From bae0d5e7174fed8ffa8a30408c3cffa6e4dd3ddc Mon Sep 17 00:00:00 2001
From: TejeshR13 <tejesh.r@oracle.com>
Date: Fri, 4 Mar 2022 22:50:32 +0000
Subject: [PATCH 001/345] 8236907: JTable added to nested panels does not paint
 last visible row

Reviewed-by: psadhukhan, prr
---
 .../classes/javax/swing/TablePrintable.java   |  11 +-
 .../javax/swing/plaf/basic/BasicTableUI.java  |  17 --
 .../swing/JTable/8236907/LastVisibleRow.java  | 221 ++++++++++++++++++
 3 files changed, 228 insertions(+), 21 deletions(-)
 create mode 100644 test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java

diff --git a/src/java.desktop/share/classes/javax/swing/TablePrintable.java b/src/java.desktop/share/classes/javax/swing/TablePrintable.java
index 4c8eb0529ab..a6de3de2b09 100644
--- a/src/java.desktop/share/classes/javax/swing/TablePrintable.java
+++ b/src/java.desktop/share/classes/javax/swing/TablePrintable.java
@@ -395,11 +395,14 @@ class TablePrintable implements Printable {
         // draw a box around the table
         g2d.setColor(Color.BLACK);
 
+        Rectangle bounds = table.getBounds();
+        bounds.x = bounds.y = 0;
+
         // compute the visible portion of table and draw the rect around it
-        Rectangle visibleBounds = clip.intersection(table.getBounds());
+        Rectangle visibleBounds = clip.intersection(bounds);
         Point upperLeft = visibleBounds.getLocation();
-        Point lowerRight = new Point(visibleBounds.x + visibleBounds.width,
-                                     visibleBounds.y + visibleBounds.height);
+        Point lowerRight = new Point(visibleBounds.x + visibleBounds.width - 1,
+                                     visibleBounds.y + visibleBounds.height - 1);
 
         int rMin = table.rowAtPoint(upperLeft);
         int rMax = table.rowAtPoint(lowerRight);
@@ -410,7 +413,7 @@ class TablePrintable implements Printable {
             rMax = table.getRowCount();
         }
         int rowHeight = 0;
-        for(int visrow = rMin; visrow < rMax; visrow++) {
+        for(int visrow = rMin; visrow <= rMax; visrow++) {
             rowHeight += table.getRowHeight(visrow);
         }
         // If PrintMode is FIT_WIDTH, then draw rect for entire column width while
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
index 37ebb12823c..59f966df2c3 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java
@@ -1872,23 +1872,6 @@ public class BasicTableUI extends TableUI
             comp = comp.getParent();
         }
 
-        if (comp != null && !(comp instanceof JViewport) && !(comp instanceof JScrollPane)) {
-            // We did rMax-1 to paint the same number of rows that are drawn on console
-            // otherwise 1 extra row is printed per page than that are displayed
-            // when there is no scrollPane and we do printing of table
-            // but not when rmax is already pointing to index of last row
-            // and if there is any selected rows
-            if (rMax != (table.getRowCount() - 1) &&
-                    (table.getSelectedRow() == -1)) {
-                // Do not decrement rMax if rMax becomes
-                // less than or equal to rMin
-                // else cells will not be painted
-                if (rMax - rMin > 1) {
-                    rMax = rMax - 1;
-                }
-            }
-        }
-
         // Paint the grid.
         paintGrid(g, rMin, rMax, cMin, cMax);
 
diff --git a/test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java b/test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java
new file mode 100644
index 00000000000..6ca33c96356
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @key headful
+ * @bug 8236907
+ * @summary  Verifies if JTable last row is visible.
+ * @run main LastVisibleRow
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.event.InputEvent;
+import java.awt.image.BufferedImage;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+
+public class LastVisibleRow {
+    static JFrame frame;
+    static JTable table;
+    static Robot testRobot;
+
+    public static void main(String[] args) throws Exception {
+        Point clkPoint;
+        try {
+            testRobot = new Robot();
+
+            SwingUtilities.invokeAndWait(new Runnable() {
+
+                public void run() {
+                    createAndShowGUI();
+                }
+            });
+            testRobot.delay(1000);
+            testRobot.waitForIdle();
+            BufferedImage bufferedImageBefore = testRobot.createScreenCapture(getCaptureRect());
+            testRobot.delay(1000);
+            testRobot.waitForIdle();
+            clkPoint = getMousePosition();
+            mouseEvents(clkPoint);
+            testRobot.waitForIdle();
+            clearSelect();
+            testRobot.waitForIdle();
+            BufferedImage bufferedImageAfter = testRobot.createScreenCapture(getCaptureRect());
+            testRobot.delay(1000);
+
+            if (!compare(bufferedImageBefore, bufferedImageAfter)) {
+                throw new RuntimeException("Test Case Failed!!");
+            }
+        } finally {
+            if (frame != null) SwingUtilities.invokeAndWait(() -> frame.dispose());
+        }
+    }
+
+    /*
+     *
+     * Get clickable screen point for particular row and column of a table
+     * param row   Row Number
+     * param column    Column Number
+     * return Point
+     */
+    private static Point getCellClickPoint(final int row, final int column) {
+        Point result;
+
+        Rectangle rect = table.getCellRect(row, column, false);
+        Point point = new Point(rect.x + rect.width / 2,
+                rect.y + rect.height / 2);
+        SwingUtilities.convertPointToScreen(point, table);
+        result = point;
+
+        return result;
+    }
+
+    private static void createAndShowGUI() {
+        final PrintRequestAttributeSet printReqAttr = new HashPrintRequestAttributeSet();
+        printReqAttr.add(javax.print.attribute.standard.OrientationRequested.LANDSCAPE);
+        frame = new JFrame();
+        frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        Container contentPane = frame.getContentPane();
+        JPanel centerPane = new JPanel(new BorderLayout());
+        centerPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        JPanel tablePaneContainer = new JPanel(new BorderLayout());
+        JPanel tablePane = new JPanel(new BorderLayout());
+        table = new JTable(new Object[][]{{"row_1_col_1", "row_1_col_2", "row_1_col_3"}, {"row_2_col_1", "row_2_col_2", "row_2_col_3"}, {"row_3_col_1", "row_3_col_2", "row_3_col_3"}, {"row_4_col_1", "row_4_col_2", "row_4_col_3"}}, new String[]{"Col1", "Col2", "Col3"});
+        table.setPreferredSize(new Dimension(0, (table.getRowHeight() * 3)));
+
+        tablePane.add(table.getTableHeader(), BorderLayout.NORTH);
+        tablePane.add(table, BorderLayout.CENTER);
+        tablePaneContainer.add(tablePane, BorderLayout.CENTER);
+        centerPane.add(tablePaneContainer, BorderLayout.NORTH);
+        contentPane.add(centerPane, BorderLayout.CENTER);
+        frame.setSize(400, 120);
+        frame.setVisible(true);
+        frame.setLocationRelativeTo(null);
+
+    }
+
+    /*
+     *
+     * mouseEvents for last row click
+     */
+
+    private static void mouseEvents(Point clkPnt)  {
+        testRobot.mouseMove(clkPnt.x, clkPnt.y);
+        testRobot.delay(50);
+        testRobot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        testRobot.delay(50);
+        testRobot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        testRobot.delay(50);
+    }
+    /*
+     *
+     * getMousePosition Actions for last row click
+     * returns Point
+     * throws Exception
+     */
+
+    private static Point getMousePosition() throws Exception {
+        final Point[] clickPoint = new Point[1];
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                clickPoint[0] = getCellClickPoint(2, 0);
+            }
+        });
+        return clickPoint[0];
+    }
+
+    /*
+     *
+     * Clears the selected table row
+     * throws Exception
+     */
+
+    private static void clearSelect() throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                table.getSelectionModel().clearSelection();
+                table.setFocusable(false);
+            }
+        });
+    }
+
+    /*
+     * getCaptureRect Method - To Compute the Rectangle for
+     * Screen Capturing the Last Row for comparison
+     * return Rectangle
+     */
+
+    private static Rectangle getCaptureRect() throws InterruptedException, InvocationTargetException {
+        final Rectangle[] captureRect = new Rectangle[1];
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                Rectangle cellRect = table.getCellRect(2, 0, true);
+                Point point = new Point(cellRect.x, cellRect.y);
+                SwingUtilities.convertPointToScreen(point, table);
+
+                captureRect[0] = new Rectangle(point.x, point.y, table.getColumnCount() * cellRect.width, cellRect.height);
+            }
+        });
+        return captureRect[0];
+    }
+
+    /*
+     * Compare method - to compare two images.
+     * param bufferedImage1    Buffered Image Before click
+     * param bufferedImage2    Buffered Image After click
+     * return Boolean
+     */
+
+    static Boolean compare(BufferedImage bufferedImage1, BufferedImage bufferedImage2) {
+        if (bufferedImage1.getWidth() == bufferedImage2.getWidth()
+                && bufferedImage1.getHeight() == bufferedImage2.getHeight()) {
+            for (int x = 0; x < bufferedImage1.getWidth(); x++) {
+                for (int y = 0; y < bufferedImage1.getHeight(); y++) {
+                    if (bufferedImage1.getRGB(x, y) != bufferedImage2.getRGB(x, y)) {
+                        return false;
+                    }
+                }
+            }
+        } else {
+            return false;
+        }
+        return true;
+    }
+}
-- 
GitLab


From c459f8f406a99cf78814bb5722f546ae1cdb6c6f Mon Sep 17 00:00:00 2001
From: wanghaomin <wanghaomin@loongson.cn>
Date: Sat, 5 Mar 2022 00:01:49 +0000
Subject: [PATCH 002/345] 8282142: [TestCase]
 compiler/inlining/ResolvedClassTest.java will fail when
 --with-jvm-features=-compiler1

Reviewed-by: jiefu, kvn
---
 test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
index dfeee6cdd7b..44b21cb6815 100644
--- a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
+++ b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8279515
  *
- * @requires vm.flagless
+ * @requires vm.flagless & vm.compiler1.enabled & vm.compiler2.enabled
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
  *
-- 
GitLab


From 52278b80c4b68af566327cf46b53dda5eda25a51 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Sat, 5 Mar 2022 01:36:02 +0000
Subject: [PATCH 003/345] 8282694: ProblemList
 runtime/CommandLine/VMDeprecatedOptions.java

Reviewed-by: jjg
---
 test/hotspot/jtreg/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 518238d9c0a..5f007410904 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -102,6 +102,7 @@ runtime/os/TestTracePageSizes.java#compiler-options 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#G1 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#Parallel 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#Serial 8267460 linux-aarch64
+runtime/CommandLine/VMDeprecatedOptions.java 8282690 generic-all
 runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
 
 applications/jcstress/copy.java 8229852 linux-all
-- 
GitLab


From bc42e7cbbfd586308338bfdf535c4fcab0cdbc48 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Sat, 5 Mar 2022 06:37:39 +0000
Subject: [PATCH 004/345] 8282382: Report glibc malloc tunables in error
 reports

Reviewed-by: zgu, dholmes
---
 src/hotspot/os/linux/os_linux.cpp | 47 ++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 18b908cfc8f..33acc06df53 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022 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
@@ -2092,6 +2093,34 @@ bool os::Linux::query_process_memory_info(os::Linux::meminfo_t* info) {
   return false;
 }
 
+#ifdef __GLIBC__
+// For Glibc, print a one-liner with the malloc tunables.
+// Most important and popular is MALLOC_ARENA_MAX, but we are
+// thorough and print them all.
+static void print_glibc_malloc_tunables(outputStream* st) {
+  static const char* var[] = {
+      // the new variant
+      "GLIBC_TUNABLES",
+      // legacy variants
+      "MALLOC_CHECK_", "MALLOC_TOP_PAD_", "MALLOC_PERTURB_",
+      "MALLOC_MMAP_THRESHOLD_", "MALLOC_TRIM_THRESHOLD_",
+      "MALLOC_MMAP_MAX_", "MALLOC_ARENA_TEST", "MALLOC_ARENA_MAX",
+      NULL};
+  st->print("glibc malloc tunables: ");
+  bool printed = false;
+  for (int i = 0; var[i] != NULL; i ++) {
+    const char* const val = ::getenv(var[i]);
+    if (val != NULL) {
+      st->print("%s%s=%s", (printed ? ", " : ""), var[i], val);
+      printed = true;
+    }
+  }
+  if (!printed) {
+    st->print("(default)");
+  }
+}
+#endif // __GLIBC__
+
 void os::Linux::print_process_memory_info(outputStream* st) {
 
   st->print_cr("Process Memory:");
@@ -2114,8 +2143,9 @@ void os::Linux::print_process_memory_info(outputStream* st) {
     st->print_cr("Could not open /proc/self/status to get process memory related information");
   }
 
-  // Print glibc outstanding allocations.
-  // (note: there is no implementation of mallinfo for muslc)
+  // glibc only:
+  // - Print outstanding allocations using mallinfo
+  // - Print glibc tunables
 #ifdef __GLIBC__
   size_t total_allocated = 0;
   bool might_have_wrapped = false;
@@ -2123,9 +2153,10 @@ void os::Linux::print_process_memory_info(outputStream* st) {
     struct glibc_mallinfo2 mi = _mallinfo2();
     total_allocated = mi.uordblks;
   } else if (_mallinfo != NULL) {
-    // mallinfo is an old API. Member names mean next to nothing and, beyond that, are int.
-    // So values may have wrapped around. Still useful enough to see how much glibc thinks
-    // we allocated.
+    // mallinfo is an old API. Member names mean next to nothing and, beyond that, are 32-bit signed.
+    // So for larger footprints the values may have wrapped around. We try to detect this here: if the
+    // process whole resident set size is smaller than 4G, malloc footprint has to be less than that
+    // and the numbers are reliable.
     struct glibc_mallinfo mi = _mallinfo();
     total_allocated = (size_t)(unsigned)mi.uordblks;
     // Since mallinfo members are int, glibc values may have wrapped. Warn about this.
@@ -2136,8 +2167,10 @@ void os::Linux::print_process_memory_info(outputStream* st) {
                  total_allocated / K,
                  might_have_wrapped ? " (may have wrapped)" : "");
   }
-#endif // __GLIBC__
-
+  // Tunables
+  print_glibc_malloc_tunables(st);
+  st->cr();
+#endif
 }
 
 bool os::Linux::print_ld_preload_file(outputStream* st) {
-- 
GitLab


From 974ef5542fe52f9cb8ffd8751df8a020bca503c9 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Sun, 6 Mar 2022 08:16:39 +0000
Subject: [PATCH 005/345] 8282617:
 sun.net.www.protocol.https.HttpsClient#putInKeepAliveCache() doesn't use a
 lock while dealing with "inCache" field

Reviewed-by: dfuchs, michaelm
---
 .../sun/net/www/protocol/https/HttpsClient.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
index 4818f945bcc..1cb435f7fdf 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -661,12 +661,17 @@ final class HttpsClient extends HttpClient
 
     @Override
     protected void putInKeepAliveCache() {
-        if (inCache) {
-            assert false : "Duplicate put to keep alive cache";
-            return;
+        lock();
+        try {
+            if (inCache) {
+                assert false : "Duplicate put to keep alive cache";
+                return;
+            }
+            inCache = true;
+            kac.put(url, sslSocketFactory, this);
+        } finally {
+            unlock();
         }
-        inCache = true;
-        kac.put(url, sslSocketFactory, this);
     }
 
     /*
-- 
GitLab


From 415bf44191632cd8dbcc158c0ff0992c0b61c3ba Mon Sep 17 00:00:00 2001
From: Masanori Yano <myano@openjdk.org>
Date: Sun, 6 Mar 2022 23:53:50 +0000
Subject: [PATCH 006/345] 8275715: D3D pipeline processes multiple PaintEvent
 at initial drawing

Reviewed-by: prr
---
 .../java2d/d3d/D3DScreenUpdateManager.java    | 10 ++-
 .../MultiPaintEventTest.java                  | 86 +++++++++++++++++++
 2 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java

diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
index d2850927120..4d65e2700ab 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
@@ -258,7 +258,7 @@ public class D3DScreenUpdateManager extends ScreenUpdateManager
     {
         if (!done && sd instanceof D3DWindowSurfaceData) {
             D3DWindowSurfaceData d3dw = (D3DWindowSurfaceData)sd;
-            if (!d3dw.isSurfaceLost() || validate(d3dw)) {
+            if (!d3dw.isSurfaceLost() || validate(d3dw, false)) {
                 trackScreenSurface(d3dw);
                 return new SunGraphics2D(sd, fgColor, bgColor, font);
             }
@@ -452,7 +452,7 @@ public class D3DScreenUpdateManager extends ScreenUpdateManager
                         } finally {
                             rq.unlock();
                         }
-                    } else if (!validate(sd)) {
+                    } else if (!validate(sd, true)) {
                         // it is possible that the validation may never
                         // succeed, we need to detect this and replace
                         // the d3dw surface with gdi; the replacement of
@@ -474,7 +474,7 @@ public class D3DScreenUpdateManager extends ScreenUpdateManager
      * @return true if surface wasn't lost or if restoration was successful,
      * false otherwise
      */
-    private boolean validate(D3DWindowSurfaceData sd) {
+    private boolean validate(D3DWindowSurfaceData sd, boolean postEvent) {
         if (sd.isSurfaceLost()) {
             try {
                 sd.restoreSurface();
@@ -491,7 +491,9 @@ public class D3DScreenUpdateManager extends ScreenUpdateManager
                 sd.markClean();
                 // since the surface was successfully restored we need to
                 // repaint whole window to repopulate the back-buffer
-                repaintPeerTarget(sd.getPeer());
+                if (postEvent) {
+                    repaintPeerTarget(sd.getPeer());
+                }
             } catch (InvalidPipeException ipe) {
                 return false;
             }
diff --git a/test/jdk/sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java b/test/jdk/sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java
new file mode 100644
index 00000000000..69042d07635
--- /dev/null
+++ b/test/jdk/sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key headful
+ * @bug 8275715
+ * @summary Tests that paint method is not called twice
+ * @run main/othervm MultiPaintEventTest
+ */
+
+import java.awt.*;
+
+public class MultiPaintEventTest extends Canvas {
+
+    private int count = 0;
+    private final Object lock = new Object();
+
+    public void paint(Graphics g) {
+        synchronized(lock) {
+            count++;
+        }
+
+        int w = getWidth();
+        int h = getHeight();
+
+        Graphics2D g2d = (Graphics2D)g;
+        if (count % 2 == 1) {
+            g2d.setColor(Color.green);
+        } else {
+            g2d.setColor(Color.red);
+        }
+        g2d.fillRect(0, 0, w, h);
+    }
+
+    public int getCount() {
+        synchronized(lock) {
+            return count;
+        }
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(400, 400);
+    }
+
+    public static void main(String[] args) {
+        MultiPaintEventTest test = new MultiPaintEventTest();
+        Frame frame = new Frame();
+        frame.setUndecorated(true);
+        frame.add(test);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+
+        try {
+            Thread.sleep(2000);
+            if (test.getCount() > 1) {
+                throw new RuntimeException("Processed unnecessary paint().");
+            }
+        } catch (InterruptedException ex) {
+            throw new RuntimeException("Failed: Interrupted");
+        } finally {
+            frame.dispose();
+        }
+    }
+}
-- 
GitLab


From 894ffb098c80bfeb4209038c017d01dbf53fac0f Mon Sep 17 00:00:00 2001
From: Masanori Yano <myano@openjdk.org>
Date: Mon, 7 Mar 2022 01:33:41 +0000
Subject: [PATCH 007/345] 8282713: Invalid copyright notice in new test added
 by JDK-8275715

Reviewed-by: dholmes
---
 .../java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java b/test/jdk/sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java
index 69042d07635..27d54af6a0b 100644
--- a/test/jdk/sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java
+++ b/test/jdk/sun/java2d/DirectX/MultiPaintEventTest/MultiPaintEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
-- 
GitLab


From 6fc73f709ba9a7f4810027f6c888b63a4604f004 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 7 Mar 2022 13:52:19 +0000
Subject: [PATCH 008/345] 8282620: G1/Parallel: Constify is_in_young()
 predicates

Reviewed-by: iwalulya, ayang
---
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp                   | 2 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp            | 2 +-
 src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp        | 3 +--
 src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 1fad936447d..6c1b60a3faa 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1179,7 +1179,7 @@ public:
   size_t max_tlab_size() const override;
   size_t unsafe_max_tlab_alloc(Thread* ignored) const override;
 
-  inline bool is_in_young(const oop obj);
+  inline bool is_in_young(const oop obj) const;
 
   // Returns "true" iff the given word_size is "very large".
   static bool is_humongous(size_t word_size) {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
index af778e43b13..13231603533 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -208,7 +208,7 @@ void G1CollectedHeap::register_optional_region_with_region_attr(HeapRegion* r) {
   _region_attr.set_optional(r->hrm_index(), r->rem_set()->is_tracked());
 }
 
-inline bool G1CollectedHeap::is_in_young(const oop obj) {
+inline bool G1CollectedHeap::is_in_young(const oop obj) const {
   if (obj == NULL) {
     return false;
   }
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index cda8d7446ca..3ee16e5d8b9 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -184,8 +184,7 @@ class ParallelScavengeHeap : public CollectedHeap {
 
   bool is_in_reserved(const void* p) const;
 
-  bool is_in_young(oop p);  // reserved part
-  bool is_in_old(oop p);    // reserved part
+  bool is_in_young(const oop p) const;
 
   MemRegion reserved_region() const { return _reserved; }
   HeapWord* base() const { return _reserved.start(); }
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
index a867c689c98..80efa1b8fc6 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
@@ -43,7 +43,7 @@ inline void ParallelScavengeHeap::invoke_scavenge() {
   PSScavenge::invoke();
 }
 
-inline bool ParallelScavengeHeap::is_in_young(oop p) {
+inline bool ParallelScavengeHeap::is_in_young(const oop p) const {
   // Assumes the the old gen address range is lower than that of the young gen.
   bool result = cast_from_oop<HeapWord*>(p) >= young_gen()->reserved().start();
   assert(result == young_gen()->is_in_reserved(p),
-- 
GitLab


From 104e3cb24b4de5512abf9f5491f9c530b26838d3 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 7 Mar 2022 14:47:52 +0000
Subject: [PATCH 009/345] 8282696: Add constructors taking a cause to
 InvalidObjectException and InvalidClassException

Reviewed-by: lancea
---
 .../java/io/InvalidClassException.java        | 27 ++++++++-
 .../java/io/InvalidObjectException.java       | 18 +++++-
 .../classes/java/io/ObjectInputStream.java    | 44 +++++---------
 .../classes/java/io/ObjectStreamClass.java    |  7 ++-
 .../java/io/ObjectStreamException.java        | 24 +++++++-
 .../TestIceConstructors.java                  | 58 +++++++++++++++++++
 .../TestIoeConstructors.java                  | 56 ++++++++++++++++++
 7 files changed, 198 insertions(+), 36 deletions(-)
 create mode 100644 test/jdk/java/io/Serializable/InvalidClassException/TestIceConstructors.java
 create mode 100644 test/jdk/java/io/Serializable/InvalidObjectException/TestIoeConstructors.java

diff --git a/src/java.base/share/classes/java/io/InvalidClassException.java b/src/java.base/share/classes/java/io/InvalidClassException.java
index 6de0e70f760..be187597726 100644
--- a/src/java.base/share/classes/java/io/InvalidClassException.java
+++ b/src/java.base/share/classes/java/io/InvalidClassException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,9 +73,34 @@ public class InvalidClassException extends ObjectStreamException {
         classname = cname;
     }
 
+    /**
+     * Report an InvalidClassException for the reason and cause specified.
+     *
+     * @param reason  String describing the reason for the exception.
+     * @param cause the cause
+     * @since 19
+     */
+    public InvalidClassException(String reason, Throwable cause) {
+        super(reason, cause);
+    }
+
+    /**
+     * Report an InvalidClassException for the reason and cause specified.
+     *
+     * @param cname   a String naming the invalid class.
+     * @param reason  String describing the reason for the exception.
+     * @param cause the cause
+     * @since 19
+     */
+    public InvalidClassException(String cname, String reason, Throwable cause) {
+        super(reason, cause);
+        classname = cname;
+    }
+
     /**
      * Produce the message and include the classname, if present.
      */
+    @Override
     public String getMessage() {
         if (classname == null)
             return super.getMessage();
diff --git a/src/java.base/share/classes/java/io/InvalidObjectException.java b/src/java.base/share/classes/java/io/InvalidObjectException.java
index c6e626b238f..a6331de45ab 100644
--- a/src/java.base/share/classes/java/io/InvalidObjectException.java
+++ b/src/java.base/share/classes/java/io/InvalidObjectException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,21 @@ public class InvalidObjectException extends ObjectStreamException {
      *
      * @see ObjectInputValidation
      */
-    public  InvalidObjectException(String reason) {
+    public InvalidObjectException(String reason) {
         super(reason);
     }
+
+    /**
+     * Constructs an {@code InvalidObjectException} with the given
+     * reason and cause.
+     *
+     * @param reason Detailed message explaining the reason for the failure.
+     * @param cause the cause
+     *
+     * @see ObjectInputValidation
+     * @since 19
+     */
+    public InvalidObjectException(String reason, Throwable cause) {
+        super(reason, cause);
+    }
 }
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
index 714785cd117..14812fea9ad 100644
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -1429,9 +1429,7 @@ public class ObjectInputStream
             event.commit();
         }
         if (serialFilter != null && (status == null || status == ObjectInputFilter.Status.REJECTED)) {
-            InvalidClassException ice = new InvalidClassException("filter status: " + status);
-            ice.initCause(ex);
-            throw ice;
+            throw new InvalidClassException("filter status: " + status, ex);
         }
     }
 
@@ -1996,14 +1994,10 @@ public class ObjectInputStream
         } catch (ClassNotFoundException ex) {
             resolveEx = ex;
         } catch (IllegalAccessError aie) {
-            IOException ice = new InvalidClassException(aie.getMessage());
-            ice.initCause(aie);
-            throw ice;
+            throw new InvalidClassException(aie.getMessage(), aie);
         } catch (OutOfMemoryError memerr) {
-            IOException ex = new InvalidObjectException("Proxy interface limit exceeded: " +
-                    Arrays.toString(ifaces));
-            ex.initCause(memerr);
-            throw ex;
+            throw new InvalidObjectException("Proxy interface limit exceeded: " +
+                                             Arrays.toString(ifaces), memerr);
         }
 
         // Call filterCheck on the class before reading anything else
@@ -2016,10 +2010,8 @@ public class ObjectInputStream
             depth++;
             desc.initProxy(cl, resolveEx, readClassDesc(false));
         } catch (OutOfMemoryError memerr) {
-            IOException ex = new InvalidObjectException("Proxy interface limit exceeded: " +
-                    Arrays.toString(ifaces));
-            ex.initCause(memerr);
-            throw ex;
+            throw new InvalidObjectException("Proxy interface limit exceeded: " +
+                                             Arrays.toString(ifaces), memerr);
         } finally {
             depth--;
         }
@@ -2050,8 +2042,8 @@ public class ObjectInputStream
         try {
             readDesc = readClassDescriptor();
         } catch (ClassNotFoundException ex) {
-            throw (IOException) new InvalidClassException(
-                "failed to read class descriptor").initCause(ex);
+            throw new InvalidClassException("failed to read class descriptor",
+                                            ex);
         }
 
         Class<?> cl = null;
@@ -2221,9 +2213,8 @@ public class ObjectInputStream
                 Enum<?> en = Enum.valueOf((Class)cl, name);
                 result = en;
             } catch (IllegalArgumentException ex) {
-                throw (IOException) new InvalidObjectException(
-                    "enum constant " + name + " does not exist in " +
-                    cl).initCause(ex);
+                throw new InvalidObjectException("enum constant " +
+                                                 name + " does not exist in " + cl, ex);
             }
             if (!unshared) {
                 handles.setObject(enumHandle, result);
@@ -2262,9 +2253,8 @@ public class ObjectInputStream
         try {
             obj = desc.isInstantiable() ? desc.newInstance() : null;
         } catch (Exception ex) {
-            throw (IOException) new InvalidClassException(
-                desc.forClass().getName(),
-                "unable to create instance").initCause(ex);
+            throw new InvalidClassException(desc.forClass().getName(),
+                                            "unable to create instance", ex);
         }
 
         passHandle = handles.assign(unshared ? unsharedMarker : obj);
@@ -2388,16 +2378,12 @@ public class ObjectInputStream
         try {
             return (Object) ctrMH.invokeExact(fieldValues.primValues, fieldValues.objValues);
         } catch (Exception e) {
-            InvalidObjectException ioe = new InvalidObjectException(e.getMessage());
-            ioe.initCause(e);
-            throw ioe;
+            throw new InvalidObjectException(e.getMessage(), e);
         } catch (Error e) {
             throw e;
         } catch (Throwable t) {
-            ObjectStreamException ose = new InvalidObjectException(
-                    "ReflectiveOperationException during deserialization");
-            ose.initCause(t);
-            throw ose;
+            throw new InvalidObjectException("ReflectiveOperationException " +
+                                             "during deserialization", t);
         }
     }
 
diff --git a/src/java.base/share/classes/java/io/ObjectStreamClass.java b/src/java.base/share/classes/java/io/ObjectStreamClass.java
index 86ed2b839d1..c41e8b1744a 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -709,8 +709,9 @@ public class ObjectStreamClass implements Serializable {
             try {
                 fields[i] = new ObjectStreamField(fname, signature, false);
             } catch (RuntimeException e) {
-                throw (IOException) new InvalidClassException(name,
-                    "invalid descriptor for field " + fname).initCause(e);
+                throw new InvalidClassException(name,
+                                                "invalid descriptor for field " +
+                                                fname, e);
             }
         }
         computeFieldOffsets();
diff --git a/src/java.base/share/classes/java/io/ObjectStreamException.java b/src/java.base/share/classes/java/io/ObjectStreamException.java
index 779cc0627d3..a7d19cdc1fa 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamException.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,10 +44,32 @@ public abstract class ObjectStreamException extends IOException {
         super(message);
     }
 
+    /**
+     * Create an ObjectStreamException with the specified message and
+     * cause.
+     *
+     * @param message the detailed message for the exception
+     * @param cause the cause
+     * @since 19
+     */
+    protected ObjectStreamException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
     /**
      * Create an ObjectStreamException.
      */
     protected ObjectStreamException() {
         super();
     }
+
+    /**
+     * Create an ObjectStreamException with the specified cause.
+     *
+     * @param cause the cause
+     * @since 19
+     */
+    protected ObjectStreamException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/test/jdk/java/io/Serializable/InvalidClassException/TestIceConstructors.java b/test/jdk/java/io/Serializable/InvalidClassException/TestIceConstructors.java
new file mode 100644
index 00000000000..991ec32ec8f
--- /dev/null
+++ b/test/jdk/java/io/Serializable/InvalidClassException/TestIceConstructors.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282696
+ * @summary Verify message and cause handling of InvalidClassException
+ */
+import java.io.*;
+import java.util.Objects;
+
+public class TestIceConstructors {
+    public static void main(String... args) {
+        String reason = "reason";
+        Throwable cause = new RuntimeException();
+
+        testException(new InvalidClassException(reason),
+                      reason, null);
+        testException(new InvalidClassException(reason, cause),
+                      reason, cause);
+        testException(new InvalidClassException("prefix", reason, cause),
+                      "prefix" + "; " + reason, cause);
+    }
+
+    private static void testException(InvalidClassException ice,
+                                      String expectedMessage,
+                                      Throwable expectedCause) {
+        var message = ice.getMessage();
+        if (!Objects.equals(message, expectedMessage)) {
+            throw new RuntimeException("Unexpected message " + message);
+        }
+
+        var cause = ice.getCause();
+        if (cause != expectedCause) {
+            throw new RuntimeException("Unexpected cause");
+        }
+    }
+}
diff --git a/test/jdk/java/io/Serializable/InvalidObjectException/TestIoeConstructors.java b/test/jdk/java/io/Serializable/InvalidObjectException/TestIoeConstructors.java
new file mode 100644
index 00000000000..d3a952e62df
--- /dev/null
+++ b/test/jdk/java/io/Serializable/InvalidObjectException/TestIoeConstructors.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282696
+ * @summary Verify message and cause handling of InvalidObjectException
+ */
+import java.io.*;
+import java.util.Objects;
+
+public class TestIoeConstructors {
+    public static void main(String... args) {
+        String reason = "reason";
+        Throwable cause = new RuntimeException();
+
+        testException(new InvalidObjectException(reason),
+                      reason, null);
+        testException(new InvalidObjectException(reason, cause),
+                      reason, cause);
+    }
+
+    private static void testException(InvalidObjectException ioe,
+                                      String expectedMessage,
+                                      Throwable expectedCause) {
+        var message = ioe.getMessage();
+        if (!Objects.equals(message, expectedMessage)) {
+            throw new RuntimeException("Unexpected message " + message);
+        }
+
+        var cause = ioe.getCause();
+        if (cause != expectedCause) {
+            throw new RuntimeException("Unexpected cause");
+        }
+    }
+}
-- 
GitLab


From e544e354a425a242f23cee1049d6ba31b30740e0 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Mon, 7 Mar 2022 15:05:42 +0000
Subject: [PATCH 010/345] 8282621: G1: G1SegmentedArray remove unnecessary
 template parameter

Reviewed-by: kbarrett, tschatzl
---
 src/hotspot/share/gc/g1/g1CardSetMemory.cpp   | 54 ++++++++++--------
 src/hotspot/share/gc/g1/g1CardSetMemory.hpp   | 56 ++++---------------
 .../share/gc/g1/g1CardSetMemory.inline.hpp    | 13 ++---
 src/hotspot/share/gc/g1/g1SegmentedArray.hpp  |  2 +-
 .../share/gc/g1/g1SegmentedArray.inline.hpp   | 42 +++++++-------
 5 files changed, 70 insertions(+), 97 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.cpp b/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
index 24b482ac597..b68c50b5cb1 100644
--- a/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
+++ b/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,9 @@
 #include "runtime/atomic.hpp"
 #include "utilities/ostream.hpp"
 
-template <class Slot>
-G1CardSetAllocator<Slot>::G1CardSetAllocator(const char* name,
-                                             const G1CardSetAllocOptions* alloc_options,
-                                             G1CardSetFreeList* free_segment_list) :
+G1CardSetAllocator::G1CardSetAllocator(const char* name,
+                                       const G1CardSetAllocOptions* alloc_options,
+                                       G1CardSetFreeList* free_segment_list) :
   _segmented_array(alloc_options, free_segment_list),
   _free_slots_list(name, &_segmented_array)
 {
@@ -41,26 +40,38 @@ G1CardSetAllocator<Slot>::G1CardSetAllocator(const char* name,
   assert(slot_size >= sizeof(G1CardSetContainer), "Slot instance size %u for allocator %s too small", slot_size, name);
 }
 
-template <class Slot>
-G1CardSetAllocator<Slot>::~G1CardSetAllocator() {
+G1CardSetAllocator::~G1CardSetAllocator() {
   drop_all();
 }
 
-template <class Slot>
-void G1CardSetAllocator<Slot>::free(Slot* slot) {
+void G1CardSetAllocator::free(void* slot) {
   assert(slot != nullptr, "precondition");
-  slot->~Slot();
   _free_slots_list.release(slot);
 }
 
-template <class Slot>
-void G1CardSetAllocator<Slot>::drop_all() {
+void G1CardSetAllocator::drop_all() {
   _free_slots_list.reset();
   _segmented_array.drop_all();
 }
 
-template <class Slot>
-void G1CardSetAllocator<Slot>::print(outputStream* os) {
+size_t G1CardSetAllocator::mem_size() const {
+  return sizeof(*this) +
+         _segmented_array.num_segments() * sizeof(G1CardSetSegment) +
+         _segmented_array.num_available_slots() * _segmented_array.slot_size();
+}
+
+size_t G1CardSetAllocator::wasted_mem_size() const {
+  uint num_wasted_slots = _segmented_array.num_available_slots() -
+                          _segmented_array.num_allocated_slots() -
+                          (uint)_free_slots_list.pending_count();
+  return num_wasted_slots * _segmented_array.slot_size();
+}
+
+uint G1CardSetAllocator::num_segments() const {
+  return _segmented_array.num_segments();
+}
+
+void G1CardSetAllocator::print(outputStream* os) {
   uint num_allocated_slots = _segmented_array.num_allocated_slots();
   uint num_available_slots = _segmented_array.num_available_slots();
   uint highest = _segmented_array.first_array_segment() != nullptr
@@ -82,13 +93,13 @@ void G1CardSetAllocator<Slot>::print(outputStream* os) {
 G1CardSetMemoryManager::G1CardSetMemoryManager(G1CardSetConfiguration* config,
                                                G1CardSetFreePool* free_list_pool) : _config(config) {
 
-  _allocators = NEW_C_HEAP_ARRAY(G1CardSetAllocator<G1CardSetContainer>,
+  _allocators = NEW_C_HEAP_ARRAY(G1CardSetAllocator,
                                  _config->num_mem_object_types(),
                                  mtGC);
   for (uint i = 0; i < num_mem_object_types(); i++) {
-    new (&_allocators[i]) G1CardSetAllocator<G1CardSetContainer>(_config->mem_object_type_name_str(i),
-                                                                 _config->mem_object_alloc_options(i),
-                                                                 free_list_pool->free_list(i));
+    new (&_allocators[i]) G1CardSetAllocator(_config->mem_object_type_name_str(i),
+                                             _config->mem_object_alloc_options(i),
+                                             free_list_pool->free_list(i));
   }
 }
 
@@ -106,7 +117,7 @@ G1CardSetMemoryManager::~G1CardSetMemoryManager() {
 
 void G1CardSetMemoryManager::free(uint type, void* value) {
   assert(type < num_mem_object_types(), "must be");
-  _allocators[type].free((G1CardSetContainer*)value);
+  _allocators[type].free(value);
 }
 
 void G1CardSetMemoryManager::flush() {
@@ -127,9 +138,8 @@ size_t G1CardSetMemoryManager::mem_size() const {
   for (uint i = 0; i < num_mem_object_types(); i++) {
     result += _allocators[i].mem_size();
   }
-  return sizeof(*this) -
-    (sizeof(G1CardSetAllocator<G1CardSetContainer>) * num_mem_object_types()) +
-    result;
+  return sizeof(*this) + result -
+    (sizeof(G1CardSetAllocator) * num_mem_object_types());
 }
 
 size_t G1CardSetMemoryManager::wasted_mem_size() const {
diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.hpp b/src/hotspot/share/gc/g1/g1CardSetMemory.hpp
index c455706a616..c2663b41cf1 100644
--- a/src/hotspot/share/gc/g1/g1CardSetMemory.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetMemory.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,37 +62,12 @@ typedef G1SegmentedArraySegment<mtGCCardSet> G1CardSetSegment;
 
 typedef G1SegmentedArrayFreeList<mtGCCardSet> G1CardSetFreeList;
 
-// Arena-like allocator for (card set) heap memory objects (Slot slots).
+// Arena-like allocator for (card set) heap memory objects.
 //
-// Allocation and deallocation in the first phase on G1CardSetContainer basis
-// may occur by multiple threads at once.
-//
-// Allocation occurs from an internal free list of G1CardSetContainers first,
-// only then trying to bump-allocate from the current G1CardSetSegment. If there is
-// none, this class allocates a new G1CardSetSegment (allocated from the C heap,
-// asking the G1CardSetAllocOptions instance about sizes etc) and uses that one.
-//
-// The SegmentStack free list is a linked list of G1CardSetContainers
-// within all G1CardSetSegment instances allocated so far. It uses a separate
-// pending list and global synchronization to avoid the ABA problem when the
-// user frees a memory object.
-//
-// The class also manages a few counters for statistics using atomic operations.
-// Their values are only consistent within each other with extra global
-// synchronization.
-//
-// Since it is expected that every CardSet (and in extension each region) has its
-// own set of allocators, there is intentionally no padding between them to save
-// memory.
-template <class Slot>
+// Allocation occurs from an internal free list of objects first. If the free list is
+// empty then tries to allocate from the G1SegmentedArray.
 class G1CardSetAllocator {
-  // G1CardSetSegment management.
-
-  typedef G1SegmentedArray<Slot, mtGCCardSet> SegmentedArray;
-  // G1CardSetContainer slot management within the G1CardSetSegments allocated
-  // by this allocator.
-
-  SegmentedArray _segmented_array;
+  G1SegmentedArray<mtGCCardSet> _segmented_array;
   FreeListAllocator _free_slots_list;
 
 public:
@@ -101,27 +76,18 @@ public:
                      G1CardSetFreeList* free_segment_list);
   ~G1CardSetAllocator();
 
-  Slot* allocate();
-  void free(Slot* slot);
+  void* allocate();
+  void free(void* slot);
 
   // Deallocate all segments to the free segment list and reset this allocator. Must
   // be called in a globally synchronized area.
   void drop_all();
 
-  size_t mem_size() const {
-    return sizeof(*this) +
-      _segmented_array.num_segments() * sizeof(G1CardSetSegment) +
-      _segmented_array.num_available_slots() * _segmented_array.slot_size();
-  }
+  size_t mem_size() const;
 
-  size_t wasted_mem_size() const {
-    uint num_wasted_slots = _segmented_array.num_available_slots() -
-                            _segmented_array.num_allocated_slots() -
-                            (uint)_free_slots_list.pending_count();
-    return num_wasted_slots * _segmented_array.slot_size();
-  }
+  size_t wasted_mem_size() const;
 
-  inline uint num_segments() { return _segmented_array.num_segments(); }
+  uint num_segments() const;
 
   void print(outputStream* os);
 };
@@ -131,7 +97,7 @@ typedef G1SegmentedArrayFreePool<mtGCCardSet> G1CardSetFreePool;
 class G1CardSetMemoryManager : public CHeapObj<mtGCCardSet> {
   G1CardSetConfiguration* _config;
 
-  G1CardSetAllocator<G1CardSetContainer>* _allocators;
+  G1CardSetAllocator* _allocators;
 
   uint num_mem_object_types() const;
 public:
diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
index 7d75f86bb7d..bdf69e227df 100644
--- a/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,13 @@
 #define SHARE_GC_G1_G1CARDSETMEMORY_INLINE_HPP
 
 #include "gc/g1/g1CardSetMemory.hpp"
-#include "gc/g1/g1CardSetContainers.hpp"
-#include "gc/g1/g1SegmentedArray.inline.hpp"
-#include "utilities/ostream.hpp"
-
 #include "gc/g1/g1CardSetContainers.inline.hpp"
+#include "gc/g1/g1SegmentedArray.inline.hpp"
 #include "utilities/globalCounter.inline.hpp"
+#include "utilities/ostream.hpp"
 
-template <class Slot>
-Slot* G1CardSetAllocator<Slot>::allocate() {
-  Slot* slot = ::new (_free_slots_list.allocate()) Slot();
+inline void* G1CardSetAllocator::allocate() {
+  void* slot = _free_slots_list.allocate();
   assert(slot != nullptr, "must be");
   return slot;
 }
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArray.hpp b/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
index bddb6af15fe..6c73e9855cc 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
@@ -181,7 +181,7 @@ public:
 // The class also manages a few counters for statistics using atomic operations.
 // Their values are only consistent within each other with extra global
 // synchronization.
-template <class Slot, MEMFLAGS flag>
+template <MEMFLAGS flag>
 class G1SegmentedArray : public FreeListConfig  {
   // G1SegmentedArrayAllocOptions provides parameters for allocation segment
   // sizing and expansion.
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp b/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
index 51b778d82f0..69c3526e58d 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
@@ -115,8 +115,8 @@ void G1SegmentedArrayFreeList<flag>::free_all() {
   Atomic::sub(&_mem_size, mem_size_freed, memory_order_relaxed);
 }
 
-template <class Slot, MEMFLAGS flag>
-G1SegmentedArraySegment<flag>* G1SegmentedArray<Slot, flag>::create_new_segment(G1SegmentedArraySegment<flag>* const prev) {
+template <MEMFLAGS flag>
+G1SegmentedArraySegment<flag>* G1SegmentedArray<flag>::create_new_segment(G1SegmentedArraySegment<flag>* const prev) {
   // Take an existing segment if available.
   G1SegmentedArraySegment<flag>* next = _free_segment_list->get();
   if (next == nullptr) {
@@ -125,7 +125,7 @@ G1SegmentedArraySegment<flag>* G1SegmentedArray<Slot, flag>::create_new_segment(
     next = new G1SegmentedArraySegment<flag>(slot_size(), num_slots, prev);
   } else {
     assert(slot_size() == next->slot_size() ,
-           "Mismatch %d != %d Slot %zu", slot_size(), next->slot_size(), sizeof(Slot));
+           "Mismatch %d != %d", slot_size(), next->slot_size());
     next->reset(prev);
   }
 
@@ -148,14 +148,14 @@ G1SegmentedArraySegment<flag>* G1SegmentedArray<Slot, flag>::create_new_segment(
   }
 }
 
-template <class Slot, MEMFLAGS flag>
-uint G1SegmentedArray<Slot, flag>::slot_size() const {
+template <MEMFLAGS flag>
+uint G1SegmentedArray<flag>::slot_size() const {
   return _alloc_options->slot_size();
 }
 
-template <class Slot, MEMFLAGS flag>
-G1SegmentedArray<Slot, flag>::G1SegmentedArray(const G1SegmentedArrayAllocOptions* alloc_options,
-                                               G1SegmentedArrayFreeList<flag>* free_segment_list) :
+template <MEMFLAGS flag>
+G1SegmentedArray<flag>::G1SegmentedArray(const G1SegmentedArrayAllocOptions* alloc_options,
+                                         G1SegmentedArrayFreeList<flag>* free_segment_list) :
      _alloc_options(alloc_options),
      _first(nullptr),
      _last(nullptr),
@@ -167,13 +167,13 @@ G1SegmentedArray<Slot, flag>::G1SegmentedArray(const G1SegmentedArrayAllocOption
   assert(_free_segment_list != nullptr, "precondition!");
 }
 
-template <class Slot, MEMFLAGS flag>
-G1SegmentedArray<Slot, flag>::~G1SegmentedArray() {
+template <MEMFLAGS flag>
+G1SegmentedArray<flag>::~G1SegmentedArray() {
   drop_all();
 }
 
-template <class Slot, MEMFLAGS flag>
-void G1SegmentedArray<Slot, flag>::drop_all() {
+template <MEMFLAGS flag>
+void G1SegmentedArray<flag>::drop_all() {
   G1SegmentedArraySegment<flag>* cur = Atomic::load_acquire(&_first);
 
   if (cur != nullptr) {
@@ -209,8 +209,8 @@ void G1SegmentedArray<Slot, flag>::drop_all() {
   _num_allocated_slots = 0;
 }
 
-template <class Slot, MEMFLAGS flag>
-void* G1SegmentedArray<Slot, flag>::allocate() {
+template <MEMFLAGS flag>
+void* G1SegmentedArray<flag>::allocate() {
   assert(slot_size() > 0, "instance size not set.");
 
   G1SegmentedArraySegment<flag>* cur = Atomic::load_acquire(&_first);
@@ -219,7 +219,7 @@ void* G1SegmentedArray<Slot, flag>::allocate() {
   }
 
   while (true) {
-    Slot* slot = (Slot*)cur->get_new_slot();
+    void* slot = cur->get_new_slot();
     if (slot != nullptr) {
       Atomic::inc(&_num_allocated_slots, memory_order_relaxed);
       guarantee(is_aligned(slot, _alloc_options->slot_alignment()),
@@ -232,8 +232,8 @@ void* G1SegmentedArray<Slot, flag>::allocate() {
   }
 }
 
-template <class Slot, MEMFLAGS flag>
-inline uint G1SegmentedArray<Slot, flag>::num_segments() const {
+template <MEMFLAGS flag>
+inline uint G1SegmentedArray<flag>::num_segments() const {
   return Atomic::load(&_num_segments);
 }
 
@@ -251,17 +251,17 @@ public:
   }
 };
 
-template <class Slot, MEMFLAGS flag>
-uint G1SegmentedArray<Slot, flag>::calculate_length() const {
+template <MEMFLAGS flag>
+uint G1SegmentedArray<flag>::calculate_length() const {
   LengthClosure<flag> closure;
   iterate_segments(closure);
   return closure.length();
 }
 #endif
 
-template <class Slot, MEMFLAGS flag>
+template <MEMFLAGS flag>
 template <typename SegmentClosure>
-void G1SegmentedArray<Slot, flag>::iterate_segments(SegmentClosure& closure) const {
+void G1SegmentedArray<flag>::iterate_segments(SegmentClosure& closure) const {
   G1SegmentedArraySegment<flag>* cur = Atomic::load_acquire(&_first);
 
   assert((cur != nullptr) == (_last != nullptr),
-- 
GitLab


From 8e70f4c3dca4cefe813c5b0fd39c386230ca2fd7 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 7 Mar 2022 15:23:10 +0000
Subject: [PATCH 011/345] 8282224: Correct TIG::bang_stack_shadow_pages
 comments

Reviewed-by: coleenp
---
 src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index ca7bcd8e50e..7177d7ca34c 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -755,8 +755,8 @@ void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
     __ bang_stack_with_offset(p*page_size);
   }
 
-  // Record a new watermark, unless the update is above the safe limit.
-  // Otherwise, the next time around a check above would pass the safe limit.
+  // Record the new watermark, but only if update is above the safe limit.
+  // Otherwise, the next time around the check above would pass the safe limit.
   __ cmpptr(rsp, Address(thread, JavaThread::shadow_zone_safe_limit()));
   __ jccb(Assembler::belowEqual, L_done);
   __ movptr(Address(thread, JavaThread::shadow_zone_growth_watermark()), rsp);
-- 
GitLab


From f0995abe62b81cf9c96cc07caa0ac27d00c96ff1 Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Mon, 7 Mar 2022 16:10:31 +0000
Subject: [PATCH 012/345] 8280404: Unexpected exception thrown when CEN file
 entry comment length is not valid

Reviewed-by: alanb
---
 .../share/classes/java/util/zip/ZipFile.java  |  11 +-
 .../zip/ZipFile/InvalidCommentLengthTest.java | 345 ++++++++++++++++++
 2 files changed, 355 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/util/zip/ZipFile/InvalidCommentLengthTest.java

diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
index b89de2cef62..8538b4aef89 100644
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -1206,8 +1206,17 @@ public class ZipFile implements ZipConstants, Closeable {
                 entries[index++] = hash;
                 entries[index++] = next;
                 entries[index  ] = pos;
+                // Validate comment if it exists
+                // if the bytes representing the comment cannot be converted to
+                // a String via zcp.toString, an Exception will be thrown
+                int clen = CENCOM(cen, pos);
+                if (clen > 0) {
+                    int elen = CENEXT(cen, pos);
+                    int start = entryPos + nlen + elen;
+                    zcp.toString(cen, start, clen);
+                }
             } catch (Exception e) {
-                zerror("invalid CEN header (bad entry name)");
+                zerror("invalid CEN header (bad entry name or comment)");
             }
             return nlen;
         }
diff --git a/test/jdk/java/util/zip/ZipFile/InvalidCommentLengthTest.java b/test/jdk/java/util/zip/ZipFile/InvalidCommentLengthTest.java
new file mode 100644
index 00000000000..1910107f0d3
--- /dev/null
+++ b/test/jdk/java/util/zip/ZipFile/InvalidCommentLengthTest.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import static org.testng.Assert.*;
+
+/**
+ * @test
+ * @bug 8280404
+ * @summary Validate that Zip/JarFile will throw a ZipException when the CEN
+ * comment length field contains an incorrect value
+ * @run testng/othervm InvalidCommentLengthTest
+ */
+public class InvalidCommentLengthTest {
+
+    // Name used to create a JAR with an invalid comment length
+    public static final Path INVALID_CEN_COMMENT_LENGTH_JAR =
+            Path.of("Invalid-CEN-Comment-Length.jar");
+    // Name used to create a JAR with a valid comment length
+    public static final Path VALID_CEN_COMMENT_LENGTH_JAR =
+            Path.of("Valid-CEN-Comment-Length.jar");
+    // Zip/Jar CEN file header entry that will be modified
+    public static final String META_INF_MANIFEST_MF = "META-INF/MANIFEST.MF";
+    // Expected ZipException message when the comment length corrupts the
+    // Zip/Jar file
+    public static final String INVALID_CEN_HEADER_BAD_ENTRY_NAME_OR_COMMENT =
+            "invalid CEN header (bad entry name or comment)";
+
+    /**
+     * Byte array representing a valid jar file prior modifying the comment length
+     * entry in a CEN file header.
+     * The "Valid-CEN-Comment-Length.jar" jar file was created via:
+     * <pre>
+     *     {@code
+     *     jar cvf Valid-CEN-Comment-Length.jar Hello.txt Tennis.txt BruceWayne.txt
+     *     added manifest
+     *     adding: Hello.txt(in = 12) (out= 14)(deflated -16%)
+     *     adding: Tennis.txt(in = 53) (out= 53)(deflated 0%)
+     *     adding: BruceWayne.txt(in = 12) (out= 14)(deflated -16%)
+     *     }
+     * </pre>
+     * Its contents are:
+     * <pre>
+     *     {@code
+     *     jar tvf Valid-CEN-Comment-Length.jar
+     *      0 Wed Mar 02 06:39:24 EST 2022 META-INF/
+     *     66 Wed Mar 02 06:39:24 EST 2022 META-INF/MANIFEST.MF
+     *     12 Wed Mar 02 06:39:06 EST 2022 Hello.txt
+     *     53 Wed Mar 02 13:04:48 EST 2022 Tennis.txt
+     *     12 Wed Mar 02 15:15:34 EST 2022 BruceWayne.txt
+     *     }
+     * </pre>
+     * The ByteArray was created by:
+     * <pre>
+     *  {@code
+     *     var jar = Files.readAllBytes("Valid-CEN-Comment-Length.jar");
+     *     var validEntryName = createByteArray(fooJar,
+     *           "VALID_ZIP_WITH_NO_COMMENTS_BYTES");
+     *  }
+     * </pre>
+     */
+    public static byte[] VALID_ZIP_WITH_NO_COMMENTS_BYTES = {
+            (byte) 0x50, (byte) 0x4b, (byte) 0x3, (byte) 0x4, (byte) 0x14,
+            (byte) 0x0, (byte) 0x8, (byte) 0x8, (byte) 0x8, (byte) 0x0,
+            (byte) 0xec, (byte) 0x34, (byte) 0x62, (byte) 0x54, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x9, (byte) 0x0, (byte) 0x4, (byte) 0x0,
+            (byte) 0x4d, (byte) 0x45, (byte) 0x54, (byte) 0x41, (byte) 0x2d,
+            (byte) 0x49, (byte) 0x4e, (byte) 0x46, (byte) 0x2f, (byte) 0xfe,
+            (byte) 0xca, (byte) 0x0, (byte) 0x0, (byte) 0x3, (byte) 0x0,
+            (byte) 0x50, (byte) 0x4b, (byte) 0x7, (byte) 0x8, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x2, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x50, (byte) 0x4b, (byte) 0x3, (byte) 0x4,
+            (byte) 0x14, (byte) 0x0, (byte) 0x8, (byte) 0x8, (byte) 0x8,
+            (byte) 0x0, (byte) 0xec, (byte) 0x34, (byte) 0x62, (byte) 0x54,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x14, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x4d, (byte) 0x45, (byte) 0x54, (byte) 0x41,
+            (byte) 0x2d, (byte) 0x49, (byte) 0x4e, (byte) 0x46, (byte) 0x2f,
+            (byte) 0x4d, (byte) 0x41, (byte) 0x4e, (byte) 0x49, (byte) 0x46,
+            (byte) 0x45, (byte) 0x53, (byte) 0x54, (byte) 0x2e, (byte) 0x4d,
+            (byte) 0x46, (byte) 0xf3, (byte) 0x4d, (byte) 0xcc, (byte) 0xcb,
+            (byte) 0x4c, (byte) 0x4b, (byte) 0x2d, (byte) 0x2e, (byte) 0xd1,
+            (byte) 0xd, (byte) 0x4b, (byte) 0x2d, (byte) 0x2a, (byte) 0xce,
+            (byte) 0xcc, (byte) 0xcf, (byte) 0xb3, (byte) 0x52, (byte) 0x30,
+            (byte) 0xd4, (byte) 0x33, (byte) 0xe0, (byte) 0xe5, (byte) 0x72,
+            (byte) 0x2e, (byte) 0x4a, (byte) 0x4d, (byte) 0x2c, (byte) 0x49,
+            (byte) 0x4d, (byte) 0xd1, (byte) 0x75, (byte) 0xaa, (byte) 0x4,
+            (byte) 0xa, (byte) 0x98, (byte) 0xe8, (byte) 0x19, (byte) 0xe8,
+            (byte) 0x19, (byte) 0x2a, (byte) 0x68, (byte) 0xf8, (byte) 0x17,
+            (byte) 0x25, (byte) 0x26, (byte) 0xe7, (byte) 0xa4, (byte) 0x2a,
+            (byte) 0x38, (byte) 0xe7, (byte) 0x17, (byte) 0x15, (byte) 0xe4,
+            (byte) 0x17, (byte) 0x25, (byte) 0x96, (byte) 0x0, (byte) 0x15,
+            (byte) 0x6b, (byte) 0xf2, (byte) 0x72, (byte) 0xf1, (byte) 0x72,
+            (byte) 0x1, (byte) 0x0, (byte) 0x50, (byte) 0x4b, (byte) 0x7,
+            (byte) 0x8, (byte) 0xf4, (byte) 0x59, (byte) 0xdc, (byte) 0xa6,
+            (byte) 0x42, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x42,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x50, (byte) 0x4b,
+            (byte) 0x3, (byte) 0x4, (byte) 0x14, (byte) 0x0, (byte) 0x8,
+            (byte) 0x8, (byte) 0x8, (byte) 0x0, (byte) 0xe3, (byte) 0x34,
+            (byte) 0x62, (byte) 0x54, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x9,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x48, (byte) 0x65,
+            (byte) 0x6c, (byte) 0x6c, (byte) 0x6f, (byte) 0x2e, (byte) 0x74,
+            (byte) 0x78, (byte) 0x74, (byte) 0xf3, (byte) 0x48, (byte) 0xcd,
+            (byte) 0xc9, (byte) 0xc9, (byte) 0x57, (byte) 0x28, (byte) 0xcf,
+            (byte) 0x2f, (byte) 0xca, (byte) 0x49, (byte) 0xe1, (byte) 0x2,
+            (byte) 0x0, (byte) 0x50, (byte) 0x4b, (byte) 0x7, (byte) 0x8,
+            (byte) 0xd5, (byte) 0xe0, (byte) 0x39, (byte) 0xb7, (byte) 0xe,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0xc, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x50, (byte) 0x4b, (byte) 0x3,
+            (byte) 0x4, (byte) 0x14, (byte) 0x0, (byte) 0x8, (byte) 0x8,
+            (byte) 0x8, (byte) 0x0, (byte) 0x98, (byte) 0x68, (byte) 0x62,
+            (byte) 0x54, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0xa, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x54, (byte) 0x65, (byte) 0x6e,
+            (byte) 0x6e, (byte) 0x69, (byte) 0x73, (byte) 0x2e, (byte) 0x74,
+            (byte) 0x78, (byte) 0x74, (byte) 0x73, (byte) 0xf2, (byte) 0xb,
+            (byte) 0x50, (byte) 0x8, (byte) 0x48, (byte) 0x2c, (byte) 0xca,
+            (byte) 0x4c, (byte) 0x4a, (byte) 0x2c, (byte) 0x56, (byte) 0xf0,
+            (byte) 0x2f, (byte) 0x48, (byte) 0xcd, (byte) 0x53, (byte) 0xc8,
+            (byte) 0x2c, (byte) 0x56, (byte) 0x48, (byte) 0x54, (byte) 0x48,
+            (byte) 0x2b, (byte) 0xcd, (byte) 0x53, (byte) 0x8, (byte) 0x49,
+            (byte) 0xcd, (byte) 0xcb, (byte) 0x3, (byte) 0x72, (byte) 0x42,
+            (byte) 0xf2, (byte) 0x4b, (byte) 0x8b, (byte) 0xf2, (byte) 0x12,
+            (byte) 0x73, (byte) 0x53, (byte) 0xf3, (byte) 0x4a, (byte) 0x14,
+            (byte) 0x4a, (byte) 0xf2, (byte) 0x15, (byte) 0xca, (byte) 0x13,
+            (byte) 0x4b, (byte) 0x92, (byte) 0x33, (byte) 0xb8, (byte) 0x0,
+            (byte) 0x50, (byte) 0x4b, (byte) 0x7, (byte) 0x8, (byte) 0xaa,
+            (byte) 0xad, (byte) 0x14, (byte) 0xd, (byte) 0x35, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x35, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x50, (byte) 0x4b, (byte) 0x3, (byte) 0x4,
+            (byte) 0x14, (byte) 0x0, (byte) 0x8, (byte) 0x8, (byte) 0x8,
+            (byte) 0x0, (byte) 0xf1, (byte) 0x79, (byte) 0x62, (byte) 0x54,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0xe, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x42, (byte) 0x72, (byte) 0x75, (byte) 0x63,
+            (byte) 0x65, (byte) 0x57, (byte) 0x61, (byte) 0x79, (byte) 0x6e,
+            (byte) 0x65, (byte) 0x2e, (byte) 0x74, (byte) 0x78, (byte) 0x74,
+            (byte) 0xf3, (byte) 0x54, (byte) 0x48, (byte) 0xcc, (byte) 0x55,
+            (byte) 0x70, (byte) 0x4a, (byte) 0x2c, (byte) 0xc9, (byte) 0x4d,
+            (byte) 0xcc, (byte) 0xe3, (byte) 0x2, (byte) 0x0, (byte) 0x50,
+            (byte) 0x4b, (byte) 0x7, (byte) 0x8, (byte) 0x6c, (byte) 0x70,
+            (byte) 0x60, (byte) 0xbd, (byte) 0xe, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0xc, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x50, (byte) 0x4b, (byte) 0x1, (byte) 0x2, (byte) 0x14,
+            (byte) 0x0, (byte) 0x14, (byte) 0x0, (byte) 0x8, (byte) 0x8,
+            (byte) 0x8, (byte) 0x0, (byte) 0xec, (byte) 0x34, (byte) 0x62,
+            (byte) 0x54, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x2, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x9, (byte) 0x0,
+            (byte) 0x4, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x4d, (byte) 0x45, (byte) 0x54, (byte) 0x41,
+            (byte) 0x2d, (byte) 0x49, (byte) 0x4e, (byte) 0x46, (byte) 0x2f,
+            (byte) 0xfe, (byte) 0xca, (byte) 0x0, (byte) 0x0, (byte) 0x50,
+            (byte) 0x4b, (byte) 0x1, (byte) 0x2, (byte) 0x14, (byte) 0x0,
+            (byte) 0x14, (byte) 0x0, (byte) 0x8, (byte) 0x8, (byte) 0x8,
+            (byte) 0x0, (byte) 0xec, (byte) 0x34, (byte) 0x62, (byte) 0x54,
+            (byte) 0xf4, (byte) 0x59, (byte) 0xdc, (byte) 0xa6, (byte) 0x42,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x42, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x14, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x3d, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x4d, (byte) 0x45, (byte) 0x54, (byte) 0x41, (byte) 0x2d,
+            (byte) 0x49, (byte) 0x4e, (byte) 0x46, (byte) 0x2f, (byte) 0x4d,
+            (byte) 0x41, (byte) 0x4e, (byte) 0x49, (byte) 0x46, (byte) 0x45,
+            (byte) 0x53, (byte) 0x54, (byte) 0x2e, (byte) 0x4d, (byte) 0x46,
+            (byte) 0x50, (byte) 0x4b, (byte) 0x1, (byte) 0x2, (byte) 0x14,
+            (byte) 0x0, (byte) 0x14, (byte) 0x0, (byte) 0x8, (byte) 0x8,
+            (byte) 0x8, (byte) 0x0, (byte) 0xe3, (byte) 0x34, (byte) 0x62,
+            (byte) 0x54, (byte) 0xd5, (byte) 0xe0, (byte) 0x39, (byte) 0xb7,
+            (byte) 0xe, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0xc,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x9, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0xc1, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x48, (byte) 0x65, (byte) 0x6c, (byte) 0x6c,
+            (byte) 0x6f, (byte) 0x2e, (byte) 0x74, (byte) 0x78, (byte) 0x74,
+            (byte) 0x50, (byte) 0x4b, (byte) 0x1, (byte) 0x2, (byte) 0x14,
+            (byte) 0x0, (byte) 0x14, (byte) 0x0, (byte) 0x8, (byte) 0x8,
+            (byte) 0x8, (byte) 0x0, (byte) 0x98, (byte) 0x68, (byte) 0x62,
+            (byte) 0x54, (byte) 0xaa, (byte) 0xad, (byte) 0x14, (byte) 0xd,
+            (byte) 0x35, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x35,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0xa, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x6, (byte) 0x1, (byte) 0x0,
+            (byte) 0x0, (byte) 0x54, (byte) 0x65, (byte) 0x6e, (byte) 0x6e,
+            (byte) 0x69, (byte) 0x73, (byte) 0x2e, (byte) 0x74, (byte) 0x78,
+            (byte) 0x74, (byte) 0x50, (byte) 0x4b, (byte) 0x1, (byte) 0x2,
+            (byte) 0x14, (byte) 0x0, (byte) 0x14, (byte) 0x0, (byte) 0x8,
+            (byte) 0x8, (byte) 0x8, (byte) 0x0, (byte) 0xf1, (byte) 0x79,
+            (byte) 0x62, (byte) 0x54, (byte) 0x6c, (byte) 0x70, (byte) 0x60,
+            (byte) 0xbd, (byte) 0xe, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0xc, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0xe,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x73, (byte) 0x1,
+            (byte) 0x0, (byte) 0x0, (byte) 0x42, (byte) 0x72, (byte) 0x75,
+            (byte) 0x63, (byte) 0x65, (byte) 0x57, (byte) 0x61, (byte) 0x79,
+            (byte) 0x6e, (byte) 0x65, (byte) 0x2e, (byte) 0x74, (byte) 0x78,
+            (byte) 0x74, (byte) 0x50, (byte) 0x4b, (byte) 0x5, (byte) 0x6,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x0, (byte) 0x5,
+            (byte) 0x0, (byte) 0x5, (byte) 0x0, (byte) 0x28, (byte) 0x1,
+            (byte) 0x0, (byte) 0x0, (byte) 0xbd, (byte) 0x1, (byte) 0x0,
+            (byte) 0x0, (byte) 0x0, (byte) 0x0,
+    };
+
+    /**
+     * Create Jar files used by the tests.
+     * The {@code byte} array {@code VALID_ZIP_WITH_NO_COMMENTS_BYTES} is written
+     * to disk to create the jar file: {@code Valid-CEN-Comment-Length.jar}.
+     *
+     * The jar file {@code InValid-CEN-Comment-Length.jar} is created by copying
+     * the {@code byte} array {@code VALID_ZIP_WITH_NO_COMMENTS_BYTES} and modifying
+     * the CEN file header comment length entry for "META-INF/MANIFEST.MF" so that
+     * new comment length will forward the CEN to a subsequent CEN file header
+     * entry.
+     *
+     * For {@code InValid-CEN-Comment-Length.jar}, the comment length is changed
+     * from {@code 0x0} to the {@code 0x37}.
+     *
+     * @throws IOException If an error occurs
+     */
+    @BeforeTest
+    public void setup() throws IOException {
+        Files.deleteIfExists(VALID_CEN_COMMENT_LENGTH_JAR);
+        Files.deleteIfExists(INVALID_CEN_COMMENT_LENGTH_JAR);
+        // Create the valid jar
+        Files.write(VALID_CEN_COMMENT_LENGTH_JAR, VALID_ZIP_WITH_NO_COMMENTS_BYTES);
+        // Now create an invalid jar
+        byte[] invalid_bytes = Arrays.copyOf(VALID_ZIP_WITH_NO_COMMENTS_BYTES,
+                VALID_ZIP_WITH_NO_COMMENTS_BYTES.length);
+        // Change CEN file Header comment length so that the length will
+        // result in the offset pointing to a subsequent CEN file header
+        // resulting in an invalid comment
+        invalid_bytes[536] = 55;
+        Files.write(INVALID_CEN_COMMENT_LENGTH_JAR, invalid_bytes);
+    }
+
+    /**
+     * Clean up after the test run
+     *
+     * @throws IOException If an error occurs
+     */
+    @AfterTest
+    public static void cleanup() throws IOException {
+        Files.deleteIfExists(VALID_CEN_COMMENT_LENGTH_JAR);
+        Files.deleteIfExists(INVALID_CEN_COMMENT_LENGTH_JAR);
+    }
+
+    /**
+     * Validate that the original(valid) Jar file can be opened by {@code ZipFile}
+     * and the expected Zip entry can be found
+     * @throws IOException If an error occurs
+     */
+    @Test
+    public static void ZipFileValidCommentLengthTest() throws IOException {
+        try (ZipFile jf = new ZipFile(VALID_CEN_COMMENT_LENGTH_JAR.toFile())) {
+            ZipEntry ze = jf.getEntry(META_INF_MANIFEST_MF);
+            assertNotNull(ze);
+            assertEquals(ze.getName(), META_INF_MANIFEST_MF);
+        }
+    }
+
+    /**
+     * Validate that the original(valid) Jar file can be opened by {@code JarFile}
+     * and the expected Zip entry can be found
+     * @throws IOException If an error occurs
+     */
+    @Test
+    public static void JarFileValidCommentLengthTest() throws IOException {
+        try (JarFile jf = new JarFile(VALID_CEN_COMMENT_LENGTH_JAR.toFile())) {
+            ZipEntry ze = jf.getEntry(META_INF_MANIFEST_MF);
+            assertNotNull(ze);
+            assertEquals(ze.getName(), META_INF_MANIFEST_MF);
+        }
+    }
+
+    /**
+     * Validate that a ZipException is thrown when the CEN file header comment
+     * length is non-zero and the CEN entry does not contain a comment when
+     * the Jar file is opened by {@code ZipFile}
+     */
+    @Test
+    public static void ZipFileInValidCommentLengthTest() {
+        var ex= expectThrows(ZipException.class,
+                () -> new ZipFile(INVALID_CEN_COMMENT_LENGTH_JAR.toFile()));
+        assertEquals(ex.getMessage(), INVALID_CEN_HEADER_BAD_ENTRY_NAME_OR_COMMENT);
+    }
+
+    /**
+     * Validate that a ZipException is thrown when the CEN file header comment
+     * length is non-zero and the CEN entry does not contain a comment when
+     * the Jar file is opened by  {@code JarFile}
+     */
+    @Test
+    public static void JarFileInValidCommentLengthTest()  {
+        var ex= expectThrows(ZipException.class,
+                () -> new JarFile(INVALID_CEN_COMMENT_LENGTH_JAR.toFile()));
+        assertEquals(ex.getMessage(), INVALID_CEN_HEADER_BAD_ENTRY_NAME_OR_COMMENT);
+    }
+}
-- 
GitLab


From ef266d77b6eb54d7e30a0aafd8a3e8c8f4f0e43a Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Mon, 7 Mar 2022 16:26:19 +0000
Subject: [PATCH 013/345] 8278296: Generalize long range check transformation

Reviewed-by: jrose, thartmann
---
 src/hotspot/share/opto/loopPredicate.cpp      |   2 +-
 src/hotspot/share/opto/loopTransform.cpp      | 246 +++++++++++++-----
 src/hotspot/share/opto/loopnode.cpp           | 242 ++++++++++-------
 src/hotspot/share/opto/loopnode.hpp           |  13 +-
 src/hotspot/share/opto/node.hpp               |   7 +-
 .../c2/irTests/TestLongRangeChecks.java       | 146 +++++++++++
 .../rangechecks/TestLongRangeCheck.java       | 222 +++++++++++-----
 7 files changed, 644 insertions(+), 234 deletions(-)

diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index 584df763156..ee88d0fabf4 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -759,7 +759,7 @@ bool IdealLoopTree::is_range_check_if(IfNode *iff, PhaseIdealLoop *phase, BasicT
   }
   scale  = 0;
   offset = NULL;
-  if (!phase->is_scaled_iv_plus_offset(cmp->in(1), iv, &scale, &offset, bt)) {
+  if (!phase->is_scaled_iv_plus_offset(cmp->in(1), iv, bt, &scale, &offset)) {
     return false;
   }
   return true;
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 21dab9335c0..a997439f43f 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1121,18 +1121,18 @@ bool IdealLoopTree::policy_range_check(PhaseIdealLoop* phase, bool provisional,
         continue; // not RC
       }
       Node *cmp = bol->in(1);
-      Node *rc_exp = cmp->in(1);
-      Node *limit = cmp->in(2);
 
       if (provisional) {
         // Try to pattern match with either cmp inputs, do not check
         // whether one of the inputs is loop independent as it may not
         // have had a chance to be hoisted yet.
-        if (!phase->is_scaled_iv_plus_offset(cmp->in(1), trip_counter, NULL, NULL, bt) &&
-            !phase->is_scaled_iv_plus_offset(cmp->in(2), trip_counter, NULL, NULL, bt)) {
+        if (!phase->is_scaled_iv_plus_offset(cmp->in(1), trip_counter, bt, NULL, NULL) &&
+            !phase->is_scaled_iv_plus_offset(cmp->in(2), trip_counter, bt, NULL, NULL)) {
           continue;
         }
       } else {
+        Node *rc_exp = cmp->in(1);
+        Node *limit = cmp->in(2);
         Node *limit_c = phase->get_ctrl(limit);
         if (limit_c == phase->C->top()) {
           return false;           // Found dead test on live IF?  No RCE!
@@ -1147,7 +1147,7 @@ bool IdealLoopTree::policy_range_check(PhaseIdealLoop* phase, bool provisional,
           }
         }
 
-        if (!phase->is_scaled_iv_plus_offset(rc_exp, trip_counter, NULL, NULL, bt)) {
+        if (!phase->is_scaled_iv_plus_offset(rc_exp, trip_counter, bt, NULL, NULL)) {
           continue;
         }
       }
@@ -2522,127 +2522,202 @@ void PhaseIdealLoop::add_constraint(jlong stride_con, jlong scale_con, Node* off
   }
 }
 
+//----------------------------------is_iv------------------------------------
+// Return true if exp is the value (of type bt) of the given induction var.
+// This grammar of cases is recognized, where X is I|L according to bt:
+//    VIV[iv] = iv | (CastXX VIV[iv]) | (ConvI2X VIV[iv])
 bool PhaseIdealLoop::is_iv(Node* exp, Node* iv, BasicType bt) {
-  if (exp == iv) {
+  exp = exp->uncast();
+  if (exp == iv && iv->bottom_type()->isa_integer(bt)) {
     return true;
   }
 
-  if (bt == T_LONG && iv->bottom_type()->isa_int() && exp->Opcode() == Op_ConvI2L && exp->in(1) == iv) {
+  if (bt == T_LONG && iv->bottom_type()->isa_int() && exp->Opcode() == Op_ConvI2L && exp->in(1)->uncast() == iv) {
     return true;
   }
   return false;
 }
 
 //------------------------------is_scaled_iv---------------------------------
-// Return true if exp is a constant times an induction var
-bool PhaseIdealLoop::is_scaled_iv(Node* exp, Node* iv, jlong* p_scale, BasicType bt, bool* converted) {
-  exp = exp->uncast();
-  assert(bt == T_INT || bt == T_LONG, "unexpected int type");
-  if (is_iv(exp, iv, bt)) {
+// Return true if exp is a constant times the given induction var (of type bt).
+// The multiplication is either done in full precision (exactly of type bt),
+// or else bt is T_LONG but iv is scaled using 32-bit arithmetic followed by a ConvI2L.
+// This grammar of cases is recognized, where X is I|L according to bt:
+//    SIV[iv] = VIV[iv] | (CastXX SIV[iv])
+//            | (MulX VIV[iv] ConX) | (MulX ConX VIV[iv])
+//            | (LShiftX VIV[iv] ConI)
+//            | (ConvI2L SIV[iv])  -- a "short-scale" can occur here; note recursion
+//            | (SubX 0 SIV[iv])  -- same as MulX(iv, -scale); note recursion
+//    VIV[iv] = [either iv or its value converted; see is_iv() above]
+// On success, the constant scale value is stored back to *p_scale.
+// The value (*p_short_scale) reports if such a ConvI2L conversion was present.
+bool PhaseIdealLoop::is_scaled_iv(Node* exp, Node* iv, BasicType bt, jlong* p_scale, bool* p_short_scale, int depth) {
+  BasicType exp_bt = bt;
+  exp = exp->uncast();  //strip casts
+  assert(exp_bt == T_INT || exp_bt == T_LONG, "unexpected int type");
+  if (is_iv(exp, iv, exp_bt)) {
     if (p_scale != NULL) {
       *p_scale = 1;
     }
+    if (p_short_scale != NULL) {
+      *p_short_scale = false;
+    }
     return true;
   }
-  if (bt == T_LONG && iv->bottom_type()->isa_int() && exp->Opcode() == Op_ConvI2L) {
+  if (exp_bt == T_LONG && iv->bottom_type()->isa_int() && exp->Opcode() == Op_ConvI2L) {
     exp = exp->in(1);
-    bt = T_INT;
-    if (converted != NULL) {
-      *converted = true;
-    }
+    exp_bt = T_INT;
   }
   int opc = exp->Opcode();
+  int which = 0;  // this is which subexpression we find the iv in
   // Can't use is_Mul() here as it's true for AndI and AndL
-  if (opc == Op_Mul(bt)) {
-    if (is_iv(exp->in(1)->uncast(), iv, bt) && exp->in(2)->is_Con()) {
+  if (opc == Op_Mul(exp_bt)) {
+    if ((is_iv(exp->in(which = 1), iv, exp_bt) && exp->in(2)->is_Con()) ||
+        (is_iv(exp->in(which = 2), iv, exp_bt) && exp->in(1)->is_Con())) {
+      Node* factor = exp->in(which == 1 ? 2 : 1);  // the other argument
+      jlong scale = factor->find_integer_as_long(exp_bt, 0);
+      if (scale == 0) {
+        return false;  // might be top
+      }
       if (p_scale != NULL) {
-        *p_scale = exp->in(2)->get_integer_as_long(bt);
+        *p_scale = scale;
+      }
+      if (p_short_scale != NULL) {
+        // (ConvI2L (MulI iv K)) can be 64-bit linear if iv is kept small enough...
+        *p_short_scale = (exp_bt != bt && scale != 1);
       }
       return true;
     }
-    if (is_iv(exp->in(2)->uncast(), iv, bt) && exp->in(1)->is_Con()) {
+  } else if (opc == Op_LShift(exp_bt)) {
+    if (is_iv(exp->in(1), iv, exp_bt) && exp->in(2)->is_Con()) {
+      jint shift_amount = exp->in(2)->find_int_con(min_jint);
+      if (shift_amount == min_jint) {
+        return false;  // might be top
+      }
+      jlong scale;
+      if (exp_bt == T_INT) {
+        scale = java_shift_left((jint)1, (juint)shift_amount);
+      } else if (exp_bt == T_LONG) {
+        scale = java_shift_left((jlong)1, (julong)shift_amount);
+      }
       if (p_scale != NULL) {
-        *p_scale = exp->in(1)->get_integer_as_long(bt);
+        *p_scale = scale;
+      }
+      if (p_short_scale != NULL) {
+        // (ConvI2L (MulI iv K)) can be 64-bit linear if iv is kept small enough...
+        *p_short_scale = (exp_bt != bt && scale != 1);
       }
       return true;
     }
-  } else if (opc == Op_LShift(bt)) {
-    if (is_iv(exp->in(1)->uncast(), iv, bt) && exp->in(2)->is_Con()) {
+  } else if (opc == Op_Sub(exp_bt) &&
+             exp->in(1)->find_integer_as_long(exp_bt, -1) == 0) {
+    jlong scale = 0;
+    if (depth == 0 && is_scaled_iv(exp->in(2), iv, exp_bt, &scale, p_short_scale, depth + 1)) {
+      // SubX(0, iv*K) => iv*(-K)
+      if (scale == min_signed_integer(exp_bt)) {
+        // This should work even if -K overflows, but let's not.
+        return false;
+      }
+      scale = java_multiply(scale, (jlong)-1);
       if (p_scale != NULL) {
-        jint shift_amount = exp->in(2)->get_int();
-        if (bt == T_INT) {
-          *p_scale = java_shift_left((jint)1, (juint)shift_amount);
-        } else if (bt == T_LONG) {
-          *p_scale = java_shift_left((jlong)1, (julong)shift_amount);
-        }
+        *p_scale = scale;
+      }
+      if (p_short_scale != NULL) {
+        // (ConvI2L (MulI iv K)) can be 64-bit linear if iv is kept small enough...
+        *p_short_scale = *p_short_scale || (exp_bt != bt && scale != 1);
       }
       return true;
     }
   }
+  // We could also recognize (iv*K1)*K2, even with overflow, but let's not.
   return false;
 }
 
-//-----------------------------is_scaled_iv_plus_offset------------------------------
-// Return true if exp is a simple induction variable expression: k1*iv + (invar + k2)
-bool PhaseIdealLoop::is_scaled_iv_plus_offset(Node* exp, Node* iv, jlong* p_scale, Node** p_offset, BasicType bt, bool* converted, int depth) {
+//-------------------------is_scaled_iv_plus_offset--------------------------
+// Return true if exp is a simple linear transform of the given induction var.
+// The scale must be constant and the addition tree (if any) must be simple.
+// This grammar of cases is recognized, where X is I|L according to bt:
+//
+//    OIV[iv] = SIV[iv] | (CastXX OIV[iv])
+//            | (AddX SIV[iv] E) | (AddX E SIV[iv])
+//            | (SubX SIV[iv] E) | (SubX E SIV[iv])
+//    SSIV[iv] = (ConvI2X SIV[iv])  -- a "short scale" might occur here
+//    SIV[iv] = [a possibly scaled value of iv; see is_scaled_iv() above]
+//
+// On success, the constant scale value is stored back to *p_scale unless null.
+// Likewise, the addend (perhaps a synthetic AddX node) is stored to *p_offset.
+// Also, (*p_short_scale) reports if a ConvI2L conversion was seen after a MulI,
+// meaning bt is T_LONG but iv was scaled using 32-bit arithmetic.
+// To avoid looping, the match is depth-limited, and so may fail to match the grammar to complex expressions.
+bool PhaseIdealLoop::is_scaled_iv_plus_offset(Node* exp, Node* iv, BasicType bt, jlong* p_scale, Node** p_offset, bool* p_short_scale, int depth) {
   assert(bt == T_INT || bt == T_LONG, "unexpected int type");
-  if (is_scaled_iv(exp, iv, p_scale, bt, converted)) {
+  jlong scale = 0;  // to catch result from is_scaled_iv()
+  BasicType exp_bt = bt;
+  exp = exp->uncast();
+  if (is_scaled_iv(exp, iv, exp_bt, &scale, p_short_scale)) {
+    if (p_scale != NULL) {
+      *p_scale = scale;
+    }
     if (p_offset != NULL) {
-      Node *zero = _igvn.integercon(0, bt);
+      Node *zero = _igvn.zerocon(bt);
       set_ctrl(zero, C->root());
       *p_offset = zero;
     }
     return true;
   }
-  exp = exp->uncast();
+  if (exp_bt != bt) {
+    // We would now be matching inputs like (ConvI2L exp:(AddI (MulI iv S) E)).
+    // It's hard to make 32-bit arithmetic linear if it overflows.  Although we do
+    // cope with overflowing multiplication by S, it would be even more work to
+    // handle overflowing addition of E.  So we bail out here on ConvI2L input.
+    return false;
+  }
   int opc = exp->Opcode();
-  if (opc == Op_Add(bt)) {
-    if (is_scaled_iv(exp->in(1), iv, p_scale, bt, converted)) {
+  int which = 0;  // this is which subexpression we find the iv in
+  Node* offset = NULL;
+  if (opc == Op_Add(exp_bt)) {
+    // Check for a scaled IV in (AddX (MulX iv S) E) or (AddX E (MulX iv S)).
+    if (is_scaled_iv(exp->in(which = 1), iv, bt, &scale, p_short_scale) ||
+        is_scaled_iv(exp->in(which = 2), iv, bt, &scale, p_short_scale)) {
+      offset = exp->in(which == 1 ? 2 : 1);  // the other argument
+      if (p_scale != NULL) {
+        *p_scale = scale;
+      }
       if (p_offset != NULL) {
-        *p_offset = exp->in(2);
+        *p_offset = offset;
       }
       return true;
     }
-    if (is_scaled_iv(exp->in(2), iv, p_scale, bt, converted)) {
-      if (p_offset != NULL) {
-        *p_offset = exp->in(1);
-      }
+    // Check for more addends, like (AddX (AddX (MulX iv S) E1) E2), etc.
+    if (is_scaled_iv_plus_extra_offset(exp->in(1), exp->in(2), iv, bt, p_scale, p_offset, p_short_scale, depth) ||
+        is_scaled_iv_plus_extra_offset(exp->in(2), exp->in(1), iv, bt, p_scale, p_offset, p_short_scale, depth)) {
       return true;
     }
-    if (exp->in(2)->is_Con()) {
-      Node* offset2 = NULL;
-      if (depth < 2 &&
-          is_scaled_iv_plus_offset(exp->in(1), iv, p_scale,
-                                   p_offset != NULL ? &offset2 : NULL, bt, converted, depth+1)) {
-        if (p_offset != NULL) {
-          Node *ctrl_off2 = get_ctrl(offset2);
-          Node* offset = AddNode::make(offset2, exp->in(2), bt);
-          register_new_node(offset, ctrl_off2);
-          *p_offset = offset;
+  } else if (opc == Op_Sub(exp_bt)) {
+    if (is_scaled_iv(exp->in(which = 1), iv, bt, &scale, p_short_scale) ||
+        is_scaled_iv(exp->in(which = 2), iv, bt, &scale, p_short_scale)) {
+      // Match (SubX SIV[iv] E) as if (AddX SIV[iv] (SubX 0 E)), and
+      // match (SubX E SIV[iv]) as if (AddX E (SubX 0 SIV[iv])).
+      offset = exp->in(which == 1 ? 2 : 1);  // the other argument
+      if (which == 2) {
+        // We can't handle a scale of min_jint (or min_jlong) here as -1 * min_jint = min_jint
+        if (scale == min_signed_integer(bt)) {
+          return false;   // cannot negate the scale of the iv
         }
-        return true;
+        scale = java_multiply(scale, (jlong)-1);
       }
-    }
-  } else if (opc == Op_Sub(bt)) {
-    if (is_scaled_iv(exp->in(1), iv, p_scale, bt, converted)) {
-      if (p_offset != NULL) {
-        Node *zero = _igvn.integercon(0, bt);
-        set_ctrl(zero, C->root());
-        Node *ctrl_off = get_ctrl(exp->in(2));
-        Node* offset = SubNode::make(zero, exp->in(2), bt);
-        register_new_node(offset, ctrl_off);
-        *p_offset = offset;
+      if (p_scale != NULL) {
+        *p_scale = scale;
       }
-      return true;
-    }
-    if (is_scaled_iv(exp->in(2), iv, p_scale, bt, converted)) {
       if (p_offset != NULL) {
-        // We can't handle a scale of min_jint (or min_jlong) here as -1 * min_jint = min_jint
-        if (*p_scale == min_signed_integer(bt)) {
-          return false;
+        if (which == 1) {  // must negate the extracted offset
+          Node *zero = _igvn.integercon(0, exp_bt);
+          set_ctrl(zero, C->root());
+          Node *ctrl_off = get_ctrl(offset);
+          offset = SubNode::make(zero, offset, exp_bt);
+          register_new_node(offset, ctrl_off);
         }
-        *p_scale *= -1;
-        *p_offset = exp->in(1);
+        *p_offset = offset;
       }
       return true;
     }
@@ -2650,6 +2725,33 @@ bool PhaseIdealLoop::is_scaled_iv_plus_offset(Node* exp, Node* iv, jlong* p_scal
   return false;
 }
 
+// Helper for is_scaled_iv_plus_offset(), not called separately.
+// The caller encountered (AddX exp1 offset3) or (AddX offset3 exp1).
+// Here, exp1 is inspected to see if it is a simple linear transform of iv.
+// If so, the offset3 is combined with any other offset2 from inside exp1.
+bool PhaseIdealLoop::is_scaled_iv_plus_extra_offset(Node* exp1, Node* offset3, Node* iv,
+                                                    BasicType bt,
+                                                    jlong* p_scale, Node** p_offset,
+                                                    bool* p_short_scale, int depth) {
+  // By the time we reach here, it is unlikely that exp1 is a simple iv*K.
+  // If is a linear iv transform, it is probably an add or subtract.
+  // Let's collect the internal offset2 from it.
+  Node* offset2 = NULL;
+  if (offset3->is_Con() &&
+      depth < 2 &&
+      is_scaled_iv_plus_offset(exp1, iv, bt, p_scale,
+                               &offset2, p_short_scale, depth+1)) {
+    if (p_offset != NULL) {
+      Node* ctrl_off2 = get_ctrl(offset2);
+      Node* offset = AddNode::make(offset2, offset3, bt);
+      register_new_node(offset, ctrl_off2);
+      *p_offset = offset;
+    }
+    return true;
+  }
+  return false;
+}
+
 // Same as PhaseIdealLoop::duplicate_predicates() but for range checks
 // eliminated by iteration splitting.
 Node* PhaseIdealLoop::add_range_check_predicate(IdealLoopTree* loop, CountedLoopNode* cl,
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 25bf93883d9..6732c6dee01 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -1122,9 +1122,6 @@ void PhaseIdealLoop::strip_mined_nest_back_to_counted_loop(IdealLoopTree* loop,
 
 int PhaseIdealLoop::extract_long_range_checks(const IdealLoopTree* loop, jlong stride_con, int iters_limit, PhiNode* phi,
                                               Node_List& range_checks) {
-  if (stride_con < 0) { // only for stride_con > 0 && scale > 0 for now
-    return iters_limit;
-  }
   const jlong min_iters = 2;
   jlong reduced_iters_limit = iters_limit;
   jlong original_iters_limit = iters_limit;
@@ -1139,7 +1136,6 @@ int PhaseIdealLoop::extract_long_range_checks(const IdealLoopTree* loop, jlong s
         RangeCheckNode* rc = c->in(0)->as_RangeCheck();
         if (loop->is_range_check_if(rc, this, T_LONG, phi, range, offset, scale) &&
             loop->is_invariant(range) && loop->is_invariant(offset) &&
-            scale > 0 && // only for stride_con > 0 && scale > 0 for now
             original_iters_limit / ABS(scale * stride_con) >= min_iters) {
           reduced_iters_limit = MIN2(reduced_iters_limit, original_iters_limit/ABS(scale));
           range_checks.push(c);
@@ -1154,27 +1150,29 @@ int PhaseIdealLoop::extract_long_range_checks(const IdealLoopTree* loop, jlong s
 // One execution of the inner loop covers a sub-range of the entire iteration range of the loop: [A,Z), aka [A=init,
 // Z=limit). If the loop has at least one trip (which is the case here), the iteration variable i always takes A as its
 // first value, followed by A+S (S is the stride), next A+2S, etc. The limit is exclusive, so that the final value B of
-// i is never Z.  It will be B=Z-1 if S=1, or B=Z+1 if S=-1.  If |S|>1 the formula for the last value requires a floor
-// operation, specifically B=floor((Z-sgn(S)-A)/S)*S+A.  Thus i ranges as i:[A,B] or i:[A,Z) or i:[A,Z-U) for some U<S.
+// i is never Z.  It will be B=Z-1 if S=1, or B=Z+1 if S=-1.
 
-// N.B. We handle only the case of positive S currently, so comments about S<0 are not operative at present.  Also,
-// we only support positive index scale value (K > 0) to simplify the logic for clamping 32-bit bounds (L_2, R_2).
-// For restrictions on S and K, see the guards in extract_long_range_checks.
+// If |S|>1 the formula for the last value B would require a floor operation, specifically B=floor((Z-sgn(S)-A)/S)*S+A,
+// which is B=Z-sgn(S)U for some U in [1,|S|].  So when S>0, i ranges as i:[A,Z) or i:[A,B=Z-U], or else (in reverse)
+// as i:(Z,A] or i:[B=Z+U,A].  It will become important to reason about this inclusive range [A,B] or [B,A].
 
 // Within the loop there may be many range checks.  Each such range check (R.C.) is of the form 0 <= i*K+L < R, where K
 // is a scale factor applied to the loop iteration variable i, and L is some offset; K, L, and R are loop-invariant.
-// Because R is never negative, this check can always be simplified to an unsigned check i*K+L <u R.
+// Because R is never negative (see below), this check can always be simplified to an unsigned check i*K+L <u R.
 
 // When a long loop over a 64-bit variable i (outer_iv) is decomposed into a series of shorter sub-loops over a 32-bit
-// variable j (inner_iv), j ranges over a shorter interval j:[0,Z_2), where the limit is chosen to prevent various cases
-// of 32-bit overflow (including multiplications j*K below).  In the sub-loop the logical value i is offset from j by a
-// 64-bit constant C, so i ranges in i:C+[0,Z_2).
+// variable j (inner_iv), j ranges over a shorter interval j:[0,B_2] or [0,Z_2) (assuming S > 0), where the limit is
+// chosen to prevent various cases of 32-bit overflow (including multiplications j*K below).  In the sub-loop the
+// logical value i is offset from j by a 64-bit constant C, so i ranges in i:C+[0,Z_2).
 
-// The union of all the C+[0,Z_2) ranges from the sub-loops must be identical to the whole range [A,B].  Assuming S>0,
-// the first C must be A itself, and the next C value is the previous C+Z_2.  In each sub-loop, j counts up from zero
-// and exits just before i=C+Z_2.
+// For S<0, j ranges (in reverse!) through j:[-|B_2|,0] or (-|Z_2|,0].  For either sign of S, we can say i=j+C and j
+// ranges through 32-bit ranges [A_2,B_2] or [B_2,A_2] (A_2=0 of course).
 
-// (N.B. If S<0 the formulas are different, because all the loops count downward.)
+// The disjoint union of all the C+[A_2,B_2] ranges from the sub-loops must be identical to the whole range [A,B].
+// Assuming S>0, the first C must be A itself, and the next C value is the previous C+B_2, plus S.  If |S|=1, the next
+// C value is also the previous C+Z_2.  In each sub-loop, j counts from j=A_2=0 and i counts from C+0 and exits at
+// j=B_2 (i=C+B_2), just before it gets to i=C+Z_2.  Both i and j count up (from C and 0) if S>0; otherwise they count
+// down (from C and 0 again).
 
 // Returning to range checks, we see that each i*K+L <u R expands to (C+j)*K+L <u R, or j*K+Q <u R, where Q=(C*K+L).
 // (Recall that K and L and R are loop-invariant scale, offset and range values for a particular R.C.)  This is still a
@@ -1194,65 +1192,104 @@ int PhaseIdealLoop::extract_long_range_checks(const IdealLoopTree* loop, jlong s
 
 // If 32-bit multiplication j*K might overflow, we adjust the sub-loop limit Z_2 closer to zero to reduce j's range.
 
-// For each R.C. j*K+Q <u32 R, the range of mathematical values of j*K+Q in the sub-loop is [Q_min, Q_max), where
-// Q_min=Q and Q_max=Z_2*K+Q.  Making the upper limit Q_max be exclusive helps it integrate correctly with the strict
-// comparisons against R and R_2.  Sometimes a very high R will be replaced by an R_2 derived from the more moderate
-// Q_max, and replacing one exclusive limit by another exclusive limit avoids off-by-one complexities.
+// For each R.C. j*K+Q <u32 R, the range of mathematical values of j*K+Q in the sub-loop is [Q_min, Q_max], where
+// Q_min=Q and Q_max=B_2*K+Q (if S>0 and K>0), Q_min=A_2*K+Q and Q_max=Q (if S<0 and K>0),
+// Q_min=B_2*K+Q and Q_max=Q if (S>0 and K<0), Q_min=Q and Q_max=A_2*K+Q (if S<0 and K<0)
 
-// N.B. If (S*K)<0 then the formulas for Q_min and Q_max may differ; the values may need to be swapped and adjusted to
-// the correct type of bound (inclusive or exclusive).
+// Note that the first R.C. value is always Q=(S*K>0 ? Q_min : Q_max).  Also Q_{min,max} = Q + {min,max}(A_2*K,B_2*K).
+// If S*K>0 then, as the loop iterations progress, each R.C. value i*K+L = j*K+Q goes up from Q=Q_min towards Q_max.
+// If S*K<0 then j*K+Q starts at Q=Q_max and goes down towards Q_min.
 
 // Case A: Some Negatives (but no overflow).
 // Number line:
 // |s64_min   .    .    .    0    .    .    .   s64_max|
 // |    .  Q_min..Q_max .    0    .    .    .     .    |  s64 negative
+// |    .     .    .    .    R=0  R<   R<   R<    R<   |  (against R values)
 // |    .     .    .  Q_min..0..Q_max  .    .     .    |  small mixed
+// |    .     .    .    .    R    R    R<   R<    R<   |  (against R values)
+//
+// R values which are out of range (>Q_max+1) are reduced to max(0,Q_max+1).  They are marked on the number line as R<.
 //
-// if Q_min <s64 0, then use this test:
-// j*K + s32_trunc(Q_min) <u32 clamp(R, 0, Q_max)
+// So, if Q_min <s64 0, then use this test:
+// j*K + s32_trunc(Q_min) <u32 clamp(R, 0, Q_max+1) if S*K>0 (R.C.E. steps upward)
+// j*K + s32_trunc(Q_max) <u32 clamp(R, 0, Q_max+1) if S*K<0 (R.C.E. steps downward)
+// Both formulas reduce to adding j*K to the 32-bit truncated value of the first R.C. expression value, Q:
+// j*K + s32_trunc(Q) <u32 clamp(R, 0, Q_max+1) for all S,K
 
-// If the 32-bit truncation loses information, no harm is done, since certainly the clamp also returns R_2=zero.
+// If the 32-bit truncation loses information, no harm is done, since certainly the clamp also will return R_2=zero.
 
 // Case B: No Negatives.
 // Number line:
 // |s64_min   .    .    .    0    .    .    .   s64_max|
 // |    .     .    .    .    0 Q_min..Q_max .     .    |  small positive
+// |    .     .    .    .    R>   R    R    R<    R<   |  (against R values)
 // |    .     .    .    .    0    . Q_min..Q_max  .    |  s64 positive
+// |    .     .    .    .    R>   R>   R    R     R<   |  (against R values)
+//
+// R values which are out of range (<Q_min or >Q_max+1) are reduced as marked: R> up to Q_min, R< down to Q_max+1.
+// Then the whole comparison is shifted left by Q_min, so it can take place at zero, which is a nice 32-bit value.
 //
-// if both Q_min, Q_max >=s64 0, then use this test:
-// j*K + 0 <u32 clamp(R, Q_min, Q_max) - Q_min
-// or equivalently:
-// j*K + 0 <u32 clamp(R - Q_min, 0, Q_max - Q_min)
+// So, if both Q_min, Q_max+1 >=s64 0, then use this test:
+// j*K + 0         <u32 clamp(R, Q_min, Q_max+1) - Q_min if S*K>0
+// More generally:
+// j*K + Q - Q_min <u32 clamp(R, Q_min, Q_max+1) - Q_min for all S,K
 
 // Case C: Overflow in the 64-bit domain
 // Number line:
 // |..Q_max-2^64   .    .    0    .    .    .   Q_min..|  s64 overflow
+// |    .     .    .    .    R>   R>   R>   R>    R    |  (against R values)
+//
+// In this case, Q_min >s64 Q_max+1, even though the mathematical values of Q_min and Q_max+1 are correctly ordered.
+// The formulas from the previous case can be used, except that the bad upper bound Q_max is replaced by max_jlong.
+// (In fact, we could use any replacement bound from R to max_jlong inclusive, as the input to the clamp function.)
+//
+// So if Q_min >=s64 0 but Q_max+1 <s64 0, use this test:
+// j*K + 0         <u32 clamp(R, Q_min, max_jlong) - Q_min if S*K>0
+// More generally:
+// j*K + Q - Q_min <u32 clamp(R, Q_min, max_jlong) - Q_min for all S,K
 //
-// if Q_min >=s64 0 but Q_max <s64 0, then use this test:
-// j*K + 0 <u32 clamp(R, Q_min, R) - Q_min
-// or equivalently:
-// j*K + 0 <u32 clamp(R - Q_min, 0, R - Q_min)
-// or also equivalently:
-// j*K + 0 <u32 max(0, R - Q_min)
+// Dropping the bad bound means only Q_min is used to reduce the range of R:
+// j*K + Q - Q_min <u32 max(Q_min, R) - Q_min for all S,K
 //
-// Here the clamp function is a simple 64-bit min/max:
-// clamp(X, L, H) := max(L, min(X, H))
+// Here the clamp function is a 64-bit min/max that reduces the dynamic range of its R operand to the required [L,H]:
+//     clamp(X, L, H) := max(L, min(X, H))
 // When degenerately L > H, it returns L not H.
 //
-// Tests above can be merged into a single one:
-// L_clamp = Q_min < 0 ? 0 : Q_min
-// H_clamp = Q_max < Q_min ? R : Q_max
-// j*K + Q_min - L_clamp <u32 clamp(R, L_clamp, H_clamp) - L_clamp
-// or equivalently:
-// j*K + Q_min - L_clamp <u32 clamp(R - L_clamp, 0, H_clamp - L_clamp)
+// All of the formulas above can be merged into a single one:
+//     L_clamp = Q_min < 0 ? 0 : Q_min        --whether and how far to left-shift
+//     H_clamp = Q_max+1 < Q_min ? max_jlong : Q_max+1
+//             = Q_max+1 < 0 && Q_min >= 0 ? max_jlong : Q_max+1
+//     Q_first = Q = (S*K>0 ? Q_min : Q_max) = (C*K+L)
+//     R_clamp = clamp(R, L_clamp, H_clamp)   --reduced dynamic range
+//     replacement R.C.:
+//       j*K + Q_first - L_clamp <u32 R_clamp - L_clamp
+//     or equivalently:
+//       j*K + L_2 <u32 R_2
+//     where
+//       L_2 = Q_first - L_clamp
+//       R_2 = R_clamp - L_clamp
+//
+// Note on why R is never negative:
+//
+// Various details of this transformation would break badly if R could be negative, so this transformation only
+// operates after obtaining hard evidence that R<0 is impossible.  For example, if R comes from a LoadRange node, we
+// know R cannot be negative.  For explicit checks (of both int and long) a proof is constructed in
+// inline_preconditions_checkIndex, which triggers an uncommon trap if R<0, then wraps R in a ConstraintCastNode with a
+// non-negative type.  Later on, when IdealLoopTree::is_range_check_if looks for an optimizable R.C., it checks that
+// the type of that R node is non-negative.  Any "wild" R node that could be negative is not treated as an optimizable
+// R.C., but R values from a.length and inside checkIndex are good to go.
 //
-// Readers may find the equivalent forms easier to reason about, but the forms given first generate better code.
-
 void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List &range_checks, Node* outer_phi,
                                                  Node* inner_iters_actual_int, Node* inner_phi,
                                                  Node* iv_add, LoopNode* inner_head) {
   Node* long_zero = _igvn.longcon(0);
   set_ctrl(long_zero, C->root());
+  Node* int_zero = _igvn.intcon(0);
+  set_ctrl(int_zero, this->C->root());
+  Node* long_one = _igvn.longcon(1);
+  set_ctrl(long_one, this->C->root());
+  Node* int_stride = _igvn.intcon(checked_cast<int>(stride_con));
+  set_ctrl(int_stride, this->C->root());
 
   for (uint i = 0; i < range_checks.size(); i++) {
     ProjNode* proj = range_checks.at(i)->as_Proj();
@@ -1266,8 +1303,8 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
       // could be shared and have already been taken care of
       continue;
     }
-    bool converted = false;
-    bool ok = is_scaled_iv_plus_offset(rc_cmp->in(1), iv_add, &scale, &offset, T_LONG, &converted);
+    bool short_scale = false;
+    bool ok = is_scaled_iv_plus_offset(rc_cmp->in(1), iv_add, T_LONG, &scale, &offset, &short_scale);
     assert(ok, "inconsistent: was tested before");
     Node* range = rc_cmp->in(2);
     Node* c = rc->in(0);
@@ -1279,33 +1316,33 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
 
     Node* L = offset;
 
-    if (converted) {
+    if (short_scale) {
       // This converts:
-      // i*K + L <u64 R
+      // (int)i*K + L <u64 R
       // with K an int into:
       // i*(long)K + L <u64 unsigned_min((long)max_jint + L + 1, R)
-      // to protect against an overflow of i*K
+      // to protect against an overflow of (int)i*K
       //
-      // Because if i*K overflows, there are K,L where:
-      // i*K + L <u64 R is false
-      // when
-      // i*(long)K is > (long)max_jint and < R
-      // and so i*(long)K + L <u64 R is true
-      // As a consequence simply converting:
-      // i*K + L <u64 R to i*(long)K + L <u64 R could cause incorrect execution
+      // Because if (int)i*K overflows, there are K,L where:
+      // (int)i*K + L <u64 R is false because (int)i*K+L overflows to a negative which becomes a huge u64 value.
+      // But if i*(long)K + L is >u64 (long)max_jint and still is <u64 R, then
+      // i*(long)K + L <u64 R is true.
+      //
+      // As a consequence simply converting i*K + L <u64 R to i*(long)K + L <u64 R could cause incorrect execution.
       //
       // It's always true that:
-      // i*K <u64 (long)max_jint + 1
-      // which implies i*K + L <u64 (long)max_jint + 1 + L
+      // (int)i*K <u64 (long)max_jint + 1
+      // which implies (int)i*K + L <u64 (long)max_jint + 1 + L
       // As a consequence:
       // i*(long)K + L <u64 unsigned_min((long)max_jint + L + 1, R)
       // is always false in case of overflow of i*K
       //
-      // Note, there are K,L where i*K overflows and
+      // Note, there are also K,L where i*K overflows and
       // i*K + L <u64 R is true, but
       // i*(long)K + L <u64 unsigned_min((long)max_jint + L + 1, R) is false
       // So this transformation could cause spurious deoptimizations and failed range check elimination
-      // (but not incorrect execution) for unlikely corner cases with overflow
+      // (but not incorrect execution) for unlikely corner cases with overflow.
+      // If this causes problems in practice, we could maybe direct excution to a post-loop, instead of deoptimizing.
       Node* max_jint_plus_one_long = _igvn.longcon((jlong)max_jint + 1);
       set_ctrl(max_jint_plus_one_long, C->root());
       Node* max_range = new AddLNode(max_jint_plus_one_long, L);
@@ -1315,26 +1352,38 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
     }
 
     Node* C = outer_phi;
-    Node* Z_2 = new ConvI2LNode(inner_iters_actual_int, TypeLong::LONG);
-    register_new_node(Z_2, entry_control);
 
     // Start with 64-bit values:
     //   i*K + L <u64 R
     //   (C+j)*K + L <u64 R
-    //   j*K + L_2 <u64 R    where L_2 = C*K+L
-    Node* L_2 = new MulLNode(C, K);
-    register_new_node(L_2, entry_control);
-    L_2 = new AddLNode(L_2, L);
-    register_new_node(L_2, entry_control);
-
-    // Compute endpoints of the range of values j*K.
-    //  Q_min = (j=0)*K + L_2;  Q_max = (j=Z_2)*K + L_2
-    Node* Q_min = L_2;
-    Node* Q_max = new MulLNode(Z_2, K);
+    //   j*K + Q <u64 R    where Q = Q_first = C*K+L
+    Node* Q_first = new MulLNode(C, K);
+    register_new_node(Q_first, entry_control);
+    Q_first = new AddLNode(Q_first, L);
+    register_new_node(Q_first, entry_control);
+
+    // Compute endpoints of the range of values j*K + Q.
+    //  Q_min = (j=0)*K + Q;  Q_max = (j=B_2)*K + Q
+    Node* Q_min = Q_first;
+
+    // Compute the exact ending value B_2 (which is really A_2 if S < 0)
+    Node* B_2 = new LoopLimitNode(this->C, int_zero, inner_iters_actual_int, int_stride);
+    register_new_node(B_2, entry_control);
+    B_2 = new SubINode(B_2, int_stride);
+    register_new_node(B_2, entry_control);
+    B_2 = new ConvI2LNode(B_2);
+    register_new_node(B_2, entry_control);
+
+    Node* Q_max = new MulLNode(B_2, K);
     register_new_node(Q_max, entry_control);
-    Q_max = new AddLNode(Q_max, L_2);
+    Q_max = new AddLNode(Q_max, Q_first);
     register_new_node(Q_max, entry_control);
 
+    if (scale * stride_con < 0) {
+      swap(Q_min, Q_max);
+    }
+    // Now, mathematically, Q_max > Q_min, and they are close enough so that (Q_max-Q_min) fits in 32 bits.
+
     // L_clamp = Q_min < 0 ? 0 : Q_min
     Node* Q_min_cmp = new CmpLNode(Q_min, long_zero);
     register_new_node(Q_min_cmp, entry_control);
@@ -1342,38 +1391,53 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
     register_new_node(Q_min_bool, entry_control);
     Node* L_clamp = new CMoveLNode(Q_min_bool, Q_min, long_zero, TypeLong::LONG);
     register_new_node(L_clamp, entry_control);
+    // (This could also be coded bitwise as L_clamp = Q_min & ~(Q_min>>63).)
+
+    Node* Q_max_plus_one = new AddLNode(Q_max, long_one);
+    register_new_node(Q_max_plus_one, entry_control);
 
-    // H_clamp = Q_max < Q_min ? R : Q_max
-    Node* Q_max_cmp = new CmpLNode(Q_max, Q_min);
+    // H_clamp = Q_max+1 < Q_min ? max_jlong : Q_max+1
+    // (Because Q_min and Q_max are close, the overflow check could also be encoded as Q_max+1 < 0 & Q_min >= 0.)
+    Node* max_jlong_long = _igvn.longcon(max_jlong);
+    set_ctrl(max_jlong_long, this->C->root());
+    Node* Q_max_cmp = new CmpLNode(Q_max_plus_one, Q_min);
     register_new_node(Q_max_cmp, entry_control);
     Node* Q_max_bool = new BoolNode(Q_max_cmp, BoolTest::lt);
     register_new_node(Q_max_bool, entry_control);
-    Node* H_clamp = new CMoveLNode(Q_max_bool, Q_max, R, TypeLong::LONG);
+    Node* H_clamp = new CMoveLNode(Q_max_bool, Q_max_plus_one, max_jlong_long, TypeLong::LONG);
     register_new_node(H_clamp, entry_control);
+    // (This could also be coded bitwise as H_clamp = ((Q_max+1)<<1 | M)>>>1 where M = (Q_max+1)>>63 & ~Q_min>>63.)
 
     // R_2 = clamp(R, L_clamp, H_clamp) - L_clamp
-    // that is: R_2 = clamp(R, L_clamp, H_clamp) if Q_min < 0
-    // or:      R_2 = clamp(R, L_clamp, H_clamp) - Q_min if Q_min > 0
+    // that is:  R_2 = clamp(R, L_clamp=0, H_clamp=Q_max)      if Q_min < 0
+    // or else:  R_2 = clamp(R, L_clamp,   H_clamp) - Q_min    if Q_min >= 0
+    // and also: R_2 = clamp(R, L_clamp,   Q_max+1) - L_clamp  if Q_min < Q_max+1 (no overflow)
+    // or else:  R_2 = clamp(R, L_clamp, *no limit*)- L_clamp  if Q_max+1 < Q_min (overflow)
     Node* R_2 = clamp(R, L_clamp, H_clamp);
     R_2 = new SubLNode(R_2, L_clamp);
     register_new_node(R_2, entry_control);
     R_2 = new ConvL2INode(R_2, TypeInt::POS);
     register_new_node(R_2, entry_control);
 
-    // Q = Q_min - L_clamp
-    // that is: Q = Q_min - 0 if Q_min < 0
-    // or:      Q = Q_min - Q_min = 0 if Q_min > 0
-    Node* Q = new SubLNode(Q_min, L_clamp);
-    register_new_node(Q, entry_control);
-    Q = new ConvL2INode(Q, TypeInt::INT);
-    register_new_node(Q, entry_control);
+    // L_2 = Q_first - L_clamp
+    // We are subtracting L_clamp from both sides of the <u32 comparison.
+    // If S*K>0, then Q_first == 0 and the R.C. expression at -L_clamp and steps upward to Q_max-L_clamp.
+    // If S*K<0, then Q_first != 0 and the R.C. expression starts high and steps downward to Q_min-L_clamp.
+    Node* L_2 = new SubLNode(Q_first, L_clamp);
+    register_new_node(L_2, entry_control);
+    L_2 = new ConvL2INode(L_2, TypeInt::INT);
+    register_new_node(L_2, entry_control);
 
-    // Transform the range check
+    // Transform the range check using the computed values L_2/R_2
+    // from:   i*K + L   <u64 R
+    // to:     j*K + L_2 <u32 R_2
+    // that is:
+    //   (j*K + Q_first) - L_clamp <u32 clamp(R, L_clamp, H_clamp) - L_clamp
     K = _igvn.intcon(checked_cast<int>(scale));
     set_ctrl(K, this->C->root());
     Node* scaled_iv = new MulINode(inner_phi, K);
     register_new_node(scaled_iv, c);
-    Node* scaled_iv_plus_offset = scaled_iv_plus_offset = new AddINode(scaled_iv, Q);
+    Node* scaled_iv_plus_offset = scaled_iv_plus_offset = new AddINode(scaled_iv, L_2);
     register_new_node(scaled_iv_plus_offset, c);
 
     Node* new_rc_cmp = new CmpUNode(scaled_iv_plus_offset, R_2);
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 9b9a52f80af..606d9c46331 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1265,15 +1265,15 @@ public:
   void mark_reductions( IdealLoopTree *loop );
 
   // Return true if exp is a constant times an induction var
-  bool is_scaled_iv(Node* exp, Node* iv, jlong* p_scale, BasicType bt, bool* converted);
+  bool is_scaled_iv(Node* exp, Node* iv, BasicType bt, jlong* p_scale, bool* p_short_scale, int depth = 0);
 
   bool is_iv(Node* exp, Node* iv, BasicType bt);
 
   // Return true if exp is a scaled induction var plus (or minus) constant
-  bool is_scaled_iv_plus_offset(Node* exp, Node* iv, jlong* p_scale, Node** p_offset, BasicType bt, bool* converted = NULL, int depth = 0);
+  bool is_scaled_iv_plus_offset(Node* exp, Node* iv, BasicType bt, jlong* p_scale, Node** p_offset, bool* p_short_scale = NULL, int depth = 0);
   bool is_scaled_iv_plus_offset(Node* exp, Node* iv, int* p_scale, Node** p_offset) {
     jlong long_scale;
-    if (is_scaled_iv_plus_offset(exp, iv, &long_scale, p_offset, T_INT)) {
+    if (is_scaled_iv_plus_offset(exp, iv, T_INT, &long_scale, p_offset)) {
       int int_scale = checked_cast<int>(long_scale);
       if (p_scale != NULL) {
         *p_scale = int_scale;
@@ -1282,6 +1282,12 @@ public:
     }
     return false;
   }
+  // Helper for finding more complex matches to is_scaled_iv_plus_offset.
+  bool is_scaled_iv_plus_extra_offset(Node* exp1, Node* offset2, Node* iv,
+                                      BasicType bt,
+                                      jlong* p_scale, Node** p_offset,
+                                      bool* p_short_scale, int depth);
+
 
   // Enum to determine the action to be performed in create_new_if_for_predicate() when processing phis of UCT regions.
   enum class UnswitchingAction {
@@ -1658,6 +1664,7 @@ public:
 
   void strip_mined_nest_back_to_counted_loop(IdealLoopTree* loop, const BaseCountedLoopNode* head, Node* back_control,
                                              IfNode*&exit_test, SafePointNode*&safepoint);
+
   void push_pinned_nodes_thru_region(IfNode* dom_if, Node* region);
 
   bool try_merge_identical_ifs(Node* n);
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 6a03a080c82..748db286710 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1153,7 +1153,12 @@ public:
 
   jlong get_integer_as_long(BasicType bt) const {
     const TypeInteger* t = find_integer_type(bt);
-    guarantee(t != NULL, "must be con");
+    guarantee(t != NULL && t->is_con(), "must be con");
+    return t->get_con_as_long(bt);
+  }
+  jlong find_integer_as_long(BasicType bt, jlong value_if_unknown) const {
+    const TypeInteger* t = find_integer_type(bt);
+    if (t == NULL || !t->is_con())  return value_if_unknown;
     return t->get_con_as_long(bt);
   }
   const TypePtr* get_ptr_type() const;
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java b/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
index 4fd677ab4c0..e84f3062f14 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
@@ -96,4 +96,150 @@ public class TestLongRangeChecks {
     private void testStridePosScalePosInIntLoop2_runner() {
         testStridePosScalePosInIntLoop2(0, 100, 200, 0);
     }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1"})
+    @IR(failOn = { IRNode.COUNTEDLOOP})
+    public static void testStrideNegScaleNeg(long start, long stop, long length, long offset) {
+        final long scale = -1;
+        final long stride = 1;
+        for (long i = stop; i > start; i -= stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStrideNegScaleNeg")
+    private void testStrideNegScaleNeg_runner() {
+        testStrideNegScaleNeg(0, 100, 100, 100);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1" })
+    @IR(failOn = { IRNode.COUNTEDLOOP })
+    public static void testStrideNegScaleNegInIntLoop1(int start, int stop, long length, long offset) {
+        final long scale = -2;
+        final int stride = 1;
+
+        for (int i = stop; i > start; i -= stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStrideNegScaleNegInIntLoop1")
+    private void testStrideNegScaleNegInIntLoop1_runner() {
+        testStrideNegScaleNegInIntLoop1(0, 100, 200, 200);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1" })
+    @IR(failOn = { IRNode.COUNTEDLOOP })
+    public static void testStrideNegScaleNegInIntLoop2(int start, int stop, long length, long offset) {
+        final int scale = -2;
+        final int stride = 1;
+
+        for (int i = stop; i > start; i -= stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStrideNegScaleNegInIntLoop2")
+    private void testStrideNegScaleNegInIntLoop2_runner() {
+        testStrideNegScaleNegInIntLoop2(0, 100, 200, 200);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1"})
+    @IR(failOn = { IRNode.COUNTEDLOOP})
+    public static void testStrideNegScalePos(long start, long stop, long length, long offset) {
+        final long scale = 1;
+        final long stride = 1;
+        for (long i = stop-1; i >= start; i -= stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStrideNegScalePos")
+    private void testStrideNegScalePos_runner() {
+        testStrideNegScalePos(0, 100, 100, 0);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1" })
+    @IR(failOn = { IRNode.COUNTEDLOOP })
+    public static void testStrideNegScalePosInIntLoop1(int start, int stop, long length, long offset) {
+        final long scale = 2;
+        final int stride = 1;
+        for (int i = stop-1; i >= start; i -= stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStrideNegScalePosInIntLoop1")
+    private void testStrideNegScalePosInIntLoop1_runner() {
+        testStrideNegScalePosInIntLoop1(0, 100, 200, 0);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1" })
+    @IR(failOn = { IRNode.COUNTEDLOOP })
+    public static void testStrideNegScalePosInIntLoop2(int start, int stop, long length, long offset) {
+        final int scale = 2;
+        final int stride = 1;
+        for (int i = stop-1; i >= start; i -= stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStrideNegScalePosInIntLoop2")
+    private void testStrideNegScalePosInIntLoop2_runner() {
+        testStrideNegScalePosInIntLoop1(0, 100, 200, 0);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1"})
+    @IR(failOn = { IRNode.COUNTEDLOOP})
+    public static void testStridePosScaleNeg(long start, long stop, long length, long offset) {
+        final long scale = -1;
+        final long stride = 1;
+        for (long i = start; i < stop; i += stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStridePosScaleNeg")
+    private void testStridePosScaleNeg_runner() {
+        testStridePosScaleNeg(0, 100, 100, 99);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1"})
+    @IR(failOn = { IRNode.COUNTEDLOOP})
+    public static void testStridePosScaleNegInIntLoop1(int start, int stop, long length, long offset) {
+        final long scale = -2;
+        final int stride = 1;
+        for (int i = start; i < stop; i += stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStridePosScaleNegInIntLoop1")
+    private void testStridePosScaleNegInIntLoop1_runner() {
+        testStridePosScaleNegInIntLoop1(0, 100, 200, 198);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOOP, "1"})
+    @IR(failOn = { IRNode.COUNTEDLOOP})
+    public static void testStridePosScaleNegInIntLoop2(int start, int stop, long length, long offset) {
+        final int scale = -2;
+        final int stride = 1;
+        for (int i = start; i < stop; i += stride) {
+            Objects.checkIndex(scale * i + offset, length);
+        }
+    }
+
+    @Run(test = "testStridePosScaleNegInIntLoop2")
+    private void testStridePosScaleNegInIntLoop2_runner() {
+        testStridePosScaleNegInIntLoop1(0, 100, 200, 198);
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/rangechecks/TestLongRangeCheck.java b/test/hotspot/jtreg/compiler/rangechecks/TestLongRangeCheck.java
index d56d19278cf..1cd04523ba7 100644
--- a/test/hotspot/jtreg/compiler/rangechecks/TestLongRangeCheck.java
+++ b/test/hotspot/jtreg/compiler/rangechecks/TestLongRangeCheck.java
@@ -127,6 +127,73 @@ public class TestLongRangeCheck {
         assertIsNotCompiled(m);
     }
 
+    private static void testOverflow(String method, long start, long stop, long length, long offset0, long offset1) throws Exception {
+        Method m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod(method, long.class, long.class, long.class, long.class);
+        m.invoke(null, start, stop, length, offset0);
+        compile(m);
+
+        m.invoke(null, start, stop, length, offset0);
+        assertIsCompiled(m);
+        try {
+            m.invoke(null, start, stop, length, offset1);
+            throw new RuntimeException("should have thrown");
+        } catch(InvocationTargetException e) {
+            if (!(e.getCause() instanceof IndexOutOfBoundsException)) {
+                throw new RuntimeException("unexpected exception");
+            }
+        }
+        assertIsNotCompiled(m);
+    }
+
+    private static void testConditional(String method, long start, long stop, long length, long offset0, long offset1, long start1, long stop1) throws Exception {
+        Method m;
+
+        if (start1 != start) {
+            m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod(method, long.class, long.class, long.class, long.class, long.class, long.class);
+            m.invoke(null, start, stop, length, offset0, start, stop);
+            compile(m);
+
+            m.invoke(null, start, stop, length, offset0, start, stop);
+            assertIsCompiled(m);
+            try {
+                m.invoke(null, start, stop, length, offset1, start1-1, stop1);
+                throw new RuntimeException("should have thrown");
+            } catch(InvocationTargetException e) {
+                if (!(e.getCause() instanceof IndexOutOfBoundsException)) {
+                    throw new RuntimeException("unexpected exception");
+                }
+            }
+            assertIsNotCompiled(m);
+        }
+
+        if (stop1 != stop) {
+            m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod(method, long.class, long.class, long.class, long.class, long.class, long.class);
+            m.invoke(null, start, stop, length, offset0, start, stop);
+            compile(m);
+
+            m.invoke(null, start, stop, length, offset0, start, stop);
+            assertIsCompiled(m);
+            try {
+                m.invoke(null, start, stop, length, offset1, start1, stop1+1);
+                throw new RuntimeException("should have thrown");
+            } catch(InvocationTargetException e) {
+                if (!(e.getCause() instanceof IndexOutOfBoundsException)) {
+                    throw new RuntimeException("unexpected exception");
+                }
+            }
+            assertIsNotCompiled(m);
+        }
+
+        m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod(method, long.class, long.class, long.class, long.class, long.class, long.class);
+        m.invoke(null, start, stop, length, offset0, start, stop);
+        compile(m);
+
+        m.invoke(null, start, stop, length, offset0, start, stop);
+        assertIsCompiled(m);
+
+        m.invoke(null, start, stop, length, offset1, start1, stop1);
+        assertIsCompiled(m);
+    }
 
     public static void main(String[] args) throws Exception {
 
@@ -157,42 +224,20 @@ public class TestLongRangeCheck {
         test("testStridePosNotOneScaleNeg", -v, v, v * 2, v-1);
 
         // offset causes overflow
-
-        {
-            Method m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod("testStridePosScalePos", long.class, long.class, long.class, long.class);
-            m.invoke(null, 0, 100, 100, 0);
-            compile(m);
-
-            m.invoke(null, 0, 100, 100, 0);
-            assertIsCompiled(m);
-            try {
-                m.invoke(null, 0, 100, 100, Long.MAX_VALUE - 50);
-                throw new RuntimeException("should have thrown");
-            } catch(InvocationTargetException e) {
-                if (!(e.getCause() instanceof IndexOutOfBoundsException)) {
-                    throw new RuntimeException("unexpected exception");
-                }
-            }
-            assertIsNotCompiled(m);
-        }
+        testOverflow("testStridePosScalePos", 0, 100, 100, 0, Long.MAX_VALUE - 50);
+        testOverflow("testStrideNegScaleNeg", 0, 100, 100, 100, Long.MIN_VALUE + 50);
+        testOverflow("testStrideNegScalePos", 0, 100, 100, 0, Long.MAX_VALUE - 50);
+        testOverflow("testStridePosScaleNeg", 0, 100, 100, 99, Long.MIN_VALUE + 50);
 
         // no spurious deopt if the range check doesn't fail because not executed
-        {
-            Method m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod("testStridePosScalePosConditional", long.class, long.class, long.class, long.class, long.class, long.class);
-            m.invoke(null, 0, 100, 100, 0, 0, 100);
-            compile(m);
-
-            m.invoke(null, 0, 100, 100, -50, 50, 100);
-            assertIsCompiled(m);
-        }
-        {
-            Method m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod("testStridePosScalePosConditional", long.class, long.class, long.class, long.class, long.class, long.class);
-            m.invoke(null, 0, 100, 100, 0, 0, 100);
-            compile(m);
-
-            m.invoke(null, 0, 100, Long.MAX_VALUE, Long.MAX_VALUE - 50, 0, 50);
-            assertIsCompiled(m);
-        }
+        testConditional("testStridePosScalePosConditional", 0, 100, 100, 0, -50, 50, 100);
+        testConditional("testStridePosScalePosConditional", 0, 100, Long.MAX_VALUE, 0, Long.MAX_VALUE - 50, 0, 50);
+        testConditional("testStrideNegScaleNegConditional", 0, 100, 100, 100, 50, 0, 51);
+        testConditional("testStrideNegScaleNegConditional", 0, 100, Long.MAX_VALUE, 100, Long.MIN_VALUE + 50, 52, 100);
+        testConditional("testStrideNegScalePosConditional", 0, 100, 100, 0, -50, 50, 100);
+        testConditional("testStrideNegScalePosConditional", 0, 100, Long.MAX_VALUE, 100, Long.MAX_VALUE - 50, 0, 50);
+        testConditional("testStridePosScaleNegConditional", 0, 100, 100, 99, 50, 0, 51);
+        testConditional("testStridePosScaleNegConditional", 0, 100, Long.MAX_VALUE, 99, Long.MIN_VALUE + 50, 52, 100);
 
         test("testStridePosScalePosInIntLoop", 0, 100, 100, 0);
 
@@ -221,40 +266,19 @@ public class TestLongRangeCheck {
         test("testStridePosNotOneScaleNegInIntLoop", -v, v, v * 4, 2 * v - 1);
 
         // offset causes overflow
-        {
-            Method m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod("testStridePosScalePosInIntLoop", long.class, long.class, long.class, long.class);
-            m.invoke(null, 0, 100, 100, 0);
-            compile(m);
-
-            m.invoke(null, 0, 100, 100, 0);
-            assertIsCompiled(m);
-            try {
-                m.invoke(null, 0, 100, 100, Long.MAX_VALUE - 50);
-                throw new RuntimeException("should have thrown");
-            } catch(InvocationTargetException e) {
-                if (!(e.getCause() instanceof IndexOutOfBoundsException)) {
-                    throw new RuntimeException("unexpected exception");
-                }
-            }
-            assertIsNotCompiled(m);
-        }
+        testOverflow("testStridePosScalePosInIntLoop", 0, 100, 100, 0, Long.MAX_VALUE - 50);
+        testOverflow("testStrideNegScaleNegInIntLoop", 0, 100, 100, 100, Long.MIN_VALUE + 50);
+        testOverflow("testStrideNegScalePosInIntLoop", 0, 100, 100, 0, Long.MAX_VALUE - 50);
+        testOverflow("testStridePosScaleNegInIntLoop", 0, 100, 100, 99, Long.MIN_VALUE + 50);
         // no spurious deopt if the range check doesn't fail because not executed
-        {
-            Method m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod("testStridePosScalePosConditional", long.class, long.class, long.class, long.class, long.class, long.class);
-            m.invoke(null, 0, 100, 100, 0, 0, 100);
-            compile(m);
-
-            m.invoke(null, 0, 100, 100, -50, 50, 100);
-            assertIsCompiled(m);
-        }
-        {
-            Method m = newClassLoader().loadClass("TestLongRangeCheck").getDeclaredMethod("testStridePosScalePosConditional", long.class, long.class, long.class, long.class, long.class, long.class);
-            m.invoke(null, 0, 100, 100, 0, 0, 100);
-            compile(m);
-
-            m.invoke(null, 0, 100, Long.MAX_VALUE, Long.MAX_VALUE - 50, 0, 50);
-            assertIsCompiled(m);
-        }
+        testConditional("testStridePosScalePosConditionalInIntLoop", 0, 100, 100, 0, -50, 50, 100);
+        testConditional("testStridePosScalePosConditionalInIntLoop", 0, 100, Long.MAX_VALUE, 0, Long.MAX_VALUE - 50, 0, 50);
+        testConditional("testStrideNegScaleNegConditionalInIntLoop", 0, 100, 100, 100, 50, 0, 51);
+        testConditional("testStrideNegScaleNegConditionalInIntLoop", 0, 100, Long.MAX_VALUE, 100, Long.MIN_VALUE + 50, 52, 100);
+        testConditional("testStrideNegScalePosConditionalInIntLoop", 0, 100, 100, 0, -50, 50, 100);
+        testConditional("testStrideNegScalePosConditionalInIntLoop", 0, 100, Long.MAX_VALUE, 100, Long.MAX_VALUE - 50, 0, 50);
+        testConditional("testStridePosScaleNegConditionalInIntLoop", 0, 100, 100, 99, 50, 0, 51);
+        testConditional("testStridePosScaleNegConditionalInIntLoop", 0, 100, Long.MAX_VALUE, 99, Long.MIN_VALUE + 50, 52, 100);
 
         test("testStridePosScalePosNotOneInIntLoop2", 0, 100, 1090, 0);
 
@@ -411,6 +435,36 @@ public class TestLongRangeCheck {
         }
     }
 
+    public static void testStrideNegScaleNegConditional(long start, long stop, long length, long offset, long start2, long stop2) {
+        final long scale = -1;
+        final long stride = 1;
+        for (long i = stop; i > start; i -= stride) {
+            if (i >= start2 && i < stop2) {
+                Preconditions.checkIndex(scale * i + offset, length, null);
+            }
+        }
+    }
+
+    public static void testStrideNegScalePosConditional(long start, long stop, long length, long offset, long start2, long stop2) {
+        final long scale = 1;
+        final long stride = 1;
+        for (long i = stop-1; i >= start; i -= stride) {
+            if (i >= start2 && i < stop2) {
+                Preconditions.checkIndex(scale * i + offset, length, null);
+            }
+        }
+    }
+
+    public static void testStridePosScaleNegConditional(long start, long stop, long length, long offset, long start2, long stop2) {
+        final long scale = -1;
+        final long stride = 1;
+        for (long i = start; i < stop; i += stride) {
+            if (i >= start2 && i < stop2) {
+                Preconditions.checkIndex(scale * i + offset, length, null);
+            }
+        }
+    }
+
     private static void checkInputs(long... inputs) {
         for (int i = 0; i < inputs.length; i++) {
             if ((long)((int)inputs[i]) != inputs[i]) {
@@ -529,7 +583,6 @@ public class TestLongRangeCheck {
 
     public static void testStridePosScalePosConditionalInIntLoop(long start, long stop, long length, long offset, long start2, long stop2) {
         checkInputs(start, stop, start2, stop2);
-        Preconditions.checkIndex(0, length, null);
         final long scale = 1;
         final int stride = 1;
         for (int i = (int)start; i < (int)stop; i += stride) {
@@ -539,6 +592,39 @@ public class TestLongRangeCheck {
         }
     }
 
+    public static void testStrideNegScaleNegConditionalInIntLoop(long start, long stop, long length, long offset, long start2, long stop2) {
+        checkInputs(start, stop, start2, stop2);
+        final long scale = -1;
+        final int stride = 1;
+        for (int i = (int)stop; i > (int)start; i -= stride) {
+            if (i >= (int)start2 && i < (int)stop2) {
+                Preconditions.checkIndex(scale * i + offset, length, null);
+            }
+        }
+    }
+
+    public static void testStrideNegScalePosConditionalInIntLoop(long start, long stop, long length, long offset, long start2, long stop2) {
+        checkInputs(start, stop, start2, stop2);
+        final long scale = 1;
+        final int stride = 1;
+        for (int i = (int)(stop-1); i >= (int)start; i -= stride) {
+            if (i >= (int)start2 && i < (int)stop2) {
+                Preconditions.checkIndex(scale * i + offset, length, null);
+            }
+        }
+    }
+
+    public static void testStridePosScaleNegConditionalInIntLoop(long start, long stop, long length, long offset, long start2, long stop2) {
+        checkInputs(start, stop, start2, stop2);
+        final long scale = -1;
+        final int stride = 1;
+        for (int i = (int)start; i < (int)stop; i += stride) {
+            if (i >= (int)start2 && i < (int)stop2) {
+                Preconditions.checkIndex(scale * i + offset, length, null);
+            }
+        }
+    }
+
     public static void testStridePosScalePosNotOneInIntLoop2(long start, long stop, long length, long offset) {
         checkInputs(start, stop);
         final int scale = 11;
-- 
GitLab


From 7194097bcae7e0fd32488834277bb18cb97cea8b Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 7 Mar 2022 17:35:21 +0000
Subject: [PATCH 014/345] 8252577: HotSpot Style Guide should link to
 One-True-Brace-Style description

Reviewed-by: stuefe, dcubed, dholmes
---
 doc/hotspot-style.html | 2 +-
 doc/hotspot-style.md   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index eb0c8de2ae5..75211788c6b 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -153,7 +153,7 @@
 <h3 id="whitespace">Whitespace</h3>
 <ul>
 <li><p>In general, don't change whitespace unless it improves readability or consistency. Gratuitous whitespace changes will make integrations and backports more difficult.</p></li>
-<li><p>Use One-True-Brace-Style. The opening brace for a function or class is normally at the end of the line; it is sometimes moved to the beginning of the next line for emphasis. Substatements are enclosed in braces, even if there is only a single statement. Extremely simple one-line statements may drop braces around a substatement.</p></li>
+<li><p>Use <a href="https://en.wikipedia.org/wiki/Indentation_style#Variant:_1TBS_(OTBS)">One-True-Brace-Style</a>. The opening brace for a function or class is normally at the end of the line; it is sometimes moved to the beginning of the next line for emphasis. Substatements are enclosed in braces, even if there is only a single statement. Extremely simple one-line statements may drop braces around a substatement.</p></li>
 <li><p>Indentation levels are two columns.</p></li>
 <li><p>There is no hard line length limit. That said, bear in mind that excessively long lines can cause difficulties. Some people like to have multiple side-by-side windows in their editors, and long lines may force them to choose among unpleasant options. They can use wide windows, reducing the number that can fit across the screen, and wasting a lot of screen real estate because most lines are not that long. Alternatively, they can have more windows across the screen, with long lines wrapping (or worse, requiring scrolling to see in their entirety), which is harder to read. Similar issues exist for side-by-side code reviews.</p></li>
 <li><p>Tabs are not allowed in code. Set your editor accordingly.<br> (Emacs: <code>(setq-default indent-tabs-mode nil)</code>.)</p></li>
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 4efce0301b2..4720c9f558c 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -294,7 +294,9 @@ well.
 or consistency.  Gratuitous whitespace changes will make integrations
 and backports more difficult.
 
-* Use One-True-Brace-Style. The opening brace for a function or class
+* Use [One-True-Brace-Style](
+https://en.wikipedia.org/wiki/Indentation_style#Variant:_1TBS_(OTBS)).
+The opening brace for a function or class
 is normally at the end of the line; it is sometimes moved to the
 beginning of the next line for emphasis.  Substatements are enclosed
 in braces, even if there is only a single statement.  Extremely simple
-- 
GitLab


From 1faa5c8092f8baec3ca08ed059653876ec46db46 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 7 Mar 2022 17:52:04 +0000
Subject: [PATCH 015/345] 8282686: Add constructors taking a cause to
 SocketException

Reviewed-by: alanb, xuelei, lancea, dfuchs
---
 .../classes/java/net/DatagramSocket.java      |  6 +--
 .../classes/java/net/SocketException.java     | 25 ++++++++-
 .../classes/javax/net/SocketFactory.java      | 10 ++--
 .../javax/net/ssl/SSLServerSocketFactory.java |  3 +-
 .../javax/net/ssl/SSLSocketFactory.java       |  3 +-
 .../sun/nio/ch/DatagramSocketAdaptor.java     | 14 ++---
 .../TestSocketExceptionCtor.java              | 54 +++++++++++++++++++
 7 files changed, 90 insertions(+), 25 deletions(-)
 create mode 100644 test/jdk/java/net/SocketException/TestSocketExceptionCtor.java

diff --git a/src/java.base/share/classes/java/net/DatagramSocket.java b/src/java.base/share/classes/java/net/DatagramSocket.java
index 114794be1f9..1833dd2470d 100644
--- a/src/java.base/share/classes/java/net/DatagramSocket.java
+++ b/src/java.base/share/classes/java/net/DatagramSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1353,9 +1353,7 @@ public class DatagramSocket implements java.io.Closeable {
         Throwable cause = e.getCause();
         if (cause instanceof SocketException)
             return (SocketException) cause;
-        SocketException se = new SocketException(e.getMessage());
-        se.initCause(e);
-        return se;
+        return new SocketException(e.getMessage(), e);
     }
 
     /**
diff --git a/src/java.base/share/classes/java/net/SocketException.java b/src/java.base/share/classes/java/net/SocketException.java
index f4a412258df..7b738249923 100644
--- a/src/java.base/share/classes/java/net/SocketException.java
+++ b/src/java.base/share/classes/java/net/SocketException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,4 +52,27 @@ public class SocketException extends IOException {
      */
     public SocketException() {
     }
+
+    /**
+     * Constructs a new {@code SocketException} with the
+     * specified detail message and cause.
+     *
+     * @param msg the detail message.
+     * @param cause the cause
+     * @since 19
+     */
+    public SocketException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+
+    /**
+     * Constructs a new {@code SocketException} with the
+     * specified cause.
+     *
+     * @param cause the cause
+     * @since 19
+     */
+    public SocketException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/src/java.base/share/classes/javax/net/SocketFactory.java b/src/java.base/share/classes/javax/net/SocketFactory.java
index 5d56483b9de..285167500b8 100644
--- a/src/java.base/share/classes/javax/net/SocketFactory.java
+++ b/src/java.base/share/classes/javax/net/SocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,12 +120,8 @@ public abstract class SocketFactory
         // The Exception is used by HttpsClient to signal that
         // unconnected sockets have not been implemented.
         //
-        UnsupportedOperationException uop = new
-                UnsupportedOperationException();
-        SocketException se =  new SocketException(
-                "Unconnected sockets not implemented");
-        se.initCause(uop);
-        throw se;
+        throw new SocketException("Unconnected sockets not implemented",
+                                  new UnsupportedOperationException());
     }
 
 
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java
index 68c09c02a6f..22f64f98f29 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java
@@ -173,8 +173,7 @@ class DefaultSSLServerSocketFactory extends SSLServerSocketFactory {
     }
 
     private ServerSocket throwException() throws SocketException {
-        throw (SocketException)
-            new SocketException(reason.toString()).initCause(reason);
+        throw new SocketException(reason.toString(), reason);
     }
 
     @Override
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java
index dd10f422f3e..6a01687dc56 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java
@@ -263,8 +263,7 @@ class DefaultSSLSocketFactory extends SSLSocketFactory
     }
 
     private Socket throwException() throws SocketException {
-        throw (SocketException)
-            new SocketException(reason.toString()).initCause(reason);
+        throw new SocketException(reason.toString(), reason);
     }
 
     @Override
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 abe33000cda..d962cdf3693 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -219,9 +219,7 @@ public class DatagramSocketAdaptor
             } catch (AlreadyConnectedException e) {
                 throw new IllegalArgumentException("Connected and packet address differ");
             } catch (ClosedChannelException e) {
-                var exc = new SocketException("Socket closed");
-                exc.initCause(e);
-                throw exc;
+                throw new SocketException("Socket closed", e);
             }
         } finally {
             if (bb != null) {
@@ -249,9 +247,7 @@ public class DatagramSocketAdaptor
                 p.setSocketAddress(sender);
             }
         } catch (ClosedChannelException e) {
-            var exc = new SocketException("Socket closed");
-            exc.initCause(e);
-            throw exc;
+            throw new SocketException("Socket closed", e);
         } finally {
             Util.offerFirstTemporaryDirectBuffer(bb);
         }
@@ -481,7 +477,7 @@ public class DatagramSocketAdaptor
             joinGroup(new InetSocketAddress(group, 0), null);
         } catch (IllegalArgumentException iae) {
             // 1-arg joinGroup does not specify IllegalArgumentException
-            throw (SocketException) new SocketException("joinGroup failed").initCause(iae);
+            throw new SocketException("joinGroup failed", iae);
         }
     }
 
@@ -493,7 +489,7 @@ public class DatagramSocketAdaptor
             leaveGroup(new InetSocketAddress(group, 0), null);
         } catch (IllegalArgumentException iae) {
             // 1-arg leaveGroup does not specify IllegalArgumentException
-            throw (SocketException) new SocketException("leaveGroup failed").initCause(iae);
+            throw new SocketException("leaveGroup failed", iae);
         }
     }
 
diff --git a/test/jdk/java/net/SocketException/TestSocketExceptionCtor.java b/test/jdk/java/net/SocketException/TestSocketExceptionCtor.java
new file mode 100644
index 00000000000..18611924bec
--- /dev/null
+++ b/test/jdk/java/net/SocketException/TestSocketExceptionCtor.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282686
+ * @summary Verify cause and message handling of SocketException
+ */
+import java.net.SocketException;
+import java.util.Objects;
+
+public class TestSocketExceptionCtor {
+    public static void main(String... args) {
+        String message = "message";
+        Throwable cause = new RuntimeException();
+
+        testException(new SocketException(cause), cause.toString(), cause);
+        testException(new SocketException(message, cause), message, cause);
+    }
+
+    private static void testException(SocketException se,
+                                      String expectedMessage,
+                                      Throwable expectedCause) {
+        var message = se.getMessage();
+        if (!Objects.equals(message, expectedMessage)) {
+            throw new RuntimeException("Unexpected message " + message);
+        }
+
+        var cause = se.getCause();
+        if (cause != expectedCause) {
+            throw new RuntimeException("Unexpected cause");
+        }
+    }
+}
-- 
GitLab


From 5953b229bf6d7834d575862e7577522ded0b6791 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 7 Mar 2022 18:12:14 +0000
Subject: [PATCH 016/345] 8257589: HotSpot Style Guide should link to rfc7282

Reviewed-by: dcubed, dholmes
---
 doc/hotspot-style.html | 2 +-
 doc/hotspot-style.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index 75211788c6b..4fd5c5a9064 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -68,7 +68,7 @@
 <p>Many of the guidelines mentioned here have (sometimes widespread) counterexamples in the HotSpot code base. Finding a counterexample is not sufficient justification for new code to follow the counterexample as a precedent, since readers of your code will rightfully expect your code to follow the greater bulk of precedents documented here.</p>
 <p>Occasionally a guideline mentioned here may be just out of synch with the actual HotSpot code base. If you find that a guideline is consistently contradicted by a large number of counterexamples, please bring it up for discussion and possible change. The architectural rule, of course, is &quot;When in Rome do as the Romans&quot;. Sometimes in the suburbs of Rome the rules are a little different; these differences can be pointed out here.</p>
 <p>Proposed changes should be discussed on the <a href="mailto:hotspot-dev@openjdk.java.net">HotSpot Developers</a> mailing list. Changes are likely to be cautious and incremental, since HotSpot coders have been using these guidelines for years.</p>
-<p>Substantive changes are approved by <a href="https://en.wikipedia.org/wiki/Rough_consensus">rough consensus</a> of the <a href="https://openjdk.java.net/census#hotspot">HotSpot Group</a> Members. The Group Lead determines whether consensus has been reached.</p>
+<p>Substantive changes are approved by <a href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a> of the <a href="https://openjdk.java.net/census#hotspot">HotSpot Group</a> Members. The Group Lead determines whether consensus has been reached.</p>
 <p>Editorial changes (changes that only affect the description of HotSpot style, not its substance) do not require the full consensus gathering process. The normal HotSpot pull request process may be used for editorial changes, with the additional requirement that the requisite reviewers are also HotSpot Group Members.</p>
 <h2 id="structure-and-formatting">Structure and Formatting</h2>
 <h3 id="factoring-and-class-design">Factoring and Class Design</h3>
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 4720c9f558c..5d25cdb6667 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -60,7 +60,7 @@ list.  Changes are likely to be cautious and incremental, since HotSpot
 coders have been using these guidelines for years.
 
 Substantive changes are approved by
-[rough consensus](https://en.wikipedia.org/wiki/Rough_consensus) of
+[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
 the [HotSpot Group](https://openjdk.java.net/census#hotspot) Members.
 The Group Lead determines whether consensus has been reached.
 
-- 
GitLab


From 2e298b8bf45edc37269b8b70f7784082a8f87306 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 7 Mar 2022 18:20:01 +0000
Subject: [PATCH 017/345] 8272691: Fix HotSpot style guide terminology for
 "non-local variables"

Reviewed-by: dcubed, dholmes
---
 doc/hotspot-style.html | 2 +-
 doc/hotspot-style.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index 4fd5c5a9064..453b9fbc14b 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -438,7 +438,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><p>Inline namespaces (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2535.htm">n2535</a>) — HotSpot makes very limited use of namespaces.</p></li>
 <li><p><code>using namespace</code> directives. In particular, don't use <code>using namespace std;</code> to avoid needing to qualify Standard Library names.</p></li>
 <li><p>Propagating exceptions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html">n2179</a>) — HotSpot does not permit the use of exceptions, so this feature isn't useful.</p></li>
-<li><p>Avoid namespace-scoped variables with non-constexpr initialization. In particular, avoid variables with types requiring non-trivial initialization or destruction. Initialization order problems can be difficult to deal with and lead to surprises, as can destruction ordering. HotSpot doesn't generally try to cleanup on exit, and running destructors at exit can also lead to problems.</p></li>
+<li><p>Avoid non-local variables with non-constexpr initialization. In particular, avoid variables with types requiring non-trivial initialization or destruction. Initialization order problems can be difficult to deal with and lead to surprises, as can destruction ordering. HotSpot doesn't generally try to cleanup on exit, and running destructors at exit can also lead to problems.</p></li>
 <li><p><code>[[deprecated]]</code> attribute (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3760.html">n3760</a>) — Not relevant in HotSpot code.</p></li>
 <li><p>Avoid most operator overloading, preferring named functions. When operator overloading is used, ensure the semantics conform to the normal expected behavior of the operation.</p></li>
 <li><p>Avoid most implicit conversion constructors and (implicit or explicit) conversion operators. (Note that conversion to <code>bool</code> isn't needed in HotSpot code because of the &quot;no implicit boolean&quot; guideline.)</p></li>
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 5d25cdb6667..84cb22a1bda 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -1066,7 +1066,7 @@ namespace std;` to avoid needing to qualify Standard Library names.
 ([n2179](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html)) &mdash;
 HotSpot does not permit the use of exceptions, so this feature isn't useful.
 
-* Avoid namespace-scoped variables with non-constexpr initialization.
+* Avoid non-local variables with non-constexpr initialization.
 In particular, avoid variables with types requiring non-trivial
 initialization or destruction.  Initialization order problems can be
 difficult to deal with and lead to surprises, as can destruction
-- 
GitLab


From 3996782c5af7b0396d5133fab457c507758d9340 Mon Sep 17 00:00:00 2001
From: Ravi Reddy <rreddy@openjdk.org>
Date: Mon, 7 Mar 2022 19:36:54 +0000
Subject: [PATCH 018/345] 8281093: Violating Attribute-Value Normalization in
 the XML specification 1.0

Reviewed-by: joehw
---
 .../org/apache/xerces/internal/impl/XMLEntityScanner.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
index 33ffe9831b8..5fb78877e21 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -57,7 +57,7 @@ import java.util.Locale;
  * @author Arnaud  Le Hors, IBM
  * @author K.Venugopal Sun Microsystems
  *
- * @LastModified: Sep 2021
+ * @LastModified: Mar 2022
  */
 public class XMLEntityScanner implements XMLLocator  {
 
@@ -2162,7 +2162,7 @@ public class XMLEntityScanner implements XMLLocator  {
                             break;
                         }
                     }
-                    if (c == '\r') {
+                    if (c == '\r' && isExternal) {
                         int cc = fCurrentEntity.ch[fCurrentEntity.position];
                         if (cc == '\n' || (version == XML_VERSION_1_1 && cc == 0x85)) {
                             fCurrentEntity.position++;
-- 
GitLab


From 5d5bf16b0af419781fd336fe33d8eab5adf8be5a Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 7 Mar 2022 19:40:34 +0000
Subject: [PATCH 019/345] 8282567: Improve source-date handling in build system

Reviewed-by: erikj, sgehwolf
---
 doc/building.html            |  42 +++++++-------
 doc/building.md              | 104 ++++++++++++++++++++++-------------
 make/InitSupport.gmk         |  23 ++++----
 make/autoconf/configure.ac   |   2 +-
 make/autoconf/help.m4        |   7 +++
 make/autoconf/hotspot.m4     |  18 +++++-
 make/autoconf/jdk-options.m4 |  41 +++++++++++---
 make/autoconf/spec.gmk.in    |   7 +++
 8 files changed, 162 insertions(+), 82 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index cbc7edd7e10..09ea7dc7f72 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -890,30 +890,28 @@ spawn failed</code></pre>
 <p>If you need general help or advice about developing for the JDK, you can also contact the Adoption Group. See the section on <a href="#contributing-to-openjdk">Contributing to OpenJDK</a> for more information.</p>
 <h2 id="reproducible-builds">Reproducible Builds</h2>
 <p>Build reproducibility is the property of getting exactly the same bits out when building, every time, independent on who builds the product, or where. This is for many reasons a harder goal than it initially appears, but it is an important goal, for security reasons and others. Please see <a href="https://reproducible-builds.org">Reproducible Builds</a> for more information about the background and reasons for reproducible builds.</p>
-<p>Currently, it is not possible to build OpenJDK fully reproducibly, but getting there is an ongoing effort. There are some things you can do to minimize non-determinism and make a larger part of the build reproducible:</p>
+<p>Currently, it is not possible to build OpenJDK fully reproducibly, but getting there is an ongoing effort.</p>
+<p>An absolute prerequisite for building reproducible is to speficy a fixed build time, since time stamps are embedded in many file formats. This is done by setting the <code>SOURCE_DATE_EPOCH</code> environment variable, which is an <a href="https://reproducible-builds.org/docs/source-date-epoch/">industry standard</a>, that many tools, such as gcc, recognize, and use in place of the current time when generating output.</p>
+<p>To generate reproducible builds, you must set <code>SOURCE_DATE_EPOCH</code> before running <code>configure</code>. The value in <code>SOURCE_DATE_EPOCH</code> will be stored in the configuration, and used by <code>make</code>. Setting <code>SOURCE_DATE_EPOCH</code> before running <code>make</code> will have no effect on the build.</p>
+<p>You must also make sure your build does not rely on <code>configure</code>'s default adhoc version strings. Default adhoc version strings <code>OPT</code> segment include user name and source directory. You can either override just the <code>OPT</code> segment using <code>--with-version-opt=&lt;any fixed string&gt;</code>, or you can specify the entire version string using <code>--with-version-string=&lt;your version&gt;</code>.</p>
+<p>This is a typical example of how to build the JDK in a reproducible way:</p>
+<pre><code>export SOURCE_DATE_EPOCH=946684800
+bash configure --with-version-opt=adhoc
+make</code></pre>
+<p>Note that regardless if you specify a source date for <code>configure</code> or not, the JDK build system will set <code>SOURCE_DATE_EPOCH</code> for all build tools when building. If <code>--with-source-date</code> has the value <code>updated</code> (which is the default unless <code>SOURCE_DATE_EPOCH</code> is found by in the environment by <code>configure</code>), the source date value will be determined at build time.</p>
+<p>There are several aspects of reproducible builds that can be individually adjusted by <code>configure</code> arguments. If any of these are given, they will override the value derived from <code>SOURCE_DATE_EPOCH</code>. These arguments are:</p>
 <ul>
-<li>Turn on build system support for reproducible builds</li>
+<li><p><code>--with-source-date</code></p>
+<p>This option controls how the JDK build sets <code>SOURCE_DATE_EPOCH</code> when building. It can be set to a value describing a date, either an epoch based timestamp as an integer, or a valid ISO-8601 date.</p>
+<p>It can also be set to one of the special values <code>current</code>, <code>updated</code> or <code>version</code>. <code>current</code> means that the time of running <code>configure</code> will be used. <code>version</code> will use the nominal release date for the current JDK version. <code>updated</code>, which means that <code>SOURCE_DATE_EPOCH</code> will be set to the current time each time you are running <code>make</code>. All choices, except for <code>updated</code>, will set a fixed value for the source date timestamp.</p>
+<p>When <code>SOURCE_DATE_EPOCH</code> is set, the default value for <code>--with-source-date</code> will be the value given by <code>SOURCE_DATE_EPOCH</code>. Otherwise, the default value is <code>updated</code>.</p></li>
+<li><p><code>--with-hotspot-build-time</code></p>
+<p>This option controls the build time string that will be included in the hotspot library (<code>libjvm.so</code> or <code>jvm.dll</code>). When the source date is fixed (e.g. by setting <code>SOURCE_DATE_EPOCH</code>), the default value for <code>--with-hotspot-build-time</code> will be an ISO 8601 representation of that time stamp. Otherwise the default value will be the current time when building hotspot.</p></li>
+<li><p><code>--with-copyright-year</code></p>
+<p>This option controls the copyright year in some generated text files. When the source date is fixed (e.g. by setting <code>SOURCE_DATE_EPOCH</code>), the default value for <code>--with-copyright-year</code> will be the year of that time stamp. Otherwise the default is the current year at the time of running configure. This can be overridden by <code>--with-copyright-year=&lt;year&gt;</code>.</p></li>
+<li><p><code>--enable-reproducible-build</code></p>
+<p>This option controls some additional behavior needed to make the build reproducible. When the source date is fixed (e.g. by setting <code>SOURCE_DATE_EPOCH</code>), this flag will be turned on by default. Otherwise, the value is determined by heuristics. If it is explicitly turned off, the build might not be reproducible.</p></li>
 </ul>
-<p>Add the flag <code>--enable-reproducible-build</code> to your <code>configure</code> command line. This will turn on support for reproducible builds where it could otherwise be lacking.</p>
-<ul>
-<li>Do not rely on <code>configure</code>'s default adhoc version strings</li>
-</ul>
-<p>Default adhoc version strings OPT segment include user name, source directory and timestamp. You can either override just the OPT segment using <code>--with-version-opt=&lt;any fixed string&gt;</code>, or you can specify the entire version string using <code>--with-version-string=&lt;your version&gt;</code>.</p>
-<ul>
-<li>Specify how the build sets <code>SOURCE_DATE_EPOCH</code></li>
-</ul>
-<p>The JDK build system will set the <code>SOURCE_DATE_EPOCH</code> environment variable during building, depending on the value of the <code>--with-source-date</code> option for <code>configure</code>. The default value is <code>updated</code>, which means that <code>SOURCE_DATE_EPOCH</code> will be set to the current time each time you are running <code>make</code>.</p>
-<p>The <a href="https://reproducible-builds.org/docs/source-date-epoch/"><code>SOURCE_DATE_EPOCH</code> environment variable</a> is an industry standard, that many tools, such as gcc, recognize, and use in place of the current time when generating output.</p>
-<p>For reproducible builds, you need to set this to a fixed value. You can use the special value <code>version</code> which will use the nominal release date for the current JDK version, or a value describing a date, either an epoch based timestamp as an integer, or a valid ISO-8601 date.</p>
-<p><strong>Hint:</strong> If your build environment already sets <code>SOURCE_DATE_EPOCH</code>, you can propagate this using <code>--with-source-date=$SOURCE_DATE_EPOCH</code>.</p>
-<ul>
-<li>Specify a hotspot build time</li>
-</ul>
-<p>Set a fixed hotspot build time. This will be included in the hotspot library (<code>libjvm.so</code> or <code>jvm.dll</code>) and defaults to the current time when building hotspot. Use <code>--with-hotspot-build-time=&lt;any fixed string&gt;</code> for reproducible builds. It's a string so you don't need to format it specifically, so e.g. <code>n/a</code> will do. Another solution is to use the <code>SOURCE_DATE_EPOCH</code> variable, e.g. <code>--with-hotspot-build-time=$(date --date=@$SOURCE_DATE_EPOCH)</code>.</p>
-<ul>
-<li>Copyright year</li>
-</ul>
-<p>The copyright year in some generated text files are normally set to the current year. This can be overridden by <code>--with-copyright-year=&lt;year&gt;</code>. For fully reproducible builds, this needs to be set to a fixed value.</p>
 <h2 id="hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</h2>
 <h3 id="bash-completion">Bash Completion</h3>
 <p>The <code>configure</code> and <code>make</code> commands tries to play nice with bash command-line completion (using <code>&lt;tab&gt;</code> or <code>&lt;tab&gt;&lt;tab&gt;</code>). To use this functionality, make sure you enable completion in your <code>~/.bashrc</code> (see instructions for bash in your operating system).</p>
diff --git a/doc/building.md b/doc/building.md
index f71e4e2e730..e83c2bada21 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -1527,57 +1527,85 @@ https://reproducible-builds.org) for more information about the background and
 reasons for reproducible builds.
 
 Currently, it is not possible to build OpenJDK fully reproducibly, but getting
-there is an ongoing effort. There are some things you can do to minimize
-non-determinism and make a larger part of the build reproducible:
+there is an ongoing effort.
+
+An absolute prerequisite for building reproducible is to speficy a fixed build
+time, since time stamps are embedded in many file formats. This is done by
+setting the `SOURCE_DATE_EPOCH` environment variable, which is an [industry
+standard]( https://reproducible-builds.org/docs/source-date-epoch/), that many
+tools, such as gcc, recognize, and use in place of the current time when
+generating output.
+
+To generate reproducible builds, you must set `SOURCE_DATE_EPOCH` before running
+`configure`. The value in `SOURCE_DATE_EPOCH` will be stored in the
+configuration, and used by `make`. Setting `SOURCE_DATE_EPOCH` before running
+`make` will have no effect on the build.
+
+You must also make sure your build does not rely on `configure`'s default adhoc
+version strings. Default adhoc version strings `OPT` segment include user name
+and source directory. You can either override just the `OPT` segment using
+`--with-version-opt=<any fixed string>`, or you can specify the entire version
+string using `--with-version-string=<your version>`.
 
-  * Turn on build system support for reproducible builds
+This is a typical example of how to build the JDK in a reproducible way:
+
+```
+export SOURCE_DATE_EPOCH=946684800
+bash configure --with-version-opt=adhoc
+make
+```
 
-Add the flag `--enable-reproducible-build` to your `configure` command line.
-This will turn on support for reproducible builds where it could otherwise be
-lacking.
+Note that regardless if you specify a source date for `configure` or not, the
+JDK build system will set `SOURCE_DATE_EPOCH` for all build tools when building.
+If `--with-source-date` has the value `updated` (which is the default unless
+`SOURCE_DATE_EPOCH` is found by in the environment by `configure`), the source
+date value will be determined at build time.
 
-  * Do not rely on `configure`'s default adhoc version strings
+There are several aspects of reproducible builds that can be individually
+adjusted by `configure` arguments. If any of these are given, they will override
+the value derived from `SOURCE_DATE_EPOCH`. These arguments are:
 
-Default adhoc version strings OPT segment include user name, source directory
-and timestamp. You can either override just the OPT segment using
-`--with-version-opt=<any fixed string>`, or you can specify the entire version
-string using `--with-version-string=<your version>`.
+ * `--with-source-date`
 
-  * Specify how the build sets `SOURCE_DATE_EPOCH`
+    This option controls how the JDK build sets `SOURCE_DATE_EPOCH` when
+    building. It can be set to a value describing a date, either an epoch based
+    timestamp as an integer, or a valid ISO-8601 date.
 
-The JDK build system will set the `SOURCE_DATE_EPOCH` environment variable
-during building, depending on the value of the `--with-source-date` option for
-`configure`. The default value is `updated`, which means that
-`SOURCE_DATE_EPOCH` will be set to the current time each time you are running
-`make`.
+    It can also be set to one of the special values `current`, `updated` or
+    `version`. `current` means that the time of running `configure` will be
+    used. `version` will use the nominal release date for the current JDK
+    version. `updated`, which means that `SOURCE_DATE_EPOCH` will be set to the
+    current time each time you are running `make`. All choices, except for
+    `updated`, will set a fixed value for the source date timestamp.
 
-The [`SOURCE_DATE_EPOCH` environment variable](
-https://reproducible-builds.org/docs/source-date-epoch/) is an industry
-standard, that many tools, such as gcc, recognize, and use in place of the
-current time when generating output.
+    When `SOURCE_DATE_EPOCH` is set, the default value for `--with-source-date`
+    will be the value given by `SOURCE_DATE_EPOCH`. Otherwise, the default value
+    is `updated`.
 
-For reproducible builds, you need to set this to a fixed value. You can use the
-special value `version` which will use the nominal release date for the current
-JDK version, or a value describing a date, either an epoch based timestamp as an
-integer, or a valid ISO-8601 date.
+ * `--with-hotspot-build-time`
 
-**Hint:** If your build environment already sets `SOURCE_DATE_EPOCH`, you can
-propagate this using `--with-source-date=$SOURCE_DATE_EPOCH`.
+    This option controls the build time string that will be included in the
+    hotspot library (`libjvm.so` or `jvm.dll`). When the source date is fixed
+    (e.g. by setting `SOURCE_DATE_EPOCH`), the default value for
+    `--with-hotspot-build-time` will be an ISO 8601 representation of that time
+    stamp. Otherwise the default value will be the current time when building
+    hotspot.
 
-  * Specify a hotspot build time
+ * `--with-copyright-year`
 
-Set a fixed hotspot build time. This will be included in the hotspot library
-(`libjvm.so` or `jvm.dll`) and defaults to the current time when building
-hotspot. Use `--with-hotspot-build-time=<any fixed string>` for reproducible
-builds. It's a string so you don't need to format it specifically, so e.g. `n/a`
-will do. Another solution is to use the `SOURCE_DATE_EPOCH` variable, e.g.
-`--with-hotspot-build-time=$(date --date=@$SOURCE_DATE_EPOCH)`.
+    This option controls the copyright year in some generated text files. When
+    the source date is fixed (e.g. by setting `SOURCE_DATE_EPOCH`), the default
+    value for `--with-copyright-year` will be the year of that time stamp.
+    Otherwise the default is the current year at the time of running configure.
+    This can be overridden by `--with-copyright-year=<year>`.
 
-  * Copyright year
+ * `--enable-reproducible-build`
 
-The copyright year in some generated text files are normally set to the current
-year. This can be overridden by `--with-copyright-year=<year>`. For fully
-reproducible builds, this needs to be set to a fixed value.
+    This option controls some additional behavior needed to make the build
+    reproducible. When the source date is fixed (e.g. by setting
+    `SOURCE_DATE_EPOCH`), this flag will be turned on by default. Otherwise, the
+    value is determined by heuristics. If it is explicitly turned off, the build
+    might not be reproducible.
 
 ## Hints and Suggestions for Advanced Users
 
diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index d2291c50f21..62fdc438c8a 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -310,17 +310,16 @@ else # $(HAS_SPEC)=true
   # level of reproducible builds
   define SetupReproducibleBuild
     ifeq ($$(SOURCE_DATE), updated)
-      SOURCE_DATE := $$(shell $$(DATE) +"%s")
-    endif
-    export SOURCE_DATE_EPOCH := $$(SOURCE_DATE)
-    ifeq ($$(IS_GNU_DATE), yes)
-      export SOURCE_DATE_ISO_8601 := $$(shell $$(DATE) --utc \
-                                                       --date="@$$(SOURCE_DATE_EPOCH)" \
-                                                       +"%Y-%m-%dT%H:%M:%SZ" 2> /dev/null)
-    else
-      export SOURCE_DATE_ISO_8601 := $$(shell $$(DATE) -u \
-                                                       -j -f "%s" "$$(SOURCE_DATE_EPOCH)" \
-                                                       +"%Y-%m-%dT%H:%M:%SZ" 2> /dev/null)
+      # For static values of SOURCE_DATE (not "updated"), these are set in spec.gmk
+      export SOURCE_DATE_EPOCH := $$(shell $$(DATE) +"%s")
+      ifeq ($$(IS_GNU_DATE), yes)
+        export SOURCE_DATE_ISO_8601 := $$(shell $$(DATE) --utc \
+            --date="@$$(SOURCE_DATE_EPOCH)" +"$$(ISO_8601_FORMAT_STRING)" \
+            2> /dev/null)
+      else
+        export SOURCE_DATE_ISO_8601 := $$(shell $$(DATE) -u -j -f "%s" \
+            "$$(SOURCE_DATE_EPOCH)" +"$$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
+      endif
     endif
   endef
 
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index d52ad2c4315..5e58696e34d 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -152,6 +152,7 @@ BOOTJDK_SETUP_DOCS_REFERENCE_JDK
 #
 ###############################################################################
 
+JDKOPT_SETUP_REPRODUCIBLE_BUILD
 JDKOPT_SETUP_JDK_OPTIONS
 
 ###############################################################################
@@ -207,7 +208,6 @@ PLATFORM_SETUP_OPENJDK_TARGET_BITS
 PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
 
 # Configure flags for the tools. Need to know if we should build reproducible.
-JDKOPT_SETUP_REPRODUCIBLE_BUILD
 FLAGS_SETUP_FLAGS
 
 # Setup debug symbols (need objcopy from the toolchain for that)
diff --git a/make/autoconf/help.m4 b/make/autoconf/help.m4
index 486e78d4fcf..3d6963c7d4d 100644
--- a/make/autoconf/help.m4
+++ b/make/autoconf/help.m4
@@ -296,6 +296,13 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
   printf "* Version string: $VERSION_STRING ($VERSION_SHORT)\n"
 
+  if test "x$SOURCE_DATE" != xupdated; then
+    source_date_info="$SOURCE_DATE ($SOURCE_DATE_ISO_8601)"
+  else
+    source_date_info="Determined at build time"
+  fi
+  printf "* Source date:    $source_date_info\n"
+
   printf "\n"
   printf "Tools summary:\n"
   if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 1cac6bb00c6..18f46036fe5 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -114,12 +114,26 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
     HOTSPOT_TARGET_CPU_ARCH=zero
   fi
 
+
   AC_ARG_WITH([hotspot-build-time], [AS_HELP_STRING([--with-hotspot-build-time],
-  [timestamp to use in hotspot version string, empty for on-the-fly @<:@empty@:>@])])
+  [timestamp to use in hotspot version string, empty means determined at build time @<:@source-date/empty@:>@])])
+
+  AC_MSG_CHECKING([what hotspot build time to use])
 
   if test "x$with_hotspot_build_time" != x; then
     HOTSPOT_BUILD_TIME="$with_hotspot_build_time"
+    AC_MSG_RESULT([$HOTSPOT_BUILD_TIME (from --with-hotspot-build-time)])
+  else
+    if test "x$SOURCE_DATE" = xupdated; then
+      HOTSPOT_BUILD_TIME=""
+      AC_MSG_RESULT([determined at build time (default)])
+    else
+      # If we have a fixed value for SOURCE_DATE, use it as default
+      HOTSPOT_BUILD_TIME="$SOURCE_DATE_ISO_8601"
+      AC_MSG_RESULT([$HOTSPOT_BUILD_TIME (from --with-source-date)])
+    fi
   fi
+
   AC_SUBST(HOTSPOT_BUILD_TIME)
 
 
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 70806149203..2034934cd73 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -211,16 +211,16 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
 
   # Setup default copyright year. Mostly overridden when building close to a new year.
   AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
-      [Set copyright year value for build @<:@current year@:>@])])
+      [Set copyright year value for build @<:@current year/source-date@:>@])])
   if test "x$with_copyright_year" = xyes; then
     AC_MSG_ERROR([Copyright year must have a value])
   elif test "x$with_copyright_year" != x; then
     COPYRIGHT_YEAR="$with_copyright_year"
-  elif test "x$SOURCE_DATE_EPOCH" != x; then
+  elif test "x$SOURCE_DATE" != xupdated; then
     if test "x$IS_GNU_DATE" = xyes; then
-      COPYRIGHT_YEAR=`date --date=@$SOURCE_DATE_EPOCH +%Y`
+      COPYRIGHT_YEAR=`$DATE --date=@$SOURCE_DATE +%Y`
     else
-      COPYRIGHT_YEAR=`date -j -f %s $SOURCE_DATE_EPOCH +%Y`
+      COPYRIGHT_YEAR=`$DATE -j -f %s $SOURCE_DATE +%Y`
     fi
   else
     COPYRIGHT_YEAR=`$DATE +'%Y'`
@@ -662,15 +662,28 @@ AC_DEFUN([JDKOPT_ALLOW_ABSOLUTE_PATHS_IN_OUTPUT],
 AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
 [
   AC_ARG_WITH([source-date], [AS_HELP_STRING([--with-source-date],
-      [how to set SOURCE_DATE_EPOCH ('updated', 'current', 'version' a timestamp or an ISO-8601 date) @<:@updated@:>@])],
+      [how to set SOURCE_DATE_EPOCH ('updated', 'current', 'version' a timestamp or an ISO-8601 date) @<:@updated/value of SOURCE_DATE_EPOCH@:>@])],
       [with_source_date_present=true], [with_source_date_present=false])
 
+  if test "x$SOURCE_DATE_EPOCH" != x && test "x$with_source_date" != x; then
+    AC_MSG_WARN([--with-source-date will override SOURCE_DATE_EPOCH])
+  fi
+
   AC_MSG_CHECKING([what source date to use])
 
   if test "x$with_source_date" = xyes; then
     AC_MSG_ERROR([--with-source-date must have a value])
-  elif test "x$with_source_date" = xupdated || test "x$with_source_date" = x; then
-    # Tell the makefiles to update at each build
+  elif test "x$with_source_date" = x; then
+    if test "x$SOURCE_DATE_EPOCH" != x; then
+      SOURCE_DATE=$SOURCE_DATE_EPOCH
+      with_source_date_present=true
+      AC_MSG_RESULT([$SOURCE_DATE, from SOURCE_DATE_EPOCH])
+    else
+      # Tell the makefiles to update at each build
+      SOURCE_DATE=updated
+      AC_MSG_RESULT([determined at build time (default)])
+    fi
+  elif test "x$with_source_date" = xupdated; then
     SOURCE_DATE=updated
     AC_MSG_RESULT([determined at build time, from 'updated'])
   elif test "x$with_source_date" = xcurrent; then
@@ -702,6 +715,18 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
     fi
   fi
 
+  ISO_8601_FORMAT_STRING="%Y-%m-%dT%H:%M:%SZ"
+  if test "x$SOURCE_DATE" != xupdated; then
+    # If we have a fixed value for SOURCE_DATE, we need to set SOURCE_DATE_EPOCH
+    # for the rest of configure.
+    SOURCE_DATE_EPOCH="$SOURCE_DATE"
+    if test "x$IS_GNU_DATE" = xyes; then
+      SOURCE_DATE_ISO_8601=`$DATE --utc --date="@$SOURCE_DATE" +"$ISO_8601_FORMAT_STRING" 2> /dev/null`
+    else
+      SOURCE_DATE_ISO_8601=`$DATE -u -j -f "%s" "$SOURCE_DATE" +"$ISO_8601_FORMAT_STRING" 2> /dev/null`
+    fi
+  fi
+
   REPRODUCIBLE_BUILD_DEFAULT=$with_source_date_present
 
   if test "x$OPENJDK_BUILD_OS" = xwindows && \
@@ -726,4 +751,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
 
   AC_SUBST(SOURCE_DATE)
   AC_SUBST(ENABLE_REPRODUCIBLE_BUILD)
+  AC_SUBST(ISO_8601_FORMAT_STRING)
+  AC_SUBST(SOURCE_DATE_ISO_8601)
 ])
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index 01bcc32a24e..5671d4a9f3e 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -130,6 +130,13 @@ RELEASE_FILE_LIBC:=@RELEASE_FILE_LIBC@
 
 SOURCE_DATE := @SOURCE_DATE@
 ENABLE_REPRODUCIBLE_BUILD := @ENABLE_REPRODUCIBLE_BUILD@
+ISO_8601_FORMAT_STRING := @ISO_8601_FORMAT_STRING@
+
+ifneq ($(SOURCE_DATE), updated)
+  # For "updated" source date value, these are set in InitSupport.gmk
+  export SOURCE_DATE_EPOCH := $(SOURCE_DATE)
+  SOURCE_DATE_ISO_8601 := @SOURCE_DATE_ISO_8601@
+endif
 
 LIBM:=@LIBM@
 LIBDL:=@LIBDL@
-- 
GitLab


From ccad39237ab860c5c5579537f740177e3f1adcc9 Mon Sep 17 00:00:00 2001
From: Matteo Baccan <matteo.baccan@gmail.com>
Date: Mon, 7 Mar 2022 21:33:40 +0000
Subject: [PATCH 020/345] 8282657: Code cleanup: removing double semicolons at
 the end of lines

Reviewed-by: lancea, rriggs, ihse, prr, iris, wetmore, darcy, dholmes
---
 .../build/tools/generatecharacter/CharacterScript.java    | 2 +-
 make/langtools/tools/genstubs/GenStubs.java               | 2 +-
 src/java.base/share/classes/java/io/File.java             | 2 +-
 src/java.base/share/classes/java/util/WeakHashMap.java    | 2 +-
 .../share/classes/sun/util/logging/PlatformLogger.java    | 2 +-
 .../share/classes/javax/swing/RepaintManager.java         | 2 +-
 src/java.rmi/share/classes/java/rmi/server/LogStream.java | 2 +-
 .../sun/security/krb5/internal/rcache/AuthTime.java       | 4 ++--
 .../com/sun/rowset/internal/CachedRowSetWriter.java       | 2 +-
 .../classes/javax/sql/rowset/serial/SQLOutputImpl.java    | 2 +-
 .../apache/xalan/internal/xsltc/compiler/XPathParser.java | 2 +-
 .../javac/processing/JavacProcessingEnvironment.java      | 2 +-
 .../share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java      | 2 +-
 .../classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java  | 2 +-
 .../share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java | 2 +-
 .../classes/com/sun/tools/classfile/TypeAnnotation.java   | 2 +-
 .../instrument/SocketChannelImplInstrumentor.java         | 2 +-
 .../share/classes/jdk/jfr/internal/tool/JSONWriter.java   | 2 +-
 .../share/classes/jdk/internal/jshell/tool/Selector.java  | 2 +-
 .../java/com/sun/hotspot/tools/compiler/LogParser.java    | 2 +-
 test/hotspot/jtreg/compiler/codegen/Test6909839.java      | 8 ++++----
 .../compiler/jvmci/compilerToVM/CompileCodeTestCase.java  | 2 +-
 .../jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java | 2 +-
 test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java     | 2 +-
 .../cds/appcds/customLoader/SameNameInTwoLoadersTest.java | 2 +-
 .../jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java  | 2 +-
 .../ctw/src/sun/hotspot/tools/ctw/CtwRunner.java          | 2 +-
 test/hotspot/jtreg/vmTestbase/jit/series/series.java      | 2 +-
 .../nsk/jdb/unmonitor/unmonitor001/unmonitor001.java      | 2 +-
 .../vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java | 2 +-
 .../ClassObjectReference/reflectedType/reflectype002.java | 2 +-
 .../nsk/jdi/LocalVariable/isVisible/isvisible001.java     | 2 +-
 .../nsk/jdi/ThreadReference/frames/frames001.java         | 2 +-
 .../scenarios/hotswap/HS203/hs203t002/hs203t002.java      | 2 +-
 test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java | 2 +-
 test/jdk/com/sun/jdi/ConstantPoolInfo.java                | 2 +-
 test/jdk/com/sun/jdi/GenericsTest.java                    | 2 +-
 .../CompEventOnHiddenComponent.java                       | 2 +-
 .../EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java      | 2 +-
 test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java | 2 +-
 test/jdk/java/awt/SplashScreen/GenerateTestImage.java     | 2 +-
 test/jdk/java/awt/print/PrinterJob/PrtException.java      | 2 +-
 test/jdk/java/io/File/GetXSpace.java                      | 2 +-
 test/jdk/java/io/File/createTempFile/NameTooLong.java     | 2 +-
 test/jdk/java/io/RandomAccessFile/WriteBytesChars.java    | 2 +-
 test/jdk/java/lang/invoke/8022701/BogoLoader.java         | 2 +-
 .../java/lang/invoke/accessProtectedSuper/BogoLoader.java | 2 +-
 .../management/RuntimeMXBean/GetSystemProperties.java     | 2 +-
 .../jdk/java/net/httpclient/AggregateRequestBodyTest.java | 2 +-
 .../nio/channels/SocketChannel/CloseTimeoutChannel.java   | 2 +-
 .../java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java | 2 +-
 test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java   | 2 +-
 test/jdk/java/util/logging/TestAppletLoggerContext.java   | 2 +-
 test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java  | 2 +-
 .../net/ssl/ServerName/SSLSocketExplorerFailure.java      | 2 +-
 .../net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java   | 2 +-
 .../net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java | 2 +-
 .../net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java   | 2 +-
 .../net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java   | 2 +-
 .../NewModelIdentifierStringStringInt.java                | 2 +-
 .../jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java | 2 +-
 .../javax/sound/midi/Gervill/SoftChannel/NoteOff2.java    | 2 +-
 .../jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java | 2 +-
 .../sql/testng/test/rowset/serial/SQLInputImplTests.java  | 2 +-
 .../sql/testng/test/rowset/serial/SerialArrayTests.java   | 2 +-
 .../testng/test/rowset/serial/SerialExceptionTests.java   | 2 +-
 .../sql/testng/test/rowset/serial/SerialStructTests.java  | 2 +-
 test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java      | 4 ++--
 test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java   | 2 +-
 test/jdk/jdk/jfr/api/recording/event/TestEventTime.java   | 4 ++--
 .../jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java | 4 ++--
 .../src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java  | 4 ++--
 test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java  | 4 ++--
 .../provider/certpath/DisabledAlgorithms/CPBuilder.java   | 2 +-
 .../certpath/DisabledAlgorithms/CPBuilderWithMD5.java     | 2 +-
 test/jdk/sun/tools/jhsdb/BasicLauncherTest.java           | 4 ++--
 test/jdk/tools/jar/modularJar/Basic.java                  | 2 +-
 .../jar/multiRelease/data/test13/v10/version/Nested.java  | 2 +-
 .../jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java   | 2 +-
 test/langtools/jdk/jshell/VariablesTest.java              | 2 +-
 test/langtools/tools/doclint/RunTest.java                 | 2 +-
 .../tools/javac/generics/inference/4954546/T4954546.java  | 4 ++--
 82 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java b/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java
index fda7a561e87..d242cb8ed42 100644
--- a/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java
+++ b/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java
@@ -115,7 +115,7 @@ public class CharacterScript {
 
             for (j = 0; j < scriptSize; j++) {
                 for (int cp = scripts[j][0]; cp <= scripts[j][1]; cp++) {
-                    String name = names[scripts[j][2]].toUpperCase(Locale.ENGLISH);;
+                    String name = names[scripts[j][2]].toUpperCase(Locale.ENGLISH);
                     if (cp > 0xffff)
                         System.out.printf("%05X    %s%n", cp, name);
                     else
diff --git a/make/langtools/tools/genstubs/GenStubs.java b/make/langtools/tools/genstubs/GenStubs.java
index 9f8fc7a7a59..bcf73fc5f71 100644
--- a/make/langtools/tools/genstubs/GenStubs.java
+++ b/make/langtools/tools/genstubs/GenStubs.java
@@ -213,7 +213,7 @@ public class GenStubs {
             long prevClassMods = currClassMods;
             currClassMods = tree.mods.flags;
             try {
-                super.visitClassDef(tree);;
+                super.visitClassDef(tree);
             } finally {
                 currClassMods = prevClassMods;
             }
diff --git a/src/java.base/share/classes/java/io/File.java b/src/java.base/share/classes/java/io/File.java
index 3f7cd86cf70..f279ee56bf5 100644
--- a/src/java.base/share/classes/java/io/File.java
+++ b/src/java.base/share/classes/java/io/File.java
@@ -2012,7 +2012,7 @@ public class File
 
             int prefixLength = prefix.length();
             int nusLength = nus.length();
-            int suffixLength = suffix.length();;
+            int suffixLength = suffix.length();
 
             String name;
             int nameMax = fs.getNameMax(dir.getPath());
diff --git a/src/java.base/share/classes/java/util/WeakHashMap.java b/src/java.base/share/classes/java/util/WeakHashMap.java
index 03aee09e992..d74c7d65728 100644
--- a/src/java.base/share/classes/java/util/WeakHashMap.java
+++ b/src/java.base/share/classes/java/util/WeakHashMap.java
@@ -1040,7 +1040,7 @@ public class WeakHashMap<K,V>
         Objects.requireNonNull(function);
         int expectedModCount = modCount;
 
-        Entry<K, V>[] tab = getTable();;
+        Entry<K, V>[] tab = getTable();
         for (Entry<K, V> entry : tab) {
             while (entry != null) {
                 Object key = entry.get();
diff --git a/src/java.base/share/classes/sun/util/logging/PlatformLogger.java b/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
index 07c6878c151..db85d9c317b 100644
--- a/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
+++ b/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
@@ -371,7 +371,7 @@ public class PlatformLogger {
     @Deprecated
     public void setLevel(Level newLevel) {
         final ConfigurableBridge.LoggerConfiguration spi =
-                PlatformLogger.ConfigurableBridge.getLoggerConfiguration(loggerProxy);;
+                PlatformLogger.ConfigurableBridge.getLoggerConfiguration(loggerProxy);
         if (spi != null) {
             spi.setPlatformLevel(newLevel);
         }
diff --git a/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/src/java.desktop/share/classes/javax/swing/RepaintManager.java
index fe414fc16af..3831a66a01c 100644
--- a/src/java.desktop/share/classes/javax/swing/RepaintManager.java
+++ b/src/java.desktop/share/classes/javax/swing/RepaintManager.java
@@ -966,7 +966,7 @@ public class RepaintManager
         tmp.setBounds(dirtyComponents.get(dirtyComponent));
 
         // System.out.println("Collect dirty component for bound " + tmp +
-        //                                   "component bounds is " + cBounds);;
+        //                                   "component bounds is " + cBounds);
         SwingUtilities.computeIntersection(0,0,w,h,tmp);
 
         if (tmp.isEmpty()) {
diff --git a/src/java.rmi/share/classes/java/rmi/server/LogStream.java b/src/java.rmi/share/classes/java/rmi/server/LogStream.java
index 7d501ffb4af..ca554569d3b 100644
--- a/src/java.rmi/share/classes/java/rmi/server/LogStream.java
+++ b/src/java.rmi/share/classes/java/rmi/server/LogStream.java
@@ -176,7 +176,7 @@ public class LogStream extends PrintStream {
             synchronized (this) {
                 synchronized (logOut) {
                     // construct prefix for log messages:
-                    buffer.setLength(0);;
+                    buffer.setLength(0);
                     buffer.append(              // date/time stamp...
                         (new Date()).toString());
                     buffer.append(':');
diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
index 695268735a9..d9cd765d12e 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
@@ -134,8 +134,8 @@ public class AuthTime {
      * Encodes to be used in a dfl file
      */
     protected byte[] encode0(String cstring, String sstring) {
-        byte[] c = cstring.getBytes(StandardCharsets.UTF_8);;
-        byte[] s = sstring.getBytes(StandardCharsets.UTF_8);;
+        byte[] c = cstring.getBytes(StandardCharsets.UTF_8);
+        byte[] s = sstring.getBytes(StandardCharsets.UTF_8);
         byte[] zero = new byte[1];
         int len = 4 + c.length + 1 + 4 + s.length + 1 + 4 + 4;
         ByteBuffer bb = ByteBuffer.allocate(len)
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
index a588c1dd94a..21b9614d746 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
@@ -276,7 +276,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable {
         // We assume caller is a CachedRowSet
         CachedRowSetImpl crs = (CachedRowSetImpl)caller;
         // crsResolve = new CachedRowSetImpl();
-        this.crsResolve = new CachedRowSetImpl();;
+        this.crsResolve = new CachedRowSetImpl();
 
         // The reader is registered with the writer at design time.
         // This is not required, in general.  The reader has logic
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
index 136fff08d2a..1affa2634ec 100644
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
@@ -535,7 +535,7 @@ public class SQLOutputImpl implements SQLOutput {
      */
     @SuppressWarnings("unchecked")
     public void writeStruct(Struct x) throws SQLException {
-        SerialStruct s = new SerialStruct(x,map);;
+        SerialStruct s = new SerialStruct(x,map);
         attribs.add(s);
     }
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
index ab12a274a46..e0259cb8c3f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
@@ -1011,7 +1011,7 @@ public class XPathParser extends lr_parser {
 
             if (axis == Axis.NAMESPACE) {
                 nodeType = (name.toString().equals("*")) ? -1
-                        : _xsltc.registerNamespacePrefix(name);;
+                        : _xsltc.registerNamespacePrefix(name);
             } else {
                 final String uri = name.getNamespace();
                 final String local = name.getLocalPart();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index 594bb4e95b4..9dd94f74252 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -493,7 +493,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
     }
 
     private class NameServiceIterator extends ServiceIterator {
-        private Map<String, Processor> namedProcessorsMap = new HashMap<>();;
+        private Map<String, Processor> namedProcessorsMap = new HashMap<>();
         private Iterator<String> processorNames = null;
         private Processor nextProc = null;
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java
index 5f129b51a96..8e1c005d6a1 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java
@@ -78,7 +78,7 @@ public class ZGlobals {
         ZPageSizeMediumShift = db.lookupLongConstant("ZPageSizeMediumShift").longValue();
 
         ZObjectAlignmentMediumShift = db.lookupIntConstant("ZObjectAlignmentMediumShift").intValue();
-        ZObjectAlignmentLargeShift = db.lookupIntConstant("ZObjectAlignmentLargeShift").intValue();;
+        ZObjectAlignmentLargeShift = db.lookupIntConstant("ZObjectAlignmentLargeShift").intValue();
 
         ZAddressOffsetShift = db.lookupLongConstant("ZAddressOffsetShift").longValue();
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java
index 21619b1f5ae..c83d7912650 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java
@@ -79,7 +79,7 @@ public class FindInCodeCachePanel extends SAPanel {
         }
         begin = begin.addOffsetTo(addressSize);
       }
-      iterated = end.minus(base);;
+      iterated = end.minus(base);
       updateProgressBar(null);
     }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java
index ced929dea16..c9808063ad3 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java
@@ -195,7 +195,7 @@ public class FindInHeapPanel extends JPanel {
       for (String update : updates) {
         textArea.append(update);
       }
-      updates = new ArrayList<>();;
+      updates = new ArrayList<>();
     }
     pendingUpdate = false;
   }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java
index 5d591705d52..707cb831540 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java
@@ -130,7 +130,7 @@ public class TypeAnnotation {
             break;
         // class extends or implements clause
         case CLASS_EXTENDS:
-            position.type_index = cr.readUnsignedShort();;
+            position.type_index = cr.readUnsignedShort();
             break;
         // throws
         case THROWS:
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java
index 6d353112dff..a83fabfbaa8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java
@@ -52,7 +52,7 @@ final class SocketChannelImplInstrumentor {
         int bytesRead = 0;
         long start  = 0;
         try {
-            start = EventHandler.timestamp();;
+            start = EventHandler.timestamp();
             bytesRead = read(dst);
         } finally {
             long duration = EventHandler.timestamp() - start;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/JSONWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/JSONWriter.java
index cbf508306d5..3be2dd6c199 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/JSONWriter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/JSONWriter.java
@@ -63,7 +63,7 @@ final class JSONWriter extends EventPrintWriter {
 
     @Override
     protected void printEnd() {
-        printArrayEnd();;
+        printArrayEnd();
         printObjectEnd();
         printObjectEnd();
     }
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Selector.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Selector.java
index 9d540847148..aec5116bb2e 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Selector.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Selector.java
@@ -302,7 +302,7 @@ class Selector {
 
         <E extends Enum<E> & SelectorInstanceWithDoc<E>>
         SelectorKind(Class<E> k) {
-            this.all = EnumSet.allOf(FormatCase.class);;
+            this.all = EnumSet.allOf(FormatCase.class);
             this.k = k;
         }
     }
diff --git a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
index b0fc682f65a..05407f8c969 100644
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
@@ -973,7 +973,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler {
             m.setHolder(type(search(atts, "holder")));
             m.setName(search(atts, "name"));
             m.setReturnType(type(search(atts, "return")));
-            String arguments = atts.getValue("arguments");;
+            String arguments = atts.getValue("arguments");
             if (arguments == null) {
                 m.setSignature("()" + sigtype(atts.getValue("return")));
             } else {
diff --git a/test/hotspot/jtreg/compiler/codegen/Test6909839.java b/test/hotspot/jtreg/compiler/codegen/Test6909839.java
index d6fa98d8155..5fcd5ceacee 100644
--- a/test/hotspot/jtreg/compiler/codegen/Test6909839.java
+++ b/test/hotspot/jtreg/compiler/codegen/Test6909839.java
@@ -241,7 +241,7 @@ public class Test6909839 {
 
     static void testp() {
         Object a = new Object();
-        Object b = new Object();;
+        Object b = new Object();
         int total = 0;
         for (int i = 0 ; i < 10000; i++) {
             total += ((i % 4 != 0) ? a : b).hashCode();
@@ -251,7 +251,7 @@ public class Test6909839 {
 
     static void testup() {
         Object a = new Object();
-        Object b = new Object();;
+        Object b = new Object();
         int total = 0;
         for (int i = 0 ; i < 10000; i++) {
             int v = i % 4;
@@ -262,7 +262,7 @@ public class Test6909839 {
 
     static void testdp() {
         Object a = new Object();
-        Object b = new Object();;
+        Object b = new Object();
         int total = 0;
         for (int i = 0 ; i < 10000; i++) {
             int v = i % 4;
@@ -272,7 +272,7 @@ public class Test6909839 {
     }
     static void testfp() {
         Object a = new Object();
-        Object b = new Object();;
+        Object b = new Object();
         int total = 0;
         for (int i = 0 ; i < 10000; i++) {
             int v = i % 4;
diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java
index e15b151ec06..797bef95edc 100644
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java
@@ -244,7 +244,7 @@ public class CompileCodeTestCase {
     }
 
     static {
-        Map<Class<?>, Object> map = new HashMap<>();;
+        Map<Class<?>, Object> map = new HashMap<>();
         map.put(CompileCodeTestCase.DummyEx.class,
                 new CompileCodeTestCase.DummyEx());
         map.put(CompileCodeTestCase.Dummy.class,
diff --git a/test/hotspot/jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java b/test/hotspot/jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java
index 10d766cf122..84752a0ccf0 100644
--- a/test/hotspot/jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java
+++ b/test/hotspot/jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java
@@ -37,7 +37,7 @@ import jdk.test.lib.Asserts;
 
 public class TestMisalignedUnsafeAccess {
 
-    private static final Unsafe UNSAFE = Unsafe.getUnsafe();;
+    private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
     private static short onHeapStaticMemory; // For static field testing
     private static final Object onHeapStaticMemoryBase;
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java
index 959d43173d0..55c10299ed6 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java
@@ -466,7 +466,7 @@ public class TestCommon extends CDSTestUtils {
 
     public static Result runWithoutCDS(String... suffix) throws Exception {
         AppCDSOptions opts = (new AppCDSOptions());
-        opts.addSuffix(suffix).setXShareMode("off");;
+        opts.addSuffix(suffix).setXShareMode("off");
         return new Result(opts, runWithArchive(opts));
     }
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java
index 72d62c64179..2aeb2d41559 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java
@@ -54,7 +54,7 @@ public class SameNameInTwoLoadersTest {
         customJar = JarBuilder.build("SameNameInTwoLoadersTest_custom", "CustomLoadee", "CustomLoadee3");
 
         useWbParam = "-Xbootclasspath/a:" +
-            JarBuilder.build(true, "WhiteBox", "sun/hotspot/WhiteBox");;
+            JarBuilder.build(true, "WhiteBox", "sun/hotspot/WhiteBox");
 
         // ====== unrelated loaders
         executeTestCase(getClassList_FP(),
diff --git a/test/hotspot/jtreg/serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java b/test/hotspot/jtreg/serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java
index 03e388df6c3..6b835ca7ac8 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java
@@ -590,7 +590,7 @@ public class IterateHeapWithEscapeAnalysisEnabled {
             // The new instance is an ArgEscape instance and escapes to the JVMTI agent
             // while the target thread is in the call to dontinline_endlessLoop(). At this
             // location there is no local variable that references the ArgEscape.
-            ((ABBox) dontinline_endlessLoop(new ABBox(this))).synchronizedSlowInc();;
+            ((ABBox) dontinline_endlessLoop(new ABBox(this))).synchronizedSlowInc();
         }
     }
 
diff --git a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
index 3f8a6b3765a..2f0dca67427 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
+++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
@@ -93,7 +93,7 @@ public class CtwRunner {
         errors = new ArrayList<>();
 
         if (start.endsWith("%") && stop.endsWith("%")) {
-            int startPercentage = Integer.parseInt(start.substring(0, start.length() - 1));;
+            int startPercentage = Integer.parseInt(start.substring(0, start.length() - 1));
             int stopPercentage = Integer.parseInt(stop.substring(0, stop.length() - 1));
             if (startPercentage < 0 || startPercentage > 100 ||
                 stopPercentage < 0 || stopPercentage > 100) {
diff --git a/test/hotspot/jtreg/vmTestbase/jit/series/series.java b/test/hotspot/jtreg/vmTestbase/jit/series/series.java
index c17e24427f9..eef54c2c81a 100644
--- a/test/hotspot/jtreg/vmTestbase/jit/series/series.java
+++ b/test/hotspot/jtreg/vmTestbase/jit/series/series.java
@@ -192,7 +192,7 @@ fres);
   {
       series patObj = new series();
       if (patObj.runit()!=0)
-         throw new TestFailure("Test failed.");;
+         throw new TestFailure("Test failed.");
                                                series.goldChecker.check();
   }
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java
index 54a90a930f2..9fe8a7e5703 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java
@@ -172,7 +172,7 @@ public class unmonitor001 extends JdbTest {
     private boolean checkCommands(String[] reply) {
         Paragrep grep;
         String found;
-        Vector v = new Vector();;
+        Vector v = new Vector();
         boolean result = true;
         int count;
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java
index 4fd48e21ff0..79bb11fc706 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java
@@ -146,7 +146,7 @@ public class tc02x003 {
                             hitEvent(clsEvent);
 
                             mthdReq = evm.createMethodEntryRequest();
-                            ReferenceType testedClass = clsEvent.referenceType();;
+                            ReferenceType testedClass = clsEvent.referenceType();
                             mthdReq.addClassFilter(testedClass);
                             mthdReq.enable();
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java
index da528cee5b3..46608d9b07d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java
@@ -166,7 +166,7 @@ public class reflectype002 extends Log {
 
             print_log_on_verbose
                 ("--> reflectype002: getting ClassObjectReference object for loaded checked class...");
-            ClassObjectReference class_obj_ref = refType.classObject();;
+            ClassObjectReference class_obj_ref = refType.classObject();
             print_log_on_verbose("--> reflectype002: getting ClassObjectReference object - DONE!");
 
             print_log_on_verbose
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java
index 9d5dba92c75..5593aabe31b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java
@@ -415,7 +415,7 @@ public class isvisible001 {
                         expresult = returnCode1;
                     }
                 } catch ( IllegalArgumentException e ) {
-                    log3("ERROR:  IllegalArgumentException for i3 in stackFrame");;
+                    log3("ERROR:  IllegalArgumentException for i3 in stackFrame");
                     expresult = returnCode1;
                 }
             }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java
index cc75403caf6..2e361e65cab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java
@@ -373,7 +373,7 @@ public class frames001 {
 
                     log2("       getting new List of frames");
                     try {
-                        frameList = thread2.frames();;
+                        frameList = thread2.frames();
                     } catch ( IndexOutOfBoundsException e1 ) {
                         log3("ERROR: IndexOutOfBoundsException");
                         expresult = returnCode1;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java
index f872a6dcba3..d9dd4a88c80 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java
@@ -79,7 +79,7 @@ public class hs203t002 extends RedefineAgent {
             Thread.sleep(10000);
             popThreadFrame(mt);
             resumeThread(mt);
-            while(!MyThread.resume2.get());;
+            while(!MyThread.resume2.get());
             Thread.sleep(10000);
                         suspendThread(mt);
             //mt.suspend();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
index d7aa6c30219..a78dabdbe25 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
@@ -184,7 +184,7 @@ public class Launcher extends DebugeeBinder {
             connect.append(argumentHandler.getConnectorName() + ":");
 
             String connectorAddress;
-            String vmAddress = makeTransportAddress();;
+            String vmAddress = makeTransportAddress();
 
             if (argumentHandler.isRawLaunchingConnector()) {
 
diff --git a/test/jdk/com/sun/jdi/ConstantPoolInfo.java b/test/jdk/com/sun/jdi/ConstantPoolInfo.java
index 097ab535cf2..5d5c2a6a5d9 100644
--- a/test/jdk/com/sun/jdi/ConstantPoolInfo.java
+++ b/test/jdk/com/sun/jdi/ConstantPoolInfo.java
@@ -241,7 +241,7 @@ public class ConstantPoolInfo extends TestScaffold {
         if (magic != JAVA_MAGIC) {
             failure("fatal bad class file format");
         }
-        expectedMinorVersion = in.readShort();;
+        expectedMinorVersion = in.readShort();
         expectedMajorVersion = in.readShort();
         expectedCpoolCount = in.readUnsignedShort();
         in.close();
diff --git a/test/jdk/com/sun/jdi/GenericsTest.java b/test/jdk/com/sun/jdi/GenericsTest.java
index 28a3d69a8d6..f12a5f74322 100644
--- a/test/jdk/com/sun/jdi/GenericsTest.java
+++ b/test/jdk/com/sun/jdi/GenericsTest.java
@@ -40,7 +40,7 @@ import java.util.*;
     /********** target program **********/
 
 class GenericsTarg {
-    static Gen1<String> genField = new Gen1<String>();;
+    static Gen1<String> genField = new Gen1<String>();
     static Sub1 sub1Field = new Sub1();
 
     String[] strArray = null;
diff --git a/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java b/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java
index c643aae1f00..0c1734cb1cc 100644
--- a/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java
+++ b/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java
@@ -86,7 +86,7 @@ public class CompEventOnHiddenComponent
         EventQueue.invokeLater(new Runnable() {
                 public void run() {
                     JFrame parentWindow = new JFrame("JFrame 1");
-                    JButton component = new JButton("JButton 1");;
+                    JButton component = new JButton("JButton 1");
                     JButton smallButton = new JButton("Small Button");
 
 
diff --git a/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java b/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
index e186e7ac132..535e6c68aa5 100644
--- a/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
+++ b/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java
@@ -81,7 +81,7 @@ public class EmbeddedFrameGrabTest {
                 = clazz.getConstructor(new Class[]{long.class});
         final Frame embedded_frame
                 = (Frame) constructor.newInstance(new Object[]{
-                    new Long(hwnd)});;
+                    new Long(hwnd)});
         final JComboBox<String> combo = new JComboBox<>(new String[]{
             "Item 1", "Item 2"
         });
diff --git a/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java b/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java
index 15cf121607c..7e9023b1afc 100644
--- a/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java
+++ b/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java
@@ -65,7 +65,7 @@ public class PrintArcTest extends Panel implements ActionListener {
     }
 
     private Frame getFrame() {
-        Container cont = getParent();;
+        Container cont = getParent();
 
         while ( !(cont instanceof Frame  ) ) {
             cont = cont.getParent();
diff --git a/test/jdk/java/awt/SplashScreen/GenerateTestImage.java b/test/jdk/java/awt/SplashScreen/GenerateTestImage.java
index 93def334756..ddde69ca295 100644
--- a/test/jdk/java/awt/SplashScreen/GenerateTestImage.java
+++ b/test/jdk/java/awt/SplashScreen/GenerateTestImage.java
@@ -43,7 +43,7 @@ public class GenerateTestImage {
         Graphics2D graphics2D = image.createGraphics();
         graphics2D.setColor(Color.red);
         graphics2D.fillOval(0, 0, IMAGE_SIZE, IMAGE_SIZE);
-        graphics2D.dispose();;
+        graphics2D.dispose();
 
        ImageIO.write(image, "png", file);
     }
diff --git a/test/jdk/java/awt/print/PrinterJob/PrtException.java b/test/jdk/java/awt/print/PrinterJob/PrtException.java
index 152fe70d485..bb590fd6cd9 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrtException.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrtException.java
@@ -50,7 +50,7 @@ public class PrtException implements Printable {
             }
 
             System.out.println("PrintService found : "+defService);
-            pj = PrinterJob.getPrinterJob();;
+            pj = PrinterJob.getPrinterJob();
             pj.setPrintService(defService);
             //pj.setPrintable(this); // commenting this line should not result in PrinterException
             pj.print();
diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java
index ac80bdf68fd..d53b246994e 100644
--- a/test/jdk/java/io/File/GetXSpace.java
+++ b/test/jdk/java/io/File/GetXSpace.java
@@ -154,7 +154,7 @@ public class GetXSpace {
                         // cygwin's df lists windows path as FileSystem (1st group)
                         name = Platform.isWindows() ? m.group(1) : m.group(4);
                     }
-                    al.add(new Space(m.group(2), m.group(3), name));;
+                    al.add(new Space(m.group(2), m.group(3), name));
                 }
                 j = m.end();
             } else {
diff --git a/test/jdk/java/io/File/createTempFile/NameTooLong.java b/test/jdk/java/io/File/createTempFile/NameTooLong.java
index 75d604b81e1..fe7bd03f95e 100644
--- a/test/jdk/java/io/File/createTempFile/NameTooLong.java
+++ b/test/jdk/java/io/File/createTempFile/NameTooLong.java
@@ -54,7 +54,7 @@ public class NameTooLong {
                 if (ps[1].startsWith(".")
                     && !s.contains(ps[1].substring(0, 4))) {
                     System.err.printf("%s did not contain %s%n", s,
-                        ps[1].substring(0, 4));;
+                        ps[1].substring(0, 4));
                     failures++;
                 }
             } catch (IOException e) {
diff --git a/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java b/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java
index cc89709b7e7..7b564bc633a 100644
--- a/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java
+++ b/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java
@@ -37,7 +37,7 @@ public class WriteBytesChars {
         byte[] b = new byte[80];
         File fn = new File("x.WriteBytesChars");
 
-        RandomAccessFile raf = new RandomAccessFile(fn , "rw");;
+        RandomAccessFile raf = new RandomAccessFile(fn , "rw");
         try {
             for (int i = 0; i < 80; i++) {
                 buf[i] = 'a';
diff --git a/test/jdk/java/lang/invoke/8022701/BogoLoader.java b/test/jdk/java/lang/invoke/8022701/BogoLoader.java
index e8c579a27c8..568ff62089e 100644
--- a/test/jdk/java/lang/invoke/8022701/BogoLoader.java
+++ b/test/jdk/java/lang/invoke/8022701/BogoLoader.java
@@ -120,7 +120,7 @@ public class BogoLoader extends ClassLoader {
                 if (verbose) {
                     System.err.println("Loading classloader class " + name);
                 }
-                byte[] classData = getClass(name);;
+                byte[] classData = getClass(name);
                 boolean expanded = false;
                 if (!noReplace && replaced.containsKey(name)) {
                     if (verbose) {
diff --git a/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java b/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java
index a129ea254a4..b4d19fe8a05 100644
--- a/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java
+++ b/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java
@@ -121,7 +121,7 @@ public class BogoLoader extends ClassLoader {
                 if (verbose) {
                     System.err.println("Loading classloader class " + name);
                 }
-                byte[] classData = getClass(name);;
+                byte[] classData = getClass(name);
                 boolean expanded = false;
                 if (!noReplace && replaced.containsKey(name)) {
                     if (verbose) {
diff --git a/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java b/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java
index 5f6923526ab..ac6de886b25 100644
--- a/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java
+++ b/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java
@@ -40,7 +40,7 @@ public class GetSystemProperties {
 
     // system properties to be omitted
     private static final String KEY3   = "test.property.key3";
-    private static final Long VALUE3   = new Long(0);;
+    private static final Long VALUE3   = new Long(0);
 
     private static final Object KEY4   = new Object();
     private static final String VALUE4 = "test.property.value4";
diff --git a/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java b/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
index 05d27547a15..60a35a42a06 100644
--- a/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
+++ b/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
@@ -485,7 +485,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         subscriber.subscriptionCF.thenAccept(s -> s.request(1));
         List<ByteBuffer> result = subscriber.resultCF.join();
         assertEquals(result, List.of());
-        assertTrue(subscriber.items.isEmpty());;
+        assertTrue(subscriber.items.isEmpty());
     }
 
     // verifies that error emitted by upstream publishers are propagated downstream.
diff --git a/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java b/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java
index 10fdcaaaea6..c715cad8c7c 100644
--- a/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java
+++ b/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java
@@ -102,7 +102,7 @@ public class CloseTimeoutChannel {
                 System.out.println(INDENT+"Listening on port "+
                     _listener.socket().getLocalPort());
                 ByteBuffer buf=ByteBuffer.allocate(5);
-                Socket client=_listener.accept().socket();;
+                Socket client=_listener.accept().socket();
                 System.out.println(INDENT+"Accepted client");
 
                 OutputStream out=client.getOutputStream();
diff --git a/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java b/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java
index c4a15b28bb1..9a0490beb0f 100644
--- a/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java
+++ b/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java
@@ -68,7 +68,7 @@ public class DGCImplInsulation implements java.rmi.Remote {
                 new ProtectionDomain(
                     new CodeSource(null, (Certificate[]) null), perms) });
 
-        Remote impl = new DGCImplInsulation();;
+        Remote impl = new DGCImplInsulation();
 
         try {
             Remote stub = (Remote) java.security.AccessController.doPrivileged(
diff --git a/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java
index 3f6c17b277a..d44216b69b5 100644
--- a/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java
+++ b/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java
@@ -1072,7 +1072,7 @@ public class TCKZoneRules {
                                            );
 
          OffsetDateTime before_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).minusSeconds(1);
-         OffsetDateTime after_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).plusSeconds(1);;
+         OffsetDateTime after_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).plusSeconds(1);
          assertEquals(zoneRule.getStandardOffset(before_time_of_stdOffsetTransition1.toInstant()), stdOffset1);
          assertEquals(zoneRule.getStandardOffset(after_time_of_stdOffsetTransition1.toInstant()), stdOffset2);
 
diff --git a/test/jdk/java/util/logging/TestAppletLoggerContext.java b/test/jdk/java/util/logging/TestAppletLoggerContext.java
index 6fbe975b5e4..b69497a626e 100644
--- a/test/jdk/java/util/logging/TestAppletLoggerContext.java
+++ b/test/jdk/java/util/logging/TestAppletLoggerContext.java
@@ -447,7 +447,7 @@ public class TestAppletLoggerContext {
                 Logger logger4b = manager.getLogger(Logger.GLOBAL_LOGGER_NAME);
                 assertNotNull(logger4);
                 assertNotNull(logger4b);
-                expected = (System.getSecurityManager() == null ? global : global2);;
+                expected = (System.getSecurityManager() == null ? global : global2);
                 assertEquals(logger4,  expected);
                 assertEquals(logger4b, expected);
 
diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java
index 4992553eba9..3ae2e777810 100644
--- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java
+++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java
@@ -134,7 +134,7 @@ public class SSLSocketExplorer {
             position += n;
         }
 
-        capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+        capabilities = SSLExplorer.explore(buffer, 0, recordLength);
         if (capabilities != null) {
             System.out.println("Record version: " +
                     capabilities.getRecordVersion());
diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
index 00d00001d87..7193fcaf136 100644
--- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
+++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
@@ -135,7 +135,7 @@ public class SSLSocketExplorerFailure {
                 position += n;
             }
 
-            capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+            capabilities = SSLExplorer.explore(buffer, 0, recordLength);
             if (capabilities != null) {
                 System.out.println("Record version: " +
                         capabilities.getRecordVersion());
diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
index 724a37e1a80..0cea7323b83 100644
--- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
+++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
@@ -138,7 +138,7 @@ public class SSLSocketExplorerMatchedSNI {
             position += n;
         }
 
-        capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+        capabilities = SSLExplorer.explore(buffer, 0, recordLength);
         if (capabilities != null) {
             System.out.println("Record version: " +
                     capabilities.getRecordVersion());
diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
index 732e0cf3097..619a997eda2 100644
--- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
+++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
@@ -130,7 +130,7 @@ public class SSLSocketExplorerUnmatchedSNI {
             position += n;
         }
 
-        capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+        capabilities = SSLExplorer.explore(buffer, 0, recordLength);
         if (capabilities != null) {
             System.out.println("Record version: " +
                     capabilities.getRecordVersion());
diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
index 8f2b7816864..8451b44f0bf 100644
--- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
+++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
@@ -129,7 +129,7 @@ public class SSLSocketExplorerWithCliSNI {
             position += n;
         }
 
-        capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+        capabilities = SSLExplorer.explore(buffer, 0, recordLength);
         if (capabilities != null) {
             System.out.println("Record version: " +
                     capabilities.getRecordVersion());
diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
index f026f32e781..8b891e804e4 100644
--- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
+++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
@@ -129,7 +129,7 @@ public class SSLSocketExplorerWithSrvSNI {
             position += n;
         }
 
-        capabilities = SSLExplorer.explore(buffer, 0, recordLength);;
+        capabilities = SSLExplorer.explore(buffer, 0, recordLength);
         if (capabilities != null) {
             System.out.println("Record version: " +
                     capabilities.getRecordVersion());
diff --git a/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java
index 348012f54bf..fdd6e542440 100644
--- a/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java
+++ b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java
@@ -37,7 +37,7 @@ import com.sun.media.sound.*;
 public class NewModelIdentifierStringStringInt {
 
     public static void main(String[] args) throws Exception {
-        ModelIdentifier id = new ModelIdentifier("test","a",1);;
+        ModelIdentifier id = new ModelIdentifier("test","a",1);
         if(!id.getObject().equals("test"))
             throw new RuntimeException("id.getObject() doesn't return \"test\"!");
         if(!id.getVariable().equals("a"))
diff --git a/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java
index 0330628c8b6..eaff35c2c3c 100644
--- a/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java
+++ b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java
@@ -56,7 +56,7 @@ public class NoteOff {
         assertEquals(v[0].active, true);
         channel.noteOff(60);
         soft.read(1);
-        v = soft.synth.getVoiceStatus();;
+        v = soft.synth.getVoiceStatus();
         assertEquals(v[0].active, false);
 
         soft.close();
diff --git a/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java
index 71172a049da..8143ee846a5 100644
--- a/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java
+++ b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java
@@ -56,7 +56,7 @@ public class NoteOff2 {
         assertEquals(v[0].active, true);
         channel.noteOff(60);
         soft.read(1);
-        v = soft.synth.getVoiceStatus();;
+        v = soft.synth.getVoiceStatus();
         assertEquals(v[0].active, false);
 
         soft.close();
diff --git a/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java
index 95883556a05..c1d2d9a2ed0 100644
--- a/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java
+++ b/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java
@@ -355,7 +355,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
         Blob aBlob = new SerialBlob(new StubBlob());
         Clob aClob = new SerialClob(new StubClob());
         Reader rdr = new StringReader(query);
-        InputStream is = new StringBufferInputStream(query);;
+        InputStream is = new StringBufferInputStream(query);
         brs = new StubBaseRowSet();
         brs.setBytes(1, bytes);
         brs.setAsciiStream(2, is, query.length());
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java
index a6756a13a4a..95cc508828a 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java
+++ b/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java
@@ -183,7 +183,7 @@ public class SQLInputImplTests extends BaseTest {
      */
     @Test(enabled = true)
     public void test10() throws Exception {
-        URL u = new URL("http://www.oracle.com/");;
+        URL u = new URL("http://www.oracle.com/");
         Object[] values = {u};
         SQLInputImpl sqli = new SQLInputImpl(values, map);
         URL u2 = sqli.readURL();
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java
index 077ce43da85..345315b7f05 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java
+++ b/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java
@@ -230,7 +230,7 @@ public class SerialArrayTests extends BaseTest {
     @Test
     public void test18() throws Exception {
         SerialArray sa = new SerialArray(a);
-        SerialArray sa1 = serializeDeserializeObject(sa);;
+        SerialArray sa1 = serializeDeserializeObject(sa);
         assertTrue(sa.equals(sa1));
     }
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java
index ff963ae7ba8..8ef215584a9 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java
+++ b/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java
@@ -108,6 +108,6 @@ public class SerialExceptionTests extends BaseTest {
         assertTrue(ex1.getMessage().equals(reason)
                 && ex1.getSQLState() == null
                 && ex1.getCause() == null
-                && ex1.getErrorCode() == 0);;
+                && ex1.getErrorCode() == 0);
     }
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java
index 84a0ff2aaaf..79ac2421c9a 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java
+++ b/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java
@@ -134,7 +134,7 @@ public class SerialStructTests extends BaseTest {
     @Test
     public void test08() throws Exception {
         SerialStruct ss = new SerialStruct(struct, map);
-        SerialStruct ss1 = serializeDeserializeObject(ss);;
+        SerialStruct ss1 = serializeDeserializeObject(ss);
         assertTrue(ss.equals(ss1));
     }
 }
diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java b/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java
index 923895447c7..a81262f9405 100644
--- a/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java
@@ -194,11 +194,11 @@ public class TestRecordingFile {
                    rotator.stop();
                }
                r2.stop();
-               r2.dump(twoEventTypes);;
+               r2.dump(twoEventTypes);
            }
            FlightRecorder.register(Event3.class);
            r1.stop();
-           r1.dump(threeEventTypes);;
+           r1.dump(threeEventTypes);
        }
        try (RecordingFile f = new RecordingFile(twoEventTypes)) {
            List<EventType> types = f.readEventTypes();
diff --git a/test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java b/test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java
index 3d7d143f44c..3dbe26eea16 100644
--- a/test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java
+++ b/test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java
@@ -89,7 +89,7 @@ public class TestReuse {
                 es.setReuse(true);
                 es.onEvent(e -> {
                     if(events.containsKey(e)) {
-                        success.set(true);;
+                        success.set(true);
                         es.close();
                     }
                     events.put(e,e);
diff --git a/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java b/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java
index af740a6e559..7ee9748520a 100644
--- a/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java
+++ b/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java
@@ -101,7 +101,7 @@ public class TestEventTime {
         MyEvent event = new MyEvent(id);
         event.begin();
         if (!CommonHelper.hasFastTimeEnabled()) {
-            CommonHelper.waitForSystemCurrentMillisToChange();;
+            CommonHelper.waitForSystemCurrentMillisToChange();
         }
         actualOrder.add(new TimeEvent(id, true));
         return event;
@@ -110,7 +110,7 @@ public class TestEventTime {
     private static void endEvent(MyEvent event) throws Exception {
         event.end();
         if (!CommonHelper.hasFastTimeEnabled()) {
-            CommonHelper.waitForSystemCurrentMillisToChange();;
+            CommonHelper.waitForSystemCurrentMillisToChange();
         }
         event.commit();
         actualOrder.add(new TimeEvent(event.id, false));
diff --git a/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java b/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java
index 5be87e78e10..7f6f7be79d2 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java
@@ -58,8 +58,8 @@ public final class TestActiveSettingEvent {
     private static final String ACTIVE_SETTING_EVENT_NAME = EventNames.ActiveSetting;
 
     public static void main(String[] args) throws Throwable {
-        testDefaultSettings();;
-        testProfileSettings();;
+        testDefaultSettings();
+        testProfileSettings();
         testNewSettings();
         testChangedSetting();
         testUnregistered();
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java
index 724a16715bb..105160237cc 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java
@@ -58,9 +58,9 @@ public class ToolTipDemo extends JPanel {
 
     public static final String DEMO_TITLE = ToolTipDemo.class.getAnnotation(DemoProperties.class).value();
     private final static ResourceManager resourceManager = new ResourceManager(ToolTipDemo.class);
-    public static final String PLAIN_TOOLTIP_COMP_TITLE = resourceManager.getString("ToolTipDemo.plain");;
+    public static final String PLAIN_TOOLTIP_COMP_TITLE = resourceManager.getString("ToolTipDemo.plain");
     public static final String PLAIN_TOOLTIP_TEXT = "A simple one line tip.";
-    public static final String HTML_TOOLTIP_COMP_TITLE = resourceManager.getString("ToolTipDemo.html");;
+    public static final String HTML_TOOLTIP_COMP_TITLE = resourceManager.getString("ToolTipDemo.html");
     public static final String HTML_TOOLTIP_TEXT = "<html><body bgcolor=\"#AABBFF\">In case you thought that tooltips had to be<p>" +
             "boring, one line descriptions, the <font color=blue size=+2>Swing!</font> team<p>" +
             "is happy to shatter your illusions.<p>" +
diff --git a/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java
index a16f37f1236..62cc0f52720 100644
--- a/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java
+++ b/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java
@@ -258,7 +258,7 @@ public class ImageFactory {
                         for (int j = 0; j < HEIGHT; j++) {
                             pixel[0] = (i/255.0)*(cs.getMaxValue(0) -
                                                   cs.getMinValue(0)) +
-                                       cs.getMinValue(0);;
+                                       cs.getMinValue(0);
                             sm.setPixel(i, j, pixel, data);
                         }
                     }
@@ -268,7 +268,7 @@ public class ImageFactory {
                         for (int j = 0; j < HEIGHT; j++) {
                             pixel[0] = (i/255.0f)*(cs.getMaxValue(0) -
                                                   cs.getMinValue(0)) +
-                                       cs.getMinValue(0);;
+                                       cs.getMinValue(0);
                             sm.setPixel(i, j, pixel, data);
                         }
                     }
diff --git a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java
index 3edf02d70d7..0037ac7bad6 100644
--- a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java
+++ b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java
@@ -348,7 +348,7 @@ public class CPBuilder {
         for (String key : certmap.keySet()) {
             String certStr = certmap.get(key);
             ByteArrayInputStream is =
-                        new ByteArrayInputStream(certStr.getBytes());;
+                        new ByteArrayInputStream(certStr.getBytes());
             Certificate cert = cf.generateCertificate(is);
             entries.add(cert);
         }
diff --git a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java
index e6a9765037b..9785b270299 100644
--- a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java
+++ b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java
@@ -353,7 +353,7 @@ public class CPBuilderWithMD5 {
         for (String key : certmap.keySet()) {
             String certStr = certmap.get(key);
             ByteArrayInputStream is =
-                        new ByteArrayInputStream(certStr.getBytes());;
+                        new ByteArrayInputStream(certStr.getBytes());
             Certificate cert = cf.generateCertificate(is);
             entries.add(cert);
         }
diff --git a/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java b/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java
index 401dfe6ca31..d2ca78f044a 100644
--- a/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java
+++ b/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java
@@ -134,7 +134,7 @@ public class BasicLauncherTest {
             launcher.addToolArg("--pid=" + Long.toString(theApp.getPid()));
 
             ProcessBuilder processBuilder = SATestUtils.createProcessBuilder(launcher);
-            OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);;
+            OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
             output.shouldContain("No deadlocks found");
             output.shouldNotContain("illegal bci");
             output.shouldNotContain("AssertionFailure");
@@ -171,7 +171,7 @@ public class BasicLauncherTest {
 
             ProcessBuilder processBuilder = SATestUtils.createProcessBuilder(launcher);
             processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);
-            OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);;
+            OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
             output.shouldContain(expectedMessage);
             unexpectedMessage.ifPresent(output::shouldNotContain);
             output.shouldHaveExitValue(0);
diff --git a/test/jdk/tools/jar/modularJar/Basic.java b/test/jdk/tools/jar/modularJar/Basic.java
index 26e9b835a49..177ae2a8453 100644
--- a/test/jdk/tools/jar/modularJar/Basic.java
+++ b/test/jdk/tools/jar/modularJar/Basic.java
@@ -123,7 +123,7 @@ public class Basic {
             moduleName = mn; mainClass = mc; version = v; message = m; hashes = h;
             this.requires = requires != null ? requires : Collections.emptySet();
             this.exports = exports != null ? exports : Collections.emptySet();
-            this.uses = uses != null ? uses : Collections.emptySet();;
+            this.uses = uses != null ? uses : Collections.emptySet();
             this.provides = provides != null ? provides : Collections.emptySet();
             this.packages = Stream.concat(this.exports.stream(), contains.stream())
                                   .collect(Collectors.toSet());
diff --git a/test/jdk/tools/jar/multiRelease/data/test13/v10/version/Nested.java b/test/jdk/tools/jar/multiRelease/data/test13/v10/version/Nested.java
index 7acd05676b4..35f43edcb39 100644
--- a/test/jdk/tools/jar/multiRelease/data/test13/v10/version/Nested.java
+++ b/test/jdk/tools/jar/multiRelease/data/test13/v10/version/Nested.java
@@ -12,7 +12,7 @@ public class Nested {
         int save = getVersion();
 
         class nestnested {
-            int save = getVersion();;
+            int save = getVersion();
         }
     }
 }
diff --git a/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java b/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java
index 1a8f1d89f77..ab84566e827 100644
--- a/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java
+++ b/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java
@@ -104,7 +104,7 @@ public class JavadocTaskImplTest extends APITest {
             File outDir = getOutDir();
             fm.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(outDir));
             try {
-                DocumentationTask t = new JavadocTaskImpl(c, null, null, files);;
+                DocumentationTask t = new JavadocTaskImpl(c, null, null, files);
                 error("getTask succeeded, no exception thrown");
             } catch (NullPointerException e) {
                 System.err.println("exception caught as expected: " + e);
diff --git a/test/langtools/jdk/jshell/VariablesTest.java b/test/langtools/jdk/jshell/VariablesTest.java
index 4224331b331..be957d5065e 100644
--- a/test/langtools/jdk/jshell/VariablesTest.java
+++ b/test/langtools/jdk/jshell/VariablesTest.java
@@ -340,7 +340,7 @@ public class VariablesTest extends KullaTesting {
         //assertEquals(getState().source(snippet), src);
         //assertEquals(snippet, undefKey);
         assertEquals(getState().status(undefKey), RECOVERABLE_NOT_DEFINED);
-        List<String> unr = getState().unresolvedDependencies((VarSnippet) undefKey).collect(toList());;
+        List<String> unr = getState().unresolvedDependencies((VarSnippet) undefKey).collect(toList());
         assertEquals(unr.size(), 1);
         assertEquals(unr.get(0), "class undefined");
         assertVariables(variable("undefined", "d"));
diff --git a/test/langtools/tools/doclint/RunTest.java b/test/langtools/tools/doclint/RunTest.java
index 2d287136b47..aff4b6c855b 100644
--- a/test/langtools/tools/doclint/RunTest.java
+++ b/test/langtools/tools/doclint/RunTest.java
@@ -59,7 +59,7 @@ public class RunTest {
                 System.err.println("test: " + m.getName());
                 try {
                     StringWriter sw = new StringWriter();
-                    PrintWriter pw = new PrintWriter(sw);;
+                    PrintWriter pw = new PrintWriter(sw);
                     m.invoke(this, new Object[] { pw });
                     String out = sw.toString();
                     System.err.println(">>> " + out.replace("\n", "\n>>> "));
diff --git a/test/langtools/tools/javac/generics/inference/4954546/T4954546.java b/test/langtools/tools/javac/generics/inference/4954546/T4954546.java
index 7ce1dcb5a3a..456624b8333 100644
--- a/test/langtools/tools/javac/generics/inference/4954546/T4954546.java
+++ b/test/langtools/tools/javac/generics/inference/4954546/T4954546.java
@@ -46,7 +46,7 @@ public class T4954546 {
         f(true, new A(), new B());
     }
     static void f(boolean cond, A a, B b) {
-        (cond?a:b).f();;
-        (cond?a:b).g();;
+        (cond?a:b).f();
+        (cond?a:b).g();
     }
 }
-- 
GitLab


From 50eb915a74aed2daf03c7d39670d3a1ac8d5cbfb Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Mon, 7 Mar 2022 22:00:11 +0000
Subject: [PATCH 021/345] 8282632: Cleanup unnecessary calls to
 Throwable.initCause() in java.security.jgss

Reviewed-by: mullan, rhalade
---
 .../www/protocol/http/spnego/NegotiatorImpl.java    | 10 +++-------
 .../sun/security/krb5/internal/KRBError.java        |  8 +++-----
 .../krb5/internal/crypto/dk/ArcFourCrypto.java      | 13 +++----------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java b/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java
index 82f2391816b..aa5795448c9 100644
--- a/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java
+++ b/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,9 +127,7 @@ public class NegotiatorImpl extends Negotiator {
                         "fallback to other scheme if allowed. Reason:");
                 e.printStackTrace();
             }
-            IOException ioe = new IOException("Negotiate support not initiated");
-            ioe.initCause(e);
-            throw ioe;
+            throw new IOException("Negotiate support not initiated", e);
         }
     }
 
@@ -157,9 +155,7 @@ public class NegotiatorImpl extends Negotiator {
                 System.out.println("Negotiate support cannot continue. Reason:");
                 e.printStackTrace();
             }
-            IOException ioe = new IOException("Negotiate support cannot continue");
-            ioe.initCause(e);
-            throw ioe;
+            throw new IOException("Negotiate support cannot continue", e);
         }
     }
 }
diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java
index 93505216090..206bbfc46f5 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -234,10 +234,8 @@ public class KRBError implements java.io.Serializable {
                     System.out.println("Unable to parse eData field of KRB-ERROR:\n" +
                             new sun.security.util.HexDumpEncoder().encodeBuffer(data));
                 }
-                IOException ioe = new IOException(
-                        "Unable to parse eData field of KRB-ERROR");
-                ioe.initCause(e);
-                throw ioe;
+                throw new IOException(
+                        "Unable to parse eData field of KRB-ERROR", e);
             }
         } else {
             if (DEBUG) {
diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
index cb9912df6c2..a8bda6008f6 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import java.security.*;
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.util.*;
-import sun.security.krb5.EncryptedData;
 import sun.security.krb5.KrbCryptoException;
 import sun.security.krb5.Confounder;
 import sun.security.krb5.internal.crypto.KeyUsage;
@@ -159,10 +158,7 @@ public class ArcFourCrypto extends DkCrypto {
            System.arraycopy(ss, 0, new_ss, 0, ss.length);
            Ksign = getHmac(baseKey, new_ss);
         } catch (Exception e) {
-            GeneralSecurityException gse =
-                new GeneralSecurityException("Calculate Checkum Failed!");
-            gse.initCause(e);
-            throw gse;
+            throw new GeneralSecurityException("Calculate Checksum Failed!", e);
         }
 
         // get the salt using key usage
@@ -173,10 +169,7 @@ public class ArcFourCrypto extends DkCrypto {
         try {
             messageDigest = MessageDigest.getInstance("MD5");
         } catch (NoSuchAlgorithmException e) {
-            GeneralSecurityException gse =
-                new GeneralSecurityException("Calculate Checkum Failed!");
-            gse.initCause(e);
-            throw gse;
+            throw new GeneralSecurityException("Calculate Checksum Failed!", e);
         }
         messageDigest.update(salt);
         messageDigest.update(input, start, len);
-- 
GitLab


From cde923dd471a22cd69ea2cd4994bb16eba780804 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 8 Mar 2022 00:19:07 +0000
Subject: [PATCH 022/345] 8282690: runtime/CommandLine/VMDeprecatedOptions.java
 fails after JDK-8281181

Reviewed-by: dholmes, dcubed
---
 test/hotspot/jtreg/ProblemList.txt                        | 1 -
 .../jtreg/runtime/CommandLine/VMDeprecatedOptions.java    | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 5f007410904..518238d9c0a 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -102,7 +102,6 @@ runtime/os/TestTracePageSizes.java#compiler-options 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#G1 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#Parallel 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#Serial 8267460 linux-aarch64
-runtime/CommandLine/VMDeprecatedOptions.java 8282690 generic-all
 runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
 
 applications/jcstress/copy.java 8229852 linux-all
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index 164aaa4d9a0..ee93c740cf1 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
@@ -45,6 +45,8 @@ public class VMDeprecatedOptions {
      */
     public static final String[][] DEPRECATED_OPTIONS;
     static {
+        // Use an ArrayList so platform-specific flags can be
+        // optionally added.
         ArrayList<String[]> deprecated = new ArrayList(
           Arrays.asList(new String[][] {
             // deprecated non-alias flags:
@@ -54,14 +56,16 @@ public class VMDeprecatedOptions {
             {"InitialRAMFraction",        "64"},
             {"TLABStats",                 "false"},
             {"AllowRedefinitionToAddDeleteMethods", "true"},
-            {"UseContainerCpuShares",      "false"},
-            {"PreferContainerQuotaForCPUCount", "true"},
 
             // deprecated alias flags (see also aliased_jvm_flags):
             {"DefaultMaxRAMFraction", "4"},
             {"CreateMinidumpOnCrash", "false"}
           }
         ));
+        if (Platform.isLinux()) {
+            deprecated.add(new String[] {"UseContainerCpuShares",           "false"});
+            deprecated.add(new String[] {"PreferContainerQuotaForCPUCount", "true"});
+        }
         DEPRECATED_OPTIONS = deprecated.toArray(new String[][]{});
     };
 
-- 
GitLab


From 3f0684d0b85662724af845a4ee6b97d9c5ceacbd Mon Sep 17 00:00:00 2001
From: Yi Yang <yyang@openjdk.org>
Date: Tue, 8 Mar 2022 03:14:21 +0000
Subject: [PATCH 023/345] 8275775: Add jcmd VM.classes to print details of all
 classes

Reviewed-by: dholmes, iklam, stuefe
---
 src/hotspot/share/oops/instanceKlass.cpp      | 52 ++++++++++++++++++-
 src/hotspot/share/oops/instanceKlass.hpp      | 10 ++++
 src/hotspot/share/runtime/vmOperation.hpp     |  1 +
 .../share/services/diagnosticCommand.cpp      | 37 +++++++++++++
 .../share/services/diagnosticCommand.hpp      | 22 ++++++++
 .../runtime/CommandLine/PrintClasses.java     | 51 ++++++++++++++++++
 6 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/runtime/CommandLine/PrintClasses.java

diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 5545732a1c1..e5dbd1f293e 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2074,6 +2074,52 @@ Method* InstanceKlass::lookup_method_in_all_interfaces(Symbol* name,
   return NULL;
 }
 
+PrintClassClosure::PrintClassClosure(outputStream* st, bool verbose)
+  :_st(st), _verbose(verbose) {
+  ResourceMark rm;
+  _st->print("%-18s  ", "KlassAddr");
+  _st->print("%-4s  ", "Size");
+  _st->print("%-20s  ", "State");
+  _st->print("%-7s  ", "Flags");
+  _st->print("%-5s  ", "ClassName");
+  _st->cr();
+}
+
+void PrintClassClosure::do_klass(Klass* k)  {
+  ResourceMark rm;
+  // klass pointer
+  _st->print(INTPTR_FORMAT "  ", p2i(k));
+  // klass size
+  _st->print("%4d  ", k->size());
+  // initialization state
+  if (k->is_instance_klass()) {
+    _st->print("%-20s  ",InstanceKlass::cast(k)->init_state_name());
+  } else {
+    _st->print("%-20s  ","");
+  }
+  // misc flags(Changes should synced with ClassesDCmd::ClassesDCmd help doc)
+  char buf[10];
+  int i = 0;
+  if (k->has_finalizer()) buf[i++] = 'F';
+  if (k->has_final_method()) buf[i++] = 'f';
+  if (k->is_instance_klass()) {
+    InstanceKlass* ik = InstanceKlass::cast(k);
+    if (ik->is_rewritten()) buf[i++] = 'W';
+    if (ik->is_contended()) buf[i++] = 'C';
+    if (ik->has_been_redefined()) buf[i++] = 'R';
+    if (ik->is_shared()) buf[i++] = 'S';
+  }
+  buf[i++] = '\0';
+  _st->print("%-7s  ", buf);
+  // klass name
+  _st->print("%-5s  ", k->external_name());
+  // end
+  _st->cr();
+  if (_verbose) {
+    k->print_on(_st);
+  }
+}
+
 /* jni_id_for for jfieldIds only */
 JNIid* InstanceKlass::jni_id_for(int offset) {
   MutexLocker ml(JfieldIdCreation_lock);
@@ -3393,6 +3439,10 @@ static void print_vtable(vtableEntry* start, int len, outputStream* st) {
   return print_vtable(reinterpret_cast<intptr_t*>(start), len, st);
 }
 
+const char* InstanceKlass::init_state_name() const {
+  return state_names[_init_state];
+}
+
 void InstanceKlass::print_on(outputStream* st) const {
   assert(is_klass(), "must be klass");
   Klass::print_on(st);
@@ -3400,7 +3450,7 @@ void InstanceKlass::print_on(outputStream* st) const {
   st->print(BULLET"instance size:     %d", size_helper());                        st->cr();
   st->print(BULLET"klass size:        %d", size());                               st->cr();
   st->print(BULLET"access:            "); access_flags().print_on(st);            st->cr();
-  st->print(BULLET"state:             "); st->print_cr("%s", state_names[_init_state]);
+  st->print(BULLET"state:             "); st->print_cr("%s", init_state_name());
   st->print(BULLET"name:              "); name()->print_value_on(st);             st->cr();
   st->print(BULLET"super:             "); Metadata::print_value_on_maybe_null(st, super()); st->cr();
   st->print(BULLET"sub:               ");
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 11f03cc149b..9ec3535e0dc 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -547,6 +547,7 @@ public:
   bool is_in_error_state() const           { return _init_state == initialization_error; }
   bool is_reentrant_initialization(Thread *thread)  { return thread == _init_thread; }
   ClassState  init_state()                 { return (ClassState)_init_state; }
+  const char* init_state_name() const;
   bool is_rewritten() const                { return (_misc_flags & _misc_rewritten) != 0; }
 
   // is this a sealed class
@@ -1277,6 +1278,15 @@ inline u2 InstanceKlass::next_method_idnum() {
   }
 }
 
+class PrintClassClosure : public KlassClosure {
+private:
+  outputStream* _st;
+  bool _verbose;
+public:
+  PrintClassClosure(outputStream* st, bool verbose);
+
+  void do_klass(Klass* k);
+};
 
 /* JNIid class for jfieldIDs only */
 class JNIid: public CHeapObj<mtClass> {
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index 5489770f386..e6e9f3f6457 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -95,6 +95,7 @@
   template(CleanClassLoaderDataMetaspaces)        \
   template(PrintCompileQueue)                     \
   template(PrintClassHierarchy)                   \
+  template(PrintClasses)                          \
   template(ICBufferFull)                          \
   template(PrintMetadata)                         \
   template(GTestExecuteAtSafepoint)               \
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 06b9539a94d..725d8016134 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -26,6 +26,7 @@
 #include "jvm.h"
 #include "classfile/classLoaderHierarchyDCmd.hpp"
 #include "classfile/classLoaderStats.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmClasses.hpp"
@@ -102,6 +103,7 @@ void DCmdRegistrant::register_dcmds(){
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemDictionaryDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHierarchyDCmd>(full_export, true, false));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassesDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SymboltableDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<StringtableDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<metaspace::MetaspaceDCmd>(full_export, true, false));
@@ -954,6 +956,41 @@ void TouchedMethodsDCmd::execute(DCmdSource source, TRAPS) {
   VMThread::execute(&dumper);
 }
 
+ClassesDCmd::ClassesDCmd(outputStream* output, bool heap) :
+                                     DCmdWithParser(output, heap),
+  _verbose("-verbose",
+           "Dump the detailed content of a Java class. "
+           "Some classes are annotated with flags: "
+           "F = has, or inherits, a non-empty finalize method, "
+           "f = has final method, "
+           "W = methods rewritten, "
+           "C = marked with @Contended annotation, "
+           "R = has been redefined, "
+           "S = is shared class",
+           "BOOLEAN", false, "false") {
+  _dcmdparser.add_dcmd_option(&_verbose);
+}
+
+class VM_PrintClasses : public VM_Operation {
+private:
+  outputStream* _out;
+  bool _verbose;
+public:
+  VM_PrintClasses(outputStream* out, bool verbose) : _out(out), _verbose(verbose) {}
+
+  virtual VMOp_Type type() const { return VMOp_PrintClasses; }
+
+  virtual void doit() {
+    PrintClassClosure closure(_out, _verbose);
+    ClassLoaderDataGraph::classes_do(&closure);
+  }
+};
+
+void ClassesDCmd::execute(DCmdSource source, TRAPS) {
+  VM_PrintClasses vmop(output(), _verbose.is_set());
+  VMThread::execute(&vmop);
+}
+
 #if INCLUDE_CDS
 DumpSharedArchiveDCmd::DumpSharedArchiveDCmd(outputStream* output, bool heap) :
                                      DCmdWithParser(output, heap),
diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp
index d276a3ca756..dfcdc783f88 100644
--- a/src/hotspot/share/services/diagnosticCommand.hpp
+++ b/src/hotspot/share/services/diagnosticCommand.hpp
@@ -858,6 +858,28 @@ public:
   virtual void execute(DCmdSource source, TRAPS);
 };
 
+class ClassesDCmd : public DCmdWithParser {
+protected:
+  DCmdArgument<bool> _verbose;
+public:
+  ClassesDCmd(outputStream* output, bool heap);
+  static const char* name() {
+    return "VM.classes";
+  }
+  static const char* description() {
+    return "Print all loaded classes";
+  }
+  static const char* impact() {
+      return "Medium: Depends on number of loaded classes.";
+  }
+  static const JavaPermission permission() {
+    JavaPermission p = {"java.lang.management.ManagementPermission",
+                        "monitor", NULL};
+    return p;
+  }
+  virtual void execute(DCmdSource source, TRAPS);
+};
+
 #if INCLUDE_JVMTI
 class DebugOnCmdStartDCmd : public DCmd {
 public:
diff --git a/test/hotspot/jtreg/runtime/CommandLine/PrintClasses.java b/test/hotspot/jtreg/runtime/CommandLine/PrintClasses.java
new file mode 100644
index 00000000000..7c45e2ea02f
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/CommandLine/PrintClasses.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022, Alibaba Group Holding Limited. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ * @bug 8275775
+ * @summary Test jcmd VM.classes
+ * @library /test/lib
+ * @run main/othervm PrintClasses
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
+
+public class PrintClasses {
+  public static void main(String args[]) throws Exception {
+    var pid = Long.toString(ProcessHandle.current().pid());
+    var pb = new ProcessBuilder();
+
+    pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.classes"});
+    var output = new OutputAnalyzer(pb.start());
+    output.shouldNotContain("instance size");
+    output.shouldContain(PrintClasses.class.getSimpleName());
+
+    pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.classes", "-verbose"});
+    output = new OutputAnalyzer(pb.start());
+    output.shouldContain("instance size");
+    output.shouldContain(PrintClasses.class.getSimpleName());
+  }
+}
-- 
GitLab


From 8b45dbdae6e5dee85ef65ce25850ce692ad3e965 Mon Sep 17 00:00:00 2001
From: Jamil Nimeh <jnimeh@openjdk.org>
Date: Tue, 8 Mar 2022 05:50:41 +0000
Subject: [PATCH 024/345] 8282312: Minor corrections to evbroadcasti32x4
 intrinsic on x86

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

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index e9652fa04b2..be8c18b0710 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -9864,12 +9864,12 @@ void Assembler::vpbroadcastq(XMMRegister dst, Address src, int vector_len) {
 
 void Assembler::evbroadcasti32x4(XMMRegister dst, Address src, int vector_len) {
   assert(vector_len != Assembler::AVX_128bit, "");
-  assert(VM_Version::supports_avx512dq(), "");
+  assert(VM_Version::supports_evex(), "");
   assert(dst != xnoreg, "sanity");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_rex_vex_w_reverted();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_T2, /* input_size_in_bits */ EVEX_64bit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T4, /* input_size_in_bits */ EVEX_32bit);
   // swap src<->dst for encoding
   vex_prefix(src, 0, dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes);
   emit_int8(0x5A);
-- 
GitLab


From e607287204dbb551b75e82f4de64ea3cd0f47f24 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 8 Mar 2022 08:24:10 +0000
Subject: [PATCH 025/345] 8282728: Serial: Remove unused
 BlockOffsetArray::Action

Reviewed-by: tschatzl
---
 .../share/gc/shared/blockOffsetTable.cpp      | 42 ++++---------------
 .../share/gc/shared/blockOffsetTable.hpp      | 10 +----
 2 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.cpp b/src/hotspot/share/gc/shared/blockOffsetTable.cpp
index e350e70ad5f..2a4f3a48fa3 100644
--- a/src/hotspot/share/gc/shared/blockOffsetTable.cpp
+++ b/src/hotspot/share/gc/shared/blockOffsetTable.cpp
@@ -248,14 +248,10 @@ BlockOffsetArray::alloc_block(HeapWord* blk_start, HeapWord* blk_end) {
   single_block(blk_start, blk_end);
 }
 
-// Action_mark - update the BOT for the block [blk_start, blk_end).
-//               Current typical use is for splitting a block.
-// Action_single - udpate the BOT for an allocation.
-// Action_verify - BOT verification.
 void
 BlockOffsetArray::do_block_internal(HeapWord* blk_start,
                                     HeapWord* blk_end,
-                                    Action action, bool reducing) {
+                                    bool reducing) {
   assert(_sp->is_in_reserved(blk_start),
          "reference must be into the space");
   assert(_sp->is_in_reserved(blk_end-1),
@@ -284,33 +280,13 @@ BlockOffsetArray::do_block_internal(HeapWord* blk_start,
     }
     assert(start_index <= end_index, "monotonicity of index_for()");
     assert(boundary <= (HeapWord*)boundary_before_end, "tautology");
-    switch (action) {
-      case Action_mark: {
-        if (init_to_zero()) {
-          _array->set_offset_array(start_index, boundary, blk_start, reducing);
-          break;
-        } // Else fall through to the next case
-      }
-      case Action_single: {
-        _array->set_offset_array(start_index, boundary, blk_start, reducing);
-        // We have finished marking the "offset card". We need to now
-        // mark the subsequent cards that this blk spans.
-        if (start_index < end_index) {
-          HeapWord* rem_st = _array->address_for_index(start_index) + BOTConstants::card_size_in_words();
-          HeapWord* rem_end = _array->address_for_index(end_index) + BOTConstants::card_size_in_words();
-          set_remainder_to_point_to_start(rem_st, rem_end, reducing);
-        }
-        break;
-      }
-      case Action_check: {
-        _array->check_offset_array(start_index, boundary, blk_start);
-        // We have finished checking the "offset card". We need to now
-        // check the subsequent cards that this blk spans.
-        check_all_cards(start_index + 1, end_index);
-        break;
-      }
-      default:
-        ShouldNotReachHere();
+    _array->set_offset_array(start_index, boundary, blk_start, reducing);
+    // We have finished marking the "offset card". We need to now
+    // mark the subsequent cards that this blk spans.
+    if (start_index < end_index) {
+      HeapWord* rem_st = _array->address_for_index(start_index) + BOTConstants::card_size_in_words();
+      HeapWord* rem_end = _array->address_for_index(end_index) + BOTConstants::card_size_in_words();
+      set_remainder_to_point_to_start(rem_st, rem_end, reducing);
     }
   }
 }
@@ -322,7 +298,7 @@ BlockOffsetArray::do_block_internal(HeapWord* blk_start,
 void
 BlockOffsetArray::single_block(HeapWord* blk_start,
                                HeapWord* blk_end) {
-  do_block_internal(blk_start, blk_end, Action_single);
+  do_block_internal(blk_start, blk_end);
 }
 
 void BlockOffsetArray::verify() const {
diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.hpp
index 9a32594c123..6adc224876d 100644
--- a/src/hotspot/share/gc/shared/blockOffsetTable.hpp
+++ b/src/hotspot/share/gc/shared/blockOffsetTable.hpp
@@ -279,14 +279,6 @@ class Space;
 class BlockOffsetArray: public BlockOffsetTable {
   friend class VMStructs;
  protected:
-  // The following enums are used by do_block_internal() below
-  enum Action {
-    Action_single,      // BOT records a single block (see single_block())
-    Action_mark,        // BOT marks the start of a block (see mark_block())
-    Action_check        // Check that BOT records block correctly
-                        // (see verify_single_block()).
-  };
-
   // The shared array, which is shared with other BlockOffsetArray's
   // corresponding to different spaces within a generation or span of
   // memory.
@@ -315,7 +307,7 @@ class BlockOffsetArray: public BlockOffsetTable {
   void set_remainder_to_point_to_start_incl(size_t start, size_t end, bool reducing = false);
 
   // A helper function for BOT adjustment/verification work
-  void do_block_internal(HeapWord* blk_start, HeapWord* blk_end, Action action, bool reducing = false);
+  void do_block_internal(HeapWord* blk_start, HeapWord* blk_end, bool reducing = false);
 
  public:
   // The space may not have its bottom and top set yet, which is why the
-- 
GitLab


From 65ca0a5776df229ee91f420585ca1e8f91e489c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Tue, 8 Mar 2022 09:28:46 +0000
Subject: [PATCH 026/345] 8276333:
 jdk/jfr/event/oldobject/TestLargeRootSet.java failed
 "assert(!contains(edge->reference())) failed: invariant"

Reviewed-by: egahlin
---
 .../jfr/leakprofiler/chains/dfsClosure.cpp    | 19 +++++++++----------
 .../jfr/leakprofiler/chains/edgeStore.cpp     | 15 +++++++++++++--
 test/jdk/ProblemList.txt                      |  1 -
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.cpp b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.cpp
index 8161e172215..c6d368a9020 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.cpp
@@ -80,24 +80,23 @@ void DFSClosure::closure_impl(UnifiedOopRef reference, const oop pointee) {
   if (GranularTimer::is_finished()) {
     return;
   }
+
   if (_depth == 0 && _ignore_root_set) {
     // Root set is already marked, but we want
     // to continue, so skip is_marked check.
     assert(_mark_bits->is_marked(pointee), "invariant");
-  }  else {
+    _reference_stack[_depth] = reference;
+  } else {
     if (_mark_bits->is_marked(pointee)) {
       return;
     }
+    _mark_bits->mark_obj(pointee);
+    _reference_stack[_depth] = reference;
+    // is the pointee a sample object?
+    if (pointee->mark().is_marked()) {
+      add_chain();
+    }
   }
-  _reference_stack[_depth] = reference;
-  _mark_bits->mark_obj(pointee);
-  assert(_mark_bits->is_marked(pointee), "invariant");
-
-  // is the pointee a sample object?
-  if (pointee->mark().is_marked()) {
-    add_chain();
-  }
-
   assert(_max_depth >= 1, "invariant");
   if (_depth < _max_depth - 1) {
     _depth++;
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.cpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.cpp
index 8ba9409df56..c9bee7d1ab6 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.cpp
@@ -234,7 +234,15 @@ static int leak_context_edge_idx(const ObjectSample* sample) {
 }
 
 bool EdgeStore::has_leak_context(const ObjectSample* sample) const {
-  return leak_context_edge_idx(sample) != 0;
+  const int idx = leak_context_edge_idx(sample);
+  if (idx == 0) {
+    return false;
+  }
+  assert(idx > 0, "invariant");
+  assert(_leak_context_edges != nullptr, "invariant");
+  assert(idx < _leak_context_edges->length(), "invariant");
+  assert(_leak_context_edges->at(idx) != nullptr, "invariant");
+  return true;
 }
 
 const StoredEdge* EdgeStore::get(const ObjectSample* sample) const {
@@ -243,7 +251,10 @@ const StoredEdge* EdgeStore::get(const ObjectSample* sample) const {
     assert(SafepointSynchronize::is_at_safepoint(), "invariant");
     const int idx = leak_context_edge_idx(sample);
     if (idx > 0) {
-      return _leak_context_edges->at(idx);
+      assert(idx < _leak_context_edges->length(), "invariant");
+      const StoredEdge* const edge =_leak_context_edges->at(idx);
+      assert(edge != nullptr, "invariant");
+      return edge;
     }
   }
   return get(UnifiedOopRef::encode_in_native(sample->object_addr()));
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 5bbb2e79340..fc1979b6ed6 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -826,7 +826,6 @@ jdk/jfr/event/compiler/TestCodeSweeper.java                     8225209 generic-
 jdk/jfr/event/os/TestThreadContextSwitches.java                 8247776 windows-all
 jdk/jfr/startupargs/TestStartName.java                          8214685 windows-x64
 jdk/jfr/startupargs/TestStartDuration.java                      8214685 windows-x64
-jdk/jfr/event/oldobject/TestLargeRootSet.java                   8276333 generic-x64
 jdk/jfr/api/consumer/recordingstream/TestOnEvent.java           8255404 linux-x64
 jdk/jfr/jvm/TestWaste.java                                      8282427 generic-all
 
-- 
GitLab


From 5fab27e1b8fdf2ea27cb3b349bd339a4a6ec828b Mon Sep 17 00:00:00 2001
From: Jim Laskey <jlaskey@openjdk.org>
Date: Tue, 8 Mar 2022 13:25:34 +0000
Subject: [PATCH 027/345] 8282144: RandomSupport.convertSeedBytesToLongs sign
 extension overwrites previous bytes

Reviewed-by: bpb
---
 .../internal/util/random/RandomSupport.java   |  2 +-
 test/jdk/java/util/Random/T8282144.java       | 71 +++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/util/Random/T8282144.java

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 1fc1eeff46a..24a73f734d3 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
@@ -265,7 +265,7 @@ public class RandomSupport {
         final int m = Math.min(seed.length, n << 3);
         // Distribute seed bytes into the words to be formed.
         for (int j = 0; j < m; j++) {
-            result[j>>3] = (result[j>>3] << 8) | seed[j];
+            result[j>>3] = (result[j>>3] << 8) | (seed[j] & 0xFF);
         }
         // If there aren't enough seed bytes for all the words we need,
         // use a SplitMix-style PRNG to fill in the rest.
diff --git a/test/jdk/java/util/Random/T8282144.java b/test/jdk/java/util/Random/T8282144.java
new file mode 100644
index 00000000000..4a0218602f2
--- /dev/null
+++ b/test/jdk/java/util/Random/T8282144.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.random.*;
+import jdk.internal.util.random.RandomSupport;
+
+/**
+ * @test
+ * @summary RandomSupport.convertSeedBytesToLongs sign extension overwrites previous bytes.
+ * @bug 8282144
+ * @modules java.base/jdk.internal.util.random
+ * @run main T8282144
+ * @key randomness
+ */
+
+
+public class T8282144 {
+    public static void main(String[] args) {
+        RandomGenerator rng = RandomGeneratorFactory.of("L64X128MixRandom").create(42);
+
+        for (int i = 1; i < 8; i++) {
+            byte[] seed = new byte[i];
+
+            for (int j = 0; j < 10; j++) {
+                rng.nextBytes(seed);
+
+                long[] existing = RandomSupport.convertSeedBytesToLongs(seed, 1, 1);
+                long[] testing = convertSeedBytesToLongsFixed(seed, 1, 1);
+
+                for (int k = 0; k < existing.length; k++) {
+                    if (existing[k] != testing[k]) {
+                        throw new RuntimeException("convertSeedBytesToLongs incorrect");
+                    }
+                }
+            }
+        }
+    }
+
+
+    public static long[] convertSeedBytesToLongsFixed(byte[] seed, int n, int z) {
+        final long[] result = new long[n];
+        final int m = Math.min(seed.length, n << 3);
+
+        // Distribute seed bytes into the words to be formed.
+        for (int j = 0; j < m; j++) {
+            result[j >> 3] = (result[j >> 3] << 8) | (seed[j] & 0xff);
+        }
+
+        return result;
+    }
+}
-- 
GitLab


From c6d743fb920e740c7b0aac0c0ef5bdc3d60252ad Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 8 Mar 2022 13:57:59 +0000
Subject: [PATCH 028/345] 8282770: Set source date in jib profiles from buildId

Reviewed-by: erikj
---
 make/conf/jib-profiles.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 5e4c5791859..137d7cc7bb2 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -258,7 +258,6 @@ var getJibProfilesCommon = function (input, data) {
     common.release_profile_base = {
         configure_args: [
             "--enable-reproducible-build",
-            "--with-source-date=current",
         ],
     };
     // Extra settings for debug profiles
@@ -1447,6 +1446,14 @@ var versionArgs = function(input, common) {
     } else {
         args = concat(args, "--with-version-opt=" + common.build_id);
     }
+    var sourceDate
+    if (input.build_id_data && input.build_id_data.creationTime) {
+        sourceDate = Math.floor(Date.parse(input.build_id_data.creationTime)/1000);
+    } else {
+        sourceDate = "current";
+    }
+    args = concat(args, "--with-source-date=" + sourceDate);
+
     return args;
 }
 
-- 
GitLab


From 0f88fc180cd5abc60605a094efa3f3a54f67f7a0 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 8 Mar 2022 14:04:59 +0000
Subject: [PATCH 029/345] 8282769: BSD date cannot handle all ISO 8601 formats

Reviewed-by: erikj
---
 make/autoconf/util.m4 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4
index 877165ab3a3..15f41abafda 100644
--- a/make/autoconf/util.m4
+++ b/make/autoconf/util.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -230,8 +230,6 @@ AC_DEFUN([UTIL_GET_MATCHING_VALUES],
 # Converts an ISO-8601 date/time string to a unix epoch timestamp. If no
 # suitable conversion method was found, an empty string is returned.
 #
-# Sets the specified variable to the resulting list.
-#
 # $1: result variable name
 # $2: input date/time string
 AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
@@ -241,11 +239,11 @@ AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
     timestamp=$($DATE --utc --date=$2 +"%s" 2> /dev/null)
   else
     # BSD date
-    timestamp=$($DATE -u -j -f "%F %T" "$2" "+%s" 2> /dev/null)
+    timestamp=$($DATE -u -j -f "%FZ %TZ" "$2" "+%s" 2> /dev/null)
     if test "x$timestamp" = x; then
-      # Perhaps the time was missing
-      timestamp=$($DATE -u -j -f "%F %T" "$2 00:00:00" "+%s" 2> /dev/null)
-      # If this did not work, we give up and return the empty string
+      # BSD date cannot handle trailing milliseconds.
+      # Try again ignoring characters at end
+      timestamp=$($DATE -u -j -f "%Y-%m-%dT%H:%M:%S" "$2" "+%s" 2> /dev/null)
     fi
   fi
   $1=$timestamp
-- 
GitLab


From 0cbc4b85bf8ab2ccfb8762322098c4cc7996df7d Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Tue, 8 Mar 2022 15:35:55 +0000
Subject: [PATCH 030/345] 8281266: [JVMCI] MetaUtil.toInternalName() doesn't
 handle hidden classes correctly

Reviewed-by: sgehwolf, dnsimon
---
 .../src/jdk/vm/ci/meta/MetaUtil.java          | 52 ++++++++++++-------
 .../ci/runtime/test/TestResolvedJavaType.java | 15 +++---
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java
index 528bb34e059..54a55dc3122 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,11 @@ package jdk.vm.ci.meta;
  */
 public class MetaUtil {
 
+    public static final char PACKAGE_SEPARATOR_INTERNAL = '/';
+    public static final char HIDDEN_SEPARATOR_INTERNAL = '.';
+    public static final char PACKAGE_SEPARATOR_JAVA = HIDDEN_SEPARATOR_INTERNAL;
+    public static final char HIDDEN_SEPARATOR_JAVA = PACKAGE_SEPARATOR_INTERNAL;
+
     /**
      * Extends the functionality of {@link Class#getSimpleName()} to include a non-empty string for
      * anonymous and local classes.
@@ -87,25 +92,27 @@ public class MetaUtil {
     }
 
     /**
-     * Classes for lambdas can have {@code /} characters that are not package separators. These are
-     * distinguished by being followed by a character that is not a
+     * Hidden classes have {@code /} characters in their internal names and {@code .} characters in their names returned
+     * by {@link Class#getName()} that are not package separators.
+     * These are distinguished by being followed by a character that is not a
      * {@link Character#isJavaIdentifierStart(char)} (e.g.,
      * "jdk.vm.ci.runtime.test.TypeUniverse$$Lambda$1/869601985").
+     *
+     * @param name the name to perform the replacements on
+     * @param packageSeparator the {@link Character} used as the package separator, e.g. {@code /} in internal form
+     * @param hiddenSeparator the {@link Character} used as the hidden class separator, e.g. {@code .} in internal form
      */
-    private static String replacePackageSeparatorsWithDot(String name) {
+    private static String replacePackageAndHiddenSeparators(String name, Character packageSeparator, Character hiddenSeparator) {
+        int index = name.indexOf(hiddenSeparator);   // check if it's a hidden class
         int length = name.length();
-        int i = 0;
         StringBuilder buf = new StringBuilder(length);
-        while (i < length - 1) {
-            char ch = name.charAt(i);
-            if (ch == '/' && Character.isJavaIdentifierStart(name.charAt(i + 1))) {
-                buf.append('.');
-            } else {
-                buf.append(ch);
-            }
-            i++;
+        if (index < 0) {
+            buf.append(name.replace(packageSeparator, hiddenSeparator));
+        } else {
+            buf.append(name.substring(0, index).replace(packageSeparator, hiddenSeparator));
+            buf.append(packageSeparator);
+            buf.append(name.substring(index + 1));
         }
-        buf.append(name.charAt(length - 1));
         return buf.toString();
     }
 
@@ -122,9 +129,10 @@ public class MetaUtil {
     public static String internalNameToJava(String name, boolean qualified, boolean classForNameCompatible) {
         switch (name.charAt(0)) {
             case 'L': {
-                String result = replacePackageSeparatorsWithDot(name.substring(1, name.length() - 1));
+                String type = name.substring(1, name.length() - 1);
+                String result = replacePackageAndHiddenSeparators(type, PACKAGE_SEPARATOR_INTERNAL, HIDDEN_SEPARATOR_INTERNAL);
                 if (!qualified) {
-                    final int lastDot = result.lastIndexOf('.');
+                    final int lastDot = result.lastIndexOf(HIDDEN_SEPARATOR_INTERNAL);
                     if (lastDot != -1) {
                         result = result.substring(lastDot + 1);
                     }
@@ -132,7 +140,11 @@ public class MetaUtil {
                 return result;
             }
             case '[':
-                return classForNameCompatible ? replacePackageSeparatorsWithDot(name) : internalNameToJava(name.substring(1), qualified, classForNameCompatible) + "[]";
+                if (classForNameCompatible) {
+                    return replacePackageAndHiddenSeparators(name, PACKAGE_SEPARATOR_INTERNAL, HIDDEN_SEPARATOR_INTERNAL);
+                } else {
+                    return internalNameToJava(name.substring(1), qualified, false) + "[]";
+                }
             default:
                 if (name.length() != 1) {
                     throw new IllegalArgumentException("Illegal internal name: " + name);
@@ -213,7 +225,7 @@ public class MetaUtil {
     public static String toInternalName(String className) {
         if (className.startsWith("[")) {
             /* Already in the correct array style. */
-            return className.replace('.', '/');
+            return replacePackageAndHiddenSeparators(className, PACKAGE_SEPARATOR_JAVA, HIDDEN_SEPARATOR_JAVA);
         }
 
         StringBuilder result = new StringBuilder();
@@ -252,7 +264,9 @@ public class MetaUtil {
                 result.append("V");
                 break;
             default:
-                result.append("L").append(base.replace('.', '/')).append(";");
+                result.append("L")
+                        .append(replacePackageAndHiddenSeparators(base, PACKAGE_SEPARATOR_JAVA, HIDDEN_SEPARATOR_JAVA))
+                        .append(";");
                 break;
         }
         return result.toString();
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
index ec7a7b3bd70..d186e5ea710 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
@@ -42,6 +42,8 @@ import static java.lang.reflect.Modifier.isPrivate;
 import static java.lang.reflect.Modifier.isProtected;
 import static java.lang.reflect.Modifier.isPublic;
 import static java.lang.reflect.Modifier.isStatic;
+import static jdk.vm.ci.meta.MetaUtil.internalNameToJava;
+import static jdk.vm.ci.meta.MetaUtil.toInternalName;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -163,16 +165,15 @@ public class TestResolvedJavaType extends TypeUniverse {
     }
 
     @Test
-    public void internalNameTest() {
-        // Verify that the last slash in lambda types are not replaced with a '.' as they
-        // are part of the type name.
+    public void lambdaInternalNameTest() {
+        // Verify that the last dot in lambda types is properly handled when transitioning from internal name to java
+        // name and vice versa.
         Supplier<Runnable> lambda = () -> () -> System.out.println("run");
         ResolvedJavaType lambdaType = metaAccess.lookupJavaType(lambda.getClass());
         String typeName = lambdaType.getName();
-        int typeNameLen = TestResolvedJavaType.class.getSimpleName().length();
-        int index = typeName.indexOf(TestResolvedJavaType.class.getSimpleName());
-        String suffix = typeName.substring(index + typeNameLen, typeName.length() - 1);
-        assertEquals(TestResolvedJavaType.class.getName() + suffix, lambdaType.toJavaName());
+        String javaName = lambda.getClass().getName();
+        assertEquals(typeName, toInternalName(javaName));
+        assertEquals(javaName, internalNameToJava(typeName, true, true));
     }
 
     @Test
-- 
GitLab


From 3e4dfc63e75db7e8ccbb21a831d8d86fb7c1ac4e Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 8 Mar 2022 16:10:26 +0000
Subject: [PATCH 031/345] 8282295: SymbolPropertyEntry::set_method_type fails
 with assert

Reviewed-by: hseigel
---
 src/hotspot/share/memory/universe.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index ca68e601cf4..ef244b66912 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -1248,6 +1248,7 @@ bool Universe::release_fullgc_alot_dummy() {
     if (_fullgc_alot_dummy_next >= fullgc_alot_dummy_array->length()) {
       // No more dummies to release, release entire array instead
       _fullgc_alot_dummy_array.release(Universe::vm_global());
+      _fullgc_alot_dummy_array = OopHandle(); // NULL out OopStorage pointer.
       return false;
     }
 
-- 
GitLab


From 2549e5503806447733572643603af9a2bf4b52e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Tue, 8 Mar 2022 16:15:24 +0000
Subject: [PATCH 032/345] 8275640: (win) java.net.NetworkInterface issues with
 IPv6-only environments

Reviewed-by: msheppar, dfuchs
---
 .../windows/native/libnet/NetworkInterface.c  | 34 ++++++++------
 .../native/libnet/NetworkInterface_winXP.c    | 47 +++++++++++--------
 2 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/src/java.base/windows/native/libnet/NetworkInterface.c b/src/java.base/windows/native/libnet/NetworkInterface.c
index c2f604b24de..2bad69e1655 100644
--- a/src/java.base/windows/native/libnet/NetworkInterface.c
+++ b/src/java.base/windows/native/libnet/NetworkInterface.c
@@ -176,6 +176,8 @@ int enumInterfaces(JNIEnv *env, netif **netifPP)
     DWORD i;
     int lo=0, eth=0, tr=0, fddi=0, ppp=0, sl=0, wlan=0, net=0, wlen=0;
 
+    *netifPP = NULL;
+
     /*
      * Ask the IP Helper library to enumerate the adapters
      */
@@ -213,9 +215,7 @@ int enumInterfaces(JNIEnv *env, netif **netifPP)
                     "IP Helper Library GetIfTable function failed");
                 break;
         }
-        // this different error code is to handle the case when we call
-        // GetIpAddrTable in pure IPv6 environment
-        return -2;
+        return -1;
     }
 
     /*
@@ -373,6 +373,9 @@ int lookupIPAddrTable(JNIEnv *env, MIB_IPADDRTABLE **tablePP)
     MIB_IPADDRTABLE *tableP;
     ULONG size;
     DWORD ret;
+
+    *tablePP = NULL;
+
     /*
      * Use GetIpAddrTable to enumerate the IP Addresses
      */
@@ -434,12 +437,15 @@ int enumAddresses_win_ipaddrtable(JNIEnv *env, netif *netifP, netaddr **netaddrP
     int count = 0;
     unsigned long mask;
 
+    *netaddrPP = NULL;
+
     /*
      * Iterate through the table to find the addresses with the
      * matching dwIndex. Ignore 0.0.0.0 addresses.
      */
-    if (tableP == NULL)
+    if (tableP == NULL) {
         return 0;
+    }
     count = 0;
     netaddrP = NULL;
 
@@ -452,7 +458,6 @@ int enumAddresses_win_ipaddrtable(JNIEnv *env, netif *netifP, netaddr **netaddrP
             if (curr == NULL) {
                 JNU_ThrowOutOfMemoryError(env, "Native heap allocation failure");
                 free_netaddr(netaddrP);
-                free(tableP);
                 return -1;
             }
 
@@ -518,9 +523,12 @@ int enumAddresses_win_ipaddrtable(JNIEnv *env, netif *netifP, netaddr **netaddrP
 int enumAddresses_win(JNIEnv *env, netif *netifP, netaddr **netaddrPP) {
     MIB_IPADDRTABLE *tableP;
     int count;
+
+    *netaddrPP = NULL;
+
     int ret = lookupIPAddrTable(env, &tableP);
     if (ret < 0) {
-      return NULL;
+      return ret;
     }
     count = enumAddresses_win_ipaddrtable(env, netifP, netaddrPP, tableP);
     free(tableP);
@@ -850,9 +858,7 @@ JNIEXPORT jboolean JNICALL Java_java_net_NetworkInterface_boundInetAddress0
                     break;
                 }
             }
-        }
-        if (tableP != NULL) {
-          free(tableP);
+            free(tableP);
         }
         return found;
     } else {
@@ -922,16 +928,16 @@ JNIEXPORT jobject JNICALL Java_java_net_NetworkInterface_getByInetAddress0
                 /* createNetworkInterface will free addrList */
                 netifObj = createNetworkInterface(env, curr, count, addrList);
                 break;
+            } else {
+                free_netaddr(addrList);
             }
 
             /* on next interface */
             curr = curr->next;
         }
-    }
-
-    /* release the IP address table */
-    if (tableP != NULL)
+        /* release the IP address table */
         free(tableP);
+    }
 
     /* release the interface list */
     free_netif(ifList);
@@ -948,7 +954,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll
     (JNIEnv *env, jclass cls)
 {
     int count;
-    netif *ifList = NULL, *curr;
+    netif *ifList, *curr;
     jobjectArray netIFArr;
     jint arr_index;
 
diff --git a/src/java.base/windows/native/libnet/NetworkInterface_winXP.c b/src/java.base/windows/native/libnet/NetworkInterface_winXP.c
index 6483cd9eb80..08b6acf751a 100644
--- a/src/java.base/windows/native/libnet/NetworkInterface_winXP.c
+++ b/src/java.base/windows/native/libnet/NetworkInterface_winXP.c
@@ -79,6 +79,8 @@ int getAdapters (JNIEnv *env, int flags, IP_ADAPTER_ADDRESSES **adapters) {
     ULONG len;
     int try;
 
+    *adapters = NULL;
+
     adapterInfo = (IP_ADAPTER_ADDRESSES *) malloc(BUFF_SIZE);
     if (adapterInfo == NULL) {
         JNU_ThrowByName(env, "java/lang/OutOfMemoryError",
@@ -233,8 +235,6 @@ IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env,  jint index) {
     return ret;
 }
 
-static int ipinflen = 2048;
-
 /*
  */
 int getAllInterfacesAndAddresses (JNIEnv *env, netif **netifPP)
@@ -242,23 +242,18 @@ int getAllInterfacesAndAddresses (JNIEnv *env, netif **netifPP)
     int ret, flags;
     MIB_IPADDRTABLE *tableP;
     IP_ADAPTER_ADDRESSES *ptr, *adapters=NULL;
-    ULONG len=ipinflen, count=0;
+    ULONG count=0;
     netif *nif=NULL, *dup_nif, *last=NULL, *loopif=NULL, *curr;
     int tun=0, net=0;
 
-    *netifPP = NULL;
    /*
     * Get the IPv4 interfaces. This information is the same
     * as what previous JDK versions would return.
     */
 
     ret = enumInterfaces(env, netifPP);
-    if (ret == -1) {
+    if (ret < 0) {
         return -1;
-    } else if( ret == -2){
-        if ((*env)->ExceptionCheck(env)) {
-            (*env)->ExceptionClear(env);
-        }
     } else {
         count = ret;
     }
@@ -274,20 +269,23 @@ int getAllInterfacesAndAddresses (JNIEnv *env, netif **netifPP)
     // Retrieve IPv4 addresses with the IP Helper API
     curr = *netifPP;
     ret = lookupIPAddrTable(env, &tableP);
-    if (ret < 0) {
+    if (ret == -1) {
+      free_netif(*netifPP);
       return -1;
+    } else if (ret == -2) {
+        // Clear the exception and continue.
+        if ((*env)->ExceptionCheck(env)) {
+            (*env)->ExceptionClear(env);
+        }
+        tableP = NULL;
     }
     while (curr != NULL) {
         netaddr *netaddrP;
         ret = enumAddresses_win_ipaddrtable(env, curr, &netaddrP, tableP);
-        if (ret == -1) {
+        if (ret < 0) {
+            free_netif(*netifPP);
             free(tableP);
             return -1;
-        } else if (ret == -2) {
-            if ((*env)->ExceptionCheck(env)) {
-                (*env)->ExceptionClear(env);
-            }
-            break;
         } else{
             curr->addrs = netaddrP;
             curr->naddrs += ret;
@@ -301,7 +299,8 @@ int getAllInterfacesAndAddresses (JNIEnv *env, netif **netifPP)
     flags |= GAA_FLAG_INCLUDE_PREFIX;
     ret = getAdapters (env, flags, &adapters);
     if (ret != ERROR_SUCCESS) {
-        goto err;
+        free_netif(*netifPP);
+        return -1;
     }
 
     /* Now get the IPv6 information. This includes:
@@ -340,6 +339,9 @@ int getAllInterfacesAndAddresses (JNIEnv *env, netif **netifPP)
                          */
                         nif->ipv6Index = ptr->Ipv6IfIndex;
                         c = getAddrsFromAdapter(ptr, &nif->addrs);
+                        if (c == -1) {
+                            goto err;
+                        }
                         nif->naddrs += c;
                         break;
                     }
@@ -378,6 +380,7 @@ int getAllInterfacesAndAddresses (JNIEnv *env, netif **netifPP)
                         nif->name = malloc (strlen(newname)+1);
                         nif->displayName = malloc (wcslen(ptr->FriendlyName)*2+2);
                         if (nif->name == 0 || nif->displayName == 0) {
+                                free(nif);
                                 goto err;
                         }
                         strcpy (nif->name, newname);
@@ -390,7 +393,11 @@ int getAllInterfacesAndAddresses (JNIEnv *env, netif **netifPP)
                         nif->ipv6Index = ptr->Ipv6IfIndex;
                         nif->hasIpv6Address = TRUE;
 
-                        last->next = nif;
+                        if (last) {
+                                last->next = nif;
+                        } else {
+                                *netifPP = nif;
+                        }
                         last = nif;
                         count++;
                         c = getAddrsFromAdapter(ptr, &nif->addrs);
@@ -585,6 +592,8 @@ static jobject createNetworkInterfaceXP(JNIEnv *env, netif *ifs)
             if ((*env)->ExceptionCheck(env)) {
                 (*env)->ExceptionClear(env);
             }
+            netaddrCount = 0;
+            netaddrPToFree = NULL;
         }
         netaddrP = netaddrPToFree;
     }
@@ -826,7 +835,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_net_NetworkInterface_getAll_XP
     (JNIEnv *env, jclass cls)
 {
     int count;
-    netif *ifList = NULL, *curr;
+    netif *ifList, *curr;
     jobjectArray netIFArr;
     jint arr_index;
 
-- 
GitLab


From 3fc009be8a49f9edb8059d8612ef6ed7f048f242 Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Tue, 8 Mar 2022 16:32:18 +0000
Subject: [PATCH 033/345] 8281560: Matcher.hitEnd returns unexpected results in
 presence of CANON_EQ flag.

Reviewed-by: rriggs, lancea
---
 .../classes/java/util/regex/Pattern.java      |  3 ++-
 test/jdk/java/util/regex/RegExTest.java       | 26 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index f5d4c965b25..5bb6ec76a7c 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -4005,8 +4005,9 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
                 }
                 if (j < matcher.to)
                     return false;
+            } else {
+                matcher.hitEnd = true;
             }
-            matcher.hitEnd = true;
             return false;
         }
 
diff --git a/test/jdk/java/util/regex/RegExTest.java b/test/jdk/java/util/regex/RegExTest.java
index 0a7705c800e..39c454ce4f4 100644
--- a/test/jdk/java/util/regex/RegExTest.java
+++ b/test/jdk/java/util/regex/RegExTest.java
@@ -4557,12 +4557,36 @@ public class RegExTest {
         assertTrue(e.getMessage().contains("Bad intersection syntax"));
     }
 
+    //This test is for 8281560
+    @Test
+    public static void prematureHitEndInNFCCharProperty() {
+        var testInput = "a1a1";
+        var pat1 = "(a+|1+)";
+        var pat2 = "([a]+|[1]+)";
+
+        var matcher1 = Pattern.compile(pat1, Pattern.CANON_EQ).matcher(testInput);
+        var matcher2 = Pattern.compile(pat2, Pattern.CANON_EQ).matcher(testInput);
+
+        ArrayList<Boolean> results1 = new ArrayList<>();
+        ArrayList<Boolean> results2 = new ArrayList<>();
+
+        while (matcher1.find()) {
+            results1.add(matcher1.hitEnd());
+        }
+
+        while (matcher2.find()) {
+            results2.add(matcher2.hitEnd());
+        }
+
+        assertEquals(results1, results2);
+    }
+
     //This test is for 8281315
     @Test
     public static void iOOBForCIBackrefs(){
         String line = "\ud83d\udc95\ud83d\udc95\ud83d\udc95";
         var pattern2 = Pattern.compile("(?i)(.)\\1{2,}");
         assertTrue(pattern2.matcher(line).find());
-
     }
 }
+
-- 
GitLab


From 6b34884b34c4d84a1b5cfa3556a188415a42b1de Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Tue, 8 Mar 2022 17:01:03 +0000
Subject: [PATCH 034/345] 8282234: Create a regression test for JDK-4532513

Reviewed-by: aivanov
---
 .../DefaultCaretRequestsFocusTest.java        | 193 ++++++++++++++++++
 1 file changed, 193 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTextField/4532513/DefaultCaretRequestsFocusTest.java

diff --git a/test/jdk/javax/swing/JTextField/4532513/DefaultCaretRequestsFocusTest.java b/test/jdk/javax/swing/JTextField/4532513/DefaultCaretRequestsFocusTest.java
new file mode 100644
index 00000000000..b2fec6d9f94
--- /dev/null
+++ b/test/jdk/javax/swing/JTextField/4532513/DefaultCaretRequestsFocusTest.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.GridLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import javax.swing.InputVerifier;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+/*
+ * @test
+ * @key headful
+ * @bug 4532513
+ * @summary Verifies that DefaultCaret doesn't requests focus in mouseClick and mousePressed
+ *          causing the associated input verifier to fire twice.
+ * @run main DefaultCaretRequestsFocusTest
+ */
+public class DefaultCaretRequestsFocusTest {
+
+    private static JTextField jTextField1;
+    private static JTextField jTextField2;
+    private static JTextField jTextField3;
+    private static JFrame frame;
+    private static Robot robot;
+    private static volatile int shouldYieldFocusCount;
+
+    public static void main(String[] args) throws Exception {
+        runTest();
+    }
+
+    public static void runTest() throws Exception {
+        robot = new Robot();
+        robot.setAutoWaitForIdle(true);
+        robot.setAutoDelay(200);
+
+        List<String> lafs = Arrays.stream(getInstalledLookAndFeels())
+                                  .map(LookAndFeelInfo::getClassName)
+                                  .collect(Collectors.toList());
+        for (final String laf : lafs) {
+            try {
+                AtomicBoolean lafSetSuccess = new AtomicBoolean(false);
+                SwingUtilities.invokeAndWait(() -> {
+                    lafSetSuccess.set(setLookAndFeel(laf));
+                    if (lafSetSuccess.get()) {
+                        createUI();
+                    }
+                });
+                if (!lafSetSuccess.get()) {
+                    continue;
+                }
+                robot.waitForIdle();
+
+                AtomicReference<Point> jTextField1LocRef = new AtomicReference<>();
+                AtomicReference<Point> jTextField2LocRef = new AtomicReference<>();
+                SwingUtilities.invokeAndWait(() -> {
+                    jTextField1LocRef.set(jTextField1.getLocationOnScreen());
+                    jTextField2LocRef.set(jTextField2.getLocationOnScreen());
+                });
+                final Point jTextField1Loc = jTextField1LocRef.get();
+                final Point jTextField2Loc = jTextField2LocRef.get();
+
+                shouldYieldFocusCount = 0;
+
+                // Click on TextField2
+                robot.mouseMove(jTextField2Loc.x + 5, jTextField2Loc.y + 5);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+                typeSomeText();
+
+                // Click on TextField1
+                robot.mouseMove(jTextField1Loc.x + 5, jTextField1Loc.y + 5);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+                typeSomeText();
+
+                if (shouldYieldFocusCount == 1) {
+                    System.out.println("Test passed for " + laf);
+                } else {
+                    throw new RuntimeException("Test failed for " + laf
+                            + " as InputVerifier.shouldYieldFocus() was called " + shouldYieldFocusCount
+                            + " times on jTextField2, but it is expected to be called only once.");
+                }
+
+            } finally {
+                SwingUtilities.invokeAndWait(DefaultCaretRequestsFocusTest::disposeFrame);
+            }
+        }
+    }
+
+    private static void typeSomeText() {
+        robot.keyPress(KeyEvent.VK_T);
+        robot.keyRelease(KeyEvent.VK_T);
+        robot.keyPress(KeyEvent.VK_E);
+        robot.keyRelease(KeyEvent.VK_E);
+        robot.keyPress(KeyEvent.VK_X);
+        robot.keyRelease(KeyEvent.VK_X);
+        robot.keyPress(KeyEvent.VK_T);
+        robot.keyRelease(KeyEvent.VK_T);
+    }
+
+    private static void createUI() {
+        frame = new JFrame();
+        jTextField1 = new JTextField(6);
+        jTextField2 = new JTextField(6);
+        jTextField3 = new JTextField(6);
+        JPanel panel = new JPanel();
+        panel.setLayout(new GridLayout(3, 1));
+        panel.add(jTextField1);
+        panel.add(jTextField2);
+        panel.add(jTextField3);
+
+        InputVerifier iv = new InputVerifier() {
+            public boolean verify(JComponent input) {
+                System.out.println("InputVerifier.verify() called");
+                return false;
+            }
+
+            public boolean shouldYieldFocus(JComponent input) {
+                ++shouldYieldFocusCount;
+                System.out.println("InputVerifier.shouldYieldFocus() called " + shouldYieldFocusCount);
+                return false;
+            }
+        };
+
+        jTextField2.setInputVerifier(iv);
+
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        frame.add(panel);
+        frame.pack();
+        frame.setAlwaysOnTop(true);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    private static boolean setLookAndFeel(String lafName) {
+        try {
+            UIManager.setLookAndFeel(lafName);
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Ignoring Unsupported laf : " + lafName);
+            return false;
+        } catch (ClassNotFoundException | InstantiationException
+                | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+    private static void disposeFrame() {
+        if (frame != null) {
+            frame.dispose();
+            frame = null;
+        }
+    }
+
+}
-- 
GitLab


From 288d1afc5a2d5ac128b1b427bc877b7815925917 Mon Sep 17 00:00:00 2001
From: Xin Liu <xliu@openjdk.org>
Date: Tue, 8 Mar 2022 17:33:15 +0000
Subject: [PATCH 035/345] 8282715: typo compileony in test Test8005033.java

Reviewed-by: jiefu, dholmes, thartmann
---
 test/hotspot/jtreg/compiler/codegen/Test8005033.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/codegen/Test8005033.java b/test/hotspot/jtreg/compiler/codegen/Test8005033.java
index 84630ad01da..d96983537d9 100644
--- a/test/hotspot/jtreg/compiler/codegen/Test8005033.java
+++ b/test/hotspot/jtreg/compiler/codegen/Test8005033.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012 SAP SE. 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,7 +28,7 @@
  * @summary On sparcv9, C2's intrinsic for Integer.bitCount(OV) returns wrong result if OV is the result of an operation with int overflow.
  *
  * @run main/othervm -Xcomp
- *      -XX:CompileCommand=compileony,compiler.codegen.Test8005033::testBitCount
+ *      -XX:CompileCommand=compileonly,compiler.codegen.Test8005033::testBitCount
  *      compiler.codegen.Test8005033
  * @author Richard Reingruber richard DOT reingruber AT sap DOT com
  */
-- 
GitLab


From 72e987e3b49b81f2f66d125c18ab459d9ed572b6 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Tue, 8 Mar 2022 18:18:57 +0000
Subject: [PATCH 036/345] 7192189: Support endpoint identification algorithm in
 RFC 6125

Reviewed-by: xuelei, rhalade
---
 .../sun/security/util/HostnameChecker.java    |  41 ++----------------
 .../NullHostnameCheck.java                    |   0
 .../TestHostnameChecker.java                  |  31 ++++++++++---
 .../cert1.crt                                 | Bin
 .../cert2.crt                                 | Bin
 .../cert3.crt                                 | Bin
 .../cert4.crt                                 | Bin
 .../cert5.crt                                 |   0
 8 files changed, 29 insertions(+), 43 deletions(-)
 rename test/jdk/sun/security/util/{HostnameMatcher => HostnameChecker}/NullHostnameCheck.java (100%)
 rename test/jdk/sun/security/util/{HostnameMatcher => HostnameChecker}/TestHostnameChecker.java (88%)
 rename test/jdk/sun/security/util/{HostnameMatcher => HostnameChecker}/cert1.crt (100%)
 rename test/jdk/sun/security/util/{HostnameMatcher => HostnameChecker}/cert2.crt (100%)
 rename test/jdk/sun/security/util/{HostnameMatcher => HostnameChecker}/cert3.crt (100%)
 rename test/jdk/sun/security/util/{HostnameMatcher => HostnameChecker}/cert4.crt (100%)
 rename test/jdk/sun/security/util/{HostnameMatcher => HostnameChecker}/cert5.crt (100%)

diff --git a/src/java.base/share/classes/sun/security/util/HostnameChecker.java b/src/java.base/share/classes/sun/security/util/HostnameChecker.java
index aacd94837c9..4c0bca36830 100644
--- a/src/java.base/share/classes/sun/security/util/HostnameChecker.java
+++ b/src/java.base/share/classes/sun/security/util/HostnameChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -178,7 +178,7 @@ public class HostnameChecker {
      * Certification Authorities are encouraged to use the dNSName instead.
      *
      * Matching is performed using the matching rules specified by
-     * [RFC5280].  If more than one identity of a given type is present in
+     * [RFC6125].  If more than one identity of a given type is present in
      * the certificate (e.g., more than one dNSName name, a match in any one
      * of the set is considered acceptable.)
      */
@@ -262,7 +262,7 @@ public class HostnameChecker {
     /**
      * Returns true if name matches against template.<p>
      *
-     * The matching is performed as per RFC 2818 rules for TLS and
+     * The matching is performed as per RFC 2818/6125 rules for TLS and
      * RFC 2830 rules for LDAP.<p>
      *
      * The <code>name</code> parameter should represent a DNS name.  The
@@ -299,9 +299,7 @@ public class HostnameChecker {
             return false;
         }
 
-        if (checkType == TYPE_TLS) {
-            return matchAllWildcards(name, template);
-        } else if (checkType == TYPE_LDAP) {
+        if (checkType == TYPE_TLS || checkType == TYPE_LDAP) {
             return matchLeftmostWildcard(name, template);
         } else {
             return false;
@@ -371,37 +369,6 @@ public class HostnameChecker {
         return false;
     }
 
-    /**
-     * Returns true if name matches against template.<p>
-     *
-     * According to RFC 2818, section 3.1 -
-     * Names may contain the wildcard character * which is
-     * considered to match any single domain name component
-     * or component fragment.
-     * E.g., *.a.com matches foo.a.com but not
-     * bar.foo.a.com. f*.com matches foo.com but not bar.com.
-     */
-    private static boolean matchAllWildcards(String name,
-         String template) {
-        name = name.toLowerCase(Locale.ENGLISH);
-        template = template.toLowerCase(Locale.ENGLISH);
-        StringTokenizer nameSt = new StringTokenizer(name, ".");
-        StringTokenizer templateSt = new StringTokenizer(template, ".");
-
-        if (nameSt.countTokens() != templateSt.countTokens()) {
-            return false;
-        }
-
-        while (nameSt.hasMoreTokens()) {
-            if (!matchWildCards(nameSt.nextToken(),
-                        templateSt.nextToken())) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-
     /**
      * Returns true if name matches against template.<p>
      *
diff --git a/test/jdk/sun/security/util/HostnameMatcher/NullHostnameCheck.java b/test/jdk/sun/security/util/HostnameChecker/NullHostnameCheck.java
similarity index 100%
rename from test/jdk/sun/security/util/HostnameMatcher/NullHostnameCheck.java
rename to test/jdk/sun/security/util/HostnameChecker/NullHostnameCheck.java
diff --git a/test/jdk/sun/security/util/HostnameMatcher/TestHostnameChecker.java b/test/jdk/sun/security/util/HostnameChecker/TestHostnameChecker.java
similarity index 88%
rename from test/jdk/sun/security/util/HostnameMatcher/TestHostnameChecker.java
rename to test/jdk/sun/security/util/HostnameChecker/TestHostnameChecker.java
index 8d50aa4c295..d5c0898d8e6 100644
--- a/test/jdk/sun/security/util/HostnameMatcher/TestHostnameChecker.java
+++ b/test/jdk/sun/security/util/HostnameChecker/TestHostnameChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,19 @@
 
 /*
  * @test
- * @bug 4514108
- * @summary Verify host name matching behaves as defined in RFC2818.
+ * @bug 4514108 7192189
+ * @summary Verify host name matching behaves as defined in RFC2818 and RFC6125.
  * @library /test/lib
- * @modules java.base/sun.security.util
+ * @modules java.base/sun.security.util java.base/sun.security.x509
  */
 
 import java.security.cert.*;
+import java.util.Collection;
+import java.util.List;
 
 import jdk.test.lib.security.CertUtils;
 import sun.security.util.*;
+import sun.security.x509.X509CertImpl;
 
 /**
  * Certificate 1:
@@ -193,10 +196,17 @@ public class TestHostnameChecker {
         check(checker, "altfoo2.com", cert3, true);
         check(checker, "5.6.7.8", cert3, true);
         check(checker, "foo.bar.com", cert4, true);
-        check(checker, "altfoo.bar.com", cert4, true);
+        check(checker, "altfoo.bar.com", cert4, false);
         check(checker, "2001:db8:3c4d:15::1a2f:1a2b", cert5, true);
         check(checker, "2001:0db8:3c4d:0015:0000:0000:1a2f:1a2b", cert5, true);
         check(checker, "2002:db8:3c4d:15::1a2f:1a2b", cert5, false);
+        check(checker, "foo.bar.example.net", mock("foo.*.example.net"), false);
+        check(checker, "baz1.example.net", mock("baz*.example.net"), true);
+        check(checker, "foobaz.example.net", mock("*baz.example.net"), true);
+        check(checker, "buzz.example.net", mock("b*z.example.net"), true);
+        check(checker, "公司.example.net", mock("xn--5*.example.net"), false);
+        check(checker, "公司.江利子.example.net",
+                       mock("*.xn--kcry6tjko.example.net"), true);
 
         checker = HostnameChecker.getInstance(
                                 HostnameChecker.TYPE_LDAP);
@@ -214,6 +224,15 @@ public class TestHostnameChecker {
         check(checker, "altfoo.bar.com", cert4, false);
     }
 
+    private static X509Certificate mock(String domain) {
+        return new X509CertImpl() {
+            @Override
+            public Collection<List<?>> getSubjectAlternativeNames() {
+                return List.of(List.of(2, domain));
+            }
+        };
+    }
+
     private static void check(HostnameChecker checker, String name,
                  X509Certificate cert, boolean expectedResult)
                  throws Exception {
@@ -224,7 +243,7 @@ public class TestHostnameChecker {
             }
         } catch (CertificateException e) {
             if (expectedResult == true) {
-                throw e;
+                throw new Exception("Failed valid test: " + name, e);
             }
         }
         System.out.println("OK: " + name);
diff --git a/test/jdk/sun/security/util/HostnameMatcher/cert1.crt b/test/jdk/sun/security/util/HostnameChecker/cert1.crt
similarity index 100%
rename from test/jdk/sun/security/util/HostnameMatcher/cert1.crt
rename to test/jdk/sun/security/util/HostnameChecker/cert1.crt
diff --git a/test/jdk/sun/security/util/HostnameMatcher/cert2.crt b/test/jdk/sun/security/util/HostnameChecker/cert2.crt
similarity index 100%
rename from test/jdk/sun/security/util/HostnameMatcher/cert2.crt
rename to test/jdk/sun/security/util/HostnameChecker/cert2.crt
diff --git a/test/jdk/sun/security/util/HostnameMatcher/cert3.crt b/test/jdk/sun/security/util/HostnameChecker/cert3.crt
similarity index 100%
rename from test/jdk/sun/security/util/HostnameMatcher/cert3.crt
rename to test/jdk/sun/security/util/HostnameChecker/cert3.crt
diff --git a/test/jdk/sun/security/util/HostnameMatcher/cert4.crt b/test/jdk/sun/security/util/HostnameChecker/cert4.crt
similarity index 100%
rename from test/jdk/sun/security/util/HostnameMatcher/cert4.crt
rename to test/jdk/sun/security/util/HostnameChecker/cert4.crt
diff --git a/test/jdk/sun/security/util/HostnameMatcher/cert5.crt b/test/jdk/sun/security/util/HostnameChecker/cert5.crt
similarity index 100%
rename from test/jdk/sun/security/util/HostnameMatcher/cert5.crt
rename to test/jdk/sun/security/util/HostnameChecker/cert5.crt
-- 
GitLab


From ea19114e66326e4be7b4b9995888ad2ead3d37dc Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Tue, 8 Mar 2022 20:34:02 +0000
Subject: [PATCH 037/345] 8282832: Update file path for
 HostnameMatcher/cert5.crt in test sun/security/util/Pem/encoding.sh

Reviewed-by: mullan
---
 test/jdk/sun/security/util/Pem/encoding.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/sun/security/util/Pem/encoding.sh b/test/jdk/sun/security/util/Pem/encoding.sh
index 2bc39504218..7f8b142caf8 100644
--- a/test/jdk/sun/security/util/Pem/encoding.sh
+++ b/test/jdk/sun/security/util/Pem/encoding.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,4 +32,4 @@
 
 $TESTJAVA/bin/java $TESTVMOPTS -cp $TESTCLASSES \
         -Dfile.encoding=UTF-16 \
-        PemEncoding $TESTSRC/../HostnameMatcher/cert5.crt
+        PemEncoding $TESTSRC/../HostnameChecker/cert5.crt
-- 
GitLab


From 49245131e98c1c72c447536e5527acecb3311add Mon Sep 17 00:00:00 2001
From: Hao Sun <haosun@openjdk.org>
Date: Wed, 9 Mar 2022 00:52:01 +0000
Subject: [PATCH 038/345] 8265263: AArch64: Combine vneg with right shift count

Reviewed-by: adinn, dlong
---
 src/hotspot/cpu/aarch64/aarch64.ad            |   9 +
 src/hotspot/cpu/aarch64/aarch64_neon.ad       | 611 ++++++++++++------
 src/hotspot/cpu/aarch64/aarch64_neon_ad.m4    | 434 +++++++------
 .../bench/vm/compiler/VectorShiftRight.java   | 129 ++++
 4 files changed, 809 insertions(+), 374 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/VectorShiftRight.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index f21835f9de3..96075ecd9d5 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1311,6 +1311,9 @@ public:
   // predicate controlling translation of CompareAndSwapX
   bool needs_acquiring_load_exclusive(const Node *load);
 
+  // Assert that the given node is not a variable shift.
+  bool assert_not_var_shift(const Node* n);
+
   // predicate controlling addressing modes
   bool size_fits_all_mem_uses(AddPNode* addp, int shift);
 %}
@@ -1725,6 +1728,12 @@ bool needs_acquiring_load_exclusive(const Node *n)
   return true;
 }
 
+// Assert that the given node is not a variable shift.
+bool assert_not_var_shift(const Node* n) {
+  assert(!n->as_ShiftV()->is_var_shift(), "illegal variable shift");
+  return true;
+}
+
 #define __ _masm.
 
 // advance declarations for helper functions to convert register
diff --git a/src/hotspot/cpu/aarch64/aarch64_neon.ad b/src/hotspot/cpu/aarch64/aarch64_neon.ad
index 7c84a93583b..feecd8ab90a 100644
--- a/src/hotspot/cpu/aarch64/aarch64_neon.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_neon.ad
@@ -1,5 +1,5 @@
-// Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2020, 2021, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, 2022, Arm Limited. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -4400,11 +4400,17 @@ instruct vxor16B(vecX dst, vecX src1, vecX src2)
 
 // ------------------------------ Shift ---------------------------------------
 
-instruct vshiftcnt8B(vecD dst, iRegIorL2I cnt) %{
+// Vector shift count
+// Note-1: Low 8 bits of each element are used, so it doesn't matter if we
+//         treat it as ints or bytes here.
+// Note-2: Shift value is negated for RShiftCntV additionally. See the comments
+//         on vsra8B rule for more details.
+
+instruct vslcnt8B(vecD dst, iRegIorL2I cnt) %{
   predicate(UseSVE == 0 && (n->as_Vector()->length_in_bytes() == 4 ||
-            n->as_Vector()->length_in_bytes() == 8));
+                            n->as_Vector()->length_in_bytes() == 8));
   match(Set dst (LShiftCntV cnt));
-  match(Set dst (RShiftCntV cnt));
+  ins_cost(INSN_COST);
   format %{ "dup  $dst, $cnt\t# shift count vector (8B)" %}
   ins_encode %{
     __ dup(as_FloatRegister($dst$$reg), __ T8B, as_Register($cnt$$reg));
@@ -4412,10 +4418,10 @@ instruct vshiftcnt8B(vecD dst, iRegIorL2I cnt) %{
   ins_pipe(vdup_reg_reg64);
 %}
 
-instruct vshiftcnt16B(vecX dst, iRegIorL2I cnt) %{
-  predicate(UseSVE == 0 && (n->as_Vector()->length_in_bytes() == 16));
+instruct vslcnt16B(vecX dst, iRegIorL2I cnt) %{
+  predicate(UseSVE == 0 && n->as_Vector()->length_in_bytes() == 16);
   match(Set dst (LShiftCntV cnt));
-  match(Set dst (RShiftCntV cnt));
+  ins_cost(INSN_COST);
   format %{ "dup  $dst, $cnt\t# shift count vector (16B)" %}
   ins_encode %{
     __ dup(as_FloatRegister($dst$$reg), __ T16B, as_Register($cnt$$reg));
@@ -4423,9 +4429,35 @@ instruct vshiftcnt16B(vecX dst, iRegIorL2I cnt) %{
   ins_pipe(vdup_reg_reg128);
 %}
 
+instruct vsrcnt8B(vecD dst, iRegIorL2I cnt) %{
+  predicate(UseSVE == 0 && (n->as_Vector()->length_in_bytes() == 4 ||
+                            n->as_Vector()->length_in_bytes() == 8));
+  match(Set dst (RShiftCntV cnt));
+  ins_cost(INSN_COST * 2);
+  format %{ "negw  rscratch1, $cnt\t"
+            "dup   $dst, rscratch1\t# shift count vector (8B)" %}
+  ins_encode %{
+    __ negw(rscratch1, as_Register($cnt$$reg));
+    __ dup(as_FloatRegister($dst$$reg), __ T8B, rscratch1);
+  %}
+  ins_pipe(vdup_reg_reg64);
+%}
+
+instruct vsrcnt16B(vecX dst, iRegIorL2I cnt) %{
+  predicate(UseSVE == 0 && n->as_Vector()->length_in_bytes() == 16);
+  match(Set dst (RShiftCntV cnt));
+  ins_cost(INSN_COST * 2);
+  format %{ "negw  rscratch1, $cnt\t"
+            "dup   $dst, rscratch1\t# shift count vector (16B)" %}
+  ins_encode %{
+    __ negw(rscratch1, as_Register($cnt$$reg));
+    __ dup(as_FloatRegister($dst$$reg), __ T16B, rscratch1);
+  %}
+  ins_pipe(vdup_reg_reg128);
+%}
+
 instruct vsll8B(vecD dst, vecD src, vecD shift) %{
-  predicate(n->as_Vector()->length() == 4 ||
-            n->as_Vector()->length() == 8);
+  predicate(n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8);
   match(Set dst (LShiftVB src shift));
   ins_cost(INSN_COST);
   format %{ "sshl  $dst,$src,$shift\t# vector (8B)" %}
@@ -4459,8 +4491,6 @@ instruct vsll16B(vecX dst, vecX src, vecX shift) %{
 //    LoadVector  RShiftCntV
 //        |       /
 //     RShiftVI
-// Note: In inner loop, multiple neg instructions are used, which can be
-// moved to outer loop and merge into one neg instruction.
 //
 // Case 2: The vector shift count is from loading.
 // This case isn't supported by middle-end now. But it's supported by
@@ -4470,83 +4500,145 @@ instruct vsll16B(vecX dst, vecX src, vecX shift) %{
 //        |       /
 //     RShiftVI
 //
+// The negate is conducted in RShiftCntV rule for case 1, whereas it's done in
+// RShiftV* rules for case 2. Because there exists an optimization opportunity
+// for case 1, that is, multiple neg instructions in inner loop can be hoisted
+// to outer loop and merged into one neg instruction.
+//
+// Note that ShiftVNode::is_var_shift() indicates whether the vector shift
+// count is a variable vector(case 2) or not(a vector generated by RShiftCntV,
+// i.e. case 1).
 
-instruct vsra8B(vecD dst, vecD src, vecD shift, vecD tmp) %{
-  predicate(n->as_Vector()->length() == 4 ||
-            n->as_Vector()->length() == 8);
+instruct vsra8B(vecD dst, vecD src, vecD shift) %{
+  predicate((n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8) &&
+            !n->as_ShiftV()->is_var_shift());
   match(Set dst (RShiftVB src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "sshl  $dst,$src,$tmp\t# vector (8B)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector (8B)" %}
+  ins_encode %{
+    __ sshl(as_FloatRegister($dst$$reg), __ T8B,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift64);
+%}
+
+instruct vsra8B_var(vecD dst, vecD src, vecD shift) %{
+  predicate((n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8) &&
+            n->as_ShiftV()->is_var_shift());
+  match(Set dst (RShiftVB src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "sshl  $dst,$src,$dst\t# vector (8B)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T8B,
+    __ negr(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($shift$$reg));
     __ sshl(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift64);
 %}
 
-instruct vsra16B(vecX dst, vecX src, vecX shift, vecX tmp) %{
-  predicate(n->as_Vector()->length() == 16);
+instruct vsra16B(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 16 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (RShiftVB src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "sshl  $dst,$src,$tmp\t# vector (16B)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector (16B)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T16B,
+    __ sshl(as_FloatRegister($dst$$reg), __ T16B,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift128);
+%}
+
+instruct vsra16B_var(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 16 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (RShiftVB src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "sshl  $dst,$src,$dst\t# vector (16B)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($shift$$reg));
     __ sshl(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift128);
 %}
 
-instruct vsrl8B(vecD dst, vecD src, vecD shift, vecD tmp) %{
-  predicate(n->as_Vector()->length() == 4 ||
-            n->as_Vector()->length() == 8);
+instruct vsrl8B(vecD dst, vecD src, vecD shift) %{
+  predicate((n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8) &&
+            !n->as_ShiftV()->is_var_shift());
   match(Set dst (URShiftVB src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "ushl  $dst,$src,$tmp\t# vector (8B)" %}
+  format %{ "ushl  $dst,$src,$shift\t# vector (8B)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T8B,
+    __ ushl(as_FloatRegister($dst$$reg), __ T8B,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift64);
+%}
+
+instruct vsrl8B_var(vecD dst, vecD src, vecD shift) %{
+  predicate((n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8) &&
+            n->as_ShiftV()->is_var_shift());
+  match(Set dst (URShiftVB src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "ushl  $dst,$src,$dst\t# vector (8B)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($shift$$reg));
     __ ushl(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift64);
 %}
 
-instruct vsrl16B(vecX dst, vecX src, vecX shift, vecX tmp) %{
-  predicate(n->as_Vector()->length() == 16);
+instruct vsrl16B(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 16 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (URShiftVB src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "ushl  $dst,$src,$tmp\t# vector (16B)" %}
+  format %{ "ushl  $dst,$src,$shift\t# vector (16B)" %}
+  ins_encode %{
+    __ ushl(as_FloatRegister($dst$$reg), __ T16B,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift128);
+%}
+
+instruct vsrl16B_var(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 16 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (URShiftVB src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "ushl  $dst,$src,$dst\t# vector (16B)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T16B,
+    __ negr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($shift$$reg));
     __ ushl(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift128);
 %}
 
 instruct vsll8B_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 4 ||
-            n->as_Vector()->length() == 8);
+  predicate((n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8) &&
+            assert_not_var_shift(n));
   match(Set dst (LShiftVB src (LShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "shl    $dst, $src, $shift\t# vector (8B)" %}
+  format %{ "shl  $dst, $src, $shift\t# vector (8B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 8) {
@@ -4562,10 +4654,10 @@ instruct vsll8B_imm(vecD dst, vecD src, immI shift) %{
 %}
 
 instruct vsll16B_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 16);
+  predicate(n->as_Vector()->length() == 16 && assert_not_var_shift(n));
   match(Set dst (LShiftVB src (LShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "shl    $dst, $src, $shift\t# vector (16B)" %}
+  format %{ "shl  $dst, $src, $shift\t# vector (16B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 8) {
@@ -4581,40 +4673,40 @@ instruct vsll16B_imm(vecX dst, vecX src, immI shift) %{
 %}
 
 instruct vsra8B_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 4 ||
-            n->as_Vector()->length() == 8);
+  predicate((n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8) &&
+            assert_not_var_shift(n));
   match(Set dst (RShiftVB src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "sshr    $dst, $src, $shift\t# vector (8B)" %}
+  format %{ "sshr  $dst, $src, $shift\t# vector (8B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 8) sh = 7;
     __ sshr(as_FloatRegister($dst$$reg), __ T8B,
-           as_FloatRegister($src$$reg), sh);
+            as_FloatRegister($src$$reg), sh);
   %}
   ins_pipe(vshift64_imm);
 %}
 
 instruct vsra16B_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 16);
+  predicate(n->as_Vector()->length() == 16 && assert_not_var_shift(n));
   match(Set dst (RShiftVB src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "sshr    $dst, $src, $shift\t# vector (16B)" %}
+  format %{ "sshr  $dst, $src, $shift\t# vector (16B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 8) sh = 7;
     __ sshr(as_FloatRegister($dst$$reg), __ T16B,
-           as_FloatRegister($src$$reg), sh);
+            as_FloatRegister($src$$reg), sh);
   %}
   ins_pipe(vshift128_imm);
 %}
 
 instruct vsrl8B_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 4 ||
-            n->as_Vector()->length() == 8);
+  predicate((n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8) &&
+            assert_not_var_shift(n));
   match(Set dst (URShiftVB src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "ushr    $dst, $src, $shift\t# vector (8B)" %}
+  format %{ "ushr  $dst, $src, $shift\t# vector (8B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 8) {
@@ -4623,17 +4715,17 @@ instruct vsrl8B_imm(vecD dst, vecD src, immI shift) %{
              as_FloatRegister($src$$reg));
     } else {
       __ ushr(as_FloatRegister($dst$$reg), __ T8B,
-             as_FloatRegister($src$$reg), sh);
+              as_FloatRegister($src$$reg), sh);
     }
   %}
   ins_pipe(vshift64_imm);
 %}
 
 instruct vsrl16B_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 16);
+  predicate(n->as_Vector()->length() == 16 && assert_not_var_shift(n));
   match(Set dst (URShiftVB src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "ushr    $dst, $src, $shift\t# vector (16B)" %}
+  format %{ "ushr  $dst, $src, $shift\t# vector (16B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 8) {
@@ -4642,15 +4734,14 @@ instruct vsrl16B_imm(vecX dst, vecX src, immI shift) %{
              as_FloatRegister($src$$reg));
     } else {
       __ ushr(as_FloatRegister($dst$$reg), __ T16B,
-             as_FloatRegister($src$$reg), sh);
+              as_FloatRegister($src$$reg), sh);
     }
   %}
   ins_pipe(vshift128_imm);
 %}
 
 instruct vsll4S(vecD dst, vecD src, vecD shift) %{
-  predicate(n->as_Vector()->length() == 2 ||
-            n->as_Vector()->length() == 4);
+  predicate(n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4);
   match(Set dst (LShiftVS src shift));
   ins_cost(INSN_COST);
   format %{ "sshl  $dst,$src,$shift\t# vector (4H)" %}
@@ -4675,82 +4766,136 @@ instruct vsll8S(vecX dst, vecX src, vecX shift) %{
   ins_pipe(vshift128);
 %}
 
-instruct vsra4S(vecD dst, vecD src, vecD shift, vecD tmp) %{
-  predicate(n->as_Vector()->length() == 2 ||
-            n->as_Vector()->length() == 4);
+instruct vsra4S(vecD dst, vecD src, vecD shift) %{
+  predicate((n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4) &&
+            !n->as_ShiftV()->is_var_shift());
   match(Set dst (RShiftVS src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "sshl  $dst,$src,$tmp\t# vector (4H)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector (4H)" %}
+  ins_encode %{
+    __ sshl(as_FloatRegister($dst$$reg), __ T4H,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift64);
+%}
+
+instruct vsra4S_var(vecD dst, vecD src, vecD shift) %{
+  predicate((n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4) &&
+            n->as_ShiftV()->is_var_shift());
+  match(Set dst (RShiftVS src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "sshl  $dst,$src,$dst\t# vector (4H)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T8B,
+    __ negr(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($shift$$reg));
     __ sshl(as_FloatRegister($dst$$reg), __ T4H,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift64);
 %}
 
-instruct vsra8S(vecX dst, vecX src, vecX shift, vecX tmp) %{
-  predicate(n->as_Vector()->length() == 8);
+instruct vsra8S(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 8 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (RShiftVS src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "sshl  $dst,$src,$tmp\t# vector (8H)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector (8H)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T16B,
+    __ sshl(as_FloatRegister($dst$$reg), __ T8H,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift128);
+%}
+
+instruct vsra8S_var(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 8 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (RShiftVS src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "sshl  $dst,$src,$dst\t# vector (8H)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($shift$$reg));
     __ sshl(as_FloatRegister($dst$$reg), __ T8H,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift128);
 %}
 
-instruct vsrl4S(vecD dst, vecD src, vecD shift, vecD tmp) %{
-  predicate(n->as_Vector()->length() == 2 ||
-            n->as_Vector()->length() == 4);
+instruct vsrl4S(vecD dst, vecD src, vecD shift) %{
+  predicate((n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4) &&
+            !n->as_ShiftV()->is_var_shift());
   match(Set dst (URShiftVS src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "ushl  $dst,$src,$tmp\t# vector (4H)" %}
+  format %{ "ushl  $dst,$src,$shift\t# vector (4H)" %}
+  ins_encode %{
+    __ ushl(as_FloatRegister($dst$$reg), __ T4H,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift64);
+%}
+
+instruct vsrl4S_var(vecD dst, vecD src, vecD shift) %{
+  predicate((n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4) &&
+            n->as_ShiftV()->is_var_shift());
+  match(Set dst (URShiftVS src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "ushl  $dst,$src,$dst\t# vector (4H)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T8B,
+    __ negr(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($shift$$reg));
     __ ushl(as_FloatRegister($dst$$reg), __ T4H,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift64);
 %}
 
-instruct vsrl8S(vecX dst, vecX src, vecX shift, vecX tmp) %{
-  predicate(n->as_Vector()->length() == 8);
+instruct vsrl8S(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 8 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (URShiftVS src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "ushl  $dst,$src,$tmp\t# vector (8H)" %}
+  format %{ "ushl  $dst,$src,$shift\t# vector (8H)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T16B,
+    __ ushl(as_FloatRegister($dst$$reg), __ T8H,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift128);
+%}
+
+instruct vsrl8S_var(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 8 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (URShiftVS src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "ushl  $dst,$src,$dst\t# vector (8H)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($shift$$reg));
     __ ushl(as_FloatRegister($dst$$reg), __ T8H,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift128);
 %}
 
 instruct vsll4S_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2 ||
-            n->as_Vector()->length() == 4);
+  predicate((n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4) &&
+            assert_not_var_shift(n));
   match(Set dst (LShiftVS src (LShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "shl    $dst, $src, $shift\t# vector (4H)" %}
+  format %{ "shl  $dst, $src, $shift\t# vector (4H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 16) {
@@ -4766,10 +4911,10 @@ instruct vsll4S_imm(vecD dst, vecD src, immI shift) %{
 %}
 
 instruct vsll8S_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 8);
+  predicate(n->as_Vector()->length() == 8 && assert_not_var_shift(n));
   match(Set dst (LShiftVS src (LShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "shl    $dst, $src, $shift\t# vector (8H)" %}
+  format %{ "shl  $dst, $src, $shift\t# vector (8H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 16) {
@@ -4785,40 +4930,40 @@ instruct vsll8S_imm(vecX dst, vecX src, immI shift) %{
 %}
 
 instruct vsra4S_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2 ||
-            n->as_Vector()->length() == 4);
+  predicate((n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4) &&
+            assert_not_var_shift(n));
   match(Set dst (RShiftVS src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "sshr    $dst, $src, $shift\t# vector (4H)" %}
+  format %{ "sshr  $dst, $src, $shift\t# vector (4H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 16) sh = 15;
     __ sshr(as_FloatRegister($dst$$reg), __ T4H,
-           as_FloatRegister($src$$reg), sh);
+            as_FloatRegister($src$$reg), sh);
   %}
   ins_pipe(vshift64_imm);
 %}
 
 instruct vsra8S_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 8);
+  predicate(n->as_Vector()->length() == 8 && assert_not_var_shift(n));
   match(Set dst (RShiftVS src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "sshr    $dst, $src, $shift\t# vector (8H)" %}
+  format %{ "sshr  $dst, $src, $shift\t# vector (8H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 16) sh = 15;
     __ sshr(as_FloatRegister($dst$$reg), __ T8H,
-           as_FloatRegister($src$$reg), sh);
+            as_FloatRegister($src$$reg), sh);
   %}
   ins_pipe(vshift128_imm);
 %}
 
 instruct vsrl4S_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2 ||
-            n->as_Vector()->length() == 4);
+  predicate((n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4) &&
+            assert_not_var_shift(n));
   match(Set dst (URShiftVS src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "ushr    $dst, $src, $shift\t# vector (4H)" %}
+  format %{ "ushr  $dst, $src, $shift\t# vector (4H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 16) {
@@ -4827,17 +4972,17 @@ instruct vsrl4S_imm(vecD dst, vecD src, immI shift) %{
              as_FloatRegister($src$$reg));
     } else {
       __ ushr(as_FloatRegister($dst$$reg), __ T4H,
-             as_FloatRegister($src$$reg), sh);
+              as_FloatRegister($src$$reg), sh);
     }
   %}
   ins_pipe(vshift64_imm);
 %}
 
 instruct vsrl8S_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 8);
+  predicate(n->as_Vector()->length() == 8 && assert_not_var_shift(n));
   match(Set dst (URShiftVS src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "ushr    $dst, $src, $shift\t# vector (8H)" %}
+  format %{ "ushr  $dst, $src, $shift\t# vector (8H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 16) {
@@ -4846,7 +4991,7 @@ instruct vsrl8S_imm(vecX dst, vecX src, immI shift) %{
              as_FloatRegister($src$$reg));
     } else {
       __ ushr(as_FloatRegister($dst$$reg), __ T8H,
-             as_FloatRegister($src$$reg), sh);
+              as_FloatRegister($src$$reg), sh);
     }
   %}
   ins_pipe(vshift128_imm);
@@ -4878,79 +5023,131 @@ instruct vsll4I(vecX dst, vecX src, vecX shift) %{
   ins_pipe(vshift128);
 %}
 
-instruct vsra2I(vecD dst, vecD src, vecD shift, vecD tmp) %{
-  predicate(n->as_Vector()->length() == 2);
+instruct vsra2I(vecD dst, vecD src, vecD shift) %{
+  predicate(n->as_Vector()->length() == 2 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (RShiftVI src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "sshl  $dst,$src,$tmp\t# vector (2S)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector (2S)" %}
+  ins_encode %{
+    __ sshl(as_FloatRegister($dst$$reg), __ T2S,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift64);
+%}
+
+instruct vsra2I_var(vecD dst, vecD src, vecD shift) %{
+  predicate(n->as_Vector()->length() == 2 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (RShiftVI src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "sshl  $dst,$src,$dst\t# vector (2S)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T8B,
+    __ negr(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($shift$$reg));
     __ sshl(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift64);
 %}
 
-instruct vsra4I(vecX dst, vecX src, vecX shift, vecX tmp) %{
-  predicate(n->as_Vector()->length() == 4);
+instruct vsra4I(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 4 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (RShiftVI src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "sshl  $dst,$src,$tmp\t# vector (4S)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector (4S)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T16B,
+    __ sshl(as_FloatRegister($dst$$reg), __ T4S,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift128);
+%}
+
+instruct vsra4I_var(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 4 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (RShiftVI src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "sshl  $dst,$src,$dst\t# vector (4S)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($shift$$reg));
     __ sshl(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift128);
 %}
 
-instruct vsrl2I(vecD dst, vecD src, vecD shift, vecD tmp) %{
-  predicate(n->as_Vector()->length() == 2);
+instruct vsrl2I(vecD dst, vecD src, vecD shift) %{
+  predicate(n->as_Vector()->length() == 2 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (URShiftVI src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "ushl  $dst,$src,$tmp\t# vector (2S)" %}
+  format %{ "ushl  $dst,$src,$shift\t# vector (2S)" %}
+  ins_encode %{
+    __ ushl(as_FloatRegister($dst$$reg), __ T2S,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift64);
+%}
+
+instruct vsrl2I_var(vecD dst, vecD src, vecD shift) %{
+  predicate(n->as_Vector()->length() == 2 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (URShiftVI src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "ushl  $dst,$src,$dst\t# vector (2S)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T8B,
+    __ negr(as_FloatRegister($dst$$reg), __ T8B,
             as_FloatRegister($shift$$reg));
     __ ushl(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift64);
 %}
 
-instruct vsrl4I(vecX dst, vecX src, vecX shift, vecX tmp) %{
-  predicate(n->as_Vector()->length() == 4);
+instruct vsrl4I(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 4 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (URShiftVI src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "ushl  $dst,$src,$tmp\t# vector (4S)" %}
+  format %{ "ushl  $dst,$src,$shift\t# vector (4S)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T16B,
+    __ ushl(as_FloatRegister($dst$$reg), __ T4S,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift128);
+%}
+
+instruct vsrl4I_var(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 4 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (URShiftVI src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "ushl  $dst,$src,$dst\t# vector (4S)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($shift$$reg));
     __ ushl(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift128);
 %}
 
 instruct vsll2I_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2);
+  predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n));
   match(Set dst (LShiftVI src (LShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "shl    $dst, $src, $shift\t# vector (2S)" %}
+  format %{ "shl  $dst, $src, $shift\t# vector (2S)" %}
   ins_encode %{
     __ shl(as_FloatRegister($dst$$reg), __ T2S,
            as_FloatRegister($src$$reg),
@@ -4960,10 +5157,10 @@ instruct vsll2I_imm(vecD dst, vecD src, immI shift) %{
 %}
 
 instruct vsll4I_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 4);
+  predicate(n->as_Vector()->length() == 4 && assert_not_var_shift(n));
   match(Set dst (LShiftVI src (LShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "shl    $dst, $src, $shift\t# vector (4S)" %}
+  format %{ "shl  $dst, $src, $shift\t# vector (4S)" %}
   ins_encode %{
     __ shl(as_FloatRegister($dst$$reg), __ T4S,
            as_FloatRegister($src$$reg),
@@ -4973,10 +5170,10 @@ instruct vsll4I_imm(vecX dst, vecX src, immI shift) %{
 %}
 
 instruct vsra2I_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2);
+  predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n));
   match(Set dst (RShiftVI src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "sshr    $dst, $src, $shift\t# vector (2S)" %}
+  format %{ "sshr  $dst, $src, $shift\t# vector (2S)" %}
   ins_encode %{
     __ sshr(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src$$reg),
@@ -4986,10 +5183,10 @@ instruct vsra2I_imm(vecD dst, vecD src, immI shift) %{
 %}
 
 instruct vsra4I_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 4);
+  predicate(n->as_Vector()->length() == 4 && assert_not_var_shift(n));
   match(Set dst (RShiftVI src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "sshr    $dst, $src, $shift\t# vector (4S)" %}
+  format %{ "sshr  $dst, $src, $shift\t# vector (4S)" %}
   ins_encode %{
     __ sshr(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src$$reg),
@@ -4999,10 +5196,10 @@ instruct vsra4I_imm(vecX dst, vecX src, immI shift) %{
 %}
 
 instruct vsrl2I_imm(vecD dst, vecD src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2);
+  predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n));
   match(Set dst (URShiftVI src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "ushr    $dst, $src, $shift\t# vector (2S)" %}
+  format %{ "ushr  $dst, $src, $shift\t# vector (2S)" %}
   ins_encode %{
     __ ushr(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src$$reg),
@@ -5012,10 +5209,10 @@ instruct vsrl2I_imm(vecD dst, vecD src, immI shift) %{
 %}
 
 instruct vsrl4I_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 4);
+  predicate(n->as_Vector()->length() == 4 && assert_not_var_shift(n));
   match(Set dst (URShiftVI src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "ushr    $dst, $src, $shift\t# vector (4S)" %}
+  format %{ "ushr  $dst, $src, $shift\t# vector (4S)" %}
   ins_encode %{
     __ ushr(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src$$reg),
@@ -5037,45 +5234,71 @@ instruct vsll2L(vecX dst, vecX src, vecX shift) %{
   ins_pipe(vshift128);
 %}
 
-instruct vsra2L(vecX dst, vecX src, vecX shift, vecX tmp) %{
-  predicate(n->as_Vector()->length() == 2);
+instruct vsra2L(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 2 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (RShiftVL src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "sshl  $dst,$src,$tmp\t# vector (2D)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector (2D)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T16B,
+    __ sshl(as_FloatRegister($dst$$reg), __ T2D,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift128);
+%}
+
+instruct vsra2L_var(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 2 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (RShiftVL src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "sshl  $dst,$src,$dst\t# vector (2D)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($shift$$reg));
     __ sshl(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift128);
 %}
 
-instruct vsrl2L(vecX dst, vecX src, vecX shift, vecX tmp) %{
-  predicate(n->as_Vector()->length() == 2);
+instruct vsrl2L(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 2 && !n->as_ShiftV()->is_var_shift());
   match(Set dst (URShiftVL src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "negr  $tmp,$shift\t"
-            "ushl  $dst,$src,$tmp\t# vector (2D)" %}
+  format %{ "ushl  $dst,$src,$shift\t# vector (2D)" %}
+  ins_encode %{
+    __ ushl(as_FloatRegister($dst$$reg), __ T2D,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift128);
+%}
+
+instruct vsrl2L_var(vecX dst, vecX src, vecX shift) %{
+  predicate(n->as_Vector()->length() == 2 && n->as_ShiftV()->is_var_shift());
+  match(Set dst (URShiftVL src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "ushl  $dst,$src,$dst\t# vector (2D)" %}
   ins_encode %{
-    __ negr(as_FloatRegister($tmp$$reg), __ T16B,
+    __ negr(as_FloatRegister($dst$$reg), __ T16B,
             as_FloatRegister($shift$$reg));
     __ ushl(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
   ins_pipe(vshift128);
 %}
 
 instruct vsll2L_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2);
+  predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n));
   match(Set dst (LShiftVL src (LShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "shl    $dst, $src, $shift\t# vector (2D)" %}
+  format %{ "shl  $dst, $src, $shift\t# vector (2D)" %}
   ins_encode %{
     __ shl(as_FloatRegister($dst$$reg), __ T2D,
            as_FloatRegister($src$$reg),
@@ -5085,10 +5308,10 @@ instruct vsll2L_imm(vecX dst, vecX src, immI shift) %{
 %}
 
 instruct vsra2L_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2);
+  predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n));
   match(Set dst (RShiftVL src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "sshr    $dst, $src, $shift\t# vector (2D)" %}
+  format %{ "sshr  $dst, $src, $shift\t# vector (2D)" %}
   ins_encode %{
     __ sshr(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src$$reg),
@@ -5098,10 +5321,10 @@ instruct vsra2L_imm(vecX dst, vecX src, immI shift) %{
 %}
 
 instruct vsrl2L_imm(vecX dst, vecX src, immI shift) %{
-  predicate(n->as_Vector()->length() == 2);
+  predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n));
   match(Set dst (URShiftVL src (RShiftCntV shift)));
   ins_cost(INSN_COST);
-  format %{ "ushr    $dst, $src, $shift\t# vector (2D)" %}
+  format %{ "ushr  $dst, $src, $shift\t# vector (2D)" %}
   ins_encode %{
     __ ushr(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src$$reg),
@@ -5114,12 +5337,12 @@ instruct vsraa8B_imm(vecD dst, vecD src, immI shift) %{
   predicate(n->as_Vector()->length() == 8);
   match(Set dst (AddVB dst (RShiftVB src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "ssra    $dst, $src, $shift\t# vector (8B)" %}
+  format %{ "ssra  $dst, $src, $shift\t# vector (8B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 8) sh = 7;
     __ ssra(as_FloatRegister($dst$$reg), __ T8B,
-           as_FloatRegister($src$$reg), sh);
+            as_FloatRegister($src$$reg), sh);
   %}
   ins_pipe(vshift64_imm);
 %}
@@ -5128,12 +5351,12 @@ instruct vsraa16B_imm(vecX dst, vecX src, immI shift) %{
   predicate(n->as_Vector()->length() == 16);
   match(Set dst (AddVB dst (RShiftVB src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "ssra    $dst, $src, $shift\t# vector (16B)" %}
+  format %{ "ssra  $dst, $src, $shift\t# vector (16B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 8) sh = 7;
     __ ssra(as_FloatRegister($dst$$reg), __ T16B,
-           as_FloatRegister($src$$reg), sh);
+            as_FloatRegister($src$$reg), sh);
   %}
   ins_pipe(vshift128_imm);
 %}
@@ -5142,12 +5365,12 @@ instruct vsraa4S_imm(vecD dst, vecD src, immI shift) %{
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (AddVS dst (RShiftVS src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "ssra    $dst, $src, $shift\t# vector (4H)" %}
+  format %{ "ssra  $dst, $src, $shift\t# vector (4H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 16) sh = 15;
     __ ssra(as_FloatRegister($dst$$reg), __ T4H,
-           as_FloatRegister($src$$reg), sh);
+            as_FloatRegister($src$$reg), sh);
   %}
   ins_pipe(vshift64_imm);
 %}
@@ -5156,12 +5379,12 @@ instruct vsraa8S_imm(vecX dst, vecX src, immI shift) %{
   predicate(n->as_Vector()->length() == 8);
   match(Set dst (AddVS dst (RShiftVS src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "ssra    $dst, $src, $shift\t# vector (8H)" %}
+  format %{ "ssra  $dst, $src, $shift\t# vector (8H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh >= 16) sh = 15;
     __ ssra(as_FloatRegister($dst$$reg), __ T8H,
-           as_FloatRegister($src$$reg), sh);
+            as_FloatRegister($src$$reg), sh);
   %}
   ins_pipe(vshift128_imm);
 %}
@@ -5170,7 +5393,7 @@ instruct vsraa2I_imm(vecD dst, vecD src, immI shift) %{
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AddVI dst (RShiftVI src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "ssra    $dst, $src, $shift\t# vector (2S)" %}
+  format %{ "ssra  $dst, $src, $shift\t# vector (2S)" %}
   ins_encode %{
     __ ssra(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src$$reg),
@@ -5183,7 +5406,7 @@ instruct vsraa4I_imm(vecX dst, vecX src, immI shift) %{
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (AddVI dst (RShiftVI src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "ssra    $dst, $src, $shift\t# vector (4S)" %}
+  format %{ "ssra  $dst, $src, $shift\t# vector (4S)" %}
   ins_encode %{
     __ ssra(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src$$reg),
@@ -5196,7 +5419,7 @@ instruct vsraa2L_imm(vecX dst, vecX src, immI shift) %{
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AddVL dst (RShiftVL src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "ssra    $dst, $src, $shift\t# vector (2D)" %}
+  format %{ "ssra  $dst, $src, $shift\t# vector (2D)" %}
   ins_encode %{
     __ ssra(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src$$reg),
@@ -5209,12 +5432,12 @@ instruct vsrla8B_imm(vecD dst, vecD src, immI shift) %{
   predicate(n->as_Vector()->length() == 8);
   match(Set dst (AddVB dst (URShiftVB src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "usra    $dst, $src, $shift\t# vector (8B)" %}
+  format %{ "usra  $dst, $src, $shift\t# vector (8B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh < 8) {
       __ usra(as_FloatRegister($dst$$reg), __ T8B,
-             as_FloatRegister($src$$reg), sh);
+              as_FloatRegister($src$$reg), sh);
     }
   %}
   ins_pipe(vshift64_imm);
@@ -5224,12 +5447,12 @@ instruct vsrla16B_imm(vecX dst, vecX src, immI shift) %{
   predicate(n->as_Vector()->length() == 16);
   match(Set dst (AddVB dst (URShiftVB src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "usra    $dst, $src, $shift\t# vector (16B)" %}
+  format %{ "usra  $dst, $src, $shift\t# vector (16B)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh < 8) {
       __ usra(as_FloatRegister($dst$$reg), __ T16B,
-             as_FloatRegister($src$$reg), sh);
+              as_FloatRegister($src$$reg), sh);
     }
   %}
   ins_pipe(vshift128_imm);
@@ -5239,12 +5462,12 @@ instruct vsrla4S_imm(vecD dst, vecD src, immI shift) %{
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (AddVS dst (URShiftVS src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "usra    $dst, $src, $shift\t# vector (4H)" %}
+  format %{ "usra  $dst, $src, $shift\t# vector (4H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh < 16) {
       __ usra(as_FloatRegister($dst$$reg), __ T4H,
-             as_FloatRegister($src$$reg), sh);
+              as_FloatRegister($src$$reg), sh);
     }
   %}
   ins_pipe(vshift64_imm);
@@ -5254,12 +5477,12 @@ instruct vsrla8S_imm(vecX dst, vecX src, immI shift) %{
   predicate(n->as_Vector()->length() == 8);
   match(Set dst (AddVS dst (URShiftVS src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "usra    $dst, $src, $shift\t# vector (8H)" %}
+  format %{ "usra  $dst, $src, $shift\t# vector (8H)" %}
   ins_encode %{
     int sh = (int)$shift$$constant;
     if (sh < 16) {
       __ usra(as_FloatRegister($dst$$reg), __ T8H,
-             as_FloatRegister($src$$reg), sh);
+              as_FloatRegister($src$$reg), sh);
     }
   %}
   ins_pipe(vshift128_imm);
@@ -5269,7 +5492,7 @@ instruct vsrla2I_imm(vecD dst, vecD src, immI shift) %{
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AddVI dst (URShiftVI src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "usra    $dst, $src, $shift\t# vector (2S)" %}
+  format %{ "usra  $dst, $src, $shift\t# vector (2S)" %}
   ins_encode %{
     __ usra(as_FloatRegister($dst$$reg), __ T2S,
             as_FloatRegister($src$$reg),
@@ -5282,7 +5505,7 @@ instruct vsrla4I_imm(vecX dst, vecX src, immI shift) %{
   predicate(n->as_Vector()->length() == 4);
   match(Set dst (AddVI dst (URShiftVI src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "usra    $dst, $src, $shift\t# vector (4S)" %}
+  format %{ "usra  $dst, $src, $shift\t# vector (4S)" %}
   ins_encode %{
     __ usra(as_FloatRegister($dst$$reg), __ T4S,
             as_FloatRegister($src$$reg),
@@ -5295,7 +5518,7 @@ instruct vsrla2L_imm(vecX dst, vecX src, immI shift) %{
   predicate(n->as_Vector()->length() == 2);
   match(Set dst (AddVL dst (URShiftVL src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "usra    $dst, $src, $shift\t# vector (2D)" %}
+  format %{ "usra  $dst, $src, $shift\t# vector (2D)" %}
   ins_encode %{
     __ usra(as_FloatRegister($dst$$reg), __ T2D,
             as_FloatRegister($src$$reg),
diff --git a/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
index ff94bb002fa..f98ddf4ee36 100644
--- a/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
@@ -1,5 +1,5 @@
-// Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2020, 2021, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, 2022, Arm Limited. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -1972,223 +1972,277 @@ VLOGICAL(xor, eor,  xor, Xor, 16, B, X)
 
 // ------------------------------ Shift ---------------------------------------
 dnl
-define(`VSHIFTCNT', `
-instruct vshiftcnt$3$4`'(vec$5 dst, iRegIorL2I cnt) %{
-  predicate(UseSVE == 0 && (ifelse($3, 8, n->as_Vector()->length_in_bytes() == 4 ||`
-            ')n->as_Vector()->length_in_bytes() == $3));
+define(`VSLCNT', `
+instruct vslcnt$1$2`'(vec$3 dst, iRegIorL2I cnt) %{
+  predicate(UseSVE == 0 && ifelse($1, 8,
+                                  (n->as_Vector()->length_in_bytes() == 4 ||`
+                            'n->as_Vector()->length_in_bytes() == $1),
+                                  n->as_Vector()->length_in_bytes() == $1));
   match(Set dst (LShiftCntV cnt));
-  match(Set dst (RShiftCntV cnt));
-  format %{ "$1  $dst, $cnt\t# shift count vector ($3$4)" %}
+  ins_cost(INSN_COST);
+  format %{ "dup  $dst, $cnt\t# shift count vector ($1$2)" %}
   ins_encode %{
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$4, as_Register($cnt$$reg));
+    __ dup(as_FloatRegister($dst$$reg), __ T$1$2, as_Register($cnt$$reg));
   %}
-  ins_pipe(vdup_reg_reg`'ifelse($5, D, 64, 128));
+  ins_pipe(vdup_reg_reg`'ifelse($3, D, 64, 128));
 %}')dnl
-dnl       $1   $2   $3  $4 $5
-VSHIFTCNT(dup, dup, 8,  B, D)
-VSHIFTCNT(dup, dup, 16, B, X)
+dnl
+define(`VSRCNT', `
+instruct vsrcnt$1$2`'(vec$3 dst, iRegIorL2I cnt) %{
+  predicate(UseSVE == 0 && ifelse($1, 8,
+                                  (n->as_Vector()->length_in_bytes() == 4 ||`
+                            'n->as_Vector()->length_in_bytes() == $1),
+                                  n->as_Vector()->length_in_bytes() == $1));
+  match(Set dst (RShiftCntV cnt));
+  ins_cost(INSN_COST * 2);
+  format %{ "negw  rscratch1, $cnt\t"
+            "dup   $dst, rscratch1\t# shift count vector ($1$2)" %}
+  ins_encode %{
+    __ negw(rscratch1, as_Register($cnt$$reg));
+    __ dup(as_FloatRegister($dst$$reg), __ T$1$2, rscratch1);
+  %}
+  ins_pipe(vdup_reg_reg`'ifelse($3, D, 64, 128));
+%}')dnl
+dnl
+
+// Vector shift count
+// Note-1: Low 8 bits of each element are used, so it doesn't matter if we
+//         treat it as ints or bytes here.
+// Note-2: Shift value is negated for RShiftCntV additionally. See the comments
+//         on vsra8B rule for more details.
+dnl    $1  $2 $3
+VSLCNT(8,  B, D)
+VSLCNT(16, B, X)
+VSRCNT(8,  B, D)
+VSRCNT(16, B, X)
+dnl
+define(`PREDICATE',
+`ifelse($1, 8B,
+            ifelse($3, `', `predicate(n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8);',
+                           `predicate((n->as_Vector()->length() == 4 || n->as_Vector()->length() == 8) &&`
+            '$3);'),
+        $1, 4S,
+            ifelse($3, `', `predicate(n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4);',
+                           `predicate((n->as_Vector()->length() == 2 || n->as_Vector()->length() == 4) &&`
+            '$3);'),
+        ifelse($3, `', `predicate(n->as_Vector()->length() == $2);',
+                       `predicate(n->as_Vector()->length() == $2 && $3);'))')dnl
 dnl
 define(`VSLL', `
-instruct vsll$3$4`'(vec$6 dst, vec$6 src, vec$6 shift) %{
-  predicate(ifelse($3$4, 8B, n->as_Vector()->length() == 4 ||`
-            ',
-  $3$4, 4S, n->as_Vector()->length() == 2 ||`
-            ')n->as_Vector()->length() == $3);
-  match(Set dst (LShiftV$4 src shift));
+instruct vsll$1$2`'(vec$4 dst, vec$4 src, vec$4 shift) %{
+  PREDICATE(`$1$2', $1, )
+  match(Set dst (LShiftV$2 src shift));
   ins_cost(INSN_COST);
-  format %{ "$1  $dst,$src,$shift\t# vector ($3$5)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector ($1$3)" %}
   ins_encode %{
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+    __ sshl(as_FloatRegister($dst$$reg), __ T$1$3,
             as_FloatRegister($src$$reg),
             as_FloatRegister($shift$$reg));
   %}
-  ins_pipe(vshift`'ifelse($6, D, 64, 128));
+  ins_pipe(vshift`'ifelse($4, D, 64, 128));
 %}')dnl
 dnl
 define(`VSRA', `
-instruct vsra$3$4`'(vec$6 dst, vec$6 src, vec$6 shift, vec$6 tmp) %{
-  predicate(ifelse($3$4, 8B, n->as_Vector()->length() == 4 ||`
-            ',
-  $3$4, 4S, n->as_Vector()->length() == 2 ||`
-            ')n->as_Vector()->length() == $3);
-  match(Set dst (RShiftV$4 src shift));
+instruct vsra$1$2`'(vec$4 dst, vec$4 src, vec$4 shift) %{
+  PREDICATE(`$1$2', $1, !n->as_ShiftV()->is_var_shift())
+  match(Set dst (RShiftV$2 src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "$1  $tmp,$shift\t"
-            "$2  $dst,$src,$tmp\t# vector ($3$5)" %}
+  format %{ "sshl  $dst,$src,$shift\t# vector ($1$3)" %}
   ins_encode %{
-    __ $1(as_FloatRegister($tmp$$reg), __ T`'ifelse($6, D, 8B, 16B),
+    __ sshl(as_FloatRegister($dst$$reg), __ T$1$3,
+            as_FloatRegister($src$$reg),
             as_FloatRegister($shift$$reg));
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+  %}
+  ins_pipe(vshift`'ifelse($4, D, 64, 128));
+%}')dnl
+dnl
+define(`VSRA_VAR', `
+instruct vsra$1$2_var`'(vec$4 dst, vec$4 src, vec$4 shift) %{
+  PREDICATE(`$1$2', $1, n->as_ShiftV()->is_var_shift())
+  match(Set dst (RShiftV$2 src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "sshl  $dst,$src,$dst\t# vector ($1$3)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T`'ifelse($4, D, 8B, 16B),
+            as_FloatRegister($shift$$reg));
+    __ sshl(as_FloatRegister($dst$$reg), __ T$1$3,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
-  ins_pipe(vshift`'ifelse($6, D, 64, 128));
+  ins_pipe(vshift`'ifelse($4, D, 64, 128));
 %}')dnl
 dnl
 define(`VSRL', `
-instruct vsrl$3$4`'(vec$6 dst, vec$6 src, vec$6 shift, vec$6 tmp) %{
-  predicate(ifelse($3$4, 8B, n->as_Vector()->length() == 4 ||`
-            ',
-  $3$4, 4S, n->as_Vector()->length() == 2 ||`
-            ')n->as_Vector()->length() == $3);
-  match(Set dst (URShiftV$4 src shift));
+instruct vsrl$1$2`'(vec$4 dst, vec$4 src, vec$4 shift) %{
+  PREDICATE(`$1$2', $1, !n->as_ShiftV()->is_var_shift())
+  match(Set dst (URShiftV$2 src shift));
   ins_cost(INSN_COST);
-  effect(TEMP tmp);
-  format %{ "$1  $tmp,$shift\t"
-            "$2  $dst,$src,$tmp\t# vector ($3$5)" %}
+  format %{ "ushl  $dst,$src,$shift\t# vector ($1$3)" %}
+  ins_encode %{
+    __ ushl(as_FloatRegister($dst$$reg), __ T$1$3,
+            as_FloatRegister($src$$reg),
+            as_FloatRegister($shift$$reg));
+  %}
+  ins_pipe(vshift`'ifelse($4, D, 64, 128));
+%}')dnl
+dnl
+define(`VSRL_VAR', `
+instruct vsrl$1$2_var`'(vec$4 dst, vec$4 src, vec$4 shift) %{
+  PREDICATE(`$1$2', $1, n->as_ShiftV()->is_var_shift())
+  match(Set dst (URShiftV$2 src shift));
+  ins_cost(INSN_COST * 2);
+  effect(TEMP_DEF dst);
+  format %{ "negr  $dst,$shift\t"
+            "ushl  $dst,$src,$dst\t# vector ($1$3)" %}
   ins_encode %{
-    __ $1(as_FloatRegister($tmp$$reg), __ T`'ifelse($6, D, 8B, 16B),
+    __ negr(as_FloatRegister($dst$$reg), __ T`'ifelse($4, D, 8B, 16B),
             as_FloatRegister($shift$$reg));
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+    __ ushl(as_FloatRegister($dst$$reg), __ T$1$3,
             as_FloatRegister($src$$reg),
-            as_FloatRegister($tmp$$reg));
+            as_FloatRegister($dst$$reg));
   %}
-  ins_pipe(vshift`'ifelse($6, D, 64, 128));
+  ins_pipe(vshift`'ifelse($4, D, 64, 128));
 %}')dnl
 dnl
 define(`VSLL_IMM', `
-instruct vsll$3$4_imm`'(vec$6 dst, vec$6 src, immI shift) %{
-  predicate(ifelse($3$4, 8B, n->as_Vector()->length() == 4 ||`
-            ',
-  $3$4, 4S, n->as_Vector()->length() == 2 ||`
-            ')n->as_Vector()->length() == $3);
-  match(Set dst (LShiftV$4 src (LShiftCntV shift)));
-  ins_cost(INSN_COST);
-  format %{ "$1    $dst, $src, $shift\t# vector ($3$5)" %}
-  ins_encode %{ifelse($4, B,`
+instruct vsll$1$2_imm`'(vec$4 dst, vec$4 src, immI shift) %{
+  PREDICATE(`$1$2', $1, assert_not_var_shift(n))
+  match(Set dst (LShiftV$2 src (LShiftCntV shift)));
+  ins_cost(INSN_COST);
+  format %{ "shl  $dst, $src, $shift\t# vector ($1$3)" %}
+  ins_encode %{ifelse($2, B,`
     int sh = (int)$shift$$constant;
     if (sh >= 8) {
-      __ eor(as_FloatRegister($dst$$reg), __ ifelse($6, D, T8B, T16B),
+      __ eor(as_FloatRegister($dst$$reg), __ ifelse($4, D, T8B, T16B),
              as_FloatRegister($src$$reg),
              as_FloatRegister($src$$reg));
     } else {
-      __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+      __ shl(as_FloatRegister($dst$$reg), __ T$1$3,
              as_FloatRegister($src$$reg), sh);
-    }', $4, S,`
+    }', $2, S,`
     int sh = (int)$shift$$constant;
     if (sh >= 16) {
-      __ eor(as_FloatRegister($dst$$reg), __ ifelse($6, D, T8B, T16B),
+      __ eor(as_FloatRegister($dst$$reg), __ ifelse($4, D, T8B, T16B),
              as_FloatRegister($src$$reg),
              as_FloatRegister($src$$reg));
     } else {
-      __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+      __ shl(as_FloatRegister($dst$$reg), __ T$1$3,
              as_FloatRegister($src$$reg), sh);
     }', `
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+    __ shl(as_FloatRegister($dst$$reg), __ T$1$3,
            as_FloatRegister($src$$reg),
            (int)$shift$$constant);')
   %}
-  ins_pipe(vshift`'ifelse($6, D, 64, 128)_imm);
+  ins_pipe(vshift`'ifelse($4, D, 64, 128)_imm);
 %}')dnl
+dnl
 define(`VSRA_IMM', `
-instruct vsra$3$4_imm`'(vec$6 dst, vec$6 src, immI shift) %{
-  predicate(ifelse($3$4, 8B, n->as_Vector()->length() == 4 ||`
-            ',
-  $3$4, 4S, n->as_Vector()->length() == 2 ||`
-            ')n->as_Vector()->length() == $3);
-  match(Set dst (RShiftV$4 src (RShiftCntV shift)));
-  ins_cost(INSN_COST);
-  format %{ "$1    $dst, $src, $shift\t# vector ($3$5)" %}
-  ins_encode %{ifelse($4, B,`
+instruct vsra$1$2_imm`'(vec$4 dst, vec$4 src, immI shift) %{
+  PREDICATE(`$1$2', $1, assert_not_var_shift(n))
+  match(Set dst (RShiftV$2 src (RShiftCntV shift)));
+  ins_cost(INSN_COST);
+  format %{ "sshr  $dst, $src, $shift\t# vector ($1$3)" %}
+  ins_encode %{ifelse($2, B,`
     int sh = (int)$shift$$constant;
     if (sh >= 8) sh = 7;
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
-           as_FloatRegister($src$$reg), sh);', $4, S,`
+    __ sshr(as_FloatRegister($dst$$reg), __ T$1$3,
+            as_FloatRegister($src$$reg), sh);', $2, S,`
     int sh = (int)$shift$$constant;
     if (sh >= 16) sh = 15;
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
-           as_FloatRegister($src$$reg), sh);', `
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+    __ sshr(as_FloatRegister($dst$$reg), __ T$1$3,
+            as_FloatRegister($src$$reg), sh);', `
+    __ sshr(as_FloatRegister($dst$$reg), __ T$1$3,
             as_FloatRegister($src$$reg),
             (int)$shift$$constant);')
   %}
-  ins_pipe(vshift`'ifelse($6, D, 64, 128)_imm);
+  ins_pipe(vshift`'ifelse($4, D, 64, 128)_imm);
 %}')dnl
 dnl
 define(`VSRL_IMM', `
-instruct vsrl$3$4_imm`'(vec$6 dst, vec$6 src, immI shift) %{
-  predicate(ifelse($3$4, 8B, n->as_Vector()->length() == 4 ||`
-            ',
-  $3$4, 4S, n->as_Vector()->length() == 2 ||`
-            ')n->as_Vector()->length() == $3);
-  match(Set dst (URShiftV$4 src (RShiftCntV shift)));
-  ins_cost(INSN_COST);
-  format %{ "$1    $dst, $src, $shift\t# vector ($3$5)" %}
-  ins_encode %{ifelse($4, B,`
+instruct vsrl$1$2_imm`'(vec$4 dst, vec$4 src, immI shift) %{
+  PREDICATE(`$1$2', $1, assert_not_var_shift(n))
+  match(Set dst (URShiftV$2 src (RShiftCntV shift)));
+  ins_cost(INSN_COST);
+  format %{ "ushr  $dst, $src, $shift\t# vector ($1$3)" %}
+  ins_encode %{ifelse($2, B,`
     int sh = (int)$shift$$constant;
     if (sh >= 8) {
-      __ eor(as_FloatRegister($dst$$reg), __ ifelse($6, D, T8B, T16B),
+      __ eor(as_FloatRegister($dst$$reg), __ ifelse($4, D, T8B, T16B),
              as_FloatRegister($src$$reg),
              as_FloatRegister($src$$reg));
     } else {
-      __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
-             as_FloatRegister($src$$reg), sh);
-    }', $4, S,`
+      __ ushr(as_FloatRegister($dst$$reg), __ T$1$3,
+              as_FloatRegister($src$$reg), sh);
+    }', $2, S,`
     int sh = (int)$shift$$constant;
     if (sh >= 16) {
-      __ eor(as_FloatRegister($dst$$reg), __ ifelse($6, D, T8B, T16B),
+      __ eor(as_FloatRegister($dst$$reg), __ ifelse($4, D, T8B, T16B),
              as_FloatRegister($src$$reg),
              as_FloatRegister($src$$reg));
     } else {
-      __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
-             as_FloatRegister($src$$reg), sh);
+      __ ushr(as_FloatRegister($dst$$reg), __ T$1$3,
+              as_FloatRegister($src$$reg), sh);
     }', `
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+    __ ushr(as_FloatRegister($dst$$reg), __ T$1$3,
             as_FloatRegister($src$$reg),
             (int)$shift$$constant);')
   %}
-  ins_pipe(vshift`'ifelse($6, D, 64, 128)_imm);
+  ins_pipe(vshift`'ifelse($4, D, 64, 128)_imm);
 %}')dnl
 dnl
 define(`VSRLA_IMM', `
-instruct vsrla$3$4_imm`'(vec$6 dst, vec$6 src, immI shift) %{
-  predicate(n->as_Vector()->length() == $3);
-  match(Set dst (AddV$4 dst (URShiftV$4 src (RShiftCntV shift))));
+instruct vsrla$1$2_imm`'(vec$4 dst, vec$4 src, immI shift) %{
+  predicate(n->as_Vector()->length() == $1);
+  match(Set dst (AddV$2 dst (URShiftV$2 src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "$1    $dst, $src, $shift\t# vector ($3$5)" %}
-  ins_encode %{ifelse($4, B,`
+  format %{ "usra  $dst, $src, $shift\t# vector ($1$3)" %}
+  ins_encode %{ifelse($2, B,`
     int sh = (int)$shift$$constant;
     if (sh < 8) {
-      __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
-             as_FloatRegister($src$$reg), sh);
-    }', $4, S,`
+      __ usra(as_FloatRegister($dst$$reg), __ T$1$3,
+              as_FloatRegister($src$$reg), sh);
+    }', $2, S,`
     int sh = (int)$shift$$constant;
     if (sh < 16) {
-      __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
-             as_FloatRegister($src$$reg), sh);
+      __ usra(as_FloatRegister($dst$$reg), __ T$1$3,
+              as_FloatRegister($src$$reg), sh);
     }', `
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+    __ usra(as_FloatRegister($dst$$reg), __ T$1$3,
             as_FloatRegister($src$$reg),
             (int)$shift$$constant);')
   %}
-  ins_pipe(vshift`'ifelse($6, D, 64, 128)_imm);
+  ins_pipe(vshift`'ifelse($4, D, 64, 128)_imm);
 %}')dnl
 dnl
 define(`VSRAA_IMM', `
-instruct vsraa$3$4_imm`'(vec$6 dst, vec$6 src, immI shift) %{
-  predicate(n->as_Vector()->length() == $3);
-  match(Set dst (AddV$4 dst (RShiftV$4 src (RShiftCntV shift))));
+instruct vsraa$1$2_imm`'(vec$4 dst, vec$4 src, immI shift) %{
+  predicate(n->as_Vector()->length() == $1);
+  match(Set dst (AddV$2 dst (RShiftV$2 src (RShiftCntV shift))));
   ins_cost(INSN_COST);
-  format %{ "$1    $dst, $src, $shift\t# vector ($3$5)" %}
-  ins_encode %{ifelse($4, B,`
+  format %{ "ssra  $dst, $src, $shift\t# vector ($1$3)" %}
+  ins_encode %{ifelse($2, B,`
     int sh = (int)$shift$$constant;
     if (sh >= 8) sh = 7;
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
-           as_FloatRegister($src$$reg), sh);', $4, S,`
+    __ ssra(as_FloatRegister($dst$$reg), __ T$1$3,
+            as_FloatRegister($src$$reg), sh);', $2, S,`
     int sh = (int)$shift$$constant;
     if (sh >= 16) sh = 15;
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
-           as_FloatRegister($src$$reg), sh);', `
-    __ $2(as_FloatRegister($dst$$reg), __ T$3$5,
+    __ ssra(as_FloatRegister($dst$$reg), __ T$1$3,
+            as_FloatRegister($src$$reg), sh);', `
+    __ ssra(as_FloatRegister($dst$$reg), __ T$1$3,
             as_FloatRegister($src$$reg),
             (int)$shift$$constant);')
   %}
-  ins_pipe(vshift`'ifelse($6, D, 64, 128)_imm);
+  ins_pipe(vshift`'ifelse($4, D, 64, 128)_imm);
 %}')dnl
-dnl  $1    $2    $3  $4 $5 $6
-VSLL(sshl, sshl, 8,  B, B, D)
-VSLL(sshl, sshl, 16, B, B, X)
+dnl
+undefine(PREDICATE)dnl
+dnl
+dnl  $1  $2 $3 $4
+VSLL(8,  B, B, D)
+VSLL(16, B, B, X)
 
 // Right shifts with vector shift count on aarch64 SIMD are implemented
 // as left shift by negative shift count.
@@ -2199,8 +2253,6 @@ VSLL(sshl, sshl, 16, B, B, X)
 //    LoadVector  RShiftCntV
 //        |       /
 //     RShiftVI
-// Note: In inner loop, multiple neg instructions are used, which can be
-// moved to outer loop and merge into one neg instruction.
 //
 // Case 2: The vector shift count is from loading.
 // This case isn't supported by middle-end now. But it's supported by
@@ -2210,61 +2262,83 @@ VSLL(sshl, sshl, 16, B, B, X)
 //        |       /
 //     RShiftVI
 //
-dnl  $1    $2    $3  $4 $5 $6
-VSRA(negr, sshl, 8,  B, B, D)
-VSRA(negr, sshl, 16, B, B, X)
-VSRL(negr, ushl, 8,  B, B, D)
-VSRL(negr, ushl, 16, B, B, X)
-VSLL_IMM(shl, shl, 8,  B, B, D)
-VSLL_IMM(shl, shl, 16, B, B, X)
-VSRA_IMM(sshr, sshr, 8,  B, B, D)
-VSRA_IMM(sshr, sshr, 16, B, B, X)
-VSRL_IMM(ushr, ushr, 8,  B, B, D)
-VSRL_IMM(ushr, ushr, 16, B, B, X)
-VSLL(sshl, sshl, 4,  S, H, D)
-VSLL(sshl, sshl, 8,  S, H, X)
-VSRA(negr, sshl, 4,  S, H, D)
-VSRA(negr, sshl, 8,  S, H, X)
-VSRL(negr, ushl, 4,  S, H, D)
-VSRL(negr, ushl, 8,  S, H, X)
-VSLL_IMM(shl, shl, 4,  S, H, D)
-VSLL_IMM(shl, shl, 8,  S, H, X)
-VSRA_IMM(sshr, sshr, 4,  S, H, D)
-VSRA_IMM(sshr, sshr, 8,  S, H, X)
-VSRL_IMM(ushr, ushr, 4,  S, H, D)
-VSRL_IMM(ushr, ushr, 8,  S, H, X)
-VSLL(sshl, sshl, 2,  I, S, D)
-VSLL(sshl, sshl, 4,  I, S, X)
-VSRA(negr, sshl, 2,  I, S, D)
-VSRA(negr, sshl, 4,  I, S, X)
-VSRL(negr, ushl, 2,  I, S, D)
-VSRL(negr, ushl, 4,  I, S, X)
-VSLL_IMM(shl, shl, 2,  I, S, D)
-VSLL_IMM(shl, shl, 4,  I, S, X)
-VSRA_IMM(sshr, sshr, 2,  I, S, D)
-VSRA_IMM(sshr, sshr, 4,  I, S, X)
-VSRL_IMM(ushr, ushr, 2,  I, S, D)
-VSRL_IMM(ushr, ushr, 4,  I, S, X)
-VSLL(sshl, sshl, 2,  L, D, X)
-VSRA(negr, sshl, 2,  L, D, X)
-VSRL(negr, ushl, 2,  L, D, X)
-VSLL_IMM(shl, shl, 2,  L, D, X)
-VSRA_IMM(sshr, sshr, 2,  L, D, X)
-VSRL_IMM(ushr, ushr, 2,  L, D, X)
-VSRAA_IMM(ssra, ssra, 8,  B, B, D)
-VSRAA_IMM(ssra, ssra, 16, B, B, X)
-VSRAA_IMM(ssra, ssra, 4,  S, H, D)
-VSRAA_IMM(ssra, ssra, 8,  S, H, X)
-VSRAA_IMM(ssra, ssra, 2,  I, S, D)
-VSRAA_IMM(ssra, ssra, 4,  I, S, X)
-VSRAA_IMM(ssra, ssra, 2,  L, D, X)
-VSRLA_IMM(usra, usra, 8,  B, B, D)
-VSRLA_IMM(usra, usra, 16, B, B, X)
-VSRLA_IMM(usra, usra, 4,  S, H, D)
-VSRLA_IMM(usra, usra, 8,  S, H, X)
-VSRLA_IMM(usra, usra, 2,  I, S, D)
-VSRLA_IMM(usra, usra, 4,  I, S, X)
-VSRLA_IMM(usra, usra, 2,  L, D, X)
+// The negate is conducted in RShiftCntV rule for case 1, whereas it's done in
+// RShiftV* rules for case 2. Because there exists an optimization opportunity
+// for case 1, that is, multiple neg instructions in inner loop can be hoisted
+// to outer loop and merged into one neg instruction.
+//
+// Note that ShiftVNode::is_var_shift() indicates whether the vector shift
+// count is a variable vector(case 2) or not(a vector generated by RShiftCntV,
+// i.e. case 1).
+dnl  $1  $2 $3 $4
+VSRA(8,  B, B, D)
+VSRA_VAR(8,  B, B, D)
+VSRA(16, B, B, X)
+VSRA_VAR(16, B, B, X)
+VSRL(8,  B, B, D)
+VSRL_VAR(8,  B, B, D)
+VSRL(16, B, B, X)
+VSRL_VAR(16, B, B, X)
+VSLL_IMM(8,  B, B, D)
+VSLL_IMM(16, B, B, X)
+VSRA_IMM(8,  B, B, D)
+VSRA_IMM(16, B, B, X)
+VSRL_IMM(8,  B, B, D)
+VSRL_IMM(16, B, B, X)
+VSLL(4,  S, H, D)
+VSLL(8,  S, H, X)
+VSRA(4,  S, H, D)
+VSRA_VAR(4,  S, H, D)
+VSRA(8,  S, H, X)
+VSRA_VAR(8,  S, H, X)
+VSRL(4,  S, H, D)
+VSRL_VAR(4,  S, H, D)
+VSRL(8,  S, H, X)
+VSRL_VAR(8,  S, H, X)
+VSLL_IMM(4,  S, H, D)
+VSLL_IMM(8,  S, H, X)
+VSRA_IMM(4,  S, H, D)
+VSRA_IMM(8,  S, H, X)
+VSRL_IMM(4,  S, H, D)
+VSRL_IMM(8,  S, H, X)
+VSLL(2,  I, S, D)
+VSLL(4,  I, S, X)
+VSRA(2,  I, S, D)
+VSRA_VAR(2,  I, S, D)
+VSRA(4,  I, S, X)
+VSRA_VAR(4,  I, S, X)
+VSRL(2,  I, S, D)
+VSRL_VAR(2,  I, S, D)
+VSRL(4,  I, S, X)
+VSRL_VAR(4,  I, S, X)
+VSLL_IMM(2,  I, S, D)
+VSLL_IMM(4,  I, S, X)
+VSRA_IMM(2,  I, S, D)
+VSRA_IMM(4,  I, S, X)
+VSRL_IMM(2,  I, S, D)
+VSRL_IMM(4,  I, S, X)
+VSLL(2,  L, D, X)
+VSRA(2,  L, D, X)
+VSRA_VAR(2,  L, D, X)
+VSRL(2,  L, D, X)
+VSRL_VAR(2,  L, D, X)
+VSLL_IMM(2,  L, D, X)
+VSRA_IMM(2,  L, D, X)
+VSRL_IMM(2,  L, D, X)
+VSRAA_IMM(8,  B, B, D)
+VSRAA_IMM(16, B, B, X)
+VSRAA_IMM(4,  S, H, D)
+VSRAA_IMM(8,  S, H, X)
+VSRAA_IMM(2,  I, S, D)
+VSRAA_IMM(4,  I, S, X)
+VSRAA_IMM(2,  L, D, X)
+VSRLA_IMM(8,  B, B, D)
+VSRLA_IMM(16, B, B, X)
+VSRLA_IMM(4,  S, H, D)
+VSRLA_IMM(8,  S, H, X)
+VSRLA_IMM(2,  I, S, D)
+VSRLA_IMM(4,  I, S, X)
+VSRLA_IMM(2,  L, D, X)
 dnl
 define(`VMINMAX', `
 instruct v$1$3`'ifelse($5, S, F, D)`'(vec$6 dst, vec$6 src1, vec$6 src2)
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorShiftRight.java b/test/micro/org/openjdk/bench/vm/compiler/VectorShiftRight.java
new file mode 100644
index 00000000000..068d1bd704d
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorShiftRight.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+
+import java.util.concurrent.TimeUnit;
+import java.util.Random;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+public class VectorShiftRight {
+    @Param({"1024"})
+    public int SIZE;
+
+    private byte[]  bytesA,  bytesB;
+    private short[] shortsA, shortsB;
+    private char[]  charsA,  charsB;
+    private int[]   intsA,   intsB;
+    private long[]  longsA,  longsB;
+
+    @Param("0")
+    private int seed;
+    private Random r = new Random(seed);
+
+    @Param("3")
+    private int shiftCount;
+
+    @Setup
+    public void init() {
+        bytesA  = new byte[SIZE];
+        shortsA = new short[SIZE];
+        charsA  = new char[SIZE];
+        intsA   = new int[SIZE];
+        longsA  = new long[SIZE];
+
+        bytesB  = new byte[SIZE];
+        shortsB = new short[SIZE];
+        charsB  = new char[SIZE];
+        intsB   = new int[SIZE];
+        longsB  = new long[SIZE];
+
+        for (int i = 0; i < SIZE; i++) {
+            bytesA[i]  = (byte) r.nextInt();
+            shortsA[i] = (short) r.nextInt();
+            charsA[i]  = (char) r.nextInt();
+            intsA[i]   = r.nextInt();
+            longsA[i]  = r.nextLong();
+       }
+    }
+
+    @Benchmark
+    public void rShiftByte() {
+        for (int i = 0; i < SIZE; i++) {
+            bytesB[i] = (byte) (bytesA[i] >> shiftCount);
+        }
+    }
+
+    @Benchmark
+    public void urShiftByte() {
+        for (int i = 0; i < SIZE; i++) {
+            bytesB[i] = (byte) (bytesA[i] >>> shiftCount);
+        }
+    }
+
+    @Benchmark
+    public void rShiftShort() {
+        for (int i = 0; i < SIZE; i++) {
+            shortsB[i] = (short) (shortsA[i] >> shiftCount);
+        }
+    }
+
+    @Benchmark
+    public void urShiftChar() {
+        for (int i = 0; i < SIZE; i++) {
+            charsB[i] = (char) (charsA[i] >>> shiftCount);
+        }
+    }
+
+    @Benchmark
+    public void rShiftInt() {
+        for (int i = 0; i < SIZE; i++) {
+            intsB[i] = intsA[i] >> shiftCount;
+        }
+    }
+
+    @Benchmark
+    public void urShiftInt() {
+        for (int i = 0; i < SIZE; i++) {
+            intsB[i] = intsA[i] >>> shiftCount;
+        }
+    }
+
+    @Benchmark
+    public void rShiftLong() {
+        for (int i = 0; i < SIZE; i++) {
+            longsB[i] = longsA[i] >> shiftCount;
+        }
+    }
+
+    @Benchmark
+    public void urShiftLong() {
+        for (int i = 0; i < SIZE; i++) {
+            longsB[i] = longsA[i] >>> shiftCount;
+        }
+    }
+}
-- 
GitLab


From 12693a6cf3e00c38a635d888419406f689657813 Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Wed, 9 Mar 2022 01:02:25 +0000
Subject: [PATCH 039/345] 8282432: Optimize masked "test" Vector API with
 predicate feature

Reviewed-by: psandoz
---
 .../jdk/incubator/vector/Byte128Vector.java   |  8 +-
 .../jdk/incubator/vector/Byte256Vector.java   |  8 +-
 .../jdk/incubator/vector/Byte512Vector.java   |  8 +-
 .../jdk/incubator/vector/Byte64Vector.java    |  8 +-
 .../jdk/incubator/vector/ByteMaxVector.java   |  8 +-
 .../jdk/incubator/vector/ByteVector.java      | 35 ++++++--
 .../jdk/incubator/vector/Double128Vector.java |  8 +-
 .../jdk/incubator/vector/Double256Vector.java |  8 +-
 .../jdk/incubator/vector/Double512Vector.java |  8 +-
 .../jdk/incubator/vector/Double64Vector.java  |  8 +-
 .../jdk/incubator/vector/DoubleMaxVector.java |  8 +-
 .../jdk/incubator/vector/DoubleVector.java    | 49 +++++++++--
 .../jdk/incubator/vector/Float128Vector.java  |  8 +-
 .../jdk/incubator/vector/Float256Vector.java  |  8 +-
 .../jdk/incubator/vector/Float512Vector.java  |  8 +-
 .../jdk/incubator/vector/Float64Vector.java   |  8 +-
 .../jdk/incubator/vector/FloatMaxVector.java  |  8 +-
 .../jdk/incubator/vector/FloatVector.java     | 49 +++++++++--
 .../jdk/incubator/vector/Int128Vector.java    |  8 +-
 .../jdk/incubator/vector/Int256Vector.java    |  8 +-
 .../jdk/incubator/vector/Int512Vector.java    |  8 +-
 .../jdk/incubator/vector/Int64Vector.java     |  8 +-
 .../jdk/incubator/vector/IntMaxVector.java    |  8 +-
 .../jdk/incubator/vector/IntVector.java       | 35 ++++++--
 .../jdk/incubator/vector/Long128Vector.java   |  8 +-
 .../jdk/incubator/vector/Long256Vector.java   |  8 +-
 .../jdk/incubator/vector/Long512Vector.java   |  8 +-
 .../jdk/incubator/vector/Long64Vector.java    |  8 +-
 .../jdk/incubator/vector/LongMaxVector.java   |  8 +-
 .../jdk/incubator/vector/LongVector.java      | 35 ++++++--
 .../jdk/incubator/vector/Short128Vector.java  |  8 +-
 .../jdk/incubator/vector/Short256Vector.java  |  8 +-
 .../jdk/incubator/vector/Short512Vector.java  |  8 +-
 .../jdk/incubator/vector/Short64Vector.java   |  8 +-
 .../jdk/incubator/vector/ShortMaxVector.java  |  8 +-
 .../jdk/incubator/vector/ShortVector.java     | 35 ++++++--
 .../incubator/vector/X-Vector.java.template   | 61 ++++++++++++--
 .../vector/X-VectorBits.java.template         |  8 +-
 .../incubator/vector/Byte128VectorTests.java  | 34 ++++----
 .../incubator/vector/Byte256VectorTests.java  | 34 ++++----
 .../incubator/vector/Byte512VectorTests.java  | 34 ++++----
 .../incubator/vector/Byte64VectorTests.java   | 34 ++++----
 .../incubator/vector/ByteMaxVectorTests.java  | 34 ++++----
 .../vector/Double128VectorTests.java          | 82 +++++++++++--------
 .../vector/Double256VectorTests.java          | 82 +++++++++++--------
 .../vector/Double512VectorTests.java          | 82 +++++++++++--------
 .../incubator/vector/Double64VectorTests.java | 82 +++++++++++--------
 .../vector/DoubleMaxVectorTests.java          | 82 +++++++++++--------
 .../incubator/vector/Float128VectorTests.java | 82 +++++++++++--------
 .../incubator/vector/Float256VectorTests.java | 82 +++++++++++--------
 .../incubator/vector/Float512VectorTests.java | 82 +++++++++++--------
 .../incubator/vector/Float64VectorTests.java  | 82 +++++++++++--------
 .../incubator/vector/FloatMaxVectorTests.java | 82 +++++++++++--------
 .../incubator/vector/Int128VectorTests.java   | 34 ++++----
 .../incubator/vector/Int256VectorTests.java   | 34 ++++----
 .../incubator/vector/Int512VectorTests.java   | 34 ++++----
 .../incubator/vector/Int64VectorTests.java    | 34 ++++----
 .../incubator/vector/IntMaxVectorTests.java   | 34 ++++----
 .../incubator/vector/Long128VectorTests.java  | 34 ++++----
 .../incubator/vector/Long256VectorTests.java  | 34 ++++----
 .../incubator/vector/Long512VectorTests.java  | 34 ++++----
 .../incubator/vector/Long64VectorTests.java   | 34 ++++----
 .../incubator/vector/LongMaxVectorTests.java  | 34 ++++----
 .../incubator/vector/Short128VectorTests.java | 34 ++++----
 .../incubator/vector/Short256VectorTests.java | 34 ++++----
 .../incubator/vector/Short512VectorTests.java | 34 ++++----
 .../incubator/vector/Short64VectorTests.java  | 34 ++++----
 .../incubator/vector/ShortMaxVectorTests.java | 34 ++++----
 .../vector/templates/Unit-Test.template       | 16 ++--
 .../vector/templates/Unit-header.template     |  2 +-
 70 files changed, 1314 insertions(+), 751 deletions(-)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
index e4fae8e0acf..86627f9f33d 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Byte128Vector extends ByteVector {
         return super.testTemplate(Byte128Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Byte128Mask test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(Byte128Mask.class, op, (Byte128Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
index 7c123c893b4..f5f9977db08 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Byte256Vector extends ByteVector {
         return super.testTemplate(Byte256Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Byte256Mask test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(Byte256Mask.class, op, (Byte256Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
index 1b63838b14c..e72dbed51dc 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Byte512Vector extends ByteVector {
         return super.testTemplate(Byte512Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Byte512Mask test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(Byte512Mask.class, op, (Byte512Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
index 16010b7de09..c5e060b8de9 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Byte64Vector extends ByteVector {
         return super.testTemplate(Byte64Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Byte64Mask test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(Byte64Mask.class, op, (Byte64Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
index fb36dab860c..5239cd33ea0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class ByteMaxVector extends ByteVector {
         return super.testTemplate(ByteMaxMask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final ByteMaxMask test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(ByteMaxMask.class, op, (ByteMaxMask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
index d67f86f7985..5bd14c97601 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1855,12 +1855,11 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     M testTemplate(Class<M> maskType, Test op) {
         ByteSpecies vsp = vspecies();
         if (opKind(op, VO_SPECIAL)) {
-            ByteVector bits = this.viewAsIntegralLanes();
             VectorMask<Byte> m;
             if (op == IS_DEFAULT) {
-                m = bits.compare(EQ, (byte) 0);
+                m = compare(EQ, (byte) 0);
             } else if (op == IS_NEGATIVE) {
-                m = bits.compare(LT, (byte) 0);
+                m = compare(LT, (byte) 0);
             }
             else {
                 throw new AssertionError(op);
@@ -1875,11 +1874,31 @@ public abstract class ByteVector extends AbstractVector<Byte> {
      * {@inheritDoc} <!--workaround-->
      */
     @Override
-    @ForceInline
-    public final
+    public abstract
     VectorMask<Byte> test(VectorOperators.Test op,
-                                  VectorMask<Byte> m) {
-        return test(op).and(m);
+                                  VectorMask<Byte> m);
+
+    /*package-private*/
+    @ForceInline
+    final
+    <M extends VectorMask<Byte>>
+    M testTemplate(Class<M> maskType, Test op, M mask) {
+        ByteSpecies vsp = vspecies();
+        mask.check(maskType, this);
+        if (opKind(op, VO_SPECIAL)) {
+            VectorMask<Byte> m = mask;
+            if (op == IS_DEFAULT) {
+                m = compare(EQ, (byte) 0, m);
+            } else if (op == IS_NEGATIVE) {
+                m = compare(LT, (byte) 0, m);
+            }
+            else {
+                throw new AssertionError(op);
+            }
+            return maskType.cast(m);
+        }
+        int opc = opCode(op);
+        throw new AssertionError(op);
     }
 
     /**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
index d4762fe7796..24c32c848c3 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class Double128Vector extends DoubleVector {
         return super.testTemplate(Double128Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Double128Mask test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(Double128Mask.class, op, (Double128Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
index 147d6b866d6..e265dc86288 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class Double256Vector extends DoubleVector {
         return super.testTemplate(Double256Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Double256Mask test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(Double256Mask.class, op, (Double256Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
index e091ca9b63f..77b52f511d6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class Double512Vector extends DoubleVector {
         return super.testTemplate(Double512Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Double512Mask test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(Double512Mask.class, op, (Double512Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
index a90ff9c761c..dba680a6a3c 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class Double64Vector extends DoubleVector {
         return super.testTemplate(Double64Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Double64Mask test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(Double64Mask.class, op, (Double64Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
index bf4ce4e6422..8c454d3f872 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class DoubleMaxVector extends DoubleVector {
         return super.testTemplate(DoubleMaxMask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final DoubleMaxMask test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(DoubleMaxMask.class, op, (DoubleMaxMask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
index 063a4bbb191..aec717394ed 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1715,7 +1715,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
             else {
                 throw new AssertionError(op);
             }
-            return maskType.cast(m.cast(this.vspecies()));
+            return maskType.cast(m.cast(vsp));
         }
         int opc = opCode(op);
         throw new AssertionError(op);
@@ -1725,11 +1725,48 @@ public abstract class DoubleVector extends AbstractVector<Double> {
      * {@inheritDoc} <!--workaround-->
      */
     @Override
-    @ForceInline
-    public final
+    public abstract
     VectorMask<Double> test(VectorOperators.Test op,
-                                  VectorMask<Double> m) {
-        return test(op).and(m);
+                                  VectorMask<Double> m);
+
+    /*package-private*/
+    @ForceInline
+    final
+    <M extends VectorMask<Double>>
+    M testTemplate(Class<M> maskType, Test op, M mask) {
+        DoubleSpecies vsp = vspecies();
+        mask.check(maskType, this);
+        if (opKind(op, VO_SPECIAL)) {
+            LongVector bits = this.viewAsIntegralLanes();
+            VectorMask<Long> m = mask.cast(LongVector.species(shape()));
+            if (op == IS_DEFAULT) {
+                m = bits.compare(EQ, (long) 0, m);
+            } else if (op == IS_NEGATIVE) {
+                m = bits.compare(LT, (long) 0, m);
+            }
+            else if (op == IS_FINITE ||
+                     op == IS_NAN ||
+                     op == IS_INFINITE) {
+                // first kill the sign:
+                bits = bits.and(Long.MAX_VALUE);
+                // next find the bit pattern for infinity:
+                long infbits = (long) toBits(Double.POSITIVE_INFINITY);
+                // now compare:
+                if (op == IS_FINITE) {
+                    m = bits.compare(LT, infbits, m);
+                } else if (op == IS_NAN) {
+                    m = bits.compare(GT, infbits, m);
+                } else {
+                    m = bits.compare(EQ, infbits, m);
+                }
+            }
+            else {
+                throw new AssertionError(op);
+            }
+            return maskType.cast(m.cast(vsp));
+        }
+        int opc = opCode(op);
+        throw new AssertionError(op);
     }
 
     /**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
index 88f6d76d0cb..1d6195486ae 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class Float128Vector extends FloatVector {
         return super.testTemplate(Float128Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Float128Mask test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(Float128Mask.class, op, (Float128Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
index 4b039df7984..6a2a1003cf4 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class Float256Vector extends FloatVector {
         return super.testTemplate(Float256Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Float256Mask test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(Float256Mask.class, op, (Float256Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
index 7864af72205..5b29c2cca10 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class Float512Vector extends FloatVector {
         return super.testTemplate(Float512Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Float512Mask test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(Float512Mask.class, op, (Float512Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
index bbdbcee1c5f..0eea80c244f 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class Float64Vector extends FloatVector {
         return super.testTemplate(Float64Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Float64Mask test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(Float64Mask.class, op, (Float64Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
index bba093b3b76..0db9aab9c57 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -357,6 +357,12 @@ final class FloatMaxVector extends FloatVector {
         return super.testTemplate(FloatMaxMask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final FloatMaxMask test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(FloatMaxMask.class, op, (FloatMaxMask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
index f78d9814514..c55df4b72bd 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1727,7 +1727,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
             else {
                 throw new AssertionError(op);
             }
-            return maskType.cast(m.cast(this.vspecies()));
+            return maskType.cast(m.cast(vsp));
         }
         int opc = opCode(op);
         throw new AssertionError(op);
@@ -1737,11 +1737,48 @@ public abstract class FloatVector extends AbstractVector<Float> {
      * {@inheritDoc} <!--workaround-->
      */
     @Override
-    @ForceInline
-    public final
+    public abstract
     VectorMask<Float> test(VectorOperators.Test op,
-                                  VectorMask<Float> m) {
-        return test(op).and(m);
+                                  VectorMask<Float> m);
+
+    /*package-private*/
+    @ForceInline
+    final
+    <M extends VectorMask<Float>>
+    M testTemplate(Class<M> maskType, Test op, M mask) {
+        FloatSpecies vsp = vspecies();
+        mask.check(maskType, this);
+        if (opKind(op, VO_SPECIAL)) {
+            IntVector bits = this.viewAsIntegralLanes();
+            VectorMask<Integer> m = mask.cast(IntVector.species(shape()));
+            if (op == IS_DEFAULT) {
+                m = bits.compare(EQ, (int) 0, m);
+            } else if (op == IS_NEGATIVE) {
+                m = bits.compare(LT, (int) 0, m);
+            }
+            else if (op == IS_FINITE ||
+                     op == IS_NAN ||
+                     op == IS_INFINITE) {
+                // first kill the sign:
+                bits = bits.and(Integer.MAX_VALUE);
+                // next find the bit pattern for infinity:
+                int infbits = (int) toBits(Float.POSITIVE_INFINITY);
+                // now compare:
+                if (op == IS_FINITE) {
+                    m = bits.compare(LT, infbits, m);
+                } else if (op == IS_NAN) {
+                    m = bits.compare(GT, infbits, m);
+                } else {
+                    m = bits.compare(EQ, infbits, m);
+                }
+            }
+            else {
+                throw new AssertionError(op);
+            }
+            return maskType.cast(m.cast(vsp));
+        }
+        int opc = opCode(op);
+        throw new AssertionError(op);
     }
 
     /**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
index 3a88ba76e80..3baf712aa7c 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Int128Vector extends IntVector {
         return super.testTemplate(Int128Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Int128Mask test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(Int128Mask.class, op, (Int128Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
index ffc560e5f52..a82f1cf1d07 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Int256Vector extends IntVector {
         return super.testTemplate(Int256Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Int256Mask test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(Int256Mask.class, op, (Int256Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
index a2ff6d515e3..40b7246b63f 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Int512Vector extends IntVector {
         return super.testTemplate(Int512Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Int512Mask test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(Int512Mask.class, op, (Int512Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
index 996f35ac15d..59c54a6007b 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Int64Vector extends IntVector {
         return super.testTemplate(Int64Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Int64Mask test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(Int64Mask.class, op, (Int64Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
index cfc645fcd6b..58588448c06 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class IntMaxVector extends IntVector {
         return super.testTemplate(IntMaxMask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final IntMaxMask test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(IntMaxMask.class, op, (IntMaxMask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
index c80b61cb7a2..312e1ad725a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1854,12 +1854,11 @@ public abstract class IntVector extends AbstractVector<Integer> {
     M testTemplate(Class<M> maskType, Test op) {
         IntSpecies vsp = vspecies();
         if (opKind(op, VO_SPECIAL)) {
-            IntVector bits = this.viewAsIntegralLanes();
             VectorMask<Integer> m;
             if (op == IS_DEFAULT) {
-                m = bits.compare(EQ, (int) 0);
+                m = compare(EQ, (int) 0);
             } else if (op == IS_NEGATIVE) {
-                m = bits.compare(LT, (int) 0);
+                m = compare(LT, (int) 0);
             }
             else {
                 throw new AssertionError(op);
@@ -1874,11 +1873,31 @@ public abstract class IntVector extends AbstractVector<Integer> {
      * {@inheritDoc} <!--workaround-->
      */
     @Override
-    @ForceInline
-    public final
+    public abstract
     VectorMask<Integer> test(VectorOperators.Test op,
-                                  VectorMask<Integer> m) {
-        return test(op).and(m);
+                                  VectorMask<Integer> m);
+
+    /*package-private*/
+    @ForceInline
+    final
+    <M extends VectorMask<Integer>>
+    M testTemplate(Class<M> maskType, Test op, M mask) {
+        IntSpecies vsp = vspecies();
+        mask.check(maskType, this);
+        if (opKind(op, VO_SPECIAL)) {
+            VectorMask<Integer> m = mask;
+            if (op == IS_DEFAULT) {
+                m = compare(EQ, (int) 0, m);
+            } else if (op == IS_NEGATIVE) {
+                m = compare(LT, (int) 0, m);
+            }
+            else {
+                throw new AssertionError(op);
+            }
+            return maskType.cast(m);
+        }
+        int opc = opCode(op);
+        throw new AssertionError(op);
     }
 
     /**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
index aad676d8fce..7a11c0005a4 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -365,6 +365,12 @@ final class Long128Vector extends LongVector {
         return super.testTemplate(Long128Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Long128Mask test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(Long128Mask.class, op, (Long128Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
index 85f1e54f242..ad4057dc070 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -365,6 +365,12 @@ final class Long256Vector extends LongVector {
         return super.testTemplate(Long256Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Long256Mask test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(Long256Mask.class, op, (Long256Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
index 1642b885f34..6f7bee397a1 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -365,6 +365,12 @@ final class Long512Vector extends LongVector {
         return super.testTemplate(Long512Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Long512Mask test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(Long512Mask.class, op, (Long512Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
index 3e67506c392..e7ab1241f4e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -365,6 +365,12 @@ final class Long64Vector extends LongVector {
         return super.testTemplate(Long64Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Long64Mask test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(Long64Mask.class, op, (Long64Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
index 2078dbec65b..56ce68f1fc3 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -365,6 +365,12 @@ final class LongMaxVector extends LongVector {
         return super.testTemplate(LongMaxMask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final LongMaxMask test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(LongMaxMask.class, op, (LongMaxMask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
index 6934469b213..513178181f4 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1767,12 +1767,11 @@ public abstract class LongVector extends AbstractVector<Long> {
     M testTemplate(Class<M> maskType, Test op) {
         LongSpecies vsp = vspecies();
         if (opKind(op, VO_SPECIAL)) {
-            LongVector bits = this.viewAsIntegralLanes();
             VectorMask<Long> m;
             if (op == IS_DEFAULT) {
-                m = bits.compare(EQ, (long) 0);
+                m = compare(EQ, (long) 0);
             } else if (op == IS_NEGATIVE) {
-                m = bits.compare(LT, (long) 0);
+                m = compare(LT, (long) 0);
             }
             else {
                 throw new AssertionError(op);
@@ -1787,11 +1786,31 @@ public abstract class LongVector extends AbstractVector<Long> {
      * {@inheritDoc} <!--workaround-->
      */
     @Override
-    @ForceInline
-    public final
+    public abstract
     VectorMask<Long> test(VectorOperators.Test op,
-                                  VectorMask<Long> m) {
-        return test(op).and(m);
+                                  VectorMask<Long> m);
+
+    /*package-private*/
+    @ForceInline
+    final
+    <M extends VectorMask<Long>>
+    M testTemplate(Class<M> maskType, Test op, M mask) {
+        LongSpecies vsp = vspecies();
+        mask.check(maskType, this);
+        if (opKind(op, VO_SPECIAL)) {
+            VectorMask<Long> m = mask;
+            if (op == IS_DEFAULT) {
+                m = compare(EQ, (long) 0, m);
+            } else if (op == IS_NEGATIVE) {
+                m = compare(LT, (long) 0, m);
+            }
+            else {
+                throw new AssertionError(op);
+            }
+            return maskType.cast(m);
+        }
+        int opc = opCode(op);
+        throw new AssertionError(op);
     }
 
     /**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
index 93bf40153a7..ce7e3ca8c18 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Short128Vector extends ShortVector {
         return super.testTemplate(Short128Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Short128Mask test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(Short128Mask.class, op, (Short128Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
index 805f89bcdd9..3d7b00ddcd0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Short256Vector extends ShortVector {
         return super.testTemplate(Short256Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Short256Mask test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(Short256Mask.class, op, (Short256Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
index 51d72852938..2d23dcae93f 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Short512Vector extends ShortVector {
         return super.testTemplate(Short512Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Short512Mask test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(Short512Mask.class, op, (Short512Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
index 97ac8fe07cb..f7e0c0162d3 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class Short64Vector extends ShortVector {
         return super.testTemplate(Short64Mask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final Short64Mask test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(Short64Mask.class, op, (Short64Mask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
index c0ec9ee8b4e..154096d9d6f 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,12 @@ final class ShortMaxVector extends ShortVector {
         return super.testTemplate(ShortMaxMask.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final ShortMaxMask test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(ShortMaxMask.class, op, (ShortMaxMask) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
index b3c89e87cc4..511e10a6563 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1855,12 +1855,11 @@ public abstract class ShortVector extends AbstractVector<Short> {
     M testTemplate(Class<M> maskType, Test op) {
         ShortSpecies vsp = vspecies();
         if (opKind(op, VO_SPECIAL)) {
-            ShortVector bits = this.viewAsIntegralLanes();
             VectorMask<Short> m;
             if (op == IS_DEFAULT) {
-                m = bits.compare(EQ, (short) 0);
+                m = compare(EQ, (short) 0);
             } else if (op == IS_NEGATIVE) {
-                m = bits.compare(LT, (short) 0);
+                m = compare(LT, (short) 0);
             }
             else {
                 throw new AssertionError(op);
@@ -1875,11 +1874,31 @@ public abstract class ShortVector extends AbstractVector<Short> {
      * {@inheritDoc} <!--workaround-->
      */
     @Override
-    @ForceInline
-    public final
+    public abstract
     VectorMask<Short> test(VectorOperators.Test op,
-                                  VectorMask<Short> m) {
-        return test(op).and(m);
+                                  VectorMask<Short> m);
+
+    /*package-private*/
+    @ForceInline
+    final
+    <M extends VectorMask<Short>>
+    M testTemplate(Class<M> maskType, Test op, M mask) {
+        ShortSpecies vsp = vspecies();
+        mask.check(maskType, this);
+        if (opKind(op, VO_SPECIAL)) {
+            VectorMask<Short> m = mask;
+            if (op == IS_DEFAULT) {
+                m = compare(EQ, (short) 0, m);
+            } else if (op == IS_NEGATIVE) {
+                m = compare(LT, (short) 0, m);
+            }
+            else {
+                throw new AssertionError(op);
+            }
+            return maskType.cast(m);
+        }
+        int opc = opCode(op);
+        throw new AssertionError(op);
     }
 
     /**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
index 1cd50a11b8b..16d2dbea06e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2128,12 +2128,14 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     M testTemplate(Class<M> maskType, Test op) {
         $Type$Species vsp = vspecies();
         if (opKind(op, VO_SPECIAL)) {
+#if[FP]
             $Bitstype$Vector bits = this.viewAsIntegralLanes();
+#end[FP]
             VectorMask<$Boxbitstype$> m;
             if (op == IS_DEFAULT) {
-                m = bits.compare(EQ, ($bitstype$) 0);
+                m = {#if[FP]?bits.}compare(EQ, ($bitstype$) 0);
             } else if (op == IS_NEGATIVE) {
-                m = bits.compare(LT, ($bitstype$) 0);
+                m = {#if[FP]?bits.}compare(LT, ($bitstype$) 0);
             }
 #if[FP]
             else if (op == IS_FINITE ||
@@ -2156,7 +2158,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             else {
                 throw new AssertionError(op);
             }
-            return maskType.cast(m{#if[FP]?.cast(this.vspecies())});
+            return maskType.cast(m{#if[FP]?.cast(vsp)});
         }
         int opc = opCode(op);
         throw new AssertionError(op);
@@ -2166,11 +2168,54 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
      * {@inheritDoc} <!--workaround-->
      */
     @Override
-    @ForceInline
-    public final
+    public abstract
     VectorMask<$Boxtype$> test(VectorOperators.Test op,
-                                  VectorMask<$Boxtype$> m) {
-        return test(op).and(m);
+                                  VectorMask<$Boxtype$> m);
+
+    /*package-private*/
+    @ForceInline
+    final
+    <M extends VectorMask<$Boxtype$>>
+    M testTemplate(Class<M> maskType, Test op, M mask) {
+        $Type$Species vsp = vspecies();
+        mask.check(maskType, this);
+        if (opKind(op, VO_SPECIAL)) {
+#if[FP]
+            $Bitstype$Vector bits = this.viewAsIntegralLanes();
+            VectorMask<$Boxbitstype$> m = mask.cast($Bitstype$Vector.species(shape()));
+#else[FP]
+            VectorMask<$Boxbitstype$> m = mask;
+#end[FP]
+            if (op == IS_DEFAULT) {
+                m = {#if[FP]?bits.}compare(EQ, ($bitstype$) 0, m);
+            } else if (op == IS_NEGATIVE) {
+                m = {#if[FP]?bits.}compare(LT, ($bitstype$) 0, m);
+            }
+#if[FP]
+            else if (op == IS_FINITE ||
+                     op == IS_NAN ||
+                     op == IS_INFINITE) {
+                // first kill the sign:
+                bits = bits.and($Boxbitstype$.MAX_VALUE);
+                // next find the bit pattern for infinity:
+                $bitstype$ infbits = ($bitstype$) toBits($Boxtype$.POSITIVE_INFINITY);
+                // now compare:
+                if (op == IS_FINITE) {
+                    m = bits.compare(LT, infbits, m);
+                } else if (op == IS_NAN) {
+                    m = bits.compare(GT, infbits, m);
+                } else {
+                    m = bits.compare(EQ, infbits, m);
+                }
+            }
+#end[FP]
+            else {
+                throw new AssertionError(op);
+            }
+            return maskType.cast(m{#if[FP]?.cast(vsp)});
+        }
+        int opc = opCode(op);
+        throw new AssertionError(op);
     }
 
     /**
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
index 2f1004f6450..ec6e714f218 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -374,6 +374,12 @@ final class $vectortype$ extends $abstractvectortype$ {
         return super.testTemplate($masktype$.class, op);  // specialize
     }
 
+    @Override
+    @ForceInline
+    public final $masktype$ test(Test op, VectorMask<$Boxtype$> m) {
+        return super.testTemplate($masktype$.class, op, ($masktype$) m);  // specialize
+    }
+
     // Specialized comparisons
 
     @Override
diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
index 22e07e05a06..e7e97452b16 100644
--- a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3564,19 +3564,21 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByte128VectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByte128VectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3602,19 +3604,21 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByte128VectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByte128VectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
index 9a631c47993..aa14ff55a6d 100644
--- a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3564,19 +3564,21 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByte256VectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByte256VectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3602,19 +3604,21 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByte256VectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByte256VectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
index 203f233e4e8..c16f5d7d296 100644
--- a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3564,19 +3564,21 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByte512VectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByte512VectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3602,19 +3604,21 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByte512VectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByte512VectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
index 110e741ea43..b47c7be7ed7 100644
--- a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3564,19 +3564,21 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByte64VectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByte64VectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3602,19 +3604,21 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByte64VectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByte64VectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
index e4a9ebf19f5..7499c29fd50 100644
--- a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3569,19 +3569,21 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3607,19 +3609,21 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-            VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                VectorMask<Byte> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorTests.java b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
index c79b1e2f4ef..15a55af00c0 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2577,19 +2577,21 @@ public class Double128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDouble128VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDouble128VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2615,19 +2617,21 @@ public class Double128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDouble128VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDouble128VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2654,19 +2658,21 @@ public class Double128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDouble128VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDouble128VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2694,19 +2700,21 @@ public class Double128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDouble128VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NANMaskedDouble128VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2734,19 +2742,21 @@ public class Double128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDouble128VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDouble128VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorTests.java b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
index 6d459901d13..6a9e85129c2 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2577,19 +2577,21 @@ public class Double256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDouble256VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDouble256VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2615,19 +2617,21 @@ public class Double256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDouble256VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDouble256VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2654,19 +2658,21 @@ public class Double256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDouble256VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDouble256VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2694,19 +2700,21 @@ public class Double256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDouble256VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NANMaskedDouble256VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2734,19 +2742,21 @@ public class Double256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDouble256VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDouble256VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorTests.java b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
index 82299753e65..7d6d280d744 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2577,19 +2577,21 @@ public class Double512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDouble512VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDouble512VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2615,19 +2617,21 @@ public class Double512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDouble512VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDouble512VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2654,19 +2658,21 @@ public class Double512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDouble512VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDouble512VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2694,19 +2700,21 @@ public class Double512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDouble512VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NANMaskedDouble512VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2734,19 +2742,21 @@ public class Double512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDouble512VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDouble512VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorTests.java b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
index 82fd826ffcb..35bf2ec0465 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2577,19 +2577,21 @@ public class Double64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDouble64VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDouble64VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2615,19 +2617,21 @@ public class Double64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDouble64VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDouble64VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2654,19 +2658,21 @@ public class Double64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDouble64VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDouble64VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2694,19 +2700,21 @@ public class Double64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDouble64VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NANMaskedDouble64VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2734,19 +2742,21 @@ public class Double64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDouble64VectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDouble64VectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
index af9054efbb0..102749b7ca0 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2582,19 +2582,21 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2620,19 +2622,21 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2659,19 +2663,21 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2699,19 +2705,21 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_NANMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2739,19 +2747,21 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-            VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                VectorMask<Double> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorTests.java b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
index c793515b6c6..114ac299f3e 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2587,19 +2587,21 @@ public class Float128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloat128VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloat128VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2625,19 +2627,21 @@ public class Float128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloat128VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloat128VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2664,19 +2668,21 @@ public class Float128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloat128VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloat128VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2704,19 +2710,21 @@ public class Float128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloat128VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloat128VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2744,19 +2752,21 @@ public class Float128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloat128VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloat128VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorTests.java b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
index 61593a8c23a..8011f3a6869 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2587,19 +2587,21 @@ public class Float256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloat256VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloat256VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2625,19 +2627,21 @@ public class Float256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloat256VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloat256VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2664,19 +2668,21 @@ public class Float256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloat256VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloat256VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2704,19 +2710,21 @@ public class Float256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloat256VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloat256VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2744,19 +2752,21 @@ public class Float256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloat256VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloat256VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorTests.java b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
index 421338f053c..f6fa6ecc6f0 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2587,19 +2587,21 @@ public class Float512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloat512VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloat512VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2625,19 +2627,21 @@ public class Float512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloat512VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloat512VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2664,19 +2668,21 @@ public class Float512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloat512VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloat512VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2704,19 +2710,21 @@ public class Float512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloat512VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloat512VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2744,19 +2752,21 @@ public class Float512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloat512VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloat512VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorTests.java b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
index cbe82a7e22d..d0edf33f340 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2587,19 +2587,21 @@ public class Float64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloat64VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloat64VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2625,19 +2627,21 @@ public class Float64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloat64VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloat64VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2664,19 +2668,21 @@ public class Float64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloat64VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloat64VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2704,19 +2710,21 @@ public class Float64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloat64VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloat64VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2744,19 +2752,21 @@ public class Float64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloat64VectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloat64VectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
index e8680eb1d94..4f8711e8b1c 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2592,19 +2592,21 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -2630,19 +2632,21 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
@@ -2669,19 +2673,21 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_FINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                }
             }
         }
     }
@@ -2709,19 +2715,21 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_NAN, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                }
             }
         }
     }
@@ -2749,19 +2757,21 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-            VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                VectorMask<Float> mv = av.test(VectorOperators.IS_INFINITE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Int128VectorTests.java b/test/jdk/jdk/incubator/vector/Int128VectorTests.java
index 99bc02b8239..4de0a1b3044 100644
--- a/test/jdk/jdk/incubator/vector/Int128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3529,19 +3529,21 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedInt128VectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedInt128VectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3567,19 +3569,21 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedInt128VectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedInt128VectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Int256VectorTests.java b/test/jdk/jdk/incubator/vector/Int256VectorTests.java
index e4b3f491e31..597d5c6fdbb 100644
--- a/test/jdk/jdk/incubator/vector/Int256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3529,19 +3529,21 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedInt256VectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedInt256VectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3567,19 +3569,21 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedInt256VectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedInt256VectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Int512VectorTests.java b/test/jdk/jdk/incubator/vector/Int512VectorTests.java
index 503d24ab05c..075450c6adb 100644
--- a/test/jdk/jdk/incubator/vector/Int512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3529,19 +3529,21 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedInt512VectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedInt512VectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3567,19 +3569,21 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedInt512VectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedInt512VectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Int64VectorTests.java b/test/jdk/jdk/incubator/vector/Int64VectorTests.java
index 2bebc06d0e2..0d2346215d1 100644
--- a/test/jdk/jdk/incubator/vector/Int64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3529,19 +3529,21 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedInt64VectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedInt64VectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3567,19 +3569,21 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedInt64VectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedInt64VectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
index faf232e2985..eb735c101e7 100644
--- a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3534,19 +3534,21 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedIntMaxVectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3572,19 +3574,21 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedIntMaxVectorTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            IntVector av = IntVector.fromArray(SPECIES, a, i);
-            VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                VectorMask<Integer> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Long128VectorTests.java b/test/jdk/jdk/incubator/vector/Long128VectorTests.java
index 74d251476b2..da8c3fc8022 100644
--- a/test/jdk/jdk/incubator/vector/Long128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3551,19 +3551,21 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLong128VectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLong128VectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3589,19 +3591,21 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLong128VectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLong128VectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Long256VectorTests.java b/test/jdk/jdk/incubator/vector/Long256VectorTests.java
index 4d2acbddd86..6e291fc3c10 100644
--- a/test/jdk/jdk/incubator/vector/Long256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3551,19 +3551,21 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLong256VectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLong256VectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3589,19 +3591,21 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLong256VectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLong256VectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Long512VectorTests.java b/test/jdk/jdk/incubator/vector/Long512VectorTests.java
index 9bb6f568fca..8b0e64d5ae4 100644
--- a/test/jdk/jdk/incubator/vector/Long512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3551,19 +3551,21 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLong512VectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLong512VectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3589,19 +3591,21 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLong512VectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLong512VectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Long64VectorTests.java b/test/jdk/jdk/incubator/vector/Long64VectorTests.java
index 50976531dac..f3134e72b21 100644
--- a/test/jdk/jdk/incubator/vector/Long64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3551,19 +3551,21 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLong64VectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLong64VectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3589,19 +3591,21 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLong64VectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLong64VectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
index eb16136a0d6..749ec641d3d 100644
--- a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3556,19 +3556,21 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLongMaxVectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3594,19 +3596,21 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLongMaxVectorTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            LongVector av = LongVector.fromArray(SPECIES, a, i);
-            VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                VectorMask<Long> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Short128VectorTests.java b/test/jdk/jdk/incubator/vector/Short128VectorTests.java
index 2a060c354cd..e933c0eaac5 100644
--- a/test/jdk/jdk/incubator/vector/Short128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short128VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3554,19 +3554,21 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShort128VectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShort128VectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3592,19 +3594,21 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShort128VectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShort128VectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Short256VectorTests.java b/test/jdk/jdk/incubator/vector/Short256VectorTests.java
index 46626d63aaf..75f7129e14b 100644
--- a/test/jdk/jdk/incubator/vector/Short256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short256VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3554,19 +3554,21 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShort256VectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShort256VectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3592,19 +3594,21 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShort256VectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShort256VectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Short512VectorTests.java b/test/jdk/jdk/incubator/vector/Short512VectorTests.java
index 2cff4a4802a..af7eea3b2c8 100644
--- a/test/jdk/jdk/incubator/vector/Short512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short512VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3554,19 +3554,21 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShort512VectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShort512VectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3592,19 +3594,21 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShort512VectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShort512VectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/Short64VectorTests.java b/test/jdk/jdk/incubator/vector/Short64VectorTests.java
index 481081b75da..100bc4e3243 100644
--- a/test/jdk/jdk/incubator/vector/Short64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short64VectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3554,19 +3554,21 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShort64VectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShort64VectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3592,19 +3594,21 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShort64VectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShort64VectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
index 00d99484a13..bd71da2ab8e 100644
--- a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3559,19 +3559,21 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShortMaxVectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_DEFAULT, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                }
             }
         }
     }
@@ -3597,19 +3599,21 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShortMaxVectorTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-            VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                VectorMask<Short> mv = av.test(VectorOperators.IS_NEGATIVE, vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Test.template b/test/jdk/jdk/incubator/vector/templates/Unit-Test.template
index 03cb5a48733..c91be6191d2 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Test.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Test.template
@@ -20,19 +20,21 @@
     }
 
     @Test(dataProvider = "$type$TestOpMaskProvider")
-    static void [[TEST]]Masked$vectorteststype$SmokeTest(IntFunction<$type$[]> fa,
+    static void [[TEST]]Masked$vectorteststype$(IntFunction<$type$[]> fa,
                                           IntFunction<boolean[]> fm) {
         $type$[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<$Wideboxtype$> vmask = VectorMask.fromArray(SPECIES, mask, 0);
 
-        for (int i = 0; i < a.length; i += SPECIES.length()) {
-            $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-            VectorMask<$Wideboxtype$> mv = av.test(VectorOperators.[[TEST]], vmask);
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
+                VectorMask<$Wideboxtype$> mv = av.test(VectorOperators.[[TEST]], vmask);
 
-            // Check results as part of computation.
-            for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && test[[TEST]](a[i + j]));
+                // Check results as part of computation.
+                for (int j = 0; j < SPECIES.length(); j++) {
+                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && test[[TEST]](a[i + j]));
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-header.template b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
index 239596bf433..e010bb7268b 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-header.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
-- 
GitLab


From 31ad80a229e3f67823ff8f1fc914c5503f184b57 Mon Sep 17 00:00:00 2001
From: Tim Prinzing <tim.prinzing@oracle.com>
Date: Wed, 9 Mar 2022 04:02:17 +0000
Subject: [PATCH 040/345] 8280902: ResourceBundle::getBundle may throw NPE when
 invoked by JNI code with no caller frame

Reviewed-by: naoto, mchung, ihse
---
 make/test/JtregNativeJdk.gmk                  |   2 +
 .../classes/java/util/ResourceBundle.java     |  39 +++++--
 .../NullCallerResourceBundle.java             |  83 ++++++++++++++
 .../exeNullCallerResourceBundle.c             | 102 ++++++++++++++++++
 4 files changed, 215 insertions(+), 11 deletions(-)
 create mode 100644 test/jdk/java/util/ResourceBundle/exeNullCallerResourceBundle/NullCallerResourceBundle.java
 create mode 100644 test/jdk/java/util/ResourceBundle/exeNullCallerResourceBundle/exeNullCallerResourceBundle.c

diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index 6797952bc05..89cc94f90bf 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -64,6 +64,7 @@ ifeq ($(call isTargetOs, windows), true)
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := jvm.lib
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerClassLoaderTest := jvm.lib
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerLookupTest := jvm.lib
+  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerResourceBundle := jvm.lib
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exerevokeall := advapi32.lib
   BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libAsyncStackWalk := /EHsc
   BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libAsyncInvokers := /EHsc
@@ -84,6 +85,7 @@ else
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := -ljvm
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerClassLoaderTest := -ljvm
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerLookupTest := -ljvm
+  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerResourceBundle := -ljvm
 endif
 
 ifeq ($(call isTargetOs, macosx), true)
diff --git a/src/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java
index 052de0555c7..2e6ecf46582 100644
--- a/src/java.base/share/classes/java/util/ResourceBundle.java
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -256,6 +256,12 @@ import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION;
  * resource bundle provider</a>, it does not fall back to the
  * class loader search.
  *
+ * <p>
+ * In cases where the {@code getBundle} factory method is called from a context
+ * where there is no caller frame on the stack (e.g. when called directly from
+ * a JNI attached thread), the caller module is default to the unnamed module for the
+ * {@linkplain ClassLoader#getSystemClassLoader system class loader}.
+ *
  * <h3>Resource bundles in automatic modules</h3>
  *
  * A common format of resource bundles is in {@linkplain PropertyResourceBundle
@@ -1505,7 +1511,8 @@ public abstract class ResourceBundle {
     }
 
     private static Control getDefaultControl(Class<?> caller, String baseName) {
-        return getDefaultControl(caller.getModule(), baseName);
+        Module callerModule = getCallerModule(caller);
+        return getDefaultControl(callerModule, baseName);
     }
 
     private static Control getDefaultControl(Module targetModule, String baseName) {
@@ -1536,7 +1543,8 @@ public abstract class ResourceBundle {
     }
 
     private static void checkNamedModule(Class<?> caller) {
-        if (caller.getModule().isNamed()) {
+        Module callerModule = getCallerModule(caller);
+        if (callerModule.isNamed()) {
             throw new UnsupportedOperationException(
                     "ResourceBundle.Control not supported in named modules");
         }
@@ -1546,7 +1554,19 @@ public abstract class ResourceBundle {
                                                 Locale locale,
                                                 Class<?> caller,
                                                 Control control) {
-        return getBundleImpl(baseName, locale, caller, caller.getClassLoader(), control);
+        ClassLoader loader = getLoader(getCallerModule(caller));
+        return getBundleImpl(baseName, locale, caller, loader, control);
+    }
+
+    /*
+     * Determine the module to be used for the caller.  If
+     * Reflection::getCallerClass is called from JNI with an empty
+     * stack frame the caller will be null, so the system class loader unnamed
+     * module will be used.
+     */
+    private static Module getCallerModule(Class<?> caller) {
+        return  (caller != null) ? caller.getModule()
+                : ClassLoader.getSystemClassLoader().getUnnamedModule();
     }
 
     /**
@@ -1565,10 +1585,7 @@ public abstract class ResourceBundle {
                                                 Class<?> caller,
                                                 ClassLoader loader,
                                                 Control control) {
-        if (caller == null) {
-            throw new InternalError("null caller");
-        }
-        Module callerModule = caller.getModule();
+        Module callerModule = getCallerModule(caller);
 
         // get resource bundles for a named module only if loader is the module's class loader
         if (callerModule.isNamed() && loader == getLoader(callerModule)) {
@@ -1592,7 +1609,7 @@ public abstract class ResourceBundle {
                                                       Locale locale,
                                                       Control control) {
         Objects.requireNonNull(module);
-        Module callerModule = caller.getModule();
+        Module callerModule = getCallerModule(caller);
         if (callerModule != module) {
             @SuppressWarnings("removal")
             SecurityManager sm = System.getSecurityManager();
@@ -2228,9 +2245,9 @@ public abstract class ResourceBundle {
      */
     @CallerSensitive
     public static final void clearCache() {
-        Class<?> caller = Reflection.getCallerClass();
+        Module callerModule = getCallerModule(Reflection.getCallerClass());
         cacheList.keySet().removeIf(
-            key -> key.getCallerModule() == caller.getModule()
+            key -> key.getCallerModule() == callerModule
         );
     }
 
diff --git a/test/jdk/java/util/ResourceBundle/exeNullCallerResourceBundle/NullCallerResourceBundle.java b/test/jdk/java/util/ResourceBundle/exeNullCallerResourceBundle/NullCallerResourceBundle.java
new file mode 100644
index 00000000000..edbcf3ba316
--- /dev/null
+++ b/test/jdk/java/util/ResourceBundle/exeNullCallerResourceBundle/NullCallerResourceBundle.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8280902
+ * @summary Test uses custom launcher that starts VM using JNI that verifies
+ *          ResourceBundle::getBundle with null caller class functions properly
+ *          using the system class loader unnamed module.  The custom launcher
+ *          creates a properties file and passes the VM option to the JNI
+ *          functionality for the resource lookup.
+ * @library /test/lib
+ * @requires os.family != "aix"
+ * @run main/native NullCallerResourceBundle
+ */
+
+// Test disabled on AIX since we cannot invoke the JVM on the primordial thread.
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Properties;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class NullCallerResourceBundle {
+    public static void main(String[] args) throws IOException {
+
+        // build a properties file for the native test
+        var propPath = Path.of(System.getProperty("test.classes"), "NullCallerResource.properties");
+        try (var stream = Files.newOutputStream(propPath)) {
+            var props = new Properties();
+            props.put("message", "Hello!");
+            props.save(stream, "Test property list");
+        }
+
+        var launcher = Path.of(System.getProperty("test.nativepath"), "NullCallerResourceBundle");
+        var classpathAppend = "-Djava.class.path=" + System.getProperty("test.classes");
+        var pb = new ProcessBuilder(launcher.toString(), classpathAppend);
+        var env = pb.environment();
+
+        var libDir = Platform.libDir().toString();
+        var vmDir = Platform.jvmLibDir().toString();
+
+        // set up shared library path
+        var sharedLibraryPathEnvName = Platform.sharedLibraryPathVariableName();
+        env.compute(sharedLibraryPathEnvName,
+                (k, v) -> (v == null) ? libDir : v + File.pathSeparator + libDir);
+        env.compute(sharedLibraryPathEnvName,
+                (k, v) -> (v == null) ? vmDir : v + File.pathSeparator + vmDir);
+
+        System.out.println("Launching: " + launcher + " shared library path: " +
+                env.get(sharedLibraryPathEnvName));
+        new OutputAnalyzer(pb.start())
+                .outputTo(System.out)
+                .errorTo(System.err)
+                .shouldHaveExitValue(0);
+    }
+
+}
+
diff --git a/test/jdk/java/util/ResourceBundle/exeNullCallerResourceBundle/exeNullCallerResourceBundle.c b/test/jdk/java/util/ResourceBundle/exeNullCallerResourceBundle/exeNullCallerResourceBundle.c
new file mode 100644
index 00000000000..309873df795
--- /dev/null
+++ b/test/jdk/java/util/ResourceBundle/exeNullCallerResourceBundle/exeNullCallerResourceBundle.c
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "jni.h"
+#undef NDEBUG
+#include "assert.h"
+#include "string.h"
+
+
+/*
+ * The java test running this native test passes in an argument to provide as
+ * an option for the configuration of the JVM.  The system classpath has the
+ * classpath of the java test appended so it can pick up the resource that
+ * was created by the java part of the test.
+ */
+int main(int argc, char** args) {
+    JavaVM *jvm;
+    JNIEnv *env;
+    JavaVMInitArgs vm_args;
+    JavaVMOption options[1];
+    jint rc;
+
+    assert(argc == 2);
+    options[0].optionString = args[1];
+
+    vm_args.version = JNI_VERSION_1_2;
+    vm_args.nOptions = 1;
+    vm_args.options = options;
+
+    if ((rc = JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args)) != JNI_OK) {
+        printf("ERROR: cannot create VM.\n");
+        exit(-1);
+    }
+
+    // b = ResourceBundle.getBundle("NullCallerResource");
+    jclass class_ResourceBundle = (*env)->FindClass(env, "java/util/ResourceBundle");
+    assert(class_ResourceBundle != NULL);
+    jmethodID mid_ResourceBundle_getBundle = (*env)->GetStaticMethodID(env, class_ResourceBundle, "getBundle", "(Ljava/lang/String;)Ljava/util/ResourceBundle;" );
+    assert(mid_ResourceBundle_getBundle != NULL);
+    jobject resourceName = (*env)->NewStringUTF(env, "NullCallerResource");
+    assert(resourceName != NULL);
+    jobject b = (*env)->CallStaticObjectMethod(env, class_ResourceBundle, mid_ResourceBundle_getBundle, resourceName);
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        printf("ERROR: Exception was thrown calling ResourceBundle::getBundle.\n");
+        (*env)->ExceptionDescribe(env);
+        exit(-1);
+    }
+
+    // msg = b.getString("message");
+    jmethodID mid_ResourceBundle_getString = (*env)->GetMethodID(env, class_ResourceBundle, "getString", "(Ljava/lang/String;)Ljava/lang/String;" );
+    assert(mid_ResourceBundle_getString != NULL);
+    jobject key = (*env)->NewStringUTF(env, "message");
+    jobject msg =(*env)->CallObjectMethod(env, b, mid_ResourceBundle_getString, key);
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        printf("ERROR: Exception was thrown calling ResourceBundle::getString.\n");
+        (*env)->ExceptionDescribe(env);
+        exit(-1);
+    }
+    assert(msg != NULL);
+
+    // check the message
+    const char* cstr = (*env)->GetStringUTFChars(env, msg, NULL);
+    assert(cstr != NULL);
+    assert(strcmp(cstr,"Hello!") == 0);
+
+    // ResourceBundle.clearCache()
+    jmethodID mid_ResourceBundle_clearCache = (*env)->GetStaticMethodID(env, class_ResourceBundle, "clearCache", "()V" );
+    assert(mid_ResourceBundle_clearCache != NULL);
+    (*env)->CallStaticVoidMethod(env, class_ResourceBundle, mid_ResourceBundle_clearCache);
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        printf("ERROR: Exception was thrown calling ResourceBundle::clearCache.\n");
+        (*env)->ExceptionDescribe(env);
+        exit(-1);
+    }
+
+    (*jvm)->DestroyJavaVM(jvm);
+    return 0;
+}
+
-- 
GitLab


From d07f7c76c5df1473bffa41f10a89ca1e21e001ef Mon Sep 17 00:00:00 2001
From: Emanuel Peter <emanuel.peter@oracle.com>
Date: Wed, 9 Mar 2022 08:59:37 +0000
Subject: [PATCH 041/345] 8282665: [REDO] ByteBufferTest.java: replace endless
 recursion with RuntimeException in void ck(double x, double y)

Reviewed-by: psandoz, thartmann
---
 .../intrinsics/unsafe/ByteBufferTest.java         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/intrinsics/unsafe/ByteBufferTest.java b/test/hotspot/jtreg/compiler/intrinsics/unsafe/ByteBufferTest.java
index 6294e90a8a9..194ce17af7a 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/unsafe/ByteBufferTest.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/unsafe/ByteBufferTest.java
@@ -211,13 +211,22 @@ class MyByteBuffer {
 
     void ck(long x, long y) {
         if (x != y) {
-            throw new RuntimeException(" x = " + Long.toHexString(x) + ", y = " + Long.toHexString(y));
+            throw new RuntimeException("expect x == y: x = " + Long.toHexString(x) + ", y = " + Long.toHexString(y));
         }
     }
 
     void ck(double x, double y) {
-        if (x == x && y == y && x != y) {
-            ck(x, y);
+        // Check if x and y have identical values.
+        // Remember: NaN == x is false for ANY x, including if x is NaN (IEEE standard).
+        // Therefore, if x and y are NaN, x != y would return true, which is not what we want.
+        // We do not want an Exception if both are NaN.
+        // Double.compare takes care of these special cases
+        // including NaNs, and comparing -0.0 to 0.0
+        if (Double.compare(x,y) != 0) {
+            throw new RuntimeException("expect x == y:"
+                                    + "  x = " + Double.toString(x) + ", y = " + Double.toString(y)
+                                    + " (x = " + Long.toHexString(Double.doubleToRawLongBits(x))
+                                    + ", y = " + Long.toHexString(Double.doubleToRawLongBits(y)) + ")");
         }
     }
 
-- 
GitLab


From 5df2a057707eb65148f96710bd57d8dd8d85d1ed Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Wed, 9 Mar 2022 13:27:11 +0000
Subject: [PATCH 042/345] 8282628: Potential memory leak in
 sun.font.FontConfigManager.getFontConfig()

Reviewed-by: stuefe, dholmes, aivanov
---
 src/java.desktop/unix/native/common/awt/fontpath.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c
index c4b2fcb73c0..051c9de88fa 100644
--- a/src/java.desktop/unix/native/common/awt/fontpath.c
+++ b/src/java.desktop/unix/native/common/awt/fontpath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -935,8 +935,10 @@ Java_sun_font_FontConfigManager_getFontConfig
         if (cacheDirs != NULL) {
             while ((cnt < max) && (cacheDir = (*FcStrListNext)(cacheDirs))) {
                 jstr = (*env)->NewStringUTF(env, (const char*)cacheDir);
-                JNU_CHECK_EXCEPTION(env);
-
+                if (IS_NULL(jstr)) {
+                    (*FcStrListDone)(cacheDirs);
+                    return;
+                }
                 (*env)->SetObjectArrayElement(env, cacheDirArray, cnt++, jstr);
                 (*env)->DeleteLocalRef(env, jstr);
             }
-- 
GitLab


From 6d8d156c97b90a9ab4776c6b42563a962d959741 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Wed, 9 Mar 2022 16:11:07 +0000
Subject: [PATCH 043/345] 8280494: (D)TLS signature schemes

Reviewed-by: mullan
---
 .../classes/javax/net/ssl/SSLParameters.java  | 148 ++++++++++++++++--
 .../sun/security/ssl/SSLConfiguration.java    |  70 +++++----
 .../sun/security/ssl/SignatureScheme.java     |  54 +++++--
 .../classes/sun/security/ssl/Utilities.java   |  12 +-
 .../net/ssl/DTLS/DTLSSignatureSchemes.java    | 137 ++++++++++++++++
 .../ssl/SSLParameters/SignatureSchemes.java   | 147 +++++++++++++++++
 6 files changed, 509 insertions(+), 59 deletions(-)
 create mode 100644 test/jdk/javax/net/ssl/DTLS/DTLSSignatureSchemes.java
 create mode 100644 test/jdk/javax/net/ssl/SSLParameters/SignatureSchemes.java

diff --git a/src/java.base/share/classes/javax/net/ssl/SSLParameters.java b/src/java.base/share/classes/javax/net/ssl/SSLParameters.java
index 5926c48aed0..b4fbdf9a437 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLParameters.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLParameters.java
@@ -33,18 +33,20 @@ import java.util.*;
  * are the list of ciphersuites to be accepted in an SSL/TLS/DTLS handshake,
  * the list of protocols to be allowed, the endpoint identification
  * algorithm during SSL/TLS/DTLS handshaking, the Server Name Indication (SNI),
- * the maximum network packet size, the algorithm constraints and whether
- * SSL/TLS/DTLS servers should request or require client authentication, etc.
+ * the maximum network packet size, the algorithm constraints, the signature
+ * schemes and whether SSL/TLS/DTLS servers should request or require client
+ * authentication, etc.
  * <p>
- * SSLParameters can be created via the constructors in this class.
- * Objects can also be obtained using the {@code getSSLParameters()}
- * methods in
+ * {@code SSLParameter} objects can be created via the constructors in this
+ * class, and can be described as pre-populated objects. {@code SSLParameter}
+ * objects can also be obtained using the {@code getSSLParameters()} methods in
  * {@link SSLSocket#getSSLParameters SSLSocket} and
  * {@link SSLServerSocket#getSSLParameters SSLServerSocket} and
  * {@link SSLEngine#getSSLParameters SSLEngine} or the
  * {@link SSLContext#getDefaultSSLParameters getDefaultSSLParameters()} and
  * {@link SSLContext#getSupportedSSLParameters getSupportedSSLParameters()}
- * methods in {@code SSLContext}.
+ * methods in {@code SSLContext}, and can be described as connection populated
+ * objects.
  * <p>
  * SSLParameters can be applied to a connection via the methods
  * {@link SSLSocket#setSSLParameters SSLSocket.setSSLParameters()} and
@@ -82,16 +84,17 @@ public class SSLParameters {
     private boolean enableRetransmissions = true;
     private int maximumPacketSize = 0;
     private String[] applicationProtocols = new String[0];
+    private String[] signatureSchemes = null;
 
     /**
      * Constructs SSLParameters.
      * <p>
      * The values of cipherSuites, protocols, cryptographic algorithm
-     * constraints, endpoint identification algorithm, server names and
-     * server name matchers are set to {@code null}; useCipherSuitesOrder,
-     * wantClientAuth and needClientAuth are set to {@code false};
-     * enableRetransmissions is set to {@code true}; maximum network packet
-     * size is set to {@code 0}.
+     * constraints, endpoint identification algorithm, signature schemes,
+     * server names and server name matchers are set to {@code null};
+     * useCipherSuitesOrder, wantClientAuth and needClientAuth are set
+     * to {@code false}; enableRetransmissions is set to {@code true};
+     * maximum network packet size is set to {@code 0}.
      */
     public SSLParameters() {
         // empty
@@ -367,7 +370,7 @@ public class SSLParameters {
      * <P>
      * It is recommended that providers initialize default Server Name
      * Indications when creating {@code SSLSocket}/{@code SSLEngine}s.
-     * In the following examples, the server name could be represented by an
+     * In the following examples, the server name may be represented by an
      * instance of {@link SNIHostName} which has been initialized with the
      * hostname "www.example.com" and type
      * {@link StandardConstants#SNI_HOST_NAME}.
@@ -686,4 +689,125 @@ public class SSLParameters {
         }
         applicationProtocols = tempProtocols;
     }
+
+    /**
+     * Returns a prioritized array of signature scheme names that can be used
+     * over the SSL/TLS/DTLS protocols.
+     * <p>
+     * Note that the standard list of signature scheme names are defined in
+     * the <a href=
+     * "{@docRoot}/../specs/security/standard-names.html#signature-schemes">
+     * Signature Schemes</a> section of the Java Security Standard Algorithm
+     * Names Specification.  Providers may support signature schemes not defined
+     * in this list or may not use the recommended name for a certain
+     * signature scheme.
+     * <p>
+     * The set of signature schemes that will be used over the SSL/TLS/DTLS
+     * connections is determined by the returned array of this method and the
+     * underlying provider-specific default signature schemes.
+     * <p>
+     * If the returned array is {@code null}, then the underlying
+     * provider-specific default signature schemes will be used over the
+     * SSL/TLS/DTLS connections.
+     * <p>
+     * If the returned array is empty (zero-length), then the signature scheme
+     * negotiation mechanism is turned off for SSL/TLS/DTLS protocols, and
+     * the connections may not be able to be established if the negotiation
+     * mechanism is required by a certain SSL/TLS/DTLS protocol.  This
+     * parameter will override the underlying provider-specific default
+     * signature schemes.
+     * <p>
+     * If the returned array is not {@code null} or empty (zero-length),
+     * then the signature schemes in the returned array will be used over
+     * the SSL/TLS/DTLS connections.  This parameter will override the
+     * underlying provider-specific default signature schemes.
+     * <p>
+     * This method returns the most recent value passed to
+     * {@link #setSignatureSchemes} if that method has been called and
+     * otherwise returns the default signature schemes for connection
+     * populated objects, or {@code null} for pre-populated objects.
+     *
+     * @apiNote
+     * Note that a provider may not have been updated to support this method
+     * and in that case may return {@code null} instead of the default
+     * signature schemes for connection populated objects.
+     *
+     * @implNote
+     * The SunJSSE provider supports this method.
+     *
+     * @implNote
+     * Note that applications may use the
+     * {@systemProperty jdk.tls.client.SignatureSchemes} and/or
+     * {@systemProperty jdk.tls.server.SignatureSchemes} system properties
+     * with the SunJSSE provider to override the provider-specific default
+     * signature schemes.
+     *
+     * @return an array of signature scheme {@code Strings} or {@code null} if
+     *         none have been set.  For non-null returns, this method will
+     *         return a new array each time it is invoked.  The array is
+     *         ordered based on signature scheme preference, with the first
+     *         entry being the most preferred.  Providers should ignore unknown
+     *         signature scheme names while establishing the SSL/TLS/DTLS
+     *         connections.
+     * @see #setSignatureSchemes
+     *
+     * @since 19
+     */
+    public String[] getSignatureSchemes() {
+        return clone(signatureSchemes);
+    }
+
+    /**
+     * Sets the prioritized array of signature scheme names that
+     * can be used over the SSL/TLS/DTLS protocols.
+     * <p>
+     * Note that the standard list of signature scheme names are defined in
+     * the <a href=
+     * "{@docRoot}/../specs/security/standard-names.html#signature-schemes">
+     * Signature Schemes</a> section of the Java Security Standard Algorithm
+     * Names Specification.  Providers may support signature schemes not
+     * defined in this list or may not use the recommended name for a certain
+     * signature scheme.
+     * <p>
+     * The set of signature schemes that will be used over the SSL/TLS/DTLS
+     * connections is determined by the input parameter {@code signatureSchemes}
+     * array and the underlying provider-specific default signature schemes.
+     * See {@link #getSignatureSchemes} for specific details on how the
+     * parameters are used in SSL/TLS/DTLS connections.
+     *
+     * @apiNote
+     * Note that a provider may not have been updated to support this method
+     * and in that case may ignore the schemes that are set.
+     *
+     * @implNote
+     * The SunJSSE provider supports this method.
+     *
+     * @param signatureSchemes an ordered array of signature scheme names with
+     *        the first entry being the most preferred, or {@code null}.  This
+     *        method will make a copy of this array.  Providers should ignore
+     *        unknown signature scheme names while establishing the
+     *        SSL/TLS/DTLS connections.
+     * @throws IllegalArgumentException if any element in the
+     *        {@code signatureSchemes} array is {@code null} or
+     *        {@linkplain String#isBlank() blank}.
+     *
+     * @see #getSignatureSchemes
+     *
+     * @since 19
+     */
+    public void setSignatureSchemes(String[] signatureSchemes) {
+        String[] tempSchemes = null;
+
+        if (signatureSchemes != null) {
+            tempSchemes = signatureSchemes.clone();
+            for (String scheme : tempSchemes) {
+                if (scheme == null || scheme.isBlank()) {
+                    throw new IllegalArgumentException(
+                        "An element of signatureSchemes is null or blank");
+                }
+            }
+        }
+
+        this.signatureSchemes = tempSchemes;
+    }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
index d267c2e6b46..056f00a5a3c 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,7 @@ import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.AlgorithmConstraints;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.function.BiFunction;
 import javax.crypto.KeyGenerator;
 import javax.net.ssl.HandshakeCompletedListener;
@@ -66,7 +62,7 @@ final class SSLConfiguration implements Cloneable {
 
     // The configured signature schemes for "signature_algorithms" and
     // "signature_algorithms_cert" extensions
-    List<SignatureScheme>       signatureSchemes;
+    String[]                   signatureSchemes;
 
     // the maximum protocol version of enabled protocols
     ProtocolVersion             maximumProtocolVersion;
@@ -204,6 +200,7 @@ final class SSLConfiguration implements Cloneable {
         params.setUseCipherSuitesOrder(this.preferLocalCipherSuites);
         params.setEnableRetransmissions(this.enableRetransmissions);
         params.setMaximumPacketSize(this.maximumPacketSize);
+        params.setSignatureSchemes(this.signatureSchemes);
 
         return params;
     }
@@ -261,6 +258,13 @@ final class SSLConfiguration implements Cloneable {
             this.applicationProtocols = sa;
         }   // otherwise, use the default values
 
+        String[] ss = params.getSignatureSchemes();
+        if (ss != null) {
+            // Note if 'ss' is empty, then no signature schemes should be
+            // specified over the connections.
+            this.signatureSchemes = ss;
+        }   // Otherwise, use the default values
+
         this.preferLocalCipherSuites = params.getUseCipherSuitesOrder();
         this.enableRetransmissions = params.getEnableRetransmissions();
         this.maximumPacketSize = params.getMaximumPacketSize();
@@ -403,10 +407,15 @@ final class SSLConfiguration implements Cloneable {
     void toggleClientMode() {
         this.isClientMode ^= true;
 
-        // reset the signature schemes
-        this.signatureSchemes = isClientMode ?
-                CustomizedClientSignatureSchemes.signatureSchemes :
-                CustomizedServerSignatureSchemes.signatureSchemes;
+        // Reset the signature schemes, if it was configured with SSLParameters.
+        if (Arrays.equals(signatureSchemes,
+                CustomizedClientSignatureSchemes.signatureSchemes) ||
+            Arrays.equals(signatureSchemes,
+                    CustomizedServerSignatureSchemes.signatureSchemes)) {
+            this.signatureSchemes = isClientMode ?
+                    CustomizedClientSignatureSchemes.signatureSchemes :
+                    CustomizedServerSignatureSchemes.signatureSchemes;
+        }
     }
 
     @Override
@@ -434,7 +443,7 @@ final class SSLConfiguration implements Cloneable {
     //
     // See Effective Java Second Edition: Item 71.
     private static final class CustomizedClientSignatureSchemes {
-        private static final List<SignatureScheme> signatureSchemes =
+        private static final String[] signatureSchemes =
                 getCustomizedSignatureScheme("jdk.tls.client.SignatureSchemes");
     }
 
@@ -442,7 +451,7 @@ final class SSLConfiguration implements Cloneable {
     //
     // See Effective Java Second Edition: Item 71.
     private static final class CustomizedServerSignatureSchemes {
-        private static final List<SignatureScheme> signatureSchemes =
+        private static final String[] signatureSchemes =
                 getCustomizedSignatureScheme("jdk.tls.server.SignatureSchemes");
     }
 
@@ -450,14 +459,12 @@ final class SSLConfiguration implements Cloneable {
      * Get the customized signature schemes specified by the given
      * system property.
      */
-    private static List<SignatureScheme> getCustomizedSignatureScheme(
-            String propertyName) {
-
+    private static String[] getCustomizedSignatureScheme(String propertyName) {
         String property = GetPropertyAction.privilegedGetProperty(propertyName);
         if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
             SSLLogger.fine(
                     "System property " + propertyName + " is set to '" +
-                    property + "'");
+                            property + "'");
         }
         if (property != null && !property.isEmpty()) {
             // remove double quote marks from beginning/end of the property
@@ -469,31 +476,34 @@ final class SSLConfiguration implements Cloneable {
 
         if (property != null && !property.isEmpty()) {
             String[] signatureSchemeNames = property.split(",");
-            List<SignatureScheme> signatureSchemes =
-                        new ArrayList<>(signatureSchemeNames.length);
-            for (int i = 0; i < signatureSchemeNames.length; i++) {
-                signatureSchemeNames[i] = signatureSchemeNames[i].trim();
-                if (signatureSchemeNames[i].isEmpty()) {
+            List<String> signatureSchemes =
+                    new ArrayList<>(signatureSchemeNames.length);
+            for (String schemeName : signatureSchemeNames) {
+                schemeName = schemeName.trim();
+                if (schemeName.isEmpty()) {
                     continue;
                 }
 
-                SignatureScheme scheme =
-                    SignatureScheme.nameOf(signatureSchemeNames[i]);
+                // Check the availability
+                SignatureScheme scheme = SignatureScheme.nameOf(schemeName);
                 if (scheme != null && scheme.isAvailable) {
-                    signatureSchemes.add(scheme);
+                    signatureSchemes.add(schemeName);
                 } else {
                     if (SSLLogger.isOn && SSLLogger.isOn("ssl,sslctx")) {
                         SSLLogger.fine(
-                                "The current installed providers do not " +
-                                "support signature scheme: " +
-                                signatureSchemeNames[i]);
+                        "The current installed providers do not " +
+                              "support signature scheme: " + schemeName);
                     }
                 }
             }
 
-            return signatureSchemes;
+            if (!signatureSchemes.isEmpty()) {
+                return signatureSchemes.toArray(new String[0]);
+            }
         }
 
-        return Collections.emptyList();
+        // Note that if the System Property value is not defined (JDK
+        // default value) or empty, the provider-specific default is used.
+        return null;
     }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
index 706cb4371d3..87feda0e83b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -181,7 +181,7 @@ enum SignatureScheme {
             "anonymous",    "rsa",      "dsa",      "ecdsa",
         };
 
-    static enum SigAlgParamSpec {   // support RSASSA-PSS only now
+    enum SigAlgParamSpec {   // support RSASSA-PSS only now
         RSA_PSS_SHA256 ("SHA-256", 32),
         RSA_PSS_SHA384 ("SHA-384", 48),
         RSA_PSS_SHA512 ("SHA-512", 64);
@@ -224,13 +224,13 @@ enum SignatureScheme {
         Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
 
 
-    private SignatureScheme(int id, String name,
+    SignatureScheme(int id, String name,
             String algorithm, String keyAlgorithm,
             ProtocolVersion[] supportedProtocols) {
         this(id, name, algorithm, keyAlgorithm, -1, supportedProtocols);
     }
 
-    private SignatureScheme(int id, String name,
+    SignatureScheme(int id, String name,
             String algorithm, String keyAlgorithm,
             int minimalKeySize,
             ProtocolVersion[] supportedProtocols) {
@@ -238,7 +238,7 @@ enum SignatureScheme {
                 null, minimalKeySize, supportedProtocols);
     }
 
-    private SignatureScheme(int id, String name,
+    SignatureScheme(int id, String name,
             String algorithm, String keyAlgorithm,
             SigAlgParamSpec signAlgParamSpec, int minimalKeySize,
             ProtocolVersion[] supportedProtocols) {
@@ -247,7 +247,7 @@ enum SignatureScheme {
                 supportedProtocols, supportedProtocols);
     }
 
-    private SignatureScheme(int id, String name,
+    SignatureScheme(int id, String name,
             String algorithm, String keyAlgorithm,
             NamedGroup namedGroup,
             ProtocolVersion[] supportedProtocols) {
@@ -256,7 +256,7 @@ enum SignatureScheme {
                 supportedProtocols, supportedProtocols);
     }
 
-    private SignatureScheme(int id, String name,
+    SignatureScheme(int id, String name,
             String algorithm, String keyAlgorithm,
             SigAlgParamSpec signAlgParams,
             NamedGroup namedGroup, int minimalKeySize,
@@ -376,15 +376,10 @@ enum SignatureScheme {
             List<ProtocolVersion> activeProtocols) {
         List<SignatureScheme> supported = new LinkedList<>();
 
-        // If config.signatureSchemes is non-empty then it means that
-        // it was defined by a System property.  Per
-        // SSLConfiguration.getCustomizedSignatureScheme() the list will
-        // only contain schemes that are in the enum.
-        // Otherwise, use the enum constants (converted to a List).
         List<SignatureScheme> schemesToCheck =
-                config.signatureSchemes.isEmpty() ?
+                config.signatureSchemes == null ?
                     Arrays.asList(SignatureScheme.values()) :
-                    config.signatureSchemes;
+                    namesOfAvailable(config.signatureSchemes);
 
         for (SignatureScheme ss: schemesToCheck) {
             if (!ss.isAvailable) {
@@ -437,8 +432,8 @@ enum SignatureScheme {
                 }
             } else if (ss.isAvailable &&
                     ss.supportedProtocols.contains(protocolVersion) &&
-                    (config.signatureSchemes.isEmpty() ||
-                        config.signatureSchemes.contains(ss)) &&
+                    (config.signatureSchemes == null ||
+                        Utilities.contains(config.signatureSchemes, ss.name)) &&
                     ss.isPermitted(constraints)) {
                 supported.add(ss);
             } else {
@@ -563,6 +558,33 @@ enum SignatureScheme {
         return new String[0];
     }
 
+    private static List<SignatureScheme> namesOfAvailable(
+                String[] signatureSchemes) {
+
+        if (signatureSchemes == null || signatureSchemes.length == 0) {
+            return Collections.emptyList();
+        }
+
+        List<SignatureScheme> sss = new ArrayList<>(signatureSchemes.length);
+        for (String ss : signatureSchemes) {
+            SignatureScheme scheme = SignatureScheme.nameOf(ss);
+            if (scheme == null || !scheme.isAvailable) {
+                if (SSLLogger.isOn &&
+                        SSLLogger.isOn("ssl,handshake,verbose")) {
+                    SSLLogger.finest(
+                            "Ignore the signature algorithm (" + ss
+                          + "), unsupported or unavailable");
+                }
+
+                continue;
+            }
+
+            sss.add(scheme);
+        }
+
+        return sss;
+    }
+
     // This method is used to get the signature instance of this signature
     // scheme for the specific public key.  Unlike getSigner(), the exception
     // is bubbled up.  If the public key does not support this signature
diff --git a/src/java.base/share/classes/sun/security/ssl/Utilities.java b/src/java.base/share/classes/sun/security/ssl/Utilities.java
index 8317d9ae3cb..441f978c84f 100644
--- a/src/java.base/share/classes/sun/security/ssl/Utilities.java
+++ b/src/java.base/share/classes/sun/security/ssl/Utilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -229,6 +229,16 @@ final class Utilities {
         }
     }
 
+    static <T> boolean contains(T[] array, T item) {
+        for (T t : array) {
+            if (item.equals(t)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private static void swap(byte[] arr, int i, int j) {
         byte tmp = arr[i];
         arr[i] = arr[j];
diff --git a/test/jdk/javax/net/ssl/DTLS/DTLSSignatureSchemes.java b/test/jdk/javax/net/ssl/DTLS/DTLSSignatureSchemes.java
new file mode 100644
index 00000000000..5dd897b1bd7
--- /dev/null
+++ b/test/jdk/javax/net/ssl/DTLS/DTLSSignatureSchemes.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
+/*
+ * @test
+ * @bug 8280494
+ * @summary (D)TLS signature schemes
+ * @modules java.base/sun.security.util
+ * @library /test/lib
+ * @build DTLSOverDatagram
+ * @run main/othervm DTLSSignatureSchemes
+ */
+
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
+import java.security.Security;
+
+/**
+ * Test DTLS client authentication.
+ */
+public class DTLSSignatureSchemes extends DTLSOverDatagram {
+    private final String[] serverSignatureSchemes;
+    private final String[] clientSignatureSchemes;
+
+    public DTLSSignatureSchemes(String[] serverSignatureSchemes,
+                            String[] clientSignatureSchemes) {
+        this.serverSignatureSchemes = serverSignatureSchemes;
+        this.clientSignatureSchemes = clientSignatureSchemes;
+    }
+
+    @Override
+    SSLEngine createSSLEngine(boolean isClient) throws Exception {
+        SSLEngine engine = super.createSSLEngine(isClient);
+
+        SSLParameters sslParameters = engine.getSSLParameters();
+        if (isClient) {
+            sslParameters.setSignatureSchemes(clientSignatureSchemes);
+        } else {
+            sslParameters.setSignatureSchemes(serverSignatureSchemes);
+        }
+        engine.setSSLParameters(sslParameters);
+
+        return engine;
+    }
+
+    public static void main(String[] args) throws Exception {
+        Security.setProperty("jdk.tls.disabledAlgorithms", "");
+
+        runTest(new String[] {
+                        "ecdsa_secp256r1_sha256",
+                        "ed25519"
+                },
+                new String[] {
+                        "ecdsa_secp256r1_sha256",
+                        "ed25519"
+                },
+                false);
+        runTest(new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                false);
+        runTest(null,
+                new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                false);
+        runTest(new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                null,
+                false);
+        runTest(new String[0],
+                new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                true);
+        runTest(new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                new String[0],
+                true);
+        runTest(new String[] {
+                        "ecdsa_secp256r1_shaNA"
+                },
+                new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                true);
+    }
+
+    private static void runTest(String[] serverSignatureSchemes,
+                                String[] clientSignatureSchemes,
+                                boolean exceptionExpected) throws Exception {
+        DTLSSignatureSchemes testCase = new DTLSSignatureSchemes(
+                serverSignatureSchemes, clientSignatureSchemes);
+        try {
+            testCase.runTest(testCase);
+        } catch (Exception e) {
+            if (!exceptionExpected) {
+                throw e;
+            } else { // Otherwise, swallow the expected exception and return.
+                return;
+            }
+        }
+
+        if (exceptionExpected) {
+            throw new RuntimeException("Unexpected success!");
+        }
+    }
+}
+
diff --git a/test/jdk/javax/net/ssl/SSLParameters/SignatureSchemes.java b/test/jdk/javax/net/ssl/SSLParameters/SignatureSchemes.java
new file mode 100644
index 00000000000..7dadeff5703
--- /dev/null
+++ b/test/jdk/javax/net/ssl/SSLParameters/SignatureSchemes.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
+/*
+ * @test
+ * @bug 8280494
+ * @summary (D)TLS signature schemes
+ * @library /javax/net/ssl/templates
+ * @run main/othervm SignatureSchemes
+ */
+
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLSocket;
+import java.security.Security;
+
+public class SignatureSchemes extends SSLSocketTemplate {
+    private final String[] serverSignatureSchemes;
+    private final String[] clientSignatureSchemes;
+    private final boolean exceptionExpected;
+
+    public SignatureSchemes(String[] serverSignatureSchemes,
+                            String[] clientSignatureSchemes,
+                            boolean exceptionExpected) {
+        this.serverSignatureSchemes = serverSignatureSchemes;
+        this.clientSignatureSchemes = clientSignatureSchemes;
+        this.exceptionExpected = exceptionExpected;
+    }
+
+    @Override
+    protected void configureServerSocket(SSLServerSocket sslServerSocket) {
+        SSLParameters sslParameters = sslServerSocket.getSSLParameters();
+        sslParameters.setSignatureSchemes(serverSignatureSchemes);
+        sslServerSocket.setSSLParameters(sslParameters);
+    }
+
+    @Override
+    protected void configureClientSocket(SSLSocket socket) {
+        SSLParameters sslParameters = socket.getSSLParameters();
+        sslParameters.setSignatureSchemes(clientSignatureSchemes);
+        socket.setSSLParameters(sslParameters);
+    }
+
+    @Override
+    protected void runServerApplication(SSLSocket socket) throws Exception {
+        try {
+            super.runServerApplication(socket);
+        } catch (Exception ex) {
+            // Just ignore, let the client handle the failure information.
+        }
+    }
+
+    @Override
+    protected void runClientApplication(SSLSocket sslSocket) throws Exception {
+        try {
+            super.runClientApplication(sslSocket);
+        } catch (Exception ex) {
+            if (!exceptionExpected) {
+                throw ex;
+            } else {  // Otherwise, swallow the exception and return.
+                return;
+            }
+        }
+
+        if (exceptionExpected) {
+            throw new RuntimeException("Unexpected success!");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        Security.setProperty("jdk.tls.disabledAlgorithms", "");
+
+        runTest(new String[] {
+                        "ecdsa_secp256r1_sha256",
+                        "ed25519"
+                },
+                new String[] {
+                        "ecdsa_secp256r1_sha256",
+                        "ed25519"
+                },
+                false);
+        runTest(new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                false);
+        runTest(null,
+                new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                false);
+        runTest(new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                null,
+                false);
+        runTest(new String[0],
+                new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                true);
+        runTest(new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                new String[0],
+                true);
+        runTest(new String[] {
+                        "ecdsa_secp256r1_shaNA"
+                },
+                new String[] {
+                        "ecdsa_secp256r1_sha256"
+                },
+                true);
+    }
+
+    private static void runTest(String[] serverSignatureSchemes,
+                                String[] clientSignatureSchemes,
+                                boolean exceptionExpected) throws Exception {
+        new SignatureSchemes(serverSignatureSchemes,
+                clientSignatureSchemes, exceptionExpected).run();
+    }
+}
-- 
GitLab


From 70318e1d17072198be5674ebe7118fb5f9373144 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Wed, 9 Mar 2022 16:47:03 +0000
Subject: [PATCH 044/345] 8282884: Provide OID aliases for MD2, MD5, and OAEP

Reviewed-by: xuelei
---
 .../share/classes/com/sun/crypto/provider/SunJCE.java     | 6 +++---
 .../share/classes/sun/security/provider/SunEntries.java   | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
index a020e1c15d8..38836d2701e 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -525,8 +525,8 @@ public final class SunJCE extends Provider {
         ps("AlgorithmParameters", "RC2",
                 "com.sun.crypto.provider.RC2Parameters");
 
-        ps("AlgorithmParameters", "OAEP",
-                "com.sun.crypto.provider.OAEPParameters");
+        psA("AlgorithmParameters", "OAEP",
+                "com.sun.crypto.provider.OAEPParameters", null);
 
         psA("AlgorithmParameters", "ChaCha20-Poly1305",
                 "com.sun.crypto.provider.ChaCha20Poly1305Parameters", null);
diff --git a/src/java.base/share/classes/sun/security/provider/SunEntries.java b/src/java.base/share/classes/sun/security/provider/SunEntries.java
index 912cad59714..c7fdd230830 100644
--- a/src/java.base/share/classes/sun/security/provider/SunEntries.java
+++ b/src/java.base/share/classes/sun/security/provider/SunEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -210,8 +210,10 @@ public final class SunEntries {
         /*
          * Digest engines
          */
-        add(p, "MessageDigest", "MD2", "sun.security.provider.MD2", attrs);
-        add(p, "MessageDigest", "MD5", "sun.security.provider.MD5", attrs);
+        addWithAlias(p, "MessageDigest", "MD2", "sun.security.provider.MD2",
+                attrs);
+        addWithAlias(p, "MessageDigest", "MD5", "sun.security.provider.MD5",
+                attrs);
         addWithAlias(p, "MessageDigest", "SHA-1", "sun.security.provider.SHA",
                 attrs);
 
-- 
GitLab


From ff76620487c307514c435443bbaebc9a6c473f5d Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 9 Mar 2022 19:42:47 +0000
Subject: [PATCH 045/345] 8282641: Make jdb "threadgroup" command with no args
 reset the current threadgroup back to the default

Reviewed-by: kevinw, amenkov
---
 .../sun/tools/example/debug/tty/Commands.java |  4 ++--
 .../tools/example/debug/tty/TTYResources.java |  8 +++----
 .../example/debug/tty/TTYResources_ja.java    |  3 +--
 .../example/debug/tty/TTYResources_zh_CN.java |  3 +--
 .../threadgroup002/threadgroup002.java        | 22 +++++++++++++++----
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
index 15091d310d5..121038a6d72 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/Commands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -501,7 +501,7 @@ class Commands {
 
     void commandThreadGroup(StringTokenizer t) {
         if (!t.hasMoreTokens()) {
-            MessageOutput.println("Threadgroup name not specified.");
+            ThreadInfo.setThreadGroup(null); // reset to default (top level ThreadGroup)
             return;
         }
         String name = t.nextToken();
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
index 8ba3c42c83a..adec7aa98cf 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -312,7 +312,6 @@ public class TTYResources extends java.util.ListResourceBundle {
         {"Thread has been resumed", "Thread has been resumed"},
         {"Thread not suspended", "Thread not suspended"},
         {"thread group number description name", "{0,number,integer}. {1} {2}"},
-        {"Threadgroup name not specified.", "Threadgroup name not specified."},
         {"<thread_id> option not valid until the VM is started with the run command",
          "<thread_id> option not valid until the VM is started with the run command"},
         {"Threads must be suspended", "Threads must be suspended"},
@@ -354,7 +353,7 @@ public class TTYResources extends java.util.ListResourceBundle {
              "\n" +
              "run [class [args]]        -- start execution of application's main class\n" +
              "\n" +
-             "threads [threadgroup]     -- list threads\n" +
+             "threads [threadgroup]     -- list threads in threadgroup. Use current threadgroup if none specified.\n" +
              "thread <thread id>        -- set default thread\n" +
              "suspend [thread id(s)]    -- suspend threads (default: all)\n" +
              "resume [thread id(s)]     -- resume threads (default: all)\n" +
@@ -377,7 +376,8 @@ public class TTYResources extends java.util.ListResourceBundle {
              "fields <class id>         -- list a class's fields\n" +
              "\n" +
              "threadgroups              -- list threadgroups\n" +
-             "threadgroup <name>        -- set current threadgroup\n" +
+             "threadgroup <name>        -- set current threadgroup to <name>\n" +
+             "threadgroup               -- set current threadgroup back to the top level threadgroup\n" +
              "\n" +
              "stop [go|thread] [<thread_id>] <at|in> <location>\n" +
              "                          -- set a breakpoint\n" +
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
index 1f0dd4a3e22..330fc33a820 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -302,7 +302,6 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
         {"Thread has been resumed", "\u30B9\u30EC\u30C3\u30C9\u304C\u518D\u958B\u3057\u307E\u3057\u305F"},
         {"Thread not suspended", "\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u3066\u3044\u307E\u305B\u3093"},
         {"thread group number description name", "{0,number,integer}. {1} {2}"},
-        {"Threadgroup name not specified.", "\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"<thread_id> option not valid until the VM is started with the run command",
          "<thread_id>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001VM\u304Crun\u30B3\u30DE\u30F3\u30C9\u3067\u958B\u59CB\u3055\u308C\u308B\u307E\u3067\u7121\u52B9\u3067\u3059"},
         {"Threads must be suspended", "\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
index 88c1cd3e878..6c4be977705 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -302,7 +302,6 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"Thread has been resumed", "\u5DF2\u6062\u590D\u7EBF\u7A0B"},
         {"Thread not suspended", "\u672A\u6302\u8D77\u7EBF\u7A0B"},
         {"thread group number description name", "{0,number,integer}\u3002{1} {2}"},
-        {"Threadgroup name not specified.", "\u672A\u6307\u5B9A\u7EBF\u7A0B\u7EC4\u540D\u3002"},
         {"<thread_id> option not valid until the VM is started with the run command",
          "\u5728\u4F7F\u7528 run \u547D\u4EE4\u542F\u52A8 VM \u524D\uFF0C<thread_id> \u9009\u9879\u65E0\u6548"},
         {"Threads must be suspended", "\u5FC5\u987B\u6302\u8D77\u7EBF\u7A0B"},
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java
index cb8004643d3..72bbf358474 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,15 @@
  * VM Testbase keywords: [jpda, jdb]
  * VM Testbase readme:
  * DECSRIPTION
- *  This is a test for jdb 'threadgroup <threadgroup_name>' command.
+ *  This is a test for jdb 'threadgroup <threadgroup_name>' command and
+ *  also for the 'threadgroup' command with no argument.
  *  The main thread creates 3 threadgroups of 5 threads each.
  *  All threads are locked in their 'run' method on a lock that the main
- *  thread holds. The test passes if jdb correctly switches between
- *  three user-defined threadgroups using 'threadgroup' command.
+ *  thread holds. The test then makes sure jdb correctly switches between
+ *  the three user-defined threadgroups using 'threadgroup' command. It then
+ *  resets the current threadgroup back to the default top level threadgroup
+ *  by using the 'threadgroup' command with no argument. It then tests that
+ *  all 3 created threadgroups can be found in the 'threads' output.
  * COMMENTS
  *  This test functionally equals to nsk/jdb/threadgroup/threadgroup001
  *  test and replaces it.
@@ -45,6 +49,7 @@
  *      nsk.jdb.threadgroup.threadgroup002.threadgroup002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
+ *      -verbose
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
  *      -jdb=${test.jdk}/bin/jdb
@@ -100,6 +105,15 @@ public class threadgroup002 extends JdbTest {
             }
         }
 
+        // Test switching back to the default top level group.
+        reply = jdb.receiveReplyFor(JdbCommand.threadgroup);
+        reply = jdb.receiveReplyFor(JdbCommand.threads);
+        grep = new Paragrep(reply);
+        count = grep.find(threadgroup002a.THREADGROUP_NAME);
+        if (count != threadgroup002a.numThreadGroups) {
+            failure("jdb cannot switch to default top level threadgroup");
+        }
+
         jdb.contToExit(1);
     }
 }
-- 
GitLab


From 8aba4de98477a3bcfcde8db71e0d797965f774c7 Mon Sep 17 00:00:00 2001
From: Rajat Mahajan <rajat.m.mahajan@oracle.com>
Date: Thu, 10 Mar 2022 05:09:29 +0000
Subject: [PATCH 046/345] 8249592: Robot.mouseMove moves cursor to incorrect
 location when display scale varies and Java runs in DPI Unaware mode

Reviewed-by: serb, aivanov
---
 .../native/libawt/windows/awt_Robot.cpp       | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
index 33457ebef32..0afce8727e0 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp
@@ -28,20 +28,33 @@
 #include "awt_Component.h"
 #include <winuser.h>
 
-static int signum(int i) {
-  // special version of signum which returns 1 when value is 0
-  return i >= 0 ? 1 : -1;
-}
-
 static void MouseMove(jint x, jint y)
 {
     INPUT mouseInput = {0};
     mouseInput.type = INPUT_MOUSE;
     mouseInput.mi.time = 0;
-    mouseInput.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE;
-    mouseInput.mi.dx = (x * 65536 /::GetSystemMetrics(SM_CXSCREEN)) + signum(x);
-    mouseInput.mi.dy = (y * 65536 /::GetSystemMetrics(SM_CYSCREEN)) + signum(y);
+
+    // The following calculations take into account a multi-monitor setup using
+    // a virtual screen for all monitors combined.
+    // More details from Microsoft are here --
+    // https://docs.microsoft.com/en-us/windows/win32/gdi/the-virtual-screen
+
+    x -= ::GetSystemMetrics(SM_XVIRTUALSCREEN);
+    y -= ::GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+    mouseInput.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE |
+                            MOUSEEVENTF_VIRTUALDESK;
+
+    int scW = ::GetSystemMetrics(SM_CXVIRTUALSCREEN);
+    int scH = ::GetSystemMetrics(SM_CYVIRTUALSCREEN);
+
+    // The following calculation to deduce mouse coordinates is based on
+    // empirical data
+    mouseInput.mi.dx = (x * 65536 + scW - 1) / scW;
+    mouseInput.mi.dy = (y * 65536 + scH - 1) / scH;
+
     ::SendInput(1, &mouseInput, sizeof(mouseInput));
+
 }
 
 static void MousePress(jint buttonMask)
-- 
GitLab


From 5b78a82e9d4b73e5bf3c6e099564206ecbda889b Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 10 Mar 2022 09:22:21 +0000
Subject: [PATCH 047/345] 7017094: ParsedSynthStyle: parameter name "direction"
 should be changed to "tabIndex"

Reviewed-by: jdv, aivanov, prr
---
 .../classes/javax/swing/plaf/synth/ParsedSynthStyle.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java
index 3173b40ab6a..ff559ee1d4f 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java
@@ -1935,9 +1935,9 @@ class ParsedSynthStyle extends DefaultSynthStyle {
         }
 
         public void paintTabbedPaneTabBackground(SynthContext context,
-                     Graphics g, int x, int y, int w, int h, int direction) {
+                     Graphics g, int x, int y, int w, int h, int tabIndex) {
             getPainter(context, "tabbedpanetabbackground", -1).
-                paintTabbedPaneTabBackground(context, g, x, y, w, h, direction);
+                paintTabbedPaneTabBackground(context, g, x, y, w, h, tabIndex);
         }
 
         public void paintTabbedPaneTabBackground(SynthContext context,
-- 
GitLab


From 6a3a7b94a4c342ce12ad553f1ba2818ca3a77f36 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 10 Mar 2022 09:26:36 +0000
Subject: [PATCH 048/345] 6218162: DefaultTableColumnModel.getColumn() method
 should mention ArrayIndexOutOfBoundsException

Reviewed-by: aivanov, prr
---
 .../classes/javax/swing/table/DefaultTableColumnModel.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
index 71c39b7e8bb..ab5ff974eb9 100644
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -290,6 +290,9 @@ public class DefaultTableColumnModel implements TableColumnModel,
      * @param   columnIndex     the index of the column desired
      * @return  the <code>TableColumn</code> object for the column
      *                          at <code>columnIndex</code>
+     * @throws  ArrayIndexOutOfBoundsException if <code>columnIndex</code>
+     *             is out of range:
+     *             (<code>columnIndex &lt; 0 || columnIndex &gt;= getColumnCount()</code>)
      */
     public TableColumn getColumn(int columnIndex) {
         return tableColumns.elementAt(columnIndex);
-- 
GitLab


From 83d771869046c2a2bf251ee5aebaceba60555e65 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 10 Mar 2022 11:28:29 +0000
Subject: [PATCH 049/345] 8282893: Remove
 MacroAssembler::push/pop_callee_saved_registers

Reviewed-by: redestad
---
 src/hotspot/cpu/x86/macroAssembler_x86.cpp | 15 ---------------
 src/hotspot/cpu/x86/macroAssembler_x86.hpp |  4 ----
 2 files changed, 19 deletions(-)

diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 10a1cb4b6a1..7659598fcb7 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -332,21 +332,6 @@ void MacroAssembler::movptr(Address dst, intptr_t src) {
   movl(dst, src);
 }
 
-
-void MacroAssembler::pop_callee_saved_registers() {
-  pop(rcx);
-  pop(rdx);
-  pop(rdi);
-  pop(rsi);
-}
-
-void MacroAssembler::push_callee_saved_registers() {
-  push(rsi);
-  push(rdi);
-  push(rdx);
-  push(rcx);
-}
-
 void MacroAssembler::pushoop(jobject obj) {
   push_literal32((int32_t)obj, oop_Relocation::spec_for_immediate());
 }
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 3593874866c..3bffad9940b 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -521,10 +521,6 @@ class MacroAssembler: public Assembler {
   // Round up to a power of two
   void round_to(Register reg, int modulus);
 
-  // Callee saved registers handling
-  void push_callee_saved_registers();
-  void pop_callee_saved_registers();
-
   // allocation
   void eden_allocate(
     Register thread,                   // Current thread
-- 
GitLab


From 9c88c5bb63fb67f301e843d1bd5700d7e5e95204 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 10 Mar 2022 13:50:05 +0000
Subject: [PATCH 050/345] 8282948: JDK-8274980 missed correct handling of
 MACOSX_BUNDLE_BUILD_VERSION

Reviewed-by: erikj
---
 make/autoconf/jdk-version.m4 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4
index 5e64ce9a064..b18e8a504ab 100644
--- a/make/autoconf/jdk-version.m4
+++ b/make/autoconf/jdk-version.m4
@@ -549,7 +549,12 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   elif test "x$with_macosx_bundle_build_version" != x; then
     MACOSX_BUNDLE_BUILD_VERSION="$with_macosx_bundle_build_version"
   else
-    MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
+    if test "x$VERSION_BUILD" != x; then
+      MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
+    else
+      MACOSX_BUNDLE_BUILD_VERSION=0
+    fi
+
     # If VERSION_OPT consists of only numbers and periods, add it.
     if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
       MACOSX_BUNDLE_BUILD_VERSION="$MACOSX_BUNDLE_BUILD_VERSION.$VERSION_OPT"
-- 
GitLab


From 7c8ea9f05b35069e2b5b43e1a0e46f7dbe374e4c Mon Sep 17 00:00:00 2001
From: Tyler Steele <tyler.steele@ibm.com>
Date: Thu, 10 Mar 2022 15:09:19 +0000
Subject: [PATCH 051/345] 8282509: [exploded image] ResolvedClassTest fails
 with similar output

Reviewed-by: mdoerr, dlong
---
 test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
index 44b21cb6815..92263bf10cf 100644
--- a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
+++ b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
@@ -125,9 +125,9 @@ public class ResolvedClassTest {
 
         analyzer.shouldHaveExitValue(0);
 
-        analyzer.shouldNotContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes)   not inlineable");
+        analyzer.shouldNotMatch("java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\)   not inlineable");
 
-        analyzer.shouldContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes)   force inline by annotation");
+        analyzer.shouldMatch("java\\.lang\\.invoke\\..+::linkToTargetMethod \\(9 bytes\\)   force inline by annotation");
         analyzer.shouldContain("java/lang/invoke/MethodHandle::invokeBasic (not loaded)   not inlineable");
     }
 
-- 
GitLab


From 26747990053ab8f378d7f64cd7e565e530af88fc Mon Sep 17 00:00:00 2001
From: Alex Blewitt <alex.blewitt@gmail.com>
Date: Thu, 10 Mar 2022 15:27:29 +0000
Subject: [PATCH 052/345] 8282878: Removed _JavaThread from PhaseTraceTime

Reviewed-by: shade, thartmann
---
 src/hotspot/share/c1/c1_Compilation.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/c1/c1_Compilation.cpp b/src/hotspot/share/c1/c1_Compilation.cpp
index ac415edb1f5..baabbbd147b 100644
--- a/src/hotspot/share/c1/c1_Compilation.cpp
+++ b/src/hotspot/share/c1/c1_Compilation.cpp
@@ -77,7 +77,6 @@ static int totalInstructionNodes = 0;
 
 class PhaseTraceTime: public TraceTime {
  private:
-  JavaThread* _thread;
   CompileLog* _log;
   TimerName _timer;
 
-- 
GitLab


From 1668c02ee83cc4f7bd7b2fe5bb7ef59b5dbda081 Mon Sep 17 00:00:00 2001
From: Anton Litvinov <alitvinov@openjdk.org>
Date: Thu, 10 Mar 2022 16:37:55 +0000
Subject: [PATCH 053/345] 8277922: Unable to click JCheckBox in JTable through
 Java Access Bridge

Reviewed-by: aivanov, serb
---
 .../share/classes/javax/swing/JTable.java     |  21 +-
 ...ooleanRendererHasAccessibleActionTest.java | 192 ++++++++++++++++++
 2 files changed, 212 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/javax/accessibility/JTable/BooleanRendererHasAccessibleActionTest.java

diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index 9af6a1ba616..c70ec2f935e 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -5481,6 +5481,21 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
 
             return this;
         }
+
+        @Override
+        public AccessibleContext getAccessibleContext() {
+            if (accessibleContext == null) {
+                accessibleContext = new AccessibleBooleanRenderer();
+            }
+            return accessibleContext;
+        }
+
+        class AccessibleBooleanRenderer extends JCheckBox.AccessibleJCheckBox {
+            @Override
+            public AccessibleAction getAccessibleAction() {
+                return null;
+            }
+        }
     }
 
     /**
@@ -8396,7 +8411,11 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
              * @return the <code>AccessibleAction</code>, or <code>null</code>
              */
             public AccessibleAction getAccessibleAction() {
-                return getCurrentAccessibleContext().getAccessibleAction();
+                AccessibleContext ac = getCurrentAccessibleContext();
+                if (ac != null) {
+                    return ac.getAccessibleAction();
+                }
+                return null;
             }
 
             /**
diff --git a/test/jdk/javax/accessibility/JTable/BooleanRendererHasAccessibleActionTest.java b/test/jdk/javax/accessibility/JTable/BooleanRendererHasAccessibleActionTest.java
new file mode 100644
index 00000000000..79f16e3c366
--- /dev/null
+++ b/test/jdk/javax/accessibility/JTable/BooleanRendererHasAccessibleActionTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+   @bug 8277922
+   @key headful
+   @summary TableCellRenderer of JTable cell with Boolean data should not
+            support any AccessibleAction.
+ */
+
+import java.awt.AWTException;
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Robot;
+import java.lang.reflect.InvocationTargetException;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleTable;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellRenderer;
+
+public class BooleanRendererHasAccessibleActionTest {
+    private volatile JFrame frame;
+    private volatile JTable table;
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException, AWTException {
+        final BooleanRendererHasAccessibleActionTest test =
+            new BooleanRendererHasAccessibleActionTest();
+
+        try {
+            SwingUtilities.invokeAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    test.createGUI();
+                }
+            });
+            Robot robot = new Robot();
+            robot.waitForIdle();
+
+            SwingUtilities.invokeAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    test.runTest();
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    test.dispose();
+                }
+            });
+        }
+    }
+
+    private void createGUI() {
+        frame = new JFrame("BooleanRendererHasAccessibleActionTest");
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        Container content = frame.getContentPane();
+        content.setLayout(new BorderLayout());
+
+        String[] tblColNames = {"Column 1", "Column 2", "Column 3"};
+        Object[][] tblData = {
+            {Boolean.TRUE, "Text 1", Boolean.FALSE},
+            {Boolean.FALSE, "Text 2", Boolean.TRUE}
+        };
+        final DefaultTableModel tblModel = new DefaultTableModel(
+                tblData, tblColNames) {
+            @Override
+            public Class<?> getColumnClass(int column) {
+                return getValueAt(0, column).getClass();
+            }
+        };
+        table = new JTable(tblModel);
+        table.setPreferredScrollableViewportSize(new Dimension(400, 100));
+
+        JScrollPane tblScroller = new JScrollPane(table);
+        tblScroller.setHorizontalScrollBarPolicy(
+            JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+        tblScroller.setVerticalScrollBarPolicy(
+            JScrollPane.VERTICAL_SCROLLBAR_ALWAYS
+        );
+        content.add(tblScroller, BorderLayout.CENTER);
+
+        frame.pack();
+        frame.setVisible(true);
+    }
+
+    private void dispose() {
+        if (frame != null) {
+            frame.dispose();
+            frame = null;
+        }
+    }
+
+    private void runTest() {
+        if (table == null) {
+            throw new RuntimeException("'table' should not be null");
+        }
+
+        testAccessibleActionInCellRenderer(0, 0, true);
+        testAccessibleActionInCellRenderer(1, 0, true);
+        testAccessibleActionInCellRenderer(0, 2, true);
+        testAccessibleActionInCellRenderer(1, 2, true);
+
+        testAccessibleActionInCell(0, 0, true);
+        testAccessibleActionInCell(1, 0, true);
+        testAccessibleActionInCell(0, 2, true);
+        testAccessibleActionInCell(1, 2, true);
+
+        System.out.println("Test passed.");
+    }
+
+    private void testAccessibleActionInCellRenderer(int row, int column,
+            boolean shouldBeNull) {
+        System.out.println(String.format(
+                "testAccessibleActionInCellRenderer():" +
+                    " row='%d', column='%d', shouldBeNull='%b'",
+                row, column, shouldBeNull));
+
+        TableCellRenderer cellRenderer = table.getCellRenderer(row, column);
+        if (!(cellRenderer instanceof Accessible)) {
+            throw new RuntimeException("'cellRenderer' is not Accessible");
+        }
+
+        AccessibleContext cellRendererAc =
+            ((Accessible) cellRenderer).getAccessibleContext();
+        if (cellRendererAc == null) {
+            throw new RuntimeException("'cellRendererAc' should not be null");
+        }
+
+        AccessibleAction cellRendererAa = cellRendererAc.getAccessibleAction();
+        if ((shouldBeNull && (cellRendererAa != null)) ||
+            (!shouldBeNull && (cellRendererAa == null))) {
+            throw new RuntimeException(
+                "Test failed. 'cellRendererAa' is not as should be");
+        }
+    }
+
+    private void testAccessibleActionInCell(int row, int column,
+            boolean shouldBeNull) {
+        System.out.println(String.format("testAccessibleActionInCell():" +
+                    " row='%d', column='%d', shouldBeNull='%b'",
+                row, column, shouldBeNull));
+
+        AccessibleContext tblAc = table.getAccessibleContext();
+        AccessibleTable accessibleTbl = tblAc.getAccessibleTable();
+        if (accessibleTbl == null) {
+            throw new RuntimeException("'accessibleTbl' should not be null");
+        }
+
+        Accessible cellAccessible = accessibleTbl.getAccessibleAt(row, column);
+        AccessibleContext cellAc = cellAccessible.getAccessibleContext();
+        if (cellAc == null) {
+            throw new RuntimeException("'cellAc' should not be null");
+        }
+
+        AccessibleAction cellAa = cellAc.getAccessibleAction();
+        if ((shouldBeNull && (cellAa != null)) ||
+            (!shouldBeNull && (cellAa == null))) {
+            throw new RuntimeException(
+                "Test failed. 'cellAa' is not as should be");
+        }
+    }
+}
-- 
GitLab


From e8a1ce00b2981a698b4ba3e09a8b2d49d0051ccb Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 10 Mar 2022 16:38:44 +0000
Subject: [PATCH 054/345] 8280881: (fs) UnixNativeDispatcher.close0 may throw
 UnixException

Reviewed-by: alanb
---
 .../sun/nio/fs/LinuxDosFileAttributeView.java |  6 ++---
 .../classes/sun/nio/fs/LinuxWatchService.java | 10 +++----
 .../unix/classes/sun/nio/fs/UnixCopyFile.java | 10 +++----
 .../sun/nio/fs/UnixDirectoryStream.java       |  4 +--
 .../sun/nio/fs/UnixFileAttributeViews.java    |  4 +--
 .../classes/sun/nio/fs/UnixFileStore.java     |  4 +--
 .../sun/nio/fs/UnixFileSystemProvider.java    | 13 +++++-----
 .../sun/nio/fs/UnixNativeDispatcher.java      | 26 ++++++++++++++++---
 .../sun/nio/fs/UnixSecureDirectoryStream.java | 21 ++++++++-------
 .../fs/UnixUserDefinedFileAttributeView.java  | 14 +++++-----
 10 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java b/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java
index a60f2ad45f9..70d701c1ef7 100644
--- a/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java
+++ b/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -182,7 +182,7 @@ class LinuxDosFileAttributeView
             x.rethrowAsIOException(file);
             return null;    // keep compiler happy
         } finally {
-            close(fd);
+            close(fd, e -> null);
         }
     }
 
@@ -277,7 +277,7 @@ class LinuxDosFileAttributeView
         } catch (UnixException x) {
             x.rethrowAsIOException(file);
         } finally {
-            close(fd);
+            close(fd, e -> null);
         }
     }
 }
diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java b/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
index 3e53b59ff90..43719e0d5be 100644
--- a/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
+++ b/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ class LinuxWatchService
             socketpair(sp);
             configureBlocking(sp[0], false);
         } catch (UnixException x) {
-            UnixNativeDispatcher.close(ifd);
+            UnixNativeDispatcher.close(ifd, e -> null);
             throw new IOException(x.errorString());
         }
 
@@ -296,9 +296,9 @@ class LinuxWatchService
 
             // free resources
             unsafe.freeMemory(address);
-            UnixNativeDispatcher.close(socketpair[0]);
-            UnixNativeDispatcher.close(socketpair[1]);
-            UnixNativeDispatcher.close(ifd);
+            UnixNativeDispatcher.close(socketpair[0], e -> null);
+            UnixNativeDispatcher.close(socketpair[1], e -> null);
+            UnixNativeDispatcher.close(ifd, e -> null);
         }
 
         /**
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java b/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
index 3f98c81b3bf..5412748b06c 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixCopyFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -186,7 +186,7 @@ class UnixCopyFile {
                 }
                 if (sfd >= 0) {
                     source.getFileSystem().copyNonPosixAttributes(sfd, dfd);
-                    close(sfd);
+                    close(sfd, e -> null);
                 }
             }
             // copy time stamps last
@@ -210,7 +210,7 @@ class UnixCopyFile {
             done = true;
         } finally {
             if (dfd >= 0)
-                close(dfd);
+                close(dfd, e -> null);
             if (!done) {
                 // rollback
                 try { rmdir(target); } catch (UnixException ignore) { }
@@ -288,7 +288,7 @@ class UnixCopyFile {
                 }
                 complete = true;
             } finally {
-                close(fo);
+                close(fo, e -> null);
 
                 // copy of file or attributes failed so rollback
                 if (!complete) {
@@ -298,7 +298,7 @@ class UnixCopyFile {
                 }
             }
         } finally {
-            close(fi);
+            close(fi, e -> null);
         }
     }
 
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java b/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java
index 44b1c70abbb..3bab00b9782 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixDirectoryStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ class UnixDirectoryStream
         this.filter = filter;
     }
 
-    protected final UnixPath directory() {
+    final UnixPath directory() {
         return dir;
     }
 
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
index 0744be1296d..2ffb3099dbc 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,7 +160,7 @@ class UnixFileAttributeViews {
                     }
                 }
             } finally {
-                close(fd);
+                close(fd, e -> null);
             }
         }
     }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
index 7947c416a65..0d793dc69bb 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -197,7 +197,7 @@ abstract class UnixFileStore
             if (e.errno() == UnixConstants.XATTR_NOT_FOUND)
                 return true;
         } finally {
-            UnixNativeDispatcher.close(fd);
+            UnixNativeDispatcher.close(fd, e -> null);
         }
         return false;
     }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
index 44a61827137..99703d94755 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -431,13 +431,14 @@ public abstract class UnixFileSystemProvider
             dfd2 = dup(dfd1);
             dp = fdopendir(dfd1);
         } catch (UnixException x) {
+            IOException ioe = x.errno() == UnixConstants.ENOTDIR ?
+                new NotDirectoryException(dir.getPathForExceptionMessage()) :
+                x.asIOException(dir);
             if (dfd1 != -1)
-                UnixNativeDispatcher.close(dfd1);
+                UnixNativeDispatcher.close(dfd1, e -> null);
             if (dfd2 != -1)
-                UnixNativeDispatcher.close(dfd2);
-            if (x.errno() == UnixConstants.ENOTDIR)
-                throw new NotDirectoryException(dir.getPathForExceptionMessage());
-            x.rethrowAsIOException(dir);
+                UnixNativeDispatcher.close(dfd2, e -> null);
+            throw ioe;
         }
         return new UnixSecureDirectoryStream(dir, dp, dfd2, filter);
     }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
index 90be5cefae3..4080c08c32e 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package sun.nio.fs;
 
+import java.util.function.Function;
+
 /**
  * Unix system and library calls.
  */
@@ -90,12 +92,30 @@ class UnixNativeDispatcher {
     /**
      * close(int filedes). If fd is -1 this is a no-op.
      */
-    static void close(int fd) {
+    static void close(int fd) throws UnixException {
         if (fd != -1) {
             close0(fd);
         }
     }
-    private static native void close0(int fd);
+    private static native void close0(int fd) throws UnixException;
+
+    /**
+     * close(fd). If close fails then the given exception supplier function is
+     * invoked to produce an exception to throw. If the function returns null
+     * then no exception is thrown. If close fails and the exception supplier
+     * function is null, then no exception is thrown.
+     */
+    static <X extends Throwable>
+    void close(int fd, Function<UnixException, X> mapper) throws X {
+        try {
+            close(fd);
+        } catch (UnixException e) {
+            if (mapper != null) {
+                X ex = mapper.apply(e);
+                if (ex != null) throw ex;
+            }
+        }
+    }
 
     /**
      * void rewind(FILE* stream);
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
index 226effad3ef..bedf847c6e7 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ class UnixSecureDirectoryStream
         ds.writeLock().lock();
         try {
             if (ds.closeImpl()) {
-                UnixNativeDispatcher.close(dfd);
+                UnixNativeDispatcher.close(dfd, e -> e.asIOException(ds.directory()));
             }
         } finally {
             ds.writeLock().unlock();
@@ -117,13 +117,14 @@ class UnixSecureDirectoryStream
                 newdfd2 = dup(newdfd1);
                 ptr = fdopendir(newdfd1);
             } catch (UnixException x) {
+                IOException ioe = x.errno() == UnixConstants.ENOTDIR ?
+                    new NotDirectoryException(file.toString()) :
+                    x.asIOException(file);
                 if (newdfd1 != -1)
-                    UnixNativeDispatcher.close(newdfd1);
+                    UnixNativeDispatcher.close(newdfd1, e -> null);
                 if (newdfd2 != -1)
-                    UnixNativeDispatcher.close(newdfd2);
-                if (x.errno() == UnixConstants.ENOTDIR)
-                    throw new NotDirectoryException(file.toString());
-                x.rethrowAsIOException(file);
+                    UnixNativeDispatcher.close(newdfd1, e -> null);
+                throw ioe;
             }
             return new UnixSecureDirectoryStream(child, ptr, newdfd2, null);
         } finally {
@@ -422,7 +423,7 @@ class UnixSecureDirectoryStream
                     }
                 } finally {
                     if (file != null)
-                        UnixNativeDispatcher.close(fd);
+                        UnixNativeDispatcher.close(fd, e-> null);
                 }
             } finally {
                 ds.readLock().unlock();
@@ -504,7 +505,7 @@ class UnixSecureDirectoryStream
                     x.rethrowAsIOException(file);
                 } finally {
                     if (file != null && fd >= 0)
-                        UnixNativeDispatcher.close(fd);
+                        UnixNativeDispatcher.close(fd, e-> null);
                 }
             } finally {
                 ds.readLock().unlock();
@@ -527,7 +528,7 @@ class UnixSecureDirectoryStream
                     x.rethrowAsIOException(file);
                 } finally {
                     if (file != null && fd >= 0)
-                        UnixNativeDispatcher.close(fd);
+                        UnixNativeDispatcher.close(fd, e-> null);
                 }
             } finally {
                 ds.readLock().unlock();
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java b/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
index 2b62d18cb6f..f568517a2bd 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@ abstract class UnixUserDefinedFileAttributeView
                 null, "Unable to get list of extended attributes: " +
                 x.getMessage());
         } finally {
-            close(fd);
+            close(fd, e -> null);
         }
     }
 
@@ -157,7 +157,7 @@ abstract class UnixUserDefinedFileAttributeView
                 null, "Unable to get size of extended attribute '" + name +
                 "': " + x.getMessage());
         } finally {
-            close(fd);
+            close(fd, e -> null);
         }
     }
 
@@ -221,7 +221,7 @@ abstract class UnixUserDefinedFileAttributeView
             throw new FileSystemException(file.getPathForExceptionMessage(),
                     null, "Error reading extended attribute '" + name + "': " + msg);
         } finally {
-            close(fd);
+            close(fd, e -> null);
         }
     }
 
@@ -283,7 +283,7 @@ abstract class UnixUserDefinedFileAttributeView
                     null, "Error writing extended attribute '" + name + "': " +
                     x.getMessage());
         } finally {
-            close(fd);
+            close(fd, e -> null);
         }
     }
 
@@ -305,7 +305,7 @@ abstract class UnixUserDefinedFileAttributeView
             throw new FileSystemException(file.getPathForExceptionMessage(),
                 null, "Unable to delete extended attribute '" + name + "': " + x.getMessage());
         } finally {
-            close(fd);
+            close(fd, e -> null);
         }
     }
 
@@ -346,4 +346,4 @@ abstract class UnixUserDefinedFileAttributeView
             buffer.release();
         }
     }
-}
\ No newline at end of file
+}
-- 
GitLab


From fdce97df5f03d9aa37d85f271d08971ec47db01d Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 10 Mar 2022 17:36:51 +0000
Subject: [PATCH 055/345] 8267820: (fs) Files.copy should attempt to copy POSIX
 attributes when target file in custom file system

Reviewed-by: lancea, alanb
---
 .../classes/java/nio/file/CopyMoveHelper.java | 48 ++++++++++++++-----
 test/jdk/java/nio/file/Files/CopyAndMove.java | 19 ++++----
 test/jdk/jdk/nio/zipfs/TestPosix.java         | 12 +++--
 test/jdk/jdk/nio/zipfs/test.policy            |  1 +
 test/jdk/jdk/nio/zipfs/test.policy.posix      |  1 +
 5 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java b/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
index ab9281807fd..e5ca66fa631 100644
--- a/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
+++ b/src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,11 +105,20 @@ class CopyMoveHelper {
         LinkOption[] linkOptions = (opts.followLinks) ? new LinkOption[0] :
             new LinkOption[] { LinkOption.NOFOLLOW_LINKS };
 
+        // retrieve source posix view, null if unsupported
+        final PosixFileAttributeView sourcePosixView =
+            Files.getFileAttributeView(source, PosixFileAttributeView.class);
+
         // attributes of source file
-        BasicFileAttributes attrs = Files.readAttributes(source,
-                                                         BasicFileAttributes.class,
-                                                         linkOptions);
-        if (attrs.isSymbolicLink())
+        BasicFileAttributes sourceAttrs = sourcePosixView != null ?
+            Files.readAttributes(source,
+                                 PosixFileAttributes.class,
+                                 linkOptions) :
+            Files.readAttributes(source,
+                                 BasicFileAttributes.class,
+                                 linkOptions);
+
+        if (sourceAttrs.isSymbolicLink())
             throw new IOException("Copying of symbolic links not supported");
 
         // delete target if it exists and REPLACE_EXISTING is specified
@@ -119,7 +128,7 @@ class CopyMoveHelper {
             throw new FileAlreadyExistsException(target.toString());
 
         // create directory or copy file
-        if (attrs.isDirectory()) {
+        if (sourceAttrs.isDirectory()) {
             Files.createDirectory(target);
         } else {
             try (InputStream in = Files.newInputStream(source)) {
@@ -127,14 +136,29 @@ class CopyMoveHelper {
             }
         }
 
-        // copy basic attributes to target
+        // copy basic and, if supported, POSIX attributes to target
         if (opts.copyAttributes) {
-            BasicFileAttributeView view =
-                Files.getFileAttributeView(target, BasicFileAttributeView.class);
+            BasicFileAttributeView targetView = null;
+            if (sourcePosixView != null) {
+                targetView = Files.getFileAttributeView(target,
+                                                     PosixFileAttributeView.class);
+            }
+
+            // target might not support posix even if source does
+            if (targetView == null) {
+                targetView = Files.getFileAttributeView(target,
+                                                     BasicFileAttributeView.class);
+            }
+
             try {
-                view.setTimes(attrs.lastModifiedTime(),
-                              attrs.lastAccessTime(),
-                              attrs.creationTime());
+                targetView.setTimes(sourceAttrs.lastModifiedTime(),
+                                 sourceAttrs.lastAccessTime(),
+                                 sourceAttrs.creationTime());
+
+                if (sourceAttrs instanceof PosixFileAttributes sourcePosixAttrs &&
+                    targetView instanceof PosixFileAttributeView targetPosixView) {
+                    targetPosixView.setPermissions(sourcePosixAttrs.permissions());
+                }
             } catch (Throwable x) {
                 // rollback
                 try {
diff --git a/test/jdk/java/nio/file/Files/CopyAndMove.java b/test/jdk/java/nio/file/Files/CopyAndMove.java
index 981fb332fc0..e91f3e3713b 100644
--- a/test/jdk/java/nio/file/Files/CopyAndMove.java
+++ b/test/jdk/java/nio/file/Files/CopyAndMove.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4313887 6838333 6917021 7006126 6950237 8006645 8201407
+ * @bug 4313887 6838333 6917021 7006126 6950237 8006645 8201407 8267820
  * @summary Unit test for java.nio.file.Files copy and move methods (use -Dseed=X to set PRNG seed)
  * @library .. /test/lib
  * @build jdk.test.lib.Platform jdk.test.lib.RandomFactory
@@ -672,16 +672,15 @@ public class CopyAndMove {
             checkBasicAttributes(basicAttributes,
                 readAttributes(source, BasicFileAttributes.class, linkOptions));
 
+            // check POSIX attributes are copied
+            if (!Platform.isWindows() && testPosixAttributes) {
+                checkPosixAttributes(
+                    readAttributes(source, PosixFileAttributes.class, linkOptions),
+                    readAttributes(target, PosixFileAttributes.class, linkOptions));
+            }
+
             // verify other attributes when same provider
             if (source.getFileSystem().provider() == target.getFileSystem().provider()) {
-
-                // check POSIX attributes are copied
-                if (!Platform.isWindows() && testPosixAttributes) {
-                    checkPosixAttributes(
-                        readAttributes(source, PosixFileAttributes.class, linkOptions),
-                        readAttributes(target, PosixFileAttributes.class, linkOptions));
-                }
-
                 // check DOS attributes are copied
                 if (Platform.isWindows()) {
                     checkDosAttributes(
diff --git a/test/jdk/jdk/nio/zipfs/TestPosix.java b/test/jdk/jdk/nio/zipfs/TestPosix.java
index 2be70758fbc..f629dfef222 100644
--- a/test/jdk/jdk/nio/zipfs/TestPosix.java
+++ b/test/jdk/jdk/nio/zipfs/TestPosix.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, SAP SE. All rights reserved.
+ * Copyright (c) 2019, 2022, 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
@@ -69,11 +69,11 @@ import static org.testng.Assert.fail;
 /**
  * @test
  * @bug 8213031 8273935
+ * @summary Test POSIX ZIP file operations.
  * @modules jdk.zipfs
  *          jdk.jartool
  * @run testng TestPosix
  * @run testng/othervm/java.security.policy=test.policy.posix TestPosix
- * @summary Test POSIX zip file operations.
  */
 public class TestPosix {
     private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
@@ -528,9 +528,11 @@ public class TestPosix {
         }
 
         // check entries on copied zipfs - no permission data should exist
-        try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE_COPY, ENV_DEFAULT)) {
-            checkEntries(zip, checkExpects.noPermDataInZip);
-        }
+        if (System.getProperty("os.name").toLowerCase().contains("windows"))
+            try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE_COPY,
+                ENV_DEFAULT)) {
+                checkEntries(zip, checkExpects.noPermDataInZip);
+            }
     }
 
     /**
diff --git a/test/jdk/jdk/nio/zipfs/test.policy b/test/jdk/jdk/nio/zipfs/test.policy
index 1e91f1f8dcf..d0492d0fc7a 100644
--- a/test/jdk/jdk/nio/zipfs/test.policy
+++ b/test/jdk/jdk/nio/zipfs/test.policy
@@ -3,4 +3,5 @@ grant {
     permission java.util.PropertyPermission "test.jdk","read";
     permission java.util.PropertyPermission "test.src","read";
     permission java.util.PropertyPermission "user.dir","read";
+    permission java.lang.RuntimePermission "accessUserInformation";
 };
diff --git a/test/jdk/jdk/nio/zipfs/test.policy.posix b/test/jdk/jdk/nio/zipfs/test.policy.posix
index 601ef439ab4..77415b0f4ba 100644
--- a/test/jdk/jdk/nio/zipfs/test.policy.posix
+++ b/test/jdk/jdk/nio/zipfs/test.policy.posix
@@ -5,4 +5,5 @@ grant {
     permission java.util.PropertyPermission "test.src","read";
     permission java.util.PropertyPermission "user.dir","read";
     permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.module";
+    permission java.lang.RuntimePermission "accessUserInformation";
 };
-- 
GitLab


From 879b6445e33ad3a07461d01ea8f28a09979a4313 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Thu, 10 Mar 2022 18:23:41 +0000
Subject: [PATCH 056/345] 8282897: Fix call parameter to GetStringChars() in
 HostLocaleProviderAdapter_md.c

Reviewed-by: shade, naoto
---
 .../libjava/HostLocaleProviderAdapter_md.c    | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
index b7c2bcc28db..5d5f3ab476e 100644
--- a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
+++ b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
@@ -243,7 +243,7 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
 JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getDateTimePattern
   (JNIEnv *env, jclass cls, jint dateStyle, jint timeStyle, jstring jlangtag) {
     WCHAR pattern[BUFLEN];
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, NULL);
 
     pattern[0] = L'\0';
@@ -274,7 +274,7 @@ JNIEXPORT jint JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterIm
   (JNIEnv *env, jclass cls, jstring jlangtag) {
     const jchar *langtag;
     jint ret;
-    langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, 0);
     ret = getCalendarID(langtag);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -362,7 +362,7 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
     jstring ret;
     WCHAR * pattern;
 
-    langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, NULL);
     pattern = getNumberPattern(langtag, numberStyle);
     CHECK_NULL_RETURN(pattern, NULL);
@@ -383,7 +383,7 @@ JNIEXPORT jboolean JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapt
   (JNIEnv *env, jclass cls, jstring jlangtag) {
     DWORD num;
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, JNI_FALSE);
     got = getLocaleInfoWrapper(langtag,
         LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER,
@@ -402,7 +402,7 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
   (JNIEnv *env, jclass cls, jstring jlangtag, jstring currencySymbol) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, currencySymbol);
     got = getLocaleInfoWrapper(langtag, LOCALE_SCURRENCY, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -423,7 +423,7 @@ JNIEXPORT jchar JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterI
   (JNIEnv *env, jclass cls, jstring jlangtag, jchar decimalSeparator) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, decimalSeparator);
     got = getLocaleInfoWrapper(langtag, LOCALE_SDECIMAL, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -444,7 +444,7 @@ JNIEXPORT jchar JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterI
   (JNIEnv *env, jclass cls, jstring jlangtag, jchar groupingSeparator) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, groupingSeparator);
     got = getLocaleInfoWrapper(langtag, LOCALE_STHOUSAND, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -465,7 +465,7 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
   (JNIEnv *env, jclass cls, jstring jlangtag, jstring infinity) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, infinity);
     got = getLocaleInfoWrapper(langtag, LOCALE_SPOSINFINITY, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -486,7 +486,7 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
   (JNIEnv *env, jclass cls, jstring jlangtag, jstring internationalCurrencySymbol) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, internationalCurrencySymbol);
     got = getLocaleInfoWrapper(langtag, LOCALE_SINTLSYMBOL, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -507,7 +507,7 @@ JNIEXPORT jchar JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterI
   (JNIEnv *env, jclass cls, jstring jlangtag, jchar minusSign) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, minusSign);
     got = getLocaleInfoWrapper(langtag, LOCALE_SNEGATIVESIGN, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -528,7 +528,7 @@ JNIEXPORT jchar JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterI
   (JNIEnv *env, jclass cls, jstring jlangtag, jchar monetaryDecimalSeparator) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, monetaryDecimalSeparator);
     got = getLocaleInfoWrapper(langtag, LOCALE_SMONDECIMALSEP, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -549,7 +549,7 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
   (JNIEnv *env, jclass cls, jstring jlangtag, jstring nan) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, nan);
     got = getLocaleInfoWrapper(langtag, LOCALE_SNAN, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -570,7 +570,7 @@ JNIEXPORT jchar JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterI
   (JNIEnv *env, jclass cls, jstring jlangtag, jchar percent) {
     WCHAR buf[BUFLEN];
     int got;
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, percent);
     got = getLocaleInfoWrapper(langtag, LOCALE_SPERCENT, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
@@ -592,7 +592,7 @@ JNIEXPORT jchar JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterI
     WCHAR buf[BUFLEN];
     const jchar *langtag;
     int got;
-    langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, perMill);
     got = getLocaleInfoWrapper(langtag, LOCALE_SPERMILLE, buf, BUFLEN);
 
@@ -615,7 +615,7 @@ JNIEXPORT jchar JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterI
     WCHAR buf[BUFLEN];
     const jchar *langtag;
     int got;
-    langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, zeroDigit);
     got = getLocaleInfoWrapper(langtag, LOCALE_SNATIVEDIGITS, buf, BUFLEN);
 
@@ -639,7 +639,7 @@ JNIEXPORT jint JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterIm
     const jchar *langtag;
     int got = 0;
 
-    langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, -1);
     switch (type) {
     case sun_util_locale_provider_HostLocaleProviderAdapterImpl_CD_FIRSTDAYOFWEEK:
@@ -756,7 +756,7 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
             return NULL;
     }
 
-    pjChar = (*env)->GetStringChars(env, jStr, JNI_FALSE);
+    pjChar = (*env)->GetStringChars(env, jStr, NULL);
     CHECK_NULL_RETURN(pjChar, NULL);
     got = getLocaleInfoWrapper(pjChar, lcType, buf, BUFLEN);
     (*env)->ReleaseStringChars(env, jStr, pjChar);
@@ -833,7 +833,7 @@ jint getCalendarID(const jchar *langtag) {
 
 void replaceCalendarArrayElems(JNIEnv *env, jstring jlangtag, jint calid, jobjectArray jarray, DWORD* pTypes, int offset, int length, int style, BOOL bCal) {
     WCHAR name[BUFLEN];
-    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar *langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     jstring tmp_string;
     CALTYPE isGenitive = 0;
 
@@ -1023,7 +1023,7 @@ BOOL CALLBACK EnumCalendarInfoProc(LPWSTR lpCalInfoStr, CALID calid, LPWSTR lpRe
 }
 
 jobjectArray getErasImpl(JNIEnv *env, jstring jlangtag, jint calid, jint style, jobjectArray eras) {
-    const jchar * langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE);
+    const jchar * langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     WCHAR buf[BUFLEN];
     jobjectArray ret = eras;
     CALTYPE type;
-- 
GitLab


From 1f295239b97cccfff24df259215d34c712065867 Mon Sep 17 00:00:00 2001
From: John Jiang <jjiang@openjdk.org>
Date: Thu, 10 Mar 2022 18:25:06 +0000
Subject: [PATCH 057/345] 8282932: a space is needed for the unsupported
 protocol exception message in ProtocolVersion

Reviewed-by: xuelei, mullan
---
 .../share/classes/sun/security/ssl/ProtocolVersion.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java b/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
index e4cb5637c60..32c112a4991 100644
--- a/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
+++ b/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -290,7 +290,7 @@ enum ProtocolVersion {
             ProtocolVersion pv = ProtocolVersion.nameOf(pn);
             if (pv == null) {
                 throw new IllegalArgumentException(
-                        "Unsupported protocol" + pn);
+                        "Unsupported protocol: " + pn);
             }
 
             pvs.add(pv);
-- 
GitLab


From b13cacc575f58c206c928f2756698b027ee07b6f Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 10 Mar 2022 18:25:53 +0000
Subject: [PATCH 058/345] 8254574: PrintWriter handling of
 InterruptedIOException should be removed

Reviewed-by: alanb
---
 .../share/classes/java/io/PrintStream.java    | 21 +++++--------------
 .../share/classes/java/io/PrintWriter.java    | 10 ++++-----
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java
index 0281ed66ca8..d18afa97d54 100644
--- a/src/java.base/share/classes/java/io/PrintStream.java
+++ b/src/java.base/share/classes/java/io/PrintStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -464,22 +464,11 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Flushes the stream and checks its error state. The internal error state
-     * is set to {@code true} when the underlying output stream throws an
-     * {@code IOException} other than {@code InterruptedIOException},
-     * and when the {@code setError} method is invoked.  If an operation
-     * on the underlying output stream throws an
-     * {@code InterruptedIOException}, then the {@code PrintStream}
-     * converts the exception back into an interrupt by doing:
-     * <pre>{@code
-     *     Thread.currentThread().interrupt();
-     * }</pre>
-     * or the equivalent.
+     * Flushes the stream if it's not closed and checks its error state.
      *
      * @return {@code true} if and only if this stream has encountered an
-     *         {@code IOException} other than
-     *         {@code InterruptedIOException}, or the
-     *         {@code setError} method has been invoked
+     *         {@code IOException}, or the {@code setError} method has been
+     *         invoked
      */
     public boolean checkError() {
         if (out != null)
@@ -504,7 +493,7 @@ public class PrintStream extends FilterOutputStream
     }
 
     /**
-     * Clears the internal error state of this stream.
+     * Clears the error state of this stream.
      *
      * <p> This method will cause subsequent invocations of {@link
      * #checkError()} to return {@code false} until another write
diff --git a/src/java.base/share/classes/java/io/PrintWriter.java b/src/java.base/share/classes/java/io/PrintWriter.java
index 874a03cce3b..249efc4d99a 100644
--- a/src/java.base/share/classes/java/io/PrintWriter.java
+++ b/src/java.base/share/classes/java/io/PrintWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -428,9 +428,9 @@ public class PrintWriter extends Writer {
     /**
      * Flushes the stream if it's not closed and checks its error state.
      *
-     * @return {@code true} if the print stream has encountered an error,
-     *          either on the underlying output stream or during a format
-     *          conversion.
+     * @return {@code true} if and only if this stream has encountered an
+     *         {@code IOException}, or the {@code setError} method has been
+     *         invoked
      */
     public boolean checkError() {
         if (out != null) {
@@ -445,7 +445,7 @@ public class PrintWriter extends Writer {
     }
 
     /**
-     * Indicates that an error has occurred.
+     * Sets the error state of the stream to {@code true}.
      *
      * <p> This method will cause subsequent invocations of {@link
      * #checkError()} to return {@code true} until {@link
-- 
GitLab


From 7b91bbba82e871edaf133343415e254972c6ddc7 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 10 Mar 2022 18:53:59 +0000
Subject: [PATCH 059/345] 8282170: JVMTI SetBreakpoint metaspace allocation
 test

Reviewed-by: cjplummer, lmesnik
---
 .../SetBreakpoint/TestManyBreakpoints.java    |  82 +++++++++++++
 .../SetBreakpoint/libTestManyBreakpoints.cpp  | 111 ++++++++++++++++++
 2 files changed, 193 insertions(+)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/libTestManyBreakpoints.cpp

diff --git a/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java b/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java
new file mode 100644
index 00000000000..bc935ea99d1
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8144992
+ * @requires vm.jvmti
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ * @run main/othervm/native -agentlib:TestManyBreakpoints
+ *                          -Xlog:gc+metaspace
+ *                          -Xint
+ *                          -XX:MetaspaceSize=16K -XX:MaxMetaspaceSize=64M
+ *                          TestManyBreakpoints
+ */
+
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+public class TestManyBreakpoints {
+
+  static final int BATCHES = 50;
+  static final int METHODS = 1000;
+
+  public static void main(String[] args) throws Exception {
+    for (int c = 0; c < BATCHES; c++) {
+      System.out.println("Batch " + c);
+      TestClassLoader loader = new TestClassLoader();
+      Class.forName("Target", true, loader);
+    }
+  }
+
+  private static class TestClassLoader extends ClassLoader implements Opcodes {
+    static byte[] TARGET_BYTES = generateTarget();
+
+    private static byte[] generateTarget() {
+      ClassWriter cw = new ClassWriter(0);
+
+      cw.visit(52, ACC_SUPER | ACC_PUBLIC, "Target", null, "java/lang/Object", null);
+      for (int m = 0; m < METHODS; m++) {
+        MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "m" + m, "()V", null, null);
+        mv.visitCode();
+        mv.visitInsn(RETURN);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+      }
+      cw.visitEnd();
+      return cw.toByteArray();
+    }
+
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+      if (name.equals("Target")) {
+        return defineClass(name, TARGET_BYTES, 0, TARGET_BYTES.length);
+      } else {
+        return super.findClass(name);
+      }
+    }
+  }
+
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/libTestManyBreakpoints.cpp b/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/libTestManyBreakpoints.cpp
new file mode 100644
index 00000000000..dcb8f87ddd7
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/SetBreakpoint/libTestManyBreakpoints.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "jvmti.h"
+
+#define TARGET_CLASS_NAME "LTarget;"
+
+static jvmtiEnv *jvmti = NULL;
+
+static void
+check_jvmti_status(JNIEnv* jni, jvmtiError err, const char* msg) {
+  if (err != JVMTI_ERROR_NONE) {
+    printf("check_jvmti_status: %s, JVMTI function returned error: %d\n", msg, err);
+    jni->FatalError(msg);
+  }
+}
+
+void JNICALL classprepare(jvmtiEnv* jvmti_env, JNIEnv* jni_env, jthread thread, jclass klass) {
+    char* buf;
+    jvmtiError err;
+
+    err = jvmti->GetClassSignature(klass, &buf, NULL);
+    check_jvmti_status(jni_env, err, "classprepare: GetClassSignature error");
+
+    if (strncmp(buf, TARGET_CLASS_NAME, strlen(TARGET_CLASS_NAME)) == 0) {
+        jint nMethods;
+        jmethodID* methods;
+        int i;
+
+        err = jvmti->GetClassMethods(klass, &nMethods, &methods);
+        check_jvmti_status(jni_env, err, "classprepare: GetClassMethods error");
+        printf("Setting breakpoints in %s\n", buf);
+        fflush(stdout);
+        for (i = 0; i < nMethods; i++) {
+            err = jvmti->SetBreakpoint(methods[i], 0);
+            check_jvmti_status(jni_env, err, "classprepare: SetBreakpoint error");
+        }
+    }
+}
+
+
+void JNICALL breakpoint(jvmtiEnv* jvmti_env, JNIEnv* jni_env, jthread thread, jmethodID method, jlocation location) {
+   // Do nothing
+}
+
+JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM* vm, char* options, void* reserved) {
+    jvmtiCapabilities capa;
+    jvmtiEventCallbacks cbs;
+    jint err;
+
+    err = vm->GetEnv((void**)&jvmti, JVMTI_VERSION_1_0);
+    if (err != JNI_OK) {
+        printf("Agent_OnLoad: GetEnv error\n");
+        return JNI_ERR;
+    }
+
+    memset(&capa, 0, sizeof(capa));
+    capa.can_generate_breakpoint_events = 1;
+    capa.can_generate_single_step_events = 1;
+    err = jvmti->AddCapabilities(&capa);
+    if (err != JNI_OK) {
+        printf("Agent_OnLoad: AddCapabilities error\n");
+        return JNI_ERR;
+    }
+
+    memset(&cbs, 0, sizeof(cbs));
+    cbs.ClassPrepare = classprepare;
+    cbs.Breakpoint = breakpoint;
+    err = jvmti->SetEventCallbacks(&cbs, sizeof(cbs));
+    if (err != JNI_OK) {
+        printf("Agent_OnLoad: SetEventCallbacks error\n");
+        return JNI_ERR;
+    }
+
+    err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, NULL);
+    if (err != JNI_OK) {
+        printf("Agent_OnLoad: SetEventNotificationMode CLASS_PREPARE error\n");
+        return JNI_ERR;
+    }
+
+    err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_BREAKPOINT, NULL);
+    if (err != JNI_OK) {
+        printf("Agent_OnLoad: SetEventNotificationMode BREAKPOINT error\n");
+        return JNI_ERR;
+    }
+
+    return JNI_OK;
+}
-- 
GitLab


From f5217b475e2bfcbc649dd1e067222bf500429663 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Thu, 10 Mar 2022 19:08:10 +0000
Subject: [PATCH 060/345] 8282852: Debug agent asserts in
 classTrack_addPreparedClass()

Reviewed-by: amenkov, lmesnik
---
 .../share/native/libjdwp/classTrack.c         | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c b/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c
index de9918780bf..613b02c8d1e 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c
@@ -110,21 +110,28 @@ classTrack_addPreparedClass(JNIEnv *env_unused, jclass klass)
     jvmtiError error;
     jvmtiEnv* env = trackingEnv;
 
+    char* signature;
+    error = classSignature(klass, &signature, NULL);
+    if (error != JVMTI_ERROR_NONE) {
+        EXIT_ERROR(error,"signature");
+    }
+
     if (gdata && gdata->assertOn) {
-        // Check this is not already tagged.
+        // Check if already tagged.
         jlong tag;
         error = JVMTI_FUNC_PTR(trackingEnv, GetTag)(env, klass, &tag);
         if (error != JVMTI_ERROR_NONE) {
             EXIT_ERROR(error, "Unable to GetTag with class trackingEnv");
         }
-        JDI_ASSERT(tag == NOT_TAGGED);
+        if (tag != NOT_TAGGED) {
+            // If tagged, the old tag better be the same as the new.
+            char* oldSignature = (char*)jlong_to_ptr(tag);
+            JDI_ASSERT(strcmp(signature, oldSignature) == 0);
+            jvmtiDeallocate(signature);
+            return;
+        }
     }
 
-    char* signature;
-    error = classSignature(klass, &signature, NULL);
-    if (error != JVMTI_ERROR_NONE) {
-        EXIT_ERROR(error,"signature");
-    }
     error = JVMTI_FUNC_PTR(trackingEnv, SetTag)(env, klass, ptr_to_jlong(signature));
     if (error != JVMTI_ERROR_NONE) {
         jvmtiDeallocate(signature);
-- 
GitLab


From bb7ee5a04ae21a9f9dc6c59a990f7e571e832f0d Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Thu, 10 Mar 2022 19:13:55 +0000
Subject: [PATCH 061/345] 8282314: nsk/jvmti/SuspendThread/suspendthrd003 may
 leak memory

Reviewed-by: dholmes, cjplummer, amenkov, lmesnik, mseledtsov
---
 .../nsk/jvmti/SuspendThread/suspendthrd003.java          | 5 ++++-
 test/hotspot/jtreg/vmTestbase/nsk/share/Log.java         | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003.java
index fd98b382d2a..e2a48a948e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,9 @@ public class suspendthrd003 extends DebugeeClass {
         int res = -1;
         long start_time = System.currentTimeMillis();
         while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
+            // Start each loop with a clear log buffer so we only
+            // track the run that can potentially fail:
+            log.clearLogBuffer();
             count++;
 
             // Original suspendthrd001 test block starts here:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java b/test/hotspot/jtreg/vmTestbase/nsk/share/Log.java
index 109c3ddd8f7..e171f6daa82 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -477,6 +477,13 @@ public class Log extends FinalizableObject {
 
     /////////////////////////////////////////////////////////////////
 
+    /**
+     * Clear all messages from log buffer.
+     */
+    public synchronized void clearLogBuffer() {
+        logBuffer.clear();
+    }
+
     /**
      * Print all messages from log buffer which were hidden because
      * of non-verbose mode,
-- 
GitLab


From a5a1a32db65b98f0d7bae20cf054be2fbbf2cf3a Mon Sep 17 00:00:00 2001
From: Yi Yang <yyang@openjdk.org>
Date: Fri, 11 Mar 2022 02:27:01 +0000
Subject: [PATCH 062/345] 8282883: Use JVM_LEAF to avoid ThreadStateTransition
 for some simple JVM entries

Reviewed-by: dholmes, shade
---
 src/hotspot/share/prims/jvm.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index d8a5a025b9d..f18fe51616c 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -487,7 +487,7 @@ JVM_ENTRY_NO_ENV(jint, JVM_ActiveProcessorCount(void))
   return os::active_processor_count();
 JVM_END
 
-JVM_ENTRY_NO_ENV(jboolean, JVM_IsUseContainerSupport(void))
+JVM_LEAF(jboolean, JVM_IsUseContainerSupport(void))
 #ifdef LINUX
   if (UseContainerSupport) {
     return JNI_TRUE;
@@ -690,7 +690,7 @@ JVM_ENTRY(void, JVM_ReportFinalizationComplete(JNIEnv * env, jobject finalizee))
   MANAGEMENT_ONLY(FinalizerService::on_complete(JNIHandles::resolve_non_null(finalizee), THREAD);)
 JVM_END
 
-JVM_ENTRY(jboolean, JVM_IsFinalizationEnabled(JNIEnv * env))
+JVM_LEAF(jboolean, JVM_IsFinalizationEnabled(JNIEnv * env))
   return InstanceKlass::is_finalization_enabled();
 JVM_END
 
@@ -3035,7 +3035,7 @@ JVM_ENTRY(void, JVM_SetThreadPriority(JNIEnv* env, jobject jthread, jint prio))
 JVM_END
 
 
-JVM_ENTRY(void, JVM_Yield(JNIEnv *env, jclass threadClass))
+JVM_LEAF(void, JVM_Yield(JNIEnv *env, jclass threadClass))
   if (os::dont_yield()) return;
   HOTSPOT_THREAD_YIELD();
   os::naked_yield();
@@ -3643,11 +3643,11 @@ JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env,
 #endif // INCLUDE_CDS
 JVM_END
 
-JVM_ENTRY(jboolean, JVM_IsCDSDumpingEnabled(JNIEnv* env))
+JVM_LEAF(jboolean, JVM_IsCDSDumpingEnabled(JNIEnv* env))
   return Arguments::is_dumping_archive();
 JVM_END
 
-JVM_ENTRY(jboolean, JVM_IsSharingEnabled(JNIEnv* env))
+JVM_LEAF(jboolean, JVM_IsSharingEnabled(JNIEnv* env))
   return UseSharedSpaces;
 JVM_END
 
@@ -3673,7 +3673,7 @@ JVM_ENTRY_NO_ENV(jlong, JVM_GetRandomSeedForDumping())
   }
 JVM_END
 
-JVM_ENTRY(jboolean, JVM_IsDumpingClassList(JNIEnv *env))
+JVM_LEAF(jboolean, JVM_IsDumpingClassList(JNIEnv *env))
 #if INCLUDE_CDS
   return ClassListWriter::is_enabled() || DynamicDumpSharedSpaces;
 #else
@@ -3782,7 +3782,7 @@ JVM_ENTRY(jobjectArray, JVM_DumpThreads(JNIEnv *env, jclass threadClass, jobject
 JVM_END
 
 // JVM monitoring and management support
-JVM_ENTRY_NO_ENV(void*, JVM_GetManagement(jint version))
+JVM_LEAF(void*, JVM_GetManagement(jint version))
   return Management::get_jmm_interface(version);
 JVM_END
 
@@ -3871,7 +3871,7 @@ JVM_ENTRY(jobjectArray, JVM_GetVmArguments(JNIEnv *env))
   return (jobjectArray) JNIHandles::make_local(THREAD, result_h());
 JVM_END
 
-JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
+JVM_LEAF(jint, JVM_FindSignal(const char *name))
   return os::get_signal_number(name);
 JVM_END
 
-- 
GitLab


From 88f0938c943bfacf748ddb0588a301c2cf7e941e Mon Sep 17 00:00:00 2001
From: Yi Yang <yyang@openjdk.org>
Date: Fri, 11 Mar 2022 02:28:07 +0000
Subject: [PATCH 063/345] 8272493: Suboptimal code generation around
 Preconditions.checkIndex intrinsic with AVX2

Reviewed-by: redestad, thartmann
---
 src/hotspot/share/opto/library_call.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 31d56fcd70e..f5c19d8123c 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -1092,7 +1092,6 @@ bool LibraryCallKit::inline_preconditions_checkIndex(BasicType bt) {
   result = _gvn.transform(result);
   set_result(result);
   replace_in_map(index, result);
-  clear_upper_avx();
   return true;
 }
 
-- 
GitLab


From 1a5a496aee0f4c33cb67b0853bbf23313fd6ec7d Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Fri, 11 Mar 2022 08:43:04 +0000
Subject: [PATCH 064/345] 8282763: G1: G1CardSetContainer remove intrusive-list
 details.

Reviewed-by: tschatzl, kbarrett, ayang
---
 .../share/gc/g1/g1CardSetContainers.hpp       | 29 ++-----------------
 .../gc/g1/g1CardSetContainers.inline.hpp      |  1 +
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
index 4f861baf4eb..6736a18ab02 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
@@ -30,11 +30,6 @@
 #include "runtime/atomic.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/spinYield.hpp"
-
-#include "logging/log.hpp"
-
-#include "runtime/thread.inline.hpp"
 
 // A helper class to encode a few card indexes within a CardSetPtr.
 //
@@ -143,18 +138,12 @@ public:
 // To maintain these constraints, live objects should have ((_ref_count & 0x1) == 1),
 // which requires that we increment the reference counts by 2 starting at _ref_count = 3.
 //
-// When such an object is on a free list, we reuse the same field for linking
-// together those free objects.
-//
 // All but inline pointers are of this kind. For those, card entries are stored
 // directly in the CardSetPtr of the ConcurrentHashTable node.
 class G1CardSetContainer {
-private:
-  union {
-    G1CardSetContainer* _next;
-    uintptr_t _ref_count;
-  };
-
+  uintptr_t _ref_count;
+protected:
+  ~G1CardSetContainer() = default;
 public:
   G1CardSetContainer() : _ref_count(3) { }
 
@@ -166,18 +155,6 @@ public:
   // to check the value after attempting to decrement.
   uintptr_t decrement_refcount();
 
-  G1CardSetContainer* next() {
-    return _next;
-  }
-
-  G1CardSetContainer** next_addr() {
-    return &_next;
-  }
-
-  void set_next(G1CardSetContainer* next) {
-    _next = next;
-  }
-
   // Log of largest card index that can be stored in any G1CardSetContainer
   static uint LogCardsPerRegionLimit;
 };
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
index 13e70302b02..73d84fbf934 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
@@ -29,6 +29,7 @@
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/spinYield.hpp"
 
 inline G1CardSetInlinePtr::CardSetPtr G1CardSetInlinePtr::merge(CardSetPtr orig_value, uint card_in_region, uint idx, uint bits_per_card) {
   assert((idx & (SizeFieldMask >> SizeFieldPos)) == idx, "Index %u too large to fit into size field", idx);
-- 
GitLab


From cab9def1c1ab28b0b1a8cf268d0853f6e2bfa77f Mon Sep 17 00:00:00 2001
From: Julian Waters <jwaters@openjdk.org>
Date: Fri, 11 Mar 2022 09:12:19 +0000
Subject: [PATCH 065/345] 8282700: Properly handle several --without options
 during configure

Reviewed-by: ihse
---
 make/autoconf/jdk-version.m4 | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/make/autoconf/jdk-version.m4 b/make/autoconf/jdk-version.m4
index b18e8a504ab..41f4b1fb121 100644
--- a/make/autoconf/jdk-version.m4
+++ b/make/autoconf/jdk-version.m4
@@ -72,7 +72,9 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # Setup username (for use in adhoc version strings etc)
   AC_ARG_WITH([build-user], [AS_HELP_STRING([--with-build-user],
       [build username to use in version strings])])
-  if test "x$with_build_user" != x; then
+  if test "x$with_build_user" = xyes || test "x$with_build_user" = xno; then
+    AC_MSG_ERROR([--with-build-user must have a value])
+  elif test "x$with_build_user" != x; then
     USERNAME="$with_build_user"
   else
     # Outer [ ] to quote m4.
@@ -84,7 +86,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_ARG_WITH(jdk-rc-name, [AS_HELP_STRING([--with-jdk-rc-name],
       [Set JDK RC name. This is used for FileDescription and ProductName properties
        of MS Windows binaries. @<:@not specified@:>@])])
-  if test "x$with_jdk_rc_name" = xyes; then
+  if test "x$with_jdk_rc_name" = xyes || test "x$with_jdk_rc_name" = xno; then
     AC_MSG_ERROR([--with-jdk-rc-name must have a value])
   elif [ ! [[ $with_jdk_rc_name =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-jdk-rc-name contains non-printing characters: $with_jdk_rc_name])
@@ -101,7 +103,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
       [Set vendor name. Among others, used to set the 'java.vendor'
        and 'java.vm.vendor' system properties. @<:@not specified@:>@])])
-  if test "x$with_vendor_name" = xyes; then
+  if test "x$with_vendor_name" = xyes || test "x$with_vendor_name" = xno; then
     AC_MSG_ERROR([--with-vendor-name must have a value])
   elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
@@ -115,7 +117,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # The vendor URL, if any
   AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url],
       [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
-  if test "x$with_vendor_url" = xyes; then
+  if test "x$with_vendor_url" = xyes || test "x$with_vendor_url" = xno; then
     AC_MSG_ERROR([--with-vendor-url must have a value])
   elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
@@ -129,7 +131,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # The vendor bug URL, if any
   AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url],
       [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
-  if test "x$with_vendor_bug_url" = xyes; then
+  if test "x$with_vendor_bug_url" = xyes || test "x$with_vendor_bug_url" = xno; then
     AC_MSG_ERROR([--with-vendor-bug-url must have a value])
   elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
@@ -143,7 +145,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # The vendor VM bug URL, if any
   AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url],
       [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])])
-  if test "x$with_vendor_vm_bug_url" = xyes; then
+  if test "x$with_vendor_vm_bug_url" = xyes || test "x$with_vendor_vm_bug_url" = xno; then
     AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
   elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
@@ -160,7 +162,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # override parts with more specific flags, since these are processed later.
   AC_ARG_WITH(version-string, [AS_HELP_STRING([--with-version-string],
       [Set version string @<:@calculated@:>@])])
-  if test "x$with_version_string" = xyes; then
+  if test "x$with_version_string" = xyes || test "x$with_version_string" = xno; then
     AC_MSG_ERROR([--with-version-string must have a value])
   elif test "x$with_version_string" != x; then
     # Additional [] needed to keep m4 from mangling shell constructs.
@@ -293,7 +295,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
       [with_version_feature_present=true], [with_version_feature_present=false])
 
   if test "x$with_version_feature_present" = xtrue; then
-    if test "x$with_version_feature" = xyes; then
+    if test "x$with_version_feature" = xyes || test "x$with_version_feature" = xno; then
       AC_MSG_ERROR([--with-version-feature must have a value])
     else
       JDKVER_CHECK_AND_SET_NUMBER(VERSION_FEATURE, $with_version_feature)
@@ -480,7 +482,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # The version date
   AC_ARG_WITH(version-date, [AS_HELP_STRING([--with-version-date],
       [Set version date @<:@current source value@:>@])])
-  if test "x$with_version_date" = xyes; then
+  if test "x$with_version_date" = xyes || test "x$with_version_date" = xno; then
     AC_MSG_ERROR([--with-version-date must have a value])
   elif test "x$with_version_date" != x; then
     if [ ! [[ $with_version_date =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]] ]; then
@@ -499,7 +501,10 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-version-string must have a value])
   elif [ ! [[ $with_vendor_version_string =~ ^[[:graph:]]*$ ]] ]; then
     AC_MSG_ERROR([--with--vendor-version-string contains non-graphical characters: $with_vendor_version_string])
-  else
+  elif test "x$with_vendor_version_string" != xno; then
+    # Set vendor version string if --without is not passed
+    # Check not required if an empty value is passed, since VENDOR_VERSION_STRING
+    # would then be set to ""
     VENDOR_VERSION_STRING="$with_vendor_version_string"
   fi
 
@@ -507,7 +512,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base],
       [Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names.
       @<:@not specified@:>@])])
-  if test "x$with_macosx_bundle_name_base" = xyes; then
+  if test "x$with_macosx_bundle_name_base" = xyes || test "x$with_macosx_bundle_name_base" = xno; then
     AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value])
   elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base])
@@ -521,7 +526,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base],
       [Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs.
       @<:@not specified@:>@])])
-  if test "x$with_macosx_bundle_id_base" = xyes; then
+  if test "x$with_macosx_bundle_id_base" = xyes || test "x$with_macosx_bundle_id_base" = xno; then
     AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value])
   elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base])
@@ -542,7 +547,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
       [Set the MacOSX Bundle CFBundleVersion field. This key is a machine-readable
       string composed of one to three period-separated integers and should represent the
       build version. Defaults to the build number.])])
-  if test "x$with_macosx_bundle_build_version" = xyes; then
+  if test "x$with_macosx_bundle_build_version" = xyes || test "x$with_macosx_bundle_build_version" = xno; then
     AC_MSG_ERROR([--with-macosx-bundle-build-version must have a value])
   elif [ ! [[ $with_macosx_bundle_build_version =~ ^[0-9\.]*$ ]] ]; then
     AC_MSG_ERROR([--with-macosx-bundle-build-version contains non numbers and periods: $with_macosx_bundle_build_version])
-- 
GitLab


From f99193ae3fe8b7bcba34a451890da37cab5ebffb Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Fri, 11 Mar 2022 09:58:22 +0000
Subject: [PATCH 066/345] 8282811: Typo in IAE details message of
 `RecordedObject.getValueDescriptor`

Reviewed-by: egahlin
---
 src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
index 9b24844734e..14d5ce4985f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
@@ -329,7 +329,7 @@ public class RecordedObject {
                 return v;
             }
         }
-        throw new IllegalArgumentException("\"Attempt to get unknown field \"" + name + "\"");
+        throw new IllegalArgumentException("Attempt to get unknown field \"" + name + "\"");
     }
 
     // Gets a value, but checks that type and name is correct first
-- 
GitLab


From 95ca94436d12974d98b1b999f9cc8408d64cbe3c Mon Sep 17 00:00:00 2001
From: Mahendra Chhipa <mahendra.chhipa@oracle.com>
Date: Fri, 11 Mar 2022 10:48:57 +0000
Subject: [PATCH 067/345] 8282354: Remove dependancy of TestHttpServer,
 HttpTransaction, HttpCallback from open/test/jdk/ tests

Reviewed-by: dfuchs
---
 .../net/ProxySelector/LoopbackAddresses.java  |  62 +-
 .../jdk/java/net/ProxySelector/ProxyTest.java |  61 +-
 test/jdk/java/net/URL/PerConnectionProxy.java |  68 +-
 test/jdk/java/net/URLConnection/B5052093.java |  67 +-
 test/jdk/sun/net/www/AuthHeaderTest.java      | 134 +--
 .../net/www/http/KeepAliveCache/B5045306.java |  80 +-
 .../net/www/httptest/AbstractCallback.java    |  82 --
 .../net/www/httptest/ClosedChannelList.java   |  77 --
 .../sun/net/www/httptest/HttpCallback.java    |  39 -
 .../sun/net/www/httptest/HttpTransaction.java | 330 --------
 .../sun/net/www/httptest/TestHttpServer.java  | 797 ------------------
 .../ssl/InputRecord/ClientHelloRead.java      |  20 +-
 12 files changed, 306 insertions(+), 1511 deletions(-)
 delete mode 100644 test/jdk/sun/net/www/httptest/AbstractCallback.java
 delete mode 100644 test/jdk/sun/net/www/httptest/ClosedChannelList.java
 delete mode 100644 test/jdk/sun/net/www/httptest/HttpCallback.java
 delete mode 100644 test/jdk/sun/net/www/httptest/HttpTransaction.java
 delete mode 100644 test/jdk/sun/net/www/httptest/TestHttpServer.java

diff --git a/test/jdk/java/net/ProxySelector/LoopbackAddresses.java b/test/jdk/java/net/ProxySelector/LoopbackAddresses.java
index cd5eb919b97..8e27185d518 100644
--- a/test/jdk/java/net/ProxySelector/LoopbackAddresses.java
+++ b/test/jdk/java/net/ProxySelector/LoopbackAddresses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,25 @@
  * @summary PIT: Can no launch jnlp application via 127.0.0.1 address on the web server.
  *          This test might fail intermittently as it needs a server that
  *          binds to the wildcard address.
- * @modules java.base/sun.net.www
- * @library ../../../sun/net/www/httptest/ /test/lib
- * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
+ * @library /test/lib
  * @compile LoopbackAddresses.java
  * @run main/othervm LoopbackAddresses
  */
 
-import java.net.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
+import java.nio.charset.Charset;
+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;
 
 /**
@@ -43,17 +53,8 @@ import jdk.test.lib.net.URIBuilder;
  * addresses when selecting proxies. This is the existing behaviour.
  */
 
-public class LoopbackAddresses implements HttpCallback {
-    static TestHttpServer server;
-
-    public void request (HttpTransaction req) {
-        req.setResponseEntityBody ("Hello .");
-        try {
-            req.sendResponse (200, "Ok");
-            req.orderlyClose();
-        } catch (IOException e) {
-        }
-    }
+public class LoopbackAddresses {
+    static HttpServer server;
 
     public static void main(String[] args) {
         try {
@@ -63,15 +64,17 @@ public class LoopbackAddresses implements HttpCallback {
             // to answer both for the loopback and "localhost".
             // Though "localhost" usually point to the loopback there is no
             // hard guarantee.
-            server = new TestHttpServer (new LoopbackAddresses(), 1, 10, 0);
-            ProxyServer pserver = new ProxyServer(InetAddress.getByName("localhost"), server.getLocalPort());
+            server = HttpServer.create(new InetSocketAddress(loopback, 0), 10, "/", new LoopbackAddressesHandler());
+            server.setExecutor(Executors.newSingleThreadExecutor());
+            server.start();
+            ProxyServer pserver = new ProxyServer(InetAddress.getByName("localhost"), server.getAddress().getPort());
             // start proxy server
             new Thread(pserver).start();
 
             System.setProperty("http.proxyHost", loopback.getHostAddress());
             System.setProperty("http.proxyPort", pserver.getPort()+"");
 
-            URL url = new URL("http://localhost:"+server.getLocalPort());
+            URL url = new URL("http://localhost:"+server.getAddress().getPort());
 
             try {
                 HttpURLConnection urlc = (HttpURLConnection)url.openConnection ();
@@ -85,7 +88,7 @@ public class LoopbackAddresses implements HttpCallback {
                 url = URIBuilder.newBuilder()
                       .scheme("http")
                       .host(loopback.getHostAddress())
-                      .port(server.getLocalPort())
+                      .port(server.getAddress().getPort())
                       .toURL();
                 HttpURLConnection urlc = (HttpURLConnection)url.openConnection ();
                 int respCode = urlc.getResponseCode();
@@ -97,7 +100,7 @@ public class LoopbackAddresses implements HttpCallback {
             throw new RuntimeException(e);
         } finally {
             if (server != null) {
-                server.terminate();
+                server.stop(1);
             }
         }
 
@@ -151,3 +154,18 @@ public class LoopbackAddresses implements HttpCallback {
         }
     }
 }
+
+class LoopbackAddressesHandler implements HttpHandler {
+
+    @Override
+    public void handle(HttpExchange exchange) throws IOException {
+        try {
+            exchange.sendResponseHeaders(200, 0);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        try(PrintWriter pw = new PrintWriter(exchange.getResponseBody(), false, Charset.forName("UTF-8"))) {
+            pw.print("Hello .");
+        }
+    }
+}
diff --git a/test/jdk/java/net/ProxySelector/ProxyTest.java b/test/jdk/java/net/ProxySelector/ProxyTest.java
index 8debe931469..179cc886c00 100644
--- a/test/jdk/java/net/ProxySelector/ProxyTest.java
+++ b/test/jdk/java/net/ProxySelector/ProxyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,37 @@
  * @test
  * @bug 4696512
  * @summary HTTP client: Improve proxy server configuration and selection
- * @modules java.base/sun.net.www
- * @library ../../../sun/net/www/httptest/ /test/lib
- * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
+ * @library /test/lib
  * @compile ProxyTest.java
  * @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 ProxyTest
  */
 
-import java.net.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.List;
+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;
 
-public class ProxyTest implements HttpCallback {
-    static TestHttpServer server;
+public class ProxyTest {
+    static HttpServer server;
 
     public ProxyTest() {
     }
 
-    public void request(HttpTransaction req) {
-        req.setResponseEntityBody("Hello .");
-        try {
-            req.sendResponse(200, "Ok");
-            req.orderlyClose();
-        } catch (IOException e) {
-        }
-    }
-
     static public class MyProxySelector extends ProxySelector {
         private static volatile URI lastURI;
         private final static List<Proxy> NO_PROXY = List.of(Proxy.NO_PROXY);
@@ -75,11 +79,13 @@ public class ProxyTest implements HttpCallback {
         ProxySelector.setDefault(new MyProxySelector());
         try {
             InetAddress loopback = InetAddress.getLoopbackAddress();
-            server = new TestHttpServer(new ProxyTest(), 1, 10, loopback, 0);
+            server = HttpServer.create(new InetSocketAddress(loopback, 0), 10, "/", new ProxyTestHandler());
+            server.setExecutor(Executors.newSingleThreadExecutor());
+            server.start();
             URL url = URIBuilder.newBuilder()
                       .scheme("http")
                       .loopback()
-                      .port(server.getLocalPort())
+                      .port(server.getAddress().getPort())
                       .toURL();
             System.out.println("client opening connection to: " + url);
             HttpURLConnection urlc = (HttpURLConnection)url.openConnection();
@@ -93,8 +99,23 @@ public class ProxyTest implements HttpCallback {
                 throw new RuntimeException(e);
         } finally {
             if (server != null) {
-                server.terminate();
+                server.stop(1);
             }
         }
     }
 }
+
+class ProxyTestHandler implements HttpHandler {
+
+    @Override
+    public void handle(HttpExchange exchange) throws IOException {
+        try {
+            exchange.sendResponseHeaders(200, 0);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        try(PrintWriter pw = new PrintWriter(exchange.getResponseBody(), false, Charset.forName("UTF-8"))) {
+            pw.print("Hello .");
+        }
+    }
+}
diff --git a/test/jdk/java/net/URL/PerConnectionProxy.java b/test/jdk/java/net/URL/PerConnectionProxy.java
index 6ce25b9a50e..1877e7cef28 100644
--- a/test/jdk/java/net/URL/PerConnectionProxy.java
+++ b/test/jdk/java/net/URL/PerConnectionProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,42 +24,47 @@
 /* @test
  * @bug 4920526
  * @summary Needs per connection proxy support for URLs
- * @modules java.base/sun.net.www
- * @library ../../../sun/net/www/httptest/ /test/lib
- * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
+ * @library /test/lib
  * @compile PerConnectionProxy.java
  * @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 PerConnectionProxy
  */
 
-import java.net.*;
-import java.io.*;
-
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
+import java.nio.charset.Charset;
+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;
 
-public class PerConnectionProxy implements HttpCallback {
-    static TestHttpServer server;
-
-    public void request (HttpTransaction req) {
-        req.setResponseEntityBody ("Hello .");
-        try {
-            req.sendResponse (200, "Ok");
-            req.orderlyClose();
-        } catch (IOException e) {
-        }
-    }
+public class PerConnectionProxy {
+    static HttpServer server;
 
     public static void main(String[] args) {
         try {
             InetAddress loopbackAddress = InetAddress.getLoopbackAddress();
-            server = new TestHttpServer(new PerConnectionProxy(), 1, 10, loopbackAddress, 0);
-            ProxyServer pserver = new ProxyServer(loopbackAddress, server.getLocalPort());
+            server = HttpServer.create(new InetSocketAddress(loopbackAddress, 0), 10, "/", new PerConnectionProxyHandler());
+            server.setExecutor(Executors.newSingleThreadExecutor());
+            server.start();
+            ProxyServer pserver = new ProxyServer(loopbackAddress, server.getAddress().getPort());
             // start proxy server
             new Thread(pserver).start();
 
             URL url = URIBuilder.newBuilder()
                     .scheme("http")
                     .loopback()
-                    .port(server.getLocalPort())
+                    .port(server.getAddress().getPort())
                     .toURLUnchecked();
 
             // for non existing proxy expect an IOException
@@ -73,7 +78,6 @@ public class PerConnectionProxy implements HttpCallback {
             } catch (IOException ioex) {
                 // expected
             }
-
             // for NO_PROXY, expect direct connection
             try {
                 HttpURLConnection urlc = (HttpURLConnection)url.openConnection (Proxy.NO_PROXY);
@@ -82,7 +86,6 @@ public class PerConnectionProxy implements HttpCallback {
             } catch (IOException ioex) {
                 throw new RuntimeException("direct connection should succeed :"+ioex.getMessage());
             }
-
             // for a normal proxy setting expect to see connection
             // goes through that proxy
             try {
@@ -101,10 +104,9 @@ public class PerConnectionProxy implements HttpCallback {
             throw new RuntimeException(e);
         } finally {
             if (server != null) {
-                server.terminate();
+                server.stop(1);
             }
         }
-
     }
 
     static class ProxyServer extends Thread {
@@ -145,7 +147,6 @@ public class PerConnectionProxy implements HttpCallback {
 
         private void processRequests() throws Exception {
             // connection set to the tunneling mode
-
             Socket serverSocket = new Socket(serverInetAddr, serverPort);
             ProxyTunnel clientToServer = new ProxyTunnel(
                                                          clientSocket, serverSocket);
@@ -161,7 +162,6 @@ public class PerConnectionProxy implements HttpCallback {
 
             clientToServer.close();
             serverToClient.close();
-
         }
 
         /**
@@ -221,6 +221,20 @@ public class PerConnectionProxy implements HttpCallback {
                 } catch (IOException ignored) { }
             }
         }
+    }
+}
 
+class PerConnectionProxyHandler implements HttpHandler {
+
+    @Override
+    public void handle(HttpExchange exchange) throws IOException {
+        try {
+            exchange.sendResponseHeaders(200, 0);
+        } catch (IOException e) {
+        }
+        try(PrintWriter pw = new PrintWriter(exchange.getResponseBody(), false, Charset.forName("UTF-8"))) {
+            pw.print("Hello .");
+        }
     }
 }
+
diff --git a/test/jdk/java/net/URLConnection/B5052093.java b/test/jdk/java/net/URLConnection/B5052093.java
index f5434f9528b..c93098f2de8 100644
--- a/test/jdk/java/net/URLConnection/B5052093.java
+++ b/test/jdk/java/net/URLConnection/B5052093.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,21 +23,31 @@
 
 /*
  * @test
+ * @modules java.base/sun.net.www.protocol.file
  * @bug 5052093
- * @modules java.base/sun.net.www java.base/sun.net.www.protocol.file
- * @library ../../../sun/net/www/httptest/
- * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
- * @run main B5052093
+ * @library /test/lib
+ * @run main/othervm B5052093
  * @summary URLConnection doesn't support large files
  */
-import java.net.*;
-import java.io.*;
-import sun.net.www.protocol.file.FileURLConnection;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.concurrent.Executors;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
 import static java.net.Proxy.NO_PROXY;
+import jdk.test.lib.net.URIBuilder;
+import sun.net.www.protocol.file.FileURLConnection;
 
-public class B5052093 implements HttpCallback {
-    private static TestHttpServer server;
-    private static long testSize = ((long) (Integer.MAX_VALUE)) + 2;
+public class B5052093 {
+    private static HttpServer server;
+    static long testSize = ((long) (Integer.MAX_VALUE)) + 2;
 
     public static class LargeFile extends File {
         public LargeFile() {
@@ -55,20 +65,18 @@ public class B5052093 implements HttpCallback {
         }
     }
 
-    public void request(HttpTransaction req) {
-        try {
-            req.setResponseHeader("content-length", Long.toString(testSize));
-            req.sendResponse(200, "OK");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
     public static void main(String[] args) throws Exception {
         InetAddress loopback = InetAddress.getLoopbackAddress();
-        server = new TestHttpServer(new B5052093(), 1, 10, loopback, 0);
+        server = HttpServer.create(new InetSocketAddress(loopback, 0), 10, "/", new B5052093Handler());
+        server.setExecutor(Executors.newSingleThreadExecutor());
+        server.start();
         try {
-            URL url = new URL("http://" + server.getAuthority() + "/foo");
+            URL url = URIBuilder.newBuilder()
+                    .scheme("http")
+                    .loopback()
+                    .port(server.getAddress().getPort())
+                    .path("/foo")
+                    .build().toURL();
             URLConnection conn = url.openConnection(NO_PROXY);
             int i = conn.getContentLength();
             long l = conn.getContentLengthLong();
@@ -89,7 +97,20 @@ public class B5052093 implements HttpCallback {
                 throw new RuntimeException("Wrong content-length from file");
             }
         } finally {
-            server.terminate();
+            server.stop(1);
+        }
+    }
+}
+
+class B5052093Handler implements HttpHandler {
+    @Override
+    public void handle(HttpExchange exchange) throws IOException {
+        try {
+            exchange.getResponseHeaders().set("content-length", Long.toString(B5052093.testSize));
+            exchange.sendResponseHeaders(200, 0);
+            exchange.close();
+        } catch (IOException e) {
+            e.printStackTrace();
         }
     }
 }
diff --git a/test/jdk/sun/net/www/AuthHeaderTest.java b/test/jdk/sun/net/www/AuthHeaderTest.java
index 53852aab8f1..ba1729cb7e6 100644
--- a/test/jdk/sun/net/www/AuthHeaderTest.java
+++ b/test/jdk/sun/net/www/AuthHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,53 +24,31 @@
 /**
  * @test
  * @bug 4804309
- * @modules java.base/sun.net.www
- * @library ../../../sun/net/www/httptest/
- * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
- * @run main AuthHeaderTest
+ * @library /test/lib
+ * @run main/othervm AuthHeaderTest
  * @summary AuthHeaderTest bug
  */
 
-import java.io.*;
-import java.net.*;
-
-public class AuthHeaderTest implements HttpCallback {
-
-    static int count = 0;
-    static String authstring;
-
-    void errorReply (HttpTransaction req, String reply) throws IOException {
-        req.addResponseHeader ("Connection", "close");
-        req.addResponseHeader ("Www-authenticate", reply);
-        req.sendResponse (401, "Unauthorized");
-        req.orderlyClose();
-    }
-
-    void okReply (HttpTransaction req) throws IOException {
-        req.setResponseEntityBody ("Hello .");
-        req.sendResponse (200, "Ok");
-        req.orderlyClose();
-    }
-
-    public void request (HttpTransaction req) {
-        try {
-            authstring = req.getRequestHeader ("Authorization");
-            System.out.println (authstring);
-            switch (count) {
-            case 0:
-                errorReply (req, "Basic realm=\"wallyworld\"");
-                break;
-            case 1:
-                /* client stores a username/pw for wallyworld
-                 */
-                okReply (req);
-                break;
-            }
-            count ++;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.net.Authenticator;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.Charset;
+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;
+
+public class AuthHeaderTest {
+    static HttpServer server;
 
     static void read (InputStream is) throws IOException {
         int c;
@@ -91,19 +69,27 @@ public class AuthHeaderTest implements HttpCallback {
         is.close();
     }
 
-    static TestHttpServer server;
-
     public static void main (String[] args) throws Exception {
         MyAuthenticator auth = new MyAuthenticator ();
         Authenticator.setDefault (auth);
         InetAddress loopback = InetAddress.getLoopbackAddress();
         try {
-            server = new TestHttpServer (new AuthHeaderTest(), 1, 10, loopback, 0);
-            System.out.println ("Server: listening on port: " + server.getAuthority());
-            client ("http://" + server.getAuthority() + "/d1/foo.html");
+            server = HttpServer.create(new InetSocketAddress(loopback, 0), 10, "/", new AuthHeaderTestHandler());
+            server.setExecutor(Executors.newSingleThreadExecutor());
+            server.start();
+            System.out.println ("Server: listening on port: " + server.getAddress().getPort());
+
+            String serverURL = URIBuilder.newBuilder()
+                    .scheme("http")
+                    .loopback()
+                    .port(server.getAddress().getPort())
+                    .path("/")
+                    .build()
+                    .toString();
+            client (serverURL + "d1/foo.html");
         } catch (Exception e) {
             if (server != null) {
-                server.terminate();
+                server.stop(1);
             }
             throw e;
         }
@@ -111,11 +97,11 @@ public class AuthHeaderTest implements HttpCallback {
         if (f != 1) {
             except ("Authenticator was called "+f+" times. Should be 1");
         }
-        server.terminate();
+        server.stop(1);
     }
 
     public static void except (String s) {
-        server.terminate();
+        server.stop(1);
         throw new RuntimeException (s);
     }
 
@@ -138,3 +124,45 @@ public class AuthHeaderTest implements HttpCallback {
         }
     }
 }
+
+class AuthHeaderTestHandler implements HttpHandler {
+    static int count = 0;
+    static String authstring;
+
+    void errorReply (HttpExchange req, String reply) throws IOException {
+        req.getResponseHeaders().set("Connection", "close");
+        req.getResponseHeaders().set("Www-authenticate", reply);
+        req.sendResponseHeaders(401, -1);
+    }
+
+    void okReply (HttpExchange req) throws IOException {
+        req.sendResponseHeaders (200, 0);
+        try(PrintWriter pw = new PrintWriter(req.getResponseBody(), false, Charset.forName("UTF-8"))) {
+            pw.print("Hello .");
+        }
+    }
+
+    @Override
+    public void handle(HttpExchange exchange) throws IOException {
+        try {
+            if(exchange.getRequestHeaders().get("Authorization") != null) {
+                authstring = exchange.getRequestHeaders().get("Authorization").get(0);
+                System.out.println (authstring);
+            }
+
+            switch (count) {
+                case 0:
+                    errorReply (exchange, "Basic realm=\"wallyworld\"");
+                    break;
+                case 1:
+                    /* client stores a username/pw for wallyworld
+                     */
+                    okReply (exchange);
+                    break;
+            }
+            count ++;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java b/test/jdk/sun/net/www/http/KeepAliveCache/B5045306.java
index d624741bc2c..ebfb550b826 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, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,30 @@
 /*
  * @test
  * @bug 5045306 6356004 6993490 8255124
- * @modules java.base/sun.net.www
- *          java.management
- * @library ../../httptest/
- * @build HttpCallback TestHttpServer HttpTransaction
+ * @library /test/lib
  * @run main/othervm B5045306
  * @summary Http keep-alive implementation is not efficient
  */
 
-import java.net.*;
-import java.io.*;
-import java.lang.management.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Executors;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
 
 /* Part 1:
  * The http client makes a connection to a URL whos content contains a lot of
@@ -51,20 +62,19 @@ import java.util.List;
  * Content-length header.
  */
 
-public class B5045306
-{
-    static SimpleHttpTransaction httpTrans;
-    static TestHttpServer server;
+public class B5045306 {
+    static HttpServer server;
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         startHttpServer();
         clientHttpCalls();
     }
 
     public static void startHttpServer() {
         try {
-            httpTrans = new SimpleHttpTransaction();
-            server = new TestHttpServer(httpTrans, 1, 10, InetAddress.getLocalHost(), 0);
+            server = HttpServer.create(new InetSocketAddress(InetAddress.getLocalHost(), 0), 10, "/", new SimpleHttpTransactionHandler());
+            server.setExecutor(Executors.newSingleThreadExecutor());
+            server.start();
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -76,10 +86,10 @@ public class B5045306
             uncaught.add(ex);
         });
         try {
-            System.out.println("http server listen on: " + server.getLocalPort());
+            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.getLocalPort() + "/";
+            String baseURLStr = "http://" + hostAddr + ":" + server.getAddress().getPort() + "/";
 
             URL bigDataURL = new URL (baseURLStr + "firstCall");
             URL smallDataURL = new URL (baseURLStr + "secondCall");
@@ -98,7 +108,7 @@ public class B5045306
             uc = (HttpURLConnection)smallDataURL.openConnection(Proxy.NO_PROXY);
             uc.getResponseCode();
 
-            if (SimpleHttpTransaction.failed)
+            if (SimpleHttpTransactionHandler.failed)
                 throw new RuntimeException("Failed: Initial Keep Alive Connection is not being reused");
 
             // Part 2
@@ -137,7 +147,7 @@ public class B5045306
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
-            server.terminate();
+            server.stop(1);
         }
         if (!uncaught.isEmpty()) {
             throw new RuntimeException("Unhandled exception:", uncaught.get(0));
@@ -145,9 +155,9 @@ public class B5045306
     }
 }
 
-class SimpleHttpTransaction implements HttpCallback
+class SimpleHttpTransactionHandler implements HttpHandler
 {
-    static boolean failed = false;
+    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.
@@ -155,48 +165,46 @@ class SimpleHttpTransaction implements HttpCallback
 
     int port1;
 
-    public void request(HttpTransaction trans) {
+    public void handle(HttpExchange trans) {
         try {
             String path = trans.getRequestURI().getPath();
             if (path.equals("/firstCall")) {
-                port1 = trans.channel().socket().getPort();
+                port1 = trans.getLocalAddress().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.setResponseEntityBody (responseBody, responseBody.length);
-                trans.sendResponse(200, "OK");
+                trans.sendResponseHeaders(200, 0);
+                try(PrintWriter pw = new PrintWriter(trans.getResponseBody(), false, Charset.forName("UTF-8"))) {
+                    pw.print(responseBody);
+                }
             } else if (path.equals("/secondCall")) {
-                int port2 = trans.channel().socket().getPort();
+                int port2 = trans.getLocalAddress().getPort();
                 System.out.println("Second connection on client port = " + port2);
 
                 if (port1 != port2)
                     failed = true;
 
-                trans.setResponseHeader ("Content-length", Integer.toString(0));
-
                  /* 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.sendResponse(200, "OK");
+                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;
-                trans.setResponseEntityBody (responseBody, responseBody.length);
-
                 // override the Content-length header to be greater than the actual response body
-                trans.setResponseHeader("Content-length", Integer.toString(responseBody.length+1));
-                trans.sendResponse(200, "OK");
-
+                trans.sendResponseHeaders(200, responseBody.length+1);
+                try(PrintWriter pw = new PrintWriter(trans.getResponseBody(), false, Charset.forName("UTF-8"))) {
+                    pw.print(responseBody);
+                }
                 // now close the socket
-                trans.channel().socket().close();
+                trans.close();
             }
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/test/jdk/sun/net/www/httptest/AbstractCallback.java b/test/jdk/sun/net/www/httptest/AbstractCallback.java
deleted file mode 100644
index 4fc60def96a..00000000000
--- a/test/jdk/sun/net/www/httptest/AbstractCallback.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.net.*;
-import java.util.*;
-import java.io.IOException;
-
-/**
- * This class provides a partial implementation of the HttpCallback
- * interface. Use this class if you want to use the requestURI as a means
- * of tracking multiple invocations of a request (on the server).
- * In this case, you implement the modified request() method, which includes
- * an integer count parameter. This parameter indicates the number of times
- * (starting at zero) the request URI has been received.
- */
-
-public abstract class AbstractCallback implements HttpCallback {
-
-    Map requests;
-
-    static class Request {
-        URI uri;
-        int count;
-
-        Request (URI u) {
-            uri = u;
-            count = 0;
-        }
-    }
-
-    AbstractCallback () {
-        requests = Collections.synchronizedMap (new HashMap());
-    }
-
-    /**
-     * handle the given request and generate an appropriate response.
-     * @param msg the transaction containing the request from the
-     *        client and used to send the response
-     */
-    public void request (HttpTransaction msg) {
-        URI uri = msg.getRequestURI();
-        Request req = (Request) requests.get (uri);
-        if (req == null) {
-            req = new Request (uri);
-            requests.put (uri, req);
-        }
-        request (msg, req.count++);
-    }
-
-    /**
-     * Same as HttpCallback interface except that the integer n
-     * is provided to indicate sequencing of repeated requests using
-     * the same request URI. n starts at zero and is incremented
-     * for each successive call.
-     *
-     * @param msg the transaction containing the request from the
-     *        client and used to send the response
-     * @param n value is 0 at first call, and is incremented by 1 for
-     *        each subsequent call using the same request URI.
-     */
-    abstract public void request (HttpTransaction msg, int n);
-}
diff --git a/test/jdk/sun/net/www/httptest/ClosedChannelList.java b/test/jdk/sun/net/www/httptest/ClosedChannelList.java
deleted file mode 100644
index dd7a07f7a42..00000000000
--- a/test/jdk/sun/net/www/httptest/ClosedChannelList.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.*;
-import java.nio.channels.*;
-import java.util.*;
-
-class ClosedChannelList {
-
-    static final long TIMEOUT = 10 * 1000; /* 10 sec */
-
-    static class Element {
-        long expiry;
-        SelectionKey key;
-        Element (long l, SelectionKey key) {
-            expiry = l;
-            this.key = key;
-        }
-    }
-
-    LinkedList list;
-
-    public ClosedChannelList () {
-        list = new LinkedList ();
-    }
-
-    /* close chan after TIMEOUT milliseconds */
-
-    public synchronized void add (SelectionKey key) {
-        long exp = System.currentTimeMillis () + TIMEOUT;
-        list.add (new Element (exp, key));
-    }
-
-    public synchronized void check () {
-        check (false);
-    }
-
-    public synchronized void terminate () {
-        check (true);
-    }
-
-    public synchronized void check (boolean forceClose) {
-        Iterator iter = list.iterator ();
-        long now = System.currentTimeMillis();
-        while (iter.hasNext ()) {
-            Element elm = (Element)iter.next();
-            if (forceClose || elm.expiry <= now) {
-                SelectionKey k = elm.key;
-                try {
-                    k.channel().close ();
-                } catch (IOException e) {}
-                k.cancel();
-                iter.remove();
-            }
-        }
-    }
-}
diff --git a/test/jdk/sun/net/www/httptest/HttpCallback.java b/test/jdk/sun/net/www/httptest/HttpCallback.java
deleted file mode 100644
index 27af7b7aaf4..00000000000
--- a/test/jdk/sun/net/www/httptest/HttpCallback.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * This interface is implemented by classes that wish to handle incoming HTTP
- * requests and generate responses. This could be a general purpose HTTP server
- * or a test case that expects specific requests from a client.
- * <p>
- * The incoming request fields can be examined via the {@link HttpTransaction}
- * object, and a response can also be generated and sent via the request object.
- */
-public interface HttpCallback {
-    /**
-     * handle the given request and generate an appropriate response.
-     * @param msg the transaction containing the request from the
-     *        client and used to send the response
-     */
-    void request (HttpTransaction msg);
-}
diff --git a/test/jdk/sun/net/www/httptest/HttpTransaction.java b/test/jdk/sun/net/www/httptest/HttpTransaction.java
deleted file mode 100644
index 781aacaff5b..00000000000
--- a/test/jdk/sun/net/www/httptest/HttpTransaction.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.net.*;
-import sun.net.www.MessageHeader;
-
-/**
- * This class encapsulates a HTTP request received and a response to be
- * generated in one transaction. It provides methods for examaining the
- * request from the client, and for building and sending a reply.
- */
-
-public class HttpTransaction {
-
-    String command;
-    URI requesturi;
-    TestHttpServer.Server server;
-    MessageHeader reqheaders, reqtrailers;
-    String reqbody;
-    byte[] rspbody;
-    MessageHeader rspheaders, rsptrailers;
-    SelectionKey  key;
-    int rspbodylen;
-    boolean rspchunked;
-
-    HttpTransaction (TestHttpServer.Server server, String command,
-                        URI requesturi, MessageHeader headers,
-                        String body, MessageHeader trailers, SelectionKey  key) {
-        this.command = command;
-        this.requesturi = requesturi;
-        this.reqheaders = headers;
-        this.reqbody = body;
-        this.reqtrailers = trailers;
-        this.key = key;
-        this.server = server;
-    }
-
-    /**
-     * Get the value of a request header whose name is specified by the
-     * String argument.
-     *
-     * @param key the name of the request header
-     * @return the value of the header or null if it does not exist
-     */
-    public String getRequestHeader (String key) {
-        return reqheaders.findValue (key);
-    }
-
-    /**
-     * Get the value of a response header whose name is specified by the
-     * String argument.
-     *
-     * @param key the name of the response header
-     * @return the value of the header or null if it does not exist
-     */
-    public String getResponseHeader (String key) {
-        return rspheaders.findValue (key);
-    }
-
-    /**
-     * Get the request URI
-     *
-     * @return the request URI
-     */
-    public URI getRequestURI () {
-        return requesturi;
-    }
-
-    public String toString () {
-        StringBuffer buf = new StringBuffer();
-        buf.append ("Request from: ").append (key.channel().toString()).append("\r\n");
-        buf.append ("Command: ").append (command).append("\r\n");
-        buf.append ("Request URI: ").append (requesturi).append("\r\n");
-        buf.append ("Headers: ").append("\r\n");
-        buf.append (reqheaders.toString()).append("\r\n");
-        buf.append ("Body: ").append (reqbody).append("\r\n");
-        buf.append ("---------Response-------\r\n");
-        buf.append ("Headers: ").append("\r\n");
-        if (rspheaders != null) {
-            buf.append (rspheaders.toString()).append("\r\n");
-        }
-        String rbody = rspbody == null? "": new String (rspbody);
-        buf.append ("Body: ").append (rbody).append("\r\n");
-        return new String (buf);
-    }
-
-    /**
-     * Get the value of a request trailer whose name is specified by
-     * the String argument.
-     *
-     * @param key the name of the request trailer
-     * @return the value of the trailer or null if it does not exist
-     */
-    public String getRequestTrailer (String key) {
-        return reqtrailers.findValue (key);
-    }
-
-    /**
-     * Add a response header to the response. Multiple calls with the same
-     * key value result in multiple header lines with the same key identifier
-     * @param key the name of the request header to add
-     * @param val the value of the header
-     */
-    public void addResponseHeader (String key, String val) {
-        if (rspheaders == null)
-            rspheaders = new MessageHeader ();
-        rspheaders.add (key, val);
-    }
-
-    /**
-     * Set a response header. Searches for first header with named key
-     * and replaces its value with val
-     * @param key the name of the request header to add
-     * @param val the value of the header
-     */
-    public void setResponseHeader (String key, String val) {
-        if (rspheaders == null)
-            rspheaders = new MessageHeader ();
-        rspheaders.set (key, val);
-    }
-
-    /**
-     * Add a response trailer to the response. Multiple calls with the same
-     * key value result in multiple trailer lines with the same key identifier
-     * @param key the name of the request trailer to add
-     * @param val the value of the trailer
-     */
-    public void addResponseTrailer (String key, String val) {
-        if (rsptrailers == null)
-            rsptrailers = new MessageHeader ();
-        rsptrailers.add (key, val);
-    }
-
-    /**
-     * Get the request method
-     *
-     * @return the request method
-     */
-    public String getRequestMethod (){
-        return command;
-    }
-
-    /**
-     * Perform an orderly close of the TCP connection associated with this
-     * request. This method guarantees that any response already sent will
-     * not be reset (by this end). The implementation does a shutdownOutput()
-     * of the TCP connection and for a period of time consumes and discards
-     * data received on the reading side of the connection. This happens
-     * in the background. After the period has expired the
-     * connection is completely closed.
-     */
-
-    public void orderlyClose () {
-        try {
-            server.orderlyCloseChannel (key);
-        } catch (IOException e) {
-            System.out.println (e);
-        }
-    }
-
-    /**
-     * Do an immediate abortive close of the TCP connection associated
-     * with this request.
-     */
-    public void abortiveClose () {
-        try {
-            server.abortiveCloseChannel(key);
-        } catch (IOException e) {
-            System.out.println (e);
-        }
-    }
-
-    /**
-     * Get the SocketChannel associated with this request
-     *
-     * @return the socket channel
-     */
-    public SocketChannel channel() {
-        return (SocketChannel) key.channel();
-    }
-
-    /**
-     * Get the request entity body associated with this request
-     * as a single String.
-     *
-     * @return the entity body in one String
-     */
-    public String getRequestEntityBody (){
-        return reqbody;
-    }
-
-    /**
-     * Set the entity response body with the given string
-     * The content length is set to the length of the string
-     * @param body the string to send in the response
-     */
-    public void setResponseEntityBody (String body){
-        rspbody = body.getBytes();
-        rspbodylen = body.length();
-        rspchunked = false;
-        addResponseHeader ("Content-length", Integer.toString (rspbodylen));
-    }
-    /**
-     * Set the entity response body with the given byte[]
-     * The content length is set to the gven length
-     * @param body the string to send in the response
-     */
-    public void setResponseEntityBody (byte[] body, int len){
-        rspbody = body;
-        rspbodylen = len;
-        rspchunked = false;
-        addResponseHeader ("Content-length", Integer.toString (rspbodylen));
-    }
-
-
-    /**
-     * Set the entity response body by reading the given inputstream
-     *
-     * @param is the inputstream from which to read the body
-     */
-    public void setResponseEntityBody (InputStream is) throws IOException {
-        byte[] buf = new byte [2048];
-        byte[] total = new byte [2048];
-        int total_len = 2048;
-        int c, len=0;
-        while ((c=is.read (buf)) != -1) {
-            if (len+c > total_len) {
-                byte[] total1 = new byte [total_len * 2];
-                System.arraycopy (total, 0, total1, 0, len);
-                total = total1;
-                total_len = total_len * 2;
-            }
-            System.arraycopy (buf, 0, total, len, c);
-            len += c;
-        }
-        setResponseEntityBody (total, len);
-    }
-
-    /* chunked */
-
-    /**
-     * Set the entity response body with the given array of strings
-     * The content encoding is set to "chunked" and each array element
-     * is sent as one chunk.
-     * @param body the array of string chunks to send in the response
-     */
-    public void setResponseEntityBody (String[] body) {
-        StringBuffer buf = new StringBuffer ();
-        int len = 0;
-        for (int i=0; i<body.length; i++) {
-            String chunklen = Integer.toHexString (body[i].length());
-            len += body[i].length();
-            buf.append (chunklen).append ("\r\n");
-            buf.append (body[i]).append ("\r\n");
-        }
-        buf.append ("0\r\n");
-        rspbody = new String (buf).getBytes();
-        rspbodylen = rspbody.length;
-        rspchunked = true;
-        addResponseHeader ("Transfer-encoding", "chunked");
-    }
-
-    /**
-     * Send the response with the current set of response parameters
-     * but using the response code and string tag line as specified
-     * @param rCode the response code to send
-     * @param rTag the response string to send with the response code
-     */
-    public void sendResponse (int rCode, String rTag) throws IOException {
-        OutputStream os = new TestHttpServer.NioOutputStream(channel());
-        PrintStream ps = new PrintStream (os);
-        ps.print ("HTTP/1.1 " + rCode + " " + rTag + "\r\n");
-        if (rspheaders != null) {
-            rspheaders.print (ps);
-        } else {
-            ps.print ("\r\n");
-        }
-        ps.flush ();
-        if (rspbody != null) {
-            os.write (rspbody, 0, rspbodylen);
-            os.flush();
-        }
-        if (rsptrailers != null) {
-            rsptrailers.print (ps);
-        } else if (rspchunked) {
-            ps.print ("\r\n");
-        }
-        ps.flush();
-    }
-
-    /* sends one byte less than intended */
-
-    public void sendPartialResponse (int rCode, String rTag)throws IOException {
-        OutputStream os = new TestHttpServer.NioOutputStream(channel());
-        PrintStream ps = new PrintStream (os);
-        ps.print ("HTTP/1.1 " + rCode + " " + rTag + "\r\n");
-        ps.flush();
-        if (rspbody != null) {
-            os.write (rspbody, 0, rspbodylen-1);
-            os.flush();
-        }
-        if (rsptrailers != null) {
-            rsptrailers.print (ps);
-        }
-        ps.flush();
-    }
-}
diff --git a/test/jdk/sun/net/www/httptest/TestHttpServer.java b/test/jdk/sun/net/www/httptest/TestHttpServer.java
deleted file mode 100644
index b29e6b8c7f5..00000000000
--- a/test/jdk/sun/net/www/httptest/TestHttpServer.java
+++ /dev/null
@@ -1,797 +0,0 @@
-/*
- * 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.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.net.*;
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import sun.net.www.MessageHeader;
-import java.util.*;
-
-/**
- * This class implements a simple HTTP server. It uses multiple threads to
- * handle connections in parallel, and also multiple connections/requests
- * can be handled per thread.
- * <p>
- * It must be instantiated with a {@link HttpCallback} object to which
- * requests are given and must be handled.
- * <p>
- * Simple synchronization between the client(s) and server can be done
- * using the {@link #waitForCondition(String)}, {@link #setCondition(String)} and
- * {@link #rendezvous(String,int)} methods.
- *
- * NOTE NOTE NOTE NOTE NOTE NOTE NOTE
- *
- * If changes are made here, please sure they are propagated to
- * the HTTPS equivalent in the JSSE regression test suite.
- *
- * NOTE NOTE NOTE NOTE NOTE NOTE NOTE
- */
-
-public class TestHttpServer {
-
-    ServerSocketChannel schan;
-    int threads;
-    int cperthread;
-    HttpCallback cb;
-    Server[] servers;
-
-    /**
-     * Create a <code>TestHttpServer<code> instance with the specified callback object
-     * for handling requests. One thread is created to handle requests,
-     * and up to ten TCP connections will be handled simultaneously.
-     * @param cb the callback object which is invoked to handle each
-     *  incoming request
-     */
-
-    public TestHttpServer (HttpCallback cb) throws IOException {
-        this (cb, 1, 10, 0);
-    }
-
-    /**
-     * Create a <code>TestHttpServer<code> instance with the specified callback object
-     * for handling requests. One thread is created to handle requests,
-     * and up to ten TCP connections will be handled simultaneously.
-     * @param cb the callback object which is invoked to handle each
-     *  incoming request
-     * @param address the address to bind the server to. <code>Null</code>
-     *  means bind to the wildcard address.
-     * @param port the port number to bind the server to. <code>Zero</code>
-     *  means choose any free port.
-     */
-
-    public TestHttpServer (HttpCallback cb, InetAddress address, int port) throws IOException {
-        this (cb, 1, 10, address, 0);
-    }
-
-    /**
-     * Create a <code>TestHttpServer<code> instance with the specified number of
-     * threads and maximum number of connections per thread. This functions
-     * the same as the 4 arg constructor, where the port argument is set to zero.
-     * @param cb the callback object which is invoked to handle each
-     *     incoming request
-     * @param threads the number of threads to create to handle requests
-     *     in parallel
-     * @param cperthread the number of simultaneous TCP connections to
-     *     handle per thread
-     */
-
-    public TestHttpServer (HttpCallback cb, int threads, int cperthread)
-        throws IOException {
-        this (cb, threads, cperthread, 0);
-    }
-
-    /**
-     * Create a <code>TestHttpServer<code> instance with the specified number
-     * of threads and maximum number of connections per thread and running on
-     * the specified port. The specified number of threads are created to
-     * handle incoming requests, and each thread is allowed
-     * to handle a number of simultaneous TCP connections.
-     * @param cb the callback object which is invoked to handle
-     *  each incoming request
-     * @param threads the number of threads to create to handle
-     *  requests in parallel
-     * @param cperthread the number of simultaneous TCP connections
-     *  to handle per thread
-     * @param port the port number to bind the server to. <code>Zero</code>
-     *  means choose any free port.
-     */
-
-    public TestHttpServer (HttpCallback cb, int threads, int cperthread, int port)
-            throws IOException {
-        this(cb, threads, cperthread, null, port);
-    }
-
-    /**
-     * Create a <code>TestHttpServer<code> instance with the specified number
-     * of threads and maximum number of connections per thread and running on
-     * the specified port. The specified number of threads are created to
-     * handle incoming requests, and each thread is allowed
-     * to handle a number of simultaneous TCP connections.
-     * @param cb the callback object which is invoked to handle
-     *  each incoming request
-     * @param threads the number of threads to create to handle
-     *  requests in parallel
-     * @param cperthread the number of simultaneous TCP connections
-     *  to handle per thread
-     * @param address the address to bind the server to. <code>Null</code>
-     *  means bind to the wildcard address.
-     * @param port the port number to bind the server to. <code>Zero</code>
-     *  means choose any free port.
-     */
-
-    public TestHttpServer (HttpCallback cb, int threads, int cperthread,
-                           InetAddress address, int port)
-        throws IOException {
-        schan = ServerSocketChannel.open ();
-        InetSocketAddress addr = new InetSocketAddress (address, port);
-        schan.socket().bind (addr);
-        this.threads = threads;
-        this.cb = cb;
-        this.cperthread = cperthread;
-        servers = new Server [threads];
-        for (int i=0; i<threads; i++) {
-            servers[i] = new Server (cb, schan, cperthread);
-            servers[i].start();
-        }
-    }
-
-    /**
-     * Tell all threads in the server to exit within 5 seconds.
-     * This is an abortive termination. Just prior to the thread exiting
-     * all channels in that thread waiting to be closed are forceably closed.
-     * @throws InterruptedException
-     */
-
-    public void terminate () {
-        for (int i=0; i<threads; i++) {
-            servers[i].terminate ();
-        }
-
-        for (int i = 0; i < threads; i++) {
-            try {
-                servers[i].join();
-            } catch (InterruptedException e) {
-                System.err.println("Unexpected InterruptedException during terminating server");
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    /**
-     * return the local port number to which the server is bound.
-     * @return the local port number
-     */
-
-    public int getLocalPort () {
-        return schan.socket().getLocalPort ();
-    }
-
-    public String getAuthority() {
-        InetAddress address = schan.socket().getInetAddress();
-        String hostaddr = address.getHostAddress();
-        if (address.isAnyLocalAddress()) hostaddr = "localhost";
-        if (hostaddr.indexOf(':') > -1) hostaddr = "[" + hostaddr + "]";
-        return hostaddr + ":" + getLocalPort();
-    }
-
-    static class Server extends Thread {
-
-        ServerSocketChannel schan;
-        Selector selector;
-        SelectionKey listenerKey;
-        SelectionKey key; /* the current key being processed */
-        HttpCallback cb;
-        ByteBuffer consumeBuffer;
-        int maxconn;
-        int nconn;
-        ClosedChannelList clist;
-        volatile boolean shutdown;
-
-        Server (HttpCallback cb, ServerSocketChannel schan, int maxconn) {
-            this.schan = schan;
-            this.maxconn = maxconn;
-            this.cb = cb;
-            nconn = 0;
-            consumeBuffer = ByteBuffer.allocate (512);
-            clist = new ClosedChannelList ();
-            try {
-                selector = Selector.open ();
-                schan.configureBlocking (false);
-                listenerKey = schan.register (selector, SelectionKey.OP_ACCEPT);
-            } catch (IOException e) {
-                System.err.println ("Server could not start: " + e);
-                throw new RuntimeException("Server could not start: " + e, e);
-            }
-        }
-
-        /* Stop the thread as soon as possible */
-        public void terminate () {
-            shutdown = true;
-        }
-
-        public void run ()  {
-            try {
-                while (true) {
-                    selector.select(1000);
-                    Set<SelectionKey> selected = selector.selectedKeys();
-                    Iterator<SelectionKey> iter = selected.iterator();
-                    while (iter.hasNext()) {
-                        key = iter.next();
-                        if (key.equals (listenerKey)) {
-                            SocketChannel sock = schan.accept ();
-                            if (sock == null) {
-                                /* false notification */
-                                iter.remove();
-                                continue;
-                            }
-                            sock.configureBlocking (false);
-                            sock.register (selector, SelectionKey.OP_READ);
-                            nconn ++;
-                            System.out.println("SERVER: new connection. chan[" + sock + "]");
-                            if (nconn == maxconn) {
-                                /* deregister */
-                                listenerKey.cancel ();
-                                listenerKey = null;
-                            }
-                        } else {
-                            if (key.isReadable()) {
-                                boolean closed;
-                                SocketChannel chan = (SocketChannel) key.channel();
-                                System.out.println("SERVER: connection readable. chan[" + chan + "]");
-                                if (key.attachment() != null) {
-                                    System.out.println("Server: consume");
-                                    closed = consume (chan);
-                                } else {
-                                    closed = read (chan, key);
-                                }
-                                if (closed) {
-                                    chan.close ();
-                                    key.cancel ();
-                                    if (nconn == maxconn) {
-                                        listenerKey = schan.register (selector, SelectionKey.OP_ACCEPT);
-                                    }
-                                    nconn --;
-                                }
-                            }
-                        }
-                        iter.remove();
-                    }
-                    clist.check();
-                    if (shutdown) {
-                        System.out.println("Force to Shutdown");
-                        SelectionKey sKey = schan.keyFor(selector);
-                        if (sKey != null) {
-                            sKey.cancel();
-                        }
-
-                        clist.terminate ();
-                        selector.close();
-                        schan.socket().close();
-                        schan.close();
-                        return;
-                    }
-                }
-            } catch (IOException e) {
-                System.out.println ("Server exception: " + e);
-                // TODO finish
-            }
-        }
-
-        /* read all the data off the channel without looking at it
-             * return true if connection closed
-             */
-        boolean consume (SocketChannel chan) {
-            try {
-                consumeBuffer.clear ();
-                int c = chan.read (consumeBuffer);
-                if (c == -1)
-                    return true;
-            } catch (IOException e) {
-                return true;
-            }
-            return false;
-        }
-
-        /* return true if the connection is closed, false otherwise */
-
-        private boolean read (SocketChannel chan, SelectionKey key) {
-            HttpTransaction msg;
-            boolean res;
-            try {
-                InputStream is = new BufferedInputStream (new NioInputStream (chan));
-                String requestline = readLine (is);
-                MessageHeader mhead = new MessageHeader (is);
-                String clen = mhead.findValue ("Content-Length");
-                String trferenc = mhead.findValue ("Transfer-Encoding");
-                String data = null;
-                if (trferenc != null && trferenc.equals ("chunked"))
-                    data = new String (readChunkedData (is));
-                else if (clen != null)
-                    data = new String (readNormalData (is, Integer.parseInt (clen)));
-                String[] req = requestline.split (" ");
-                if (req.length < 2) {
-                    /* invalid request line */
-                    return false;
-                }
-                String cmd = req[0];
-                URI uri = null;
-                try {
-                    uri = new URI (req[1]);
-                    msg = new HttpTransaction (this, cmd, uri, mhead, data, null, key);
-                    cb.request (msg);
-                } catch (URISyntaxException e) {
-                    System.err.println ("Invalid URI: " + e);
-                    msg = new HttpTransaction (this, cmd, null, null, null, null, key);
-                    msg.sendResponse (501, "Whatever");
-                }
-                res = false;
-            } catch (IOException e) {
-                res = true;
-            }
-            return res;
-        }
-
-        byte[] readNormalData (InputStream is, int len) throws IOException {
-            byte [] buf  = new byte [len];
-            int c, off=0, remain=len;
-            while (remain > 0 && ((c=is.read (buf, off, remain))>0)) {
-                remain -= c;
-                off += c;
-            }
-            return buf;
-        }
-
-        private void readCRLF(InputStream is) throws IOException {
-            int cr = is.read();
-            int lf = is.read();
-
-            if (((cr & 0xff) != 0x0d) ||
-                ((lf & 0xff) != 0x0a)) {
-                throw new IOException(
-                    "Expected <CR><LF>:  got '" + cr + "/" + lf + "'");
-            }
-        }
-
-        byte[] readChunkedData (InputStream is) throws IOException {
-            LinkedList l = new LinkedList ();
-            int total = 0;
-            for (int len=readChunkLen(is); len!=0; len=readChunkLen(is)) {
-                l.add (readNormalData(is, len));
-                total += len;
-                readCRLF(is);  // CRLF at end of chunk
-            }
-            readCRLF(is); // CRLF at end of Chunked Stream.
-            byte[] buf = new byte [total];
-            Iterator i = l.iterator();
-            int x = 0;
-            while (i.hasNext()) {
-                byte[] b = (byte[])i.next();
-                System.arraycopy (b, 0, buf, x, b.length);
-                x += b.length;
-            }
-            return buf;
-        }
-
-        private int readChunkLen (InputStream is) throws IOException {
-            int c, len=0;
-            boolean done=false, readCR=false;
-            while (!done) {
-                c = is.read ();
-                if (c == '\n' && readCR) {
-                    done = true;
-                } else {
-                    if (c == '\r' && !readCR) {
-                        readCR = true;
-                    } else {
-                        int x=0;
-                        if (c >= 'a' && c <= 'f') {
-                            x = c - 'a' + 10;
-                        } else if (c >= 'A' && c <= 'F') {
-                            x = c - 'A' + 10;
-                        } else if (c >= '0' && c <= '9') {
-                            x = c - '0';
-                        }
-                        len = len * 16 + x;
-                    }
-                }
-            }
-            return len;
-        }
-
-        private String readLine (InputStream is) throws IOException {
-            boolean done=false, readCR=false;
-            byte[] b = new byte [512];
-            int c, l = 0;
-
-            while (!done) {
-                c = is.read ();
-                if (c == '\n' && readCR) {
-                    done = true;
-                } else {
-                    if (c == '\r' && !readCR) {
-                        readCR = true;
-                    } else {
-                        b[l++] = (byte)c;
-                    }
-                }
-            }
-            return new String (b);
-        }
-
-        /** close the channel associated with the current key by:
-         * 1. shutdownOutput (send a FIN)
-         * 2. mark the key so that incoming data is to be consumed and discarded
-         * 3. After a period, close the socket
-         */
-
-        synchronized void orderlyCloseChannel (SelectionKey key) throws IOException {
-            SocketChannel ch = (SocketChannel)key.channel ();
-            System.out.println("SERVER: orderlyCloseChannel chan[" + ch + "]");
-            ch.socket().shutdownOutput();
-            key.attach (this);
-            clist.add (key);
-        }
-
-        synchronized void abortiveCloseChannel (SelectionKey key) throws IOException {
-            SocketChannel ch = (SocketChannel)key.channel ();
-            System.out.println("SERVER: abortiveCloseChannel chan[" + ch + "]");
-
-            Socket s = ch.socket ();
-            s.setSoLinger (true, 0);
-            ch.close();
-        }
-    }
-
-
-    /**
-     * Implements blocking reading semantics on top of a non-blocking channel
-     */
-
-    static class NioInputStream extends InputStream {
-        SocketChannel channel;
-        Selector selector;
-        ByteBuffer chanbuf;
-        SelectionKey key;
-        int available;
-        byte[] one;
-        boolean closed;
-        ByteBuffer markBuf; /* reads may be satisifed from this buffer */
-        boolean marked;
-        boolean reset;
-        int readlimit;
-
-        public NioInputStream (SocketChannel chan) throws IOException {
-            this.channel = chan;
-            selector = Selector.open();
-            chanbuf = ByteBuffer.allocate (1024);
-            key = chan.register (selector, SelectionKey.OP_READ);
-            available = 0;
-            one = new byte[1];
-            closed = marked = reset = false;
-        }
-
-        public synchronized int read (byte[] b) throws IOException {
-            return read (b, 0, b.length);
-        }
-
-        public synchronized int read () throws IOException {
-            return read (one, 0, 1);
-        }
-
-        public synchronized int read (byte[] b, int off, int srclen) throws IOException {
-
-            int canreturn, willreturn;
-
-            if (closed)
-                return -1;
-
-            if (reset) { /* satisfy from markBuf */
-                canreturn = markBuf.remaining ();
-                willreturn = canreturn>srclen ? srclen : canreturn;
-                markBuf.get(b, off, willreturn);
-                if (canreturn == willreturn) {
-                    reset = false;
-                }
-            } else { /* satisfy from channel */
-                canreturn = available();
-                if (canreturn == 0) {
-                    block ();
-                    canreturn = available();
-                }
-                willreturn = canreturn>srclen ? srclen : canreturn;
-                chanbuf.get(b, off, willreturn);
-                available -= willreturn;
-
-                if (marked) { /* copy into markBuf */
-                    try {
-                        markBuf.put (b, off, willreturn);
-                    } catch (BufferOverflowException e) {
-                        marked = false;
-                    }
-                }
-            }
-            return willreturn;
-        }
-
-        public synchronized int available () throws IOException {
-            if (closed)
-                throw new IOException ("Stream is closed");
-
-            if (reset)
-                return markBuf.remaining();
-
-            if (available > 0)
-                return available;
-
-            chanbuf.clear ();
-            available = channel.read (chanbuf);
-            if (available > 0)
-                chanbuf.flip();
-            else if (available == -1)
-                throw new IOException ("Stream is closed");
-            return available;
-        }
-
-        /**
-         * block() only called when available==0 and buf is empty
-         */
-        private synchronized void block () throws IOException {
-            //assert available == 0;
-            int n = selector.select ();
-            //assert n == 1;
-            selector.selectedKeys().clear();
-            available ();
-        }
-
-        public void close () throws IOException {
-            if (closed)
-                return;
-            channel.close ();
-            closed = true;
-        }
-
-        public synchronized void mark (int readlimit) {
-            if (closed)
-                return;
-            this.readlimit = readlimit;
-            markBuf = ByteBuffer.allocate (readlimit);
-            marked = true;
-            reset = false;
-        }
-
-        public synchronized void reset () throws IOException {
-            if (closed )
-                return;
-            if (!marked)
-                throw new IOException ("Stream not marked");
-            marked = false;
-            reset = true;
-            markBuf.flip ();
-        }
-    }
-
-    static class NioOutputStream extends OutputStream {
-        SocketChannel channel;
-        ByteBuffer buf;
-        SelectionKey key;
-        Selector selector;
-        boolean closed;
-        byte[] one;
-
-        public NioOutputStream (SocketChannel channel) throws IOException {
-            this.channel = channel;
-            selector = Selector.open ();
-            key = channel.register (selector, SelectionKey.OP_WRITE);
-            closed = false;
-            one = new byte [1];
-        }
-
-        public synchronized void write (int b) throws IOException {
-            one[0] = (byte)b;
-            write (one, 0, 1);
-        }
-
-        public synchronized void write (byte[] b) throws IOException {
-            write (b, 0, b.length);
-        }
-
-        public synchronized void write (byte[] b, int off, int len) throws IOException {
-            if (closed)
-                throw new IOException ("stream is closed");
-
-            buf = ByteBuffer.allocate (len);
-            buf.put (b, off, len);
-            buf.flip ();
-            int n;
-            while ((n = channel.write (buf)) < len) {
-                len -= n;
-                if (len == 0)
-                    return;
-                selector.select ();
-                selector.selectedKeys().clear ();
-            }
-        }
-
-        public void close () throws IOException {
-            if (closed)
-                return;
-            channel.close ();
-            closed = true;
-        }
-    }
-
-    /**
-     * Utilities for synchronization. A condition is
-     * identified by a string name, and is initialized
-     * upon first use (ie. setCondition() or waitForCondition()). Threads
-     * are blocked until some thread calls (or has called) setCondition() for the same
-     * condition.
-     * <P>
-     * A rendezvous built on a condition is also provided for synchronizing
-     * N threads.
-     */
-
-    private static HashMap conditions = new HashMap();
-
-    /*
-     * Modifiable boolean object
-     */
-    private static class BValue {
-        boolean v;
-    }
-
-    /*
-     * Modifiable int object
-     */
-    private static class IValue {
-        int v;
-        IValue (int i) {
-            v =i;
-        }
-    }
-
-
-    private static BValue getCond (String condition) {
-        synchronized (conditions) {
-            BValue cond = (BValue) conditions.get (condition);
-            if (cond == null) {
-                cond = new BValue();
-                conditions.put (condition, cond);
-            }
-            return cond;
-        }
-    }
-
-    /**
-     * Set the condition to true. Any threads that are currently blocked
-     * waiting on the condition, will be unblocked and allowed to continue.
-     * Threads that subsequently call waitForCondition() will not block.
-     * If the named condition did not exist prior to the call, then it is created
-     * first.
-     */
-
-    public static void setCondition (String condition) {
-        BValue cond = getCond (condition);
-        synchronized (cond) {
-            if (cond.v) {
-                return;
-            }
-            cond.v = true;
-            cond.notifyAll();
-        }
-    }
-
-    /**
-     * If the named condition does not exist, then it is created and initialized
-     * to false. If the condition exists or has just been created and its value
-     * is false, then the thread blocks until another thread sets the condition.
-     * If the condition exists and is already set to true, then this call returns
-     * immediately without blocking.
-     */
-
-    public static void waitForCondition (String condition) {
-        BValue cond = getCond (condition);
-        synchronized (cond) {
-            if (!cond.v) {
-                try {
-                    cond.wait();
-                } catch (InterruptedException e) {}
-            }
-        }
-    }
-
-    /* conditions must be locked when accessing this */
-    static HashMap rv = new HashMap();
-
-    /**
-     * Force N threads to rendezvous (ie. wait for each other) before proceeding.
-     * The first thread(s) to call are blocked until the last
-     * thread makes the call. Then all threads continue.
-     * <p>
-     * All threads that call with the same condition name, must use the same value
-     * for N (or the results may be not be as expected).
-     * <P>
-     * Obviously, if fewer than N threads make the rendezvous then the result
-     * will be a hang.
-     */
-
-    public static void rendezvous (String condition, int N) {
-        BValue cond;
-        IValue iv;
-        String name = "RV_"+condition;
-
-        /* get the condition */
-
-        synchronized (conditions) {
-            cond = (BValue)conditions.get (name);
-            if (cond == null) {
-                /* we are first caller */
-                if (N < 2) {
-                    throw new RuntimeException ("rendezvous must be called with N >= 2");
-                }
-                cond = new BValue ();
-                conditions.put (name, cond);
-                iv = new IValue (N-1);
-                rv.put (name, iv);
-            } else {
-                /* already initialised, just decrement the counter */
-                iv = (IValue) rv.get (name);
-                iv.v --;
-            }
-        }
-
-        if (iv.v > 0) {
-            waitForCondition (name);
-        } else {
-            setCondition (name);
-            synchronized (conditions) {
-                clearCondition (name);
-                rv.remove (name);
-            }
-        }
-    }
-
-    /**
-     * If the named condition exists and is set then remove it, so it can
-     * be re-initialized and used again. If the condition does not exist, or
-     * exists but is not set, then the call returns without doing anything.
-     * Note, some higher level synchronization
-     * may be needed between clear and the other operations.
-     */
-
-    public static void clearCondition(String condition) {
-        BValue cond;
-        synchronized (conditions) {
-            cond = (BValue) conditions.get (condition);
-            if (cond == null) {
-                return;
-            }
-            synchronized (cond) {
-                if (cond.v) {
-                    conditions.remove (condition);
-                }
-            }
-        }
-    }
-}
diff --git a/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java b/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java
index e08230f325d..06cba109139 100644
--- a/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java
+++ b/test/jdk/sun/security/ssl/InputRecord/ClientHelloRead.java
@@ -32,12 +32,22 @@
  *     system properties in samevm/agentvm mode.
  */
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.ServerSocket;
+import java.net.URL;
 import java.security.KeyStore;
-import javax.net.*;
-import javax.net.ssl.*;
-import java.security.cert.*;
+
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSession;
 
 /*
  * ClientHelloRead.java -- includes a simple server that can serve
-- 
GitLab


From 0fd09d383b9921f26d2d609ab330630a4520325a Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Fri, 11 Mar 2022 13:25:09 +0000
Subject: [PATCH 068/345] 8282978: Wrong parameter passed to GetStringXXXChars
 in various places

Reviewed-by: alanb, dfuchs
---
 src/java.base/unix/native/libnet/Inet4AddressImpl.c         | 4 ++--
 src/java.base/unix/native/libnet/Inet6AddressImpl.c         | 4 ++--
 src/java.base/windows/native/libnet/Inet4AddressImpl.c      | 4 ++--
 src/java.base/windows/native/libnet/Inet6AddressImpl.c      | 4 ++--
 src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c | 4 ++--
 .../windows/native/libawt/windows/awt_Button.cpp            | 6 +++---
 .../windows/native/libawt/windows/awt_Checkbox.cpp          | 6 +++---
 .../windows/native/libawt/windows/awt_Desktop.cpp           | 6 +++---
 .../windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp  | 6 +++---
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/java.base/unix/native/libnet/Inet4AddressImpl.c b/src/java.base/unix/native/libnet/Inet4AddressImpl.c
index bc6c859b841..0edebdbb3ba 100644
--- a/src/java.base/unix/native/libnet/Inet4AddressImpl.c
+++ b/src/java.base/unix/native/libnet/Inet4AddressImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,7 +100,7 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
         JNU_ThrowNullPointerException(env, "host argument is null");
         return NULL;
     }
-    hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
+    hostname = JNU_GetStringPlatformChars(env, host, NULL);
     CHECK_NULL_RETURN(hostname, NULL);
 
     // try once, with our static buffer
diff --git a/src/java.base/unix/native/libnet/Inet6AddressImpl.c b/src/java.base/unix/native/libnet/Inet6AddressImpl.c
index ed0ddbb562c..331151faeb5 100644
--- a/src/java.base/unix/native/libnet/Inet6AddressImpl.c
+++ b/src/java.base/unix/native/libnet/Inet6AddressImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -220,7 +220,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
         JNU_ThrowNullPointerException(env, "host argument is null");
         return NULL;
     }
-    hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
+    hostname = JNU_GetStringPlatformChars(env, host, NULL);
     CHECK_NULL_RETURN(hostname, NULL);
 
     // try once, with our static buffer
diff --git a/src/java.base/windows/native/libnet/Inet4AddressImpl.c b/src/java.base/windows/native/libnet/Inet4AddressImpl.c
index 75dfb57eb2f..33f379024c0 100644
--- a/src/java.base/windows/native/libnet/Inet4AddressImpl.c
+++ b/src/java.base/windows/native/libnet/Inet4AddressImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
         JNU_ThrowNullPointerException(env, "host argument is null");
         return NULL;
     }
-    hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
+    hostname = JNU_GetStringPlatformChars(env, host, NULL);
     CHECK_NULL_RETURN(hostname, NULL);
 
     // try once, with our static buffer
diff --git a/src/java.base/windows/native/libnet/Inet6AddressImpl.c b/src/java.base/windows/native/libnet/Inet6AddressImpl.c
index 87908775e99..a011b2fe5fa 100644
--- a/src/java.base/windows/native/libnet/Inet6AddressImpl.c
+++ b/src/java.base/windows/native/libnet/Inet6AddressImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
         JNU_ThrowNullPointerException(env, "host argument is null");
         return NULL;
     }
-    hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
+    hostname = JNU_GetStringPlatformChars(env, host, NULL);
     CHECK_NULL_RETURN(hostname, NULL);
 
     // try once, with our static buffer
diff --git a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
index 19173eb6052..851071db3e0 100644
--- a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
+++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -825,7 +825,7 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_SetProperty
     */
     if (!JNU_IsNull(env, jstr)) {
 #ifdef X_HAVE_UTF8_STRING
-        cname = (char *) (*env)->GetStringUTFChars(env, jstr, JNI_FALSE);
+        cname = (char *) (*env)->GetStringUTFChars(env, jstr, NULL);
 #else
         cname = (char *) JNU_GetStringPlatformChars(env, jstr, NULL);
 #endif
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp
index 1a7a89fdef4..3f019b0c278 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,7 +105,7 @@ AwtButton* AwtButton::Create(jobject self, jobject parent)
         if (label == NULL) {
             labelStr = L"";
         } else {
-            labelStr = JNU_GetStringPlatformChars(env, label, JNI_FALSE);
+            labelStr = JNU_GetStringPlatformChars(env, label, NULL);
         }
         style = 0;
 
@@ -311,7 +311,7 @@ void AwtButton::_SetLabel(void *param)
         if (label == NULL) {
             labelStr = TEXT("");
         } else {
-            labelStr = JNU_GetStringPlatformChars(env, label, JNI_FALSE);
+            labelStr = JNU_GetStringPlatformChars(env, label, NULL);
         }
 
         if (labelStr == NULL) {
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp
index d77ebb74a3e..5b004da95f2 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -106,7 +106,7 @@ AwtCheckbox* AwtCheckbox::Create(jobject peer, jobject parent)
 
             label = (jstring)env->GetObjectField(target, AwtCheckbox::labelID);
             if (label != NULL) {
-                labelStr = JNU_GetStringPlatformChars(env, label, 0);
+                labelStr = JNU_GetStringPlatformChars(env, label, NULL);
             }
             if (labelStr != 0) {
                 jint x = env->GetIntField(target, AwtComponent::xID);
@@ -375,7 +375,7 @@ void AwtCheckbox::_SetLabel(void *param)
         }
         else
         {
-            labelStr = JNU_GetStringPlatformChars(env, label, JNI_FALSE);
+            labelStr = JNU_GetStringPlatformChars(env, label, NULL);
         }
 
         if (labelStr == NULL)
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp
index 73b3c51c796..9cf2cea6fab 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,9 +75,9 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WDesktopPeer_init
 JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_ShellExecute
   (JNIEnv *env, jclass cls, jstring fileOrUri_j, jstring verb_j)
 {
-    LPCWSTR fileOrUri_c = JNU_GetStringPlatformChars(env, fileOrUri_j, JNI_FALSE);
+    LPCWSTR fileOrUri_c = JNU_GetStringPlatformChars(env, fileOrUri_j, NULL);
     CHECK_NULL_RETURN(fileOrUri_c, NULL);
-    LPCWSTR verb_c = JNU_GetStringPlatformChars(env, verb_j, JNI_FALSE);
+    LPCWSTR verb_c = JNU_GetStringPlatformChars(env, verb_j, NULL);
     if (verb_c == NULL) {
         JNU_ReleaseStringPlatformChars(env, fileOrUri_j, fileOrUri_c);
         return NULL;
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp
index 434050215a3..ab8ad1ddf9e 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -183,7 +183,7 @@ Java_sun_awt_Win32FontManager_registerFontWithPlatform(JNIEnv *env,
                                                        jclass cl,
                                                        jstring fontName)
 {
-    LPTSTR file = (LPTSTR)JNU_GetStringPlatformChars(env, fontName, JNI_FALSE);
+    LPTSTR file = (LPTSTR)JNU_GetStringPlatformChars(env, fontName, NULL);
     if (file) {
         ::AddFontResourceEx(file, FR_PRIVATE, NULL);
         JNU_ReleaseStringPlatformChars(env, fontName, file);
@@ -203,7 +203,7 @@ Java_sun_awt_Win32FontManager_deRegisterFontWithPlatform(JNIEnv *env,
                                                          jclass cl,
                                                          jstring fontName)
 {
-    LPTSTR file = (LPTSTR)JNU_GetStringPlatformChars(env, fontName, JNI_FALSE);
+    LPTSTR file = (LPTSTR)JNU_GetStringPlatformChars(env, fontName, NULL);
     if (file) {
         ::RemoveFontResourceEx(file, FR_PRIVATE, NULL);
         JNU_ReleaseStringPlatformChars(env, fontName, file);
-- 
GitLab


From 374193b6d2465a356941f9588a0ccf6d97cb76f6 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Fri, 11 Mar 2022 22:41:47 +0000
Subject: [PATCH 069/345] 8283041: [javadoc] Crashes using {@return} with
 @param

Reviewed-by: jjg
---
 .../jdk/javadoc/internal/doclint/Checker.java |  6 +++---
 .../doclet/testReturnTag/TestReturnTag.java   | 20 ++++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

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 446757513a1..6b167aa3933 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -985,8 +985,8 @@ public class Checker extends DocTreePathScanner<Void, Void> {
         }
         if (tree.isInline()) {
             DocCommentTree dct = getCurrentPath().getDocComment();
-            if (tree != dct.getFirstSentence().get(0)) {
-                env.messages.warning(REFERENCE, tree, "dc.return.not.first");
+            if (dct.getFirstSentence().isEmpty() || tree != dct.getFirstSentence().get(0)) {
+                env.messages.warning(SYNTAX, tree, "dc.return.not.first");
             }
         }
 
diff --git a/test/langtools/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java b/test/langtools/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java
index 00d5c92c630..4974f4e586e 100644
--- a/test/langtools/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testReturnTag/TestReturnTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4490068 8075778
+ * @bug      4490068 8075778 8283041
  * @summary  General tests for inline or block at-return tag
  * @library  /tools/lib ../../lib
  * @modules  jdk.javadoc/jdk.javadoc.internal.tool
@@ -265,16 +265,30 @@ public class TestReturnTag extends JavadocTester {
                          */
                         public int m() { return 0; }
                     }
+                    """,
+                """
+                    /** Comment. */
+                    public class X {
+                        /**
+                         * @author Jim
+                         * {@return the result}
+                         */
+                        public int m() { return 0; }
+                    }
                     """);
 
         javadoc("-d", base.resolve("out").toString(),
                 "-sourcepath", src.toString(),
-                src.resolve("C.java").toString());
+                src.resolve("C.java").toString(),
+                src.resolve("X.java").toString());
         checkExit(Exit.OK);
 
         checkOutput(Output.OUT, true,
                 "C.java:4: warning: {@return} not at beginning of description");
 
+        checkOutput(Output.OUT, true,
+                "X.java:5: warning: {@return} not at beginning of description");
+
         checkOutput("C.html", true,
                 """
                     <div class="block">Some text. Returns the result. More text.</div>
-- 
GitLab


From 5c408c1410e15087f735a815b7edc716d514b1b3 Mon Sep 17 00:00:00 2001
From: Joshua Zhu <jzhu@openjdk.org>
Date: Sat, 12 Mar 2022 04:04:28 +0000
Subject: [PATCH 070/345] 8282874: Bad performance on gather/scatter API caused
 by different IntSpecies of indexMap

Reviewed-by: psandoz
---
 .../classes/jdk/incubator/vector/ByteVector.java     | 12 ++++++------
 .../classes/jdk/incubator/vector/DoubleVector.java   | 12 ++++++------
 .../classes/jdk/incubator/vector/FloatVector.java    | 12 ++++++------
 .../classes/jdk/incubator/vector/IntVector.java      | 12 ++++++------
 .../classes/jdk/incubator/vector/LongVector.java     | 12 ++++++------
 .../classes/jdk/incubator/vector/ShortVector.java    | 12 ++++++------
 .../jdk/incubator/vector/X-Vector.java.template      | 12 ++++++------
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
index 5bd14c97601..c21fde386b9 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
@@ -4336,12 +4336,12 @@ public abstract class ByteVector extends AbstractVector<Byte> {
      */
     static ByteSpecies species(VectorShape s) {
         Objects.requireNonNull(s);
-        switch (s) {
-            case S_64_BIT: return (ByteSpecies) SPECIES_64;
-            case S_128_BIT: return (ByteSpecies) SPECIES_128;
-            case S_256_BIT: return (ByteSpecies) SPECIES_256;
-            case S_512_BIT: return (ByteSpecies) SPECIES_512;
-            case S_Max_BIT: return (ByteSpecies) SPECIES_MAX;
+        switch (s.switchKey) {
+            case VectorShape.SK_64_BIT: return (ByteSpecies) SPECIES_64;
+            case VectorShape.SK_128_BIT: return (ByteSpecies) SPECIES_128;
+            case VectorShape.SK_256_BIT: return (ByteSpecies) SPECIES_256;
+            case VectorShape.SK_512_BIT: return (ByteSpecies) SPECIES_512;
+            case VectorShape.SK_Max_BIT: return (ByteSpecies) SPECIES_MAX;
             default: throw new IllegalArgumentException("Bad shape: " + s);
         }
     }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
index aec717394ed..4d62284bb6e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
@@ -3963,12 +3963,12 @@ public abstract class DoubleVector extends AbstractVector<Double> {
      */
     static DoubleSpecies species(VectorShape s) {
         Objects.requireNonNull(s);
-        switch (s) {
-            case S_64_BIT: return (DoubleSpecies) SPECIES_64;
-            case S_128_BIT: return (DoubleSpecies) SPECIES_128;
-            case S_256_BIT: return (DoubleSpecies) SPECIES_256;
-            case S_512_BIT: return (DoubleSpecies) SPECIES_512;
-            case S_Max_BIT: return (DoubleSpecies) SPECIES_MAX;
+        switch (s.switchKey) {
+            case VectorShape.SK_64_BIT: return (DoubleSpecies) SPECIES_64;
+            case VectorShape.SK_128_BIT: return (DoubleSpecies) SPECIES_128;
+            case VectorShape.SK_256_BIT: return (DoubleSpecies) SPECIES_256;
+            case VectorShape.SK_512_BIT: return (DoubleSpecies) SPECIES_512;
+            case VectorShape.SK_Max_BIT: return (DoubleSpecies) SPECIES_MAX;
             default: throw new IllegalArgumentException("Bad shape: " + s);
         }
     }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
index c55df4b72bd..60da7eb57fc 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
@@ -3913,12 +3913,12 @@ public abstract class FloatVector extends AbstractVector<Float> {
      */
     static FloatSpecies species(VectorShape s) {
         Objects.requireNonNull(s);
-        switch (s) {
-            case S_64_BIT: return (FloatSpecies) SPECIES_64;
-            case S_128_BIT: return (FloatSpecies) SPECIES_128;
-            case S_256_BIT: return (FloatSpecies) SPECIES_256;
-            case S_512_BIT: return (FloatSpecies) SPECIES_512;
-            case S_Max_BIT: return (FloatSpecies) SPECIES_MAX;
+        switch (s.switchKey) {
+            case VectorShape.SK_64_BIT: return (FloatSpecies) SPECIES_64;
+            case VectorShape.SK_128_BIT: return (FloatSpecies) SPECIES_128;
+            case VectorShape.SK_256_BIT: return (FloatSpecies) SPECIES_256;
+            case VectorShape.SK_512_BIT: return (FloatSpecies) SPECIES_512;
+            case VectorShape.SK_Max_BIT: return (FloatSpecies) SPECIES_MAX;
             default: throw new IllegalArgumentException("Bad shape: " + s);
         }
     }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
index 312e1ad725a..e5033ac5366 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
@@ -4061,12 +4061,12 @@ public abstract class IntVector extends AbstractVector<Integer> {
      */
     static IntSpecies species(VectorShape s) {
         Objects.requireNonNull(s);
-        switch (s) {
-            case S_64_BIT: return (IntSpecies) SPECIES_64;
-            case S_128_BIT: return (IntSpecies) SPECIES_128;
-            case S_256_BIT: return (IntSpecies) SPECIES_256;
-            case S_512_BIT: return (IntSpecies) SPECIES_512;
-            case S_Max_BIT: return (IntSpecies) SPECIES_MAX;
+        switch (s.switchKey) {
+            case VectorShape.SK_64_BIT: return (IntSpecies) SPECIES_64;
+            case VectorShape.SK_128_BIT: return (IntSpecies) SPECIES_128;
+            case VectorShape.SK_256_BIT: return (IntSpecies) SPECIES_256;
+            case VectorShape.SK_512_BIT: return (IntSpecies) SPECIES_512;
+            case VectorShape.SK_Max_BIT: return (IntSpecies) SPECIES_MAX;
             default: throw new IllegalArgumentException("Bad shape: " + s);
         }
     }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
index 513178181f4..37ba7189679 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
@@ -3987,12 +3987,12 @@ public abstract class LongVector extends AbstractVector<Long> {
      */
     static LongSpecies species(VectorShape s) {
         Objects.requireNonNull(s);
-        switch (s) {
-            case S_64_BIT: return (LongSpecies) SPECIES_64;
-            case S_128_BIT: return (LongSpecies) SPECIES_128;
-            case S_256_BIT: return (LongSpecies) SPECIES_256;
-            case S_512_BIT: return (LongSpecies) SPECIES_512;
-            case S_Max_BIT: return (LongSpecies) SPECIES_MAX;
+        switch (s.switchKey) {
+            case VectorShape.SK_64_BIT: return (LongSpecies) SPECIES_64;
+            case VectorShape.SK_128_BIT: return (LongSpecies) SPECIES_128;
+            case VectorShape.SK_256_BIT: return (LongSpecies) SPECIES_256;
+            case VectorShape.SK_512_BIT: return (LongSpecies) SPECIES_512;
+            case VectorShape.SK_Max_BIT: return (LongSpecies) SPECIES_MAX;
             default: throw new IllegalArgumentException("Bad shape: " + s);
         }
     }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
index 511e10a6563..8c6dd4718f7 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
@@ -4330,12 +4330,12 @@ public abstract class ShortVector extends AbstractVector<Short> {
      */
     static ShortSpecies species(VectorShape s) {
         Objects.requireNonNull(s);
-        switch (s) {
-            case S_64_BIT: return (ShortSpecies) SPECIES_64;
-            case S_128_BIT: return (ShortSpecies) SPECIES_128;
-            case S_256_BIT: return (ShortSpecies) SPECIES_256;
-            case S_512_BIT: return (ShortSpecies) SPECIES_512;
-            case S_Max_BIT: return (ShortSpecies) SPECIES_MAX;
+        switch (s.switchKey) {
+            case VectorShape.SK_64_BIT: return (ShortSpecies) SPECIES_64;
+            case VectorShape.SK_128_BIT: return (ShortSpecies) SPECIES_128;
+            case VectorShape.SK_256_BIT: return (ShortSpecies) SPECIES_256;
+            case VectorShape.SK_512_BIT: return (ShortSpecies) SPECIES_512;
+            case VectorShape.SK_Max_BIT: return (ShortSpecies) SPECIES_MAX;
             default: throw new IllegalArgumentException("Bad shape: " + s);
         }
     }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
index 16d2dbea06e..6c5ed6b9c13 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
@@ -5543,12 +5543,12 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
      */
     static $Type$Species species(VectorShape s) {
         Objects.requireNonNull(s);
-        switch (s) {
-            case S_64_BIT: return ($Type$Species) SPECIES_64;
-            case S_128_BIT: return ($Type$Species) SPECIES_128;
-            case S_256_BIT: return ($Type$Species) SPECIES_256;
-            case S_512_BIT: return ($Type$Species) SPECIES_512;
-            case S_Max_BIT: return ($Type$Species) SPECIES_MAX;
+        switch (s.switchKey) {
+            case VectorShape.SK_64_BIT: return ($Type$Species) SPECIES_64;
+            case VectorShape.SK_128_BIT: return ($Type$Species) SPECIES_128;
+            case VectorShape.SK_256_BIT: return ($Type$Species) SPECIES_256;
+            case VectorShape.SK_512_BIT: return ($Type$Species) SPECIES_512;
+            case VectorShape.SK_Max_BIT: return ($Type$Species) SPECIES_MAX;
             default: throw new IllegalArgumentException("Bad shape: " + s);
         }
     }
-- 
GitLab


From 3cf83a671eaedd78d87197dffa76dcc3fededb78 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Mon, 14 Mar 2022 03:17:57 +0000
Subject: [PATCH 071/345] 8282572: EnumSet should be a sealed class

Reviewed-by: sundar
---
 src/java.base/share/classes/java/util/EnumSet.java        | 6 +++---
 src/java.base/share/classes/java/util/JumboEnumSet.java   | 4 ++--
 src/java.base/share/classes/java/util/RegularEnumSet.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/java/util/EnumSet.java b/src/java.base/share/classes/java/util/EnumSet.java
index ee475ba338a..3776cedd5bb 100644
--- a/src/java.base/share/classes/java/util/EnumSet.java
+++ b/src/java.base/share/classes/java/util/EnumSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,8 +76,8 @@ import jdk.internal.access.SharedSecrets;
  * @since 1.5
  * @see EnumMap
  */
-public abstract class EnumSet<E extends Enum<E>> extends AbstractSet<E>
-    implements Cloneable, java.io.Serializable
+public abstract sealed class EnumSet<E extends Enum<E>> extends AbstractSet<E>
+    implements Cloneable, java.io.Serializable permits JumboEnumSet, RegularEnumSet
 {
     // declare EnumSet.class serialization compatibility with JDK 8
     @java.io.Serial
diff --git a/src/java.base/share/classes/java/util/JumboEnumSet.java b/src/java.base/share/classes/java/util/JumboEnumSet.java
index f80e5056803..126fc077b6c 100644
--- a/src/java.base/share/classes/java/util/JumboEnumSet.java
+++ b/src/java.base/share/classes/java/util/JumboEnumSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ package java.util;
  * @since 1.5
  * @serial exclude
  */
-class JumboEnumSet<E extends Enum<E>> extends EnumSet<E> {
+final class JumboEnumSet<E extends Enum<E>> extends EnumSet<E> {
     @java.io.Serial
     private static final long serialVersionUID = 334349849919042784L;
 
diff --git a/src/java.base/share/classes/java/util/RegularEnumSet.java b/src/java.base/share/classes/java/util/RegularEnumSet.java
index 1deda8a2935..f06adcbf692 100644
--- a/src/java.base/share/classes/java/util/RegularEnumSet.java
+++ b/src/java.base/share/classes/java/util/RegularEnumSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ package java.util;
  * @since 1.5
  * @serial exclude
  */
-class RegularEnumSet<E extends Enum<E>> extends EnumSet<E> {
+final class RegularEnumSet<E extends Enum<E>> extends EnumSet<E> {
     @java.io.Serial
     private static final long serialVersionUID = 3411599620347842686L;
     /**
-- 
GitLab


From fde31498963d76630ada31bd0e0cf3035f87445b Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Mon, 14 Mar 2022 07:11:23 +0000
Subject: [PATCH 072/345] 8281375: Accelerate bitCount operation for AVX2 and
 AVX512 target.

Reviewed-by: sviswanathan, thartmann
---
 src/hotspot/cpu/aarch64/matcher_aarch64.hpp   |  6 ++
 src/hotspot/cpu/arm/matcher_arm.hpp           |  5 ++
 src/hotspot/cpu/ppc/matcher_ppc.hpp           |  6 ++
 src/hotspot/cpu/s390/matcher_s390.hpp         |  5 ++
 src/hotspot/cpu/x86/assembler_x86.cpp         | 22 ++++-
 src/hotspot/cpu/x86/assembler_x86.hpp         |  7 ++
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 88 +++++++++++++++++++
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp |  8 ++
 src/hotspot/cpu/x86/matcher_x86.hpp           |  9 ++
 src/hotspot/cpu/x86/stubGenerator_x86_32.cpp  | 29 ++++++
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  | 20 +++++
 src/hotspot/cpu/x86/stubRoutines_x86.cpp      |  1 +
 src/hotspot/cpu/x86/stubRoutines_x86.hpp      |  4 +
 src/hotspot/cpu/x86/x86.ad                    | 60 +++++++++++--
 src/hotspot/share/opto/loopTransform.cpp      |  7 ++
 .../vectorization/TestPopCountVectorLong.java |  3 +-
 16 files changed, 268 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
index aca82240a57..c2f801f408a 100644
--- a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
@@ -163,4 +163,10 @@
   // Implements a variant of EncodeISOArrayNode that encode ASCII only
   static const bool supports_encode_ascii_array = true;
 
+  // Returns pre-selection estimated size of a vector operation.
+  static int vector_op_pre_select_sz_estimate(int vopc, BasicType ety, int vlen) {
+    return 0;
+  }
+
+
 #endif // CPU_AARCH64_MATCHER_AARCH64_HPP
diff --git a/src/hotspot/cpu/arm/matcher_arm.hpp b/src/hotspot/cpu/arm/matcher_arm.hpp
index 7552b014c06..496ea27c086 100644
--- a/src/hotspot/cpu/arm/matcher_arm.hpp
+++ b/src/hotspot/cpu/arm/matcher_arm.hpp
@@ -155,4 +155,9 @@
   // Implements a variant of EncodeISOArrayNode that encode ASCII only
   static const bool supports_encode_ascii_array = false;
 
+  // Returns pre-selection estimated cost of a vector operation.
+  static int vector_op_pre_select_sz_estimate(int vopc, BasicType ety, int vlen) {
+    return 0;
+  }
+
 #endif // CPU_ARM_MATCHER_ARM_HPP
diff --git a/src/hotspot/cpu/ppc/matcher_ppc.hpp b/src/hotspot/cpu/ppc/matcher_ppc.hpp
index df2074dee24..069c40485fe 100644
--- a/src/hotspot/cpu/ppc/matcher_ppc.hpp
+++ b/src/hotspot/cpu/ppc/matcher_ppc.hpp
@@ -164,4 +164,10 @@
   // Implements a variant of EncodeISOArrayNode that encode ASCII only
   static const bool supports_encode_ascii_array = true;
 
+  // Returns pre-selection estimated cost of a vector operation.
+  static int vector_op_pre_select_sz_estimate(int vopc, BasicType ety, int vlen) {
+    return 0;
+  }
+
+
 #endif // CPU_PPC_MATCHER_PPC_HPP
diff --git a/src/hotspot/cpu/s390/matcher_s390.hpp b/src/hotspot/cpu/s390/matcher_s390.hpp
index ac55bd84dff..5c56ec5373b 100644
--- a/src/hotspot/cpu/s390/matcher_s390.hpp
+++ b/src/hotspot/cpu/s390/matcher_s390.hpp
@@ -153,4 +153,9 @@
   // Implements a variant of EncodeISOArrayNode that encode ASCII only
   static const bool supports_encode_ascii_array = true;
 
+  // Returns pre-selection estimated cost of a vector operation.
+  static int vector_op_pre_select_sz_estimate(int vopc, BasicType ety, int vlen) {
+    return 0;
+  }
+
 #endif // CPU_S390_MATCHER_S390_HPP
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index be8c18b0710..03229421305 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -8317,8 +8317,28 @@ void Assembler::vpbroadcastw(XMMRegister dst, Address src, int vector_len) {
   emit_operand(dst, src);
 }
 
-// xmm/mem sourced byte/word/dword/qword replicate
+void Assembler::vpsadbw(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) {
+  assert(UseAVX > 0, "requires some form of AVX");
+  InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
+  int encode = vex_prefix_and_encode(dst->encoding(), nds->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int16((unsigned char)0xF6, (0xC0 | encode));
+}
+
+void Assembler::vpunpckhdq(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) {
+  assert(UseAVX > 0, "requires some form of AVX");
+  InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  int encode = vex_prefix_and_encode(dst->encoding(), nds->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x6A, (0xC0 | encode));
+}
 
+void Assembler::vpunpckldq(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) {
+  assert(UseAVX > 0, "requires some form of AVX");
+  InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  int encode = vex_prefix_and_encode(dst->encoding(), nds->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x62, (0xC0 | encode));
+}
+
+// xmm/mem sourced byte/word/dword/qword replicate
 void Assembler::evpaddb(XMMRegister dst, KRegister mask, XMMRegister nds, XMMRegister src, bool merge, int vector_len) {
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index f21dd901c5d..3256b990cf7 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1933,10 +1933,17 @@ private:
   // Interleave Low Doublewords
   void punpckldq(XMMRegister dst, XMMRegister src);
   void punpckldq(XMMRegister dst, Address src);
+  void vpunpckldq(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len);
+
+  // Interleave High Doublewords
+  void vpunpckhdq(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len);
 
   // Interleave Low Quadwords
   void punpcklqdq(XMMRegister dst, XMMRegister src);
 
+  // Vector sum of absolute difference.
+  void vpsadbw(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len);
+
 #ifndef _LP64 // no 32bit push/pop on amd64
   void pushl(Address src);
 #endif
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 400bcec45e2..f3f684b1b25 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -4321,6 +4321,94 @@ void C2_MacroAssembler::vector_maskall_operation(KRegister dst, Register src, in
   }
 }
 
+
+//
+// Following is lookup table based popcount computation algorithm:-
+//       Index   Bit set count
+//     [ 0000 ->   0,
+//       0001 ->   1,
+//       0010 ->   1,
+//       0011 ->   2,
+//       0100 ->   1,
+//       0101 ->   2,
+//       0110 ->   2,
+//       0111 ->   3,
+//       1000 ->   1,
+//       1001 ->   2,
+//       1010 ->   3,
+//       1011 ->   3,
+//       1100 ->   2,
+//       1101 ->   3,
+//       1111 ->   4 ]
+//  a. Count the number of 1s in 4 LSB bits of each byte. These bits are used as
+//     shuffle indices for lookup table access.
+//  b. Right shift each byte of vector lane by 4 positions.
+//  c. Count the number of 1s in 4 MSB bits each byte. These bits are used as
+//     shuffle indices for lookup table access.
+//  d. Add the bitset count of upper and lower 4 bits of each byte.
+//  e. Unpack double words to quad words and compute sum of absolute difference of bitset
+//     count of all the bytes of a quadword.
+//  f. Perform step e. for upper 128bit vector lane.
+//  g. Pack the bitset count of quadwords back to double word.
+//  h. Unpacking and packing operations are not needed for 64bit vector lane.
+void C2_MacroAssembler::vector_popcount_int(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                                            XMMRegister xtmp2, XMMRegister xtmp3, Register rtmp,
+                                            int vec_enc) {
+  if (VM_Version::supports_avx512_vpopcntdq()) {
+    vpopcntd(dst, src, vec_enc);
+  } else {
+    assert((vec_enc == Assembler::AVX_512bit && VM_Version::supports_avx512bw()) || VM_Version::supports_avx2(), "");
+    movl(rtmp, 0x0F0F0F0F);
+    movdl(xtmp1, rtmp);
+    vpbroadcastd(xtmp1, xtmp1, vec_enc);
+    if (Assembler::AVX_512bit == vec_enc) {
+      evmovdqul(xtmp2, k0, ExternalAddress(StubRoutines::x86::vector_popcount_lut()), false, vec_enc, rtmp);
+    } else {
+      vmovdqu(xtmp2, ExternalAddress(StubRoutines::x86::vector_popcount_lut()), rtmp);
+    }
+    vpand(xtmp3, src, xtmp1, vec_enc);
+    vpshufb(xtmp3, xtmp2, xtmp3, vec_enc);
+    vpsrlw(dst, src, 4, vec_enc);
+    vpand(dst, dst, xtmp1, vec_enc);
+    vpshufb(dst, xtmp2, dst, vec_enc);
+    vpaddb(xtmp3, dst, xtmp3, vec_enc);
+    vpxor(xtmp1, xtmp1, xtmp1, vec_enc);
+    vpunpckhdq(dst, xtmp3, xtmp1, vec_enc);
+    vpsadbw(dst, dst, xtmp1, vec_enc);
+    vpunpckldq(xtmp2, xtmp3, xtmp1, vec_enc);
+    vpsadbw(xtmp2, xtmp2, xtmp1, vec_enc);
+    vpackuswb(dst, xtmp2, dst, vec_enc);
+  }
+}
+
+void C2_MacroAssembler::vector_popcount_long(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                                             XMMRegister xtmp2, XMMRegister xtmp3, Register rtmp,
+                                             int vec_enc) {
+  if (VM_Version::supports_avx512_vpopcntdq()) {
+    vpopcntq(dst, src, vec_enc);
+  } else if (vec_enc == Assembler::AVX_512bit) {
+    assert(VM_Version::supports_avx512bw(), "");
+    movl(rtmp, 0x0F0F0F0F);
+    movdl(xtmp1, rtmp);
+    vpbroadcastd(xtmp1, xtmp1, vec_enc);
+    evmovdqul(xtmp2, k0, ExternalAddress(StubRoutines::x86::vector_popcount_lut()), true, vec_enc, rtmp);
+    vpandq(xtmp3, src, xtmp1, vec_enc);
+    vpshufb(xtmp3, xtmp2, xtmp3, vec_enc);
+    vpsrlw(dst, src, 4, vec_enc);
+    vpandq(dst, dst, xtmp1, vec_enc);
+    vpshufb(dst, xtmp2, dst, vec_enc);
+    vpaddb(xtmp3, dst, xtmp3, vec_enc);
+    vpxorq(xtmp1, xtmp1, xtmp1, vec_enc);
+    vpsadbw(dst, xtmp3, xtmp1, vec_enc);
+  } else {
+    // We do not see any performance benefit of running
+    // above instruction sequence on 256 bit vector which
+    // can operate over maximum 4 long elements.
+    ShouldNotReachHere();
+  }
+  evpmovqd(dst, dst, vec_enc);
+}
+
 #ifndef _LP64
 void C2_MacroAssembler::vector_maskall_operation32(KRegister dst, Register src, KRegister tmp, int mask_len) {
   assert(VM_Version::supports_avx512bw(), "");
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index 0e6a381430f..0464d755ed4 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -317,4 +317,12 @@ public:
   void evpternlog(XMMRegister dst, int func, KRegister mask, XMMRegister src2, Address src3,
                   bool merge, BasicType bt, int vlen_enc);
 
+  void vector_popcount_int(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                           XMMRegister xtmp2, XMMRegister xtmp3, Register rtmp,
+                           int vec_enc);
+
+  void vector_popcount_long(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                            XMMRegister xtmp2, XMMRegister xtmp3, Register rtmp,
+                            int vec_enc);
+
 #endif // CPU_X86_C2_MACROASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/matcher_x86.hpp b/src/hotspot/cpu/x86/matcher_x86.hpp
index 61af24cf31c..9711bc8c2c4 100644
--- a/src/hotspot/cpu/x86/matcher_x86.hpp
+++ b/src/hotspot/cpu/x86/matcher_x86.hpp
@@ -183,4 +183,13 @@
   // Implements a variant of EncodeISOArrayNode that encode ASCII only
   static const bool supports_encode_ascii_array = true;
 
+  // Returns pre-selection estimated cost of a vector operation.
+  static int vector_op_pre_select_sz_estimate(int vopc, BasicType ety, int vlen) {
+    switch(vopc) {
+      default: return 0;
+      case Op_PopCountVI: return VM_Version::supports_avx512_vpopcntdq() ? 0 : 50;
+      case Op_PopCountVL: return VM_Version::supports_avx512_vpopcntdq() ? 0 : 40;
+    }
+  }
+
 #endif // CPU_X86_MATCHER_X86_HPP
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
index 1525d10e5b5..24cfc237b23 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
@@ -588,6 +588,30 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  address generate_popcount_avx_lut(const char *stub_name) {
+    __ align64();
+    StubCodeMark mark(this, "StubRoutines", stub_name);
+    address start = __ pc();
+    __ emit_data(0x02010100, relocInfo::none, 0);
+    __ emit_data(0x03020201, relocInfo::none, 0);
+    __ emit_data(0x03020201, relocInfo::none, 0);
+    __ emit_data(0x04030302, relocInfo::none, 0);
+    __ emit_data(0x02010100, relocInfo::none, 0);
+    __ emit_data(0x03020201, relocInfo::none, 0);
+    __ emit_data(0x03020201, relocInfo::none, 0);
+    __ emit_data(0x04030302, relocInfo::none, 0);
+    __ emit_data(0x02010100, relocInfo::none, 0);
+    __ emit_data(0x03020201, relocInfo::none, 0);
+    __ emit_data(0x03020201, relocInfo::none, 0);
+    __ emit_data(0x04030302, relocInfo::none, 0);
+    __ emit_data(0x02010100, relocInfo::none, 0);
+    __ emit_data(0x03020201, relocInfo::none, 0);
+    __ emit_data(0x03020201, relocInfo::none, 0);
+    __ emit_data(0x04030302, relocInfo::none, 0);
+    return start;
+  }
+
+
   address generate_iota_indices(const char *stub_name) {
     __ align(CodeEntryAlignment);
     StubCodeMark mark(this, "StubRoutines", stub_name);
@@ -4004,6 +4028,11 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::x86::_vector_int_mask_cmp_bits = generate_vector_mask("vector_int_mask_cmp_bits", 0x00000001);
     StubRoutines::x86::_vector_iota_indices = generate_iota_indices("iota_indices");
 
+    if (UsePopCountInstruction && VM_Version::supports_avx2() && !VM_Version::supports_avx512_vpopcntdq()) {
+      // lut implementation influenced by counting 1s algorithm from section 5-1 of Hackers' Delight.
+      StubRoutines::x86::_vector_popcount_lut = generate_popcount_avx_lut("popcount_lut");
+    }
+
     // support for verify_oop (must happen after universe_init)
     StubRoutines::_verify_oop_subroutine_entry     = generate_verify_oop();
 
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 8b7188ca42c..6bdff24bddd 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -795,6 +795,21 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  address generate_popcount_avx_lut(const char *stub_name) {
+    __ align64();
+    StubCodeMark mark(this, "StubRoutines", stub_name);
+    address start = __ pc();
+    __ emit_data64(0x0302020102010100, relocInfo::none);
+    __ emit_data64(0x0403030203020201, relocInfo::none);
+    __ emit_data64(0x0302020102010100, relocInfo::none);
+    __ emit_data64(0x0403030203020201, relocInfo::none);
+    __ emit_data64(0x0302020102010100, relocInfo::none);
+    __ emit_data64(0x0403030203020201, relocInfo::none);
+    __ emit_data64(0x0302020102010100, relocInfo::none);
+    __ emit_data64(0x0403030203020201, relocInfo::none);
+    return start;
+  }
+
   address generate_iota_indices(const char *stub_name) {
     __ align(CodeEntryAlignment);
     StubCodeMark mark(this, "StubRoutines", stub_name);
@@ -7713,6 +7728,11 @@ address generate_avx_ghash_processBlocks() {
     StubRoutines::x86::_vector_long_sign_mask = generate_vector_mask("vector_long_sign_mask", 0x8000000000000000);
     StubRoutines::x86::_vector_iota_indices = generate_iota_indices("iota_indices");
 
+    if (UsePopCountInstruction && VM_Version::supports_avx2() && !VM_Version::supports_avx512_vpopcntdq()) {
+      // lut implementation influenced by counting 1s algorithm from section 5-1 of Hackers' Delight.
+      StubRoutines::x86::_vector_popcount_lut = generate_popcount_avx_lut("popcount_lut");
+    }
+
     // support for verify_oop (must happen after universe_init)
     if (VerifyOops) {
       StubRoutines::_verify_oop_subroutine_entry = generate_verify_oop();
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.cpp b/src/hotspot/cpu/x86/stubRoutines_x86.cpp
index 81362c76bd6..f5a0eb623d0 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86.cpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.cpp
@@ -59,6 +59,7 @@ address StubRoutines::x86::_vector_double_sign_flip = NULL;
 address StubRoutines::x86::_vector_byte_perm_mask = NULL;
 address StubRoutines::x86::_vector_long_sign_mask = NULL;
 address StubRoutines::x86::_vector_iota_indices = NULL;
+address StubRoutines::x86::_vector_popcount_lut = NULL;
 address StubRoutines::x86::_vector_32_bit_mask = NULL;
 address StubRoutines::x86::_vector_64_bit_mask = NULL;
 #ifdef _LP64
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
index e4dd9550ce2..5119dde4fd5 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
@@ -177,6 +177,7 @@ class x86 {
   static address _vector_short_shuffle_mask;
   static address _vector_long_shuffle_mask;
   static address _vector_iota_indices;
+  static address _vector_popcount_lut;
 #ifdef _LP64
   static juint _k256_W[];
   static address _k256_W_adr;
@@ -340,6 +341,9 @@ class x86 {
     return _vector_iota_indices;
   }
 
+  static address vector_popcount_lut() {
+    return _vector_popcount_lut;
+  }
 #ifdef _LP64
   static address k256_W_addr()    { return _k256_W_adr; }
   static address k512_W_addr()    { return _k512_W_addr; }
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 7ff67e9a085..ab28ebd5ca5 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -1405,8 +1405,12 @@ const bool Matcher::match_rule_supported(int opcode) {
       }
       break;
     case Op_PopCountVI:
+      if (!UsePopCountInstruction || (UseAVX < 2)) {
+        return false;
+      }
+      break;
     case Op_PopCountVL:
-      if (!UsePopCountInstruction || !VM_Version::supports_avx512_vpopcntdq()) {
+      if (!UsePopCountInstruction || (UseAVX <= 2)) {
         return false;
       }
       break;
@@ -1861,6 +1865,18 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType
         return false;
       }
       break;
+    case Op_PopCountVI:
+      if (!VM_Version::supports_avx512_vpopcntdq() &&
+          (vlen == 16) && !VM_Version::supports_avx512bw()) {
+        return false;
+      }
+      break;
+    case Op_PopCountVL:
+      if (!VM_Version::supports_avx512_vpopcntdq() &&
+          ((vlen <= 4) || ((vlen == 8) && !VM_Version::supports_avx512bw()))) {
+        return false;
+      }
+      break;
   }
   return true;  // Per default match rules are supported.
 }
@@ -8571,28 +8587,54 @@ instruct vmuladdaddS2I_reg(vec dst, vec src1, vec src2) %{
 
 // --------------------------------- PopCount --------------------------------------
 
-instruct vpopcountI(vec dst, vec src) %{
+instruct vpopcountI_popcntd(vec dst, vec src) %{
+  predicate(VM_Version::supports_avx512_vpopcntdq());
   match(Set dst (PopCountVI src));
-  format %{ "vpopcntd  $dst,$src\t! vector popcount packedI" %}
+  format %{ "vector_popcount_int $dst, $src\t! vector popcount packedI" %}
   ins_encode %{
     assert(UsePopCountInstruction, "not enabled");
+    int vlen_enc = vector_length_encoding(this);
+    __ vector_popcount_int($dst$$XMMRegister, $src$$XMMRegister, xnoreg, xnoreg, xnoreg, noreg, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
 
+instruct vpopcountI(vec dst, vec src, vec xtmp1, vec xtmp2, vec xtmp3, rRegP rtmp, rFlagsReg cc) %{
+  predicate(!VM_Version::supports_avx512_vpopcntdq());
+  match(Set dst (PopCountVI src));
+  effect(TEMP dst, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP rtmp, KILL cc);
+  format %{ "vector_popcount_int  $dst, $src\t! using $xtmp1, $xtmp2, $xtmp3, and $rtmp as TEMP" %}
+  ins_encode %{
+    assert(UsePopCountInstruction, "not enabled");
     int vlen_enc = vector_length_encoding(this);
-    __ vpopcntd($dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
+    __ vector_popcount_int($dst$$XMMRegister, $src$$XMMRegister, $xtmp1$$XMMRegister, $xtmp2$$XMMRegister,
+                           $xtmp3$$XMMRegister, $rtmp$$Register, vlen_enc);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct vpopcountL(vec dst, vec src) %{
+instruct vpopcountL_popcntd(vec dst, vec src) %{
+  predicate(VM_Version::supports_avx512_vpopcntdq());
   match(Set dst (PopCountVL src));
-  format %{ "vpopcntq  $dst,$src\t! vector popcount packedL" %}
+  format %{ "vector_popcount_long  $dst, $src\t! vector popcount packedL" %}
   ins_encode %{
     assert(UsePopCountInstruction, "not enabled");
-
     int vlen_enc = vector_length_encoding(this, $src);
-    __ vpopcntq($dst$$XMMRegister, $src$$XMMRegister, vlen_enc);
-    __ evpmovqd($dst$$XMMRegister, $dst$$XMMRegister, vlen_enc);
+    __ vector_popcount_long($dst$$XMMRegister, $src$$XMMRegister, xnoreg, xnoreg, xnoreg, noreg, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
 
+instruct vpopcountL(vec dst, vec src, vec xtmp1, vec xtmp2, vec xtmp3, rRegP rtmp, rFlagsReg cc) %{
+  predicate(!VM_Version::supports_avx512_vpopcntdq());
+  match(Set dst (PopCountVL src));
+  effect(TEMP dst, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP rtmp, KILL cc);
+  format %{ "vector_popcount_long  $dst, $src\t! using $xtmp1, $xtmp2, $xtmp3, and $rtmp as TEMP" %}
+  ins_encode %{
+    assert(UsePopCountInstruction, "not enabled");
+    int vlen_enc = vector_length_encoding(this, $src);
+    __ vector_popcount_long($dst$$XMMRegister, $src$$XMMRegister, $xtmp1$$XMMRegister, $xtmp2$$XMMRegister,
+                           $xtmp3$$XMMRegister, $rtmp$$Register, vlen_enc);
   %}
   ins_pipe( pipe_slow );
 %}
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index a997439f43f..dccf75c0022 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -956,6 +956,8 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) {
       (stride_con < 0 && ((max_jint + stride_con) < limit_type->_lo)))
     return false;  // overflow
 
+  // Rudimentary cost model to estimate loop unrolling
+  // factor.
   // Adjust body_size to determine if we unroll or not
   uint body_size = _body.size();
   // Key test to unroll loop in CRC32 java code
@@ -968,6 +970,11 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) {
       case Op_ModL: body_size += 30; break;
       case Op_DivL: body_size += 30; break;
       case Op_MulL: body_size += 10; break;
+      case Op_PopCountVI:
+      case Op_PopCountVL: {
+        const TypeVect* vt = n->bottom_type()->is_vect();
+        body_size += Matcher::vector_op_pre_select_sz_estimate(n->Opcode(), vt->element_basic_type(), vt->length());
+      } break;
       case Op_StrComp:
       case Op_StrEquals:
       case Op_StrIndexOf:
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
index e80c7cfac95..49e3a428c30 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
@@ -24,9 +24,8 @@
 /**
 * @test
 * @summary Test vectorization of popcount for Long
-* @requires vm.cpu.features ~= ".*avx512dq.*"
-* @requires vm.cpu.features ~= ".*vpopcntdq.*"
 * @requires vm.compiler2.enabled
+* @requires vm.cpu.features ~= ".*avx512bw.*"
 * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64"
 * @library /test/lib /
 * @run driver compiler.vectorization.TestPopCountVectorLong
-- 
GitLab


From c0e3d107f67a1a333dbe58ae745200d85764c74e Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 14 Mar 2022 09:02:12 +0000
Subject: [PATCH 073/345] 8283008: KRegister documentation out of date

Reviewed-by: dlong, sviswanathan, jiefu, jbhateja
---
 src/hotspot/cpu/x86/register_x86.hpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/cpu/x86/register_x86.hpp b/src/hotspot/cpu/x86/register_x86.hpp
index b9ac2890240..38ca95c0126 100644
--- a/src/hotspot/cpu/x86/register_x86.hpp
+++ b/src/hotspot/cpu/x86/register_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,7 +135,7 @@ inline XMMRegister as_XMMRegister(int encoding) {
 }
 
 
-// The implementation of XMM registers for the IA32 architecture
+// The implementation of XMM registers.
 class XMMRegisterImpl: public AbstractRegisterImpl {
  public:
   enum {
@@ -201,11 +201,7 @@ CONSTANT_REGISTER_DECLARATION(XMMRegister, xmm30,    (30));
 CONSTANT_REGISTER_DECLARATION(XMMRegister, xmm31,    (31));
 #endif // AMD64
 
-// Only used by the 32bit stubGenerator. These can't be described by vmreg and hence
-// can't be described in oopMaps and therefore can't be used by the compilers (at least
-// were deopt might wan't to see them).
-
-// Use XMMRegister as shortcut
+// Use KRegister as shortcut
 class KRegisterImpl;
 typedef KRegisterImpl* KRegister;
 
@@ -213,7 +209,7 @@ inline KRegister as_KRegister(int encoding) {
   return (KRegister)(intptr_t)encoding;
 }
 
-// The implementation of XMM registers for the IA32 architecture
+// The implementation of AVX-3 (AVX-512) opmask registers.
 class KRegisterImpl : public AbstractRegisterImpl {
 public:
   enum {
-- 
GitLab


From 01570ca92d234481df2d540027e320b91af415a0 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 14 Mar 2022 09:03:05 +0000
Subject: [PATCH 074/345] 8283017: GHA: Workflows break with update release
 versions

Reviewed-by: erikj, ihse
---
 .github/workflows/submit.yml | 40 ++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index b7018a5fc95..93dd4e4b9f0 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -23,6 +23,7 @@ jobs:
     outputs:
       should_run: ${{ steps.check_submit.outputs.should_run }}
       bundle_id: ${{ steps.check_bundle_id.outputs.bundle_id }}
+      jdk_version: ${{ steps.check_jdk_versions.outputs.jdk_version }}
       platform_linux_additional: ${{ steps.check_platforms.outputs.platform_linux_additional }}
       platform_linux_x64: ${{ steps.check_platforms.outputs.platform_linux_x64 }}
       platform_linux_x86: ${{ steps.check_platforms.outputs.platform_linux_x86 }}
@@ -70,6 +71,23 @@ jobs:
         run: "echo '${{ steps.check_deps.outputs.dependencies }}'"
         if: steps.check_submit.outputs.should_run != 'false'
 
+      - name: Determine full JDK versions
+        id: check_jdk_versions
+        shell: bash
+        run: |
+          FEATURE=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_FEATURE }}
+          INTERIM=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_INTERIM }}
+          UPDATE=${{ fromJson(steps.check_deps.outputs.dependencies).DEFAULT_VERSION_UPDATE }}
+          if [ "x${UPDATE}" != "x0" ]; then
+             V=${FEATURE}.${INTERIM}.${UPDATE}
+          elif [ "x${INTERIM}" != "x0" ]; then
+             V={FEATURE}.${INTERIM}
+          else
+             V=${FEATURE}
+          fi
+          echo "::set-output name=jdk_version::${V}"
+        if: steps.check_submit.outputs.should_run != 'false'
+
       - name: Determine the jtreg ref to checkout
         run: "echo JTREG_REF=jtreg-${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_VERSION }}+${{ fromJson(steps.check_deps.outputs.dependencies).JTREG_BUILD }} >> $GITHUB_ENV"
         if: steps.check_submit.outputs.should_run != 'false'
@@ -125,7 +143,7 @@ jobs:
             artifact: -debug
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -253,7 +271,7 @@ jobs:
             artifact: -debug
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -435,7 +453,7 @@ jobs:
             gnu-arch: powerpc64le
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -582,7 +600,7 @@ jobs:
 
     # Reduced 32-bit build uses the same boot JDK as 64-bit build
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -718,7 +736,7 @@ jobs:
 
     # Reduced 32-bit build uses the same boot JDK as 64-bit build
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
@@ -869,7 +887,7 @@ jobs:
             artifact: -debug
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}"
@@ -957,7 +975,7 @@ jobs:
             artifact: -debug
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}"
@@ -1108,7 +1126,7 @@ jobs:
             artifact: -debug
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}"
@@ -1283,7 +1301,7 @@ jobs:
             artifact: -debug
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"
@@ -1384,7 +1402,7 @@ jobs:
             artifact: -debug
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"
@@ -1514,7 +1532,7 @@ jobs:
             artifact: -debug
 
     env:
-      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      JDK_VERSION: "${{ needs.prerequisites.outputs.jdk_version }}"
       BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
       BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_FILENAME }}"
       BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).MACOS_X64_BOOT_JDK_URL }}"
-- 
GitLab


From 5f3d4032f3a8854f7afde28698e66a7b6684aed7 Mon Sep 17 00:00:00 2001
From: Ahmed Muhsin <ahmedmuhsin@microsoft.com>
Date: Mon, 14 Mar 2022 09:05:53 +0000
Subject: [PATCH 075/345] 8272735: Add missing SubL node transformations

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/subnode.cpp            |  6 +-
 .../c2/irTests/SubINodeIdealizationTests.java |  8 +-
 .../c2/irTests/SubLNodeIdealizationTests.java | 85 ++++++++++++-------
 3 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/src/hotspot/share/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp
index 67b60f74c60..7897a2e99d3 100644
--- a/src/hotspot/share/opto/subnode.cpp
+++ b/src/hotspot/share/opto/subnode.cpp
@@ -61,7 +61,7 @@ Node* SubNode::Identity(PhaseGVN* phase) {
   }
 
   // Convert "(X+Y) - Y" into X and "(X+Y) - X" into Y
-  if (in(1)->Opcode() == Op_AddI) {
+  if (in(1)->Opcode() == Op_AddI || in(1)->Opcode() == Op_AddL) {
     if (in(1)->in(2) == in(2)) {
       return in(1)->in(1);
     }
@@ -417,6 +417,10 @@ Node *SubLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   if (op2 == Op_AddL && in1 == in2->in(1)) {
     return new SubLNode(phase->makecon(TypeLong::ZERO), in2->in(2));
   }
+  // Convert "(x-y) - x" into "-y"
+  if (op1 == Op_SubL && in1->in(1) == in2) {
+    return new SubLNode(phase->makecon(TypeLong::ZERO), in1->in(2));
+  }
   // Convert "x - (y+x)" into "-y"
   if (op2 == Op_AddL && in1 == in2->in(2)) {
     return new SubLNode(phase->makecon(TypeLong::ZERO), in2->in(1));
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/SubINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/SubINodeIdealizationTests.java
index a71710a9664..04a122000e5 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/SubINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/SubINodeIdealizationTests.java
@@ -112,14 +112,14 @@ public class SubINodeIdealizationTests {
     @Test
     @IR(failOn = {IRNode.ADD})
     @IR(counts = {IRNode.SUB, "1"})
-    // Checks x - (x + y) => -y
+    // Checks x - (x + y) => 0 - y
     public int test4(int x, int y) {
         return x - (x + y);
     }
 
     @Test
     @IR(counts = {IRNode.SUB, "1"})
-    // Checks (x - y) - x => -y
+    // Checks (x - y) - x => 0 - y
     public int test5(int x, int y) {
         return (x - y) - x;
     }
@@ -127,7 +127,7 @@ public class SubINodeIdealizationTests {
     @Test
     @IR(failOn = {IRNode.ADD})
     @IR(counts = {IRNode.SUB, "1"})
-    // Checks x - (y + x) => -y
+    // Checks x - (y + x) => 0 - y
     public int test6(int x, int y) {
         return x - (y + x);
     }
@@ -206,7 +206,7 @@ public class SubINodeIdealizationTests {
 
     @Test
     @IR(failOn = {IRNode.SUB, IRNode.ADD})
-    // Checks (x + y) - y => y
+    // Checks (x + y) - y => x
     public int test16(int x, int y) {
         return (x + y) - y;
     }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/SubLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/SubLNodeIdealizationTests.java
index bf60147e142..f03a07d84d0 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/SubLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/SubLNodeIdealizationTests.java
@@ -27,7 +27,7 @@ import compiler.lib.ir_framework.*;
 
 /*
  * @test
- * @bug 8267265
+ * @bug 8267265 8272735
  * @summary Test that Ideal transformations of SubLNode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.SubLNodeIdealizationTests
@@ -42,7 +42,8 @@ public class SubLNodeIdealizationTests {
                  "test7", "test8", "test9",
                  "test10", "test11", "test12",
                  "test13", "test14", "test15",
-                 "test16", "test17", "test18"})
+                 "test16", "test17", "test18",
+                 "test19", "test20", "test21"})
     public void runMethod() {
         long a = RunInfo.getRandom().nextLong();
         long b = RunInfo.getRandom().nextLong();
@@ -63,20 +64,23 @@ public class SubLNodeIdealizationTests {
         Asserts.assertEQ((a + 1) - b      , test2(a, b));
         Asserts.assertEQ(a - (b + 2021)   , test3(a, b));
         Asserts.assertEQ(a - (a + b)      , test4(a, b));
-        Asserts.assertEQ(a - (b + a)      , test5(a, b));
-        Asserts.assertEQ(0 - (a - b)      , test6(a, b));
-        Asserts.assertEQ(0 - (a + 2021)   , test7(a, b));
-        Asserts.assertEQ((a + b) - (a + c), test8(a, b, c));
-        Asserts.assertEQ((b + a) - (c + a), test9(a, b, c));
-        Asserts.assertEQ((b + a) - (a + c), test10(a, b, c));
-        Asserts.assertEQ((a + b) - (c + a), test11(a, b, c));
-        Asserts.assertEQ(a - (b - c)      , test12(a, b, c));
-        Asserts.assertEQ(0 - (a >> 63)    , test13(a));
-        Asserts.assertEQ(0 - (0 - a)      , test14(a));
-        Asserts.assertEQ(a*b - a*c        , test15(a, b, c));
-        Asserts.assertEQ(a*b - b*c        , test16(a, b, c));
-        Asserts.assertEQ(a*c - b*c        , test17(a, b, c));
-        Asserts.assertEQ(a*b - c*a        , test18(a, b, c));
+        Asserts.assertEQ((a - b) - a      , test5(a, b));
+        Asserts.assertEQ(a - (b + a)      , test6(a, b));
+        Asserts.assertEQ(0 - (a - b)      , test7(a, b));
+        Asserts.assertEQ(0 - (a + 2021)   , test8(a, b));
+        Asserts.assertEQ((a + b) - (a + c), test9(a, b, c));
+        Asserts.assertEQ((b + a) - (c + a), test10(a, b, c));
+        Asserts.assertEQ((b + a) - (a + c), test11(a, b, c));
+        Asserts.assertEQ((a + b) - (c + a), test12(a, b, c));
+        Asserts.assertEQ(a - (b - c)      , test13(a, b, c));
+        Asserts.assertEQ(0 - (a >> 63)    , test14(a));
+        Asserts.assertEQ(0 - (0 - a)      , test15(a));
+        Asserts.assertEQ((a + b) - b      , test16(a, b));
+        Asserts.assertEQ((a + b) - a      , test17(a, b));
+        Asserts.assertEQ(a*b - a*c        , test18(a, b, c));
+        Asserts.assertEQ(a*b - b*c        , test19(a, b, c));
+        Asserts.assertEQ(a*c - b*c        , test20(a, b, c));
+        Asserts.assertEQ(a*b - c*a        , test21(a, b, c));
     }
 
     @Test
@@ -113,18 +117,25 @@ public class SubLNodeIdealizationTests {
         return x - (x + y);
     }
 
+    @Test
+    @IR(counts = {IRNode.SUB, "1"})
+    // Checks (x - y) - x => 0 - y
+    public long test5(long x, long y) {
+        return (x - y) - x;
+    }
+
     @Test
     @IR(failOn = {IRNode.ADD})
     @IR(counts = {IRNode.SUB, "1"})
     // Checks x - (y + x) => 0 - y
-    public long test5(long x, long y) {
+    public long test6(long x, long y) {
         return x - (y + x);
     }
 
     @Test
     @IR(counts = {IRNode.SUB, "1"})
     // Checks 0 - (x - y) => y - x
-    public long test6(long x, long y) {
+    public long test7(long x, long y) {
         return 0 - (x - y);
     }
 
@@ -132,7 +143,7 @@ public class SubLNodeIdealizationTests {
     @IR(failOn = {IRNode.ADD})
     @IR(counts = {IRNode.SUB, "1"})
     // Checks 0 - (x + 2021) => -2021 - x
-    public long test7(long x, long y) {
+    public long test8(long x, long y) {
         return 0 - (x + 2021);
     }
 
@@ -140,7 +151,7 @@ public class SubLNodeIdealizationTests {
     @IR(failOn = {IRNode.ADD})
     @IR(counts = {IRNode.SUB, "1"})
     // Checks (x + a) - (x + b) => a - b;
-    public long test8(long x, long a, long b) {
+    public long test9(long x, long a, long b) {
         return (x + a) - (x + b);
     }
 
@@ -148,7 +159,7 @@ public class SubLNodeIdealizationTests {
     @IR(failOn = {IRNode.ADD})
     @IR(counts = {IRNode.SUB, "1"})
     // Checks (a + x) - (b + x) => a - b
-    public long test9(long x, long a, long b) {
+    public long test10(long x, long a, long b) {
         return (a + x) - (b + x);
     }
 
@@ -156,7 +167,7 @@ public class SubLNodeIdealizationTests {
     @IR(failOn = {IRNode.ADD})
     @IR(counts = {IRNode.SUB, "1"})
     // Checks (a + x) - (x + b) => a - b
-    public long test10(long x, long a, long b) {
+    public long test11(long x, long a, long b) {
         return (a + x) - (x + b);
     }
 
@@ -164,7 +175,7 @@ public class SubLNodeIdealizationTests {
     @IR(failOn = {IRNode.ADD})
     @IR(counts = {IRNode.SUB, "1"})
     // Checks (x + a) - (b + x) => a - b
-    public long test11(long x, long a, long b) {
+    public long test12(long x, long a, long b) {
         return (x + a) - (b + x);
     }
 
@@ -173,7 +184,7 @@ public class SubLNodeIdealizationTests {
                   IRNode.ADD, "1"
                  })
     // Checks a - (b - c) => (a + c) - b
-    public long test12(long a, long b, long c) {
+    public long test13(long a, long b, long c) {
         return a - (b - c);
     }
 
@@ -182,22 +193,36 @@ public class SubLNodeIdealizationTests {
     @IR(counts = {IRNode.URSHIFT_L, "1"})
     // Checks 0 - (a >> 63) => a >>> 63
     //        signed ^^          ^^^ unsigned
-    public long test13(long a) {
+    public long test14(long a) {
         return 0 - (a >> 63);
     }
 
     @Test
     @IR(failOn = {IRNode.SUB})
     // Checks 0 - (0 - x) => x
-    public long test14(long x) {
+    public long test15(long x) {
         return 0 - (0 - x);
     }
 
+    @Test
+    @IR(failOn = {IRNode.SUB, IRNode.ADD})
+    // Checks (x + y) - y => x
+    public long test16(long x, long y) {
+        return (x + y) - y;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.SUB, IRNode.ADD})
+    // Checks (x + y) - x => y
+    public long test17(long x, long y) {
+        return (x + y) - x;
+    }
+
     @Test
     @IR(counts = {IRNode.MUL, "1",
                   IRNode.SUB, "1"})
     // Checks "a*b-a*c => a*(b-c)
-    public long test15(long a, long b, long c) {
+    public long test18(long a, long b, long c) {
         return a*b - a*c;
     }
 
@@ -205,7 +230,7 @@ public class SubLNodeIdealizationTests {
     @IR(counts = {IRNode.MUL, "1",
                   IRNode.SUB, "1"})
     // Checks a*b-b*c => b*(a-c)
-    public long test16(long a, long b, long c) {
+    public long test19(long a, long b, long c) {
         return a*b - b*c;
     }
 
@@ -213,7 +238,7 @@ public class SubLNodeIdealizationTests {
     @IR(counts = {IRNode.MUL, "1",
                   IRNode.SUB, "1"})
     // Checks a*c-b*c => (a-b)*c
-    public long test17(long a, long b, long c) {
+    public long test20(long a, long b, long c) {
         return a*c - b*c;
     }
 
@@ -221,7 +246,7 @@ public class SubLNodeIdealizationTests {
     @IR(counts = {IRNode.MUL, "1",
                   IRNode.SUB, "1"})
     // Checks a*b-c*a => a*(b-c)
-    public long test18(long a, long b, long c) {
+    public long test21(long a, long b, long c) {
         return a*b - c*a;
     }
 }
-- 
GitLab


From ea9eeea8ffea6ed32a270051c6986f4f059943c0 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Mon, 14 Mar 2022 13:59:13 +0000
Subject: [PATCH 076/345] 8281322: C2: always construct strip mined loop
 initially (even if strip mining is disabled)

Reviewed-by: chagedorn, thartmann
---
 src/hotspot/share/opto/loopnode.cpp           | 406 ++++++++++--------
 src/hotspot/share/opto/loopnode.hpp           |  15 +-
 .../c2/irTests/TestCountedLoopSafepoint.java  |  61 +++
 .../c2/irTests/TestLongRangeChecks.java       |   4 +-
 4 files changed, 296 insertions(+), 190 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/irTests/TestCountedLoopSafepoint.java

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 6732c6dee01..39c6ad49563 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -852,7 +852,10 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
   SafePointNode* safepoint;
   if (bt == T_INT && head->as_CountedLoop()->is_strip_mined()) {
     // Loop is strip mined: use the safepoint of the outer strip mined loop
-    strip_mined_nest_back_to_counted_loop(loop, head, back_control, exit_test, safepoint);
+    OuterStripMinedLoopNode* outer_loop = head->as_CountedLoop()->outer_loop();
+    safepoint = outer_loop->outer_safepoint();
+    outer_loop->transform_to_counted_loop(&_igvn, this);
+    exit_test = head->loopexit();
   } else {
     safepoint = find_safepoint(back_control, x, loop);
   }
@@ -1058,68 +1061,6 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
   return true;
 }
 
-// Convert the strip mined loop nest back to a single loop with the safepoint right before the loop exit test
-void PhaseIdealLoop::strip_mined_nest_back_to_counted_loop(IdealLoopTree* loop, const BaseCountedLoopNode* head,
-                                                           Node* back_control, IfNode*& exit_test,
-                                                           SafePointNode*& safepoint) {
-  CountedLoopNode* cl = head->as_CountedLoop();
-  cl->verify_strip_mined(1);
-  safepoint = cl->outer_safepoint();
-  CountedLoopEndNode* cle = cl->loopexit();
-  OuterStripMinedLoopNode* outer_head = cl->outer_loop();
-  OuterStripMinedLoopEndNode* outer_end = cl->outer_loop_end();
-
-  cl->clear_strip_mined();
-
-  _igvn.replace_input_of(cl, LoopNode::EntryControl, outer_head->in(LoopNode::EntryControl));
-  _igvn.replace_input_of(outer_head, LoopNode::EntryControl, C->top());
-  set_idom(cl, cl->in(LoopNode::EntryControl), dom_depth(cl));
-
-  Node* exit_bol = cle->in(1);
-  Node *zero = _igvn.intcon(0);
-  set_ctrl(zero, C->root());
-  _igvn.replace_input_of(cle, 1, zero);
-
-  _igvn.replace_input_of(outer_end, 1, exit_bol);
-
-  assert(outer_head->in(LoopNode::LoopBackControl)->in(0) == outer_end, "");
-  _igvn.replace_input_of(outer_head->in(LoopNode::LoopBackControl), 0, C->top());
-  _igvn.replace_input_of(back_control, 0, outer_end);
-  set_idom(back_control, outer_end, dom_depth(outer_end) + 1);
-
-  Unique_Node_List wq;
-  wq.push(safepoint);
-
-  IdealLoopTree* outer_loop_ilt = get_loop(outer_head);
-
-  for (uint i = 0; i < wq.size(); i++) {
-    Node* n = wq.at(i);
-    for (uint j = 0; j < n->req(); ++j) {
-      Node* in = n->in(j);
-      if (in == NULL || in->is_CFG()) {
-        continue;
-      }
-      if (get_loop(get_ctrl(in)) != outer_loop_ilt) {
-        continue;
-      }
-      assert(!loop->_body.contains(in), "");
-      loop->_body.push(in);
-      wq.push(in);
-    }
-  }
-
-  set_loop(outer_end, loop);
-  loop->_body.push(outer_end);
-  set_loop(safepoint, loop);
-  loop->_body.push(safepoint);
-  set_loop(safepoint->in(0), loop);
-  loop->_body.push(safepoint->in(0));
-
-  exit_test = outer_end;
-
-  outer_loop_ilt->_tail = C->top();
-}
-
 int PhaseIdealLoop::extract_long_range_checks(const IdealLoopTree* loop, jlong stride_con, int iters_limit, PhiNode* phi,
                                               Node_List& range_checks) {
   const jlong min_iters = 2;
@@ -2054,7 +1995,6 @@ bool PhaseIdealLoop::is_counted_loop(Node* x, IdealLoopTree*&loop, BasicType iv_
 
   Node* entry_control = init_control;
   bool strip_mine_loop = iv_bt == T_INT &&
-                         LoopStripMiningIter > 1 &&
                          loop->_child == NULL &&
                          sfpt != NULL &&
                          !loop->_has_call;
@@ -2082,7 +2022,7 @@ bool PhaseIdealLoop::is_counted_loop(Node* x, IdealLoopTree*&loop, BasicType iv_
 
   if (iv_bt == T_INT && (LoopStripMiningIter == 0 || strip_mine_loop)) {
     // Check for immediately preceding SafePoint and remove
-    if (sfpt != NULL && (LoopStripMiningIter != 0 || is_deleteable_safept(sfpt))) {
+    if (sfpt != NULL && (strip_mine_loop || is_deleteable_safept(sfpt))) {
       if (strip_mine_loop) {
         Node* outer_le = outer_ilt->_tail->in(0);
         Node* sfpt_clone = sfpt->clone();
@@ -2624,6 +2564,123 @@ BaseCountedLoopNode* BaseCountedLoopNode::make(Node* entry, Node* backedge, Basi
   return new LongCountedLoopNode(entry, backedge);
 }
 
+void OuterStripMinedLoopNode::fix_sunk_stores(CountedLoopEndNode* inner_cle, LoopNode* inner_cl, PhaseIterGVN* igvn,
+                                              PhaseIdealLoop* iloop) {
+  Node* cle_out = inner_cle->proj_out(false);
+  Node* cle_tail = inner_cle->proj_out(true);
+  if (cle_out->outcnt() > 1) {
+    // Look for chains of stores that were sunk
+    // out of the inner loop and are in the outer loop
+    for (DUIterator_Fast imax, i = cle_out->fast_outs(imax); i < imax; i++) {
+      Node* u = cle_out->fast_out(i);
+      if (u->is_Store()) {
+        int alias_idx = igvn->C->get_alias_index(u->adr_type());
+        Node* first = u;
+        for (;;) {
+          Node* next = first->in(MemNode::Memory);
+          if (!next->is_Store() || next->in(0) != cle_out) {
+            break;
+          }
+          assert(igvn->C->get_alias_index(next->adr_type()) == alias_idx, "");
+          first = next;
+        }
+        Node* last = u;
+        for (;;) {
+          Node* next = NULL;
+          for (DUIterator_Fast jmax, j = last->fast_outs(jmax); j < jmax; j++) {
+            Node* uu = last->fast_out(j);
+            if (uu->is_Store() && uu->in(0) == cle_out) {
+              assert(next == NULL, "only one in the outer loop");
+              next = uu;
+              assert(igvn->C->get_alias_index(next->adr_type()) == alias_idx, "");
+            }
+          }
+          if (next == NULL) {
+            break;
+          }
+          last = next;
+        }
+        Node* phi = NULL;
+        for (DUIterator_Fast jmax, j = inner_cl->fast_outs(jmax); j < jmax; j++) {
+          Node* uu = inner_cl->fast_out(j);
+          if (uu->is_Phi()) {
+            Node* be = uu->in(LoopNode::LoopBackControl);
+            if (be->is_Store() && be->in(0) == inner_cl->in(LoopNode::LoopBackControl)) {
+              assert(igvn->C->get_alias_index(uu->adr_type()) != alias_idx && igvn->C->get_alias_index(uu->adr_type()) != Compile::AliasIdxBot, "unexpected store");
+            }
+            if (be == last || be == first->in(MemNode::Memory)) {
+              assert(igvn->C->get_alias_index(uu->adr_type()) == alias_idx || igvn->C->get_alias_index(uu->adr_type()) == Compile::AliasIdxBot, "unexpected alias");
+              assert(phi == NULL, "only one phi");
+              phi = uu;
+            }
+          }
+        }
+#ifdef ASSERT
+        for (DUIterator_Fast jmax, j = inner_cl->fast_outs(jmax); j < jmax; j++) {
+          Node* uu = inner_cl->fast_out(j);
+          if (uu->is_Phi() && uu->bottom_type() == Type::MEMORY) {
+            if (uu->adr_type() == igvn->C->get_adr_type(igvn->C->get_alias_index(u->adr_type()))) {
+              assert(phi == uu, "what's that phi?");
+            } else if (uu->adr_type() == TypePtr::BOTTOM) {
+              Node* n = uu->in(LoopNode::LoopBackControl);
+              uint limit = igvn->C->live_nodes();
+              uint i = 0;
+              while (n != uu) {
+                i++;
+                assert(i < limit, "infinite loop");
+                if (n->is_Proj()) {
+                  n = n->in(0);
+                } else if (n->is_SafePoint() || n->is_MemBar()) {
+                  n = n->in(TypeFunc::Memory);
+                } else if (n->is_Phi()) {
+                  n = n->in(1);
+                } else if (n->is_MergeMem()) {
+                  n = n->as_MergeMem()->memory_at(igvn->C->get_alias_index(u->adr_type()));
+                } else if (n->is_Store() || n->is_LoadStore() || n->is_ClearArray()) {
+                  n = n->in(MemNode::Memory);
+                } else {
+                  n->dump();
+                  ShouldNotReachHere();
+                }
+              }
+            }
+          }
+        }
+#endif
+        if (phi == NULL) {
+          // If an entire chains was sunk, the
+          // inner loop has no phi for that memory
+          // slice, create one for the outer loop
+          phi = PhiNode::make(inner_cl, first->in(MemNode::Memory), Type::MEMORY,
+                              igvn->C->get_adr_type(igvn->C->get_alias_index(u->adr_type())));
+          phi->set_req(LoopNode::LoopBackControl, last);
+          phi = register_new_node(phi, inner_cl, igvn, iloop);
+          igvn->replace_input_of(first, MemNode::Memory, phi);
+        } else {
+          // Or fix the outer loop fix to include
+          // that chain of stores.
+          Node* be = phi->in(LoopNode::LoopBackControl);
+          assert(!(be->is_Store() && be->in(0) == inner_cl->in(LoopNode::LoopBackControl)), "store on the backedge + sunk stores: unsupported");
+          if (be == first->in(MemNode::Memory)) {
+            if (be == phi->in(LoopNode::LoopBackControl)) {
+              igvn->replace_input_of(phi, LoopNode::LoopBackControl, last);
+            } else {
+              igvn->replace_input_of(be, MemNode::Memory, last);
+            }
+          } else {
+#ifdef ASSERT
+            if (be == phi->in(LoopNode::LoopBackControl)) {
+              assert(phi->in(LoopNode::LoopBackControl) == last, "");
+            } else {
+              assert(be->in(MemNode::Memory) == last, "");
+            }
+#endif
+          }
+        }
+      }
+    }
+  }
+}
 
 void OuterStripMinedLoopNode::adjust_strip_mined_loop(PhaseIterGVN* igvn) {
   // Look for the outer & inner strip mined loop, reduce number of
@@ -2631,6 +2688,14 @@ void OuterStripMinedLoopNode::adjust_strip_mined_loop(PhaseIterGVN* igvn) {
   // construct required phi nodes for outer loop.
   CountedLoopNode* inner_cl = unique_ctrl_out()->as_CountedLoop();
   assert(inner_cl->is_strip_mined(), "inner loop should be strip mined");
+  if (LoopStripMiningIter == 0) {
+    remove_outer_loop_and_safepoint(igvn);
+    return;
+  }
+  if (LoopStripMiningIter == 1) {
+    transform_to_counted_loop(igvn, NULL);
+    return;
+  }
   Node* inner_iv_phi = inner_cl->phi();
   if (inner_iv_phi == NULL) {
     IfNode* outer_le = outer_loop_end();
@@ -2650,11 +2715,7 @@ void OuterStripMinedLoopNode::adjust_strip_mined_loop(PhaseIterGVN* igvn) {
   assert(iter_estimate > 0, "broken");
   if ((jlong)scaled_iters != scaled_iters_long || iter_estimate <= short_scaled_iters) {
     // Remove outer loop and safepoint (too few iterations)
-    Node* outer_sfpt = outer_safepoint();
-    Node* outer_out = outer_loop_exit();
-    igvn->replace_node(outer_out, outer_sfpt->in(0));
-    igvn->replace_input_of(outer_sfpt, 0, igvn->C->top());
-    inner_cl->clear_strip_mined();
+    remove_outer_loop_and_safepoint(igvn);
     return;
   }
   if (iter_estimate <= scaled_iters_long) {
@@ -2735,121 +2796,6 @@ void OuterStripMinedLoopNode::adjust_strip_mined_loop(PhaseIterGVN* igvn) {
       }
     }
   }
-  Node* cle_out = inner_cle->proj_out(false);
-  if (cle_out->outcnt() > 1) {
-    // Look for chains of stores that were sunk
-    // out of the inner loop and are in the outer loop
-    for (DUIterator_Fast imax, i = cle_out->fast_outs(imax); i < imax; i++) {
-      Node* u = cle_out->fast_out(i);
-      if (u->is_Store()) {
-        Node* first = u;
-        for(;;) {
-          Node* next = first->in(MemNode::Memory);
-          if (!next->is_Store() || next->in(0) != cle_out) {
-            break;
-          }
-          first = next;
-        }
-        Node* last = u;
-        for(;;) {
-          Node* next = NULL;
-          for (DUIterator_Fast jmax, j = last->fast_outs(jmax); j < jmax; j++) {
-            Node* uu = last->fast_out(j);
-            if (uu->is_Store() && uu->in(0) == cle_out) {
-              assert(next == NULL, "only one in the outer loop");
-              next = uu;
-            }
-          }
-          if (next == NULL) {
-            break;
-          }
-          last = next;
-        }
-        Node* phi = NULL;
-        for (DUIterator_Fast jmax, j = fast_outs(jmax); j < jmax; j++) {
-          Node* uu = fast_out(j);
-          if (uu->is_Phi()) {
-            Node* be = uu->in(LoopNode::LoopBackControl);
-            if (be->is_Store() && old_new[be->_idx] != NULL) {
-              assert(false, "store on the backedge + sunk stores: unsupported");
-              // drop outer loop
-              IfNode* outer_le = outer_loop_end();
-              Node* iff = igvn->transform(new IfNode(outer_le->in(0), outer_le->in(1), outer_le->_prob, outer_le->_fcnt));
-              igvn->replace_node(outer_le, iff);
-              inner_cl->clear_strip_mined();
-              return;
-            }
-            if (be == last || be == first->in(MemNode::Memory)) {
-              assert(phi == NULL, "only one phi");
-              phi = uu;
-            }
-          }
-        }
-#ifdef ASSERT
-        for (DUIterator_Fast jmax, j = fast_outs(jmax); j < jmax; j++) {
-          Node* uu = fast_out(j);
-          if (uu->is_Phi() && uu->bottom_type() == Type::MEMORY) {
-            if (uu->adr_type() == igvn->C->get_adr_type(igvn->C->get_alias_index(u->adr_type()))) {
-              assert(phi == uu, "what's that phi?");
-            } else if (uu->adr_type() == TypePtr::BOTTOM) {
-              Node* n = uu->in(LoopNode::LoopBackControl);
-              uint limit = igvn->C->live_nodes();
-              uint i = 0;
-              while (n != uu) {
-                i++;
-                assert(i < limit, "infinite loop");
-                if (n->is_Proj()) {
-                  n = n->in(0);
-                } else if (n->is_SafePoint() || n->is_MemBar()) {
-                  n = n->in(TypeFunc::Memory);
-                } else if (n->is_Phi()) {
-                  n = n->in(1);
-                } else if (n->is_MergeMem()) {
-                  n = n->as_MergeMem()->memory_at(igvn->C->get_alias_index(u->adr_type()));
-                } else if (n->is_Store() || n->is_LoadStore() || n->is_ClearArray()) {
-                  n = n->in(MemNode::Memory);
-                } else {
-                  n->dump();
-                  ShouldNotReachHere();
-                }
-              }
-            }
-          }
-        }
-#endif
-        if (phi == NULL) {
-          // If the an entire chains was sunk, the
-          // inner loop has no phi for that memory
-          // slice, create one for the outer loop
-          phi = PhiNode::make(this, first->in(MemNode::Memory), Type::MEMORY,
-                              igvn->C->get_adr_type(igvn->C->get_alias_index(u->adr_type())));
-          phi->set_req(LoopNode::LoopBackControl, last);
-          phi = igvn->transform(phi);
-          igvn->replace_input_of(first, MemNode::Memory, phi);
-        } else {
-          // Or fix the outer loop fix to include
-          // that chain of stores.
-          Node* be = phi->in(LoopNode::LoopBackControl);
-          assert(!(be->is_Store() && old_new[be->_idx] != NULL), "store on the backedge + sunk stores: unsupported");
-          if (be == first->in(MemNode::Memory)) {
-            if (be == phi->in(LoopNode::LoopBackControl)) {
-              igvn->replace_input_of(phi, LoopNode::LoopBackControl, last);
-            } else {
-              igvn->replace_input_of(be, MemNode::Memory, last);
-            }
-          } else {
-#ifdef ASSERT
-            if (be == phi->in(LoopNode::LoopBackControl)) {
-              assert(phi->in(LoopNode::LoopBackControl) == last, "");
-            } else {
-              assert(be->in(MemNode::Memory) == last, "");
-            }
-#endif
-          }
-        }
-      }
-    }
-  }
 
   if (iv_phi != NULL) {
     // Now adjust the inner loop's exit condition
@@ -2898,6 +2844,96 @@ void OuterStripMinedLoopNode::adjust_strip_mined_loop(PhaseIterGVN* igvn) {
   }
 }
 
+void OuterStripMinedLoopNode::transform_to_counted_loop(PhaseIterGVN* igvn, PhaseIdealLoop* iloop) {
+  CountedLoopNode* inner_cl = unique_ctrl_out()->as_CountedLoop();
+  CountedLoopEndNode* cle = inner_cl->loopexit();
+  Node* inner_test = cle->in(1);
+  IfNode* outer_le = outer_loop_end();
+  CountedLoopEndNode* inner_cle = inner_cl->loopexit();
+  Node* safepoint = outer_safepoint();
+
+  fix_sunk_stores(inner_cle, inner_cl, igvn, iloop);
+
+  // make counted loop exit test always fail
+  ConINode* zero = igvn->intcon(0);
+  if (iloop != NULL) {
+    iloop->set_ctrl(zero, igvn->C->root());
+  }
+  igvn->replace_input_of(cle, 1, zero);
+  // replace outer loop end with CountedLoopEndNode with formers' CLE's exit test
+  Node* new_end = new CountedLoopEndNode(outer_le->in(0), inner_test, cle->_prob, cle->_fcnt);
+  register_control(new_end, inner_cl, outer_le->in(0), igvn, iloop);
+  if (iloop == NULL) {
+    igvn->replace_node(outer_le, new_end);
+  } else {
+    iloop->lazy_replace(outer_le, new_end);
+  }
+  // the backedge of the inner loop must be rewired to the new loop end
+  Node* backedge = cle->proj_out(true);
+  igvn->replace_input_of(backedge, 0, new_end);
+  if (iloop != NULL) {
+    iloop->set_idom(backedge, new_end, iloop->dom_depth(new_end) + 1);
+  }
+  // make the outer loop go away
+  igvn->replace_input_of(in(LoopBackControl), 0, igvn->C->top());
+  igvn->replace_input_of(this, LoopBackControl, igvn->C->top());
+  inner_cl->clear_strip_mined();
+  if (iloop != NULL) {
+    Unique_Node_List wq;
+    wq.push(safepoint);
+
+    IdealLoopTree* outer_loop_ilt = iloop->get_loop(this);
+    IdealLoopTree* loop = iloop->get_loop(inner_cl);
+
+    for (uint i = 0; i < wq.size(); i++) {
+      Node* n = wq.at(i);
+      for (uint j = 0; j < n->req(); ++j) {
+        Node* in = n->in(j);
+        if (in == NULL || in->is_CFG()) {
+          continue;
+        }
+        if (iloop->get_loop(iloop->get_ctrl(in)) != outer_loop_ilt) {
+          continue;
+        }
+        assert(!loop->_body.contains(in), "");
+        loop->_body.push(in);
+        wq.push(in);
+      }
+    }
+    iloop->set_loop(safepoint, loop);
+    loop->_body.push(safepoint);
+    iloop->set_loop(safepoint->in(0), loop);
+    loop->_body.push(safepoint->in(0));
+    outer_loop_ilt->_tail = igvn->C->top();
+  }
+}
+
+void OuterStripMinedLoopNode::remove_outer_loop_and_safepoint(PhaseIterGVN* igvn) const {
+  CountedLoopNode* inner_cl = unique_ctrl_out()->as_CountedLoop();
+  Node* outer_sfpt = outer_safepoint();
+  Node* outer_out = outer_loop_exit();
+  igvn->replace_node(outer_out, outer_sfpt->in(0));
+  igvn->replace_input_of(outer_sfpt, 0, igvn->C->top());
+  inner_cl->clear_strip_mined();
+}
+
+Node* OuterStripMinedLoopNode::register_new_node(Node* node, LoopNode* ctrl, PhaseIterGVN* igvn, PhaseIdealLoop* iloop) {
+  if (iloop == NULL) {
+    return igvn->transform(node);
+  }
+  iloop->register_new_node(node, ctrl);
+  return node;
+}
+
+Node* OuterStripMinedLoopNode::register_control(Node* node, Node* loop, Node* idom, PhaseIterGVN* igvn,
+                                                PhaseIdealLoop* iloop) {
+  if (iloop == NULL) {
+    return igvn->transform(node);
+  }
+  iloop->register_control(node, iloop->get_loop(loop), idom);
+  return node;
+}
+
 const Type* OuterStripMinedLoopEndNode::Value(PhaseGVN* phase) const {
   if (!in(0)) return Type::TOP;
   if (phase->type(in(0)) == Type::TOP)
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 606d9c46331..c81180fa7b8 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -546,7 +546,8 @@ class LoopLimitNode : public Node {
 // Support for strip mining
 class OuterStripMinedLoopNode : public LoopNode {
 private:
-  CountedLoopNode* inner_loop() const;
+  static void fix_sunk_stores(CountedLoopEndNode* inner_cle, LoopNode* inner_cl, PhaseIterGVN* igvn, PhaseIdealLoop* iloop);
+
 public:
   OuterStripMinedLoopNode(Compile* C, Node *entry, Node *backedge)
     : LoopNode(entry, backedge) {
@@ -562,6 +563,15 @@ public:
   virtual IfFalseNode* outer_loop_exit() const;
   virtual SafePointNode* outer_safepoint() const;
   void adjust_strip_mined_loop(PhaseIterGVN* igvn);
+
+  void remove_outer_loop_and_safepoint(PhaseIterGVN* igvn) const;
+
+  void transform_to_counted_loop(PhaseIterGVN* igvn, PhaseIdealLoop* iloop);
+
+  static Node* register_new_node(Node* node, LoopNode* ctrl, PhaseIterGVN* igvn, PhaseIdealLoop* iloop);
+
+  Node* register_control(Node* node, Node* loop, Node* idom, PhaseIterGVN* igvn,
+                         PhaseIdealLoop* iloop);
 };
 
 class OuterStripMinedLoopEndNode : public IfNode {
@@ -1662,9 +1672,6 @@ public:
 
   bool safe_for_if_replacement(const Node* dom) const;
 
-  void strip_mined_nest_back_to_counted_loop(IdealLoopTree* loop, const BaseCountedLoopNode* head, Node* back_control,
-                                             IfNode*&exit_test, SafePointNode*&safepoint);
-
   void push_pinned_nodes_thru_region(IfNode* dom_if, Node* region);
 
   bool try_merge_identical_ifs(Node* n);
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestCountedLoopSafepoint.java b/test/hotspot/jtreg/compiler/c2/irTests/TestCountedLoopSafepoint.java
new file mode 100644
index 00000000000..a56fd1592fd
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestCountedLoopSafepoint.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022, 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.
+ */
+
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * bug 8281322
+ * @summary check counted loop is properly constructed with/without safepoint
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestCountedLoopSafepoint
+ */
+
+public class TestCountedLoopSafepoint {
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("-XX:LoopMaxUnroll=1", "-XX:-UseCountedLoopSafepoints");
+        TestFramework.runWithFlags("-XX:LoopMaxUnroll=1", "-XX:+UseCountedLoopSafepoints", "-XX:LoopStripMiningIter=1");
+        TestFramework.runWithFlags("-XX:LoopMaxUnroll=1", "-XX:+UseCountedLoopSafepoints", "-XX:LoopStripMiningIter=1000");
+    }
+
+    @Test
+    @IR(counts = { IRNode.COUNTEDLOOP, "1" })
+    @IR(applyIf = { "LoopStripMiningIter", "0" }, failOn = { IRNode.SAFEPOINT, IRNode.OUTERSTRIPMINEDLOOP })
+    @IR(applyIf = { "LoopStripMiningIter", "1" }, counts = { IRNode.SAFEPOINT, "1" }, failOn = { IRNode.OUTERSTRIPMINEDLOOP })
+    @IR(applyIf = { "LoopStripMiningIter", "> 1" }, counts = { IRNode.SAFEPOINT, "1", IRNode.OUTERSTRIPMINEDLOOP, "1" })
+    public static float test(int start, int stop) {
+        float v = 1;
+        for (int i = start; i < stop; i++) {
+            v *= 2;
+        }
+        return v;
+    }
+
+    @Run(test = "test")
+    private void testRunner() {
+        test(0, 100);
+    }
+
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java b/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
index e84f3062f14..87bfd943888 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestLongRangeChecks.java
@@ -36,7 +36,9 @@ import java.util.Objects;
 
 public class TestLongRangeChecks {
     public static void main(String[] args) {
-        TestFramework.run();
+        TestFramework.runWithFlags("-XX:-UseCountedLoopSafepoints");
+        TestFramework.runWithFlags("-XX:+UseCountedLoopSafepoints", "-XX:LoopStripMiningIter=1");
+        TestFramework.runWithFlags("-XX:+UseCountedLoopSafepoints", "-XX:LoopStripMiningIter=1000");
     }
 
 
-- 
GitLab


From 08573cc3b2370a697a7bd4ad0665ee20ae148d39 Mon Sep 17 00:00:00 2001
From: Zdenek Zambersky <zzambers@redhat.com>
Date: Mon, 14 Mar 2022 14:21:58 +0000
Subject: [PATCH 077/345] 8282529: Fix API Note in javadoc for
 javax.net.ssl.SSLSocket

Reviewed-by: wetmore, xuelei
---
 .../classes/javax/net/ssl/SSLSocket.java      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
index b2c912c3b65..e5cdd3741b9 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java
@@ -174,17 +174,19 @@ import java.util.function.BiFunction;
  * @apiNote
  * When the connection is no longer needed, the client and server
  * applications should each close both sides of their respective connection.
- * For {@code SSLSocket} objects, for example, an application can call
- * {@link Socket#shutdownOutput()} or {@link java.io.OutputStream#close()}
- * for output stream close and call {@link Socket#shutdownInput()} or
- * {@link java.io.InputStream#close()} for input stream close.  Note that
- * in some cases, closing the input stream may depend on the peer's output
- * stream being closed first.  If the connection is not closed in an orderly
- * manner (for example {@link Socket#shutdownInput()} is called before the
- * peer's write closure notification has been received), exceptions may
- * be raised to indicate that an error has occurred.  Once an
- * {@code SSLSocket} is closed, it is not reusable: a new {@code SSLSocket}
- * must be created.
+ * This can be done either in one shot by calling {@link Socket#close()},
+ * or by closing each side individually using
+ * {@link Socket#shutdownOutput()} / {@link Socket#shutdownInput()} which is
+ * useful for protocol versions that can support half-closed connections.
+ *
+ * <P> Note that in some cases, closing the input stream may depend on the
+ * peer's output stream being closed first.  If the connection is not closed
+ * in an orderly manner (for example {@link Socket#shutdownInput()} is called
+ * before the peer's write closure notification has been received), exceptions
+ * may be raised to indicate that an error has occurred.
+ *
+ * <P> Once an {@code SSLSocket} is closed, it is not reusable: a new
+ * {@code SSLSocket} must be created.
  *
  * @see java.net.Socket
  * @see SSLServerSocket
-- 
GitLab


From 13cebffe618255ae29310c95fd1b91576e576751 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Mon, 14 Mar 2022 16:10:15 +0000
Subject: [PATCH 078/345] 8058924: FileReader(String) documentation is
 insufficient

Reviewed-by: naoto, lancea
---
 src/java.base/share/classes/java/io/package-info.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/io/package-info.java b/src/java.base/share/classes/java/io/package-info.java
index 1c41f9835e6..81f61412eed 100644
--- a/src/java.base/share/classes/java/io/package-info.java
+++ b/src/java.base/share/classes/java/io/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,14 @@
  * Provides for system input and output through data streams,
  * serialization and the file system.
  *
- * Unless otherwise noted, passing a null argument to a constructor or
+ * Unless otherwise noted, passing a {@code null} argument to a constructor or
  * method in any class or interface in this package will cause a
  * {@code NullPointerException} to be thrown.
  *
+ * A <i>pathname string</i> passed as a {@code String} argument to a
+ * constructor or method in any class or interface in this package will be
+ * interpreted as described in the class specification of {@link File}.
+ *
  * <h2>Object Serialization</h2>
  * <p><strong>Warning: Deserialization of untrusted data is inherently dangerous
  * and should be avoided. Untrusted data should be carefully validated according to the
-- 
GitLab


From c96085eaab1f6b21e084b94fcc619d090f0afc97 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 14 Mar 2022 16:28:15 +0000
Subject: [PATCH 079/345] 8282929: Localized monetary symbols are not reflected
 in `toLocalizedPattern` return value

Reviewed-by: joehw, lancea
---
 .../classes/java/text/DecimalFormat.java      | 12 ++--
 .../DecimalFormat/ToLocalizedPatternTest.java | 61 +++++++++++++++++++
 2 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/java/text/Format/DecimalFormat/ToLocalizedPatternTest.java

diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index ea125b7d14b..094a5258b09 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3210,16 +3210,18 @@ public class DecimalFormat extends NumberFormat {
             for (i = digitCount; i > 0; --i) {
                 if (i != digitCount && isGroupingUsed() && groupingSize != 0 &&
                     i % groupingSize == 0) {
-                    result.append(localized ? symbols.getGroupingSeparator() :
-                                  PATTERN_GROUPING_SEPARATOR);
+                    result.append(localized ?
+                        (isCurrencyFormat ? symbols.getMonetaryGroupingSeparator() : symbols.getGroupingSeparator()) :
+                        PATTERN_GROUPING_SEPARATOR);
                 }
                 result.append(i <= getMinimumIntegerDigits()
                     ? (localized ? symbols.getZeroDigit() : PATTERN_ZERO_DIGIT)
                     : (localized ? symbols.getDigit() : PATTERN_DIGIT));
             }
             if (getMaximumFractionDigits() > 0 || decimalSeparatorAlwaysShown)
-                result.append(localized ? symbols.getDecimalSeparator() :
-                              PATTERN_DECIMAL_SEPARATOR);
+                result.append(localized ?
+                    (isCurrencyFormat ? symbols.getMonetaryDecimalSeparator() : symbols.getDecimalSeparator()) :
+                    PATTERN_DECIMAL_SEPARATOR);
             for (i = 0; i < getMaximumFractionDigits(); ++i) {
                 if (i < getMinimumFractionDigits()) {
                     result.append(localized ? symbols.getZeroDigit() :
diff --git a/test/jdk/java/text/Format/DecimalFormat/ToLocalizedPatternTest.java b/test/jdk/java/text/Format/DecimalFormat/ToLocalizedPatternTest.java
new file mode 100644
index 00000000000..6d8ab9c9a0c
--- /dev/null
+++ b/test/jdk/java/text/Format/DecimalFormat/ToLocalizedPatternTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282929
+ * @summary Verifies that toLocalizedPattern() method correctly returns
+ *          monetary symbols in a currency formatter
+ * @run testng ToLocalizedPatternTest
+ */
+
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+@Test
+public class ToLocalizedPatternTest {
+    private static final char MONETARY_GROUPING = 'g';
+    private static final char MONETARY_DECIMAL = 'd';
+
+    public void testToLocalizedPattern() {
+        var dfs = new DecimalFormatSymbols(Locale.US);
+
+        // Customize the decimal format symbols
+        dfs.setMonetaryGroupingSeparator(MONETARY_GROUPING);
+        dfs.setMonetaryDecimalSeparator(MONETARY_DECIMAL);
+
+        // create a currency formatter
+        var cf = (DecimalFormat)DecimalFormat.getCurrencyInstance(Locale.US);
+        cf.setDecimalFormatSymbols(dfs);
+
+        // check
+        assertEquals(cf.toLocalizedPattern(),
+            cf.toPattern()
+               .replace(',', MONETARY_GROUPING)
+               .replace('.', MONETARY_DECIMAL));
+    }
+}
-- 
GitLab


From 7833667f0e2151fc56c7c1533015f004f02f7ab2 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <emanuel.peter@oracle.com>
Date: Mon, 14 Mar 2022 17:35:09 +0000
Subject: [PATCH 080/345] 8282881: Print exception message in VM crash with
 -XX:AbortVMOnException

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

diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index 4ddc8e18ae6..1b56009a27d 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -538,7 +538,11 @@ void Exceptions::debug_check_abort(const char *value_string, const char* message
       strstr(value_string, AbortVMOnException)) {
     if (AbortVMOnExceptionMessage == NULL || (message != NULL &&
         strstr(message, AbortVMOnExceptionMessage))) {
-      fatal("Saw %s, aborting", value_string);
+      if (message == NULL) {
+        fatal("Saw %s, aborting", value_string);
+      } else {
+        fatal("Saw %s: %s, aborting", value_string, message);
+      }
     }
   }
 }
-- 
GitLab


From 70bd57ed3544cdb41029d425507ba4b9b35c8cdb Mon Sep 17 00:00:00 2001
From: Carter Kozak <ckozak@ckozak.net>
Date: Mon, 14 Mar 2022 17:54:19 +0000
Subject: [PATCH 081/345] 8283049: Fix non-singleton LoggerFinder error
 message: s/on/one

Reviewed-by: dfuchs
---
 .../classes/jdk/internal/logger/LoggerFinderLoader.java     | 4 ++--
 .../LoggerFinderLoaderTest/LoggerFinderLoaderTest.java      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java b/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
index dbf4ccca128..4f009973e27 100644
--- a/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
+++ b/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -129,7 +129,7 @@ public final class LoggerFinderLoader {
                 result = iterator.next();
                 if (iterator.hasNext() && ensureSingletonProvider()) {
                     throw new ServiceConfigurationError(
-                            "More than on LoggerFinder implementation");
+                            "More than one LoggerFinder implementation");
                 }
             } else {
                 result = loadDefaultImplementation();
diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java
index 8f1ce47fb07..d7ac2286678 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @test
- * @bug     8140364 8189291
+ * @bug     8140364 8189291 8283049
  * @summary JDK implementation specific unit test for LoggerFinderLoader.
  *          Tests the behavior of LoggerFinderLoader with respect to the
  *          value of the internal diagnosability switches. Also test the
@@ -230,7 +230,7 @@ public class LoggerFinderLoaderTest {
                             throw new RuntimeException("Expected message not found. Error stream contained: " + warning);
                         }
                     } else if (singleton) {
-                        if (!warning.contains("java.util.ServiceConfigurationError: More than on LoggerFinder implementation")) {
+                        if (!warning.contains("java.util.ServiceConfigurationError: More than one LoggerFinder implementation")) {
                             throw new RuntimeException("Expected message not found. Error stream contained: " + warning);
                         }
                     }
-- 
GitLab


From f66070b00d4311c6e3a6fbf38956fa2d5da5fada Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Mon, 14 Mar 2022 18:05:38 +0000
Subject: [PATCH 082/345] 8282577: ICC_Profile.setData(int, byte[]) invalidates
 the profile

Reviewed-by: serb
---
 src/java.desktop/share/native/liblcms/LCMS.c  | 27 ++++---
 .../ICC_ColorSpace/SetTagDataValidation.java  | 75 +++++++++++++++++++
 .../java/awt/color/ICC_Profile/MTGetData.java |  2 +
 3 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 test/jdk/java/awt/color/ICC_ColorSpace/SetTagDataValidation.java

diff --git a/src/java.desktop/share/native/liblcms/LCMS.c b/src/java.desktop/share/native/liblcms/LCMS.c
index 27c23c6d92f..06a7eb26140 100644
--- a/src/java.desktop/share/native/liblcms/LCMS.c
+++ b/src/java.desktop/share/native/liblcms/LCMS.c
@@ -734,34 +734,43 @@ static cmsHPROFILE _writeCookedTag(const cmsHPROFILE pfTarget,
 
     // now we have all tags moved to the new profile.
     // do some sanity checks: write it to a memory buffer and read again.
+    void* buf = NULL;
     if (cmsSaveProfileToMem(p, NULL, &pfSize)) {
-        void* buf = malloc(pfSize);
+        buf = malloc(pfSize);
         if (buf != NULL) {
             // load raw profile data into the buffer
             if (cmsSaveProfileToMem(p, buf, &pfSize)) {
                 pfSanity = cmsOpenProfileFromMem(buf, pfSize);
             }
-            free(buf);
         }
     }
 
+    cmsCloseProfile(p); // No longer needed.
+
     if (pfSanity == NULL) {
         // for some reason, we failed to save and read the updated profile
         // It likely indicates that the profile is not correct, so we report
         // a failure here.
-        cmsCloseProfile(p);
-        p =  NULL;
+        free(buf);
+        return NULL;
     } else {
         // do final check whether we can read and handle the target tag.
         const void* pTag = cmsReadTag(pfSanity, sig);
         if (pTag == NULL) {
             // the tag can not be cooked
-            cmsCloseProfile(p);
-            p = NULL;
+            free(buf);
+            cmsCloseProfile(pfSanity);
+            return NULL;
         }
+        // The profile we used for sanity checking needs to be returned
+        // since the one we updated is raw - not cooked.
+        // Except we want to re-open it since the call to cmsReadTag()
+        // means we may not get back the same bytes as we set.
+        // Whilst this may change later anyway, we can at least prevent
+        // it from happening immediately.
         cmsCloseProfile(pfSanity);
-        pfSanity = NULL;
+        pfSanity = cmsOpenProfileFromMem(buf, pfSize);
+        free(buf);
+        return pfSanity;
     }
-
-    return p;
 }
diff --git a/test/jdk/java/awt/color/ICC_ColorSpace/SetTagDataValidation.java b/test/jdk/java/awt/color/ICC_ColorSpace/SetTagDataValidation.java
new file mode 100644
index 00000000000..92faced75ba
--- /dev/null
+++ b/test/jdk/java/awt/color/ICC_ColorSpace/SetTagDataValidation.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8282577
+ * @summary Verify setting data for a tag doesn't invalidate the profile.
+ */
+
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_ColorSpace;
+import java.awt.color.ICC_Profile;
+
+public final class SetTagDataValidation {
+
+    public static void main(String[] args) throws Exception {
+
+        ICC_Profile srgb = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
+        // Create a new profile, using the srgb data but private to us.
+        ICC_Profile icc = ICC_Profile.getInstance(srgb.getData());
+
+        // Get data for some tag, which one isn't important so long as it exists
+        int tag = ICC_Profile.icSigBlueColorantTag;
+        byte[] tagData = icc.getData(tag);
+        if (tagData == null) {
+            throw new RuntimeException("No data for tag");
+        }
+        // Set the data to be the SAME data which ought to be a harmless no-op
+        icc.setData(tag, tagData);
+
+        // Perform a color conversion - from rgb to rgb but it doesn't matter
+        // we just need to verify the op is applied and results are sane.
+
+        ColorSpace cs = new ICC_ColorSpace(icc);
+        float[] in = new float[3];
+        in[0] = 0.4f;
+        in[1] = 0.5f;
+        in[2] = 0.6f;
+
+        // the toRGB op previously threw an exception - or crashed
+        float[] out = cs.toRGB(in);
+        // If we get this far let's validate the results.
+        if (out == null || out.length !=3) {
+            throw new RuntimeException("out array invalid");
+        }
+        for (int i=0;i<out.length;i++) {
+           System.out.println(out[i]);
+        }
+        for (int i=0;i<out.length;i++) {
+           if ((Math.abs(in[i]-out[i]) > 0.01)) {
+               throw new RuntimeException("Inaccurate no-op conversion");
+           }
+        }
+    }
+}
diff --git a/test/jdk/java/awt/color/ICC_Profile/MTGetData.java b/test/jdk/java/awt/color/ICC_Profile/MTGetData.java
index 5b2572e14f1..7d634cb0f4a 100644
--- a/test/jdk/java/awt/color/ICC_Profile/MTGetData.java
+++ b/test/jdk/java/awt/color/ICC_Profile/MTGetData.java
@@ -23,6 +23,7 @@
 
 import java.awt.color.ColorSpace;
 import java.awt.color.ICC_Profile;
+import java.awt.color.CMMException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -103,6 +104,7 @@ public final class MTGetData {
                     icc.setData(tag, data2);
                 }
             } catch (IllegalArgumentException ignored) {
+                System.err.println("Ignoring " + ignored);
             } catch (Throwable throwable) {
                 throwable.printStackTrace();
                 failed = true;
-- 
GitLab


From 5bf6a7f7d78506118ded0f0bf6383b0825366619 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Mon, 14 Mar 2022 18:15:40 +0000
Subject: [PATCH 083/345] 8282691: add jdb "-R" option for passing any argument
 to the launched debuggee process

Reviewed-by: alanb, kevinw
---
 .../com/sun/tools/example/debug/tty/TTY.java   |  4 +++-
 .../tools/example/debug/tty/TTYResources.java  |  3 ++-
 src/jdk.jdi/share/man/jdb.1                    | 16 +++++++++++++---
 test/jdk/com/sun/jdi/JdbOptions.java           | 18 +++++++++++++++++-
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
index 6e1ddcb1b84..9373bc9e0e0 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -993,6 +993,8 @@ public class TTY implements EventNotifier {
                    token.startsWith("-ss") || token.startsWith("-oss") ) {
 
                 javaArgs = addArgument(javaArgs, token);
+            } else if (token.startsWith("-R")) {
+                javaArgs = addArgument(javaArgs, token.substring(2));
             } else if (token.equals("-tclassic")) {
                 usageError("Classic VM no longer supported.");
                 return;
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
index adec7aa98cf..e7090c8c8c8 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
@@ -477,8 +477,9 @@ public class TTYResources extends java.util.ListResourceBundle {
              "    -dbgtrace [flags] print info for debugging {0}\n" +
              "    -tclient          run the application in the HotSpot(TM) Client Compiler\n" +
              "    -tserver          run the application in the HotSpot(TM) Server Compiler\n" +
+             "    -R<option>        forward <option> to debuggee process if launched by jdb, otherwise ignored\n" +
              "\n" +
-             "options forwarded to debuggee process:\n" +
+             "options forwarded to debuggee process if lauched by jdb (shorthand instead of using -R):\n" +
              "    -v -verbose[:class|gc|jni]\n" +
              "                      turn on verbose mode\n" +
              "    -D<name>=<value>  set a system property\n" +
diff --git a/src/jdk.jdi/share/man/jdb.1 b/src/jdk.jdi/share/man/jdb.1
index fb6f04f5c12..dd4aefe1812 100644
--- a/src/jdk.jdi/share/man/jdb.1
+++ b/src/jdk.jdi/share/man/jdb.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
 .\" This code is free software; you can redistribute it and/or modify it
@@ -230,8 +230,9 @@ Runs the application in the Java HotSpot VM server.
 .RE
 .TP
 .B \f[CB]\-J\f[R]\f[I]option\f[R]
-Passes \f[I]option\f[R] to the JVM, where option is one of the options
-described on the reference page for the Java application launcher.
+Passes \f[I]option\f[R] to the JDB JVM, where option is one of the
+options described on the reference page for the Java application
+launcher.
 For example, \f[CB]\-J\-Xms48m\f[R] sets the startup memory to 48 MB.
 See \f[I]Overview of Java Options\f[R] in \f[B]java\f[R].
 .RS
@@ -239,6 +240,15 @@ See \f[I]Overview of Java Options\f[R] in \f[B]java\f[R].
 .PP
 The following options are forwarded to the debuggee process:
 .TP
+.B \f[CB]\-R\f[R]\f[I]option\f[R]
+Passes \f[I]option\f[R] to the debuggee JVM, where option is one of the
+options described on the reference page for the Java application
+launcher.
+For example, \f[CB]\-R\-Xms48m\f[R] sets the startup memory to 48 MB.
+See \f[I]Overview of Java Options\f[R] in \f[B]java\f[R].
+.RS
+.RE
+.TP
 .B \f[CB]\-v\f[R] or \f[CB]\-verbose\f[R][\f[CB]:\f[R]\f[I]class\f[R]|\f[CB]gc\f[R]|\f[CB]jni\f[R]]
 Turns on the verbose mode.
 .RS
diff --git a/test/jdk/com/sun/jdi/JdbOptions.java b/test/jdk/com/sun/jdi/JdbOptions.java
index a4e3bfd356f..4a6c8550fc6 100644
--- a/test/jdk/com/sun/jdi/JdbOptions.java
+++ b/test/jdk/com/sun/jdi/JdbOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,6 +151,22 @@ public class JdbOptions {
                 .expectedArg("-XX:StartFlightRecording:dumponexit=true,maxsize=500M")
                 .expectedArg("-XX:FlightRecorderOptions:repository=jfrrep");
 
+        // -R is tested to see if options are passed through.
+        test("-R-Dprop1=val1",
+                "-R-Dprop2=val 2",
+                "-R-Xmixed",
+                "-R--add-modules", "-Rjdk.attach",
+                "-R-Xcheck:jni",
+                "-R--enable-preview",
+                "-connect",
+                "com.sun.jdi.CommandLineLaunch:vmexec=java,main=" + targ + " " + outFilename + " prop1 prop2")
+                .expectedProp("prop1", "val1")
+                .expectedProp("prop2", "val 2")
+                .expectedArg("-Xmixed")
+                .expectedArg("--add-modules=jdk.attach")
+                .expectedArg("-Xcheck:jni")
+                .expectedArg("--enable-preview");
+
     }
 
     private static class TestResult {
-- 
GitLab


From a244051a8c967039d7639afcaf83f7d92af49613 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Mon, 14 Mar 2022 18:37:41 +0000
Subject: [PATCH 084/345] 8283062: Uninitialized warnings in libgtest with GCC
 11.2

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

diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index cb2bbccc168..f16b9a747bc 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
         $(GTEST_FRAMEWORK_SRC)/googletest/src \
         $(GTEST_FRAMEWORK_SRC)/googlemock/src, \
     INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
-    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral, \
+    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral maybe-uninitialized, \
     DISABLED_WARNINGS_clang := undef unused-result format-nonliteral, \
     CFLAGS := $(JVM_CFLAGS) \
         -I$(GTEST_FRAMEWORK_SRC)/googletest \
-- 
GitLab


From 5ba5e21fd2a02d15d4d56931cae4f9a978470c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 14 Mar 2022 20:28:07 +0000
Subject: [PATCH 085/345] 8282214: Upgrade JQuery to version 3.6.0

Reviewed-by: jjg
---
 .../doclets/formats/html/HtmlDoclet.java      |   2 +-
 .../resources/script-dir/jquery-3.5.1.min.js  |   2 -
 .../{jquery-3.5.1.js => jquery-3.6.0.js}      | 227 +++++++++---------
 .../resources/script-dir/jquery-3.6.0.min.js  |   2 +
 .../doclets/toolkit/util/DocPaths.java        |   2 +-
 src/jdk.javadoc/share/legal/jquery.md         |   8 +-
 .../javadoc/doclet/testSearch/TestSearch.java |   4 +-
 .../jdk/javadoc/tool/api/basic/APITest.java   |   2 +-
 8 files changed, 129 insertions(+), 120 deletions(-)
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.5.1.min.js
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/{jquery-3.5.1.js => jquery-3.6.0.js} (98%)
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.min.js

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
index b33c3900544..e8fb77654d1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -313,7 +313,7 @@ public class HtmlDoclet extends AbstractDoclet {
 
     private void copyJqueryFiles() throws DocletException {
         List<String> files = Arrays.asList(
-                "jquery-3.5.1.min.js",
+                "jquery-3.6.0.min.js",
                 "jquery-ui.min.js",
                 "jquery-ui.min.css",
                 "jquery-ui.structure.min.css",
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.5.1.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.5.1.min.js
deleted file mode 100644
index b0614034ad3..00000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.5.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.5.1.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.js
similarity index 98%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.5.1.js
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.js
index 50937333b99..fc6c299b73e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.5.1.js
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.js
@@ -1,15 +1,15 @@
 /*!
- * jQuery JavaScript Library v3.5.1
+ * jQuery JavaScript Library v3.6.0
  * https://jquery.com/
  *
  * Includes Sizzle.js
  * https://sizzlejs.com/
  *
- * Copyright JS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2020-05-04T22:49Z
+ * Date: 2021-03-02T17:08Z
  */
 ( function( global, factory ) {
 
@@ -76,12 +76,16 @@ var support = {};
 
 var isFunction = function isFunction( obj ) {
 
-      // Support: Chrome <=57, Firefox <=52
-      // In some browsers, typeof returns "function" for HTML <object> elements
-      // (i.e., `typeof document.createElement( "object" ) === "function"`).
-      // We don't want to classify *any* DOM node as a function.
-      return typeof obj === "function" && typeof obj.nodeType !== "number";
-  };
+		// Support: Chrome <=57, Firefox <=52
+		// In some browsers, typeof returns "function" for HTML <object> elements
+		// (i.e., `typeof document.createElement( "object" ) === "function"`).
+		// We don't want to classify *any* DOM node as a function.
+		// Support: QtWeb <=3.8.5, WebKit <=534.34, wkhtmltopdf tool <=0.12.5
+		// Plus for old WebKit, typeof returns "function" for HTML collections
+		// (e.g., `typeof document.getElementsByTagName("div") === "function"`). (gh-4756)
+		return typeof obj === "function" && typeof obj.nodeType !== "number" &&
+			typeof obj.item !== "function";
+	};
 
 
 var isWindow = function isWindow( obj ) {
@@ -147,7 +151,7 @@ function toType( obj ) {
 
 
 var
-	version = "3.5.1",
+	version = "3.6.0",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -401,7 +405,7 @@ jQuery.extend( {
 			if ( isArrayLike( Object( arr ) ) ) {
 				jQuery.merge( ret,
 					typeof arr === "string" ?
-					[ arr ] : arr
+						[ arr ] : arr
 				);
 			} else {
 				push.call( ret, arr );
@@ -496,9 +500,9 @@ if ( typeof Symbol === "function" ) {
 
 // Populate the class2type map
 jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( _i, name ) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
+	function( _i, name ) {
+		class2type[ "[object " + name + "]" ] = name.toLowerCase();
+	} );
 
 function isArrayLike( obj ) {
 
@@ -518,14 +522,14 @@ function isArrayLike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v2.3.5
+ * Sizzle CSS Selector Engine v2.3.6
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2020-03-14
+ * Date: 2021-02-16
  */
 ( function( window ) {
 var i,
@@ -1108,8 +1112,8 @@ support = Sizzle.support = {};
  * @returns {Boolean} True iff elem is a non-HTML XML node
  */
 isXML = Sizzle.isXML = function( elem ) {
-	var namespace = elem.namespaceURI,
-		docElem = ( elem.ownerDocument || elem ).documentElement;
+	var namespace = elem && elem.namespaceURI,
+		docElem = elem && ( elem.ownerDocument || elem ).documentElement;
 
 	// Support: IE <=8
 	// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
@@ -3024,9 +3028,9 @@ var rneedsContext = jQuery.expr.match.needsContext;
 
 function nodeName( elem, name ) {
 
-  return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
 
-};
+}
 var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
 
 
@@ -3997,8 +4001,8 @@ jQuery.extend( {
 			resolveContexts = Array( i ),
 			resolveValues = slice.call( arguments ),
 
-			// the master Deferred
-			master = jQuery.Deferred(),
+			// the primary Deferred
+			primary = jQuery.Deferred(),
 
 			// subordinate callback factory
 			updateFunc = function( i ) {
@@ -4006,30 +4010,30 @@ jQuery.extend( {
 					resolveContexts[ i ] = this;
 					resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
 					if ( !( --remaining ) ) {
-						master.resolveWith( resolveContexts, resolveValues );
+						primary.resolveWith( resolveContexts, resolveValues );
 					}
 				};
 			};
 
 		// Single- and empty arguments are adopted like Promise.resolve
 		if ( remaining <= 1 ) {
-			adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
+			adoptValue( singleValue, primary.done( updateFunc( i ) ).resolve, primary.reject,
 				!remaining );
 
 			// Use .then() to unwrap secondary thenables (cf. gh-3000)
-			if ( master.state() === "pending" ||
+			if ( primary.state() === "pending" ||
 				isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
 
-				return master.then();
+				return primary.then();
 			}
 		}
 
 		// Multiple arguments are aggregated like Promise.all array elements
 		while ( i-- ) {
-			adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
+			adoptValue( resolveValues[ i ], updateFunc( i ), primary.reject );
 		}
 
-		return master.promise();
+		return primary.promise();
 	}
 } );
 
@@ -4180,8 +4184,8 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
 			for ( ; i < len; i++ ) {
 				fn(
 					elems[ i ], key, raw ?
-					value :
-					value.call( elems[ i ], i, fn( elems[ i ], key ) )
+						value :
+						value.call( elems[ i ], i, fn( elems[ i ], key ) )
 				);
 			}
 		}
@@ -5089,10 +5093,7 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 }
 
 
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
+var rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
 
 function returnTrue() {
 	return true;
@@ -5387,8 +5388,8 @@ jQuery.event = {
 			event = jQuery.event.fix( nativeEvent ),
 
 			handlers = (
-					dataPriv.get( this, "events" ) || Object.create( null )
-				)[ event.type ] || [],
+				dataPriv.get( this, "events" ) || Object.create( null )
+			)[ event.type ] || [],
 			special = jQuery.event.special[ event.type ] || {};
 
 		// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5512,12 +5513,12 @@ jQuery.event = {
 			get: isFunction( hook ) ?
 				function() {
 					if ( this.originalEvent ) {
-							return hook( this.originalEvent );
+						return hook( this.originalEvent );
 					}
 				} :
 				function() {
 					if ( this.originalEvent ) {
-							return this.originalEvent[ name ];
+						return this.originalEvent[ name ];
 					}
 				},
 
@@ -5656,7 +5657,13 @@ function leverageNative( el, type, expectSync ) {
 						// Cancel the outer synthetic event
 						event.stopImmediatePropagation();
 						event.preventDefault();
-						return result.value;
+
+						// Support: Chrome 86+
+						// In Chrome, if an element having a focusout handler is blurred by
+						// clicking outside of it, it invokes the handler synchronously. If
+						// that handler calls `.remove()` on the element, the data is cleared,
+						// leaving `result` undefined. We need to guard against this.
+						return result && result.value;
 					}
 
 				// If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5821,34 +5828,7 @@ jQuery.each( {
 	targetTouches: true,
 	toElement: true,
 	touches: true,
-
-	which: function( event ) {
-		var button = event.button;
-
-		// Add which for key events
-		if ( event.which == null && rkeyEvent.test( event.type ) ) {
-			return event.charCode != null ? event.charCode : event.keyCode;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
-			if ( button & 1 ) {
-				return 1;
-			}
-
-			if ( button & 2 ) {
-				return 3;
-			}
-
-			if ( button & 4 ) {
-				return 2;
-			}
-
-			return 0;
-		}
-
-		return event.which;
-	}
+	which: true
 }, jQuery.event.addProp );
 
 jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
@@ -5874,6 +5854,12 @@ jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateTyp
 			return true;
 		},
 
+		// Suppress native focus or blur as it's already being fired
+		// in leverageNative.
+		_default: function() {
+			return true;
+		},
+
 		delegateType: delegateType
 	};
 } );
@@ -6541,6 +6527,10 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 		// set in CSS while `offset*` properties report correct values.
 		// Behavior in IE 9 is more subtle than in newer versions & it passes
 		// some versions of this test; make sure not to make it pass there!
+		//
+		// Support: Firefox 70+
+		// Only Firefox includes border widths
+		// in computed dimensions. (gh-4529)
 		reliableTrDimensions: function() {
 			var table, tr, trChild, trStyle;
 			if ( reliableTrDimensionsVal == null ) {
@@ -6548,17 +6538,32 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 				tr = document.createElement( "tr" );
 				trChild = document.createElement( "div" );
 
-				table.style.cssText = "position:absolute;left:-11111px";
+				table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
+				tr.style.cssText = "border:1px solid";
+
+				// Support: Chrome 86+
+				// Height set through cssText does not get applied.
+				// Computed height then comes back as 0.
 				tr.style.height = "1px";
 				trChild.style.height = "9px";
 
+				// Support: Android 8 Chrome 86+
+				// In our bodyBackground.html iframe,
+				// display for all div elements is set to "inline",
+				// which causes a problem only in Android 8 Chrome 86.
+				// Ensuring the div is display: block
+				// gets around this issue.
+				trChild.style.display = "block";
+
 				documentElement
 					.appendChild( table )
 					.appendChild( tr )
 					.appendChild( trChild );
 
 				trStyle = window.getComputedStyle( tr );
-				reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
+				reliableTrDimensionsVal = ( parseInt( trStyle.height, 10 ) +
+					parseInt( trStyle.borderTopWidth, 10 ) +
+					parseInt( trStyle.borderBottomWidth, 10 ) ) === tr.offsetHeight;
 
 				documentElement.removeChild( table );
 			}
@@ -7022,10 +7027,10 @@ jQuery.each( [ "height", "width" ], function( _i, dimension ) {
 					// Running getBoundingClientRect on a disconnected node
 					// in IE throws an error.
 					( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
-						swap( elem, cssShow, function() {
-							return getWidthOrHeight( elem, dimension, extra );
-						} ) :
-						getWidthOrHeight( elem, dimension, extra );
+					swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, dimension, extra );
+					} ) :
+					getWidthOrHeight( elem, dimension, extra );
 			}
 		},
 
@@ -7084,7 +7089,7 @@ jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
 					swap( elem, { marginLeft: 0 }, function() {
 						return elem.getBoundingClientRect().left;
 					} )
-				) + "px";
+			) + "px";
 		}
 	}
 );
@@ -7223,7 +7228,7 @@ Tween.propHooks = {
 			if ( jQuery.fx.step[ tween.prop ] ) {
 				jQuery.fx.step[ tween.prop ]( tween );
 			} else if ( tween.elem.nodeType === 1 && (
-					jQuery.cssHooks[ tween.prop ] ||
+				jQuery.cssHooks[ tween.prop ] ||
 					tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) {
 				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
 			} else {
@@ -7468,7 +7473,7 @@ function defaultPrefilter( elem, props, opts ) {
 
 			anim.done( function() {
 
-			/* eslint-enable no-loop-func */
+				/* eslint-enable no-loop-func */
 
 				// The final step of a "hide" animation is actually hiding the element
 				if ( !hidden ) {
@@ -7588,7 +7593,7 @@ function Animation( elem, properties, options ) {
 			tweens: [],
 			createTween: function( prop, end ) {
 				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+					animation.opts.specialEasing[ prop ] || animation.opts.easing );
 				animation.tweens.push( tween );
 				return tween;
 			},
@@ -7761,7 +7766,8 @@ jQuery.fn.extend( {
 					anim.stop( true );
 				}
 			};
-			doAnimation.finish = doAnimation;
+
+		doAnimation.finish = doAnimation;
 
 		return empty || optall.queue === false ?
 			this.each( doAnimation ) :
@@ -8401,8 +8407,8 @@ jQuery.fn.extend( {
 				if ( this.setAttribute ) {
 					this.setAttribute( "class",
 						className || value === false ?
-						"" :
-						dataPriv.get( this, "__className__" ) || ""
+							"" :
+							dataPriv.get( this, "__className__" ) || ""
 					);
 				}
 			}
@@ -8417,7 +8423,7 @@ jQuery.fn.extend( {
 		while ( ( elem = this[ i++ ] ) ) {
 			if ( elem.nodeType === 1 &&
 				( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
-					return true;
+				return true;
 			}
 		}
 
@@ -8707,9 +8713,7 @@ jQuery.extend( jQuery.event, {
 				special.bindType || type;
 
 			// jQuery handler
-			handle = (
-					dataPriv.get( cur, "events" ) || Object.create( null )
-				)[ event.type ] &&
+			handle = ( dataPriv.get( cur, "events" ) || Object.create( null ) )[ event.type ] &&
 				dataPriv.get( cur, "handle" );
 			if ( handle ) {
 				handle.apply( cur, data );
@@ -8856,7 +8860,7 @@ var rquery = ( /\?/ );
 
 // Cross-browser xml parsing
 jQuery.parseXML = function( data ) {
-	var xml;
+	var xml, parserErrorElem;
 	if ( !data || typeof data !== "string" ) {
 		return null;
 	}
@@ -8865,12 +8869,17 @@ jQuery.parseXML = function( data ) {
 	// IE throws on parseFromString with invalid input.
 	try {
 		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
-	} catch ( e ) {
-		xml = undefined;
-	}
+	} catch ( e ) {}
 
-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
+	parserErrorElem = xml && xml.getElementsByTagName( "parsererror" )[ 0 ];
+	if ( !xml || parserErrorElem ) {
+		jQuery.error( "Invalid XML: " + (
+			parserErrorElem ?
+				jQuery.map( parserErrorElem.childNodes, function( el ) {
+					return el.textContent;
+				} ).join( "\n" ) :
+				data
+		) );
 	}
 	return xml;
 };
@@ -8971,16 +8980,14 @@ jQuery.fn.extend( {
 			// Can add propHook for "elements" to filter or add form elements
 			var elements = jQuery.prop( this, "elements" );
 			return elements ? jQuery.makeArray( elements ) : this;
-		} )
-		.filter( function() {
+		} ).filter( function() {
 			var type = this.type;
 
 			// Use .is( ":disabled" ) so that fieldset[disabled] works
 			return this.name && !jQuery( this ).is( ":disabled" ) &&
 				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
 				( this.checked || !rcheckableType.test( type ) );
-		} )
-		.map( function( _i, elem ) {
+		} ).map( function( _i, elem ) {
 			var val = jQuery( this ).val();
 
 			if ( val == null ) {
@@ -9033,7 +9040,8 @@ var
 
 	// Anchor tag for parsing the document origin
 	originAnchor = document.createElement( "a" );
-	originAnchor.href = location.href;
+
+originAnchor.href = location.href;
 
 // Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
 function addToPrefiltersOrTransports( structure ) {
@@ -9414,8 +9422,8 @@ jQuery.extend( {
 			// Context for global events is callbackContext if it is a DOM node or jQuery collection
 			globalEventContext = s.context &&
 				( callbackContext.nodeType || callbackContext.jquery ) ?
-					jQuery( callbackContext ) :
-					jQuery.event,
+				jQuery( callbackContext ) :
+				jQuery.event,
 
 			// Deferreds
 			deferred = jQuery.Deferred(),
@@ -9727,8 +9735,10 @@ jQuery.extend( {
 				response = ajaxHandleResponses( s, jqXHR, responses );
 			}
 
-			// Use a noop converter for missing script
-			if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+			// Use a noop converter for missing script but not if jsonp
+			if ( !isSuccess &&
+				jQuery.inArray( "script", s.dataTypes ) > -1 &&
+				jQuery.inArray( "json", s.dataTypes ) < 0 ) {
 				s.converters[ "text script" ] = function() {};
 			}
 
@@ -10466,12 +10476,6 @@ jQuery.offset = {
 			options.using.call( elem, props );
 
 		} else {
-			if ( typeof props.top === "number" ) {
-				props.top += "px";
-			}
-			if ( typeof props.left === "number" ) {
-				props.left += "px";
-			}
 			curElem.css( props );
 		}
 	}
@@ -10640,8 +10644,11 @@ jQuery.each( [ "top", "left" ], function( _i, prop ) {
 
 // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
 jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
-		function( defaultExtra, funcName ) {
+	jQuery.each( {
+		padding: "inner" + name,
+		content: type,
+		"": "outer" + name
+	}, function( defaultExtra, funcName ) {
 
 		// Margin is only for outerHeight, outerWidth
 		jQuery.fn[ funcName ] = function( margin, value ) {
@@ -10726,7 +10733,8 @@ jQuery.fn.extend( {
 	}
 } );
 
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+jQuery.each(
+	( "blur focus focusin focusout resize scroll click dblclick " +
 	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
 	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
 	function( _i, name ) {
@@ -10737,7 +10745,8 @@ jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
 				this.on( name, null, data, fn ) :
 				this.trigger( name );
 		};
-	} );
+	}
+);
 
 
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.min.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.min.js
new file mode 100644
index 00000000000..c4c6022f298
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.6.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=qt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+Rt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Wt(Pt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Bt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
index b96ada5367b..b8c90fee823 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
@@ -104,7 +104,7 @@ public class DocPaths {
     public static final DocPath JQUERY_OVERRIDES_CSS = DocPath.create("jquery-ui.overrides.css");
 
     /** The name of the default jQuery javascript file. */
-    public static final DocPath JQUERY_JS = DocPath.create("jquery-3.5.1.min.js");
+    public static final DocPath JQUERY_JS = DocPath.create("jquery-3.6.0.min.js");
 
     /** The name of the default jQuery UI stylesheet file. */
     public static final DocPath JQUERY_UI_CSS = DocPath.create("jquery-ui.min.css");
diff --git a/src/jdk.javadoc/share/legal/jquery.md b/src/jdk.javadoc/share/legal/jquery.md
index 8054a34c830..f7b72e3fbec 100644
--- a/src/jdk.javadoc/share/legal/jquery.md
+++ b/src/jdk.javadoc/share/legal/jquery.md
@@ -1,9 +1,9 @@
-## jQuery v3.5.1
+## jQuery v3.6.0
 
 ### jQuery License
 ```
-jQuery v 3.5.1
-Copyright JS Foundation and other contributors, https://js.foundation/
+jQuery v 3.6.0
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************
 
-The jQuery JavaScript Library v3.5.1 also includes Sizzle.js
+The jQuery JavaScript Library v3.6.0 also includes Sizzle.js
 
 Sizzle.js includes the following license:
 
diff --git a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
index d25dba1df22..3d316571811 100644
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
@@ -411,7 +411,7 @@ public class TestSearch extends JavadocTester {
                     <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
                     """,
                 """
-                    <script type="text/javascript" src="script-dir/jquery-3.5.1.min.js"></script>
+                    <script type="text/javascript" src="script-dir/jquery-3.6.0.min.js"></script>
                     """,
                 """
                     <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>""",
@@ -684,7 +684,7 @@ public class TestSearch extends JavadocTester {
         checkFiles(expectedOutput,
                 "search.js",
                 "jquery-ui.overrides.css",
-                "script-dir/jquery-3.5.1.min.js",
+                "script-dir/jquery-3.6.0.min.js",
                 "script-dir/jquery-ui.min.js",
                 "script-dir/jquery-ui.min.css",
                 "script-dir/jquery-ui.structure.min.css",
diff --git a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
index a0d68d85403..3a5ddda8261 100644
--- a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
+++ b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
@@ -201,7 +201,7 @@ class APITest {
             "help-doc.html",
             "index-all.html",
             "index.html",
-            "script-dir/jquery-3.5.1.min.js",
+            "script-dir/jquery-3.6.0.min.js",
             "script-dir/jquery-ui.min.js",
             "script-dir/jquery-ui.min.css",
             "script-dir/jquery-ui.structure.min.css",
-- 
GitLab


From 6013d09e82693a1c07cf0bf6daffd95114b3cbfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 14 Mar 2022 20:29:15 +0000
Subject: [PATCH 086/345] 8268866: Javascript when used in an iframe cannot
 display search results

Reviewed-by: jjg
---
 .../doclets/formats/html/resources/search.js.template       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
index b5c92aefeb3..27ad08ad580 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
@@ -359,11 +359,7 @@ $(function() {
                 } else if (ui.item.category === catSearchTags) {
                     url += ui.item.u;
                 }
-                if (top !== window) {
-                    parent.classFrame.location = pathtoroot + url;
-                } else {
-                    window.location.href = pathtoroot + url;
-                }
+                window.location.href = pathtoroot + url;
                 $("#search-input").focus();
             }
         }
-- 
GitLab


From 34d4ffcea5d71560c549655967de863342b48984 Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Tue, 15 Mar 2022 07:24:50 +0000
Subject: [PATCH 087/345] 8279317:
 compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java assumes immutable
 code

Reviewed-by: dnsimon, iveresov
---
 .../compilerToVM/DisassembleCodeBlobTest.java | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
index 9d26ed16eb6..ec5b9337b49 100644
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
@@ -83,6 +83,11 @@ public class DisassembleCodeBlobTest {
                 + " : non-null return value for invalid installCode");
     }
 
+    private void checkLineStart(CompileCodeTestCase testCase, String line, String match) {
+        Asserts.assertTrue(line.startsWith(match),
+                testCase + " : line \"" + line + "\" does not start with: \"" + match +"\"");
+    }
+
     private void check(CompileCodeTestCase testCase) {
         System.out.println(testCase);
         // to have a clean state
@@ -98,19 +103,33 @@ public class DisassembleCodeBlobTest {
         }
         // The very first call to the disassembler contains a string specifying the
         // architecture: [Disassembling for mach='i386:x86-64']
-        // Therefore compare strings 2 and 3.
+        // so discard it and try again.
         String str2 = CompilerToVMHelper.disassembleCodeBlob(installedCode);
-        String str3 = CompilerToVMHelper.disassembleCodeBlob(installedCode);
-        String[] str2Lines = str2.split(System.lineSeparator());
-        String[] str3Lines = str3.split(System.lineSeparator());
-        // skip the first two lines since it contains a timestamp that may vary from different invocations
-        // <empty-line>
-        // Compiled method (c2)     309  463       4       compiler.jvmci.compilerToVM.CompileCodeTestCase$Dummy::staticMethod (1 bytes)
-        // <empty-line>
-        // Compiled method (c2)     310  463       4       compiler.jvmci.compilerToVM.CompileCodeTestCase$Dummy::staticMethod (1 bytes)
-        for (int i = 2; i < str2Lines.length; i++) {
-            Asserts.assertEQ(str2Lines[i], str3Lines[i],
-                testCase + " : 3nd invocation returned different value from 2nd");
+        String[] strLines = str2.split("\\R");
+        // Check some basic layout
+        int MIN_LINES = 5;
+        Asserts.assertTrue(strLines.length > 2,
+            testCase + " : read " + strLines.length + " lines, " + MIN_LINES + " expected");
+        int l = 1;
+        checkLineStart(testCase, strLines[l++], "Compiled method "); // 2
+        checkLineStart(testCase, strLines[l++], " total in heap  "); // 3
+        int foundDisassemblyLine = -1;
+        int foundEntryPointLine = -1;
+        for (; l < strLines.length; ++l) {
+            String line = strLines[l];
+            if (line.equals("[Disassembly]") || line.equals("[MachCode]")) {
+                Asserts.assertTrue(foundDisassemblyLine == -1,
+                    testCase + " : Duplicate disassembly section markers found at lines " + foundDisassemblyLine + " and " + l);
+                foundDisassemblyLine = l;
+            }
+            if (line.equals("[Entry Point]") || line.equals("[Verified Entry Point]")) {
+                Asserts.assertTrue(foundDisassemblyLine != -1,
+                    testCase + " : entry point found but [Disassembly] section missing ");
+                foundEntryPointLine = l;
+                break;
+            }
         }
+        Asserts.assertTrue(foundDisassemblyLine != -1, testCase + " : no disassembly section found");
+        Asserts.assertTrue(foundEntryPointLine != -1, testCase + " : no entry point found");
     }
 }
-- 
GitLab


From 710653ce1856d13161ae1786d7c5f71997536e78 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Tue, 15 Mar 2022 12:59:54 +0000
Subject: [PATCH 088/345] 8254786: java/net/httpclient/CancelRequestTest.java
 failing intermittently

Reviewed-by: jpai, michaelm
---
 .../jdk/internal/net/http/Exchange.java       | 53 ++++++++++++++-----
 .../internal/net/http/Http2ClientImpl.java    | 12 +++--
 .../internal/net/http/Http2Connection.java    |  6 ++-
 .../net/httpclient/CancelRequestTest.java     |  4 +-
 4 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
index 36af3005032..8c9282c0579 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,14 +144,45 @@ final class Exchange<T> {
         private volatile boolean closeRequested;
 
         void connection(HttpConnection connection) {
-            this.connection = connection;
-            if (closeRequested) closeConnection();
+            boolean closeRequested;
+            synchronized (this) {
+                // check whether this new connection should be
+                // closed
+                closeRequested = this.closeRequested;
+                if (!closeRequested) {
+                    this.connection = connection;
+                } else {
+                    // assert this.connection == null
+                    this.closeRequested = false;
+                }
+            }
+            if (closeRequested) closeConnection(connection);
         }
 
         void closeConnection() {
-            closeRequested = true;
-            HttpConnection connection = this.connection;
-            this.connection = null;
+            HttpConnection connection;
+            synchronized (this) {
+                connection = this.connection;
+                if (connection == null) {
+                    closeRequested = true;
+                } else {
+                    this.connection = null;
+                }
+            }
+            closeConnection(connection);
+        }
+
+        HttpConnection disable() {
+            HttpConnection connection;
+            synchronized (this) {
+                connection = this.connection;
+                this.connection = null;
+                this.closeRequested = false;
+            }
+            return connection;
+        }
+
+        private static void closeConnection(HttpConnection connection) {
             if (connection != null) {
                 try {
                     connection.close();
@@ -160,11 +191,6 @@ final class Exchange<T> {
                 }
             }
         }
-
-        void disable() {
-            connection = null;
-            closeRequested = false;
-        }
     }
 
     // Called for 204 response - when no body is permitted
@@ -524,8 +550,11 @@ final class Exchange<T> {
                                                  client.client2(),
                                                  this, e::drainLeftOverBytes)
                         .thenCompose((Http2Connection c) -> {
+                            HttpConnection connection = connectionAborter.disable();
                             boolean cached = c.offerConnection();
-                            if (cached) connectionAborter.disable();
+                            if (!cached && connection != null) {
+                                connectionAborter.connection(connection);
+                            }
                             Stream<T> s = c.getStream(1);
 
                             if (s == null) {
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
index 4101133a025..c3861b2ad9f 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package jdk.internal.net.http;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.Base64;
@@ -101,7 +100,7 @@ class Http2ClientImpl {
             Http2Connection connection = connections.get(key);
             if (connection != null) {
                 try {
-                    if (connection.closed || !connection.reserveStream(true)) {
+                    if (!connection.isOpen() || !connection.reserveStream(true)) {
                         if (debug.on())
                             debug.log("removing found closed or closing connection: %s", connection);
                         deleteConnection(connection);
@@ -153,7 +152,7 @@ class Http2ClientImpl {
      */
     boolean offerConnection(Http2Connection c) {
         if (debug.on()) debug.log("offering to the connection pool: %s", c);
-        if (c.closed || c.finalStream()) {
+        if (!c.isOpen() || c.finalStream()) {
             if (debug.on())
                 debug.log("skipping offered closed or closing connection: %s", c);
             return false;
@@ -161,6 +160,11 @@ class Http2ClientImpl {
 
         String key = c.key();
         synchronized(this) {
+            if (!c.isOpen()) {
+                if (debug.on())
+                    debug.log("skipping offered closed or closing connection: %s", c);
+                return false;
+            }
             Http2Connection c1 = connections.putIfAbsent(key, c);
             if (c1 != null) {
                 c.setFinalStream();
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
index 6a07d755e69..8cd9db1210a 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -880,6 +880,10 @@ class Http2Connection  {
         }
     }
 
+    boolean isOpen() {
+        return !closed && connection.channel().isOpen();
+    }
+
     void resetStream(int streamid, int code) {
         try {
             if (connection.channel().isOpen()) {
diff --git a/test/jdk/java/net/httpclient/CancelRequestTest.java b/test/jdk/java/net/httpclient/CancelRequestTest.java
index de48316a25b..95d56fdbcce 100644
--- a/test/jdk/java/net/httpclient/CancelRequestTest.java
+++ b/test/jdk/java/net/httpclient/CancelRequestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8245462 8229822
+ * @bug 8245462 8229822 8254786
  * @summary Tests cancelling the request.
  * @library /test/lib http2/server
  * @key randomness
-- 
GitLab


From 2cddf3f5391518ea40796e6c4759047d51b7b312 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Tue, 15 Mar 2022 14:16:35 +0000
Subject: [PATCH 089/345] 8282887: Potential memory leak in
 sun.util.locale.provider.HostLocaleProviderAdapterImpl.getNumberPattern() on
 Windows

Reviewed-by: naoto, alanb
---
 .../native/libjava/HostLocaleProviderAdapter_md.c     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
index 5d5f3ab476e..ebbad326146 100644
--- a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
+++ b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
@@ -359,18 +359,17 @@ JNIEXPORT jobjectArray JNICALL Java_sun_util_locale_provider_HostLocaleProviderA
 JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getNumberPattern
   (JNIEnv *env, jclass cls, jint numberStyle, jstring jlangtag) {
     const jchar *langtag;
-    jstring ret;
+    jstring ret = NULL;
     WCHAR * pattern;
 
     langtag = (*env)->GetStringChars(env, jlangtag, NULL);
     CHECK_NULL_RETURN(langtag, NULL);
     pattern = getNumberPattern(langtag, numberStyle);
-    CHECK_NULL_RETURN(pattern, NULL);
-
+    if (!IS_NULL(pattern)) {
+        ret = (*env)->NewString(env, pattern, (jsize)wcslen(pattern));
+        free(pattern);
+    }
     (*env)->ReleaseStringChars(env, jlangtag, langtag);
-    ret = (*env)->NewString(env, pattern, (jsize)wcslen(pattern));
-    free(pattern);
-
     return ret;
 }
 
-- 
GitLab


From 4de72014d3a33469399fec6f428f35c47c4cfbe0 Mon Sep 17 00:00:00 2001
From: Tyler Steele <tyler.steele@ibm.com>
Date: Tue, 15 Mar 2022 14:52:27 +0000
Subject: [PATCH 090/345] 8283122: [AIX, s390] UnsafeCopyMemory 'Mismatched'
 Tests Fail on Big Endian Systems

Reviewed-by: thartmann, stuefe
---
 .../jtreg/compiler/unsafe/UnsafeCopyMemory.java     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java
index 51cbb5e8c2f..eb6f065305e 100644
--- a/test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java
+++ b/test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,11 +36,14 @@
 package compiler.unsafe;
 
 import jdk.internal.misc.Unsafe;
+import java.nio.ByteOrder;
 import static jdk.test.lib.Asserts.assertEQ;
 
 public class UnsafeCopyMemory {
     static private Unsafe UNSAFE = Unsafe.getUnsafe();
 
+    static final boolean IS_BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+
     // On-heap arrays
     static int[] srcArr = new int[1];
     static int[] dstArr = new int[1];
@@ -104,8 +107,12 @@ public class UnsafeCopyMemory {
         srcArr [readIdx]  = v1;
         dstArrL[writeIdx] = v2;
 
+        // On LE systems, low-order bytes of long and int overlap, but
+        // on BE systems, they differ by the size of an int.
+        long mismatchedOffset = Unsafe.ARRAY_LONG_BASE_OFFSET + (IS_BIG_ENDIAN ? 4 : 0);
+
         UNSAFE.copyMemory(srcArr,  Unsafe.ARRAY_INT_BASE_OFFSET,
-                          dstArrL, Unsafe.ARRAY_LONG_BASE_OFFSET, 4); // mismatched
+                          dstArrL, mismatchedOffset, 4); // mismatched
         long r = resArrL[0]; // snapshot
 
         srcArr[readIdx]  = v3;
@@ -156,6 +163,7 @@ public class UnsafeCopyMemory {
 
         Object srcArrLocal = (flag ? srcArrIntLocal               : srcArrLongLocal);
         long   srcOffset   = (flag ? Unsafe.ARRAY_INT_BASE_OFFSET : Unsafe.ARRAY_LONG_BASE_OFFSET);
+        srcOffset += (!flag && IS_BIG_ENDIAN ? 4 : 0);
 
         srcArrIntLocal[0]  = v1;
         srcArrLongLocal[0] = v1;
@@ -179,6 +187,7 @@ public class UnsafeCopyMemory {
 
         Object dstArrLocal = (flag ? dstArrIntLocal               : dstArrLongLocal);
         long   dstOffset   = (flag ? Unsafe.ARRAY_INT_BASE_OFFSET : Unsafe.ARRAY_LONG_BASE_OFFSET);
+        dstOffset += (!flag && IS_BIG_ENDIAN ? 4 : 0);
 
         srcArr[readIdx] = v1;
         dstArrIntLocal[0]  = v2;
-- 
GitLab


From f43ffe211f8ff287697092c39e4c25a16b40a383 Mon Sep 17 00:00:00 2001
From: Hai-May Chao <hchao@openjdk.org>
Date: Tue, 15 Mar 2022 15:54:47 +0000
Subject: [PATCH 091/345] 8282633: jarsigner output does not explain why an EC
 key is disabled if its curve has been disabled

Reviewed-by: weijun
---
 .../sun/security/tools/keytool/Main.java      |  30 ++----
 .../classes/sun/security/util/KeyUtil.java    |  24 ++++-
 .../sun/security/tools/jarsigner/Main.java    |  35 ++++--
 .../security/tools/jarsigner/Resources.java   |   2 +
 .../tools/jarsigner/DisableCurveTest.java     | 100 ++++++++++++++++++
 5 files changed, 160 insertions(+), 31 deletions(-)
 create mode 100644 test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java

diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 032fcd768ea..462606c7f84 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -42,8 +42,6 @@ import java.security.cert.TrustAnchor;
 import java.security.cert.URICertStoreParameters;
 
 
-import java.security.interfaces.ECKey;
-import java.security.interfaces.EdECKey;
 import java.security.spec.ECParameterSpec;
 import java.text.Collator;
 import java.text.MessageFormat;
@@ -2018,7 +2016,7 @@ public final class Main {
                     ("Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for"));
             Object[] source = {
                     groupName == null ? keysize : KeyUtil.getKeySize(privKey),
-                    fullDisplayAlgName(privKey),
+                    KeyUtil.fullDisplayAlgName(privKey),
                     newCert.getSigAlgName(),
                     signerAlias,
                     validity,
@@ -2029,7 +2027,7 @@ public final class Main {
                     ("Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for"));
             Object[] source = {
                     groupName == null ? keysize : KeyUtil.getKeySize(privKey),
-                    fullDisplayAlgName(privKey),
+                    KeyUtil.fullDisplayAlgName(privKey),
                     newCert.getSigAlgName(),
                     validity,
                     x500Name};
@@ -3560,24 +3558,10 @@ public final class Main {
         }
     }
 
-    private String fullDisplayAlgName(Key key) {
-        String result = key.getAlgorithm();
-        if (key instanceof ECKey) {
-            ECParameterSpec paramSpec = ((ECKey) key).getParams();
-            if (paramSpec instanceof NamedCurve) {
-                NamedCurve nc = (NamedCurve)paramSpec;
-                result += " (" + nc.getNameAndAliases()[0] + ")";
-            }
-        } else if (key instanceof EdECKey) {
-            result = ((EdECKey) key).getParams().getName();
-        }
-        return result;
-    }
-
     private String withWeakConstraint(Key key,
             CertPathConstraintsParameters cpcp) {
         int kLen = KeyUtil.getKeySize(key);
-        String displayAlg = fullDisplayAlgName(key);
+        String displayAlg = KeyUtil.fullDisplayAlgName(key);
         try {
             DISABLED_CHECK.permits(key.getAlgorithm(), cpcp, true);
         } catch (CertPathValidatorException e) {
@@ -4946,13 +4930,13 @@ public final class Main {
                     weakWarnings.add(String.format(
                             rb.getString("whose.key.weak"), label,
                             String.format(rb.getString("key.bit"),
-                            KeyUtil.getKeySize(key), fullDisplayAlgName(key))));
+                            KeyUtil.getKeySize(key), KeyUtil.fullDisplayAlgName(key))));
                 }
             } catch (CertPathValidatorException e) {
                 weakWarnings.add(String.format(
                         rb.getString("whose.key.disabled"), label,
                         String.format(rb.getString("key.bit"),
-                        KeyUtil.getKeySize(key), fullDisplayAlgName(key))));
+                        KeyUtil.getKeySize(key), KeyUtil.fullDisplayAlgName(key))));
             }
         }
     }
@@ -4973,12 +4957,12 @@ public final class Main {
                 weakWarnings.add(String.format(
                     rb.getString("whose.key.disabled"), label,
                     String.format(rb.getString("key.bit"),
-                    KeyUtil.getKeySize(key), fullDisplayAlgName(key))));
+                    KeyUtil.getKeySize(key), KeyUtil.fullDisplayAlgName(key))));
             } else if (!LEGACY_CHECK.permits(SIG_PRIMITIVE_SET, key)) {
                 weakWarnings.add(String.format(
                     rb.getString("whose.key.weak"), label,
                     String.format(rb.getString("key.bit"),
-                    KeyUtil.getKeySize(key), fullDisplayAlgName(key))));
+                    KeyUtil.getKeySize(key), KeyUtil.fullDisplayAlgName(key))));
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/security/util/KeyUtil.java b/src/java.base/share/classes/sun/security/util/KeyUtil.java
index a20ebffa5ff..3648447e10e 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -190,6 +190,28 @@ public final class KeyUtil {
         return -1;
     }
 
+    /**
+     * Returns the algorithm name of the given key object. If an EC key is
+     * specified, returns the algorithm name and its named curve.
+     *
+     * @param key the key object, cannot be null
+     * @return the algorithm name of the given key object, or return in the
+     *       form of "EC (named curve)" if the given key object is an EC key
+     */
+    public static final String fullDisplayAlgName(Key key) {
+        String result = key.getAlgorithm();
+        if (key instanceof ECKey) {
+            ECParameterSpec paramSpec = ((ECKey) key).getParams();
+            if (paramSpec instanceof NamedCurve) {
+                NamedCurve nc = (NamedCurve)paramSpec;
+                result += " (" + nc.getNameAndAliases()[0] + ")";
+            }
+        } else if (key instanceof EdECKey) {
+            result = ((EdECKey) key).getParams().getName();
+        }
+        return result;
+    }
+
     /**
      * Returns whether the key is valid or not.
      * <P>
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
index 750b125f10d..1b9e23f0fde 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -30,6 +30,7 @@ import java.net.UnknownHostException;
 import java.net.URLClassLoader;
 import java.security.cert.CertPathValidatorException;
 import java.security.cert.PKIXBuilderParameters;
+import java.security.interfaces.ECKey;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.*;
@@ -1244,13 +1245,13 @@ public class Main {
             if ((legacyAlg & 8) == 8) {
                 warnings.add(String.format(
                         rb.getString("The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update."),
-                        privateKey.getAlgorithm(), KeyUtil.getKeySize(privateKey)));
+                        KeyUtil.fullDisplayAlgName(privateKey), KeyUtil.getKeySize(privateKey)));
             }
 
             if ((disabledAlg & 8) == 8) {
                 errors.add(String.format(
                         rb.getString("The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.and.is.disabled."),
-                        privateKey.getAlgorithm(), KeyUtil.getKeySize(privateKey)));
+                        KeyUtil.fullDisplayAlgName(privateKey), KeyUtil.getKeySize(privateKey)));
             }
         } else {
             if ((legacyAlg & 1) != 0) {
@@ -1274,7 +1275,7 @@ public class Main {
             if ((legacyAlg & 8) == 8) {
                 warnings.add(String.format(
                         rb.getString("The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update."),
-                        weakPublicKey.getAlgorithm(), KeyUtil.getKeySize(weakPublicKey)));
+                        KeyUtil.fullDisplayAlgName(weakPublicKey), KeyUtil.getKeySize(weakPublicKey)));
             }
         }
 
@@ -1451,7 +1452,12 @@ public class Main {
             JAR_DISABLED_CHECK.permits(key.getAlgorithm(), jcp, true);
         } catch (CertPathValidatorException e) {
             disabledAlgFound = true;
-            return String.format(rb.getString("key.bit.disabled"), kLen);
+            if (key instanceof ECKey) {
+                return String.format(rb.getString("key.bit.eccurve.disabled"), kLen,
+                        KeyUtil.fullDisplayAlgName(key));
+            } else {
+                return String.format(rb.getString("key.bit.disabled"), kLen);
+            }
         }
         try {
             LEGACY_CHECK.permits(key.getAlgorithm(), jcp, true);
@@ -1463,7 +1469,12 @@ public class Main {
         } catch (CertPathValidatorException e) {
             weakPublicKey = key;
             legacyAlg |= 8;
-            return String.format(rb.getString("key.bit.weak"), kLen);
+            if (key instanceof ECKey) {
+                return String.format(rb.getString("key.bit.eccurve.weak"), kLen,
+                        KeyUtil.fullDisplayAlgName(key));
+            } else {
+                return String.format(rb.getString("key.bit.weak"), kLen);
+            }
         }
     }
 
@@ -1516,7 +1527,12 @@ public class Main {
         try {
             CERTPATH_DISABLED_CHECK.permits(key.getAlgorithm(), cpcp, true);
         } catch (CertPathValidatorException e) {
-            return String.format(rb.getString("key.bit.disabled"), kLen);
+            if (key instanceof ECKey) {
+                return String.format(rb.getString("key.bit.eccurve.disabled"), kLen,
+                        KeyUtil.fullDisplayAlgName(key));
+            } else {
+                return String.format(rb.getString("key.bit.disabled"), kLen);
+            }
         }
         try {
             LEGACY_CHECK.permits(key.getAlgorithm(), cpcp, true);
@@ -1526,7 +1542,12 @@ public class Main {
                 return rb.getString("unknown.size");
             }
         } catch (CertPathValidatorException e) {
-            return String.format(rb.getString("key.bit.weak"), kLen);
+            if (key instanceof ECKey) {
+                return String.format(rb.getString("key.bit.eccurve.weak"), kLen,
+                        KeyUtil.fullDisplayAlgName(key));
+            } else {
+                return String.format(rb.getString("key.bit.weak"), kLen);
+            }
         }
     }
 
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
index f5a1bb2e3cb..37a1f24f90d 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
@@ -181,7 +181,9 @@ public class Resources extends java.util.ListResourceBundle {
         {"with.algparams.disabled", "%1$s using %2$s (disabled)"},
         {"key.bit", "%d-bit key"},
         {"key.bit.weak", "%d-bit key (weak)"},
+        {"key.bit.eccurve.weak", "%1$d-bit %2$s key (weak)"},
         {"key.bit.disabled", "%d-bit key (disabled)"},
+        {"key.bit.eccurve.disabled", "%1$d-bit %2$s key (disabled)"},
         {"unknown.size", "unknown size"},
         {"extra.attributes.detected", "POSIX file permission and/or symlink attributes detected. These attributes are ignored when signing and are not protected by the signature."},
 
diff --git a/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java b/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java
new file mode 100644
index 00000000000..9270899182c
--- /dev/null
+++ b/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282633
+ * @summary jarsigner should display the named curve to better explain why
+ *          an EC key is disabled or will be disabled.
+ * @library /test/lib
+ */
+
+import jdk.test.lib.SecurityTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.util.JarUtils;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class DisableCurveTest {
+    private static final String JAVA_SECURITY_FILE = "java.security";
+
+    public static void main(String[] args) throws Exception{
+        SecurityTools.keytool("-keystore ks -storepass changeit " +
+                "-genkeypair -keyalg EC -alias ca -dname CN=CA " +
+                "-ext bc:c")
+                .shouldHaveExitValue(0);
+
+        JarUtils.createJarFile(Path.of("a.jar"), Path.of("."), Path.of("ks"));
+
+        Files.writeString(Files.createFile(Paths.get(JAVA_SECURITY_FILE)),
+                "jdk.jar.disabledAlgorithms=secp256r1\n" +
+                "jdk.certpath.disabledAlgorithms=secp256r1\n");
+
+        SecurityTools.jarsigner("-keystore ks -storepass changeit " +
+                "-signedjar signeda.jar -verbose " +
+                "-J-Djava.security.properties=" +
+                JAVA_SECURITY_FILE +
+                " a.jar ca")
+                .shouldContain(">>> Signer")
+                .shouldContain("Signature algorithm: SHA256withECDSA, 256-bit EC (secp256r1) key (disabled)")
+                .shouldContain("Warning:")
+                .shouldContain("The EC (secp256r1) signing key has a keysize of 256 which is considered a security risk and is disabled")
+                .shouldHaveExitValue(0);
+
+        SecurityTools.jarsigner("-verify signeda.jar " +
+                "-J-Djava.security.properties=" +
+                JAVA_SECURITY_FILE +
+                " -keystore ks -storepass changeit -verbose -debug")
+                .shouldContain("- Signed by")
+                .shouldContain("Signature algorithm: SHA256withECDSA, 256-bit EC (secp256r1) key (disabled)")
+                .shouldContain("WARNING: The jar will be treated as unsigned")
+                .shouldHaveExitValue(0);
+
+        Files.deleteIfExists(Paths.get(JAVA_SECURITY_FILE));
+        Files.writeString(Files.createFile(Paths.get(JAVA_SECURITY_FILE)),
+                "jdk.security.legacyAlgorithms=secp256r1\n");
+
+        SecurityTools.jarsigner("-keystore ks -storepass changeit " +
+                "-signedjar signeda.jar -verbose " +
+                "-J-Djava.security.properties=" +
+                JAVA_SECURITY_FILE +
+                " a.jar ca")
+                .shouldContain(">>> Signer")
+                .shouldContain("Signature algorithm: SHA256withECDSA, 256-bit EC (secp256r1) key (weak)")
+                .shouldContain("Warning:")
+                .shouldContain("The EC (secp256r1) signing key has a keysize of 256 which is considered a security risk. This key size will be disabled in a future update")
+                .shouldHaveExitValue(0);
+
+        SecurityTools.jarsigner("-verify signeda.jar " +
+                "-J-Djava.security.properties=" +
+                JAVA_SECURITY_FILE +
+                " -keystore ks -storepass changeit -verbose -debug")
+                .shouldContain("- Signed by")
+                .shouldContain("Signature algorithm: SHA256withECDSA, 256-bit EC (secp256r1) key (weak)")
+                .shouldContain("jar verified")
+                .shouldContain("The EC (secp256r1) signing key has a keysize of 256 which is considered a security risk. This key size will be disabled in a future update")
+                .shouldHaveExitValue(0);
+    }
+}
-- 
GitLab


From 671b6efd6126384c0630d1cd84f53f52995e68d8 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 15 Mar 2022 16:05:37 +0000
Subject: [PATCH 092/345] 8283143: Use minimal-length literals to initialize PI
 and E constants

Reviewed-by: smarks
---
 src/java.base/share/classes/java/lang/Math.java       | 6 +++---
 src/java.base/share/classes/java/lang/StrictMath.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index 7341aa56a6a..649a85cfc52 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -131,14 +131,14 @@ public final class Math {
      * The {@code double} value that is closer than any other to
      * <i>e</i>, the base of the natural logarithms.
      */
-    public static final double E = 2.7182818284590452354;
+    public static final double E = 2.718281828459045;
 
     /**
      * The {@code double} value that is closer than any other to
      * <i>pi</i>, the ratio of the circumference of a circle to its
      * diameter.
      */
-    public static final double PI = 3.14159265358979323846;
+    public static final double PI = 3.141592653589793;
 
     /**
      * Constant by which to multiply an angular value in degrees to obtain an
diff --git a/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java
index 53b25fedebb..b212ab592cb 100644
--- a/src/java.base/share/classes/java/lang/StrictMath.java
+++ b/src/java.base/share/classes/java/lang/StrictMath.java
@@ -92,14 +92,14 @@ public final class StrictMath {
      * The {@code double} value that is closer than any other to
      * <i>e</i>, the base of the natural logarithms.
      */
-    public static final double E = 2.7182818284590452354;
+    public static final double E = 2.718281828459045;
 
     /**
      * The {@code double} value that is closer than any other to
      * <i>pi</i>, the ratio of the circumference of a circle to its
      * diameter.
      */
-    public static final double PI = 3.14159265358979323846;
+    public static final double PI = 3.141592653589793;
 
     /**
      * Returns the trigonometric sine of an angle. Special cases:
-- 
GitLab


From 05a83e03ca35b4885b48bb0e7d188baf8f7d9d7f Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 15 Mar 2022 16:22:11 +0000
Subject: [PATCH 093/345] 8283124: Add constant for tau to Math and StrictMath

Reviewed-by: bpb, iris
---
 src/java.base/share/classes/java/lang/Math.java | 17 +++++++++++++++--
 .../share/classes/java/lang/StrictMath.java     | 15 ++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index 649a85cfc52..6d8fa48c976 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -135,11 +135,24 @@ public final class Math {
 
     /**
      * The {@code double} value that is closer than any other to
-     * <i>pi</i>, the ratio of the circumference of a circle to its
-     * diameter.
+     * <i>pi</i> (&pi;), the ratio of the circumference of a circle to
+     * its diameter.
      */
     public static final double PI = 3.141592653589793;
 
+    /**
+     * The {@code double} value that is closer than any other to
+     * <i>tau</i> (&tau;), the ratio of the circumference of a circle
+     * to its radius.
+     *
+     * @apiNote
+     * The value of <i>pi</i> is one half that of <i>tau</i>; in other
+     * words, <i>tau</i> is double <i>pi</i> .
+     *
+     * @since 19
+     */
+    public static final double TAU = 2.0 * PI;
+
     /**
      * Constant by which to multiply an angular value in degrees to obtain an
      * angular value in radians.
diff --git a/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java
index b212ab592cb..b551288a38f 100644
--- a/src/java.base/share/classes/java/lang/StrictMath.java
+++ b/src/java.base/share/classes/java/lang/StrictMath.java
@@ -96,11 +96,24 @@ public final class StrictMath {
 
     /**
      * The {@code double} value that is closer than any other to
-     * <i>pi</i>, the ratio of the circumference of a circle to its
+     * <i>pi</i> (&pi;), the ratio of the circumference of a circle to its
      * diameter.
      */
     public static final double PI = 3.141592653589793;
 
+    /**
+     * The {@code double} value that is closer than any other to
+     * <i>tau</i> (&tau;), the ratio of the circumference of a circle
+     * to its radius.
+     *
+     * @apiNote
+     * The value of <i>pi</i> is one half that of <i>tau</i>; in other
+     * words, <i>tau</i> is double <i>pi</i> .
+     *
+     * @since 19
+     */
+    public static final double TAU = 2.0 * PI;
+
     /**
      * Returns the trigonometric sine of an angle. Special cases:
      * <ul><li>If the argument is NaN or an infinity, then the
-- 
GitLab


From 12dca36c73583d0ed2e1f684b056100dc1f2ef55 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Tue, 15 Mar 2022 16:28:54 +0000
Subject: [PATCH 094/345] 8283189: Bad copyright header in
 UnsafeCopyMemory.java

Reviewed-by: chagedorn, dcubed
---
 test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java
index eb6f065305e..950fef40ec0 100644
--- a/test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java
+++ b/test/hotspot/jtreg/compiler/unsafe/UnsafeCopyMemory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
-- 
GitLab


From 32f8437d85a003914d5ca35bdddebdc732ab222d Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 15 Mar 2022 17:33:45 +0000
Subject: [PATCH 095/345] 8283075: Bad IllegalArgumentException message for out
 of range rank from ClassDesc.arrayType(int)

Reviewed-by: vromero, alanb
---
 .../classes/java/lang/constant/ClassDesc.java | 26 ++++++++++++++-----
 .../jdk/java/lang/constant/ClassDescTest.java | 16 +++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

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 14923594c0e..c992bfb4380 100644
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,7 +148,8 @@ public sealed interface ClassDesc
      * is described by this {@linkplain ClassDesc}.
      *
      * @return a {@linkplain ClassDesc} describing the array type
-     * @throws IllegalStateException if the resulting {@linkplain ClassDesc} would have an array rank of greater than 255
+     * @throws IllegalStateException if the resulting {@linkplain
+     * ClassDesc} would have an array rank of greater than 255
      * @jvms 4.4.1 The CONSTANT_Class_info Structure
      */
     default ClassDesc arrayType() {
@@ -167,14 +168,27 @@ public sealed interface ClassDesc
      *
      * @param rank the rank of the array
      * @return a {@linkplain ClassDesc} describing the array type
-     * @throws IllegalArgumentException if the rank is less than or equal to zero or if the rank of the resulting array type is
+     * @throws IllegalArgumentException if the rank is less than or
+     * equal to zero or if the rank of the resulting array type is
      * greater than 255
      * @jvms 4.4.1 The CONSTANT_Class_info Structure
      */
     default ClassDesc arrayType(int rank) {
-        int currentDepth = ConstantUtils.arrayDepth(descriptorString());
-        if (rank <= 0 || currentDepth + rank > ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS)
-            throw new IllegalArgumentException("rank: " + currentDepth + 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");
+        }
         return ClassDesc.ofDescriptor("[".repeat(rank) + descriptorString());
     }
 
diff --git a/test/jdk/java/lang/constant/ClassDescTest.java b/test/jdk/java/lang/constant/ClassDescTest.java
index 32cf19b4fb4..81104e92c49 100644
--- a/test/jdk/java/lang/constant/ClassDescTest.java
+++ b/test/jdk/java/lang/constant/ClassDescTest.java
@@ -42,7 +42,7 @@ import static org.testng.Assert.fail;
 
 /**
  * @test
- * @bug 8215510
+ * @bug 8215510 8283075
  * @compile ClassDescTest.java
  * @run testng ClassDescTest
  * @summary unit tests for java.lang.constant.ClassDesc
@@ -184,6 +184,19 @@ public class ClassDescTest extends SymbolicDescTest {
         }
     }
 
+    private void testArrayRankOverflow() {
+        ClassDesc TwoDArrayDesc =
+            String.class.describeConstable().get().arrayType().arrayType();
+
+        try {
+            TwoDArrayDesc.arrayType(Integer.MAX_VALUE);
+            fail("");
+        } catch (IllegalArgumentException iae) {
+            // Expected
+        }
+    }
+
+
     public void testArrayClassDesc() throws ReflectiveOperationException {
         for (String d : basicDescs) {
             ClassDesc a0 = ClassDesc.ofDescriptor(d);
@@ -218,6 +231,7 @@ public class ClassDescTest extends SymbolicDescTest {
             testBadArrayRank(ConstantDescs.CD_int);
             testBadArrayRank(ConstantDescs.CD_String);
             testBadArrayRank(ClassDesc.of("Bar"));
+            testArrayRankOverflow();
         }
     }
 
-- 
GitLab


From ac06bdb1239a97b7ea2fee8280da8ebc9728dc30 Mon Sep 17 00:00:00 2001
From: Man Cao <manc@openjdk.org>
Date: Tue, 15 Mar 2022 20:05:33 +0000
Subject: [PATCH 096/345] 8282507: Add a separate license file for hsdis

Reviewed-by: ihse
---
 src/utils/hsdis/hsdis-license.txt | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/utils/hsdis/hsdis-license.txt

diff --git a/src/utils/hsdis/hsdis-license.txt b/src/utils/hsdis/hsdis-license.txt
new file mode 100644
index 00000000000..3c0b0823265
--- /dev/null
+++ b/src/utils/hsdis/hsdis-license.txt
@@ -0,0 +1,35 @@
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to
+any person obtaining a copy of this software, associated documentation
+and/or data (collectively the "Software"), free of charge and under any
+and all copyright rights in the Software, and any and all patent rights
+owned or freely licensable by each licensor hereunder covering either (i)
+the unmodified Software as contributed to or provided by such licensor,
+or (ii) the Larger Works (as defined below), to deal in both
+
+(a) the Software, and
+
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file
+if one is included with the Software (each a "Larger Work" to which the
+Software is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy,
+create derivative works of, display, perform, and distribute the Software
+and make, use, sell, offer for sale, import, export, have made, and have
+sold the Software and the Larger Work(s), and to sublicense the foregoing
+rights on either these or other terms.
+
+This license is subject to the following condition:
+
+The above copyright notice and either this complete permission notice or
+at a minimum a reference to the UPL must be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
-- 
GitLab


From 1465ea98b7736b5960a8b546ccc366c3e3260bdd Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Tue, 15 Mar 2022 20:17:36 +0000
Subject: [PATCH 097/345] 8282355:
 compiler/arguments/TestCodeEntryAlignment.java failed "guarantee(sect->end()
 <= tend) failed: sanity"

Reviewed-by: jiefu, thartmann, shade
---
 src/hotspot/share/runtime/stubRoutines.cpp           | 12 +++++++++---
 .../compiler/arguments/TestCodeEntryAlignment.java   |  8 ++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index 591950fa213..c378ab09dc8 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -215,7 +215,10 @@ void StubRoutines::initialize1() {
   if (_code1 == NULL) {
     ResourceMark rm;
     TraceTime timer("StubRoutines generation 1", TRACETIME_LOG(Info, startuptime));
-    _code1 = BufferBlob::create("StubRoutines (1)", code_size1);
+    // Add extra space for large CodeEntryAlignment
+    int max_aligned_stubs = 10;
+    int size = code_size1 + CodeEntryAlignment * max_aligned_stubs;
+    _code1 = BufferBlob::create("StubRoutines (1)", size);
     if (_code1 == NULL) {
       vm_exit_out_of_memory(code_size1, OOM_MALLOC_ERROR, "CodeCache: no room for StubRoutines (1)");
     }
@@ -269,7 +272,10 @@ void StubRoutines::initialize2() {
   if (_code2 == NULL) {
     ResourceMark rm;
     TraceTime timer("StubRoutines generation 2", TRACETIME_LOG(Info, startuptime));
-    _code2 = BufferBlob::create("StubRoutines (2)", code_size2);
+    // Add extra space for large CodeEntryAlignment
+    int max_aligned_stubs = 100;
+    int size = code_size2 + CodeEntryAlignment * max_aligned_stubs;
+    _code2 = BufferBlob::create("StubRoutines (2)", size);
     if (_code2 == NULL) {
       vm_exit_out_of_memory(code_size2, OOM_MALLOC_ERROR, "CodeCache: no room for StubRoutines (2)");
     }
diff --git a/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java b/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
index fd6c8ca50bf..15a60382245 100644
--- a/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
+++ b/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,6 +73,13 @@ public class TestCodeEntryAlignment {
                 "-XX:CodeEntryAlignment=" + align
             );
         }
+        for (int align = 256; align <= 1024; align *= 2) {
+            shouldPass(
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:CodeCacheSegmentSize=" + align,
+                "-XX:CodeEntryAlignment=" + align
+            );
+        }
     }
 
 }
-- 
GitLab


From bacfaa3ee16882563200ef3b3df4441b33664451 Mon Sep 17 00:00:00 2001
From: Quan Anh Mai <anhmdq99@gmail.com>
Date: Wed, 16 Mar 2022 01:10:22 +0000
Subject: [PATCH 098/345] 8282414: x86: Enhance the assembler to generate more
 compact instructions

Reviewed-by: thartmann, sviswanathan
---
 src/hotspot/cpu/x86/assembler_x86.cpp | 96 ++++++++++++++++++++++-----
 src/hotspot/cpu/x86/assembler_x86.hpp |  6 +-
 src/hotspot/cpu/x86/x86_64.ad         |  2 +-
 3 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 03229421305..e287512b93c 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -300,12 +300,24 @@ void Assembler::emit_arith_b(int op1, int op2, Register dst, int imm8) {
 
 void Assembler::emit_arith(int op1, int op2, Register dst, int32_t imm32) {
   assert(isByte(op1) && isByte(op2), "wrong opcode");
-  assert((op1 & 0x01) == 1, "should be 32bit operation");
-  assert((op1 & 0x02) == 0, "sign-extension bit should not be set");
+  assert(op1 == 0x81, "Unexpected opcode");
   if (is8bit(imm32)) {
     emit_int24(op1 | 0x02,        // set sign bit
                op2 | encode(dst),
                imm32 & 0xFF);
+  } else if (dst == rax) {
+    switch (op2) {
+      case 0xD0: emit_int8(0x15); break; // adc
+      case 0xC0: emit_int8(0x05); break; // add
+      case 0xE0: emit_int8(0x25); break; // and
+      case 0xF8: emit_int8(0x3D); break; // cmp
+      case 0xC8: emit_int8(0x0D); break; // or
+      case 0xD8: emit_int8(0x1D); break; // sbb
+      case 0xE8: emit_int8(0x2D); break; // sub
+      case 0xF0: emit_int8(0x35); break; // xor
+      default: ShouldNotReachHere();
+    }
+    emit_int32(imm32);
   } else {
     emit_int16(op1, (op2 | encode(dst)));
     emit_int32(imm32);
@@ -929,6 +941,16 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
     tail_size = 1;
     break;
 
+  case 0x15: // adc rax, #32
+  case 0x05: // add rax, #32
+  case 0x25: // and rax, #32
+  case 0x3D: // cmp rax, #32
+  case 0x0D: // or  rax, #32
+  case 0x1D: // sbb rax, #32
+  case 0x2D: // sub rax, #32
+  case 0x35: // xor rax, #32
+    return which == end_pc_operand ? ip + 4 : ip;
+
   case 0x9B:
     switch (0xFF & *ip++) {
     case 0xD9: // fnstcw a
@@ -954,6 +976,11 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
     debug_only(has_disp32 = true); // has both kinds of operands!
     break;
 
+  case 0xA8: // testb rax, #8
+    return which == end_pc_operand ? ip + 1 : ip;
+  case 0xA9: // testl/testq rax, #32
+    return which == end_pc_operand ? ip + 4 : ip;
+
   case 0xC1: // sal a, #8; sar a, #8; shl a, #8; shr a, #8
   case 0xC6: // movb a, #8
   case 0x80: // cmpb a, #8
@@ -1683,12 +1710,6 @@ void Assembler::cmpl(Address dst, int32_t imm32) {
   emit_int32(imm32);
 }
 
-void Assembler::cmp(Register dst, int32_t imm32) {
-  prefix(dst);
-  emit_int8((unsigned char)0x3D);
-  emit_int32(imm32);
-}
-
 void Assembler::cmpl(Register dst, int32_t imm32) {
   prefix(dst);
   emit_arith(0x81, 0xF8, dst, imm32);
@@ -5775,8 +5796,13 @@ void Assembler::subss(XMMRegister dst, Address src) {
 
 void Assembler::testb(Register dst, int imm8) {
   NOT_LP64(assert(dst->has_byte_register(), "must have byte register"));
-  (void) prefix_and_encode(dst->encoding(), true);
-  emit_arith_b(0xF6, 0xC0, dst, imm8);
+  if (dst == rax) {
+    emit_int8((unsigned char)0xA8);
+    emit_int8(imm8);
+  } else {
+    (void) prefix_and_encode(dst->encoding(), true);
+    emit_arith_b(0xF6, 0xC0, dst, imm8);
+  }
 }
 
 void Assembler::testb(Address dst, int imm8) {
@@ -5787,14 +5813,34 @@ void Assembler::testb(Address dst, int imm8) {
   emit_int8(imm8);
 }
 
+void Assembler::testl(Address dst, int32_t imm32) {
+  if (imm32 >= 0 && is8bit(imm32)) {
+    testb(dst, imm32);
+    return;
+  }
+  InstructionMark im(this);
+  emit_int8((unsigned char)0xF7);
+  emit_operand(as_Register(0), dst);
+  emit_int32(imm32);
+}
+
 void Assembler::testl(Register dst, int32_t imm32) {
+  if (imm32 >= 0 && is8bit(imm32) && dst->has_byte_register()) {
+    testb(dst, imm32);
+    return;
+  }
   // not using emit_arith because test
   // doesn't support sign-extension of
   // 8bit operands
-  int encode = dst->encoding();
-  encode = prefix_and_encode(encode);
-  emit_int16((unsigned char)0xF7, (0xC0 | encode));
-  emit_int32(imm32);
+  if (dst == rax) {
+    emit_int8((unsigned char)0xA9);
+    emit_int32(imm32);
+  } else {
+    int encode = dst->encoding();
+    encode = prefix_and_encode(encode);
+    emit_int16((unsigned char)0xF7, (0xC0 | encode));
+    emit_int32(imm32);
+  }
 }
 
 void Assembler::testl(Register dst, Register src) {
@@ -13013,6 +13059,10 @@ void Assembler::subq(Register dst, Register src) {
 }
 
 void Assembler::testq(Address dst, int32_t imm32) {
+  if (imm32 >= 0) {
+    testl(dst, imm32);
+    return;
+  }
   InstructionMark im(this);
   emit_int16(get_prefixq(dst), (unsigned char)0xF7);
   emit_operand(as_Register(0), dst);
@@ -13020,13 +13070,23 @@ void Assembler::testq(Address dst, int32_t imm32) {
 }
 
 void Assembler::testq(Register dst, int32_t imm32) {
+  if (imm32 >= 0) {
+    testl(dst, imm32);
+    return;
+  }
   // not using emit_arith because test
   // doesn't support sign-extension of
   // 8bit operands
-  int encode = dst->encoding();
-  encode = prefixq_and_encode(encode);
-  emit_int16((unsigned char)0xF7, (0xC0 | encode));
-  emit_int32(imm32);
+  if (dst == rax) {
+    prefix(REX_W);
+    emit_int8((unsigned char)0xA9);
+    emit_int32(imm32);
+  } else {
+    int encode = dst->encoding();
+    encode = prefixq_and_encode(encode);
+    emit_int16((unsigned char)0xF7, (0xC0 | encode));
+    emit_int32(imm32);
+  }
 }
 
 void Assembler::testq(Register dst, Register src) {
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 3256b990cf7..7141e4b96c4 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1081,15 +1081,12 @@ private:
   void cmpb(Address dst, int imm8);
 
   void cmpl(Address dst, int32_t imm32);
-
-  void cmp(Register dst, int32_t imm32);
   void cmpl(Register dst, int32_t imm32);
   void cmpl(Register dst, Register src);
   void cmpl(Register dst, Address src);
 
   void cmpq(Address dst, int32_t imm32);
   void cmpq(Address dst, Register src);
-
   void cmpq(Register dst, int32_t imm32);
   void cmpq(Register dst, Register src);
   void cmpq(Register dst, Address src);
@@ -2099,9 +2096,10 @@ private:
   void subss(XMMRegister dst, Address src);
   void subss(XMMRegister dst, XMMRegister src);
 
-  void testb(Register dst, int imm8);
   void testb(Address dst, int imm8);
+  void testb(Register dst, int imm8);
 
+  void testl(Address dst, int32_t imm32);
   void testl(Register dst, int32_t imm32);
   void testl(Register dst, Register src);
   void testl(Register dst, Address src);
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index fbf71300dcd..bc04106f3f2 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -1926,7 +1926,7 @@ encode %{
     Label done;
 
     // cmp    $0x80000000,%eax
-    __ cmp(as_Register(RAX_enc), 0x80000000);
+    __ cmpl(as_Register(RAX_enc), 0x80000000);
 
     // jne    e <normal>
     __ jccb(Assembler::notEqual, normal);
-- 
GitLab


From 27fe3d7f8db4ede6441a7cc325d9f29eb4a1d10d Mon Sep 17 00:00:00 2001
From: Toshio Nakamura <tnakamura@openjdk.org>
Date: Wed, 16 Mar 2022 01:11:40 +0000
Subject: [PATCH 099/345] 8240756: [macos] SwingSet2:TableDemo:Printed Japanese
 characters were garbled

Reviewed-by: prr, serb
---
 .../classes/sun/lwawt/macosx/CTextPipe.java   |  80 ++++++++++-
 .../font/GlyphVector/MultiSlotFontTest.java   | 136 ++++++++++++++++++
 2 files changed, 212 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/java/awt/font/GlyphVector/MultiSlotFontTest.java

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java
index f4dcc7ec675..6aa36453ac0 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,10 +81,57 @@ public class CTextPipe implements TextPipe {
         }
     }
 
-    public void drawGlyphVector(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) {
-        final Font prevFont = sg2d.getFont();
-        sg2d.setFont(gV.getFont());
+    private boolean hasSlotData(GlyphVector gv) {
+        final int length = gv.getNumGlyphs();
+        for (int i = 0; i < length; i++) {
+            if ((gv.getGlyphCode(i) & CompositeGlyphMapper.SLOTMASK) != 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private Font getSlotFont(Font font, int slot) {
+        Font2D f2d = FontUtilities.getFont2D(font);
+        if (f2d instanceof CFont) {
+            CompositeFont cf = ((CFont)f2d).getCompositeFont2D();
+            PhysicalFont pf = cf.getSlotFont(slot);
+            Font f = new Font(pf.getFontName(null),
+                              font.getStyle(), font.getSize());
+            return f;
+        }
+        return null;
+    }
+
+    private GlyphVector getGlyphVectorWithRange(final Font font, final GlyphVector gV, int start, int count) {
+        int[] glyphs = new int[count];
+        for (int i = 0; i < count; i++) {
+            glyphs[i] = gV.getGlyphCode(start+i) & CompositeGlyphMapper.GLYPHMASK;
+        }
+        // Positions should be null to recalculate by native methods,
+        // if GV was segmented.
+        StandardGlyphVector sgv = new StandardGlyphVector(font,
+                                          gV.getFontRenderContext(),
+                                          glyphs,
+                                          null, // positions
+                                          null, // indices
+                                          gV.getLayoutFlags());
+        return sgv;
+    }
+
+    private int getLengthOfSameSlot(final GlyphVector gV, final int targetSlot, final int start, final int length) {
+        int count = 1;
+        for (; start + count < length; count++) {
+            int slot = (gV.getGlyphCode(start + count) &
+                        CompositeGlyphMapper.SLOTMASK) >> 24;
+            if (targetSlot != slot) {
+                break;
+            }
+        }
+        return count;
+    }
 
+    private void drawGlyphVectorImpl(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) {
         final long nativeStrikePtr = getNativeStrikePtr(sg2d);
         if (OSXSurfaceData.IsSimpleColor(sg2d.paint) && nativeStrikePtr != 0) {
             final OSXSurfaceData surfaceData = (OSXSurfaceData)sg2d.getSurfaceData();
@@ -92,6 +139,31 @@ public class CTextPipe implements TextPipe {
         } else {
             drawGlyphVectorAsShape(sg2d, gV, x, y);
         }
+    }
+
+    public void drawGlyphVector(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) {
+        final Font prevFont = sg2d.getFont();
+        sg2d.setFont(gV.getFont());
+
+        if (hasSlotData(gV)) {
+            final int length = gV.getNumGlyphs();
+            float[] positions = gV.getGlyphPositions(0, length, null);
+            int start = 0;
+            while (start < length) {
+                int slot = (gV.getGlyphCode(start) &
+                            CompositeGlyphMapper.SLOTMASK) >> 24;
+                sg2d.setFont(getSlotFont(gV.getFont(), slot));
+                int count = getLengthOfSameSlot(gV, slot, start, length);
+                GlyphVector rangeGV = getGlyphVectorWithRange(sg2d.getFont(),
+                                                              gV, start, count);
+                drawGlyphVectorImpl(sg2d, rangeGV,
+                                    x + positions[start * 2],
+                                    y + positions[start * 2 + 1]);
+                start += count;
+            }
+        } else {
+            drawGlyphVectorImpl(sg2d, gV, x, y);
+        }
         sg2d.setFont(prevFont);
     }
 
diff --git a/test/jdk/java/awt/font/GlyphVector/MultiSlotFontTest.java b/test/jdk/java/awt/font/GlyphVector/MultiSlotFontTest.java
new file mode 100644
index 00000000000..65acd420345
--- /dev/null
+++ b/test/jdk/java/awt/font/GlyphVector/MultiSlotFontTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8240756
+ * @summary Non-English characters are printed with wrong glyphs on MacOS
+ * @modules java.desktop/sun.java2d java.desktop/sun.java2d.loops java.desktop/sun.font
+ * @requires os.family == "mac"
+ * @run main MultiSlotFontTest
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.RenderingHints;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.image.BufferedImage;
+import sun.font.StandardGlyphVector;
+import sun.java2d.OSXOffScreenSurfaceData;
+import sun.java2d.SunGraphics2D;
+import sun.java2d.SurfaceData;
+import sun.java2d.loops.SurfaceType;
+
+public class MultiSlotFontTest {
+
+    private static final int WIDTH = 100;
+    private static final int HEIGHT = 60;
+
+    private static final String TEST_STR = "\u3042\u3044\u3046\u3048\u304Aabc";
+    private static final int EXPECTED_HEIGHT = 10;
+    private static final int EXPECTED_WIDTH = 77;
+    private static final int LIMIT_DIFF_HEIGHT = 3;
+    private static final int LIMIT_DIFF_WIDTH = 15;
+
+    public static void main(String[] args) throws Exception {
+        MultiSlotFontTest test = new MultiSlotFontTest();
+    }
+
+    public MultiSlotFontTest() {
+        BufferedImage img = createImage();
+
+        SurfaceData sd = OSXOffScreenSurfaceData.createDataIC(img,
+                             SurfaceType.IntRgb);
+        SunGraphics2D g2d = new SunGraphics2D(sd,
+                                    Color.BLACK, Color.WHITE, null);
+        Font font = g2d.getFont();
+
+        if (font.canDisplayUpTo(TEST_STR) != -1) {
+            System.out.println("There is no capable font. Skipping the test.");
+            System.out.println("Font: " + font);
+            return;
+        }
+
+        FontRenderContext frc = new FontRenderContext(null, false, false);
+        StandardGlyphVector gv = new StandardGlyphVector(font, TEST_STR, frc);
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                             RenderingHints.VALUE_ANTIALIAS_OFF);
+        g2d.drawGlyphVector(gv, 0.0f, (float)(HEIGHT - 5));
+        g2d.dispose();
+
+        Dimension d = getBounds(img);
+
+        if (Math.abs(d.height - EXPECTED_HEIGHT) > LIMIT_DIFF_HEIGHT ||
+            Math.abs(d.width  - EXPECTED_WIDTH)  > LIMIT_DIFF_WIDTH) {
+            debugOut(img);
+            throw new RuntimeException(
+                "Incorrect GlyphVector shape " + d + "," + gv);
+        }
+    }
+
+    private static BufferedImage createImage() {
+        BufferedImage image = new BufferedImage(WIDTH, HEIGHT,
+                                      BufferedImage.TYPE_INT_RGB);
+        Graphics g = image.createGraphics();
+        g.setColor(Color.WHITE);
+        g.fillRect(0, 0, WIDTH, HEIGHT);
+        g.dispose();
+        return image;
+    }
+
+    private Dimension getBounds(BufferedImage img) {
+        int top = HEIGHT;
+        int left = WIDTH;
+        int right = 0;
+        int bottom = 0;
+        for (int y = 0; y < HEIGHT; y++) {
+            for (int x = 0; x < WIDTH; x++) {
+                if ((img.getRGB(x, y) & 0xFFFFFF) == 0) {
+                    if (top    > y) top = y;
+                    if (bottom < y) bottom = y;
+                    if (left   > x) left = x;
+                    if (right  < x) right = x;
+                }
+            }
+        }
+        return new Dimension(right - left, bottom - top);
+    }
+
+    private void debugOut(BufferedImage img) {
+        for (int y = 0; y < HEIGHT; y++) {
+            for (int x = 0; x < WIDTH; x++) {
+                int c = img.getRGB(x, y) & 0xFFFFFF;
+                if (c == 0) {
+                    System.out.print("*");
+                } else {
+                    System.out.print(" ");
+                }
+            }
+            System.out.println();
+        }
+    }
+}
-- 
GitLab


From 4df24c5df38eeacc73097f71383916e9a0933839 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 16 Mar 2022 02:02:10 +0000
Subject: [PATCH 100/345] 8283230: Improve @jls usage in ElementType

Reviewed-by: jjg, iris
---
 .../share/classes/java/lang/annotation/ElementType.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/annotation/ElementType.java b/src/java.base/share/classes/java/lang/annotation/ElementType.java
index c046272b12c..97275fb97ec 100644
--- a/src/java.base/share/classes/java/lang/annotation/ElementType.java
+++ b/src/java.base/share/classes/java/lang/annotation/ElementType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,14 +40,14 @@ package java.lang.annotation;
  * <p>The constants {@link #ANNOTATION_TYPE}, {@link #CONSTRUCTOR}, {@link
  * #FIELD}, {@link #LOCAL_VARIABLE}, {@link #METHOD}, {@link #PACKAGE}, {@link
  * #MODULE}, {@link #PARAMETER}, {@link #TYPE}, and {@link #TYPE_PARAMETER}
- * correspond to the declaration contexts in JLS 9.6.4.1.
+ * correspond to the declaration contexts in JLS {@jls 9.6.4.1}.
  *
  * <p>For example, an annotation whose interface is meta-annotated with
  * {@code @Target(ElementType.FIELD)} may only be written as a modifier for a
  * field declaration.
  *
  * <p>The constant {@link #TYPE_USE} corresponds to the type contexts in JLS
- * 4.11, as well as to two declaration contexts: class and interface
+ * {@jls 4.11}, as well as to two declaration contexts: class and interface
  * declarations (including annotation declarations) and type parameter
  * declarations.
  *
-- 
GitLab


From de4f04cb71a26ce03b96460cb8d1c1e28cd1ed38 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 16 Mar 2022 03:12:48 +0000
Subject: [PATCH 101/345] 8253495: CDS generates non-deterministic output

Reviewed-by: erikj, kbarrett, ccheung, ihse
---
 make/scripts/compare.sh                       |  4 ++--
 src/hotspot/share/cds/archiveBuilder.cpp      |  5 +++--
 src/hotspot/share/cds/archiveUtils.hpp        |  5 +++--
 src/hotspot/share/cds/dumpTimeClassInfo.hpp   |  5 +++--
 src/hotspot/share/cds/heapShared.cpp          |  8 ++++----
 src/hotspot/share/cds/heapShared.hpp          |  8 ++------
 src/hotspot/share/gc/shared/collectedHeap.cpp | 18 +++++++++++++----
 src/hotspot/share/gc/shared/collectedHeap.hpp |  1 +
 src/hotspot/share/prims/jvm.cpp               | 20 +++++++++++++++++++
 src/hotspot/share/runtime/os.cpp              | 10 ++++++++--
 test/hotspot/jtreg/ProblemList.txt            |  1 -
 .../jtreg/runtime/cds/DeterministicDump.java  | 10 +++++++++-
 .../cds/appcds/javaldr/LockDuringDump.java    |  4 ++--
 .../appcds/javaldr/LockDuringDumpAgent.java   | 16 +++++++++++++--
 test/lib/jdk/test/lib/cds/CDSOptions.java     |  7 ++++++-
 15 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh
index cc05476c997..a0006fa4cee 100644
--- a/make/scripts/compare.sh
+++ b/make/scripts/compare.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -324,7 +324,7 @@ compare_general_files() {
         ! -name "*.cpl" ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
         ! -name "*.lib" ! -name "*.jmod" ! -name "*.exe" \
         ! -name "*.obj" ! -name "*.o" ! -name "jspawnhelper" ! -name "*.a" \
-        ! -name "*.tar.gz" ! -name "*.jsa" ! -name "gtestLauncher" \
+        ! -name "*.tar.gz" ! -name "classes_nocoops.jsa" ! -name "gtestLauncher" \
         ! -name "*.map" \
         | $GREP -v "./bin/"  | $SORT | $FILTER)
 
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index cb5c0aeb8c7..89529b2cf59 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -522,7 +522,8 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
   if (MetaspaceShared::is_in_shared_metaspace(obj)) {
     // Don't dump existing shared metadata again.
     return point_to_it;
-  } else if (ref->msotype() == MetaspaceObj::MethodDataType) {
+  } else if (ref->msotype() == MetaspaceObj::MethodDataType ||
+             ref->msotype() == MetaspaceObj::MethodCountersType) {
     return set_to_null;
   } else {
     if (ref->msotype() == MetaspaceObj::ClassType) {
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index 588ad1b6da9..be8d8a0e84e 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "memory/virtualspace.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/exceptions.hpp"
+#include "utilities/macros.hpp"
 
 class BootstrapInfo;
 class ReservedSpace;
@@ -147,7 +148,7 @@ public:
   char* expand_top_to(char* newtop);
   char* allocate(size_t num_bytes);
 
-  void append_intptr_t(intptr_t n, bool need_to_mark = false);
+  void append_intptr_t(intptr_t n, bool need_to_mark = false) NOT_CDS_RETURN;
 
   char* base()      const { return _base;        }
   char* top()       const { return _top;         }
diff --git a/src/hotspot/share/cds/dumpTimeClassInfo.hpp b/src/hotspot/share/cds/dumpTimeClassInfo.hpp
index 80f6d81442c..5b4f5cd9b9b 100644
--- a/src/hotspot/share/cds/dumpTimeClassInfo.hpp
+++ b/src/hotspot/share/cds/dumpTimeClassInfo.hpp
@@ -167,7 +167,8 @@ public:
   size_t runtime_info_bytesize() const;
 };
 
-inline unsigned DumpTimeSharedClassTable_hash(InstanceKlass* const& k) {
+template <typename T>
+inline unsigned DumpTimeSharedClassTable_hash(T* const& k) {
   if (DumpSharedSpaces) {
     // Deterministic archive contents
     uintx delta = k->name() - MetaspaceShared::symbol_rs_base();
@@ -175,7 +176,7 @@ inline unsigned DumpTimeSharedClassTable_hash(InstanceKlass* const& k) {
   } else {
     // Deterministic archive is not possible because classes can be loaded
     // in multiple threads.
-    return primitive_hash<InstanceKlass*>(k);
+    return primitive_hash<T*>(k);
   }
 }
 
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 26a852b0158..14bca5d74b6 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -574,7 +574,7 @@ KlassSubGraphInfo* HeapShared::init_subgraph_info(Klass* k, bool is_full_module_
   bool created;
   Klass* relocated_k = ArchiveBuilder::get_relocated_klass(k);
   KlassSubGraphInfo* info =
-    _dump_time_subgraph_info_table->put_if_absent(relocated_k, KlassSubGraphInfo(relocated_k, is_full_module_graph),
+    _dump_time_subgraph_info_table->put_if_absent(k, KlassSubGraphInfo(relocated_k, is_full_module_graph),
                                                   &created);
   assert(created, "must not initialize twice");
   return info;
@@ -582,8 +582,7 @@ KlassSubGraphInfo* HeapShared::init_subgraph_info(Klass* k, bool is_full_module_
 
 KlassSubGraphInfo* HeapShared::get_subgraph_info(Klass* k) {
   assert(DumpSharedSpaces, "dump time only");
-  Klass* relocated_k = ArchiveBuilder::get_relocated_klass(k);
-  KlassSubGraphInfo* info = _dump_time_subgraph_info_table->get(relocated_k);
+  KlassSubGraphInfo* info = _dump_time_subgraph_info_table->get(k);
   assert(info != NULL, "must have been initialized");
   return info;
 }
@@ -744,7 +743,8 @@ struct CopyKlassSubGraphInfoToArchive : StackObj {
         (ArchivedKlassSubGraphInfoRecord*)ArchiveBuilder::ro_region_alloc(sizeof(ArchivedKlassSubGraphInfoRecord));
       record->init(&info);
 
-      unsigned int hash = SystemDictionaryShared::hash_for_shared_dictionary((address)klass);
+      Klass* relocated_k = ArchiveBuilder::get_relocated_klass(klass);
+      unsigned int hash = SystemDictionaryShared::hash_for_shared_dictionary((address)relocated_k);
       u4 delta = ArchiveBuilder::current()->any_to_offset_u4(record);
       _writer->add(hash, delta);
     }
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index 74d1f1b6e7e..d8fc71fc76e 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_CDS_HEAPSHARED_HPP
 #define SHARE_CDS_HEAPSHARED_HPP
 
+#include "cds/dumpTimeClassInfo.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.hpp"
@@ -252,17 +253,12 @@ private:
       HeapShared::oop_hash> ArchivedObjectCache;
   static ArchivedObjectCache* _archived_object_cache;
 
-  static unsigned klass_hash(Klass* const& klass) {
-    // Generate deterministic hashcode even if SharedBaseAddress is changed due to ASLR.
-    return primitive_hash<address>(address(klass) - SharedBaseAddress);
-  }
-
   class DumpTimeKlassSubGraphInfoTable
     : public ResourceHashtable<Klass*, KlassSubGraphInfo,
                                137, // prime number
                                ResourceObj::C_HEAP,
                                mtClassShared,
-                               HeapShared::klass_hash> {
+                               DumpTimeSharedClassTable_hash> {
   public:
     int _count;
   };
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index f9ad0759b42..eb3213d12df 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -417,6 +417,11 @@ size_t CollectedHeap::filler_array_min_size() {
   return align_object_size(filler_array_hdr_size()); // align to MinObjAlignment
 }
 
+void CollectedHeap::zap_filler_array_with(HeapWord* start, size_t words, juint value) {
+  Copy::fill_to_words(start + filler_array_hdr_size(),
+                      words - filler_array_hdr_size(), value);
+}
+
 #ifdef ASSERT
 void CollectedHeap::fill_args_check(HeapWord* start, size_t words)
 {
@@ -427,8 +432,7 @@ void CollectedHeap::fill_args_check(HeapWord* start, size_t words)
 void CollectedHeap::zap_filler_array(HeapWord* start, size_t words, bool zap)
 {
   if (ZapFillerObjects && zap) {
-    Copy::fill_to_words(start + filler_array_hdr_size(),
-                        words - filler_array_hdr_size(), 0XDEAFBABE);
+    zap_filler_array_with(start, words, 0XDEAFBABE);
   }
 }
 #endif // ASSERT
@@ -445,7 +449,13 @@ CollectedHeap::fill_with_array(HeapWord* start, size_t words, bool zap)
 
   ObjArrayAllocator allocator(Universe::intArrayKlassObj(), words, (int)len, /* do_zero */ false);
   allocator.initialize(start);
-  DEBUG_ONLY(zap_filler_array(start, words, zap);)
+  if (DumpSharedSpaces) {
+    // This array is written into the CDS archive. Make sure it
+    // has deterministic contents.
+    zap_filler_array_with(start, words, 0);
+  } else {
+    DEBUG_ONLY(zap_filler_array(start, words, zap);)
+  }
 }
 
 void
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 89cca6777d6..fd6427fee60 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -157,6 +157,7 @@ class CollectedHeap : public CHeapObj<mtGC> {
   static inline size_t filler_array_hdr_size();
   static inline size_t filler_array_min_size();
 
+  static inline void zap_filler_array_with(HeapWord* start, size_t words, juint value);
   DEBUG_ONLY(static void fill_args_check(HeapWord* start, size_t words);)
   DEBUG_ONLY(static void zap_filler_array(HeapWord* start, size_t words, bool zap = true);)
 
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index f18fe51616c..c574cb3ecc8 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -2865,6 +2865,26 @@ static void thread_entry(JavaThread* thread, TRAPS) {
 
 
 JVM_ENTRY(void, JVM_StartThread(JNIEnv* env, jobject jthread))
+#if INCLUDE_CDS
+  if (DumpSharedSpaces) {
+    // During java -Xshare:dump, if we allow multiple Java threads to
+    // execute in parallel, symbols and classes may be loaded in
+    // random orders which will make the resulting CDS archive
+    // non-deterministic.
+    //
+    // Lucikly, during java -Xshare:dump, it's important to run only
+    // the code in the main Java thread (which is NOT started here) that
+    // creates the module graph, etc. It's safe to not start the other
+    // threads which are launched by class static initializers
+    // (ReferenceHandler, FinalizerThread and CleanerImpl).
+    if (log_is_enabled(Info, cds)) {
+      ResourceMark rm;
+      oop t = JNIHandles::resolve_non_null(jthread);
+      log_info(cds)("JVM_StartThread() ignored: %s", t->klass()->external_name());
+    }
+    return;
+  }
+#endif
   JavaThread *native_thread = NULL;
 
   // We cannot hold the Threads_lock when we throw an exception,
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index e8165fe7ff3..6e2ee7654ea 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -634,6 +634,8 @@ void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
   // Special handling for NMT preinit phase before arguments are parsed
   void* rc = NULL;
   if (NMTPreInit::handle_malloc(&rc, size)) {
+    // No need to fill with 0 because DumpSharedSpaces doesn't use these
+    // early allocations.
     return rc;
   }
 
@@ -658,9 +660,13 @@ void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
 
   void* const inner_ptr = MemTracker::record_malloc((address)outer_ptr, size, memflags, stack);
 
-  DEBUG_ONLY(::memset(inner_ptr, uninitBlockPad, size);)
+  if (DumpSharedSpaces) {
+    // Need to deterministically fill all the alignment gaps in C++ structures.
+    ::memset(inner_ptr, 0, size);
+  } else {
+    DEBUG_ONLY(::memset(inner_ptr, uninitBlockPad, size);)
+  }
   DEBUG_ONLY(break_if_ptr_caught(inner_ptr);)
-
   return inner_ptr;
 }
 
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 518238d9c0a..870f1d3c596 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -94,7 +94,6 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8241293 macosx-x64
 # :hotspot_runtime
 
 runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java 8253437 windows-x64
-runtime/cds/DeterministicDump.java 8253495 generic-all
 runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
 runtime/os/TestTracePageSizes.java#no-options 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#explicit-large-page-size 8267460 linux-aarch64
diff --git a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
index 9cdba1fa922..6e8ccffce27 100644
--- a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
+++ b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,11 @@ public class DeterministicDump {
         baseArgs.add("-Xmx128M");
 
         if (Platform.is64bit()) {
+            if (!compressed) {
+                System.out.println("CDS archives with uncompressed oops are still non-deterministic");
+                System.out.println("See https://bugs.openjdk.java.net/browse/JDK-8282828");
+                return;
+            }
             // These options are available only on 64-bit.
             String sign = (compressed) ?  "+" : "-";
             baseArgs.add("-XX:" + sign + "UseCompressedOops");
@@ -78,9 +83,12 @@ public class DeterministicDump {
     static String dump(ArrayList<String> args, String... more) throws Exception {
         String logName = "SharedArchiveFile" + (id++);
         String archiveName = logName + ".jsa";
+        String mapName = logName + ".map";
         CDSOptions opts = (new CDSOptions())
             .addPrefix("-Xlog:cds=debug")
+            .addPrefix("-Xlog:cds+map=trace:file=" + mapName + ":none:filesize=0")
             .setArchiveName(archiveName)
+            .addSuffix(args)
             .addSuffix(more);
         CDSTestUtils.createArchiveAndCheck(opts);
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/LockDuringDump.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/LockDuringDump.java
index 04652d2eb78..391596160d6 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/LockDuringDump.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/LockDuringDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ public class LockDuringDump {
                 TestCommon.testDump(appJar, TestCommon.list(LockDuringDumpApp.class.getName()),
                                     "-XX:+UnlockDiagnosticVMOptions",
                                     agentArg, agentArg2);
-            if (i != 0) {
+            if (i != 0 && !out.getStdout().contains("LockDuringDumpAgent timeout")) {
                 out.shouldContain("Let's hold the lock on the literal string");
             }
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/LockDuringDumpAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/LockDuringDumpAgent.java
index 5e053d83efc..57db61e9335 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/LockDuringDumpAgent.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/LockDuringDumpAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,9 +51,21 @@ public class LockDuringDumpAgent implements Runnable {
 
     static void waitForThreadStart() {
         try {
+            long started = System.currentTimeMillis();
+            long timeout = 10000;
+            synchronized (LITERAL) {
+                Thread.sleep(1);
+            }
             synchronized (lock) {
                 while (!threadStarted) {
-                    lock.wait();
+                    lock.wait(timeout);
+                    long elapsed = System.currentTimeMillis() - started;
+                    if (elapsed >= timeout) {
+                        System.out.println("This JVM may decide to not launch any Java threads during -Xshare:dump.");
+                        System.out.println("This is OK because no string objects could be in a locked state during heap dump.");
+                        System.out.println("LockDuringDumpAgent timeout after " + elapsed + " ms");
+                        return;
+                    }
                 }
                 System.out.println("Thread has started");
             }
diff --git a/test/lib/jdk/test/lib/cds/CDSOptions.java b/test/lib/jdk/test/lib/cds/CDSOptions.java
index cbc11db777b..a60afb90aed 100644
--- a/test/lib/jdk/test/lib/cds/CDSOptions.java
+++ b/test/lib/jdk/test/lib/cds/CDSOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,11 @@ public class CDSOptions {
         return this;
     }
 
+    public CDSOptions addSuffix(ArrayList<String> suffix) {
+        for (String s : suffix) this.suffix.add(s);
+        return this;
+    }
+
     public CDSOptions addSuffix(String... suffix) {
         for (String s : suffix) this.suffix.add(s);
         return this;
-- 
GitLab


From 08cadb4754da0d5e68ee2df45f4098d203d14115 Mon Sep 17 00:00:00 2001
From: Swati Sharma <swati.sharma@intel.com>
Date: Wed, 16 Mar 2022 09:48:09 +0000
Subject: [PATCH 102/345] 8271195: Use largest available large page size
 smaller than LargePageSizeInBytes when available

Co-authored-by: Jatin Bhateja <jbhateja@openjdk.org>
Reviewed-by: ayang, tschatzl
---
 src/hotspot/os/linux/os_linux.cpp             | 21 ++-----
 src/hotspot/share/memory/virtualspace.cpp     | 34 +++++++---
 .../openjdk/bench/vm/gc/MicroLargePages.java  | 62 +++++++++++++++++++
 3 files changed, 95 insertions(+), 22 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/vm/gc/MicroLargePages.java

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 33acc06df53..f2ecca92c82 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -3972,23 +3972,14 @@ char* os::Linux::reserve_memory_special_shm(size_t bytes, size_t alignment,
   return addr;
 }
 
-static void warn_on_commit_special_failure(char* req_addr, size_t bytes,
+static void log_on_commit_special_failure(char* req_addr, size_t bytes,
                                            size_t page_size, int error) {
   assert(error == ENOMEM, "Only expect to fail if no memory is available");
 
-  bool warn_on_failure = UseLargePages &&
-      (!FLAG_IS_DEFAULT(UseLargePages) ||
-       !FLAG_IS_DEFAULT(UseHugeTLBFS) ||
-       !FLAG_IS_DEFAULT(LargePageSizeInBytes));
-
-  if (warn_on_failure) {
-    char msg[128];
-    jio_snprintf(msg, sizeof(msg), "Failed to reserve and commit memory. req_addr: "
-                                   PTR_FORMAT " bytes: " SIZE_FORMAT " page size: "
-                                   SIZE_FORMAT " (errno = %d).",
-                                   req_addr, bytes, page_size, error);
-    warning("%s", msg);
-  }
+  log_info(pagesize)("Failed to reserve and commit memory with given page size. req_addr: " PTR_FORMAT
+                     " size: " SIZE_FORMAT "%s, page size: " SIZE_FORMAT "%s, (errno = %d)",
+                     p2i(req_addr), byte_size_in_exact_unit(bytes), exact_unit_for_byte_size(bytes),
+                     byte_size_in_exact_unit(page_size), exact_unit_for_byte_size(page_size), error);
 }
 
 bool os::Linux::commit_memory_special(size_t bytes,
@@ -4010,7 +4001,7 @@ bool os::Linux::commit_memory_special(size_t bytes,
   char* addr = (char*)::mmap(req_addr, bytes, prot, flags, -1, 0);
 
   if (addr == MAP_FAILED) {
-    warn_on_commit_special_failure(req_addr, bytes, page_size, errno);
+    log_on_commit_special_failure(req_addr, bytes, page_size, errno);
     return false;
   }
 
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index ad918dea29b..b02d723baab 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -139,6 +139,19 @@ static bool large_pages_requested() {
          (!FLAG_IS_DEFAULT(UseLargePages) || !FLAG_IS_DEFAULT(LargePageSizeInBytes));
 }
 
+static void log_on_large_pages_failure(char* req_addr, size_t bytes) {
+  if (large_pages_requested()) {
+    // Compressed oops logging.
+    log_debug(gc, heap, coops)("Reserve regular memory without large pages");
+    // JVM style warning that we did not succeed in using large pages.
+    char msg[128];
+    jio_snprintf(msg, sizeof(msg), "Failed to reserve and commit memory using large pages. "
+                                   "req_addr: " PTR_FORMAT " bytes: " SIZE_FORMAT,
+                                   req_addr, bytes);
+    warning("%s", msg);
+  }
+}
+
 static char* reserve_memory(char* requested_address, const size_t size,
                             const size_t alignment, int fd, bool exec) {
   char* base;
@@ -183,10 +196,6 @@ static char* reserve_memory_special(char* requested_address, const size_t size,
            "reserve_memory_special() returned an unaligned address, base: " PTR_FORMAT
            " alignment: " SIZE_FORMAT_HEX,
            p2i(base), alignment);
-  } else {
-    if (large_pages_requested()) {
-      log_debug(gc, heap, coops)("Reserve regular memory without large pages");
-    }
   }
   return base;
 }
@@ -235,14 +244,25 @@ void ReservedSpace::reserve(size_t size,
     // the caller requested large pages. To satisfy this request we use
     // explicit large pages and these have to be committed up front to ensure
     // no reservations are lost.
+    size_t used_page_size = page_size;
+    char* base = NULL;
+
+    do {
+      base = reserve_memory_special(requested_address, size, alignment, used_page_size, executable);
+      if (base != NULL) {
+        break;
+      }
+      used_page_size = os::page_sizes().next_smaller(used_page_size);
+    } while (used_page_size > (size_t) os::vm_page_size());
 
-    char* base = reserve_memory_special(requested_address, size, alignment, page_size, executable);
     if (base != NULL) {
       // Successful reservation using large pages.
-      initialize_members(base, size, alignment, page_size, true, executable);
+      initialize_members(base, size, alignment, used_page_size, true, executable);
       return;
     }
-    // Failed to reserve explicit large pages, fall back to normal reservation.
+    // Failed to reserve explicit large pages, do proper logging.
+    log_on_large_pages_failure(requested_address, size);
+    // Now fall back to normal reservation.
     page_size = os::vm_page_size();
   }
 
diff --git a/test/micro/org/openjdk/bench/vm/gc/MicroLargePages.java b/test/micro/org/openjdk/bench/vm/gc/MicroLargePages.java
new file mode 100644
index 00000000000..67702cfe607
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/gc/MicroLargePages.java
@@ -0,0 +1,62 @@
+//
+// Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+
+package org.openjdk.bench.vm.gc;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+
+@OutputTimeUnit(TimeUnit.MINUTES)
+@State(Scope.Thread)
+@Fork(jvmArgsAppend = {"-Xmx256m", "-XX:+UseLargePages", "-XX:LargePageSizeInBytes=1g", "-Xlog:pagesize"}, value = 5)
+
+public class MicroLargePages {
+
+    @Param({"2097152"})
+    public int ARRAYSIZE;
+
+    @Param({"1", "2", "4"})
+    public int NUM;
+
+    public long[][] INP;
+    public long[][] OUT;
+
+    @Setup(Level.Trial)
+    public void BmSetup() {
+        INP = new long[NUM][ARRAYSIZE];
+        OUT = new long[NUM][ARRAYSIZE];
+        for (int i = 0; i < NUM; i++) {
+            Arrays.fill(INP[i], 10);
+        }
+    }
+
+    @Benchmark
+    public void micro_HOP_DIST_4KB() {
+        for (int i = 0; i < NUM; i += 1) {
+             for (int j = 0; j < ARRAYSIZE; j += 512) {
+                 OUT[i][j] = INP[i][j];
+             }
+        }
+    }
+}
-- 
GitLab


From 9b8afce3791080d664c5051a86592706f5b0ade0 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 16 Mar 2022 16:07:32 +0000
Subject: [PATCH 103/345] 8283260: gcc is not supported on mac

Reviewed-by: erikj
---
 make/autoconf/flags-ldflags.m4 | 13 +++++--------
 make/autoconf/toolchain.m4     |  6 +++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index e9d4557f866..8f77734c93c 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -95,13 +95,10 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
   fi
 
   # Setup OS-dependent LDFLAGS
-  if test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xgcc; then
-    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      # Assume clang or gcc.
-      # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
-      OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
-      OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
-    fi
+  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
+    # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
+    OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
+    OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
   fi
 
   # Setup debug level-dependent LDFLAGS
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index 2288dda7ed6..b79d161331d 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -39,7 +39,7 @@ VALID_TOOLCHAINS_all="gcc clang xlc microsoft"
 
 # These toolchains are valid on different platforms
 VALID_TOOLCHAINS_linux="gcc clang"
-VALID_TOOLCHAINS_macosx="gcc clang"
+VALID_TOOLCHAINS_macosx="clang"
 VALID_TOOLCHAINS_aix="xlc"
 VALID_TOOLCHAINS_windows="microsoft"
 
@@ -901,8 +901,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
       BUILD_LDCXX="$BUILD_LD"
     else
       if test "x$OPENJDK_BUILD_OS" = xmacosx; then
-        UTIL_REQUIRE_PROGS(BUILD_CC, clang cc gcc)
-        UTIL_REQUIRE_PROGS(BUILD_CXX, clang++ CC g++)
+        UTIL_REQUIRE_PROGS(BUILD_CC, clang)
+        UTIL_REQUIRE_PROGS(BUILD_CXX, clang++)
       else
         UTIL_REQUIRE_PROGS(BUILD_CC, cc gcc)
         UTIL_REQUIRE_PROGS(BUILD_CXX, CC g++)
-- 
GitLab


From 0cf291bc31acf69c767c5d39d21b1195e6d761b2 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 16 Mar 2022 16:17:50 +0000
Subject: [PATCH 104/345] 8283234: Improve @jls usage in java.base

Reviewed-by: iris
---
 .../classes/java/lang/StringConcatHelper.java      |  4 ++--
 .../classes/java/lang/invoke/MethodHandle.java     |  8 ++++----
 .../classes/java/lang/invoke/MethodHandles.java    | 10 +++++-----
 .../java/lang/invoke/StringConcatFactory.java      | 14 +++++++-------
 .../classes/java/lang/reflect/TypeVariable.java    |  6 +++---
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index f267fd9e1d6..3867c10e8d6 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -430,7 +430,7 @@ final class StringConcatHelper {
      * Produce a String from a concatenation of single argument, which we
      * end up using for trivial concatenations like {@code "" + arg}.
      *
-     * This will always create a new Object to comply with JLS 15.18.1:
+     * This will always create a new Object to comply with JLS {@jls 15.18.1}:
      * "The String object is newly created unless the expression is a
      * compile-time constant expression".
      *
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
index ec910dbf8fe..fb7ef0afbac 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -807,15 +807,15 @@ public abstract class MethodHandle implements Constable {
      *     (The types do not need to be related in any particular way.
      *     This is because a dynamic value of null can convert to any reference type.)
      * <li>If <em>T0</em> and <em>T1</em> are primitives, then a Java method invocation
-     *     conversion (JLS 5.3) is applied, if one exists.
+     *     conversion (JLS {@jls 5.3}) is applied, if one exists.
      *     (Specifically, <em>T0</em> must convert to <em>T1</em> by a widening primitive conversion.)
      * <li>If <em>T0</em> is a primitive and <em>T1</em> a reference,
-     *     a Java casting conversion (JLS 5.5) is applied if one exists.
+     *     a Java casting conversion (JLS {@jls 5.5}) is applied if one exists.
      *     (Specifically, the value is boxed from <em>T0</em> to its wrapper class,
      *     which is then widened as needed to <em>T1</em>.)
      * <li>If <em>T0</em> is a reference and <em>T1</em> a primitive, an unboxing
      *     conversion will be applied at runtime, possibly followed
-     *     by a Java method invocation conversion (JLS 5.3)
+     *     by a Java method invocation conversion (JLS {@jls 5.3})
      *     on the primitive value.  (These are the primitive widening conversions.)
      *     <em>T0</em> must be a wrapper class or a supertype of one.
      *     (In the case where <em>T0</em> is Object, these are the conversions
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index bdc26750992..dd8b01c73bc 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -1884,7 +1884,7 @@ public class MethodHandles {
              * as a normal class or interface has with its own defining loader.
              * This means that the hidden class may be unloaded if and only if
              * its defining loader is not reachable and thus may be reclaimed
-             * by a garbage collector (JLS 12.7).
+             * by a garbage collector (JLS {@jls 12.7}).
              *
              * <p> By default, a hidden class or interface may be unloaded
              * even if the class loader that is marked as its defining loader is
@@ -2024,7 +2024,7 @@ public class MethodHandles {
          * that {@linkplain Class#getClassLoader() defined it}.
          * This means that a class created by a class loader may be unloaded if and
          * only if its defining loader is not reachable and thus may be reclaimed
-         * by a garbage collector (JLS 12.7).
+         * by a garbage collector (JLS {@jls 12.7}).
          *
          * By default, however, a hidden class or interface may be unloaded even if
          * the class loader that is marked as its defining loader is
@@ -4757,15 +4757,15 @@ return invoker;
      *     the boolean is converted to a byte value, 1 for true, 0 for false.
      *     (This treatment follows the usage of the bytecode verifier.)
      * <li>If <em>T1</em> is boolean and <em>T0</em> is another primitive,
-     *     <em>T0</em> is converted to byte via Java casting conversion (JLS 5.5),
+     *     <em>T0</em> is converted to byte via Java casting conversion (JLS {@jls 5.5}),
      *     and the low order bit of the result is tested, as if by {@code (x & 1) != 0}.
      * <li>If <em>T0</em> and <em>T1</em> are primitives other than boolean,
-     *     then a Java casting conversion (JLS 5.5) is applied.
+     *     then a Java casting conversion (JLS {@jls 5.5}) is applied.
      *     (Specifically, <em>T0</em> will convert to <em>T1</em> by
      *     widening and/or narrowing.)
      * <li>If <em>T0</em> is a reference and <em>T1</em> a primitive, an unboxing
      *     conversion will be applied at runtime, possibly followed
-     *     by a Java casting conversion (JLS 5.5) on the primitive value,
+     *     by a Java casting conversion (JLS {@jls 5.5}) on the primitive value,
      *     possibly followed by a conversion from byte to boolean by testing
      *     the low-order bit.
      * <li>If <em>T0</em> is a reference and <em>T1</em> a primitive,
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index 5ff0cf84aec..7026591190e 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -142,10 +142,10 @@ public final class StringConcatFactory {
      * <ul>
      *     <li>zero inputs, concatenation results in an empty string;</li>
      *     <li>one input, concatenation results in the single
-     *     input converted as per JLS 5.1.11 "String Conversion"; otherwise</li>
+     *     input converted as per JLS {@jls 5.1.11} "String Conversion"; otherwise</li>
      *     <li>two or more inputs, the inputs are concatenated as per
-     *     requirements stated in JLS 15.18.1 "String Concatenation Operator +".
-     *     The inputs are converted as per JLS 5.1.11 "String Conversion",
+     *     requirements stated in JLS {@jls 15.18.1} "String Concatenation Operator +".
+     *     The inputs are converted as per JLS {@jls 5.1.11} "String Conversion",
      *     and combined from left to right.</li>
      * </ul>
      *
@@ -223,10 +223,10 @@ public final class StringConcatFactory {
      * <ul>
      *     <li>zero inputs, concatenation results in an empty string;</li>
      *     <li>one input, concatenation results in the single
-     *     input converted as per JLS 5.1.11 "String Conversion"; otherwise</li>
+     *     input converted as per JLS {@jls 5.1.11} "String Conversion"; otherwise</li>
      *     <li>two or more inputs, the inputs are concatenated as per
-     *     requirements stated in JLS 15.18.1 "String Concatenation Operator +".
-     *     The inputs are converted as per JLS 5.1.11 "String Conversion",
+     *     requirements stated in JLS {@jls 15.18.1} "String Concatenation Operator +".
+     *     The inputs are converted as per JLS {@jls 5.1.11} "String Conversion",
      *     and combined from left to right.</li>
      * </ul>
      *
diff --git a/src/java.base/share/classes/java/lang/reflect/TypeVariable.java b/src/java.base/share/classes/java/lang/reflect/TypeVariable.java
index 0064aed2a22..01746e34385 100644
--- a/src/java.base/share/classes/java/lang/reflect/TypeVariable.java
+++ b/src/java.base/share/classes/java/lang/reflect/TypeVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,8 @@ package java.lang.reflect;
  * A type variable is created the first time it is needed by a reflective
  * method, as specified in this package.  If a type variable t is referenced
  * by a type (i.e, class, interface or annotation type) T, and T is declared
- * by the nth enclosing class of T (see JLS 8.1.2), then the creation of t
- * requires the resolution (see JVMS 5) of the ith enclosing class of T,
+ * by the n<sup>th</sup> enclosing class of T (see JLS {@jls 8.1.2}), then the creation of t
+ * requires the resolution (see JVMS {@jvms 5}) of the i<sup>th</sup> enclosing class of T,
  * for i = 0 to n, inclusive. Creating a type variable must not cause the
  * creation of its bounds. Repeated creation of a type variable has no effect.
  *
-- 
GitLab


From 3e393047e12147a81e2899784b943923fc34da8e Mon Sep 17 00:00:00 2001
From: XenoAmess <xenoamess@gmail.com>
Date: Wed, 16 Mar 2022 16:48:49 +0000
Subject: [PATCH 105/345] 8281631: HashMap copy constructor and putAll can
 over-allocate table

Reviewed-by: smarks
---
 .../share/classes/java/util/HashMap.java      |  14 +-
 .../share/classes/java/util/WeakHashMap.java  |  10 +-
 test/jdk/ProblemList.txt                      |   1 +
 .../java/util/HashMap/WhiteBoxResizeTest.java | 305 ++++++++++++++----
 4 files changed, 258 insertions(+), 72 deletions(-)

diff --git a/src/java.base/share/classes/java/util/HashMap.java b/src/java.base/share/classes/java/util/HashMap.java
index 24fcd9516ca..997273aa104 100644
--- a/src/java.base/share/classes/java/util/HashMap.java
+++ b/src/java.base/share/classes/java/util/HashMap.java
@@ -495,9 +495,9 @@ public class HashMap<K,V> extends AbstractMap<K,V>
         int s = m.size();
         if (s > 0) {
             if (table == null) { // pre-size
-                float ft = ((float)s / loadFactor) + 1.0F;
-                int t = ((ft < (float)MAXIMUM_CAPACITY) ?
-                         (int)ft : MAXIMUM_CAPACITY);
+                double dt = Math.ceil(s / (double)loadFactor);
+                int t = ((dt < (double)MAXIMUM_CAPACITY) ?
+                         (int)dt : MAXIMUM_CAPACITY);
                 if (t > threshold)
                     threshold = tableSizeFor(t);
             } else {
@@ -1527,12 +1527,12 @@ public class HashMap<K,V> extends AbstractMap<K,V>
         } else if (mappings == 0) {
             // use defaults
         } else if (mappings > 0) {
-            float fc = (float)mappings / lf + 1.0f;
-            int cap = ((fc < DEFAULT_INITIAL_CAPACITY) ?
+            double dc = Math.ceil(mappings / (double)lf);
+            int cap = ((dc < DEFAULT_INITIAL_CAPACITY) ?
                        DEFAULT_INITIAL_CAPACITY :
-                       (fc >= MAXIMUM_CAPACITY) ?
+                       (dc >= MAXIMUM_CAPACITY) ?
                        MAXIMUM_CAPACITY :
-                       tableSizeFor((int)fc));
+                       tableSizeFor((int)dc));
             float ft = (float)cap * lf;
             threshold = ((cap < MAXIMUM_CAPACITY && ft < MAXIMUM_CAPACITY) ?
                          (int)ft : Integer.MAX_VALUE);
diff --git a/src/java.base/share/classes/java/util/WeakHashMap.java b/src/java.base/share/classes/java/util/WeakHashMap.java
index d74c7d65728..bc31985b66e 100644
--- a/src/java.base/share/classes/java/util/WeakHashMap.java
+++ b/src/java.base/share/classes/java/util/WeakHashMap.java
@@ -213,9 +213,7 @@ public class WeakHashMap<K,V>
         if (loadFactor <= 0 || Float.isNaN(loadFactor))
             throw new IllegalArgumentException("Illegal Load factor: "+
                                                loadFactor);
-        int capacity = 1;
-        while (capacity < initialCapacity)
-            capacity <<= 1;
+        int capacity = HashMap.tableSizeFor(initialCapacity);
         table = newTable(capacity);
         this.loadFactor = loadFactor;
         threshold = (int)(capacity * loadFactor);
@@ -251,7 +249,7 @@ public class WeakHashMap<K,V>
      * @since   1.3
      */
     public WeakHashMap(Map<? extends K, ? extends V> m) {
-        this(Math.max((int) ((float)m.size() / DEFAULT_LOAD_FACTOR + 1.0F),
+        this(Math.max((int) Math.ceil(m.size() / (double)DEFAULT_LOAD_FACTOR),
                 DEFAULT_INITIAL_CAPACITY),
              DEFAULT_LOAD_FACTOR);
         putAll(m);
@@ -468,7 +466,7 @@ public class WeakHashMap<K,V>
         modCount++;
         Entry<K,V> e = tab[i];
         tab[i] = new Entry<>(k, value, queue, h, e);
-        if (++size >= threshold)
+        if (++size > threshold)
             resize(tab.length * 2);
         return null;
     }
@@ -557,7 +555,7 @@ public class WeakHashMap<K,V>
          * to at most one extra resize.
          */
         if (numKeysToBeAdded > threshold) {
-            int targetCapacity = (int)(numKeysToBeAdded / loadFactor + 1);
+            int targetCapacity = (int)Math.ceil(numKeysToBeAdded / (double)loadFactor);
             if (targetCapacity > MAXIMUM_CAPACITY)
                 targetCapacity = MAXIMUM_CAPACITY;
             int newCapacity = table.length;
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index fc1979b6ed6..0bafc13a252 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -542,6 +542,7 @@ java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java        8151492 generic-
 java/lang/invoke/LFCaching/LFGarbageCollectedTest.java          8078602 generic-all
 java/lang/invoke/lambda/LambdaFileEncodingSerialization.java    8249079 linux-x64
 java/lang/invoke/RicochetTest.java                              8251969 generic-all
+java/lang/Enum/ConstantDirectoryOptimalCapacity.java            8282120 generic-all
 
 ############################################################################
 
diff --git a/test/jdk/java/util/HashMap/WhiteBoxResizeTest.java b/test/jdk/java/util/HashMap/WhiteBoxResizeTest.java
index e7374dff5cd..ad02b3000e2 100644
--- a/test/jdk/java/util/HashMap/WhiteBoxResizeTest.java
+++ b/test/jdk/java/util/HashMap/WhiteBoxResizeTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,113 +22,299 @@
  * questions.
  */
 
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.VarHandle;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ThreadLocalRandom;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
-import java.util.stream.IntStream;
 
-import static java.util.stream.Collectors.toMap;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
 /*
  * @test
- * @bug 8210280
+ * @bug 8210280 8281631
  * @modules java.base/java.util:open
- * @summary White box tests for HashMap internals around table resize
+ * @summary White box tests for HashMap-related internals around table sizing
  * @run testng WhiteBoxResizeTest
- * @key randomness
  */
 public class WhiteBoxResizeTest {
-    final ThreadLocalRandom rnd = ThreadLocalRandom.current();
+
     final MethodHandle TABLE_SIZE_FOR;
-    final VarHandle THRESHOLD;
-    final VarHandle TABLE;
+    final VarHandle HM_TABLE;
+    final VarHandle WHM_TABLE;
 
     public WhiteBoxResizeTest() throws ReflectiveOperationException {
-        Class<?> mClass = HashMap.class;
-        String nodeClassName = mClass.getName() + "$Node";
-        Class<?> nodeArrayClass = Class.forName("[L" + nodeClassName + ";");
-        MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(mClass, MethodHandles.lookup());
-        TABLE = lookup.findVarHandle(mClass, "table", nodeArrayClass);
-        this.TABLE_SIZE_FOR = lookup.findStatic(
-                mClass, "tableSizeFor",
-                MethodType.methodType(int.class, int.class));
-        this.THRESHOLD = lookup.findVarHandle(mClass, "threshold", int.class);
+        MethodHandles.Lookup hmlookup = MethodHandles.privateLookupIn(HashMap.class, MethodHandles.lookup());
+        TABLE_SIZE_FOR = hmlookup.findStatic(
+                HashMap.class, "tableSizeFor", MethodType.methodType(int.class, int.class));
+        HM_TABLE = hmlookup.unreflectVarHandle(HashMap.class.getDeclaredField("table"));
+
+        MethodHandles.Lookup whmlookup = MethodHandles.privateLookupIn(WeakHashMap.class, MethodHandles.lookup());
+        WHM_TABLE = whmlookup.unreflectVarHandle(WeakHashMap.class.getDeclaredField("table"));
     }
 
+    /*
+     * utility methods
+     */
+
     int tableSizeFor(int n) {
         try {
             return (int) TABLE_SIZE_FOR.invoke(n);
-        } catch (Throwable t) { throw new AssertionError(t); }
+        } catch (Throwable t) {
+            throw new AssertionError(t);
+        }
     }
 
-    Object[] table(HashMap map) {
+    Object[] table(Map<?, ?> map) {
         try {
-            return (Object[]) TABLE.get(map);
-        } catch (Throwable t) { throw new AssertionError(t); }
+            VarHandle vh = map instanceof WeakHashMap ? WHM_TABLE : HM_TABLE;
+            return (Object[]) vh.get(map);
+        } catch (Throwable t) {
+            throw new AssertionError(t);
+        }
     }
 
-    int capacity(HashMap map) {
+    int capacity(Map<?, ?> map) {
         return table(map).length;
     }
 
-    @Test
-    public void testTableSizeFor() {
-        assertEquals(tableSizeFor(0), 1);
-        assertEquals(tableSizeFor(1), 1);
-        assertEquals(tableSizeFor(2), 2);
-        assertEquals(tableSizeFor(3), 4);
-        assertEquals(tableSizeFor(15), 16);
-        assertEquals(tableSizeFor(16), 16);
-        assertEquals(tableSizeFor(17), 32);
-        int maxSize = 1 << 30;
-        assertEquals(tableSizeFor(maxSize - 1), maxSize);
-        assertEquals(tableSizeFor(maxSize), maxSize);
-        assertEquals(tableSizeFor(maxSize + 1), maxSize);
-        assertEquals(tableSizeFor(Integer.MAX_VALUE), maxSize);
+    // creates a map with size mappings
+    Map<String, String> makeMap(int size) {
+        Map<String, String> map = new HashMap<>();
+        putN(map, size);
+        return map;
+    }
+
+    // creates a "fake" map: size() returns the given size, but
+    // the entrySet iterator returns only one entry
+    Map<String, String> fakeMap(int size) {
+        return new AbstractMap<>() {
+            public Set<Map.Entry<String, String>> entrySet() {
+                return new AbstractSet<Map.Entry<String, String>>() {
+                    public int size() {
+                        return size;
+                    }
+
+                    public Iterator<Map.Entry<String, String>> iterator() {
+                        return Set.of(Map.entry("1", "1")).iterator();
+                    }
+                };
+            }
+        };
+    }
+
+    void putN(Map<String, String> map, int n) {
+        for (int i = 0; i < n; i++) {
+            String string = Integer.toString(i);
+            map.put(string, string);
+        }
+    }
+
+    /*
+     * tests of tableSizeFor
+     */
+
+    @DataProvider(name = "tableSizeFor")
+    public Object[][] tableSizeForCases() {
+        final int MAX = 1 << 30;
+        return new Object[][] {
+                // tableSizeFor(arg), expected
+                { 0,                   1 },
+                { 1,                   1 },
+                { 2,                   2 },
+                { 3,                   4 },
+                { 4,                   4 },
+                { 5,                   8 },
+                { 15,                 16 },
+                { 16,                 16 },
+                { 17,                 32 },
+                { MAX-1,             MAX },
+                { MAX,               MAX },
+                { MAX+1,             MAX },
+                { Integer.MAX_VALUE, MAX }
+        };
+    }
+
+    @Test(dataProvider = "tableSizeFor")
+    public void tableSizeFor(int arg, int expected) {
+        assertEquals(tableSizeFor(arg), expected);
     }
 
-    @Test
-    public void capacityTestDefaultConstructor() {
-        capacityTestDefaultConstructor(new HashMap<>());
-        capacityTestDefaultConstructor(new LinkedHashMap<>());
+    /*
+     * tests for lazy table allocation
+     */
+
+    @DataProvider(name = "lazy")
+    public Object[][] lazyTableAllocationCases() {
+        return new Object[][]{
+                {new HashMap<>()},
+                // { new WeakHashMap<>() }, // WHM doesn't allocate lazily
+                {new LinkedHashMap<>()}
+        };
     }
 
-    void capacityTestDefaultConstructor(HashMap<Integer, Integer> map) {
+    @Test(dataProvider = "lazy")
+    public void lazyTableAllocation(Map<?, ?> map) {
         assertNull(table(map));
+    }
 
-        map.put(1, 1);
-        assertEquals(capacity(map), 16); // default initial capacity
+    /*
+     * tests for default capacity (no-arg constructor)
+     */
 
-        map.putAll(IntStream.range(0, 64).boxed().collect(toMap(i -> i, i -> i)));
-        assertEquals(capacity(map), 128);
+    @DataProvider(name = "defaultCapacity")
+    public Object[][] defaultCapacityCases() {
+        return new Supplier<?>[][]{
+                {() -> new HashMap<>()},
+                {() -> new LinkedHashMap<>()},
+                {() -> new WeakHashMap<>()}
+        };
     }
 
-    @Test
-    public void capacityTestInitialCapacity() {
-        int initialCapacity = rnd.nextInt(2, 128);
-        List<Supplier<HashMap<Integer, Integer>>> suppliers = List.of(
-            () -> new HashMap<>(initialCapacity),
-            () -> new HashMap<>(initialCapacity, 0.75f),
-            () -> new LinkedHashMap<>(initialCapacity),
-            () -> new LinkedHashMap<>(initialCapacity, 0.75f));
+    @Test(dataProvider = "defaultCapacity")
+    public void defaultCapacity(Supplier<Map<String, String>> s) {
+        Map<String, String> map = s.get();
+        map.put("", "");
+        assertEquals(capacity(map), 16);
+    }
 
-        for (Supplier<HashMap<Integer, Integer>> supplier : suppliers) {
-            HashMap<Integer, Integer> map = supplier.get();
-            assertNull(table(map));
+    /*
+     * tests for requested capacity (int and int+float constructors)
+     */
 
-            map.put(1, 1);
-            assertEquals(capacity(map), tableSizeFor(initialCapacity));
+    @DataProvider(name = "requestedCapacity")
+    public Iterator<Object[]> requestedCapacityCases() {
+        ArrayList<Object[]> cases = new ArrayList<>();
+        for (int i = 2; i < 128; i++) {
+            int cap = i;
+            cases.add(new Object[]{"rhm1", cap, (Supplier<Map<String, String>>) () -> new HashMap<>(cap)});
+            cases.add(new Object[]{"rhm2", cap, (Supplier<Map<String, String>>) () -> new HashMap<>(cap, 0.75f)});
+            cases.add(new Object[]{"rlm1", cap, (Supplier<Map<String, String>>) () -> new LinkedHashMap<>(cap)});
+            cases.add(new Object[]{"rlm2", cap, (Supplier<Map<String, String>>) () -> new LinkedHashMap<>(cap, 0.75f)});
+            cases.add(new Object[]{"rwm1", cap, (Supplier<Map<String, String>>) () -> new WeakHashMap<>(cap)});
+            cases.add(new Object[]{"rwm2", cap, (Supplier<Map<String, String>>) () -> new WeakHashMap<>(cap, 0.75f)});
         }
+        return cases.iterator();
+    }
+
+    @Test(dataProvider = "requestedCapacity")
+    public void requestedCapacity(String label, int cap, Supplier<Map<String, String>> s) {
+        Map<String, String> map = s.get();
+        map.put("", "");
+        assertEquals(capacity(map), tableSizeFor(cap));
+    }
+
+    /*
+     * Tests for capacity after map is populated with a given number N of mappings.
+     * Maps are populated using a copy constructor on a map with N mappings,
+     * other constructors followed by N put() calls, and other constructors followed
+     * by putAll() on a map with N mappings.
+     *
+     * String labels encode the test case for ease of diagnosis if one of the test cases fails.
+     * For example, "plm2pn" is "populated LinkedHashMap, 2-arg constructor, followed by putN".
+     */
+
+    // helper method for one populated capacity case, to provide target types for lambdas
+    Object[] pcc(String label,
+                 int size,
+                 int expectedCapacity,
+                 Supplier<Map<String, String>> supplier,
+                 Consumer<Map<String, String>> consumer) {
+        return new Object[]{label, size, expectedCapacity, supplier, consumer};
+    }
+
+    List<Object[]> genPopulatedCapacityCases(int size, int cap) {
+        return Arrays.asList(
+                pcc("phmcpy", size, cap, () -> new HashMap<>(makeMap(size)),       map -> { }),
+                pcc("phm0pn", size, cap, () -> new HashMap<>(),                    map -> { putN(map, size); }),
+                pcc("phm1pn", size, cap, () -> new HashMap<>(cap),                 map -> { putN(map, size); }),
+                pcc("phm2pn", size, cap, () -> new HashMap<>(cap, 0.75f),          map -> { putN(map, size); }),
+                pcc("phm0pa", size, cap, () -> new HashMap<>(),                    map -> { map.putAll(makeMap(size)); }),
+                pcc("phm1pa", size, cap, () -> new HashMap<>(cap),                 map -> { map.putAll(makeMap(size)); }),
+                pcc("phm2pa", size, cap, () -> new HashMap<>(cap, 0.75f),          map -> { map.putAll(makeMap(size)); }),
+
+                pcc("plmcpy", size, cap, () -> new LinkedHashMap<>(makeMap(size)), map -> { }),
+                pcc("plm0pn", size, cap, () -> new LinkedHashMap<>(),              map -> { putN(map, size); }),
+                pcc("plm1pn", size, cap, () -> new LinkedHashMap<>(cap),           map -> { putN(map, size); }),
+                pcc("plm2pn", size, cap, () -> new LinkedHashMap<>(cap, 0.75f),    map -> { putN(map, size); }),
+                pcc("plm0pa", size, cap, () -> new LinkedHashMap<>(),              map -> { map.putAll(makeMap(size)); }),
+                pcc("plm1pa", size, cap, () -> new LinkedHashMap<>(cap),           map -> { map.putAll(makeMap(size)); }),
+                pcc("plm2pa", size, cap, () -> new LinkedHashMap<>(cap, 0.75f),    map -> { map.putAll(makeMap(size)); }),
+
+                pcc("pwmcpy", size, cap, () -> new WeakHashMap<>(makeMap(size)),   map -> { }),
+                pcc("pwm0pn", size, cap, () -> new WeakHashMap<>(),                map -> { putN(map, size); }),
+                pcc("pwm1pn", size, cap, () -> new WeakHashMap<>(cap),             map -> { putN(map, size); }),
+                pcc("pwm2pn", size, cap, () -> new WeakHashMap<>(cap, 0.75f),      map -> { putN(map, size); }),
+                pcc("pwm0pa", size, cap, () -> new WeakHashMap<>(),                map -> { map.putAll(makeMap(size)); }),
+                pcc("pwm1pa", size, cap, () -> new WeakHashMap<>(cap),             map -> { map.putAll(makeMap(size)); }),
+                pcc("pwm2pa", size, cap, () -> new WeakHashMap<>(cap, 0.75f),      map -> { map.putAll(makeMap(size)); })
+        );
+    }
+
+    List<Object[]> genFakePopulatedCapacityCases(int size, int cap) {
+        return Arrays.asList(
+                pcc("fhmcpy", size, cap, () -> new HashMap<>(fakeMap(size)),       map -> { }),
+                pcc("fhm0pa", size, cap, () -> new HashMap<>(),                    map -> { map.putAll(fakeMap(size)); }),
+                pcc("fhm1pa", size, cap, () -> new HashMap<>(cap),                 map -> { map.putAll(fakeMap(size)); }),
+                pcc("fhm2pa", size, cap, () -> new HashMap<>(cap, 0.75f),          map -> { map.putAll(fakeMap(size)); }),
+
+                pcc("flmcpy", size, cap, () -> new LinkedHashMap<>(fakeMap(size)), map -> { }),
+                pcc("flm0pa", size, cap, () -> new LinkedHashMap<>(),              map -> { map.putAll(fakeMap(size)); }),
+                pcc("flm1pa", size, cap, () -> new LinkedHashMap<>(cap),           map -> { map.putAll(fakeMap(size)); }),
+                pcc("flm2pa", size, cap, () -> new LinkedHashMap<>(cap, 0.75f),    map -> { map.putAll(fakeMap(size)); }),
+
+                pcc("fwmcpy", size, cap, () -> new WeakHashMap<>(fakeMap(size)),   map -> { }),
+                // pcc("fwm0pa", size, cap, () -> new WeakHashMap<>(),                map -> { map.putAll(fakeMap(size)); }), // see note
+                pcc("fwm1pa", size, cap, () -> new WeakHashMap<>(cap),             map -> { map.putAll(fakeMap(size)); }),
+                pcc("fwm2pa", size, cap, () -> new WeakHashMap<>(cap, 0.75f),      map -> { map.putAll(fakeMap(size)); })
+        );
+
+        // Test case "fwm0pa" is commented out because WeakHashMap uses a different allocation
+        // policy from the other map implementations: it deliberately under-allocates in this case.
+    }
+
+    @DataProvider(name = "populatedCapacity")
+    public Iterator<Object[]> populatedCapacityCases() {
+        ArrayList<Object[]> cases = new ArrayList<>();
+        cases.addAll(genPopulatedCapacityCases(11,  16));
+        cases.addAll(genPopulatedCapacityCases(12,  16));
+        cases.addAll(genPopulatedCapacityCases(13,  32));
+        cases.addAll(genPopulatedCapacityCases(64, 128));
+
+        // numbers in this range are truncated by a float computation with 0.75f
+        // but can get an exact result with a double computation with 0.75d
+        cases.addAll(genFakePopulatedCapacityCases(25165824, 33554432));
+        cases.addAll(genFakePopulatedCapacityCases(25165825, 67108864));
+        cases.addAll(genFakePopulatedCapacityCases(25165826, 67108864));
+
+        return cases.iterator();
     }
+
+    @Test(dataProvider = "populatedCapacity")
+    public void populatedCapacity(String label, // unused, included for diagnostics
+                                  int size,     // unused, included for diagnostics
+                                  int expectedCapacity,
+                                  Supplier<Map<String, String>> s,
+                                  Consumer<Map<String, String>> c) {
+        Map<String, String> map = s.get();
+        c.accept(map);
+        assertEquals(capacity(map), expectedCapacity);
+    }
+
 }
-- 
GitLab


From 3da5204b3c3a3f95bddcdcfe2628c2e0ed8a12d9 Mon Sep 17 00:00:00 2001
From: Jie Fu <jiefu@openjdk.org>
Date: Thu, 17 Mar 2022 00:05:57 +0000
Subject: [PATCH 106/345] 8283229:
 compiler/arguments/TestCodeEntryAlignment.java fails with release VMs

Reviewed-by: dlong
---
 .../hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java b/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
index 15a60382245..0ea1aee6bd6 100644
--- a/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
+++ b/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
@@ -27,6 +27,7 @@
  * @library /test/lib /
  * @bug 8281467
  * @requires vm.flagless
+ * @requires vm.debug
  * @requires os.arch=="amd64" | os.arch=="x86_64"
  *
  * @summary Test large CodeEntryAlignments are accepted
-- 
GitLab


From a5ebcc0c04bedd87bc9a523b0a45b50fc4b0f5f0 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Thu, 17 Mar 2022 08:54:29 +0000
Subject: [PATCH 107/345] 8282072: G1: Rename CardSetPtr to CardSetContainerPtr

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/g1/g1CardSet.cpp         | 405 +++++++++---------
 src/hotspot/share/gc/g1/g1CardSet.hpp         | 133 +++---
 src/hotspot/share/gc/g1/g1CardSet.inline.hpp  |  35 +-
 .../share/gc/g1/g1CardSetContainers.hpp       |  58 +--
 .../gc/g1/g1CardSetContainers.inline.hpp      |  56 +--
 .../share/gc/g1/heapRegionRemSet.inline.hpp   |   6 +-
 test/hotspot/gtest/gc/g1/test_g1CardSet.cpp   |   4 +-
 .../gtest/gc/g1/test_g1CardSetContainers.cpp  |   2 +-
 8 files changed, 346 insertions(+), 353 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CardSet.cpp b/src/hotspot/share/gc/g1/g1CardSet.cpp
index a87db1ff718..82092a1d502 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.cpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.cpp
@@ -26,25 +26,19 @@
 #include "gc/g1/g1CardSet.inline.hpp"
 #include "gc/g1/g1CardSetContainers.inline.hpp"
 #include "gc/g1/g1CardSetMemory.inline.hpp"
-#include "gc/g1/g1FromCardCache.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/gcTraceTime.inline.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals_extension.hpp"
-#include "runtime/mutex.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/concurrentHashTable.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/lockFreeStack.hpp"
-#include "utilities/spinYield.hpp"
-
-#include "gc/shared/gcLogPrecious.hpp"
-#include "gc/shared/gcTraceTime.inline.hpp"
-#include "runtime/java.hpp"
 
-G1CardSet::CardSetPtr G1CardSet::FullCardSet = (G1CardSet::CardSetPtr)-1;
+G1CardSet::ContainerPtr G1CardSet::FullCardSet = (G1CardSet::ContainerPtr)-1;
 
-static uint default_log2_card_region_per_region() {
+static uint default_log2_card_regions_per_region() {
   uint log2_card_regions_per_heap_region = 0;
 
   const uint card_container_limit = G1CardSetContainer::LogCardsPerRegionLimit;
@@ -62,7 +56,7 @@ G1CardSetConfiguration::G1CardSetConfiguration() :
                          G1RemSetHowlNumBuckets,                                    /* num_buckets_in_howl */
                          (double)G1RemSetCoarsenHowlToFullPercent / 100,            /* cards_in_howl_threshold_percent */
                          (uint)HeapRegion::CardsPerRegion,                          /* max_cards_in_cardset */
-                         default_log2_card_region_per_region())                     /* log2_card_region_per_region */
+                         default_log2_card_regions_per_region())                    /* log2_card_regions_per_region */
 {
   assert((_log2_card_regions_per_heap_region + _log2_cards_per_card_region) == (uint)HeapRegion::LogCardsPerRegion,
          "inconsistent heap region virtualization setup");
@@ -73,7 +67,7 @@ G1CardSetConfiguration::G1CardSetConfiguration(uint max_cards_in_array,
                                                uint max_buckets_in_howl,
                                                double cards_in_howl_threshold_percent,
                                                uint max_cards_in_card_set,
-                                               uint log2_card_region_per_region) :
+                                               uint log2_card_regions_per_region) :
   G1CardSetConfiguration(log2i_exact(max_cards_in_card_set),                   /* inline_ptr_bits_per_card */
                          max_cards_in_array,                                   /* max_cards_in_array */
                          cards_in_bitmap_threshold_percent,                    /* cards_in_bitmap_threshold_percent */
@@ -82,7 +76,7 @@ G1CardSetConfiguration::G1CardSetConfiguration(uint max_cards_in_array,
                                                     max_buckets_in_howl),
                          cards_in_howl_threshold_percent,                      /* cards_in_howl_threshold_percent */
                          max_cards_in_card_set,                                /* max_cards_in_cardset */
-                         log2_card_region_per_region)
+                         log2_card_regions_per_region)
 { }
 
 G1CardSetConfiguration::G1CardSetConfiguration(uint inline_ptr_bits_per_card,
@@ -197,7 +191,7 @@ void G1CardSetCoarsenStats::print_on(outputStream* out) {
 }
 
 class G1CardSetHashTable : public CHeapObj<mtGCCardSet> {
-  using CardSetPtr = G1CardSet::CardSetPtr;
+  using ContainerPtr = G1CardSet::ContainerPtr;
 
   // Did we insert at least one card in the table?
   bool volatile _inserted_card;
@@ -231,12 +225,12 @@ class G1CardSetHashTable : public CHeapObj<mtGCCardSet> {
   };
 
   class G1CardSetHashTableScan : public StackObj {
-    G1CardSet::CardSetPtrClosure* _scan_f;
+    G1CardSet::ContainerPtrClosure* _scan_f;
   public:
-    explicit G1CardSetHashTableScan(G1CardSet::CardSetPtrClosure* f) : _scan_f(f) { }
+    explicit G1CardSetHashTableScan(G1CardSet::ContainerPtrClosure* f) : _scan_f(f) { }
 
     bool operator()(G1CardSetHashTableValue* value) {
-      _scan_f->do_cardsetptr(value->_region_idx, value->_num_occupied, value->_card_set);
+      _scan_f->do_containerptr(value->_region_idx, value->_num_occupied, value->_container);
       return true;
     }
   };
@@ -284,19 +278,19 @@ public:
     return found.value();
   }
 
-  void iterate_safepoint(G1CardSet::CardSetPtrClosure* cl2) {
+  void iterate_safepoint(G1CardSet::ContainerPtrClosure* cl2) {
     G1CardSetHashTableScan cl(cl2);
     _table.do_safepoint_scan(cl);
   }
 
-  void iterate(G1CardSet::CardSetPtrClosure* cl2) {
+  void iterate(G1CardSet::ContainerPtrClosure* cl2) {
     G1CardSetHashTableScan cl(cl2);
     _table.do_scan(Thread::current(), cl);
   }
 
   void reset() {
     if (Atomic::load(&_inserted_card)) {
-       _table.unsafe_reset(InitialLogTableSize);
+      _table.unsafe_reset(InitialLogTableSize);
       Atomic::store(&_inserted_card, false);
     }
   }
@@ -343,93 +337,93 @@ G1CardSet::~G1CardSet() {
   _mm->flush();
 }
 
-uint G1CardSet::card_set_type_to_mem_object_type(uintptr_t type) const {
-  assert(type == G1CardSet::CardSetArrayOfCards ||
-         type == G1CardSet::CardSetBitMap ||
-         type == G1CardSet::CardSetHowl, "should not allocate card set type %zu", type);
+uint G1CardSet::container_type_to_mem_object_type(uintptr_t type) const {
+  assert(type == G1CardSet::ContainerArrayOfCards ||
+         type == G1CardSet::ContainerBitMap ||
+         type == G1CardSet::ContainerHowl, "should not allocate container type %zu", type);
 
   return (uint)type;
 }
 
 uint8_t* G1CardSet::allocate_mem_object(uintptr_t type) {
-  return _mm->allocate(card_set_type_to_mem_object_type(type));
+  return _mm->allocate(container_type_to_mem_object_type(type));
 }
 
-void G1CardSet::free_mem_object(CardSetPtr card_set) {
-  assert(card_set != G1CardSet::FreeCardSet, "should not free Free card set");
-  assert(card_set != G1CardSet::FullCardSet, "should not free Full card set");
+void G1CardSet::free_mem_object(ContainerPtr container) {
+  assert(container != G1CardSet::FreeCardSet, "should not free container FreeCardSet");
+  assert(container != G1CardSet::FullCardSet, "should not free container FullCardSet");
 
-  uintptr_t type = card_set_type(card_set);
-  void* value = strip_card_set_type(card_set);
+  uintptr_t type = container_type(container);
+  void* value = strip_container_type(container);
 
-  assert(type == G1CardSet::CardSetArrayOfCards ||
-         type == G1CardSet::CardSetBitMap ||
-         type == G1CardSet::CardSetHowl, "should not free card set type %zu", type);
+  assert(type == G1CardSet::ContainerArrayOfCards ||
+         type == G1CardSet::ContainerBitMap ||
+         type == G1CardSet::ContainerHowl, "should not free card set type %zu", type);
   assert(static_cast<G1CardSetContainer*>(value)->refcount() == 1, "must be");
 
-  _mm->free(card_set_type_to_mem_object_type(type), value);
+  _mm->free(container_type_to_mem_object_type(type), value);
 }
 
-G1CardSet::CardSetPtr G1CardSet::acquire_card_set(CardSetPtr volatile* card_set_addr) {
+G1CardSet::ContainerPtr G1CardSet::acquire_container(ContainerPtr volatile* container_addr) {
   // Update reference counts under RCU critical section to avoid a
   // use-after-cleapup bug where we increment a reference count for
   // an object whose memory has already been cleaned up and reused.
   GlobalCounter::CriticalSection cs(Thread::current());
   while (true) {
-    // Get cardsetptr and increment refcount atomically wrt to memory reuse.
-    CardSetPtr card_set = Atomic::load_acquire(card_set_addr);
-    uint cs_type = card_set_type(card_set);
-    if (card_set == FullCardSet || cs_type == CardSetInlinePtr) {
-      return card_set;
+    // Get ContainerPtr and increment refcount atomically wrt to memory reuse.
+    ContainerPtr container = Atomic::load_acquire(container_addr);
+    uint cs_type = container_type(container);
+    if (container == FullCardSet || cs_type == ContainerInlinePtr) {
+      return container;
     }
 
-    G1CardSetContainer* card_set_on_heap = (G1CardSetContainer*)strip_card_set_type(card_set);
+    G1CardSetContainer* container_on_heap = (G1CardSetContainer*)strip_container_type(container);
 
-    if (card_set_on_heap->try_increment_refcount()) {
-      assert(card_set_on_heap->refcount() >= 3, "Smallest value is 3");
-      return card_set;
+    if (container_on_heap->try_increment_refcount()) {
+      assert(container_on_heap->refcount() >= 3, "Smallest value is 3");
+      return container;
     }
   }
 }
 
-bool G1CardSet::release_card_set(CardSetPtr card_set) {
-  uint cs_type = card_set_type(card_set);
-  if (card_set == FullCardSet || cs_type == CardSetInlinePtr) {
+bool G1CardSet::release_container(ContainerPtr container) {
+  uint cs_type = container_type(container);
+  if (container == FullCardSet || cs_type == ContainerInlinePtr) {
     return false;
   }
 
-  G1CardSetContainer* card_set_on_heap = (G1CardSetContainer*)strip_card_set_type(card_set);
-  return card_set_on_heap->decrement_refcount() == 1;
+  G1CardSetContainer* container_on_heap = (G1CardSetContainer*)strip_container_type(container);
+  return container_on_heap->decrement_refcount() == 1;
 }
 
-void G1CardSet::release_and_maybe_free_card_set(CardSetPtr card_set) {
-  if (release_card_set(card_set)) {
-    free_mem_object(card_set);
+void G1CardSet::release_and_maybe_free_container(ContainerPtr container) {
+  if (release_container(container)) {
+    free_mem_object(container);
   }
 }
 
-void G1CardSet::release_and_must_free_card_set(CardSetPtr card_set) {
-  bool should_free = release_card_set(card_set);
+void G1CardSet::release_and_must_free_container(ContainerPtr container) {
+  bool should_free = release_container(container);
   assert(should_free, "should have been the only one having a reference");
-  free_mem_object(card_set);
+  free_mem_object(container);
 }
 
 class G1ReleaseCardsets : public StackObj {
   G1CardSet* _card_set;
-  using CardSetPtr = G1CardSet::CardSetPtr;
+  using ContainerPtr = G1CardSet::ContainerPtr;
 
-  void coarsen_to_full(CardSetPtr* card_set_addr) {
+  void coarsen_to_full(ContainerPtr* container_addr) {
     while (true) {
-      CardSetPtr cur_card_set = Atomic::load_acquire(card_set_addr);
-      uint cs_type = G1CardSet::card_set_type(cur_card_set);
-      if (cur_card_set == G1CardSet::FullCardSet) {
+      ContainerPtr cur_container = Atomic::load_acquire(container_addr);
+      uint cs_type = G1CardSet::container_type(cur_container);
+      if (cur_container == G1CardSet::FullCardSet) {
         return;
       }
 
-      CardSetPtr old_value = Atomic::cmpxchg(card_set_addr, cur_card_set, G1CardSet::FullCardSet);
+      ContainerPtr old_value = Atomic::cmpxchg(container_addr, cur_container, G1CardSet::FullCardSet);
 
-      if (old_value == cur_card_set) {
-        _card_set->release_and_maybe_free_card_set(cur_card_set);
+      if (old_value == cur_container) {
+        _card_set->release_and_maybe_free_container(cur_container);
         return;
       }
     }
@@ -438,51 +432,51 @@ class G1ReleaseCardsets : public StackObj {
 public:
   explicit G1ReleaseCardsets(G1CardSet* card_set) : _card_set(card_set) { }
 
-  void operator ()(CardSetPtr* card_set_addr) {
-    coarsen_to_full(card_set_addr);
+  void operator ()(ContainerPtr* container_addr) {
+    coarsen_to_full(container_addr);
   }
 };
 
-G1AddCardResult G1CardSet::add_to_array(CardSetPtr card_set, uint card_in_region) {
-  G1CardSetArray* array = card_set_ptr<G1CardSetArray>(card_set);
+G1AddCardResult G1CardSet::add_to_array(ContainerPtr container, uint card_in_region) {
+  G1CardSetArray* array = container_ptr<G1CardSetArray>(container);
   return array->add(card_in_region);
 }
 
-G1AddCardResult G1CardSet::add_to_howl(CardSetPtr parent_card_set,
-                                                uint card_region,
-                                                uint card_in_region,
-                                                bool increment_total) {
-  G1CardSetHowl* howl = card_set_ptr<G1CardSetHowl>(parent_card_set);
+G1AddCardResult G1CardSet::add_to_howl(ContainerPtr parent_container,
+                                       uint card_region,
+                                       uint card_in_region,
+                                       bool increment_total) {
+  G1CardSetHowl* howl = container_ptr<G1CardSetHowl>(parent_container);
 
   G1AddCardResult add_result;
-  CardSetPtr to_transfer = nullptr;
-  CardSetPtr card_set;
+  ContainerPtr to_transfer = nullptr;
+  ContainerPtr container;
 
   uint bucket = _config->howl_bucket_index(card_in_region);
-  volatile CardSetPtr* bucket_entry = howl->get_card_set_addr(bucket);
+  ContainerPtr volatile* bucket_entry = howl->get_container_addr(bucket);
 
   while (true) {
     if (Atomic::load(&howl->_num_entries) >= _config->cards_in_howl_threshold()) {
       return Overflow;
     }
 
-    card_set = acquire_card_set(bucket_entry);
-    add_result = add_to_card_set(bucket_entry, card_set, card_region, card_in_region);
+    container = acquire_container(bucket_entry);
+    add_result = add_to_container(bucket_entry, container, card_region, card_in_region);
 
     if (add_result != Overflow) {
       break;
     }
-    // Card set has overflown. Coarsen or retry.
-    bool coarsened = coarsen_card_set(bucket_entry, card_set, card_in_region, true /* within_howl */);
-    _coarsen_stats.record_coarsening(card_set_type(card_set) + G1CardSetCoarsenStats::CoarsenHowlOffset, !coarsened);
+    // Card set container has overflown. Coarsen or retry.
+    bool coarsened = coarsen_container(bucket_entry, container, card_in_region, true /* within_howl */);
+    _coarsen_stats.record_coarsening(container_type(container) + G1CardSetCoarsenStats::CoarsenHowlOffset, !coarsened);
     if (coarsened) {
-      // We have been the one coarsening this card set (and in the process added that card).
+      // We successful coarsened this card set container (and in the process added the card).
       add_result = Added;
-      to_transfer = card_set;
+      to_transfer = container;
       break;
     }
     // Somebody else beat us to coarsening. Retry.
-    release_and_maybe_free_card_set(card_set);
+    release_and_maybe_free_container(container);
   }
 
   if (increment_total && add_result == Added) {
@@ -490,91 +484,91 @@ G1AddCardResult G1CardSet::add_to_howl(CardSetPtr parent_card_set,
   }
 
   if (to_transfer != nullptr) {
-    transfer_cards_in_howl(parent_card_set, to_transfer, card_region);
+    transfer_cards_in_howl(parent_container, to_transfer, card_region);
   }
 
-  release_and_maybe_free_card_set(card_set);
+  release_and_maybe_free_container(container);
   return add_result;
 }
 
-G1AddCardResult G1CardSet::add_to_bitmap(CardSetPtr card_set, uint card_in_region) {
-  G1CardSetBitMap* bitmap = card_set_ptr<G1CardSetBitMap>(card_set);
+G1AddCardResult G1CardSet::add_to_bitmap(ContainerPtr container, uint card_in_region) {
+  G1CardSetBitMap* bitmap = container_ptr<G1CardSetBitMap>(container);
   uint card_offset = _config->howl_bitmap_offset(card_in_region);
   return bitmap->add(card_offset, _config->cards_in_howl_bitmap_threshold(), _config->max_cards_in_howl_bitmap());
 }
 
-G1AddCardResult G1CardSet::add_to_inline_ptr(CardSetPtr volatile* card_set_addr, CardSetPtr card_set, uint card_in_region) {
-  G1CardSetInlinePtr value(card_set_addr, card_set);
+G1AddCardResult G1CardSet::add_to_inline_ptr(ContainerPtr volatile* container_addr, ContainerPtr container, uint card_in_region) {
+  G1CardSetInlinePtr value(container_addr, container);
   return value.add(card_in_region, _config->inline_ptr_bits_per_card(), _config->max_cards_in_inline_ptr());
 }
 
-G1CardSet::CardSetPtr G1CardSet::create_coarsened_array_of_cards(uint card_in_region, bool within_howl) {
+G1CardSet::ContainerPtr G1CardSet::create_coarsened_array_of_cards(uint card_in_region, bool within_howl) {
   uint8_t* data = nullptr;
-  CardSetPtr new_card_set;
+  ContainerPtr new_container;
   if (within_howl) {
     uint const size_in_bits = _config->max_cards_in_howl_bitmap();
-    uint card_offset = _config->howl_bitmap_offset(card_in_region);
-    data = allocate_mem_object(CardSetBitMap);
-    new (data) G1CardSetBitMap(card_offset, size_in_bits);
-    new_card_set = make_card_set_ptr(data, CardSetBitMap);
+    uint container_offset = _config->howl_bitmap_offset(card_in_region);
+    data = allocate_mem_object(ContainerBitMap);
+    new (data) G1CardSetBitMap(container_offset, size_in_bits);
+    new_container = make_container_ptr(data, ContainerBitMap);
   } else {
-    data = allocate_mem_object(CardSetHowl);
+    data = allocate_mem_object(ContainerHowl);
     new (data) G1CardSetHowl(card_in_region, _config);
-    new_card_set = make_card_set_ptr(data, CardSetHowl);
+    new_container = make_container_ptr(data, ContainerHowl);
   }
-  return new_card_set;
+  return new_container;
 }
 
-bool G1CardSet::coarsen_card_set(volatile CardSetPtr* card_set_addr,
-                                 CardSetPtr cur_card_set,
-                                 uint card_in_region,
-                                 bool within_howl) {
-  CardSetPtr new_card_set = nullptr;
+bool G1CardSet::coarsen_container(ContainerPtr volatile* container_addr,
+                                  ContainerPtr cur_container,
+                                  uint card_in_region,
+                                  bool within_howl) {
+  ContainerPtr new_container = nullptr;
 
-  switch (card_set_type(cur_card_set)) {
-    case CardSetArrayOfCards : {
-      new_card_set = create_coarsened_array_of_cards(card_in_region, within_howl);
+  switch (container_type(cur_container)) {
+    case ContainerArrayOfCards: {
+      new_container = create_coarsened_array_of_cards(card_in_region, within_howl);
       break;
     }
-    case CardSetBitMap: {
-      new_card_set = FullCardSet;
+    case ContainerBitMap: {
+      new_container = FullCardSet;
       break;
     }
-    case CardSetInlinePtr: {
+    case ContainerInlinePtr: {
       uint const size = _config->max_cards_in_array();
-      uint8_t* data = allocate_mem_object(CardSetArrayOfCards);
+      uint8_t* data = allocate_mem_object(ContainerArrayOfCards);
       new (data) G1CardSetArray(card_in_region, size);
-      new_card_set = make_card_set_ptr(data, CardSetArrayOfCards);
+      new_container = make_container_ptr(data, ContainerArrayOfCards);
       break;
     }
-    case CardSetHowl: {
-      new_card_set = FullCardSet; // anything will do at this point.
+    case ContainerHowl: {
+      new_container = FullCardSet; // anything will do at this point.
       break;
     }
     default:
       ShouldNotReachHere();
   }
 
-  CardSetPtr old_value = Atomic::cmpxchg(card_set_addr, cur_card_set, new_card_set); // Memory order?
-  if (old_value == cur_card_set) {
+  ContainerPtr old_value = Atomic::cmpxchg(container_addr, cur_container, new_container); // Memory order?
+  if (old_value == cur_container) {
     // Success. Indicate that the cards from the current card set must be transferred
     // by this caller.
     // Release the hash table reference to the card. The caller still holds the
     // reference to this card set, so it can never be released (and we do not need to
     // check its result).
-    bool should_free = release_card_set(cur_card_set);
+    bool should_free = release_container(cur_container);
     assert(!should_free, "must have had more than one reference");
-    // Free containers if cur_card_set is CardSetHowl
-    if (card_set_type(cur_card_set) == CardSetHowl) {
+    // Free containers if cur_container is ContainerHowl
+    if (container_type(cur_container) == ContainerHowl) {
       G1ReleaseCardsets rel(this);
-      card_set_ptr<G1CardSetHowl>(cur_card_set)->iterate(rel, _config->num_buckets_in_howl());
+      container_ptr<G1CardSetHowl>(cur_container)->iterate(rel, _config->num_buckets_in_howl());
     }
     return true;
   } else {
     // Somebody else beat us to coarsening that card set. Exit, but clean up first.
-    if (new_card_set != FullCardSet) {
-      assert(new_card_set != nullptr, "must not be");
-      release_and_must_free_card_set(new_card_set);
+    if (new_container != FullCardSet) {
+      assert(new_container != nullptr, "must not be");
+      release_and_must_free_container(new_container);
     }
     return false;
   }
@@ -591,34 +585,34 @@ public:
   }
 };
 
-void G1CardSet::transfer_cards(G1CardSetHashTableValue* table_entry, CardSetPtr source_card_set, uint card_region) {
-  assert(source_card_set != FullCardSet, "Should not need to transfer from full");
-  // Need to transfer old entries unless there is a Full card set in place now, i.e.
-  // the old type has been CardSetBitMap. "Full" contains all elements anyway.
-  if (card_set_type(source_card_set) != CardSetHowl) {
+void G1CardSet::transfer_cards(G1CardSetHashTableValue* table_entry, ContainerPtr source_container, uint card_region) {
+  assert(source_container != FullCardSet, "Should not need to transfer from FullCardSet");
+  // Need to transfer old entries unless there is a Full card set container in place now, i.e.
+  // the old type has been ContainerBitMap. "Full" contains all elements anyway.
+  if (container_type(source_container) != ContainerHowl) {
     G1TransferCard iter(this, card_region);
-    iterate_cards_during_transfer(source_card_set, iter);
+    iterate_cards_during_transfer(source_container, iter);
   } else {
-    assert(card_set_type(source_card_set) == CardSetHowl, "must be");
+    assert(container_type(source_container) == ContainerHowl, "must be");
     // Need to correct for that the Full remembered set occupies more cards than the
     // AoCS before.
     Atomic::add(&_num_occupied, _config->max_cards_in_region() - table_entry->_num_occupied, memory_order_relaxed);
   }
 }
 
-void G1CardSet::transfer_cards_in_howl(CardSetPtr parent_card_set,
-                                                     CardSetPtr source_card_set,
-                                                     uint card_region) {
-  assert(card_set_type(parent_card_set) == CardSetHowl, "must be");
-  assert(source_card_set != FullCardSet, "Should not need to transfer from full");
+void G1CardSet::transfer_cards_in_howl(ContainerPtr parent_container,
+                                       ContainerPtr source_container,
+                                       uint card_region) {
+  assert(container_type(parent_container) == ContainerHowl, "must be");
+  assert(source_container != FullCardSet, "Should not need to transfer from full");
   // Need to transfer old entries unless there is a Full card set in place now, i.e.
-  // the old type has been CardSetBitMap.
-  if (card_set_type(source_card_set) != CardSetBitMap) {
-    // We only need to transfer from anything below CardSetBitMap.
+  // the old type has been ContainerBitMap.
+  if (container_type(source_container) != ContainerBitMap) {
+    // We only need to transfer from anything below ContainerBitMap.
     G1TransferCard iter(this, card_region);
-    iterate_cards_during_transfer(source_card_set, iter);
+    iterate_cards_during_transfer(source_container, iter);
   } else {
-    uint diff = _config->max_cards_in_howl_bitmap() - card_set_ptr<G1CardSetBitMap>(source_card_set)->num_bits_set();
+    uint diff = _config->max_cards_in_howl_bitmap() - container_ptr<G1CardSetBitMap>(source_container)->num_bits_set();
 
     // Need to correct for that the Full remembered set occupies more cards than the
     // bitmap before.
@@ -627,10 +621,10 @@ void G1CardSet::transfer_cards_in_howl(CardSetPtr parent_card_set,
     // G1CardSet::add_to_howl after coarsening.
     diff -= 1;
 
-    G1CardSetHowl* howling_array = card_set_ptr<G1CardSetHowl>(parent_card_set);
+    G1CardSetHowl* howling_array = container_ptr<G1CardSetHowl>(parent_container);
     Atomic::add(&howling_array->_num_entries, diff, memory_order_relaxed);
 
-    G1CardSetHashTableValue* table_entry = get_card_set(card_region);
+    G1CardSetHashTableValue* table_entry = get_container(card_region);
     assert(table_entry != nullptr, "Table entry not found for transferred cards");
 
     Atomic::add(&table_entry->_num_occupied, diff, memory_order_relaxed);
@@ -639,72 +633,75 @@ void G1CardSet::transfer_cards_in_howl(CardSetPtr parent_card_set,
   }
 }
 
-G1AddCardResult G1CardSet::add_to_card_set(volatile CardSetPtr* card_set_addr, CardSetPtr card_set,  uint card_region, uint card_in_region, bool increment_total) {
-  assert(card_set_addr != nullptr, "Cannot add to empty cardset");
+G1AddCardResult G1CardSet::add_to_container(ContainerPtr volatile* container_addr,
+                                            ContainerPtr container,
+                                            uint card_region,
+                                            uint card_in_region,
+                                            bool increment_total) {
+  assert(container_addr != nullptr, "must be");
 
   G1AddCardResult add_result;
 
-  switch (card_set_type(card_set)) {
-    case CardSetInlinePtr: {
-      add_result = add_to_inline_ptr(card_set_addr, card_set, card_in_region);
+  switch (container_type(container)) {
+    case ContainerInlinePtr: {
+      add_result = add_to_inline_ptr(container_addr, container, card_in_region);
       break;
     }
-    case CardSetArrayOfCards : {
-      add_result = add_to_array(card_set, card_in_region);
+    case ContainerArrayOfCards: {
+      add_result = add_to_array(container, card_in_region);
       break;
     }
-    case CardSetBitMap: {
-      add_result = add_to_bitmap(card_set, card_in_region);
+    case ContainerBitMap: {
+      add_result = add_to_bitmap(container, card_in_region);
       break;
     }
-    case CardSetHowl: {
-      assert(CardSetHowl == card_set_type(FullCardSet), "must be");
-      if (card_set == FullCardSet) {
+    case ContainerHowl: {
+      assert(ContainerHowl == container_type(FullCardSet), "must be");
+      if (container == FullCardSet) {
         return Found;
       }
-      add_result = add_to_howl(card_set, card_region, card_in_region, increment_total);
+      add_result = add_to_howl(container, card_region, card_in_region, increment_total);
       break;
     }
     default:
       ShouldNotReachHere();
   }
-
   return add_result;
 }
 
-G1CardSetHashTableValue* G1CardSet::get_or_add_card_set(uint card_region, bool* should_grow_table) {
+G1CardSetHashTableValue* G1CardSet::get_or_add_container(uint card_region, bool* should_grow_table) {
   return _table->get_or_add(card_region, should_grow_table);
 }
 
-G1CardSetHashTableValue* G1CardSet::get_card_set(uint card_region) {
+G1CardSetHashTableValue* G1CardSet::get_container(uint card_region) {
   return _table->get(card_region);
 }
 
 G1AddCardResult G1CardSet::add_card(uint card_region, uint card_in_region, bool increment_total) {
   G1AddCardResult add_result;
-  CardSetPtr to_transfer = nullptr;
-  CardSetPtr card_set;
+  ContainerPtr to_transfer = nullptr;
+  ContainerPtr container;
 
   bool should_grow_table = false;
-  G1CardSetHashTableValue* table_entry = get_or_add_card_set(card_region, &should_grow_table);
+  G1CardSetHashTableValue* table_entry = get_or_add_container(card_region, &should_grow_table);
   while (true) {
-    card_set = acquire_card_set(&table_entry->_card_set);
-    add_result = add_to_card_set(&table_entry->_card_set, card_set, card_region, card_in_region, increment_total);
+    container = acquire_container(&table_entry->_container);
+    add_result = add_to_container(&table_entry->_container, container, card_region, card_in_region, increment_total);
 
     if (add_result != Overflow) {
       break;
     }
     // Card set has overflown. Coarsen or retry.
-    bool coarsened = coarsen_card_set(&table_entry->_card_set, card_set, card_in_region);
-    _coarsen_stats.record_coarsening(card_set_type(card_set), !coarsened);
+    bool coarsened = coarsen_container(&table_entry->_container, container, card_in_region);
+    _coarsen_stats.record_coarsening(container_type(container), !coarsened);
     if (coarsened) {
-      // We have been the one coarsening this card set (and in the process added that card).
+      // We successful coarsened this card set container (and in the process added the card).
       add_result = Added;
-      to_transfer = card_set;
+      to_transfer = container;
       break;
     }
     // Somebody else beat us to coarsening. Retry.
-    release_and_maybe_free_card_set(card_set);
+    release_and_maybe_free_container(container);
   }
 
   if (increment_total && add_result == Added) {
@@ -718,7 +715,7 @@ G1AddCardResult G1CardSet::add_card(uint card_region, uint card_in_region, bool
     transfer_cards(table_entry, to_transfer, card_region);
   }
 
-  release_and_maybe_free_card_set(card_set);
+  release_and_maybe_free_container(container);
 
   return add_result;
 }
@@ -727,29 +724,29 @@ bool G1CardSet::contains_card(uint card_region, uint card_in_region) {
   assert(card_in_region < _config->max_cards_in_region(),
          "Card %u is beyond max %u", card_in_region, _config->max_cards_in_region());
 
-  // Protect the card set from reclamation.
+  // Protect the card set container from reclamation.
   GlobalCounter::CriticalSection cs(Thread::current());
-  G1CardSetHashTableValue* table_entry = get_card_set(card_region);
+  G1CardSetHashTableValue* table_entry = get_container(card_region);
   if (table_entry == nullptr) {
     return false;
   }
 
-  CardSetPtr card_set = table_entry->_card_set;
-  if (card_set == FullCardSet) {
+  ContainerPtr container = table_entry->_container;
+  if (container == FullCardSet) {
     // contains_card() is not a performance critical method so we do not hide that
     // case in the switch below.
     return true;
   }
 
-  switch (card_set_type(card_set)) {
-    case CardSetInlinePtr: {
-      G1CardSetInlinePtr ptr(card_set);
+  switch (container_type(container)) {
+    case ContainerInlinePtr: {
+      G1CardSetInlinePtr ptr(container);
       return ptr.contains(card_in_region, _config->inline_ptr_bits_per_card());
     }
-    case CardSetArrayOfCards :  return card_set_ptr<G1CardSetArray>(card_set)->contains(card_in_region);
-    case CardSetBitMap: return card_set_ptr<G1CardSetBitMap>(card_set)->contains(card_in_region, _config->max_cards_in_howl_bitmap());
-    case CardSetHowl: {
-      G1CardSetHowl* howling_array = card_set_ptr<G1CardSetHowl>(card_set);
+    case ContainerArrayOfCards: return container_ptr<G1CardSetArray>(container)->contains(card_in_region);
+    case ContainerBitMap: return container_ptr<G1CardSetBitMap>(container)->contains(card_in_region, _config->max_cards_in_howl_bitmap());
+    case ContainerHowl: {
+      G1CardSetHowl* howling_array = container_ptr<G1CardSetHowl>(container);
 
       return howling_array->contains(card_in_region, _config);
     }
@@ -759,53 +756,53 @@ bool G1CardSet::contains_card(uint card_region, uint card_in_region) {
 }
 
 void G1CardSet::print_info(outputStream* st, uint card_region, uint card_in_region) {
-  G1CardSetHashTableValue* table_entry = get_card_set(card_region);
+  G1CardSetHashTableValue* table_entry = get_container(card_region);
   if (table_entry == nullptr) {
     st->print("NULL card set");
     return;
   }
 
-  CardSetPtr card_set = table_entry->_card_set;
-  if (card_set == FullCardSet) {
+  ContainerPtr container = table_entry->_container;
+  if (container == FullCardSet) {
     st->print("FULL card set)");
     return;
   }
-  switch (card_set_type(card_set)) {
-    case CardSetInlinePtr: {
+  switch (container_type(container)) {
+    case ContainerInlinePtr: {
       st->print("InlinePtr not containing %u", card_in_region);
       break;
     }
-    case CardSetArrayOfCards :  {
+    case ContainerArrayOfCards: {
       st->print("AoC not containing %u", card_in_region);
       break;
     }
-    case CardSetBitMap: {
+    case ContainerBitMap: {
       st->print("BitMap not containing %u", card_in_region);
       break;
     }
-    case CardSetHowl: {
-      st->print("CardSetHowl not containing %u", card_in_region);
+    case ContainerHowl: {
+      st->print("ContainerHowl not containing %u", card_in_region);
       break;
     }
-    default: st->print("Unknown card set type %u", card_set_type(card_set)); ShouldNotReachHere(); break;
+    default: st->print("Unknown card set container type %u", container_type(container)); ShouldNotReachHere(); break;
   }
 }
 
 template <class CardVisitor>
-void G1CardSet::iterate_cards_during_transfer(CardSetPtr const card_set, CardVisitor& cl) {
-  uint type = card_set_type(card_set);
-  assert(type == CardSetInlinePtr || type == CardSetArrayOfCards,
+void G1CardSet::iterate_cards_during_transfer(ContainerPtr const container, CardVisitor& cl) {
+  uint type = container_type(container);
+  assert(type == ContainerInlinePtr || type == ContainerArrayOfCards,
          "invalid card set type %d to transfer from",
-         card_set_type(card_set));
+         container_type(container));
 
   switch (type) {
-    case CardSetInlinePtr: {
-      G1CardSetInlinePtr ptr(card_set);
+    case ContainerInlinePtr: {
+      G1CardSetInlinePtr ptr(container);
       ptr.iterate(cl, _config->inline_ptr_bits_per_card());
       return;
     }
-    case CardSetArrayOfCards : {
-      card_set_ptr<G1CardSetArray>(card_set)->iterate(cl);
+    case ContainerArrayOfCards: {
+      container_ptr<G1CardSetArray>(container)->iterate(cl);
       return;
     }
     default:
@@ -813,7 +810,7 @@ void G1CardSet::iterate_cards_during_transfer(CardSetPtr const card_set, CardVis
   }
 }
 
-void G1CardSet::iterate_containers(CardSetPtrClosure* cl, bool at_safepoint) {
+void G1CardSet::iterate_containers(ContainerPtrClosure* cl, bool at_safepoint) {
   if (at_safepoint) {
     _table->iterate_safepoint(cl);
   } else {
@@ -844,7 +841,7 @@ public:
 };
 
 template <typename Closure, template <typename> class CardOrRanges>
-class G1CardSetContainersClosure : public G1CardSet::CardSetPtrClosure {
+class G1CardSetContainersClosure : public G1CardSet::ContainerPtrClosure {
   G1CardSet* _card_set;
   Closure& _cl;
 
@@ -855,9 +852,9 @@ public:
     _card_set(card_set),
     _cl(cl) { }
 
-  void do_cardsetptr(uint region_idx, size_t num_occupied, G1CardSet::CardSetPtr card_set) override {
+  void do_containerptr(uint region_idx, size_t num_occupied, G1CardSet::ContainerPtr container) override {
     CardOrRanges<Closure> cl(_cl, region_idx);
-    _card_set->iterate_cards_or_ranges_in_container(card_set, cl);
+    _card_set->iterate_cards_or_ranges_in_container(container, cl);
   }
 };
 
@@ -879,13 +876,13 @@ size_t G1CardSet::occupied() const {
 }
 
 size_t G1CardSet::num_containers() {
-  class GetNumberOfContainers : public CardSetPtrClosure {
+  class GetNumberOfContainers : public ContainerPtrClosure {
   public:
     size_t _count;
 
-    GetNumberOfContainers() : CardSetPtrClosure(), _count(0) { }
+    GetNumberOfContainers() : ContainerPtrClosure(), _count(0) { }
 
-    void do_cardsetptr(uint region_idx, size_t num_occupied, CardSetPtr card_set) override {
+    void do_containerptr(uint region_idx, size_t num_occupied, ContainerPtr container) override {
       _count++;
     }
   } cl;
diff --git a/src/hotspot/share/gc/g1/g1CardSet.hpp b/src/hotspot/share/gc/g1/g1CardSet.hpp
index 465984d7138..946d8cb7338 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.hpp
@@ -26,10 +26,7 @@
 #define SHARE_GC_G1_G1CARDSET_HPP
 
 #include "memory/allocation.hpp"
-#include "memory/padded.hpp"
-#include "oops/oopsHierarchy.hpp"
 #include "utilities/concurrentHashTable.hpp"
-#include "utilities/lockFreeStack.hpp"
 
 class G1CardSetAllocOptions;
 class G1CardSetHashTable;
@@ -147,10 +144,10 @@ public:
 class G1CardSetCoarsenStats {
 public:
   // Number of entries in the statistics tables: since we index with the source
-  // cardset of the coarsening, this is the total number of combinations of
-  // card sets - 1.
+  // container of the coarsening, this is the total number of combinations of
+  // card set containers - 1.
   static constexpr size_t NumCoarsenCategories = 7;
-  // Coarsening statistics for the possible CardSetPtr in the Howl card set
+  // Coarsening statistics for the possible ContainerPtr in the Howl card set
   // start from this offset.
   static constexpr size_t CoarsenHowlOffset = 4;
 
@@ -173,14 +170,14 @@ public:
   void print_on(outputStream* out);
 };
 
-// Sparse set of card indexes comprising a remembered set on the Java heap. Card
+// Set of card indexes comprising a remembered set on the Java heap. Card
 // size is assumed to be card table card size.
 //
 // Technically it is implemented using a ConcurrentHashTable that stores a card
 // set container for every region containing at least one card.
 //
 // There are in total five different containers, encoded in the ConcurrentHashTable
-// node as CardSetPtr. A CardSetPtr may cover the whole region or just a part of
+// node as ContainerPtr. A ContainerPtr may cover the whole region or just a part of
 // it.
 // See its description below for more information.
 class G1CardSet : public CHeapObj<mtGCCardSet> {
@@ -194,46 +191,46 @@ class G1CardSet : public CHeapObj<mtGCCardSet> {
   static G1CardSetCoarsenStats _coarsen_stats; // Coarsening statistics since VM start.
   static G1CardSetCoarsenStats _last_coarsen_stats; // Coarsening statistics at last GC.
 public:
-  // Two lower bits are used to encode the card storage types
-  static const uintptr_t CardSetPtrHeaderSize = 2;
+  // Two lower bits are used to encode the card set container types
+  static const uintptr_t ContainerPtrHeaderSize = 2;
 
-  // CardSetPtr represents the card storage type of a given covered area. It encodes
-  // a type in the LSBs, in addition to having a few significant values.
+  // ContainerPtr represents the card set container  type of a given covered area.
+  // It encodes a type in the LSBs, in addition to having a few significant values.
   //
   // Possible encodings:
   //
   // 0...00000 free               (Empty, should never happen)
-  // 1...11111 full               All card indexes in the whole area this CardSetPtr covers are part of this container.
-  // X...XXX00 inline-ptr-cards   A handful of card indexes covered by this CardSetPtr are encoded within the CardSetPtr.
+  // 1...11111 full               All card indexes in the whole area this ContainerPtr covers are part of this container.
+  // X...XXX00 inline-ptr-cards   A handful of card indexes covered by this ContainerPtr are encoded within the ContainerPtr.
   // X...XXX01 array of cards     The container is a contiguous array of card indexes.
   // X...XXX10 bitmap             The container uses a bitmap to determine whether a given index is part of this set.
-  // X...XXX11 howl               This is a card set container containing an array of CardSetPtr, with each CardSetPtr
+  // X...XXX11 howl               This is a card set container containing an array of ContainerPtr, with each ContainerPtr
   //                              limited to a sub-range of the original range. Currently only one level of this
   //                              container is supported.
-  typedef void* CardSetPtr;
+  using ContainerPtr = void*;
   // Coarsening happens in the order below:
-  // CardSetInlinePtr -> CardSetArrayOfCards -> CardSetHowl -> Full
-  // Corsening of containers inside the CardSetHowl happens in the order:
-  // CardSetInlinePtr -> CardSetArrayOfCards -> CardSetBitMap -> Full
-  static const uintptr_t CardSetInlinePtr      = 0x0;
-  static const uintptr_t CardSetArrayOfCards   = 0x1;
-  static const uintptr_t CardSetBitMap         = 0x2;
-  static const uintptr_t CardSetHowl           = 0x3;
+  // ContainerInlinePtr -> ContainerArrayOfCards -> ContainerHowl -> Full
+  // Corsening of containers inside the ContainerHowl happens in the order:
+  // ContainerInlinePtr -> ContainerArrayOfCards -> ContainerBitMap -> Full
+  static const uintptr_t ContainerInlinePtr      = 0x0;
+  static const uintptr_t ContainerArrayOfCards   = 0x1;
+  static const uintptr_t ContainerBitMap         = 0x2;
+  static const uintptr_t ContainerHowl           = 0x3;
 
   // The special sentinel values
-  static constexpr CardSetPtr FreeCardSet = nullptr;
-  // Unfortunately we can't make (G1CardSet::CardSetPtr)-1 constexpr because
+  static constexpr ContainerPtr FreeCardSet = nullptr;
+  // Unfortunately we can't make (G1CardSet::ContainerPtr)-1 constexpr because
   // reinterpret_casts are forbidden in constexprs. Use a regular static instead.
-  static CardSetPtr FullCardSet;
+  static ContainerPtr FullCardSet;
 
-  static const uintptr_t CardSetPtrTypeMask    = ((uintptr_t)1 << CardSetPtrHeaderSize) - 1;
+  static const uintptr_t ContainerPtrTypeMask = ((uintptr_t)1 << ContainerPtrHeaderSize) - 1;
 
-  static CardSetPtr strip_card_set_type(CardSetPtr ptr) { return (CardSetPtr)((uintptr_t)ptr & ~CardSetPtrTypeMask); }
+  static ContainerPtr strip_container_type(ContainerPtr ptr) { return (ContainerPtr)((uintptr_t)ptr & ~ContainerPtrTypeMask); }
 
-  static uint card_set_type(CardSetPtr ptr) { return (uintptr_t)ptr & CardSetPtrTypeMask; }
+  static uint container_type(ContainerPtr ptr) { return (uintptr_t)ptr & ContainerPtrTypeMask; }
 
   template <class T>
-  static T* card_set_ptr(CardSetPtr ptr);
+  static T* container_ptr(ContainerPtr ptr);
 
 private:
   G1CardSetMemoryManager* _mm;
@@ -245,42 +242,42 @@ private:
   // be (slightly) more cards in the card set than this value in reality.
   size_t _num_occupied;
 
-  CardSetPtr make_card_set_ptr(void* value, uintptr_t type);
+  ContainerPtr make_container_ptr(void* value, uintptr_t type);
 
-  CardSetPtr acquire_card_set(CardSetPtr volatile* card_set_addr);
-  // Returns true if the card set should be released
-  bool release_card_set(CardSetPtr card_set);
+  ContainerPtr acquire_container(ContainerPtr volatile* container_addr);
+  // Returns true if the card set container should be released
+  bool release_container(ContainerPtr container);
   // Release card set and free if needed.
-  void release_and_maybe_free_card_set(CardSetPtr card_set);
+  void release_and_maybe_free_container(ContainerPtr container);
   // Release card set and free (and it must be freeable).
-  void release_and_must_free_card_set(CardSetPtr card_set);
+  void release_and_must_free_container(ContainerPtr container);
 
-  // Coarsens the CardSet cur_card_set to the next level; tries to replace the
-  // previous CardSet with a new one which includes the given card_in_region.
-  // coarsen_card_set does not transfer cards from cur_card_set
-  // to the new card_set. Transfer is achieved by transfer_cards.
-  // Returns true if this was the thread that coarsened the CardSet (and added the card).
-  bool coarsen_card_set(CardSetPtr volatile* card_set_addr,
-                        CardSetPtr cur_card_set,
-                        uint card_in_region, bool within_howl = false);
+  // Coarsens the card set container cur_container to the next level; tries to replace the
+  // previous ContainerPtr with a new one which includes the given card_in_region.
+  // coarsen_container does not transfer cards from cur_container
+  // to the new container. Transfer is achieved by transfer_cards.
+  // Returns true if this was the thread that coarsened the container (and added the card).
+  bool coarsen_container(ContainerPtr volatile* container_addr,
+                         ContainerPtr cur_container,
+                         uint card_in_region, bool within_howl = false);
 
-  CardSetPtr create_coarsened_array_of_cards(uint card_in_region, bool within_howl);
+  ContainerPtr create_coarsened_array_of_cards(uint card_in_region, bool within_howl);
 
   // Transfer entries from source_card_set to a recently installed coarser storage type
-  // We only need to transfer anything finer than CardSetBitMap. "Full" contains
+  // We only need to transfer anything finer than ContainerBitMap. "Full" contains
   // all elements anyway.
-  void transfer_cards(G1CardSetHashTableValue* table_entry, CardSetPtr source_card_set, uint card_region);
-  void transfer_cards_in_howl(CardSetPtr parent_card_set, CardSetPtr source_card_set, uint card_region);
+  void transfer_cards(G1CardSetHashTableValue* table_entry, ContainerPtr source_container, uint card_region);
+  void transfer_cards_in_howl(ContainerPtr parent_container, ContainerPtr source_container, uint card_region);
 
-  G1AddCardResult add_to_card_set(CardSetPtr volatile* card_set_addr, CardSetPtr card_set, uint card_region, uint card, bool increment_total = true);
+  G1AddCardResult add_to_container(ContainerPtr volatile* container_addr, ContainerPtr container, uint card_region, uint card, bool increment_total = true);
 
-  G1AddCardResult add_to_inline_ptr(CardSetPtr volatile* card_set_addr, CardSetPtr card_set, uint card_in_region);
-  G1AddCardResult add_to_array(CardSetPtr card_set, uint card_in_region);
-  G1AddCardResult add_to_bitmap(CardSetPtr card_set, uint card_in_region);
-  G1AddCardResult add_to_howl(CardSetPtr parent_card_set, uint card_region, uint card_in_region, bool increment_total = true);
+  G1AddCardResult add_to_inline_ptr(ContainerPtr volatile* container_addr, ContainerPtr container, uint card_in_region);
+  G1AddCardResult add_to_array(ContainerPtr container, uint card_in_region);
+  G1AddCardResult add_to_bitmap(ContainerPtr container, uint card_in_region);
+  G1AddCardResult add_to_howl(ContainerPtr parent_container, uint card_region, uint card_in_region, bool increment_total = true);
 
-  G1CardSetHashTableValue* get_or_add_card_set(uint card_region, bool* should_grow_table);
-  G1CardSetHashTableValue* get_card_set(uint card_region);
+  G1CardSetHashTableValue* get_or_add_container(uint card_region, bool* should_grow_table);
+  G1CardSetHashTableValue* get_container(uint card_region);
 
   // Iterate over cards of a card set container during transfer of the cards from
   // one container to another. Executes
@@ -289,11 +286,11 @@ private:
   //
   // on the given class.
   template <class CardVisitor>
-  void iterate_cards_during_transfer(CardSetPtr const card_set, CardVisitor& vl);
+  void iterate_cards_during_transfer(ContainerPtr const container, CardVisitor& vl);
 
-  uint card_set_type_to_mem_object_type(uintptr_t type) const;
+  uint container_type_to_mem_object_type(uintptr_t type) const;
   uint8_t* allocate_mem_object(uintptr_t type);
-  void free_mem_object(CardSetPtr card_set);
+  void free_mem_object(ContainerPtr container);
 
 public:
   G1CardSetConfiguration* config() const { return _config; }
@@ -302,8 +299,8 @@ public:
   G1CardSet(G1CardSetConfiguration* config, G1CardSetMemoryManager* mm);
   virtual ~G1CardSet();
 
-  // Adds the given card to this set, returning an appropriate result. If added,
-  // updates the total count.
+  // Adds the given card to this set, returning an appropriate result.
+  // If incremental_count is true and the card has been added, updates the total count.
   G1AddCardResult add_card(uint card_region, uint card_in_region, bool increment_total = true);
 
   bool contains_card(uint card_region, uint card_in_region);
@@ -351,14 +348,14 @@ public:
   // start_iterate().
   //
   template <class CardOrRangeVisitor>
-  void iterate_cards_or_ranges_in_container(CardSetPtr const card_set, CardOrRangeVisitor& cl);
+  void iterate_cards_or_ranges_in_container(ContainerPtr const container, CardOrRangeVisitor& cl);
 
-  class CardSetPtrClosure {
+  class ContainerPtrClosure {
   public:
-    virtual void do_cardsetptr(uint region_idx, size_t num_occupied, CardSetPtr card_set) = 0;
+    virtual void do_containerptr(uint region_idx, size_t num_occupied, ContainerPtr container) = 0;
   };
 
-  void iterate_containers(CardSetPtrClosure* cl, bool safepoint = false);
+  void iterate_containers(ContainerPtrClosure* cl, bool safepoint = false);
 
   class CardClosure {
   public:
@@ -370,13 +367,13 @@ public:
 
 class G1CardSetHashTableValue {
 public:
-  using CardSetPtr = G1CardSet::CardSetPtr;
+  using ContainerPtr = G1CardSet::ContainerPtr;
 
   const uint _region_idx;
   uint volatile _num_occupied;
-  CardSetPtr volatile _card_set;
+  ContainerPtr volatile _container;
 
-  G1CardSetHashTableValue(uint region_idx, CardSetPtr card_set) : _region_idx(region_idx), _num_occupied(0), _card_set(card_set) { }
+  G1CardSetHashTableValue(uint region_idx, ContainerPtr container) : _region_idx(region_idx), _num_occupied(0), _container(container) { }
 };
 
 class G1CardSetHashTableConfig : public StackObj {
@@ -391,6 +388,6 @@ public:
   static void free_node(void* context, void* memory, Value const& value);
 };
 
-typedef ConcurrentHashTable<G1CardSetHashTableConfig, mtGCCardSet> CardSetHash;
+using CardSetHash = ConcurrentHashTable<G1CardSetHashTableConfig, mtGCCardSet>;
 
 #endif // SHARE_GC_G1_G1CARDSET_HPP
diff --git a/src/hotspot/share/gc/g1/g1CardSet.inline.hpp b/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
index 99938b4b74e..49d7928735a 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
@@ -28,55 +28,54 @@
 #include "gc/g1/g1CardSet.hpp"
 #include "gc/g1/g1CardSetContainers.inline.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
-#include "runtime/atomic.hpp"
 #include "logging/log.hpp"
 
 template <class T>
-inline T* G1CardSet::card_set_ptr(CardSetPtr ptr) {
-  return (T*)strip_card_set_type(ptr);
+inline T* G1CardSet::container_ptr(ContainerPtr ptr) {
+  return (T*)strip_container_type(ptr);
 }
 
-inline G1CardSet::CardSetPtr G1CardSet::make_card_set_ptr(void* value, uintptr_t type) {
-  assert(card_set_type(value) == 0, "Given ptr " PTR_FORMAT " already has type bits set", p2i(value));
-  return (CardSetPtr)((uintptr_t)value | type);
+inline G1CardSet::ContainerPtr G1CardSet::make_container_ptr(void* value, uintptr_t type) {
+  assert(container_type(value) == 0, "Given ptr " PTR_FORMAT " already has type bits set", p2i(value));
+  return (ContainerPtr)((uintptr_t)value | type);
 }
 
 template <class CardOrRangeVisitor>
-inline void G1CardSet::iterate_cards_or_ranges_in_container(CardSetPtr const card_set, CardOrRangeVisitor& cl) {
-  switch (card_set_type(card_set)) {
-    case CardSetInlinePtr: {
+inline void G1CardSet::iterate_cards_or_ranges_in_container(ContainerPtr const container, CardOrRangeVisitor& cl) {
+  switch (container_type(container)) {
+    case ContainerInlinePtr: {
       if (cl.start_iterate(G1GCPhaseTimes::MergeRSMergedInline)) {
-        G1CardSetInlinePtr ptr(card_set);
+        G1CardSetInlinePtr ptr(container);
         ptr.iterate(cl, _config->inline_ptr_bits_per_card());
       }
       return;
     }
-    case CardSetArrayOfCards : {
+    case ContainerArrayOfCards: {
       if (cl.start_iterate(G1GCPhaseTimes::MergeRSMergedArrayOfCards)) {
-        card_set_ptr<G1CardSetArray>(card_set)->iterate(cl);
+        container_ptr<G1CardSetArray>(container)->iterate(cl);
       }
       return;
     }
-    case CardSetBitMap: {
+    case ContainerBitMap: {
       // There is no first-level bitmap spanning the whole area.
       ShouldNotReachHere();
       return;
     }
-    case CardSetHowl: {
-      assert(card_set_type(FullCardSet) == CardSetHowl, "Must be");
-      if (card_set == FullCardSet) {
+    case ContainerHowl: {
+      assert(container_type(FullCardSet) == ContainerHowl, "Must be");
+      if (container == FullCardSet) {
         if (cl.start_iterate(G1GCPhaseTimes::MergeRSMergedFull)) {
           cl(0, _config->max_cards_in_region());
         }
         return;
       }
       if (cl.start_iterate(G1GCPhaseTimes::MergeRSMergedHowl)) {
-        card_set_ptr<G1CardSetHowl>(card_set)->iterate(cl, _config);
+        container_ptr<G1CardSetHowl>(container)->iterate(cl, _config);
       }
       return;
     }
   }
-  log_error(gc)("Unkown card set type %u", card_set_type(card_set));
+  log_error(gc)("Unkown card set container type %u", container_type(container));
   ShouldNotReachHere();
 }
 
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
index 6736a18ab02..453594da3f9 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
@@ -31,7 +31,7 @@
 #include "utilities/bitMap.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-// A helper class to encode a few card indexes within a CardSetPtr.
+// A helper class to encode a few card indexes within a ContainerPtr.
 //
 // The pointer value (either 32 or 64 bits) is split into two areas:
 //
@@ -65,16 +65,16 @@
 class G1CardSetInlinePtr : public StackObj {
   friend class G1CardSetContainersTest;
 
-  typedef G1CardSet::CardSetPtr CardSetPtr;
+  using ContainerPtr = G1CardSet::ContainerPtr;
 
-  CardSetPtr volatile * _value_addr;
-  CardSetPtr _value;
+  ContainerPtr volatile * _value_addr;
+  ContainerPtr _value;
 
   static const uint SizeFieldLen = 3;
   static const uint SizeFieldPos = 2;
-  static const uint HeaderSize = G1CardSet::CardSetPtrHeaderSize + SizeFieldLen;
+  static const uint HeaderSize = G1CardSet::ContainerPtrHeaderSize + SizeFieldLen;
 
-  static const uint BitsInValue = sizeof(CardSetPtr) * BitsPerByte;
+  static const uint BitsInValue = sizeof(ContainerPtr) * BitsPerByte;
 
   static const uintptr_t SizeFieldMask = (((uint)1 << SizeFieldLen) - 1) << SizeFieldPos;
 
@@ -82,9 +82,9 @@ class G1CardSetInlinePtr : public StackObj {
     return (idx * bits_per_card + HeaderSize);
   }
 
-  static CardSetPtr merge(CardSetPtr orig_value, uint card_in_region, uint idx, uint bits_per_card);
+  static ContainerPtr merge(ContainerPtr orig_value, uint card_in_region, uint idx, uint bits_per_card);
 
-  static uint card_at(CardSetPtr value, uint const idx, uint const bits_per_card) {
+  static uint card_at(ContainerPtr value, uint const idx, uint const bits_per_card) {
     uint8_t card_pos = card_pos_for(idx, bits_per_card);
     uint result = ((uintptr_t)value >> card_pos) & (((uintptr_t)1 << bits_per_card) - 1);
     return result;
@@ -93,14 +93,14 @@ class G1CardSetInlinePtr : public StackObj {
   uint find(uint const card_idx, uint const bits_per_card, uint start_at, uint num_cards);
 
 public:
-  G1CardSetInlinePtr() : _value_addr(nullptr), _value((CardSetPtr)G1CardSet::CardSetInlinePtr) { }
+  G1CardSetInlinePtr() : _value_addr(nullptr), _value((ContainerPtr)G1CardSet::ContainerInlinePtr) { }
 
-  G1CardSetInlinePtr(CardSetPtr value) : _value_addr(nullptr), _value(value) {
-    assert(G1CardSet::card_set_type(_value) == G1CardSet::CardSetInlinePtr, "Value " PTR_FORMAT " is not a valid G1CardSetInPtr.", p2i(_value));
+  G1CardSetInlinePtr(ContainerPtr value) : _value_addr(nullptr), _value(value) {
+    assert(G1CardSet::container_type(_value) == G1CardSet::ContainerInlinePtr, "Value " PTR_FORMAT " is not a valid G1CardSetInlinePtr.", p2i(_value));
   }
 
-  G1CardSetInlinePtr(CardSetPtr volatile* value_addr, CardSetPtr value) : _value_addr(value_addr), _value(value) {
-    assert(G1CardSet::card_set_type(_value) == G1CardSet::CardSetInlinePtr, "Value " PTR_FORMAT " is not a valid G1CardSetInPtr.", p2i(_value));
+  G1CardSetInlinePtr(ContainerPtr volatile* value_addr, ContainerPtr value) : _value_addr(value_addr), _value(value) {
+    assert(G1CardSet::container_type(_value) == G1CardSet::ContainerInlinePtr, "Value " PTR_FORMAT " is not a valid G1CardSetInlinePtr.", p2i(_value));
   }
 
   G1AddCardResult add(uint const card_idx, uint const bits_per_card, uint const max_cards_in_inline_ptr);
@@ -110,13 +110,13 @@ public:
   template <class CardVisitor>
   void iterate(CardVisitor& found, uint const bits_per_card);
 
-  operator CardSetPtr () { return _value; }
+  operator ContainerPtr () { return _value; }
 
   static uint max_cards_in_inline_ptr(uint bits_per_card) {
     return (BitsInValue - HeaderSize) / bits_per_card;
   }
 
-  static uint num_cards_in(CardSetPtr value) {
+  static uint num_cards_in(ContainerPtr value) {
     return ((uintptr_t)value & SizeFieldMask) >> SizeFieldPos;
   }
 };
@@ -139,7 +139,7 @@ public:
 // which requires that we increment the reference counts by 2 starting at _ref_count = 3.
 //
 // All but inline pointers are of this kind. For those, card entries are stored
-// directly in the CardSetPtr of the ConcurrentHashTable node.
+// directly in the ContainerPtr of the ConcurrentHashTable node.
 class G1CardSetContainer {
   uintptr_t _ref_count;
 protected:
@@ -163,7 +163,7 @@ class G1CardSetArray : public G1CardSetContainer {
 public:
   typedef uint16_t EntryDataType;
   typedef uint EntryCountType;
-  using CardSetPtr = G1CardSet::CardSetPtr;
+  using ContainerPtr = G1CardSet::ContainerPtr;
 private:
   EntryCountType _size;
   EntryCountType volatile _num_entries;
@@ -217,7 +217,7 @@ class G1CardSetBitMap : public G1CardSetContainer {
   size_t _num_bits_set;
   BitMap::bm_word_t _bits[1];
 
-  using CardSetPtr = G1CardSet::CardSetPtr;
+  using ContainerPtr = G1CardSet::ContainerPtr;
 
   template<typename Derived>
   static size_t header_size_in_bytes_internal() {
@@ -252,10 +252,10 @@ public:
 class G1CardSetHowl : public G1CardSetContainer {
 public:
   typedef uint EntryCountType;
-  using CardSetPtr = G1CardSet::CardSetPtr;
+  using ContainerPtr = G1CardSet::ContainerPtr;
   EntryCountType volatile _num_entries;
 private:
-  CardSetPtr _buckets[2];
+  ContainerPtr _buckets[2];
   // Do not add class member variables beyond this point
 
   template<typename Derived>
@@ -263,32 +263,32 @@ private:
     return offset_of(Derived, _buckets);
   }
 
-  // Iterates over the given CardSetPtr with at index in this Howl card set,
+  // Iterates over the given ContainerPtr with at index in this Howl card set,
   // applying a CardOrRangeVisitor on it.
   template <class CardOrRangeVisitor>
-  void iterate_cardset(CardSetPtr const card_set, uint index, CardOrRangeVisitor& found, G1CardSetConfiguration* config);
+  void iterate_cardset(ContainerPtr const container, uint index, CardOrRangeVisitor& found, G1CardSetConfiguration* config);
 
 public:
   G1CardSetHowl(EntryCountType card_in_region, G1CardSetConfiguration* config);
 
-  CardSetPtr* get_card_set_addr(EntryCountType index) {
+  ContainerPtr* get_container_addr(EntryCountType index) {
     return &_buckets[index];
   }
 
   bool contains(uint card_idx, G1CardSetConfiguration* config);
 
-  // Iterates over all CardSetPtrs in this Howl card set, applying a CardOrRangeVisitor
+  // Iterates over all ContainerPtrs in this Howl card set, applying a CardOrRangeVisitor
   // on it.
   template <class CardOrRangeVisitor>
   void iterate(CardOrRangeVisitor& found, G1CardSetConfiguration* config);
 
-  // Iterates over all CardSetPtrs in this Howl card set. Calls
+  // Iterates over all ContainerPtrs in this Howl card set. Calls
   //
-  //   void operator ()(CardSetPtr* card_set_addr);
+  //   void operator ()(ContainerPtr* card_set_addr);
   //
   // on all of them.
-  template <class CardSetPtrVisitor>
-  void iterate(CardSetPtrVisitor& found, uint num_card_sets);
+  template <class ContainerPtrVisitor>
+  void iterate(ContainerPtrVisitor& found, uint num_card_sets);
 
   static EntryCountType num_buckets(size_t size_in_bits, size_t num_cards_in_array, size_t max_buckets);
 
@@ -300,7 +300,7 @@ public:
   static size_t header_size_in_bytes() { return header_size_in_bytes_internal<G1CardSetHowl>(); }
 
   static size_t size_in_bytes(size_t num_arrays) {
-    return header_size_in_bytes() + sizeof(CardSetPtr) * num_arrays;
+    return header_size_in_bytes() + sizeof(ContainerPtr) * num_arrays;
   }
 };
 
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
index 73d84fbf934..3949687a97c 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
@@ -31,7 +31,7 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/spinYield.hpp"
 
-inline G1CardSetInlinePtr::CardSetPtr G1CardSetInlinePtr::merge(CardSetPtr orig_value, uint card_in_region, uint idx, uint bits_per_card) {
+inline G1CardSetInlinePtr::ContainerPtr G1CardSetInlinePtr::merge(ContainerPtr orig_value, uint card_in_region, uint idx, uint bits_per_card) {
   assert((idx & (SizeFieldMask >> SizeFieldPos)) == idx, "Index %u too large to fit into size field", idx);
   assert(card_in_region < ((uint)1 << bits_per_card), "Card %u too large to fit into card value field", card_in_region);
 
@@ -44,7 +44,7 @@ inline G1CardSetInlinePtr::CardSetPtr G1CardSetInlinePtr::merge(CardSetPtr orig_
 
   uintptr_t value = ((uintptr_t)(idx + 1) << SizeFieldPos) | ((uintptr_t)card_in_region << card_pos);
   uintptr_t res = (((uintptr_t)orig_value & ~SizeFieldMask) | value);
-  return (CardSetPtr)res;
+  return (ContainerPtr)res;
 }
 
 inline G1AddCardResult G1CardSetInlinePtr::add(uint card_idx, uint bits_per_card, uint max_cards_in_inline_ptr) {
@@ -64,8 +64,8 @@ inline G1AddCardResult G1CardSetInlinePtr::add(uint card_idx, uint bits_per_card
     if (num_cards >= max_cards_in_inline_ptr) {
       return Overflow;
     }
-    CardSetPtr new_value = merge(_value, card_idx, num_cards, bits_per_card);
-    CardSetPtr old_value = Atomic::cmpxchg(_value_addr, _value, new_value, memory_order_relaxed);
+    ContainerPtr new_value = merge(_value, card_idx, num_cards, bits_per_card);
+    ContainerPtr old_value = Atomic::cmpxchg(_value_addr, _value, new_value, memory_order_relaxed);
     if (_value == old_value) {
       return Added;
     }
@@ -73,7 +73,7 @@ inline G1AddCardResult G1CardSetInlinePtr::add(uint card_idx, uint bits_per_card
     _value = old_value;
     // The value of the pointer may have changed to something different than
     // an inline card set. Exit then instead of overwriting.
-    if (G1CardSet::card_set_type(_value) != G1CardSet::CardSetInlinePtr) {
+    if (G1CardSet::container_type(_value) != G1CardSet::ContainerInlinePtr) {
       return Overflow;
     }
   }
@@ -268,23 +268,23 @@ 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);
-  CardSetPtr* array_entry = get_card_set_addr(bucket);
-  CardSetPtr card_set = Atomic::load_acquire(array_entry);
+  ContainerPtr* array_entry = get_container_addr(bucket);
+  ContainerPtr container = Atomic::load_acquire(array_entry);
 
-  switch (G1CardSet::card_set_type(card_set)) {
-    case G1CardSet::CardSetArrayOfCards : {
-      return G1CardSet::card_set_ptr<G1CardSetArray>(card_set)->contains(card_idx);
+  switch (G1CardSet::container_type(container)) {
+    case G1CardSet::ContainerArrayOfCards: {
+      return G1CardSet::container_ptr<G1CardSetArray>(container)->contains(card_idx);
     }
-    case G1CardSet::CardSetBitMap: {
+    case G1CardSet::ContainerBitMap: {
       uint card_offset = config->howl_bitmap_offset(card_idx);
-      return G1CardSet::card_set_ptr<G1CardSetBitMap>(card_set)->contains(card_offset, config->max_cards_in_howl_bitmap());
+      return G1CardSet::container_ptr<G1CardSetBitMap>(container)->contains(card_offset, config->max_cards_in_howl_bitmap());
     }
-    case G1CardSet::CardSetInlinePtr: {
-      G1CardSetInlinePtr ptr(card_set);
+    case G1CardSet::ContainerInlinePtr: {
+      G1CardSetInlinePtr ptr(container);
       return ptr.contains(card_idx, config->inline_ptr_bits_per_card());
     }
-    case G1CardSet::CardSetHowl: {// Fullcard set entry
-      assert(card_set == G1CardSet::FullCardSet, "Must be");
+    case G1CardSet::ContainerHowl: {// Fullcard set entry
+      assert(container == G1CardSet::FullCardSet, "Must be");
       return true;
     }
   }
@@ -298,38 +298,38 @@ inline void G1CardSetHowl::iterate(CardOrRangeVisitor& found, G1CardSetConfigura
   }
 }
 
-template <class CardSetPtrVisitor>
-inline void G1CardSetHowl::iterate(CardSetPtrVisitor& found, uint num_card_sets) {
+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]);
   }
 }
 
 template <class CardOrRangeVisitor>
-inline void G1CardSetHowl::iterate_cardset(CardSetPtr const card_set, uint index, CardOrRangeVisitor& found, G1CardSetConfiguration* config) {
-  switch (G1CardSet::card_set_type(card_set)) {
-    case G1CardSet::CardSetInlinePtr: {
+inline void G1CardSetHowl::iterate_cardset(ContainerPtr const container, uint index, CardOrRangeVisitor& found, G1CardSetConfiguration* config) {
+  switch (G1CardSet::container_type(container)) {
+    case G1CardSet::ContainerInlinePtr: {
       if (found.start_iterate(G1GCPhaseTimes::MergeRSHowlInline)) {
-        G1CardSetInlinePtr ptr(card_set);
+        G1CardSetInlinePtr ptr(container);
         ptr.iterate(found, config->inline_ptr_bits_per_card());
       }
       return;
     }
-    case G1CardSet::CardSetArrayOfCards : {
+    case G1CardSet::ContainerArrayOfCards: {
       if (found.start_iterate(G1GCPhaseTimes::MergeRSHowlArrayOfCards)) {
-        G1CardSet::card_set_ptr<G1CardSetArray>(card_set)->iterate(found);
+        G1CardSet::container_ptr<G1CardSetArray>(container)->iterate(found);
       }
       return;
     }
-    case G1CardSet::CardSetBitMap: {
+    case G1CardSet::ContainerBitMap: {
       if (found.start_iterate(G1GCPhaseTimes::MergeRSHowlBitmap)) {
         uint offset = index << config->log2_max_cards_in_howl_bitmap();
-        G1CardSet::card_set_ptr<G1CardSetBitMap>(card_set)->iterate(found, config->max_cards_in_howl_bitmap(), offset);
+        G1CardSet::container_ptr<G1CardSetBitMap>(container)->iterate(found, config->max_cards_in_howl_bitmap(), offset);
       }
       return;
     }
-    case G1CardSet::CardSetHowl: { // actually FullCardSet
-      assert(card_set == G1CardSet::FullCardSet, "Must be");
+    case G1CardSet::ContainerHowl: { // actually FullCardSet
+      assert(container == G1CardSet::FullCardSet, "Must be");
       if (found.start_iterate(G1GCPhaseTimes::MergeRSHowlFull)) {
         uint offset = index << config->log2_max_cards_in_howl_bitmap();
         found(offset, config->max_cards_in_howl_bitmap());
diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp b/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp
index 4bb8e6c4ff9..a0e920175e1 100644
--- a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp
@@ -78,7 +78,7 @@ public:
 };
 
 template <typename Closure, template <typename> class CardOrRanges>
-class G1HeapRegionRemSetMergeCardClosure : public G1CardSet::CardSetPtrClosure {
+class G1HeapRegionRemSetMergeCardClosure : public G1CardSet::ContainerPtrClosure {
   G1CardSet* _card_set;
   Closure& _cl;
   uint _log_card_regions_per_region;
@@ -98,11 +98,11 @@ public:
     _log_card_region_size(log_card_region_size) {
   }
 
-  void do_cardsetptr(uint card_region_idx, size_t num_occupied, G1CardSet::CardSetPtr card_set) override {
+  void do_containerptr(uint card_region_idx, size_t num_occupied, G1CardSet::ContainerPtr container) override {
     CardOrRanges<Closure> cl(_cl,
                              card_region_idx >> _log_card_regions_per_region,
                              (card_region_idx & _card_regions_per_region_mask) << _log_card_region_size);
-    _card_set->iterate_cards_or_ranges_in_container(card_set, cl);
+    _card_set->iterate_cards_or_ranges_in_container(container, cl);
   }
 };
 
diff --git a/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp b/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp
index 914c64aacc5..004fd71cb2f 100644
--- a/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1CardSet.cpp
@@ -165,13 +165,13 @@ void G1CardSetTest::translate_cards(uint cards_per_region, uint region_idx, uint
   }
 }
 
-class G1CountCardsOccupied : public G1CardSet::CardSetPtrClosure {
+class G1CountCardsOccupied : public G1CardSet::ContainerPtrClosure {
   size_t _num_occupied;
 
 public:
   G1CountCardsOccupied() : _num_occupied(0) { }
 
-  void do_cardsetptr(uint region_idx, size_t num_occupied, G1CardSet::CardSetPtr card_set) override {
+  void do_containerptr(uint region_idx, size_t num_occupied, G1CardSet::ContainerPtr container) override {
     _num_occupied += num_occupied;
   }
 
diff --git a/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp b/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
index 9283fc3303f..0ad3aed18cc 100644
--- a/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
@@ -83,7 +83,7 @@ void G1CardSetContainersTest::cardset_inlineptr_test(uint bits_per_card) {
 
   G1AddCardResult res;
 
-  G1CardSet::CardSetPtr value = G1CardSetInlinePtr();
+  G1CardSet::ContainerPtr value = G1CardSetInlinePtr();
 
   for (uint i = 0; i < CardsPerSet; i++) {
     {
-- 
GitLab


From 096bca4a9c5e8ac2668dd965df92153ea1d80add Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 17 Mar 2022 09:10:08 +0000
Subject: [PATCH 108/345] 8282473: Refactor swing classes javadoc to use
 @throws instead of @exception

Reviewed-by: aivanov, dmarkov, prr
---
 .../classes/javax/swing/AbstractButton.java   | 18 ++---
 .../javax/swing/AbstractListModel.java        |  2 +-
 .../classes/javax/swing/BorderFactory.java    |  2 +-
 .../share/classes/javax/swing/BoxLayout.java  | 16 ++---
 .../javax/swing/DefaultBoundedRangeModel.java |  2 +-
 .../javax/swing/DefaultButtonModel.java       |  2 +-
 .../classes/javax/swing/DefaultListModel.java |  2 +-
 .../swing/DefaultListSelectionModel.java      |  4 +-
 .../swing/DefaultSingleSelectionModel.java    |  2 +-
 .../share/classes/javax/swing/JApplet.java    | 12 ++--
 .../classes/javax/swing/JColorChooser.java    | 12 ++--
 .../share/classes/javax/swing/JComboBox.java  |  6 +-
 .../share/classes/javax/swing/JComponent.java |  8 +--
 .../classes/javax/swing/JEditorPane.java      | 12 ++--
 .../classes/javax/swing/JFileChooser.java     | 14 ++--
 .../share/classes/javax/swing/JFrame.java     | 20 +++---
 .../classes/javax/swing/JInternalFrame.java   | 18 ++---
 .../share/classes/javax/swing/JLabel.java     |  8 +--
 .../share/classes/javax/swing/JLayer.java     |  2 +-
 .../share/classes/javax/swing/JList.java      | 10 +--
 .../share/classes/javax/swing/JMenu.java      | 26 ++++----
 .../classes/javax/swing/JOptionPane.java      | 40 +++++------
 .../classes/javax/swing/JPasswordField.java   |  2 +-
 .../share/classes/javax/swing/JPopupMenu.java |  6 +-
 .../classes/javax/swing/JProgressBar.java     |  2 +-
 .../share/classes/javax/swing/JRootPane.java  |  6 +-
 .../share/classes/javax/swing/JScrollBar.java |  4 +-
 .../classes/javax/swing/JScrollPane.java      |  8 +--
 .../share/classes/javax/swing/JSeparator.java |  4 +-
 .../share/classes/javax/swing/JSlider.java    |  2 +-
 .../share/classes/javax/swing/JSpinner.java   | 14 ++--
 .../share/classes/javax/swing/JSplitPane.java | 16 ++---
 .../classes/javax/swing/JTabbedPane.java      | 66 +++++++++----------
 .../share/classes/javax/swing/JTable.java     | 26 ++++----
 .../share/classes/javax/swing/JTextArea.java  | 22 +++----
 .../share/classes/javax/swing/JTextField.java |  6 +-
 .../share/classes/javax/swing/JTextPane.java  |  4 +-
 .../share/classes/javax/swing/JToolBar.java   |  4 +-
 .../share/classes/javax/swing/JTree.java      |  6 +-
 .../share/classes/javax/swing/JViewport.java  |  2 +-
 .../share/classes/javax/swing/JWindow.java    | 10 +--
 .../classes/javax/swing/OverlayLayout.java    |  2 +-
 .../share/classes/javax/swing/Popup.java      |  2 +-
 .../classes/javax/swing/PopupFactory.java     |  4 +-
 .../classes/javax/swing/ProgressMonitor.java  |  2 +-
 .../javax/swing/RootPaneContainer.java        |  4 +-
 .../classes/javax/swing/ScrollPaneLayout.java |  6 +-
 .../classes/javax/swing/SizeSequence.java     |  4 +-
 .../classes/javax/swing/SwingUtilities.java   |  8 +--
 .../share/classes/javax/swing/Timer.java      |  2 +-
 .../classes/javax/swing/TransferHandler.java  |  4 +-
 .../AbstractColorChooserPanel.java            |  2 +-
 .../javax/swing/event/EventListenerList.java  |  2 +-
 .../classes/javax/swing/plaf/TextUI.java      | 10 +--
 .../javax/swing/plaf/basic/BasicHTML.java     |  4 +-
 .../swing/plaf/basic/BasicTabbedPaneUI.java   |  2 +-
 .../swing/plaf/basic/BasicTextFieldUI.java    |  6 +-
 .../javax/swing/plaf/basic/BasicTextUI.java   | 12 ++--
 .../swing/plaf/basic/BasicTransferable.java   |  4 +-
 .../javax/swing/table/AbstractTableModel.java |  2 +-
 .../swing/table/DefaultTableColumnModel.java  | 10 +--
 .../javax/swing/table/DefaultTableModel.java  | 12 ++--
 .../javax/swing/table/JTableHeader.java       |  2 +-
 .../javax/swing/table/TableColumnModel.java   |  4 +-
 .../javax/swing/text/AbstractDocument.java    | 34 +++++-----
 .../javax/swing/text/AbstractWriter.java      | 14 ++--
 .../javax/swing/text/AsyncBoxView.java        | 14 ++--
 .../classes/javax/swing/text/BoxView.java     | 14 ++--
 .../javax/swing/text/ComponentView.java       |  8 +--
 .../javax/swing/text/CompositeView.java       | 18 ++---
 .../javax/swing/text/DefaultCaret.java        |  2 +-
 .../javax/swing/text/DefaultEditorKit.java    | 16 ++---
 .../javax/swing/text/DefaultHighlighter.java  |  4 +-
 .../swing/text/DefaultStyledDocument.java     | 10 +--
 .../classes/javax/swing/text/Document.java    | 10 +--
 .../javax/swing/text/DocumentFilter.java      | 12 ++--
 .../classes/javax/swing/text/EditorKit.java   | 16 ++---
 .../classes/javax/swing/text/FieldView.java   |  2 +-
 .../classes/javax/swing/text/GapContent.java  | 10 +--
 .../javax/swing/text/GlyphPainter2.java       |  4 +-
 .../classes/javax/swing/text/GlyphView.java   | 12 ++--
 .../classes/javax/swing/text/Highlighter.java |  4 +-
 .../classes/javax/swing/text/IconView.java    |  4 +-
 .../javax/swing/text/JTextComponent.java      | 24 +++----
 .../javax/swing/text/NavigationFilter.java    |  4 +-
 .../javax/swing/text/ParagraphView.java       |  2 +-
 .../javax/swing/text/PasswordView.java        |  6 +-
 .../javax/swing/text/PlainDocument.java       |  2 +-
 .../classes/javax/swing/text/PlainView.java   | 12 ++--
 .../javax/swing/text/StringContent.java       | 10 +--
 .../javax/swing/text/StyleContext.java        | 14 ++--
 .../javax/swing/text/StyledEditorKit.java     |  4 +-
 .../classes/javax/swing/text/TableView.java   |  2 +-
 .../classes/javax/swing/text/Utilities.java   | 24 +++----
 .../share/classes/javax/swing/text/View.java  | 14 ++--
 .../javax/swing/text/WrappedPlainView.java    | 10 +--
 .../classes/javax/swing/text/ZoneView.java    |  4 +-
 .../javax/swing/text/html/AccessibleHTML.java |  2 +-
 .../javax/swing/text/html/BlockView.java      |  8 +--
 .../javax/swing/text/html/FormView.java       |  2 +-
 .../javax/swing/text/html/HRuleView.java      |  2 +-
 .../javax/swing/text/html/HTMLDocument.java   |  2 +-
 .../javax/swing/text/html/HTMLEditorKit.java  | 12 ++--
 .../javax/swing/text/html/HTMLWriter.java     | 36 +++++-----
 .../javax/swing/text/html/ImageView.java      |  2 +-
 .../swing/text/html/MinimalHTMLWriter.java    | 42 ++++++------
 .../swing/text/html/OptionListModel.java      |  2 +-
 .../javax/swing/text/html/StyleSheet.java     |  2 +-
 .../javax/swing/text/html/TableView.java      |  2 +-
 .../javax/swing/text/rtf/RTFEditorKit.java    | 16 ++---
 .../swing/tree/DefaultMutableTreeNode.java    | 28 ++++----
 .../javax/swing/tree/DefaultTreeModel.java    |  2 +-
 .../swing/tree/DefaultTreeSelectionModel.java |  4 +-
 .../swing/undo/AbstractUndoableEdit.java      |  4 +-
 114 files changed, 533 insertions(+), 533 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/AbstractButton.java b/src/java.desktop/share/classes/javax/swing/AbstractButton.java
index 8a2936cd499..4f79ac8e2b3 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractButton.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractButton.java
@@ -876,7 +876,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
      * <li>{@code SwingConstants.LEADING}
      * <li>{@code SwingConstants.TRAILING} (the default)
      * </ul>
-     * @exception IllegalArgumentException if <code>textPosition</code>
+     * @throws IllegalArgumentException if <code>textPosition</code>
      *          is not one of the legal values listed above
      */
     @BeanProperty(visualUpdate = true, enumerationValues = {
@@ -953,7 +953,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
      *        {@code IllegalArgumentException} that is thrown for an invalid
      *        value
      * @return the {@code key} argument
-     * @exception IllegalArgumentException if key is not one of the legal
+     * @throws IllegalArgumentException if key is not one of the legal
      *            values listed above
      * @see #setHorizontalTextPosition
      * @see #setHorizontalAlignment
@@ -984,7 +984,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
      *        {@code IllegalArgumentException} that is thrown for an invalid
      *        value
      * @return the {@code key} argument
-     * @exception IllegalArgumentException if key is not one of the legal
+     * @throws IllegalArgumentException if key is not one of the legal
      *            values listed above
      */
     protected int checkVerticalKey(int key, String exception) {
@@ -1571,7 +1571,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
      *
      * @since 1.4
      * @param index Index into the String to underline
-     * @exception IllegalArgumentException will be thrown if <code>index</code>
+     * @throws IllegalArgumentException will be thrown if <code>index</code>
      *            is &gt;= length of the text, or &lt; -1
      * @see #getDisplayedMnemonicIndex
      */
@@ -1654,7 +1654,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
      * @see #getMultiClickThreshhold
      * @param threshhold the amount of time required between mouse
      *        press events to generate corresponding action events
-     * @exception   IllegalArgumentException if threshhold &lt; 0
+     * @throws   IllegalArgumentException if threshhold &lt; 0
      * @since 1.4
      */
     public void setMultiClickThreshhold(long threshhold) {
@@ -1791,10 +1791,10 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
      * @param     index the position in the container's list at which to
      *                 insert the component, where <code>-1</code>
      *                 means append to the end
-     * @exception IllegalArgumentException if <code>index</code> is invalid
-     * @exception IllegalArgumentException if adding the container's parent
+     * @throws IllegalArgumentException if <code>index</code> is invalid
+     * @throws IllegalArgumentException if adding the container's parent
      *                  to itself
-     * @exception IllegalArgumentException if adding a window to a container
+     * @throws IllegalArgumentException if adding a window to a container
      * @since 1.5
      */
     protected void addImpl(Component comp, Object constraints, int index) {
@@ -3064,7 +3064,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
              *
              * @param i zero-based index of the key bindings
              * @return a javax.lang.Object which specifies the key binding
-             * @exception IllegalArgumentException if the index is
+             * @throws IllegalArgumentException if the index is
              * out of bounds
              * @see #getAccessibleKeyBindingCount
              */
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractListModel.java b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
index 0396c956597..815fbea8407 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
@@ -218,7 +218,7 @@ public abstract class AbstractListModel<E> implements ListModel<E>, Serializable
      *          on this model,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code> doesn't
+     * @throws ClassCastException if <code>listenerType</code> doesn't
      *          specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/BorderFactory.java b/src/java.desktop/share/classes/javax/swing/BorderFactory.java
index 3fcb5620e69..2e4b18848a2 100644
--- a/src/java.desktop/share/classes/javax/swing/BorderFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/BorderFactory.java
@@ -332,7 +332,7 @@ public class BorderFactory
      * @param type      one of <code>EtchedBorder.RAISED</code>, or
      *                  <code>EtchedBorder.LOWERED</code>
      * @return the <code>Border</code> object
-     * @exception IllegalArgumentException if type is not either
+     * @throws IllegalArgumentException if type is not either
      *                  <code>EtchedBorder.RAISED</code> or
      *                  <code>EtchedBorder.LOWERED</code>
      * @since 1.3
diff --git a/src/java.desktop/share/classes/javax/swing/BoxLayout.java b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
index bc84a4fa582..d20a05ce4ef 100644
--- a/src/java.desktop/share/classes/javax/swing/BoxLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
@@ -169,7 +169,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
      *              {@code BoxLayout.X_AXIS, BoxLayout.Y_AXIS,
      *              BoxLayout.LINE_AXIS} or {@code BoxLayout.PAGE_AXIS}
      *
-     * @exception AWTError  if the value of {@code axis} is invalid
+     * @throws AWTError  if the value of {@code axis} is invalid
      */
     @ConstructorProperties({"target", "axis"})
     public BoxLayout(Container target, int axis) {
@@ -234,7 +234,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
      *
      * @param target  the affected container
      *
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError  if the target isn't the container specified to the
      *                      BoxLayout constructor
      */
     public synchronized void invalidateLayout(Container target) {
@@ -280,7 +280,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
      *
      * @param target  the container that needs to be laid out
      * @return the dimensions &gt;= 0 &amp;&amp; &lt;= Integer.MAX_VALUE
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError  if the target isn't the container specified to the
      *                      BoxLayout constructor
      * @see Container
      * @see #minimumLayoutSize
@@ -306,7 +306,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
      *
      * @param target  the container that needs to be laid out
      * @return the dimensions &gt;= 0 &amp;&amp; &lt;= Integer.MAX_VALUE
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError  if the target isn't the container specified to the
      *                      BoxLayout constructor
      * @see #preferredLayoutSize
      * @see #maximumLayoutSize
@@ -331,7 +331,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
      *
      * @param target  the container that needs to be laid out
      * @return the dimensions &gt;= 0 &amp;&amp; &lt;= Integer.MAX_VALUE
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError  if the target isn't the container specified to the
      *                      BoxLayout constructor
      * @see #preferredLayoutSize
      * @see #minimumLayoutSize
@@ -358,7 +358,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
      *
      * @param target  the container
      * @return the alignment &gt;= 0.0f &amp;&amp; &lt;= 1.0f
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError  if the target isn't the container specified to the
      *                      BoxLayout constructor
      */
     public synchronized float getLayoutAlignmentX(Container target) {
@@ -375,7 +375,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
      *
      * @param target  the container
      * @return the alignment &gt;= 0.0f &amp;&amp; &lt;= 1.0f
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError  if the target isn't the container specified to the
      *                      BoxLayout constructor
      */
     public synchronized float getLayoutAlignmentY(Container target) {
@@ -390,7 +390,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
      *
      * @param target  the container to lay out
      *
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError  if the target isn't the container specified to the
      *                      BoxLayout constructor
      */
     public void layoutContainer(Container target) {
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
index 7e254d5c8b3..e9bd3d96a6a 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
@@ -417,7 +417,7 @@ public class DefaultBoundedRangeModel implements BoundedRangeModel, Serializable
      *          on this model,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code> doesn't
+     * @throws ClassCastException if <code>listenerType</code> doesn't
      *          specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
index 453b1d0ab0e..d391011167a 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
@@ -488,7 +488,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable {
      *          on this model,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code> doesn't
+     * @throws ClassCastException if <code>listenerType</code> doesn't
      *          specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
index 88210b77c9c..9d519927b67 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
@@ -345,7 +345,7 @@ public class DefaultListModel<E> extends AbstractListModel<E>
      *
      * @param      element the component to insert
      * @param      index   where to insert the new component
-     * @exception  ArrayIndexOutOfBoundsException if the index was invalid
+     * @throws  ArrayIndexOutOfBoundsException if the index was invalid
      * @see #add(int,Object)
      * @see Vector#insertElementAt(Object,int)
      */
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
index 55b8fbba66c..aa69c2d1ab0 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
@@ -284,7 +284,7 @@ public class DefaultListSelectionModel implements ListSelectionModel, Cloneable,
      *          on this model,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code> doesn't
+     * @throws ClassCastException if <code>listenerType</code> doesn't
      *          specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
@@ -750,7 +750,7 @@ public class DefaultListSelectionModel implements ListSelectionModel, Cloneable,
      * Returns a clone of this selection model with the same selection.
      * <code>listenerLists</code> are not duplicated.
      *
-     * @exception CloneNotSupportedException if the selection model does not
+     * @throws CloneNotSupportedException if the selection model does not
      *    both (a) implement the Cloneable interface and (b) define a
      *    <code>clone</code> method.
      */
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
index c5c2539d41f..122e635fba1 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
@@ -178,7 +178,7 @@ Serializable {
      *          on this model,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code> doesn't
+     * @throws ClassCastException if <code>listenerType</code> doesn't
      *          specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/JApplet.java b/src/java.desktop/share/classes/javax/swing/JApplet.java
index a1d51bf0069..e5ad62322e6 100644
--- a/src/java.desktop/share/classes/javax/swing/JApplet.java
+++ b/src/java.desktop/share/classes/javax/swing/JApplet.java
@@ -135,7 +135,7 @@ public class JApplet extends Applet implements Accessible,
      * This constructor sets the component's locale property to the value
      * returned by <code>JComponent.getDefaultLocale</code>.
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @see JComponent#getDefaultLocale
@@ -312,10 +312,10 @@ public class JApplet extends Applet implements Accessible,
      * @param comp the component to be enhanced
      * @param constraints the constraints to be respected
      * @param index the index
-     * @exception IllegalArgumentException if <code>index</code> is invalid
-     * @exception IllegalArgumentException if adding the container's parent
+     * @throws IllegalArgumentException if <code>index</code> is invalid
+     * @throws IllegalArgumentException if adding the container's parent
      *                  to itself
-     * @exception IllegalArgumentException if adding a window to a container
+     * @throws IllegalArgumentException if adding a window to a container
      *
      * @see #setRootPaneCheckingEnabled
      * @see javax.swing.RootPaneContainer
@@ -423,7 +423,7 @@ public class JApplet extends Applet implements Accessible,
      * Sets the contentPane property.  This method is called by the constructor.
      * @param contentPane the contentPane object for this applet
      *
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *            exception) if the content pane parameter is null
      * @see #getContentPane
      * @see RootPaneContainer#setContentPane
@@ -437,7 +437,7 @@ public class JApplet extends Applet implements Accessible,
     /**
      * Returns the layeredPane object for this applet.
      *
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *            exception) if the layered pane parameter is null
      * @see #setLayeredPane
      * @see RootPaneContainer#getLayeredPane
diff --git a/src/java.desktop/share/classes/javax/swing/JColorChooser.java b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
index 29bf7009b4f..945c6f60697 100644
--- a/src/java.desktop/share/classes/javax/swing/JColorChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
@@ -150,7 +150,7 @@ public class JColorChooser extends JComponent implements Accessible {
      * @param title        the String containing the dialog's title
      * @param initialColor the initial Color set when the color-chooser is shown
      * @return the selected color or <code>null</code> if the user opted out
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -173,7 +173,7 @@ public class JColorChooser extends JComponent implements Accessible {
      * @param colorTransparencySelectionEnabled true if the transparency of
      *            a color can be selected
      * @return the selected color or <code>null</code> if the user opted out
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -217,7 +217,7 @@ public class JColorChooser extends JComponent implements Accessible {
      * @param okListener     the ActionListener invoked when "OK" is pressed
      * @param cancelListener the ActionListener invoked when "Cancel" is pressed
      * @return a new dialog containing the color-chooser pane
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -343,7 +343,7 @@ public class JColorChooser extends JComponent implements Accessible {
      * @param r   an int specifying the amount of Red
      * @param g   an int specifying the amount of Green
      * @param b   an int specifying the amount of Blue
-     * @exception IllegalArgumentException if r,g,b values are out of range
+     * @throws IllegalArgumentException if r,g,b values are out of range
      * @see java.awt.Color
      */
     public void setColor(int r, int g, int b) {
@@ -386,7 +386,7 @@ public class JColorChooser extends JComponent implements Accessible {
      * <code>TransferHandler</code>.
      *
      * @param b the value to set the <code>dragEnabled</code> property to
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *            <code>b</code> is <code>true</code> and
      *            <code>GraphicsEnvironment.isHeadless()</code>
      *            returns <code>true</code>
@@ -464,7 +464,7 @@ public class JColorChooser extends JComponent implements Accessible {
      *
      * @param panel   a string that specifies the panel to be removed
      * @return the color panel
-     * @exception IllegalArgumentException if panel is not in list of
+     * @throws IllegalArgumentException if panel is not in list of
      *                  known chooser panels
      */
     public AbstractColorChooserPanel removeChooserPanel( AbstractColorChooserPanel panel ) {
diff --git a/src/java.desktop/share/classes/javax/swing/JComboBox.java b/src/java.desktop/share/classes/javax/swing/JComboBox.java
index fdbbdc68657..f035c186896 100644
--- a/src/java.desktop/share/classes/javax/swing/JComboBox.java
+++ b/src/java.desktop/share/classes/javax/swing/JComboBox.java
@@ -638,7 +638,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
      *
      * @param anIndex an integer specifying the list item to select,
      *                  where 0 specifies the first item in the list and -1 indicates no selection
-     * @exception IllegalArgumentException if <code>anIndex</code> &lt; -1 or
+     * @throws IllegalArgumentException if <code>anIndex</code> &lt; -1 or
      *                  <code>anIndex</code> is greater than or equal to size
      */
     @BeanProperty(bound = false, preferred = true, description
@@ -815,7 +815,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
     /**
      * Checks that the <code>dataModel</code> is an instance of
      * <code>MutableComboBoxModel</code>.  If not, it throws an exception.
-     * @exception RuntimeException if <code>dataModel</code> is not an
+     * @throws RuntimeException if <code>dataModel</code> is not an
      *          instance of <code>MutableComboBoxModel</code>.
      */
     void checkMutableComboBoxModel() {
@@ -2298,7 +2298,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
              * @return this component's locale.  If this component does not have
              * a locale, the locale of its parent is returned.
              *
-             * @exception IllegalComponentStateException
+             * @throws IllegalComponentStateException
              * If the Component does not have its own locale and has not yet been
              * added to a containment hierarchy such that the locale can be
              * determined from the containing parent.
diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java
index c572a12ebb4..87b8c3175bd 100644
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -2455,7 +2455,7 @@ public abstract class JComponent extends Container implements Serializable,
      *
      * @param condition one of the values listed above
      * @param map  the <code>InputMap</code> to use for the given condition
-     * @exception IllegalArgumentException if <code>condition</code> is
+     * @throws IllegalArgumentException if <code>condition</code> is
      *          <code>WHEN_IN_FOCUSED_WINDOW</code> and <code>map</code>
      *          is not an instance of <code>ComponentInputMap</code>; or
      *          if <code>condition</code> is not one of the legal values
@@ -2554,7 +2554,7 @@ public abstract class JComponent extends Container implements Serializable,
      * @return the <code>InputMap</code> for the given <code>condition</code>;
      *          if <code>create</code> is false and the <code>InputMap</code>
      *          hasn't been created, returns <code>null</code>
-     * @exception IllegalArgumentException if <code>condition</code>
+     * @throws IllegalArgumentException if <code>condition</code>
      *          is not one of the legal values listed above
      */
     final InputMap getInputMap(int condition, boolean create) {
@@ -4623,7 +4623,7 @@ public abstract class JComponent extends Container implements Serializable,
      * @param propertyName  the name of the property that was listened on
      * @param oldValue  the old value of the property
      * @param newValue  the new value of the property
-     * @exception java.beans.PropertyVetoException when the attempt to set the
+     * @throws java.beans.PropertyVetoException when the attempt to set the
      *          property is vetoed by the component
      */
     protected void fireVetoableChange(String propertyName, Object oldValue, Object newValue)
@@ -4799,7 +4799,7 @@ public abstract class JComponent extends Container implements Serializable,
      *          <code><em>Foo</em>Listener</code>s on this component,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code>
+     * @throws ClassCastException if <code>listenerType</code>
      *          doesn't specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
index 6b9189d550d..f347621a687 100644
--- a/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -312,7 +312,7 @@ public class JEditorPane extends JTextComponent {
      * Creates a <code>JEditorPane</code> based on a specified URL for input.
      *
      * @param initialPage the URL
-     * @exception IOException if the URL is <code>null</code>
+     * @throws IOException if the URL is <code>null</code>
      *          or cannot be accessed
      */
     public JEditorPane(URL initialPage) throws IOException {
@@ -325,7 +325,7 @@ public class JEditorPane extends JTextComponent {
      * a URL specification.
      *
      * @param url the URL
-     * @exception IOException if the URL is <code>null</code> or
+     * @throws IOException if the URL is <code>null</code> or
      *          cannot be accessed
      */
     public JEditorPane(String url) throws IOException {
@@ -340,7 +340,7 @@ public class JEditorPane extends JTextComponent {
      *
      * @param type mime type of the given text
      * @param text the text to initialize with; may be <code>null</code>
-     * @exception NullPointerException if the <code>type</code> parameter
+     * @throws NullPointerException if the <code>type</code> parameter
      *          is <code>null</code>
      */
     public JEditorPane(String type, String text) {
@@ -462,7 +462,7 @@ public class JEditorPane extends JTextComponent {
      * thread is done whether the load was successful or not.
      *
      * @param page the URL of the page
-     * @exception IOException for a <code>null</code> or invalid
+     * @throws IOException for a <code>null</code> or invalid
      *          page specification, or exception from the stream being read
      * @see #getPage
      */
@@ -578,7 +578,7 @@ public class JEditorPane extends JTextComponent {
      *
      * @param in the stream from which to read
      * @param desc an object describing the stream
-     * @exception IOException as thrown by the stream being
+     * @throws IOException as thrown by the stream being
      *          used to initialize
      * @see JTextComponent#read
      * @see #setDocument
@@ -925,7 +925,7 @@ public class JEditorPane extends JTextComponent {
      * Sets the current URL being displayed.
      *
      * @param url the URL for display
-     * @exception IOException for a <code>null</code> or invalid URL
+     * @throws IOException for a <code>null</code> or invalid URL
      *          specification
      */
     public void setPage(String url) throws IOException {
diff --git a/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
index 8d286e05f3b..2e0a80f788b 100644
--- a/src/java.desktop/share/classes/javax/swing/JFileChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
@@ -446,7 +446,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * <code>TransferHandler</code>.
      *
      * @param b the value to set the <code>dragEnabled</code> property to
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *            <code>b</code> is <code>true</code> and
      *            <code>GraphicsEnvironment.isHeadless()</code>
      *            returns <code>true</code>
@@ -658,7 +658,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * <li>JFileChooser.ERROR_OPTION if an error occurs or the
      *                  dialog is dismissed
      * </ul>
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @see #showDialog
@@ -683,7 +683,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * <li>JFileChooser.ERROR_OPTION if an error occurs or the
      *                  dialog is dismissed
      * </ul>
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @see #showDialog
@@ -743,7 +743,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * <li>JFileChooser.ERROR_OPTION if an error occurs or the
      *                  dialog is dismissed
      * </ul>
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -800,7 +800,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * @param   parent  the parent component of the dialog;
      *                  can be <code>null</code>
      * @return a new <code>JDialog</code> containing this instance
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since 1.4
@@ -924,7 +924,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * <li>JFileChooser.CUSTOM_DIALOG
      * </ul>
      *
-     * @exception IllegalArgumentException if <code>dialogType</code> is
+     * @throws IllegalArgumentException if <code>dialogType</code> is
      *                          not legal
      *
      * @see #getDialogType
@@ -1311,7 +1311,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * <li>JFileChooser.FILES_AND_DIRECTORIES
      * </ul>
      *
-     * @exception IllegalArgumentException  if <code>mode</code> is an
+     * @throws IllegalArgumentException  if <code>mode</code> is an
      *                          illegal file selection mode
      *
      * @see #getFileSelectionMode
diff --git a/src/java.desktop/share/classes/javax/swing/JFrame.java b/src/java.desktop/share/classes/javax/swing/JFrame.java
index 339268fd165..9b37ae77ab0 100644
--- a/src/java.desktop/share/classes/javax/swing/JFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JFrame.java
@@ -169,7 +169,7 @@ public class JFrame  extends Frame implements WindowConstants,
      * This constructor sets the component's locale property to the value
      * returned by <code>JComponent.getDefaultLocale</code>.
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @see Component#setSize
@@ -193,7 +193,7 @@ public class JFrame  extends Frame implements WindowConstants,
      *          to construct the new <code>Frame</code>;
      *          if <code>gc</code> is <code>null</code>, the system
      *          default <code>GraphicsConfiguration</code> is assumed
-     * @exception IllegalArgumentException if <code>gc</code> is not from
+     * @throws IllegalArgumentException if <code>gc</code> is not from
      *          a screen device.  This exception is always thrown when
      *      GraphicsEnvironment.isHeadless() returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -213,7 +213,7 @@ public class JFrame  extends Frame implements WindowConstants,
      * returned by <code>JComponent.getDefaultLocale</code>.
      *
      * @param title the title for the frame
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @see Component#setSize
@@ -239,7 +239,7 @@ public class JFrame  extends Frame implements WindowConstants,
      *          to construct the new <code>JFrame</code> with;
      *          if <code>gc</code> is <code>null</code>, the system
      *          default <code>GraphicsConfiguration</code> is assumed
-     * @exception IllegalArgumentException if <code>gc</code> is not from
+     * @throws IllegalArgumentException if <code>gc</code> is not from
      *          a screen device.  This exception is always thrown when
      *      GraphicsEnvironment.isHeadless() returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -357,7 +357,7 @@ public class JFrame  extends Frame implements WindowConstants,
      *
      * @param operation the operation which should be performed when the
      *        user closes the frame
-     * @exception IllegalArgumentException if defaultCloseOperation value
+     * @throws IllegalArgumentException if defaultCloseOperation value
      *             isn't one of the above valid values
      * @see #addWindowListener
      * @see #getDefaultCloseOperation
@@ -540,10 +540,10 @@ public class JFrame  extends Frame implements WindowConstants,
      * @param comp the component to be enhanced
      * @param constraints the constraints to be respected
      * @param index the index
-     * @exception IllegalArgumentException if <code>index</code> is invalid
-     * @exception IllegalArgumentException if adding the container's parent
+     * @throws IllegalArgumentException if <code>index</code> is invalid
+     * @throws IllegalArgumentException if adding the container's parent
      *                  to itself
-     * @exception IllegalArgumentException if adding a window to a container
+     * @throws IllegalArgumentException if adding a window to a container
      *
      * @see #setRootPaneCheckingEnabled
      * @see javax.swing.RootPaneContainer
@@ -668,7 +668,7 @@ public class JFrame  extends Frame implements WindowConstants,
      *
      * @param contentPane the <code>contentPane</code> object for this frame
      *
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *            exception) if the content pane parameter is <code>null</code>
      * @see #getContentPane
      * @see RootPaneContainer#setContentPane
@@ -696,7 +696,7 @@ public class JFrame  extends Frame implements WindowConstants,
      * This method is called by the constructor.
      * @param layeredPane the <code>layeredPane</code> object for this frame
      *
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *            exception) if the layered pane parameter is <code>null</code>
      * @see #getLayeredPane
      * @see RootPaneContainer#setLayeredPane
diff --git a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
index 62efd03c0db..9caa5f966e3 100644
--- a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -497,10 +497,10 @@ public class JInternalFrame extends JComponent implements
      * @param comp the component to be enhanced
      * @param constraints the constraints to be respected
      * @param index the index
-     * @exception IllegalArgumentException if <code>index</code> is invalid
-     * @exception IllegalArgumentException if adding the container's parent
+     * @throws IllegalArgumentException if <code>index</code> is invalid
+     * @throws IllegalArgumentException if adding the container's parent
      *                  to itself
-     * @exception IllegalArgumentException if adding a window to a container
+     * @throws IllegalArgumentException if adding a window to a container
      *
      * @see #setRootPaneCheckingEnabled
      * @see javax.swing.RootPaneContainer
@@ -628,7 +628,7 @@ public class JInternalFrame extends JComponent implements
      *
      * @param c  the content pane for this internal frame
      *
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *           exception) if the content pane parameter is <code>null</code>
      * @see RootPaneContainer#getContentPane
      */
@@ -657,7 +657,7 @@ public class JInternalFrame extends JComponent implements
      *
      * @param layered the <code>JLayeredPane</code> for this internal frame
      *
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *           exception) if the layered pane parameter is <code>null</code>
      * @see RootPaneContainer#setLayeredPane
      */
@@ -794,7 +794,7 @@ public class JInternalFrame extends JComponent implements
      *
      * @param b must be <code>true</code>
      *
-     * @exception PropertyVetoException when the attempt to set the
+     * @throws PropertyVetoException when the attempt to set the
      *            property is vetoed by the <code>JInternalFrame</code>
      *
      * @see #isClosed()
@@ -906,7 +906,7 @@ public class JInternalFrame extends JComponent implements
      *
      * @param b a boolean, where <code>true</code> means to iconify this internal frame and
      *          <code>false</code> means to de-iconify it
-     * @exception PropertyVetoException when the attempt to set the
+     * @throws PropertyVetoException when the attempt to set the
      *            property is vetoed by the <code>JInternalFrame</code>
      *
      * @see InternalFrameEvent#INTERNAL_FRAME_ICONIFIED
@@ -985,7 +985,7 @@ public class JInternalFrame extends JComponent implements
      *
      * @param b  a boolean, where <code>true</code> maximizes this internal frame and <code>false</code>
      *           restores it
-     * @exception PropertyVetoException when the attempt to set the
+     * @throws PropertyVetoException when the attempt to set the
      *            property is vetoed by the <code>JInternalFrame</code>
      */
     @BeanProperty(description
@@ -1047,7 +1047,7 @@ public class JInternalFrame extends JComponent implements
      * @param selected  a boolean, where <code>true</code> means this internal frame
      *                  should become selected (currently active)
      *                  and <code>false</code> means it should become deselected
-     * @exception PropertyVetoException when the attempt to set the
+     * @throws PropertyVetoException when the attempt to set the
      *            property is vetoed by the <code>JInternalFrame</code>
      *
      * @see #isShowing
diff --git a/src/java.desktop/share/classes/javax/swing/JLabel.java b/src/java.desktop/share/classes/javax/swing/JLabel.java
index 8dff4a8fd25..eed6a157cc1 100644
--- a/src/java.desktop/share/classes/javax/swing/JLabel.java
+++ b/src/java.desktop/share/classes/javax/swing/JLabel.java
@@ -551,7 +551,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
      *
      * @since 1.4
      * @param index Index into the String to underline
-     * @exception IllegalArgumentException will be thrown if <code>index</code>
+     * @throws IllegalArgumentException will be thrown if <code>index</code>
      *            is &gt;= length of the text, or &lt; -1
      */
     @BeanProperty(visualUpdate = true, description
@@ -595,7 +595,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
      * @param message the IllegalArgumentException detail message
      * @return the key value if {@code key} is a a legal value for the
      *         horizontalAlignment properties
-     * @exception IllegalArgumentException if key isn't LEFT, CENTER, RIGHT,
+     * @throws IllegalArgumentException if key isn't LEFT, CENTER, RIGHT,
      * LEADING or TRAILING.
      * @see #setHorizontalTextPosition
      * @see #setHorizontalAlignment
@@ -622,7 +622,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
      * @param message the IllegalArgumentException detail message
      * @return the key value if {@code key} is a legal value for the
      *         verticalAlignment or verticalTextPosition properties
-     * @exception IllegalArgumentException if key isn't TOP, CENTER, or BOTTOM.
+     * @throws IllegalArgumentException if key isn't TOP, CENTER, or BOTTOM.
      * @see #setVerticalAlignment
      * @see #setVerticalTextPosition
      */
@@ -1637,7 +1637,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
              *
              * @param i zero-based index of the key bindings
              * @return a javax.lang.Object which specifies the key binding
-             * @exception IllegalArgumentException if the index is
+             * @throws IllegalArgumentException if the index is
              * out of bounds
              * @see #getAccessibleKeyBindingCount
              */
diff --git a/src/java.desktop/share/classes/javax/swing/JLayer.java b/src/java.desktop/share/classes/javax/swing/JLayer.java
index 0ade190ce42..c2076299e44 100644
--- a/src/java.desktop/share/classes/javax/swing/JLayer.java
+++ b/src/java.desktop/share/classes/javax/swing/JLayer.java
@@ -316,7 +316,7 @@ public final class JLayer<V extends Component>
      * a {@code JLayer}.
      *
      * @param mgr the specified layout manager
-     * @exception IllegalArgumentException this method is not supported
+     * @throws IllegalArgumentException this method is not supported
      */
     public void setLayout(LayoutManager mgr) {
         if (mgr != null) {
diff --git a/src/java.desktop/share/classes/javax/swing/JList.java b/src/java.desktop/share/classes/javax/swing/JList.java
index ac4a1e3fe3a..220f86aca4e 100644
--- a/src/java.desktop/share/classes/javax/swing/JList.java
+++ b/src/java.desktop/share/classes/javax/swing/JList.java
@@ -445,7 +445,7 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
      * allowing for tooltips to be provided by the cell renderers.
      *
      * @param dataModel the model for the list
-     * @exception IllegalArgumentException if the model is {@code null}
+     * @throws IllegalArgumentException if the model is {@code null}
      */
     public JList(ListModel<E> dataModel)
     {
@@ -1202,7 +1202,7 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
      * list's {@code TransferHandler}.
      *
      * @param b whether or not to enable automatic drag handling
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *            <code>b</code> is <code>true</code> and
      *            <code>GraphicsEnvironment.isHeadless()</code>
      *            returns <code>true</code>
@@ -1493,7 +1493,7 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
      * Position.Bias.Forward or Position.Bias.Backward.
      * @return the index of the next list element that
      * starts with the prefix; otherwise {@code -1}
-     * @exception IllegalArgumentException if prefix is {@code null}
+     * @throws IllegalArgumentException if prefix is {@code null}
      * or startIndex is out of bounds
      * @since 1.4
      */
@@ -1695,7 +1695,7 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
      *
      * @param model  the <code>ListModel</code> that provides the
      *                                          list of items for display
-     * @exception IllegalArgumentException  if <code>model</code> is
+     * @throws IllegalArgumentException  if <code>model</code> is
      *                                          <code>null</code>
      * @see #getModel
      * @see #clearSelection
@@ -1910,7 +1910,7 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
      *
      * @param selectionModel  the <code>ListSelectionModel</code> that
      *                          implements the selections
-     * @exception IllegalArgumentException   if <code>selectionModel</code>
+     * @throws IllegalArgumentException   if <code>selectionModel</code>
      *                                          is <code>null</code>
      * @see #getSelectionModel
      */
diff --git a/src/java.desktop/share/classes/javax/swing/JMenu.java b/src/java.desktop/share/classes/javax/swing/JMenu.java
index dbac4812ca8..1565440969a 100644
--- a/src/java.desktop/share/classes/javax/swing/JMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenu.java
@@ -508,7 +508,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * to manage the idiosyncrasies of the various UI implementations.
      *
      * @param       d the number of milliseconds to delay
-     * @exception   IllegalArgumentException if <code>d</code>
+     * @throws   IllegalArgumentException if <code>d</code>
      *                       is less than 0
      */
     @BeanProperty(bound = false, expert = true, description
@@ -674,7 +674,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * @param s the text for the menu item to add
      * @param pos an integer specifying the position at which to add the
      *               new menu item
-     * @exception IllegalArgumentException when the value of
+     * @throws IllegalArgumentException when the value of
      *                  <code>pos</code> &lt; 0
      */
     public void insert(String s, int pos) {
@@ -693,7 +693,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * @param pos an integer specifying the position at which to add the
      *               new <code>JMenuitem</code>
      * @return the new menu item
-     * @exception IllegalArgumentException if the value of
+     * @throws IllegalArgumentException if the value of
      *                  <code>pos</code> &lt; 0
      */
     public JMenuItem insert(JMenuItem mi, int pos) {
@@ -713,7 +713,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * @param pos an integer specifying the position at which to add the
      *               new menu item
      * @return the new menu item
-     * @exception IllegalArgumentException if the value of
+     * @throws IllegalArgumentException if the value of
      *                  <code>pos</code> &lt; 0
      */
     public JMenuItem insert(Action a, int pos) {
@@ -734,7 +734,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      *
      * @param       index an integer specifying the position at which to
      *                    insert the menu separator
-     * @exception   IllegalArgumentException if the value of
+     * @throws   IllegalArgumentException if the value of
      *                       <code>index</code> &lt; 0
      */
     public void insertSeparator(int index) {
@@ -755,7 +755,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * @param pos  an integer specifying the position
      * @return  the menu item at the specified position; or <code>null</code>
      *          if the item as the specified position is not a menu item
-     * @exception  IllegalArgumentException if the value of
+     * @throws  IllegalArgumentException if the value of
      *             {@code pos} &lt; 0
      */
     public JMenuItem getItem(int pos) {
@@ -790,7 +790,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * yet implemented.
      *
      * @return true if the menu can be torn off, else false
-     * @exception  Error  if invoked -- this method is not yet implemented
+     * @throws  Error  if invoked -- this method is not yet implemented
      */
     @BeanProperty(bound = false)
     public boolean isTearOff() {
@@ -812,7 +812,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * Removes the menu item at the specified index from this menu.
      *
      * @param       pos the position of the item to be removed
-     * @exception   IllegalArgumentException if the value of
+     * @throws   IllegalArgumentException if the value of
      *                       <code>pos</code> &lt; 0, or if <code>pos</code>
      *                       is greater than the number of menu items
      */
@@ -1024,7 +1024,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * notification on this event type.  The event instance
      * is created lazily.
      *
-     * @exception Error  if there is a <code>null</code> listener
+     * @throws Error  if there is a <code>null</code> listener
      * @see EventListenerList
      */
     protected void fireMenuSelected() {
@@ -1054,7 +1054,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * notification on this event type.  The event instance
      * is created lazily.
      *
-     * @exception Error if there is a <code>null</code> listener
+     * @throws Error if there is a <code>null</code> listener
      * @see EventListenerList
      */
     protected void fireMenuDeselected() {
@@ -1084,7 +1084,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * notification on this event type.  The event instance
      * is created lazily.
      *
-     * @exception Error if there is a <code>null</code> listener
+     * @throws Error if there is a <code>null</code> listener
      * @see EventListenerList
      */
     protected void fireMenuCanceled() {
@@ -1238,7 +1238,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      *
      * @param o the new component orientation of this menu and
      *        the components contained within it.
-     * @exception NullPointerException if <code>orientation</code> is null.
+     * @throws NullPointerException if <code>orientation</code> is null.
      * @see java.awt.Component#setComponentOrientation
      * @see java.awt.Component#getComponentOrientation
      * @since 1.4
@@ -1275,7 +1275,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
      * @param keyStroke  the keystroke combination which will invoke
      *                  the <code>JMenuItem</code>'s actionlisteners
      *                  without navigating the menu hierarchy
-     * @exception Error  if invoked -- this method is not defined for JMenu.
+     * @throws Error  if invoked -- this method is not defined for JMenu.
      *                  Use <code>setMnemonic</code> instead
      */
     public void setAccelerator(KeyStroke keyStroke) {
diff --git a/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
index 99eee90347b..28a547dc2cb 100644
--- a/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -435,7 +435,7 @@ public class JOptionPane extends JComponent implements Accessible
      * the screen.
      *
      * @param message the <code>Object</code> to display
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @return user's input
@@ -471,7 +471,7 @@ public class JOptionPane extends JComponent implements Accessible
      * @param parentComponent  the parent <code>Component</code> for the
      *          dialog
      * @param message  the <code>Object</code> to display
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *    <code>GraphicsEnvironment.isHeadless</code> returns
      *    <code>true</code>
      * @return user's input
@@ -523,7 +523,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                  <code>QUESTION_MESSAGE</code>,
      *                  or <code>PLAIN_MESSAGE</code>
      * @return user's input
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -566,7 +566,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                 field
      * @return user's input, or <code>null</code> meaning the user
      *                  canceled the input
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -609,7 +609,7 @@ public class JOptionPane extends JComponent implements Accessible
      *          or if the <code>parentComponent</code> has no
      *          <code>Frame</code>, a default <code>Frame</code> is used
      * @param message   the <code>Object</code> to display
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -637,7 +637,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                  <code>WARNING_MESSAGE</code>,
      *                  <code>QUESTION_MESSAGE</code>,
      *                  or <code>PLAIN_MESSAGE</code>
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -666,7 +666,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                  or <code>PLAIN_MESSAGE</code>
      * @param icon      an icon to display in the dialog that helps the user
      *                  identify the kind of message that is being displayed
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -690,7 +690,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                  default <code>Frame</code> is used
      * @param message   the <code>Object</code> to display
      * @return an integer indicating the option selected by the user
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -718,7 +718,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                  <code>YES_NO_CANCEL_OPTION</code>,
      *                  or <code>OK_CANCEL_OPTION</code>
      * @return an int indicating the option selected by the user
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -757,7 +757,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                  <code>QUESTION_MESSAGE</code>,
      *                  or <code>PLAIN_MESSAGE</code>
      * @return an integer indicating the option selected by the user
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -795,7 +795,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                  or <code>PLAIN_MESSAGE</code>
      * @param icon      the icon to display in the dialog
      * @return an int indicating the option selected by the user
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -856,7 +856,7 @@ public class JOptionPane extends JComponent implements Accessible
      * @return an integer indicating the option chosen by the user,
      *                  or <code>CLOSED_OPTION</code> if the user closed
      *                  the dialog
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -919,7 +919,7 @@ public class JOptionPane extends JComponent implements Accessible
      *          no <code>Frame</code>, a default <code>Frame</code> is used
      * @param title     the title string for the dialog
      * @return a new <code>JDialog</code> containing this instance
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -946,7 +946,7 @@ public class JOptionPane extends JComponent implements Accessible
      *
      * @param title     the title string for the dialog
      * @return a new <code>JDialog</code> containing this instance
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -1508,7 +1508,7 @@ public class JOptionPane extends JComponent implements Accessible
      *          frame's title bar
      * @return a <code>JInternalFrame</code> containing a
      *          <code>JOptionPane</code>
-     * @exception RuntimeException if <code>parentComponent</code> does
+     * @throws RuntimeException if <code>parentComponent</code> does
      *          not have a valid parent
      */
     public JInternalFrame createInternalFrame(Component parentComponent,
@@ -1600,7 +1600,7 @@ public class JOptionPane extends JComponent implements Accessible
      *          or <code>getRootFrame</code>
      *          if the component is <code>null</code>,
      *          or does not have a valid <code>Frame</code> parent
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see #getRootFrame
@@ -1626,7 +1626,7 @@ public class JOptionPane extends JComponent implements Accessible
      *          frame if the component is <code>null</code>,
      *          or does not have a valid
      *          <code>Frame</code> or <code>Dialog</code> parent
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -1683,7 +1683,7 @@ public class JOptionPane extends JComponent implements Accessible
      * which a frame is not provided.
      *
      * @return the default <code>Frame</code> to use
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   <code>GraphicsEnvironment.isHeadless</code> returns
      *   <code>true</code>
      * @see #setRootFrame
@@ -2050,7 +2050,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                <code>ERROR_MESSAGE</code>, <code>INFORMATION_MESSAGE</code>,
      *                <code>WARNING_MESSAGE</code>,
      *                <code>QUESTION_MESSAGE</code>, or <code>PLAIN_MESSAGE</code>
-     * @exception RuntimeException if <code>newType</code> is not one of the
+     * @throws RuntimeException if <code>newType</code> is not one of the
      *          legal values listed above
 
      * @see #getMessageType
@@ -2096,7 +2096,7 @@ public class JOptionPane extends JComponent implements Accessible
      *                  <code>YES_NO_OPTION</code>,
      *                  <code>YES_NO_CANCEL_OPTION</code>,
      *                  or <code>OK_CANCEL_OPTION</code>
-     * @exception RuntimeException if <code>newType</code> is not one of
+     * @throws RuntimeException if <code>newType</code> is not one of
      *          the legal values listed above
      *
      * @see #getOptionType
diff --git a/src/java.desktop/share/classes/javax/swing/JPasswordField.java b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
index 577998cb336..c6450d0605a 100644
--- a/src/java.desktop/share/classes/javax/swing/JPasswordField.java
+++ b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
@@ -288,7 +288,7 @@ public class JPasswordField extends JTextField {
      * @param offs the offset &gt;= 0
      * @param len the length &gt;= 0
      * @return the text
-     * @exception BadLocationException if the offset or length are invalid
+     * @throws BadLocationException if the offset or length are invalid
      */
     @Deprecated
     public String getText(int offs, int len) throws BadLocationException {
diff --git a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index ef9ad42ef81..a6811fad5eb 100644
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -475,7 +475,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
      * Removes the component at the specified index from this popup menu.
      *
      * @param       pos the position of the item to be removed
-     * @exception   IllegalArgumentException if the value of
+     * @throws   IllegalArgumentException if the value of
      *                          <code>pos</code> &lt; 0, or if the value of
      *                          <code>pos</code> is greater than the
      *                          number of items
@@ -573,7 +573,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
      * @param a  the <code>Action</code> object to insert
      * @param index      specifies the position at which to insert the
      *                   <code>Action</code>, where 0 is the first
-     * @exception IllegalArgumentException if <code>index</code> &lt; 0
+     * @throws IllegalArgumentException if <code>index</code> &lt; 0
      * @see Action
      */
     public void insert(Action a, int index) {
@@ -589,7 +589,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
      * @param component  the <code>Component</code> to insert
      * @param index      specifies the position at which
      *                   to insert the component, where 0 is the first
-     * @exception IllegalArgumentException if <code>index</code> &lt; 0
+     * @throws IllegalArgumentException if <code>index</code> &lt; 0
      */
     public void insert(Component component, int index) {
         if (index < 0) {
diff --git a/src/java.desktop/share/classes/javax/swing/JProgressBar.java b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
index 90945bb67e3..edba6e4a5da 100644
--- a/src/java.desktop/share/classes/javax/swing/JProgressBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
@@ -394,7 +394,7 @@ public class JProgressBar extends JComponent implements SwingConstants, Accessib
      * is {@code SwingConstants.HORIZONTAL}.
      *
      * @param  newOrientation  <code>HORIZONTAL</code> or <code>VERTICAL</code>
-     * @exception      IllegalArgumentException    if <code>newOrientation</code>
+     * @throws      IllegalArgumentException    if <code>newOrientation</code>
      *                                              is an illegal value
      * @see #getOrientation
      */
diff --git a/src/java.desktop/share/classes/javax/swing/JRootPane.java b/src/java.desktop/share/classes/javax/swing/JRootPane.java
index dcc6d6bb4ef..48e06a917fc 100644
--- a/src/java.desktop/share/classes/javax/swing/JRootPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JRootPane.java
@@ -578,7 +578,7 @@ public class JRootPane extends JComponent implements Accessible {
      * replace it with an opaque <code>JComponent</code>.
      *
      * @param content the <code>Container</code> to use for component-contents
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *            exception) if the content pane parameter is <code>null</code>
      */
     public void setContentPane(Container content) {
@@ -605,7 +605,7 @@ public class JRootPane extends JComponent implements Accessible {
      * typically holds a content pane and an optional <code>JMenuBar</code>.
      *
      * @param layered  the <code>JLayeredPane</code> to use
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *            exception) if the layered pane parameter is <code>null</code>
      */
     public void setLayeredPane(JLayeredPane layered) {
@@ -647,7 +647,7 @@ public class JRootPane extends JComponent implements Accessible {
      *
      * @param glass the <code>Component</code> to use as the glass pane
      *              for this <code>JRootPane</code>
-     * @exception NullPointerException if the <code>glass</code> parameter is
+     * @throws NullPointerException if the <code>glass</code> parameter is
      *          <code>null</code>
      */
     public void setGlassPane(Component glass) {
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollBar.java b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
index 6bb997a6150..ba65f21a954 100644
--- a/src/java.desktop/share/classes/javax/swing/JScrollBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
@@ -155,7 +155,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
      * That way, when the user jumps the knob to an adjacent position,
      * one or two lines of the original contents remain in view.
      *
-     * @exception IllegalArgumentException if orientation is not one of VERTICAL, HORIZONTAL
+     * @throws IllegalArgumentException if orientation is not one of VERTICAL, HORIZONTAL
      *
      * @see #setOrientation
      * @see #setValue
@@ -279,7 +279,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
      * HORIZONTAL.
      *
      * @param orientation an orientation of the {@code JScrollBar}
-     * @exception IllegalArgumentException if orientation is not one of VERTICAL, HORIZONTAL
+     * @throws IllegalArgumentException if orientation is not one of VERTICAL, HORIZONTAL
      * @see #getOrientation
      */
     @BeanProperty(preferred = true, visualUpdate = true, enumerationValues = {
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollPane.java b/src/java.desktop/share/classes/javax/swing/JScrollPane.java
index 2c3302178df..3d5385a34d1 100644
--- a/src/java.desktop/share/classes/javax/swing/JScrollPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollPane.java
@@ -418,7 +418,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
      * will invoke <code>syncWithScrollPane</code> on it.
      *
      * @param layout the specified layout manager
-     * @exception ClassCastException if layout is not a
+     * @throws ClassCastException if layout is not a
      *                  <code>ScrollPaneLayout</code>
      * @see java.awt.Container#getLayout
      * @see java.awt.Container#setLayout
@@ -476,7 +476,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
      * </ul>
      *
      * @param policy one of the three values listed above
-     * @exception IllegalArgumentException if <code>policy</code>
+     * @throws IllegalArgumentException if <code>policy</code>
      *                          is not one of the legal values shown above
      * @see #getVerticalScrollBarPolicy
      */
@@ -521,7 +521,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
      * </ul>
      *
      * @param policy one of the three values listed above
-     * @exception IllegalArgumentException if <code>policy</code>
+     * @throws IllegalArgumentException if <code>policy</code>
      *                          is not one of the legal values shown above
      * @see #getHorizontalScrollBarPolicy
      */
@@ -1195,7 +1195,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
      * <li>upperLeft
      * <li>upperRight
      * </ul>
-     * @exception IllegalArgumentException if corner key is invalid
+     * @throws IllegalArgumentException if corner key is invalid
      */
     public void setCorner(String key, Component corner)
     {
diff --git a/src/java.desktop/share/classes/javax/swing/JSeparator.java b/src/java.desktop/share/classes/javax/swing/JSeparator.java
index 69d17382acd..10a724a7e2e 100644
--- a/src/java.desktop/share/classes/javax/swing/JSeparator.java
+++ b/src/java.desktop/share/classes/javax/swing/JSeparator.java
@@ -97,7 +97,7 @@ public class JSeparator extends JComponent implements SwingConstants, Accessible
      * @param orientation an integer specifying
      *          <code>SwingConstants.HORIZONTAL</code> or
      *          <code>SwingConstants.VERTICAL</code>
-     * @exception IllegalArgumentException if <code>orientation</code>
+     * @throws IllegalArgumentException if <code>orientation</code>
      *          is neither <code>SwingConstants.HORIZONTAL</code> nor
      *          <code>SwingConstants.VERTICAL</code>
      */
@@ -190,7 +190,7 @@ public class JSeparator extends JComponent implements SwingConstants, Accessible
      * The default value of this property is HORIZONTAL.
      * @param orientation  either <code>SwingConstants.HORIZONTAL</code>
      *                  or <code>SwingConstants.VERTICAL</code>
-     * @exception IllegalArgumentException  if <code>orientation</code>
+     * @throws IllegalArgumentException  if <code>orientation</code>
      *          is neither <code>SwingConstants.HORIZONTAL</code>
      *          nor <code>SwingConstants.VERTICAL</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/JSlider.java b/src/java.desktop/share/classes/javax/swing/JSlider.java
index 0d826fe7e49..4682acb8a54 100644
--- a/src/java.desktop/share/classes/javax/swing/JSlider.java
+++ b/src/java.desktop/share/classes/javax/swing/JSlider.java
@@ -920,7 +920,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible {
      * @return a new {@code Hashtable} of labels
      * @see #setLabelTable
      * @see #setPaintLabels
-     * @exception IllegalArgumentException if {@code start} is
+     * @throws IllegalArgumentException if {@code start} is
      *          out of range, or if {@code increment} is less than or equal
      *          to zero
      */
diff --git a/src/java.desktop/share/classes/javax/swing/JSpinner.java b/src/java.desktop/share/classes/javax/swing/JSpinner.java
index a371c557439..245212131f2 100644
--- a/src/java.desktop/share/classes/javax/swing/JSpinner.java
+++ b/src/java.desktop/share/classes/javax/swing/JSpinner.java
@@ -1015,7 +1015,7 @@ public class JSpinner extends JComponent implements Accessible
          * on the new <code>JFormattedTextField</code>.
          *
          * @param spinner the spinner whose model <code>this</code> editor will monitor
-         * @exception IllegalArgumentException if the spinners model is not
+         * @throws IllegalArgumentException if the spinners model is not
          *     an instance of <code>SpinnerDateModel</code>
          *
          * @see #getModel
@@ -1039,7 +1039,7 @@ public class JSpinner extends JComponent implements Accessible
          * @param dateFormatPattern the initial pattern for the
          *     <code>SimpleDateFormat</code> object that's used to display
          *     and parse the value of the text field.
-         * @exception IllegalArgumentException if the spinners model is not
+         * @throws IllegalArgumentException if the spinners model is not
          *     an instance of <code>SpinnerDateModel</code>
          *
          * @see #getModel
@@ -1064,7 +1064,7 @@ public class JSpinner extends JComponent implements Accessible
          *        will monitor
          * @param format <code>DateFormat</code> object that's used to display
          *     and parse the value of the text field.
-         * @exception IllegalArgumentException if the spinners model is not
+         * @throws IllegalArgumentException if the spinners model is not
          *     an instance of <code>SpinnerDateModel</code>
          *
          * @see #getModel
@@ -1202,7 +1202,7 @@ public class JSpinner extends JComponent implements Accessible
          * on the new <code>JFormattedTextField</code>.
          *
          * @param spinner the spinner whose model <code>this</code> editor will monitor
-         * @exception IllegalArgumentException if the spinners model is not
+         * @throws IllegalArgumentException if the spinners model is not
          *     an instance of <code>SpinnerNumberModel</code>
          *
          * @see #getModel
@@ -1225,7 +1225,7 @@ public class JSpinner extends JComponent implements Accessible
          * @param decimalFormatPattern the initial pattern for the
          *     <code>DecimalFormat</code> object that's used to display
          *     and parse the value of the text field.
-         * @exception IllegalArgumentException if the spinners model is not
+         * @throws IllegalArgumentException if the spinners model is not
          *     an instance of <code>SpinnerNumberModel</code> or if
          *     <code>decimalFormatPattern</code> is not a legal
          *     argument to <code>DecimalFormat</code>
@@ -1251,7 +1251,7 @@ public class JSpinner extends JComponent implements Accessible
          * @param format the initial pattern for the
          *     <code>DecimalFormat</code> object that's used to display
          *     and parse the value of the text field.
-         * @exception IllegalArgumentException if the spinners model is not
+         * @throws IllegalArgumentException if the spinners model is not
          *     an instance of <code>SpinnerNumberModel</code>
          *
          * @see #getTextField
@@ -1346,7 +1346,7 @@ public class JSpinner extends JComponent implements Accessible
          * on the new <code>JFormattedTextField</code>.
          *
          * @param spinner the spinner whose model <code>this</code> editor will monitor
-         * @exception IllegalArgumentException if the spinners model is not
+         * @throws IllegalArgumentException if the spinners model is not
          *     an instance of <code>SpinnerListModel</code>
          *
          * @see #getModel
diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index bd5e85ed4a6..5a3cfef943e 100644
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -262,7 +262,7 @@ public class JSplitPane extends JComponent implements Accessible
      *
      * @param newOrientation  <code>JSplitPane.HORIZONTAL_SPLIT</code> or
      *                        <code>JSplitPane.VERTICAL_SPLIT</code>
-     * @exception IllegalArgumentException if <code>orientation</code>
+     * @throws IllegalArgumentException if <code>orientation</code>
      *          is not one of HORIZONTAL_SPLIT or VERTICAL_SPLIT.
      */
     @ConstructorProperties({"orientation"})
@@ -281,7 +281,7 @@ public class JSplitPane extends JComponent implements Accessible
      * @param newContinuousLayout  a boolean, true for the components to
      *        redraw continuously as the divider changes position, false
      *        to wait until the divider position stops changing to redraw
-     * @exception IllegalArgumentException if <code>orientation</code>
+     * @throws IllegalArgumentException if <code>orientation</code>
      *          is not one of HORIZONTAL_SPLIT or VERTICAL_SPLIT
      */
     public JSplitPane(int newOrientation,
@@ -304,7 +304,7 @@ public class JSplitPane extends JComponent implements Accessible
      *          appear on the right
      *          of a horizontally-split pane, or at the bottom of a
      *          vertically-split pane
-     * @exception IllegalArgumentException if <code>orientation</code>
+     * @throws IllegalArgumentException if <code>orientation</code>
      *          is not one of: HORIZONTAL_SPLIT or VERTICAL_SPLIT
      */
     public JSplitPane(int newOrientation,
@@ -334,7 +334,7 @@ public class JSplitPane extends JComponent implements Accessible
      *          appear on the right
      *          of a horizontally-split pane, or at the bottom of a
      *          vertically-split pane
-     * @exception IllegalArgumentException if <code>orientation</code>
+     * @throws IllegalArgumentException if <code>orientation</code>
      *          is not one of HORIZONTAL_SPLIT or VERTICAL_SPLIT
      */
     public JSplitPane(int newOrientation,
@@ -622,7 +622,7 @@ public class JSplitPane extends JComponent implements Accessible
      * </ul>
      *
      * @param orientation an integer specifying the orientation
-     * @exception IllegalArgumentException if orientation is not one of:
+     * @throws IllegalArgumentException if orientation is not one of:
      *        HORIZONTAL_SPLIT or VERTICAL_SPLIT.
      */
     @BeanProperty(enumerationValues = {
@@ -701,7 +701,7 @@ public class JSplitPane extends JComponent implements Accessible
      * extra space.
      *
      * @param value as described above
-     * @exception IllegalArgumentException if <code>value</code> is &lt; 0 or &gt; 1
+     * @throws IllegalArgumentException if <code>value</code> is &lt; 0 or &gt; 1
      * @since 1.3
      */
     @BeanProperty(description
@@ -754,7 +754,7 @@ public class JSplitPane extends JComponent implements Accessible
      * @param proportionalLocation  a double-precision floating point value
      *        that specifies a percentage, from zero (top/left) to 1.0
      *        (bottom/right)
-     * @exception IllegalArgumentException if the specified location is &lt; 0
+     * @throws IllegalArgumentException if the specified location is &lt; 0
      *            or &gt; 1.0
      */
     @BeanProperty(description
@@ -964,7 +964,7 @@ public class JSplitPane extends JComponent implements Accessible
      *                    (position) for this component
      * @param index       an integer specifying the index in the container's
      *                    list.
-     * @exception IllegalArgumentException  if the <code>constraints</code>
+     * @throws IllegalArgumentException  if the <code>constraints</code>
      *          object does not match an existing component
      * @see java.awt.Container#addImpl(Component, Object, int)
      */
diff --git a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
index 4acf4f8a930..2bdd93a7e8d 100644
--- a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
@@ -215,7 +215,7 @@ public class JTabbedPane extends JComponent
      *
      * @param tabPlacement the placement for the tabs relative to the content
      * @param tabLayoutPolicy the policy for laying out tabs when all tabs will not fit on one run
-     * @exception IllegalArgumentException if tab placement or tab layout policy are not
+     * @throws IllegalArgumentException if tab placement or tab layout policy are not
      *            one of the above supported values
      * @see #addTab
      * @since 1.4
@@ -505,7 +505,7 @@ public class JTabbedPane extends JComponent
      * The default value, if not set, is <code>SwingConstants.TOP</code>.
      *
      * @param tabPlacement the placement for the tabs relative to the content
-     * @exception IllegalArgumentException if tab placement value isn't one
+     * @throws IllegalArgumentException if tab placement value isn't one
      *                          of the above valid values
      */
     @BeanProperty(preferred = true, visualUpdate = true, enumerationValues = {
@@ -561,7 +561,7 @@ public class JTabbedPane extends JComponent
      * ignored.
      *
      * @param tabLayoutPolicy the policy used to layout the tabs
-     * @exception IllegalArgumentException if layoutPolicy value isn't one
+     * @throws IllegalArgumentException if layoutPolicy value isn't one
      *                          of the above valid values
      * @see #getTabLayoutPolicy
      * @since 1.4
@@ -609,7 +609,7 @@ public class JTabbedPane extends JComponent
      * the results will be implementation defined.
      *
      * @param index  the index to be selected
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < -1 || index >= tab count)}
      *
      * @see #getSelectedIndex
@@ -696,7 +696,7 @@ public class JTabbedPane extends JComponent
      * corresponding to the specified component.
      *
      * @param c the selected {@code Component} for this {@code TabbedPane}
-     * @exception IllegalArgumentException if component not found in tabbed
+     * @throws IllegalArgumentException if component not found in tabbed
      *          pane
      * @see #getSelectedComponent
      */
@@ -963,7 +963,7 @@ public class JTabbedPane extends JComponent
      * its visibility is reset to true to ensure it will be visible
      * if added to other containers.
      * @param index the index of the tab to be removed
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #addTab
@@ -1084,7 +1084,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the index of the component to remove from the
      *          <code>tabbedpane</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      * @see #addTab
      * @see #removeTabAt
@@ -1148,7 +1148,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index  the index of the item being queried
      * @return the title at <code>index</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      * @see #setTitleAt
      */
@@ -1161,7 +1161,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index  the index of the item being queried
      * @return the icon at <code>index</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setIconAt
@@ -1180,7 +1180,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index  the index of the item being queried
      * @return the icon at <code>index</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setDisabledIconAt
@@ -1198,7 +1198,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index  the index of the item being queried
      * @return a string containing the tool tip text at <code>index</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setToolTipTextAt
@@ -1214,7 +1214,7 @@ public class JTabbedPane extends JComponent
      * @param index  the index of the item being queried
      * @return the <code>Color</code> of the tab background at
      *          <code>index</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setBackgroundAt
@@ -1229,7 +1229,7 @@ public class JTabbedPane extends JComponent
      * @param index  the index of the item being queried
      * @return the <code>Color</code> of the tab foreground at
      *          <code>index</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setForegroundAt
@@ -1245,7 +1245,7 @@ public class JTabbedPane extends JComponent
      * @param index  the index of the item being queried
      * @return true if the tab at <code>index</code> is enabled;
      *          false otherwise
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setEnabledAt
@@ -1259,7 +1259,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index  the index of the item being queried
      * @return the <code>Component</code> at <code>index</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setComponentAt
@@ -1278,7 +1278,7 @@ public class JTabbedPane extends JComponent
      * @param tabIndex the index of the tab that the mnemonic refers to
      * @return the key code which represents the mnemonic;
      *         -1 if a mnemonic is not specified for the tab
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            (<code>tabIndex</code> &lt; 0 ||
      *              <code>tabIndex</code> &gt;= tab count)
      * @see #setDisplayedMnemonicIndexAt(int,int)
@@ -1299,7 +1299,7 @@ public class JTabbedPane extends JComponent
      * @param tabIndex the index of the tab that the mnemonic refers to
      * @return index representing mnemonic character if one exists;
      *    otherwise returns -1
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            (<code>tabIndex</code> &lt; 0 ||
      *              <code>tabIndex</code> &gt;= tab count)
      * @see #setDisplayedMnemonicIndexAt(int,int)
@@ -1324,7 +1324,7 @@ public class JTabbedPane extends JComponent
      *          <code>index</code>, or <code>null</code> if tab at
      *          <code>index</code> is not currently visible in the UI,
      *          or if there is no UI set on this <code>tabbedpane</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      */
     public Rectangle getBoundsAt(int index) {
@@ -1346,7 +1346,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the tab index where the title should be set
      * @param title the title to be displayed in the tab
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #getTitleAt
@@ -1386,7 +1386,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the tab index where the icon should be set
      * @param icon the icon to be displayed in the tab
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setDisabledIconAt
@@ -1428,7 +1428,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the tab index where the disabled icon should be set
      * @param disabledIcon the icon to be displayed in the tab when disabled
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #getDisabledIconAt
@@ -1451,7 +1451,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the tab index where the tooltip text should be set
      * @param toolTipText the tooltip text to be displayed for the tab
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #getToolTipTextAt
@@ -1486,7 +1486,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the tab index where the background should be set
      * @param background the color to be displayed in the tab's background
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #getBackgroundAt
@@ -1517,7 +1517,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the tab index where the foreground should be set
      * @param foreground the color to be displayed as the tab's foreground
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #getForegroundAt
@@ -1542,7 +1542,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the tab index which should be enabled/disabled
      * @param enabled whether or not the tab should be enabled
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #isEnabledAt
@@ -1562,7 +1562,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index the tab index where this component is being placed
      * @param component the component for the tab
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #getComponentAt
@@ -1638,10 +1638,10 @@ public class JTabbedPane extends JComponent
      * @since 1.4
      * @param tabIndex the index of the tab that the mnemonic refers to
      * @param mnemonicIndex index into the <code>String</code> to underline
-     * @exception IndexOutOfBoundsException if <code>tabIndex</code> is
+     * @throws IndexOutOfBoundsException if <code>tabIndex</code> is
      *            out of range ({@code tabIndex < 0 || tabIndex >= tab
      *            count})
-     * @exception IllegalArgumentException will be thrown if
+     * @throws IllegalArgumentException will be thrown if
      *            <code>mnemonicIndex</code> is &gt;= length of the tab
      *            title , or &lt; -1
      * @see #setMnemonicAt(int,int)
@@ -1678,7 +1678,7 @@ public class JTabbedPane extends JComponent
      * @since 1.4
      * @param tabIndex the index of the tab that the mnemonic refers to
      * @param mnemonic the key code which represents the mnemonic
-     * @exception IndexOutOfBoundsException if <code>tabIndex</code> is out
+     * @throws IndexOutOfBoundsException if <code>tabIndex</code> is out
      *            of range ({@code tabIndex < 0 || tabIndex >= tab count})
      * @see #getMnemonicAt(int)
      * @see #setDisplayedMnemonicIndexAt(int,int)
@@ -2001,7 +2001,7 @@ public class JTabbedPane extends JComponent
          *
          * @param i zero-based index of child
          * @return the Accessible child of the object
-         * @exception IllegalArgumentException if index is out of bounds
+         * @throws IllegalArgumentException if index is out of bounds
          */
         public Accessible getAccessibleChild(int i) {
             if (i < 0 || i >= getTabCount()) {
@@ -2426,9 +2426,9 @@ public class JTabbedPane extends JComponent
     * @param index the tab index where the component should be set
     * @param component the component to render the title for the
     *                  specified tab
-    * @exception IndexOutOfBoundsException if index is out of range
+    * @throws IndexOutOfBoundsException if index is out of range
     *            {@code (index < 0 || index >= tab count)}
-    * @exception IllegalArgumentException if component has already been
+    * @throws IllegalArgumentException if component has already been
     *            added to this <code>JTabbedPane</code>
     *
     * @see #getTabComponentAt
@@ -2456,7 +2456,7 @@ public class JTabbedPane extends JComponent
      *
      * @param index  the index of the item being queried
      * @return the tab component at <code>index</code>
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            {@code (index < 0 || index >= tab count)}
      *
      * @see #setTabComponentAt
diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index c70ec2f935e..5d27be29454 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -991,7 +991,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * the row margin.
      *
      * @param   rowHeight                       new row height
-     * @exception IllegalArgumentException      if <code>rowHeight</code> is
+     * @throws IllegalArgumentException      if <code>rowHeight</code> is
      *                                          less than 1
      * @see     #getRowHeight
      */
@@ -1037,7 +1037,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * @param   row                             the row whose height is being
                                                 changed
      * @param   rowHeight                       new row height, in pixels
-     * @exception IllegalArgumentException      if <code>rowHeight</code> is
+     * @throws IllegalArgumentException      if <code>rowHeight</code> is
      *                                          less than 1
      * @since 1.3
      */
@@ -1126,7 +1126,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * The default color is look and feel dependent.
      *
      * @param   gridColor                       the new color of the grid lines
-     * @exception IllegalArgumentException      if <code>gridColor</code> is <code>null</code>
+     * @throws IllegalArgumentException      if <code>gridColor</code> is <code>null</code>
      * @see     #getGridColor
      */
     @BeanProperty(description
@@ -1485,7 +1485,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * table's {@code TransferHandler}.
      *
      * @param b whether or not to enable automatic drag handling
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *            <code>b</code> is <code>true</code> and
      *            <code>GraphicsEnvironment.isHeadless()</code>
      *            returns <code>true</code>
@@ -2220,7 +2220,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * Selects the rows from <code>index0</code> to <code>index1</code>,
      * inclusive.
      *
-     * @exception IllegalArgumentException      if <code>index0</code> or
+     * @throws IllegalArgumentException      if <code>index0</code> or
      *                                          <code>index1</code> lie outside
      *                                          [0, <code>getRowCount()</code>-1]
      * @param   index0 one end of the interval
@@ -2234,7 +2234,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * Selects the columns from <code>index0</code> to <code>index1</code>,
      * inclusive.
      *
-     * @exception IllegalArgumentException      if <code>index0</code> or
+     * @throws IllegalArgumentException      if <code>index0</code> or
      *                                          <code>index1</code> lie outside
      *                                          [0, <code>getColumnCount()</code>-1]
      * @param   index0 one end of the interval
@@ -2248,7 +2248,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * Adds the rows from <code>index0</code> to <code>index1</code>, inclusive, to
      * the current selection.
      *
-     * @exception IllegalArgumentException      if <code>index0</code> or <code>index1</code>
+     * @throws IllegalArgumentException      if <code>index0</code> or <code>index1</code>
      *                                          lie outside [0, <code>getRowCount()</code>-1]
      * @param   index0 one end of the interval
      * @param   index1 the other end of the interval
@@ -2261,7 +2261,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * Adds the columns from <code>index0</code> to <code>index1</code>,
      * inclusive, to the current selection.
      *
-     * @exception IllegalArgumentException      if <code>index0</code> or
+     * @throws IllegalArgumentException      if <code>index0</code> or
      *                                          <code>index1</code> lie outside
      *                                          [0, <code>getColumnCount()</code>-1]
      * @param   index0 one end of the interval
@@ -2274,7 +2274,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
     /**
      * Deselects the rows from <code>index0</code> to <code>index1</code>, inclusive.
      *
-     * @exception IllegalArgumentException      if <code>index0</code> or
+     * @throws IllegalArgumentException      if <code>index0</code> or
      *                                          <code>index1</code> lie outside
      *                                          [0, <code>getRowCount()</code>-1]
      * @param   index0 one end of the interval
@@ -2287,7 +2287,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
     /**
      * Deselects the columns from <code>index0</code> to <code>index1</code>, inclusive.
      *
-     * @exception IllegalArgumentException      if <code>index0</code> or
+     * @throws IllegalArgumentException      if <code>index0</code> or
      *                                          <code>index1</code> lie outside
      *                                          [0, <code>getColumnCount()</code>-1]
      * @param   index0 one end of the interval
@@ -2596,7 +2596,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * <code>equals</code>.
      *
      * @return  the <code>TableColumn</code> object that matches the identifier
-     * @exception IllegalArgumentException      if <code>identifier</code> is <code>null</code> or no <code>TableColumn</code> has this identifier
+     * @throws IllegalArgumentException      if <code>identifier</code> is <code>null</code> or no <code>TableColumn</code> has this identifier
      *
      * @param   identifier                      the identifier object
      */
@@ -8355,7 +8355,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
              *
              * @return this component's locale; if this component does
              *    not have a locale, the locale of its parent is returned
-             * @exception IllegalComponentStateException if the
+             * @throws IllegalComponentStateException if the
              *    <code>Component</code> does not have its own locale
              *    and has not yet been added to a containment hierarchy
              *    such that the locale can be determined from the
@@ -9161,7 +9161,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
              *
              * @return this component's locale; if this component does
              *    not have a locale, the locale of its parent is returned
-             * @exception IllegalComponentStateException if the
+             * @throws IllegalComponentStateException if the
              *    <code>Component</code> does not have its own locale
              *    and has not yet been added to a containment hierarchy
              *    such that the locale can be determined from the
diff --git a/src/java.desktop/share/classes/javax/swing/JTextArea.java b/src/java.desktop/share/classes/javax/swing/JTextArea.java
index ecc9342f05a..03b3bc7e9bd 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextArea.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextArea.java
@@ -166,7 +166,7 @@ public class JTextArea extends JTextComponent {
      *
      * @param rows the number of rows &gt;= 0
      * @param columns the number of columns &gt;= 0
-     * @exception IllegalArgumentException if the rows or columns
+     * @throws IllegalArgumentException if the rows or columns
      *  arguments are negative.
      */
     public JTextArea(int rows, int columns) {
@@ -180,7 +180,7 @@ public class JTextArea extends JTextComponent {
      * @param text the text to be displayed, or null
      * @param rows the number of rows &gt;= 0
      * @param columns the number of columns &gt;= 0
-     * @exception IllegalArgumentException if the rows or columns
+     * @throws IllegalArgumentException if the rows or columns
      *  arguments are negative.
      */
     public JTextArea(String text, int rows, int columns) {
@@ -206,7 +206,7 @@ public class JTextArea extends JTextComponent {
      * @param text the text to be displayed, null if none
      * @param rows the number of rows &gt;= 0
      * @param columns the number of columns &gt;= 0
-     * @exception IllegalArgumentException if the rows or columns
+     * @throws IllegalArgumentException if the rows or columns
      *  arguments are negative.
      */
     public JTextArea(Document doc, String text, int rows, int columns) {
@@ -370,7 +370,7 @@ public class JTextArea extends JTextComponent {
      *
      * @param offset the offset &gt;= 0
      * @return the line number &gt;= 0
-     * @exception BadLocationException thrown if the offset is
+     * @throws BadLocationException thrown if the offset is
      *   less than zero or greater than the document length.
      */
     public int getLineOfOffset(int offset) throws BadLocationException {
@@ -401,7 +401,7 @@ public class JTextArea extends JTextComponent {
      *
      * @param line  the line number to translate &gt;= 0
      * @return the offset &gt;= 0
-     * @exception BadLocationException thrown if the line is
+     * @throws BadLocationException thrown if the line is
      * less than zero or greater or equal to the number of
      * lines contained in the document (as reported by
      * getLineCount).
@@ -424,7 +424,7 @@ public class JTextArea extends JTextComponent {
      *
      * @param line  the line &gt;= 0
      * @return the offset &gt;= 0
-     * @exception BadLocationException Thrown if the line is
+     * @throws BadLocationException Thrown if the line is
      * less than zero or greater or equal to the number of
      * lines contained in the document (as reported by
      * getLineCount).
@@ -452,7 +452,7 @@ public class JTextArea extends JTextComponent {
      *
      * @param str the text to insert
      * @param pos the position at which to insert &gt;= 0
-     * @exception IllegalArgumentException  if pos is an
+     * @throws IllegalArgumentException  if pos is an
      *  invalid position in the model
      * @see TextComponent#setText
      * @see #replaceRange
@@ -493,7 +493,7 @@ public class JTextArea extends JTextComponent {
      * @param str the text to use as the replacement
      * @param start the start position &gt;= 0
      * @param end the end position &gt;= start
-     * @exception IllegalArgumentException  if part of the range is an
+     * @throws IllegalArgumentException  if part of the range is an
      *  invalid position in the model
      * @see #insert
      */
@@ -532,7 +532,7 @@ public class JTextArea extends JTextComponent {
      * setting the new value.
      *
      * @param rows the number of rows &gt;= 0
-     * @exception IllegalArgumentException if rows is less than 0
+     * @throws IllegalArgumentException if rows is less than 0
      * @see #getRows
      */
     @BeanProperty(bound = false, description
@@ -576,7 +576,7 @@ public class JTextArea extends JTextComponent {
      * after setting the new value.
      *
      * @param columns the number of columns &gt;= 0
-     * @exception IllegalArgumentException if columns is less than 0
+     * @throws IllegalArgumentException if columns is less than 0
      * @see #getColumns
      */
     @BeanProperty(bound = false, description
@@ -726,7 +726,7 @@ public class JTextArea extends JTextComponent {
      * @param direction Less than zero to scroll up/left,
      *   greater than zero for down/right.
      * @return The "unit" increment for scrolling in the specified direction
-     * @exception IllegalArgumentException for an invalid orientation
+     * @throws IllegalArgumentException for an invalid orientation
      * @see JScrollBar#setUnitIncrement
      * @see #getRowHeight
      * @see #getColumnWidth
diff --git a/src/java.desktop/share/classes/javax/swing/JTextField.java b/src/java.desktop/share/classes/javax/swing/JTextField.java
index 3abe09d0565..0d66209d8af 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextField.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextField.java
@@ -242,7 +242,7 @@ public class JTextField extends JTextComponent implements SwingConstants {
      *   the preferred width &gt;= 0; if <code>columns</code>
      *   is set to zero, the preferred width will be whatever
      *   naturally results from the component implementation
-     * @exception IllegalArgumentException if <code>columns</code> &lt; 0
+     * @throws IllegalArgumentException if <code>columns</code> &lt; 0
      */
     public JTextField(Document doc, String text, int columns) {
         if (columns < 0) {
@@ -343,7 +343,7 @@ public class JTextField extends JTextComponent implements SwingConstants {
      * and a <code>PropertyChange</code> event ("horizontalAlignment") is fired.
      *
      * @param alignment the alignment
-     * @exception IllegalArgumentException if <code>alignment</code>
+     * @throws IllegalArgumentException if <code>alignment</code>
      *  is not a valid key
      */
      @BeanProperty(preferred = true, enumerationValues = {
@@ -393,7 +393,7 @@ public class JTextField extends JTextComponent implements SwingConstants {
      * and then invalidate the layout.
      *
      * @param columns the number of columns &gt;= 0
-     * @exception IllegalArgumentException if <code>columns</code>
+     * @throws IllegalArgumentException if <code>columns</code>
      *          is less than 0
      */
     @BeanProperty(bound = false, description
diff --git a/src/java.desktop/share/classes/javax/swing/JTextPane.java b/src/java.desktop/share/classes/javax/swing/JTextPane.java
index 41e16034c23..228181f31f7 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextPane.java
@@ -138,7 +138,7 @@ public class JTextPane extends JEditorPane {
      * must be a <code>StyledDocument</code>.
      *
      * @param doc  the document to display/edit
-     * @exception IllegalArgumentException  if <code>doc</code> can't
+     * @throws IllegalArgumentException  if <code>doc</code> can't
      *   be narrowed to a <code>StyledDocument</code> which is the
      *   required type of model for this text component
      */
@@ -480,7 +480,7 @@ public class JTextPane extends JEditorPane {
      * establishes the content type of the editor.
      *
      * @param kit the desired editor behavior
-     * @exception IllegalArgumentException if kit is not a
+     * @throws IllegalArgumentException if kit is not a
      *          <code>StyledEditorKit</code>
      */
     public final void setEditorKit(EditorKit kit) {
diff --git a/src/java.desktop/share/classes/javax/swing/JToolBar.java b/src/java.desktop/share/classes/javax/swing/JToolBar.java
index 114ef0d169c..4d93a1bceef 100644
--- a/src/java.desktop/share/classes/javax/swing/JToolBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JToolBar.java
@@ -142,7 +142,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
      * @param name  the name of the tool bar
      * @param orientation  the initial orientation -- it must be
      *          either <code>HORIZONTAL</code> or <code>VERTICAL</code>
-     * @exception IllegalArgumentException if orientation is neither
+     * @throws IllegalArgumentException if orientation is neither
      *          <code>HORIZONTAL</code> nor <code>VERTICAL</code>
      * @since 1.3
      */
@@ -406,7 +406,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
      *
      * @param o  the new orientation -- either <code>HORIZONTAL</code> or
      *                  <code>VERTICAL</code>
-     * @exception IllegalArgumentException if orientation is neither
+     * @throws IllegalArgumentException if orientation is neither
      *          <code>HORIZONTAL</code> nor <code>VERTICAL</code>
      * @see #getOrientation
      */
diff --git a/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java
index ae90ea8be8b..e6e591bad27 100644
--- a/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -1251,7 +1251,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
      * tree's {@code TransferHandler}.
      *
      * @param b whether or not to enable automatic drag handling
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *            <code>b</code> is <code>true</code> and
      *            <code>GraphicsEnvironment.isHeadless()</code>
      *            returns <code>true</code>
@@ -3087,7 +3087,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
      * Position.Bias.Forward or Position.Bias.Backward.
      * @return the TreePath of the next tree element that
      * starts with the prefix; otherwise null
-     * @exception IllegalArgumentException if prefix is null
+     * @throws IllegalArgumentException if prefix is null
      * or startingRow is out of bounds
      * @since 1.4
      */
@@ -5053,7 +5053,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
              *
              * @return This component's locale. If this component does not have
              * a locale, the locale of its parent is returned.
-             * @exception IllegalComponentStateException
+             * @throws IllegalComponentStateException
              * If the Component does not have its own locale and has not yet
              * been added to a containment hierarchy such that the locale can be
              * determined from the containing parent.
diff --git a/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java
index e3974a84f27..ff082acc694 100644
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -565,7 +565,7 @@ public class JViewport extends JComponent implements Accessible
      * a <code>JViewPort</code>.
      *
      * @param border the <code>Border</code> to set
-     * @exception IllegalArgumentException this method is not implemented
+     * @throws IllegalArgumentException this method is not implemented
      */
     public final void setBorder(Border border) {
         if (border != null) {
diff --git a/src/java.desktop/share/classes/javax/swing/JWindow.java b/src/java.desktop/share/classes/javax/swing/JWindow.java
index 69269c9f284..a306ea6d4ea 100644
--- a/src/java.desktop/share/classes/javax/swing/JWindow.java
+++ b/src/java.desktop/share/classes/javax/swing/JWindow.java
@@ -387,10 +387,10 @@ public class JWindow extends Window implements Accessible,
      * @param comp the component to be enhanced
      * @param constraints the constraints to be respected
      * @param index the index
-     * @exception IllegalArgumentException if <code>index</code> is invalid
-     * @exception IllegalArgumentException if adding the container's parent
+     * @throws IllegalArgumentException if <code>index</code> is invalid
+     * @throws IllegalArgumentException if adding the container's parent
      *                  to itself
-     * @exception IllegalArgumentException if adding a window to a container
+     * @throws IllegalArgumentException if adding a window to a container
      *
      * @see #setRootPaneCheckingEnabled
      * @see javax.swing.RootPaneContainer
@@ -504,7 +504,7 @@ public class JWindow extends Window implements Accessible,
      *
      * @param contentPane the new <code>contentPane</code>
      *
-     * @exception IllegalComponentStateException (a runtime
+     * @throws IllegalComponentStateException (a runtime
      *            exception) if the content pane parameter is <code>null</code>
      * @see #getContentPane
      * @see RootPaneContainer#setContentPane
@@ -532,7 +532,7 @@ public class JWindow extends Window implements Accessible,
      *
      * @param layeredPane the new <code>layeredPane</code> object
      *
-     * @exception IllegalComponentStateException (a runtime
+     * @throws IllegalComponentStateException (a runtime
      *            exception) if the content pane parameter is <code>null</code>
      * @see #getLayeredPane
      * @see RootPaneContainer#setLayeredPane
diff --git a/src/java.desktop/share/classes/javax/swing/OverlayLayout.java b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
index 0067f6fd6bd..71ca34f1aa0 100644
--- a/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
@@ -217,7 +217,7 @@ public class OverlayLayout implements LayoutManager2,Serializable {
      *
      * @param target  the container to lay out
      *
-     * @exception AWTError  if the target isn't the container specified to the
+     * @throws AWTError  if the target isn't the container specified to the
      *                      constructor
      */
     public void layoutContainer(Container target) {
diff --git a/src/java.desktop/share/classes/javax/swing/Popup.java b/src/java.desktop/share/classes/javax/swing/Popup.java
index 605ecd6fd78..15c90ad3be7 100644
--- a/src/java.desktop/share/classes/javax/swing/Popup.java
+++ b/src/java.desktop/share/classes/javax/swing/Popup.java
@@ -82,7 +82,7 @@ public class Popup {
      * @param contents Contents of the Popup
      * @param x        Initial x screen coordinate
      * @param y        Initial y screen coordinate
-     * @exception IllegalArgumentException if contents is null
+     * @throws IllegalArgumentException if contents is null
      */
     protected Popup(Component owner, Component contents, int x, int y) {
         this();
diff --git a/src/java.desktop/share/classes/javax/swing/PopupFactory.java b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
index 462675fa828..a30aba6f2fc 100644
--- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
@@ -127,7 +127,7 @@ public class PopupFactory {
      * <code>factory</code> is null.
      *
      * @param factory Shared PopupFactory
-     * @exception IllegalArgumentException if <code>factory</code> is null
+     * @throws IllegalArgumentException if <code>factory</code> is null
      * @see #getPopup
      */
     public static void setSharedInstance(PopupFactory factory) {
@@ -186,7 +186,7 @@ public class PopupFactory {
      * @param contents Contents of the Popup
      * @param x        Initial x screen coordinate
      * @param y        Initial y screen coordinate
-     * @exception IllegalArgumentException if contents is null
+     * @throws IllegalArgumentException if contents is null
      * @return Popup containing Contents
      */
     public Popup getPopup(Component owner, Component contents,
diff --git a/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java b/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
index 8733d5b3cfe..6f2d1eda4b6 100644
--- a/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
+++ b/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
@@ -794,7 +794,7 @@ public class ProgressMonitor implements Accessible
          * @return this component's locale.  If this component does not have
          * a locale, the locale of its parent is returned.
          *
-         * @exception IllegalComponentStateException
+         * @throws IllegalComponentStateException
          * If the Component does not have its own locale and has not yet been
          * added to a containment hierarchy such that the locale can be
          * determined from the containing parent.
diff --git a/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java b/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
index 76dc2286f87..b05e0c52e55 100644
--- a/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
+++ b/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
@@ -103,7 +103,7 @@ public interface RootPaneContainer
      * Generally implemented with
      * <code>getRootPane().setContentPane(contentPane);</code>
      *
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *            exception) if the content pane parameter is null
      * @param contentPane the Container to use for the contents of this
      *        JRootPane
@@ -134,7 +134,7 @@ public interface RootPaneContainer
      *    getRootPane().setLayeredPane(layeredPane);</pre>
      *
      * @param layeredPane the layered pane
-     * @exception java.awt.IllegalComponentStateException (a runtime
+     * @throws java.awt.IllegalComponentStateException (a runtime
      *            exception) if the layered pane parameter is null
      * @see #getLayeredPane
      * @see JRootPane#getLayeredPane
diff --git a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
index 9f9e6660666..0b8d8576f14 100644
--- a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
@@ -230,7 +230,7 @@ public class ScrollPaneLayout
      *
      * @param s the component identifier
      * @param c the component to be added
-     * @exception IllegalArgumentException if <code>s</code> is an invalid key
+     * @throws IllegalArgumentException if <code>s</code> is an invalid key
      */
     public void addLayoutComponent(String s, Component c)
     {
@@ -328,7 +328,7 @@ public class ScrollPaneLayout
      * with the Swing 1.0.2 (and earlier) versions of this class.
      *
      * @param x an integer giving the display policy
-     * @exception IllegalArgumentException if <code>x</code> is an invalid
+     * @throws IllegalArgumentException if <code>x</code> is an invalid
      *          vertical scroll bar policy, as listed above
      */
     public void setVerticalScrollBarPolicy(int x) {
@@ -366,7 +366,7 @@ public class ScrollPaneLayout
      * with the Swing 1.0.2 (and earlier) versions of this class.
      *
      * @param x an int giving the display policy
-     * @exception IllegalArgumentException if <code>x</code> is not a valid
+     * @throws IllegalArgumentException if <code>x</code> is not a valid
      *          horizontal scrollbar policy, as listed above
      */
     public void setHorizontalScrollBarPolicy(int x) {
diff --git a/src/java.desktop/share/classes/javax/swing/SizeSequence.java b/src/java.desktop/share/classes/javax/swing/SizeSequence.java
index 899a64570f3..c6877dc8b2b 100644
--- a/src/java.desktop/share/classes/javax/swing/SizeSequence.java
+++ b/src/java.desktop/share/classes/javax/swing/SizeSequence.java
@@ -142,7 +142,7 @@ public class SizeSequence {
      * all initialized to have size 0.
      *
      * @param numEntries  the number of sizes to track
-     * @exception NegativeArraySizeException if
+     * @throws NegativeArraySizeException if
      *    <code>numEntries &lt; 0</code>
      */
     public SizeSequence(int numEntries) {
@@ -355,7 +355,7 @@ public class SizeSequence {
      *                in the group
      * @param length  the number of entries in the group
      * @param value   the size to be assigned to each new entry
-     * @exception ArrayIndexOutOfBoundsException if the parameters
+     * @throws ArrayIndexOutOfBoundsException if the parameters
      *   are outside of the range:
      *   (<code>0 &lt;= start &lt; (getSizes().length)) AND (length &gt;= 0)</code>
      */
diff --git a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
index 5e3965e69b8..1d58541dfee 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
@@ -1466,10 +1466,10 @@ public class SwingUtilities implements SwingConstants
      * <code>java.awt.EventQueue.invokeAndWait()</code>.
      *
      * @param doRun the instance of {@code Runnable}
-     * @exception  InterruptedException if we're interrupted while waiting for
+     * @throws  InterruptedException if we're interrupted while waiting for
      *             the event dispatching thread to finish executing
      *             <code>doRun.run()</code>
-     * @exception  InvocationTargetException  if an exception is thrown
+     * @throws  InvocationTargetException  if an exception is thrown
      *             while running <code>doRun</code>
      *
      * @see #invokeLater
@@ -1984,7 +1984,7 @@ public class SwingUtilities implements SwingConstants
      * Returns a toolkit-private, shared, invisible Frame
      * to be the owner for JDialogs and JWindows created with
      * {@code null} owners.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -2002,7 +2002,7 @@ public class SwingUtilities implements SwingConstants
     /**
      * Returns a SharedOwnerFrame's shutdown listener to dispose the SharedOwnerFrame
      * if it has no more displayable children.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
diff --git a/src/java.desktop/share/classes/javax/swing/Timer.java b/src/java.desktop/share/classes/javax/swing/Timer.java
index 6b4f95be108..ced691f4e06 100644
--- a/src/java.desktop/share/classes/javax/swing/Timer.java
+++ b/src/java.desktop/share/classes/javax/swing/Timer.java
@@ -341,7 +341,7 @@ public class Timer implements Serializable
      *          on this timer,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code> doesn't
+     * @throws ClassCastException if <code>listenerType</code> doesn't
      *          specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/TransferHandler.java b/src/java.desktop/share/classes/javax/swing/TransferHandler.java
index f2622880e7f..445234e4bda 100644
--- a/src/java.desktop/share/classes/javax/swing/TransferHandler.java
+++ b/src/java.desktop/share/classes/javax/swing/TransferHandler.java
@@ -1172,9 +1172,9 @@ public class TransferHandler implements Serializable {
          *
          * @param flavor the requested flavor for the data
          * @see DataFlavor#getRepresentationClass
-         * @exception IOException                if the data is no longer available
+         * @throws IOException                if the data is no longer available
          *              in the requested flavor.
-         * @exception UnsupportedFlavorException if the requested data flavor is
+         * @throws UnsupportedFlavorException if the requested data flavor is
          *              not supported.
          */
         public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
index 2f2163c8939..9a428492512 100644
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -161,7 +161,7 @@ public abstract class AbstractColorChooserPanel extends JPanel {
      * If you override this, be sure to call <code>super</code>.
      *
      * @param enclosingChooser the chooser to which the panel is to be added
-     * @exception RuntimeException  if the chooser panel has already been
+     * @throws RuntimeException  if the chooser panel has already been
      *                          installed
      */
     public void installChooserPanel(JColorChooser enclosingChooser) {
diff --git a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
index 1be0228864c..81ae2393008 100644
--- a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
+++ b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
@@ -144,7 +144,7 @@ public class EventListenerList implements Serializable {
      * @param <T> the type of {@code EventListener} to search for
      * @param t the type of {@code EventListener} classes to be returned
      * @return all of the listeners of the specified type.
-     * @exception  ClassCastException if the supplied class
+     * @throws  ClassCastException if the supplied class
      *          is not assignable to EventListener
      *
      * @since 1.3
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java
index cba6691ba58..3c96fdabffd 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/TextUI.java
@@ -49,7 +49,7 @@ public abstract class TextUI extends ComponentUI
      * @param t the text component for which this UI is installed
      * @param pos  the local location in the model to translate &gt;= 0
      * @return the coordinates as a {@code Rectangle}
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      *
      * @deprecated replaced by
@@ -66,7 +66,7 @@ public abstract class TextUI extends ComponentUI
      * @param pos  the local location in the model to translate &gt;= 0
      * @param bias the bias for the position
      * @return the coordinates as a {@code Rectangle}
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      *
      * @deprecated replaced by
@@ -86,7 +86,7 @@ public abstract class TextUI extends ComponentUI
      * @param pos  the local location in the model to translate {@code >= 0}
      * @param bias the bias for the position
      * @return the coordinates as a {@code Rectangle2D}
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *            represent a valid location in the associated document
      *
      * @since 9
@@ -178,8 +178,8 @@ public abstract class TextUI extends ComponentUI
      * @param biasRet an array to contain the bias for the returned position
      * @return the location within the model that best represents the next
      *  location visual position
-     * @exception BadLocationException for a bad location within a document model
-     * @exception IllegalArgumentException for an invalid direction
+     * @throws BadLocationException for a bad location within a document model
+     * @throws IllegalArgumentException for an invalid direction
      */
     public abstract int getNextVisualPositionFrom(JTextComponent t,
                          int pos, Position.Bias b,
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java
index 3e1108fb25b..5a7f88ff3ce 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicHTML.java
@@ -585,9 +585,9 @@ public class BasicHTML {
          *  position is a boundary of two views.
          * @param a the allocated region to render into
          * @return the bounding box of the given position is returned
-         * @exception BadLocationException  if the given position does
+         * @throws BadLocationException  if the given position does
          *   not represent a valid location in the associated document
-         * @exception IllegalArgumentException for an invalid bias argument
+         * @throws IllegalArgumentException for an invalid bias argument
          * @see View#viewToModel
          */
         public Shape modelToView(int p0, Position.Bias b0, int p1,
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index 360e98eee7a..92d5896bca2 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -775,7 +775,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants {
      * Returns the baseline for the specified tab.
      *
      * @param tab index of tab to get baseline for
-     * @exception IndexOutOfBoundsException if index is out of range
+     * @throws IndexOutOfBoundsException if index is out of range
      *            (index &lt; 0 || index &gt;= tab count)
      * @return baseline or a value &lt; 0 indicating there is no reasonable
      *                  baseline
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
index 2e67a99720a..5d767d3b703 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
@@ -345,7 +345,7 @@ public class BasicTextFieldUI extends BasicTextUI {
          * @param pos the position to convert >= 0
          * @param a the allocated region to render into
          * @return the bounding box of the given position
-         * @exception BadLocationException  if the given position does not
+         * @throws BadLocationException  if the given position does not
          *   represent a valid location in the associated document
          * @see View#modelToView
          */
@@ -367,9 +367,9 @@ public class BasicTextFieldUI extends BasicTextUI {
          *  position is a boundary of two views.
          * @param a the allocated region to render into
          * @return the bounding box of the given position is returned
-         * @exception BadLocationException  if the given position does
+         * @throws BadLocationException  if the given position does
          *   not represent a valid location in the associated document
-         * @exception IllegalArgumentException for an invalid bias argument
+         * @throws IllegalArgumentException for an invalid bias argument
          * @see View#viewToModel
          */
         public Shape modelToView(int p0, Position.Bias b0,
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
index 6e98a57e5c3..881b9557b0c 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
@@ -1045,7 +1045,7 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
      * @param tc the text component for which this UI is installed
      * @param pos the local location in the model to translate &gt;= 0
      * @return the coordinates as a rectangle, null if the model is not painted
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      * @see TextUI#modelToView
      *
@@ -1067,7 +1067,7 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
      * @param tc the text component for which this UI is installed
      * @param pos the local location in the model to translate &gt;= 0
      * @return the coordinates as a rectangle, null if the model is not painted
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      * @see TextUI#modelToView
      *
@@ -1626,9 +1626,9 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
          *  position is a boundary of two views.
          * @param a the allocated region to render into
          * @return the bounding box of the given position is returned
-         * @exception BadLocationException  if the given position does
+         * @throws BadLocationException  if the given position does
          *   not represent a valid location in the associated document
-         * @exception IllegalArgumentException for an invalid bias argument
+         * @throws IllegalArgumentException for an invalid bias argument
          * @see View#viewToModel
          */
         public Shape modelToView(int p0, Position.Bias b0, int p1, Position.Bias b1, Shape a) throws BadLocationException {
@@ -1674,9 +1674,9 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
          *  SwingConstants.NORTH, or SwingConstants.SOUTH.
          * @return the location within the model that best represents the next
          *  location visual position.
-         * @exception BadLocationException the given position is not a valid
+         * @throws BadLocationException the given position is not a valid
          *                                 position within the document
-         * @exception IllegalArgumentException for an invalid direction
+         * @throws IllegalArgumentException for an invalid direction
          */
         public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
                                              int direction,
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java
index 544c2ebe731..116226188c9 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTransferable.java
@@ -130,9 +130,9 @@ class BasicTransferable implements Transferable, UIResource {
      *
      * @param flavor the requested flavor for the data
      * @see DataFlavor#getRepresentationClass
-     * @exception IOException                if the data is no longer available
+     * @throws IOException                if the data is no longer available
      *              in the requested flavor.
-     * @exception UnsupportedFlavorException if the requested data flavor is
+     * @throws UnsupportedFlavorException if the requested data flavor is
      *              not supported.
      */
     public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
diff --git a/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java b/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java
index 886d0ad64b0..99208f3cd26 100644
--- a/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/AbstractTableModel.java
@@ -331,7 +331,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
      *          <code><em>Foo</em>Listener</code>s on this component,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code>
+     * @throws ClassCastException if <code>listenerType</code>
      *          doesn't specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
index ab5ff974eb9..e1a6264a478 100644
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
@@ -109,7 +109,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
      *  event to its listeners.
      *
      * @param   aColumn         the <code>TableColumn</code> to be added
-     * @exception IllegalArgumentException      if <code>aColumn</code> is
+     * @throws IllegalArgumentException      if <code>aColumn</code> is
      *                          <code>null</code>
      * @see     #removeColumn
      */
@@ -170,7 +170,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
      *
      * @param   columnIndex                     the index of column to be moved
      * @param   newIndex                        new index to move the column
-     * @exception IllegalArgumentException      if <code>column</code> or
+     * @throws IllegalArgumentException      if <code>column</code> or
      *                                          <code>newIndex</code>
      *                                          are not in the valid range
      */
@@ -258,7 +258,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
      * @return          the index of the first column in the
      *                  <code>tableColumns</code> array whose identifier
      *                  is equal to <code>identifier</code>
-     * @exception       IllegalArgumentException  if <code>identifier</code>
+     * @throws       IllegalArgumentException  if <code>identifier</code>
      *                          is <code>null</code>, or if no
      *                          <code>TableColumn</code> has this
      *                          <code>identifier</code>
@@ -368,7 +368,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
      *  an exception is thrown.
      *
      * @param   newModel        the new selection model
-     * @exception IllegalArgumentException      if <code>newModel</code>
+     * @throws IllegalArgumentException      if <code>newModel</code>
      *                                          is <code>null</code>
      * @see     #getSelectionModel
      */
@@ -636,7 +636,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
      *          <code><em>Foo</em>Listener</code>s on this model,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code>
+     * @throws ClassCastException if <code>listenerType</code>
      *          doesn't specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
index 08dfc85b0a9..cdb3f29b76a 100644
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
@@ -375,7 +375,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
      *
      * @param   row             the row index of the row to be inserted
      * @param   rowData         optional data of the row being added
-     * @exception  ArrayIndexOutOfBoundsException  if the row was invalid
+     * @throws  ArrayIndexOutOfBoundsException  if the row was invalid
      */
     public void insertRow(int row, Vector<?> rowData) {
         dataVector.insertElementAt(rowData, row);
@@ -390,7 +390,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
      *
      * @param   row      the row index of the row to be inserted
      * @param   rowData          optional data of the row being added
-     * @exception  ArrayIndexOutOfBoundsException  if the row was invalid
+     * @throws  ArrayIndexOutOfBoundsException  if the row was invalid
      */
     public void insertRow(int row, Object[] rowData) {
         insertRow(row, convertToVector(rowData));
@@ -438,7 +438,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
      * @param   start       the starting row index to be moved
      * @param   end         the ending row index to be moved
      * @param   to          the destination of the rows to be moved
-     * @exception  ArrayIndexOutOfBoundsException  if any of the elements
+     * @throws  ArrayIndexOutOfBoundsException  if any of the elements
      * would be moved out of the table's range
      *
      */
@@ -463,7 +463,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
      *  of the row being removed will be sent to all the listeners.
      *
      * @param   row      the row index of the row to be removed
-     * @exception  ArrayIndexOutOfBoundsException  if the row was invalid
+     * @throws  ArrayIndexOutOfBoundsException  if the row was invalid
      */
     public void removeRow(int row) {
         dataVector.removeElementAt(row);
@@ -652,7 +652,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
      * @param   row             the row whose value is to be queried
      * @param   column          the column whose value is to be queried
      * @return                  the value Object at the specified cell
-     * @exception  ArrayIndexOutOfBoundsException  if an invalid row or
+     * @throws  ArrayIndexOutOfBoundsException  if an invalid row or
      *               column was given
      */
     public Object getValueAt(int row, int column) {
@@ -669,7 +669,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
      * @param   aValue          the new value; this can be null
      * @param   row             the row whose value is to be changed
      * @param   column          the column whose value is to be changed
-     * @exception  ArrayIndexOutOfBoundsException  if an invalid row or
+     * @throws  ArrayIndexOutOfBoundsException  if an invalid row or
      *               column was given
      */
     public void setValueAt(Object aValue, int row, int column) {
diff --git a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
index f36b5646e3d..561d6a71c75 100644
--- a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
+++ b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
@@ -550,7 +550,7 @@ public class JTableHeader extends JComponent implements TableColumnModelListener
      *  for listener notifications from the new column model.
      *
      * @param   columnModel     the new data source for this table
-     * @exception IllegalArgumentException
+     * @throws IllegalArgumentException
      *                          if <code>newModel</code> is <code>null</code>
      * @see     #getColumnModel
      */
diff --git a/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java b/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java
index eaaa8447ef7..4cf4870b5e3 100644
--- a/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java
@@ -79,7 +79,7 @@ public interface TableColumnModel
      *
      * @param   columnIndex                     the index of column to be moved
      * @param   newIndex                        index of the column's new location
-     * @exception IllegalArgumentException      if <code>columnIndex</code> or
+     * @throws IllegalArgumentException      if <code>columnIndex</code> or
      *                                          <code>newIndex</code>
      *                                          are not in the valid range
      */
@@ -119,7 +119,7 @@ public interface TableColumnModel
      * @param           columnIdentifier        the identifier object
      * @return          the index of the first table column
      *                  whose identifier is equal to <code>identifier</code>
-     * @exception IllegalArgumentException      if <code>identifier</code>
+     * @throws IllegalArgumentException      if <code>identifier</code>
      *                          is <code>null</code>, or no
      *                          <code>TableColumn</code> has this
      *                          <code>identifier</code>
diff --git a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
index 1b97006bc34..db19b81e8e5 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
@@ -344,7 +344,7 @@ public abstract class AbstractDocument implements Document, Serializable {
      *          <code><em>Foo</em>Listener</code>s on this component,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code>
+     * @throws ClassCastException if <code>listenerType</code>
      *          doesn't specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
@@ -604,7 +604,7 @@ public abstract class AbstractDocument implements Document, Serializable {
      *
      * @param offs the starting offset &gt;= 0
      * @param len the number of characters to remove &gt;= 0
-     * @exception BadLocationException  the given remove position is not a valid
+     * @throws BadLocationException  the given remove position is not a valid
      *   position within the document
      * @see Document#remove
      */
@@ -674,7 +674,7 @@ public abstract class AbstractDocument implements Document, Serializable {
      *              <code>null</code>
      *              is legal, and typically treated as an empty attributeset,
      *              but exact interpretation is left to the subclass
-     * @exception BadLocationException the given position is not a valid
+     * @throws BadLocationException the given position is not a valid
      *            position within the document
      * @since 1.4
      */
@@ -718,7 +718,7 @@ public abstract class AbstractDocument implements Document, Serializable {
      * @param offs the starting offset &gt;= 0
      * @param str the string to insert; does nothing with null/empty strings
      * @param a the attributes for the inserted content
-     * @exception BadLocationException  the given insert position is not a valid
+     * @throws BadLocationException  the given insert position is not a valid
      *   position within the document
      * @see Document#insertString
      */
@@ -792,7 +792,7 @@ public abstract class AbstractDocument implements Document, Serializable {
      * @param offset the starting offset &gt;= 0
      * @param length the number of characters to retrieve &gt;= 0
      * @return the text
-     * @exception BadLocationException  the range given includes a position
+     * @throws BadLocationException  the range given includes a position
      *   that is not a valid position within the document
      * @see Document#getText
      */
@@ -833,7 +833,7 @@ public abstract class AbstractDocument implements Document, Serializable {
      * @param offset the starting offset &gt;= 0
      * @param length the number of characters to retrieve &gt;= 0
      * @param txt the Segment object to retrieve the text into
-     * @exception BadLocationException  the range given includes a position
+     * @throws BadLocationException  the range given includes a position
      *   that is not a valid position within the document
      */
     public void getText(int offset, int length, Segment txt) throws BadLocationException {
@@ -854,7 +854,7 @@ public abstract class AbstractDocument implements Document, Serializable {
      *
      * @param offs the position in the model &gt;= 0
      * @return the position
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      * @see Document#createPosition
      */
@@ -1354,7 +1354,7 @@ public abstract class AbstractDocument implements Document, Serializable {
      * <code>Document</code> will be left in a locked state so that no
      * reading or writing can be done.
      *
-     * @exception IllegalStateException thrown on illegal lock
+     * @throws IllegalStateException thrown on illegal lock
      *  attempt.  If the document is implemented properly, this can
      *  only happen if a document listener attempts to mutate the
      *  document.  This situation violates the bean event model
@@ -1633,7 +1633,7 @@ public abstract class AbstractDocument implements Document, Serializable {
          *
          * @param offset the offset in the content &gt;= 0
          * @return a Position
-         * @exception BadLocationException for an invalid offset
+         * @throws BadLocationException for an invalid offset
          */
         public Position createPosition(int offset) throws BadLocationException;
 
@@ -1652,7 +1652,7 @@ public abstract class AbstractDocument implements Document, Serializable {
          * @return  if the implementation supports a history mechanism,
          *    a reference to an <code>Edit</code> implementation will be returned,
          *    otherwise returns <code>null</code>
-         * @exception BadLocationException  thrown if the area covered by
+         * @throws BadLocationException  thrown if the area covered by
          *   the arguments is not contained in the character sequence
          */
         public UndoableEdit insertString(int where, String str) throws BadLocationException;
@@ -1666,7 +1666,7 @@ public abstract class AbstractDocument implements Document, Serializable {
          * @return  If the implementation supports a history mechanism,
          *    a reference to an Edit implementation will be returned,
          *    otherwise null.
-         * @exception BadLocationException  Thrown if the area covered by
+         * @throws BadLocationException  Thrown if the area covered by
          *   the arguments is not contained in the character sequence.
          */
         public UndoableEdit remove(int where, int nitems) throws BadLocationException;
@@ -1677,7 +1677,7 @@ public abstract class AbstractDocument implements Document, Serializable {
          * @param where   Offset into the sequence to fetch &gt;= 0.
          * @param len     number of characters to copy &gt;= 0.
          * @return the string
-         * @exception BadLocationException  Thrown if the area covered by
+         * @throws BadLocationException  Thrown if the area covered by
          *   the arguments is not contained in the character sequence.
          */
         public String getString(int where, int len) throws BadLocationException;
@@ -1688,7 +1688,7 @@ public abstract class AbstractDocument implements Document, Serializable {
          * @param where the starting offset &gt;= 0
          * @param len the number of characters &gt;= 0
          * @param txt the target location to copy into
-         * @exception BadLocationException  Thrown if the area covered by
+         * @throws BadLocationException  Thrown if the area covered by
          *   the arguments is not contained in the character sequence.
          */
         public void getChars(int where, int len, Segment txt) throws BadLocationException;
@@ -2819,7 +2819,7 @@ public abstract class AbstractDocument implements Document, Serializable {
         /**
          * Redoes a change.
          *
-         * @exception CannotRedoException if the change cannot be redone
+         * @throws CannotRedoException if the change cannot be redone
          */
         public void redo() throws CannotRedoException {
             writeLock();
@@ -2843,7 +2843,7 @@ public abstract class AbstractDocument implements Document, Serializable {
         /**
          * Undoes a change.
          *
-         * @exception CannotUndoException if the change cannot be undone
+         * @throws CannotUndoException if the change cannot be undone
          */
         public void undo() throws CannotUndoException {
             writeLock();
@@ -3187,7 +3187,7 @@ public abstract class AbstractDocument implements Document, Serializable {
         /**
          * Redoes a change.
          *
-         * @exception CannotRedoException if the change cannot be redone
+         * @throws CannotRedoException if the change cannot be redone
          */
         public void redo() throws CannotRedoException {
             super.redo();
@@ -3204,7 +3204,7 @@ public abstract class AbstractDocument implements Document, Serializable {
         /**
          * Undoes a change.
          *
-         * @exception CannotUndoException if the change cannot be undone
+         * @throws CannotUndoException if the change cannot be undone
          */
         public void undo() throws CannotUndoException {
             super.undo();
diff --git a/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java b/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
index 0ca0fecb5a8..07a8301f0b5 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
@@ -270,7 +270,7 @@ public abstract class AbstractWriter {
      * when encountered.
      *
      * @param     elem an <code>Element</code>
-     * @exception BadLocationException if pos represents an invalid
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document
      * @return    the text as a <code>String</code>
      */
@@ -286,8 +286,8 @@ public abstract class AbstractWriter {
      * out.
      *
      * @param     elem an Element.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      */
     protected void text(Element elem) throws BadLocationException,
@@ -462,7 +462,7 @@ public abstract class AbstractWriter {
      * line is empty, this will not make it so that the current line is
      * still considered empty.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void indent() throws IOException {
         int max = getIndentLevel() * getIndentSpace();
@@ -485,7 +485,7 @@ public abstract class AbstractWriter {
      * the <code>write</code> method that takes a char[].
      *
      * @param     ch a char.
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void write(char ch) throws IOException {
         if (tempChars == null) {
@@ -500,7 +500,7 @@ public abstract class AbstractWriter {
      * <code>write</code> method that takes a char[].
      *
      * @param     content a String.
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void write(String content) throws IOException {
         if (content == null) {
@@ -671,7 +671,7 @@ public abstract class AbstractWriter {
      * pairs. It throws an IOException when encountered.
      *
      * @param     attr an AttributeSet.
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeAttributes(AttributeSet attr) throws IOException {
 
diff --git a/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java b/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java
index a9e4c58fbaa..ac0dd40b28a 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java
@@ -640,7 +640,7 @@ public class AsyncBoxView extends View {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getPreferredSpan(int axis) {
         float margin = getInsetSpan(axis);
@@ -665,7 +665,7 @@ public class AsyncBoxView extends View {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getMinimumSpan(int axis) {
         if (axis == this.axis) {
@@ -693,7 +693,7 @@ public class AsyncBoxView extends View {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getMaximumSpan(int axis) {
         if (axis == this.axis) {
@@ -773,9 +773,9 @@ public class AsyncBoxView extends View {
      *  next character represented by the offset, in case the
      *  position is a boundary of two views.
      * @return the bounding box of the given position is returned
-     * @exception BadLocationException  if the given position does
+     * @throws BadLocationException  if the given position does
      *   not represent a valid location in the associated document
-     * @exception IllegalArgumentException for an invalid bias argument
+     * @throws IllegalArgumentException for an invalid bias argument
      * @see View#viewToModel
      */
     public Shape modelToView(int pos, Shape a, Position.Bias b) throws BadLocationException {
@@ -864,9 +864,9 @@ public class AsyncBoxView extends View {
      * @param biasRet an array contain the bias that was checked
      * @return the location within the model that best represents the next
      *  location visual position
-     * @exception BadLocationException the given position is not a valid
+     * @throws BadLocationException the given position is not a valid
      *                                 position within the document
-     * @exception IllegalArgumentException if <code>direction</code> is invalid
+     * @throws IllegalArgumentException if <code>direction</code> is invalid
      */
     public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
                                          int direction,
diff --git a/src/java.desktop/share/classes/javax/swing/text/BoxView.java b/src/java.desktop/share/classes/javax/swing/text/BoxView.java
index afaefacccf5..cc21e039021 100644
--- a/src/java.desktop/share/classes/javax/swing/text/BoxView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/BoxView.java
@@ -293,7 +293,7 @@ public class BoxView extends CompositeView {
      * @param axis may be either <code>View.X_AXIS</code> or
      *          <code>View.Y_AXIS</code>
      * @return the weight
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public int getResizeWeight(int axis) {
         checkRequests(axis);
@@ -473,7 +473,7 @@ public class BoxView extends CompositeView {
      * @param pos the position to convert &gt;= 0
      * @param a the allocated region to render into
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does
+     * @throws BadLocationException  if the given position does
      *  not represent a valid location in the associated document
      * @see View#modelToView
      */
@@ -519,7 +519,7 @@ public class BoxView extends CompositeView {
      *   origin and 1.0 indicates alignment to the full span
      *   away from the origin; an alignment of 0.5 would be the
      *   center of the view
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public float getAlignment(int axis) {
         checkRequests(axis);
@@ -540,7 +540,7 @@ public class BoxView extends CompositeView {
      *           typically the view is told to render into the span
      *           that is returned, although there is no guarantee;
      *           the parent may choose to resize or break the view
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getPreferredSpan(int axis) {
         checkRequests(axis);
@@ -563,7 +563,7 @@ public class BoxView extends CompositeView {
      *           typically the view is told to render into the span
      *           that is returned, although there is no guarantee;
      *           the parent may choose to resize or break the view
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getMinimumSpan(int axis) {
         checkRequests(axis);
@@ -586,7 +586,7 @@ public class BoxView extends CompositeView {
      *           typically the view is told to render into the span
      *           that is returned, although there is no guarantee;
      *           the parent may choose to resize or break the view
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getMaximumSpan(int axis) {
         checkRequests(axis);
@@ -919,7 +919,7 @@ public class BoxView extends CompositeView {
     /**
      * Checks the request cache and update if needed.
      * @param axis the axis being studied
-     * @exception IllegalArgumentException if <code>axis</code> is
+     * @throws IllegalArgumentException if <code>axis</code> is
      *  neither <code>View.X_AXIS</code> nor <code>View.Y_AXIS</code>
      */
     void checkRequests(int axis) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/ComponentView.java b/src/java.desktop/share/classes/javax/swing/text/ComponentView.java
index a4aaa30e512..0d8743f86ed 100644
--- a/src/java.desktop/share/classes/javax/swing/text/ComponentView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/ComponentView.java
@@ -132,7 +132,7 @@ public class ComponentView extends View  {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public float getPreferredSpan(int axis) {
         if ((axis != X_AXIS) && (axis != Y_AXIS)) {
@@ -160,7 +160,7 @@ public class ComponentView extends View  {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public float getMinimumSpan(int axis) {
         if ((axis != X_AXIS) && (axis != Y_AXIS)) {
@@ -188,7 +188,7 @@ public class ComponentView extends View  {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public float getMaximumSpan(int axis) {
         if ((axis != X_AXIS) && (axis != Y_AXIS)) {
@@ -325,7 +325,7 @@ public class ComponentView extends View  {
      * @param pos the position to convert &gt;=0
      * @param a the allocated region to render into
      * @return the bounding box of the given position is returned
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      * @see View#modelToView
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/CompositeView.java b/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
index 343c02feddc..5220395d35a 100644
--- a/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
@@ -244,7 +244,7 @@ public abstract class CompositeView extends View {
      * @param b a bias value of either <code>Position.Bias.Forward</code>
      *  or <code>Position.Bias.Backward</code>
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does
+     * @throws BadLocationException  if the given position does
      *   not represent a valid location in the associated document
      * @see View#modelToView
      */
@@ -294,9 +294,9 @@ public abstract class CompositeView extends View {
      *  position is a boundary of two views
      * @param a the allocated region to render into
      * @return the bounding box of the given position is returned
-     * @exception BadLocationException  if the given position does
+     * @throws BadLocationException  if the given position does
      *   not represent a valid location in the associated document
-     * @exception IllegalArgumentException for an invalid bias argument
+     * @throws IllegalArgumentException for an invalid bias argument
      * @see View#viewToModel
      */
     public Shape modelToView(int p0, Position.Bias b0, int p1, Position.Bias b1, Shape a) throws BadLocationException {
@@ -458,9 +458,9 @@ public abstract class CompositeView extends View {
      * @param biasRet an array containing the bias that was checked
      * @return the location within the model that best represents the next
      *  location visual position
-     * @exception BadLocationException the given position is not a valid
+     * @throws BadLocationException the given position is not a valid
      *                                 position within the document
-     * @exception IllegalArgumentException if <code>direction</code> is invalid
+     * @throws IllegalArgumentException if <code>direction</code> is invalid
      */
     public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
                                          int direction, Position.Bias[] biasRet)
@@ -715,8 +715,8 @@ public abstract class CompositeView extends View {
      * @param biasRet an array containing the bias that was checked
      * @return the location within the model that best represents the next
      *  north or south location
-     * @exception BadLocationException for a bad location within a document model
-     * @exception IllegalArgumentException if <code>direction</code> is invalid
+     * @throws BadLocationException for a bad location within a document model
+     * @throws IllegalArgumentException if <code>direction</code> is invalid
      * @see #getNextVisualPositionFrom
      */
     protected int getNextNorthSouthVisualPositionFrom(int pos, Position.Bias b,
@@ -748,8 +748,8 @@ public abstract class CompositeView extends View {
      * @param biasRet an array containing the bias that was checked
      * @return the location within the model that best represents the next
      *  west or east location
-     * @exception BadLocationException for a bad location within a document model
-     * @exception IllegalArgumentException if <code>direction</code> is invalid
+     * @throws BadLocationException for a bad location within a document model
+     * @throws IllegalArgumentException if <code>direction</code> is invalid
      * @see #getNextVisualPositionFrom
      */
     protected int getNextEastWestVisualPositionFrom(int pos, Position.Bias b,
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
index a980268bd94..ff4d37224e3 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
@@ -870,7 +870,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou
      *          <code><em>Foo</em>Listener</code>s on this component,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code>
+     * @throws ClassCastException if <code>listenerType</code>
      *          doesn't specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
index ee1db4739ce..2d9971d3794 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
@@ -142,8 +142,8 @@ public class DefaultEditorKit extends EditorKit {
      * @param doc The destination for the insertion.
      * @param pos The location in the document to place the
      *   content &gt;=0.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public void read(InputStream in, Document doc, int pos)
@@ -161,8 +161,8 @@ public class DefaultEditorKit extends EditorKit {
      * @param pos The location in the document to fetch the
      *   content &gt;=0.
      * @param len The amount to write out &gt;=0.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public void write(OutputStream out, Document doc, int pos, int len)
@@ -193,8 +193,8 @@ public class DefaultEditorKit extends EditorKit {
      * @param doc The destination for the insertion.
      * @param pos The location in the document to place the
      *   content &gt;=0.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public void read(Reader in, Document doc, int pos)
@@ -303,8 +303,8 @@ public class DefaultEditorKit extends EditorKit {
      * @param pos The location in the document to fetch the
      *   content from &gt;=0.
      * @param len The amount to write out &gt;=0.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos is not within 0 and
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos is not within 0 and
      *   the length of the document.
      */
     public void write(Writer out, Document doc, int pos, int len)
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java b/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
index 4e874ec1f00..0465b9157e2 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
@@ -110,7 +110,7 @@ public class DefaultHighlighter extends LayeredHighlighter {
      * @param p    the painter to use to actually render the highlight
      * @return     an object that can be used as a tag
      *   to refer to the highlight
-     * @exception BadLocationException if the specified location is invalid
+     * @throws BadLocationException if the specified location is invalid
      */
     public Object addHighlight(int p0, int p1, Highlighter.HighlightPainter p) throws BadLocationException {
         if (p0 < 0) {
@@ -222,7 +222,7 @@ public class DefaultHighlighter extends LayeredHighlighter {
      * @param tag the highlight tag
      * @param p0 the beginning of the range &gt;= 0
      * @param p1 the end of the range &gt;= p0
-     * @exception BadLocationException if the specified location is invalid
+     * @throws BadLocationException if the specified location is invalid
      */
     public void changeHighlight(Object tag, int p0, int p1) throws BadLocationException {
         if (p0 < 0) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
index f549f522ff2..5d373177eaf 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
@@ -182,7 +182,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
      *
      * @param offset the starting offset &gt;= 0
      * @param data the element data
-     * @exception BadLocationException for an invalid starting offset
+     * @throws BadLocationException for an invalid starting offset
      */
     protected void insert(int offset, ElementSpec[] data) throws BadLocationException {
         if (data == null || data.length == 0) {
@@ -2548,7 +2548,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
         /**
          * Redoes a change.
          *
-         * @exception CannotRedoException if the change cannot be redone
+         * @throws CannotRedoException if the change cannot be redone
          */
         public void redo() throws CannotRedoException {
             super.redo();
@@ -2562,7 +2562,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
         /**
          * Undoes a change.
          *
-         * @exception CannotUndoException if the change cannot be undone
+         * @throws CannotUndoException if the change cannot be undone
          */
         public void undo() throws CannotUndoException {
             super.undo();
@@ -2604,7 +2604,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
         /**
          * Redoes a change.
          *
-         * @exception CannotRedoException if the change cannot be redone
+         * @throws CannotRedoException if the change cannot be redone
          */
         public void redo() throws CannotRedoException {
             super.redo();
@@ -2614,7 +2614,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
         /**
          * Undoes a change.
          *
-         * @exception CannotUndoException if the change cannot be undone
+         * @throws CannotUndoException if the change cannot be undone
          */
         public void undo() throws CannotUndoException {
             super.undo();
diff --git a/src/java.desktop/share/classes/javax/swing/text/Document.java b/src/java.desktop/share/classes/javax/swing/text/Document.java
index e0f4ac791d5..09f162733cf 100644
--- a/src/java.desktop/share/classes/javax/swing/text/Document.java
+++ b/src/java.desktop/share/classes/javax/swing/text/Document.java
@@ -453,7 +453,7 @@ public interface Document {
      *
      * @param offs  the offset from the beginning &gt;= 0
      * @param len   the number of characters to remove &gt;= 0
-     * @exception BadLocationException  some portion of the removal range
+     * @throws BadLocationException  some portion of the removal range
      *   was not a valid part of the document.  The location in the exception
      *   is the first bad position encountered.
      * @see javax.swing.event.DocumentEvent
@@ -490,7 +490,7 @@ public interface Document {
      * @param str    the string to insert
      * @param a      the attributes to associate with the inserted
      *   content.  This may be null if there are no attributes.
-     * @exception BadLocationException  the given insert position is not a valid
+     * @throws BadLocationException  the given insert position is not a valid
      * position within the document
      * @see javax.swing.event.DocumentEvent
      * @see javax.swing.event.DocumentListener
@@ -507,7 +507,7 @@ public interface Document {
      *   start of the text &gt;= 0
      * @param length  the length of the desired string &gt;= 0
      * @return the text, in a String of length &gt;= 0
-     * @exception BadLocationException  some portion of the given range
+     * @throws BadLocationException  some portion of the given range
      *   was not a valid part of the document.  The location in the exception
      *   is the first bad position encountered.
      */
@@ -546,7 +546,7 @@ public interface Document {
      * @param length  the length of the desired string &gt;= 0
      * @param txt the Segment object to return the text in
      *
-     * @exception BadLocationException  Some portion of the given range
+     * @throws BadLocationException  Some portion of the given range
      *   was not a valid part of the document.  The location in the exception
      *   is the first bad position encountered.
      */
@@ -582,7 +582,7 @@ public interface Document {
      *
      * @param offs  the offset from the start of the document &gt;= 0
      * @return the position
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      */
     public Position createPosition(int offs) throws BadLocationException;
diff --git a/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java b/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
index 5f69882ff8e..d0334bce45e 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
@@ -75,7 +75,7 @@ public class DocumentFilter {
      * @param fb FilterBypass that can be used to mutate Document
      * @param offset the offset from the beginning &gt;= 0
      * @param length the number of characters to remove &gt;= 0
-     * @exception BadLocationException  some portion of the removal range
+     * @throws BadLocationException  some portion of the removal range
      *   was not a valid part of the document.  The location in the exception
      *   is the first bad position encountered.
      */
@@ -97,7 +97,7 @@ public class DocumentFilter {
      * @param string the string to insert
      * @param attr      the attributes to associate with the inserted
      *   content.  This may be null if there are no attributes.
-     * @exception BadLocationException  the given insert position is not a
+     * @throws BadLocationException  the given insert position is not a
      *   valid position within the document
      */
     public void insertString(FilterBypass fb, int offset, String string,
@@ -117,7 +117,7 @@ public class DocumentFilter {
      * @param text Text to insert, null indicates no text to insert
      * @param attrs AttributeSet indicating attributes of inserted text,
      *              null is legal.
-     * @exception BadLocationException  the given insert position is not a
+     * @throws BadLocationException  the given insert position is not a
      *   valid position within the document
      */
     public void replace(FilterBypass fb, int offset, int length, String text,
@@ -153,7 +153,7 @@ public class DocumentFilter {
          *
          * @param offset the offset from the beginning &gt;= 0
          * @param length the number of characters to remove &gt;= 0
-         * @exception BadLocationException some portion of the removal range
+         * @throws BadLocationException some portion of the removal range
          *   was not a valid part of the document.  The location in the
          *   exception is the first bad position encountered.
          */
@@ -169,7 +169,7 @@ public class DocumentFilter {
          * @param string the string to insert
          * @param attr the attributes to associate with the inserted
          *   content.  This may be null if there are no attributes.
-         * @exception BadLocationException  the given insert position is not a
+         * @throws BadLocationException  the given insert position is not a
          *   valid position within the document
          */
         public abstract void insertString(int offset, String string,
@@ -186,7 +186,7 @@ public class DocumentFilter {
          * @param string Text to insert, null indicates no text to insert
          * @param attrs AttributeSet indicating attributes of inserted text,
          *              null is legal.
-         * @exception BadLocationException  the given insert is not a
+         * @throws BadLocationException  the given insert is not a
          *   valid position within the document
          */
         public abstract void replace(int offset, int length, String string,
diff --git a/src/java.desktop/share/classes/javax/swing/text/EditorKit.java b/src/java.desktop/share/classes/javax/swing/text/EditorKit.java
index 9163a6361e4..cd491fb5bac 100644
--- a/src/java.desktop/share/classes/javax/swing/text/EditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/EditorKit.java
@@ -141,8 +141,8 @@ public abstract class EditorKit implements Cloneable, Serializable {
      * @param doc The destination for the insertion.
      * @param pos The location in the document to place the
      *   content &gt;= 0.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public abstract void read(InputStream in, Document doc, int pos)
@@ -157,8 +157,8 @@ public abstract class EditorKit implements Cloneable, Serializable {
      * @param pos The location in the document to fetch the
      *   content from &gt;= 0.
      * @param len The amount to write out &gt;= 0.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public abstract void write(OutputStream out, Document doc, int pos, int len)
@@ -178,8 +178,8 @@ public abstract class EditorKit implements Cloneable, Serializable {
      * @param doc The destination for the insertion.
      * @param pos The location in the document to place the
      *   content &gt;= 0.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public abstract void read(Reader in, Document doc, int pos)
@@ -199,8 +199,8 @@ public abstract class EditorKit implements Cloneable, Serializable {
      * @param pos The location in the document to fetch the
      *   content &gt;= 0.
      * @param len The amount to write out &gt;= 0.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public abstract void write(Writer out, Document doc, int pos, int len)
diff --git a/src/java.desktop/share/classes/javax/swing/text/FieldView.java b/src/java.desktop/share/classes/javax/swing/text/FieldView.java
index 936a78700be..b5ad6369945 100644
--- a/src/java.desktop/share/classes/javax/swing/text/FieldView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/FieldView.java
@@ -258,7 +258,7 @@ public class FieldView extends PlainView {
      * @param pos the position to convert &gt;= 0
      * @param a the allocated region to render into
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      * @see View#modelToView
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/GapContent.java b/src/java.desktop/share/classes/javax/swing/text/GapContent.java
index c59c350541b..6c96b2b0ec3 100644
--- a/src/java.desktop/share/classes/javax/swing/text/GapContent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/GapContent.java
@@ -130,7 +130,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
      * @param where the starting position &gt;= 0, &lt; length()
      * @param str the non-null string to insert
      * @return an UndoableEdit object for undoing
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      * @see AbstractDocument.Content#insertString
      */
     public UndoableEdit insertString(int where, String str) throws BadLocationException {
@@ -148,7 +148,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
      * @param where the starting position &gt;= 0, where + nitems &lt; length()
      * @param nitems the number of characters to remove &gt;= 0
      * @return an UndoableEdit object for undoing
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      * @see AbstractDocument.Content#remove
      */
     public UndoableEdit remove(int where, int nitems) throws BadLocationException {
@@ -168,7 +168,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
      * @param where the starting position &gt;= 0
      * @param len the length to retrieve &gt;= 0
      * @return a string representing the content
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      * @see AbstractDocument.Content#getString
      */
     public String getString(int where, int len) throws BadLocationException {
@@ -186,7 +186,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
      * @param where the starting position &gt;= 0, where + len &lt;= length()
      * @param len the number of characters to retrieve &gt;= 0
      * @param chars the Segment object to return the characters in
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      * @see AbstractDocument.Content#getChars
      */
     public void getChars(int where, int len, Segment chars) throws BadLocationException {
@@ -237,7 +237,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
      *
      * @param offset the offset to track &gt;= 0
      * @return the position
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      */
     public Position createPosition(int offset) throws BadLocationException {
         while ( queue.poll() != null ) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java b/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java
index 3a070bb4040..59e2a9da491 100644
--- a/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java
+++ b/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java
@@ -231,8 +231,8 @@ class GlyphPainter2 extends GlyphView.GlyphPainter {
          *  SwingConstants.NORTH, or SwingConstants.SOUTH.
          * @return the location within the model that best represents the next
          *  location visual position.
-         * @exception BadLocationException
-         * @exception IllegalArgumentException for an invalid direction
+         * @throws BadLocationException
+         * @throws IllegalArgumentException for an invalid direction
          */
         public int getNextVisualPositionFrom(GlyphView v, int pos,
                                              Position.Bias b, Shape a,
diff --git a/src/java.desktop/share/classes/javax/swing/text/GlyphView.java b/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
index b075356593c..8a4828f62d5 100644
--- a/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
@@ -637,7 +637,7 @@ public class GlyphView extends View implements TabableView, Cloneable {
      * @param b   either <code>Position.Bias.Forward</code>
      *                or <code>Position.Bias.Backward</code>
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does not represent a
+     * @throws BadLocationException  if the given position does not represent a
      *   valid location in the associated document
      * @see View#modelToView
      */
@@ -885,9 +885,9 @@ public class GlyphView extends View implements TabableView, Cloneable {
      *  SwingConstants.NORTH, or SwingConstants.SOUTH.
      * @return the location within the model that best represents the next
      *  location visual position.
-     * @exception BadLocationException the given position is not a valid
+     * @throws BadLocationException the given position is not a valid
      *                                 position within the document
-     * @exception IllegalArgumentException for an invalid direction
+     * @throws IllegalArgumentException for an invalid direction
      */
     public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
                                          int direction,
@@ -1199,7 +1199,7 @@ public class GlyphView extends View implements TabableView, Cloneable {
          *                  or <code>Position.Bias.Backward</code>
          * @param a     Bounds of the View
          * @return      the bounding box of the given position
-         * @exception BadLocationException  if the given position does not represent a
+         * @throws BadLocationException  if the given position does not represent a
          *   valid location in the associated document
          * @see View#modelToView
          */
@@ -1283,8 +1283,8 @@ public class GlyphView extends View implements TabableView, Cloneable {
          *                 is returned as the zero-th element of this array
          * @return the location within the model that best represents the next
          *  location visual position.
-         * @exception BadLocationException for a bad location within a document model
-         * @exception IllegalArgumentException for an invalid direction
+         * @throws BadLocationException for a bad location within a document model
+         * @throws IllegalArgumentException for an invalid direction
          */
         public int getNextVisualPositionFrom(GlyphView v, int pos, Position.Bias b, Shape a,
                                              int direction,
diff --git a/src/java.desktop/share/classes/javax/swing/text/Highlighter.java b/src/java.desktop/share/classes/javax/swing/text/Highlighter.java
index 10243f10cdd..7913e47b948 100644
--- a/src/java.desktop/share/classes/javax/swing/text/Highlighter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/Highlighter.java
@@ -70,7 +70,7 @@ public interface Highlighter {
      * @param p1 the end of the range &gt;= p0
      * @param p the painter to use for the actual highlighting
      * @return an object that refers to the highlight
-     * @exception BadLocationException for an invalid range specification
+     * @throws BadLocationException for an invalid range specification
      */
     public Object addHighlight(int p0, int p1, HighlightPainter p) throws BadLocationException;
 
@@ -95,7 +95,7 @@ public interface Highlighter {
      * @param tag  which highlight to change
      * @param p0 the beginning of the range &gt;= 0
      * @param p1 the end of the range &gt;= p0
-     * @exception BadLocationException for an invalid range specification
+     * @throws BadLocationException for an invalid range specification
      */
     public void changeHighlight(Object tag, int p0, int p1) throws BadLocationException;
 
diff --git a/src/java.desktop/share/classes/javax/swing/text/IconView.java b/src/java.desktop/share/classes/javax/swing/text/IconView.java
index c908e973753..76cb653c9ae 100644
--- a/src/java.desktop/share/classes/javax/swing/text/IconView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/IconView.java
@@ -81,7 +81,7 @@ public class IconView extends View  {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public float getPreferredSpan(int axis) {
         switch (axis) {
@@ -123,7 +123,7 @@ public class IconView extends View  {
      * @param pos the position to convert &gt;= 0
      * @param a the allocated region to render into
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      * @see View#modelToView
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
index cbdd308cc84..d618dc6a2a1 100644
--- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
@@ -672,7 +672,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * component's {@code TransferHandler}.
      *
      * @param b whether or not to enable automatic drag handling
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *            <code>b</code> is <code>true</code> and
      *            <code>GraphicsEnvironment.isHeadless()</code>
      *            returns <code>true</code>
@@ -1358,7 +1358,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * @param offs the offset &ge; 0
      * @param len the length &ge; 0
      * @return the text
-     * @exception BadLocationException if the offset or length are invalid
+     * @throws BadLocationException if the offset or length are invalid
      */
     public String getText(int offs, int len) throws BadLocationException {
         return getDocument().getText(offs, len);
@@ -1376,7 +1376,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * @return the coordinates as a rectangle, with (r.x, r.y) as the location
      *   in the coordinate system, or null if the component does
      *   not yet have a positive size.
-     * @exception BadLocationException if the given position does not
+     * @throws BadLocationException if the given position does not
      *   represent a valid location in the associated document
      * @see TextUI#modelToView
      *
@@ -1400,7 +1400,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * @return the coordinates as a rectangle, with (r.x, r.y) as the location
      *   in the coordinate system, or null if the component does
      *   not yet have a positive size.
-     * @exception BadLocationException if the given position does not
+     * @throws BadLocationException if the given position does not
      *   represent a valid location in the associated document
      * @see TextUI#modelToView2D
      *
@@ -1545,7 +1545,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * an exception is thrown.
      *
      * @param pos the position
-     * @exception    IllegalArgumentException if the value supplied
+     * @throws    IllegalArgumentException if the value supplied
      *               for <code>position</code> is less than zero or greater
      *               than the component's text length
      * @see #setCaretPosition
@@ -1617,7 +1617,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      *   of documents (such as html for example) might be
      *   able to make use of this information; if non-<code>null</code>,
      *   it is added as a property of the document
-     * @exception IOException as thrown by the stream being
+     * @throws IOException as thrown by the stream being
      *  used to initialize
      * @see EditorKit#createDefaultDocument
      * @see #setDocument
@@ -1643,7 +1643,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * text.
      *
      * @param out the output stream
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     public void write(Writer out) throws IOException {
         Document doc = getDocument();
@@ -1672,7 +1672,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * an exception is thrown.
      *
      * @param position the position
-     * @exception    IllegalArgumentException if the value supplied
+     * @throws    IllegalArgumentException if the value supplied
      *               for <code>position</code> is less than zero or greater
      *               than the component's text length
      */
@@ -1743,7 +1743,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * use <code>DocumentListener</code>.
      *
      * @return the text
-     * @exception NullPointerException if the document is <code>null</code>
+     * @throws NullPointerException if the document is <code>null</code>
      * @see #setText
      */
     public String getText() {
@@ -1763,7 +1763,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * <code>null</code> or the document empty, returns <code>null</code>.
      *
      * @return the text
-     * @exception IllegalArgumentException if the selection doesn't
+     * @throws IllegalArgumentException if the selection doesn't
      *  have a valid mapping into the document for some reason
      * @see #setText
      */
@@ -2013,7 +2013,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * @param direction less than zero to scroll up/left, greater than
      *   zero for down/right
      * @return the "unit" increment for scrolling in the specified direction
-     * @exception IllegalArgumentException for an invalid orientation
+     * @throws IllegalArgumentException for an invalid orientation
      * @see JScrollBar#setUnitIncrement
      */
     public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
@@ -2043,7 +2043,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      * @param direction less than zero to scroll up/left, greater than zero
      *  for down/right
      * @return the "block" increment for scrolling in the specified direction
-     * @exception IllegalArgumentException for an invalid orientation
+     * @throws IllegalArgumentException for an invalid orientation
      * @see JScrollBar#setBlockIncrement
      */
     public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java b/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
index 648625e8974..a7d85a71e02 100644
--- a/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
@@ -105,8 +105,8 @@ public class NavigationFilter {
      * @param biasRet Used to return resulting Bias of next position
      * @return the location within the model that best represents the next
      *  location visual position
-     * @exception BadLocationException for a bad location within a document model
-     * @exception IllegalArgumentException if <code>direction</code>
+     * @throws BadLocationException for a bad location within a document model
+     * @throws IllegalArgumentException if <code>direction</code>
      *          doesn't have one of the legal values above
      */
     public int getNextVisualPositionFrom(JTextComponent text, int pos,
diff --git a/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java b/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
index f8d0e390cb2..e24583af13b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
@@ -876,7 +876,7 @@ public class ParagraphView extends FlowView implements TabExpander {
          * @param pos the position to convert
          * @param a the allocated region to render into
          * @return the bounding box of the given position
-         * @exception BadLocationException  if the given position does not represent a
+         * @throws BadLocationException  if the given position does not represent a
          *   valid location in the associated document
          * @see View#modelToView
          */
diff --git a/src/java.desktop/share/classes/javax/swing/text/PasswordView.java b/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
index 38bb0eec13e..bdf8d5cdfe6 100644
--- a/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
@@ -61,7 +61,7 @@ public class PasswordView extends FieldView {
      * @param p0 the starting offset in the model &gt;= 0
      * @param p1 the ending offset in the model &gt;= p0
      * @return the X location of the end of the range &gt;= 0
-     * @exception BadLocationException if p0 or p1 are out of range
+     * @throws BadLocationException if p0 or p1 are out of range
      *
      * @deprecated replaced by
      *     {@link #drawUnselectedText(Graphics2D, float, float, int, int)}
@@ -131,7 +131,7 @@ public class PasswordView extends FieldView {
      * @param p0 the starting offset in the model &gt;= 0
      * @param p1 the ending offset in the model &gt;= p0
      * @return the X location of the end of the range &gt;= 0
-     * @exception BadLocationException if p0 or p1 are out of range
+     * @throws BadLocationException if p0 or p1 are out of range
      *
      * @deprecated replaced by
      *     {@link #drawSelectedText(Graphics2D, float, float, int, int)}
@@ -240,7 +240,7 @@ public class PasswordView extends FieldView {
      * @param pos the position to convert &gt;= 0
      * @param a the allocated region to render into
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      * @see View#modelToView
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java b/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
index cd397d12a68..ad6a0bdf2d3 100644
--- a/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
@@ -107,7 +107,7 @@ public class PlainDocument extends AbstractDocument {
      * @param offs the starting offset &gt;= 0
      * @param str the string to insert; does nothing with null/empty strings
      * @param a the attributes for the inserted content
-     * @exception BadLocationException  the given insert position is not a valid
+     * @throws BadLocationException  the given insert position is not a valid
      *   position within the document
      * @see Document#insertString
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/PlainView.java b/src/java.desktop/share/classes/javax/swing/text/PlainView.java
index 725dec9bb7d..0c245196d99 100644
--- a/src/java.desktop/share/classes/javax/swing/text/PlainView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/PlainView.java
@@ -179,7 +179,7 @@ public class PlainView extends View implements TabExpander {
      * @param p0 the beginning position in the model &gt;= 0
      * @param p1 the ending position in the model &gt;= 0
      * @return the X location of the end of the range &gt;= 0
-     * @exception BadLocationException if the range is invalid
+     * @throws BadLocationException if the range is invalid
      *
      * @deprecated replaced by
      *     {@link #drawUnselectedText(Graphics2D, float, float, int, int)}
@@ -224,7 +224,7 @@ public class PlainView extends View implements TabExpander {
      * @param p0 the beginning position in the model {@code >= 0}
      * @param p1 the ending position in the model {@code >= 0}
      * @return the X location of the end of the range {@code >= 0}
-     * @exception BadLocationException if the range is invalid
+     * @throws BadLocationException if the range is invalid
      *
      * @since 9
      */
@@ -245,7 +245,7 @@ public class PlainView extends View implements TabExpander {
      * @param p0 the beginning position in the model &gt;= 0
      * @param p1 the ending position in the model &gt;= 0
      * @return the location of the end of the range
-     * @exception BadLocationException if the range is invalid
+     * @throws BadLocationException if the range is invalid
      *
      * @deprecated replaced by
      *     {@link #drawSelectedText(Graphics2D, float, float, int, int)}
@@ -294,7 +294,7 @@ public class PlainView extends View implements TabExpander {
      * @param p0 the beginning position in the model {@code >= 0}
      * @param p1 the ending position in the model {@code >= 0}
      * @return the location of the end of the range
-     * @exception BadLocationException if the range is invalid
+     * @throws BadLocationException if the range is invalid
      *
      * @since 9
      */
@@ -351,7 +351,7 @@ public class PlainView extends View implements TabExpander {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public float getPreferredSpan(int axis) {
         updateMetrics();
@@ -468,7 +468,7 @@ public class PlainView extends View implements TabExpander {
      * @param pos the position to convert &gt;= 0
      * @param a the allocated region to render into
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document
      * @see View#modelToView
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/StringContent.java b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
index 7f154df38ed..04bd4d7e0b4 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StringContent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
@@ -90,7 +90,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
      * @param where the starting position &gt;= 0 &amp;&amp; &lt; length()
      * @param str the non-null string to insert
      * @return an UndoableEdit object for undoing
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      * @see AbstractDocument.Content#insertString
      */
     public UndoableEdit insertString(int where, String str) throws BadLocationException {
@@ -111,7 +111,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
      * @param where the starting position &gt;= 0
      * @param nitems the number of characters to remove &gt;= 0
      * @return an UndoableEdit object for undoing
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      * @see AbstractDocument.Content#remove
      */
     public UndoableEdit remove(int where, int nitems) throws BadLocationException {
@@ -134,7 +134,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
      * @param where the starting position &gt;= 0
      * @param len the length to retrieve &gt;= 0
      * @return a string representing the content; may be empty
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      * @see AbstractDocument.Content#getString
      */
     public String getString(int where, int len) throws BadLocationException {
@@ -150,7 +150,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
      * @param where the starting position &gt;= 0
      * @param len the number of characters to retrieve &gt;= 0
      * @param chars the Segment object to return the characters in
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      * @see AbstractDocument.Content#getChars
      */
     public void getChars(int where, int len, Segment chars) throws BadLocationException {
@@ -168,7 +168,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
      *
      * @param offset the offset to create a position for &gt;= 0
      * @return the position
-     * @exception BadLocationException if the specified position is invalid
+     * @throws BadLocationException if the specified position is invalid
      */
     public Position createPosition(int offset) throws BadLocationException {
         // some small documents won't have any sticky positions
diff --git a/src/java.desktop/share/classes/javax/swing/text/StyleContext.java b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
index 9e01aecd3fb..70da1356b99 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
@@ -579,7 +579,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
      * Context-specific handling of writing out attributes
      * @param out the output stream
      * @param a the attribute set
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     public void writeAttributes(ObjectOutputStream out,
                                   AttributeSet a) throws IOException {
@@ -591,9 +591,9 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
      * @param in the object stream to read the attribute data from.
      * @param a  the attribute set to place the attribute
      *   definitions in.
-     * @exception ClassNotFoundException passed upward if encountered
+     * @throws ClassNotFoundException passed upward if encountered
      *  when reading the object stream.
-     * @exception IOException passed upward if encountered when
+     * @throws IOException passed upward if encountered when
      *  reading the object stream.
      */
     public void readAttributes(ObjectInputStream in,
@@ -613,7 +613,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
      *
      * @param out the output stream
      * @param a the attribute set
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     public static void writeAttributeSet(ObjectOutputStream out,
                                          AttributeSet a) throws IOException {
@@ -660,9 +660,9 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
      * @param in the object stream to read the attribute data from.
      * @param a  the attribute set to place the attribute
      *   definitions in.
-     * @exception ClassNotFoundException passed upward if encountered
+     * @throws ClassNotFoundException passed upward if encountered
      *  when reading the object stream.
-     * @exception IOException passed upward if encountered when
+     * @throws IOException passed upward if encountered when
      *  reading the object stream.
      */
     public static void readAttributeSet(ObjectInputStream in,
@@ -1077,7 +1077,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
          * Returns the next element of this enumeration.
          *
          * @return     the next element of this enumeration.
-         * @exception  NoSuchElementException  if no more elements exist.
+         * @throws  NoSuchElementException  if no more elements exist.
          * @since      1.0
          */
         public Object nextElement() {
diff --git a/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
index 00ad982cbf4..a4984efce6c 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
@@ -411,7 +411,7 @@ public class StyledEditorKit extends DefaultEditorKit {
          *
          * @param e the editor
          * @return the document
-         * @exception IllegalArgumentException for the wrong document type
+         * @throws IllegalArgumentException for the wrong document type
          */
         protected final StyledDocument getStyledDocument(JEditorPane e) {
             Document d = e.getDocument();
@@ -426,7 +426,7 @@ public class StyledEditorKit extends DefaultEditorKit {
          *
          * @param e the editor pane
          * @return the kit
-         * @exception IllegalArgumentException for the wrong document type
+         * @throws IllegalArgumentException for the wrong document type
          */
         protected final StyledEditorKit getStyledEditorKit(JEditorPane e) {
             EditorKit k = e.getEditorKit();
diff --git a/src/java.desktop/share/classes/javax/swing/text/TableView.java b/src/java.desktop/share/classes/javax/swing/text/TableView.java
index bd1c677ffae..d18bd5a93db 100644
--- a/src/java.desktop/share/classes/javax/swing/text/TableView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/TableView.java
@@ -805,7 +805,7 @@ public abstract class TableView extends BoxView {
          *
          * @param axis may be either View.X_AXIS or View.Y_AXIS
          * @return the resize weight
-         * @exception IllegalArgumentException for an invalid axis
+         * @throws IllegalArgumentException for an invalid axis
          */
         public int getResizeWeight(int axis) {
             return 1;
diff --git a/src/java.desktop/share/classes/javax/swing/text/Utilities.java b/src/java.desktop/share/classes/javax/swing/text/Utilities.java
index ae93b5a40b5..62f323f076a 100644
--- a/src/java.desktop/share/classes/javax/swing/text/Utilities.java
+++ b/src/java.desktop/share/classes/javax/swing/text/Utilities.java
@@ -683,7 +683,7 @@ public class Utilities {
      * @param offs the offset in the document &gt;= 0
      * @return the position &gt;= 0 if the request can be computed, otherwise
      *  a value of -1 will be returned.
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      */
     @SuppressWarnings("deprecation")
     public static final int getRowStart(JTextComponent c, int offs) throws BadLocationException {
@@ -714,7 +714,7 @@ public class Utilities {
      * @param offs the offset in the document &gt;= 0
      * @return the position &gt;= 0 if the request can be computed, otherwise
      *  a value of -1 will be returned.
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      */
     @SuppressWarnings("deprecation")
     public static final int getRowEnd(JTextComponent c, int offs) throws BadLocationException {
@@ -747,7 +747,7 @@ public class Utilities {
      * @param x the X coordinate &gt;= 0
      * @return the position &gt;= 0 if the request can be computed, otherwise
      *  a value of -1 will be returned.
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      *
      * @deprecated replaced by
      *     {@link #getPositionAbove(JTextComponent, int, float)}
@@ -802,7 +802,7 @@ public class Utilities {
      * @param x the X coordinate {@code >= 0}
      * @return the position {@code >= 0} if the request can be computed, otherwise
      *  a value of -1 will be returned.
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      *
      * @since 9
      */
@@ -822,7 +822,7 @@ public class Utilities {
      * @param x the X coordinate &gt;= 0
      * @return the position &gt;= 0 if the request can be computed, otherwise
      *  a value of -1 will be returned.
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      *
      * @deprecated replaced by
      *     {@link #getPositionBelow(JTextComponent, int, float)}
@@ -878,7 +878,7 @@ public class Utilities {
      * @param x the X coordinate {@code >= 0}
      * @return the position {@code >= 0} if the request can be computed, otherwise
      *  a value of -1 will be returned.
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      *
      * @since 9
      */
@@ -894,7 +894,7 @@ public class Utilities {
      * @param c the editor
      * @param offs the offset in the document &gt;= 0
      * @return the location in the model of the word start &gt;= 0
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      */
     public static final int getWordStart(JTextComponent c, int offs) throws BadLocationException {
         Document doc = c.getDocument();
@@ -928,7 +928,7 @@ public class Utilities {
      * @param c the editor
      * @param offs the offset in the document &gt;= 0
      * @return the location in the model of the word end &gt;= 0
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      */
     public static final int getWordEnd(JTextComponent c, int offs) throws BadLocationException {
         Document doc = c.getDocument();
@@ -961,7 +961,7 @@ public class Utilities {
      * @param c the editor
      * @param offs the offset in the document &gt;= 0
      * @return the location in the model of the word start &gt;= 0
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      */
     public static final int getNextWord(JTextComponent c, int offs) throws BadLocationException {
         int nextWord;
@@ -1039,7 +1039,7 @@ public class Utilities {
      * @param c the editor
      * @param offs the offset in the document &gt;= 0
      * @return the location in the model of the word start &gt;= 0
-     * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      */
     public static final int getPreviousWord(JTextComponent c, int offs) throws BadLocationException {
         int prevWord;
@@ -1271,8 +1271,8 @@ public class Utilities {
      * @param biasRet an array contain the bias that was checked
      * @return the location within the model that best represents the next
      *  location visual position
-     * @exception BadLocationException
-     * @exception IllegalArgumentException if <code>direction</code> is invalid
+     * @throws BadLocationException
+     * @throws IllegalArgumentException if <code>direction</code> is invalid
      */
     static int getNextVisualPositionFrom(View v, int pos, Position.Bias b,
                                           Shape alloc, int direction,
diff --git a/src/java.desktop/share/classes/javax/swing/text/View.java b/src/java.desktop/share/classes/javax/swing/text/View.java
index a3ad927e3a8..eb10efb0e83 100644
--- a/src/java.desktop/share/classes/javax/swing/text/View.java
+++ b/src/java.desktop/share/classes/javax/swing/text/View.java
@@ -495,9 +495,9 @@ public abstract class View implements SwingConstants {
      * @param biasRet the returned bias
      * @return the location within the model that best represents the next
      *  location visual position
-     * @exception BadLocationException the given position is not a valid
+     * @throws BadLocationException the given position is not a valid
      *                                 position within the document
-     * @exception IllegalArgumentException if <code>direction</code>
+     * @throws IllegalArgumentException if <code>direction</code>
      *          doesn't have one of the legal values above
      */
     @SuppressWarnings("deprecation")
@@ -585,9 +585,9 @@ public abstract class View implements SwingConstants {
      * </ul>
      * @return the bounding box, in view coordinate space,
      *          of the character at the specified position
-     * @exception BadLocationException  if the specified position does
+     * @throws BadLocationException  if the specified position does
      *   not represent a valid location in the associated document
-     * @exception IllegalArgumentException if <code>b</code> is not one of the
+     * @throws IllegalArgumentException if <code>b</code> is not one of the
      *          legal <code>Position.Bias</code> values listed above
      * @see View#viewToModel
      */
@@ -615,9 +615,9 @@ public abstract class View implements SwingConstants {
      * @param a the area of the view, which encompasses the requested region
      * @return the bounding box which is a union of the region specified
      *          by the first and last character positions
-     * @exception BadLocationException  if the given position does
+     * @throws BadLocationException  if the given position does
      *   not represent a valid location in the associated document
-     * @exception IllegalArgumentException if <code>b0</code> or
+     * @throws IllegalArgumentException if <code>b0</code> or
      *          <code>b1</code> are not one of the
      *          legal <code>Position.Bias</code> values listed above
      * @see View#viewToModel
@@ -1337,7 +1337,7 @@ public abstract class View implements SwingConstants {
      * @param pos the position to convert &gt;= 0
      * @param a the allocated region in which to render
      * @return the bounding box of the given position is returned
-     * @exception BadLocationException  if the given position does
+     * @throws BadLocationException  if the given position does
      *   not represent a valid location in the associated document
      * @see View#modelToView
      * @deprecated
diff --git a/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java b/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
index b229fa69f9f..d3587c8b40b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
@@ -207,7 +207,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
      * @param p0 the beginning position in the model &gt;= 0
      * @param p1 the ending position in the model &gt;= p0
      * @return the X location of the end of the range &gt;= 0
-     * @exception BadLocationException if the range is invalid
+     * @throws BadLocationException if the range is invalid
      *
      * @deprecated replaced by
      *     {@link #drawUnselectedText(Graphics2D, float, float, int, int)}
@@ -252,7 +252,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
      * @param p0 the beginning position in the model &gt;= 0
      * @param p1 the ending position in the model &gt;= p0
      * @return the X location of the end of the range &gt;= 0
-     * @exception BadLocationException if the range is invalid
+     * @throws BadLocationException if the range is invalid
      *
      * @since 9
      */
@@ -272,7 +272,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
      * @param p0 the beginning position in the model &gt;= 0
      * @param p1 the ending position in the model &gt;= p0
      * @return the location of the end of the range.
-     * @exception BadLocationException if the range is invalid
+     * @throws BadLocationException if the range is invalid
      *
      * @deprecated replaced by
      *     {@link #drawSelectedText(Graphics2D, float, float, int, int)}
@@ -320,7 +320,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
      * @param p0 the beginning position in the model &gt;= 0
      * @param p1 the ending position in the model &gt;= p0
      * @return the location of the end of the range.
-     * @exception BadLocationException if the range is invalid
+     * @throws BadLocationException if the range is invalid
      *
      * @since 9
      */
@@ -748,7 +748,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
          * @param pos the position to convert
          * @param a the allocated region to render into
          * @return the bounding box of the given position is returned
-         * @exception BadLocationException  if the given position does not represent a
+         * @throws BadLocationException  if the given position does not represent a
          *   valid location in the associated document
          * @see View#modelToView
          */
diff --git a/src/java.desktop/share/classes/javax/swing/text/ZoneView.java b/src/java.desktop/share/classes/javax/swing/text/ZoneView.java
index 1deb927fb6e..595eafc336b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/ZoneView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/ZoneView.java
@@ -134,7 +134,7 @@ public class ZoneView extends BoxView {
      *
      * @param mzl the desired maximum number of zones
      *  to be actively loaded, must be greater than 0
-     * @exception IllegalArgumentException if <code>mzl</code> is &lt; 1
+     * @throws IllegalArgumentException if <code>mzl</code> is &lt; 1
      */
     public void setMaxZonesLoaded(int mzl) {
         if (mzl < 1) {
@@ -579,7 +579,7 @@ public class ZoneView extends BoxView {
          * @param pos the position to convert
          * @param a the allocated region to render into
          * @return the bounding box of the given position
-         * @exception BadLocationException  if the given position does not represent a
+         * @throws BadLocationException  if the given position does not represent a
          *   valid location in the associated document
          * @see View#modelToView
          */
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
index 12cd5a74a72..77623a541e0 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
@@ -384,7 +384,7 @@ class AccessibleHTML implements Accessible {
          * @return this component's locale.  If this component does not have
          * a locale, the locale of its parent is returned.
          *
-         * @exception IllegalComponentStateException
+         * @throws IllegalComponentStateException
          * If the Component does not have its own locale and has not yet been
          * added to a containment hierarchy such that the locale can be
          * determined from the containing parent.
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java b/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java
index 524a57d93c1..dc2a5e22477 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java
@@ -300,7 +300,7 @@ public class BlockView extends BoxView  {
      *
      * @param axis may be either X_AXIS or Y_AXIS
      * @return the weight
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public int getResizeWeight(int axis) {
         switch (axis) {
@@ -356,7 +356,7 @@ public class BlockView extends BoxView  {
      *           typically the view is told to render into the span
      *           that is returned, although there is no guarantee;
      *           the parent may choose to resize or break the view
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getPreferredSpan(int axis) {
         return super.getPreferredSpan(axis);
@@ -372,7 +372,7 @@ public class BlockView extends BoxView  {
      *           typically the view is told to render into the span
      *           that is returned, although there is no guarantee;
      *           the parent may choose to resize or break the view
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getMinimumSpan(int axis) {
         return super.getMinimumSpan(axis);
@@ -388,7 +388,7 @@ public class BlockView extends BoxView  {
      *           typically the view is told to render into the span
      *           that is returned, although there is no guarantee;
      *           the parent may choose to resize or break the view
-     * @exception IllegalArgumentException for an invalid axis type
+     * @throws IllegalArgumentException for an invalid axis type
      */
     public float getMaximumSpan(int axis) {
         return super.getMaximumSpan(axis);
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/FormView.java b/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
index 467651a9d98..b0855832a1d 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
@@ -380,7 +380,7 @@ public class FormView extends ComponentView implements ActionListener {
      *           Typically the view is told to render into the span
      *           that is returned, although there is no guarantee.
      *           The parent may choose to resize or break the view.
-     * @exception IllegalArgumentException for an invalid axis
+     * @throws IllegalArgumentException for an invalid axis
      */
     public float getMaximumSpan(int axis) {
         switch (axis) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java b/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java
index 885f0b7f2c9..29a7fce803d 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java
@@ -245,7 +245,7 @@ class HRuleView extends View  {
      * @param pos the position to convert
      * @param a the allocated region to render into
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      * represent a valid location in the associated document
      * @see View#modelToView
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
index 46d84e3cadc..f4bbb772e78 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
@@ -427,7 +427,7 @@ public class HTMLDocument extends DefaultStyledDocument {
      *
      * @param offset the starting offset
      * @param data the element data
-     * @exception BadLocationException  if the given position does not
+     * @throws BadLocationException  if the given position does not
      *   represent a valid location in the associated document.
      */
     protected void insert(int offset, ElementSpec[] data) throws BadLocationException {
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
index 8d78819b0e8..a5c1067f03f 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
@@ -298,10 +298,10 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
      * @param doc the destination for the insertion
      * @param pos the location in the document to place the
      *   content
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document
-     * @exception RuntimeException (will eventually be a BadLocationException)
+     * @throws RuntimeException (will eventually be a BadLocationException)
      *            if pos is invalid
      */
     public void read(Reader in, Document doc, int pos) throws IOException, BadLocationException {
@@ -337,7 +337,7 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
      *
      * @throws BadLocationException if {@code offset} is invalid
      * @throws IOException on I/O error
-     * @exception RuntimeException (will eventually be a BadLocationException)
+     * @throws RuntimeException (will eventually be a BadLocationException)
      *            if pos is invalid
      */
     public void insertHTML(HTMLDocument doc, int offset, String html,
@@ -367,8 +367,8 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
      * @param pos the location in the document to fetch the
      *   content
      * @param len the amount to write out
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if {@code pos} represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if {@code pos} represents an invalid
      *   location within the document
      */
     public void write(Writer out, Document doc, int pos, int len)
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java
index c11214d71e3..270e4615309 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java
@@ -125,8 +125,8 @@ public class HTMLWriter extends AbstractWriter {
      * Element tree and controls the writing out of
      * all the tags and its attributes.
      *
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      *
      */
@@ -248,7 +248,7 @@ public class HTMLWriter extends AbstractWriter {
      * HTML.Attribute.ENDTAG.
      *
      * @param attr   an AttributeSet
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      *
      */
     protected void writeAttributes(AttributeSet attr) throws IOException {
@@ -273,8 +273,8 @@ public class HTMLWriter extends AbstractWriter {
      * corresponding end tag).
      *
      * @param elem   an Element
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      */
     protected void emptyTag(Element elem) throws BadLocationException, IOException {
@@ -451,8 +451,8 @@ public class HTMLWriter extends AbstractWriter {
      * element.
      *
      * @param attr  an AttributeSet
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      */
     protected void textAreaContent(AttributeSet attr) throws BadLocationException, IOException {
@@ -485,8 +485,8 @@ public class HTMLWriter extends AbstractWriter {
      * out.
      *
      * @param elem   an Element
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      */
     protected void text(Element elem) throws BadLocationException, IOException {
@@ -523,7 +523,7 @@ public class HTMLWriter extends AbstractWriter {
      * Writes out the content of the SELECT form element.
      *
      * @param attr the AttributeSet associated with the form element
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void selectContent(AttributeSet attr) throws IOException {
         Object model = attr.getAttribute(StyleConstants.ModelAttribute);
@@ -552,7 +552,7 @@ public class HTMLWriter extends AbstractWriter {
     /**
      * Writes out the content of the Option form element.
      * @param option  an Option
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      *
      */
     protected void writeOption(Option option) throws IOException {
@@ -580,7 +580,7 @@ public class HTMLWriter extends AbstractWriter {
      * Writes out an end tag for the element.
      *
      * @param elem    an Element
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void endTag(Element elem) throws IOException {
         if (synthesizedElement(elem)) {
@@ -615,8 +615,8 @@ public class HTMLWriter extends AbstractWriter {
      * Writes out comments.
      *
      * @param elem    an Element
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      */
     protected void comment(Element elem) throws BadLocationException, IOException {
@@ -637,8 +637,8 @@ public class HTMLWriter extends AbstractWriter {
      * Writes out comment string.
      *
      * @param string   the comment
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      */
     void writeComment(String string) throws IOException {
@@ -712,7 +712,7 @@ public class HTMLWriter extends AbstractWriter {
      * written out.
      *
      * @param attr a set of attributes
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeEmbeddedTags(AttributeSet attr) throws IOException {
 
@@ -767,7 +767,7 @@ public class HTMLWriter extends AbstractWriter {
      * end tag is written out.
      *
      * @param attr a set of attributes
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void closeOutUnwantedEmbeddedTags(AttributeSet attr) throws IOException {
 
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
index 6f0a7cbdff4..7d2583509c1 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
@@ -557,7 +557,7 @@ public class ImageView extends View {
      * @param pos the position to convert
      * @param a the allocated region to render into
      * @return the bounding box of the given position
-     * @exception BadLocationException  if the given position does not represent a
+     * @throws BadLocationException  if the given position does not represent a
      *   valid location in the associated document
      * @see View#modelToView
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java b/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
index caa8dd07051..712cb350ee9 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
@@ -128,8 +128,8 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * Generates HTML output
      * from a StyledDocument.
      *
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      *
      */
@@ -152,7 +152,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * The attribute name and value are separated by a colon.
      * Each pair is separated by a semicolon.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeAttributes(AttributeSet attr) throws IOException {
         Enumeration<?> attributeNames = attr.getAttributeNames();
@@ -178,7 +178,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
     /**
      * Writes out text.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void text(Element elem) throws IOException, BadLocationException {
         String contentStr = getText(elem);
@@ -196,7 +196,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * indented.  Also increments the indent level.
      *
      * @param tag a start tag
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeStartTag(String tag) throws IOException {
         indent();
@@ -211,7 +211,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * indented.  Also decrements the indent level.
      *
      * @param endTag an end tag
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeEndTag(String endTag) throws IOException {
         decrIndent();
@@ -230,7 +230,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * document is viewable in applications/browsers
      * that do not support the tag.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeHeader() throws IOException {
         writeStartTag("<head>");
@@ -248,7 +248,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * Writes out all the named styles as the
      * content of the &lt;style&gt; tag.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeStyles() throws IOException {
         /*
@@ -338,7 +338,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * that all other tags that have been opened are
      * appropriately closed off.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeEndParagraph() throws IOException {
         writeEndMask(fontMask);
@@ -359,7 +359,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * style.
      *
      * @param elem an element
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeStartParagraph(Element elem) throws IOException {
         AttributeSet attr = elem.getAttributes();
@@ -377,7 +377,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * elements.
      *
      * @param elem an element
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeLeaf(Element elem) throws IOException {
         indent();
@@ -434,8 +434,8 @@ public class MinimalHTMLWriter extends AbstractWriter {
      *
      * @param elem an element
      * @param needsIndenting indention will be added if {@code needsIndenting} is {@code true}
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *            location within the document.
      */
     protected void writeContent(Element elem,  boolean needsIndenting)
@@ -457,7 +457,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * text based on its attribute settings.
      *
      * @param attr a set of attributes
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
 
     protected void writeHTMLTags(AttributeSet attr) throws IOException {
@@ -522,7 +522,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * Writes out start tags &lt;u&gt;, &lt;i&gt;, and &lt;b&gt; based on
      * the mask settings.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     private void writeStartMask(int mask) throws IOException  {
         if (mask != 0) {
@@ -542,7 +542,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * Writes out end tags for &lt;u&gt;, &lt;i&gt;, and &lt;b&gt; based on
      * the mask settings.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     private void writeEndMask(int mask) throws IOException {
         if (mask != 0) {
@@ -569,7 +569,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * attributes just like inline styles.
      *
      * @param attr a set of attributes
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void writeNonHTMLAttributes(AttributeSet attr) throws IOException {
 
@@ -636,7 +636,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * <p>
      * Writes out an end tag for the &lt;font&gt; tag.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void endFontTag() throws IOException {
         write(NEWLINE);
@@ -655,7 +655,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * new start tag.
      *
      * @param style a font style
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     protected void startFontTag(String style) throws IOException {
         boolean callIndent = false;
@@ -676,7 +676,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
      * any enclosing font tag before writing out a
      * new start tag.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     private void startSpanTag(String style) throws IOException {
         boolean callIndent = false;
@@ -693,7 +693,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
     /**
      * Writes out an end tag for the &lt;span&gt; tag.
      *
-     * @exception IOException on any I/O error
+     * @throws IOException on any I/O error
      */
     private void endSpanTag() throws IOException {
         write(NEWLINE);
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java b/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java
index 2b84b54b3e1..c7f0ff34a9b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java
@@ -464,7 +464,7 @@ class OptionListModel<E> extends DefaultListModel<E> implements ListSelectionMod
      * <code>listenerLists</code> are not duplicated.
      *
      * @return a clone of the receiver
-     * @exception CloneNotSupportedException if the receiver does not
+     * @throws CloneNotSupportedException if the receiver does not
      *    both (a) implement the <code>Cloneable</code> interface
      *    and (b) define a <code>clone</code> method
      */
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
index 9ce35f47ee9..35002f9fff2 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
@@ -1886,7 +1886,7 @@ public class StyleSheet extends StyleContext {
          *  used to get the AttributeSet, and may be used to
          *  resolve percentage arguments.
          * @return the inset needed for the margin, border and padding.
-         * @exception IllegalArgumentException for an invalid direction
+         * @throws IllegalArgumentException for an invalid direction
          */
         public float getInset(int side, View v) {
             AttributeSet a = v.getAttributes();
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/TableView.java b/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
index c088bf0eb9a..11b383acd31 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
@@ -1611,7 +1611,7 @@ import javax.swing.text.*;
          *
          * @param axis may be either View.X_AXIS or View.Y_AXIS
          * @return the resize weight
-         * @exception IllegalArgumentException for an invalid axis
+         * @throws IllegalArgumentException for an invalid axis
          */
         public int getResizeWeight(int axis) {
             return 1;
diff --git a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java
index 794c2cfee40..f841d9119f5 100644
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java
@@ -70,8 +70,8 @@ public class RTFEditorKit extends StyledEditorKit {
      * @param doc The destination for the insertion.
      * @param pos The location in the document to place the
      *   content.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public void read(InputStream in, Document doc, int pos) throws IOException, BadLocationException {
@@ -97,8 +97,8 @@ public class RTFEditorKit extends StyledEditorKit {
      * @param pos The location in the document to fetch the
      *   content.
      * @param len The amount to write out.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public void write(OutputStream out, Document doc, int pos, int len)
@@ -117,8 +117,8 @@ public class RTFEditorKit extends StyledEditorKit {
      * @param doc The destination for the insertion.
      * @param pos The location in the document to place the
      *   content.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public void read(Reader in, Document doc, int pos)
@@ -143,8 +143,8 @@ public class RTFEditorKit extends StyledEditorKit {
      * @param pos The location in the document to fetch the
      *   content.
      * @param len The amount to write out.
-     * @exception IOException on any I/O error
-     * @exception BadLocationException if pos represents an invalid
+     * @throws IOException on any I/O error
+     * @throws BadLocationException if pos represents an invalid
      *   location within the document.
      */
     public void write(Writer out, Document doc, int pos, int len)
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
index 7735895502e..11efb12e7a2 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
@@ -174,12 +174,12 @@ public class DefaultMutableTreeNode implements Cloneable,
      * @param   newChild        the MutableTreeNode to insert under this node
      * @param   childIndex      the index in this node's child array
      *                          where this node is to be inserted
-     * @exception       ArrayIndexOutOfBoundsException  if
+     * @throws       ArrayIndexOutOfBoundsException  if
      *                          <code>childIndex</code> is out of bounds
-     * @exception       IllegalArgumentException        if
+     * @throws       IllegalArgumentException        if
      *                          <code>newChild</code> is null or is an
      *                          ancestor of this node
-     * @exception       IllegalStateException   if this node does not allow
+     * @throws       IllegalStateException   if this node does not allow
      *                                          children
      * @see     #isNodeDescendant
      */
@@ -211,7 +211,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      *
      * @param   childIndex      the index in this node's child array
      *                          of the child to remove
-     * @exception       ArrayIndexOutOfBoundsException  if
+     * @throws       ArrayIndexOutOfBoundsException  if
      *                          <code>childIndex</code> is out of bounds
      */
     public void remove(int childIndex) {
@@ -247,7 +247,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      * Returns the child at the specified index in this node's child array.
      *
      * @param   index   an index into this node's child array
-     * @exception       ArrayIndexOutOfBoundsException  if <code>index</code>
+     * @throws       ArrayIndexOutOfBoundsException  if <code>index</code>
      *                                          is out of bounds
      * @return  the TreeNode in this node's child array at  the specified index
      */
@@ -278,7 +278,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      * where n is the number of children.
      *
      * @param   aChild  the TreeNode to search for among this node's children
-     * @exception       IllegalArgumentException        if <code>aChild</code>
+     * @throws       IllegalArgumentException        if <code>aChild</code>
      *                                                  is null
      * @return  an int giving the index of the node in this node's child
      *          array, or <code>-1</code> if the specified node is a not
@@ -382,7 +382,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      * null parent.
      *
      * @param   aChild  a child of this node to remove
-     * @exception       IllegalArgumentException        if <code>aChild</code>
+     * @throws       IllegalArgumentException        if <code>aChild</code>
      *                                  is null or is not a child of this node
      */
     public void remove(MutableTreeNode aChild) {
@@ -412,9 +412,9 @@ public class DefaultMutableTreeNode implements Cloneable,
      *
      * @see             #insert
      * @param   newChild        node to add as a child of this node
-     * @exception       IllegalArgumentException    if <code>newChild</code>
+     * @throws       IllegalArgumentException    if <code>newChild</code>
      *                                          is null
-     * @exception       IllegalStateException   if this node does not allow
+     * @throws       IllegalStateException   if this node does not allow
      *                                          children
      */
     public void add(MutableTreeNode newChild) {
@@ -846,7 +846,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      * @param           ancestor the node to start enumeration from
      * @see             #isNodeAncestor
      * @see             #isNodeDescendant
-     * @exception       IllegalArgumentException if <code>ancestor</code> is
+     * @throws       IllegalArgumentException if <code>ancestor</code> is
      *                                          not an ancestor of this node
      * @return  an enumeration for following the path from an ancestor of
      *          this node to this one
@@ -890,7 +890,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      * throws NoSuchElementException.
      *
      * @return  the first child of this node
-     * @exception       NoSuchElementException  if this node has no children
+     * @throws       NoSuchElementException  if this node has no children
      */
     public TreeNode getFirstChild() {
         if (getChildCount() == 0) {
@@ -905,7 +905,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      * throws NoSuchElementException.
      *
      * @return  the last child of this node
-     * @exception       NoSuchElementException  if this node has no children
+     * @throws       NoSuchElementException  if this node has no children
      */
     public TreeNode getLastChild() {
         if (getChildCount() == 0) {
@@ -925,7 +925,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      *
      * @param           aChild the child node to look for next child after it
      * @see             #children
-     * @exception       IllegalArgumentException if <code>aChild</code> is
+     * @throws       IllegalArgumentException if <code>aChild</code> is
      *                                  null or is not a child of this node
      * @return  the child of this node that immediately follows
      *          <code>aChild</code>
@@ -957,7 +957,7 @@ public class DefaultMutableTreeNode implements Cloneable,
      * and is O(n) where n is the number of children.
      *
      * @param           aChild the child node to look for previous child before it
-     * @exception       IllegalArgumentException if <code>aChild</code> is null
+     * @throws       IllegalArgumentException if <code>aChild</code> is null
      *                                          or is not a child of this node
      * @return  the child of this node that immediately precedes
      *          <code>aChild</code>
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
index 4cdec3f6b38..511cde568c0 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
@@ -672,7 +672,7 @@ public class DefaultTreeModel implements Serializable, TreeModel {
      *          <code><em>Foo</em>Listener</code>s on this component,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code>
+     * @throws ClassCastException if <code>listenerType</code>
      *          doesn't specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
index e1bdc4fc94b..ff7ed27302d 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -679,7 +679,7 @@ public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeS
      *          <code><em>Foo</em>Listener</code>s on this component,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if <code>listenerType</code>
+     * @throws ClassCastException if <code>listenerType</code>
      *          doesn't specify a class or interface that implements
      *          <code>java.util.EventListener</code>
      *
@@ -1187,7 +1187,7 @@ public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeS
      * This method does not duplicate
      * selection listeners and property listeners.
      *
-     * @exception CloneNotSupportedException never thrown by instances of
+     * @throws CloneNotSupportedException never thrown by instances of
      *                                       this class
      */
     public Object clone() throws CloneNotSupportedException {
diff --git a/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java b/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java
index 7184557d1e7..94f5eb69a74 100644
--- a/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java
+++ b/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java
@@ -102,7 +102,7 @@ public class AbstractUndoableEdit implements UndoableEdit, Serializable {
      * operation represented by this edit. Override should begin with
      * a call to super.
      *
-     * @exception CannotUndoException if <code>canUndo</code>
+     * @throws CannotUndoException if <code>canUndo</code>
      *    returns <code>false</code>
      * @see     #canUndo
      */
@@ -134,7 +134,7 @@ public class AbstractUndoableEdit implements UndoableEdit, Serializable {
      * Subclasses should override to redo the operation represented by
      * this edit. Override should begin with a call to super.
      *
-     * @exception CannotRedoException if <code>canRedo</code>
+     * @throws CannotRedoException if <code>canRedo</code>
      *     returns <code>false</code>
      * @see     #canRedo
      */
-- 
GitLab


From 249d553659ab75a2271e98c77e7d62f662ffa684 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 17 Mar 2022 09:15:54 +0000
Subject: [PATCH 109/345] 8282602: Refactor awt classes javadoc to use @throws
 instead of @exception

Reviewed-by: aivanov, prr
---
 .../classes/java/awt/AWTEventMulticaster.java |  4 +-
 .../share/classes/java/awt/BorderLayout.java  |  8 +-
 .../classes/java/awt/BufferCapabilities.java  |  2 +-
 .../share/classes/java/awt/Button.java        |  6 +-
 .../share/classes/java/awt/Canvas.java        |  8 +-
 .../share/classes/java/awt/CardLayout.java    |  2 +-
 .../share/classes/java/awt/Checkbox.java      | 12 +--
 .../classes/java/awt/CheckboxMenuItem.java    |  8 +-
 .../share/classes/java/awt/Choice.java        | 16 ++--
 .../share/classes/java/awt/Color.java         |  2 +-
 .../share/classes/java/awt/Component.java     | 36 ++++-----
 .../share/classes/java/awt/Container.java     | 42 +++++------
 .../share/classes/java/awt/Cursor.java        |  4 +-
 .../share/classes/java/awt/Dialog.java        | 74 +++++++++----------
 .../share/classes/java/awt/EventQueue.java    |  8 +-
 .../share/classes/java/awt/FileDialog.java    | 18 ++---
 .../share/classes/java/awt/Frame.java         | 12 +--
 .../java/awt/GraphicsConfiguration.java       |  4 +-
 .../classes/java/awt/GraphicsDevice.java      |  4 +-
 .../classes/java/awt/GraphicsEnvironment.java |  8 +-
 .../share/classes/java/awt/GridBagLayout.java |  2 +-
 .../share/classes/java/awt/GridLayout.java    |  6 +-
 .../share/classes/java/awt/Image.java         |  4 +-
 .../share/classes/java/awt/Label.java         |  8 +-
 .../share/classes/java/awt/List.java          | 16 ++--
 .../share/classes/java/awt/MediaTracker.java  |  8 +-
 .../share/classes/java/awt/Menu.java          | 12 +--
 .../share/classes/java/awt/MenuBar.java       |  2 +-
 .../share/classes/java/awt/MenuComponent.java |  2 +-
 .../share/classes/java/awt/MenuItem.java      |  8 +-
 .../share/classes/java/awt/MouseInfo.java     |  6 +-
 .../share/classes/java/awt/Polygon.java       |  6 +-
 .../share/classes/java/awt/PopupMenu.java     | 12 +--
 .../classes/java/awt/RenderingHints.java      | 16 ++--
 .../share/classes/java/awt/Scrollbar.java     | 14 ++--
 .../share/classes/java/awt/TextArea.java      | 14 ++--
 .../share/classes/java/awt/TextComponent.java |  6 +-
 .../share/classes/java/awt/TextField.java     | 12 +--
 .../share/classes/java/awt/Toolkit.java       | 46 ++++++------
 .../share/classes/java/awt/Window.java        | 30 ++++----
 .../classes/java/awt/dnd/DragSource.java      |  6 +-
 .../classes/java/awt/dnd/DropTarget.java      | 10 +--
 .../java/awt/event/InputMethodEvent.java      |  2 +-
 .../classes/java/awt/font/TextLayout.java     |  2 +-
 .../java/awt/geom/AffineTransform.java        |  8 +-
 .../classes/java/awt/geom/CubicCurve2D.java   |  2 +-
 .../classes/java/awt/geom/Dimension2D.java    |  2 +-
 .../java/awt/geom/FlatteningPathIterator.java |  6 +-
 .../share/classes/java/awt/geom/Line2D.java   |  2 +-
 .../share/classes/java/awt/geom/Path2D.java   |  8 +-
 .../share/classes/java/awt/geom/Point2D.java  |  2 +-
 .../classes/java/awt/geom/QuadCurve2D.java    |  2 +-
 .../java/awt/geom/RectangularShape.java       |  2 +-
 .../classes/java/awt/im/InputContext.java     |  6 +-
 .../java/awt/im/InputMethodHighlight.java     |  6 +-
 .../classes/java/awt/im/spi/InputMethod.java  |  6 +-
 .../java/awt/im/spi/InputMethodContext.java   |  4 +-
 .../awt/im/spi/InputMethodDescriptor.java     |  4 +-
 .../classes/java/awt/image/BufferedImage.java | 10 +--
 .../java/awt/image/ByteLookupTable.java       |  4 +-
 .../java/awt/image/ColorConvertOp.java        |  8 +-
 .../java/awt/image/DirectColorModel.java      | 30 ++++----
 .../classes/java/awt/image/ImageFilter.java   |  4 +-
 .../image/MultiPixelPackedSampleModel.java    | 14 ++--
 .../classes/java/awt/image/PixelGrabber.java  |  4 +-
 .../java/awt/image/RGBImageFilter.java        |  2 +-
 .../share/classes/java/awt/image/Raster.java  |  4 +-
 .../java/awt/image/ShortLookupTable.java      |  4 +-
 .../image/SinglePixelPackedSampleModel.java   |  2 +-
 .../java/awt/image/WritableRaster.java        |  2 +-
 .../classes/java/awt/print/PageFormat.java    |  2 +-
 .../classes/java/awt/print/Printable.java     |  2 +-
 .../classes/java/awt/print/PrinterJob.java    | 20 ++---
 73 files changed, 350 insertions(+), 350 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java b/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java
index a9f102643f4..b7584fc84dd 100644
--- a/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java
+++ b/src/java.desktop/share/classes/java/awt/AWTEventMulticaster.java
@@ -1097,9 +1097,9 @@ public class AWTEventMulticaster implements
      *          <code><em>Foo</em>Listener</code>s by the specified multicast
      *          listener, or an empty array if no such listeners have been
      *          chained by the specified multicast listener
-     * @exception NullPointerException if the specified
+     * @throws NullPointerException if the specified
      *             {@code listenertype} parameter is {@code null}
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/BorderLayout.java b/src/java.desktop/share/classes/java/awt/BorderLayout.java
index 88edc23dec4..e3b92a7996a 100644
--- a/src/java.desktop/share/classes/java/awt/BorderLayout.java
+++ b/src/java.desktop/share/classes/java/awt/BorderLayout.java
@@ -419,7 +419,7 @@ public class BorderLayout implements LayoutManager2,
      * @param   constraints  an object that specifies how and where
      *                       the component is added to the layout.
      * @see     java.awt.Container#add(java.awt.Component, java.lang.Object)
-     * @exception   IllegalArgumentException  if the constraint object is not
+     * @throws   IllegalArgumentException  if the constraint object is not
      *              a string, or if it not one of the five specified constants.
      * @since   1.1
      */
@@ -514,7 +514,7 @@ public class BorderLayout implements LayoutManager2,
      *                       {@code LINE_START}, {@code LINE_END}
      * @return  the component at the given location, or {@code null} if
      *          the location is empty
-     * @exception   IllegalArgumentException  if the constraint object is
+     * @throws   IllegalArgumentException  if the constraint object is
      *              not one of the nine specified constants
      * @see     #addLayoutComponent(java.awt.Component, java.lang.Object)
      * @since 1.5
@@ -562,9 +562,9 @@ public class BorderLayout implements LayoutManager2,
      *                     {@code Container}'s component orientation.
      * @return  the component at the given location, or {@code null} if
      *          the location is empty
-     * @exception   IllegalArgumentException  if the constraint object is
+     * @throws   IllegalArgumentException  if the constraint object is
      *              not one of the five specified constants
-     * @exception   NullPointerException  if the target parameter is null
+     * @throws   NullPointerException  if the target parameter is null
      * @see     #addLayoutComponent(java.awt.Component, java.lang.Object)
      * @since 1.5
      */
diff --git a/src/java.desktop/share/classes/java/awt/BufferCapabilities.java b/src/java.desktop/share/classes/java/awt/BufferCapabilities.java
index 22df13cfb50..6edeae843aa 100644
--- a/src/java.desktop/share/classes/java/awt/BufferCapabilities.java
+++ b/src/java.desktop/share/classes/java/awt/BufferCapabilities.java
@@ -47,7 +47,7 @@ public class BufferCapabilities implements Cloneable {
      * cannot be {@code null}
      * @param flipContents the contents of the back buffer after page-flipping,
      * {@code null} if page flipping is not used (implies blitting)
-     * @exception IllegalArgumentException if frontCaps or backCaps are
+     * @throws IllegalArgumentException if frontCaps or backCaps are
      * {@code null}
      */
     public BufferCapabilities(ImageCapabilities frontCaps,
diff --git a/src/java.desktop/share/classes/java/awt/Button.java b/src/java.desktop/share/classes/java/awt/Button.java
index 35acb8d2928..524008e401a 100644
--- a/src/java.desktop/share/classes/java/awt/Button.java
+++ b/src/java.desktop/share/classes/java/awt/Button.java
@@ -140,7 +140,7 @@ public class Button extends Component implements Accessible {
     /**
      * Constructs a button with an empty string for its label.
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -153,7 +153,7 @@ public class Button extends Component implements Accessible {
      *
      * @param label  a string label for the button, or
      *               {@code null} for no label
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -339,7 +339,7 @@ public class Button extends Component implements Accessible {
      *          <code><em>Foo</em>Listener</code>s on this button,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/Canvas.java b/src/java.desktop/share/classes/java/awt/Canvas.java
index 1ee5380c6df..7d90e148b6c 100644
--- a/src/java.desktop/share/classes/java/awt/Canvas.java
+++ b/src/java.desktop/share/classes/java/awt/Canvas.java
@@ -166,8 +166,8 @@ public class Canvas extends Component implements Accessible {
      * Each time this method is called,
      * the existing buffer strategy for this component is discarded.
      * @param numBuffers number of buffers to create, including the front buffer
-     * @exception IllegalArgumentException if numBuffers is less than 1.
-     * @exception IllegalStateException if the component is not displayable
+     * @throws IllegalArgumentException if numBuffers is less than 1.
+     * @throws IllegalStateException if the component is not displayable
      * @see #isDisplayable
      * @see #getBufferStrategy
      * @since 1.4
@@ -187,11 +187,11 @@ public class Canvas extends Component implements Accessible {
      * @param numBuffers number of buffers to create
      * @param caps the required capabilities for creating the buffer strategy;
      * cannot be {@code null}
-     * @exception AWTException if the capabilities supplied could not be
+     * @throws AWTException if the capabilities supplied could not be
      * supported or met; this may happen, for example, if there is not enough
      * accelerated memory currently available, or if page flipping is specified
      * but not possible.
-     * @exception IllegalArgumentException if numBuffers is less than 1, or if
+     * @throws IllegalArgumentException if numBuffers is less than 1, or if
      * caps is {@code null}
      * @see #getBufferStrategy
      * @since 1.4
diff --git a/src/java.desktop/share/classes/java/awt/CardLayout.java b/src/java.desktop/share/classes/java/awt/CardLayout.java
index d53c86a9d45..915376d0320 100644
--- a/src/java.desktop/share/classes/java/awt/CardLayout.java
+++ b/src/java.desktop/share/classes/java/awt/CardLayout.java
@@ -206,7 +206,7 @@ public class CardLayout implements LayoutManager2,
      * @param     constraints   a tag that identifies a particular
      *                                        card in the layout.
      * @see       java.awt.CardLayout#show(java.awt.Container, java.lang.String)
-     * @exception  IllegalArgumentException  if the constraint is not a string.
+     * @throws  IllegalArgumentException  if the constraint is not a string.
      */
     public void addLayoutComponent(Component comp, Object constraints) {
       synchronized (comp.getTreeLock()) {
diff --git a/src/java.desktop/share/classes/java/awt/Checkbox.java b/src/java.desktop/share/classes/java/awt/Checkbox.java
index e72d249f8e3..f4a642cb329 100644
--- a/src/java.desktop/share/classes/java/awt/Checkbox.java
+++ b/src/java.desktop/share/classes/java/awt/Checkbox.java
@@ -146,7 +146,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
      * Creates a check box with an empty string for its label.
      * The state of this check box is set to "off," and it is not
      * part of any check box group.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -161,7 +161,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
      *
      * @param     label   a string label for this check box,
      *                        or {@code null} for no label.
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *      {@code GraphicsEnvironment.isHeadless}
      *      returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -178,7 +178,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
      * @param     label   a string label for this check box,
      *                        or {@code null} for no label
      * @param     state    the initial state of this check box
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *     {@code GraphicsEnvironment.isHeadless}
      *     returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -196,7 +196,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
      * @param     state   the initial state of this check box.
      * @param     group   a check box group for this check box,
      *                           or {@code null} for no group.
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *     {@code GraphicsEnvironment.isHeadless}
      *     returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -222,7 +222,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
      * @param     group   a check box group for this check box,
      *                           or {@code null} for no group.
      * @param     state   the initial state of this check box.
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *    {@code GraphicsEnvironment.isHeadless}
      *    returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -508,7 +508,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
      *          <code><em>Foo</em>Listener</code>s on this checkbox,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
index 4df4ddbef85..f95d1d39424 100644
--- a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
+++ b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
@@ -110,7 +110,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
     /**
      * Create a check box menu item with an empty label.
      * The item's state is initially set to "off."
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since   1.1
@@ -125,7 +125,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
 
      * @param     label   a string label for the check box menu item,
      *                or {@code null} for an unlabeled menu item.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -140,7 +140,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
      * @param      state   the initial state of the menu item, where
      *                     {@code true} indicates "on" and
      *                     {@code false} indicates "off."
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since      1.1
@@ -316,7 +316,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
      *          <code><em>Foo</em>Listener</code>s on this checkbox menuitem,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/Choice.java b/src/java.desktop/share/classes/java/awt/Choice.java
index d8e8ab4c026..2b04239fd31 100644
--- a/src/java.desktop/share/classes/java/awt/Choice.java
+++ b/src/java.desktop/share/classes/java/awt/Choice.java
@@ -124,7 +124,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
      * By default, the first item added to the choice menu becomes the
      * selected item, until a different selection is made by the user
      * by calling one of the {@code select} methods.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @see       #select(int)
@@ -205,7 +205,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
     /**
      * Adds an item to this {@code Choice} menu.
      * @param      item    the item to be added
-     * @exception  NullPointerException   if the item's value is
+     * @throws  NullPointerException   if the item's value is
      *                  {@code null}
      * @since      1.1
      */
@@ -219,7 +219,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
      * <p>
      * Adds an item to this {@code Choice} menu.
      * @param item the item to be added
-     * @exception NullPointerException if the item's value is equal to
+     * @throws NullPointerException if the item's value is equal to
      *          {@code null}
      */
     public void addItem(String item) {
@@ -238,7 +238,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
      * invoking this method.
      * @param item the item to be added
      * @param index the new item position
-     * @exception NullPointerException if the item's value is equal to
+     * @throws NullPointerException if the item's value is equal to
      *          {@code null}
      */
     private void insertNoInvalidate(String item, int index) {
@@ -274,7 +274,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
      * the selected item.
      * @param item the non-{@code null} item to be inserted
      * @param index the position at which the item should be inserted
-     * @exception IllegalArgumentException if index is less than 0
+     * @throws IllegalArgumentException if index is less than 0
      */
     public void insert(String item, int index) {
         synchronized (this) {
@@ -300,7 +300,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
      * item remains selected (and the selected index is
      * updated accordingly).
      * @param      item  the item to remove from this {@code Choice} menu
-     * @exception  IllegalArgumentException  if the item doesn't
+     * @throws  IllegalArgumentException  if the item doesn't
      *                     exist in the choice menu
      * @since      1.1
      */
@@ -430,7 +430,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
      * {@code ItemEvent} is by user interaction.
      *
      * @param      pos      the position of the selected item
-     * @exception  IllegalArgumentException if the specified
+     * @throws  IllegalArgumentException if the specified
      *                            position is greater than the
      *                            number of items or less than zero
      * @see        #getSelectedItem
@@ -561,7 +561,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
      *          <code><em>Foo</em>Listener</code>s on this choice,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/Color.java b/src/java.desktop/share/classes/java/awt/Color.java
index aae90be8616..6bb4befd8e8 100644
--- a/src/java.desktop/share/classes/java/awt/Color.java
+++ b/src/java.desktop/share/classes/java/awt/Color.java
@@ -722,7 +722,7 @@ public class Color implements Paint, java.io.Serializable {
      *                            an opaque color as a 24-bit integer
      * @return     the new {@code Color} object.
      * @see        java.lang.Integer#decode
-     * @exception  NumberFormatException  if the specified string cannot
+     * @throws  NumberFormatException  if the specified string cannot
      *                      be interpreted as a decimal,
      *                      octal, or hexadecimal integer.
      * @since      1.1
diff --git a/src/java.desktop/share/classes/java/awt/Component.java b/src/java.desktop/share/classes/java/awt/Component.java
index 813f9bd0c79..cfd4cbe025a 100644
--- a/src/java.desktop/share/classes/java/awt/Component.java
+++ b/src/java.desktop/share/classes/java/awt/Component.java
@@ -1420,7 +1420,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
      * pointer. If the return value of this method is {@code null}, mouse
      * pointer is not directly above the {@code Component}.
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
      * @see       #isShowing
      * @see       Container#getMousePosition
      * @return    mouse coordinates relative to this {@code Component}, or null
@@ -1984,7 +1984,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
      * @return this component's locale; if this component does not
      *          have a locale, the locale of its parent is returned
      * @see #setLocale
-     * @exception IllegalComponentStateException if the {@code Component}
+     * @throws IllegalComponentStateException if the {@code Component}
      *          does not have its own locale and has not yet been added to
      *          a containment hierarchy such that the locale can be determined
      *          from the containing parent
@@ -3827,8 +3827,8 @@ public abstract class Component implements ImageObserver, MenuContainer,
      * Each time this method is called,
      * the existing buffer strategy for this component is discarded.
      * @param numBuffers number of buffers to create, including the front buffer
-     * @exception IllegalArgumentException if numBuffers is less than 1.
-     * @exception IllegalStateException if the component is not displayable
+     * @throws IllegalArgumentException if numBuffers is less than 1.
+     * @throws IllegalStateException if the component is not displayable
      * @see #isDisplayable
      * @see Window#getBufferStrategy()
      * @see Canvas#getBufferStrategy()
@@ -3884,11 +3884,11 @@ public abstract class Component implements ImageObserver, MenuContainer,
      * @param numBuffers number of buffers to create
      * @param caps the required capabilities for creating the buffer strategy;
      * cannot be {@code null}
-     * @exception AWTException if the capabilities supplied could not be
+     * @throws AWTException if the capabilities supplied could not be
      * supported or met; this may happen, for example, if there is not enough
      * accelerated memory currently available, or if page flipping is specified
      * but not possible.
-     * @exception IllegalArgumentException if numBuffers is less than 1, or if
+     * @throws IllegalArgumentException if numBuffers is less than 1, or if
      * caps is {@code null}
      * @see Window#getBufferStrategy()
      * @see Canvas#getBufferStrategy()
@@ -4032,12 +4032,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
          * @see Applet
          * @param numBuffers the number of buffers
          * @param caps the capabilities of the buffers
-         * @exception AWTException if the capabilities supplied could not be
+         * @throws AWTException if the capabilities supplied could not be
          * supported or met
-         * @exception ClassCastException if the component is not a canvas or
+         * @throws ClassCastException if the component is not a canvas or
          * window.
-         * @exception IllegalStateException if the component has no peer
-         * @exception IllegalArgumentException if {@code numBuffers} is less than two,
+         * @throws IllegalStateException if the component has no peer
+         * @throws IllegalArgumentException if {@code numBuffers} is less than two,
          * or if {@code BufferCapabilities.isPageFlipping} is not
          * {@code true}.
          * @see #createBuffers(int, BufferCapabilities)
@@ -4066,10 +4066,10 @@ public abstract class Component implements ImageObserver, MenuContainer,
          * @param caps the capabilities of the buffers.
          * {@code BufferCapabilities.isPageFlipping} must be
          * {@code true}.
-         * @exception AWTException if the capabilities supplied could not be
+         * @throws AWTException if the capabilities supplied could not be
          * supported or met
-         * @exception IllegalStateException if the component has no peer
-         * @exception IllegalArgumentException if numBuffers is less than two,
+         * @throws IllegalStateException if the component has no peer
+         * @throws IllegalArgumentException if numBuffers is less than two,
          * or if {@code BufferCapabilities.isPageFlipping} is not
          * {@code true}.
          * @see java.awt.BufferCapabilities#isPageFlipping()
@@ -4135,7 +4135,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
          * Provides direct access to the back buffer as an image.
          *
          * @return the back buffer as an image
-         * @exception IllegalStateException if the buffers have not yet
+         * @throws IllegalStateException if the buffers have not yet
          * been created
          */
         protected Image getBackBuffer() {
@@ -4154,7 +4154,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
          * for the contents of the back buffer.  This should be one of the
          * values of the {@code BufferCapabilities.FlipContents}
          * property.
-         * @exception IllegalStateException if the buffers have not yet
+         * @throws IllegalStateException if the buffers have not yet
          * been created
          * @see java.awt.BufferCapabilities#getFlipContents()
          */
@@ -6060,7 +6060,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
      * @return an array of all objects registered as
      *          <code><em>Foo</em>Listener</code>s on this component,
      *          or an empty array if no such listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      * @throws NullPointerException if {@code listenerType} is {@code null}
@@ -8352,7 +8352,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
      * Adds the specified popup menu to the component.
      * @param     popup the popup menu to be added to the component.
      * @see       #remove(MenuComponent)
-     * @exception NullPointerException if {@code popup} is {@code null}
+     * @throws NullPointerException if {@code popup} is {@code null}
      * @since     1.1
      */
     public void add(PopupMenu popup) {
@@ -9192,7 +9192,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
      *
      * @param orientation the new component orientation of this component and
      *        the components contained within it.
-     * @exception NullPointerException if {@code orientation} is null.
+     * @throws NullPointerException if {@code orientation} is null.
      * @see #setComponentOrientation
      * @see #getComponentOrientation
      * @see #invalidate
diff --git a/src/java.desktop/share/classes/java/awt/Container.java b/src/java.desktop/share/classes/java/awt/Container.java
index 5b4489f3cac..f63c507a829 100644
--- a/src/java.desktop/share/classes/java/awt/Container.java
+++ b/src/java.desktop/share/classes/java/awt/Container.java
@@ -340,7 +340,7 @@ public class Container extends Component {
      *
      * @param      n   the index of the component to get.
      * @return     the n<sup>th</sup> component in this container.
-     * @exception  ArrayIndexOutOfBoundsException
+     * @throws  ArrayIndexOutOfBoundsException
      *                 if the n<sup>th</sup> value does not exist.
      * @see Component#getTreeLock()
      */
@@ -429,7 +429,7 @@ public class Container extends Component {
      * display the added component.
      *
      * @param     comp   the component to be added
-     * @exception NullPointerException if {@code comp} is {@code null}
+     * @throws NullPointerException if {@code comp} is {@code null}
      * @see #addImpl
      * @see #invalidate
      * @see #validate
@@ -456,7 +456,7 @@ public class Container extends Component {
      * @param  name the name of the component to be added
      * @param  comp the component to be added
      * @return the component added
-     * @exception NullPointerException if {@code comp} is {@code null}
+     * @throws NullPointerException if {@code comp} is {@code null}
      * @see #add(Component, Object)
      * @see #invalidate
      */
@@ -479,8 +479,8 @@ public class Container extends Component {
      * @param     comp   the component to be added
      * @param     index    the position at which to insert the component,
      *                   or {@code -1} to append the component to the end
-     * @exception NullPointerException if {@code comp} is {@code null}
-     * @exception IllegalArgumentException if {@code index} is invalid (see
+     * @throws NullPointerException if {@code comp} is {@code null}
+     * @throws IllegalArgumentException if {@code index} is invalid (see
      *            {@link #addImpl} for details)
      * @return    the component {@code comp}
      * @see #addImpl
@@ -764,17 +764,17 @@ public class Container extends Component {
      * @param     index the position in the container's list to
      *            insert the component, where {@code getComponentCount()}
      *            appends to the end
-     * @exception NullPointerException if {@code comp} is
+     * @throws NullPointerException if {@code comp} is
      *            {@code null}
-     * @exception IllegalArgumentException if {@code comp} is one of the
+     * @throws IllegalArgumentException if {@code comp} is one of the
      *            container's parents
-     * @exception IllegalArgumentException if {@code index} is not in
+     * @throws IllegalArgumentException if {@code index} is not in
      *            the range {@code [0, getComponentCount()]} for moving
      *            between containers, or not in the range
      *            {@code [0, getComponentCount()-1]} for moving inside
      *            a container
-     * @exception IllegalArgumentException if adding a container to itself
-     * @exception IllegalArgumentException if adding a {@code Window}
+     * @throws IllegalArgumentException if adding a container to itself
+     * @throws IllegalArgumentException if adding a {@code Window}
      *            to a container
      * @see #getComponentZOrder(java.awt.Component)
      * @see #invalidate
@@ -989,7 +989,7 @@ public class Container extends Component {
      * @param     comp the component to be added
      * @param     constraints an object expressing
      *                  layout constraints for this component
-     * @exception NullPointerException if {@code comp} is {@code null}
+     * @throws NullPointerException if {@code comp} is {@code null}
      * @see #addImpl
      * @see #invalidate
      * @see #validate
@@ -1019,8 +1019,8 @@ public class Container extends Component {
      * @param index the position in the container's list at which to insert
      * the component; {@code -1} means insert at the end
      * component
-     * @exception NullPointerException if {@code comp} is {@code null}
-     * @exception IllegalArgumentException if {@code index} is invalid (see
+     * @throws NullPointerException if {@code comp} is {@code null}
+     * @throws IllegalArgumentException if {@code index} is invalid (see
      *            {@link #addImpl} for details)
      * @see #addImpl
      * @see #invalidate
@@ -1082,16 +1082,16 @@ public class Container extends Component {
      * @param     index the position in the container's list at which to
      *                 insert the component, where {@code -1}
      *                 means append to the end
-     * @exception IllegalArgumentException if {@code index} is invalid;
+     * @throws IllegalArgumentException if {@code index} is invalid;
      *            if {@code comp} is a child of this container, the valid
      *            range is {@code [-1, getComponentCount()-1]}; if component is
      *            not a child of this container, the valid range is
      *            {@code [-1, getComponentCount()]}
      *
-     * @exception IllegalArgumentException if {@code comp} is an ancestor of
+     * @throws IllegalArgumentException if {@code comp} is an ancestor of
      *                                     this container
-     * @exception IllegalArgumentException if adding a window to a container
-     * @exception NullPointerException if {@code comp} is {@code null}
+     * @throws IllegalArgumentException if adding a window to a container
+     * @throws NullPointerException if {@code comp} is {@code null}
      * @see       #add(Component)
      * @see       #add(Component, int)
      * @see       #add(Component, java.lang.Object)
@@ -2213,10 +2213,10 @@ public class Container extends Component {
      * @return an array of all objects registered as
      *          <code><em>Foo</em>Listener</code>s on this container,
      *          or an empty array if no such listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
-     * @exception NullPointerException if {@code listenerType} is {@code null}
+     * @throws NullPointerException if {@code listenerType} is {@code null}
      *
      * @see #getContainerListeners
      *
@@ -2622,7 +2622,7 @@ public class Container extends Component {
      * a non-null value if the mouse pointer is above {@code Container} or any
      * of its descendants.
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
      * @param     allowChildren true if children should be taken into account
      * @see       Component#getMousePosition
      * @return    mouse coordinates relative to this {@code Component}, or null
@@ -3556,7 +3556,7 @@ public class Container extends Component {
      *
      * @param o the new component orientation of this container and
      *        the components contained within it.
-     * @exception NullPointerException if {@code orientation} is null.
+     * @throws NullPointerException if {@code orientation} is null.
      * @see Component#setComponentOrientation
      * @see Component#getComponentOrientation
      * @see #invalidate
diff --git a/src/java.desktop/share/classes/java/awt/Cursor.java b/src/java.desktop/share/classes/java/awt/Cursor.java
index 936d17da46f..cfccf06723b 100644
--- a/src/java.desktop/share/classes/java/awt/Cursor.java
+++ b/src/java.desktop/share/classes/java/awt/Cursor.java
@@ -285,9 +285,9 @@ public class Cursor implements java.io.Serializable {
      *
      * @param name a string describing the desired system-specific custom cursor
      * @return the system specific custom cursor named
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      * {@code GraphicsEnvironment.isHeadless} returns true
-     * @exception AWTException in case of erroneous retrieving of the cursor
+     * @throws AWTException in case of erroneous retrieving of the cursor
      */
     public static Cursor getSystemCustomCursor(final String name)
         throws AWTException, HeadlessException {
diff --git a/src/java.desktop/share/classes/java/awt/Dialog.java b/src/java.desktop/share/classes/java/awt/Dialog.java
index 1a54d707306..2c126e74ffc 100644
--- a/src/java.desktop/share/classes/java/awt/Dialog.java
+++ b/src/java.desktop/share/classes/java/awt/Dialog.java
@@ -329,9 +329,9 @@ public class Dialog extends Window {
      *
      * @param owner the owner of the dialog or {@code null} if
      *     this dialog has no owner
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *    {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *    {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -352,9 +352,9 @@ public class Dialog extends Window {
      *     windows when shown. If {@code false}, the dialog is {@code MODELESS};
      *     if {@code true}, the modality type property is set to
      *     {@code DEFAULT_MODALITY_TYPE}
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *    {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.Dialog.ModalityType
@@ -376,9 +376,9 @@ public class Dialog extends Window {
      *     this dialog has no owner
      * @param title the title of the dialog or {@code null} if this dialog
      *     has no title
-     * @exception IllegalArgumentException if the {@code owner}'s
+     * @throws IllegalArgumentException if the {@code owner}'s
      *     {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -401,9 +401,9 @@ public class Dialog extends Window {
      *     windows when shown. If {@code false}, the dialog is {@code MODELESS};
      *     if {@code true}, the modality type property is set to
      *     {@code DEFAULT_MODALITY_TYPE}
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *    {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *    {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.Dialog.ModalityType
@@ -433,9 +433,9 @@ public class Dialog extends Window {
      * @param gc the {@code GraphicsConfiguration} of the target screen device;
      *     if {@code null}, the default system {@code GraphicsConfiguration}
      *     is assumed
-     * @exception java.lang.IllegalArgumentException if {@code gc}
+     * @throws java.lang.IllegalArgumentException if {@code gc}
      *     is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.Dialog.ModalityType
@@ -459,9 +459,9 @@ public class Dialog extends Window {
      *
      * @param owner the owner of the dialog or {@code null} if this
      *     dialog has no owner
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *     {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since 1.2
@@ -478,9 +478,9 @@ public class Dialog extends Window {
      *     has no owner
      * @param title the title of the dialog or {@code null} if this dialog
      *     has no title
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *     {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -502,9 +502,9 @@ public class Dialog extends Window {
      *     windows when shown. If {@code false}, the dialog is {@code MODELESS};
      *     if {@code true}, the modality type property is set to
      *     {@code DEFAULT_MODALITY_TYPE}
-     * @exception IllegalArgumentException if the {@code owner}'s
+     * @throws IllegalArgumentException if the {@code owner}'s
      *    {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *    {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.Dialog.ModalityType
@@ -536,9 +536,9 @@ public class Dialog extends Window {
      * @param gc the {@code GraphicsConfiguration} of the target screen device;
      *     if {@code null}, the default system {@code GraphicsConfiguration}
      *     is assumed
-     * @exception java.lang.IllegalArgumentException if {@code gc}
+     * @throws java.lang.IllegalArgumentException if {@code gc}
      *    is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *    {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.Dialog.ModalityType
@@ -565,12 +565,12 @@ public class Dialog extends Window {
      *     {@link java.awt.Dialog Dialog}, {@link java.awt.Frame Frame}, any
      *     of their descendants or {@code null}
      *
-     * @exception java.lang.IllegalArgumentException if the {@code owner}
+     * @throws java.lang.IllegalArgumentException if the {@code owner}
      *     is not an instance of {@link java.awt.Dialog Dialog} or {@link
      *     java.awt.Frame Frame}
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *     {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -591,12 +591,12 @@ public class Dialog extends Window {
      * @param title the title of the dialog or {@code null} if this dialog
      *    has no title
      *
-     * @exception java.lang.IllegalArgumentException if the {@code owner}
+     * @throws java.lang.IllegalArgumentException if the {@code owner}
      *    is not an instance of {@link java.awt.Dialog Dialog} or {@link
      *    java.awt.Frame Frame}
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *    {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *    {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -618,14 +618,14 @@ public class Dialog extends Window {
      *    windows when shown. {@code null} value and unsupported modality
      *    types are equivalent to {@code MODELESS}
      *
-     * @exception java.lang.IllegalArgumentException if the {@code owner}
+     * @throws java.lang.IllegalArgumentException if the {@code owner}
      *    is not an instance of {@link java.awt.Dialog Dialog} or {@link
      *    java.awt.Frame Frame}
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *    {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *    {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @exception SecurityException if the calling thread does not have permission
+     * @throws SecurityException if the calling thread does not have permission
      *    to create modal dialogs with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
@@ -653,14 +653,14 @@ public class Dialog extends Window {
      *    windows when shown. {@code null} value and unsupported modality
      *    types are equivalent to {@code MODELESS}
      *
-     * @exception java.lang.IllegalArgumentException if the {@code owner}
+     * @throws java.lang.IllegalArgumentException if the {@code owner}
      *     is not an instance of {@link java.awt.Dialog Dialog} or {@link
      *     java.awt.Frame Frame}
-     * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+     * @throws java.lang.IllegalArgumentException if the {@code owner}'s
      *     {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @exception SecurityException if the calling thread does not have permission
+     * @throws SecurityException if the calling thread does not have permission
      *     to create modal dialogs with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
@@ -704,14 +704,14 @@ public class Dialog extends Window {
      *     if {@code null}, the default system {@code GraphicsConfiguration}
      *     is assumed
      *
-     * @exception java.lang.IllegalArgumentException if the {@code owner}
+     * @throws java.lang.IllegalArgumentException if the {@code owner}
      *     is not an instance of {@link java.awt.Dialog Dialog} or {@link
      *     java.awt.Frame Frame}
-     * @exception java.lang.IllegalArgumentException if {@code gc}
+     * @throws java.lang.IllegalArgumentException if {@code gc}
      *     is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
-     * @exception SecurityException if the calling thread does not have permission
+     * @throws SecurityException if the calling thread does not have permission
      *     to create modal dialogs with the given {@code modalityType}
      *
      * @see java.awt.Dialog.ModalityType
@@ -848,7 +848,7 @@ public class Dialog extends Window {
      * @param type specifies whether dialog blocks input to other
      *     windows when shown. {@code null} value and unsupported modality
      *     types are equivalent to {@code MODELESS}
-     * @exception SecurityException if the calling thread does not have permission
+     * @throws SecurityException if the calling thread does not have permission
      *     to create modal dialogs with the given {@code modalityType}
      *
      * @see       java.awt.Dialog#getModalityType
diff --git a/src/java.desktop/share/classes/java/awt/EventQueue.java b/src/java.desktop/share/classes/java/awt/EventQueue.java
index e7d1dcc8286..4dce257f727 100644
--- a/src/java.desktop/share/classes/java/awt/EventQueue.java
+++ b/src/java.desktop/share/classes/java/awt/EventQueue.java
@@ -544,7 +544,7 @@ public class EventQueue {
      * returns it.  This method will block until an event has
      * been posted by another thread.
      * @return the next {@code AWTEvent}
-     * @exception InterruptedException
+     * @throws InterruptedException
      *            if any thread has interrupted this thread
      */
     public AWTEvent getNextEvent() throws InterruptedException {
@@ -946,7 +946,7 @@ public class EventQueue {
      * Warning: To avoid deadlock, do not declare this method
      * synchronized in a subclass.
      *
-     * @exception EmptyStackException if no previous push was made
+     * @throws EmptyStackException if no previous push was made
      *  on this {@code EventQueue}
      * @see      java.awt.EventQueue#push
      * @since           1.2
@@ -1331,9 +1331,9 @@ public class EventQueue {
      *                  synchronously in the
      *                  {@link #isDispatchThread event dispatch thread}
      *                  of {@link Toolkit#getSystemEventQueue the system EventQueue}
-     * @exception       InterruptedException  if any thread has
+     * @throws       InterruptedException  if any thread has
      *                  interrupted this thread
-     * @exception       InvocationTargetException  if an throwable is thrown
+     * @throws       InvocationTargetException  if an throwable is thrown
      *                  when running {@code runnable}
      * @see             #invokeLater
      * @see             Toolkit#getSystemEventQueue
diff --git a/src/java.desktop/share/classes/java/awt/FileDialog.java b/src/java.desktop/share/classes/java/awt/FileDialog.java
index b6a501b44e9..399544b9547 100644
--- a/src/java.desktop/share/classes/java/awt/FileDialog.java
+++ b/src/java.desktop/share/classes/java/awt/FileDialog.java
@@ -232,7 +232,7 @@ public class FileDialog extends Dialog {
      * @param     title   the title of the dialog
      * @param     mode   the mode of the dialog; either
      *            {@code FileDialog.LOAD} or {@code FileDialog.SAVE}
-     * @exception  IllegalArgumentException if an illegal file
+     * @throws  IllegalArgumentException if an illegal file
      *                 dialog mode is supplied
      * @see       java.awt.FileDialog#LOAD
      * @see       java.awt.FileDialog#SAVE
@@ -255,10 +255,10 @@ public class FileDialog extends Dialog {
      * displayed.
      *
      * @param     parent   the owner of the dialog
-     * @exception java.lang.IllegalArgumentException if the {@code parent}'s
+     * @throws java.lang.IllegalArgumentException if the {@code parent}'s
      *            {@code GraphicsConfiguration}
      *            is not from a screen device;
-     * @exception java.lang.IllegalArgumentException if {@code parent}
+     * @throws java.lang.IllegalArgumentException if {@code parent}
      *            is {@code null}; this exception is always thrown when
      *            {@code GraphicsEnvironment.isHeadless}
      *            returns {@code true}
@@ -285,10 +285,10 @@ public class FileDialog extends Dialog {
      * @param     title    the title of the dialog; a {@code null} value
      *                     will be accepted without causing a
      *                     {@code NullPointerException} to be thrown
-     * @exception java.lang.IllegalArgumentException if the {@code parent}'s
+     * @throws java.lang.IllegalArgumentException if the {@code parent}'s
      *            {@code GraphicsConfiguration}
      *            is not from a screen device;
-     * @exception java.lang.IllegalArgumentException if {@code parent}
+     * @throws java.lang.IllegalArgumentException if {@code parent}
      *            is {@code null}; this exception is always thrown when
      *            {@code GraphicsEnvironment.isHeadless}
      *            returns {@code true}
@@ -321,12 +321,12 @@ public class FileDialog extends Dialog {
      *                     {@code NullPointerException} to be thrown
      * @param     mode     the mode of the dialog; either
      *                     {@code FileDialog.LOAD} or {@code FileDialog.SAVE}
-     * @exception java.lang.IllegalArgumentException if an illegal
+     * @throws java.lang.IllegalArgumentException if an illegal
      *            file dialog mode is supplied;
-     * @exception java.lang.IllegalArgumentException if the {@code parent}'s
+     * @throws java.lang.IllegalArgumentException if the {@code parent}'s
      *            {@code GraphicsConfiguration}
      *            is not from a screen device;
-     * @exception java.lang.IllegalArgumentException if {@code parent}
+     * @throws java.lang.IllegalArgumentException if {@code parent}
      *            is {@code null}; this exception is always thrown when
      *            {@code GraphicsEnvironment.isHeadless}
      *            returns {@code true}
@@ -408,7 +408,7 @@ public class FileDialog extends Dialog {
      * @see        java.awt.FileDialog#LOAD
      * @see        java.awt.FileDialog#SAVE
      * @see        java.awt.FileDialog#getMode
-     * @exception  IllegalArgumentException if an illegal file
+     * @throws  IllegalArgumentException if an illegal file
      *                 dialog mode is supplied
      * @since      1.1
      */
diff --git a/src/java.desktop/share/classes/java/awt/Frame.java b/src/java.desktop/share/classes/java/awt/Frame.java
index 6dde9373c38..e01ef082d42 100644
--- a/src/java.desktop/share/classes/java/awt/Frame.java
+++ b/src/java.desktop/share/classes/java/awt/Frame.java
@@ -383,7 +383,7 @@ public class Frame extends Window implements MenuContainer {
      * Constructs a new instance of {@code Frame} that is
      * initially invisible.  The title of the {@code Frame}
      * is empty.
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless()
      * @see Component#setSize
@@ -401,9 +401,9 @@ public class Frame extends Window implements MenuContainer {
      * of the target screen device. If {@code gc}
      * is {@code null}, the system default
      * {@code GraphicsConfiguration} is assumed.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code gc} is not from a screen device.
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless()
      * @since     1.3
@@ -418,7 +418,7 @@ public class Frame extends Window implements MenuContainer {
      * @param title the title to be displayed in the frame's border.
      *              A {@code null} value
      *              is treated as an empty string, "".
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless()
      * @see java.awt.Component#setSize
@@ -440,9 +440,9 @@ public class Frame extends Window implements MenuContainer {
      * of the target screen device.  If {@code gc} is
      * {@code null}, the system default
      * {@code GraphicsConfiguration} is assumed.
-     * @exception IllegalArgumentException if {@code gc}
+     * @throws IllegalArgumentException if {@code gc}
      * is not from a screen device.
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless()
      * @see java.awt.Component#setSize
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java b/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java
index b698f0f3706..58d502ac03f 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java
@@ -261,7 +261,7 @@ public abstract class GraphicsConfiguration {
      * @param width the width of the returned {@code VolatileImage}
      * @param height the height of the returned {@code VolatileImage}
      * @param caps the image capabilities
-     * @exception AWTException if the supplied image capabilities could not
+     * @throws AWTException if the supplied image capabilities could not
      * be met by this graphics configuration
      * @since 1.4
      */
@@ -294,7 +294,7 @@ public abstract class GraphicsConfiguration {
      * @see Transparency#BITMASK
      * @see Transparency#TRANSLUCENT
      * @throws IllegalArgumentException if the transparency is not a valid value
-     * @exception AWTException if the supplied image capabilities could not
+     * @throws AWTException if the supplied image capabilities could not
      * be met by this graphics configuration
      * @see Component#createVolatileImage(int, int)
      * @since 1.5
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
index d878f610fca..c08c5580ae7 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
@@ -418,10 +418,10 @@ public abstract class GraphicsDevice {
      * </code></pre>
      *
      * @param dm The new display mode of this graphics device.
-     * @exception IllegalArgumentException if the {@code DisplayMode}
+     * @throws IllegalArgumentException if the {@code DisplayMode}
      * supplied is {@code null}, or is not available in the array returned
      * by {@code getDisplayModes}
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code isDisplayChangeSupported} returns {@code false}
      * @see #getDisplayMode
      * @see #getDisplayModes
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
index 438f9f399a0..79102059b0e 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
@@ -191,7 +191,7 @@ public abstract class GraphicsEnvironment {
      * objects.
      * @return an array containing all the {@code GraphicsDevice}
      * objects that represent screen devices
-     * @exception HeadlessException if isHeadless() returns true
+     * @throws HeadlessException if isHeadless() returns true
      * @see #isHeadless()
      */
     public abstract GraphicsDevice[] getScreenDevices()
@@ -201,7 +201,7 @@ public abstract class GraphicsEnvironment {
      * Returns the default screen {@code GraphicsDevice}.
      * @return the {@code GraphicsDevice} that represents the
      * default screen device
-     * @exception HeadlessException if isHeadless() returns true
+     * @throws HeadlessException if isHeadless() returns true
      * @see #isHeadless()
      */
     public abstract GraphicsDevice getDefaultScreenDevice()
@@ -383,7 +383,7 @@ public abstract class GraphicsEnvironment {
      * within the available display area using getMaximumWindowBounds().
      * @return the point where Windows should be centered
      *
-     * @exception HeadlessException if isHeadless() returns true
+     * @throws HeadlessException if isHeadless() returns true
      * @see #getMaximumWindowBounds
      * @since 1.4
      */
@@ -409,7 +409,7 @@ public abstract class GraphicsEnvironment {
      * {@code Toolkit.getScreenInsets()}.
      * @return  the maximum bounds for centered Windows
      *
-     * @exception HeadlessException if isHeadless() returns true
+     * @throws HeadlessException if isHeadless() returns true
      * @see #getCenterPoint
      * @see GraphicsConfiguration#getBounds
      * @see Toolkit#getScreenInsets
diff --git a/src/java.desktop/share/classes/java/awt/GridBagLayout.java b/src/java.desktop/share/classes/java/awt/GridBagLayout.java
index ff3bec8b115..e0692ac0624 100644
--- a/src/java.desktop/share/classes/java/awt/GridBagLayout.java
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayout.java
@@ -688,7 +688,7 @@ java.io.Serializable {
      * @param      comp         the component to be added
      * @param      constraints  an object that determines how
      *                          the component is added to the layout
-     * @exception IllegalArgumentException if {@code constraints}
+     * @throws IllegalArgumentException if {@code constraints}
      *            is not a {@code GridBagConstraint}
      */
     public void addLayoutComponent(Component comp, Object constraints) {
diff --git a/src/java.desktop/share/classes/java/awt/GridLayout.java b/src/java.desktop/share/classes/java/awt/GridLayout.java
index 4a3b66f4332..5c9265bc912 100644
--- a/src/java.desktop/share/classes/java/awt/GridLayout.java
+++ b/src/java.desktop/share/classes/java/awt/GridLayout.java
@@ -186,7 +186,7 @@ public class GridLayout implements LayoutManager, java.io.Serializable {
      *                   any number of columns
      * @param     hgap   the horizontal gap
      * @param     vgap   the vertical gap
-     * @exception   IllegalArgumentException  if the value of both
+     * @throws   IllegalArgumentException  if the value of both
      *                  {@code rows} and {@code cols} is
      *                  set to zero
      */
@@ -212,7 +212,7 @@ public class GridLayout implements LayoutManager, java.io.Serializable {
     /**
      * Sets the number of rows in this layout to the specified value.
      * @param        rows   the number of rows in this layout
-     * @exception    IllegalArgumentException  if the value of both
+     * @throws    IllegalArgumentException  if the value of both
      *               {@code rows} and {@code cols} is set to zero
      * @since        1.1
      */
@@ -240,7 +240,7 @@ public class GridLayout implements LayoutManager, java.io.Serializable {
      * of columns displayed in the layout is determined by the total
      * number of components and the number of rows specified.
      * @param        cols   the number of columns in this layout
-     * @exception    IllegalArgumentException  if the value of both
+     * @throws    IllegalArgumentException  if the value of both
      *               {@code rows} and {@code cols} is set to zero
      * @since        1.1
      */
diff --git a/src/java.desktop/share/classes/java/awt/Image.java b/src/java.desktop/share/classes/java/awt/Image.java
index 7e627323269..1ad4ec9226f 100644
--- a/src/java.desktop/share/classes/java/awt/Image.java
+++ b/src/java.desktop/share/classes/java/awt/Image.java
@@ -105,7 +105,7 @@ public abstract class Image {
      * Creates a graphics context for drawing to an off-screen image.
      * This method can only be called for off-screen images.
      * @return  a graphics context to draw to the off-screen image.
-     * @exception UnsupportedOperationException if called for a
+     * @throws UnsupportedOperationException if called for a
      *            non-off-screen image.
      * @see     java.awt.Graphics
      * @see     java.awt.Component#createImage(int, int)
@@ -162,7 +162,7 @@ public abstract class Image {
      * @param hints flags to indicate the type of algorithm to use
      * for image resampling.
      * @return     a scaled version of the image.
-     * @exception IllegalArgumentException if {@code width}
+     * @throws IllegalArgumentException if {@code width}
      *             or {@code height} is zero.
      * @see        java.awt.Image#SCALE_DEFAULT
      * @see        java.awt.Image#SCALE_FAST
diff --git a/src/java.desktop/share/classes/java/awt/Label.java b/src/java.desktop/share/classes/java/awt/Label.java
index b061efb5170..ad8ff4c2b82 100644
--- a/src/java.desktop/share/classes/java/awt/Label.java
+++ b/src/java.desktop/share/classes/java/awt/Label.java
@@ -114,7 +114,7 @@ public class Label extends Component implements Accessible {
     /**
      * Constructs an empty label.
      * The text of the label is the empty string {@code ""}.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -129,7 +129,7 @@ public class Label extends Component implements Accessible {
      *        A {@code null} value
      *        will be accepted without causing a NullPointerException
      *        to be thrown.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -147,7 +147,7 @@ public class Label extends Component implements Accessible {
      *        will be accepted without causing a NullPointerException
      *        to be thrown.
      * @param     alignment   the alignment value.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -216,7 +216,7 @@ public class Label extends Component implements Accessible {
      * Possible values are {@code Label.LEFT},
      * {@code Label.RIGHT}, and {@code Label.CENTER}.
      * @param      alignment    the alignment to be set.
-     * @exception  IllegalArgumentException if an improper value for
+     * @throws  IllegalArgumentException if an improper value for
      *                          {@code alignment} is given.
      * @see        java.awt.Label#getAlignment
      */
diff --git a/src/java.desktop/share/classes/java/awt/List.java b/src/java.desktop/share/classes/java/awt/List.java
index f29374ab6bc..fe1a5dc5530 100644
--- a/src/java.desktop/share/classes/java/awt/List.java
+++ b/src/java.desktop/share/classes/java/awt/List.java
@@ -193,7 +193,7 @@ public class List extends Component implements ItemSelectable, Accessible {
      * not allowed.  Note that this is a convenience method for
      * {@code List(0, false)}.  Also note that the number of visible
      * lines in the list cannot be changed after it has been created.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -209,7 +209,7 @@ public class List extends Component implements ItemSelectable, Accessible {
      * of visible rows in the list cannot be changed after it has
      * been created.
      * @param       rows the number of items to show.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since       1.1
@@ -238,7 +238,7 @@ public class List extends Component implements ItemSelectable, Accessible {
      * @param       multipleMode   if {@code true},
      *                     then multiple selections are allowed;
      *                     otherwise, only one item can be selected at a time.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -411,7 +411,7 @@ public class List extends Component implements ItemSelectable, Accessible {
      * with the new string.
      * @param       newValue   a new string to replace an existing item
      * @param       index      the position of the item to replace
-     * @exception ArrayIndexOutOfBoundsException if {@code index}
+     * @throws ArrayIndexOutOfBoundsException if {@code index}
      *          is out of range
      */
     public synchronized void replaceItem(String newValue, int index) {
@@ -448,7 +448,7 @@ public class List extends Component implements ItemSelectable, Accessible {
      * If the specified item is selected, and is the only selected
      * item in the list, the list is set to have no selection.
      * @param        item  the item to remove from the list
-     * @exception    IllegalArgumentException
+     * @throws    IllegalArgumentException
      *                     if the item doesn't exist in the list
      * @since        1.1
      */
@@ -470,7 +470,7 @@ public class List extends Component implements ItemSelectable, Accessible {
      * @param      position   the index of the item to delete
      * @see        #add(String, int)
      * @since      1.1
-     * @exception    ArrayIndexOutOfBoundsException
+     * @throws    ArrayIndexOutOfBoundsException
      *               if the {@code position} is less than 0 or
      *               greater than {@code getItemCount()-1}
      */
@@ -1053,7 +1053,7 @@ public class List extends Component implements ItemSelectable, Accessible {
      *          <code><em>Foo</em>Listener</code>s on this list,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
@@ -1631,7 +1631,7 @@ public class List extends Component implements ItemSelectable, Accessible {
              * @return This component's locale.  If this component does not have
              * a locale, the locale of its parent is returned.
              *
-             * @exception IllegalComponentStateException
+             * @throws IllegalComponentStateException
              * If the Component does not have its own locale and has not yet
              * been added to a containment hierarchy such that the locale can
              * be determined from the containing parent.
diff --git a/src/java.desktop/share/classes/java/awt/MediaTracker.java b/src/java.desktop/share/classes/java/awt/MediaTracker.java
index e2b754c40af..37e372d0d1f 100644
--- a/src/java.desktop/share/classes/java/awt/MediaTracker.java
+++ b/src/java.desktop/share/classes/java/awt/MediaTracker.java
@@ -396,7 +396,7 @@ public class MediaTracker implements java.io.Serializable {
      * @see         java.awt.MediaTracker#waitForAll(long)
      * @see         java.awt.MediaTracker#isErrorAny
      * @see         java.awt.MediaTracker#isErrorID
-     * @exception   InterruptedException  if any thread has
+     * @throws   InterruptedException  if any thread has
      *                                     interrupted this thread
      */
     public void waitForAll() throws InterruptedException {
@@ -421,7 +421,7 @@ public class MediaTracker implements java.io.Serializable {
      * @see         java.awt.MediaTracker#waitForAll(long)
      * @see         java.awt.MediaTracker#isErrorAny
      * @see         java.awt.MediaTracker#isErrorID
-     * @exception   InterruptedException  if any thread has
+     * @throws   InterruptedException  if any thread has
      *                                     interrupted this thread.
      */
     public synchronized boolean waitForAll(long ms)
@@ -627,7 +627,7 @@ public class MediaTracker implements java.io.Serializable {
      * @see           java.awt.MediaTracker#waitForAll
      * @see           java.awt.MediaTracker#isErrorAny()
      * @see           java.awt.MediaTracker#isErrorID(int)
-     * @exception     InterruptedException  if any thread has
+     * @throws     InterruptedException  if any thread has
      *                          interrupted this thread.
      */
     public void waitForID(int id) throws InterruptedException {
@@ -655,7 +655,7 @@ public class MediaTracker implements java.io.Serializable {
      * @see           java.awt.MediaTracker#statusID
      * @see           java.awt.MediaTracker#isErrorAny()
      * @see           java.awt.MediaTracker#isErrorID(int)
-     * @exception     InterruptedException  if any thread has
+     * @throws     InterruptedException  if any thread has
      *                          interrupted this thread.
      */
     public synchronized boolean waitForID(int id, long ms)
diff --git a/src/java.desktop/share/classes/java/awt/Menu.java b/src/java.desktop/share/classes/java/awt/Menu.java
index 5f24c7cb8bd..79c3dfe0d82 100644
--- a/src/java.desktop/share/classes/java/awt/Menu.java
+++ b/src/java.desktop/share/classes/java/awt/Menu.java
@@ -125,7 +125,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
     /**
      * Constructs a new menu with an empty label. This menu is not
      * a tear-off menu.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since      1.1
@@ -139,7 +139,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
      * a tear-off menu.
      * @param       label the menu's label in the menu bar, or in
      *                   another menu of which this menu is a submenu.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -158,7 +158,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
      *                   another menu of which this menu is a submenu.
      * @param       tearOff   if {@code true}, the menu
      *                   is a tear-off menu.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -313,7 +313,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
      *                          item should be inserted.
      * @see           java.awt.Menu#add(java.lang.String)
      * @see           java.awt.Menu#add(java.awt.MenuItem)
-     * @exception     IllegalArgumentException if the value of
+     * @throws     IllegalArgumentException if the value of
      *                    {@code index} is less than zero
      * @since         1.1
      */
@@ -357,7 +357,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
      *                      should be inserted
      * @see         java.awt.Menu#add(java.lang.String)
      * @see         java.awt.Menu#add(java.awt.MenuItem)
-     * @exception     IllegalArgumentException if the value of
+     * @throws     IllegalArgumentException if the value of
      *                    {@code index} is less than zero
      * @since       1.1
      */
@@ -378,7 +378,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
      * Inserts a separator at the specified position.
      * @param       index the position at which the
      *                       menu separator should be inserted.
-     * @exception   IllegalArgumentException if the value of
+     * @throws   IllegalArgumentException if the value of
      *                       {@code index} is less than 0.
      * @see         java.awt.Menu#addSeparator
      * @since       1.1
diff --git a/src/java.desktop/share/classes/java/awt/MenuBar.java b/src/java.desktop/share/classes/java/awt/MenuBar.java
index 2f78371407a..c1016f5bd0b 100644
--- a/src/java.desktop/share/classes/java/awt/MenuBar.java
+++ b/src/java.desktop/share/classes/java/awt/MenuBar.java
@@ -127,7 +127,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
 
     /**
      * Creates a new menu bar.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
diff --git a/src/java.desktop/share/classes/java/awt/MenuComponent.java b/src/java.desktop/share/classes/java/awt/MenuComponent.java
index 2550eea7f52..a2d28fb9e3e 100644
--- a/src/java.desktop/share/classes/java/awt/MenuComponent.java
+++ b/src/java.desktop/share/classes/java/awt/MenuComponent.java
@@ -176,7 +176,7 @@ public abstract class MenuComponent implements java.io.Serializable {
 
     /**
      * Creates a {@code MenuComponent}.
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *    {@code GraphicsEnvironment.isHeadless}
      *    returns {@code true}
      * @see java.awt.GraphicsEnvironment#isHeadless
diff --git a/src/java.desktop/share/classes/java/awt/MenuItem.java b/src/java.desktop/share/classes/java/awt/MenuItem.java
index d1f6f59aa15..adc37db7111 100644
--- a/src/java.desktop/share/classes/java/awt/MenuItem.java
+++ b/src/java.desktop/share/classes/java/awt/MenuItem.java
@@ -185,7 +185,7 @@ public class MenuItem extends MenuComponent implements Accessible {
     /**
      * Constructs a new MenuItem with an empty label and no keyboard
      * shortcut.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since    1.1
@@ -201,7 +201,7 @@ public class MenuItem extends MenuComponent implements Accessible {
      * menu items. By default, all menu items except for
      * separators are enabled.
      * @param       label the label for this menu item.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since       1.0
@@ -218,7 +218,7 @@ public class MenuItem extends MenuComponent implements Accessible {
      * @param       label the label for this menu item.
      * @param       s the instance of {@code MenuShortcut}
      *                       associated with this menu item.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since       1.1
@@ -616,7 +616,7 @@ public class MenuItem extends MenuComponent implements Accessible {
      *          <code><em>Foo</em>Listener</code>s on this menu item,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/MouseInfo.java b/src/java.desktop/share/classes/java/awt/MouseInfo.java
index 76b5ed6e397..3dd115e0724 100644
--- a/src/java.desktop/share/classes/java/awt/MouseInfo.java
+++ b/src/java.desktop/share/classes/java/awt/MouseInfo.java
@@ -62,8 +62,8 @@ public class MouseInfo {
      * permission before creating and returning a {@code PointerInfo}
      * object. This may result in a {@code SecurityException}.
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
-     * @exception SecurityException if a security manager exists and its
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
+     * @throws SecurityException if a security manager exists and its
      *            {@code checkPermission} method doesn't allow the operation
      * @see       GraphicsConfiguration
      * @see       SecurityManager#checkPermission
@@ -124,7 +124,7 @@ public class MouseInfo {
      * by requesting the {@code "awt.mouse.numButtons"} desktop property
      * which is set by the underlying native platform.
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
      * @return number of buttons on the mouse
      * @see Toolkit#getDesktopProperty
      * @since 1.5
diff --git a/src/java.desktop/share/classes/java/awt/Polygon.java b/src/java.desktop/share/classes/java/awt/Polygon.java
index 64f049cd1c7..e74ce5cb10f 100644
--- a/src/java.desktop/share/classes/java/awt/Polygon.java
+++ b/src/java.desktop/share/classes/java/awt/Polygon.java
@@ -139,12 +139,12 @@ public class Polygon implements Shape, java.io.Serializable {
      * @param ypoints an array of Y coordinates
      * @param npoints the total number of points in the
      *                          {@code Polygon}
-     * @exception  NegativeArraySizeException if the value of
+     * @throws  NegativeArraySizeException if the value of
      *                       {@code npoints} is negative.
-     * @exception  IndexOutOfBoundsException if {@code npoints} is
+     * @throws  IndexOutOfBoundsException if {@code npoints} is
      *             greater than the length of {@code xpoints}
      *             or the length of {@code ypoints}.
-     * @exception  NullPointerException if {@code xpoints} or
+     * @throws  NullPointerException if {@code xpoints} or
      *             {@code ypoints} is {@code null}.
      * @since 1.0
      */
diff --git a/src/java.desktop/share/classes/java/awt/PopupMenu.java b/src/java.desktop/share/classes/java/awt/PopupMenu.java
index fd56461df55..e9b88d2a12f 100644
--- a/src/java.desktop/share/classes/java/awt/PopupMenu.java
+++ b/src/java.desktop/share/classes/java/awt/PopupMenu.java
@@ -69,7 +69,7 @@ public class PopupMenu extends Menu {
 
     /**
      * Creates a new popup menu with an empty name.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -82,7 +82,7 @@ public class PopupMenu extends Menu {
      *
      * @param label a non-{@code null} string specifying
      *                the popup menu's label
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -149,12 +149,12 @@ public class PopupMenu extends Menu {
      * @param origin the component which defines the coordinate space
      * @param x the x coordinate position to popup the menu
      * @param y the y coordinate position to popup the menu
-     * @exception NullPointerException  if the parent is {@code null}
-     * @exception IllegalArgumentException  if this {@code PopupMenu}
+     * @throws NullPointerException  if the parent is {@code null}
+     * @throws IllegalArgumentException  if this {@code PopupMenu}
      *                has a non-{@code Component} parent
-     * @exception IllegalArgumentException if the origin is not in the
+     * @throws IllegalArgumentException if the origin is not in the
      *                parent's hierarchy
-     * @exception RuntimeException if the parent is not showing on screen
+     * @throws RuntimeException if the parent is not showing on screen
      */
     @SuppressWarnings("deprecation")
     public void show(Component origin, int x, int y) {
diff --git a/src/java.desktop/share/classes/java/awt/RenderingHints.java b/src/java.desktop/share/classes/java/awt/RenderingHints.java
index d69ed339eee..46d2fda1031 100644
--- a/src/java.desktop/share/classes/java/awt/RenderingHints.java
+++ b/src/java.desktop/share/classes/java/awt/RenderingHints.java
@@ -1064,7 +1064,7 @@ public class RenderingHints
      * {@code RenderingHints} is to be tested.
      * @return {@code true} if this {@code RenderingHints}
      *          contains a mapping for the specified key.
-     * @exception ClassCastException if the key can not
+     * @throws ClassCastException if the key can not
      *            be cast to {@code RenderingHints.Key}
      */
     public boolean containsKey(Object key) {
@@ -1099,7 +1099,7 @@ public class RenderingHints
      * @return  the value to which the key is mapped in this object or
      *          {@code null} if the key is not mapped to any value in
      *          this object.
-     * @exception ClassCastException if the key can not
+     * @throws ClassCastException if the key can not
      *            be cast to {@code RenderingHints.Key}
      * @see     #put(Object, Object)
      */
@@ -1117,11 +1117,11 @@ public class RenderingHints
      * @param      value   the rendering hint value.
      * @return     the previous value of the specified key in this object
      *             or {@code null} if it did not have one.
-     * @exception NullPointerException if the key is
+     * @throws NullPointerException if the key is
      *            {@code null}.
-     * @exception ClassCastException if the key can not
+     * @throws ClassCastException if the key can not
      *            be cast to {@code RenderingHints.Key}
-     * @exception IllegalArgumentException if the
+     * @throws IllegalArgumentException if the
      *            {@link Key#isCompatibleValue(java.lang.Object)
      *                   Key.isCompatibleValue()}
      *            method of the specified key returns false for the
@@ -1163,7 +1163,7 @@ public class RenderingHints
      * {@code RenderingHints} object. This method does nothing if the
      * key is not in this {@code RenderingHints} object.
      * @param   key   the rendering hints key that needs to be removed
-     * @exception ClassCastException if the key can not
+     * @throws ClassCastException if the key can not
      *            be cast to {@code RenderingHints.Key}
      * @return  the value to which the key had previously been mapped in this
      *          {@code RenderingHints} object, or {@code null}
@@ -1179,10 +1179,10 @@ public class RenderingHints
      * any mappings that this {@code RenderingHints} had for any
      * of the keys currently in the specified {@code Map}.
      * @param m the specified {@code Map}
-     * @exception ClassCastException class of a key or value
+     * @throws ClassCastException class of a key or value
      *          in the specified {@code Map} prevents it from being
      *          stored in this {@code RenderingHints}.
-     * @exception IllegalArgumentException some aspect
+     * @throws IllegalArgumentException some aspect
      *          of a key or value in the specified {@code Map}
      *           prevents it from being stored in
      *            this {@code RenderingHints}.
diff --git a/src/java.desktop/share/classes/java/awt/Scrollbar.java b/src/java.desktop/share/classes/java/awt/Scrollbar.java
index 34cd3ecc799..c8f100cc1c2 100644
--- a/src/java.desktop/share/classes/java/awt/Scrollbar.java
+++ b/src/java.desktop/share/classes/java/awt/Scrollbar.java
@@ -349,7 +349,7 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
      * </tbody>
      * </table>
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -366,9 +366,9 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
      * indicating a horizontal or vertical scroll bar, respectively.
      *
      * @param       orientation   indicates the orientation of the scroll bar
-     * @exception   IllegalArgumentException    when an illegal value for
+     * @throws   IllegalArgumentException    when an illegal value for
      *                    the {@code orientation} argument is supplied
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -394,9 +394,9 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
      *                      represented by the size of the bubble
      * @param     minimum   the minimum value of the scroll bar
      * @param     maximum   the maximum value of the scroll bar
-     * @exception IllegalArgumentException    when an illegal value for
+     * @throws IllegalArgumentException    when an illegal value for
      *                    the {@code orientation} argument is supplied
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see #setValues
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -457,7 +457,7 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
      *               {@code Scrollbar.HORIZONTAL} or
      *               {@code Scrollbar.VERTICAL}
      * @see       java.awt.Scrollbar#getOrientation
-     * @exception   IllegalArgumentException  if the value supplied
+     * @throws   IllegalArgumentException  if the value supplied
      *                   for {@code orientation} is not a
      *                   legal value
      * @since     1.1
@@ -1062,7 +1062,7 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
      * @return an array of all objects registered as
      *          <code><em>Foo</em>Listener</code>s on this component,
      *          or an empty array if no such listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/TextArea.java b/src/java.desktop/share/classes/java/awt/TextArea.java
index 5e3e5ca6b33..4c7baa52e4e 100644
--- a/src/java.desktop/share/classes/java/awt/TextArea.java
+++ b/src/java.desktop/share/classes/java/awt/TextArea.java
@@ -157,7 +157,7 @@ public class TextArea extends TextComponent {
      * This text area is created with scrollbar visibility equal to
      * {@link #SCROLLBARS_BOTH}, so both vertical and horizontal
      * scrollbars will be visible for this text area.
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *    {@code GraphicsEnvironment.isHeadless} returns true
      * @see java.awt.GraphicsEnvironment#isHeadless()
      */
@@ -173,7 +173,7 @@ public class TextArea extends TextComponent {
      * @param      text       the text to be displayed; if
      *             {@code text} is {@code null}, the empty
      *             string {@code ""} will be displayed
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *        {@code GraphicsEnvironment.isHeadless} returns true
      * @see java.awt.GraphicsEnvironment#isHeadless()
      */
@@ -191,7 +191,7 @@ public class TextArea extends TextComponent {
      * text area.
      * @param rows the number of rows
      * @param columns the number of columns
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *     {@code GraphicsEnvironment.isHeadless} returns true
      * @see java.awt.GraphicsEnvironment#isHeadless()
      */
@@ -212,7 +212,7 @@ public class TextArea extends TextComponent {
      *             string {@code ""} will be displayed
      * @param     rows      the number of rows
      * @param     columns   the number of columns
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *   {@code GraphicsEnvironment.isHeadless} returns true
      * @see java.awt.GraphicsEnvironment#isHeadless()
      */
@@ -252,7 +252,7 @@ public class TextArea extends TextComponent {
      * @param      scrollbars  a constant that determines what
      *             scrollbars are created to view the text area
      * @since      1.1
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *    {@code GraphicsEnvironment.isHeadless} returns true
      * @see java.awt.GraphicsEnvironment#isHeadless()
      */
@@ -421,7 +421,7 @@ public class TextArea extends TextComponent {
      * @param       rows   the number of rows
      * @see         #getRows()
      * @see         #setColumns(int)
-     * @exception   IllegalArgumentException   if the value
+     * @throws   IllegalArgumentException   if the value
      *                 supplied for {@code rows}
      *                 is less than {@code 0}
      * @since       1.1
@@ -452,7 +452,7 @@ public class TextArea extends TextComponent {
      * @param       columns   the number of columns
      * @see         #getColumns()
      * @see         #setRows(int)
-     * @exception   IllegalArgumentException   if the value
+     * @throws   IllegalArgumentException   if the value
      *                 supplied for {@code columns}
      *                 is less than {@code 0}
      * @since       1.1
diff --git a/src/java.desktop/share/classes/java/awt/TextComponent.java b/src/java.desktop/share/classes/java/awt/TextComponent.java
index 5dc8d4068cc..b471b4e5ec6 100644
--- a/src/java.desktop/share/classes/java/awt/TextComponent.java
+++ b/src/java.desktop/share/classes/java/awt/TextComponent.java
@@ -137,7 +137,7 @@ public class TextComponent extends Component implements Accessible {
      * @param      text       the text to be displayed; if
      *             {@code text} is {@code null}, the empty
      *             string {@code ""} will be displayed
-     * @exception  HeadlessException if
+     * @throws  HeadlessException if
      *             {@code GraphicsEnvironment.isHeadless}
      *             returns true
      * @see        java.awt.GraphicsEnvironment#isHeadless
@@ -511,7 +511,7 @@ public class TextComponent extends Component implements Accessible {
      * is thrown.
      *
      * @param        position the position of the text insertion caret
-     * @exception    IllegalArgumentException if {@code position}
+     * @throws    IllegalArgumentException if {@code position}
      *               is less than zero
      * @since        1.1
      */
@@ -645,7 +645,7 @@ public class TextComponent extends Component implements Accessible {
      *          <code><em>Foo</em>Listener</code>s on this text component,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/TextField.java b/src/java.desktop/share/classes/java/awt/TextField.java
index 5ca720ee80e..d2bfa0360b9 100644
--- a/src/java.desktop/share/classes/java/awt/TextField.java
+++ b/src/java.desktop/share/classes/java/awt/TextField.java
@@ -152,7 +152,7 @@ public class TextField extends TextComponent {
 
     /**
      * Constructs a new text field.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -167,7 +167,7 @@ public class TextField extends TextComponent {
      *             string {@code ""} will be displayed.
      *             If {@code text} contains EOL and/or LF characters, then
      *             each will be replaced by space character.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -182,7 +182,7 @@ public class TextField extends TextComponent {
      * @param      columns     the number of columns.  If
      *             {@code columns} is less than {@code 0},
      *             {@code columns} is set to {@code 0}.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -203,7 +203,7 @@ public class TextField extends TextComponent {
      * @param      columns     the number of columns.  If
      *             {@code columns} is less than {@code 0},
      *             {@code columns} is set to {@code 0}.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -369,7 +369,7 @@ public class TextField extends TextComponent {
      * approximate average character width that is platform-dependent.
      * @param      columns   the number of columns.
      * @see        java.awt.TextField#getColumns
-     * @exception  IllegalArgumentException   if the value
+     * @throws  IllegalArgumentException   if the value
      *                 supplied for {@code columns}
      *                 is less than {@code 0}.
      * @since      1.1
@@ -585,7 +585,7 @@ public class TextField extends TextComponent {
      *          <code><em>Foo</em>Listener</code>s on this textfield,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java
index f3f4bcbb5c8..7399ced02bb 100644
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -149,7 +149,7 @@ public abstract class Toolkit {
      * with the current system color values.
      *
      * @param     systemColors an integer array.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @since     1.1
@@ -181,7 +181,7 @@ public abstract class Toolkit {
      * @param     dynamic  If true, Containers should re-layout their
      *            components as the Container is being resized.  If false,
      *            the layout will be validated after resizing is completed.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see       #isDynamicLayoutSet()
      * @see       #isDynamicLayoutActive()
@@ -208,7 +208,7 @@ public abstract class Toolkit {
      *
      * @return    true if validation of Containers is done dynamically,
      *            false if validation is done after resizing is finished.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see       #setDynamicLayout(boolean dynamic)
      * @see       #isDynamicLayoutActive()
@@ -274,7 +274,7 @@ public abstract class Toolkit {
      * available from {@code GraphicsConfiguration} and
      * {@code GraphicsDevice}.
      * @return    the size of this toolkit's screen, in pixels.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsConfiguration#getBounds
      * @see       java.awt.GraphicsDevice#getDisplayMode
@@ -286,7 +286,7 @@ public abstract class Toolkit {
     /**
      * Returns the screen resolution in dots-per-inch.
      * @return    this toolkit's screen resolution, in dots-per-inch.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      */
@@ -297,7 +297,7 @@ public abstract class Toolkit {
      * Gets the insets of the screen.
      * @param     gc a {@code GraphicsConfiguration}
      * @return    the insets of this toolkit's screen, in pixels.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @since     1.4
@@ -324,7 +324,7 @@ public abstract class Toolkit {
      * {@code getColorModel} method
      * of the {@code Component} class.
      * @return    the color model of this toolkit's screen.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @see       java.awt.image.ColorModel
@@ -973,7 +973,7 @@ public abstract class Toolkit {
      * checkPermission} method to check {@code AWTPermission("accessClipboard")}.
      *
      * @return    the system Clipboard
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @see       java.awt.datatransfer.Clipboard
@@ -1020,7 +1020,7 @@ public abstract class Toolkit {
      * @return the system selection as a {@code Clipboard}, or
      *         {@code null} if the native platform does not support a
      *         system selection {@code Clipboard}
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      *
      * @see java.awt.datatransfer.Clipboard
@@ -1057,7 +1057,7 @@ public abstract class Toolkit {
      * <b>Control</b> key isn't the correct key for accelerators.
      * @return    the modifier mask on the {@code Event} class
      *                 that is used for menu shortcuts on this toolkit.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @see       java.awt.MenuBar
@@ -1111,12 +1111,12 @@ public abstract class Toolkit {
      * @param  keyCode the key code
      * @return {@code true} if the given key is currently in its "on" state;
      *          otherwise {@code false}
-     * @exception java.lang.IllegalArgumentException if {@code keyCode}
+     * @throws java.lang.IllegalArgumentException if {@code keyCode}
      * is not one of the valid key codes
-     * @exception java.lang.UnsupportedOperationException if the host system doesn't
+     * @throws java.lang.UnsupportedOperationException if the host system doesn't
      * allow getting the state of this key programmatically, or if the keyboard
      * doesn't have this key
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @since 1.3
@@ -1147,12 +1147,12 @@ public abstract class Toolkit {
      *
      * @param  keyCode the key code
      * @param  on the state of the key
-     * @exception java.lang.IllegalArgumentException if {@code keyCode}
+     * @throws java.lang.IllegalArgumentException if {@code keyCode}
      * is not one of the valid key codes
-     * @exception java.lang.UnsupportedOperationException if the host system doesn't
+     * @throws java.lang.UnsupportedOperationException if the host system doesn't
      * allow setting the state of this key programmatically, or if the keyboard
      * doesn't have this key
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @since 1.3
@@ -1193,10 +1193,10 @@ public abstract class Toolkit {
      *   hotSpot values must be less than the Dimension returned by
      *   {@code getBestCursorSize}
      * @param     name a localized description of the cursor, for Java Accessibility use
-     * @exception IndexOutOfBoundsException if the hotSpot values are outside
+     * @throws IndexOutOfBoundsException if the hotSpot values are outside
      *   the bounds of the cursor
      * @return the cursor created
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @since     1.2
@@ -1232,7 +1232,7 @@ public abstract class Toolkit {
      * to use.
      * @return    the closest matching supported cursor size, or a dimension of 0,0 if
      * the Toolkit implementation doesn't support custom cursors.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @since     1.2
@@ -1262,7 +1262,7 @@ public abstract class Toolkit {
      *
      * @return    the maximum number of colors, or zero if custom cursors are not
      * supported by this Toolkit implementation.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @since     1.2
@@ -1310,7 +1310,7 @@ public abstract class Toolkit {
      * @param state one of named frame state constants.
      * @return {@code true} is this frame state is supported by
      *     this Toolkit implementation, {@code false} otherwise.
-     * @exception HeadlessException
+     * @throws HeadlessException
      *     if {@code GraphicsEnvironment.isHeadless()}
      *     returns {@code true}.
      * @see java.awt.Window#addWindowStateListener
@@ -2203,7 +2203,7 @@ public abstract class Toolkit {
      * returned is unmodifiable.
      * @param highlight input method highlight
      * @return style attribute map, or {@code null}
-     * @exception HeadlessException if
+     * @throws HeadlessException if
      *     {@code GraphicsEnvironment.isHeadless} returns true
      * @see       java.awt.GraphicsEnvironment#isHeadless
      * @since 1.3
@@ -2360,7 +2360,7 @@ public abstract class Toolkit {
     * initialized with {@code true}.
     * Changing this value after the {@code Toolkit} class initialization will have no effect.
     *
-    * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
+    * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
     * @return {@code true} if events from extra mouse buttons are allowed to be processed and posted;
     *         {@code false} otherwise
     * @see System#getProperty(String propertyName)
diff --git a/src/java.desktop/share/classes/java/awt/Window.java b/src/java.desktop/share/classes/java/awt/Window.java
index 59e63abbb3c..c58b2a5e94a 100644
--- a/src/java.desktop/share/classes/java/awt/Window.java
+++ b/src/java.desktop/share/classes/java/awt/Window.java
@@ -442,9 +442,9 @@ public class Window extends Container implements Accessible {
      * @param gc the {@code GraphicsConfiguration} of the target screen
      *     device. If {@code gc} is {@code null}, the system default
      *     {@code GraphicsConfiguration} is assumed
-     * @exception IllegalArgumentException if {@code gc}
+     * @throws IllegalArgumentException if {@code gc}
      *    is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -544,7 +544,7 @@ public class Window extends Container implements Accessible {
      * If that check fails with a {@code SecurityException} then a warning
      * banner is created.
      *
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns {@code true}
      *
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -566,9 +566,9 @@ public class Window extends Container implements Accessible {
      *
      * @param owner the {@code Frame} to act as owner or {@code null}
      *    if this window has no owner
-     * @exception IllegalArgumentException if the {@code owner}'s
+     * @throws IllegalArgumentException if the {@code owner}'s
      *    {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *    {@code GraphicsEnvironment.isHeadless} returns {@code true}
      *
      * @see java.awt.GraphicsEnvironment#isHeadless
@@ -593,9 +593,9 @@ public class Window extends Container implements Accessible {
      *
      * @param owner the {@code Window} to act as owner or
      *     {@code null} if this window has no owner
-     * @exception IllegalArgumentException if the {@code owner}'s
+     * @throws IllegalArgumentException if the {@code owner}'s
      *     {@code GraphicsConfiguration} is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns
      *     {@code true}
      *
@@ -627,9 +627,9 @@ public class Window extends Container implements Accessible {
      * @param gc the {@code GraphicsConfiguration} of the target
      *     screen device; if {@code gc} is {@code null},
      *     the system default {@code GraphicsConfiguration} is assumed
-     * @exception IllegalArgumentException if {@code gc}
+     * @throws IllegalArgumentException if {@code gc}
      *     is not from a screen device
-     * @exception HeadlessException when
+     * @throws HeadlessException when
      *     {@code GraphicsEnvironment.isHeadless()} returns
      *     {@code true}
      *
@@ -1964,10 +1964,10 @@ public class Window extends Container implements Accessible {
      *          <code><em>Foo</em>Listener</code>s on this window,
      *          or an empty array if no such
      *          listeners have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
-     * @exception NullPointerException if {@code listenerType} is {@code null}
+     * @throws NullPointerException if {@code listenerType} is {@code null}
      *
      * @see #getWindowListeners
      * @since 1.3
@@ -3372,8 +3372,8 @@ public class Window extends Container implements Accessible {
      * Each time this method is called,
      * the existing buffer strategy for this component is discarded.
      * @param numBuffers number of buffers to create
-     * @exception IllegalArgumentException if numBuffers is less than 1.
-     * @exception IllegalStateException if the component is not displayable
+     * @throws IllegalArgumentException if numBuffers is less than 1.
+     * @throws IllegalStateException if the component is not displayable
      * @see #isDisplayable
      * @see #getBufferStrategy
      * @since 1.4
@@ -3393,11 +3393,11 @@ public class Window extends Container implements Accessible {
      * @param numBuffers number of buffers to create, including the front buffer
      * @param caps the required capabilities for creating the buffer strategy;
      * cannot be {@code null}
-     * @exception AWTException if the capabilities supplied could not be
+     * @throws AWTException if the capabilities supplied could not be
      * supported or met; this may happen, for example, if there is not enough
      * accelerated memory currently available, or if page flipping is specified
      * but not possible.
-     * @exception IllegalArgumentException if numBuffers is less than 1, or if
+     * @throws IllegalArgumentException if numBuffers is less than 1, or if
      * caps is {@code null}
      * @see #getBufferStrategy
      * @since 1.4
diff --git a/src/java.desktop/share/classes/java/awt/dnd/DragSource.java b/src/java.desktop/share/classes/java/awt/dnd/DragSource.java
index 8bbdfc24c06..71bf6d27c83 100644
--- a/src/java.desktop/share/classes/java/awt/dnd/DragSource.java
+++ b/src/java.desktop/share/classes/java/awt/dnd/DragSource.java
@@ -217,7 +217,7 @@ public class DragSource implements Serializable {
      * the underlying platform.
      *
      * @return the platform DragSource
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -255,7 +255,7 @@ public class DragSource implements Serializable {
     /**
      * Creates a new {@code DragSource}.
      *
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -682,7 +682,7 @@ public class DragSource implements Serializable {
      *          <code><em>Foo</em>Listener</code>s on this
      *          {@code DragSource}, or an empty array if no such listeners
      *          have been added
-     * @exception ClassCastException if {@code listenerType}
+     * @throws ClassCastException if {@code listenerType}
      *          doesn't specify a class or interface that implements
      *          {@code java.util.EventListener}
      *
diff --git a/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java b/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
index 7ba9c9711da..fbd086792a5 100644
--- a/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
+++ b/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
@@ -89,7 +89,7 @@ public class DropTarget implements DropTargetListener, Serializable {
      * @param dtl       The {@code DropTargetListener} for this {@code DropTarget}
      * @param act       Is the {@code DropTarget} accepting drops.
      * @param fm        The {@code FlavorMap} to use, or null for the default {@code FlavorMap}
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -136,7 +136,7 @@ public class DropTarget implements DropTargetListener, Serializable {
      * @param ops       The default acceptable actions for this {@code DropTarget}
      * @param dtl       The {@code DropTargetListener} for this {@code DropTarget}
      * @param act       Is the {@code DropTarget} accepting drops.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -149,7 +149,7 @@ public class DropTarget implements DropTargetListener, Serializable {
 
     /**
      * Creates a {@code DropTarget}.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -165,7 +165,7 @@ public class DropTarget implements DropTargetListener, Serializable {
      * The Component will receive drops only if it is enabled.
      * @param c         The {@code Component} with which this {@code DropTarget} is associated
      * @param dtl       The {@code DropTargetListener} for this {@code DropTarget}
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -185,7 +185,7 @@ public class DropTarget implements DropTargetListener, Serializable {
      * @param c         The {@code Component} with which this {@code DropTarget} is associated
      * @param ops       The default acceptable actions for this {@code DropTarget}
      * @param dtl       The {@code DropTargetListener} for this {@code DropTarget}
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      *            returns true
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
diff --git a/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java b/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java
index 94cfcc0bf40..12ad1a03171 100644
--- a/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java
+++ b/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java
@@ -436,7 +436,7 @@ public class InputMethodEvent extends AWTEvent {
      * belongs to.
      *
      * @param source the source of the event
-     * @exception  IllegalArgumentException  if source is null.
+     * @throws  IllegalArgumentException  if source is null.
      * @return most recent event time in the {@code EventQueue}
      */
     private static long getMostRecentEventTimeForSource(Object source) {
diff --git a/src/java.desktop/share/classes/java/awt/font/TextLayout.java b/src/java.desktop/share/classes/java/awt/font/TextLayout.java
index ddc5199b843..352d3c81df2 100644
--- a/src/java.desktop/share/classes/java/awt/font/TextLayout.java
+++ b/src/java.desktop/share/classes/java/awt/font/TextLayout.java
@@ -789,7 +789,7 @@ public final class TextLayout implements Cloneable {
      * For best results, it should not be too different from the current
      * advance of the line.
      * @return a {@code TextLayout} justified to the specified width.
-     * @exception Error if this layout has already been justified, an Error is
+     * @throws Error if this layout has already been justified, an Error is
      * thrown.
      */
     public TextLayout getJustifiedLayout(float justificationWidth) {
diff --git a/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java b/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java
index 44324e2d3b9..7f6fc7c34f9 100644
--- a/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java
+++ b/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java
@@ -2667,7 +2667,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * @return a new {@code AffineTransform} object representing the
      * inverse transformation.
      * @see #getDeterminant
-     * @exception NoninvertibleTransformException
+     * @throws NoninvertibleTransformException
      * if the matrix cannot be inverted.
      * @since 1.2
      */
@@ -2762,7 +2762,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * transform has no inverse, in which case an exception will be
      * thrown if the {@code invert} method is called.
      * @see #getDeterminant
-     * @exception NoninvertibleTransformException
+     * @throws NoninvertibleTransformException
      * if the matrix cannot be inverted.
      * @since 1.6
      */
@@ -3464,7 +3464,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * @param ptDst the resulting transformed point
      * @return {@code ptDst}, which contains the result of the
      * inverse transform.
-     * @exception NoninvertibleTransformException  if the matrix cannot be
+     * @throws NoninvertibleTransformException  if the matrix cannot be
      *                                         inverted.
      * @since 1.2
      */
@@ -3550,7 +3550,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * @param dstOff the offset to the location of the first
      * transformed point that is stored in the destination array
      * @param numPts the number of point objects to be transformed
-     * @exception NoninvertibleTransformException  if the matrix cannot be
+     * @throws NoninvertibleTransformException  if the matrix cannot be
      *                                         inverted.
      * @since 1.2
      */
diff --git a/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java b/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java
index 76d366c0ec6..cf33fb30438 100644
--- a/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java
@@ -1564,7 +1564,7 @@ public abstract class CubicCurve2D implements Shape, Cloneable {
      * Creates a new object of the same class as this object.
      *
      * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
+     * @throws  OutOfMemoryError            if there is not enough memory.
      * @see        java.lang.Cloneable
      * @since      1.2
      */
diff --git a/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java b/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java
index 180d96a3840..0a2015b15a9 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java
@@ -99,7 +99,7 @@ public abstract class Dimension2D implements Cloneable {
      * Creates a new object of the same class as this object.
      *
      * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
+     * @throws  OutOfMemoryError            if there is not enough memory.
      * @see        java.lang.Cloneable
      * @since      1.2
      */
diff --git a/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java b/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java
index 40159f2db5f..123e6d60b92 100644
--- a/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java
+++ b/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java
@@ -109,7 +109,7 @@ public class FlatteningPathIterator implements PathIterator {
      * control points and the flattened curve
      * @param limit the maximum number of recursive subdivisions
      * allowed for any curved segment
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      *          {@code flatness} or {@code limit}
      *          is less than zero
      */
@@ -336,7 +336,7 @@ public class FlatteningPathIterator implements PathIterator {
      * @param coords an array that holds the data returned from
      * this method
      * @return the path segment type of the current path segment.
-     * @exception NoSuchElementException if there
+     * @throws NoSuchElementException if there
      *          are no more elements in the flattening path to be
      *          returned.
      * @see PathIterator#SEG_MOVETO
@@ -371,7 +371,7 @@ public class FlatteningPathIterator implements PathIterator {
      * @param coords an array that holds the data returned from
      * this method
      * @return the path segment type of the current path segment.
-     * @exception NoSuchElementException if there
+     * @throws NoSuchElementException if there
      *          are no more elements in the flattening path to be
      *          returned.
      * @see PathIterator#SEG_MOVETO
diff --git a/src/java.desktop/share/classes/java/awt/geom/Line2D.java b/src/java.desktop/share/classes/java/awt/geom/Line2D.java
index 3d79e44dfee..305b51942d9 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Line2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Line2D.java
@@ -1111,7 +1111,7 @@ public abstract class Line2D implements Shape, Cloneable {
      * Creates a new object of the same class as this object.
      *
      * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
+     * @throws  OutOfMemoryError            if there is not enough memory.
      * @see        java.lang.Cloneable
      * @since      1.2
      */
diff --git a/src/java.desktop/share/classes/java/awt/geom/Path2D.java b/src/java.desktop/share/classes/java/awt/geom/Path2D.java
index 6168664452b..e777f276602 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Path2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Path2D.java
@@ -842,7 +842,7 @@ public abstract class Path2D implements Shape, Cloneable {
          * Creates a new object of the same class as this object.
          *
          * @return     a clone of this instance.
-         * @exception  OutOfMemoryError    if there is not enough memory.
+         * @throws  OutOfMemoryError    if there is not enough memory.
          * @see        java.lang.Cloneable
          * @since      1.6
          */
@@ -1638,7 +1638,7 @@ public abstract class Path2D implements Shape, Cloneable {
          * Creates a new object of the same class as this object.
          *
          * @return     a clone of this instance.
-         * @exception  OutOfMemoryError    if there is not enough memory.
+         * @throws  OutOfMemoryError    if there is not enough memory.
          * @see        java.lang.Cloneable
          * @since      1.6
          */
@@ -2018,7 +2018,7 @@ public abstract class Path2D implements Shape, Cloneable {
      *
      * @param rule an integer representing the specified
      *             winding rule
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      *          {@code rule} is not either
      *          {@link #WIND_EVEN_ODD} or
      *          {@link #WIND_NON_ZERO}
@@ -2530,7 +2530,7 @@ public abstract class Path2D implements Shape, Cloneable {
      * Creates a new object of the same class as this object.
      *
      * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
+     * @throws  OutOfMemoryError            if there is not enough memory.
      * @see        java.lang.Cloneable
      * @since      1.6
      */
diff --git a/src/java.desktop/share/classes/java/awt/geom/Point2D.java b/src/java.desktop/share/classes/java/awt/geom/Point2D.java
index bffb5594cfa..2b0a2aabef1 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Point2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Point2D.java
@@ -387,7 +387,7 @@ public abstract class Point2D implements Cloneable {
      * Creates a new object of the same class and with the
      * same contents as this object.
      * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
+     * @throws  OutOfMemoryError            if there is not enough memory.
      * @see        java.lang.Cloneable
      * @since      1.2
      */
diff --git a/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java b/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java
index f7dce7ea8e3..6f4990df49c 100644
--- a/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java
@@ -1388,7 +1388,7 @@ public abstract class QuadCurve2D implements Shape, Cloneable {
      * as this object.
      *
      * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
+     * @throws  OutOfMemoryError            if there is not enough memory.
      * @see        java.lang.Cloneable
      * @since      1.2
      */
diff --git a/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java b/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java
index 892eb634559..d0b0792792e 100644
--- a/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java
+++ b/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java
@@ -382,7 +382,7 @@ public abstract class RectangularShape implements Shape, Cloneable {
      * Creates a new object of the same class and with the same
      * contents as this object.
      * @return     a clone of this instance.
-     * @exception  OutOfMemoryError            if there is not enough memory.
+     * @throws  OutOfMemoryError            if there is not enough memory.
      * @see        java.lang.Cloneable
      * @since      1.2
      */
diff --git a/src/java.desktop/share/classes/java/awt/im/InputContext.java b/src/java.desktop/share/classes/java/awt/im/InputContext.java
index 2a73793df2b..5476d9e2518 100644
--- a/src/java.desktop/share/classes/java/awt/im/InputContext.java
+++ b/src/java.desktop/share/classes/java/awt/im/InputContext.java
@@ -140,7 +140,7 @@ public class InputContext {
      * @param locale The desired new locale.
      * @return true if the input method or keyboard layout that's active after
      *         this call supports the desired locale.
-     * @exception NullPointerException if {@code locale} is null
+     * @throws NullPointerException if {@code locale} is null
      */
     public boolean selectInputMethod(Locale locale) {
         // real implementation is in sun.awt.im.InputContext
@@ -268,7 +268,7 @@ public class InputContext {
      * If no input method is available, then the event will never be consumed.
      *
      * @param event The event
-     * @exception NullPointerException if {@code event} is null
+     * @throws NullPointerException if {@code event} is null
      */
     public void dispatchEvent(AWTEvent event) {
         // real implementation is in sun.awt.im.InputContext
@@ -286,7 +286,7 @@ public class InputContext {
      * If no input methods are available, then this method has no effect.
      *
      * @param client Client component
-     * @exception NullPointerException if {@code client} is null
+     * @throws NullPointerException if {@code client} is null
      */
     public void removeNotify(Component client) {
         // real implementation is in sun.awt.im.InputContext
diff --git a/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java b/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
index 7fcf3c9549b..4b8d4d5c9ea 100644
--- a/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
+++ b/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
@@ -111,7 +111,7 @@ public class InputMethodHighlight {
      * @param state The conversion state for the text range - RAW_TEXT or CONVERTED_TEXT
      * @see InputMethodHighlight#RAW_TEXT
      * @see InputMethodHighlight#CONVERTED_TEXT
-     * @exception IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
+     * @throws IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
      */
     public InputMethodHighlight(boolean selected, int state) {
         this(selected, state, 0, null);
@@ -125,7 +125,7 @@ public class InputMethodHighlight {
      * @param variation The style variation for the text range
      * @see InputMethodHighlight#RAW_TEXT
      * @see InputMethodHighlight#CONVERTED_TEXT
-     * @exception IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
+     * @throws IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
      */
     public InputMethodHighlight(boolean selected, int state, int variation) {
         this(selected, state, variation, null);
@@ -140,7 +140,7 @@ public class InputMethodHighlight {
      * @param style the rendering style attributes for the text range, or null
      * @see InputMethodHighlight#RAW_TEXT
      * @see InputMethodHighlight#CONVERTED_TEXT
-     * @exception IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
+     * @throws IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
      * @since 1.3
      */
     public InputMethodHighlight(boolean selected, int state, int variation,
diff --git a/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java
index 1174493cc58..c01987bbfed 100644
--- a/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java
+++ b/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java
@@ -59,7 +59,7 @@ public interface InputMethod {
      * method.
      *
      * @param context the input method context for this input method
-     * @exception NullPointerException if {@code context} is null
+     * @throws NullPointerException if {@code context} is null
      */
     public void setInputMethodContext(InputMethodContext context);
 
@@ -80,7 +80,7 @@ public interface InputMethod {
      *
      * @param locale locale to input
      * @return whether the specified locale is supported
-     * @exception NullPointerException if {@code locale} is null
+     * @throws NullPointerException if {@code locale} is null
      */
     public boolean setLocale(Locale locale);
 
@@ -211,7 +211,7 @@ public interface InputMethod {
      * This method is called by {@link java.awt.im.InputContext#dispatchEvent InputContext.dispatchEvent}.
      *
      * @param event the event being dispatched to the input method
-     * @exception NullPointerException if {@code event} is null
+     * @throws NullPointerException if {@code event} is null
      */
     public void dispatchEvent(AWTEvent event);
 
diff --git a/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java
index 09d44a5eda4..c17c4e4afef 100644
--- a/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java
+++ b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java
@@ -92,7 +92,7 @@ public interface InputMethodContext extends InputMethodRequests {
      * @param attachToInputContext whether this window should share the input context
      *              that corresponds to this input method context
      * @return a window with special characteristics for use by input methods
-     * @exception HeadlessException if {@code GraphicsEnvironment.isHeadless}
+     * @throws HeadlessException if {@code GraphicsEnvironment.isHeadless}
      *            returns {@code true}
      */
     public Window createInputMethodWindow(String title, boolean attachToInputContext);
@@ -124,7 +124,7 @@ public interface InputMethodContext extends InputMethodRequests {
      * @param attachToInputContext whether this window should share the input context
      *              that corresponds to this input method context
      * @return a JFrame with special characteristics for use by input methods
-     * @exception HeadlessException if {@code GraphicsEnvironment.isHeadless}
+     * @throws HeadlessException if {@code GraphicsEnvironment.isHeadless}
      *            returns {@code true}
      *
      * @since 1.4
diff --git a/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java
index 885e7ad4e09..6e3d8f89706 100644
--- a/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java
+++ b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java
@@ -63,7 +63,7 @@ public interface InputMethodDescriptor {
      * unavailable.
      *
      * @return the locales supported by the input method
-     * @exception AWTException if it can be determined that the input method
+     * @throws AWTException if it can be determined that the input method
      * is inoperable, for example, because of incomplete installation.
      */
     Locale[] getAvailableLocales() throws AWTException;
@@ -122,7 +122,7 @@ public interface InputMethodDescriptor {
      * Creates a new instance of the corresponding input method.
      *
      * @return a new instance of the corresponding input method
-     * @exception Exception any exception that may occur while creating the
+     * @throws Exception any exception that may occur while creating the
      * input method instance
      */
     InputMethod createInputMethod() throws Exception;
diff --git a/src/java.desktop/share/classes/java/awt/image/BufferedImage.java b/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
index 3c937dd3866..770fec6e8ab 100644
--- a/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
+++ b/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
@@ -594,12 +594,12 @@ public class BufferedImage extends java.awt.Image
      *                  the raster has been premultiplied with alpha.
      * @param properties {@code Hashtable} of
      *                  {@code String}/{@code Object} pairs.
-     * @exception RasterFormatException if the number and
+     * @throws RasterFormatException if the number and
      * types of bands in the {@code SampleModel} of the
      * {@code Raster} do not match the number and types required by
      * the {@code ColorModel} to represent its color and alpha
      * components.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      *          {@code raster} is incompatible with {@code cm}
      * @see ColorModel
      * @see Raster
@@ -1195,7 +1195,7 @@ public class BufferedImage extends java.awt.Image
      * @param h the height of the specified rectangular region
      * @return a {@code BufferedImage} that is the subimage of this
      *          {@code BufferedImage}.
-     * @exception RasterFormatException if the specified
+     * @throws RasterFormatException if the specified
      * area is not contained within this {@code BufferedImage}.
      */
     public BufferedImage getSubimage (int x, int y, int w, int h) {
@@ -1391,7 +1391,7 @@ public class BufferedImage extends java.awt.Image
      * @param tileY the y index of the requested tile in the tile array
      * @return a {@code Raster} that is the tile defined by the
      *          arguments {@code tileX} and {@code tileY}.
-     * @exception ArrayIndexOutOfBoundsException if both
+     * @throws ArrayIndexOutOfBoundsException if both
      *          {@code tileX} and {@code tileY} are not
      *          equal to 0
      */
@@ -1561,7 +1561,7 @@ public class BufferedImage extends java.awt.Image
      * @return {@code true} if the tile specified by the specified
      *          indices is checked out for writing; {@code false}
      *          otherwise.
-     * @exception ArrayIndexOutOfBoundsException if both
+     * @throws ArrayIndexOutOfBoundsException if both
      *          {@code tileX} and {@code tileY} are not equal
      *          to 0
      */
diff --git a/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java b/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java
index 01bebc12ee2..2bb5a1219ef 100644
--- a/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java
+++ b/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java
@@ -117,7 +117,7 @@ public class ByteLookupTable extends LookupTable {
      *         same length as {@code src}.
      * @return the array {@code dst}, an {@code int} array of
      *         samples.
-     * @exception ArrayIndexOutOfBoundsException if {@code src} is
+     * @throws ArrayIndexOutOfBoundsException if {@code src} is
      *            longer than {@code dst} or if for any element
      *            {@code i} of {@code src},
      *            {@code src[i]-offset} is either less than zero or
@@ -168,7 +168,7 @@ public class ByteLookupTable extends LookupTable {
      *         same length as {@code src}.
      * @return the array {@code dst}, an {@code int} array of
      *         samples.
-     * @exception ArrayIndexOutOfBoundsException if {@code src} is
+     * @throws ArrayIndexOutOfBoundsException if {@code src} is
      *            longer than {@code dst} or if for any element
      *            {@code i} of {@code src},
      *            {@code (src[i]&0xff)-offset} is either less than
diff --git a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
index 023b376d73d..f5ec86a151a 100644
--- a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
+++ b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
@@ -194,9 +194,9 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp {
      * @param profiles the array of {@code ICC_Profile} objects
      * @param hints the {@code RenderingHints} object used to control
      *        the color conversion, or {@code null}
-     * @exception IllegalArgumentException when the profile sequence does not
+     * @throws IllegalArgumentException when the profile sequence does not
      *             specify a well-defined color conversion
-     * @exception NullPointerException if profiles is null
+     * @throws NullPointerException if profiles is null
      */
     public ColorConvertOp (ICC_Profile[] profiles, RenderingHints hints)
     {
@@ -242,7 +242,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp {
      * @return {@code dest} color converted from {@code src}
      *         or a new, converted {@code BufferedImage}
      *         if {@code dest} is {@code null}
-     * @exception IllegalArgumentException if dest is null and this op was
+     * @throws IllegalArgumentException if dest is null and this op was
      *             constructed using the constructor which takes only a
      *             RenderingHints argument, since the operation is ill defined.
      */
@@ -456,7 +456,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp {
      * @return {@code dest} color converted from {@code src}
      *         or a new, converted {@code WritableRaster}
      *         if {@code dest} is {@code null}
-     * @exception IllegalArgumentException if the number of source or
+     * @throws IllegalArgumentException if the number of source or
      *             destination bands is incorrect, the source or destination
      *             color spaces are undefined, or this op was constructed
      *             with one of the constructors that applies only to
diff --git a/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
index bf7ad07a22e..5853f3802a4 100644
--- a/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
@@ -642,12 +642,12 @@ public class DirectColorModel extends PackedColorModel {
      * @param inData the specified pixel
      * @return the alpha component of the specified pixel, scaled from
      *         0 to 255.
-     * @exception ClassCastException if {@code inData}
+     * @throws ClassCastException if {@code inData}
      *  is not a primitive array of type {@code transferType}
-     * @exception ArrayIndexOutOfBoundsException if
+     * @throws ArrayIndexOutOfBoundsException if
      *  {@code inData} is not large enough to hold a pixel value
      *  for this {@code ColorModel}
-     * @exception UnsupportedOperationException if this
+     * @throws UnsupportedOperationException if this
      *  {@code tranferType} is not supported by this
      *  {@code ColorModel}
      */
@@ -694,7 +694,7 @@ public class DirectColorModel extends PackedColorModel {
      *
      * @param inData the specified pixel
      * @return the color and alpha components of the specified pixel.
-     * @exception UnsupportedOperationException if this
+     * @throws UnsupportedOperationException if this
      *            {@code transferType} is not supported by this
      *            {@code ColorModel}
      * @see ColorModel#getRGBdefault
@@ -744,12 +744,12 @@ public class DirectColorModel extends PackedColorModel {
      * @param pixel the specified pixel
      * @return an array representation of the specified pixel in this
      *         {@code ColorModel}
-     * @exception ClassCastException if {@code pixel}
+     * @throws ClassCastException if {@code pixel}
      *  is not a primitive array of type {@code transferType}
-     * @exception ArrayIndexOutOfBoundsException if
+     * @throws ArrayIndexOutOfBoundsException if
      *  {@code pixel} is not large enough to hold a pixel value
      *  for this {@code ColorModel}
-     * @exception UnsupportedOperationException if this
+     * @throws UnsupportedOperationException if this
      *  {@code transferType} is not supported by this
      *  {@code ColorModel}
      * @see WritableRaster#setDataElements
@@ -963,14 +963,14 @@ public class DirectColorModel extends PackedColorModel {
      *        which to start storing the color and alpha components
      * @return an array containing the color and alpha components of the
      * specified pixel starting at the specified offset.
-     * @exception ClassCastException if {@code pixel}
+     * @throws ClassCastException if {@code pixel}
      *  is not a primitive array of type {@code transferType}
-     * @exception ArrayIndexOutOfBoundsException if
+     * @throws ArrayIndexOutOfBoundsException if
      *  {@code pixel} is not large enough to hold a pixel value
      *  for this {@code ColorModel}, or if {@code components}
      *  is not {@code null} and is not large enough to hold all the
      *  color and alpha components, starting at {@code offset}
-     * @exception UnsupportedOperationException if this
+     * @throws UnsupportedOperationException if this
      *            {@code transferType} is not supported by this
      *            color model
      */
@@ -1055,7 +1055,7 @@ public class DirectColorModel extends PackedColorModel {
      * begin retrieving the color and alpha components
      * @return an {@code int} pixel value in this
      * {@code ColorModel} corresponding to the specified components.
-     * @exception ArrayIndexOutOfBoundsException if
+     * @throws ArrayIndexOutOfBoundsException if
      *  the {@code components} array is not large enough to
      *  hold all of the color and alpha components starting at
      *  {@code offset}
@@ -1097,14 +1097,14 @@ public class DirectColorModel extends PackedColorModel {
      * and alpha components
      * @return an {@code Object} representing an array of color and
      * alpha components.
-     * @exception ClassCastException if {@code obj}
+     * @throws ClassCastException if {@code obj}
      *  is not a primitive array of type {@code transferType}
-     * @exception ArrayIndexOutOfBoundsException if
+     * @throws ArrayIndexOutOfBoundsException if
      *  {@code obj} is not large enough to hold a pixel value
      *  for this {@code ColorModel} or the {@code components}
      *  array is not large enough to hold all of the color and alpha
      *  components starting at {@code offset}
-     * @exception UnsupportedOperationException if this
+     * @throws UnsupportedOperationException if this
      *            {@code transferType} is not supported by this
      *            color model
      * @see WritableRaster#setDataElements
@@ -1169,7 +1169,7 @@ public class DirectColorModel extends PackedColorModel {
      * premultiplied; {@code false} otherwise
      * @return a {@code ColorModel} object that represents the
      * coerced data.
-     * @exception UnsupportedOperationException if this
+     * @throws UnsupportedOperationException if this
      *            {@code transferType} is not supported by this
      *            color model
      */
diff --git a/src/java.desktop/share/classes/java/awt/image/ImageFilter.java b/src/java.desktop/share/classes/java/awt/image/ImageFilter.java
index d136e16fc6b..94586b851ae 100644
--- a/src/java.desktop/share/classes/java/awt/image/ImageFilter.java
+++ b/src/java.desktop/share/classes/java/awt/image/ImageFilter.java
@@ -107,7 +107,7 @@ public class ImageFilter implements ImageConsumer, Cloneable {
      * with the filtering operation.
      *
      * @param props the properties from the source object
-     * @exception NullPointerException if {@code props} is null
+     * @throws NullPointerException if {@code props} is null
      */
     public void setProperties(Hashtable<?,?> props) {
         @SuppressWarnings("unchecked")
@@ -245,7 +245,7 @@ public class ImageFilter implements ImageConsumer, Cloneable {
      * @param ip the ImageProducer that is feeding this instance of
      * the filter - also the ImageProducer that the request should be
      * forwarded to if necessary
-     * @exception NullPointerException if {@code ip} is null
+     * @throws NullPointerException if {@code ip} is null
      */
     public void resendTopDownLeftRight(ImageProducer ip) {
         ip.requestTopDownLeftRightResend(this);
diff --git a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
index dcec78fb348..9254d9fa717 100644
--- a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
@@ -130,7 +130,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * @param scanlineStride the line stride of the image data
      * @param dataBitOffset the data bit offset for the region of image
      *                  data described
-     * @exception RasterFormatException if the number of bits per pixel
+     * @throws RasterFormatException if the number of bits per pixel
      *                  is not a power of 2 or if a power of 2 number of
      *                  pixels do not fit in one data element.
      * @throws IllegalArgumentException if {@code w} or
@@ -321,7 +321,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * @param bands the specified bands
      * @return a new {@code SampleModel} with a subset of bands of
      * this {@code MultiPixelPackedSampleModel}.
-     * @exception RasterFormatException if the number of bands requested
+     * @throws RasterFormatException if the number of bands requested
      * is not one.
      * @throws IllegalArgumentException if {@code w} or
      *         {@code h} is not greater than 0
@@ -348,7 +348,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
      *                  data
      * @return the specified band containing the sample of the specified
      * pixel.
-     * @exception ArrayIndexOutOfBoundsException if the specified
+     * @throws ArrayIndexOutOfBoundsException if the specified
      *          coordinates are not in bounds.
      * @see #setSample(int, int, int, int, DataBuffer)
      */
@@ -377,7 +377,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * @param b the band to return, which is assumed to be 0
      * @param s the input sample as an {@code int}
      * @param data the {@code DataBuffer} where image data is stored
-     * @exception ArrayIndexOutOfBoundsException if the coordinates are
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds.
      * @see #getSample(int, int, int, DataBuffer)
      */
@@ -442,9 +442,9 @@ public class MultiPixelPackedSampleModel extends SampleModel
      * @param data the {@code DataBuffer} containing the image data.
      * @return an {@code Object} containing data for the specified
      *  pixel.
-     * @exception ClassCastException if {@code obj} is not a
+     * @throws ClassCastException if {@code obj} is not a
      *  primitive array of type TransferType or is not {@code null}
-     * @exception ArrayIndexOutOfBoundsException if the coordinates are
+     * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if {@code obj} is not {@code null} or
      * not large enough to hold the pixel data
      * @see #setDataElements(int, int, Object, DataBuffer)
@@ -526,7 +526,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
      *  {@code null}
      * @param data the {@code DataBuffer} where image data is stored
      * @return an array containing the specified pixel.
-     * @exception ArrayIndexOutOfBoundsException if the coordinates
+     * @throws ArrayIndexOutOfBoundsException if the coordinates
      *  are not in bounds
      * @see #setPixel(int, int, int[], DataBuffer)
      */
diff --git a/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java b/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java
index 3855316d986..fb66a95f539 100644
--- a/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java
+++ b/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java
@@ -219,7 +219,7 @@ public class PixelGrabber implements ImageConsumer {
      * delivered.
      * @return true if the pixels were successfully grabbed, false on
      * abort, error or timeout
-     * @exception InterruptedException
+     * @throws InterruptedException
      *            Another thread has interrupted this thread.
      */
     public boolean grabPixels() throws InterruptedException {
@@ -243,7 +243,7 @@ public class PixelGrabber implements ImageConsumer {
      * to arrive before timing out
      * @return true if the pixels were successfully grabbed, false on
      * abort, error or timeout
-     * @exception InterruptedException
+     * @throws InterruptedException
      *            Another thread has interrupted this thread.
      */
     public synchronized boolean grabPixels(long ms)
diff --git a/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java b/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java
index 44302923d17..9838fdfe8b6 100644
--- a/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java
+++ b/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java
@@ -146,7 +146,7 @@ public abstract class RGBImageFilter extends ImageFilter {
      * a color table entry is being filtered rather than an actual
      * pixel value.
      * @param icm the IndexColorModel object to be filtered
-     * @exception NullPointerException if {@code icm} is null
+     * @throws NullPointerException if {@code icm} is null
      * @return a new IndexColorModel representing the filtered colors
      */
     public IndexColorModel filterIndexColorModel(IndexColorModel icm) {
diff --git a/src/java.desktop/share/classes/java/awt/image/Raster.java b/src/java.desktop/share/classes/java/awt/image/Raster.java
index 32d45078b38..d388aa1f79c 100644
--- a/src/java.desktop/share/classes/java/awt/image/Raster.java
+++ b/src/java.desktop/share/classes/java/awt/image/Raster.java
@@ -1375,7 +1375,7 @@ public class Raster {
      * @param h the specified height of the new {@code WritableRaster}
      * @return a compatible {@code WritableRaster} with the specified
      *         size and a new sample model and data buffer.
-     * @exception RasterFormatException if the width or height is less than
+     * @throws RasterFormatException if the width or height is less than
      *                               or equal to zero.
      */
     public WritableRaster createCompatibleWritableRaster(int w, int h) {
@@ -1501,7 +1501,7 @@ public class Raster {
      *                   of the returned Raster
      * @param bandList   Array of band indices, or null to use all bands
      * @return a new {@code Raster}.
-     * @exception RasterFormatException if the specified subregion is outside
+     * @throws RasterFormatException if the specified subregion is outside
      *                               of the raster bounds.
      * @throws RasterFormatException if {@code width} or
      *         {@code height}
diff --git a/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java b/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java
index 3f4e236b9bc..e9c97ad864e 100644
--- a/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java
+++ b/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java
@@ -111,7 +111,7 @@ public class ShortLookupTable extends LookupTable {
      *         same length as {@code src}.
      * @return the array {@code dst}, an {@code int} array of
      *         samples.
-     * @exception ArrayIndexOutOfBoundsException if {@code src} is
+     * @throws ArrayIndexOutOfBoundsException if {@code src} is
      *            longer than {@code dst} or if for any element
      *            {@code i} of {@code src},
      *            {@code (src[i]&0xffff)-offset} is either less than
@@ -162,7 +162,7 @@ public class ShortLookupTable extends LookupTable {
      *         same length as {@code src}.
      * @return the array {@code dst}, an {@code int} array of
      *         samples.
-     * @exception ArrayIndexOutOfBoundsException if {@code src} is
+     * @throws ArrayIndexOutOfBoundsException if {@code src} is
      *            longer than {@code dst} or if for any element
      *            {@code i} of {@code src},
      *            {@code (src[i]&0xffff)-offset} is either less than
diff --git a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
index 864ed00cf76..abb669e02c6 100644
--- a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
@@ -302,7 +302,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
      * SinglePixelPackedSampleModel/DataBuffer combination will represent
      * an image with a subset of the bands of the original
      * SinglePixelPackedSampleModel/DataBuffer combination.
-     * @exception RasterFormatException if the length of the bands argument is
+     * @throws RasterFormatException if the length of the bands argument is
      *                                  greater than the number of bands in
      *                                  the sample model.
      */
diff --git a/src/java.desktop/share/classes/java/awt/image/WritableRaster.java b/src/java.desktop/share/classes/java/awt/image/WritableRaster.java
index 0e345026c2b..729317d85a3 100644
--- a/src/java.desktop/share/classes/java/awt/image/WritableRaster.java
+++ b/src/java.desktop/share/classes/java/awt/image/WritableRaster.java
@@ -204,7 +204,7 @@ public class WritableRaster extends Raster {
      * @param bandList   Array of band indices, or null to use all bands.
      * @return a {@code WritableRaster} sharing all or part of the
      *         {@code DataBuffer} of this {@code WritableRaster}.
-     * @exception RasterFormatException if the subregion is outside of the
+     * @throws RasterFormatException if the subregion is outside of the
      *                               raster bounds.
      * @throws RasterFormatException if {@code w} or
      *         {@code h}
diff --git a/src/java.desktop/share/classes/java/awt/print/PageFormat.java b/src/java.desktop/share/classes/java/awt/print/PageFormat.java
index b7709eb581e..019c5d0bdcc 100644
--- a/src/java.desktop/share/classes/java/awt/print/PageFormat.java
+++ b/src/java.desktop/share/classes/java/awt/print/PageFormat.java
@@ -286,7 +286,7 @@ public class PageFormat implements Cloneable
      * {@code PageFormat}.
      * @param paper the {@code Paper} object to which to set
      * the {@code Paper} object for this {@code PageFormat}.
-     * @exception NullPointerException
+     * @throws NullPointerException
      *              a null paper instance was passed as a parameter.
      * @see #getPaper
      */
diff --git a/src/java.desktop/share/classes/java/awt/print/Printable.java b/src/java.desktop/share/classes/java/awt/print/Printable.java
index 28a01cc9a16..1fbf1f7c616 100644
--- a/src/java.desktop/share/classes/java/awt/print/Printable.java
+++ b/src/java.desktop/share/classes/java/awt/print/Printable.java
@@ -134,7 +134,7 @@ public interface Printable {
      * @return PAGE_EXISTS if the page is rendered successfully
      *         or NO_SUCH_PAGE if {@code pageIndex} specifies a
      *         non-existent page.
-     * @exception java.awt.print.PrinterException
+     * @throws java.awt.print.PrinterException
      *         thrown when the print job is terminated.
      */
     int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
diff --git a/src/java.desktop/share/classes/java/awt/print/PrinterJob.java b/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
index 41656367183..ddf565f3ce3 100644
--- a/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
+++ b/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
@@ -168,7 +168,7 @@ public abstract class PrinterJob {
      * cannot support the {@code Pageable} and
      * {@code Printable} interfaces necessary to support 2D printing.
      * @param service a print service that supports 2D printing
-     * @exception PrinterException if the specified service does not support
+     * @throws PrinterException if the specified service does not support
      * 2D printing, or this PrinterJob class does not support
      * setting a 2D print service, or the specified service is
      * otherwise not a valid print service.
@@ -212,7 +212,7 @@ public abstract class PrinterJob {
      * {@code document}.
      * @param document the pages to be printed. It can not be
      * {@code null}.
-     * @exception NullPointerException the {@code Pageable} passed in
+     * @throws NullPointerException the {@code Pageable} passed in
      * was {@code null}.
      * @see PageFormat
      * @see Printable
@@ -235,7 +235,7 @@ public abstract class PrinterJob {
      * selected by the user.
      * @return {@code true} if the user does not cancel the dialog;
      * {@code false} otherwise.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -279,9 +279,9 @@ public abstract class PrinterJob {
      * This parameter may not be null.
      * @return {@code true} if the user does not cancel the dialog;
      * {@code false} otherwise.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
-     * @exception NullPointerException if {@code attributes} parameter
+     * @throws NullPointerException if {@code attributes} parameter
      * is null.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since     1.4
@@ -313,7 +313,7 @@ public abstract class PrinterJob {
      *            is cancelled; a new {@code PageFormat} object
      *            containing the format indicated by the user if the
      *            dialog is acknowledged.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since     1.2
@@ -342,9 +342,9 @@ public abstract class PrinterJob {
      * This parameter may not be null.
      * @return a page format if the user does not cancel the dialog;
      * {@code null} otherwise.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
-     * @exception NullPointerException if {@code attributes} parameter
+     * @throws NullPointerException if {@code attributes} parameter
      * is null.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since     1.4
@@ -495,7 +495,7 @@ public abstract class PrinterJob {
 
     /**
      * Prints a set of pages.
-     * @exception PrinterException an error in the print system
+     * @throws PrinterException an error in the print system
      *            caused the job to be aborted.
      * @see Book
      * @see Pageable
@@ -533,7 +533,7 @@ public abstract class PrinterJob {
      * this print() method.
      *
      * @param attributes a set of attributes for the job
-     * @exception PrinterException an error in the print system
+     * @throws PrinterException an error in the print system
      *            caused the job to be aborted.
      * @see Book
      * @see Pageable
-- 
GitLab


From beedae1141b6b650dc4cedf1f038afc1c8b460dd Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Thu, 17 Mar 2022 09:20:24 +0000
Subject: [PATCH 110/345] 8281146: Replace StringCoding.hasNegatives with
 countPositives

Co-authored-by: Lutz Schmidt <lucy@openjdk.org>
Co-authored-by: Martin Doerr <mdoerr@openjdk.org>
Reviewed-by: kvn, lucy, rriggs
---
 src/hotspot/cpu/aarch64/aarch64.ad            |   8 +-
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |  36 ++--
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |   2 +-
 .../cpu/aarch64/stubGenerator_aarch64.cpp     |  54 +++---
 .../cpu/aarch64/stubRoutines_aarch64.cpp      |   4 +-
 .../cpu/aarch64/stubRoutines_aarch64.hpp      |  12 +-
 src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp |  32 ++--
 src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp |   2 +-
 src/hotspot/cpu/ppc/ppc.ad                    |  14 +-
 .../cpu/s390/c2_MacroAssembler_s390.cpp       | 104 ++++++-----
 .../cpu/s390/c2_MacroAssembler_s390.hpp       |   4 +-
 src/hotspot/cpu/s390/s390.ad                  |  11 +-
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 155 +++++++++++------
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp |   9 +-
 src/hotspot/cpu/x86/x86_32.ad                 |  28 +--
 src/hotspot/cpu/x86/x86_64.ad                 |  28 +--
 src/hotspot/share/adlc/formssel.cpp           |   4 +-
 src/hotspot/share/classfile/vmIntrinsics.cpp  |   2 +-
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   9 +-
 .../gc/shenandoah/c2/shenandoahSupport.cpp    |   2 +-
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |   4 +-
 src/hotspot/share/opto/c2compiler.cpp         |   4 +-
 src/hotspot/share/opto/classes.hpp            |   2 +-
 src/hotspot/share/opto/escape.cpp             |   9 +-
 src/hotspot/share/opto/intrinsicnode.hpp      |   8 +-
 src/hotspot/share/opto/lcm.cpp                |   2 +-
 src/hotspot/share/opto/library_call.cpp       |  12 +-
 src/hotspot/share/opto/library_call.hpp       |   2 +-
 src/hotspot/share/opto/loopTransform.cpp      |   4 +-
 src/hotspot/share/opto/loopnode.cpp           |   2 +-
 src/hotspot/share/opto/matcher.cpp            |   4 +-
 .../share/classes/java/lang/String.java       | 164 +++++++++---------
 .../share/classes/java/lang/StringCoding.java |  23 ++-
 .../intrinsics/string/TestCountPositives.java | 130 ++++++++++++++
 .../patches/java.base/java/lang/Helper.java   |   5 +
 .../openjdk/bench/java/lang/StringDecode.java |   4 +-
 36 files changed, 558 insertions(+), 341 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 96075ecd9d5..68fd336aa33 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -17080,13 +17080,13 @@ instruct array_equalsC(iRegP_R1 ary1, iRegP_R2 ary2, iRegI_R0 result,
   ins_pipe(pipe_class_memory);
 %}
 
-instruct has_negatives(iRegP_R1 ary1, iRegI_R2 len, iRegI_R0 result, rFlagsReg cr)
+instruct count_positives(iRegP_R1 ary1, iRegI_R2 len, iRegI_R0 result, rFlagsReg cr)
 %{
-  match(Set result (HasNegatives ary1 len));
+  match(Set result (CountPositives ary1 len));
   effect(USE_KILL ary1, USE_KILL len, KILL cr);
-  format %{ "has negatives byte[] $ary1,$len -> $result" %}
+  format %{ "count positives byte[] $ary1,$len -> $result" %}
   ins_encode %{
-    address tpc = __ has_negatives($ary1$$Register, $len$$Register, $result$$Register);
+    address tpc = __ count_positives($ary1$$Register, $len$$Register, $result$$Register);
     if (tpc == NULL) {
       ciEnv::current()->record_failure("CodeCache is full");
       return;
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 80287fb6949..dae4e22b15b 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -4339,16 +4339,17 @@ void MacroAssembler::remove_frame(int framesize) {
 }
 
 
-// This method checks if provided byte array contains byte with highest bit set.
-address MacroAssembler::has_negatives(Register ary1, Register len, Register result) {
+// This method counts leading positive bytes (highest bit not set) in provided byte array
+address MacroAssembler::count_positives(Register ary1, Register len, Register result) {
     // Simple and most common case of aligned small array which is not at the
     // end of memory page is placed here. All other cases are in stub.
     Label LOOP, END, STUB, STUB_LONG, SET_RESULT, DONE;
     const uint64_t UPPER_BIT_MASK=0x8080808080808080;
     assert_different_registers(ary1, len, result);
 
+    mov(result, len);
     cmpw(len, 0);
-    br(LE, SET_RESULT);
+    br(LE, DONE);
     cmpw(len, 4 * wordSize);
     br(GE, STUB_LONG); // size > 32 then go to stub
 
@@ -4367,19 +4368,20 @@ address MacroAssembler::has_negatives(Register ary1, Register len, Register resu
     subs(len, len, wordSize);
     br(GE, LOOP);
     cmpw(len, -wordSize);
-    br(EQ, SET_RESULT);
+    br(EQ, DONE);
 
   BIND(END);
-    ldr(result, Address(ary1));
-    sub(len, zr, len, LSL, 3); // LSL 3 is to get bits from bytes
-    lslv(result, result, len);
-    tst(result, UPPER_BIT_MASK);
-    b(SET_RESULT);
+    ldr(rscratch1, Address(ary1));
+    sub(rscratch2, zr, len, LSL, 3); // LSL 3 is to get bits from bytes
+    lslv(rscratch1, rscratch1, rscratch2);
+    tst(rscratch1, UPPER_BIT_MASK);
+    br(NE, SET_RESULT);
+    b(DONE);
 
   BIND(STUB);
-    RuntimeAddress has_neg = RuntimeAddress(StubRoutines::aarch64::has_negatives());
-    assert(has_neg.target() != NULL, "has_negatives stub has not been generated");
-    address tpc1 = trampoline_call(has_neg);
+    RuntimeAddress count_pos = RuntimeAddress(StubRoutines::aarch64::count_positives());
+    assert(count_pos.target() != NULL, "count_positives stub has not been generated");
+    address tpc1 = trampoline_call(count_pos);
     if (tpc1 == NULL) {
       DEBUG_ONLY(reset_labels(STUB_LONG, SET_RESULT, DONE));
       postcond(pc() == badAddress);
@@ -4388,9 +4390,9 @@ address MacroAssembler::has_negatives(Register ary1, Register len, Register resu
     b(DONE);
 
   BIND(STUB_LONG);
-    RuntimeAddress has_neg_long = RuntimeAddress(StubRoutines::aarch64::has_negatives_long());
-    assert(has_neg_long.target() != NULL, "has_negatives stub has not been generated");
-    address tpc2 = trampoline_call(has_neg_long);
+    RuntimeAddress count_pos_long = RuntimeAddress(StubRoutines::aarch64::count_positives_long());
+    assert(count_pos_long.target() != NULL, "count_positives_long stub has not been generated");
+    address tpc2 = trampoline_call(count_pos_long);
     if (tpc2 == NULL) {
       DEBUG_ONLY(reset_labels(SET_RESULT, DONE));
       postcond(pc() == badAddress);
@@ -4399,7 +4401,9 @@ address MacroAssembler::has_negatives(Register ary1, Register len, Register resu
     b(DONE);
 
   BIND(SET_RESULT);
-    cset(result, NE); // set true or false
+
+    add(len, len, wordSize);
+    sub(result, result, len);
 
   BIND(DONE);
   postcond(pc() != badAddress);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 29d4b8ac119..1344250febb 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1234,7 +1234,7 @@ public:
         Register table0, Register table1, Register table2, Register table3,
         bool upper = false);
 
-  address has_negatives(Register ary1, Register len, Register result);
+  address count_positives(Register ary1, Register len, Register result);
 
   address arrays_equals(Register a1, Register a2, Register result, Register cnt1,
                         Register tmp1, Register tmp2, Register tmp3, int elem_size);
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index eef7e6afe71..5a92dcb6b47 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -4657,7 +4657,7 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  address generate_has_negatives(address &has_negatives_long) {
+  address generate_count_positives(address &count_positives_long) {
     const u1 large_loop_size = 64;
     const uint64_t UPPER_BIT_MASK=0x8080808080808080;
     int dcache_line = VM_Version::dcache_line_size();
@@ -4666,13 +4666,15 @@ class StubGenerator: public StubCodeGenerator {
 
     __ align(CodeEntryAlignment);
 
-    StubCodeMark mark(this, "StubRoutines", "has_negatives");
+    StubCodeMark mark(this, "StubRoutines", "count_positives");
 
     address entry = __ pc();
 
     __ enter();
+    // precondition: a copy of len is already in result
+    // __ mov(result, len);
 
-  Label RET_TRUE, RET_TRUE_NO_POP, RET_FALSE, ALIGNED, LOOP16, CHECK_16,
+  Label RET_ADJUST, RET_ADJUST_16, RET_ADJUST_LONG, RET_NO_POP, RET_LEN, ALIGNED, LOOP16, CHECK_16,
         LARGE_LOOP, POST_LOOP16, LEN_OVER_15, LEN_OVER_8, POST_LOOP16_LOAD_TAIL;
 
   __ cmp(len, (u1)15);
@@ -4686,25 +4688,26 @@ class StubGenerator: public StubCodeGenerator {
   __ sub(rscratch1, zr, len, __ LSL, 3);  // LSL 3 is to get bits from bytes.
   __ lsrv(rscratch2, rscratch2, rscratch1);
   __ tst(rscratch2, UPPER_BIT_MASK);
-  __ cset(result, Assembler::NE);
+  __ csel(result, zr, result, Assembler::NE);
   __ leave();
   __ ret(lr);
   __ bind(LEN_OVER_8);
   __ ldp(rscratch1, rscratch2, Address(ary1, -16));
   __ sub(len, len, 8); // no data dep., then sub can be executed while loading
   __ tst(rscratch2, UPPER_BIT_MASK);
-  __ br(Assembler::NE, RET_TRUE_NO_POP);
+  __ br(Assembler::NE, RET_NO_POP);
   __ sub(rscratch2, zr, len, __ LSL, 3); // LSL 3 is to get bits from bytes
   __ lsrv(rscratch1, rscratch1, rscratch2);
   __ tst(rscratch1, UPPER_BIT_MASK);
-  __ cset(result, Assembler::NE);
+  __ bind(RET_NO_POP);
+  __ csel(result, zr, result, Assembler::NE);
   __ leave();
   __ ret(lr);
 
   Register tmp1 = r3, tmp2 = r4, tmp3 = r5, tmp4 = r6, tmp5 = r7, tmp6 = r10;
   const RegSet spilled_regs = RegSet::range(tmp1, tmp5) + tmp6;
 
-  has_negatives_long = __ pc(); // 2nd entry point
+  count_positives_long = __ pc(); // 2nd entry point
 
   __ enter();
 
@@ -4716,10 +4719,10 @@ class StubGenerator: public StubCodeGenerator {
     __ mov(tmp5, 16);
     __ sub(rscratch1, tmp5, rscratch2); // amount of bytes until aligned address
     __ add(ary1, ary1, rscratch1);
-    __ sub(len, len, rscratch1);
     __ orr(tmp6, tmp6, tmp1);
     __ tst(tmp6, UPPER_BIT_MASK);
-    __ br(Assembler::NE, RET_TRUE);
+    __ br(Assembler::NE, RET_ADJUST);
+    __ sub(len, len, rscratch1);
 
   __ bind(ALIGNED);
     __ cmp(len, large_loop_size);
@@ -4734,7 +4737,7 @@ class StubGenerator: public StubCodeGenerator {
     __ sub(len, len, 16);
     __ orr(tmp6, tmp6, tmp1);
     __ tst(tmp6, UPPER_BIT_MASK);
-    __ br(Assembler::NE, RET_TRUE);
+    __ br(Assembler::NE, RET_ADJUST_16);
     __ cmp(len, large_loop_size);
     __ br(Assembler::LT, CHECK_16);
 
@@ -4766,7 +4769,7 @@ class StubGenerator: public StubCodeGenerator {
     __ orr(rscratch1, rscratch1, tmp6);
     __ orr(tmp2, tmp2, rscratch1);
     __ tst(tmp2, UPPER_BIT_MASK);
-    __ br(Assembler::NE, RET_TRUE);
+    __ br(Assembler::NE, RET_ADJUST_LONG);
     __ cmp(len, large_loop_size);
     __ br(Assembler::GE, LARGE_LOOP);
 
@@ -4779,7 +4782,7 @@ class StubGenerator: public StubCodeGenerator {
     __ sub(len, len, 16);
     __ orr(tmp2, tmp2, tmp3);
     __ tst(tmp2, UPPER_BIT_MASK);
-    __ br(Assembler::NE, RET_TRUE);
+    __ br(Assembler::NE, RET_ADJUST_16);
     __ cmp(len, (u1)16);
     __ br(Assembler::GE, LOOP16); // 16-byte load loop end
 
@@ -4787,31 +4790,36 @@ class StubGenerator: public StubCodeGenerator {
     __ cmp(len, (u1)8);
     __ br(Assembler::LE, POST_LOOP16_LOAD_TAIL);
     __ ldr(tmp3, Address(__ post(ary1, 8)));
-    __ sub(len, len, 8);
     __ tst(tmp3, UPPER_BIT_MASK);
-    __ br(Assembler::NE, RET_TRUE);
+    __ br(Assembler::NE, RET_ADJUST);
+    __ sub(len, len, 8);
 
   __ bind(POST_LOOP16_LOAD_TAIL);
-    __ cbz(len, RET_FALSE); // Can't shift left by 64 when len==0
+    __ cbz(len, RET_LEN); // Can't shift left by 64 when len==0
     __ ldr(tmp1, Address(ary1));
     __ mov(tmp2, 64);
     __ sub(tmp4, tmp2, len, __ LSL, 3);
     __ lslv(tmp1, tmp1, tmp4);
     __ tst(tmp1, UPPER_BIT_MASK);
-    __ br(Assembler::NE, RET_TRUE);
+    __ br(Assembler::NE, RET_ADJUST);
     // Fallthrough
 
-  __ bind(RET_FALSE);
+  __ bind(RET_LEN);
     __ pop(spilled_regs, sp);
     __ leave();
-    __ mov(result, zr);
     __ ret(lr);
 
-  __ bind(RET_TRUE);
+    // difference result - len is the count of guaranteed to be
+    // positive bytes
+
+  __ bind(RET_ADJUST_LONG);
+    __ add(len, len, (u1)(large_loop_size - 16));
+  __ bind(RET_ADJUST_16);
+    __ add(len, len, 16);
+  __ bind(RET_ADJUST);
     __ pop(spilled_regs, sp);
-  __ bind(RET_TRUE_NO_POP);
     __ leave();
-    __ mov(result, 1);
+    __ sub(result, result, len);
     __ ret(lr);
 
     return entry;
@@ -7515,8 +7523,8 @@ class StubGenerator: public StubCodeGenerator {
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    // has negatives stub for large arrays.
-    StubRoutines::aarch64::_has_negatives = generate_has_negatives(StubRoutines::aarch64::_has_negatives_long);
+    // countPositives stub for large arrays.
+    StubRoutines::aarch64::_count_positives = generate_count_positives(StubRoutines::aarch64::_count_positives_long);
 
     // array equals stub for large arrays.
     if (!UseSimpleArrayEquals) {
diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
index 9e16a1f9f88..2e1c4b69542 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
@@ -45,8 +45,8 @@ address StubRoutines::aarch64::_float_sign_flip = NULL;
 address StubRoutines::aarch64::_double_sign_mask = NULL;
 address StubRoutines::aarch64::_double_sign_flip = NULL;
 address StubRoutines::aarch64::_zero_blocks = NULL;
-address StubRoutines::aarch64::_has_negatives = NULL;
-address StubRoutines::aarch64::_has_negatives_long = NULL;
+address StubRoutines::aarch64::_count_positives = NULL;
+address StubRoutines::aarch64::_count_positives_long = NULL;
 address StubRoutines::aarch64::_large_array_equals = NULL;
 address StubRoutines::aarch64::_compare_long_string_LL = NULL;
 address StubRoutines::aarch64::_compare_long_string_UU = NULL;
diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
index ae48d8788e1..a17e7540e42 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
@@ -76,8 +76,8 @@ class aarch64 {
 
  public:
 
-  static address _has_negatives;
-  static address _has_negatives_long;
+  static address _count_positives;
+  static address _count_positives_long;
 
   static address get_previous_sp_entry()
   {
@@ -132,12 +132,12 @@ class aarch64 {
     return _zero_blocks;
   }
 
-  static address has_negatives() {
-    return _has_negatives;
+  static address count_positives() {
+    return _count_positives;
   }
 
-  static address has_negatives_long() {
-      return _has_negatives_long;
+  static address count_positives_long() {
+      return _count_positives_long;
   }
 
   static address large_array_equals() {
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
index 1ae5c13e62e..30104094983 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
@@ -565,16 +565,16 @@ void C2_MacroAssembler::string_indexof_char(Register result, Register haystack,
 } // string_indexof_char
 
 
-void C2_MacroAssembler::has_negatives(Register src, Register cnt, Register result,
-                                      Register tmp1, Register tmp2) {
+void C2_MacroAssembler::count_positives(Register src, Register cnt, Register result,
+                                        Register tmp1, Register tmp2) {
   const Register tmp0 = R0;
   assert_different_registers(src, result, cnt, tmp0, tmp1, tmp2);
-  Label Lfastloop, Lslow, Lloop, Lnoneg, Ldone;
+  Label Lfastloop, Lslow, Lloop, Ldone;
 
   // Check if cnt >= 8 (= 16 bytes)
   lis(tmp1, (int)(short)0x8080);  // tmp1 = 0x8080808080808080
   srwi_(tmp2, cnt, 4);
-  li(result, 1);                  // Assume there's a negative byte.
+  mr(result, src);                // Use result reg to point to the current position.
   beq(CCR0, Lslow);
   ori(tmp1, tmp1, 0x8080);
   rldimi(tmp1, tmp1, 32, 0);
@@ -582,30 +582,28 @@ void C2_MacroAssembler::has_negatives(Register src, Register cnt, Register resul
 
   // 2x unrolled loop
   bind(Lfastloop);
-  ld(tmp2, 0, src);
-  ld(tmp0, 8, src);
+  ld(tmp2, 0, result);
+  ld(tmp0, 8, result);
 
   orr(tmp0, tmp2, tmp0);
 
   and_(tmp0, tmp0, tmp1);
-  bne(CCR0, Ldone);               // Found negative byte.
-  addi(src, src, 16);
-
+  bne(CCR0, Lslow);               // Found negative byte.
+  addi(result, result, 16);
   bdnz(Lfastloop);
 
-  bind(Lslow);                    // Fallback to slow version
-  rldicl_(tmp0, cnt, 0, 64-4);
-  beq(CCR0, Lnoneg);
+  bind(Lslow);                    // Fallback to slow version.
+  subf(tmp0, src, result);        // Bytes known positive.
+  subf_(tmp0, tmp0, cnt);         // Remaining Bytes.
+  beq(CCR0, Ldone);
   mtctr(tmp0);
   bind(Lloop);
-  lbz(tmp0, 0, src);
-  addi(src, src, 1);
+  lbz(tmp0, 0, result);
   andi_(tmp0, tmp0, 0x80);
   bne(CCR0, Ldone);               // Found negative byte.
+  addi(result, result, 1);
   bdnz(Lloop);
-  bind(Lnoneg);
-  li(result, 0);
 
   bind(Ldone);
+  subf(result, src, result);      // Result is offset from src.
 }
-
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
index 9c4576f2eaf..ef4840b08a2 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
@@ -63,6 +63,6 @@
   void string_indexof_char(Register result, Register haystack, Register haycnt,
                            Register needle, jchar needleChar, Register tmp1, Register tmp2, bool is_byte);
 
-  void has_negatives(Register src, Register cnt, Register result, Register tmp1, Register tmp2);
+  void count_positives(Register src, Register cnt, Register result, Register tmp1, Register tmp2);
 
 #endif // CPU_PPC_C2_MACROASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 832982deb45..b41c72ab449 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -12779,16 +12779,16 @@ instruct string_inflate(Universe dummy, rarg1RegP src, rarg2RegP dst, iRegIsrc l
 %}
 
 // StringCoding.java intrinsics
-instruct has_negatives(rarg1RegP ary1, iRegIsrc len, iRegIdst result, iRegLdst tmp1, iRegLdst tmp2,
-                       regCTR ctr, flagsRegCR0 cr0)
+instruct count_positives(iRegPsrc ary1, iRegIsrc len, iRegIdst result, iRegLdst tmp1, iRegLdst tmp2,
+                         regCTR ctr, flagsRegCR0 cr0)
 %{
-  match(Set result (HasNegatives ary1 len));
-  effect(TEMP_DEF result, USE_KILL ary1, TEMP tmp1, TEMP tmp2, KILL ctr, KILL cr0);
+  match(Set result (CountPositives ary1 len));
+  effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2, KILL ctr, KILL cr0);
   ins_cost(300);
-  format %{ "has negatives byte[] $ary1,$len -> $result \t// KILL $tmp1, $tmp2" %}
+  format %{ "count positives byte[] $ary1,$len -> $result \t// KILL $tmp1, $tmp2" %}
   ins_encode %{
-    __ has_negatives($ary1$$Register, $len$$Register, $result$$Register,
-                     $tmp1$$Register, $tmp2$$Register);
+    __ count_positives($ary1$$Register, $len$$Register, $result$$Register,
+                       $tmp1$$Register, $tmp2$$Register);
   %}
   ins_pipe(pipe_class_default);
 %}
diff --git a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
index 04a6b88052c..6fac285f738 100644
--- a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp
@@ -823,52 +823,64 @@ unsigned int C2_MacroAssembler::string_inflate_const(Register src, Register dst,
   return offset() - block_start;
 }
 
-// Kills src.
-unsigned int C2_MacroAssembler::has_negatives(Register result, Register src, Register cnt,
-                                              Register odd_reg, Register even_reg, Register tmp) {
-  int block_start = offset();
-  Label Lloop1, Lloop2, Lslow, Lnotfound, Ldone;
-  const Register addr = src, mask = tmp;
-
-  BLOCK_COMMENT("has_negatives {");
-
-  z_llgfr(Z_R1, cnt);      // Number of bytes to read. (Must be a positive simm32.)
-  z_llilf(mask, 0x80808080);
-  z_lhi(result, 1);        // Assume true.
-  // Last possible addr for fast loop.
-  z_lay(odd_reg, -16, Z_R1, src);
-  z_chi(cnt, 16);
-  z_brl(Lslow);
-
-  // ind1: index, even_reg: index increment, odd_reg: index limit
-  z_iihf(mask, 0x80808080);
-  z_lghi(even_reg, 16);
-
-  bind(Lloop1); // 16 bytes per iteration.
-  z_lg(Z_R0, Address(addr));
-  z_lg(Z_R1, Address(addr, 8));
-  z_ogr(Z_R0, Z_R1);
-  z_ngr(Z_R0, mask);
-  z_brne(Ldone);           // If found return 1.
-  z_brxlg(addr, even_reg, Lloop1);
-
-  bind(Lslow);
-  z_aghi(odd_reg, 16-1);   // Last possible addr for slow loop.
-  z_lghi(even_reg, 1);
-  z_cgr(addr, odd_reg);
-  z_brh(Lnotfound);
-
-  bind(Lloop2); // 1 byte per iteration.
-  z_cli(Address(addr), 0x80);
-  z_brnl(Ldone);           // If found return 1.
-  z_brxlg(addr, even_reg, Lloop2);
-
-  bind(Lnotfound);
-  z_lhi(result, 0);
-
-  bind(Ldone);
-
-  BLOCK_COMMENT("} has_negatives");
+// Returns the number of non-negative bytes (aka US-ASCII characters) found
+// before the first negative byte is encountered.
+unsigned int C2_MacroAssembler::count_positives(Register result, Register src, Register cnt, Register tmp) {
+  const unsigned int block_start   = offset();
+  const unsigned int byte_mask     = 0x80;
+  const unsigned int twobyte_mask  = byte_mask<<8 | byte_mask;
+  const unsigned int unroll_factor = 16;
+  const unsigned int log_unroll_factor = exact_log2(unroll_factor);
+  Register pos  = src;     // current position in src array, restored at end
+  Register ctr  = result;  // loop counter, result value
+  Register mask = tmp;     // holds the sign detection mask
+  Label unrolledLoop, unrolledDone, byteLoop, allDone;
+
+  assert_different_registers(result, src, cnt, tmp);
+
+  BLOCK_COMMENT("count_positives {");
+
+  lgr_if_needed(pos, src);              // current position in src array
+  z_srak(ctr, cnt, log_unroll_factor);  // # iterations of unrolled loop
+  z_brnh(unrolledDone);                 // array too short for unrolled loop
+
+  z_iilf(mask, twobyte_mask<<16 | twobyte_mask);
+  z_iihf(mask, twobyte_mask<<16 | twobyte_mask);
+
+  bind(unrolledLoop);
+    z_lmg(Z_R0, Z_R1, 0, pos);
+    z_ogr(Z_R0, Z_R1);
+    z_ngr(Z_R0, mask);
+    z_brne(unrolledDone);               // There is a negative byte somewhere.
+                                        // ctr and pos are not updated yet ->
+                                        // delegate finding correct pos to byteLoop.
+    add2reg(pos, unroll_factor);
+    z_brct(ctr, unrolledLoop);
+
+  // Once we arrive here, we have to examine at most (unroll_factor - 1) bytes more.
+  // We then either have reached the end of the array or we hit a negative byte.
+  bind(unrolledDone);
+  z_sll(ctr, log_unroll_factor);        // calculate # bytes not processed by unrolled loop
+                                        // > 0 only if a negative byte was found
+  z_lr(Z_R0, cnt);                      // calculate remainder bytes
+  z_nilf(Z_R0, unroll_factor - 1);
+  z_ar(ctr, Z_R0);                      // remaining bytes
+  z_brnh(allDone);                      // shortcut if nothing left to do
+
+  bind(byteLoop);
+    z_cli(0, pos, byte_mask);           // unsigned comparison! byte@pos must be smaller that byte_mask
+    z_brnl(allDone);                    // negative byte found.
+
+    add2reg(pos, 1);
+    z_brct(ctr, byteLoop);
+
+  bind(allDone);
+
+  z_srk(ctr, cnt, ctr);                 // # bytes actually processed (= cnt or index of first negative byte)
+  z_sgfr(pos, ctr);                     // restore src
+  z_lgfr(result, ctr);                  // unnecessary. Only there to be sure the high word has a defined state.
+
+  BLOCK_COMMENT("} count_positives");
 
   return offset() - block_start;
 }
diff --git a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
index a6c98656495..a502e41ee08 100644
--- a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp
@@ -57,9 +57,7 @@
   //   len is signed int. Counts # characters, not bytes.
   unsigned int string_inflate_const(Register src, Register dst, Register tmp, int len);
 
-  // Kills src.
-  unsigned int has_negatives(Register result, Register src, Register cnt,
-                             Register odd_reg, Register even_reg, Register tmp);
+  unsigned int count_positives(Register result, Register src, Register cnt, Register tmp);
 
   unsigned int string_compare(Register str1, Register str2, Register cnt1, Register cnt2,
                               Register odd_reg, Register even_reg, Register result, int ae);
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index 74ad8ef40d3..d13afd1c8b4 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -10273,14 +10273,13 @@ instruct string_inflate_const(Universe dummy, iRegP src, iRegP dst, iRegI tmp, i
 %}
 
 // StringCoding.java intrinsics
-instruct has_negatives(rarg5RegP ary1, iRegI len, iRegI result, roddRegI oddReg, revenRegI evenReg, iRegI tmp, flagsReg cr) %{
-  match(Set result (HasNegatives ary1 len));
-  effect(TEMP_DEF result, USE_KILL ary1, TEMP oddReg, TEMP evenReg, TEMP tmp, KILL cr); // R0, R1 are killed, too.
+instruct count_positives(iRegP ary1, iRegI len, iRegI result, iRegI tmp, flagsReg cr) %{
+  match(Set result (CountPositives ary1 len));
+  effect(TEMP_DEF result, TEMP tmp, KILL cr); // R0, R1 are killed, too.
   ins_cost(300);
-  format %{ "has negatives byte[] $ary1($len) -> $result" %}
+  format %{ "count positives byte[] $ary1($len) -> $result" %}
   ins_encode %{
-    __ has_negatives($result$$Register, $ary1$$Register, $len$$Register,
-                     $oddReg$$Register, $evenReg$$Register, $tmp$$Register);
+    __ count_positives($result$$Register, $ary1$$Register, $len$$Register, $tmp$$Register);
   %}
   ins_pipe(pipe_class_dummy);
 %}
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index f3f684b1b25..6d8b9101303 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -3374,18 +3374,19 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
 }
 
 // Search for Non-ASCII character (Negative byte value) in a byte array,
-// return true if it has any and false otherwise.
+// return the index of the first such character, otherwise the length
+// of the array segment searched.
 //   ..\jdk\src\java.base\share\classes\java\lang\StringCoding.java
 //   @IntrinsicCandidate
-//   private static boolean hasNegatives(byte[] ba, int off, int len) {
+//   public static int countPositives(byte[] ba, int off, int len) {
 //     for (int i = off; i < off + len; i++) {
 //       if (ba[i] < 0) {
-//         return true;
+//         return i - off;
 //       }
 //     }
-//     return false;
+//     return len;
 //   }
-void C2_MacroAssembler::has_negatives(Register ary1, Register len,
+void C2_MacroAssembler::count_positives(Register ary1, Register len,
   Register result, Register tmp1,
   XMMRegister vec1, XMMRegister vec2, KRegister mask1, KRegister mask2) {
   // rsi: byte array
@@ -3394,17 +3395,18 @@ void C2_MacroAssembler::has_negatives(Register ary1, Register len,
   ShortBranchVerifier sbv(this);
   assert_different_registers(ary1, len, result, tmp1);
   assert_different_registers(vec1, vec2);
-  Label TRUE_LABEL, FALSE_LABEL, DONE, COMPARE_CHAR, COMPARE_VECTORS, COMPARE_BYTE;
+  Label ADJUST, TAIL_ADJUST, DONE, TAIL_START, CHAR_ADJUST, COMPARE_CHAR, COMPARE_VECTORS, COMPARE_BYTE;
 
+  movl(result, len); // copy
   // len == 0
   testl(len, len);
-  jcc(Assembler::zero, FALSE_LABEL);
+  jcc(Assembler::zero, DONE);
 
   if ((AVX3Threshold == 0) && (UseAVX > 2) && // AVX512
     VM_Version::supports_avx512vlbw() &&
     VM_Version::supports_bmi2()) {
 
-    Label test_64_loop, test_tail;
+    Label test_64_loop, test_tail, BREAK_LOOP;
     Register tmp3_aliased = len;
 
     movl(tmp1, len);
@@ -3421,16 +3423,15 @@ void C2_MacroAssembler::has_negatives(Register ary1, Register len,
     // Check whether our 64 elements of size byte contain negatives
     evpcmpgtb(mask1, vec2, Address(ary1, len, Address::times_1), Assembler::AVX_512bit);
     kortestql(mask1, mask1);
-    jcc(Assembler::notZero, TRUE_LABEL);
+    jcc(Assembler::notZero, BREAK_LOOP);
 
     addptr(len, 64);
     jccb(Assembler::notZero, test_64_loop);
 
-
     bind(test_tail);
     // bail out when there is nothing to be done
     testl(tmp1, -1);
-    jcc(Assembler::zero, FALSE_LABEL);
+    jcc(Assembler::zero, DONE);
 
     // ~(~0 << len) applied up to two times (for 32-bit scenario)
 #ifdef _LP64
@@ -3467,21 +3468,30 @@ void C2_MacroAssembler::has_negatives(Register ary1, Register len,
 #endif
     evpcmpgtb(mask1, mask2, vec2, Address(ary1, 0), Assembler::AVX_512bit);
     ktestq(mask1, mask2);
-    jcc(Assembler::notZero, TRUE_LABEL);
+    jcc(Assembler::zero, DONE);
 
-    jmp(FALSE_LABEL);
+    bind(BREAK_LOOP);
+    // At least one byte in the last 64 bytes is negative.
+    // Set up to look at the last 64 bytes as if they were a tail
+    lea(ary1, Address(ary1, len, Address::times_1));
+    addptr(result, len);
+    // Ignore the very last byte: if all others are positive,
+    // it must be negative, so we can skip right to the 2+1 byte
+    // end comparison at this point
+    orl(result, 63);
+    movl(len, 63);
+    // Fallthru to tail compare
   } else {
-    movl(result, len); // copy
 
     if (UseAVX >= 2 && UseSSE >= 2) {
       // With AVX2, use 32-byte vector compare
-      Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
+      Label COMPARE_WIDE_VECTORS, BREAK_LOOP;
 
       // Compare 32-byte vectors
-      andl(result, 0x0000001f);  //   tail count (in bytes)
-      andl(len, 0xffffffe0);   // vector count (in bytes)
-      jccb(Assembler::zero, COMPARE_TAIL);
+      testl(len, 0xffffffe0);   // vector count (in bytes)
+      jccb(Assembler::zero, TAIL_START);
 
+      andl(len, 0xffffffe0);
       lea(ary1, Address(ary1, len, Address::times_1));
       negptr(len);
 
@@ -3492,30 +3502,42 @@ void C2_MacroAssembler::has_negatives(Register ary1, Register len,
       bind(COMPARE_WIDE_VECTORS);
       vmovdqu(vec1, Address(ary1, len, Address::times_1));
       vptest(vec1, vec2);
-      jccb(Assembler::notZero, TRUE_LABEL);
+      jccb(Assembler::notZero, BREAK_LOOP);
       addptr(len, 32);
-      jcc(Assembler::notZero, COMPARE_WIDE_VECTORS);
+      jccb(Assembler::notZero, COMPARE_WIDE_VECTORS);
 
-      testl(result, result);
-      jccb(Assembler::zero, FALSE_LABEL);
+      testl(result, 0x0000001f);   // any bytes remaining?
+      jcc(Assembler::zero, DONE);
 
-      vmovdqu(vec1, Address(ary1, result, Address::times_1, -32));
+      // Quick test using the already prepared vector mask
+      movl(len, result);
+      andl(len, 0x0000001f);
+      vmovdqu(vec1, Address(ary1, len, Address::times_1, -32));
       vptest(vec1, vec2);
-      jccb(Assembler::notZero, TRUE_LABEL);
-      jmpb(FALSE_LABEL);
+      jcc(Assembler::zero, DONE);
+      // There are zeros, jump to the tail to determine exactly where
+      jmpb(TAIL_START);
 
-      bind(COMPARE_TAIL); // len is zero
-      movl(len, result);
+      bind(BREAK_LOOP);
+      // At least one byte in the last 32-byte vector is negative.
+      // Set up to look at the last 32 bytes as if they were a tail
+      lea(ary1, Address(ary1, len, Address::times_1));
+      addptr(result, len);
+      // Ignore the very last byte: if all others are positive,
+      // it must be negative, so we can skip right to the 2+1 byte
+      // end comparison at this point
+      orl(result, 31);
+      movl(len, 31);
       // Fallthru to tail compare
     } else if (UseSSE42Intrinsics) {
       // With SSE4.2, use double quad vector compare
-      Label COMPARE_WIDE_VECTORS, COMPARE_TAIL;
+      Label COMPARE_WIDE_VECTORS, BREAK_LOOP;
 
       // Compare 16-byte vectors
-      andl(result, 0x0000000f);  //   tail count (in bytes)
-      andl(len, 0xfffffff0);   // vector count (in bytes)
-      jcc(Assembler::zero, COMPARE_TAIL);
+      testl(len, 0xfffffff0);   // vector count (in bytes)
+      jcc(Assembler::zero, TAIL_START);
 
+      andl(len, 0xfffffff0);
       lea(ary1, Address(ary1, len, Address::times_1));
       negptr(len);
 
@@ -3526,23 +3548,36 @@ void C2_MacroAssembler::has_negatives(Register ary1, Register len,
       bind(COMPARE_WIDE_VECTORS);
       movdqu(vec1, Address(ary1, len, Address::times_1));
       ptest(vec1, vec2);
-      jcc(Assembler::notZero, TRUE_LABEL);
+      jccb(Assembler::notZero, BREAK_LOOP);
       addptr(len, 16);
-      jcc(Assembler::notZero, COMPARE_WIDE_VECTORS);
+      jccb(Assembler::notZero, COMPARE_WIDE_VECTORS);
 
-      testl(result, result);
-      jcc(Assembler::zero, FALSE_LABEL);
+      testl(result, 0x0000000f); // len is zero, any bytes remaining?
+      jcc(Assembler::zero, DONE);
 
-      movdqu(vec1, Address(ary1, result, Address::times_1, -16));
+      // Quick test using the already prepared vector mask
+      movl(len, result);
+      andl(len, 0x0000000f);   // tail count (in bytes)
+      movdqu(vec1, Address(ary1, len, Address::times_1, -16));
       ptest(vec1, vec2);
-      jccb(Assembler::notZero, TRUE_LABEL);
-      jmpb(FALSE_LABEL);
+      jcc(Assembler::zero, DONE);
+      jmpb(TAIL_START);
 
-      bind(COMPARE_TAIL); // len is zero
-      movl(len, result);
+      bind(BREAK_LOOP);
+      // At least one byte in the last 16-byte vector is negative.
+      // Set up and look at the last 16 bytes as if they were a tail
+      lea(ary1, Address(ary1, len, Address::times_1));
+      addptr(result, len);
+      // Ignore the very last byte: if all others are positive,
+      // it must be negative, so we can skip right to the 2+1 byte
+      // end comparison at this point
+      orl(result, 15);
+      movl(len, 15);
       // Fallthru to tail compare
     }
   }
+
+  bind(TAIL_START);
   // Compare 4-byte vectors
   andl(len, 0xfffffffc); // vector count (in bytes)
   jccb(Assembler::zero, COMPARE_CHAR);
@@ -3553,34 +3588,45 @@ void C2_MacroAssembler::has_negatives(Register ary1, Register len,
   bind(COMPARE_VECTORS);
   movl(tmp1, Address(ary1, len, Address::times_1));
   andl(tmp1, 0x80808080);
-  jccb(Assembler::notZero, TRUE_LABEL);
+  jccb(Assembler::notZero, TAIL_ADJUST);
   addptr(len, 4);
-  jcc(Assembler::notZero, COMPARE_VECTORS);
+  jccb(Assembler::notZero, COMPARE_VECTORS);
 
-  // Compare trailing char (final 2 bytes), if any
+  // Compare trailing char (final 2-3 bytes), if any
   bind(COMPARE_CHAR);
+
   testl(result, 0x2);   // tail  char
   jccb(Assembler::zero, COMPARE_BYTE);
   load_unsigned_short(tmp1, Address(ary1, 0));
   andl(tmp1, 0x00008080);
-  jccb(Assembler::notZero, TRUE_LABEL);
-  subptr(result, 2);
+  jccb(Assembler::notZero, CHAR_ADJUST);
   lea(ary1, Address(ary1, 2));
 
   bind(COMPARE_BYTE);
   testl(result, 0x1);   // tail  byte
-  jccb(Assembler::zero, FALSE_LABEL);
+  jccb(Assembler::zero, DONE);
   load_unsigned_byte(tmp1, Address(ary1, 0));
-  andl(tmp1, 0x00000080);
-  jccb(Assembler::notEqual, TRUE_LABEL);
-  jmpb(FALSE_LABEL);
-
-  bind(TRUE_LABEL);
-  movl(result, 1);   // return true
+  testl(tmp1, 0x00000080);
+  jccb(Assembler::zero, DONE);
+  subptr(result, 1);
   jmpb(DONE);
 
-  bind(FALSE_LABEL);
-  xorl(result, result); // return false
+  bind(TAIL_ADJUST);
+  // there are negative bits in the last 4 byte block.
+  // Adjust result and check the next three bytes
+  addptr(result, len);
+  orl(result, 3);
+  lea(ary1, Address(ary1, len, Address::times_1));
+  jmpb(COMPARE_CHAR);
+
+  bind(CHAR_ADJUST);
+  // We are looking at a char + optional byte tail, and found that one
+  // of the bytes in the char is negative. Adjust the result, check the
+  // first byte and readjust if needed.
+  andl(result, 0xfffffffc);
+  testl(tmp1, 0x00000080); // little-endian, so lowest byte comes first
+  jccb(Assembler::notZero, DONE);
+  addptr(result, 1);
 
   // That's it
   bind(DONE);
@@ -3590,6 +3636,7 @@ void C2_MacroAssembler::has_negatives(Register ary1, Register len,
     vpxor(vec2, vec2);
   }
 }
+
 // Compare char[] or byte[] arrays aligned to 4 bytes or substrings.
 void C2_MacroAssembler::arrays_equals(bool is_array_equ, Register ary1, Register ary2,
                                       Register limit, Register result, Register chr,
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index 0464d755ed4..5ecdf20700d 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -271,11 +271,10 @@ public:
                       XMMRegister vec1, int ae, KRegister mask = knoreg);
 
   // Search for Non-ASCII character (Negative byte value) in a byte array,
-  // return true if it has any and false otherwise.
-  void has_negatives(Register ary1, Register len,
-                     Register result, Register tmp1,
-                     XMMRegister vec1, XMMRegister vec2, KRegister mask1 = knoreg, KRegister mask2 = knoreg);
-
+  // return index of the first such character, otherwise len.
+  void count_positives(Register ary1, Register len,
+                       Register result, Register tmp1,
+                       XMMRegister vec1, XMMRegister vec2, KRegister mask1 = knoreg, KRegister mask2 = knoreg);
   // Compare char[] or byte[] arrays.
   void arrays_equals(bool is_array_equ, Register ary1, Register ary2,
                      Register limit, Register result, Register chr,
diff --git a/src/hotspot/cpu/x86/x86_32.ad b/src/hotspot/cpu/x86/x86_32.ad
index 3bb01e3eeae..9bba150516e 100644
--- a/src/hotspot/cpu/x86/x86_32.ad
+++ b/src/hotspot/cpu/x86/x86_32.ad
@@ -12122,34 +12122,34 @@ instruct array_equalsC_evex(eDIRegP ary1, eSIRegP ary2, eAXRegI result,
   ins_pipe( pipe_slow );
 %}
 
-instruct has_negatives(eSIRegP ary1, eCXRegI len, eAXRegI result,
-                      regD tmp1, regD tmp2, eBXRegI tmp3, eFlagsReg cr)
+instruct count_positives(eSIRegP ary1, eCXRegI len, eAXRegI result,
+                         regD tmp1, regD tmp2, eBXRegI tmp3, eFlagsReg cr)
 %{
   predicate(!VM_Version::supports_avx512vlbw() || !VM_Version::supports_bmi2());
-  match(Set result (HasNegatives ary1 len));
+  match(Set result (CountPositives ary1 len));
   effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL len, KILL tmp3, KILL cr);
 
-  format %{ "has negatives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
+  format %{ "countPositives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
   ins_encode %{
-    __ has_negatives($ary1$$Register, $len$$Register,
-                     $result$$Register, $tmp3$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, knoreg, knoreg);
+    __ count_positives($ary1$$Register, $len$$Register,
+                       $result$$Register, $tmp3$$Register,
+                       $tmp1$$XMMRegister, $tmp2$$XMMRegister, knoreg, knoreg);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct has_negatives_evex(eSIRegP ary1, eCXRegI len, eAXRegI result,
-                           regD tmp1, regD tmp2, kReg ktmp1, kReg ktmp2, eBXRegI tmp3, eFlagsReg cr)
+instruct count_positives_evex(eSIRegP ary1, eCXRegI len, eAXRegI result,
+                              regD tmp1, regD tmp2, kReg ktmp1, kReg ktmp2, eBXRegI tmp3, eFlagsReg cr)
 %{
   predicate(VM_Version::supports_avx512vlbw() && VM_Version::supports_bmi2());
-  match(Set result (HasNegatives ary1 len));
+  match(Set result (CountPositives ary1 len));
   effect(TEMP tmp1, TEMP tmp2, TEMP ktmp1, TEMP ktmp2, USE_KILL ary1, USE_KILL len, KILL tmp3, KILL cr);
 
-  format %{ "has negatives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
+  format %{ "countPositives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
   ins_encode %{
-    __ has_negatives($ary1$$Register, $len$$Register,
-                     $result$$Register, $tmp3$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, $ktmp1$$KRegister, $ktmp2$$KRegister);
+    __ count_positives($ary1$$Register, $len$$Register,
+                       $result$$Register, $tmp3$$Register,
+                       $tmp1$$XMMRegister, $tmp2$$XMMRegister, $ktmp1$$KRegister, $ktmp2$$KRegister);
   %}
   ins_pipe( pipe_slow );
 %}
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index bc04106f3f2..3eed117ece8 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -11685,34 +11685,34 @@ instruct array_equalsC_evex(rdi_RegP ary1, rsi_RegP ary2, rax_RegI result,
   ins_pipe( pipe_slow );
 %}
 
-instruct has_negatives(rsi_RegP ary1, rcx_RegI len, rax_RegI result,
-                       legRegD tmp1, legRegD tmp2, rbx_RegI tmp3, rFlagsReg cr,)
+instruct count_positives(rsi_RegP ary1, rcx_RegI len, rax_RegI result,
+                         legRegD tmp1, legRegD tmp2, rbx_RegI tmp3, rFlagsReg cr,)
 %{
   predicate(!VM_Version::supports_avx512vlbw() || !VM_Version::supports_bmi2());
-  match(Set result (HasNegatives ary1 len));
+  match(Set result (CountPositives ary1 len));
   effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL len, KILL tmp3, KILL cr);
 
-  format %{ "has negatives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
+  format %{ "countPositives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
   ins_encode %{
-    __ has_negatives($ary1$$Register, $len$$Register,
-                     $result$$Register, $tmp3$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, knoreg, knoreg);
+    __ count_positives($ary1$$Register, $len$$Register,
+                       $result$$Register, $tmp3$$Register,
+                       $tmp1$$XMMRegister, $tmp2$$XMMRegister, knoreg, knoreg);
   %}
   ins_pipe( pipe_slow );
 %}
 
-instruct has_negatives_evex(rsi_RegP ary1, rcx_RegI len, rax_RegI result,
-                            legRegD tmp1, legRegD tmp2, kReg ktmp1, kReg ktmp2, rbx_RegI tmp3, rFlagsReg cr,)
+instruct count_positives_evex(rsi_RegP ary1, rcx_RegI len, rax_RegI result,
+                              legRegD tmp1, legRegD tmp2, kReg ktmp1, kReg ktmp2, rbx_RegI tmp3, rFlagsReg cr,)
 %{
   predicate(VM_Version::supports_avx512vlbw() && VM_Version::supports_bmi2());
-  match(Set result (HasNegatives ary1 len));
+  match(Set result (CountPositives ary1 len));
   effect(TEMP tmp1, TEMP tmp2, TEMP ktmp1, TEMP ktmp2, USE_KILL ary1, USE_KILL len, KILL tmp3, KILL cr);
 
-  format %{ "has negatives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
+  format %{ "countPositives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
   ins_encode %{
-    __ has_negatives($ary1$$Register, $len$$Register,
-                     $result$$Register, $tmp3$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, $ktmp1$$KRegister, $ktmp2$$KRegister);
+    __ count_positives($ary1$$Register, $len$$Register,
+                       $result$$Register, $tmp3$$Register,
+                       $tmp1$$XMMRegister, $tmp2$$XMMRegister, $ktmp1$$KRegister, $ktmp2$$KRegister);
   %}
   ins_pipe( pipe_slow );
 %}
diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp
index 274e623ea61..0ae7b075074 100644
--- a/src/hotspot/share/adlc/formssel.cpp
+++ b/src/hotspot/share/adlc/formssel.cpp
@@ -612,7 +612,7 @@ bool InstructForm::needs_anti_dependence_check(FormDict &globals) const {
         strcmp(_matrule->_rChild->_opType,"StrEquals"  )==0 ||
         strcmp(_matrule->_rChild->_opType,"StrIndexOf" )==0 ||
         strcmp(_matrule->_rChild->_opType,"StrIndexOfChar" )==0 ||
-        strcmp(_matrule->_rChild->_opType,"HasNegatives" )==0 ||
+        strcmp(_matrule->_rChild->_opType,"CountPositives" )==0 ||
         strcmp(_matrule->_rChild->_opType,"AryEq"      )==0 ))
     return true;
 
@@ -902,7 +902,7 @@ uint InstructForm::oper_input_base(FormDict &globals) {
         strcmp(_matrule->_rChild->_opType,"StrCompressedCopy" )==0 ||
         strcmp(_matrule->_rChild->_opType,"StrIndexOf")==0 ||
         strcmp(_matrule->_rChild->_opType,"StrIndexOfChar")==0 ||
-        strcmp(_matrule->_rChild->_opType,"HasNegatives")==0 ||
+        strcmp(_matrule->_rChild->_opType,"CountPositives")==0 ||
         strcmp(_matrule->_rChild->_opType,"EncodeISOArray")==0)) {
         // String.(compareTo/equals/indexOf) and Arrays.equals
         // and sun.nio.cs.iso8859_1$Encoder.EncodeISOArray
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index cc3dc1ebdcc..a329669bed3 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -229,7 +229,7 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
     case vmIntrinsics::_loadFence:
     case vmIntrinsics::_storeFence:
     case vmIntrinsics::_fullFence:
-    case vmIntrinsics::_hasNegatives:
+    case vmIntrinsics::_countPositives:
     case vmIntrinsics::_Reference_get:
       break;
     default:
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 7c3cb1d3f10..5b2c6a9ce56 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -354,9 +354,9 @@ class methodHandle;
    do_signature(Preconditions_checkLongIndex_signature,          "(JJLjava/util/function/BiFunction;)J")                \
                                                                                                                         \
   do_class(java_lang_StringCoding,        "java/lang/StringCoding")                                                     \
-  do_intrinsic(_hasNegatives,             java_lang_StringCoding, hasNegatives_name, hasNegatives_signature,     F_S)   \
-   do_name(     hasNegatives_name,                               "hasNegatives")                                        \
-   do_signature(hasNegatives_signature,                          "([BII)Z")                                             \
+  do_intrinsic(_countPositives,     java_lang_StringCoding, countPositives_name, countPositives_signature, F_S)         \
+   do_name(     countPositives_name,                       "countPositives")                                            \
+   do_signature(countPositives_signature,                  "([BII)I")                                                   \
                                                                                                                         \
   do_class(sun_nio_cs_iso8859_1_Encoder,  "sun/nio/cs/ISO_8859_1$Encoder")                                              \
   do_intrinsic(_encodeISOArray,     sun_nio_cs_iso8859_1_Encoder, encodeISOArray_name, encodeISOArray_signature, F_S)   \
@@ -459,9 +459,8 @@ class methodHandle;
                                                                                                                         \
   /* support for sun.security.provider.DigestBase */                                                                    \
   do_class(sun_security_provider_digestbase,                       "sun/security/provider/DigestBase")                  \
-  do_intrinsic(_digestBase_implCompressMB, sun_security_provider_digestbase, implCompressMB_name, implCompressMB_signature, F_R)   \
+  do_intrinsic(_digestBase_implCompressMB, sun_security_provider_digestbase, implCompressMB_name, countPositives_signature, F_R)   \
    do_name(     implCompressMB_name,                               "implCompressMultiBlock0")                           \
-   do_signature(implCompressMB_signature,                          "([BII)I")                                           \
                                                                                                                         \
    /* support for java.util.Base64.Encoder*/                                                                            \
   do_class(java_util_Base64_Encoder, "java/util/Base64$Encoder")                                                        \
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 849b40f3d79..667808f4efd 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -567,7 +567,7 @@ void ShenandoahBarrierC2Support::verify(RootNode* root) {
         { { 2, ShenandoahLoad },                  { 3, ShenandoahLoad } },
         Op_EncodeISOArray,
         { { 2, ShenandoahLoad },                  { 3, ShenandoahStore } },
-        Op_HasNegatives,
+        Op_CountPositives,
         { { 2, ShenandoahLoad },                  { -1, ShenandoahNone} },
         Op_CastP2X,
         { { 1, ShenandoahLoad },                  { -1, ShenandoahNone} },
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 998f1d1ad4f..7ed48a79eeb 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -742,8 +742,8 @@
 
 #define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
   static_field(VM_Version, _zva_length, int)                            \
-  static_field(StubRoutines::aarch64, _has_negatives, address)          \
-  static_field(StubRoutines::aarch64, _has_negatives_long, address)     \
+  static_field(StubRoutines::aarch64, _count_positives, address)        \
+  static_field(StubRoutines::aarch64, _count_positives_long, address)   \
   static_field(VM_Version, _rop_protection, bool)                       \
   volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
 
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index af2b8e5456c..94e7fb4f4a0 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -234,8 +234,8 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt
   case vmIntrinsics::_encodeByteISOArray:
     if (!Matcher::match_rule_supported(Op_EncodeISOArray)) return false;
     break;
-  case vmIntrinsics::_hasNegatives:
-    if (!Matcher::match_rule_supported(Op_HasNegatives))  return false;
+  case vmIntrinsics::_countPositives:
+    if (!Matcher::match_rule_supported(Op_CountPositives))  return false;
     break;
   case vmIntrinsics::_bitCount_i:
     if (!Matcher::match_rule_supported(Op_PopCountI)) return false;
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 4abb3fef3b4..35dd640b4ee 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -174,7 +174,7 @@ macro(FmaD)
 macro(FmaF)
 macro(Goto)
 macro(Halt)
-macro(HasNegatives)
+macro(CountPositives)
 macro(If)
 macro(RangeCheck)
 macro(IfFalse)
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index d9df238aff4..3e02b18f50f 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -635,7 +635,7 @@ void ConnectionGraph::add_node_to_connection_graph(Node *n, Unique_Node_List *de
       break;
     }
     case Op_AryEq:
-    case Op_HasNegatives:
+    case Op_CountPositives:
     case Op_StrComp:
     case Op_StrEquals:
     case Op_StrIndexOf:
@@ -773,7 +773,7 @@ void ConnectionGraph::add_final_edges(Node *n) {
       break;
     }
     case Op_AryEq:
-    case Op_HasNegatives:
+    case Op_CountPositives:
     case Op_StrComp:
     case Op_StrEquals:
     case Op_StrIndexOf:
@@ -3344,7 +3344,8 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
           memnode_worklist.append_if_missing(use);
         } else if (!(op == Op_CmpP || op == Op_Conv2B ||
               op == Op_CastP2X || op == Op_StoreCM ||
-              op == Op_FastLock || op == Op_AryEq || op == Op_StrComp || op == Op_HasNegatives ||
+              op == Op_FastLock || op == Op_AryEq || op == Op_StrComp ||
+              op == Op_CountPositives ||
               op == Op_StrCompressedCopy || op == Op_StrInflatedCopy ||
               op == Op_StrEquals || op == Op_StrIndexOf || op == Op_StrIndexOfChar ||
               op == Op_SubTypeCheck ||
@@ -3475,7 +3476,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
           // They overwrite memory edge corresponding to destination array,
           memnode_worklist.append_if_missing(use);
         } else if (!(BarrierSet::barrier_set()->barrier_set_c2()->is_gc_barrier_node(use) ||
-              op == Op_AryEq || op == Op_StrComp || op == Op_HasNegatives ||
+              op == Op_AryEq || op == Op_StrComp || op == Op_CountPositives ||
               op == Op_StrCompressedCopy || op == Op_StrInflatedCopy ||
               op == Op_StrEquals || op == Op_StrIndexOf || op == Op_StrIndexOfChar)) {
           n->dump();
diff --git a/src/hotspot/share/opto/intrinsicnode.hpp b/src/hotspot/share/opto/intrinsicnode.hpp
index ab8a834bb28..477842869c3 100644
--- a/src/hotspot/share/opto/intrinsicnode.hpp
+++ b/src/hotspot/share/opto/intrinsicnode.hpp
@@ -157,13 +157,13 @@ class AryEqNode: public StrIntrinsicNode {
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
 };
 
-//------------------------------HasNegatives---------------------------------
-class HasNegativesNode: public StrIntrinsicNode {
+//------------------------------CountPositives------------------------------
+class CountPositivesNode: public StrIntrinsicNode {
  public:
-  HasNegativesNode(Node* control, Node* char_array_mem, Node* s1, Node* c1):
+  CountPositivesNode(Node* control, Node* char_array_mem, Node* s1, Node* c1):
   StrIntrinsicNode(control, char_array_mem, s1, c1, none) {};
   virtual int Opcode() const;
-  virtual const Type* bottom_type() const { return TypeInt::BOOL; }
+  virtual const Type* bottom_type() const { return TypeInt::POS; }
 };
 
 
diff --git a/src/hotspot/share/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index fe799dd9847..97740e90a29 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -203,7 +203,7 @@ void PhaseCFG::implicit_null_check(Block* block, Node *proj, Node *val, int allo
     case Op_StrInflatedCopy:
     case Op_StrCompressedCopy:
     case Op_EncodeISOArray:
-    case Op_HasNegatives:
+    case Op_CountPositives:
       // Not a legit memory op for implicit null check regardless of
       // embedded loads
       continue;
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index f5c19d8123c..2f7c7fdc84c 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -617,8 +617,8 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_isCompileConstant:
     return inline_isCompileConstant();
 
-  case vmIntrinsics::_hasNegatives:
-    return inline_hasNegatives();
+  case vmIntrinsics::_countPositives:
+    return inline_countPositives();
 
   case vmIntrinsics::_fmaD:
   case vmIntrinsics::_fmaF:
@@ -1011,13 +1011,13 @@ bool LibraryCallKit::inline_array_equals(StrIntrinsicNode::ArgEnc ae) {
   return true;
 }
 
-//------------------------------inline_hasNegatives------------------------------
-bool LibraryCallKit::inline_hasNegatives() {
+//------------------------------inline_countPositives------------------------------
+bool LibraryCallKit::inline_countPositives() {
   if (too_many_traps(Deoptimization::Reason_intrinsic)) {
     return false;
   }
 
-  assert(callee()->signature()->size() == 3, "hasNegatives has 3 parameters");
+  assert(callee()->signature()->size() == 3, "countPositives has 3 parameters");
   // no receiver since it is static method
   Node* ba         = argument(0);
   Node* offset     = argument(1);
@@ -1031,7 +1031,7 @@ bool LibraryCallKit::inline_hasNegatives() {
     return true;
   }
   Node* ba_start = array_element_address(ba, offset, T_BYTE);
-  Node* result = new HasNegativesNode(control(), memory(TypeAryPtr::BYTES), ba_start, len);
+  Node* result = new CountPositivesNode(control(), memory(TypeAryPtr::BYTES), ba_start, len);
   set_result(_gvn.transform(result));
   return true;
 }
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index eca3e70bb5a..d8f86233d6b 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -296,7 +296,7 @@ class LibraryCallKit : public GraphKit {
   bool inline_updateBytesAdler32();
   bool inline_updateByteBufferAdler32();
   bool inline_multiplyToLen();
-  bool inline_hasNegatives();
+  bool inline_countPositives();
   bool inline_squareToLen();
   bool inline_mulAdd();
   bool inline_montgomeryMultiply();
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index dccf75c0022..4257b0fd6e5 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -828,7 +828,7 @@ bool IdealLoopTree::policy_maximally_unroll(PhaseIdealLoop* phase) const {
       case Op_StrIndexOfChar:
       case Op_EncodeISOArray:
       case Op_AryEq:
-      case Op_HasNegatives: {
+      case Op_CountPositives: {
         return false;
       }
 #if INCLUDE_RTM_OPT
@@ -981,7 +981,7 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) {
       case Op_StrIndexOfChar:
       case Op_EncodeISOArray:
       case Op_AryEq:
-      case Op_HasNegatives: {
+      case Op_CountPositives: {
         // Do not unroll a loop with String intrinsics code.
         // String intrinsics are large and have loops.
         return false;
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 39c6ad49563..f08b1d46b1c 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -5775,7 +5775,7 @@ void PhaseIdealLoop::build_loop_late_post_work(Node *n, bool pinned) {
     case Op_StrIndexOf:
     case Op_StrIndexOfChar:
     case Op_AryEq:
-    case Op_HasNegatives:
+    case Op_CountPositives:
       pinned = false;
     }
     if (n->is_CMove() || n->is_ConstraintCast()) {
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 35ccf26e7cb..20a08e0cb4b 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -1066,7 +1066,7 @@ static void match_alias_type(Compile* C, Node* n, Node* m) {
     case Op_StrIndexOf:
     case Op_StrIndexOfChar:
     case Op_AryEq:
-    case Op_HasNegatives:
+    case Op_CountPositives:
     case Op_MemBarVolatile:
     case Op_MemBarCPUOrder: // %%% these ideals should have narrower adr_type?
     case Op_StrInflatedCopy:
@@ -2252,7 +2252,7 @@ bool Matcher::find_shared_visit(MStack& mstack, Node* n, uint opcode, bool& mem_
     case Op_StrIndexOf:
     case Op_StrIndexOfChar:
     case Op_AryEq:
-    case Op_HasNegatives:
+    case Op_CountPositives:
     case Op_StrInflatedCopy:
     case Op_StrCompressedCopy:
     case Op_EncodeISOArray:
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index e79884bd4cc..3c3a2ba28f0 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -525,56 +525,63 @@ public final class String
             this.value = "".value;
             this.coder = "".coder;
         } else if (charset == UTF_8.INSTANCE) {
-            if (COMPACT_STRINGS && !StringCoding.hasNegatives(bytes, offset, length)) {
-                this.value = Arrays.copyOfRange(bytes, offset, offset + length);
-                this.coder = LATIN1;
-            } else {
+            if (COMPACT_STRINGS) {
+                int dp = StringCoding.countPositives(bytes, offset, length);
+                if (dp == length) {
+                    this.value = Arrays.copyOfRange(bytes, offset, offset + length);
+                    this.coder = LATIN1;
+                    return;
+                }
                 int sl = offset + length;
-                int dp = 0;
-                byte[] dst = null;
-                if (COMPACT_STRINGS) {
-                    dst = new byte[length];
-                    while (offset < sl) {
-                        int b1 = bytes[offset];
-                        if (b1 >= 0) {
-                            dst[dp++] = (byte)b1;
+                byte[] dst = new byte[length];
+                if (dp > 0) {
+                    System.arraycopy(bytes, offset, dst, 0, dp);
+                    offset += dp;
+                }
+                while (offset < sl) {
+                    int b1 = bytes[offset++];
+                    if (b1 >= 0) {
+                        dst[dp++] = (byte)b1;
+                        continue;
+                    }
+                    if ((b1 & 0xfe) == 0xc2 && offset < sl) { // b1 either 0xc2 or 0xc3
+                        int b2 = bytes[offset];
+                        if (b2 < -64) { // continuation bytes are always negative values in the range -128 to -65
+                            dst[dp++] = (byte)decode2(b1, b2);
                             offset++;
                             continue;
                         }
-                        if ((b1 & 0xfe) == 0xc2 && offset + 1 < sl) { // b1 either 0xc2 or 0xc3
-                            int b2 = bytes[offset + 1];
-                            if (!isNotContinuation(b2)) {
-                                dst[dp++] = (byte)decode2(b1, b2);
-                                offset += 2;
-                                continue;
-                            }
-                        }
-                        // anything not a latin1, including the repl
-                        // we have to go with the utf16
-                        break;
-                    }
-                    if (offset == sl) {
-                        if (dp != dst.length) {
-                            dst = Arrays.copyOf(dst, dp);
-                        }
-                        this.value = dst;
-                        this.coder = LATIN1;
-                        return;
                     }
+                    // anything not a latin1, including the REPL
+                    // we have to go with the utf16
+                    offset--;
+                    break;
                 }
-                if (dp == 0 || dst == null) {
-                    dst = new byte[length << 1];
-                } else {
-                    byte[] buf = new byte[length << 1];
-                    StringLatin1.inflate(dst, 0, buf, 0, dp);
-                    dst = buf;
+                if (offset == sl) {
+                    if (dp != dst.length) {
+                        dst = Arrays.copyOf(dst, dp);
+                    }
+                    this.value = dst;
+                    this.coder = LATIN1;
+                    return;
                 }
+                byte[] buf = new byte[length << 1];
+                StringLatin1.inflate(dst, 0, buf, 0, dp);
+                dst = buf;
                 dp = decodeUTF8_UTF16(bytes, offset, sl, dst, dp, true);
                 if (dp != length) {
                     dst = Arrays.copyOf(dst, dp << 1);
                 }
                 this.value = dst;
                 this.coder = UTF16;
+            } else { // !COMPACT_STRINGS
+                byte[] dst = new byte[length << 1];
+                int dp = decodeUTF8_UTF16(bytes, offset, offset + length, dst, 0, true);
+                if (dp != length) {
+                    dst = Arrays.copyOf(dst, dp << 1);
+                }
+                this.value = dst;
+                this.coder = UTF16;
             }
         } else if (charset == ISO_8859_1.INSTANCE) {
             if (COMPACT_STRINGS) {
@@ -682,41 +689,43 @@ public final class String
         if (length == 0) {
             return "";
         }
-        if (COMPACT_STRINGS && !StringCoding.hasNegatives(bytes, offset, length)) {
-            return new String(Arrays.copyOfRange(bytes, offset, offset + length), LATIN1);
-        } else {
+        int dp;
+        byte[] dst;
+        if (COMPACT_STRINGS) {
+            dp = StringCoding.countPositives(bytes, offset, length);
             int sl = offset + length;
-            int dp = 0;
-            byte[] dst = null;
-            if (COMPACT_STRINGS) {
-                dst = new byte[length];
-                while (offset < sl) {
-                    int b1 = bytes[offset];
-                    if (b1 >= 0) {
-                        dst[dp++] = (byte) b1;
+            if (dp == length) {
+                return new String(Arrays.copyOfRange(bytes, offset, offset + length), LATIN1);
+            }
+            dst = new byte[length];
+            System.arraycopy(bytes, offset, dst, 0, dp);
+            offset += dp;
+            while (offset < sl) {
+                int b1 = bytes[offset++];
+                if (b1 >= 0) {
+                    dst[dp++] = (byte)b1;
+                    continue;
+                }
+                if ((b1 & 0xfe) == 0xc2 && offset < sl) { // b1 either 0xc2 or 0xc3
+                    int b2 = bytes[offset];
+                    if (b2 < -64) { // continuation bytes are always negative values in the range -128 to -65
+                        dst[dp++] = (byte)decode2(b1, b2);
                         offset++;
                         continue;
                     }
-                    if ((b1 & 0xfe) == 0xc2 && offset + 1 < sl) { // b1 either 0xc2 or 0xc3
-                        int b2 = bytes[offset + 1];
-                        if (!isNotContinuation(b2)) {
-                            dst[dp++] = (byte) decode2(b1, b2);
-                            offset += 2;
-                            continue;
-                        }
-                    }
-                    // anything not a latin1, including the REPL
-                    // we have to go with the utf16
-                    break;
                 }
-                if (offset == sl) {
-                    if (dp != dst.length) {
-                        dst = Arrays.copyOf(dst, dp);
-                    }
-                    return new String(dst, LATIN1);
+                // anything not a latin1, including the REPL
+                // we have to go with the utf16
+                offset--;
+                break;
+            }
+            if (offset == sl) {
+                if (dp != dst.length) {
+                    dst = Arrays.copyOf(dst, dp);
                 }
+                return new String(dst, LATIN1);
             }
-            if (dp == 0 || dst == null) {
+            if (dp == 0) {
                 dst = new byte[length << 1];
             } else {
                 byte[] buf = new byte[length << 1];
@@ -724,11 +733,14 @@ public final class String
                 dst = buf;
             }
             dp = decodeUTF8_UTF16(bytes, offset, sl, dst, dp, false);
-            if (dp != length) {
-                dst = Arrays.copyOf(dst, dp << 1);
-            }
-            return new String(dst, UTF16);
+        } else { // !COMPACT_STRINGS
+            dst = new byte[length << 1];
+            dp = decodeUTF8_UTF16(bytes, offset, offset + length, dst, 0, false);
         }
+        if (dp != length) {
+            dst = Arrays.copyOf(dst, dp << 1);
+        }
+        return new String(dst, UTF16);
     }
 
     static String newStringNoRepl(byte[] src, Charset cs) throws CharacterCodingException {
@@ -1019,17 +1031,9 @@ public final class String
      */
     /* package-private */
     static int decodeASCII(byte[] sa, int sp, char[] da, int dp, int len) {
-        if (!StringCoding.hasNegatives(sa, sp, len)) {
-            StringLatin1.inflate(sa, sp, da, dp, len);
-            return len;
-        } else {
-            int start = sp;
-            int end = sp + len;
-            while (sp < end && sa[sp] >= 0) {
-                da[dp++] = (char) sa[sp++];
-            }
-            return sp - start;
-        }
+        int count = StringCoding.countPositives(sa, sp, len);
+        StringLatin1.inflate(sa, sp, da, dp, count);
+        return count;
     }
 
     private static boolean isNotContinuation(int b) {
diff --git a/src/java.base/share/classes/java/lang/StringCoding.java b/src/java.base/share/classes/java/lang/StringCoding.java
index ec81c379579..293fbdb78dc 100644
--- a/src/java.base/share/classes/java/lang/StringCoding.java
+++ b/src/java.base/share/classes/java/lang/StringCoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,14 +34,27 @@ class StringCoding {
 
     private StringCoding() { }
 
-    @IntrinsicCandidate
     public static boolean hasNegatives(byte[] ba, int off, int len) {
-        for (int i = off; i < off + len; i++) {
+        return countPositives(ba, off, len) != len;
+    }
+
+    /**
+     * Count the number of leading positive bytes in the range.
+     *
+     * @implSpec the implementation must return len if there are no negative
+     *   bytes in the range. If there are negative bytes, the implementation must return
+     *   a value that is less than or equal to the index of the first negative byte
+     *   in the range.
+     */
+    @IntrinsicCandidate
+    public static int countPositives(byte[] ba, int off, int len) {
+        int limit = off + len;
+        for (int i = off; i < limit; i++) {
             if (ba[i] < 0) {
-                return true;
+                return i - off;
             }
         }
-        return false;
+        return len;
     }
 
     @IntrinsicCandidate
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java
new file mode 100644
index 00000000000..afc308c37dd
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.intrinsics.string;
+
+/*
+ * @test
+ * @bug 8999999
+ * @summary Validates StringCoding.countPositives intrinsic with a small range of tests.
+ * @library /compiler/patches
+ *
+ * @build java.base/java.lang.Helper
+ * @run main compiler.intrinsics.string.TestCountPositives
+ */
+
+public class TestCountPositives {
+
+    private static byte[] tBa = new byte[4096 + 16];
+
+    /**
+     * Completely initialize the test array, preparing it for tests of the
+     * StringCoding.hasNegatives method with a given array segment offset,
+     * length, and number of negative bytes.
+     */
+    public static void initialize(int off, int len, int neg) {
+        assert (len + off <= tBa.length);
+        // insert "canary" (negative) values before offset
+        for (int i = 0; i < off; ++i) {
+            tBa[i] = (byte) (((i + 15) & 0x7F) | 0x80);
+        }
+        // fill the array segment
+        for (int i = off; i < len + off; ++i) {
+            tBa[i] = (byte) (((i - off + 15) & 0x7F));
+        }
+        if (neg != 0) {
+            // modify a number (neg) disparate array bytes inside
+            // segment to be negative.
+            int div = (neg > 1) ? (len - 1) / (neg - 1) : 0;
+            int idx;
+            for (int i = 0; i < neg; ++i) {
+                idx = off + (len - 1) - div * i;
+                tBa[idx] = (byte) (0x80 | tBa[idx]);
+            }
+        }
+        // insert "canary" negative values after array segment
+        for (int i = len + off; i < tBa.length; ++i) {
+            tBa[i] = (byte) (((i + 15) & 0x7F) | 0x80);
+        }
+    }
+
+    /** Sizes of array segments to test. */
+    private static int sizes[] = { 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 13, 17, 19, 23, 37, 61, 131,
+            4099 };
+
+    /**
+     * Test different array segment sizes, offsets, and number of negative
+     * bytes.
+     */
+    public static void test_countPositives() throws Exception {
+        int len, off;
+        int ng;
+
+        for (ng = 0; ng < 57; ++ng) { // number of negatives in array segment
+            for (off = 0; off < 8; ++off) { // starting offset of array segment
+                for (int i = 0; i < sizes.length; ++i) { // array segment size
+                                                         // choice
+                    len = sizes[i];
+                    if (len + off > tBa.length)
+                        continue;
+                    initialize(off, len, ng);
+                    int calculated = Helper.StringCodingCountPositives(tBa, off, len);
+                    int expected = countPositives(tBa, off, len);
+                    if (calculated != expected) {
+                        if (expected != len && calculated >= 0 && calculated < expected) {
+                            // allow intrinsics to return early with a lower value,
+                            // but only if we're not expecting the full length (no
+                            // negative bytes)
+                            continue;
+                        }
+                        throw new Exception("Failed test countPositives " + "offset: " + off + " "
+                                + "length: " + len + " " + "return: " + calculated + " expected: " + expected + " negatives: "
+                                + ng);
+                    }
+                }
+            }
+        }
+    }
+
+    private static int countPositives(byte[] ba, int off, int len) {
+        int limit = off + len;
+        for (int i = off; i < limit; i++) {
+            if (ba[i] < 0) {
+                return i - off;
+            }
+        }
+        return len;
+    }
+
+    public void run() throws Exception {
+        // iterate to eventually get intrinsic inlined
+        for (int j = 0; j < 1000; ++j) {
+            test_countPositives();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        (new TestCountPositives()).run();
+        System.out.println("countPositives validated");
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
index ded4a58945d..6d8b5be79bf 100644
--- a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
+++ b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
@@ -32,6 +32,11 @@ public class Helper {
         return StringCoding.hasNegatives(ba, off, len);
     }
 
+    @jdk.internal.vm.annotation.ForceInline
+    public static int StringCodingCountPositives(byte[] ba, int off, int len) {
+        return StringCoding.countPositives(ba, off, len);
+    }
+
     @jdk.internal.vm.annotation.ForceInline
     public static byte[] compressByte(byte[] src, int srcOff, int dstSize, int dstOff, int len) {
         byte[] dst = new byte[dstSize];
diff --git a/test/micro/org/openjdk/bench/java/lang/StringDecode.java b/test/micro/org/openjdk/bench/java/lang/StringDecode.java
index c5609ce4e51..ee4f8df7c73 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringDecode.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringDecode.java
@@ -87,7 +87,7 @@ public class StringDecode {
         bh.consume(new String(asciiString, charset));
         bh.consume(new String(longAsciiString, 0, 15, charset));
         bh.consume(new String(asciiString, 0, 3, charset));
-        bh.consume(new String(longAsciiString, 512, 512 + 7, charset));
+        bh.consume(new String(longAsciiString, 512, 7, charset));
     }
 
     @Benchmark
@@ -103,7 +103,7 @@ public class StringDecode {
         bh.consume(new String(latin1String, charset));
         bh.consume(new String(latin1String, 0, 15, charset));
         bh.consume(new String(latin1String, 0, 3, charset));
-        bh.consume(new String(longLatin1OnlyString, 512, 512 + 7, charset));
+        bh.consume(new String(longLatin1OnlyString, 512, 7, charset));
     }
 
     @Benchmark
-- 
GitLab


From bad658e8e93c831631d41b6dbf66a0a102cd0462 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 17 Mar 2022 09:47:51 +0000
Subject: [PATCH 111/345] 8282727: Parallel: Remove
 PSPromotionManager::_totally_drain

Reviewed-by: tschatzl, kbarrett
---
 src/hotspot/share/gc/parallel/psPromotionManager.cpp | 5 ++---
 src/hotspot/share/gc/parallel/psPromotionManager.hpp | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.cpp b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
index 9c6b8acf624..652342ae31f 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
@@ -180,8 +180,7 @@ PSPromotionManager::PSPromotionManager() {
   uint queue_size;
   queue_size = claimed_stack_depth()->max_elems();
 
-  _totally_drain = (ParallelGCThreads == 1) || (GCDrainStackTargetSize == 0);
-  if (_totally_drain) {
+  if (ParallelGCThreads == 1) {
     _target_stack_size = 0;
   } else {
     // don't let the target stack size to be more than 1/4 of the entries
@@ -227,7 +226,7 @@ void PSPromotionManager::restore_preserved_marks() {
 }
 
 void PSPromotionManager::drain_stacks_depth(bool totally_drain) {
-  totally_drain = totally_drain || _totally_drain;
+  totally_drain = totally_drain || (_target_stack_size == 0);
 
   PSScannerTasksQueue* const tq = claimed_stack_depth();
   do {
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
index bd48135f134..a1d2b38db31 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
@@ -83,7 +83,6 @@ class PSPromotionManager {
 
   PSScannerTasksQueue                 _claimed_stack_depth;
 
-  bool                                _totally_drain;
   uint                                _target_stack_size;
 
   uint                                _array_chunk_size;
-- 
GitLab


From 69e4e338b19c0ffd2f0881be1bbb19a5642bc4d4 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Thu, 17 Mar 2022 12:51:10 +0000
Subject: [PATCH 112/345] 8283056: show abstract machine code in hs-err for all
 VM crashes

Reviewed-by: thartmann, dholmes
---
 src/hotspot/share/utilities/vmError.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 1d72092f8ae..89b4645fa45 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -910,7 +910,7 @@ void VMError::report(outputStream* st, bool _verbose) {
 
   STEP("printing code blobs if possible")
 
-     if (_verbose && _context) {
+     if (_verbose) {
        const int printed_capacity = max_error_log_print_code;
        address printed[printed_capacity];
        printed[0] = nullptr;
@@ -929,7 +929,8 @@ void VMError::report(outputStream* st, bool _verbose) {
              printed_len++;
            }
          } else {
-           frame fr = os::fetch_frame_from_context(_context);
+           frame fr = _context ? os::fetch_frame_from_context(_context)
+                               : os::current_frame();
            while (printed_len < limit && fr.pc() != nullptr) {
              if (print_code(st, _thread, fr.pc(), fr.pc() == _pc, printed, printed_capacity)) {
                printed_len++;
-- 
GitLab


From 0f1766dff633e55532d94069d7266a7fe625286c Mon Sep 17 00:00:00 2001
From: Julian Waters <jwaters@openjdk.org>
Date: Thu, 17 Mar 2022 15:30:17 +0000
Subject: [PATCH 113/345] 8283320: Error message for Windows libraries always
 points to --with-msvcr-dll no matter the actual file name

Reviewed-by: erikj, ihse
---
 make/autoconf/toolchain_microsoft.m4 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/make/autoconf/toolchain_microsoft.m4 b/make/autoconf/toolchain_microsoft.m4
index 2e02c531da7..03d4ae50dfb 100644
--- a/make/autoconf/toolchain_microsoft.m4
+++ b/make/autoconf/toolchain_microsoft.m4
@@ -481,6 +481,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
 AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
 [
   DLL_NAME="$1"
+  DLL_HELP="$2"
   MSVC_DLL=
 
   if test "x$OPENJDK_TARGET_CPU" = xx86; then
@@ -565,7 +566,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
   if test "x$MSVC_DLL" = x; then
     AC_MSG_CHECKING([for $DLL_NAME])
     AC_MSG_RESULT([no])
-    AC_MSG_ERROR([Could not find $DLL_NAME. Please specify using --with-msvcr-dll.])
+    AC_MSG_ERROR([Could not find $DLL_NAME. Please specify using ${DLL_HELP}.])
   fi
 ])
 
@@ -588,7 +589,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
     fi
     MSVCR_DLL="$MSVC_DLL"
   else
-    TOOLCHAIN_SETUP_MSVC_DLL([${MSVCR_NAME}])
+    TOOLCHAIN_SETUP_MSVC_DLL([${MSVCR_NAME}], [--with-msvcr-dll])
     MSVCR_DLL="$MSVC_DLL"
   fi
   AC_SUBST(MSVCR_DLL)
@@ -611,7 +612,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
       fi
       MSVCP_DLL="$MSVC_DLL"
     else
-      TOOLCHAIN_SETUP_MSVC_DLL([${MSVCP_NAME}])
+      TOOLCHAIN_SETUP_MSVC_DLL([${MSVCP_NAME}], [--with-msvcp-dll])
       MSVCP_DLL="$MSVC_DLL"
     fi
     AC_SUBST(MSVCP_DLL)
@@ -636,7 +637,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
       fi
       VCRUNTIME_1_DLL="$MSVC_DLL"
     else
-      TOOLCHAIN_SETUP_MSVC_DLL([${VCRUNTIME_1_NAME}])
+      TOOLCHAIN_SETUP_MSVC_DLL([${VCRUNTIME_1_NAME}], [--with-vcruntime-1-dll])
       VCRUNTIME_1_DLL="$MSVC_DLL"
     fi
   fi
-- 
GitLab


From 31df6a60a8853be224d8c8b8c8ca6aea1bae2167 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 17 Mar 2022 16:17:18 +0000
Subject: [PATCH 114/345] 8283188: Build time regression caused by JDK-8278917

Reviewed-by: kbarrett, tschatzl
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp        | 7 +++++++
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp        | 2 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp | 8 --------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index cbd13a7f282..3b6458b9f82 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -3313,6 +3313,13 @@ HeapRegion* G1CollectedHeap::alloc_highest_free_region() {
   return NULL;
 }
 
+void G1CollectedHeap::mark_evac_failure_object(const oop obj, uint worker_id) const {
+  // All objects failing evacuation are live. What we'll do is
+  // that we'll update the prev marking info so that they are
+  // all under PTAMS and explicitly marked.
+  _cm->par_mark_in_prev_bitmap(obj);
+}
+
 // Optimized nmethod scanning
 
 class RegisterNMethodOopClosure: public OopClosure {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 6c1b60a3faa..de2442c7ce5 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1249,7 +1249,7 @@ public:
   inline bool is_obj_dead_full(const oop obj) const;
 
   // Mark the live object that failed evacuation in the prev bitmap.
-  inline void mark_evac_failure_object(const oop obj, uint worker_id) const;
+  void mark_evac_failure_object(const oop obj, uint worker_id) const;
 
   G1ConcurrentMark* concurrent_mark() const { return _cm; }
 
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
index 13231603533..0cd8de23e56 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -29,7 +29,6 @@
 
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CollectorState.hpp"
-#include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1EvacFailureRegions.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RemSet.hpp"
@@ -234,13 +233,6 @@ inline bool G1CollectedHeap::is_obj_dead_full(const oop obj) const {
     return is_obj_dead_full(obj, heap_region_containing(obj));
 }
 
-inline void G1CollectedHeap::mark_evac_failure_object(const oop obj, uint worker_id) const {
-  // All objects failing evacuation are live. What we'll do is
-  // that we'll update the prev marking info so that they are
-  // all under PTAMS and explicitly marked.
-  _cm->par_mark_in_prev_bitmap(obj);
-}
-
 inline void G1CollectedHeap::set_humongous_reclaim_candidate(uint region, bool value) {
   assert(_hrm.at(region)->is_starts_humongous(), "Must start a humongous object");
   _humongous_reclaim_candidates.set_candidate(region, value);
-- 
GitLab


From 5ef1990d6ce35a85c86689badba465b6c8f9f4a1 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 17 Mar 2022 16:37:20 +0000
Subject: [PATCH 115/345] 8283274: Improve @jvms usage in java.base

Reviewed-by: iris
---
 .../share/classes/java/lang/constant/ClassDesc.java         | 2 +-
 .../share/classes/java/lang/constant/Constable.java         | 6 +++---
 .../share/classes/java/lang/constant/ConstantDesc.java      | 6 +++---
 .../share/classes/java/lang/constant/package-info.java      | 4 ++--
 .../share/classes/java/lang/invoke/ConstantBootstraps.java  | 4 ++--
 .../share/classes/java/lang/invoke/MethodHandles.java       | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

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 c992bfb4380..6742b622a40 100644
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
@@ -116,7 +116,7 @@ public sealed interface ClassDesc
      * followed by the field descriptor for the component type.  Examples of
      * valid type descriptor strings include {@code "Ljava/lang/String;"}, {@code "I"},
      * {@code "[I"}, {@code "V"}, {@code "[Ljava/lang/String;"}, etc.
-     * See JVMS 4.3.2 ("Field Descriptors") for more detail.
+     * See JVMS {@jvms 4.3.2 }("Field Descriptors") for more detail.
      *
      * @param descriptor a field descriptor string
      * @return a {@linkplain ClassDesc} describing the desired class
diff --git a/src/java.base/share/classes/java/lang/constant/Constable.java b/src/java.base/share/classes/java/lang/constant/Constable.java
index 33875654c05..e404dff6e4b 100644
--- a/src/java.base/share/classes/java/lang/constant/Constable.java
+++ b/src/java.base/share/classes/java/lang/constant/Constable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.util.Optional;
 /**
  * Represents a type which is <em>constable</em>.  A constable type is one whose
  * values are constants that can be represented in the constant pool of a Java
- * classfile as described in JVMS 4.4, and whose instances can describe themselves
+ * classfile as described in JVMS {@jvms 4.4}, and whose instances can describe themselves
  * nominally as a {@link ConstantDesc}.
  *
  * <p>Some constable types have a native representation in the constant pool:
@@ -48,7 +48,7 @@ import java.util.Optional;
  * Platform API are types that support Java language features such as {@link Enum},
  * and runtime support classes such as {@link VarHandle}.  These are typically
  * described with a {@link DynamicConstantDesc}, which describes dynamically
- * generated constants (JVMS 4.4.10).
+ * generated constants (JVMS {@jvms 4.4.10}).
  *
  * <p>The nominal form of an instance of a constable type is obtained via
  * {@link #describeConstable()}. A {@linkplain Constable} need
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantDesc.java b/src/java.base/share/classes/java/lang/constant/ConstantDesc.java
index 70c5f8fcb55..401119989a9 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.lang.invoke.VarHandle.VarHandleDesc;
 
 /**
  * A <a href="package-summary.html#nominal">nominal descriptor</a> for a loadable
- * constant value, as defined in JVMS 4.4. Such a descriptor can be resolved via
+ * constant value, as defined in JVMS {@jvms 4.4}. Such a descriptor can be resolved via
  * {@link ConstantDesc#resolveConstantDesc(MethodHandles.Lookup)} to yield the
  * constant value itself.
  *
@@ -87,7 +87,7 @@ public sealed interface ConstantDesc
                 String {
     /**
      * Resolves this descriptor reflectively, emulating the resolution behavior
-     * of JVMS 5.4.3 and the access control behavior of JVMS 5.4.4.  The resolution
+     * of JVMS {@jvms 5.4.3} and the access control behavior of JVMS {@jvms 5.4.4}.  The resolution
      * and access control context is provided by the {@link MethodHandles.Lookup}
      * parameter.  No caching of the resulting value is performed.
      *
diff --git a/src/java.base/share/classes/java/lang/constant/package-info.java b/src/java.base/share/classes/java/lang/constant/package-info.java
index 9bc978e44a1..fd85dfb93d7 100644
--- a/src/java.base/share/classes/java/lang/constant/package-info.java
+++ b/src/java.base/share/classes/java/lang/constant/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@
  * referenced in their nominal description are present and accessible.
  *
  * <p>The subtypes of {@link java.lang.constant.ConstantDesc} describe various kinds
- * of constant values.  For each type of loadable constant pool entry defined in JVMS 4.4,
+ * of constant values.  For each type of loadable constant pool entry defined in JVMS {@jvms 4.4},
  * there is a corresponding subtype of {@link java.lang.constant.ConstantDesc}:
  * {@link java.lang.constant.ClassDesc}, {@link java.lang.constant.MethodTypeDesc},
  * {@link java.lang.constant.DirectMethodHandleDesc}, {@link java.lang.String},
diff --git a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
index 27d74284dc6..b3858104e21 100644
--- a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
+++ b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,7 @@ public final class ConstantBootstraps {
      * descriptor is specified by {@code name}.
      *
      * @param lookup unused
-     * @param name the descriptor (JVMS 4.3) of the desired primitive type
+     * @param name the descriptor (JVMS {@jvms 4.3}) of the desired primitive type
      * @param type the required result type (must be {@code Class.class})
      * @return the {@link Class} mirror
      * @throws IllegalArgumentException if the name is not a descriptor for a
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index dd8b01c73bc..7488db060d2 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -2759,7 +2759,7 @@ assertEquals("[x, y, z]", pb.command().toString());
         /**
          * Looks up a class by name from the lookup context defined by this {@code Lookup} object,
          * <a href="MethodHandles.Lookup.html#equiv">as if resolved</a> by an {@code ldc} instruction.
-         * Such a resolution, as specified in JVMS 5.4.3.1 section, attempts to locate and load the class,
+         * Such a resolution, as specified in JVMS {@jvms 5.4.3.1}, attempts to locate and load the class,
          * and then determines whether the class is accessible to this lookup object.
          * <p>
          * The lookup context here is determined by the {@linkplain #lookupClass() lookup class},
-- 
GitLab


From b004fb0550d8fc94e3f6412975c23c0a2ac2a42f Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 17 Mar 2022 17:50:20 +0000
Subject: [PATCH 116/345] 8282773: Refactor parsing of integer VM options

Reviewed-by: dholmes, kbarrett
---
 src/hotspot/share/runtime/arguments.cpp       | 235 ++++++-----
 .../share/runtime/flags/debug_globals.hpp     |  25 +-
 test/hotspot/gtest/runtime/test_arguments.cpp | 366 +++++++++++++++++-
 .../gtest/runtime/test_largeOptions.cpp       | 108 ------
 4 files changed, 529 insertions(+), 205 deletions(-)
 delete mode 100644 test/hotspot/gtest/runtime/test_largeOptions.cpp

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index a38e70b0b26..1d7fb5f983a 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -40,6 +40,7 @@
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
+#include "metaprogramming/enableIf.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
@@ -56,6 +57,7 @@
 #include "services/management.hpp"
 #include "services/nmtCommon.hpp"
 #include "utilities/align.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/powerOfTwo.hpp"
@@ -63,6 +65,7 @@
 #if INCLUDE_JFR
 #include "jfr/jfr.hpp"
 #endif
+#include <limits>
 
 #define DEFAULT_JAVA_LAUNCHER  "generic"
 
@@ -744,20 +747,84 @@ bool Arguments::verify_special_jvm_flags(bool check_globals) {
 }
 #endif
 
-// Parses a size specification string.
-bool Arguments::atojulong(const char *s, julong* result) {
-  julong n = 0;
+template <typename T, ENABLE_IF(std::is_signed<T>::value), ENABLE_IF(sizeof(T) == 4)> // signed 32-bit
+static bool parse_integer_impl(const char *s, char **endptr, int base, T* result) {
+  // Don't use strtol -- on 64-bit builds, "long" could be either 32- or 64-bits
+  // so the range tests could be tautological and might cause compiler warnings.
+  STATIC_ASSERT(sizeof(long long) >= 8); // C++ specification
+  errno = 0; // errno is thread safe
+  long long v = strtoll(s, endptr, base);
+  if (errno != 0 || v < min_jint || v > max_jint) {
+    return false;
+  }
+  *result = static_cast<T>(v);
+  return true;
+}
 
-  // First char must be a digit. Don't allow negative numbers or leading spaces.
-  if (!isdigit(*s)) {
+template <typename T, ENABLE_IF(!std::is_signed<T>::value), ENABLE_IF(sizeof(T) == 4)> // unsigned 32-bit
+static bool parse_integer_impl(const char *s, char **endptr, int base, T* result) {
+  if (s[0] == '-') {
     return false;
   }
+  // Don't use strtoul -- same reason as above.
+  STATIC_ASSERT(sizeof(unsigned long long) >= 8); // C++ specification
+  errno = 0; // errno is thread safe
+  unsigned long long v = strtoull(s, endptr, base);
+  if (errno != 0 || v > max_juint) {
+    return false;
+  }
+  *result = static_cast<T>(v);
+  return true;
+}
 
-  bool is_hex = (s[0] == '0' && (s[1] == 'x' || s[1] == 'X'));
+template <typename T, ENABLE_IF(std::is_signed<T>::value), ENABLE_IF(sizeof(T) == 8)> // signed 64-bit
+static bool parse_integer_impl(const char *s, char **endptr, int base, T* result) {
+  errno = 0; // errno is thread safe
+  *result = strtoll(s, endptr, base);
+  return errno == 0;
+}
+
+template <typename T, ENABLE_IF(!std::is_signed<T>::value), ENABLE_IF(sizeof(T) == 8)> // unsigned 64-bit
+static bool parse_integer_impl(const char *s, char **endptr, int base, T* result) {
+  if (s[0] == '-') {
+    return false;
+  }
+  errno = 0; // errno is thread safe
+  *result = strtoull(s, endptr, base);
+  return errno == 0;
+}
+
+template<typename T>
+static bool multiply_by_1k(T& n) {
+  if (n >= std::numeric_limits<T>::min() / 1024 &&
+      n <= std::numeric_limits<T>::max() / 1024) {
+    n *= 1024;
+    return true;
+  } else {
+    return false;
+  }
+}
+
+// All of the integral types that can be used for command line options:
+//   int, uint, intx, uintx, uint64_t, size_t
+//
+// In all supported platforms, these types can be mapped to only 4 native types:
+//    {signed, unsigned} x {32-bit, 64-bit}
+//
+// We use SFINAE to pick the correct parse_integer_impl() function
+template<typename T>
+static bool parse_integer(const char *s, T* result) {
+  if (!isdigit(s[0]) && s[0] != '-') {
+    // strtoll/strtoull may allow leading spaces. Forbid it.
+    return false;
+  }
+
+  T n = 0;
+  bool is_hex = (s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) ||
+                (s[0] == '-' && s[1] == '0' && (s[2] == 'x' || s[3] == 'X'));
   char* remainder;
-  errno = 0;
-  n = strtoull(s, &remainder, (is_hex ? 16 : 10));
-  if (errno != 0) {
+
+  if (!parse_integer_impl(s, &remainder, (is_hex ? 16 : 10), &n)) {
     return false;
   }
 
@@ -768,28 +835,29 @@ bool Arguments::atojulong(const char *s, julong* result) {
 
   switch (*remainder) {
     case 'T': case 't':
-      *result = n * G * K;
-      // Check for overflow.
-      if (*result/((julong)G * K) != n) return false;
-      return true;
+      if (!multiply_by_1k(n)) return false;
+      // fall-through
     case 'G': case 'g':
-      *result = n * G;
-      if (*result/G != n) return false;
-      return true;
+      if (!multiply_by_1k(n)) return false;
+      // fall-through
     case 'M': case 'm':
-      *result = n * M;
-      if (*result/M != n) return false;
-      return true;
+      if (!multiply_by_1k(n)) return false;
+      // fall-through
     case 'K': case 'k':
-      *result = n * K;
-      if (*result/K != n) return false;
-      return true;
+      if (!multiply_by_1k(n)) return false;
+      break;
     case '\0':
-      *result = n;
-      return true;
+      break;
     default:
       return false;
   }
+
+  *result = n;
+  return true;
+}
+
+bool Arguments::atojulong(const char *s, julong* result) {
+  return parse_integer(s, result);
 }
 
 Arguments::ArgsRange Arguments::check_memory_size(julong size, julong min_size, julong max_size) {
@@ -838,72 +906,57 @@ static bool set_fp_numeric_flag(JVMFlag* flag, char* value, JVMFlagOrigin origin
   return false;
 }
 
-static bool set_numeric_flag(JVMFlag* flag, char* value, JVMFlagOrigin origin) {
-  julong v;
-  int int_v;
-  intx intx_v;
-  bool is_neg = false;
-
+static JVMFlag::Error set_numeric_flag(JVMFlag* flag, char* value, JVMFlagOrigin origin) {
   if (flag == NULL) {
-    return false;
+    return JVMFlag::INVALID_FLAG;
   }
 
-  // Check the sign first since atojulong() parses only unsigned values.
-  if (*value == '-') {
-    if (!flag->is_intx() && !flag->is_int()) {
-      return false;
-    }
-    value++;
-    is_neg = true;
-  }
-  if (!Arguments::atojulong(value, &v)) {
-    return false;
-  }
   if (flag->is_int()) {
-    int_v = (int) v;
-    if (is_neg) {
-      int_v = -int_v;
+    int v;
+    if (parse_integer(value, &v)) {
+      return JVMFlagAccess::set_int(flag, &v, origin);
     }
-    if ((!is_neg && v > max_jint) || (is_neg && -(intx)v < min_jint)) {
-      return false;
-    }
-    return JVMFlagAccess::set_int(flag, &int_v, origin) == JVMFlag::SUCCESS;
   } else if (flag->is_uint()) {
-    if (v > max_juint) {
-      return false;
+    uint v;
+    if (parse_integer(value, &v)) {
+      return JVMFlagAccess::set_uint(flag, &v, origin);
     }
-    uint uint_v = (uint) v;
-    return JVMFlagAccess::set_uint(flag, &uint_v, origin) == JVMFlag::SUCCESS;
   } else if (flag->is_intx()) {
-    intx_v = (intx) v;
-    if (is_neg) {
-      if (intx_v != min_intx) {
-        intx_v = - intx_v;
-        if (intx_v > 0) {
-          return false; // underflow
-        }
-      }
-    } else {
-      if (intx_v < 0) {
-        return false; // overflow
-      }
+    intx v;
+    if (parse_integer(value, &v)) {
+      return JVMFlagAccess::set_intx(flag, &v, origin);
     }
-    return JVMFlagAccess::set_intx(flag, &intx_v, origin) == JVMFlag::SUCCESS;
   } else if (flag->is_uintx()) {
-    uintx uintx_v = (uintx) v;
-    return JVMFlagAccess::set_uintx(flag, &uintx_v, origin) == JVMFlag::SUCCESS;
+    uintx v;
+    if (parse_integer(value, &v)) {
+      return JVMFlagAccess::set_uintx(flag, &v, origin);
+    }
   } else if (flag->is_uint64_t()) {
-    uint64_t uint64_t_v = (uint64_t) v;
-    return JVMFlagAccess::set_uint64_t(flag, &uint64_t_v, origin) == JVMFlag::SUCCESS;
+    uint64_t v;
+    if (parse_integer(value, &v)) {
+      return JVMFlagAccess::set_uint64_t(flag, &v, origin);
+    }
   } else if (flag->is_size_t()) {
-    size_t size_t_v = (size_t) v;
-    return JVMFlagAccess::set_size_t(flag, &size_t_v, origin) == JVMFlag::SUCCESS;
+    size_t v;
+    if (parse_integer(value, &v)) {
+      return JVMFlagAccess::set_size_t(flag, &v, origin);
+    }
   } else if (flag->is_double()) {
-    double double_v = (double) v;
-    return JVMFlagAccess::set_double(flag, &double_v, origin) == JVMFlag::SUCCESS;
-  } else {
-    return false;
+    // This function parses only input strings without a decimal
+    // point character (.)
+    // If a string looks like a FP number, it would be parsed by
+    // set_fp_numeric_flag(). See Arguments::parse_argument().
+    jlong v;
+    if (parse_integer(value, &v)) {
+      double double_v = (double) v;
+      if (value[0] == '-' && v == 0) { // special case: 0.0 is different than -0.0.
+        double_v = -0.0;
+      }
+      return JVMFlagAccess::set_double(flag, &double_v, origin);
+    }
   }
+
+  return JVMFlag::WRONG_FORMAT;
 }
 
 static bool set_string_flag(JVMFlag* flag, const char* value, JVMFlagOrigin origin) {
@@ -1065,7 +1118,7 @@ bool Arguments::parse_argument(const char* arg, JVMFlagOrigin origin) {
       return false;
     }
     JVMFlag* flag = JVMFlag::find_flag(real_name);
-    return set_numeric_flag(flag, value, origin);
+    return set_numeric_flag(flag, value, origin) == JVMFlag::SUCCESS;
   }
 
   return false;
@@ -2082,24 +2135,16 @@ static const char* system_assertion_options[] = {
 bool Arguments::parse_uintx(const char* value,
                             uintx* uintx_arg,
                             uintx min_size) {
-
-  // Check the sign first since atojulong() parses only unsigned values.
-  bool value_is_positive = !(*value == '-');
-
-  if (value_is_positive) {
-    julong n;
-    bool good_return = atojulong(value, &n);
-    if (good_return) {
-      bool above_minimum = n >= min_size;
-      bool value_is_too_large = n > max_uintx;
-
-      if (above_minimum && !value_is_too_large) {
-        *uintx_arg = n;
-        return true;
-      }
-    }
+  uintx n;
+  if (!parse_integer(value, &n)) {
+    return false;
+  }
+  if (n >= min_size) {
+    *uintx_arg = n;
+    return true;
+  } else {
+    return false;
   }
-  return false;
 }
 
 bool Arguments::create_module_property(const char* prop_name, const char* prop_value, PropertyInternal internal) {
@@ -2150,7 +2195,7 @@ Arguments::ArgsRange Arguments::parse_memory_size(const char* s,
                                                   julong* long_arg,
                                                   julong min_size,
                                                   julong max_size) {
-  if (!atojulong(s, long_arg)) return arg_unreadable;
+  if (!parse_integer(s, long_arg)) return arg_unreadable;
   return check_memory_size(*long_arg, min_size, max_size);
 }
 
diff --git a/src/hotspot/share/runtime/flags/debug_globals.hpp b/src/hotspot/share/runtime/flags/debug_globals.hpp
index 11ea2f60104..177a4ae074b 100644
--- a/src/hotspot/share/runtime/flags/debug_globals.hpp
+++ b/src/hotspot/share/runtime/flags/debug_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,29 @@
   product(ccstr, DummyManageableStringFlag, NULL, MANAGEABLE,               \
           "Dummy flag for testing string handling in WriteableFlags")       \
                                                                             \
+  product(bool, TestFlagFor_bool, false,                                    \
+          "Used by VM internal regression tests only")                      \
+                                                                            \
+  product(int, TestFlagFor_int, 0,                                          \
+          "Used by VM internal regression tests only")                      \
+                                                                            \
+  product(uint, TestFlagFor_uint, 0,                                        \
+           "Used by VM internal regression tests only")                     \
+                                                                            \
+  product(intx, TestFlagFor_intx, 0,                                        \
+          "Used by VM internal regression tests only")                      \
+                                                                            \
+  product(uintx, TestFlagFor_uintx, 0,                                      \
+          "Used by VM internal regression tests only")                      \
+                                                                            \
+  product(uint64_t, TestFlagFor_uint64_t, 0,                                \
+          "Used by VM internal regression tests only")                      \
+                                                                            \
+  product(size_t, TestFlagFor_size_t, 0,                                    \
+          "Used by VM internal regression tests only")                      \
+                                                                            \
+  product(double, TestFlagFor_double, 0.0,                                  \
+          "Used by VM internal regression tests only")                      \
 
 // end of DEBUG_RUNTIME_FLAGS
 
diff --git a/test/hotspot/gtest/runtime/test_arguments.cpp b/test/hotspot/gtest/runtime/test_arguments.cpp
index 81bae6c468a..234bb2a015b 100644
--- a/test/hotspot/gtest/runtime/test_arguments.cpp
+++ b/test/hotspot/gtest/runtime/test_arguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "jvm.h"
 #include "unittest.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/flags/jvmFlag.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -41,6 +42,16 @@ public:
   static jint parse_xss(const JavaVMOption* option, const char* tail, intx* out_ThreadStackSize) {
     return Arguments::parse_xss(option, tail, out_ThreadStackSize);
   }
+
+  static bool parse_argument(const char* name, const char* value) {
+    char buf[1024];
+    int ret = jio_snprintf(buf, sizeof(buf), "%s=%s", name, value);
+    if (ret > 0) {
+      return Arguments::parse_argument(buf, JVMFlagOrigin::COMMAND_LINE);
+    } else {
+      return false;
+    }
+  }
 };
 
 TEST_F(ArgumentsTest, atojulong) {
@@ -201,3 +212,356 @@ TEST_VM_F(ArgumentsTest, parse_xss) {
     EXPECT_EQ(parse_xss_inner(to_string(K + 1), JNI_OK), calc_expected(K + 1));
   }
 }
+
+struct Dummy {};
+static Dummy BAD;
+
+template <typename T>
+struct NumericArgument {
+  bool bad;
+  const char* str;
+  T expected_value;
+
+  NumericArgument(const char* s, T v) :           bad(false), str(s), expected_value(v) {}
+  NumericArgument(const char* s, Dummy & dummy) : bad(true),  str(s), expected_value(0) {}
+};
+
+static void check_invalid_numeric_string(JVMFlag* flag,  const char** invalid_strings) {
+  for (uint i = 0; ; i++) {
+    const char* str = invalid_strings[i];
+    if (str == NULL) {
+      return;
+    }
+    ASSERT_FALSE(ArgumentsTest::parse_argument(flag->name(), str))
+        << "Invalid string '" << str
+        << "' parsed without error for type " << flag->type_string() << ".";
+  }
+}
+
+template <typename T>
+void check_numeric_flag(JVMFlag* flag, T getvalue(JVMFlag* flag),
+                        NumericArgument<T>* valid_args, size_t n,
+                        bool is_double = false) {
+  for (size_t i = 0; i < n; i++) {
+    NumericArgument<T>* info = &valid_args[i];
+    const char* str = info->str;
+    if (info->bad) {
+      ASSERT_FALSE(ArgumentsTest::parse_argument(flag->name(), str))
+        << "Invalid string '" << str
+        << "' parsed without error for type " << flag->type_string() << ".";
+    } else {
+      ASSERT_TRUE(ArgumentsTest::parse_argument(flag->name(), str))
+        << "Valid string '" <<
+        str << "' did not parse for type " << flag->type_string() << ".";
+      ASSERT_EQ(getvalue(flag), info->expected_value)
+        << "Valid string '" << str
+        << "' did not parse to the correct value for type "
+        << flag->type_string() << ".";
+    }
+  }
+
+  {
+    // Invalid strings for *any* type of integer VM arguments
+    const char* invalid_strings[] = {
+      "", " 1", "2 ", "3 2",
+      "0x", "0x0x1" "e"
+      "K", "M", "G", "1MB", "1KM", "AA", "0B",
+      "18446744073709551615K", "17179869184G",
+      "999999999999999999999999999999",
+      "0x10000000000000000", "18446744073709551616",
+      "-0x10000000000000000", "-18446744073709551616",
+      "-0x8000000000000001", "-9223372036854775809",
+      "0x8000000t", "0x800000000g",
+      "0x800000000000m", "0x800000000000000k",
+      "-0x8000000t", "-0x800000000g",
+      "-0x800000000000m", "-0x800000000000000k",
+      NULL,
+    };
+    check_invalid_numeric_string(flag, invalid_strings);
+  }
+
+  if (!is_double) {
+    const char* invalid_strings_for_integers[] = {
+      "1.0", "0x4.5", "0.001", "4e10",
+      NULL,
+    };
+    check_invalid_numeric_string(flag, invalid_strings_for_integers);
+  }
+}
+
+#define INTEGER_TEST_TABLE(f) \
+  /*input                      i32           u32           i64                      u64 */ \
+  f("0",                       0,            0,            0,                       0                        ) \
+  f("-0",                      0,            BAD,          0,                       BAD                      ) \
+  f("-1",                     -1,            BAD,         -1,                       BAD                      ) \
+  f("0x1",                     1,            1,            1,                       1                        ) \
+  f("-0x1",                   -1,            BAD,         -1,                       BAD                      ) \
+  f("4711",                    4711,         4711,         4711,                    4711                     ) \
+  f("1K",                      1024,         1024,         1024,                    1024                     ) \
+  f("1k",                      1024,         1024,         1024,                    1024                     ) \
+  f("2M",                      2097152,      2097152,      2097152,                 2097152                  ) \
+  f("2m",                      2097152,      2097152,      2097152,                 2097152                  ) \
+  f("1G",                      1073741824,   1073741824,   1073741824,              1073741824               ) \
+  f("2G",                      BAD,          0x80000000,   2147483648LL,            2147483648ULL            ) \
+  f("1T",                      BAD,          BAD,          1099511627776LL,         1099511627776ULL         ) \
+  f("1t",                      BAD,          BAD,          1099511627776LL,         1099511627776ULL         ) \
+  f("-1K",                    -1024,         BAD,         -1024,                    BAD                      ) \
+  f("0x1K",                    1024,         1024,         1024,                    1024                     ) \
+  f("-0x1K",                  -1024,         BAD,         -1024,                    BAD                      ) \
+  f("0K",                      0,            0,            0,                       0                        ) \
+  f("0x1000000k",              BAD,          BAD,          17179869184LL,           17179869184ULL           ) \
+  f("0x800000m",               BAD,          BAD,          0x80000000000LL,         0x80000000000ULL         ) \
+  f("0x8000g",                 BAD,          BAD,          0x200000000000LL,        0x200000000000ULL        ) \
+  f("0x8000t",                 BAD,          BAD,          0x80000000000000LL,      0x80000000000000ULL      ) \
+  f("-0x1000000k",             BAD,          BAD,         -17179869184LL,           BAD                      ) \
+  f("-0x800000m",              BAD,          BAD,         -0x80000000000LL,         BAD                      ) \
+  f("-0x8000g",                BAD,          BAD,         -0x200000000000LL,        BAD                      ) \
+  f("-0x8000t",                BAD,          BAD,         -0x80000000000000LL,      BAD                      ) \
+  f("0x7fffffff",              0x7fffffff,   0x7fffffff,   0x7fffffff,              0x7fffffff               ) \
+  f("0xffffffff",              BAD,          0xffffffff,   0xffffffff,              0xffffffff               ) \
+  f("0x80000000",              BAD,          0x80000000,   0x80000000,              0x80000000               ) \
+  f("-0x7fffffff",            -2147483647,   BAD,         -2147483647LL,            BAD                      ) \
+  f("-0x80000000",            -2147483648,   BAD,         -2147483648LL,            BAD                      ) \
+  f("-0x80000001",             BAD,          BAD,         -2147483649LL,            BAD                      ) \
+  f("0x100000000",             BAD,          BAD,          0x100000000LL,           0x100000000ULL           ) \
+  f("0xcafebabe",              BAD,          0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
+  f("0XCAFEBABE",              BAD,          0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
+  f("0XCAFEbabe",              BAD,          0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
+  f("0xcafebabe1",             BAD,          BAD,          0xcafebabe1,             0xcafebabe1              ) \
+  f("0x7fffffffffffffff",      BAD,          BAD,          max_jlong,               9223372036854775807ULL   ) \
+  f("0x8000000000000000",      BAD,          BAD,          BAD,                     9223372036854775808ULL   ) \
+  f("0xffffffffffffffff",      BAD,          BAD,          BAD,                     max_julong               ) \
+  f("9223372036854775807",     BAD,          BAD,          9223372036854775807LL,   9223372036854775807ULL   ) \
+  f("9223372036854775808",     BAD,          BAD,          BAD,                     9223372036854775808ULL   ) \
+  f("-9223372036854775808",    BAD,          BAD,          min_jlong,               BAD                      ) \
+  f("18446744073709551615",    BAD,          BAD,          BAD,                     max_julong               ) \
+                                                                                                               \
+  /* All edge cases without a k/m/g/t suffix */                                                                \
+  f("0x7ffffffe",              max_jint-1,   0x7ffffffe,   0x7ffffffeLL,            0x7ffffffeULL            ) \
+  f("0x7fffffff",              max_jint,     0x7fffffff,   0x7fffffffLL,            0x7fffffffULL            ) \
+  f("0x80000000",              BAD,          0x80000000,   0x80000000LL,            0x80000000ULL            ) \
+  f("0xfffffffe",              BAD,          max_juint-1,  0xfffffffeLL,            0xfffffffeULL            ) \
+  f("0xffffffff",              BAD,          max_juint,    0xffffffffLL,            0xffffffffULL            ) \
+  f("0x100000000",             BAD,          BAD,          0x100000000LL,           0x100000000ULL           ) \
+  f("-0x7fffffff",             min_jint+1,   BAD,         -0x7fffffffLL,            BAD                      ) \
+  f("-0x80000000",             min_jint,     BAD,         -0x80000000LL,            BAD                      ) \
+  f("-0x80000001",             BAD,          BAD,         -0x80000001LL,            BAD                      ) \
+                                                                                                               \
+  f("0x7ffffffffffffffe",      BAD,          BAD,          max_jlong-1,             0x7ffffffffffffffeULL    ) \
+  f("0x7fffffffffffffff",      BAD,          BAD,          max_jlong,               0x7fffffffffffffffULL    ) \
+  f("0x8000000000000000",      BAD,          BAD,          BAD,                     0x8000000000000000ULL    ) \
+  f("0xfffffffffffffffe",      BAD,          BAD,          BAD,                     max_julong-1             ) \
+  f("0xffffffffffffffff",      BAD,          BAD,          BAD,                     max_julong               ) \
+  f("0x10000000000000000",     BAD,          BAD,          BAD,                     BAD                      ) \
+  f("-0x7fffffffffffffff",     BAD,          BAD,          min_jlong+1,             BAD                      ) \
+  f("-0x8000000000000000",     BAD,          BAD,          min_jlong,               BAD                      ) \
+  f("-0x8000000000000001",     BAD,          BAD,          BAD,                     BAD                      ) \
+                                                                                                               \
+  /* edge cases for suffix: K */                                                                               \
+  f("0x1ffffek",               0x1ffffe * k, 0x1ffffeU * k,0x1ffffeLL * k,          0x1ffffeULL * k          ) \
+  f("0x1fffffk",               0x1fffff * k, 0x1fffffU * k,0x1fffffLL * k,          0x1fffffULL * k          ) \
+  f("0x200000k",               BAD,          0x200000U * k,0x200000LL * k,          0x200000ULL * k          ) \
+  f("0x3ffffek",               BAD,          0x3ffffeU * k,0x3ffffeLL * k,          0x3ffffeULL * k          ) \
+  f("0x3fffffk",               BAD,          0x3fffffU * k,0x3fffffLL * k,          0x3fffffULL * k          ) \
+  f("0x400000k",               BAD,          BAD,          0x400000LL * k,          0x400000ULL * k          ) \
+  f("-0x1fffffk",             -0x1fffff * k, BAD,         -0x1fffffLL * k,          BAD                      ) \
+  f("-0x200000k",             -0x200000 * k, BAD,         -0x200000LL * k,          BAD                      ) \
+  f("-0x200001k",              BAD,          BAD,         -0x200001LL * k,          BAD                      ) \
+                                                                                                               \
+  f("0x1ffffffffffffek",       BAD,          BAD,          0x1ffffffffffffeLL * k,  0x1ffffffffffffeULL * k  ) \
+  f("0x1fffffffffffffk",       BAD,          BAD,          0x1fffffffffffffLL * k,  0x1fffffffffffffULL * k  ) \
+  f("0x20000000000000k",       BAD,          BAD,          BAD,                     0x20000000000000ULL * k  ) \
+  f("0x3ffffffffffffek",       BAD,          BAD,          BAD,                     0x3ffffffffffffeULL * k  ) \
+  f("0x3fffffffffffffk",       BAD,          BAD,          BAD,                     0x3fffffffffffffULL * k  ) \
+  f("0x40000000000000k",       BAD,          BAD,          BAD,                     BAD                      ) \
+  f("-0x1fffffffffffffk",      BAD,          BAD,         -0x1fffffffffffffLL * k,  BAD                      ) \
+  f("-0x20000000000000k",      BAD,          BAD,         -0x20000000000000LL * k,  BAD                      ) \
+  f("-0x20000000000001k",      BAD,          BAD,          BAD,                     BAD                      ) \
+                                                                                                               \
+  /* edge cases for suffix: M */                                                                               \
+  f("0x7fem",                  0x7fe * m,    0x7feU * m,   0x7feLL * m,             0x7feULL * m             ) \
+  f("0x7ffm",                  0x7ff * m,    0x7ffU * m,   0x7ffLL * m,             0x7ffULL * m             ) \
+  f("0x800m",                  BAD,          0x800U * m,   0x800LL * m,             0x800ULL * m             ) \
+  f("0xffem",                  BAD,          0xffeU * m,   0xffeLL * m,             0xffeULL * m             ) \
+  f("0xfffm",                  BAD,          0xfffU * m,   0xfffLL * m,             0xfffULL * m             ) \
+  f("0x1000m",                 BAD,          BAD,          0x1000LL * m,            0x1000ULL * m            ) \
+  f("-0x7ffm",                -0x7ff * m,    BAD,         -0x7ffLL * m,             BAD                      ) \
+  f("-0x800m",                -0x800 * m,    BAD,         -0x800LL * m,             BAD                      ) \
+  f("-0x801m",                 BAD,          BAD,         -0x801LL * m,             BAD                      ) \
+                                                                                                               \
+  f("0x7fffffffffem",          BAD,          BAD,          0x7fffffffffeLL * m,     0x7fffffffffeULL * m     ) \
+  f("0x7ffffffffffm",          BAD,          BAD,          0x7ffffffffffLL * m,     0x7ffffffffffULL * m     ) \
+  f("0x80000000000m",          BAD,          BAD,          BAD,                     0x80000000000ULL * m     ) \
+  f("0xffffffffffem",          BAD,          BAD,          BAD,                     0xffffffffffeULL * m     ) \
+  f("0xfffffffffffm",          BAD,          BAD,          BAD,                     0xfffffffffffULL * m     ) \
+  f("0x100000000000m",         BAD,          BAD,          BAD,                     BAD                      ) \
+  f("-0x7ffffffffffm",         BAD,          BAD,         -0x7ffffffffffLL * m,     BAD                      ) \
+  f("-0x80000000000m",         BAD,          BAD,         -0x80000000000LL * m,     BAD                      ) \
+  f("-0x80000000001m",         BAD,          BAD,          BAD,                     BAD                      ) \
+                                                                                                               \
+  /* edge cases for suffix: G */                                                                               \
+  f("0x0g",                    0x0 * g,      0x0U * g,     0x0LL * g,               0x0ULL * g               ) \
+  f("0x1g",                    0x1 * g,      0x1U * g,     0x1LL * g,               0x1ULL * g               ) \
+  f("0x2g",                    BAD,          0x2U * g,     0x2LL * g,               0x2ULL * g               ) \
+  f("0x3g",                    BAD,          0x3U * g,     0x3LL * g,               0x3ULL * g               ) \
+  f("0x4g",                    BAD,          BAD,          0x4LL * g,               0x4ULL * g               ) \
+  f("-0x1g",                  -0x1 * g,      BAD,         -0x1LL * g,               BAD                      ) \
+  f("-0x2g",                  -0x2 * g,      BAD,         -0x2LL * g,               BAD                      ) \
+  f("-0x3g",                   BAD,          BAD,         -0x3LL * g,               BAD                      ) \
+                                                                                                               \
+  f("0x1fffffffeg",            BAD,          BAD,          0x1fffffffeLL * g,       0x1fffffffeULL * g       ) \
+  f("0x1ffffffffg",            BAD,          BAD,          0x1ffffffffLL * g,       0x1ffffffffULL * g       ) \
+  f("0x200000000g",            BAD,          BAD,          BAD,                     0x200000000ULL * g       ) \
+  f("0x3fffffffeg",            BAD,          BAD,          BAD,                     0x3fffffffeULL * g       ) \
+  f("0x3ffffffffg",            BAD,          BAD,          BAD,                     0x3ffffffffULL * g       ) \
+  f("0x400000000g",            BAD,          BAD,          BAD,                     BAD                      ) \
+  f("-0x1ffffffffg",           BAD,          BAD,         -0x1ffffffffLL * g,       BAD                      ) \
+  f("-0x200000000g",           BAD,          BAD,         -0x200000000LL * g,       BAD                      ) \
+  f("-0x200000001g",           BAD,          BAD,          BAD,                     BAD                      ) \
+                                                                                                               \
+  /* edge cases for suffix: T */                                                                               \
+  f("0x7ffffet",               BAD,          BAD,          0x7ffffeLL * t,          0x7ffffeULL * t          ) \
+  f("0x7ffffft",               BAD,          BAD,          0x7fffffLL * t,          0x7fffffULL * t          ) \
+  f("0x800000t",               BAD,          BAD,          BAD,                     0x800000ULL * t          ) \
+  f("0xfffffet",               BAD,          BAD,          BAD,                     0xfffffeULL * t          ) \
+  f("0xfffffft",               BAD,          BAD,          BAD,                     0xffffffULL * t          ) \
+  f("0x1000000t",              BAD,          BAD,          BAD,                     BAD                      ) \
+  f("-0x7ffffft",              BAD,          BAD,         -0x7fffffLL * t,          BAD                      ) \
+  f("-0x800000t",              BAD,          BAD,         -0x800000LL * t,          BAD                      ) \
+  f("-0x800001t",              BAD,          BAD,          BAD,                     BAD                      )
+
+#define INTEGER_TEST_i32(s, i32, u32, i64, u64) NumericArgument<T>(s, i32),
+#define INTEGER_TEST_u32(s, i32, u32, i64, u64) NumericArgument<T>(s, u32),
+#define INTEGER_TEST_i64(s, i32, u32, i64, u64) NumericArgument<T>(s, i64),
+#define INTEGER_TEST_u64(s, i32, u32, i64, u64) NumericArgument<T>(s, u64),
+
+// signed 32-bit
+template <typename T, ENABLE_IF(std::is_signed<T>::value), ENABLE_IF(sizeof(T) == 4)>
+void check_flag(const char* f, T getvalue(JVMFlag* flag)) {
+  JVMFlag* flag = JVMFlag::find_flag(f);
+  if (flag == NULL) { // not available in product builds
+    return;
+  }
+
+  T k = static_cast<T>(K);
+  T m = static_cast<T>(M);
+  T g = static_cast<T>(G);
+  NumericArgument<T> valid_strings[] = { INTEGER_TEST_TABLE(INTEGER_TEST_i32) };
+  check_numeric_flag(flag, getvalue, valid_strings, ARRAY_SIZE(valid_strings));
+}
+
+// unsigned 32-bit
+template <typename T, ENABLE_IF(!std::is_signed<T>::value), ENABLE_IF(sizeof(T) == 4)>
+void check_flag(const char* f, T getvalue(JVMFlag* flag)) {
+  JVMFlag* flag = JVMFlag::find_flag(f);
+  if (flag == NULL) { // not available in product builds
+    return;
+  }
+
+  T k = static_cast<T>(K);
+  T m = static_cast<T>(M);
+  T g = static_cast<T>(G);
+  NumericArgument<T> valid_strings[] = { INTEGER_TEST_TABLE(INTEGER_TEST_u32) };
+  check_numeric_flag(flag, getvalue, valid_strings, ARRAY_SIZE(valid_strings));
+}
+
+// signed 64-bit
+template <typename T, ENABLE_IF(std::is_signed<T>::value), ENABLE_IF(sizeof(T) == 8)>
+void check_flag(const char* f, T getvalue(JVMFlag* flag)) {
+  JVMFlag* flag = JVMFlag::find_flag(f);
+  if (flag == NULL) { // not available in product builds
+    return;
+  }
+
+  T k = static_cast<T>(K);
+  T m = static_cast<T>(M);
+  T g = static_cast<T>(G);
+  T t = static_cast<T>(G) * k;
+  NumericArgument<T> valid_strings[] = { INTEGER_TEST_TABLE(INTEGER_TEST_i64) };
+  check_numeric_flag(flag, getvalue, valid_strings, ARRAY_SIZE(valid_strings));
+}
+
+// unsigned 64-bit
+template <typename T, ENABLE_IF(!std::is_signed<T>::value), ENABLE_IF(sizeof(T) == 8)>
+void check_flag(const char* f, T getvalue(JVMFlag* flag)) {
+  JVMFlag* flag = JVMFlag::find_flag(f);
+  if (flag == NULL) { // not available in product builds
+    return;
+  }
+
+  T k = static_cast<T>(K);
+  T m = static_cast<T>(M);
+  T g = static_cast<T>(G);
+  T t = static_cast<T>(G) * k;
+  NumericArgument<T> valid_strings[] = { INTEGER_TEST_TABLE(INTEGER_TEST_u64) };
+  check_numeric_flag(flag, getvalue, valid_strings, ARRAY_SIZE(valid_strings));
+}
+
+// Testing the parsing of -XX:<SomeFlag>=<an integer value>
+//
+// All of the integral types that can be used for command line options:
+//   int, uint, intx, uintx, uint64_t, size_t
+//
+// In all supported platforms, these types can be mapped to only 4 native types:
+//    {signed, unsigned} x {32-bit, 64-bit}
+//
+// We use SFINAE to pick the correct column in the INTEGER_TEST_TABLE for each type.
+
+TEST_VM_F(ArgumentsTest, set_numeric_flag_int) {
+  check_flag<int>("TestFlagFor_int", [] (JVMFlag* flag) {
+    return flag->get_int();
+  });
+}
+
+TEST_VM_F(ArgumentsTest, set_numeric_flag_uint) {
+  check_flag<uint>("TestFlagFor_uint", [] (JVMFlag* flag) {
+    return flag->get_uint();
+  });
+}
+
+TEST_VM_F(ArgumentsTest, set_numeric_flag_intx) {
+  check_flag<intx>("TestFlagFor_intx", [] (JVMFlag* flag) {
+    return flag->get_intx();
+  });
+}
+
+TEST_VM_F(ArgumentsTest, set_numeric_flag_uintx) {
+  check_flag<uintx>("TestFlagFor_uintx", [] (JVMFlag* flag) {
+    return flag->get_uintx();
+  });
+}
+
+TEST_VM_F(ArgumentsTest, set_numeric_flag_uint64_t) {
+  check_flag<uint64_t>("TestFlagFor_uint64_t", [] (JVMFlag* flag) {
+    return flag->get_uint64_t();
+  });
+}
+
+TEST_VM_F(ArgumentsTest, set_numeric_flag_size_t) {
+  check_flag<size_t>("TestFlagFor_size_t", [] (JVMFlag* flag) {
+    return flag->get_size_t();
+  });
+}
+
+TEST_VM_F(ArgumentsTest, set_numeric_flag_double) {
+  JVMFlag* flag = JVMFlag::find_flag("TestFlagFor_double");
+  if (flag == NULL) { // not available in product builds
+    return;
+  }
+
+  // TODO -- JDK-8282774
+  // Need to add more test input that have a fractional part like "4.2".
+  NumericArgument<double> valid_strings[] = {
+    NumericArgument<double>("0",   0.0),
+    NumericArgument<double>("1",   1.0),
+    NumericArgument<double>("-0", -0.0),
+    NumericArgument<double>("-1", -1.0),
+  };
+
+  auto getvalue = [] (JVMFlag* flag) {
+    return flag->get_double();
+  };
+
+  check_numeric_flag<double>(flag, getvalue, valid_strings,
+                             ARRAY_SIZE(valid_strings), /*is_double=*/true);
+}
diff --git a/test/hotspot/gtest/runtime/test_largeOptions.cpp b/test/hotspot/gtest/runtime/test_largeOptions.cpp
deleted file mode 100644
index a8d5af24915..00000000000
--- a/test/hotspot/gtest/runtime/test_largeOptions.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include "precompiled.hpp"
-#include "compiler/compiler_globals.hpp"
-#include "runtime/arguments.hpp"
-#include "runtime/flags/jvmFlag.hpp"
-#include "runtime/globals.hpp"
-#include "unittest.hpp"
-
-class LargeOptionsTest : public ::testing::Test {
-public:
-  static bool test_option_value(const char* option, intx value) {
-    char buffer[100];
-    UnlockDiagnosticVMOptions = true;
-    os::snprintf(buffer, 100, "%s=" INTX_FORMAT, option, value);
-    return Arguments::parse_argument(buffer, JVMFlagOrigin::COMMAND_LINE);
-  }
-
-  static bool test_option_value(const char* option) {
-    UnlockDiagnosticVMOptions = true;
-    return Arguments::parse_argument(option, JVMFlagOrigin::COMMAND_LINE);
-  }
-};
-
-#ifdef _LP64
-// CompilerDirectivesLimit is a diagnostic int option.
-TEST_VM(LARGE_OPTION, large_ints) {
-  for (intx x = max_jint - 1; x <= (intx)max_jint + 1; x++) {
-    bool result = LargeOptionsTest::test_option_value("CompilerDirectivesLimit", x);
-    if (x > max_jint) {
-      ASSERT_FALSE(result);
-    } else {
-      ASSERT_TRUE(result);
-      ASSERT_EQ(CompilerDirectivesLimit, x);
-    }
-  }
-}
-
-TEST_VM(LARGE_OPTION, small_ints) {
-  for (intx x = min_jint + 1; x >= (intx)min_jint - 1; x--) {
-    bool result = LargeOptionsTest::test_option_value("CompilerDirectivesLimit", x);
-    if (x < min_jint) {
-      ASSERT_FALSE(result);
-    } else {
-      ASSERT_TRUE(result);
-      ASSERT_EQ(CompilerDirectivesLimit, x);
-    }
-  }
-}
-
-TEST_VM(LARGE_OPTION, large_int_overflow) { // Test 0x100000000
-  ASSERT_FALSE(LargeOptionsTest::test_option_value("CompilerDirectivesLimit", 4294967296));
-}
-#endif
-
-// HandshakeTimeout is a diagnostic uint option.
-TEST_VM(LARGE_OPTION, large_uints) {
-  for (uintx x = max_juint - 1; x <= (uintx)max_juint + 1; x++) {
-    bool result = LargeOptionsTest::test_option_value("HandshakeTimeout", x);
-    if (x <= max_juint) {
-      ASSERT_TRUE(result);
-      ASSERT_EQ(HandshakeTimeout, x);
-    } else {
-      ASSERT_FALSE(result);
-    }
-  }
-}
-
-#ifdef _LP64
-// MaxJNILocalCapacity is an intx option.
-TEST_VM(LARGE_OPTION, large_intxs) {
-  // max_intx + 1 equals min_intx!
-  for (julong x = max_intx - 1; x <= (julong)max_intx + 1; x++) {
-    ASSERT_TRUE(LargeOptionsTest::test_option_value("MaxJNILocalCapacity", x));
-    ASSERT_EQ((julong)MaxJNILocalCapacity, x);
-  }
-}
-
-TEST_VM(LARGE_OPTION, small_intxs) {
-  ASSERT_TRUE(LargeOptionsTest::test_option_value("MaxJNILocalCapacity", min_intx + 1));
-  ASSERT_EQ(MaxJNILocalCapacity, -9223372036854775807);
-  ASSERT_TRUE(LargeOptionsTest::test_option_value("MaxJNILocalCapacity", min_intx));
-  ASSERT_EQ(MaxJNILocalCapacity, min_intx);
-  // Test value that's less than min_intx (-0x8000000000000001).
-  ASSERT_FALSE(LargeOptionsTest::test_option_value("MaxJNILocalCapacity=-9223372036854775809"));
-}
-#endif
-- 
GitLab


From 002e3667443d94e2303c875daf72cf1ccbbb0099 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Thu, 17 Mar 2022 21:15:36 +0000
Subject: [PATCH 117/345] 8283325: US_ASCII decoder relies on
 String.decodeASCII being exhaustive

Reviewed-by: rriggs, dcubed
---
 .../share/classes/java/lang/String.java       |  6 ++
 .../charset/CharsetDecoder/ASCIIDecode.java   | 55 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 test/jdk/java/nio/charset/CharsetDecoder/ASCIIDecode.java

diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 3c3a2ba28f0..009a61a9ba3 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -1032,6 +1032,12 @@ public final class String
     /* package-private */
     static int decodeASCII(byte[] sa, int sp, char[] da, int dp, int len) {
         int count = StringCoding.countPositives(sa, sp, len);
+        while (count < len) {
+            if (sa[sp + count] < 0) {
+                break;
+            }
+            count++;
+        }
         StringLatin1.inflate(sa, sp, da, dp, count);
         return count;
     }
diff --git a/test/jdk/java/nio/charset/CharsetDecoder/ASCIIDecode.java b/test/jdk/java/nio/charset/CharsetDecoder/ASCIIDecode.java
new file mode 100644
index 00000000000..330c2c49a07
--- /dev/null
+++ b/test/jdk/java/nio/charset/CharsetDecoder/ASCIIDecode.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8283325
+ * @summary Ensure that decoding to ASCII from a stream with a non-ASCII
+ *          character correctly decodes up until the byte in error.
+ */
+
+import java.nio.*;
+import java.nio.charset.*;
+import java.util.Arrays;
+
+public class ASCIIDecode {
+
+    public static void main(String[] args) throws Exception {
+        final Charset ascii = Charset.forName("US-ASCII");
+        final CharsetDecoder decoder = ascii.newDecoder();
+
+        byte[] ba = new byte[] { 0x60, 0x60, 0x60, (byte)0xFF };
+
+        // Repeat enough times to test that interpreter and JIT:ed versions
+        // behave the same (without the patch for 8283325 this fails within
+        // 50 000 iterations on the system used for verification)
+        for (int i = 0; i < 100_000; i++) {
+            ByteBuffer bb = ByteBuffer.wrap(ba);
+            char[] ca = new char[4];
+            CharBuffer cb = CharBuffer.wrap(ca);
+            CoderResult buf = decoder.decode(bb, cb, true);
+            if (ca[0] != 0x60 || ca[1] != 0x60 || ca[2] != 0x60) {
+                throw new RuntimeException("Unexpected output on iteration " + i);
+            }
+        }
+    }
+}
-- 
GitLab


From d83cee98b5e6628f19f1b5dea11038079dd0c758 Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Fri, 18 Mar 2022 03:14:32 +0000
Subject: [PATCH 118/345] 8282407: Missing ')' in MacResources.properties

Reviewed-by: naoto
---
 .../jdk/jpackage/internal/resources/MacResources.properties   | 4 ++--
 .../jpackage/internal/resources/MacResources_ja.properties    | 4 ++--
 .../jpackage/internal/resources/MacResources_zh_CN.properties | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
index 23a4f9d0437..25a9facea5f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -80,7 +80,7 @@ message.building-dmg=Building DMG package for {0}.
 message.running-script=Running shell script on application image [{0}].
 message.preparing-dmg-setup=Preparing dmg setup: {0}.
 message.creating-dmg-file=Creating DMG file: {0}.
-message.dmg-cannot-be-overwritten=Dmg file exists ({0} and can not be removed.
+message.dmg-cannot-be-overwritten=Dmg file exists [{0}] and can not be removed.
 message.output-to-location=Result DMG installer for {0}: {1}.
 message.building-pkg=Building PKG package for {0}.
 message.preparing-scripts=Preparing package scripts.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
index d9da226ec92..291130fb237 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ message.building-dmg={0}\u306EDMG\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u621
 message.running-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8[{0}]\u3067\u30B7\u30A7\u30EB\u30FB\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u5B9F\u884C\u3057\u3066\u3044\u307E\u3059\u3002
 message.preparing-dmg-setup=dmg\u306E\u8A2D\u5B9A\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
 message.creating-dmg-file=DMG\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {0}
-message.dmg-cannot-be-overwritten=Dmg\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057({0}\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002
+message.dmg-cannot-be-overwritten=Dmg\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057[{0}]\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002
 message.output-to-location={0}\u306E\u7D50\u679C\u306EDMG\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9: {1}
 message.building-pkg={0}\u306EPKG\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059
 message.preparing-scripts=\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
index d6f47a7bc85..ecf9e8796d5 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ message.building-dmg=\u6B63\u5728\u4E3A {0} \u6784\u5EFA DMG \u7A0B\u5E8F\u5305\
 message.running-script=\u6B63\u5728\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF [{0}] \u4E0A\u8FD0\u884C shell \u811A\u672C\u3002
 message.preparing-dmg-setup=\u6B63\u5728\u51C6\u5907 dmg \u8BBE\u7F6E: {0}\u3002
 message.creating-dmg-file=\u6B63\u5728\u521B\u5EFA DMG \u6587\u4EF6: {0}\u3002
-message.dmg-cannot-be-overwritten=Dmg \u6587\u4EF6\u5DF2\u5B58\u5728 ({0}) \u4E14\u65E0\u6CD5\u5220\u9664\u3002
+message.dmg-cannot-be-overwritten=Dmg \u6587\u4EF6\u5DF2\u5B58\u5728 [{0}] \u4E14\u65E0\u6CD5\u5220\u9664\u3002
 message.output-to-location=\u4E3A {0} \u751F\u6210\u7684 DMG \u5B89\u88C5\u7A0B\u5E8F: {1}\u3002
 message.building-pkg=\u6B63\u5728\u4E3A {0} \u6784\u5EFA PKG \u7A0B\u5E8F\u5305\u3002
 message.preparing-scripts=\u6B63\u5728\u51C6\u5907\u7A0B\u5E8F\u5305\u811A\u672C\u3002
-- 
GitLab


From cab4ff64541393a974ea91e35167668ef0036804 Mon Sep 17 00:00:00 2001
From: Tyler Steele <tyler.steele@ibm.com>
Date: Fri, 18 Mar 2022 07:02:26 +0000
Subject: [PATCH 119/345] 8283225: ClassLoader.c produces incorrect OutOfMemory
 Exception when length is 0 (aix)

Reviewed-by: stuefe, rriggs, dholmes
---
 src/java.base/share/native/libjava/ClassLoader.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/java.base/share/native/libjava/ClassLoader.c b/src/java.base/share/native/libjava/ClassLoader.c
index bbdff87b0b3..da34a7b438b 100644
--- a/src/java.base/share/native/libjava/ClassLoader.c
+++ b/src/java.base/share/native/libjava/ClassLoader.c
@@ -99,7 +99,12 @@ Java_java_lang_ClassLoader_defineClass1(JNIEnv *env,
         return 0;
     }
 
+    // On AIX malloc(0) returns NULL which looks like an out-of-memory condition; so adjust it to malloc(1)
+    #ifdef _AIX
+    body = (jbyte *)malloc(length == 0 ? 1 : length);
+    #else
     body = (jbyte *)malloc(length);
+    #endif
 
     if (body == 0) {
         JNU_ThrowOutOfMemoryError(env, 0);
@@ -239,7 +244,13 @@ Java_java_lang_ClassLoader_defineClass0(JNIEnv *env,
         return 0;
     }
 
+    // On AIX malloc(0) returns NULL which looks like an out-of-memory condition; so adjust it to malloc(1)
+    #ifdef _AIX
+    body = (jbyte *)malloc(length == 0 ? 1 : length);
+    #else
     body = (jbyte *)malloc(length);
+    #endif
+
     if (body == 0) {
         JNU_ThrowOutOfMemoryError(env, 0);
         return 0;
-- 
GitLab


From b96cb048f1a7f3ae6e745b245f2b04c64ebb911e Mon Sep 17 00:00:00 2001
From: Jie Fu <jiefu@openjdk.org>
Date: Fri, 18 Mar 2022 07:58:58 +0000
Subject: [PATCH 120/345] 8283353: compiler/c2/cr6865031/Test.java and
 compiler/runtime/Test6826736.java fails on x86_32

Reviewed-by: chagedorn
---
 test/hotspot/jtreg/compiler/c2/cr6865031/Test.java   | 2 ++
 test/hotspot/jtreg/compiler/runtime/Test6826736.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/c2/cr6865031/Test.java b/test/hotspot/jtreg/compiler/c2/cr6865031/Test.java
index 71689eaca18..af23628577b 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6865031/Test.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6865031/Test.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Goldman Sachs International.  All Rights Reserved.
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +28,7 @@
  * @bug 6865031
  * @summary Application gives bad result (throws bad exception) with compressed oops
  *
+ * @requires vm.bits == 64
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops
  *      -XX:HeapBaseMinAddress=32g -XX:-LoopUnswitching
  *      -XX:CompileCommand=inline,compiler.c2.cr6865031.AbstractMemoryEfficientList::equals
diff --git a/test/hotspot/jtreg/compiler/runtime/Test6826736.java b/test/hotspot/jtreg/compiler/runtime/Test6826736.java
index 2f078506e55..0b028947f77 100644
--- a/test/hotspot/jtreg/compiler/runtime/Test6826736.java
+++ b/test/hotspot/jtreg/compiler/runtime/Test6826736.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6826736
  * @summary CMS: core dump with -XX:+UseCompressedOops
  *
+ * @requires vm.bits == 64
  * @run main/othervm/timeout=600 -XX:+IgnoreUnrecognizedVMOptions -Xbatch
  *      -XX:+ScavengeALot -XX:+UseCompressedOops -XX:HeapBaseMinAddress=32g
  *      -XX:CompileThreshold=100 -XX:-BlockLayoutRotateLoops
-- 
GitLab


From 4b5079b9836c1cc881f571d060b310f58c8a860c Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 18 Mar 2022 13:18:38 +0000
Subject: [PATCH 121/345] 8283202: Potential off-read when checking JFR's
 status in awaitFinished

Reviewed-by: mgronlun
---
 .../jfr/internal/consumer/ChunkHeader.java    | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java
index 54687725b74..550878888cd 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java
@@ -109,14 +109,19 @@ public final class ChunkHeader {
         input.position(absoluteEventStart);
     }
 
+    private byte readFileState() throws IOException {
+        byte fs;
+        input.positionPhysical(absoluteChunkStart + FILE_STATE_POSITION);
+        while ((fs = input.readPhysicalByte()) == UPDATING_CHUNK_HEADER) {
+            Utils.takeNap(1);
+            input.positionPhysical(absoluteChunkStart + FILE_STATE_POSITION);
+        }
+        return fs;
+    }
+
     public void refresh() throws IOException {
         while (true) {
-            byte fileState1;
-            input.positionPhysical(absoluteChunkStart + FILE_STATE_POSITION);
-            while ((fileState1 = input.readPhysicalByte()) == UPDATING_CHUNK_HEADER) {
-                Utils.takeNap(1);
-                input.positionPhysical(absoluteChunkStart + FILE_STATE_POSITION);
-            }
+            byte fileState1 = readFileState();
             input.positionPhysical(absoluteChunkStart + CHUNK_SIZE_POSITION);
             long chunkSize = input.readPhysicalLong();
             long constantPoolPosition = input.readPhysicalLong();
@@ -169,10 +174,9 @@ public final class ChunkHeader {
         }
         long pos = input.position();
         try {
-            input.positionPhysical(absoluteChunkStart + FILE_STATE_POSITION);
             while (true) {
-                byte filestate = input.readPhysicalByte();
-                if (filestate == 0) {
+                byte fileState = readFileState();
+                if (fileState == 0) {
                     finished = true;
                     return;
                 }
-- 
GitLab


From c72bcfc1b230d22137ac7f683cf46dc70b6e3d16 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 18 Mar 2022 13:27:49 +0000
Subject: [PATCH 122/345] 8283289: JFR: Rename CheckPoint

Reviewed-by: mgronlun
---
 .../jfr/internal/consumer/ChunkParser.java    | 12 ++++----
 .../consumer/filter/CheckPointEvent.java      | 14 ++++-----
 .../consumer/filter/CheckPointPool.java       |  4 +--
 .../internal/consumer/filter/ChunkWriter.java | 30 +++++++++----------
 .../jdk/jfr/internal/tool/Summary.java        |  2 +-
 .../jdk/management/jfr/DiskRepository.java    |  8 ++---
 6 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
index 8a392d985c5..9d88adcf478 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
@@ -41,7 +41,7 @@ import jdk.jfr.internal.LongMap;
 import jdk.jfr.internal.MetadataDescriptor;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.Utils;
-import jdk.jfr.internal.consumer.filter.CheckPointEvent;
+import jdk.jfr.internal.consumer.filter.CheckpointEvent;
 import jdk.jfr.internal.consumer.filter.ChunkWriter;
 
 /**
@@ -77,7 +77,7 @@ public final class ChunkParser {
         }
     }
 
-    private enum CheckPointType {
+    private enum CheckpointType {
         // Checkpoint that finishes a flush segment
         FLUSH(1),
         // Checkpoint contains chunk header information in the first pool
@@ -87,7 +87,7 @@ public final class ChunkParser {
         // Checkpoint contains thread related information
         THREAD(8);
         private final int mask;
-        private CheckPointType(int mask) {
+        private CheckpointType(int mask) {
             this.mask = mask;
         }
 
@@ -267,7 +267,7 @@ public final class ChunkParser {
                 // Not accepted by filter
             } else {
                 if (typeId == 1) { // checkpoint event
-                    if (CheckPointType.FLUSH.is(parseCheckpointType())) {
+                    if (CheckpointType.FLUSH.is(parseCheckpointType())) {
                         input.position(pos + size);
                         return FLUSH_MARKER;
                     }
@@ -317,9 +317,9 @@ public final class ChunkParser {
         long delta = -1;
         boolean logTrace = Logger.shouldLog(LogTag.JFR_SYSTEM_PARSER, LogLevel.TRACE);
         while (thisCP != abortCP && delta != 0) {
-            CheckPointEvent cp = null;
+            CheckpointEvent cp = null;
             if (configuration.chunkWriter != null) {
-                cp = configuration.chunkWriter.newCheckPointEvent(thisCP);
+                cp = configuration.chunkWriter.newCheckpointEvent(thisCP);
             }
             input.position(thisCP);
             lastCP = thisCP;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointEvent.java
index a2c1723a1e3..72f40c0e7a7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointEvent.java
@@ -35,12 +35,12 @@ import jdk.jfr.internal.Type;
  * <p>
  * All positional values are relative to file start, not the chunk.
  */
-public final class CheckPointEvent {
+public final class CheckpointEvent {
     private final ChunkWriter chunkWriter;
-    private final LinkedHashMap<Long, CheckPointPool> pools = new LinkedHashMap<>();
+    private final LinkedHashMap<Long, CheckpointPool> pools = new LinkedHashMap<>();
     private final long startPosition;
 
-    public CheckPointEvent(ChunkWriter chunkWriter, long startPosition) {
+    public CheckpointEvent(ChunkWriter chunkWriter, long startPosition) {
         this.chunkWriter = chunkWriter;
         this.startPosition = startPosition;
     }
@@ -48,7 +48,7 @@ public final class CheckPointEvent {
     public PoolEntry addEntry(Type type, long id, long startPosition, long endPosition, Object references) {
         long typeId = type.getId();
         PoolEntry pe = new PoolEntry(startPosition, endPosition, type, id, references);
-        var cpp = pools.computeIfAbsent(typeId, k -> new CheckPointPool(typeId));
+        var cpp = pools.computeIfAbsent(typeId, k -> new CheckpointPool(typeId));
         cpp.add(pe);
         chunkWriter.getPool(type).add(id, pe);
         return pe;
@@ -56,7 +56,7 @@ public final class CheckPointEvent {
 
     public long touchedPools() {
         int count = 0;
-        for (CheckPointPool cpp : pools.values()) {
+        for (CheckpointPool cpp : pools.values()) {
             if (cpp.isTouched()) {
                 count++;
             }
@@ -64,7 +64,7 @@ public final class CheckPointEvent {
         return count;
     }
 
-    public Collection<CheckPointPool> getPools() {
+    public Collection<CheckpointPool> getPools() {
         return pools.values();
     }
 
@@ -74,7 +74,7 @@ public final class CheckPointEvent {
 
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        for (CheckPointPool p : pools.values()) {
+        for (CheckpointPool p : pools.values()) {
             for (var e : p.getEntries()) {
                 if (e.isTouched()) {
                     sb.append(e.getType().getName() + " " + e.getId() + "\n");
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointPool.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointPool.java
index 3b0ca0f58eb..d4b1ce926be 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointPool.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointPool.java
@@ -29,11 +29,11 @@ import java.util.List;
 /**
  * Represents a constant pool in a checkpoint, both entries and type id
  */
-final class CheckPointPool {
+final class CheckpointPool {
     private final List<PoolEntry> entries = new ArrayList<>();
     private final long typeId;
 
-    public CheckPointPool(long typeId) {
+    public CheckpointPool(long typeId) {
         this.typeId = typeId;
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/ChunkWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/ChunkWriter.java
index 1a1cc236359..8c22432512a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/ChunkWriter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/ChunkWriter.java
@@ -51,7 +51,7 @@ import jdk.jfr.internal.consumer.Reference;
  */
 public final class ChunkWriter implements Closeable {
     private LongMap<Constants> pools = new LongMap<>();
-    private final Deque<CheckPointEvent> checkPoints = new ArrayDeque<>();
+    private final Deque<CheckpointEvent> checkpoints = new ArrayDeque<>();
     private final Path destination;
     private final RecordingInput input;
     private final RecordingOutput output;
@@ -59,7 +59,7 @@ public final class ChunkWriter implements Closeable {
 
     private long chunkStartPosition;
     private boolean chunkComplete;
-    private long lastCheckPoint;
+    private long lastCheckpoint;
 
     public ChunkWriter(Path source, Path destination, Predicate<RecordedEvent> filter) throws IOException {
         this.destination = destination;
@@ -78,9 +78,9 @@ public final class ChunkWriter implements Closeable {
         return pool;
     }
 
-    public CheckPointEvent newCheckPointEvent(long startPosition) {
-        CheckPointEvent event = new CheckPointEvent(this, startPosition);
-        checkPoints.add(event);
+    public CheckpointEvent newCheckpointEvent(long startPosition) {
+        CheckpointEvent event = new CheckpointEvent(this, startPosition);
+        checkpoints.add(event);
         return event;
     }
 
@@ -120,16 +120,16 @@ public final class ChunkWriter implements Closeable {
 
     // Write check point events before a position
     private void writeCheckpointEvents(long before) throws IOException {
-        CheckPointEvent cp = checkPoints.peek();
+        CheckpointEvent cp = checkpoints.peek();
         while (cp != null && cp.getStartPosition() < before) {
-            checkPoints.poll();
+            checkpoints.poll();
             long delta = 0;
-            if (lastCheckPoint != 0) {
-                delta = lastCheckPoint - output.position();
+            if (lastCheckpoint != 0) {
+                delta = lastCheckpoint - output.position();
             }
-            lastCheckPoint = output.position();
+            lastCheckpoint = output.position();
             write(cp, delta);
-            cp = checkPoints.peek();
+            cp = checkpoints.peek();
         }
     }
 
@@ -174,10 +174,10 @@ public final class ChunkWriter implements Closeable {
         writeCheckpointEvents(Long.MAX_VALUE);
         long metadata = output.position();
         writeMetadataEvent(header);
-        updateHeader(output.position(), lastCheckPoint, metadata);
+        updateHeader(output.position(), lastCheckpoint, metadata);
         pools = new LongMap<>();
         chunkComplete = true;
-        lastCheckPoint = 0;
+        lastCheckpoint = 0;
     }
 
     private void writeMetadataEvent(ChunkHeader header) throws IOException {
@@ -190,7 +190,7 @@ public final class ChunkWriter implements Closeable {
         }
     }
 
-    private void write(CheckPointEvent event, long delta) throws IOException {
+    private void write(CheckpointEvent event, long delta) throws IOException {
         input.position(event.getStartPosition());
         long startPosition = output.position();
 
@@ -205,7 +205,7 @@ public final class ChunkWriter implements Closeable {
 
         // Write even if touched pools are zero, checkpoint works as sync point
         output.writeLong(event.touchedPools()); // Pool count
-        for (CheckPointPool pool : event.getPools()) {
+        for (CheckpointPool pool : event.getPools()) {
             if (pool.isTouched()) {
                 output.writeLong(pool.getTypeId());
                 output.writeLong(pool.getTouchedCount());
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Summary.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Summary.java
index 767ccf63507..850e995acf3 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Summary.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Summary.java
@@ -100,7 +100,7 @@ final class Summary extends Command {
             }
             HashMap<Long, Statistics> stats = new HashMap<>();
             stats.put(0L, new Statistics(eventPrefix + "Metadata"));
-            stats.put(1L, new Statistics(eventPrefix + "CheckPoint"));
+            stats.put(1L, new Statistics(eventPrefix + "Checkpoint"));
             int minWidth = 0;
             while (true) {
                 long chunkEnd = ch.getEnd();
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/DiskRepository.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/DiskRepository.java
index 7ce5f9c9360..d8ff2debe9e 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/DiskRepository.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/DiskRepository.java
@@ -179,7 +179,7 @@ final class DiskRepository implements Closeable {
                 bufferIndex = 0;
                 break;
             case CHECKPOINT_EVENT_HEADER_BYTE_ARRAY_CONTENT:
-                processCheckPointHeader();
+                processCheckpointHeader();
                 break;
             case CHECKPOINT_EVENT_FLUSH_TYPE:
                 processFlush();
@@ -286,10 +286,10 @@ final class DiskRepository implements Closeable {
         }
     }
 
-    private void processCheckPointHeader() throws IOException {
+    private void processCheckpointHeader() throws IOException {
         buffer.put(bufferIndex, nextByte(true));
         if (bufferIndex == HEADER_SIZE) {
-            writeCheckPointHeader();
+            writeCheckpointHeader();
             state = State.EVENT_PAYLOAD;
             bufferIndex = 0;
         }
@@ -321,7 +321,7 @@ final class DiskRepository implements Closeable {
         }
     }
 
-    private void writeCheckPointHeader() throws IOException {
+    private void writeCheckpointHeader() throws IOException {
         Objects.requireNonNull(raf);
         byte state = buffer.get(HEADER_FILE_STATE_POSITION);
         boolean complete = state == COMPLETE_STATE;
-- 
GitLab


From 85cc6f1440aa7e073cab894cb9a72d9eed4e8369 Mon Sep 17 00:00:00 2001
From: Andrew Leonard <aleonard@openjdk.org>
Date: Fri, 18 Mar 2022 13:40:35 +0000
Subject: [PATCH 123/345] 8283315: jrt-fs.jar not always deterministically
 built

Reviewed-by: ihse
---
 make/common/JarArchive.gmk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/make/common/JarArchive.gmk b/make/common/JarArchive.gmk
index 5a87e471428..26b08fc1509 100644
--- a/make/common/JarArchive.gmk
+++ b/make/common/JarArchive.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -193,7 +193,8 @@ define SetupJarArchiveBody
   $1_UPDATE_CONTENTS=\
       if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
         $(ECHO) "  updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-        $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \
+        $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
+        $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted; \
       fi $$(NEWLINE)
   # The s-variants of the above macros are used when the jar is created from scratch.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
@@ -212,7 +213,9 @@ define SetupJarArchiveBody
             | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
         $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
   endif
-  $1_SUPDATE_CONTENTS=$$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
+  $1_SUPDATE_CONTENTS=\
+      $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
+      $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted $$(NEWLINE)
 
   # Use a slightly shorter name for logging, but with enough path to identify this jar.
   $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_JAR))
-- 
GitLab


From b2aa085e67711a32e1679b68aabb092058dca044 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 18 Mar 2022 14:54:56 +0000
Subject: [PATCH 124/345] 8283378: JFR: Checkpoint classes not renamed properly

Reviewed-by: dcubed
---
 .../filter/{CheckPointEvent.java => CheckpointEvent.java}         | 0
 .../consumer/filter/{CheckPointPool.java => CheckpointPool.java}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/{CheckPointEvent.java => CheckpointEvent.java} (100%)
 rename src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/{CheckPointPool.java => CheckpointPool.java} (100%)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckpointEvent.java
similarity index 100%
rename from src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointEvent.java
rename to src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckpointEvent.java
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointPool.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckpointPool.java
similarity index 100%
rename from src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckPointPool.java
rename to src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/filter/CheckpointPool.java
-- 
GitLab


From ff0b0927a2df8b36f8fd6ed41bd4e20e71a5b653 Mon Sep 17 00:00:00 2001
From: Ravi Reddy <rreddy@openjdk.org>
Date: Fri, 18 Mar 2022 15:31:30 +0000
Subject: [PATCH 125/345] 8278794: Infinite loop in
 DeflaterOutputStream.finish()

Reviewed-by: coffeys, lancea
---
 .../share/classes/java/util/zip/Deflater.java |  12 +-
 .../java/util/zip/DeflaterOutputStream.java   |  14 +-
 .../java/util/zip/ZipOutputStream.java        |   4 +-
 test/jdk/java/util/zip/CloseDeflaterTest.java | 147 -------------
 .../util/zip/CloseInflaterDeflaterTest.java   | 208 ++++++++++++++++++
 5 files changed, 231 insertions(+), 154 deletions(-)
 delete mode 100644 test/jdk/java/util/zip/CloseDeflaterTest.java
 create mode 100644 test/jdk/java/util/zip/CloseInflaterDeflaterTest.java

diff --git a/src/java.base/share/classes/java/util/zip/Deflater.java b/src/java.base/share/classes/java/util/zip/Deflater.java
index d41b8a7e126..155264e4afe 100644
--- a/src/java.base/share/classes/java/util/zip/Deflater.java
+++ b/src/java.base/share/classes/java/util/zip/Deflater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -895,6 +895,16 @@ public class Deflater {
             throw new NullPointerException("Deflater has been closed");
     }
 
+    /**
+     * Returns the value of 'finish' flag.
+     * 'finish' will be set to true if def.finish() method is called.
+     */
+    boolean shouldFinish() {
+        synchronized (zsRef) {
+            return finish;
+        }
+    }
+
     private static native long init(int level, int strategy, boolean nowrap);
     private static native void setDictionary(long addr, byte[] b, int off,
                                              int len);
diff --git a/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java b/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java
index 7dfbd7f9edb..c856d8999b3 100644
--- a/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java
+++ b/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -220,9 +220,15 @@ public class DeflaterOutputStream extends FilterOutputStream {
      */
     public void finish() throws IOException {
         if (!def.finished()) {
-            def.finish();
-            while (!def.finished()) {
-                deflate();
+            try{
+                def.finish();
+                while (!def.finished()) {
+                    deflate();
+                }
+            } catch(IOException e) {
+                if (usesDefaultDeflater)
+                    def.end();
+                throw e;
             }
         }
     }
diff --git a/src/java.base/share/classes/java/util/zip/ZipOutputStream.java b/src/java.base/share/classes/java/util/zip/ZipOutputStream.java
index 1b8ed562d9f..d11eb4d4aae 100644
--- a/src/java.base/share/classes/java/util/zip/ZipOutputStream.java
+++ b/src/java.base/share/classes/java/util/zip/ZipOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -314,7 +314,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
                 crc.reset();
                 current = null;
             } catch (IOException e) {
-                if (usesDefaultDeflater && !(e instanceof ZipException))
+                if (def.shouldFinish() && usesDefaultDeflater && !(e instanceof ZipException))
                     def.end();
                 throw e;
             }
diff --git a/test/jdk/java/util/zip/CloseDeflaterTest.java b/test/jdk/java/util/zip/CloseDeflaterTest.java
deleted file mode 100644
index 8aa4960f543..00000000000
--- a/test/jdk/java/util/zip/CloseDeflaterTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8193682
- * @summary Test Infinite loop while writing on closed GZipOutputStream , ZipOutputStream and JarOutputStream.
- * @run testng CloseDeflaterTest
- */
-import java.io.*;
-import java.util.Random;
-import java.util.jar.JarOutputStream;
-import java.util.zip.GZIPOutputStream;
-import java.util.zip.ZipOutputStream;
-import java.util.zip.ZipEntry;
-
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.fail;
-
-
-public class CloseDeflaterTest {
-
-    //number of bytes to write
-    private static final int INPUT_LENGTH= 512;
-    //OutputStream that will throw an exception during a write operation
-    private static OutputStream outStream = new OutputStream() {
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            //throw exception during write
-            throw new IOException();
-        }
-        @Override
-        public void write(byte b[]) throws IOException {}
-        @Override
-        public void write(int b) throws IOException {}
-    };
-    private static byte[] inputBytes = new byte[INPUT_LENGTH];
-    private static Random rand = new Random();
-
-    @DataProvider(name = "testgzipinput")
-    public Object[][] testGZipInput() {
-     //testGZip will close the GZipOutputStream using close() method when the boolean
-     //useCloseMethod is set to true and finish() method if the value is set to false
-     return new Object[][] {
-      { GZIPOutputStream.class, true },
-      { GZIPOutputStream.class, false },
-     };
-    }
-
-    @DataProvider(name = "testzipjarinput")
-    public Object[][] testZipAndJarInput() {
-     //testZipAndJarInput will perfrom write/closeEntry operations on JarOutputStream when the boolean
-     //useJar is set to true and on ZipOutputStream if the value is set to false
-     return new Object[][] {
-      { JarOutputStream.class, true },
-      { ZipOutputStream.class, false },
-     };
-    }
-
-    @BeforeTest
-    public void before_test()
-    {
-       //add inputBytes array with random bytes to write into Zip
-       rand.nextBytes(inputBytes);
-    }
-
-    //Test for infinite loop by writing bytes to closed GZIPOutputStream
-    @Test(dataProvider = "testgzipinput")
-    public void testGZip(Class<?> type, boolean useCloseMethod) throws IOException {
-        GZIPOutputStream zip = new GZIPOutputStream(outStream);
-        try {
-            zip.write(inputBytes, 0, INPUT_LENGTH);
-            //close zip
-            if(useCloseMethod) {
-               zip.close();
-            } else {
-               zip.finish();
-            }
-        } catch (IOException e) {
-            //expected
-        }
-        for (int i = 0; i < 3; i++) {
-            try {
-                //write on a closed GZIPOutputStream
-                zip.write(inputBytes, 0, INPUT_LENGTH);
-                fail("Deflater closed exception not thrown");
-            } catch (NullPointerException e) {
-                //expected , Deflater has been closed exception
-            }
-        }
-    }
-
-    //Test for infinite loop by writing bytes to closed ZipOutputStream/JarOutputStream
-    @Test(dataProvider = "testzipjarinput")
-    public void testZipCloseEntry(Class<?> type,boolean useJar) throws IOException {
-        ZipOutputStream zip = null;
-        if(useJar) {
-           zip = new JarOutputStream(outStream);
-        } else {
-           zip = new ZipOutputStream(outStream);
-        }
-        try {
-            zip.putNextEntry(new ZipEntry(""));
-        } catch (IOException e) {
-            //expected to throw IOException since putNextEntry calls write method
-        }
-        try {
-            zip.write(inputBytes, 0, INPUT_LENGTH);
-            //close zip entry
-            zip.closeEntry();
-        } catch (IOException e) {
-            //expected
-        }
-        for (int i = 0; i < 3; i++) {
-            try {
-                //write on a closed ZipOutputStream
-                zip.write(inputBytes, 0, INPUT_LENGTH);
-                fail("Deflater closed exception not thrown");
-            } catch (NullPointerException e) {
-                //expected , Deflater has been closed exception
-            }
-        }
-    }
-
-}
diff --git a/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java b/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java
new file mode 100644
index 00000000000..4f0fafc8dbe
--- /dev/null
+++ b/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8193682 8278794
+ * @summary Test Infinite loop while writing on closed Deflater and Inflater.
+ * @run testng CloseInflaterDeflaterTest
+ */
+import java.io.*;
+import java.util.Random;
+import java.util.jar.JarOutputStream;
+import java.util.zip.DeflaterInputStream;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.GZIPOutputStream;
+import java.util.zip.InflaterOutputStream;
+import java.util.zip.ZipOutputStream;
+import java.util.zip.ZipEntry;
+
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertThrows;
+
+
+public class CloseInflaterDeflaterTest {
+
+    // Number of bytes to write/read from Deflater/Inflater
+    private static final int INPUT_LENGTH= 512;
+    // OutputStream that will throw an exception during a write operation
+    private static OutputStream outStream = new OutputStream() {
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            throw new IOException();
+        }
+        @Override
+        public void write(byte[] b) throws IOException {}
+        @Override
+        public void write(int b) throws IOException {}
+    };
+    // InputStream that will throw an exception during a read operation
+    private static InputStream inStream = new InputStream() {
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            throw new IOException();
+        }
+        @Override
+        public int read(byte[] b) throws IOException { throw new IOException();}
+        @Override
+        public int read() throws IOException { throw new IOException();}
+    };
+    // Input bytes for read/write operation
+    private static byte[] inputBytes = new byte[INPUT_LENGTH];
+    // Random function to add bytes to inputBytes
+    private static Random rand = new Random();
+
+    /**
+     * DataProvider to specify whether to use close() or finish() of OutputStream
+     *
+     * @return Entry object indicating which method to use for closing OutputStream
+     */
+    @DataProvider
+    public Object[][] testOutputStreams() {
+     return new Object[][] {
+      { true },
+      { false },
+     };
+    }
+
+    /**
+     * DataProvider to specify on which outputstream closeEntry() has to be called
+     *
+     * @return Entry object returning either JarOutputStream or ZipOutputStream
+     */
+    @DataProvider
+    public Object[][] testZipAndJar() throws IOException{
+     return new Object[][] {
+      { new JarOutputStream(outStream)},
+      { new ZipOutputStream(outStream)},
+     };
+    }
+
+    /**
+     * Add inputBytes array with random bytes to write into OutputStream
+     */
+    @BeforeTest
+    public void before_test()
+    {
+       rand.nextBytes(inputBytes);
+    }
+
+    /**
+     * Test for infinite loop by writing bytes to closed GZIPOutputStream
+     *
+     * @param useCloseMethod indicates whether to use Close() or finish() method
+     * @throws IOException if an error occurs
+     */
+    @Test(dataProvider = "testOutputStreams")
+    public void testGZip(boolean useCloseMethod) throws IOException {
+        GZIPOutputStream gzip = new GZIPOutputStream(outStream);
+        gzip.write(inputBytes, 0, INPUT_LENGTH);
+        assertThrows(IOException.class, () -> {
+            // Close GZIPOutputStream
+            if (useCloseMethod) {
+                gzip.close();
+            } else {
+                gzip.finish();
+            }
+        });
+        // Write on a closed GZIPOutputStream, closed Deflater IOException expected
+        assertThrows(NullPointerException.class , () -> gzip.write(inputBytes, 0, INPUT_LENGTH));
+    }
+
+    /**
+     * Test for infinite loop by writing bytes to closed DeflaterOutputStream
+     *
+     * @param useCloseMethod indicates whether to use Close() or finish() method
+     * @throws IOException if an error occurs
+     */
+    @Test(dataProvider = "testOutputStreams")
+    public void testDeflaterOutputStream(boolean useCloseMethod) throws IOException {
+        DeflaterOutputStream def = new DeflaterOutputStream(outStream);
+        assertThrows(IOException.class , () -> def.write(inputBytes, 0, INPUT_LENGTH));
+        assertThrows(IOException.class, () -> {
+            // Close DeflaterOutputStream
+            if (useCloseMethod) {
+                def.close();
+            } else {
+                def.finish();
+            }
+        });
+        // Write on a closed DeflaterOutputStream, 'Deflater has been closed' NPE is expected
+        assertThrows(NullPointerException.class , () -> def.write(inputBytes, 0, INPUT_LENGTH));
+    }
+
+    /**
+     * Test for infinite loop by reading bytes from closed DeflaterInputStream
+     *
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void testDeflaterInputStream() throws IOException {
+        DeflaterInputStream def = new DeflaterInputStream(inStream);
+        assertThrows(IOException.class , () -> def.read(inputBytes, 0, INPUT_LENGTH));
+        // Close DeflaterInputStream
+        def.close();
+        // Read from a closed DeflaterInputStream, closed Deflater IOException expected
+        assertThrows(IOException.class , () -> def.read(inputBytes, 0, INPUT_LENGTH));
+    }
+
+    /**
+     * Test for infinite loop by writing bytes to closed InflaterOutputStream
+     *
+     * @param useCloseMethod indicates whether to use Close() or finish() method
+     * @throws IOException if an error occurs
+     */
+    @Test(dataProvider = "testOutputStreams")
+    public void testInflaterOutputStream(boolean useCloseMethod) throws IOException {
+        InflaterOutputStream inf = new InflaterOutputStream(outStream);
+        assertThrows(IOException.class , () -> inf.write(inputBytes, 0, INPUT_LENGTH));
+        assertThrows(IOException.class , () -> {
+            // Close InflaterOutputStream
+            if (useCloseMethod) {
+                inf.close();
+            } else {
+                inf.finish();
+            }
+        });
+        // Write on a closed InflaterOutputStream , closed Inflater IOException expected
+        assertThrows(IOException.class , () -> inf.write(inputBytes, 0, INPUT_LENGTH));
+    }
+
+    /**
+     * Test for infinite loop by writing bytes to closed ZipOutputStream/JarOutputStream
+     *
+     * @param zip will be the instance of either JarOutputStream or ZipOutputStream
+     * @throws IOException if an error occurs
+     */
+    @Test(dataProvider = "testZipAndJar")
+    public void testZipCloseEntry(ZipOutputStream zip) throws IOException {
+        assertThrows(IOException.class , () -> zip.putNextEntry(new ZipEntry("")));
+        zip.write(inputBytes, 0, INPUT_LENGTH);
+        assertThrows(IOException.class , () -> zip.closeEntry());
+        // Write on a closed ZipOutputStream , 'Deflater has been closed' NPE is expected
+        assertThrows(NullPointerException.class , () -> zip.write(inputBytes, 0, INPUT_LENGTH));
+    }
+
+}
-- 
GitLab


From d8893fad23d1ee6841336b96c34599643edb81ce Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Fri, 18 Mar 2022 20:28:39 +0000
Subject: [PATCH 126/345] 8283059: Uninitialized warning in check_code.c with
 GCC 11.2

Reviewed-by: dholmes
---
 .../share/native/libverify/check_code.c       | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/java.base/share/native/libverify/check_code.c b/src/java.base/share/native/libverify/check_code.c
index fca549cfc9b..55d6fbcf42a 100644
--- a/src/java.base/share/native/libverify/check_code.c
+++ b/src/java.base/share/native/libverify/check_code.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -468,7 +468,8 @@ static void CCout_of_memory (context_type *);
 /* Because we can longjmp any time, we need to be very careful about
  * remembering what needs to be freed. */
 
-static void check_and_push(context_type *context, const void *ptr, int kind);
+static void check_and_push_malloc_block(context_type *context, void *ptr);
+static void check_and_push_string_utf(context_type *context, const char *ptr);
 static void pop_and_free(context_type *context);
 
 static int signature_to_args_size(const char *method_signature);
@@ -604,7 +605,7 @@ class_to_ID(context_type *context, jclass cb, jboolean loadable)
     unsigned short *pID;
     const char *name = JVM_GetClassNameUTF(env, cb);
 
-    check_and_push(context, name, VM_STRING_UTF);
+    check_and_push_string_utf(context, name);
     hash = class_hash_fun(name);
     pID = &(class_hash->table[hash % HASH_TABLE_SIZE]);
     while (*pID) {
@@ -939,10 +940,10 @@ read_all_code(context_type* context, jclass cb, int num_methods,
     int i;
 
     lengths = malloc(sizeof(int) * num_methods);
-    check_and_push(context, lengths, VM_MALLOC_BLK);
+    check_and_push_malloc_block(context, lengths);
 
     code = malloc(sizeof(unsigned char*) * num_methods);
-    check_and_push(context, code, VM_MALLOC_BLK);
+    check_and_push_malloc_block(context, code);
 
     *(lengths_addr) = lengths;
     *(code_addr) = code;
@@ -951,7 +952,7 @@ read_all_code(context_type* context, jclass cb, int num_methods,
         lengths[i] = JVM_GetMethodIxByteCodeLength(context->env, cb, i);
         if (lengths[i] > 0) {
             code[i] = malloc(sizeof(unsigned char) * (lengths[i] + 1));
-            check_and_push(context, code[i], VM_MALLOC_BLK);
+            check_and_push_malloc_block(context, code[i]);
             JVM_GetMethodIxByteCode(context->env, cb, i, code[i]);
         } else {
             code[i] = NULL;
@@ -1305,7 +1306,7 @@ verify_opcode_operands(context_type *context, unsigned int inumber, int offset)
         /* Make sure the constant pool item is the right type. */
         verify_constant_pool_type(context, key, kind);
         methodname = JVM_GetCPMethodNameUTF(env, cb, key);
-        check_and_push(context, methodname, VM_STRING_UTF);
+        check_and_push_string_utf(context, methodname);
         is_constructor = !strcmp(methodname, "<init>");
         is_internal = methodname[0] == '<';
         pop_and_free(context);
@@ -1354,7 +1355,7 @@ verify_opcode_operands(context_type *context, unsigned int inumber, int offset)
             unsigned int args2;
             const char *signature =
                 JVM_GetCPMethodSignatureUTF(env, context->class, key);
-            check_and_push(context, signature, VM_STRING_UTF);
+            check_and_push_string_utf(context, signature);
             args1 = signature_to_args_size(signature) + 1;
             args2 = code[offset + 3];
             if (args1 != args2) {
@@ -1652,7 +1653,7 @@ initialize_exception_table(context_type *context)
             classname = JVM_GetCPClassNameUTF(env,
                                               context->class,
                                               einfo.catchType);
-            check_and_push(context, classname, VM_STRING_UTF);
+            check_and_push_string_utf(context, classname);
             stack_item->item = make_class_info_from_name(context, classname);
             if (!isAssignableTo(context,
                                 stack_item->item,
@@ -1807,7 +1808,7 @@ initialize_dataflow(context_type *context)
         }
     }
     signature = JVM_GetMethodIxSignatureUTF(env, cb, mi);
-    check_and_push(context, signature, VM_STRING_UTF);
+    check_and_push_string_utf(context, signature);
     /* Fill in each of the arguments into the registers. */
     for (p = signature + 1; *p != JVM_SIGNATURE_ENDFUNC; ) {
         char fieldchar = signature_to_fieldtype(context, &p, &full_info);
@@ -2050,7 +2051,7 @@ pop_stack(context_type *context, unsigned int inumber, stack_info_type *new_stac
                                            context->class,
                                            operand);
             char *ip = buffer;
-            check_and_push(context, signature, VM_STRING_UTF);
+            check_and_push_string_utf(context, signature);
 #ifdef DEBUG
             if (verify_verbose) {
                 print_formatted_fieldname(context, operand);
@@ -2076,7 +2077,7 @@ pop_stack(context_type *context, unsigned int inumber, stack_info_type *new_stac
                                             operand);
             char *ip = buffer;
             const char *p;
-            check_and_push(context, signature, VM_STRING_UTF);
+            check_and_push_string_utf(context, signature);
 #ifdef DEBUG
             if (verify_verbose) {
                 print_formatted_methodname(context, operand);
@@ -2376,7 +2377,7 @@ pop_stack(context_type *context, unsigned int inumber, stack_info_type *new_stac
                                             operand);
             int item;
             const char *p;
-            check_and_push(context, signature, VM_STRING_UTF);
+            check_and_push_string_utf(context, signature);
             if (opcode == JVM_OPC_invokestatic) {
                 item = 0;
             } else if (opcode == JVM_OPC_invokeinit) {
@@ -2758,7 +2759,7 @@ push_stack(context_type *context, unsigned int inumber, stack_info_type *new_sta
             const char *signature = JVM_GetCPFieldSignatureUTF(context->env,
                                                                context->class,
                                                                operand);
-            check_and_push(context, signature, VM_STRING_UTF);
+            check_and_push_string_utf(context, signature);
 #ifdef DEBUG
             if (verify_verbose) {
                 print_formatted_fieldname(context, operand);
@@ -2780,7 +2781,7 @@ push_stack(context_type *context, unsigned int inumber, stack_info_type *new_sta
                                                                 context->class,
                                                                 operand);
             const char *result_signature;
-            check_and_push(context, signature, VM_STRING_UTF);
+            check_and_push_string_utf(context, signature);
             result_signature = get_result_signature(signature);
             if (result_signature++ == NULL) {
                 CCerror(context, "Illegal signature %s", signature);
@@ -3621,7 +3622,7 @@ cp_index_to_class_fullinfo(context_type *context, int cp_index, int kind)
         CCerror(context, "Internal error #5");
     }
 
-    check_and_push(context, classname, VM_STRING_UTF);
+    check_and_push_string_utf(context, classname);
     if (classname[0] == JVM_SIGNATURE_ARRAY) {
         /* This make recursively call us, in case of a class array */
         signature_to_fieldtype(context, &classname, &result);
@@ -3822,8 +3823,8 @@ signature_to_fieldtype(context_type *context,
                 assert(finish >= p);
                 length = (int)(finish - p);
                 if (length + 1 > (int)sizeof(buffer_space)) {
-                    buffer = calloc(length + 1, sizeof(char));
-                    check_and_push(context, buffer, VM_MALLOC_BLK);
+                    buffer = malloc(length + 1);
+                    check_and_push_malloc_block(context, buffer);
                 }
                 memcpy(buffer, p, length);
                 buffer[length] = '\0';
@@ -4142,7 +4143,7 @@ static void free_block(void *ptr, int kind)
     }
 }
 
-static void check_and_push(context_type *context, const void *ptr, int kind)
+static void check_and_push_common(context_type *context, void *ptr, int kind)
 {
     alloc_stack_type *p;
     if (ptr == 0)
@@ -4154,16 +4155,24 @@ static void check_and_push(context_type *context, const void *ptr, int kind)
         p = malloc(sizeof(alloc_stack_type));
         if (p == 0) {
             /* Make sure we clean up. */
-            free_block((void *)ptr, kind);
+            free_block(ptr, kind);
             CCout_of_memory(context);
         }
     }
     p->kind = kind;
-    p->ptr = (void *)ptr;
+    p->ptr = ptr;
     p->next = context->allocated_memory;
     context->allocated_memory = p;
 }
 
+static void check_and_push_malloc_block(context_type *context, void *ptr) {
+  check_and_push_common(context, ptr, VM_MALLOC_BLK);
+}
+
+static void check_and_push_string_utf(context_type *context, const char *ptr) {
+  check_and_push_common(context, (void *)ptr, VM_STRING_UTF);
+}
+
 static void pop_and_free(context_type *context)
 {
     alloc_stack_type *p = context->allocated_memory;
-- 
GitLab


From 8384ac4ed3eaaa18998ab88e1ca36358c212e699 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Fri, 18 Mar 2022 22:01:27 +0000
Subject: [PATCH 127/345] 8283057: Update GCC to version 11.2 for Oracle builds
 on Linux

Reviewed-by: erikj
---
 doc/building.html         |  4 ++--
 doc/building.md           |  4 ++--
 make/conf/jib-profiles.js |  4 ++--
 make/devkit/Tools.gmk     | 13 +++++++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index 09ea7dc7f72..66e07f07b9d 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -273,7 +273,7 @@
 <tbody>
 <tr class="odd">
 <td style="text-align: left;">Linux</td>
-<td style="text-align: left;">gcc 10.2.0</td>
+<td style="text-align: left;">gcc 11.2.0</td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">macOS</td>
@@ -288,7 +288,7 @@
 <p>All compilers are expected to be able to compile to the C99 language standard, as some C99 features are used in the source code. Microsoft Visual Studio doesn't fully support C99 so in practice shared code is limited to using C99 features that it does support.</p>
 <h3 id="gcc">gcc</h3>
 <p>The minimum accepted version of gcc is 5.0. Older versions will generate a warning by <code>configure</code> and are unlikely to work.</p>
-<p>The JDK is currently known to be able to compile with at least version 10.2 of gcc.</p>
+<p>The JDK is currently known to be able to compile with at least version 11.2 of gcc.</p>
 <p>In general, any version between these two should be usable.</p>
 <h3 id="clang">clang</h3>
 <p>The minimum accepted version of clang is 3.5. Older versions will not be accepted by <code>configure</code>.</p>
diff --git a/doc/building.md b/doc/building.md
index e83c2bada21..6bc5857811e 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -329,7 +329,7 @@ issues.
 
  Operating system   Toolchain version
  ------------------ -------------------------------------------------------
- Linux              gcc 10.2.0
+ Linux              gcc 11.2.0
  macOS              Apple Xcode 10.1 (using clang 10.0.0)
  Windows            Microsoft Visual Studio 2019 update 16.7.2
 
@@ -343,7 +343,7 @@ features that it does support.
 The minimum accepted version of gcc is 5.0. Older versions will generate a warning
 by `configure` and are unlikely to work.
 
-The JDK is currently known to be able to compile with at least version 10.2 of
+The JDK is currently known to be able to compile with at least version 11.2 of
 gcc.
 
 In general, any version between these two should be usable.
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 137d7cc7bb2..f16d7fd12e7 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1052,10 +1052,10 @@ var getJibProfilesProfiles = function (input, common, data) {
 var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
-        linux_x64: "gcc10.3.0-OL6.4+1.0",
+        linux_x64: "gcc11.2.0-OL6.4+1.0",
         macosx: "Xcode12.4+1.0",
         windows_x64: "VS2019-16.9.3+1.0",
-        linux_aarch64: "gcc10.3.0-OL7.6+1.0",
+        linux_aarch64: "gcc11.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
         linux_s390x: "gcc8.2.0-Fedora27+1.0"
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
index 19eccf89be2..e94a74d0063 100644
--- a/make/devkit/Tools.gmk
+++ b/make/devkit/Tools.gmk
@@ -87,8 +87,17 @@ endif
 # Define external dependencies
 
 # Latest that could be made to work.
-GCC_VER := 10.3.0
-ifeq ($(GCC_VER), 10.3.0)
+GCC_VER := 11.2.0
+ifeq ($(GCC_VER), 11.2.0)
+  gcc_ver := gcc-11.2.0
+  binutils_ver := binutils-2.37
+  ccache_ver := ccache-3.7.12
+  mpfr_ver := mpfr-4.1.0
+  gmp_ver := gmp-6.2.1
+  mpc_ver := mpc-1.2.1
+  gdb_ver := gdb-11.1
+  REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
+else ifeq ($(GCC_VER), 10.3.0)
   gcc_ver := gcc-10.3.0
   binutils_ver := binutils-2.36.1
   ccache_ver := ccache-3.7.11
-- 
GitLab


From 0c3094c8186b4d53e8bad80e2369fc7b9ae9e201 Mon Sep 17 00:00:00 2001
From: Ichiroh Takiguchi <itakiguchi@openjdk.org>
Date: Sat, 19 Mar 2022 04:43:20 +0000
Subject: [PATCH 128/345] 8204541: Correctly support AIX xlC 16.1 symbol
 visibility flags

Reviewed-by: ihse, stuefe
---
 make/autoconf/flags-ldflags.m4         | 2 +-
 make/common/modules/LauncherCommon.gmk | 5 +++--
 make/common/modules/LibCommon.gmk      | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index 8f77734c93c..457690ac391 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -77,7 +77,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
         -fPIC"
 
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
-    BASIC_LDFLAGS="-b64 -brtl -bnorwexec -bnolibpath -bexpall -bernotok -btextpsize:64K \
+    BASIC_LDFLAGS="-b64 -brtl -bnorwexec -bnolibpath -bnoexpall -bernotok -btextpsize:64K \
         -bdatapsize:64K -bstackpsize:64K"
     # libjvm.so has gotten too large for normal TOC size; compile with qpic=large and link with bigtoc
     BASIC_LDFLAGS_JVM_ONLY="-Wl,-lC_r -bbigtoc"
diff --git a/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk
index 7ad0375e2e3..85056bbe40f 100644
--- a/make/common/modules/LauncherCommon.gmk
+++ b/make/common/modules/LauncherCommon.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,13 +33,14 @@ include ToolsJdk.gmk
 # On Mac, we have always exported all symbols, probably due to oversight
 # and/or misunderstanding. To emulate this, don't hide any symbols
 # by default.
-# On AIX/xlc we need at least xlc 13.1 for the symbol hiding (see JDK-8214063)
 # Also provide an override for non-conformant libraries.
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   LAUNCHER_CFLAGS += -fvisibility=hidden
   LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL
 else ifeq ($(TOOLCHAIN_TYPE), clang)
   LAUNCHER_CFLAGS += -fvisibility=hidden
+else ifeq ($(TOOLCHAIN_TYPE), xlc)
+  LAUNCHER_CFLAGS += -qvisibility=hidden
 endif
 
 LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
diff --git a/make/common/modules/LibCommon.gmk b/make/common/modules/LibCommon.gmk
index 8ca3ddfffe9..aa5c9f0a5c6 100644
--- a/make/common/modules/LibCommon.gmk
+++ b/make/common/modules/LibCommon.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@ WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
 # On Mac, we have always exported all symbols, probably due to oversight
 # and/or misunderstanding. To emulate this, don't hide any symbols
 # by default.
-# On AIX/xlc we need at least xlc 13.1 for the symbol hiding (see JDK-8214063)
 # Also provide an override for non-conformant libraries.
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   CFLAGS_JDKLIB += -fvisibility=hidden
@@ -47,6 +46,10 @@ else ifeq ($(TOOLCHAIN_TYPE), clang)
   CFLAGS_JDKLIB += -fvisibility=hidden
   CXXFLAGS_JDKLIB += -fvisibility=hidden
   EXPORT_ALL_SYMBOLS := -fvisibility=default
+else ifeq ($(TOOLCHAIN_TYPE), xlc)
+  CFLAGS_JDKLIB += -qvisibility=hidden
+  CXXFLAGS_JDKLIB += -qvisibility=hidden
+  EXPORT_ALL_SYMBOLS := -qvisibility=default
 endif
 
 # Put the libraries here.
-- 
GitLab


From 3e58a438e9051d4c976273eea35e36d37d5428c3 Mon Sep 17 00:00:00 2001
From: Tyler Steele <tyler.steele@ibm.com>
Date: Sat, 19 Mar 2022 07:06:47 +0000
Subject: [PATCH 129/345] 8283287: ClassLoader.c cleanups

Reviewed-by: stuefe, alanb, rriggs
---
 .../share/native/libjava/ClassLoader.c        | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/java.base/share/native/libjava/ClassLoader.c b/src/java.base/share/native/libjava/ClassLoader.c
index da34a7b438b..301f068070b 100644
--- a/src/java.base/share/native/libjava/ClassLoader.c
+++ b/src/java.base/share/native/libjava/ClassLoader.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,16 @@
  * questions.
  */
 
-#include <stdlib.h>
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "check_classname.h"
+#include "java_lang_ClassLoader.h"
+#include "jlong.h"
 #include "jni.h"
 #include "jni_util.h"
-#include "jlong.h"
 #include "jvm.h"
-#include "check_classname.h"
-#include "java_lang_ClassLoader.h"
-#include <string.h>
 
 static JNINativeMethod methods[] = {
     {"retrieveDirectives",  "()Ljava/lang/AssertionStatusDirectives;", (void *)&JVM_AssertionStatusDirectives}
@@ -88,7 +88,7 @@ Java_java_lang_ClassLoader_defineClass1(JNIEnv *env,
 
     if (data == NULL) {
         JNU_ThrowNullPointerException(env, 0);
-        return 0;
+        return NULL;
     }
 
     /* Work around 4153825. malloc crashes on Solaris when passed a
@@ -96,25 +96,27 @@ Java_java_lang_ClassLoader_defineClass1(JNIEnv *env,
      */
     if (length < 0) {
         JNU_ThrowArrayIndexOutOfBoundsException(env, 0);
-        return 0;
+        return NULL;
     }
 
-    // On AIX malloc(0) returns NULL which looks like an out-of-memory condition; so adjust it to malloc(1)
+    // On AIX malloc(0) returns NULL which looks like an out-of-memory
+    // condition; so adjust it to malloc(1)
     #ifdef _AIX
-    body = (jbyte *)malloc(length == 0 ? 1 : length);
+        body = (jbyte *)malloc(length == 0 ? 1 : length);
     #else
-    body = (jbyte *)malloc(length);
+        body = (jbyte *)malloc(length);
     #endif
 
-    if (body == 0) {
+    if (body == NULL) {
         JNU_ThrowOutOfMemoryError(env, 0);
-        return 0;
+        return NULL;
     }
 
     (*env)->GetByteArrayRegion(env, data, offset, length, body);
 
-    if ((*env)->ExceptionOccurred(env))
+    if ((*env)->ExceptionOccurred(env)) {
         goto free_body;
+    }
 
     if (name != NULL) {
         utfName = getUTF(env, name, buf, sizeof(buf));
@@ -173,9 +175,9 @@ Java_java_lang_ClassLoader_defineClass2(JNIEnv *env,
 
     body = (*env)->GetDirectBufferAddress(env, data);
 
-    if (body == 0) {
+    if (body == NULL) {
         JNU_ThrowNullPointerException(env, 0);
-        return 0;
+        return NULL;
     }
 
     body += offset;
@@ -233,7 +235,7 @@ Java_java_lang_ClassLoader_defineClass0(JNIEnv *env,
 
     if (data == NULL) {
         JNU_ThrowNullPointerException(env, 0);
-        return 0;
+        return NULL;
     }
 
     /* Work around 4153825. malloc crashes on Solaris when passed a
@@ -241,19 +243,20 @@ Java_java_lang_ClassLoader_defineClass0(JNIEnv *env,
      */
     if (length < 0) {
         JNU_ThrowArrayIndexOutOfBoundsException(env, 0);
-        return 0;
+        return NULL;
     }
 
-    // On AIX malloc(0) returns NULL which looks like an out-of-memory condition; so adjust it to malloc(1)
+    // On AIX malloc(0) returns NULL which looks like an out-of-memory
+    // condition; so adjust it to malloc(1)
     #ifdef _AIX
-    body = (jbyte *)malloc(length == 0 ? 1 : length);
+        body = (jbyte *)malloc(length == 0 ? 1 : length);
     #else
-    body = (jbyte *)malloc(length);
+        body = (jbyte *)malloc(length);
     #endif
 
-    if (body == 0) {
+    if (body == NULL) {
         JNU_ThrowOutOfMemoryError(env, 0);
-        return 0;
+        return NULL;
     }
 
     (*env)->GetByteArrayRegion(env, data, offset, length, body);
@@ -293,7 +296,7 @@ Java_java_lang_ClassLoader_findBootstrapClass(JNIEnv *env, jclass dummy,
     char buf[128];
 
     if (classname == NULL) {
-        return 0;
+        return NULL;
     }
 
     clname = getUTF(env, classname, buf, sizeof(buf));
@@ -322,7 +325,7 @@ Java_java_lang_ClassLoader_findLoadedClass0(JNIEnv *env, jobject loader,
                                            jstring name)
 {
     if (name == NULL) {
-        return 0;
+        return NULL;
     } else {
         return JVM_FindLoadedClass(env, loader, name);
     }
-- 
GitLab


From 10ccfffae1f18dd1a3d2f3dca53ad547d3d3ecb5 Mon Sep 17 00:00:00 2001
From: Jie Fu <jiefu@openjdk.org>
Date: Sat, 19 Mar 2022 07:08:47 +0000
Subject: [PATCH 130/345] 8283352: [CDS] SharedBaseAddress.java fails on x86_32

Reviewed-by: dholmes, iklam, stuefe
---
 .../jtreg/runtime/cds/SharedBaseAddress.java  | 32 +++++++++++++------
 .../runtime/cds/appcds/SharedBaseAddress.java | 26 +++++++++++----
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java b/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java
index 761b5a05d29..a7f31cf1a08 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,26 +70,31 @@ import jdk.test.lib.process.OutputAnalyzer;
 
 public class SharedBaseAddress {
 
-    // shared base address test table
-    private static final String[] testTable = {
-        "1g", "8g", "64g","512g", "4t",
-        "32t", "128t", "0",
+    // shared base address test table for {32, 64}bit VM
+    private static final String[] testTableShared = {
+        "1g", "0",
         "1", "64k", "64M",
+        "0xfff80000",         // archive top wraps around 32-bit address space
+        "0xffffffff",         // archive bottom wraps around 32-bit address space -- due to align_up()
+        "0"                   // always let OS pick the base address at runtime (ASLR for CDS archive)
+    };
+
+    // shared base address test table for 64bit VM only
+    private static final String[] testTable64 = {
+        "8g", "64g","512g", "4t",
+        "32t", "128t",
         "0x800001000",        // Default base address + 1 page - probably valid but unaligned to metaspace alignment, see JDK 8247522
         "0xfffffffffff00000", // archive top wraps around 64-bit address space
-        "0xfff80000",         // archive top wraps around 32-bit address space
         "0xffffffffffffffff", // archive bottom wraps around 64-bit address space -- due to align_up()
-        "0xffffffff",         // archive bottom wraps around 32-bit address space -- due to align_up()
         "0x00007ffffff00000", // end of archive will go past the end of user space on linux/x64
-        "0x500000000",        // (20g) below 32g at a 4g aligned address, but cannot be expressed with a logical
+        "0x500000000"         // (20g) below 32g at a 4g aligned address, but cannot be expressed with a logical
                               //    immediate on aarch64 (0x5_0000_0000) (see JDK-8265705)
-        "0",                  // always let OS pick the base address at runtime (ASLR for CDS archive)
     };
 
     // failed pattern
     private static String failedPattern = "os::release_memory\\(0x[0-9a-fA-F]*,\\s[0-9]*\\)\\sfailed";
 
-    public static void main(String[] args) throws Exception {
+    public static void test(String[] args, String[] testTable) throws Exception {
         int mid = testTable.length / 2;
         int start = args[0].equals("0") ? 0 : mid;
         int end   = args[0].equals("0") ? mid : testTable.length;
@@ -134,4 +139,11 @@ public class SharedBaseAddress {
             }
         }
     }
+
+    public static void main(String[] args) throws Exception {
+        test(args, testTableShared);
+        if (Platform.is64bit()) {
+            test(args, testTable64);
+        }
+    }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java b/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java
index 5d981c01794..2220fc52baa 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,19 +33,24 @@
  * @run main/timeout=240 SharedBaseAddress
  */
 
+import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 
 public class SharedBaseAddress {
 
-    // shared base address test table
-    private static final String[] testTable = {
-        "1g", "8g", "64g","512g", "4t",
-        "32t", "128t", "0",
-        "1", "64k", "64M", "320g",
+    // shared base address test table for {32, 64}bit VM
+    private static final String[] testTableShared = {
+        "1g", "0", "1", "64k", "64M"
+    };
+
+    // shared base address test table for 64bit VM only
+    private static final String[] testTable64 = {
+        "8g", "64g","512g", "4t",
+        "32t", "128t", "320g",
         "0x800001000"  // Default base address + 1 page - probably valid but unaligned to metaspace alignment, see JDK 8247522
     };
 
-    public static void main(String[] args) throws Exception {
+    public static void test(String[] testTable) throws Exception {
         String appJar = JarBuilder.getOrCreateHelloJar();
 
         for (String testEntry : testTable) {
@@ -62,4 +67,11 @@ public class SharedBaseAddress {
             TestCommon.checkExec(execOutput, "Hello World");
         }
     }
+
+    public static void main(String[] args) throws Exception {
+        test(testTableShared);
+        if (Platform.is64bit()) {
+            test(testTable64);
+        }
+    }
 }
-- 
GitLab


From e8caf84fb9dfcbb59da6459972724b6780b0871a Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Sat, 19 Mar 2022 13:29:49 +0000
Subject: [PATCH 131/345] 8282574: Cleanup unnecessary calls to
 Throwable.initCause() in jdk.compiler

Reviewed-by: darcy
---
 .../tools/javac/processing/JavacProcessingEnvironment.java | 7 ++-----
 .../share/classes/com/sun/tools/javac/tree/Pretty.java     | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index 9dd94f74252..9174f0b7385 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -300,10 +300,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
             try {
                 processorIterator = List.of(new PrintingProcessor()).iterator();
             } catch (Throwable t) {
-                AssertionError assertError =
-                    new AssertionError("Problem instantiating PrintingProcessor.");
-                assertError.initCause(t);
-                throw assertError;
+                throw new AssertionError("Problem instantiating PrintingProcessor.", t);
             }
         } else if (processors != null) {
             processorIterator = processors.iterator();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
index acccd4d574c..bdfef06fd7c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -194,9 +194,7 @@ public class Pretty extends JCTree.Visitor {
                 tree.accept(this);
             }
         } catch (UncheckedIOException ex) {
-            IOException e = new IOException(ex.getMessage());
-            e.initCause(ex);
-            throw e;
+            throw new IOException(ex.getMessage(), ex);
         } finally {
             this.prec = prevPrec;
         }
-- 
GitLab


From 80415e04c5fd6709e7e5b5ffb7a3d9431b672d99 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Sat, 19 Mar 2022 13:31:50 +0000
Subject: [PATCH 132/345] 8282534: Remove redundant null check in
 ChaCha20Cipher.engineInit

Reviewed-by: xuelei
---
 .../com/sun/crypto/provider/ChaCha20Cipher.java      | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
index 8cb200876ac..917921801cb 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -159,7 +159,7 @@ abstract class ChaCha20Cipher extends CipherSpi {
      * ciphers, but allow {@code NoPadding}.  See JCE spec.
      *
      * @param padding The padding type.  The only allowed value is
-     *      {@code NoPadding} case insensitive).
+     *      {@code NoPadding} case insensitive.
      *
      * @throws NoSuchPaddingException if a padding scheme besides
      *      {@code NoPadding} is provided.
@@ -393,7 +393,7 @@ abstract class ChaCha20Cipher extends CipherSpi {
             return;
         }
 
-        byte[] newNonce = null;
+        byte[] newNonce;
         switch (mode) {
             case MODE_NONE:
                 throw new InvalidAlgorithmParameterException(
@@ -420,12 +420,6 @@ abstract class ChaCha20Cipher extends CipherSpi {
                 throw new RuntimeException("Invalid mode: " + mode);
         }
 
-        // If after all the above processing we still don't have a nonce value
-        // then supply a random one provided a random source has been given.
-        if (newNonce == null) {
-            newNonce = createRandomNonce(random);
-        }
-
         // Continue with initialization
         init(opmode, key, newNonce);
     }
-- 
GitLab


From 3f923b82c31325504430b50dee262fd460004e7b Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Sat, 19 Mar 2022 13:43:06 +0000
Subject: [PATCH 133/345] 8282704: runtime/Thread/StopAtExit.java may leak
 memory

Reviewed-by: dholmes, alanb
---
 .../jtreg/runtime/Thread/StopAtExit.java      | 69 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/Thread/StopAtExit.java b/test/hotspot/jtreg/runtime/Thread/StopAtExit.java
index 22550093202..b997890e347 100644
--- a/test/hotspot/jtreg/runtime/Thread/StopAtExit.java
+++ b/test/hotspot/jtreg/runtime/Thread/StopAtExit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,13 @@
 
 /**
  * @test
- * @bug 8167108 8266130
+ * @bug 8167108 8266130 8282704
  * @summary Stress test java.lang.Thread.stop() at thread exit.
+ * @modules java.base/java.lang:open
  * @run main/othervm StopAtExit
  */
 
+import java.lang.reflect.Method;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -38,6 +40,10 @@ public class StopAtExit extends Thread {
     public CountDownLatch exitSyncObj = new CountDownLatch(1);
     public CountDownLatch startSyncObj = new CountDownLatch(1);
 
+    public StopAtExit(ThreadGroup group, Runnable target) {
+        super(group, target);
+    }
+
     @Override
     public void run() {
         try {
@@ -72,11 +78,18 @@ public class StopAtExit extends Thread {
         System.out.println("About to execute for " + timeMax + " seconds.");
 
         long count = 0;
+        long manualDestroyCnt = 0;
+        long manualTerminateCnt = 0;
         long start_time = System.currentTimeMillis();
         while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
             count++;
 
-            StopAtExit thread = new StopAtExit();
+            // Use my own ThreadGroup so the thread count is known and make
+            // it a daemon ThreadGroup so it is automatically destroyed when
+            // the thread is terminated.
+            ThreadGroup myTG = new ThreadGroup("myTG-" + count);
+            myTG.setDaemon(true);
+            StopAtExit thread = new StopAtExit(myTG, null);
             thread.start();
             try {
                 // Wait for the worker thread to get going.
@@ -107,9 +120,52 @@ public class StopAtExit extends Thread {
             } catch (InterruptedException e) {
                 throw new Error("Unexpected: " + e);
             }
+            // This stop() call happens after the join() so it should do
+            // nothing, but let's make sure.
             thread.stop();
+
+            if (myTG.activeCount() != 0) {
+                // If the ThreadGroup still has a count, then the thread
+                // received the async exception while in exit() so we need
+                // to do a manual terminate.
+                manualTerminateCnt++;
+                try {
+                    threadTerminated(myTG, thread);
+                } catch (Exception e) {
+                    throw new Error("threadTerminated() threw unexpected: " + e);
+                }
+                int activeCount = myTG.activeCount();
+                if (activeCount != 0) {
+                    throw new Error("threadTerminated() did not clean up " +
+                                    "worker thread: count=" + activeCount);
+                }
+                if (!myTG.isDestroyed()) {
+                    throw new Error("threadTerminated() did not destroy " +
+                                    myTG.getName());
+                }
+            } else if (!myTG.isDestroyed()) {
+                // If the ThreadGroup does not have a count, but is not
+                // yet destroyed, then the thread received the async
+                // exception while the thread was in the later stages of
+                // its threadTerminated() call so we need to do a manual
+                // destroy.
+                manualDestroyCnt++;
+                try {
+                    myTG.destroy();
+                } catch (Exception e) {
+                    throw new Error("myTG.destroy() threw unexpected: " + e);
+                }
+            }
         }
 
+        if (manualDestroyCnt != 0) {
+            System.out.println("Manually destroyed ThreadGroup " +
+                               manualDestroyCnt + " times.");
+        }
+        if (manualTerminateCnt != 0) {
+            System.out.println("Manually terminated Thread " +
+                               manualTerminateCnt + " times.");
+        }
         System.out.println("Executed " + count + " loops in " + timeMax +
                            " seconds.");
 
@@ -120,6 +176,13 @@ public class StopAtExit extends Thread {
         }
     }
 
+    static void threadTerminated(ThreadGroup group, Thread thread) throws Exception {
+        // ThreadGroup.threadTerminated() is package private:
+        Method method = ThreadGroup.class.getDeclaredMethod("threadTerminated", Thread.class);
+        method.setAccessible(true);
+        method.invoke(group, thread);
+    }
+
     public static void usage() {
         System.err.println("Usage: " + PROG_NAME + " [time_max]");
         System.err.println("where:");
-- 
GitLab


From 4df67426ed02f18af0757897acb28b636a317a91 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Sun, 20 Mar 2022 06:46:13 +0000
Subject: [PATCH 134/345] 8282723: Add constructors taking a cause to JSSE
 exceptions

Reviewed-by: wetmore, iris
---
 .../classes/javax/net/ssl/SSLException.java   | 15 ++----
 .../javax/net/ssl/SSLHandshakeException.java  | 27 +++++++---
 .../javax/net/ssl/SSLKeyException.java        | 25 +++++++---
 .../net/ssl/SSLPeerUnverifiedException.java   | 25 +++++++---
 .../javax/net/ssl/SSLProtocolException.java   | 25 +++++++---
 .../share/classes/sun/security/ssl/Alert.java | 17 ++-----
 .../sun/security/ssl/DHClientKeyExchange.java |  6 +--
 .../sun/security/ssl/ECDHKeyExchange.java     | 12 ++---
 .../sun/security/ssl/KAKeyDerivation.java     |  8 ++-
 .../sun/security/ssl/NewSessionTicket.java    |  5 +-
 .../security/ssl/SSLBasicKeyDerivation.java   |  5 +-
 .../sun/security/ssl/SSLEngineImpl.java       | 14 ++----
 .../security/ssl/SSLEngineInputRecord.java    |  5 +-
 .../sun/security/ssl/SSLSecretDerivation.java |  5 +-
 .../sun/security/ssl/SSLSocketImpl.java       | 16 ++----
 .../security/ssl/SSLSocketInputRecord.java    |  5 +-
 .../security/ssl/SSLTrafficKeyDerivation.java |  6 +--
 .../classes/sun/security/ssl/ServerHello.java |  5 +-
 .../sun/security/ssl/ServerNameExtension.java | 12 ++---
 .../jndi/ldap/ext/StartTlsResponseImpl.java   |  7 ++-
 .../jdk/internal/net/http/HttpClientImpl.java |  6 +--
 .../jdk/internal/net/http/common/SSLTube.java |  6 +--
 .../net/ssl/ALPN/SSLServerSocketAlpnTest.java |  4 +-
 .../javax/net/ssl/ALPN/SSLSocketAlpnTest.java |  4 +-
 .../CheckSSLHandshakeException.java           | 50 +++++++++++++++++++
 .../SSLException/CheckSSLKeyException.java    | 50 +++++++++++++++++++
 .../CheckSSLPeerUnverifiedException.java      | 50 +++++++++++++++++++
 .../CheckSSLProtocolException.java            | 50 +++++++++++++++++++
 .../templates/SSLSocketSSLEngineTemplate.java |  6 +--
 .../net/ssl/templates/SSLSocketTemplate.java  |  4 +-
 30 files changed, 343 insertions(+), 132 deletions(-)
 create mode 100644 test/jdk/javax/net/ssl/SSLException/CheckSSLHandshakeException.java
 create mode 100644 test/jdk/javax/net/ssl/SSLException/CheckSSLKeyException.java
 create mode 100644 test/jdk/javax/net/ssl/SSLException/CheckSSLPeerUnverifiedException.java
 create mode 100644 test/jdk/javax/net/ssl/SSLException/CheckSSLProtocolException.java

diff --git a/src/java.base/share/classes/javax/net/ssl/SSLException.java b/src/java.base/share/classes/javax/net/ssl/SSLException.java
index c77992db301..b2e96afa7d6 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLException.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,7 @@ import java.io.IOException;
  * @since 1.4
  * @author David Brownell
  */
-public
-class SSLException extends IOException
-{
+public class SSLException extends IOException {
     @java.io.Serial
     private static final long serialVersionUID = 4511006460650708967L;
 
@@ -48,8 +46,7 @@ class SSLException extends IOException
      *
      * @param reason describes the problem.
      */
-    public SSLException(String reason)
-    {
+    public SSLException(String reason) {
         super(reason);
     }
 
@@ -66,8 +63,7 @@ class SSLException extends IOException
      * @since 1.5
      */
     public SSLException(String message, Throwable cause) {
-        super(message);
-        initCause(cause);
+        super(message, cause);
     }
 
     /**
@@ -83,7 +79,6 @@ class SSLException extends IOException
      * @since 1.5
      */
     public SSLException(Throwable cause) {
-        super(cause == null ? null : cause.toString());
-        initCause(cause);
+        super(cause);
     }
 }
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java b/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java
index 5f342b074db..e6fa239bdcb 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,8 @@
  * questions.
  */
 
-
 package javax.net.ssl;
 
-
 /**
  * Indicates that the client and server could not negotiate the
  * desired level of security.  The connection is no longer usable.
@@ -34,9 +32,7 @@ package javax.net.ssl;
  * @since 1.4
  * @author David Brownell
  */
-public
-class SSLHandshakeException extends SSLException
-{
+public class SSLHandshakeException extends SSLException {
     @java.io.Serial
     private static final long serialVersionUID = -5045881315018326890L;
 
@@ -46,8 +42,23 @@ class SSLHandshakeException extends SSLException
      *
      * @param reason describes the problem.
      */
-    public SSLHandshakeException(String reason)
-    {
+    public SSLHandshakeException(String reason) {
         super(reason);
     }
+
+    /**
+     * Creates a {@code SSLHandshakeException} with the specified detail
+     * message and cause.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *        by the {@link #getMessage()} method).
+     * @param cause the cause (which is saved for later retrieval by the
+     *        {@link #getCause()} method).  (A {@code null} value is
+     *        permitted, and indicates that the cause is nonexistent or
+     *        unknown.)
+     * @since 19
+     */
+    public SSLHandshakeException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java b/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java
index 49fe57c369d..f27c9ee554c 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLKeyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,7 @@ package javax.net.ssl;
  * @since 1.4
  * @author David Brownell
  */
-public
-class SSLKeyException extends SSLException
-{
+public class SSLKeyException extends SSLException {
     @java.io.Serial
     private static final long serialVersionUID = -8071664081941937874L;
 
@@ -45,8 +43,23 @@ class SSLKeyException extends SSLException
      *
      * @param reason describes the problem.
      */
-    public SSLKeyException(String reason)
-    {
+    public SSLKeyException(String reason) {
         super(reason);
     }
+
+    /**
+     * Creates a {@code SSLKeyException} with the specified detail
+     * message and cause.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *        by the {@link #getMessage()} method).
+     * @param cause the cause (which is saved for later retrieval by the
+     *        {@link #getCause()} method).  (A {@code null} value is
+     *        permitted, and indicates that the cause is nonexistent or
+     *        unknown.)
+     * @since 19
+     */
+    public SSLKeyException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java b/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
index e98e2b4b7f4..3fbec6c0434 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,7 @@ package javax.net.ssl;
  * @since 1.4
  * @author David Brownell
  */
-public
-class SSLPeerUnverifiedException extends SSLException
-{
+public class SSLPeerUnverifiedException extends SSLException {
     @java.io.Serial
     private static final long serialVersionUID = -8919512675000600547L;
 
@@ -51,8 +49,23 @@ class SSLPeerUnverifiedException extends SSLException
      *
      * @param reason describes the problem.
      */
-    public SSLPeerUnverifiedException(String reason)
-    {
+    public SSLPeerUnverifiedException(String reason) {
         super(reason);
     }
+
+    /**
+     * Creates a {@code SSLPeerUnverifiedException} with the specified detail
+     * message and cause.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *        by the {@link #getMessage()} method).
+     * @param cause the cause (which is saved for later retrieval by the
+     *        {@link #getCause()} method).  (A {@code null} value is
+     *        permitted, and indicates that the cause is nonexistent or
+     *        unknown.)
+     * @since 19
+     */
+    public SSLPeerUnverifiedException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java b/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java
index a39b2048924..bf590430b3f 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,7 @@ package javax.net.ssl;
  * @since 1.4
  * @author David Brownell
  */
-public
-class SSLProtocolException extends SSLException
-{
+public class SSLProtocolException extends SSLException {
     @java.io.Serial
     private static final long serialVersionUID = 5445067063799134928L;
 
@@ -45,8 +43,23 @@ class SSLProtocolException extends SSLException
      *
      * @param reason describes the problem.
      */
-    public SSLProtocolException(String reason)
-    {
+    public SSLProtocolException(String reason) {
         super(reason);
     }
+
+    /**
+     * Creates a {@code SSLProtocolException} with the specified detail
+     * message and cause.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *        by the {@link #getMessage()} method).
+     * @param cause the cause (which is saved for later retrieval by the
+     *        {@link #getCause()} method).  (A {@code null} value is
+     *        permitted, and indicates that the cause is nonexistent or
+     *        unknown.)
+     * @since 19
+     */
+    public SSLProtocolException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/Alert.java b/src/java.base/share/classes/sun/security/ssl/Alert.java
index bc034dc8c3b..922937887aa 100644
--- a/src/java.base/share/classes/sun/security/ssl/Alert.java
+++ b/src/java.base/share/classes/sun/security/ssl/Alert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,22 +122,15 @@ enum Alert {
             reason = (cause != null) ? cause.getMessage() : "";
         }
 
-        SSLException ssle;
         if (cause instanceof IOException) {
-            ssle = new SSLException(reason);
+            return new SSLException(reason, cause);
         } else if ((this == UNEXPECTED_MESSAGE)) {
-            ssle = new SSLProtocolException(reason);
+            return new SSLProtocolException(reason, cause);
         } else if (handshakeOnly) {
-            ssle = new SSLHandshakeException(reason);
+            return new SSLHandshakeException(reason, cause);
         } else {
-            ssle = new SSLException(reason);
+            return new SSLException(reason, cause);
         }
-
-        if (cause != null) {
-            ssle.initCause(cause);
-        }
-
-        return ssle;
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
index f9753ffe078..996e3f78ec1 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -295,8 +295,8 @@ final class DHClientKeyExchange {
                 shc.handshakeCredentials.add(
                         new DHECredentials(peerPublicKey, namedGroup));
             } catch (GeneralSecurityException | java.io.IOException e) {
-                throw (SSLHandshakeException)(new SSLHandshakeException(
-                        "Could not generate DHPublicKey").initCause(e));
+                throw new SSLHandshakeException(
+                        "Could not generate DHPublicKey", e);
             }
 
             // update the states
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHKeyExchange.java
index 59bc40411ce..9833ea94e8d 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,8 +160,7 @@ final class ECDHKeyExchange {
                 ka.doPhase(peerPublicKey, true);
                 return ka.generateSecret("TlsPremasterSecret");
             } catch (GeneralSecurityException e) {
-                throw (SSLHandshakeException) new SSLHandshakeException(
-                    "Could not generate secret").initCause(e);
+                throw new SSLHandshakeException("Could not generate secret", e);
             }
         }
 
@@ -177,8 +176,7 @@ final class ECDHKeyExchange {
                 PublicKey peerPublicKey = kf.generatePublic(spec);
                 return getAgreedSecret(peerPublicKey);
             } catch (GeneralSecurityException | java.io.IOException e) {
-                throw (SSLHandshakeException) new SSLHandshakeException(
-                    "Could not generate secret").initCause(e);
+                throw new SSLHandshakeException("Could not generate secret", e);
             }
         }
 
@@ -202,8 +200,8 @@ final class ECDHKeyExchange {
                         "ECPublicKey does not comply to algorithm constraints");
                 }
             } catch (GeneralSecurityException | java.io.IOException e) {
-                throw (SSLHandshakeException) new SSLHandshakeException(
-                        "Could not generate ECPublicKey").initCause(e);
+                throw new SSLHandshakeException(
+                        "Could not generate ECPublicKey", e);
             }
         }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
index 7c791e85f77..b76da75c763 100644
--- a/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,8 +88,7 @@ public class KAKeyDerivation implements SSLKeyDerivation {
                     context, preMasterSecret);
             return kd.deriveKey("MasterSecret", params);
         } catch (GeneralSecurityException gse) {
-            throw (SSLHandshakeException) new SSLHandshakeException(
-                    "Could not generate secret").initCause(gse);
+            throw new SSLHandshakeException("Could not generate secret", gse);
         }
     }
 
@@ -125,8 +124,7 @@ public class KAKeyDerivation implements SSLKeyDerivation {
             // derive handshake secret
             return hkdf.extract(saltSecret, sharedSecret, algorithm);
         } catch (GeneralSecurityException gse) {
-            throw (SSLHandshakeException) new SSLHandshakeException(
-                    "Could not generate secret").initCause(gse);
+            throw new SSLHandshakeException("Could not generate secret", gse);
         }
     }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
index 50f19dbf715..337c8384991 100644
--- a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
+++ b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -302,8 +302,7 @@ final class NewSessionTicket {
             return hkdf.expand(resumptionMasterSecret, hkdfInfo,
                     hashAlg.hashLength, "TlsPreSharedKey");
         } catch  (GeneralSecurityException gse) {
-            throw (SSLHandshakeException) new SSLHandshakeException(
-                    "Could not derive PSK").initCause(gse);
+            throw new SSLHandshakeException("Could not derive PSK", gse);
         }
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java
index 7f693400637..20fc7112593 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,7 @@ final class SSLBasicKeyDerivation implements SSLKeyDerivation {
             return hkdf.expand(secret, hkdfInfo,
                     ((SecretSizeSpec)keySpec).length, algorithm);
         } catch (GeneralSecurityException gse) {
-            throw (SSLHandshakeException) new SSLHandshakeException(
-                "Could not generate secret").initCause(gse);
+            throw new SSLHandshakeException("Could not generate secret", gse);
         }
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
index ca4a80c5a5c..1db9ba8d86b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1167,17 +1167,13 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
         if (taskThrown instanceof RuntimeException) {
             throw new RuntimeException(msg, taskThrown);
         } else if (taskThrown instanceof SSLHandshakeException) {
-            return (SSLHandshakeException)
-                new SSLHandshakeException(msg).initCause(taskThrown);
+            return new SSLHandshakeException(msg, taskThrown);
         } else if (taskThrown instanceof SSLKeyException) {
-            return (SSLKeyException)
-                new SSLKeyException(msg).initCause(taskThrown);
+            return new SSLKeyException(msg, taskThrown);
         } else if (taskThrown instanceof SSLPeerUnverifiedException) {
-            return (SSLPeerUnverifiedException)
-                new SSLPeerUnverifiedException(msg).initCause(taskThrown);
+            return new SSLPeerUnverifiedException(msg, taskThrown);
         } else if (taskThrown instanceof SSLProtocolException) {
-            return (SSLProtocolException)
-                new SSLProtocolException(msg).initCause(taskThrown);
+            return new SSLProtocolException(msg, taskThrown);
         } else if (taskThrown instanceof SSLException) {
             return (SSLException)taskThrown;
         } else {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
index 938768aaf76..dc957ca1419 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -242,8 +242,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
         } catch (BadPaddingException bpe) {
             throw bpe;
         } catch (GeneralSecurityException gse) {
-            throw (SSLProtocolException)(new SSLProtocolException(
-                    "Unexpected exception")).initCause(gse);
+            throw new SSLProtocolException("Unexpected exception", gse);
         } finally {
             // consume a complete record
             packet.limit(srcLim);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
index a7ba9a5e566..ff13948a67c 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,8 +113,7 @@ final class SSLSecretDerivation implements SSLKeyDerivation {
             HKDF hkdf = new HKDF(hashAlg.name);
             return hkdf.expand(secret, hkdfInfo, hashAlg.hashLength, algorithm);
         } catch (GeneralSecurityException gse) {
-            throw (SSLHandshakeException) new SSLHandshakeException(
-                "Could not generate secret").initCause(gse);
+            throw new SSLHandshakeException("Could not generate secret", gse);
         }
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index 842cef11911..68fb3860203 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1709,19 +1709,13 @@ public final class SSLSocketImpl
 
     private Plaintext handleEOF(EOFException eofe) throws IOException {
         if (requireCloseNotify || conContext.handshakeContext != null) {
-            SSLException ssle;
             if (conContext.handshakeContext != null) {
-                ssle = new SSLHandshakeException(
-                        "Remote host terminated the handshake");
+                throw new SSLHandshakeException(
+                        "Remote host terminated the handshake",  eofe);
             } else {
-                ssle = new SSLProtocolException(
-                        "Remote host terminated the connection");
-            }
-
-            if (eofe != null) {
-                ssle.initCause(eofe);
+                throw new SSLProtocolException(
+                        "Remote host terminated the connection", eofe);
             }
-            throw ssle;
         } else {
             // treat as if we had received a close_notify
             conContext.isInputCloseNotified = true;
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
index da189f4f3ff..7afacb0f3d7 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -263,8 +263,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
         } catch (BadPaddingException bpe) {
             throw bpe;
         } catch (GeneralSecurityException gse) {
-            throw (SSLProtocolException)(new SSLProtocolException(
-                    "Unexpected exception")).initCause(gse);
+            throw new SSLProtocolException("Unexpected exception", gse);
         }
 
         if (contentType != ContentType.HANDSHAKE.id &&
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
index ac39cbb16fb..6e890c8818d 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,8 +154,8 @@ enum SSLTrafficKeyDerivation implements SSLKeyDerivationGenerator {
                         ks.getKeyLength(cs),
                         ks.getAlgorithm(cs, algorithm));
             } catch (GeneralSecurityException gse) {
-                throw (SSLHandshakeException)(new SSLHandshakeException(
-                    "Could not generate secret").initCause(gse));
+                throw new SSLHandshakeException(
+                        "Could not generate secret", gse);
             }
         }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHello.java b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
index 193a71cde86..efbe860bfd6 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1205,8 +1205,7 @@ final class ServerHello {
             hc.handshakeKeyDerivation =
                     new SSLSecretDerivation(hc, earlySecret);
         } catch  (GeneralSecurityException gse) {
-            throw (SSLHandshakeException) new SSLHandshakeException(
-                "Could not generate secret").initCause(gse);
+            throw new SSLHandshakeException("Could not generate secret", gse);
         }
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
index 74f38bf5b56..eaf154af3bb 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,9 +135,8 @@ final class ServerNameExtension {
                             nameType + "), name=" +
                             (new String(encoded, StandardCharsets.UTF_8)) +
                             ", value={" +
-                            Utilities.toHexString(encoded) + "}");
-                        throw hc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
-                                (SSLProtocolException)spe.initCause(iae));
+                            Utilities.toHexString(encoded) + "}", iae);
+                        throw hc.conContext.fatal(Alert.ILLEGAL_PARAMETER, spe);
                     }
                 } else {
                     try {
@@ -146,9 +145,8 @@ final class ServerNameExtension {
                         SSLProtocolException spe = new SSLProtocolException(
                             "Illegal server name, type=(" + nameType +
                             "), value={" +
-                            Utilities.toHexString(encoded) + "}");
-                        throw hc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
-                                (SSLProtocolException)spe.initCause(iae));
+                            Utilities.toHexString(encoded) + "}", iae);
+                        throw hc.conContext.fatal(Alert.ILLEGAL_PARAMETER, spe);
                     }
                 }
 
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java
index 3c75f75519a..41144b132c0 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -435,11 +435,10 @@ public final class StartTlsResponseImpl extends StartTlsResponse {
             /*
              * Pass up the cause of the failure
              */
-            throw(SSLPeerUnverifiedException)
-                new SSLPeerUnverifiedException("hostname of the server '" +
+            throw new SSLPeerUnverifiedException("hostname of the server '" +
                                 hostname +
                                 "' does not match the hostname in the " +
-                                "server's certificate.").initCause(e);
+                                "server's certificate.", e);
         }
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
index 6394b7b3cfa..fc2596e0aa4 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -573,9 +573,7 @@ final class HttpClientImpl extends HttpClient implements Trackable {
                 throw ce;
             } else if (throwable instanceof SSLHandshakeException) {
                 // special case for SSLHandshakeException
-                SSLHandshakeException he = new SSLHandshakeException(msg);
-                he.initCause(throwable);
-                throw he;
+                throw new SSLHandshakeException(msg, throwable);
             } else if (throwable instanceof SSLException) {
                 // any other SSLException is wrapped in a plain
                 // SSLException
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLTube.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLTube.java
index 42174ef9c44..e72ba9d33dc 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLTube.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLTube.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -592,9 +592,7 @@ public class SSLTube implements FlowTube {
                     engine.isOutboundDone(),
                     handshakeFailed);
 
-        SSLHandshakeException e = new SSLHandshakeException(handshakeFailed);
-        if (t != null) e.initCause(t);
-        return e;
+        return new SSLHandshakeException(handshakeFailed, t);
     }
 
     @Override
diff --git a/test/jdk/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java b/test/jdk/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java
index a9373ed09f9..2752649dc74 100644
--- a/test/jdk/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java
+++ b/test/jdk/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -484,7 +484,7 @@ public class SSLServerSocketAlpnTest {
          */
         if ((local != null) && (remote != null)) {
             // If both failed, return the curthread's exception.
-            local.initCause(remote);
+            local.addSuppressed(remote);
             exception = local;
         } else if (local != null) {
             exception = local;
diff --git a/test/jdk/javax/net/ssl/ALPN/SSLSocketAlpnTest.java b/test/jdk/javax/net/ssl/ALPN/SSLSocketAlpnTest.java
index ef72474f417..172eecd4608 100644
--- a/test/jdk/javax/net/ssl/ALPN/SSLSocketAlpnTest.java
+++ b/test/jdk/javax/net/ssl/ALPN/SSLSocketAlpnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -480,7 +480,7 @@ public class SSLSocketAlpnTest {
          */
         if ((local != null) && (remote != null)) {
             // If both failed, return the curthread's exception.
-            local.initCause(remote);
+            local.addSuppressed(remote);
             exception = local;
         } else if (local != null) {
             exception = local;
diff --git a/test/jdk/javax/net/ssl/SSLException/CheckSSLHandshakeException.java b/test/jdk/javax/net/ssl/SSLException/CheckSSLHandshakeException.java
new file mode 100644
index 00000000000..4c8aba3de44
--- /dev/null
+++ b/test/jdk/javax/net/ssl/SSLException/CheckSSLHandshakeException.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282723
+ * @summary Add constructors taking a cause to JSSE exceptions
+ */
+import javax.net.ssl.SSLHandshakeException;
+import java.util.Objects;
+
+public class CheckSSLHandshakeException {
+    private static String exceptionMessage = "message";
+    private static Throwable exceptionCause = new RuntimeException();
+
+    public static void main(String[] args) throws Exception {
+        testException(
+                new SSLHandshakeException(exceptionMessage, exceptionCause));
+    }
+
+    private static void testException(Exception ex) {
+        if (!Objects.equals(ex.getMessage(), exceptionMessage)) {
+            throw new RuntimeException("Unexpected exception message");
+        }
+
+        if (ex.getCause() != exceptionCause) {
+            throw new RuntimeException("Unexpected exception cause");
+        }
+    }
+}
diff --git a/test/jdk/javax/net/ssl/SSLException/CheckSSLKeyException.java b/test/jdk/javax/net/ssl/SSLException/CheckSSLKeyException.java
new file mode 100644
index 00000000000..dcd62fcf8e7
--- /dev/null
+++ b/test/jdk/javax/net/ssl/SSLException/CheckSSLKeyException.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282723
+ * @summary Add constructors taking a cause to JSSE exceptions
+ */
+import javax.net.ssl.SSLKeyException;
+import java.util.Objects;
+
+public class CheckSSLKeyException {
+    private static String exceptionMessage = "message";
+    private static Throwable exceptionCause = new RuntimeException();
+
+    public static void main(String[] args) throws Exception {
+        testException(
+                new SSLKeyException(exceptionMessage, exceptionCause));
+    }
+
+    private static void testException(Exception ex) {
+        if (!Objects.equals(ex.getMessage(), exceptionMessage)) {
+            throw new RuntimeException("Unexpected exception message");
+        }
+
+        if (ex.getCause() != exceptionCause) {
+            throw new RuntimeException("Unexpected exception cause");
+        }
+    }
+}
diff --git a/test/jdk/javax/net/ssl/SSLException/CheckSSLPeerUnverifiedException.java b/test/jdk/javax/net/ssl/SSLException/CheckSSLPeerUnverifiedException.java
new file mode 100644
index 00000000000..04184e99306
--- /dev/null
+++ b/test/jdk/javax/net/ssl/SSLException/CheckSSLPeerUnverifiedException.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282723
+ * @summary Add constructors taking a cause to JSSE exceptions
+ */
+import javax.net.ssl.SSLPeerUnverifiedException;
+import java.util.Objects;
+
+public class CheckSSLPeerUnverifiedException {
+    private static String exceptionMessage = "message";
+    private static Throwable exceptionCause = new RuntimeException();
+
+    public static void main(String[] args) throws Exception {
+        testException(
+            new SSLPeerUnverifiedException(exceptionMessage, exceptionCause));
+    }
+
+    private static void testException(Exception ex) {
+        if (!Objects.equals(ex.getMessage(), exceptionMessage)) {
+            throw new RuntimeException("Unexpected exception message");
+        }
+
+        if (ex.getCause() != exceptionCause) {
+            throw new RuntimeException("Unexpected exception cause");
+        }
+    }
+}
diff --git a/test/jdk/javax/net/ssl/SSLException/CheckSSLProtocolException.java b/test/jdk/javax/net/ssl/SSLException/CheckSSLProtocolException.java
new file mode 100644
index 00000000000..3f62fac8f77
--- /dev/null
+++ b/test/jdk/javax/net/ssl/SSLException/CheckSSLProtocolException.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282723
+ * @summary Add constructors taking a cause to JSSE exceptions
+ */
+import javax.net.ssl.SSLProtocolException;
+import java.util.Objects;
+
+public class CheckSSLProtocolException {
+    private static String exceptionMessage = "message";
+    private static Throwable exceptionCause = new RuntimeException();
+
+    public static void main(String[] args) throws Exception {
+        testException(
+                new SSLProtocolException(exceptionMessage, exceptionCause));
+    }
+
+    private static void testException(Exception ex) {
+        if (!Objects.equals(ex.getMessage(), exceptionMessage)) {
+            throw new RuntimeException("Unexpected exception message");
+        }
+
+        if (ex.getCause() != exceptionCause) {
+            throw new RuntimeException("Unexpected exception cause");
+        }
+    }
+}
diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
index 54b4e3c6840..cbb42ee1a69 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -349,13 +349,13 @@ public class SSLSocketSSLEngineTemplate {
         } finally {
             if (serverException != null) {
                 if (clientException != null) {
-                    serverException.initCause(clientException);
+                    serverException.addSuppressed(clientException);
                 }
                 throw serverException;
             }
             if (clientException != null) {
                 if (serverException != null) {
-                    clientException.initCause(serverException);
+                    clientException.addSuppressed(serverException);
                 }
                 throw clientException;
             }
diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
index ce2e3ee121b..f200752d2a7 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -544,7 +544,7 @@ public class SSLSocketTemplate {
          */
         if ((local != null) && (remote != null)) {
             // If both failed, return the curthread's exception.
-            local.initCause(remote);
+            local.addSuppressed(remote);
             exception = local;
         } else if (local != null) {
             exception = local;
-- 
GitLab


From 8a2d5ab07e6a1668f3e3918bdc8a30bd28a8f93b Mon Sep 17 00:00:00 2001
From: Maxim Kartashev <maxim.kartashev@jetbrains.com>
Date: Mon, 21 Mar 2022 07:21:00 +0000
Subject: [PATCH 135/345] 8282270: java/awt/Robot Screen Capture tests fail
 after 8280861

Reviewed-by: aivanov
---
 test/jdk/ProblemList.txt                      |  2 -
 .../HiDPIRobotScreenCaptureTest.java          |  6 +-
 .../ScreenCaptureGtkTest.java                 | 61 ++++++++++++++-----
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 0bafc13a252..25858d1cb71 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -739,8 +739,6 @@ javax/swing/plaf/metal/MetalGradient/8163193/ButtonGradientTest.java  8277816 ma
 javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java  8277816 macosx-aarch64
 javax/swing/JInternalFrame/8069348/bug8069348.java 8277816 macosx-aarch64
 java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java  8277816 macosx-aarch64
-java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java 8282270 linux-all
-java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java 8282270 windows-all
 java/awt/Robot/CheckCommonColors/CheckCommonColors.java 8277816 macosx-aarch64
 java/awt/ColorClass/AlphaColorTest.java 8277816 macosx-aarch64
 java/awt/AlphaComposite/WindowAlphaCompositeTest.java 8277816 macosx-aarch64
diff --git a/test/jdk/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java b/test/jdk/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java
index 835a52c7719..db34b1714b5 100644
--- a/test/jdk/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java
+++ b/test/jdk/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java
@@ -66,14 +66,14 @@ public class HiDPIRobotScreenCaptureTest {
         }
 
         Frame frame = new Frame();
-        // Position the frame on prime number coordinates to avoid
-        // them being multiple of the desktop scale; this tests Linux
+        // Position the frame on prime number coordinates (mind OFFSET)
+        // to avoid them being multiple of the desktop scale; this tests Linux
         // color picker better.
         // Also, the position should be far enough from the top left
         // corner of the screen to reduce the chance of being repositioned
         // by the system because that area's occupied by the global
         // menu bar and such.
-        frame.setBounds(83, 97, 400, 300);
+        frame.setBounds(78, 92, 100, 100);
         frame.setUndecorated(true);
 
         Panel panel = new Panel(new BorderLayout());
diff --git a/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java b/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java
index ef45c08988a..6ba5ec18e0a 100644
--- a/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java
+++ b/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java
@@ -31,6 +31,12 @@ import java.awt.Panel;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Robot;
+import java.awt.image.BufferedImage;
+import javax.swing.UIManager;
+import javax.imageio.ImageIO;
+import java.io.File;
+import java.io.IOException;
+
 
 /**
  * @test
@@ -40,11 +46,7 @@ import java.awt.Robot;
  *           Gtk backends and presence of UI scaling
  * @requires os.family == "linux"
  * @run main/othervm -Djdk.gtk.version=2 -Dsun.java2d.uiScale=1 ScreenCaptureGtkTest
- * @run main/othervm -Djdk.gtk.version=2 -Dsun.java2d.uiScale=2 ScreenCaptureGtkTest
- * @run main/othervm -Djdk.gtk.version=2 -Dsun.java2d.uiScale=3 ScreenCaptureGtkTest
  * @run main/othervm -Djdk.gtk.version=3 -Dsun.java2d.uiScale=1 ScreenCaptureGtkTest
- * @run main/othervm -Djdk.gtk.version=3 -Dsun.java2d.uiScale=2 ScreenCaptureGtkTest
- * @run main/othervm -Djdk.gtk.version=3 -Dsun.java2d.uiScale=3 ScreenCaptureGtkTest
  */
 
 public class ScreenCaptureGtkTest {
@@ -52,15 +54,18 @@ public class ScreenCaptureGtkTest {
             Color.GREEN, Color.BLUE, Color.ORANGE, Color.RED};
 
     public static void main(String[] args) throws Exception {
+        final int topOffset = 50;
+        final int leftOffset = 50;
+
         Frame frame = new Frame();
-        // Position the frame on prime number coordinates to avoid
-        // them being multiple of the desktop scale; this tests Linux
-        // color picker better.
+        // Position the frame such that color picker will work with
+        // prime number coordinates (mind the offset) to avoid them being
+        // multiple of the desktop scale; this tests Linux color picker better.
         // Also, the position should be far enough from the top left
         // corner of the screen to reduce the chance of being repositioned
         // by the system because that area's occupied by the global
         // menu bar and such.
-        frame.setBounds(83, 97, 400, 300);
+        frame.setBounds(89, 99, 100, 100);
         frame.setUndecorated(true);
 
         Panel panel = new Panel(new BorderLayout());
@@ -74,9 +79,9 @@ public class ScreenCaptureGtkTest {
                 g.fillRect(0, 0, w, h);
                 // Paint several distinct pixels next to one another
                 // in order to test color picker's precision.
-                for (int i = 1; i < 4; i++) {
+                for (int i = 1; i < COLORS.length; i++) {
                     g.setColor(COLORS[i]);
-                    g.fillRect(i, 0, 1, 1);
+                    g.fillRect(leftOffset + i, topOffset, 1, 1);
                 }
             }
         };
@@ -88,19 +93,25 @@ public class ScreenCaptureGtkTest {
         robot.waitForIdle();
         robot.delay(500);
 
-        final Point screenLocation = frame.getLocationOnScreen();
-        checkPixelColors(robot, screenLocation.x, screenLocation.y);
+        captureImageOf(frame, robot);
 
-        robot.delay(100);
-        frame.dispose();
+        final Point screenLocation = frame.getLocationOnScreen();
+        try {
+            checkPixelColors(robot, screenLocation.x + leftOffset,
+                    screenLocation.y + topOffset);
+        } finally {
+            robot.delay(100);
+            frame.dispose();
+        }
     }
 
     static void checkPixelColors(Robot robot, int x, int y) {
-        for (int i = 0; i < 4; i++) {
+        for (int i = 0; i < COLORS.length; i++) {
             final Color actualColor = robot.getPixelColor(x + i, y);
             System.out.print("Checking color at " + (x + i) + ", " + y + " to be equal to " + COLORS[i]);
             if (!actualColor.equals(COLORS[i])) {
                 System.out.println("... Mismatch: found " + actualColor + " instead");
+                saveImage();
                 throw new RuntimeException("Wrong screen pixel color");
 
             } else {
@@ -108,4 +119,24 @@ public class ScreenCaptureGtkTest {
             }
         }
     }
+
+    private static BufferedImage image;
+
+    static void captureImageOf(Frame frame, Robot robot) {
+        Rectangle rect = frame.getBounds();
+        rect.setLocation(frame.getLocationOnScreen());
+
+        System.out.println("Creating screen capture of " + rect);
+        image = robot.createScreenCapture(rect);
+    }
+
+    static void saveImage() {
+        System.out.println("Check image.png");
+        try {
+            ImageIO.write(image, "png", new File("image.png"));
+        } catch(IOException e) {
+            System.out.println("failed to save image.png.");
+            e.printStackTrace();
+        }
+    }
 }
-- 
GitLab


From b451273d209d9dfce3d7c4464defe0df523dfc7c Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Mon, 21 Mar 2022 07:33:20 +0000
Subject: [PATCH 136/345] 8282548: Create a regression test for JDK-4330998

Reviewed-by: aivanov
---
 .../4330998/JEditorPaneSetTextNullTest.java   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 test/jdk/javax/swing/JEditorPane/4330998/JEditorPaneSetTextNullTest.java

diff --git a/test/jdk/javax/swing/JEditorPane/4330998/JEditorPaneSetTextNullTest.java b/test/jdk/javax/swing/JEditorPane/4330998/JEditorPaneSetTextNullTest.java
new file mode 100644
index 00000000000..5b543894ef6
--- /dev/null
+++ b/test/jdk/javax/swing/JEditorPane/4330998/JEditorPaneSetTextNullTest.java
@@ -0,0 +1,45 @@
+ /*
+  * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License version 2 only, as
+  * published by the Free Software Foundation.
+  *
+  * This code is distributed in the hope that it will be useful, but WITHOUT
+  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  * version 2 for more details (a copy is included in the LICENSE file that
+  * accompanied this code).
+  *
+  * You should have received a copy of the GNU General Public License version
+  * 2 along with this work; if not, write to the Free Software Foundation,
+  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  * or visit www.oracle.com if you need additional information or have any
+  * questions.
+  */
+
+ import javax.swing.JEditorPane;
+ import javax.swing.SwingUtilities;
+
+ /*
+  * @test
+  * @bug 4330998
+  * @summary Verifies that JEditorPane.setText(null) doesn't throw NullPointerException.
+  * @run main JEditorPaneSetTextNullTest
+  */
+ public class JEditorPaneSetTextNullTest {
+
+     public static void main(String[] args) throws Exception {
+         try {
+             SwingUtilities.invokeAndWait(() -> new JEditorPane().setText(null));
+             System.out.println("Test passed");
+         } catch (Exception e) {
+             throw new RuntimeException("Test failed, caught Exception " + e
+                     + " when calling JEditorPane.setText(null)");
+         }
+     }
+
+ }
-- 
GitLab


From 83a1c90433343107eaa2a7fa41b9b07f86b6ce19 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Mon, 21 Mar 2022 07:36:21 +0000
Subject: [PATCH 137/345] 8282789: Create a regression test for the JTree
 usecase of JDK-4618767

Reviewed-by: aivanov
---
 .../4618767/JTreeSelectedElementTest.java     | 226 ++++++++++++++++++
 1 file changed, 226 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTree/4618767/JTreeSelectedElementTest.java

diff --git a/test/jdk/javax/swing/JTree/4618767/JTreeSelectedElementTest.java b/test/jdk/javax/swing/JTree/4618767/JTreeSelectedElementTest.java
new file mode 100644
index 00000000000..19b00c05d37
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/4618767/JTreeSelectedElementTest.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+/*
+ * @test
+ * @key headful
+ * @bug 4618767
+ * @summary This test confirms that typing a letter while a JTree has focus now makes the selection
+ *          not jump to the item whose text starts with that letter if that typed letter is accompanied
+ *          by modifier keys such as ALT or CTRL(eg: ALT+F).
+ * @run main JTreeSelectedElementTest
+ */
+public class JTreeSelectedElementTest {
+
+    private static final int FILE_MENU = KeyEvent.VK_F;
+    private static JFrame frame;
+    private static JTree tree;
+    private static Robot robot;
+    private static CountDownLatch menuSelectedEventLatch;
+
+    public static void main(String[] args) throws Exception {
+        robot = new Robot();
+        robot.setAutoWaitForIdle(true);
+        robot.setAutoDelay(200);
+
+        final boolean isMac = System.getProperty("os.name")
+                                    .toLowerCase()
+                                    .contains("os x");
+
+        List<String> lafs = Arrays.stream(getInstalledLookAndFeels())
+                                  .map(LookAndFeelInfo::getClassName)
+                                  .collect(Collectors.toList());
+        for (final String laf : lafs) {
+            menuSelectedEventLatch = new CountDownLatch(1);
+            try {
+                AtomicBoolean lafSetSuccess = new AtomicBoolean(false);
+                SwingUtilities.invokeAndWait(() -> {
+                    lafSetSuccess.set(setLookAndFeel(laf));
+                    if (lafSetSuccess.get()) {
+                        createUI();
+                    }
+                });
+                if (!lafSetSuccess.get()) {
+                    continue;
+                }
+                robot.waitForIdle();
+
+                // Select the node named as 'colors'
+                Point pt = getNodeLocation(1);
+                robot.mouseMove(pt.x, pt.y);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+                // Assertion check to verify that the selected node is 'colors'
+                final String elementSelBefore = getCurrentNodeName();
+                if (!"colors".equals(elementSelBefore)) {
+                    throw new RuntimeException("Test failed for " + laf
+                            + " as the tree node selected: " + elementSelBefore
+                            + " is not the expected one 'colors'"
+                    );
+                }
+
+                // Now operate Menu using Mnemonics, different key combinations for different OSes.
+                // For most OSes it's ALT+F; on macOS it's ALT+CNTRL+F except for Nimbus LaF.
+                if (isMac && !laf.contains("Nimbus")) {
+                    hitKeys(KeyEvent.VK_ALT, KeyEvent.VK_CONTROL, FILE_MENU);
+                } else {
+                    hitKeys(KeyEvent.VK_ALT, FILE_MENU);
+                }
+
+                // Wait until the menu got selected.
+                if (!menuSelectedEventLatch.await(3, TimeUnit.SECONDS)) {
+                    throw new RuntimeException("Waited too long, but can't select menu using mnemonics for " + laf);
+                }
+
+                hitKeys(KeyEvent.VK_ENTER);
+
+                String elementSelAfter = getCurrentNodeName();
+
+                // As per the fix of BugID 4618767, the tree element selection should not change
+                if (!elementSelBefore.equals(elementSelAfter)) {
+                    throw new RuntimeException("Test failed for " + laf
+                            + " as tree.getLastSelectedPathComponent() before: " + elementSelBefore
+                            + " not same as tree.getLastSelectedPathComponent() after pressing Enter: "
+                            + elementSelAfter
+                    );
+                }
+
+                System.out.println("Test passed for laf: " + laf);
+
+            } finally {
+                SwingUtilities.invokeAndWait(JTreeSelectedElementTest::disposeFrame);
+            }
+        }
+    }
+
+    private static void hitKeys(int... keys) {
+        for (int key : keys) {
+            robot.keyPress(key);
+        }
+
+        for (int i = keys.length - 1; i >= 0; i--) {
+            robot.keyRelease(keys[i]);
+        }
+    }
+
+    private static String getCurrentNodeName() throws Exception {
+        AtomicReference<String> nodeName = new AtomicReference<>();
+        SwingUtilities.invokeAndWait(() -> {
+            nodeName.set(tree.getLastSelectedPathComponent().toString().trim());
+        });
+        return nodeName.get();
+    }
+
+    private static Point getNodeLocation(int rowCount) throws Exception {
+        AtomicReference<Point> treeNodeLoc = new AtomicReference<>();
+        SwingUtilities.invokeAndWait(() -> {
+            final Point locationOnScreen = tree.getLocationOnScreen();
+            Rectangle rt = tree.getPathBounds(tree.getPathForRow(rowCount));
+            locationOnScreen.translate(rt.x + rt.width / 2, rt.y + rt.height / 2);
+            treeNodeLoc.set(locationOnScreen);
+        });
+        return treeNodeLoc.get();
+    }
+
+    private static void createUI() {
+        frame = new JFrame();
+        tree = new JTree();
+        JMenu menu = new JMenu("File");
+        menu.setMnemonic(FILE_MENU);
+        JMenuItem menuItem = new JMenuItem("Dummy");
+        menu.add(menuItem);
+        menu.addMenuListener(new MenuListener() {
+            @Override
+            public void menuSelected(MenuEvent e) {
+                menuSelectedEventLatch.countDown();
+            }
+
+            @Override
+            public void menuDeselected(MenuEvent e) {
+            }
+
+            @Override
+            public void menuCanceled(MenuEvent e) {
+            }
+        });
+
+        JMenuBar menuBar = new JMenuBar();
+        menuBar.add(menu);
+
+        frame.setJMenuBar(menuBar);
+        frame.setContentPane(tree);
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        frame.pack();
+        frame.setAlwaysOnTop(true);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    private static boolean setLookAndFeel(String lafName) {
+        try {
+            UIManager.setLookAndFeel(lafName);
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Ignoring Unsupported L&F: " + lafName);
+            return false;
+        } catch (ClassNotFoundException | InstantiationException
+                | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+    private static void disposeFrame() {
+        if (frame != null) {
+            frame.dispose();
+            frame = null;
+        }
+    }
+
+}
-- 
GitLab


From e709cb05dcf67462f266c1f3dae30976b562676d Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 21 Mar 2022 08:25:33 +0000
Subject: [PATCH 138/345] 8283186: Explicitly pass a third temp register to
 MacroAssembler::store_heap_oop

Reviewed-by: eosterlund
---
 .../x86/gc/g1/g1BarrierSetAssembler_x86.cpp   |  7 ++-
 .../x86/gc/g1/g1BarrierSetAssembler_x86.hpp   |  2 +-
 .../x86/gc/shared/barrierSetAssembler_x86.cpp |  2 +-
 .../x86/gc/shared/barrierSetAssembler_x86.hpp |  2 +-
 .../cardTableBarrierSetAssembler_x86.cpp      |  4 +-
 .../cardTableBarrierSetAssembler_x86.hpp      |  2 +-
 .../shared/modRefBarrierSetAssembler_x86.cpp  |  6 +--
 .../shared/modRefBarrierSetAssembler_x86.hpp  |  4 +-
 .../shenandoahBarrierSetAssembler_x86.cpp     |  9 ++--
 .../shenandoahBarrierSetAssembler_x86.hpp     |  2 +-
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp |  5 +-
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp |  3 +-
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    | 12 ++---
 src/hotspot/cpu/x86/macroAssembler_x86.hpp    |  4 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |  2 +-
 src/hotspot/cpu/x86/templateTable_x86.cpp     | 46 +++++++++----------
 16 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
index 6525b13c5c2..0fb005ce06f 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
@@ -342,7 +342,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
 }
 
 void G1BarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                         Address dst, Register val, Register tmp1, Register tmp2) {
+                                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
   bool in_heap = (decorators & IN_HEAP) != 0;
   bool as_normal = (decorators & AS_NORMAL) != 0;
   assert((decorators & IS_DEST_UNINITIALIZED) == 0, "unsupported");
@@ -350,7 +350,6 @@ void G1BarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet deco
   bool needs_pre_barrier = as_normal;
   bool needs_post_barrier = val != noreg && in_heap;
 
-  Register tmp3 = LP64_ONLY(r8) NOT_LP64(rsi);
   Register rthread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
   // flatten object address if needed
   // We do it regardless of precise because we need the registers
@@ -379,7 +378,7 @@ void G1BarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet deco
                          false /* expand_call */);
   }
   if (val == noreg) {
-    BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg);
+    BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
   } else {
     Register new_val = val;
     if (needs_post_barrier) {
@@ -389,7 +388,7 @@ void G1BarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet deco
         __ movptr(new_val, val);
       }
     }
-    BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg);
+    BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
     if (needs_post_barrier) {
       g1_write_barrier_post(masm /*masm*/,
                             tmp1 /* store_adr */,
diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
index 94bbadc7b2b..a5695f5657a 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp
@@ -54,7 +54,7 @@ class G1BarrierSetAssembler: public ModRefBarrierSetAssembler {
                              Register tmp2);
 
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            Address dst, Register val, Register tmp1, Register tmp2);
+                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
 
  public:
   void gen_pre_barrier_stub(LIR_Assembler* ce, G1PreBarrierStub* stub);
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
index 55823bdf217..930926bbb17 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
@@ -103,7 +103,7 @@ void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators,
 }
 
 void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                   Address dst, Register val, Register tmp1, Register tmp2) {
+                                   Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
   bool in_heap = (decorators & IN_HEAP) != 0;
   bool in_native = (decorators & IN_NATIVE) != 0;
   bool is_not_null = (decorators & IS_NOT_NULL) != 0;
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
index 3c63c00e4db..085238d60b5 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
@@ -47,7 +47,7 @@ public:
   virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                        Register dst, Address src, Register tmp1, Register tmp_thread);
   virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        Address dst, Register val, Register tmp1, Register tmp2);
+                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
 
   // Support for jniFastGetField to try resolving a jobject/jweak in native
   virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
index 7fc36ffae8f..f314cac5980 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
@@ -128,7 +128,7 @@ void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register ob
 }
 
 void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                                Address dst, Register val, Register tmp1, Register tmp2) {
+                                                Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
   bool in_heap = (decorators & IN_HEAP) != 0;
 
   bool is_array = (decorators & IS_ARRAY) != 0;
@@ -137,7 +137,7 @@ void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorS
 
   bool needs_post_barrier = val != noreg && in_heap;
 
-  BarrierSetAssembler::store_at(masm, decorators, type, dst, val, noreg, noreg);
+  BarrierSetAssembler::store_at(masm, decorators, type, dst, val, noreg, noreg, noreg);
   if (needs_post_barrier) {
     // flatten object address if needed
     if (!precise || (dst.index() == noreg && dst.disp() == 0)) {
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
index a65286bd599..4760b222977 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
@@ -35,7 +35,7 @@ protected:
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count, Register tmp);
 
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            Address dst, Register val, Register tmp1, Register tmp2);
+                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
 };
 
 #endif // CPU_X86_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp
index 9325ab7ecf9..618095bdfa6 100644
--- a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp
@@ -84,10 +84,10 @@ void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, Decorat
 }
 
 void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                                         Address dst, Register val, Register tmp1, Register tmp2) {
+                                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
   if (is_reference_type(type)) {
-    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
   } else {
-    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
   }
 }
diff --git a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp
index 39950225bfe..c8b5043256a 100644
--- a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp
@@ -39,7 +39,7 @@ protected:
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                 Register addr, Register count, Register tmp) {}
   virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                            Address dst, Register val, Register tmp1, Register tmp2) = 0;
+                            Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) = 0;
 public:
   virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                   Register src, Register dst, Register count);
@@ -47,7 +47,7 @@ public:
                                   Register src, Register dst, Register count);
 
   virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        Address dst, Register val, Register tmp1, Register tmp2);
+                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
 };
 
 #endif // CPU_X86_GC_SHARED_MODREFBARRIERSETASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
index 64169b01529..d213e6fda39 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
@@ -591,7 +591,7 @@ void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet d
 }
 
 void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-              Address dst, Register val, Register tmp1, Register tmp2) {
+              Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
 
   bool on_oop = is_reference_type(type);
   bool in_heap = (decorators & IN_HEAP) != 0;
@@ -599,7 +599,6 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet
   if (on_oop && in_heap) {
     bool needs_pre_barrier = as_normal;
 
-    Register tmp3 = LP64_ONLY(r8) NOT_LP64(rsi);
     Register rthread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
     // flatten object address if needed
     // We do it regardless of precise because we need the registers
@@ -629,14 +628,14 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet
                                    false /* expand_call */);
     }
     if (val == noreg) {
-      BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg);
+      BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
     } else {
       iu_barrier(masm, val, tmp3);
-      BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg);
+      BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
     }
     NOT_LP64(imasm->restore_bcp());
   } else {
-    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
   }
 }
 
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
index 2a8c0862b9e..47dfe144928 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
@@ -77,7 +77,7 @@ public:
   virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                        Register dst, Address src, Register tmp1, Register tmp_thread);
   virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
-                        Address dst, Register val, Register tmp1, Register tmp2);
+                        Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
   virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
                                              Register obj, Register tmp, Label& slowpath);
 };
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 8c74db952e8..00071d66da3 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -193,7 +193,8 @@ void ZBarrierSetAssembler::store_at(MacroAssembler* masm,
                                     Address dst,
                                     Register src,
                                     Register tmp1,
-                                    Register tmp2) {
+                                    Register tmp2,
+                                    Register tmp3) {
   BLOCK_COMMENT("ZBarrierSetAssembler::store_at {");
 
   // Verify oop store
@@ -211,7 +212,7 @@ void ZBarrierSetAssembler::store_at(MacroAssembler* masm,
   }
 
   // Store value
-  BarrierSetAssembler::store_at(masm, decorators, type, dst, src, tmp1, tmp2);
+  BarrierSetAssembler::store_at(masm, decorators, type, dst, src, tmp1, tmp2, tmp3);
 
   BLOCK_COMMENT("} ZBarrierSetAssembler::store_at");
 }
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
index 134f7e6c9e2..2446bd1e46a 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -61,7 +61,8 @@ public:
                         Address dst,
                         Register src,
                         Register tmp1,
-                        Register tmp2);
+                        Register tmp2,
+                        Register tmp3);
 #endif // ASSERT
 
   virtual void arraycopy_prologue(MacroAssembler* masm,
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 7659598fcb7..944e7b9b816 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -4590,14 +4590,14 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators, Reg
 }
 
 void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src,
-                                     Register tmp1, Register tmp2) {
+                                     Register tmp1, Register tmp2, Register tmp3) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   decorators = AccessInternal::decorator_fixup(decorators);
   bool as_raw = (decorators & AS_RAW) != 0;
   if (as_raw) {
-    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2);
+    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
   } else {
-    bs->store_at(this, decorators, type, dst, src, tmp1, tmp2);
+    bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
   }
 }
 
@@ -4613,13 +4613,13 @@ void MacroAssembler::load_heap_oop_not_null(Register dst, Address src, Register
 }
 
 void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,
-                                    Register tmp2, DecoratorSet decorators) {
-  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2);
+                                    Register tmp2, Register tmp3, DecoratorSet decorators) {
+  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2, tmp3);
 }
 
 // Used for storing NULLs.
 void MacroAssembler::store_heap_oop_null(Address dst) {
-  access_store_at(T_OBJECT, IN_HEAP, dst, noreg, noreg, noreg);
+  access_store_at(T_OBJECT, IN_HEAP, dst, noreg, noreg, noreg, noreg);
 }
 
 #ifdef _LP64
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 3bffad9940b..918019d015c 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -345,14 +345,14 @@ class MacroAssembler: public Assembler {
   void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
                       Register tmp1, Register thread_tmp);
   void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src,
-                       Register tmp1, Register tmp2);
+                       Register tmp1, Register tmp2, Register tmp3);
 
   void load_heap_oop(Register dst, Address src, Register tmp1 = noreg,
                      Register thread_tmp = noreg, DecoratorSet decorators = 0);
   void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg,
                               Register thread_tmp = noreg, DecoratorSet decorators = 0);
   void store_heap_oop(Address dst, Register src, Register tmp1 = noreg,
-                      Register tmp2 = noreg, DecoratorSet decorators = 0);
+                      Register tmp2 = noreg, Register tmp3 = noreg, DecoratorSet decorators = 0);
 
   // Used for storing NULL. All other oop constants should be
   // stored using routines that take a jobject.
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 6bdff24bddd..39d5cbe2fb4 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -2848,7 +2848,7 @@ class StubGenerator: public StubCodeGenerator {
     __ align(OptoLoopAlignment);
 
     __ BIND(L_store_element);
-    __ store_heap_oop(to_element_addr, rax_oop, noreg, noreg, AS_RAW);  // store the oop
+    __ store_heap_oop(to_element_addr, rax_oop, noreg, noreg, noreg, AS_RAW);  // store the oop
     __ increment(count);               // increment the count toward zero
     __ jcc(Assembler::zero, L_do_card_marks);
 
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 0532fb17785..cadc71916db 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -152,7 +152,7 @@ static void do_oop_store(InterpreterMacroAssembler* _masm,
                          Register val,
                          DecoratorSet decorators = 0) {
   assert(val == noreg || val == rax, "parameter is just for looks");
-  __ store_heap_oop(dst, val, rdx, rbx, decorators);
+  __ store_heap_oop(dst, val, rdx, rbx, LP64_ONLY(r8) NOT_LP64(rsi), decorators);
 }
 
 static void do_oop_load(InterpreterMacroAssembler* _masm,
@@ -1067,7 +1067,7 @@ void TemplateTable::iastore() {
   __ access_store_at(T_INT, IN_HEAP | IS_ARRAY,
                      Address(rdx, rbx, Address::times_4,
                              arrayOopDesc::base_offset_in_bytes(T_INT)),
-                     rax, noreg, noreg);
+                     rax, noreg, noreg, noreg);
 }
 
 void TemplateTable::lastore() {
@@ -1081,7 +1081,7 @@ void TemplateTable::lastore() {
   __ access_store_at(T_LONG, IN_HEAP | IS_ARRAY,
                      Address(rcx, rbx, Address::times_8,
                              arrayOopDesc::base_offset_in_bytes(T_LONG)),
-                     noreg /* ltos */, noreg, noreg);
+                     noreg /* ltos */, noreg, noreg, noreg);
 }
 
 
@@ -1095,7 +1095,7 @@ void TemplateTable::fastore() {
   __ access_store_at(T_FLOAT, IN_HEAP | IS_ARRAY,
                      Address(rdx, rbx, Address::times_4,
                              arrayOopDesc::base_offset_in_bytes(T_FLOAT)),
-                     noreg /* ftos */, noreg, noreg);
+                     noreg /* ftos */, noreg, noreg, noreg);
 }
 
 void TemplateTable::dastore() {
@@ -1108,7 +1108,7 @@ void TemplateTable::dastore() {
   __ access_store_at(T_DOUBLE, IN_HEAP | IS_ARRAY,
                      Address(rdx, rbx, Address::times_8,
                              arrayOopDesc::base_offset_in_bytes(T_DOUBLE)),
-                     noreg /* dtos */, noreg, noreg);
+                     noreg /* dtos */, noreg, noreg, noreg);
 }
 
 void TemplateTable::aastore() {
@@ -1186,7 +1186,7 @@ void TemplateTable::bastore() {
   __ access_store_at(T_BYTE, IN_HEAP | IS_ARRAY,
                      Address(rdx, rbx,Address::times_1,
                              arrayOopDesc::base_offset_in_bytes(T_BYTE)),
-                     rax, noreg, noreg);
+                     rax, noreg, noreg, noreg);
 }
 
 void TemplateTable::castore() {
@@ -1199,7 +1199,7 @@ void TemplateTable::castore() {
   __ access_store_at(T_CHAR, IN_HEAP | IS_ARRAY,
                      Address(rdx, rbx, Address::times_2,
                              arrayOopDesc::base_offset_in_bytes(T_CHAR)),
-                     rax, noreg, noreg);
+                     rax, noreg, noreg, noreg);
 }
 
 
@@ -3102,7 +3102,7 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
   {
     __ pop(btos);
     if (!is_static) pop_and_check_object(obj);
-    __ access_store_at(T_BYTE, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_BYTE, IN_HEAP, field, rax, noreg, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_bputfield, bc, rbx, true, byte_no);
     }
@@ -3117,7 +3117,7 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
   {
     __ pop(ztos);
     if (!is_static) pop_and_check_object(obj);
-    __ access_store_at(T_BOOLEAN, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_BOOLEAN, IN_HEAP, field, rax, noreg, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_zputfield, bc, rbx, true, byte_no);
     }
@@ -3148,7 +3148,7 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
   {
     __ pop(itos);
     if (!is_static) pop_and_check_object(obj);
-    __ access_store_at(T_INT, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_INT, IN_HEAP, field, rax, noreg, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_iputfield, bc, rbx, true, byte_no);
     }
@@ -3163,7 +3163,7 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
   {
     __ pop(ctos);
     if (!is_static) pop_and_check_object(obj);
-    __ access_store_at(T_CHAR, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_CHAR, IN_HEAP, field, rax, noreg, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_cputfield, bc, rbx, true, byte_no);
     }
@@ -3178,7 +3178,7 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
   {
     __ pop(stos);
     if (!is_static) pop_and_check_object(obj);
-    __ access_store_at(T_SHORT, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_SHORT, IN_HEAP, field, rax, noreg, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_sputfield, bc, rbx, true, byte_no);
     }
@@ -3194,7 +3194,7 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
     __ pop(ltos);
     if (!is_static) pop_and_check_object(obj);
     // MO_RELAXED: generate atomic store for the case of volatile field (important for x86_32)
-    __ access_store_at(T_LONG, IN_HEAP | MO_RELAXED, field, noreg /* ltos*/, noreg, noreg);
+    __ access_store_at(T_LONG, IN_HEAP | MO_RELAXED, field, noreg /* ltos*/, noreg, noreg, noreg);
 #ifdef _LP64
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_lputfield, bc, rbx, true, byte_no);
@@ -3211,7 +3211,7 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
   {
     __ pop(ftos);
     if (!is_static) pop_and_check_object(obj);
-    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos */, noreg, noreg);
+    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos */, noreg, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_fputfield, bc, rbx, true, byte_no);
     }
@@ -3230,7 +3230,7 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
     __ pop(dtos);
     if (!is_static) pop_and_check_object(obj);
     // MO_RELAXED: for the case of volatile field, in fact it adds no extra work for the underlying implementation
-    __ access_store_at(T_DOUBLE, IN_HEAP | MO_RELAXED, field, noreg /* dtos */, noreg, noreg);
+    __ access_store_at(T_DOUBLE, IN_HEAP | MO_RELAXED, field, noreg /* dtos */, noreg, noreg, noreg);
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_dputfield, bc, rbx, true, byte_no);
     }
@@ -3373,31 +3373,31 @@ void TemplateTable::fast_storefield_helper(Address field, Register rax) {
     break;
   case Bytecodes::_fast_lputfield:
 #ifdef _LP64
-    __ access_store_at(T_LONG, IN_HEAP, field, noreg /* ltos */, noreg, noreg);
+    __ access_store_at(T_LONG, IN_HEAP, field, noreg /* ltos */, noreg, noreg, noreg);
 #else
   __ stop("should not be rewritten");
 #endif
     break;
   case Bytecodes::_fast_iputfield:
-    __ access_store_at(T_INT, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_INT, IN_HEAP, field, rax, noreg, noreg, noreg);
     break;
   case Bytecodes::_fast_zputfield:
-    __ access_store_at(T_BOOLEAN, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_BOOLEAN, IN_HEAP, field, rax, noreg, noreg, noreg);
     break;
   case Bytecodes::_fast_bputfield:
-    __ access_store_at(T_BYTE, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_BYTE, IN_HEAP, field, rax, noreg, noreg, noreg);
     break;
   case Bytecodes::_fast_sputfield:
-    __ access_store_at(T_SHORT, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_SHORT, IN_HEAP, field, rax, noreg, noreg, noreg);
     break;
   case Bytecodes::_fast_cputfield:
-    __ access_store_at(T_CHAR, IN_HEAP, field, rax, noreg, noreg);
+    __ access_store_at(T_CHAR, IN_HEAP, field, rax, noreg, noreg, noreg);
     break;
   case Bytecodes::_fast_fputfield:
-    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos*/, noreg, noreg);
+    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos*/, noreg, noreg, noreg);
     break;
   case Bytecodes::_fast_dputfield:
-    __ access_store_at(T_DOUBLE, IN_HEAP, field, noreg /* dtos*/, noreg, noreg);
+    __ access_store_at(T_DOUBLE, IN_HEAP, field, noreg /* dtos*/, noreg, noreg, noreg);
     break;
   default:
     ShouldNotReachHere();
-- 
GitLab


From ec62d90db2428d0da6ed0f338858f5bc2a76e991 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 21 Mar 2022 08:39:17 +0000
Subject: [PATCH 139/345] 8283365: G1: Remove duplicate assertions in
 HeapRegion::oops_on_memregion_seq_iterate_careful

Reviewed-by: kbarrett, tschatzl
---
 src/hotspot/share/gc/g1/heapRegion.inline.hpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/hotspot/share/gc/g1/heapRegion.inline.hpp b/src/hotspot/share/gc/g1/heapRegion.inline.hpp
index 3d61cc1620a..e94320fbdb4 100644
--- a/src/hotspot/share/gc/g1/heapRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/heapRegion.inline.hpp
@@ -329,16 +329,6 @@ HeapWord* HeapRegion::oops_on_memregion_seq_iterate_careful(MemRegion mr,
   // Find the obj that extends onto mr.start().
   HeapWord* cur = block_start(start);
 
-#ifdef ASSERT
-  {
-    assert(cur <= start,
-           "cur: " PTR_FORMAT ", start: " PTR_FORMAT, p2i(cur), p2i(start));
-    HeapWord* next = cur + block_size(cur);
-    assert(start < next,
-           "start: " PTR_FORMAT ", next: " PTR_FORMAT, p2i(start), p2i(next));
-  }
-#endif
-
   const G1CMBitMap* const bitmap = g1h->concurrent_mark()->prev_mark_bitmap();
   while (true) {
     oop obj = cast_to_oop(cur);
-- 
GitLab


From fd9301514e2093d9dcd7bcd9e4b812146b20dd03 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 21 Mar 2022 08:40:14 +0000
Subject: [PATCH 140/345] 8283332: G1: Stricter assertion in
 G1BlockOffsetTablePart::forward_to_block_containing_addr

Reviewed-by: kbarrett, iwalulya
---
 src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
index f70cb118627..058a9f58785 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
@@ -140,7 +140,7 @@ inline HeapWord* G1BlockOffsetTablePart::forward_to_block_containing_addr(HeapWo
         "start of block must be an initialized object");
     n += block_size(q);
   }
-  assert(q <= n, "wrong order for q and addr");
+  assert(q <= addr, "wrong order for q and addr");
   assert(addr < n, "wrong order for addr and n");
   return q;
 }
-- 
GitLab


From eb4849e5615dd307a5abc435a0204a6d26610fcb Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 21 Mar 2022 10:42:38 +0000
Subject: [PATCH 141/345] 8283327: Add methods to save/restore registers when
 calling into the VM from C1/interpreter barrier code

Reviewed-by: eosterlund, dlong
---
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |   6 +-
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |   2 +-
 src/hotspot/cpu/aarch64/register_aarch64.hpp  | 105 ----------
 .../cpu/aarch64/stubGenerator_aarch64.cpp     |   7 +-
 .../x86/gc/g1/g1BarrierSetAssembler_x86.cpp   |  58 ++----
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    | 185 ++++++++++++++++++
 src/hotspot/cpu/x86/macroAssembler_x86.hpp    |  30 +++
 src/hotspot/cpu/x86/register_x86.hpp          |  31 +++
 src/hotspot/share/asm/register.hpp            | 144 ++++++++++++++
 9 files changed, 417 insertions(+), 151 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index dae4e22b15b..ad1a6d58596 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -2543,7 +2543,7 @@ void MacroAssembler::debug64(char* msg, int64_t pc, int64_t regs[])
   fatal("DEBUG MESSAGE: %s", msg);
 }
 
-RegSet MacroAssembler::call_clobbered_registers() {
+RegSet MacroAssembler::call_clobbered_gp_registers() {
   RegSet regs = RegSet::range(r0, r17) - RegSet::of(rscratch1, rscratch2);
 #ifndef R18_RESERVED
   regs += r18_tls;
@@ -2553,7 +2553,7 @@ RegSet MacroAssembler::call_clobbered_registers() {
 
 void MacroAssembler::push_call_clobbered_registers_except(RegSet exclude) {
   int step = 4 * wordSize;
-  push(call_clobbered_registers() - exclude, sp);
+  push(call_clobbered_gp_registers() - exclude, sp);
   sub(sp, sp, step);
   mov(rscratch1, -step);
   // Push v0-v7, v16-v31.
@@ -2575,7 +2575,7 @@ void MacroAssembler::pop_call_clobbered_registers_except(RegSet exclude) {
 
   reinitialize_ptrue();
 
-  pop(call_clobbered_registers() - exclude, sp);
+  pop(call_clobbered_gp_registers() - exclude, sp);
 }
 
 void MacroAssembler::push_CPU_state(bool save_vectors, bool use_sve,
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 1344250febb..d5bfc42e784 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -468,7 +468,7 @@ public:
   void push_fp(FloatRegSet regs, Register stack) { if (regs.bits()) push_fp(regs.bits(), stack); }
   void pop_fp(FloatRegSet regs, Register stack) { if (regs.bits()) pop_fp(regs.bits(), stack); }
 
-  static RegSet call_clobbered_registers();
+  static RegSet call_clobbered_gp_registers();
 
   void push_p(PRegSet regs, Register stack) { if (regs.bits()) push_p(regs.bits(), stack); }
   void pop_p(PRegSet regs, Register stack) { if (regs.bits()) pop_p(regs.bits(), stack); }
diff --git a/src/hotspot/cpu/aarch64/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp
index 400eaeb90f2..3fe2fae42a1 100644
--- a/src/hotspot/cpu/aarch64/register_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp
@@ -314,115 +314,10 @@ class ConcreteRegisterImpl : public AbstractRegisterImpl {
   static const int max_pr;
 };
 
-template <class RegImpl = Register> class RegSetIterator;
-
-// A set of registers
-template <class RegImpl>
-class AbstractRegSet {
-  uint32_t _bitset;
-
-  AbstractRegSet(uint32_t bitset) : _bitset(bitset) { }
-
-public:
-
-  AbstractRegSet() : _bitset(0) { }
-
-  AbstractRegSet(RegImpl r1) : _bitset(1 << r1->encoding()) { }
-
-  AbstractRegSet operator+(const AbstractRegSet aSet) const {
-    AbstractRegSet result(_bitset | aSet._bitset);
-    return result;
-  }
-
-  AbstractRegSet operator-(const AbstractRegSet aSet) const {
-    AbstractRegSet result(_bitset & ~aSet._bitset);
-    return result;
-  }
-
-  AbstractRegSet &operator+=(const AbstractRegSet aSet) {
-    *this = *this + aSet;
-    return *this;
-  }
-
-  AbstractRegSet &operator-=(const AbstractRegSet aSet) {
-    *this = *this - aSet;
-    return *this;
-  }
-
-  static AbstractRegSet of(RegImpl r1) {
-    return AbstractRegSet(r1);
-  }
-
-  static AbstractRegSet of(RegImpl r1, RegImpl r2) {
-    return of(r1) + r2;
-  }
-
-  static AbstractRegSet of(RegImpl r1, RegImpl r2, RegImpl r3) {
-    return of(r1, r2) + r3;
-  }
-
-  static AbstractRegSet of(RegImpl r1, RegImpl r2, RegImpl r3, RegImpl r4) {
-    return of(r1, r2, r3) + r4;
-  }
-
-  static AbstractRegSet range(RegImpl start, RegImpl end) {
-    uint32_t bits = ~0;
-    bits <<= start->encoding();
-    bits <<= 31 - end->encoding();
-    bits >>= 31 - end->encoding();
-
-    return AbstractRegSet(bits);
-  }
-
-  uint32_t bits() const { return _bitset; }
-
-private:
-
-  RegImpl first();
-
-public:
-
-  friend class RegSetIterator<RegImpl>;
-
-  RegSetIterator<RegImpl> begin();
-};
-
 typedef AbstractRegSet<Register> RegSet;
 typedef AbstractRegSet<FloatRegister> FloatRegSet;
 typedef AbstractRegSet<PRegister> PRegSet;
 
-template <class RegImpl>
-class RegSetIterator {
-  AbstractRegSet<RegImpl> _regs;
-
-public:
-  RegSetIterator(AbstractRegSet<RegImpl> x): _regs(x) {}
-  RegSetIterator(const RegSetIterator& mit) : _regs(mit._regs) {}
-
-  RegSetIterator& operator++() {
-    RegImpl r = _regs.first();
-    if (r->is_valid())
-      _regs -= r;
-    return *this;
-  }
-
-  bool operator==(const RegSetIterator& rhs) const {
-    return _regs.bits() == rhs._regs.bits();
-  }
-  bool operator!=(const RegSetIterator& rhs) const {
-    return ! (rhs == *this);
-  }
-
-  RegImpl operator*() {
-    return _regs.first();
-  }
-};
-
-template <class RegImpl>
-inline RegSetIterator<RegImpl> AbstractRegSet<RegImpl>::begin() {
-  return RegSetIterator<RegImpl>(*this);
-}
-
 template <>
 inline Register AbstractRegSet<Register>::first() {
   uint32_t first = _bitset & -_bitset;
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 5a92dcb6b47..1b41f09d972 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "asm/register.hpp"
 #include "atomic_aarch64.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/shared/barrierSet.hpp"
@@ -1320,10 +1321,10 @@ class StubGenerator: public StubCodeGenerator {
   void clobber_registers() {
 #ifdef ASSERT
     RegSet clobbered
-      = MacroAssembler::call_clobbered_registers() - rscratch1;
+      = MacroAssembler::call_clobbered_gp_registers() - rscratch1;
     __ mov(rscratch1, (uint64_t)0xdeadbeef);
     __ orr(rscratch1, rscratch1, rscratch1, Assembler::LSL, 32);
-    for (RegSetIterator<> it = clobbered.begin(); *it != noreg; ++it) {
+    for (RegSetIterator<Register> it = clobbered.begin(); *it != noreg; ++it) {
       __ mov(*it, rscratch1);
     }
 #endif
@@ -6629,7 +6630,7 @@ class StubGenerator: public StubCodeGenerator {
 
       // Register allocation
 
-      RegSetIterator<> regs = (RegSet::range(r0, r26) - r18_tls).begin();
+      RegSetIterator<Register> regs = (RegSet::range(r0, r26) - r18_tls).begin();
       Pa_base = *regs;       // Argument registers
       if (squaring)
         Pb_base = Pa_base;
diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
index 0fb005ce06f..475a92d0f43 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
@@ -67,7 +67,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
 
     __ jcc(Assembler::equal, filtered);
 
-    __ pusha();                      // push registers
+    __ push_call_clobbered_registers(false /* save_fpu */);
 #ifdef _LP64
     if (count == c_rarg0) {
       if (addr == c_rarg1) {
@@ -90,7 +90,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
     __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry),
                     addr, count);
 #endif
-    __ popa();
+    __ pop_call_clobbered_registers(false /* save_fpu */);
 
     __ bind(filtered);
   }
@@ -98,7 +98,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm
 
 void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                              Register addr, Register count, Register tmp) {
-  __ pusha();             // push registers (overkill)
+  __ push_call_clobbered_registers(false /* save_fpu */);
 #ifdef _LP64
   if (c_rarg0 == count) { // On win64 c_rarg0 == rcx
     assert_different_registers(c_rarg1, addr);
@@ -114,7 +114,7 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
   __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry),
                   addr, count);
 #endif
-  __ popa();
+  __ pop_call_clobbered_registers(false /* save_fpu */);
 }
 
 void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
@@ -204,14 +204,15 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
   __ jmp(done);
 
   __ bind(runtime);
-  // save the live input values
-  if(tosca_live) __ push(rax);
 
-  if (obj != noreg && obj != rax)
-    __ push(obj);
+  // Determine and save the live input values
+  RegSet saved;
+  if (tosca_live) saved += RegSet::of(rax);
+  if (obj != noreg && obj != rax) saved += RegSet::of(obj);
+  if (pre_val != rax) saved += RegSet::of(pre_val);
+  NOT_LP64( saved += RegSet::of(thread); )
 
-  if (pre_val != rax)
-    __ push(pre_val);
+  __ push_set(saved);
 
   // Calling the runtime using the regular call_VM_leaf mechanism generates
   // code (generated by InterpreterMacroAssember::call_VM_leaf_base)
@@ -225,8 +226,6 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
   // So when we do not have have a full interpreter frame on the stack
   // expand_call should be passed true.
 
-  NOT_LP64( __ push(thread); )
-
   if (expand_call) {
     LP64_ONLY( assert(pre_val != c_rarg1, "smashed arg"); )
 #ifdef _LP64
@@ -244,17 +243,7 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
   } else {
     __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, thread);
   }
-
-  NOT_LP64( __ pop(thread); )
-
-  // save the live input values
-  if (pre_val != rax)
-    __ pop(pre_val);
-
-  if (obj != noreg && obj != rax)
-    __ pop(obj);
-
-  if(tosca_live) __ pop(rax);
+  __ pop_set(saved);
 
   __ bind(done);
 }
@@ -328,15 +317,10 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
 
   __ bind(runtime);
   // save the live input values
-  __ push(store_addr);
-#ifdef _LP64
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, r15_thread);
-#else
-  __ push(thread);
+  RegSet saved = RegSet::of(store_addr NOT_LP64(COMMA thread));
+  __ push_set(saved);
   __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, thread);
-  __ pop(thread);
-#endif
-  __ pop(store_addr);
+  __ pop_set(saved);
 
   __ bind(done);
 }
@@ -495,13 +479,13 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
 
   __ bind(runtime);
 
-  __ save_live_registers_no_oop_map(true);
+  __ push_call_clobbered_registers();
 
   // load the pre-value
   __ load_parameter(0, rcx);
   __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), rcx, thread);
 
-  __ restore_live_registers(true);
+  __ pop_call_clobbered_registers();
 
   __ bind(done);
 
@@ -514,9 +498,6 @@ void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler*
 void G1BarrierSetAssembler::generate_c1_post_barrier_runtime_stub(StubAssembler* sasm) {
   __ prologue("g1_post_barrier", false);
 
-  // arg0: store_address
-  Address store_addr(rbp, 2*BytesPerWord);
-
   CardTableBarrierSet* ct =
     barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
 
@@ -572,12 +553,11 @@ void G1BarrierSetAssembler::generate_c1_post_barrier_runtime_stub(StubAssembler*
   __ jmp(enqueued);
 
   __ bind(runtime);
-
-  __ save_live_registers_no_oop_map(true);
+  __ push_call_clobbered_registers();
 
   __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, thread);
 
-  __ restore_live_registers(true);
+  __ pop_call_clobbered_registers();
 
   __ bind(enqueued);
   __ pop(rdx);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 944e7b9b816..e9285b11e42 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -26,6 +26,7 @@
 #include "jvm.h"
 #include "asm/assembler.hpp"
 #include "asm/assembler.inline.hpp"
+#include "c1/c1_FrameMap.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "compiler/disassembler.hpp"
 #include "gc/shared/barrierSet.hpp"
@@ -3578,6 +3579,190 @@ void MacroAssembler::tlab_allocate(Register thread, Register obj,
   bs->tlab_allocate(this, thread, obj, var_size_in_bytes, con_size_in_bytes, t1, t2, slow_case);
 }
 
+RegSet MacroAssembler::call_clobbered_gp_registers() {
+  RegSet regs;
+#ifdef _LP64
+  regs += RegSet::of(rax, rcx, rdx);
+#ifndef WINDOWS
+  regs += RegSet::of(rsi, rdi);
+#endif
+  regs += RegSet::range(r8, r11);
+#else
+  regs += RegSet::of(rax, rcx, rdx);
+#endif
+  return regs;
+}
+
+XMMRegSet MacroAssembler::call_clobbered_xmm_registers() {
+#if defined(WINDOWS) && defined(_LP64)
+  XMMRegSet result = XMMRegSet::range(xmm0, xmm5);
+  if (FrameMap::get_num_caller_save_xmms() > 16) {
+     result += XMMRegSet::range(xmm16, as_XMMRegister(FrameMap::get_num_caller_save_xmms() - 1));
+  }
+  return result;
+#else
+  return XMMRegSet::range(xmm0, as_XMMRegister(FrameMap::get_num_caller_save_xmms() - 1));
+#endif
+}
+
+static int FPUSaveAreaSize = align_up(108, StackAlignmentInBytes); // 108 bytes needed for FPU state by fsave/frstor
+
+#ifndef _LP64
+static bool use_x87_registers() { return UseSSE < 2; }
+#endif
+static bool use_xmm_registers() { return UseSSE >= 1; }
+
+// C1 only ever uses the first double/float of the XMM register.
+static int xmm_save_size() { return UseSSE >= 2 ? sizeof(double) : sizeof(float); }
+
+static void save_xmm_register(MacroAssembler* masm, int offset, XMMRegister reg) {
+  if (UseSSE == 1) {
+    masm->movflt(Address(rsp, offset), reg);
+  } else {
+    masm->movdbl(Address(rsp, offset), reg);
+  }
+}
+
+static void restore_xmm_register(MacroAssembler* masm, int offset, XMMRegister reg) {
+  if (UseSSE == 1) {
+    masm->movflt(reg, Address(rsp, offset));
+  } else {
+    masm->movdbl(reg, Address(rsp, offset));
+  }
+}
+
+int register_section_sizes(RegSet gp_registers, XMMRegSet xmm_registers, bool save_fpu,
+                           int& gp_area_size, int& fp_area_size, int& xmm_area_size) {
+
+  gp_area_size = align_up(gp_registers.size() * RegisterImpl::max_slots_per_register * VMRegImpl::stack_slot_size,
+                         StackAlignmentInBytes);
+#ifdef _LP64
+  fp_area_size = 0;
+#else
+  fp_area_size = (save_fpu && use_x87_registers()) ? FPUSaveAreaSize : 0;
+#endif
+  xmm_area_size = (save_fpu && use_xmm_registers()) ? xmm_registers.size() * xmm_save_size() : 0;
+
+  return gp_area_size + fp_area_size + xmm_area_size;
+}
+
+void MacroAssembler::push_call_clobbered_registers_except(RegSet exclude, bool save_fpu) {
+  block_comment("push_call_clobbered_registers start");
+  // Regular registers
+  RegSet gp_registers_to_push = call_clobbered_gp_registers() - exclude;
+
+  int gp_area_size;
+  int fp_area_size;
+  int xmm_area_size;
+  int total_save_size = register_section_sizes(gp_registers_to_push, call_clobbered_xmm_registers(), save_fpu,
+                                               gp_area_size, fp_area_size, xmm_area_size);
+  subptr(rsp, total_save_size);
+
+  push_set(gp_registers_to_push, 0);
+
+#ifndef _LP64
+  if (save_fpu && use_x87_registers()) {
+    fnsave(Address(rsp, gp_area_size));
+    fwait();
+  }
+#endif
+  if (save_fpu && use_xmm_registers()) {
+    push_set(call_clobbered_xmm_registers(), gp_area_size + fp_area_size);
+  }
+
+  block_comment("push_call_clobbered_registers end");
+}
+
+void MacroAssembler::pop_call_clobbered_registers_except(RegSet exclude, bool restore_fpu) {
+  block_comment("pop_call_clobbered_registers start");
+
+  RegSet gp_registers_to_pop = call_clobbered_gp_registers() - exclude;
+
+  int gp_area_size;
+  int fp_area_size;
+  int xmm_area_size;
+  int total_save_size = register_section_sizes(gp_registers_to_pop, call_clobbered_xmm_registers(), restore_fpu,
+                                               gp_area_size, fp_area_size, xmm_area_size);
+
+  if (restore_fpu && use_xmm_registers()) {
+    pop_set(call_clobbered_xmm_registers(), gp_area_size + fp_area_size);
+  }
+#ifndef _LP64
+  if (restore_fpu && use_x87_registers()) {
+    frstor(Address(rsp, gp_area_size));
+  }
+#endif
+
+  pop_set(gp_registers_to_pop, 0);
+
+  addptr(rsp, total_save_size);
+
+  vzeroupper();
+
+  block_comment("pop_call_clobbered_registers end");
+}
+
+void MacroAssembler::push_set(XMMRegSet set, int offset) {
+  assert(is_aligned(set.size() * xmm_save_size(), StackAlignmentInBytes), "must be");
+  int spill_offset = offset;
+
+  for (RegSetIterator<XMMRegister> it = set.begin(); *it != xnoreg; ++it) {
+    save_xmm_register(this, spill_offset, *it);
+    spill_offset += xmm_save_size();
+  }
+}
+
+void MacroAssembler::pop_set(XMMRegSet set, int offset) {
+  int restore_size = set.size() * xmm_save_size();
+  assert(is_aligned(restore_size, StackAlignmentInBytes), "must be");
+
+  int restore_offset = offset + restore_size - xmm_save_size();
+
+  for (ReverseRegSetIterator<XMMRegister> it = set.rbegin(); *it != xnoreg; ++it) {
+    restore_xmm_register(this, restore_offset, *it);
+    restore_offset -= xmm_save_size();
+  }
+}
+
+void MacroAssembler::push_set(RegSet set, int offset) {
+  int spill_offset;
+  if (offset == -1) {
+    int register_push_size = set.size() * RegisterImpl::max_slots_per_register * VMRegImpl::stack_slot_size;
+    int aligned_size = align_up(register_push_size, StackAlignmentInBytes);
+    subptr(rsp, aligned_size);
+    spill_offset = 0;
+  } else {
+    spill_offset = offset;
+  }
+
+  for (RegSetIterator<Register> it = set.begin(); *it != noreg; ++it) {
+    movptr(Address(rsp, spill_offset), *it);
+    spill_offset += RegisterImpl::max_slots_per_register * VMRegImpl::stack_slot_size;
+  }
+}
+
+void MacroAssembler::pop_set(RegSet set, int offset) {
+
+  int gp_reg_size = RegisterImpl::max_slots_per_register * VMRegImpl::stack_slot_size;
+  int restore_size = set.size() * gp_reg_size;
+  int aligned_size = align_up(restore_size, StackAlignmentInBytes);
+
+  int restore_offset;
+  if (offset == -1) {
+    restore_offset = restore_size - gp_reg_size;
+  } else {
+    restore_offset = offset + restore_size - gp_reg_size;
+  }
+  for (ReverseRegSetIterator<Register> it = set.rbegin(); *it != noreg; ++it) {
+    movptr(*it, Address(rsp, restore_offset));
+    restore_offset -= gp_reg_size;
+  }
+
+  if (offset == -1) {
+    addptr(rsp, aligned_size);
+  }
+}
+
 // Defines obj, preserves var_size_in_bytes
 void MacroAssembler::eden_allocate(Register thread, Register obj,
                                    Register var_size_in_bytes,
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 918019d015c..9b3da9d5de1 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -26,6 +26,7 @@
 #define CPU_X86_MACROASSEMBLER_X86_HPP
 
 #include "asm/assembler.hpp"
+#include "asm/register.hpp"
 #include "code/vmreg.inline.hpp"
 #include "compiler/oopMap.hpp"
 #include "utilities/macros.hpp"
@@ -521,6 +522,35 @@ class MacroAssembler: public Assembler {
   // Round up to a power of two
   void round_to(Register reg, int modulus);
 
+private:
+  // General purpose and XMM registers potentially clobbered by native code; there
+  // is no need for FPU or AVX opmask related methods because C1/interpreter
+  // - we save/restore FPU state as a whole always
+  // - do not care about AVX-512 opmask
+  static RegSet call_clobbered_gp_registers();
+  static XMMRegSet call_clobbered_xmm_registers();
+
+  void push_set(XMMRegSet set, int offset);
+  void pop_set(XMMRegSet set, int offset);
+
+public:
+  void push_set(RegSet set, int offset = -1);
+  void pop_set(RegSet set, int offset = -1);
+
+  // Push and pop everything that might be clobbered by a native
+  // runtime call.
+  // Only save the lower 64 bits of each vector register.
+  // Additonal registers can be excluded in a passed RegSet.
+  void push_call_clobbered_registers_except(RegSet exclude, bool save_fpu = true);
+  void pop_call_clobbered_registers_except(RegSet exclude, bool restore_fpu = true);
+
+  void push_call_clobbered_registers(bool save_fpu = true) {
+    push_call_clobbered_registers_except(RegSet(), save_fpu);
+  }
+  void pop_call_clobbered_registers(bool restore_fpu = true) {
+    pop_call_clobbered_registers_except(RegSet(), restore_fpu);
+  }
+
   // allocation
   void eden_allocate(
     Register thread,                   // Current thread
diff --git a/src/hotspot/cpu/x86/register_x86.hpp b/src/hotspot/cpu/x86/register_x86.hpp
index 38ca95c0126..f57b1db48c8 100644
--- a/src/hotspot/cpu/x86/register_x86.hpp
+++ b/src/hotspot/cpu/x86/register_x86.hpp
@@ -26,6 +26,8 @@
 #define CPU_X86_REGISTER_X86_HPP
 
 #include "asm/register.hpp"
+#include "utilities/count_leading_zeros.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 class VMRegImpl;
 typedef VMRegImpl* VMReg;
@@ -272,4 +274,33 @@ class ConcreteRegisterImpl : public AbstractRegisterImpl {
 
 };
 
+template <>
+inline Register AbstractRegSet<Register>::first() {
+  uint32_t first = _bitset & -_bitset;
+  return first ? as_Register(exact_log2(first)) : noreg;
+}
+
+template <>
+inline Register AbstractRegSet<Register>::last() {
+  if (_bitset == 0) { return noreg; }
+  uint32_t last = 31 - count_leading_zeros(_bitset);
+  return as_Register(last);
+}
+
+template <>
+inline XMMRegister AbstractRegSet<XMMRegister>::first() {
+  uint32_t first = _bitset & -_bitset;
+  return first ? as_XMMRegister(exact_log2(first)) : xnoreg;
+}
+
+template <>
+inline XMMRegister AbstractRegSet<XMMRegister>::last() {
+  if (_bitset == 0) { return xnoreg; }
+  uint32_t last = 31 - count_leading_zeros(_bitset);
+  return as_XMMRegister(last);
+}
+
+typedef AbstractRegSet<Register> RegSet;
+typedef AbstractRegSet<XMMRegister> XMMRegSet;
+
 #endif // CPU_X86_REGISTER_X86_HPP
diff --git a/src/hotspot/share/asm/register.hpp b/src/hotspot/share/asm/register.hpp
index 4207267ebab..b8538e4df68 100644
--- a/src/hotspot/share/asm/register.hpp
+++ b/src/hotspot/share/asm/register.hpp
@@ -28,6 +28,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/population_count.hpp"
 
 // Use AbstractRegister as shortcut
 class AbstractRegisterImpl;
@@ -86,6 +87,149 @@ const type name = ((type)value)
 #define INTERNAL_VISIBILITY
 #endif
 
+template <class RegImpl> class RegSetIterator;
+template <class RegImpl> class ReverseRegSetIterator;
+
+// A set of registers
+template <class RegImpl>
+class AbstractRegSet {
+  uint32_t _bitset;
+
+  AbstractRegSet(uint32_t bitset) : _bitset(bitset) { }
+
+public:
+
+  AbstractRegSet() : _bitset(0) { }
+
+  AbstractRegSet(RegImpl r1) : _bitset(1 << r1->encoding()) { }
+
+  AbstractRegSet operator+(const AbstractRegSet aSet) const {
+    AbstractRegSet result(_bitset | aSet._bitset);
+    return result;
+  }
+
+  AbstractRegSet operator-(const AbstractRegSet aSet) const {
+    AbstractRegSet result(_bitset & ~aSet._bitset);
+    return result;
+  }
+
+  AbstractRegSet &operator+=(const AbstractRegSet aSet) {
+    *this = *this + aSet;
+    return *this;
+  }
+
+  AbstractRegSet &operator-=(const AbstractRegSet aSet) {
+    *this = *this - aSet;
+    return *this;
+  }
+
+  static AbstractRegSet of(RegImpl r1) {
+    return AbstractRegSet(r1);
+  }
+
+  static AbstractRegSet of(RegImpl r1, RegImpl r2) {
+    return of(r1) + r2;
+  }
+
+  static AbstractRegSet of(RegImpl r1, RegImpl r2, RegImpl r3) {
+    return of(r1, r2) + r3;
+  }
+
+  static AbstractRegSet of(RegImpl r1, RegImpl r2, RegImpl r3, RegImpl r4) {
+    return of(r1, r2, r3) + r4;
+  }
+
+  static AbstractRegSet range(RegImpl start, RegImpl end) {
+    assert(start <= end, "must be");
+    uint32_t bits = ~0;
+    bits <<= start->encoding();
+    bits <<= 31 - end->encoding();
+    bits >>= 31 - end->encoding();
+
+    return AbstractRegSet(bits);
+  }
+
+  uint size() const { return population_count(_bitset); }
+
+  uint32_t bits() const { return _bitset; }
+
+private:
+
+  RegImpl first();
+  RegImpl last();
+
+public:
+
+  friend class RegSetIterator<RegImpl>;
+  friend class ReverseRegSetIterator<RegImpl>;
+
+  RegSetIterator<RegImpl> begin();
+  ReverseRegSetIterator<RegImpl> rbegin();
+};
+
+template <class RegImpl>
+class RegSetIterator {
+  AbstractRegSet<RegImpl> _regs;
+
+public:
+  RegSetIterator(AbstractRegSet<RegImpl> x): _regs(x) {}
+  RegSetIterator(const RegSetIterator& mit) : _regs(mit._regs) {}
+
+  RegSetIterator& operator++() {
+    RegImpl r = _regs.first();
+    if (r->is_valid())
+      _regs -= r;
+    return *this;
+  }
+
+  bool operator==(const RegSetIterator& rhs) const {
+    return _regs.bits() == rhs._regs.bits();
+  }
+  bool operator!=(const RegSetIterator& rhs) const {
+    return ! (rhs == *this);
+  }
+
+  RegImpl operator*() {
+    return _regs.first();
+  }
+};
+
+template <class RegImpl>
+inline RegSetIterator<RegImpl> AbstractRegSet<RegImpl>::begin() {
+  return RegSetIterator<RegImpl>(*this);
+}
+
+template <class RegImpl>
+class ReverseRegSetIterator {
+  AbstractRegSet<RegImpl> _regs;
+
+public:
+  ReverseRegSetIterator(AbstractRegSet<RegImpl> x): _regs(x) {}
+  ReverseRegSetIterator(const ReverseRegSetIterator& mit) : _regs(mit._regs) {}
+
+  ReverseRegSetIterator& operator++() {
+    RegImpl r = _regs.last();
+    if (r->is_valid())
+      _regs -= r;
+    return *this;
+  }
+
+  bool operator==(const ReverseRegSetIterator& rhs) const {
+    return _regs.bits() == rhs._regs.bits();
+  }
+  bool operator!=(const ReverseRegSetIterator& rhs) const {
+    return ! (rhs == *this);
+  }
+
+  RegImpl operator*() {
+    return _regs.last();
+  }
+};
+
+template <class RegImpl>
+inline ReverseRegSetIterator<RegImpl> AbstractRegSet<RegImpl>::rbegin() {
+  return ReverseRegSetIterator<RegImpl>(*this);
+}
 
 #include CPU_HEADER(register)
 
-- 
GitLab


From b617f1db4ec5d54b1ea541fb885e296da928f166 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 21 Mar 2022 11:30:26 +0000
Subject: [PATCH 142/345] 8283447: Remove unused LIR_Assembler::_bs

Reviewed-by: redestad
---
 src/hotspot/share/c1/c1_LIRAssembler.cpp | 4 +---
 src/hotspot/share/c1/c1_LIRAssembler.hpp | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/c1/c1_LIRAssembler.cpp b/src/hotspot/share/c1/c1_LIRAssembler.cpp
index be0a6abc2ca..1c4e0d09306 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.cpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 #include "c1/c1_ValueStack.hpp"
 #include "ci/ciInstance.hpp"
 #include "compiler/oopMap.hpp"
-#include "gc/shared/barrierSet.hpp"
 #include "runtime/os.hpp"
 #include "runtime/vm_version.hpp"
 
@@ -104,7 +103,6 @@ PatchingStub::PatchID LIR_Assembler::patching_id(CodeEmitInfo* info) {
 
 LIR_Assembler::LIR_Assembler(Compilation* c):
    _masm(c->masm())
- , _bs(BarrierSet::barrier_set())
  , _compilation(c)
  , _frame_map(c->frame_map())
  , _current_block(NULL)
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.hpp b/src/hotspot/share/c1/c1_LIRAssembler.hpp
index f27ade60bae..1d873b9638d 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.hpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,13 +32,11 @@
 
 class Compilation;
 class ScopeValue;
-class BarrierSet;
 
 class LIR_Assembler: public CompilationResourceObj {
  private:
   C1_MacroAssembler* _masm;
   CodeStubList*      _slow_case_stubs;
-  BarrierSet*        _bs;
 
   Compilation*       _compilation;
   FrameMap*          _frame_map;
-- 
GitLab


From 909986c7e110c8ac3ba16750be7707b1ec344ee5 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Mon, 21 Mar 2022 12:26:58 +0000
Subject: [PATCH 143/345] 8283217: Leak FcObjectSet in getFontConfigLocations()
 in fontpath.c

Reviewed-by: prr, aivanov
---
 src/java.desktop/unix/native/common/awt/fontpath.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c
index 051c9de88fa..fd28f5c0ea6 100644
--- a/src/java.desktop/unix/native/common/awt/fontpath.c
+++ b/src/java.desktop/unix/native/common/awt/fontpath.c
@@ -496,6 +496,7 @@ typedef FcResult (*FcPatternGetStringFuncType)(const FcPattern *p,
                                                FcChar8 ** s);
 typedef FcChar8* (*FcStrDirnameFuncType)(const FcChar8 *file);
 typedef void (*FcPatternDestroyFuncType)(FcPattern *p);
+typedef void (*FcObjectSetDestroyFuncType)(FcObjectSet *os);
 typedef void (*FcFontSetDestroyFuncType)(FcFontSet *s);
 typedef FcPattern* (*FcNameParseFuncType)(const FcChar8 *name);
 typedef FcBool (*FcPatternAddStringFuncType)(FcPattern *p,
@@ -542,6 +543,7 @@ static char **getFontConfigLocations() {
     FcPatternGetStringFuncType FcPatternGetString;
     FcStrDirnameFuncType FcStrDirname;
     FcPatternDestroyFuncType FcPatternDestroy;
+    FcObjectSetDestroyFuncType FcObjectSetDestroy;
     FcFontSetDestroyFuncType FcFontSetDestroy;
 
     FcConfig *fontconfig;
@@ -571,6 +573,8 @@ static char **getFontConfigLocations() {
         (FcStrDirnameFuncType)dlsym(libfontconfig, "FcStrDirname");
     FcPatternDestroy   =
         (FcPatternDestroyFuncType)dlsym(libfontconfig, "FcPatternDestroy");
+    FcObjectSetDestroy =
+        (FcObjectSetDestroyFuncType)dlsym(libfontconfig, "FcObjectSetDestroy");
     FcFontSetDestroy   =
         (FcFontSetDestroyFuncType)dlsym(libfontconfig, "FcFontSetDestroy");
 
@@ -580,6 +584,7 @@ static char **getFontConfigLocations() {
         FcFontList         == NULL ||
         FcStrDirname       == NULL ||
         FcPatternDestroy   == NULL ||
+        FcObjectSetDestroy == NULL ||
         FcFontSetDestroy   == NULL) { /* problem with the library: return. */
         closeFontConfig(libfontconfig, JNI_FALSE);
         return NULL;
@@ -636,6 +641,7 @@ static char **getFontConfigLocations() {
 
 cleanup:
     /* Free memory and close the ".so" */
+    (*FcObjectSetDestroy)(objset);
     (*FcPatternDestroy)(pattern);
     closeFontConfig(libfontconfig, JNI_TRUE);
     return fontdirs;
-- 
GitLab


From cb576da575ea3c8f14087dd312313843764ca2f4 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Mon, 21 Mar 2022 12:28:17 +0000
Subject: [PATCH 144/345] 8283379: Memory leak in FileHeaderHelper

Reviewed-by: dholmes, iklam, stuefe
---
 src/hotspot/share/cds/filemap.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 7901ab855ce..b8e28f30b72 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -1108,6 +1108,9 @@ public:
   }
 
   ~FileHeaderHelper() {
+    if (_header != nullptr) {
+      FREE_C_HEAP_ARRAY(char, _header);
+    }
     if (_fd != -1) {
       ::close(_fd);
     }
-- 
GitLab


From c4dc58e12e197562dce90c0027aa74c29047cea6 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 21 Mar 2022 15:33:09 +0000
Subject: [PATCH 145/345] 8283277: ISO 4217 Amendment 171 Update

Reviewed-by: iris, joehw
---
 make/data/currency/CurrencyData.properties                | 8 ++++----
 .../classes/sun/util/resources/CurrencyNames.properties   | 4 +++-
 test/jdk/java/util/Currency/ValidateISO4217.java          | 6 +++---
 test/jdk/java/util/Currency/tablea1.txt                   | 8 ++++----
 test/jdk/sun/text/resources/LocaleData                    | 1 +
 test/jdk/sun/text/resources/LocaleDataTest.java           | 4 ++--
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/make/data/currency/CurrencyData.properties b/make/data/currency/CurrencyData.properties
index 236e544feaf..d86fc6ddfd4 100644
--- a/make/data/currency/CurrencyData.properties
+++ b/make/data/currency/CurrencyData.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ formatVersion=3
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=170
+dataVersion=171
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -51,7 +51,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
     MTL470-MUR480-MVR462-MWK454-MXN484-MXV979-MYR458-MZM508-MZN943-NAD516-NGN566-\
     NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
     PKR586-PLN985-PTE620-PYG600-QAR634-ROL642-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
-    SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
+    SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLE925-SLL694-SOS706-\
     SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
     TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
     UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
@@ -484,7 +484,7 @@ CS=CSD
 # SEYCHELLES
 SC=SCR
 # SIERRA LEONE
-SL=SLL
+SL=SLE
 # SINGAPORE
 SG=SGD
 # SLOVAKIA
diff --git a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
index 9f1867d2cd1..53bf1d837ff 100644
--- a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
+++ b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -221,6 +221,7 @@ SGD=SGD
 SHP=SHP
 SIT=SIT
 SKK=SKK
+SLE=SLE
 SLL=SLL
 SOS=SOS
 SRD=SRD
@@ -445,6 +446,7 @@ sgd=Singapore Dollar
 shp=Saint Helena Pound
 sit=Slovenian Tolar
 skk=Slovak Koruna
+sle=Sierra Leonean Leone
 sll=Sierra Leonean Leone
 sos=Somali Shilling
 srd=Surinamese Dollar
diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
index 40bb55cfd1f..a0f09842ffe 100644
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
  * @test
  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
  *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
- *      8208746 8209775 8264792 8274658
+ *      8208746 8209775 8264792 8274658 8283277
  * @summary Validate ISO 4217 data for Currency class.
  * @modules java.base/java.util:open
  *          jdk.localedata
@@ -101,7 +101,7 @@ public class ValidateISO4217 {
     static final String otherCodes =
         "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-"
         + "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LTL-LUF-LVL-MGF-MRO-MTL-MXV-MZM-NLG-"
-        + "PTE-ROL-RUR-SDD-SIT-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-VED-"
+        + "PTE-ROL-RUR-SDD-SIT-SLL-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-VED-"
         + "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
         + "YUM-ZMK-ZWD-ZWN-ZWR";
 
diff --git a/test/jdk/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt
index 7716863419f..62d71c8c94b 100644
--- a/test/jdk/java/util/Currency/tablea1.txt
+++ b/test/jdk/java/util/Currency/tablea1.txt
@@ -1,12 +1,12 @@
 #
 #
-# Amendments up until ISO 4217 AMENDMENT NUMBER 170
-#   (As of 1 Oct 2021)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 171
+#   (As of 16 Mar 2022)
 #
 
 # Version
 FILEVERSION=3
-DATAVERSION=170
+DATAVERSION=171
 
 # ISO 4217 currency data
 AF	AFN	971	2
@@ -218,7 +218,7 @@ RS	RSD	941	2
 CS	CSD	891	2
 #CS	EUR	978	2
 SC	SCR	690	2
-SL	SLL	694	2
+SL	SLE	925	2
 SG	SGD	702	2
 SK	EUR	978	2
 # MA 131
diff --git a/test/jdk/sun/text/resources/LocaleData b/test/jdk/sun/text/resources/LocaleData
index ba176097825..50fa417ae6d 100644
--- a/test/jdk/sun/text/resources/LocaleData
+++ b/test/jdk/sun/text/resources/LocaleData
@@ -6448,6 +6448,7 @@ CurrencyNames//rsd=Serbian Dinar
 CurrencyNames//scr=Seychellois Rupee
 CurrencyNames//sdd=Sudanese Dinar (1992-2007)
 CurrencyNames//sit=Slovenian Tolar
+CurrencyNames//sle=Sierra Leonean Leone
 CurrencyNames//sll=Sierra Leonean Leone
 CurrencyNames//srd=Surinamese Dollar
 CurrencyNames//srg=Surinamese Guilder
diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java
index 1d2ddd03a82..51e88d72a2b 100644
--- a/test/jdk/sun/text/resources/LocaleDataTest.java
+++ b/test/jdk/sun/text/resources/LocaleDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
  *      8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
  *      8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
  *      8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
- *      8251317 8274658
+ *      8251317 8274658 8283277
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @modules jdk.localedata
-- 
GitLab


From 999da9bfc5be703141cdc07af455b4b6b2cc1aae Mon Sep 17 00:00:00 2001
From: Johannes Bechberger <johannes.bechberger@sap.com>
Date: Mon, 21 Mar 2022 15:49:59 +0000
Subject: [PATCH 146/345] 8282306: os::is_first_C_frame(frame*) crashes on
 invalid link access

Reviewed-by: stuefe, mdoerr
---
 .../cpu/aarch64/frame_aarch64.inline.hpp      |  6 +++--
 src/hotspot/cpu/arm/frame_arm.inline.hpp      |  6 ++++-
 src/hotspot/cpu/ppc/frame_ppc.inline.hpp      |  4 +++
 src/hotspot/cpu/s390/frame_s390.inline.hpp    |  4 +++
 src/hotspot/cpu/x86/frame_x86.inline.hpp      |  7 ++++--
 src/hotspot/cpu/zero/frame_zero.inline.hpp    |  5 ++++
 src/hotspot/share/runtime/frame.hpp           |  4 +++
 src/hotspot/share/runtime/os.cpp              | 25 +++++++++----------
 .../share/runtime/safefetch.inline.hpp        | 10 ++++++++
 src/hotspot/share/runtime/thread.cpp          |  4 +--
 test/hotspot/gtest/runtime/test_os.cpp        | 11 ++++++++
 11 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
index b0fe436ca59..20b5b8e8662 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
@@ -148,10 +148,12 @@ inline intptr_t* frame::id(void) const { return unextended_sp(); }
 inline bool frame::is_older(intptr_t* id) const   { assert(this->id() != NULL && id != NULL, "NULL frame id");
                                                     return this->id() > id ; }
 
-
-
 inline intptr_t* frame::link() const              { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
 
+inline intptr_t* frame::link_or_null() const {
+  intptr_t** ptr = (intptr_t **)addr_at(link_offset);
+  return os::is_readable_pointer(ptr) ? *ptr : NULL;
+}
 
 inline intptr_t* frame::unextended_sp() const     { return _unextended_sp; }
 
diff --git a/src/hotspot/cpu/arm/frame_arm.inline.hpp b/src/hotspot/cpu/arm/frame_arm.inline.hpp
index 835edd68493..773b6d06f7b 100644
--- a/src/hotspot/cpu/arm/frame_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/frame_arm.inline.hpp
@@ -124,9 +124,13 @@ inline intptr_t* frame::id(void) const { return unextended_sp(); }
 inline bool frame::is_older(intptr_t* id) const   { assert(this->id() != NULL && id != NULL, "NULL frame id");
                                                     return this->id() > id ; }
 
-
 inline intptr_t* frame::link() const              { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
 
+inline intptr_t* frame::link_or_null() const {
+  intptr_t** ptr = (intptr_t **)addr_at(link_offset);
+  return os::is_readable_pointer(ptr) ? *ptr : NULL;
+}
+
 inline intptr_t* frame::unextended_sp() const     { return _unextended_sp; }
 
 // Return address:
diff --git a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
index 705b4abefdb..239db8224c0 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
@@ -117,6 +117,10 @@ inline intptr_t* frame::link() const {
   return (intptr_t*)callers_abi()->callers_sp;
 }
 
+inline intptr_t* frame::link_or_null() const {
+  return link();
+}
+
 inline intptr_t* frame::real_fp() const {
   return fp();
 }
diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
index d8a4395d8ca..5574e6384e2 100644
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
@@ -155,6 +155,10 @@ inline intptr_t* frame::link() const {
   return (intptr_t*) callers_abi()->callers_sp;
 }
 
+inline intptr_t* frame::link_or_null() const {
+  return link();
+}
+
 inline intptr_t** frame::interpreter_frame_locals_addr() const {
   return (intptr_t**) &(ijava_state()->locals);
 }
diff --git a/src/hotspot/cpu/x86/frame_x86.inline.hpp b/src/hotspot/cpu/x86/frame_x86.inline.hpp
index 733a357d5fe..23072238e16 100644
--- a/src/hotspot/cpu/x86/frame_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/frame_x86.inline.hpp
@@ -138,10 +138,13 @@ inline intptr_t* frame::id(void) const { return unextended_sp(); }
 inline bool frame::is_older(intptr_t* id) const   { assert(this->id() != NULL && id != NULL, "NULL frame id");
                                                     return this->id() > id ; }
 
-
-
 inline intptr_t* frame::link() const              { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
 
+inline intptr_t* frame::link_or_null() const {
+  intptr_t** ptr = (intptr_t **)addr_at(link_offset);
+  return os::is_readable_pointer(ptr) ? *ptr : NULL;
+}
+
 inline intptr_t* frame::unextended_sp() const     { return _unextended_sp; }
 
 // Return address:
diff --git a/src/hotspot/cpu/zero/frame_zero.inline.hpp b/src/hotspot/cpu/zero/frame_zero.inline.hpp
index 396e189a5db..dfca0e4bcb1 100644
--- a/src/hotspot/cpu/zero/frame_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/frame_zero.inline.hpp
@@ -82,6 +82,11 @@ inline intptr_t* frame::link() const {
   return NULL;
 }
 
+inline intptr_t* frame::link_or_null() const {
+  ShouldNotCallThis();
+  return NULL;
+}
+
 inline interpreterState frame::get_interpreterState() const {
   return zero_interpreterframe()->interpreter_state();
 }
diff --git a/src/hotspot/share/runtime/frame.hpp b/src/hotspot/share/runtime/frame.hpp
index e4eed4a1198..bc7d3d4775e 100644
--- a/src/hotspot/share/runtime/frame.hpp
+++ b/src/hotspot/share/runtime/frame.hpp
@@ -207,8 +207,12 @@ class frame {
 
  public:
   // Link (i.e., the pointer to the previous frame)
+  // might crash if the frame has no parent
   intptr_t* link() const;
 
+  // Link (i.e., the pointer to the previous frame) or null if the link cannot be accessed
+  intptr_t* link_or_null() const;
+
   // Return address
   address  sender_pc() const;
 
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 6e2ee7654ea..9ac8a993556 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1173,34 +1173,34 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {
   st->print_cr(INTPTR_FORMAT " is an unknown value", p2i(addr));
 }
 
+bool is_pointer_bad(intptr_t* ptr) {
+  return !is_aligned(ptr, sizeof(uintptr_t)) || !os::is_readable_pointer(ptr);
+}
+
 // Looks like all platforms can use the same function to check if C
 // stack is walkable beyond current frame.
+// Returns true if this is not the case, i.e. the frame is possibly
+// the first C frame on the stack.
 bool os::is_first_C_frame(frame* fr) {
 
 #ifdef _WINDOWS
   return true; // native stack isn't walkable on windows this way.
 #endif
-
   // Load up sp, fp, sender sp and sender fp, check for reasonable values.
   // Check usp first, because if that's bad the other accessors may fault
   // on some architectures.  Ditto ufp second, etc.
-  uintptr_t fp_align_mask = (uintptr_t)(sizeof(address)-1);
-  // sp on amd can be 32 bit aligned.
-  uintptr_t sp_align_mask = (uintptr_t)(sizeof(int)-1);
 
-  uintptr_t usp    = (uintptr_t)fr->sp();
-  if ((usp & sp_align_mask) != 0) return true;
+  if (is_pointer_bad(fr->sp())) return true;
 
   uintptr_t ufp    = (uintptr_t)fr->fp();
-  if ((ufp & fp_align_mask) != 0) return true;
+  if (is_pointer_bad(fr->fp())) return true;
 
   uintptr_t old_sp = (uintptr_t)fr->sender_sp();
-  if ((old_sp & sp_align_mask) != 0) return true;
-  if (old_sp == 0 || old_sp == (uintptr_t)-1) return true;
+  if ((uintptr_t)fr->sender_sp() == (uintptr_t)-1 || is_pointer_bad(fr->sender_sp())) return true;
 
-  uintptr_t old_fp = (uintptr_t)fr->link();
-  if ((old_fp & fp_align_mask) != 0) return true;
-  if (old_fp == 0 || old_fp == (uintptr_t)-1 || old_fp == ufp) return true;
+  uintptr_t old_fp = (uintptr_t)fr->link_or_null();
+  if (old_fp == 0 || old_fp == (uintptr_t)-1 || old_fp == ufp ||
+    is_pointer_bad(fr->link_or_null())) return true;
 
   // stack grows downwards; if old_fp is below current fp or if the stack
   // frame is too large, either the stack is corrupted or fp is not saved
@@ -1212,7 +1212,6 @@ bool os::is_first_C_frame(frame* fr) {
   return false;
 }
 
-
 // Set up the boot classpath.
 
 char* os::format_boot_path(const char* format_string,
diff --git a/src/hotspot/share/runtime/safefetch.inline.hpp b/src/hotspot/share/runtime/safefetch.inline.hpp
index 79c833e4db6..cee0853573c 100644
--- a/src/hotspot/share/runtime/safefetch.inline.hpp
+++ b/src/hotspot/share/runtime/safefetch.inline.hpp
@@ -54,10 +54,20 @@ inline intptr_t SafeFetchN(intptr_t* adr, intptr_t errValue) {
 
 // returns true if SafeFetch32 and SafeFetchN can be used safely (stubroutines are already generated)
 inline bool CanUseSafeFetch32() {
+#if defined (__APPLE__) && defined(AARCH64)
+  if (Thread::current_or_null_safe() == NULL) { // workaround for JDK-8282475
+    return false;
+  }
+#endif // __APPLE__ && AARCH64
   return StubRoutines::SafeFetch32_stub() ? true : false;
 }
 
 inline bool CanUseSafeFetchN() {
+#if defined (__APPLE__) && defined(AARCH64)
+  if (Thread::current_or_null_safe() == NULL) {
+    return false;
+  }
+#endif // __APPLE__ && AARCH64
   return StubRoutines::SafeFetchN_stub() ? true : false;
 }
 
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 0ec50849f5a..eb6bce1fdbb 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -336,10 +336,10 @@ void Thread::call_run() {
 
   // Perform common initialization actions
 
-  register_thread_stack_with_NMT();
-
   MACOS_AARCH64_ONLY(this->init_wx());
 
+  register_thread_stack_with_NMT();
+
   JFR_ONLY(Jfr::on_thread_start(this);)
 
   log_debug(os, thread)("Thread " UINTX_FORMAT " stack dimensions: "
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 60bd02a42ee..0f78630d460 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -32,6 +32,7 @@
 #include "utilities/ostream.hpp"
 #include "utilities/align.hpp"
 #include "unittest.hpp"
+#include "runtime/frame.inline.hpp"
 
 static size_t small_page_size() {
   return os::vm_page_size();
@@ -865,3 +866,13 @@ TEST_VM(os, iso8601_time) {
   // Canary should still be intact
   EXPECT_EQ(buffer[os::iso8601_timestamp_size], 'X');
 }
+
+TEST_VM(os, is_first_C_frame) {
+#ifndef _WIN32
+  frame invalid_frame;
+  EXPECT_TRUE(os::is_first_C_frame(&invalid_frame)); // the frame has zeroes for all values
+
+  frame cur_frame = os::current_frame(); // this frame has to have a sender
+  EXPECT_FALSE(os::is_first_C_frame(&cur_frame));
+#endif // _WIN32
+}
-- 
GitLab


From 19d34bdf99e98a9ef614cb7f93c141e6c82bedcb Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 21 Mar 2022 16:20:20 +0000
Subject: [PATCH 147/345] 8281879: Serial: Merge CardGeneration into
 TenuredGeneration

Reviewed-by: tschatzl, iwalulya
---
 .../share/gc/serial/tenuredGeneration.cpp     | 283 +++++++++++++++-
 .../share/gc/serial/tenuredGeneration.hpp     |  67 +++-
 .../gc/serial/tenuredGeneration.inline.hpp    |  24 ++
 .../share/gc/serial/vmStructs_serial.hpp      |   2 +-
 .../share/gc/shared/cardGeneration.cpp        | 318 ------------------
 .../share/gc/shared/cardGeneration.hpp        |  95 ------
 .../share/gc/shared/cardGeneration.inline.hpp |  56 ---
 src/hotspot/share/gc/shared/generation.hpp    |   3 +-
 src/hotspot/share/gc/shared/vmStructs_gc.hpp  |  12 +-
 .../hotspot/gc/serial/TenuredGeneration.java  |   2 +-
 .../jvm/hotspot/gc/shared/CardGeneration.java |  40 ---
 .../sun/jvm/hotspot/gc/shared/Generation.java |   5 +-
 .../sa/ClhsdbVmStructsDump.java               |   2 +-
 .../jtreg/serviceability/sa/TestType.java     |   1 -
 14 files changed, 367 insertions(+), 543 deletions(-)
 delete mode 100644 src/hotspot/share/gc/shared/cardGeneration.cpp
 delete mode 100644 src/hotspot/share/gc/shared/cardGeneration.hpp
 delete mode 100644 src/hotspot/share/gc/shared/cardGeneration.inline.hpp
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java

diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index acf19426a95..08aede2880f 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -26,8 +26,8 @@
 #include "gc/serial/genMarkSweep.hpp"
 #include "gc/serial/tenuredGeneration.inline.hpp"
 #include "gc/shared/blockOffsetTable.inline.hpp"
-#include "gc/shared/cardGeneration.inline.hpp"
 #include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
@@ -40,13 +40,286 @@
 #include "runtime/java.hpp"
 #include "utilities/macros.hpp"
 
+bool TenuredGeneration::grow_by(size_t bytes) {
+  assert_correct_size_change_locking();
+  bool result = _virtual_space.expand_by(bytes);
+  if (result) {
+    size_t new_word_size =
+       heap_word_size(_virtual_space.committed_size());
+    MemRegion mr(space()->bottom(), new_word_size);
+    // Expand card table
+    GenCollectedHeap::heap()->rem_set()->resize_covered_region(mr);
+    // Expand shared block offset array
+    _bts->resize(new_word_size);
+
+    // Fix for bug #4668531
+    if (ZapUnusedHeapArea) {
+      MemRegion mangle_region(space()->end(),
+      (HeapWord*)_virtual_space.high());
+      SpaceMangler::mangle_region(mangle_region);
+    }
+
+    // Expand space -- also expands space's BOT
+    // (which uses (part of) shared array above)
+    space()->set_end((HeapWord*)_virtual_space.high());
+
+    // update the space and generation capacity counters
+    update_counters();
+
+    size_t new_mem_size = _virtual_space.committed_size();
+    size_t old_mem_size = new_mem_size - bytes;
+    log_trace(gc, heap)("Expanding %s from " SIZE_FORMAT "K by " SIZE_FORMAT "K to " SIZE_FORMAT "K",
+                    name(), old_mem_size/K, bytes/K, new_mem_size/K);
+  }
+  return result;
+}
+
+bool TenuredGeneration::expand(size_t bytes, size_t expand_bytes) {
+  assert_locked_or_safepoint(Heap_lock);
+  if (bytes == 0) {
+    return true;  // That's what grow_by(0) would return
+  }
+  size_t aligned_bytes  = ReservedSpace::page_align_size_up(bytes);
+  if (aligned_bytes == 0){
+    // The alignment caused the number of bytes to wrap.  An expand_by(0) will
+    // return true with the implication that an expansion was done when it
+    // was not.  A call to expand implies a best effort to expand by "bytes"
+    // but not a guarantee.  Align down to give a best effort.  This is likely
+    // the most that the generation can expand since it has some capacity to
+    // start with.
+    aligned_bytes = ReservedSpace::page_align_size_down(bytes);
+  }
+  size_t aligned_expand_bytes = ReservedSpace::page_align_size_up(expand_bytes);
+  bool success = false;
+  if (aligned_expand_bytes > aligned_bytes) {
+    success = grow_by(aligned_expand_bytes);
+  }
+  if (!success) {
+    success = grow_by(aligned_bytes);
+  }
+  if (!success) {
+    success = grow_to_reserved();
+  }
+  if (success && GCLocker::is_active_and_needs_gc()) {
+    log_trace(gc, heap)("Garbage collection disabled, expanded heap instead");
+  }
+
+  return success;
+}
+
+bool TenuredGeneration::grow_to_reserved() {
+  assert_correct_size_change_locking();
+  bool success = true;
+  const size_t remaining_bytes = _virtual_space.uncommitted_size();
+  if (remaining_bytes > 0) {
+    success = grow_by(remaining_bytes);
+    DEBUG_ONLY(if (!success) log_warning(gc)("grow to reserved failed");)
+  }
+  return success;
+}
+
+void TenuredGeneration::shrink(size_t bytes) {
+  assert_correct_size_change_locking();
+
+  size_t size = ReservedSpace::page_align_size_down(bytes);
+  if (size == 0) {
+    return;
+  }
+
+  // Shrink committed space
+  _virtual_space.shrink_by(size);
+  // Shrink space; this also shrinks the space's BOT
+  space()->set_end((HeapWord*) _virtual_space.high());
+  size_t new_word_size = heap_word_size(space()->capacity());
+  // Shrink the shared block offset array
+  _bts->resize(new_word_size);
+  MemRegion mr(space()->bottom(), new_word_size);
+  // Shrink the card table
+  GenCollectedHeap::heap()->rem_set()->resize_covered_region(mr);
+
+  size_t new_mem_size = _virtual_space.committed_size();
+  size_t old_mem_size = new_mem_size + size;
+  log_trace(gc, heap)("Shrinking %s from " SIZE_FORMAT "K to " SIZE_FORMAT "K",
+                      name(), old_mem_size/K, new_mem_size/K);
+}
+
+// Objects in this generation may have moved, invalidate this
+// generation's cards.
+void TenuredGeneration::invalidate_remembered_set() {
+  _rs->invalidate(used_region());
+}
+
+void TenuredGeneration::compute_new_size_inner() {
+  assert(_shrink_factor <= 100, "invalid shrink factor");
+  size_t current_shrink_factor = _shrink_factor;
+  if (ShrinkHeapInSteps) {
+    // Always reset '_shrink_factor' if the heap is shrunk in steps.
+    // If we shrink the heap in this iteration, '_shrink_factor' will
+    // be recomputed based on the old value further down in this fuction.
+    _shrink_factor = 0;
+  }
+
+  // We don't have floating point command-line arguments
+  // Note:  argument processing ensures that MinHeapFreeRatio < 100.
+  const double minimum_free_percentage = MinHeapFreeRatio / 100.0;
+  const double maximum_used_percentage = 1.0 - minimum_free_percentage;
+
+  // Compute some numbers about the state of the heap.
+  const size_t used_after_gc = used();
+  const size_t capacity_after_gc = capacity();
+
+  const double min_tmp = used_after_gc / maximum_used_percentage;
+  size_t minimum_desired_capacity = (size_t)MIN2(min_tmp, double(max_uintx));
+  // Don't shrink less than the initial generation size
+  minimum_desired_capacity = MAX2(minimum_desired_capacity, initial_size());
+  assert(used_after_gc <= minimum_desired_capacity, "sanity check");
+
+    const size_t free_after_gc = free();
+    const double free_percentage = ((double)free_after_gc) / capacity_after_gc;
+    log_trace(gc, heap)("TenuredGeneration::compute_new_size:");
+    log_trace(gc, heap)("    minimum_free_percentage: %6.2f  maximum_used_percentage: %6.2f",
+                  minimum_free_percentage,
+                  maximum_used_percentage);
+    log_trace(gc, heap)("     free_after_gc   : %6.1fK   used_after_gc   : %6.1fK   capacity_after_gc   : %6.1fK",
+                  free_after_gc / (double) K,
+                  used_after_gc / (double) K,
+                  capacity_after_gc / (double) K);
+    log_trace(gc, heap)("     free_percentage: %6.2f", free_percentage);
+
+  if (capacity_after_gc < minimum_desired_capacity) {
+    // If we have less free space than we want then expand
+    size_t expand_bytes = minimum_desired_capacity - capacity_after_gc;
+    // Don't expand unless it's significant
+    if (expand_bytes >= _min_heap_delta_bytes) {
+      expand(expand_bytes, 0); // safe if expansion fails
+    }
+    log_trace(gc, heap)("    expanding:  minimum_desired_capacity: %6.1fK  expand_bytes: %6.1fK  _min_heap_delta_bytes: %6.1fK",
+                  minimum_desired_capacity / (double) K,
+                  expand_bytes / (double) K,
+                  _min_heap_delta_bytes / (double) K);
+    return;
+  }
+
+  // No expansion, now see if we want to shrink
+  size_t shrink_bytes = 0;
+  // We would never want to shrink more than this
+  size_t max_shrink_bytes = capacity_after_gc - minimum_desired_capacity;
+
+  if (MaxHeapFreeRatio < 100) {
+    const double maximum_free_percentage = MaxHeapFreeRatio / 100.0;
+    const double minimum_used_percentage = 1.0 - maximum_free_percentage;
+    const double max_tmp = used_after_gc / minimum_used_percentage;
+    size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));
+    maximum_desired_capacity = MAX2(maximum_desired_capacity, initial_size());
+    log_trace(gc, heap)("    maximum_free_percentage: %6.2f  minimum_used_percentage: %6.2f",
+                             maximum_free_percentage, minimum_used_percentage);
+    log_trace(gc, heap)("    _capacity_at_prologue: %6.1fK  minimum_desired_capacity: %6.1fK  maximum_desired_capacity: %6.1fK",
+                             _capacity_at_prologue / (double) K,
+                             minimum_desired_capacity / (double) K,
+                             maximum_desired_capacity / (double) K);
+    assert(minimum_desired_capacity <= maximum_desired_capacity,
+           "sanity check");
+
+    if (capacity_after_gc > maximum_desired_capacity) {
+      // Capacity too large, compute shrinking size
+      shrink_bytes = capacity_after_gc - maximum_desired_capacity;
+      if (ShrinkHeapInSteps) {
+        // If ShrinkHeapInSteps is true (the default),
+        // we don't want to shrink all the way back to initSize if people call
+        // System.gc(), because some programs do that between "phases" and then
+        // we'd just have to grow the heap up again for the next phase.  So we
+        // damp the shrinking: 0% on the first call, 10% on the second call, 40%
+        // on the third call, and 100% by the fourth call.  But if we recompute
+        // size without shrinking, it goes back to 0%.
+        shrink_bytes = shrink_bytes / 100 * current_shrink_factor;
+        if (current_shrink_factor == 0) {
+          _shrink_factor = 10;
+        } else {
+          _shrink_factor = MIN2(current_shrink_factor * 4, (size_t) 100);
+        }
+      }
+      assert(shrink_bytes <= max_shrink_bytes, "invalid shrink size");
+      log_trace(gc, heap)("    shrinking:  initSize: %.1fK  maximum_desired_capacity: %.1fK",
+                               initial_size() / (double) K, maximum_desired_capacity / (double) K);
+      log_trace(gc, heap)("    shrink_bytes: %.1fK  current_shrink_factor: " SIZE_FORMAT "  new shrink factor: " SIZE_FORMAT "  _min_heap_delta_bytes: %.1fK",
+                               shrink_bytes / (double) K,
+                               current_shrink_factor,
+                               _shrink_factor,
+                               _min_heap_delta_bytes / (double) K);
+    }
+  }
+
+  if (capacity_after_gc > _capacity_at_prologue) {
+    // We might have expanded for promotions, in which case we might want to
+    // take back that expansion if there's room after GC.  That keeps us from
+    // stretching the heap with promotions when there's plenty of room.
+    size_t expansion_for_promotion = capacity_after_gc - _capacity_at_prologue;
+    expansion_for_promotion = MIN2(expansion_for_promotion, max_shrink_bytes);
+    // We have two shrinking computations, take the largest
+    shrink_bytes = MAX2(shrink_bytes, expansion_for_promotion);
+    assert(shrink_bytes <= max_shrink_bytes, "invalid shrink size");
+    log_trace(gc, heap)("    aggressive shrinking:  _capacity_at_prologue: %.1fK  capacity_after_gc: %.1fK  expansion_for_promotion: %.1fK  shrink_bytes: %.1fK",
+                        capacity_after_gc / (double) K,
+                        _capacity_at_prologue / (double) K,
+                        expansion_for_promotion / (double) K,
+                        shrink_bytes / (double) K);
+  }
+  // Don't shrink unless it's significant
+  if (shrink_bytes >= _min_heap_delta_bytes) {
+    shrink(shrink_bytes);
+  }
+}
+
+void TenuredGeneration::space_iterate(SpaceClosure* blk,
+                                                 bool usedOnly) {
+  blk->do_space(space());
+}
+
+void TenuredGeneration::younger_refs_iterate(OopIterateClosure* blk) {
+  // Apply "cl->do_oop" to (the address of) (exactly) all the ref fields in
+  // "sp" that point into the young generation.
+  // The iteration is only over objects allocated at the start of the
+  // iterations; objects allocated as a result of applying the closure are
+  // not included.
+
+  HeapWord* gen_boundary = reserved().start();
+  _rs->younger_refs_in_space_iterate(space(), gen_boundary, blk);
+}
+
 TenuredGeneration::TenuredGeneration(ReservedSpace rs,
                                      size_t initial_byte_size,
                                      size_t min_byte_size,
                                      size_t max_byte_size,
                                      CardTableRS* remset) :
-  CardGeneration(rs, initial_byte_size, remset)
+  Generation(rs, initial_byte_size), _rs(remset),
+  _min_heap_delta_bytes(), _capacity_at_prologue(),
+  _used_at_prologue()
 {
+  // If we don't shrink the heap in steps, '_shrink_factor' is always 100%.
+  _shrink_factor = ShrinkHeapInSteps ? 0 : 100;
+  HeapWord* start = (HeapWord*)rs.base();
+  size_t reserved_byte_size = rs.size();
+  assert((uintptr_t(start) & 3) == 0, "bad alignment");
+  assert((reserved_byte_size & 3) == 0, "bad alignment");
+  MemRegion reserved_mr(start, heap_word_size(reserved_byte_size));
+  _bts = new BlockOffsetSharedArray(reserved_mr,
+                                    heap_word_size(initial_byte_size));
+  MemRegion committed_mr(start, heap_word_size(initial_byte_size));
+  _rs->resize_covered_region(committed_mr);
+
+  // Verify that the start and end of this generation is the start of a card.
+  // If this wasn't true, a single card could span more than on generation,
+  // which would cause problems when we commit/uncommit memory, and when we
+  // clear and dirty cards.
+  guarantee(_rs->is_aligned(reserved_mr.start()), "generation must be card aligned");
+  if (reserved_mr.end() != GenCollectedHeap::heap()->reserved_region().end()) {
+    // Don't check at the very end of the heap as we'll assert that we're probing off
+    // the end if we try.
+    guarantee(_rs->is_aligned(reserved_mr.end()), "generation must be card aligned");
+  }
+  _min_heap_delta_bytes = MinHeapDeltaBytes;
+  _capacity_at_prologue = initial_byte_size;
+  _used_at_prologue = 0;
   HeapWord* bottom = (HeapWord*) _virtual_space.low();
   HeapWord* end    = (HeapWord*) _virtual_space.high();
   _the_space  = new TenuredSpace(_bts, MemRegion(bottom, end));
@@ -114,7 +387,7 @@ void TenuredGeneration::compute_new_size() {
   const size_t used_after_gc = used();
   const size_t capacity_after_gc = capacity();
 
-  CardGeneration::compute_new_size();
+  compute_new_size_inner();
 
   assert(used() == used_after_gc && used_after_gc <= capacity(),
          "used: " SIZE_FORMAT " used_after_gc: " SIZE_FORMAT
@@ -195,10 +468,6 @@ TenuredGeneration::expand_and_allocate(size_t word_size, bool is_tlab) {
   return _the_space->allocate(word_size);
 }
 
-bool TenuredGeneration::expand(size_t bytes, size_t expand_bytes) {
-  return CardGeneration::expand(bytes, expand_bytes);
-}
-
 size_t TenuredGeneration::unsafe_max_alloc_nogc() const {
   return _the_space->free();
 }
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 410981de758..6f364a38f44 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -26,36 +26,85 @@
 #define SHARE_GC_SERIAL_TENUREDGENERATION_HPP
 
 #include "gc/serial/cSpaceCounters.hpp"
-#include "gc/shared/cardGeneration.hpp"
+#include "gc/shared/generation.hpp"
 #include "gc/shared/gcStats.hpp"
 #include "gc/shared/generationCounters.hpp"
 #include "utilities/macros.hpp"
 
+class BlockOffsetSharedArray;
+class CardTableRS;
+class CompactibleSpace;
+
 // TenuredGeneration models the heap containing old (promoted/tenured) objects
-// contained in a single contiguous space.
-//
+// contained in a single contiguous space. This generation is covered by a card
+// table, and uses a card-size block-offset array to implement block_start.
 // Garbage collection is performed using mark-compact.
 
-class TenuredGeneration: public CardGeneration {
+class TenuredGeneration: public Generation {
   friend class VMStructs;
   // Abstractly, this is a subtype that gets access to protected fields.
   friend class VM_PopulateDumpSharedSpace;
 
  protected:
+
+  // This is shared with other generations.
+  CardTableRS* _rs;
+  // This is local to this generation.
+  BlockOffsetSharedArray* _bts;
+
+  // Current shrinking effect: this damps shrinking when the heap gets empty.
+  size_t _shrink_factor;
+
+  size_t _min_heap_delta_bytes;   // Minimum amount to expand.
+
+  // Some statistics from before gc started.
+  // These are gathered in the gc_prologue (and should_collect)
+  // to control growing/shrinking policy in spite of promotions.
+  size_t _capacity_at_prologue;
+  size_t _used_at_prologue;
+
+  void assert_correct_size_change_locking();
+
   ContiguousSpace*    _the_space;       // Actual space holding objects
 
   GenerationCounters* _gen_counters;
   CSpaceCounters*     _space_counters;
 
-  // Allocation failure
-  virtual bool expand(size_t bytes, size_t expand_bytes);
-
   // Accessing spaces
   ContiguousSpace* space() const { return _the_space; }
 
-  void assert_correct_size_change_locking();
+  // Attempt to expand the generation by "bytes".  Expand by at a
+  // minimum "expand_bytes".  Return true if some amount (not
+  // necessarily the full "bytes") was done.
+  bool expand(size_t bytes, size_t expand_bytes);
+
+  // Shrink generation with specified size
+  void shrink(size_t bytes);
 
+  void compute_new_size_inner();
  public:
+  virtual void compute_new_size();
+
+  virtual void invalidate_remembered_set();
+
+  // Grow generation with specified size (returns false if unable to grow)
+  bool grow_by(size_t bytes);
+  // Grow generation to reserved size.
+  bool grow_to_reserved();
+
+  size_t capacity() const;
+  size_t used() const;
+  size_t free() const;
+  MemRegion used_region() const;
+
+  void space_iterate(SpaceClosure* blk, bool usedOnly = false);
+
+  void younger_refs_iterate(OopIterateClosure* blk);
+
+  bool is_in(const void* p) const;
+
+  CompactibleSpace* first_compaction_space() const;
+
   TenuredGeneration(ReservedSpace rs,
                     size_t initial_byte_size,
                     size_t min_byte_size,
@@ -104,8 +153,6 @@ class TenuredGeneration: public CardGeneration {
                       size_t word_size,
                       bool   is_tlab);
 
-  virtual void compute_new_size();
-
   // Performance Counter support
   void update_counters();
 
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index f79d31786e2..2e6a4ca56df 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -29,6 +29,30 @@
 
 #include "gc/shared/space.inline.hpp"
 
+inline size_t TenuredGeneration::capacity() const {
+  return space()->capacity();
+}
+
+inline size_t TenuredGeneration::used() const {
+  return space()->used();
+}
+
+inline size_t TenuredGeneration::free() const {
+  return space()->free();
+}
+
+inline MemRegion TenuredGeneration::used_region() const {
+  return space()->used_region();
+}
+
+inline bool TenuredGeneration::is_in(const void* p) const {
+  return space()->is_in(p);
+}
+
+inline CompactibleSpace* TenuredGeneration::first_compaction_space() const {
+  return space();
+}
+
 HeapWord* TenuredGeneration::allocate(size_t word_size,
                                                  bool is_tlab) {
   assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
index 39905458d4c..0ba676706ab 100644
--- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp
+++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
@@ -45,7 +45,7 @@
                           declare_toplevel_type,                              \
                           declare_integer_type)                               \
   declare_type(SerialHeap,                   GenCollectedHeap)                \
-  declare_type(TenuredGeneration,            CardGeneration)                  \
+  declare_type(TenuredGeneration,            Generation)                      \
   declare_type(TenuredSpace,                 OffsetTableContigSpace)          \
                                                                               \
   declare_type(DefNewGeneration,             Generation)                      \
diff --git a/src/hotspot/share/gc/shared/cardGeneration.cpp b/src/hotspot/share/gc/shared/cardGeneration.cpp
deleted file mode 100644
index 523f65c8cc3..00000000000
--- a/src/hotspot/share/gc/shared/cardGeneration.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-
-#include "gc/shared/blockOffsetTable.inline.hpp"
-#include "gc/shared/cardGeneration.inline.hpp"
-#include "gc/shared/cardTableRS.hpp"
-#include "gc/shared/gcLocker.hpp"
-#include "gc/shared/genCollectedHeap.hpp"
-#include "gc/shared/genOopClosures.inline.hpp"
-#include "gc/shared/generationSpec.hpp"
-#include "gc/shared/space.inline.hpp"
-#include "memory/iterator.hpp"
-#include "memory/memRegion.hpp"
-#include "logging/log.hpp"
-#include "runtime/java.hpp"
-
-CardGeneration::CardGeneration(ReservedSpace rs,
-                               size_t initial_byte_size,
-                               CardTableRS* remset) :
-  Generation(rs, initial_byte_size), _rs(remset),
-  _min_heap_delta_bytes(), _capacity_at_prologue(),
-  _used_at_prologue()
-{
-  // If we don't shrink the heap in steps, '_shrink_factor' is always 100%.
-  _shrink_factor = ShrinkHeapInSteps ? 0 : 100;
-  HeapWord* start = (HeapWord*)rs.base();
-  size_t reserved_byte_size = rs.size();
-  assert((uintptr_t(start) & 3) == 0, "bad alignment");
-  assert((reserved_byte_size & 3) == 0, "bad alignment");
-  MemRegion reserved_mr(start, heap_word_size(reserved_byte_size));
-  _bts = new BlockOffsetSharedArray(reserved_mr,
-                                    heap_word_size(initial_byte_size));
-  MemRegion committed_mr(start, heap_word_size(initial_byte_size));
-  _rs->resize_covered_region(committed_mr);
-
-  // Verify that the start and end of this generation is the start of a card.
-  // If this wasn't true, a single card could span more than on generation,
-  // which would cause problems when we commit/uncommit memory, and when we
-  // clear and dirty cards.
-  guarantee(_rs->is_aligned(reserved_mr.start()), "generation must be card aligned");
-  if (reserved_mr.end() != GenCollectedHeap::heap()->reserved_region().end()) {
-    // Don't check at the very end of the heap as we'll assert that we're probing off
-    // the end if we try.
-    guarantee(_rs->is_aligned(reserved_mr.end()), "generation must be card aligned");
-  }
-  _min_heap_delta_bytes = MinHeapDeltaBytes;
-  _capacity_at_prologue = initial_byte_size;
-  _used_at_prologue = 0;
-}
-
-bool CardGeneration::grow_by(size_t bytes) {
-  assert_correct_size_change_locking();
-  bool result = _virtual_space.expand_by(bytes);
-  if (result) {
-    size_t new_word_size =
-       heap_word_size(_virtual_space.committed_size());
-    MemRegion mr(space()->bottom(), new_word_size);
-    // Expand card table
-    GenCollectedHeap::heap()->rem_set()->resize_covered_region(mr);
-    // Expand shared block offset array
-    _bts->resize(new_word_size);
-
-    // Fix for bug #4668531
-    if (ZapUnusedHeapArea) {
-      MemRegion mangle_region(space()->end(),
-      (HeapWord*)_virtual_space.high());
-      SpaceMangler::mangle_region(mangle_region);
-    }
-
-    // Expand space -- also expands space's BOT
-    // (which uses (part of) shared array above)
-    space()->set_end((HeapWord*)_virtual_space.high());
-
-    // update the space and generation capacity counters
-    update_counters();
-
-    size_t new_mem_size = _virtual_space.committed_size();
-    size_t old_mem_size = new_mem_size - bytes;
-    log_trace(gc, heap)("Expanding %s from " SIZE_FORMAT "K by " SIZE_FORMAT "K to " SIZE_FORMAT "K",
-                    name(), old_mem_size/K, bytes/K, new_mem_size/K);
-  }
-  return result;
-}
-
-bool CardGeneration::expand(size_t bytes, size_t expand_bytes) {
-  assert_locked_or_safepoint(Heap_lock);
-  if (bytes == 0) {
-    return true;  // That's what grow_by(0) would return
-  }
-  size_t aligned_bytes  = ReservedSpace::page_align_size_up(bytes);
-  if (aligned_bytes == 0){
-    // The alignment caused the number of bytes to wrap.  An expand_by(0) will
-    // return true with the implication that an expansion was done when it
-    // was not.  A call to expand implies a best effort to expand by "bytes"
-    // but not a guarantee.  Align down to give a best effort.  This is likely
-    // the most that the generation can expand since it has some capacity to
-    // start with.
-    aligned_bytes = ReservedSpace::page_align_size_down(bytes);
-  }
-  size_t aligned_expand_bytes = ReservedSpace::page_align_size_up(expand_bytes);
-  bool success = false;
-  if (aligned_expand_bytes > aligned_bytes) {
-    success = grow_by(aligned_expand_bytes);
-  }
-  if (!success) {
-    success = grow_by(aligned_bytes);
-  }
-  if (!success) {
-    success = grow_to_reserved();
-  }
-  if (success && GCLocker::is_active_and_needs_gc()) {
-    log_trace(gc, heap)("Garbage collection disabled, expanded heap instead");
-  }
-
-  return success;
-}
-
-bool CardGeneration::grow_to_reserved() {
-  assert_correct_size_change_locking();
-  bool success = true;
-  const size_t remaining_bytes = _virtual_space.uncommitted_size();
-  if (remaining_bytes > 0) {
-    success = grow_by(remaining_bytes);
-    DEBUG_ONLY(if (!success) log_warning(gc)("grow to reserved failed");)
-  }
-  return success;
-}
-
-void CardGeneration::shrink(size_t bytes) {
-  assert_correct_size_change_locking();
-
-  size_t size = ReservedSpace::page_align_size_down(bytes);
-  if (size == 0) {
-    return;
-  }
-
-  // Shrink committed space
-  _virtual_space.shrink_by(size);
-  // Shrink space; this also shrinks the space's BOT
-  space()->set_end((HeapWord*) _virtual_space.high());
-  size_t new_word_size = heap_word_size(space()->capacity());
-  // Shrink the shared block offset array
-  _bts->resize(new_word_size);
-  MemRegion mr(space()->bottom(), new_word_size);
-  // Shrink the card table
-  GenCollectedHeap::heap()->rem_set()->resize_covered_region(mr);
-
-  size_t new_mem_size = _virtual_space.committed_size();
-  size_t old_mem_size = new_mem_size + size;
-  log_trace(gc, heap)("Shrinking %s from " SIZE_FORMAT "K to " SIZE_FORMAT "K",
-                      name(), old_mem_size/K, new_mem_size/K);
-}
-
-// Objects in this generation may have moved, invalidate this
-// generation's cards.
-void CardGeneration::invalidate_remembered_set() {
-  _rs->invalidate(used_region());
-}
-
-void CardGeneration::compute_new_size() {
-  assert(_shrink_factor <= 100, "invalid shrink factor");
-  size_t current_shrink_factor = _shrink_factor;
-  if (ShrinkHeapInSteps) {
-    // Always reset '_shrink_factor' if the heap is shrunk in steps.
-    // If we shrink the heap in this iteration, '_shrink_factor' will
-    // be recomputed based on the old value further down in this fuction.
-    _shrink_factor = 0;
-  }
-
-  // We don't have floating point command-line arguments
-  // Note:  argument processing ensures that MinHeapFreeRatio < 100.
-  const double minimum_free_percentage = MinHeapFreeRatio / 100.0;
-  const double maximum_used_percentage = 1.0 - minimum_free_percentage;
-
-  // Compute some numbers about the state of the heap.
-  const size_t used_after_gc = used();
-  const size_t capacity_after_gc = capacity();
-
-  const double min_tmp = used_after_gc / maximum_used_percentage;
-  size_t minimum_desired_capacity = (size_t)MIN2(min_tmp, double(max_uintx));
-  // Don't shrink less than the initial generation size
-  minimum_desired_capacity = MAX2(minimum_desired_capacity, initial_size());
-  assert(used_after_gc <= minimum_desired_capacity, "sanity check");
-
-    const size_t free_after_gc = free();
-    const double free_percentage = ((double)free_after_gc) / capacity_after_gc;
-    log_trace(gc, heap)("CardGeneration::compute_new_size:");
-    log_trace(gc, heap)("    minimum_free_percentage: %6.2f  maximum_used_percentage: %6.2f",
-                  minimum_free_percentage,
-                  maximum_used_percentage);
-    log_trace(gc, heap)("     free_after_gc   : %6.1fK   used_after_gc   : %6.1fK   capacity_after_gc   : %6.1fK",
-                  free_after_gc / (double) K,
-                  used_after_gc / (double) K,
-                  capacity_after_gc / (double) K);
-    log_trace(gc, heap)("     free_percentage: %6.2f", free_percentage);
-
-  if (capacity_after_gc < minimum_desired_capacity) {
-    // If we have less free space than we want then expand
-    size_t expand_bytes = minimum_desired_capacity - capacity_after_gc;
-    // Don't expand unless it's significant
-    if (expand_bytes >= _min_heap_delta_bytes) {
-      expand(expand_bytes, 0); // safe if expansion fails
-    }
-    log_trace(gc, heap)("    expanding:  minimum_desired_capacity: %6.1fK  expand_bytes: %6.1fK  _min_heap_delta_bytes: %6.1fK",
-                  minimum_desired_capacity / (double) K,
-                  expand_bytes / (double) K,
-                  _min_heap_delta_bytes / (double) K);
-    return;
-  }
-
-  // No expansion, now see if we want to shrink
-  size_t shrink_bytes = 0;
-  // We would never want to shrink more than this
-  size_t max_shrink_bytes = capacity_after_gc - minimum_desired_capacity;
-
-  if (MaxHeapFreeRatio < 100) {
-    const double maximum_free_percentage = MaxHeapFreeRatio / 100.0;
-    const double minimum_used_percentage = 1.0 - maximum_free_percentage;
-    const double max_tmp = used_after_gc / minimum_used_percentage;
-    size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));
-    maximum_desired_capacity = MAX2(maximum_desired_capacity, initial_size());
-    log_trace(gc, heap)("    maximum_free_percentage: %6.2f  minimum_used_percentage: %6.2f",
-                             maximum_free_percentage, minimum_used_percentage);
-    log_trace(gc, heap)("    _capacity_at_prologue: %6.1fK  minimum_desired_capacity: %6.1fK  maximum_desired_capacity: %6.1fK",
-                             _capacity_at_prologue / (double) K,
-                             minimum_desired_capacity / (double) K,
-                             maximum_desired_capacity / (double) K);
-    assert(minimum_desired_capacity <= maximum_desired_capacity,
-           "sanity check");
-
-    if (capacity_after_gc > maximum_desired_capacity) {
-      // Capacity too large, compute shrinking size
-      shrink_bytes = capacity_after_gc - maximum_desired_capacity;
-      if (ShrinkHeapInSteps) {
-        // If ShrinkHeapInSteps is true (the default),
-        // we don't want to shrink all the way back to initSize if people call
-        // System.gc(), because some programs do that between "phases" and then
-        // we'd just have to grow the heap up again for the next phase.  So we
-        // damp the shrinking: 0% on the first call, 10% on the second call, 40%
-        // on the third call, and 100% by the fourth call.  But if we recompute
-        // size without shrinking, it goes back to 0%.
-        shrink_bytes = shrink_bytes / 100 * current_shrink_factor;
-        if (current_shrink_factor == 0) {
-          _shrink_factor = 10;
-        } else {
-          _shrink_factor = MIN2(current_shrink_factor * 4, (size_t) 100);
-        }
-      }
-      assert(shrink_bytes <= max_shrink_bytes, "invalid shrink size");
-      log_trace(gc, heap)("    shrinking:  initSize: %.1fK  maximum_desired_capacity: %.1fK",
-                               initial_size() / (double) K, maximum_desired_capacity / (double) K);
-      log_trace(gc, heap)("    shrink_bytes: %.1fK  current_shrink_factor: " SIZE_FORMAT "  new shrink factor: " SIZE_FORMAT "  _min_heap_delta_bytes: %.1fK",
-                               shrink_bytes / (double) K,
-                               current_shrink_factor,
-                               _shrink_factor,
-                               _min_heap_delta_bytes / (double) K);
-    }
-  }
-
-  if (capacity_after_gc > _capacity_at_prologue) {
-    // We might have expanded for promotions, in which case we might want to
-    // take back that expansion if there's room after GC.  That keeps us from
-    // stretching the heap with promotions when there's plenty of room.
-    size_t expansion_for_promotion = capacity_after_gc - _capacity_at_prologue;
-    expansion_for_promotion = MIN2(expansion_for_promotion, max_shrink_bytes);
-    // We have two shrinking computations, take the largest
-    shrink_bytes = MAX2(shrink_bytes, expansion_for_promotion);
-    assert(shrink_bytes <= max_shrink_bytes, "invalid shrink size");
-    log_trace(gc, heap)("    aggressive shrinking:  _capacity_at_prologue: %.1fK  capacity_after_gc: %.1fK  expansion_for_promotion: %.1fK  shrink_bytes: %.1fK",
-                        capacity_after_gc / (double) K,
-                        _capacity_at_prologue / (double) K,
-                        expansion_for_promotion / (double) K,
-                        shrink_bytes / (double) K);
-  }
-  // Don't shrink unless it's significant
-  if (shrink_bytes >= _min_heap_delta_bytes) {
-    shrink(shrink_bytes);
-  }
-}
-
-void CardGeneration::space_iterate(SpaceClosure* blk,
-                                                 bool usedOnly) {
-  blk->do_space(space());
-}
-
-void CardGeneration::younger_refs_iterate(OopIterateClosure* blk) {
-  // Apply "cl->do_oop" to (the address of) (exactly) all the ref fields in
-  // "sp" that point into the young generation.
-  // The iteration is only over objects allocated at the start of the
-  // iterations; objects allocated as a result of applying the closure are
-  // not included.
-
-  HeapWord* gen_boundary = reserved().start();
-  _rs->younger_refs_in_space_iterate(space(), gen_boundary, blk);
-}
diff --git a/src/hotspot/share/gc/shared/cardGeneration.hpp b/src/hotspot/share/gc/shared/cardGeneration.hpp
deleted file mode 100644
index 084737a6146..00000000000
--- a/src/hotspot/share/gc/shared/cardGeneration.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_SHARED_CARDGENERATION_HPP
-#define SHARE_GC_SHARED_CARDGENERATION_HPP
-
-// Class CardGeneration is a generation that is covered by a card table,
-// and uses a card-size block-offset array to implement block_start.
-
-#include "gc/shared/generation.hpp"
-
-class BlockOffsetSharedArray;
-class CardTableRS;
-class CompactibleSpace;
-
-class CardGeneration: public Generation {
-  friend class VMStructs;
- protected:
-  // This is shared with other generations.
-  CardTableRS* _rs;
-  // This is local to this generation.
-  BlockOffsetSharedArray* _bts;
-
-  // Current shrinking effect: this damps shrinking when the heap gets empty.
-  size_t _shrink_factor;
-
-  size_t _min_heap_delta_bytes;   // Minimum amount to expand.
-
-  // Some statistics from before gc started.
-  // These are gathered in the gc_prologue (and should_collect)
-  // to control growing/shrinking policy in spite of promotions.
-  size_t _capacity_at_prologue;
-  size_t _used_at_prologue;
-
-  CardGeneration(ReservedSpace rs, size_t initial_byte_size, CardTableRS* remset);
-
-  virtual void assert_correct_size_change_locking() = 0;
-
-  virtual CompactibleSpace* space() const = 0;
-
- public:
-
-  // Attempt to expand the generation by "bytes".  Expand by at a
-  // minimum "expand_bytes".  Return true if some amount (not
-  // necessarily the full "bytes") was done.
-  virtual bool expand(size_t bytes, size_t expand_bytes);
-
-  // Shrink generation with specified size
-  virtual void shrink(size_t bytes);
-
-  virtual void compute_new_size();
-
-  virtual void invalidate_remembered_set();
-
-  // Grow generation with specified size (returns false if unable to grow)
-  bool grow_by(size_t bytes);
-  // Grow generation to reserved size.
-  bool grow_to_reserved();
-
-  size_t capacity() const;
-  size_t used() const;
-  size_t free() const;
-  MemRegion used_region() const;
-
-  void space_iterate(SpaceClosure* blk, bool usedOnly = false);
-
-  void younger_refs_iterate(OopIterateClosure* blk);
-
-  bool is_in(const void* p) const;
-
-  CompactibleSpace* first_compaction_space() const;
-};
-
-#endif // SHARE_GC_SHARED_CARDGENERATION_HPP
diff --git a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp
deleted file mode 100644
index bd8285af679..00000000000
--- a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
-#define SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
-
-#include "gc/shared/cardGeneration.hpp"
-
-#include "gc/shared/space.hpp"
-
-inline size_t CardGeneration::capacity() const {
-  return space()->capacity();
-}
-
-inline size_t CardGeneration::used() const {
-  return space()->used();
-}
-
-inline size_t CardGeneration::free() const {
-  return space()->free();
-}
-
-inline MemRegion CardGeneration::used_region() const {
-  return space()->used_region();
-}
-
-inline bool CardGeneration::is_in(const void* p) const {
-  return space()->is_in(p);
-}
-
-inline CompactibleSpace* CardGeneration::first_compaction_space() const {
-  return space();
-}
-
-#endif // SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp
index b9183ec2898..36740cc4039 100644
--- a/src/hotspot/share/gc/shared/generation.hpp
+++ b/src/hotspot/share/gc/shared/generation.hpp
@@ -41,8 +41,7 @@
 //
 // Generation                      - abstract base class
 // - DefNewGeneration              - allocation area (copy collected)
-// - CardGeneration                 - abstract class adding offset array behavior
-//   - TenuredGeneration             - tenured (old object) space (markSweepCompact)
+// - TenuredGeneration             - tenured (old object) space (markSweepCompact)
 //
 // The system configuration currently allowed is:
 //
diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
index f9b1c631123..d5cf2c15373 100644
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
@@ -26,7 +26,6 @@
 #define SHARE_GC_SHARED_VMSTRUCTS_GC_HPP
 
 #include "gc/shared/ageTable.hpp"
-#include "gc/shared/cardGeneration.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableRS.hpp"
 #include "gc/shared/collectedHeap.hpp"
@@ -101,11 +100,11 @@
   nonstatic_field(BlockOffsetArrayContigSpace, _next_offset_threshold,                        HeapWord*)                             \
   nonstatic_field(BlockOffsetArrayContigSpace, _next_offset_index,                            size_t)                                \
                                                                                                                                      \
-  nonstatic_field(CardGeneration,              _rs,                                           CardTableRS*)                          \
-  nonstatic_field(CardGeneration,              _bts,                                          BlockOffsetSharedArray*)               \
-  nonstatic_field(CardGeneration,              _shrink_factor,                                size_t)                                \
-  nonstatic_field(CardGeneration,              _capacity_at_prologue,                         size_t)                                \
-  nonstatic_field(CardGeneration,              _used_at_prologue,                             size_t)                                \
+  nonstatic_field(TenuredGeneration,           _rs,                                           CardTableRS*)                          \
+  nonstatic_field(TenuredGeneration,           _bts,                                          BlockOffsetSharedArray*)               \
+  nonstatic_field(TenuredGeneration,           _shrink_factor,                                size_t)                                \
+  nonstatic_field(TenuredGeneration,           _capacity_at_prologue,                         size_t)                                \
+  nonstatic_field(TenuredGeneration,           _used_at_prologue,                             size_t)                                \
                                                                                                                                      \
   nonstatic_field(CardTable,                   _whole_heap,                                   const MemRegion)                       \
   nonstatic_field(CardTable,                   _guard_index,                                  const size_t)                          \
@@ -186,7 +185,6 @@
   declare_toplevel_type(CollectedHeap)                                    \
            declare_type(GenCollectedHeap,             CollectedHeap)      \
   declare_toplevel_type(Generation)                                       \
-           declare_type(CardGeneration,               Generation)         \
   declare_toplevel_type(Space)                                            \
            declare_type(CompactibleSpace,             Space)              \
            declare_type(ContiguousSpace,              CompactibleSpace)   \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java
index 6f121f963af..cc4f216efc2 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/serial/TenuredGeneration.java
@@ -39,7 +39,7 @@ import sun.jvm.hotspot.utilities.Observer;
 
     <P> Garbage collection is performed using mark-compact. </P> */
 
-public class TenuredGeneration extends CardGeneration {
+public class TenuredGeneration extends Generation {
   private static AddressField theSpaceField;
 
   static {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java
deleted file mode 100644
index 3d96d33d81e..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/CardGeneration.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.gc.shared;
-
-import sun.jvm.hotspot.debugger.*;
-
-/** Class CardGeneration is a generation that is covered by a card
-    table, and uses a card-size block-offset array to implement
-    block_start. */
-
-public abstract class CardGeneration extends Generation {
-  public CardGeneration(Address addr) {
-    super(addr);
-  }
-
-  // FIXME: not sure what I need to expose from here in order to have
-  // verification similar to that of the old RememberedSet
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Generation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Generation.java
index eeb099a11dc..5323d9cee4e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Generation.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/Generation.java
@@ -38,10 +38,7 @@ import sun.jvm.hotspot.utilities.Observer;
     <ul>
     <li> Generation
       <ul>
-      <li> CardGeneration
-        <ul>
-        <li> TenuredGeneration
-        </ul>
+      <li> TenuredGeneration
       <li> DefNewGeneration
       </ul>
     </ul>
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
index 680d9078d3b..050ec9c05d6 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
@@ -57,7 +57,7 @@ public class ClhsdbVmStructsDump {
                 "field Klass _name Symbol*",
                 "type ClassLoaderData* null",
                 "field JavaThread _osthread OSThread*",
-                "type TenuredGeneration CardGeneration",
+                "type TenuredGeneration Generation",
                 "type Universe null",
                 "type ConstantPoolCache MetaspaceObj"));
             test.run(theApp.getPid(), cmds, expStrMap, null);
diff --git a/test/hotspot/jtreg/serviceability/sa/TestType.java b/test/hotspot/jtreg/serviceability/sa/TestType.java
index 1e4a9e56e57..4f71e42cd4e 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestType.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestType.java
@@ -62,7 +62,6 @@ public class TestType {
                 "type ConstantPoolCache MetaspaceObj",
                 "type ConstantPool Metadata",
                 "type CompilerThread JavaThread",
-                "type CardGeneration Generation",
                 "type ArrayKlass Klass",
                 "type InstanceKlass Klass"));
             // String to check for in the output of "type InstanceKlass"
-- 
GitLab


From f4f87284cbbe95958d8c7d8adc0f5c5e260892ca Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 21 Mar 2022 16:21:30 +0000
Subject: [PATCH 148/345] 8283097: Parallel: Move filler object logic inside
 PSPromotionLAB::unallocate_object

Reviewed-by: tschatzl, iwalulya
---
 src/hotspot/share/gc/parallel/psPromotionLAB.cpp      |  9 +++++----
 src/hotspot/share/gc/parallel/psPromotionLAB.hpp      |  2 +-
 .../share/gc/parallel/psPromotionManager.inline.hpp   | 11 +++--------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.cpp b/src/hotspot/share/gc/parallel/psPromotionLAB.cpp
index 312db67606a..bab79b25a13 100644
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.cpp
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.cpp
@@ -85,18 +85,19 @@ void PSPromotionLAB::flush() {
   _state = flushed;
 }
 
-bool PSPromotionLAB::unallocate_object(HeapWord* obj, size_t obj_size) {
+void PSPromotionLAB::unallocate_object(HeapWord* obj, size_t obj_size) {
   assert(ParallelScavengeHeap::heap()->is_in(obj), "Object outside heap");
 
+  // If the object is inside this LAB, we just bump-down the `top` pointer.
+  // Otherwise, we overwrite it with a filler object.
   if (contains(obj)) {
     HeapWord* object_end = obj + obj_size;
     assert(object_end == top(), "Not matching last allocation");
 
     set_top(obj);
-    return true;
+  } else {
+    CollectedHeap::fill_with_object(obj, obj_size);
   }
-
-  return false;
 }
 
 // Fill all remaining lab space with an unreachable object.
diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
index 239a1140a8a..7e8f8857dcd 100644
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
@@ -72,7 +72,7 @@ class PSPromotionLAB : public CHeapObj<mtGC> {
 
   bool is_flushed()                  { return _state == flushed; }
 
-  bool unallocate_object(HeapWord* obj, size_t obj_size);
+  void unallocate_object(HeapWord* obj, size_t obj_size);
 
   // Returns a subregion containing all objects in this space.
   MemRegion used_region()            { return MemRegion(bottom(), top()); }
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index b3f1c7297f4..1b7b00d9fba 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -290,15 +290,10 @@ inline oop PSPromotionManager::copy_unmarked_to_survivor_space(oop o,
     assert(o->is_forwarded(), "Object must be forwarded if the cas failed.");
     assert(o->forwardee() == forwardee, "invariant");
 
-    // Try to deallocate the space.  If it was directly allocated we cannot
-    // deallocate it, so we have to test.  If the deallocation fails,
-    // overwrite with a filler object.
     if (new_obj_is_tenured) {
-      if (!_old_lab.unallocate_object(cast_from_oop<HeapWord*>(new_obj), new_obj_size)) {
-        CollectedHeap::fill_with_object(cast_from_oop<HeapWord*>(new_obj), new_obj_size);
-      }
-    } else if (!_young_lab.unallocate_object(cast_from_oop<HeapWord*>(new_obj), new_obj_size)) {
-      CollectedHeap::fill_with_object(cast_from_oop<HeapWord*>(new_obj), new_obj_size);
+      _old_lab.unallocate_object(cast_from_oop<HeapWord*>(new_obj), new_obj_size);
+    } else {
+      _young_lab.unallocate_object(cast_from_oop<HeapWord*>(new_obj), new_obj_size);
     }
     return forwardee;
   }
-- 
GitLab


From 14b9e80b8adcc0ab0634357f5a7c25f24fd6808c Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 21 Mar 2022 16:57:17 +0000
Subject: [PATCH 149/345] 8283415: Update java.lang.ref to use sealed classes

Reviewed-by: kbarrett, alanb
---
 .../share/classes/java/lang/ref/FinalReference.java          | 4 ++--
 .../share/classes/java/lang/ref/PhantomReference.java        | 4 ++--
 src/java.base/share/classes/java/lang/ref/Reference.java     | 5 +++--
 src/java.base/share/classes/java/lang/ref/SoftReference.java | 4 ++--
 src/java.base/share/classes/java/lang/ref/WeakReference.java | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/ref/FinalReference.java b/src/java.base/share/classes/java/lang/ref/FinalReference.java
index 9175516d4d0..06af37df67c 100644
--- a/src/java.base/share/classes/java/lang/ref/FinalReference.java
+++ b/src/java.base/share/classes/java/lang/ref/FinalReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@ package java.lang.ref;
 /**
  * Final references, used to implement finalization
  */
-class FinalReference<T> extends Reference<T> {
+sealed class FinalReference<T> extends Reference<T> permits Finalizer {
 
     public FinalReference(T referent, ReferenceQueue<? super T> q) {
         super(referent, q);
diff --git a/src/java.base/share/classes/java/lang/ref/PhantomReference.java b/src/java.base/share/classes/java/lang/ref/PhantomReference.java
index 2c1532b8eb2..fef3bc7c508 100644
--- a/src/java.base/share/classes/java/lang/ref/PhantomReference.java
+++ b/src/java.base/share/classes/java/lang/ref/PhantomReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ import jdk.internal.vm.annotation.IntrinsicCandidate;
  * @since    1.2
  */
 
-public class PhantomReference<T> extends Reference<T> {
+public non-sealed class PhantomReference<T> extends Reference<T> {
 
     /**
      * Returns this reference object's referent.  Because the referent of a
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
index 17d8c7b669c..777567085eb 100644
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,8 @@ import jdk.internal.ref.Cleaner;
  * @since    1.2
  */
 
-public abstract class Reference<T> {
+public abstract sealed class Reference<T>
+    permits PhantomReference, SoftReference, WeakReference, FinalReference {
 
     /* The state of a Reference object is characterized by two attributes.  It
      * may be either "active", "pending", or "inactive".  It may also be
diff --git a/src/java.base/share/classes/java/lang/ref/SoftReference.java b/src/java.base/share/classes/java/lang/ref/SoftReference.java
index 8ce74a67d0a..a0cb75dcf50 100644
--- a/src/java.base/share/classes/java/lang/ref/SoftReference.java
+++ b/src/java.base/share/classes/java/lang/ref/SoftReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ package java.lang.ref;
  * @since    1.2
  */
 
-public class SoftReference<T> extends Reference<T> {
+public non-sealed class SoftReference<T> extends Reference<T> {
 
     /**
      * Timestamp clock, updated by the garbage collector
diff --git a/src/java.base/share/classes/java/lang/ref/WeakReference.java b/src/java.base/share/classes/java/lang/ref/WeakReference.java
index fdf2b5c9f02..1d1a01f3acd 100644
--- a/src/java.base/share/classes/java/lang/ref/WeakReference.java
+++ b/src/java.base/share/classes/java/lang/ref/WeakReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@ package java.lang.ref;
  * @since    1.2
  */
 
-public class WeakReference<T> extends Reference<T> {
+public non-sealed class WeakReference<T> extends Reference<T> {
 
     /**
      * Creates a new weak reference that refers to the given object.  The new
-- 
GitLab


From f8878cb0cc436993ef1222bc13b00b923d91aad1 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 21 Mar 2022 21:34:09 +0000
Subject: [PATCH 150/345] 8257733: Move module-specific data from make to
 respective module

Reviewed-by: jjg, weijun, naoto, erikj, prr, alanb, mchung
---
 make/ModuleWrapper.gmk                        |   4 +-
 make/ToolsJdk.gmk                             |   4 +-
 make/UpdateX11Wrappers.gmk                    |   4 +-
 .../tools/symbolgenerator/CreateSymbols.java  |   9 ++--
 make/modules/java.base/Gendata.gmk            |  10 ++---
 make/modules/java.base/Gensrc.gmk             |  12 +++---
 .../java.base/gendata/GendataBlockedCerts.gmk |   4 +-
 .../gendata/GendataBreakIterator.gmk          |   4 +-
 .../gendata/GendataPublicSuffixList.gmk       |   4 +-
 .../modules/java.base/gendata/GendataTZDB.gmk |   4 +-
 .../modules/java.base/gensrc/GensrcBuffer.gmk |   4 +-
 .../java.base/gensrc/GensrcCharacterData.gmk  |  10 ++---
 .../java.base/gensrc/GensrcCharsetCoder.gmk   |   4 +-
 .../java.base/gensrc/GensrcEmojiData.gmk      |   6 +--
 .../java.base/gensrc/GensrcExceptions.gmk     |   4 +-
 .../java.base/gensrc/GensrcLocaleData.gmk     |   6 +--
 .../gensrc/GensrcScopedMemoryAccess.gmk       |   6 +--
 .../java.base/gensrc/GensrcVarHandles.gmk     |   4 +-
 .../gendata/GendataFontConfig.gmk             |  39 ++++++++++--------
 .../java.desktop/gensrc/GensrcIcons.gmk       |   8 ++--
 .../java.desktop/gensrc/GensrcSwing.gmk       |   4 +-
 .../java.desktop/gensrc/GensrcX11Wrappers.gmk |   6 +--
 make/modules/jdk.charsets/Gensrc.gmk          |   6 +--
 make/modules/jdk.compiler/Gendata.gmk         |   6 +--
 make/modules/jdk.javadoc/Gendata.gmk          |   6 +--
 make/modules/jdk.jdi/Gensrc.gmk               |   9 ++--
 make/modules/jdk.localedata/Gensrc.gmk        |   4 +-
 make/scripts/generate-symbol-data.sh          |  18 ++++----
 .../java/lang}/CharacterData00.java.template  |   0
 .../java/lang}/CharacterData01.java.template  |   0
 .../java/lang}/CharacterData02.java.template  |   0
 .../java/lang}/CharacterData03.java.template  |   0
 .../java/lang}/CharacterData0E.java.template  |   0
 .../lang}/CharacterDataLatin1.java.template   |   0
 .../blockedcertsconverter/blocked.certs.pem   |   0
 .../java.base/share}/data/cacerts/README      |   0
 .../data/cacerts/actalisauthenticationrootca  |   0
 .../share}/data/cacerts/addtrustexternalca    |   0
 .../share}/data/cacerts/addtrustqualifiedca   |   0
 .../data/cacerts/affirmtrustcommercialca      |   0
 .../data/cacerts/affirmtrustnetworkingca      |   0
 .../share}/data/cacerts/affirmtrustpremiumca  |   0
 .../data/cacerts/affirmtrustpremiumeccca      |   0
 .../share}/data/cacerts/amazonrootca1         |   0
 .../share}/data/cacerts/amazonrootca2         |   0
 .../share}/data/cacerts/amazonrootca3         |   0
 .../share}/data/cacerts/amazonrootca4         |   0
 .../share}/data/cacerts/baltimorecybertrustca |   0
 .../share}/data/cacerts/buypassclass2ca       |   0
 .../share}/data/cacerts/buypassclass3ca       |   0
 .../share}/data/cacerts/camerfirmachambersca  |   0
 .../data/cacerts/camerfirmachamberscommerceca |   0
 .../data/cacerts/camerfirmachambersignca      |   0
 .../java.base/share}/data/cacerts/certumca    |   0
 .../data/cacerts/certumtrustednetworkca       |   0
 .../share}/data/cacerts/chunghwaepkirootca    |   0
 .../java.base/share}/data/cacerts/comodoaaaca |   0
 .../java.base/share}/data/cacerts/comodoeccca |   0
 .../java.base/share}/data/cacerts/comodorsaca |   0
 .../share}/data/cacerts/digicertassuredidg2   |   0
 .../share}/data/cacerts/digicertassuredidg3   |   0
 .../data/cacerts/digicertassuredidrootca      |   0
 .../share}/data/cacerts/digicertglobalrootca  |   0
 .../share}/data/cacerts/digicertglobalrootg2  |   0
 .../share}/data/cacerts/digicertglobalrootg3  |   0
 .../cacerts/digicerthighassuranceevrootca     |   0
 .../share}/data/cacerts/digicerttrustedrootg4 |   0
 .../share}/data/cacerts/dtrustclass3ca2       |   0
 .../share}/data/cacerts/dtrustclass3ca2ev     |   0
 .../share}/data/cacerts/entrust2048ca         |   0
 .../java.base/share}/data/cacerts/entrustevca |   0
 .../share}/data/cacerts/entrustrootcaec1      |   0
 .../share}/data/cacerts/entrustrootcag2       |   0
 .../share}/data/cacerts/entrustrootcag4       |   0
 .../share}/data/cacerts/geotrustglobalca      |   0
 .../share}/data/cacerts/geotrustprimaryca     |   0
 .../share}/data/cacerts/geotrustprimarycag2   |   0
 .../share}/data/cacerts/geotrustprimarycag3   |   0
 .../share}/data/cacerts/geotrustuniversalca   |   0
 .../share}/data/cacerts/globalsignca          |   0
 .../share}/data/cacerts/globalsigneccrootcar4 |   0
 .../share}/data/cacerts/globalsigneccrootcar5 |   0
 .../share}/data/cacerts/globalsignr3ca        |   0
 .../share}/data/cacerts/globalsignrootcar6    |   0
 .../share}/data/cacerts/godaddyclass2ca       |   0
 .../share}/data/cacerts/godaddyrootg2ca       |   0
 .../share}/data/cacerts/haricaeccrootca2015   |   0
 .../share}/data/cacerts/haricarootca2015      |   0
 .../share}/data/cacerts/identrustcommercial   |   0
 .../share}/data/cacerts/identrustpublicca     |   0
 .../share}/data/cacerts/letsencryptisrgx1     |   0
 .../share}/data/cacerts/luxtrustglobalroot2ca |   0
 .../share}/data/cacerts/luxtrustglobalrootca  |   0
 .../share}/data/cacerts/quovadisrootca        |   0
 .../share}/data/cacerts/quovadisrootca1g3     |   0
 .../share}/data/cacerts/quovadisrootca2       |   0
 .../share}/data/cacerts/quovadisrootca2g3     |   0
 .../share}/data/cacerts/quovadisrootca3       |   0
 .../share}/data/cacerts/quovadisrootca3g3     |   0
 .../share}/data/cacerts/secomscrootca1        |   0
 .../share}/data/cacerts/secomscrootca2        |   0
 .../share}/data/cacerts/securetrustca         |   0
 .../share}/data/cacerts/sslrooteccca          |   0
 .../share}/data/cacerts/sslrootevrsaca        |   0
 .../share}/data/cacerts/sslrootrsaca          |   0
 .../share}/data/cacerts/starfieldclass2ca     |   0
 .../share}/data/cacerts/starfieldrootg2ca     |   0
 .../data/cacerts/starfieldservicesrootg2ca    |   0
 .../share}/data/cacerts/swisssigngoldg2ca     |   0
 .../share}/data/cacerts/swisssignplatinumg2ca |   0
 .../share}/data/cacerts/swisssignsilverg2ca   |   0
 .../share}/data/cacerts/teliasonerarootcav1   |   0
 .../share}/data/cacerts/thawteprimaryrootca   |   0
 .../share}/data/cacerts/thawteprimaryrootcag2 |   0
 .../share}/data/cacerts/thawteprimaryrootcag3 |   0
 .../data/cacerts/ttelesecglobalrootclass2ca   |   0
 .../data/cacerts/ttelesecglobalrootclass3ca   |   0
 .../share}/data/cacerts/usertrusteccca        |   0
 .../share}/data/cacerts/usertrustrsaca        |   0
 .../share}/data/cacerts/utnuserfirstobjectca  |   0
 .../share}/data/cacerts/verisignclass3g3ca    |   0
 .../share}/data/cacerts/verisignclass3g4ca    |   0
 .../share}/data/cacerts/verisignclass3g5ca    |   0
 .../data/cacerts/verisignuniversalrootca      |   0
 .../share}/data/cacerts/xrampglobalca         |   0
 .../data/currency/CurrencyData.properties     |   0
 .../data/lsrdata/language-subtag-registry.txt |   0
 .../share}/data/publicsuffixlist/VERSION      |   0
 .../publicsuffixlist/public_suffix_list.dat   |   0
 .../java.base/share}/data/tzdata/VERSION      |   0
 .../java.base/share}/data/tzdata/africa       |   0
 .../java.base/share}/data/tzdata/antarctica   |   0
 .../java.base/share}/data/tzdata/asia         |   0
 .../java.base/share}/data/tzdata/australasia  |   0
 .../java.base/share}/data/tzdata/backward     |   0
 .../java.base/share}/data/tzdata/etcetera     |   0
 .../java.base/share}/data/tzdata/europe       |   0
 .../java.base/share}/data/tzdata/factory      |   0
 {make => src/java.base/share}/data/tzdata/gmt |   0
 .../java.base/share}/data/tzdata/iso3166.tab  |   0
 .../share}/data/tzdata/jdk11_backward         |   0
 .../java.base/share}/data/tzdata/leapseconds  |   0
 .../java.base/share}/data/tzdata/northamerica |   0
 .../java.base/share}/data/tzdata/solar87      |   0
 .../java.base/share}/data/tzdata/solar88      |   0
 .../java.base/share}/data/tzdata/solar89      |   0
 .../java.base/share}/data/tzdata/southamerica |   0
 .../java.base/share}/data/tzdata/zone.tab     |   0
 .../share}/data/unicodedata/Blocks.txt        |   0
 .../unicodedata/DerivedCoreProperties.txt     |   0
 .../data/unicodedata/NormalizationTest.txt    |   0
 .../share}/data/unicodedata/PropList.txt      |   0
 .../data/unicodedata/PropertyValueAliases.txt |   0
 .../share}/data/unicodedata/ReadMe.txt        |   0
 .../share}/data/unicodedata/Scripts.txt       |   0
 .../share}/data/unicodedata/SpecialCasing.txt |   0
 .../share}/data/unicodedata/UnicodeData.txt   |   0
 .../auxiliary/GraphemeBreakProperty.txt       |   0
 .../auxiliary/GraphemeBreakTest.txt           |   0
 .../data/unicodedata/emoji/emoji-data.txt     |   0
 .../aix/data/fontconfig/fontconfig.properties |   0
 .../bsd/data/fontconfig/fontconfig.properties |   0
 .../data/fontconfig/fontconfig.properties     |   0
 .../macosx}/data/macosxicons/JavaApp.icns     | Bin
 .../share}/data/dtdbuilder/HTMLlat1.sgml      |   0
 .../share}/data/dtdbuilder/HTMLspecial.sgml   |   0
 .../share}/data/dtdbuilder/HTMLsymbol.sgml    |   0
 .../share}/data/dtdbuilder/html32.dtd         |   0
 .../share}/data/dtdbuilder/public.map         |   0
 .../unix}/data/x11wrappergen/sizes-32.txt     |   0
 .../unix}/data/x11wrappergen/sizes-64.txt     |   0
 .../unix}/data/x11wrappergen/xlibtypes.txt    |   0
 .../data/fontconfig/fontconfig.properties     |   0
 .../java.se/share}/data/jdwp/jdwp.spec        |   0
 .../jdk.compiler/share}/data/symbols/README   |   0
 .../share}/data/symbols/include.list          |   0
 .../data/symbols/java.activation-8.sym.txt    |   0
 .../data/symbols/java.activation-9.sym.txt    |   0
 .../data/symbols/java.activation-A.sym.txt    |   0
 .../data/symbols/java.activation-B.sym.txt    |   0
 .../share}/data/symbols/java.base-7.sym.txt   |   0
 .../share}/data/symbols/java.base-8.sym.txt   |   0
 .../share}/data/symbols/java.base-9.sym.txt   |   0
 .../share}/data/symbols/java.base-A.sym.txt   |   0
 .../share}/data/symbols/java.base-B.sym.txt   |   0
 .../share}/data/symbols/java.base-C.sym.txt   |   0
 .../share}/data/symbols/java.base-D.sym.txt   |   0
 .../share}/data/symbols/java.base-E.sym.txt   |   0
 .../share}/data/symbols/java.base-F.sym.txt   |   0
 .../share}/data/symbols/java.base-G.sym.txt   |   0
 .../share}/data/symbols/java.base-H.sym.txt   |   0
 .../share}/data/symbols/java.base-I.sym.txt   |   0
 .../data/symbols/java.compiler-7.sym.txt      |   0
 .../data/symbols/java.compiler-8.sym.txt      |   0
 .../data/symbols/java.compiler-9.sym.txt      |   0
 .../data/symbols/java.compiler-A.sym.txt      |   0
 .../data/symbols/java.compiler-B.sym.txt      |   0
 .../data/symbols/java.compiler-C.sym.txt      |   0
 .../data/symbols/java.compiler-D.sym.txt      |   0
 .../data/symbols/java.compiler-E.sym.txt      |   0
 .../data/symbols/java.compiler-F.sym.txt      |   0
 .../data/symbols/java.compiler-G.sym.txt      |   0
 .../data/symbols/java.compiler-H.sym.txt      |   0
 .../data/symbols/java.compiler-I.sym.txt      |   0
 .../share}/data/symbols/java.corba-8.sym.txt  |   0
 .../share}/data/symbols/java.corba-9.sym.txt  |   0
 .../share}/data/symbols/java.corba-A.sym.txt  |   0
 .../share}/data/symbols/java.corba-B.sym.txt  |   0
 .../data/symbols/java.datatransfer-7.sym.txt  |   0
 .../data/symbols/java.datatransfer-8.sym.txt  |   0
 .../data/symbols/java.datatransfer-9.sym.txt  |   0
 .../data/symbols/java.datatransfer-A.sym.txt  |   0
 .../data/symbols/java.datatransfer-B.sym.txt  |   0
 .../data/symbols/java.datatransfer-G.sym.txt  |   0
 .../data/symbols/java.datatransfer-H.sym.txt  |   0
 .../data/symbols/java.datatransfer-I.sym.txt  |   0
 .../data/symbols/java.desktop-7.sym.txt       |   0
 .../data/symbols/java.desktop-8.sym.txt       |   0
 .../data/symbols/java.desktop-9.sym.txt       |   0
 .../data/symbols/java.desktop-A.sym.txt       |   0
 .../data/symbols/java.desktop-B.sym.txt       |   0
 .../data/symbols/java.desktop-C.sym.txt       |   0
 .../data/symbols/java.desktop-D.sym.txt       |   0
 .../data/symbols/java.desktop-E.sym.txt       |   0
 .../data/symbols/java.desktop-F.sym.txt       |   0
 .../data/symbols/java.desktop-G.sym.txt       |   0
 .../data/symbols/java.desktop-H.sym.txt       |   0
 .../data/symbols/java.desktop-I.sym.txt       |   0
 .../data/symbols/java.instrument-8.sym.txt    |   0
 .../data/symbols/java.instrument-9.sym.txt    |   0
 .../data/symbols/java.instrument-A.sym.txt    |   0
 .../data/symbols/java.instrument-B.sym.txt    |   0
 .../data/symbols/java.instrument-G.sym.txt    |   0
 .../data/symbols/java.instrument-H.sym.txt    |   0
 .../data/symbols/java.instrument-I.sym.txt    |   0
 .../data/symbols/java.logging-7.sym.txt       |   0
 .../data/symbols/java.logging-8.sym.txt       |   0
 .../data/symbols/java.logging-9.sym.txt       |   0
 .../data/symbols/java.logging-A.sym.txt       |   0
 .../data/symbols/java.logging-B.sym.txt       |   0
 .../data/symbols/java.logging-G.sym.txt       |   0
 .../data/symbols/java.logging-H.sym.txt       |   0
 .../data/symbols/java.logging-I.sym.txt       |   0
 .../data/symbols/java.management-7.sym.txt    |   0
 .../data/symbols/java.management-8.sym.txt    |   0
 .../data/symbols/java.management-9.sym.txt    |   0
 .../data/symbols/java.management-A.sym.txt    |   0
 .../data/symbols/java.management-B.sym.txt    |   0
 .../data/symbols/java.management-D.sym.txt    |   0
 .../data/symbols/java.management-G.sym.txt    |   0
 .../data/symbols/java.management-H.sym.txt    |   0
 .../data/symbols/java.management-I.sym.txt    |   0
 .../symbols/java.management.rmi-8.sym.txt     |   0
 .../symbols/java.management.rmi-9.sym.txt     |   0
 .../symbols/java.management.rmi-A.sym.txt     |   0
 .../symbols/java.management.rmi-B.sym.txt     |   0
 .../symbols/java.management.rmi-D.sym.txt     |   0
 .../symbols/java.management.rmi-F.sym.txt     |   0
 .../symbols/java.management.rmi-G.sym.txt     |   0
 .../symbols/java.management.rmi-H.sym.txt     |   0
 .../symbols/java.management.rmi-I.sym.txt     |   0
 .../share}/data/symbols/java.naming-7.sym.txt |   0
 .../share}/data/symbols/java.naming-8.sym.txt |   0
 .../share}/data/symbols/java.naming-9.sym.txt |   0
 .../share}/data/symbols/java.naming-A.sym.txt |   0
 .../share}/data/symbols/java.naming-B.sym.txt |   0
 .../share}/data/symbols/java.naming-C.sym.txt |   0
 .../share}/data/symbols/java.naming-F.sym.txt |   0
 .../share}/data/symbols/java.naming-G.sym.txt |   0
 .../share}/data/symbols/java.naming-H.sym.txt |   0
 .../share}/data/symbols/java.naming-I.sym.txt |   0
 .../data/symbols/java.net.http-B.sym.txt      |   0
 .../data/symbols/java.net.http-D.sym.txt      |   0
 .../data/symbols/java.net.http-G.sym.txt      |   0
 .../data/symbols/java.net.http-I.sym.txt      |   0
 .../share}/data/symbols/java.prefs-7.sym.txt  |   0
 .../share}/data/symbols/java.prefs-8.sym.txt  |   0
 .../share}/data/symbols/java.prefs-9.sym.txt  |   0
 .../share}/data/symbols/java.prefs-A.sym.txt  |   0
 .../share}/data/symbols/java.prefs-B.sym.txt  |   0
 .../share}/data/symbols/java.rmi-7.sym.txt    |   0
 .../share}/data/symbols/java.rmi-8.sym.txt    |   0
 .../share}/data/symbols/java.rmi-9.sym.txt    |   0
 .../share}/data/symbols/java.rmi-A.sym.txt    |   0
 .../share}/data/symbols/java.rmi-B.sym.txt    |   0
 .../share}/data/symbols/java.rmi-C.sym.txt    |   0
 .../share}/data/symbols/java.rmi-F.sym.txt    |   0
 .../share}/data/symbols/java.rmi-G.sym.txt    |   0
 .../share}/data/symbols/java.rmi-H.sym.txt    |   0
 .../share}/data/symbols/java.rmi-I.sym.txt    |   0
 .../data/symbols/java.scripting-7.sym.txt     |   0
 .../data/symbols/java.scripting-8.sym.txt     |   0
 .../data/symbols/java.scripting-9.sym.txt     |   0
 .../data/symbols/java.scripting-A.sym.txt     |   0
 .../data/symbols/java.scripting-B.sym.txt     |   0
 .../data/symbols/java.scripting-G.sym.txt     |   0
 .../data/symbols/java.scripting-H.sym.txt     |   0
 .../data/symbols/java.scripting-I.sym.txt     |   0
 .../share}/data/symbols/java.se-9.sym.txt     |   0
 .../share}/data/symbols/java.se-A.sym.txt     |   0
 .../share}/data/symbols/java.se-B.sym.txt     |   0
 .../share}/data/symbols/java.se.ee-9.sym.txt  |   0
 .../share}/data/symbols/java.se.ee-A.sym.txt  |   0
 .../share}/data/symbols/java.se.ee-B.sym.txt  |   0
 .../data/symbols/java.security.jgss-7.sym.txt |   0
 .../data/symbols/java.security.jgss-8.sym.txt |   0
 .../data/symbols/java.security.jgss-9.sym.txt |   0
 .../data/symbols/java.security.jgss-A.sym.txt |   0
 .../data/symbols/java.security.jgss-B.sym.txt |   0
 .../data/symbols/java.security.jgss-D.sym.txt |   0
 .../data/symbols/java.security.jgss-G.sym.txt |   0
 .../data/symbols/java.security.jgss-H.sym.txt |   0
 .../data/symbols/java.security.jgss-I.sym.txt |   0
 .../data/symbols/java.security.sasl-7.sym.txt |   0
 .../data/symbols/java.security.sasl-8.sym.txt |   0
 .../data/symbols/java.security.sasl-9.sym.txt |   0
 .../data/symbols/java.security.sasl-A.sym.txt |   0
 .../data/symbols/java.security.sasl-B.sym.txt |   0
 .../data/symbols/java.security.sasl-G.sym.txt |   0
 .../data/symbols/java.security.sasl-H.sym.txt |   0
 .../data/symbols/java.security.sasl-I.sym.txt |   0
 .../data/symbols/java.smartcardio-9.sym.txt   |   0
 .../data/symbols/java.smartcardio-A.sym.txt   |   0
 .../data/symbols/java.smartcardio-B.sym.txt   |   0
 .../data/symbols/java.smartcardio-G.sym.txt   |   0
 .../data/symbols/java.smartcardio-H.sym.txt   |   0
 .../data/symbols/java.smartcardio-I.sym.txt   |   0
 .../share}/data/symbols/java.sql-7.sym.txt    |   0
 .../share}/data/symbols/java.sql-8.sym.txt    |   0
 .../share}/data/symbols/java.sql-9.sym.txt    |   0
 .../share}/data/symbols/java.sql-A.sym.txt    |   0
 .../share}/data/symbols/java.sql-B.sym.txt    |   0
 .../share}/data/symbols/java.sql-G.sym.txt    |   0
 .../share}/data/symbols/java.sql-H.sym.txt    |   0
 .../share}/data/symbols/java.sql-I.sym.txt    |   0
 .../data/symbols/java.sql.rowset-7.sym.txt    |   0
 .../data/symbols/java.sql.rowset-8.sym.txt    |   0
 .../data/symbols/java.sql.rowset-9.sym.txt    |   0
 .../data/symbols/java.sql.rowset-A.sym.txt    |   0
 .../data/symbols/java.sql.rowset-B.sym.txt    |   0
 .../data/symbols/java.sql.rowset-G.sym.txt    |   0
 .../data/symbols/java.sql.rowset-H.sym.txt    |   0
 .../data/symbols/java.sql.rowset-I.sym.txt    |   0
 .../data/symbols/java.transaction-8.sym.txt   |   0
 .../data/symbols/java.transaction-9.sym.txt   |   0
 .../data/symbols/java.transaction-A.sym.txt   |   0
 .../data/symbols/java.transaction-B.sym.txt   |   0
 .../symbols/java.transaction.xa-B.sym.txt     |   0
 .../share}/data/symbols/java.xml-7.sym.txt    |   0
 .../share}/data/symbols/java.xml-8.sym.txt    |   0
 .../share}/data/symbols/java.xml-9.sym.txt    |   0
 .../share}/data/symbols/java.xml-A.sym.txt    |   0
 .../share}/data/symbols/java.xml-B.sym.txt    |   0
 .../share}/data/symbols/java.xml-C.sym.txt    |   0
 .../share}/data/symbols/java.xml-D.sym.txt    |   0
 .../share}/data/symbols/java.xml-E.sym.txt    |   0
 .../share}/data/symbols/java.xml-F.sym.txt    |   0
 .../share}/data/symbols/java.xml-G.sym.txt    |   0
 .../share}/data/symbols/java.xml-H.sym.txt    |   0
 .../share}/data/symbols/java.xml-I.sym.txt    |   0
 .../data/symbols/java.xml.bind-7.sym.txt      |   0
 .../data/symbols/java.xml.bind-8.sym.txt      |   0
 .../data/symbols/java.xml.bind-9.sym.txt      |   0
 .../data/symbols/java.xml.bind-A.sym.txt      |   0
 .../data/symbols/java.xml.bind-B.sym.txt      |   0
 .../data/symbols/java.xml.crypto-8.sym.txt    |   0
 .../data/symbols/java.xml.crypto-9.sym.txt    |   0
 .../data/symbols/java.xml.crypto-A.sym.txt    |   0
 .../data/symbols/java.xml.crypto-B.sym.txt    |   0
 .../data/symbols/java.xml.crypto-D.sym.txt    |   0
 .../data/symbols/java.xml.crypto-G.sym.txt    |   0
 .../data/symbols/java.xml.crypto-H.sym.txt    |   0
 .../data/symbols/java.xml.crypto-I.sym.txt    |   0
 .../share}/data/symbols/java.xml.ws-8.sym.txt |   0
 .../share}/data/symbols/java.xml.ws-9.sym.txt |   0
 .../share}/data/symbols/java.xml.ws-A.sym.txt |   0
 .../share}/data/symbols/java.xml.ws-B.sym.txt |   0
 .../symbols/java.xml.ws.annotation-7.sym.txt  |   0
 .../symbols/java.xml.ws.annotation-8.sym.txt  |   0
 .../symbols/java.xml.ws.annotation-9.sym.txt  |   0
 .../symbols/java.xml.ws.annotation-A.sym.txt  |   0
 .../symbols/java.xml.ws.annotation-B.sym.txt  |   0
 .../data/symbols/jdk.accessibility-9.sym.txt  |   0
 .../data/symbols/jdk.accessibility-A.sym.txt  |   0
 .../data/symbols/jdk.accessibility-B.sym.txt  |   0
 .../data/symbols/jdk.accessibility-G.sym.txt  |   0
 .../data/symbols/jdk.accessibility-H.sym.txt  |   0
 .../data/symbols/jdk.accessibility-I.sym.txt  |   0
 .../share}/data/symbols/jdk.attach-9.sym.txt  |   0
 .../share}/data/symbols/jdk.attach-A.sym.txt  |   0
 .../share}/data/symbols/jdk.attach-B.sym.txt  |   0
 .../share}/data/symbols/jdk.attach-G.sym.txt  |   0
 .../share}/data/symbols/jdk.attach-H.sym.txt  |   0
 .../share}/data/symbols/jdk.attach-I.sym.txt  |   0
 .../data/symbols/jdk.charsets-9.sym.txt       |   0
 .../data/symbols/jdk.charsets-A.sym.txt       |   0
 .../data/symbols/jdk.charsets-B.sym.txt       |   0
 .../data/symbols/jdk.compiler-9.sym.txt       |   0
 .../data/symbols/jdk.compiler-A.sym.txt       |   0
 .../data/symbols/jdk.compiler-B.sym.txt       |   0
 .../data/symbols/jdk.compiler-C.sym.txt       |   0
 .../data/symbols/jdk.compiler-D.sym.txt       |   0
 .../data/symbols/jdk.compiler-E.sym.txt       |   0
 .../data/symbols/jdk.compiler-F.sym.txt       |   0
 .../data/symbols/jdk.compiler-G.sym.txt       |   0
 .../data/symbols/jdk.compiler-H.sym.txt       |   0
 .../data/symbols/jdk.compiler-I.sym.txt       |   0
 .../symbols/jdk.crypto.cryptoki-9.sym.txt     |   0
 .../symbols/jdk.crypto.cryptoki-A.sym.txt     |   0
 .../symbols/jdk.crypto.cryptoki-B.sym.txt     |   0
 .../data/symbols/jdk.crypto.ec-9.sym.txt      |   0
 .../data/symbols/jdk.crypto.ec-A.sym.txt      |   0
 .../data/symbols/jdk.crypto.ec-B.sym.txt      |   0
 .../data/symbols/jdk.dynalink-9.sym.txt       |   0
 .../data/symbols/jdk.dynalink-A.sym.txt       |   0
 .../data/symbols/jdk.dynalink-B.sym.txt       |   0
 .../data/symbols/jdk.dynalink-G.sym.txt       |   0
 .../data/symbols/jdk.dynalink-H.sym.txt       |   0
 .../data/symbols/jdk.dynalink-I.sym.txt       |   0
 .../share}/data/symbols/jdk.editpad-9.sym.txt |   0
 .../share}/data/symbols/jdk.editpad-A.sym.txt |   0
 .../share}/data/symbols/jdk.editpad-B.sym.txt |   0
 .../data/symbols/jdk.hotspot.agent-9.sym.txt  |   0
 .../data/symbols/jdk.hotspot.agent-A.sym.txt  |   0
 .../data/symbols/jdk.hotspot.agent-B.sym.txt  |   0
 .../data/symbols/jdk.httpserver-7.sym.txt     |   0
 .../data/symbols/jdk.httpserver-8.sym.txt     |   0
 .../data/symbols/jdk.httpserver-9.sym.txt     |   0
 .../data/symbols/jdk.httpserver-A.sym.txt     |   0
 .../data/symbols/jdk.httpserver-B.sym.txt     |   0
 .../data/symbols/jdk.httpserver-D.sym.txt     |   0
 .../data/symbols/jdk.httpserver-E.sym.txt     |   0
 .../data/symbols/jdk.httpserver-G.sym.txt     |   0
 .../data/symbols/jdk.httpserver-H.sym.txt     |   0
 .../data/symbols/jdk.httpserver-I.sym.txt     |   0
 .../symbols/jdk.incubator.foreign-E.sym.txt   |   0
 .../symbols/jdk.incubator.foreign-F.sym.txt   |   0
 .../symbols/jdk.incubator.foreign-G.sym.txt   |   0
 .../symbols/jdk.incubator.foreign-H.sym.txt   |   0
 .../symbols/jdk.incubator.foreign-I.sym.txt   |   0
 .../jdk.incubator.httpclient-9.sym.txt        |   0
 .../jdk.incubator.httpclient-A.sym.txt        |   0
 .../jdk.incubator.httpclient-B.sym.txt        |   0
 .../symbols/jdk.incubator.jpackage-E.sym.txt  |   0
 .../symbols/jdk.incubator.jpackage-G.sym.txt  |   0
 .../symbols/jdk.incubator.vector-G.sym.txt    |   0
 .../symbols/jdk.incubator.vector-H.sym.txt    |   0
 .../symbols/jdk.incubator.vector-I.sym.txt    |   0
 .../share}/data/symbols/jdk.jartool-9.sym.txt |   0
 .../share}/data/symbols/jdk.jartool-A.sym.txt |   0
 .../share}/data/symbols/jdk.jartool-B.sym.txt |   0
 .../share}/data/symbols/jdk.jartool-D.sym.txt |   0
 .../share}/data/symbols/jdk.jartool-F.sym.txt |   0
 .../share}/data/symbols/jdk.jartool-G.sym.txt |   0
 .../share}/data/symbols/jdk.jartool-H.sym.txt |   0
 .../share}/data/symbols/jdk.jartool-I.sym.txt |   0
 .../share}/data/symbols/jdk.javadoc-9.sym.txt |   0
 .../share}/data/symbols/jdk.javadoc-A.sym.txt |   0
 .../share}/data/symbols/jdk.javadoc-B.sym.txt |   0
 .../share}/data/symbols/jdk.javadoc-D.sym.txt |   0
 .../share}/data/symbols/jdk.javadoc-F.sym.txt |   0
 .../share}/data/symbols/jdk.javadoc-G.sym.txt |   0
 .../share}/data/symbols/jdk.javadoc-H.sym.txt |   0
 .../share}/data/symbols/jdk.javadoc-I.sym.txt |   0
 .../share}/data/symbols/jdk.jcmd-9.sym.txt    |   0
 .../share}/data/symbols/jdk.jcmd-A.sym.txt    |   0
 .../share}/data/symbols/jdk.jcmd-B.sym.txt    |   0
 .../data/symbols/jdk.jconsole-9.sym.txt       |   0
 .../data/symbols/jdk.jconsole-A.sym.txt       |   0
 .../data/symbols/jdk.jconsole-B.sym.txt       |   0
 .../data/symbols/jdk.jconsole-G.sym.txt       |   0
 .../data/symbols/jdk.jconsole-H.sym.txt       |   0
 .../data/symbols/jdk.jconsole-I.sym.txt       |   0
 .../share}/data/symbols/jdk.jdeps-9.sym.txt   |   0
 .../share}/data/symbols/jdk.jdeps-A.sym.txt   |   0
 .../share}/data/symbols/jdk.jdeps-B.sym.txt   |   0
 .../share}/data/symbols/jdk.jdi-9.sym.txt     |   0
 .../share}/data/symbols/jdk.jdi-A.sym.txt     |   0
 .../share}/data/symbols/jdk.jdi-B.sym.txt     |   0
 .../share}/data/symbols/jdk.jdi-F.sym.txt     |   0
 .../share}/data/symbols/jdk.jdi-G.sym.txt     |   0
 .../share}/data/symbols/jdk.jdi-H.sym.txt     |   0
 .../share}/data/symbols/jdk.jdi-I.sym.txt     |   0
 .../data/symbols/jdk.jdwp.agent-9.sym.txt     |   0
 .../data/symbols/jdk.jdwp.agent-A.sym.txt     |   0
 .../data/symbols/jdk.jdwp.agent-B.sym.txt     |   0
 .../share}/data/symbols/jdk.jfr-B.sym.txt     |   0
 .../share}/data/symbols/jdk.jfr-C.sym.txt     |   0
 .../share}/data/symbols/jdk.jfr-E.sym.txt     |   0
 .../share}/data/symbols/jdk.jfr-G.sym.txt     |   0
 .../share}/data/symbols/jdk.jfr-H.sym.txt     |   0
 .../share}/data/symbols/jdk.jlink-9.sym.txt   |   0
 .../share}/data/symbols/jdk.jlink-A.sym.txt   |   0
 .../share}/data/symbols/jdk.jlink-B.sym.txt   |   0
 .../share}/data/symbols/jdk.jlink-D.sym.txt   |   0
 .../share}/data/symbols/jdk.jlink-E.sym.txt   |   0
 .../share}/data/symbols/jdk.jlink-I.sym.txt   |   0
 .../data/symbols/jdk.jpackage-G.sym.txt       |   0
 .../share}/data/symbols/jdk.jshell-9.sym.txt  |   0
 .../share}/data/symbols/jdk.jshell-A.sym.txt  |   0
 .../share}/data/symbols/jdk.jshell-B.sym.txt  |   0
 .../share}/data/symbols/jdk.jshell-D.sym.txt  |   0
 .../share}/data/symbols/jdk.jshell-E.sym.txt  |   0
 .../share}/data/symbols/jdk.jshell-G.sym.txt  |   0
 .../share}/data/symbols/jdk.jshell-H.sym.txt  |   0
 .../share}/data/symbols/jdk.jshell-I.sym.txt  |   0
 .../data/symbols/jdk.jsobject-9.sym.txt       |   0
 .../data/symbols/jdk.jsobject-A.sym.txt       |   0
 .../data/symbols/jdk.jsobject-B.sym.txt       |   0
 .../data/symbols/jdk.jsobject-C.sym.txt       |   0
 .../data/symbols/jdk.jsobject-E.sym.txt       |   0
 .../data/symbols/jdk.jsobject-G.sym.txt       |   0
 .../data/symbols/jdk.jsobject-H.sym.txt       |   0
 .../data/symbols/jdk.jsobject-I.sym.txt       |   0
 .../share}/data/symbols/jdk.jstatd-9.sym.txt  |   0
 .../share}/data/symbols/jdk.jstatd-A.sym.txt  |   0
 .../share}/data/symbols/jdk.jstatd-B.sym.txt  |   0
 .../data/symbols/jdk.localedata-9.sym.txt     |   0
 .../data/symbols/jdk.localedata-A.sym.txt     |   0
 .../data/symbols/jdk.localedata-B.sym.txt     |   0
 .../data/symbols/jdk.management-7.sym.txt     |   0
 .../data/symbols/jdk.management-8.sym.txt     |   0
 .../data/symbols/jdk.management-9.sym.txt     |   0
 .../data/symbols/jdk.management-A.sym.txt     |   0
 .../data/symbols/jdk.management-B.sym.txt     |   0
 .../data/symbols/jdk.management-E.sym.txt     |   0
 .../data/symbols/jdk.management-G.sym.txt     |   0
 .../data/symbols/jdk.management-H.sym.txt     |   0
 .../data/symbols/jdk.management-I.sym.txt     |   0
 .../symbols/jdk.management.agent-9.sym.txt    |   0
 .../symbols/jdk.management.agent-A.sym.txt    |   0
 .../symbols/jdk.management.agent-B.sym.txt    |   0
 .../data/symbols/jdk.management.jfr-B.sym.txt |   0
 .../data/symbols/jdk.management.jfr-G.sym.txt |   0
 .../data/symbols/jdk.management.jfr-H.sym.txt |   0
 .../data/symbols/jdk.management.jfr-I.sym.txt |   0
 .../data/symbols/jdk.naming.dns-9.sym.txt     |   0
 .../data/symbols/jdk.naming.dns-A.sym.txt     |   0
 .../data/symbols/jdk.naming.dns-B.sym.txt     |   0
 .../data/symbols/jdk.naming.rmi-9.sym.txt     |   0
 .../data/symbols/jdk.naming.rmi-A.sym.txt     |   0
 .../data/symbols/jdk.naming.rmi-B.sym.txt     |   0
 .../share}/data/symbols/jdk.net-9.sym.txt     |   0
 .../share}/data/symbols/jdk.net-A.sym.txt     |   0
 .../share}/data/symbols/jdk.net-B.sym.txt     |   0
 .../share}/data/symbols/jdk.net-E.sym.txt     |   0
 .../share}/data/symbols/jdk.net-F.sym.txt     |   0
 .../share}/data/symbols/jdk.net-G.sym.txt     |   0
 .../share}/data/symbols/jdk.net-H.sym.txt     |   0
 .../share}/data/symbols/jdk.net-I.sym.txt     |   0
 .../data/symbols/jdk.nio.mapmode-F.sym.txt    |   0
 .../share}/data/symbols/jdk.pack-9.sym.txt    |   0
 .../share}/data/symbols/jdk.pack-A.sym.txt    |   0
 .../share}/data/symbols/jdk.pack-B.sym.txt    |   0
 .../share}/data/symbols/jdk.pack-E.sym.txt    |   0
 .../data/symbols/jdk.policytool-9.sym.txt     |   0
 .../data/symbols/jdk.policytool-A.sym.txt     |   0
 .../share}/data/symbols/jdk.rmic-9.sym.txt    |   0
 .../share}/data/symbols/jdk.rmic-A.sym.txt    |   0
 .../share}/data/symbols/jdk.rmic-B.sym.txt    |   0
 .../share}/data/symbols/jdk.rmic-F.sym.txt    |   0
 .../symbols/jdk.scripting.nashorn-7.sym.txt   |   0
 .../symbols/jdk.scripting.nashorn-8.sym.txt   |   0
 .../symbols/jdk.scripting.nashorn-9.sym.txt   |   0
 .../symbols/jdk.scripting.nashorn-A.sym.txt   |   0
 .../symbols/jdk.scripting.nashorn-B.sym.txt   |   0
 .../symbols/jdk.scripting.nashorn-F.sym.txt   |   0
 .../share}/data/symbols/jdk.sctp-7.sym.txt    |   0
 .../share}/data/symbols/jdk.sctp-8.sym.txt    |   0
 .../share}/data/symbols/jdk.sctp-9.sym.txt    |   0
 .../share}/data/symbols/jdk.sctp-A.sym.txt    |   0
 .../share}/data/symbols/jdk.sctp-B.sym.txt    |   0
 .../share}/data/symbols/jdk.sctp-G.sym.txt    |   0
 .../share}/data/symbols/jdk.sctp-H.sym.txt    |   0
 .../share}/data/symbols/jdk.sctp-I.sym.txt    |   0
 .../data/symbols/jdk.security.auth-7.sym.txt  |   0
 .../data/symbols/jdk.security.auth-8.sym.txt  |   0
 .../data/symbols/jdk.security.auth-9.sym.txt  |   0
 .../data/symbols/jdk.security.auth-A.sym.txt  |   0
 .../data/symbols/jdk.security.auth-B.sym.txt  |   0
 .../data/symbols/jdk.security.auth-G.sym.txt  |   0
 .../data/symbols/jdk.security.auth-H.sym.txt  |   0
 .../data/symbols/jdk.security.auth-I.sym.txt  |   0
 .../data/symbols/jdk.security.jgss-7.sym.txt  |   0
 .../data/symbols/jdk.security.jgss-8.sym.txt  |   0
 .../data/symbols/jdk.security.jgss-9.sym.txt  |   0
 .../data/symbols/jdk.security.jgss-A.sym.txt  |   0
 .../data/symbols/jdk.security.jgss-B.sym.txt  |   0
 .../data/symbols/jdk.security.jgss-G.sym.txt  |   0
 .../data/symbols/jdk.security.jgss-H.sym.txt  |   0
 .../data/symbols/jdk.security.jgss-I.sym.txt  |   0
 .../data/symbols/jdk.unsupported-9.sym.txt    |   0
 .../data/symbols/jdk.unsupported-A.sym.txt    |   0
 .../data/symbols/jdk.unsupported-B.sym.txt    |   0
 .../data/symbols/jdk.unsupported-C.sym.txt    |   0
 .../data/symbols/jdk.unsupported-F.sym.txt    |   0
 .../data/symbols/jdk.unsupported-G.sym.txt    |   0
 .../data/symbols/jdk.unsupported-H.sym.txt    |   0
 .../data/symbols/jdk.unsupported-I.sym.txt    |   0
 .../share}/data/symbols/jdk.xml.dom-9.sym.txt |   0
 .../share}/data/symbols/jdk.xml.dom-A.sym.txt |   0
 .../share}/data/symbols/jdk.xml.dom-B.sym.txt |   0
 .../share}/data/symbols/jdk.xml.dom-G.sym.txt |   0
 .../share}/data/symbols/jdk.xml.dom-H.sym.txt |   0
 .../share}/data/symbols/jdk.xml.dom-I.sym.txt |   0
 .../share}/data/symbols/jdk.zipfs-9.sym.txt   |   0
 .../share}/data/symbols/jdk.zipfs-A.sym.txt   |   0
 .../share}/data/symbols/jdk.zipfs-B.sym.txt   |   0
 .../jdk.compiler/share}/data/symbols/symbols  |   0
 test/jdk/java/security/misc/Versions.java     |   4 +-
 test/jdk/java/util/Currency/CurrencyTest.java |   4 +-
 test/jdk/java/util/Locale/LSRDataTest.java    |  10 ++---
 .../lib/testlibrary/java/lang/UCDFiles.java   |   9 ++--
 test/jdk/sun/nio/cs/TestCharsetMapping.java   |   4 +-
 test/jdk/sun/nio/cs/TestMS950.java            |   2 +-
 .../sun/security/lib/CheckBlockedCerts.java   |   4 +-
 .../sun/util/calendar/zi/TestZoneInfo310.java |   4 +-
 .../platform/CanHandleClassFilesTest.java     |   2 +-
 .../tools/javac/sym/ElementStructureTest.java |   8 ++--
 619 files changed, 134 insertions(+), 126 deletions(-)
 rename {make/data/characterdata => src/java.base/share/classes/java/lang}/CharacterData00.java.template (100%)
 rename {make/data/characterdata => src/java.base/share/classes/java/lang}/CharacterData01.java.template (100%)
 rename {make/data/characterdata => src/java.base/share/classes/java/lang}/CharacterData02.java.template (100%)
 rename {make/data/characterdata => src/java.base/share/classes/java/lang}/CharacterData03.java.template (100%)
 rename {make/data/characterdata => src/java.base/share/classes/java/lang}/CharacterData0E.java.template (100%)
 rename {make/data/characterdata => src/java.base/share/classes/java/lang}/CharacterDataLatin1.java.template (100%)
 rename {make => src/java.base/share}/data/blockedcertsconverter/blocked.certs.pem (100%)
 rename {make => src/java.base/share}/data/cacerts/README (100%)
 rename {make => src/java.base/share}/data/cacerts/actalisauthenticationrootca (100%)
 rename {make => src/java.base/share}/data/cacerts/addtrustexternalca (100%)
 rename {make => src/java.base/share}/data/cacerts/addtrustqualifiedca (100%)
 rename {make => src/java.base/share}/data/cacerts/affirmtrustcommercialca (100%)
 rename {make => src/java.base/share}/data/cacerts/affirmtrustnetworkingca (100%)
 rename {make => src/java.base/share}/data/cacerts/affirmtrustpremiumca (100%)
 rename {make => src/java.base/share}/data/cacerts/affirmtrustpremiumeccca (100%)
 rename {make => src/java.base/share}/data/cacerts/amazonrootca1 (100%)
 rename {make => src/java.base/share}/data/cacerts/amazonrootca2 (100%)
 rename {make => src/java.base/share}/data/cacerts/amazonrootca3 (100%)
 rename {make => src/java.base/share}/data/cacerts/amazonrootca4 (100%)
 rename {make => src/java.base/share}/data/cacerts/baltimorecybertrustca (100%)
 rename {make => src/java.base/share}/data/cacerts/buypassclass2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/buypassclass3ca (100%)
 rename {make => src/java.base/share}/data/cacerts/camerfirmachambersca (100%)
 rename {make => src/java.base/share}/data/cacerts/camerfirmachamberscommerceca (100%)
 rename {make => src/java.base/share}/data/cacerts/camerfirmachambersignca (100%)
 rename {make => src/java.base/share}/data/cacerts/certumca (100%)
 rename {make => src/java.base/share}/data/cacerts/certumtrustednetworkca (100%)
 rename {make => src/java.base/share}/data/cacerts/chunghwaepkirootca (100%)
 rename {make => src/java.base/share}/data/cacerts/comodoaaaca (100%)
 rename {make => src/java.base/share}/data/cacerts/comodoeccca (100%)
 rename {make => src/java.base/share}/data/cacerts/comodorsaca (100%)
 rename {make => src/java.base/share}/data/cacerts/digicertassuredidg2 (100%)
 rename {make => src/java.base/share}/data/cacerts/digicertassuredidg3 (100%)
 rename {make => src/java.base/share}/data/cacerts/digicertassuredidrootca (100%)
 rename {make => src/java.base/share}/data/cacerts/digicertglobalrootca (100%)
 rename {make => src/java.base/share}/data/cacerts/digicertglobalrootg2 (100%)
 rename {make => src/java.base/share}/data/cacerts/digicertglobalrootg3 (100%)
 rename {make => src/java.base/share}/data/cacerts/digicerthighassuranceevrootca (100%)
 rename {make => src/java.base/share}/data/cacerts/digicerttrustedrootg4 (100%)
 rename {make => src/java.base/share}/data/cacerts/dtrustclass3ca2 (100%)
 rename {make => src/java.base/share}/data/cacerts/dtrustclass3ca2ev (100%)
 rename {make => src/java.base/share}/data/cacerts/entrust2048ca (100%)
 rename {make => src/java.base/share}/data/cacerts/entrustevca (100%)
 rename {make => src/java.base/share}/data/cacerts/entrustrootcaec1 (100%)
 rename {make => src/java.base/share}/data/cacerts/entrustrootcag2 (100%)
 rename {make => src/java.base/share}/data/cacerts/entrustrootcag4 (100%)
 rename {make => src/java.base/share}/data/cacerts/geotrustglobalca (100%)
 rename {make => src/java.base/share}/data/cacerts/geotrustprimaryca (100%)
 rename {make => src/java.base/share}/data/cacerts/geotrustprimarycag2 (100%)
 rename {make => src/java.base/share}/data/cacerts/geotrustprimarycag3 (100%)
 rename {make => src/java.base/share}/data/cacerts/geotrustuniversalca (100%)
 rename {make => src/java.base/share}/data/cacerts/globalsignca (100%)
 rename {make => src/java.base/share}/data/cacerts/globalsigneccrootcar4 (100%)
 rename {make => src/java.base/share}/data/cacerts/globalsigneccrootcar5 (100%)
 rename {make => src/java.base/share}/data/cacerts/globalsignr3ca (100%)
 rename {make => src/java.base/share}/data/cacerts/globalsignrootcar6 (100%)
 rename {make => src/java.base/share}/data/cacerts/godaddyclass2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/godaddyrootg2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/haricaeccrootca2015 (100%)
 rename {make => src/java.base/share}/data/cacerts/haricarootca2015 (100%)
 rename {make => src/java.base/share}/data/cacerts/identrustcommercial (100%)
 rename {make => src/java.base/share}/data/cacerts/identrustpublicca (100%)
 rename {make => src/java.base/share}/data/cacerts/letsencryptisrgx1 (100%)
 rename {make => src/java.base/share}/data/cacerts/luxtrustglobalroot2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/luxtrustglobalrootca (100%)
 rename {make => src/java.base/share}/data/cacerts/quovadisrootca (100%)
 rename {make => src/java.base/share}/data/cacerts/quovadisrootca1g3 (100%)
 rename {make => src/java.base/share}/data/cacerts/quovadisrootca2 (100%)
 rename {make => src/java.base/share}/data/cacerts/quovadisrootca2g3 (100%)
 rename {make => src/java.base/share}/data/cacerts/quovadisrootca3 (100%)
 rename {make => src/java.base/share}/data/cacerts/quovadisrootca3g3 (100%)
 rename {make => src/java.base/share}/data/cacerts/secomscrootca1 (100%)
 rename {make => src/java.base/share}/data/cacerts/secomscrootca2 (100%)
 rename {make => src/java.base/share}/data/cacerts/securetrustca (100%)
 rename {make => src/java.base/share}/data/cacerts/sslrooteccca (100%)
 rename {make => src/java.base/share}/data/cacerts/sslrootevrsaca (100%)
 rename {make => src/java.base/share}/data/cacerts/sslrootrsaca (100%)
 rename {make => src/java.base/share}/data/cacerts/starfieldclass2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/starfieldrootg2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/starfieldservicesrootg2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/swisssigngoldg2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/swisssignplatinumg2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/swisssignsilverg2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/teliasonerarootcav1 (100%)
 rename {make => src/java.base/share}/data/cacerts/thawteprimaryrootca (100%)
 rename {make => src/java.base/share}/data/cacerts/thawteprimaryrootcag2 (100%)
 rename {make => src/java.base/share}/data/cacerts/thawteprimaryrootcag3 (100%)
 rename {make => src/java.base/share}/data/cacerts/ttelesecglobalrootclass2ca (100%)
 rename {make => src/java.base/share}/data/cacerts/ttelesecglobalrootclass3ca (100%)
 rename {make => src/java.base/share}/data/cacerts/usertrusteccca (100%)
 rename {make => src/java.base/share}/data/cacerts/usertrustrsaca (100%)
 rename {make => src/java.base/share}/data/cacerts/utnuserfirstobjectca (100%)
 rename {make => src/java.base/share}/data/cacerts/verisignclass3g3ca (100%)
 rename {make => src/java.base/share}/data/cacerts/verisignclass3g4ca (100%)
 rename {make => src/java.base/share}/data/cacerts/verisignclass3g5ca (100%)
 rename {make => src/java.base/share}/data/cacerts/verisignuniversalrootca (100%)
 rename {make => src/java.base/share}/data/cacerts/xrampglobalca (100%)
 rename {make => src/java.base/share}/data/currency/CurrencyData.properties (100%)
 rename {make => src/java.base/share}/data/lsrdata/language-subtag-registry.txt (100%)
 rename {make => src/java.base/share}/data/publicsuffixlist/VERSION (100%)
 rename {make => src/java.base/share}/data/publicsuffixlist/public_suffix_list.dat (100%)
 rename {make => src/java.base/share}/data/tzdata/VERSION (100%)
 rename {make => src/java.base/share}/data/tzdata/africa (100%)
 rename {make => src/java.base/share}/data/tzdata/antarctica (100%)
 rename {make => src/java.base/share}/data/tzdata/asia (100%)
 rename {make => src/java.base/share}/data/tzdata/australasia (100%)
 rename {make => src/java.base/share}/data/tzdata/backward (100%)
 rename {make => src/java.base/share}/data/tzdata/etcetera (100%)
 rename {make => src/java.base/share}/data/tzdata/europe (100%)
 rename {make => src/java.base/share}/data/tzdata/factory (100%)
 rename {make => src/java.base/share}/data/tzdata/gmt (100%)
 rename {make => src/java.base/share}/data/tzdata/iso3166.tab (100%)
 rename {make => src/java.base/share}/data/tzdata/jdk11_backward (100%)
 rename {make => src/java.base/share}/data/tzdata/leapseconds (100%)
 rename {make => src/java.base/share}/data/tzdata/northamerica (100%)
 rename {make => src/java.base/share}/data/tzdata/solar87 (100%)
 rename {make => src/java.base/share}/data/tzdata/solar88 (100%)
 rename {make => src/java.base/share}/data/tzdata/solar89 (100%)
 rename {make => src/java.base/share}/data/tzdata/southamerica (100%)
 rename {make => src/java.base/share}/data/tzdata/zone.tab (100%)
 rename {make => src/java.base/share}/data/unicodedata/Blocks.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/DerivedCoreProperties.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/NormalizationTest.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/PropList.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/PropertyValueAliases.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/ReadMe.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/Scripts.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/SpecialCasing.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/UnicodeData.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/auxiliary/GraphemeBreakProperty.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/auxiliary/GraphemeBreakTest.txt (100%)
 rename {make => src/java.base/share}/data/unicodedata/emoji/emoji-data.txt (100%)
 rename make/data/fontconfig/aix.fontconfig.properties => src/java.desktop/aix/data/fontconfig/fontconfig.properties (100%)
 rename make/data/fontconfig/bsd.fontconfig.properties => src/java.desktop/bsd/data/fontconfig/fontconfig.properties (100%)
 rename make/data/fontconfig/macosx.fontconfig.properties => src/java.desktop/macosx/data/fontconfig/fontconfig.properties (100%)
 rename {make => src/java.desktop/macosx}/data/macosxicons/JavaApp.icns (100%)
 rename {make => src/java.desktop/share}/data/dtdbuilder/HTMLlat1.sgml (100%)
 rename {make => src/java.desktop/share}/data/dtdbuilder/HTMLspecial.sgml (100%)
 rename {make => src/java.desktop/share}/data/dtdbuilder/HTMLsymbol.sgml (100%)
 rename {make => src/java.desktop/share}/data/dtdbuilder/html32.dtd (100%)
 rename {make => src/java.desktop/share}/data/dtdbuilder/public.map (100%)
 rename {make => src/java.desktop/unix}/data/x11wrappergen/sizes-32.txt (100%)
 rename {make => src/java.desktop/unix}/data/x11wrappergen/sizes-64.txt (100%)
 rename {make => src/java.desktop/unix}/data/x11wrappergen/xlibtypes.txt (100%)
 rename make/data/fontconfig/windows.fontconfig.properties => src/java.desktop/windows/data/fontconfig/fontconfig.properties (100%)
 rename {make => src/java.se/share}/data/jdwp/jdwp.spec (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/README (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/include.list (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.activation-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.activation-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.activation-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.activation-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.base-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.compiler-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.corba-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.corba-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.corba-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.corba-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.datatransfer-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.datatransfer-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.datatransfer-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.datatransfer-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.datatransfer-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.datatransfer-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.datatransfer-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.datatransfer-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.desktop-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.instrument-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.instrument-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.instrument-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.instrument-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.instrument-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.instrument-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.instrument-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.logging-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.logging-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.logging-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.logging-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.logging-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.logging-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.logging-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.logging-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.management.rmi-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.naming-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.net.http-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.net.http-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.net.http-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.net.http-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.prefs-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.prefs-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.prefs-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.prefs-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.prefs-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.rmi-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.scripting-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.scripting-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.scripting-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.scripting-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.scripting-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.scripting-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.scripting-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.scripting-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.se-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.se-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.se-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.se.ee-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.se.ee-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.se.ee-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.jgss-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.sasl-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.sasl-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.sasl-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.sasl-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.sasl-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.sasl-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.sasl-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.security.sasl-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.smartcardio-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.smartcardio-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.smartcardio-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.smartcardio-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.smartcardio-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.smartcardio-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql.rowset-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql.rowset-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql.rowset-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql.rowset-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql.rowset-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql.rowset-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql.rowset-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.sql.rowset-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.transaction-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.transaction-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.transaction-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.transaction-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.transaction.xa-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.bind-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.bind-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.bind-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.bind-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.bind-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.crypto-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.crypto-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.crypto-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.crypto-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.crypto-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.crypto-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.crypto-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.crypto-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws.annotation-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws.annotation-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws.annotation-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws.annotation-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/java.xml.ws.annotation-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.accessibility-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.accessibility-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.accessibility-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.accessibility-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.accessibility-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.accessibility-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.attach-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.attach-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.attach-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.attach-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.attach-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.attach-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.charsets-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.charsets-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.charsets-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.compiler-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.crypto.cryptoki-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.crypto.cryptoki-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.crypto.cryptoki-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.crypto.ec-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.crypto.ec-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.crypto.ec-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.dynalink-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.dynalink-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.dynalink-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.dynalink-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.dynalink-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.dynalink-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.editpad-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.editpad-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.editpad-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.hotspot.agent-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.hotspot.agent-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.hotspot.agent-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.httpserver-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.foreign-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.foreign-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.foreign-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.foreign-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.foreign-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.httpclient-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.httpclient-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.httpclient-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.jpackage-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.jpackage-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.vector-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.vector-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.incubator.vector-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jartool-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jartool-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jartool-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jartool-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jartool-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jartool-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jartool-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jartool-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.javadoc-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.javadoc-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.javadoc-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.javadoc-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.javadoc-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.javadoc-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.javadoc-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.javadoc-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jcmd-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jcmd-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jcmd-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jconsole-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jconsole-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jconsole-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jconsole-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jconsole-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jconsole-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdeps-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdeps-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdeps-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdi-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdi-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdi-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdi-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdi-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdi-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdi-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdwp.agent-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdwp.agent-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jdwp.agent-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jfr-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jfr-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jfr-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jfr-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jfr-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jlink-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jlink-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jlink-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jlink-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jlink-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jlink-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jpackage-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jshell-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jshell-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jshell-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jshell-D.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jshell-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jshell-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jshell-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jshell-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jsobject-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jsobject-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jsobject-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jsobject-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jsobject-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jsobject-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jsobject-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jsobject-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jstatd-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jstatd-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.jstatd-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.localedata-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.localedata-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.localedata-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management.agent-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management.agent-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management.agent-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management.jfr-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management.jfr-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management.jfr-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.management.jfr-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.naming.dns-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.naming.dns-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.naming.dns-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.naming.rmi-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.naming.rmi-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.naming.rmi-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.net-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.net-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.net-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.net-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.net-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.net-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.net-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.net-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.nio.mapmode-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.pack-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.pack-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.pack-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.pack-E.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.policytool-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.policytool-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.rmic-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.rmic-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.rmic-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.rmic-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.scripting.nashorn-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.scripting.nashorn-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.scripting.nashorn-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.scripting.nashorn-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.scripting.nashorn-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.scripting.nashorn-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.sctp-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.sctp-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.sctp-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.sctp-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.sctp-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.sctp-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.sctp-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.sctp-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.auth-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.auth-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.auth-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.auth-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.auth-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.auth-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.auth-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.auth-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.jgss-7.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.jgss-8.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.jgss-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.jgss-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.jgss-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.jgss-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.jgss-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.security.jgss-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.unsupported-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.unsupported-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.unsupported-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.unsupported-C.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.unsupported-F.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.unsupported-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.unsupported-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.unsupported-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.xml.dom-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.xml.dom-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.xml.dom-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.xml.dom-G.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.xml.dom-H.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.xml.dom-I.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.zipfs-9.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.zipfs-A.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/jdk.zipfs-B.sym.txt (100%)
 rename {make => src/jdk.compiler/share}/data/symbols/symbols (100%)

diff --git a/make/ModuleWrapper.gmk b/make/ModuleWrapper.gmk
index e4a8db24aa3..d83af819a9b 100644
--- a/make/ModuleWrapper.gmk
+++ b/make/ModuleWrapper.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+MODULE_SRC := $(TOPDIR)/src/$(MODULE)
+
 # All makefiles should add the targets to be built to this variable.
 TARGETS :=
 
diff --git a/make/ToolsJdk.gmk b/make/ToolsJdk.gmk
index af9def3a415..9eef6969125 100644
--- a/make/ToolsJdk.gmk
+++ b/make/ToolsJdk.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ TOOL_GENERATECHARACTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_cla
 TOOL_CHARACTERNAME = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generatecharacter.CharacterName
 
-TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(TOPDIR)/make/data/dtdbuilder \
+TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(TOPDIR)/src/java.desktop/share/data/dtdbuilder \
     -Djava.awt.headless=true \
     -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.dtdbuilder.DTDBuilder
 
diff --git a/make/UpdateX11Wrappers.gmk b/make/UpdateX11Wrappers.gmk
index ad67966ec8a..3201b5f883f 100644
--- a/make/UpdateX11Wrappers.gmk
+++ b/make/UpdateX11Wrappers.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ endif
 X11WRAPPERS_OUTPUT := $(SUPPORT_OUTPUTDIR)/x11wrappers
 GENERATOR_SOURCE_FILE := $(X11WRAPPERS_OUTPUT)/src/data_generator.c
 
-GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen
+GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/src/java.desktop/unix/data/x11wrappergen
 WRAPPER_OUTPUT_FILE := $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(BITS).txt
 
 BITS := $(OPENJDK_TARGET_CPU_BITS)
diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
index ea700f0b660..41f600a817e 100644
--- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -156,7 +156,7 @@ import java.util.Optional;
  * A tool for processing the .sym.txt files.
  *
  * To add historical data for JDK N, N >= 11, do the following:
- *  * cd <open-jdk-checkout>/make/data/symbols
+ *  * cd <open-jdk-checkout>/src/jdk.compiler/share/data/symbols
  *  * <jdk-N>/bin/java --add-exports jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED \
  *                     --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
  *                     --add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
@@ -164,7 +164,7 @@ import java.util.Optional;
  *                     --add-modules jdk.jdeps \
  *                     ../../../make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java \
  *                     build-description-incremental symbols include.list
- *  * sanity-check the new and updates files in make/data/symbols and commit them
+ *  * sanity-check the new and updates files in src/jdk.compiler/share/data/symbols and commit them
  *
  * The tools allows to:
  *  * convert the .sym.txt into class/sig files for ct.sym
@@ -212,7 +212,8 @@ import java.util.Optional;
  * To generate the .sym.txt files for OpenJDK 7 and 8:
  *     <jdk-7>/bin/java build.tools.symbolgenerator.Probe OpenJDK7.classes
  *     <jdk-8>/bin/java build.tools.symbolgenerator.Probe OpenJDK8.classes
- *     java build.tools.symbolgenerator.CreateSymbols build-description make/data/symbols $TOPDIR make/data/symbols/include.list
+ *     java build.tools.symbolgenerator.CreateSymbols build-description src/jdk.compiler/share/data/symbols
+ *          $TOPDIR src/jdk.compiler/share/data/symbols/include.list
  *                                                    8 OpenJDK8.classes '<none>'
  *                                                    7 OpenJDK7.classes 8
  *
diff --git a/make/modules/java.base/Gendata.gmk b/make/modules/java.base/Gendata.gmk
index 4b894eeae4a..9e5cfe2d0fc 100644
--- a/make/modules/java.base/Gendata.gmk
+++ b/make/modules/java.base/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ include gendata/GendataPublicSuffixList.gmk
 
 GENDATA_UNINAME := $(JDK_OUTPUTDIR)/modules/java.base/java/lang/uniName.dat
 
-$(GENDATA_UNINAME): $(TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
+$(GENDATA_UNINAME): $(MODULE_SRC)/share/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(TOOL_CHARACTERNAME) $< $@
 
@@ -49,7 +49,7 @@ TARGETS += $(GENDATA_UNINAME)
 
 GENDATA_CURDATA := $(JDK_OUTPUTDIR)/modules/java.base/java/util/currency.data
 
-$(GENDATA_CURDATA): $(TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
+$(GENDATA_CURDATA): $(MODULE_SRC)/share/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(RM) $@
 	$(TOOL_GENERATECURRENCYDATA) -o $@.tmp -i $<
@@ -63,7 +63,7 @@ TARGETS += $(GENDATA_CURDATA)
 ifneq ($(CACERTS_SRC), )
   GENDATA_CACERTS_SRC := $(CACERTS_SRC)
 else
-  GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
+  GENDATA_CACERTS_SRC := $(MODULE_SRC)/share/data/cacerts/
 endif
 GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts
 
@@ -78,7 +78,7 @@ endif
 
 ################################################################################
 
-GENDATA_JAVA_SECURITY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.security
+GENDATA_JAVA_SECURITY_SRC := $(MODULE_SRC)/share/conf/security/java.security
 GENDATA_JAVA_SECURITY := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/java.security
 
 ifeq ($(UNLIMITED_CRYPTO), true)
diff --git a/make/modules/java.base/Gensrc.gmk b/make/modules/java.base/Gensrc.gmk
index 9ea2d015d3b..9c9576bdd4a 100644
--- a/make/modules/java.base/Gensrc.gmk
+++ b/make/modules/java.base/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -46,8 +46,8 @@ TARGETS += $(GENSRC_BASELOCALEDATA)
 CLDR_DATA_DIR := $(TOPDIR)/make/data/cldr/common
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base
 CLDR_GEN_DONE := $(GENSRC_DIR)/_cldr-gensrc.marker
-TZ_DATA_DIR := $(TOPDIR)/make/data/tzdata
-ZONENAME_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/java/time/format/ZoneName.java.template
+TZ_DATA_DIR := $(MODULE_SRC)/share/data/tzdata
+ZONENAME_TEMPLATE := $(MODULE_SRC)/share/classes/java/time/format/ZoneName.java.template
 
 $(CLDR_GEN_DONE): $(wildcard $(CLDR_DATA_DIR)/dtd/*.dtd) \
     $(wildcard $(CLDR_DATA_DIR)/main/en*.xml) \
@@ -74,12 +74,12 @@ TARGETS += $(CLDR_GEN_DONE)
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, LIST_RESOURCE_BUNDLE, \
-    SRC_DIRS := $(TOPDIR)/src/java.base/share/classes/sun/launcher/resources, \
+    SRC_DIRS := $(MODULE_SRC)/share/classes/sun/launcher/resources, \
     CLASS := ListResourceBundle, \
 ))
 
 $(eval $(call SetupCompileProperties, SUN_UTIL, \
-    SRC_DIRS := $(TOPDIR)/src/java.base/share/classes/sun/util/resources, \
+    SRC_DIRS := $(MODULE_SRC)/share/classes/sun/util/resources, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
 ))
 
@@ -98,7 +98,7 @@ TARGETS += $(COPY_ZH_HK)
 
 GENSRC_LSREQUIVMAPS := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/LocaleEquivalentMaps.java
 
-$(GENSRC_LSREQUIVMAPS): $(TOPDIR)/make/data/lsrdata/language-subtag-registry.txt $(BUILD_TOOLS_JDK)
+$(GENSRC_LSREQUIVMAPS): $(MODULE_SRC)/share/data/lsrdata/language-subtag-registry.txt $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(TOOL_GENERATELSREQUIVMAPS) $< $@ $(COPYRIGHT_YEAR)
 
diff --git a/make/modules/java.base/gendata/GendataBlockedCerts.gmk b/make/modules/java.base/gendata/GendataBlockedCerts.gmk
index 65f75012a33..b6149b457cd 100644
--- a/make/modules/java.base/gendata/GendataBlockedCerts.gmk
+++ b/make/modules/java.base/gendata/GendataBlockedCerts.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 # questions.
 #
 
-GENDATA_BLOCKED_CERTS_SRC += $(TOPDIR)/make/data/blockedcertsconverter/blocked.certs.pem
+GENDATA_BLOCKED_CERTS_SRC += $(MODULE_SRC)/share/data/blockedcertsconverter/blocked.certs.pem
 GENDATA_BLOCKED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blocked.certs
 
 $(GENDATA_BLOCKED_CERTS): $(BUILD_TOOLS_JDK) $(GENDATA_BLOCKED_CERTS_SRC)
diff --git a/make/modules/java.base/gendata/GendataBreakIterator.gmk b/make/modules/java.base/gendata/GendataBreakIterator.gmk
index d314253b4fe..857ce2b7c34 100644
--- a/make/modules/java.base/gendata/GendataBreakIterator.gmk
+++ b/make/modules/java.base/gendata/GendataBreakIterator.gmk
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -74,7 +74,7 @@ BREAK_ITERATOR_BOOTCLASSPATH := \
 
 # Generate data resource files.
 # input
-UNICODEDATA := $(TOPDIR)/make/data/unicodedata/UnicodeData.txt
+UNICODEDATA := $(MODULE_SRC)/share/data/unicodedata/UnicodeData.txt
 
 # output
 BASE_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/java.base/sun/text/resources
diff --git a/make/modules/java.base/gendata/GendataPublicSuffixList.gmk b/make/modules/java.base/gendata/GendataPublicSuffixList.gmk
index 757098a619f..189fccf0c0d 100644
--- a/make/modules/java.base/gendata/GendataPublicSuffixList.gmk
+++ b/make/modules/java.base/gendata/GendataPublicSuffixList.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 include $(SPEC)
 
-GENDATA_PUBLICSUFFIXLIST_SRC += $(TOPDIR)/make/data/publicsuffixlist/public_suffix_list.dat
+GENDATA_PUBLICSUFFIXLIST_SRC += $(MODULE_SRC)/share/data/publicsuffixlist/public_suffix_list.dat
 GENDATA_PUBLICSUFFIXLIST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/public_suffix_list.dat
 
 $(GENDATA_PUBLICSUFFIXLIST): $(GENDATA_PUBLICSUFFIXLIST_SRC) $(BUILD_TOOLS_JDK)
diff --git a/make/modules/java.base/gendata/GendataTZDB.gmk b/make/modules/java.base/gendata/GendataTZDB.gmk
index 1352178694f..593ed8a8f11 100644
--- a/make/modules/java.base/gendata/GendataTZDB.gmk
+++ b/make/modules/java.base/gendata/GendataTZDB.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@ GENDATA_TZDB :=
 #
 # Time zone data file creation
 #
-TZDATA_DIR := $(TOPDIR)/make/data/tzdata
+TZDATA_DIR := $(MODULE_SRC)/share/data/tzdata
 TZDATA_TZFILE := africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt jdk11_backward
 TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
 
diff --git a/make/modules/java.base/gensrc/GensrcBuffer.gmk b/make/modules/java.base/gensrc/GensrcBuffer.gmk
index 6ad432fb866..ce22230a8e1 100644
--- a/make/modules/java.base/gensrc/GensrcBuffer.gmk
+++ b/make/modules/java.base/gensrc/GensrcBuffer.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@ GENSRC_BUFFER :=
 
 GENSRC_BUFFER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
 
-GENSRC_BUFFER_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_BUFFER_SRC := $(MODULE_SRC)/share/classes/java/nio
 
 ###
 
diff --git a/make/modules/java.base/gensrc/GensrcCharacterData.gmk b/make/modules/java.base/gensrc/GensrcCharacterData.gmk
index eb938016506..115a28309a2 100644
--- a/make/modules/java.base/gensrc/GensrcCharacterData.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharacterData.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,8 @@
 
 GENSRC_CHARACTERDATA :=
 
-CHARACTERDATA = $(TOPDIR)/make/data/characterdata
-UNICODEDATA = $(TOPDIR)/make/data/unicodedata
+CHARACTERDATA_TEMPLATES = $(MODULE_SRC)/share/classes/java/lang
+UNICODEDATA = $(MODULE_SRC)/share/data/unicodedata
 
 ifneq ($(DEBUG_LEVEL), release)
   ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), true)
@@ -40,11 +40,11 @@ endif
 
 define SetupCharacterData
   $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java: \
-      $(CHARACTERDATA)/$1.java.template
+      $(CHARACTERDATA_TEMPLATES)/$1.java.template
 	$$(call LogInfo, Generating $1.java)
 	$$(call MakeDir, $$(@D))
 	$(TOOL_GENERATECHARACTER) $2 $(DEBUG_OPTION) \
-	    -template $(CHARACTERDATA)/$1.java.template \
+	    -template $(CHARACTERDATA_TEMPLATES)/$1.java.template \
 	    -spec $(UNICODEDATA)/UnicodeData.txt \
 	    -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
 	    -proplist $(UNICODEDATA)/PropList.txt \
diff --git a/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk b/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
index 79fa54b19cc..2940ba42319 100644
--- a/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@ GENSRC_CHARSETCODER :=
 
 GENSRC_CHARSETCODER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio/charset
 
-GENSRC_CHARSETCODER_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_CHARSETCODER_SRC := $(MODULE_SRC)/share/classes/java/nio
 
 GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Coder.java.template
 
diff --git a/make/modules/java.base/gensrc/GensrcEmojiData.gmk b/make/modules/java.base/gensrc/GensrcEmojiData.gmk
index d92cb9354a3..1af03bcafe9 100644
--- a/make/modules/java.base/gensrc/GensrcEmojiData.gmk
+++ b/make/modules/java.base/gensrc/GensrcEmojiData.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,8 @@
 
 GENSRC_EMOJIDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/util/regex/EmojiData.java
 
-EMOJIDATATEMP = $(TOPDIR)/src/java.base/share/classes/java/util/regex/EmojiData.java.template
-UNICODEDATA = $(TOPDIR)/make/data/unicodedata
+EMOJIDATATEMP = $(MODULE_SRC)/share/classes/java/util/regex/EmojiData.java.template
+UNICODEDATA = $(MODULE_SRC)/share/data/unicodedata
 
 $(GENSRC_EMOJIDATA): $(BUILD_TOOLS_JDK) $(EMOJIDATATEMP) $(UNICODEDATA)/emoji/emoji-data.txt
 	$(call LogInfo, Generating $@)
diff --git a/make/modules/java.base/gensrc/GensrcExceptions.gmk b/make/modules/java.base/gensrc/GensrcExceptions.gmk
index 37fed896560..1c4974b4a28 100644
--- a/make/modules/java.base/gensrc/GensrcExceptions.gmk
+++ b/make/modules/java.base/gensrc/GensrcExceptions.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@ GENSRC_EXCEPTIONS :=
 
 GENSRC_EXCEPTIONS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
 
-GENSRC_EXCEPTIONS_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_EXCEPTIONS_SRC := $(MODULE_SRC)/share/classes/java/nio
 GENSRC_EXCEPTIONS_CMD := $(TOPDIR)/make/scripts/genExceptions.sh
 
 GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
diff --git a/make/modules/java.base/gensrc/GensrcLocaleData.gmk b/make/modules/java.base/gensrc/GensrcLocaleData.gmk
index 1e28d91ab68..c04bab53175 100644
--- a/make/modules/java.base/gensrc/GensrcLocaleData.gmk
+++ b/make/modules/java.base/gensrc/GensrcLocaleData.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,8 @@
 
 # First go look for all locale files
 LOCALE_FILES := $(call FindFiles, \
-    $(TOPDIR)/src/$(MODULE)/share/classes/sun/text/resources \
-    $(TOPDIR)/src/$(MODULE)/share/classes/sun/util/resources, \
+    $(MODULE_SRC)/share/classes/sun/text/resources \
+    $(MODULE_SRC)/share/classes/sun/util/resources, \
     FormatData_*.java FormatData_*.properties \
     CollationData_*.java CollationData_*.properties \
     TimeZoneNames_*.java TimeZoneNames_*.properties \
diff --git a/make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk b/make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk
index b431acc14e1..54fea77571e 100644
--- a/make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk
+++ b/make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk
@@ -24,7 +24,7 @@
 #
 
 SCOPED_MEMORY_ACCESS_GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/misc
-SCOPED_MEMORY_ACCESS_SRC_DIR := $(TOPDIR)/src/java.base/share/classes/jdk/internal/misc
+SCOPED_MEMORY_ACCESS_SRC_DIR := $(MODULE_SRC)/share/classes/jdk/internal/misc
 SCOPED_MEMORY_ACCESS_TEMPLATE := $(SCOPED_MEMORY_ACCESS_SRC_DIR)/X-ScopedMemoryAccess.java.template
 SCOPED_MEMORY_ACCESS_BIN_TEMPLATE := $(SCOPED_MEMORY_ACCESS_SRC_DIR)/X-ScopedMemoryAccess-bin.java.template
 SCOPED_MEMORY_ACCESS_DEST := $(SCOPED_MEMORY_ACCESS_GENSRC_DIR)/ScopedMemoryAccess.java
@@ -139,7 +139,7 @@ endef
 SCOPE_MEMORY_ACCESS_TYPES := Byte Short Char Int Long Float Double
 $(foreach t, $(SCOPE_MEMORY_ACCESS_TYPES), \
   $(eval $(call GenerateScopedOp,BIN_$t,$t)))
-	
+
 $(SCOPED_MEMORY_ACCESS_DEST): $(BUILD_TOOLS_JDK) $(SCOPED_MEMORY_ACCESS_TEMPLATE) $(SCOPED_MEMORY_ACCESS_BIN_TEMPLATE)
 	$(call MakeDir, $(SCOPED_MEMORY_ACCESS_GENSRC_DIR))
 	$(CAT) $(SCOPED_MEMORY_ACCESS_TEMPLATE) > $(SCOPED_MEMORY_ACCESS_DEST)
@@ -147,5 +147,5 @@ $(SCOPED_MEMORY_ACCESS_DEST): $(BUILD_TOOLS_JDK) $(SCOPED_MEMORY_ACCESS_TEMPLATE
 	  $(TOOL_SPP) -nel -K$(BIN_$t_type) -Dtype=$(BIN_$t_type) -DType=$(BIN_$t_Type) $(BIN_$t_ARGS) \
 	  -i$(SCOPED_MEMORY_ACCESS_BIN_TEMPLATE) -o$(SCOPED_MEMORY_ACCESS_DEST) ;)
 	$(PRINTF) "}\n" >> $(SCOPED_MEMORY_ACCESS_DEST)
-	
+
 TARGETS += $(SCOPED_MEMORY_ACCESS_DEST)
diff --git a/make/modules/java.base/gensrc/GensrcVarHandles.gmk b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
index 579488379c3..e1686834bf5 100644
--- a/make/modules/java.base/gensrc/GensrcVarHandles.gmk
+++ b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 GENSRC_VARHANDLES :=
 
 VARHANDLES_GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/invoke
-VARHANDLES_SRC_DIR := $(TOPDIR)/src/java.base/share/classes/java/lang/invoke
+VARHANDLES_SRC_DIR := $(MODULE_SRC)/share/classes/java/lang/invoke
 
 ################################################################################
 # Setup a rule for generating a VarHandle java class
diff --git a/make/modules/java.desktop/gendata/GendataFontConfig.gmk b/make/modules/java.desktop/gendata/GendataFontConfig.gmk
index 42e3f4b485f..92a64b986e1 100644
--- a/make/modules/java.desktop/gendata/GendataFontConfig.gmk
+++ b/make/modules/java.desktop/gendata/GendataFontConfig.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,30 +23,35 @@
 # questions.
 #
 
-GENDATA_FONT_CONFIG_DST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
+FONTCONFIG_DATA_DIR := $(MODULE_SRC)/$(OPENJDK_TARGET_OS)/data/fontconfig
+FONTCONFIG_SRC_FILE := $(FONTCONFIG_DATA_DIR)/fontconfig.properties
 
-GENDATA_FONT_CONFIG_DATA_DIR ?= $(TOPDIR)/make/data/fontconfig
+FONTCONFIG_DEST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
+FONTCONFIG_OUT_FILE := $(FONTCONFIG_DEST_DIR)/fontconfig.properties.src
+FONTCONFIG_OUT_BIN_FILE := $(FONTCONFIG_DEST_DIR)/fontconfig.bfc
 
-GENDATA_FONT_CONFIG_SRC_FILES := \
-    $(wildcard $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).*)
+ifneq ($(findstring $(LOG_LEVEL), debug trace), )
+  FONTCONFIG_VERBOSE_FLAG := -verbose
+endif
 
+# Not all OSes have a fontconfig file
+ifneq ($(wildcard $(FONTCONFIG_SRC_FILE)), )
 
-$(GENDATA_FONT_CONFIG_DST)/%.src: \
-    $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%
+  # Copy properties file as-is
+  $(FONTCONFIG_OUT_FILE): $(FONTCONFIG_SRC_FILE)
+	$(call LogInfo, Copying fontconfig.properties)
 	$(call install-file)
 
-$(GENDATA_FONT_CONFIG_DST)/%.bfc: \
-    $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%.properties \
-    $(BUILD_TOOLS_JDK)
+  TARGETS += $(FONTCONFIG_OUT_FILE)
+
+  # Generate binary representation
+  $(FONTCONFIG_OUT_BIN_FILE): $(FONTCONFIG_SRC_FILE) $(BUILD_TOOLS_JDK)
+	$(call LogInfo, Compiling fontconfig.properties to binary)
 	$(call MakeTargetDir)
 	$(RM) $@
-	$(TOOL_COMPILEFONTCONFIG) $< $@
+	$(TOOL_COMPILEFONTCONFIG) $(FONTCONFIG_VERBOSE_FLAG) $< $@
 	$(CHMOD) 444 $@
 
+  TARGETS += $(FONTCONFIG_OUT_BIN_FILE)
 
-GENDATA_FONT_CONFIGS := $(patsubst $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%, \
-    $(GENDATA_FONT_CONFIG_DST)/%.src, $(GENDATA_FONT_CONFIG_SRC_FILES))
-GENDATA_BFONT_CONFIGS := $(patsubst $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%.properties, \
-    $(GENDATA_FONT_CONFIG_DST)/%.bfc, $(GENDATA_FONT_CONFIG_SRC_FILES))
-
-TARGETS := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS)
+endif
diff --git a/make/modules/java.desktop/gensrc/GensrcIcons.gmk b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
index e0a6c107ecc..28434d3f4c1 100644
--- a/make/modules/java.desktop/gensrc/GensrcIcons.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop
 GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/sun/awt/
 
 # Allow this to be overridden from a custom makefile
-X11_ICONS_PATH_PREFIX ?= $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
+X11_ICONS_PATH_PREFIX ?= $(MODULE_SRC)/$(OPENJDK_TARGET_OS_TYPE)
 
 GENSRC_AWT_ICONS_SRC += \
     $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
@@ -38,7 +38,7 @@ GENSRC_AWT_ICONS_SRC += \
     $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
 
 
-AWT_ICONPATH := $(TOPDIR)/src/java.desktop/share/classes/sun/awt/resources
+AWT_ICONPATH := $(MODULE_SRC)/share/classes/sun/awt/resources
 
 GENSRC_AWT_ICONS_SRC += \
     $(AWT_ICONPATH)/security-icon-bw16.png \
@@ -111,7 +111,7 @@ ifeq ($(call isTargetOs, macosx), true)
   GENSRC_OSX_ICONS_DST := $(SUPPORT_OUTPUTDIR)/headers/java.desktop
   GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
 
-  GENSRC_OSX_ICONS_SRC ?= $(TOPDIR)/make/data/macosxicons/JavaApp.icns
+  GENSRC_OSX_ICONS_SRC ?= $(MODULE_SRC)/macosx/data/macosxicons/JavaApp.icns
 
 
   $(GENSRC_OSX_ICONS): $(GENSRC_OSX_ICONS_SRC) $(BUILD_TOOLS_JDK)
diff --git a/make/modules/java.desktop/gensrc/GensrcSwing.gmk b/make/modules/java.desktop/gensrc/GensrcSwing.gmk
index cfb50831d1b..abd428f3641 100644
--- a/make/modules/java.desktop/gensrc/GensrcSwing.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcSwing.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 #
 NIMBUS_PACKAGE = javax.swing.plaf
 NIMBUS_GENSRC_DIR = $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/javax/swing/plaf/nimbus
-NIMBUS_SKIN_FILE = $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
+NIMBUS_SKIN_FILE = $(MODULE_SRC)/share/classes/javax/swing/plaf/nimbus/skin.laf
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating Nimbus source files)
diff --git a/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk b/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
index d46328f8607..25402ad035a 100644
--- a/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,13 @@
 #
 
 # Generate java sources using the X11 offsets that are precalculated in files
-# make/data/x11wrappergen/sizes-<address size>.txt.
+# src/java.desktop/unix/data/x11wrappergen/sizes-<address size>.txt.
 
 # Put the generated Java classes used to interface X11 from awt here.
 GENSRC_X11WRAPPERS_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/sun/awt/X11
 
 # The pre-calculated offset file are stored here:
-GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen
+GENSRC_X11WRAPPERS_DATADIR := $(MODULE_SRC)/unix/data/x11wrappergen
 GENSRC_X11WRAPPERS_DATA := $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(OPENJDK_TARGET_CPU_BITS).txt
 
 # Run the tool on the offset files to generate several Java classes used in awt.
diff --git a/make/modules/jdk.charsets/Gensrc.gmk b/make/modules/jdk.charsets/Gensrc.gmk
index ca9c1940941..1fac37b2c4b 100644
--- a/make/modules/jdk.charsets/Gensrc.gmk
+++ b/make/modules/jdk.charsets/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@ CHARSET_TEMPLATES := \
     $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
     $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
 CHARSET_EXTENDED_JAVA_TEMPLATES := \
-    $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
-CHARSET_EXTENDED_JAVA_DIR := $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
+    $(MODULE_SRC)/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
+CHARSET_EXTENDED_JAVA_DIR := $(MODULE_SRC)/share/classes/sun/nio/cs/ext
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \
diff --git a/make/modules/jdk.compiler/Gendata.gmk b/make/modules/jdk.compiler/Gendata.gmk
index 85815e5524b..5471fa1127c 100644
--- a/make/modules/jdk.compiler/Gendata.gmk
+++ b/make/modules/jdk.compiler/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ CT_MODULES := $(DOCS_MODULES)
 # Get the complete module source path:
 CT_MODULESOURCEPATH := $(call GetModuleSrcPath)
 
-CT_DATA_DESCRIPTION += $(TOPDIR)/make/data/symbols/symbols
+CT_DATA_DESCRIPTION += $(MODULE_SRC)/share/data/symbols/symbols
 
 COMPILECREATESYMBOLS_ADD_EXPORTS := \
     --add-exports java.base/jdk.internal.javac=java.compiler.interim,jdk.compiler.interim \
@@ -65,7 +65,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
 
 $(SUPPORT_OUTPUTDIR)/symbols/ct.sym: \
     $(COMPILE_CREATE_SYMBOLS) \
-    $(wildcard $(TOPDIR)/make/data/symbols/*) \
+    $(wildcard $(MODULE_SRC)/share/data/symbols/*) \
     $(MODULE_INFOS)
 	$(RM) -r $(@D)
 	$(MKDIR) -p $(@D)
diff --git a/make/modules/jdk.javadoc/Gendata.gmk b/make/modules/jdk.javadoc/Gendata.gmk
index 50ef87545a4..69c93c29468 100644
--- a/make/modules/jdk.javadoc/Gendata.gmk
+++ b/make/modules/jdk.javadoc/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ JAVADOC_MODULES := $(DOCS_MODULES)
 # Get the complete module source path:
 JAVADOC_MODULESOURCEPATH := $(call GetModuleSrcPath)
 
-CT_DATA_DESCRIPTION += $(TOPDIR)/make/data/symbols/symbols
+CT_DATA_DESCRIPTION += $(TOPDIR)/src/jdk.compiler/share/data/symbols/symbols
 
 COMPILECREATESYMBOLS_ADD_EXPORTS := \
     --add-exports java.base/jdk.internal=java.compiler.interim,jdk.compiler.interim \
@@ -68,7 +68,7 @@ ELEMENT_LISTS_DIR := $(JDK_JAVADOC_DIR)/$(ELEMENT_LISTS_PKG)
 
 $(JDK_JAVADOC_DIR)/_element_lists.marker: \
     $(COMPILE_CREATE_SYMBOLS) \
-    $(wildcard $(TOPDIR)/make/data/symbols/*) \
+    $(wildcard $(TOPDIR)/src/jdk.compiler/share/data/symbols/*) \
     $(MODULE_INFOS)
 	$(call MakeTargetDir)
 	$(call LogInfo, Creating javadoc element lists)
diff --git a/make/modules/jdk.jdi/Gensrc.gmk b/make/modules/jdk.jdi/Gensrc.gmk
index 5487e950921..7db06b5c958 100644
--- a/make/modules/jdk.jdi/Gensrc.gmk
+++ b/make/modules/jdk.jdi/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,11 @@
 include GensrcCommonJdk.gmk
 
 ################################################################################
-# Translate the Java debugger wire protocol (jdwp.spec) file into a JDWP.java file
-# and a JDWPCommands.h C-header file.
+# Translate the Java debugger wire protocol (jdwp.spec) file into a front-end
+# Java implementation (JDWP.java), a back-end C header file (JDWPCommands.h) and
+# an HTML documentation file (jdwp-protocol.html).
 
-JDWP_SPEC_FILE := $(TOPDIR)/make/data/jdwp/jdwp.spec
+JDWP_SPEC_FILE := $(TOPDIR)/src/java.se/share/data/jdwp/jdwp.spec
 HEADER_FILE := $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h
 JAVA_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/com/sun/tools/jdi/JDWP.java
 HTML_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
diff --git a/make/modules/jdk.localedata/Gensrc.gmk b/make/modules/jdk.localedata/Gensrc.gmk
index 09f014e8607..233572c8a54 100644
--- a/make/modules/jdk.localedata/Gensrc.gmk
+++ b/make/modules/jdk.localedata/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ TARGETS += $(CLDR_GEN_DONE)
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(TOPDIR)/src/jdk.localedata/share/classes/sun/util/resources, \
+    SRC_DIRS := $(MODULE_SRC)/share/classes/sun/util/resources, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
     KEEP_ALL_TRANSLATIONS := true, \
 ))
diff --git a/make/scripts/generate-symbol-data.sh b/make/scripts/generate-symbol-data.sh
index 56aa8016dd6..ee1d540715f 100644
--- a/make/scripts/generate-symbol-data.sh
+++ b/make/scripts/generate-symbol-data.sh
@@ -34,19 +34,19 @@
 # - have a checkout the JDK to which the data should be added (or in which the data should be updated).
 #   The checkout directory will be denoted as "${JDK_CHECKOUT}" in the further text.
 #   The checkout must not have any local changes that could interfere with the new data. In particular,
-#   there must be absolutely no changed, new or removed files under the ${JDK_CHECKOUT}/make/data/symbols
+#   there must be absolutely no changed, new or removed files under the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols
 #   directory.
 # - open a terminal program and run these commands:
-#     cd "${JDK_CHECKOUT}"/make/data/symbols
+#     cd "${JDK_CHECKOUT}"/src/jdk.compiler/share/data/symbols
 #     bash ../../scripts/generate-symbol-data.sh "${JDK_N_INSTALL}"
-# - this command will generate or update data for "--release N" into the ${JDK_CHECKOUT}/make/data/symbols
+# - this command will generate or update data for "--release N" into the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols
 #   directory, updating all registration necessary. If the goal was to update the data, and there are no
-#   new or changed files in the ${JDK_CHECKOUT}/make/data/symbols directory after running this script,
+#   new or changed files in the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols directory after running this script,
 #   there were no relevant changes and no further action is necessary. Note that version for N > 9 are encoded
 #   using capital letters, i.e. A represents version 10, B represents 11, and so on. The version numbers are in
-#   the names of the files in the ${JDK_CHECKOUT}/make/data/symbols directory, as well as in
-#   the ${JDK_CHECKOUT}/make/data/symbols/symbols file.
-# - if there are any changed/new files in the ${JDK_CHECKOUT}/make/data/symbols directory after running this script,
+#   the names of the files in the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols directory, as well as in
+#   the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols/symbols file.
+# - if there are any changed/new files in the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols directory after running this script,
 #   then all the changes in this directory, including any new files, need to be sent for review and eventually pushed.
 #   The commit message should specify which binary build was installed in the ${JDK_N_INSTALL} directory and also
 #   include the SCM state that was used to build it, which can be found in ${JDK_N_INSTALL}/release,
@@ -59,12 +59,12 @@ if [ "$1x" = "x" ] ; then
 fi;
 
 if [ ! -f symbols ] ; then
-    echo "Must run inside the make/data/symbols directory" >&2
+    echo "Must run inside the src/jdk.compiler/share/data/symbols directory" >&2
     exit 1
 fi;
 
 if [ "`git status --porcelain=v1 .`x" != "x" ] ; then
-    echo "The make/data/symbols directory contains local changes!" >&2
+    echo "The src/jdk.compiler/share/data/symbols directory contains local changes!" >&2
     exit 1
 fi;
 
diff --git a/make/data/characterdata/CharacterData00.java.template b/src/java.base/share/classes/java/lang/CharacterData00.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData00.java.template
rename to src/java.base/share/classes/java/lang/CharacterData00.java.template
diff --git a/make/data/characterdata/CharacterData01.java.template b/src/java.base/share/classes/java/lang/CharacterData01.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData01.java.template
rename to src/java.base/share/classes/java/lang/CharacterData01.java.template
diff --git a/make/data/characterdata/CharacterData02.java.template b/src/java.base/share/classes/java/lang/CharacterData02.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData02.java.template
rename to src/java.base/share/classes/java/lang/CharacterData02.java.template
diff --git a/make/data/characterdata/CharacterData03.java.template b/src/java.base/share/classes/java/lang/CharacterData03.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData03.java.template
rename to src/java.base/share/classes/java/lang/CharacterData03.java.template
diff --git a/make/data/characterdata/CharacterData0E.java.template b/src/java.base/share/classes/java/lang/CharacterData0E.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData0E.java.template
rename to src/java.base/share/classes/java/lang/CharacterData0E.java.template
diff --git a/make/data/characterdata/CharacterDataLatin1.java.template b/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
similarity index 100%
rename from make/data/characterdata/CharacterDataLatin1.java.template
rename to src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
diff --git a/make/data/blockedcertsconverter/blocked.certs.pem b/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem
similarity index 100%
rename from make/data/blockedcertsconverter/blocked.certs.pem
rename to src/java.base/share/data/blockedcertsconverter/blocked.certs.pem
diff --git a/make/data/cacerts/README b/src/java.base/share/data/cacerts/README
similarity index 100%
rename from make/data/cacerts/README
rename to src/java.base/share/data/cacerts/README
diff --git a/make/data/cacerts/actalisauthenticationrootca b/src/java.base/share/data/cacerts/actalisauthenticationrootca
similarity index 100%
rename from make/data/cacerts/actalisauthenticationrootca
rename to src/java.base/share/data/cacerts/actalisauthenticationrootca
diff --git a/make/data/cacerts/addtrustexternalca b/src/java.base/share/data/cacerts/addtrustexternalca
similarity index 100%
rename from make/data/cacerts/addtrustexternalca
rename to src/java.base/share/data/cacerts/addtrustexternalca
diff --git a/make/data/cacerts/addtrustqualifiedca b/src/java.base/share/data/cacerts/addtrustqualifiedca
similarity index 100%
rename from make/data/cacerts/addtrustqualifiedca
rename to src/java.base/share/data/cacerts/addtrustqualifiedca
diff --git a/make/data/cacerts/affirmtrustcommercialca b/src/java.base/share/data/cacerts/affirmtrustcommercialca
similarity index 100%
rename from make/data/cacerts/affirmtrustcommercialca
rename to src/java.base/share/data/cacerts/affirmtrustcommercialca
diff --git a/make/data/cacerts/affirmtrustnetworkingca b/src/java.base/share/data/cacerts/affirmtrustnetworkingca
similarity index 100%
rename from make/data/cacerts/affirmtrustnetworkingca
rename to src/java.base/share/data/cacerts/affirmtrustnetworkingca
diff --git a/make/data/cacerts/affirmtrustpremiumca b/src/java.base/share/data/cacerts/affirmtrustpremiumca
similarity index 100%
rename from make/data/cacerts/affirmtrustpremiumca
rename to src/java.base/share/data/cacerts/affirmtrustpremiumca
diff --git a/make/data/cacerts/affirmtrustpremiumeccca b/src/java.base/share/data/cacerts/affirmtrustpremiumeccca
similarity index 100%
rename from make/data/cacerts/affirmtrustpremiumeccca
rename to src/java.base/share/data/cacerts/affirmtrustpremiumeccca
diff --git a/make/data/cacerts/amazonrootca1 b/src/java.base/share/data/cacerts/amazonrootca1
similarity index 100%
rename from make/data/cacerts/amazonrootca1
rename to src/java.base/share/data/cacerts/amazonrootca1
diff --git a/make/data/cacerts/amazonrootca2 b/src/java.base/share/data/cacerts/amazonrootca2
similarity index 100%
rename from make/data/cacerts/amazonrootca2
rename to src/java.base/share/data/cacerts/amazonrootca2
diff --git a/make/data/cacerts/amazonrootca3 b/src/java.base/share/data/cacerts/amazonrootca3
similarity index 100%
rename from make/data/cacerts/amazonrootca3
rename to src/java.base/share/data/cacerts/amazonrootca3
diff --git a/make/data/cacerts/amazonrootca4 b/src/java.base/share/data/cacerts/amazonrootca4
similarity index 100%
rename from make/data/cacerts/amazonrootca4
rename to src/java.base/share/data/cacerts/amazonrootca4
diff --git a/make/data/cacerts/baltimorecybertrustca b/src/java.base/share/data/cacerts/baltimorecybertrustca
similarity index 100%
rename from make/data/cacerts/baltimorecybertrustca
rename to src/java.base/share/data/cacerts/baltimorecybertrustca
diff --git a/make/data/cacerts/buypassclass2ca b/src/java.base/share/data/cacerts/buypassclass2ca
similarity index 100%
rename from make/data/cacerts/buypassclass2ca
rename to src/java.base/share/data/cacerts/buypassclass2ca
diff --git a/make/data/cacerts/buypassclass3ca b/src/java.base/share/data/cacerts/buypassclass3ca
similarity index 100%
rename from make/data/cacerts/buypassclass3ca
rename to src/java.base/share/data/cacerts/buypassclass3ca
diff --git a/make/data/cacerts/camerfirmachambersca b/src/java.base/share/data/cacerts/camerfirmachambersca
similarity index 100%
rename from make/data/cacerts/camerfirmachambersca
rename to src/java.base/share/data/cacerts/camerfirmachambersca
diff --git a/make/data/cacerts/camerfirmachamberscommerceca b/src/java.base/share/data/cacerts/camerfirmachamberscommerceca
similarity index 100%
rename from make/data/cacerts/camerfirmachamberscommerceca
rename to src/java.base/share/data/cacerts/camerfirmachamberscommerceca
diff --git a/make/data/cacerts/camerfirmachambersignca b/src/java.base/share/data/cacerts/camerfirmachambersignca
similarity index 100%
rename from make/data/cacerts/camerfirmachambersignca
rename to src/java.base/share/data/cacerts/camerfirmachambersignca
diff --git a/make/data/cacerts/certumca b/src/java.base/share/data/cacerts/certumca
similarity index 100%
rename from make/data/cacerts/certumca
rename to src/java.base/share/data/cacerts/certumca
diff --git a/make/data/cacerts/certumtrustednetworkca b/src/java.base/share/data/cacerts/certumtrustednetworkca
similarity index 100%
rename from make/data/cacerts/certumtrustednetworkca
rename to src/java.base/share/data/cacerts/certumtrustednetworkca
diff --git a/make/data/cacerts/chunghwaepkirootca b/src/java.base/share/data/cacerts/chunghwaepkirootca
similarity index 100%
rename from make/data/cacerts/chunghwaepkirootca
rename to src/java.base/share/data/cacerts/chunghwaepkirootca
diff --git a/make/data/cacerts/comodoaaaca b/src/java.base/share/data/cacerts/comodoaaaca
similarity index 100%
rename from make/data/cacerts/comodoaaaca
rename to src/java.base/share/data/cacerts/comodoaaaca
diff --git a/make/data/cacerts/comodoeccca b/src/java.base/share/data/cacerts/comodoeccca
similarity index 100%
rename from make/data/cacerts/comodoeccca
rename to src/java.base/share/data/cacerts/comodoeccca
diff --git a/make/data/cacerts/comodorsaca b/src/java.base/share/data/cacerts/comodorsaca
similarity index 100%
rename from make/data/cacerts/comodorsaca
rename to src/java.base/share/data/cacerts/comodorsaca
diff --git a/make/data/cacerts/digicertassuredidg2 b/src/java.base/share/data/cacerts/digicertassuredidg2
similarity index 100%
rename from make/data/cacerts/digicertassuredidg2
rename to src/java.base/share/data/cacerts/digicertassuredidg2
diff --git a/make/data/cacerts/digicertassuredidg3 b/src/java.base/share/data/cacerts/digicertassuredidg3
similarity index 100%
rename from make/data/cacerts/digicertassuredidg3
rename to src/java.base/share/data/cacerts/digicertassuredidg3
diff --git a/make/data/cacerts/digicertassuredidrootca b/src/java.base/share/data/cacerts/digicertassuredidrootca
similarity index 100%
rename from make/data/cacerts/digicertassuredidrootca
rename to src/java.base/share/data/cacerts/digicertassuredidrootca
diff --git a/make/data/cacerts/digicertglobalrootca b/src/java.base/share/data/cacerts/digicertglobalrootca
similarity index 100%
rename from make/data/cacerts/digicertglobalrootca
rename to src/java.base/share/data/cacerts/digicertglobalrootca
diff --git a/make/data/cacerts/digicertglobalrootg2 b/src/java.base/share/data/cacerts/digicertglobalrootg2
similarity index 100%
rename from make/data/cacerts/digicertglobalrootg2
rename to src/java.base/share/data/cacerts/digicertglobalrootg2
diff --git a/make/data/cacerts/digicertglobalrootg3 b/src/java.base/share/data/cacerts/digicertglobalrootg3
similarity index 100%
rename from make/data/cacerts/digicertglobalrootg3
rename to src/java.base/share/data/cacerts/digicertglobalrootg3
diff --git a/make/data/cacerts/digicerthighassuranceevrootca b/src/java.base/share/data/cacerts/digicerthighassuranceevrootca
similarity index 100%
rename from make/data/cacerts/digicerthighassuranceevrootca
rename to src/java.base/share/data/cacerts/digicerthighassuranceevrootca
diff --git a/make/data/cacerts/digicerttrustedrootg4 b/src/java.base/share/data/cacerts/digicerttrustedrootg4
similarity index 100%
rename from make/data/cacerts/digicerttrustedrootg4
rename to src/java.base/share/data/cacerts/digicerttrustedrootg4
diff --git a/make/data/cacerts/dtrustclass3ca2 b/src/java.base/share/data/cacerts/dtrustclass3ca2
similarity index 100%
rename from make/data/cacerts/dtrustclass3ca2
rename to src/java.base/share/data/cacerts/dtrustclass3ca2
diff --git a/make/data/cacerts/dtrustclass3ca2ev b/src/java.base/share/data/cacerts/dtrustclass3ca2ev
similarity index 100%
rename from make/data/cacerts/dtrustclass3ca2ev
rename to src/java.base/share/data/cacerts/dtrustclass3ca2ev
diff --git a/make/data/cacerts/entrust2048ca b/src/java.base/share/data/cacerts/entrust2048ca
similarity index 100%
rename from make/data/cacerts/entrust2048ca
rename to src/java.base/share/data/cacerts/entrust2048ca
diff --git a/make/data/cacerts/entrustevca b/src/java.base/share/data/cacerts/entrustevca
similarity index 100%
rename from make/data/cacerts/entrustevca
rename to src/java.base/share/data/cacerts/entrustevca
diff --git a/make/data/cacerts/entrustrootcaec1 b/src/java.base/share/data/cacerts/entrustrootcaec1
similarity index 100%
rename from make/data/cacerts/entrustrootcaec1
rename to src/java.base/share/data/cacerts/entrustrootcaec1
diff --git a/make/data/cacerts/entrustrootcag2 b/src/java.base/share/data/cacerts/entrustrootcag2
similarity index 100%
rename from make/data/cacerts/entrustrootcag2
rename to src/java.base/share/data/cacerts/entrustrootcag2
diff --git a/make/data/cacerts/entrustrootcag4 b/src/java.base/share/data/cacerts/entrustrootcag4
similarity index 100%
rename from make/data/cacerts/entrustrootcag4
rename to src/java.base/share/data/cacerts/entrustrootcag4
diff --git a/make/data/cacerts/geotrustglobalca b/src/java.base/share/data/cacerts/geotrustglobalca
similarity index 100%
rename from make/data/cacerts/geotrustglobalca
rename to src/java.base/share/data/cacerts/geotrustglobalca
diff --git a/make/data/cacerts/geotrustprimaryca b/src/java.base/share/data/cacerts/geotrustprimaryca
similarity index 100%
rename from make/data/cacerts/geotrustprimaryca
rename to src/java.base/share/data/cacerts/geotrustprimaryca
diff --git a/make/data/cacerts/geotrustprimarycag2 b/src/java.base/share/data/cacerts/geotrustprimarycag2
similarity index 100%
rename from make/data/cacerts/geotrustprimarycag2
rename to src/java.base/share/data/cacerts/geotrustprimarycag2
diff --git a/make/data/cacerts/geotrustprimarycag3 b/src/java.base/share/data/cacerts/geotrustprimarycag3
similarity index 100%
rename from make/data/cacerts/geotrustprimarycag3
rename to src/java.base/share/data/cacerts/geotrustprimarycag3
diff --git a/make/data/cacerts/geotrustuniversalca b/src/java.base/share/data/cacerts/geotrustuniversalca
similarity index 100%
rename from make/data/cacerts/geotrustuniversalca
rename to src/java.base/share/data/cacerts/geotrustuniversalca
diff --git a/make/data/cacerts/globalsignca b/src/java.base/share/data/cacerts/globalsignca
similarity index 100%
rename from make/data/cacerts/globalsignca
rename to src/java.base/share/data/cacerts/globalsignca
diff --git a/make/data/cacerts/globalsigneccrootcar4 b/src/java.base/share/data/cacerts/globalsigneccrootcar4
similarity index 100%
rename from make/data/cacerts/globalsigneccrootcar4
rename to src/java.base/share/data/cacerts/globalsigneccrootcar4
diff --git a/make/data/cacerts/globalsigneccrootcar5 b/src/java.base/share/data/cacerts/globalsigneccrootcar5
similarity index 100%
rename from make/data/cacerts/globalsigneccrootcar5
rename to src/java.base/share/data/cacerts/globalsigneccrootcar5
diff --git a/make/data/cacerts/globalsignr3ca b/src/java.base/share/data/cacerts/globalsignr3ca
similarity index 100%
rename from make/data/cacerts/globalsignr3ca
rename to src/java.base/share/data/cacerts/globalsignr3ca
diff --git a/make/data/cacerts/globalsignrootcar6 b/src/java.base/share/data/cacerts/globalsignrootcar6
similarity index 100%
rename from make/data/cacerts/globalsignrootcar6
rename to src/java.base/share/data/cacerts/globalsignrootcar6
diff --git a/make/data/cacerts/godaddyclass2ca b/src/java.base/share/data/cacerts/godaddyclass2ca
similarity index 100%
rename from make/data/cacerts/godaddyclass2ca
rename to src/java.base/share/data/cacerts/godaddyclass2ca
diff --git a/make/data/cacerts/godaddyrootg2ca b/src/java.base/share/data/cacerts/godaddyrootg2ca
similarity index 100%
rename from make/data/cacerts/godaddyrootg2ca
rename to src/java.base/share/data/cacerts/godaddyrootg2ca
diff --git a/make/data/cacerts/haricaeccrootca2015 b/src/java.base/share/data/cacerts/haricaeccrootca2015
similarity index 100%
rename from make/data/cacerts/haricaeccrootca2015
rename to src/java.base/share/data/cacerts/haricaeccrootca2015
diff --git a/make/data/cacerts/haricarootca2015 b/src/java.base/share/data/cacerts/haricarootca2015
similarity index 100%
rename from make/data/cacerts/haricarootca2015
rename to src/java.base/share/data/cacerts/haricarootca2015
diff --git a/make/data/cacerts/identrustcommercial b/src/java.base/share/data/cacerts/identrustcommercial
similarity index 100%
rename from make/data/cacerts/identrustcommercial
rename to src/java.base/share/data/cacerts/identrustcommercial
diff --git a/make/data/cacerts/identrustpublicca b/src/java.base/share/data/cacerts/identrustpublicca
similarity index 100%
rename from make/data/cacerts/identrustpublicca
rename to src/java.base/share/data/cacerts/identrustpublicca
diff --git a/make/data/cacerts/letsencryptisrgx1 b/src/java.base/share/data/cacerts/letsencryptisrgx1
similarity index 100%
rename from make/data/cacerts/letsencryptisrgx1
rename to src/java.base/share/data/cacerts/letsencryptisrgx1
diff --git a/make/data/cacerts/luxtrustglobalroot2ca b/src/java.base/share/data/cacerts/luxtrustglobalroot2ca
similarity index 100%
rename from make/data/cacerts/luxtrustglobalroot2ca
rename to src/java.base/share/data/cacerts/luxtrustglobalroot2ca
diff --git a/make/data/cacerts/luxtrustglobalrootca b/src/java.base/share/data/cacerts/luxtrustglobalrootca
similarity index 100%
rename from make/data/cacerts/luxtrustglobalrootca
rename to src/java.base/share/data/cacerts/luxtrustglobalrootca
diff --git a/make/data/cacerts/quovadisrootca b/src/java.base/share/data/cacerts/quovadisrootca
similarity index 100%
rename from make/data/cacerts/quovadisrootca
rename to src/java.base/share/data/cacerts/quovadisrootca
diff --git a/make/data/cacerts/quovadisrootca1g3 b/src/java.base/share/data/cacerts/quovadisrootca1g3
similarity index 100%
rename from make/data/cacerts/quovadisrootca1g3
rename to src/java.base/share/data/cacerts/quovadisrootca1g3
diff --git a/make/data/cacerts/quovadisrootca2 b/src/java.base/share/data/cacerts/quovadisrootca2
similarity index 100%
rename from make/data/cacerts/quovadisrootca2
rename to src/java.base/share/data/cacerts/quovadisrootca2
diff --git a/make/data/cacerts/quovadisrootca2g3 b/src/java.base/share/data/cacerts/quovadisrootca2g3
similarity index 100%
rename from make/data/cacerts/quovadisrootca2g3
rename to src/java.base/share/data/cacerts/quovadisrootca2g3
diff --git a/make/data/cacerts/quovadisrootca3 b/src/java.base/share/data/cacerts/quovadisrootca3
similarity index 100%
rename from make/data/cacerts/quovadisrootca3
rename to src/java.base/share/data/cacerts/quovadisrootca3
diff --git a/make/data/cacerts/quovadisrootca3g3 b/src/java.base/share/data/cacerts/quovadisrootca3g3
similarity index 100%
rename from make/data/cacerts/quovadisrootca3g3
rename to src/java.base/share/data/cacerts/quovadisrootca3g3
diff --git a/make/data/cacerts/secomscrootca1 b/src/java.base/share/data/cacerts/secomscrootca1
similarity index 100%
rename from make/data/cacerts/secomscrootca1
rename to src/java.base/share/data/cacerts/secomscrootca1
diff --git a/make/data/cacerts/secomscrootca2 b/src/java.base/share/data/cacerts/secomscrootca2
similarity index 100%
rename from make/data/cacerts/secomscrootca2
rename to src/java.base/share/data/cacerts/secomscrootca2
diff --git a/make/data/cacerts/securetrustca b/src/java.base/share/data/cacerts/securetrustca
similarity index 100%
rename from make/data/cacerts/securetrustca
rename to src/java.base/share/data/cacerts/securetrustca
diff --git a/make/data/cacerts/sslrooteccca b/src/java.base/share/data/cacerts/sslrooteccca
similarity index 100%
rename from make/data/cacerts/sslrooteccca
rename to src/java.base/share/data/cacerts/sslrooteccca
diff --git a/make/data/cacerts/sslrootevrsaca b/src/java.base/share/data/cacerts/sslrootevrsaca
similarity index 100%
rename from make/data/cacerts/sslrootevrsaca
rename to src/java.base/share/data/cacerts/sslrootevrsaca
diff --git a/make/data/cacerts/sslrootrsaca b/src/java.base/share/data/cacerts/sslrootrsaca
similarity index 100%
rename from make/data/cacerts/sslrootrsaca
rename to src/java.base/share/data/cacerts/sslrootrsaca
diff --git a/make/data/cacerts/starfieldclass2ca b/src/java.base/share/data/cacerts/starfieldclass2ca
similarity index 100%
rename from make/data/cacerts/starfieldclass2ca
rename to src/java.base/share/data/cacerts/starfieldclass2ca
diff --git a/make/data/cacerts/starfieldrootg2ca b/src/java.base/share/data/cacerts/starfieldrootg2ca
similarity index 100%
rename from make/data/cacerts/starfieldrootg2ca
rename to src/java.base/share/data/cacerts/starfieldrootg2ca
diff --git a/make/data/cacerts/starfieldservicesrootg2ca b/src/java.base/share/data/cacerts/starfieldservicesrootg2ca
similarity index 100%
rename from make/data/cacerts/starfieldservicesrootg2ca
rename to src/java.base/share/data/cacerts/starfieldservicesrootg2ca
diff --git a/make/data/cacerts/swisssigngoldg2ca b/src/java.base/share/data/cacerts/swisssigngoldg2ca
similarity index 100%
rename from make/data/cacerts/swisssigngoldg2ca
rename to src/java.base/share/data/cacerts/swisssigngoldg2ca
diff --git a/make/data/cacerts/swisssignplatinumg2ca b/src/java.base/share/data/cacerts/swisssignplatinumg2ca
similarity index 100%
rename from make/data/cacerts/swisssignplatinumg2ca
rename to src/java.base/share/data/cacerts/swisssignplatinumg2ca
diff --git a/make/data/cacerts/swisssignsilverg2ca b/src/java.base/share/data/cacerts/swisssignsilverg2ca
similarity index 100%
rename from make/data/cacerts/swisssignsilverg2ca
rename to src/java.base/share/data/cacerts/swisssignsilverg2ca
diff --git a/make/data/cacerts/teliasonerarootcav1 b/src/java.base/share/data/cacerts/teliasonerarootcav1
similarity index 100%
rename from make/data/cacerts/teliasonerarootcav1
rename to src/java.base/share/data/cacerts/teliasonerarootcav1
diff --git a/make/data/cacerts/thawteprimaryrootca b/src/java.base/share/data/cacerts/thawteprimaryrootca
similarity index 100%
rename from make/data/cacerts/thawteprimaryrootca
rename to src/java.base/share/data/cacerts/thawteprimaryrootca
diff --git a/make/data/cacerts/thawteprimaryrootcag2 b/src/java.base/share/data/cacerts/thawteprimaryrootcag2
similarity index 100%
rename from make/data/cacerts/thawteprimaryrootcag2
rename to src/java.base/share/data/cacerts/thawteprimaryrootcag2
diff --git a/make/data/cacerts/thawteprimaryrootcag3 b/src/java.base/share/data/cacerts/thawteprimaryrootcag3
similarity index 100%
rename from make/data/cacerts/thawteprimaryrootcag3
rename to src/java.base/share/data/cacerts/thawteprimaryrootcag3
diff --git a/make/data/cacerts/ttelesecglobalrootclass2ca b/src/java.base/share/data/cacerts/ttelesecglobalrootclass2ca
similarity index 100%
rename from make/data/cacerts/ttelesecglobalrootclass2ca
rename to src/java.base/share/data/cacerts/ttelesecglobalrootclass2ca
diff --git a/make/data/cacerts/ttelesecglobalrootclass3ca b/src/java.base/share/data/cacerts/ttelesecglobalrootclass3ca
similarity index 100%
rename from make/data/cacerts/ttelesecglobalrootclass3ca
rename to src/java.base/share/data/cacerts/ttelesecglobalrootclass3ca
diff --git a/make/data/cacerts/usertrusteccca b/src/java.base/share/data/cacerts/usertrusteccca
similarity index 100%
rename from make/data/cacerts/usertrusteccca
rename to src/java.base/share/data/cacerts/usertrusteccca
diff --git a/make/data/cacerts/usertrustrsaca b/src/java.base/share/data/cacerts/usertrustrsaca
similarity index 100%
rename from make/data/cacerts/usertrustrsaca
rename to src/java.base/share/data/cacerts/usertrustrsaca
diff --git a/make/data/cacerts/utnuserfirstobjectca b/src/java.base/share/data/cacerts/utnuserfirstobjectca
similarity index 100%
rename from make/data/cacerts/utnuserfirstobjectca
rename to src/java.base/share/data/cacerts/utnuserfirstobjectca
diff --git a/make/data/cacerts/verisignclass3g3ca b/src/java.base/share/data/cacerts/verisignclass3g3ca
similarity index 100%
rename from make/data/cacerts/verisignclass3g3ca
rename to src/java.base/share/data/cacerts/verisignclass3g3ca
diff --git a/make/data/cacerts/verisignclass3g4ca b/src/java.base/share/data/cacerts/verisignclass3g4ca
similarity index 100%
rename from make/data/cacerts/verisignclass3g4ca
rename to src/java.base/share/data/cacerts/verisignclass3g4ca
diff --git a/make/data/cacerts/verisignclass3g5ca b/src/java.base/share/data/cacerts/verisignclass3g5ca
similarity index 100%
rename from make/data/cacerts/verisignclass3g5ca
rename to src/java.base/share/data/cacerts/verisignclass3g5ca
diff --git a/make/data/cacerts/verisignuniversalrootca b/src/java.base/share/data/cacerts/verisignuniversalrootca
similarity index 100%
rename from make/data/cacerts/verisignuniversalrootca
rename to src/java.base/share/data/cacerts/verisignuniversalrootca
diff --git a/make/data/cacerts/xrampglobalca b/src/java.base/share/data/cacerts/xrampglobalca
similarity index 100%
rename from make/data/cacerts/xrampglobalca
rename to src/java.base/share/data/cacerts/xrampglobalca
diff --git a/make/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties
similarity index 100%
rename from make/data/currency/CurrencyData.properties
rename to src/java.base/share/data/currency/CurrencyData.properties
diff --git a/make/data/lsrdata/language-subtag-registry.txt b/src/java.base/share/data/lsrdata/language-subtag-registry.txt
similarity index 100%
rename from make/data/lsrdata/language-subtag-registry.txt
rename to src/java.base/share/data/lsrdata/language-subtag-registry.txt
diff --git a/make/data/publicsuffixlist/VERSION b/src/java.base/share/data/publicsuffixlist/VERSION
similarity index 100%
rename from make/data/publicsuffixlist/VERSION
rename to src/java.base/share/data/publicsuffixlist/VERSION
diff --git a/make/data/publicsuffixlist/public_suffix_list.dat b/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
similarity index 100%
rename from make/data/publicsuffixlist/public_suffix_list.dat
rename to src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
diff --git a/make/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION
similarity index 100%
rename from make/data/tzdata/VERSION
rename to src/java.base/share/data/tzdata/VERSION
diff --git a/make/data/tzdata/africa b/src/java.base/share/data/tzdata/africa
similarity index 100%
rename from make/data/tzdata/africa
rename to src/java.base/share/data/tzdata/africa
diff --git a/make/data/tzdata/antarctica b/src/java.base/share/data/tzdata/antarctica
similarity index 100%
rename from make/data/tzdata/antarctica
rename to src/java.base/share/data/tzdata/antarctica
diff --git a/make/data/tzdata/asia b/src/java.base/share/data/tzdata/asia
similarity index 100%
rename from make/data/tzdata/asia
rename to src/java.base/share/data/tzdata/asia
diff --git a/make/data/tzdata/australasia b/src/java.base/share/data/tzdata/australasia
similarity index 100%
rename from make/data/tzdata/australasia
rename to src/java.base/share/data/tzdata/australasia
diff --git a/make/data/tzdata/backward b/src/java.base/share/data/tzdata/backward
similarity index 100%
rename from make/data/tzdata/backward
rename to src/java.base/share/data/tzdata/backward
diff --git a/make/data/tzdata/etcetera b/src/java.base/share/data/tzdata/etcetera
similarity index 100%
rename from make/data/tzdata/etcetera
rename to src/java.base/share/data/tzdata/etcetera
diff --git a/make/data/tzdata/europe b/src/java.base/share/data/tzdata/europe
similarity index 100%
rename from make/data/tzdata/europe
rename to src/java.base/share/data/tzdata/europe
diff --git a/make/data/tzdata/factory b/src/java.base/share/data/tzdata/factory
similarity index 100%
rename from make/data/tzdata/factory
rename to src/java.base/share/data/tzdata/factory
diff --git a/make/data/tzdata/gmt b/src/java.base/share/data/tzdata/gmt
similarity index 100%
rename from make/data/tzdata/gmt
rename to src/java.base/share/data/tzdata/gmt
diff --git a/make/data/tzdata/iso3166.tab b/src/java.base/share/data/tzdata/iso3166.tab
similarity index 100%
rename from make/data/tzdata/iso3166.tab
rename to src/java.base/share/data/tzdata/iso3166.tab
diff --git a/make/data/tzdata/jdk11_backward b/src/java.base/share/data/tzdata/jdk11_backward
similarity index 100%
rename from make/data/tzdata/jdk11_backward
rename to src/java.base/share/data/tzdata/jdk11_backward
diff --git a/make/data/tzdata/leapseconds b/src/java.base/share/data/tzdata/leapseconds
similarity index 100%
rename from make/data/tzdata/leapseconds
rename to src/java.base/share/data/tzdata/leapseconds
diff --git a/make/data/tzdata/northamerica b/src/java.base/share/data/tzdata/northamerica
similarity index 100%
rename from make/data/tzdata/northamerica
rename to src/java.base/share/data/tzdata/northamerica
diff --git a/make/data/tzdata/solar87 b/src/java.base/share/data/tzdata/solar87
similarity index 100%
rename from make/data/tzdata/solar87
rename to src/java.base/share/data/tzdata/solar87
diff --git a/make/data/tzdata/solar88 b/src/java.base/share/data/tzdata/solar88
similarity index 100%
rename from make/data/tzdata/solar88
rename to src/java.base/share/data/tzdata/solar88
diff --git a/make/data/tzdata/solar89 b/src/java.base/share/data/tzdata/solar89
similarity index 100%
rename from make/data/tzdata/solar89
rename to src/java.base/share/data/tzdata/solar89
diff --git a/make/data/tzdata/southamerica b/src/java.base/share/data/tzdata/southamerica
similarity index 100%
rename from make/data/tzdata/southamerica
rename to src/java.base/share/data/tzdata/southamerica
diff --git a/make/data/tzdata/zone.tab b/src/java.base/share/data/tzdata/zone.tab
similarity index 100%
rename from make/data/tzdata/zone.tab
rename to src/java.base/share/data/tzdata/zone.tab
diff --git a/make/data/unicodedata/Blocks.txt b/src/java.base/share/data/unicodedata/Blocks.txt
similarity index 100%
rename from make/data/unicodedata/Blocks.txt
rename to src/java.base/share/data/unicodedata/Blocks.txt
diff --git a/make/data/unicodedata/DerivedCoreProperties.txt b/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
similarity index 100%
rename from make/data/unicodedata/DerivedCoreProperties.txt
rename to src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
diff --git a/make/data/unicodedata/NormalizationTest.txt b/src/java.base/share/data/unicodedata/NormalizationTest.txt
similarity index 100%
rename from make/data/unicodedata/NormalizationTest.txt
rename to src/java.base/share/data/unicodedata/NormalizationTest.txt
diff --git a/make/data/unicodedata/PropList.txt b/src/java.base/share/data/unicodedata/PropList.txt
similarity index 100%
rename from make/data/unicodedata/PropList.txt
rename to src/java.base/share/data/unicodedata/PropList.txt
diff --git a/make/data/unicodedata/PropertyValueAliases.txt b/src/java.base/share/data/unicodedata/PropertyValueAliases.txt
similarity index 100%
rename from make/data/unicodedata/PropertyValueAliases.txt
rename to src/java.base/share/data/unicodedata/PropertyValueAliases.txt
diff --git a/make/data/unicodedata/ReadMe.txt b/src/java.base/share/data/unicodedata/ReadMe.txt
similarity index 100%
rename from make/data/unicodedata/ReadMe.txt
rename to src/java.base/share/data/unicodedata/ReadMe.txt
diff --git a/make/data/unicodedata/Scripts.txt b/src/java.base/share/data/unicodedata/Scripts.txt
similarity index 100%
rename from make/data/unicodedata/Scripts.txt
rename to src/java.base/share/data/unicodedata/Scripts.txt
diff --git a/make/data/unicodedata/SpecialCasing.txt b/src/java.base/share/data/unicodedata/SpecialCasing.txt
similarity index 100%
rename from make/data/unicodedata/SpecialCasing.txt
rename to src/java.base/share/data/unicodedata/SpecialCasing.txt
diff --git a/make/data/unicodedata/UnicodeData.txt b/src/java.base/share/data/unicodedata/UnicodeData.txt
similarity index 100%
rename from make/data/unicodedata/UnicodeData.txt
rename to src/java.base/share/data/unicodedata/UnicodeData.txt
diff --git a/make/data/unicodedata/auxiliary/GraphemeBreakProperty.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
similarity index 100%
rename from make/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
rename to src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
diff --git a/make/data/unicodedata/auxiliary/GraphemeBreakTest.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
similarity index 100%
rename from make/data/unicodedata/auxiliary/GraphemeBreakTest.txt
rename to src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
diff --git a/make/data/unicodedata/emoji/emoji-data.txt b/src/java.base/share/data/unicodedata/emoji/emoji-data.txt
similarity index 100%
rename from make/data/unicodedata/emoji/emoji-data.txt
rename to src/java.base/share/data/unicodedata/emoji/emoji-data.txt
diff --git a/make/data/fontconfig/aix.fontconfig.properties b/src/java.desktop/aix/data/fontconfig/fontconfig.properties
similarity index 100%
rename from make/data/fontconfig/aix.fontconfig.properties
rename to src/java.desktop/aix/data/fontconfig/fontconfig.properties
diff --git a/make/data/fontconfig/bsd.fontconfig.properties b/src/java.desktop/bsd/data/fontconfig/fontconfig.properties
similarity index 100%
rename from make/data/fontconfig/bsd.fontconfig.properties
rename to src/java.desktop/bsd/data/fontconfig/fontconfig.properties
diff --git a/make/data/fontconfig/macosx.fontconfig.properties b/src/java.desktop/macosx/data/fontconfig/fontconfig.properties
similarity index 100%
rename from make/data/fontconfig/macosx.fontconfig.properties
rename to src/java.desktop/macosx/data/fontconfig/fontconfig.properties
diff --git a/make/data/macosxicons/JavaApp.icns b/src/java.desktop/macosx/data/macosxicons/JavaApp.icns
similarity index 100%
rename from make/data/macosxicons/JavaApp.icns
rename to src/java.desktop/macosx/data/macosxicons/JavaApp.icns
diff --git a/make/data/dtdbuilder/HTMLlat1.sgml b/src/java.desktop/share/data/dtdbuilder/HTMLlat1.sgml
similarity index 100%
rename from make/data/dtdbuilder/HTMLlat1.sgml
rename to src/java.desktop/share/data/dtdbuilder/HTMLlat1.sgml
diff --git a/make/data/dtdbuilder/HTMLspecial.sgml b/src/java.desktop/share/data/dtdbuilder/HTMLspecial.sgml
similarity index 100%
rename from make/data/dtdbuilder/HTMLspecial.sgml
rename to src/java.desktop/share/data/dtdbuilder/HTMLspecial.sgml
diff --git a/make/data/dtdbuilder/HTMLsymbol.sgml b/src/java.desktop/share/data/dtdbuilder/HTMLsymbol.sgml
similarity index 100%
rename from make/data/dtdbuilder/HTMLsymbol.sgml
rename to src/java.desktop/share/data/dtdbuilder/HTMLsymbol.sgml
diff --git a/make/data/dtdbuilder/html32.dtd b/src/java.desktop/share/data/dtdbuilder/html32.dtd
similarity index 100%
rename from make/data/dtdbuilder/html32.dtd
rename to src/java.desktop/share/data/dtdbuilder/html32.dtd
diff --git a/make/data/dtdbuilder/public.map b/src/java.desktop/share/data/dtdbuilder/public.map
similarity index 100%
rename from make/data/dtdbuilder/public.map
rename to src/java.desktop/share/data/dtdbuilder/public.map
diff --git a/make/data/x11wrappergen/sizes-32.txt b/src/java.desktop/unix/data/x11wrappergen/sizes-32.txt
similarity index 100%
rename from make/data/x11wrappergen/sizes-32.txt
rename to src/java.desktop/unix/data/x11wrappergen/sizes-32.txt
diff --git a/make/data/x11wrappergen/sizes-64.txt b/src/java.desktop/unix/data/x11wrappergen/sizes-64.txt
similarity index 100%
rename from make/data/x11wrappergen/sizes-64.txt
rename to src/java.desktop/unix/data/x11wrappergen/sizes-64.txt
diff --git a/make/data/x11wrappergen/xlibtypes.txt b/src/java.desktop/unix/data/x11wrappergen/xlibtypes.txt
similarity index 100%
rename from make/data/x11wrappergen/xlibtypes.txt
rename to src/java.desktop/unix/data/x11wrappergen/xlibtypes.txt
diff --git a/make/data/fontconfig/windows.fontconfig.properties b/src/java.desktop/windows/data/fontconfig/fontconfig.properties
similarity index 100%
rename from make/data/fontconfig/windows.fontconfig.properties
rename to src/java.desktop/windows/data/fontconfig/fontconfig.properties
diff --git a/make/data/jdwp/jdwp.spec b/src/java.se/share/data/jdwp/jdwp.spec
similarity index 100%
rename from make/data/jdwp/jdwp.spec
rename to src/java.se/share/data/jdwp/jdwp.spec
diff --git a/make/data/symbols/README b/src/jdk.compiler/share/data/symbols/README
similarity index 100%
rename from make/data/symbols/README
rename to src/jdk.compiler/share/data/symbols/README
diff --git a/make/data/symbols/include.list b/src/jdk.compiler/share/data/symbols/include.list
similarity index 100%
rename from make/data/symbols/include.list
rename to src/jdk.compiler/share/data/symbols/include.list
diff --git a/make/data/symbols/java.activation-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.activation-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.activation-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.activation-8.sym.txt
diff --git a/make/data/symbols/java.activation-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.activation-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.activation-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.activation-9.sym.txt
diff --git a/make/data/symbols/java.activation-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.activation-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.activation-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.activation-A.sym.txt
diff --git a/make/data/symbols/java.activation-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.activation-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.activation-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.activation-B.sym.txt
diff --git a/make/data/symbols/java.base-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-7.sym.txt
diff --git a/make/data/symbols/java.base-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-8.sym.txt
diff --git a/make/data/symbols/java.base-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-9.sym.txt
diff --git a/make/data/symbols/java.base-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-A.sym.txt
diff --git a/make/data/symbols/java.base-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-B.sym.txt
diff --git a/make/data/symbols/java.base-C.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-C.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-C.sym.txt
diff --git a/make/data/symbols/java.base-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-D.sym.txt
diff --git a/make/data/symbols/java.base-E.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-E.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-E.sym.txt
diff --git a/make/data/symbols/java.base-F.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-F.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-F.sym.txt
diff --git a/make/data/symbols/java.base-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-G.sym.txt
diff --git a/make/data/symbols/java.base-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-H.sym.txt
diff --git a/make/data/symbols/java.base-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.base-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.base-I.sym.txt
diff --git a/make/data/symbols/java.compiler-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-7.sym.txt
diff --git a/make/data/symbols/java.compiler-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-8.sym.txt
diff --git a/make/data/symbols/java.compiler-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-9.sym.txt
diff --git a/make/data/symbols/java.compiler-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-A.sym.txt
diff --git a/make/data/symbols/java.compiler-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-B.sym.txt
diff --git a/make/data/symbols/java.compiler-C.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-C.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-C.sym.txt
diff --git a/make/data/symbols/java.compiler-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-D.sym.txt
diff --git a/make/data/symbols/java.compiler-E.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-E.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-E.sym.txt
diff --git a/make/data/symbols/java.compiler-F.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-F.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-F.sym.txt
diff --git a/make/data/symbols/java.compiler-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-G.sym.txt
diff --git a/make/data/symbols/java.compiler-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-H.sym.txt
diff --git a/make/data/symbols/java.compiler-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.compiler-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.compiler-I.sym.txt
diff --git a/make/data/symbols/java.corba-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.corba-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.corba-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.corba-8.sym.txt
diff --git a/make/data/symbols/java.corba-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.corba-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.corba-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.corba-9.sym.txt
diff --git a/make/data/symbols/java.corba-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.corba-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.corba-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.corba-A.sym.txt
diff --git a/make/data/symbols/java.corba-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.corba-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.corba-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.corba-B.sym.txt
diff --git a/make/data/symbols/java.datatransfer-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.datatransfer-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.datatransfer-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.datatransfer-7.sym.txt
diff --git a/make/data/symbols/java.datatransfer-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.datatransfer-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.datatransfer-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.datatransfer-8.sym.txt
diff --git a/make/data/symbols/java.datatransfer-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.datatransfer-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.datatransfer-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.datatransfer-9.sym.txt
diff --git a/make/data/symbols/java.datatransfer-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.datatransfer-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.datatransfer-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.datatransfer-A.sym.txt
diff --git a/make/data/symbols/java.datatransfer-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.datatransfer-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.datatransfer-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.datatransfer-B.sym.txt
diff --git a/make/data/symbols/java.datatransfer-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.datatransfer-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.datatransfer-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.datatransfer-G.sym.txt
diff --git a/make/data/symbols/java.datatransfer-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.datatransfer-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.datatransfer-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.datatransfer-H.sym.txt
diff --git a/make/data/symbols/java.datatransfer-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.datatransfer-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.datatransfer-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.datatransfer-I.sym.txt
diff --git a/make/data/symbols/java.desktop-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-7.sym.txt
diff --git a/make/data/symbols/java.desktop-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-8.sym.txt
diff --git a/make/data/symbols/java.desktop-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-9.sym.txt
diff --git a/make/data/symbols/java.desktop-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-A.sym.txt
diff --git a/make/data/symbols/java.desktop-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-B.sym.txt
diff --git a/make/data/symbols/java.desktop-C.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-C.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-C.sym.txt
diff --git a/make/data/symbols/java.desktop-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-D.sym.txt
diff --git a/make/data/symbols/java.desktop-E.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-E.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-E.sym.txt
diff --git a/make/data/symbols/java.desktop-F.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-F.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-F.sym.txt
diff --git a/make/data/symbols/java.desktop-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-G.sym.txt
diff --git a/make/data/symbols/java.desktop-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-H.sym.txt
diff --git a/make/data/symbols/java.desktop-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.desktop-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.desktop-I.sym.txt
diff --git a/make/data/symbols/java.instrument-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.instrument-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.instrument-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.instrument-8.sym.txt
diff --git a/make/data/symbols/java.instrument-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.instrument-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.instrument-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.instrument-9.sym.txt
diff --git a/make/data/symbols/java.instrument-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.instrument-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.instrument-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.instrument-A.sym.txt
diff --git a/make/data/symbols/java.instrument-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.instrument-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.instrument-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.instrument-B.sym.txt
diff --git a/make/data/symbols/java.instrument-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.instrument-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.instrument-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.instrument-G.sym.txt
diff --git a/make/data/symbols/java.instrument-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.instrument-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.instrument-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.instrument-H.sym.txt
diff --git a/make/data/symbols/java.instrument-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.instrument-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.instrument-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.instrument-I.sym.txt
diff --git a/make/data/symbols/java.logging-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.logging-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.logging-7.sym.txt
diff --git a/make/data/symbols/java.logging-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.logging-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.logging-8.sym.txt
diff --git a/make/data/symbols/java.logging-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.logging-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.logging-9.sym.txt
diff --git a/make/data/symbols/java.logging-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.logging-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.logging-A.sym.txt
diff --git a/make/data/symbols/java.logging-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.logging-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.logging-B.sym.txt
diff --git a/make/data/symbols/java.logging-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.logging-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.logging-G.sym.txt
diff --git a/make/data/symbols/java.logging-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.logging-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.logging-H.sym.txt
diff --git a/make/data/symbols/java.logging-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.logging-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.logging-I.sym.txt
diff --git a/make/data/symbols/java.management-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-7.sym.txt
diff --git a/make/data/symbols/java.management-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-8.sym.txt
diff --git a/make/data/symbols/java.management-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-9.sym.txt
diff --git a/make/data/symbols/java.management-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-A.sym.txt
diff --git a/make/data/symbols/java.management-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-B.sym.txt
diff --git a/make/data/symbols/java.management-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-D.sym.txt
diff --git a/make/data/symbols/java.management-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-G.sym.txt
diff --git a/make/data/symbols/java.management-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-H.sym.txt
diff --git a/make/data/symbols/java.management-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.management-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management-I.sym.txt
diff --git a/make/data/symbols/java.management.rmi-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-8.sym.txt
diff --git a/make/data/symbols/java.management.rmi-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-9.sym.txt
diff --git a/make/data/symbols/java.management.rmi-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-A.sym.txt
diff --git a/make/data/symbols/java.management.rmi-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-B.sym.txt
diff --git a/make/data/symbols/java.management.rmi-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-D.sym.txt
diff --git a/make/data/symbols/java.management.rmi-F.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-F.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-F.sym.txt
diff --git a/make/data/symbols/java.management.rmi-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-G.sym.txt
diff --git a/make/data/symbols/java.management.rmi-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-H.sym.txt
diff --git a/make/data/symbols/java.management.rmi-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.management.rmi-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.management.rmi-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.management.rmi-I.sym.txt
diff --git a/make/data/symbols/java.naming-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-7.sym.txt
diff --git a/make/data/symbols/java.naming-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-8.sym.txt
diff --git a/make/data/symbols/java.naming-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-9.sym.txt
diff --git a/make/data/symbols/java.naming-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-A.sym.txt
diff --git a/make/data/symbols/java.naming-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-B.sym.txt
diff --git a/make/data/symbols/java.naming-C.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-C.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-C.sym.txt
diff --git a/make/data/symbols/java.naming-F.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-F.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-F.sym.txt
diff --git a/make/data/symbols/java.naming-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-G.sym.txt
diff --git a/make/data/symbols/java.naming-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-H.sym.txt
diff --git a/make/data/symbols/java.naming-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.naming-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.naming-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.naming-I.sym.txt
diff --git a/make/data/symbols/java.net.http-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.net.http-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.net.http-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.net.http-B.sym.txt
diff --git a/make/data/symbols/java.net.http-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.net.http-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.net.http-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.net.http-D.sym.txt
diff --git a/make/data/symbols/java.net.http-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.net.http-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.net.http-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.net.http-G.sym.txt
diff --git a/make/data/symbols/java.net.http-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.net.http-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.net.http-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.net.http-I.sym.txt
diff --git a/make/data/symbols/java.prefs-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.prefs-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.prefs-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.prefs-7.sym.txt
diff --git a/make/data/symbols/java.prefs-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.prefs-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.prefs-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.prefs-8.sym.txt
diff --git a/make/data/symbols/java.prefs-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.prefs-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.prefs-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.prefs-9.sym.txt
diff --git a/make/data/symbols/java.prefs-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.prefs-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.prefs-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.prefs-A.sym.txt
diff --git a/make/data/symbols/java.prefs-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.prefs-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.prefs-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.prefs-B.sym.txt
diff --git a/make/data/symbols/java.rmi-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-7.sym.txt
diff --git a/make/data/symbols/java.rmi-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-8.sym.txt
diff --git a/make/data/symbols/java.rmi-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-9.sym.txt
diff --git a/make/data/symbols/java.rmi-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-A.sym.txt
diff --git a/make/data/symbols/java.rmi-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-B.sym.txt
diff --git a/make/data/symbols/java.rmi-C.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-C.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-C.sym.txt
diff --git a/make/data/symbols/java.rmi-F.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-F.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-F.sym.txt
diff --git a/make/data/symbols/java.rmi-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-G.sym.txt
diff --git a/make/data/symbols/java.rmi-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-H.sym.txt
diff --git a/make/data/symbols/java.rmi-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.rmi-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.rmi-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.rmi-I.sym.txt
diff --git a/make/data/symbols/java.scripting-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.scripting-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.scripting-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.scripting-7.sym.txt
diff --git a/make/data/symbols/java.scripting-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.scripting-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.scripting-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.scripting-8.sym.txt
diff --git a/make/data/symbols/java.scripting-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.scripting-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.scripting-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.scripting-9.sym.txt
diff --git a/make/data/symbols/java.scripting-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.scripting-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.scripting-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.scripting-A.sym.txt
diff --git a/make/data/symbols/java.scripting-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.scripting-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.scripting-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.scripting-B.sym.txt
diff --git a/make/data/symbols/java.scripting-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.scripting-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.scripting-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.scripting-G.sym.txt
diff --git a/make/data/symbols/java.scripting-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.scripting-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.scripting-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.scripting-H.sym.txt
diff --git a/make/data/symbols/java.scripting-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.scripting-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.scripting-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.scripting-I.sym.txt
diff --git a/make/data/symbols/java.se-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.se-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.se-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.se-9.sym.txt
diff --git a/make/data/symbols/java.se-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.se-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.se-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.se-A.sym.txt
diff --git a/make/data/symbols/java.se-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.se-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.se-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.se-B.sym.txt
diff --git a/make/data/symbols/java.se.ee-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.se.ee-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.se.ee-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.se.ee-9.sym.txt
diff --git a/make/data/symbols/java.se.ee-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.se.ee-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.se.ee-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.se.ee-A.sym.txt
diff --git a/make/data/symbols/java.se.ee-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.se.ee-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.se.ee-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.se.ee-B.sym.txt
diff --git a/make/data/symbols/java.security.jgss-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-7.sym.txt
diff --git a/make/data/symbols/java.security.jgss-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-8.sym.txt
diff --git a/make/data/symbols/java.security.jgss-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-9.sym.txt
diff --git a/make/data/symbols/java.security.jgss-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-A.sym.txt
diff --git a/make/data/symbols/java.security.jgss-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-B.sym.txt
diff --git a/make/data/symbols/java.security.jgss-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-D.sym.txt
diff --git a/make/data/symbols/java.security.jgss-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-G.sym.txt
diff --git a/make/data/symbols/java.security.jgss-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-H.sym.txt
diff --git a/make/data/symbols/java.security.jgss-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.jgss-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.jgss-I.sym.txt
diff --git a/make/data/symbols/java.security.sasl-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.sasl-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.sasl-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.sasl-7.sym.txt
diff --git a/make/data/symbols/java.security.sasl-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.sasl-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.sasl-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.sasl-8.sym.txt
diff --git a/make/data/symbols/java.security.sasl-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.sasl-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.sasl-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.sasl-9.sym.txt
diff --git a/make/data/symbols/java.security.sasl-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.sasl-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.sasl-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.sasl-A.sym.txt
diff --git a/make/data/symbols/java.security.sasl-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.sasl-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.sasl-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.sasl-B.sym.txt
diff --git a/make/data/symbols/java.security.sasl-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.sasl-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.sasl-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.sasl-G.sym.txt
diff --git a/make/data/symbols/java.security.sasl-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.sasl-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.sasl-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.sasl-H.sym.txt
diff --git a/make/data/symbols/java.security.sasl-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.sasl-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.security.sasl-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.security.sasl-I.sym.txt
diff --git a/make/data/symbols/java.smartcardio-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.smartcardio-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.smartcardio-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.smartcardio-9.sym.txt
diff --git a/make/data/symbols/java.smartcardio-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.smartcardio-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.smartcardio-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.smartcardio-A.sym.txt
diff --git a/make/data/symbols/java.smartcardio-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.smartcardio-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.smartcardio-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.smartcardio-B.sym.txt
diff --git a/make/data/symbols/java.smartcardio-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.smartcardio-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.smartcardio-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.smartcardio-G.sym.txt
diff --git a/make/data/symbols/java.smartcardio-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.smartcardio-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.smartcardio-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.smartcardio-H.sym.txt
diff --git a/make/data/symbols/java.smartcardio-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.smartcardio-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.smartcardio-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.smartcardio-I.sym.txt
diff --git a/make/data/symbols/java.sql-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql-7.sym.txt
diff --git a/make/data/symbols/java.sql-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql-8.sym.txt
diff --git a/make/data/symbols/java.sql-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql-9.sym.txt
diff --git a/make/data/symbols/java.sql-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql-A.sym.txt
diff --git a/make/data/symbols/java.sql-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql-B.sym.txt
diff --git a/make/data/symbols/java.sql-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql-G.sym.txt
diff --git a/make/data/symbols/java.sql-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql-H.sym.txt
diff --git a/make/data/symbols/java.sql-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql-I.sym.txt
diff --git a/make/data/symbols/java.sql.rowset-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql.rowset-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql.rowset-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql.rowset-7.sym.txt
diff --git a/make/data/symbols/java.sql.rowset-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql.rowset-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql.rowset-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql.rowset-8.sym.txt
diff --git a/make/data/symbols/java.sql.rowset-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql.rowset-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql.rowset-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql.rowset-9.sym.txt
diff --git a/make/data/symbols/java.sql.rowset-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql.rowset-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql.rowset-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql.rowset-A.sym.txt
diff --git a/make/data/symbols/java.sql.rowset-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql.rowset-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql.rowset-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql.rowset-B.sym.txt
diff --git a/make/data/symbols/java.sql.rowset-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql.rowset-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql.rowset-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql.rowset-G.sym.txt
diff --git a/make/data/symbols/java.sql.rowset-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql.rowset-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql.rowset-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql.rowset-H.sym.txt
diff --git a/make/data/symbols/java.sql.rowset-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.sql.rowset-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.sql.rowset-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.sql.rowset-I.sym.txt
diff --git a/make/data/symbols/java.transaction-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.transaction-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.transaction-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.transaction-8.sym.txt
diff --git a/make/data/symbols/java.transaction-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.transaction-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.transaction-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.transaction-9.sym.txt
diff --git a/make/data/symbols/java.transaction-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.transaction-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.transaction-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.transaction-A.sym.txt
diff --git a/make/data/symbols/java.transaction-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.transaction-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.transaction-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.transaction-B.sym.txt
diff --git a/make/data/symbols/java.transaction.xa-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.transaction.xa-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.transaction.xa-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.transaction.xa-B.sym.txt
diff --git a/make/data/symbols/java.xml-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-7.sym.txt
diff --git a/make/data/symbols/java.xml-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-8.sym.txt
diff --git a/make/data/symbols/java.xml-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-9.sym.txt
diff --git a/make/data/symbols/java.xml-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-A.sym.txt
diff --git a/make/data/symbols/java.xml-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-B.sym.txt
diff --git a/make/data/symbols/java.xml-C.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-C.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-C.sym.txt
diff --git a/make/data/symbols/java.xml-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-D.sym.txt
diff --git a/make/data/symbols/java.xml-E.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-E.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-E.sym.txt
diff --git a/make/data/symbols/java.xml-F.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-F.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-F.sym.txt
diff --git a/make/data/symbols/java.xml-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-G.sym.txt
diff --git a/make/data/symbols/java.xml-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-H.sym.txt
diff --git a/make/data/symbols/java.xml-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml-I.sym.txt
diff --git a/make/data/symbols/java.xml.bind-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.bind-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.bind-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.bind-7.sym.txt
diff --git a/make/data/symbols/java.xml.bind-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.bind-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.bind-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.bind-8.sym.txt
diff --git a/make/data/symbols/java.xml.bind-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.bind-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.bind-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.bind-9.sym.txt
diff --git a/make/data/symbols/java.xml.bind-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.bind-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.bind-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.bind-A.sym.txt
diff --git a/make/data/symbols/java.xml.bind-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.bind-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.bind-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.bind-B.sym.txt
diff --git a/make/data/symbols/java.xml.crypto-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.crypto-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.crypto-8.sym.txt
diff --git a/make/data/symbols/java.xml.crypto-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.crypto-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.crypto-9.sym.txt
diff --git a/make/data/symbols/java.xml.crypto-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.crypto-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.crypto-A.sym.txt
diff --git a/make/data/symbols/java.xml.crypto-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.crypto-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.crypto-B.sym.txt
diff --git a/make/data/symbols/java.xml.crypto-D.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-D.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.crypto-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.crypto-D.sym.txt
diff --git a/make/data/symbols/java.xml.crypto-G.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-G.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.crypto-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.crypto-G.sym.txt
diff --git a/make/data/symbols/java.xml.crypto-H.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-H.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.crypto-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.crypto-H.sym.txt
diff --git a/make/data/symbols/java.xml.crypto-I.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-I.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.crypto-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.crypto-I.sym.txt
diff --git a/make/data/symbols/java.xml.ws-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws-8.sym.txt
diff --git a/make/data/symbols/java.xml.ws-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws-9.sym.txt
diff --git a/make/data/symbols/java.xml.ws-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws-A.sym.txt
diff --git a/make/data/symbols/java.xml.ws-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws-B.sym.txt
diff --git a/make/data/symbols/java.xml.ws.annotation-7.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-7.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws.annotation-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-7.sym.txt
diff --git a/make/data/symbols/java.xml.ws.annotation-8.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-8.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws.annotation-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-8.sym.txt
diff --git a/make/data/symbols/java.xml.ws.annotation-9.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-9.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws.annotation-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-9.sym.txt
diff --git a/make/data/symbols/java.xml.ws.annotation-A.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-A.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws.annotation-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-A.sym.txt
diff --git a/make/data/symbols/java.xml.ws.annotation-B.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-B.sym.txt
similarity index 100%
rename from make/data/symbols/java.xml.ws.annotation-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/java.xml.ws.annotation-B.sym.txt
diff --git a/make/data/symbols/jdk.accessibility-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.accessibility-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.accessibility-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.accessibility-9.sym.txt
diff --git a/make/data/symbols/jdk.accessibility-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.accessibility-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.accessibility-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.accessibility-A.sym.txt
diff --git a/make/data/symbols/jdk.accessibility-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.accessibility-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.accessibility-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.accessibility-B.sym.txt
diff --git a/make/data/symbols/jdk.accessibility-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.accessibility-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.accessibility-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.accessibility-G.sym.txt
diff --git a/make/data/symbols/jdk.accessibility-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.accessibility-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.accessibility-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.accessibility-H.sym.txt
diff --git a/make/data/symbols/jdk.accessibility-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.accessibility-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.accessibility-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.accessibility-I.sym.txt
diff --git a/make/data/symbols/jdk.attach-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.attach-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.attach-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.attach-9.sym.txt
diff --git a/make/data/symbols/jdk.attach-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.attach-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.attach-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.attach-A.sym.txt
diff --git a/make/data/symbols/jdk.attach-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.attach-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.attach-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.attach-B.sym.txt
diff --git a/make/data/symbols/jdk.attach-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.attach-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.attach-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.attach-G.sym.txt
diff --git a/make/data/symbols/jdk.attach-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.attach-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.attach-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.attach-H.sym.txt
diff --git a/make/data/symbols/jdk.attach-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.attach-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.attach-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.attach-I.sym.txt
diff --git a/make/data/symbols/jdk.charsets-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.charsets-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.charsets-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.charsets-9.sym.txt
diff --git a/make/data/symbols/jdk.charsets-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.charsets-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.charsets-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.charsets-A.sym.txt
diff --git a/make/data/symbols/jdk.charsets-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.charsets-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.charsets-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.charsets-B.sym.txt
diff --git a/make/data/symbols/jdk.compiler-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-9.sym.txt
diff --git a/make/data/symbols/jdk.compiler-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-A.sym.txt
diff --git a/make/data/symbols/jdk.compiler-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-B.sym.txt
diff --git a/make/data/symbols/jdk.compiler-C.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-C.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-C.sym.txt
diff --git a/make/data/symbols/jdk.compiler-D.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-D.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-D.sym.txt
diff --git a/make/data/symbols/jdk.compiler-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-E.sym.txt
diff --git a/make/data/symbols/jdk.compiler-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-F.sym.txt
diff --git a/make/data/symbols/jdk.compiler-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-G.sym.txt
diff --git a/make/data/symbols/jdk.compiler-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-H.sym.txt
diff --git a/make/data/symbols/jdk.compiler-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.compiler-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.compiler-I.sym.txt
diff --git a/make/data/symbols/jdk.crypto.cryptoki-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.crypto.cryptoki-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-9.sym.txt
diff --git a/make/data/symbols/jdk.crypto.cryptoki-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.crypto.cryptoki-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-A.sym.txt
diff --git a/make/data/symbols/jdk.crypto.cryptoki-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.crypto.cryptoki-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-B.sym.txt
diff --git a/make/data/symbols/jdk.crypto.ec-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.crypto.ec-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.crypto.ec-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.crypto.ec-9.sym.txt
diff --git a/make/data/symbols/jdk.crypto.ec-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.crypto.ec-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.crypto.ec-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.crypto.ec-A.sym.txt
diff --git a/make/data/symbols/jdk.crypto.ec-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.crypto.ec-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.crypto.ec-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.crypto.ec-B.sym.txt
diff --git a/make/data/symbols/jdk.dynalink-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.dynalink-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.dynalink-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.dynalink-9.sym.txt
diff --git a/make/data/symbols/jdk.dynalink-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.dynalink-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.dynalink-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.dynalink-A.sym.txt
diff --git a/make/data/symbols/jdk.dynalink-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.dynalink-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.dynalink-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.dynalink-B.sym.txt
diff --git a/make/data/symbols/jdk.dynalink-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.dynalink-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.dynalink-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.dynalink-G.sym.txt
diff --git a/make/data/symbols/jdk.dynalink-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.dynalink-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.dynalink-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.dynalink-H.sym.txt
diff --git a/make/data/symbols/jdk.dynalink-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.dynalink-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.dynalink-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.dynalink-I.sym.txt
diff --git a/make/data/symbols/jdk.editpad-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.editpad-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.editpad-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.editpad-9.sym.txt
diff --git a/make/data/symbols/jdk.editpad-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.editpad-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.editpad-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.editpad-A.sym.txt
diff --git a/make/data/symbols/jdk.editpad-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.editpad-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.editpad-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.editpad-B.sym.txt
diff --git a/make/data/symbols/jdk.hotspot.agent-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.hotspot.agent-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.hotspot.agent-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.hotspot.agent-9.sym.txt
diff --git a/make/data/symbols/jdk.hotspot.agent-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.hotspot.agent-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.hotspot.agent-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.hotspot.agent-A.sym.txt
diff --git a/make/data/symbols/jdk.hotspot.agent-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.hotspot.agent-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.hotspot.agent-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.hotspot.agent-B.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-7.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-7.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-7.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-8.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-8.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-8.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-9.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-A.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-B.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-D.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-D.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-D.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-E.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-G.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-H.sym.txt
diff --git a/make/data/symbols/jdk.httpserver-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.httpserver-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.httpserver-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.httpserver-I.sym.txt
diff --git a/make/data/symbols/jdk.incubator.foreign-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.foreign-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-E.sym.txt
diff --git a/make/data/symbols/jdk.incubator.foreign-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.foreign-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-F.sym.txt
diff --git a/make/data/symbols/jdk.incubator.foreign-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.foreign-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-G.sym.txt
diff --git a/make/data/symbols/jdk.incubator.foreign-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.foreign-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-H.sym.txt
diff --git a/make/data/symbols/jdk.incubator.foreign-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.foreign-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-I.sym.txt
diff --git a/make/data/symbols/jdk.incubator.httpclient-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.httpclient-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.httpclient-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.httpclient-9.sym.txt
diff --git a/make/data/symbols/jdk.incubator.httpclient-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.httpclient-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.httpclient-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.httpclient-A.sym.txt
diff --git a/make/data/symbols/jdk.incubator.httpclient-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.httpclient-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.httpclient-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.httpclient-B.sym.txt
diff --git a/make/data/symbols/jdk.incubator.jpackage-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.jpackage-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.jpackage-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.jpackage-E.sym.txt
diff --git a/make/data/symbols/jdk.incubator.jpackage-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.jpackage-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.jpackage-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.jpackage-G.sym.txt
diff --git a/make/data/symbols/jdk.incubator.vector-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.vector-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.vector-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.vector-G.sym.txt
diff --git a/make/data/symbols/jdk.incubator.vector-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.vector-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.vector-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.vector-H.sym.txt
diff --git a/make/data/symbols/jdk.incubator.vector-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.vector-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.incubator.vector-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.incubator.vector-I.sym.txt
diff --git a/make/data/symbols/jdk.jartool-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jartool-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jartool-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jartool-9.sym.txt
diff --git a/make/data/symbols/jdk.jartool-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jartool-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jartool-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jartool-A.sym.txt
diff --git a/make/data/symbols/jdk.jartool-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jartool-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jartool-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jartool-B.sym.txt
diff --git a/make/data/symbols/jdk.jartool-D.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jartool-D.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jartool-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jartool-D.sym.txt
diff --git a/make/data/symbols/jdk.jartool-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jartool-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jartool-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jartool-F.sym.txt
diff --git a/make/data/symbols/jdk.jartool-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jartool-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jartool-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jartool-G.sym.txt
diff --git a/make/data/symbols/jdk.jartool-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jartool-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jartool-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jartool-H.sym.txt
diff --git a/make/data/symbols/jdk.jartool-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jartool-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jartool-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jartool-I.sym.txt
diff --git a/make/data/symbols/jdk.javadoc-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.javadoc-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.javadoc-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.javadoc-9.sym.txt
diff --git a/make/data/symbols/jdk.javadoc-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.javadoc-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.javadoc-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.javadoc-A.sym.txt
diff --git a/make/data/symbols/jdk.javadoc-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.javadoc-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.javadoc-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.javadoc-B.sym.txt
diff --git a/make/data/symbols/jdk.javadoc-D.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.javadoc-D.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.javadoc-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.javadoc-D.sym.txt
diff --git a/make/data/symbols/jdk.javadoc-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.javadoc-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.javadoc-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.javadoc-F.sym.txt
diff --git a/make/data/symbols/jdk.javadoc-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.javadoc-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.javadoc-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.javadoc-G.sym.txt
diff --git a/make/data/symbols/jdk.javadoc-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.javadoc-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.javadoc-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.javadoc-H.sym.txt
diff --git a/make/data/symbols/jdk.javadoc-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.javadoc-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.javadoc-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.javadoc-I.sym.txt
diff --git a/make/data/symbols/jdk.jcmd-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jcmd-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jcmd-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jcmd-9.sym.txt
diff --git a/make/data/symbols/jdk.jcmd-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jcmd-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jcmd-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jcmd-A.sym.txt
diff --git a/make/data/symbols/jdk.jcmd-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jcmd-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jcmd-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jcmd-B.sym.txt
diff --git a/make/data/symbols/jdk.jconsole-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jconsole-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jconsole-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jconsole-9.sym.txt
diff --git a/make/data/symbols/jdk.jconsole-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jconsole-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jconsole-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jconsole-A.sym.txt
diff --git a/make/data/symbols/jdk.jconsole-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jconsole-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jconsole-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jconsole-B.sym.txt
diff --git a/make/data/symbols/jdk.jconsole-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jconsole-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jconsole-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jconsole-G.sym.txt
diff --git a/make/data/symbols/jdk.jconsole-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jconsole-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jconsole-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jconsole-H.sym.txt
diff --git a/make/data/symbols/jdk.jconsole-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jconsole-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jconsole-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jconsole-I.sym.txt
diff --git a/make/data/symbols/jdk.jdeps-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdeps-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdeps-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdeps-9.sym.txt
diff --git a/make/data/symbols/jdk.jdeps-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdeps-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdeps-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdeps-A.sym.txt
diff --git a/make/data/symbols/jdk.jdeps-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdeps-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdeps-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdeps-B.sym.txt
diff --git a/make/data/symbols/jdk.jdi-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdi-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdi-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdi-9.sym.txt
diff --git a/make/data/symbols/jdk.jdi-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdi-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdi-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdi-A.sym.txt
diff --git a/make/data/symbols/jdk.jdi-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdi-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdi-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdi-B.sym.txt
diff --git a/make/data/symbols/jdk.jdi-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdi-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdi-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdi-F.sym.txt
diff --git a/make/data/symbols/jdk.jdi-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdi-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdi-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdi-G.sym.txt
diff --git a/make/data/symbols/jdk.jdi-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdi-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdi-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdi-H.sym.txt
diff --git a/make/data/symbols/jdk.jdi-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdi-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdi-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdi-I.sym.txt
diff --git a/make/data/symbols/jdk.jdwp.agent-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdwp.agent-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdwp.agent-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdwp.agent-9.sym.txt
diff --git a/make/data/symbols/jdk.jdwp.agent-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdwp.agent-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdwp.agent-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdwp.agent-A.sym.txt
diff --git a/make/data/symbols/jdk.jdwp.agent-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdwp.agent-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jdwp.agent-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jdwp.agent-B.sym.txt
diff --git a/make/data/symbols/jdk.jfr-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jfr-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jfr-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jfr-B.sym.txt
diff --git a/make/data/symbols/jdk.jfr-C.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jfr-C.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jfr-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jfr-C.sym.txt
diff --git a/make/data/symbols/jdk.jfr-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jfr-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jfr-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jfr-E.sym.txt
diff --git a/make/data/symbols/jdk.jfr-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jfr-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jfr-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jfr-G.sym.txt
diff --git a/make/data/symbols/jdk.jfr-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jfr-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jfr-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jfr-H.sym.txt
diff --git a/make/data/symbols/jdk.jlink-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jlink-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jlink-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jlink-9.sym.txt
diff --git a/make/data/symbols/jdk.jlink-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jlink-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jlink-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jlink-A.sym.txt
diff --git a/make/data/symbols/jdk.jlink-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jlink-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jlink-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jlink-B.sym.txt
diff --git a/make/data/symbols/jdk.jlink-D.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jlink-D.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jlink-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jlink-D.sym.txt
diff --git a/make/data/symbols/jdk.jlink-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jlink-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jlink-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jlink-E.sym.txt
diff --git a/make/data/symbols/jdk.jlink-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jlink-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jlink-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jlink-I.sym.txt
diff --git a/make/data/symbols/jdk.jpackage-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jpackage-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jpackage-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jpackage-G.sym.txt
diff --git a/make/data/symbols/jdk.jshell-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jshell-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jshell-9.sym.txt
diff --git a/make/data/symbols/jdk.jshell-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jshell-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jshell-A.sym.txt
diff --git a/make/data/symbols/jdk.jshell-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jshell-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jshell-B.sym.txt
diff --git a/make/data/symbols/jdk.jshell-D.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-D.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jshell-D.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jshell-D.sym.txt
diff --git a/make/data/symbols/jdk.jshell-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jshell-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jshell-E.sym.txt
diff --git a/make/data/symbols/jdk.jshell-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jshell-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jshell-G.sym.txt
diff --git a/make/data/symbols/jdk.jshell-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jshell-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jshell-H.sym.txt
diff --git a/make/data/symbols/jdk.jshell-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jshell-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jshell-I.sym.txt
diff --git a/make/data/symbols/jdk.jsobject-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jsobject-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jsobject-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jsobject-9.sym.txt
diff --git a/make/data/symbols/jdk.jsobject-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jsobject-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jsobject-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jsobject-A.sym.txt
diff --git a/make/data/symbols/jdk.jsobject-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jsobject-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jsobject-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jsobject-B.sym.txt
diff --git a/make/data/symbols/jdk.jsobject-C.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jsobject-C.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jsobject-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jsobject-C.sym.txt
diff --git a/make/data/symbols/jdk.jsobject-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jsobject-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jsobject-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jsobject-E.sym.txt
diff --git a/make/data/symbols/jdk.jsobject-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jsobject-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jsobject-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jsobject-G.sym.txt
diff --git a/make/data/symbols/jdk.jsobject-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jsobject-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jsobject-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jsobject-H.sym.txt
diff --git a/make/data/symbols/jdk.jsobject-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jsobject-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jsobject-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jsobject-I.sym.txt
diff --git a/make/data/symbols/jdk.jstatd-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jstatd-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jstatd-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jstatd-9.sym.txt
diff --git a/make/data/symbols/jdk.jstatd-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jstatd-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jstatd-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jstatd-A.sym.txt
diff --git a/make/data/symbols/jdk.jstatd-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jstatd-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.jstatd-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.jstatd-B.sym.txt
diff --git a/make/data/symbols/jdk.localedata-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.localedata-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.localedata-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.localedata-9.sym.txt
diff --git a/make/data/symbols/jdk.localedata-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.localedata-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.localedata-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.localedata-A.sym.txt
diff --git a/make/data/symbols/jdk.localedata-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.localedata-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.localedata-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.localedata-B.sym.txt
diff --git a/make/data/symbols/jdk.management-7.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-7.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-7.sym.txt
diff --git a/make/data/symbols/jdk.management-8.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-8.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-8.sym.txt
diff --git a/make/data/symbols/jdk.management-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-9.sym.txt
diff --git a/make/data/symbols/jdk.management-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-A.sym.txt
diff --git a/make/data/symbols/jdk.management-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-B.sym.txt
diff --git a/make/data/symbols/jdk.management-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-E.sym.txt
diff --git a/make/data/symbols/jdk.management-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-G.sym.txt
diff --git a/make/data/symbols/jdk.management-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-H.sym.txt
diff --git a/make/data/symbols/jdk.management-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management-I.sym.txt
diff --git a/make/data/symbols/jdk.management.agent-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management.agent-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management.agent-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management.agent-9.sym.txt
diff --git a/make/data/symbols/jdk.management.agent-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management.agent-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management.agent-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management.agent-A.sym.txt
diff --git a/make/data/symbols/jdk.management.agent-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management.agent-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management.agent-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management.agent-B.sym.txt
diff --git a/make/data/symbols/jdk.management.jfr-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management.jfr-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management.jfr-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management.jfr-B.sym.txt
diff --git a/make/data/symbols/jdk.management.jfr-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management.jfr-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management.jfr-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management.jfr-G.sym.txt
diff --git a/make/data/symbols/jdk.management.jfr-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management.jfr-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management.jfr-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management.jfr-H.sym.txt
diff --git a/make/data/symbols/jdk.management.jfr-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management.jfr-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.management.jfr-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.management.jfr-I.sym.txt
diff --git a/make/data/symbols/jdk.naming.dns-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.naming.dns-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.naming.dns-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.naming.dns-9.sym.txt
diff --git a/make/data/symbols/jdk.naming.dns-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.naming.dns-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.naming.dns-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.naming.dns-A.sym.txt
diff --git a/make/data/symbols/jdk.naming.dns-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.naming.dns-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.naming.dns-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.naming.dns-B.sym.txt
diff --git a/make/data/symbols/jdk.naming.rmi-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.naming.rmi-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.naming.rmi-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.naming.rmi-9.sym.txt
diff --git a/make/data/symbols/jdk.naming.rmi-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.naming.rmi-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.naming.rmi-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.naming.rmi-A.sym.txt
diff --git a/make/data/symbols/jdk.naming.rmi-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.naming.rmi-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.naming.rmi-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.naming.rmi-B.sym.txt
diff --git a/make/data/symbols/jdk.net-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.net-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.net-9.sym.txt
diff --git a/make/data/symbols/jdk.net-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.net-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.net-A.sym.txt
diff --git a/make/data/symbols/jdk.net-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.net-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.net-B.sym.txt
diff --git a/make/data/symbols/jdk.net-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.net-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.net-E.sym.txt
diff --git a/make/data/symbols/jdk.net-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.net-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.net-F.sym.txt
diff --git a/make/data/symbols/jdk.net-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.net-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.net-G.sym.txt
diff --git a/make/data/symbols/jdk.net-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.net-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.net-H.sym.txt
diff --git a/make/data/symbols/jdk.net-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.net-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.net-I.sym.txt
diff --git a/make/data/symbols/jdk.nio.mapmode-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.nio.mapmode-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.nio.mapmode-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.nio.mapmode-F.sym.txt
diff --git a/make/data/symbols/jdk.pack-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.pack-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.pack-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.pack-9.sym.txt
diff --git a/make/data/symbols/jdk.pack-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.pack-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.pack-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.pack-A.sym.txt
diff --git a/make/data/symbols/jdk.pack-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.pack-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.pack-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.pack-B.sym.txt
diff --git a/make/data/symbols/jdk.pack-E.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.pack-E.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.pack-E.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.pack-E.sym.txt
diff --git a/make/data/symbols/jdk.policytool-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.policytool-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.policytool-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.policytool-9.sym.txt
diff --git a/make/data/symbols/jdk.policytool-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.policytool-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.policytool-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.policytool-A.sym.txt
diff --git a/make/data/symbols/jdk.rmic-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.rmic-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.rmic-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.rmic-9.sym.txt
diff --git a/make/data/symbols/jdk.rmic-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.rmic-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.rmic-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.rmic-A.sym.txt
diff --git a/make/data/symbols/jdk.rmic-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.rmic-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.rmic-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.rmic-B.sym.txt
diff --git a/make/data/symbols/jdk.rmic-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.rmic-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.rmic-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.rmic-F.sym.txt
diff --git a/make/data/symbols/jdk.scripting.nashorn-7.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-7.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.scripting.nashorn-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-7.sym.txt
diff --git a/make/data/symbols/jdk.scripting.nashorn-8.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-8.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.scripting.nashorn-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-8.sym.txt
diff --git a/make/data/symbols/jdk.scripting.nashorn-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.scripting.nashorn-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-9.sym.txt
diff --git a/make/data/symbols/jdk.scripting.nashorn-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.scripting.nashorn-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-A.sym.txt
diff --git a/make/data/symbols/jdk.scripting.nashorn-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.scripting.nashorn-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-B.sym.txt
diff --git a/make/data/symbols/jdk.scripting.nashorn-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.scripting.nashorn-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.scripting.nashorn-F.sym.txt
diff --git a/make/data/symbols/jdk.sctp-7.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.sctp-7.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.sctp-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.sctp-7.sym.txt
diff --git a/make/data/symbols/jdk.sctp-8.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.sctp-8.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.sctp-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.sctp-8.sym.txt
diff --git a/make/data/symbols/jdk.sctp-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.sctp-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.sctp-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.sctp-9.sym.txt
diff --git a/make/data/symbols/jdk.sctp-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.sctp-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.sctp-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.sctp-A.sym.txt
diff --git a/make/data/symbols/jdk.sctp-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.sctp-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.sctp-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.sctp-B.sym.txt
diff --git a/make/data/symbols/jdk.sctp-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.sctp-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.sctp-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.sctp-G.sym.txt
diff --git a/make/data/symbols/jdk.sctp-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.sctp-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.sctp-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.sctp-H.sym.txt
diff --git a/make/data/symbols/jdk.sctp-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.sctp-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.sctp-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.sctp-I.sym.txt
diff --git a/make/data/symbols/jdk.security.auth-7.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.auth-7.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.auth-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.auth-7.sym.txt
diff --git a/make/data/symbols/jdk.security.auth-8.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.auth-8.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.auth-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.auth-8.sym.txt
diff --git a/make/data/symbols/jdk.security.auth-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.auth-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.auth-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.auth-9.sym.txt
diff --git a/make/data/symbols/jdk.security.auth-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.auth-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.auth-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.auth-A.sym.txt
diff --git a/make/data/symbols/jdk.security.auth-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.auth-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.auth-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.auth-B.sym.txt
diff --git a/make/data/symbols/jdk.security.auth-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.auth-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.auth-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.auth-G.sym.txt
diff --git a/make/data/symbols/jdk.security.auth-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.auth-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.auth-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.auth-H.sym.txt
diff --git a/make/data/symbols/jdk.security.auth-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.auth-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.auth-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.auth-I.sym.txt
diff --git a/make/data/symbols/jdk.security.jgss-7.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-7.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.jgss-7.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.jgss-7.sym.txt
diff --git a/make/data/symbols/jdk.security.jgss-8.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-8.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.jgss-8.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.jgss-8.sym.txt
diff --git a/make/data/symbols/jdk.security.jgss-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.jgss-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.jgss-9.sym.txt
diff --git a/make/data/symbols/jdk.security.jgss-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.jgss-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.jgss-A.sym.txt
diff --git a/make/data/symbols/jdk.security.jgss-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.jgss-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.jgss-B.sym.txt
diff --git a/make/data/symbols/jdk.security.jgss-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.jgss-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.jgss-G.sym.txt
diff --git a/make/data/symbols/jdk.security.jgss-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.jgss-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.jgss-H.sym.txt
diff --git a/make/data/symbols/jdk.security.jgss-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.security.jgss-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.security.jgss-I.sym.txt
diff --git a/make/data/symbols/jdk.unsupported-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.unsupported-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.unsupported-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.unsupported-9.sym.txt
diff --git a/make/data/symbols/jdk.unsupported-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.unsupported-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.unsupported-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.unsupported-A.sym.txt
diff --git a/make/data/symbols/jdk.unsupported-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.unsupported-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.unsupported-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.unsupported-B.sym.txt
diff --git a/make/data/symbols/jdk.unsupported-C.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.unsupported-C.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.unsupported-C.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.unsupported-C.sym.txt
diff --git a/make/data/symbols/jdk.unsupported-F.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.unsupported-F.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.unsupported-F.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.unsupported-F.sym.txt
diff --git a/make/data/symbols/jdk.unsupported-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.unsupported-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.unsupported-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.unsupported-G.sym.txt
diff --git a/make/data/symbols/jdk.unsupported-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.unsupported-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.unsupported-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.unsupported-H.sym.txt
diff --git a/make/data/symbols/jdk.unsupported-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.unsupported-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.unsupported-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.unsupported-I.sym.txt
diff --git a/make/data/symbols/jdk.xml.dom-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.xml.dom-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.xml.dom-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.xml.dom-9.sym.txt
diff --git a/make/data/symbols/jdk.xml.dom-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.xml.dom-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.xml.dom-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.xml.dom-A.sym.txt
diff --git a/make/data/symbols/jdk.xml.dom-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.xml.dom-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.xml.dom-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.xml.dom-B.sym.txt
diff --git a/make/data/symbols/jdk.xml.dom-G.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.xml.dom-G.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.xml.dom-G.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.xml.dom-G.sym.txt
diff --git a/make/data/symbols/jdk.xml.dom-H.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.xml.dom-H.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.xml.dom-H.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.xml.dom-H.sym.txt
diff --git a/make/data/symbols/jdk.xml.dom-I.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.xml.dom-I.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.xml.dom-I.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.xml.dom-I.sym.txt
diff --git a/make/data/symbols/jdk.zipfs-9.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.zipfs-9.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.zipfs-9.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.zipfs-9.sym.txt
diff --git a/make/data/symbols/jdk.zipfs-A.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.zipfs-A.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.zipfs-A.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.zipfs-A.sym.txt
diff --git a/make/data/symbols/jdk.zipfs-B.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.zipfs-B.sym.txt
similarity index 100%
rename from make/data/symbols/jdk.zipfs-B.sym.txt
rename to src/jdk.compiler/share/data/symbols/jdk.zipfs-B.sym.txt
diff --git a/make/data/symbols/symbols b/src/jdk.compiler/share/data/symbols/symbols
similarity index 100%
rename from make/data/symbols/symbols
rename to src/jdk.compiler/share/data/symbols/symbols
diff --git a/test/jdk/java/security/misc/Versions.java b/test/jdk/java/security/misc/Versions.java
index 6c14b2bc212..ebfe9a13a88 100644
--- a/test/jdk/java/security/misc/Versions.java
+++ b/test/jdk/java/security/misc/Versions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ public class Versions {
                         "src/java.xml.crypto/share/legal/santuario.md",
                         Pattern.compile("## Apache Santuario v(?<n>\\S+)"),
                         "java.xml.crypto/santuario.md"},
-                {"make/data/publicsuffixlist/VERSION",
+                {"src/java.base/share/data/publicsuffixlist/VERSION",
                         Pattern.compile("list/(?<n>[0-9a-f]+)/public_suffix_list.dat"),
                         "src/java.base/share/legal/public_suffix.md",
                         Pattern.compile("list/(?<n>[0-9a-f]+)/public_suffix_list.dat"),
diff --git a/test/jdk/java/util/Currency/CurrencyTest.java b/test/jdk/java/util/Currency/CurrencyTest.java
index ad7c596485b..f82b032e2f8 100644
--- a/test/jdk/java/util/Currency/CurrencyTest.java
+++ b/test/jdk/java/util/Currency/CurrencyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,7 +139,7 @@ public class CurrencyTest {
 
         /*
         * check currency changes
-        * In current implementation, there is no data of old currency and transition date at jdk/make/data/currency/CurrencyData.properties.
+        * In current implementation, there is no data of old currency and transition date at jdk/src/java.base/share/data/currency/CurrencyData.properties.
         * So, all the switch data arrays are empty. In the future, if data of old currency and transition date are necessary for any country, the
         * arrays here can be updated so that the program can check the currency switch.
         */
diff --git a/test/jdk/java/util/Locale/LSRDataTest.java b/test/jdk/java/util/Locale/LSRDataTest.java
index 81edf48b9b0..f32642981b5 100644
--- a/test/jdk/java/util/Locale/LSRDataTest.java
+++ b/test/jdk/java/util/Locale/LSRDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,11 +52,11 @@ public class LSRDataTest {
     private static final Map<String, List<String>> multiLangEquivsMap = new HashMap<>();
     private static final Map<String, String> regionVariantEquivMap = new HashMap<>();
 
-    // path to the lsr file from the make folder, this test relies on the
-    // relative path to the file in the make folder, considering
-    // test and make will always exist in the same jdk layout
+    // path to the lsr file from the data folder, this test relies on the
+    // relative path to the file in the data folder, considering
+    // test and src/.../data will always exist in the same jdk layout
     private static final String LSR_FILE_PATH = System.getProperty("test.src", ".")
-                + "/../../../../../make/data/lsrdata/language-subtag-registry.txt";
+                + "/../../../../../src/java.base/share/data/lsrdata/language-subtag-registry.txt";
 
     public static void main(String[] args) throws IOException {
 
diff --git a/test/jdk/lib/testlibrary/java/lang/UCDFiles.java b/test/jdk/lib/testlibrary/java/lang/UCDFiles.java
index 10c6243f615..83054c5c0fb 100644
--- a/test/jdk/lib/testlibrary/java/lang/UCDFiles.java
+++ b/test/jdk/lib/testlibrary/java/lang/UCDFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,15 @@
 
 /**
  * Holds the file paths to the Unicode Character Database source files.
- * Paths to the source files in the "make" directory are relative, and
- * subject to change due to future repository structure re-org.
+ * Paths to the source files in the "data" directory are relative.
  */
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public class UCDFiles {
-    public static Path UCD_DIR = Paths.get(
-        System.getProperty("test.root"), "..", "..", "make", "data", "unicodedata");
+    public static Path UCD_DIR = Paths.get(System.getProperty("test.root"),
+        "../../src/java.base/share/data/unicodedata");
 
     public static Path BLOCKS =
         UCD_DIR.resolve("Blocks.txt");
diff --git a/test/jdk/sun/nio/cs/TestCharsetMapping.java b/test/jdk/sun/nio/cs/TestCharsetMapping.java
index 63eeba1774e..c7bd101aa42 100644
--- a/test/jdk/sun/nio/cs/TestCharsetMapping.java
+++ b/test/jdk/sun/nio/cs/TestCharsetMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -569,7 +569,7 @@ public class TestCharsetMapping {
 
     public static void main(String args[]) throws Exception {
         Path dir = Paths.get(System.getProperty("test.src", ".") +
-                             "/../../../../make/data/charsetmapping");
+                             "/../../../../src/java.base/share/data/charsetmapping");
         if (!Files.exists(dir)) {
             // not inside jdk repo, no mappings, exit silently
             log.println("Nothing done, not in a jdk repo: ");
diff --git a/test/jdk/sun/nio/cs/TestMS950.java b/test/jdk/sun/nio/cs/TestMS950.java
index 6d567e07751..36820f381a0 100644
--- a/test/jdk/sun/nio/cs/TestMS950.java
+++ b/test/jdk/sun/nio/cs/TestMS950.java
@@ -33,7 +33,7 @@ import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 public class TestMS950 {
-    // Data is listed from make/data/charsetmapping/MS950.map
+    // Data is listed from src/java.base/share/data/charsetmapping/MS950.map
     private final static String[] MS950B2C = new String[] {
         "0xF9FA  0x256D",
         "0xF9FB  0x256E",
diff --git a/test/jdk/sun/security/lib/CheckBlockedCerts.java b/test/jdk/sun/security/lib/CheckBlockedCerts.java
index e5561bf15b8..5afbf4b610b 100644
--- a/test/jdk/sun/security/lib/CheckBlockedCerts.java
+++ b/test/jdk/sun/security/lib/CheckBlockedCerts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ public class CheckBlockedCerts {
 
         // Assumes the full src is available
         File blockedCertsFile = new File(System.getProperty("test.src"),
-                "../../../../../make/data/blockedcertsconverter/blocked.certs.pem");
+                "../../../../../src/java.base/share/data/blockedcertsconverter/blocked.certs.pem");
 
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
         try (FileInputStream fis = new FileInputStream(blockedCertsFile)) {
diff --git a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
index 7b50c342a0d..ef6405860f5 100644
--- a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
+++ b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ public class TestZoneInfo310 {
 
         String TESTDIR = System.getProperty("test.dir", ".");
         Path tzdir = Paths.get(System.getProperty("test.root"),
-            "..", "..", "make", "data", "tzdata");
+            "../../src/java.base/share/data/tzdata");
         String tzfiles = "africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt";
         Path jdk_tzdir = Paths.get(System.getProperty("test.src"), "tzdata_jdk");
         String jdk_tzfiles = "jdk11_backward";
diff --git a/test/langtools/tools/javac/platform/CanHandleClassFilesTest.java b/test/langtools/tools/javac/platform/CanHandleClassFilesTest.java
index 8afdf54f40d..ae4f525e4ee 100644
--- a/test/langtools/tools/javac/platform/CanHandleClassFilesTest.java
+++ b/test/langtools/tools/javac/platform/CanHandleClassFilesTest.java
@@ -64,7 +64,7 @@ public class CanHandleClassFilesTest {
                 Path test = d.resolve("make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java");
                 if (Files.exists(test)) {
                     createSymbols = test;
-                    includeList = d.resolve("make/data/symbols/include.list");
+                    includeList = d.resolve("src/jdk.compiler/share/data/symbols/include.list");
                     break;
                 }
             }
diff --git a/test/langtools/tools/javac/sym/ElementStructureTest.java b/test/langtools/tools/javac/sym/ElementStructureTest.java
index db5ae5f4582..791785b2452 100644
--- a/test/langtools/tools/javac/sym/ElementStructureTest.java
+++ b/test/langtools/tools/javac/sym/ElementStructureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,7 @@ import toolbox.ToolBox;
 
 /**To generate the hash values for version N, invoke this class like:
  *
- *     java ElementStructureTest generate-hashes $LANGTOOLS_DIR/make/data/symbols/include.list (<classes-for-N> N)+
+ *     java ElementStructureTest generate-hashes $LANGTOOLS_DIR/src/jdk.compiler/share/data/symbols/include.list (<classes-for-N> N)+
  *
  * Where <classes-for-N> is the file produced by make/src/classes/build/tools/symbolgenerator/Probe.java.
  * So, to produce hashes for 6, 7 and 8, this command can be used:
@@ -113,11 +113,11 @@ import toolbox.ToolBox;
  *
  * To inspect differences between the actual and expected output for version N, invoke this class like:
  *
- *     java ElementStructureTest generate-output $LANGTOOLS_DIR/make/data/symbols/include.list (<classes-for-N> N <actual-output-file> <expected-output-file>)+
+ *     java ElementStructureTest generate-output $LANGTOOLS_DIR/src/jdk.compiler/share/data/symbols/include.list (<classes-for-N> N <actual-output-file> <expected-output-file>)+
  *
  * For example, to get the actual and expected output for 6 in /tmp/actual and /tmp/expected, respectively:
  *
- *     java ElementStructureTest generate-output $LANGTOOLS_DIR/make/data/symbols/include.list classes-6 6 /tmp/actual /tmp/expected
+ *     java ElementStructureTest generate-output $LANGTOOLS_DIR/src/jdk.compiler/share/data/symbols/include.list classes-6 6 /tmp/actual /tmp/expected
  */
 public class ElementStructureTest {
 
-- 
GitLab


From f3dc0c88ea00a3745f5f105404e0788a0f616407 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 22 Mar 2022 01:12:29 +0000
Subject: [PATCH 151/345] 8282721: HotSpot Style Guide should allow considered
 use of C++ thread_local

Reviewed-by: kbarrett, jrose, dcubed, stuefe, mdoerr, kvn
---
 doc/hotspot-style.html |  6 +++---
 doc/hotspot-style.md   | 34 +++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index 453b9fbc14b..c93b941c988 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -210,7 +210,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <p>Rationale: Other than to implement exceptions (which HotSpot doesn't use), most potential uses of <a href="https://en.wikipedia.org/wiki/Run-time_type_information" title="Runtime Type Information">RTTI</a> are better done via virtual functions. Some of the remainder can be replaced by bespoke mechanisms. The cost of the additional runtime data structures needed to support <a href="https://en.wikipedia.org/wiki/Run-time_type_information" title="Runtime Type Information">RTTI</a> are deemed not worthwhile, given the alternatives.</p>
 <h3 id="memory-allocation">Memory Allocation</h3>
 <p>Do not use the standard global allocation and deallocation functions (operator new and related functions). Use of these functions by HotSpot code is disabled for some platforms.</p>
-<p>Rationale: HotSpot often uses &quot;resource&quot; or &quot;arena&quot; allocation. Even where heap allocation is used, the standard global functions are avoided in favor of wrappers around malloc and free that support the VM's Native Memory Tracking (NMT) feature.</p>
+<p>Rationale: HotSpot often uses &quot;resource&quot; or &quot;arena&quot; allocation. Even where heap allocation is used, the standard global functions are avoided in favor of wrappers around malloc and free that support the VM's Native Memory Tracking (NMT) feature. Typically, uses of the global operator new are inadvertent and therefore often associated with memory leaks.</p>
 <p>Native memory allocation failures are often treated as non-recoverable. The place where &quot;out of memory&quot; is (first) detected may be an innocent bystander, unrelated to the actual culprit.</p>
 <h3 id="class-inheritance">Class Inheritance</h3>
 <p>Use public single inheritance.</p>
@@ -270,8 +270,8 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <p>The underlying type of a <em>scoped-enum</em> should also be specified explicitly if conversions may be applied to values of that type.</p>
 <p>Due to bugs in certain (very old) compilers, there is widespread use of enums and avoidance of in-class initialization of static integral constant members. Compilers having such bugs are no longer supported. Except where an enum is semantically appropriate, new code should use integral constants.</p>
 <h3 id="thread_local">thread_local</h3>
-<p>Do not use <code>thread_local</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm">n2659</a>); instead, use the HotSpot macro <code>THREAD_LOCAL</code>. The initializer must be a constant expression.</p>
-<p>As was discussed in the review for <a href="https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html">JDK-8230877</a>, <code>thread_local</code> allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local <code>thread_local</code> variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of namespace-scoped thread local variables also has the same ordering problems as for ordinary namespace-scoped variables.</p>
+<p>Avoid use of <code>thread_local</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm">n2659</a>); and instead, use the HotSpot macro <code>THREAD_LOCAL</code>, for which the initializer must be a constant expression. When <code>thread_local</code> must be used, use the Hotspot macro <code>APPROVED_CPP_THREAD_LOCAL</code> to indicate that the use has been given appropriate consideration.</p>
+<p>As was discussed in the review for <a href="https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html">JDK-8230877</a>, <code>thread_local</code> allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local <code>thread_local</code> variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of non-local <code>thread_local</code> variables also has the same ordering problems as for ordinary non-local variables. So we avoid use of <code>thread_local</code> in general, limiting its use to only those cases where dynamic initialization or destruction are essential. See <a href="https://bugs.openjdk.java.net/browse/JDK-8282469">JDK-8282469</a> for further discussion.</p>
 <h3 id="nullptr">nullptr</h3>
 <p>Prefer <code>nullptr</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf">n2431</a>) to <code>NULL</code>. Don't use (constexpr or literal) 0 for pointers.</p>
 <p>For historical reasons there are widespread uses of both <code>NULL</code> and of integer 0 as a pointer value.</p>
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 84cb22a1bda..89d9684672d 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -471,7 +471,9 @@ code is disabled for some platforms.
 Rationale: HotSpot often uses "resource" or "arena" allocation.  Even
 where heap allocation is used, the standard global functions are
 avoided in favor of wrappers around malloc and free that support the
-VM's Native Memory Tracking (NMT) feature.
+VM's Native Memory Tracking (NMT) feature.  Typically, uses of the global
+operator new are inadvertent and therefore often associated with memory
+leaks.
 
 Native memory allocation failures are often treated as non-recoverable.
 The place where "out of memory" is (first) detected may be an innocent
@@ -631,7 +633,7 @@ Here are a few closely related example bugs:<br>
 ### enum
 
 Where appropriate, _scoped-enums_ should be used.
-([n2347](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf)) 
+([n2347](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf))
 
 Use of _unscoped-enums_ is permitted, though ordinary constants may be
 preferable when the automatic initializer feature isn't used.
@@ -651,10 +653,12 @@ integral constants.
 
 ### thread_local
 
-Do not use `thread_local`
+Avoid use of `thread_local`
 ([n2659](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm));
-instead, use the HotSpot macro `THREAD_LOCAL`.  The initializer must
-be a constant expression.
+and instead, use the HotSpot macro `THREAD_LOCAL`, for which the initializer must
+be a constant expression. When `thread_local` must be used, use the Hotspot macro
+`APPROVED_CPP_THREAD_LOCAL` to indicate that the use has been given appropriate
+consideration.
 
 As was discussed in the review for
 [JDK-8230877](https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html),
@@ -663,14 +667,18 @@ semantics.  However, that support requires a run-time penalty for
 references to non-function-local `thread_local` variables defined in a
 different translation unit, even if they don't need dynamic
 initialization.  Dynamic initialization and destruction of
-namespace-scoped thread local variables also has the same ordering
-problems as for ordinary namespace-scoped variables.
+non-local `thread_local` variables also has the same ordering
+problems as for ordinary non-local variables. So we avoid use of
+`thread_local` in general, limiting its use to only those cases where dynamic
+initialization or destruction are essential. See
+[JDK-8282469](https://bugs.openjdk.java.net/browse/JDK-8282469)
+for further discussion.
 
 ### nullptr
 
 Prefer `nullptr`
 ([n2431](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf))
-to `NULL`.  Don't use (constexpr or literal) 0 for pointers. 
+to `NULL`.  Don't use (constexpr or literal) 0 for pointers.
 
 For historical reasons there are widespread uses of both `NULL` and of
 integer 0 as a pointer value.
@@ -939,7 +947,7 @@ References:
 * Generalized lambda capture (init-capture) ([N3648])
 * Generic (polymorphic) lambda expressions ([N3649])
 
-[n2657]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm 
+[n2657]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm
 [n2927]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2927.pdf
 [N3648]: https://isocpp.org/files/papers/N3648.html
 [N3649]: https://isocpp.org/files/papers/N3649.html
@@ -980,7 +988,7 @@ References from C++23
 ### Additional Permitted Features
 
 * `constexpr`
-([n2235](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf)) 
+([n2235](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf))
 ([n3652](https://isocpp.org/files/papers/N3652.html))
 
 * Sized deallocation
@@ -1087,14 +1095,14 @@ in HotSpot code because of the "no implicit boolean" guideline.)
 
 * Avoid covariant return types.
 
-* Avoid `goto` statements. 
+* Avoid `goto` statements.
 
 ### Undecided Features
 
 This list is incomplete; it serves to explicitly call out some
 features that have not yet been discussed.
 
-* Trailing return type syntax for functions 
+* Trailing return type syntax for functions
 ([n2541](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm))
 
 * Variable templates
@@ -1108,7 +1116,7 @@ features that have not yet been discussed.
 
 * Rvalue references and move semantics
 
-[ADL]: https://en.cppreference.com/w/cpp/language/adl 
+[ADL]: https://en.cppreference.com/w/cpp/language/adl
   "Argument Dependent Lookup"
 
 [ODR]: https://en.cppreference.com/w/cpp/language/definition
-- 
GitLab


From 81d63734bc2e2a18063cb6afbc53f8813a0ba880 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 22 Mar 2022 01:20:31 +0000
Subject: [PATCH 152/345] 8282469: Allow considered use of C++ thread_local in
 Hotspot

Reviewed-by: kbarrett, dcubed
---
 src/hotspot/share/memory/operator_new.cpp     | 100 ------------------
 .../share/utilities/globalDefinitions.hpp     |   4 +
 2 files changed, 4 insertions(+), 100 deletions(-)
 delete mode 100644 src/hotspot/share/memory/operator_new.cpp

diff --git a/src/hotspot/share/memory/operator_new.cpp b/src/hotspot/share/memory/operator_new.cpp
deleted file mode 100644
index 357e26f9c88..00000000000
--- a/src/hotspot/share/memory/operator_new.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "utilities/debug.hpp"
-
-#include <new>
-
-//--------------------------------------------------------------------------------------
-// Non-product code
-
-#ifndef PRODUCT
-// The global operator new should never be called since it will usually indicate
-// a memory leak.  Use CHeapObj as the base class of such objects to make it explicit
-// that they're allocated on the C heap.
-// Commented out in product version to avoid conflicts with third-party C++ native code.
-//
-// In C++98/03 the throwing new operators are defined with the following signature:
-//
-// void* operator new(std::size_tsize) throw(std::bad_alloc);
-// void* operator new[](std::size_tsize) throw(std::bad_alloc);
-//
-// while all the other (non-throwing) new and delete operators are defined with an empty
-// throw clause (i.e. "operator delete(void* p) throw()") which means that they do not
-// throw any exceptions (see section 18.4 of the C++ standard).
-//
-// In the new C++11/14 standard, the signature of the throwing new operators was changed
-// by completely omitting the throw clause (which effectively means they could throw any
-// exception) while all the other new/delete operators where changed to have a 'nothrow'
-// clause instead of an empty throw clause.
-//
-// Unfortunately, the support for exception specifications among C++ compilers is still
-// very fragile. While some more strict compilers like AIX xlC or HP aCC reject to
-// override the default throwing new operator with a user operator with an empty throw()
-// clause, the MS Visual C++ compiler warns for every non-empty throw clause like
-// throw(std::bad_alloc) that it will ignore the exception specification. The following
-// operator definitions have been checked to correctly work with all currently supported
-// compilers and they should be upwards compatible with C++11/14. Therefore
-// PLEASE BE CAREFUL if you change the signature of the following operators!
-
-static void * zero = (void *) 0;
-
-void* operator new(size_t size) /* throw(std::bad_alloc) */ {
-  fatal("Should not call global operator new");
-  return zero;
-}
-
-void* operator new [](size_t size) /* throw(std::bad_alloc) */ {
-  fatal("Should not call global operator new[]");
-  return zero;
-}
-
-void* operator new(size_t size, const std::nothrow_t&  nothrow_constant) throw() {
-  fatal("Should not call global operator new");
-  return 0;
-}
-
-void* operator new [](size_t size, std::nothrow_t&  nothrow_constant) throw() {
-  fatal("Should not call global operator new[]");
-  return 0;
-}
-
-void operator delete(void* p) throw() {
-  fatal("Should not call global delete");
-}
-
-void operator delete [](void* p) throw() {
-  fatal("Should not call global delete []");
-}
-
-void operator delete(void* p, size_t size) throw() {
-  fatal("Should not call global sized delete");
-}
-
-void operator delete [](void* p, size_t size) throw() {
-  fatal("Should not call global sized delete []");
-}
-
-#endif // Non-product
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 1b0b90e70fc..fdd3db8875a 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -1219,5 +1219,9 @@ template<typename K> bool primitive_equals(const K& k0, const K& k1) {
   return k0 == k1;
 }
 
+//----------------------------------------------------------------------------------------------------
+
+// Allow use of C++ thread_local when approved - see JDK-8282469.
+#define APPROVED_CPP_THREAD_LOCAL thread_local
 
 #endif // SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
-- 
GitLab


From 849b19523a666bd2ec110876bfd5679b20be77f4 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Tue, 22 Mar 2022 01:28:06 +0000
Subject: [PATCH 153/345] 8282937: Write a regression test for JDK-4820080

Reviewed-by: serb
---
 .../4820080/JSplitPaneDragColorTest.java      | 205 ++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 test/jdk/javax/swing/JSplitPane/4820080/JSplitPaneDragColorTest.java

diff --git a/test/jdk/javax/swing/JSplitPane/4820080/JSplitPaneDragColorTest.java b/test/jdk/javax/swing/JSplitPane/4820080/JSplitPaneDragColorTest.java
new file mode 100644
index 00000000000..7e107f1265c
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/4820080/JSplitPaneDragColorTest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.event.InputEvent;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import javax.imageio.ImageIO;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+/*
+ * @test
+ * @key headful
+ * @bug 4820080
+ * @summary This test confirms that the Drag color of JSplitPane divider should
+ *          be the user specified one(Red here).
+ * @run main JSplitPaneDragColorTest
+ */
+public class JSplitPaneDragColorTest {
+
+    // Tolerance is set inorder to negate small differences in pixel color values,
+    // especially in Mac machines.
+    private final static int COLOR_TOLERANCE = 9;
+    private static final Color EXPECTED_DRAG_COLOR = Color.RED;
+    private static JFrame frame;
+    private static JSplitPane pane;
+    private static Robot robot;
+
+    public static void main(String[] args) throws Exception {
+
+        robot = new Robot();
+        robot.setAutoWaitForIdle(true);
+        robot.setAutoDelay(200);
+        // Skipping NimbusLookAndFeel & GTKLookAndFeel,
+        // as both are not supported for this feature - JDK-8075914, JDK-8075608
+        List<String> lafs = Arrays.stream(getInstalledLookAndFeels())
+                .filter(laf -> !(laf.getName().contains("GTK")
+                        || laf.getName().contains("Nimbus")))
+                .map(LookAndFeelInfo::getClassName)
+                .collect(Collectors.toList());
+        for (final String laf : lafs) {
+            try {
+                AtomicBoolean lafSetSuccess = new AtomicBoolean(false);
+                SwingUtilities.invokeAndWait(() -> {
+                    lafSetSuccess.set(setLookAndFeel(laf));
+                    if (lafSetSuccess.get()) {
+                        createUI();
+                    }
+                });
+                if (!lafSetSuccess.get()) {
+                    continue;
+                }
+                robot.waitForIdle();
+
+                Rectangle dividerRect = getDividerRect();
+
+                // Mouse click and right drag split pane divider
+                robot.mouseMove(dividerRect.x + 5, dividerRect.y + 36);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseMove(dividerRect.x + 15, dividerRect.y + 36);
+                robot.mouseMove(dividerRect.x + 5, dividerRect.y + 36);
+
+                // Get the color of one of the pixels of the splitpane divider
+                // after the drag has started. Ideally it should be the
+                // SplitPaneDivider.draggingColor set by user, otherwise the test fails
+                final Color actualDragColor = robot.getPixelColor(dividerRect.x + 2,
+                        dividerRect.y + 2);
+                if (checkDragColor(actualDragColor)) {
+                    System.out.println("Test passed in " + laf);
+                } else {
+                    System.out.print("Expected pixel color = ");
+                    System.out.printf("%X", EXPECTED_DRAG_COLOR.getRGB());
+                    System.out.print(", but actual color = ");
+                    System.out.printf("%X", actualDragColor.getRGB());
+                    System.out.println();
+                    captureScreen();
+                    throw new RuntimeException("Test failed, drag color is wrong in "
+                            + laf);
+                }
+            } finally {
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+                SwingUtilities.invokeAndWait(JSplitPaneDragColorTest::disposeFrame);
+            }
+        }
+    }
+
+    private static boolean checkDragColor(Color actualDragColor) {
+        int actualRed = actualDragColor.getRed();
+        int actualGreen = actualDragColor.getGreen();
+        int actualBlue = actualDragColor.getBlue();
+        int expectedRed = EXPECTED_DRAG_COLOR.getRed();
+        int expectedGreen = EXPECTED_DRAG_COLOR.getGreen();
+        int expectedBlue = EXPECTED_DRAG_COLOR.getBlue();
+
+        final double tolerance = Math.sqrt(
+                (actualRed - expectedRed) * (actualRed - expectedRed) +
+                        (actualGreen - expectedGreen) * (actualGreen - expectedGreen) +
+                        (actualBlue - expectedBlue) * (actualBlue - expectedBlue));
+        return (tolerance <= COLOR_TOLERANCE);
+    }
+
+    private static Rectangle getDividerRect() {
+        final AtomicReference<Rectangle> rect = new AtomicReference<>();
+        SwingUtilities.invokeLater(() -> {
+            javax.swing.plaf.basic.BasicSplitPaneUI ui =
+                    (javax.swing.plaf.basic.BasicSplitPaneUI) pane.getUI();
+
+            javax.swing.plaf.basic.BasicSplitPaneDivider divider = ui.getDivider();
+            Point dividerLoc = divider.getLocationOnScreen();
+            rect.set(new Rectangle(dividerLoc.x, dividerLoc.y, divider.getWidth(),
+                    divider.getHeight()));
+        });
+        robot.waitForIdle();
+        return rect.get();
+    }
+
+    private static void captureScreen() {
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        try {
+            ImageIO.write(
+                    robot.createScreenCapture(new Rectangle(0, 0,
+                            screenSize.width,
+                            screenSize.height)),
+                    "png",
+                    new File("screen1.png")
+            );
+        } catch (IOException ignore) {
+        }
+    }
+
+    private static void createUI() {
+        frame = new JFrame();
+        UIManager.put("SplitPaneDivider.draggingColor", EXPECTED_DRAG_COLOR);
+        JLabel l1 = new JLabel("LEFT  LABEL", JLabel.CENTER);
+        JLabel l2 = new JLabel("RIGHT LABEL", JLabel.CENTER);
+        pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, l1, l2);
+        frame.setSize(400, 400);
+        pane.setDividerSize(15);
+        pane.setDividerLocation(frame.getSize().width / 2);
+        frame.getContentPane().add(pane, BorderLayout.CENTER);
+        frame.setLocationRelativeTo(null);
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        frame.setVisible(true);
+    }
+
+    private static boolean setLookAndFeel(String lafName) {
+        try {
+            UIManager.setLookAndFeel(lafName);
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Ignoring Unsupported L&F: " + lafName);
+            return false;
+        } catch (ClassNotFoundException | InstantiationException
+                | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+    private static void disposeFrame() {
+        if (frame != null) {
+            frame.dispose();
+            frame = null;
+        }
+    }
+
+}
-- 
GitLab


From 37fc77ef60dd97c4acc468ecfeb6753132974720 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Tue, 22 Mar 2022 07:54:41 +0000
Subject: [PATCH 154/345] 8283092: JMX subclass permission check redundant with
 strong encapsulation

Reviewed-by: dfuchs, mchung
---
 .../lang/management/ManagementFactory.java    |   3 +-
 .../management/spi/PlatformMBeanProvider.java |  18 +--
 .../jdk/internal/agent/spi/AgentProvider.java |  19 +---
 ...PlatformMBeanProviderConstructorCheck.java | 103 ++++++++++--------
 4 files changed, 63 insertions(+), 80 deletions(-)

diff --git a/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
index 13db85d0f09..375f0ebb719 100644
--- a/src/java.management/share/classes/java/lang/management/ManagementFactory.java
+++ b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
@@ -936,8 +936,7 @@ public class ManagementFactory {
                         all.add(new DefaultPlatformMBeanProvider());
                         return all;
                     }
-                }, null, new FilePermission("<<ALL FILES>>", "read"),
-                new RuntimePermission("sun.management.spi.PlatformMBeanProvider.subclass"));
+                }, null, new FilePermission("<<ALL FILES>>", "read"));
 
             // load all platform components into a map
             var map = new HashMap<String, PlatformComponent<?>>();
diff --git a/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java b/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java
index 93779f0a811..12472cabfcc 100644
--- a/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java
+++ b/src/java.management/share/classes/sun/management/spi/PlatformMBeanProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -203,15 +203,8 @@ public abstract class PlatformMBeanProvider {
 
     /**
      * Instantiates a new PlatformMBeanProvider.
-     *
-     * @throws SecurityException if the subclass (and calling code) does not
-     *    have {@code RuntimePermission("sun.management.spi.PlatformMBeanProvider.subclass")}
      */
     protected PlatformMBeanProvider () {
-        this(checkSubclassPermission());
-    }
-
-    private PlatformMBeanProvider(Void unused) {
     }
 
     /**
@@ -222,13 +215,4 @@ public abstract class PlatformMBeanProvider {
      * MBeans provided by this provider.
      */
     public abstract List<PlatformComponent<?>> getPlatformComponentList();
-
-    private static Void checkSubclassPermission() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission(PlatformMBeanProvider.class.getName()+".subclass"));
-        }
-        return null;
-    }
 }
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java
index ea42d597486..395961cad96 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,25 +33,8 @@ public abstract class AgentProvider {
 
     /**
      * Instantiates a new AgentProvider.
-     *
-     * @throws SecurityException if the subclass (and calling code) does not
-     * have
-     * {@code RuntimePermission("sun.management.spi.AgentProvider.subclass")}
      */
     protected AgentProvider() {
-        this(checkSubclassPermission());
-    }
-
-    private AgentProvider(Void unused) {
-    }
-
-    private static Void checkSubclassPermission() {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission(AgentProvider.class.getName() + ".subclass"));
-        }
-        return null;
     }
 
     /**
diff --git a/test/jdk/sun/management/PlatformMBeanProviderConstructorCheck.java b/test/jdk/sun/management/PlatformMBeanProviderConstructorCheck.java
index b7b4edc8c98..16fee912a7c 100644
--- a/test/jdk/sun/management/PlatformMBeanProviderConstructorCheck.java
+++ b/test/jdk/sun/management/PlatformMBeanProviderConstructorCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,63 +21,79 @@
  * questions.
  */
 
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.security.Policy;
-import java.security.ProtectionDomain;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
 import java.util.List;
 
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import static jdk.test.lib.Asserts.*;
+
 /*
  * @test
- * @bug     8042901
- * @summary Check permission for PlatformMBeanProvider Constructor
+ * @library /test/lib
+ * @build  jdk.test.lib.Asserts
+ * @bug     8042901 8283092
+ * @summary Check encapsulation of PlatformMBeanProvider Constructor
  * @modules java.management/sun.management.spi
- * @author  Shanliang Jiang
- * @run main/othervm -Djava.security.manager=allow PlatformMBeanProviderConstructorCheck
+ * @run main PlatformMBeanProviderConstructorCheck
  */
 public class PlatformMBeanProviderConstructorCheck {
-    public static void main(String[] args) throws Exception {
-        Policy origPolicy = Policy.getPolicy();
-        SecurityManager origSM = System.getSecurityManager();
-        try {
-            System.out.println("---PlatformMBeanProviderConstructorCheck starting...");
 
-            Policy.setPolicy(new MyPolicy());
-            System.setSecurityManager(new SecurityManager());
+    /**
+     * jtreg invokes this test with module arguments that permit compilation
+     * of the MyProvider class, which extends PlatformMBeanProvider.
+     * First check we can invoke that class, then re-invoke ourself without
+     * those module arguments, and expect a failure calling MyProvider.
+     */
+    public static void main(String[] args) throws Exception {
+        System.out.println("---PlatformMBeanProviderConstructorCheck:");
+        boolean expectedFail = false;
 
-            System.out.println("---PlatformMBeanProviderConstructorCheck Testing without permission...");
-            try {
-                new MyProvider();
-                throw new RuntimeException("Does not get expected AccessControlException!");
-            } catch (AccessControlException ace) {
-                System.out.println("---PlatformMBeanProviderConstructorCheck got the expected exception: "
-                        + ace);
+        // Recognise argument to signify we were re-invoked, and MyProvider should fail:
+        if (args.length == 1) {
+            if (args[0].equals("--nomoduleargs")) {
+                expectedFail = true;
+                verifyNoModuleArguments();
+            } else {
+                throw new RuntimeException("unknown argument: '" + args[0] + "'");
             }
-
-            System.out.println("---PlatformMBeanProviderConstructorCheck Testing with permission...");
-            MyPolicy.allowed = true;
+        }
+        System.out.println("---PlatformMBeanProviderConstructorCheck: invoke MyProvider with expectedFail = " + expectedFail);
+        Throwable e = null;
+        try {
             new MyProvider();
-
-            System.out.println("---PlatformMBeanProviderConstructorCheck PASSED!");
-        } finally {
-            System.setSecurityManager(origSM);
-            Policy.setPolicy(origPolicy);
+        } catch (IllegalAccessError iae) {
+            System.out.println("---PlatformMBeanProviderConstructorCheck got exception: " + iae);
+            e = iae;
         }
-    }
 
-    private static class MyPolicy extends Policy {
-        private static String permName = "sun.management.spi.PlatformMBeanProvider.subclass";
-        private static boolean allowed = false;
+        if (!expectedFail) {
+            // This was the first invocation, should have worked OK:
+            assertNull(e);
+            System.out.println("---PlatformMBeanProviderConstructorCheck PASSED (1) (expectedFail = " + expectedFail + ")");
 
-        @Override
-        public boolean implies(ProtectionDomain domain, Permission permission) {
-            if (permName.equals(permission.getName())) {
-                System.out.println("---MyPolicy-implies checks permission for "
-                        +permName+" and returns "+allowed);
+            // Re-invoke this test to check failure:
+            System.out.println("---PlatformMBeanProviderConstructorCheck: re-invoke without --add-modules or --add-exports");
+            OutputAnalyzer output =  ProcessTools.executeTestJava("PlatformMBeanProviderConstructorCheck", "--nomoduleargs");
+            output.reportDiagnosticSummary();
+            output.shouldContain("java.lang.IllegalAccessError: superclass access check failed:");
+            output.shouldContain(" module java.management does not export sun.management.spi to ");
+            output.shouldNotContain("MyProvider constructor.");
+        } else {
+            // This was the re-invocation without module access, should fail:
+            assertNotNull(e);
+            System.out.println("---PlatformMBeanProviderConstructorCheck PASSED (2) (expectedFail = " + expectedFail + ")");
+        }
+    }
 
-                return allowed;
-            } else {
-                return true;
+    private static void verifyNoModuleArguments() {
+        RuntimeMXBean mxbean = ManagementFactory.getRuntimeMXBean();
+        for (String s : mxbean.getInputArguments()) {
+            if (s.startsWith("--add-modules") || s.startsWith("--add-exports")) {
+                System.out.println("arg: " + s);
+                throw new RuntimeException("argument list contains: " + s);
             }
         }
     }
@@ -85,6 +101,7 @@ public class PlatformMBeanProviderConstructorCheck {
     private static class MyProvider extends sun.management.spi.PlatformMBeanProvider {
         @Override
         public List<PlatformComponent<?>> getPlatformComponentList() {
+            System.out.println("MyProvider constructor.");
             return null;
         }
     }
-- 
GitLab


From a6fd0b21ddc1575366eed8d47191f6b14b2d7cb6 Mon Sep 17 00:00:00 2001
From: Srinivas Mandalika <smandalika@openjdk.org>
Date: Tue, 22 Mar 2022 09:20:12 +0000
Subject: [PATCH 155/345] 8283087: Create a test or JDK-4715503

Reviewed-by: serb
---
 ...ssibleJTableCellBoundingRectangleTest.java | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 test/jdk/javax/accessibility/4715503/AccessibleJTableCellBoundingRectangleTest.java

diff --git a/test/jdk/javax/accessibility/4715503/AccessibleJTableCellBoundingRectangleTest.java b/test/jdk/javax/accessibility/4715503/AccessibleJTableCellBoundingRectangleTest.java
new file mode 100644
index 00000000000..716925a51e6
--- /dev/null
+++ b/test/jdk/javax/accessibility/4715503/AccessibleJTableCellBoundingRectangleTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key headful
+ * @bug 4715503
+ * @summary AccessibleTable cannot get the Bounding Rectangle of Table Header Cells.
+ * @run main AccessibleJTableCellBoundingRectangleTest
+ */
+
+import java.awt.Rectangle;
+import java.awt.Robot;
+
+import javax.swing.JFrame;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+
+public class AccessibleJTableCellBoundingRectangleTest {
+    private static JTable jTable;
+    private static JFrame jFrame;
+
+    private static Object[][] rowData = { { "01", "02", "03", "04", "05" },
+        { "11", "12", "13", "14", "15" }, { "21", "22", "23", "24", "25" },
+        { "31", "32", "33", "34", "35" }, { "41", "42", "43", "44", "45" } };
+
+    private static Object[] colNames = { "1", "2", "3", "4", "5" };
+
+    private static void doTest() throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> createGUI());
+            Robot robot = new Robot();
+            robot.setAutoDelay(500);
+            robot.waitForIdle();
+
+            for (int i = 0; i <= colNames.length - 1; i++) {
+                try {
+                    Rectangle bounds =
+                        jTable.getTableHeader().getAccessibleContext().getAccessibleChild(i)
+                        .getAccessibleContext().getAccessibleComponent().getBounds();
+
+                    if (bounds != null) {
+                        System.out.println("Column " + i + " Bounds: " + bounds);
+                    } else {
+                        throw new RuntimeException(
+                            "Bounding Rectangles getting bounding rectangle for table header cells is null");
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException("Bounding Rectangles getting bounding rectangle for "
+                        + "table header cells threw an exception:\n" + e);
+                }
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> jFrame.dispose());
+        }
+    }
+
+    private static void createGUI() {
+        jTable = new JTable(rowData, colNames);
+        jFrame = new JFrame();
+        jFrame.setBounds(100, 100, 300, 300);
+        jFrame.getContentPane().add(jTable);
+        jFrame.setVisible(true);
+    }
+
+    public static void main(String args[]) throws Exception {
+        doTest();
+        System.out.println("Test Passed");
+    }
+}
+
-- 
GitLab


From 85628a871df3fdeec1b422d1c01c222abe45d0a8 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 22 Mar 2022 10:34:33 +0000
Subject: [PATCH 156/345] 8282592: C2: assert(false) failed: graph should be
 schedulable

Reviewed-by: chagedorn, thartmann
---
 src/hotspot/share/opto/loopTransform.cpp      |  6 ++
 src/hotspot/share/opto/loopopts.cpp           |  2 +
 .../c2/irTests/TestSkeletonPredicates.java    | 78 +++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/c2/irTests/TestSkeletonPredicates.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 4257b0fd6e5..dc9c2064ed9 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1954,6 +1954,12 @@ bool IdealLoopTree::is_invariant(Node* n) const {
 }
 
 void PhaseIdealLoop::update_main_loop_skeleton_predicates(Node* ctrl, CountedLoopNode* loop_head, Node* init, int stride_con) {
+  if (init->Opcode() == Op_CastII) {
+    // skip over the cast added by PhaseIdealLoop::cast_incr_before_loop() when pre/post/main loops are created because
+    // it can get in the way of type propagation
+    assert(((CastIINode*)init)->carry_dependency() && loop_head->skip_predicates() == init->in(0), "casted iv phi from pre loop expected");
+    init = init->in(1);
+  }
   // Search for skeleton predicates and update them according to the new stride
   Node* entry = ctrl;
   Node* prev_proj = ctrl;
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index a7c82ad2ee1..dc9cddfdabf 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -3828,6 +3828,8 @@ void PhaseIdealLoop::reorg_offsets(IdealLoopTree *loop) {
       set_ctrl(neg_stride, C->root());
       Node *post = new AddINode(opaq, neg_stride);
       register_new_node(post, c);
+      post = new CastIINode(post, phi->bottom_type()); // preserve the iv phi's type
+      register_new_node(post, c);
       _igvn.rehash_node_delayed(use);
       for (uint j = 1; j < use->req(); j++) {
         if (use->in(j) == phi)
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestSkeletonPredicates.java b/test/hotspot/jtreg/compiler/c2/irTests/TestSkeletonPredicates.java
new file mode 100644
index 00000000000..79bcd16cfb2
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestSkeletonPredicates.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022, 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.
+ */
+
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Utils;
+import java.util.Random;
+
+/*
+ * @test
+ * @bug 8278228
+ * @summary C2: Improve identical back-to-back if elimination
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestSkeletonPredicates
+ */
+
+public class TestSkeletonPredicates {
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("-XX:-UseLoopPredicate", "-XX:LoopUnrollLimit=240", "-XX:+StressIGVN", "-XX:StressSeed=255527877");
+        TestFramework.runWithFlags("-XX:-UseLoopPredicate", "-XX:LoopUnrollLimit=240", "-XX:+StressIGVN");
+    }
+
+    static volatile int barrier;
+
+    @ForceInline
+    static boolean test1_helper(int start, int stop, double[] array1, double[] array2) {
+        for (int i = start; i < stop; i++) {
+            if ((i % 2) == 0) {
+                array1[i] = 42.42;
+            } else {
+                barrier = 0x42;
+            }
+        }
+        return false;
+    }
+
+    @Test
+    @IR(counts = { IRNode.COUNTEDLOOP, "3" })
+    static double[] test1(int stop, double[] array2) {
+        double[] array1 = null;
+        array1 = new double[10];
+        for (int j = 0; j < stop; j++) {
+            if (test1_helper(8, j, array1, array2)) {
+                return null;
+            }
+        }
+        return array1;
+    }
+
+    @Run(test = "test1")
+    void test1_runner() {
+        double[] array2 = new double[10];
+        double[] array3 = new double[1000];
+        test1_helper(1, 1000, array3, array3);
+        test1(11, array3);
+    }
+}
-- 
GitLab


From c0f984e5fbba7b44fa7b0a4309896ef9ccb4e666 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Tue, 22 Mar 2022 13:30:26 +0000
Subject: [PATCH 157/345] 8283456: Make
 CompiledICHolder::live_count/live_not_claimed_count debug only

Reviewed-by: dholmes
---
 src/hotspot/share/oops/compiledICHolder.cpp | 5 +++--
 src/hotspot/share/oops/compiledICHolder.hpp | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/oops/compiledICHolder.cpp b/src/hotspot/share/oops/compiledICHolder.cpp
index a285998a236..c6ca6be2030 100644
--- a/src/hotspot/share/oops/compiledICHolder.cpp
+++ b/src/hotspot/share/oops/compiledICHolder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,10 @@
 #include "oops/compiledICHolder.hpp"
 #include "runtime/atomic.hpp"
 
+#ifdef ASSERT
 volatile int CompiledICHolder::_live_count;
 volatile int CompiledICHolder::_live_not_claimed_count;
-
+#endif
 
 CompiledICHolder::CompiledICHolder(Metadata* metadata, Klass* klass, bool is_method)
   : _holder_metadata(metadata), _holder_klass(klass), _is_metadata_method(is_method) {
diff --git a/src/hotspot/share/oops/compiledICHolder.hpp b/src/hotspot/share/oops/compiledICHolder.hpp
index b3d0c8715bf..5ddcf07d9ce 100644
--- a/src/hotspot/share/oops/compiledICHolder.hpp
+++ b/src/hotspot/share/oops/compiledICHolder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,11 @@
 class CompiledICHolder : public CHeapObj<mtCompiler> {
   friend class VMStructs;
  private:
+#ifdef ASSERT
   static volatile int _live_count; // allocated
   static volatile int _live_not_claimed_count; // allocated but not yet in use so not
                                                // reachable by iterating over nmethods
+#endif
 
   Metadata* _holder_metadata;
   Klass*    _holder_klass;    // to avoid name conflict with oopDesc::_klass
@@ -58,8 +60,10 @@ class CompiledICHolder : public CHeapObj<mtCompiler> {
   CompiledICHolder(Metadata* metadata, Klass* klass, bool is_method = true);
   ~CompiledICHolder() NOT_DEBUG_RETURN;
 
+#ifdef ASSERT
   static int live_count() { return _live_count; }
   static int live_not_claimed_count() { return _live_not_claimed_count; }
+#endif
 
   // accessors
   Klass*    holder_klass()  const     { return _holder_klass; }
-- 
GitLab


From fabde3b7b8ed5e576febe8138c14696ccdf636d5 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 22 Mar 2022 14:06:49 +0000
Subject: [PATCH 158/345] 8283451: C2: assert(_base == Long) failed: Not a Long

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/phaseX.cpp             |  4 +-
 .../jtreg/compiler/c2/TestModDivTopInput.java | 78 +++++++++++++++++++
 2 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestModDivTopInput.java

diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 0589d1eab0c..9df9a18dbf7 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1691,7 +1691,7 @@ bool PhaseIterGVN::no_dependent_zero_check(Node* n) const {
     case Op_DivI:
     case Op_ModI: {
       // Type of divisor includes 0?
-      if (n->in(2)->is_top()) {
+      if (type(n->in(2)) == Type::TOP) {
         // 'n' is dead. Treat as if zero check is still there to avoid any further optimizations.
         return false;
       }
@@ -1701,7 +1701,7 @@ bool PhaseIterGVN::no_dependent_zero_check(Node* n) const {
     case Op_DivL:
     case Op_ModL: {
       // Type of divisor includes 0?
-      if (n->in(2)->is_top()) {
+      if (type(n->in(2)) == Type::TOP) {
         // 'n' is dead. Treat as if zero check is still there to avoid any further optimizations.
         return false;
       }
diff --git a/test/hotspot/jtreg/compiler/c2/TestModDivTopInput.java b/test/hotspot/jtreg/compiler/c2/TestModDivTopInput.java
new file mode 100644
index 00000000000..9e4ba1dd6f0
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestModDivTopInput.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022, 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 8283451
+ * @summary C2: assert(_base == Long) failed: Not a Long
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressLCM -XX:+StressGCM -XX:+StressCCP -XX:+StressIGVN
+ *                   -Xcomp -XX:CompileOnly=TestModDivTopInput -XX:-TieredCompilation -XX:StressSeed=87628618 TestModDivTopInput
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+StressLCM -XX:+StressGCM -XX:+StressCCP -XX:+StressIGVN
+ *                   -Xcomp -XX:CompileOnly=TestModDivTopInput -XX:-TieredCompilation TestModDivTopInput
+ */
+
+public class TestModDivTopInput {
+
+    public static final int N = 400;
+
+    public static float fFld=-2.447F;
+    public long lFld=-189L;
+
+    public void mainTest(String[] strArr1) {
+
+        int i18, i20=-14, i21, iArr2[]=new int[N];
+        boolean b2=true;
+        double d2;
+        long l;
+
+        init(iArr2, -13265);
+
+        for (i18 = 13; i18 < 315; ++i18) {
+            if (b2) continue;
+            for (d2 = 5; d2 < 83; d2++) {
+            }
+            for (i21 = 4; i21 < 83; i21++) {
+                for (l = 1; 2 > l; l++) {
+                }
+                b2 = b2;
+                lFld %= (i20 | 1);
+                i20 = (int)fFld;
+                i20 += (int)d2;
+            }
+        }
+    }
+
+    public static void main(String[] strArr) {
+        TestModDivTopInput _instance = new TestModDivTopInput();
+        for (int i = 0; i < 10; i++ ) {
+            _instance.mainTest(strArr);
+        }
+    }
+
+    static void init(int[] arr, int v) {
+        for (int i = 0; i < arr.length; i++) {
+            arr[i] = v;
+        }
+    }
+
+}
-- 
GitLab


From 557ff4b3558f95723ebaff680b8524b0cb979559 Mon Sep 17 00:00:00 2001
From: Jim Laskey <jlaskey@openjdk.org>
Date: Tue, 22 Mar 2022 15:32:46 +0000
Subject: [PATCH 159/345] 8282625: Formatter caches Locale/DecimalFormatSymbols
 poorly

Reviewed-by: naoto, rriggs, jpai
---
 .../java/text/DecimalFormatSymbols.java       | 11 ++-
 .../share/classes/java/util/Formatter.java    | 78 +++++++++----------
 .../IntlTestDecimalFormatSymbols.java         | 11 ++-
 3 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/java.base/share/classes/java/text/DecimalFormatSymbols.java b/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
index 11fd24573ef..795e087a351 100644
--- a/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
+++ b/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,6 +188,15 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
         return dfsyms;
     }
 
+    /**
+     * {@return locale used to create this instance}
+     *
+     * @since 19
+     */
+    public Locale getLocale() {
+        return locale;
+    }
+
     /**
      * Gets the character used for zero. Different for Arabic, etc.
      *
diff --git a/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java
index 65f67656087..5c5859c767d 100644
--- a/src/java.base/share/classes/java/util/Formatter.java
+++ b/src/java.base/share/classes/java/util/Formatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2008,15 +2008,41 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  * @since 1.5
  */
 public final class Formatter implements Closeable, Flushable {
+    // Caching DecimalFormatSymbols. Non-volatile to avoid thread slamming.
+    private static DecimalFormatSymbols DFS = null;
+    private static DecimalFormatSymbols getDecimalFormatSymbols(Locale locale) {
+        // Capture local copy to avoid thread race.
+        DecimalFormatSymbols dfs = DFS;
+        if (dfs != null && dfs.getLocale().equals(locale)) {
+            return dfs;
+        }
+        // Fetch a new local instance of DecimalFormatSymbols. Note that DFS are mutable
+        // and this instance is reserved for Formatter.
+        dfs = DecimalFormatSymbols.getInstance(locale);
+        // Non-volatile here is acceptable heuristic.
+        DFS = dfs;
+        return dfs;
+    }
+
+    // Use zero from cached DecimalFormatSymbols.
+    private static char getZero(Locale locale) {
+        return locale == null ? '0' : getDecimalFormatSymbols(locale).getZeroDigit();
+    }
+
+    // Use decimal separator from cached DecimalFormatSymbols.
+    private static char getDecimalSeparator(Locale locale) {
+        return locale == null ? '.' : getDecimalFormatSymbols(locale).getDecimalSeparator();
+    }
+
+    // Use grouping separator from cached DecimalFormatSymbols.
+    private static char getGroupingSeparator(Locale locale) {
+        return locale == null ? ',' : getDecimalFormatSymbols(locale).getGroupingSeparator();
+    }
+
     private Appendable a;
     private final Locale l;
-
     private IOException lastException;
 
-    // Non-character value used to mark zero as uninitialized
-    private static final char ZERO_SENTINEL = '\uFFFE';
-    private char zero = ZERO_SENTINEL;
-
     /**
      * Returns a charset object for the given charset name.
      * @throws NullPointerException          is csn is null
@@ -2523,20 +2549,6 @@ public final class Formatter implements Closeable, Flushable {
         this(l, new BufferedWriter(new OutputStreamWriter(os, charset)));
     }
 
-    private char zero() {
-        char zero = this.zero;
-        if (zero == ZERO_SENTINEL) {
-            if ((l != null) && !l.equals(Locale.US)) {
-                DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(l);
-                zero = dfs.getZeroDigit();
-            } else {
-                zero = '0';
-            }
-            this.zero = zero;
-        }
-        return zero;
-    }
-
     /**
      * Returns the locale set by the construction of this formatter.
      *
@@ -4498,14 +4510,6 @@ public final class Formatter implements Closeable, Flushable {
             throw new IllegalFormatConversionException(c, arg.getClass());
         }
 
-        private char getZero(Formatter fmt, Locale l) {
-            if ((l != null) &&  !l.equals(fmt.locale())) {
-                DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(l);
-                return dfs.getZeroDigit();
-            }
-            return fmt.zero();
-        }
-
         private StringBuilder localizedMagnitude(Formatter fmt, StringBuilder sb,
                 long value, int flags, int width, Locale l) {
             return localizedMagnitude(fmt, sb, Long.toString(value, 10), 0, flags, width, l);
@@ -4519,7 +4523,7 @@ public final class Formatter implements Closeable, Flushable {
             }
             int begin = sb.length();
 
-            char zero = getZero(fmt, l);
+            char zero = getZero(l);
 
             // determine localized grouping separator and size
             char grpSep = '\0';
@@ -4536,21 +4540,15 @@ public final class Formatter implements Closeable, Flushable {
             }
 
             if (dot < len) {
-                if (l == null || l.equals(Locale.US)) {
-                    decSep  = '.';
-                } else {
-                    DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(l);
-                    decSep  = dfs.getDecimalSeparator();
-                }
+                decSep  = getDecimalSeparator(l);
             }
 
             if (Flags.contains(f, Flags.GROUP)) {
+                grpSep = getGroupingSeparator(l);
+
                 if (l == null || l.equals(Locale.US)) {
-                    grpSep = ',';
                     grpSize = 3;
                 } else {
-                    DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(l);
-                    grpSep = dfs.getGroupingSeparator();
                     DecimalFormat df = null;
                     NumberFormat nf = NumberFormat.getNumberInstance(l);
                     if (nf instanceof DecimalFormat) {
@@ -4567,7 +4565,7 @@ public final class Formatter implements Closeable, Flushable {
                         }
                         String[] all = adapter.getLocaleResources(l)
                                 .getNumberPatterns();
-                        df = new DecimalFormat(all[0], dfs);
+                        df = new DecimalFormat(all[0], getDecimalFormatSymbols(l));
                     }
                     grpSize = df.getGroupingSize();
                     // Some locales do not use grouping (the number
@@ -4612,7 +4610,7 @@ public final class Formatter implements Closeable, Flushable {
         // group separators is added for any locale.
         private void localizedMagnitudeExp(Formatter fmt, StringBuilder sb, char[] value,
                 final int offset, Locale l) {
-            char zero = getZero(fmt, l);
+            char zero = getZero(l);
 
             int len = value.length;
             for (int j = offset; j < len; j++) {
diff --git a/test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java b/test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java
index cd19fee1e35..30905ee46f1 100644
--- a/test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java
+++ b/test/jdk/java/text/Format/NumberFormat/IntlTestDecimalFormatSymbols.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8282625
  * @library /java/text/testlib
  * @summary test International Decimal Format Symbols
  */
@@ -60,6 +61,14 @@ public class IntlTestDecimalFormatSymbols extends IntlTest
 
         // just do some VERY basic tests to make sure that get/set work
 
+        if (!fr.getLocale().equals(Locale.FRENCH)) {
+            errln("ERROR: French DecimalFormatSymbols not Locale.FRENCH");
+        }
+
+        if (!en.getLocale().equals(Locale.ENGLISH)) {
+            errln("ERROR: English DecimalFormatSymbols not Locale.ENGLISH");
+        }
+
         char zero = en.getZeroDigit();
         fr.setZeroDigit(zero);
         if(fr.getZeroDigit() != en.getZeroDigit()) {
-- 
GitLab


From d29c7e740d51cb50a1aa0a941a5b460782f8da68 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <emanuel.peter@oracle.com>
Date: Tue, 22 Mar 2022 16:23:23 +0000
Subject: [PATCH 160/345] 8282590: C2: assert(addp->is_AddP() && addp->outcnt()
 > 0) failed: Don't process dead nodes

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/arraycopynode.cpp      | 27 ++++++++++++++-----
 src/hotspot/share/opto/subtypenode.cpp        |  4 +--
 .../arraycopy/TestArrayCopyAsLoadsStores.java | 13 +++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/opto/arraycopynode.cpp b/src/hotspot/share/opto/arraycopynode.cpp
index 11560f6419b..b0f30703f91 100644
--- a/src/hotspot/share/opto/arraycopynode.cpp
+++ b/src/hotspot/share/opto/arraycopynode.cpp
@@ -189,9 +189,8 @@ Node* ArrayCopyNode::try_clone_instance(PhaseGVN *phase, bool can_reshape, int c
   }
 
   MergeMemNode* mem = phase->transform(MergeMemNode::make(in_mem))->as_MergeMem();
-  PhaseIterGVN* igvn = phase->is_IterGVN();
-  if (igvn != NULL) {
-    igvn->_worklist.push(mem);
+  if (can_reshape) {
+    phase->is_IterGVN()->_worklist.push(mem);
   }
 
   if (!inst_src->klass_is_exact()) {
@@ -294,9 +293,17 @@ bool ArrayCopyNode::prepare_array_copy(PhaseGVN *phase, bool can_reshape,
     uint header = arrayOopDesc::base_offset_in_bytes(dest_elem);
 
     src_offset = Compile::conv_I2X_index(phase, src_offset, ary_src->size());
+    if (src_offset->is_top()) {
+      // Offset is out of bounds (the ArrayCopyNode will be removed)
+      return false;
+    }
     dest_offset = Compile::conv_I2X_index(phase, dest_offset, ary_dest->size());
-    if (src_offset->is_top() || dest_offset->is_top()) {
+    if (dest_offset->is_top()) {
       // Offset is out of bounds (the ArrayCopyNode will be removed)
+      if (can_reshape) {
+        // record src_offset, so it can be deleted later (if it is dead)
+        phase->is_IterGVN()->_worklist.push(src_offset);
+      }
       return false;
     }
 
@@ -316,9 +323,6 @@ bool ArrayCopyNode::prepare_array_copy(PhaseGVN *phase, bool can_reshape,
 
     disjoint_bases = true;
 
-    adr_src  = phase->transform(new AddPNode(base_src, base_src, src_offset));
-    adr_dest = phase->transform(new AddPNode(base_dest, base_dest, dest_offset));
-
     BasicType elem = ary_src->klass()->as_array_klass()->element_type()->basic_type();
     if (is_reference_type(elem)) {
       elem = T_OBJECT;
@@ -329,6 +333,9 @@ bool ArrayCopyNode::prepare_array_copy(PhaseGVN *phase, bool can_reshape,
       return false;
     }
 
+    adr_src  = phase->transform(new AddPNode(base_src, base_src, src_offset));
+    adr_dest = phase->transform(new AddPNode(base_dest, base_dest, dest_offset));
+
     // The address is offseted to an aligned address where a raw copy would start.
     // If the clone copy is decomposed into load-stores - the address is adjusted to
     // point at where the array starts.
@@ -566,6 +573,8 @@ Node *ArrayCopyNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   if (!prepare_array_copy(phase, can_reshape,
                           adr_src, base_src, adr_dest, base_dest,
                           copy_type, value_type, disjoint_bases)) {
+    assert(adr_src == NULL, "no node can be left behind");
+    assert(adr_dest == NULL, "no node can be left behind");
     return NULL;
   }
 
@@ -629,6 +638,10 @@ Node *ArrayCopyNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   }
 
   if (!finish_transform(phase, can_reshape, ctl, mem)) {
+    if (can_reshape) {
+      // put in worklist, so that if it happens to be dead it is removed
+      phase->is_IterGVN()->_worklist.push(mem);
+    }
     return NULL;
   }
 
diff --git a/src/hotspot/share/opto/subtypenode.cpp b/src/hotspot/share/opto/subtypenode.cpp
index 10604cfebcc..c90b74b7d22 100644
--- a/src/hotspot/share/opto/subtypenode.cpp
+++ b/src/hotspot/share/opto/subtypenode.cpp
@@ -135,7 +135,7 @@ Node *SubTypeCheckNode::Ideal(PhaseGVN* phase, bool can_reshape) {
     Node* obj = AddPNode::Ideal_base_and_offset(addr, phase, con);
     if (con == oopDesc::klass_offset_in_bytes() && obj != NULL) {
       assert(is_oop(phase, obj), "only for oop input");
-      set_req(ObjOrSubKlass, obj);
+      set_req_X(ObjOrSubKlass, obj, phase);
       return this;
     }
   }
@@ -144,7 +144,7 @@ Node *SubTypeCheckNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   Node* allocated_klass = AllocateNode::Ideal_klass(obj_or_subklass, phase);
   if (allocated_klass != NULL) {
     assert(is_oop(phase, obj_or_subklass), "only for oop input");
-    set_req(ObjOrSubKlass, allocated_klass);
+    set_req_X(ObjOrSubKlass, allocated_klass, phase);
     return this;
   }
 
diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyAsLoadsStores.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyAsLoadsStores.java
index 4c4c38848d8..103e99fefef 100644
--- a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyAsLoadsStores.java
+++ b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyAsLoadsStores.java
@@ -38,6 +38,19 @@
  *                   compiler.arraycopy.TestArrayCopyAsLoadsStores
  */
 
+/*
+ * @test
+ * @bug 8282590
+ * @library /
+ *
+ * @run main/othervm -ea -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
+ *                   -XX:CompileCommand=dontinline,compiler.arraycopy.TestArrayCopyAsLoadsStores::m*
+ *                   -XX:TypeProfileLevel=200
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+StressArrayCopyMacroNode
+ *                   -XX:-TieredCompilation -XX:+StressReflectiveCode -XX:-ReduceInitialCardMarks
+ *                   compiler.arraycopy.TestArrayCopyAsLoadsStores
+ */
+
 package compiler.arraycopy;
 
 import java.util.Arrays;
-- 
GitLab


From f7d21c3523d87584b62a1143bfe52d067cf77519 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 22 Mar 2022 16:26:23 +0000
Subject: [PATCH 161/345] 8283480: Make AbstractStringBuilder sealed

Reviewed-by: jjg, rriggs, jlaskey, dfuchs
---
 .../share/classes/java/lang/AbstractStringBuilder.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index cf83c825d38..fed3a6f9178 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,8 @@ import static java.lang.String.checkOffset;
  * @author      Ulf Zibis
  * @since       1.5
  */
-abstract class AbstractStringBuilder implements Appendable, CharSequence {
+abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
+    permits StringBuilder, StringBuffer {
     /**
      * The value is used for character storage.
      */
-- 
GitLab


From 33eb89dfeb4a43e1ad2c3dd657ec3b6ee7abbb3a Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Tue, 22 Mar 2022 21:48:42 +0000
Subject: [PATCH 162/345] 8283457: [macos] libpng build failures with Xcode13.3

Reviewed-by: erikj
---
 make/modules/java.desktop/lib/Awt2dLibraries.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
index a0c40825546..3cf8ca8a820 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -742,7 +742,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
           maybe-uninitialized shift-negative-value implicit-fallthrough \
           unused-function, \
       DISABLED_WARNINGS_clang := incompatible-pointer-types sign-compare \
-          deprecated-declarations, \
+          deprecated-declarations null-pointer-subtraction, \
       DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
-- 
GitLab


From 8cc12350294c202ae4050471587b95135a9f6ac6 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Wed, 23 Mar 2022 00:06:53 +0000
Subject: [PATCH 163/345] 8282952: Thread::exit should be immune to Thread.stop

Reviewed-by: dcubed, pchilanomate, alanb
---
 src/hotspot/share/runtime/thread.cpp        | 36 ++++++++++++---------
 src/hotspot/share/runtime/thread.hpp        | 17 +++++++---
 src/hotspot/share/runtime/thread.inline.hpp | 13 +++++++-
 3 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index eb6bce1fdbb..c1e327d40a5 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -1373,23 +1373,24 @@ void JavaThread::exit(bool destroy_vm, ExitType exit_type) {
       }
     }
 
-    // Call Thread.exit(). We try 3 times in case we got another Thread.stop during
-    // the execution of the method. If that is not enough, then we don't really care. Thread.stop
-    // is deprecated anyhow.
     if (!is_Compiler_thread()) {
-      int count = 3;
-      while (java_lang_Thread::threadGroup(threadObj()) != NULL && (count-- > 0)) {
-        EXCEPTION_MARK;
-        JavaValue result(T_VOID);
-        Klass* thread_klass = vmClasses::Thread_klass();
-        JavaCalls::call_virtual(&result,
-                                threadObj, thread_klass,
-                                vmSymbols::exit_method_name(),
-                                vmSymbols::void_method_signature(),
-                                THREAD);
-        CLEAR_PENDING_EXCEPTION;
-      }
+      // We have finished executing user-defined Java code and now have to do the
+      // implementation specific clean-up by calling Thread.exit(). We prevent any
+      // asynchronous exceptions from being delivered while in Thread.exit()
+      // to ensure the clean-up is not corrupted.
+      NoAsyncExceptionDeliveryMark _no_async(this);
+
+      EXCEPTION_MARK;
+      JavaValue result(T_VOID);
+      Klass* thread_klass = vmClasses::Thread_klass();
+      JavaCalls::call_virtual(&result,
+                              threadObj, thread_klass,
+                              vmSymbols::exit_method_name(),
+                              vmSymbols::void_method_signature(),
+                              THREAD);
+      CLEAR_PENDING_EXCEPTION;
     }
+
     // notify JVMTI
     if (JvmtiExport::should_post_thread_life()) {
       JvmtiExport::post_thread_end(this);
@@ -1592,7 +1593,7 @@ void JavaThread::check_and_handle_async_exceptions() {
     // If we are at a polling page safepoint (not a poll return)
     // then we must defer async exception because live registers
     // will be clobbered by the exception path. Poll return is
-    // ok because the call we a returning from already collides
+    // ok because the call we are returning from already collides
     // with exception handling registers and so there is no issue.
     // (The exception handling path kills call result registers but
     //  this is ok since the exception kills the result anyway).
@@ -1613,6 +1614,9 @@ void JavaThread::check_and_handle_async_exceptions() {
   }
 
   if (!clear_async_exception_condition()) {
+    if ((_suspend_flags & _async_delivery_disabled) != 0) {
+      log_info(exceptions)("Async exception delivery is disabled");
+    }
     return;
   }
 
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 0d56f3dc682..4256a44c39c 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -785,9 +785,10 @@ class JavaThread: public Thread {
   enum SuspendFlags {
     // NOTE: avoid using the sign-bit as cc generates different test code
     //       when the sign-bit is used, and sometimes incorrectly - see CR 6398077
-    _has_async_exception    = 0x00000001U, // there is a pending async exception
-    _trace_flag             = 0x00000004U, // call tracing backend
-    _obj_deopt              = 0x00000008U  // suspend for object reallocation and relocking for JVMTI agent
+    _has_async_exception     = 0x00000001U, // there is a pending async exception
+    _async_delivery_disabled = 0x00000002U, // async exception delivery is disabled
+    _trace_flag              = 0x00000004U, // call tracing backend
+    _obj_deopt               = 0x00000008U  // suspend for object reallocation and relocking for JVMTI agent
   };
 
   // various suspension related flags - atomically updated
@@ -815,7 +816,8 @@ class JavaThread: public Thread {
   inline bool clear_async_exception_condition();
  public:
   bool has_async_exception_condition() {
-    return (_suspend_flags & _has_async_exception) != 0;
+    return (_suspend_flags & _has_async_exception) != 0 &&
+           (_suspend_flags & _async_delivery_disabled) == 0;
   }
   inline void set_pending_async_exception(oop e);
   inline void set_pending_unsafe_access_error();
@@ -823,6 +825,13 @@ class JavaThread: public Thread {
   void send_thread_stop(oop throwable);
   void check_and_handle_async_exceptions();
 
+  class NoAsyncExceptionDeliveryMark : public StackObj {
+    friend JavaThread;
+    JavaThread *_target;
+    inline NoAsyncExceptionDeliveryMark(JavaThread *t);
+    inline ~NoAsyncExceptionDeliveryMark();
+  };
+
   // Safepoint support
  public:                                                        // Expose _thread_state for SafeFetchInt()
   volatile JavaThreadState _thread_state;
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index 7d27a3bf257..cdb8d9abb23 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -124,7 +124,9 @@ inline void JavaThread::clear_obj_deopt_flag() {
 
 inline bool JavaThread::clear_async_exception_condition() {
   bool ret = has_async_exception_condition();
-  clear_suspend_flag(_has_async_exception);
+  if (ret) {
+    clear_suspend_flag(_has_async_exception);
+  }
   return ret;
 }
 
@@ -138,6 +140,15 @@ inline void JavaThread::set_pending_unsafe_access_error() {
   DEBUG_ONLY(_is_unsafe_access_error = true);
 }
 
+
+inline JavaThread::NoAsyncExceptionDeliveryMark::NoAsyncExceptionDeliveryMark(JavaThread *t) : _target(t) {
+  assert((_target->_suspend_flags & _async_delivery_disabled) == 0, "Nesting is not supported");
+  _target->set_suspend_flag(_async_delivery_disabled);
+}
+inline JavaThread::NoAsyncExceptionDeliveryMark::~NoAsyncExceptionDeliveryMark() {
+  _target->clear_suspend_flag(_async_delivery_disabled);
+}
+
 inline JavaThreadState JavaThread::thread_state() const    {
 #if defined(PPC64) || defined (AARCH64)
   // Use membars when accessing volatile _thread_state. See
-- 
GitLab


From 6ea996c20591cafa9673d9c697437ce2c48e4616 Mon Sep 17 00:00:00 2001
From: Ichiroh Takiguchi <itakiguchi@openjdk.org>
Date: Wed, 23 Mar 2022 01:39:20 +0000
Subject: [PATCH 164/345] 8282422: JTable.print() failed with
 UnsupportedCharsetException on AIX ko_KR locale

Reviewed-by: prr, serb
---
 .../share/classes/sun/awt/FontConfiguration.java            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
index e2e7ab3e5ae..45035042992 100644
--- a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
+++ b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -960,7 +960,9 @@ public abstract class FontConfiguration {
             return fc.newEncoder();
         }
 
-        if (!charsetName.startsWith("sun.awt.") && !charsetName.equals("default")) {
+        if (!charsetName.startsWith("sun.awt.") &&
+            !charsetName.equals("default") &&
+            !charsetName.startsWith("sun.font.")) {
             fc = Charset.forName(charsetName);
         } else {
             @SuppressWarnings("removal")
-- 
GitLab


From b035fda459284fa130bf936743a8579a6888160b Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 23 Mar 2022 06:06:51 +0000
Subject: [PATCH 165/345] 8283497: [windows] print TMP and TEMP in hs_err and
 VM.info

Reviewed-by: ysuenaga, dholmes
---
 src/hotspot/share/utilities/vmError.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 89b4645fa45..984c57a13ec 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -115,7 +115,7 @@ static const char* env_list[] = {
   "DYLD_INSERT_LIBRARIES",
 
   // defined on Windows
-  "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR",
+  "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR", "TMP", "TEMP",
 
   (const char *)0
 };
-- 
GitLab


From 82e1a1cf8bafddfa2ecf11c2ce88ed4eaa091757 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 23 Mar 2022 06:30:19 +0000
Subject: [PATCH 166/345] 8283257: x86: Clean up invocation/branch counter
 updates code

Reviewed-by: redestad, kvn
---
 src/hotspot/cpu/x86/interp_masm_x86.cpp       | 19 +++++++++----------
 src/hotspot/cpu/x86/interp_masm_x86.hpp       |  6 ++----
 .../x86/templateInterpreterGenerator_x86.cpp  |  6 ++----
 src/hotspot/cpu/x86/templateTable_x86.cpp     |  7 +++----
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index bf8b94a6319..34d4178b8da 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -1972,19 +1972,18 @@ void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) {
 #endif
 }
 
-// Jump if ((*counter_addr += increment) & mask) satisfies the condition.
-void InterpreterMacroAssembler::increment_mask_and_jump(Address counter_addr,
-                                                        int increment, Address mask,
-                                                        Register scratch, bool preloaded,
-                                                        Condition cond, Label* where) {
-  if (!preloaded) {
-    movl(scratch, counter_addr);
-  }
-  incrementl(scratch, increment);
+// Jump if ((*counter_addr += increment) & mask) == 0
+void InterpreterMacroAssembler::increment_mask_and_jump(Address counter_addr, Address mask,
+                                                        Register scratch, Label* where) {
+  // This update is actually not atomic and can lose a number of updates
+  // under heavy contention, but the alternative of using the (contended)
+  // atomic update here penalizes profiling paths too much.
+  movl(scratch, counter_addr);
+  incrementl(scratch, InvocationCounter::count_increment);
   movl(counter_addr, scratch);
   andl(scratch, mask);
   if (where != NULL) {
-    jcc(cond, *where);
+    jcc(Assembler::zero, *where);
   }
 }
 
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index 0aecb6b4a25..a94f35426b8 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -248,10 +248,8 @@ class InterpreterMacroAssembler: public MacroAssembler {
                              bool decrement = false);
   void increment_mdp_data_at(Register mdp_in, Register reg, int constant,
                              bool decrement = false);
-  void increment_mask_and_jump(Address counter_addr,
-                               int increment, Address mask,
-                               Register scratch, bool preloaded,
-                               Condition cond, Label* where);
+  void increment_mask_and_jump(Address counter_addr, Address mask,
+                               Register scratch, Label* where);
   void set_mdp_flag_at(Register mdp_in, int flag_constant);
   void test_mdp_data_at(Register mdp_in, int offset, Register value,
                         Register test_value_out,
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index 7177d7ca34c..7b14aff6f1f 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -388,7 +388,6 @@ address TemplateInterpreterGenerator::generate_safept_entry_for(
 void TemplateInterpreterGenerator::generate_counter_incr(Label* overflow) {
   Label done;
   // Note: In tiered we increment either counters in Method* or in MDO depending if we're profiling or not.
-  int increment = InvocationCounter::count_increment;
   Label no_mdo;
   if (ProfileInterpreter) {
     // Are we profiling?
@@ -399,7 +398,7 @@ void TemplateInterpreterGenerator::generate_counter_incr(Label* overflow) {
     const Address mdo_invocation_counter(rax, in_bytes(MethodData::invocation_counter_offset()) +
         in_bytes(InvocationCounter::counter_offset()));
     const Address mask(rax, in_bytes(MethodData::invoke_mask_offset()));
-    __ increment_mask_and_jump(mdo_invocation_counter, increment, mask, rcx, false, Assembler::zero, overflow);
+    __ increment_mask_and_jump(mdo_invocation_counter, mask, rcx, overflow);
     __ jmp(done);
   }
   __ bind(no_mdo);
@@ -409,8 +408,7 @@ void TemplateInterpreterGenerator::generate_counter_incr(Label* overflow) {
       InvocationCounter::counter_offset());
   __ get_method_counters(rbx, rax, done);
   const Address mask(rax, in_bytes(MethodCounters::invoke_mask_offset()));
-  __ increment_mask_and_jump(invocation_counter, increment, mask, rcx,
-      false, Assembler::zero, overflow);
+  __ increment_mask_and_jump(invocation_counter, mask, rcx, overflow);
   __ bind(done);
 }
 
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index cadc71916db..531ff7956b4 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -2197,7 +2197,6 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
     __ bind(has_counters);
 
     Label no_mdo;
-    int increment = InvocationCounter::count_increment;
     if (ProfileInterpreter) {
       // Are we profiling?
       __ movptr(rbx, Address(rcx, in_bytes(Method::method_data_offset())));
@@ -2207,7 +2206,7 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
       const Address mdo_backedge_counter(rbx, in_bytes(MethodData::backedge_counter_offset()) +
           in_bytes(InvocationCounter::counter_offset()));
       const Address mask(rbx, in_bytes(MethodData::backedge_mask_offset()));
-      __ increment_mask_and_jump(mdo_backedge_counter, increment, mask, rax, false, Assembler::zero,
+      __ increment_mask_and_jump(mdo_backedge_counter, mask, rax,
           UseOnStackReplacement ? &backedge_counter_overflow : NULL);
       __ jmp(dispatch);
     }
@@ -2215,8 +2214,8 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
     // Increment backedge counter in MethodCounters*
     __ movptr(rcx, Address(rcx, Method::method_counters_offset()));
     const Address mask(rcx, in_bytes(MethodCounters::backedge_mask_offset()));
-    __ increment_mask_and_jump(Address(rcx, be_offset), increment, mask,
-        rax, false, Assembler::zero, UseOnStackReplacement ? &backedge_counter_overflow : NULL);
+    __ increment_mask_and_jump(Address(rcx, be_offset), mask, rax,
+        UseOnStackReplacement ? &backedge_counter_overflow : NULL);
     __ bind(dispatch);
   }
 
-- 
GitLab


From 1443f6b9191c127abdae38cadb1a44af3c652f1d Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 23 Mar 2022 06:31:36 +0000
Subject: [PATCH 167/345] 8283199: Linux os::cpu_microcode_revision() stalls
 cold startup

Reviewed-by: dholmes, redestad, stuefe
---
 src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index 5e346efee54..c6b945fdd79 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -459,11 +459,26 @@ bool os::supports_sse() {
 }
 
 juint os::cpu_microcode_revision() {
+  // Note: this code runs on startup, and therefore should not be slow,
+  // see JDK-8283200.
+
   juint result = 0;
-  char data[2048] = {0}; // lines should fit in 2K buf
-  size_t len = sizeof(data);
-  FILE *fp = os::fopen("/proc/cpuinfo", "r");
+
+  // Attempt 1 (faster): Read the microcode version off the sysfs.
+  FILE *fp = os::fopen("/sys/devices/system/cpu/cpu0/microcode/version", "r");
+  if (fp) {
+    int read = fscanf(fp, "%x", &result);
+    fclose(fp);
+    if (read > 0) {
+      return result;
+    }
+  }
+
+  // Attempt 2 (slower): Read the microcode version off the procfs.
+  fp = os::fopen("/proc/cpuinfo", "r");
   if (fp) {
+    char data[2048] = {0}; // lines should fit in 2K buf
+    size_t len = sizeof(data);
     while (!feof(fp)) {
       if (fgets(data, len, fp)) {
         if (strstr(data, "microcode") != NULL) {
@@ -475,6 +490,7 @@ juint os::cpu_microcode_revision() {
     }
     fclose(fp);
   }
+
   return result;
 }
 
-- 
GitLab


From 86015e15a5105a779ee065cca64479c8d4fbc074 Mon Sep 17 00:00:00 2001
From: Sibabrata Sahoo <ssahoo@openjdk.org>
Date: Wed, 23 Mar 2022 06:45:37 +0000
Subject: [PATCH 168/345] 8282293: Domain value for system property
 jdk.https.negotiate.cbt should be case-insensitive

Reviewed-by: weijun, rhalade
---
 .../https/AbstractDelegateHttpsURLConnection.java        | 5 +++--
 test/jdk/sun/security/krb5/auto/HttpsCB.java             | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
index 7ed4381dda6..ff54e474b8e 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
@@ -332,10 +332,11 @@ public abstract class AbstractDelegateHttpsURLConnection extends
         if (prop.startsWith("domain:")) {
             String[] domains = prop.substring(7).split(",");
             for (String domain : domains) {
-                if (target.equals(domain)) {
+                if (target.equalsIgnoreCase(domain)) {
                     return true;
                 }
-                if (domain.startsWith("*.") && target.endsWith(domain.substring(1))) {
+                if (domain.startsWith("*.") && target.regionMatches(
+                        true, target.length() - domain.length() + 1, domain, 1, domain.length() - 1)) {
                     return true;
                 }
             }
diff --git a/test/jdk/sun/security/krb5/auto/HttpsCB.java b/test/jdk/sun/security/krb5/auto/HttpsCB.java
index a65aa5d0241..1f9f0de33ac 100644
--- a/test/jdk/sun/security/krb5/auto/HttpsCB.java
+++ b/test/jdk/sun/security/krb5/auto/HttpsCB.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8279842
+ * @bug 8279842 8282293
  * @modules java.base/sun.security.util
  *          java.security.jgss/sun.security.jgss
  *          java.security.jgss/sun.security.jgss.krb5
@@ -52,7 +52,13 @@
  * @run main/othervm -Djdk.net.hosts.file=TestHosts
  *          -Djdk.https.negotiate.cbt=domain:host.web.domain HttpsCB true true
  * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=domain:HOST.WEB.DOMAIN HttpsCB true true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
  *          -Djdk.https.negotiate.cbt=domain:*.web.domain HttpsCB true true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=domain:*.WEB.Domain HttpsCB true true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=domain:*.Invalid,*.WEB.Domain HttpsCB true true
  */
 
 import com.sun.net.httpserver.Headers;
@@ -198,6 +204,7 @@ public class HttpsCB {
                     conn.getInputStream()));
             return reader.readLine().equals(CONTENT);
         } catch (IOException e) {
+            e.printStackTrace(System.out);
             return false;
         }
     }
-- 
GitLab


From 58487ddc170f73123668f29c99097b16ba84aa9b Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 23 Mar 2022 06:46:55 +0000
Subject: [PATCH 169/345] 8283249: CompressedClassPointers.java fails on ppc
 with 'Narrow klass shift: 0' missing

Reviewed-by: iklam
---
 .../runtime/CompressedOops/CompressedClassPointers.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
index c46b32b220d..8e2033e7329 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java
@@ -224,8 +224,8 @@ public class CompressedClassPointers {
             "-XX:+VerifyBeforeGC", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("Narrow klass base: 0x0000000000000000");
-        if (!Platform.isAArch64()) {
-            // Currently relax this test for Aarch64.
+        if (!Platform.isAArch64() && !Platform.isPPC()) {
+            // Currently relax this test for Aarch64 and ppc.
             output.shouldContain("Narrow klass shift: 0");
         }
         output.shouldHaveExitValue(0);
@@ -244,8 +244,8 @@ public class CompressedClassPointers {
             "-XX:+VerifyBeforeGC", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("Narrow klass base: 0x0000000000000000");
-        if (!Platform.isAArch64()) {
-            // Currently relax this test for Aarch64.
+        if (!Platform.isAArch64() && !Platform.isPPC()) {
+            // Currently relax this test for Aarch64 and ppc.
             output.shouldContain("Narrow klass shift: 0");
         }
         output.shouldHaveExitValue(0);
-- 
GitLab


From 026b85303c01326bc49a1105a89853d7641fcd50 Mon Sep 17 00:00:00 2001
From: Jie Fu <jiefu@openjdk.org>
Date: Wed, 23 Mar 2022 08:48:17 +0000
Subject: [PATCH 170/345] 8283298: Make CodeCacheSegmentSize a product flag

Reviewed-by: dlong, kvn
---
 src/hotspot/share/interpreter/templateInterpreter.cpp     | 8 ++++++--
 src/hotspot/share/prims/methodHandles.cpp                 | 8 ++++++--
 src/hotspot/share/runtime/globals.hpp                     | 2 +-
 .../jtreg/compiler/arguments/TestCodeEntryAlignment.java  | 1 -
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/interpreter/templateInterpreter.cpp b/src/hotspot/share/interpreter/templateInterpreter.cpp
index 732c12532f7..322a21b6aa7 100644
--- a/src/hotspot/share/interpreter/templateInterpreter.cpp
+++ b/src/hotspot/share/interpreter/templateInterpreter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,11 @@ void TemplateInterpreter::initialize_stub() {
   // allocate interpreter
   int code_size = InterpreterCodeSize;
   NOT_PRODUCT(code_size *= 4;)  // debug uses extra interpreter code space
-  _code = new StubQueue(new InterpreterCodeletInterface, code_size, NULL,
+  // 270+ interpreter codelets are generated and each of them is required to be aligned to
+  // CodeEntryAlignment twice. So we need additional size due to alignment.
+  int max_aligned_codelets = 280;
+  int max_aligned_bytes = max_aligned_codelets * CodeEntryAlignment * 2;
+  _code = new StubQueue(new InterpreterCodeletInterface, code_size + max_aligned_bytes, NULL,
                         "Interpreter");
 }
 
diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp
index 5ae35e34a8c..cb66076eeca 100644
--- a/src/hotspot/share/prims/methodHandles.cpp
+++ b/src/hotspot/share/prims/methodHandles.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,7 +89,11 @@ void MethodHandles::generate_adapters() {
 
   ResourceMark rm;
   TraceTime timer("MethodHandles adapters generation", TRACETIME_LOG(Info, startuptime));
-  _adapter_code = MethodHandlesAdapterBlob::create(adapter_code_size);
+  // The adapter entry is required to be aligned to CodeEntryAlignment.
+  // So we need additional bytes due to alignment.
+  int adapter_num = (int)Interpreter::method_handle_invoke_LAST - (int)Interpreter::method_handle_invoke_FIRST + 1;
+  int max_aligned_bytes = adapter_num * CodeEntryAlignment;
+  _adapter_code = MethodHandlesAdapterBlob::create(adapter_code_size + max_aligned_bytes);
   CodeBuffer code(_adapter_code);
   MethodHandlesAdapterGenerator g(&code);
   g.generate();
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 7dd589b58c5..0ab10a117f1 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1522,7 +1522,7 @@ const intx ObjectAlignmentInBytes = 8;
           "Stack space (bytes) required for JVM_InvokeMethod to complete")  \
                                                                             \
   /* code cache parameters                                    */            \
-  develop_pd(uintx, CodeCacheSegmentSize,                                   \
+  product_pd(uintx, CodeCacheSegmentSize, EXPERIMENTAL,                     \
           "Code cache segment size (in bytes) - smallest unit of "          \
           "allocation")                                                     \
           range(1, 1024)                                                    \
diff --git a/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java b/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
index 0ea1aee6bd6..15a60382245 100644
--- a/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
+++ b/test/hotspot/jtreg/compiler/arguments/TestCodeEntryAlignment.java
@@ -27,7 +27,6 @@
  * @library /test/lib /
  * @bug 8281467
  * @requires vm.flagless
- * @requires vm.debug
  * @requires os.arch=="amd64" | os.arch=="x86_64"
  *
  * @summary Test large CodeEntryAlignments are accepted
-- 
GitLab


From d8c55725e0f85e21c16bb81e3f1a9bcfacc59f87 Mon Sep 17 00:00:00 2001
From: Quan Anh Mai <anhmdq99@gmail.com>
Date: Wed, 23 Mar 2022 09:45:23 +0000
Subject: [PATCH 171/345] 8282204: Use lea instructions for arithmetic
 operations on x86_64

Reviewed-by: jiefu, sviswanathan, thartmann
---
 src/hotspot/cpu/x86/assembler_x86.cpp         |   3 -
 src/hotspot/cpu/x86/vm_version_x86.hpp        |  19 ++
 src/hotspot/cpu/x86/x86_64.ad                 | 164 +++++++++++++++---
 .../bench/vm/compiler/LeaInstruction.java     | 122 +++++++++++++
 4 files changed, 282 insertions(+), 26 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/LeaInstruction.java

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index e287512b93c..3505e081d38 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -2410,10 +2410,7 @@ void Assembler::ldmxcsr( Address src) {
 
 void Assembler::leal(Register dst, Address src) {
   InstructionMark im(this);
-#ifdef _LP64
-  emit_int8(0x67); // addr32
   prefix(src, dst);
-#endif // LP64
   emit_int8((unsigned char)0x8D);
   emit_operand(dst, src);
 }
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index 2fd1bbc9617..2f4e31b4708 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -1044,6 +1044,25 @@ public:
   static bool supports_clflushopt() { return ((_features & CPU_FLUSHOPT) != 0); }
   static bool supports_clwb() { return ((_features & CPU_CLWB) != 0); }
 
+  // Old CPUs perform lea on AGU which causes additional latency transfering the
+  // value from/to ALU for other operations
+  static bool supports_fast_2op_lea() {
+    return (is_intel() && supports_avx()) || // Sandy Bridge and above
+           (is_amd()   && supports_avx());   // Jaguar and Bulldozer and above
+  }
+
+  // Pre Icelake Intels suffer inefficiency regarding 3-operand lea, which contains
+  // all of base register, index register and displacement immediate, with 3 latency.
+  // Note that when the address contains no displacement but the base register is
+  // rbp or r13, the machine code must contain a zero displacement immediate,
+  // effectively transform a 2-operand lea into a 3-operand lea. This can be
+  // replaced by add-add or lea-add
+  static bool supports_fast_3op_lea() {
+    return supports_fast_2op_lea() &&
+           ((is_intel() && supports_clwb() && !is_intel_skylake()) || // Icelake and above
+            is_amd());
+  }
+
 #ifdef __APPLE__
   // Is the CPU running emulated (for example macOS Rosetta running x86_64 code on M1 ARM (aarch64)
   static bool is_cpu_emulated();
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 3eed117ece8..09ff7075994 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -241,6 +241,11 @@ reg_class long_no_rcx_reg %{
   return _LONG_NO_RCX_REG_mask;
 %}
 
+// Class for all long registers (excluding RBP and R13)
+reg_class long_no_rbp_r13_reg %{
+  return _LONG_NO_RBP_R13_REG_mask;
+%}
+
 // Class for all int registers (excluding RSP)
 reg_class int_reg %{
   return _INT_REG_mask;
@@ -256,6 +261,11 @@ reg_class int_no_rcx_reg %{
   return _INT_NO_RCX_REG_mask;
 %}
 
+// Class for all int registers (excluding RBP and R13)
+reg_class int_no_rbp_r13_reg %{
+  return _INT_NO_RBP_R13_REG_mask;
+%}
+
 // Singleton class for RAX pointer register
 reg_class ptr_rax_reg(RAX, RAX_H);
 
@@ -319,9 +329,11 @@ extern RegMask _PTR_NO_RAX_RBX_REG_mask;
 extern RegMask _LONG_REG_mask;
 extern RegMask _LONG_NO_RAX_RDX_REG_mask;
 extern RegMask _LONG_NO_RCX_REG_mask;
+extern RegMask _LONG_NO_RBP_R13_REG_mask;
 extern RegMask _INT_REG_mask;
 extern RegMask _INT_NO_RAX_RDX_REG_mask;
 extern RegMask _INT_NO_RCX_REG_mask;
+extern RegMask _INT_NO_RBP_R13_REG_mask;
 extern RegMask _FLOAT_REG_mask;
 
 extern RegMask _STACK_OR_PTR_REG_mask;
@@ -348,9 +360,11 @@ RegMask _PTR_NO_RAX_RBX_REG_mask;
 RegMask _LONG_REG_mask;
 RegMask _LONG_NO_RAX_RDX_REG_mask;
 RegMask _LONG_NO_RCX_REG_mask;
+RegMask _LONG_NO_RBP_R13_REG_mask;
 RegMask _INT_REG_mask;
 RegMask _INT_NO_RAX_RDX_REG_mask;
 RegMask _INT_NO_RCX_REG_mask;
+RegMask _INT_NO_RBP_R13_REG_mask;
 RegMask _FLOAT_REG_mask;
 RegMask _STACK_OR_PTR_REG_mask;
 RegMask _STACK_OR_LONG_REG_mask;
@@ -409,6 +423,12 @@ void reg_mask_init() {
   _LONG_NO_RCX_REG_mask.Remove(OptoReg::as_OptoReg(rcx->as_VMReg()));
   _LONG_NO_RCX_REG_mask.Remove(OptoReg::as_OptoReg(rcx->as_VMReg()->next()));
 
+  _LONG_NO_RBP_R13_REG_mask = _LONG_REG_mask;
+  _LONG_NO_RBP_R13_REG_mask.Remove(OptoReg::as_OptoReg(rbp->as_VMReg()));
+  _LONG_NO_RBP_R13_REG_mask.Remove(OptoReg::as_OptoReg(rbp->as_VMReg()->next()));
+  _LONG_NO_RBP_R13_REG_mask.Remove(OptoReg::as_OptoReg(r13->as_VMReg()));
+  _LONG_NO_RBP_R13_REG_mask.Remove(OptoReg::as_OptoReg(r13->as_VMReg()->next()));
+
   _INT_REG_mask = _ALL_INT_REG_mask;
   if (PreserveFramePointer) {
     _INT_REG_mask.Remove(OptoReg::as_OptoReg(rbp->as_VMReg()));
@@ -427,6 +447,10 @@ void reg_mask_init() {
   _INT_NO_RCX_REG_mask = _INT_REG_mask;
   _INT_NO_RCX_REG_mask.Remove(OptoReg::as_OptoReg(rcx->as_VMReg()));
 
+  _INT_NO_RBP_R13_REG_mask = _INT_REG_mask;
+  _INT_NO_RBP_R13_REG_mask.Remove(OptoReg::as_OptoReg(rbp->as_VMReg()));
+  _INT_NO_RBP_R13_REG_mask.Remove(OptoReg::as_OptoReg(r13->as_VMReg()));
+
   // _FLOAT_REG_LEGACY_mask/_FLOAT_REG_EVEX_mask is generated by adlc
   // from the float_reg_legacy/float_reg_evex register class.
   _FLOAT_REG_mask = VM_Version::supports_evex() ? _FLOAT_REG_EVEX_mask : _FLOAT_REG_LEGACY_mask;
@@ -3491,6 +3515,21 @@ operand no_rax_rdx_RegI()
   interface(REG_INTER);
 %}
 
+operand no_rbp_r13_RegI()
+%{
+  constraint(ALLOC_IN_RC(int_no_rbp_r13_reg));
+  match(RegI);
+  match(rRegI);
+  match(rax_RegI);
+  match(rbx_RegI);
+  match(rcx_RegI);
+  match(rdx_RegI);
+  match(rdi_RegI);
+
+  format %{ %}
+  interface(REG_INTER);
+%}
+
 // Pointer Register
 operand any_RegP()
 %{
@@ -3718,6 +3757,19 @@ operand rdx_RegL()
   interface(REG_INTER);
 %}
 
+operand no_rbp_r13_RegL()
+%{
+  constraint(ALLOC_IN_RC(long_no_rbp_r13_reg));
+  match(RegL);
+  match(rRegL);
+  match(rax_RegL);
+  match(rcx_RegL);
+  match(rdx_RegL);
+
+  format %{ %}
+  interface(REG_INTER);
+%}
+
 // Flags register, used as output of compare instructions
 operand rFlagsReg()
 %{
@@ -7443,14 +7495,53 @@ instruct decI_mem(memory dst, immI_M1 src, rFlagsReg cr)
   ins_pipe(ialu_mem_imm);
 %}
 
-instruct leaI_rReg_immI(rRegI dst, rRegI src0, immI src1)
+instruct leaI_rReg_immI2_immI(rRegI dst, rRegI index, immI2 scale, immI disp)
 %{
-  match(Set dst (AddI src0 src1));
+  predicate(VM_Version::supports_fast_2op_lea());
+  match(Set dst (AddI (LShiftI index scale) disp));
 
-  ins_cost(110);
-  format %{ "addr32 leal $dst, [$src0 + $src1]\t# int" %}
+  format %{ "leal $dst, [$index << $scale + $disp]\t# int" %}
+  ins_encode %{
+    Address::ScaleFactor scale = static_cast<Address::ScaleFactor>($scale$$constant);
+    __ leal($dst$$Register, Address(noreg, $index$$Register, scale, $disp$$constant));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct leaI_rReg_rReg_immI(rRegI dst, rRegI base, rRegI index, immI disp)
+%{
+  predicate(VM_Version::supports_fast_3op_lea());
+  match(Set dst (AddI (AddI base index) disp));
+
+  format %{ "leal $dst, [$base + $index + $disp]\t# int" %}
   ins_encode %{
-    __ leal($dst$$Register, Address($src0$$Register, $src1$$constant));
+    __ leal($dst$$Register, Address($base$$Register, $index$$Register, Address::times_1, $disp$$constant));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct leaI_rReg_rReg_immI2(rRegI dst, no_rbp_r13_RegI base, rRegI index, immI2 scale)
+%{
+  predicate(VM_Version::supports_fast_2op_lea());
+  match(Set dst (AddI base (LShiftI index scale)));
+
+  format %{ "leal $dst, [$base + $index << $scale]\t# int" %}
+  ins_encode %{
+    Address::ScaleFactor scale = static_cast<Address::ScaleFactor>($scale$$constant);
+    __ leal($dst$$Register, Address($base$$Register, $index$$Register, scale));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct leaI_rReg_rReg_immI2_immI(rRegI dst, rRegI base, rRegI index, immI2 scale, immI disp)
+%{
+  predicate(VM_Version::supports_fast_3op_lea());
+  match(Set dst (AddI (AddI base (LShiftI index scale)) disp));
+
+  format %{ "leal $dst, [$base + $index << $scale + $disp]\t# int" %}
+  ins_encode %{
+    Address::ScaleFactor scale = static_cast<Address::ScaleFactor>($scale$$constant);
+    __ leal($dst$$Register, Address($base$$Register, $index$$Register, scale, $disp$$constant));
   %}
   ins_pipe(ialu_reg_reg);
 %}
@@ -7574,14 +7665,53 @@ instruct decL_mem(memory dst, immL_M1 src, rFlagsReg cr)
   ins_pipe(ialu_mem_imm);
 %}
 
-instruct leaL_rReg_immL(rRegL dst, rRegL src0, immL32 src1)
+instruct leaL_rReg_immI2_immL32(rRegL dst, rRegL index, immI2 scale, immL32 disp)
 %{
-  match(Set dst (AddL src0 src1));
+  predicate(VM_Version::supports_fast_2op_lea());
+  match(Set dst (AddL (LShiftL index scale) disp));
 
-  ins_cost(110);
-  format %{ "leaq    $dst, [$src0 + $src1]\t# long" %}
+  format %{ "leaq $dst, [$index << $scale + $disp]\t# long" %}
+  ins_encode %{
+    Address::ScaleFactor scale = static_cast<Address::ScaleFactor>($scale$$constant);
+    __ leaq($dst$$Register, Address(noreg, $index$$Register, scale, $disp$$constant));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct leaL_rReg_rReg_immL32(rRegL dst, rRegL base, rRegL index, immL32 disp)
+%{
+  predicate(VM_Version::supports_fast_3op_lea());
+  match(Set dst (AddL (AddL base index) disp));
+
+  format %{ "leaq $dst, [$base + $index + $disp]\t# long" %}
+  ins_encode %{
+    __ leaq($dst$$Register, Address($base$$Register, $index$$Register, Address::times_1, $disp$$constant));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct leaL_rReg_rReg_immI2(rRegL dst, no_rbp_r13_RegL base, rRegL index, immI2 scale)
+%{
+  predicate(VM_Version::supports_fast_2op_lea());
+  match(Set dst (AddL base (LShiftL index scale)));
+
+  format %{ "leaq $dst, [$base + $index << $scale]\t# long" %}
+  ins_encode %{
+    Address::ScaleFactor scale = static_cast<Address::ScaleFactor>($scale$$constant);
+    __ leaq($dst$$Register, Address($base$$Register, $index$$Register, scale));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct leaL_rReg_rReg_immI2_immL32(rRegL dst, rRegL base, rRegL index, immI2 scale, immL32 disp)
+%{
+  predicate(VM_Version::supports_fast_3op_lea());
+  match(Set dst (AddL (AddL base (LShiftL index scale)) disp));
+
+  format %{ "leaq $dst, [$base + $index << $scale + $disp]\t# long" %}
   ins_encode %{
-    __ leaq($dst$$Register, Address($src0$$Register, $src1$$constant));
+    Address::ScaleFactor scale = static_cast<Address::ScaleFactor>($scale$$constant);
+    __ leaq($dst$$Register, Address($base$$Register, $index$$Register, scale, $disp$$constant));
   %}
   ins_pipe(ialu_reg_reg);
 %}
@@ -7612,18 +7742,6 @@ instruct addP_rReg_imm(rRegP dst, immL32 src, rFlagsReg cr)
 
 // XXX addP mem ops ????
 
-instruct leaP_rReg_imm(rRegP dst, rRegP src0, immL32 src1)
-%{
-  match(Set dst (AddP src0 src1));
-
-  ins_cost(110);
-  format %{ "leaq    $dst, [$src0 + $src1]\t# ptr" %}
-  ins_encode %{
-    __ leaq($dst$$Register, Address($src0$$Register, $src1$$constant));
-  %}
-  ins_pipe(ialu_reg_reg);
-%}
-
 instruct checkCastPP(rRegP dst)
 %{
   match(Set dst (CheckCastPP dst));
diff --git a/test/micro/org/openjdk/bench/vm/compiler/LeaInstruction.java b/test/micro/org/openjdk/bench/vm/compiler/LeaInstruction.java
new file mode 100644
index 00000000000..02b10d7ddf7
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/LeaInstruction.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(value = 1, jvmArgsAppend = {"-XX:LoopUnrollLimit=1"})
+@State(Scope.Thread)
+public class LeaInstruction {
+    static final int ITERATION = 1000;
+
+    int x, y;
+
+    @Benchmark
+    public void IS_D_int(Blackhole bh) {
+        int x = this.x;
+        for (int i = 0; i < ITERATION; i++) {
+            x = x * 4 + 10;
+        }
+        bh.consume(x);
+    }
+
+    @Benchmark
+    public void B_I_D_int(Blackhole bh) {
+        int x = this.x, y = this.y;
+        for (int i = 0; i < ITERATION; i++) {
+            x = x + y + 10;
+            y = x + y + 20;
+        }
+        bh.consume(x);
+        bh.consume(y);
+    }
+
+    @Benchmark
+    public void B_IS_int(Blackhole bh) {
+        int x = this.x, y = this.y;
+        for (int i = 0; i < ITERATION; i++) {
+            x = x + y * 4;
+            y = x + y * 8;
+        }
+        bh.consume(x);
+        bh.consume(y);
+    }
+
+    @Benchmark
+    public void B_IS_D_int(Blackhole bh) {
+        int x = this.x, y = this.y;
+        for (int i = 0; i < ITERATION; i++) {
+            x = x + y * 4 + 10;
+            y = x + y * 8 + 20;
+        }
+        bh.consume(x);
+        bh.consume(y);
+    }
+
+    @Benchmark
+    public void IS_D_long(Blackhole bh) {
+        long x = this.x;
+        for (int i = 0; i < ITERATION; i++) {
+            x = x * 4 + 10;
+        }
+        bh.consume(x);
+    }
+
+    @Benchmark
+    public void B_I_D_long(Blackhole bh) {
+        long x = this.x, y = this.y;
+        for (int i = 0; i < ITERATION; i++) {
+            x = x + y + 10;
+            y = x + y + 20;
+        }
+        bh.consume(x);
+        bh.consume(y);
+    }
+
+    @Benchmark
+    public void B_IS_long(Blackhole bh) {
+        long x = this.x, y = this.y;
+        for (int i = 0; i < ITERATION; i++) {
+            x = x + y * 4;
+            y = x + y * 8;
+        }
+        bh.consume(x);
+        bh.consume(y);
+    }
+
+    @Benchmark
+    public void B_IS_D_long(Blackhole bh) {
+        long x = this.x, y = this.y;
+        for (int i = 0; i < ITERATION; i++) {
+            x = x + y * 4 + 10;
+            y = x + y * 8 + 20;
+        }
+        bh.consume(x);
+        bh.consume(y);
+    }
+}
-- 
GitLab


From 91fab6ad59d2a4baf58802fc6e6039af3dd8d578 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 23 Mar 2022 09:47:44 +0000
Subject: [PATCH 172/345] 8283411: InflaterInputStream holds on to a temporary
 byte array of 512 bytes

Reviewed-by: lancea, vtewari, alanb
---
 .../share/classes/java/util/zip/InflaterInputStream.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/util/zip/InflaterInputStream.java b/src/java.base/share/classes/java/util/zip/InflaterInputStream.java
index e17f561224f..a87f78b3838 100644
--- a/src/java.base/share/classes/java/util/zip/InflaterInputStream.java
+++ b/src/java.base/share/classes/java/util/zip/InflaterInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -189,8 +189,6 @@ public class InflaterInputStream extends FilterInputStream {
         }
     }
 
-    private byte[] b = new byte[512];
-
     /**
      * Skips specified number of bytes of uncompressed data.
      * @param n the number of bytes to skip
@@ -205,6 +203,7 @@ public class InflaterInputStream extends FilterInputStream {
         ensureOpen();
         int max = (int)Math.min(n, Integer.MAX_VALUE);
         int total = 0;
+        byte[] b = new byte[Math.min(max, 512)];
         while (total < max) {
             int len = max - total;
             if (len > b.length) {
-- 
GitLab


From 6ed0ba2f8a2af58c45a6b7be684ef30d15af6ead Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Wed, 23 Mar 2022 10:34:09 +0000
Subject: [PATCH 173/345] 8283543: indentation error at
 com.sun.tools.javac.comp.Enter::visitTopLevel

Reviewed-by: darcy, iris
---
 .../share/classes/com/sun/tools/javac/comp/Enter.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
index 5cf8c5d5387..dbb4f1a46a4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
@@ -377,7 +377,7 @@ public class Enter extends JCTree.Visitor {
                 ClassSymbol c = syms.enterClass(tree.modle, name, tree.packge);
                 c.flatname = names.fromString(tree.packge + "." + name);
                 c.classfile = c.sourcefile = tree.sourcefile;
-            c.completer = Completer.NULL_COMPLETER;
+                c.completer = Completer.NULL_COMPLETER;
                 c.members_field = WriteableScope.create(c);
                 tree.packge.package_info = c;
                 tree.packge.sourcefile = tree.sourcefile;
-- 
GitLab


From 61d7d868db030d878f4a1c4467075e8d4e116a6e Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Wed, 23 Mar 2022 11:03:25 +0000
Subject: [PATCH 174/345] 8283254: Remove redundant class
 jdk/internal/agent/spi/AgentProvider

Reviewed-by: mchung, redestad, dfuchs
---
 .../classes/jdk/internal/agent/Agent.java     |  1 -
 .../jdk/internal/agent/spi/AgentProvider.java | 76 -------------------
 .../share/classes/module-info.java            |  4 +-
 3 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java

diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
index 2d261bfb3a7..175c736e420 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
@@ -51,7 +51,6 @@ import javax.management.remote.JMXConnectorServer;
 import javax.management.remote.JMXServiceURL;
 
 import static jdk.internal.agent.AgentConfigurationError.*;
-import jdk.internal.agent.spi.AgentProvider;
 import jdk.internal.vm.VMSupport;
 import sun.management.jdp.JdpController;
 import sun.management.jdp.JdpException;
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java
deleted file mode 100644
index 395961cad96..00000000000
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/spi/AgentProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 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.agent.spi;
-
-import java.util.Properties;
-
-/**
- * Service interface for management agent
- */
-public abstract class AgentProvider {
-
-    /**
-     * Instantiates a new AgentProvider.
-     */
-    protected AgentProvider() {
-    }
-
-    /**
-     * Gets the name of the agent provider.
-     *
-     * @return name of agent provider
-     */
-    public abstract String getName();
-
-    /**
-     * Initializes and starts the agent.
-     *
-     * @throws IllegalStateException if this agent has already been started.
-     */
-    public abstract void startAgent();
-
-    /**
-     * Initializes and starts the agent at given port and with given properties
-     *
-     * @param props environment variables for agent
-     *
-     * @throws IllegalStateException if this agent has already been started.
-     */
-    public abstract void startAgent(Properties props);
-
-    /**
-     * Checks if agent is started and not terminated.
-     *
-     * @return true if agent is running, false otherwise.
-     */
-    public abstract boolean isActive();
-
-    /**
-     * Stops this agent.
-     *
-     * @throws IllegalStateException if this agent is not started.
-     */
-    public abstract void stopAgent();
-}
diff --git a/src/jdk.management.agent/share/classes/module-info.java b/src/jdk.management.agent/share/classes/module-info.java
index 921744822b6..9688e22b9f9 100644
--- a/src/jdk.management.agent/share/classes/module-info.java
+++ b/src/jdk.management.agent/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,4 @@ module jdk.management.agent {
     requires java.management.rmi;
 
     exports jdk.internal.agent to jdk.jconsole;
-
-    uses jdk.internal.agent.spi.AgentProvider;
 }
-- 
GitLab


From 78ef2fdef68c5161c8875296e9479026ac89743a Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 23 Mar 2022 12:55:28 +0000
Subject: [PATCH 175/345] 8283562: JDK-8282306 breaks gtests on zero

Reviewed-by: shade
---
 test/hotspot/gtest/runtime/test_os.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 0f78630d460..270710e94c0 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -868,7 +868,7 @@ TEST_VM(os, iso8601_time) {
 }
 
 TEST_VM(os, is_first_C_frame) {
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(ZERO)
   frame invalid_frame;
   EXPECT_TRUE(os::is_first_C_frame(&invalid_frame)); // the frame has zeroes for all values
 
-- 
GitLab


From dc45b0ac58f46e2e46b3302a7e1d81888726f6f4 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 23 Mar 2022 14:09:01 +0000
Subject: [PATCH 176/345] 8283513: Parallel: Skip the card marking in
 PSRootsClosure

Reviewed-by: tschatzl, iwalulya
---
 src/hotspot/share/gc/parallel/psClosure.inline.hpp |  9 ++++++---
 .../gc/parallel/psPromotionManager.inline.hpp      | 14 ++++----------
 src/hotspot/share/gc/parallel/psScavenge.hpp       |  4 ++++
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psClosure.inline.hpp b/src/hotspot/share/gc/parallel/psClosure.inline.hpp
index cd78583bb80..3499b179f46 100644
--- a/src/hotspot/share/gc/parallel/psClosure.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psClosure.inline.hpp
@@ -60,9 +60,12 @@ private:
   PSPromotionManager* _promotion_manager;
 
   template <class T> void do_oop_work(T *p) {
-    if (PSScavenge::should_scavenge(p)) {
-      // We never card mark roots, maybe call a func without test?
-      _promotion_manager->copy_and_push_safe_barrier<promote_immediately>(p);
+    assert(!ParallelScavengeHeap::heap()->is_in_reserved(p), "roots should be outside of heap");
+    oop o = RawAccess<>::oop_load(p);
+    if (PSScavenge::is_obj_in_young(o)) {
+      assert(!PSScavenge::is_obj_in_to_space(o), "Revisiting roots?");
+      oop new_obj = _promotion_manager->copy_to_survivor_space<promote_immediately>(o);
+      RawAccess<IS_NOT_NULL>::oop_store(p, new_obj);
     }
   }
 public:
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index 1b7b00d9fba..64ee5f286b5 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -300,24 +300,18 @@ inline oop PSPromotionManager::copy_unmarked_to_survivor_space(oop o,
 }
 
 // Attempt to "claim" oop at p via CAS, push the new obj if successful
-// This version tests the oop* to make sure it is within the heap before
-// attempting marking.
 template <bool promote_immediately, class T>
 inline void PSPromotionManager::copy_and_push_safe_barrier(T* p) {
+  assert(ParallelScavengeHeap::heap()->is_in_reserved(p), "precondition");
   assert(should_scavenge(p, true), "revisiting object?");
 
   oop o = RawAccess<IS_NOT_NULL>::oop_load(p);
   oop new_obj = copy_to_survivor_space<promote_immediately>(o);
   RawAccess<IS_NOT_NULL>::oop_store(p, new_obj);
 
-  // We cannot mark without test, as some code passes us pointers
-  // that are outside the heap. These pointers are either from roots
-  // or from metadata.
-  if ((!PSScavenge::is_obj_in_young((HeapWord*)p)) &&
-      ParallelScavengeHeap::heap()->is_in_reserved(p)) {
-    if (PSScavenge::is_obj_in_young(new_obj)) {
-      PSScavenge::card_table()->inline_write_ref_field_gc(p, new_obj);
-    }
+  if (!PSScavenge::is_obj_in_young((HeapWord*)p) &&
+       PSScavenge::is_obj_in_young(new_obj)) {
+    PSScavenge::card_table()->inline_write_ref_field_gc(p, new_obj);
   }
 }
 
diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp
index c575e8a3f2c..01bc154e552 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.hpp
@@ -135,6 +135,10 @@ class PSScavenge: AllStatic {
   inline static bool is_obj_in_young(HeapWord* o) {
     return o >= _young_generation_boundary;
   }
+
+  static bool is_obj_in_to_space(oop o) {
+    return ParallelScavengeHeap::young_gen()->to_space()->contains(o);
+  }
 };
 
 #endif // SHARE_GC_PARALLEL_PSSCAVENGE_HPP
-- 
GitLab


From 2b291d837ebfd9d0a61f26541107c6a5f1d43773 Mon Sep 17 00:00:00 2001
From: Aleksei Efimov <aefimov@openjdk.org>
Date: Wed, 23 Mar 2022 14:57:36 +0000
Subject: [PATCH 177/345] 8282536: java.net.InetAddress should be a sealed
 class

Reviewed-by: dfuchs, jpai, rriggs, michaelm
---
 .../share/classes/java/net/Inet6Address.java  |  6 +----
 .../share/classes/java/net/InetAddress.java   | 24 ++++---------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/java.base/share/classes/java/net/Inet6Address.java b/src/java.base/share/classes/java/net/Inet6Address.java
index 751623536e7..325765ff3b6 100644
--- a/src/java.base/share/classes/java/net/Inet6Address.java
+++ b/src/java.base/share/classes/java/net/Inet6Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -593,10 +593,6 @@ class Inet6Address extends InetAddress {
         throws IOException, ClassNotFoundException {
         NetworkInterface scope_ifname = null;
 
-        if (getClass().getClassLoader() != null) {
-            throw new SecurityException ("invalid address type");
-        }
-
         ObjectInputStream.GetField gf = s.readFields();
         byte[] ipaddress = (byte[])gf.get("ipaddress", new byte[0]);
         int scope_id = gf.get("scope_id", -1);
diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java
index 3875216768b..3bad2755978 100644
--- a/src/java.base/share/classes/java/net/InetAddress.java
+++ b/src/java.base/share/classes/java/net/InetAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectInputStream.GetField;
 import java.io.ObjectOutputStream;
 import java.io.ObjectOutputStream.PutField;
+import java.io.Serializable;
 import java.lang.annotation.Native;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
@@ -223,7 +224,7 @@ import static java.net.spi.InetAddressResolver.LookupPolicy.IPV6_FIRST;
  * @see     java.net.InetAddress#getLocalHost()
  * @since 1.0
  */
-public class InetAddress implements java.io.Serializable {
+public sealed class InetAddress implements Serializable permits Inet4Address, Inet6Address {
 
     /**
      * Specify the address family: Internet Protocol, Version 4
@@ -1769,16 +1770,6 @@ public class InetAddress implements java.io.Serializable {
         return impl.anyLocalAddress();
     }
 
-    /**
-     * Initializes an empty InetAddress.
-     */
-    @java.io.Serial
-    private void readObjectNoData () {
-        if (getClass().getClassLoader() != null) {
-            throw new SecurityException ("invalid address type");
-        }
-    }
-
     private static final jdk.internal.misc.Unsafe UNSAFE
             = jdk.internal.misc.Unsafe.getUnsafe();
     private static final long FIELDS_OFFSET
@@ -1794,9 +1785,6 @@ public class InetAddress implements java.io.Serializable {
     @java.io.Serial
     private void readObject (ObjectInputStream s) throws
                          IOException, ClassNotFoundException {
-        if (getClass().getClassLoader() != null) {
-            throw new SecurityException ("invalid address type");
-        }
         GetField gf = s.readFields();
         String host = (String)gf.get("hostName", null);
         int address = gf.get("address", 0);
@@ -1830,11 +1818,7 @@ public class InetAddress implements java.io.Serializable {
      * @throws IOException if an I/O error occurs
      */
     @java.io.Serial
-    private void writeObject (ObjectOutputStream s) throws
-                        IOException {
-        if (getClass().getClassLoader() != null) {
-            throw new SecurityException ("invalid address type");
-        }
+    private void writeObject (ObjectOutputStream s) throws IOException {
         PutField pf = s.putFields();
         pf.put("hostName", holder().getHostName());
         pf.put("address", holder().getAddress());
-- 
GitLab


From a77160065bb6f62314711514f7694fe50f0dc35b Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Wed, 23 Mar 2022 15:00:05 +0000
Subject: [PATCH 178/345] 8283279: [Testbug] Improve TestGetSwapSpaceSize

Reviewed-by: jiefu
---
 .../platform/docker/GetFreeSwapSpaceSize.java | 28 ++++++++++++++++---
 .../docker/TestGetFreeSwapSpaceSize.java      | 11 ++++----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/test/jdk/jdk/internal/platform/docker/GetFreeSwapSpaceSize.java b/test/jdk/jdk/internal/platform/docker/GetFreeSwapSpaceSize.java
index efb6a39e479..92b8cf282b7 100644
--- a/test/jdk/jdk/internal/platform/docker/GetFreeSwapSpaceSize.java
+++ b/test/jdk/jdk/internal/platform/docker/GetFreeSwapSpaceSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2020, 2022 THL A29 Limited, a Tencent company. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,16 +24,36 @@
 import com.sun.management.OperatingSystemMXBean;
 import java.lang.management.ManagementFactory;
 
+// Usage:
+//   GetFreeSwapSpaceSize <memoryAlloc> <expectedMemory> <memorySwapAlloc> <expectedSwap>
 public class GetFreeSwapSpaceSize {
     public static void main(String[] args) {
-        System.out.println("TestGetFreeSwapSpaceSize");
+        if (args.length != 4) {
+            throw new RuntimeException("Unexpected arguments. Expected 4, got " + args.length);
+        }
+        String memoryAlloc = args[0];
+        long expectedMemory = Long.parseLong(args[1]);
+        String memorySwapAlloc = args[2];
+        long expectedSwap = Long.parseLong(args[3]);
+        System.out.println("TestGetFreeSwapSpaceSize (memory=" + memoryAlloc + ", memorySwap=" + memorySwapAlloc + ")");
+        if (expectedSwap != 0) {
+            throw new RuntimeException("Precondition of test not met: Expected swap size of 0, got: " + expectedSwap);
+        }
         OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
+        long osBeanTotalSwap = osBean.getTotalSwapSpaceSize();
+        // Premise of this test is to test on a system where --memory and --memory-swap are set to
+        // the same amount via the container engine (i.e. no swap). In that case the OSBean must
+        // not report negative values for free swap space. Assert this precondition.
+        if (osBeanTotalSwap != expectedSwap) {
+            throw new RuntimeException("OperatingSystemMXBean.getTotalSwapSpaceSize() reported " + osBeanTotalSwap + " expected " + expectedSwap);
+        }
+        System.out.println("TestGetFreeSwapSpaceSize precondition met, osBeanTotalSwap = " + expectedSwap + ". Running test... ");
         for (int i = 0; i < 100; i++) {
             long size = osBean.getFreeSwapSpaceSize();
             if (size < 0) {
-                System.out.println("Error: getFreeSwapSpaceSize returns " + size);
-                System.exit(-1);
+                throw new RuntimeException("Test failed! getFreeSwapSpaceSize returns " + size);
             }
         }
+        System.out.println("TestGetFreeSwapSpaceSize PASSED." );
     }
 }
diff --git a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
index 319c55ab518..92f3364da10 100644
--- a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
+++ b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2020, 2022 THL A29 Limited, a Tencent company. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ import jdk.test.lib.containers.docker.DockerTestUtils;
 import jdk.test.lib.process.OutputAnalyzer;
 
 public class TestGetFreeSwapSpaceSize {
-    private static final String imageName = Common.imageName("memory");
+    private static final String imageName = Common.imageName("osbeanSwapSpace");
 
     public static void main(String[] args) throws Exception {
         if (!DockerTestUtils.canTestDocker()) {
@@ -58,17 +58,18 @@ public class TestGetFreeSwapSpaceSize {
     }
 
     private static void testGetFreeSwapSpaceSize(String memoryAllocation, String expectedMemory,
-            String swapAllocation, String expectedSwap) throws Exception {
+            String memorySwapAllocation, String expectedSwap) throws Exception {
         Common.logNewTestCase("TestGetFreeSwapSpaceSize");
 
         DockerRunOptions opts = Common.newOpts(imageName, "GetFreeSwapSpaceSize")
+            .addClassOptions(memoryAllocation, expectedMemory, memorySwapAllocation, expectedSwap)
             .addDockerOpts(
                 "--memory", memoryAllocation,
-                "--memory-swap", swapAllocation
+                "--memory-swap", memorySwapAllocation
             );
 
         OutputAnalyzer out = DockerTestUtils.dockerRunJava(opts);
         out.shouldHaveExitValue(0)
-           .shouldContain("TestGetFreeSwapSpaceSize");
+           .shouldContain("TestGetFreeSwapSpaceSize PASSED.");
     }
 }
-- 
GitLab


From 3e73a0b726a97df0a4e92f9cf917429346090f45 Mon Sep 17 00:00:00 2001
From: liach <liach@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:06 +0000
Subject: [PATCH 179/345] 8283237: CallSite should be a sealed class

Reviewed-by: jkuhn, mchung
---
 .../share/classes/java/lang/invoke/CallSite.java          | 8 ++++----
 .../share/classes/java/lang/invoke/ConstantCallSite.java  | 4 ++--
 .../share/classes/java/lang/invoke/MutableCallSite.java   | 4 ++--
 .../share/classes/java/lang/invoke/VolatileCallSite.java  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/CallSite.java b/src/java.base/share/classes/java/lang/invoke/CallSite.java
index e159e235f30..ec002e1fc46 100644
--- a/src/java.base/share/classes/java/lang/invoke/CallSite.java
+++ b/src/java.base/share/classes/java/lang/invoke/CallSite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,9 +40,9 @@ import jdk.internal.vm.annotation.Stable;
  * In any case, it may be invoked through an associated method handle
  * called its {@linkplain #dynamicInvoker dynamic invoker}.
  * <p>
- * {@code CallSite} is an abstract class which does not allow
+ * {@code CallSite} is an abstract sealed class which does not allow
  * direct subclassing by users.  It has three immediate,
- * concrete subclasses that may be either instantiated or subclassed.
+ * concrete non-sealed subclasses that may be either instantiated or subclassed.
  * <ul>
  * <li>If a mutable target is not required, an {@code invokedynamic} instruction
  * may be permanently bound by means of a {@linkplain ConstantCallSite constant call site}.
@@ -85,7 +85,7 @@ private static CallSite bootstrapDynamic(MethodHandles.Lookup caller, String nam
  * @since 1.7
  */
 public
-abstract class CallSite {
+abstract sealed class CallSite permits ConstantCallSite, MutableCallSite, VolatileCallSite {
 
     // The actual payload of this call site.
     // Can be modified using {@link MethodHandleNatives#setCallSiteTargetNormal} or {@link MethodHandleNatives#setCallSiteTargetVolatile}.
diff --git a/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java b/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java
index e2e3f478a3c..29e557ad141 100644
--- a/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java
+++ b/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ import jdk.internal.vm.annotation.Stable;
  * @author John Rose, JSR 292 EG
  * @since 1.7
  */
-public class ConstantCallSite extends CallSite {
+public non-sealed class ConstantCallSite extends CallSite {
     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
     @Stable // should NOT be constant folded during instance initialization (isFrozen == false)
diff --git a/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java b/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java
index c16483d02ae..50ba77d8f96 100644
--- a/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java
+++ b/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,7 +83,7 @@ assertEquals("Wilma, dear?", (String) worker2.invokeExact());
  * @author John Rose, JSR 292 EG
  * @since 1.7
  */
-public class MutableCallSite extends CallSite {
+public non-sealed class MutableCallSite extends CallSite {
     /**
      * Creates a blank call site object with the given method type.
      * The initial target is set to a method handle of the given type
diff --git a/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java b/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java
index 742fa23737d..faf10fd79f4 100644
--- a/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java
+++ b/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ package java.lang.invoke;
  * @author John Rose, JSR 292 EG
  * @since 1.7
  */
-public class VolatileCallSite extends CallSite {
+public non-sealed class VolatileCallSite extends CallSite {
     /**
      * Creates a call site with a volatile binding to its target.
      * The initial target is set to a method handle
-- 
GitLab


From f01773956fbc092b00c18392735a020ca05257ed Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Wed, 23 Mar 2022 18:31:34 +0000
Subject: [PATCH 180/345] 8282241: Invalid generic signature for redefined
 classes

Reviewed-by: coleenp, sspitsyn
---
 .../share/prims/jvmtiRedefineClasses.cpp      |  19 +-
 .../RedefineGenericSignatureTest.java         | 196 ++++++++++++++++++
 2 files changed, 205 insertions(+), 10 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java

diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
index 586c0679177..e8ba72cbc0e 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
@@ -1856,14 +1856,15 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
   if (old_cp->has_dynamic_constant()) {
     scratch_cp->set_has_dynamic_constant();
   }
-  // Copy attributes from scratch_cp to merge_cp
-  merge_cp->copy_fields(scratch_cp());
 
   log_info(redefine, class, constantpool)("merge_cp_len=%d, index_map_len=%d", merge_cp_length, _index_map_count);
 
   if (_index_map_count == 0) {
     // there is nothing to map between the new and merged constant pools
 
+    // Copy attributes from scratch_cp to merge_cp
+    merge_cp->copy_fields(scratch_cp());
+
     if (old_cp->length() == scratch_cp->length()) {
       // The old and new constant pools are the same length and the
       // index map is empty. This means that the three constant pools
@@ -1917,6 +1918,9 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
       return JVMTI_ERROR_INTERNAL;
     }
 
+    // Copy attributes from scratch_cp to merge_cp (should be done after rewrite_cp_refs())
+    merge_cp->copy_fields(scratch_cp());
+
     // Replace the new constant pool with a shrunken copy of the
     // merged constant pool so now the rewritten bytecodes have
     // valid references; the previous new constant pool will get
@@ -3492,10 +3496,9 @@ void VM_RedefineClasses::rewrite_cp_refs_in_verification_type_info(
 } // end rewrite_cp_refs_in_verification_type_info()
 
 
-// Change the constant pool associated with klass scratch_class to
-// scratch_cp. If shrink is true, then scratch_cp_length elements
-// are copied from scratch_cp to a smaller constant pool and the
-// smaller constant pool is associated with scratch_class.
+// Change the constant pool associated with klass scratch_class to scratch_cp.
+// scratch_cp_length elements are copied from scratch_cp to a smaller constant pool
+// and the smaller constant pool is associated with scratch_class.
 void VM_RedefineClasses::set_new_constant_pool(
        ClassLoaderData* loader_data,
        InstanceKlass* scratch_class, constantPoolHandle scratch_cp,
@@ -4357,10 +4360,6 @@ void VM_RedefineClasses::redefine_single_class(Thread* current, jclass the_jclas
 
   // Leave arrays of jmethodIDs and itable index cache unchanged
 
-  // Copy the "source file name" attribute from new class version
-  the_class->set_source_file_name_index(
-    scratch_class->source_file_name_index());
-
   // Copy the "source debug extension" attribute from new class version
   the_class->set_source_debug_extension(
     scratch_class->source_debug_extension(),
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java
new file mode 100644
index 00000000000..b16120037e2
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282241
+ * @summary Verifies class redefinition correctly updates generic_signature and source_file_name attributes
+ * @requires vm.jvmti
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ *          java.instrument
+ * @library /test/lib
+ * @run compile -g RedefineGenericSignatureTest.java
+ * @run main RedefineClassHelper
+ * @run main/othervm -javaagent:redefineagent.jar --add-opens=java.base/java.lang=ALL-UNNAMED RedefineGenericSignatureTest
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+class GenericSignatureTester {
+    public GenericSignatureTarget<List<String>> method1() {
+        return null;
+    }
+}
+
+class GenericSignatureTarget<T extends List<?>>  {
+    public GenericSignatureTarget<T> foo() { return null; }
+    public static void throwException() { throw new RuntimeException(); }
+}
+
+public class RedefineGenericSignatureTest {
+    private static final String newTargetClassSource =
+            "class GenericSignatureTarget<T> {\n" +
+            "    public GenericSignatureTarget<T> foo() { return null; }\n" +
+            "    public static void throwException() { throw new RuntimeException(); }\n" +
+            "}\n";
+
+    public static void main (String[] args) throws Throwable {
+        RedefineGenericSignatureTest test = new RedefineGenericSignatureTest();
+        test.runTest();
+    }
+
+    private final static String sourceFileName = "RedefineGenericSignatureTest.java";
+    private final static String sourceFileNameNew = "RedefineGenericSignatureTestNew.java";
+    // expected signature of GenericSignatureTester.method1 return type
+    private final static String expectedRetType = "GenericSignatureTarget<java.util.List<java.lang.String>>";
+    // expected generic signature of the original GenericSignatureTarget
+    private final static String expectedSigOld = "<T::Ljava/util/List<*>;>Ljava/lang/Object;";
+    // expected generic signature of the redefined GenericSignatureTarget
+    private final static String expectedSigNew = "<T:Ljava/lang/Object;>Ljava/lang/Object;";
+
+    private static void log(Object o) {
+        System.out.println(o);
+    }
+
+    private String getTargetGenSig() throws Throwable {
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        MethodHandles.Lookup classLookup = MethodHandles.privateLookupIn(Class.class, lookup);
+        MethodHandle getGenericSignature0 = classLookup.findVirtual(
+                Class.class, "getGenericSignature0", MethodType.methodType(String.class));
+        Object genericSignature = getGenericSignature0.invoke(GenericSignatureTarget.class);
+        return String.valueOf(genericSignature);
+    }
+
+    private String getTesterRetType() throws Throwable {
+        Type type = GenericSignatureTester.class.getDeclaredMethod("method1").getGenericReturnType();
+        return String.valueOf(type);
+    }
+
+    private String getTargetSourceFilename() {
+        try {
+            GenericSignatureTarget.throwException();
+        } catch (RuntimeException ex) {
+            return ex.getStackTrace()[0].getFileName();
+        }
+        return "Cannot get source file name";
+    }
+
+    // Prints dissassembled class bytes.
+    private void printDisassembled(String description, Class cls, byte[] bytes) throws Exception {
+        log(description + " -------------------");
+
+        File f = new File(cls.getSimpleName()+".class");
+        try (FileOutputStream fos = new FileOutputStream(f)) {
+            fos.write(bytes);
+        }
+        JDKToolLauncher javap = JDKToolLauncher.create("javap")
+                .addToolArg("-verbose")
+                .addToolArg("-p")       // Shows all classes and members.
+                //.addToolArg("-c")       // Prints out disassembled code
+                .addToolArg("-s")       // Prints internal type signatures.
+                .addToolArg(f.toString());
+        ProcessBuilder pb = new ProcessBuilder(javap.getCommand());
+        OutputAnalyzer out = ProcessTools.executeProcess(pb);
+        out.shouldHaveExitValue(0);
+        try {
+            Files.delete(f.toPath());
+        } catch (Exception ex) {
+            // ignore
+        }
+        out.asLines().forEach(s -> log(s));
+        log("==========================================");
+        Files.deleteIfExists(f.toPath());
+    }
+
+    private byte[] getNewClassBytes() {
+        byte[] bytecode = InMemoryJavaCompiler.compile(GenericSignatureTarget.class.getName(), newTargetClassSource, "-g");
+
+        ClassWriter cw = new ClassWriter(0);
+        ClassReader cr = new ClassReader(bytecode);
+        cr.accept(new ClassVisitor(Opcodes.ASM7, cw) {
+            private boolean sourceSet = false;
+            @Override
+            public void visitSource(String source, String debug) {
+                sourceSet = true;
+                log("Changing source: \"" + source + "\" -> \"" + sourceFileNameNew + "\"");
+                super.visitSource(sourceFileNameNew, debug);
+            }
+
+            @Override
+            public void visitEnd() {
+                if (!sourceSet) {
+                    log("Set source: \"" + sourceFileNameNew + "\"");
+                    super.visitSource(sourceFileNameNew, null);
+                }
+                super.visitEnd();
+            }
+        }, 0);
+        return cw.toByteArray();
+    }
+
+    private void runTest() throws Throwable {
+        Class targetClass = GenericSignatureTarget.class;
+
+        String oldSig = getTargetGenSig();
+        log("old target class sig: \"" + oldSig + "\"");
+
+        byte[] oldClassBytes = targetClass.getResourceAsStream(targetClass.getName() + ".class").readAllBytes();
+        printDisassembled("Old " + targetClass.getName(), targetClass, oldClassBytes);
+
+        log("Redefining " + targetClass.getName() + " class");
+        byte[] newClassBytes = getNewClassBytes();
+        printDisassembled("New " + targetClass.getName(), targetClass, newClassBytes);
+        RedefineClassHelper.redefineClass(targetClass, newClassBytes);
+
+        String newSig = getTargetGenSig();
+        log("new target class sig: \"" + newSig + "\"");
+
+        String newRetType = getTesterRetType();
+        log("new tester ret type: \"" + newRetType + "\"");
+
+        String newSrcFileName = getTargetSourceFilename();
+        log("new source file name: \"" + newSrcFileName + "\"");
+
+        Asserts.assertStringsEqual(expectedSigOld, oldSig, "wrong old generic signature");
+        Asserts.assertStringsEqual(expectedSigNew, newSig, "wrong new generic signature");
+        Asserts.assertStringsEqual(expectedRetType, newRetType, "wrong ret type");
+        Asserts.assertStringsEqual(sourceFileNameNew, newSrcFileName, "wrong new source file name");
+    }
+}
-- 
GitLab


From 138460c004a9a21a84f892896cf2f172fab2ac99 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Wed, 23 Mar 2022 18:32:55 +0000
Subject: [PATCH 181/345] 8163327: Remove 3DES from the default enabled cipher
 suites list

Reviewed-by: xuelei
---
 .../classes/sun/security/ssl/CipherSuite.java | 76 +++++++++----------
 test/jdk/javax/net/ssl/DTLS/CipherSuite.java  | 12 ++-
 .../ssl/ciphersuites/DisabledAlgorithms.java  | 43 ++++++++---
 ...uite.java => NoDesRC4DesEdeCiphSuite.java} | 27 +++++--
 4 files changed, 103 insertions(+), 55 deletions(-)
 rename test/jdk/sun/security/ssl/CipherSuite/{NoDesRC4CiphSuite.java => NoDesRC4DesEdeCiphSuite.java} (92%)

diff --git a/src/java.base/share/classes/sun/security/ssl/CipherSuite.java b/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
index 8500ae7e188..d957d7b20bd 100644
--- a/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
+++ b/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,9 +54,9 @@ enum CipherSuite {
     //    changed later, see below).
     // 2. Prefer forward secrecy cipher suites.
     // 3. Prefer the stronger bulk cipher, in the order of AES_256(GCM),
-    //    AES_128(GCM), AES_256, AES_128, 3DES-EDE.
+    //    AES_128(GCM), AES_256, AES_128.
     // 4. Prefer the stronger MAC algorithm, in the order of SHA384,
-    //    SHA256, SHA, MD5.
+    //    SHA256, SHA.
     // 5. Prefer the better performance of key exchange and digital
     //    signature algorithm, in the order of ECDHE-ECDSA, ECDHE-RSA,
     //    DHE-RSA, DHE-DSS, ECDH-ECDSA, ECDH-RSA, RSA.
@@ -327,41 +327,6 @@ enum CipherSuite {
             ProtocolVersion.PROTOCOLS_TO_12,
             K_RSA, B_AES_128, M_SHA, H_SHA256),
 
-    // 3DES_EDE, forward secrecy.
-    TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA(
-            0xC008, true, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA", "",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDHE_ECDSA, B_3DES, M_SHA, H_SHA256),
-    TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA(
-            0xC012, true, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDHE_RSA, B_3DES, M_SHA, H_SHA256),
-    SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA(
-            0x0016, true, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
-                          "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_DHE_RSA, B_3DES, M_SHA, H_SHA256),
-    SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA(
-            0x0013, true, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
-                          "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_DHE_DSS, B_3DES, M_SHA, H_SHA256),
-
-    // 3DES_EDE, not forward secrecy.
-    TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA(
-            0xC003, true, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", "",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDH_ECDSA, B_3DES, M_SHA, H_SHA256),
-    TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA(
-            0xC00D, true, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", "",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_ECDH_RSA, B_3DES, M_SHA, H_SHA256),
-    SSL_RSA_WITH_3DES_EDE_CBC_SHA(
-            0x000A, true, "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
-                          "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
-            ProtocolVersion.PROTOCOLS_TO_12,
-            K_RSA, B_3DES, M_SHA, H_SHA256),
-
     // Renegotiation protection request Signalling Cipher Suite Value (SCSV).
     TLS_EMPTY_RENEGOTIATION_INFO_SCSV(        //  RFC 5746, TLS 1.2 and prior
             0x00FF, true, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV", "",
@@ -413,6 +378,41 @@ enum CipherSuite {
             0x0034, false, "TLS_DH_anon_WITH_AES_128_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
             K_DH_ANON, B_AES_128, M_SHA, H_SHA256),
+
+    // 3DES_EDE, forward secrecy.
+    TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA(
+            0xC008, false, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA", "",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_ECDHE_ECDSA, B_3DES, M_SHA, H_SHA256),
+    TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA(
+            0xC012, false, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_ECDHE_RSA, B_3DES, M_SHA, H_SHA256),
+    SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA(
+            0x0016, false, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
+                           "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_DHE_RSA, B_3DES, M_SHA, H_SHA256),
+    SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA(
+            0x0013, false, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
+                           "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_DHE_DSS, B_3DES, M_SHA, H_SHA256),
+
+    // 3DES_EDE, not forward secrecy.
+    TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA(
+            0xC003, false, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA", "",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_ECDH_ECDSA, B_3DES, M_SHA, H_SHA256),
+    TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA(
+            0xC00D, false, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA", "",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_ECDH_RSA, B_3DES, M_SHA, H_SHA256),
+    SSL_RSA_WITH_3DES_EDE_CBC_SHA(
+            0x000A, false, "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
+                           "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
+            ProtocolVersion.PROTOCOLS_TO_12,
+            K_RSA, B_3DES, M_SHA, H_SHA256),
     TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA(
             0xC017, false, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA", "",
             ProtocolVersion.PROTOCOLS_TO_12,
diff --git a/test/jdk/javax/net/ssl/DTLS/CipherSuite.java b/test/jdk/javax/net/ssl/DTLS/CipherSuite.java
index 773fb08d317..1c4b1c6d84f 100644
--- a/test/jdk/javax/net/ssl/DTLS/CipherSuite.java
+++ b/test/jdk/javax/net/ssl/DTLS/CipherSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,9 @@
 
 import javax.net.ssl.SSLEngine;
 import java.security.Security;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Test common DTLS cipher suites.
@@ -59,10 +62,12 @@ public class CipherSuite extends DTLSOverDatagram {
 
     // use the specific cipher suite
     volatile static String cipherSuite;
+    private static boolean reenable;
 
     public static void main(String[] args) throws Exception {
         if (args.length > 1 && "re-enable".equals(args[1])) {
             Security.setProperty("jdk.tls.disabledAlgorithms", "");
+            reenable = true;
         }
 
         cipherSuite = args[0];
@@ -77,6 +82,11 @@ public class CipherSuite extends DTLSOverDatagram {
 
         if (isClient) {
             engine.setEnabledCipherSuites(new String[]{cipherSuite});
+        } else if (reenable) {
+            List<String> cipherSuites =
+                new ArrayList(Arrays.asList(engine.getEnabledCipherSuites()));
+            cipherSuites.add(cipherSuite);
+            engine.setEnabledCipherSuites(cipherSuites.toArray(new String[0]));
         }
 
         return engine;
diff --git a/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java b/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java
index 7bb3e2c8d2b..441f6bdff48 100644
--- a/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java
+++ b/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8076221 8211883
+ * @bug 8076221 8211883 8163327
  * @summary Check if weak cipher suites are disabled
  * @modules jdk.crypto.ec
  * @run main/othervm DisabledAlgorithms default
@@ -60,9 +60,10 @@ public class DisabledAlgorithms {
             System.getProperty("test.src", "./") + "/" + pathToStores +
                 "/" + trustStoreFile;
 
-    // supported RC4, NULL, and anon cipher suites
+    // supported 3DES, DES, RC4, NULL, and anon cipher suites
     // it does not contain KRB5 cipher suites because they need a KDC
-    private static final String[] rc4_null_anon_ciphersuites = new String[] {
+    private static final String[] desede_des_rc4_null_anon_ciphersuites
+        = new String[] {
         "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
         "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
         "SSL_RSA_WITH_RC4_128_SHA",
@@ -90,11 +91,25 @@ public class DisabledAlgorithms {
         "TLS_DH_anon_WITH_AES_256_CBC_SHA",
         "TLS_DH_anon_WITH_AES_256_CBC_SHA256",
         "TLS_DH_anon_WITH_AES_256_GCM_SHA384",
+        "SSL_RSA_WITH_DES_CBC_SHA",
+        "SSL_DHE_RSA_WITH_DES_CBC_SHA",
+        "SSL_DHE_DSS_WITH_DES_CBC_SHA",
+        "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
+        "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
+        "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
+        "SSL_RSA_EXPORT_WITH_RC4_40_MD5",
         "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
         "TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
         "TLS_ECDH_anon_WITH_AES_256_CBC_SHA",
         "TLS_ECDH_anon_WITH_NULL_SHA",
-        "TLS_ECDH_anon_WITH_RC4_128_SHA"
+        "TLS_ECDH_anon_WITH_RC4_128_SHA",
+        "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
+        "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+        "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
+        "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
+        "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
+        "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
+        "SSL_RSA_WITH_3DES_EDE_CBC_SHA"
     };
 
     public static void main(String[] args) throws Exception {
@@ -113,19 +128,25 @@ public class DisabledAlgorithms {
                 System.out.println("jdk.tls.disabledAlgorithms = "
                         + Security.getProperty("jdk.tls.disabledAlgorithms"));
 
-                // check if RC4, NULL, and anon cipher suites
+                // check if 3DES, DES, RC4, NULL, and anon cipher suites
                 // can't be used by default
-                checkFailure(rc4_null_anon_ciphersuites);
+                checkFailure(desede_des_rc4_null_anon_ciphersuites);
                 break;
             case "empty":
                 // reset jdk.tls.disabledAlgorithms
                 Security.setProperty("jdk.tls.disabledAlgorithms", "");
                 System.out.println("jdk.tls.disabledAlgorithms = "
                         + Security.getProperty("jdk.tls.disabledAlgorithms"));
-
-                // check if RC4, NULL, and anon cipher suites can be used
-                // if jdk.tls.disabledAlgorithms is empty
-                checkSuccess(rc4_null_anon_ciphersuites);
+                // reset jdk.certpath.disabledAlgorithms. This is necessary
+                // to allow the RSA_EXPORT suites to pass which use an RSA 512
+                // bit key which violates the default certpath constraints.
+                Security.setProperty("jdk.certpath.disabledAlgorithms", "");
+                System.out.println("jdk.certpath.disabledAlgorithms = "
+                    + Security.getProperty("jdk.certpath.disabledAlgorithms"));
+
+                // check if 3DES, DES, RC4, NULL, and anon cipher suites
+                // can be used if jdk.{tls,certpath}.disabledAlgorithms is empty
+                checkSuccess(desede_des_rc4_null_anon_ciphersuites);
                 break;
             default:
                 throw new RuntimeException("Wrong parameter: " + args[0]);
diff --git a/test/jdk/sun/security/ssl/CipherSuite/NoDesRC4CiphSuite.java b/test/jdk/sun/security/ssl/CipherSuite/NoDesRC4DesEdeCiphSuite.java
similarity index 92%
rename from test/jdk/sun/security/ssl/CipherSuite/NoDesRC4CiphSuite.java
rename to test/jdk/sun/security/ssl/CipherSuite/NoDesRC4DesEdeCiphSuite.java
index 22238d38e1d..c9861324237 100644
--- a/test/jdk/sun/security/ssl/CipherSuite/NoDesRC4CiphSuite.java
+++ b/test/jdk/sun/security/ssl/CipherSuite/NoDesRC4DesEdeCiphSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
 
 /*
  * @test
- * @bug 8208350
- * @summary Disable all DES cipher suites
- * @run main/othervm NoDesRC4CiphSuite
+ * @bug 8208350 8163327
+ * @summary Disable all DES, RC4, and 3DES/DesEde cipher suites
+ * @run main/othervm NoDesRC4DesEdeCiphSuite
  */
 
 /*
@@ -43,7 +43,7 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-public class NoDesRC4CiphSuite {
+public class NoDesRC4DesEdeCiphSuite {
 
     private static final boolean DEBUG = false;
 
@@ -80,6 +80,18 @@ public class NoDesRC4CiphSuite {
         "SSL_RSA_EXPORT_WITH_RC4_40_MD5",
         "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
     };
+    private static final List<Integer> DESEDE_CS_LIST = Arrays.asList(
+        0xC008, 0xC012, 0x0016, 0x0013, 0xC003, 0xC00D, 0x000A
+    );
+    private static final String[] DESEDE_CS_LIST_NAMES = new String[] {
+        "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
+        "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+        "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
+        "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
+        "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
+        "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
+        "SSL_RSA_WITH_3DES_EDE_CBC_SHA"
+    };
 
     private static final ByteBuffer CLIOUTBUF =
             ByteBuffer.wrap("Client Side".getBytes());
@@ -99,6 +111,11 @@ public class NoDesRC4CiphSuite {
         allGood &= testEngAddDisabled(RC4_CS_LIST_NAMES, RC4_CS_LIST);
         allGood &= testEngOnlyDisabled(RC4_CS_LIST_NAMES);
 
+        // Disabled 3DES tests
+        allGood &= testDefaultCase(DESEDE_CS_LIST);
+        allGood &= testEngAddDisabled(DESEDE_CS_LIST_NAMES, DESEDE_CS_LIST);
+        allGood &= testEngOnlyDisabled(DESEDE_CS_LIST_NAMES);
+
         if (allGood) {
             System.err.println("All tests passed");
         } else {
-- 
GitLab


From 0b11b576a2a53446444a6d4899faa0be9e7bb18a Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Wed, 23 Mar 2022 19:18:57 +0000
Subject: [PATCH 182/345] 8283222: improve diagnosability of
 runtime/8176717/TestInheritFD.java timeouts

Reviewed-by: dholmes, hseigel
---
 .../jtreg/runtime/8176717/TestInheritFD.java  | 208 +++++++++++++++---
 1 file changed, 177 insertions(+), 31 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java b/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
index 37c5280d236..c84bc7e0159 100644
--- a/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
+++ b/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import static java.lang.Character.isDigit;
 import static java.lang.Long.parseLong;
 import static java.lang.System.getProperty;
 import static java.nio.file.Files.readAllBytes;
@@ -40,6 +41,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Collection;
+import java.util.concurrent.TimeUnit;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -60,17 +62,18 @@ import java.util.stream.Stream;
  *
  * This test is performed in three steps. The first VM starts a second VM with
  * gc logging enabled. The second VM starts a third VM and redirects the third
- * VMs output to the first VM, it then exits and hopefully closes its log file.
+ * VMs output to the first VM. The second VM then exits and hopefully closes
+ * its log file.
  *
- * The third VM waits for the second to exit and close its log file. After that,
- * the third VM tries to rename the log file of the second VM. If it succeeds in
- * doing so it means that the third VM did not inherit the open log file
- * (windows can not rename opened files easily)
+ * The third VM waits for the second to exit and close its log file.
+ * On Windows, the third VM tries to rename the log file of the second VM.
+ * If it succeeds in doing so it means that the third VM did not inherit
+ * the open log file (windows cannot rename opened files easily).
+ * On unix like systems, the third VM uses "lsof" for verification.
  *
- * The third VM communicates the success to rename the file by printing "CLOSED
- * FD". The first VM checks that the string was printed by the third VM.
- *
- * On unix like systems "lsof" is used.
+ * The third VM communicates success by printing "RETAINS FD". The first VM
+ * waits for the third VM to exit and checks that the string was printed by
+ * the third VM.
  */
 
 public class TestInheritFD {
@@ -80,9 +83,145 @@ public class TestInheritFD {
     public static final String EXIT = "VM RESULT => VM EXIT";
     public static final String LOG_SUFFIX = ".strangelogsuffixthatcanbecheckedfor";
     public static final String USER_DIR = System.getProperty("user.dir");
+    public static final String LSOF_PID_PREFIX = " VM lsof pid=";
+    public static final String SECOND_VM_PID_PREFIX = "Second VM pid=";
+    public static final String THIRD_VM_PID_PREFIX = "Third VM pid=";
+    public static final String THIRD_VM_WAITING_PREFIX = "Third VM waiting for second VM pid=";
+
+    public static float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0"));
+    public static long subProcessTimeout = (long)(15L * timeoutFactor);
+
+    // Extract a pid from the specified String at the specified start offset.
+    private static long extractPidFromStringOffset(String str, int start) {
+        int end;
+        for (end = start; end < str.length(); end++) {
+            if (!isDigit(str.charAt(end))) {
+                break;
+            }
+        }
+        if (start == end) {  // no digits at all
+            return -1;
+        }
+        return parseLong(str.substring(start, end));
+    }
+
+    // Wait for the sub-process pids identified in commFile to finish executing.
+    // Returns true if RETAINS_FD was found in the commFile and false otherwise.
+    private static boolean waitForSubPids(File commFile) throws Exception {
+        String out = "";
+        int sleepCnt = 0;
+        long secondVMPID = -1;
+        long secondVMlsofPID = -1;
+        long thirdVMPID = -1;
+        long thirdVMlsofPID = -1;
+        // Only have to gather info until the doneWithPattern shows up in the output:
+        String doneWithPattern;
+        if (isWindows()) {
+            doneWithPattern = THIRD_VM_PID_PREFIX;
+        } else {
+            doneWithPattern = "Third" + LSOF_PID_PREFIX;
+        }
+        do {
+            out = new String(readAllBytes(commFile.toPath()));
+            if (secondVMPID == -1) {
+                int ind = out.indexOf(SECOND_VM_PID_PREFIX);
+                if (ind != -1) {
+                    int startPid = ind + SECOND_VM_PID_PREFIX.length();
+                    secondVMPID = extractPidFromStringOffset(out, startPid);
+                    System.out.println("secondVMPID=" + secondVMPID);
+                }
+            }
+            if (!isWindows() && secondVMlsofPID == -1) {
+                String prefix = "Second" + LSOF_PID_PREFIX;
+                int ind = out.indexOf(prefix);
+                if (ind != -1) {
+                    int startPid = ind + prefix.length();
+                    secondVMlsofPID = extractPidFromStringOffset(out, startPid);
+                    System.out.println("secondVMlsofPID=" + secondVMlsofPID);
+                }
+            }
+            if (thirdVMPID == -1) {
+                int ind = out.indexOf(THIRD_VM_PID_PREFIX);
+                if (ind != -1) {
+                    int startPid = ind + THIRD_VM_PID_PREFIX.length();
+                    thirdVMPID = extractPidFromStringOffset(out, startPid);
+                    System.out.println("thirdVMPID=" + thirdVMPID);
+                }
+            }
+            if (!isWindows() && thirdVMlsofPID == -1) {
+                String prefix = "Third" + LSOF_PID_PREFIX;
+                int ind = out.indexOf(prefix);
+                if (ind != -1) {
+                    int startPid = ind + prefix.length();
+                    thirdVMlsofPID = extractPidFromStringOffset(out, startPid);
+                    System.out.println("thirdVMlsofPID=" + thirdVMlsofPID);
+                }
+            }
+            Thread.sleep(100);
+            sleepCnt++;
+        } while (!out.contains(doneWithPattern) && !out.contains(EXIT));
+
+        System.out.println("Called Thread.sleep(100) " + sleepCnt + " times.");
+
+        long subPids[] = new long[4];       // At most 4 pids to check.
+        String subNames[] = new String[4];  // At most 4 names for those pids.
+        int ind = 0;
+        if (!isWindows() && secondVMlsofPID != -1) {
+            // The second VM's lsof cmd should be the first non-windows sub-process to finish:
+            subPids[ind] = secondVMlsofPID;
+            subNames[ind] = "second VM lsof";
+            ind++;
+        }
+        // The second VM should the second non-windows or first windows sub-process to finish:
+        subPids[ind] = secondVMPID;
+        subNames[ind] = "second VM";
+        ind++;
+        if (!isWindows() && thirdVMlsofPID != -1) {
+            // The third VM's lsof cmd should be the third non-windows sub-process to finish:
+            subPids[ind] = thirdVMlsofPID;
+            subNames[ind] = "third VM lsof";
+            ind++;
+        }
+        // The third VM should the last sub-process to finish:
+        subPids[ind] = thirdVMPID;
+        subNames[ind] = "third VM";
+        ind++;
+        if (isWindows()) {
+            // No lsof pids on windows so we use fewer array slots.
+            // Make sure they are marked as not used.
+            for (; ind < subPids.length; ind++) {
+                subPids[ind] = -1;
+            }
+        }
+
+        try {
+            for (ind = 0; ind < subPids.length; ind++) {
+                if (subPids[ind] == -1) {
+                    continue;
+                }
+                System.out.print("subs[" + ind + "]={pid=" + subPids[ind] + ", name=" + subNames[ind] + "}");
+                ProcessHandle.of(subPids[ind]).ifPresent(handle -> handle.onExit().orTimeout(subProcessTimeout, TimeUnit.SECONDS).join());
+                System.out.println(" finished.");
+            }
+        } catch (Exception e) {
+            // Terminate the "subs" line from above:
+            System.out.println(" Exception was thrown while trying to join() subPids: " + e.toString());
+            throw e;
+        } finally {
+            // Reread to get everything in the commFile:
+            out = new String(readAllBytes(commFile.toPath()));
+            System.out.println("<BEGIN commFile contents>");
+            System.out.println(out);
+            System.out.println("<END commFile contents>");
+        }
+
+        return out.contains(RETAINS_FD);
+    }
 
     // first VM
     public static void main(String[] args) throws Exception {
+        System.out.println("subProcessTimeout=" + subProcessTimeout + " seconds.");
+        System.out.println("First VM starts.");
         String logPath = Utils.createTempFile("logging", LOG_SUFFIX).toFile().getName();
         File commFile = Utils.createTempFile("communication", ".txt").toFile();
 
@@ -99,24 +238,18 @@ public class TestInheritFD {
         pb.redirectOutput(commFile); // use temp file to communicate between processes
         pb.start();
 
-        String out = "";
-        do {
-            out = new String(readAllBytes(commFile.toPath()));
-            Thread.sleep(100);
-            System.out.println("SLEEP 100 millis");
-        } while (!out.contains(EXIT));
-
-        System.out.println(out);
-        if (out.contains(RETAINS_FD)) {
-            System.out.println("Log file was not inherited by third VM");
+        if (waitForSubPids(commFile)) {
+            System.out.println("Log file was not inherited by third VM.");
         } else {
-            throw new RuntimeException("could not match: " + RETAINS_FD);
+            throw new RuntimeException("Log file was leaked to the third VM.");
         }
+        System.out.println("First VM ends.");
     }
 
     static class VMStartedWithLogging {
         // second VM
         public static void main(String[] args) throws IOException, InterruptedException {
+            System.out.println(SECOND_VM_PID_PREFIX + ProcessHandle.current().pid());
             ProcessBuilder pb = createJavaProcessBuilder(
                 "-Dtest.jdk=" + getProperty("test.jdk"),
                 VMShouldNotInheritFileDescriptors.class.getName(),
@@ -126,30 +259,43 @@ public class TestInheritFD {
             pb.start();
 
             if (!isWindows()) {
-                System.out.println("(Second VM) Open file descriptors:\n" + outputContainingFilenames().stream().collect(joining("\n")));
+                System.out.println("(Second VM) Open file descriptors:\n" + outputContainingFilenames("Second").stream().collect(joining("\n")));
+            }
+            if (false) {  // Enable to simulate a timeout in the second VM.
+                Thread.sleep(300 * 1000);
             }
+            System.out.println("Second VM ends.");
         }
     }
 
     static class VMShouldNotInheritFileDescriptors {
         // third VM
         public static void main(String[] args) throws InterruptedException {
+            System.out.println(THIRD_VM_PID_PREFIX + ProcessHandle.current().pid());
             try {
                 File logFile = new File(args[0]);
                 long parentPid = parseLong(args[1]);
                 fakeLeakyJVM(false); // for debugging of test case
 
+                System.out.println(THIRD_VM_WAITING_PREFIX + parentPid);
+                ProcessHandle.of(parentPid).ifPresent(handle -> handle.onExit().orTimeout(subProcessTimeout, TimeUnit.SECONDS).join());
+
                 if (isWindows()) {
-                    windows(logFile, parentPid);
+                    windows(logFile);
                 } else {
-                    Collection<String> output = outputContainingFilenames();
+                    Collection<String> output = outputContainingFilenames("Third");
                     System.out.println("(Third VM) Open file descriptors:\n" + output.stream().collect(joining("\n")));
                     System.out.println(findOpenLogFile(output) ? LEAKS_FD : RETAINS_FD);
                 }
+                if (false) {  // Enable to simulate a timeout in the third VM.
+                    Thread.sleep(300 * 1000);
+                }
             } catch (Exception e) {
-                System.out.println(e.toString());
+                System.out.println("Exception was thrown: " + e.toString());
+                throw e;
             } finally {
                 System.out.println(EXIT);
+                System.out.println("Third VM ends.");
             }
         }
     }
@@ -165,9 +311,11 @@ public class TestInheritFD {
         }
     }
 
-    static Stream<String> run(String... args){
+    static Stream<String> runLsof(String whichVM, String... args){
         try {
-            return new BufferedReader(new InputStreamReader(new ProcessBuilder(args).start().getInputStream())).lines();
+            Process lsof = new ProcessBuilder(args).start();
+            System.out.println(whichVM + LSOF_PID_PREFIX + lsof.pid());
+            return new BufferedReader(new InputStreamReader(lsof.getInputStream())).lines();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -186,12 +334,12 @@ public class TestInheritFD {
         return lsofCommandCache;
     }
 
-    static Collection<String> outputContainingFilenames() {
+    static Collection<String> outputContainingFilenames(String whichVM) {
         long pid = ProcessHandle.current().pid();
         String[] command = lsofCommand().orElseThrow(() -> new RuntimeException("lsof like command not found"));
         // Only search the directory in which the VM is running (user.dir property).
         System.out.println("using command: " + command[0] + " -a +d " + USER_DIR + " " + command[1] + " " + pid);
-        return run(command[0], "-a", "+d", USER_DIR, command[1], "" + pid).collect(toList());
+        return runLsof(whichVM, command[0], "-a", "+d", USER_DIR, command[1], "" + pid).collect(toList());
     }
 
     static boolean findOpenLogFile(Collection<String> fileNames) {
@@ -208,9 +356,7 @@ public class TestInheritFD {
             .isPresent();
     }
 
-    static void windows(File f, long parentPid) throws InterruptedException {
-        System.out.println("waiting for pid: " + parentPid);
-        ProcessHandle.of(parentPid).ifPresent(handle -> handle.onExit().join());
+    static void windows(File f) throws InterruptedException {
         System.out.println("trying to rename file to the same name: " + f);
         System.out.println(f.renameTo(f) ? RETAINS_FD : LEAKS_FD); // this parts communicates a closed file descriptor by printing "VM RESULT => RETAINS FD"
     }
-- 
GitLab


From f9137cb7b79f86e96247e7b4bc4abb03857afe75 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Wed, 23 Mar 2022 19:27:56 +0000
Subject: [PATCH 183/345] 8280896:
 java/nio/file/Files/probeContentType/Basic.java fails on Windows 11

Reviewed-by: jpai, bpb
---
 test/jdk/java/nio/file/Files/probeContentType/Basic.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/nio/file/Files/probeContentType/Basic.java b/test/jdk/java/nio/file/Files/probeContentType/Basic.java
index b404673b2f4..74e4cd5ab39 100644
--- a/test/jdk/java/nio/file/Files/probeContentType/Basic.java
+++ b/test/jdk/java/nio/file/Files/probeContentType/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,7 +161,7 @@ public class Basic {
                 new ExType("doc", List.of("application/msword")),
                 new ExType("docx", List.of("application/vnd.openxmlformats-officedocument.wordprocessingml.document")),
                 new ExType("gz", List.of("application/gzip", "application/x-gzip")),
-                new ExType("jar", List.of("application/java-archive", "application/x-java-archive")),
+                new ExType("jar", List.of("application/java-archive", "application/x-java-archive", "application/jar")),
                 new ExType("jpg", List.of("image/jpeg")),
                 new ExType("js", List.of("text/javascript", "application/javascript")),
                 new ExType("json", List.of("application/json")),
-- 
GitLab


From 0ee65e1ff3eaed4a8a2542562f0ba2a61d0f5894 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 23 Mar 2022 19:44:04 +0000
Subject: [PATCH 184/345] 8283465: Character.UnicodeBlock.NUM_ENTITIES is out
 of date

Reviewed-by: bpb, iris, smarks
---
 .../share/classes/java/lang/Character.java    |  7 +-
 .../UnicodeBlock/NumberEntities.java          | 50 +++++++++++++
 .../UnicodeBlock/OptimalMapSize.java          | 73 -------------------
 3 files changed, 55 insertions(+), 75 deletions(-)
 create mode 100644 test/jdk/java/lang/Character/UnicodeBlock/NumberEntities.java
 delete mode 100644 test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java

diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index 92e9b5b43f5..d30743b143c 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.java
@@ -737,10 +737,13 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
      */
     public static final class UnicodeBlock extends Subset {
         /**
-         * 696 - the expected number of entities
+         * NUM_ENTITIES should match the total number of UnicodeBlocks
+         * to calculate the initial capacity of the map. It should be
+         * adjusted whenever the Unicode Character Database is upgraded.
+         *
          * 0.75 - the default load factor of HashMap
          */
-        private static final int NUM_ENTITIES = 696;
+        private static final int NUM_ENTITIES = 737;
         private static Map<String, UnicodeBlock> map =
                 new HashMap<>((int)(NUM_ENTITIES / 0.75f + 1.0f));
 
diff --git a/test/jdk/java/lang/Character/UnicodeBlock/NumberEntities.java b/test/jdk/java/lang/Character/UnicodeBlock/NumberEntities.java
new file mode 100644
index 00000000000..a2a2312d6e3
--- /dev/null
+++ b/test/jdk/java/lang/Character/UnicodeBlock/NumberEntities.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8080535 8191410 8215194 8221431 8239383 8268081 8283465
+ * @summary Check if the NUM_ENTITIES field reflects the correct number
+ *      of Character.UnicodeBlock constants.
+ * @modules java.base/java.lang:open
+ * @run testng NumberEntities
+ */
+
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+@Test
+public class NumberEntities {
+    public void test_NumberEntities() throws Throwable {
+        // The number of entries in Character.UnicodeBlock.map.
+        // See src/java.base/share/classes/java/lang/Character.java
+        Field n = Character.UnicodeBlock.class.getDeclaredField("NUM_ENTITIES");
+        Field m = Character.UnicodeBlock.class.getDeclaredField("map");
+        n.setAccessible(true);
+        m.setAccessible(true);
+        assertEquals(((Map)m.get(null)).size(), n.getInt(null));
+    }
+}
diff --git a/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java b/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java
deleted file mode 100644
index abe63eb0b7c..00000000000
--- a/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8080535 8191410 8215194 8221431 8239383 8268081
- * @summary Expected size of Character.UnicodeBlock.map is not optimal
- * @library /test/lib
- * @modules java.base/java.lang:open
- *          java.base/java.util:open
- * @build jdk.test.lib.util.OptimalCapacity
- * @run main OptimalMapSize
- */
-
-import java.lang.reflect.Field;
-import jdk.test.lib.util.OptimalCapacity;
-
-// What will be the number of the Unicode blocks in the future.
-//
-// According to http://www.unicode.org/versions/Unicode7.0.0/ ,
-// in Unicode 7 there will be added 32 new blocks (96 with aliases).
-// According to http://www.unicode.org/versions/beta-8.0.0.html ,
-// in Unicode 8 there will be added 10 more blocks (30 with aliases).
-//
-// After implementing support of Unicode 9 and 10 in Java, there will
-// be 638 entries in Character.UnicodeBlock.map.
-//
-// As of Unicode 11, 667 entries are expected.
-// As of Unicode 12.1, 676 entries are expected.
-// As of Unicode 13.0, 684 entries are expected.
-// As of Unicode 14.0, 696 entries are expected.
-//
-// Initialization of the map and this test will have to be adjusted
-// accordingly then.
-//
-// Note that HashMap's implementation aligns the initial capacity to
-// a power of two size, so it will end up 1024 (and thus succeed) in
-// cases, such as 638, 667, 676, 684, and 696.
-
-public class OptimalMapSize {
-    public static void main(String[] args) throws Throwable {
-        // The initial size of Character.UnicodeBlock.map.
-        // See src/java.base/share/classes/java/lang/Character.java
-        Field f = Character.UnicodeBlock.class.getDeclaredField("NUM_ENTITIES");
-        f.setAccessible(true);
-        int num_entities = f.getInt(null);
-        assert num_entities == 696;
-        int initialCapacity = (int)(num_entities / 0.75f + 1.0f);
-
-        OptimalCapacity.ofHashMap(Character.UnicodeBlock.class,
-                "map", initialCapacity);
-    }
-}
-- 
GitLab


From 6917c39e450e0564b8db7c96be132881a6b0a112 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Wed, 23 Mar 2022 23:42:39 +0000
Subject: [PATCH 185/345] 8283493: Create an automated regression test for RFE
 4231298

Reviewed-by: serb
---
 .../JComboBoxPrototypeDisplayValueTest.java   | 184 ++++++++++++++++++
 1 file changed, 184 insertions(+)
 create mode 100644 test/jdk/javax/swing/JComboBox/4231298/JComboBoxPrototypeDisplayValueTest.java

diff --git a/test/jdk/javax/swing/JComboBox/4231298/JComboBoxPrototypeDisplayValueTest.java b/test/jdk/javax/swing/JComboBox/4231298/JComboBoxPrototypeDisplayValueTest.java
new file mode 100644
index 00000000000..bd71c4fabac
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/4231298/JComboBoxPrototypeDisplayValueTest.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Robot;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+/*
+ * @test
+ * @key headful
+ * @bug 4231298
+ * @summary This testcase tests the RFE 4231298 request, JComboBox Custom
+ *          Renderer should not be called for non displaying elements if
+ *          setPrototypeDisplayValue() has been invoked.
+ * @run main JComboBoxPrototypeDisplayValueTest
+ */
+public class JComboBoxPrototypeDisplayValueTest {
+
+    private static Robot robot;
+    private static JFrame frame;
+    private static JComboBox buttonComboBox;
+    private static volatile int count;
+
+    public static void main(String[] args) throws Exception {
+        robot = new Robot();
+        robot.setAutoWaitForIdle(true);
+        robot.setAutoDelay(200);
+        List<String> lafs = Arrays.stream(getInstalledLookAndFeels())
+                                  .map(LookAndFeelInfo::getClassName)
+                                  .collect(Collectors.toList());
+        for (final String laf : lafs) {
+            try {
+                count = 0;
+                AtomicBoolean lafSetSuccess = new AtomicBoolean(false);
+                SwingUtilities.invokeAndWait(() -> {
+                    lafSetSuccess.set(setLookAndFeel(laf));
+                    if (lafSetSuccess.get()) {
+                        createUI();
+                    }
+                });
+                if (!lafSetSuccess.get()) {
+                    continue;
+                }
+                robot.waitForIdle();
+
+                SwingUtilities
+                        .invokeAndWait(() -> buttonComboBox.getPreferredSize());
+
+                robot.waitForIdle();
+                if (count > 6) {
+                    System.out.println("Test Failed");
+                    throw new RuntimeException(
+                            "Custom Renderer got called " + count + " times, " +
+                            "even after calling setPrototypeDisplayValue(), " +
+                            "but the expected maximum is 6 times for " + laf);
+                } else {
+                    System.out.println("Test Passed for " + laf);
+                }
+            } finally {
+                SwingUtilities.invokeAndWait(
+                        JComboBoxPrototypeDisplayValueTest::disposeFrame);
+            }
+        }
+    }
+
+    public static void createUI() {
+        Vector data = new Vector(IntStream.rangeClosed(1, 100).boxed()
+                                          .map(i -> new JButton("" + i))
+                                          .collect(Collectors.toList()));
+        buttonComboBox = new JComboBox(data);
+        ButtonRenderer renderer = new ButtonRenderer();
+        buttonComboBox.setRenderer(renderer);
+        buttonComboBox.setMaximumRowCount(25);
+
+        // New method introduced in Java 1.4
+        buttonComboBox.setPrototypeDisplayValue(new JButton("111111111"));
+
+        frame = new JFrame();
+        JPanel panel = new JPanel();
+        panel.add(buttonComboBox);
+        frame.getContentPane().add(panel);
+        frame.setSize(200, 100);
+        frame.setLocationRelativeTo(null);
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        frame.setVisible(true);
+    }
+
+    private static boolean setLookAndFeel(String lafName) {
+        try {
+            UIManager.setLookAndFeel(lafName);
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Ignoring Unsupported L&F: " + lafName);
+            return false;
+        } catch (ClassNotFoundException | InstantiationException
+                | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+    private static void disposeFrame() {
+        if (frame != null) {
+            frame.dispose();
+            frame = null;
+        }
+    }
+
+    /**
+     * Custom ListCellRenderer used for the drop down portion and the text
+     * portion of the ComboBox.
+     */
+    private static class ButtonRenderer implements ListCellRenderer {
+        private final Color selectedBackground;
+        private final Color selectedForeground;
+        private final Color background;
+        private final Color foreground;
+
+        public ButtonRenderer() {
+            selectedBackground = Color.BLUE;
+            selectedForeground = Color.YELLOW;
+            background = Color.GRAY;
+            foreground = Color.RED;
+        }
+
+        public Component getListCellRendererComponent(JList list, Object value,
+                                                      int index,
+                                                      boolean isSelected,
+                                                      boolean cellHasFocus) {
+            JButton button = (JButton) value;
+            System.out.println(
+                    "getListCellRendererComponent index = " + index + ", " +
+                    "isSelected = " + isSelected + ", cellHasFocus = " +
+                    cellHasFocus);
+
+            button.setBackground(isSelected ? selectedBackground : background);
+            button.setForeground(isSelected ? selectedForeground : foreground);
+
+            count++;
+            System.out.println("Value of the Counter is " + count);
+
+            return button;
+        }
+
+    }
+
+}
-- 
GitLab


From 8a044649bd722da54999f55ff2cf907682fdc180 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Wed, 23 Mar 2022 23:46:58 +0000
Subject: [PATCH 186/345] 8282860: Write a regression test for JDK-4164779

Reviewed-by: serb
---
 .../JSplitPaneKeyboardNavigationTest.java     | 220 ++++++++++++++++++
 1 file changed, 220 insertions(+)
 create mode 100644 test/jdk/javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java

diff --git a/test/jdk/javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java b/test/jdk/javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java
new file mode 100644
index 00000000000..ced7410bf06
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+/*
+ * @test
+ * @key headful
+ * @bug 4164779
+ * @summary This test confirms that JSplitPane keyboard navigation supports F6 and Ctrl+Tab.
+ * @run main JSplitPaneKeyboardNavigationTest
+ */
+public class JSplitPaneKeyboardNavigationTest {
+
+    private static final StringBuffer failedVerifiers = new StringBuffer();
+    private static JPanel panel;
+    private static JButton leftButton;
+    private static JButton rightButton1;
+    private static JButton rightButton2;
+    private static JButton topButton;
+    private static JButton bottomButton;
+    private static Robot robot;
+    private static JFrame frame;
+
+    public static void main(String[] s) throws Exception {
+        robot = new Robot();
+        robot.setAutoWaitForIdle(true);
+        robot.setAutoDelay(200);
+        List<String> lafs = Arrays.stream(getInstalledLookAndFeels())
+                                  .map(LookAndFeelInfo::getClassName)
+                                  .collect(Collectors.toList());
+        for (final String laf : lafs) {
+            try {
+                AtomicBoolean lafSetSuccess = new AtomicBoolean(false);
+                SwingUtilities.invokeAndWait(() -> {
+                    lafSetSuccess.set(setLookAndFeel(laf));
+                    if (lafSetSuccess.get()) {
+                        createUI();
+                    }
+                });
+                if (!lafSetSuccess.get()) {
+                    continue;
+                }
+                robot.waitForIdle();
+
+                // Press Right button 1 and move focus to it.
+                pressButton(rightButton1);
+                hitKeys(KeyEvent.VK_F6);
+
+                // Verifier1 - Verifies that, F6 transfers focus to the right/bottom side of the splitpane
+                if (isFocusOwner(rightButton2)) {
+                    System.out.println("Verifier 1 passed");
+                } else {
+                    failedVerifiers.append("1,");
+                    System.out.println("Verifier 1 failed, rightButton2 is not focus owner," +
+                            "F6 doesn't transfer focus to the right/bottom side of the splitpane");
+                }
+
+                // Press Right button 2 and move focus to it.
+                pressButton(rightButton2);
+                hitKeys(KeyEvent.VK_F6);
+
+                // Verifier2 - Verifies that, F6 transfers focus to the left side of the parent splitpane,
+                // if the right/bottom side of splitpane already has focus, and it is contained within another splitpane
+                if (isFocusOwner(leftButton)) {
+                    System.out.println("Verifier 2 passed");
+                } else {
+                    failedVerifiers.append("2,");
+                    System.out.println("Verifier 2 failed, leftButton is not focus owner, " +
+                            "F6 doesn't transfer focus to the left side of the splitpane");
+                }
+
+                // Press Left button and move focus to it.
+                pressButton(leftButton);
+                hitKeys(KeyEvent.VK_CONTROL, KeyEvent.VK_TAB);
+                // Verifier3 - Verifies that, CTRL-TAB navigates forward outside the JSplitPane
+                if (isFocusOwner(bottomButton)) {
+                    System.out.println("Verifier 3 passed");
+                } else {
+                    failedVerifiers.append("3,");
+                    System.out.println("Verifier 3 failed, bottomButton is not focus owner, " +
+                            "CTRL-TAB doesn't navigate forward outside the JSplitPane");
+                }
+
+                // Press Left button and move focus to it.
+                pressButton(leftButton);
+                hitKeys(KeyEvent.VK_CONTROL, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
+
+                // Verifier4 - Verifies that, CTRL-SHIFT-TAB navigates backward outside the JSplitPane
+                if (isFocusOwner(topButton)) {
+                    System.out.println("Verifier 4 passed");
+                } else {
+                    failedVerifiers.append("4");
+                    System.out.println("Verifier 4 failed, topButton is not focus owner, " +
+                            "CTRL-SHIFT-TAB doesn't navigate backward outside the JSplitPane");
+                }
+
+                if (failedVerifiers.toString().isEmpty()) {
+                    System.out.println("Test passed, All verifiers succeeded for " + laf);
+                } else {
+                    throw new RuntimeException("Test failed, verifiers " + failedVerifiers.toString() + " failed for " + laf);
+                }
+            } finally {
+                SwingUtilities.invokeAndWait(JSplitPaneKeyboardNavigationTest::disposeFrame);
+            }
+        }
+    }
+
+    private static boolean isFocusOwner(JButton button) throws Exception {
+        final AtomicBoolean isFocusOwner = new AtomicBoolean(false);
+        SwingUtilities.invokeAndWait(() -> {
+            isFocusOwner.set(button.isFocusOwner());
+        });
+        return isFocusOwner.get();
+    }
+
+    private static void pressButton(JButton button) throws Exception {
+        final AtomicReference<Point> loc = new AtomicReference<>();
+        SwingUtilities.invokeAndWait(() -> {
+            loc.set(button.getLocationOnScreen());
+        });
+        final Point buttonLoc = loc.get();
+        robot.mouseMove(buttonLoc.x + 8, buttonLoc.y + 8);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+    }
+
+    public static void createUI() {
+        frame = new JFrame();
+        panel = new JPanel();
+        panel.setLayout(new BorderLayout());
+        leftButton = new JButton("Left Button");
+        rightButton1 = new JButton("Right Button 1");
+        rightButton2 = new JButton("Right Button 2");
+        topButton = new JButton("Top Button");
+        bottomButton = new JButton("Bottom Button");
+        panel.add(topButton, BorderLayout.NORTH);
+        panel.add(bottomButton, BorderLayout.SOUTH);
+        final JSplitPane splitPane2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, rightButton1, rightButton2);
+        final JSplitPane splitPane1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, leftButton, splitPane2);
+        panel.add(splitPane1, BorderLayout.CENTER);
+        frame.setContentPane(panel);
+        frame.setSize(200, 200);
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        frame.pack();
+        frame.setAlwaysOnTop(true);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    private static void hitKeys(int... keys) {
+        for (int key : keys) {
+            robot.keyPress(key);
+        }
+
+        for (int i = keys.length - 1; i >= 0; i--) {
+            robot.keyRelease(keys[i]);
+        }
+    }
+
+    private static boolean setLookAndFeel(String lafName) {
+        try {
+            UIManager.setLookAndFeel(lafName);
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Ignoring Unsupported L&F: " + lafName);
+            return false;
+        } catch (ClassNotFoundException | InstantiationException
+                | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+    private static void disposeFrame() {
+        if (frame != null) {
+            frame.dispose();
+            frame = null;
+        }
+    }
+
+}
-- 
GitLab


From 1a84d7590ae8d120c86d72e5b15ec89754f39ba0 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 24 Mar 2022 00:57:54 +0000
Subject: [PATCH 187/345] 8283594: Improve docs of ElementScanner classes

Reviewed-by: jjg
---
 .../lang/model/util/ElementScanner14.java     | 21 ++++++++++---------
 .../lang/model/util/ElementScanner6.java      | 18 +++++++++-------
 .../lang/model/util/ElementScanner7.java      | 20 ++++++++++--------
 .../lang/model/util/ElementScanner8.java      | 20 ++++++++++--------
 .../lang/model/util/ElementScanner9.java      | 21 ++++++++++---------
 5 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
index ac1bc4976ca..4365c6df53c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,15 +37,16 @@ import static javax.lang.model.SourceVersion.*;
  * appropriate for the {@link SourceVersion#RELEASE_14 RELEASE_14}
  * source version.
  *
- * The <code>visit<i>Xyz</i></code> methods in this
- * class scan their component elements by calling {@code scan} on
- * their {@linkplain Element#getEnclosedElements enclosed elements},
- * {@linkplain ExecutableElement#getParameters parameters}, etc., as
- * indicated in the individual method specifications.  A subclass can
- * control the order elements are visited by overriding the
- * <code>visit<i>Xyz</i></code> methods.  Note that clients of a scanner
- * may get the desired behavior be invoking {@code v.scan(e, p)} rather
- * than {@code v.visit(e, p)} on the root objects of interest.
+ * The <code>visit<i>Xyz</i></code> methods in this class scan their
+ * component elements by calling {@link ElementScanner6#scan(Element,
+ * Object) scan} on their {@linkplain Element#getEnclosedElements
+ * enclosed elements}, {@linkplain ExecutableElement#getParameters
+ * parameters}, etc., as indicated in the individual method
+ * specifications.  A subclass can control the order elements are
+ * visited by overriding the <code>visit<i>Xyz</i></code> methods.
+ * Note that clients of a scanner may get the desired behavior by
+ * invoking {@code v.scan(e, p)} rather than {@code v.visit(e, p)} on
+ * the root objects of interest.
  *
  * <p>When a subclass overrides a <code>visit<i>Xyz</i></code> method, the
  * new method can cause the enclosed elements to be scanned in the
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 b13bd3cd0cc..c2b628b033c 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
@@ -35,14 +35,16 @@ import static javax.lang.model.SourceVersion.*;
  * A scanning visitor of program elements with default behavior
  * appropriate for the {@link SourceVersion#RELEASE_6 RELEASE_6}
  * source version.  The <code>visit<i>Xyz</i></code> methods in this
- * class scan their component elements by calling {@code scan} on
- * their {@linkplain Element#getEnclosedElements enclosed elements},
- * {@linkplain ExecutableElement#getParameters parameters}, etc., as
- * indicated in the individual method specifications.  A subclass can
- * control the order elements are visited by overriding the
- * <code>visit<i>Xyz</i></code> methods.  Note that clients of a scanner
- * may get the desired behavior be invoking {@code v.scan(e, p)} rather
- * than {@code v.visit(e, p)} on the root objects of interest.
+ * class scan their component elements by calling {@link
+ * #scan(Element, P) scan} on their {@linkplain
+ * Element#getEnclosedElements enclosed elements}, {@linkplain
+ * ExecutableElement#getParameters parameters}, etc., as indicated in
+ * the individual method specifications.  A subclass can control the
+ * order elements are visited by overriding the
+ * <code>visit<i>Xyz</i></code> methods.  Note that clients of a
+ * scanner may get the desired behavior by invoking {@code v.scan(e,
+ * p)} rather than {@code v.visit(e, p)} on the root objects of
+ * interest.
  *
  * <p>When a subclass overrides a <code>visit<i>Xyz</i></code> method, the
  * new method can cause the enclosed elements to be scanned in the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java
index e79af27dacf..73e286cea55 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,14 +35,16 @@ import static javax.lang.model.SourceVersion.*;
  * A scanning visitor of program elements with default behavior
  * appropriate for the {@link SourceVersion#RELEASE_7 RELEASE_7}
  * source version.  The <code>visit<i>Xyz</i></code> methods in this
- * class scan their component elements by calling {@code scan} on
- * their {@linkplain Element#getEnclosedElements enclosed elements},
- * {@linkplain ExecutableElement#getParameters parameters}, etc., as
- * indicated in the individual method specifications.  A subclass can
- * control the order elements are visited by overriding the
- * <code>visit<i>Xyz</i></code> methods.  Note that clients of a scanner
- * may get the desired behavior be invoking {@code v.scan(e, p)} rather
- * than {@code v.visit(e, p)} on the root objects of interest.
+ * class scan their component elements by calling {@link
+ * ElementScanner6#scan(Element, Object) scan} on their {@linkplain
+ * Element#getEnclosedElements enclosed elements}, {@linkplain
+ * ExecutableElement#getParameters parameters}, etc., as indicated in
+ * the individual method specifications.  A subclass can control the
+ * order elements are visited by overriding the
+ * <code>visit<i>Xyz</i></code> methods.  Note that clients of a
+ * scanner may get the desired behavior by invoking {@code v.scan(e,
+ * p)} rather than {@code v.visit(e, p)} on the root objects of
+ * interest.
  *
  * <p>When a subclass overrides a <code>visit<i>Xyz</i></code> method, the
  * new method can cause the enclosed elements to be scanned in the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java
index 229ab1a512c..db3ee069d4b 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,14 +35,16 @@ import static javax.lang.model.SourceVersion.*;
  * A scanning visitor of program elements with default behavior
  * appropriate for the {@link SourceVersion#RELEASE_8 RELEASE_8}
  * source version.  The <code>visit<i>Xyz</i></code> methods in this
- * class scan their component elements by calling {@code scan} on
- * their {@linkplain Element#getEnclosedElements enclosed elements},
- * {@linkplain ExecutableElement#getParameters parameters}, etc., as
- * indicated in the individual method specifications.  A subclass can
- * control the order elements are visited by overriding the
- * <code>visit<i>Xyz</i></code> methods.  Note that clients of a scanner
- * may get the desired behavior be invoking {@code v.scan(e, p)} rather
- * than {@code v.visit(e, p)} on the root objects of interest.
+ * class scan their component elements by calling {@link
+ * ElementScanner6#scan(Element, Object) scan} on their {@linkplain
+ * Element#getEnclosedElements enclosed elements}, {@linkplain
+ * ExecutableElement#getParameters parameters}, etc., as indicated in
+ * the individual method specifications.  A subclass can control the
+ * order elements are visited by overriding the
+ * <code>visit<i>Xyz</i></code> methods.  Note that clients of a
+ * scanner may get the desired behavior by invoking {@code v.scan(e,
+ * p)} rather than {@code v.visit(e, p)} on the root objects of
+ * interest.
  *
  * <p>When a subclass overrides a <code>visit<i>Xyz</i></code> method, the
  * new method can cause the enclosed elements to be scanned in the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
index b36235afd2a..3ee290d70cf 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,15 +36,16 @@ import static javax.lang.model.SourceVersion.*;
  * appropriate for source versions {@link SourceVersion#RELEASE_9
  * RELEASE_9} through {@link SourceVersion#RELEASE_14 RELEASE_14}.
  *
- * The <code>visit<i>Xyz</i></code> methods in this
- * class scan their component elements by calling {@code scan} on
- * their {@linkplain Element#getEnclosedElements enclosed elements},
- * {@linkplain ExecutableElement#getParameters parameters}, etc., as
- * indicated in the individual method specifications.  A subclass can
- * control the order elements are visited by overriding the
- * <code>visit<i>Xyz</i></code> methods.  Note that clients of a scanner
- * may get the desired behavior be invoking {@code v.scan(e, p)} rather
- * than {@code v.visit(e, p)} on the root objects of interest.
+ * The <code>visit<i>Xyz</i></code> methods in this class scan their
+ * component elements by calling {@link ElementScanner6#scan(Element,
+ * Object) scan} on their {@linkplain Element#getEnclosedElements
+ * enclosed elements}, {@linkplain ExecutableElement#getParameters
+ * parameters}, etc., as indicated in the individual method
+ * specifications.  A subclass can control the order elements are
+ * visited by overriding the <code>visit<i>Xyz</i></code> methods.
+ * Note that clients of a scanner may get the desired behavior by
+ * invoking {@code v.scan(e, p)} rather than {@code v.visit(e, p)} on
+ * the root objects of interest.
  *
  * <p>When a subclass overrides a <code>visit<i>Xyz</i></code> method, the
  * new method can cause the enclosed elements to be scanned in the
-- 
GitLab


From a6740c010b7d37f991c8547be6ea72b198e9094f Mon Sep 17 00:00:00 2001
From: Pengfei Li <pli@openjdk.org>
Date: Thu, 24 Mar 2022 01:50:04 +0000
Subject: [PATCH 188/345] 8283408: Fix a C2 crash when filling arrays with
 unsafe

Reviewed-by: roland, thartmann
---
 src/hotspot/share/opto/loopTransform.cpp      | 13 +++-
 .../loopopts/FillArrayWithUnsafe.java         | 63 +++++++++++++++++++
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/FillArrayWithUnsafe.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index dc9c2064ed9..253340a6be5 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -4047,10 +4047,17 @@ bool PhaseIdealLoop::intrinsify_fill(IdealLoopTree* lpt) {
     index = new LShiftXNode(index, shift->in(2));
     _igvn.register_new_node_with_optimizer(index);
   }
-  index = new AddPNode(base, base, index);
-  _igvn.register_new_node_with_optimizer(index);
-  Node* from = new AddPNode(base, index, offset);
+  Node* from = new AddPNode(base, base, index);
   _igvn.register_new_node_with_optimizer(from);
+  // For normal array fills, C2 uses two AddP nodes for array element
+  // addressing. But for array fills with Unsafe call, there's only one
+  // AddP node adding an absolute offset, so we do a NULL check here.
+  assert(offset != NULL || C->has_unsafe_access(),
+         "Only array fills with unsafe have no extra offset");
+  if (offset != NULL) {
+    from = new AddPNode(base, from, offset);
+    _igvn.register_new_node_with_optimizer(from);
+  }
   // Compute the number of elements to copy
   Node* len = new SubINode(head->limit(), head->init_trip());
   _igvn.register_new_node_with_optimizer(len);
diff --git a/test/hotspot/jtreg/compiler/loopopts/FillArrayWithUnsafe.java b/test/hotspot/jtreg/compiler/loopopts/FillArrayWithUnsafe.java
new file mode 100644
index 00000000000..6e3b840987a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/FillArrayWithUnsafe.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8283408
+ * @summary Fill a byte array with Java Unsafe API
+ * @run main/othervm -XX:+OptimizeFill compiler.loopopts.FillArrayWithUnsafe
+ */
+
+package compiler.loopopts;
+
+import java.lang.reflect.Field;
+
+import sun.misc.Unsafe;
+
+public class FillArrayWithUnsafe {
+
+    private static Unsafe unsafe;
+
+    public static void main(String[] args) throws Exception {
+        Class klass = Unsafe.class;
+        Field field = klass.getDeclaredField("theUnsafe");
+        field.setAccessible(true);
+        unsafe = (Unsafe) field.get(null);
+
+        byte[] buffer;
+        // Make sure method newByteArray is compiled by C2
+        for (int i = 0; i < 50000; i++) {
+            buffer = newByteArray(100, (byte) 0x80);
+        }
+    }
+
+    public static byte[] newByteArray(int size, byte val) {
+        byte[] arr = new byte[size];
+        int offset = unsafe.arrayBaseOffset(byte[].class);
+        for (int i = offset; i < offset + size; i++) {
+             unsafe.putByte(arr, i, val);
+        }
+        return arr;
+    }
+}
+
-- 
GitLab


From 2ef9767aae8e1798661fea615b096833bdb9d985 Mon Sep 17 00:00:00 2001
From: "lawrence.andrews" <lawrence.andrews@oracle.com>
Date: Thu, 24 Mar 2022 02:55:21 +0000
Subject: [PATCH 189/345] 8270331: [TESTBUG] Error: Not a test or directory
 containing tests: java/awt/print/PrinterJob/InitToBlack.java

Reviewed-by: prr
---
 .../awt/print/PrinterJob/InitToBlack.java     | 146 ++++++++++++++++--
 1 file changed, 131 insertions(+), 15 deletions(-)

diff --git a/test/jdk/java/awt/print/PrinterJob/InitToBlack.java b/test/jdk/java/awt/print/PrinterJob/InitToBlack.java
index 783320829b6..a4d7dd0a958 100644
--- a/test/jdk/java/awt/print/PrinterJob/InitToBlack.java
+++ b/test/jdk/java/awt/print/PrinterJob/InitToBlack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,21 +22,57 @@
  */
 
 /**
+ * @test
  * @bug 4184565
  * @summary Confirm that the default foreground color on a printer
  *          graphics object is black so that rendering will appear
  *          without having to execute setColor first.
- * @run applet/manual=yesno InitToBlack.html
+ * @run main/manual InitToBlack
  */
 
-import java.awt.*;
-import java.awt.print.*;
-import java.applet.Applet;
+import java.awt.BorderLayout;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.print.Book;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
 
-public class InitToBlack extends Applet implements Printable {
+public class InitToBlack implements Printable {
 
-    public void init() {
+    private static volatile JFrame frame;
+    private static volatile boolean testResult = false;
+    private static volatile CountDownLatch printButtonCountDownLatch =
+            new CountDownLatch(1);
+    private static volatile CountDownLatch CountDownLatch =
+            new CountDownLatch(1);
+    private static volatile String failureReason;
+
+    @Override
+    public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) throws PrinterException {
+        Graphics2D g2d = (Graphics2D) graphics;
+        g2d.translate(pageFormat.getImageableX(), pageFormat.getImageableY());
+        graphics.drawString("Test Passes", 200, 200);
+        return PAGE_EXISTS;
+    }
+
+    private void test() {
         PrinterJob pjob = PrinterJob.getPrinterJob();
+        if (pjob.getPrintService() == null) {
+            System.out.println("There is no printer configured on this system");
+            return;
+        }
 
         Book book = new Book();
         book.append(this, pjob.defaultPage());
@@ -49,17 +85,97 @@ public class InitToBlack extends Applet implements Printable {
         }
     }
 
-    public int print(Graphics g, PageFormat pf, int pageIndex) {
-        Graphics2D g2d = (Graphics2D) g;
-        g2d.translate(pf.getImageableX(), pf.getImageableY());
+    private static void createTestUI() {
+        frame = new JFrame("Test InitToBlack");
+        String INSTRUCTION = """
+                Aim: This test checks whether the default foreground color on a printer
+                graphics object is black so that rendering will appear without having
+                to execute setColor.
+                Step:
+                1) Click on the "Print" button. Check whether page is printed on the printer.
+                2) Check whether "Test Passes" is printed on the page and it should be in
+                black color. If yes then press "Pass" button else press "Fail" button.
+                """;
+        JTextArea instructionTextArea = new JTextArea(INSTRUCTION, 4, 40);
+        instructionTextArea.setEditable(false);
 
-        g.drawString("Test Passes", 200, 200);
+        JPanel buttonPanel = new JPanel();
+        JButton printButton = new JButton("Print");
+        printButton.addActionListener((ae) -> {
+            InitToBlack initToBlack = new InitToBlack();
+            initToBlack.test();
+            printButtonCountDownLatch.countDown();
+        });
 
-        return PAGE_EXISTS;
+        JButton passButton = new JButton("Pass");
+        passButton.addActionListener((ae) -> {
+            testResult = true;
+            CountDownLatch.countDown();
+            frame.dispose();
+        });
+        JButton failButton = new JButton("Fail");
+        failButton.addActionListener((ae) -> {
+            getFailureReason();
+            frame.dispose();
+        });
+        buttonPanel.add(printButton);
+        buttonPanel.add(passButton);
+        buttonPanel.add(failButton);
+
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(instructionTextArea, BorderLayout.CENTER);
+        panel.add(buttonPanel, BorderLayout.SOUTH);
+
+        frame.add(panel);
+        frame.setLocationRelativeTo(null);
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        frame.pack();
+        frame.setVisible(true);
+    }
+
+    public static void getFailureReason() {
+        final JDialog dialog = new JDialog();
+        dialog.setTitle("Read testcase failure reason");
+        JPanel jPanel = new JPanel(new BorderLayout());
+        JTextArea jTextArea = new JTextArea(5, 20);
+
+        JButton okButton = new JButton("Ok");
+        okButton.addActionListener((ae) -> {
+            failureReason = jTextArea.getText();
+            testResult = false;
+            CountDownLatch.countDown();
+            dialog.dispose();
+        });
+
+        jPanel.add(new JLabel("Enter the testcase failed reason below and " +
+                "click OK button", JLabel.CENTER), BorderLayout.NORTH);
+        jPanel.add(jTextArea, BorderLayout.CENTER);
+
+        JPanel okayBtnPanel = new JPanel();
+        okayBtnPanel.add(okButton);
+
+        jPanel.add(okayBtnPanel, BorderLayout.SOUTH);
+        dialog.add(jPanel);
+        dialog.setLocationRelativeTo(null);
+        dialog.pack();
+        dialog.setVisible(true);
     }
 
-    public static void main(String[] args) {
-        new InitToBlack().init();
-        System.exit(0);
+    public static void main(String[] args) throws InterruptedException, InvocationTargetException {
+        SwingUtilities.invokeAndWait(InitToBlack::createTestUI);
+        if (!printButtonCountDownLatch.await(2, TimeUnit.MINUTES)) {
+            throw new RuntimeException("Timeout: User did not perform action " +
+                    "on Print button.");
+        }
+        if (!CountDownLatch.await(2, TimeUnit.MINUTES)) {
+            throw new RuntimeException("Timeout : User did not decide " +
+                    "whether test passed or failed");
+        }
+
+        if (!testResult) {
+            throw new RuntimeException("Test failed : " + failureReason);
+        } else {
+            System.out.println("Test Passed");
+        }
     }
 }
-- 
GitLab


From 5cf580e0fb57245c43c9c719b9b03baa323f2245 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Thu, 24 Mar 2022 04:41:38 +0000
Subject: [PATCH 190/345] 8283587: [BACKOUT] Invalid generic signature for
 redefined classes

Reviewed-by: lmesnik, dcubed, sspitsyn
---
 .../share/prims/jvmtiRedefineClasses.cpp      |  19 +-
 .../RedefineGenericSignatureTest.java         | 196 ------------------
 2 files changed, 10 insertions(+), 205 deletions(-)
 delete mode 100644 test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java

diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
index e8ba72cbc0e..586c0679177 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
@@ -1856,15 +1856,14 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
   if (old_cp->has_dynamic_constant()) {
     scratch_cp->set_has_dynamic_constant();
   }
+  // Copy attributes from scratch_cp to merge_cp
+  merge_cp->copy_fields(scratch_cp());
 
   log_info(redefine, class, constantpool)("merge_cp_len=%d, index_map_len=%d", merge_cp_length, _index_map_count);
 
   if (_index_map_count == 0) {
     // there is nothing to map between the new and merged constant pools
 
-    // Copy attributes from scratch_cp to merge_cp
-    merge_cp->copy_fields(scratch_cp());
-
     if (old_cp->length() == scratch_cp->length()) {
       // The old and new constant pools are the same length and the
       // index map is empty. This means that the three constant pools
@@ -1918,9 +1917,6 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
       return JVMTI_ERROR_INTERNAL;
     }
 
-    // Copy attributes from scratch_cp to merge_cp (should be done after rewrite_cp_refs())
-    merge_cp->copy_fields(scratch_cp());
-
     // Replace the new constant pool with a shrunken copy of the
     // merged constant pool so now the rewritten bytecodes have
     // valid references; the previous new constant pool will get
@@ -3496,9 +3492,10 @@ void VM_RedefineClasses::rewrite_cp_refs_in_verification_type_info(
 } // end rewrite_cp_refs_in_verification_type_info()
 
 
-// Change the constant pool associated with klass scratch_class to scratch_cp.
-// scratch_cp_length elements are copied from scratch_cp to a smaller constant pool
-// and the smaller constant pool is associated with scratch_class.
+// Change the constant pool associated with klass scratch_class to
+// scratch_cp. If shrink is true, then scratch_cp_length elements
+// are copied from scratch_cp to a smaller constant pool and the
+// smaller constant pool is associated with scratch_class.
 void VM_RedefineClasses::set_new_constant_pool(
        ClassLoaderData* loader_data,
        InstanceKlass* scratch_class, constantPoolHandle scratch_cp,
@@ -4360,6 +4357,10 @@ void VM_RedefineClasses::redefine_single_class(Thread* current, jclass the_jclas
 
   // Leave arrays of jmethodIDs and itable index cache unchanged
 
+  // Copy the "source file name" attribute from new class version
+  the_class->set_source_file_name_index(
+    scratch_class->source_file_name_index());
+
   // Copy the "source debug extension" attribute from new class version
   the_class->set_source_debug_extension(
     scratch_class->source_debug_extension(),
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java
deleted file mode 100644
index b16120037e2..00000000000
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8282241
- * @summary Verifies class redefinition correctly updates generic_signature and source_file_name attributes
- * @requires vm.jvmti
- * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.instrument
- * @library /test/lib
- * @run compile -g RedefineGenericSignatureTest.java
- * @run main RedefineClassHelper
- * @run main/othervm -javaagent:redefineagent.jar --add-opens=java.base/java.lang=ALL-UNNAMED RedefineGenericSignatureTest
- */
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Type;
-import java.nio.file.Files;
-import java.util.List;
-
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.test.lib.Asserts;
-import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.compiler.InMemoryJavaCompiler;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
-class GenericSignatureTester {
-    public GenericSignatureTarget<List<String>> method1() {
-        return null;
-    }
-}
-
-class GenericSignatureTarget<T extends List<?>>  {
-    public GenericSignatureTarget<T> foo() { return null; }
-    public static void throwException() { throw new RuntimeException(); }
-}
-
-public class RedefineGenericSignatureTest {
-    private static final String newTargetClassSource =
-            "class GenericSignatureTarget<T> {\n" +
-            "    public GenericSignatureTarget<T> foo() { return null; }\n" +
-            "    public static void throwException() { throw new RuntimeException(); }\n" +
-            "}\n";
-
-    public static void main (String[] args) throws Throwable {
-        RedefineGenericSignatureTest test = new RedefineGenericSignatureTest();
-        test.runTest();
-    }
-
-    private final static String sourceFileName = "RedefineGenericSignatureTest.java";
-    private final static String sourceFileNameNew = "RedefineGenericSignatureTestNew.java";
-    // expected signature of GenericSignatureTester.method1 return type
-    private final static String expectedRetType = "GenericSignatureTarget<java.util.List<java.lang.String>>";
-    // expected generic signature of the original GenericSignatureTarget
-    private final static String expectedSigOld = "<T::Ljava/util/List<*>;>Ljava/lang/Object;";
-    // expected generic signature of the redefined GenericSignatureTarget
-    private final static String expectedSigNew = "<T:Ljava/lang/Object;>Ljava/lang/Object;";
-
-    private static void log(Object o) {
-        System.out.println(o);
-    }
-
-    private String getTargetGenSig() throws Throwable {
-        MethodHandles.Lookup lookup = MethodHandles.lookup();
-        MethodHandles.Lookup classLookup = MethodHandles.privateLookupIn(Class.class, lookup);
-        MethodHandle getGenericSignature0 = classLookup.findVirtual(
-                Class.class, "getGenericSignature0", MethodType.methodType(String.class));
-        Object genericSignature = getGenericSignature0.invoke(GenericSignatureTarget.class);
-        return String.valueOf(genericSignature);
-    }
-
-    private String getTesterRetType() throws Throwable {
-        Type type = GenericSignatureTester.class.getDeclaredMethod("method1").getGenericReturnType();
-        return String.valueOf(type);
-    }
-
-    private String getTargetSourceFilename() {
-        try {
-            GenericSignatureTarget.throwException();
-        } catch (RuntimeException ex) {
-            return ex.getStackTrace()[0].getFileName();
-        }
-        return "Cannot get source file name";
-    }
-
-    // Prints dissassembled class bytes.
-    private void printDisassembled(String description, Class cls, byte[] bytes) throws Exception {
-        log(description + " -------------------");
-
-        File f = new File(cls.getSimpleName()+".class");
-        try (FileOutputStream fos = new FileOutputStream(f)) {
-            fos.write(bytes);
-        }
-        JDKToolLauncher javap = JDKToolLauncher.create("javap")
-                .addToolArg("-verbose")
-                .addToolArg("-p")       // Shows all classes and members.
-                //.addToolArg("-c")       // Prints out disassembled code
-                .addToolArg("-s")       // Prints internal type signatures.
-                .addToolArg(f.toString());
-        ProcessBuilder pb = new ProcessBuilder(javap.getCommand());
-        OutputAnalyzer out = ProcessTools.executeProcess(pb);
-        out.shouldHaveExitValue(0);
-        try {
-            Files.delete(f.toPath());
-        } catch (Exception ex) {
-            // ignore
-        }
-        out.asLines().forEach(s -> log(s));
-        log("==========================================");
-        Files.deleteIfExists(f.toPath());
-    }
-
-    private byte[] getNewClassBytes() {
-        byte[] bytecode = InMemoryJavaCompiler.compile(GenericSignatureTarget.class.getName(), newTargetClassSource, "-g");
-
-        ClassWriter cw = new ClassWriter(0);
-        ClassReader cr = new ClassReader(bytecode);
-        cr.accept(new ClassVisitor(Opcodes.ASM7, cw) {
-            private boolean sourceSet = false;
-            @Override
-            public void visitSource(String source, String debug) {
-                sourceSet = true;
-                log("Changing source: \"" + source + "\" -> \"" + sourceFileNameNew + "\"");
-                super.visitSource(sourceFileNameNew, debug);
-            }
-
-            @Override
-            public void visitEnd() {
-                if (!sourceSet) {
-                    log("Set source: \"" + sourceFileNameNew + "\"");
-                    super.visitSource(sourceFileNameNew, null);
-                }
-                super.visitEnd();
-            }
-        }, 0);
-        return cw.toByteArray();
-    }
-
-    private void runTest() throws Throwable {
-        Class targetClass = GenericSignatureTarget.class;
-
-        String oldSig = getTargetGenSig();
-        log("old target class sig: \"" + oldSig + "\"");
-
-        byte[] oldClassBytes = targetClass.getResourceAsStream(targetClass.getName() + ".class").readAllBytes();
-        printDisassembled("Old " + targetClass.getName(), targetClass, oldClassBytes);
-
-        log("Redefining " + targetClass.getName() + " class");
-        byte[] newClassBytes = getNewClassBytes();
-        printDisassembled("New " + targetClass.getName(), targetClass, newClassBytes);
-        RedefineClassHelper.redefineClass(targetClass, newClassBytes);
-
-        String newSig = getTargetGenSig();
-        log("new target class sig: \"" + newSig + "\"");
-
-        String newRetType = getTesterRetType();
-        log("new tester ret type: \"" + newRetType + "\"");
-
-        String newSrcFileName = getTargetSourceFilename();
-        log("new source file name: \"" + newSrcFileName + "\"");
-
-        Asserts.assertStringsEqual(expectedSigOld, oldSig, "wrong old generic signature");
-        Asserts.assertStringsEqual(expectedSigNew, newSig, "wrong new generic signature");
-        Asserts.assertStringsEqual(expectedRetType, newRetType, "wrong ret type");
-        Asserts.assertStringsEqual(sourceFileNameNew, newSrcFileName, "wrong new source file name");
-    }
-}
-- 
GitLab


From af18b1111a7382a366d26ea1646282bdfb4ac495 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Thu, 24 Mar 2022 06:02:09 +0000
Subject: [PATCH 191/345] 8283574: Use Klass::_id for type checks in the C++
 code

Reviewed-by: tschatzl, kbarrett
---
 .../share/gc/g1/g1FullGCMarker.inline.hpp     |  2 +-
 .../share/oops/instanceClassLoaderKlass.hpp   |  2 +-
 src/hotspot/share/oops/instanceKlass.cpp      |  8 +++---
 src/hotspot/share/oops/instanceKlass.hpp      | 26 +------------------
 .../share/oops/instanceMirrorKlass.hpp        |  4 +--
 src/hotspot/share/oops/instanceRefKlass.cpp   |  3 +--
 src/hotspot/share/oops/instanceRefKlass.hpp   |  2 +-
 src/hotspot/share/oops/klass.hpp              | 22 +++++++---------
 src/hotspot/share/oops/oop.cpp                |  9 ++++---
 src/hotspot/share/oops/oop.hpp                | 18 +++++++------
 src/hotspot/share/oops/oop.inline.hpp         |  9 ++++---
 11 files changed, 40 insertions(+), 65 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
index 256fd766f82..ce3013138ce 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
@@ -138,7 +138,7 @@ inline void G1FullGCMarker::follow_object(oop obj) {
   } else {
     obj->oop_iterate(mark_closure());
     if (VerifyDuringGC) {
-      if (obj->is_instance() && InstanceKlass::cast(obj->klass())->is_reference_instance_klass()) {
+      if (obj->is_instanceRef()) {
         return;
       }
       _verify_closure.set_containing_obj(obj);
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
index b0261854626..e1a42ae3181 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
@@ -43,7 +43,7 @@ public:
   static const KlassID ID = InstanceClassLoaderKlassID;
 
 private:
-  InstanceClassLoaderKlass(const ClassFileParser& parser) : InstanceKlass(parser, InstanceKlass::_kind_class_loader, ID) {}
+  InstanceClassLoaderKlass(const ClassFileParser& parser) : InstanceKlass(parser, ID) {}
 
 public:
   InstanceClassLoaderKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index e5dbd1f293e..f5dcaebd96a 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -442,13 +442,12 @@ InstanceKlass* InstanceKlass::allocate_instance_klass(const ClassFileParser& par
     if (class_name == vmSymbols::java_lang_Class()) {
       // mirror
       ik = new (loader_data, size, THREAD) InstanceMirrorKlass(parser);
-    }
-    else if (is_class_loader(class_name, parser)) {
+    } else if (is_class_loader(class_name, parser)) {
       // class loader
       ik = new (loader_data, size, THREAD) InstanceClassLoaderKlass(parser);
     } else {
       // normal
-      ik = new (loader_data, size, THREAD) InstanceKlass(parser, InstanceKlass::_kind_other);
+      ik = new (loader_data, size, THREAD) InstanceKlass(parser);
     }
   } else {
     // reference
@@ -486,7 +485,7 @@ Array<int>* InstanceKlass::create_new_default_vtable_indices(int len, TRAPS) {
   return vtable_indices;
 }
 
-InstanceKlass::InstanceKlass(const ClassFileParser& parser, unsigned kind, KlassID id) :
+InstanceKlass::InstanceKlass(const ClassFileParser& parser, KlassID id) :
   Klass(id),
   _nest_members(NULL),
   _nest_host(NULL),
@@ -501,7 +500,6 @@ InstanceKlass::InstanceKlass(const ClassFileParser& parser, unsigned kind, Klass
   _init_thread(NULL)
 {
   set_vtable_length(parser.vtable_size());
-  set_kind(kind);
   set_access_flags(parser.access_flags());
   if (parser.is_hidden()) set_is_hidden();
   set_layout_helper(Klass::instance_layout_helper(parser.layout_size(),
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 9ec3535e0dc..623c3e24a95 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -136,7 +136,7 @@ class InstanceKlass: public Klass {
   static const KlassID ID = InstanceKlassID;
 
  protected:
-  InstanceKlass(const ClassFileParser& parser, unsigned kind, KlassID id = ID);
+  InstanceKlass(const ClassFileParser& parser, KlassID id = ID);
 
  public:
   InstanceKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
@@ -229,15 +229,7 @@ class InstanceKlass: public Klass {
   // _idnum_allocated_count.
   u1              _init_state;              // state of class
 
-  // This can be used to quickly discriminate among the four kinds of
-  // InstanceKlass. This should be an enum (?)
-  static const unsigned _kind_other        = 0; // concrete InstanceKlass
-  static const unsigned _kind_reference    = 1; // InstanceRefKlass
-  static const unsigned _kind_class_loader = 2; // InstanceClassLoaderKlass
-  static const unsigned _kind_mirror       = 3; // InstanceMirrorKlass
-
   u1              _reference_type;                // reference type
-  u1              _kind;                          // kind of InstanceKlass
 
   enum {
     _misc_rewritten                           = 1 << 0,  // methods rewritten.
@@ -787,24 +779,8 @@ public:
   void set_has_resolved_methods() {
     _access_flags.set_has_resolved_methods();
   }
-private:
-
-  void set_kind(unsigned kind) {
-    _kind = (u1)kind;
-  }
-
-  bool is_kind(unsigned desired) const {
-    return _kind == (u1)desired;
-  }
 
 public:
-
-  // Other is anything that is not one of the more specialized kinds of InstanceKlass.
-  bool is_other_instance_klass() const        { return is_kind(_kind_other); }
-  bool is_reference_instance_klass() const    { return is_kind(_kind_reference); }
-  bool is_mirror_instance_klass() const       { return is_kind(_kind_mirror); }
-  bool is_class_loader_instance_klass() const { return is_kind(_kind_class_loader); }
-
 #if INCLUDE_JVMTI
 
   void init_previous_versions() {
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp
index 154151932f7..00258e13bc3 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.hpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp
@@ -50,7 +50,7 @@ class InstanceMirrorKlass: public InstanceKlass {
  private:
   static int _offset_of_static_fields;
 
-  InstanceMirrorKlass(const ClassFileParser& parser) : InstanceKlass(parser, InstanceKlass::_kind_mirror, ID) {}
+  InstanceMirrorKlass(const ClassFileParser& parser) : InstanceKlass(parser, ID) {}
 
  public:
   InstanceMirrorKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
@@ -60,7 +60,7 @@ class InstanceMirrorKlass: public InstanceKlass {
   }
 
   static const InstanceMirrorKlass* cast(const Klass* k) {
-    assert(InstanceKlass::cast(k)->is_mirror_instance_klass(), "cast to InstanceMirrorKlass");
+    assert(k->is_mirror_instance_klass(), "cast to InstanceMirrorKlass");
     return static_cast<const InstanceMirrorKlass*>(k);
   }
 
diff --git a/src/hotspot/share/oops/instanceRefKlass.cpp b/src/hotspot/share/oops/instanceRefKlass.cpp
index aab23761e27..0b3e5e4e0ec 100644
--- a/src/hotspot/share/oops/instanceRefKlass.cpp
+++ b/src/hotspot/share/oops/instanceRefKlass.cpp
@@ -87,7 +87,6 @@ void InstanceRefKlass::oop_verify_on(oop obj, outputStream* st) {
   oop next = java_lang_ref_Reference::next(obj);
   if (next != NULL) {
     guarantee(oopDesc::is_oop(next), "next field should be an oop");
-    guarantee(next->is_instance(), "next field should be an instance");
-    guarantee(InstanceKlass::cast(next->klass())->is_reference_instance_klass(), "next field verify failed");
+    guarantee(next->is_instanceRef(), "next field verify failed");
   }
 }
diff --git a/src/hotspot/share/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp
index 16a9bb53c3a..5e271ebb762 100644
--- a/src/hotspot/share/oops/instanceRefKlass.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.hpp
@@ -53,7 +53,7 @@ class InstanceRefKlass: public InstanceKlass {
   static const KlassID ID = InstanceRefKlassID;
 
  private:
-  InstanceRefKlass(const ClassFileParser& parser) : InstanceKlass(parser, InstanceKlass::_kind_reference, ID) {}
+  InstanceRefKlass(const ClassFileParser& parser) : InstanceKlass(parser, ID) {}
 
  public:
   InstanceRefKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index 9871036d576..f82ba4d9970 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -614,18 +614,16 @@ protected:
   }
  public:
   #endif
-  inline  bool is_instance_klass()            const { return assert_same_query(
-                                                      layout_helper_is_instance(layout_helper()),
-                                                      is_instance_klass_slow()); }
-  inline  bool is_array_klass()               const { return assert_same_query(
-                                                    layout_helper_is_array(layout_helper()),
-                                                    is_array_klass_slow()); }
-  inline  bool is_objArray_klass()            const { return assert_same_query(
-                                                    layout_helper_is_objArray(layout_helper()),
-                                                    is_objArray_klass_slow()); }
-  inline  bool is_typeArray_klass()           const { return assert_same_query(
-                                                    layout_helper_is_typeArray(layout_helper()),
-                                                    is_typeArray_klass_slow()); }
+
+  bool is_instance_klass()              const { return assert_same_query(_id <= InstanceClassLoaderKlassID, is_instance_klass_slow()); }
+  // Other is anything that is not one of the more specialized kinds of InstanceKlass.
+  bool is_other_instance_klass()        const { return _id == InstanceKlassID; }
+  bool is_reference_instance_klass()    const { return _id == InstanceRefKlassID; }
+  bool is_mirror_instance_klass()       const { return _id == InstanceMirrorKlassID; }
+  bool is_class_loader_instance_klass() const { return _id == InstanceClassLoaderKlassID; }
+  bool is_array_klass()                 const { return assert_same_query( _id >= TypeArrayKlassID, is_array_klass_slow()); }
+  bool is_objArray_klass()              const { return assert_same_query( _id == ObjArrayKlassID,  is_objArray_klass_slow()); }
+  bool is_typeArray_klass()             const { return assert_same_query( _id == TypeArrayKlassID, is_typeArray_klass_slow()); }
   #undef assert_same_query
 
   // Access flags
diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp
index 14592997091..17e96450cf2 100644
--- a/src/hotspot/share/oops/oop.cpp
+++ b/src/hotspot/share/oops/oop.cpp
@@ -134,10 +134,11 @@ void VerifyOopClosure::do_oop(oop* p)       { VerifyOopClosure::do_oop_work(p);
 void VerifyOopClosure::do_oop(narrowOop* p) { VerifyOopClosure::do_oop_work(p); }
 
 // type test operations that doesn't require inclusion of oop.inline.hpp.
-bool oopDesc::is_instance_noinline()          const { return is_instance();            }
-bool oopDesc::is_array_noinline()             const { return is_array();               }
-bool oopDesc::is_objArray_noinline()          const { return is_objArray();            }
-bool oopDesc::is_typeArray_noinline()         const { return is_typeArray();           }
+bool oopDesc::is_instance_noinline()    const { return is_instance();    }
+bool oopDesc::is_instanceRef_noinline() const { return is_instanceRef(); }
+bool oopDesc::is_array_noinline()       const { return is_array();       }
+bool oopDesc::is_objArray_noinline()    const { return is_objArray();    }
+bool oopDesc::is_typeArray_noinline()   const { return is_typeArray();   }
 
 bool oopDesc::has_klass_gap() {
   // Only has a klass gap when compressed class pointers are used.
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index 994bb677032..08f354a905d 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -107,16 +107,18 @@ class oopDesc {
   inline size_t size_given_klass(Klass* klass);
 
   // type test operations (inlined in oop.inline.hpp)
-  inline bool is_instance()            const;
-  inline bool is_array()               const;
-  inline bool is_objArray()            const;
-  inline bool is_typeArray()           const;
+  inline bool is_instance()    const;
+  inline bool is_instanceRef() const;
+  inline bool is_array()       const;
+  inline bool is_objArray()    const;
+  inline bool is_typeArray()   const;
 
   // type test operations that don't require inclusion of oop.inline.hpp.
-  bool is_instance_noinline()          const;
-  bool is_array_noinline()             const;
-  bool is_objArray_noinline()          const;
-  bool is_typeArray_noinline()         const;
+  bool is_instance_noinline()    const;
+  bool is_instanceRef_noinline() const;
+  bool is_array_noinline()       const;
+  bool is_objArray_noinline()    const;
+  bool is_typeArray_noinline()   const;
 
  protected:
   inline oop        as_oop() const { return const_cast<oopDesc*>(this); }
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index 17ce5bed561..d8ff94178c5 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -195,10 +195,11 @@ size_t oopDesc::size_given_klass(Klass* klass)  {
   return s;
 }
 
-bool oopDesc::is_instance()  const { return klass()->is_instance_klass();  }
-bool oopDesc::is_array()     const { return klass()->is_array_klass();     }
-bool oopDesc::is_objArray()  const { return klass()->is_objArray_klass();  }
-bool oopDesc::is_typeArray() const { return klass()->is_typeArray_klass(); }
+bool oopDesc::is_instance()    const { return klass()->is_instance_klass();           }
+bool oopDesc::is_instanceRef() const { return klass()->is_reference_instance_klass(); }
+bool oopDesc::is_array()       const { return klass()->is_array_klass();              }
+bool oopDesc::is_objArray()    const { return klass()->is_objArray_klass();           }
+bool oopDesc::is_typeArray()   const { return klass()->is_typeArray_klass();          }
 
 template<typename T>
 T*       oopDesc::field_addr(int offset)     const { return reinterpret_cast<T*>(cast_from_oop<intptr_t>(as_oop()) + offset); }
-- 
GitLab


From e6f707aa76ac231bef7d0abf1dd643bd7471067f Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 24 Mar 2022 06:31:12 +0000
Subject: [PATCH 192/345] 8283437: Refactor imageio classes javadoc to use
 @throws instead of @exception

Reviewed-by: serb
---
 .../imageio/plugins/bmp/BMPImageReader.java   |   6 +-
 .../plugins/common/BogusColorSpace.java       |   4 +-
 .../imageio/plugins/common/LZWCompressor.java |   6 +-
 .../plugins/common/PaletteBuilder.java        |  12 +-
 .../imageio/plugins/jpeg/JPEGImageReader.java |   4 +-
 .../imageio/plugins/png/PNGImageWriter.java   |   2 +-
 .../plugins/tiff/TIFFDecompressor.java        |   2 +-
 .../share/classes/javax/imageio/IIOImage.java |  12 +-
 .../share/classes/javax/imageio/IIOParam.java |  16 +-
 .../javax/imageio/IIOParamController.java     |   2 +-
 .../share/classes/javax/imageio/ImageIO.java  |  62 ++---
 .../classes/javax/imageio/ImageReadParam.java |   8 +-
 .../classes/javax/imageio/ImageReader.java    | 240 +++++++++---------
 .../javax/imageio/ImageTranscoder.java        |   4 +-
 .../javax/imageio/ImageTypeSpecifier.java     |  74 +++---
 .../javax/imageio/ImageWriteParam.java        | 122 ++++-----
 .../classes/javax/imageio/ImageWriter.java    | 228 ++++++++---------
 .../javax/imageio/metadata/IIOMetadata.java   |  30 +--
 .../metadata/IIOMetadataController.java       |   2 +-
 .../imageio/metadata/IIOMetadataFormat.java   | 106 ++++----
 .../metadata/IIOMetadataFormatImpl.java       |  82 +++---
 .../imageio/metadata/IIOMetadataNode.java     |   8 +-
 .../plugins/jpeg/JPEGImageReadParam.java      |   2 +-
 .../plugins/jpeg/JPEGImageWriteParam.java     |   6 +-
 .../javax/imageio/spi/IIOServiceProvider.java |   4 +-
 .../imageio/spi/ImageInputStreamSpi.java      |  14 +-
 .../imageio/spi/ImageOutputStreamSpi.java     |  14 +-
 .../javax/imageio/spi/ImageReaderSpi.java     |  22 +-
 .../imageio/spi/ImageReaderWriterSpi.java     |  12 +-
 .../javax/imageio/spi/ImageWriterSpi.java     |  22 +-
 .../javax/imageio/spi/ServiceRegistry.java    |  44 ++--
 .../stream/FileCacheImageInputStream.java     |   4 +-
 .../stream/FileCacheImageOutputStream.java    |  12 +-
 .../imageio/stream/FileImageInputStream.java  |  10 +-
 .../imageio/stream/FileImageOutputStream.java |  14 +-
 .../imageio/stream/ImageInputStream.java      | 170 ++++++-------
 .../imageio/stream/ImageInputStreamImpl.java  |  22 +-
 .../imageio/stream/ImageOutputStream.java     |  88 +++----
 .../imageio/stream/ImageOutputStreamImpl.java |   2 +-
 .../javax/imageio/stream/MemoryCache.java     |  14 +-
 .../stream/MemoryCacheImageInputStream.java   |   2 +-
 .../stream/MemoryCacheImageOutputStream.java  |   2 +-
 .../sun/awt/image/ByteBandedRaster.java       |   4 +-
 .../sun/awt/image/ByteComponentRaster.java    |   4 +-
 .../sun/awt/image/ByteInterleavedRaster.java  |   4 +-
 .../sun/awt/image/BytePackedRaster.java       |   6 +-
 .../sun/awt/image/IntegerComponentRaster.java |   4 +-
 .../awt/image/IntegerInterleavedRaster.java   |   4 +-
 .../sun/awt/image/ShortBandedRaster.java      |   4 +-
 .../sun/awt/image/ShortComponentRaster.java   |   4 +-
 .../sun/awt/image/ShortInterleavedRaster.java |   4 +-
 51 files changed, 775 insertions(+), 775 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
index 2e1c2db03ca..81baefe8155 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
@@ -254,11 +254,11 @@ public class BMPImageReader extends ImageReader implements BMPConstants {
     /**
      * Process the image header.
      *
-     * @exception IllegalStateException if source stream is not set.
+     * @throws IllegalStateException if source stream is not set.
      *
-     * @exception IOException if image stream is corrupted.
+     * @throws IOException if image stream is corrupted.
      *
-     * @exception IllegalArgumentException if the image stream does not contain
+     * @throws IllegalArgumentException if the image stream does not contain
      *             a BMP image, or if a sample model instance to describe the
      *             image can not be created.
      */
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
index b6f73efc712..a62008dfbd4 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
@@ -38,7 +38,7 @@ public class BogusColorSpace extends ColorSpace {
      *
      * @param numComponents The number of components in the
      * {@code ColorSpace}.
-     * @exception IllegalArgumentException if {@code numComponents}
+     * @throws IllegalArgumentException if {@code numComponents}
      * is less than 1.
      */
     private static int getType(int numComponents) {
@@ -66,7 +66,7 @@ public class BogusColorSpace extends ColorSpace {
      *
      * @param numComponents The number of components in the
      * {@code ColorSpace}.
-     * @exception IllegalArgumentException if {@code numComponents}
+     * @throws IllegalArgumentException if {@code numComponents}
      * is less than 1.
      */
     public BogusColorSpace(int numComponents) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java
index 0177848ad80..52f66f5eafa 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java
@@ -65,7 +65,7 @@ public class LZWCompressor {
      * @param out destination for compressed data
      * @param codeSize the initial code size for the LZW compressor
      * @param TIFF flag indicating that TIFF lzw fudge needs to be applied
-     * @exception IOException if underlying output stream error
+     * @throws IOException if underlying output stream error
      **/
     public LZWCompressor(ImageOutputStream out, int codeSize, boolean TIFF)
         throws IOException
@@ -90,7 +90,7 @@ public class LZWCompressor {
 
     /**
      * @param buf data to be compressed to output stream
-     * @exception IOException if underlying output stream error
+     * @throws IOException if underlying output stream error
      **/
     public void compress(byte[] buf, int offset, int length)
         throws IOException
@@ -129,7 +129,7 @@ public class LZWCompressor {
      * Indicate to compressor that no more data to go so write out
      * any remaining buffered data.
      *
-     * @exception IOException if underlying output stream error
+     * @throws IOException if underlying output stream error
      */
     public void flush() throws IOException {
         if (prefix != -1) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java
index b4541d5c662..00d2dde0e88 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java
@@ -77,10 +77,10 @@ public class PaletteBuilder {
      * Result image then is an approximation constructed by octree
      * quantization method.
      *
-     * @exception IllegalArgumentException if {@code src} is
+     * @throws IllegalArgumentException if {@code src} is
      * {@code null}.
      *
-     * @exception UnsupportedOperationException if implemented method
+     * @throws UnsupportedOperationException if implemented method
      * is unable to create approximation of {@code src}
      * and {@code canCreatePalette} returns {@code false}.
      *
@@ -98,10 +98,10 @@ public class PaletteBuilder {
      * {@code img}. If number of colors in the given image exceeds
      * maximum palette size closest colors would be merged.
      *
-     * @exception IllegalArgumentException if {@code img} is
+     * @throws IllegalArgumentException if {@code img} is
      * {@code null}.
      *
-     * @exception UnsupportedOperationException if implemented method
+     * @throws UnsupportedOperationException if implemented method
      * is unable to create approximation of {@code img}
      * and {@code canCreatePalette} returns {@code false}.
      *
@@ -124,7 +124,7 @@ public class PaletteBuilder {
      * @return {@code true} if the {@code PaletteBuilder}
      * is likely to be able to create palette for this image type.
      *
-     * @exception IllegalArgumentException if {@code type}
+     * @throws IllegalArgumentException if {@code type}
      * is {@code null}.
      */
     public static boolean canCreatePalette(ImageTypeSpecifier type) {
@@ -144,7 +144,7 @@ public class PaletteBuilder {
      * @return {@code true} if the {@code PaletteBuilder}
      * is likely to be able to create palette for this image type.
      *
-     * @exception IllegalArgumentException if {@code image}
+     * @throws IllegalArgumentException if {@code image}
      * is {@code null}.
      */
     public static boolean canCreatePalette(RenderedImage image) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
index a7edf73cb80..dac1b79d4ea 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
@@ -487,9 +487,9 @@ public class JPEGImageReader extends ImageReader {
     /**
      * Sets the input stream to the start of the requested image.
      * <pre>
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
      * </pre>
      */
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
index ce6f771ecdc..27707613f76 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
@@ -322,7 +322,7 @@ final class PNGImageWriteParam extends ImageWriteParam {
      * <p> The default implementation resets the compression quality
      * to <code>0.5F</code>.
      *
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * <code>MODE_EXPLICIT</code>.
      */
     @Override
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java
index 4516ce0ad82..bd7eb568fd8 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java
@@ -2373,7 +2373,7 @@ public abstract class TIFFDecompressor {
      * and instead override the {@code decodeRaw} and/or
      * {@code getRawImageType} methods.
      *
-     * @exception IOException if an error occurs in
+     * @throws IOException if an error occurs in
      * {@code decodeRaw}.
      */
     public void decode() throws IOException {
diff --git a/src/java.desktop/share/classes/javax/imageio/IIOImage.java b/src/java.desktop/share/classes/javax/imageio/IIOImage.java
index ad1c18444ef..c830189d0ba 100644
--- a/src/java.desktop/share/classes/javax/imageio/IIOImage.java
+++ b/src/java.desktop/share/classes/javax/imageio/IIOImage.java
@@ -99,7 +99,7 @@ public class IIOImage {
      * @param metadata an {@code IIOMetadata} object, or
      * {@code null}.
      *
-     * @exception IllegalArgumentException if {@code image} is
+     * @throws IllegalArgumentException if {@code image} is
      * {@code null}.
      */
     public IIOImage(RenderedImage image,
@@ -127,7 +127,7 @@ public class IIOImage {
      * @param metadata an {@code IIOMetadata} object, or
      * {@code null}.
      *
-     * @exception IllegalArgumentException if {@code raster} is
+     * @throws IllegalArgumentException if {@code raster} is
      * {@code null}.
      */
     public IIOImage(Raster raster,
@@ -163,7 +163,7 @@ public class IIOImage {
      *
      * @param image a {@code RenderedImage}.
      *
-     * @exception IllegalArgumentException if {@code image} is
+     * @throws IllegalArgumentException if {@code image} is
      * {@code null}.
      *
      * @see #getRenderedImage
@@ -213,7 +213,7 @@ public class IIOImage {
      *
      * @param raster a {@code Raster}.
      *
-     * @exception IllegalArgumentException if {@code raster} is
+     * @throws IllegalArgumentException if {@code raster} is
      * {@code null}.
      *
      * @see #getRaster
@@ -245,9 +245,9 @@ public class IIOImage {
      *
      * @return a thumbnail image, as a {@code BufferedImage}.
      *
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * negative or larger than the largest valid index.
-     * @exception ClassCastException if a
+     * @throws ClassCastException if a
      * non-{@code BufferedImage} object is encountered in the
      * list of thumbnails at the given index.
      *
diff --git a/src/java.desktop/share/classes/javax/imageio/IIOParam.java b/src/java.desktop/share/classes/javax/imageio/IIOParam.java
index 360ec532895..36b10f1eacc 100644
--- a/src/java.desktop/share/classes/javax/imageio/IIOParam.java
+++ b/src/java.desktop/share/classes/javax/imageio/IIOParam.java
@@ -162,15 +162,15 @@ public abstract class IIOParam {
      * @param sourceRegion a {@code Rectangle} specifying the
      * source region of interest, or {@code null}.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code sourceRegion} is non-{@code null} and either
      * {@code sourceRegion.x} or {@code sourceRegion.y} is
      * negative.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code sourceRegion} is non-{@code null} and either
      * {@code sourceRegion.width} or
      * {@code sourceRegion.height} is negative or 0.
-     * @exception IllegalStateException if subsampling is such that
+     * @throws IllegalStateException if subsampling is such that
      * this region will have a subsampled width or height of zero.
      *
      * @see #getSourceRegion
@@ -290,10 +290,10 @@ public abstract class IIOParam {
      * within the region, or within the image if no region is set.
      * @param subsamplingYOffset the horizontal offset of the first subsample
      * within the region, or within the image if no region is set.
-     * @exception IllegalArgumentException if either period is
+     * @throws IllegalArgumentException if either period is
      * negative or 0, or if either grid offset is negative or greater than
      * the corresponding period.
-     * @exception IllegalStateException if the source region is such that
+     * @throws IllegalStateException if the source region is such that
      * the subsampled output would contain no pixels.
      */
     public void setSourceSubsampling(int sourceXSubsampling,
@@ -413,7 +413,7 @@ public abstract class IIOParam {
      * @param sourceBands an array of integer band indices to be
      * used.
      *
-     * @exception IllegalArgumentException if {@code sourceBands}
+     * @throws IllegalArgumentException if {@code sourceBands}
      * contains a negative or duplicate value.
      *
      * @see #getSourceBands
@@ -537,7 +537,7 @@ public abstract class IIOParam {
      * @param destinationOffset the offset in the destination, as a
      * {@code Point}.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code destinationOffset} is {@code null}.
      *
      * @see #getDestinationOffset
@@ -658,7 +658,7 @@ public abstract class IIOParam {
      *
      * @return {@code true} if the controller completed normally.
      *
-     * @exception IllegalStateException if there is no controller
+     * @throws IllegalStateException if there is no controller
      * currently installed.
      *
      * @see IIOParamController
diff --git a/src/java.desktop/share/classes/javax/imageio/IIOParamController.java b/src/java.desktop/share/classes/javax/imageio/IIOParamController.java
index 5d8a7017ccd..9389a0093cd 100644
--- a/src/java.desktop/share/classes/javax/imageio/IIOParamController.java
+++ b/src/java.desktop/share/classes/javax/imageio/IIOParamController.java
@@ -111,7 +111,7 @@ public interface IIOParamController {
      * @return {@code true} if the {@code IIOParam} has been
      * modified, {@code false} otherwise.
      *
-     * @exception IllegalArgumentException if {@code param} is
+     * @throws IllegalArgumentException if {@code param} is
      * {@code null} or is not an instance of the correct class.
      */
     boolean activate(IIOParam param);
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageIO.java b/src/java.desktop/share/classes/javax/imageio/ImageIO.java
index 8c62ef92b11..9e87640967b 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageIO.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageIO.java
@@ -277,9 +277,9 @@ public final class ImageIO {
      *
      * @see File#createTempFile(String, String, File)
      *
-     * @exception SecurityException if the security manager denies
+     * @throws SecurityException if the security manager denies
      * access to the directory.
-     * @exception IllegalArgumentException if {@code cacheDir} is
+     * @throws IllegalArgumentException if {@code cacheDir} is
      * non-{@code null} but is not a directory.
      *
      * @see #getCacheDirectory
@@ -326,9 +326,9 @@ public final class ImageIO {
      *
      * @return an {@code ImageInputStream}, or {@code null}.
      *
-     * @exception IllegalArgumentException if {@code input}
+     * @throws IllegalArgumentException if {@code input}
      * is {@code null}.
-     * @exception IOException if a cache file is needed but cannot be
+     * @throws IOException if a cache file is needed but cannot be
      * created.
      *
      * @see javax.imageio.spi.ImageInputStreamSpi
@@ -388,9 +388,9 @@ public final class ImageIO {
      * @return an {@code ImageOutputStream}, or
      * {@code null}.
      *
-     * @exception IllegalArgumentException if {@code output} is
+     * @throws IllegalArgumentException if {@code output} is
      * {@code null}.
-     * @exception IOException if a cache file is needed but cannot be
+     * @throws IOException if a cache file is needed but cannot be
      * created.
      *
      * @see javax.imageio.spi.ImageOutputStreamSpi
@@ -637,7 +637,7 @@ public final class ImageIO {
      *
      * @return an {@code Iterator} containing {@code ImageReader}s.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * {@code null}.
      *
      * @see javax.imageio.spi.ImageReaderSpi#canDecodeInput
@@ -697,7 +697,7 @@ public final class ImageIO {
      * @return an {@code Iterator} containing
      * {@code ImageReader}s.
      *
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null}.
      *
      * @see javax.imageio.spi.ImageReaderSpi#getFormatNames
@@ -732,7 +732,7 @@ public final class ImageIO {
      * @return an {@code Iterator} containing
      * {@code ImageReader}s.
      *
-     * @exception IllegalArgumentException if {@code fileSuffix}
+     * @throws IllegalArgumentException if {@code fileSuffix}
      * is {@code null}.
      *
      * @see javax.imageio.spi.ImageReaderSpi#getFileSuffixes
@@ -767,7 +767,7 @@ public final class ImageIO {
      * @return an {@code Iterator} containing
      * {@code ImageReader}s.
      *
-     * @exception IllegalArgumentException if {@code MIMEType} is
+     * @throws IllegalArgumentException if {@code MIMEType} is
      * {@code null}.
      *
      * @see javax.imageio.spi.ImageReaderSpi#getMIMETypes
@@ -880,7 +880,7 @@ public final class ImageIO {
      * @return an {@code Iterator} containing
      * {@code ImageWriter}s.
      *
-     * @exception IllegalArgumentException if {@code formatName} is
+     * @throws IllegalArgumentException if {@code formatName} is
      * {@code null}.
      *
      * @see javax.imageio.spi.ImageWriterSpi#getFormatNames
@@ -914,7 +914,7 @@ public final class ImageIO {
      *
      * @return an {@code Iterator} containing {@code ImageWriter}s.
      *
-     * @exception IllegalArgumentException if {@code fileSuffix} is
+     * @throws IllegalArgumentException if {@code fileSuffix} is
      * {@code null}.
      *
      * @see javax.imageio.spi.ImageWriterSpi#getFileSuffixes
@@ -948,7 +948,7 @@ public final class ImageIO {
      *
      * @return an {@code Iterator} containing {@code ImageWriter}s.
      *
-     * @exception IllegalArgumentException if {@code MIMEType} is
+     * @throws IllegalArgumentException if {@code MIMEType} is
      * {@code null}.
      *
      * @see javax.imageio.spi.ImageWriterSpi#getMIMETypes
@@ -995,7 +995,7 @@ public final class ImageIO {
      *
      * @return an {@code ImageWriter}, or null.
      *
-     * @exception IllegalArgumentException if {@code reader} is
+     * @throws IllegalArgumentException if {@code reader} is
      * {@code null}.
      *
      * @see #getImageReader(ImageWriter)
@@ -1075,7 +1075,7 @@ public final class ImageIO {
      *
      * @return an {@code ImageReader}, or null.
      *
-     * @exception IllegalArgumentException if {@code writer} is
+     * @throws IllegalArgumentException if {@code writer} is
      * {@code null}.
      *
      * @see #getImageWriter(ImageReader)
@@ -1151,7 +1151,7 @@ public final class ImageIO {
      *
      * @return an {@code Iterator} containing {@code ImageWriter}s.
      *
-     * @exception IllegalArgumentException if any parameter is
+     * @throws IllegalArgumentException if any parameter is
      * {@code null}.
      *
      * @see javax.imageio.spi.ImageWriterSpi#canEncodeImage(ImageTypeSpecifier)
@@ -1238,7 +1238,7 @@ public final class ImageIO {
      * @return an {@code Iterator} containing
      * {@code ImageTranscoder}s.
      *
-     * @exception IllegalArgumentException if {@code reader} or
+     * @throws IllegalArgumentException if {@code reader} or
      * {@code writer} is {@code null}.
      */
     public static Iterator<ImageTranscoder>
@@ -1295,9 +1295,9 @@ public final class ImageIO {
      * @return a {@code BufferedImage} containing the decoded
      * contents of the input, or {@code null}.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * {@code null}.
-     * @exception IOException if an error occurs during reading or when not
+     * @throws IOException if an error occurs during reading or when not
      * able to create required ImageInputStream.
      */
     public static BufferedImage read(File input) throws IOException {
@@ -1346,9 +1346,9 @@ public final class ImageIO {
      * @return a {@code BufferedImage} containing the decoded
      * contents of the input, or {@code null}.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * {@code null}.
-     * @exception IOException if an error occurs during reading or when not
+     * @throws IOException if an error occurs during reading or when not
      * able to create required ImageInputStream.
      */
     public static BufferedImage read(InputStream input) throws IOException {
@@ -1390,9 +1390,9 @@ public final class ImageIO {
      * @return a {@code BufferedImage} containing the decoded
      * contents of the input, or {@code null}.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * {@code null}.
-     * @exception IOException if an error occurs during reading or when not
+     * @throws IOException if an error occurs during reading or when not
      * able to create required ImageInputStream.
      */
     public static BufferedImage read(URL input) throws IOException {
@@ -1443,9 +1443,9 @@ public final class ImageIO {
      * @return a {@code BufferedImage} containing the decoded
      * contents of the input, or {@code null}.
      *
-     * @exception IllegalArgumentException if {@code stream} is
+     * @throws IllegalArgumentException if {@code stream} is
      * {@code null}.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public static BufferedImage read(ImageInputStream stream)
         throws IOException {
@@ -1489,9 +1489,9 @@ public final class ImageIO {
      *
      * @return {@code false} if no appropriate writer is found.
      *
-     * @exception IllegalArgumentException if any parameter is
+     * @throws IllegalArgumentException if any parameter is
      * {@code null}.
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public static boolean write(RenderedImage im,
                                 String formatName,
@@ -1522,9 +1522,9 @@ public final class ImageIO {
      *
      * @return {@code false} if no appropriate writer is found.
      *
-     * @exception IllegalArgumentException if any parameter is
+     * @throws IllegalArgumentException if any parameter is
      * {@code null}.
-     * @exception IOException if an error occurs during writing or when not
+     * @throws IOException if an error occurs during writing or when not
      * able to create required ImageOutputStream.
      */
     public static boolean write(RenderedImage im,
@@ -1570,9 +1570,9 @@ public final class ImageIO {
      *
      * @return {@code false} if no appropriate writer is found.
      *
-     * @exception IllegalArgumentException if any parameter is
+     * @throws IllegalArgumentException if any parameter is
      * {@code null}.
-     * @exception IOException if an error occurs during writing or when not
+     * @throws IOException if an error occurs during writing or when not
      * able to create required ImageOutputStream.
      */
     public static boolean write(RenderedImage im,
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java b/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java
index d2181a18115..00866f60e7b 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageReadParam.java
@@ -272,7 +272,7 @@ public class ImageReadParam extends IIOParam {
      * @param destinationBands an array of integer band indices to be
      * used.
      *
-     * @exception IllegalArgumentException if {@code destinationBands}
+     * @throws IllegalArgumentException if {@code destinationBands}
      * contains a negative or duplicate value.
      *
      * @see #getDestinationBands
@@ -360,9 +360,9 @@ public class ImageReadParam extends IIOParam {
      * @param size a {@code Dimension} indicating the desired
      * width and height.
      *
-     * @exception IllegalArgumentException if either the width or the
+     * @throws IllegalArgumentException if either the width or the
      * height is negative or 0.
-     * @exception UnsupportedOperationException if image resizing
+     * @throws UnsupportedOperationException if image resizing
      * is not supported by this plug-in.
      *
      * @see #getSourceRenderSize
@@ -433,7 +433,7 @@ public class ImageReadParam extends IIOParam {
      * @param minPass the index of the first pass to be decoded.
      * @param numPasses the maximum number of passes to be decoded.
      *
-     * @exception IllegalArgumentException if {@code minPass} is
+     * @throws IllegalArgumentException if {@code minPass} is
      * negative, {@code numPasses} is negative or 0, or
      * {@code numPasses} is smaller than
      * {@code Integer.MAX_VALUE} but
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageReader.java b/src/java.desktop/share/classes/javax/imageio/ImageReader.java
index e17a5f2e796..97092ec7de9 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageReader.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageReader.java
@@ -196,7 +196,7 @@ public abstract class ImageReader {
      * provider, or which desire a different naming policy should
      * override this method.
      *
-     * @exception IOException if an error occurs reading the
+     * @throws IOException if an error occurs reading the
      * information from the input source.
      *
      * @return the format name, as a {@code String}.
@@ -276,7 +276,7 @@ public abstract class ImageReader {
      * @param ignoreMetadata if {@code true}, metadata
      * may be ignored during reads.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * not an instance of one of the classes returned by the
      * originating service provider's {@code getInputTypes}
      * method, or is not an {@code ImageInputStream}.
@@ -343,7 +343,7 @@ public abstract class ImageReader {
      * @param seekForwardOnly if {@code true}, images and metadata
      * may only be read in ascending order from this input source.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * not an instance of one of the classes returned by the
      * originating service provider's {@code getInputTypes}
      * method, or is not an {@code ImageInputStream}.
@@ -369,7 +369,7 @@ public abstract class ImageReader {
      * @param input the {@code ImageInputStream} or other
      * {@code Object} to use for future decoding.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * not an instance of one of the classes returned by the
      * originating service provider's {@code getInputTypes}
      * method, or is not an {@code ImageInputStream}.
@@ -470,7 +470,7 @@ public abstract class ImageReader {
      * @param locale the desired {@code Locale}, or
      * {@code null}.
      *
-     * @exception IllegalArgumentException if {@code locale} is
+     * @throws IllegalArgumentException if {@code locale} is
      * non-{@code null} but is not one of the values returned by
      * {@code getAvailableLocales}.
      *
@@ -538,10 +538,10 @@ public abstract class ImageReader {
      * {@code -1} if {@code allowSearch} is
      * {@code false} and a search would be required.
      *
-     * @exception IllegalStateException if the input source has not been set,
+     * @throws IllegalStateException if the input source has not been set,
      * or if the input has been specified with {@code seekForwardOnly}
      * set to {@code true}.
-     * @exception IOException if an error occurs reading the
+     * @throws IOException if an error occurs reading the
      * information from the input source.
      *
      * @see #setInput
@@ -559,10 +559,10 @@ public abstract class ImageReader {
      *
      * @return the width of the image, as an {@code int}.
      *
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs reading the width
+     * @throws IOException if an error occurs reading the width
      * information from the input source.
      */
     public abstract int getWidth(int imageIndex) throws IOException;
@@ -578,10 +578,10 @@ public abstract class ImageReader {
      *
      * @return the height of the image, as an {@code int}.
      *
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs reading the height
+     * @throws IOException if an error occurs reading the height
      * information from the input source.
      */
     public abstract int getHeight(int imageIndex) throws IOException;
@@ -617,12 +617,12 @@ public abstract class ImageReader {
      * @return {@code true} if reading a region of interest of
      * the given image is likely to be efficient.
      *
-     * @exception IllegalStateException if an input source is required
+     * @throws IllegalStateException if an input source is required
      * to determine the return value, but none has been set.
-     * @exception IndexOutOfBoundsException if an image must be
+     * @throws IndexOutOfBoundsException if an image must be
      * accessed to determine the return value, but the supplied index
      * is out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public boolean isRandomAccessEasy(int imageIndex) throws IOException {
         return false;
@@ -644,10 +644,10 @@ public abstract class ImageReader {
      * @return a {@code float} indicating the aspect ratio of the
      * given image.
      *
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public float getAspectRatio(int imageIndex) throws IOException {
         return (float)getWidth(imageIndex)/getHeight(imageIndex);
@@ -669,10 +669,10 @@ public abstract class ImageReader {
      *
      * @return an {@code ImageTypeSpecifier}.
      *
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs reading the format
+     * @throws IOException if an error occurs reading the format
      * information from the input source.
      */
     public ImageTypeSpecifier getRawImageType(int imageIndex)
@@ -699,10 +699,10 @@ public abstract class ImageReader {
      * {@code ImageTypeSpecifier} representing suggested image
      * types for decoding the current given image.
      *
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs reading the format
+     * @throws IOException if an error occurs reading the format
      * information from the input source.
      *
      * @see ImageReadParam#setDestination(BufferedImage)
@@ -739,7 +739,7 @@ public abstract class ImageReader {
      *
      * @return an {@code IIOMetadata} object, or {@code null}.
      *
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public abstract IIOMetadata getStreamMetadata() throws IOException;
 
@@ -778,11 +778,11 @@ public abstract class ImageReader {
      *
      * @return an {@code IIOMetadata} object, or {@code null}.
      *
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code nodeNames}
+     * @throws IllegalArgumentException if {@code nodeNames}
      * is {@code null}.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public IIOMetadata getStreamMetadata(String formatName,
                                          Set<String> nodeNames)
@@ -839,11 +839,11 @@ public abstract class ImageReader {
      * @return an {@code IIOMetadata} object, or
      * {@code null}.
      *
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public abstract IIOMetadata getImageMetadata(int imageIndex)
         throws IOException;
@@ -885,15 +885,15 @@ public abstract class ImageReader {
      *
      * @return an {@code IIOMetadata} object, or {@code null}.
      *
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code nodeNames}
+     * @throws IllegalArgumentException if {@code nodeNames}
      * is {@code null}.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public IIOMetadata getImageMetadata(int imageIndex,
                                         String formatName,
@@ -928,11 +928,11 @@ public abstract class ImageReader {
      * @return the desired portion of the image as a
      * {@code BufferedImage}.
      *
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public BufferedImage read(int imageIndex) throws IOException {
         return read(imageIndex, null);
@@ -980,18 +980,18 @@ public abstract class ImageReader {
      * @return the desired portion of the image as a
      * {@code BufferedImage}.
      *
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IllegalArgumentException if the set of source and
+     * @throws IllegalArgumentException if the set of source and
      * destination bands specified by
      * {@code param.getSourceBands} and
      * {@code param.getDestinationBands} differ in length or
      * include indices that are out of bounds.
-     * @exception IllegalArgumentException if the resulting image would
+     * @throws IllegalArgumentException if the resulting image would
      * have a width or height less than 1.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public abstract BufferedImage read(int imageIndex, ImageReadParam param)
         throws IOException;
@@ -1043,18 +1043,18 @@ public abstract class ImageReader {
      * of the image, a set of thumbnails, and associated image
      * metadata.
      *
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IllegalArgumentException if the set of source and
+     * @throws IllegalArgumentException if the set of source and
      * destination bands specified by
      * {@code param.getSourceBands} and
      * {@code param.getDestinationBands} differ in length or
      * include indices that are out of bounds.
-     * @exception IllegalArgumentException if the resulting image
+     * @throws IllegalArgumentException if the resulting image
      * would have a width or height less than 1.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public IIOImage readAll(int imageIndex, ImageReadParam param)
         throws IOException {
@@ -1134,19 +1134,19 @@ public abstract class ImageReader {
      * @return an {@code Iterator} representing the
      * contents of the input source as {@code IIOImage}s.
      *
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IllegalArgumentException if any
+     * @throws IllegalArgumentException if any
      * non-{@code null} element of {@code params} is not an
      * {@code ImageReadParam}.
-     * @exception IllegalArgumentException if the set of source and
+     * @throws IllegalArgumentException if the set of source and
      * destination bands specified by
      * {@code param.getSourceBands} and
      * {@code param.getDestinationBands} differ in length or
      * include indices that are out of bounds.
-     * @exception IllegalArgumentException if a resulting image would
+     * @throws IllegalArgumentException if a resulting image would
      * have a width or height less than 1.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      *
      * @see ImageReadParam
      * @see IIOImage
@@ -1267,13 +1267,13 @@ public abstract class ImageReader {
      * @return the desired portion of the image as a
      * {@code Raster}.
      *
-     * @exception UnsupportedOperationException if this plug-in does not
+     * @throws UnsupportedOperationException if this plug-in does not
      * support reading raw {@code Raster}s.
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      *
      * @see #canReadRaster
      * @see #read
@@ -1310,12 +1310,12 @@ public abstract class ImageReader {
      *
      * @return {@code true} if the image is tiled.
      *
-     * @exception IllegalStateException if an input source is required
+     * @throws IllegalStateException if an input source is required
      * to determine the return value, but none has been set.
-     * @exception IndexOutOfBoundsException if an image must be
+     * @throws IndexOutOfBoundsException if an image must be
      * accessed to determine the return value, but the supplied index
      * is out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public boolean isImageTiled(int imageIndex) throws IOException {
         return false;
@@ -1333,10 +1333,10 @@ public abstract class ImageReader {
      *
      * @param imageIndex the index of the image to be queried.
      *
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public int getTileWidth(int imageIndex) throws IOException {
         return getWidth(imageIndex);
@@ -1354,10 +1354,10 @@ public abstract class ImageReader {
      *
      * @param imageIndex the index of the image to be queried.
      *
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public int getTileHeight(int imageIndex) throws IOException {
         return getHeight(imageIndex);
@@ -1382,12 +1382,12 @@ public abstract class ImageReader {
      *
      * @param imageIndex the index of the image to be queried.
      *
-     * @exception IllegalStateException if an input source is required
+     * @throws IllegalStateException if an input source is required
      * to determine the return value, but none has been set.
-     * @exception IndexOutOfBoundsException if an image must be
+     * @throws IndexOutOfBoundsException if an image must be
      * accessed to determine the return value, but the supplied index
      * is out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public int getTileGridXOffset(int imageIndex) throws IOException {
         return 0;
@@ -1412,12 +1412,12 @@ public abstract class ImageReader {
      *
      * @param imageIndex the index of the image to be queried.
      *
-     * @exception IllegalStateException if an input source is required
+     * @throws IllegalStateException if an input source is required
      * to determine the return value, but none has been set.
-     * @exception IndexOutOfBoundsException if an image must be
+     * @throws IndexOutOfBoundsException if an image must be
      * accessed to determine the return value, but the supplied index
      * is out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public int getTileGridYOffset(int imageIndex) throws IOException {
         return 0;
@@ -1455,13 +1455,13 @@ public abstract class ImageReader {
      *
      * @return the tile as a {@code BufferedImage}.
      *
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if {@code imageIndex}
+     * @throws IndexOutOfBoundsException if {@code imageIndex}
      * is out of bounds.
-     * @exception IllegalArgumentException if the tile indices are
+     * @throws IllegalArgumentException if the tile indices are
      * out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public BufferedImage readTile(int imageIndex,
                                   int tileX, int tileY) throws IOException {
@@ -1495,15 +1495,15 @@ public abstract class ImageReader {
      *
      * @return the tile as a {@code Raster}.
      *
-     * @exception UnsupportedOperationException if this plug-in does not
+     * @throws UnsupportedOperationException if this plug-in does not
      * support reading raw {@code Raster}s.
-     * @exception IllegalArgumentException if the tile indices are
+     * @throws IllegalArgumentException if the tile indices are
      * out of bounds.
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if {@code imageIndex}
+     * @throws IndexOutOfBoundsException if {@code imageIndex}
      * is out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      *
      * @see #readTile
      * @see #readRaster
@@ -1554,18 +1554,18 @@ public abstract class ImageReader {
      * @return a {@code RenderedImage} object providing a view of
      * the image.
      *
-     * @exception IllegalStateException if the input source has not been
+     * @throws IllegalStateException if the input source has not been
      * set.
-     * @exception IndexOutOfBoundsException if the supplied index is
+     * @throws IndexOutOfBoundsException if the supplied index is
      * out of bounds.
-     * @exception IllegalArgumentException if the set of source and
+     * @throws IllegalArgumentException if the set of source and
      * destination bands specified by
      * {@code param.getSourceBands} and
      * {@code param.getDestinationBands} differ in length or
      * include indices that are out of bounds.
-     * @exception IllegalArgumentException if the resulting image
+     * @throws IllegalArgumentException if the resulting image
      * would have a width or height less than 1.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public RenderedImage readAsRenderedImage(int imageIndex,
                                              ImageReadParam param)
@@ -1611,11 +1611,11 @@ public abstract class ImageReader {
      *
      * @return {@code true} if the given image has thumbnails.
      *
-     * @exception IllegalStateException if the reader supports
+     * @throws IllegalStateException if the reader supports
      * thumbnails but the input source has not been set.
-     * @exception IndexOutOfBoundsException if the reader supports
+     * @throws IndexOutOfBoundsException if the reader supports
      * thumbnails but {@code imageIndex} is out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public boolean hasThumbnails(int imageIndex) throws IOException {
         return getNumThumbnails(imageIndex) > 0;
@@ -1637,11 +1637,11 @@ public abstract class ImageReader {
      * @return the number of thumbnails associated with the given
      * image.
      *
-     * @exception IllegalStateException if the reader supports
+     * @throws IllegalStateException if the reader supports
      * thumbnails but the input source has not been set.
-     * @exception IndexOutOfBoundsException if the reader supports
+     * @throws IndexOutOfBoundsException if the reader supports
      * thumbnails but {@code imageIndex} is out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public int getNumThumbnails(int imageIndex)
         throws IOException {
@@ -1669,12 +1669,12 @@ public abstract class ImageReader {
      *
      * @return the width of the desired thumbnail as an {@code int}.
      *
-     * @exception UnsupportedOperationException if thumbnails are not
+     * @throws UnsupportedOperationException if thumbnails are not
      * supported.
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if either of the supplied
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if either of the supplied
      * indices are out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public int getThumbnailWidth(int imageIndex, int thumbnailIndex)
         throws IOException {
@@ -1702,12 +1702,12 @@ public abstract class ImageReader {
      *
      * @return the height of the desired thumbnail as an {@code int}.
      *
-     * @exception UnsupportedOperationException if thumbnails are not
+     * @throws UnsupportedOperationException if thumbnails are not
      * supported.
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if either of the supplied
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if either of the supplied
      * indices are out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public int getThumbnailHeight(int imageIndex, int thumbnailIndex)
         throws IOException {
@@ -1738,12 +1738,12 @@ public abstract class ImageReader {
      *
      * @return the desired thumbnail as a {@code BufferedImage}.
      *
-     * @exception UnsupportedOperationException if thumbnails are not
+     * @throws UnsupportedOperationException if thumbnails are not
      * supported.
-     * @exception IllegalStateException if the input source has not been set.
-     * @exception IndexOutOfBoundsException if either of the supplied
+     * @throws IllegalStateException if the input source has not been set.
+     * @throws IndexOutOfBoundsException if either of the supplied
      * indices are out of bounds.
-     * @exception IOException if an error occurs during reading.
+     * @throws IOException if an error occurs during reading.
      */
     public BufferedImage readThumbnail(int imageIndex,
                                        int thumbnailIndex)
@@ -2388,7 +2388,7 @@ public abstract class ImageReader {
      *
      * @param warning the warning message to send.
      *
-     * @exception IllegalArgumentException if {@code warning}
+     * @throws IllegalArgumentException if {@code warning}
      * is {@code null}.
      */
     protected void processWarningOccurred(String warning) {
@@ -2420,15 +2420,15 @@ public abstract class ImageReader {
      * @param keyword the keyword used to index the warning message
      * within the set of {@code ResourceBundle}s.
      *
-     * @exception IllegalArgumentException if {@code baseName}
+     * @throws IllegalArgumentException if {@code baseName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code keyword}
+     * @throws IllegalArgumentException if {@code keyword}
      * is {@code null}.
-     * @exception IllegalArgumentException if no appropriate
+     * @throws IllegalArgumentException if no appropriate
      * {@code ResourceBundle} may be located.
-     * @exception IllegalArgumentException if the named resource is
+     * @throws IllegalArgumentException if the named resource is
      * not found in the located {@code ResourceBundle}.
-     * @exception IllegalArgumentException if the object retrieved
+     * @throws IllegalArgumentException if the object retrieved
      * from the {@code ResourceBundle} is not a
      * {@code String}.
      */
@@ -2594,11 +2594,11 @@ public abstract class ImageReader {
      * the source region of interest.
      * @param destRegion a {@code Rectangle} that will be filled with
      * the destination region of interest.
-     * @exception IllegalArgumentException if {@code srcRegion}
+     * @throws IllegalArgumentException if {@code srcRegion}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code dstRegion}
+     * @throws IllegalArgumentException if {@code dstRegion}
      * is {@code null}.
-     * @exception IllegalArgumentException if the resulting source or
+     * @throws IllegalArgumentException if the resulting source or
      * destination region is empty.
      */
     protected static void computeRegions(ImageReadParam param,
@@ -2720,7 +2720,7 @@ public abstract class ImageReader {
      * @param numDstBands the number of bands in the destination image
      * being written.
      *
-     * @exception IllegalArgumentException if {@code param}
+     * @throws IllegalArgumentException if {@code param}
      * contains an invalid specification of a source and/or
      * destination band subset.
      */
@@ -2797,15 +2797,15 @@ public abstract class ImageReader {
      * @return the {@code BufferedImage} to which decoded pixel
      * data should be written.
      *
-     * @exception IIOException if the {@code ImageTypeSpecifier}
+     * @throws IIOException if the {@code ImageTypeSpecifier}
      * specified by {@code param} does not match any of the legal
      * ones from {@code imageTypes}.
-     * @exception IllegalArgumentException if {@code imageTypes}
+     * @throws IllegalArgumentException if {@code imageTypes}
      * is {@code null} or empty, or if an object not of type
      * {@code ImageTypeSpecifier} is retrieved from it.
-     * @exception IllegalArgumentException if the resulting image would
+     * @throws IllegalArgumentException if the resulting image would
      * have a width or height less than 1.
-     * @exception IllegalArgumentException if the product of
+     * @throws IllegalArgumentException if the product of
      * {@code width} and {@code height} is greater than
      * {@code Integer.MAX_VALUE}.
      */
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java b/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java
index 3ce8fc88710..d2832c49a1f 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageTranscoder.java
@@ -109,7 +109,7 @@ public interface ImageTranscoder {
      * {@code null} if the plug-in does not provide metadata
      * encoding capabilities.
      *
-     * @exception IllegalArgumentException if {@code inData} is
+     * @throws IllegalArgumentException if {@code inData} is
      * {@code null}.
      */
     IIOMetadata convertStreamMetadata(IIOMetadata inData,
@@ -142,7 +142,7 @@ public interface ImageTranscoder {
      * or {@code null} if the plug-in does not provide
      * metadata encoding capabilities.
      *
-     * @exception IllegalArgumentException if either of
+     * @throws IllegalArgumentException if either of
      * {@code inData} or {@code imageType} is
      * {@code null}.
      */
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java b/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java
index e328d7499bc..b94b7709d2b 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java
@@ -90,9 +90,9 @@ public class ImageTypeSpecifier {
      * @param colorModel a {@code ColorModel}.
      * @param sampleModel a {@code SampleModel}.
      *
-     * @exception IllegalArgumentException if either parameter is
+     * @throws IllegalArgumentException if either parameter is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code sampleModel}
+     * @throws IllegalArgumentException if {@code sampleModel}
      * is not compatible with {@code colorModel}.
      */
     public ImageTypeSpecifier(ColorModel colorModel, SampleModel sampleModel) {
@@ -120,7 +120,7 @@ public class ImageTypeSpecifier {
      *
      * @param image a {@code RenderedImage}.
      *
-     * @exception IllegalArgumentException if the argument is
+     * @throws IllegalArgumentException if the argument is
      * {@code null}.
      */
     public ImageTypeSpecifier(RenderedImage image) {
@@ -208,13 +208,13 @@ public class ImageTypeSpecifier {
      * @return an {@code ImageTypeSpecifier} with the desired
      * characteristics.
      *
-     * @exception IllegalArgumentException if {@code colorSpace}
+     * @throws IllegalArgumentException if {@code colorSpace}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code colorSpace}
+     * @throws IllegalArgumentException if {@code colorSpace}
      * is not of type {@code TYPE_RGB}.
-     * @exception IllegalArgumentException if no mask has at least 1
+     * @throws IllegalArgumentException if no mask has at least 1
      * bit set.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code transferType} if not one of
      * {@code DataBuffer.TYPE_BYTE},
      * {@code DataBuffer.TYPE_USHORT}, or
@@ -375,13 +375,13 @@ public class ImageTypeSpecifier {
      * @return an {@code ImageTypeSpecifier} with the desired
      * characteristics.
      *
-     * @exception IllegalArgumentException if {@code colorSpace}
+     * @throws IllegalArgumentException if {@code colorSpace}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code bandOffsets}
+     * @throws IllegalArgumentException if {@code bandOffsets}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of the legal {@code DataBuffer.TYPE_*} constants.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code bandOffsets.length} does not equal the number of
      * color space components, plus 1 if {@code hasAlpha} is
      * {@code true}.
@@ -525,19 +525,19 @@ public class ImageTypeSpecifier {
      * @return an {@code ImageTypeSpecifier} with the desired
      * characteristics.
      *
-     * @exception IllegalArgumentException if {@code colorSpace}
+     * @throws IllegalArgumentException if {@code colorSpace}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code bankIndices}
+     * @throws IllegalArgumentException if {@code bankIndices}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code bandOffsets}
+     * @throws IllegalArgumentException if {@code bandOffsets}
      * is {@code null}.
-     * @exception IllegalArgumentException if the lengths of
+     * @throws IllegalArgumentException if the lengths of
      * {@code bankIndices} and {@code bandOffsets} differ.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code bandOffsets.length} does not equal the number of
      * color space components, plus 1 if {@code hasAlpha} is
      * {@code true}.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of the legal {@code DataBuffer.TYPE_*} constants.
      */
     public static ImageTypeSpecifier
@@ -661,13 +661,13 @@ public class ImageTypeSpecifier {
      * @return an {@code ImageTypeSpecifier} with the desired
      * characteristics.
      *
-     * @exception IllegalArgumentException if {@code bits} is
+     * @throws IllegalArgumentException if {@code bits} is
      * not one of 1, 2, 4, 8, or 16.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of {@code DataBuffer.TYPE_BYTE},
      * {@code DataBuffer.TYPE_SHORT}, or
      * {@code DataBuffer.TYPE_USHORT}.
-     * @exception IllegalArgumentException if {@code bits} is
+     * @throws IllegalArgumentException if {@code bits} is
      * larger than the bit size of the given {@code dataType}.
      */
     public static ImageTypeSpecifier
@@ -697,13 +697,13 @@ public class ImageTypeSpecifier {
      * @return an {@code ImageTypeSpecifier} with the desired
      * characteristics.
      *
-     * @exception IllegalArgumentException if {@code bits} is
+     * @throws IllegalArgumentException if {@code bits} is
      * not one of 1, 2, 4, 8, or 16.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of {@code DataBuffer.TYPE_BYTE},
      * {@code DataBuffer.TYPE_SHORT}, or
      * {@code DataBuffer.TYPE_USHORT}.
-     * @exception IllegalArgumentException if {@code bits} is
+     * @throws IllegalArgumentException if {@code bits} is
      * larger than the bit size of the given {@code dataType}.
      */
     public static ImageTypeSpecifier
@@ -822,23 +822,23 @@ public class ImageTypeSpecifier {
      * @return an {@code ImageTypeSpecifier} with the desired
      * characteristics.
      *
-     * @exception IllegalArgumentException if {@code redLUT} is
+     * @throws IllegalArgumentException if {@code redLUT} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code greenLUT} is
+     * @throws IllegalArgumentException if {@code greenLUT} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code blueLUT} is
+     * @throws IllegalArgumentException if {@code blueLUT} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code bits} is
+     * @throws IllegalArgumentException if {@code bits} is
      * not one of 1, 2, 4, 8, or 16.
-     * @exception IllegalArgumentException if the
+     * @throws IllegalArgumentException if the
      * non-{@code null} LUT parameters do not have lengths of
      * exactly {@code 1 << bits}.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of {@code DataBuffer.TYPE_BYTE},
      * {@code DataBuffer.TYPE_SHORT},
      * {@code DataBuffer.TYPE_USHORT},
      * or {@code DataBuffer.TYPE_INT}.
-     * @exception IllegalArgumentException if {@code bits} is
+     * @throws IllegalArgumentException if {@code bits} is
      * larger than the bit size of the given {@code dataType}.
      */
     public static ImageTypeSpecifier
@@ -867,7 +867,7 @@ public class ImageTypeSpecifier {
      * @return an {@code ImageTypeSpecifier} with the desired
      * characteristics.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code bufferedImageType} is not one of the standard
      * types, or is equal to {@code TYPE_CUSTOM}.
      *
@@ -908,7 +908,7 @@ public class ImageTypeSpecifier {
      * @return an {@code ImageTypeSpecifier} with the desired
      * characteristics.
      *
-     * @exception IllegalArgumentException if {@code image} is
+     * @throws IllegalArgumentException if {@code image} is
      * {@code null}.
      */
     public static
@@ -985,7 +985,7 @@ public class ImageTypeSpecifier {
      *
      * @return an int specifying a number of bits.
      *
-     * @exception IllegalArgumentException if {@code band} is
+     * @throws IllegalArgumentException if {@code band} is
      * negative or greater than the largest band index.
      */
     public int getBitsPerBand(int band) {
@@ -1017,9 +1017,9 @@ public class ImageTypeSpecifier {
      *
      * @return a {@code SampleModel} with the given dimensions.
      *
-     * @exception IllegalArgumentException if either {@code width} or
+     * @throws IllegalArgumentException if either {@code width} or
      * {@code height} are negative or zero.
-     * @exception IllegalArgumentException if the product of
+     * @throws IllegalArgumentException if the product of
      * {@code width} and {@code height} is greater than
      * {@code Integer.MAX_VALUE}
      */
@@ -1051,9 +1051,9 @@ public class ImageTypeSpecifier {
      *
      * @return a new {@code BufferedImage}
      *
-     * @exception IllegalArgumentException if either {@code width} or
+     * @throws IllegalArgumentException if either {@code width} or
      * {@code height} are negative or zero.
-     * @exception IllegalArgumentException if the product of
+     * @throws IllegalArgumentException if the product of
      * {@code width} and {@code height} is greater than
      * {@code Integer.MAX_VALUE}, or if the number of array
      * elements needed to store the image is greater than
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java b/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java
index cbaa5781271..482730ba888 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageWriteParam.java
@@ -474,9 +474,9 @@ public class ImageWriteParam extends IIOParam {
      *
      * @param mode The mode to use for tiling.
      *
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canWriteTiles} returns {@code false}.
-     * @exception IllegalArgumentException if {@code mode} is not
+     * @throws IllegalArgumentException if {@code mode} is not
      * one of the modes listed above.
      *
      * @see #setTiling
@@ -501,7 +501,7 @@ public class ImageWriteParam extends IIOParam {
      *
      * @return the current tiling mode.
      *
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canWriteTiles} returns {@code false}.
      *
      * @see #setTilingMode
@@ -530,7 +530,7 @@ public class ImageWriteParam extends IIOParam {
      * <p> If no array is specified on the constructor, but tiling is
      * allowed, then this method returns {@code null}.
      *
-     * @exception UnsupportedOperationException if the plug-in does
+     * @throws UnsupportedOperationException if the plug-in does
      * not support tiling.
      *
      * @return an array of {@code Dimension}s with an even length
@@ -559,16 +559,16 @@ public class ImageWriteParam extends IIOParam {
      * @param tileGridXOffset the horizontal offset of the tile grid.
      * @param tileGridYOffset the vertical offset of the tile grid.
      *
-     * @exception UnsupportedOperationException if the plug-in does not
+     * @throws UnsupportedOperationException if the plug-in does not
      * support tiling.
-     * @exception IllegalStateException if the tiling mode is not
+     * @throws IllegalStateException if the tiling mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception UnsupportedOperationException if the plug-in does not
+     * @throws UnsupportedOperationException if the plug-in does not
      * support grid offsets, and the grid offsets are not both zero.
-     * @exception IllegalArgumentException if the tile size is not
+     * @throws IllegalArgumentException if the tile size is not
      * within one of the allowable ranges returned by
      * {@code getPreferredTileSizes}.
-     * @exception IllegalArgumentException if {@code tileWidth}
+     * @throws IllegalArgumentException if {@code tileWidth}
      * or {@code tileHeight} is less than or equal to 0.
      *
      * @see #canWriteTiles
@@ -630,9 +630,9 @@ public class ImageWriteParam extends IIOParam {
      * {@code tileGridXOffset}, and
      * {@code tileGridYOffset} to {@code 0}.
      *
-     * @exception UnsupportedOperationException if the plug-in does not
+     * @throws UnsupportedOperationException if the plug-in does not
      * support tiling.
-     * @exception IllegalStateException if the tiling mode is not
+     * @throws IllegalStateException if the tiling mode is not
      * {@code MODE_EXPLICIT}.
      *
      * @see #setTiling(int, int, int, int)
@@ -658,11 +658,11 @@ public class ImageWriteParam extends IIOParam {
      *
      * @return the tile width to be used for encoding.
      *
-     * @exception UnsupportedOperationException if the plug-in does not
+     * @throws UnsupportedOperationException if the plug-in does not
      * support tiling.
-     * @exception IllegalStateException if the tiling mode is not
+     * @throws IllegalStateException if the tiling mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the tiling parameters have
+     * @throws IllegalStateException if the tiling parameters have
      * not been set.
      *
      * @see #setTiling(int, int, int, int)
@@ -688,11 +688,11 @@ public class ImageWriteParam extends IIOParam {
      *
      * @return the tile height to be used for encoding.
      *
-     * @exception UnsupportedOperationException if the plug-in does not
+     * @throws UnsupportedOperationException if the plug-in does not
      * support tiling.
-     * @exception IllegalStateException if the tiling mode is not
+     * @throws IllegalStateException if the tiling mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the tiling parameters have
+     * @throws IllegalStateException if the tiling parameters have
      * not been set.
      *
      * @see #setTiling(int, int, int, int)
@@ -718,11 +718,11 @@ public class ImageWriteParam extends IIOParam {
      *
      * @return the tile grid X offset to be used for encoding.
      *
-     * @exception UnsupportedOperationException if the plug-in does not
+     * @throws UnsupportedOperationException if the plug-in does not
      * support tiling.
-     * @exception IllegalStateException if the tiling mode is not
+     * @throws IllegalStateException if the tiling mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the tiling parameters have
+     * @throws IllegalStateException if the tiling parameters have
      * not been set.
      *
      * @see #setTiling(int, int, int, int)
@@ -748,11 +748,11 @@ public class ImageWriteParam extends IIOParam {
      *
      * @return the tile grid Y offset to be used for encoding.
      *
-     * @exception UnsupportedOperationException if the plug-in does not
+     * @throws UnsupportedOperationException if the plug-in does not
      * support tiling.
-     * @exception IllegalStateException if the tiling mode is not
+     * @throws IllegalStateException if the tiling mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the tiling parameters have
+     * @throws IllegalStateException if the tiling parameters have
      * not been set.
      *
      * @see #setTiling(int, int, int, int)
@@ -818,9 +818,9 @@ public class ImageWriteParam extends IIOParam {
      * @param mode The mode for setting progression in the output
      * stream.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support progressive encoding.
-     * @exception IllegalArgumentException if {@code mode} is not
+     * @throws IllegalArgumentException if {@code mode} is not
      * one of the modes listed above.
      *
      * @see #getProgressiveMode
@@ -846,7 +846,7 @@ public class ImageWriteParam extends IIOParam {
      *
      * @return the current mode for progressive encoding.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support progressive encoding.
      *
      * @see #setProgressiveMode
@@ -902,9 +902,9 @@ public class ImageWriteParam extends IIOParam {
      * @param mode The mode for setting compression in the output
      * stream.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression, or does not support the requested mode.
-     * @exception IllegalArgumentException if {@code mode} is not
+     * @throws IllegalArgumentException if {@code mode} is not
      * one of the modes listed above.
      *
      * @see #getCompressionMode
@@ -929,7 +929,7 @@ public class ImageWriteParam extends IIOParam {
      *
      * @return the current compression mode.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
      *
      * @see #setCompressionMode
@@ -965,7 +965,7 @@ public class ImageWriteParam extends IIOParam {
      * (non-localized) names of available compression types, or
      * {@code null}.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
      */
     public String[] getCompressionTypes() {
@@ -998,13 +998,13 @@ public class ImageWriteParam extends IIOParam {
      * by {@code getCompressionTypes}, or {@code null} to
      * remove any previous setting.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception UnsupportedOperationException if there are no
+     * @throws UnsupportedOperationException if there are no
      * settable compression types.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code compressionType} is non-{@code null} but is not
      * one of the values returned by {@code getCompressionTypes}.
      *
@@ -1059,9 +1059,9 @@ public class ImageWriteParam extends IIOParam {
      * @return the current compression type as a {@code String},
      * or {@code null} if no type is set.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
      *
      * @see #setCompressionType
@@ -1086,9 +1086,9 @@ public class ImageWriteParam extends IIOParam {
      * instance variable {@code compressionQuality} to
      * {@code 1.0F}.
      *
-     * @exception UnsupportedOperationException if the plug-in does not
+     * @throws UnsupportedOperationException if the plug-in does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
      *
      * @see #setCompressionType
@@ -1122,11 +1122,11 @@ public class ImageWriteParam extends IIOParam {
      * @return a {@code String} containing a localized version of
      * the name of the current compression type.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if no compression type is set.
+     * @throws IllegalStateException if no compression type is set.
      */
     public String getLocalizedCompressionTypeName() {
         if (!canWriteCompressed()) {
@@ -1162,11 +1162,11 @@ public class ImageWriteParam extends IIOParam {
      * @return {@code true} if the current compression type is
      * lossless.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the set of legal
+     * @throws IllegalStateException if the set of legal
      * compression types is non-{@code null} and the current
      * compression type is {@code null}.
      */
@@ -1218,14 +1218,14 @@ public class ImageWriteParam extends IIOParam {
      * @param quality a {@code float} between {@code 0} and
      * {@code 1} indicating the desired quality level.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the set of legal
+     * @throws IllegalStateException if the set of legal
      * compression types is non-{@code null} and the current
      * compression type is {@code null}.
-     * @exception IllegalArgumentException if {@code quality} is
+     * @throws IllegalArgumentException if {@code quality} is
      * not between {@code 0} and {@code 1}, inclusive.
      *
      * @see #getCompressionQuality
@@ -1264,11 +1264,11 @@ public class ImageWriteParam extends IIOParam {
      *
      * @return the current compression quality setting.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the set of legal
+     * @throws IllegalStateException if the set of legal
      * compression types is non-{@code null} and the current
      * compression type is {@code null}.
      *
@@ -1317,14 +1317,14 @@ public class ImageWriteParam extends IIOParam {
      * @return an estimate of the compressed bit rate, or
      * {@code -1.0F} if no estimate is available.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the set of legal
+     * @throws IllegalStateException if the set of legal
      * compression types is non-{@code null} and the current
      * compression type is {@code null}.
-     * @exception IllegalArgumentException if {@code quality} is
+     * @throws IllegalArgumentException if {@code quality} is
      * not between {@code 0} and {@code 1}, inclusive.
      */
     public float getBitRate(float quality) {
@@ -1389,11 +1389,11 @@ public class ImageWriteParam extends IIOParam {
      * @return an array of {@code String}s containing localized
      * descriptions of the compression quality levels.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the set of legal
+     * @throws IllegalStateException if the set of legal
      * compression types is non-{@code null} and the current
      * compression type is {@code null}.
      *
@@ -1442,11 +1442,11 @@ public class ImageWriteParam extends IIOParam {
      * by the {@code String}s from
      * {@code getCompressionQualityDescriptions}.
      *
-     * @exception UnsupportedOperationException if the writer does not
+     * @throws UnsupportedOperationException if the writer does not
      * support compression.
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
-     * @exception IllegalStateException if the set of legal
+     * @throws IllegalStateException if the set of legal
      * compression types is non-{@code null} and the current
      * compression type is {@code null}.
      *
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageWriter.java b/src/java.desktop/share/classes/javax/imageio/ImageWriter.java
index 8723c50773e..a688d9aea91 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageWriter.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageWriter.java
@@ -194,7 +194,7 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @param output the {@code ImageOutputStream} or other
      * {@code Object} to use for future writing.
      *
-     * @exception IllegalArgumentException if {@code output} is
+     * @throws IllegalArgumentException if {@code output} is
      * not an instance of one of the classes returned by the
      * originating service provider's {@code getOutputTypes}
      * method.
@@ -276,7 +276,7 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @param locale the desired {@code Locale}, or
      * {@code null}.
      *
-     * @exception IllegalArgumentException if {@code locale} is
+     * @throws IllegalArgumentException if {@code locale} is
      * non-{@code null} but is not one of the values returned by
      * {@code getAvailableLocales}.
      *
@@ -561,14 +561,14 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null} to use a default
      * {@code ImageWriteParam}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if {@code image}
+     * @throws UnsupportedOperationException if {@code image}
      * contains a {@code Raster} and {@code canWriteRasters}
      * returns {@code false}.
-     * @exception IllegalArgumentException if {@code image} is
+     * @throws IllegalArgumentException if {@code image} is
      * {@code null}.
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public abstract void write(IIOMetadata streamMetadata,
                                IIOImage image,
@@ -582,14 +582,14 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @param image an {@code IIOImage} object containing an
      * image, thumbnails, and metadata to be written.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception IllegalArgumentException if {@code image} is
+     * @throws IllegalArgumentException if {@code image} is
      * {@code null}.
-     * @exception UnsupportedOperationException if {@code image}
+     * @throws UnsupportedOperationException if {@code image}
      * contains a {@code Raster} and {@code canWriteRasters}
      * returns {@code false}.
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public void write(IIOImage image) throws IOException {
         write(null, image, null);
@@ -603,11 +603,11 @@ public abstract class ImageWriter implements ImageTranscoder {
      *
      * @param image a {@code RenderedImage} to be written.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception IllegalArgumentException if {@code image} is
+     * @throws IllegalArgumentException if {@code image} is
      * {@code null}.
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public void write(RenderedImage image) throws IOException {
         write(null, new IIOImage(image, null, null), null);
@@ -671,11 +671,11 @@ public abstract class ImageWriter implements ImageTranscoder {
      *
      * @param streamMetadata A stream metadata object, or {@code null}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canWriteSequence} returns {@code false}.
-     * @exception IOException if an error occurs writing the stream
+     * @throws IOException if an error occurs writing the stream
      * metadata.
      */
     public void prepareWriteSequence(IIOMetadata streamMetadata)
@@ -732,16 +732,16 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null} to use a default
      * {@code ImageWriteParam}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set, or {@code prepareWriteSequence} has not been called.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canWriteSequence} returns {@code false}.
-     * @exception IllegalArgumentException if {@code image} is
+     * @throws IllegalArgumentException if {@code image} is
      * {@code null}.
-     * @exception UnsupportedOperationException if {@code image}
+     * @throws UnsupportedOperationException if {@code image}
      * contains a {@code Raster} and {@code canWriteRasters}
      * returns {@code false}.
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public void writeToSequence(IIOImage image, ImageWriteParam param)
         throws IOException {
@@ -767,11 +767,11 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null}, and otherwise throws an
      * {@code UnsupportedOperationException}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set, or {@code prepareWriteSequence} has not been called.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canWriteSequence} returns {@code false}.
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public void endWriteSequence() throws IOException {
         unsupported();
@@ -790,9 +790,9 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @return {@code true} if replacement of stream metadata is
      * allowed.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception IOException if an I/O error occurs during the query.
+     * @throws IOException if an I/O error occurs during the query.
      */
     public boolean canReplaceStreamMetadata() throws IOException {
         if (getOutput() == null) {
@@ -821,12 +821,12 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @param streamMetadata an {@code IIOMetadata} object representing
      * stream metadata, or {@code null} to use default values.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if the
+     * @throws UnsupportedOperationException if the
      * {@code canReplaceStreamMetadata} returns
      * {@code false}.  modes do not include
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public void replaceStreamMetadata(IIOMetadata streamMetadata)
         throws IOException {
@@ -856,13 +856,13 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @return {@code true} if the image metadata of the given
      * image can be replaced.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception IndexOutOfBoundsException if the writer supports
+     * @throws IndexOutOfBoundsException if the writer supports
      * image metadata replacement in general, but
      * {@code imageIndex} is less than 0 or greater than the
      * largest available index.
-     * @exception IOException if an I/O error occurs during the query.
+     * @throws IOException if an I/O error occurs during the query.
      */
     public boolean canReplaceImageMetadata(int imageIndex)
         throws IOException {
@@ -889,14 +889,14 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @param imageMetadata an {@code IIOMetadata} object
      * representing image metadata, or {@code null}.
      *
-     * @exception IllegalStateException if the output has not been
+     * @throws IllegalStateException if the output has not been
      * set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canReplaceImageMetadata} returns
      * {@code false}.
-     * @exception IndexOutOfBoundsException if {@code imageIndex}
+     * @throws IndexOutOfBoundsException if {@code imageIndex}
      * is less than 0 or greater than the largest available index.
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public void replaceImageMetadata(int imageIndex,
                                      IIOMetadata imageMetadata)
@@ -929,12 +929,12 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @return {@code true} if an image may be inserted at the
      * given index.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception IndexOutOfBoundsException if the writer supports
+     * @throws IndexOutOfBoundsException if the writer supports
      * image insertion in general, but {@code imageIndex} is less
      * than -1 or greater than the largest available index.
-     * @exception IOException if an I/O error occurs during the query.
+     * @throws IOException if an I/O error occurs during the query.
      */
     public boolean canInsertImage(int imageIndex) throws IOException {
         if (getOutput() == null) {
@@ -978,18 +978,18 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null} to use a default
      * {@code ImageWriteParam}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canInsertImage(imageIndex)} returns {@code false}.
-     * @exception IllegalArgumentException if {@code image} is
+     * @throws IllegalArgumentException if {@code image} is
      * {@code null}.
-     * @exception IndexOutOfBoundsException if {@code imageIndex}
+     * @throws IndexOutOfBoundsException if {@code imageIndex}
      * is less than -1 or greater than the largest available index.
-     * @exception UnsupportedOperationException if {@code image}
+     * @throws UnsupportedOperationException if {@code image}
      * contains a {@code Raster} and {@code canWriteRasters}
      * returns {@code false}.
-     * @exception IOException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     public void writeInsert(int imageIndex,
                             IIOImage image,
@@ -1019,12 +1019,12 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @return {@code true} if it is possible to remove the given
      * image.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception IndexOutOfBoundsException if the writer supports
+     * @throws IndexOutOfBoundsException if the writer supports
      * image removal in general, but {@code imageIndex} is less
      * than 0 or greater than the largest available index.
-     * @exception IOException if an I/O error occurs during the
+     * @throws IOException if an I/O error occurs during the
      * query.
      */
     public boolean canRemoveImage(int imageIndex) throws IOException {
@@ -1050,13 +1050,13 @@ public abstract class ImageWriter implements ImageTranscoder {
      *
      * @param imageIndex the index of the image to be removed.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canRemoveImage(imageIndex)} returns {@code false}.
-     * @exception IndexOutOfBoundsException if {@code imageIndex}
+     * @throws IndexOutOfBoundsException if {@code imageIndex}
      * is less than 0 or greater than the largest available index.
-     * @exception IOException if an I/O error occurs during the
+     * @throws IOException if an I/O error occurs during the
      * removal.
      */
     public void removeImage(int imageIndex) throws IOException {
@@ -1082,9 +1082,9 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @return {@code true} if the writing of complete image
      * stream with contents to be defined later is supported.
      *
-     * @exception IllegalStateException if the output has not been
+     * @throws IllegalStateException if the output has not been
      * set.
-     * @exception IOException if an I/O error occurs during the
+     * @throws IOException if an I/O error occurs during the
      * query.
      */
     public boolean canWriteEmpty() throws IOException {
@@ -1144,23 +1144,23 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null} to use a default
      * {@code ImageWriteParam}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canWriteEmpty} returns {@code false}.
-     * @exception IllegalStateException if a previous call to
+     * @throws IllegalStateException if a previous call to
      * {@code prepareWriteEmpty} has been made without a
      * corresponding call to {@code endWriteEmpty}.
-     * @exception IllegalStateException if a previous call to
+     * @throws IllegalStateException if a previous call to
      * {@code prepareInsertEmpty} has been made without a
      * corresponding call to {@code endInsertEmpty}.
-     * @exception IllegalArgumentException if {@code imageType}
+     * @throws IllegalArgumentException if {@code imageType}
      * is {@code null} or {@code thumbnails} contains
      * {@code null} references or objects other than
      * {@code BufferedImage}s.
-     * @exception IllegalArgumentException if width or height are less
+     * @throws IllegalArgumentException if width or height are less
      * than 1.
-     * @exception IOException if an I/O error occurs during writing.
+     * @throws IOException if an I/O error occurs during writing.
      */
     public void prepareWriteEmpty(IIOMetadata streamMetadata,
                                   ImageTypeSpecifier imageType,
@@ -1183,21 +1183,21 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null}, and otherwise throws an
      * {@code UnsupportedOperationException}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canWriteEmpty(imageIndex)} returns
      * {@code false}.
-     * @exception IllegalStateException if a previous call to
+     * @throws IllegalStateException if a previous call to
      * {@code prepareWriteEmpty} without a corresponding call to
      * {@code endWriteEmpty} has not been made.
-     * @exception IllegalStateException if a previous call to
+     * @throws IllegalStateException if a previous call to
      * {@code prepareInsertEmpty} without a corresponding call to
      * {@code endInsertEmpty} has been made.
-     * @exception IllegalStateException if a call to
+     * @throws IllegalStateException if a call to
      * {@code prepareReiplacePixels} has been made without a
      * matching call to {@code endReplacePixels}.
-     * @exception IOException if an I/O error occurs during writing.
+     * @throws IOException if an I/O error occurs during writing.
      */
     public void endWriteEmpty() throws IOException {
         if (getOutput() == null) {
@@ -1231,12 +1231,12 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @return {@code true} if an empty image may be inserted at
      * the given index.
      *
-     * @exception IllegalStateException if the output has not been
+     * @throws IllegalStateException if the output has not been
      * set.
-     * @exception IndexOutOfBoundsException if the writer supports
+     * @throws IndexOutOfBoundsException if the writer supports
      * empty image insertion in general, but {@code imageIndex}
      * is less than -1 or greater than the largest available index.
-     * @exception IOException if an I/O error occurs during the
+     * @throws IOException if an I/O error occurs during the
      * query.
      */
     public boolean canInsertEmpty(int imageIndex) throws IOException {
@@ -1301,26 +1301,26 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null} to use a default
      * {@code ImageWriteParam}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canInsertEmpty(imageIndex)} returns
      * {@code false}.
-     * @exception IndexOutOfBoundsException if {@code imageIndex}
+     * @throws IndexOutOfBoundsException if {@code imageIndex}
      * is less than -1 or greater than the largest available index.
-     * @exception IllegalStateException if a previous call to
+     * @throws IllegalStateException if a previous call to
      * {@code prepareInsertEmpty} has been made without a
      * corresponding call to {@code endInsertEmpty}.
-     * @exception IllegalStateException if a previous call to
+     * @throws IllegalStateException if a previous call to
      * {@code prepareWriteEmpty} has been made without a
      * corresponding call to {@code endWriteEmpty}.
-     * @exception IllegalArgumentException if {@code imageType}
+     * @throws IllegalArgumentException if {@code imageType}
      * is {@code null} or {@code thumbnails} contains
      * {@code null} references or objects other than
      * {@code BufferedImage}s.
-     * @exception IllegalArgumentException if width or height are less
+     * @throws IllegalArgumentException if width or height are less
      * than 1.
-     * @exception IOException if an I/O error occurs during writing.
+     * @throws IOException if an I/O error occurs during writing.
      */
     public void prepareInsertEmpty(int imageIndex,
                                    ImageTypeSpecifier imageType,
@@ -1340,21 +1340,21 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null}, and otherwise throws an
      * {@code UnsupportedOperationException}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canInsertEmpty(imageIndex)} returns
      * {@code false}.
-     * @exception IllegalStateException if a previous call to
+     * @throws IllegalStateException if a previous call to
      * {@code prepareInsertEmpty} without a corresponding call to
      * {@code endInsertEmpty} has not been made.
-     * @exception IllegalStateException if a previous call to
+     * @throws IllegalStateException if a previous call to
      * {@code prepareWriteEmpty} without a corresponding call to
      * {@code endWriteEmpty} has been made.
-     * @exception IllegalStateException if a call to
+     * @throws IllegalStateException if a call to
      * {@code prepareReplacePixels} has been made without a
      * matching call to {@code endReplacePixels}.
-     * @exception IOException if an I/O error occurs during writing.
+     * @throws IOException if an I/O error occurs during writing.
      */
     public void endInsertEmpty() throws IOException {
         unsupported();
@@ -1382,12 +1382,12 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @return {@code true} if the pixels of the given
      * image can be replaced.
      *
-     * @exception IllegalStateException if the output has not been
+     * @throws IllegalStateException if the output has not been
      * set.
-     * @exception IndexOutOfBoundsException if the writer supports
+     * @throws IndexOutOfBoundsException if the writer supports
      * pixel replacement in general, but {@code imageIndex} is
      * less than 0 or greater than the largest available index.
-     * @exception IOException if an I/O error occurs during the query.
+     * @throws IOException if an I/O error occurs during the query.
      */
     public boolean canReplacePixels(int imageIndex) throws IOException {
         if (getOutput() == null) {
@@ -1415,20 +1415,20 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @param region a {@code Rectangle} that will be used to clip
      * future pixel regions.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canReplacePixels(imageIndex)} returns
      * {@code false}.
-     * @exception IndexOutOfBoundsException if {@code imageIndex}
+     * @throws IndexOutOfBoundsException if {@code imageIndex}
      * is less than 0 or greater than the largest available index.
-     * @exception IllegalStateException if there is a previous call to
+     * @throws IllegalStateException if there is a previous call to
      * {@code prepareReplacePixels} without a matching call to
      * {@code endReplacePixels} (<i>i.e.</i>, nesting is not
      * allowed).
-     * @exception IllegalArgumentException if {@code region} is
+     * @throws IllegalArgumentException if {@code region} is
      * {@code null} or has a width or height less than 1.
-     * @exception IOException if an I/O error occurs during the
+     * @throws IOException if an I/O error occurs during the
      * preparation.
      */
     public void prepareReplacePixels(int imageIndex,
@@ -1471,22 +1471,22 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null} to use a default
      * {@code ImageWriteParam}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canReplacePixels(imageIndex)} returns
      * {@code false}.
-     * @exception IllegalStateException if there is no previous call to
+     * @throws IllegalStateException if there is no previous call to
      * {@code prepareReplacePixels} without a matching call to
      * {@code endReplacePixels}.
-     * @exception IllegalArgumentException if any of the following are true:
+     * @throws IllegalArgumentException if any of the following are true:
      * <ul>
      * <li> {@code image} is {@code null}.
      * <li> the intersected region does not contain at least one pixel.
      * <li> the layout of {@code image} does not match, or this
      * writer cannot convert it to, the existing image layout.
      * </ul>
-     * @exception IOException if an I/O error occurs during writing.
+     * @throws IOException if an I/O error occurs during writing.
      */
     public void replacePixels(RenderedImage image, ImageWriteParam param)
         throws IOException {
@@ -1529,24 +1529,24 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null} to use a default
      * {@code ImageWriteParam}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canReplacePixels(imageIndex)} returns
      * {@code false}.
-     * @exception IllegalStateException if there is no previous call to
+     * @throws IllegalStateException if there is no previous call to
      * {@code prepareReplacePixels} without a matching call to
      * {@code endReplacePixels}.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canWriteRasters} returns {@code false}.
-     * @exception IllegalArgumentException if any of the following are true:
+     * @throws IllegalArgumentException if any of the following are true:
      * <ul>
      * <li> {@code raster} is {@code null}.
      * <li> the intersected region does not contain at least one pixel.
      * <li> the layout of {@code raster} does not match, or this
      * writer cannot convert it to, the existing image layout.
      * </ul>
-     * @exception IOException if an I/O error occurs during writing.
+     * @throws IOException if an I/O error occurs during writing.
      */
     public void replacePixels(Raster raster, ImageWriteParam param)
         throws IOException {
@@ -1565,15 +1565,15 @@ public abstract class ImageWriter implements ImageTranscoder {
      * {@code null}, and otherwise throws an
      * {@code UnsupportedOperationException}.
      *
-     * @exception IllegalStateException if the output has not
+     * @throws IllegalStateException if the output has not
      * been set.
-     * @exception UnsupportedOperationException if
+     * @throws UnsupportedOperationException if
      * {@code canReplacePixels(imageIndex)} returns
      * {@code false}.
-     * @exception IllegalStateException if there is no previous call
+     * @throws IllegalStateException if there is no previous call
      * to {@code prepareReplacePixels} without a matching call to
      * {@code endReplacePixels}.
-     * @exception IOException if an I/O error occurs during writing.
+     * @throws IOException if an I/O error occurs during writing.
      */
     public void endReplacePixels() throws IOException {
         unsupported();
@@ -1886,7 +1886,7 @@ public abstract class ImageWriter implements ImageTranscoder {
      * occurred.
      * @param warning the warning message.
      *
-     * @exception IllegalArgumentException if {@code warning}
+     * @throws IllegalArgumentException if {@code warning}
      * is {@code null}.
      */
     protected void processWarningOccurred(int imageIndex,
@@ -1921,15 +1921,15 @@ public abstract class ImageWriter implements ImageTranscoder {
      * @param keyword the keyword used to index the warning message
      * within the set of {@code ResourceBundle}s.
      *
-     * @exception IllegalArgumentException if {@code baseName}
+     * @throws IllegalArgumentException if {@code baseName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code keyword}
+     * @throws IllegalArgumentException if {@code keyword}
      * is {@code null}.
-     * @exception IllegalArgumentException if no appropriate
+     * @throws IllegalArgumentException if no appropriate
      * {@code ResourceBundle} may be located.
-     * @exception IllegalArgumentException if the named resource is
+     * @throws IllegalArgumentException if the named resource is
      * not found in the located {@code ResourceBundle}.
-     * @exception IllegalArgumentException if the object retrieved
+     * @throws IllegalArgumentException if the object retrieved
      * from the {@code ResourceBundle} is not a
      * {@code String}.
      */
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
index 9952544b487..3954f886f47 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java
@@ -165,9 +165,9 @@ public abstract class IIOMetadata {
      * indicating the class names of any additional formats supported by
      * this object, or {@code null} if there are none.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code extraMetadataFormatNames} has length 0.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code extraMetadataFormatNames} and
      * {@code extraMetadataFormatClassNames} are neither both
      * {@code null}, nor of the same length.
@@ -368,10 +368,10 @@ public abstract class IIOMetadata {
      *
      * @return an {@code IIOMetadataFormat} object.
      *
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null} or is not one of the names recognized by
      * the plug-in.
-     * @exception IllegalStateException if the class corresponding to
+     * @throws IllegalStateException if the class corresponding to
      * the format name cannot be loaded.
      */
     public IIOMetadataFormat getMetadataFormat(String formatName) {
@@ -452,7 +452,7 @@ public abstract class IIOMetadata {
      * @return an XML DOM {@code Node} object forming the
      * root of a tree.
      *
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null} or is not one of the names returned by
      * {@code getMetadataFormatNames}.
      *
@@ -481,13 +481,13 @@ public abstract class IIOMetadata {
      * @param root an XML DOM {@code Node} object forming the
      * root of a tree.
      *
-     * @exception IllegalStateException if this object is read-only.
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalStateException if this object is read-only.
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null} or is not one of the names returned by
      * {@code getMetadataFormatNames}.
-     * @exception IllegalArgumentException if {@code root} is
+     * @throws IllegalArgumentException if {@code root} is
      * {@code null}.
-     * @exception IIOInvalidTreeException if the tree cannot be parsed
+     * @throws IIOInvalidTreeException if the tree cannot be parsed
      * successfully using the rules of the given format.
      *
      * @see #getMetadataFormatNames
@@ -731,13 +731,13 @@ public abstract class IIOMetadata {
      * @param root an XML DOM {@code Node} object forming the
      * root of a tree.
      *
-     * @exception IllegalStateException if this object is read-only.
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalStateException if this object is read-only.
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null} or is not one of the names returned by
      * {@code getMetadataFormatNames}.
-     * @exception IllegalArgumentException if {@code root} is
+     * @throws IllegalArgumentException if {@code root} is
      * {@code null}.
-     * @exception IIOInvalidTreeException if the tree cannot be parsed
+     * @throws IIOInvalidTreeException if the tree cannot be parsed
      * successfully using the rules of the given format.
      *
      * @see #getMetadataFormatNames
@@ -757,7 +757,7 @@ public abstract class IIOMetadata {
      * Note that there are many possible default values, depending on
      * how the object was created.
      *
-     * @exception IllegalStateException if this object is read-only.
+     * @throws IllegalStateException if this object is read-only.
      *
      * @see javax.imageio.ImageReader#getStreamMetadata
      * @see javax.imageio.ImageReader#getImageMetadata
@@ -873,7 +873,7 @@ public abstract class IIOMetadata {
      *
      * @return {@code true} if the controller completed normally.
      *
-     * @exception IllegalStateException if there is no controller
+     * @throws IllegalStateException if there is no controller
      * currently installed.
      *
      * @see IIOMetadataController
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java
index ddf105763f0..88f8727aad5 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataController.java
@@ -79,7 +79,7 @@ public interface IIOMetadataController {
      * @return {@code true} if the {@code IIOMetadata} has been
      * modified, {@code false} otherwise.
      *
-     * @exception IllegalArgumentException if {@code metadata} is
+     * @throws IllegalArgumentException if {@code metadata} is
      * {@code null} or is not an instance of the correct class.
      */
     boolean activate(IIOMetadata metadata);
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java
index 797ecc56180..b0cd40b6f6e 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormat.java
@@ -319,10 +319,10 @@ public interface IIOMetadataFormat {
      *
      * @return an {@code int}.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element does
+     * @throws IllegalArgumentException if the named element does
      * not have a child policy of {@code CHILD_POLICY_REPEAT}.
      */
     int getElementMinChildren(String elementName);
@@ -339,10 +339,10 @@ public interface IIOMetadataFormat {
      *
      * @return an {@code int}.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element does
+     * @throws IllegalArgumentException if the named element does
      * not have a child policy of {@code CHILD_POLICY_REPEAT}.
      */
     int getElementMaxChildren(String elementName);
@@ -362,7 +362,7 @@ public interface IIOMetadataFormat {
      *
      * @return the element description.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this format.
      */
     String getElementDescription(String elementName, Locale locale);
@@ -378,7 +378,7 @@ public interface IIOMetadataFormat {
      *
      * @return one of the {@code CHILD_POLICY_*} constants.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
      */
@@ -394,7 +394,7 @@ public interface IIOMetadataFormat {
      *
      * @return an array of {@code String}s, or null.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
      */
@@ -410,7 +410,7 @@ public interface IIOMetadataFormat {
      *
      * @return an array of {@code String}s.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
      */
@@ -428,10 +428,10 @@ public interface IIOMetadataFormat {
      *
      * @return one of the {@code VALUE_*} constants.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
      */
@@ -450,10 +450,10 @@ public interface IIOMetadataFormat {
      *
      * @return one of the {@code DATATYPE_*} constants.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
      */
@@ -468,10 +468,10 @@ public interface IIOMetadataFormat {
      *
      * @return {@code true} if the attribute must be present.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
      */
@@ -489,10 +489,10 @@ public interface IIOMetadataFormat {
      * @return a {@code String} containing the default value, or
      * {@code null}.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
      */
@@ -510,13 +510,13 @@ public interface IIOMetadataFormat {
      *
      * @return an array of {@code String}s.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
-     * @exception IllegalArgumentException if the given attribute is
+     * @throws IllegalArgumentException if the given attribute is
      * not defined as an enumeration.
      */
     String[] getAttributeEnumerations(String elementName, String attrName);
@@ -537,13 +537,13 @@ public interface IIOMetadataFormat {
      * @return a {@code String} containing the smallest legal
      * value for the attribute.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
-     * @exception IllegalArgumentException if the given attribute is
+     * @throws IllegalArgumentException if the given attribute is
      * not defined as a range.
      */
     String getAttributeMinValue(String elementName, String attrName);
@@ -565,13 +565,13 @@ public interface IIOMetadataFormat {
      * @return a {@code String} containing the largest legal
      * value for the attribute.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
-     * @exception IllegalArgumentException if the given attribute is
+     * @throws IllegalArgumentException if the given attribute is
      * not defined as a range.
      */
     String getAttributeMaxValue(String elementName, String attrName);
@@ -590,13 +590,13 @@ public interface IIOMetadataFormat {
      * @return the smallest legal number of list items for the
      * attribute.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
-     * @exception IllegalArgumentException if the given attribute is
+     * @throws IllegalArgumentException if the given attribute is
      * not defined as a list.
      */
     int getAttributeListMinLength(String elementName, String attrName);
@@ -617,13 +617,13 @@ public interface IIOMetadataFormat {
      * @return the largest legal number of list items for the
      * attribute.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
-     * @exception IllegalArgumentException if the given attribute is
+     * @throws IllegalArgumentException if the given attribute is
      * not defined as a list.
      */
     int getAttributeListMaxLength(String elementName, String attrName);
@@ -644,9 +644,9 @@ public interface IIOMetadataFormat {
      *
      * @return the attribute description.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
      */
@@ -671,7 +671,7 @@ public interface IIOMetadataFormat {
      *
      * @return one of the {@code VALUE_*} constants.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
      *
@@ -696,10 +696,10 @@ public interface IIOMetadataFormat {
      *
      * @return a {@code Class} object.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element cannot
+     * @throws IllegalArgumentException if the named element cannot
      * contain an object value (<i>i.e.</i>, if
      * {@code getObjectValueType(elementName) == VALUE_NONE}).
      */
@@ -714,10 +714,10 @@ public interface IIOMetadataFormat {
      *
      * @return an {@code Object}.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element cannot
+     * @throws IllegalArgumentException if the named element cannot
      * contain an object value (<i>i.e.</i>, if
      * {@code getObjectValueType(elementName) == VALUE_NONE}).
      */
@@ -739,13 +739,13 @@ public interface IIOMetadataFormat {
      *
      * @return an array of {@code Object}s.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element cannot
+     * @throws IllegalArgumentException if the named element cannot
      * contain an object value (<i>i.e.</i>, if
      * {@code getObjectValueType(elementName) == VALUE_NONE}).
-     * @exception IllegalArgumentException if the {@code Object}
+     * @throws IllegalArgumentException if the {@code Object}
      * is not defined as an enumeration.
      */
     Object[] getObjectEnumerations(String elementName);
@@ -762,13 +762,13 @@ public interface IIOMetadataFormat {
      *
      * @return the smallest legal value for the attribute.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element cannot
+     * @throws IllegalArgumentException if the named element cannot
      * contain an object value (<i>i.e.</i>, if
      * {@code getObjectValueType(elementName) == VALUE_NONE}).
-     * @exception IllegalArgumentException if the {@code Object}
+     * @throws IllegalArgumentException if the {@code Object}
      * is not defined as a range.
      */
     Comparable<?> getObjectMinValue(String elementName);
@@ -785,13 +785,13 @@ public interface IIOMetadataFormat {
      *
      * @param elementName the name of the element being queried.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element cannot
+     * @throws IllegalArgumentException if the named element cannot
      * contain an object value (<i>i.e.</i>, if
      * {@code getObjectValueType(elementName) == VALUE_NONE}).
-     * @exception IllegalArgumentException if the {@code Object}
+     * @throws IllegalArgumentException if the {@code Object}
      * is not defined as a range.
      */
     Comparable<?> getObjectMaxValue(String elementName);
@@ -808,13 +808,13 @@ public interface IIOMetadataFormat {
      * @return the smallest valid array length for the
      * {@code Object} reference.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element cannot
+     * @throws IllegalArgumentException if the named element cannot
      * contain an object value (<i>i.e.</i>, if
      * {@code getObjectValueType(elementName) == VALUE_NONE}).
-     * @exception IllegalArgumentException if the {@code Object} is not
+     * @throws IllegalArgumentException if the {@code Object} is not
      * an array.
      */
     int getObjectArrayMinLength(String elementName);
@@ -832,13 +832,13 @@ public interface IIOMetadataFormat {
      * @return the largest valid array length for the
      * {@code Object} reference.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null} or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if the named element cannot
+     * @throws IllegalArgumentException if the named element cannot
      * contain an object value (<i>i.e.</i>, if
      * {@code getObjectValueType(elementName) == VALUE_NONE}).
-     * @exception IllegalArgumentException if the {@code Object} is not
+     * @throws IllegalArgumentException if the {@code Object} is not
      * an array.
      */
     int getObjectArrayMaxLength(String elementName);
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
index 8b5de4089ef..d81b0df3c87 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
@@ -160,9 +160,9 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param childPolicy one of the {@code CHILD_POLICY_*} constants,
      * other than {@code CHILD_POLICY_REPEAT}.
      *
-     * @exception IllegalArgumentException if {@code rootName} is
+     * @throws IllegalArgumentException if {@code rootName} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code childPolicy} is
+     * @throws IllegalArgumentException if {@code childPolicy} is
      * not one of the predefined constants.
      */
     public IIOMetadataFormatImpl(String rootName,
@@ -196,9 +196,9 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param minChildren the minimum number of children of the node.
      * @param maxChildren the maximum number of children of the node.
      *
-     * @exception IllegalArgumentException if {@code rootName} is
+     * @throws IllegalArgumentException if {@code rootName} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code minChildren}
+     * @throws IllegalArgumentException if {@code minChildren}
      * is negative or larger than {@code maxChildren}.
      */
     public IIOMetadataFormatImpl(String rootName,
@@ -236,7 +236,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param resourceBaseName a {@code String} containing the new
      * base name.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code resourceBaseName} is {@code null}.
      *
      * @see #getResourceBaseName
@@ -307,10 +307,10 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * constants, other than {@code CHILD_POLICY_REPEAT},
      * indicating the child policy of the new element.
      *
-     * @exception IllegalArgumentException if {@code parentName}
+     * @throws IllegalArgumentException if {@code parentName}
      * is {@code null}, or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code childPolicy}
+     * @throws IllegalArgumentException if {@code childPolicy}
      * is not one of the predefined constants.
      */
     protected void addElement(String elementName,
@@ -344,10 +344,10 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param minChildren the minimum number of children of the node.
      * @param maxChildren the maximum number of children of the node.
      *
-     * @exception IllegalArgumentException if {@code parentName}
+     * @throws IllegalArgumentException if {@code parentName}
      * is {@code null}, or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code minChildren}
+     * @throws IllegalArgumentException if {@code minChildren}
      * is negative or larger than {@code maxChildren}.
      */
     protected void addElement(String elementName,
@@ -383,10 +383,10 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param elementName the name of the element to be added as a
      * child.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code parentName}
+     * @throws IllegalArgumentException if {@code parentName}
      * is {@code null}, or is not a legal element name for this
      * format.
      */
@@ -429,12 +429,12 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param defaultValue the default value for the attribute, or
      * {@code null}.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of the predefined constants.
      */
     protected void addAttribute(String elementName,
@@ -476,19 +476,19 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * {@code String}s containing the legal values for the
      * attribute.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of the predefined constants.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code enumeratedValues} is {@code null}.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code enumeratedValues} does not contain at least one
      * entry.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code enumeratedValues} contains an element that is not a
      * {@code String} or is {@code null}.
      */
@@ -556,12 +556,12 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param maxInclusive {@code true} if {@code maxValue}
      * is inclusive.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of the predefined constants.
      */
     protected void addAttribute(String elementName,
@@ -612,14 +612,14 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param listMinLength the smallest legal number of list items.
      * @param listMaxLength the largest legal number of list items.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code dataType} is
+     * @throws IllegalArgumentException if {@code dataType} is
      * not one of the predefined constants.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code listMinLength} is negative or larger than
      * {@code listMaxLength}.
      */
@@ -666,10 +666,10 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * {@code boolean}, ignored if {@code hasDefaultValue}
      * is {@code false}.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this
      * format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null}.
      */
     protected void addBooleanAttribute(String elementName,
@@ -700,7 +700,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param elementName the name of the element.
      * @param attrName the name of the attribute being removed.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this format.
      */
     protected void removeAttribute(String elementName, String attrName) {
@@ -726,7 +726,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * {@code Object} reference, or {@code null}.
      * @param <T> the type of the object.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this format.
      */
     protected <T> void addObjectValue(String elementName,
@@ -763,14 +763,14 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * object reference.
      * @param <T> the type of the object.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this format.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code enumeratedValues} is {@code null}.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code enumeratedValues} does not contain at least one
      * entry.
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code enumeratedValues} contains an element that is not
      * an instance of the class type denoted by {@code classType}
      * or is {@code null}.
@@ -833,7 +833,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * is inclusive.
      * @param <T> the type of the object.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this
      * format.
      */
@@ -880,7 +880,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      * @param arrayMinLength the smallest legal length for the array.
      * @param arrayMaxLength the largest legal length for the array.
      *
-     * @exception IllegalArgumentException if {@code elementName} is
+     * @throws IllegalArgumentException if {@code elementName} is
      * not a legal element name for this format.
      */
     protected void addObjectValue(String elementName,
@@ -903,7 +903,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      *
      * @param elementName the name of the element.
      *
-     * @exception IllegalArgumentException if {@code elementName} is
+     * @throws IllegalArgumentException if {@code elementName} is
      * not a legal element name for this format.
      */
     protected void removeObjectValue(String elementName) {
@@ -990,7 +990,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      *
      * @return the element description.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this format.
      *
      * @see #setResourceBaseName
@@ -1130,9 +1130,9 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat {
      *
      * @return the attribute description.
      *
-     * @exception IllegalArgumentException if {@code elementName}
+     * @throws IllegalArgumentException if {@code elementName}
      * is {@code null}, or is not a legal element name for this format.
-     * @exception IllegalArgumentException if {@code attrName} is
+     * @throws IllegalArgumentException if {@code attrName} is
      * {@code null} or is not a legal attribute name for this
      * element.
      *
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java
index 227bc8dcb31..e57d0ba00fd 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadataNode.java
@@ -464,7 +464,7 @@ public class IIOMetadataNode implements Element, NodeList {
      *
      * @return the node being inserted.
      *
-     * @exception IllegalArgumentException if {@code newChild} is
+     * @throws IllegalArgumentException if {@code newChild} is
      * {@code null}.
      */
     public Node insertBefore(Node newChild,
@@ -522,7 +522,7 @@ public class IIOMetadataNode implements Element, NodeList {
      *
      * @return the node replaced.
      *
-     * @exception IllegalArgumentException if {@code newChild} is
+     * @throws IllegalArgumentException if {@code newChild} is
      * {@code null}.
      */
     public Node replaceChild(Node newChild,
@@ -573,7 +573,7 @@ public class IIOMetadataNode implements Element, NodeList {
      *
      * @return the node removed.
      *
-     * @exception IllegalArgumentException if {@code oldChild} is
+     * @throws IllegalArgumentException if {@code oldChild} is
      * {@code null}.
      */
     public Node removeChild(Node oldChild) {
@@ -617,7 +617,7 @@ public class IIOMetadataNode implements Element, NodeList {
      *
      * @return the node added.
      *
-     * @exception IllegalArgumentException if {@code newChild} is
+     * @throws IllegalArgumentException if {@code newChild} is
      * {@code null}.
      */
     public Node appendChild(Node newChild) {
diff --git a/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
index 8904c89fff2..507d2c28041 100644
--- a/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
+++ b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
@@ -113,7 +113,7 @@ public class JPEGImageReadParam extends ImageReadParam {
      * @param DCHuffmanTables an array of Huffman table objects.
      * @param ACHuffmanTables an array of Huffman table objects.
      *
-     * @exception IllegalArgumentException if any of the arguments
+     * @throws IllegalArgumentException if any of the arguments
      * is {@code null}, has more than 4 elements, or if the
      * numbers of DC and AC tables differ.
      *
diff --git a/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
index 986d302decc..de9c077d8c7 100644
--- a/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
+++ b/src/java.desktop/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
@@ -130,7 +130,7 @@ public class JPEGImageWriteParam extends ImageWriteParam {
      * <p> The default implementation resets the compression quality
      * to {@code 0.75F}.
      *
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
      */
     public void unsetCompression() {
@@ -147,7 +147,7 @@ public class JPEGImageWriteParam extends ImageWriteParam {
      *
      * @return {@code false}.
      *
-     * @exception IllegalStateException if the compression mode is not
+     * @throws IllegalStateException if the compression mode is not
      * {@code MODE_EXPLICIT}.
      */
     public boolean isCompressionLossless() {
@@ -204,7 +204,7 @@ public class JPEGImageWriteParam extends ImageWriteParam {
      * @param DCHuffmanTables An array of Huffman table objects.
      * @param ACHuffmanTables An array of Huffman table objects.
      *
-     * @exception IllegalArgumentException if any of the arguments
+     * @throws IllegalArgumentException if any of the arguments
      * is {@code null} or has more than 4 elements, or if the
      * numbers of DC and AC tables differ.
      *
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java b/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java
index 95f0ec0edab..9bb3cbac97e 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/IIOServiceProvider.java
@@ -65,9 +65,9 @@ public abstract class IIOServiceProvider implements RegisterableService {
      * @param vendorName the vendor name.
      * @param version a version identifier.
      *
-     * @exception IllegalArgumentException if {@code vendorName}
+     * @throws IllegalArgumentException if {@code vendorName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code version}
+     * @throws IllegalArgumentException if {@code version}
      * is {@code null}.
      */
     public IIOServiceProvider(String vendorName,
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java
index e7f7264287c..fb3b8d58e31 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ImageInputStreamSpi.java
@@ -79,9 +79,9 @@ public abstract class ImageInputStreamSpi extends IIOServiceProvider {
      * legal object type for use by the
      * {@code createInputStreamInstance} method.
      *
-     * @exception IllegalArgumentException if {@code vendorName}
+     * @throws IllegalArgumentException if {@code vendorName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code version}
+     * @throws IllegalArgumentException if {@code version}
      * is {@code null}.
      */
     public ImageInputStreamSpi(String vendorName,
@@ -159,12 +159,12 @@ public abstract class ImageInputStreamSpi extends IIOServiceProvider {
      *
      * @return an {@code ImageInputStream} instance.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * not an instance of the correct class or is {@code null}.
-     * @exception IllegalArgumentException if a cache file is needed
+     * @throws IllegalArgumentException if a cache file is needed
      * but {@code cacheDir} is non-{@code null} and is not a
      * directory.
-     * @exception IOException if a cache file is needed but cannot be
+     * @throws IOException if a cache file is needed but cannot be
      * created.
      *
      * @see #getInputClass
@@ -187,9 +187,9 @@ public abstract class ImageInputStreamSpi extends IIOServiceProvider {
      *
      * @return an {@code ImageInputStream} instance.
      *
-     * @exception IllegalArgumentException if {@code input} is
+     * @throws IllegalArgumentException if {@code input} is
      * not an instance of the correct class or is {@code null}.
-     * @exception IOException if a cache file is needed but cannot be
+     * @throws IOException if a cache file is needed but cannot be
      * created.
      *
      * @see #getInputClass()
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java
index d3cf9593d04..a8fcf7ef19f 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java
@@ -80,9 +80,9 @@ public abstract class ImageOutputStreamSpi extends IIOServiceProvider {
      * legal object type for use by the
      * {@code createOutputStreamInstance} method.
      *
-     * @exception IllegalArgumentException if {@code vendorName}
+     * @throws IllegalArgumentException if {@code vendorName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code version}
+     * @throws IllegalArgumentException if {@code version}
      * is {@code null}.
     */
     public ImageOutputStreamSpi(String vendorName,
@@ -159,12 +159,12 @@ public abstract class ImageOutputStreamSpi extends IIOServiceProvider {
      *
      * @return an {@code ImageOutputStream} instance.
      *
-     * @exception IllegalArgumentException if {@code output} is
+     * @throws IllegalArgumentException if {@code output} is
      * not an instance of the correct class or is {@code null}.
-     * @exception IllegalArgumentException if a cache file is needed,
+     * @throws IllegalArgumentException if a cache file is needed,
      * but {@code cacheDir} is non-{@code null} and is not a
      * directory.
-     * @exception IOException if a cache file is needed but cannot be
+     * @throws IOException if a cache file is needed but cannot be
      * created.
      *
      * @see #getOutputClass
@@ -186,9 +186,9 @@ public abstract class ImageOutputStreamSpi extends IIOServiceProvider {
      *
      * @return an {@code ImageOutputStream} instance.
      *
-     * @exception IllegalArgumentException if {@code output} is
+     * @throws IllegalArgumentException if {@code output} is
      * not an instance of the correct class or is {@code null}.
-     * @exception IOException if a cache file is needed but cannot be
+     * @throws IOException if a cache file is needed but cannot be
      * created.
      *
      * @see #getOutputClass()
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java
index 4777f989c4b..f20f1bd6eb0 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderSpi.java
@@ -180,15 +180,15 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi {
      * {@code getImageMetadataFormat}.  An array of length
      * 0 is normalized to {@code null}.
      *
-     * @exception IllegalArgumentException if {@code vendorName}
+     * @throws IllegalArgumentException if {@code vendorName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code version}
+     * @throws IllegalArgumentException if {@code version}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code names}
+     * @throws IllegalArgumentException if {@code names}
      * is {@code null} or has length 0.
-     * @exception IllegalArgumentException if {@code readerClassName}
+     * @throws IllegalArgumentException if {@code readerClassName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code inputTypes}
+     * @throws IllegalArgumentException if {@code inputTypes}
      * is {@code null} or has length 0.
      */
     public ImageReaderSpi(String vendorName,
@@ -294,9 +294,9 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi {
      * @return {@code true} if it is likely that this stream can
      * be decoded.
      *
-     * @exception IllegalArgumentException if {@code source} is
+     * @throws IllegalArgumentException if {@code source} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs while reading the
+     * @throws IOException if an I/O error occurs while reading the
      * stream.
      */
     public abstract boolean canDecodeInput(Object source) throws IOException;
@@ -312,7 +312,7 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi {
      *
      * @return an {@code ImageReader} instance.
      *
-     * @exception IOException if an error occurs during loading,
+     * @throws IOException if an error occurs during loading,
      * or initialization of the reader class, or during instantiation
      * or initialization of the reader object.
      */
@@ -338,9 +338,9 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi {
      *
      * @return an {@code ImageReader} instance.
      *
-     * @exception IOException if the attempt to instantiate
+     * @throws IOException if the attempt to instantiate
      * the reader fails.
-     * @exception IllegalArgumentException if the
+     * @throws IllegalArgumentException if the
      * {@code ImageReader}'s constructor throws an
      * {@code IllegalArgumentException} to indicate that the
      * extension object is unsuitable.
@@ -362,7 +362,7 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi {
      *
      * @return {@code true} if {@code reader} is recognized.
      *
-     * @exception IllegalArgumentException if {@code reader} is
+     * @throws IllegalArgumentException if {@code reader} is
      * {@code null}.
      */
     public boolean isOwnReader(ImageReader reader) {
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
index 29ed6de0d50..7abefdd9431 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
@@ -199,13 +199,13 @@ public abstract class ImageReaderWriterSpi extends IIOServiceProvider {
      * {@code getImageMetadataFormat}.  An array of length
      * 0 is normalized to {@code null}.
      *
-     * @exception IllegalArgumentException if {@code vendorName}
+     * @throws IllegalArgumentException if {@code vendorName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code version}
+     * @throws IllegalArgumentException if {@code version}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code names}
+     * @throws IllegalArgumentException if {@code names}
      * is {@code null} or has length 0.
-     * @exception IllegalArgumentException if {@code pluginClassName}
+     * @throws IllegalArgumentException if {@code pluginClassName}
      * is {@code null}.
      */
     public ImageReaderWriterSpi(String vendorName,
@@ -518,7 +518,7 @@ public abstract class ImageReaderWriterSpi extends IIOServiceProvider {
      *
      * @return an {@code IIOMetadataFormat} object.
      *
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null} or is not a supported name.
      */
     public IIOMetadataFormat getStreamMetadataFormat(String formatName) {
@@ -542,7 +542,7 @@ public abstract class ImageReaderWriterSpi extends IIOServiceProvider {
      *
      * @return an {@code IIOMetadataFormat} object.
      *
-     * @exception IllegalArgumentException if {@code formatName}
+     * @throws IllegalArgumentException if {@code formatName}
      * is {@code null} or is not a supported name.
      */
     public IIOMetadataFormat getImageMetadataFormat(String formatName) {
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java b/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java
index 604de8d7b22..de2195988b4 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ImageWriterSpi.java
@@ -181,15 +181,15 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi {
      * {@code getImageMetadataFormat}.  An array of length
      * 0 is normalized to {@code null}.
      *
-     * @exception IllegalArgumentException if {@code vendorName}
+     * @throws IllegalArgumentException if {@code vendorName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code version}
+     * @throws IllegalArgumentException if {@code version}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code names}
+     * @throws IllegalArgumentException if {@code names}
      * is {@code null} or has length 0.
-     * @exception IllegalArgumentException if {@code writerClassName}
+     * @throws IllegalArgumentException if {@code writerClassName}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code outputTypes}
+     * @throws IllegalArgumentException if {@code outputTypes}
      * is {@code null} or has length 0.
      */
     public ImageWriterSpi(String vendorName,
@@ -304,7 +304,7 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi {
      * @return {@code true} if this writer is likely to be able
      * to encode images with the given layout.
      *
-     * @exception IllegalArgumentException if {@code type}
+     * @throws IllegalArgumentException if {@code type}
      * is {@code null}.
      */
     public abstract boolean canEncodeImage(ImageTypeSpecifier type);
@@ -325,7 +325,7 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi {
      * @return {@code true} if this writer is likely to be able
      * to encode this image.
      *
-     * @exception IllegalArgumentException if {@code im}
+     * @throws IllegalArgumentException if {@code im}
      * is {@code null}.
      */
     public boolean canEncodeImage(RenderedImage im) {
@@ -343,7 +343,7 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi {
      *
      * @return an {@code ImageWriter} instance.
      *
-     * @exception IOException if an error occurs during loading,
+     * @throws IOException if an error occurs during loading,
      * or initialization of the writer class, or during instantiation
      * or initialization of the writer object.
      */
@@ -369,9 +369,9 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi {
      *
      * @return an {@code ImageWriter} instance.
      *
-     * @exception IOException if the attempt to instantiate
+     * @throws IOException if the attempt to instantiate
      * the writer fails.
-     * @exception IllegalArgumentException if the
+     * @throws IllegalArgumentException if the
      * {@code ImageWriter}'s constructor throws an
      * {@code IllegalArgumentException} to indicate that the
      * extension object is unsuitable.
@@ -388,7 +388,7 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi {
      *
      * @return {@code true} if {@code writer} is recognized
      *
-     * @exception IllegalArgumentException if {@code writer} is
+     * @throws IllegalArgumentException if {@code writer} is
      * {@code null}.
      */
     public boolean isOwnWriter(ImageWriter writer) {
diff --git a/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
index 4a43ca8133a..64f71f734a9 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java
@@ -104,7 +104,7 @@ public class ServiceRegistry {
      * @param categories an {@code Iterator} containing
      * {@code Class} objects to be used to define categories.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code categories} is {@code null}, or if
      * one of the categories is not an allowed service type.
      */
@@ -157,7 +157,7 @@ public class ServiceRegistry {
      * file violates the specified format or if a provider class
      * cannot be found and instantiated.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code providerClass} is {@code null}, or if it is
      * not one of the allowed service types.
      */
@@ -196,7 +196,7 @@ public class ServiceRegistry {
      * file violates the specified format or if a provider class
      * cannot be found and instantiated.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code providerClass} is {@code null}, or if it is
      * not one of the allowed service types.
      */
@@ -254,11 +254,11 @@ public class ServiceRegistry {
      * @return true if no provider of the same class was previously
      * registered in the same category category.
      *
-     * @exception IllegalArgumentException if {@code provider} is
+     * @throws IllegalArgumentException if {@code provider} is
      * {@code null}.
-     * @exception IllegalArgumentException if there is no category
+     * @throws IllegalArgumentException if there is no category
      * corresponding to {@code category}.
-     * @exception ClassCastException if provider does not implement
+     * @throws ClassCastException if provider does not implement
      * the {@code Class} defined by {@code category}.
      */
     public <T> boolean registerServiceProvider(T provider,
@@ -292,7 +292,7 @@ public class ServiceRegistry {
      *
      * @param provider the service provider object to be registered.
      *
-     * @exception IllegalArgumentException if
+     * @throws IllegalArgumentException if
      * {@code provider} is {@code null}.
      */
     public void registerServiceProvider(Object provider) {
@@ -323,7 +323,7 @@ public class ServiceRegistry {
      * @param providers an Iterator containing service provider
      * objects to be registered.
      *
-     * @exception IllegalArgumentException if {@code providers}
+     * @throws IllegalArgumentException if {@code providers}
      * is {@code null} or contains a {@code null} entry.
      */
     public void registerServiceProviders(Iterator<?> providers) {
@@ -357,11 +357,11 @@ public class ServiceRegistry {
      * registered in the same category category,
      * {@code false} otherwise.
      *
-     * @exception IllegalArgumentException if {@code provider} is
+     * @throws IllegalArgumentException if {@code provider} is
      * {@code null}.
-     * @exception IllegalArgumentException if there is no category
+     * @throws IllegalArgumentException if there is no category
      * corresponding to {@code category}.
-     * @exception ClassCastException if provider does not implement
+     * @throws ClassCastException if provider does not implement
      * the class defined by {@code category}.
      */
     public <T> boolean deregisterServiceProvider(T provider,
@@ -385,7 +385,7 @@ public class ServiceRegistry {
      *
      * @param provider the service provider object to be deregistered.
      *
-     * @exception IllegalArgumentException if {@code provider} is
+     * @throws IllegalArgumentException if {@code provider} is
      * {@code null}.
      */
     public void deregisterServiceProvider(Object provider) {
@@ -408,7 +408,7 @@ public class ServiceRegistry {
      * @return {@code true} if the given provider has been
      * registered.
      *
-     * @exception IllegalArgumentException if {@code provider} is
+     * @throws IllegalArgumentException if {@code provider} is
      * {@code null}.
      */
     public boolean contains(Object provider) {
@@ -444,7 +444,7 @@ public class ServiceRegistry {
      * @return an {@code Iterator} containing service provider
      * objects from the given category, possibly in order.
      *
-     * @exception IllegalArgumentException if there is no category
+     * @throws IllegalArgumentException if there is no category
      * corresponding to {@code category}.
      */
     public <T> Iterator<T> getServiceProviders(Class<T> category,
@@ -502,7 +502,7 @@ public class ServiceRegistry {
      * @return an {@code Iterator} containing service provider
      * objects from the given category, possibly in order.
      *
-     * @exception IllegalArgumentException if there is no category
+     * @throws IllegalArgumentException if there is no category
      * corresponding to {@code category}.
      */
     public <T> Iterator<T> getServiceProviders(Class<T> category,
@@ -531,7 +531,7 @@ public class ServiceRegistry {
      * desired {@code Class} type, or {@code null} is none is
      * present.
      *
-     * @exception IllegalArgumentException if {@code providerClass} is
+     * @throws IllegalArgumentException if {@code providerClass} is
      * {@code null}.
      */
     public <T> T getServiceProviderByClass(Class<T> providerClass) {
@@ -573,9 +573,9 @@ public class ServiceRegistry {
      * @return {@code true} if a previously unset ordering
      * was established.
      *
-     * @exception IllegalArgumentException if either provider is
+     * @throws IllegalArgumentException if either provider is
      * {@code null} or they are the same object.
-     * @exception IllegalArgumentException if there is no category
+     * @throws IllegalArgumentException if there is no category
      * corresponding to {@code category}.
      */
     public <T> boolean setOrdering(Class<T> category,
@@ -619,9 +619,9 @@ public class ServiceRegistry {
      * @return {@code true} if a previously set ordering was
      * disestablished.
      *
-     * @exception IllegalArgumentException if either provider is
+     * @throws IllegalArgumentException if either provider is
      * {@code null} or they are the same object.
-     * @exception IllegalArgumentException if there is no category
+     * @throws IllegalArgumentException if there is no category
      * corresponding to {@code category}.
      */
     public <T> boolean unsetOrdering(Class<T> category,
@@ -650,7 +650,7 @@ public class ServiceRegistry {
      *
      * @param category the category to be emptied.
      *
-     * @exception IllegalArgumentException if there is no category
+     * @throws IllegalArgumentException if there is no category
      * corresponding to {@code category}.
      */
     public void deregisterAll(Class<?> category) {
@@ -677,7 +677,7 @@ public class ServiceRegistry {
      * currently registered service providers.  This method should not
      * be called from application code.
      *
-     * @exception Throwable if an error occurs during superclass
+     * @throws Throwable if an error occurs during superclass
      * finalization.
      *
      * @deprecated Finalization has been deprecated for removal.  See
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
index 6bf14838b7f..d5c1ff18e5a 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
@@ -83,9 +83,9 @@ public class FileCacheImageInputStream extends ImageInputStreamImpl {
      * cache file should be created, or {@code null} to use the
      * system directory.
      *
-     * @exception IllegalArgumentException if {@code stream} is
+     * @throws IllegalArgumentException if {@code stream} is
      * {@code null}.
-     * @exception IllegalArgumentException if {@code cacheDir} is
+     * @throws IllegalArgumentException if {@code cacheDir} is
      * non-{@code null} but is not a directory.
      * @throws IOException if a cache file cannot be created.
      */
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
index 5a2a54abcaa..904515b6f82 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
@@ -69,11 +69,11 @@ public class FileCacheImageOutputStream extends ImageOutputStreamImpl {
      * cache file should be created, or {@code null} to use the
      * system directory.
      *
-     * @exception IllegalArgumentException if {@code stream}
+     * @throws IllegalArgumentException if {@code stream}
      * is {@code null}.
-     * @exception IllegalArgumentException if {@code cacheDir} is
+     * @throws IllegalArgumentException if {@code cacheDir} is
      * non-{@code null} but is not a directory.
-     * @exception IOException if a cache file cannot be created.
+     * @throws IOException if a cache file cannot be created.
      */
     public FileCacheImageOutputStream(OutputStream stream, File cacheDir)
         throws IOException {
@@ -159,9 +159,9 @@ public class FileCacheImageOutputStream extends ImageOutputStreamImpl {
      * performed.  The file length will not be increased until a write
      * is performed.
      *
-     * @exception IndexOutOfBoundsException if {@code pos} is smaller
+     * @throws IndexOutOfBoundsException if {@code pos} is smaller
      * than the flushed position.
-     * @exception IOException if any other I/O error occurs.
+     * @throws IOException if any other I/O error occurs.
      */
     public void seek(long pos) throws IOException {
         checkClosed();
@@ -223,7 +223,7 @@ public class FileCacheImageOutputStream extends ImageOutputStreamImpl {
      * is closed and removed.  The destination {@code OutputStream}
      * is not closed.
      *
-     * @exception IOException if an error occurs.
+     * @throws IOException if an error occurs.
      */
     public void close() throws IOException {
         maxStreamPos = cache.length();
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java
index b1cce6fae4c..ef127ddfa2e 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/FileImageInputStream.java
@@ -60,13 +60,13 @@ public class FileImageInputStream extends ImageInputStreamImpl {
      *
      * @param f a {@code File} to read from.
      *
-     * @exception IllegalArgumentException if {@code f} is
+     * @throws IllegalArgumentException if {@code f} is
      * {@code null}.
-     * @exception SecurityException if a security manager exists
+     * @throws SecurityException if a security manager exists
      * and does not allow read access to the file.
-     * @exception FileNotFoundException if {@code f} is a
+     * @throws FileNotFoundException if {@code f} is a
      * directory or cannot be opened for reading for any other reason.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     public FileImageInputStream(File f)
         throws FileNotFoundException, IOException {
@@ -83,7 +83,7 @@ public class FileImageInputStream extends ImageInputStreamImpl {
      *
      * @param raf a {@code RandomAccessFile} to read from.
      *
-     * @exception IllegalArgumentException if {@code raf} is
+     * @throws IllegalArgumentException if {@code raf} is
      * {@code null}.
      */
     public FileImageInputStream(RandomAccessFile raf) {
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java
index 715b43f40fb..96d84ef652f 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/FileImageOutputStream.java
@@ -55,14 +55,14 @@ public class FileImageOutputStream extends ImageOutputStreamImpl {
      *
      * @param f a {@code File} to write to.
      *
-     * @exception IllegalArgumentException if {@code f} is
+     * @throws IllegalArgumentException if {@code f} is
      * {@code null}.
-     * @exception SecurityException if a security manager exists
+     * @throws SecurityException if a security manager exists
      * and does not allow write access to the file.
-     * @exception FileNotFoundException if {@code f} does not denote
+     * @throws FileNotFoundException if {@code f} does not denote
      * a regular file or it cannot be opened for reading and writing for any
      * other reason.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     public FileImageOutputStream(File f)
         throws FileNotFoundException, IOException {
@@ -75,7 +75,7 @@ public class FileImageOutputStream extends ImageOutputStreamImpl {
      *
      * @param raf a {@code RandomAccessFile} to write to.
      *
-     * @exception IllegalArgumentException if {@code raf} is
+     * @throws IllegalArgumentException if {@code raf} is
      * {@code null}.
      */
     public FileImageOutputStream(RandomAccessFile raf) {
@@ -141,9 +141,9 @@ public class FileImageOutputStream extends ImageOutputStreamImpl {
      * performed.  The file length will not be increased until a write
      * is performed.
      *
-     * @exception IndexOutOfBoundsException if {@code pos} is smaller
+     * @throws IndexOutOfBoundsException if {@code pos} is smaller
      * than the flushed position.
-     * @exception IOException if any other I/O error occurs.
+     * @throws IOException if any other I/O error occurs.
      */
     public void seek(long pos) throws IOException {
         checkClosed();
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java
index d8999d4a884..11251ac5938 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java
@@ -100,7 +100,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @return a byte value from the stream, as an int, or -1 to
      * indicate EOF.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     int read() throws IOException;
 
@@ -118,10 +118,10 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @return the number of bytes actually read, or {@code -1}
      * to indicate EOF.
      *
-     * @exception NullPointerException if {@code b} is
+     * @throws NullPointerException if {@code b} is
      * {@code null}.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     int read(byte[] b) throws IOException;
 
@@ -142,12 +142,12 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @return the number of bytes actually read, or {@code -1}
      * to indicate EOF.
      *
-     * @exception NullPointerException if {@code b} is
+     * @throws NullPointerException if {@code b} is
      * {@code null}.
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code b.length}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     int read(byte[] b, int off, int len) throws IOException;
 
@@ -164,12 +164,12 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param buf an IIOByteBuffer object to be modified.
      * @param len the maximum number of {@code byte}s to read.
      *
-     * @exception IndexOutOfBoundsException if {@code len} is
+     * @throws IndexOutOfBoundsException if {@code len} is
      * negative.
-     * @exception NullPointerException if {@code buf} is
+     * @throws NullPointerException if {@code buf} is
      * {@code null}.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readBytes(IIOByteBuffer buf, int len) throws IOException;
 
@@ -183,8 +183,8 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a boolean value from the stream.
      *
-     * @exception java.io.EOFException if the end of the stream is reached.
-     * @exception IOException if an I/O error occurs.
+     * @throws java.io.EOFException if the end of the stream is reached.
+     * @throws IOException if an I/O error occurs.
      */
     boolean readBoolean() throws IOException;
 
@@ -201,8 +201,8 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a signed byte value from the stream.
      *
-     * @exception java.io.EOFException if the end of the stream is reached.
-     * @exception IOException if an I/O error occurs.
+     * @throws java.io.EOFException if the end of the stream is reached.
+     * @throws IOException if an I/O error occurs.
      */
     byte readByte() throws IOException;
 
@@ -225,8 +225,8 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return an unsigned byte value from the stream.
      *
-     * @exception java.io.EOFException if the end of the stream is reached.
-     * @exception IOException if an I/O error occurs.
+     * @throws java.io.EOFException if the end of the stream is reached.
+     * @throws IOException if an I/O error occurs.
      */
     int readUnsignedByte() throws IOException;
 
@@ -240,9 +240,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a signed short value from the stream.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #getByteOrder
      */
@@ -261,9 +261,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return an unsigned short value from the stream, as an int.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #getByteOrder
      */
@@ -278,9 +278,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return an unsigned char value from the stream.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #readUnsignedShort
      */
@@ -296,9 +296,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a signed int value from the stream.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #getByteOrder
      */
@@ -316,9 +316,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return an unsigned int value from the stream, as a long.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #getByteOrder
      */
@@ -334,9 +334,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a signed long value from the stream.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #getByteOrder
      */
@@ -352,9 +352,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a float value from the stream.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #getByteOrder
      */
@@ -370,9 +370,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a double value from the stream.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #getByteOrder
      */
@@ -408,7 +408,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a String containing a line of text from the stream.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     String readLine() throws IOException;
 
@@ -488,11 +488,11 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a String read from the stream.
      *
-     * @exception  java.io.EOFException  if this stream reaches the end
+     * @throws  java.io.EOFException  if this stream reaches the end
      * before reading all the bytes.
-     * @exception  java.io.UTFDataFormatException if the bytes do not represent
+     * @throws  java.io.UTFDataFormatException if the bytes do not represent
      * a valid modified UTF-8 encoding of a string.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     String readUTF() throws IOException;
 
@@ -509,14 +509,14 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param off the starting position within {@code b} to write to.
      * @param len the maximum number of {@code byte}s to read.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code b.length}.
-     * @exception NullPointerException if {@code b} is
+     * @throws NullPointerException if {@code b} is
      * {@code null}.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readFully(byte[] b, int off, int len) throws IOException;
 
@@ -531,11 +531,11 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @param b an array of {@code byte}s.
      *
-     * @exception NullPointerException if {@code b} is
+     * @throws NullPointerException if {@code b} is
      * {@code null}.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readFully(byte[] b) throws IOException;
 
@@ -553,14 +553,14 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param off the starting position within {@code s} to write to.
      * @param len the maximum number of {@code short}s to read.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code s.length}.
-     * @exception NullPointerException if {@code s} is
+     * @throws NullPointerException if {@code s} is
      * {@code null}.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readFully(short[] s, int off, int len) throws IOException;
 
@@ -578,14 +578,14 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param off the starting position within {@code c} to write to.
      * @param len the maximum number of {@code char}s to read.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code c.length}.
-     * @exception NullPointerException if {@code c} is
+     * @throws NullPointerException if {@code c} is
      * {@code null}.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readFully(char[] c, int off, int len) throws IOException;
 
@@ -603,14 +603,14 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param off the starting position within {@code i} to write to.
      * @param len the maximum number of {@code int}s to read.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code i.length}.
-     * @exception NullPointerException if {@code i} is
+     * @throws NullPointerException if {@code i} is
      * {@code null}.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readFully(int[] i, int off, int len) throws IOException;
 
@@ -628,14 +628,14 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param off the starting position within {@code l} to write to.
      * @param len the maximum number of {@code long}s to read.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code l.length}.
-     * @exception NullPointerException if {@code l} is
+     * @throws NullPointerException if {@code l} is
      * {@code null}.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readFully(long[] l, int off, int len) throws IOException;
 
@@ -653,14 +653,14 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param off the starting position within {@code f} to write to.
      * @param len the maximum number of {@code float}s to read.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code f.length}.
-     * @exception NullPointerException if {@code f} is
+     * @throws NullPointerException if {@code f} is
      * {@code null}.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readFully(float[] f, int off, int len) throws IOException;
 
@@ -678,14 +678,14 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param off the starting position within {@code d} to write to.
      * @param len the maximum number of {@code double}s to read.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code d.length}.
-     * @exception NullPointerException if {@code d} is
+     * @throws NullPointerException if {@code d} is
      * {@code null}.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void readFully(double[] d, int off, int len) throws IOException;
 
@@ -695,7 +695,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return a long containing the position of the stream.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     long getStreamPosition() throws IOException;
 
@@ -714,7 +714,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @return an {@code int} containing the bit offset between
      * 0 and 7, inclusive.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #setBitOffset
      */
@@ -731,9 +731,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param bitOffset the desired offset, as an {@code int}
      * between 0 and 7, inclusive.
      *
-     * @exception IllegalArgumentException if {@code bitOffset}
+     * @throws IllegalArgumentException if {@code bitOffset}
      * is not between 0 and 7, inclusive.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #getBitOffset
      */
@@ -748,9 +748,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @return an {@code int} containing the value {@code 0}
      * or {@code 1}.
      *
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bits.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     int readBit() throws IOException;
 
@@ -788,11 +788,11 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @return the bitstring, as a {@code long} with the last bit
      * read stored in the least significant bit.
      *
-     * @exception IllegalArgumentException if {@code numBits}
+     * @throws IllegalArgumentException if {@code numBits}
      * is not between 0 and 64, inclusive.
-     * @exception java.io.EOFException if the stream reaches the end before
+     * @throws java.io.EOFException if the stream reaches the end before
      * reading all the bits.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     long readBits(int numBits) throws IOException;
 
@@ -803,7 +803,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @return a {@code long} containing the length of the
      * stream, if known, or else {@code -1}.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     long length() throws IOException;
 
@@ -820,7 +820,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      *
      * @return an {@code int} representing the number of bytes skipped.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     int skipBytes(int n) throws IOException;
 
@@ -835,7 +835,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @return a {@code long} representing the number of bytes
      * skipped.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     long skipBytes(long n) throws IOException;
 
@@ -855,9 +855,9 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param pos a {@code long} containing the desired file
      * pointer position.
      *
-     * @exception IndexOutOfBoundsException if {@code pos} is smaller
+     * @throws IndexOutOfBoundsException if {@code pos} is smaller
      * than the flushed position.
-     * @exception IOException if any other I/O error occurs.
+     * @throws IOException if any other I/O error occurs.
      */
     void seek(long pos) throws IOException;
 
@@ -897,7 +897,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      * <p> An {@code IOException} will be thrown if the previous
      * marked position lies in the discarded portion of the stream.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void reset() throws IOException;
 
@@ -915,10 +915,10 @@ public interface ImageInputStream extends DataInput, Closeable {
      * @param pos a {@code long} containing the length of the
      * stream prefix that may be flushed.
      *
-     * @exception IndexOutOfBoundsException if {@code pos} lies
+     * @throws IndexOutOfBoundsException if {@code pos} lies
      * in the flushed portion of the stream or past the current stream
      * position.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void flushBefore(long pos) throws IOException;
 
@@ -927,7 +927,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      * stream position.  Equivalent to
      * {@code flushBefore(getStreamPosition())}.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void flush() throws IOException;
 
@@ -993,7 +993,7 @@ public interface ImageInputStream extends DataInput, Closeable {
      * this interface to release resources associated with the stream
      * such as memory, disk space, or file descriptors.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void close() throws IOException;
 }
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
index 053bbf74918..f9bb1235660 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
@@ -103,7 +103,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
      * Subclasses may call this method from any of their methods that
      * require the stream not to be closed.
      *
-     * @exception IOException if the stream is closed.
+     * @throws IOException if the stream is closed.
      */
     protected final void checkClosed() throws IOException {
         if (isClosed) {
@@ -134,7 +134,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
      * @return the value of the next byte in the stream, or {@code -1}
      * if EOF is reached.
      *
-     * @exception IOException if the stream has been closed.
+     * @throws IOException if the stream has been closed.
      */
     public abstract int read() throws IOException;
 
@@ -147,9 +147,9 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
      * @return the number of bytes actually read, or {@code -1}
      * to indicate EOF.
      *
-     * @exception NullPointerException if {@code b} is
+     * @throws NullPointerException if {@code b} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     public int read(byte[] b) throws IOException {
         return read(b, 0, b.length);
@@ -175,12 +175,12 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
      * @return the number of bytes actually read, or {@code -1}
      * to indicate EOF.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code b.length}.
-     * @exception NullPointerException if {@code b} is
+     * @throws NullPointerException if {@code b} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     public abstract int read(byte[] b, int off, int len) throws IOException;
 
@@ -729,7 +729,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
      * @return an {@code int} representing the number of bytes
      * skipped.
      *
-     * @exception IOException if {@code getStreamPosition}
+     * @throws IOException if {@code getStreamPosition}
      * throws an {@code IOException} when computing either
      * the starting or ending position.
      */
@@ -750,7 +750,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
      * @return a {@code long} representing the number of bytes
      * skipped.
      *
-     * @exception IOException if {@code getStreamPosition}
+     * @throws IOException if {@code getStreamPosition}
      * throws an {@code IOException} when computing either
      * the starting or ending position.
      */
@@ -791,7 +791,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
      * <p> An {@code IOException} will be thrown if the previous
      * marked position lies in the discarded portion of the stream.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     public void reset() throws IOException {
         if (markByteStack.empty()) {
@@ -865,7 +865,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
      * source.  This method should not be called from application
      * code.
      *
-     * @exception Throwable if an error occurs during superclass
+     * @throws Throwable if an error occurs during superclass
      * finalization.
      *
      * @deprecated Finalization has been deprecated for removal.  See
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java
index 5c261754c91..e88fb00e9cf 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java
@@ -66,7 +66,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param b an {@code int} whose lower 8 bits are to be
      * written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void write(int b) throws IOException;
 
@@ -83,9 +83,9 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      *
      * @param b an array of {@code byte}s to be written.
      *
-     * @exception NullPointerException if {@code b} is
+     * @throws NullPointerException if {@code b} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void write(byte[] b) throws IOException;
 
@@ -107,12 +107,12 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param off the start offset in the data.
      * @param len the number of {@code byte}s to write.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code b.length}.
-     * @exception NullPointerException if {@code b} is
+     * @throws NullPointerException if {@code b} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void write(byte[] b, int off, int len) throws IOException;
 
@@ -129,7 +129,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      *
      * @param v the {@code boolean} to be written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeBoolean(boolean v) throws IOException;
 
@@ -147,7 +147,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param v an {@code int} containing the byte value to be
      * written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeByte(int v) throws IOException;
 
@@ -177,7 +177,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param v an {@code int} containing the short value to be
      * written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeShort(int v) throws IOException;
 
@@ -187,7 +187,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param v an {@code int} containing the char (unsigned
      * short) value to be written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      *
      * @see #writeShort(int)
      */
@@ -222,7 +222,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param v an {@code int} containing the value to be
      * written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeInt(int v) throws IOException;
 
@@ -263,7 +263,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param v a {@code long} containing the value to be
      * written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeLong(long v) throws IOException;
 
@@ -283,7 +283,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param v a {@code float} containing the value to be
      * written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeFloat(float v) throws IOException;
 
@@ -304,7 +304,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param v a {@code double} containing the value to be
      * written.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeDouble(double v) throws IOException;
 
@@ -330,9 +330,9 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param s a {@code String} containing the value to be
      * written.
      *
-     * @exception NullPointerException if {@code s} is
+     * @throws NullPointerException if {@code s} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeBytes(String s) throws IOException;
 
@@ -358,9 +358,9 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param s a {@code String} containing the value to be
      * written.
      *
-     * @exception NullPointerException if {@code s} is
+     * @throws NullPointerException if {@code s} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeChars(String s) throws IOException;
 
@@ -427,11 +427,11 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param s a {@code String} containing the value to be
      * written.
      *
-     * @exception NullPointerException if {@code s} is
+     * @throws NullPointerException if {@code s} is
      * {@code null}.
-     * @exception java.io.UTFDataFormatException if the modified UTF-8
+     * @throws java.io.UTFDataFormatException if the modified UTF-8
      * representation of {@code s} requires more than 65536 bytes.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeUTF(String s) throws IOException;
 
@@ -452,12 +452,12 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param off the start offset in the data.
      * @param len the number of {@code short}s to write.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code s.length}.
-     * @exception NullPointerException if {@code s} is
+     * @throws NullPointerException if {@code s} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeShorts(short[] s, int off, int len) throws IOException;
 
@@ -478,12 +478,12 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param off the start offset in the data.
      * @param len the number of {@code char}s to write.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code c.length}.
-     * @exception NullPointerException if {@code c} is
+     * @throws NullPointerException if {@code c} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeChars(char[] c, int off, int len) throws IOException;
 
@@ -504,12 +504,12 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param off the start offset in the data.
      * @param len the number of {@code int}s to write.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code i.length}.
-     * @exception NullPointerException if {@code i} is
+     * @throws NullPointerException if {@code i} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeInts(int[] i, int off, int len) throws IOException;
 
@@ -530,12 +530,12 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param off the start offset in the data.
      * @param len the number of {@code long}s to write.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code l.length}.
-     * @exception NullPointerException if {@code l} is
+     * @throws NullPointerException if {@code l} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeLongs(long[] l, int off, int len) throws IOException;
 
@@ -556,12 +556,12 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param off the start offset in the data.
      * @param len the number of {@code float}s to write.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code f.length}.
-     * @exception NullPointerException if {@code f} is
+     * @throws NullPointerException if {@code f} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeFloats(float[] f, int off, int len) throws IOException;
 
@@ -582,12 +582,12 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param off the start offset in the data.
      * @param len the number of {@code double}s to write.
      *
-     * @exception IndexOutOfBoundsException if {@code off} is
+     * @throws IndexOutOfBoundsException if {@code off} is
      * negative, {@code len} is negative, or {@code off + len}
      * is greater than {@code d.length}.
-     * @exception NullPointerException if {@code d} is
+     * @throws NullPointerException if {@code d} is
      * {@code null}.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeDoubles(double[] d, int off, int len) throws IOException;
 
@@ -606,7 +606,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param bit an {@code int} whose least significant bit
      * is to be written to the stream.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeBit(int bit) throws IOException;
 
@@ -637,9 +637,9 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      *
      * @param numBits an {@code int} between 0 and 64, inclusive.
      *
-     * @exception IllegalArgumentException if {@code numBits} is
+     * @throws IllegalArgumentException if {@code numBits} is
      * not between 0 and 64, inclusive.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void writeBits(long bits, int numBits) throws IOException;
 
@@ -653,10 +653,10 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput {
      * @param pos a {@code long} containing the length of the
      * stream prefix that may be flushed to the destination.
      *
-     * @exception IndexOutOfBoundsException if {@code pos} lies
+     * @throws IndexOutOfBoundsException if {@code pos} lies
      * in the flushed portion of the stream or past the current stream
      * position.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     void flushBefore(long pos) throws IOException;
 }
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java
index 29e55a9a745..0bee5c7a240 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java
@@ -484,7 +484,7 @@ public abstract class ImageOutputStreamImpl
      * beginning of the {@code write(int)} and
      * {@code write(byte[], int, int)} methods.
      *
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     protected final void flushBits() throws IOException {
         checkClosed();
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java
index 2b0fdd98d60..260a0242546 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCache.java
@@ -141,7 +141,7 @@ class MemoryCache {
      * not dispose of any blocks containing bytes written.  To dispose
      * blocks, use {@link #disposeBefore disposeBefore()}.
      *
-     * @exception IndexOutOfBoundsException if any portion of
+     * @throws IndexOutOfBoundsException if any portion of
      * the requested data is not in the cache (including if {@code pos}
      * is in a block already disposed), or if either {@code pos} or
      * {@code len} is < 0.
@@ -207,8 +207,8 @@ class MemoryCache {
      * @param len the number of bytes to be written.
      * @param pos the cache position at which to begin writing.
      *
-     * @exception NullPointerException if {@code b} is {@code null}.
-     * @exception IndexOutOfBoundsException if {@code off},
+     * @throws NullPointerException if {@code b} is {@code null}.
+     * @throws IndexOutOfBoundsException if {@code off},
      * {@code len}, or {@code pos} are negative,
      * or if {@code off+len > b.length}.
      * @throws IOException if there is an I/O error while writing to the cache
@@ -254,7 +254,7 @@ class MemoryCache {
      * will be written.
      * @param pos the cache position at which to begin writing.
      *
-     * @exception IndexOutOfBoundsException if {@code pos} is negative.
+     * @throws IndexOutOfBoundsException if {@code pos} is negative.
      * @throws IOException if there is an I/O error while writing to the cache
      */
     public void write(int b, long pos) throws IOException {
@@ -309,8 +309,8 @@ class MemoryCache {
      * at cache position {@code pos}, into the array
      * {@code b} at offset {@code off}.
      *
-     * @exception NullPointerException if b is {@code null}
-     * @exception IndexOutOfBoundsException if {@code off},
+     * @throws NullPointerException if b is {@code null}
+     * @throws IndexOutOfBoundsException if {@code off},
      * {@code len} or {@code pos} are negative or if
      * {@code off + len > b.length} or if any portion of the
      * requested data is not in the cache (including if
@@ -349,7 +349,7 @@ class MemoryCache {
      * Free the blocks up to the position {@code pos}.
      * The byte at {@code pos} remains available.
      *
-     * @exception IndexOutOfBoundsException if {@code pos}
+     * @throws IndexOutOfBoundsException if {@code pos}
      * is in a block that has already been disposed.
      */
     public void disposeBefore(long pos) {
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
index 44b9d8cd5fb..ecb30ddba52 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
@@ -61,7 +61,7 @@ public class MemoryCacheImageInputStream extends ImageInputStreamImpl {
      *
      * @param stream an {@code InputStream} to read from.
      *
-     * @exception IllegalArgumentException if {@code stream} is
+     * @throws IllegalArgumentException if {@code stream} is
      * {@code null}.
      */
     public MemoryCacheImageInputStream(InputStream stream) {
diff --git a/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java
index b90b7f33eac..676e3c829e3 100644
--- a/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java
+++ b/src/java.desktop/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java
@@ -51,7 +51,7 @@ public class MemoryCacheImageOutputStream extends ImageOutputStreamImpl {
      *
      * @param stream an {@code OutputStream} to write to.
      *
-     * @exception IllegalArgumentException if {@code stream} is
+     * @throws IllegalArgumentException if {@code stream} is
      * {@code null}.
      */
     public MemoryCacheImageOutputStream(OutputStream stream) {
diff --git a/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java
index 882881f13b9..0afae4060c0 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java
@@ -634,7 +634,7 @@ public class ByteBandedRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public WritableRaster createWritableChild (int x, int y,
@@ -689,7 +689,7 @@ public class ByteBandedRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild (int x, int y,
diff --git a/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
index 6a92748330c..3ec93b741e7 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java
@@ -759,7 +759,7 @@ public class ByteComponentRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild(int x, int y,
@@ -788,7 +788,7 @@ public class ByteComponentRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent Raster.
      */
     public WritableRaster createWritableChild(int x, int y,
diff --git a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
index 796f0835972..f0dedd9775a 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java
@@ -1195,7 +1195,7 @@ public class ByteInterleavedRaster extends ByteComponentRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild(int x, int y,
@@ -1224,7 +1224,7 @@ public class ByteInterleavedRaster extends ByteComponentRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent Raster.
      */
     public WritableRaster createWritableChild(int x, int y,
diff --git a/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java b/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
index d721eee5739..cadc390e6e9 100644
--- a/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java
@@ -143,7 +143,7 @@ public class BytePackedRaster extends SunWritableRaster {
      * @param origin          The Point that specifies the origin.
      * @param parent          The parent (if any) of this raster.
      *
-     * @exception RasterFormatException if the parameters do not conform
+     * @throws RasterFormatException if the parameters do not conform
      * to requirements of this Raster type.
      */
     public BytePackedRaster(SampleModel sampleModel,
@@ -1258,7 +1258,7 @@ public class BytePackedRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild(int x, int y,
@@ -1286,7 +1286,7 @@ public class BytePackedRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent Raster.
      */
     public WritableRaster createWritableChild(int x, int y,
diff --git a/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
index 3b110e77eca..e918a285aaa 100644
--- a/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java
@@ -535,7 +535,7 @@ public class IntegerComponentRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public WritableRaster createWritableChild (int x, int y,
@@ -589,7 +589,7 @@ public class IntegerComponentRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subRaster.
      * @param y0              Translated Y origin of the subRaster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild (int x, int y,
diff --git a/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
index cb84024ae22..b00b0301130 100644
--- a/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java
@@ -447,7 +447,7 @@ public class IntegerInterleavedRaster extends IntegerComponentRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public WritableRaster createWritableChild (int x, int y,
@@ -501,7 +501,7 @@ public class IntegerInterleavedRaster extends IntegerComponentRaster {
      * @param x0              Translated X origin of the subRaster.
      * @param y0              Translated Y origin of the subRaster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild (int x, int y,
diff --git a/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java
index d8403926567..17d24e27686 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java
@@ -633,7 +633,7 @@ public class ShortBandedRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent Raster.
      */
     public WritableRaster createWritableChild(int x, int y,
@@ -689,7 +689,7 @@ public class ShortBandedRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild (int x, int y,
diff --git a/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
index 3e95f652d33..b24b664826f 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java
@@ -693,7 +693,7 @@ public class ShortComponentRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild (int x, int y,
@@ -722,7 +722,7 @@ public class ShortComponentRaster extends SunWritableRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent Raster.
      */
     public WritableRaster createWritableChild(int x, int y,
diff --git a/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java b/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
index d4926bb295e..327adf9ac98 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java
@@ -666,7 +666,7 @@ public class ShortInterleavedRaster extends ShortComponentRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent raster.
      */
     public Raster createChild (int x, int y,
@@ -695,7 +695,7 @@ public class ShortInterleavedRaster extends ShortComponentRaster {
      * @param x0              Translated X origin of the subraster.
      * @param y0              Translated Y origin of the subraster.
      * @param bandList        Array of band indices.
-     * @exception RasterFormatException
+     * @throws RasterFormatException
      *            if the specified bounding box is outside of the parent Raster.
      */
     public WritableRaster createWritableChild(int x, int y,
-- 
GitLab


From a35afe84c3032cb10720bcd16498e2969cea0b86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Thu, 24 Mar 2022 07:53:14 +0000
Subject: [PATCH 193/345] 8283519: Hsdis with capstone should annotate output

Reviewed-by: jvernee
---
 src/utils/hsdis/capstone/hsdis-capstone.c | 43 ++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/utils/hsdis/capstone/hsdis-capstone.c b/src/utils/hsdis/capstone/hsdis-capstone.c
index d71330ee6a7..075b4c67b14 100644
--- a/src/utils/hsdis/capstone/hsdis-capstone.c
+++ b/src/utils/hsdis/capstone/hsdis-capstone.c
@@ -61,6 +61,26 @@ typedef decode_instructions_printf_callback_ftype printf_callback_t;
 
 #define print(...) (*printf_callback) (printf_stream, __VA_ARGS__)
 
+static void* null_event_callback(void* ignore_stream, const char* ignore_event, void* arg) {
+  return NULL;
+}
+
+/* print all events as XML markup */
+static void* xml_event_callback(void* stream, const char* event, void* arg) {
+  FILE* fp = (FILE*) stream;
+#define NS_PFX "dis:"
+  if (event[0] != '/') {
+    /* issue the tag, with or without a formatted argument */
+    fprintf(fp, "<"NS_PFX);
+    fprintf(fp, event, arg);
+    fprintf(fp, ">");
+  } else {
+    ++event;                    /* skip slash */
+    fprintf(fp, "</"NS_PFX"%s>", event);
+  }
+  return NULL;
+}
+
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
@@ -74,6 +94,21 @@ void* decode_instructions_virtual(uintptr_t start_va, uintptr_t end_va,
                                   int newline /* bool value for nice new line */) {
   csh cs_handle;
 
+  if (printf_callback == NULL) {
+    int (*fprintf_callback)(FILE*, const char*, ...) = &fprintf;
+    FILE* fprintf_stream = stdout;
+    printf_callback = (printf_callback_t) fprintf_callback;
+    if (printf_stream == NULL)
+      printf_stream   = (void*)           fprintf_stream;
+  }
+  if (event_callback == NULL) {
+    if (event_stream == NULL)
+      event_callback = &null_event_callback;
+    else
+      event_callback = &xml_event_callback;
+  }
+
+
   if (cs_open(CAPSTONE_ARCH, CAPSTONE_MODE, &cs_handle) != CS_ERR_OK) {
     print("Could not open cs_handle");
     return NULL;
@@ -86,7 +121,13 @@ void* decode_instructions_virtual(uintptr_t start_va, uintptr_t end_va,
   size_t count = cs_disasm(cs_handle, buffer, length, (uintptr_t) buffer, 0 , &insn);
   if (count) {
     for (unsigned int j = 0; j < count; j++) {
-      print("  0x%" PRIx64 ":\t%s\t\t%s\n", insn[j].address, insn[j].mnemonic, insn[j].op_str);
+      (*event_callback)(event_stream, "insn", (void*) insn[j].address);
+      print("%s\t\t%s", insn[j].mnemonic, insn[j].op_str);
+      (*event_callback)(event_stream, "/insn", (void*) (insn[j].address + insn[j].size));
+      if (newline) {
+        /* follow each complete insn by a nice newline */
+        print("\n");
+      }
     }
     cs_free(insn, count);
   }
-- 
GitLab


From b05d4ccf8e54635c16bc2c26aa7a8fcc2e3b3dde Mon Sep 17 00:00:00 2001
From: Yoshiki Sato <ysatowse@openjdk.org>
Date: Thu, 24 Mar 2022 09:13:25 +0000
Subject: [PATCH 194/345] 8283350: (tz) Update Timezone Data to 2022a

Reviewed-by: coffeys
---
 src/java.base/share/data/tzdata/VERSION      |  2 +-
 src/java.base/share/data/tzdata/africa       |  4 ++
 src/java.base/share/data/tzdata/asia         | 13 +++--
 src/java.base/share/data/tzdata/europe       | 56 +++++++++++++++++---
 src/java.base/share/data/tzdata/leapseconds  |  8 +--
 src/java.base/share/data/tzdata/southamerica | 47 ++++++++++++----
 6 files changed, 103 insertions(+), 27 deletions(-)

diff --git a/src/java.base/share/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION
index 3a40c910333..bc830a3a5ef 100644
--- a/src/java.base/share/data/tzdata/VERSION
+++ b/src/java.base/share/data/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2021e
+tzdata2022a
diff --git a/src/java.base/share/data/tzdata/africa b/src/java.base/share/data/tzdata/africa
index 0f367713ea9..5466bbcc87b 100644
--- a/src/java.base/share/data/tzdata/africa
+++ b/src/java.base/share/data/tzdata/africa
@@ -941,6 +941,10 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 #         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
 #         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
 #     (setq islamic-year (+ 1 islamic-year))))
+#
+# From Milamber (2021-03-31, 2022-03-10), confirming these predictions:
+# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076
+# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/
 
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	-
diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia
index cfe48745e24..4aaaf146b0f 100644
--- a/src/java.base/share/data/tzdata/asia
+++ b/src/java.base/share/data/tzdata/asia
@@ -3429,8 +3429,12 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # ... winter time will begin in Palestine from Friday 10-29, 01:00 AM
 # by 60 minutes backwards.
 #
-# From Paul Eggert (2021-10-20):
-# Guess future fall transitions on October's last Friday at 01:00.
+# From Tim Parenti (2021-10-25), per Paul Eggert (2021-10-24):
+# Guess future fall transitions at 01:00 on the Friday preceding October's
+# last Sunday (i.e., Fri>=23), as this is more consistent with recent practice.
+
+# From Heba Hamad (2022-03-10):
+# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
 
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
@@ -3466,9 +3470,10 @@ Rule Palestine	2016	2018	-	Mar	Sat>=24	1:00	1:00	S
 Rule Palestine	2016	2018	-	Oct	Sat>=24	1:00	0	-
 Rule Palestine	2019	only	-	Mar	29	0:00	1:00	S
 Rule Palestine	2019	only	-	Oct	Sat>=24	0:00	0	-
-Rule Palestine	2020	max	-	Mar	Sat>=24	0:00	1:00	S
+Rule Palestine	2020	2021	-	Mar	Sat>=24	0:00	1:00	S
 Rule Palestine	2020	only	-	Oct	24	1:00	0	-
-Rule Palestine	2021	max	-	Oct	lastFri	1:00	0	-
+Rule Palestine	2021	max	-	Oct	Fri>=23	1:00	0	-
+Rule Palestine	2022	max	-	Mar	Sun>=25	0:00	1:00	S
 
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
diff --git a/src/java.base/share/data/tzdata/europe b/src/java.base/share/data/tzdata/europe
index 9b0b64aa3eb..bc57e94e44f 100644
--- a/src/java.base/share/data/tzdata/europe
+++ b/src/java.base/share/data/tzdata/europe
@@ -2808,8 +2808,26 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 # says he remembers that Samara opted out of the 1992-01-19 exception
 # 2 days before the switch.
 #
-#
-# From Paul Eggert (2016-03-18):
+# From Alois Treindl (2022-02-15):
+# the Russian wikipedia page
+# https://ru.wikipedia.org/wiki/Московское_время#Перемещение_границы_применения_московского_времени_на_восток
+# contains the sentence (in Google translation) "In the autumn of
+# 1981, Arkhangelsk, Vologda, Yaroslavl, Ivanovo, Vladimir, Ryazan,
+# Lipetsk, Voronezh, Rostov-on-Don, Krasnodar and regions to the east
+# of those named (about 30 in total) parted ways with Moscow time.
+# However, the convenience of common time with Moscow turned out to be
+# decisive - in 1982, these regions again switched to Moscow time."
+# Shanks International atlas has similar information, and also the
+# Russian book Zaitsev A., Kutalev D. A new astrologer's reference
+# book. Coordinates of cities and time corrections, - The World of
+# Urania, 2012 (Russian: Зайцев А., Куталёв Д., Новый справочник
+# астролога. Координаты городов и временные поправки).
+# To me it seems that an extra zone is needed, which starts with LMT
+# util 1919, later follows Moscow since 1930, but deviates from it
+# between 1 October 1981 until 1 April 1982.
+#
+#
+# From Paul Eggert (2022-02-15):
 # Given the above, we appear to be missing some Zone entries for the
 # chaotic early 1980s in Russia.  It's not clear what these entries
 # should be.  For now, sweep this under the rug and just document the
@@ -2856,7 +2874,7 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 			 1:00	C-Eur	CE%sT	1944 Apr 13
 			 3:00	Russia	MSK/MSD	1990
 			 3:00	-	MSK	1990 Jul  1  2:00
-			 2:00	-	EET	1992
+			 2:00	-	EET	1992 Mar 20
 # Central Crimea used Moscow time 1994/1997.
 #
 # From Paul Eggert (2006-03-22):
@@ -2866,7 +2884,7 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 # sometime between the 1994 DST switches.  Shanks & Pottenger simply say
 # 1994-09-25 03:00, but that can't be right.  For now, guess it
 # changed in May.
-			 2:00	E-Eur	EE%sT	1994 May
+			 2:00	C-Eur	EE%sT	1994 May
 # From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
 			 3:00	E-Eur	MSK/MSD	1996 Mar 31  0:00s
 			 3:00	1:00	MSD	1996 Oct 27  3:00s
@@ -4033,6 +4051,27 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 
 # Ukraine
 #
+# From Alois Triendl (2014-03-01):
+# REGULATION A N O V A on March 20, 1992 N 139 ...  means that from
+# 1992 on, Ukraine had DST with begin time at 02:00 am, on last Sunday
+# in March, and end time 03:00 am, last Sunday in September....
+# CABINET OF MINISTERS OF UKRAINE RESOLUTION on May 13, 1996 N 509
+# "On the order of computation time on the territory of Ukraine" ....
+# As this cabinet decision is from May 1996, it seems likely that the
+# transition in March 1996, which predates it, was still at 2:00 am
+# and not at 3:00 as would have been under EU rules.
+# This is why I have set the change to EU rules into May 1996,
+# so that the change in March is stil covered by the Ukraine rule.
+# The next change in October 1996 happened under EU rules....
+# TZ database holds three other zones for Ukraine.... I have not yet
+# worked out the consequences for these three zones, as we (me and my
+# US colleague David Cochrane) are still trying to get more
+# information upon these local deviations from Kiev rules.
+#
+# From Paul Eggert (2022-02-08):
+# For now, assume that Ukraine's other three zones followed the same rules,
+# except that Crimea switched to Moscow time in 1994 as described elsewhere.
+
 # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
 # via Garrett Wollman (2003-01-27):
 # BTW, I've found the official document on this matter. It's government
@@ -4122,7 +4161,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
 			1:00	C-Eur	CE%sT	1943 Nov  6
 			3:00	Russia	MSK/MSD	1990 Jul  1  2:00
 			2:00	1:00	EEST	1991 Sep 29  3:00
-			2:00	E-Eur	EE%sT	1995
+			2:00	C-Eur	EE%sT	1996 May 13
 			2:00	EU	EE%sT
 # Transcarpathia used CET 1990/1991.
 # "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
@@ -4135,8 +4174,8 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
 			3:00	Russia	MSK/MSD	1990
 			3:00	-	MSK	1990 Jul  1  2:00
 			1:00	-	CET	1991 Mar 31  3:00
-			2:00	-	EET	1992
-			2:00	E-Eur	EE%sT	1995
+			2:00	-	EET	1992 Mar 20
+			2:00	C-Eur	EE%sT	1996 May 13
 			2:00	EU	EE%sT
 # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
 # "Zaporizhia" is the transliteration of the Ukrainian name, but
@@ -4149,7 +4188,8 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
 			3:00	-	MSK	1941 Aug 25
 			1:00	C-Eur	CE%sT	1943 Oct 25
 			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
-			2:00	E-Eur	EE%sT	1995
+			2:00	E-Eur	EE%sT	1992 Mar 20
+			2:00	C-Eur	EE%sT	1996 May 13
 			2:00	EU	EE%sT
 
 # Vatican City
diff --git a/src/java.base/share/data/tzdata/leapseconds b/src/java.base/share/data/tzdata/leapseconds
index cc514561ff1..776d25ab367 100644
--- a/src/java.base/share/data/tzdata/leapseconds
+++ b/src/java.base/share/data/tzdata/leapseconds
@@ -95,11 +95,11 @@ Leap	2016	Dec	31	23:59:60	+	S
 # Any additional leap seconds will come after this.
 # This Expires line is commented out for now,
 # so that pre-2020a zic implementations do not reject this file.
-#Expires 2022	Jun	28	00:00:00
+#Expires 2022	Dec	28	00:00:00
 
 # POSIX timestamps for the data in this file:
 #updated 1467936000 (2016-07-08 00:00:00 UTC)
-#expires 1656374400 (2022-06-28 00:00:00 UTC)
+#expires 1672185600 (2022-12-28 00:00:00 UTC)
 
-#	Updated through IERS Bulletin C62
-#	File expires on:  28 June 2022
+#	Updated through IERS Bulletin C63
+#	File expires on:  28 December 2022
diff --git a/src/java.base/share/data/tzdata/southamerica b/src/java.base/share/data/tzdata/southamerica
index 503ed65f580..b6e401ac252 100644
--- a/src/java.base/share/data/tzdata/southamerica
+++ b/src/java.base/share/data/tzdata/southamerica
@@ -1109,7 +1109,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 
 # Chile
 
-# From Paul Eggert (2015-04-03):
+# From Paul Eggert (2022-03-15):
 # Shanks & Pottenger says America/Santiago introduced standard time in
 # 1890 and rounds its UT offset to 70W40; guess that in practice this
 # was the same offset as in 1916-1919.  It also says Pacific/Easter
@@ -1132,7 +1132,7 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # Historia de la hora oficial de Chile (retrieved 2012-10-24).  See:
 # https://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
 # A fancier Spanish version (requiring mouse-clicking) is at:
-# http://www.horaoficial.cl/historia_hora.html
+# http://www.horaoficial.cl/historia_hora.php
 # Conflicts between [1] and [2] were resolved as follows:
 #
 #  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
@@ -1141,7 +1141,8 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 #  - [1] says SMT was -4:42:45, [2] says Chile's official time from
 #    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
 #    Astronomical Observatory (OAN), then located in what is now
-#    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
+#    Quinta Normal in Santiago.  Go with [1], as this matches the meridian
+#    referred to by the relevant Chilean laws to this day.
 #
 #  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
 #    Boletín No. 22, Aviso No. 129/1918 (1918-08-23).  Go with [2].
@@ -1163,6 +1164,32 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # this is known to work for DST transitions starting in 2008 and
 # may well be true for earlier transitions.
 
+# From Tim Parenti (2022-03-15):
+# For a brief period of roughly six weeks in 1946, DST was only observed on an
+# emergency basis in specific regions of central Chile; namely, "the national
+# territory between the provinces of Coquimbo and Concepción, inclusive".
+# This was enacted by Decree 3,891, dated 1946-07-13, and took effect
+# 1946-07-14 24:00, advancing these central regions to -03.
+# https://www.diariooficial.interior.gob.cl/versiones-anteriores/do-h/19460715/#page/1
+# The decree contemplated "[t]hat this advancement of the Official Time, even
+# though it has been proposed for the cities of Santiago and Valparaíso only,
+# must be agreed with that of other cities, due to the connection of various
+# activities that require it, such as, for example, the operation of rail
+# services".  It was originally set to expire after 30 days but was extended
+# through 1946-08-31 by Decree 4,506, dated 1946-08-13.
+# https://www.diariooficial.interior.gob.cl/versiones-anteriores/do-h/19460814/#page/1
+#
+# Law Number 8,522, promulgated 1946-08-27, reunified Chilean clocks at their
+# new "Summer Time" of -04, reckoned as that of "the meridian of the
+# Astronomical Observatory of Lo Espejo, advanced by 42 minutes and 45
+# seconds".
+# https://www.diariooficial.interior.gob.cl/versiones-anteriores/do-h/19460828/#page/1
+# After a brief "Winter Time" stint at -05 beginning 1947-04-01, Law Number
+# 8,777, promulgated 1947-05-17, established year-round -04 "from 23:00 on the
+# second day after it is published in the 'Diario Oficial'."  It was published
+# on Monday 1947-05-19 and so took effect from Wednesday 1947-05-21 23:00.
+# https://www.diariooficial.interior.gob.cl/versiones-anteriores/do-h/19470519/#page/1
+
 # From Eduardo Krell (1995-10-19):
 # The law says to switch to DST at midnight [24:00] on the second SATURDAY
 # of October....  The law is the same for March and October.
@@ -1321,12 +1348,12 @@ Rule	Chile	2019	max	-	Sep	Sun>=2	4:00u	1:00	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Santiago	-4:42:46 -	LMT	1890
-			-4:42:46 -	SMT	1910 Jan 10 # Santiago Mean Time
+Zone America/Santiago	-4:42:45 -	LMT	1890
+			-4:42:45 -	SMT	1910 Jan 10 # Santiago Mean Time
 			-5:00	-	-05	1916 Jul  1
-			-4:42:46 -	SMT	1918 Sep 10
+			-4:42:45 -	SMT	1918 Sep 10
 			-4:00	-	-04	1919 Jul  1
-			-4:42:46 -	SMT	1927 Sep  1
+			-4:42:45 -	SMT	1927 Sep  1
 			-5:00	Chile	-05/-04	1932 Sep  1
 			-4:00	-	-04	1942 Jun  1
 			-5:00	-	-05	1942 Aug  1
@@ -1336,11 +1363,11 @@ Zone America/Santiago	-4:42:46 -	LMT	1890
 			-5:00	-	-05	1947 May 21 23:00
 			-4:00	Chile	-04/-03
 Zone America/Punta_Arenas -4:43:40 -	LMT	1890
-			-4:42:46 -	SMT	1910 Jan 10
+			-4:42:45 -	SMT	1910 Jan 10
 			-5:00	-	-05	1916 Jul  1
-			-4:42:46 -	SMT	1918 Sep 10
+			-4:42:45 -	SMT	1918 Sep 10
 			-4:00	-	-04	1919 Jul  1
-			-4:42:46 -	SMT	1927 Sep  1
+			-4:42:45 -	SMT	1927 Sep  1
 			-5:00	Chile	-05/-04	1932 Sep  1
 			-4:00	-	-04	1942 Jun  1
 			-5:00	-	-05	1942 Aug  1
-- 
GitLab


From 5905b02c0e2643ae8d097562f181953f6c88fc89 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Thu, 24 Mar 2022 09:22:46 +0000
Subject: [PATCH 195/345] 8276799: Implementation of JEP 422: Linux/RISC-V Port

Co-authored-by: Yadong Wang <yadonn.wang@huawei.com>
Co-authored-by: Yanhong Zhu <zhuyanhong2@huawei.com>
Co-authored-by: Feilong Jiang <jiangfeilong@huawei.com>
Co-authored-by: Kun Wang <wangkun49@huawei.com>
Co-authored-by: Zhuxuan Ni <nizhuxuan@huawei.com>
Co-authored-by: Taiping Guo <guotaiping1@huawei.com>
Co-authored-by: Kang He <hekang6@huawei.com>
Co-authored-by: Aleksey Shipilev <shade@openjdk.org>
Co-authored-by: Xiaolin Zheng <yunyao.zxl@alibaba-inc.com>
Co-authored-by: Kuai Wei <kuaiwei.kw@alibaba-inc.com>
Co-authored-by: Magnus Ihse Bursie <ihse@openjdk.org>
Reviewed-by: ihse, dholmes, rriggs, kvn, shade
---
 make/autoconf/build-aux/config.guess          |    11 +-
 make/autoconf/jvm-features.m4                 |     6 +-
 make/autoconf/libraries.m4                    |     8 +-
 make/autoconf/platform.m4                     |     6 +-
 make/hotspot/gensrc/GensrcAdlc.gmk            |     9 +-
 .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp   |     6 +-
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp   |     7 +-
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp   |     6 +-
 .../cpu/riscv/abstractInterpreter_riscv.cpp   |   177 +
 src/hotspot/cpu/riscv/assembler_riscv.cpp     |   372 +
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |  3047 +++++
 .../cpu/riscv/assembler_riscv.inline.hpp      |    47 +
 src/hotspot/cpu/riscv/bytes_riscv.hpp         |   167 +
 src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp  |   353 +
 src/hotspot/cpu/riscv/c1_Defs_riscv.hpp       |    84 +
 .../cpu/riscv/c1_FpuStackSim_riscv.cpp        |    30 +
 .../cpu/riscv/c1_FpuStackSim_riscv.hpp        |    32 +
 src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp   |   388 +
 src/hotspot/cpu/riscv/c1_FrameMap_riscv.hpp   |   148 +
 .../cpu/riscv/c1_LIRAssembler_arith_riscv.cpp |   281 +
 .../cpu/riscv/c1_LIRAssembler_arith_riscv.hpp |    37 +
 .../riscv/c1_LIRAssembler_arraycopy_riscv.cpp |   388 +
 .../riscv/c1_LIRAssembler_arraycopy_riscv.hpp |    52 +
 .../cpu/riscv/c1_LIRAssembler_riscv.cpp       |  2267 ++++
 .../cpu/riscv/c1_LIRAssembler_riscv.hpp       |   132 +
 .../cpu/riscv/c1_LIRGenerator_riscv.cpp       |  1075 ++
 src/hotspot/cpu/riscv/c1_LIR_riscv.cpp        |    55 +
 src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp |    33 +
 src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp |    83 +
 .../cpu/riscv/c1_MacroAssembler_riscv.cpp     |   432 +
 .../cpu/riscv/c1_MacroAssembler_riscv.hpp     |   120 +
 src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp   |  1172 ++
 src/hotspot/cpu/riscv/c1_globals_riscv.hpp    |    65 +
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     |  1646 +++
 .../cpu/riscv/c2_MacroAssembler_riscv.hpp     |   193 +
 src/hotspot/cpu/riscv/c2_globals_riscv.hpp    |    83 +
 src/hotspot/cpu/riscv/c2_init_riscv.cpp       |    38 +
 .../riscv/c2_safepointPollStubTable_riscv.cpp |    47 +
 src/hotspot/cpu/riscv/codeBuffer_riscv.hpp    |    36 +
 src/hotspot/cpu/riscv/compiledIC_riscv.cpp    |   149 +
 src/hotspot/cpu/riscv/copy_riscv.hpp          |   136 +
 src/hotspot/cpu/riscv/disassembler_riscv.hpp  |    58 +
 .../cpu/riscv/foreign_globals_riscv.cpp       |    44 +
 .../cpu/riscv/foreign_globals_riscv.hpp       |    32 +
 src/hotspot/cpu/riscv/frame_riscv.cpp         |   697 +
 src/hotspot/cpu/riscv/frame_riscv.hpp         |   202 +
 src/hotspot/cpu/riscv/frame_riscv.inline.hpp  |   248 +
 .../gc/g1/g1BarrierSetAssembler_riscv.cpp     |   484 +
 .../gc/g1/g1BarrierSetAssembler_riscv.hpp     |    78 +
 .../cpu/riscv/gc/g1/g1Globals_riscv.hpp       |    31 +
 .../gc/shared/barrierSetAssembler_riscv.cpp   |   302 +
 .../gc/shared/barrierSetAssembler_riscv.hpp   |    79 +
 .../gc/shared/barrierSetNMethod_riscv.cpp     |   171 +
 .../cardTableBarrierSetAssembler_riscv.cpp    |   111 +
 .../cardTableBarrierSetAssembler_riscv.hpp    |    42 +
 .../modRefBarrierSetAssembler_riscv.cpp       |    55 +
 .../modRefBarrierSetAssembler_riscv.hpp       |    55 +
 .../c1/shenandoahBarrierSetC1_riscv.cpp       |   117 +
 .../shenandoahBarrierSetAssembler_riscv.cpp   |   712 ++
 .../shenandoahBarrierSetAssembler_riscv.hpp   |    88 +
 .../riscv/gc/shenandoah/shenandoah_riscv64.ad |   285 +
 .../riscv/gc/z/zBarrierSetAssembler_riscv.cpp |   441 +
 .../riscv/gc/z/zBarrierSetAssembler_riscv.hpp |   101 +
 src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.cpp |   212 +
 src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.hpp |    36 +
 src/hotspot/cpu/riscv/gc/z/z_riscv64.ad       |   233 +
 .../cpu/riscv/globalDefinitions_riscv.hpp     |    52 +
 src/hotspot/cpu/riscv/globals_riscv.hpp       |    99 +
 src/hotspot/cpu/riscv/icBuffer_riscv.cpp      |    79 +
 src/hotspot/cpu/riscv/icache_riscv.cpp        |    51 +
 src/hotspot/cpu/riscv/icache_riscv.hpp        |    42 +
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp   |  1940 +++
 src/hotspot/cpu/riscv/interp_masm_riscv.hpp   |   285 +
 src/hotspot/cpu/riscv/interpreterRT_riscv.cpp |   295 +
 src/hotspot/cpu/riscv/interpreterRT_riscv.hpp |    68 +
 .../cpu/riscv/javaFrameAnchor_riscv.hpp       |    86 +
 .../cpu/riscv/jniFastGetField_riscv.cpp       |   214 +
 src/hotspot/cpu/riscv/jniTypes_riscv.hpp      |   106 +
 .../cpu/riscv/macroAssembler_riscv.cpp        |  4016 ++++++
 .../cpu/riscv/macroAssembler_riscv.hpp        |   858 ++
 .../cpu/riscv/macroAssembler_riscv.inline.hpp |    31 +
 src/hotspot/cpu/riscv/matcher_riscv.hpp       |   169 +
 src/hotspot/cpu/riscv/methodHandles_riscv.cpp |   461 +
 src/hotspot/cpu/riscv/methodHandles_riscv.hpp |    57 +
 src/hotspot/cpu/riscv/nativeInst_riscv.cpp    |   429 +
 src/hotspot/cpu/riscv/nativeInst_riscv.hpp    |   572 +
 src/hotspot/cpu/riscv/registerMap_riscv.cpp   |    45 +
 src/hotspot/cpu/riscv/registerMap_riscv.hpp   |    43 +
 src/hotspot/cpu/riscv/register_riscv.cpp      |    73 +
 src/hotspot/cpu/riscv/register_riscv.hpp      |   324 +
 src/hotspot/cpu/riscv/relocInfo_riscv.cpp     |   113 +
 src/hotspot/cpu/riscv/relocInfo_riscv.hpp     |    44 +
 src/hotspot/cpu/riscv/riscv.ad                | 10611 ++++++++++++++++
 src/hotspot/cpu/riscv/riscv_b.ad              |   527 +
 src/hotspot/cpu/riscv/riscv_v.ad              |  2065 +++
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |  2761 ++++
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp |  3864 ++++++
 src/hotspot/cpu/riscv/stubRoutines_riscv.cpp  |    58 +
 src/hotspot/cpu/riscv/stubRoutines_riscv.hpp  |   161 +
 .../templateInterpreterGenerator_riscv.cpp    |  1794 +++
 src/hotspot/cpu/riscv/templateTable_riscv.cpp |  3951 ++++++
 src/hotspot/cpu/riscv/templateTable_riscv.hpp |    42 +
 .../riscv/universalNativeInvoker_riscv.cpp    |    33 +
 .../cpu/riscv/universalUpcallHandle_riscv.cpp |    42 +
 src/hotspot/cpu/riscv/vmStructs_riscv.hpp     |    42 +
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    |   230 +
 src/hotspot/cpu/riscv/vm_version_riscv.hpp    |    72 +
 src/hotspot/cpu/riscv/vmreg_riscv.cpp         |    64 +
 src/hotspot/cpu/riscv/vmreg_riscv.hpp         |    68 +
 src/hotspot/cpu/riscv/vmreg_riscv.inline.hpp  |    46 +
 src/hotspot/cpu/riscv/vtableStubs_riscv.cpp   |   260 +
 src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp |     7 +-
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp   |     7 +-
 src/hotspot/os/linux/os_linux.cpp             |     2 +
 .../linux_riscv/assembler_linux_riscv.cpp     |    26 +
 .../os_cpu/linux_riscv/atomic_linux_riscv.hpp |   134 +
 .../os_cpu/linux_riscv/bytes_linux_riscv.hpp  |    45 +
 .../os_cpu/linux_riscv/copy_linux_riscv.hpp   |    31 +
 .../linux_riscv/gc/z/zSyscall_linux_riscv.hpp |    42 +
 .../linux_riscv/globals_linux_riscv.hpp       |    43 +
 .../linux_riscv/orderAccess_linux_riscv.hpp   |    63 +
 .../os_cpu/linux_riscv/os_linux_riscv.cpp     |   466 +
 .../os_cpu/linux_riscv/os_linux_riscv.hpp     |    59 +
 .../prefetch_linux_riscv.inline.hpp           |    38 +
 .../os_cpu/linux_riscv/thread_linux_riscv.cpp |    92 +
 .../os_cpu/linux_riscv/thread_linux_riscv.hpp |    48 +
 .../linux_riscv/vmStructs_linux_riscv.hpp     |    55 +
 .../linux_riscv/vm_version_linux_riscv.cpp    |   118 +
 src/hotspot/share/c1/c1_LIR.cpp               |   109 +-
 src/hotspot/share/c1/c1_LIR.hpp               |   191 +-
 src/hotspot/share/c1/c1_LIRAssembler.cpp      |    15 +-
 src/hotspot/share/c1/c1_LIRAssembler.hpp      |     5 +-
 src/hotspot/share/c1/c1_LinearScan.cpp        |    18 +-
 .../gc/shenandoah/shenandoahArguments.cpp     |     4 +-
 src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp   |     4 +-
 .../share/jfr/utilities/jfrBigEndian.hpp      |     2 +-
 src/hotspot/share/opto/regmask.hpp            |     4 +-
 .../share/runtime/abstract_vm_version.cpp     |     3 +-
 src/hotspot/share/runtime/arguments.cpp       |     2 +-
 src/hotspot/share/runtime/synchronizer.cpp    |     4 +-
 src/hotspot/share/runtime/thread.inline.hpp   |     4 +-
 src/hotspot/share/utilities/macros.hpp        |    26 +
 .../native/libsaproc/LinuxDebuggerLocal.cpp   |    49 +-
 .../linux/native/libsaproc/libproc.h          |     4 +-
 .../classes/sun/jvm/hotspot/HotSpotAgent.java |     3 +
 .../debugger/MachineDescriptionRISCV64.java   |    40 +
 .../debugger/linux/LinuxCDebugger.java        |    13 +-
 .../linux/riscv64/LinuxRISCV64CFrame.java     |    90 +
 .../riscv64/LinuxRISCV64ThreadContext.java    |    48 +
 .../proc/riscv64/ProcRISCV64Thread.java       |    88 +
 .../riscv64/ProcRISCV64ThreadContext.java     |    48 +
 .../riscv64/ProcRISCV64ThreadFactory.java     |    46 +
 .../remote/riscv64/RemoteRISCV64Thread.java   |    55 +
 .../riscv64/RemoteRISCV64ThreadContext.java   |    48 +
 .../riscv64/RemoteRISCV64ThreadFactory.java   |    46 +
 .../debugger/risv64/RISCV64ThreadContext.java |   172 +
 .../sun/jvm/hotspot/runtime/Threads.java      |     5 +-
 .../LinuxRISCV64JavaThreadPDAccess.java       |   134 +
 .../riscv64/RISCV64CurrentFrameGuess.java     |   223 +
 .../hotspot/runtime/riscv64/RISCV64Frame.java |   556 +
 .../riscv64/RISCV64JavaCallWrapper.java       |    61 +
 .../runtime/riscv64/RISCV64RegisterMap.java   |    53 +
 .../jvm/hotspot/utilities/PlatformInfo.java   |     4 +-
 test/hotspot/jtreg/compiler/c2/TestBit.java   |     7 +-
 ...eSHA1IntrinsicsOptionOnUnsupportedCPU.java |     5 +-
 ...HA256IntrinsicsOptionOnUnsupportedCPU.java |     5 +-
 ...HA512IntrinsicsOptionOnUnsupportedCPU.java |     5 +-
 .../cli/TestUseSHAOptionOnUnsupportedCPU.java |     5 +-
 .../testcases/GenericTestCaseForOtherCPU.java |    11 +-
 ...nericTestCaseForUnsupportedRISCV64CPU.java |   115 +
 .../loopopts/superword/ProdRed_Double.java    |     4 +-
 .../loopopts/superword/ProdRed_Float.java     |     4 +-
 .../loopopts/superword/ProdRed_Int.java       |     4 +-
 .../loopopts/superword/ReductionPerf.java     |     4 +-
 .../superword/SumRedAbsNeg_Double.java        |     4 +-
 .../superword/SumRedAbsNeg_Float.java         |     4 +-
 .../loopopts/superword/SumRedSqrt_Double.java |     4 +-
 .../loopopts/superword/SumRed_Double.java     |     4 +-
 .../loopopts/superword/SumRed_Float.java      |     4 +-
 .../loopopts/superword/SumRed_Int.java        |     4 +-
 .../sha/predicate/IntrinsicPredicates.java    |    11 +-
 .../NMT/CheckForProperDetailStackTrace.java   |     4 +-
 .../ReservedStack/ReservedStackTest.java      |     4 +-
 .../MyPackage/ASGCTBaseTest.java              |     4 +-
 .../ConcurrentHashMap/MapLoops.java           |     2 +-
 .../jdk/jfr/event/os/TestCPUInformation.java  |     6 +-
 ...stMutuallyExclusivePlatformPredicates.java |     2 +-
 test/lib/jdk/test/lib/Platform.java           |     4 +
 188 files changed, 59087 insertions(+), 177 deletions(-)
 create mode 100644 src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/assembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/assembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/assembler_riscv.inline.hpp
 create mode 100644 src/hotspot/cpu/riscv/bytes_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_FrameMap_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LIR_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c1_globals_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c2_globals_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/c2_init_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/c2_safepointPollStubTable_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/compiledIC_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/copy_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/disassembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/foreign_globals_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/foreign_globals_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/frame_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/frame_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/frame_riscv.inline.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/g1/g1Globals_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv64.ad
 create mode 100644 src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/gc/z/z_riscv64.ad
 create mode 100644 src/hotspot/cpu/riscv/globalDefinitions_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/globals_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/icBuffer_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/icache_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/icache_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/interp_masm_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/interp_masm_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/interpreterRT_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/interpreterRT_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/javaFrameAnchor_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/jniTypes_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/macroAssembler_riscv.inline.hpp
 create mode 100644 src/hotspot/cpu/riscv/matcher_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/methodHandles_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/methodHandles_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/nativeInst_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/nativeInst_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/registerMap_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/registerMap_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/register_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/register_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/relocInfo_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/relocInfo_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/riscv.ad
 create mode 100644 src/hotspot/cpu/riscv/riscv_b.ad
 create mode 100644 src/hotspot/cpu/riscv/riscv_v.ad
 create mode 100644 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/templateTable_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/templateTable_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/universalNativeInvoker_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/universalUpcallHandle_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/vmStructs_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/vm_version_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/vm_version_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/vmreg_riscv.cpp
 create mode 100644 src/hotspot/cpu/riscv/vmreg_riscv.hpp
 create mode 100644 src/hotspot/cpu/riscv/vmreg_riscv.inline.hpp
 create mode 100644 src/hotspot/cpu/riscv/vtableStubs_riscv.cpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/assembler_linux_riscv.cpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/bytes_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/copy_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/gc/z/zSyscall_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/globals_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/os_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/prefetch_linux_riscv.inline.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.cpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
 create mode 100644 src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionRISCV64.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64CFrame.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64ThreadContext.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64Thread.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64ThreadContext.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64ThreadFactory.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64Thread.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64ThreadContext.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64ThreadFactory.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/risv64/RISCV64ThreadContext.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_riscv64/LinuxRISCV64JavaThreadPDAccess.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64CurrentFrameGuess.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64JavaCallWrapper.java
 create mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64RegisterMap.java
 create mode 100644 test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedRISCV64CPU.java

diff --git a/make/autoconf/build-aux/config.guess b/make/autoconf/build-aux/config.guess
index d589529f35a..6ae31e8ae22 100644
--- a/make/autoconf/build-aux/config.guess
+++ b/make/autoconf/build-aux/config.guess
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -111,6 +111,15 @@ if [ "x$OUT" = x ]; then
   fi
 fi
 
+# Test and fix RISC-V.
+if [ "x$OUT" = x ]; then
+  if [ `uname -s` = Linux ]; then
+    if [ `uname -m` = riscv64 ]; then
+      OUT=riscv64-unknown-linux-gnu
+    fi
+  fi
+fi
+
 # Test and fix cpu on macos-aarch64, uname -p reports arm, buildsys expects aarch64
 echo $OUT | grep arm-apple-darwin > /dev/null 2> /dev/null
 if test $? != 0; then
diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
index 8dfc0d362b9..ee1d19ecce8 100644
--- a/make/autoconf/jvm-features.m4
+++ b/make/autoconf/jvm-features.m4
@@ -291,7 +291,8 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_SHENANDOAHGC],
     AC_MSG_CHECKING([if platform is supported by Shenandoah])
     if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || \
         test "x$OPENJDK_TARGET_CPU" = "xaarch64" || \
-        test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
+        test "x$OPENJDK_TARGET_CPU" = "xppc64le" || \
+        test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
       AC_MSG_RESULT([yes])
     else
       AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
@@ -341,7 +342,8 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
         AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
         AVAILABLE=false
       fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
+    elif test "x$OPENJDK_TARGET_CPU" = "xppc64le" || \
+        test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
       if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
         AC_MSG_RESULT([yes])
       else
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
index fbc8ee7b9c8..b901d77c5c5 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -149,6 +149,12 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
     fi
   fi
 
+  # Because RISC-V only has word-sized atomics, it requries libatomic where
+  # other common architectures do not.  So link libatomic by default.
+  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xriscv64; then
+    BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"
+  fi
+
   # perfstat lib
   if test "x$OPENJDK_TARGET_OS" = xaix; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat"
diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index 205d64f566d..a48aabe06f3 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -561,6 +561,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
     HOTSPOT_$1_CPU_DEFINE=PPC64
   elif test "x$OPENJDK_$1_CPU" = xppc64le; then
     HOTSPOT_$1_CPU_DEFINE=PPC64
+  elif test "x$OPENJDK_$1_CPU" = xriscv64; then
+    HOTSPOT_$1_CPU_DEFINE=RISCV64
 
   # The cpu defines below are for zero, we don't support them directly.
   elif test "x$OPENJDK_$1_CPU" = xsparc; then
@@ -571,8 +573,6 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
     HOTSPOT_$1_CPU_DEFINE=S390
   elif test "x$OPENJDK_$1_CPU" = xs390x; then
     HOTSPOT_$1_CPU_DEFINE=S390
-  elif test "x$OPENJDK_$1_CPU" = xriscv64; then
-    HOTSPOT_$1_CPU_DEFINE=RISCV
   elif test "x$OPENJDK_$1_CPU" != x; then
     HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
   fi
diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk
index 25c13272914..73496bc6586 100644
--- a/make/hotspot/gensrc/GensrcAdlc.gmk
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -146,6 +146,13 @@ ifeq ($(call check-jvm-feature, compiler2), true)
     )))
   endif
 
+  ifeq ($(HOTSPOT_TARGET_CPU_ARCH), riscv)
+    AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_CPU_ARCH)_v.ad \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_CPU_ARCH)_b.ad \
+    )))
+  endif
+
   ifeq ($(call check-jvm-feature, shenandoahgc), true)
     AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
         $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/shenandoah/shenandoah_$(HOTSPOT_TARGET_CPU).ad \
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 6f91b1539a6..b7e6ccc28d9 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1582,7 +1582,9 @@ void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op) {
 }
 
 
-void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
+                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
+  assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on aarch64");
 
   Assembler::Condition acond, ncond;
   switch (condition) {
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index f7ffe84618d..b92167fb6a0 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1412,7 +1412,10 @@ void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op) {
 }
 
 
-void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
+                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
+  assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on arm");
+
   AsmCondition acond = al;
   AsmCondition ncond = nv;
   if (opr1 != opr2) {
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index b04c49152f3..730e95ae775 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1547,8 +1547,10 @@ inline void load_to_reg(LIR_Assembler *lasm, LIR_Opr src, LIR_Opr dst) {
   }
 }
 
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
+                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
+  assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on ppc");
 
-void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
   if (opr1->is_equal(opr2) || opr1->is_same_register(opr2)) {
     load_to_reg(this, opr1, result); // Condition doesn't matter.
     return;
diff --git a/src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp b/src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp
new file mode 100644
index 00000000000..31c63abe71d
--- /dev/null
+++ b/src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "interpreter/interpreter.hpp"
+#include "oops/constMethod.hpp"
+#include "oops/klass.inline.hpp"
+#include "oops/method.hpp"
+#include "runtime/frame.inline.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/macros.hpp"
+
+int AbstractInterpreter::BasicType_as_index(BasicType type) {
+  int i = 0;
+  switch (type) {
+    case T_BOOLEAN: i = 0; break;
+    case T_CHAR   : i = 1; break;
+    case T_BYTE   : i = 2; break;
+    case T_SHORT  : i = 3; break;
+    case T_INT    : i = 4; break;
+    case T_LONG   : i = 5; break;
+    case T_VOID   : i = 6; break;
+    case T_FLOAT  : i = 7; break;
+    case T_DOUBLE : i = 8; break;
+    case T_OBJECT : i = 9; break;
+    case T_ARRAY  : i = 9; break;
+    default       : ShouldNotReachHere();
+  }
+  assert(0 <= i && i < AbstractInterpreter::number_of_result_handlers,
+         "index out of bounds");
+  return i;
+}
+
+// How much stack a method activation needs in words.
+int AbstractInterpreter::size_top_interpreter_activation(Method* method) {
+  const int entry_size = frame::interpreter_frame_monitor_size();
+
+  // total overhead size: entry_size + (saved fp thru expr stack
+  // bottom).  be sure to change this if you add/subtract anything
+  // to/from the overhead area
+  const int overhead_size =
+    -(frame::interpreter_frame_initial_sp_offset) + entry_size;
+
+  const int stub_code = frame::entry_frame_after_call_words;
+  assert_cond(method != NULL);
+  const int method_stack = (method->max_locals() + method->max_stack()) *
+                           Interpreter::stackElementWords;
+  return (overhead_size + method_stack + stub_code);
+}
+
+// asm based interpreter deoptimization helpers
+int AbstractInterpreter::size_activation(int max_stack,
+                                         int temps,
+                                         int extra_args,
+                                         int monitors,
+                                         int callee_params,
+                                         int callee_locals,
+                                         bool is_top_frame) {
+  // Note: This calculation must exactly parallel the frame setup
+  // in TemplateInterpreterGenerator::generate_method_entry.
+
+  // fixed size of an interpreter frame:
+  int overhead = frame::sender_sp_offset -
+                 frame::interpreter_frame_initial_sp_offset;
+  // Our locals were accounted for by the caller (or last_frame_adjust
+  // on the transistion) Since the callee parameters already account
+  // for the callee's params we only need to account for the extra
+  // locals.
+  int size = overhead +
+             (callee_locals - callee_params) +
+             monitors * frame::interpreter_frame_monitor_size() +
+             // On the top frame, at all times SP <= ESP, and SP is
+             // 16-aligned.  We ensure this by adjusting SP on method
+             // entry and re-entry to allow room for the maximum size of
+             // the expression stack.  When we call another method we bump
+             // SP so that no stack space is wasted.  So, only on the top
+             // frame do we need to allow max_stack words.
+             (is_top_frame ? max_stack : temps + extra_args);
+
+  // On riscv we always keep the stack pointer 16-aligned, so we
+  // must round up here.
+  size = align_up(size, 2);
+
+  return size;
+}
+
+void AbstractInterpreter::layout_activation(Method* method,
+                                            int tempcount,
+                                            int popframe_extra_args,
+                                            int moncount,
+                                            int caller_actual_parameters,
+                                            int callee_param_count,
+                                            int callee_locals,
+                                            frame* caller,
+                                            frame* interpreter_frame,
+                                            bool is_top_frame,
+                                            bool is_bottom_frame) {
+  // The frame interpreter_frame is guaranteed to be the right size,
+  // as determined by a previous call to the size_activation() method.
+  // It is also guaranteed to be walkable even though it is in a
+  // skeletal state
+  assert_cond(method != NULL && caller != NULL && interpreter_frame != NULL);
+  int max_locals = method->max_locals() * Interpreter::stackElementWords;
+  int extra_locals = (method->max_locals() - method->size_of_parameters()) *
+    Interpreter::stackElementWords;
+
+#ifdef ASSERT
+  assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable");
+#endif
+
+  interpreter_frame->interpreter_frame_set_method(method);
+  // NOTE the difference in using sender_sp and interpreter_frame_sender_sp
+  // interpreter_frame_sender_sp is the original sp of the caller (the unextended_sp)
+  // and sender_sp is fp
+  intptr_t* locals = NULL;
+  if (caller->is_interpreted_frame()) {
+    locals = caller->interpreter_frame_last_sp() + caller_actual_parameters - 1;
+  } else {
+    locals = interpreter_frame->sender_sp() + max_locals - 1;
+  }
+
+#ifdef ASSERT
+  if (caller->is_interpreted_frame()) {
+    assert(locals < caller->fp() + frame::interpreter_frame_initial_sp_offset, "bad placement");
+  }
+#endif
+
+  interpreter_frame->interpreter_frame_set_locals(locals);
+  BasicObjectLock* montop = interpreter_frame->interpreter_frame_monitor_begin();
+  BasicObjectLock* monbot = montop - moncount;
+  interpreter_frame->interpreter_frame_set_monitor_end(monbot);
+
+  // Set last_sp
+  intptr_t* last_sp = (intptr_t*) monbot -
+    tempcount*Interpreter::stackElementWords -
+    popframe_extra_args;
+  interpreter_frame->interpreter_frame_set_last_sp(last_sp);
+
+  // All frames but the initial (oldest) interpreter frame we fill in have
+  // a value for sender_sp that allows walking the stack but isn't
+  // truly correct. Correct the value here.
+  if (extra_locals != 0 &&
+      interpreter_frame->sender_sp() ==
+      interpreter_frame->interpreter_frame_sender_sp()) {
+    interpreter_frame->set_interpreter_frame_sender_sp(caller->sp() +
+                                                       extra_locals);
+  }
+
+  *interpreter_frame->interpreter_frame_cache_addr() =
+    method->constants()->cache();
+  *interpreter_frame->interpreter_frame_mirror_addr() =
+    method->method_holder()->java_mirror();
+}
diff --git a/src/hotspot/cpu/riscv/assembler_riscv.cpp b/src/hotspot/cpu/riscv/assembler_riscv.cpp
new file mode 100644
index 00000000000..f15ef5304c5
--- /dev/null
+++ b/src/hotspot/cpu/riscv/assembler_riscv.cpp
@@ -0,0 +1,372 @@
+/*
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
+#include "compiler/disassembler.hpp"
+#include "interpreter/interpreter.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+
+int AbstractAssembler::code_fill_byte() {
+  return 0;
+}
+
+void Assembler::add(Register Rd, Register Rn, int64_t increment, Register temp) {
+  if (is_imm_in_range(increment, 12, 0)) {
+    addi(Rd, Rn, increment);
+  } else {
+    assert_different_registers(Rn, temp);
+    li(temp, increment);
+    add(Rd, Rn, temp);
+  }
+}
+
+void Assembler::addw(Register Rd, Register Rn, int64_t increment, Register temp) {
+  if (is_imm_in_range(increment, 12, 0)) {
+    addiw(Rd, Rn, increment);
+  } else {
+    assert_different_registers(Rn, temp);
+    li(temp, increment);
+    addw(Rd, Rn, temp);
+  }
+}
+
+void Assembler::sub(Register Rd, Register Rn, int64_t decrement, Register temp) {
+  if (is_imm_in_range(-decrement, 12, 0)) {
+    addi(Rd, Rn, -decrement);
+  } else {
+    assert_different_registers(Rn, temp);
+    li(temp, decrement);
+    sub(Rd, Rn, temp);
+  }
+}
+
+void Assembler::subw(Register Rd, Register Rn, int64_t decrement, Register temp) {
+  if (is_imm_in_range(-decrement, 12, 0)) {
+    addiw(Rd, Rn, -decrement);
+  } else {
+    assert_different_registers(Rn, temp);
+    li(temp, decrement);
+    subw(Rd, Rn, temp);
+  }
+}
+
+void Assembler::zext_w(Register Rd, Register Rs) {
+  add_uw(Rd, Rs, zr);
+}
+
+void Assembler::_li(Register Rd, int64_t imm) {
+  // int64_t is in range 0x8000 0000 0000 0000 ~ 0x7fff ffff ffff ffff
+  int shift = 12;
+  int64_t upper = imm, lower = imm;
+  // Split imm to a lower 12-bit sign-extended part and the remainder,
+  // because addi will sign-extend the lower imm.
+  lower = ((int32_t)imm << 20) >> 20;
+  upper -= lower;
+
+  // Test whether imm is a 32-bit integer.
+  if (!(((imm) & ~(int64_t)0x7fffffff) == 0 ||
+        (((imm) & ~(int64_t)0x7fffffff) == ~(int64_t)0x7fffffff))) {
+    while (((upper >> shift) & 1) == 0) { shift++; }
+    upper >>= shift;
+    li(Rd, upper);
+    slli(Rd, Rd, shift);
+    if (lower != 0) {
+      addi(Rd, Rd, lower);
+    }
+  } else {
+    // 32-bit integer
+    Register hi_Rd = zr;
+    if (upper != 0) {
+      lui(Rd, (int32_t)upper);
+      hi_Rd = Rd;
+    }
+    if (lower != 0 || hi_Rd == zr) {
+      addiw(Rd, hi_Rd, lower);
+    }
+  }
+}
+
+void Assembler::li64(Register Rd, int64_t imm) {
+   // Load upper 32 bits. upper = imm[63:32], but if imm[31] == 1 or
+   // (imm[31:28] == 0x7ff && imm[19] == 1), upper = imm[63:32] + 1.
+   int64_t lower = imm & 0xffffffff;
+   lower -= ((lower << 44) >> 44);
+   int64_t tmp_imm = ((uint64_t)(imm & 0xffffffff00000000)) + (uint64_t)lower;
+   int32_t upper = (tmp_imm - (int32_t)lower) >> 32;
+
+   // Load upper 32 bits
+   int64_t up = upper, lo = upper;
+   lo = (lo << 52) >> 52;
+   up -= lo;
+   up = (int32_t)up;
+   lui(Rd, up);
+   addi(Rd, Rd, lo);
+
+   // Load the rest 32 bits.
+   slli(Rd, Rd, 12);
+   addi(Rd, Rd, (int32_t)lower >> 20);
+   slli(Rd, Rd, 12);
+   lower = ((int32_t)imm << 12) >> 20;
+   addi(Rd, Rd, lower);
+   slli(Rd, Rd, 8);
+   lower = imm & 0xff;
+   addi(Rd, Rd, lower);
+}
+
+void Assembler::li32(Register Rd, int32_t imm) {
+  // int32_t is in range 0x8000 0000 ~ 0x7fff ffff, and imm[31] is the sign bit
+  int64_t upper = imm, lower = imm;
+  lower = (imm << 20) >> 20;
+  upper -= lower;
+  upper = (int32_t)upper;
+  // lui Rd, imm[31:12] + imm[11]
+  lui(Rd, upper);
+  // use addiw to distinguish li32 to li64
+  addiw(Rd, Rd, lower);
+}
+
+#define INSN(NAME, REGISTER)                                       \
+  void Assembler::NAME(const address &dest, Register temp) {       \
+    assert_cond(dest != NULL);                                     \
+    int64_t distance = dest - pc();                                \
+    if (is_imm_in_range(distance, 20, 1)) {                        \
+      jal(REGISTER, distance);                                     \
+    } else {                                                       \
+      assert(temp != noreg, "temp must not be empty register!");   \
+      int32_t offset = 0;                                          \
+      movptr_with_offset(temp, dest, offset);                      \
+      jalr(REGISTER, temp, offset);                                \
+    }                                                              \
+  }                                                                \
+  void Assembler::NAME(Label &l, Register temp) {                  \
+    jal(REGISTER, l, temp);                                        \
+  }                                                                \
+
+  INSN(j,   x0);
+  INSN(jal, x1);
+
+#undef INSN
+
+#define INSN(NAME, REGISTER)                                       \
+  void Assembler::NAME(Register Rs) {                              \
+    jalr(REGISTER, Rs, 0);                                         \
+  }
+
+  INSN(jr,   x0);
+  INSN(jalr, x1);
+
+#undef INSN
+
+void Assembler::ret() {
+  jalr(x0, x1, 0);
+}
+
+#define INSN(NAME, REGISTER)                                      \
+  void Assembler::NAME(const address &dest, Register temp) {      \
+    assert_cond(dest != NULL);                                    \
+    assert(temp != noreg, "temp must not be empty register!");    \
+    int64_t distance = dest - pc();                               \
+    if (is_offset_in_range(distance, 32)) {                       \
+      auipc(temp, distance + 0x800);                              \
+      jalr(REGISTER, temp, ((int32_t)distance << 20) >> 20);      \
+    } else {                                                      \
+      int32_t offset = 0;                                         \
+      movptr_with_offset(temp, dest, offset);                     \
+      jalr(REGISTER, temp, offset);                               \
+    }                                                             \
+  }
+
+  INSN(call, x1);
+  INSN(tail, x0);
+
+#undef INSN
+
+#define INSN(NAME, REGISTER)                                   \
+  void Assembler::NAME(const Address &adr, Register temp) {    \
+    switch (adr.getMode()) {                                   \
+      case Address::literal: {                                 \
+        code_section()->relocate(pc(), adr.rspec());           \
+        NAME(adr.target(), temp);                              \
+        break;                                                 \
+      }                                                        \
+      case Address::base_plus_offset: {                        \
+        int32_t offset = 0;                                    \
+        baseOffset(temp, adr, offset);                         \
+        jalr(REGISTER, temp, offset);                          \
+        break;                                                 \
+      }                                                        \
+      default:                                                 \
+        ShouldNotReachHere();                                  \
+    }                                                          \
+  }
+
+  INSN(j,    x0);
+  INSN(jal,  x1);
+  INSN(call, x1);
+  INSN(tail, x0);
+
+#undef INSN
+
+void Assembler::wrap_label(Register r1, Register r2, Label &L, compare_and_branch_insn insn,
+                           compare_and_branch_label_insn neg_insn, bool is_far) {
+  if (is_far) {
+    Label done;
+    (this->*neg_insn)(r1, r2, done, /* is_far */ false);
+    j(L);
+    bind(done);
+  } else {
+    if (L.is_bound()) {
+      (this->*insn)(r1, r2, target(L));
+    } else {
+      L.add_patch_at(code(), locator());
+      (this->*insn)(r1, r2, pc());
+    }
+  }
+}
+
+void Assembler::wrap_label(Register Rt, Label &L, Register tmp, load_insn_by_temp insn) {
+  if (L.is_bound()) {
+    (this->*insn)(Rt, target(L), tmp);
+  } else {
+    L.add_patch_at(code(), locator());
+    (this->*insn)(Rt, pc(), tmp);
+  }
+}
+
+void Assembler::wrap_label(Register Rt, Label &L, jal_jalr_insn insn) {
+  if (L.is_bound()) {
+    (this->*insn)(Rt, target(L));
+  } else {
+    L.add_patch_at(code(), locator());
+    (this->*insn)(Rt, pc());
+  }
+}
+
+void Assembler::movptr_with_offset(Register Rd, address addr, int32_t &offset) {
+  uintptr_t imm64 = (uintptr_t)addr;
+#ifndef PRODUCT
+  {
+    char buffer[64];
+    snprintf(buffer, sizeof(buffer), "0x%" PRIx64, imm64);
+    block_comment(buffer);
+  }
+#endif
+  assert(is_unsigned_imm_in_range(imm64, 47, 0) || (imm64 == (uintptr_t)-1),
+         "48-bit overflow in address constant");
+  // Load upper 32 bits
+  int32_t imm = imm64 >> 16;
+  int64_t upper = imm, lower = imm;
+  lower = (lower << 52) >> 52;
+  upper -= lower;
+  upper = (int32_t)upper;
+  lui(Rd, upper);
+  addi(Rd, Rd, lower);
+
+  // Load the rest 16 bits.
+  slli(Rd, Rd, 11);
+  addi(Rd, Rd, (imm64 >> 5) & 0x7ff);
+  slli(Rd, Rd, 5);
+
+  // This offset will be used by following jalr/ld.
+  offset = imm64 & 0x1f;
+}
+
+void Assembler::movptr(Register Rd, uintptr_t imm64) {
+  movptr(Rd, (address)imm64);
+}
+
+void Assembler::movptr(Register Rd, address addr) {
+  int offset = 0;
+  movptr_with_offset(Rd, addr, offset);
+  addi(Rd, Rd, offset);
+}
+
+void Assembler::ifence() {
+  fence_i();
+  if (UseConservativeFence) {
+    fence(ir, ir);
+  }
+}
+
+#define INSN(NAME, NEG_INSN)                                                         \
+  void Assembler::NAME(Register Rs, Register Rt, const address &dest) {              \
+    NEG_INSN(Rt, Rs, dest);                                                          \
+  }                                                                                  \
+  void Assembler::NAME(Register Rs, Register Rt, Label &l, bool is_far) {            \
+    NEG_INSN(Rt, Rs, l, is_far);                                                     \
+  }
+
+  INSN(bgt,  blt);
+  INSN(ble,  bge);
+  INSN(bgtu, bltu);
+  INSN(bleu, bgeu);
+#undef INSN
+
+#undef __
+
+Address::Address(address target, relocInfo::relocType rtype) : _base(noreg), _offset(0), _mode(literal) {
+  _target = target;
+  switch (rtype) {
+    case relocInfo::oop_type:
+    case relocInfo::metadata_type:
+      // Oops are a special case. Normally they would be their own section
+      // but in cases like icBuffer they are literals in the code stream that
+      // we don't have a section for. We use none so that we get a literal address
+      // which is always patchable.
+      break;
+    case relocInfo::external_word_type:
+      _rspec = external_word_Relocation::spec(target);
+      break;
+    case relocInfo::internal_word_type:
+      _rspec = internal_word_Relocation::spec(target);
+      break;
+    case relocInfo::opt_virtual_call_type:
+      _rspec = opt_virtual_call_Relocation::spec();
+      break;
+    case relocInfo::static_call_type:
+      _rspec = static_call_Relocation::spec();
+      break;
+    case relocInfo::runtime_call_type:
+      _rspec = runtime_call_Relocation::spec();
+      break;
+    case relocInfo::poll_type:
+    case relocInfo::poll_return_type:
+      _rspec = Relocation::spec_simple(rtype);
+      break;
+    case relocInfo::none:
+      _rspec = RelocationHolder::none;
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
new file mode 100644
index 00000000000..4923962a496
--- /dev/null
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -0,0 +1,3047 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_ASSEMBLER_RISCV_HPP
+#define CPU_RISCV_ASSEMBLER_RISCV_HPP
+
+#include "asm/register.hpp"
+#include "assembler_riscv.inline.hpp"
+#include "metaprogramming/enableIf.hpp"
+
+#define XLEN 64
+
+// definitions of various symbolic names for machine registers
+
+// First intercalls between C and Java which use 8 general registers
+// and 8 floating registers
+
+class Argument {
+ public:
+  enum {
+    n_int_register_parameters_c   = 8, // x10, x11, ... x17 (c_rarg0, c_rarg1, ...)
+    n_float_register_parameters_c = 8, // f10, f11, ... f17 (c_farg0, c_farg1, ... )
+
+    n_int_register_parameters_j   = 8, // x11, ... x17, x10 (j_rarg0, j_rarg1, ...)
+    n_float_register_parameters_j = 8  // f10, f11, ... f17 (j_farg0, j_farg1, ...)
+  };
+};
+
+// function argument(caller-save registers)
+REGISTER_DECLARATION(Register, c_rarg0, x10);
+REGISTER_DECLARATION(Register, c_rarg1, x11);
+REGISTER_DECLARATION(Register, c_rarg2, x12);
+REGISTER_DECLARATION(Register, c_rarg3, x13);
+REGISTER_DECLARATION(Register, c_rarg4, x14);
+REGISTER_DECLARATION(Register, c_rarg5, x15);
+REGISTER_DECLARATION(Register, c_rarg6, x16);
+REGISTER_DECLARATION(Register, c_rarg7, x17);
+
+REGISTER_DECLARATION(FloatRegister, c_farg0, f10);
+REGISTER_DECLARATION(FloatRegister, c_farg1, f11);
+REGISTER_DECLARATION(FloatRegister, c_farg2, f12);
+REGISTER_DECLARATION(FloatRegister, c_farg3, f13);
+REGISTER_DECLARATION(FloatRegister, c_farg4, f14);
+REGISTER_DECLARATION(FloatRegister, c_farg5, f15);
+REGISTER_DECLARATION(FloatRegister, c_farg6, f16);
+REGISTER_DECLARATION(FloatRegister, c_farg7, f17);
+
+// Symbolically name the register arguments used by the Java calling convention.
+// We have control over the convention for java so we can do what we please.
+// What pleases us is to offset the java calling convention so that when
+// we call a suitable jni method the arguments are lined up and we don't
+// have to do much shuffling. A suitable jni method is non-static and a
+// small number of arguments.
+//
+// |------------------------------------------------------------------------|
+// | c_rarg0  c_rarg1  c_rarg2  c_rarg3  c_rarg4  c_rarg5  c_rarg6  c_rarg7 |
+// |------------------------------------------------------------------------|
+// | x10      x11      x12      x13      x14      x15      x16      x17     |
+// |------------------------------------------------------------------------|
+// | j_rarg7  j_rarg0  j_rarg1  j_rarg2  j_rarg3  j_rarg4  j_rarg5  j_rarg6 |
+// |------------------------------------------------------------------------|
+
+REGISTER_DECLARATION(Register, j_rarg0, c_rarg1);
+REGISTER_DECLARATION(Register, j_rarg1, c_rarg2);
+REGISTER_DECLARATION(Register, j_rarg2, c_rarg3);
+REGISTER_DECLARATION(Register, j_rarg3, c_rarg4);
+REGISTER_DECLARATION(Register, j_rarg4, c_rarg5);
+REGISTER_DECLARATION(Register, j_rarg5, c_rarg6);
+REGISTER_DECLARATION(Register, j_rarg6, c_rarg7);
+REGISTER_DECLARATION(Register, j_rarg7, c_rarg0);
+
+// Java floating args are passed as per C
+
+REGISTER_DECLARATION(FloatRegister, j_farg0, f10);
+REGISTER_DECLARATION(FloatRegister, j_farg1, f11);
+REGISTER_DECLARATION(FloatRegister, j_farg2, f12);
+REGISTER_DECLARATION(FloatRegister, j_farg3, f13);
+REGISTER_DECLARATION(FloatRegister, j_farg4, f14);
+REGISTER_DECLARATION(FloatRegister, j_farg5, f15);
+REGISTER_DECLARATION(FloatRegister, j_farg6, f16);
+REGISTER_DECLARATION(FloatRegister, j_farg7, f17);
+
+// zero rigster
+REGISTER_DECLARATION(Register, zr,        x0);
+// global pointer
+REGISTER_DECLARATION(Register, gp,        x3);
+// thread pointer
+REGISTER_DECLARATION(Register, tp,        x4);
+
+// registers used to hold VM data either temporarily within a method
+// or across method calls
+
+// volatile (caller-save) registers
+
+// current method -- must be in a call-clobbered register
+REGISTER_DECLARATION(Register, xmethod,   x31);
+// return address
+REGISTER_DECLARATION(Register, ra,        x1);
+
+// non-volatile (callee-save) registers
+
+// stack pointer
+REGISTER_DECLARATION(Register, sp,        x2);
+// frame pointer
+REGISTER_DECLARATION(Register, fp,        x8);
+// base of heap
+REGISTER_DECLARATION(Register, xheapbase, x27);
+// constant pool cache
+REGISTER_DECLARATION(Register, xcpool,    x26);
+// monitors allocated on stack
+REGISTER_DECLARATION(Register, xmonitors, x25);
+// locals on stack
+REGISTER_DECLARATION(Register, xlocals,   x24);
+
+// java thread pointer
+REGISTER_DECLARATION(Register, xthread,   x23);
+// bytecode pointer
+REGISTER_DECLARATION(Register, xbcp,      x22);
+// Dispatch table base
+REGISTER_DECLARATION(Register, xdispatch, x21);
+// Java stack pointer
+REGISTER_DECLARATION(Register, esp,       x20);
+
+// temporary register(caller-save registers)
+REGISTER_DECLARATION(Register, t0, x5);
+REGISTER_DECLARATION(Register, t1, x6);
+REGISTER_DECLARATION(Register, t2, x7);
+
+const Register g_INTArgReg[Argument::n_int_register_parameters_c] = {
+  c_rarg0, c_rarg1, c_rarg2, c_rarg3, c_rarg4, c_rarg5, c_rarg6, c_rarg7
+};
+
+const FloatRegister g_FPArgReg[Argument::n_float_register_parameters_c] = {
+  c_farg0, c_farg1, c_farg2, c_farg3, c_farg4, c_farg5, c_farg6, c_farg7
+};
+
+#define assert_cond(ARG1) assert(ARG1, #ARG1)
+
+// Addressing modes
+class Address {
+ public:
+
+  enum mode { no_mode, base_plus_offset, pcrel, literal };
+
+ private:
+  Register _base;
+  Register _index;
+  int64_t _offset;
+  enum mode _mode;
+
+  RelocationHolder _rspec;
+
+  // If the target is far we'll need to load the ea of this to a
+  // register to reach it. Otherwise if near we can do PC-relative
+  // addressing.
+  address          _target;
+
+ public:
+  Address()
+    : _base(noreg), _index(noreg), _offset(0), _mode(no_mode), _target(NULL) { }
+  Address(Register r)
+    : _base(r), _index(noreg), _offset(0), _mode(base_plus_offset), _target(NULL) { }
+
+  template<typename T, ENABLE_IF(std::is_integral<T>::value)>
+  Address(Register r, T o)
+    : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(NULL) {}
+
+  Address(Register r, ByteSize disp)
+    : Address(r, in_bytes(disp)) {}
+  Address(address target, RelocationHolder const& rspec)
+    : _base(noreg),
+      _index(noreg),
+      _offset(0),
+      _mode(literal),
+      _rspec(rspec),
+      _target(target) { }
+  Address(address target, relocInfo::relocType rtype = relocInfo::external_word_type);
+
+  const Register base() const {
+    guarantee((_mode == base_plus_offset | _mode == pcrel | _mode == literal), "wrong mode");
+    return _base;
+  }
+  long offset() const {
+    return _offset;
+  }
+  Register index() const {
+    return _index;
+  }
+  mode getMode() const {
+    return _mode;
+  }
+
+  bool uses(Register reg) const { return _base == reg; }
+  const address target() const { return _target; }
+  const RelocationHolder& rspec() const { return _rspec; }
+  ~Address() {
+    _target = NULL;
+    _base = NULL;
+  }
+};
+
+// Convience classes
+class RuntimeAddress: public Address {
+
+  public:
+
+  RuntimeAddress(address target) : Address(target, relocInfo::runtime_call_type) {}
+  ~RuntimeAddress() {}
+};
+
+class OopAddress: public Address {
+
+  public:
+
+  OopAddress(address target) : Address(target, relocInfo::oop_type) {}
+  ~OopAddress() {}
+};
+
+class ExternalAddress: public Address {
+ private:
+  static relocInfo::relocType reloc_for_target(address target) {
+    // Sometimes ExternalAddress is used for values which aren't
+    // exactly addresses, like the card table base.
+    // external_word_type can't be used for values in the first page
+    // so just skip the reloc in that case.
+    return external_word_Relocation::can_be_relocated(target) ? relocInfo::external_word_type : relocInfo::none;
+  }
+
+ public:
+
+  ExternalAddress(address target) : Address(target, reloc_for_target(target)) {}
+  ~ExternalAddress() {}
+};
+
+class InternalAddress: public Address {
+
+  public:
+
+  InternalAddress(address target) : Address(target, relocInfo::internal_word_type) {}
+  ~InternalAddress() {}
+};
+
+class Assembler : public AbstractAssembler {
+public:
+
+  enum { instruction_size = 4 };
+
+  //---<  calculate length of instruction  >---
+  // We just use the values set above.
+  // instruction must start at passed address
+  static unsigned int instr_len(unsigned char *instr) { return instruction_size; }
+
+  //---<  longest instructions  >---
+  static unsigned int instr_maxlen() { return instruction_size; }
+
+  enum RoundingMode {
+    rne = 0b000,     // round to Nearest, ties to Even
+    rtz = 0b001,     // round towards Zero
+    rdn = 0b010,     // round Down (towards eegative infinity)
+    rup = 0b011,     // round Up (towards infinity)
+    rmm = 0b100,     // round to Nearest, ties to Max Magnitude
+    rdy = 0b111,     // in instruction's rm field, selects dynamic rounding mode.In Rounding Mode register, Invalid.
+  };
+
+  void baseOffset32(Register Rd, const Address &adr, int32_t &offset) {
+    assert(Rd != noreg, "Rd must not be empty register!");
+    guarantee(Rd != adr.base(), "should use different registers!");
+    if (is_offset_in_range(adr.offset(), 32)) {
+      int32_t imm = adr.offset();
+      int32_t upper = imm, lower = imm;
+      lower = (imm << 20) >> 20;
+      upper -= lower;
+      lui(Rd, upper);
+      offset = lower;
+    } else {
+      movptr_with_offset(Rd, (address)(uintptr_t)adr.offset(), offset);
+    }
+    add(Rd, Rd, adr.base());
+  }
+
+  void baseOffset(Register Rd, const Address &adr, int32_t &offset) {
+    if (is_offset_in_range(adr.offset(), 12)) {
+      assert(Rd != noreg, "Rd must not be empty register!");
+      addi(Rd, adr.base(), adr.offset());
+      offset = 0;
+    } else {
+      baseOffset32(Rd, adr, offset);
+    }
+  }
+
+  void _li(Register Rd, int64_t imm);  // optimized load immediate
+  void li32(Register Rd, int32_t imm);
+  void li64(Register Rd, int64_t imm);
+  void movptr(Register Rd, address addr);
+  void movptr_with_offset(Register Rd, address addr, int32_t &offset);
+  void movptr(Register Rd, uintptr_t imm64);
+  void ifence();
+  void j(const address &dest, Register temp = t0);
+  void j(const Address &adr, Register temp = t0);
+  void j(Label &l, 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 jr(Register Rs);
+  void jalr(Register Rs);
+  void ret();
+  void call(const address &dest, Register temp = t0);
+  void call(const Address &adr, Register temp = t0);
+  void tail(const address &dest, Register temp = t0);
+  void tail(const Address &adr, Register temp = t0);
+  void call(Label &l, Register temp) {
+    call(target(l), temp);
+  }
+  void tail(Label &l, Register temp) {
+    tail(target(l), temp);
+  }
+
+  static inline uint32_t extract(uint32_t val, unsigned msb, unsigned lsb) {
+    assert_cond(msb >= lsb && msb <= 31);
+    unsigned nbits = msb - lsb + 1;
+    uint32_t mask = (1U << nbits) - 1;
+    uint32_t result = val >> lsb;
+    result &= mask;
+    return result;
+  }
+
+  static inline int32_t sextract(uint32_t val, unsigned msb, unsigned lsb) {
+    assert_cond(msb >= lsb && msb <= 31);
+    int32_t result = val << (31 - msb);
+    result >>= (31 - msb + lsb);
+    return result;
+  }
+
+  static void patch(address a, unsigned msb, unsigned lsb, unsigned val) {
+    assert_cond(a != NULL);
+    assert_cond(msb >= lsb && msb <= 31);
+    unsigned nbits = msb - lsb + 1;
+    guarantee(val < (1U << nbits), "Field too big for insn");
+    unsigned mask = (1U << nbits) - 1;
+    val <<= lsb;
+    mask <<= lsb;
+    unsigned target = *(unsigned *)a;
+    target &= ~mask;
+    target |= val;
+    *(unsigned *)a = target;
+  }
+
+  static void patch(address a, unsigned bit, unsigned val) {
+    patch(a, bit, bit, val);
+  }
+
+  static void patch_reg(address a, unsigned lsb, Register reg) {
+    patch(a, lsb + 4, lsb, reg->encoding_nocheck());
+  }
+
+  static void patch_reg(address a, unsigned lsb, FloatRegister reg) {
+    patch(a, lsb + 4, lsb, reg->encoding_nocheck());
+  }
+
+  static void patch_reg(address a, unsigned lsb, VectorRegister reg) {
+    patch(a, lsb + 4, lsb, reg->encoding_nocheck());
+  }
+
+  void emit(unsigned insn) {
+    emit_int32((jint)insn);
+  }
+
+  void _halt() {
+    emit_int32(0);
+  }
+
+// Register Instruction
+#define INSN(NAME, op, funct3, funct7)                          \
+  void NAME(Register Rd, Register Rs1, Register Rs2) {          \
+    unsigned insn = 0;                                          \
+    patch((address)&insn, 6,  0, op);                           \
+    patch((address)&insn, 14, 12, funct3);                      \
+    patch((address)&insn, 31, 25, funct7);                      \
+    patch_reg((address)&insn, 7, Rd);                           \
+    patch_reg((address)&insn, 15, Rs1);                         \
+    patch_reg((address)&insn, 20, Rs2);                         \
+    emit(insn);                                                 \
+  }
+
+  INSN(_add,  0b0110011, 0b000, 0b0000000);
+  INSN(_sub,  0b0110011, 0b000, 0b0100000);
+  INSN(_andr, 0b0110011, 0b111, 0b0000000);
+  INSN(_orr,  0b0110011, 0b110, 0b0000000);
+  INSN(_xorr, 0b0110011, 0b100, 0b0000000);
+  INSN(sll,   0b0110011, 0b001, 0b0000000);
+  INSN(sra,   0b0110011, 0b101, 0b0100000);
+  INSN(srl,   0b0110011, 0b101, 0b0000000);
+  INSN(slt,   0b0110011, 0b010, 0b0000000);
+  INSN(sltu,  0b0110011, 0b011, 0b0000000);
+  INSN(_addw, 0b0111011, 0b000, 0b0000000);
+  INSN(_subw, 0b0111011, 0b000, 0b0100000);
+  INSN(sllw,  0b0111011, 0b001, 0b0000000);
+  INSN(sraw,  0b0111011, 0b101, 0b0100000);
+  INSN(srlw,  0b0111011, 0b101, 0b0000000);
+  INSN(mul,   0b0110011, 0b000, 0b0000001);
+  INSN(mulh,  0b0110011, 0b001, 0b0000001);
+  INSN(mulhsu,0b0110011, 0b010, 0b0000001);
+  INSN(mulhu, 0b0110011, 0b011, 0b0000001);
+  INSN(mulw,  0b0111011, 0b000, 0b0000001);
+  INSN(div,   0b0110011, 0b100, 0b0000001);
+  INSN(divu,  0b0110011, 0b101, 0b0000001);
+  INSN(divw,  0b0111011, 0b100, 0b0000001);
+  INSN(divuw, 0b0111011, 0b101, 0b0000001);
+  INSN(rem,   0b0110011, 0b110, 0b0000001);
+  INSN(remu,  0b0110011, 0b111, 0b0000001);
+  INSN(remw,  0b0111011, 0b110, 0b0000001);
+  INSN(remuw, 0b0111011, 0b111, 0b0000001);
+
+#undef INSN
+
+#define INSN_ENTRY_RELOC(result_type, header)                               \
+  result_type header {                                                      \
+    InstructionMark im(this);                                               \
+    guarantee(rtype == relocInfo::internal_word_type,                       \
+              "only internal_word_type relocs make sense here");            \
+    code_section()->relocate(inst_mark(), InternalAddress(dest).rspec());
+
+  // Load/store register (all modes)
+#define INSN(NAME, op, funct3)                                                                     \
+  void NAME(Register Rd, Register Rs, const int32_t offset) {                                      \
+    guarantee(is_offset_in_range(offset, 12), "offset is invalid.");                               \
+    unsigned insn = 0;                                                                             \
+    int32_t val = offset & 0xfff;                                                                  \
+    patch((address)&insn, 6, 0, op);                                                               \
+    patch((address)&insn, 14, 12, funct3);                                                         \
+    patch_reg((address)&insn, 15, Rs);                                                             \
+    patch_reg((address)&insn, 7, Rd);                                                              \
+    patch((address)&insn, 31, 20, val);                                                            \
+    emit(insn);                                                                                    \
+  }
+
+  INSN(lb,  0b0000011, 0b000);
+  INSN(lbu, 0b0000011, 0b100);
+  INSN(lh,  0b0000011, 0b001);
+  INSN(lhu, 0b0000011, 0b101);
+  INSN(_lw, 0b0000011, 0b010);
+  INSN(lwu, 0b0000011, 0b110);
+  INSN(_ld, 0b0000011, 0b011);
+
+#undef INSN
+
+#define INSN(NAME)                                                                                 \
+  void NAME(Register Rd, address dest) {                                                           \
+    assert_cond(dest != NULL);                                                                     \
+    int64_t distance = (dest - pc());                                                              \
+    if (is_offset_in_range(distance, 32)) {                                                        \
+      auipc(Rd, (int32_t)distance + 0x800);                                                        \
+      NAME(Rd, Rd, ((int32_t)distance << 20) >> 20);                                               \
+    } else {                                                                                       \
+      int32_t offset = 0;                                                                          \
+      movptr_with_offset(Rd, dest, offset);                                                        \
+      NAME(Rd, Rd, offset);                                                                        \
+    }                                                                                              \
+  }                                                                                                \
+  INSN_ENTRY_RELOC(void, NAME(Register Rd, address dest, relocInfo::relocType rtype))              \
+    NAME(Rd, dest);                                                                                \
+  }                                                                                                \
+  void NAME(Register Rd, const Address &adr, Register temp = t0) {                                 \
+    switch (adr.getMode()) {                                                                       \
+      case Address::literal: {                                                                     \
+        code_section()->relocate(pc(), adr.rspec());                                               \
+        NAME(Rd, adr.target());                                                                    \
+        break;                                                                                     \
+      }                                                                                            \
+      case Address::base_plus_offset: {                                                            \
+        if (is_offset_in_range(adr.offset(), 12)) {                                                \
+          NAME(Rd, adr.base(), adr.offset());                                                      \
+        } else {                                                                                   \
+          int32_t offset = 0;                                                                      \
+          if (Rd == adr.base()) {                                                                  \
+            baseOffset32(temp, adr, offset);                                                       \
+            NAME(Rd, temp, offset);                                                                \
+          } else {                                                                                 \
+            baseOffset32(Rd, adr, offset);                                                         \
+            NAME(Rd, Rd, offset);                                                                  \
+          }                                                                                        \
+        }                                                                                          \
+        break;                                                                                     \
+      }                                                                                            \
+      default:                                                                                     \
+        ShouldNotReachHere();                                                                      \
+    }                                                                                              \
+  }                                                                                                \
+  void NAME(Register Rd, Label &L) {                                                               \
+    wrap_label(Rd, L, &Assembler::NAME);                                                           \
+  }
+
+  INSN(lb);
+  INSN(lbu);
+  INSN(lh);
+  INSN(lhu);
+  INSN(lw);
+  INSN(lwu);
+  INSN(ld);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3)                                                                     \
+  void NAME(FloatRegister Rd, Register Rs, const int32_t offset) {                                 \
+    guarantee(is_offset_in_range(offset, 12), "offset is invalid.");                               \
+    unsigned insn = 0;                                                                             \
+    uint32_t val = offset & 0xfff;                                                                 \
+    patch((address)&insn, 6, 0, op);                                                               \
+    patch((address)&insn, 14, 12, funct3);                                                         \
+    patch_reg((address)&insn, 15, Rs);                                                             \
+    patch_reg((address)&insn, 7, Rd);                                                              \
+    patch((address)&insn, 31, 20, val);                                                            \
+    emit(insn);                                                                                    \
+  }
+
+  INSN(flw,  0b0000111, 0b010);
+  INSN(_fld, 0b0000111, 0b011);
+
+#undef INSN
+
+#define INSN(NAME)                                                                                 \
+  void NAME(FloatRegister Rd, address dest, Register temp = t0) {                                  \
+    assert_cond(dest != NULL);                                                                     \
+    int64_t distance = (dest - pc());                                                              \
+    if (is_offset_in_range(distance, 32)) {                                                        \
+      auipc(temp, (int32_t)distance + 0x800);                                                      \
+      NAME(Rd, temp, ((int32_t)distance << 20) >> 20);                                             \
+    } else {                                                                                       \
+      int32_t offset = 0;                                                                          \
+      movptr_with_offset(temp, dest, offset);                                                      \
+      NAME(Rd, temp, offset);                                                                      \
+    }                                                                                              \
+  }                                                                                                \
+  INSN_ENTRY_RELOC(void, NAME(FloatRegister Rd, address dest, relocInfo::relocType rtype, Register temp = t0)) \
+    NAME(Rd, dest, temp);                                                                          \
+  }                                                                                                \
+  void NAME(FloatRegister Rd, const Address &adr, Register temp = t0) {                            \
+    switch (adr.getMode()) {                                                                       \
+      case Address::literal: {                                                                     \
+        code_section()->relocate(pc(), adr.rspec());                                               \
+        NAME(Rd, adr.target(), temp);                                                              \
+        break;                                                                                     \
+      }                                                                                            \
+      case Address::base_plus_offset: {                                                            \
+        if (is_offset_in_range(adr.offset(), 12)) {                                                \
+          NAME(Rd, adr.base(), adr.offset());                                                      \
+        } else {                                                                                   \
+          int32_t offset = 0;                                                                      \
+          baseOffset32(temp, adr, offset);                                                         \
+          NAME(Rd, temp, offset);                                                                  \
+        }                                                                                          \
+        break;                                                                                     \
+      }                                                                                            \
+      default:                                                                                     \
+        ShouldNotReachHere();                                                                      \
+    }                                                                                              \
+  }
+
+  INSN(flw);
+  INSN(fld);
+#undef INSN
+
+#define INSN(NAME, op, funct3)                                                                           \
+  void NAME(Register Rs1, Register Rs2, const int64_t offset) {                                          \
+    guarantee(is_imm_in_range(offset, 12, 1), "offset is invalid.");                                     \
+    unsigned insn = 0;                                                                                   \
+    uint32_t val  = offset & 0x1fff;                                                                     \
+    uint32_t val11 = (val >> 11) & 0x1;                                                                  \
+    uint32_t val12 = (val >> 12) & 0x1;                                                                  \
+    uint32_t low  = (val >> 1) & 0xf;                                                                    \
+    uint32_t high = (val >> 5) & 0x3f;                                                                   \
+    patch((address)&insn, 6, 0, op);                                                                     \
+    patch((address)&insn, 14, 12, funct3);                                                               \
+    patch_reg((address)&insn, 15, Rs1);                                                                  \
+    patch_reg((address)&insn, 20, Rs2);                                                                  \
+    patch((address)&insn, 7, val11);                                                                     \
+    patch((address)&insn, 11, 8, low);                                                                   \
+    patch((address)&insn, 30, 25, high);                                                                 \
+    patch((address)&insn, 31, val12);                                                                    \
+    emit(insn);                                                                                          \
+  }
+
+  INSN(_beq, 0b1100011, 0b000);
+  INSN(_bne, 0b1100011, 0b001);
+  INSN(bge,  0b1100011, 0b101);
+  INSN(bgeu, 0b1100011, 0b111);
+  INSN(blt,  0b1100011, 0b100);
+  INSN(bltu, 0b1100011, 0b110);
+
+#undef INSN
+
+#define INSN(NAME)                                                                                       \
+  void NAME(Register Rs1, Register Rs2, const address dest) {                                            \
+    assert_cond(dest != NULL);                                                                           \
+    int64_t offset = (dest - pc());                                                                      \
+    guarantee(is_imm_in_range(offset, 12, 1), "offset is invalid.");                                     \
+    NAME(Rs1, Rs2, offset);                                                                              \
+  }                                                                                                      \
+  INSN_ENTRY_RELOC(void, NAME(Register Rs1, Register Rs2, address dest, relocInfo::relocType rtype))     \
+    NAME(Rs1, Rs2, dest);                                                                                \
+  }
+
+  INSN(beq);
+  INSN(bne);
+  INSN(bge);
+  INSN(bgeu);
+  INSN(blt);
+  INSN(bltu);
+
+#undef INSN
+
+#define INSN(NAME, NEG_INSN)                                                                \
+  void NAME(Register Rs1, Register Rs2, Label &L, bool is_far = false) {                    \
+    wrap_label(Rs1, Rs2, L, &Assembler::NAME, &Assembler::NEG_INSN, is_far);                \
+  }
+
+  INSN(beq,  bne);
+  INSN(bne,  beq);
+  INSN(blt,  bge);
+  INSN(bge,  blt);
+  INSN(bltu, bgeu);
+  INSN(bgeu, bltu);
+
+#undef INSN
+
+#define INSN(NAME, REGISTER, op, funct3)                                                                    \
+  void NAME(REGISTER Rs1, Register Rs2, const int32_t offset) {                                             \
+    guarantee(is_offset_in_range(offset, 12), "offset is invalid.");                                        \
+    unsigned insn = 0;                                                                                      \
+    uint32_t val  = offset & 0xfff;                                                                         \
+    uint32_t low  = val & 0x1f;                                                                             \
+    uint32_t high = (val >> 5) & 0x7f;                                                                      \
+    patch((address)&insn, 6, 0, op);                                                                        \
+    patch((address)&insn, 14, 12, funct3);                                                                  \
+    patch_reg((address)&insn, 15, Rs2);                                                                     \
+    patch_reg((address)&insn, 20, Rs1);                                                                     \
+    patch((address)&insn, 11, 7, low);                                                                      \
+    patch((address)&insn, 31, 25, high);                                                                    \
+    emit(insn);                                                                                             \
+  }                                                                                                         \
+
+  INSN(sb,   Register,      0b0100011, 0b000);
+  INSN(sh,   Register,      0b0100011, 0b001);
+  INSN(_sw,  Register,      0b0100011, 0b010);
+  INSN(_sd,  Register,      0b0100011, 0b011);
+  INSN(fsw,  FloatRegister, 0b0100111, 0b010);
+  INSN(_fsd, FloatRegister, 0b0100111, 0b011);
+
+#undef INSN
+
+#define INSN(NAME, REGISTER)                                                                                \
+  INSN_ENTRY_RELOC(void, NAME(REGISTER Rs, address dest, relocInfo::relocType rtype, Register temp = t0))   \
+    NAME(Rs, dest, temp);                                                                                   \
+  }
+
+  INSN(sb,  Register);
+  INSN(sh,  Register);
+  INSN(sw,  Register);
+  INSN(sd,  Register);
+  INSN(fsw, FloatRegister);
+  INSN(fsd, FloatRegister);
+
+#undef INSN
+
+#define INSN(NAME)                                                                                 \
+  void NAME(Register Rs, address dest, Register temp = t0) {                                       \
+    assert_cond(dest != NULL);                                                                     \
+    assert_different_registers(Rs, temp);                                                          \
+    int64_t distance = (dest - pc());                                                              \
+    if (is_offset_in_range(distance, 32)) {                                                        \
+      auipc(temp, (int32_t)distance + 0x800);                                                      \
+      NAME(Rs, temp, ((int32_t)distance << 20) >> 20);                                             \
+    } else {                                                                                       \
+      int32_t offset = 0;                                                                          \
+      movptr_with_offset(temp, dest, offset);                                                      \
+      NAME(Rs, temp, offset);                                                                      \
+    }                                                                                              \
+  }                                                                                                \
+  void NAME(Register Rs, const Address &adr, Register temp = t0) {                                 \
+    switch (adr.getMode()) {                                                                       \
+      case Address::literal: {                                                                     \
+        assert_different_registers(Rs, temp);                                                      \
+        code_section()->relocate(pc(), adr.rspec());                                               \
+        NAME(Rs, adr.target(), temp);                                                              \
+        break;                                                                                     \
+      }                                                                                            \
+      case Address::base_plus_offset: {                                                            \
+        if (is_offset_in_range(adr.offset(), 12)) {                                                \
+          NAME(Rs, adr.base(), adr.offset());                                                      \
+        } else {                                                                                   \
+          int32_t offset= 0;                                                                       \
+          assert_different_registers(Rs, temp);                                                    \
+          baseOffset32(temp, adr, offset);                                                         \
+          NAME(Rs, temp, offset);                                                                  \
+        }                                                                                          \
+        break;                                                                                     \
+      }                                                                                            \
+      default:                                                                                     \
+        ShouldNotReachHere();                                                                      \
+    }                                                                                              \
+  }
+
+  INSN(sb);
+  INSN(sh);
+  INSN(sw);
+  INSN(sd);
+
+#undef INSN
+
+#define INSN(NAME)                                                                                 \
+  void NAME(FloatRegister Rs, address dest, Register temp = t0) {                                  \
+    assert_cond(dest != NULL);                                                                     \
+    int64_t distance = (dest - pc());                                                              \
+    if (is_offset_in_range(distance, 32)) {                                                        \
+      auipc(temp, (int32_t)distance + 0x800);                                                      \
+      NAME(Rs, temp, ((int32_t)distance << 20) >> 20);                                             \
+    } else {                                                                                       \
+      int32_t offset = 0;                                                                          \
+      movptr_with_offset(temp, dest, offset);                                                      \
+      NAME(Rs, temp, offset);                                                                      \
+    }                                                                                              \
+  }                                                                                                \
+  void NAME(FloatRegister Rs, const Address &adr, Register temp = t0) {                            \
+    switch (adr.getMode()) {                                                                       \
+      case Address::literal: {                                                                     \
+        code_section()->relocate(pc(), adr.rspec());                                               \
+        NAME(Rs, adr.target(), temp);                                                              \
+        break;                                                                                     \
+      }                                                                                            \
+      case Address::base_plus_offset: {                                                            \
+        if (is_offset_in_range(adr.offset(), 12)) {                                                \
+          NAME(Rs, adr.base(), adr.offset());                                                      \
+        } else {                                                                                   \
+          int32_t offset = 0;                                                                      \
+          baseOffset32(temp, adr, offset);                                                         \
+          NAME(Rs, temp, offset);                                                                  \
+        }                                                                                          \
+        break;                                                                                     \
+      }                                                                                            \
+      default:                                                                                     \
+        ShouldNotReachHere();                                                                      \
+    }                                                                                              \
+  }
+
+  INSN(fsw);
+  INSN(fsd);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3)                                                        \
+  void NAME(Register Rd, const uint32_t csr, Register Rs1) {                          \
+    guarantee(is_unsigned_imm_in_range(csr, 12, 0), "csr is invalid");                \
+    unsigned insn = 0;                                                                \
+    patch((address)&insn, 6, 0, op);                                                  \
+    patch((address)&insn, 14, 12, funct3);                                            \
+    patch_reg((address)&insn, 7, Rd);                                                 \
+    patch_reg((address)&insn, 15, Rs1);                                               \
+    patch((address)&insn, 31, 20, csr);                                               \
+    emit(insn);                                                                       \
+  }
+
+  INSN(csrrw, 0b1110011, 0b001);
+  INSN(csrrs, 0b1110011, 0b010);
+  INSN(csrrc, 0b1110011, 0b011);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3)                                                        \
+  void NAME(Register Rd, const uint32_t csr, const uint32_t uimm) {                   \
+    guarantee(is_unsigned_imm_in_range(csr, 12, 0), "csr is invalid");                \
+    guarantee(is_unsigned_imm_in_range(uimm, 5, 0), "uimm is invalid");               \
+    unsigned insn = 0;                                                                \
+    uint32_t val  = uimm & 0x1f;                                                      \
+    patch((address)&insn, 6, 0, op);                                                  \
+    patch((address)&insn, 14, 12, funct3);                                            \
+    patch_reg((address)&insn, 7, Rd);                                                 \
+    patch((address)&insn, 19, 15, val);                                               \
+    patch((address)&insn, 31, 20, csr);                                               \
+    emit(insn);                                                                       \
+  }
+
+  INSN(csrrwi, 0b1110011, 0b101);
+  INSN(csrrsi, 0b1110011, 0b110);
+  INSN(csrrci, 0b1110011, 0b111);
+
+#undef INSN
+
+#define INSN(NAME, op)                                                                        \
+  void NAME(Register Rd, const int32_t offset) {                                              \
+    guarantee(is_imm_in_range(offset, 20, 1), "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);                                                                               \
+  }
+
+  INSN(_jal, 0b1101111);
+
+#undef INSN
+
+#define INSN(NAME)                                                                            \
+  void NAME(Register Rd, const address dest, Register temp = t0) {                            \
+    assert_cond(dest != NULL);                                                                \
+    int64_t offset = dest - pc();                                                             \
+    if (is_imm_in_range(offset, 20, 1)) {                                                     \
+      NAME(Rd, offset);                                                                       \
+    } else {                                                                                  \
+      assert_different_registers(Rd, temp);                                                   \
+      int32_t off = 0;                                                                        \
+      movptr_with_offset(temp, dest, off);                                                    \
+      jalr(Rd, temp, off);                                                                    \
+    }                                                                                         \
+  }                                                                                           \
+  void NAME(Register Rd, Label &L, Register temp = t0) {                                      \
+    assert_different_registers(Rd, temp);                                                     \
+    wrap_label(Rd, L, temp, &Assembler::NAME);                                                \
+  }
+
+  INSN(jal);
+
+#undef INSN
+
+#undef INSN_ENTRY_RELOC
+
+#define INSN(NAME, op, funct)                                                              \
+  void NAME(Register Rd, Register Rs, const int32_t offset) {                              \
+    guarantee(is_offset_in_range(offset, 12), "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);                                                                            \
+  }
+
+  INSN(_jalr, 0b1100111, 0b000);
+
+#undef INSN
+
+  enum barrier {
+    i = 0b1000, o = 0b0100, r = 0b0010, w = 0b0001,
+    ir = i | r, ow = o | w, iorw = i | o | r | w
+  };
+
+  void fence(const uint32_t predecessor, const uint32_t successor) {
+    unsigned insn = 0;
+    guarantee(predecessor < 16, "predecessor is invalid");
+    guarantee(successor < 16, "successor is invalid");
+    patch((address)&insn, 6, 0, 0b001111);
+    patch((address)&insn, 11, 7, 0b00000);
+    patch((address)&insn, 14, 12, 0b000);
+    patch((address)&insn, 19, 15, 0b00000);
+    patch((address)&insn, 23, 20, successor);
+    patch((address)&insn, 27, 24, predecessor);
+    patch((address)&insn, 31, 28, 0b0000);
+    emit(insn);
+  }
+
+#define INSN(NAME, op, funct3, funct7)                      \
+  void NAME() {                                             \
+    unsigned insn = 0;                                      \
+    patch((address)&insn, 6, 0, op);                        \
+    patch((address)&insn, 11, 7, 0b00000);                  \
+    patch((address)&insn, 14, 12, funct3);                  \
+    patch((address)&insn, 19, 15, 0b00000);                 \
+    patch((address)&insn, 31, 20, funct7);                  \
+    emit(insn);                                             \
+  }
+
+  INSN(fence_i, 0b0001111, 0b001, 0b000000000000);
+  INSN(ecall,   0b1110011, 0b000, 0b000000000000);
+  INSN(_ebreak, 0b1110011, 0b000, 0b000000000001);
+
+#undef INSN
+
+enum Aqrl {relaxed = 0b00, rl = 0b01, aq = 0b10, aqrl = 0b11};
+
+#define INSN(NAME, op, funct3, funct7)                                                  \
+  void NAME(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {        \
+    unsigned insn = 0;                                                                  \
+    patch((address)&insn, 6, 0, op);                                                    \
+    patch((address)&insn, 14, 12, funct3);                                              \
+    patch_reg((address)&insn, 7, Rd);                                                   \
+    patch_reg((address)&insn, 15, Rs1);                                                 \
+    patch_reg((address)&insn, 20, Rs2);                                                 \
+    patch((address)&insn, 31, 27, funct7);                                              \
+    patch((address)&insn, 26, 25, memory_order);                                        \
+    emit(insn);                                                                         \
+  }
+
+  INSN(amoswap_w, 0b0101111, 0b010, 0b00001);
+  INSN(amoadd_w,  0b0101111, 0b010, 0b00000);
+  INSN(amoxor_w,  0b0101111, 0b010, 0b00100);
+  INSN(amoand_w,  0b0101111, 0b010, 0b01100);
+  INSN(amoor_w,   0b0101111, 0b010, 0b01000);
+  INSN(amomin_w,  0b0101111, 0b010, 0b10000);
+  INSN(amomax_w,  0b0101111, 0b010, 0b10100);
+  INSN(amominu_w, 0b0101111, 0b010, 0b11000);
+  INSN(amomaxu_w, 0b0101111, 0b010, 0b11100);
+  INSN(amoswap_d, 0b0101111, 0b011, 0b00001);
+  INSN(amoadd_d,  0b0101111, 0b011, 0b00000);
+  INSN(amoxor_d,  0b0101111, 0b011, 0b00100);
+  INSN(amoand_d,  0b0101111, 0b011, 0b01100);
+  INSN(amoor_d,   0b0101111, 0b011, 0b01000);
+  INSN(amomin_d,  0b0101111, 0b011, 0b10000);
+  INSN(amomax_d , 0b0101111, 0b011, 0b10100);
+  INSN(amominu_d, 0b0101111, 0b011, 0b11000);
+  INSN(amomaxu_d, 0b0101111, 0b011, 0b11100);
+#undef INSN
+
+enum operand_size { int8, int16, int32, uint32, int64 };
+
+#define INSN(NAME, op, funct3, funct7)                                              \
+  void NAME(Register Rd, Register Rs1, Aqrl memory_order = relaxed) {               \
+    unsigned insn = 0;                                                              \
+    uint32_t val = memory_order & 0x3;                                              \
+    patch((address)&insn, 6, 0, op);                                                \
+    patch((address)&insn, 14, 12, funct3);                                          \
+    patch_reg((address)&insn, 7, Rd);                                               \
+    patch_reg((address)&insn, 15, Rs1);                                             \
+    patch((address)&insn, 25, 20, 0b00000);                                         \
+    patch((address)&insn, 31, 27, funct7);                                          \
+    patch((address)&insn, 26, 25, val);                                             \
+    emit(insn);                                                                     \
+  }
+
+  INSN(lr_w, 0b0101111, 0b010, 0b00010);
+  INSN(lr_d, 0b0101111, 0b011, 0b00010);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct7)                                                      \
+  void NAME(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = relaxed) {         \
+    unsigned insn = 0;                                                                      \
+    uint32_t val = memory_order & 0x3;                                                      \
+    patch((address)&insn, 6, 0, op);                                                        \
+    patch((address)&insn, 14, 12, funct3);                                                  \
+    patch_reg((address)&insn, 7, Rd);                                                       \
+    patch_reg((address)&insn, 15, Rs2);                                                     \
+    patch_reg((address)&insn, 20, Rs1);                                                     \
+    patch((address)&insn, 31, 27, funct7);                                                  \
+    patch((address)&insn, 26, 25, val);                                                     \
+    emit(insn);                                                                             \
+  }
+
+  INSN(sc_w, 0b0101111, 0b010, 0b00011);
+  INSN(sc_d, 0b0101111, 0b011, 0b00011);
+#undef INSN
+
+#define INSN(NAME, op, funct5, funct7)                                                      \
+  void NAME(FloatRegister Rd, FloatRegister Rs1, RoundingMode rm = rne) {                   \
+    unsigned insn = 0;                                                                      \
+    patch((address)&insn, 6, 0, op);                                                        \
+    patch((address)&insn, 14, 12, rm);                                                      \
+    patch((address)&insn, 24, 20, funct5);                                                  \
+    patch((address)&insn, 31, 25, funct7);                                                  \
+    patch_reg((address)&insn, 7, Rd);                                                       \
+    patch_reg((address)&insn, 15, Rs1);                                                     \
+    emit(insn);                                                                             \
+  }
+
+  INSN(fsqrt_s,   0b1010011, 0b00000, 0b0101100);
+  INSN(fsqrt_d,   0b1010011, 0b00000, 0b0101101);
+  INSN(fcvt_s_d,  0b1010011, 0b00001, 0b0100000);
+  INSN(fcvt_d_s,  0b1010011, 0b00000, 0b0100001);
+#undef INSN
+
+// Immediate Instruction
+#define INSN(NAME, op, funct3)                                                              \
+  void NAME(Register Rd, Register Rs1, int32_t imm) {                                       \
+    guarantee(is_imm_in_range(imm, 12, 0), "Immediate is out of validity");                 \
+    unsigned insn = 0;                                                                      \
+    patch((address)&insn, 6, 0, op);                                                        \
+    patch((address)&insn, 14, 12, funct3);                                                  \
+    patch((address)&insn, 31, 20, imm & 0x00000fff);                                        \
+    patch_reg((address)&insn, 7, Rd);                                                       \
+    patch_reg((address)&insn, 15, Rs1);                                                     \
+    emit(insn);                                                                             \
+  }
+
+  INSN(_addi,      0b0010011, 0b000);
+  INSN(slti,       0b0010011, 0b010);
+  INSN(_addiw,     0b0011011, 0b000);
+  INSN(_and_imm12, 0b0010011, 0b111);
+  INSN(ori,        0b0010011, 0b110);
+  INSN(xori,       0b0010011, 0b100);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3)                                                              \
+  void NAME(Register Rd, Register Rs1, uint32_t imm) {                                      \
+    guarantee(is_unsigned_imm_in_range(imm, 12, 0), "Immediate is out of validity");        \
+    unsigned insn = 0;                                                                      \
+    patch((address)&insn,6, 0,  op);                                                        \
+    patch((address)&insn, 14, 12, funct3);                                                  \
+    patch((address)&insn, 31, 20, imm & 0x00000fff);                                        \
+    patch_reg((address)&insn, 7, Rd);                                                       \
+    patch_reg((address)&insn, 15, Rs1);                                                     \
+    emit(insn);                                                                             \
+  }
+
+  INSN(sltiu, 0b0010011, 0b011);
+
+#undef INSN
+
+// Shift Immediate Instruction
+#define INSN(NAME, op, funct3, funct6)                                   \
+  void NAME(Register Rd, Register Rs1, unsigned shamt) {                 \
+    guarantee(shamt <= 0x3f, "Shamt is invalid");                        \
+    unsigned insn = 0;                                                   \
+    patch((address)&insn, 6, 0, op);                                     \
+    patch((address)&insn, 14, 12, funct3);                               \
+    patch((address)&insn, 25, 20, shamt);                                \
+    patch((address)&insn, 31, 26, funct6);                               \
+    patch_reg((address)&insn, 7, Rd);                                    \
+    patch_reg((address)&insn, 15, Rs1);                                  \
+    emit(insn);                                                          \
+  }
+
+  INSN(_slli, 0b0010011, 0b001, 0b000000);
+  INSN(_srai, 0b0010011, 0b101, 0b010000);
+  INSN(_srli, 0b0010011, 0b101, 0b000000);
+
+#undef INSN
+
+// Shift Word Immediate Instruction
+#define INSN(NAME, op, funct3, funct7)                                  \
+  void NAME(Register Rd, Register Rs1, unsigned shamt) {                \
+    guarantee(shamt <= 0x1f, "Shamt is invalid");                       \
+    unsigned insn = 0;                                                  \
+    patch((address)&insn, 6, 0, op);                                    \
+    patch((address)&insn, 14, 12, funct3);                              \
+    patch((address)&insn, 24, 20, shamt);                               \
+    patch((address)&insn, 31, 25, funct7);                              \
+    patch_reg((address)&insn, 7, Rd);                                   \
+    patch_reg((address)&insn, 15, Rs1);                                 \
+    emit(insn);                                                         \
+  }
+
+  INSN(slliw, 0b0011011, 0b001, 0b0000000);
+  INSN(sraiw, 0b0011011, 0b101, 0b0100000);
+  INSN(srliw, 0b0011011, 0b101, 0b0000000);
+
+#undef INSN
+
+// Upper Immediate Instruction
+#define INSN(NAME, op)                                                  \
+  void NAME(Register Rd, int32_t imm) {                                 \
+    int32_t upperImm = imm >> 12;                                       \
+    unsigned insn = 0;                                                  \
+    patch((address)&insn, 6, 0, op);                                    \
+    patch_reg((address)&insn, 7, Rd);                                   \
+    upperImm &= 0x000fffff;                                             \
+    patch((address)&insn, 31, 12, upperImm);                            \
+    emit(insn);                                                         \
+  }
+
+  INSN(_lui,  0b0110111);
+  INSN(auipc, 0b0010111);
+
+#undef INSN
+
+// Float and Double Rigster Instruction
+#define INSN(NAME, op, funct2)                                                                                     \
+  void NAME(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, FloatRegister Rs3, RoundingMode rm = rne) {    \
+    unsigned insn = 0;                                                                                             \
+    patch((address)&insn, 6, 0, op);                                                                               \
+    patch((address)&insn, 14, 12, rm);                                                                             \
+    patch((address)&insn, 26, 25, funct2);                                                                         \
+    patch_reg((address)&insn, 7, Rd);                                                                              \
+    patch_reg((address)&insn, 15, Rs1);                                                                            \
+    patch_reg((address)&insn, 20, Rs2);                                                                            \
+    patch_reg((address)&insn, 27, Rs3);                                                                            \
+    emit(insn);                                                                                                    \
+  }
+
+  INSN(fmadd_s,   0b1000011,  0b00);
+  INSN(fmsub_s,   0b1000111,  0b00);
+  INSN(fnmsub_s,  0b1001011,  0b00);
+  INSN(fnmadd_s,  0b1001111,  0b00);
+  INSN(fmadd_d,   0b1000011,  0b01);
+  INSN(fmsub_d,   0b1000111,  0b01);
+  INSN(fnmsub_d,  0b1001011,  0b01);
+  INSN(fnmadd_d,  0b1001111,  0b01);
+
+#undef INSN
+
+// Float and Double Rigster Instruction
+#define INSN(NAME, op, funct3, funct7)                                        \
+  void NAME(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {         \
+    unsigned insn = 0;                                                        \
+    patch((address)&insn, 6, 0, op);                                          \
+    patch((address)&insn, 14, 12, funct3);                                    \
+    patch((address)&insn, 31, 25, funct7);                                    \
+    patch_reg((address)&insn, 7, Rd);                                         \
+    patch_reg((address)&insn, 15, Rs1);                                       \
+    patch_reg((address)&insn, 20, Rs2);                                       \
+    emit(insn);                                                               \
+  }
+
+  INSN(fsgnj_s,  0b1010011, 0b000, 0b0010000);
+  INSN(fsgnjn_s, 0b1010011, 0b001, 0b0010000);
+  INSN(fsgnjx_s, 0b1010011, 0b010, 0b0010000);
+  INSN(fmin_s,   0b1010011, 0b000, 0b0010100);
+  INSN(fmax_s,   0b1010011, 0b001, 0b0010100);
+  INSN(fsgnj_d,  0b1010011, 0b000, 0b0010001);
+  INSN(fsgnjn_d, 0b1010011, 0b001, 0b0010001);
+  INSN(fsgnjx_d, 0b1010011, 0b010, 0b0010001);
+  INSN(fmin_d,   0b1010011, 0b000, 0b0010101);
+  INSN(fmax_d,   0b1010011, 0b001, 0b0010101);
+
+#undef INSN
+
+// Float and Double Rigster Arith Instruction
+#define INSN(NAME, op, funct3, funct7)                                    \
+  void NAME(Register Rd, FloatRegister Rs1, FloatRegister Rs2) {          \
+    unsigned insn = 0;                                                    \
+    patch((address)&insn, 6, 0, op);                                      \
+    patch((address)&insn, 14, 12, funct3);                                \
+    patch((address)&insn, 31, 25, funct7);                                \
+    patch_reg((address)&insn, 7, Rd);                                     \
+    patch_reg((address)&insn, 15, Rs1);                                   \
+    patch_reg((address)&insn, 20, Rs2);                                   \
+    emit(insn);                                                           \
+  }
+
+  INSN(feq_s,    0b1010011, 0b010, 0b1010000);
+  INSN(flt_s,    0b1010011, 0b001, 0b1010000);
+  INSN(fle_s,    0b1010011, 0b000, 0b1010000);
+  INSN(feq_d,    0b1010011, 0b010, 0b1010001);
+  INSN(fle_d,    0b1010011, 0b000, 0b1010001);
+  INSN(flt_d,    0b1010011, 0b001, 0b1010001);
+#undef INSN
+
+// Float and Double Arith Instruction
+#define INSN(NAME, op, funct7)                                                                  \
+  void NAME(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {    \
+    unsigned insn = 0;                                                                          \
+    patch((address)&insn, 6, 0, op);                                                            \
+    patch((address)&insn, 14, 12, rm);                                                          \
+    patch((address)&insn, 31, 25, funct7);                                                      \
+    patch_reg((address)&insn, 7, Rd);                                                           \
+    patch_reg((address)&insn, 15, Rs1);                                                         \
+    patch_reg((address)&insn, 20, Rs2);                                                         \
+    emit(insn);                                                                                 \
+  }
+
+  INSN(fadd_s,   0b1010011, 0b0000000);
+  INSN(fsub_s,   0b1010011, 0b0000100);
+  INSN(fmul_s,   0b1010011, 0b0001000);
+  INSN(fdiv_s,   0b1010011, 0b0001100);
+  INSN(fadd_d,   0b1010011, 0b0000001);
+  INSN(fsub_d,   0b1010011, 0b0000101);
+  INSN(fmul_d,   0b1010011, 0b0001001);
+  INSN(fdiv_d,   0b1010011, 0b0001101);
+
+#undef INSN
+
+// Whole Float and Double Conversion Instruction
+#define INSN(NAME, op, funct5, funct7)                                  \
+  void NAME(FloatRegister Rd, Register Rs1, RoundingMode rm = rne) {    \
+    unsigned insn = 0;                                                  \
+    patch((address)&insn, 6, 0, op);                                    \
+    patch((address)&insn, 14, 12, rm);                                  \
+    patch((address)&insn, 24, 20, funct5);                              \
+    patch((address)&insn, 31, 25, funct7);                              \
+    patch_reg((address)&insn, 7, Rd);                                   \
+    patch_reg((address)&insn, 15, Rs1);                                 \
+    emit(insn);                                                         \
+  }
+
+  INSN(fcvt_s_w,   0b1010011, 0b00000, 0b1101000);
+  INSN(fcvt_s_wu,  0b1010011, 0b00001, 0b1101000);
+  INSN(fcvt_s_l,   0b1010011, 0b00010, 0b1101000);
+  INSN(fcvt_s_lu,  0b1010011, 0b00011, 0b1101000);
+  INSN(fcvt_d_w,   0b1010011, 0b00000, 0b1101001);
+  INSN(fcvt_d_wu,  0b1010011, 0b00001, 0b1101001);
+  INSN(fcvt_d_l,   0b1010011, 0b00010, 0b1101001);
+  INSN(fcvt_d_lu,  0b1010011, 0b00011, 0b1101001);
+
+#undef INSN
+
+// Float and Double Conversion Instruction
+#define INSN(NAME, op, funct5, funct7)                                  \
+  void NAME(Register Rd, FloatRegister Rs1, RoundingMode rm = rtz) {    \
+    unsigned insn = 0;                                                  \
+    patch((address)&insn, 6, 0, op);                                    \
+    patch((address)&insn, 14, 12, rm);                                  \
+    patch((address)&insn, 24, 20, funct5);                              \
+    patch((address)&insn, 31, 25, funct7);                              \
+    patch_reg((address)&insn, 7, Rd);                                   \
+    patch_reg((address)&insn, 15, Rs1);                                 \
+    emit(insn);                                                         \
+  }
+
+  INSN(fcvt_w_s,   0b1010011, 0b00000, 0b1100000);
+  INSN(fcvt_l_s,   0b1010011, 0b00010, 0b1100000);
+  INSN(fcvt_wu_s,  0b1010011, 0b00001, 0b1100000);
+  INSN(fcvt_lu_s,  0b1010011, 0b00011, 0b1100000);
+  INSN(fcvt_w_d,   0b1010011, 0b00000, 0b1100001);
+  INSN(fcvt_wu_d,  0b1010011, 0b00001, 0b1100001);
+  INSN(fcvt_l_d,   0b1010011, 0b00010, 0b1100001);
+  INSN(fcvt_lu_d,  0b1010011, 0b00011, 0b1100001);
+
+#undef INSN
+
+// Float and Double Move Instruction
+#define INSN(NAME, op, funct3, funct5, funct7)       \
+  void NAME(FloatRegister Rd, Register Rs1) {        \
+    unsigned insn = 0;                               \
+    patch((address)&insn, 6, 0, op);                 \
+    patch((address)&insn, 14, 12, funct3);           \
+    patch((address)&insn, 20, funct5);               \
+    patch((address)&insn, 31, 25, funct7);           \
+    patch_reg((address)&insn, 7, Rd);                \
+    patch_reg((address)&insn, 15, Rs1);              \
+    emit(insn);                                      \
+  }
+
+  INSN(fmv_w_x,  0b1010011, 0b000, 0b00000, 0b1111000);
+  INSN(fmv_d_x,  0b1010011, 0b000, 0b00000, 0b1111001);
+
+#undef INSN
+
+// Float and Double Conversion Instruction
+#define INSN(NAME, op, funct3, funct5, funct7)            \
+  void NAME(Register Rd, FloatRegister Rs1) {             \
+    unsigned insn = 0;                                    \
+    patch((address)&insn, 6, 0, op);                      \
+    patch((address)&insn, 14, 12, funct3);                \
+    patch((address)&insn, 20, funct5);                    \
+    patch((address)&insn, 31, 25, funct7);                \
+    patch_reg((address)&insn, 7, Rd);                     \
+    patch_reg((address)&insn, 15, Rs1);                   \
+    emit(insn);                                           \
+  }
+
+  INSN(fclass_s, 0b1010011, 0b001, 0b00000, 0b1110000);
+  INSN(fclass_d, 0b1010011, 0b001, 0b00000, 0b1110001);
+  INSN(fmv_x_w,  0b1010011, 0b000, 0b00000, 0b1110000);
+  INSN(fmv_x_d,  0b1010011, 0b000, 0b00000, 0b1110001);
+
+#undef INSN
+
+// ==========================
+// RISC-V Vector Extension
+// ==========================
+enum SEW {
+  e8,
+  e16,
+  e32,
+  e64,
+  RESERVED,
+};
+
+enum LMUL {
+  mf8 = 0b101,
+  mf4 = 0b110,
+  mf2 = 0b111,
+  m1  = 0b000,
+  m2  = 0b001,
+  m4  = 0b010,
+  m8  = 0b011,
+};
+
+enum VMA {
+  mu, // undisturbed
+  ma, // agnostic
+};
+
+enum VTA {
+  tu, // undisturbed
+  ta, // agnostic
+};
+
+static Assembler::SEW elembytes_to_sew(int ebytes) {
+  assert(ebytes > 0 && ebytes <= 8, "unsupported element size");
+  return (Assembler::SEW) exact_log2(ebytes);
+}
+
+static Assembler::SEW elemtype_to_sew(BasicType etype) {
+  return Assembler::elembytes_to_sew(type2aelembytes(etype));
+}
+
+#define patch_vtype(hsb, lsb, vlmul, vsew, vta, vma, vill)   \
+    if (vill == 1) {                                         \
+      guarantee((vlmul | vsew | vta | vma == 0),             \
+                "the other bits in vtype shall be zero");    \
+    }                                                        \
+    patch((address)&insn, lsb + 2, lsb, vlmul);              \
+    patch((address)&insn, lsb + 5, lsb + 3, vsew);           \
+    patch((address)&insn, lsb + 6, vta);                     \
+    patch((address)&insn, lsb + 7, vma);                     \
+    patch((address)&insn, hsb - 1, lsb + 8, 0);              \
+    patch((address)&insn, hsb, vill)
+
+#define INSN(NAME, op, funct3)                                            \
+  void NAME(Register Rd, Register Rs1, SEW sew, LMUL lmul = m1,           \
+            VMA vma = mu, VTA vta = tu, bool vill = false) {              \
+    unsigned insn = 0;                                                    \
+    patch((address)&insn, 6, 0, op);                                      \
+    patch((address)&insn, 14, 12, funct3);                                \
+    patch_vtype(30, 20, lmul, sew, vta, vma, vill);                       \
+    patch((address)&insn, 31, 0);                                         \
+    patch_reg((address)&insn, 7, Rd);                                     \
+    patch_reg((address)&insn, 15, Rs1);                                   \
+    emit(insn);                                                           \
+  }
+
+  INSN(vsetvli, 0b1010111, 0b111);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3)                                            \
+  void NAME(Register Rd, uint32_t imm, SEW sew, LMUL lmul = m1,           \
+            VMA vma = mu, VTA vta = tu, bool vill = false) {              \
+    unsigned insn = 0;                                                    \
+    guarantee(is_unsigned_imm_in_range(imm, 5, 0), "imm is invalid");     \
+    patch((address)&insn, 6, 0, op);                                      \
+    patch((address)&insn, 14, 12, funct3);                                \
+    patch((address)&insn, 19, 15, imm);                                   \
+    patch_vtype(29, 20, lmul, sew, vta, vma, vill);                       \
+    patch((address)&insn, 31, 30, 0b11);                                  \
+    patch_reg((address)&insn, 7, Rd);                                     \
+    emit(insn);                                                           \
+  }
+
+  INSN(vsetivli, 0b1010111, 0b111);
+
+#undef INSN
+
+#undef patch_vtype
+
+#define INSN(NAME, op, funct3, funct7)                          \
+  void NAME(Register Rd, Register Rs1, Register Rs2) {          \
+    unsigned insn = 0;                                          \
+    patch((address)&insn, 6,  0, op);                           \
+    patch((address)&insn, 14, 12, funct3);                      \
+    patch((address)&insn, 31, 25, funct7);                      \
+    patch_reg((address)&insn, 7, Rd);                           \
+    patch_reg((address)&insn, 15, Rs1);                         \
+    patch_reg((address)&insn, 20, Rs2);                         \
+    emit(insn);                                                 \
+  }
+
+  // Vector Configuration Instruction
+  INSN(vsetvl, 0b1010111, 0b111, 0b1000000);
+
+#undef INSN
+
+enum VectorMask {
+  v0_t = 0b0,
+  unmasked = 0b1
+};
+
+#define patch_VArith(op, Reg, funct3, Reg_or_Imm5, Vs2, vm, funct6)            \
+    unsigned insn = 0;                                                         \
+    patch((address)&insn, 6, 0, op);                                           \
+    patch((address)&insn, 14, 12, funct3);                                     \
+    patch((address)&insn, 19, 15, Reg_or_Imm5);                                \
+    patch((address)&insn, 25, vm);                                             \
+    patch((address)&insn, 31, 26, funct6);                                     \
+    patch_reg((address)&insn, 7, Reg);                                         \
+    patch_reg((address)&insn, 20, Vs2);                                        \
+    emit(insn)
+
+// r2_vm
+#define INSN(NAME, op, funct3, Vs1, funct6)                                    \
+  void NAME(Register Rd, VectorRegister Vs2, VectorMask vm = unmasked) {       \
+    patch_VArith(op, Rd, funct3, Vs1, Vs2, vm, funct6);                        \
+  }
+
+  // Vector Mask
+  INSN(vpopc_m,  0b1010111, 0b010, 0b10000, 0b010000);
+  INSN(vfirst_m, 0b1010111, 0b010, 0b10001, 0b010000);
+#undef INSN
+
+#define INSN(NAME, op, funct3, Vs1, funct6)                                    \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, VectorMask vm = unmasked) { \
+    patch_VArith(op, Vd, funct3, Vs1, Vs2, vm, funct6);                        \
+  }
+
+  // Vector Integer Extension
+  INSN(vzext_vf2, 0b1010111, 0b010, 0b00110, 0b010010);
+  INSN(vzext_vf4, 0b1010111, 0b010, 0b00100, 0b010010);
+  INSN(vzext_vf8, 0b1010111, 0b010, 0b00010, 0b010010);
+  INSN(vsext_vf2, 0b1010111, 0b010, 0b00111, 0b010010);
+  INSN(vsext_vf4, 0b1010111, 0b010, 0b00101, 0b010010);
+  INSN(vsext_vf8, 0b1010111, 0b010, 0b00011, 0b010010);
+
+  // Vector Mask
+  INSN(vmsbf_m,   0b1010111, 0b010, 0b00001, 0b010100);
+  INSN(vmsif_m,   0b1010111, 0b010, 0b00011, 0b010100);
+  INSN(vmsof_m,   0b1010111, 0b010, 0b00010, 0b010100);
+  INSN(viota_m,   0b1010111, 0b010, 0b10000, 0b010100);
+
+  // Vector Single-Width Floating-Point/Integer Type-Convert Instructions
+  INSN(vfcvt_xu_f_v, 0b1010111, 0b001, 0b00000, 0b010010);
+  INSN(vfcvt_x_f_v,  0b1010111, 0b001, 0b00001, 0b010010);
+  INSN(vfcvt_f_xu_v, 0b1010111, 0b001, 0b00010, 0b010010);
+  INSN(vfcvt_f_x_v,  0b1010111, 0b001, 0b00011, 0b010010);
+  INSN(vfcvt_rtz_xu_f_v, 0b1010111, 0b001, 0b00110, 0b010010);
+  INSN(vfcvt_rtz_x_f_v,  0b1010111, 0b001, 0b00111, 0b010010);
+
+  // Vector Floating-Point Instruction
+  INSN(vfsqrt_v,  0b1010111, 0b001, 0b00000, 0b010011);
+  INSN(vfclass_v, 0b1010111, 0b001, 0b10000, 0b010011);
+
+#undef INSN
+
+// r2rd
+#define INSN(NAME, op, funct3, simm5, vm, funct6)         \
+  void NAME(VectorRegister Vd, VectorRegister Vs2) {      \
+    patch_VArith(op, Vd, funct3, simm5, Vs2, vm, funct6); \
+  }
+
+  // Vector Whole Vector Register Move
+  INSN(vmv1r_v, 0b1010111, 0b011, 0b00000, 0b1, 0b100111);
+  INSN(vmv2r_v, 0b1010111, 0b011, 0b00001, 0b1, 0b100111);
+  INSN(vmv4r_v, 0b1010111, 0b011, 0b00011, 0b1, 0b100111);
+  INSN(vmv8r_v, 0b1010111, 0b011, 0b00111, 0b1, 0b100111);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, Vs1, vm, funct6)           \
+  void NAME(FloatRegister Rd, VectorRegister Vs2) {       \
+    patch_VArith(op, Rd, funct3, Vs1, Vs2, vm, funct6);   \
+  }
+
+  // Vector Floating-Point Move Instruction
+  INSN(vfmv_f_s, 0b1010111, 0b001, 0b00000, 0b1, 0b010000);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, Vs1, vm, funct6)          \
+  void NAME(Register Rd, VectorRegister Vs2) {           \
+    patch_VArith(op, Rd, funct3, Vs1, Vs2, vm, funct6);  \
+  }
+
+  // Vector Integer Scalar Move Instructions
+  INSN(vmv_x_s, 0b1010111, 0b010, 0b00000, 0b1, 0b010000);
+
+#undef INSN
+
+// r_vm
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, uint32_t imm, VectorMask vm = unmasked) {       \
+    guarantee(is_unsigned_imm_in_range(imm, 5, 0), "imm is invalid");                              \
+    patch_VArith(op, Vd, funct3, (uint32_t)(imm & 0x1f), Vs2, vm, funct6);                         \
+  }
+
+  // Vector Single-Width Bit Shift Instructions
+  INSN(vsra_vi,    0b1010111, 0b011, 0b101001);
+  INSN(vsrl_vi,    0b1010111, 0b011, 0b101000);
+  INSN(vsll_vi,    0b1010111, 0b011, 0b100101);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, VectorRegister Vs1, VectorRegister Vs2, VectorMask vm = unmasked) { \
+    patch_VArith(op, Vd, funct3, Vs1->encoding_nocheck(), Vs2, vm, funct6);                        \
+  }
+
+  // Vector Single-Width Floating-Point Fused Multiply-Add Instructions
+  INSN(vfnmsub_vv, 0b1010111, 0b001, 0b101011);
+  INSN(vfmsub_vv,  0b1010111, 0b001, 0b101010);
+  INSN(vfnmadd_vv, 0b1010111, 0b001, 0b101001);
+  INSN(vfmadd_vv,  0b1010111, 0b001, 0b101000);
+  INSN(vfnmsac_vv, 0b1010111, 0b001, 0b101111);
+  INSN(vfmsac_vv,  0b1010111, 0b001, 0b101110);
+  INSN(vfmacc_vv,  0b1010111, 0b001, 0b101100);
+  INSN(vfnmacc_vv, 0b1010111, 0b001, 0b101101);
+
+  // Vector Single-Width Integer Multiply-Add Instructions
+  INSN(vnmsub_vv, 0b1010111, 0b010, 0b101011);
+  INSN(vmadd_vv,  0b1010111, 0b010, 0b101001);
+  INSN(vnmsac_vv, 0b1010111, 0b010, 0b101111);
+  INSN(vmacc_vv,  0b1010111, 0b010, 0b101101);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, Register Rs1, VectorRegister Vs2, VectorMask vm = unmasked) {       \
+    patch_VArith(op, Vd, funct3, Rs1->encoding_nocheck(), Vs2, vm, funct6);                        \
+  }
+
+  // Vector Single-Width Integer Multiply-Add Instructions
+  INSN(vnmsub_vx, 0b1010111, 0b110, 0b101011);
+  INSN(vmadd_vx,  0b1010111, 0b110, 0b101001);
+  INSN(vnmsac_vx, 0b1010111, 0b110, 0b101111);
+  INSN(vmacc_vx,  0b1010111, 0b110, 0b101101);
+
+  INSN(vrsub_vx,  0b1010111, 0b100, 0b000011);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, FloatRegister Rs1, VectorRegister Vs2, VectorMask vm = unmasked) {  \
+    patch_VArith(op, Vd, funct3, Rs1->encoding_nocheck(), Vs2, vm, funct6);                        \
+  }
+
+  // Vector Single-Width Floating-Point Fused Multiply-Add Instructions
+  INSN(vfnmsub_vf, 0b1010111, 0b101, 0b101011);
+  INSN(vfmsub_vf,  0b1010111, 0b101, 0b101010);
+  INSN(vfnmadd_vf, 0b1010111, 0b101, 0b101001);
+  INSN(vfmadd_vf,  0b1010111, 0b101, 0b101000);
+  INSN(vfnmsac_vf, 0b1010111, 0b101, 0b101111);
+  INSN(vfmsac_vf,  0b1010111, 0b101, 0b101110);
+  INSN(vfmacc_vf,  0b1010111, 0b101, 0b101100);
+  INSN(vfnmacc_vf, 0b1010111, 0b101, 0b101101);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, VectorRegister Vs1, VectorMask vm = unmasked) { \
+    patch_VArith(op, Vd, funct3, Vs1->encoding_nocheck(), Vs2, vm, funct6);                        \
+  }
+
+  // Vector Single-Width Floating-Point Reduction Instructions
+  INSN(vfredsum_vs,   0b1010111, 0b001, 0b000001);
+  INSN(vfredosum_vs,  0b1010111, 0b001, 0b000011);
+  INSN(vfredmin_vs,   0b1010111, 0b001, 0b000101);
+  INSN(vfredmax_vs,   0b1010111, 0b001, 0b000111);
+
+  // Vector Single-Width Integer Reduction Instructions
+  INSN(vredsum_vs,    0b1010111, 0b010, 0b000000);
+  INSN(vredand_vs,    0b1010111, 0b010, 0b000001);
+  INSN(vredor_vs,     0b1010111, 0b010, 0b000010);
+  INSN(vredxor_vs,    0b1010111, 0b010, 0b000011);
+  INSN(vredminu_vs,   0b1010111, 0b010, 0b000100);
+  INSN(vredmin_vs,    0b1010111, 0b010, 0b000101);
+  INSN(vredmaxu_vs,   0b1010111, 0b010, 0b000110);
+  INSN(vredmax_vs,    0b1010111, 0b010, 0b000111);
+
+  // Vector Floating-Point Compare Instructions
+  INSN(vmfle_vv, 0b1010111, 0b001, 0b011001);
+  INSN(vmflt_vv, 0b1010111, 0b001, 0b011011);
+  INSN(vmfne_vv, 0b1010111, 0b001, 0b011100);
+  INSN(vmfeq_vv, 0b1010111, 0b001, 0b011000);
+
+  // Vector Floating-Point Sign-Injection Instructions
+  INSN(vfsgnjx_vv, 0b1010111, 0b001, 0b001010);
+  INSN(vfsgnjn_vv, 0b1010111, 0b001, 0b001001);
+  INSN(vfsgnj_vv,  0b1010111, 0b001, 0b001000);
+
+  // Vector Floating-Point MIN/MAX Instructions
+  INSN(vfmax_vv,   0b1010111, 0b001, 0b000110);
+  INSN(vfmin_vv,   0b1010111, 0b001, 0b000100);
+
+  // Vector Single-Width Floating-Point Multiply/Divide Instructions
+  INSN(vfdiv_vv,   0b1010111, 0b001, 0b100000);
+  INSN(vfmul_vv,   0b1010111, 0b001, 0b100100);
+
+  // Vector Single-Width Floating-Point Add/Subtract Instructions
+  INSN(vfsub_vv, 0b1010111, 0b001, 0b000010);
+  INSN(vfadd_vv, 0b1010111, 0b001, 0b000000);
+
+  // Vector Single-Width Fractional Multiply with Rounding and Saturation
+  INSN(vsmul_vv, 0b1010111, 0b000, 0b100111);
+
+  // Vector Integer Divide Instructions
+  INSN(vrem_vv,  0b1010111, 0b010, 0b100011);
+  INSN(vremu_vv, 0b1010111, 0b010, 0b100010);
+  INSN(vdiv_vv,  0b1010111, 0b010, 0b100001);
+  INSN(vdivu_vv, 0b1010111, 0b010, 0b100000);
+
+  // Vector Single-Width Integer Multiply Instructions
+  INSN(vmulhsu_vv, 0b1010111, 0b010, 0b100110);
+  INSN(vmulhu_vv,  0b1010111, 0b010, 0b100100);
+  INSN(vmulh_vv,   0b1010111, 0b010, 0b100111);
+  INSN(vmul_vv,    0b1010111, 0b010, 0b100101);
+
+  // Vector Integer Min/Max Instructions
+  INSN(vmax_vv,  0b1010111, 0b000, 0b000111);
+  INSN(vmaxu_vv, 0b1010111, 0b000, 0b000110);
+  INSN(vmin_vv,  0b1010111, 0b000, 0b000101);
+  INSN(vminu_vv, 0b1010111, 0b000, 0b000100);
+
+  // Vector Integer Comparison Instructions
+  INSN(vmsle_vv,  0b1010111, 0b000, 0b011101);
+  INSN(vmsleu_vv, 0b1010111, 0b000, 0b011100);
+  INSN(vmslt_vv,  0b1010111, 0b000, 0b011011);
+  INSN(vmsltu_vv, 0b1010111, 0b000, 0b011010);
+  INSN(vmsne_vv,  0b1010111, 0b000, 0b011001);
+  INSN(vmseq_vv,  0b1010111, 0b000, 0b011000);
+
+  // Vector Single-Width Bit Shift Instructions
+  INSN(vsra_vv, 0b1010111, 0b000, 0b101001);
+  INSN(vsrl_vv, 0b1010111, 0b000, 0b101000);
+  INSN(vsll_vv, 0b1010111, 0b000, 0b100101);
+
+  // Vector Bitwise Logical Instructions
+  INSN(vxor_vv, 0b1010111, 0b000, 0b001011);
+  INSN(vor_vv,  0b1010111, 0b000, 0b001010);
+  INSN(vand_vv, 0b1010111, 0b000, 0b001001);
+
+  // Vector Single-Width Integer Add and Subtract
+  INSN(vsub_vv, 0b1010111, 0b000, 0b000010);
+  INSN(vadd_vv, 0b1010111, 0b000, 0b000000);
+
+#undef INSN
+
+
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, Register Rs1, VectorMask vm = unmasked) {       \
+    patch_VArith(op, Vd, funct3, Rs1->encoding_nocheck(), Vs2, vm, funct6);                        \
+  }
+
+  // Vector Integer Divide Instructions
+  INSN(vrem_vx,  0b1010111, 0b110, 0b100011);
+  INSN(vremu_vx, 0b1010111, 0b110, 0b100010);
+  INSN(vdiv_vx,  0b1010111, 0b110, 0b100001);
+  INSN(vdivu_vx, 0b1010111, 0b110, 0b100000);
+
+  // Vector Single-Width Integer Multiply Instructions
+  INSN(vmulhsu_vx, 0b1010111, 0b110, 0b100110);
+  INSN(vmulhu_vx,  0b1010111, 0b110, 0b100100);
+  INSN(vmulh_vx,   0b1010111, 0b110, 0b100111);
+  INSN(vmul_vx,    0b1010111, 0b110, 0b100101);
+
+  // Vector Integer Min/Max Instructions
+  INSN(vmax_vx,  0b1010111, 0b100, 0b000111);
+  INSN(vmaxu_vx, 0b1010111, 0b100, 0b000110);
+  INSN(vmin_vx,  0b1010111, 0b100, 0b000101);
+  INSN(vminu_vx, 0b1010111, 0b100, 0b000100);
+
+  // Vector Integer Comparison Instructions
+  INSN(vmsgt_vx,  0b1010111, 0b100, 0b011111);
+  INSN(vmsgtu_vx, 0b1010111, 0b100, 0b011110);
+  INSN(vmsle_vx,  0b1010111, 0b100, 0b011101);
+  INSN(vmsleu_vx, 0b1010111, 0b100, 0b011100);
+  INSN(vmslt_vx,  0b1010111, 0b100, 0b011011);
+  INSN(vmsltu_vx, 0b1010111, 0b100, 0b011010);
+  INSN(vmsne_vx,  0b1010111, 0b100, 0b011001);
+  INSN(vmseq_vx,  0b1010111, 0b100, 0b011000);
+
+  // Vector Narrowing Integer Right Shift Instructions
+  INSN(vnsra_wx, 0b1010111, 0b100, 0b101101);
+  INSN(vnsrl_wx, 0b1010111, 0b100, 0b101100);
+
+  // Vector Single-Width Bit Shift Instructions
+  INSN(vsra_vx, 0b1010111, 0b100, 0b101001);
+  INSN(vsrl_vx, 0b1010111, 0b100, 0b101000);
+  INSN(vsll_vx, 0b1010111, 0b100, 0b100101);
+
+  // Vector Bitwise Logical Instructions
+  INSN(vxor_vx, 0b1010111, 0b100, 0b001011);
+  INSN(vor_vx,  0b1010111, 0b100, 0b001010);
+  INSN(vand_vx, 0b1010111, 0b100, 0b001001);
+
+  // Vector Single-Width Integer Add and Subtract
+  INSN(vsub_vx, 0b1010111, 0b100, 0b000010);
+  INSN(vadd_vx, 0b1010111, 0b100, 0b000000);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, FloatRegister Rs1, VectorMask vm = unmasked) {  \
+    patch_VArith(op, Vd, funct3, Rs1->encoding_nocheck(), Vs2, vm, funct6);                        \
+  }
+
+  // Vector Floating-Point Compare Instructions
+  INSN(vmfge_vf, 0b1010111, 0b101, 0b011111);
+  INSN(vmfgt_vf, 0b1010111, 0b101, 0b011101);
+  INSN(vmfle_vf, 0b1010111, 0b101, 0b011001);
+  INSN(vmflt_vf, 0b1010111, 0b101, 0b011011);
+  INSN(vmfne_vf, 0b1010111, 0b101, 0b011100);
+  INSN(vmfeq_vf, 0b1010111, 0b101, 0b011000);
+
+  // Vector Floating-Point Sign-Injection Instructions
+  INSN(vfsgnjx_vf, 0b1010111, 0b101, 0b001010);
+  INSN(vfsgnjn_vf, 0b1010111, 0b101, 0b001001);
+  INSN(vfsgnj_vf,  0b1010111, 0b101, 0b001000);
+
+  // Vector Floating-Point MIN/MAX Instructions
+  INSN(vfmax_vf, 0b1010111, 0b101, 0b000110);
+  INSN(vfmin_vf, 0b1010111, 0b101, 0b000100);
+
+  // Vector Single-Width Floating-Point Multiply/Divide Instructions
+  INSN(vfdiv_vf,  0b1010111, 0b101, 0b100000);
+  INSN(vfmul_vf,  0b1010111, 0b101, 0b100100);
+  INSN(vfrdiv_vf, 0b1010111, 0b101, 0b100001);
+
+  // Vector Single-Width Floating-Point Add/Subtract Instructions
+  INSN(vfsub_vf,  0b1010111, 0b101, 0b000010);
+  INSN(vfadd_vf,  0b1010111, 0b101, 0b000000);
+  INSN(vfrsub_vf, 0b1010111, 0b101, 0b100111);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, int32_t imm, VectorMask vm = unmasked) {        \
+    guarantee(is_imm_in_range(imm, 5, 0), "imm is invalid");                                       \
+    patch_VArith(op, Vd, funct3, (uint32_t)imm & 0x1f, Vs2, vm, funct6);                           \
+  }
+
+  INSN(vmsgt_vi,  0b1010111, 0b011, 0b011111);
+  INSN(vmsgtu_vi, 0b1010111, 0b011, 0b011110);
+  INSN(vmsle_vi,  0b1010111, 0b011, 0b011101);
+  INSN(vmsleu_vi, 0b1010111, 0b011, 0b011100);
+  INSN(vmsne_vi,  0b1010111, 0b011, 0b011001);
+  INSN(vmseq_vi,  0b1010111, 0b011, 0b011000);
+  INSN(vxor_vi,   0b1010111, 0b011, 0b001011);
+  INSN(vor_vi,    0b1010111, 0b011, 0b001010);
+  INSN(vand_vi,   0b1010111, 0b011, 0b001001);
+  INSN(vadd_vi,   0b1010111, 0b011, 0b000000);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct6)                                                             \
+  void NAME(VectorRegister Vd, int32_t imm, VectorRegister Vs2, VectorMask vm = unmasked) {        \
+    guarantee(is_imm_in_range(imm, 5, 0), "imm is invalid");                                       \
+    patch_VArith(op, Vd, funct3, (uint32_t)(imm & 0x1f), Vs2, vm, funct6);                         \
+  }
+
+  INSN(vrsub_vi, 0b1010111, 0b011, 0b000011);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, vm, funct6)                                   \
+  void NAME(VectorRegister Vd, VectorRegister Vs2, VectorRegister Vs1) {     \
+    patch_VArith(op, Vd, funct3, Vs1->encoding_nocheck(), Vs2, vm, funct6);  \
+  }
+
+  // Vector Compress Instruction
+  INSN(vcompress_vm, 0b1010111, 0b010, 0b1, 0b010111);
+
+  // Vector Mask-Register Logical Instructions
+  INSN(vmxnor_mm,   0b1010111, 0b010, 0b1, 0b011111);
+  INSN(vmornot_mm,  0b1010111, 0b010, 0b1, 0b011100);
+  INSN(vmnor_mm,    0b1010111, 0b010, 0b1, 0b011110);
+  INSN(vmor_mm,     0b1010111, 0b010, 0b1, 0b011010);
+  INSN(vmxor_mm,    0b1010111, 0b010, 0b1, 0b011011);
+  INSN(vmandnot_mm, 0b1010111, 0b010, 0b1, 0b011000);
+  INSN(vmnand_mm,   0b1010111, 0b010, 0b1, 0b011101);
+  INSN(vmand_mm,    0b1010111, 0b010, 0b1, 0b011001);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, Vs2, vm, funct6)                            \
+  void NAME(VectorRegister Vd, int32_t imm) {                              \
+    guarantee(is_imm_in_range(imm, 5, 0), "imm is invalid");               \
+    patch_VArith(op, Vd, funct3, (uint32_t)(imm & 0x1f), Vs2, vm, funct6); \
+  }
+
+  // Vector Integer Move Instructions
+  INSN(vmv_v_i, 0b1010111, 0b011, v0, 0b1, 0b010111);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, Vs2, vm, funct6)                             \
+  void NAME(VectorRegister Vd, FloatRegister Rs1) {                         \
+    patch_VArith(op, Vd, funct3, Rs1->encoding_nocheck(), Vs2, vm, funct6); \
+  }
+
+  // Floating-Point Scalar Move Instructions
+  INSN(vfmv_s_f, 0b1010111, 0b101, v0, 0b1, 0b010000);
+  // Vector Floating-Point Move Instruction
+  INSN(vfmv_v_f, 0b1010111, 0b101, v0, 0b1, 0b010111);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, Vs2, vm, funct6)                             \
+  void NAME(VectorRegister Vd, VectorRegister Vs1) {                        \
+    patch_VArith(op, Vd, funct3, Vs1->encoding_nocheck(), Vs2, vm, funct6); \
+  }
+
+  // Vector Integer Move Instructions
+  INSN(vmv_v_v, 0b1010111, 0b000, v0, 0b1, 0b010111);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, Vs2, vm, funct6)                             \
+   void NAME(VectorRegister Vd, Register Rs1) {                             \
+    patch_VArith(op, Vd, funct3, Rs1->encoding_nocheck(), Vs2, vm, funct6); \
+   }
+
+  // Integer Scalar Move Instructions
+  INSN(vmv_s_x, 0b1010111, 0b110, v0, 0b1, 0b010000);
+
+  // Vector Integer Move Instructions
+  INSN(vmv_v_x, 0b1010111, 0b100, v0, 0b1, 0b010111);
+
+#undef INSN
+#undef patch_VArith
+
+#define INSN(NAME, op, funct13, funct6)                    \
+  void NAME(VectorRegister Vd, VectorMask vm = unmasked) { \
+    unsigned insn = 0;                                     \
+    patch((address)&insn, 6, 0, op);                       \
+    patch((address)&insn, 24, 12, funct13);                \
+    patch((address)&insn, 25, vm);                         \
+    patch((address)&insn, 31, 26, funct6);                 \
+    patch_reg((address)&insn, 7, Vd);                      \
+    emit(insn);                                            \
+  }
+
+  // Vector Element Index Instruction
+  INSN(vid_v, 0b1010111, 0b0000010001010, 0b010100);
+
+#undef INSN
+
+enum Nf {
+  g1 = 0b000,
+  g2 = 0b001,
+  g3 = 0b010,
+  g4 = 0b011,
+  g5 = 0b100,
+  g6 = 0b101,
+  g7 = 0b110,
+  g8 = 0b111
+};
+
+#define patch_VLdSt(op, VReg, width, Rs1, Reg_or_umop, vm, mop, mew, nf) \
+    unsigned insn = 0;                                                   \
+    patch((address)&insn, 6, 0, op);                                     \
+    patch((address)&insn, 14, 12, width);                                \
+    patch((address)&insn, 24, 20, Reg_or_umop);                          \
+    patch((address)&insn, 25, vm);                                       \
+    patch((address)&insn, 27, 26, mop);                                  \
+    patch((address)&insn, 28, mew);                                      \
+    patch((address)&insn, 31, 29, nf);                                   \
+    patch_reg((address)&insn, 7, VReg);                                  \
+    patch_reg((address)&insn, 15, Rs1);                                  \
+    emit(insn)
+
+#define INSN(NAME, op, lumop, vm, mop, nf)                                           \
+  void NAME(VectorRegister Vd, Register Rs1, uint32_t width = 0, bool mew = false) { \
+    guarantee(is_unsigned_imm_in_range(width, 3, 0), "width is invalid");            \
+    patch_VLdSt(op, Vd, width, Rs1, lumop, vm, mop, mew, nf);                        \
+  }
+
+  // Vector Load/Store Instructions
+  INSN(vl1r_v, 0b0000111, 0b01000, 0b1, 0b00, g1);
+
+#undef INSN
+
+#define INSN(NAME, op, width, sumop, vm, mop, mew, nf)           \
+  void NAME(VectorRegister Vs3, Register Rs1) {                  \
+    patch_VLdSt(op, Vs3, width, Rs1, sumop, vm, mop, mew, nf);   \
+  }
+
+  // Vector Load/Store Instructions
+  INSN(vs1r_v, 0b0100111, 0b000, 0b01000, 0b1, 0b00, 0b0, g1);
+
+#undef INSN
+
+// r2_nfvm
+#define INSN(NAME, op, width, umop, mop, mew)                         \
+  void NAME(VectorRegister Vd_or_Vs3, Register Rs1, Nf nf = g1) {     \
+    patch_VLdSt(op, Vd_or_Vs3, width, Rs1, umop, 1, mop, mew, nf);    \
+  }
+
+  // Vector Unit-Stride Instructions
+  INSN(vle1_v, 0b0000111, 0b000, 0b01011, 0b00, 0b0);
+  INSN(vse1_v, 0b0100111, 0b000, 0b01011, 0b00, 0b0);
+
+#undef INSN
+
+#define INSN(NAME, op, width, umop, mop, mew)                                               \
+  void NAME(VectorRegister Vd_or_Vs3, Register Rs1, VectorMask vm = unmasked, Nf nf = g1) { \
+    patch_VLdSt(op, Vd_or_Vs3, width, Rs1, umop, vm, mop, mew, nf);                         \
+  }
+
+  // Vector Unit-Stride Instructions
+  INSN(vle8_v,    0b0000111, 0b000, 0b00000, 0b00, 0b0);
+  INSN(vle16_v,   0b0000111, 0b101, 0b00000, 0b00, 0b0);
+  INSN(vle32_v,   0b0000111, 0b110, 0b00000, 0b00, 0b0);
+  INSN(vle64_v,   0b0000111, 0b111, 0b00000, 0b00, 0b0);
+
+  // Vector unit-stride fault-only-first Instructions
+  INSN(vle8ff_v,  0b0000111, 0b000, 0b10000, 0b00, 0b0);
+  INSN(vle16ff_v, 0b0000111, 0b101, 0b10000, 0b00, 0b0);
+  INSN(vle32ff_v, 0b0000111, 0b110, 0b10000, 0b00, 0b0);
+  INSN(vle64ff_v, 0b0000111, 0b111, 0b10000, 0b00, 0b0);
+
+  INSN(vse8_v,  0b0100111, 0b000, 0b00000, 0b00, 0b0);
+  INSN(vse16_v, 0b0100111, 0b101, 0b00000, 0b00, 0b0);
+  INSN(vse32_v, 0b0100111, 0b110, 0b00000, 0b00, 0b0);
+  INSN(vse64_v, 0b0100111, 0b111, 0b00000, 0b00, 0b0);
+
+#undef INSN
+
+#define INSN(NAME, op, width, mop, mew)                                                                  \
+  void NAME(VectorRegister Vd, Register Rs1, VectorRegister Vs2, VectorMask vm = unmasked, Nf nf = g1) { \
+    patch_VLdSt(op, Vd, width, Rs1, Vs2->encoding_nocheck(), vm, mop, mew, nf);                          \
+  }
+
+  // Vector unordered indexed load instructions
+  INSN(vluxei8_v,  0b0000111, 0b000, 0b01, 0b0);
+  INSN(vluxei16_v, 0b0000111, 0b101, 0b01, 0b0);
+  INSN(vluxei32_v, 0b0000111, 0b110, 0b01, 0b0);
+  INSN(vluxei64_v, 0b0000111, 0b111, 0b01, 0b0);
+
+  // Vector ordered indexed load instructions
+  INSN(vloxei8_v,  0b0000111, 0b000, 0b11, 0b0);
+  INSN(vloxei16_v, 0b0000111, 0b101, 0b11, 0b0);
+  INSN(vloxei32_v, 0b0000111, 0b110, 0b11, 0b0);
+  INSN(vloxei64_v, 0b0000111, 0b111, 0b11, 0b0);
+#undef INSN
+
+#define INSN(NAME, op, width, mop, mew)                                                                  \
+  void NAME(VectorRegister Vd, Register Rs1, Register Rs2, VectorMask vm = unmasked, Nf nf = g1) {       \
+    patch_VLdSt(op, Vd, width, Rs1, Rs2->encoding_nocheck(), vm, mop, mew, nf);                          \
+  }
+
+  // Vector Strided Instructions
+  INSN(vlse8_v,  0b0000111, 0b000, 0b10, 0b0);
+  INSN(vlse16_v, 0b0000111, 0b101, 0b10, 0b0);
+  INSN(vlse32_v, 0b0000111, 0b110, 0b10, 0b0);
+  INSN(vlse64_v, 0b0000111, 0b111, 0b10, 0b0);
+
+#undef INSN
+#undef patch_VLdSt
+
+// ====================================
+// RISC-V Bit-Manipulation Extension
+// ====================================
+#define INSN(NAME, op, funct3, funct7)                  \
+  void NAME(Register Rd, Register Rs1, Register Rs2) {  \
+    unsigned insn = 0;                                  \
+    patch((address)&insn, 6,  0, op);                   \
+    patch((address)&insn, 14, 12, funct3);              \
+    patch((address)&insn, 31, 25, funct7);              \
+    patch_reg((address)&insn, 7, Rd);                   \
+    patch_reg((address)&insn, 15, Rs1);                 \
+    patch_reg((address)&insn, 20, Rs2);                 \
+    emit(insn);                                         \
+  }
+
+  INSN(add_uw,    0b0111011, 0b000, 0b0000100);
+  INSN(rol,       0b0110011, 0b001, 0b0110000);
+  INSN(rolw,      0b0111011, 0b001, 0b0110000);
+  INSN(ror,       0b0110011, 0b101, 0b0110000);
+  INSN(rorw,      0b0111011, 0b101, 0b0110000);
+  INSN(sh1add,    0b0110011, 0b010, 0b0010000);
+  INSN(sh2add,    0b0110011, 0b100, 0b0010000);
+  INSN(sh3add,    0b0110011, 0b110, 0b0010000);
+  INSN(sh1add_uw, 0b0111011, 0b010, 0b0010000);
+  INSN(sh2add_uw, 0b0111011, 0b100, 0b0010000);
+  INSN(sh3add_uw, 0b0111011, 0b110, 0b0010000);
+  INSN(andn,      0b0110011, 0b111, 0b0100000);
+  INSN(orn,       0b0110011, 0b110, 0b0100000);
+  INSN(xnor,      0b0110011, 0b100, 0b0100000);
+  INSN(max,       0b0110011, 0b110, 0b0000101);
+  INSN(maxu,      0b0110011, 0b111, 0b0000101);
+  INSN(min,       0b0110011, 0b100, 0b0000101);
+  INSN(minu,      0b0110011, 0b101, 0b0000101);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct12)                 \
+  void NAME(Register Rd, Register Rs1) {                \
+    unsigned insn = 0;                                  \
+    patch((address)&insn, 6, 0, op);                    \
+    patch((address)&insn, 14, 12, funct3);              \
+    patch((address)&insn, 31, 20, funct12);             \
+    patch_reg((address)&insn, 7, Rd);                   \
+    patch_reg((address)&insn, 15, Rs1);                 \
+    emit(insn);                                         \
+  }
+
+  INSN(rev8,   0b0010011, 0b101, 0b011010111000);
+  INSN(sext_b, 0b0010011, 0b001, 0b011000000100);
+  INSN(sext_h, 0b0010011, 0b001, 0b011000000101);
+  INSN(zext_h, 0b0111011, 0b100, 0b000010000000);
+  INSN(clz,    0b0010011, 0b001, 0b011000000000);
+  INSN(clzw,   0b0011011, 0b001, 0b011000000000);
+  INSN(ctz,    0b0010011, 0b001, 0b011000000001);
+  INSN(ctzw,   0b0011011, 0b001, 0b011000000001);
+  INSN(cpop,   0b0010011, 0b001, 0b011000000010);
+  INSN(cpopw,  0b0011011, 0b001, 0b011000000010);
+  INSN(orc_b,  0b0010011, 0b101, 0b001010000111);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct6)                  \
+  void NAME(Register Rd, Register Rs1, unsigned shamt) {\
+    guarantee(shamt <= 0x3f, "Shamt is invalid");       \
+    unsigned insn = 0;                                  \
+    patch((address)&insn, 6, 0, op);                    \
+    patch((address)&insn, 14, 12, funct3);              \
+    patch((address)&insn, 25, 20, shamt);               \
+    patch((address)&insn, 31, 26, funct6);              \
+    patch_reg((address)&insn, 7, Rd);                   \
+    patch_reg((address)&insn, 15, Rs1);                 \
+    emit(insn);                                         \
+  }
+
+  INSN(rori,    0b0010011, 0b101, 0b011000);
+  INSN(slli_uw, 0b0011011, 0b001, 0b000010);
+
+#undef INSN
+
+#define INSN(NAME, op, funct3, funct7)                  \
+  void NAME(Register Rd, Register Rs1, unsigned shamt) {\
+    guarantee(shamt <= 0x1f, "Shamt is invalid");       \
+    unsigned insn = 0;                                  \
+    patch((address)&insn, 6, 0, op);                    \
+    patch((address)&insn, 14, 12, funct3);              \
+    patch((address)&insn, 24, 20, shamt);               \
+    patch((address)&insn, 31, 25, funct7);              \
+    patch_reg((address)&insn, 7, Rd);                   \
+    patch_reg((address)&insn, 15, Rs1);                 \
+    emit(insn);                                         \
+  }
+
+  INSN(roriw, 0b0011011, 0b101, 0b0110000);
+
+#undef INSN
+
+// ========================================
+// RISC-V Compressed Instructions Extension
+// ========================================
+// Note:
+// 1. When UseRVC is enabled, 32-bit instructions under 'CompressibleRegion's will be
+//    transformed to 16-bit instructions if compressible.
+// 2. RVC instructions in Assembler always begin with 'c_' prefix, as 'c_li',
+//    but most of time we have no need to explicitly use these instructions.
+// 3. 'CompressibleRegion' is introduced to hint instructions in this Region's RTTI range
+//    are qualified to be compressed with their 2-byte versions.
+//    An example:
+//
+//      CompressibleRegion cr(_masm);
+//      __ andr(...);      // this instruction could change to c.and if able to
+//
+// 4. Using -XX:PrintAssemblyOptions=no-aliases could distinguish RVC instructions from
+//    normal ones.
+//
+
+private:
+  bool _in_compressible_region;
+public:
+  bool in_compressible_region() const { return _in_compressible_region; }
+  void set_in_compressible_region(bool b) { _in_compressible_region = b; }
+public:
+
+  // a compressible region
+  class CompressibleRegion : public StackObj {
+  protected:
+    Assembler *_masm;
+    bool _saved_in_compressible_region;
+  public:
+    CompressibleRegion(Assembler *_masm)
+    : _masm(_masm)
+    , _saved_in_compressible_region(_masm->in_compressible_region()) {
+      _masm->set_in_compressible_region(true);
+    }
+    ~CompressibleRegion() {
+      _masm->set_in_compressible_region(_saved_in_compressible_region);
+    }
+  };
+
+  // patch a 16-bit instruction.
+  static void c_patch(address a, unsigned msb, unsigned lsb, uint16_t val) {
+    assert_cond(a != NULL);
+    assert_cond(msb >= lsb && msb <= 15);
+    unsigned nbits = msb - lsb + 1;
+    guarantee(val < (1U << nbits), "Field too big for insn");
+    uint16_t mask = (1U << nbits) - 1;
+    val <<= lsb;
+    mask <<= lsb;
+    uint16_t target = *(uint16_t *)a;
+    target &= ~mask;
+    target |= val;
+    *(uint16_t *)a = target;
+  }
+
+  static void c_patch(address a, unsigned bit, uint16_t val) {
+    c_patch(a, bit, bit, val);
+  }
+
+  // patch a 16-bit instruction with a general purpose register ranging [0, 31] (5 bits)
+  static void c_patch_reg(address a, unsigned lsb, Register reg) {
+    c_patch(a, lsb + 4, lsb, reg->encoding_nocheck());
+  }
+
+  // patch a 16-bit instruction with a general purpose register ranging [8, 15] (3 bits)
+  static void c_patch_compressed_reg(address a, unsigned lsb, Register reg) {
+    c_patch(a, lsb + 2, lsb, reg->compressed_encoding_nocheck());
+  }
+
+  // patch a 16-bit instruction with a float register ranging [0, 31] (5 bits)
+  static void c_patch_reg(address a, unsigned lsb, FloatRegister reg) {
+    c_patch(a, lsb + 4, lsb, reg->encoding_nocheck());
+  }
+
+  // patch a 16-bit instruction with a float register ranging [8, 15] (3 bits)
+  static void c_patch_compressed_reg(address a, unsigned lsb, FloatRegister reg) {
+    c_patch(a, lsb + 2, lsb, reg->compressed_encoding_nocheck());
+  }
+
+// --------------  RVC Instruction Definitions  --------------
+
+  void c_nop() {
+    c_addi(x0, 0);
+  }
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rd_Rs1, int32_t imm) {                                                  \
+    assert_cond(is_imm_in_range(imm, 6, 0));                                                 \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 6, 2, (imm & right_n_bits(5)));                                  \
+    c_patch_reg((address)&insn, 7, Rd_Rs1);                                                  \
+    c_patch((address)&insn, 12, 12, (imm & nth_bit(5)) >> 5);                                \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_addi,   0b000, 0b01);
+  INSN(c_addiw,  0b001, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(int32_t imm) {                                                                   \
+    assert_cond(is_imm_in_range(imm, 10, 0));                                                \
+    assert_cond((imm & 0b1111) == 0);                                                        \
+    assert_cond(imm != 0);                                                                   \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 2, 2, (imm & nth_bit(5)) >> 5);                                  \
+    c_patch((address)&insn, 4, 3, (imm & right_n_bits(9)) >> 7);                             \
+    c_patch((address)&insn, 5, 5, (imm & nth_bit(6)) >> 6);                                  \
+    c_patch((address)&insn, 6, 6, (imm & nth_bit(4)) >> 4);                                  \
+    c_patch_reg((address)&insn, 7, sp);                                                      \
+    c_patch((address)&insn, 12, 12, (imm & nth_bit(9)) >> 9);                                \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_addi16sp, 0b011, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rd, uint32_t uimm) {                                                    \
+    assert_cond(is_unsigned_imm_in_range(uimm, 10, 0));                                      \
+    assert_cond((uimm & 0b11) == 0);                                                         \
+    assert_cond(uimm != 0);                                                                  \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch_compressed_reg((address)&insn, 2, Rd);                                           \
+    c_patch((address)&insn, 5, 5, (uimm & nth_bit(3)) >> 3);                                 \
+    c_patch((address)&insn, 6, 6, (uimm & nth_bit(2)) >> 2);                                 \
+    c_patch((address)&insn, 10, 7, (uimm & right_n_bits(10)) >> 6);                          \
+    c_patch((address)&insn, 12, 11, (uimm & right_n_bits(6)) >> 4);                          \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_addi4spn, 0b000, 0b00);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rd_Rs1, uint32_t shamt) {                                               \
+    assert_cond(is_unsigned_imm_in_range(shamt, 6, 0));                                      \
+    assert_cond(shamt != 0);                                                                 \
+    assert_cond(Rd_Rs1 != x0);                                                               \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 6, 2, (shamt & right_n_bits(5)));                                \
+    c_patch_reg((address)&insn, 7, Rd_Rs1);                                                  \
+    c_patch((address)&insn, 12, 12, (shamt & nth_bit(5)) >> 5);                              \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_slli, 0b000, 0b10);
+
+#undef INSN
+
+#define INSN(NAME, funct3, funct2, op)                                                       \
+  void NAME(Register Rd_Rs1, uint32_t shamt) {                                               \
+    assert_cond(is_unsigned_imm_in_range(shamt, 6, 0));                                      \
+    assert_cond(shamt != 0);                                                                 \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 6, 2, (shamt & right_n_bits(5)));                                \
+    c_patch_compressed_reg((address)&insn, 7, Rd_Rs1);                                       \
+    c_patch((address)&insn, 11, 10, funct2);                                                 \
+    c_patch((address)&insn, 12, 12, (shamt & nth_bit(5)) >> 5);                              \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_srli, 0b100, 0b00, 0b01);
+  INSN(c_srai, 0b100, 0b01, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct3, funct2, op)                                                       \
+  void NAME(Register Rd_Rs1, int32_t imm) {                                                  \
+    assert_cond(is_imm_in_range(imm, 6, 0));                                                 \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 6, 2, (imm & right_n_bits(5)));                                  \
+    c_patch_compressed_reg((address)&insn, 7, Rd_Rs1);                                       \
+    c_patch((address)&insn, 11, 10, funct2);                                                 \
+    c_patch((address)&insn, 12, 12, (imm & nth_bit(5)) >> 5);                                \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_andi, 0b100, 0b10, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct6, funct2, op)                                                       \
+  void NAME(Register Rd_Rs1, Register Rs2) {                                                 \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch_compressed_reg((address)&insn, 2, Rs2);                                          \
+    c_patch((address)&insn, 6, 5, funct2);                                                   \
+    c_patch_compressed_reg((address)&insn, 7, Rd_Rs1);                                       \
+    c_patch((address)&insn, 15, 10, funct6);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_sub,  0b100011, 0b00, 0b01);
+  INSN(c_xor,  0b100011, 0b01, 0b01);
+  INSN(c_or,   0b100011, 0b10, 0b01);
+  INSN(c_and,  0b100011, 0b11, 0b01);
+  INSN(c_subw, 0b100111, 0b00, 0b01);
+  INSN(c_addw, 0b100111, 0b01, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct4, op)                                                               \
+  void NAME(Register Rd_Rs1, Register Rs2) {                                                 \
+    assert_cond(Rd_Rs1 != x0);                                                               \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch_reg((address)&insn, 2, Rs2);                                                     \
+    c_patch_reg((address)&insn, 7, Rd_Rs1);                                                  \
+    c_patch((address)&insn, 15, 12, funct4);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_mv,  0b1000, 0b10);
+  INSN(c_add, 0b1001, 0b10);
+
+#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);                                                                        \
+  }
+
+  INSN(c_jr,   0b1000, 0b10);
+  INSN(c_jalr, 0b1001, 0b10);
+
+#undef INSN
+
+  typedef void (Assembler::* j_c_insn)(address dest);
+  typedef void (Assembler::* compare_and_branch_c_insn)(Register Rs1, address dest);
+
+  void wrap_label(Label &L, j_c_insn insn) {
+    if (L.is_bound()) {
+      (this->*insn)(target(L));
+    } else {
+      L.add_patch_at(code(), locator());
+      (this->*insn)(pc());
+    }
+  }
+
+  void wrap_label(Label &L, Register r, compare_and_branch_c_insn insn) {
+    if (L.is_bound()) {
+      (this->*insn)(r, target(L));
+    } else {
+      L.add_patch_at(code(), locator());
+      (this->*insn)(r, pc());
+    }
+  }
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(int32_t offset) {                                                                \
+    assert_cond(is_imm_in_range(offset, 11, 1));                                             \
+    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 != NULL);                                                               \
+    int64_t distance = dest - pc();                                                          \
+    assert_cond(is_imm_in_range(distance, 11, 1));                                           \
+    c_j(distance);                                                                           \
+  }                                                                                          \
+  void NAME(Label &L) {                                                                      \
+    wrap_label(L, &Assembler::NAME);                                                         \
+  }
+
+  INSN(c_j, 0b101, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rs1, int32_t imm) {                                                     \
+    assert_cond(is_imm_in_range(imm, 8, 1));                                                 \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 2, 2, (imm & nth_bit(5)) >> 5);                                  \
+    c_patch((address)&insn, 4, 3, (imm & right_n_bits(3)) >> 1);                             \
+    c_patch((address)&insn, 6, 5, (imm & right_n_bits(8)) >> 6);                             \
+    c_patch_compressed_reg((address)&insn, 7, Rs1);                                          \
+    c_patch((address)&insn, 11, 10, (imm & right_n_bits(5)) >> 3);                           \
+    c_patch((address)&insn, 12, 12, (imm & nth_bit(8)) >> 8);                                \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }                                                                                          \
+  void NAME(Register Rs1, address dest) {                                                    \
+    assert_cond(dest != NULL);                                                               \
+    int64_t distance = dest - pc();                                                          \
+    assert_cond(is_imm_in_range(distance, 8, 1));                                            \
+    NAME(Rs1, distance);                                                                     \
+  }                                                                                          \
+  void NAME(Register Rs1, Label &L) {                                                        \
+    wrap_label(L, Rs1, &Assembler::NAME);                                                    \
+  }
+
+  INSN(c_beqz, 0b110, 0b01);
+  INSN(c_bnez, 0b111, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rd, int32_t imm) {                                                      \
+    assert_cond(is_imm_in_range(imm, 18, 0));                                                \
+    assert_cond((imm & 0xfff) == 0);                                                         \
+    assert_cond(imm != 0);                                                                   \
+    assert_cond(Rd != x0 && Rd != x2);                                                       \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 6, 2, (imm & right_n_bits(17)) >> 12);                           \
+    c_patch_reg((address)&insn, 7, Rd);                                                      \
+    c_patch((address)&insn, 12, 12, (imm & nth_bit(17)) >> 17);                              \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_lui, 0b011, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rd, int32_t imm) {                                                      \
+    assert_cond(is_imm_in_range(imm, 6, 0));                                                 \
+    assert_cond(Rd != x0);                                                                   \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 6, 2, (imm & right_n_bits(5)));                                  \
+    c_patch_reg((address)&insn, 7, Rd);                                                      \
+    c_patch((address)&insn, 12, 12, (imm & right_n_bits(6)) >> 5);                           \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_li, 0b010, 0b01);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rd, uint32_t uimm) {                                                    \
+    assert_cond(is_unsigned_imm_in_range(uimm, 9, 0));                                       \
+    assert_cond((uimm & 0b111) == 0);                                                        \
+    assert_cond(Rd != x0);                                                                   \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 4, 2, (uimm & right_n_bits(9)) >> 6);                            \
+    c_patch((address)&insn, 6, 5, (uimm & right_n_bits(5)) >> 3);                            \
+    c_patch_reg((address)&insn, 7, Rd);                                                      \
+    c_patch((address)&insn, 12, 12, (uimm & nth_bit(5)) >> 5);                               \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_ldsp,  0b011, 0b10);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(FloatRegister Rd, uint32_t uimm) {                                               \
+    assert_cond(is_unsigned_imm_in_range(uimm, 9, 0));                                       \
+    assert_cond((uimm & 0b111) == 0);                                                        \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 4, 2, (uimm & right_n_bits(9)) >> 6);                            \
+    c_patch((address)&insn, 6, 5, (uimm & right_n_bits(5)) >> 3);                            \
+    c_patch_reg((address)&insn, 7, Rd);                                                      \
+    c_patch((address)&insn, 12, 12, (uimm & nth_bit(5)) >> 5);                               \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_fldsp, 0b001, 0b10);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op, REGISTER_TYPE)                                                \
+  void NAME(REGISTER_TYPE Rd_Rs2, Register Rs1, uint32_t uimm) {                             \
+    assert_cond(is_unsigned_imm_in_range(uimm, 8, 0));                                       \
+    assert_cond((uimm & 0b111) == 0);                                                        \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch_compressed_reg((address)&insn, 2, Rd_Rs2);                                       \
+    c_patch((address)&insn, 6, 5, (uimm & right_n_bits(8)) >> 6);                            \
+    c_patch_compressed_reg((address)&insn, 7, Rs1);                                          \
+    c_patch((address)&insn, 12, 10, (uimm & right_n_bits(6)) >> 3);                          \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_ld,  0b011, 0b00, Register);
+  INSN(c_sd,  0b111, 0b00, Register);
+  INSN(c_fld, 0b001, 0b00, FloatRegister);
+  INSN(c_fsd, 0b101, 0b00, FloatRegister);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op, REGISTER_TYPE)                                                \
+  void NAME(REGISTER_TYPE Rs2, uint32_t uimm) {                                              \
+    assert_cond(is_unsigned_imm_in_range(uimm, 9, 0));                                       \
+    assert_cond((uimm & 0b111) == 0);                                                        \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch_reg((address)&insn, 2, Rs2);                                                     \
+    c_patch((address)&insn, 9, 7, (uimm & right_n_bits(9)) >> 6);                            \
+    c_patch((address)&insn, 12, 10, (uimm & right_n_bits(6)) >> 3);                          \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_sdsp,  0b111, 0b10, Register);
+  INSN(c_fsdsp, 0b101, 0b10, FloatRegister);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rs2, uint32_t uimm) {                                                   \
+    assert_cond(is_unsigned_imm_in_range(uimm, 8, 0));                                       \
+    assert_cond((uimm & 0b11) == 0);                                                         \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch_reg((address)&insn, 2, Rs2);                                                     \
+    c_patch((address)&insn, 8, 7, (uimm & right_n_bits(8)) >> 6);                            \
+    c_patch((address)&insn, 12, 9, (uimm & right_n_bits(6)) >> 2);                           \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_swsp, 0b110, 0b10);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rd, uint32_t uimm) {                                                    \
+    assert_cond(is_unsigned_imm_in_range(uimm, 8, 0));                                       \
+    assert_cond((uimm & 0b11) == 0);                                                         \
+    assert_cond(Rd != x0);                                                                   \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 3, 2, (uimm & right_n_bits(8)) >> 6);                            \
+    c_patch((address)&insn, 6, 4, (uimm & right_n_bits(5)) >> 2);                            \
+    c_patch_reg((address)&insn, 7, Rd);                                                      \
+    c_patch((address)&insn, 12, 12, (uimm & nth_bit(5)) >> 5);                               \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_lwsp, 0b010, 0b10);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME(Register Rd_Rs2, Register Rs1, uint32_t uimm) {                                  \
+    assert_cond(is_unsigned_imm_in_range(uimm, 7, 0));                                       \
+    assert_cond((uimm & 0b11) == 0);                                                         \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch_compressed_reg((address)&insn, 2, Rd_Rs2);                                       \
+    c_patch((address)&insn, 5, 5, (uimm & nth_bit(6)) >> 6);                                 \
+    c_patch((address)&insn, 6, 6, (uimm & nth_bit(2)) >> 2);                                 \
+    c_patch_compressed_reg((address)&insn, 7, Rs1);                                          \
+    c_patch((address)&insn, 12, 10, (uimm & right_n_bits(6)) >> 3);                          \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_lw, 0b010, 0b00);
+  INSN(c_sw, 0b110, 0b00);
+
+#undef INSN
+
+#define INSN(NAME, funct3, op)                                                               \
+  void NAME() {                                                                              \
+    uint16_t insn = 0;                                                                       \
+    c_patch((address)&insn, 1, 0, op);                                                       \
+    c_patch((address)&insn, 11, 2, 0x0);                                                     \
+    c_patch((address)&insn, 12, 12, 0b1);                                                    \
+    c_patch((address)&insn, 15, 13, funct3);                                                 \
+    emit_int16(insn);                                                                        \
+  }
+
+  INSN(c_ebreak, 0b100, 0b10);
+
+#undef INSN
+
+// --------------  RVC Transformation Functions  --------------
+
+// --------------------------
+// Register instructions
+// --------------------------
+#define INSN(NAME)                                                                             \
+  void NAME(Register Rd, Register Rs1, Register Rs2) {                                         \
+    /* add -> c.add */                                                                         \
+    if (do_compress()) {                                                                       \
+      Register src = noreg;                                                                    \
+      if (Rs1 != x0 && Rs2 != x0 && ((src = Rs1, Rs2 == Rd) || (src = Rs2, Rs1 == Rd))) {      \
+        c_add(Rd, src);                                                                        \
+        return;                                                                                \
+      }                                                                                        \
+    }                                                                                          \
+    _add(Rd, Rs1, Rs2);                                                                        \
+  }
+
+  INSN(add);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME, C_NAME, NORMAL_NAME)                                                      \
+  void NAME(Register Rd, Register Rs1, Register Rs2) {                                       \
+    /* sub/subw -> c.sub/c.subw */                                                           \
+    if (do_compress() &&                                                                     \
+        (Rd == Rs1 && Rd->is_compressed_valid() && Rs2->is_compressed_valid())) {            \
+      C_NAME(Rd, Rs2);                                                                       \
+      return;                                                                                \
+    }                                                                                        \
+    NORMAL_NAME(Rd, Rs1, Rs2);                                                               \
+  }
+
+  INSN(sub,  c_sub,  _sub);
+  INSN(subw, c_subw, _subw);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME, C_NAME, NORMAL_NAME)                                                      \
+  void NAME(Register Rd, Register Rs1, Register Rs2) {                                       \
+    /* and/or/xor/addw -> c.and/c.or/c.xor/c.addw */                                         \
+    if (do_compress()) {                                                                     \
+      Register src = noreg;                                                                  \
+      if (Rs1->is_compressed_valid() && Rs2->is_compressed_valid() &&                        \
+        ((src = Rs1, Rs2 == Rd) || (src = Rs2, Rs1 == Rd))) {                                \
+        C_NAME(Rd, src);                                                                     \
+        return;                                                                              \
+      }                                                                                      \
+    }                                                                                        \
+    NORMAL_NAME(Rd, Rs1, Rs2);                                                               \
+  }
+
+  INSN(andr, c_and,  _andr);
+  INSN(orr,  c_or,   _orr);
+  INSN(xorr, c_xor,  _xorr);
+  INSN(addw, c_addw, _addw);
+
+#undef INSN
+
+private:
+// some helper functions
+  bool do_compress() const {
+    return UseRVC && in_compressible_region();
+  }
+
+#define FUNC(NAME, funct3, bits)                                                             \
+  bool NAME(Register rs1, Register rd_rs2, int32_t imm12, bool ld) {                         \
+    return rs1 == sp &&                                                                      \
+      is_unsigned_imm_in_range(imm12, bits, 0) &&                                            \
+      (intx(imm12) & funct3) == 0x0 &&                                                       \
+      (!ld || rd_rs2 != x0);                                                                 \
+  }                                                                                          \
+
+  FUNC(is_c_ldsdsp,  0b111, 9);
+  FUNC(is_c_lwswsp,  0b011, 8);
+
+#undef FUNC
+
+#define FUNC(NAME, funct3, bits)                                                             \
+  bool NAME(Register rs1, int32_t imm12) {                                                   \
+    return rs1 == sp &&                                                                      \
+      is_unsigned_imm_in_range(imm12, bits, 0) &&                                            \
+      (intx(imm12) & funct3) == 0x0;                                                         \
+  }                                                                                          \
+
+  FUNC(is_c_fldsdsp, 0b111, 9);
+
+#undef FUNC
+
+#define FUNC(NAME, REG_TYPE, funct3, bits)                                                   \
+  bool NAME(Register rs1, REG_TYPE rd_rs2, int32_t imm12) {                                  \
+    return rs1->is_compressed_valid() &&                                                     \
+      rd_rs2->is_compressed_valid() &&                                                       \
+      is_unsigned_imm_in_range(imm12, bits, 0) &&                                            \
+      (intx(imm12) & funct3) == 0x0;                                                         \
+  }                                                                                          \
+
+  FUNC(is_c_ldsd,  Register,      0b111, 8);
+  FUNC(is_c_lwsw,  Register,      0b011, 7);
+  FUNC(is_c_fldsd, FloatRegister, 0b111, 8);
+
+#undef FUNC
+
+public:
+// --------------------------
+// Load/store register
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
+    /* lw -> c.lwsp/c.lw */                                                                  \
+    if (do_compress()) {                                                                     \
+      if (is_c_lwswsp(Rs, Rd, offset, true)) {                                               \
+        c_lwsp(Rd, offset);                                                                  \
+        return;                                                                              \
+      } else if (is_c_lwsw(Rs, Rd, offset)) {                                                \
+        c_lw(Rd, Rs, offset);                                                                \
+        return;                                                                              \
+      }                                                                                      \
+    }                                                                                        \
+    _lw(Rd, Rs, offset);                                                                     \
+  }
+
+  INSN(lw);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
+    /* ld -> c.ldsp/c.ld */                                                                  \
+    if (do_compress()) {                                                                     \
+      if (is_c_ldsdsp(Rs, Rd, offset, true)) {                                               \
+        c_ldsp(Rd, offset);                                                                  \
+        return;                                                                              \
+      } else if (is_c_ldsd(Rs, Rd, offset)) {                                                \
+        c_ld(Rd, Rs, offset);                                                                \
+        return;                                                                              \
+      }                                                                                      \
+    }                                                                                        \
+    _ld(Rd, Rs, offset);                                                                     \
+  }
+
+  INSN(ld);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(FloatRegister Rd, Register Rs, const int32_t offset) {                           \
+    /* fld -> c.fldsp/c.fld */                                                               \
+    if (do_compress()) {                                                                     \
+      if (is_c_fldsdsp(Rs, offset)) {                                                        \
+        c_fldsp(Rd, offset);                                                                 \
+        return;                                                                              \
+      } else if (is_c_fldsd(Rs, Rd, offset)) {                                               \
+        c_fld(Rd, Rs, offset);                                                               \
+        return;                                                                              \
+      }                                                                                      \
+    }                                                                                        \
+    _fld(Rd, Rs, offset);                                                                    \
+  }
+
+  INSN(fld);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
+    /* sd -> c.sdsp/c.sd */                                                                  \
+    if (do_compress()) {                                                                     \
+      if (is_c_ldsdsp(Rs, Rd, offset, false)) {                                              \
+        c_sdsp(Rd, offset);                                                                  \
+        return;                                                                              \
+      } else if (is_c_ldsd(Rs, Rd, offset)) {                                                \
+        c_sd(Rd, Rs, offset);                                                                \
+        return;                                                                              \
+      }                                                                                      \
+    }                                                                                        \
+    _sd(Rd, Rs, offset);                                                                     \
+  }
+
+  INSN(sd);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
+    /* sw -> c.swsp/c.sw */                                                                  \
+    if (do_compress()) {                                                                     \
+      if (is_c_lwswsp(Rs, Rd, offset, false)) {                                              \
+        c_swsp(Rd, offset);                                                                  \
+        return;                                                                              \
+      } else if (is_c_lwsw(Rs, Rd, offset)) {                                                \
+        c_sw(Rd, Rs, offset);                                                                \
+        return;                                                                              \
+      }                                                                                      \
+    }                                                                                        \
+    _sw(Rd, Rs, offset);                                                                     \
+  }
+
+  INSN(sw);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(FloatRegister Rd, Register Rs, const int32_t offset) {                           \
+    /* fsd -> c.fsdsp/c.fsd */                                                               \
+    if (do_compress()) {                                                                     \
+      if (is_c_fldsdsp(Rs, offset)) {                                                        \
+        c_fsdsp(Rd, offset);                                                                 \
+        return;                                                                              \
+      } else if (is_c_fldsd(Rs, Rd, offset)) {                                               \
+        c_fsd(Rd, Rs, offset);                                                               \
+        return;                                                                              \
+      }                                                                                      \
+    }                                                                                        \
+    _fsd(Rd, Rs, offset);                                                                    \
+  }
+
+  INSN(fsd);
+
+#undef INSN
+
+// --------------------------
+// Conditional branch instructions
+// --------------------------
+#define INSN(NAME, C_NAME, NORMAL_NAME)                                                      \
+  void NAME(Register Rs1, Register Rs2, const int64_t offset) {                              \
+    /* beq/bne -> c.beqz/c.bnez */                                                           \
+    if (do_compress() &&                                                                     \
+        (offset != 0 && Rs2 == x0 && Rs1->is_compressed_valid() &&                           \
+        is_imm_in_range(offset, 8, 1))) {                                                    \
+      C_NAME(Rs1, offset);                                                                   \
+      return;                                                                                \
+    }                                                                                        \
+    NORMAL_NAME(Rs1, Rs2, offset);                                                           \
+  }
+
+  INSN(beq, c_beqz, _beq);
+  INSN(bne, c_beqz, _bne);
+
+#undef INSN
+
+// --------------------------
+// Unconditional branch instructions
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, const int32_t offset) {                                             \
+    /* jal -> c.j */                                                                         \
+    if (do_compress() && offset != 0 && Rd == x0 && is_imm_in_range(offset, 11, 1)) {        \
+      c_j(offset);                                                                           \
+      return;                                                                                \
+    }                                                                                        \
+    _jal(Rd, offset);                                                                        \
+  }
+
+  INSN(jal);
+
+#undef INSN
+
+// --------------------------
+#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);                                                                   \
+  }
+
+  INSN(jalr);
+
+#undef INSN
+
+// --------------------------
+// Miscellaneous Instructions
+// --------------------------
+#define INSN(NAME)                                                     \
+  void NAME() {                                                        \
+    /* ebreak -> c.ebreak */                                           \
+    if (do_compress()) {                                               \
+      c_ebreak();                                                      \
+      return;                                                          \
+    }                                                                  \
+    _ebreak();                                                         \
+  }
+
+  INSN(ebreak);
+
+#undef INSN
+
+#define INSN(NAME)                                                      \
+  void NAME() {                                                         \
+    /* The illegal instruction in RVC is presented by a 16-bit 0. */    \
+    if (do_compress()) {                                                \
+      emit_int16(0);                                                    \
+      return;                                                           \
+    }                                                                   \
+    _halt();                                                            \
+  }
+
+  INSN(halt);
+
+#undef INSN
+
+// --------------------------
+// Immediate Instructions
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, int64_t imm) {                                                      \
+    /* li -> c.li */                                                                         \
+    if (do_compress() && (is_imm_in_range(imm, 6, 0) && Rd != x0)) {                         \
+      c_li(Rd, imm);                                                                         \
+      return;                                                                                \
+    }                                                                                        \
+    _li(Rd, imm);                                                                            \
+  }
+
+  INSN(li);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, Register Rs1, int32_t imm) {                                        \
+    /* addi -> c.addi/c.nop/c.mv/c.addi16sp/c.addi4spn */                                    \
+    if (do_compress()) {                                                                     \
+      if (Rd == Rs1 && is_imm_in_range(imm, 6, 0)) {                                         \
+        c_addi(Rd, imm);                                                                     \
+        return;                                                                              \
+      } else if (imm == 0 && Rd != x0 && Rs1 != x0) {                                        \
+        c_mv(Rd, Rs1);                                                                       \
+        return;                                                                              \
+      } else if (Rs1 == sp && imm != 0) {                                                    \
+        if (Rd == Rs1 && (imm & 0b1111) == 0x0 && is_imm_in_range(imm, 10, 0)) {             \
+          c_addi16sp(imm);                                                                   \
+          return;                                                                            \
+        } else if (Rd->is_compressed_valid() && (imm & 0b11) == 0x0 && is_unsigned_imm_in_range(imm, 10, 0)) { \
+          c_addi4spn(Rd, imm);                                                               \
+          return;                                                                            \
+        }                                                                                    \
+      }                                                                                      \
+    }                                                                                        \
+    _addi(Rd, Rs1, imm);                                                                     \
+  }
+
+  INSN(addi);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, Register Rs1, int32_t imm) {                                        \
+    /* addiw -> c.addiw */                                                                   \
+    if (do_compress() && (Rd == Rs1 && Rd != x0 && is_imm_in_range(imm, 6, 0))) {            \
+      c_addiw(Rd, imm);                                                                      \
+      return;                                                                                \
+    }                                                                                        \
+    _addiw(Rd, Rs1, imm);                                                                    \
+  }
+
+  INSN(addiw);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, Register Rs1, int32_t imm) {                                        \
+    /* and_imm12 -> c.andi */                                                                \
+    if (do_compress() &&                                                                     \
+        (Rd == Rs1 && Rd->is_compressed_valid() && is_imm_in_range(imm, 6, 0))) {            \
+      c_andi(Rd, imm);                                                                       \
+      return;                                                                                \
+    }                                                                                        \
+    _and_imm12(Rd, Rs1, imm);                                                                \
+  }
+
+  INSN(and_imm12);
+
+#undef INSN
+
+// --------------------------
+// Shift Immediate Instructions
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, Register Rs1, unsigned shamt) {                                     \
+    /* slli -> c.slli */                                                                     \
+    if (do_compress() && (Rd == Rs1 && Rd != x0 && shamt != 0)) {                            \
+      c_slli(Rd, shamt);                                                                     \
+      return;                                                                                \
+    }                                                                                        \
+    _slli(Rd, Rs1, shamt);                                                                   \
+  }
+
+  INSN(slli);
+
+#undef INSN
+
+// --------------------------
+#define INSN(NAME, C_NAME, NORMAL_NAME)                                                      \
+  void NAME(Register Rd, Register Rs1, unsigned shamt) {                                     \
+    /* srai/srli -> c.srai/c.srli */                                                         \
+    if (do_compress() && (Rd == Rs1 && Rd->is_compressed_valid() && shamt != 0)) {           \
+      C_NAME(Rd, shamt);                                                                     \
+      return;                                                                                \
+    }                                                                                        \
+    NORMAL_NAME(Rd, Rs1, shamt);                                                             \
+  }
+
+  INSN(srai, c_srai, _srai);
+  INSN(srli, c_srli, _srli);
+
+#undef INSN
+
+// --------------------------
+// Upper Immediate Instruction
+// --------------------------
+#define INSN(NAME)                                                                           \
+  void NAME(Register Rd, int32_t imm) {                                                      \
+    /* lui -> c.lui */                                                                       \
+    if (do_compress() && (Rd != x0 && Rd != x2 && imm != 0 && is_imm_in_range(imm, 18, 0))) { \
+      c_lui(Rd, imm);                                                                        \
+      return;                                                                                \
+    }                                                                                        \
+    _lui(Rd, imm);                                                                           \
+  }
+
+  INSN(lui);
+
+#undef INSN
+
+// ---------------------------------------------------------------------------------------
+
+  void bgt(Register Rs, Register Rt, const address &dest);
+  void ble(Register Rs, Register Rt, const address &dest);
+  void bgtu(Register Rs, Register Rt, const address &dest);
+  void bleu(Register Rs, Register Rt, const address &dest);
+  void bgt(Register Rs, Register Rt, Label &l, bool is_far = false);
+  void ble(Register Rs, Register Rt, Label &l, bool is_far = false);
+  void bgtu(Register Rs, Register Rt, Label &l, bool is_far = false);
+  void bleu(Register Rs, Register Rt, Label &l, bool is_far = false);
+
+  typedef void (Assembler::* jal_jalr_insn)(Register Rt, address dest);
+  typedef void (Assembler::* load_insn_by_temp)(Register Rt, address dest, Register temp);
+  typedef void (Assembler::* compare_and_branch_insn)(Register Rs1, Register Rs2, const address dest);
+  typedef void (Assembler::* compare_and_branch_label_insn)(Register Rs1, Register Rs2, Label &L, bool is_far);
+
+  void wrap_label(Register r1, Register r2, Label &L, compare_and_branch_insn insn,
+                  compare_and_branch_label_insn neg_insn, bool is_far);
+  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);
+
+  // calculate pseudoinstruction
+  void add(Register Rd, Register Rn, int64_t increment, Register temp = t0);
+  void addw(Register Rd, Register Rn, int64_t increment, Register temp = t0);
+  void sub(Register Rd, Register Rn, int64_t decrement, Register temp = t0);
+  void subw(Register Rd, Register Rn, int64_t decrement, Register temp = t0);
+
+  // RVB pseudo instructions
+  // zero extend word
+  void zext_w(Register Rd, Register Rs);
+
+  Assembler(CodeBuffer* code) : AbstractAssembler(code), _in_compressible_region(false) {
+  }
+
+  // Stack overflow checking
+  virtual void bang_stack_with_offset(int offset) { Unimplemented(); }
+
+  static bool operand_valid_for_add_immediate(long imm) {
+    return is_imm_in_range(imm, 12, 0);
+  }
+
+  // The maximum range of a branch is fixed for the RISCV architecture.
+  static const unsigned long branch_range = 1 * M;
+
+  static bool reachable_from_branch_at(address branch, address target) {
+    return uabs(target - branch) < branch_range;
+  }
+
+  virtual ~Assembler() {}
+};
+
+#endif // CPU_RISCV_ASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp b/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp
new file mode 100644
index 00000000000..7ffe8803985
--- /dev/null
+++ b/src/hotspot/cpu/riscv/assembler_riscv.inline.hpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_ASSEMBLER_RISCV_INLINE_HPP
+#define CPU_RISCV_ASSEMBLER_RISCV_INLINE_HPP
+
+#include "asm/assembler.inline.hpp"
+#include "asm/codeBuffer.hpp"
+#include "code/codeCache.hpp"
+
+inline bool is_imm_in_range(long value, unsigned bits, unsigned align_bits) {
+  intx sign_bits = (value >> (bits + align_bits - 1));
+  return ((value & right_n_bits(align_bits)) == 0) && ((sign_bits == 0) || (sign_bits == -1));
+}
+
+inline bool is_unsigned_imm_in_range(intx value, unsigned bits, unsigned align_bits) {
+  return (value >= 0) && ((value & right_n_bits(align_bits)) == 0) && ((value >> (align_bits + bits)) == 0);
+}
+
+inline bool is_offset_in_range(intx offset, unsigned bits) {
+  return is_imm_in_range(offset, bits, 0);
+}
+
+#endif // CPU_RISCV_ASSEMBLER_RISCV_INLINE_HPP
diff --git a/src/hotspot/cpu/riscv/bytes_riscv.hpp b/src/hotspot/cpu/riscv/bytes_riscv.hpp
new file mode 100644
index 00000000000..23d982f9abd
--- /dev/null
+++ b/src/hotspot/cpu/riscv/bytes_riscv.hpp
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016 SAP SE. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_BYTES_RISCV_HPP
+#define CPU_RISCV_BYTES_RISCV_HPP
+
+#include "memory/allStatic.hpp"
+
+class Bytes: AllStatic {
+ public:
+  // Efficient reading and writing of unaligned unsigned data in platform-specific byte ordering
+  // RISCV needs to check for alignment.
+
+  // Forward declarations of the compiler-dependent implementation
+  static inline u2 swap_u2(u2 x);
+  static inline u4 swap_u4(u4 x);
+  static inline u8 swap_u8(u8 x);
+
+  static inline u2 get_native_u2(address p) {
+    if ((intptr_t(p) & 1) == 0) {
+      return *(u2*)p;
+    } else {
+      return ((u2)(p[1]) << 8) |
+             ((u2)(p[0]));
+    }
+  }
+
+  static inline u4 get_native_u4(address p) {
+    switch (intptr_t(p) & 3) {
+      case 0:
+        return *(u4*)p;
+
+      case 2:
+        return ((u4)(((u2*)p)[1]) << 16) |
+               ((u4)(((u2*)p)[0]));
+
+      default:
+        return ((u4)(p[3]) << 24) |
+               ((u4)(p[2]) << 16) |
+               ((u4)(p[1]) <<  8) |
+               ((u4)(p[0]));
+    }
+  }
+
+  static inline u8 get_native_u8(address p) {
+    switch (intptr_t(p) & 7) {
+      case 0:
+        return *(u8*)p;
+
+      case 4:
+        return ((u8)(((u4*)p)[1]) << 32) |
+               ((u8)(((u4*)p)[0]));
+
+      case 2:
+        return ((u8)(((u2*)p)[3]) << 48) |
+               ((u8)(((u2*)p)[2]) << 32) |
+               ((u8)(((u2*)p)[1]) << 16) |
+               ((u8)(((u2*)p)[0]));
+
+      default:
+        return ((u8)(p[7]) << 56) |
+               ((u8)(p[6]) << 48) |
+               ((u8)(p[5]) << 40) |
+               ((u8)(p[4]) << 32) |
+               ((u8)(p[3]) << 24) |
+               ((u8)(p[2]) << 16) |
+               ((u8)(p[1]) <<  8) |
+               ((u8)(p[0]));
+    }
+  }
+
+  static inline void put_native_u2(address p, u2 x) {
+    if ((intptr_t(p) & 1) == 0) {
+      *(u2*)p = x;
+    } else {
+      p[1] = x >> 8;
+      p[0] = x;
+    }
+  }
+
+  static inline void put_native_u4(address p, u4 x) {
+    switch (intptr_t(p) & 3) {
+      case 0:
+        *(u4*)p = x;
+        break;
+
+      case 2:
+        ((u2*)p)[1] = x >> 16;
+        ((u2*)p)[0] = x;
+        break;
+
+      default:
+        ((u1*)p)[3] = x >> 24;
+        ((u1*)p)[2] = x >> 16;
+        ((u1*)p)[1] = x >>  8;
+        ((u1*)p)[0] = x;
+        break;
+    }
+  }
+
+  static inline void put_native_u8(address p, u8 x) {
+    switch (intptr_t(p) & 7) {
+      case 0:
+        *(u8*)p = x;
+        break;
+
+      case 4:
+        ((u4*)p)[1] = x >> 32;
+        ((u4*)p)[0] = x;
+        break;
+
+      case 2:
+        ((u2*)p)[3] = x >> 48;
+        ((u2*)p)[2] = x >> 32;
+        ((u2*)p)[1] = x >> 16;
+        ((u2*)p)[0] = x;
+        break;
+
+      default:
+        ((u1*)p)[7] = x >> 56;
+        ((u1*)p)[6] = x >> 48;
+        ((u1*)p)[5] = x >> 40;
+        ((u1*)p)[4] = x >> 32;
+        ((u1*)p)[3] = x >> 24;
+        ((u1*)p)[2] = x >> 16;
+        ((u1*)p)[1] = x >>  8;
+        ((u1*)p)[0] = x;
+        break;
+    }
+  }
+
+  // Efficient reading and writing of unaligned unsigned data in Java byte ordering (i.e. big-endian ordering)
+  static inline u2 get_Java_u2(address p) { return swap_u2(get_native_u2(p)); }
+  static inline u4 get_Java_u4(address p) { return swap_u4(get_native_u4(p)); }
+  static inline u8 get_Java_u8(address p) { return swap_u8(get_native_u8(p)); }
+
+  static inline void put_Java_u2(address p, u2 x) { put_native_u2(p, swap_u2(x)); }
+  static inline void put_Java_u4(address p, u4 x) { put_native_u4(p, swap_u4(x)); }
+  static inline void put_Java_u8(address p, u8 x) { put_native_u8(p, swap_u8(x)); }
+};
+
+#include OS_CPU_HEADER(bytes)
+
+#endif // CPU_RISCV_BYTES_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp b/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
new file mode 100644
index 00000000000..dcd0472c540
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "c1/c1_CodeStubs.hpp"
+#include "c1/c1_FrameMap.hpp"
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "c1/c1_Runtime1.hpp"
+#include "classfile/javaClasses.hpp"
+#include "nativeInst_riscv.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "vmreg_riscv.inline.hpp"
+
+
+#define __ ce->masm()->
+
+void C1SafepointPollStub::emit_code(LIR_Assembler* ce) {
+  __ bind(_entry);
+  InternalAddress safepoint_pc(__ pc() - __ offset() + safepoint_offset());
+  __ code_section()->relocate(__ pc(), safepoint_pc.rspec());
+  __ la(t0, safepoint_pc.target());
+  __ sd(t0, Address(xthread, JavaThread::saved_exception_pc_offset()));
+
+  assert(SharedRuntime::polling_page_return_handler_blob() != NULL,
+         "polling page return stub not created yet");
+  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
+
+  __ far_jump(RuntimeAddress(stub));
+}
+
+void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
+  __ bind(_entry);
+  Metadata *m = _method->as_constant_ptr()->as_metadata();
+  __ mov_metadata(t0, m);
+  ce->store_parameter(t0, 1);
+  ce->store_parameter(_bci, 0);
+  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::counter_overflow_id)));
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+  __ j(_continuation);
+}
+
+RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, LIR_Opr array)
+  : _index(index), _array(array), _throw_index_out_of_bounds_exception(false) {
+  assert(info != NULL, "must have info");
+  _info = new CodeEmitInfo(info);
+}
+
+RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index)
+  : _index(index), _array(), _throw_index_out_of_bounds_exception(true) {
+  assert(info != NULL, "must have info");
+  _info = new CodeEmitInfo(info);
+}
+
+void RangeCheckStub::emit_code(LIR_Assembler* ce) {
+  __ bind(_entry);
+  if (_info->deoptimize_on_exception()) {
+    address a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id);
+    __ far_call(RuntimeAddress(a));
+    ce->add_call_info_here(_info);
+    ce->verify_oop_map(_info);
+    debug_only(__ should_not_reach_here());
+    return;
+  }
+
+  if (_index->is_cpu_register()) {
+    __ mv(t0, _index->as_register());
+  } else {
+    __ mv(t0, _index->as_jint());
+  }
+  Runtime1::StubID stub_id;
+  if (_throw_index_out_of_bounds_exception) {
+    stub_id = Runtime1::throw_index_exception_id;
+  } else {
+    assert(_array != LIR_Opr::nullOpr(), "sanity");
+    __ mv(t1, _array->as_pointer_register());
+    stub_id = Runtime1::throw_range_check_failed_id;
+  }
+  int32_t off = 0;
+  __ la_patchable(ra, RuntimeAddress(Runtime1::entry_for(stub_id)), off);
+  __ jalr(ra, ra, off);
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+  debug_only(__ should_not_reach_here());
+}
+
+PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
+  _info = new CodeEmitInfo(info);
+}
+
+void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
+  __ bind(_entry);
+  address a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id);
+  __ far_call(RuntimeAddress(a));
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+  debug_only(__ should_not_reach_here());
+}
+
+void DivByZeroStub::emit_code(LIR_Assembler* ce) {
+  if (_offset != -1) {
+    ce->compilation()->implicit_exception_table()->append(_offset, __ offset());
+  }
+  __ bind(_entry);
+  __ far_call(Address(Runtime1::entry_for(Runtime1::throw_div0_exception_id), relocInfo::runtime_call_type));
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+#ifdef ASSERT
+  __ should_not_reach_here();
+#endif
+}
+
+// Implementation of NewInstanceStub
+NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result, ciInstanceKlass* klass, CodeEmitInfo* info, Runtime1::StubID stub_id) {
+  _result = result;
+  _klass = klass;
+  _klass_reg = klass_reg;
+  _info = new CodeEmitInfo(info);
+  assert(stub_id == Runtime1::new_instance_id                 ||
+         stub_id == Runtime1::fast_new_instance_id            ||
+         stub_id == Runtime1::fast_new_instance_init_check_id,
+         "need new_instance id");
+  _stub_id = stub_id;
+}
+
+void NewInstanceStub::emit_code(LIR_Assembler* ce) {
+  assert(__ rsp_offset() == 0, "frame size should be fixed");
+  __ bind(_entry);
+  __ mv(x13, _klass_reg->as_register());
+  __ far_call(RuntimeAddress(Runtime1::entry_for(_stub_id)));
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+  assert(_result->as_register() == x10, "result must in x10");
+  __ j(_continuation);
+}
+
+// Implementation of NewTypeArrayStub
+NewTypeArrayStub::NewTypeArrayStub(LIR_Opr klass_reg, LIR_Opr length, LIR_Opr result, CodeEmitInfo* info) {
+  _klass_reg = klass_reg;
+  _length = length;
+  _result = result;
+  _info = new CodeEmitInfo(info);
+}
+
+void NewTypeArrayStub::emit_code(LIR_Assembler* ce) {
+  assert(__ rsp_offset() == 0, "frame size should be fixed");
+  __ bind(_entry);
+  assert(_length->as_register() == x9, "length must in x9");
+  assert(_klass_reg->as_register() == x13, "klass_reg must in x13");
+  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::new_type_array_id)));
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+  assert(_result->as_register() == x10, "result must in x10");
+  __ j(_continuation);
+}
+
+// Implementation of NewObjectArrayStub
+NewObjectArrayStub::NewObjectArrayStub(LIR_Opr klass_reg, LIR_Opr length, LIR_Opr result, CodeEmitInfo* info) {
+  _klass_reg = klass_reg;
+  _result = result;
+  _length = length;
+  _info = new CodeEmitInfo(info);
+}
+
+void NewObjectArrayStub::emit_code(LIR_Assembler* ce) {
+  assert(__ rsp_offset() == 0, "frame size should be fixed");
+  __ bind(_entry);
+  assert(_length->as_register() == x9, "length must in x9");
+  assert(_klass_reg->as_register() == x13, "klass_reg must in x13");
+  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::new_object_array_id)));
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+  assert(_result->as_register() == x10, "result must in x10");
+  __ j(_continuation);
+}
+
+// Implementation of MonitorAccessStubs
+MonitorEnterStub::MonitorEnterStub(LIR_Opr obj_reg, LIR_Opr lock_reg, CodeEmitInfo* info)
+: MonitorAccessStub(obj_reg, lock_reg) {
+  _info = new CodeEmitInfo(info);
+}
+
+void MonitorEnterStub::emit_code(LIR_Assembler* ce) {
+  assert(__ rsp_offset() == 0, "frame size should be fixed");
+  __ bind(_entry);
+  ce->store_parameter(_obj_reg->as_register(),  1);
+  ce->store_parameter(_lock_reg->as_register(), 0);
+  Runtime1::StubID enter_id;
+  if (ce->compilation()->has_fpu_code()) {
+    enter_id = Runtime1::monitorenter_id;
+  } else {
+    enter_id = Runtime1::monitorenter_nofpu_id;
+  }
+  __ far_call(RuntimeAddress(Runtime1::entry_for(enter_id)));
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+  __ j(_continuation);
+}
+
+void MonitorExitStub::emit_code(LIR_Assembler* ce) {
+  __ bind(_entry);
+  if (_compute_lock) {
+    // lock_reg was destroyed by fast unlocking attempt => recompute it
+    ce->monitor_address(_monitor_ix, _lock_reg);
+  }
+  ce->store_parameter(_lock_reg->as_register(), 0);
+  // note: non-blocking leaf routine => no call info needed
+  Runtime1::StubID exit_id;
+  if (ce->compilation()->has_fpu_code()) {
+    exit_id = Runtime1::monitorexit_id;
+  } else {
+    exit_id = Runtime1::monitorexit_nofpu_id;
+  }
+  __ la(ra, _continuation);
+  __ far_jump(RuntimeAddress(Runtime1::entry_for(exit_id)));
+}
+
+// Implementation of patching:
+// - Copy the code at given offset to an inlined buffer (first the bytes, then the number of bytes)
+// - Replace original code with a call to the stub
+// At Runtime:
+// - call to stub, jump to runtime
+// - in runtime: preserve all registers (rspecially objects, i.e., source and destination object)
+// - in runtime: after initializing class, restore original code, reexecute instruction
+
+int PatchingStub::_patch_info_offset = -NativeGeneralJump::instruction_size;
+
+void PatchingStub::align_patch_site(MacroAssembler* masm) {}
+
+void PatchingStub::emit_code(LIR_Assembler* ce) {
+  assert(false, "RISCV should not use C1 runtime patching");
+}
+
+void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
+  __ bind(_entry);
+  ce->store_parameter(_trap_request, 0);
+  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::deoptimize_id)));
+  ce->add_call_info_here(_info);
+  DEBUG_ONLY(__ should_not_reach_here());
+}
+
+void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
+  address a = NULL;
+  if (_info->deoptimize_on_exception()) {
+    // Deoptimize, do not throw the exception, because it is probably wrong to do it here.
+    a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id);
+  } else {
+    a = Runtime1::entry_for(Runtime1::throw_null_pointer_exception_id);
+  }
+
+  ce->compilation()->implicit_exception_table()->append(_offset, __ offset());
+  __ bind(_entry);
+  __ far_call(RuntimeAddress(a));
+  ce->add_call_info_here(_info);
+  ce->verify_oop_map(_info);
+  debug_only(__ should_not_reach_here());
+}
+
+void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
+  assert(__ rsp_offset() == 0, "frame size should be fixed");
+
+  __ bind(_entry);
+  // pass the object in a tmp register because all other registers
+  // must be preserved
+  if (_obj->is_cpu_register()) {
+    __ mv(t0, _obj->as_register());
+  }
+  __ far_call(RuntimeAddress(Runtime1::entry_for(_stub)), NULL, t1);
+  ce->add_call_info_here(_info);
+  debug_only(__ should_not_reach_here());
+}
+
+void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
+  // ---------------slow case: call to native-----------------
+  __ bind(_entry);
+  // Figure out where the args should go
+  // This should really convert the IntrinsicID to the Method* and signature
+  // but I don't know how to do that.
+  const int args_num = 5;
+  VMRegPair args[args_num];
+  BasicType signature[args_num] = { T_OBJECT, T_INT, T_OBJECT, T_INT, T_INT };
+  SharedRuntime::java_calling_convention(signature, args, args_num);
+
+  // push parameters
+  Register r[args_num];
+  r[0] = src()->as_register();
+  r[1] = src_pos()->as_register();
+  r[2] = dst()->as_register();
+  r[3] = dst_pos()->as_register();
+  r[4] = length()->as_register();
+
+  // next registers will get stored on the stack
+  for (int j = 0; j < args_num; j++) {
+    VMReg r_1 = args[j].first();
+    if (r_1->is_stack()) {
+      int st_off = r_1->reg2stack() * wordSize;
+      __ sd(r[j], Address(sp, st_off));
+    } else {
+      assert(r[j] == args[j].first()->as_Register(), "Wrong register for arg");
+    }
+  }
+
+  ce->align_call(lir_static_call);
+
+  ce->emit_static_call_stub();
+  if (ce->compilation()->bailed_out()) {
+    return; // CodeCache is full
+  }
+  Address resolve(SharedRuntime::get_resolve_static_call_stub(),
+                  relocInfo::static_call_type);
+  address call = __ trampoline_call(resolve);
+  if (call == NULL) {
+    ce->bailout("trampoline stub overflow");
+    return;
+  }
+  ce->add_call_info_here(info());
+
+#ifndef PRODUCT
+  if (PrintC1Statistics) {
+    __ la(t1, ExternalAddress((address)&Runtime1::_arraycopy_slowcase_cnt));
+    __ add_memory_int32(Address(t1), 1);
+  }
+#endif
+
+  __ j(_continuation);
+}
+
+#undef __
diff --git a/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp b/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
new file mode 100644
index 00000000000..4417ad63091
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_DEFS_RISCV_HPP
+#define CPU_RISCV_C1_DEFS_RISCV_HPP
+
+// native word offsets from memory address (little endian)
+enum {
+  pd_lo_word_offset_in_bytes = 0,
+  pd_hi_word_offset_in_bytes = BytesPerWord
+};
+
+// explicit rounding operations are required to implement the strictFP mode
+enum {
+  pd_strict_fp_requires_explicit_rounding = false
+};
+
+// registers
+enum {
+  pd_nof_cpu_regs_frame_map = RegisterImpl::number_of_registers,       // number of registers used during code emission
+  pd_nof_fpu_regs_frame_map = FloatRegisterImpl::number_of_registers,  // number of float registers used during code emission
+
+  // caller saved
+  pd_nof_caller_save_cpu_regs_frame_map = 13, // number of registers killed by calls
+  pd_nof_caller_save_fpu_regs_frame_map = 32, // number of float registers killed by calls
+
+  pd_first_callee_saved_reg = pd_nof_caller_save_cpu_regs_frame_map,
+  pd_last_callee_saved_reg = 21,
+
+  pd_last_allocatable_cpu_reg = pd_nof_caller_save_cpu_regs_frame_map - 1,
+
+  pd_nof_cpu_regs_reg_alloc
+    = pd_nof_caller_save_cpu_regs_frame_map,  // number of registers that are visible to register allocator
+  pd_nof_fpu_regs_reg_alloc = 32,  // number of float registers that are visible to register allocator
+
+  pd_nof_cpu_regs_linearscan = 32, // number of registers visible to linear scan
+  pd_nof_fpu_regs_linearscan = pd_nof_fpu_regs_frame_map, // number of float registers visible to linear scan
+  pd_nof_xmm_regs_linearscan = 0, // don't have vector registers
+
+  pd_first_cpu_reg  = 0,
+  pd_last_cpu_reg   = pd_nof_cpu_regs_reg_alloc - 1,
+  pd_first_byte_reg = 0,
+  pd_last_byte_reg  = pd_nof_cpu_regs_reg_alloc - 1,
+
+  pd_first_fpu_reg  = pd_nof_cpu_regs_frame_map,
+  pd_last_fpu_reg   = pd_first_fpu_reg + 31,
+
+  pd_first_callee_saved_fpu_reg_1 = 8 + pd_first_fpu_reg,
+  pd_last_callee_saved_fpu_reg_1  = 9 + pd_first_fpu_reg,
+  pd_first_callee_saved_fpu_reg_2 = 18 + pd_first_fpu_reg,
+  pd_last_callee_saved_fpu_reg_2  = 27 + pd_first_fpu_reg
+};
+
+
+// Encoding of float value in debug info.  This is true on x86 where
+// floats are extended to doubles when stored in the stack, false for
+// RISCV where floats and doubles are stored in their native form.
+enum {
+  pd_float_saved_as_double = false
+};
+
+#endif // CPU_RISCV_C1_DEFS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp b/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp
new file mode 100644
index 00000000000..e3a2606c532
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+//--------------------------------------------------------
+//               FpuStackSim
+//--------------------------------------------------------
+
+// No FPU stack on RISCV
diff --git a/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp b/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp
new file mode 100644
index 00000000000..7bc3d311501
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP
+#define CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP
+
+// No FPU stack on RISCV
+class FpuStackSim;
+
+#endif // CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp b/src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp
new file mode 100644
index 00000000000..172031941b2
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_FrameMap_riscv.cpp
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "c1/c1_FrameMap.hpp"
+#include "c1/c1_LIR.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "vmreg_riscv.inline.hpp"
+
+LIR_Opr FrameMap::map_to_opr(BasicType type, VMRegPair* reg, bool) {
+  LIR_Opr opr = LIR_OprFact::illegalOpr;
+  VMReg r_1 = reg->first();
+  VMReg r_2 = reg->second();
+  if (r_1->is_stack()) {
+    // Convert stack slot to an SP offset
+    // The calling convention does not count the SharedRuntime::out_preserve_stack_slots() value
+    // so we must add it in here.
+    int st_off = (r_1->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
+    opr = LIR_OprFact::address(new LIR_Address(sp_opr, st_off, type));
+  } else if (r_1->is_Register()) {
+    Register reg1 = r_1->as_Register();
+    if (r_2->is_Register() && (type == T_LONG || type == T_DOUBLE)) {
+      Register reg2 = r_2->as_Register();
+      assert(reg2 == reg1, "must be same register");
+      opr = as_long_opr(reg1);
+    } else if (is_reference_type(type)) {
+      opr = as_oop_opr(reg1);
+    } else if (type == T_METADATA) {
+      opr = as_metadata_opr(reg1);
+    } else if (type == T_ADDRESS) {
+      opr = as_address_opr(reg1);
+    } else {
+      opr = as_opr(reg1);
+    }
+  } else if (r_1->is_FloatRegister()) {
+    assert(type == T_DOUBLE || type == T_FLOAT, "wrong type");
+    int num = r_1->as_FloatRegister()->encoding();
+    if (type == T_FLOAT) {
+      opr = LIR_OprFact::single_fpu(num);
+    } else {
+      opr = LIR_OprFact::double_fpu(num);
+    }
+  } else {
+    ShouldNotReachHere();
+  }
+  return opr;
+}
+
+LIR_Opr FrameMap::zr_opr;
+LIR_Opr FrameMap::r1_opr;
+LIR_Opr FrameMap::r2_opr;
+LIR_Opr FrameMap::r3_opr;
+LIR_Opr FrameMap::r4_opr;
+LIR_Opr FrameMap::r5_opr;
+LIR_Opr FrameMap::r6_opr;
+LIR_Opr FrameMap::r7_opr;
+LIR_Opr FrameMap::r8_opr;
+LIR_Opr FrameMap::r9_opr;
+LIR_Opr FrameMap::r10_opr;
+LIR_Opr FrameMap::r11_opr;
+LIR_Opr FrameMap::r12_opr;
+LIR_Opr FrameMap::r13_opr;
+LIR_Opr FrameMap::r14_opr;
+LIR_Opr FrameMap::r15_opr;
+LIR_Opr FrameMap::r16_opr;
+LIR_Opr FrameMap::r17_opr;
+LIR_Opr FrameMap::r18_opr;
+LIR_Opr FrameMap::r19_opr;
+LIR_Opr FrameMap::r20_opr;
+LIR_Opr FrameMap::r21_opr;
+LIR_Opr FrameMap::r22_opr;
+LIR_Opr FrameMap::r23_opr;
+LIR_Opr FrameMap::r24_opr;
+LIR_Opr FrameMap::r25_opr;
+LIR_Opr FrameMap::r26_opr;
+LIR_Opr FrameMap::r27_opr;
+LIR_Opr FrameMap::r28_opr;
+LIR_Opr FrameMap::r29_opr;
+LIR_Opr FrameMap::r30_opr;
+LIR_Opr FrameMap::r31_opr;
+
+LIR_Opr FrameMap::fp_opr;
+LIR_Opr FrameMap::sp_opr;
+
+LIR_Opr FrameMap::receiver_opr;
+
+LIR_Opr FrameMap::zr_oop_opr;
+LIR_Opr FrameMap::r1_oop_opr;
+LIR_Opr FrameMap::r2_oop_opr;
+LIR_Opr FrameMap::r3_oop_opr;
+LIR_Opr FrameMap::r4_oop_opr;
+LIR_Opr FrameMap::r5_oop_opr;
+LIR_Opr FrameMap::r6_oop_opr;
+LIR_Opr FrameMap::r7_oop_opr;
+LIR_Opr FrameMap::r8_oop_opr;
+LIR_Opr FrameMap::r9_oop_opr;
+LIR_Opr FrameMap::r10_oop_opr;
+LIR_Opr FrameMap::r11_oop_opr;
+LIR_Opr FrameMap::r12_oop_opr;
+LIR_Opr FrameMap::r13_oop_opr;
+LIR_Opr FrameMap::r14_oop_opr;
+LIR_Opr FrameMap::r15_oop_opr;
+LIR_Opr FrameMap::r16_oop_opr;
+LIR_Opr FrameMap::r17_oop_opr;
+LIR_Opr FrameMap::r18_oop_opr;
+LIR_Opr FrameMap::r19_oop_opr;
+LIR_Opr FrameMap::r20_oop_opr;
+LIR_Opr FrameMap::r21_oop_opr;
+LIR_Opr FrameMap::r22_oop_opr;
+LIR_Opr FrameMap::r23_oop_opr;
+LIR_Opr FrameMap::r24_oop_opr;
+LIR_Opr FrameMap::r25_oop_opr;
+LIR_Opr FrameMap::r26_oop_opr;
+LIR_Opr FrameMap::r27_oop_opr;
+LIR_Opr FrameMap::r28_oop_opr;
+LIR_Opr FrameMap::r29_oop_opr;
+LIR_Opr FrameMap::r30_oop_opr;
+LIR_Opr FrameMap::r31_oop_opr;
+
+LIR_Opr FrameMap::t0_opr;
+LIR_Opr FrameMap::t1_opr;
+LIR_Opr FrameMap::t0_long_opr;
+LIR_Opr FrameMap::t1_long_opr;
+
+LIR_Opr FrameMap::r10_metadata_opr;
+LIR_Opr FrameMap::r11_metadata_opr;
+LIR_Opr FrameMap::r12_metadata_opr;
+LIR_Opr FrameMap::r13_metadata_opr;
+LIR_Opr FrameMap::r14_metadata_opr;
+LIR_Opr FrameMap::r15_metadata_opr;
+
+LIR_Opr FrameMap::long10_opr;
+LIR_Opr FrameMap::long11_opr;
+LIR_Opr FrameMap::fpu10_float_opr;
+LIR_Opr FrameMap::fpu10_double_opr;
+
+LIR_Opr FrameMap::_caller_save_cpu_regs[] = {};
+LIR_Opr FrameMap::_caller_save_fpu_regs[] = {};
+
+//--------------------------------------------------------
+//               FrameMap
+//--------------------------------------------------------
+// |---f31--|
+// |---..---|
+// |---f28--|
+// |---f27--|<---pd_last_callee_saved_fpu_reg_2
+// |---..---|
+// |---f18--|<---pd_first_callee_saved_fpu_reg_2
+// |---f17--|
+// |---..---|
+// |---f10--|
+// |---f9---|<---pd_last_callee_saved_fpu_reg_1
+// |---f8---|<---pd_first_callee_saved_fpu_reg_1
+// |---f7---|
+// |---..---|
+// |---f0---|
+// |---x27--|
+// |---x23--|
+// |---x8---|
+// |---x4---|
+// |---x3---|
+// |---x2---|
+// |---x1---|
+// |---x0---|
+// |---x26--|<---pd_last_callee_saved_reg
+// |---..---|
+// |---x18--|
+// |---x9---|<---pd_first_callee_saved_reg
+// |---x31--|
+// |---..---|
+// |---x28--|
+// |---x17--|
+// |---..---|
+// |---x10--|
+// |---x7---|
+
+void FrameMap::initialize() {
+  assert(!_init_done, "once");
+
+  int i = 0;
+
+  // caller save register
+  map_register(i, x7);  r7_opr  = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x10); r10_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x11); r11_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x12); r12_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x13); r13_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x14); r14_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x15); r15_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x16); r16_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x17); r17_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x28); r28_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x29); r29_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x30); r30_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x31); r31_opr = LIR_OprFact::single_cpu(i); i++;
+
+  // callee save register
+  map_register(i, x9);  r9_opr  = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x18); r18_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x19); r19_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x20); r20_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x21); r21_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x22); r22_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x24); r24_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x25); r25_opr = LIR_OprFact::single_cpu(i); i++;
+  map_register(i, x26); r26_opr = LIR_OprFact::single_cpu(i); i++;
+
+  // special register
+  map_register(i, x0);  zr_opr  = LIR_OprFact::single_cpu(i); i++;  // zr
+  map_register(i, x1);  r1_opr  = LIR_OprFact::single_cpu(i); i++;  // ra
+  map_register(i, x2);  r2_opr  = LIR_OprFact::single_cpu(i); i++;  // sp
+  map_register(i, x3);  r3_opr  = LIR_OprFact::single_cpu(i); i++;  // gp
+  map_register(i, x4);  r4_opr  = LIR_OprFact::single_cpu(i); i++;  // thread
+  map_register(i, x8);  r8_opr  = LIR_OprFact::single_cpu(i); i++;  // fp
+  map_register(i, x23); r23_opr = LIR_OprFact::single_cpu(i); i++;  // java thread
+  map_register(i, x27); r27_opr = LIR_OprFact::single_cpu(i); i++;  // heapbase
+
+  // tmp register
+  map_register(i, x5);  r5_opr  = LIR_OprFact::single_cpu(i); i++;  // t0
+  map_register(i, x6);  r6_opr  = LIR_OprFact::single_cpu(i); i++;  // t1
+
+  t0_opr = r5_opr;
+  t1_opr = r6_opr;
+  t0_long_opr = LIR_OprFact::double_cpu(r5_opr->cpu_regnr(), r5_opr->cpu_regnr());
+  t1_long_opr = LIR_OprFact::double_cpu(r6_opr->cpu_regnr(), r6_opr->cpu_regnr());
+
+  long10_opr  = LIR_OprFact::double_cpu(r10_opr->cpu_regnr(), r10_opr->cpu_regnr());
+  long11_opr  = LIR_OprFact::double_cpu(r11_opr->cpu_regnr(), r11_opr->cpu_regnr());
+
+  fpu10_float_opr   = LIR_OprFact::single_fpu(10);
+  fpu10_double_opr  = LIR_OprFact::double_fpu(10);
+
+  i = 0;
+  _caller_save_cpu_regs[i++]  = r7_opr;
+  _caller_save_cpu_regs[i++]  = r10_opr;
+  _caller_save_cpu_regs[i++]  = r11_opr;
+  _caller_save_cpu_regs[i++]  = r12_opr;
+  _caller_save_cpu_regs[i++]  = r13_opr;
+  _caller_save_cpu_regs[i++]  = r14_opr;
+  _caller_save_cpu_regs[i++]  = r15_opr;
+  _caller_save_cpu_regs[i++]  = r16_opr;
+  _caller_save_cpu_regs[i++]  = r17_opr;
+  _caller_save_cpu_regs[i++]  = r28_opr;
+  _caller_save_cpu_regs[i++]  = r29_opr;
+  _caller_save_cpu_regs[i++]  = r30_opr;
+  _caller_save_cpu_regs[i++]  = r31_opr;
+
+  _init_done = true;
+
+  zr_oop_opr  = as_oop_opr(x0);
+  r1_oop_opr  = as_oop_opr(x1);
+  r2_oop_opr  = as_oop_opr(x2);
+  r3_oop_opr  = as_oop_opr(x3);
+  r4_oop_opr  = as_oop_opr(x4);
+  r5_oop_opr  = as_oop_opr(x5);
+  r6_oop_opr  = as_oop_opr(x6);
+  r7_oop_opr  = as_oop_opr(x7);
+  r8_oop_opr  = as_oop_opr(x8);
+  r9_oop_opr  = as_oop_opr(x9);
+  r10_oop_opr = as_oop_opr(x10);
+  r11_oop_opr = as_oop_opr(x11);
+  r12_oop_opr = as_oop_opr(x12);
+  r13_oop_opr = as_oop_opr(x13);
+  r14_oop_opr = as_oop_opr(x14);
+  r15_oop_opr = as_oop_opr(x15);
+  r16_oop_opr = as_oop_opr(x16);
+  r17_oop_opr = as_oop_opr(x17);
+  r18_oop_opr = as_oop_opr(x18);
+  r19_oop_opr = as_oop_opr(x19);
+  r20_oop_opr = as_oop_opr(x20);
+  r21_oop_opr = as_oop_opr(x21);
+  r22_oop_opr = as_oop_opr(x22);
+  r23_oop_opr = as_oop_opr(x23);
+  r24_oop_opr = as_oop_opr(x24);
+  r25_oop_opr = as_oop_opr(x25);
+  r26_oop_opr = as_oop_opr(x26);
+  r27_oop_opr = as_oop_opr(x27);
+  r28_oop_opr = as_oop_opr(x28);
+  r29_oop_opr = as_oop_opr(x29);
+  r30_oop_opr = as_oop_opr(x30);
+  r31_oop_opr = as_oop_opr(x31);
+
+  r10_metadata_opr = as_metadata_opr(x10);
+  r11_metadata_opr = as_metadata_opr(x11);
+  r12_metadata_opr = as_metadata_opr(x12);
+  r13_metadata_opr = as_metadata_opr(x13);
+  r14_metadata_opr = as_metadata_opr(x14);
+  r15_metadata_opr = as_metadata_opr(x15);
+
+  sp_opr = as_pointer_opr(sp);
+  fp_opr = as_pointer_opr(fp);
+
+  VMRegPair regs;
+  BasicType sig_bt = T_OBJECT;
+  SharedRuntime::java_calling_convention(&sig_bt, &regs, 1);
+  receiver_opr = as_oop_opr(regs.first()->as_Register());
+
+  for (i = 0; i < nof_caller_save_fpu_regs; i++) {
+    _caller_save_fpu_regs[i] = LIR_OprFact::single_fpu(i);
+  }
+}
+
+
+Address FrameMap::make_new_address(ByteSize sp_offset) const {
+  return Address(sp, in_bytes(sp_offset));
+}
+
+
+// ----------------mapping-----------------------
+// all mapping is based on fp addressing, except for simple leaf methods where we access
+// the locals sp based (and no frame is built)
+
+
+// Frame for simple leaf methods (quick entries)
+//
+//   +----------+
+//   | ret addr |   <- TOS
+//   +----------+
+//   | args     |
+//   | ......   |
+
+// Frame for standard methods
+//
+//   | .........|  <- TOS
+//   | locals   |
+//   +----------+
+//   |  old fp, |
+//   +----------+
+//   | ret addr |
+//   +----------+
+//   |  args    |  <- FP
+//   | .........|
+
+
+// For OopMaps, map a local variable or spill index to an VMRegImpl name.
+// This is the offset from sp() in the frame of the slot for the index,
+// skewed by VMRegImpl::stack0 to indicate a stack location (vs.a register.)
+//
+//           framesize +
+//           stack0         stack0          0  <- VMReg
+//             |              | <registers> |
+//  ...........|..............|.............|
+//      0 1 2 3 x x 4 5 6 ... |                <- local indices
+//      ^           ^        sp()                 ( x x indicate link
+//      |           |                               and return addr)
+//  arguments   non-argument locals
+
+
+VMReg FrameMap::fpu_regname (int n) {
+  // Return the OptoReg name for the fpu stack slot "n"
+  // A spilled fpu stack slot comprises to two single-word OptoReg's.
+  return as_FloatRegister(n)->as_VMReg();
+}
+
+LIR_Opr FrameMap::stack_pointer() {
+  return FrameMap::sp_opr;
+}
+
+// JSR 292
+LIR_Opr FrameMap::method_handle_invoke_SP_save_opr() {
+  return LIR_OprFact::illegalOpr;  // Not needed on riscv
+}
+
+bool FrameMap::validate_frame() {
+  return true;
+}
diff --git a/src/hotspot/cpu/riscv/c1_FrameMap_riscv.hpp b/src/hotspot/cpu/riscv/c1_FrameMap_riscv.hpp
new file mode 100644
index 00000000000..01281f5c9e1
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_FrameMap_riscv.hpp
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_FRAMEMAP_RISCV_HPP
+#define CPU_RISCV_C1_FRAMEMAP_RISCV_HPP
+
+//  On RISCV the frame looks as follows:
+//
+//  +-----------------------------+---------+----------------------------------------+----------------+-----------
+//  | size_arguments-nof_reg_args | 2 words | size_locals-size_arguments+numreg_args | _size_monitors | spilling .
+//  +-----------------------------+---------+----------------------------------------+----------------+-----------
+
+ public:
+  static const int pd_c_runtime_reserved_arg_size;
+
+  enum {
+    first_available_sp_in_frame = 0,
+    frame_pad_in_bytes = 16,
+    nof_reg_args = 8
+  };
+
+ public:
+  static LIR_Opr receiver_opr;
+
+  static LIR_Opr zr_opr;
+  static LIR_Opr r1_opr;
+  static LIR_Opr r2_opr;
+  static LIR_Opr r3_opr;
+  static LIR_Opr r4_opr;
+  static LIR_Opr r5_opr;
+  static LIR_Opr r6_opr;
+  static LIR_Opr r7_opr;
+  static LIR_Opr r8_opr;
+  static LIR_Opr r9_opr;
+  static LIR_Opr r10_opr;
+  static LIR_Opr r11_opr;
+  static LIR_Opr r12_opr;
+  static LIR_Opr r13_opr;
+  static LIR_Opr r14_opr;
+  static LIR_Opr r15_opr;
+  static LIR_Opr r16_opr;
+  static LIR_Opr r17_opr;
+  static LIR_Opr r18_opr;
+  static LIR_Opr r19_opr;
+  static LIR_Opr r20_opr;
+  static LIR_Opr r21_opr;
+  static LIR_Opr r22_opr;
+  static LIR_Opr r23_opr;
+  static LIR_Opr r24_opr;
+  static LIR_Opr r25_opr;
+  static LIR_Opr r26_opr;
+  static LIR_Opr r27_opr;
+  static LIR_Opr r28_opr;
+  static LIR_Opr r29_opr;
+  static LIR_Opr r30_opr;
+  static LIR_Opr r31_opr;
+  static LIR_Opr fp_opr;
+  static LIR_Opr sp_opr;
+
+  static LIR_Opr zr_oop_opr;
+  static LIR_Opr r1_oop_opr;
+  static LIR_Opr r2_oop_opr;
+  static LIR_Opr r3_oop_opr;
+  static LIR_Opr r4_oop_opr;
+  static LIR_Opr r5_oop_opr;
+  static LIR_Opr r6_oop_opr;
+  static LIR_Opr r7_oop_opr;
+  static LIR_Opr r8_oop_opr;
+  static LIR_Opr r9_oop_opr;
+  static LIR_Opr r10_oop_opr;
+  static LIR_Opr r11_oop_opr;
+  static LIR_Opr r12_oop_opr;
+  static LIR_Opr r13_oop_opr;
+  static LIR_Opr r14_oop_opr;
+  static LIR_Opr r15_oop_opr;
+  static LIR_Opr r16_oop_opr;
+  static LIR_Opr r17_oop_opr;
+  static LIR_Opr r18_oop_opr;
+  static LIR_Opr r19_oop_opr;
+  static LIR_Opr r20_oop_opr;
+  static LIR_Opr r21_oop_opr;
+  static LIR_Opr r22_oop_opr;
+  static LIR_Opr r23_oop_opr;
+  static LIR_Opr r24_oop_opr;
+  static LIR_Opr r25_oop_opr;
+  static LIR_Opr r26_oop_opr;
+  static LIR_Opr r27_oop_opr;
+  static LIR_Opr r28_oop_opr;
+  static LIR_Opr r29_oop_opr;
+  static LIR_Opr r30_oop_opr;
+  static LIR_Opr r31_oop_opr;
+
+  static LIR_Opr t0_opr;
+  static LIR_Opr t1_opr;
+  static LIR_Opr t0_long_opr;
+  static LIR_Opr t1_long_opr;
+
+  static LIR_Opr r10_metadata_opr;
+  static LIR_Opr r11_metadata_opr;
+  static LIR_Opr r12_metadata_opr;
+  static LIR_Opr r13_metadata_opr;
+  static LIR_Opr r14_metadata_opr;
+  static LIR_Opr r15_metadata_opr;
+
+  static LIR_Opr long10_opr;
+  static LIR_Opr long11_opr;
+  static LIR_Opr fpu10_float_opr;
+  static LIR_Opr fpu10_double_opr;
+
+  static LIR_Opr as_long_opr(Register r) {
+    return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r));
+  }
+  static LIR_Opr as_pointer_opr(Register r) {
+    return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r));
+  }
+
+  // VMReg name for spilled physical FPU stack slot n
+  static VMReg fpu_regname(int n);
+
+  static bool is_caller_save_register(LIR_Opr opr) { return true; }
+  static bool is_caller_save_register(Register r)  { return true; }
+
+  static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; }
+  static int last_cpu_reg()             { return pd_last_cpu_reg; }
+
+#endif // CPU_RISCV_C1_FRAMEMAP_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
new file mode 100644
index 00000000000..4c1c13dc290
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+
+#ifndef PRODUCT
+#define COMMENT(x)   do { __ block_comment(x); } while (0)
+#else
+#define COMMENT(x)
+#endif
+
+#define __ _masm->
+
+void LIR_Assembler::arithmetic_idiv(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr illegal,
+                                    LIR_Opr result, CodeEmitInfo* info) {
+  // opcode check
+  assert((code == lir_idiv) || (code == lir_irem), "opcode must be idiv or irem");
+  bool is_irem = (code == lir_irem);
+  // opreand check
+  assert(left->is_single_cpu(), "left must be a register");
+  assert(right->is_single_cpu() || right->is_constant(), "right must be a register or constant");
+  assert(result->is_single_cpu(), "result must be a register");
+  Register lreg = left->as_register();
+  Register dreg = result->as_register();
+
+  // power-of-2 constant check and codegen
+  if (right->is_constant()) {
+    int c = right->as_constant_ptr()->as_jint();
+    assert(c > 0 && is_power_of_2(c), "divisor must be power-of-2 constant");
+    if (is_irem) {
+      if (c == 1) {
+        // move 0 to dreg if divisor is 1
+        __ mv(dreg, zr);
+      } else {
+        unsigned int shift = exact_log2(c);
+        __ sraiw(t0, lreg, 0x1f);
+        __ srliw(t0, t0, BitsPerInt - shift);
+        __ addw(t1, lreg, t0);
+        if (is_imm_in_range(c - 1, 12, 0)) {
+          __ andi(t1, t1, c - 1);
+        } else {
+          __ zero_extend(t1, t1, shift);
+        }
+        __ subw(dreg, t1, t0);
+      }
+    } else {
+      if (c == 1) {
+        // move lreg to dreg if divisor is 1
+        __ mv(dreg, lreg);
+      } else {
+        unsigned int shift = exact_log2(c);
+        __ sraiw(t0, lreg, 0x1f);
+        if (is_imm_in_range(c - 1, 12, 0)) {
+          __ andi(t0, t0, c - 1);
+        } else {
+          __ zero_extend(t0, t0, shift);
+        }
+        __ addw(dreg, t0, lreg);
+        __ sraiw(dreg, dreg, shift);
+      }
+    }
+  } else {
+    Register rreg = right->as_register();
+    __ corrected_idivl(dreg, lreg, rreg, is_irem);
+  }
+}
+
+void LIR_Assembler::arith_op_single_cpu_right_constant(LIR_Code code, LIR_Opr left, LIR_Opr right,
+                                                       Register lreg, Register dreg) {
+  // cpu register - constant
+  jlong c;
+
+  switch (right->type()) {
+    case T_LONG:
+      c = right->as_constant_ptr()->as_jlong(); break;
+    case T_INT:     // fall through
+    case T_ADDRESS:
+      c = right->as_constant_ptr()->as_jint(); break;
+    default:
+      ShouldNotReachHere();
+      c = 0;   // unreachable
+  }
+
+  assert(code == lir_add || code == lir_sub, "mismatched arithmetic op");
+  if (c == 0 && dreg == lreg) {
+    COMMENT("effective nop elided");
+    return;
+  }
+  switch (left->type()) {
+    case T_INT:
+      switch (code) {
+        case lir_add: __ addw(dreg, lreg, c); break;
+        case lir_sub: __ subw(dreg, lreg, c); break;
+        default:      ShouldNotReachHere();
+      }
+    break;
+    case T_OBJECT:  // fall through
+    case T_ADDRESS:
+      switch (code) {
+        case lir_add: __ add(dreg, lreg, c); break;
+        case lir_sub: __ sub(dreg, lreg, c); break;
+        default:      ShouldNotReachHere();
+      }
+    break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::arith_op_single_cpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) {
+  Register lreg = left->as_register();
+  Register dreg = as_reg(dest);
+
+  if (right->is_single_cpu()) {
+    // cpu register - cpu register
+    assert(left->type() == T_INT && right->type() == T_INT && dest->type() == T_INT, "should be");
+    Register rreg = right->as_register();
+    switch (code) {
+      case lir_add: __ addw(dest->as_register(), lreg, rreg); break;
+      case lir_sub: __ subw(dest->as_register(), lreg, rreg); break;
+      case lir_mul: __ mulw(dest->as_register(), lreg, rreg); break;
+      default:      ShouldNotReachHere();
+    }
+  } else if (right->is_double_cpu()) {
+    Register rreg = right->as_register_lo();
+    // sigle_cpu + double_cpu; can happen with obj_long
+    assert(code == lir_add || code == lir_sub, "mismatched arithmetic op");
+    switch (code) {
+      case lir_add: __ add(dreg, lreg, rreg); break;
+      case lir_sub: __ sub(dreg, lreg, rreg); break;
+      default:      ShouldNotReachHere();
+    }
+  } else if (right->is_constant()) {
+    arith_op_single_cpu_right_constant(code, left, right, lreg, dreg);
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::arith_op_double_cpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) {
+  Register lreg_lo = left->as_register_lo();
+
+  if (right->is_double_cpu()) {
+    // cpu register - cpu register
+    Register rreg_lo = right->as_register_lo();
+    switch (code) {
+      case lir_add: __ add(dest->as_register_lo(), lreg_lo, rreg_lo); break;
+      case lir_sub: __ sub(dest->as_register_lo(), lreg_lo, rreg_lo); break;
+      case lir_mul: __ mul(dest->as_register_lo(), lreg_lo, rreg_lo); break;
+      case lir_div: __ corrected_idivq(dest->as_register_lo(), lreg_lo, rreg_lo, false); break;
+      case lir_rem: __ corrected_idivq(dest->as_register_lo(), lreg_lo, rreg_lo, true); break;
+      default:
+        ShouldNotReachHere();
+    }
+  } else if (right->is_constant()) {
+    jlong c = right->as_constant_ptr()->as_jlong();
+    Register dreg = as_reg(dest);
+    switch (code) {
+      case lir_add: // fall through
+      case lir_sub:
+        if (c == 0 && dreg == lreg_lo) {
+          COMMENT("effective nop elided");
+          return;
+        }
+        code == lir_add ? __ add(dreg, lreg_lo, c) : __ sub(dreg, lreg_lo, c);
+        break;
+      case lir_div:
+        assert(c > 0 && is_power_of_2(c), "divisor must be power-of-2 constant");
+        if (c == 1) {
+          // move lreg_lo to dreg if divisor is 1
+          __ mv(dreg, lreg_lo);
+        } else {
+          unsigned int shift = exact_log2_long(c);
+          // use t0 as intermediate result register
+          __ srai(t0, lreg_lo, 0x3f);
+          if (is_imm_in_range(c - 1, 12, 0)) {
+            __ andi(t0, t0, c - 1);
+          } else {
+            __ zero_extend(t0, t0, shift);
+          }
+          __ add(dreg, t0, lreg_lo);
+          __ srai(dreg, dreg, shift);
+        }
+        break;
+      case lir_rem:
+        assert(c > 0 && is_power_of_2(c), "divisor must be power-of-2 constant");
+        if (c == 1) {
+          // move 0 to dreg if divisor is 1
+          __ mv(dreg, zr);
+        } else {
+          unsigned int shift = exact_log2_long(c);
+          __ srai(t0, lreg_lo, 0x3f);
+          __ srli(t0, t0, BitsPerLong - shift);
+          __ add(t1, lreg_lo, t0);
+          if (is_imm_in_range(c - 1, 12, 0)) {
+            __ andi(t1, t1, c - 1);
+          } else {
+            __ zero_extend(t1, t1, shift);
+          }
+          __ sub(dreg, t1, t0);
+        }
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::arith_op_single_fpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) {
+  assert(right->is_single_fpu(), "right hand side of float arithmetics needs to be float register");
+  switch (code) {
+    case lir_add: __ fadd_s(dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
+    case lir_sub: __ fsub_s(dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
+    case lir_mul: __ fmul_s(dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
+    case lir_div: __ fdiv_s(dest->as_float_reg(), left->as_float_reg(), right->as_float_reg()); break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::arith_op_double_fpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest) {
+  if (right->is_double_fpu()) {
+    // fpu register - fpu register
+    switch (code) {
+      case lir_add: __ fadd_d(dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
+      case lir_sub: __ fsub_d(dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
+      case lir_mul: __ fmul_d(dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
+      case lir_div: __ fdiv_d(dest->as_double_reg(), left->as_double_reg(), right->as_double_reg()); break;
+      default:
+        ShouldNotReachHere();
+    }
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest,
+                             CodeEmitInfo* info, bool pop_fpu_stack) {
+  assert(info == NULL, "should never be used, idiv/irem and ldiv/lrem not handled by this method");
+
+  if (left->is_single_cpu()) {
+    arith_op_single_cpu(code, left, right, dest);
+  } else if (left->is_double_cpu()) {
+    arith_op_double_cpu(code, left, right, dest);
+  } else if (left->is_single_fpu()) {
+    arith_op_single_fpu(code, left, right, dest);
+  } else if (left->is_double_fpu()) {
+    arith_op_double_fpu(code, left, right, dest);
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+#undef __
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.hpp
new file mode 100644
index 00000000000..ab0a9963fc1
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_LIRASSEMBLER_ARITH_RISCV_HPP
+#define CPU_RISCV_C1_LIRASSEMBLER_ARITH_RISCV_HPP
+
+  // arith_op sub functions
+  void arith_op_single_cpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
+  void arith_op_double_cpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
+  void arith_op_single_fpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
+  void arith_op_double_fpu(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
+  void arith_op_single_cpu_right_constant(LIR_Code code, LIR_Opr left, LIR_Opr right, Register lreg, Register dreg);
+  void arithmetic_idiv(LIR_Op3* op, bool is_irem);
+
+#endif // CPU_RISCV_C1_LIRASSEMBLER_ARITH_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp
new file mode 100644
index 00000000000..b7f53e395f3
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.cpp
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "ci/ciArrayKlass.hpp"
+#include "oops/objArrayKlass.hpp"
+#include "runtime/stubRoutines.hpp"
+
+#define __ _masm->
+
+
+void LIR_Assembler::generic_arraycopy(Register src, Register src_pos, Register length,
+                                      Register dst, Register dst_pos, CodeStub *stub) {
+  assert(src == x11 && src_pos == x12, "mismatch in calling convention");
+  // Save the arguments in case the generic arraycopy fails and we
+  // have to fall back to the JNI stub
+  arraycopy_store_args(src, src_pos, length, dst, dst_pos);
+
+  address copyfunc_addr = StubRoutines::generic_arraycopy();
+  assert(copyfunc_addr != NULL, "generic arraycopy stub required");
+
+  // The arguments are in java calling convention so we shift them
+  // to C convention
+  assert_different_registers(c_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4);
+  __ mv(c_rarg0, j_rarg0);
+  assert_different_registers(c_rarg1, j_rarg2, j_rarg3, j_rarg4);
+  __ mv(c_rarg1, j_rarg1);
+  assert_different_registers(c_rarg2, j_rarg3, j_rarg4);
+  __ mv(c_rarg2, j_rarg2);
+  assert_different_registers(c_rarg3, j_rarg4);
+  __ mv(c_rarg3, j_rarg3);
+  __ mv(c_rarg4, j_rarg4);
+#ifndef PRODUCT
+  if (PrintC1Statistics) {
+    __ add_memory_int32(ExternalAddress((address)&Runtime1::_generic_arraycopystub_cnt), 1);
+  }
+#endif
+  __ far_call(RuntimeAddress(copyfunc_addr));
+  __ beqz(x10, *stub->continuation());
+  // Reload values from the stack so they are where the stub
+  // expects them.
+  arraycopy_load_args(src, src_pos, length, dst, dst_pos);
+
+  // x10 is -1^K where K == partial copied count
+  __ xori(t0, x10, -1);
+  // adjust length down and src/end pos up by partial copied count
+  __ subw(length, length, t0);
+  __ addw(src_pos, src_pos, t0);
+  __ addw(dst_pos, dst_pos, t0);
+  __ j(*stub->entry());
+
+  __ bind(*stub->continuation());
+}
+
+void LIR_Assembler::arraycopy_simple_check(Register src, Register src_pos, Register length,
+                                           Register dst, Register dst_pos, Register tmp,
+                                           CodeStub *stub, int flags) {
+  // test for NULL
+  if (flags & LIR_OpArrayCopy::src_null_check) {
+    __ beqz(src, *stub->entry(), /* is_far */ true);
+  }
+  if (flags & LIR_OpArrayCopy::dst_null_check) {
+    __ beqz(dst, *stub->entry(), /* is_far */ true);
+  }
+
+  // If the compiler was not able to prove that exact type of the source or the destination
+  // of the arraycopy is an array type, check at runtime if the source or the destination is
+  // an instance type.
+  if (flags & LIR_OpArrayCopy::type_check) {
+    if (!(flags & LIR_OpArrayCopy::LIR_OpArrayCopy::dst_objarray)) {
+      __ load_klass(tmp, dst);
+      __ lw(t0, Address(tmp, in_bytes(Klass::layout_helper_offset())));
+      __ li(t1, Klass::_lh_neutral_value);
+      __ bge(t0, t1, *stub->entry(), /* is_far */ true);
+    }
+
+    if (!(flags & LIR_OpArrayCopy::LIR_OpArrayCopy::src_objarray)) {
+      __ load_klass(tmp, src);
+      __ lw(t0, Address(tmp, in_bytes(Klass::layout_helper_offset())));
+      __ li(t1, Klass::_lh_neutral_value);
+      __ bge(t0, t1, *stub->entry(), /* is_far */ true);
+    }
+  }
+
+  // check if negative
+  if (flags & LIR_OpArrayCopy::src_pos_positive_check) {
+    __ bltz(src_pos, *stub->entry(), /* is_far */ true);
+  }
+  if (flags & LIR_OpArrayCopy::dst_pos_positive_check) {
+    __ bltz(dst_pos, *stub->entry(), /* is_far */ true);
+  }
+  if (flags & LIR_OpArrayCopy::length_positive_check) {
+    __ bltz(length, *stub->entry(), /* is_far */ true);
+  }
+
+  if (flags & LIR_OpArrayCopy::src_range_check) {
+    __ addw(tmp, src_pos, length);
+    __ lwu(t0, Address(src, arrayOopDesc::length_offset_in_bytes()));
+    __ bgtu(tmp, t0, *stub->entry(), /* is_far */ true);
+  }
+  if (flags & LIR_OpArrayCopy::dst_range_check) {
+    __ addw(tmp, dst_pos, length);
+    __ lwu(t0, Address(dst, arrayOopDesc::length_offset_in_bytes()));
+    __ bgtu(tmp, t0, *stub->entry(), /* is_far */ true);
+  }
+}
+
+void LIR_Assembler::arraycopy_checkcast(Register src, Register src_pos, Register length,
+                                        Register dst, Register dst_pos, Register tmp,
+                                        CodeStub *stub, BasicType basic_type,
+                                        address copyfunc_addr, int flags) {
+  // src is not a sub class of dst so we have to do a
+  // per-element check.
+  int mask = LIR_OpArrayCopy::src_objarray | LIR_OpArrayCopy::dst_objarray;
+  if ((flags & mask) != mask) {
+    // Check that at least both of them object arrays.
+    assert(flags & mask, "one of the two should be known to be an object array");
+
+    if (!(flags & LIR_OpArrayCopy::src_objarray)) {
+      __ load_klass(tmp, src);
+    } else if (!(flags & LIR_OpArrayCopy::dst_objarray)) {
+      __ load_klass(tmp, dst);
+    }
+    int lh_offset = in_bytes(Klass::layout_helper_offset());
+    Address klass_lh_addr(tmp, lh_offset);
+    jint objArray_lh = Klass::array_layout_helper(T_OBJECT);
+    __ lw(t0, klass_lh_addr);
+    __ mvw(t1, objArray_lh);
+    __ bne(t0, t1, *stub->entry(), /* is_far */ true);
+  }
+
+  // Spill because stubs can use any register they like and it's
+  // easier to restore just those that we care about.
+  arraycopy_store_args(src, src_pos, length, dst, dst_pos);
+  arraycopy_checkcast_prepare_params(src, src_pos, length, dst, dst_pos, basic_type);
+  __ far_call(RuntimeAddress(copyfunc_addr));
+
+#ifndef PRODUCT
+  if (PrintC1Statistics) {
+    Label failed;
+    __ bnez(x10, failed);
+    __ add_memory_int32(ExternalAddress((address)&Runtime1::_arraycopy_checkcast_cnt), 1);
+    __ bind(failed);
+  }
+#endif
+
+  __ beqz(x10, *stub->continuation());
+
+#ifndef PRODUCT
+  if (PrintC1Statistics) {
+    __ add_memory_int32(ExternalAddress((address)&Runtime1::_arraycopy_checkcast_attempt_cnt), 1);
+  }
+#endif
+  assert_different_registers(dst, dst_pos, length, src_pos, src, x10, t0);
+
+  // Restore previously spilled arguments
+  arraycopy_load_args(src, src_pos, length, dst, dst_pos);
+
+  // return value is -1^K where K is partial copied count
+  __ xori(t0, x10, -1);
+  // adjust length down and src/end pos up by partial copied count
+  __ subw(length, length, t0);
+  __ addw(src_pos, src_pos, t0);
+  __ addw(dst_pos, dst_pos, t0);
+}
+
+void LIR_Assembler::arraycopy_type_check(Register src, Register src_pos, Register length,
+                                         Register dst, Register dst_pos, Register tmp,
+                                         CodeStub *stub, BasicType basic_type, int flags) {
+  // We don't know the array types are compatible
+  if (basic_type != T_OBJECT) {
+    // Simple test for basic type arrays
+    if (UseCompressedClassPointers) {
+      __ lwu(tmp, Address(src, oopDesc::klass_offset_in_bytes()));
+      __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
+    } else {
+      __ ld(tmp, Address(src, oopDesc::klass_offset_in_bytes()));
+      __ ld(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
+    }
+    __ bne(tmp, t0, *stub->entry(), /* is_far */ true);
+  } else {
+    // For object arrays, if src is a sub class of dst then we can
+    // safely do the copy.
+    Label cont, slow;
+
+#define PUSH(r1, r2)                                     \
+    __ addi(sp, sp, -2 * wordSize);                      \
+    __ sd(r1, Address(sp, 1 * wordSize));                \
+    __ sd(r2, Address(sp, 0));
+
+#define POP(r1, r2)                                      \
+    __ ld(r1, Address(sp, 1 * wordSize));                \
+    __ ld(r2, Address(sp, 0));                           \
+    __ addi(sp, sp, 2 * wordSize);
+
+    PUSH(src, dst);
+    __ load_klass(src, src);
+    __ load_klass(dst, dst);
+    __ check_klass_subtype_fast_path(src, dst, tmp, &cont, &slow, NULL);
+
+    PUSH(src, dst);
+    __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
+    POP(src, dst);
+    __ bnez(dst, cont);
+
+    __ bind(slow);
+    POP(src, dst);
+
+    address copyfunc_addr = StubRoutines::checkcast_arraycopy();
+    if (copyfunc_addr != NULL) { // use stub if available
+      arraycopy_checkcast(src, src_pos, length, dst, dst_pos, tmp, stub, basic_type, copyfunc_addr, flags);
+    }
+
+    __ j(*stub->entry());
+    __ bind(cont);
+    POP(src, dst);
+  }
+}
+
+void LIR_Assembler::arraycopy_assert(Register src, Register dst, Register tmp, ciArrayKlass *default_type, int flags) {
+  assert(default_type != NULL, "NULL default_type!");
+  BasicType basic_type = default_type->element_type()->basic_type();
+
+  if (basic_type == T_ARRAY) { basic_type = T_OBJECT; }
+  if (basic_type != T_OBJECT || !(flags & LIR_OpArrayCopy::type_check)) {
+    // Sanity check the known type with the incoming class.  For the
+    // primitive case the types must match exactly with src.klass and
+    // dst.klass each exactly matching the default type.  For the
+    // object array case, if no type check is needed then either the
+    // dst type is exactly the expected type and the src type is a
+    // subtype which we can't check or src is the same array as dst
+    // but not necessarily exactly of type default_type.
+    Label known_ok, halt;
+    __ mov_metadata(tmp, default_type->constant_encoding());
+    if (UseCompressedClassPointers) {
+      __ encode_klass_not_null(tmp);
+    }
+
+    if (basic_type != T_OBJECT) {
+      if (UseCompressedClassPointers) {
+        __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
+      } else {
+        __ ld(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
+      }
+      __ bne(tmp, t0, halt);
+      if (UseCompressedClassPointers) {
+        __ lwu(t0, Address(src, oopDesc::klass_offset_in_bytes()));
+      } else {
+        __ ld(t0, Address(src, oopDesc::klass_offset_in_bytes()));
+      }
+      __ beq(tmp, t0, known_ok);
+    } else {
+      if (UseCompressedClassPointers) {
+        __ lwu(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
+      } else {
+        __ ld(t0, Address(dst, oopDesc::klass_offset_in_bytes()));
+      }
+      __ beq(tmp, t0, known_ok);
+      __ beq(src, dst, known_ok);
+    }
+    __ bind(halt);
+    __ stop("incorrect type information in arraycopy");
+    __ bind(known_ok);
+  }
+}
+
+void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
+  ciArrayKlass *default_type = op->expected_type();
+  Register src = op->src()->as_register();
+  Register dst = op->dst()->as_register();
+  Register src_pos = op->src_pos()->as_register();
+  Register dst_pos = op->dst_pos()->as_register();
+  Register length = op->length()->as_register();
+  Register tmp = op->tmp()->as_register();
+
+  CodeStub* stub = op->stub();
+  int flags = op->flags();
+  BasicType basic_type = default_type != NULL ? default_type->element_type()->basic_type() : T_ILLEGAL;
+  if (is_reference_type(basic_type)) { basic_type = T_OBJECT; }
+
+  // if we don't know anything, just go through the generic arraycopy
+  if (default_type == NULL) {
+    generic_arraycopy(src, src_pos, length, dst, dst_pos, stub);
+    return;
+  }
+
+  assert(default_type != NULL && default_type->is_array_klass() && default_type->is_loaded(),
+         "must be true at this point");
+
+  arraycopy_simple_check(src, src_pos, length, dst, dst_pos, tmp, stub, flags);
+
+  if (flags & LIR_OpArrayCopy::type_check) {
+    arraycopy_type_check(src, src_pos, length, dst, dst_pos, tmp, stub, basic_type, flags);
+  }
+
+#ifdef ASSERT
+  arraycopy_assert(src, dst, tmp, default_type, flags);
+#endif
+
+#ifndef PRODUCT
+  if (PrintC1Statistics) {
+    __ add_memory_int32(ExternalAddress(Runtime1::arraycopy_count_address(basic_type)), 1);
+  }
+#endif
+  arraycopy_prepare_params(src, src_pos, length, dst, dst_pos, basic_type);
+
+  bool disjoint = (flags & LIR_OpArrayCopy::overlapping) == 0;
+  bool aligned = (flags & LIR_OpArrayCopy::unaligned) == 0;
+  const char *name = NULL;
+  address entry = StubRoutines::select_arraycopy_function(basic_type, aligned, disjoint, name, false);
+
+  CodeBlob *cb = CodeCache::find_blob(entry);
+  if (cb != NULL) {
+    __ far_call(RuntimeAddress(entry));
+  } else {
+    const int args_num = 3;
+    __ call_VM_leaf(entry, args_num);
+  }
+
+  __ bind(*stub->continuation());
+}
+
+
+void LIR_Assembler::arraycopy_prepare_params(Register src, Register src_pos, Register length,
+                                             Register dst, Register dst_pos, BasicType basic_type) {
+  int scale = array_element_size(basic_type);
+  __ shadd(c_rarg0, src_pos, src, t0, scale);
+  __ add(c_rarg0, c_rarg0, arrayOopDesc::base_offset_in_bytes(basic_type));
+  assert_different_registers(c_rarg0, dst, dst_pos, length);
+  __ shadd(c_rarg1, dst_pos, dst, t0, scale);
+  __ add(c_rarg1, c_rarg1, arrayOopDesc::base_offset_in_bytes(basic_type));
+  assert_different_registers(c_rarg1, dst, length);
+  __ mv(c_rarg2, length);
+  assert_different_registers(c_rarg2, dst);
+}
+
+void LIR_Assembler::arraycopy_checkcast_prepare_params(Register src, Register src_pos, Register length,
+                                                       Register dst, Register dst_pos, BasicType basic_type) {
+  arraycopy_prepare_params(src, src_pos, length, dst, dst_pos, basic_type);
+  __ load_klass(c_rarg4, dst);
+  __ ld(c_rarg4, Address(c_rarg4, ObjArrayKlass::element_klass_offset()));
+  __ lwu(c_rarg3, Address(c_rarg4, Klass::super_check_offset_offset()));
+}
+
+void LIR_Assembler::arraycopy_store_args(Register src, Register src_pos, Register length,
+                                         Register dst, Register dst_pos) {
+  __ sd(dst_pos, Address(sp, 0));                // 0: dst_pos sp offset
+  __ sd(dst, Address(sp, 1 * BytesPerWord));     // 1: dst sp offset
+  __ sd(length, Address(sp, 2 * BytesPerWord));  // 2: length sp offset
+  __ sd(src_pos, Address(sp, 3 * BytesPerWord)); // 3: src_pos sp offset
+  __ sd(src, Address(sp, 4 * BytesPerWord));     // 4: src sp offset
+}
+
+void LIR_Assembler::arraycopy_load_args(Register src, Register src_pos, Register length,
+                                        Register dst, Register dst_pos) {
+  __ ld(dst_pos, Address(sp, 0));                // 0: dst_pos sp offset
+  __ ld(dst, Address(sp, 1 * BytesPerWord));     // 1: dst sp offset
+  __ ld(length, Address(sp, 2 * BytesPerWord));  // 2: length sp offset
+  __ ld(src_pos, Address(sp, 3 * BytesPerWord)); // 3: src_pos sp offset
+  __ ld(src, Address(sp, 4 * BytesPerWord));     // 4: src sp offset
+}
+
+#undef __
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.hpp
new file mode 100644
index 00000000000..06a0f248ca6
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_arraycopy_riscv.hpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_LIRASSEMBLER_ARRAYCOPY_RISCV_HPP
+#define CPU_RISCV_C1_LIRASSEMBLER_ARRAYCOPY_RISCV_HPP
+
+  // arraycopy sub functions
+  void generic_arraycopy(Register src, Register src_pos, Register length,
+                         Register dst, Register dst_pos, CodeStub *stub);
+  void arraycopy_simple_check(Register src, Register src_pos, Register length,
+                              Register dst, Register dst_pos, Register tmp,
+                              CodeStub *stub, int flags);
+  void arraycopy_checkcast(Register src, Register src_pos, Register length,
+                           Register dst, Register dst_pos, Register tmp,
+                           CodeStub *stub, BasicType basic_type,
+                           address copyfunc_addr, int flags);
+  void arraycopy_type_check(Register src, Register src_pos, Register length,
+                            Register dst, Register dst_pos, Register tmp,
+                            CodeStub *stub, BasicType basic_type, int flags);
+  void arraycopy_assert(Register src, Register dst, Register tmp, ciArrayKlass *default_type, int flags);
+  void arraycopy_prepare_params(Register src, Register src_pos, Register length,
+                                Register dst, Register dst_pos, BasicType basic_type);
+  void arraycopy_checkcast_prepare_params(Register src, Register src_pos, Register length,
+                                          Register dst, Register dst_pos, BasicType basic_type);
+  void arraycopy_store_args(Register src, Register src_pos, Register length,
+                            Register dst, Register dst_pos);
+  void arraycopy_load_args(Register src, Register src_pos, Register length,
+                           Register dst, Register dst_pos);
+
+#endif // CPU_RISCV_C1_LIRASSEMBLER_ARRAYCOPY_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
new file mode 100644
index 00000000000..742c2126e60
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -0,0 +1,2267 @@
+/*
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "c1/c1_CodeStubs.hpp"
+#include "c1/c1_Compilation.hpp"
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "c1/c1_Runtime1.hpp"
+#include "c1/c1_ValueStack.hpp"
+#include "ci/ciArrayKlass.hpp"
+#include "ci/ciInstance.hpp"
+#include "code/compiledIC.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "nativeInst_riscv.hpp"
+#include "oops/objArrayKlass.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "utilities/powerOfTwo.hpp"
+#include "vmreg_riscv.inline.hpp"
+
+#ifndef PRODUCT
+#define COMMENT(x)   do { __ block_comment(x); } while (0)
+#else
+#define COMMENT(x)
+#endif
+
+NEEDS_CLEANUP // remove this definitions ?
+const Register IC_Klass    = t1;    // where the IC klass is cached
+const Register SYNC_header = x10;   // synchronization header
+const Register SHIFT_count = x10;   // where count for shift operations must be
+
+#define __ _masm->
+
+static void select_different_registers(Register preserve,
+                                       Register extra,
+                                       Register &tmp1,
+                                       Register &tmp2) {
+  if (tmp1 == preserve) {
+    assert_different_registers(tmp1, tmp2, extra);
+    tmp1 = extra;
+  } else if (tmp2 == preserve) {
+    assert_different_registers(tmp1, tmp2, extra);
+    tmp2 = extra;
+  }
+  assert_different_registers(preserve, tmp1, tmp2);
+}
+
+static void select_different_registers(Register preserve,
+                                       Register extra,
+                                       Register &tmp1,
+                                       Register &tmp2,
+                                       Register &tmp3) {
+  if (tmp1 == preserve) {
+    assert_different_registers(tmp1, tmp2, tmp3, extra);
+    tmp1 = extra;
+  } else if (tmp2 == preserve) {
+    assert_different_registers(tmp1, tmp2, tmp3, extra);
+    tmp2 = extra;
+  } else if (tmp3 == preserve) {
+    assert_different_registers(tmp1, tmp2, tmp3, extra);
+    tmp3 = extra;
+  }
+  assert_different_registers(preserve, tmp1, tmp2, tmp3);
+}
+
+bool LIR_Assembler::is_small_constant(LIR_Opr opr) { Unimplemented(); return false; }
+
+void LIR_Assembler::clinit_barrier(ciMethod* method) {
+  assert(VM_Version::supports_fast_class_init_checks(), "sanity");
+  assert(!method->holder()->is_not_initialized(), "initialization should have been started");
+
+  Label L_skip_barrier;
+
+  __ mov_metadata(t1, method->holder()->constant_encoding());
+  __ clinit_barrier(t1, t0, &L_skip_barrier /* L_fast_path */);
+  __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+  __ bind(L_skip_barrier);
+}
+
+LIR_Opr LIR_Assembler::receiverOpr() {
+  return FrameMap::receiver_opr;
+}
+
+LIR_Opr LIR_Assembler::osrBufferPointer() {
+  return FrameMap::as_pointer_opr(receiverOpr()->as_register());
+}
+
+void LIR_Assembler::breakpoint() { Unimplemented(); }
+
+void LIR_Assembler::push(LIR_Opr opr) { Unimplemented(); }
+
+void LIR_Assembler::pop(LIR_Opr opr) { Unimplemented(); }
+
+static jlong as_long(LIR_Opr data) {
+  jlong result;
+  switch (data->type()) {
+    case T_INT:
+      result = (data->as_jint());
+      break;
+    case T_LONG:
+      result = (data->as_jlong());
+      break;
+    default:
+      ShouldNotReachHere();
+      result = 0;  // unreachable
+  }
+  return result;
+}
+
+Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp) {
+  if (addr->base()->is_illegal()) {
+    assert(addr->index()->is_illegal(), "must be illegal too");
+    __ movptr(tmp, addr->disp());
+    return Address(tmp, 0);
+  }
+
+  Register base = addr->base()->as_pointer_register();
+  LIR_Opr index_opr = addr->index();
+
+  if (index_opr->is_illegal()) {
+    return Address(base, addr->disp());
+  }
+
+  int scale = addr->scale();
+  if (index_opr->is_cpu_register()) {
+    Register index;
+    if (index_opr->is_single_cpu()) {
+      index = index_opr->as_register();
+    } else {
+      index = index_opr->as_register_lo();
+    }
+    if (scale != 0) {
+      __ shadd(tmp, index, base, tmp, scale);
+    } else {
+      __ add(tmp, base, index);
+    }
+    return Address(tmp, addr->disp());
+  } else if (index_opr->is_constant()) {
+    intptr_t addr_offset = (((intptr_t)index_opr->as_constant_ptr()->as_jint()) << scale) + addr->disp();
+    return Address(base, addr_offset);
+  }
+
+  Unimplemented();
+  return Address();
+}
+
+Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
+  ShouldNotReachHere();
+  return Address();
+}
+
+Address LIR_Assembler::as_Address(LIR_Address* addr) {
+  return as_Address(addr, t0);
+}
+
+Address LIR_Assembler::as_Address_lo(LIR_Address* addr) {
+  return as_Address(addr);
+}
+
+// Ensure a valid Address (base + offset) to a stack-slot. If stack access is
+// not encodable as a base + (immediate) offset, generate an explicit address
+// calculation to hold the address in t0.
+Address LIR_Assembler::stack_slot_address(int index, uint size, int adjust) {
+  precond(size == 4 || size == 8);
+  Address addr = frame_map()->address_for_slot(index, adjust);
+  precond(addr.getMode() == Address::base_plus_offset);
+  precond(addr.base() == sp);
+  precond(addr.offset() > 0);
+  uint mask = size - 1;
+  assert((addr.offset() & mask) == 0, "scaled offsets only");
+
+  return addr;
+}
+
+void LIR_Assembler::osr_entry() {
+  offsets()->set_value(CodeOffsets::OSR_Entry, code_offset());
+  BlockBegin* osr_entry = compilation()->hir()->osr_entry();
+  guarantee(osr_entry != NULL, "NULL osr_entry!");
+  ValueStack* entry_state = osr_entry->state();
+  int number_of_locks = entry_state->locks_size();
+
+  // we jump here if osr happens with the interpreter
+  // state set up to continue at the beginning of the
+  // loop that triggered osr - in particular, we have
+  // the following registers setup:
+  //
+  // x12: osr buffer
+  //
+
+  //build frame
+  ciMethod* m = compilation()->method();
+  __ build_frame(initial_frame_size_in_bytes(), bang_size_in_bytes());
+
+  // OSR buffer is
+  //
+  // locals[nlocals-1..0]
+  // monitors[0..number_of_locks]
+  //
+  // locals is a direct copy of the interpreter frame so in the osr buffer
+  // so first slot in the local array is the last local from the interpreter
+  // and last slot is local[0] (receiver) from the interpreter
+  //
+  // Similarly with locks. The first lock slot in the osr buffer is the nth lock
+  // from the interpreter frame, the nth lock slot in the osr buffer is 0th lock
+  // in the interpreter frame (the method lock if a sync method)
+
+  // Initialize monitors in the compiled activation.
+  //   x12: pointer to osr buffer
+  // All other registers are dead at this point and the locals will be
+  // copied into place by code emitted in the IR.
+
+  Register OSR_buf = osrBufferPointer()->as_pointer_register();
+  {
+    assert(frame::interpreter_frame_monitor_size() == BasicObjectLock::size(), "adjust code below");
+    int monitor_offset = BytesPerWord * method()->max_locals() +
+      (2 * BytesPerWord) * (number_of_locks - 1);
+    // SharedRuntime::OSR_migration_begin() packs BasicObjectLocks in
+    // the OSR buffer using 2 word entries: first the lock and then
+    // the oop.
+    for (int i = 0; i < number_of_locks; i++) {
+      int slot_offset = monitor_offset - ((i * 2) * BytesPerWord);
+#ifdef ASSERT
+      // verify the interpreter's monitor has a non-null object
+      {
+        Label L;
+        __ ld(t0, Address(OSR_buf, slot_offset + 1 * BytesPerWord));
+        __ bnez(t0, L);
+        __ stop("locked object is NULL");
+        __ bind(L);
+      }
+#endif // ASSERT
+      __ ld(x9, Address(OSR_buf, slot_offset + 0));
+      __ sd(x9, frame_map()->address_for_monitor_lock(i));
+      __ ld(x9, Address(OSR_buf, slot_offset + 1 * BytesPerWord));
+      __ sd(x9, frame_map()->address_for_monitor_object(i));
+    }
+  }
+}
+
+// inline cache check; done before the frame is built.
+int LIR_Assembler::check_icache() {
+  Register receiver = FrameMap::receiver_opr->as_register();
+  Register ic_klass = IC_Klass;
+  int start_offset = __ offset();
+  Label dont;
+  __ inline_cache_check(receiver, ic_klass, dont);
+
+  // if icache check fails, then jump to runtime routine
+  // Note: RECEIVER must still contain the receiver!
+  __ far_jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
+
+  // We align the verified entry point unless the method body
+  // (including its inline cache check) will fit in a single 64-byte
+  // icache line.
+  if (!method()->is_accessor() || __ offset() - start_offset > 4 * 4) {
+    // force alignment after the cache check.
+    __ align(CodeEntryAlignment);
+  }
+
+  __ bind(dont);
+  return start_offset;
+}
+
+void LIR_Assembler::jobject2reg(jobject o, Register reg) {
+  if (o == NULL) {
+    __ mv(reg, zr);
+  } else {
+    __ movoop(reg, o, /* immediate */ true);
+  }
+}
+
+void LIR_Assembler::jobject2reg_with_patching(Register reg, CodeEmitInfo *info) {
+  deoptimize_trap(info);
+}
+
+// This specifies the rsp decrement needed to build the frame
+int LIR_Assembler::initial_frame_size_in_bytes() const {
+  // if rounding, must let FrameMap know!
+
+  return in_bytes(frame_map()->framesize_in_bytes());
+}
+
+int LIR_Assembler::emit_exception_handler() {
+  // if the last instruction is a call (typically to do a throw which
+  // is coming at the end after block reordering) the return address
+  // must still point into the code area in order to avoid assertion
+  // failures when searching for the corresponding bci ==> add a nop
+  // (was bug 5/14/1999 -gri)
+  __ nop();
+
+  // generate code for exception handler
+  address handler_base = __ start_a_stub(exception_handler_size());
+  if (handler_base == NULL) {
+    // not enough space left for the handler
+    bailout("exception handler overflow");
+    return -1;
+  }
+
+  int offset = code_offset();
+
+  // the exception oop and pc are in x10, and x13
+  // no other registers need to be preserved, so invalidate them
+  __ invalidate_registers(false, true, true, false, true, true);
+
+  // check that there is really an exception
+  __ verify_not_null_oop(x10);
+
+  // search an exception handler (x10: exception oop, x13: throwing pc)
+  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::handle_exception_from_callee_id)));
+  __ should_not_reach_here();
+  guarantee(code_offset() - offset <= exception_handler_size(), "overflow");
+  __ end_a_stub();
+
+  return offset;
+}
+
+// Emit the code to remove the frame from the stack in the exception
+// unwind path.
+int LIR_Assembler::emit_unwind_handler() {
+#ifndef PRODUCT
+  if (CommentedAssembly) {
+    _masm->block_comment("Unwind handler");
+  }
+#endif // PRODUCT
+
+  int offset = code_offset();
+
+  // Fetch the exception from TLS and clear out exception related thread state
+  __ ld(x10, Address(xthread, JavaThread::exception_oop_offset()));
+  __ sd(zr, Address(xthread, JavaThread::exception_oop_offset()));
+  __ sd(zr, Address(xthread, JavaThread::exception_pc_offset()));
+
+  __ bind(_unwind_handler_entry);
+  __ verify_not_null_oop(x10);
+  if (method()->is_synchronized() || compilation()->env()->dtrace_method_probes()) {
+    __ mv(x9, x10);   // Perserve the exception
+  }
+
+  // Preform needed unlocking
+  MonitorExitStub* stub = NULL;
+  if (method()->is_synchronized()) {
+    monitor_address(0, FrameMap::r10_opr);
+    stub = new MonitorExitStub(FrameMap::r10_opr, true, 0);
+    if (UseHeavyMonitors) {
+      __ j(*stub->entry());
+    } else {
+      __ unlock_object(x15, x14, x10, *stub->entry());
+    }
+    __ bind(*stub->continuation());
+  }
+
+  if (compilation()->env()->dtrace_method_probes()) {
+    __ mv(c_rarg0, xthread);
+    __ mov_metadata(c_rarg1, method()->constant_encoding());
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), c_rarg0, c_rarg1);
+  }
+
+  if (method()->is_synchronized() || compilation()->env()->dtrace_method_probes()) {
+    __ mv(x10, x9);   // Restore the exception
+  }
+
+  // remove the activation and dispatch to the unwind handler
+  __ block_comment("remove_frame and dispatch to the unwind handler");
+  __ remove_frame(initial_frame_size_in_bytes());
+  __ far_jump(RuntimeAddress(Runtime1::entry_for(Runtime1::unwind_exception_id)));
+
+  // Emit the slow path assembly
+  if (stub != NULL) {
+    stub->emit_code(this);
+  }
+
+  return offset;
+}
+
+int LIR_Assembler::emit_deopt_handler() {
+  // if the last instruciton is a call (typically to do a throw which
+  // is coming at the end after block reordering) the return address
+  // must still point into the code area in order to avoid assertion
+  // failures when searching for the corresponding bck => add a nop
+  // (was bug 5/14/1999 - gri)
+  __ nop();
+
+  // generate code for exception handler
+  address handler_base = __ start_a_stub(deopt_handler_size());
+  if (handler_base == NULL) {
+    // not enough space left for the handler
+    bailout("deopt handler overflow");
+    return -1;
+  }
+
+  int offset = code_offset();
+
+  __ auipc(ra, 0);
+  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+  guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
+  __ end_a_stub();
+
+  return offset;
+}
+
+void LIR_Assembler::return_op(LIR_Opr result, C1SafepointPollStub* code_stub) {
+  assert(result->is_illegal() || !result->is_single_cpu() || result->as_register() == x10, "word returns are in x10");
+
+  // Pop the stack before the safepoint code
+  __ remove_frame(initial_frame_size_in_bytes());
+
+  if (StackReservedPages > 0 && compilation()->has_reserved_stack_access()) {
+    __ reserved_stack_check();
+  }
+
+  code_stub->set_safepoint_offset(__ offset());
+  __ relocate(relocInfo::poll_return_type);
+  __ safepoint_poll(*code_stub->entry(), true /* at_return */, false /* acquire */, true /* in_nmethod */);
+  __ ret();
+}
+
+int LIR_Assembler::safepoint_poll(LIR_Opr tmp, CodeEmitInfo* info) {
+  guarantee(info != NULL, "Shouldn't be NULL");
+  __ get_polling_page(t0, relocInfo::poll_type);
+  add_debug_info_for_branch(info);  // This isn't just debug info:
+                                    // it's the oop map
+  __ read_polling_page(t0, 0, relocInfo::poll_type);
+  return __ offset();
+}
+
+void LIR_Assembler::move_regs(Register from_reg, Register to_reg) {
+  __ mv(to_reg, from_reg);
+}
+
+void LIR_Assembler::swap_reg(Register a, Register b) { Unimplemented(); }
+
+void LIR_Assembler::const2reg(LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_code, CodeEmitInfo* info) {
+  assert(src->is_constant(), "should not call otherwise");
+  assert(dest->is_register(), "should not call otherwise");
+  LIR_Const* c = src->as_constant_ptr();
+  address const_addr = NULL;
+
+  switch (c->type()) {
+    case T_INT:
+      assert(patch_code == lir_patch_none, "no patching handled here");
+      __ mvw(dest->as_register(), c->as_jint());
+      break;
+
+    case T_ADDRESS:
+      assert(patch_code == lir_patch_none, "no patching handled here");
+      __ mv(dest->as_register(), c->as_jint());
+      break;
+
+    case T_LONG:
+      assert(patch_code == lir_patch_none, "no patching handled here");
+      __ mv(dest->as_register_lo(), (intptr_t)c->as_jlong());
+      break;
+
+    case T_OBJECT:
+    case T_ARRAY:
+      if (patch_code == lir_patch_none) {
+        jobject2reg(c->as_jobject(), dest->as_register());
+      } else {
+        jobject2reg_with_patching(dest->as_register(), info);
+      }
+      break;
+
+    case T_METADATA:
+      if (patch_code != lir_patch_none) {
+        klass2reg_with_patching(dest->as_register(), info);
+      } else {
+        __ mov_metadata(dest->as_register(), c->as_metadata());
+      }
+      break;
+
+    case T_FLOAT:
+      const_addr = float_constant(c->as_jfloat());
+      assert(const_addr != NULL, "must create float constant in the constant table");
+      __ flw(dest->as_float_reg(), InternalAddress(const_addr));
+      break;
+
+    case T_DOUBLE:
+      const_addr = double_constant(c->as_jdouble());
+      assert(const_addr != NULL, "must create double constant in the constant table");
+      __ fld(dest->as_double_reg(), InternalAddress(const_addr));
+      break;
+
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::const2stack(LIR_Opr src, LIR_Opr dest) {
+  assert(src->is_constant(), "should not call otherwise");
+  assert(dest->is_stack(), "should not call otherwise");
+  LIR_Const* c = src->as_constant_ptr();
+  switch (c->type()) {
+    case T_OBJECT:
+      if (c->as_jobject() == NULL) {
+        __ sd(zr, frame_map()->address_for_slot(dest->single_stack_ix()));
+      } else {
+        const2reg(src, FrameMap::t1_opr, lir_patch_none, NULL);
+        reg2stack(FrameMap::t1_opr, dest, c->type(), false);
+      }
+      break;
+    case T_ADDRESS:   // fall through
+      const2reg(src, FrameMap::t1_opr, lir_patch_none, NULL);
+      reg2stack(FrameMap::t1_opr, dest, c->type(), false);
+    case T_INT:       // fall through
+    case T_FLOAT:
+      if (c->as_jint_bits() == 0) {
+        __ sw(zr, frame_map()->address_for_slot(dest->single_stack_ix()));
+      } else {
+        __ mvw(t1, c->as_jint_bits());
+        __ sw(t1, frame_map()->address_for_slot(dest->single_stack_ix()));
+      }
+      break;
+    case T_LONG:      // fall through
+    case T_DOUBLE:
+      if (c->as_jlong_bits() == 0) {
+        __ sd(zr, frame_map()->address_for_slot(dest->double_stack_ix(),
+                                                lo_word_offset_in_bytes));
+      } else {
+        __ mv(t1, (intptr_t)c->as_jlong_bits());
+        __ sd(t1, frame_map()->address_for_slot(dest->double_stack_ix(),
+                                                lo_word_offset_in_bytes));
+      }
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::const2mem(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info, bool wide) {
+  assert(src->is_constant(), "should not call otherwise");
+  assert(dest->is_address(), "should not call otherwise");
+  LIR_Const* c = src->as_constant_ptr();
+  LIR_Address* to_addr = dest->as_address_ptr();
+  void (Assembler::* insn)(Register Rt, const Address &adr, Register temp);
+  switch (type) {
+    case T_ADDRESS:
+      assert(c->as_jint() == 0, "should be");
+      insn = &Assembler::sd; break;
+    case T_LONG:
+      assert(c->as_jlong() == 0, "should be");
+      insn = &Assembler::sd; break;
+    case T_DOUBLE:
+      assert(c->as_jdouble() == 0.0, "should be");
+      insn = &Assembler::sd; break;
+    case T_INT:
+      assert(c->as_jint() == 0, "should be");
+      insn = &Assembler::sw; break;
+    case T_FLOAT:
+      assert(c->as_jfloat() == 0.0f, "should be");
+      insn = &Assembler::sw; break;
+    case T_OBJECT:    // fall through
+    case T_ARRAY:
+      assert(c->as_jobject() == 0, "should be");
+      if (UseCompressedOops && !wide) {
+        insn = &Assembler::sw;
+      } else {
+        insn = &Assembler::sd;
+      }
+      break;
+    case T_CHAR:      // fall through
+    case T_SHORT:
+      assert(c->as_jint() == 0, "should be");
+      insn = &Assembler::sh;
+      break;
+    case T_BOOLEAN:   // fall through
+    case T_BYTE:
+      assert(c->as_jint() == 0, "should be");
+      insn = &Assembler::sb; break;
+    default:
+      ShouldNotReachHere();
+      insn = &Assembler::sd;  // unreachable
+  }
+  if (info != NULL) {
+    add_debug_info_for_null_check_here(info);
+  }
+  (_masm->*insn)(zr, as_Address(to_addr), t0);
+}
+
+void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) {
+  assert(src->is_register(), "should not call otherwise");
+  assert(dest->is_register(), "should not call otherwise");
+
+  // move between cpu-registers
+  if (dest->is_single_cpu()) {
+    if (src->type() == T_LONG) {
+      // Can do LONG -> OBJECT
+      move_regs(src->as_register_lo(), dest->as_register());
+      return;
+    }
+    assert(src->is_single_cpu(), "must match");
+    if (src->type() == T_OBJECT) {
+      __ verify_oop(src->as_register());
+    }
+    move_regs(src->as_register(), dest->as_register());
+  } else if (dest->is_double_cpu()) {
+    if (is_reference_type(src->type())) {
+      __ verify_oop(src->as_register());
+      move_regs(src->as_register(), dest->as_register_lo());
+      return;
+    }
+    assert(src->is_double_cpu(), "must match");
+    Register f_lo = src->as_register_lo();
+    Register f_hi = src->as_register_hi();
+    Register t_lo = dest->as_register_lo();
+    Register t_hi = dest->as_register_hi();
+    assert(f_hi == f_lo, "must be same");
+    assert(t_hi == t_lo, "must be same");
+    move_regs(f_lo, t_lo);
+  } else if (dest->is_single_fpu()) {
+    assert(src->is_single_fpu(), "expect single fpu");
+    __ fmv_s(dest->as_float_reg(), src->as_float_reg());
+  } else if (dest->is_double_fpu()) {
+    assert(src->is_double_fpu(), "expect double fpu");
+    __ fmv_d(dest->as_double_reg(), src->as_double_reg());
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
+  precond(src->is_register() && dest->is_stack());
+
+  uint const c_sz32 = sizeof(uint32_t);
+  uint const c_sz64 = sizeof(uint64_t);
+
+  assert(src->is_register(), "should not call otherwise");
+  assert(dest->is_stack(), "should not call otherwise");
+  if (src->is_single_cpu()) {
+    int index = dest->single_stack_ix();
+    if (is_reference_type(type)) {
+      __ sd(src->as_register(), stack_slot_address(index, c_sz64));
+      __ verify_oop(src->as_register());
+    } else if (type == T_METADATA || type == T_DOUBLE || type == T_ADDRESS) {
+      __ sd(src->as_register(), stack_slot_address(index, c_sz64));
+    } else {
+      __ sw(src->as_register(), stack_slot_address(index, c_sz32));
+    }
+  } else if (src->is_double_cpu()) {
+    int index = dest->double_stack_ix();
+    Address dest_addr_LO = stack_slot_address(index, c_sz64, lo_word_offset_in_bytes);
+    __ sd(src->as_register_lo(), dest_addr_LO);
+  } else if (src->is_single_fpu()) {
+    int index = dest->single_stack_ix();
+    __ fsw(src->as_float_reg(), stack_slot_address(index, c_sz32));
+  } else if (src->is_double_fpu()) {
+    int index = dest->double_stack_ix();
+    __ fsd(src->as_double_reg(), stack_slot_address(index, c_sz64));
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide) {
+  LIR_Address* to_addr = dest->as_address_ptr();
+  // t0 was used as tmp reg in as_Address, so we use t1 as compressed_src
+  Register compressed_src = t1;
+
+  if (patch_code != lir_patch_none) {
+    deoptimize_trap(info);
+    return;
+  }
+
+  if (is_reference_type(type)) {
+    __ verify_oop(src->as_register());
+
+    if (UseCompressedOops && !wide) {
+      __ encode_heap_oop(compressed_src, src->as_register());
+    } else {
+      compressed_src = src->as_register();
+    }
+  }
+
+  int null_check_here = code_offset();
+
+  switch (type) {
+    case T_FLOAT:
+      __ fsw(src->as_float_reg(), as_Address(to_addr));
+      break;
+
+    case T_DOUBLE:
+      __ fsd(src->as_double_reg(), as_Address(to_addr));
+      break;
+
+    case T_ARRAY:      // fall through
+    case T_OBJECT:
+      if (UseCompressedOops && !wide) {
+        __ sw(compressed_src, as_Address(to_addr));
+      } else {
+        __ sd(compressed_src, as_Address(to_addr));
+      }
+      break;
+    case T_METADATA:
+      // We get here to store a method pointer to the stack to pass to
+      // a dtrace runtime call. This can't work on 64 bit with
+      // compressed klass ptrs: T_METADATA can be compressed klass
+      // ptr or a 64 bit method pointer.
+      ShouldNotReachHere();
+      __ sd(src->as_register(), as_Address(to_addr));
+      break;
+    case T_ADDRESS:
+      __ sd(src->as_register(), as_Address(to_addr));
+      break;
+    case T_INT:
+      __ sw(src->as_register(), as_Address(to_addr));
+      break;
+    case T_LONG:
+      __ sd(src->as_register_lo(), as_Address(to_addr));
+      break;
+    case T_BYTE:    // fall through
+    case T_BOOLEAN:
+      __ sb(src->as_register(), as_Address(to_addr));
+      break;
+    case T_CHAR:    // fall through
+    case T_SHORT:
+      __ sh(src->as_register(), as_Address(to_addr));
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+
+  if (info != NULL) {
+    add_debug_info_for_null_check(null_check_here, info);
+  }
+}
+
+void LIR_Assembler::stack2reg(LIR_Opr src, LIR_Opr dest, BasicType type) {
+  precond(src->is_stack() && dest->is_register());
+
+  uint const c_sz32 = sizeof(uint32_t);
+  uint const c_sz64 = sizeof(uint64_t);
+
+  if (dest->is_single_cpu()) {
+    int index = src->single_stack_ix();
+    if (type == T_INT) {
+      __ lw(dest->as_register(), stack_slot_address(index, c_sz32));
+    } else if (is_reference_type(type)) {
+      __ ld(dest->as_register(), stack_slot_address(index, c_sz64));
+      __ verify_oop(dest->as_register());
+    } else if (type == T_METADATA || type == T_ADDRESS) {
+      __ ld(dest->as_register(), stack_slot_address(index, c_sz64));
+    } else {
+      __ lwu(dest->as_register(), stack_slot_address(index, c_sz32));
+    }
+  } else if (dest->is_double_cpu()) {
+    int index = src->double_stack_ix();
+    Address src_addr_LO = stack_slot_address(index, c_sz64, lo_word_offset_in_bytes);
+    __ ld(dest->as_register_lo(), src_addr_LO);
+  } else if (dest->is_single_fpu()) {
+    int index = src->single_stack_ix();
+    __ flw(dest->as_float_reg(), stack_slot_address(index, c_sz32));
+  } else if (dest->is_double_fpu()) {
+    int index = src->double_stack_ix();
+    __ fld(dest->as_double_reg(), stack_slot_address(index, c_sz64));
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::klass2reg_with_patching(Register reg, CodeEmitInfo* info) {
+  deoptimize_trap(info);
+}
+
+void LIR_Assembler::stack2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
+  LIR_Opr temp;
+  if (type == T_LONG || type == T_DOUBLE) {
+    temp = FrameMap::t1_long_opr;
+  } else {
+    temp = FrameMap::t1_opr;
+  }
+
+  stack2reg(src, temp, src->type());
+  reg2stack(temp, dest, dest->type(), false);
+}
+
+void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide) {
+  assert(src->is_address(), "should not call otherwise");
+  assert(dest->is_register(), "should not call otherwise");
+
+  LIR_Address* addr = src->as_address_ptr();
+  LIR_Address* from_addr = src->as_address_ptr();
+
+  if (addr->base()->type() == T_OBJECT) {
+    __ verify_oop(addr->base()->as_pointer_register());
+  }
+
+  if (patch_code != lir_patch_none) {
+    deoptimize_trap(info);
+    return;
+  }
+
+  if (info != NULL) {
+    add_debug_info_for_null_check_here(info);
+  }
+
+  int null_check_here = code_offset();
+  switch (type) {
+    case T_FLOAT:
+      __ flw(dest->as_float_reg(), as_Address(from_addr));
+      break;
+    case T_DOUBLE:
+      __ fld(dest->as_double_reg(), as_Address(from_addr));
+      break;
+    case T_ARRAY:     // fall through
+    case T_OBJECT:
+      if (UseCompressedOops && !wide) {
+        __ lwu(dest->as_register(), as_Address(from_addr));
+      } else {
+        __ ld(dest->as_register(), as_Address(from_addr));
+      }
+      break;
+    case T_METADATA:
+      // We get here to store a method pointer to the stack to pass to
+      // a dtrace runtime call. This can't work on 64 bit with
+      // compressed klass ptrs: T_METADATA can be a compressed klass
+      // ptr or a 64 bit method pointer.
+      ShouldNotReachHere();
+      __ ld(dest->as_register(), as_Address(from_addr));
+      break;
+    case T_ADDRESS:
+      __ ld(dest->as_register(), as_Address(from_addr));
+      break;
+    case T_INT:
+      __ lw(dest->as_register(), as_Address(from_addr));
+      break;
+    case T_LONG:
+      __ ld(dest->as_register_lo(), as_Address_lo(from_addr));
+      break;
+    case T_BYTE:
+      __ lb(dest->as_register(), as_Address(from_addr));
+      break;
+    case T_BOOLEAN:
+      __ lbu(dest->as_register(), as_Address(from_addr));
+      break;
+    case T_CHAR:
+      __ lhu(dest->as_register(), as_Address(from_addr));
+      break;
+    case T_SHORT:
+      __ lh(dest->as_register(), as_Address(from_addr));
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+
+  if (is_reference_type(type)) {
+    if (UseCompressedOops && !wide) {
+      __ decode_heap_oop(dest->as_register());
+    }
+
+    if (!UseZGC) {
+      // Load barrier has not yet been applied, so ZGC can't verify the oop here
+      __ verify_oop(dest->as_register());
+    }
+  }
+}
+
+void LIR_Assembler::emit_op3(LIR_Op3* op) {
+  switch (op->code()) {
+    case lir_idiv: // fall through
+    case lir_irem:
+      arithmetic_idiv(op->code(),
+                      op->in_opr1(),
+                      op->in_opr2(),
+                      op->in_opr3(),
+                      op->result_opr(),
+                      op->info());
+      break;
+    case lir_fmad:
+      __ fmadd_d(op->result_opr()->as_double_reg(),
+                 op->in_opr1()->as_double_reg(),
+                 op->in_opr2()->as_double_reg(),
+                 op->in_opr3()->as_double_reg());
+      break;
+    case lir_fmaf:
+      __ fmadd_s(op->result_opr()->as_float_reg(),
+                 op->in_opr1()->as_float_reg(),
+                 op->in_opr2()->as_float_reg(),
+                 op->in_opr3()->as_float_reg());
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
+                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
+  Label label;
+
+  emit_branch(condition, cmp_opr1, cmp_opr2, label, /* is_far */ false,
+              /* is_unordered */ (condition == lir_cond_greaterEqual || condition == lir_cond_greater) ? false : true);
+
+  Label done;
+  move_op(opr2, result, type, lir_patch_none, NULL,
+          false,   // pop_fpu_stack
+          false);  // wide
+  __ j(done);
+  __ bind(label);
+  move_op(opr1, result, type, lir_patch_none, NULL,
+          false,   // pop_fpu_stack
+          false);  // wide
+  __ bind(done);
+}
+
+void LIR_Assembler::emit_opBranch(LIR_OpBranch* op) {
+  LIR_Condition condition = op->cond();
+  if (condition == lir_cond_always) {
+    if (op->info() != NULL) {
+      add_debug_info_for_branch(op->info());
+    }
+  } else {
+    assert(op->in_opr1() != LIR_OprFact::illegalOpr && op->in_opr2() != LIR_OprFact::illegalOpr, "conditional branches must have legal operands");
+  }
+  bool is_unordered = (op->ublock() == op->block());
+  emit_branch(condition, op->in_opr1(), op->in_opr2(), *op->label(), /* is_far */ true, is_unordered);
+}
+
+void LIR_Assembler::emit_branch(LIR_Condition cmp_flag, LIR_Opr cmp1, LIR_Opr cmp2, Label& label,
+                                bool is_far, bool is_unordered) {
+
+  if (cmp_flag == lir_cond_always) {
+    __ j(label);
+    return;
+  }
+
+  if (cmp1->is_cpu_register()) {
+    Register reg1 = as_reg(cmp1);
+    if (cmp2->is_cpu_register()) {
+      Register reg2 = as_reg(cmp2);
+      __ c1_cmp_branch(cmp_flag, reg1, reg2, label, cmp1->type(), is_far);
+    } else if (cmp2->is_constant()) {
+      const2reg_helper(cmp2);
+      __ c1_cmp_branch(cmp_flag, reg1, t0, label, cmp2->type(), is_far);
+    } else {
+      ShouldNotReachHere();
+    }
+  } else if (cmp1->is_single_fpu()) {
+    assert(cmp2->is_single_fpu(), "expect single float register");
+    __ c1_float_cmp_branch(cmp_flag, cmp1->as_float_reg(), cmp2->as_float_reg(), label, is_far, is_unordered);
+  } else if (cmp1->is_double_fpu()) {
+    assert(cmp2->is_double_fpu(), "expect double float register");
+    __ c1_float_cmp_branch(cmp_flag | C1_MacroAssembler::c1_double_branch_mask,
+                           cmp1->as_double_reg(), cmp2->as_double_reg(), label, is_far, is_unordered);
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::emit_opConvert(LIR_OpConvert* op) {
+  LIR_Opr src  = op->in_opr();
+  LIR_Opr dest = op->result_opr();
+
+  switch (op->bytecode()) {
+    case Bytecodes::_i2f:
+      __ fcvt_s_w(dest->as_float_reg(), src->as_register()); break;
+    case Bytecodes::_i2d:
+      __ fcvt_d_w(dest->as_double_reg(), src->as_register()); break;
+    case Bytecodes::_l2d:
+      __ fcvt_d_l(dest->as_double_reg(), src->as_register_lo()); break;
+    case Bytecodes::_l2f:
+      __ fcvt_s_l(dest->as_float_reg(), src->as_register_lo()); break;
+    case Bytecodes::_f2d:
+      __ fcvt_d_s(dest->as_double_reg(), src->as_float_reg()); break;
+    case Bytecodes::_d2f:
+      __ fcvt_s_d(dest->as_float_reg(), src->as_double_reg()); break;
+    case Bytecodes::_i2c:
+      __ zero_extend(dest->as_register(), src->as_register(), 16); break;
+    case Bytecodes::_i2l:
+      __ addw(dest->as_register_lo(), src->as_register(), zr); break;
+    case Bytecodes::_i2s:
+      __ sign_extend(dest->as_register(), src->as_register(), 16); break;
+    case Bytecodes::_i2b:
+      __ sign_extend(dest->as_register(), src->as_register(), 8); break;
+    case Bytecodes::_l2i:
+      _masm->block_comment("FIXME: This coulde be no-op");
+      __ addw(dest->as_register(), src->as_register_lo(), zr); break;
+    case Bytecodes::_d2l:
+      __ fcvt_l_d_safe(dest->as_register_lo(), src->as_double_reg()); break;
+    case Bytecodes::_f2i:
+      __ fcvt_w_s_safe(dest->as_register(), src->as_float_reg()); break;
+    case Bytecodes::_f2l:
+      __ fcvt_l_s_safe(dest->as_register_lo(), src->as_float_reg()); break;
+    case Bytecodes::_d2i:
+      __ fcvt_w_d_safe(dest->as_register(), src->as_double_reg()); break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::emit_alloc_obj(LIR_OpAllocObj* op) {
+  if (op->init_check()) {
+    __ lbu(t0, Address(op->klass()->as_register(),
+                       InstanceKlass::init_state_offset()));
+    __ mvw(t1, InstanceKlass::fully_initialized);
+    add_debug_info_for_null_check_here(op->stub()->info());
+    __ bne(t0, t1, *op->stub()->entry(), /* is_far */ true);
+  }
+
+  __ allocate_object(op->obj()->as_register(),
+                     op->tmp1()->as_register(),
+                     op->tmp2()->as_register(),
+                     op->header_size(),
+                     op->object_size(),
+                     op->klass()->as_register(),
+                     *op->stub()->entry());
+
+  __ bind(*op->stub()->continuation());
+}
+
+void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op) {
+  Register len = op->len()->as_register();
+
+  if (UseSlowPath ||
+      (!UseFastNewObjectArray && is_reference_type(op->type())) ||
+      (!UseFastNewTypeArray   && !is_reference_type(op->type()))) {
+    __ j(*op->stub()->entry());
+  } else {
+    Register tmp1 = op->tmp1()->as_register();
+    Register tmp2 = op->tmp2()->as_register();
+    Register tmp3 = op->tmp3()->as_register();
+    if (len == tmp1) {
+      tmp1 = tmp3;
+    } else if (len == tmp2) {
+      tmp2 = tmp3;
+    } else if (len == tmp3) {
+      // everything is ok
+    } else {
+      __ mv(tmp3, len);
+    }
+    __ allocate_array(op->obj()->as_register(),
+                      len,
+                      tmp1,
+                      tmp2,
+                      arrayOopDesc::header_size(op->type()),
+                      array_element_size(op->type()),
+                      op->klass()->as_register(),
+                      *op->stub()->entry());
+  }
+  __ bind(*op->stub()->continuation());
+}
+
+void LIR_Assembler::type_profile_helper(Register mdo, ciMethodData *md, ciProfileData *data,
+                                        Register recv, Label* update_done) {
+  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
+    Label next_test;
+    // See if the receiver is receiver[n].
+    __ ld(t1, Address(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i))));
+    __ bne(recv, t1, next_test);
+    Address data_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i)));
+    __ add_memory_int64(data_addr, DataLayout::counter_increment);
+    __ j(*update_done);
+    __ bind(next_test);
+  }
+
+  // Didn't find receiver; find next empty slot and fill it in
+  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
+    Label next_test;
+    Address recv_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i)));
+    __ ld(t1, recv_addr);
+    __ bnez(t1, next_test);
+    __ sd(recv, recv_addr);
+    __ li(t1, DataLayout::counter_increment);
+    __ sd(t1, Address(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i))));
+    __ j(*update_done);
+    __ bind(next_test);
+  }
+}
+
+void LIR_Assembler::data_check(LIR_OpTypeCheck *op, ciMethodData **md, ciProfileData **data) {
+  ciMethod* method = op->profiled_method();
+  assert(method != NULL, "Should have method");
+  int bci = op->profiled_bci();
+  *md = method->method_data_or_null();
+  guarantee(*md != NULL, "Sanity");
+  *data = ((*md)->bci_to_data(bci));
+  assert(*data != NULL, "need data for type check");
+  assert((*data)->is_ReceiverTypeData(), "need ReceiverTypeData for type check");
+}
+
+void LIR_Assembler::typecheck_helper_slowcheck(ciKlass *k, Register obj, Register Rtmp1,
+                                               Register k_RInfo, Register klass_RInfo,
+                                               Label *failure_target, Label *success_target) {
+  // get object class
+  // not a safepoint as obj null check happens earlier
+  __ load_klass(klass_RInfo, obj);
+  if (k->is_loaded()) {
+    // See if we get an immediate positive hit
+    __ ld(t0, Address(klass_RInfo, int64_t(k->super_check_offset())));
+    if ((juint)in_bytes(Klass::secondary_super_cache_offset()) != k->super_check_offset()) {
+      __ bne(k_RInfo, t0, *failure_target, /* is_far */ true);
+      // successful cast, fall through to profile or jump
+    } else {
+      // See if we get an immediate positive hit
+      __ beq(k_RInfo, t0, *success_target);
+      // check for self
+      __ beq(klass_RInfo, k_RInfo, *success_target);
+
+      __ addi(sp, sp, -2 * wordSize); // 2: store k_RInfo and klass_RInfo
+      __ sd(k_RInfo, Address(sp, 0));             // sub klass
+      __ sd(klass_RInfo, Address(sp, wordSize));  // super klass
+      __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
+      // load result to k_RInfo
+      __ ld(k_RInfo, Address(sp, 0));
+      __ addi(sp, sp, 2 * wordSize); // 2: pop out k_RInfo and klass_RInfo
+      // result is a boolean
+      __ beqz(k_RInfo, *failure_target, /* is_far */ true);
+      // successful cast, fall through to profile or jump
+    }
+  } else {
+    // perform the fast part of the checking logic
+    __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, NULL);
+    // call out-of-line instance of __ check_klass_subtytpe_slow_path(...)
+    __ addi(sp, sp, -2 * wordSize); // 2: store k_RInfo and klass_RInfo
+    __ sd(klass_RInfo, Address(sp, wordSize));  // sub klass
+    __ sd(k_RInfo, Address(sp, 0));             // super klass
+    __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
+    // load result to k_RInfo
+    __ ld(k_RInfo, Address(sp, 0));
+    __ addi(sp, sp, 2 * wordSize); // 2: pop out k_RInfo and klass_RInfo
+    // result is a boolean
+    __ beqz(k_RInfo, *failure_target, /* is_far */ true);
+    // successful cast, fall thriugh to profile or jump
+  }
+}
+
+void LIR_Assembler::profile_object(ciMethodData* md, ciProfileData* data, Register obj,
+                                   Register klass_RInfo, Label* obj_is_null) {
+  Label not_null;
+  __ bnez(obj, not_null);
+  // Object is null, update MDO and exit
+  Register mdo = klass_RInfo;
+  __ mov_metadata(mdo, md->constant_encoding());
+  Address data_addr = __ form_address(t1, mdo, md->byte_offset_of_slot(data, DataLayout::flags_offset()));
+  __ lbu(t0, data_addr);
+  __ ori(t0, t0, BitData::null_seen_byte_constant());
+  __ sb(t0, data_addr);
+  __ j(*obj_is_null);
+  __ bind(not_null);
+}
+
+void LIR_Assembler::typecheck_loaded(LIR_OpTypeCheck *op, ciKlass* k, Register k_RInfo) {
+  if (!k->is_loaded()) {
+    klass2reg_with_patching(k_RInfo, op->info_for_patch());
+  } else {
+    __ mov_metadata(k_RInfo, k->constant_encoding());
+  }
+}
+
+void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, Label* failure, Label* obj_is_null) {
+  Register obj = op->object()->as_register();
+  Register k_RInfo = op->tmp1()->as_register();
+  Register klass_RInfo = op->tmp2()->as_register();
+  Register dst = op->result_opr()->as_register();
+  ciKlass* k = op->klass();
+  Register Rtmp1 = noreg;
+
+  // check if it needs to be profiled
+  ciMethodData* md = NULL;
+  ciProfileData* data = NULL;
+
+  const bool should_profile = op->should_profile();
+  if (should_profile) {
+    data_check(op, &md, &data);
+  }
+  Label profile_cast_success, profile_cast_failure;
+  Label *success_target = should_profile ? &profile_cast_success : success;
+  Label *failure_target = should_profile ? &profile_cast_failure : failure;
+
+  if (obj == k_RInfo) {
+    k_RInfo = dst;
+  } else if (obj == klass_RInfo) {
+    klass_RInfo = dst;
+  }
+  if (k->is_loaded() && !UseCompressedClassPointers) {
+    select_different_registers(obj, dst, k_RInfo, klass_RInfo);
+  } else {
+    Rtmp1 = op->tmp3()->as_register();
+    select_different_registers(obj, dst, k_RInfo, klass_RInfo, Rtmp1);
+  }
+
+  assert_different_registers(obj, k_RInfo, klass_RInfo);
+
+  if (should_profile) {
+    profile_object(md, data, obj, klass_RInfo, obj_is_null);
+  } else {
+    __ beqz(obj, *obj_is_null);
+  }
+
+  typecheck_loaded(op, k, k_RInfo);
+  __ verify_oop(obj);
+
+  if (op->fast_check()) {
+    // get object class
+    // not a safepoint as obj null check happens earlier
+    __ load_klass(t0, obj);
+    __ bne(t0, k_RInfo, *failure_target, /* is_far */ true);
+    // successful cast, fall through to profile or jump
+  } else {
+    typecheck_helper_slowcheck(k, obj, Rtmp1, k_RInfo, klass_RInfo, failure_target, success_target);
+  }
+  if (should_profile) {
+    type_profile(obj, md, klass_RInfo, k_RInfo, data, success, failure, profile_cast_success, profile_cast_failure);
+  }
+  __ j(*success);
+}
+
+void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
+  const bool should_profile = op->should_profile();
+
+  LIR_Code code = op->code();
+  if (code == lir_store_check) {
+    typecheck_lir_store(op, should_profile);
+  } else if (code == lir_checkcast) {
+    Register obj = op->object()->as_register();
+    Register dst = op->result_opr()->as_register();
+    Label success;
+    emit_typecheck_helper(op, &success, op->stub()->entry(), &success);
+    __ bind(success);
+    if (dst != obj) {
+      __ mv(dst, obj);
+    }
+  } else if (code == lir_instanceof) {
+    Register obj = op->object()->as_register();
+    Register dst = op->result_opr()->as_register();
+    Label success, failure, done;
+    emit_typecheck_helper(op, &success, &failure, &failure);
+    __ bind(failure);
+    __ mv(dst, zr);
+    __ j(done);
+    __ bind(success);
+    __ mv(dst, 1);
+    __ bind(done);
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op) {
+  assert(VM_Version::supports_cx8(), "wrong machine");
+  Register addr;
+  if (op->addr()->is_register()) {
+    addr = as_reg(op->addr());
+  } else {
+    assert(op->addr()->is_address(), "what else?");
+    LIR_Address* addr_ptr = op->addr()->as_address_ptr();
+    assert(addr_ptr->disp() == 0, "need 0 disp");
+    assert(addr_ptr->index() == LIR_Opr::illegalOpr(), "need 0 index");
+    addr = as_reg(addr_ptr->base());
+  }
+  Register newval = as_reg(op->new_value());
+  Register cmpval = as_reg(op->cmp_value());
+
+  if (op->code() == lir_cas_obj) {
+    if (UseCompressedOops) {
+      Register tmp1 = op->tmp1()->as_register();
+      assert(op->tmp1()->is_valid(), "must be");
+      __ encode_heap_oop(tmp1, cmpval);
+      cmpval = tmp1;
+      __ encode_heap_oop(t1, newval);
+      newval = t1;
+      caswu(addr, newval, cmpval);
+    } else {
+      casl(addr, newval, cmpval);
+    }
+  } else if (op->code() == lir_cas_int) {
+    casw(addr, newval, cmpval);
+  } else {
+    casl(addr, newval, cmpval);
+  }
+}
+
+void LIR_Assembler::intrinsic_op(LIR_Code code, LIR_Opr value, LIR_Opr unused, LIR_Opr dest, LIR_Op* op) {
+  switch (code) {
+    case lir_abs:  __ fabs_d(dest->as_double_reg(), value->as_double_reg()); break;
+    case lir_sqrt: __ fsqrt_d(dest->as_double_reg(), value->as_double_reg()); break;
+    default:       ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::logic_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dst) {
+  assert(left->is_single_cpu() || left->is_double_cpu(), "expect single or double register");
+  Register Rleft = left->is_single_cpu() ? left->as_register() : left->as_register_lo();
+  if (dst->is_single_cpu()) {
+    Register Rdst = dst->as_register();
+    if (right->is_constant()) {
+      int right_const = right->as_jint();
+      if (Assembler::operand_valid_for_add_immediate(right_const)) {
+        logic_op_imm(Rdst, Rleft, right_const, code);
+        __ addw(Rdst, Rdst, zr);
+     } else {
+        __ mv(t0, right_const);
+        logic_op_reg32(Rdst, Rleft, t0, code);
+     }
+    } else {
+      Register Rright = right->is_single_cpu() ? right->as_register() : right->as_register_lo();
+      logic_op_reg32(Rdst, Rleft, Rright, code);
+    }
+  } else {
+    Register Rdst = dst->as_register_lo();
+    if (right->is_constant()) {
+      long right_const = right->as_jlong();
+      if (Assembler::operand_valid_for_add_immediate(right_const)) {
+        logic_op_imm(Rdst, Rleft, right_const, code);
+      } else {
+        __ mv(t0, right_const);
+        logic_op_reg(Rdst, Rleft, t0, code);
+      }
+    } else {
+      Register Rright = right->is_single_cpu() ? right->as_register() : right->as_register_lo();
+      logic_op_reg(Rdst, Rleft, Rright, code);
+    }
+  }
+}
+
+void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr src, LIR_Opr result, LIR_Op2* op) {
+  ShouldNotCallThis();
+}
+
+void LIR_Assembler::comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dst, LIR_Op2* op) {
+  if (code == lir_cmp_fd2i || code == lir_ucmp_fd2i) {
+    bool is_unordered_less = (code == lir_ucmp_fd2i);
+    if (left->is_single_fpu()) {
+      __ float_cmp(true, is_unordered_less ? -1 : 1,
+                   left->as_float_reg(), right->as_float_reg(), dst->as_register());
+    } else if (left->is_double_fpu()) {
+      __ float_cmp(false, is_unordered_less ? -1 : 1,
+                   left->as_double_reg(), right->as_double_reg(), dst->as_register());
+    } else {
+      ShouldNotReachHere();
+    }
+  } else if (code == lir_cmp_l2i) {
+    __ cmp_l2i(dst->as_register(), left->as_register_lo(), right->as_register_lo());
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::align_call(LIR_Code code) {
+  // With RVC a call instruction may get 2-byte aligned.
+  // The address of the call instruction needs to be 4-byte aligned to
+  // ensure that it does not span a cache line so that it can be patched.
+  __ align(4);
+}
+
+void LIR_Assembler::call(LIR_OpJavaCall* op, relocInfo::relocType rtype) {
+  address call = __ trampoline_call(Address(op->addr(), rtype));
+  if (call == NULL) {
+    bailout("trampoline stub overflow");
+    return;
+  }
+  add_call_info(code_offset(), op->info());
+}
+
+void LIR_Assembler::ic_call(LIR_OpJavaCall* op) {
+  address call = __ ic_call(op->addr());
+  if (call == NULL) {
+    bailout("trampoline stub overflow");
+    return;
+  }
+  add_call_info(code_offset(), op->info());
+}
+
+void LIR_Assembler::emit_static_call_stub() {
+  address call_pc = __ pc();
+  assert((__ offset() % 4) == 0, "bad alignment");
+  address stub = __ start_a_stub(call_stub_size());
+  if (stub == NULL) {
+    bailout("static call stub overflow");
+    return;
+  }
+
+  int start = __ offset();
+
+  __ relocate(static_stub_Relocation::spec(call_pc));
+  __ emit_static_call_stub();
+
+  assert(__ offset() - start + CompiledStaticCall::to_trampoline_stub_size()
+         <= call_stub_size(), "stub too big");
+  __ end_a_stub();
+}
+
+void LIR_Assembler::throw_op(LIR_Opr exceptionPC, LIR_Opr exceptionOop, CodeEmitInfo* info) {
+  assert(exceptionOop->as_register() == x10, "must match");
+  assert(exceptionPC->as_register() == x13, "must match");
+
+  // exception object is not added to oop map by LinearScan
+  // (LinearScan assumes that no oops are in fixed registers)
+  info->add_register_oop(exceptionOop);
+  Runtime1::StubID unwind_id;
+
+  // get current pc information
+  // pc is only needed if the method has an exception handler, the unwind code does not need it.
+  if (compilation()->debug_info_recorder()->last_pc_offset() == __ offset()) {
+    // As no instructions have been generated yet for this LIR node it's
+    // possible that an oop map already exists for the current offset.
+    // In that case insert an dummy NOP here to ensure all oop map PCs
+    // are unique. See JDK-8237483.
+    __ nop();
+  }
+  int pc_for_athrow_offset = __ offset();
+  InternalAddress pc_for_athrow(__ pc());
+  int32_t off = 0;
+  __ la_patchable(exceptionPC->as_register(), pc_for_athrow, off);
+  __ addi(exceptionPC->as_register(), exceptionPC->as_register(), off);
+  add_call_info(pc_for_athrow_offset, info); // for exception handler
+
+  __ verify_not_null_oop(x10);
+  // search an exception handler (x10: exception oop, x13: throwing pc)
+  if (compilation()->has_fpu_code()) {
+    unwind_id = Runtime1::handle_exception_id;
+  } else {
+    unwind_id = Runtime1::handle_exception_nofpu_id;
+  }
+  __ far_call(RuntimeAddress(Runtime1::entry_for(unwind_id)));
+  __ nop();
+}
+
+void LIR_Assembler::unwind_op(LIR_Opr exceptionOop) {
+  assert(exceptionOop->as_register() == x10, "must match");
+  __ j(_unwind_handler_entry);
+}
+
+void LIR_Assembler::shift_op(LIR_Code code, LIR_Opr left, LIR_Opr count, LIR_Opr dest, LIR_Opr tmp) {
+  Register left_reg = left->is_single_cpu() ? left->as_register() : left->as_register_lo();
+  Register dest_reg = dest->is_single_cpu() ? dest->as_register() : dest->as_register_lo();
+  Register count_reg = count->as_register();
+  if (dest->is_single_cpu()) {
+    assert (dest->type() == T_INT, "unexpected result type");
+    assert (left->type() == T_INT, "unexpected left type");
+    __ andi(t0, count_reg, 31); // should not shift more than 31 bits
+    switch (code) {
+      case lir_shl:  __ sllw(dest_reg, left_reg, t0); break;
+      case lir_shr:  __ sraw(dest_reg, left_reg, t0); break;
+      case lir_ushr: __ srlw(dest_reg, left_reg, t0); break;
+      default: ShouldNotReachHere();
+    }
+  } else if (dest->is_double_cpu()) {
+    __ andi(t0, count_reg, 63); // should not shift more than 63 bits
+    switch (code) {
+      case lir_shl:  __ sll(dest_reg, left_reg, t0); break;
+      case lir_shr:  __ sra(dest_reg, left_reg, t0); break;
+      case lir_ushr: __ srl(dest_reg, left_reg, t0); break;
+      default: ShouldNotReachHere();
+    }
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::shift_op(LIR_Code code, LIR_Opr left, jint count, LIR_Opr dest) {
+  Register left_reg = left->is_single_cpu() ? left->as_register() : left->as_register_lo();
+  Register dest_reg = dest->is_single_cpu() ? dest->as_register() : dest->as_register_lo();
+  if (dest->is_single_cpu()) {
+    assert (dest->type() == T_INT, "unexpected result type");
+    assert (left->type() == T_INT, "unexpected left type");
+    count &= 0x1f;
+    if (count != 0) {
+      switch (code) {
+        case lir_shl:  __ slliw(dest_reg, left_reg, count); break;
+        case lir_shr:  __ sraiw(dest_reg, left_reg, count); break;
+        case lir_ushr: __ srliw(dest_reg, left_reg, count); break;
+        default: ShouldNotReachHere();
+      }
+    } else {
+      move_regs(left_reg, dest_reg);
+    }
+  } else if (dest->is_double_cpu()) {
+    count &= 0x3f;
+    if (count != 0) {
+      switch (code) {
+        case lir_shl:  __ slli(dest_reg, left_reg, count); break;
+        case lir_shr:  __ srai(dest_reg, left_reg, count); break;
+        case lir_ushr: __ srli(dest_reg, left_reg, count); break;
+        default: ShouldNotReachHere();
+      }
+    } else {
+      move_regs(left->as_register_lo(), dest->as_register_lo());
+    }
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::emit_lock(LIR_OpLock* op) {
+  Register obj = op->obj_opr()->as_register();  // may not be an oop
+  Register hdr = op->hdr_opr()->as_register();
+  Register lock = op->lock_opr()->as_register();
+  if (UseHeavyMonitors) {
+    __ j(*op->stub()->entry());
+  } else if (op->code() == lir_lock) {
+    assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header");
+    // add debug info for NullPointerException only if one is possible
+    int null_check_offset = __ lock_object(hdr, obj, lock, *op->stub()->entry());
+    if (op->info() != NULL) {
+      add_debug_info_for_null_check(null_check_offset, op->info());
+    }
+  } else if (op->code() == lir_unlock) {
+    assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header");
+    __ unlock_object(hdr, obj, lock, *op->stub()->entry());
+  } else {
+    Unimplemented();
+  }
+  __ bind(*op->stub()->continuation());
+}
+
+void LIR_Assembler::emit_load_klass(LIR_OpLoadKlass* op) {
+  Register obj = op->obj()->as_pointer_register();
+  Register result = op->result_opr()->as_pointer_register();
+
+  CodeEmitInfo* info = op->info();
+  if (info != NULL) {
+    add_debug_info_for_null_check_here(info);
+  }
+
+  if (UseCompressedClassPointers) {
+    __ lwu(result, Address(obj, oopDesc::klass_offset_in_bytes()));
+    __ decode_klass_not_null(result);
+  } else {
+    __ ld(result, Address(obj, oopDesc::klass_offset_in_bytes()));
+  }
+}
+
+void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
+  ciMethod* method = op->profiled_method();
+  int bci          = op->profiled_bci();
+
+  // Update counter for all call types
+  ciMethodData* md = method->method_data_or_null();
+  guarantee(md != NULL, "Sanity");
+  ciProfileData* data = md->bci_to_data(bci);
+  assert(data != NULL && data->is_CounterData(), "need CounterData for calls");
+  assert(op->mdo()->is_single_cpu(),  "mdo must be allocated");
+  Register mdo  = op->mdo()->as_register();
+  __ mov_metadata(mdo, md->constant_encoding());
+  Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
+  // Perform additional virtual call profiling for invokevirtual and
+  // invokeinterface bytecodes
+  if (op->should_profile_receiver_type()) {
+    assert(op->recv()->is_single_cpu(), "recv must be allocated");
+    Register recv = op->recv()->as_register();
+    assert_different_registers(mdo, recv);
+    assert(data->is_VirtualCallData(), "need VirtualCallData for virtual calls");
+    ciKlass* known_klass = op->known_holder();
+    if (C1OptimizeVirtualCallProfiling && known_klass != NULL) {
+      // We know the type that will be seen at this call site; we can
+      // statically update the MethodData* rather than needing to do
+      // dynamic tests on the receiver type
+      // NOTE: we should probably put a lock around this search to
+      // avoid collisions by concurrent compilations
+      ciVirtualCallData* vc_data = (ciVirtualCallData*) data;
+      uint i;
+      for (i = 0; i < VirtualCallData::row_limit(); i++) {
+        ciKlass* receiver = vc_data->receiver(i);
+        if (known_klass->equals(receiver)) {
+          Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
+          __ add_memory_int64(data_addr, DataLayout::counter_increment);
+          return;
+        }
+      }
+
+      // Receiver type not found in profile data; select an empty slot
+      // Note that this is less efficient than it should be because it
+      // always does a write to the receiver part of the
+      // VirtualCallData rather than just the first time
+      for (i = 0; i < VirtualCallData::row_limit(); i++) {
+        ciKlass* receiver = vc_data->receiver(i);
+        if (receiver == NULL) {
+          Address recv_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_offset(i)));
+          __ mov_metadata(t1, known_klass->constant_encoding());
+          __ sd(t1, recv_addr);
+          Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
+          __ add_memory_int64(data_addr, DataLayout::counter_increment);
+          return;
+        }
+      }
+    } else {
+      __ load_klass(recv, recv);
+      Label update_done;
+      type_profile_helper(mdo, md, data, recv, &update_done);
+      // Receiver did not match any saved receiver and there is no empty row for it.
+      // Increment total counter to indicate polymorphic case.
+      __ add_memory_int64(counter_addr, DataLayout::counter_increment);
+
+      __ bind(update_done);
+    }
+  } else {
+    // Static call
+    __ add_memory_int64(counter_addr, DataLayout::counter_increment);
+  }
+}
+
+void LIR_Assembler::emit_delay(LIR_OpDelay*) { Unimplemented(); }
+
+void LIR_Assembler::monitor_address(int monitor_no, LIR_Opr dst) {
+  __ la(dst->as_register(), frame_map()->address_for_monitor_lock(monitor_no));
+}
+
+void LIR_Assembler::emit_updatecrc32(LIR_OpUpdateCRC32* op) { Unimplemented(); }
+
+void LIR_Assembler::check_conflict(ciKlass* exact_klass, intptr_t current_klass,
+                                   Register tmp, Label &next, Label &none,
+                                   Address mdo_addr) {
+  if (exact_klass == NULL || TypeEntries::is_type_none(current_klass)) {
+    if (exact_klass != NULL) {
+      __ mov_metadata(tmp, exact_klass->constant_encoding());
+    } else {
+      __ load_klass(tmp, tmp);
+    }
+
+    __ ld(t1, mdo_addr);
+    __ xorr(tmp, tmp, t1);
+    __ andi(t0, tmp, TypeEntries::type_klass_mask);
+    // klass seen before, nothing to do. The unknown bit may have been
+    // set already but no need to check.
+    __ beqz(t0, next);
+
+    // already unknown. Nothing to do anymore.
+    __ andi(t0, tmp, TypeEntries::type_unknown);
+    __ bnez(t0, next);
+
+    if (TypeEntries::is_type_none(current_klass)) {
+      __ beqz(t1, none);
+      __ li(t0, (u1)TypeEntries::null_seen);
+      __ beq(t0, t1, none);
+      // There is a chance that the checks above (re-reading profiling
+      // data from memory) fail if another thread has just set the
+      // profiling to this obj's klass
+      __ membar(MacroAssembler::LoadLoad);
+      __ ld(t1, mdo_addr);
+      __ xorr(tmp, tmp, t1);
+      __ andi(t0, tmp, TypeEntries::type_klass_mask);
+      __ beqz(t0, next);
+    }
+  } else {
+    assert(ciTypeEntries::valid_ciklass(current_klass) != NULL &&
+           ciTypeEntries::valid_ciklass(current_klass) != exact_klass, "conflict only");
+
+    __ ld(tmp, mdo_addr);
+    // already unknown. Nothing to do anymore.
+    __ andi(t0, tmp, TypeEntries::type_unknown);
+    __ bnez(t0, next);
+  }
+
+  // different than before. Cannot keep accurate profile.
+  __ ld(t1, mdo_addr);
+  __ ori(t1, t1, TypeEntries::type_unknown);
+  __ sd(t1, mdo_addr);
+
+  if (TypeEntries::is_type_none(current_klass)) {
+    __ j(next);
+
+    __ bind(none);
+    // first time here. Set profile type.
+    __ sd(tmp, mdo_addr);
+  }
+}
+
+void LIR_Assembler::check_no_conflict(ciKlass* exact_klass, intptr_t current_klass, Register tmp,
+                                      Address mdo_addr, Label &next) {
+  // There's a single possible klass at this profile point
+  assert(exact_klass != NULL, "should be");
+  if (TypeEntries::is_type_none(current_klass)) {
+    __ mov_metadata(tmp, exact_klass->constant_encoding());
+    __ ld(t1, mdo_addr);
+    __ xorr(tmp, tmp, t1);
+    __ andi(t0, tmp, TypeEntries::type_klass_mask);
+    __ beqz(t0, next);
+#ifdef ASSERT
+  {
+    Label ok;
+    __ ld(t0, mdo_addr);
+    __ beqz(t0, ok);
+    __ li(t1, (u1)TypeEntries::null_seen);
+    __ beq(t0, t1, ok);
+    // may have been set by another thread
+    __ membar(MacroAssembler::LoadLoad);
+    __ mov_metadata(t0, exact_klass->constant_encoding());
+    __ ld(t1, mdo_addr);
+    __ xorr(t1, t0, t1);
+    __ andi(t1, t1, TypeEntries::type_mask);
+    __ beqz(t1, ok);
+
+    __ stop("unexpected profiling mismatch");
+    __ bind(ok);
+  }
+#endif
+    // first time here. Set profile type.
+    __ sd(tmp, mdo_addr);
+  } else {
+    assert(ciTypeEntries::valid_ciklass(current_klass) != NULL &&
+           ciTypeEntries::valid_ciklass(current_klass) != exact_klass, "inconsistent");
+
+    __ ld(tmp, mdo_addr);
+    // already unknown. Nothing to do anymore.
+    __ andi(t0, tmp, TypeEntries::type_unknown);
+    __ bnez(t0, next);
+
+    __ ori(tmp, tmp, TypeEntries::type_unknown);
+    __ sd(tmp, mdo_addr);
+  }
+}
+
+void LIR_Assembler::check_null(Register tmp, Label &update, intptr_t current_klass,
+                               Address mdo_addr, bool do_update, Label &next) {
+  __ bnez(tmp, update);
+  if (!TypeEntries::was_null_seen(current_klass)) {
+    __ ld(t1, mdo_addr);
+    __ ori(t1, t1, TypeEntries::null_seen);
+    __ sd(t1, mdo_addr);
+  }
+  if (do_update) {
+    __ j(next);
+  }
+}
+
+void LIR_Assembler::emit_profile_type(LIR_OpProfileType* op) {
+  COMMENT("emit_profile_type {");
+  Register obj = op->obj()->as_register();
+  Register tmp = op->tmp()->as_pointer_register();
+  Address mdo_addr = as_Address(op->mdp()->as_address_ptr());
+  ciKlass* exact_klass = op->exact_klass();
+  intptr_t current_klass = op->current_klass();
+  bool not_null = op->not_null();
+  bool no_conflict = op->no_conflict();
+
+  Label update, next, none;
+
+  bool do_null = !not_null;
+  bool exact_klass_set = exact_klass != NULL && ciTypeEntries::valid_ciklass(current_klass) == exact_klass;
+  bool do_update = !TypeEntries::is_type_unknown(current_klass) && !exact_klass_set;
+
+  assert(do_null || do_update, "why are we here?");
+  assert(!TypeEntries::was_null_seen(current_klass) || do_update, "why are we here?");
+  assert_different_registers(tmp, t0, t1, mdo_addr.base());
+
+  __ verify_oop(obj);
+
+  if (tmp != obj) {
+    __ mv(tmp, obj);
+  }
+  if (do_null) {
+    check_null(tmp, update, current_klass, mdo_addr, do_update, next);
+#ifdef ASSERT
+  } else {
+    __ bnez(tmp, update);
+    __ stop("unexpected null obj");
+#endif
+  }
+
+  __ bind(update);
+
+  if (do_update) {
+#ifdef ASSERT
+    if (exact_klass != NULL) {
+      check_exact_klass(tmp, exact_klass);
+    }
+#endif
+    if (!no_conflict) {
+      check_conflict(exact_klass, current_klass, tmp, next, none, mdo_addr);
+    } else {
+      check_no_conflict(exact_klass, current_klass, tmp, mdo_addr, next);
+    }
+
+    __ bind(next);
+  }
+  COMMENT("} emit_profile_type");
+}
+
+void LIR_Assembler::align_backward_branch_target() { }
+
+void LIR_Assembler::negate(LIR_Opr left, LIR_Opr dest, LIR_Opr tmp) {
+  // tmp must be unused
+  assert(tmp->is_illegal(), "wasting a register if tmp is allocated");
+
+  if (left->is_single_cpu()) {
+    assert(dest->is_single_cpu(), "expect single result reg");
+    __ negw(dest->as_register(), left->as_register());
+  } else if (left->is_double_cpu()) {
+    assert(dest->is_double_cpu(), "expect double result reg");
+    __ neg(dest->as_register_lo(), left->as_register_lo());
+  } else if (left->is_single_fpu()) {
+    assert(dest->is_single_fpu(), "expect single float result reg");
+    __ fneg_s(dest->as_float_reg(), left->as_float_reg());
+  } else {
+    assert(left->is_double_fpu(), "expect double float operand reg");
+    assert(dest->is_double_fpu(), "expect double float result reg");
+    __ fneg_d(dest->as_double_reg(), left->as_double_reg());
+  }
+}
+
+
+void LIR_Assembler::leal(LIR_Opr addr, LIR_Opr dest, LIR_PatchCode patch_code, CodeEmitInfo* info) {
+  if (patch_code != lir_patch_none) {
+    deoptimize_trap(info);
+    return;
+  }
+
+  LIR_Address* adr = addr->as_address_ptr();
+  Register dst = dest->as_register_lo();
+
+  assert_different_registers(dst, t0);
+  if (adr->base()->is_valid() && dst == adr->base()->as_pointer_register() && (!adr->index()->is_cpu_register())) {
+    int scale = adr->scale();
+    intptr_t offset = adr->disp();
+    LIR_Opr index_op = adr->index();
+    if (index_op->is_constant()) {
+      offset += ((intptr_t)index_op->as_constant_ptr()->as_jint()) << scale;
+    }
+
+    if (!is_imm_in_range(offset, 12, 0)) {
+      __ la(t0, as_Address(adr));
+      __ mv(dst, t0);
+      return;
+    }
+  }
+
+  __ la(dst, as_Address(adr));
+}
+
+
+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 != NULL) {
+    __ far_call(RuntimeAddress(dest));
+  } else {
+    int32_t offset = 0;
+    __ la_patchable(t0, RuntimeAddress(dest), offset);
+    __ jalr(x1, t0, offset);
+  }
+
+  if (info != NULL) {
+    add_call_info_here(info);
+  }
+}
+
+void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info) {
+  if (dest->is_address() || src->is_address()) {
+    move_op(src, dest, type, lir_patch_none, info, /* pop_fpu_stack */ false, /* wide */ false);
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+#ifdef ASSERT
+// emit run-time assertion
+void LIR_Assembler::emit_assert(LIR_OpAssert* op) {
+  assert(op->code() == lir_assert, "must be");
+
+  Label ok;
+  if (op->in_opr1()->is_valid()) {
+    assert(op->in_opr2()->is_valid(), "both operands must be valid");
+    bool is_unordered = false;
+    LIR_Condition cond = op->condition();
+    emit_branch(cond, op->in_opr1(), op->in_opr2(), ok, /* is_far */ false,
+                /* is_unordered */(cond == lir_cond_greaterEqual || cond == lir_cond_greater) ? false : true);
+  } else {
+    assert(op->in_opr2()->is_illegal(), "both operands must be illegal");
+    assert(op->condition() == lir_cond_always, "no other conditions allowed");
+  }
+
+  if (op->halt()) {
+    const char* str = __ code_string(op->msg());
+    __ stop(str);
+  } else {
+    breakpoint();
+  }
+  __ bind(ok);
+}
+#endif
+
+#ifndef PRODUCT
+#define COMMENT(x)   do { __ block_comment(x); } while (0)
+#else
+#define COMMENT(x)
+#endif
+
+void LIR_Assembler::membar() {
+  COMMENT("membar");
+  __ membar(MacroAssembler::AnyAny);
+}
+
+void LIR_Assembler::membar_acquire() {
+  __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+}
+
+void LIR_Assembler::membar_release() {
+  __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+}
+
+void LIR_Assembler::membar_loadload() {
+  __ membar(MacroAssembler::LoadLoad);
+}
+
+void LIR_Assembler::membar_storestore() {
+  __ membar(MacroAssembler::StoreStore);
+}
+
+void LIR_Assembler::membar_loadstore() { __ membar(MacroAssembler::LoadStore); }
+
+void LIR_Assembler::membar_storeload() { __ membar(MacroAssembler::StoreLoad); }
+
+void LIR_Assembler::on_spin_wait() {
+  Unimplemented();
+}
+
+void LIR_Assembler::get_thread(LIR_Opr result_reg) {
+  __ mv(result_reg->as_register(), xthread);
+}
+
+void LIR_Assembler::peephole(LIR_List *lir) {}
+
+void LIR_Assembler::atomic_op(LIR_Code code, LIR_Opr src, LIR_Opr data, LIR_Opr dest, LIR_Opr tmp_op) {
+  Address addr = as_Address(src->as_address_ptr());
+  BasicType type = src->type();
+  bool is_oop = is_reference_type(type);
+
+  get_op(type);
+
+  switch (code) {
+    case lir_xadd:
+      {
+        RegisterOrConstant inc;
+        Register tmp = as_reg(tmp_op);
+        Register dst = as_reg(dest);
+        if (data->is_constant()) {
+          inc = RegisterOrConstant(as_long(data));
+          assert_different_registers(dst, addr.base(), tmp);
+          assert_different_registers(tmp, t0);
+        } else {
+          inc = RegisterOrConstant(as_reg(data));
+          assert_different_registers(inc.as_register(), dst, addr.base(), tmp);
+        }
+        __ la(tmp, addr);
+        (_masm->*add)(dst, inc, tmp);
+        break;
+      }
+    case lir_xchg:
+      {
+        Register tmp = tmp_op->as_register();
+        Register obj = as_reg(data);
+        Register dst = as_reg(dest);
+        if (is_oop && UseCompressedOops) {
+          __ encode_heap_oop(t0, obj);
+          obj = t0;
+        }
+        assert_different_registers(obj, addr.base(), tmp, dst);
+        __ la(tmp, addr);
+        (_masm->*xchg)(dst, obj, tmp);
+        if (is_oop && UseCompressedOops) {
+          __ decode_heap_oop(dst);
+        }
+      }
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+  __ membar(MacroAssembler::AnyAny);
+}
+
+int LIR_Assembler::array_element_size(BasicType type) const {
+  int elem_size = type2aelembytes(type);
+  return exact_log2(elem_size);
+}
+
+// helper functions which checks for overflow and sets bailout if it
+// occurs.  Always returns a valid embeddable pointer but in the
+// bailout case the pointer won't be to unique storage.
+address LIR_Assembler::float_constant(float f) {
+  address const_addr = __ float_constant(f);
+  if (const_addr == NULL) {
+    bailout("const section overflow");
+    return __ code()->consts()->start();
+  } else {
+    return const_addr;
+  }
+}
+
+address LIR_Assembler::double_constant(double d) {
+  address const_addr = __ double_constant(d);
+  if (const_addr == NULL) {
+    bailout("const section overflow");
+    return __ code()->consts()->start();
+  } else {
+    return const_addr;
+  }
+}
+
+address LIR_Assembler::int_constant(jlong n) {
+  address const_addr = __ long_constant(n);
+  if (const_addr == NULL) {
+    bailout("const section overflow");
+    return __ code()->consts()->start();
+  } else {
+    return const_addr;
+  }
+}
+
+void LIR_Assembler::casw(Register addr, Register newval, Register cmpval) {
+  __ cmpxchg(addr, cmpval, newval, Assembler::int32, Assembler::aq /* acquire */,
+             Assembler::rl /* release */, t0, true /* result as bool */);
+  __ seqz(t0, t0); // cmpxchg not equal, set t0 to 1
+  __ membar(MacroAssembler::AnyAny);
+}
+
+void LIR_Assembler::caswu(Register addr, Register newval, Register cmpval) {
+  __ cmpxchg(addr, cmpval, newval, Assembler::uint32, Assembler::aq /* acquire */,
+             Assembler::rl /* release */, t0, true /* result as bool */);
+  __ seqz(t0, t0); // cmpxchg not equal, set t0 to 1
+  __ membar(MacroAssembler::AnyAny);
+}
+
+void LIR_Assembler::casl(Register addr, Register newval, Register cmpval) {
+  __ cmpxchg(addr, cmpval, newval, Assembler::int64, Assembler::aq /* acquire */,
+             Assembler::rl /* release */, t0, true /* result as bool */);
+  __ seqz(t0, t0); // cmpxchg not equal, set t0 to 1
+  __ membar(MacroAssembler::AnyAny);
+}
+
+void LIR_Assembler::deoptimize_trap(CodeEmitInfo *info) {
+  address target = NULL;
+
+  switch (patching_id(info)) {
+    case PatchingStub::access_field_id:
+      target = Runtime1::entry_for(Runtime1::access_field_patching_id);
+      break;
+    case PatchingStub::load_klass_id:
+      target = Runtime1::entry_for(Runtime1::load_klass_patching_id);
+      break;
+    case PatchingStub::load_mirror_id:
+      target = Runtime1::entry_for(Runtime1::load_mirror_patching_id);
+      break;
+    case PatchingStub::load_appendix_id:
+      target = Runtime1::entry_for(Runtime1::load_appendix_patching_id);
+      break;
+    default: ShouldNotReachHere();
+  }
+
+  __ far_call(RuntimeAddress(target));
+  add_call_info_here(info);
+}
+
+void LIR_Assembler::check_exact_klass(Register tmp, ciKlass* exact_klass) {
+  Label ok;
+  __ load_klass(tmp, tmp);
+  __ mov_metadata(t0, exact_klass->constant_encoding());
+  __ beq(tmp, t0, ok);
+  __ stop("exact klass and actual klass differ");
+  __ bind(ok);
+}
+
+void LIR_Assembler::get_op(BasicType type) {
+  switch (type) {
+    case T_INT:
+      xchg = &MacroAssembler::atomic_xchgalw;
+      add = &MacroAssembler::atomic_addalw;
+      break;
+    case T_LONG:
+      xchg = &MacroAssembler::atomic_xchgal;
+      add = &MacroAssembler::atomic_addal;
+      break;
+    case T_OBJECT:
+    case T_ARRAY:
+      if (UseCompressedOops) {
+        xchg = &MacroAssembler::atomic_xchgalwu;
+        add = &MacroAssembler::atomic_addalw;
+      } else {
+        xchg = &MacroAssembler::atomic_xchgal;
+        add = &MacroAssembler::atomic_addal;
+      }
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+// emit_opTypeCheck sub functions
+void LIR_Assembler::typecheck_lir_store(LIR_OpTypeCheck* op, bool should_profile) {
+  Register value = op->object()->as_register();
+  Register array = op->array()->as_register();
+  Register k_RInfo = op->tmp1()->as_register();
+  Register klass_RInfo = op->tmp2()->as_register();
+  Register Rtmp1 = op->tmp3()->as_register();
+
+  CodeStub* stub = op->stub();
+
+  // check if it needs to be profiled
+  ciMethodData* md = NULL;
+  ciProfileData* data = NULL;
+
+  if (should_profile) {
+    data_check(op, &md, &data);
+  }
+  Label profile_cast_success, profile_cast_failure, done;
+  Label *success_target = should_profile ? &profile_cast_success : &done;
+  Label *failure_target = should_profile ? &profile_cast_failure : stub->entry();
+
+  if (should_profile) {
+    profile_object(md, data, value, klass_RInfo, &done);
+  } else {
+    __ beqz(value, done);
+  }
+
+  add_debug_info_for_null_check_here(op->info_for_exception());
+  __ load_klass(k_RInfo, array);
+  __ load_klass(klass_RInfo, value);
+
+  lir_store_slowcheck(k_RInfo, klass_RInfo, Rtmp1, success_target, failure_target);
+
+  // fall through to the success case
+  if (should_profile) {
+    Register mdo = klass_RInfo;
+    Register recv = k_RInfo;
+    __ bind(profile_cast_success);
+    __ mov_metadata(mdo, md->constant_encoding());
+    __ load_klass(recv, value);
+    type_profile_helper(mdo, md, data, recv, &done);
+    __ j(done);
+
+    __ bind(profile_cast_failure);
+    __ mov_metadata(mdo, md->constant_encoding());
+    Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
+    __ ld(t1, counter_addr);
+    __ addi(t1, t1, -DataLayout::counter_increment);
+    __ sd(t1, counter_addr);
+    __ j(*stub->entry());
+  }
+
+  __ bind(done);
+}
+
+void LIR_Assembler::add_debug_info_for_branch(address adr, CodeEmitInfo* info) {
+  _masm->code_section()->relocate(adr, relocInfo::poll_type);
+  int pc_offset = code_offset();
+  flush_debug_info(pc_offset);
+  info->record_debug_info(compilation()->debug_info_recorder(), pc_offset);
+  if (info->exception_handlers() != NULL) {
+    compilation()->add_exception_handlers_for_pco(pc_offset, info->exception_handlers());
+  }
+}
+
+void LIR_Assembler::type_profile(Register obj, ciMethodData* md, Register klass_RInfo, Register k_RInfo,
+                                 ciProfileData* data, Label* success, Label* failure,
+                                 Label& profile_cast_success, Label& profile_cast_failure) {
+  Register mdo = klass_RInfo;
+  Register recv = k_RInfo;
+  __ bind(profile_cast_success);
+  __ mov_metadata(mdo, md->constant_encoding());
+  __ load_klass(recv, obj);
+  Label update_done;
+  type_profile_helper(mdo, md, data, recv, success);
+  __ j(*success);
+
+  __ bind(profile_cast_failure);
+  __ mov_metadata(mdo, md->constant_encoding());
+  Address counter_addr = __ form_address(t1, mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
+  __ ld(t0, counter_addr);
+  __ addi(t0, t0, -DataLayout::counter_increment);
+  __ sd(t0, counter_addr);
+  __ j(*failure);
+}
+
+void LIR_Assembler::lir_store_slowcheck(Register k_RInfo, Register klass_RInfo, Register Rtmp1,
+                                        Label* success_target, Label* failure_target) {
+  // get instance klass (it's already uncompressed)
+  __ ld(k_RInfo, Address(k_RInfo, ObjArrayKlass::element_klass_offset()));
+  // perform the fast part of the checking logic
+  __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, NULL);
+  // call out-of-line instance of __ check_klass_subtype_slow_path(...)
+  __ addi(sp, sp, -2 * wordSize); // 2: store k_RInfo and klass_RInfo
+  __ sd(klass_RInfo, Address(sp, wordSize));  // sub klass
+  __ sd(k_RInfo, Address(sp, 0));             // super klass
+  __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::slow_subtype_check_id)));
+  // load result to k_RInfo
+  __ ld(k_RInfo, Address(sp, 0));
+  __ addi(sp, sp, 2 * wordSize); // 2: pop out k_RInfo and klass_RInfo
+  // result is a boolean
+  __ beqz(k_RInfo, *failure_target, /* is_far */ true);
+}
+
+void LIR_Assembler::const2reg_helper(LIR_Opr src) {
+  switch (src->as_constant_ptr()->type()) {
+    case T_INT:
+    case T_ADDRESS:
+    case T_OBJECT:
+    case T_ARRAY:
+    case T_METADATA:
+        const2reg(src, FrameMap::t0_opr, lir_patch_none, NULL);
+        break;
+    case T_LONG:
+        const2reg(src, FrameMap::t0_long_opr, lir_patch_none, NULL);
+        break;
+    case T_FLOAT:
+    case T_DOUBLE:
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::logic_op_reg32(Register dst, Register left, Register right, LIR_Code code) {
+  switch (code) {
+    case lir_logic_and: __ andrw(dst, left, right); break;
+    case lir_logic_or:  __ orrw (dst, left, right); break;
+    case lir_logic_xor: __ xorrw(dst, left, right); break;
+    default:            ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::logic_op_reg(Register dst, Register left, Register right, LIR_Code code) {
+  switch (code) {
+    case lir_logic_and: __ andr(dst, left, right); break;
+    case lir_logic_or:  __ orr (dst, left, right); break;
+    case lir_logic_xor: __ xorr(dst, left, right); break;
+    default:            ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::logic_op_imm(Register dst, Register left, int right, LIR_Code code) {
+  switch (code) {
+    case lir_logic_and: __ andi(dst, left, right); break;
+    case lir_logic_or:  __ ori (dst, left, right); break;
+    case lir_logic_xor: __ xori(dst, left, right); break;
+    default:            ShouldNotReachHere();
+  }
+}
+
+void LIR_Assembler::store_parameter(Register r, int offset_from_rsp_in_words) {
+  assert(offset_from_rsp_in_words >= 0, "invalid offset from rsp");
+  int offset_from_rsp_in_bytes = offset_from_rsp_in_words * BytesPerWord;
+  assert(offset_from_rsp_in_bytes < frame_map()->reserved_argument_area_size(), "invalid offset");
+  __ sd(r, Address(sp, offset_from_rsp_in_bytes));
+}
+
+void LIR_Assembler::store_parameter(jint c, int offset_from_rsp_in_words) {
+  assert(offset_from_rsp_in_words >= 0, "invalid offset from rsp");
+  int offset_from_rsp_in_bytes = offset_from_rsp_in_words * BytesPerWord;
+  assert(offset_from_rsp_in_bytes < frame_map()->reserved_argument_area_size(), "invalid offset");
+  __ li(t0, c);
+  __ sd(t0, Address(sp, offset_from_rsp_in_bytes));
+}
+
+#undef __
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
new file mode 100644
index 00000000000..051328c3a8a
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_LIRASSEMBLER_RISCV_HPP
+#define CPU_RISCV_C1_LIRASSEMBLER_RISCV_HPP
+
+// ArrayCopyStub needs access to bailout
+friend class ArrayCopyStub;
+
+private:
+
+#include "c1_LIRAssembler_arith_riscv.hpp"
+#include "c1_LIRAssembler_arraycopy_riscv.hpp"
+
+  int array_element_size(BasicType type) const;
+
+  static Register as_reg(LIR_Opr op) {
+    return op->is_double_cpu() ? op->as_register_lo() : op->as_register();
+  }
+
+  Address as_Address(LIR_Address* addr, Register tmp);
+
+  // helper functions which checks for overflow and sets bailout if it
+  // occurs.  Always returns a valid embeddable pointer but in the
+  // bailout case the pointer won't be to unique storage.
+  address float_constant(float f);
+  address double_constant(double d);
+  address int_constant(jlong n);
+
+  // Ensure we have a valid Address (base + offset) to a stack-slot.
+  Address stack_slot_address(int index, uint shift, int adjust = 0);
+
+  // Record the type of the receiver in ReceiverTypeData
+  void type_profile_helper(Register mdo,
+                           ciMethodData *md, ciProfileData *data,
+                           Register recv, Label* update_done);
+
+  void add_debug_info_for_branch(address adr, CodeEmitInfo* info);
+
+  void casw(Register addr, Register newval, Register cmpval);
+  void caswu(Register addr, Register newval, Register cmpval);
+  void casl(Register addr, Register newval, Register cmpval);
+
+  void poll_for_safepoint(relocInfo::relocType rtype, CodeEmitInfo* info = NULL);
+
+  void deoptimize_trap(CodeEmitInfo *info);
+
+  enum {
+    // See emit_static_call_stub for detail
+    // CompiledStaticCall::to_interp_stub_size() (14) + CompiledStaticCall::to_trampoline_stub_size() (1 + 3 + address)
+    _call_stub_size = 14 * NativeInstruction::instruction_size +
+                      (NativeInstruction::instruction_size + NativeCallTrampolineStub::instruction_size),
+    // See emit_exception_handler for detail
+    // verify_not_null_oop + far_call + should_not_reach_here + invalidate_registers(DEBUG_ONLY)
+    _exception_handler_size = DEBUG_ONLY(584) NOT_DEBUG(548), // or smaller
+    // See emit_deopt_handler for detail
+    // auipc (1) + far_jump (6 or 2)
+    _deopt_handler_size = 1 * NativeInstruction::instruction_size +
+                          6 * NativeInstruction::instruction_size // or smaller
+  };
+
+  void check_conflict(ciKlass* exact_klass, intptr_t current_klass, Register tmp,
+                      Label &next, Label &none, Address mdo_addr);
+  void check_no_conflict(ciKlass* exact_klass, intptr_t current_klass, Register tmp, Address mdo_addr, Label &next);
+
+  void check_exact_klass(Register tmp, ciKlass* exact_klass);
+
+  void check_null(Register tmp, Label &update, intptr_t current_klass, Address mdo_addr, bool do_update, Label &next);
+
+  void (MacroAssembler::*add)(Register prev, RegisterOrConstant incr, Register addr);
+  void (MacroAssembler::*xchg)(Register prev, Register newv, Register addr);
+
+  void get_op(BasicType type);
+
+  // emit_typecheck_helper sub functions
+  void data_check(LIR_OpTypeCheck *op, ciMethodData **md, ciProfileData **data);
+  void typecheck_helper_slowcheck(ciKlass* k, Register obj, Register Rtmp1,
+                                  Register k_RInfo, Register klass_RInfo,
+                                  Label* failure_target, Label* success_target);
+  void profile_object(ciMethodData* md, ciProfileData* data, Register obj,
+                      Register klass_RInfo, Label* obj_is_null);
+  void typecheck_loaded(LIR_OpTypeCheck* op, ciKlass* k, Register k_RInfo);
+
+  // emit_opTypeCheck sub functions
+  void typecheck_lir_store(LIR_OpTypeCheck* op, bool should_profile);
+
+  void type_profile(Register obj, ciMethodData* md, Register klass_RInfo, Register k_RInfo,
+                    ciProfileData* data, Label* success, Label* failure,
+                    Label& profile_cast_success, Label& profile_cast_failure);
+
+  void lir_store_slowcheck(Register k_RInfo, Register klass_RInfo, Register Rtmp1,
+                           Label* success_target, Label* failure_target);
+
+  void const2reg_helper(LIR_Opr src);
+
+  void emit_branch(LIR_Condition cmp_flag, LIR_Opr cmp1, LIR_Opr cmp2, Label& label, bool is_far, bool is_unordered);
+
+  void logic_op_reg32(Register dst, Register left, Register right, LIR_Code code);
+  void logic_op_reg(Register dst, Register left, Register right, LIR_Code code);
+  void logic_op_imm(Register dst, Register left, int right, LIR_Code code);
+
+public:
+
+  void emit_cmove(LIR_Op4* op);
+
+  void store_parameter(Register r, int offset_from_rsp_in_words);
+  void store_parameter(jint c, int offset_from_rsp_in_words);
+
+#endif // CPU_RISCV_C1_LIRASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
new file mode 100644
index 00000000000..e126f148cdf
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
@@ -0,0 +1,1075 @@
+/*
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "c1/c1_Compilation.hpp"
+#include "c1/c1_FrameMap.hpp"
+#include "c1/c1_Instruction.hpp"
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_LIRGenerator.hpp"
+#include "c1/c1_Runtime1.hpp"
+#include "c1/c1_ValueStack.hpp"
+#include "ci/ciArray.hpp"
+#include "ci/ciObjArrayKlass.hpp"
+#include "ci/ciTypeArrayKlass.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "utilities/powerOfTwo.hpp"
+#include "vmreg_riscv.inline.hpp"
+
+#ifdef ASSERT
+#define __ gen()->lir(__FILE__, __LINE__)->
+#else
+#define __ gen()->lir()->
+#endif
+
+// Item will be loaded into a byte register; Intel only
+void LIRItem::load_byte_item() {
+  load_item();
+}
+
+
+void LIRItem::load_nonconstant() {
+  LIR_Opr r = value()->operand();
+  if (r->is_constant()) {
+    _result = r;
+  } else {
+    load_item();
+  }
+}
+
+//--------------------------------------------------------------
+//               LIRGenerator
+//--------------------------------------------------------------
+
+
+LIR_Opr LIRGenerator::exceptionOopOpr() { return FrameMap::r10_oop_opr; }
+LIR_Opr LIRGenerator::exceptionPcOpr()  { return FrameMap::r13_opr; }
+LIR_Opr LIRGenerator::divInOpr()        { Unimplemented(); return LIR_OprFact::illegalOpr; }
+LIR_Opr LIRGenerator::divOutOpr()       { Unimplemented(); return LIR_OprFact::illegalOpr; }
+LIR_Opr LIRGenerator::remOutOpr()       { Unimplemented(); return LIR_OprFact::illegalOpr; }
+LIR_Opr LIRGenerator::shiftCountOpr()   { Unimplemented(); return LIR_OprFact::illegalOpr; }
+LIR_Opr LIRGenerator::syncLockOpr()     { return new_register(T_INT); }
+LIR_Opr LIRGenerator::syncTempOpr()     { return FrameMap::r10_opr; }
+LIR_Opr LIRGenerator::getThreadTemp()   { return LIR_OprFact::illegalOpr; }
+
+
+LIR_Opr LIRGenerator::result_register_for(ValueType* type, bool callee) {
+  LIR_Opr opr;
+  switch (type->tag()) {
+    case intTag:     opr = FrameMap::r10_opr;          break;
+    case objectTag:  opr = FrameMap::r10_oop_opr;      break;
+    case longTag:    opr = FrameMap::long10_opr;       break;
+    case floatTag:   opr = FrameMap::fpu10_float_opr;  break;
+    case doubleTag:  opr = FrameMap::fpu10_double_opr; break;
+
+    case addressTag: // fall through
+    default:
+      ShouldNotReachHere();
+      return LIR_OprFact::illegalOpr;
+  }
+
+  assert(opr->type_field() == as_OprType(as_BasicType(type)), "type mismatch");
+  return opr;
+}
+
+
+LIR_Opr LIRGenerator::rlock_byte(BasicType type) {
+  LIR_Opr reg = new_register(T_INT);
+  set_vreg_flag(reg, LIRGenerator::byte_reg);
+  return reg;
+}
+
+//--------- loading items into registers --------------------------------
+
+
+bool LIRGenerator::can_store_as_constant(Value v, BasicType type) const {
+  if (v->type()->as_IntConstant() != NULL) {
+    return v->type()->as_IntConstant()->value() == 0;
+  } else if (v->type()->as_LongConstant() != NULL) {
+    return v->type()->as_LongConstant()->value() == 0;
+  } else if (v->type()->as_ObjectConstant() != NULL) {
+    return v->type()->as_ObjectConstant()->value()->is_null_object();
+  } else if (v->type()->as_FloatConstant() != NULL) {
+    return jint_cast(v->type()->as_FloatConstant()->value()) == 0.0f;
+  } else if (v->type()->as_DoubleConstant() != NULL) {
+    return jlong_cast(v->type()->as_DoubleConstant()->value()) == 0.0;
+  }
+  return false;
+}
+
+bool LIRGenerator::can_inline_as_constant(Value v) const {
+  if (v->type()->as_IntConstant() != NULL) {
+    int value = v->type()->as_IntConstant()->value();
+    // "-value" must be defined for value may be used for sub
+    return Assembler::operand_valid_for_add_immediate(value) &&
+           Assembler::operand_valid_for_add_immediate(- value);
+  } else if (v->type()->as_ObjectConstant() != NULL) {
+    return v->type()->as_ObjectConstant()->value()->is_null_object();
+  } else if (v->type()->as_LongConstant() != NULL) {
+    long value = v->type()->as_LongConstant()->value();
+    // "-value" must be defined for value may be used for sub
+    return Assembler::operand_valid_for_add_immediate(value) &&
+           Assembler::operand_valid_for_add_immediate(- value);
+  } else if (v->type()->as_FloatConstant() != NULL) {
+    return v->type()->as_FloatConstant()->value() == 0.0f;
+  } else if (v->type()->as_DoubleConstant() != NULL) {
+    return v->type()->as_DoubleConstant()->value() == 0.0;
+  }
+  return false;
+}
+
+bool LIRGenerator::can_inline_as_constant(LIR_Const* c) const {
+  if (c->as_constant() != NULL) {
+    long constant = 0;
+    switch (c->type()) {
+      case T_INT:  constant = c->as_jint();   break;
+      case T_LONG: constant = c->as_jlong();  break;
+      default:     return false;
+    }
+    // "-constant" must be defined for c may be used for sub
+    return Assembler::operand_valid_for_add_immediate(constant) &&
+           Assembler::operand_valid_for_add_immediate(- constant);
+  }
+  return false;
+}
+
+LIR_Opr LIRGenerator::safepoint_poll_register() {
+  return LIR_OprFact::illegalOpr;
+}
+
+LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
+                                            int shift, int disp, BasicType type) {
+  assert(base->is_register(), "must be");
+
+  if (index->is_constant()) {
+    LIR_Const *constant = index->as_constant_ptr();
+    jlong c;
+    if (constant->type() == T_INT) {
+      c = (jlong(index->as_jint()) << shift) + disp;
+    } else {
+      assert(constant->type() == T_LONG, "should be");
+      c = (index->as_jlong() << shift) + disp;
+    }
+    if ((jlong)((jint)c) == c) {
+      return new LIR_Address(base, (jint)c, type);
+    } else {
+      LIR_Opr tmp = new_register(T_LONG);
+      __ move(index, tmp);
+      return new LIR_Address(base, tmp, type);
+    }
+  }
+
+  return new LIR_Address(base, index, (LIR_Address::Scale)shift, disp, type);
+}
+
+LIR_Address* LIRGenerator::emit_array_address(LIR_Opr array_opr, LIR_Opr index_opr,
+                                              BasicType type) {
+  int offset_in_bytes = arrayOopDesc::base_offset_in_bytes(type);
+  int elem_size = type2aelembytes(type);
+  int shift = exact_log2(elem_size);
+  return generate_address(array_opr, index_opr, shift, offset_in_bytes, type);
+}
+
+LIR_Opr LIRGenerator::load_immediate(int x, BasicType type) {
+  LIR_Opr r;
+  switch (type) {
+    case T_LONG:
+      r = LIR_OprFact::longConst(x);
+      break;
+    case T_INT:
+      r = LIR_OprFact::intConst(x);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+  return r;
+}
+
+void LIRGenerator::increment_counter(address counter, BasicType type, int step) {
+  LIR_Opr pointer = new_pointer_register();
+  __ move(LIR_OprFact::intptrConst(counter), pointer);
+  LIR_Address* addr = new LIR_Address(pointer, type);
+  increment_counter(addr, step);
+}
+
+void LIRGenerator::increment_counter(LIR_Address* addr, int step) {
+  LIR_Opr reg = new_register(addr->type());
+  __ load(addr, reg);
+  __ add(reg, load_immediate(step, addr->type()), reg);
+  __ store(reg, addr);
+}
+
+void LIRGenerator::cmp_mem_int(LIR_Condition condition, LIR_Opr base, int disp, int c, CodeEmitInfo* info) {
+  LIR_Opr reg = new_register(T_INT);
+  __ load(generate_address(base, disp, T_INT), reg, info);
+  __ cmp(condition, reg, LIR_OprFact::intConst(c));
+}
+
+void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr base, int disp, BasicType type, CodeEmitInfo* info) {
+  LIR_Opr reg1 = new_register(T_INT);
+  __ load(generate_address(base, disp, type), reg1, info);
+  __ cmp(condition, reg, reg1);
+}
+
+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
+  if (tmp->is_valid() && c > 0 && c < max_jint) {
+    if (is_power_of_2(c - 1)) {
+      __ shift_left(left, exact_log2(c - 1), tmp);
+      __ add(tmp, left, result);
+      return true;
+    } else if (is_power_of_2(c + 1)) {
+      __ shift_left(left, exact_log2(c + 1), tmp);
+      __ sub(tmp, left, result);
+      return true;
+    }
+  }
+  return false;
+}
+
+void LIRGenerator::store_stack_parameter (LIR_Opr item, ByteSize offset_from_sp) {
+  BasicType type = item->type();
+  __ store(item, new LIR_Address(FrameMap::sp_opr, in_bytes(offset_from_sp), type));
+}
+
+void LIRGenerator::array_store_check(LIR_Opr value, LIR_Opr array, CodeEmitInfo* store_check_info,
+                                     ciMethod* profiled_method, int profiled_bci) {
+    LIR_Opr tmp1 = new_register(objectType);
+    LIR_Opr tmp2 = new_register(objectType);
+    LIR_Opr tmp3 = new_register(objectType);
+    __ store_check(value, array, tmp1, tmp2, tmp3, store_check_info, profiled_method, profiled_bci);
+}
+
+//----------------------------------------------------------------------
+//             visitor functions
+//----------------------------------------------------------------------
+
+void LIRGenerator::do_MonitorEnter(MonitorEnter* x) {
+  assert(x->is_pinned(), "");
+  LIRItem obj(x->obj(), this);
+  obj.load_item();
+
+  set_no_result(x);
+
+  // "lock" stores the address of the monitor stack slot, so this is not an oop
+  LIR_Opr lock = new_register(T_INT);
+
+  CodeEmitInfo* info_for_exception = NULL;
+  if (x->needs_null_check()) {
+    info_for_exception = state_for(x);
+  }
+  // this CodeEmitInfo must not have the xhandlers because here the
+  // object is already locked (xhandlers expect object to be unlocked)
+  CodeEmitInfo* info = state_for(x, x->state(), true);
+  monitor_enter(obj.result(), lock, syncTempOpr(), LIR_OprFact::illegalOpr,
+                x->monitor_no(), info_for_exception, info);
+}
+
+void LIRGenerator::do_MonitorExit(MonitorExit* x) {
+  assert(x->is_pinned(), "");
+
+  LIRItem obj(x->obj(), this);
+  obj.dont_load_item();
+
+  LIR_Opr lock = new_register(T_INT);
+  LIR_Opr obj_temp = new_register(T_INT);
+  set_no_result(x);
+  monitor_exit(obj_temp, lock, syncTempOpr(), LIR_OprFact::illegalOpr, x->monitor_no());
+}
+
+// neg
+void LIRGenerator::do_NegateOp(NegateOp* x) {
+  LIRItem from(x->x(), this);
+  from.load_item();
+  LIR_Opr result = rlock_result(x);
+  __ negate(from.result(), result);
+}
+
+// for  _fadd, _fmul, _fsub, _fdiv, _frem
+//      _dadd, _dmul, _dsub, _ddiv, _drem
+void LIRGenerator::do_ArithmeticOp_FPU(ArithmeticOp* x) {
+  LIRItem left(x->x(), this);
+  LIRItem right(x->y(), this);
+
+  if (x->op() == Bytecodes::_frem || x->op() == Bytecodes::_drem) {
+
+    // float remainder is implemented as a direct call into the runtime
+    BasicTypeList signature(2);
+    if (x->op() == Bytecodes::_frem) {
+      signature.append(T_FLOAT);
+      signature.append(T_FLOAT);
+    } else {
+      signature.append(T_DOUBLE);
+      signature.append(T_DOUBLE);
+    }
+    CallingConvention* cc = frame_map()->c_calling_convention(&signature);
+
+    const LIR_Opr result_reg = result_register_for(x->type());
+
+    left.load_item();
+    __ move(left.result(), cc->at(0));
+    right.load_item_force(cc->at(1));
+
+    address entry;
+    if (x->op() == Bytecodes::_frem) {
+      entry = CAST_FROM_FN_PTR(address, SharedRuntime::frem);
+    } else {
+      entry = CAST_FROM_FN_PTR(address, SharedRuntime::drem);
+    }
+
+    LIR_Opr result = rlock_result(x);
+    __ call_runtime_leaf(entry, getThreadTemp(), result_reg, cc->args());
+    __ move(result_reg, result);
+
+    return;
+  }
+
+  if (!left.is_register()) {
+    left.load_item();
+  }
+  // Always load right hand side.
+  right.load_item();
+
+  LIR_Opr reg = rlock(x);
+  arithmetic_op_fpu(x->op(), reg, left.result(), right.result());
+
+  set_result(x, round_item(reg));
+}
+
+// for  _ladd, _lmul, _lsub, _ldiv, _lrem
+void LIRGenerator::do_ArithmeticOp_Long(ArithmeticOp* x) {
+
+  // missing test if instr is commutative and if we should swap
+  LIRItem left(x->x(), this);
+  LIRItem right(x->y(), this);
+
+  if (x->op() == Bytecodes::_ldiv || x->op() == Bytecodes::_lrem) {
+
+    left.load_item();
+
+    bool need_zero_check = true;
+    if (right.is_constant()) {
+      jlong c = right.get_jlong_constant();
+      // no need to do div-by-zero check if the divisor is a non-zero constant
+      if (c != 0) { need_zero_check = false; }
+      // do not load right if the divisor is a power-of-2 constant
+      if (c > 0 && is_power_of_2(c)) {
+        right.dont_load_item();
+      } else {
+        right.load_item();
+      }
+    } else {
+      right.load_item();
+    }
+    if (need_zero_check) {
+      CodeEmitInfo* info = state_for(x);
+      __ cmp(lir_cond_equal, right.result(), LIR_OprFact::longConst(0));
+      __ branch(lir_cond_equal, new DivByZeroStub(info));
+    }
+
+    rlock_result(x);
+    switch (x->op()) {
+      case Bytecodes::_lrem:
+        __ rem(left.result(), right.result(), x->operand());
+        break;
+      case Bytecodes::_ldiv:
+        __ div(left.result(), right.result(), x->operand());
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  } else {
+    assert(x->op() == Bytecodes::_lmul || x->op() == Bytecodes::_ladd || x->op() == Bytecodes::_lsub,
+           "expect lmul, ladd or lsub");
+    // add, sub, mul
+    left.load_item();
+    if (!right.is_register()) {
+      if (x->op() == Bytecodes::_lmul ||
+          !right.is_constant() ||
+          (x->op() == Bytecodes::_ladd &&
+          !Assembler::operand_valid_for_add_immediate(right.get_jlong_constant())) ||
+          (x->op() == Bytecodes::_lsub &&
+          !Assembler::operand_valid_for_add_immediate(-right.get_jlong_constant()))) {
+            right.load_item();
+      } else { // add, sub
+        assert(x->op() == Bytecodes::_ladd || x->op() == Bytecodes::_lsub, "expected ladd or lsub");
+        // don't load constants to save register
+        right.load_nonconstant();
+      }
+    }
+    rlock_result(x);
+    arithmetic_op_long(x->op(), x->operand(), left.result(), right.result(), NULL);
+  }
+}
+
+// for: _iadd, _imul, _isub, _idiv, _irem
+void LIRGenerator::do_ArithmeticOp_Int(ArithmeticOp* x) {
+
+  // Test if instr is commutative and if we should swap
+  LIRItem left(x->x(),  this);
+  LIRItem right(x->y(), this);
+  LIRItem* left_arg = &left;
+  LIRItem* right_arg = &right;
+  if (x->is_commutative() && left.is_stack() && right.is_register()) {
+    // swap them if left is real stack (or cached) and right is real register(not cached)
+    left_arg = &right;
+    right_arg = &left;
+  }
+  left_arg->load_item();
+  // do not need to load right, as we can handle stack and constants
+  if (x->op() == Bytecodes::_idiv || x->op() == Bytecodes::_irem) {
+
+    rlock_result(x);
+
+    bool need_zero_check = true;
+    if (right.is_constant()) {
+      jint c = right.get_jint_constant();
+      // no need to do div-by-zero check if the divisor is a non-zero constant
+      if (c != 0) { need_zero_check = false; }
+      // do not load right if the divisor is a power-of-2 constant
+      if (c > 0 && is_power_of_2(c)) {
+        right_arg->dont_load_item();
+      } else {
+        right_arg->load_item();
+      }
+    } else {
+      right_arg->load_item();
+    }
+    if (need_zero_check) {
+      CodeEmitInfo* info = state_for(x);
+      __ cmp(lir_cond_equal, right_arg->result(), LIR_OprFact::longConst(0));
+      __ branch(lir_cond_equal, new DivByZeroStub(info));
+    }
+
+    LIR_Opr ill = LIR_OprFact::illegalOpr;
+    if (x->op() == Bytecodes::_irem) {
+      __ irem(left_arg->result(), right_arg->result(), x->operand(), ill, NULL);
+    } else if (x->op() == Bytecodes::_idiv) {
+      __ idiv(left_arg->result(), right_arg->result(), x->operand(), ill, NULL);
+    }
+
+  } else if (x->op() == Bytecodes::_iadd || x->op() == Bytecodes::_isub) {
+    if (right.is_constant() &&
+        ((x->op() == Bytecodes::_iadd && !Assembler::operand_valid_for_add_immediate(right.get_jint_constant())) ||
+         (x->op() == Bytecodes::_isub && !Assembler::operand_valid_for_add_immediate(-right.get_jint_constant())))) {
+      right.load_nonconstant();
+    } else {
+      right.load_item();
+    }
+    rlock_result(x);
+    arithmetic_op_int(x->op(), x->operand(), left_arg->result(), right_arg->result(), LIR_OprFact::illegalOpr);
+  } else {
+    assert (x->op() == Bytecodes::_imul, "expect imul");
+    if (right.is_constant()) {
+      jint c = right.get_jint_constant();
+      if (c > 0 && c < max_jint && (is_power_of_2(c) || is_power_of_2(c - 1) || is_power_of_2(c + 1))) {
+        right_arg->dont_load_item();
+      } else {
+        // Cannot use constant op.
+        right_arg->load_item();
+      }
+    } else {
+      right.load_item();
+    }
+    rlock_result(x);
+    arithmetic_op_int(x->op(), x->operand(), left_arg->result(), right_arg->result(), new_register(T_INT));
+  }
+}
+
+void LIRGenerator::do_ArithmeticOp(ArithmeticOp* x) {
+  // when an operand with use count 1 is the left operand, then it is
+  // likely that no move for 2-operand-LIR-form is necessary
+  if (x->is_commutative() && x->y()->as_Constant() == NULL && x->x()->use_count() > x->y()->use_count()) {
+    x->swap_operands();
+  }
+
+  ValueTag tag = x->type()->tag();
+  assert(x->x()->type()->tag() == tag && x->y()->type()->tag() == tag, "wrong parameters");
+  switch (tag) {
+    case floatTag:
+    case doubleTag:  do_ArithmeticOp_FPU(x);  return;
+    case longTag:    do_ArithmeticOp_Long(x); return;
+    case intTag:     do_ArithmeticOp_Int(x);  return;
+    default:         ShouldNotReachHere();    return;
+  }
+}
+
+// _ishl, _lshl, _ishr, _lshr, _iushr, _lushr
+void LIRGenerator::do_ShiftOp(ShiftOp* x) {
+  LIRItem value(x->x(), this);
+  LIRItem count(x->y(), this);
+
+  value.load_item();
+  if (count.is_constant()) {
+    assert(count.type()->as_IntConstant() != NULL || count.type()->as_LongConstant() != NULL , "should be");
+    count.dont_load_item();
+  } else {
+    count.load_item();
+  }
+
+  LIR_Opr res = rlock_result(x);
+  shift_op(x->op(), res, value.result(), count.result(), LIR_OprFact::illegalOpr);
+}
+
+
+// _iand, _land, _ior, _lor, _ixor, _lxor
+void LIRGenerator::do_LogicOp(LogicOp* x) {
+
+  LIRItem left(x->x(),  this);
+  LIRItem right(x->y(), this);
+
+  left.load_item();
+  rlock_result(x);
+  ValueTag tag = right.type()->tag();
+  if (right.is_constant() &&
+     ((tag == longTag && Assembler::operand_valid_for_add_immediate(right.get_jlong_constant())) ||
+      (tag == intTag && Assembler::operand_valid_for_add_immediate(right.get_jint_constant()))))  {
+    right.dont_load_item();
+  } else {
+    right.load_item();
+  }
+
+  switch (x->op()) {
+    case Bytecodes::_iand:  // fall through
+    case Bytecodes::_land:
+      __ logical_and(left.result(), right.result(), x->operand()); break;
+    case Bytecodes::_ior:   // fall through
+    case Bytecodes::_lor:
+      __ logical_or(left.result(), right.result(), x->operand()); break;
+    case Bytecodes::_ixor:  // fall through
+    case Bytecodes::_lxor:
+      __ logical_xor(left.result(), right.result(), x->operand()); break;
+    default: Unimplemented();
+  }
+}
+
+// _lcmp, _fcmpl, _fcmpg, _dcmpl, _dcmpg
+void LIRGenerator::do_CompareOp(CompareOp* x) {
+  LIRItem left(x->x(), this);
+  LIRItem right(x->y(), this);
+  ValueTag tag = x->x()->type()->tag();
+  if (tag == longTag) {
+    left.set_destroys_register();
+  }
+  left.load_item();
+  right.load_item();
+  LIR_Opr reg = rlock_result(x);
+
+  if (x->x()->type()->is_float_kind()) {
+    Bytecodes::Code code = x->op();
+    __ fcmp2int(left.result(), right.result(), reg, (code == Bytecodes::_fcmpl || code == Bytecodes::_dcmpl));
+  } else if (x->x()->type()->tag() == longTag) {
+    __ lcmp2int(left.result(), right.result(), reg);
+  } else {
+    Unimplemented();
+  }
+}
+
+LIR_Opr LIRGenerator::atomic_cmpxchg(BasicType type, LIR_Opr addr, LIRItem& cmp_value, LIRItem& new_value) {
+  LIR_Opr ill = LIR_OprFact::illegalOpr;  // for convenience
+  new_value.load_item();
+  cmp_value.load_item();
+  LIR_Opr result = new_register(T_INT);
+  if (is_reference_type(type)) {
+    __ cas_obj(addr, cmp_value.result(), new_value.result(), new_register(T_INT), new_register(T_INT), result);
+  } else if (type == T_INT) {
+    __ cas_int(addr->as_address_ptr()->base(), cmp_value.result(), new_value.result(), ill, ill);
+  } else if (type == T_LONG) {
+    __ cas_long(addr->as_address_ptr()->base(), cmp_value.result(), new_value.result(), ill, ill);
+  } else {
+    ShouldNotReachHere();
+  }
+  __ logical_xor(FrameMap::r5_opr, LIR_OprFact::intConst(1), result);
+  return result;
+}
+
+LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value) {
+  bool is_oop = is_reference_type(type);
+  LIR_Opr result = new_register(type);
+  value.load_item();
+  assert(type == T_INT || is_oop LP64_ONLY( || type == T_LONG ), "unexpected type");
+  LIR_Opr tmp = new_register(T_INT);
+  __ xchg(addr, value.result(), result, tmp);
+  return result;
+}
+
+LIR_Opr LIRGenerator::atomic_add(BasicType type, LIR_Opr addr, LIRItem& value) {
+  LIR_Opr result = new_register(type);
+  value.load_item();
+  assert(type == T_INT LP64_ONLY( || type == T_LONG ), "unexpected type");
+  LIR_Opr tmp = new_register(T_INT);
+  __ xadd(addr, value.result(), result, tmp);
+  return result;
+}
+
+void LIRGenerator::do_MathIntrinsic(Intrinsic* x) {
+  assert(x->number_of_arguments() == 1 || (x->number_of_arguments() == 2 && x->id() == vmIntrinsics::_dpow),
+         "wrong type");
+
+  switch (x->id()) {
+    case vmIntrinsics::_dexp: // fall through
+    case vmIntrinsics::_dlog: // fall through
+    case vmIntrinsics::_dpow: // fall through
+    case vmIntrinsics::_dcos: // fall through
+    case vmIntrinsics::_dsin: // fall through
+    case vmIntrinsics::_dtan: // fall through
+    case vmIntrinsics::_dlog10:
+      do_LibmIntrinsic(x);
+      break;
+    case vmIntrinsics::_dabs: // fall through
+    case vmIntrinsics::_dsqrt: // fall through
+    case vmIntrinsics::_dsqrt_strict: {
+      assert(x->number_of_arguments() == 1, "wrong type");
+      LIRItem value(x->argument_at(0), this);
+      value.load_item();
+      LIR_Opr dst = rlock_result(x);
+
+      switch (x->id()) {
+        case vmIntrinsics::_dsqrt: // fall through
+        case vmIntrinsics::_dsqrt_strict: {
+          __ sqrt(value.result(), dst, LIR_OprFact::illegalOpr);
+          break;
+        }
+        case vmIntrinsics::_dabs: {
+          __ abs(value.result(), dst, LIR_OprFact::illegalOpr);
+          break;
+        }
+        default:
+          ShouldNotReachHere();
+      }
+      break;
+    }
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void LIRGenerator::do_LibmIntrinsic(Intrinsic* x) {
+  LIRItem value(x->argument_at(0), this);
+  value.set_destroys_register();
+  LIR_Opr calc_result = rlock_result(x);
+  LIR_Opr result_reg = result_register_for(x->type());
+  CallingConvention* cc = NULL;
+  BasicTypeList signature(1);
+  signature.append(T_DOUBLE);
+  if (x->id() == vmIntrinsics::_dpow) { signature.append(T_DOUBLE); }
+  cc = frame_map()->c_calling_convention(&signature);
+  value.load_item_force(cc->at(0));
+  if (x->id() == vmIntrinsics::_dpow) {
+    LIRItem value1(x->argument_at(1), this);
+    value1.set_destroys_register();
+    value1.load_item_force(cc->at(1));
+  }
+  switch (x->id()) {
+    case vmIntrinsics::_dexp:
+      if (StubRoutines::dexp() != NULL) { __ call_runtime_leaf(StubRoutines::dexp(), getThreadTemp(), result_reg, cc->args()); }
+      else { __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dexp), getThreadTemp(), result_reg, cc->args()); }
+      break;
+    case vmIntrinsics::_dlog:
+      if (StubRoutines::dlog() != NULL) {  __ call_runtime_leaf(StubRoutines::dlog(), getThreadTemp(), result_reg, cc->args()); }
+      else { __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dlog), getThreadTemp(), result_reg, cc->args()); }
+      break;
+    case vmIntrinsics::_dlog10:
+      if (StubRoutines::dlog10() != NULL) { __ call_runtime_leaf(StubRoutines::dlog10(), getThreadTemp(), result_reg, cc->args()); }
+      else { __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10), getThreadTemp(), result_reg, cc->args()); }
+      break;
+    case vmIntrinsics::_dsin:
+      if (StubRoutines::dsin() != NULL) { __ call_runtime_leaf(StubRoutines::dsin(), getThreadTemp(), result_reg, cc->args()); }
+      else { __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dsin), getThreadTemp(), result_reg, cc->args()); }
+      break;
+    case vmIntrinsics::_dcos:
+      if (StubRoutines::dcos() != NULL) {  __ call_runtime_leaf(StubRoutines::dcos(), getThreadTemp(), result_reg, cc->args()); }
+      else { __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dcos), getThreadTemp(), result_reg, cc->args()); }
+      break;
+    case vmIntrinsics::_dtan:
+      if (StubRoutines::dtan() != NULL) { __ call_runtime_leaf(StubRoutines::dtan(), getThreadTemp(), result_reg, cc->args()); }
+      else { __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtan), getThreadTemp(), result_reg, cc->args()); }
+      break;
+    case vmIntrinsics::_dpow:
+      if (StubRoutines::dpow() != NULL) { __ call_runtime_leaf(StubRoutines::dpow(), getThreadTemp(), result_reg, cc->args()); }
+      else { __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dpow), getThreadTemp(), result_reg, cc->args()); }
+      break;
+    default:  ShouldNotReachHere();
+  }
+  __ move(result_reg, calc_result);
+}
+
+
+void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
+  assert(x->number_of_arguments() == 5, "wrong type");
+
+  // Make all state_for calls early since they can emit code
+  CodeEmitInfo* info = state_for(x, x->state());
+
+  LIRItem src(x->argument_at(0), this);
+  LIRItem src_pos(x->argument_at(1), this);
+  LIRItem dst(x->argument_at(2), this);
+  LIRItem dst_pos(x->argument_at(3), this);
+  LIRItem length(x->argument_at(4), this);
+
+  // operands for arraycopy must use fixed registers, otherwise
+  // LinearScan will fail allocation (because arraycopy always needs a
+  // call)
+
+  // The java calling convention will give us enough registers
+  // so that on the stub side the args will be perfect already.
+  // On the other slow/special case side we call C and the arg
+  // positions are not similar enough to pick one as the best.
+  // Also because the java calling convention is a "shifted" version
+  // of the C convention we can process the java args trivially into C
+  // args without worry of overwriting during the xfer
+
+  src.load_item_force     (FrameMap::as_oop_opr(j_rarg0));
+  src_pos.load_item_force (FrameMap::as_opr(j_rarg1));
+  dst.load_item_force     (FrameMap::as_oop_opr(j_rarg2));
+  dst_pos.load_item_force (FrameMap::as_opr(j_rarg3));
+  length.load_item_force  (FrameMap::as_opr(j_rarg4));
+
+  LIR_Opr tmp = FrameMap::as_opr(j_rarg5);
+
+  set_no_result(x);
+
+  int flags;
+  ciArrayKlass* expected_type = NULL;
+  arraycopy_helper(x, &flags, &expected_type);
+
+  __ arraycopy(src.result(), src_pos.result(), dst.result(), dst_pos.result(), length.result(), tmp,
+               expected_type, flags, info); // does add_safepoint
+}
+
+void LIRGenerator::do_update_CRC32(Intrinsic* x) {
+  ShouldNotReachHere();
+}
+
+void LIRGenerator::do_update_CRC32C(Intrinsic* x) {
+  ShouldNotReachHere();
+}
+
+void LIRGenerator::do_FmaIntrinsic(Intrinsic* x) {
+  assert(x->number_of_arguments() == 3, "wrong type");
+  assert(UseFMA, "Needs FMA instructions support.");
+  LIRItem value(x->argument_at(0), this);
+  LIRItem value1(x->argument_at(1), this);
+  LIRItem value2(x->argument_at(2), this);
+
+  value.load_item();
+  value1.load_item();
+  value2.load_item();
+
+  LIR_Opr calc_input = value.result();
+  LIR_Opr calc_input1 = value1.result();
+  LIR_Opr calc_input2 = value2.result();
+  LIR_Opr calc_result = rlock_result(x);
+
+  switch (x->id()) {
+    case vmIntrinsics::_fmaD:   __ fmad(calc_input, calc_input1, calc_input2, calc_result); break;
+    case vmIntrinsics::_fmaF:   __ fmaf(calc_input, calc_input1, calc_input2, calc_result); break;
+    default:                    ShouldNotReachHere();
+  }
+}
+
+void LIRGenerator::do_vectorizedMismatch(Intrinsic* x) {
+  fatal("vectorizedMismatch intrinsic is not implemented on this platform");
+}
+
+// _i2l, _i2f, _i2d, _l2i, _l2f, _l2d, _f2i, _f2l, _f2d, _d2i, _d2l, _d2f
+// _i2b, _i2c, _i2s
+void LIRGenerator::do_Convert(Convert* x) {
+  LIRItem value(x->value(), this);
+  value.load_item();
+  LIR_Opr input = value.result();
+  LIR_Opr result = rlock(x);
+
+  // arguments of lir_convert
+  LIR_Opr conv_input = input;
+  LIR_Opr conv_result = result;
+
+  __ convert(x->op(), conv_input, conv_result);
+
+  assert(result->is_virtual(), "result must be virtual register");
+  set_result(x, result);
+}
+
+void LIRGenerator::do_NewInstance(NewInstance* x) {
+#ifndef PRODUCT
+  if (PrintNotLoaded && !x->klass()->is_loaded()) {
+    tty->print_cr("   ###class not loaded at new bci %d", x->printable_bci());
+  }
+#endif
+  CodeEmitInfo* info = state_for(x, x->state());
+  LIR_Opr reg = result_register_for(x->type());
+  new_instance(reg, x->klass(), x->is_unresolved(),
+               FrameMap::r12_oop_opr,
+               FrameMap::r15_oop_opr,
+               FrameMap::r14_oop_opr,
+               LIR_OprFact::illegalOpr,
+               FrameMap::r13_metadata_opr,
+               info);
+  LIR_Opr result = rlock_result(x);
+  __ move(reg, result);
+}
+
+void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
+  CodeEmitInfo* info = state_for(x, x->state());
+
+  LIRItem length(x->length(), this);
+  length.load_item_force(FrameMap::r9_opr);
+
+  LIR_Opr reg = result_register_for(x->type());
+  LIR_Opr tmp1 = FrameMap::r12_oop_opr;
+  LIR_Opr tmp2 = FrameMap::r14_oop_opr;
+  LIR_Opr tmp3 = FrameMap::r15_oop_opr;
+  LIR_Opr tmp4 = reg;
+  LIR_Opr klass_reg = FrameMap::r13_metadata_opr;
+  LIR_Opr len = length.result();
+  BasicType elem_type = x->elt_type();
+
+  __ 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);
+
+  LIR_Opr result = rlock_result(x);
+  __ move(reg, result);
+}
+
+void LIRGenerator::do_NewObjectArray(NewObjectArray* x) {
+  LIRItem length(x->length(), this);
+  // in case of patching (i.e., object class is not yet loaded), we need to reexecute the instruction
+  // and therefore provide the state before the parameters have been consumed
+  CodeEmitInfo* patching_info = NULL;
+  if (!x->klass()->is_loaded() || PatchALot) {
+    patching_info =  state_for(x, x->state_before());
+  }
+
+  CodeEmitInfo* info = state_for(x, x->state());
+
+  LIR_Opr reg = result_register_for(x->type());
+  LIR_Opr tmp1 = FrameMap::r12_oop_opr;
+  LIR_Opr tmp2 = FrameMap::r14_oop_opr;
+  LIR_Opr tmp3 = FrameMap::r15_oop_opr;
+  LIR_Opr tmp4 = reg;
+  LIR_Opr klass_reg = FrameMap::r13_metadata_opr;
+
+  length.load_item_force(FrameMap::r9_opr);
+  LIR_Opr len = length.result();
+
+  CodeStub* slow_path = new NewObjectArrayStub(klass_reg, len, reg, info);
+  ciKlass* obj = (ciKlass*) ciObjArrayKlass::make(x->klass());
+  if (obj == ciEnv::unloaded_ciobjarrayklass()) {
+    BAILOUT("encountered unloaded_ciobjarrayklass due to out of memory error");
+  }
+  klass2reg_with_patching(klass_reg, obj, patching_info);
+  __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, T_OBJECT, klass_reg, slow_path);
+
+  LIR_Opr result = rlock_result(x);
+  __ move(reg, result);
+}
+
+
+void LIRGenerator::do_NewMultiArray(NewMultiArray* x) {
+  Values* dims = x->dims();
+  int i = dims->length();
+  LIRItemList* items = new LIRItemList(i, i, NULL);
+  while (i-- > 0) {
+    LIRItem* size = new LIRItem(dims->at(i), this);
+    items->at_put(i, size);
+  }
+
+  // Evaluate state_for early since it may emit code.
+  CodeEmitInfo* patching_info = NULL;
+  if (!x->klass()->is_loaded() || PatchALot) {
+    patching_info = state_for(x, x->state_before());
+
+    // Cannot re-use same xhandlers for multiple CodeEmitInfos, so
+    // clone all handlers (NOTE: Usually this is handled transparently
+    // by the CodeEmitInfo cloning logic in CodeStub constructors but
+    // is done explicitly here because a stub isn't being used).
+    x->set_exception_handlers(new XHandlers(x->exception_handlers()));
+  }
+  CodeEmitInfo* info = state_for(x, x->state());
+
+  i = dims->length();
+  while (i-- > 0) {
+    LIRItem* size = items->at(i);
+    size->load_item();
+
+    store_stack_parameter(size->result(), in_ByteSize(i * BytesPerInt));
+  }
+
+  LIR_Opr klass_reg = FrameMap::r10_metadata_opr;
+  klass2reg_with_patching(klass_reg, x->klass(), patching_info);
+
+  LIR_Opr rank = FrameMap::r9_opr;
+  __ move(LIR_OprFact::intConst(x->rank()), rank);
+  LIR_Opr varargs = FrameMap::r12_opr;
+  __ move(FrameMap::sp_opr, varargs);
+  LIR_OprList* args = new LIR_OprList(3);
+  args->append(klass_reg);
+  args->append(rank);
+  args->append(varargs);
+  LIR_Opr reg = result_register_for(x->type());
+  __ call_runtime(Runtime1::entry_for(Runtime1::new_multi_array_id),
+                  LIR_OprFact::illegalOpr,
+                  reg, args, info);
+
+  LIR_Opr result = rlock_result(x);
+  __ move(reg, result);
+}
+
+void LIRGenerator::do_BlockBegin(BlockBegin* x) {
+  // nothing to do for now
+}
+
+void LIRGenerator::do_CheckCast(CheckCast* x) {
+  LIRItem obj(x->obj(), this);
+
+  CodeEmitInfo* patching_info = NULL;
+  if (!x->klass()->is_loaded() ||
+      (PatchALot && !x->is_incompatible_class_change_check() && !x->is_invokespecial_receiver_check())) {
+    // must do this before locking the destination register as an oop register,
+    // and before the obj is loaded (the latter is for deoptimization)
+    patching_info = state_for(x, x->state_before());
+  }
+  obj.load_item();
+
+  // info for exceptions
+  CodeEmitInfo* info_for_exception =
+      (x->needs_exception_state() ? state_for(x) :
+                                    state_for(x, x->state_before(), true /*ignore_xhandler*/ ));
+
+  CodeStub* stub = NULL;
+  if (x->is_incompatible_class_change_check()) {
+    assert(patching_info == NULL, "can't patch this");
+    stub = new SimpleExceptionStub(Runtime1::throw_incompatible_class_change_error_id, LIR_OprFact::illegalOpr,
+                                   info_for_exception);
+  } else if (x->is_invokespecial_receiver_check()) {
+    assert(patching_info == NULL, "can't patch this");
+    stub = new DeoptimizeStub(info_for_exception,
+                              Deoptimization::Reason_class_check,
+                              Deoptimization::Action_none);
+  } else {
+    stub = new SimpleExceptionStub(Runtime1::throw_class_cast_exception_id, obj.result(), info_for_exception);
+  }
+  LIR_Opr reg = rlock_result(x);
+  LIR_Opr tmp3 = LIR_OprFact::illegalOpr;
+  if (!x->klass()->is_loaded() || UseCompressedClassPointers) {
+    tmp3 = new_register(objectType);
+  }
+  __ checkcast(reg, obj.result(), x->klass(),
+               new_register(objectType), new_register(objectType), tmp3,
+               x->direct_compare(), info_for_exception, patching_info, stub,
+               x->profiled_method(), x->profiled_bci());
+}
+
+void LIRGenerator::do_InstanceOf(InstanceOf* x) {
+  LIRItem obj(x->obj(), this);
+
+  // result and test object may not be in same register
+  LIR_Opr reg = rlock_result(x);
+  CodeEmitInfo* patching_info = NULL;
+  if ((!x->klass()->is_loaded() || PatchALot)) {
+    // must do this before locking the destination register as an oop register
+    patching_info = state_for(x, x->state_before());
+  }
+  obj.load_item();
+  LIR_Opr tmp3 = LIR_OprFact::illegalOpr;
+  if (!x->klass()->is_loaded() || UseCompressedClassPointers) {
+    tmp3 = new_register(objectType);
+  }
+  __ instanceof(reg, obj.result(), x->klass(),
+                new_register(objectType), new_register(objectType), tmp3,
+                x->direct_compare(), patching_info, x->profiled_method(), x->profiled_bci());
+}
+
+void LIRGenerator::do_If(If* x) {
+  // If should have two successors
+  assert(x->number_of_sux() == 2, "inconsistency");
+  ValueTag tag = x->x()->type()->tag();
+  bool is_safepoint = x->is_safepoint();
+
+  If::Condition cond = x->cond();
+
+  LIRItem xitem(x->x(), this);
+  LIRItem yitem(x->y(), this);
+  LIRItem* xin = &xitem;
+  LIRItem* yin = &yitem;
+
+  if (tag == longTag) {
+    // for longs, only conditions "eql", "neq", "lss", "geq" are valid;
+    // mirror for other conditions
+    if (cond == If::gtr || cond == If::leq) {
+      cond = Instruction::mirror(cond);
+      xin = &yitem;
+      yin = &xitem;
+    }
+    xin->set_destroys_register();
+  }
+  xin->load_item();
+  yin->load_item();
+
+  set_no_result(x);
+
+  LIR_Opr left = xin->result();
+  LIR_Opr right = yin->result();
+
+  // add safepoint before generating condition code so it can be recomputed
+  if (x->is_safepoint()) {
+    // increment backedge counter if needed
+    increment_backedge_counter_conditionally(lir_cond(cond), left, right, state_for(x, x->state_before()),
+                                             x->tsux()->bci(), x->fsux()->bci(), x->profiled_bci());
+    __ safepoint(LIR_OprFact::illegalOpr, state_for(x, x->state_before()));
+  }
+
+  // Generate branch profiling. Profiling code doesn't kill flags.
+  __ cmp(lir_cond(cond), left, right);
+  profile_branch(x, cond);
+  move_to_phi(x->state());
+  if (x->x()->type()->is_float_kind()) {
+    __ branch(lir_cond(cond), x->tsux(), x->usux());
+  } else {
+    __ branch(lir_cond(cond), x->tsux());
+  }
+  assert(x->default_sux() == x->fsux(), "wrong destination above");
+  __ jump(x->default_sux());
+}
+
+LIR_Opr LIRGenerator::getThreadPointer() {
+   return FrameMap::as_pointer_opr(xthread);
+}
+
+void LIRGenerator::trace_block_entry(BlockBegin* block) { Unimplemented(); }
+
+void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
+                                        CodeEmitInfo* info) {
+  __ volatile_store_mem_reg(value, address, info);
+}
+
+void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
+                                       CodeEmitInfo* info) {
+  __ volatile_load_mem_reg(address, result, info);
+}
diff --git a/src/hotspot/cpu/riscv/c1_LIR_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIR_riscv.cpp
new file mode 100644
index 00000000000..5f1c394ab3d
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LIR_riscv.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/register.hpp"
+#include "c1/c1_LIR.hpp"
+
+FloatRegister LIR_Opr::as_float_reg() const {
+  return as_FloatRegister(fpu_regnr());
+}
+
+FloatRegister LIR_Opr::as_double_reg() const {
+  return as_FloatRegister(fpu_regnrLo());
+}
+
+// Reg2 unused.
+LIR_Opr LIR_OprFact::double_fpu(int reg1, int reg2) {
+  assert(as_FloatRegister(reg2) == fnoreg, "Not used on this platform");
+  return (LIR_Opr)(intptr_t)((reg1 << LIR_Opr::reg1_shift) |
+                             (reg1 << LIR_Opr::reg2_shift) |
+                             LIR_Opr::double_type          |
+                             LIR_Opr::fpu_register         |
+                             LIR_Opr::double_size);
+}
+
+#ifndef PRODUCT
+void LIR_Address::verify() const {
+  assert(base()->is_cpu_register(), "wrong base operand");
+  assert(index()->is_illegal() || index()->is_double_cpu() || index()->is_single_cpu(), "wrong index operand");
+  assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_LONG ||
+         base()->type() == T_METADATA, "wrong type for addresses");
+}
+#endif // PRODUCT
diff --git a/src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp b/src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp
new file mode 100644
index 00000000000..78a61128bdd
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "c1/c1_Instruction.hpp"
+#include "c1/c1_LinearScan.hpp"
+#include "utilities/bitMap.inline.hpp"
+
+void LinearScan::allocate_fpu_stack() {
+  // No FPU stack on RISCV
+}
diff --git a/src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp b/src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp
new file mode 100644
index 00000000000..d7ca7b0fd05
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_LinearScan_riscv.hpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_LINEARSCAN_RISCV_HPP
+#define CPU_RISCV_C1_LINEARSCAN_RISCV_HPP
+
+inline bool LinearScan::is_processed_reg_num(int reg_num)
+{
+  return reg_num <= FrameMap::last_cpu_reg() || reg_num >= pd_nof_cpu_regs_frame_map;
+}
+
+inline int LinearScan::num_physical_regs(BasicType type) {
+  return 1;
+}
+
+inline bool LinearScan::requires_adjacent_regs(BasicType type) {
+  return false;
+}
+
+inline bool LinearScan::is_caller_save(int assigned_reg) {
+  assert(assigned_reg >= 0 && assigned_reg < nof_regs, "should call this only for registers");
+  if (assigned_reg < pd_first_callee_saved_reg) {
+    return true;
+  }
+  if (assigned_reg > pd_last_callee_saved_reg && assigned_reg < pd_first_callee_saved_fpu_reg_1) {
+    return true;
+  }
+  if (assigned_reg > pd_last_callee_saved_fpu_reg_1 && assigned_reg < pd_first_callee_saved_fpu_reg_2) {
+    return true;
+  }
+  if (assigned_reg > pd_last_callee_saved_fpu_reg_2 && assigned_reg < pd_last_fpu_reg) {
+    return true;
+  }
+  return false;
+}
+
+inline void LinearScan::pd_add_temps(LIR_Op* op) {
+  // No special case behaviours yet
+}
+
+
+// Implementation of LinearScanWalker
+
+inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur)
+{
+  if (allocator()->gen()->is_vreg_flag_set(cur->reg_num(), LIRGenerator::callee_saved)) {
+    assert(cur->type() != T_FLOAT && cur->type() != T_DOUBLE, "cpu regs only");
+    _first_reg = pd_first_callee_saved_reg;
+    _last_reg = pd_last_callee_saved_reg;
+    return true;
+  } else if (cur->type() == T_INT || cur->type() == T_LONG || cur->type() == T_OBJECT ||
+             cur->type() == T_ADDRESS || cur->type() == T_METADATA) {
+    _first_reg = pd_first_cpu_reg;
+    _last_reg = pd_last_allocatable_cpu_reg;
+    return true;
+  }
+  return false;
+}
+
+#endif // CPU_RISCV_C1_LINEARSCAN_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
new file mode 100644
index 00000000000..6f656c8c533
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
@@ -0,0 +1,432 @@
+/*
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "c1/c1_LIR.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "c1/c1_Runtime1.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "interpreter/interpreter.hpp"
+#include "oops/arrayOop.hpp"
+#include "oops/markWord.hpp"
+#include "runtime/basicLock.hpp"
+#include "runtime/os.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+
+void C1_MacroAssembler::float_cmp(bool is_float, int unordered_result,
+                                  FloatRegister freg0, FloatRegister freg1,
+                                  Register result)
+{
+  if (is_float) {
+    float_compare(result, freg0, freg1, unordered_result);
+  } else {
+    double_compare(result, freg0, freg1, unordered_result);
+  }
+}
+
+int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {
+  const int aligned_mask = BytesPerWord - 1;
+  const int hdr_offset = oopDesc::mark_offset_in_bytes();
+  assert(hdr != obj && hdr != disp_hdr && obj != disp_hdr, "registers must be different");
+  Label done;
+  int null_check_offset = -1;
+
+  verify_oop(obj);
+
+  // save object being locked into the BasicObjectLock
+  sd(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
+
+  null_check_offset = offset();
+
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    load_klass(hdr, obj);
+    lwu(hdr, Address(hdr, Klass::access_flags_offset()));
+    andi(t0, hdr, JVM_ACC_IS_VALUE_BASED_CLASS);
+    bnez(t0, slow_case, true /* is_far */);
+  }
+
+  // Load object header
+  ld(hdr, Address(obj, hdr_offset));
+  // and mark it as unlocked
+  ori(hdr, hdr, markWord::unlocked_value);
+  // save unlocked object header into the displaced header location on the stack
+  sd(hdr, Address(disp_hdr, 0));
+  // test if object header is still the same (i.e. unlocked), and if so, store the
+  // displaced header address in the object header - if it is not the same, get the
+  // object header instead
+  la(t1, Address(obj, hdr_offset));
+  cmpxchgptr(hdr, disp_hdr, t1, t0, done, /*fallthough*/NULL);
+  // if the object header was the same, we're done
+  // if the object header was not the same, it is now in the hdr register
+  // => test if it is a stack pointer into the same stack (recursive locking), i.e.:
+  //
+  // 1) (hdr & aligned_mask) == 0
+  // 2) sp <= hdr
+  // 3) hdr <= sp + page_size
+  //
+  // these 3 tests can be done by evaluating the following expression:
+  //
+  // (hdr -sp) & (aligned_mask - page_size)
+  //
+  // assuming both the stack pointer and page_size have their least
+  // significant 2 bits cleared and page_size is a power of 2
+  sub(hdr, hdr, sp);
+  li(t0, aligned_mask - os::vm_page_size());
+  andr(hdr, hdr, t0);
+  // for recursive locking, the result is zero => save it in the displaced header
+  // location (NULL in the displaced hdr location indicates recursive locking)
+  sd(hdr, Address(disp_hdr, 0));
+  // otherwise we don't care about the result and handle locking via runtime call
+  bnez(hdr, slow_case, /* is_far */ true);
+  bind(done);
+  return null_check_offset;
+}
+
+void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {
+  const int aligned_mask = BytesPerWord - 1;
+  const int hdr_offset = oopDesc::mark_offset_in_bytes();
+  assert(hdr != obj && hdr != disp_hdr && obj != disp_hdr, "registers must be different");
+  Label done;
+
+  // load displaced header
+  ld(hdr, Address(disp_hdr, 0));
+  // if the loaded hdr is NULL we had recursive locking
+  // if we had recursive locking, we are done
+  beqz(hdr, done);
+  // load object
+  ld(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
+  verify_oop(obj);
+  // test if object header is pointing to the displaced header, and if so, restore
+  // the displaced header in the object - if the object header is not pointing to
+  // the displaced header, get the object header instead
+  // if the object header was not pointing to the displaced header,
+  // we do unlocking via runtime call
+  if (hdr_offset) {
+    la(t0, Address(obj, hdr_offset));
+    cmpxchgptr(disp_hdr, hdr, t0, t1, done, &slow_case);
+  } else {
+    cmpxchgptr(disp_hdr, hdr, obj, t1, done, &slow_case);
+  }
+  bind(done);
+}
+
+// Defines obj, preserves var_size_in_bytes
+void C1_MacroAssembler::try_allocate(Register obj, Register var_size_in_bytes, int con_size_in_bytes, Register tmp1, Register tmp2, Label& slow_case) {
+  if (UseTLAB) {
+    tlab_allocate(obj, var_size_in_bytes, con_size_in_bytes, tmp1, tmp2, slow_case, /* is_far */ true);
+  } else {
+    eden_allocate(obj, var_size_in_bytes, con_size_in_bytes, tmp1, slow_case, /* is_far */ true);
+  }
+}
+
+void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register tmp1, Register tmp2) {
+  assert_different_registers(obj, klass, len);
+  // This assumes that all prototype bits fitr in an int32_t
+  mv(tmp1, (int32_t)(intptr_t)markWord::prototype().value());
+  sd(tmp1, Address(obj, oopDesc::mark_offset_in_bytes()));
+
+  if (UseCompressedClassPointers) { // Take care not to kill klass
+    encode_klass_not_null(tmp1, klass);
+    sw(tmp1, Address(obj, oopDesc::klass_offset_in_bytes()));
+  } else {
+    sd(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
+  }
+
+  if (len->is_valid()) {
+    sw(len, Address(obj, arrayOopDesc::length_offset_in_bytes()));
+  } else if (UseCompressedClassPointers) {
+    store_klass_gap(obj, zr);
+  }
+}
+
+// preserves obj, destroys len_in_bytes
+void C1_MacroAssembler::initialize_body(Register obj, Register len_in_bytes, int hdr_size_in_bytes, Register tmp) {
+  assert(hdr_size_in_bytes >= 0, "header size must be positive or 0");
+  Label done;
+
+  // len_in_bytes is positive and ptr sized
+  sub(len_in_bytes, len_in_bytes, hdr_size_in_bytes);
+  beqz(len_in_bytes, done);
+
+  // Preserve obj
+  if (hdr_size_in_bytes) {
+    add(obj, obj, hdr_size_in_bytes);
+  }
+  zero_memory(obj, len_in_bytes, tmp);
+  if (hdr_size_in_bytes) {
+    sub(obj, obj, hdr_size_in_bytes);
+  }
+
+  bind(done);
+}
+
+void C1_MacroAssembler::allocate_object(Register obj, Register tmp1, Register tmp2, int header_size, int object_size, Register klass, Label& slow_case) {
+  assert_different_registers(obj, tmp1, tmp2);
+  assert(header_size >= 0 && object_size >= header_size, "illegal sizes");
+
+  try_allocate(obj, noreg, object_size * BytesPerWord, tmp1, tmp2, slow_case);
+
+  initialize_object(obj, klass, noreg, object_size * HeapWordSize, tmp1, tmp2, UseTLAB);
+}
+
+void C1_MacroAssembler::initialize_object(Register obj, Register klass, Register var_size_in_bytes, int con_size_in_bytes, Register tmp1, Register tmp2, bool is_tlab_allocated) {
+  assert((con_size_in_bytes & MinObjAlignmentInBytesMask) == 0,
+         "con_size_in_bytes is not multiple of alignment");
+  const int hdr_size_in_bytes = instanceOopDesc::header_size() * HeapWordSize;
+
+  initialize_header(obj, klass, noreg, tmp1, tmp2);
+
+  if (!(UseTLAB && ZeroTLAB && is_tlab_allocated)) {
+    // clear rest of allocated space
+    const Register index = tmp2;
+    // 16: multipler for threshold
+    const int threshold = 16 * BytesPerWord;    // approximate break even point for code size (see comments below)
+    if (var_size_in_bytes != noreg) {
+      mv(index, var_size_in_bytes);
+      initialize_body(obj, index, hdr_size_in_bytes, tmp1);
+    } else if (con_size_in_bytes <= threshold) {
+      // use explicit null stores
+      int i = hdr_size_in_bytes;
+      if (i < con_size_in_bytes && (con_size_in_bytes % (2 * BytesPerWord))) { // 2: multipler for BytesPerWord
+        sd(zr, Address(obj, i));
+        i += BytesPerWord;
+      }
+      for (; i < con_size_in_bytes; i += BytesPerWord) {
+        sd(zr, Address(obj, i));
+      }
+    } else if (con_size_in_bytes > hdr_size_in_bytes) {
+      block_comment("zero memory");
+      // use loop to null out the fields
+      int words = (con_size_in_bytes - hdr_size_in_bytes) / BytesPerWord;
+      mv(index, words / 8); // 8: byte size
+
+      const int unroll = 8; // Number of sd(zr) instructions we'll unroll
+      int remainder = words % unroll;
+      la(t0, Address(obj, hdr_size_in_bytes + remainder * BytesPerWord));
+
+      Label entry_point, loop;
+      j(entry_point);
+
+      bind(loop);
+      sub(index, index, 1);
+      for (int i = -unroll; i < 0; i++) {
+        if (-i == remainder) {
+          bind(entry_point);
+        }
+        sd(zr, Address(t0, i * wordSize));
+      }
+      if (remainder == 0) {
+        bind(entry_point);
+      }
+      add(t0, t0, unroll * wordSize);
+      bnez(index, loop);
+    }
+  }
+
+  membar(MacroAssembler::StoreStore);
+
+  if (CURRENT_ENV->dtrace_alloc_probes()) {
+    assert(obj == x10, "must be");
+    far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id)));
+  }
+
+  verify_oop(obj);
+}
+
+void C1_MacroAssembler::allocate_array(Register obj, Register len, Register tmp1, Register tmp2, int header_size, int f, Register klass, Label& slow_case) {
+  assert_different_registers(obj, len, tmp1, tmp2, klass);
+
+  // determine alignment mask
+  assert(!(BytesPerWord & 1), "must be multiple of 2 for masking code to work");
+
+  // check for negative or excessive length
+  mv(t0, (int32_t)max_array_allocation_length);
+  bgeu(len, t0, slow_case, /* is_far */ true);
+
+  const Register arr_size = tmp2; // okay to be the same
+  // align object end
+  mv(arr_size, (int32_t)header_size * BytesPerWord + MinObjAlignmentInBytesMask);
+  shadd(arr_size, len, arr_size, t0, f);
+  andi(arr_size, arr_size, ~(uint)MinObjAlignmentInBytesMask);
+
+  try_allocate(obj, arr_size, 0, tmp1, tmp2, slow_case);
+
+  initialize_header(obj, klass, len, tmp1, tmp2);
+
+  // clear rest of allocated space
+  const Register len_zero = len;
+  initialize_body(obj, arr_size, header_size * BytesPerWord, len_zero);
+
+  membar(MacroAssembler::StoreStore);
+
+  if (CURRENT_ENV->dtrace_alloc_probes()) {
+    assert(obj == x10, "must be");
+    far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id)));
+  }
+
+  verify_oop(obj);
+}
+
+void C1_MacroAssembler::inline_cache_check(Register receiver, Register iCache, Label &L) {
+  verify_oop(receiver);
+  // explicit NULL check not needed since load from [klass_offset] causes a trap
+  // check against inline cache
+  assert(!MacroAssembler::needs_explicit_null_check(oopDesc::klass_offset_in_bytes()), "must add explicit null check");
+  cmp_klass(receiver, iCache, t0, L);
+}
+
+void C1_MacroAssembler::build_frame(int framesize, int bang_size_in_bytes) {
+  assert(bang_size_in_bytes >= framesize, "stack bang size incorrect");
+  // Make sure there is enough stack space for this method's activation.
+  // Note that we do this before creating a frame.
+  generate_stack_overflow_check(bang_size_in_bytes);
+  MacroAssembler::build_frame(framesize);
+
+  // Insert nmethod entry barrier into frame.
+  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  bs->nmethod_entry_barrier(this);
+}
+
+void C1_MacroAssembler::remove_frame(int framesize) {
+  MacroAssembler::remove_frame(framesize);
+}
+
+
+void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
+  // If we have to make this method not-entrant we'll overwrite its
+  // first instruction with a jump. For this action to be legal we
+  // must ensure that this first instruction is a J, JAL or NOP.
+  // Make it a NOP.
+
+  nop();
+}
+
+void C1_MacroAssembler::load_parameter(int offset_in_words, Register reg) {
+  //  fp + -2: link
+  //     + -1: return address
+  //     +  0: argument with offset 0
+  //     +  1: argument with offset 1
+  //     +  2: ...
+  ld(reg, Address(fp, offset_in_words * BytesPerWord));
+}
+
+#ifndef PRODUCT
+
+void C1_MacroAssembler::verify_stack_oop(int stack_offset) {
+  if (!VerifyOops) {
+    return;
+  }
+  verify_oop_addr(Address(sp, stack_offset), "oop");
+}
+
+void C1_MacroAssembler::verify_not_null_oop(Register r) {
+  if (!VerifyOops) return;
+  Label not_null;
+  bnez(r, not_null);
+  stop("non-null oop required");
+  bind(not_null);
+  verify_oop(r);
+}
+
+void C1_MacroAssembler::invalidate_registers(bool inv_x10, bool inv_x9, bool inv_x12, bool inv_x13, bool inv_x14, bool inv_x15) {
+#ifdef ASSERT
+  static int nn;
+  if (inv_x10) { mv(x10, 0xDEAD); }
+  if (inv_x9)  { mv(x9, 0xDEAD);  }
+  if (inv_x12) { mv(x12, nn++);   }
+  if (inv_x13) { mv(x13, 0xDEAD); }
+  if (inv_x14) { mv(x14, 0xDEAD); }
+  if (inv_x15) { mv(x15, 0xDEAD); }
+#endif // ASSERT
+}
+#endif // ifndef PRODUCT
+
+typedef void (C1_MacroAssembler::*c1_cond_branch_insn)(Register op1, Register op2, Label& label, bool is_far);
+typedef void (C1_MacroAssembler::*c1_float_cond_branch_insn)(FloatRegister op1, FloatRegister op2,
+              Label& label, bool is_far, bool is_unordered);
+
+static c1_cond_branch_insn c1_cond_branch[] =
+{
+  /* SHORT branches */
+  (c1_cond_branch_insn)&Assembler::beq,
+  (c1_cond_branch_insn)&Assembler::bne,
+  (c1_cond_branch_insn)&Assembler::blt,
+  (c1_cond_branch_insn)&Assembler::ble,
+  (c1_cond_branch_insn)&Assembler::bge,
+  (c1_cond_branch_insn)&Assembler::bgt,
+  (c1_cond_branch_insn)&Assembler::bleu, // lir_cond_belowEqual
+  (c1_cond_branch_insn)&Assembler::bgeu  // lir_cond_aboveEqual
+};
+
+static c1_float_cond_branch_insn c1_float_cond_branch[] =
+{
+  /* FLOAT branches */
+  (c1_float_cond_branch_insn)&MacroAssembler::float_beq,
+  (c1_float_cond_branch_insn)&MacroAssembler::float_bne,
+  (c1_float_cond_branch_insn)&MacroAssembler::float_blt,
+  (c1_float_cond_branch_insn)&MacroAssembler::float_ble,
+  (c1_float_cond_branch_insn)&MacroAssembler::float_bge,
+  (c1_float_cond_branch_insn)&MacroAssembler::float_bgt,
+  NULL, // lir_cond_belowEqual
+  NULL, // lir_cond_aboveEqual
+
+  /* DOUBLE branches */
+  (c1_float_cond_branch_insn)&MacroAssembler::double_beq,
+  (c1_float_cond_branch_insn)&MacroAssembler::double_bne,
+  (c1_float_cond_branch_insn)&MacroAssembler::double_blt,
+  (c1_float_cond_branch_insn)&MacroAssembler::double_ble,
+  (c1_float_cond_branch_insn)&MacroAssembler::double_bge,
+  (c1_float_cond_branch_insn)&MacroAssembler::double_bgt,
+  NULL, // lir_cond_belowEqual
+  NULL  // lir_cond_aboveEqual
+};
+
+void C1_MacroAssembler::c1_cmp_branch(int cmpFlag, Register op1, Register op2, Label& label,
+                                      BasicType type, bool is_far) {
+  if (type == T_OBJECT || type == T_ARRAY) {
+    assert(cmpFlag == lir_cond_equal || cmpFlag == lir_cond_notEqual, "Should be equal or notEqual");
+    if (cmpFlag == lir_cond_equal) {
+      beq(op1, op2, label, is_far);
+    } else {
+      bne(op1, op2, label, is_far);
+    }
+  } else {
+    assert(cmpFlag >= 0 && cmpFlag < (int)(sizeof(c1_cond_branch) / sizeof(c1_cond_branch[0])),
+           "invalid c1 conditional branch index");
+    (this->*c1_cond_branch[cmpFlag])(op1, op2, label, is_far);
+  }
+}
+
+void C1_MacroAssembler::c1_float_cmp_branch(int cmpFlag, FloatRegister op1, FloatRegister op2, Label& label,
+                                            bool is_far, bool is_unordered) {
+  assert(cmpFlag >= 0 &&
+         cmpFlag < (int)(sizeof(c1_float_cond_branch) / sizeof(c1_float_cond_branch[0])),
+         "invalid c1 float conditional branch index");
+  (this->*c1_float_cond_branch[cmpFlag])(op1, op2, label, is_far, is_unordered);
+}
diff --git a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.hpp
new file mode 100644
index 00000000000..dfd3c17d7c7
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.hpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_MACROASSEMBLER_RISCV_HPP
+#define CPU_RISCV_C1_MACROASSEMBLER_RISCV_HPP
+
+using MacroAssembler::build_frame;
+using MacroAssembler::null_check;
+
+// C1_MacroAssembler contains high-level macros for C1
+
+ private:
+  int _rsp_offset;    // track rsp changes
+  // initialization
+  void pd_init() { _rsp_offset = 0; }
+
+
+ public:
+  void try_allocate(
+    Register obj,                      // result: pointer to object after successful allocation
+    Register var_size_in_bytes,        // object size in bytes if unknown at compile time; invalid otherwise
+    int      con_size_in_bytes,        // object size in bytes if known at compile time
+    Register tmp1,                     // temp register
+    Register tmp2,                     // temp register
+    Label&   slow_case                 // continuation point if fast allocation fails
+  );
+
+  void initialize_header(Register obj, Register klass, Register len, Register tmp1, Register tmp2);
+  void initialize_body(Register obj, Register len_in_bytes, int hdr_size_in_bytes, Register tmp);
+
+  void float_cmp(bool is_float, int unordered_result,
+                 FloatRegister f0, FloatRegister f1,
+                 Register result);
+
+  // locking
+  // hdr     : must be x10, contents destroyed
+  // obj     : must point to the object to lock, contents preserved
+  // disp_hdr: must point to the displaced header location, contents preserved
+  // returns code offset at which to add null check debug information
+  int lock_object  (Register swap, Register obj, Register disp_hdr, Label& slow_case);
+
+  // unlocking
+  // hdr     : contents destroyed
+  // obj     : must point to the object to lock, contents preserved
+  // disp_hdr: must be x10 & must point to the displaced header location, contents destroyed
+  void unlock_object(Register swap, Register obj, Register lock, Label& slow_case);
+
+  void initialize_object(
+    Register obj,                      // result: pointer to object after successful allocation
+    Register klass,                    // object klass
+    Register var_size_in_bytes,        // object size in bytes if unknown at compile time; invalid otherwise
+    int      con_size_in_bytes,        // object size in bytes if   known at compile time
+    Register tmp1,                     // temp register
+    Register tmp2,                     // temp register
+    bool     is_tlab_allocated         // the object was allocated in a TLAB; relevant for the implementation of ZeroTLAB
+  );
+
+  // allocation of fixed-size objects
+  // (can also be used to allocate fixed-size arrays, by setting
+  // hdr_size correctly and storing the array length afterwards)
+  // obj        : will contain pointer to allocated object
+  // t1, t2     : temp registers - contents destroyed
+  // header_size: size of object header in words
+  // object_size: total size of object in words
+  // slow_case  : exit to slow case implementation if fast allocation fails
+  void allocate_object(Register obj, Register tmp1, Register tmp2, int header_size, int object_size, Register klass, Label& slow_case);
+
+  enum {
+    max_array_allocation_length = 0x00FFFFFF
+  };
+
+  // allocation of arrays
+  // obj        : will contain pointer to allocated object
+  // len        : array length in number of elements
+  // t          : temp register - contents destroyed
+  // header_size: size of object header in words
+  // f          : element scale factor
+  // slow_case  : exit to slow case implementation if fast allocation fails
+  void allocate_array(Register obj, Register len, Register tmp1, Register tmp2, int header_size, int f, Register klass, Label& slow_case);
+
+  int  rsp_offset() const { return _rsp_offset; }
+
+  void invalidate_registers(bool inv_r0, bool inv_r19, bool inv_r2, bool inv_r3, bool inv_r4, bool inv_r5) PRODUCT_RETURN;
+
+  // This platform only uses signal-based null checks. The Label is not needed.
+  void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
+
+  void load_parameter(int offset_in_words, Register reg);
+
+  void inline_cache_check(Register receiver, Register iCache, Label &L);
+
+  static const int c1_double_branch_mask = 1 << 3; // depend on c1_float_cond_branch
+  void c1_cmp_branch(int cmpFlag, Register op1, Register op2, Label& label, BasicType type, bool is_far);
+  void c1_float_cmp_branch(int cmpFlag, FloatRegister op1, FloatRegister op2, Label& label,
+                           bool is_far, bool is_unordered = false);
+
+#endif // CPU_RISCV_C1_MACROASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
new file mode 100644
index 00000000000..f523c9ed50a
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
@@ -0,0 +1,1172 @@
+/*
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "c1/c1_CodeStubs.hpp"
+#include "c1/c1_Defs.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "c1/c1_Runtime1.hpp"
+#include "compiler/disassembler.hpp"
+#include "compiler/oopMap.hpp"
+#include "gc/shared/cardTable.hpp"
+#include "gc/shared/cardTableBarrierSet.hpp"
+#include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
+#include "nativeInst_riscv.hpp"
+#include "oops/compiledICHolder.hpp"
+#include "oops/oop.inline.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "register_riscv.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/signature.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/vframe.hpp"
+#include "runtime/vframeArray.hpp"
+#include "utilities/powerOfTwo.hpp"
+#include "vmreg_riscv.inline.hpp"
+
+
+// Implementation of StubAssembler
+
+int StubAssembler::call_RT(Register oop_result, Register metadata_result, address entry, int args_size) {
+  // setup registers
+  assert(!(oop_result->is_valid() || metadata_result->is_valid()) || oop_result != metadata_result,
+         "registers must be different");
+  assert(oop_result != xthread && metadata_result != xthread, "registers must be different");
+  assert(args_size >= 0, "illegal args_size");
+  bool align_stack = false;
+
+  mv(c_rarg0, xthread);
+  set_num_rt_args(0); // Nothing on stack
+
+  Label retaddr;
+  set_last_Java_frame(sp, fp, retaddr, t0);
+
+  // do the call
+  int32_t off = 0;
+  la_patchable(t0, RuntimeAddress(entry), off);
+  jalr(x1, t0, off);
+  bind(retaddr);
+  int call_offset = offset();
+  // verify callee-saved register
+#ifdef ASSERT
+  push_reg(x10, sp);
+  { Label L;
+    get_thread(x10);
+    beq(xthread, x10, L);
+    stop("StubAssembler::call_RT: xthread not callee saved?");
+    bind(L);
+  }
+  pop_reg(x10, sp);
+#endif
+  reset_last_Java_frame(true);
+
+  // check for pending exceptions
+  { Label L;
+    // check for pending exceptions (java_thread is set upon return)
+    ld(t0, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+    beqz(t0, L);
+    // exception pending => remove activation and forward to exception handler
+    // make sure that the vm_results are cleared
+    if (oop_result->is_valid()) {
+      sd(zr, Address(xthread, JavaThread::vm_result_offset()));
+    }
+    if (metadata_result->is_valid()) {
+      sd(zr, Address(xthread, JavaThread::vm_result_2_offset()));
+    }
+    if (frame_size() == no_frame_size) {
+      leave();
+      far_jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+    } else if (_stub_id == Runtime1::forward_exception_id) {
+      should_not_reach_here();
+    } else {
+      far_jump(RuntimeAddress(Runtime1::entry_for(Runtime1::forward_exception_id)));
+    }
+    bind(L);
+  }
+  // get oop results if there are any and reset the values in the thread
+  if (oop_result->is_valid()) {
+    get_vm_result(oop_result, xthread);
+  }
+  if (metadata_result->is_valid()) {
+    get_vm_result_2(metadata_result, xthread);
+  }
+  return call_offset;
+}
+
+int StubAssembler::call_RT(Register oop_result, Register metadata_result, address entry, Register arg1) {
+  mv(c_rarg1, arg1);
+  return call_RT(oop_result, metadata_result, entry, 1);
+}
+
+int StubAssembler::call_RT(Register oop_result, Register metadata_result, address entry, Register arg1, Register arg2) {
+  const int arg_num = 2;
+  if (c_rarg1 == arg2) {
+    if (c_rarg2 == arg1) {
+      xorr(arg1, arg1, arg2);
+      xorr(arg2, arg1, arg2);
+      xorr(arg1, arg1, arg2);
+    } else {
+      mv(c_rarg2, arg2);
+      mv(c_rarg1, arg1);
+    }
+  } else {
+    mv(c_rarg1, arg1);
+    mv(c_rarg2, arg2);
+  }
+  return call_RT(oop_result, metadata_result, entry, arg_num);
+}
+
+int StubAssembler::call_RT(Register oop_result, Register metadata_result, address entry, Register arg1, Register arg2, Register arg3) {
+  const int arg_num = 3;
+  // if there is any conflict use the stack
+  if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
+      arg2 == c_rarg1 || arg2 == c_rarg3 ||
+      arg3 == c_rarg1 || arg3 == c_rarg2) {
+    const int arg1_sp_offset = 0;
+    const int arg2_sp_offset = 1;
+    const int arg3_sp_offset = 2;
+    addi(sp, sp, -(arg_num + 1) * wordSize);
+    sd(arg1, Address(sp, arg1_sp_offset * wordSize));
+    sd(arg2, Address(sp, arg2_sp_offset * wordSize));
+    sd(arg3, Address(sp, arg3_sp_offset * wordSize));
+
+    ld(c_rarg1, Address(sp, arg1_sp_offset * wordSize));
+    ld(c_rarg2, Address(sp, arg2_sp_offset * wordSize));
+    ld(c_rarg3, Address(sp, arg3_sp_offset * wordSize));
+    addi(sp, sp, (arg_num + 1) * wordSize);
+  } else {
+    mv(c_rarg1, arg1);
+    mv(c_rarg2, arg2);
+    mv(c_rarg3, arg3);
+  }
+  return call_RT(oop_result, metadata_result, entry, arg_num);
+}
+
+enum return_state_t {
+  does_not_return, requires_return
+};
+
+// Implementation of StubFrame
+
+class StubFrame: public StackObj {
+ private:
+  StubAssembler* _sasm;
+  bool _return_state;
+
+ public:
+  StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments, return_state_t return_state=requires_return);
+  void load_argument(int offset_in_words, Register reg);
+
+  ~StubFrame();
+};;
+
+void StubAssembler::prologue(const char* name, bool must_gc_arguments) {
+  set_info(name, must_gc_arguments);
+  enter();
+}
+
+void StubAssembler::epilogue() {
+  leave();
+  ret();
+}
+
+#define __ _sasm->
+
+StubFrame::StubFrame(StubAssembler* sasm, const char* name, bool must_gc_arguments, return_state_t return_state) {
+  _sasm = sasm;
+  _return_state = return_state;
+  __ prologue(name, must_gc_arguments);
+}
+
+// load parameters that were stored with LIR_Assembler::store_parameter
+// Note: offsets for store_parameter and load_argument must match
+void StubFrame::load_argument(int offset_in_words, Register reg) {
+  __ load_parameter(offset_in_words, reg);
+}
+
+
+StubFrame::~StubFrame() {
+  if (_return_state == requires_return) {
+    __ epilogue();
+  } else {
+    __ should_not_reach_here();
+  }
+  _sasm = NULL;
+}
+
+#undef __
+
+
+// Implementation of Runtime1
+
+#define __ sasm->
+
+const int float_regs_as_doubles_size_in_slots = pd_nof_fpu_regs_frame_map * 2;
+
+// Stack layout for saving/restoring  all the registers needed during a runtime
+// call (this includes deoptimization)
+// Note: note that users of this frame may well have arguments to some runtime
+// while these values are on the stack. These positions neglect those arguments
+// but the code in save_live_registers will take the argument count into
+// account.
+//
+
+enum reg_save_layout {
+  reg_save_frame_size = 32 /* float */ + 30 /* integer excluding x3, x4 */
+};
+
+// Save off registers which might be killed by calls into the runtime.
+// Tries to smart of about FPU registers.  In particular we separate
+// saving and describing the FPU registers for deoptimization since we
+// have to save the FPU registers twice if we describe them.  The
+// deopt blob is the only thing which needs to describe FPU registers.
+// In all other cases it should be sufficient to simply save their
+// current value.
+
+static int cpu_reg_save_offsets[FrameMap::nof_cpu_regs];
+static int fpu_reg_save_offsets[FrameMap::nof_fpu_regs];
+
+static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers) {
+  int frame_size_in_bytes = reg_save_frame_size * BytesPerWord;
+  sasm->set_frame_size(frame_size_in_bytes / BytesPerWord);
+  int frame_size_in_slots = frame_size_in_bytes / sizeof(jint);
+  OopMap* oop_map = new OopMap(frame_size_in_slots, 0);
+  assert_cond(oop_map != NULL);
+
+  // caller save registers only, see FrameMap::initialize
+  // in c1_FrameMap_riscv.cpp for detail.
+  const static Register caller_save_cpu_regs[FrameMap::max_nof_caller_save_cpu_regs] = {
+    x7, x10, x11, x12, x13, x14, x15, x16, x17, x28, x29, x30, x31
+  };
+
+  for (int i = 0; i < FrameMap::max_nof_caller_save_cpu_regs; i++) {
+    Register r = caller_save_cpu_regs[i];
+    int sp_offset = cpu_reg_save_offsets[r->encoding()];
+    oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset),
+                              r->as_VMReg());
+  }
+
+  // fpu_regs
+  if (save_fpu_registers) {
+    for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
+      FloatRegister r = as_FloatRegister(i);
+      int sp_offset = fpu_reg_save_offsets[i];
+      oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset),
+                                r->as_VMReg());
+    }
+  }
+  return oop_map;
+}
+
+static OopMap* save_live_registers(StubAssembler* sasm,
+                                   bool save_fpu_registers = true) {
+  __ block_comment("save_live_registers");
+
+  // if the number of pushed regs is odd, one slot will be reserved for alignment
+  __ push_reg(RegSet::range(x5, x31), sp);    // integer registers except ra(x1) & sp(x2) & gp(x3) & tp(x4)
+
+  if (save_fpu_registers) {
+    // float registers
+    __ addi(sp, sp, -(FrameMap::nof_fpu_regs * wordSize));
+    for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
+      __ fsd(as_FloatRegister(i), Address(sp, i * wordSize));
+    }
+  } else {
+    // we define reg_save_layout = 62 as the fixed frame size,
+    // we should also sub 32 * wordSize to sp when save_fpu_registers == false
+    __ addi(sp, sp, -32 * wordSize);
+  }
+
+  return generate_oop_map(sasm, save_fpu_registers);
+}
+
+static void restore_live_registers(StubAssembler* sasm, bool restore_fpu_registers = true) {
+  if (restore_fpu_registers) {
+    for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
+      __ fld(as_FloatRegister(i), Address(sp, i * wordSize));
+    }
+    __ addi(sp, sp, FrameMap::nof_fpu_regs * wordSize);
+  } else {
+    // we define reg_save_layout = 64 as the fixed frame size,
+    // we should also add 32 * wordSize to sp when save_fpu_registers == false
+    __ addi(sp, sp, 32 * wordSize);
+  }
+
+  // if the number of popped regs is odd, the reserved slot for alignment will be removed
+  __ pop_reg(RegSet::range(x5, x31), sp);   // integer registers except ra(x1) & sp(x2) & gp(x3) & tp(x4)
+}
+
+static void restore_live_registers_except_r10(StubAssembler* sasm, bool restore_fpu_registers = true) {
+  if (restore_fpu_registers) {
+    for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
+      __ fld(as_FloatRegister(i), Address(sp, i * wordSize));
+    }
+    __ addi(sp, sp, FrameMap::nof_fpu_regs * wordSize);
+  } else {
+    // we define reg_save_layout = 64 as the fixed frame size,
+    // we should also add 32 * wordSize to sp when save_fpu_registers == false
+    __ addi(sp, sp, 32 * wordSize);
+  }
+
+  // pop integer registers except ra(x1) & sp(x2) & gp(x3) & tp(x4) & x10
+  // there is one reserved slot for alignment on the stack in save_live_registers().
+  __ pop_reg(RegSet::range(x5, x9), sp);   // pop x5 ~ x9 with the reserved slot for alignment
+  __ pop_reg(RegSet::range(x11, x31), sp); // pop x11 ~ x31; x10 will be automatically skipped here
+}
+
+void Runtime1::initialize_pd() {
+  int i = 0;
+  int sp_offset = 0;
+  const int step = 2; // SP offsets are in halfwords
+
+  // all float registers are saved explicitly
+  for (i = 0; i < FrameMap::nof_fpu_regs; i++) {
+    fpu_reg_save_offsets[i] = sp_offset;
+    sp_offset += step;
+  }
+
+  // a slot reserved for stack 16-byte alignment, see MacroAssembler::push_reg
+  sp_offset += step;
+  // we save x5 ~ x31, except x0 ~ x4: loop starts from x5
+  for (i = 5; i < FrameMap::nof_cpu_regs; i++) {
+    cpu_reg_save_offsets[i] = sp_offset;
+    sp_offset += step;
+  }
+}
+
+// target: the entry point of the method that creates and posts the exception oop
+// has_argument: true if the exception needs arguments (passed in t0 and t1)
+
+OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address target, bool has_argument) {
+  // make a frame and preserve the caller's caller-save registers
+  OopMap* oop_map = save_live_registers(sasm);
+  assert_cond(oop_map != NULL);
+  int call_offset = 0;
+  if (!has_argument) {
+    call_offset = __ call_RT(noreg, noreg, target);
+  } else {
+    __ mv(c_rarg1, t0);
+    __ mv(c_rarg2, t1);
+    call_offset = __ call_RT(noreg, noreg, target);
+  }
+  OopMapSet* oop_maps = new OopMapSet();
+  assert_cond(oop_maps != NULL);
+  oop_maps->add_gc_map(call_offset, oop_map);
+
+  return oop_maps;
+}
+
+OopMapSet* Runtime1::generate_handle_exception(StubID id, StubAssembler *sasm) {
+  __ block_comment("generate_handle_exception");
+
+  // incoming parameters
+  const Register exception_oop = x10;
+  const Register exception_pc  = x13;
+
+  OopMapSet* oop_maps = new OopMapSet();
+  assert_cond(oop_maps != NULL);
+  OopMap* oop_map = NULL;
+
+  switch (id) {
+    case forward_exception_id:
+      // We're handling an exception in the context of a compiled frame.
+      // The registers have been saved in the standard places.  Perform
+      // an exception lookup in the caller and dispatch to the handler
+      // if found.  Otherwise unwind and dispatch to the callers
+      // exception handler.
+      oop_map = generate_oop_map(sasm, 1 /* thread */);
+
+      // load and clear pending exception oop into x10
+      __ ld(exception_oop, Address(xthread, Thread::pending_exception_offset()));
+      __ sd(zr, Address(xthread, Thread::pending_exception_offset()));
+
+      // load issuing PC (the return address for this stub) into x13
+      __ ld(exception_pc, Address(fp, frame::return_addr_offset * BytesPerWord));
+
+      // make sure that the vm_results are cleared (may be unnecessary)
+      __ sd(zr, Address(xthread, JavaThread::vm_result_offset()));
+      __ sd(zr, Address(xthread, JavaThread::vm_result_2_offset()));
+      break;
+    case handle_exception_nofpu_id:
+    case handle_exception_id:
+      // At this point all registers MAY be live.
+      oop_map = save_live_registers(sasm, id != handle_exception_nofpu_id);
+      break;
+    case handle_exception_from_callee_id: {
+      // At this point all registers except exception oop (x10) and
+      // exception pc (ra) are dead.
+      const int frame_size = 2 /* fp, return address */;
+      oop_map = new OopMap(frame_size * VMRegImpl::slots_per_word, 0);
+      sasm->set_frame_size(frame_size);
+      break;
+    }
+    default: ShouldNotReachHere();
+  }
+
+  // verify that only x10 and x13 are valid at this time
+  __ invalidate_registers(false, true, true, false, true, true);
+  // verify that x10 contains a valid exception
+  __ verify_not_null_oop(exception_oop);
+
+#ifdef ASSERT
+  // check that fields in JavaThread for exception oop and issuing pc are
+  // empty before writing to them
+  Label oop_empty;
+  __ ld(t0, Address(xthread, JavaThread::exception_oop_offset()));
+  __ beqz(t0, oop_empty);
+  __ stop("exception oop already set");
+  __ bind(oop_empty);
+
+  Label pc_empty;
+  __ ld(t0, Address(xthread, JavaThread::exception_pc_offset()));
+  __ beqz(t0, pc_empty);
+  __ stop("exception pc already set");
+  __ bind(pc_empty);
+#endif
+
+  // save exception oop and issuing pc into JavaThread
+  // (exception handler will load it from here)
+  __ sd(exception_oop, Address(xthread, JavaThread::exception_oop_offset()));
+  __ sd(exception_pc, Address(xthread, JavaThread::exception_pc_offset()));
+
+  // patch throwing pc into return address (has bci & oop map)
+  __ sd(exception_pc, Address(fp, frame::return_addr_offset * BytesPerWord));
+
+  // compute the exception handler.
+  // the exception oop and the throwing pc are read from the fields in JavaThread
+  int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, exception_handler_for_pc));
+  guarantee(oop_map != NULL, "NULL oop_map!");
+  oop_maps->add_gc_map(call_offset, oop_map);
+
+  // x10: handler address
+  //      will be the deopt blob if nmethod was deoptimized while we looked up
+  //      handler regardless of whether handler existed in the nmethod.
+
+  // only x10 is valid at this time, all other registers have been destroyed by the runtime call
+  __ invalidate_registers(false, true, true, true, true, true);
+
+  // patch the return address, this stub will directly return to the exception handler
+  __ sd(x10, Address(fp, frame::return_addr_offset * BytesPerWord));
+
+  switch (id) {
+    case forward_exception_id:
+    case handle_exception_nofpu_id:
+    case handle_exception_id:
+      // Restore the registers that were saved at the beginning.
+      restore_live_registers(sasm, id != handle_exception_nofpu_id);
+      break;
+    case handle_exception_from_callee_id:
+      break;
+    default: ShouldNotReachHere();
+  }
+
+  return oop_maps;
+}
+
+
+void Runtime1::generate_unwind_exception(StubAssembler *sasm) {
+  // incoming parameters
+  const Register exception_oop = x10;
+  // other registers used in this stub
+  const Register handler_addr = x11;
+
+  // verify that only x10, is valid at this time
+  __ invalidate_registers(false, true, true, true, true, true);
+
+#ifdef ASSERT
+  // check that fields in JavaThread for exception oop and issuing pc are empty
+  Label oop_empty;
+  __ ld(t0, Address(xthread, JavaThread::exception_oop_offset()));
+  __ beqz(t0, oop_empty);
+  __ stop("exception oop must be empty");
+  __ bind(oop_empty);
+
+  Label pc_empty;
+  __ ld(t0, Address(xthread, JavaThread::exception_pc_offset()));
+  __ beqz(t0, pc_empty);
+  __ stop("exception pc must be empty");
+  __ bind(pc_empty);
+#endif
+
+  // Save our return address because
+  // exception_handler_for_return_address will destroy it.  We also
+  // save exception_oop
+  __ addi(sp, sp, -2 * wordSize);
+  __ sd(exception_oop, Address(sp, wordSize));
+  __ sd(ra, Address(sp));
+
+  // search the exception handler address of the caller (using the return address)
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::exception_handler_for_return_address), xthread, ra);
+  // x10: exception handler address of the caller
+
+  // Only x10 is valid at this time; all other registers have been
+  // destroyed by the call.
+  __ invalidate_registers(false, true, true, true, false, true);
+
+  // move result of call into correct register
+  __ mv(handler_addr, x10);
+
+  // get throwing pc (= return address).
+  // ra has been destroyed by the call
+  __ ld(ra, Address(sp));
+  __ ld(exception_oop, Address(sp, wordSize));
+  __ addi(sp, sp, 2 * wordSize);
+  __ mv(x13, ra);
+
+  __ verify_not_null_oop(exception_oop);
+
+  // continue at exception handler (return address removed)
+  // note: do *not* remove arguments when unwinding the
+  //       activation since the caller assumes having
+  //       all arguments on the stack when entering the
+  //       runtime to determine the exception handler
+  //       (GC happens at call site with arguments!)
+  // x10: exception oop
+  // x13: throwing pc
+  // x11: exception handler
+  __ jr(handler_addr);
+}
+
+OopMapSet* Runtime1::generate_patching(StubAssembler* sasm, address target) {
+  // use the maximum number of runtime-arguments here because it is difficult to
+  // distinguish each RT-Call.
+  // Note: This number affects also the RT-Call in generate_handle_exception because
+  //       the oop-map is shared for all calls.
+  DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob();
+  assert(deopt_blob != NULL, "deoptimization blob must have been created");
+
+  OopMap* oop_map = save_live_registers(sasm);
+  assert_cond(oop_map != NULL);
+
+  __ mv(c_rarg0, xthread);
+  Label retaddr;
+  __ set_last_Java_frame(sp, fp, retaddr, t0);
+  // do the call
+  int32_t off = 0;
+  __ la_patchable(t0, RuntimeAddress(target), off);
+  __ jalr(x1, t0, off);
+  __ bind(retaddr);
+  OopMapSet* oop_maps = new OopMapSet();
+  assert_cond(oop_maps != NULL);
+  oop_maps->add_gc_map(__ offset(), oop_map);
+  // verify callee-saved register
+#ifdef ASSERT
+  { Label L;
+    __ get_thread(t0);
+    __ beq(xthread, t0, L);
+    __ stop("StubAssembler::call_RT: xthread not callee saved?");
+    __ bind(L);
+  }
+#endif
+  __ reset_last_Java_frame(true);
+
+#ifdef ASSERT
+  // Check that fields in JavaThread for exception oop and issuing pc are empty
+  Label oop_empty;
+  __ ld(t0, Address(xthread, Thread::pending_exception_offset()));
+  __ beqz(t0, oop_empty);
+  __ stop("exception oop must be empty");
+  __ bind(oop_empty);
+
+  Label pc_empty;
+  __ ld(t0, Address(xthread, JavaThread::exception_pc_offset()));
+  __ beqz(t0, pc_empty);
+  __ stop("exception pc must be empty");
+  __ bind(pc_empty);
+#endif
+
+  // Runtime will return true if the nmethod has been deoptimized, this is the
+  // expected scenario and anything else is an error. Note that we maintain a
+  // check on the result purely as a defensive measure.
+  Label no_deopt;
+  __ beqz(x10, no_deopt);                                // Have we deoptimized?
+
+  // Perform a re-execute. The proper return address is already on the stack,
+  // we just need to restore registers, pop all of our frames but the return
+  // address and jump to the deopt blob.
+
+  restore_live_registers(sasm);
+  __ leave();
+  __ far_jump(RuntimeAddress(deopt_blob->unpack_with_reexecution()));
+
+  __ bind(no_deopt);
+  __ stop("deopt not performed");
+
+  return oop_maps;
+}
+
+OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
+  // for better readability
+  const bool dont_gc_arguments = false;
+
+  // default value; overwritten for some optimized stubs that are called from methods that do not use the fpu
+  bool save_fpu_registers = true;
+
+  // stub code & info for the different stubs
+  OopMapSet* oop_maps = NULL;
+  switch (id) {
+    {
+    case forward_exception_id:
+      {
+        oop_maps = generate_handle_exception(id, sasm);
+        __ leave();
+        __ ret();
+      }
+      break;
+
+    case throw_div0_exception_id:
+      {
+        StubFrame f(sasm, "throw_div0_exception", dont_gc_arguments, does_not_return);
+        oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_div0_exception), false);
+      }
+      break;
+
+    case throw_null_pointer_exception_id:
+      { StubFrame f(sasm, "throw_null_pointer_exception", dont_gc_arguments, does_not_return);
+        oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_null_pointer_exception), false);
+      }
+      break;
+
+    case new_instance_id:
+    case fast_new_instance_id:
+    case fast_new_instance_init_check_id:
+      {
+        Register klass = x13; // Incoming
+        Register obj   = x10; // Result
+
+        if (id == new_instance_id) {
+          __ set_info("new_instance", dont_gc_arguments);
+        } else if (id == fast_new_instance_id) {
+          __ set_info("fast new_instance", dont_gc_arguments);
+        } else {
+          assert(id == fast_new_instance_init_check_id, "bad StubID");
+          __ set_info("fast new_instance init check", dont_gc_arguments);
+        }
+
+        // If TLAB is disabled, see if there is support for inlining contiguous
+        // allocations.
+        // Otherwise, just go to the slow path.
+        if ((id == fast_new_instance_id || id == fast_new_instance_init_check_id) &&
+            !UseTLAB && Universe::heap()->supports_inline_contig_alloc()) {
+          Label slow_path;
+          Register obj_size   = x12;
+          Register tmp1       = x9;
+          Register tmp2       = x14;
+          assert_different_registers(klass, obj, obj_size, tmp1, tmp2);
+
+          const int sp_offset = 2;
+          const int x9_offset = 1;
+          const int zr_offset = 0;
+          __ addi(sp, sp, -(sp_offset * wordSize));
+          __ sd(x9, Address(sp, x9_offset * wordSize));
+          __ sd(zr, Address(sp, zr_offset * wordSize));
+
+          if (id == fast_new_instance_init_check_id) {
+            // make sure the klass is initialized
+            __ lbu(t0, Address(klass, InstanceKlass::init_state_offset()));
+            __ mv(t1, InstanceKlass::fully_initialized);
+            __ bne(t0, t1, slow_path);
+          }
+
+#ifdef ASSERT
+          // assert object can be fast path allocated
+          {
+            Label ok, not_ok;
+            __ lw(obj_size, Address(klass, Klass::layout_helper_offset()));
+            // make sure it's an instance. For instances, layout helper is a positive number.
+            // For arrays, layout helper is a negative number
+            __ blez(obj_size, not_ok);
+            __ andi(t0, obj_size, Klass::_lh_instance_slow_path_bit);
+            __ beqz(t0, ok);
+            __ bind(not_ok);
+            __ stop("assert(can be fast path allocated)");
+            __ should_not_reach_here();
+            __ bind(ok);
+          }
+#endif // ASSERT
+
+          // get the instance size
+          __ lwu(obj_size, Address(klass, Klass::layout_helper_offset()));
+
+          __ eden_allocate(obj, obj_size, 0, tmp1, slow_path);
+
+          __ initialize_object(obj, klass, obj_size, 0, tmp1, tmp2, /* is_tlab_allocated */ false);
+          __ verify_oop(obj);
+          __ ld(x9, Address(sp, x9_offset * wordSize));
+          __ ld(zr, Address(sp, zr_offset * wordSize));
+          __ addi(sp, sp, sp_offset * wordSize);
+          __ ret();
+
+          __ bind(slow_path);
+          __ ld(x9, Address(sp, x9_offset * wordSize));
+          __ ld(zr, Address(sp, zr_offset * wordSize));
+          __ addi(sp, sp, sp_offset * wordSize);
+        }
+
+        __ enter();
+        OopMap* map = save_live_registers(sasm);
+        assert_cond(map != NULL);
+        int call_offset = __ call_RT(obj, noreg, CAST_FROM_FN_PTR(address, new_instance), klass);
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, map);
+        restore_live_registers_except_r10(sasm);
+        __ verify_oop(obj);
+        __ leave();
+        __ ret();
+
+        // x10: new instance
+      }
+
+      break;
+
+    case counter_overflow_id:
+      {
+        Register bci = x10;
+        Register method = x11;
+        __ enter();
+        OopMap* map = save_live_registers(sasm);
+        assert_cond(map != NULL);
+
+        const int bci_off = 0;
+        const int method_off = 1;
+        // Retrieve bci
+        __ lw(bci, Address(fp, bci_off * BytesPerWord));
+        // And a pointer to the Method*
+        __ ld(method, Address(fp, method_off * BytesPerWord));
+        int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, counter_overflow), bci, method);
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, map);
+        restore_live_registers(sasm);
+        __ leave();
+        __ ret();
+      }
+      break;
+
+    case new_type_array_id:
+    case new_object_array_id:
+      {
+        Register length   = x9;  // Incoming
+        Register klass    = x13; // Incoming
+        Register obj      = x10; // Result
+
+        if (id == new_type_array_id) {
+          __ set_info("new_type_array", dont_gc_arguments);
+        } else {
+          __ set_info("new_object_array", dont_gc_arguments);
+        }
+
+#ifdef ASSERT
+        // assert object type is really an array of the proper kind
+        {
+          Label ok;
+          Register tmp = obj;
+          __ lwu(tmp, Address(klass, Klass::layout_helper_offset()));
+          __ sraiw(tmp, tmp, Klass::_lh_array_tag_shift);
+          int tag = ((id == new_type_array_id) ? Klass::_lh_array_tag_type_value : Klass::_lh_array_tag_obj_value);
+          __ mv(t0, tag);
+          __ beq(t0, tmp, ok);
+          __ stop("assert(is an array klass)");
+          __ should_not_reach_here();
+          __ bind(ok);
+        }
+#endif // ASSERT
+
+        // If TLAB is disabled, see if there is support for inlining contiguous
+        // allocations.
+        // Otherwise, just go to the slow path.
+        if (!UseTLAB && Universe::heap()->supports_inline_contig_alloc()) {
+          Register arr_size   = x14;
+          Register tmp1       = x12;
+          Register tmp2       = x15;
+          Label slow_path;
+          assert_different_registers(length, klass, obj, arr_size, tmp1, tmp2);
+
+          // check that array length is small enough for fast path.
+          __ mv(t0, C1_MacroAssembler::max_array_allocation_length);
+          __ bgtu(length, t0, slow_path);
+
+          // get the allocation size: round_up(hdr + length << (layout_helper & 0x1F))
+          __ lwu(tmp1, Address(klass, Klass::layout_helper_offset()));
+          __ andi(t0, tmp1, 0x1f);
+          __ sll(arr_size, length, t0);
+          int lh_header_size_width = exact_log2(Klass::_lh_header_size_mask + 1);
+          int lh_header_size_msb = Klass::_lh_header_size_shift + lh_header_size_width;
+          __ slli(tmp1, tmp1, XLEN - lh_header_size_msb);
+          __ srli(tmp1, tmp1, XLEN - lh_header_size_width);
+          __ add(arr_size, arr_size, tmp1);
+          __ addi(arr_size, arr_size, MinObjAlignmentInBytesMask); // align up
+          __ andi(arr_size, arr_size, ~(uint)MinObjAlignmentInBytesMask);
+
+          __ eden_allocate(obj, arr_size, 0, tmp1, slow_path); // preserves arr_size
+
+          __ initialize_header(obj, klass, length, tmp1, tmp2);
+          __ lbu(tmp1, Address(klass,
+                               in_bytes(Klass::layout_helper_offset()) +
+                               (Klass::_lh_header_size_shift / BitsPerByte)));
+          assert(Klass::_lh_header_size_shift % BitsPerByte == 0, "bytewise");
+          assert(Klass::_lh_header_size_mask <= 0xFF, "bytewise");
+          __ andi(tmp1, tmp1, Klass::_lh_header_size_mask);
+          __ sub(arr_size, arr_size, tmp1); // body length
+          __ add(tmp1, tmp1, obj);       // body start
+          __ initialize_body(tmp1, arr_size, 0, tmp2);
+          __ membar(MacroAssembler::StoreStore);
+          __ verify_oop(obj);
+
+          __ ret();
+
+          __ bind(slow_path);
+        }
+
+        __ enter();
+        OopMap* map = save_live_registers(sasm);
+        assert_cond(map != NULL);
+        int call_offset = 0;
+        if (id == new_type_array_id) {
+          call_offset = __ call_RT(obj, noreg, CAST_FROM_FN_PTR(address, new_type_array), klass, length);
+        } else {
+          call_offset = __ call_RT(obj, noreg, CAST_FROM_FN_PTR(address, new_object_array), klass, length);
+        }
+
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, map);
+        restore_live_registers_except_r10(sasm);
+
+        __ verify_oop(obj);
+        __ leave();
+        __ ret();
+
+        // x10: new array
+      }
+      break;
+
+    case new_multi_array_id:
+      {
+        StubFrame f(sasm, "new_multi_array", dont_gc_arguments);
+        // x10: klass
+        // x9: rank
+        // x12: address of 1st dimension
+        OopMap* map = save_live_registers(sasm);
+        assert_cond(map != NULL);
+        __ mv(c_rarg1, x10);
+        __ mv(c_rarg3, x12);
+        __ mv(c_rarg2, x9);
+        int call_offset = __ call_RT(x10, noreg, CAST_FROM_FN_PTR(address, new_multi_array), x11, x12, x13);
+
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, map);
+        restore_live_registers_except_r10(sasm);
+
+        // x10: new multi array
+        __ verify_oop(x10);
+      }
+      break;
+
+    case register_finalizer_id:
+      {
+        __ set_info("register_finalizer", dont_gc_arguments);
+
+        // This is called via call_runtime so the arguments
+        // will be place in C abi locations
+        __ verify_oop(c_rarg0);
+
+        // load the klass and check the has finalizer flag
+        Label register_finalizer;
+        Register t = x15;
+        __ load_klass(t, x10);
+        __ lwu(t, Address(t, Klass::access_flags_offset()));
+        __ andi(t0, t, JVM_ACC_HAS_FINALIZER);
+        __ bnez(t0, register_finalizer);
+        __ ret();
+
+        __ bind(register_finalizer);
+        __ enter();
+        OopMap* oop_map = save_live_registers(sasm);
+        assert_cond(oop_map != NULL);
+        int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, SharedRuntime::register_finalizer), x10);
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, oop_map);
+
+        // Now restore all the live registers
+        restore_live_registers(sasm);
+
+        __ leave();
+        __ ret();
+      }
+      break;
+
+    case throw_class_cast_exception_id:
+      {
+        StubFrame f(sasm, "throw_class_cast_exception", dont_gc_arguments, does_not_return);
+        oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_class_cast_exception), true);
+      }
+      break;
+
+    case throw_incompatible_class_change_error_id:
+      {
+        StubFrame f(sasm, "throw_incompatible_class_cast_exception", dont_gc_arguments, does_not_return);
+        oop_maps = generate_exception_throw(sasm,
+                                            CAST_FROM_FN_PTR(address, throw_incompatible_class_change_error), false);
+      }
+      break;
+
+    case slow_subtype_check_id:
+      {
+        // Typical calling sequence:
+        // push klass_RInfo (object klass or other subclass)
+        // push sup_k_RInfo (array element klass or other superclass)
+        // jump to slow_subtype_check
+        // Note that the subclass is pushed first, and is therefore deepest.
+        enum layout {
+          x10_off, x10_off_hi,
+          x12_off, x12_off_hi,
+          x14_off, x14_off_hi,
+          x15_off, x15_off_hi,
+          sup_k_off, sup_k_off_hi,
+          klass_off, klass_off_hi,
+          framesize,
+          result_off = sup_k_off
+        };
+
+        __ set_info("slow_subtype_check", dont_gc_arguments);
+        __ push_reg(RegSet::of(x10, x12, x14, x15), sp);
+
+        __ ld(x14, Address(sp, (klass_off) * VMRegImpl::stack_slot_size)); // sub klass
+        __ ld(x10, Address(sp, (sup_k_off) * VMRegImpl::stack_slot_size)); // super klass
+
+        Label miss;
+        __ check_klass_subtype_slow_path(x14, x10, x12, x15, NULL, &miss);
+
+        // fallthrough on success:
+        __ li(t0, 1);
+        __ sd(t0, Address(sp, (result_off) * VMRegImpl::stack_slot_size)); // result
+        __ pop_reg(RegSet::of(x10, x12, x14, x15), sp);
+        __ ret();
+
+        __ bind(miss);
+        __ sd(zr, Address(sp, (result_off) * VMRegImpl::stack_slot_size)); // result
+        __ pop_reg(RegSet::of(x10, x12, x14, x15), sp);
+        __ ret();
+      }
+      break;
+
+    case monitorenter_nofpu_id:
+      save_fpu_registers = false;
+      // fall through
+    case monitorenter_id:
+      {
+        StubFrame f(sasm, "monitorenter", dont_gc_arguments);
+        OopMap* map = save_live_registers(sasm, save_fpu_registers);
+        assert_cond(map != NULL);
+
+        // Called with store_parameter and not C abi
+        f.load_argument(1, x10); // x10: object
+        f.load_argument(0, x11); // x11: lock address
+
+        int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, monitorenter), x10, x11);
+
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, map);
+        restore_live_registers(sasm, save_fpu_registers);
+      }
+      break;
+
+    case monitorexit_nofpu_id:
+      save_fpu_registers = false;
+      // fall through
+    case monitorexit_id:
+      {
+        StubFrame f(sasm, "monitorexit", dont_gc_arguments);
+        OopMap* map = save_live_registers(sasm, save_fpu_registers);
+        assert_cond(map != NULL);
+
+        // Called with store_parameter and not C abi
+        f.load_argument(0, x10); // x10: lock address
+
+        // note: really a leaf routine but must setup last java sp
+        //       => use call_RT for now (speed can be improved by
+        //       doing last java sp setup manually)
+        int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, monitorexit), x10);
+
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, map);
+        restore_live_registers(sasm, save_fpu_registers);
+      }
+      break;
+
+    case deoptimize_id:
+      {
+        StubFrame f(sasm, "deoptimize", dont_gc_arguments, does_not_return);
+        OopMap* oop_map = save_live_registers(sasm);
+        assert_cond(oop_map != NULL);
+        f.load_argument(0, c_rarg1);
+        int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, deoptimize), c_rarg1);
+
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, oop_map);
+        restore_live_registers(sasm);
+        DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob();
+        assert(deopt_blob != NULL, "deoptimization blob must have been created");
+        __ leave();
+        __ far_jump(RuntimeAddress(deopt_blob->unpack_with_reexecution()));
+      }
+      break;
+
+    case throw_range_check_failed_id:
+      {
+        StubFrame f(sasm, "range_check_failed", dont_gc_arguments, does_not_return);
+        oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_range_check_exception), true);
+      }
+      break;
+
+    case unwind_exception_id:
+      {
+        __ set_info("unwind_exception", dont_gc_arguments);
+        // note: no stubframe since we are about to leave the current
+        //       activation and we are calling a leaf VM function only.
+        generate_unwind_exception(sasm);
+      }
+      break;
+
+    case access_field_patching_id:
+      {
+        StubFrame f(sasm, "access_field_patching", dont_gc_arguments, does_not_return);
+        // we should set up register map
+        oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, access_field_patching));
+      }
+      break;
+
+    case load_klass_patching_id:
+      {
+        StubFrame f(sasm, "load_klass_patching", dont_gc_arguments, does_not_return);
+        // we should set up register map
+        oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_klass_patching));
+      }
+      break;
+
+    case load_mirror_patching_id:
+      {
+        StubFrame f(sasm, "load_mirror_patching", dont_gc_arguments, does_not_return);
+        // we should set up register map
+        oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_mirror_patching));
+      }
+      break;
+
+    case load_appendix_patching_id:
+      {
+        StubFrame f(sasm, "load_appendix_patching", dont_gc_arguments, does_not_return);
+        // we should set up register map
+        oop_maps = generate_patching(sasm, CAST_FROM_FN_PTR(address, move_appendix_patching));
+      }
+      break;
+
+    case handle_exception_nofpu_id:
+    case handle_exception_id:
+      {
+        StubFrame f(sasm, "handle_exception", dont_gc_arguments);
+        oop_maps = generate_handle_exception(id, sasm);
+      }
+      break;
+
+    case handle_exception_from_callee_id:
+      {
+        StubFrame f(sasm, "handle_exception_from_callee", dont_gc_arguments);
+        oop_maps = generate_handle_exception(id, sasm);
+      }
+      break;
+
+    case throw_index_exception_id:
+      {
+        StubFrame f(sasm, "index_range_check_failed", dont_gc_arguments, does_not_return);
+        oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_index_exception), true);
+      }
+      break;
+
+    case throw_array_store_exception_id:
+      {
+        StubFrame f(sasm, "throw_array_store_exception", dont_gc_arguments, does_not_return);
+        // tos + 0: link
+        //     + 1: return address
+        oop_maps = generate_exception_throw(sasm, CAST_FROM_FN_PTR(address, throw_array_store_exception), true);
+      }
+      break;
+
+    case predicate_failed_trap_id:
+      {
+        StubFrame f(sasm, "predicate_failed_trap", dont_gc_arguments, does_not_return);
+
+        OopMap* map = save_live_registers(sasm);
+        assert_cond(map != NULL);
+
+        int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, predicate_failed_trap));
+        oop_maps = new OopMapSet();
+        assert_cond(oop_maps != NULL);
+        oop_maps->add_gc_map(call_offset, map);
+        restore_live_registers(sasm);
+        __ leave();
+        DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob();
+        assert(deopt_blob != NULL, "deoptimization blob must have been created");
+
+        __ far_jump(RuntimeAddress(deopt_blob->unpack_with_reexecution()));
+      }
+      break;
+
+    case dtrace_object_alloc_id:
+      { // c_rarg0: object
+        StubFrame f(sasm, "dtrace_object_alloc", dont_gc_arguments);
+        save_live_registers(sasm);
+
+        __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), c_rarg0);
+
+        restore_live_registers(sasm);
+      }
+      break;
+
+    default:
+      {
+        StubFrame f(sasm, "unimplemented entry", dont_gc_arguments, does_not_return);
+        __ li(x10, (int) id);
+        __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), x10);
+        __ should_not_reach_here();
+      }
+      break;
+    }
+  }
+  return oop_maps;
+}
+
+#undef __
+
+const char *Runtime1::pd_name_for_address(address entry) { Unimplemented(); return 0; }
diff --git a/src/hotspot/cpu/riscv/c1_globals_riscv.hpp b/src/hotspot/cpu/riscv/c1_globals_riscv.hpp
new file mode 100644
index 00000000000..fe46f7b21c8
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c1_globals_riscv.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C1_GLOBALS_RISCV_HPP
+#define CPU_RISCV_C1_GLOBALS_RISCV_HPP
+
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+// Sets the default values for platform dependent flags used by the client compiler.
+// (see c1_globals.hpp)
+
+#ifndef COMPILER2
+define_pd_global(bool, BackgroundCompilation,        true );
+define_pd_global(bool, InlineIntrinsics,             true );
+define_pd_global(bool, PreferInterpreterNativeStubs, false);
+define_pd_global(bool, ProfileTraps,                 false);
+define_pd_global(bool, UseOnStackReplacement,        true );
+define_pd_global(bool, TieredCompilation,            false);
+define_pd_global(intx, CompileThreshold,             1500 );
+
+define_pd_global(intx, OnStackReplacePercentage,     933  );
+define_pd_global(intx, NewSizeThreadIncrease,        4*K  );
+define_pd_global(intx, InitialCodeCacheSize,         160*K);
+define_pd_global(intx, ReservedCodeCacheSize,        32*M );
+define_pd_global(intx, NonProfiledCodeHeapSize,      13*M );
+define_pd_global(intx, ProfiledCodeHeapSize,         14*M );
+define_pd_global(intx, NonNMethodCodeHeapSize,       5*M  );
+define_pd_global(bool, ProfileInterpreter,           false);
+define_pd_global(intx, CodeCacheExpansionSize,       32*K );
+define_pd_global(uintx, CodeCacheMinBlockLength,     1);
+define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
+define_pd_global(bool, NeverActAsServerClassMachine, true );
+define_pd_global(uint64_t, MaxRAM,                  1ULL*G);
+define_pd_global(bool, CICompileOSR,                 true );
+#endif // !COMPILER2
+define_pd_global(bool, UseTypeProfile,               false);
+
+define_pd_global(bool, OptimizeSinglePrecision,      true );
+define_pd_global(bool, CSEArrayLength,               false);
+define_pd_global(bool, TwoOperandLIRForm,            false);
+
+#endif // CPU_RISCV_C1_GLOBALS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
new file mode 100644
index 00000000000..27770dc17aa
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -0,0 +1,1646 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
+#include "opto/c2_MacroAssembler.hpp"
+#include "opto/intrinsicnode.hpp"
+#include "opto/subnode.hpp"
+#include "runtime/stubRoutines.hpp"
+
+#ifdef PRODUCT
+#define BLOCK_COMMENT(str) /* nothing */
+#define STOP(error) stop(error)
+#else
+#define BLOCK_COMMENT(str) block_comment(str)
+#define STOP(error) block_comment(error); stop(error)
+#endif
+
+#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
+
+// short string
+// StringUTF16.indexOfChar
+// StringLatin1.indexOfChar
+void C2_MacroAssembler::string_indexof_char_short(Register str1, Register cnt1,
+                                                  Register ch, Register result,
+                                                  bool isL)
+{
+  Register ch1 = t0;
+  Register index = t1;
+
+  BLOCK_COMMENT("string_indexof_char_short {");
+
+  Label LOOP, LOOP1, LOOP4, LOOP8;
+  Label MATCH,  MATCH1, MATCH2, MATCH3,
+        MATCH4, MATCH5, MATCH6, MATCH7, NOMATCH;
+
+  mv(result, -1);
+  mv(index, zr);
+
+  bind(LOOP);
+  addi(t0, index, 8);
+  ble(t0, cnt1, LOOP8);
+  addi(t0, index, 4);
+  ble(t0, cnt1, LOOP4);
+  j(LOOP1);
+
+  bind(LOOP8);
+  isL ? lbu(ch1, Address(str1, 0)) : lhu(ch1, Address(str1, 0));
+  beq(ch, ch1, MATCH);
+  isL ? lbu(ch1, Address(str1, 1)) : lhu(ch1, Address(str1, 2));
+  beq(ch, ch1, MATCH1);
+  isL ? lbu(ch1, Address(str1, 2)) : lhu(ch1, Address(str1, 4));
+  beq(ch, ch1, MATCH2);
+  isL ? lbu(ch1, Address(str1, 3)) : lhu(ch1, Address(str1, 6));
+  beq(ch, ch1, MATCH3);
+  isL ? lbu(ch1, Address(str1, 4)) : lhu(ch1, Address(str1, 8));
+  beq(ch, ch1, MATCH4);
+  isL ? lbu(ch1, Address(str1, 5)) : lhu(ch1, Address(str1, 10));
+  beq(ch, ch1, MATCH5);
+  isL ? lbu(ch1, Address(str1, 6)) : lhu(ch1, Address(str1, 12));
+  beq(ch, ch1, MATCH6);
+  isL ? lbu(ch1, Address(str1, 7)) : lhu(ch1, Address(str1, 14));
+  beq(ch, ch1, MATCH7);
+  addi(index, index, 8);
+  addi(str1, str1, isL ? 8 : 16);
+  blt(index, cnt1, LOOP);
+  j(NOMATCH);
+
+  bind(LOOP4);
+  isL ? lbu(ch1, Address(str1, 0)) : lhu(ch1, Address(str1, 0));
+  beq(ch, ch1, MATCH);
+  isL ? lbu(ch1, Address(str1, 1)) : lhu(ch1, Address(str1, 2));
+  beq(ch, ch1, MATCH1);
+  isL ? lbu(ch1, Address(str1, 2)) : lhu(ch1, Address(str1, 4));
+  beq(ch, ch1, MATCH2);
+  isL ? lbu(ch1, Address(str1, 3)) : lhu(ch1, Address(str1, 6));
+  beq(ch, ch1, MATCH3);
+  addi(index, index, 4);
+  addi(str1, str1, isL ? 4 : 8);
+  bge(index, cnt1, NOMATCH);
+
+  bind(LOOP1);
+  isL ? lbu(ch1, Address(str1)) : lhu(ch1, Address(str1));
+  beq(ch, ch1, MATCH);
+  addi(index, index, 1);
+  addi(str1, str1, isL ? 1 : 2);
+  blt(index, cnt1, LOOP1);
+  j(NOMATCH);
+
+  bind(MATCH1);
+  addi(index, index, 1);
+  j(MATCH);
+
+  bind(MATCH2);
+  addi(index, index, 2);
+  j(MATCH);
+
+  bind(MATCH3);
+  addi(index, index, 3);
+  j(MATCH);
+
+  bind(MATCH4);
+  addi(index, index, 4);
+  j(MATCH);
+
+  bind(MATCH5);
+  addi(index, index, 5);
+  j(MATCH);
+
+  bind(MATCH6);
+  addi(index, index, 6);
+  j(MATCH);
+
+  bind(MATCH7);
+  addi(index, index, 7);
+
+  bind(MATCH);
+  mv(result, index);
+  bind(NOMATCH);
+  BLOCK_COMMENT("} string_indexof_char_short");
+}
+
+// StringUTF16.indexOfChar
+// StringLatin1.indexOfChar
+void C2_MacroAssembler::string_indexof_char(Register str1, Register cnt1,
+                                            Register ch, Register result,
+                                            Register tmp1, Register tmp2,
+                                            Register tmp3, Register tmp4,
+                                            bool isL)
+{
+  Label CH1_LOOP, HIT, NOMATCH, DONE, DO_LONG;
+  Register ch1 = t0;
+  Register orig_cnt = t1;
+  Register mask1 = tmp3;
+  Register mask2 = tmp2;
+  Register match_mask = tmp1;
+  Register trailing_char = tmp4;
+  Register unaligned_elems = tmp4;
+
+  BLOCK_COMMENT("string_indexof_char {");
+  beqz(cnt1, NOMATCH);
+
+  addi(t0, cnt1, isL ? -32 : -16);
+  bgtz(t0, DO_LONG);
+  string_indexof_char_short(str1, cnt1, ch, result, isL);
+  j(DONE);
+
+  bind(DO_LONG);
+  mv(orig_cnt, cnt1);
+  if (AvoidUnalignedAccesses) {
+    Label ALIGNED;
+    andi(unaligned_elems, str1, 0x7);
+    beqz(unaligned_elems, ALIGNED);
+    sub(unaligned_elems, unaligned_elems, 8);
+    neg(unaligned_elems, unaligned_elems);
+    if (!isL) {
+      srli(unaligned_elems, unaligned_elems, 1);
+    }
+    // do unaligned part per element
+    string_indexof_char_short(str1, unaligned_elems, ch, result, isL);
+    bgez(result, DONE);
+    mv(orig_cnt, cnt1);
+    sub(cnt1, cnt1, unaligned_elems);
+    bind(ALIGNED);
+  }
+
+  // duplicate ch
+  if (isL) {
+    slli(ch1, ch, 8);
+    orr(ch, ch1, ch);
+  }
+  slli(ch1, ch, 16);
+  orr(ch, ch1, ch);
+  slli(ch1, ch, 32);
+  orr(ch, ch1, ch);
+
+  if (!isL) {
+    slli(cnt1, cnt1, 1);
+  }
+
+  uint64_t mask0101 = UCONST64(0x0101010101010101);
+  uint64_t mask0001 = UCONST64(0x0001000100010001);
+  mv(mask1, isL ? mask0101 : mask0001);
+  uint64_t mask7f7f = UCONST64(0x7f7f7f7f7f7f7f7f);
+  uint64_t mask7fff = UCONST64(0x7fff7fff7fff7fff);
+  mv(mask2, isL ? mask7f7f : mask7fff);
+
+  bind(CH1_LOOP);
+  ld(ch1, Address(str1));
+  addi(str1, str1, 8);
+  addi(cnt1, cnt1, -8);
+  compute_match_mask(ch1, ch, match_mask, mask1, mask2);
+  bnez(match_mask, HIT);
+  bgtz(cnt1, CH1_LOOP);
+  j(NOMATCH);
+
+  bind(HIT);
+  ctzc_bit(trailing_char, match_mask, isL, ch1, result);
+  srli(trailing_char, trailing_char, 3);
+  addi(cnt1, cnt1, 8);
+  ble(cnt1, trailing_char, NOMATCH);
+  // match case
+  if (!isL) {
+    srli(cnt1, cnt1, 1);
+    srli(trailing_char, trailing_char, 1);
+  }
+
+  sub(result, orig_cnt, cnt1);
+  add(result, result, trailing_char);
+  j(DONE);
+
+  bind(NOMATCH);
+  mv(result, -1);
+
+  bind(DONE);
+  BLOCK_COMMENT("} string_indexof_char");
+}
+
+typedef void (MacroAssembler::* load_chr_insn)(Register rd, const Address &adr, Register temp);
+
+// Search for needle in haystack and return index or -1
+// x10: result
+// x11: haystack
+// x12: haystack_len
+// x13: needle
+// x14: needle_len
+void C2_MacroAssembler::string_indexof(Register haystack, Register needle,
+                                       Register haystack_len, Register needle_len,
+                                       Register tmp1, Register tmp2,
+                                       Register tmp3, Register tmp4,
+                                       Register tmp5, Register tmp6,
+                                       Register result, int ae)
+{
+  assert(ae != StrIntrinsicNode::LU, "Invalid encoding");
+
+  Label LINEARSEARCH, LINEARSTUB, DONE, NOMATCH;
+
+  Register ch1 = t0;
+  Register ch2 = t1;
+  Register nlen_tmp = tmp1; // needle len tmp
+  Register hlen_tmp = tmp2; // haystack len tmp
+  Register result_tmp = tmp4;
+
+  bool isLL = ae == StrIntrinsicNode::LL;
+
+  bool needle_isL = ae == StrIntrinsicNode::LL || ae == StrIntrinsicNode::UL;
+  bool haystack_isL = ae == StrIntrinsicNode::LL || ae == StrIntrinsicNode::LU;
+  int needle_chr_shift = needle_isL ? 0 : 1;
+  int haystack_chr_shift = haystack_isL ? 0 : 1;
+  int needle_chr_size = needle_isL ? 1 : 2;
+  int haystack_chr_size = haystack_isL ? 1 : 2;
+  load_chr_insn needle_load_1chr = needle_isL ? (load_chr_insn)&MacroAssembler::lbu :
+                              (load_chr_insn)&MacroAssembler::lhu;
+  load_chr_insn haystack_load_1chr = haystack_isL ? (load_chr_insn)&MacroAssembler::lbu :
+                                (load_chr_insn)&MacroAssembler::lhu;
+
+  BLOCK_COMMENT("string_indexof {");
+
+  // Note, inline_string_indexOf() generates checks:
+  // if (pattern.count > src.count) return -1;
+  // if (pattern.count == 0) return 0;
+
+  // We have two strings, a source string in haystack, haystack_len and a pattern string
+  // in needle, needle_len. Find the first occurence of pattern in source or return -1.
+
+  // For larger pattern and source we use a simplified Boyer Moore algorithm.
+  // With a small pattern and source we use linear scan.
+
+  // needle_len >=8 && needle_len < 256 && needle_len < haystack_len/4, use bmh algorithm.
+  sub(result_tmp, haystack_len, needle_len);
+  // needle_len < 8, use linear scan
+  sub(t0, needle_len, 8);
+  bltz(t0, LINEARSEARCH);
+  // needle_len >= 256, use linear scan
+  sub(t0, needle_len, 256);
+  bgez(t0, LINEARSTUB);
+  // needle_len >= haystack_len/4, use linear scan
+  srli(t0, haystack_len, 2);
+  bge(needle_len, t0, LINEARSTUB);
+
+  // Boyer-Moore-Horspool introduction:
+  // The Boyer Moore alogorithm is based on the description here:-
+  //
+  // http://en.wikipedia.org/wiki/Boyer%E2%80%93Moore_string_search_algorithm
+  //
+  // This describes and algorithm with 2 shift rules. The 'Bad Character' rule
+  // and the 'Good Suffix' rule.
+  //
+  // These rules are essentially heuristics for how far we can shift the
+  // pattern along the search string.
+  //
+  // The implementation here uses the 'Bad Character' rule only because of the
+  // complexity of initialisation for the 'Good Suffix' rule.
+  //
+  // This is also known as the Boyer-Moore-Horspool algorithm:
+  //
+  // http://en.wikipedia.org/wiki/Boyer-Moore-Horspool_algorithm
+  //
+  // #define ASIZE 256
+  //
+  //    int bm(unsigned char *pattern, int m, unsigned char *src, int n) {
+  //      int i, j;
+  //      unsigned c;
+  //      unsigned char bc[ASIZE];
+  //
+  //      /* Preprocessing */
+  //      for (i = 0; i < ASIZE; ++i)
+  //        bc[i] = m;
+  //      for (i = 0; i < m - 1; ) {
+  //        c = pattern[i];
+  //        ++i;
+  //        // c < 256 for Latin1 string, so, no need for branch
+  //        #ifdef PATTERN_STRING_IS_LATIN1
+  //        bc[c] = m - i;
+  //        #else
+  //        if (c < ASIZE) bc[c] = m - i;
+  //        #endif
+  //      }
+  //
+  //      /* Searching */
+  //      j = 0;
+  //      while (j <= n - m) {
+  //        c = src[i+j];
+  //        if (pattern[m-1] == c)
+  //          int k;
+  //          for (k = m - 2; k >= 0 && pattern[k] == src[k + j]; --k);
+  //          if (k < 0) return j;
+  //          // c < 256 for Latin1 string, so, no need for branch
+  //          #ifdef SOURCE_STRING_IS_LATIN1_AND_PATTERN_STRING_IS_LATIN1
+  //          // LL case: (c< 256) always true. Remove branch
+  //          j += bc[pattern[j+m-1]];
+  //          #endif
+  //          #ifdef SOURCE_STRING_IS_UTF_AND_PATTERN_STRING_IS_UTF
+  //          // UU case: need if (c<ASIZE) check. Skip 1 character if not.
+  //          if (c < ASIZE)
+  //            j += bc[pattern[j+m-1]];
+  //          else
+  //            j += 1
+  //          #endif
+  //          #ifdef SOURCE_IS_UTF_AND_PATTERN_IS_LATIN1
+  //          // UL case: need if (c<ASIZE) check. Skip <pattern length> if not.
+  //          if (c < ASIZE)
+  //            j += bc[pattern[j+m-1]];
+  //          else
+  //            j += m
+  //          #endif
+  //      }
+  //      return -1;
+  //    }
+
+  // temp register:t0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, result
+  Label BCLOOP, BCSKIP, BMLOOPSTR2, BMLOOPSTR1, BMSKIP, BMADV, BMMATCH,
+        BMLOOPSTR1_LASTCMP, BMLOOPSTR1_CMP, BMLOOPSTR1_AFTER_LOAD, BM_INIT_LOOP;
+
+  Register haystack_end = haystack_len;
+  Register skipch = tmp2;
+
+  // pattern length is >=8, so, we can read at least 1 register for cases when
+  // UTF->Latin1 conversion is not needed(8 LL or 4UU) and half register for
+  // UL case. We'll re-read last character in inner pre-loop code to have
+  // single outer pre-loop load
+  const int firstStep = isLL ? 7 : 3;
+
+  const int ASIZE = 256;
+  const int STORE_BYTES = 8; // 8 bytes stored per instruction(sd)
+
+  sub(sp, sp, ASIZE);
+
+  // init BC offset table with default value: needle_len
+  slli(t0, needle_len, 8);
+  orr(t0, t0, needle_len); // [63...16][needle_len][needle_len]
+  slli(tmp1, t0, 16);
+  orr(t0, tmp1, t0); // [63...32][needle_len][needle_len][needle_len][needle_len]
+  slli(tmp1, t0, 32);
+  orr(tmp5, tmp1, t0); // tmp5: 8 elements [needle_len]
+
+  mv(ch1, sp);  // ch1 is t0
+  mv(tmp6, ASIZE / STORE_BYTES); // loop iterations
+
+  bind(BM_INIT_LOOP);
+  // for (i = 0; i < ASIZE; ++i)
+  //   bc[i] = m;
+  for (int i = 0; i < 4; i++) {
+    sd(tmp5, Address(ch1, i * wordSize));
+  }
+  add(ch1, ch1, 32);
+  sub(tmp6, tmp6, 4);
+  bgtz(tmp6, BM_INIT_LOOP);
+
+  sub(nlen_tmp, needle_len, 1); // m - 1, index of the last element in pattern
+  Register orig_haystack = tmp5;
+  mv(orig_haystack, haystack);
+  // result_tmp = tmp4
+  shadd(haystack_end, result_tmp, haystack, haystack_end, haystack_chr_shift);
+  sub(ch2, needle_len, 1); // bc offset init value, ch2 is t1
+  mv(tmp3, needle);
+
+  //  for (i = 0; i < m - 1; ) {
+  //    c = pattern[i];
+  //    ++i;
+  //    // c < 256 for Latin1 string, so, no need for branch
+  //    #ifdef PATTERN_STRING_IS_LATIN1
+  //    bc[c] = m - i;
+  //    #else
+  //    if (c < ASIZE) bc[c] = m - i;
+  //    #endif
+  //  }
+  bind(BCLOOP);
+  (this->*needle_load_1chr)(ch1, Address(tmp3), noreg);
+  add(tmp3, tmp3, needle_chr_size);
+  if (!needle_isL) {
+    // ae == StrIntrinsicNode::UU
+    mv(tmp6, ASIZE);
+    bgeu(ch1, tmp6, BCSKIP);
+  }
+  add(tmp4, sp, ch1);
+  sb(ch2, Address(tmp4)); // store skip offset to BC offset table
+
+  bind(BCSKIP);
+  sub(ch2, ch2, 1); // for next pattern element, skip distance -1
+  bgtz(ch2, BCLOOP);
+
+  // tmp6: pattern end, address after needle
+  shadd(tmp6, needle_len, needle, tmp6, needle_chr_shift);
+  if (needle_isL == haystack_isL) {
+    // load last 8 bytes (8LL/4UU symbols)
+    ld(tmp6, Address(tmp6, -wordSize));
+  } else {
+    // UL: from UTF-16(source) search Latin1(pattern)
+    lwu(tmp6, Address(tmp6, -wordSize / 2)); // load last 4 bytes(4 symbols)
+    // convert Latin1 to UTF. eg: 0x0000abcd -> 0x0a0b0c0d
+    // We'll have to wait until load completed, but it's still faster than per-character loads+checks
+    srli(tmp3, tmp6, BitsPerByte * (wordSize / 2 - needle_chr_size)); // pattern[m-1], eg:0x0000000a
+    slli(ch2, tmp6, XLEN - 24);
+    srli(ch2, ch2, XLEN - 8); // pattern[m-2], 0x0000000b
+    slli(ch1, tmp6, XLEN - 16);
+    srli(ch1, ch1, XLEN - 8); // pattern[m-3], 0x0000000c
+    andi(tmp6, tmp6, 0xff); // pattern[m-4], 0x0000000d
+    slli(ch2, ch2, 16);
+    orr(ch2, ch2, ch1); // 0x00000b0c
+    slli(result, tmp3, 48); // use result as temp register
+    orr(tmp6, tmp6, result); // 0x0a00000d
+    slli(result, ch2, 16);
+    orr(tmp6, tmp6, result); // UTF-16:0x0a0b0c0d
+  }
+
+  // i = m - 1;
+  // skipch = j + i;
+  // if (skipch == pattern[m - 1]
+  //   for (k = m - 2; k >= 0 && pattern[k] == src[k + j]; --k);
+  // else
+  //   move j with bad char offset table
+  bind(BMLOOPSTR2);
+  // compare pattern to source string backward
+  shadd(result, nlen_tmp, haystack, result, haystack_chr_shift);
+  (this->*haystack_load_1chr)(skipch, Address(result), noreg);
+  sub(nlen_tmp, nlen_tmp, firstStep); // nlen_tmp is positive here, because needle_len >= 8
+  if (needle_isL == haystack_isL) {
+    // re-init tmp3. It's for free because it's executed in parallel with
+    // load above. Alternative is to initialize it before loop, but it'll
+    // affect performance on in-order systems with 2 or more ld/st pipelines
+    srli(tmp3, tmp6, BitsPerByte * (wordSize - needle_chr_size)); // UU/LL: pattern[m-1]
+  }
+  if (!isLL) { // UU/UL case
+    slli(ch2, nlen_tmp, 1); // offsets in bytes
+  }
+  bne(tmp3, skipch, BMSKIP); // if not equal, skipch is bad char
+  add(result, haystack, isLL ? nlen_tmp : ch2);
+  ld(ch2, Address(result)); // load 8 bytes from source string
+  mv(ch1, tmp6);
+  if (isLL) {
+    j(BMLOOPSTR1_AFTER_LOAD);
+  } else {
+    sub(nlen_tmp, nlen_tmp, 1); // no need to branch for UU/UL case. cnt1 >= 8
+    j(BMLOOPSTR1_CMP);
+  }
+
+  bind(BMLOOPSTR1);
+  shadd(ch1, nlen_tmp, needle, ch1, needle_chr_shift);
+  (this->*needle_load_1chr)(ch1, Address(ch1), noreg);
+  shadd(ch2, nlen_tmp, haystack, ch2, haystack_chr_shift);
+  (this->*haystack_load_1chr)(ch2, Address(ch2), noreg);
+
+  bind(BMLOOPSTR1_AFTER_LOAD);
+  sub(nlen_tmp, nlen_tmp, 1);
+  bltz(nlen_tmp, BMLOOPSTR1_LASTCMP);
+
+  bind(BMLOOPSTR1_CMP);
+  beq(ch1, ch2, BMLOOPSTR1);
+
+  bind(BMSKIP);
+  if (!isLL) {
+    // if we've met UTF symbol while searching Latin1 pattern, then we can
+    // skip needle_len symbols
+    if (needle_isL != haystack_isL) {
+      mv(result_tmp, needle_len);
+    } else {
+      mv(result_tmp, 1);
+    }
+    mv(t0, ASIZE);
+    bgeu(skipch, t0, BMADV);
+  }
+  add(result_tmp, sp, skipch);
+  lbu(result_tmp, Address(result_tmp)); // load skip offset
+
+  bind(BMADV);
+  sub(nlen_tmp, needle_len, 1);
+  // move haystack after bad char skip offset
+  shadd(haystack, result_tmp, haystack, result, haystack_chr_shift);
+  ble(haystack, haystack_end, BMLOOPSTR2);
+  add(sp, sp, ASIZE);
+  j(NOMATCH);
+
+  bind(BMLOOPSTR1_LASTCMP);
+  bne(ch1, ch2, BMSKIP);
+
+  bind(BMMATCH);
+  sub(result, haystack, orig_haystack);
+  if (!haystack_isL) {
+    srli(result, result, 1);
+  }
+  add(sp, sp, ASIZE);
+  j(DONE);
+
+  bind(LINEARSTUB);
+  sub(t0, needle_len, 16); // small patterns still should be handled by simple algorithm
+  bltz(t0, LINEARSEARCH);
+  mv(result, zr);
+  RuntimeAddress stub = NULL;
+  if (isLL) {
+    stub = RuntimeAddress(StubRoutines::riscv::string_indexof_linear_ll());
+    assert(stub.target() != NULL, "string_indexof_linear_ll stub has not been generated");
+  } else if (needle_isL) {
+    stub = RuntimeAddress(StubRoutines::riscv::string_indexof_linear_ul());
+    assert(stub.target() != NULL, "string_indexof_linear_ul stub has not been generated");
+  } else {
+    stub = RuntimeAddress(StubRoutines::riscv::string_indexof_linear_uu());
+    assert(stub.target() != NULL, "string_indexof_linear_uu stub has not been generated");
+  }
+  trampoline_call(stub);
+  j(DONE);
+
+  bind(NOMATCH);
+  mv(result, -1);
+  j(DONE);
+
+  bind(LINEARSEARCH);
+  string_indexof_linearscan(haystack, needle, haystack_len, needle_len, tmp1, tmp2, tmp3, tmp4, -1, result, ae);
+
+  bind(DONE);
+  BLOCK_COMMENT("} string_indexof");
+}
+
+// string_indexof
+// result: x10
+// src: x11
+// src_count: x12
+// pattern: x13
+// pattern_count: x14 or 1/2/3/4
+void C2_MacroAssembler::string_indexof_linearscan(Register haystack, Register needle,
+                                               Register haystack_len, Register needle_len,
+                                               Register tmp1, Register tmp2,
+                                               Register tmp3, Register tmp4,
+                                               int needle_con_cnt, Register result, int ae)
+{
+  // Note:
+  // needle_con_cnt > 0 means needle_len register is invalid, needle length is constant
+  // for UU/LL: needle_con_cnt[1, 4], UL: needle_con_cnt = 1
+  assert(needle_con_cnt <= 4, "Invalid needle constant count");
+  assert(ae != StrIntrinsicNode::LU, "Invalid encoding");
+
+  Register ch1 = t0;
+  Register ch2 = t1;
+  Register hlen_neg = haystack_len, nlen_neg = needle_len;
+  Register nlen_tmp = tmp1, hlen_tmp = tmp2, result_tmp = tmp4;
+
+  bool isLL = ae == StrIntrinsicNode::LL;
+
+  bool needle_isL = ae == StrIntrinsicNode::LL || ae == StrIntrinsicNode::UL;
+  bool haystack_isL = ae == StrIntrinsicNode::LL || ae == StrIntrinsicNode::LU;
+  int needle_chr_shift = needle_isL ? 0 : 1;
+  int haystack_chr_shift = haystack_isL ? 0 : 1;
+  int needle_chr_size = needle_isL ? 1 : 2;
+  int haystack_chr_size = haystack_isL ? 1 : 2;
+
+  load_chr_insn needle_load_1chr = needle_isL ? (load_chr_insn)&MacroAssembler::lbu :
+                              (load_chr_insn)&MacroAssembler::lhu;
+  load_chr_insn haystack_load_1chr = haystack_isL ? (load_chr_insn)&MacroAssembler::lbu :
+                                (load_chr_insn)&MacroAssembler::lhu;
+  load_chr_insn load_2chr = isLL ? (load_chr_insn)&MacroAssembler::lhu : (load_chr_insn)&MacroAssembler::lwu;
+  load_chr_insn load_4chr = isLL ? (load_chr_insn)&MacroAssembler::lwu : (load_chr_insn)&MacroAssembler::ld;
+
+  Label DO1, DO2, DO3, MATCH, NOMATCH, DONE;
+
+  Register first = tmp3;
+
+  if (needle_con_cnt == -1) {
+    Label DOSHORT, FIRST_LOOP, STR2_NEXT, STR1_LOOP, STR1_NEXT;
+
+    sub(t0, needle_len, needle_isL == haystack_isL ? 4 : 2);
+    bltz(t0, DOSHORT);
+
+    (this->*needle_load_1chr)(first, Address(needle), noreg);
+    slli(t0, needle_len, needle_chr_shift);
+    add(needle, needle, t0);
+    neg(nlen_neg, t0);
+    slli(t0, result_tmp, haystack_chr_shift);
+    add(haystack, haystack, t0);
+    neg(hlen_neg, t0);
+
+    bind(FIRST_LOOP);
+    add(t0, haystack, hlen_neg);
+    (this->*haystack_load_1chr)(ch2, Address(t0), noreg);
+    beq(first, ch2, STR1_LOOP);
+
+    bind(STR2_NEXT);
+    add(hlen_neg, hlen_neg, haystack_chr_size);
+    blez(hlen_neg, FIRST_LOOP);
+    j(NOMATCH);
+
+    bind(STR1_LOOP);
+    add(nlen_tmp, nlen_neg, needle_chr_size);
+    add(hlen_tmp, hlen_neg, haystack_chr_size);
+    bgez(nlen_tmp, MATCH);
+
+    bind(STR1_NEXT);
+    add(ch1, needle, nlen_tmp);
+    (this->*needle_load_1chr)(ch1, Address(ch1), noreg);
+    add(ch2, haystack, hlen_tmp);
+    (this->*haystack_load_1chr)(ch2, Address(ch2), noreg);
+    bne(ch1, ch2, STR2_NEXT);
+    add(nlen_tmp, nlen_tmp, needle_chr_size);
+    add(hlen_tmp, hlen_tmp, haystack_chr_size);
+    bltz(nlen_tmp, STR1_NEXT);
+    j(MATCH);
+
+    bind(DOSHORT);
+    if (needle_isL == haystack_isL) {
+      sub(t0, needle_len, 2);
+      bltz(t0, DO1);
+      bgtz(t0, DO3);
+    }
+  }
+
+  if (needle_con_cnt == 4) {
+    Label CH1_LOOP;
+    (this->*load_4chr)(ch1, Address(needle), noreg);
+    sub(result_tmp, haystack_len, 4);
+    slli(tmp3, result_tmp, haystack_chr_shift); // result as tmp
+    add(haystack, haystack, tmp3);
+    neg(hlen_neg, tmp3);
+
+    bind(CH1_LOOP);
+    add(ch2, haystack, hlen_neg);
+    (this->*load_4chr)(ch2, Address(ch2), noreg);
+    beq(ch1, ch2, MATCH);
+    add(hlen_neg, hlen_neg, haystack_chr_size);
+    blez(hlen_neg, CH1_LOOP);
+    j(NOMATCH);
+  }
+
+  if ((needle_con_cnt == -1 && needle_isL == haystack_isL) || needle_con_cnt == 2) {
+    Label CH1_LOOP;
+    BLOCK_COMMENT("string_indexof DO2 {");
+    bind(DO2);
+    (this->*load_2chr)(ch1, Address(needle), noreg);
+    if (needle_con_cnt == 2) {
+      sub(result_tmp, haystack_len, 2);
+    }
+    slli(tmp3, result_tmp, haystack_chr_shift);
+    add(haystack, haystack, tmp3);
+    neg(hlen_neg, tmp3);
+
+    bind(CH1_LOOP);
+    add(tmp3, haystack, hlen_neg);
+    (this->*load_2chr)(ch2, Address(tmp3), noreg);
+    beq(ch1, ch2, MATCH);
+    add(hlen_neg, hlen_neg, haystack_chr_size);
+    blez(hlen_neg, CH1_LOOP);
+    j(NOMATCH);
+    BLOCK_COMMENT("} string_indexof DO2");
+  }
+
+  if ((needle_con_cnt == -1 && needle_isL == haystack_isL) || needle_con_cnt == 3) {
+    Label FIRST_LOOP, STR2_NEXT, STR1_LOOP;
+    BLOCK_COMMENT("string_indexof DO3 {");
+
+    bind(DO3);
+    (this->*load_2chr)(first, Address(needle), noreg);
+    (this->*needle_load_1chr)(ch1, Address(needle, 2 * needle_chr_size), noreg);
+    if (needle_con_cnt == 3) {
+      sub(result_tmp, haystack_len, 3);
+    }
+    slli(hlen_tmp, result_tmp, haystack_chr_shift);
+    add(haystack, haystack, hlen_tmp);
+    neg(hlen_neg, hlen_tmp);
+
+    bind(FIRST_LOOP);
+    add(ch2, haystack, hlen_neg);
+    (this->*load_2chr)(ch2, Address(ch2), noreg);
+    beq(first, ch2, STR1_LOOP);
+
+    bind(STR2_NEXT);
+    add(hlen_neg, hlen_neg, haystack_chr_size);
+    blez(hlen_neg, FIRST_LOOP);
+    j(NOMATCH);
+
+    bind(STR1_LOOP);
+    add(hlen_tmp, hlen_neg, 2 * haystack_chr_size);
+    add(ch2, haystack, hlen_tmp);
+    (this->*haystack_load_1chr)(ch2, Address(ch2), noreg);
+    bne(ch1, ch2, STR2_NEXT);
+    j(MATCH);
+    BLOCK_COMMENT("} string_indexof DO3");
+  }
+
+  if (needle_con_cnt == -1 || needle_con_cnt == 1) {
+    Label DO1_LOOP;
+
+    BLOCK_COMMENT("string_indexof DO1 {");
+    bind(DO1);
+    (this->*needle_load_1chr)(ch1, Address(needle), noreg);
+    sub(result_tmp, haystack_len, 1);
+    mv(tmp3, result_tmp);
+    if (haystack_chr_shift) {
+      slli(tmp3, result_tmp, haystack_chr_shift);
+    }
+    add(haystack, haystack, tmp3);
+    neg(hlen_neg, tmp3);
+
+    bind(DO1_LOOP);
+    add(tmp3, haystack, hlen_neg);
+    (this->*haystack_load_1chr)(ch2, Address(tmp3), noreg);
+    beq(ch1, ch2, MATCH);
+    add(hlen_neg, hlen_neg, haystack_chr_size);
+    blez(hlen_neg, DO1_LOOP);
+    BLOCK_COMMENT("} string_indexof DO1");
+  }
+
+  bind(NOMATCH);
+  mv(result, -1);
+  j(DONE);
+
+  bind(MATCH);
+  srai(t0, hlen_neg, haystack_chr_shift);
+  add(result, result_tmp, t0);
+
+  bind(DONE);
+}
+
+// Compare strings.
+void C2_MacroAssembler::string_compare(Register str1, Register str2,
+                                    Register cnt1, Register cnt2, Register result, Register tmp1, Register tmp2,
+                                    Register tmp3, int ae)
+{
+  Label DONE, SHORT_LOOP, SHORT_STRING, SHORT_LAST, TAIL, STUB,
+      DIFFERENCE, NEXT_WORD, SHORT_LOOP_TAIL, SHORT_LAST2, SHORT_LAST_INIT,
+      SHORT_LOOP_START, TAIL_CHECK, L;
+
+  const int STUB_THRESHOLD = 64 + 8;
+  bool isLL = ae == StrIntrinsicNode::LL;
+  bool isLU = ae == StrIntrinsicNode::LU;
+  bool isUL = ae == StrIntrinsicNode::UL;
+
+  bool str1_isL = isLL || isLU;
+  bool str2_isL = isLL || isUL;
+
+  // for L strings, 1 byte for 1 character
+  // for U strings, 2 bytes for 1 character
+  int str1_chr_size = str1_isL ? 1 : 2;
+  int str2_chr_size = str2_isL ? 1 : 2;
+  int minCharsInWord = isLL ? wordSize : wordSize / 2;
+
+  load_chr_insn str1_load_chr = str1_isL ? (load_chr_insn)&MacroAssembler::lbu : (load_chr_insn)&MacroAssembler::lhu;
+  load_chr_insn str2_load_chr = str2_isL ? (load_chr_insn)&MacroAssembler::lbu : (load_chr_insn)&MacroAssembler::lhu;
+
+  BLOCK_COMMENT("string_compare {");
+
+  // Bizzarely, the counts are passed in bytes, regardless of whether they
+  // are L or U strings, however the result is always in characters.
+  if (!str1_isL) {
+    sraiw(cnt1, cnt1, 1);
+  }
+  if (!str2_isL) {
+    sraiw(cnt2, cnt2, 1);
+  }
+
+  // Compute the minimum of the string lengths and save the difference in result.
+  sub(result, cnt1, cnt2);
+  bgt(cnt1, cnt2, L);
+  mv(cnt2, cnt1);
+  bind(L);
+
+  // A very short string
+  li(t0, minCharsInWord);
+  ble(cnt2, t0, SHORT_STRING);
+
+  // Compare longwords
+  // load first parts of strings and finish initialization while loading
+  {
+    if (str1_isL == str2_isL) { // LL or UU
+      // load 8 bytes once to compare
+      ld(tmp1, Address(str1));
+      beq(str1, str2, DONE);
+      ld(tmp2, Address(str2));
+      li(t0, STUB_THRESHOLD);
+      bge(cnt2, t0, STUB);
+      sub(cnt2, cnt2, minCharsInWord);
+      beqz(cnt2, TAIL_CHECK);
+      // convert cnt2 from characters to bytes
+      if (!str1_isL) {
+        slli(cnt2, cnt2, 1);
+      }
+      add(str2, str2, cnt2);
+      add(str1, str1, cnt2);
+      sub(cnt2, zr, cnt2);
+    } else if (isLU) { // LU case
+      lwu(tmp1, Address(str1));
+      ld(tmp2, Address(str2));
+      li(t0, STUB_THRESHOLD);
+      bge(cnt2, t0, STUB);
+      addi(cnt2, cnt2, -4);
+      add(str1, str1, cnt2);
+      sub(cnt1, zr, cnt2);
+      slli(cnt2, cnt2, 1);
+      add(str2, str2, cnt2);
+      inflate_lo32(tmp3, tmp1);
+      mv(tmp1, tmp3);
+      sub(cnt2, zr, cnt2);
+      addi(cnt1, cnt1, 4);
+    } else { // UL case
+      ld(tmp1, Address(str1));
+      lwu(tmp2, Address(str2));
+      li(t0, STUB_THRESHOLD);
+      bge(cnt2, t0, STUB);
+      addi(cnt2, cnt2, -4);
+      slli(t0, cnt2, 1);
+      sub(cnt1, zr, t0);
+      add(str1, str1, t0);
+      add(str2, str2, cnt2);
+      inflate_lo32(tmp3, tmp2);
+      mv(tmp2, tmp3);
+      sub(cnt2, zr, cnt2);
+      addi(cnt1, cnt1, 8);
+    }
+    addi(cnt2, cnt2, isUL ? 4 : 8);
+    bgez(cnt2, TAIL);
+    xorr(tmp3, tmp1, tmp2);
+    bnez(tmp3, DIFFERENCE);
+
+    // main loop
+    bind(NEXT_WORD);
+    if (str1_isL == str2_isL) { // LL or UU
+      add(t0, str1, cnt2);
+      ld(tmp1, Address(t0));
+      add(t0, str2, cnt2);
+      ld(tmp2, Address(t0));
+      addi(cnt2, cnt2, 8);
+    } else if (isLU) { // LU case
+      add(t0, str1, cnt1);
+      lwu(tmp1, Address(t0));
+      add(t0, str2, cnt2);
+      ld(tmp2, Address(t0));
+      addi(cnt1, cnt1, 4);
+      inflate_lo32(tmp3, tmp1);
+      mv(tmp1, tmp3);
+      addi(cnt2, cnt2, 8);
+    } else { // UL case
+      add(t0, str2, cnt2);
+      lwu(tmp2, Address(t0));
+      add(t0, str1, cnt1);
+      ld(tmp1, Address(t0));
+      inflate_lo32(tmp3, tmp2);
+      mv(tmp2, tmp3);
+      addi(cnt1, cnt1, 8);
+      addi(cnt2, cnt2, 4);
+    }
+    bgez(cnt2, TAIL);
+
+    xorr(tmp3, tmp1, tmp2);
+    beqz(tmp3, NEXT_WORD);
+    j(DIFFERENCE);
+    bind(TAIL);
+    xorr(tmp3, tmp1, tmp2);
+    bnez(tmp3, DIFFERENCE);
+    // Last longword.  In the case where length == 4 we compare the
+    // same longword twice, but that's still faster than another
+    // conditional branch.
+    if (str1_isL == str2_isL) { // LL or UU
+      ld(tmp1, Address(str1));
+      ld(tmp2, Address(str2));
+    } else if (isLU) { // LU case
+      lwu(tmp1, Address(str1));
+      ld(tmp2, Address(str2));
+      inflate_lo32(tmp3, tmp1);
+      mv(tmp1, tmp3);
+    } else { // UL case
+      lwu(tmp2, Address(str2));
+      ld(tmp1, Address(str1));
+      inflate_lo32(tmp3, tmp2);
+      mv(tmp2, tmp3);
+    }
+    bind(TAIL_CHECK);
+    xorr(tmp3, tmp1, tmp2);
+    beqz(tmp3, DONE);
+
+    // Find the first different characters in the longwords and
+    // compute their difference.
+    bind(DIFFERENCE);
+    ctzc_bit(result, tmp3, isLL); // count zero from lsb to msb
+    srl(tmp1, tmp1, result);
+    srl(tmp2, tmp2, result);
+    if (isLL) {
+      andi(tmp1, tmp1, 0xFF);
+      andi(tmp2, tmp2, 0xFF);
+    } else {
+      andi(tmp1, tmp1, 0xFFFF);
+      andi(tmp2, tmp2, 0xFFFF);
+    }
+    sub(result, tmp1, tmp2);
+    j(DONE);
+  }
+
+  bind(STUB);
+  RuntimeAddress stub = NULL;
+  switch (ae) {
+    case StrIntrinsicNode::LL:
+      stub = RuntimeAddress(StubRoutines::riscv::compare_long_string_LL());
+      break;
+    case StrIntrinsicNode::UU:
+      stub = RuntimeAddress(StubRoutines::riscv::compare_long_string_UU());
+      break;
+    case StrIntrinsicNode::LU:
+      stub = RuntimeAddress(StubRoutines::riscv::compare_long_string_LU());
+      break;
+    case StrIntrinsicNode::UL:
+      stub = RuntimeAddress(StubRoutines::riscv::compare_long_string_UL());
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+  assert(stub.target() != NULL, "compare_long_string stub has not been generated");
+  trampoline_call(stub);
+  j(DONE);
+
+  bind(SHORT_STRING);
+  // Is the minimum length zero?
+  beqz(cnt2, DONE);
+  // arrange code to do most branches while loading and loading next characters
+  // while comparing previous
+  (this->*str1_load_chr)(tmp1, Address(str1), t0);
+  addi(str1, str1, str1_chr_size);
+  addi(cnt2, cnt2, -1);
+  beqz(cnt2, SHORT_LAST_INIT);
+  (this->*str2_load_chr)(cnt1, Address(str2), t0);
+  addi(str2, str2, str2_chr_size);
+  j(SHORT_LOOP_START);
+  bind(SHORT_LOOP);
+  addi(cnt2, cnt2, -1);
+  beqz(cnt2, SHORT_LAST);
+  bind(SHORT_LOOP_START);
+  (this->*str1_load_chr)(tmp2, Address(str1), t0);
+  addi(str1, str1, str1_chr_size);
+  (this->*str2_load_chr)(t0, Address(str2), t0);
+  addi(str2, str2, str2_chr_size);
+  bne(tmp1, cnt1, SHORT_LOOP_TAIL);
+  addi(cnt2, cnt2, -1);
+  beqz(cnt2, SHORT_LAST2);
+  (this->*str1_load_chr)(tmp1, Address(str1), t0);
+  addi(str1, str1, str1_chr_size);
+  (this->*str2_load_chr)(cnt1, Address(str2), t0);
+  addi(str2, str2, str2_chr_size);
+  beq(tmp2, t0, SHORT_LOOP);
+  sub(result, tmp2, t0);
+  j(DONE);
+  bind(SHORT_LOOP_TAIL);
+  sub(result, tmp1, cnt1);
+  j(DONE);
+  bind(SHORT_LAST2);
+  beq(tmp2, t0, DONE);
+  sub(result, tmp2, t0);
+
+  j(DONE);
+  bind(SHORT_LAST_INIT);
+  (this->*str2_load_chr)(cnt1, Address(str2), t0);
+  addi(str2, str2, str2_chr_size);
+  bind(SHORT_LAST);
+  beq(tmp1, cnt1, DONE);
+  sub(result, tmp1, cnt1);
+
+  bind(DONE);
+
+  BLOCK_COMMENT("} string_compare");
+}
+
+void C2_MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
+                                      Register tmp4, Register tmp5, Register tmp6, Register result,
+                                      Register cnt1, int elem_size) {
+  Label DONE, SAME, NEXT_DWORD, SHORT, TAIL, TAIL2, IS_TMP5_ZR;
+  Register tmp1 = t0;
+  Register tmp2 = t1;
+  Register cnt2 = tmp2;  // cnt2 only used in array length compare
+  Register elem_per_word = tmp6;
+  int log_elem_size = exact_log2(elem_size);
+  int length_offset = arrayOopDesc::length_offset_in_bytes();
+  int base_offset   = arrayOopDesc::base_offset_in_bytes(elem_size == 2 ? T_CHAR : T_BYTE);
+
+  assert(elem_size == 1 || elem_size == 2, "must be char or byte");
+  assert_different_registers(a1, a2, result, cnt1, t0, t1, tmp3, tmp4, tmp5, tmp6);
+  li(elem_per_word, wordSize / elem_size);
+
+  BLOCK_COMMENT("arrays_equals {");
+
+  // if (a1 == a2), return true
+  beq(a1, a2, SAME);
+
+  mv(result, false);
+  beqz(a1, DONE);
+  beqz(a2, DONE);
+  lwu(cnt1, Address(a1, length_offset));
+  lwu(cnt2, Address(a2, length_offset));
+  bne(cnt2, cnt1, DONE);
+  beqz(cnt1, SAME);
+
+  slli(tmp5, cnt1, 3 + log_elem_size);
+  sub(tmp5, zr, tmp5);
+  add(a1, a1, base_offset);
+  add(a2, a2, base_offset);
+  ld(tmp3, Address(a1, 0));
+  ld(tmp4, Address(a2, 0));
+  ble(cnt1, elem_per_word, SHORT); // short or same
+
+  // Main 16 byte comparison loop with 2 exits
+  bind(NEXT_DWORD); {
+    ld(tmp1, Address(a1, wordSize));
+    ld(tmp2, Address(a2, wordSize));
+    sub(cnt1, cnt1, 2 * wordSize / elem_size);
+    blez(cnt1, TAIL);
+    bne(tmp3, tmp4, DONE);
+    ld(tmp3, Address(a1, 2 * wordSize));
+    ld(tmp4, Address(a2, 2 * wordSize));
+    add(a1, a1, 2 * wordSize);
+    add(a2, a2, 2 * wordSize);
+    ble(cnt1, elem_per_word, TAIL2);
+  } beq(tmp1, tmp2, NEXT_DWORD);
+  j(DONE);
+
+  bind(TAIL);
+  xorr(tmp4, tmp3, tmp4);
+  xorr(tmp2, tmp1, tmp2);
+  sll(tmp2, tmp2, tmp5);
+  orr(tmp5, tmp4, tmp2);
+  j(IS_TMP5_ZR);
+
+  bind(TAIL2);
+  bne(tmp1, tmp2, DONE);
+
+  bind(SHORT);
+  xorr(tmp4, tmp3, tmp4);
+  sll(tmp5, tmp4, tmp5);
+
+  bind(IS_TMP5_ZR);
+  bnez(tmp5, DONE);
+
+  bind(SAME);
+  mv(result, true);
+  // That's it.
+  bind(DONE);
+
+  BLOCK_COMMENT("} array_equals");
+}
+
+// Compare Strings
+
+// For Strings we're passed the address of the first characters in a1
+// and a2 and the length in cnt1.
+// elem_size is the element size in bytes: either 1 or 2.
+// There are two implementations.  For arrays >= 8 bytes, all
+// comparisons (including the final one, which may overlap) are
+// performed 8 bytes at a time.  For strings < 8 bytes, we compare a
+// halfword, then a short, and then a byte.
+
+void C2_MacroAssembler::string_equals(Register a1, Register a2,
+                                      Register result, Register cnt1, int elem_size)
+{
+  Label SAME, DONE, SHORT, NEXT_WORD;
+  Register tmp1 = t0;
+  Register tmp2 = t1;
+
+  assert(elem_size == 1 || elem_size == 2, "must be 2 or 1 byte");
+  assert_different_registers(a1, a2, result, cnt1, t0, t1);
+
+  BLOCK_COMMENT("string_equals {");
+
+  mv(result, false);
+
+  // Check for short strings, i.e. smaller than wordSize.
+  sub(cnt1, cnt1, wordSize);
+  bltz(cnt1, SHORT);
+
+  // Main 8 byte comparison loop.
+  bind(NEXT_WORD); {
+    ld(tmp1, Address(a1, 0));
+    add(a1, a1, wordSize);
+    ld(tmp2, Address(a2, 0));
+    add(a2, a2, wordSize);
+    sub(cnt1, cnt1, wordSize);
+    bne(tmp1, tmp2, DONE);
+  } bgtz(cnt1, NEXT_WORD);
+
+  // Last longword.  In the case where length == 4 we compare the
+  // same longword twice, but that's still faster than another
+  // conditional branch.
+  // cnt1 could be 0, -1, -2, -3, -4 for chars; -4 only happens when
+  // length == 4.
+  add(tmp1, a1, cnt1);
+  ld(tmp1, Address(tmp1, 0));
+  add(tmp2, a2, cnt1);
+  ld(tmp2, Address(tmp2, 0));
+  bne(tmp1, tmp2, DONE);
+  j(SAME);
+
+  bind(SHORT);
+  Label TAIL03, TAIL01;
+
+  // 0-7 bytes left.
+  andi(t0, cnt1, 4);
+  beqz(t0, TAIL03);
+  {
+    lwu(tmp1, Address(a1, 0));
+    add(a1, a1, 4);
+    lwu(tmp2, Address(a2, 0));
+    add(a2, a2, 4);
+    bne(tmp1, tmp2, DONE);
+  }
+
+  bind(TAIL03);
+  // 0-3 bytes left.
+  andi(t0, cnt1, 2);
+  beqz(t0, TAIL01);
+  {
+    lhu(tmp1, Address(a1, 0));
+    add(a1, a1, 2);
+    lhu(tmp2, Address(a2, 0));
+    add(a2, a2, 2);
+    bne(tmp1, tmp2, DONE);
+  }
+
+  bind(TAIL01);
+  if (elem_size == 1) { // Only needed when comparing 1-byte elements
+    // 0-1 bytes left.
+    andi(t0, cnt1, 1);
+    beqz(t0, SAME);
+    {
+      lbu(tmp1, a1, 0);
+      lbu(tmp2, a2, 0);
+      bne(tmp1, tmp2, DONE);
+    }
+  }
+
+  // Arrays are equal.
+  bind(SAME);
+  mv(result, true);
+
+  // That's it.
+  bind(DONE);
+  BLOCK_COMMENT("} string_equals");
+}
+
+typedef void (Assembler::*conditional_branch_insn)(Register op1, Register op2, Label& label, bool is_far);
+typedef void (MacroAssembler::*float_conditional_branch_insn)(FloatRegister op1, FloatRegister op2, Label& label,
+                                                              bool is_far, bool is_unordered);
+
+static conditional_branch_insn conditional_branches[] =
+{
+  /* SHORT branches */
+  (conditional_branch_insn)&Assembler::beq,
+  (conditional_branch_insn)&Assembler::bgt,
+  NULL, // BoolTest::overflow
+  (conditional_branch_insn)&Assembler::blt,
+  (conditional_branch_insn)&Assembler::bne,
+  (conditional_branch_insn)&Assembler::ble,
+  NULL, // BoolTest::no_overflow
+  (conditional_branch_insn)&Assembler::bge,
+
+  /* UNSIGNED branches */
+  (conditional_branch_insn)&Assembler::beq,
+  (conditional_branch_insn)&Assembler::bgtu,
+  NULL,
+  (conditional_branch_insn)&Assembler::bltu,
+  (conditional_branch_insn)&Assembler::bne,
+  (conditional_branch_insn)&Assembler::bleu,
+  NULL,
+  (conditional_branch_insn)&Assembler::bgeu
+};
+
+static float_conditional_branch_insn float_conditional_branches[] =
+{
+  /* FLOAT SHORT branches */
+  (float_conditional_branch_insn)&MacroAssembler::float_beq,
+  (float_conditional_branch_insn)&MacroAssembler::float_bgt,
+  NULL,  // BoolTest::overflow
+  (float_conditional_branch_insn)&MacroAssembler::float_blt,
+  (float_conditional_branch_insn)&MacroAssembler::float_bne,
+  (float_conditional_branch_insn)&MacroAssembler::float_ble,
+  NULL, // BoolTest::no_overflow
+  (float_conditional_branch_insn)&MacroAssembler::float_bge,
+
+  /* DOUBLE SHORT branches */
+  (float_conditional_branch_insn)&MacroAssembler::double_beq,
+  (float_conditional_branch_insn)&MacroAssembler::double_bgt,
+  NULL,
+  (float_conditional_branch_insn)&MacroAssembler::double_blt,
+  (float_conditional_branch_insn)&MacroAssembler::double_bne,
+  (float_conditional_branch_insn)&MacroAssembler::double_ble,
+  NULL,
+  (float_conditional_branch_insn)&MacroAssembler::double_bge
+};
+
+void C2_MacroAssembler::cmp_branch(int cmpFlag, Register op1, Register op2, Label& label, bool is_far) {
+  assert(cmpFlag >= 0 && cmpFlag < (int)(sizeof(conditional_branches) / sizeof(conditional_branches[0])),
+         "invalid conditional branch index");
+  (this->*conditional_branches[cmpFlag])(op1, op2, label, is_far);
+}
+
+// This is a function should only be used by C2. Flip the unordered when unordered-greater, C2 would use
+// unordered-lesser instead of unordered-greater. Finally, commute the result bits at function do_one_bytecode().
+void C2_MacroAssembler::float_cmp_branch(int cmpFlag, FloatRegister op1, FloatRegister op2, Label& label, bool is_far) {
+  assert(cmpFlag >= 0 && cmpFlag < (int)(sizeof(float_conditional_branches) / sizeof(float_conditional_branches[0])),
+         "invalid float conditional branch index");
+  int booltest_flag = cmpFlag & ~(C2_MacroAssembler::double_branch_mask);
+  (this->*float_conditional_branches[cmpFlag])(op1, op2, label, is_far,
+    (booltest_flag == (BoolTest::ge) || booltest_flag == (BoolTest::gt)) ? false : true);
+}
+
+void C2_MacroAssembler::enc_cmpUEqNeLeGt_imm0_branch(int cmpFlag, Register op1, Label& L, bool is_far) {
+  switch (cmpFlag) {
+    case BoolTest::eq:
+    case BoolTest::le:
+      beqz(op1, L, is_far);
+      break;
+    case BoolTest::ne:
+    case BoolTest::gt:
+      bnez(op1, L, is_far);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void C2_MacroAssembler::enc_cmpEqNe_imm0_branch(int cmpFlag, Register op1, Label& L, bool is_far) {
+  switch (cmpFlag) {
+    case BoolTest::eq:
+      beqz(op1, L, is_far);
+      break;
+    case BoolTest::ne:
+      bnez(op1, L, is_far);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void C2_MacroAssembler::enc_cmove(int cmpFlag, Register op1, Register op2, Register dst, Register src) {
+  Label L;
+  cmp_branch(cmpFlag ^ (1 << neg_cond_bits), op1, op2, L);
+  mv(dst, src);
+  bind(L);
+}
+
+// Set dst to NaN if any NaN input.
+void C2_MacroAssembler::minmax_FD(FloatRegister dst, FloatRegister src1, FloatRegister src2,
+                                  bool is_double, bool is_min) {
+  assert_different_registers(dst, src1, src2);
+
+  Label Done;
+  fsflags(zr);
+  if (is_double) {
+    is_min ? fmin_d(dst, src1, src2)
+           : fmax_d(dst, src1, src2);
+    // Checking NaNs
+    flt_d(zr, src1, src2);
+  } else {
+    is_min ? fmin_s(dst, src1, src2)
+           : fmax_s(dst, src1, src2);
+    // Checking NaNs
+    flt_s(zr, src1, src2);
+  }
+
+  frflags(t0);
+  beqz(t0, Done);
+
+  // In case of NaNs
+  is_double ? fadd_d(dst, src1, src2)
+            : fadd_s(dst, src1, src2);
+
+  bind(Done);
+}
+
+void C2_MacroAssembler::element_compare(Register a1, Register a2, Register result, Register cnt, Register tmp1, Register tmp2,
+                                        VectorRegister vr1, VectorRegister vr2, VectorRegister vrs, bool islatin, Label &DONE) {
+  Label loop;
+  Assembler::SEW sew = islatin ? Assembler::e8 : Assembler::e16;
+
+  bind(loop);
+  vsetvli(tmp1, cnt, sew, Assembler::m2);
+  vlex_v(vr1, a1, sew);
+  vlex_v(vr2, a2, sew);
+  vmsne_vv(vrs, vr1, vr2);
+  vfirst_m(tmp2, vrs);
+  bgez(tmp2, DONE);
+  sub(cnt, cnt, tmp1);
+  if (!islatin) {
+    slli(tmp1, tmp1, 1); // get byte counts
+  }
+  add(a1, a1, tmp1);
+  add(a2, a2, tmp1);
+  bnez(cnt, loop);
+
+  mv(result, true);
+}
+
+void C2_MacroAssembler::string_equals_v(Register a1, Register a2, Register result, Register cnt, int elem_size) {
+  Label DONE;
+  Register tmp1 = t0;
+  Register tmp2 = t1;
+
+  BLOCK_COMMENT("string_equals_v {");
+
+  mv(result, false);
+
+  if (elem_size == 2) {
+    srli(cnt, cnt, 1);
+  }
+
+  element_compare(a1, a2, result, cnt, tmp1, tmp2, v0, v2, v0, elem_size == 1, DONE);
+
+  bind(DONE);
+  BLOCK_COMMENT("} string_equals_v");
+}
+
+// used by C2 ClearArray patterns.
+// base: Address of a buffer to be zeroed
+// cnt: Count in HeapWords
+//
+// base, cnt, v0, v1 and t0 are clobbered.
+void C2_MacroAssembler::clear_array_v(Register base, Register cnt) {
+  Label loop;
+
+  // making zero words
+  vsetvli(t0, cnt, Assembler::e64, Assembler::m4);
+  vxor_vv(v0, v0, v0);
+
+  bind(loop);
+  vsetvli(t0, cnt, Assembler::e64, Assembler::m4);
+  vse64_v(v0, base);
+  sub(cnt, cnt, t0);
+  shadd(base, t0, base, t0, 3);
+  bnez(cnt, loop);
+}
+
+void C2_MacroAssembler::arrays_equals_v(Register a1, Register a2, Register result,
+                                        Register cnt1, int elem_size) {
+  Label DONE;
+  Register tmp1 = t0;
+  Register tmp2 = t1;
+  Register cnt2 = tmp2;
+  int length_offset = arrayOopDesc::length_offset_in_bytes();
+  int base_offset = arrayOopDesc::base_offset_in_bytes(elem_size == 2 ? T_CHAR : T_BYTE);
+
+  BLOCK_COMMENT("arrays_equals_v {");
+
+  // if (a1 == a2), return true
+  mv(result, true);
+  beq(a1, a2, DONE);
+
+  mv(result, false);
+  // if a1 == null or a2 == null, return false
+  beqz(a1, DONE);
+  beqz(a2, DONE);
+  // if (a1.length != a2.length), return false
+  lwu(cnt1, Address(a1, length_offset));
+  lwu(cnt2, Address(a2, length_offset));
+  bne(cnt1, cnt2, DONE);
+
+  la(a1, Address(a1, base_offset));
+  la(a2, Address(a2, base_offset));
+
+  element_compare(a1, a2, result, cnt1, tmp1, tmp2, v0, v2, v0, elem_size == 1, DONE);
+
+  bind(DONE);
+
+  BLOCK_COMMENT("} arrays_equals_v");
+}
+
+void C2_MacroAssembler::string_compare_v(Register str1, Register str2, Register cnt1, Register cnt2,
+                                         Register result, Register tmp1, Register tmp2, int encForm) {
+  Label DIFFERENCE, DONE, L, loop;
+  bool encLL = encForm == StrIntrinsicNode::LL;
+  bool encLU = encForm == StrIntrinsicNode::LU;
+  bool encUL = encForm == StrIntrinsicNode::UL;
+
+  bool str1_isL = encLL || encLU;
+  bool str2_isL = encLL || encUL;
+
+  int minCharsInWord = encLL ? wordSize : wordSize / 2;
+
+  BLOCK_COMMENT("string_compare {");
+
+  // for Lating strings, 1 byte for 1 character
+  // for UTF16 strings, 2 bytes for 1 character
+  if (!str1_isL)
+    sraiw(cnt1, cnt1, 1);
+  if (!str2_isL)
+    sraiw(cnt2, cnt2, 1);
+
+  // if str1 == str2, return the difference
+  // save the minimum of the string lengths in cnt2.
+  sub(result, cnt1, cnt2);
+  bgt(cnt1, cnt2, L);
+  mv(cnt2, cnt1);
+  bind(L);
+
+  if (str1_isL == str2_isL) { // LL or UU
+    element_compare(str1, str2, zr, cnt2, tmp1, tmp2, v2, v4, v1, encLL, DIFFERENCE);
+    j(DONE);
+  } else { // LU or UL
+    Register strL = encLU ? str1 : str2;
+    Register strU = encLU ? str2 : str1;
+    VectorRegister vstr1 = encLU ? v4 : v0;
+    VectorRegister vstr2 = encLU ? v0 : v4;
+
+    bind(loop);
+    vsetvli(tmp1, cnt2, Assembler::e8, Assembler::m2);
+    vle8_v(vstr1, strL);
+    vsetvli(tmp1, cnt2, Assembler::e16, Assembler::m4);
+    vzext_vf2(vstr2, vstr1);
+    vle16_v(vstr1, strU);
+    vmsne_vv(v0, vstr2, vstr1);
+    vfirst_m(tmp2, v0);
+    bgez(tmp2, DIFFERENCE);
+    sub(cnt2, cnt2, tmp1);
+    add(strL, strL, tmp1);
+    shadd(strU, tmp1, strU, tmp1, 1);
+    bnez(cnt2, loop);
+    j(DONE);
+  }
+  bind(DIFFERENCE);
+  slli(tmp1, tmp2, 1);
+  add(str1, str1, str1_isL ? tmp2 : tmp1);
+  add(str2, str2, str2_isL ? tmp2 : tmp1);
+  str1_isL ? lbu(tmp1, Address(str1, 0)) : lhu(tmp1, Address(str1, 0));
+  str2_isL ? lbu(tmp2, Address(str2, 0)) : lhu(tmp2, Address(str2, 0));
+  sub(result, tmp1, tmp2);
+
+  bind(DONE);
+}
+
+void C2_MacroAssembler::byte_array_inflate_v(Register src, Register dst, Register len, Register tmp) {
+  Label loop;
+  assert_different_registers(src, dst, len, tmp, t0);
+
+  BLOCK_COMMENT("byte_array_inflate_v {");
+  bind(loop);
+  vsetvli(tmp, len, Assembler::e8, Assembler::m2);
+  vle8_v(v2, src);
+  vsetvli(t0, len, Assembler::e16, Assembler::m4);
+  vzext_vf2(v0, v2);
+  vse16_v(v0, dst);
+  sub(len, len, tmp);
+  add(src, src, tmp);
+  shadd(dst, tmp, dst, tmp, 1);
+  bnez(len, loop);
+  BLOCK_COMMENT("} byte_array_inflate_v");
+}
+
+// Compress char[] array to byte[].
+// result: the array length if every element in array can be encoded; 0, otherwise.
+void C2_MacroAssembler::char_array_compress_v(Register src, Register dst, Register len, Register result, Register tmp) {
+  Label done;
+  encode_iso_array_v(src, dst, len, result, tmp);
+  beqz(len, done);
+  mv(result, zr);
+  bind(done);
+}
+
+// result: the number of elements had been encoded.
+void C2_MacroAssembler::encode_iso_array_v(Register src, Register dst, Register len, Register result, Register tmp) {
+  Label loop, DIFFERENCE, DONE;
+
+  BLOCK_COMMENT("encode_iso_array_v {");
+  mv(result, 0);
+
+  bind(loop);
+  mv(tmp, 0xff);
+  vsetvli(t0, len, Assembler::e16, Assembler::m2);
+  vle16_v(v2, src);
+  // if element > 0xff, stop
+  vmsgtu_vx(v1, v2, tmp);
+  vfirst_m(tmp, v1);
+  vmsbf_m(v0, v1);
+  // compress char to byte
+  vsetvli(t0, len, Assembler::e8);
+  vncvt_x_x_w(v1, v2, Assembler::v0_t);
+  vse8_v(v1, dst, Assembler::v0_t);
+
+  bgez(tmp, DIFFERENCE);
+  add(result, result, t0);
+  add(dst, dst, t0);
+  sub(len, len, t0);
+  shadd(src, t0, src, t0, 1);
+  bnez(len, loop);
+  j(DONE);
+
+  bind(DIFFERENCE);
+  add(result, result, tmp);
+
+  bind(DONE);
+  BLOCK_COMMENT("} encode_iso_array_v");
+}
+
+void C2_MacroAssembler::count_positives_v(Register ary, Register len, Register result, Register tmp) {
+  Label LOOP, SET_RESULT, DONE;
+
+  BLOCK_COMMENT("count_positives_v {");
+  mv(result, zr);
+
+  bind(LOOP);
+  vsetvli(t0, len, Assembler::e8, Assembler::m4);
+  vle8_v(v0, ary);
+  vmslt_vx(v0, v0, zr);
+  vfirst_m(tmp, v0);
+  bgez(tmp, SET_RESULT);
+  // if tmp == -1, all bytes are positive
+  add(result, result, t0);
+
+  sub(len, len, t0);
+  add(ary, ary, t0);
+  bnez(len, LOOP);
+  j(DONE);
+
+  // add remaining positive bytes count
+  bind(SET_RESULT);
+  add(result, result, tmp);
+
+  bind(DONE);
+  BLOCK_COMMENT("} count_positives_v");
+}
+
+void C2_MacroAssembler::string_indexof_char_v(Register str1, Register cnt1,
+                                              Register ch, Register result,
+                                              Register tmp1, Register tmp2,
+                                              bool isL) {
+  mv(result, zr);
+
+  Label loop, MATCH, DONE;
+  Assembler::SEW sew = isL ? Assembler::e8 : Assembler::e16;
+  bind(loop);
+  vsetvli(tmp1, cnt1, sew, Assembler::m4);
+  vlex_v(v0, str1, sew);
+  vmseq_vx(v0, v0, ch);
+  vfirst_m(tmp2, v0);
+  bgez(tmp2, MATCH); // if equal, return index
+
+  add(result, result, tmp1);
+  sub(cnt1, cnt1, tmp1);
+  if (!isL) slli(tmp1, tmp1, 1);
+  add(str1, str1, tmp1);
+  bnez(cnt1, loop);
+
+  mv(result, -1);
+  j(DONE);
+
+  bind(MATCH);
+  add(result, result, tmp2);
+
+  bind(DONE);
+}
+
+// Set dst to NaN if any NaN input.
+void C2_MacroAssembler::minmax_FD_v(VectorRegister dst, VectorRegister src1, VectorRegister src2,
+                                    bool is_double, bool is_min) {
+  assert_different_registers(dst, src1, src2);
+
+  vsetvli(t0, x0, is_double ? Assembler::e64 : Assembler::e32);
+
+  is_min ? vfmin_vv(dst, src1, src2)
+         : vfmax_vv(dst, src1, src2);
+
+  vmfne_vv(v0,  src1, src1);
+  vfadd_vv(dst, src1, src1, Assembler::v0_t);
+  vmfne_vv(v0,  src2, src2);
+  vfadd_vv(dst, src2, src2, Assembler::v0_t);
+}
+
+// Set dst to NaN if any NaN input.
+void C2_MacroAssembler::reduce_minmax_FD_v(FloatRegister dst,
+                                           FloatRegister src1, VectorRegister src2,
+                                           VectorRegister tmp1, VectorRegister tmp2,
+                                           bool is_double, bool is_min) {
+  assert_different_registers(src2, tmp1, tmp2);
+
+  Label L_done, L_NaN;
+  vsetvli(t0, x0, is_double ? Assembler::e64 : Assembler::e32);
+  vfmv_s_f(tmp2, src1);
+
+  is_min ? vfredmin_vs(tmp1, src2, tmp2)
+         : vfredmax_vs(tmp1, src2, tmp2);
+
+  fsflags(zr);
+  // Checking NaNs
+  vmflt_vf(tmp2, src2, src1);
+  frflags(t0);
+  bnez(t0, L_NaN);
+  j(L_done);
+
+  bind(L_NaN);
+  vfmv_s_f(tmp2, src1);
+  vfredsum_vs(tmp1, src2, tmp2);
+
+  bind(L_done);
+  vfmv_f_s(dst, tmp1);
+}
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
new file mode 100644
index 00000000000..c71df4c101b
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C2_MACROASSEMBLER_RISCV_HPP
+#define CPU_RISCV_C2_MACROASSEMBLER_RISCV_HPP
+
+// C2_MacroAssembler contains high-level macros for C2
+
+ private:
+  void element_compare(Register r1, Register r2,
+                       Register result, Register cnt,
+                       Register tmp1, Register tmp2,
+                       VectorRegister vr1, VectorRegister vr2,
+                       VectorRegister vrs,
+                       bool is_latin, Label& DONE);
+ public:
+
+  void string_compare(Register str1, Register str2,
+                      Register cnt1, Register cnt2, Register result,
+                      Register tmp1, Register tmp2, Register tmp3,
+                      int ae);
+
+  void string_indexof_char_short(Register str1, Register cnt1,
+                                 Register ch, Register result,
+                                 bool isL);
+
+  void string_indexof_char(Register str1, Register cnt1,
+                           Register ch, Register result,
+                           Register tmp1, Register tmp2,
+                           Register tmp3, Register tmp4,
+                           bool isL);
+
+  void string_indexof(Register str1, Register str2,
+                      Register cnt1, Register cnt2,
+                      Register tmp1, Register tmp2,
+                      Register tmp3, Register tmp4,
+                      Register tmp5, Register tmp6,
+                      Register result, int ae);
+
+  void string_indexof_linearscan(Register haystack, Register needle,
+                                 Register haystack_len, Register needle_len,
+                                 Register tmp1, Register tmp2,
+                                 Register tmp3, Register tmp4,
+                                 int needle_con_cnt, Register result, int ae);
+
+  void arrays_equals(Register r1, Register r2,
+                     Register tmp3, Register tmp4,
+                     Register tmp5, Register tmp6,
+                     Register result, Register cnt1,
+                     int elem_size);
+
+  void string_equals(Register r1, Register r2,
+                     Register result, Register cnt1,
+                     int elem_size);
+
+  // refer to conditional_branches and float_conditional_branches
+  static const int bool_test_bits = 3;
+  static const int neg_cond_bits = 2;
+  static const int unsigned_branch_mask = 1 << bool_test_bits;
+  static const int double_branch_mask = 1 << bool_test_bits;
+
+  // cmp
+  void cmp_branch(int cmpFlag,
+                  Register op1, Register op2,
+                  Label& label, bool is_far = false);
+
+  void float_cmp_branch(int cmpFlag,
+                        FloatRegister op1, FloatRegister op2,
+                        Label& label, bool is_far = false);
+
+  void enc_cmpUEqNeLeGt_imm0_branch(int cmpFlag, Register op,
+                                    Label& L, bool is_far = false);
+
+  void enc_cmpEqNe_imm0_branch(int cmpFlag, Register op,
+                               Label& L, bool is_far = false);
+
+  void enc_cmove(int cmpFlag,
+                 Register op1, Register op2,
+                 Register dst, Register src);
+
+  void spill(Register r, bool is64, int offset) {
+    is64 ? sd(r, Address(sp, offset))
+         : sw(r, Address(sp, offset));
+  }
+
+  void spill(FloatRegister f, bool is64, int offset) {
+    is64 ? fsd(f, Address(sp, offset))
+         : fsw(f, Address(sp, offset));
+  }
+
+  void spill(VectorRegister v, int offset) {
+    add(t0, sp, offset);
+    vs1r_v(v, t0);
+  }
+
+  void unspill(Register r, bool is64, int offset) {
+    is64 ? ld(r, Address(sp, offset))
+         : lw(r, Address(sp, offset));
+  }
+
+  void unspillu(Register r, bool is64, int offset) {
+    is64 ? ld(r, Address(sp, offset))
+         : lwu(r, Address(sp, offset));
+  }
+
+  void unspill(FloatRegister f, bool is64, int offset) {
+    is64 ? fld(f, Address(sp, offset))
+         : flw(f, Address(sp, offset));
+  }
+
+  void unspill(VectorRegister v, int offset) {
+    add(t0, sp, offset);
+    vl1r_v(v, t0);
+  }
+
+  void spill_copy_vector_stack_to_stack(int src_offset, int dst_offset, int vec_reg_size_in_bytes) {
+    assert(vec_reg_size_in_bytes % 16 == 0, "unexpected vector reg size");
+    unspill(v0, src_offset);
+    spill(v0, dst_offset);
+  }
+
+  void minmax_FD(FloatRegister dst,
+                 FloatRegister src1, FloatRegister src2,
+                 bool is_double, bool is_min);
+
+  // intrinsic methods implemented by rvv instructions
+  void string_equals_v(Register r1, Register r2,
+                       Register result, Register cnt1,
+                       int elem_size);
+
+  void arrays_equals_v(Register r1, Register r2,
+                       Register result, Register cnt1,
+                       int elem_size);
+
+  void string_compare_v(Register str1, Register str2,
+                        Register cnt1, Register cnt2,
+                        Register result,
+                        Register tmp1, Register tmp2,
+                        int encForm);
+
+ void clear_array_v(Register base, Register cnt);
+
+ void byte_array_inflate_v(Register src, Register dst,
+                           Register len, Register tmp);
+
+ void char_array_compress_v(Register src, Register dst,
+                            Register len, Register result,
+                            Register tmp);
+
+ void encode_iso_array_v(Register src, Register dst,
+                         Register len, Register result,
+                         Register tmp);
+
+ void count_positives_v(Register ary, Register len,
+                        Register result, Register tmp);
+
+ void string_indexof_char_v(Register str1, Register cnt1,
+                            Register ch, Register result,
+                            Register tmp1, Register tmp2,
+                            bool isL);
+
+ void minmax_FD_v(VectorRegister dst,
+                  VectorRegister src1, VectorRegister src2,
+                  bool is_double, bool is_min);
+
+ void reduce_minmax_FD_v(FloatRegister dst,
+                         FloatRegister src1, VectorRegister src2,
+                         VectorRegister tmp1, VectorRegister tmp2,
+                         bool is_double, bool is_min);
+
+#endif // CPU_RISCV_C2_MACROASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c2_globals_riscv.hpp b/src/hotspot/cpu/riscv/c2_globals_riscv.hpp
new file mode 100644
index 00000000000..53a41665f4b
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c2_globals_riscv.hpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_C2_GLOBALS_RISCV_HPP
+#define CPU_RISCV_C2_GLOBALS_RISCV_HPP
+
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+// Sets the default values for platform dependent flags used by the server compiler.
+// (see c2_globals.hpp).  Alpha-sorted.
+
+define_pd_global(bool, BackgroundCompilation,        true);
+define_pd_global(bool, CICompileOSR,                 true);
+define_pd_global(bool, InlineIntrinsics,             true);
+define_pd_global(bool, PreferInterpreterNativeStubs, false);
+define_pd_global(bool, ProfileTraps,                 true);
+define_pd_global(bool, UseOnStackReplacement,        true);
+define_pd_global(bool, ProfileInterpreter,           true);
+define_pd_global(bool, TieredCompilation,            COMPILER1_PRESENT(true) NOT_COMPILER1(false));
+define_pd_global(intx, CompileThreshold,             10000);
+
+define_pd_global(intx, OnStackReplacePercentage,     140);
+define_pd_global(intx, ConditionalMoveLimit,         0);
+define_pd_global(intx, FreqInlineSize,               325);
+define_pd_global(intx, MinJumpTableSize,             10);
+define_pd_global(intx, InteriorEntryAlignment,       16);
+define_pd_global(intx, NewSizeThreadIncrease, ScaleForWordSize(4*K));
+define_pd_global(intx, LoopUnrollLimit,              60);
+define_pd_global(intx, LoopPercentProfileLimit,      10);
+// InitialCodeCacheSize derived from specjbb2000 run.
+define_pd_global(intx, InitialCodeCacheSize,         2496*K); // Integral multiple of CodeCacheExpansionSize
+define_pd_global(intx, CodeCacheExpansionSize,       64*K);
+
+// Ergonomics related flags
+define_pd_global(uint64_t,MaxRAM,                    128ULL*G);
+define_pd_global(intx, RegisterCostAreaRatio,        16000);
+
+// Peephole and CISC spilling both break the graph, and so makes the
+// scheduler sick.
+define_pd_global(bool, OptoPeephole,                 false);
+define_pd_global(bool, UseCISCSpill,                 false);
+define_pd_global(bool, OptoScheduling,               true);
+define_pd_global(bool, OptoBundling,                 false);
+define_pd_global(bool, OptoRegScheduling,            false);
+define_pd_global(bool, SuperWordLoopUnrollAnalysis,  true);
+define_pd_global(bool, IdealizeClearArrayNode,       true);
+
+define_pd_global(intx, ReservedCodeCacheSize,        48*M);
+define_pd_global(intx, NonProfiledCodeHeapSize,      21*M);
+define_pd_global(intx, ProfiledCodeHeapSize,         22*M);
+define_pd_global(intx, NonNMethodCodeHeapSize,       5*M );
+define_pd_global(uintx, CodeCacheMinBlockLength,     6);
+define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
+
+// Ergonomics related flags
+define_pd_global(bool, NeverActAsServerClassMachine, false);
+
+define_pd_global(bool, TrapBasedRangeChecks,         false); // Not needed.
+
+#endif // CPU_RISCV_C2_GLOBALS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c2_init_riscv.cpp b/src/hotspot/cpu/riscv/c2_init_riscv.cpp
new file mode 100644
index 00000000000..cdbd69807be
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c2_init_riscv.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "opto/compile.hpp"
+#include "opto/node.hpp"
+
+// processor dependent initialization for riscv
+
+extern void reg_mask_init();
+
+void Compile::pd_compiler2_init() {
+  guarantee(CodeEntryAlignment >= InteriorEntryAlignment, "" );
+  reg_mask_init();
+}
diff --git a/src/hotspot/cpu/riscv/c2_safepointPollStubTable_riscv.cpp b/src/hotspot/cpu/riscv/c2_safepointPollStubTable_riscv.cpp
new file mode 100644
index 00000000000..a90d9fdc160
--- /dev/null
+++ b/src/hotspot/cpu/riscv/c2_safepointPollStubTable_riscv.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "opto/compile.hpp"
+#include "opto/node.hpp"
+#include "opto/output.hpp"
+#include "runtime/sharedRuntime.hpp"
+
+#define __ masm.
+void C2SafepointPollStubTable::emit_stub_impl(MacroAssembler& masm, C2SafepointPollStub* entry) const {
+  assert(SharedRuntime::polling_page_return_handler_blob() != NULL,
+         "polling page return stub not created yet");
+  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
+  RuntimeAddress callback_addr(stub);
+
+  __ bind(entry->_stub_label);
+  InternalAddress safepoint_pc(masm.pc() - masm.offset() + entry->_safepoint_offset);
+  masm.code_section()->relocate(masm.pc(), safepoint_pc.rspec());
+  __ la(t0, safepoint_pc.target());
+  __ sd(t0, Address(xthread, JavaThread::saved_exception_pc_offset()));
+  __ far_jump(callback_addr);
+}
+#undef __
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
new file mode 100644
index 00000000000..14a68b45026
--- /dev/null
+++ b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_CODEBUFFER_RISCV_HPP
+#define CPU_RISCV_CODEBUFFER_RISCV_HPP
+
+private:
+  void pd_initialize() {}
+
+public:
+  void flush_bundle(bool start_new_bundle) {}
+
+#endif // CPU_RISCV_CODEBUFFER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
new file mode 100644
index 00000000000..75bc4be7840
--- /dev/null
+++ b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "code/compiledIC.hpp"
+#include "code/icBuffer.hpp"
+#include "code/nmethod.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/safepoint.hpp"
+
+// ----------------------------------------------------------------------------
+
+#define __ _masm.
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
+  precond(cbuf.stubs()->start() != badAddress);
+  precond(cbuf.stubs()->end() != badAddress);
+  // Stub is fixed up when the corresponding call is converted from
+  // calling compiled code to calling interpreted code.
+  // mv xmethod, 0
+  // jalr -4 # to self
+
+  if (mark == NULL) {
+    mark = cbuf.insts_mark();  // Get mark within main instrs section.
+  }
+
+  // Note that the code buffer's insts_mark is always relative to insts.
+  // That's why we must use the macroassembler to generate a stub.
+  MacroAssembler _masm(&cbuf);
+
+  address base = __ start_a_stub(to_interp_stub_size());
+  int offset = __ offset();
+  if (base == NULL) {
+    return NULL;  // CodeBuffer::expand failed
+  }
+  // static stub relocation stores the instruction address of the call
+  __ relocate(static_stub_Relocation::spec(mark));
+
+  __ emit_static_call_stub();
+
+  assert((__ offset() - offset) <= (int)to_interp_stub_size(), "stub too big");
+  __ end_a_stub();
+  return base;
+}
+#undef __
+
+int CompiledStaticCall::to_interp_stub_size() {
+  // fence_i + fence* + (lui, addi, slli, addi, slli, addi) + (lui, addi, slli, addi, slli) + jalr
+  return NativeFenceI::instruction_size() + 12 * NativeInstruction::instruction_size;
+}
+
+int CompiledStaticCall::to_trampoline_stub_size() {
+  // Somewhat pessimistically, we count 4 instructions here (although
+  // there are only 3) because we sometimes emit an alignment nop.
+  // Trampoline stubs are always word aligned.
+  return NativeInstruction::instruction_size + NativeCallTrampolineStub::instruction_size;
+}
+
+// Relocation entries for call stub, compiled java to interpreter.
+int CompiledStaticCall::reloc_to_interp_stub() {
+  return 4; // 3 in emit_to_interp_stub + 1 in emit_call
+}
+
+void CompiledDirectStaticCall::set_to_interpreted(const methodHandle& callee, address entry) {
+  address stub = find_stub();
+  guarantee(stub != NULL, "stub not found");
+
+  if (TraceICs) {
+    ResourceMark rm;
+    tty->print_cr("CompiledDirectStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s",
+                  p2i(instruction_address()),
+                  callee->name_and_sig_as_C_string());
+  }
+
+  // Creation also verifies the object.
+  NativeMovConstReg* method_holder
+    = nativeMovConstReg_at(stub + NativeFenceI::instruction_size());
+#ifdef ASSERT
+  NativeGeneralJump* jump = nativeGeneralJump_at(method_holder->next_instruction_address());
+
+  verify_mt_safe(callee, entry, method_holder, jump);
+#endif
+  // Update stub.
+  method_holder->set_data((intptr_t)callee());
+  NativeGeneralJump::insert_unconditional(method_holder->next_instruction_address(), entry);
+  ICache::invalidate_range(stub, to_interp_stub_size());
+  // Update jump to call.
+  set_destination_mt_safe(stub);
+}
+
+void CompiledDirectStaticCall::set_stub_to_clean(static_stub_Relocation* static_stub) {
+  // Reset stub.
+  address stub = static_stub->addr();
+  assert(stub != NULL, "stub not found");
+  assert(CompiledICLocker::is_safe(stub), "mt unsafe call");
+  // Creation also verifies the object.
+  NativeMovConstReg* method_holder
+    = nativeMovConstReg_at(stub + NativeFenceI::instruction_size());
+  method_holder->set_data(0);
+  NativeJump* jump = nativeJump_at(method_holder->next_instruction_address());
+  jump->set_jump_destination((address)-1);
+}
+
+//-----------------------------------------------------------------------------
+// Non-product mode code
+#ifndef PRODUCT
+
+void CompiledDirectStaticCall::verify() {
+  // Verify call.
+  _call->verify();
+  _call->verify_alignment();
+
+  // Verify stub.
+  address stub = find_stub();
+  assert(stub != NULL, "no stub found for static call");
+  // Creation also verifies the object.
+  NativeMovConstReg* method_holder
+    = nativeMovConstReg_at(stub + NativeFenceI::instruction_size());
+  NativeJump* jump = nativeJump_at(method_holder->next_instruction_address());
+
+  // Verify state.
+  assert(is_clean() || is_call_to_compiled() || is_call_to_interpreted(), "sanity check");
+}
+
+#endif // !PRODUCT
diff --git a/src/hotspot/cpu/riscv/copy_riscv.hpp b/src/hotspot/cpu/riscv/copy_riscv.hpp
new file mode 100644
index 00000000000..bceadcc5dcc
--- /dev/null
+++ b/src/hotspot/cpu/riscv/copy_riscv.hpp
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_COPY_RISCV_HPP
+#define CPU_RISCV_COPY_RISCV_HPP
+
+#include OS_CPU_HEADER(copy)
+
+static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
+  julong* to = (julong*) tohw;
+  julong  v  = ((julong) value << 32) | value;
+  while (count-- > 0) {
+    *to++ = v;
+  }
+}
+
+static void pd_fill_to_aligned_words(HeapWord* tohw, size_t count, juint value) {
+  pd_fill_to_words(tohw, count, value);
+}
+
+static void pd_fill_to_bytes(void* to, size_t count, jubyte value) {
+  (void)memset(to, value, count);
+}
+
+static void pd_zero_to_words(HeapWord* tohw, size_t count) {
+  pd_fill_to_words(tohw, count, 0);
+}
+
+static void pd_zero_to_bytes(void* to, size_t count) {
+  (void)memset(to, 0, count);
+}
+
+static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
+  (void)memmove(to, from, count * HeapWordSize);
+}
+
+static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
+  switch (count) {
+    case 8:  to[7] = from[7];   // fall through
+    case 7:  to[6] = from[6];   // fall through
+    case 6:  to[5] = from[5];   // fall through
+    case 5:  to[4] = from[4];   // fall through
+    case 4:  to[3] = from[3];   // fall through
+    case 3:  to[2] = from[2];   // fall through
+    case 2:  to[1] = from[1];   // fall through
+    case 1:  to[0] = from[0];   // fall through
+    case 0:  break;
+    default:
+      memcpy(to, from, count * HeapWordSize);
+      break;
+  }
+}
+
+static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) {
+  shared_disjoint_words_atomic(from, to, count);
+}
+
+static void pd_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
+  pd_conjoint_words(from, to, count);
+}
+
+static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
+  pd_disjoint_words(from, to, count);
+}
+
+static void pd_conjoint_bytes(const void* from, void* to, size_t count) {
+  (void)memmove(to, from, count);
+}
+
+static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) {
+  pd_conjoint_bytes(from, to, count);
+}
+
+static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) {
+  _Copy_conjoint_jshorts_atomic(from, to, count);
+}
+
+static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) {
+  _Copy_conjoint_jints_atomic(from, to, count);
+}
+
+static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) {
+  _Copy_conjoint_jlongs_atomic(from, to, count);
+}
+
+static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) {
+  assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size.");
+  _Copy_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count);
+}
+
+static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) {
+  _Copy_arrayof_conjoint_bytes(from, to, count);
+}
+
+static void pd_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count) {
+  _Copy_arrayof_conjoint_jshorts(from, to, count);
+}
+
+static void pd_arrayof_conjoint_jints(const HeapWord* from, HeapWord* to, size_t count) {
+  _Copy_arrayof_conjoint_jints(from, to, count);
+}
+
+static void pd_arrayof_conjoint_jlongs(const HeapWord* from, HeapWord* to, size_t count) {
+  _Copy_arrayof_conjoint_jlongs(from, to, count);
+}
+
+static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) {
+  assert(!UseCompressedOops, "foo!");
+  assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size");
+  _Copy_arrayof_conjoint_jlongs(from, to, count);
+}
+
+#endif // CPU_RISCV_COPY_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/disassembler_riscv.hpp b/src/hotspot/cpu/riscv/disassembler_riscv.hpp
new file mode 100644
index 00000000000..b0e5560c906
--- /dev/null
+++ b/src/hotspot/cpu/riscv/disassembler_riscv.hpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_DISASSEMBLER_RISCV_HPP
+#define CPU_RISCV_DISASSEMBLER_RISCV_HPP
+
+static int pd_instruction_alignment() {
+  return 1;
+}
+
+static const char* pd_cpu_opts() {
+  return "";
+}
+
+// Returns address of n-th instruction preceding addr,
+// NULL if no preceding instruction can be found.
+// On riscv, we assume a constant instruction length.
+// It might be beneficial to check "is_readable" as we do on ppc and s390.
+static address find_prev_instr(address addr, int n_instr) {
+  return addr - Assembler::instruction_size * n_instr;
+}
+
+// special-case instruction decoding.
+// There may be cases where the binutils disassembler doesn't do
+// the perfect job. In those cases, decode_instruction0 may kick in
+// and do it right.
+// If nothing had to be done, just return "here", otherwise return "here + instr_len(here)"
+static address decode_instruction0(address here, outputStream* st, address virtual_begin = NULL) {
+  return here;
+}
+
+// platform-specific instruction annotations (like value of loaded constants)
+static void annotate(address pc, outputStream* st) {}
+
+#endif // CPU_RISCV_DISASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/foreign_globals_riscv.cpp b/src/hotspot/cpu/riscv/foreign_globals_riscv.cpp
new file mode 100644
index 00000000000..5c700be9c91
--- /dev/null
+++ b/src/hotspot/cpu/riscv/foreign_globals_riscv.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "prims/foreign_globals.hpp"
+#include "utilities/debug.hpp"
+
+// Stubbed out, implement later
+const ABIDescriptor ForeignGlobals::parse_abi_descriptor_impl(jobject jabi) const {
+  Unimplemented();
+  return {};
+}
+
+const BufferLayout ForeignGlobals::parse_buffer_layout_impl(jobject jlayout) const {
+  Unimplemented();
+  return {};
+}
+
+const CallRegs ForeignGlobals::parse_call_regs_impl(jobject jconv) const {
+  ShouldNotCallThis();
+  return {};
+}
diff --git a/src/hotspot/cpu/riscv/foreign_globals_riscv.hpp b/src/hotspot/cpu/riscv/foreign_globals_riscv.hpp
new file mode 100644
index 00000000000..3ac89752c27
--- /dev/null
+++ b/src/hotspot/cpu/riscv/foreign_globals_riscv.hpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_FOREIGN_GLOBALS_RISCV_HPP
+#define CPU_RISCV_FOREIGN_GLOBALS_RISCV_HPP
+
+class ABIDescriptor {};
+class BufferLayout {};
+
+#endif // CPU_RISCV_FOREIGN_GLOBALS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/frame_riscv.cpp b/src/hotspot/cpu/riscv/frame_riscv.cpp
new file mode 100644
index 00000000000..6e38960598a
--- /dev/null
+++ b/src/hotspot/cpu/riscv/frame_riscv.cpp
@@ -0,0 +1,697 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "compiler/oopMap.hpp"
+#include "interpreter/interpreter.hpp"
+#include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
+#include "oops/markWord.hpp"
+#include "oops/method.hpp"
+#include "oops/oop.inline.hpp"
+#include "prims/methodHandles.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/javaCalls.hpp"
+#include "runtime/monitorChunk.hpp"
+#include "runtime/os.inline.hpp"
+#include "runtime/signature.hpp"
+#include "runtime/stackWatermarkSet.hpp"
+#include "runtime/stubCodeGenerator.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "vmreg_riscv.inline.hpp"
+#ifdef COMPILER1
+#include "c1/c1_Runtime1.hpp"
+#include "runtime/vframeArray.hpp"
+#endif
+
+#ifdef ASSERT
+void RegisterMap::check_location_valid() {
+}
+#endif
+
+
+// Profiling/safepoint support
+
+bool frame::safe_for_sender(JavaThread *thread) {
+  address   addr_sp = (address)_sp;
+  address   addr_fp = (address)_fp;
+  address   unextended_sp = (address)_unextended_sp;
+
+  // consider stack guards when trying to determine "safe" stack pointers
+  // sp must be within the usable part of the stack (not in guards)
+  if (!thread->is_in_usable_stack(addr_sp)) {
+    return false;
+  }
+
+  // When we are running interpreted code the machine stack pointer, SP, is
+  // set low enough so that the Java expression stack can grow and shrink
+  // without ever exceeding the machine stack bounds.  So, ESP >= SP.
+
+  // When we call out of an interpreted method, SP is incremented so that
+  // the space between SP and ESP is removed.  The SP saved in the callee's
+  // frame is the SP *before* this increment.  So, when we walk a stack of
+  // interpreter frames the sender's SP saved in a frame might be less than
+  // the SP at the point of call.
+
+  // So unextended sp must be within the stack but we need not to check
+  // that unextended sp >= sp
+
+  if (!thread->is_in_full_stack_checked(unextended_sp)) {
+    return false;
+  }
+
+  // an fp must be within the stack and above (but not equal) sp
+  // second evaluation on fp+ is added to handle situation where fp is -1
+  bool fp_safe = thread->is_in_stack_range_excl(addr_fp, addr_sp) &&
+                 thread->is_in_full_stack_checked(addr_fp + (return_addr_offset * sizeof(void*)));
+
+  // We know sp/unextended_sp are safe only fp is questionable here
+
+  // If the current frame is known to the code cache then we can attempt to
+  // to construct the sender and do some validation of it. This goes a long way
+  // toward eliminating issues when we get in frame construction code
+
+  if (_cb != NULL) {
+
+    // First check if frame is complete and tester is reliable
+    // Unfortunately we can only check frame complete for runtime stubs and nmethod
+    // other generic buffer blobs are more problematic so we just assume they are
+    // ok. adapter blobs never have a frame complete and are never ok.
+
+    if (!_cb->is_frame_complete_at(_pc)) {
+      if (_cb->is_nmethod() || _cb->is_adapter_blob() || _cb->is_runtime_stub()) {
+        return false;
+      }
+    }
+
+    // Could just be some random pointer within the codeBlob
+    if (!_cb->code_contains(_pc)) {
+      return false;
+    }
+
+    // Entry frame checks
+    if (is_entry_frame()) {
+      // an entry frame must have a valid fp.
+      return fp_safe && is_entry_frame_valid(thread);
+    }
+
+    intptr_t* sender_sp = NULL;
+    intptr_t* sender_unextended_sp = NULL;
+    address   sender_pc = NULL;
+    intptr_t* saved_fp =  NULL;
+
+    if (is_interpreted_frame()) {
+      // fp must be safe
+      if (!fp_safe) {
+        return false;
+      }
+
+      sender_pc = (address)this->fp()[return_addr_offset];
+      // for interpreted frames, the value below is the sender "raw" sp,
+      // which can be different from the sender unextended sp (the sp seen
+      // by the sender) because of current frame local variables
+      sender_sp = (intptr_t*) addr_at(sender_sp_offset);
+      sender_unextended_sp = (intptr_t*) this->fp()[interpreter_frame_sender_sp_offset];
+      saved_fp = (intptr_t*) this->fp()[link_offset];
+    } else {
+      // must be some sort of compiled/runtime frame
+      // fp does not have to be safe (although it could be check for c1?)
+
+      // check for a valid frame_size, otherwise we are unlikely to get a valid sender_pc
+      if (_cb->frame_size() <= 0) {
+        return false;
+      }
+
+      sender_sp = _unextended_sp + _cb->frame_size();
+      // Is sender_sp safe?
+      if (!thread->is_in_full_stack_checked((address)sender_sp)) {
+        return false;
+      }
+
+      sender_unextended_sp = sender_sp;
+      sender_pc = (address) *(sender_sp - 1);
+      saved_fp = (intptr_t*) *(sender_sp - 2);
+    }
+
+
+    // If the potential sender is the interpreter then we can do some more checking
+    if (Interpreter::contains(sender_pc)) {
+
+      // fp is always saved in a recognizable place in any code we generate. However
+      // only if the sender is interpreted/call_stub (c1 too?) are we certain that the saved fp
+      // is really a frame pointer.
+      if (!thread->is_in_stack_range_excl((address)saved_fp, (address)sender_sp)) {
+        return false;
+      }
+
+      // construct the potential sender
+      frame sender(sender_sp, sender_unextended_sp, saved_fp, sender_pc);
+
+      return sender.is_interpreted_frame_valid(thread);
+    }
+
+    // We must always be able to find a recognizable pc
+    CodeBlob* sender_blob = CodeCache::find_blob_unsafe(sender_pc);
+    if (sender_pc == NULL || sender_blob == NULL) {
+      return false;
+    }
+
+    // Could be a zombie method
+    if (sender_blob->is_zombie() || sender_blob->is_unloaded()) {
+      return false;
+    }
+
+    // Could just be some random pointer within the codeBlob
+    if (!sender_blob->code_contains(sender_pc)) {
+      return false;
+    }
+
+    // We should never be able to see an adapter if the current frame is something from code cache
+    if (sender_blob->is_adapter_blob()) {
+      return false;
+    }
+
+    // Could be the call_stub
+    if (StubRoutines::returns_to_call_stub(sender_pc)) {
+      if (!thread->is_in_stack_range_excl((address)saved_fp, (address)sender_sp)) {
+        return false;
+      }
+
+      // construct the potential sender
+      frame sender(sender_sp, sender_unextended_sp, saved_fp, sender_pc);
+
+      // Validate the JavaCallWrapper an entry frame must have
+      address jcw = (address)sender.entry_frame_call_wrapper();
+
+      bool jcw_safe = (jcw < thread->stack_base()) && (jcw > (address)sender.fp());
+
+      return jcw_safe;
+    }
+
+    CompiledMethod* nm = sender_blob->as_compiled_method_or_null();
+    if (nm != NULL) {
+      if (nm->is_deopt_mh_entry(sender_pc) || nm->is_deopt_entry(sender_pc) ||
+          nm->method()->is_method_handle_intrinsic()) {
+        return false;
+      }
+    }
+
+    // If the frame size is 0 something (or less) is bad because every nmethod has a non-zero frame size
+    // because the return address counts against the callee's frame.
+    if (sender_blob->frame_size() <= 0) {
+      assert(!sender_blob->is_compiled(), "should count return address at least");
+      return false;
+    }
+
+    // We should never be able to see anything here except an nmethod. If something in the
+    // code cache (current frame) is called by an entity within the code cache that entity
+    // should not be anything but the call stub (already covered), the interpreter (already covered)
+    // or an nmethod.
+    if (!sender_blob->is_compiled()) {
+        return false;
+    }
+
+    // Could put some more validation for the potential non-interpreted sender
+    // frame we'd create by calling sender if I could think of any. Wait for next crash in forte...
+
+    // One idea is seeing if the sender_pc we have is one that we'd expect to call to current cb
+
+    // We've validated the potential sender that would be created
+    return true;
+  }
+
+  // Must be native-compiled frame. Since sender will try and use fp to find
+  // linkages it must be safe
+  if (!fp_safe) {
+    return false;
+  }
+
+  // Will the pc we fetch be non-zero (which we'll find at the oldest frame)
+  if ((address)this->fp()[return_addr_offset] == NULL) { return false; }
+
+  return true;
+}
+
+void frame::patch_pc(Thread* thread, address pc) {
+  assert(_cb == CodeCache::find_blob(pc), "unexpected pc");
+  address* pc_addr = &(((address*) sp())[-1]);
+  if (TracePcPatching) {
+    tty->print_cr("patch_pc at address " INTPTR_FORMAT " [" INTPTR_FORMAT " -> " INTPTR_FORMAT "]",
+                  p2i(pc_addr), p2i(*pc_addr), p2i(pc));
+  }
+  // Either the return address is the original one or we are going to
+  // patch in the same address that's already there.
+  assert(_pc == *pc_addr || pc == *pc_addr, "must be");
+  *pc_addr = pc;
+  address original_pc = CompiledMethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    assert(original_pc == _pc, "expected original PC to be stored before patching");
+    _deopt_state = is_deoptimized;
+    // leave _pc as is
+  } else {
+    _deopt_state = not_deoptimized;
+    _pc = pc;
+  }
+}
+
+bool frame::is_interpreted_frame() const  {
+  return Interpreter::contains(pc());
+}
+
+int frame::frame_size(RegisterMap* map) const {
+  frame sender = this->sender(map);
+  return sender.sp() - sp();
+}
+
+intptr_t* frame::entry_frame_argument_at(int offset) const {
+  // convert offset to index to deal with tsi
+  int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize);
+  // Entry frame's arguments are always in relation to unextended_sp()
+  return &unextended_sp()[index];
+}
+
+// sender_sp
+intptr_t* frame::interpreter_frame_sender_sp() const {
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  return (intptr_t*) at(interpreter_frame_sender_sp_offset);
+}
+
+void frame::set_interpreter_frame_sender_sp(intptr_t* sender_sp) {
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  ptr_at_put(interpreter_frame_sender_sp_offset, (intptr_t) sender_sp);
+}
+
+
+// monitor elements
+
+BasicObjectLock* frame::interpreter_frame_monitor_begin() const {
+  return (BasicObjectLock*) addr_at(interpreter_frame_monitor_block_bottom_offset);
+}
+
+BasicObjectLock* frame::interpreter_frame_monitor_end() const {
+  BasicObjectLock* result = (BasicObjectLock*) *addr_at(interpreter_frame_monitor_block_top_offset);
+  // make sure the pointer points inside the frame
+  assert(sp() <= (intptr_t*) result, "monitor end should be above the stack pointer");
+  assert((intptr_t*) result < fp(),  "monitor end should be strictly below the frame pointer");
+  return result;
+}
+
+void frame::interpreter_frame_set_monitor_end(BasicObjectLock* value) {
+  *((BasicObjectLock**)addr_at(interpreter_frame_monitor_block_top_offset)) = value;
+}
+
+// Used by template based interpreter deoptimization
+void frame::interpreter_frame_set_last_sp(intptr_t* last_sp) {
+  *((intptr_t**)addr_at(interpreter_frame_last_sp_offset)) = last_sp;
+}
+
+frame frame::sender_for_entry_frame(RegisterMap* map) const {
+  assert(map != NULL, "map must be set");
+  // Java frame called from C; skip all C frames and return top C
+  // frame of that chunk as the sender
+  JavaFrameAnchor* jfa = entry_frame_call_wrapper()->anchor();
+  assert(!entry_frame_is_first(), "next Java fp must be non zero");
+  assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
+  // Since we are walking the stack now this nested anchor is obviously walkable
+  // even if it wasn't when it was stacked.
+  if (!jfa->walkable()) {
+    // Capture _last_Java_pc (if needed) and mark anchor walkable.
+    jfa->capture_last_Java_pc();
+  }
+  map->clear();
+  assert(map->include_argument_oops(), "should be set by clear");
+  vmassert(jfa->last_Java_pc() != NULL, "not walkable");
+  frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
+  return fr;
+}
+
+OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
+  ShouldNotCallThis();
+  return nullptr;
+}
+
+bool frame::optimized_entry_frame_is_first() const {
+  ShouldNotCallThis();
+  return false;
+}
+
+frame frame::sender_for_optimized_entry_frame(RegisterMap* map) const {
+  ShouldNotCallThis();
+  return {};
+}
+
+//------------------------------------------------------------------------------
+// frame::verify_deopt_original_pc
+//
+// Verifies the calculated original PC of a deoptimization PC for the
+// given unextended SP.
+#ifdef ASSERT
+void frame::verify_deopt_original_pc(CompiledMethod* nm, intptr_t* unextended_sp) {
+  frame fr;
+
+  // This is ugly but it's better than to change {get,set}_original_pc
+  // to take an SP value as argument.  And it's only a debugging
+  // method anyway.
+  fr._unextended_sp = unextended_sp;
+
+  assert_cond(nm != NULL);
+  address original_pc = nm->get_original_pc(&fr);
+  assert(nm->insts_contains_inclusive(original_pc),
+         "original PC must be in the main code section of the the compiled method (or must be immediately following it)");
+}
+#endif
+
+//------------------------------------------------------------------------------
+// frame::adjust_unextended_sp
+void frame::adjust_unextended_sp() {
+  // On riscv, sites calling method handle intrinsics and lambda forms are treated
+  // as any other call site. Therefore, no special action is needed when we are
+  // returning to any of these call sites.
+
+  if (_cb != NULL) {
+    CompiledMethod* sender_cm = _cb->as_compiled_method_or_null();
+    if (sender_cm != NULL) {
+      // If the sender PC is a deoptimization point, get the original PC.
+      if (sender_cm->is_deopt_entry(_pc) ||
+          sender_cm->is_deopt_mh_entry(_pc)) {
+        DEBUG_ONLY(verify_deopt_original_pc(sender_cm, _unextended_sp));
+      }
+    }
+  }
+}
+
+//------------------------------------------------------------------------------
+// frame::update_map_with_saved_link
+void frame::update_map_with_saved_link(RegisterMap* map, intptr_t** link_addr) {
+  // The interpreter and compiler(s) always save fp in a known
+  // location on entry. We must record where that location is
+  // so that if fp was live on callout from c2 we can find
+  // the saved copy no matter what it called.
+
+  // Since the interpreter always saves fp if we record where it is then
+  // we don't have to always save fp on entry and exit to c2 compiled
+  // code, on entry will be enough.
+  assert(map != NULL, "map must be set");
+  map->set_location(::fp->as_VMReg(), (address) link_addr);
+  // this is weird "H" ought to be at a higher address however the
+  // oopMaps seems to have the "H" regs at the same address and the
+  // vanilla register.
+  map->set_location(::fp->as_VMReg()->next(), (address) link_addr);
+}
+
+
+//------------------------------------------------------------------------------
+// frame::sender_for_interpreter_frame
+frame frame::sender_for_interpreter_frame(RegisterMap* map) const {
+  // SP is the raw SP from the sender after adapter or interpreter
+  // extension.
+  intptr_t* sender_sp = this->sender_sp();
+
+  // This is the sp before any possible extension (adapter/locals).
+  intptr_t* unextended_sp = interpreter_frame_sender_sp();
+
+#ifdef COMPILER2
+  assert(map != NULL, "map must be set");
+  if (map->update_map()) {
+    update_map_with_saved_link(map, (intptr_t**) addr_at(link_offset));
+  }
+#endif // COMPILER2
+
+  return frame(sender_sp, unextended_sp, link(), sender_pc());
+}
+
+
+//------------------------------------------------------------------------------
+// frame::sender_for_compiled_frame
+frame frame::sender_for_compiled_frame(RegisterMap* map) const {
+  // we cannot rely upon the last fp having been saved to the thread
+  // in C2 code but it will have been pushed onto the stack. so we
+  // have to find it relative to the unextended sp
+
+  assert(_cb->frame_size() >= 0, "must have non-zero frame size");
+  intptr_t* l_sender_sp = unextended_sp() + _cb->frame_size();
+  intptr_t* unextended_sp = l_sender_sp;
+
+  // the return_address is always the word on the stack
+  address sender_pc = (address) *(l_sender_sp + frame::return_addr_offset);
+
+  intptr_t** saved_fp_addr = (intptr_t**) (l_sender_sp + frame::link_offset);
+
+  assert(map != NULL, "map must be set");
+  if (map->update_map()) {
+    // Tell GC to use argument oopmaps for some runtime stubs that need it.
+    // For C1, the runtime stub might not have oop maps, so set this flag
+    // outside of update_register_map.
+    map->set_include_argument_oops(_cb->caller_must_gc_arguments(map->thread()));
+    if (_cb->oop_maps() != NULL) {
+      OopMapSet::update_register_map(this, map);
+    }
+
+    // Since the prolog does the save and restore of FP there is no
+    // oopmap for it so we must fill in its location as if there was
+    // an oopmap entry since if our caller was compiled code there
+    // could be live jvm state in it.
+    update_map_with_saved_link(map, saved_fp_addr);
+  }
+
+  return frame(l_sender_sp, unextended_sp, *saved_fp_addr, sender_pc);
+}
+
+//------------------------------------------------------------------------------
+// frame::sender_raw
+frame frame::sender_raw(RegisterMap* map) const {
+  // Default is we done have to follow them. The sender_for_xxx will
+  // update it accordingly
+  assert(map != NULL, "map must be set");
+  map->set_include_argument_oops(false);
+
+  if (is_entry_frame()) {
+    return sender_for_entry_frame(map);
+  }
+  if (is_interpreted_frame()) {
+    return sender_for_interpreter_frame(map);
+  }
+  assert(_cb == CodeCache::find_blob(pc()),"Must be the same");
+
+  // This test looks odd: why is it not is_compiled_frame() ?  That's
+  // because stubs also have OOP maps.
+  if (_cb != NULL) {
+    return sender_for_compiled_frame(map);
+  }
+
+  // Must be native-compiled frame, i.e. the marshaling code for native
+  // methods that exists in the core system.
+  return frame(sender_sp(), link(), sender_pc());
+}
+
+frame frame::sender(RegisterMap* map) const {
+  frame result = sender_raw(map);
+
+  if (map->process_frames()) {
+    StackWatermarkSet::on_iteration(map->thread(), result);
+  }
+
+  return result;
+}
+
+bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
+  assert(is_interpreted_frame(), "Not an interpreted frame");
+  // These are reasonable sanity checks
+  if (fp() == NULL || (intptr_t(fp()) & (wordSize-1)) != 0) {
+    return false;
+  }
+  if (sp() == NULL || (intptr_t(sp()) & (wordSize-1)) != 0) {
+    return false;
+  }
+  if (fp() + interpreter_frame_initial_sp_offset < sp()) {
+    return false;
+  }
+  // These are hacks to keep us out of trouble.
+  // The problem with these is that they mask other problems
+  if (fp() <= sp()) {        // this attempts to deal with unsigned comparison above
+    return false;
+  }
+
+  // do some validation of frame elements
+
+  // first the method
+  Method* m = *interpreter_frame_method_addr();
+  // validate the method we'd find in this potential sender
+  if (!Method::is_valid_method(m)) {
+    return false;
+  }
+
+  // stack frames shouldn't be much larger than max_stack elements
+  // this test requires the use of unextended_sp which is the sp as seen by
+  // the current frame, and not sp which is the "raw" pc which could point
+  // further because of local variables of the callee method inserted after
+  // method arguments
+  if (fp() - unextended_sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) {
+    return false;
+  }
+
+  // validate bci/bcx
+  address bcp = interpreter_frame_bcp();
+  if (m->validate_bci_from_bcp(bcp) < 0) {
+    return false;
+  }
+
+  // validate constantPoolCache*
+  ConstantPoolCache* cp = *interpreter_frame_cache_addr();
+  if (MetaspaceObj::is_valid(cp) == false) {
+    return false;
+  }
+
+  // validate locals
+  address locals = (address) *interpreter_frame_locals_addr();
+  if (locals > thread->stack_base() || locals < (address) fp()) {
+    return false;
+  }
+
+  // We'd have to be pretty unlucky to be mislead at this point
+  return true;
+}
+
+BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) {
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  Method* method = interpreter_frame_method();
+  BasicType type = method->result_type();
+
+  intptr_t* tos_addr = NULL;
+  if (method->is_native()) {
+    tos_addr = (intptr_t*)sp();
+    if (type == T_FLOAT || type == T_DOUBLE) {
+      // This is because we do a push(ltos) after push(dtos) in generate_native_entry.
+      tos_addr += 2 * Interpreter::stackElementWords;
+    }
+  } else {
+    tos_addr = (intptr_t*)interpreter_frame_tos_address();
+  }
+
+  switch (type) {
+    case T_OBJECT  :
+    case T_ARRAY   : {
+      oop obj;
+      if (method->is_native()) {
+        obj = cast_to_oop(at(interpreter_frame_oop_temp_offset));
+      } else {
+        oop* obj_p = (oop*)tos_addr;
+        obj = (obj_p == NULL) ? (oop)NULL : *obj_p;
+      }
+      assert(Universe::is_in_heap_or_null(obj), "sanity check");
+      *oop_result = obj;
+      break;
+    }
+    case T_BOOLEAN : value_result->z = *(jboolean*)tos_addr; break;
+    case T_BYTE    : value_result->b = *(jbyte*)tos_addr; break;
+    case T_CHAR    : value_result->c = *(jchar*)tos_addr; break;
+    case T_SHORT   : value_result->s = *(jshort*)tos_addr; break;
+    case T_INT     : value_result->i = *(jint*)tos_addr; break;
+    case T_LONG    : value_result->j = *(jlong*)tos_addr; break;
+    case T_FLOAT   : {
+        value_result->f = *(jfloat*)tos_addr;
+      break;
+    }
+    case T_DOUBLE  : value_result->d = *(jdouble*)tos_addr; break;
+    case T_VOID    : /* Nothing to do */ break;
+    default        : ShouldNotReachHere();
+  }
+
+  return type;
+}
+
+
+intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
+  int index = (Interpreter::expr_offset_in_bytes(offset)/wordSize);
+  return &interpreter_frame_tos_address()[index];
+}
+
+#ifndef PRODUCT
+
+#define DESCRIBE_FP_OFFSET(name) \
+  values.describe(frame_no, fp() + frame::name##_offset, #name)
+
+void frame::describe_pd(FrameValues& values, int frame_no) {
+  if (is_interpreted_frame()) {
+    DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp);
+    DESCRIBE_FP_OFFSET(interpreter_frame_last_sp);
+    DESCRIBE_FP_OFFSET(interpreter_frame_method);
+    DESCRIBE_FP_OFFSET(interpreter_frame_mdp);
+    DESCRIBE_FP_OFFSET(interpreter_frame_mirror);
+    DESCRIBE_FP_OFFSET(interpreter_frame_cache);
+    DESCRIBE_FP_OFFSET(interpreter_frame_locals);
+    DESCRIBE_FP_OFFSET(interpreter_frame_bcp);
+    DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp);
+  }
+}
+#endif
+
+intptr_t *frame::initial_deoptimization_info() {
+  // Not used on riscv, but we must return something.
+  return NULL;
+}
+
+intptr_t* frame::real_fp() const {
+  if (_cb != NULL) {
+    // use the frame size if valid
+    int size = _cb->frame_size();
+    if (size > 0) {
+      return unextended_sp() + size;
+    }
+  }
+  // else rely on fp()
+  assert(!is_compiled_frame(), "unknown compiled frame size");
+  return fp();
+}
+
+#undef DESCRIBE_FP_OFFSET
+
+#ifndef PRODUCT
+// This is a generic constructor which is only used by pns() in debug.cpp.
+frame::frame(void* ptr_sp, void* ptr_fp, void* pc) {
+  init((intptr_t*)ptr_sp, (intptr_t*)ptr_fp, (address)pc);
+}
+
+#endif
+
+void JavaFrameAnchor::make_walkable(JavaThread* thread) {
+  // last frame set?
+  if (last_Java_sp() == NULL) { return; }
+  // already walkable?
+  if (walkable()) { return; }
+  vmassert(Thread::current() == (Thread*)thread, "not current thread");
+  vmassert(last_Java_sp() != NULL, "not called from Java code?");
+  vmassert(last_Java_pc() == NULL, "already walkable");
+  capture_last_Java_pc();
+  vmassert(walkable(), "something went wrong");
+}
+
+void JavaFrameAnchor::capture_last_Java_pc() {
+  vmassert(_last_Java_sp != NULL, "no last frame set");
+  vmassert(_last_Java_pc == NULL, "already walkable");
+  _last_Java_pc = (address)_last_Java_sp[-1];
+}
diff --git a/src/hotspot/cpu/riscv/frame_riscv.hpp b/src/hotspot/cpu/riscv/frame_riscv.hpp
new file mode 100644
index 00000000000..c06aaa9e391
--- /dev/null
+++ b/src/hotspot/cpu/riscv/frame_riscv.hpp
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_FRAME_RISCV_HPP
+#define CPU_RISCV_FRAME_RISCV_HPP
+
+#include "runtime/synchronizer.hpp"
+
+// A frame represents a physical stack frame (an activation).  Frames can be
+// C or Java frames, and the Java frames can be interpreted or compiled.
+// In contrast, vframes represent source-level activations, so that one physical frame
+// can correspond to multiple source level frames because of inlining.
+// A frame is comprised of {pc, fp, sp}
+// ------------------------------ Asm interpreter ----------------------------------------
+// Layout of asm interpreter frame:
+//    [expression stack      ] * <- sp
+
+//    [monitors[0]           ]   \
+//     ...                        | monitor block size = k
+//    [monitors[k-1]         ]   /
+//    [frame initial esp     ] ( == &monitors[0], initially here)       initial_sp_offset
+//    [byte code index/pointr]                   = bcx()                bcx_offset
+
+//    [pointer to locals     ]                   = locals()             locals_offset
+//    [constant pool cache   ]                   = cache()              cache_offset
+
+//    [klass of method       ]                   = mirror()             mirror_offset
+//    [padding               ]
+
+//    [methodData            ]                   = mdp()                mdx_offset
+//    [Method                ]                   = method()             method_offset
+
+//    [last esp              ]                   = last_sp()            last_sp_offset
+//    [old stack pointer     ]                     (sender_sp)          sender_sp_offset
+
+//    [old frame pointer     ]
+//    [return pc             ]
+
+//    [last sp               ]   <- fp           = link()
+//    [oop temp              ]                     (only for native calls)
+
+//    [padding               ]                     (to preserve machine SP alignment)
+//    [locals and parameters ]
+//                               <- sender sp
+// ------------------------------ Asm interpreter ----------------------------------------
+
+// ------------------------------ C Frame ------------------------------------------------
+// Stack: gcc with -fno-omit-frame-pointer
+//                    .
+//                    .
+//       +->          .
+//       |   +-----------------+   |
+//       |   | return address  |   |
+//       |   |   previous fp ------+
+//       |   | saved registers |
+//       |   | local variables |
+//       |   |       ...       | <-+
+//       |   +-----------------+   |
+//       |   | return address  |   |
+//       +------ previous fp   |   |
+//           | saved registers |   |
+//           | local variables |   |
+//       +-> |       ...       |   |
+//       |   +-----------------+   |
+//       |   | return address  |   |
+//       |   |   previous fp ------+
+//       |   | saved registers |
+//       |   | local variables |
+//       |   |       ...       | <-+
+//       |   +-----------------+   |
+//       |   | return address  |   |
+//       +------ previous fp   |   |
+//           | saved registers |   |
+//           | local variables |   |
+//   $fp --> |       ...       |   |
+//           +-----------------+   |
+//           | return address  |   |
+//           |   previous fp ------+
+//           | saved registers |
+//   $sp --> | local variables |
+//           +-----------------+
+// ------------------------------ C Frame ------------------------------------------------
+
+ public:
+  enum {
+    pc_return_offset                                 =  0,
+    // All frames
+    link_offset                                      = -2,
+    return_addr_offset                               = -1,
+    sender_sp_offset                                 =  0,
+    // Interpreter frames
+    interpreter_frame_oop_temp_offset                =  1, // for native calls only
+
+    interpreter_frame_sender_sp_offset               = -3,
+    // outgoing sp before a call to an invoked method
+    interpreter_frame_last_sp_offset                 = interpreter_frame_sender_sp_offset - 1,
+    interpreter_frame_method_offset                  = interpreter_frame_last_sp_offset - 1,
+    interpreter_frame_mdp_offset                     = interpreter_frame_method_offset - 1,
+    interpreter_frame_padding_offset                 = interpreter_frame_mdp_offset - 1,
+    interpreter_frame_mirror_offset                  = interpreter_frame_padding_offset - 1,
+    interpreter_frame_cache_offset                   = interpreter_frame_mirror_offset - 1,
+    interpreter_frame_locals_offset                  = interpreter_frame_cache_offset - 1,
+    interpreter_frame_bcp_offset                     = interpreter_frame_locals_offset - 1,
+    interpreter_frame_initial_sp_offset              = interpreter_frame_bcp_offset - 1,
+
+    interpreter_frame_monitor_block_top_offset       = interpreter_frame_initial_sp_offset,
+    interpreter_frame_monitor_block_bottom_offset    = interpreter_frame_initial_sp_offset,
+
+    // Entry frames
+    // n.b. these values are determined by the layout defined in
+    // stubGenerator for the Java call stub
+    entry_frame_after_call_words                     =  22,
+    entry_frame_call_wrapper_offset                  = -10,
+
+    // we don't need a save area
+    arg_reg_save_area_bytes                          =  0
+  };
+
+  intptr_t ptr_at(int offset) const {
+    return *ptr_at_addr(offset);
+  }
+
+  void ptr_at_put(int offset, intptr_t value) {
+    *ptr_at_addr(offset) = value;
+  }
+
+ private:
+  // an additional field beyond _sp and _pc:
+  intptr_t*   _fp; // frame pointer
+  // The interpreter and adapters will extend the frame of the caller.
+  // Since oopMaps are based on the sp of the caller before extension
+  // we need to know that value. However in order to compute the address
+  // of the return address we need the real "raw" sp. Since sparc already
+  // uses sp() to mean "raw" sp and unextended_sp() to mean the caller's
+  // original sp we use that convention.
+
+  intptr_t*     _unextended_sp;
+  void adjust_unextended_sp();
+
+  intptr_t* ptr_at_addr(int offset) const {
+    return (intptr_t*) addr_at(offset);
+  }
+
+#ifdef ASSERT
+  // Used in frame::sender_for_{interpreter,compiled}_frame
+  static void verify_deopt_original_pc(   CompiledMethod* nm, intptr_t* unextended_sp);
+#endif
+
+ public:
+  // Constructors
+
+  frame(intptr_t* ptr_sp, intptr_t* ptr_fp, address pc);
+
+  frame(intptr_t* ptr_sp, intptr_t* unextended_sp, intptr_t* ptr_fp, address pc);
+
+  frame(intptr_t* ptr_sp, intptr_t* ptr_fp);
+
+  void init(intptr_t* ptr_sp, intptr_t* ptr_fp, address pc);
+
+  // accessors for the instance variables
+  // Note: not necessarily the real 'frame pointer' (see real_fp)
+  intptr_t*   fp() const { return _fp; }
+
+  inline address* sender_pc_addr() const;
+
+  // expression stack tos if we are nested in a java call
+  intptr_t* interpreter_frame_last_sp() const;
+
+  // helper to update a map with callee-saved RBP
+  static void update_map_with_saved_link(RegisterMap* map, intptr_t** link_addr);
+
+  // deoptimization support
+  void interpreter_frame_set_last_sp(intptr_t* last_sp);
+
+  static jint interpreter_frame_expression_stack_direction() { return -1; }
+
+  // returns the sending frame, without applying any barriers
+  frame sender_raw(RegisterMap* map) const;
+
+#endif // CPU_RISCV_FRAME_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/frame_riscv.inline.hpp b/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
new file mode 100644
index 00000000000..5ac1bf57f57
--- /dev/null
+++ b/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_FRAME_RISCV_INLINE_HPP
+#define CPU_RISCV_FRAME_RISCV_INLINE_HPP
+
+#include "code/codeCache.hpp"
+#include "code/vmreg.inline.hpp"
+
+// Inline functions for RISCV frames:
+
+// Constructors:
+
+inline frame::frame() {
+  _pc = NULL;
+  _sp = NULL;
+  _unextended_sp = NULL;
+  _fp = NULL;
+  _cb = NULL;
+  _deopt_state = unknown;
+}
+
+static int spin;
+
+inline void frame::init(intptr_t* ptr_sp, intptr_t* ptr_fp, address pc) {
+  intptr_t a = intptr_t(ptr_sp);
+  intptr_t b = intptr_t(ptr_fp);
+  _sp = ptr_sp;
+  _unextended_sp = ptr_sp;
+  _fp = ptr_fp;
+  _pc = pc;
+  assert(pc != NULL, "no pc?");
+  _cb = CodeCache::find_blob(pc);
+  adjust_unextended_sp();
+
+  address original_pc = CompiledMethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    _pc = original_pc;
+    _deopt_state = is_deoptimized;
+  } else {
+    _deopt_state = not_deoptimized;
+  }
+}
+
+inline frame::frame(intptr_t* ptr_sp, intptr_t* ptr_fp, address pc) {
+  init(ptr_sp, ptr_fp, pc);
+}
+
+inline frame::frame(intptr_t* ptr_sp, intptr_t* unextended_sp, intptr_t* ptr_fp, address pc) {
+  intptr_t a = intptr_t(ptr_sp);
+  intptr_t b = intptr_t(ptr_fp);
+  _sp = ptr_sp;
+  _unextended_sp = unextended_sp;
+  _fp = ptr_fp;
+  _pc = pc;
+  assert(pc != NULL, "no pc?");
+  _cb = CodeCache::find_blob(pc);
+  adjust_unextended_sp();
+
+  address original_pc = CompiledMethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    _pc = original_pc;
+    assert(_cb->as_compiled_method()->insts_contains_inclusive(_pc),
+           "original PC must be in the main code section of the the compiled method (or must be immediately following it)");
+    _deopt_state = is_deoptimized;
+  } else {
+    _deopt_state = not_deoptimized;
+  }
+}
+
+inline frame::frame(intptr_t* ptr_sp, intptr_t* ptr_fp) {
+  intptr_t a = intptr_t(ptr_sp);
+  intptr_t b = intptr_t(ptr_fp);
+  _sp = ptr_sp;
+  _unextended_sp = ptr_sp;
+  _fp = ptr_fp;
+  _pc = (address)(ptr_sp[-1]);
+
+  // Here's a sticky one. This constructor can be called via AsyncGetCallTrace
+  // when last_Java_sp is non-null but the pc fetched is junk. If we are truly
+  // unlucky the junk value could be to a zombied method and we'll die on the
+  // find_blob call. This is also why we can have no asserts on the validity
+  // of the pc we find here. AsyncGetCallTrace -> pd_get_top_frame_for_signal_handler
+  // -> pd_last_frame should use a specialized version of pd_last_frame which could
+  // call a specilaized frame constructor instead of this one.
+  // Then we could use the assert below. However this assert is of somewhat dubious
+  // value.
+
+  _cb = CodeCache::find_blob(_pc);
+  adjust_unextended_sp();
+
+  address original_pc = CompiledMethod::get_deopt_original_pc(this);
+  if (original_pc != NULL) {
+    _pc = original_pc;
+    _deopt_state = is_deoptimized;
+  } else {
+    _deopt_state = not_deoptimized;
+  }
+}
+
+// Accessors
+
+inline bool frame::equal(frame other) const {
+  bool ret =  sp() == other.sp() &&
+              unextended_sp() == other.unextended_sp() &&
+              fp() == other.fp() &&
+              pc() == other.pc();
+  assert(!ret || ret && cb() == other.cb() && _deopt_state == other._deopt_state, "inconsistent construction");
+  return ret;
+}
+
+// Return unique id for this frame. The id must have a value where we can distinguish
+// identity and younger/older relationship. NULL represents an invalid (incomparable)
+// frame.
+inline intptr_t* frame::id(void) const { return unextended_sp(); }
+
+// Return true if the frame is older (less recent activation) than the frame represented by id
+inline bool frame::is_older(intptr_t* id) const   { assert(this->id() != NULL && id != NULL, "NULL frame id");
+                                                    return this->id() > id ; }
+
+inline intptr_t* frame::link() const              { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
+
+inline intptr_t* frame::link_or_null() const {
+  intptr_t** ptr = (intptr_t **)addr_at(link_offset);
+  return os::is_readable_pointer(ptr) ? *ptr : NULL;
+}
+
+inline intptr_t* frame::unextended_sp() const     { return _unextended_sp; }
+
+// Return address
+inline address* frame::sender_pc_addr() const     { return (address*) addr_at(return_addr_offset); }
+inline address  frame::sender_pc() const          { return *sender_pc_addr(); }
+inline intptr_t* frame::sender_sp() const         { return addr_at(sender_sp_offset); }
+
+inline intptr_t** frame::interpreter_frame_locals_addr() const {
+  return (intptr_t**)addr_at(interpreter_frame_locals_offset);
+}
+
+inline intptr_t* frame::interpreter_frame_last_sp() const {
+  return *(intptr_t**)addr_at(interpreter_frame_last_sp_offset);
+}
+
+inline intptr_t* frame::interpreter_frame_bcp_addr() const {
+  return (intptr_t*)addr_at(interpreter_frame_bcp_offset);
+}
+
+inline intptr_t* frame::interpreter_frame_mdp_addr() const {
+  return (intptr_t*)addr_at(interpreter_frame_mdp_offset);
+}
+
+
+// Constant pool cache
+
+inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const {
+  return (ConstantPoolCache**)addr_at(interpreter_frame_cache_offset);
+}
+
+// Method
+
+inline Method** frame::interpreter_frame_method_addr() const {
+  return (Method**)addr_at(interpreter_frame_method_offset);
+}
+
+// Mirror
+
+inline oop* frame::interpreter_frame_mirror_addr() const {
+  return (oop*)addr_at(interpreter_frame_mirror_offset);
+}
+
+// top of expression stack
+inline intptr_t* frame::interpreter_frame_tos_address() const {
+  intptr_t* last_sp = interpreter_frame_last_sp();
+  if (last_sp == NULL) {
+    return sp();
+  } else {
+    // sp() may have been extended or shrunk by an adapter.  At least
+    // check that we don't fall behind the legal region.
+    // For top deoptimized frame last_sp == interpreter_frame_monitor_end.
+    assert(last_sp <= (intptr_t*) interpreter_frame_monitor_end(), "bad tos");
+    return last_sp;
+  }
+}
+
+inline oop* frame::interpreter_frame_temp_oop_addr() const {
+  return (oop *)(fp() + interpreter_frame_oop_temp_offset);
+}
+
+inline int frame::interpreter_frame_monitor_size() {
+  return BasicObjectLock::size();
+}
+
+
+// expression stack
+// (the max_stack arguments are used by the GC; see class FrameClosure)
+
+inline intptr_t* frame::interpreter_frame_expression_stack() const {
+  intptr_t* monitor_end = (intptr_t*) interpreter_frame_monitor_end();
+  return monitor_end-1;
+}
+
+
+// Entry frames
+
+inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const {
+ return (JavaCallWrapper**)addr_at(entry_frame_call_wrapper_offset);
+}
+
+
+// Compiled frames
+PRAGMA_DIAG_PUSH
+PRAGMA_NONNULL_IGNORED
+inline oop frame::saved_oop_result(RegisterMap* map) const {
+  oop* result_adr = (oop *)map->location(x10->as_VMReg());
+  guarantee(result_adr != NULL, "bad register save location");
+  return (*result_adr);
+}
+
+inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
+  oop* result_adr = (oop *)map->location(x10->as_VMReg());
+  guarantee(result_adr != NULL, "bad register save location");
+  *result_adr = obj;
+}
+PRAGMA_DIAG_POP
+
+#endif // CPU_RISCV_FRAME_RISCV_INLINE_HPP
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
new file mode 100644
index 00000000000..1c46b3947d3
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp
@@ -0,0 +1,484 @@
+/*
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/g1/g1BarrierSet.hpp"
+#include "gc/g1/g1BarrierSetAssembler.hpp"
+#include "gc/g1/g1BarrierSetRuntime.hpp"
+#include "gc/g1/g1CardTable.hpp"
+#include "gc/g1/g1ThreadLocalData.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "interpreter/interp_masm.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/thread.hpp"
+#ifdef COMPILER1
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "gc/g1/c1/g1BarrierSetC1.hpp"
+#endif
+
+#define __ masm->
+
+void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                                            Register addr, Register count, RegSet saved_regs) {
+  assert_cond(masm != NULL);
+  bool dest_uninitialized = (decorators & IS_DEST_UNINITIALIZED) != 0;
+  if (!dest_uninitialized) {
+    Label done;
+    Address in_progress(xthread, in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset()));
+
+    // Is marking active?
+    if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
+      __ lwu(t0, in_progress);
+    } else {
+      assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
+      __ lbu(t0, in_progress);
+    }
+    __ beqz(t0, done);
+
+    __ push_reg(saved_regs, sp);
+    if (count == c_rarg0) {
+      if (addr == c_rarg1) {
+        // exactly backwards!!
+        __ mv(t0, c_rarg0);
+        __ mv(c_rarg0, c_rarg1);
+        __ mv(c_rarg1, t0);
+      } else {
+        __ mv(c_rarg1, count);
+        __ mv(c_rarg0, addr);
+      }
+    } else {
+      __ mv(c_rarg0, addr);
+      __ mv(c_rarg1, count);
+    }
+    if (UseCompressedOops) {
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_narrow_oop_entry), 2);
+    } else {
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_pre_oop_entry), 2);
+    }
+    __ pop_reg(saved_regs, sp);
+
+    __ bind(done);
+  }
+}
+
+void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                                             Register start, Register count, Register tmp, RegSet saved_regs) {
+  assert_cond(masm != NULL);
+  __ push_reg(saved_regs, sp);
+  assert_different_registers(start, count, tmp);
+  assert_different_registers(c_rarg0, count);
+  __ mv(c_rarg0, start);
+  __ mv(c_rarg1, count);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_array_post_entry), 2);
+  __ pop_reg(saved_regs, sp);
+}
+
+void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
+                                                 Register obj,
+                                                 Register pre_val,
+                                                 Register thread,
+                                                 Register tmp,
+                                                 bool tosca_live,
+                                                 bool expand_call) {
+  // If expand_call is true then we expand the call_VM_leaf macro
+  // directly to skip generating the check by
+  // InterpreterMacroAssembler::call_VM_leaf_base that checks _last_sp.
+
+  assert_cond(masm != NULL);
+  assert(thread == xthread, "must be");
+
+  Label done;
+  Label runtime;
+
+  assert_different_registers(obj, pre_val, tmp, t0);
+  assert(pre_val != noreg &&  tmp != noreg, "expecting a register");
+
+  Address in_progress(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset()));
+  Address index(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_index_offset()));
+  Address buffer(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_buffer_offset()));
+
+  // Is marking active?
+  if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) { // 4-byte width
+    __ lwu(tmp, in_progress);
+  } else {
+    assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
+    __ lbu(tmp, in_progress);
+  }
+  __ beqz(tmp, done);
+
+  // Do we need to load the previous value?
+  if (obj != noreg) {
+    __ load_heap_oop(pre_val, Address(obj, 0), noreg, noreg, AS_RAW);
+  }
+
+  // Is the previous value null?
+  __ beqz(pre_val, done);
+
+  // Can we store original value in the thread's buffer?
+  // Is index == 0?
+  // (The index field is typed as size_t.)
+
+  __ ld(tmp, index);                       // tmp := *index_adr
+  __ beqz(tmp, runtime);                   // tmp == 0?
+                                           // If yes, goto runtime
+
+  __ sub(tmp, tmp, wordSize);              // tmp := tmp - wordSize
+  __ sd(tmp, index);                       // *index_adr := tmp
+  __ ld(t0, buffer);
+  __ add(tmp, tmp, t0);                    // tmp := tmp + *buffer_adr
+
+  // Record the previous value
+  __ sd(pre_val, Address(tmp, 0));
+  __ j(done);
+
+  __ bind(runtime);
+  // save the live input values
+  RegSet saved = RegSet::of(pre_val);
+  if (tosca_live) { saved += RegSet::of(x10); }
+  if (obj != noreg) { saved += RegSet::of(obj); }
+
+  __ push_reg(saved, sp);
+
+  if (expand_call) {
+    assert(pre_val != c_rarg1, "smashed arg");
+    __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, thread);
+  } else {
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, thread);
+  }
+
+  __ pop_reg(saved, sp);
+
+  __ bind(done);
+
+}
+
+void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
+                                                  Register store_addr,
+                                                  Register new_val,
+                                                  Register thread,
+                                                  Register tmp,
+                                                  Register tmp2) {
+  assert_cond(masm != NULL);
+  assert(thread == xthread, "must be");
+  assert_different_registers(store_addr, new_val, thread, tmp, tmp2,
+                             t0);
+  assert(store_addr != noreg && new_val != noreg && tmp != noreg &&
+         tmp2 != noreg, "expecting a register");
+
+  Address queue_index(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset()));
+  Address buffer(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
+
+  BarrierSet* bs = BarrierSet::barrier_set();
+  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
+  CardTable* ct = ctbs->card_table();
+
+  Label done;
+  Label runtime;
+
+  // Does store cross heap regions?
+
+  __ xorr(tmp, store_addr, new_val);
+  __ srli(tmp, tmp, HeapRegion::LogOfHRGrainBytes);
+  __ beqz(tmp, done);
+
+  // crosses regions, storing NULL?
+
+  __ beqz(new_val, done);
+
+  // storing region crossing non-NULL, is card already dirty?
+
+  ExternalAddress cardtable((address) ct->byte_map_base());
+  const Register card_addr = tmp;
+
+  __ srli(card_addr, store_addr, CardTable::card_shift());
+
+  // get the address of the card
+  __ load_byte_map_base(tmp2);
+  __ add(card_addr, card_addr, tmp2);
+  __ lbu(tmp2, Address(card_addr));
+  __ mv(t0, (int)G1CardTable::g1_young_card_val());
+  __ beq(tmp2, t0, done);
+
+  assert((int)CardTable::dirty_card_val() == 0, "must be 0");
+
+  __ membar(MacroAssembler::StoreLoad);
+
+  __ lbu(tmp2, Address(card_addr));
+  __ beqz(tmp2, done);
+
+  // storing a region crossing, non-NULL oop, card is clean.
+  // dirty card and log.
+
+  __ sb(zr, Address(card_addr));
+
+  __ ld(t0, queue_index);
+  __ beqz(t0, runtime);
+  __ sub(t0, t0, wordSize);
+  __ sd(t0, queue_index);
+
+  __ ld(tmp2, buffer);
+  __ add(t0, tmp2, t0);
+  __ sd(card_addr, Address(t0, 0));
+  __ j(done);
+
+  __ bind(runtime);
+  // save the live input values
+  RegSet saved = RegSet::of(store_addr);
+  __ push_reg(saved, sp);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, thread);
+  __ pop_reg(saved, sp);
+
+  __ bind(done);
+}
+
+void G1BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                    Register dst, Address src, Register tmp1, Register tmp_thread) {
+  assert_cond(masm != NULL);
+  bool on_oop = is_reference_type(type);
+  bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0;
+  bool on_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0;
+  bool on_reference = on_weak || on_phantom;
+  ModRefBarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread);
+  if (on_oop && on_reference) {
+    // RA is live.  It must be saved around calls.
+    __ enter(); // barrier may call runtime
+    // Generate the G1 pre-barrier code to log the value of
+    // the referent field in an SATB buffer.
+    g1_write_barrier_pre(masm /* masm */,
+                         noreg /* obj */,
+                         dst /* pre_val */,
+                         xthread /* thread */,
+                         tmp1 /* tmp */,
+                         true /* tosca_live */,
+                         true /* expand_call */);
+    __ leave();
+  }
+}
+
+void G1BarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                         Address dst, Register val, Register tmp1, Register tmp2) {
+  assert_cond(masm != NULL);
+  // flatten object address if needed
+  if (dst.offset() == 0) {
+    if (dst.base() != x13) {
+      __ mv(x13, dst.base());
+    }
+  } else {
+    __ la(x13, dst);
+  }
+
+  g1_write_barrier_pre(masm,
+                       x13 /* obj */,
+                       tmp2 /* pre_val */,
+                       xthread /* thread */,
+                       tmp1  /* tmp */,
+                       val != noreg /* tosca_live */,
+                       false /* expand_call */);
+
+  if (val == noreg) {
+    BarrierSetAssembler::store_at(masm, decorators, type, Address(x13, 0), noreg, noreg, noreg);
+  } else {
+    // G1 barrier needs uncompressed oop for region cross check.
+    Register new_val = val;
+    if (UseCompressedOops) {
+      new_val = t1;
+      __ mv(new_val, val);
+    }
+    BarrierSetAssembler::store_at(masm, decorators, type, Address(x13, 0), val, noreg, noreg);
+    g1_write_barrier_post(masm,
+                          x13 /* store_adr */,
+                          new_val /* new_val */,
+                          xthread /* thread */,
+                          tmp1 /* tmp */,
+                          tmp2 /* tmp2 */);
+  }
+}
+
+#ifdef COMPILER1
+
+#undef __
+#define __ ce->masm()->
+
+void G1BarrierSetAssembler::gen_pre_barrier_stub(LIR_Assembler* ce, G1PreBarrierStub* stub) {
+  G1BarrierSetC1* bs = (G1BarrierSetC1*)BarrierSet::barrier_set()->barrier_set_c1();
+
+  // At this point we know that marking is in progress.
+  // If do_load() is true then we have to emit the
+  // load of the previous value; otherwise it has already
+  // been loaded into _pre_val.
+  __ bind(*stub->entry());
+
+  assert(stub->pre_val()->is_register(), "Precondition.");
+
+  Register pre_val_reg = stub->pre_val()->as_register();
+
+  if (stub->do_load()) {
+    ce->mem2reg(stub->addr(), stub->pre_val(), T_OBJECT, stub->patch_code(), stub->info(), false /* wide */);
+  }
+  __ beqz(pre_val_reg, *stub->continuation(), /* is_far */ true);
+  ce->store_parameter(stub->pre_val()->as_register(), 0);
+  __ far_call(RuntimeAddress(bs->pre_barrier_c1_runtime_code_blob()->code_begin()));
+  __ j(*stub->continuation());
+}
+
+void G1BarrierSetAssembler::gen_post_barrier_stub(LIR_Assembler* ce, G1PostBarrierStub* stub) {
+  G1BarrierSetC1* bs = (G1BarrierSetC1*)BarrierSet::barrier_set()->barrier_set_c1();
+  __ bind(*stub->entry());
+  assert(stub->addr()->is_register(), "Precondition");
+  assert(stub->new_val()->is_register(), "Precondition");
+  Register new_val_reg = stub->new_val()->as_register();
+  __ beqz(new_val_reg, *stub->continuation(), /* is_far */ true);
+  ce->store_parameter(stub->addr()->as_pointer_register(), 0);
+  __ far_call(RuntimeAddress(bs->post_barrier_c1_runtime_code_blob()->code_begin()));
+  __ j(*stub->continuation());
+}
+
+#undef __
+
+#define __ sasm->
+
+void G1BarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler* sasm) {
+  __ prologue("g1_pre_barrier", false);
+
+  BarrierSet* bs = BarrierSet::barrier_set();
+
+  // arg0 : previous value of memory
+  const Register pre_val = x10;
+  const Register thread = xthread;
+  const Register tmp = t0;
+
+  Address in_progress(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset()));
+  Address queue_index(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_index_offset()));
+  Address buffer(thread, in_bytes(G1ThreadLocalData::satb_mark_queue_buffer_offset()));
+
+  Label done;
+  Label runtime;
+
+  // Is marking still active?
+  if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {  // 4-byte width
+    __ lwu(tmp, in_progress);
+  } else {
+    assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
+    __ lbu(tmp, in_progress);
+  }
+  __ beqz(tmp, done);
+
+  // Can we store original value in the thread's buffer?
+  __ ld(tmp, queue_index);
+  __ beqz(tmp, runtime);
+
+  __ sub(tmp, tmp, wordSize);
+  __ sd(tmp, queue_index);
+  __ ld(t1, buffer);
+  __ add(tmp, tmp, t1);
+  __ load_parameter(0, t1);
+  __ sd(t1, Address(tmp, 0));
+  __ j(done);
+
+  __ bind(runtime);
+  __ push_call_clobbered_registers();
+  __ load_parameter(0, pre_val);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_pre_entry), pre_val, thread);
+  __ pop_call_clobbered_registers();
+  __ bind(done);
+
+  __ epilogue();
+}
+
+void G1BarrierSetAssembler::generate_c1_post_barrier_runtime_stub(StubAssembler* sasm) {
+  __ prologue("g1_post_barrier", false);
+
+  // arg0 : store_address
+  Address store_addr(fp, 2 * BytesPerWord); // 2 BytesPerWord from fp
+
+  BarrierSet* bs = BarrierSet::barrier_set();
+  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
+  CardTable* ct = ctbs->card_table();
+
+  Label done;
+  Label runtime;
+
+  // At this point we know new_value is non-NULL and the new_value crosses regions.
+  // Must check to see if card is already dirty
+  const Register thread = xthread;
+
+  Address queue_index(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset()));
+  Address buffer(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
+
+  const Register card_offset = t1;
+  // RA is free here, so we can use it to hold the byte_map_base.
+  const Register byte_map_base = ra;
+
+  assert_different_registers(card_offset, byte_map_base, t0);
+
+  __ load_parameter(0, card_offset);
+  __ srli(card_offset, card_offset, CardTable::card_shift());
+  __ load_byte_map_base(byte_map_base);
+
+  // Convert card offset into an address in card_addr
+  Register card_addr = card_offset;
+  __ add(card_addr, byte_map_base, card_addr);
+
+  __ lbu(t0, Address(card_addr, 0));
+  __ sub(t0, t0, (int)G1CardTable::g1_young_card_val());
+  __ beqz(t0, done);
+
+  assert((int)CardTable::dirty_card_val() == 0, "must be 0");
+
+  __ membar(MacroAssembler::StoreLoad);
+  __ lbu(t0, Address(card_addr, 0));
+  __ beqz(t0, done);
+
+  // storing region crossing non-NULL, card is clean.
+  // dirty card and log.
+  __ sb(zr, Address(card_addr, 0));
+
+  __ ld(t0, queue_index);
+  __ beqz(t0, runtime);
+  __ sub(t0, t0, wordSize);
+  __ sd(t0, queue_index);
+
+  // Reuse RA to hold buffer_addr
+  const Register buffer_addr = ra;
+
+  __ ld(buffer_addr, buffer);
+  __ add(t0, buffer_addr, t0);
+  __ sd(card_addr, Address(t0, 0));
+  __ j(done);
+
+  __ bind(runtime);
+  __ push_call_clobbered_registers();
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1BarrierSetRuntime::write_ref_field_post_entry), card_addr, thread);
+  __ pop_call_clobbered_registers();
+  __ bind(done);
+  __ epilogue();
+}
+
+#undef __
+
+#endif // COMPILER1
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
new file mode 100644
index 00000000000..37bc183f39c
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.hpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GC_G1_G1BARRIERSETASSEMBLER_RISCV_HPP
+#define CPU_RISCV_GC_G1_G1BARRIERSETASSEMBLER_RISCV_HPP
+
+#include "asm/macroAssembler.hpp"
+#include "gc/shared/modRefBarrierSetAssembler.hpp"
+#include "utilities/macros.hpp"
+
+#ifdef COMPILER1
+class LIR_Assembler;
+#endif
+class StubAssembler;
+class G1PreBarrierStub;
+class G1PostBarrierStub;
+
+class G1BarrierSetAssembler: public ModRefBarrierSetAssembler {
+protected:
+  void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                       Register addr, Register count, RegSet saved_regs);
+  void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                        Register start, Register count, Register tmp, RegSet saved_regs);
+
+  void g1_write_barrier_pre(MacroAssembler* masm,
+                            Register obj,
+                            Register pre_val,
+                            Register thread,
+                            Register tmp,
+                            bool tosca_live,
+                            bool expand_call);
+
+  void g1_write_barrier_post(MacroAssembler* masm,
+                             Register store_addr,
+                             Register new_val,
+                             Register thread,
+                             Register tmp,
+                             Register tmp2);
+
+  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                            Address dst, Register val, Register tmp1, Register tmp2);
+
+public:
+#ifdef COMPILER1
+  void gen_pre_barrier_stub(LIR_Assembler* ce, G1PreBarrierStub* stub);
+  void gen_post_barrier_stub(LIR_Assembler* ce, G1PostBarrierStub* stub);
+
+  void generate_c1_pre_barrier_runtime_stub(StubAssembler* sasm);
+  void generate_c1_post_barrier_runtime_stub(StubAssembler* sasm);
+#endif
+
+  void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+               Register dst, Address src, Register tmp1, Register tmp_thread);
+};
+
+#endif // CPU_RISCV_GC_G1_G1BARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/g1/g1Globals_riscv.hpp b/src/hotspot/cpu/riscv/gc/g1/g1Globals_riscv.hpp
new file mode 100644
index 00000000000..8735fd014ff
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/g1/g1Globals_riscv.hpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GC_G1_G1GLOBALS_RISCV_HPP
+#define CPU_RISCV_GC_G1_G1GLOBALS_RISCV_HPP
+
+const size_t G1MergeHeapRootsPrefetchCacheSize = 16;
+
+#endif // CPU_RISCV_GC_G1_G1GLOBALS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
new file mode 100644
index 00000000000..3c115a2ea02
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "classfile/classLoaderData.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/barrierSetNMethod.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "interpreter/interp_masm.hpp"
+#include "memory/universe.hpp"
+#include "runtime/jniHandles.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/thread.hpp"
+
+#define __ masm->
+
+void BarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                  Register dst, Address src, Register tmp1, Register tmp_thread) {
+  assert_cond(masm != NULL);
+
+  // RA is live. It must be saved around calls.
+
+  bool in_heap = (decorators & IN_HEAP) != 0;
+  bool in_native = (decorators & IN_NATIVE) != 0;
+  bool is_not_null = (decorators & IS_NOT_NULL) != 0;
+  switch (type) {
+    case T_OBJECT:  // fall through
+    case T_ARRAY: {
+      if (in_heap) {
+        if (UseCompressedOops) {
+          __ lwu(dst, src);
+          if (is_not_null) {
+            __ decode_heap_oop_not_null(dst);
+          } else {
+            __ decode_heap_oop(dst);
+          }
+        } else {
+          __ ld(dst, src);
+        }
+      } else {
+        assert(in_native, "why else?");
+        __ ld(dst, src);
+      }
+      break;
+    }
+    case T_BOOLEAN: __ load_unsigned_byte (dst, src); break;
+    case T_BYTE:    __ load_signed_byte   (dst, src); break;
+    case T_CHAR:    __ load_unsigned_short(dst, src); break;
+    case T_SHORT:   __ load_signed_short  (dst, src); break;
+    case T_INT:     __ lw                 (dst, src); break;
+    case T_LONG:    __ ld                 (dst, src); break;
+    case T_ADDRESS: __ ld                 (dst, src); break;
+    case T_FLOAT:   __ flw                (f10, src); break;
+    case T_DOUBLE:  __ fld                (f10, src); break;
+    default: Unimplemented();
+  }
+}
+
+void BarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                   Address dst, Register val, Register tmp1, Register tmp2) {
+  assert_cond(masm != NULL);
+  bool in_heap = (decorators & IN_HEAP) != 0;
+  bool in_native = (decorators & IN_NATIVE) != 0;
+  switch (type) {
+    case T_OBJECT: // fall through
+    case T_ARRAY: {
+      val = val == noreg ? zr : val;
+      if (in_heap) {
+        if (UseCompressedOops) {
+          assert(!dst.uses(val), "not enough registers");
+          if (val != zr) {
+            __ encode_heap_oop(val);
+          }
+          __ sw(val, dst);
+        } else {
+          __ sd(val, dst);
+        }
+      } else {
+        assert(in_native, "why else?");
+        __ sd(val, dst);
+      }
+      break;
+    }
+    case T_BOOLEAN:
+      __ andi(val, val, 0x1);  // boolean is true if LSB is 1
+      __ sb(val, dst);
+      break;
+    case T_BYTE:    __ sb(val, dst); break;
+    case T_CHAR:    __ sh(val, dst); break;
+    case T_SHORT:   __ sh(val, dst); break;
+    case T_INT:     __ sw(val, dst); break;
+    case T_LONG:    __ sd(val, dst); break;
+    case T_ADDRESS: __ sd(val, dst); break;
+    case T_FLOAT:   __ fsw(f10,  dst); break;
+    case T_DOUBLE:  __ fsd(f10,  dst); break;
+    default: Unimplemented();
+  }
+
+}
+
+void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
+                                                        Register obj, Register tmp, Label& slowpath) {
+  assert_cond(masm != NULL);
+  // If mask changes we need to ensure that the inverse is still encodable as an immediate
+  STATIC_ASSERT(JNIHandles::weak_tag_mask == 1);
+  __ andi(obj, obj, ~JNIHandles::weak_tag_mask);
+  __ ld(obj, Address(obj, 0));             // *obj
+}
+
+// Defines obj, preserves var_size_in_bytes, okay for tmp2 == var_size_in_bytes.
+void BarrierSetAssembler::tlab_allocate(MacroAssembler* masm, Register obj,
+                                        Register var_size_in_bytes,
+                                        int con_size_in_bytes,
+                                        Register tmp1,
+                                        Register tmp2,
+                                        Label& slow_case,
+                                        bool is_far) {
+  assert_cond(masm != NULL);
+  assert_different_registers(obj, tmp2);
+  assert_different_registers(obj, var_size_in_bytes);
+  Register end = tmp2;
+
+  __ ld(obj, Address(xthread, JavaThread::tlab_top_offset()));
+  if (var_size_in_bytes == noreg) {
+    __ la(end, Address(obj, con_size_in_bytes));
+  } else {
+    __ add(end, obj, var_size_in_bytes);
+  }
+  __ ld(t0, Address(xthread, JavaThread::tlab_end_offset()));
+  __ bgtu(end, t0, slow_case, is_far);
+
+  // update the tlab top pointer
+  __ sd(end, Address(xthread, JavaThread::tlab_top_offset()));
+
+  // recover var_size_in_bytes if necessary
+  if (var_size_in_bytes == end) {
+    __ sub(var_size_in_bytes, var_size_in_bytes, obj);
+  }
+}
+
+// Defines obj, preserves var_size_in_bytes
+void BarrierSetAssembler::eden_allocate(MacroAssembler* masm, Register obj,
+                                        Register var_size_in_bytes,
+                                        int con_size_in_bytes,
+                                        Register tmp1,
+                                        Label& slow_case,
+                                        bool is_far) {
+  assert_cond(masm != NULL);
+  assert_different_registers(obj, var_size_in_bytes, tmp1);
+  if (!Universe::heap()->supports_inline_contig_alloc()) {
+    __ j(slow_case);
+  } else {
+    Register end = tmp1;
+    Label retry;
+    __ bind(retry);
+
+    // Get the current end of the heap
+    ExternalAddress address_end((address) Universe::heap()->end_addr());
+    {
+      int32_t offset;
+      __ la_patchable(t1, address_end, offset);
+      __ ld(t1, Address(t1, offset));
+    }
+
+    // Get the current top of the heap
+    ExternalAddress address_top((address) Universe::heap()->top_addr());
+    {
+      int32_t offset;
+      __ la_patchable(t0, address_top, offset);
+      __ addi(t0, t0, offset);
+      __ lr_d(obj, t0, Assembler::aqrl);
+    }
+
+    // Adjust it my the size of our new object
+    if (var_size_in_bytes == noreg) {
+      __ la(end, Address(obj, con_size_in_bytes));
+    } else {
+      __ add(end, obj, var_size_in_bytes);
+    }
+
+    // if end < obj then we wrapped around high memory
+    __ bltu(end, obj, slow_case, is_far);
+
+    __ bgtu(end, t1, slow_case, is_far);
+
+    // If heap_top hasn't been changed by some other thread, update it.
+    __ sc_d(t1, end, t0, Assembler::rl);
+    __ bnez(t1, retry);
+
+    incr_allocated_bytes(masm, var_size_in_bytes, con_size_in_bytes, tmp1);
+  }
+}
+
+void BarrierSetAssembler::incr_allocated_bytes(MacroAssembler* masm,
+                                               Register var_size_in_bytes,
+                                               int con_size_in_bytes,
+                                               Register tmp1) {
+  assert_cond(masm != NULL);
+  assert(tmp1->is_valid(), "need temp reg");
+
+  __ ld(tmp1, Address(xthread, in_bytes(JavaThread::allocated_bytes_offset())));
+  if (var_size_in_bytes->is_valid()) {
+    __ add(tmp1, tmp1, var_size_in_bytes);
+  } else {
+    __ add(tmp1, tmp1, con_size_in_bytes);
+  }
+  __ sd(tmp1, Address(xthread, in_bytes(JavaThread::allocated_bytes_offset())));
+}
+
+void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
+  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+
+  if (bs_nm == NULL) {
+    return;
+  }
+
+  // RISCV atomic operations require that the memory address be naturally aligned.
+  __ align(4);
+
+  Label skip, guard;
+  Address thread_disarmed_addr(xthread, in_bytes(bs_nm->thread_disarmed_offset()));
+
+  __ lwu(t0, guard);
+
+  // Subsequent loads of oops must occur after load of guard value.
+  // BarrierSetNMethod::disarm sets guard with release semantics.
+  __ membar(MacroAssembler::LoadLoad);
+  __ lwu(t1, thread_disarmed_addr);
+  __ beq(t0, t1, skip);
+
+  int32_t offset = 0;
+  __ movptr_with_offset(t0, StubRoutines::riscv::method_entry_barrier(), offset);
+  __ jalr(ra, t0, offset);
+  __ j(skip);
+
+  __ bind(guard);
+
+  assert(__ offset() % 4 == 0, "bad alignment");
+  __ emit_int32(0); // nmethod guard value. Skipped over in common case.
+
+  __ bind(skip);
+}
+
+void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
+  BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs == NULL) {
+    return;
+  }
+
+  Label bad_call;
+  __ beqz(xmethod, bad_call);
+
+  // Pointer chase to the method holder to find out if the method is concurrently unloading.
+  Label method_live;
+  __ load_method_holder_cld(t0, xmethod);
+
+  // Is it a strong CLD?
+  __ lwu(t1, Address(t0, ClassLoaderData::keep_alive_offset()));
+  __ bnez(t1, method_live);
+
+  // Is it a weak but alive CLD?
+  __ push_reg(RegSet::of(x28, x29), sp);
+
+  __ ld(x28, Address(t0, ClassLoaderData::holder_offset()));
+
+  // Uses x28 & x29, so we must pass new temporaries.
+  __ resolve_weak_handle(x28, x29);
+  __ mv(t0, x28);
+
+  __ pop_reg(RegSet::of(x28, x29), sp);
+
+  __ bnez(t0, method_live);
+
+  __ bind(bad_call);
+
+  __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+  __ bind(method_live);
+}
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
new file mode 100644
index 00000000000..b85f7f5582b
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GC_SHARED_BARRIERSETASSEMBLER_RISCV_HPP
+#define CPU_RISCV_GC_SHARED_BARRIERSETASSEMBLER_RISCV_HPP
+
+#include "asm/macroAssembler.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetNMethod.hpp"
+#include "memory/allocation.hpp"
+#include "oops/access.hpp"
+
+class BarrierSetAssembler: public CHeapObj<mtGC> {
+private:
+  void incr_allocated_bytes(MacroAssembler* masm,
+                            Register var_size_in_bytes, int con_size_in_bytes,
+                            Register t1 = noreg);
+
+public:
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register src, Register dst, Register count, RegSet saved_regs) {}
+  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register start, Register end, Register tmp, RegSet saved_regs) {}
+  virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                       Register dst, Address src, Register tmp1, Register tmp_thread);
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        Address dst, Register val, Register tmp1, Register tmp2);
+
+  virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
+                                             Register obj, Register tmp, Label& slowpath);
+
+  virtual void tlab_allocate(MacroAssembler* masm,
+    Register obj,                      // result: pointer to object after successful allocation
+    Register var_size_in_bytes,        // object size in bytes if unknown at compile time; invalid otherwise
+    int      con_size_in_bytes,        // object size in bytes if   known at compile time
+    Register tmp1,                     // temp register
+    Register tmp2,                     // temp register
+    Label&   slow_case,                // continuation point if fast allocation fails
+    bool is_far = false
+  );
+
+  void eden_allocate(MacroAssembler* masm,
+    Register obj,                      // result: pointer to object after successful allocation
+    Register var_size_in_bytes,        // object size in bytes if unknown at compile time; invalid otherwise
+    int      con_size_in_bytes,        // object size in bytes if   known at compile time
+    Register tmp1,                     // temp register
+    Label&   slow_case,                // continuation point if fast allocation fails
+    bool is_far = false
+  );
+  virtual void barrier_stubs_init() {}
+
+  virtual void nmethod_entry_barrier(MacroAssembler* masm);
+  virtual void c2i_entry_barrier(MacroAssembler* masm);
+  virtual ~BarrierSetAssembler() {}
+};
+
+#endif // CPU_RISCV_GC_SHARED_BARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp
new file mode 100644
index 00000000000..ae7ee4c5a44
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "code/codeCache.hpp"
+#include "code/nativeInst.hpp"
+#include "gc/shared/barrierSetNMethod.hpp"
+#include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/registerMap.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+
+class NativeNMethodBarrier: public NativeInstruction {
+  address instruction_address() const { return addr_at(0); }
+
+  int *guard_addr() {
+    /* auipc + lwu + fence + lwu + beq + lui + addi + slli + addi + slli + jalr + j */
+    return reinterpret_cast<int*>(instruction_address() + 12 * 4);
+  }
+
+public:
+  int get_value() {
+    return Atomic::load_acquire(guard_addr());
+  }
+
+  void set_value(int value) {
+    Atomic::release_store(guard_addr(), value);
+  }
+
+  void verify() const;
+};
+
+// Store the instruction bitmask, bits and name for checking the barrier.
+struct CheckInsn {
+  uint32_t mask;
+  uint32_t bits;
+  const char *name;
+};
+
+static const struct CheckInsn barrierInsn[] = {
+  { 0x00000fff, 0x00000297, "auipc  t0, 0           "},
+  { 0x000fffff, 0x0002e283, "lwu    t0, 48(t0)      "},
+  { 0xffffffff, 0x0aa0000f, "fence  ir, ir          "},
+  { 0x000fffff, 0x000be303, "lwu    t1, 112(xthread)"},
+  { 0x01fff07f, 0x00628063, "beq    t0, t1, skip    "},
+  { 0x00000fff, 0x000002b7, "lui    t0, imm0        "},
+  { 0x000fffff, 0x00028293, "addi   t0, t0, imm1    "},
+  { 0xffffffff, 0x00b29293, "slli   t0, t0, 11      "},
+  { 0x000fffff, 0x00028293, "addi   t0, t0, imm2    "},
+  { 0xffffffff, 0x00529293, "slli   t0, t0, 5       "},
+  { 0x000fffff, 0x000280e7, "jalr   ra, imm3(t0)    "},
+  { 0x00000fff, 0x0000006f, "j      skip            "}
+  /* guard: */
+  /* 32bit nmethod guard value */
+  /* skip: */
+};
+
+// The encodings must match the instructions emitted by
+// BarrierSetAssembler::nmethod_entry_barrier. The matching ignores the specific
+// register numbers and immediate values in the encoding.
+void NativeNMethodBarrier::verify() const {
+  intptr_t addr = (intptr_t) instruction_address();
+  for(unsigned int i = 0; i < sizeof(barrierInsn)/sizeof(struct CheckInsn); i++ ) {
+    uint32_t inst = *((uint32_t*) addr);
+    if ((inst & barrierInsn[i].mask) != barrierInsn[i].bits) {
+      tty->print_cr("Addr: " INTPTR_FORMAT " Code: 0x%x", addr, inst);
+      fatal("not an %s instruction.", barrierInsn[i].name);
+    }
+    addr += 4;
+  }
+}
+
+
+/* We're called from an nmethod when we need to deoptimize it. We do
+   this by throwing away the nmethod's frame and jumping to the
+   ic_miss stub. This looks like there has been an IC miss at the
+   entry of the nmethod, so we resolve the call, which will fall back
+   to the interpreter if the nmethod has been unloaded. */
+void BarrierSetNMethod::deoptimize(nmethod* nm, address* return_address_ptr) {
+
+  typedef struct {
+    intptr_t *sp; intptr_t *fp; address ra; address pc;
+  } frame_pointers_t;
+
+  frame_pointers_t *new_frame = (frame_pointers_t *)(return_address_ptr - 5);
+
+  JavaThread *thread = JavaThread::current();
+  RegisterMap reg_map(thread, false);
+  frame frame = thread->last_frame();
+
+  assert(frame.is_compiled_frame() || frame.is_native_frame(), "must be");
+  assert(frame.cb() == nm, "must be");
+  frame = frame.sender(&reg_map);
+
+  LogTarget(Trace, nmethod, barrier) out;
+  if (out.is_enabled()) {
+    ResourceMark mark;
+    log_trace(nmethod, barrier)("deoptimize(nmethod: %s(%p), return_addr: %p, osr: %d, thread: %p(%s), making rsp: %p) -> %p",
+                                nm->method()->name_and_sig_as_C_string(),
+                                nm, *(address *) return_address_ptr, nm->is_osr_method(), thread,
+                                thread->name(), frame.sp(), nm->verified_entry_point());
+  }
+
+  new_frame->sp = frame.sp();
+  new_frame->fp = frame.fp();
+  new_frame->ra = frame.pc();
+  new_frame->pc = SharedRuntime::get_handle_wrong_method_stub();
+}
+
+// This is the offset of the entry barrier from where the frame is completed.
+// If any code changes between the end of the verified entry where the entry
+// barrier resides, and the completion of the frame, then
+// NativeNMethodCmpBarrier::verify() will immediately complain when it does
+// not find the expected native instruction at this offset, which needs updating.
+// Note that this offset is invariant of PreserveFramePointer.
+
+// see BarrierSetAssembler::nmethod_entry_barrier
+// auipc + lwu + fence + lwu + beq + movptr_with_offset(5 instructions) + jalr + j + int32
+static const int entry_barrier_offset = -4 * 13;
+
+static NativeNMethodBarrier* native_nmethod_barrier(nmethod* nm) {
+  address barrier_address = nm->code_begin() + nm->frame_complete_offset() + entry_barrier_offset;
+  NativeNMethodBarrier* barrier = reinterpret_cast<NativeNMethodBarrier*>(barrier_address);
+  debug_only(barrier->verify());
+  return barrier;
+}
+
+void BarrierSetNMethod::disarm(nmethod* nm) {
+  if (!supports_entry_barrier(nm)) {
+    return;
+  }
+
+  // Disarms the nmethod guard emitted by BarrierSetAssembler::nmethod_entry_barrier.
+  NativeNMethodBarrier* barrier = native_nmethod_barrier(nm);
+
+  barrier->set_value(disarmed_value());
+}
+
+bool BarrierSetNMethod::is_armed(nmethod* nm) {
+  if (!supports_entry_barrier(nm)) {
+    return false;
+  }
+
+  NativeNMethodBarrier* barrier = native_nmethod_barrier(nm);
+  return barrier->get_value() != disarmed_value();
+}
diff --git a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
new file mode 100644
index 00000000000..a419f92b5f6
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTable.hpp"
+#include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
+#include "gc/shared/gc_globals.hpp"
+#include "interpreter/interp_masm.hpp"
+
+#define __ masm->
+
+
+void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Register tmp) {
+  assert_cond(masm != NULL);
+  assert_different_registers(obj, tmp);
+  BarrierSet* bs = BarrierSet::barrier_set();
+  assert(bs->kind() == BarrierSet::CardTableBarrierSet, "Wrong barrier set kind");
+
+  __ srli(obj, obj, CardTable::card_shift());
+
+  assert(CardTable::dirty_card_val() == 0, "must be");
+
+  __ load_byte_map_base(tmp);
+  __ add(tmp, obj, tmp);
+
+  if (UseCondCardMark) {
+    Label L_already_dirty;
+    __ membar(MacroAssembler::StoreLoad);
+    __ lbu(t1,  Address(tmp));
+    __ beqz(t1, L_already_dirty);
+    __ sb(zr, Address(tmp));
+    __ bind(L_already_dirty);
+  } else {
+    __ sb(zr, Address(tmp));
+  }
+}
+
+void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                                                    Register start, Register count, Register tmp, RegSet saved_regs) {
+  assert_cond(masm != NULL);
+  assert_different_registers(start, tmp);
+  assert_different_registers(count, tmp);
+
+  Label L_loop, L_done;
+  const Register end = count;
+
+  __ beqz(count, L_done); // zero count - nothing to do
+  // end = start + count << LogBytesPerHeapOop
+  __ shadd(end, count, start, count, LogBytesPerHeapOop);
+  __ sub(end, end, BytesPerHeapOop); // last element address to make inclusive
+
+  __ srli(start, start, CardTable::card_shift());
+  __ srli(end, end, CardTable::card_shift());
+  __ sub(count, end, start); // number of bytes to copy
+
+  __ load_byte_map_base(tmp);
+  __ add(start, start, tmp);
+
+  __ bind(L_loop);
+  __ add(tmp, start, count);
+  __ sb(zr, Address(tmp));
+  __ sub(count, count, 1);
+  __ bgez(count, L_loop);
+  __ bind(L_done);
+}
+
+void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                                Address dst, Register val, Register tmp1, Register tmp2) {
+  bool in_heap = (decorators & IN_HEAP) != 0;
+  bool is_array = (decorators & IS_ARRAY) != 0;
+  bool on_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
+  bool precise = is_array || on_anonymous;
+
+  bool needs_post_barrier = val != noreg && in_heap;
+  BarrierSetAssembler::store_at(masm, decorators, type, dst, val, noreg, noreg);
+  if (needs_post_barrier) {
+    // flatten object address if needed
+    if (!precise || dst.offset() == 0) {
+      store_check(masm, dst.base(), x13);
+    } else {
+      assert_cond(masm != NULL);
+      __ la(x13, dst);
+      store_check(masm, x13, t0);
+    }
+  }
+}
diff --git a/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
new file mode 100644
index 00000000000..686fe8fa478
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shared/cardTableBarrierSetAssembler_riscv.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_RISCV_HPP
+#define CPU_RISCV_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_RISCV_HPP
+
+#include "asm/macroAssembler.hpp"
+#include "gc/shared/modRefBarrierSetAssembler.hpp"
+
+class CardTableBarrierSetAssembler: public ModRefBarrierSetAssembler {
+protected:
+  void store_check(MacroAssembler* masm, Register obj, Register tmp);
+
+  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                                Register start, Register count, Register tmp, RegSet saved_regs);
+  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                            Address dst, Register val, Register tmp1, Register tmp2);
+};
+
+#endif // #ifndef CPU_RISCV_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.cpp
new file mode 100644
index 00000000000..7aa2015f9ec
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/modRefBarrierSetAssembler.hpp"
+
+#define __ masm->
+
+void ModRefBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                   Register src, Register dst, Register count, RegSet saved_regs) {
+
+  if (is_oop) {
+    gen_write_ref_array_pre_barrier(masm, decorators, dst, count, saved_regs);
+  }
+}
+
+void ModRefBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                   Register start, Register count, Register tmp,
+                                                   RegSet saved_regs) {
+  if (is_oop) {
+    gen_write_ref_array_post_barrier(masm, decorators, start, count, tmp, saved_regs);
+  }
+}
+
+void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                         Address dst, Register val, Register tmp1, Register tmp2) {
+  if (is_reference_type(type)) {
+    oop_store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+  } else {
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+  }
+}
diff --git a/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.hpp
new file mode 100644
index 00000000000..00419c3163c
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shared/modRefBarrierSetAssembler_riscv.hpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GC_SHARED_MODREFBARRIERSETASSEMBLER_RISCV_HPP
+#define CPU_RISCV_GC_SHARED_MODREFBARRIERSETASSEMBLER_RISCV_HPP
+
+#include "asm/macroAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+
+// The ModRefBarrierSetAssembler filters away accesses on BasicTypes other
+// than T_OBJECT/T_ARRAY (oops). The oop accesses call one of the protected
+// accesses, which are overridden in the concrete BarrierSetAssembler.
+
+class ModRefBarrierSetAssembler: public BarrierSetAssembler {
+protected:
+  virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                               Register addr, Register count, RegSet saved_regs) {}
+  virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
+                                                Register start, Register count, Register tmp, RegSet saved_regs) {}
+
+  virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                            Address dst, Register val, Register tmp1, Register tmp2) = 0;
+
+public:
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register src, Register dst, Register count, RegSet saved_regs);
+  virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register start, Register count, Register tmp, RegSet saved_regs);
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        Address dst, Register val, Register tmp1, Register tmp2);
+};
+
+#endif // CPU_RISCV_GC_SHARED_MODREFBARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
new file mode 100644
index 00000000000..cd568cc723f
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "gc/shared/gc_globals.hpp"
+#include "gc/shenandoah/shenandoahBarrierSet.hpp"
+#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
+#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
+
+#define __ masm->masm()->
+
+void LIR_OpShenandoahCompareAndSwap::emit_code(LIR_Assembler* masm) {
+  Register addr = _addr->as_register_lo();
+  Register newval = _new_value->as_register();
+  Register cmpval = _cmp_value->as_register();
+  Register tmp1 = _tmp1->as_register();
+  Register tmp2 = _tmp2->as_register();
+  Register result = result_opr()->as_register();
+
+  ShenandoahBarrierSet::assembler()->iu_barrier(masm->masm(), newval, t1);
+
+  if (UseCompressedOops) {
+    __ encode_heap_oop(tmp1, cmpval);
+    cmpval = tmp1;
+    __ encode_heap_oop(tmp2, newval);
+    newval = tmp2;
+  }
+
+  ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm->masm(), addr, cmpval, newval, /* acquire */ Assembler::aq,
+                                                 /* release */ Assembler::rl, /* is_cae */ false, result);
+}
+
+#undef __
+
+#ifdef ASSERT
+#define __ gen->lir(__FILE__, __LINE__)->
+#else
+#define __ gen->lir()->
+#endif
+
+LIR_Opr ShenandoahBarrierSetC1::atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value) {
+  BasicType bt = access.type();
+  if (access.is_oop()) {
+    LIRGenerator *gen = access.gen();
+    if (ShenandoahSATBBarrier) {
+      pre_barrier(gen, access.access_emit_info(), access.decorators(), access.resolved_addr(),
+                  LIR_OprFact::illegalOpr /* pre_val */);
+    }
+    if (ShenandoahCASBarrier) {
+      cmp_value.load_item();
+      new_value.load_item();
+
+      LIR_Opr tmp1 = gen->new_register(T_OBJECT);
+      LIR_Opr tmp2 = gen->new_register(T_OBJECT);
+      LIR_Opr addr = access.resolved_addr()->as_address_ptr()->base();
+      LIR_Opr result = gen->new_register(T_INT);
+
+      __ append(new LIR_OpShenandoahCompareAndSwap(addr, cmp_value.result(), new_value.result(), tmp1, tmp2, result));
+      return result;
+    }
+  }
+  return BarrierSetC1::atomic_cmpxchg_at_resolved(access, cmp_value, new_value);
+}
+
+LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value) {
+  LIRGenerator* gen = access.gen();
+  BasicType type = access.type();
+
+  LIR_Opr result = gen->new_register(type);
+  value.load_item();
+  LIR_Opr value_opr = value.result();
+
+  if (access.is_oop()) {
+    value_opr = iu_barrier(access.gen(), value_opr, access.access_emit_info(), access.decorators());
+  }
+
+  assert(type == T_INT || is_reference_type(type) LP64_ONLY( || type == T_LONG ), "unexpected type");
+  LIR_Opr tmp = gen->new_register(T_INT);
+  __ xchg(access.resolved_addr(), value_opr, result, tmp);
+
+  if (access.is_oop()) {
+    result = load_reference_barrier(access.gen(), result, LIR_OprFact::addressConst(0), access.decorators());
+    LIR_Opr tmp_opr = gen->new_register(type);
+    __ move(result, tmp_opr);
+    result = tmp_opr;
+    if (ShenandoahSATBBarrier) {
+      pre_barrier(access.gen(), access.access_emit_info(), access.decorators(), LIR_OprFact::illegalOpr,
+                  result /* pre_val */);
+    }
+  }
+
+  return result;
+}
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
new file mode 100644
index 00000000000..d0ac6e52436
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
@@ -0,0 +1,712 @@
+/*
+ * Copyright (c) 2018, 2020, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/shenandoah/shenandoahBarrierSet.hpp"
+#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
+#include "gc/shenandoah/shenandoahForwarding.hpp"
+#include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahHeapRegion.hpp"
+#include "gc/shenandoah/shenandoahRuntime.hpp"
+#include "gc/shenandoah/shenandoahThreadLocalData.hpp"
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interp_masm.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/thread.hpp"
+#ifdef COMPILER1
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
+#endif
+
+#define __ masm->
+
+void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                                       Register src, Register dst, Register count, RegSet saved_regs) {
+  if (is_oop) {
+    bool dest_uninitialized = (decorators & IS_DEST_UNINITIALIZED) != 0;
+    if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahIUBarrier || ShenandoahLoadRefBarrier) {
+
+      Label done;
+
+      // Avoid calling runtime if count == 0
+      __ beqz(count, done);
+
+      // Is GC active?
+      Address gc_state(xthread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
+      assert_different_registers(src, dst, count, t0);
+
+      __ lbu(t0, gc_state);
+      if (ShenandoahSATBBarrier && dest_uninitialized) {
+        __ andi(t0, t0, ShenandoahHeap::HAS_FORWARDED);
+        __ beqz(t0, done);
+      } else {
+        __ andi(t0, t0, ShenandoahHeap::HAS_FORWARDED | ShenandoahHeap::MARKING);
+        __ beqz(t0, done);
+      }
+
+      __ push_reg(saved_regs, sp);
+      if (UseCompressedOops) {
+        __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop_entry),
+                        src, dst, count);
+      } else {
+        __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop_entry), src, dst, count);
+      }
+      __ pop_reg(saved_regs, sp);
+      __ bind(done);
+    }
+  }
+}
+
+void ShenandoahBarrierSetAssembler::shenandoah_write_barrier_pre(MacroAssembler* masm,
+                                                                 Register obj,
+                                                                 Register pre_val,
+                                                                 Register thread,
+                                                                 Register tmp,
+                                                                 bool tosca_live,
+                                                                 bool expand_call) {
+  if (ShenandoahSATBBarrier) {
+    satb_write_barrier_pre(masm, obj, pre_val, thread, tmp, tosca_live, expand_call);
+  }
+}
+
+void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
+                                                           Register obj,
+                                                           Register pre_val,
+                                                           Register thread,
+                                                           Register tmp,
+                                                           bool tosca_live,
+                                                           bool expand_call) {
+  // If expand_call is true then we expand the call_VM_leaf macro
+  // directly to skip generating the check by
+  // InterpreterMacroAssembler::call_VM_leaf_base that checks _last_sp.
+  assert(thread == xthread, "must be");
+
+  Label done;
+  Label runtime;
+
+  assert_different_registers(obj, pre_val, tmp, t0);
+  assert(pre_val != noreg &&  tmp != noreg, "expecting a register");
+
+  Address in_progress(thread, in_bytes(ShenandoahThreadLocalData::satb_mark_queue_active_offset()));
+  Address index(thread, in_bytes(ShenandoahThreadLocalData::satb_mark_queue_index_offset()));
+  Address buffer(thread, in_bytes(ShenandoahThreadLocalData::satb_mark_queue_buffer_offset()));
+
+  // Is marking active?
+  if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
+    __ lwu(tmp, in_progress);
+  } else {
+    assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
+    __ lbu(tmp, in_progress);
+  }
+  __ beqz(tmp, done);
+
+  // Do we need to load the previous value?
+  if (obj != noreg) {
+    __ load_heap_oop(pre_val, Address(obj, 0), noreg, noreg, AS_RAW);
+  }
+
+  // Is the previous value null?
+  __ beqz(pre_val, done);
+
+  // Can we store original value in the thread's buffer?
+  // Is index == 0?
+  // (The index field is typed as size_t.)
+  __ ld(tmp, index);                        // tmp := *index_adr
+  __ beqz(tmp, runtime);                    // tmp == 0? If yes, goto runtime
+
+  __ sub(tmp, tmp, wordSize);               // tmp := tmp - wordSize
+  __ sd(tmp, index);                        // *index_adr := tmp
+  __ ld(t0, buffer);
+  __ add(tmp, tmp, t0);                     // tmp := tmp + *buffer_adr
+
+  // Record the previous value
+  __ sd(pre_val, Address(tmp, 0));
+  __ j(done);
+
+  __ bind(runtime);
+  // save the live input values
+  RegSet saved = RegSet::of(pre_val);
+  if (tosca_live) saved += RegSet::of(x10);
+  if (obj != noreg) saved += RegSet::of(obj);
+
+  __ push_reg(saved, sp);
+
+  // Calling the runtime using the regular call_VM_leaf mechanism generates
+  // code (generated by InterpreterMacroAssember::call_VM_leaf_base)
+  // that checks that the *(rfp+frame::interpreter_frame_last_sp) == NULL.
+  //
+  // If we care generating the pre-barrier without a frame (e.g. in the
+  // intrinsified Reference.get() routine) then ebp might be pointing to
+  // the caller frame and so this check will most likely fail at runtime.
+  //
+  // Expanding the call directly bypasses the generation of the check.
+  // So when we do not have have a full interpreter frame on the stack
+  // expand_call should be passed true.
+  if (expand_call) {
+    assert(pre_val != c_rarg1, "smashed arg");
+    __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
+  } else {
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
+  }
+
+  __ pop_reg(saved, sp);
+
+  __ bind(done);
+}
+
+void ShenandoahBarrierSetAssembler::resolve_forward_pointer(MacroAssembler* masm, Register dst, Register tmp) {
+  assert(ShenandoahLoadRefBarrier || ShenandoahCASBarrier, "Should be enabled");
+
+  Label is_null;
+  __ beqz(dst, is_null);
+  resolve_forward_pointer_not_null(masm, dst, tmp);
+  __ bind(is_null);
+}
+
+// IMPORTANT: This must preserve all registers, even t0 and t1, except those explicitely
+// passed in.
+void ShenandoahBarrierSetAssembler::resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp) {
+  assert(ShenandoahLoadRefBarrier || ShenandoahCASBarrier, "Should be enabled");
+  // The below loads the mark word, checks if the lowest two bits are
+  // set, and if so, clear the lowest two bits and copy the result
+  // to dst. Otherwise it leaves dst alone.
+  // Implementing this is surprisingly awkward. I do it here by:
+  // - Inverting the mark word
+  // - Test lowest two bits == 0
+  // - If so, set the lowest two bits
+  // - Invert the result back, and copy to dst
+  RegSet saved_regs = RegSet::of(t2);
+  bool borrow_reg = (tmp == noreg);
+  if (borrow_reg) {
+    // No free registers available. Make one useful.
+    tmp = t0;
+    if (tmp == dst) {
+      tmp = t1;
+    }
+    saved_regs += RegSet::of(tmp);
+  }
+
+  assert_different_registers(tmp, dst, t2);
+  __ push_reg(saved_regs, sp);
+
+  Label done;
+  __ ld(tmp, Address(dst, oopDesc::mark_offset_in_bytes()));
+  __ xori(tmp, tmp, -1); // eon with 0 is equivalent to XOR with -1
+  __ andi(t2, tmp, markWord::lock_mask_in_place);
+  __ bnez(t2, done);
+  __ ori(tmp, tmp, markWord::marked_value);
+  __ xori(dst, tmp, -1); // eon with 0 is equivalent to XOR with -1
+  __ bind(done);
+
+  __ pop_reg(saved_regs, sp);
+}
+
+void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
+                                                           Register dst,
+                                                           Address load_addr,
+                                                           DecoratorSet decorators) {
+  assert(ShenandoahLoadRefBarrier, "Should be enabled");
+  assert(dst != t1 && load_addr.base() != t1, "need t1");
+  assert_different_registers(load_addr.base(), t0, t1);
+
+  bool is_strong  = ShenandoahBarrierSet::is_strong_access(decorators);
+  bool is_weak    = ShenandoahBarrierSet::is_weak_access(decorators);
+  bool is_phantom = ShenandoahBarrierSet::is_phantom_access(decorators);
+  bool is_native  = ShenandoahBarrierSet::is_native_access(decorators);
+  bool is_narrow  = UseCompressedOops && !is_native;
+
+  Label heap_stable, not_cset;
+  __ enter();
+  Address gc_state(xthread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
+  __ lbu(t1, gc_state);
+
+  // Check for heap stability
+  if (is_strong) {
+    __ andi(t1, t1, ShenandoahHeap::HAS_FORWARDED);
+    __ beqz(t1, heap_stable);
+  } else {
+    Label lrb;
+    __ andi(t0, t1, ShenandoahHeap::WEAK_ROOTS);
+    __ bnez(t0, lrb);
+    __ andi(t0, t1, ShenandoahHeap::HAS_FORWARDED);
+    __ beqz(t0, heap_stable);
+    __ bind(lrb);
+  }
+
+  // use x11 for load address
+  Register result_dst = dst;
+  if (dst == x11) {
+    __ mv(t1, dst);
+    dst = t1;
+  }
+
+  // Save x10 and x11, unless it is an output register
+  RegSet saved_regs = RegSet::of(x10, x11) - result_dst;
+  __ push_reg(saved_regs, sp);
+  __ la(x11, load_addr);
+  __ mv(x10, dst);
+
+  // Test for in-cset
+  if (is_strong) {
+    __ li(t1, (uint64_t)ShenandoahHeap::in_cset_fast_test_addr());
+    __ srli(t0, x10, ShenandoahHeapRegion::region_size_bytes_shift_jint());
+    __ add(t1, t1, t0);
+    __ lbu(t1, Address(t1));
+    __ andi(t0, t1, 1);
+    __ beqz(t0, not_cset);
+  }
+
+  __ push_call_clobbered_registers();
+  if (is_strong) {
+    if (is_narrow) {
+      __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_strong_narrow);
+    } else {
+      __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_strong);
+    }
+  } else if (is_weak) {
+    if (is_narrow) {
+      __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_weak_narrow);
+    } else {
+      __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_weak);
+    }
+  } else {
+    assert(is_phantom, "only remaining strength");
+    assert(!is_narrow, "phantom access cannot be narrow");
+    __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_weak);
+  }
+  __ jalr(ra);
+  __ mv(t0, x10);
+  __ pop_call_clobbered_registers();
+  __ mv(x10, t0);
+  __ bind(not_cset);
+  __ mv(result_dst, x10);
+  __ pop_reg(saved_regs, sp);
+
+  __ bind(heap_stable);
+  __ leave();
+}
+
+void ShenandoahBarrierSetAssembler::iu_barrier(MacroAssembler* masm, Register dst, Register tmp) {
+  if (ShenandoahIUBarrier) {
+    __ push_call_clobbered_registers();
+
+    satb_write_barrier_pre(masm, noreg, dst, xthread, tmp, true, false);
+
+    __ pop_call_clobbered_registers();
+  }
+}
+
+//
+// Arguments:
+//
+// Inputs:
+//   src:        oop location to load from, might be clobbered
+//
+// Output:
+//   dst:        oop loaded from src location
+//
+// Kill:
+//   x30 (tmp reg)
+//
+// Alias:
+//   dst: x30 (might use x30 as temporary output register to avoid clobbering src)
+//
+void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm,
+                                            DecoratorSet decorators,
+                                            BasicType type,
+                                            Register dst,
+                                            Address src,
+                                            Register tmp1,
+                                            Register tmp_thread) {
+  // 1: non-reference load, no additional barrier is needed
+  if (!is_reference_type(type)) {
+    BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread);
+    return;
+  }
+
+  // 2: load a reference from src location and apply LRB if needed
+  if (ShenandoahBarrierSet::need_load_reference_barrier(decorators, type)) {
+    Register result_dst = dst;
+
+    // Preserve src location for LRB
+    RegSet saved_regs;
+    if (dst == src.base()) {
+      dst = (src.base() == x28) ? x29 : x28;
+      saved_regs = RegSet::of(dst);
+      __ push_reg(saved_regs, sp);
+    }
+    assert_different_registers(dst, src.base());
+
+    BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread);
+
+    load_reference_barrier(masm, dst, src, decorators);
+
+    if (dst != result_dst) {
+      __ mv(result_dst, dst);
+      dst = result_dst;
+    }
+
+    if (saved_regs.bits() != 0) {
+      __ pop_reg(saved_regs, sp);
+    }
+  } else {
+    BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread);
+  }
+
+  // 3: apply keep-alive barrier if needed
+  if (ShenandoahBarrierSet::need_keep_alive_barrier(decorators, type)) {
+    __ enter();
+    __ push_call_clobbered_registers();
+    satb_write_barrier_pre(masm /* masm */,
+                           noreg /* obj */,
+                           dst /* pre_val */,
+                           xthread /* thread */,
+                           tmp1 /* tmp */,
+                           true /* tosca_live */,
+                           true /* expand_call */);
+    __ pop_call_clobbered_registers();
+    __ leave();
+  }
+}
+
+void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                                             Address dst, Register val, Register tmp1, Register tmp2) {
+  bool on_oop = is_reference_type(type);
+  if (!on_oop) {
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+    return;
+  }
+
+  // flatten object address if needed
+  if (dst.offset() == 0) {
+    if (dst.base() != x13) {
+      __ mv(x13, dst.base());
+    }
+  } else {
+    __ la(x13, dst);
+  }
+
+  shenandoah_write_barrier_pre(masm,
+                               x13 /* obj */,
+                               tmp2 /* pre_val */,
+                               xthread /* thread */,
+                               tmp1  /* tmp */,
+                               val != noreg /* tosca_live */,
+                               false /* expand_call */);
+
+  if (val == noreg) {
+    BarrierSetAssembler::store_at(masm, decorators, type, Address(x13, 0), noreg, noreg, noreg);
+  } else {
+    iu_barrier(masm, val, tmp1);
+    // G1 barrier needs uncompressed oop for region cross check.
+    Register new_val = val;
+    if (UseCompressedOops) {
+      new_val = t1;
+      __ mv(new_val, val);
+    }
+    BarrierSetAssembler::store_at(masm, decorators, type, Address(x13, 0), val, noreg, noreg);
+  }
+}
+
+void ShenandoahBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
+                                                                  Register obj, Register tmp, Label& slowpath) {
+  Label done;
+  // Resolve jobject
+  BarrierSetAssembler::try_resolve_jobject_in_native(masm, jni_env, obj, tmp, slowpath);
+
+  // Check for null.
+  __ beqz(obj, done);
+
+  assert(obj != t1, "need t1");
+  Address gc_state(jni_env, ShenandoahThreadLocalData::gc_state_offset() - JavaThread::jni_environment_offset());
+  __ lbu(t1, gc_state);
+
+  // Check for heap in evacuation phase
+  __ andi(t0, t1, ShenandoahHeap::EVACUATION);
+  __ bnez(t0, slowpath);
+
+  __ bind(done);
+}
+
+// Special Shenandoah CAS implementation that handles false negatives due
+// to concurrent evacuation.  The service is more complex than a
+// traditional CAS operation because the CAS operation is intended to
+// succeed if the reference at addr exactly matches expected or if the
+// reference at addr holds a pointer to a from-space object that has
+// been relocated to the location named by expected.  There are two
+// races that must be addressed:
+//  a) A parallel thread may mutate the contents of addr so that it points
+//     to a different object.  In this case, the CAS operation should fail.
+//  b) A parallel thread may heal the contents of addr, replacing a
+//     from-space pointer held in addr with the to-space pointer
+//     representing the new location of the object.
+// Upon entry to cmpxchg_oop, it is assured that new_val equals NULL
+// or it refers to an object that is not being evacuated out of
+// from-space, or it refers to the to-space version of an object that
+// is being evacuated out of from-space.
+//
+// By default the value held in the result register following execution
+// of the generated code sequence is 0 to indicate failure of CAS,
+// non-zero to indicate success. If is_cae, the result is the value most
+// recently fetched from addr rather than a boolean success indicator.
+//
+// Clobbers t0, t1
+void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
+                                                Register addr,
+                                                Register expected,
+                                                Register new_val,
+                                                Assembler::Aqrl acquire,
+                                                Assembler::Aqrl release,
+                                                bool is_cae,
+                                                Register result) {
+  bool is_narrow = UseCompressedOops;
+  Assembler::operand_size size = is_narrow ? Assembler::uint32 : Assembler::int64;
+
+  assert_different_registers(addr, expected, t0, t1);
+  assert_different_registers(addr, new_val, t0, t1);
+
+  Label retry, success, fail, done;
+
+  __ bind(retry);
+
+  // Step1: Try to CAS.
+  __ cmpxchg(addr, expected, new_val, size, acquire, release, /* result */ t1);
+
+  // If success, then we are done.
+  __ beq(expected, t1, success);
+
+  // Step2: CAS failed, check the forwared pointer.
+  __ mv(t0, t1);
+
+  if (is_narrow) {
+    __ decode_heap_oop(t0, t0);
+  }
+  resolve_forward_pointer(masm, t0);
+
+  __ encode_heap_oop(t0, t0);
+
+  // Report failure when the forwarded oop was not expected.
+  __ bne(t0, expected, fail);
+
+  // Step 3: CAS again using the forwarded oop.
+  __ cmpxchg(addr, t1, new_val, size, acquire, release, /* result */ t0);
+
+  // Retry when failed.
+  __ bne(t0, t1, retry);
+
+  __ bind(success);
+  if (is_cae) {
+    __ mv(result, expected);
+  } else {
+    __ addi(result, zr, 1);
+  }
+  __ j(done);
+
+  __ bind(fail);
+  if (is_cae) {
+    __ mv(result, t0);
+  } else {
+    __ mv(result, zr);
+  }
+
+  __ bind(done);
+}
+
+#undef __
+
+#ifdef COMPILER1
+
+#define __ ce->masm()->
+
+void ShenandoahBarrierSetAssembler::gen_pre_barrier_stub(LIR_Assembler* ce, ShenandoahPreBarrierStub* stub) {
+  ShenandoahBarrierSetC1* bs = (ShenandoahBarrierSetC1*)BarrierSet::barrier_set()->barrier_set_c1();
+  // At this point we know that marking is in progress.
+  // If do_load() is true then we have to emit the
+  // load of the previous value; otherwise it has already
+  // been loaded into _pre_val.
+  __ bind(*stub->entry());
+
+  assert(stub->pre_val()->is_register(), "Precondition.");
+
+  Register pre_val_reg = stub->pre_val()->as_register();
+
+  if (stub->do_load()) {
+    ce->mem2reg(stub->addr(), stub->pre_val(), T_OBJECT, stub->patch_code(), stub->info(), false /* wide */);
+  }
+  __ beqz(pre_val_reg, *stub->continuation(), /* is_far */ true);
+  ce->store_parameter(stub->pre_val()->as_register(), 0);
+  __ far_call(RuntimeAddress(bs->pre_barrier_c1_runtime_code_blob()->code_begin()));
+  __ j(*stub->continuation());
+}
+
+void ShenandoahBarrierSetAssembler::gen_load_reference_barrier_stub(LIR_Assembler* ce,
+                                                                    ShenandoahLoadReferenceBarrierStub* stub) {
+  ShenandoahBarrierSetC1* bs = (ShenandoahBarrierSetC1*)BarrierSet::barrier_set()->barrier_set_c1();
+  __ bind(*stub->entry());
+
+  DecoratorSet decorators = stub->decorators();
+  bool is_strong  = ShenandoahBarrierSet::is_strong_access(decorators);
+  bool is_weak    = ShenandoahBarrierSet::is_weak_access(decorators);
+  bool is_phantom = ShenandoahBarrierSet::is_phantom_access(decorators);
+  bool is_native  = ShenandoahBarrierSet::is_native_access(decorators);
+
+  Register obj = stub->obj()->as_register();
+  Register res = stub->result()->as_register();
+  Register addr = stub->addr()->as_pointer_register();
+  Register tmp1 = stub->tmp1()->as_register();
+  Register tmp2 = stub->tmp2()->as_register();
+
+  assert(res == x10, "result must arrive in x10");
+  assert_different_registers(tmp1, tmp2, t0);
+
+  if (res != obj) {
+    __ mv(res, obj);
+  }
+
+  if (is_strong) {
+    // Check for object in cset.
+    __ mv(tmp2, ShenandoahHeap::in_cset_fast_test_addr());
+    __ srli(tmp1, res, ShenandoahHeapRegion::region_size_bytes_shift_jint());
+    __ add(tmp2, tmp2, tmp1);
+    __ lbu(tmp2, Address(tmp2));
+    __ beqz(tmp2, *stub->continuation(), true /* is_far */);
+  }
+
+  ce->store_parameter(res, 0);
+  ce->store_parameter(addr, 1);
+
+  if (is_strong) {
+    if (is_native) {
+      __ far_call(RuntimeAddress(bs->load_reference_barrier_strong_native_rt_code_blob()->code_begin()));
+    } else {
+      __ far_call(RuntimeAddress(bs->load_reference_barrier_strong_rt_code_blob()->code_begin()));
+    }
+  } else if (is_weak) {
+    __ far_call(RuntimeAddress(bs->load_reference_barrier_weak_rt_code_blob()->code_begin()));
+  } else {
+    assert(is_phantom, "only remaining strength");
+    __ far_call(RuntimeAddress(bs->load_reference_barrier_phantom_rt_code_blob()->code_begin()));
+  }
+
+  __ j(*stub->continuation());
+}
+
+#undef __
+
+#define __ sasm->
+
+void ShenandoahBarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAssembler* sasm) {
+  __ prologue("shenandoah_pre_barrier", false);
+
+  // arg0 : previous value of memory
+
+  BarrierSet* bs = BarrierSet::barrier_set();
+
+  const Register pre_val = x10;
+  const Register thread = xthread;
+  const Register tmp = t0;
+
+  Address queue_index(thread, in_bytes(ShenandoahThreadLocalData::satb_mark_queue_index_offset()));
+  Address buffer(thread, in_bytes(ShenandoahThreadLocalData::satb_mark_queue_buffer_offset()));
+
+  Label done;
+  Label runtime;
+
+  // Is marking still active?
+  Address gc_state(thread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
+  __ lb(tmp, gc_state);
+  __ andi(tmp, tmp, ShenandoahHeap::MARKING);
+  __ beqz(tmp, done);
+
+  // Can we store original value in the thread's buffer?
+  __ ld(tmp, queue_index);
+  __ beqz(tmp, runtime);
+
+  __ sub(tmp, tmp, wordSize);
+  __ sd(tmp, queue_index);
+  __ ld(t1, buffer);
+  __ add(tmp, tmp, t1);
+  __ load_parameter(0, t1);
+  __ sd(t1, Address(tmp, 0));
+  __ j(done);
+
+  __ bind(runtime);
+  __ push_call_clobbered_registers();
+  __ load_parameter(0, pre_val);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), pre_val, thread);
+  __ pop_call_clobbered_registers();
+  __ bind(done);
+
+  __ epilogue();
+}
+
+void ShenandoahBarrierSetAssembler::generate_c1_load_reference_barrier_runtime_stub(StubAssembler* sasm,
+                                                                                    DecoratorSet decorators) {
+  __ prologue("shenandoah_load_reference_barrier", false);
+  // arg0 : object to be resolved
+
+  __ push_call_clobbered_registers();
+  __ load_parameter(0, x10);
+  __ load_parameter(1, x11);
+
+  bool is_strong  = ShenandoahBarrierSet::is_strong_access(decorators);
+  bool is_weak    = ShenandoahBarrierSet::is_weak_access(decorators);
+  bool is_phantom = ShenandoahBarrierSet::is_phantom_access(decorators);
+  bool is_native  = ShenandoahBarrierSet::is_native_access(decorators);
+  if (is_strong) {
+    if (is_native) {
+      __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_strong);
+    } else {
+      if (UseCompressedOops) {
+        __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_strong_narrow);
+      } else {
+        __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_strong);
+      }
+    }
+  } else if (is_weak) {
+    assert(!is_native, "weak must not be called off-heap");
+    if (UseCompressedOops) {
+      __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_weak_narrow);
+    } else {
+      __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_weak);
+    }
+  } else {
+    assert(is_phantom, "only remaining strength");
+    assert(is_native, "phantom must only be called off-heap");
+    __ li(ra, (int64_t)(uintptr_t)ShenandoahRuntime::load_reference_barrier_phantom);
+  }
+  __ jalr(ra);
+  __ mv(t0, x10);
+  __ pop_call_clobbered_registers();
+  __ mv(x10, t0);
+
+  __ epilogue();
+}
+
+#undef __
+
+#endif // COMPILER1
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
new file mode 100644
index 00000000000..a705f497667
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_RISCV_HPP
+#define CPU_RISCV_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_RISCV_HPP
+
+#include "asm/macroAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shenandoah/shenandoahBarrierSet.hpp"
+#ifdef COMPILER1
+class LIR_Assembler;
+class ShenandoahPreBarrierStub;
+class ShenandoahLoadReferenceBarrierStub;
+class StubAssembler;
+#endif
+class StubCodeGenerator;
+
+class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
+private:
+
+  void satb_write_barrier_pre(MacroAssembler* masm,
+                              Register obj,
+                              Register pre_val,
+                              Register thread,
+                              Register tmp,
+                              bool tosca_live,
+                              bool expand_call);
+  void shenandoah_write_barrier_pre(MacroAssembler* masm,
+                                    Register obj,
+                                    Register pre_val,
+                                    Register thread,
+                                    Register tmp,
+                                    bool tosca_live,
+                                    bool expand_call);
+
+  void resolve_forward_pointer(MacroAssembler* masm, Register dst, Register tmp = noreg);
+  void resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp = noreg);
+  void load_reference_barrier(MacroAssembler* masm, Register dst, Address load_addr, DecoratorSet decorators);
+
+public:
+
+  void iu_barrier(MacroAssembler* masm, Register dst, Register tmp);
+
+#ifdef COMPILER1
+  void gen_pre_barrier_stub(LIR_Assembler* ce, ShenandoahPreBarrierStub* stub);
+  void gen_load_reference_barrier_stub(LIR_Assembler* ce, ShenandoahLoadReferenceBarrierStub* stub);
+  void generate_c1_pre_barrier_runtime_stub(StubAssembler* sasm);
+  void generate_c1_load_reference_barrier_runtime_stub(StubAssembler* sasm, DecoratorSet decorators);
+#endif
+
+  virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
+                                  Register src, Register dst, Register count, RegSet saved_regs);
+
+  virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                       Register dst, Address src, Register tmp1, Register tmp_thread);
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
+                        Address dst, Register val, Register tmp1, Register tmp2);
+
+  virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
+                                             Register obj, Register tmp, Label& slowpath);
+
+  void cmpxchg_oop(MacroAssembler* masm, Register addr, Register expected, Register new_val,
+                   Assembler::Aqrl acquire, Assembler::Aqrl release, bool is_cae, Register result);
+};
+
+#endif // CPU_RISCV_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv64.ad b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv64.ad
new file mode 100644
index 00000000000..6c855f23c2a
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv64.ad
@@ -0,0 +1,285 @@
+//
+// Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+// Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+//
+
+source_hpp %{
+#include "gc/shenandoah/shenandoahBarrierSet.hpp"
+#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
+%}
+
+instruct compareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
+  match(Set res (ShenandoahCompareAndSwapP mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP tmp, KILL cr);
+
+  format %{
+    "cmpxchg_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp, #@compareAndSwapP_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::relaxed /* acquire */, Assembler::rl /* release */,
+                                                   false /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
+  match(Set res (ShenandoahCompareAndSwapN mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP tmp, KILL cr);
+
+  format %{
+    "cmpxchgw_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp, #@compareAndSwapN_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::relaxed /* acquire */, Assembler::rl /* release */,
+                                                   false /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_reserved(n));
+  match(Set res (ShenandoahCompareAndSwapP mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP tmp, KILL cr);
+
+  format %{
+    "cmpxchg_acq_shenandoah_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp, #@compareAndSwapPAcq_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::aq /* acquire */, Assembler::rl /* release */,
+                                                   false /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_reserved(n));
+  match(Set res (ShenandoahCompareAndSwapN mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP tmp, KILL cr);
+
+  format %{
+    "cmpxchgw_acq_shenandoah_narrow_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp, #@compareAndSwapNAcq_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::aq /* acquire */, Assembler::rl /* release */,
+                                                   false /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeN_shenandoah(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
+  match(Set res (ShenandoahCompareAndExchangeN mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+  effect(TEMP_DEF res, TEMP tmp, KILL cr);
+
+  format %{
+    "cmpxchgw_shenandoah $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeN_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::relaxed /* acquire */, Assembler::rl /* release */,
+                                                   true /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeP_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
+  match(Set res (ShenandoahCompareAndExchangeP mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP_DEF res, TEMP tmp, KILL cr);
+  format %{
+    "cmpxchg_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp, #@compareAndExchangeP_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::relaxed /* acquire */, Assembler::rl /* release */,
+                                                   true /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
+  match(Set res (ShenandoahWeakCompareAndSwapN mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP tmp, KILL cr);
+  format %{
+    "cmpxchgw_shenandoah $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval, #@weakCompareAndSwapN_shenandoah"
+    "mv $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    // Weak is not current supported by ShenandoahBarrierSet::cmpxchg_oop
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::relaxed /* acquire */, Assembler::rl /* release */,
+                                                   false /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeNAcq_shenandoah(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_reserved(n));
+  match(Set res (ShenandoahCompareAndExchangeN mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP_DEF res, TEMP tmp, KILL cr);
+  format %{
+    "cmpxchgw_acq_shenandoah $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeNAcq_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register);
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::aq /* acquire */, Assembler::rl /* release */,
+                                                   true /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangePAcq_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_reserved(n));
+  match(Set res (ShenandoahCompareAndExchangeP mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP_DEF res, TEMP tmp, KILL cr);
+  format %{
+    "cmpxchg_acq_shenandoah $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangePAcq_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register);
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::aq /* acquire */, Assembler::rl /* release */,
+                                                   true /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
+  match(Set res (ShenandoahWeakCompareAndSwapP mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP tmp, KILL cr);
+  format %{
+    "cmpxchg_shenandoah $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval, #@weakCompareAndSwapP_shenandoah"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::relaxed /* acquire */, Assembler::rl /* release */,
+                                                   false /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_reserved(n));
+  match(Set res (ShenandoahWeakCompareAndSwapN mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP tmp, KILL cr);
+  format %{
+    "cmpxchgw_acq_shenandoah $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval, #@weakCompareAndSwapNAcq_shenandoah"
+    "mv $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    // Weak is not current supported by ShenandoahBarrierSet::cmpxchg_oop
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::aq /* acquire */, Assembler::rl /* release */,
+                                                   false /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
+  predicate(needs_acquiring_load_reserved(n));
+  match(Set res (ShenandoahWeakCompareAndSwapP mem (Binary oldval newval)));
+  ins_cost(10 * DEFAULT_COST);
+
+  effect(TEMP tmp, KILL cr);
+  format %{
+    "cmpxchg_acq_shenandoah $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval, #@weakCompareAndSwapPAcq_shenandoah"
+    "mv $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+  %}
+
+  ins_encode %{
+    Register tmp = $tmp$$Register;
+    __ mv(tmp, $oldval$$Register); // Must not clobber oldval.
+    // Weak is not current supported by ShenandoahBarrierSet::cmpxchg_oop
+    ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
+                                                   Assembler::aq /* acquire */, Assembler::rl /* release */,
+                                                   false /* is_cae */, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
diff --git a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
new file mode 100644
index 00000000000..3d3f4d4d774
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
@@ -0,0 +1,441 @@
+/*
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "code/codeBlob.hpp"
+#include "code/vmreg.inline.hpp"
+#include "gc/z/zBarrier.inline.hpp"
+#include "gc/z/zBarrierSet.hpp"
+#include "gc/z/zBarrierSetAssembler.hpp"
+#include "gc/z/zBarrierSetRuntime.hpp"
+#include "gc/z/zThreadLocalData.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "utilities/macros.hpp"
+#ifdef COMPILER1
+#include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
+#include "gc/z/c1/zBarrierSetC1.hpp"
+#endif // COMPILER1
+#ifdef COMPILER2
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#endif // COMPILER2
+
+#ifdef PRODUCT
+#define BLOCK_COMMENT(str) /* nothing */
+#else
+#define BLOCK_COMMENT(str) __ block_comment(str)
+#endif
+
+#undef __
+#define __ masm->
+
+void ZBarrierSetAssembler::load_at(MacroAssembler* masm,
+                                   DecoratorSet decorators,
+                                   BasicType type,
+                                   Register dst,
+                                   Address src,
+                                   Register tmp1,
+                                   Register tmp_thread) {
+  if (!ZBarrierSet::barrier_needed(decorators, type)) {
+    // Barrier not needed
+    BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread);
+    return;
+  }
+
+  assert_different_registers(t1, src.base());
+  assert_different_registers(t0, t1, dst);
+
+  Label done;
+
+  // Load bad mask into temp register.
+  __ la(t0, src);
+  __ ld(t1, address_bad_mask_from_thread(xthread));
+  __ ld(dst, Address(t0));
+
+  // Test reference against bad mask. If mask bad, then we need to fix it up.
+  __ andr(t1, dst, t1);
+  __ beqz(t1, done);
+
+  __ enter();
+
+  __ push_call_clobbered_registers_except(RegSet::of(dst));
+
+  if (c_rarg0 != dst) {
+    __ mv(c_rarg0, dst);
+  }
+
+  __ mv(c_rarg1, t0);
+
+  __ call_VM_leaf(ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr(decorators), 2);
+
+  // Make sure dst has the return value.
+  if (dst != x10) {
+    __ mv(dst, x10);
+  }
+
+  __ pop_call_clobbered_registers_except(RegSet::of(dst));
+  __ leave();
+
+  __ bind(done);
+}
+
+#ifdef ASSERT
+
+void ZBarrierSetAssembler::store_at(MacroAssembler* masm,
+                                    DecoratorSet decorators,
+                                    BasicType type,
+                                    Address dst,
+                                    Register val,
+                                    Register tmp1,
+                                    Register tmp2) {
+  // Verify value
+  if (is_reference_type(type)) {
+    // Note that src could be noreg, which means we
+    // are storing null and can skip verification.
+    if (val != noreg) {
+      Label done;
+
+      // tmp1 and tmp2 are often set to noreg.
+      RegSet savedRegs = RegSet::of(t0);
+      __ push_reg(savedRegs, sp);
+
+      __ ld(t0, address_bad_mask_from_thread(xthread));
+      __ andr(t0, val, t0);
+      __ beqz(t0, done);
+      __ stop("Verify oop store failed");
+      __ should_not_reach_here();
+      __ bind(done);
+      __ pop_reg(savedRegs, sp);
+    }
+  }
+
+  // Store value
+  BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2);
+}
+
+#endif // ASSERT
+
+void ZBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm,
+                                              DecoratorSet decorators,
+                                              bool is_oop,
+                                              Register src,
+                                              Register dst,
+                                              Register count,
+                                              RegSet saved_regs) {
+  if (!is_oop) {
+    // Barrier not needed
+    return;
+  }
+
+  BLOCK_COMMENT("ZBarrierSetAssembler::arraycopy_prologue {");
+
+  assert_different_registers(src, count, t0);
+
+  __ push_reg(saved_regs, sp);
+
+  if (count == c_rarg0 && src == c_rarg1) {
+    // exactly backwards!!
+    __ xorr(c_rarg0, c_rarg0, c_rarg1);
+    __ xorr(c_rarg1, c_rarg0, c_rarg1);
+    __ xorr(c_rarg0, c_rarg0, c_rarg1);
+  } else {
+    __ mv(c_rarg0, src);
+    __ mv(c_rarg1, count);
+  }
+
+  __ call_VM_leaf(ZBarrierSetRuntime::load_barrier_on_oop_array_addr(), 2);
+
+  __ pop_reg(saved_regs, sp);
+
+  BLOCK_COMMENT("} ZBarrierSetAssembler::arraycopy_prologue");
+}
+
+void ZBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm,
+                                                         Register jni_env,
+                                                         Register robj,
+                                                         Register tmp,
+                                                         Label& slowpath) {
+  BLOCK_COMMENT("ZBarrierSetAssembler::try_resolve_jobject_in_native {");
+
+  assert_different_registers(jni_env, robj, tmp);
+
+  // Resolve jobject
+  BarrierSetAssembler::try_resolve_jobject_in_native(masm, jni_env, robj, tmp, slowpath);
+
+  // Compute the offset of address bad mask from the field of jni_environment
+  long int bad_mask_relative_offset = (long int) (in_bytes(ZThreadLocalData::address_bad_mask_offset()) -
+                                                  in_bytes(JavaThread::jni_environment_offset()));
+
+  // Load the address bad mask
+  __ ld(tmp, Address(jni_env, bad_mask_relative_offset));
+
+  // Check address bad mask
+  __ andr(tmp, robj, tmp);
+  __ bnez(tmp, slowpath);
+
+  BLOCK_COMMENT("} ZBarrierSetAssembler::try_resolve_jobject_in_native");
+}
+
+#ifdef COMPILER2
+
+OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) {
+  if (!OptoReg::is_reg(opto_reg)) {
+    return OptoReg::Bad;
+  }
+
+  const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+  if (vm_reg->is_FloatRegister()) {
+    return opto_reg & ~1;
+  }
+
+  return opto_reg;
+}
+
+#undef __
+#define __ _masm->
+
+class ZSaveLiveRegisters {
+private:
+  MacroAssembler* const _masm;
+  RegSet                _gp_regs;
+  FloatRegSet           _fp_regs;
+  VectorRegSet          _vp_regs;
+
+public:
+  void initialize(ZLoadBarrierStubC2* stub) {
+    // Record registers that needs to be saved/restored
+    RegMaskIterator rmi(stub->live());
+    while (rmi.has_next()) {
+      const OptoReg::Name opto_reg = rmi.next();
+      if (OptoReg::is_reg(opto_reg)) {
+        const VMReg vm_reg = OptoReg::as_VMReg(opto_reg);
+        if (vm_reg->is_Register()) {
+          _gp_regs += RegSet::of(vm_reg->as_Register());
+        } else if (vm_reg->is_FloatRegister()) {
+          _fp_regs += FloatRegSet::of(vm_reg->as_FloatRegister());
+        } else if (vm_reg->is_VectorRegister()) {
+          const VMReg vm_reg_base = OptoReg::as_VMReg(opto_reg & ~(VectorRegisterImpl::max_slots_per_register - 1));
+          _vp_regs += VectorRegSet::of(vm_reg_base->as_VectorRegister());
+        } else {
+          fatal("Unknown register type");
+        }
+      }
+    }
+
+    // Remove C-ABI SOE registers, tmp regs and _ref register that will be updated
+    _gp_regs -= RegSet::range(x18, x27) + RegSet::of(x2) + RegSet::of(x8, x9) + RegSet::of(x5, stub->ref());
+  }
+
+  ZSaveLiveRegisters(MacroAssembler* masm, ZLoadBarrierStubC2* stub) :
+      _masm(masm),
+      _gp_regs(),
+      _fp_regs(),
+      _vp_regs() {
+    // Figure out what registers to save/restore
+    initialize(stub);
+
+    // Save registers
+    __ push_reg(_gp_regs, sp);
+    __ push_fp(_fp_regs, sp);
+    __ push_vp(_vp_regs, sp);
+  }
+
+  ~ZSaveLiveRegisters() {
+    // Restore registers
+    __ pop_vp(_vp_regs, sp);
+    __ pop_fp(_fp_regs, sp);
+    __ pop_reg(_gp_regs, sp);
+  }
+};
+
+class ZSetupArguments {
+private:
+  MacroAssembler* const _masm;
+  const Register        _ref;
+  const Address         _ref_addr;
+
+public:
+  ZSetupArguments(MacroAssembler* masm, ZLoadBarrierStubC2* stub) :
+      _masm(masm),
+      _ref(stub->ref()),
+      _ref_addr(stub->ref_addr()) {
+
+    // Setup arguments
+    if (_ref_addr.base() == noreg) {
+      // No self healing
+      if (_ref != c_rarg0) {
+        __ mv(c_rarg0, _ref);
+      }
+      __ mv(c_rarg1, zr);
+    } else {
+      // Self healing
+      if (_ref == c_rarg0) {
+        // _ref is already at correct place
+        __ la(c_rarg1, _ref_addr);
+      } else if (_ref != c_rarg1) {
+        // _ref is in wrong place, but not in c_rarg1, so fix it first
+        __ la(c_rarg1, _ref_addr);
+        __ mv(c_rarg0, _ref);
+      } else if (_ref_addr.base() != c_rarg0) {
+        assert(_ref == c_rarg1, "Mov ref first, vacating c_rarg0");
+        __ mv(c_rarg0, _ref);
+        __ la(c_rarg1, _ref_addr);
+      } else {
+        assert(_ref == c_rarg1, "Need to vacate c_rarg1 and _ref_addr is using c_rarg0");
+        if (_ref_addr.base() == c_rarg0) {
+          __ mv(t1, c_rarg1);
+          __ la(c_rarg1, _ref_addr);
+          __ mv(c_rarg0, t1);
+        } else {
+          ShouldNotReachHere();
+        }
+      }
+    }
+  }
+
+  ~ZSetupArguments() {
+    // Transfer result
+    if (_ref != x10) {
+      __ mv(_ref, x10);
+    }
+  }
+};
+
+#undef __
+#define __ masm->
+
+void ZBarrierSetAssembler::generate_c2_load_barrier_stub(MacroAssembler* masm, ZLoadBarrierStubC2* stub) const {
+  BLOCK_COMMENT("ZLoadBarrierStubC2");
+
+  // Stub entry
+  __ bind(*stub->entry());
+
+  {
+    ZSaveLiveRegisters save_live_registers(masm, stub);
+    ZSetupArguments setup_arguments(masm, stub);
+    int32_t offset = 0;
+    __ la_patchable(t0, stub->slow_path(), offset);
+    __ jalr(x1, t0, offset);
+  }
+
+  // Stub exit
+  __ j(*stub->continuation());
+}
+
+#undef __
+
+#endif // COMPILER2
+
+#ifdef COMPILER1
+#undef __
+#define __ ce->masm()->
+
+void ZBarrierSetAssembler::generate_c1_load_barrier_test(LIR_Assembler* ce,
+                                                         LIR_Opr ref) const {
+  assert_different_registers(xthread, ref->as_register(), t1);
+  __ ld(t1, address_bad_mask_from_thread(xthread));
+  __ andr(t1, t1, ref->as_register());
+}
+
+void ZBarrierSetAssembler::generate_c1_load_barrier_stub(LIR_Assembler* ce,
+                                                         ZLoadBarrierStubC1* stub) const {
+  // Stub entry
+  __ bind(*stub->entry());
+
+  Register ref = stub->ref()->as_register();
+  Register ref_addr = noreg;
+  Register tmp = noreg;
+
+  if (stub->tmp()->is_valid()) {
+    // Load address into tmp register
+    ce->leal(stub->ref_addr(), stub->tmp());
+    ref_addr = tmp = stub->tmp()->as_pointer_register();
+  } else {
+    // Address already in register
+    ref_addr = stub->ref_addr()->as_address_ptr()->base()->as_pointer_register();
+  }
+
+  assert_different_registers(ref, ref_addr, noreg);
+
+  // Save x10 unless it is the result or tmp register
+  // Set up SP to accomodate parameters and maybe x10.
+  if (ref != x10 && tmp != x10) {
+    __ sub(sp, sp, 32);
+    __ sd(x10, Address(sp, 16));
+  } else {
+    __ sub(sp, sp, 16);
+  }
+
+  // Setup arguments and call runtime stub
+  ce->store_parameter(ref_addr, 1);
+  ce->store_parameter(ref, 0);
+
+  __ far_call(stub->runtime_stub());
+
+  // Verify result
+  __ verify_oop(x10, "Bad oop");
+
+
+  // Move result into place
+  if (ref != x10) {
+    __ mv(ref, x10);
+  }
+
+  // Restore x10 unless it is the result or tmp register
+  if (ref != x10 && tmp != x10) {
+    __ ld(x10, Address(sp, 16));
+    __ add(sp, sp, 32);
+  } else {
+    __ add(sp, sp, 16);
+  }
+
+  // Stub exit
+  __ j(*stub->continuation());
+}
+
+#undef __
+#define __ sasm->
+
+void ZBarrierSetAssembler::generate_c1_load_barrier_runtime_stub(StubAssembler* sasm,
+                                                                 DecoratorSet decorators) const {
+  __ prologue("zgc_load_barrier stub", false);
+
+  __ push_call_clobbered_registers_except(RegSet::of(x10));
+
+  // Setup arguments
+  __ load_parameter(0, c_rarg0);
+  __ load_parameter(1, c_rarg1);
+
+  __ call_VM_leaf(ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr(decorators), 2);
+
+  __ pop_call_clobbered_registers_except(RegSet::of(x10));
+
+  __ epilogue();
+}
+
+#undef __
+#endif // COMPILER1
diff --git a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
new file mode 100644
index 00000000000..dc07ab635fe
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GC_Z_ZBARRIERSETASSEMBLER_RISCV_HPP
+#define CPU_RISCV_GC_Z_ZBARRIERSETASSEMBLER_RISCV_HPP
+
+#include "code/vmreg.hpp"
+#include "oops/accessDecorators.hpp"
+#ifdef COMPILER2
+#include "opto/optoreg.hpp"
+#endif // COMPILER2
+
+#ifdef COMPILER1
+class LIR_Assembler;
+class LIR_Opr;
+class StubAssembler;
+class ZLoadBarrierStubC1;
+#endif // COMPILER1
+
+#ifdef COMPILER2
+class Node;
+class ZLoadBarrierStubC2;
+#endif // COMPILER2
+
+class ZBarrierSetAssembler : public ZBarrierSetAssemblerBase {
+public:
+  virtual void load_at(MacroAssembler* masm,
+                       DecoratorSet decorators,
+                       BasicType type,
+                       Register dst,
+                       Address src,
+                       Register tmp1,
+                       Register tmp_thread);
+
+#ifdef ASSERT
+  virtual void store_at(MacroAssembler* masm,
+                        DecoratorSet decorators,
+                        BasicType type,
+                        Address dst,
+                        Register val,
+                        Register tmp1,
+                        Register tmp2);
+#endif // ASSERT
+
+  virtual void arraycopy_prologue(MacroAssembler* masm,
+                                  DecoratorSet decorators,
+                                  bool is_oop,
+                                  Register src,
+                                  Register dst,
+                                  Register count,
+                                  RegSet saved_regs);
+
+  virtual void try_resolve_jobject_in_native(MacroAssembler* masm,
+                                             Register jni_env,
+                                             Register robj,
+                                             Register tmp,
+                                             Label& slowpath);
+
+#ifdef COMPILER1
+  void generate_c1_load_barrier_test(LIR_Assembler* ce,
+                                     LIR_Opr ref) const;
+
+  void generate_c1_load_barrier_stub(LIR_Assembler* ce,
+                                     ZLoadBarrierStubC1* stub) const;
+
+  void generate_c1_load_barrier_runtime_stub(StubAssembler* sasm,
+                                             DecoratorSet decorators) const;
+#endif // COMPILER1
+
+#ifdef COMPILER2
+  OptoReg::Name refine_register(const Node* node,
+                                OptoReg::Name opto_reg);
+
+  void generate_c2_load_barrier_stub(MacroAssembler* masm,
+                                     ZLoadBarrierStubC2* stub) const;
+#endif // COMPILER2
+};
+
+#endif // CPU_RISCV_GC_Z_ZBARRIERSETASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.cpp b/src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.cpp
new file mode 100644
index 00000000000..d14997790af
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.cpp
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/gc_globals.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/os.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/powerOfTwo.hpp"
+
+#ifdef LINUX
+#include <sys/mman.h>
+#endif // LINUX
+
+//
+// The heap can have three different layouts, depending on the max heap size.
+//
+// Address Space & Pointer Layout 1
+// --------------------------------
+//
+//  +--------------------------------+ 0x00007FFFFFFFFFFF (127TB)
+//  .                                .
+//  .                                .
+//  .                                .
+//  +--------------------------------+ 0x0000014000000000 (20TB)
+//  |         Remapped View          |
+//  +--------------------------------+ 0x0000010000000000 (16TB)
+//  .                                .
+//  +--------------------------------+ 0x00000c0000000000 (12TB)
+//  |         Marked1 View           |
+//  +--------------------------------+ 0x0000080000000000 (8TB)
+//  |         Marked0 View           |
+//  +--------------------------------+ 0x0000040000000000 (4TB)
+//  .                                .
+//  +--------------------------------+ 0x0000000000000000
+//
+//   6                  4 4  4 4
+//   3                  6 5  2 1                                             0
+//  +--------------------+----+-----------------------------------------------+
+//  |00000000 00000000 00|1111|11 11111111 11111111 11111111 11111111 11111111|
+//  +--------------------+----+-----------------------------------------------+
+//  |                    |    |
+//  |                    |    * 41-0 Object Offset (42-bits, 4TB address space)
+//  |                    |
+//  |                    * 45-42 Metadata Bits (4-bits)  0001 = Marked0      (Address view 4-8TB)
+//  |                                                    0010 = Marked1      (Address view 8-12TB)
+//  |                                                    0100 = Remapped     (Address view 16-20TB)
+//  |                                                    1000 = Finalizable  (Address view N/A)
+//  |
+//  * 63-46 Fixed (18-bits, always zero)
+//
+//
+// Address Space & Pointer Layout 2
+// --------------------------------
+//
+//  +--------------------------------+ 0x00007FFFFFFFFFFF (127TB)
+//  .                                .
+//  .                                .
+//  .                                .
+//  +--------------------------------+ 0x0000280000000000 (40TB)
+//  |         Remapped View          |
+//  +--------------------------------+ 0x0000200000000000 (32TB)
+//  .                                .
+//  +--------------------------------+ 0x0000180000000000 (24TB)
+//  |         Marked1 View           |
+//  +--------------------------------+ 0x0000100000000000 (16TB)
+//  |         Marked0 View           |
+//  +--------------------------------+ 0x0000080000000000 (8TB)
+//  .                                .
+//  +--------------------------------+ 0x0000000000000000
+//
+//   6                 4 4  4 4
+//   3                 7 6  3 2                                              0
+//  +------------------+-----+------------------------------------------------+
+//  |00000000 00000000 0|1111|111 11111111 11111111 11111111 11111111 11111111|
+//  +-------------------+----+------------------------------------------------+
+//  |                   |    |
+//  |                   |    * 42-0 Object Offset (43-bits, 8TB address space)
+//  |                   |
+//  |                   * 46-43 Metadata Bits (4-bits)  0001 = Marked0      (Address view 8-16TB)
+//  |                                                   0010 = Marked1      (Address view 16-24TB)
+//  |                                                   0100 = Remapped     (Address view 32-40TB)
+//  |                                                   1000 = Finalizable  (Address view N/A)
+//  |
+//  * 63-47 Fixed (17-bits, always zero)
+//
+//
+// Address Space & Pointer Layout 3
+// --------------------------------
+//
+//  +--------------------------------+ 0x00007FFFFFFFFFFF (127TB)
+//  .                                .
+//  .                                .
+//  .                                .
+//  +--------------------------------+ 0x0000500000000000 (80TB)
+//  |         Remapped View          |
+//  +--------------------------------+ 0x0000400000000000 (64TB)
+//  .                                .
+//  +--------------------------------+ 0x0000300000000000 (48TB)
+//  |         Marked1 View           |
+//  +--------------------------------+ 0x0000200000000000 (32TB)
+//  |         Marked0 View           |
+//  +--------------------------------+ 0x0000100000000000 (16TB)
+//  .                                .
+//  +--------------------------------+ 0x0000000000000000
+//
+//   6               4  4  4 4
+//   3               8  7  4 3                                               0
+//  +------------------+----+-------------------------------------------------+
+//  |00000000 00000000 |1111|1111 11111111 11111111 11111111 11111111 11111111|
+//  +------------------+----+-------------------------------------------------+
+//  |                  |    |
+//  |                  |    * 43-0 Object Offset (44-bits, 16TB address space)
+//  |                  |
+//  |                  * 47-44 Metadata Bits (4-bits)  0001 = Marked0      (Address view 16-32TB)
+//  |                                                  0010 = Marked1      (Address view 32-48TB)
+//  |                                                  0100 = Remapped     (Address view 64-80TB)
+//  |                                                  1000 = Finalizable  (Address view N/A)
+//  |
+//  * 63-48 Fixed (16-bits, always zero)
+//
+
+// Default value if probing is not implemented for a certain platform: 128TB
+static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
+// Minimum value returned, if probing fails: 64GB
+static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
+
+static size_t probe_valid_max_address_bit() {
+#ifdef LINUX
+  size_t max_address_bit = 0;
+  const size_t page_size = os::vm_page_size();
+  for (size_t i = DEFAULT_MAX_ADDRESS_BIT; i > MINIMUM_MAX_ADDRESS_BIT; --i) {
+    const uintptr_t base_addr = ((uintptr_t) 1U) << i;
+    if (msync((void*)base_addr, page_size, MS_ASYNC) == 0) {
+      // msync suceeded, the address is valid, and maybe even already mapped.
+      max_address_bit = i;
+      break;
+    }
+    if (errno != ENOMEM) {
+      // Some error occured. This should never happen, but msync
+      // has some undefined behavior, hence ignore this bit.
+#ifdef ASSERT
+      fatal("Received '%s' while probing the address space for the highest valid bit", os::errno_name(errno));
+#else // ASSERT
+      log_warning_p(gc)("Received '%s' while probing the address space for the highest valid bit", os::errno_name(errno));
+#endif // ASSERT
+      continue;
+    }
+    // Since msync failed with ENOMEM, the page might not be mapped.
+    // Try to map it, to see if the address is valid.
+    void* const result_addr = mmap((void*) base_addr, page_size, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE, -1, 0);
+    if (result_addr != MAP_FAILED) {
+      munmap(result_addr, page_size);
+    }
+    if ((uintptr_t) result_addr == base_addr) {
+      // address is valid
+      max_address_bit = i;
+      break;
+    }
+  }
+  if (max_address_bit == 0) {
+    // probing failed, allocate a very high page and take that bit as the maximum
+    const uintptr_t high_addr = ((uintptr_t) 1U) << DEFAULT_MAX_ADDRESS_BIT;
+    void* const result_addr = mmap((void*) high_addr, page_size, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE, -1, 0);
+    if (result_addr != MAP_FAILED) {
+      max_address_bit = BitsPerSize_t - count_leading_zeros((size_t) result_addr) - 1;
+      munmap(result_addr, page_size);
+    }
+  }
+  log_info_p(gc, init)("Probing address space for the highest valid bit: " SIZE_FORMAT, max_address_bit);
+  return MAX2(max_address_bit, MINIMUM_MAX_ADDRESS_BIT);
+#else // LINUX
+  return DEFAULT_MAX_ADDRESS_BIT;
+#endif // LINUX
+}
+
+size_t ZPlatformAddressOffsetBits() {
+  const static size_t valid_max_address_offset_bits = probe_valid_max_address_bit() + 1;
+  const size_t max_address_offset_bits = valid_max_address_offset_bits - 3;
+  const size_t min_address_offset_bits = max_address_offset_bits - 2;
+  const size_t address_offset = round_up_power_of_2(MaxHeapSize * ZVirtualToPhysicalRatio);
+  const size_t address_offset_bits = log2i_exact(address_offset);
+  return clamp(address_offset_bits, min_address_offset_bits, max_address_offset_bits);
+}
+
+size_t ZPlatformAddressMetadataShift() {
+  return ZPlatformAddressOffsetBits();
+}
diff --git a/src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.hpp b/src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.hpp
new file mode 100644
index 00000000000..f20ecd9b073
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/z/zGlobals_riscv.hpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GC_Z_ZGLOBALS_RISCV_HPP
+#define CPU_RISCV_GC_Z_ZGLOBALS_RISCV_HPP
+
+const size_t ZPlatformGranuleSizeShift = 21; // 2MB
+const size_t ZPlatformHeapViews        = 3;
+const size_t ZPlatformCacheLineSize    = 64;
+
+size_t ZPlatformAddressOffsetBits();
+size_t ZPlatformAddressMetadataShift();
+
+#endif // CPU_RISCV_GC_Z_ZGLOBALS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/gc/z/z_riscv64.ad b/src/hotspot/cpu/riscv/gc/z/z_riscv64.ad
new file mode 100644
index 00000000000..6b6f87814a5
--- /dev/null
+++ b/src/hotspot/cpu/riscv/gc/z/z_riscv64.ad
@@ -0,0 +1,233 @@
+//
+// Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+
+source_hpp %{
+
+#include "gc/shared/gc_globals.hpp"
+#include "gc/z/c2/zBarrierSetC2.hpp"
+#include "gc/z/zThreadLocalData.hpp"
+
+%}
+
+source %{
+
+static void z_load_barrier(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp, int barrier_data) {
+  if (barrier_data == ZLoadBarrierElided) {
+    return;
+  }
+  ZLoadBarrierStubC2* const stub = ZLoadBarrierStubC2::create(node, ref_addr, ref, tmp, barrier_data);
+  __ ld(tmp, Address(xthread, ZThreadLocalData::address_bad_mask_offset()));
+  __ andr(tmp, tmp, ref);
+  __ bnez(tmp, *stub->entry(), true /* far */);
+  __ bind(*stub->continuation());
+}
+
+static void z_load_barrier_slow_path(MacroAssembler& _masm, const MachNode* node, Address ref_addr, Register ref, Register tmp) {
+  ZLoadBarrierStubC2* const stub = ZLoadBarrierStubC2::create(node, ref_addr, ref, tmp, ZLoadBarrierStrong);
+  __ j(*stub->entry());
+  __ bind(*stub->continuation());
+}
+
+%}
+
+// Load Pointer
+instruct zLoadP(iRegPNoSp dst, memory mem)
+%{
+  match(Set dst (LoadP mem));
+  predicate(UseZGC && (n->as_Load()->barrier_data() != 0));
+  effect(TEMP dst);
+
+  ins_cost(4 * DEFAULT_COST);
+
+  format %{ "ld  $dst, $mem, #@zLoadP" %}
+
+  ins_encode %{
+    const Address ref_addr (as_Register($mem$$base), $mem$$disp);
+    __ ld($dst$$Register, ref_addr);
+    z_load_barrier(_masm, this, ref_addr, $dst$$Register, t0 /* tmp */, barrier_data());
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+instruct zCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
+  match(Set res (CompareAndSwapP mem (Binary oldval newval)));
+  match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
+  predicate(UseZGC && !needs_acquiring_load_reserved(n) && n->as_LoadStore()->barrier_data() == ZLoadBarrierStrong);
+  effect(KILL cr, TEMP_DEF res);
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{ "cmpxchg $mem, $oldval, $newval, #@zCompareAndSwapP\n\t"
+            "mv $res, $res == $oldval" %}
+
+  ins_encode %{
+    Label failed;
+    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
+               Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register,
+               true /* result_as_bool */);
+    __ beqz($res$$Register, failed);
+    __ mv(t0, $oldval$$Register);
+    __ bind(failed);
+    if (barrier_data() != ZLoadBarrierElided) {
+      Label good;
+      __ ld(t1, Address(xthread, ZThreadLocalData::address_bad_mask_offset()), t1 /* tmp */);
+      __ andr(t1, t1, t0);
+      __ beqz(t1, good);
+      z_load_barrier_slow_path(_masm, this, Address($mem$$Register), t0 /* ref */, t1 /* tmp */);
+      __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
+                 Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register,
+                 true /* result_as_bool */);
+      __ bind(good);
+    }
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct zCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, rFlagsReg cr) %{
+  match(Set res (CompareAndSwapP mem (Binary oldval newval)));
+  match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
+  predicate(UseZGC && needs_acquiring_load_reserved(n) && (n->as_LoadStore()->barrier_data() == ZLoadBarrierStrong));
+  effect(KILL cr, TEMP_DEF res);
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{ "cmpxchg $mem, $oldval, $newval, #@zCompareAndSwapPAcq\n\t"
+            "mv $res, $res == $oldval" %}
+
+  ins_encode %{
+    Label failed;
+    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
+               Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register,
+               true /* result_as_bool */);
+    __ beqz($res$$Register, failed);
+    __ mv(t0, $oldval$$Register);
+    __ bind(failed);
+    if (barrier_data() != ZLoadBarrierElided) {
+      Label good;
+      __ ld(t1, Address(xthread, ZThreadLocalData::address_bad_mask_offset()), t1 /* tmp */);
+      __ andr(t1, t1, t0);
+      __ beqz(t1, good);
+      z_load_barrier_slow_path(_masm, this, Address($mem$$Register), t0 /* ref */, t1 /* tmp */);
+      __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
+                 Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register,
+                 true /* result_as_bool */);
+      __ bind(good);
+    }
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct zCompareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval) %{
+  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
+  predicate(UseZGC && !needs_acquiring_load_reserved(n) && n->as_LoadStore()->barrier_data() == ZLoadBarrierStrong);
+  effect(TEMP_DEF res);
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{ "cmpxchg $res = $mem, $oldval, $newval, #@zCompareAndExchangeP" %}
+
+  ins_encode %{
+    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
+               Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register);
+    if (barrier_data() != ZLoadBarrierElided) {
+      Label good;
+      __ ld(t0, Address(xthread, ZThreadLocalData::address_bad_mask_offset()));
+      __ andr(t0, t0, $res$$Register);
+      __ beqz(t0, good);
+      z_load_barrier_slow_path(_masm, this, Address($mem$$Register), $res$$Register /* ref */, t0 /* tmp */);
+      __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
+                 Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register);
+      __ bind(good);
+    }
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct zCompareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval) %{
+  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
+  predicate(UseZGC && needs_acquiring_load_reserved(n) && n->as_LoadStore()->barrier_data() == ZLoadBarrierStrong);
+  effect(TEMP_DEF res);
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{ "cmpxchg $res = $mem, $oldval, $newval, #@zCompareAndExchangePAcq" %}
+
+  ins_encode %{
+    guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+    __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
+               Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register);
+    if (barrier_data() != ZLoadBarrierElided) {
+      Label good;
+      __ ld(t0, Address(xthread, ZThreadLocalData::address_bad_mask_offset()));
+      __ andr(t0, t0, $res$$Register);
+      __ beqz(t0, good);
+      z_load_barrier_slow_path(_masm, this, Address($mem$$Register), $res$$Register /* ref */, t0 /* tmp */);
+      __ cmpxchg($mem$$Register, $oldval$$Register, $newval$$Register, Assembler::int64,
+                 Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register);
+      __ bind(good);
+    }
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct zGetAndSetP(indirect mem, iRegP newv, iRegPNoSp prev, rFlagsReg cr) %{
+  match(Set prev (GetAndSetP mem newv));
+  predicate(UseZGC && !needs_acquiring_load_reserved(n) && n->as_LoadStore()->barrier_data() != 0);
+  effect(TEMP_DEF prev, KILL cr);
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{ "atomic_xchg  $prev, $newv, [$mem], #@zGetAndSetP" %}
+
+  ins_encode %{
+    __ atomic_xchg($prev$$Register, $newv$$Register, as_Register($mem$$base));
+    z_load_barrier(_masm, this, Address(noreg, 0), $prev$$Register, t0 /* tmp */, barrier_data());
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct zGetAndSetPAcq(indirect mem, iRegP newv, iRegPNoSp prev, rFlagsReg cr) %{
+  match(Set prev (GetAndSetP mem newv));
+  predicate(UseZGC && needs_acquiring_load_reserved(n) && (n->as_LoadStore()->barrier_data() != 0));
+  effect(TEMP_DEF prev, KILL cr);
+
+  ins_cost(VOLATILE_REF_COST);
+
+  format %{ "atomic_xchg_acq  $prev, $newv, [$mem], #@zGetAndSetPAcq" %}
+
+  ins_encode %{
+    __ atomic_xchgal($prev$$Register, $newv$$Register, as_Register($mem$$base));
+    z_load_barrier(_masm, this, Address(noreg, 0), $prev$$Register, t0 /* tmp */, barrier_data());
+  %}
+  ins_pipe(pipe_serial);
+%}
diff --git a/src/hotspot/cpu/riscv/globalDefinitions_riscv.hpp b/src/hotspot/cpu/riscv/globalDefinitions_riscv.hpp
new file mode 100644
index 00000000000..2936837d951
--- /dev/null
+++ b/src/hotspot/cpu/riscv/globalDefinitions_riscv.hpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GLOBALDEFINITIONS_RISCV_HPP
+#define CPU_RISCV_GLOBALDEFINITIONS_RISCV_HPP
+
+const int StackAlignmentInBytes = 16;
+
+// Indicates whether the C calling conventions require that
+// 32-bit integer argument values are extended to 64 bits.
+const bool CCallingConventionRequiresIntsAsLongs = false;
+
+// RISCV has adopted a multicopy atomic model closely following
+// that of ARMv8.
+#define CPU_MULTI_COPY_ATOMIC
+
+// To be safe, we deoptimize when we come across an access that needs
+// patching. This is similar to what is done on aarch64.
+#define DEOPTIMIZE_WHEN_PATCHING
+
+#define SUPPORTS_NATIVE_CX8
+
+#define SUPPORT_RESERVED_STACK_AREA
+
+#define COMPRESSED_CLASS_POINTERS_DEPENDS_ON_COMPRESSED_OOPS false
+
+#define USE_POINTERS_TO_REGISTER_IMPL_ARRAY
+
+#endif // CPU_RISCV_GLOBALDEFINITIONS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
new file mode 100644
index 00000000000..cbfc0583883
--- /dev/null
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_GLOBALS_RISCV_HPP
+#define CPU_RISCV_GLOBALS_RISCV_HPP
+
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+// Sets the default values for platform dependent flags used by the runtime system.
+// (see globals.hpp)
+
+define_pd_global(bool, ImplicitNullChecks,       true);  // Generate code for implicit null checks
+define_pd_global(bool, TrapBasedNullChecks,      false);
+define_pd_global(bool, UncommonNullCast,         true);  // Uncommon-trap NULLs past to check cast
+
+define_pd_global(uintx, CodeCacheSegmentSize,    64 COMPILER1_AND_COMPILER2_PRESENT(+64)); // Tiered compilation has large code-entry alignment.
+define_pd_global(intx, CodeEntryAlignment,       64);
+define_pd_global(intx, OptoLoopAlignment,        16);
+
+#define DEFAULT_STACK_YELLOW_PAGES (2)
+#define DEFAULT_STACK_RED_PAGES (1)
+// Java_java_net_SocketOutputStream_socketWrite0() uses a 64k buffer on the
+// stack if compiled for unix and LP64. To pass stack overflow tests we need
+// 20 shadow pages.
+#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+5))
+#define DEFAULT_STACK_RESERVED_PAGES (1)
+
+#define MIN_STACK_YELLOW_PAGES DEFAULT_STACK_YELLOW_PAGES
+#define MIN_STACK_RED_PAGES    DEFAULT_STACK_RED_PAGES
+#define MIN_STACK_SHADOW_PAGES DEFAULT_STACK_SHADOW_PAGES
+#define MIN_STACK_RESERVED_PAGES (0)
+
+define_pd_global(intx, StackYellowPages, DEFAULT_STACK_YELLOW_PAGES);
+define_pd_global(intx, StackRedPages, DEFAULT_STACK_RED_PAGES);
+define_pd_global(intx, StackShadowPages, DEFAULT_STACK_SHADOW_PAGES);
+define_pd_global(intx, StackReservedPages, DEFAULT_STACK_RESERVED_PAGES);
+
+define_pd_global(bool, RewriteBytecodes,     true);
+define_pd_global(bool, RewriteFrequentPairs, true);
+
+define_pd_global(bool, PreserveFramePointer, false);
+
+define_pd_global(uintx, TypeProfileLevel, 111);
+
+define_pd_global(bool, CompactStrings, true);
+
+// Clear short arrays bigger than one word in an arch-specific way
+define_pd_global(intx, InitArrayShortSize, BytesPerLong);
+
+define_pd_global(intx, InlineSmallCode,          1000);
+
+#define ARCH_FLAGS(develop,                                                      \
+                   product,                                                      \
+                   notproduct,                                                   \
+                   range,                                                        \
+                   constraint)                                                   \
+                                                                                 \
+  product(bool, NearCpool, true,                                                 \
+         "constant pool is close to instructions")                               \
+  product(intx, BlockZeroingLowLimit, 256,                                       \
+          "Minimum size in bytes when block zeroing will be used")               \
+          range(1, max_jint)                                                     \
+  product(bool, TraceTraps, false, "Trace all traps the signal handler")         \
+  /* For now we're going to be safe and add the I/O bits to userspace fences. */ \
+  product(bool, UseConservativeFence, true,                                      \
+          "Extend i for r and o for w in the pred/succ flags of fence;"          \
+          "Extend fence.i to fence.i + fence.")                                  \
+  product(bool, AvoidUnalignedAccesses, true,                                    \
+          "Avoid generating unaligned memory accesses")                          \
+  product(bool, UseRVV, false, EXPERIMENTAL, "Use RVV instructions")             \
+  product(bool, UseRVB, false, EXPERIMENTAL, "Use RVB instructions")             \
+  product(bool, UseRVC, false, EXPERIMENTAL, "Use RVC instructions")             \
+  product(bool, UseRVVForBigIntegerShiftIntrinsics, true,                        \
+          "Use RVV instructions for left/right shift of BigInteger")
+
+#endif // CPU_RISCV_GLOBALS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/icBuffer_riscv.cpp b/src/hotspot/cpu/riscv/icBuffer_riscv.cpp
new file mode 100644
index 00000000000..cc93103dc55
--- /dev/null
+++ b/src/hotspot/cpu/riscv/icBuffer_riscv.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "code/icBuffer.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "interpreter/bytecodes.hpp"
+#include "memory/resourceArea.hpp"
+#include "nativeInst_riscv.hpp"
+#include "oops/oop.inline.hpp"
+
+int InlineCacheBuffer::ic_stub_code_size() {
+  // 6: auipc + ld + auipc + jalr + address(2 * instruction_size)
+  // 5: auipc + ld + j + address(2 * instruction_size)
+  return (MacroAssembler::far_branches() ? 6 : 5) * NativeInstruction::instruction_size;
+}
+
+#define __ masm->
+
+void InlineCacheBuffer::assemble_ic_buffer_code(address code_begin, void* cached_value, address entry_point) {
+  assert_cond(code_begin != NULL && entry_point != NULL);
+  ResourceMark rm;
+  CodeBuffer      code(code_begin, ic_stub_code_size());
+  MacroAssembler* masm            = new MacroAssembler(&code);
+  // Note: even though the code contains an embedded value, we do not need reloc info
+  // because
+  // (1) the value is old (i.e., doesn't matter for scavenges)
+  // (2) these ICStubs are removed *before* a GC happens, so the roots disappear
+
+  address start = __ pc();
+  Label l;
+  __ ld(t1, l);
+  __ far_jump(ExternalAddress(entry_point));
+  __ align(wordSize);
+  __ bind(l);
+  __ emit_int64((intptr_t)cached_value);
+  // Only need to invalidate the 1st two instructions - not the whole ic stub
+  ICache::invalidate_range(code_begin, InlineCacheBuffer::ic_stub_code_size());
+  assert(__ pc() - start == ic_stub_code_size(), "must be");
+}
+
+address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
+  NativeMovConstReg* move = nativeMovConstReg_at(code_begin);   // creation also verifies the object
+  NativeJump* jump = nativeJump_at(move->next_instruction_address());
+  return jump->jump_destination();
+}
+
+
+void* InlineCacheBuffer::ic_buffer_cached_value(address code_begin) {
+  // The word containing the cached value is at the end of this IC buffer
+  uintptr_t *p = (uintptr_t *)(code_begin + ic_stub_code_size() - wordSize);
+  void* o = (void*)*p;
+  return o;
+}
diff --git a/src/hotspot/cpu/riscv/icache_riscv.cpp b/src/hotspot/cpu/riscv/icache_riscv.cpp
new file mode 100644
index 00000000000..922a80f9f3e
--- /dev/null
+++ b/src/hotspot/cpu/riscv/icache_riscv.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "runtime/icache.hpp"
+
+#define __ _masm->
+
+static int icache_flush(address addr, int lines, int magic) {
+  os::icache_flush((long int) addr, (long int) (addr + (lines << ICache::log2_line_size)));
+  return magic;
+}
+
+void ICacheStubGenerator::generate_icache_flush(ICache::flush_icache_stub_t* flush_icache_stub) {
+  address start = (address)icache_flush;
+  *flush_icache_stub = (ICache::flush_icache_stub_t)start;
+
+  // ICache::invalidate_range() contains explicit condition that the first
+  // call is invoked on the generated icache flush stub code range.
+  ICache::invalidate_range(start, 0);
+
+  {
+    StubCodeMark mark(this, "ICache", "fake_stub_for_inlined_icache_flush");
+    __ ret();
+  }
+}
+
+#undef __
diff --git a/src/hotspot/cpu/riscv/icache_riscv.hpp b/src/hotspot/cpu/riscv/icache_riscv.hpp
new file mode 100644
index 00000000000..5bf40ca8204
--- /dev/null
+++ b/src/hotspot/cpu/riscv/icache_riscv.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_ICACHE_RISCV_HPP
+#define CPU_RISCV_ICACHE_RISCV_HPP
+
+// Interface for updating the instruction cache. Whenever the VM
+// modifies code, part of the processor instruction cache potentially
+// has to be flushed.
+
+class ICache : public AbstractICache {
+public:
+  enum {
+    stub_size      = 16,                // Size of the icache flush stub in bytes
+    line_size      = BytesPerWord,      // conservative
+    log2_line_size = LogBytesPerWord    // log2(line_size)
+  };
+};
+
+#endif // CPU_RISCV_ICACHE_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
new file mode 100644
index 00000000000..d12dcb2af19
--- /dev/null
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -0,0 +1,1940 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "interp_masm_riscv.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
+#include "logging/log.hpp"
+#include "oops/arrayOop.hpp"
+#include "oops/markWord.hpp"
+#include "oops/method.hpp"
+#include "oops/methodData.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "prims/jvmtiThreadState.hpp"
+#include "runtime/basicLock.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/safepointMechanism.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/thread.inline.hpp"
+#include "utilities/powerOfTwo.hpp"
+
+void InterpreterMacroAssembler::narrow(Register result) {
+  // Get method->_constMethod->_result_type
+  ld(t0, Address(fp, frame::interpreter_frame_method_offset * wordSize));
+  ld(t0, Address(t0, Method::const_offset()));
+  lbu(t0, Address(t0, ConstMethod::result_type_offset()));
+
+  Label done, notBool, notByte, notChar;
+
+  // common case first
+  mv(t1, T_INT);
+  beq(t0, t1, done);
+
+  // mask integer result to narrower return type.
+  mv(t1, T_BOOLEAN);
+  bne(t0, t1, notBool);
+
+  andi(result, result, 0x1);
+  j(done);
+
+  bind(notBool);
+  mv(t1, T_BYTE);
+  bne(t0, t1, notByte);
+  sign_extend(result, result, 8);
+  j(done);
+
+  bind(notByte);
+  mv(t1, T_CHAR);
+  bne(t0, t1, notChar);
+  zero_extend(result, result, 16);
+  j(done);
+
+  bind(notChar);
+  sign_extend(result, result, 16);
+
+  // Nothing to do for T_INT
+  bind(done);
+  addw(result, result, zr);
+}
+
+void InterpreterMacroAssembler::jump_to_entry(address entry) {
+  assert(entry != NULL, "Entry must have been generated by now");
+  j(entry);
+}
+
+void InterpreterMacroAssembler::check_and_handle_popframe(Register java_thread) {
+  if (JvmtiExport::can_pop_frame()) {
+    Label L;
+    // Initiate popframe handling only if it is not already being
+    // processed. If the flag has the popframe_processing bit set,
+    // it means that this code is called *during* popframe handling - we
+    // don't want to reenter.
+    // This method is only called just after the call into the vm in
+    // call_VM_base, so the arg registers are available.
+    lwu(t1, Address(xthread, JavaThread::popframe_condition_offset()));
+    andi(t0, t1, JavaThread::popframe_pending_bit);
+    beqz(t0, L);
+    andi(t0, t1, JavaThread::popframe_processing_bit);
+    bnez(t0, L);
+    // Call Interpreter::remove_activation_preserving_args_entry() to get the
+    // address of the same-named entrypoint in the generated interpreter code.
+    call_VM_leaf(CAST_FROM_FN_PTR(address, Interpreter::remove_activation_preserving_args_entry));
+    jr(x10);
+    bind(L);
+  }
+}
+
+
+void InterpreterMacroAssembler::load_earlyret_value(TosState state) {
+  ld(x12, Address(xthread, JavaThread::jvmti_thread_state_offset()));
+  const Address tos_addr(x12, JvmtiThreadState::earlyret_tos_offset());
+  const Address oop_addr(x12, JvmtiThreadState::earlyret_oop_offset());
+  const Address val_addr(x12, JvmtiThreadState::earlyret_value_offset());
+  switch (state) {
+    case atos:
+      ld(x10, oop_addr);
+      sd(zr, oop_addr);
+      verify_oop(x10);
+      break;
+    case ltos:
+      ld(x10, val_addr);
+      break;
+    case btos:  // fall through
+    case ztos:  // fall through
+    case ctos:  // fall through
+    case stos:  // fall through
+    case itos:
+      lwu(x10, val_addr);
+      break;
+    case ftos:
+      flw(f10, val_addr);
+      break;
+    case dtos:
+      fld(f10, val_addr);
+      break;
+    case vtos:
+      /* nothing to do */
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+  // Clean up tos value in the thread object
+  mvw(t0, (int) ilgl);
+  sw(t0, tos_addr);
+  sw(zr, val_addr);
+}
+
+
+void InterpreterMacroAssembler::check_and_handle_earlyret(Register java_thread) {
+  if (JvmtiExport::can_force_early_return()) {
+    Label L;
+    ld(t0, Address(xthread, JavaThread::jvmti_thread_state_offset()));
+    beqz(t0, L);  // if [thread->jvmti_thread_state() == NULL] then exit
+
+    // Initiate earlyret handling only if it is not already being processed.
+    // If the flag has the earlyret_processing bit set, it means that this code
+    // is called *during* earlyret handling - we don't want to reenter.
+    lwu(t0, Address(t0, JvmtiThreadState::earlyret_state_offset()));
+    mv(t1, JvmtiThreadState::earlyret_pending);
+    bne(t0, t1, L);
+
+    // Call Interpreter::remove_activation_early_entry() to get the address of the
+    // same-named entrypoint in the generated interpreter code.
+    ld(t0, Address(xthread, JavaThread::jvmti_thread_state_offset()));
+    lwu(t0, Address(t0, JvmtiThreadState::earlyret_tos_offset()));
+    call_VM_leaf(CAST_FROM_FN_PTR(address, Interpreter::remove_activation_early_entry), t0);
+    jr(x10);
+    bind(L);
+  }
+}
+
+void InterpreterMacroAssembler::get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset) {
+  assert(bcp_offset >= 0, "bcp is still pointing to start of bytecode");
+  lhu(reg, Address(xbcp, bcp_offset));
+  revb_h(reg, reg);
+}
+
+void InterpreterMacroAssembler::get_dispatch() {
+  int32_t offset = 0;
+  la_patchable(xdispatch, ExternalAddress((address)Interpreter::dispatch_table()), offset);
+  addi(xdispatch, xdispatch, offset);
+}
+
+void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index,
+                                                       int bcp_offset,
+                                                       size_t index_size) {
+  assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
+  if (index_size == sizeof(u2)) {
+    load_unsigned_short(index, Address(xbcp, bcp_offset));
+  } else if (index_size == sizeof(u4)) {
+    lwu(index, Address(xbcp, bcp_offset));
+    // Check if the secondary index definition is still ~x, otherwise
+    // we have to change the following assembler code to calculate the
+    // plain index.
+    assert(ConstantPool::decode_invokedynamic_index(~123) == 123, "else change next line");
+    xori(index, index, -1);
+    addw(index, index, zr);
+  } else if (index_size == sizeof(u1)) {
+    load_unsigned_byte(index, Address(xbcp, bcp_offset));
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+// Return
+// Rindex: index into constant pool
+// Rcache: address of cache entry - ConstantPoolCache::base_offset()
+//
+// A caller must add ConstantPoolCache::base_offset() to Rcache to get
+// the true address of the cache entry.
+//
+void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache,
+                                                           Register index,
+                                                           int bcp_offset,
+                                                           size_t index_size) {
+  assert_different_registers(cache, index);
+  assert_different_registers(cache, xcpool);
+  get_cache_index_at_bcp(index, bcp_offset, index_size);
+  assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below");
+  // Convert from field index to ConstantPoolCacheEntry
+  // riscv already has the cache in xcpool so there is no need to
+  // install it in cache. Instead we pre-add the indexed offset to
+  // xcpool and return it in cache. All clients of this method need to
+  // be modified accordingly.
+  shadd(cache, index, xcpool, cache, 5);
+}
+
+
+void InterpreterMacroAssembler::get_cache_and_index_and_bytecode_at_bcp(Register cache,
+                                                                        Register index,
+                                                                        Register bytecode,
+                                                                        int byte_no,
+                                                                        int bcp_offset,
+                                                                        size_t index_size) {
+  get_cache_and_index_at_bcp(cache, index, bcp_offset, index_size);
+  // We use a 32-bit load here since the layout of 64-bit words on
+  // little-endian machines allow us that.
+  // n.b. unlike x86 cache already includes the index offset
+  la(bytecode, Address(cache,
+                       ConstantPoolCache::base_offset() +
+                       ConstantPoolCacheEntry::indices_offset()));
+  membar(MacroAssembler::AnyAny);
+  lwu(bytecode, bytecode);
+  membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+  const int shift_count = (1 + byte_no) * BitsPerByte;
+  slli(bytecode, bytecode, XLEN - (shift_count + BitsPerByte));
+  srli(bytecode, bytecode, XLEN - BitsPerByte);
+}
+
+void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache,
+                                                               Register tmp,
+                                                               int bcp_offset,
+                                                               size_t index_size) {
+  assert(cache != tmp, "must use different register");
+  get_cache_index_at_bcp(tmp, bcp_offset, index_size);
+  assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below");
+  // Convert from field index to ConstantPoolCacheEntry index
+  // and from word offset to byte offset
+  assert(exact_log2(in_bytes(ConstantPoolCacheEntry::size_in_bytes())) == 2 + LogBytesPerWord,
+         "else change next line");
+  ld(cache, Address(fp, frame::interpreter_frame_cache_offset * wordSize));
+  // skip past the header
+  add(cache, cache, in_bytes(ConstantPoolCache::base_offset()));
+  // construct pointer to cache entry
+  shadd(cache, tmp, cache, tmp, 2 + LogBytesPerWord);
+}
+
+// Load object from cpool->resolved_references(index)
+void InterpreterMacroAssembler::load_resolved_reference_at_index(
+                                Register result, Register index, Register tmp) {
+  assert_different_registers(result, index);
+
+  get_constant_pool(result);
+  // Load pointer for resolved_references[] objArray
+  ld(result, Address(result, ConstantPool::cache_offset_in_bytes()));
+  ld(result, Address(result, ConstantPoolCache::resolved_references_offset_in_bytes()));
+  resolve_oop_handle(result, tmp);
+  // Add in the index
+  addi(index, index, arrayOopDesc::base_offset_in_bytes(T_OBJECT) >> LogBytesPerHeapOop);
+  shadd(result, index, result, index, LogBytesPerHeapOop);
+  load_heap_oop(result, Address(result, 0));
+}
+
+void InterpreterMacroAssembler::load_resolved_klass_at_offset(
+                                Register cpool, Register index, Register klass, Register temp) {
+  shadd(temp, index, cpool, temp, LogBytesPerWord);
+  lhu(temp, Address(temp, sizeof(ConstantPool))); // temp = resolved_klass_index
+  ld(klass, Address(cpool, ConstantPool::resolved_klasses_offset_in_bytes())); // klass = cpool->_resolved_klasses
+  shadd(klass, temp, klass, temp, LogBytesPerWord);
+  ld(klass, Address(klass, Array<Klass*>::base_offset_in_bytes()));
+}
+
+void InterpreterMacroAssembler::load_resolved_method_at_index(int byte_no,
+                                                              Register method,
+                                                              Register cache) {
+  const int method_offset = in_bytes(
+    ConstantPoolCache::base_offset() +
+      ((byte_no == TemplateTable::f2_byte)
+       ? ConstantPoolCacheEntry::f2_offset()
+       : ConstantPoolCacheEntry::f1_offset()));
+
+  ld(method, Address(cache, method_offset)); // get f1 Method*
+}
+
+// Generate a subtype check: branch to ok_is_subtype if sub_klass is a
+// subtype of super_klass.
+//
+// Args:
+//      x10: superklass
+//      Rsub_klass: subklass
+//
+// Kills:
+//      x12, x15
+void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass,
+                                                  Label& ok_is_subtype) {
+  assert(Rsub_klass != x10, "x10 holds superklass");
+  assert(Rsub_klass != x12, "x12 holds 2ndary super array length");
+  assert(Rsub_klass != x15, "x15 holds 2ndary super array scan ptr");
+
+  // Profile the not-null value's klass.
+  profile_typecheck(x12, Rsub_klass, x15); // blows x12, reloads x15
+
+  // Do the check.
+  check_klass_subtype(Rsub_klass, x10, x12, ok_is_subtype); // blows x12
+
+  // Profile the failure of the check.
+  profile_typecheck_failed(x12); // blows x12
+}
+
+// Java Expression Stack
+
+void InterpreterMacroAssembler::pop_ptr(Register r) {
+  ld(r, Address(esp, 0));
+  addi(esp, esp, wordSize);
+}
+
+void InterpreterMacroAssembler::pop_i(Register r) {
+  lw(r, Address(esp, 0)); // lw do signed extended
+  addi(esp, esp, wordSize);
+}
+
+void InterpreterMacroAssembler::pop_l(Register r) {
+  ld(r, Address(esp, 0));
+  addi(esp, esp, 2 * Interpreter::stackElementSize);
+}
+
+void InterpreterMacroAssembler::push_ptr(Register r) {
+  addi(esp, esp, -wordSize);
+  sd(r, Address(esp, 0));
+}
+
+void InterpreterMacroAssembler::push_i(Register r) {
+  addi(esp, esp, -wordSize);
+  addw(r, r, zr); // signed extended
+  sd(r, Address(esp, 0));
+}
+
+void InterpreterMacroAssembler::push_l(Register r) {
+  addi(esp, esp, -2 * wordSize);
+  sd(zr, Address(esp, wordSize));
+  sd(r, Address(esp));
+}
+
+void InterpreterMacroAssembler::pop_f(FloatRegister r) {
+  flw(r, esp, 0);
+  addi(esp, esp, wordSize);
+}
+
+void InterpreterMacroAssembler::pop_d(FloatRegister r) {
+  fld(r, esp, 0);
+  addi(esp, esp, 2 * Interpreter::stackElementSize);
+}
+
+void InterpreterMacroAssembler::push_f(FloatRegister r) {
+  addi(esp, esp, -wordSize);
+  fsw(r, Address(esp, 0));
+}
+
+void InterpreterMacroAssembler::push_d(FloatRegister r) {
+  addi(esp, esp, -2 * wordSize);
+  fsd(r, Address(esp, 0));
+}
+
+void InterpreterMacroAssembler::pop(TosState state) {
+  switch (state) {
+    case atos:
+      pop_ptr();
+      verify_oop(x10);
+      break;
+    case btos:  // fall through
+    case ztos:  // fall through
+    case ctos:  // fall through
+    case stos:  // fall through
+    case itos:
+      pop_i();
+      break;
+    case ltos:
+      pop_l();
+      break;
+    case ftos:
+      pop_f();
+      break;
+    case dtos:
+      pop_d();
+      break;
+    case vtos:
+      /* nothing to do */
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void InterpreterMacroAssembler::push(TosState state) {
+  switch (state) {
+    case atos:
+      verify_oop(x10);
+      push_ptr();
+      break;
+    case btos:  // fall through
+    case ztos:  // fall through
+    case ctos:  // fall through
+    case stos:  // fall through
+    case itos:
+      push_i();
+      break;
+    case ltos:
+      push_l();
+      break;
+    case ftos:
+      push_f();
+      break;
+    case dtos:
+      push_d();
+      break;
+    case vtos:
+      /* nothing to do */
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+// Helpers for swap and dup
+void InterpreterMacroAssembler::load_ptr(int n, Register val) {
+  ld(val, Address(esp, Interpreter::expr_offset_in_bytes(n)));
+}
+
+void InterpreterMacroAssembler::store_ptr(int n, Register val) {
+  sd(val, Address(esp, Interpreter::expr_offset_in_bytes(n)));
+}
+
+void InterpreterMacroAssembler::load_float(Address src) {
+  flw(f10, src);
+}
+
+void InterpreterMacroAssembler::load_double(Address src) {
+  fld(f10, src);
+}
+
+void InterpreterMacroAssembler::prepare_to_jump_from_interpreted() {
+  // set sender sp
+  mv(x30, sp);
+  // record last_sp
+  sd(esp, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+}
+
+// Jump to from_interpreted entry of a call unless single stepping is possible
+// in this thread in which case we must call the i2i entry
+void InterpreterMacroAssembler::jump_from_interpreted(Register method) {
+  prepare_to_jump_from_interpreted();
+  if (JvmtiExport::can_post_interpreter_events()) {
+    Label run_compiled_code;
+    // JVMTI events, such as single-stepping, are implemented partly by avoiding running
+    // compiled code in threads for which the event is enabled.  Check here for
+    // interp_only_mode if these events CAN be enabled.
+    lwu(t0, Address(xthread, JavaThread::interp_only_mode_offset()));
+    beqz(t0, run_compiled_code);
+    ld(t0, Address(method, Method::interpreter_entry_offset()));
+    jr(t0);
+    bind(run_compiled_code);
+  }
+
+  ld(t0, Address(method, Method::from_interpreted_offset()));
+  jr(t0);
+}
+
+// The following two routines provide a hook so that an implementation
+// can schedule the dispatch in two parts.  amd64 does not do this.
+void InterpreterMacroAssembler::dispatch_prolog(TosState state, int step) {
+}
+
+void InterpreterMacroAssembler::dispatch_epilog(TosState state, int step) {
+  dispatch_next(state, step);
+}
+
+void InterpreterMacroAssembler::dispatch_base(TosState state,
+                                              address* table,
+                                              bool verifyoop,
+                                              bool generate_poll,
+                                              Register Rs) {
+  // Pay attention to the argument Rs, which is acquiesce in t0.
+  if (VerifyActivationFrameSize) {
+    Unimplemented();
+  }
+  if (verifyoop && state == atos) {
+    verify_oop(x10);
+  }
+
+  Label safepoint;
+  address* const safepoint_table = Interpreter::safept_table(state);
+  bool needs_thread_local_poll = generate_poll && table != safepoint_table;
+
+  if (needs_thread_local_poll) {
+    NOT_PRODUCT(block_comment("Thread-local Safepoint poll"));
+    ld(t1, Address(xthread, JavaThread::polling_word_offset()));
+    andi(t1, t1, SafepointMechanism::poll_bit());
+    bnez(t1, safepoint);
+  }
+  if (table == Interpreter::dispatch_table(state)) {
+    li(t1, Interpreter::distance_from_dispatch_table(state));
+    add(t1, Rs, t1);
+    shadd(t1, t1, xdispatch, t1, 3);
+  } else {
+    mv(t1, (address)table);
+    shadd(t1, Rs, t1, Rs, 3);
+  }
+  ld(t1, Address(t1));
+  jr(t1);
+
+  if (needs_thread_local_poll) {
+    bind(safepoint);
+    la(t1, ExternalAddress((address)safepoint_table));
+    shadd(t1, Rs, t1, Rs, 3);
+    ld(t1, Address(t1));
+    jr(t1);
+  }
+}
+
+void InterpreterMacroAssembler::dispatch_only(TosState state, bool generate_poll, Register Rs) {
+  dispatch_base(state, Interpreter::dispatch_table(state), true, generate_poll, Rs);
+}
+
+void InterpreterMacroAssembler::dispatch_only_normal(TosState state, Register Rs) {
+  dispatch_base(state, Interpreter::normal_table(state), Rs);
+}
+
+void InterpreterMacroAssembler::dispatch_only_noverify(TosState state, Register Rs) {
+  dispatch_base(state, Interpreter::normal_table(state), false, Rs);
+}
+
+void InterpreterMacroAssembler::dispatch_next(TosState state, int step, bool generate_poll) {
+  // load next bytecode
+  load_unsigned_byte(t0, Address(xbcp, step));
+  add(xbcp, xbcp, step);
+  dispatch_base(state, Interpreter::dispatch_table(state), true, generate_poll);
+}
+
+void InterpreterMacroAssembler::dispatch_via(TosState state, address* table) {
+  // load current bytecode
+  lbu(t0, Address(xbcp, 0));
+  dispatch_base(state, table);
+}
+
+// remove activation
+//
+// Apply stack watermark barrier.
+// Unlock the receiver if this is a synchronized method.
+// Unlock any Java monitors from syncronized blocks.
+// Remove the activation from the stack.
+//
+// If there are locked Java monitors
+//    If throw_monitor_exception
+//       throws IllegalMonitorStateException
+//    Else if install_monitor_exception
+//       installs IllegalMonitorStateException
+//    Else
+//       no error processing
+void InterpreterMacroAssembler::remove_activation(
+                                TosState state,
+                                bool throw_monitor_exception,
+                                bool install_monitor_exception,
+                                bool notify_jvmdi) {
+  // Note: Registers x13 may be in use for the
+  // result check if synchronized method
+  Label unlocked, unlock, no_unlock;
+
+  // The below poll is for the stack watermark barrier. It allows fixing up frames lazily,
+  // that would normally not be safe to use. Such bad returns into unsafe territory of
+  // the stack, will call InterpreterRuntime::at_unwind.
+  Label slow_path;
+  Label fast_path;
+  safepoint_poll(slow_path, true /* at_return */, false /* acquire */, false /* in_nmethod */);
+  j(fast_path);
+
+  bind(slow_path);
+  push(state);
+  set_last_Java_frame(esp, fp, (address)pc(), t0);
+  super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), xthread);
+  reset_last_Java_frame(true);
+  pop(state);
+
+  bind(fast_path);
+
+  // get the value of _do_not_unlock_if_synchronized into x13
+  const Address do_not_unlock_if_synchronized(xthread,
+    in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
+  lbu(x13, do_not_unlock_if_synchronized);
+  sb(zr, do_not_unlock_if_synchronized); // reset the flag
+
+  // get method access flags
+  ld(x11, Address(fp, frame::interpreter_frame_method_offset * wordSize));
+  ld(x12, Address(x11, Method::access_flags_offset()));
+  andi(t0, x12, JVM_ACC_SYNCHRONIZED);
+  beqz(t0, unlocked);
+
+  // Don't unlock anything if the _do_not_unlock_if_synchronized flag
+  // is set.
+  bnez(x13, no_unlock);
+
+  // unlock monitor
+  push(state); // save result
+
+  // BasicObjectLock will be first in list, since this is a
+  // synchronized method. However, need to check that the object has
+  // not been unlocked by an explicit monitorexit bytecode.
+  const Address monitor(fp, frame::interpreter_frame_initial_sp_offset *
+                        wordSize - (int) sizeof(BasicObjectLock));
+  // We use c_rarg1 so that if we go slow path it will be the correct
+  // register for unlock_object to pass to VM directly
+  la(c_rarg1, monitor); // address of first monitor
+
+  ld(x10, Address(c_rarg1, BasicObjectLock::obj_offset_in_bytes()));
+  bnez(x10, unlock);
+
+  pop(state);
+  if (throw_monitor_exception) {
+    // Entry already unlocked, need to throw exception
+    call_VM(noreg, CAST_FROM_FN_PTR(address,
+                                    InterpreterRuntime::throw_illegal_monitor_state_exception));
+    should_not_reach_here();
+  } else {
+    // Monitor already unlocked during a stack unroll. If requested,
+    // install an illegal_monitor_state_exception.  Continue with
+    // stack unrolling.
+    if (install_monitor_exception) {
+      call_VM(noreg, CAST_FROM_FN_PTR(address,
+                                      InterpreterRuntime::new_illegal_monitor_state_exception));
+    }
+    j(unlocked);
+  }
+
+  bind(unlock);
+  unlock_object(c_rarg1);
+  pop(state);
+
+  // Check that for block-structured locking (i.e., that all locked
+  // objects has been unlocked)
+  bind(unlocked);
+
+  // x10: Might contain return value
+
+  // Check that all monitors are unlocked
+  {
+    Label loop, exception, entry, restart;
+    const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
+    const Address monitor_block_top(
+      fp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+    const Address monitor_block_bot(
+      fp, frame::interpreter_frame_initial_sp_offset * wordSize);
+
+    bind(restart);
+    // We use c_rarg1 so that if we go slow path it will be the correct
+    // register for unlock_object to pass to VM directly
+    ld(c_rarg1, monitor_block_top); // points to current entry, starting
+                                     // with top-most entry
+    la(x9, monitor_block_bot);  // points to word before bottom of
+                                  // monitor block
+
+    j(entry);
+
+    // Entry already locked, need to throw exception
+    bind(exception);
+
+    if (throw_monitor_exception) {
+      // Throw exception
+      MacroAssembler::call_VM(noreg,
+                              CAST_FROM_FN_PTR(address, InterpreterRuntime::
+                                               throw_illegal_monitor_state_exception));
+
+      should_not_reach_here();
+    } else {
+      // Stack unrolling. Unlock object and install illegal_monitor_exception.
+      // Unlock does not block, so don't have to worry about the frame.
+      // We don't have to preserve c_rarg1 since we are going to throw an exception.
+
+      push(state);
+      unlock_object(c_rarg1);
+      pop(state);
+
+      if (install_monitor_exception) {
+        call_VM(noreg, CAST_FROM_FN_PTR(address,
+                                        InterpreterRuntime::
+                                        new_illegal_monitor_state_exception));
+      }
+
+      j(restart);
+    }
+
+    bind(loop);
+    // check if current entry is used
+    add(t0, c_rarg1, BasicObjectLock::obj_offset_in_bytes());
+    ld(t0, Address(t0, 0));
+    bnez(t0, exception);
+
+    add(c_rarg1, c_rarg1, entry_size); // otherwise advance to next entry
+    bind(entry);
+    bne(c_rarg1, x9, loop); // check if bottom reached if not at bottom then check this entry
+  }
+
+  bind(no_unlock);
+
+  // jvmti support
+  if (notify_jvmdi) {
+    notify_method_exit(state, NotifyJVMTI);    // preserve TOSCA
+
+  } else {
+    notify_method_exit(state, SkipNotifyJVMTI); // preserve TOSCA
+  }
+
+  // remove activation
+  // get sender esp
+  ld(t1,
+     Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize));
+  if (StackReservedPages > 0) {
+    // testing if reserved zone needs to be re-enabled
+    Label no_reserved_zone_enabling;
+
+    ld(t0, Address(xthread, JavaThread::reserved_stack_activation_offset()));
+    ble(t1, t0, no_reserved_zone_enabling);
+
+    call_VM_leaf(
+      CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone), xthread);
+    call_VM(noreg, CAST_FROM_FN_PTR(address,
+                                    InterpreterRuntime::throw_delayed_StackOverflowError));
+    should_not_reach_here();
+
+    bind(no_reserved_zone_enabling);
+  }
+
+  // restore sender esp
+  mv(esp, t1);
+
+  // remove frame anchor
+  leave();
+  // If we're returning to interpreted code we will shortly be
+  // adjusting SP to allow some space for ESP.  If we're returning to
+  // compiled code the saved sender SP was saved in sender_sp, so this
+  // restores it.
+  andi(sp, esp, -16);
+}
+
+// Lock object
+//
+// Args:
+//      c_rarg1: BasicObjectLock to be used for locking
+//
+// Kills:
+//      x10
+//      c_rarg0, c_rarg1, c_rarg2, c_rarg3, .. (param regs)
+//      t0, t1 (temp regs)
+void InterpreterMacroAssembler::lock_object(Register lock_reg)
+{
+  assert(lock_reg == c_rarg1, "The argument is only for looks. It must be c_rarg1");
+  if (UseHeavyMonitors) {
+    call_VM(noreg,
+            CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
+            lock_reg);
+  } else {
+    Label done;
+
+    const Register swap_reg = x10;
+    const Register tmp = c_rarg2;
+    const Register obj_reg = c_rarg3; // Will contain the oop
+
+    const int obj_offset = BasicObjectLock::obj_offset_in_bytes();
+    const int lock_offset = BasicObjectLock::lock_offset_in_bytes ();
+    const int mark_offset = lock_offset +
+                            BasicLock::displaced_header_offset_in_bytes();
+
+    Label slow_case;
+
+    // Load object pointer into obj_reg c_rarg3
+    ld(obj_reg, Address(lock_reg, obj_offset));
+
+    if (DiagnoseSyncOnValueBasedClasses != 0) {
+      load_klass(tmp, obj_reg);
+      lwu(tmp, Address(tmp, Klass::access_flags_offset()));
+      andi(tmp, tmp, JVM_ACC_IS_VALUE_BASED_CLASS);
+      bnez(tmp, slow_case);
+    }
+
+    // Load (object->mark() | 1) into swap_reg
+    ld(t0, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
+    ori(swap_reg, t0, 1);
+
+    // Save (object->mark() | 1) into BasicLock's displaced header
+    sd(swap_reg, Address(lock_reg, mark_offset));
+
+    assert(lock_offset == 0,
+           "displached header must be first word in BasicObjectLock");
+
+    cmpxchg_obj_header(swap_reg, lock_reg, obj_reg, t0, done, /*fallthrough*/NULL);
+
+    // Test if the oopMark is an obvious stack pointer, i.e.,
+    //  1) (mark & 7) == 0, and
+    //  2) sp <= mark < mark + os::pagesize()
+    //
+    // These 3 tests can be done by evaluating the following
+    // expression: ((mark - sp) & (7 - os::vm_page_size())),
+    // assuming both stack pointer and pagesize have their
+    // least significant 3 bits clear.
+    // NOTE: the oopMark is in swap_reg x10 as the result of cmpxchg
+    sub(swap_reg, swap_reg, sp);
+    li(t0, (int64_t)(7 - os::vm_page_size()));
+    andr(swap_reg, swap_reg, t0);
+
+    // Save the test result, for recursive case, the result is zero
+    sd(swap_reg, Address(lock_reg, mark_offset));
+    beqz(swap_reg, done);
+
+    bind(slow_case);
+
+    // Call the runtime routine for slow case
+    call_VM(noreg,
+            CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorenter),
+            lock_reg);
+
+    bind(done);
+  }
+}
+
+
+// Unlocks an object. Used in monitorexit bytecode and
+// remove_activation.  Throws an IllegalMonitorException if object is
+// not locked by current thread.
+//
+// Args:
+//      c_rarg1: BasicObjectLock for lock
+//
+// Kills:
+//      x10
+//      c_rarg0, c_rarg1, c_rarg2, c_rarg3, ... (param regs)
+//      t0, t1 (temp regs)
+void InterpreterMacroAssembler::unlock_object(Register lock_reg)
+{
+  assert(lock_reg == c_rarg1, "The argument is only for looks. It must be rarg1");
+
+  if (UseHeavyMonitors) {
+    call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), lock_reg);
+  } else {
+    Label done;
+
+    const Register swap_reg   = x10;
+    const Register header_reg = c_rarg2;  // Will contain the old oopMark
+    const Register obj_reg    = c_rarg3;  // Will contain the oop
+
+    save_bcp(); // Save in case of exception
+
+    // Convert from BasicObjectLock structure to object and BasicLock
+    // structure Store the BasicLock address into x10
+    la(swap_reg, Address(lock_reg, BasicObjectLock::lock_offset_in_bytes()));
+
+    // Load oop into obj_reg(c_rarg3)
+    ld(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset_in_bytes()));
+
+    // Free entry
+    sd(zr, Address(lock_reg, BasicObjectLock::obj_offset_in_bytes()));
+
+    // Load the old header from BasicLock structure
+    ld(header_reg, Address(swap_reg,
+                           BasicLock::displaced_header_offset_in_bytes()));
+
+    // Test for recursion
+    beqz(header_reg, done);
+
+    // Atomic swap back the old header
+    cmpxchg_obj_header(swap_reg, header_reg, obj_reg, t0, done, /*fallthrough*/NULL);
+
+    // Call the runtime routine for slow case.
+    sd(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset_in_bytes())); // restore obj
+    call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), lock_reg);
+
+    bind(done);
+
+    restore_bcp();
+  }
+}
+
+
+void InterpreterMacroAssembler::test_method_data_pointer(Register mdp,
+                                                         Label& zero_continue) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  ld(mdp, Address(fp, frame::interpreter_frame_mdp_offset * wordSize));
+  beqz(mdp, zero_continue);
+}
+
+// Set the method data pointer for the current bcp.
+void InterpreterMacroAssembler::set_method_data_pointer_for_bcp() {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  Label set_mdp;
+  push_reg(0xc00, sp); // save x10, x11
+
+  // Test MDO to avoid the call if it is NULL.
+  ld(x10, Address(xmethod, in_bytes(Method::method_data_offset())));
+  beqz(x10, set_mdp);
+  call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::bcp_to_di), xmethod, xbcp);
+  // x10: mdi
+  // mdo is guaranteed to be non-zero here, we checked for it before the call.
+  ld(x11, Address(xmethod, in_bytes(Method::method_data_offset())));
+  la(x11, Address(x11, in_bytes(MethodData::data_offset())));
+  add(x10, x11, x10);
+  sd(x10, Address(fp, frame::interpreter_frame_mdp_offset * wordSize));
+  bind(set_mdp);
+  pop_reg(0xc00, sp);
+}
+
+void InterpreterMacroAssembler::verify_method_data_pointer() {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+#ifdef ASSERT
+  Label verify_continue;
+  add(sp, sp, -4 * wordSize);
+  sd(x10, Address(sp, 0));
+  sd(x11, Address(sp, wordSize));
+  sd(x12, Address(sp, 2 * wordSize));
+  sd(x13, Address(sp, 3 * wordSize));
+  test_method_data_pointer(x13, verify_continue); // If mdp is zero, continue
+  get_method(x11);
+
+  // If the mdp is valid, it will point to a DataLayout header which is
+  // consistent with the bcp.  The converse is highly probable also.
+  lh(x12, Address(x13, in_bytes(DataLayout::bci_offset())));
+  ld(t0, Address(x11, Method::const_offset()));
+  add(x12, x12, t0);
+  la(x12, Address(x12, ConstMethod::codes_offset()));
+  beq(x12, xbcp, verify_continue);
+  // x10: method
+  // xbcp: bcp // xbcp == 22
+  // x13: mdp
+  call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::verify_mdp),
+               x11, xbcp, x13);
+  bind(verify_continue);
+  ld(x10, Address(sp, 0));
+  ld(x11, Address(sp, wordSize));
+  ld(x12, Address(sp, 2 * wordSize));
+  ld(x13, Address(sp, 3 * wordSize));
+  add(sp, sp, 4 * wordSize);
+#endif // ASSERT
+}
+
+
+void InterpreterMacroAssembler::set_mdp_data_at(Register mdp_in,
+                                                int constant,
+                                                Register value) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  Address data(mdp_in, constant);
+  sd(value, data);
+}
+
+
+void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in,
+                                                      int constant,
+                                                      bool decrement) {
+  increment_mdp_data_at(mdp_in, noreg, constant, decrement);
+}
+
+void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in,
+                                                      Register reg,
+                                                      int constant,
+                                                      bool decrement) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  // %%% this does 64bit counters at best it is wasting space
+  // at worst it is a rare bug when counters overflow
+
+  assert_different_registers(t1, t0, mdp_in, reg);
+
+  Address addr1(mdp_in, constant);
+  Address addr2(t1, 0);
+  Address &addr = addr1;
+  if (reg != noreg) {
+    la(t1, addr1);
+    add(t1, t1, reg);
+    addr = addr2;
+  }
+
+  if (decrement) {
+    ld(t0, addr);
+    addi(t0, t0, -DataLayout::counter_increment);
+    Label L;
+    bltz(t0, L);      // skip store if counter underflow
+    sd(t0, addr);
+    bind(L);
+  } else {
+    assert(DataLayout::counter_increment == 1,
+           "flow-free idiom only works with 1");
+    ld(t0, addr);
+    addi(t0, t0, DataLayout::counter_increment);
+    Label L;
+    blez(t0, L);       // skip store if counter overflow
+    sd(t0, addr);
+    bind(L);
+  }
+}
+
+void InterpreterMacroAssembler::set_mdp_flag_at(Register mdp_in,
+                                                int flag_byte_constant) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  int flags_offset = in_bytes(DataLayout::flags_offset());
+  // Set the flag
+  lbu(t1, Address(mdp_in, flags_offset));
+  ori(t1, t1, flag_byte_constant);
+  sb(t1, Address(mdp_in, flags_offset));
+}
+
+
+void InterpreterMacroAssembler::test_mdp_data_at(Register mdp_in,
+                                                 int offset,
+                                                 Register value,
+                                                 Register test_value_out,
+                                                 Label& not_equal_continue) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  if (test_value_out == noreg) {
+    ld(t1, Address(mdp_in, offset));
+    bne(value, t1, not_equal_continue);
+  } else {
+    // Put the test value into a register, so caller can use it:
+    ld(test_value_out, Address(mdp_in, offset));
+    bne(value, test_value_out, not_equal_continue);
+  }
+}
+
+
+void InterpreterMacroAssembler::update_mdp_by_offset(Register mdp_in,
+                                                     int offset_of_disp) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  ld(t1, Address(mdp_in, offset_of_disp));
+  add(mdp_in, mdp_in, t1);
+  sd(mdp_in, Address(fp, frame::interpreter_frame_mdp_offset * wordSize));
+}
+
+void InterpreterMacroAssembler::update_mdp_by_offset(Register mdp_in,
+                                                     Register reg,
+                                                     int offset_of_disp) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  add(t1, mdp_in, reg);
+  ld(t1, Address(t1, offset_of_disp));
+  add(mdp_in, mdp_in, t1);
+  sd(mdp_in, Address(fp, frame::interpreter_frame_mdp_offset * wordSize));
+}
+
+
+void InterpreterMacroAssembler::update_mdp_by_constant(Register mdp_in,
+                                                       int constant) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  addi(mdp_in, mdp_in, (unsigned)constant);
+  sd(mdp_in, Address(fp, frame::interpreter_frame_mdp_offset * wordSize));
+}
+
+
+void InterpreterMacroAssembler::update_mdp_for_ret(Register return_bci) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+
+  // save/restore across call_VM
+  addi(sp, sp, -2 * wordSize);
+  sd(zr, Address(sp, 0));
+  sd(return_bci, Address(sp, wordSize));
+  call_VM(noreg,
+          CAST_FROM_FN_PTR(address, InterpreterRuntime::update_mdp_for_ret),
+          return_bci);
+  ld(zr, Address(sp, 0));
+  ld(return_bci, Address(sp, wordSize));
+  addi(sp, sp, 2 * wordSize);
+}
+
+void InterpreterMacroAssembler::profile_taken_branch(Register mdp,
+                                                     Register bumped_count) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    // Otherwise, assign to mdp
+    test_method_data_pointer(mdp, profile_continue);
+
+    // We are taking a branch.  Increment the taken count.
+    Address data(mdp, in_bytes(JumpData::taken_offset()));
+    ld(bumped_count, data);
+    assert(DataLayout::counter_increment == 1,
+            "flow-free idiom only works with 1");
+    addi(bumped_count, bumped_count, DataLayout::counter_increment);
+    Label L;
+    // eg: bumped_count=0x7fff ffff ffff ffff  + 1 < 0. so we use <= 0;
+    blez(bumped_count, L);       // skip store if counter overflow,
+    sd(bumped_count, data);
+    bind(L);
+    // The method data pointer needs to be updated to reflect the new target.
+    update_mdp_by_offset(mdp, in_bytes(JumpData::displacement_offset()));
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_not_taken_branch(Register mdp) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    // We are taking a branch.  Increment the not taken count.
+    increment_mdp_data_at(mdp, in_bytes(BranchData::not_taken_offset()));
+
+    // The method data pointer needs to be updated to correspond to
+    // the next bytecode
+    update_mdp_by_constant(mdp, in_bytes(BranchData::branch_data_size()));
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_call(Register mdp) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    // We are making a call.  Increment the count.
+    increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+
+    // The method data pointer needs to be updated to reflect the new target.
+    update_mdp_by_constant(mdp, in_bytes(CounterData::counter_data_size()));
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_final_call(Register mdp) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    // We are making a call.  Increment the count.
+    increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+
+    // The method data pointer needs to be updated to reflect the new target.
+    update_mdp_by_constant(mdp,
+                           in_bytes(VirtualCallData::
+                                    virtual_call_data_size()));
+    bind(profile_continue);
+  }
+}
+
+
+void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
+                                                     Register mdp,
+                                                     Register reg2,
+                                                     bool receiver_can_be_null) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    Label skip_receiver_profile;
+    if (receiver_can_be_null) {
+      Label not_null;
+      // We are making a call.  Increment the count for null receiver.
+      increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+      j(skip_receiver_profile);
+      bind(not_null);
+    }
+
+    // Record the receiver type.
+    record_klass_in_profile(receiver, mdp, reg2, true);
+    bind(skip_receiver_profile);
+
+    // The method data pointer needs to be updated to reflect the new target.
+
+    update_mdp_by_constant(mdp,
+                           in_bytes(VirtualCallData::
+                                    virtual_call_data_size()));
+    bind(profile_continue);
+  }
+}
+
+// This routine creates a state machine for updating the multi-row
+// type profile at a virtual call site (or other type-sensitive bytecode).
+// The machine visits each row (of receiver/count) until the receiver type
+// is found, or until it runs out of rows.  At the same time, it remembers
+// the location of the first empty row.  (An empty row records null for its
+// receiver, and can be allocated for a newly-observed receiver type.)
+// Because there are two degrees of freedom in the state, a simple linear
+// search will not work; it must be a decision tree.  Hence this helper
+// function is recursive, to generate the required tree structured code.
+// It's the interpreter, so we are trading off code space for speed.
+// See below for example code.
+void InterpreterMacroAssembler::record_klass_in_profile_helper(
+                                Register receiver, Register mdp,
+                                Register reg2,
+                                Label& done, bool is_virtual_call) {
+  if (TypeProfileWidth == 0) {
+    if (is_virtual_call) {
+      increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+    }
+
+  } else {
+    int non_profiled_offset = -1;
+    if (is_virtual_call) {
+      non_profiled_offset = in_bytes(CounterData::count_offset());
+    }
+
+    record_item_in_profile_helper(receiver, mdp, reg2, 0, done, TypeProfileWidth,
+      &VirtualCallData::receiver_offset, &VirtualCallData::receiver_count_offset, non_profiled_offset);
+  }
+}
+
+void InterpreterMacroAssembler::record_item_in_profile_helper(
+  Register item, Register mdp, Register reg2, int start_row, Label& done, int total_rows,
+  OffsetFunction item_offset_fn, OffsetFunction item_count_offset_fn, int non_profiled_offset) {
+  int last_row = total_rows - 1;
+  assert(start_row <= last_row, "must be work left to do");
+  // Test this row for both the item and for null.
+  // Take any of three different outcomes:
+  //   1. found item => increment count and goto done
+  //   2. found null => keep looking for case 1, maybe allocate this cell
+  //   3. found something else => keep looking for cases 1 and 2
+  // Case 3 is handled by a recursive call.
+  for (int row = start_row; row <= last_row; row++) {
+    Label next_test;
+    bool test_for_null_also = (row == start_row);
+
+    // See if the item is item[n].
+    int item_offset = in_bytes(item_offset_fn(row));
+    test_mdp_data_at(mdp, item_offset, item,
+                     (test_for_null_also ? reg2 : noreg),
+                     next_test);
+    // (Reg2 now contains the item from the CallData.)
+
+    // The item is item[n].  Increment count[n].
+    int count_offset = in_bytes(item_count_offset_fn(row));
+    increment_mdp_data_at(mdp, count_offset);
+    j(done);
+    bind(next_test);
+
+    if (test_for_null_also) {
+      Label found_null;
+      // Failed the equality check on item[n]...  Test for null.
+      if (start_row == last_row) {
+        // The only thing left to do is handle the null case.
+        if (non_profiled_offset >= 0) {
+          beqz(reg2, found_null);
+          // Item did not match any saved item and there is no empty row for it.
+          // Increment total counter to indicate polymorphic case.
+          increment_mdp_data_at(mdp, non_profiled_offset);
+          j(done);
+          bind(found_null);
+        } else {
+          bnez(reg2, done);
+        }
+        break;
+      }
+      // Since null is rare, make it be the branch-taken case.
+      beqz(reg2, found_null);
+
+      // Put all the "Case 3" tests here.
+      record_item_in_profile_helper(item, mdp, reg2, start_row + 1, done, total_rows,
+        item_offset_fn, item_count_offset_fn, non_profiled_offset);
+
+      // Found a null.  Keep searching for a matching item,
+      // but remember that this is an empty (unused) slot.
+      bind(found_null);
+    }
+  }
+
+  // In the fall-through case, we found no matching item, but we
+  // observed the item[start_row] is NULL.
+  // Fill in the item field and increment the count.
+  int item_offset = in_bytes(item_offset_fn(start_row));
+  set_mdp_data_at(mdp, item_offset, item);
+  int count_offset = in_bytes(item_count_offset_fn(start_row));
+  mv(reg2, DataLayout::counter_increment);
+  set_mdp_data_at(mdp, count_offset, reg2);
+  if (start_row > 0) {
+    j(done);
+  }
+}
+
+// Example state machine code for three profile rows:
+//   # main copy of decision tree, rooted at row[1]
+//   if (row[0].rec == rec) then [
+//     row[0].incr()
+//     goto done
+//   ]
+//   if (row[0].rec != NULL) then [
+//     # inner copy of decision tree, rooted at row[1]
+//     if (row[1].rec == rec) then [
+//       row[1].incr()
+//       goto done
+//     ]
+//     if (row[1].rec != NULL) then [
+//       # degenerate decision tree, rooted at row[2]
+//       if (row[2].rec == rec) then [
+//         row[2].incr()
+//         goto done
+//       ]
+//       if (row[2].rec != NULL) then [
+//         count.incr()
+//         goto done
+//       ] # overflow
+//       row[2].init(rec)
+//       goto done
+//     ] else [
+//       # remember row[1] is empty
+//       if (row[2].rec == rec) then [
+//         row[2].incr()
+//         goto done
+//       ]
+//       row[1].init(rec)
+//       goto done
+//     ]
+//   else [
+//     # remember row[0] is empty
+//     if (row[1].rec == rec) then [
+//       row[1].incr()
+//       goto done
+//     ]
+//     if (row[2].rec == rec) then [
+//       row[2].incr()
+//       goto done
+//     ]
+//     row[0].init(rec)
+//     goto done
+//   ]
+//   done:
+
+void InterpreterMacroAssembler::record_klass_in_profile(Register receiver,
+                                                        Register mdp, Register reg2,
+                                                        bool is_virtual_call) {
+  assert(ProfileInterpreter, "must be profiling");
+  Label done;
+
+  record_klass_in_profile_helper(receiver, mdp, reg2, done, is_virtual_call);
+
+  bind(done);
+}
+
+void InterpreterMacroAssembler::profile_ret(Register return_bci, Register mdp) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    // Update the total ret count.
+    increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
+
+    for (uint row = 0; row < RetData::row_limit(); row++) {
+      Label next_test;
+
+      // See if return_bci is equal to bci[n]:
+      test_mdp_data_at(mdp,
+                       in_bytes(RetData::bci_offset(row)),
+                       return_bci, noreg,
+                       next_test);
+
+      // return_bci is equal to bci[n].  Increment the count.
+      increment_mdp_data_at(mdp, in_bytes(RetData::bci_count_offset(row)));
+
+      // The method data pointer needs to be updated to reflect the new target.
+      update_mdp_by_offset(mdp,
+                           in_bytes(RetData::bci_displacement_offset(row)));
+      j(profile_continue);
+      bind(next_test);
+    }
+
+    update_mdp_for_ret(return_bci);
+
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_null_seen(Register mdp) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    set_mdp_flag_at(mdp, BitData::null_seen_byte_constant());
+
+    // The method data pointer needs to be updated.
+    int mdp_delta = in_bytes(BitData::bit_data_size());
+    if (TypeProfileCasts) {
+      mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size());
+    }
+    update_mdp_by_constant(mdp, mdp_delta);
+
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_typecheck_failed(Register mdp) {
+    if (ProfileInterpreter && TypeProfileCasts) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    int count_offset = in_bytes(CounterData::count_offset());
+    // Back up the address, since we have already bumped the mdp.
+    count_offset -= in_bytes(VirtualCallData::virtual_call_data_size());
+
+    // *Decrement* the counter.  We expect to see zero or small negatives.
+    increment_mdp_data_at(mdp, count_offset, true);
+
+    bind (profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass, Register reg2) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    // The method data pointer needs to be updated.
+    int mdp_delta = in_bytes(BitData::bit_data_size());
+    if (TypeProfileCasts) {
+      mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size());
+
+      // Record the object type.
+      record_klass_in_profile(klass, mdp, reg2, false);
+    }
+    update_mdp_by_constant(mdp, mdp_delta);
+
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_switch_default(Register mdp) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    // Update the default case count
+    increment_mdp_data_at(mdp,
+                          in_bytes(MultiBranchData::default_count_offset()));
+
+    // The method data pointer needs to be updated.
+    update_mdp_by_offset(mdp,
+                         in_bytes(MultiBranchData::
+                                  default_displacement_offset()));
+
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_switch_case(Register index,
+                                                    Register mdp,
+                                                    Register reg2) {
+  if (ProfileInterpreter) {
+    Label profile_continue;
+
+    // If no method data exists, go to profile_continue.
+    test_method_data_pointer(mdp, profile_continue);
+
+    // Build the base (index * per_case_size_in_bytes()) +
+    // case_array_offset_in_bytes()
+    mvw(reg2, in_bytes(MultiBranchData::per_case_size()));
+    mvw(t0, in_bytes(MultiBranchData::case_array_offset()));
+    Assembler::mul(index, index, reg2);
+    Assembler::add(index, index, t0);
+
+    // Update the case count
+    increment_mdp_data_at(mdp,
+                          index,
+                          in_bytes(MultiBranchData::relative_count_offset()));
+
+    // The method data pointer need to be updated.
+    update_mdp_by_offset(mdp,
+                         index,
+                         in_bytes(MultiBranchData::
+                                  relative_displacement_offset()));
+
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) { ; }
+
+void InterpreterMacroAssembler::notify_method_entry() {
+  // Whenever JVMTI is interp_only_mode, method entry/exit events are sent to
+  // track stack depth.  If it is possible to enter interp_only_mode we add
+  // the code to check if the event should be sent.
+  if (JvmtiExport::can_post_interpreter_events()) {
+    Label L;
+    lwu(x13, Address(xthread, JavaThread::interp_only_mode_offset()));
+    beqz(x13, L);
+    call_VM(noreg, CAST_FROM_FN_PTR(address,
+                                    InterpreterRuntime::post_method_entry));
+    bind(L);
+  }
+
+  {
+    SkipIfEqual skip(this, &DTraceMethodProbes, false);
+    get_method(c_rarg1);
+    call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
+                 xthread, c_rarg1);
+  }
+
+  // RedefineClasses() tracing support for obsolete method entry
+  if (log_is_enabled(Trace, redefine, class, obsolete)) {
+    get_method(c_rarg1);
+    call_VM_leaf(
+      CAST_FROM_FN_PTR(address, SharedRuntime::rc_trace_method_entry),
+      xthread, c_rarg1);
+  }
+}
+
+
+void InterpreterMacroAssembler::notify_method_exit(
+    TosState state, NotifyMethodExitMode mode) {
+  // Whenever JVMTI is interp_only_mode, method entry/exit events are sent to
+  // track stack depth.  If it is possible to enter interp_only_mode we add
+  // the code to check if the event should be sent.
+  if (mode == NotifyJVMTI && JvmtiExport::can_post_interpreter_events()) {
+    Label L;
+    // Note: frame::interpreter_frame_result has a dependency on how the
+    // method result is saved across the call to post_method_exit. If this
+    // is changed then the interpreter_frame_result implementation will
+    // need to be updated too.
+
+    // template interpreter will leave the result on the top of the stack.
+    push(state);
+    lwu(x13, Address(xthread, JavaThread::interp_only_mode_offset()));
+    beqz(x13, L);
+    call_VM(noreg,
+            CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_exit));
+    bind(L);
+    pop(state);
+  }
+
+  {
+    SkipIfEqual skip(this, &DTraceMethodProbes, false);
+    push(state);
+    get_method(c_rarg1);
+    call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
+                 xthread, c_rarg1);
+    pop(state);
+  }
+}
+
+
+// Jump if ((*counter_addr += increment) & mask) satisfies the condition.
+void InterpreterMacroAssembler::increment_mask_and_jump(Address counter_addr,
+                                                        int increment, Address mask,
+                                                        Register tmp1, Register tmp2,
+                                                        bool preloaded, Label* where) {
+  Label done;
+  if (!preloaded) {
+    lwu(tmp1, counter_addr);
+  }
+  add(tmp1, tmp1, increment);
+  sw(tmp1, counter_addr);
+  lwu(tmp2, mask);
+  andr(tmp1, tmp1, tmp2);
+  bnez(tmp1, done);
+  j(*where); // offset is too large so we have to use j instead of beqz here
+  bind(done);
+}
+
+void InterpreterMacroAssembler::call_VM_leaf_base(address entry_point,
+                                                  int number_of_arguments) {
+  // interpreter specific
+  //
+  // Note: No need to save/restore rbcp & rlocals pointer since these
+  //       are callee saved registers and no blocking/ GC can happen
+  //       in leaf calls.
+#ifdef ASSERT
+  {
+   Label L;
+   ld(t0, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+   beqz(t0, L);
+   stop("InterpreterMacroAssembler::call_VM_leaf_base:"
+        " last_sp != NULL");
+   bind(L);
+  }
+#endif /* ASSERT */
+  // super call
+  MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments);
+}
+
+void InterpreterMacroAssembler::call_VM_base(Register oop_result,
+                                             Register java_thread,
+                                             Register last_java_sp,
+                                             address  entry_point,
+                                             int      number_of_arguments,
+                                             bool     check_exceptions) {
+  // interpreter specific
+  //
+  // Note: Could avoid restoring locals ptr (callee saved) - however doesn't
+  //       really make a difference for these runtime calls, since they are
+  //       slow anyway. Btw., bcp must be saved/restored since it may change
+  //       due to GC.
+  save_bcp();
+#ifdef ASSERT
+  {
+    Label L;
+    ld(t0, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+    beqz(t0, L);
+    stop("InterpreterMacroAssembler::call_VM_base:"
+         " last_sp != NULL");
+    bind(L);
+  }
+#endif /* ASSERT */
+  // super call
+  MacroAssembler::call_VM_base(oop_result, noreg, last_java_sp,
+                               entry_point, number_of_arguments,
+                               check_exceptions);
+// interpreter specific
+  restore_bcp();
+  restore_locals();
+}
+
+void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& mdo_addr, Register tmp) {
+  assert_different_registers(obj, tmp, t0, mdo_addr.base());
+  Label update, next, none;
+
+  verify_oop(obj);
+
+  bnez(obj, update);
+  orptr(mdo_addr, TypeEntries::null_seen, t0, tmp);
+  j(next);
+
+  bind(update);
+  load_klass(obj, obj);
+
+  ld(t0, mdo_addr);
+  xorr(obj, obj, t0);
+  andi(t0, obj, TypeEntries::type_klass_mask);
+  beqz(t0, next); // klass seen before, nothing to
+                  // do. The unknown bit may have been
+                  // set already but no need to check.
+
+  andi(t0, obj, TypeEntries::type_unknown);
+  bnez(t0, next);
+  // already unknown. Nothing to do anymore.
+
+  ld(t0, mdo_addr);
+  beqz(t0, none);
+  li(tmp, (u1)TypeEntries::null_seen);
+  beq(t0, tmp, none);
+  // There is a chance that the checks above (re-reading profiling
+  // data from memory) fail if another thread has just set the
+  // profiling to this obj's klass
+  ld(t0, mdo_addr);
+  xorr(obj, obj, t0);
+  andi(t0, obj, TypeEntries::type_klass_mask);
+  beqz(t0, next);
+
+  // different than before. Cannot keep accurate profile.
+  orptr(mdo_addr, TypeEntries::type_unknown, t0, tmp);
+  j(next);
+
+  bind(none);
+  // first time here. Set profile type.
+  sd(obj, mdo_addr);
+
+  bind(next);
+}
+
+void InterpreterMacroAssembler::profile_arguments_type(Register mdp, Register callee, Register tmp, bool is_virtual) {
+  if (!ProfileInterpreter) {
+    return;
+  }
+
+  if (MethodData::profile_arguments() || MethodData::profile_return()) {
+    Label profile_continue;
+
+    test_method_data_pointer(mdp, profile_continue);
+
+    int off_to_start = is_virtual ? in_bytes(VirtualCallData::virtual_call_data_size()) : in_bytes(CounterData::counter_data_size());
+
+    lbu(t0, Address(mdp, in_bytes(DataLayout::tag_offset()) - off_to_start));
+    if (is_virtual) {
+      li(tmp, (u1)DataLayout::virtual_call_type_data_tag);
+      bne(t0, tmp, profile_continue);
+    } else {
+      li(tmp, (u1)DataLayout::call_type_data_tag);
+      bne(t0, tmp, profile_continue);
+    }
+
+    // calculate slot step
+    static int stack_slot_offset0 = in_bytes(TypeEntriesAtCall::stack_slot_offset(0));
+    static int slot_step = in_bytes(TypeEntriesAtCall::stack_slot_offset(1)) - stack_slot_offset0;
+
+    // calculate type step
+    static int argument_type_offset0 = in_bytes(TypeEntriesAtCall::argument_type_offset(0));
+    static int type_step = in_bytes(TypeEntriesAtCall::argument_type_offset(1)) - argument_type_offset0;
+
+    if (MethodData::profile_arguments()) {
+      Label done, loop, loopEnd, profileArgument, profileReturnType;
+      RegSet pushed_registers;
+      pushed_registers += x15;
+      pushed_registers += x16;
+      pushed_registers += x17;
+      Register mdo_addr = x15;
+      Register index = x16;
+      Register off_to_args = x17;
+      push_reg(pushed_registers, sp);
+
+      mv(off_to_args, in_bytes(TypeEntriesAtCall::args_data_offset()));
+      mv(t0, TypeProfileArgsLimit);
+      beqz(t0, loopEnd);
+
+      mv(index, zr); // index < TypeProfileArgsLimit
+      bind(loop);
+      bgtz(index, profileReturnType);
+      li(t0, (int)MethodData::profile_return());
+      beqz(t0, profileArgument); // (index > 0 || MethodData::profile_return()) == false
+      bind(profileReturnType);
+      // If return value type is profiled we may have no argument to profile
+      ld(tmp, Address(mdp, in_bytes(TypeEntriesAtCall::cell_count_offset())));
+      mv(t1, - TypeStackSlotEntries::per_arg_count());
+      mul(t1, index, t1);
+      add(tmp, tmp, t1);
+      li(t1, TypeStackSlotEntries::per_arg_count());
+      add(t0, mdp, off_to_args);
+      blt(tmp, t1, done);
+
+      bind(profileArgument);
+
+      ld(tmp, Address(callee, Method::const_offset()));
+      load_unsigned_short(tmp, Address(tmp, ConstMethod::size_of_parameters_offset()));
+      // stack offset o (zero based) from the start of the argument
+      // list, for n arguments translates into offset n - o - 1 from
+      // the end of the argument list
+      li(t0, stack_slot_offset0);
+      li(t1, slot_step);
+      mul(t1, index, t1);
+      add(t0, t0, t1);
+      add(t0, mdp, t0);
+      ld(t0, Address(t0));
+      sub(tmp, tmp, t0);
+      addi(tmp, tmp, -1);
+      Address arg_addr = argument_address(tmp);
+      ld(tmp, arg_addr);
+
+      li(t0, argument_type_offset0);
+      li(t1, type_step);
+      mul(t1, index, t1);
+      add(t0, t0, t1);
+      add(mdo_addr, mdp, t0);
+      Address mdo_arg_addr(mdo_addr, 0);
+      profile_obj_type(tmp, mdo_arg_addr, t1);
+
+      int to_add = in_bytes(TypeStackSlotEntries::per_arg_size());
+      addi(off_to_args, off_to_args, to_add);
+
+      // increment index by 1
+      addi(index, index, 1);
+      li(t1, TypeProfileArgsLimit);
+      blt(index, t1, loop);
+      bind(loopEnd);
+
+      if (MethodData::profile_return()) {
+        ld(tmp, Address(mdp, in_bytes(TypeEntriesAtCall::cell_count_offset())));
+        addi(tmp, tmp, -TypeProfileArgsLimit*TypeStackSlotEntries::per_arg_count());
+      }
+
+      add(t0, mdp, off_to_args);
+      bind(done);
+      mv(mdp, t0);
+
+      // unspill the clobbered registers
+      pop_reg(pushed_registers, sp);
+
+      if (MethodData::profile_return()) {
+        // We're right after the type profile for the last
+        // argument. tmp is the number of cells left in the
+        // CallTypeData/VirtualCallTypeData to reach its end. Non null
+        // if there's a return to profile.
+        assert(ReturnTypeEntry::static_cell_count() < TypeStackSlotEntries::per_arg_count(), "can't move past ret type");
+        shadd(mdp, tmp, mdp, tmp, exact_log2(DataLayout::cell_size));
+      }
+      sd(mdp, Address(fp, frame::interpreter_frame_mdp_offset * wordSize));
+    } else {
+      assert(MethodData::profile_return(), "either profile call args or call ret");
+      update_mdp_by_constant(mdp, in_bytes(TypeEntriesAtCall::return_only_size()));
+    }
+
+    // mdp points right after the end of the
+    // CallTypeData/VirtualCallTypeData, right after the cells for the
+    // return value type if there's one
+
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_return_type(Register mdp, Register ret, Register tmp) {
+  assert_different_registers(mdp, ret, tmp, xbcp, t0, t1);
+  if (ProfileInterpreter && MethodData::profile_return()) {
+    Label profile_continue, done;
+
+    test_method_data_pointer(mdp, profile_continue);
+
+    if (MethodData::profile_return_jsr292_only()) {
+      assert(Method::intrinsic_id_size_in_bytes() == 2, "assuming Method::_intrinsic_id is u2");
+
+      // If we don't profile all invoke bytecodes we must make sure
+      // it's a bytecode we indeed profile. We can't go back to the
+      // begining of the ProfileData we intend to update to check its
+      // type because we're right after it and we don't known its
+      // length
+      Label do_profile;
+      lbu(t0, Address(xbcp, 0));
+      li(tmp, (u1)Bytecodes::_invokedynamic);
+      beq(t0, tmp, do_profile);
+      li(tmp, (u1)Bytecodes::_invokehandle);
+      beq(t0, tmp, do_profile);
+      get_method(tmp);
+      lhu(t0, Address(tmp, Method::intrinsic_id_offset_in_bytes()));
+      li(t1, static_cast<int>(vmIntrinsics::_compiledLambdaForm));
+      bne(t0, t1, profile_continue);
+      bind(do_profile);
+    }
+
+    Address mdo_ret_addr(mdp, -in_bytes(ReturnTypeEntry::size()));
+    mv(tmp, ret);
+    profile_obj_type(tmp, mdo_ret_addr, t1);
+
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::profile_parameters_type(Register mdp, Register tmp1, Register tmp2, Register tmp3) {
+  assert_different_registers(t0, t1, mdp, tmp1, tmp2, tmp3);
+  if (ProfileInterpreter && MethodData::profile_parameters()) {
+    Label profile_continue, done;
+
+    test_method_data_pointer(mdp, profile_continue);
+
+    // Load the offset of the area within the MDO used for
+    // parameters. If it's negative we're not profiling any parameters
+    lwu(tmp1, Address(mdp, in_bytes(MethodData::parameters_type_data_di_offset()) - in_bytes(MethodData::data_offset())));
+    srli(tmp2, tmp1, 31);
+    bnez(tmp2, profile_continue);  // i.e. sign bit set
+
+    // Compute a pointer to the area for parameters from the offset
+    // and move the pointer to the slot for the last
+    // parameters. Collect profiling from last parameter down.
+    // mdo start + parameters offset + array length - 1
+    add(mdp, mdp, tmp1);
+    ld(tmp1, Address(mdp, ArrayData::array_len_offset()));
+    add(tmp1, tmp1, - TypeStackSlotEntries::per_arg_count());
+
+    Label loop;
+    bind(loop);
+
+    int off_base = in_bytes(ParametersTypeData::stack_slot_offset(0));
+    int type_base = in_bytes(ParametersTypeData::type_offset(0));
+    int per_arg_scale = exact_log2(DataLayout::cell_size);
+    add(t0, mdp, off_base);
+    add(t1, mdp, type_base);
+
+    shadd(tmp2, tmp1, t0, tmp2, per_arg_scale);
+    // load offset on the stack from the slot for this parameter
+    ld(tmp2, Address(tmp2, 0));
+    neg(tmp2, tmp2);
+
+    // read the parameter from the local area
+    shadd(tmp2, tmp2, xlocals, tmp2, Interpreter::logStackElementSize);
+    ld(tmp2, Address(tmp2, 0));
+
+    // profile the parameter
+    shadd(t1, tmp1, t1, t0, per_arg_scale);
+    Address arg_type(t1, 0);
+    profile_obj_type(tmp2, arg_type, tmp3);
+
+    // go to next parameter
+    add(tmp1, tmp1, - TypeStackSlotEntries::per_arg_count());
+    bgez(tmp1, loop);
+
+    bind(profile_continue);
+  }
+}
+
+void InterpreterMacroAssembler::get_method_counters(Register method,
+                                                    Register mcs, Label& skip) {
+  Label has_counters;
+  ld(mcs, Address(method, Method::method_counters_offset()));
+  bnez(mcs, has_counters);
+  call_VM(noreg, CAST_FROM_FN_PTR(address,
+          InterpreterRuntime::build_method_counters), method);
+  ld(mcs, Address(method, Method::method_counters_offset()));
+  beqz(mcs, skip); // No MethodCounters allocated, OutOfMemory
+  bind(has_counters);
+}
+
+#ifdef ASSERT
+void InterpreterMacroAssembler::verify_access_flags(Register access_flags, uint32_t flag_bits,
+                                                    const char* msg, bool stop_by_hit) {
+  Label L;
+  andi(t0, access_flags, flag_bits);
+  if (stop_by_hit) {
+    beqz(t0, L);
+  } else {
+    bnez(t0, L);
+  }
+  stop(msg);
+  bind(L);
+}
+
+void InterpreterMacroAssembler::verify_frame_setup() {
+  Label L;
+  const Address monitor_block_top(fp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+  ld(t0, monitor_block_top);
+  beq(esp, t0, L);
+  stop("broken stack frame setup in interpreter");
+  bind(L);
+}
+#endif
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
new file mode 100644
index 00000000000..4d8cb086f82
--- /dev/null
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_INTERP_MASM_RISCV_HPP
+#define CPU_RISCV_INTERP_MASM_RISCV_HPP
+
+#include "asm/macroAssembler.hpp"
+#include "interpreter/invocationCounter.hpp"
+#include "runtime/frame.hpp"
+
+// This file specializes the assember with interpreter-specific macros
+
+typedef ByteSize (*OffsetFunction)(uint);
+
+class InterpreterMacroAssembler: public MacroAssembler {
+ protected:
+  // Interpreter specific version of call_VM_base
+  using MacroAssembler::call_VM_leaf_base;
+
+  virtual void call_VM_leaf_base(address entry_point,
+                                 int number_of_arguments);
+
+  virtual void call_VM_base(Register oop_result,
+                            Register java_thread,
+                            Register last_java_sp,
+                            address  entry_point,
+                            int number_of_arguments,
+                            bool check_exceptions);
+
+  // base routine for all dispatches
+  void dispatch_base(TosState state, address* table, bool verifyoop = true,
+                     bool generate_poll = false, Register Rs = t0);
+
+ public:
+  InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {}
+  virtual ~InterpreterMacroAssembler() {}
+
+  void load_earlyret_value(TosState state);
+
+  void jump_to_entry(address entry);
+
+  virtual void check_and_handle_popframe(Register java_thread);
+  virtual void check_and_handle_earlyret(Register java_thread);
+
+  // Interpreter-specific registers
+  void save_bcp() {
+    sd(xbcp, Address(fp, frame::interpreter_frame_bcp_offset * wordSize));
+  }
+
+  void restore_bcp() {
+    ld(xbcp, Address(fp, frame::interpreter_frame_bcp_offset * wordSize));
+  }
+
+  void restore_locals() {
+    ld(xlocals, Address(fp, frame::interpreter_frame_locals_offset * wordSize));
+  }
+
+  void restore_constant_pool_cache() {
+    ld(xcpool, Address(fp, frame::interpreter_frame_cache_offset * wordSize));
+  }
+
+  void get_dispatch();
+
+  // Helpers for runtime call arguments/results
+  void get_method(Register reg) {
+    ld(reg, Address(fp, frame::interpreter_frame_method_offset * wordSize));
+  }
+
+  void get_const(Register reg) {
+    get_method(reg);
+    ld(reg, Address(reg, in_bytes(Method::const_offset())));
+  }
+
+  void get_constant_pool(Register reg) {
+    get_const(reg);
+    ld(reg, Address(reg, in_bytes(ConstMethod::constants_offset())));
+  }
+
+  void get_constant_pool_cache(Register reg) {
+    get_constant_pool(reg);
+    ld(reg, Address(reg, ConstantPool::cache_offset_in_bytes()));
+  }
+
+  void get_cpool_and_tags(Register cpool, Register tags) {
+    get_constant_pool(cpool);
+    ld(tags, Address(cpool, ConstantPool::tags_offset_in_bytes()));
+  }
+
+  void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset);
+  void get_cache_and_index_at_bcp(Register cache, Register index, int bcp_offset, size_t index_size = sizeof(u2));
+  void get_cache_and_index_and_bytecode_at_bcp(Register cache, Register index, Register bytecode, int byte_no, int bcp_offset, size_t index_size = sizeof(u2));
+  void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2));
+  void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2));
+  void get_method_counters(Register method, Register mcs, Label& skip);
+
+  // Load cpool->resolved_references(index).
+  void load_resolved_reference_at_index(Register result, Register index, Register tmp = x15);
+
+  // Load cpool->resolved_klass_at(index).
+  void load_resolved_klass_at_offset(Register cpool, Register index, Register klass, Register temp);
+
+  void load_resolved_method_at_index(int byte_no, Register method, Register cache);
+
+  void pop_ptr(Register r = x10);
+  void pop_i(Register r = x10);
+  void pop_l(Register r = x10);
+  void pop_f(FloatRegister r = f10);
+  void pop_d(FloatRegister r = f10);
+  void push_ptr(Register r = x10);
+  void push_i(Register r = x10);
+  void push_l(Register r = x10);
+  void push_f(FloatRegister r = f10);
+  void push_d(FloatRegister r = f10);
+
+  void pop(TosState state); // transition vtos -> state
+  void push(TosState state); // transition state -> vtos
+
+  void empty_expression_stack() {
+    ld(esp, Address(fp, frame::interpreter_frame_monitor_block_top_offset * wordSize));
+    // NULL last_sp until next java call
+    sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  }
+
+  // Helpers for swap and dup
+  void load_ptr(int n, Register val);
+  void store_ptr(int n, Register val);
+
+  // Load float value from 'address'. The value is loaded onto the FPU register v0.
+  void load_float(Address src);
+  void load_double(Address src);
+
+  // Generate a subtype check: branch to ok_is_subtype if sub_klass is
+  // a subtype of super_klass.
+  void gen_subtype_check( Register sub_klass, Label &ok_is_subtype );
+
+  // Dispatching
+  void dispatch_prolog(TosState state, int step = 0);
+  void dispatch_epilog(TosState state, int step = 0);
+  // dispatch via t0
+  void dispatch_only(TosState state, bool generate_poll = false, Register Rs = t0);
+  // dispatch normal table via t0 (assume t0 is loaded already)
+  void dispatch_only_normal(TosState state, Register Rs = t0);
+  void dispatch_only_noverify(TosState state, Register Rs = t0);
+  // load t0 from [xbcp + step] and dispatch via t0
+  void dispatch_next(TosState state, int step = 0, bool generate_poll = false);
+  // load t0 from [xbcp] and dispatch via t0 and table
+  void dispatch_via (TosState state, address* table);
+
+  // jump to an invoked target
+  void prepare_to_jump_from_interpreted();
+  void jump_from_interpreted(Register method);
+
+
+  // Returning from interpreted functions
+  //
+  // Removes the current activation (incl. unlocking of monitors)
+  // and sets up the return address.  This code is also used for
+  // exception unwindwing. In that case, we do not want to throw
+  // IllegalMonitorStateExceptions, since that might get us into an
+  // infinite rethrow exception loop.
+  // Additionally this code is used for popFrame and earlyReturn.
+  // In popFrame case we want to skip throwing an exception,
+  // installing an exception, and notifying jvmdi.
+  // In earlyReturn case we only want to skip throwing an exception
+  // and installing an exception.
+  void remove_activation(TosState state,
+                         bool throw_monitor_exception = true,
+                         bool install_monitor_exception = true,
+                         bool notify_jvmdi = true);
+
+  // FIXME: Give us a valid frame at a null check.
+  virtual void null_check(Register reg, int offset = -1) {
+        MacroAssembler::null_check(reg, offset);
+  }
+
+  // Object locking
+  void lock_object  (Register lock_reg);
+  void unlock_object(Register lock_reg);
+
+  // Interpreter profiling operations
+  void set_method_data_pointer_for_bcp();
+  void test_method_data_pointer(Register mdp, Label& zero_continue);
+  void verify_method_data_pointer();
+
+  void set_mdp_data_at(Register mdp_in, int constant, Register value);
+  void increment_mdp_data_at(Address data, bool decrement = false);
+  void increment_mdp_data_at(Register mdp_in, int constant,
+                             bool decrement = false);
+  void increment_mdp_data_at(Register mdp_in, Register reg, int constant,
+                             bool decrement = false);
+  void increment_mask_and_jump(Address counter_addr,
+                               int increment, Address mask,
+                               Register tmp1, Register tmp2,
+                               bool preloaded, Label* where);
+
+  void set_mdp_flag_at(Register mdp_in, int flag_constant);
+  void test_mdp_data_at(Register mdp_in, int offset, Register value,
+                        Register test_value_out,
+                        Label& not_equal_continue);
+
+  void record_klass_in_profile(Register receiver, Register mdp,
+                               Register reg2, bool is_virtual_call);
+  void record_klass_in_profile_helper(Register receiver, Register mdp,
+                                      Register reg2,
+                                      Label& done, bool is_virtual_call);
+  void record_item_in_profile_helper(Register item, Register mdp,
+                                     Register reg2, int start_row, Label& done, int total_rows,
+                                     OffsetFunction item_offset_fn, OffsetFunction item_count_offset_fn,
+                                     int non_profiled_offset);
+
+  void update_mdp_by_offset(Register mdp_in, int offset_of_offset);
+  void update_mdp_by_offset(Register mdp_in, Register reg, int offset_of_disp);
+  void update_mdp_by_constant(Register mdp_in, int constant);
+  void update_mdp_for_ret(Register return_bci);
+
+  // narrow int return value
+  void narrow(Register result);
+
+  void profile_taken_branch(Register mdp, Register bumped_count);
+  void profile_not_taken_branch(Register mdp);
+  void profile_call(Register mdp);
+  void profile_final_call(Register mdp);
+  void profile_virtual_call(Register receiver, Register mdp,
+                            Register t1,
+                            bool receiver_can_be_null = false);
+  void profile_ret(Register return_bci, Register mdp);
+  void profile_null_seen(Register mdp);
+  void profile_typecheck(Register mdp, Register klass, Register temp);
+  void profile_typecheck_failed(Register mdp);
+  void profile_switch_default(Register mdp);
+  void profile_switch_case(Register index_in_scratch, Register mdp,
+                           Register temp);
+
+  void profile_obj_type(Register obj, const Address& mdo_addr, Register tmp);
+  void profile_arguments_type(Register mdp, Register callee, Register tmp, bool is_virtual);
+  void profile_return_type(Register mdp, Register ret, Register tmp);
+  void profile_parameters_type(Register mdp, Register tmp1, Register tmp2, Register tmp3);
+
+  // Debugging
+  // only if +VerifyFPU  && (state == ftos || state == dtos)
+  void verify_FPU(int stack_depth, TosState state = ftos);
+
+  typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
+
+  // support for jvmti/dtrace
+  void notify_method_entry();
+  void notify_method_exit(TosState state, NotifyMethodExitMode mode);
+
+  virtual void _call_Unimplemented(address call_site) {
+    save_bcp();
+    set_last_Java_frame(esp, fp, (address) pc(), t0);
+    MacroAssembler::_call_Unimplemented(call_site);
+  }
+
+#ifdef ASSERT
+  void verify_access_flags(Register access_flags, uint32_t flag_bits,
+                           const char* msg, bool stop_by_hit = true);
+  void verify_frame_setup();
+#endif
+};
+
+#endif // CPU_RISCV_INTERP_MASM_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/interpreterRT_riscv.cpp b/src/hotspot/cpu/riscv/interpreterRT_riscv.cpp
new file mode 100644
index 00000000000..d93530d8564
--- /dev/null
+++ b/src/hotspot/cpu/riscv/interpreterRT_riscv.cpp
@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "interpreter/interp_masm.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/universe.hpp"
+#include "oops/method.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/icache.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/signature.hpp"
+
+#define __ _masm->
+
+// Implementation of SignatureHandlerGenerator
+Register InterpreterRuntime::SignatureHandlerGenerator::from() { return xlocals; }
+Register InterpreterRuntime::SignatureHandlerGenerator::to()   { return sp; }
+Register InterpreterRuntime::SignatureHandlerGenerator::temp() { return t0; }
+
+Register InterpreterRuntime::SignatureHandlerGenerator::next_gpr() {
+  if (_num_reg_int_args < Argument::n_int_register_parameters_c - 1) {
+    return g_INTArgReg[++_num_reg_int_args];
+  }
+  return noreg;
+}
+
+FloatRegister InterpreterRuntime::SignatureHandlerGenerator::next_fpr() {
+  if (_num_reg_fp_args < Argument::n_float_register_parameters_c) {
+    return g_FPArgReg[_num_reg_fp_args++];
+  } else {
+    return fnoreg;
+  }
+}
+
+int InterpreterRuntime::SignatureHandlerGenerator::next_stack_offset() {
+  int ret = _stack_offset;
+  _stack_offset += wordSize;
+  return ret;
+}
+
+InterpreterRuntime::SignatureHandlerGenerator::SignatureHandlerGenerator(
+  const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) {
+  _masm = new MacroAssembler(buffer); // allocate on resourse area by default
+  _num_reg_int_args = (method->is_static() ? 1 : 0);
+  _num_reg_fp_args = 0;
+  _stack_offset = 0;
+}
+
+void InterpreterRuntime::SignatureHandlerGenerator::pass_int() {
+  const Address src(from(), Interpreter::local_offset_in_bytes(offset()));
+
+  Register reg = next_gpr();
+  if (reg != noreg) {
+    __ lw(reg, src);
+  } else {
+    __ lw(x10, src);
+    __ sw(x10, Address(to(), next_stack_offset()));
+  }
+}
+
+void InterpreterRuntime::SignatureHandlerGenerator::pass_long() {
+  const Address src(from(), Interpreter::local_offset_in_bytes(offset() + 1));
+
+  Register reg = next_gpr();
+  if (reg != noreg) {
+    __ ld(reg, src);
+  } else  {
+    __ ld(x10, src);
+    __ sd(x10, Address(to(), next_stack_offset()));
+  }
+}
+
+void InterpreterRuntime::SignatureHandlerGenerator::pass_float() {
+  const Address src(from(), Interpreter::local_offset_in_bytes(offset()));
+
+  FloatRegister reg = next_fpr();
+  if (reg != fnoreg) {
+    __ flw(reg, src);
+  } else {
+    // a floating-point argument is passed according to the integer calling
+    // convention if no floating-point argument register available
+    pass_int();
+  }
+}
+
+void InterpreterRuntime::SignatureHandlerGenerator::pass_double() {
+  const Address src(from(), Interpreter::local_offset_in_bytes(offset() + 1));
+
+  FloatRegister reg = next_fpr();
+  if (reg != fnoreg) {
+    __ fld(reg, src);
+  } else {
+    // a floating-point argument is passed according to the integer calling
+    // convention if no floating-point argument register available
+    pass_long();
+  }
+}
+
+void InterpreterRuntime::SignatureHandlerGenerator::pass_object() {
+  Register reg = next_gpr();
+  if (reg == c_rarg1) {
+    assert(offset() == 0, "argument register 1 can only be (non-null) receiver");
+    __ addi(c_rarg1, from(), Interpreter::local_offset_in_bytes(offset()));
+  } else if (reg != noreg) {
+      // c_rarg2-c_rarg7
+      __ addi(x10, from(), Interpreter::local_offset_in_bytes(offset()));
+      __ mv(reg, zr); //_num_reg_int_args:c_rarg -> 1:c_rarg2,  2:c_rarg3...
+      __ ld(temp(), x10);
+      Label L;
+      __ beqz(temp(), L);
+      __ mv(reg, x10);
+      __ bind(L);
+  } else {
+    //to stack
+    __ addi(x10, from(), Interpreter::local_offset_in_bytes(offset()));
+    __ ld(temp(), x10);
+    Label L;
+    __ bnez(temp(), L);
+    __ mv(x10, zr);
+    __ bind(L);
+    assert(sizeof(jobject) == wordSize, "");
+    __ sd(x10, Address(to(), next_stack_offset()));
+  }
+}
+
+void InterpreterRuntime::SignatureHandlerGenerator::generate(uint64_t fingerprint) {
+  // generate code to handle arguments
+  iterate(fingerprint);
+
+  // return result handler
+  __ la(x10, ExternalAddress(Interpreter::result_handler(method()->result_type())));
+  __ ret();
+
+  __ flush();
+}
+
+
+// Implementation of SignatureHandlerLibrary
+
+void SignatureHandlerLibrary::pd_set_handler(address handler) {}
+
+
+class SlowSignatureHandler
+  : public NativeSignatureIterator {
+ private:
+  address   _from;
+  intptr_t* _to;
+  intptr_t* _int_args;
+  intptr_t* _fp_args;
+  intptr_t* _fp_identifiers;
+  unsigned int _num_reg_int_args;
+  unsigned int _num_reg_fp_args;
+
+  intptr_t* single_slot_addr() {
+    intptr_t* from_addr = (intptr_t*)(_from + Interpreter::local_offset_in_bytes(0));
+    _from -= Interpreter::stackElementSize;
+    return from_addr;
+  }
+
+  intptr_t* double_slot_addr() {
+    intptr_t* from_addr = (intptr_t*)(_from + Interpreter::local_offset_in_bytes(1));
+    _from -= 2 * Interpreter::stackElementSize;
+    return from_addr;
+  }
+
+  int pass_gpr(intptr_t value) {
+    if (_num_reg_int_args < Argument::n_int_register_parameters_c - 1) {
+      *_int_args++ = value;
+      return _num_reg_int_args++;
+    }
+    return -1;
+  }
+
+  int pass_fpr(intptr_t value) {
+    if (_num_reg_fp_args < Argument::n_float_register_parameters_c) {
+      *_fp_args++ = value;
+      return _num_reg_fp_args++;
+    }
+    return -1;
+  }
+
+  void pass_stack(intptr_t value) {
+    *_to++ = value;
+  }
+
+  virtual void pass_int() {
+    jint value = *(jint*)single_slot_addr();
+    if (pass_gpr(value) < 0) {
+      pass_stack(value);
+    }
+  }
+
+  virtual void pass_long() {
+    intptr_t value = *double_slot_addr();
+    if (pass_gpr(value) < 0) {
+      pass_stack(value);
+    }
+  }
+
+  virtual void pass_object() {
+    intptr_t* addr = single_slot_addr();
+    intptr_t value = *addr == 0 ? NULL : (intptr_t)addr;
+    if (pass_gpr(value) < 0) {
+      pass_stack(value);
+    }
+  }
+
+  virtual void pass_float() {
+    jint value = *(jint*) single_slot_addr();
+    // a floating-point argument is passed according to the integer calling
+    // convention if no floating-point argument register available
+    if (pass_fpr(value) < 0 && pass_gpr(value) < 0) {
+      pass_stack(value);
+    }
+  }
+
+  virtual void pass_double() {
+    intptr_t value = *double_slot_addr();
+    int arg = pass_fpr(value);
+    if (0 <= arg) {
+      *_fp_identifiers |= (1ull << arg); // mark as double
+    } else if (pass_gpr(value) < 0) { // no need to mark if passing by integer registers or stack
+      pass_stack(value);
+    }
+  }
+
+ public:
+  SlowSignatureHandler(const methodHandle& method, address from, intptr_t* to)
+    : NativeSignatureIterator(method)
+  {
+    _from = from;
+    _to   = to;
+
+    _int_args = to - (method->is_static() ? 16 : 17);
+    _fp_args  = to - 8;
+    _fp_identifiers = to - 9;
+    *(int*) _fp_identifiers = 0;
+    _num_reg_int_args = (method->is_static() ? 1 : 0);
+    _num_reg_fp_args = 0;
+  }
+
+  ~SlowSignatureHandler()
+  {
+    _from           = NULL;
+    _to             = NULL;
+    _int_args       = NULL;
+    _fp_args        = NULL;
+    _fp_identifiers = NULL;
+  }
+};
+
+
+JRT_ENTRY(address,
+          InterpreterRuntime::slow_signature_handler(JavaThread* current,
+                                                     Method* method,
+                                                     intptr_t* from,
+                                                     intptr_t* to))
+  methodHandle m(current, (Method*)method);
+  assert(m->is_native(), "sanity check");
+
+  // handle arguments
+  SlowSignatureHandler ssh(m, (address)from, to);
+  ssh.iterate(UCONST64(-1));
+
+  // return result handler
+  return Interpreter::result_handler(m->result_type());
+JRT_END
diff --git a/src/hotspot/cpu/riscv/interpreterRT_riscv.hpp b/src/hotspot/cpu/riscv/interpreterRT_riscv.hpp
new file mode 100644
index 00000000000..05df63ba2ae
--- /dev/null
+++ b/src/hotspot/cpu/riscv/interpreterRT_riscv.hpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_INTERPRETERRT_RISCV_HPP
+#define CPU_RISCV_INTERPRETERRT_RISCV_HPP
+
+// This is included in the middle of class Interpreter.
+// Do not include files here.
+
+// native method calls
+
+class SignatureHandlerGenerator: public NativeSignatureIterator {
+ private:
+  MacroAssembler* _masm;
+  unsigned int _num_reg_fp_args;
+  unsigned int _num_reg_int_args;
+  int _stack_offset;
+
+  void pass_int();
+  void pass_long();
+  void pass_float();
+  void pass_double();
+  void pass_object();
+
+  Register next_gpr();
+  FloatRegister next_fpr();
+  int next_stack_offset();
+
+ public:
+  // Creation
+  SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer);
+  virtual ~SignatureHandlerGenerator() {
+    _masm = NULL;
+  }
+
+  // Code generation
+  void generate(uint64_t fingerprint);
+
+  // Code generation support
+  static Register from();
+  static Register to();
+  static Register temp();
+};
+
+#endif // CPU_RISCV_INTERPRETERRT_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/javaFrameAnchor_riscv.hpp b/src/hotspot/cpu/riscv/javaFrameAnchor_riscv.hpp
new file mode 100644
index 00000000000..9a6084afa1d
--- /dev/null
+++ b/src/hotspot/cpu/riscv/javaFrameAnchor_riscv.hpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_JAVAFRAMEANCHOR_RISCV_HPP
+#define CPU_RISCV_JAVAFRAMEANCHOR_RISCV_HPP
+
+private:
+
+  // FP value associated with _last_Java_sp:
+  intptr_t* volatile _last_Java_fp; // pointer is volatile not what it points to
+
+public:
+  // Each arch must define reset, save, restore
+  // These are used by objects that only care about:
+  //  1 - initializing a new state (thread creation, javaCalls)
+  //  2 - saving a current state (javaCalls)
+  //  3 - restoring an old state (javaCalls)
+
+  void clear(void) {
+    // clearing _last_Java_sp must be first
+    _last_Java_sp = NULL;
+    OrderAccess::release();
+    _last_Java_fp = NULL;
+    _last_Java_pc = NULL;
+  }
+
+  void copy(JavaFrameAnchor* src) {
+    // In order to make sure the transition state is valid for "this"
+    // We must clear _last_Java_sp before copying the rest of the new data
+    //
+    // Hack Alert: Temporary bugfix for 4717480/4721647
+    // To act like previous version (pd_cache_state) don't NULL _last_Java_sp
+    // unless the value is changing
+    //
+    assert(src != NULL, "Src should not be NULL.");
+    if (_last_Java_sp != src->_last_Java_sp) {
+      _last_Java_sp = NULL;
+      OrderAccess::release();
+    }
+    _last_Java_fp = src->_last_Java_fp;
+    _last_Java_pc = src->_last_Java_pc;
+    // Must be last so profiler will always see valid frame if has_last_frame() is true
+    _last_Java_sp = src->_last_Java_sp;
+  }
+
+  bool walkable(void)                            { return _last_Java_sp != NULL && _last_Java_pc != NULL; }
+  void make_walkable(JavaThread* thread);
+  void capture_last_Java_pc(void);
+
+  intptr_t* last_Java_sp(void) const             { return _last_Java_sp; }
+
+  const address last_Java_pc(void)               { return _last_Java_pc; }
+
+private:
+
+  static ByteSize last_Java_fp_offset()          { return byte_offset_of(JavaFrameAnchor, _last_Java_fp); }
+
+public:
+
+  void set_last_Java_sp(intptr_t* java_sp)       { _last_Java_sp = java_sp; OrderAccess::release(); }
+
+  intptr_t* last_Java_fp(void)                   { return _last_Java_fp; }
+
+#endif // CPU_RISCV_JAVAFRAMEANCHOR_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp b/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
new file mode 100644
index 00000000000..814ed23e471
--- /dev/null
+++ b/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "memory/resourceArea.hpp"
+#include "prims/jniFastGetField.hpp"
+#include "prims/jvm_misc.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "runtime/safepoint.hpp"
+
+#define __ masm->
+
+#define BUFFER_SIZE 30*wordSize
+
+// Instead of issuing a LoadLoad barrier we create an address
+// dependency between loads; this might be more efficient.
+
+// Common register usage:
+// x10/f10:      result
+// c_rarg0:    jni env
+// c_rarg1:    obj
+// c_rarg2:    jfield id
+
+static const Register robj          = x13;
+static const Register rcounter      = x14;
+static const Register roffset       = x15;
+static const Register rcounter_addr = x16;
+static const Register result        = x17;
+
+address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
+  const char *name;
+  switch (type) {
+    case T_BOOLEAN: name = "jni_fast_GetBooleanField"; break;
+    case T_BYTE:    name = "jni_fast_GetByteField";    break;
+    case T_CHAR:    name = "jni_fast_GetCharField";    break;
+    case T_SHORT:   name = "jni_fast_GetShortField";   break;
+    case T_INT:     name = "jni_fast_GetIntField";     break;
+    case T_LONG:    name = "jni_fast_GetLongField";    break;
+    case T_FLOAT:   name = "jni_fast_GetFloatField";   break;
+    case T_DOUBLE:  name = "jni_fast_GetDoubleField";  break;
+    default:        ShouldNotReachHere();
+      name = NULL;  // unreachable
+  }
+  ResourceMark rm;
+  BufferBlob* blob = BufferBlob::create(name, BUFFER_SIZE);
+  CodeBuffer cbuf(blob);
+  MacroAssembler* masm = new MacroAssembler(&cbuf);
+  address fast_entry = __ pc();
+
+  Label slow;
+  int32_t offset = 0;
+  __ la_patchable(rcounter_addr, SafepointSynchronize::safepoint_counter_addr(), offset);
+  __ addi(rcounter_addr, rcounter_addr, offset);
+
+  Address safepoint_counter_addr(rcounter_addr, 0);
+  __ lwu(rcounter, safepoint_counter_addr);
+  // An even value means there are no ongoing safepoint operations
+  __ andi(t0, rcounter, 1);
+  __ bnez(t0, slow);
+
+  if (JvmtiExport::can_post_field_access()) {
+    // Using barrier to order wrt. JVMTI check and load of result.
+    __ membar(MacroAssembler::LoadLoad);
+
+    // Check to see if a field access watch has been set before we
+    // take the fast path.
+    int32_t offset2;
+    __ la_patchable(result,
+                    ExternalAddress((address) JvmtiExport::get_field_access_count_addr()),
+                    offset2);
+    __ lwu(result, Address(result, offset2));
+    __ bnez(result, slow);
+
+    __ mv(robj, c_rarg1);
+  } else {
+    // Using address dependency to order wrt. load of result.
+    __ xorr(robj, c_rarg1, rcounter);
+    __ xorr(robj, robj, rcounter);               // obj, since
+                                                 // robj ^ rcounter ^ rcounter == robj
+                                                 // robj is address dependent on rcounter.
+  }
+
+  // Both robj and t0 are clobbered by try_resolve_jobject_in_native.
+  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  assert_cond(bs != NULL);
+  bs->try_resolve_jobject_in_native(masm, c_rarg0, robj, t0, slow);
+
+  __ srli(roffset, c_rarg2, 2);                // offset
+
+  assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
+  speculative_load_pclist[count] = __ pc();   // Used by the segfault handler
+  __ add(roffset, robj, roffset);
+
+  switch (type) {
+    case T_BOOLEAN: __ lbu(result, Address(roffset, 0)); break;
+    case T_BYTE:    __ lb(result, Address(roffset, 0)); break;
+    case T_CHAR:    __ lhu(result, Address(roffset, 0)); break;
+    case T_SHORT:   __ lh(result, Address(roffset, 0)); break;
+    case T_INT:     __ lw(result, Address(roffset, 0)); break;
+    case T_LONG:    __ ld(result, Address(roffset, 0)); break;
+    case T_FLOAT: {
+      __ flw(f28, Address(roffset, 0)); // f28 as temporaries
+      __ fmv_x_w(result, f28); // f{31--0}-->x
+      break;
+    }
+    case T_DOUBLE: {
+      __ fld(f28, Address(roffset, 0)); // f28 as temporaries
+      __ fmv_x_d(result, f28); // d{63--0}-->x
+      break;
+    }
+    default:        ShouldNotReachHere();
+  }
+
+  // Using acquire: Order JVMTI check and load of result wrt. succeeding check
+  // (LoadStore for volatile field).
+  __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+
+  __ lw(t0, safepoint_counter_addr);
+  __ bne(rcounter, t0, slow);
+
+  switch (type) {
+    case T_FLOAT:   __ fmv_w_x(f10, result); break;
+    case T_DOUBLE:  __ fmv_d_x(f10, result); break;
+    default:        __ mv(x10, result);   break;
+  }
+  __ ret();
+
+  slowcase_entry_pclist[count++] = __ pc();
+  __ bind(slow);
+  address slow_case_addr;
+  switch (type) {
+    case T_BOOLEAN: slow_case_addr = jni_GetBooleanField_addr(); break;
+    case T_BYTE:    slow_case_addr = jni_GetByteField_addr();    break;
+    case T_CHAR:    slow_case_addr = jni_GetCharField_addr();    break;
+    case T_SHORT:   slow_case_addr = jni_GetShortField_addr();   break;
+    case T_INT:     slow_case_addr = jni_GetIntField_addr();     break;
+    case T_LONG:    slow_case_addr = jni_GetLongField_addr();    break;
+    case T_FLOAT:   slow_case_addr = jni_GetFloatField_addr();   break;
+    case T_DOUBLE:  slow_case_addr = jni_GetDoubleField_addr();  break;
+    default:        ShouldNotReachHere();
+      slow_case_addr = NULL;  // unreachable
+  }
+
+  {
+    __ enter();
+    int32_t tmp_offset = 0;
+    __ la_patchable(t0, ExternalAddress(slow_case_addr), tmp_offset);
+    __ jalr(x1, t0, tmp_offset);
+    __ leave();
+    __ ret();
+  }
+  __ flush();
+
+  return fast_entry;
+}
+
+
+address JNI_FastGetField::generate_fast_get_boolean_field() {
+  return generate_fast_get_int_field0(T_BOOLEAN);
+}
+
+address JNI_FastGetField::generate_fast_get_byte_field() {
+  return generate_fast_get_int_field0(T_BYTE);
+}
+
+address JNI_FastGetField::generate_fast_get_char_field() {
+  return generate_fast_get_int_field0(T_CHAR);
+}
+
+address JNI_FastGetField::generate_fast_get_short_field() {
+  return generate_fast_get_int_field0(T_SHORT);
+}
+
+address JNI_FastGetField::generate_fast_get_int_field() {
+  return generate_fast_get_int_field0(T_INT);
+}
+
+address JNI_FastGetField::generate_fast_get_long_field() {
+  return generate_fast_get_int_field0(T_LONG);
+}
+
+address JNI_FastGetField::generate_fast_get_float_field() {
+  return generate_fast_get_int_field0(T_FLOAT);
+}
+
+address JNI_FastGetField::generate_fast_get_double_field() {
+  return generate_fast_get_int_field0(T_DOUBLE);
+}
diff --git a/src/hotspot/cpu/riscv/jniTypes_riscv.hpp b/src/hotspot/cpu/riscv/jniTypes_riscv.hpp
new file mode 100644
index 00000000000..83ffcc55d83
--- /dev/null
+++ b/src/hotspot/cpu/riscv/jniTypes_riscv.hpp
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_JNITYPES_RISCV_HPP
+#define CPU_RISCV_JNITYPES_RISCV_HPP
+
+#include "jni.h"
+#include "memory/allStatic.hpp"
+#include "oops/oop.hpp"
+
+// This file holds platform-dependent routines used to write primitive jni
+// types to the array of arguments passed into JavaCalls::call
+
+class JNITypes : private AllStatic {
+  // These functions write a java primitive type (in native format)
+  // to a java stack slot array to be passed as an argument to JavaCalls:calls.
+  // I.e., they are functionally 'push' operations if they have a 'pos'
+  // formal parameter.  Note that jlong's and jdouble's are written
+  // _in reverse_ of the order in which they appear in the interpreter
+  // stack.  This is because call stubs (see stubGenerator_sparc.cpp)
+  // reverse the argument list constructed by JavaCallArguments (see
+  // javaCalls.hpp).
+
+public:
+  // Ints are stored in native format in one JavaCallArgument slot at *to.
+  static inline void    put_int(jint  from, intptr_t *to)           { *(jint *)(to +   0  ) =  from; }
+  static inline void    put_int(jint  from, intptr_t *to, int& pos) { *(jint *)(to + pos++) =  from; }
+  static inline void    put_int(jint *from, intptr_t *to, int& pos) { *(jint *)(to + pos++) = *from; }
+
+  // Longs are stored in native format in one JavaCallArgument slot at
+  // *(to+1).
+  static inline void put_long(jlong  from, intptr_t *to) {
+    *(jlong*) (to + 1) = from;
+  }
+
+  static inline void put_long(jlong  from, intptr_t *to, int& pos) {
+    *(jlong*) (to + 1 + pos) = from;
+    pos += 2;
+  }
+
+  static inline void put_long(jlong *from, intptr_t *to, int& pos) {
+    *(jlong*) (to + 1 + pos) = *from;
+    pos += 2;
+  }
+
+  // Oops are stored in native format in one JavaCallArgument slot at *to.
+  static inline void    put_obj(const Handle& from_handle, intptr_t *to, int& pos) { *(to + pos++) = (intptr_t)from_handle.raw_value(); }
+  static inline void    put_obj(jobject       from_handle, intptr_t *to, int& pos) { *(to + pos++) = (intptr_t)from_handle; }
+
+  // Floats are stored in native format in one JavaCallArgument slot at *to.
+  static inline void    put_float(jfloat  from, intptr_t *to)           { *(jfloat *)(to +   0  ) =  from;  }
+  static inline void    put_float(jfloat  from, intptr_t *to, int& pos) { *(jfloat *)(to + pos++) =  from; }
+  static inline void    put_float(jfloat *from, intptr_t *to, int& pos) { *(jfloat *)(to + pos++) = *from; }
+
+#undef _JNI_SLOT_OFFSET
+#define _JNI_SLOT_OFFSET 1
+  // Doubles are stored in native word format in one JavaCallArgument
+  // slot at *(to+1).
+  static inline void put_double(jdouble  from, intptr_t *to) {
+    *(jdouble*) (to + 1) = from;
+  }
+
+  static inline void put_double(jdouble  from, intptr_t *to, int& pos) {
+    *(jdouble*) (to + 1 + pos) = from;
+    pos += 2;
+  }
+
+  static inline void put_double(jdouble *from, intptr_t *to, int& pos) {
+    *(jdouble*) (to + 1 + pos) = *from;
+    pos += 2;
+  }
+
+  // The get_xxx routines, on the other hand, actually _do_ fetch
+  // java primitive types from the interpreter stack.
+  // No need to worry about alignment on Intel.
+  static inline jint    get_int   (intptr_t *from) { return *(jint *)   from; }
+  static inline jlong   get_long  (intptr_t *from) { return *(jlong *)  (from + _JNI_SLOT_OFFSET); }
+  static inline oop     get_obj   (intptr_t *from) { return *(oop *)    from; }
+  static inline jfloat  get_float (intptr_t *from) { return *(jfloat *) from; }
+  static inline jdouble get_double(intptr_t *from) { return *(jdouble *)(from + _JNI_SLOT_OFFSET); }
+#undef _JNI_SLOT_OFFSET
+};
+
+#endif // CPU_RISCV_JNITYPES_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
new file mode 100644
index 00000000000..86710295444
--- /dev/null
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -0,0 +1,4016 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
+#include "compiler/disassembler.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/cardTable.hpp"
+#include "gc/shared/cardTableBarrierSet.hpp"
+#include "interpreter/bytecodeHistogram.hpp"
+#include "interpreter/interpreter.hpp"
+#include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
+#include "nativeInst_riscv.hpp"
+#include "oops/accessDecorators.hpp"
+#include "oops/compressedOops.inline.hpp"
+#include "oops/klass.inline.hpp"
+#include "oops/oop.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/jniHandles.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/thread.hpp"
+#include "utilities/powerOfTwo.hpp"
+#ifdef COMPILER2
+#include "opto/compile.hpp"
+#include "opto/node.hpp"
+#include "opto/output.hpp"
+#endif
+
+#ifdef PRODUCT
+#define BLOCK_COMMENT(str) /* nothing */
+#else
+#define BLOCK_COMMENT(str) block_comment(str)
+#endif
+#define BIND(label) bind(label); __ BLOCK_COMMENT(#label ":")
+
+static void pass_arg0(MacroAssembler* masm, Register arg) {
+  if (c_rarg0 != arg) {
+    assert_cond(masm != NULL);
+    masm->mv(c_rarg0, arg);
+  }
+}
+
+static void pass_arg1(MacroAssembler* masm, Register arg) {
+  if (c_rarg1 != arg) {
+    assert_cond(masm != NULL);
+    masm->mv(c_rarg1, arg);
+  }
+}
+
+static void pass_arg2(MacroAssembler* masm, Register arg) {
+  if (c_rarg2 != arg) {
+    assert_cond(masm != NULL);
+    masm->mv(c_rarg2, arg);
+  }
+}
+
+static void pass_arg3(MacroAssembler* masm, Register arg) {
+  if (c_rarg3 != arg) {
+    assert_cond(masm != NULL);
+    masm->mv(c_rarg3, arg);
+  }
+}
+
+void MacroAssembler::align(int modulus, int extra_offset) {
+  CompressibleRegion cr(this);
+  while ((offset() + extra_offset) % modulus != 0) { nop(); }
+}
+
+void MacroAssembler::call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions) {
+  call_VM_base(oop_result, noreg, noreg, entry_point, number_of_arguments, check_exceptions);
+}
+
+// Implementation of call_VM versions
+
+void MacroAssembler::call_VM(Register oop_result,
+                             address entry_point,
+                             bool check_exceptions) {
+  call_VM_helper(oop_result, entry_point, 0, check_exceptions);
+}
+
+void MacroAssembler::call_VM(Register oop_result,
+                             address entry_point,
+                             Register arg_1,
+                             bool check_exceptions) {
+  pass_arg1(this, arg_1);
+  call_VM_helper(oop_result, entry_point, 1, check_exceptions);
+}
+
+void MacroAssembler::call_VM(Register oop_result,
+                             address entry_point,
+                             Register arg_1,
+                             Register arg_2,
+                             bool check_exceptions) {
+  assert(arg_1 != c_rarg2, "smashed arg");
+  pass_arg2(this, arg_2);
+  pass_arg1(this, arg_1);
+  call_VM_helper(oop_result, entry_point, 2, check_exceptions);
+}
+
+void MacroAssembler::call_VM(Register oop_result,
+                             address entry_point,
+                             Register arg_1,
+                             Register arg_2,
+                             Register arg_3,
+                             bool check_exceptions) {
+  assert(arg_1 != c_rarg3, "smashed arg");
+  assert(arg_2 != c_rarg3, "smashed arg");
+  pass_arg3(this, arg_3);
+
+  assert(arg_1 != c_rarg2, "smashed arg");
+  pass_arg2(this, arg_2);
+
+  pass_arg1(this, arg_1);
+  call_VM_helper(oop_result, entry_point, 3, check_exceptions);
+}
+
+void MacroAssembler::call_VM(Register oop_result,
+                             Register last_java_sp,
+                             address entry_point,
+                             int number_of_arguments,
+                             bool check_exceptions) {
+  call_VM_base(oop_result, xthread, last_java_sp, entry_point, number_of_arguments, check_exceptions);
+}
+
+void MacroAssembler::call_VM(Register oop_result,
+                             Register last_java_sp,
+                             address entry_point,
+                             Register arg_1,
+                             bool check_exceptions) {
+  pass_arg1(this, arg_1);
+  call_VM(oop_result, last_java_sp, entry_point, 1, check_exceptions);
+}
+
+void MacroAssembler::call_VM(Register oop_result,
+                             Register last_java_sp,
+                             address entry_point,
+                             Register arg_1,
+                             Register arg_2,
+                             bool check_exceptions) {
+
+  assert(arg_1 != c_rarg2, "smashed arg");
+  pass_arg2(this, arg_2);
+  pass_arg1(this, arg_1);
+  call_VM(oop_result, last_java_sp, entry_point, 2, check_exceptions);
+}
+
+void MacroAssembler::call_VM(Register oop_result,
+                             Register last_java_sp,
+                             address entry_point,
+                             Register arg_1,
+                             Register arg_2,
+                             Register arg_3,
+                             bool check_exceptions) {
+  assert(arg_1 != c_rarg3, "smashed arg");
+  assert(arg_2 != c_rarg3, "smashed arg");
+  pass_arg3(this, arg_3);
+  assert(arg_1 != c_rarg2, "smashed arg");
+  pass_arg2(this, arg_2);
+  pass_arg1(this, arg_1);
+  call_VM(oop_result, last_java_sp, entry_point, 3, check_exceptions);
+}
+
+// these are no-ops overridden by InterpreterMacroAssembler
+void MacroAssembler::check_and_handle_earlyret(Register java_thread) {}
+void MacroAssembler::check_and_handle_popframe(Register java_thread) {}
+
+// Calls to C land
+//
+// When entering C land, the fp, & esp of the last Java frame have to be recorded
+// in the (thread-local) JavaThread object. When leaving C land, the last Java fp
+// has to be reset to 0. This is required to allow proper stack traversal.
+void MacroAssembler::set_last_Java_frame(Register last_java_sp,
+                                         Register last_java_fp,
+                                         Register last_java_pc,
+                                         Register tmp) {
+
+  if (last_java_pc->is_valid()) {
+      sd(last_java_pc, Address(xthread,
+                               JavaThread::frame_anchor_offset() +
+                               JavaFrameAnchor::last_Java_pc_offset()));
+  }
+
+  // determine last_java_sp register
+  if (last_java_sp == sp) {
+    mv(tmp, sp);
+    last_java_sp = tmp;
+  } else if (!last_java_sp->is_valid()) {
+    last_java_sp = esp;
+  }
+
+  sd(last_java_sp, Address(xthread, JavaThread::last_Java_sp_offset()));
+
+  // last_java_fp is optional
+  if (last_java_fp->is_valid()) {
+    sd(last_java_fp, Address(xthread, JavaThread::last_Java_fp_offset()));
+  }
+}
+
+void MacroAssembler::set_last_Java_frame(Register last_java_sp,
+                                         Register last_java_fp,
+                                         address  last_java_pc,
+                                         Register tmp) {
+  assert(last_java_pc != NULL, "must provide a valid PC");
+
+  la(tmp, last_java_pc);
+  sd(tmp, Address(xthread, JavaThread::frame_anchor_offset() + JavaFrameAnchor::last_Java_pc_offset()));
+
+  set_last_Java_frame(last_java_sp, last_java_fp, noreg, tmp);
+}
+
+void MacroAssembler::set_last_Java_frame(Register last_java_sp,
+                                         Register last_java_fp,
+                                         Label &L,
+                                         Register tmp) {
+  if (L.is_bound()) {
+    set_last_Java_frame(last_java_sp, last_java_fp, target(L), tmp);
+  } else {
+    InstructionMark im(this);
+    L.add_patch_at(code(), locator());
+    set_last_Java_frame(last_java_sp, last_java_fp, pc() /* Patched later */, tmp);
+  }
+}
+
+void MacroAssembler::reset_last_Java_frame(bool clear_fp) {
+  // we must set sp to zero to clear frame
+  sd(zr, Address(xthread, JavaThread::last_Java_sp_offset()));
+
+  // must clear fp, so that compiled frames are not confused; it is
+  // possible that we need it only for debugging
+  if (clear_fp) {
+    sd(zr, Address(xthread, JavaThread::last_Java_fp_offset()));
+  }
+
+  // Always clear the pc because it could have been set by make_walkable()
+  sd(zr, Address(xthread, JavaThread::last_Java_pc_offset()));
+}
+
+void MacroAssembler::call_VM_base(Register oop_result,
+                                  Register java_thread,
+                                  Register last_java_sp,
+                                  address  entry_point,
+                                  int      number_of_arguments,
+                                  bool     check_exceptions) {
+   // determine java_thread register
+  if (!java_thread->is_valid()) {
+    java_thread = xthread;
+  }
+  // determine last_java_sp register
+  if (!last_java_sp->is_valid()) {
+    last_java_sp = esp;
+  }
+
+  // debugging support
+  assert(number_of_arguments >= 0   , "cannot have negative number of arguments");
+  assert(java_thread == xthread, "unexpected register");
+
+  assert(java_thread != oop_result  , "cannot use the same register for java_thread & oop_result");
+  assert(java_thread != last_java_sp, "cannot use the same register for java_thread & last_java_sp");
+
+  // push java thread (becomes first argument of C function)
+  mv(c_rarg0, java_thread);
+
+  // set last Java frame before call
+  assert(last_java_sp != fp, "can't use fp");
+
+  Label l;
+  set_last_Java_frame(last_java_sp, fp, l, t0);
+
+  // do the call, remove parameters
+  MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
+
+  // reset last Java frame
+  // Only interpreter should have to clear fp
+  reset_last_Java_frame(true);
+
+   // C++ interp handles this in the interpreter
+  check_and_handle_popframe(java_thread);
+  check_and_handle_earlyret(java_thread);
+
+  if (check_exceptions) {
+    // check for pending exceptions (java_thread is set upon return)
+    ld(t0, Address(java_thread, in_bytes(Thread::pending_exception_offset())));
+    Label ok;
+    beqz(t0, ok);
+    int32_t offset = 0;
+    la_patchable(t0, RuntimeAddress(StubRoutines::forward_exception_entry()), offset);
+    jalr(x0, t0, offset);
+    bind(ok);
+  }
+
+  // get oop result if there is one and reset the value in the thread
+  if (oop_result->is_valid()) {
+    get_vm_result(oop_result, java_thread);
+  }
+}
+
+void MacroAssembler::get_vm_result(Register oop_result, Register java_thread) {
+  ld(oop_result, Address(java_thread, JavaThread::vm_result_offset()));
+  sd(zr, Address(java_thread, JavaThread::vm_result_offset()));
+  verify_oop(oop_result, "broken oop in call_VM_base");
+}
+
+void MacroAssembler::get_vm_result_2(Register metadata_result, Register java_thread) {
+  ld(metadata_result, Address(java_thread, JavaThread::vm_result_2_offset()));
+  sd(zr, Address(java_thread, JavaThread::vm_result_2_offset()));
+}
+
+void MacroAssembler::clinit_barrier(Register klass, Register tmp, Label* L_fast_path, Label* L_slow_path) {
+  assert(L_fast_path != NULL || L_slow_path != NULL, "at least one is required");
+  assert_different_registers(klass, xthread, tmp);
+
+  Label L_fallthrough, L_tmp;
+  if (L_fast_path == NULL) {
+    L_fast_path = &L_fallthrough;
+  } else if (L_slow_path == NULL) {
+    L_slow_path = &L_fallthrough;
+  }
+
+  // Fast path check: class is fully initialized
+  lbu(tmp, Address(klass, InstanceKlass::init_state_offset()));
+  sub(tmp, tmp, InstanceKlass::fully_initialized);
+  beqz(tmp, *L_fast_path);
+
+  // Fast path check: current thread is initializer thread
+  ld(tmp, Address(klass, InstanceKlass::init_thread_offset()));
+
+  if (L_slow_path == &L_fallthrough) {
+    beq(xthread, tmp, *L_fast_path);
+    bind(*L_slow_path);
+  } else if (L_fast_path == &L_fallthrough) {
+    bne(xthread, tmp, *L_slow_path);
+    bind(*L_fast_path);
+  } else {
+    Unimplemented();
+  }
+}
+
+void MacroAssembler::verify_oop(Register reg, const char* s) {
+  if (!VerifyOops) { return; }
+
+  // Pass register number to verify_oop_subroutine
+  const char* b = NULL;
+  {
+    ResourceMark rm;
+    stringStream ss;
+    ss.print("verify_oop: %s: %s", reg->name(), s);
+    b = code_string(ss.as_string());
+  }
+  BLOCK_COMMENT("verify_oop {");
+
+  push_reg(RegSet::of(ra, t0, t1, c_rarg0), sp);
+
+  mv(c_rarg0, reg); // c_rarg0 : x10
+  li(t0, (uintptr_t)(address)b);
+
+  // call indirectly to solve generation ordering problem
+  int32_t offset = 0;
+  la_patchable(t1, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()), offset);
+  ld(t1, Address(t1, offset));
+  jalr(t1);
+
+  pop_reg(RegSet::of(ra, t0, t1, c_rarg0), sp);
+
+  BLOCK_COMMENT("} verify_oop");
+}
+
+void MacroAssembler::verify_oop_addr(Address addr, const char* s) {
+  if (!VerifyOops) {
+    return;
+  }
+
+  const char* b = NULL;
+  {
+    ResourceMark rm;
+    stringStream ss;
+    ss.print("verify_oop_addr: %s", s);
+    b = code_string(ss.as_string());
+  }
+  BLOCK_COMMENT("verify_oop_addr {");
+
+  push_reg(RegSet::of(ra, t0, t1, c_rarg0), sp);
+
+  if (addr.uses(sp)) {
+    la(x10, addr);
+    ld(x10, Address(x10, 4 * wordSize));
+  } else {
+    ld(x10, addr);
+  }
+
+  li(t0, (uintptr_t)(address)b);
+
+  // call indirectly to solve generation ordering problem
+  int32_t offset = 0;
+  la_patchable(t1, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()), offset);
+  ld(t1, Address(t1, offset));
+  jalr(t1);
+
+  pop_reg(RegSet::of(ra, t0, t1, c_rarg0), sp);
+
+  BLOCK_COMMENT("} verify_oop_addr");
+}
+
+Address MacroAssembler::argument_address(RegisterOrConstant arg_slot,
+                                         int extra_slot_offset) {
+  // cf. TemplateTable::prepare_invoke(), if (load_receiver).
+  int stackElementSize = Interpreter::stackElementSize;
+  int offset = Interpreter::expr_offset_in_bytes(extra_slot_offset+0);
+#ifdef ASSERT
+  int offset1 = Interpreter::expr_offset_in_bytes(extra_slot_offset+1);
+  assert(offset1 - offset == stackElementSize, "correct arithmetic");
+#endif
+  if (arg_slot.is_constant()) {
+    return Address(esp, arg_slot.as_constant() * stackElementSize + offset);
+  } else {
+    assert_different_registers(t0, arg_slot.as_register());
+    shadd(t0, arg_slot.as_register(), esp, t0, exact_log2(stackElementSize));
+    return Address(t0, offset);
+  }
+}
+
+#ifndef PRODUCT
+extern "C" void findpc(intptr_t x);
+#endif
+
+void MacroAssembler::debug64(char* msg, int64_t pc, int64_t regs[])
+{
+  // In order to get locks to work, we need to fake a in_VM state
+  if (ShowMessageBoxOnError) {
+    JavaThread* thread = JavaThread::current();
+    JavaThreadState saved_state = thread->thread_state();
+    thread->set_thread_state(_thread_in_vm);
+#ifndef PRODUCT
+    if (CountBytecodes || TraceBytecodes || StopInterpreterAt) {
+      ttyLocker ttyl;
+      BytecodeCounter::print();
+    }
+#endif
+    if (os::message_box(msg, "Execution stopped, print registers?")) {
+      ttyLocker ttyl;
+      tty->print_cr(" pc = 0x%016lx", pc);
+#ifndef PRODUCT
+      tty->cr();
+      findpc(pc);
+      tty->cr();
+#endif
+      tty->print_cr(" x0 = 0x%016lx", regs[0]);
+      tty->print_cr(" x1 = 0x%016lx", regs[1]);
+      tty->print_cr(" x2 = 0x%016lx", regs[2]);
+      tty->print_cr(" x3 = 0x%016lx", regs[3]);
+      tty->print_cr(" x4 = 0x%016lx", regs[4]);
+      tty->print_cr(" x5 = 0x%016lx", regs[5]);
+      tty->print_cr(" x6 = 0x%016lx", regs[6]);
+      tty->print_cr(" x7 = 0x%016lx", regs[7]);
+      tty->print_cr(" x8 = 0x%016lx", regs[8]);
+      tty->print_cr(" x9 = 0x%016lx", regs[9]);
+      tty->print_cr("x10 = 0x%016lx", regs[10]);
+      tty->print_cr("x11 = 0x%016lx", regs[11]);
+      tty->print_cr("x12 = 0x%016lx", regs[12]);
+      tty->print_cr("x13 = 0x%016lx", regs[13]);
+      tty->print_cr("x14 = 0x%016lx", regs[14]);
+      tty->print_cr("x15 = 0x%016lx", regs[15]);
+      tty->print_cr("x16 = 0x%016lx", regs[16]);
+      tty->print_cr("x17 = 0x%016lx", regs[17]);
+      tty->print_cr("x18 = 0x%016lx", regs[18]);
+      tty->print_cr("x19 = 0x%016lx", regs[19]);
+      tty->print_cr("x20 = 0x%016lx", regs[20]);
+      tty->print_cr("x21 = 0x%016lx", regs[21]);
+      tty->print_cr("x22 = 0x%016lx", regs[22]);
+      tty->print_cr("x23 = 0x%016lx", regs[23]);
+      tty->print_cr("x24 = 0x%016lx", regs[24]);
+      tty->print_cr("x25 = 0x%016lx", regs[25]);
+      tty->print_cr("x26 = 0x%016lx", regs[26]);
+      tty->print_cr("x27 = 0x%016lx", regs[27]);
+      tty->print_cr("x28 = 0x%016lx", regs[28]);
+      tty->print_cr("x30 = 0x%016lx", regs[30]);
+      tty->print_cr("x31 = 0x%016lx", regs[31]);
+      BREAKPOINT;
+    }
+  }
+  fatal("DEBUG MESSAGE: %s", msg);
+}
+
+void MacroAssembler::resolve_jobject(Register value, Register thread, Register tmp) {
+  Label done, not_weak;
+  beqz(value, done);           // Use NULL as-is.
+
+  // Test for jweak tag.
+  andi(t0, value, JNIHandles::weak_tag_mask);
+  beqz(t0, not_weak);
+
+  // Resolve jweak.
+  access_load_at(T_OBJECT, IN_NATIVE | ON_PHANTOM_OOP_REF, value,
+                 Address(value, -JNIHandles::weak_tag_value), tmp, thread);
+  verify_oop(value);
+  j(done);
+
+  bind(not_weak);
+  // Resolve (untagged) jobject.
+  access_load_at(T_OBJECT, IN_NATIVE, value, Address(value, 0), tmp, thread);
+  verify_oop(value);
+  bind(done);
+}
+
+void MacroAssembler::stop(const char* msg) {
+  address ip = pc();
+  pusha();
+  li(c_rarg0, (uintptr_t)(address)msg);
+  li(c_rarg1, (uintptr_t)(address)ip);
+  mv(c_rarg2, sp);
+  mv(c_rarg3, CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
+  jalr(c_rarg3);
+  ebreak();
+}
+
+void MacroAssembler::unimplemented(const char* what) {
+  const char* buf = NULL;
+  {
+    ResourceMark rm;
+    stringStream ss;
+    ss.print("unimplemented: %s", what);
+    buf = code_string(ss.as_string());
+  }
+  stop(buf);
+}
+
+void MacroAssembler::emit_static_call_stub() {
+  // CompiledDirectStaticCall::set_to_interpreted knows the
+  // exact layout of this stub.
+
+  ifence();
+  mov_metadata(xmethod, (Metadata*)NULL);
+
+  // Jump to the entry point of the i2c stub.
+  int32_t offset = 0;
+  movptr_with_offset(t0, 0, offset);
+  jalr(x0, t0, offset);
+}
+
+void MacroAssembler::call_VM_leaf_base(address entry_point,
+                                       int number_of_arguments,
+                                       Label *retaddr) {
+  call_native_base(entry_point, retaddr);
+}
+
+void MacroAssembler::call_native(address entry_point, Register arg_0) {
+  pass_arg0(this, arg_0);
+  call_native_base(entry_point);
+}
+
+void MacroAssembler::call_native_base(address entry_point, Label *retaddr) {
+  Label E, L;
+  int32_t offset = 0;
+  push_reg(0x80000040, sp);   // push << t0 & xmethod >> to sp
+  movptr_with_offset(t0, entry_point, offset);
+  jalr(x1, t0, offset);
+  if (retaddr != NULL) {
+    bind(*retaddr);
+  }
+  pop_reg(0x80000040, sp);   // pop << t0 & xmethod >> from sp
+}
+
+void MacroAssembler::call_VM_leaf(address entry_point, int number_of_arguments) {
+  call_VM_leaf_base(entry_point, number_of_arguments);
+}
+
+void MacroAssembler::call_VM_leaf(address entry_point, Register arg_0) {
+  pass_arg0(this, arg_0);
+  call_VM_leaf_base(entry_point, 1);
+}
+
+void MacroAssembler::call_VM_leaf(address entry_point, Register arg_0, Register arg_1) {
+  pass_arg0(this, arg_0);
+  pass_arg1(this, arg_1);
+  call_VM_leaf_base(entry_point, 2);
+}
+
+void MacroAssembler::call_VM_leaf(address entry_point, Register arg_0,
+                                  Register arg_1, Register arg_2) {
+  pass_arg0(this, arg_0);
+  pass_arg1(this, arg_1);
+  pass_arg2(this, arg_2);
+  call_VM_leaf_base(entry_point, 3);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0) {
+  pass_arg0(this, arg_0);
+  MacroAssembler::call_VM_leaf_base(entry_point, 1);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1) {
+
+  assert(arg_0 != c_rarg1, "smashed arg");
+  pass_arg1(this, arg_1);
+  pass_arg0(this, arg_0);
+  MacroAssembler::call_VM_leaf_base(entry_point, 2);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2) {
+  assert(arg_0 != c_rarg2, "smashed arg");
+  assert(arg_1 != c_rarg2, "smashed arg");
+  pass_arg2(this, arg_2);
+  assert(arg_0 != c_rarg1, "smashed arg");
+  pass_arg1(this, arg_1);
+  pass_arg0(this, arg_0);
+  MacroAssembler::call_VM_leaf_base(entry_point, 3);
+}
+
+void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2, Register arg_3) {
+  assert(arg_0 != c_rarg3, "smashed arg");
+  assert(arg_1 != c_rarg3, "smashed arg");
+  assert(arg_2 != c_rarg3, "smashed arg");
+  pass_arg3(this, arg_3);
+  assert(arg_0 != c_rarg2, "smashed arg");
+  assert(arg_1 != c_rarg2, "smashed arg");
+  pass_arg2(this, arg_2);
+  assert(arg_0 != c_rarg1, "smashed arg");
+  pass_arg1(this, arg_1);
+  pass_arg0(this, arg_0);
+  MacroAssembler::call_VM_leaf_base(entry_point, 4);
+}
+
+void MacroAssembler::nop() {
+  addi(x0, x0, 0);
+}
+
+void MacroAssembler::mv(Register Rd, Register Rs) {
+  if (Rd != Rs) {
+    addi(Rd, Rs, 0);
+  }
+}
+
+void MacroAssembler::notr(Register Rd, Register Rs) {
+  xori(Rd, Rs, -1);
+}
+
+void MacroAssembler::neg(Register Rd, Register Rs) {
+  sub(Rd, x0, Rs);
+}
+
+void MacroAssembler::negw(Register Rd, Register Rs) {
+  subw(Rd, x0, Rs);
+}
+
+void MacroAssembler::sext_w(Register Rd, Register Rs) {
+  addiw(Rd, Rs, 0);
+}
+
+void MacroAssembler::zext_b(Register Rd, Register Rs) {
+  andi(Rd, Rs, 0xFF);
+}
+
+void MacroAssembler::seqz(Register Rd, Register Rs) {
+  sltiu(Rd, Rs, 1);
+}
+
+void MacroAssembler::snez(Register Rd, Register Rs) {
+  sltu(Rd, x0, Rs);
+}
+
+void MacroAssembler::sltz(Register Rd, Register Rs) {
+  slt(Rd, Rs, x0);
+}
+
+void MacroAssembler::sgtz(Register Rd, Register Rs) {
+  slt(Rd, x0, Rs);
+}
+
+void MacroAssembler::fmv_s(FloatRegister Rd, FloatRegister Rs) {
+  if (Rd != Rs) {
+    fsgnj_s(Rd, Rs, Rs);
+  }
+}
+
+void MacroAssembler::fabs_s(FloatRegister Rd, FloatRegister Rs) {
+  fsgnjx_s(Rd, Rs, Rs);
+}
+
+void MacroAssembler::fneg_s(FloatRegister Rd, FloatRegister Rs) {
+  fsgnjn_s(Rd, Rs, Rs);
+}
+
+void MacroAssembler::fmv_d(FloatRegister Rd, FloatRegister Rs) {
+  if (Rd != Rs) {
+    fsgnj_d(Rd, Rs, Rs);
+  }
+}
+
+void MacroAssembler::fabs_d(FloatRegister Rd, FloatRegister Rs) {
+  fsgnjx_d(Rd, Rs, Rs);
+}
+
+void MacroAssembler::fneg_d(FloatRegister Rd, FloatRegister Rs) {
+  fsgnjn_d(Rd, Rs, Rs);
+}
+
+void MacroAssembler::vmnot_m(VectorRegister vd, VectorRegister vs) {
+  vmnand_mm(vd, vs, vs);
+}
+
+void MacroAssembler::vncvt_x_x_w(VectorRegister vd, VectorRegister vs, VectorMask vm) {
+  vnsrl_wx(vd, vs, x0, vm);
+}
+
+void MacroAssembler::vfneg_v(VectorRegister vd, VectorRegister vs) {
+  vfsgnjn_vv(vd, vs, vs);
+}
+
+void MacroAssembler::la(Register Rd, const address &dest) {
+  int64_t offset = dest - pc();
+  if (is_offset_in_range(offset, 32)) {
+    auipc(Rd, (int32_t)offset + 0x800);  //0x800, Note:the 11th sign bit
+    addi(Rd, Rd, ((int64_t)offset << 52) >> 52);
+  } else {
+    movptr(Rd, dest);
+  }
+}
+
+void MacroAssembler::la(Register Rd, const Address &adr) {
+  InstructionMark im(this);
+  code_section()->relocate(inst_mark(), adr.rspec());
+  relocInfo::relocType rtype = adr.rspec().reloc()->type();
+
+  switch (adr.getMode()) {
+    case Address::literal: {
+      if (rtype == relocInfo::none) {
+        li(Rd, (intptr_t)(adr.target()));
+      } else {
+        movptr(Rd, adr.target());
+      }
+      break;
+    }
+    case Address::base_plus_offset: {
+      int32_t offset = 0;
+      baseOffset(Rd, adr, offset);
+      addi(Rd, Rd, offset);
+      break;
+    }
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void MacroAssembler::la(Register Rd, Label &label) {
+  la(Rd, target(label));
+}
+
+#define INSN(NAME)                                                                \
+  void MacroAssembler::NAME##z(Register Rs, const address &dest) {                \
+    NAME(Rs, zr, dest);                                                           \
+  }                                                                               \
+  void MacroAssembler::NAME##z(Register Rs, Label &l, bool is_far) {              \
+    NAME(Rs, zr, l, is_far);                                                      \
+  }                                                                               \
+
+  INSN(beq);
+  INSN(bne);
+  INSN(blt);
+  INSN(ble);
+  INSN(bge);
+  INSN(bgt);
+
+#undef INSN
+
+// Float compare branch instructions
+
+#define INSN(NAME, FLOATCMP, BRANCH)                                                                                   \
+  void MacroAssembler::float_##NAME(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far, bool is_unordered) {  \
+    FLOATCMP##_s(t0, Rs1, Rs2);                                                                                        \
+    BRANCH(t0, l, is_far);                                                                                             \
+  }                                                                                                                    \
+  void MacroAssembler::double_##NAME(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far, bool is_unordered) { \
+    FLOATCMP##_d(t0, Rs1, Rs2);                                                                                        \
+    BRANCH(t0, l, is_far);                                                                                             \
+  }
+
+  INSN(beq, feq, bnez);
+  INSN(bne, feq, beqz);
+
+#undef INSN
+
+
+#define INSN(NAME, FLOATCMP1, FLOATCMP2)                                              \
+  void MacroAssembler::float_##NAME(FloatRegister Rs1, FloatRegister Rs2, Label &l,   \
+                                    bool is_far, bool is_unordered) {                 \
+    if (is_unordered) {                                                               \
+      /* jump if either source is NaN or condition is expected */                     \
+      FLOATCMP2##_s(t0, Rs2, Rs1);                                                    \
+      beqz(t0, l, is_far);                                                            \
+    } else {                                                                          \
+      /* jump if no NaN in source and condition is expected */                        \
+      FLOATCMP1##_s(t0, Rs1, Rs2);                                                    \
+      bnez(t0, l, is_far);                                                            \
+    }                                                                                 \
+  }                                                                                   \
+  void MacroAssembler::double_##NAME(FloatRegister Rs1, FloatRegister Rs2, Label &l,  \
+                                     bool is_far, bool is_unordered) {                \
+    if (is_unordered) {                                                               \
+      /* jump if either source is NaN or condition is expected */                     \
+      FLOATCMP2##_d(t0, Rs2, Rs1);                                                    \
+      beqz(t0, l, is_far);                                                            \
+    } else {                                                                          \
+      /* jump if no NaN in source and condition is expected */                        \
+      FLOATCMP1##_d(t0, Rs1, Rs2);                                                    \
+      bnez(t0, l, is_far);                                                            \
+    }                                                                                 \
+  }
+
+  INSN(ble, fle, flt);
+  INSN(blt, flt, fle);
+
+#undef INSN
+
+#define INSN(NAME, CMP)                                                              \
+  void MacroAssembler::float_##NAME(FloatRegister Rs1, FloatRegister Rs2, Label &l,  \
+                                    bool is_far, bool is_unordered) {                \
+    float_##CMP(Rs2, Rs1, l, is_far, is_unordered);                                  \
+  }                                                                                  \
+  void MacroAssembler::double_##NAME(FloatRegister Rs1, FloatRegister Rs2, Label &l, \
+                                     bool is_far, bool is_unordered) {               \
+    double_##CMP(Rs2, Rs1, l, is_far, is_unordered);                                 \
+  }
+
+  INSN(bgt, blt);
+  INSN(bge, ble);
+
+#undef INSN
+
+
+#define INSN(NAME, CSR)                       \
+  void MacroAssembler::NAME(Register Rd) {    \
+    csrr(Rd, CSR);                            \
+  }
+
+  INSN(rdinstret,  CSR_INSTERT);
+  INSN(rdcycle,    CSR_CYCLE);
+  INSN(rdtime,     CSR_TIME);
+  INSN(frcsr,      CSR_FCSR);
+  INSN(frrm,       CSR_FRM);
+  INSN(frflags,    CSR_FFLAGS);
+
+#undef INSN
+
+void MacroAssembler::csrr(Register Rd, unsigned csr) {
+  csrrs(Rd, csr, x0);
+}
+
+#define INSN(NAME, OPFUN)                                      \
+  void MacroAssembler::NAME(unsigned csr, Register Rs) {       \
+    OPFUN(x0, csr, Rs);                                        \
+  }
+
+  INSN(csrw, csrrw);
+  INSN(csrs, csrrs);
+  INSN(csrc, csrrc);
+
+#undef INSN
+
+#define INSN(NAME, OPFUN)                                      \
+  void MacroAssembler::NAME(unsigned csr, unsigned imm) {      \
+    OPFUN(x0, csr, imm);                                       \
+  }
+
+  INSN(csrwi, csrrwi);
+  INSN(csrsi, csrrsi);
+  INSN(csrci, csrrci);
+
+#undef INSN
+
+#define INSN(NAME, CSR)                                      \
+  void MacroAssembler::NAME(Register Rd, Register Rs) {      \
+    csrrw(Rd, CSR, Rs);                                      \
+  }
+
+  INSN(fscsr,   CSR_FCSR);
+  INSN(fsrm,    CSR_FRM);
+  INSN(fsflags, CSR_FFLAGS);
+
+#undef INSN
+
+#define INSN(NAME)                              \
+  void MacroAssembler::NAME(Register Rs) {      \
+    NAME(x0, Rs);                               \
+  }
+
+  INSN(fscsr);
+  INSN(fsrm);
+  INSN(fsflags);
+
+#undef INSN
+
+void MacroAssembler::fsrmi(Register Rd, unsigned imm) {
+  guarantee(imm < 5, "Rounding Mode is invalid in Rounding Mode register");
+  csrrwi(Rd, CSR_FRM, imm);
+}
+
+void MacroAssembler::fsflagsi(Register Rd, unsigned imm) {
+   csrrwi(Rd, CSR_FFLAGS, imm);
+}
+
+#define INSN(NAME)                             \
+  void MacroAssembler::NAME(unsigned imm) {    \
+    NAME(x0, imm);                             \
+  }
+
+  INSN(fsrmi);
+  INSN(fsflagsi);
+
+#undef INSN
+
+void MacroAssembler::push_reg(Register Rs)
+{
+  addi(esp, esp, 0 - wordSize);
+  sd(Rs, Address(esp, 0));
+}
+
+void MacroAssembler::pop_reg(Register Rd)
+{
+  ld(Rd, esp, 0);
+  addi(esp, esp, wordSize);
+}
+
+int MacroAssembler::bitset_to_regs(unsigned int bitset, unsigned char* regs) {
+  int count = 0;
+  // Scan bitset to accumulate register pairs
+  for (int reg = 31; reg >= 0; reg--) {
+    if ((1U << 31) & bitset) {
+      regs[count++] = reg;
+    }
+    bitset <<= 1;
+  }
+  return count;
+}
+
+// Push lots of registers in the bit set supplied.  Don't push sp.
+// Return the number of words pushed
+int MacroAssembler::push_reg(unsigned int bitset, Register stack) {
+  DEBUG_ONLY(int words_pushed = 0;)
+  CompressibleRegion cr(this);
+
+  unsigned char regs[32];
+  int count = bitset_to_regs(bitset, regs);
+  // reserve one slot to align for odd count
+  int offset = is_even(count) ? 0 : wordSize;
+
+  if (count) {
+    addi(stack, stack, - count * wordSize - offset);
+  }
+  for (int i = count - 1; i >= 0; i--) {
+    sd(as_Register(regs[i]), Address(stack, (count - 1 - i) * wordSize + offset));
+    DEBUG_ONLY(words_pushed ++;)
+  }
+
+  assert(words_pushed == count, "oops, pushed != count");
+
+  return count;
+}
+
+int MacroAssembler::pop_reg(unsigned int bitset, Register stack) {
+  DEBUG_ONLY(int words_popped = 0;)
+  CompressibleRegion cr(this);
+
+  unsigned char regs[32];
+  int count = bitset_to_regs(bitset, regs);
+  // reserve one slot to align for odd count
+  int offset = is_even(count) ? 0 : wordSize;
+
+  for (int i = count - 1; i >= 0; i--) {
+    ld(as_Register(regs[i]), Address(stack, (count - 1 - i) * wordSize + offset));
+    DEBUG_ONLY(words_popped ++;)
+  }
+
+  if (count) {
+    addi(stack, stack, count * wordSize + offset);
+  }
+  assert(words_popped == count, "oops, popped != count");
+
+  return count;
+}
+
+// Push float registers in the bitset, except sp.
+// Return the number of heapwords pushed.
+int MacroAssembler::push_fp(unsigned int bitset, Register stack) {
+  CompressibleRegion cr(this);
+  int words_pushed = 0;
+  unsigned char regs[32];
+  int count = bitset_to_regs(bitset, regs);
+  int push_slots = count + (count & 1);
+
+  if (count) {
+    addi(stack, stack, -push_slots * wordSize);
+  }
+
+  for (int i = count - 1; i >= 0; i--) {
+    fsd(as_FloatRegister(regs[i]), Address(stack, (push_slots - 1 - i) * wordSize));
+    words_pushed++;
+  }
+
+  assert(words_pushed == count, "oops, pushed(%d) != count(%d)", words_pushed, count);
+  return count;
+}
+
+int MacroAssembler::pop_fp(unsigned int bitset, Register stack) {
+  CompressibleRegion cr(this);
+  int words_popped = 0;
+  unsigned char regs[32];
+  int count = bitset_to_regs(bitset, regs);
+  int pop_slots = count + (count & 1);
+
+  for (int i = count - 1; i >= 0; i--) {
+    fld(as_FloatRegister(regs[i]), Address(stack, (pop_slots - 1 - i) * wordSize));
+    words_popped++;
+  }
+
+  if (count) {
+    addi(stack, stack, pop_slots * wordSize);
+  }
+
+  assert(words_popped == count, "oops, popped(%d) != count(%d)", words_popped, count);
+  return count;
+}
+
+#ifdef COMPILER2
+int MacroAssembler::push_vp(unsigned int bitset, Register stack) {
+  CompressibleRegion cr(this);
+  int vector_size_in_bytes = Matcher::scalable_vector_reg_size(T_BYTE);
+
+  // Scan bitset to accumulate register pairs
+  unsigned char regs[32];
+  int count = 0;
+  for (int reg = 31; reg >= 0; reg--) {
+    if ((1U << 31) & bitset) {
+      regs[count++] = reg;
+    }
+    bitset <<= 1;
+  }
+
+  for (int i = 0; i < count; i++) {
+    sub(stack, stack, vector_size_in_bytes);
+    vs1r_v(as_VectorRegister(regs[i]), stack);
+  }
+
+  return count * vector_size_in_bytes / wordSize;
+}
+
+int MacroAssembler::pop_vp(unsigned int bitset, Register stack) {
+  CompressibleRegion cr(this);
+  int vector_size_in_bytes = Matcher::scalable_vector_reg_size(T_BYTE);
+
+  // Scan bitset to accumulate register pairs
+  unsigned char regs[32];
+  int count = 0;
+  for (int reg = 31; reg >= 0; reg--) {
+    if ((1U << 31) & bitset) {
+      regs[count++] = reg;
+    }
+    bitset <<= 1;
+  }
+
+  for (int i = count - 1; i >= 0; i--) {
+    vl1r_v(as_VectorRegister(regs[i]), stack);
+    add(stack, stack, vector_size_in_bytes);
+  }
+
+  return count * vector_size_in_bytes / wordSize;
+}
+#endif // COMPILER2
+
+void MacroAssembler::push_call_clobbered_registers_except(RegSet exclude) {
+  CompressibleRegion cr(this);
+  // Push integer registers x7, x10-x17, x28-x31.
+  push_reg(RegSet::of(x7) + RegSet::range(x10, x17) + RegSet::range(x28, x31) - exclude, sp);
+
+  // Push float registers f0-f7, f10-f17, f28-f31.
+  addi(sp, sp, - wordSize * 20);
+  int offset = 0;
+  for (int i = 0; i < 32; i++) {
+    if (i <= f7->encoding() || i >= f28->encoding() || (i >= f10->encoding() && i <= f17->encoding())) {
+      fsd(as_FloatRegister(i), Address(sp, wordSize * (offset ++)));
+    }
+  }
+}
+
+void MacroAssembler::pop_call_clobbered_registers_except(RegSet exclude) {
+  CompressibleRegion cr(this);
+  int offset = 0;
+  for (int i = 0; i < 32; i++) {
+    if (i <= f7->encoding() || i >= f28->encoding() || (i >= f10->encoding() && i <= f17->encoding())) {
+      fld(as_FloatRegister(i), Address(sp, wordSize * (offset ++)));
+    }
+  }
+  addi(sp, sp, wordSize * 20);
+
+  pop_reg(RegSet::of(x7) + RegSet::range(x10, x17) + RegSet::range(x28, x31) - exclude, sp);
+}
+
+// Push all the integer registers, except zr(x0) & sp(x2) & gp(x3) & tp(x4).
+void MacroAssembler::pusha() {
+  CompressibleRegion cr(this);
+  push_reg(0xffffffe2, sp);
+}
+
+// Pop all the integer registers, except zr(x0) & sp(x2) & gp(x3) & tp(x4).
+void MacroAssembler::popa() {
+  CompressibleRegion cr(this);
+  pop_reg(0xffffffe2, sp);
+}
+
+void MacroAssembler::push_CPU_state(bool save_vectors, int vector_size_in_bytes) {
+  CompressibleRegion cr(this);
+  // integer registers, except zr(x0) & ra(x1) & sp(x2) & gp(x3) & tp(x4)
+  push_reg(0xffffffe0, sp);
+
+  // float registers
+  addi(sp, sp, - 32 * wordSize);
+  for (int i = 0; i < 32; i++) {
+    fsd(as_FloatRegister(i), Address(sp, i * wordSize));
+  }
+
+  // vector registers
+  if (save_vectors) {
+    sub(sp, sp, vector_size_in_bytes * VectorRegisterImpl::number_of_registers);
+    vsetvli(t0, x0, Assembler::e64, Assembler::m8);
+    for (int i = 0; i < VectorRegisterImpl::number_of_registers; i += 8) {
+      add(t0, sp, vector_size_in_bytes * i);
+      vse64_v(as_VectorRegister(i), t0);
+    }
+  }
+}
+
+void MacroAssembler::pop_CPU_state(bool restore_vectors, int vector_size_in_bytes) {
+  CompressibleRegion cr(this);
+  // vector registers
+  if (restore_vectors) {
+    vsetvli(t0, x0, Assembler::e64, Assembler::m8);
+    for (int i = 0; i < VectorRegisterImpl::number_of_registers; i += 8) {
+      vle64_v(as_VectorRegister(i), sp);
+      add(sp, sp, vector_size_in_bytes * 8);
+    }
+  }
+
+  // float registers
+  for (int i = 0; i < 32; i++) {
+    fld(as_FloatRegister(i), Address(sp, i * wordSize));
+  }
+  addi(sp, sp, 32 * wordSize);
+
+  // integer registers, except zr(x0) & ra(x1) & sp(x2) & gp(x3) & tp(x4)
+  pop_reg(0xffffffe0, sp);
+}
+
+static int patch_offset_in_jal(address branch, int64_t offset) {
+  assert(is_imm_in_range(offset, 20, 1), "offset is too large to be patched in one jal insrusction!\n");
+  Assembler::patch(branch, 31, 31, (offset >> 20) & 0x1);                       // offset[20]    ==> branch[31]
+  Assembler::patch(branch, 30, 21, (offset >> 1)  & 0x3ff);                     // offset[10:1]  ==> branch[30:21]
+  Assembler::patch(branch, 20, 20, (offset >> 11) & 0x1);                       // offset[11]    ==> branch[20]
+  Assembler::patch(branch, 19, 12, (offset >> 12) & 0xff);                      // offset[19:12] ==> branch[19:12]
+  return NativeInstruction::instruction_size;                                   // only one instruction
+}
+
+static int patch_offset_in_conditional_branch(address branch, int64_t offset) {
+  assert(is_imm_in_range(offset, 12, 1), "offset is too large to be patched in one beq/bge/bgeu/blt/bltu/bne insrusction!\n");
+  Assembler::patch(branch, 31, 31, (offset >> 12) & 0x1);                       // offset[12]    ==> branch[31]
+  Assembler::patch(branch, 30, 25, (offset >> 5)  & 0x3f);                      // offset[10:5]  ==> branch[30:25]
+  Assembler::patch(branch, 7,  7,  (offset >> 11) & 0x1);                       // offset[11]    ==> branch[7]
+  Assembler::patch(branch, 11, 8,  (offset >> 1)  & 0xf);                       // offset[4:1]   ==> branch[11:8]
+  return NativeInstruction::instruction_size;                                   // only one instruction
+}
+
+static int patch_offset_in_pc_relative(address branch, int64_t offset) {
+  const int PC_RELATIVE_INSTRUCTION_NUM = 2;                                    // auipc, addi/jalr/load
+  Assembler::patch(branch, 31, 12, ((offset + 0x800) >> 12) & 0xfffff);         // Auipc.          offset[31:12]  ==> branch[31:12]
+  Assembler::patch(branch + 4, 31, 20, offset & 0xfff);                         // Addi/Jalr/Load. offset[11:0]   ==> branch[31:20]
+  return PC_RELATIVE_INSTRUCTION_NUM * NativeInstruction::instruction_size;
+}
+
+static int patch_addr_in_movptr(address branch, address target) {
+  const int MOVPTR_INSTRUCTIONS_NUM = 6;                                        // lui + addi + slli + addi + slli + addi/jalr/load
+  int32_t lower = ((intptr_t)target << 36) >> 36;
+  int64_t upper = ((intptr_t)target - lower) >> 28;
+  Assembler::patch(branch + 0,  31, 12, upper & 0xfffff);                       // Lui.             target[47:28] + target[27] ==> branch[31:12]
+  Assembler::patch(branch + 4,  31, 20, (lower >> 16) & 0xfff);                 // Addi.            target[27:16] ==> branch[31:20]
+  Assembler::patch(branch + 12, 31, 20, (lower >> 5) & 0x7ff);                  // Addi.            target[15: 5] ==> branch[31:20]
+  Assembler::patch(branch + 20, 31, 20, lower & 0x1f);                          // Addi/Jalr/Load.  target[ 4: 0] ==> branch[31:20]
+  return MOVPTR_INSTRUCTIONS_NUM * NativeInstruction::instruction_size;
+}
+
+static int patch_imm_in_li64(address branch, address target) {
+  const int LI64_INSTRUCTIONS_NUM = 8;                                          // lui + addi + slli + addi + slli + addi + slli + addi
+  int64_t lower = (intptr_t)target & 0xffffffff;
+  lower = lower - ((lower << 44) >> 44);
+  int64_t tmp_imm = ((uint64_t)((intptr_t)target & 0xffffffff00000000)) + (uint64_t)lower;
+  int32_t upper =  (tmp_imm - (int32_t)lower) >> 32;
+  int64_t tmp_upper = upper, tmp_lower = upper;
+  tmp_lower = (tmp_lower << 52) >> 52;
+  tmp_upper -= tmp_lower;
+  tmp_upper >>= 12;
+  // Load upper 32 bits. Upper = target[63:32], but if target[31] = 1 or (target[31:28] == 0x7ff && target[19] == 1),
+  // upper = target[63:32] + 1.
+  Assembler::patch(branch + 0,  31, 12, tmp_upper & 0xfffff);                       // Lui.
+  Assembler::patch(branch + 4,  31, 20, tmp_lower & 0xfff);                         // Addi.
+  // Load the rest 32 bits.
+  Assembler::patch(branch + 12, 31, 20, ((int32_t)lower >> 20) & 0xfff);            // Addi.
+  Assembler::patch(branch + 20, 31, 20, (((intptr_t)target << 44) >> 52) & 0xfff);  // Addi.
+  Assembler::patch(branch + 28, 31, 20, (intptr_t)target & 0xff);                   // Addi.
+  return LI64_INSTRUCTIONS_NUM * NativeInstruction::instruction_size;
+}
+
+static int patch_imm_in_li32(address branch, int32_t target) {
+  const int LI32_INSTRUCTIONS_NUM = 2;                                          // lui + addiw
+  int64_t upper = (intptr_t)target;
+  int32_t lower = (((int32_t)target) << 20) >> 20;
+  upper -= lower;
+  upper = (int32_t)upper;
+  Assembler::patch(branch + 0,  31, 12, (upper >> 12) & 0xfffff);               // Lui.
+  Assembler::patch(branch + 4,  31, 20, lower & 0xfff);                         // Addiw.
+  return LI32_INSTRUCTIONS_NUM * NativeInstruction::instruction_size;
+}
+
+static long get_offset_of_jal(address insn_addr) {
+  assert_cond(insn_addr != NULL);
+  long offset = 0;
+  unsigned insn = *(unsigned*)insn_addr;
+  long val = (long)Assembler::sextract(insn, 31, 12);
+  offset |= ((val >> 19) & 0x1) << 20;
+  offset |= (val & 0xff) << 12;
+  offset |= ((val >> 8) & 0x1) << 11;
+  offset |= ((val >> 9) & 0x3ff) << 1;
+  offset = (offset << 43) >> 43;
+  return offset;
+}
+
+static long get_offset_of_conditional_branch(address insn_addr) {
+  long offset = 0;
+  assert_cond(insn_addr != NULL);
+  unsigned insn = *(unsigned*)insn_addr;
+  offset = (long)Assembler::sextract(insn, 31, 31);
+  offset = (offset << 12) | (((long)(Assembler::sextract(insn, 7, 7) & 0x1)) << 11);
+  offset = offset | (((long)(Assembler::sextract(insn, 30, 25) & 0x3f)) << 5);
+  offset = offset | (((long)(Assembler::sextract(insn, 11, 8) & 0xf)) << 1);
+  offset = (offset << 41) >> 41;
+  return offset;
+}
+
+static long get_offset_of_pc_relative(address insn_addr) {
+  long offset = 0;
+  assert_cond(insn_addr != NULL);
+  offset = ((long)(Assembler::sextract(((unsigned*)insn_addr)[0], 31, 12))) << 12;                                  // Auipc.
+  offset += ((long)Assembler::sextract(((unsigned*)insn_addr)[1], 31, 20));                                         // Addi/Jalr/Load.
+  offset = (offset << 32) >> 32;
+  return offset;
+}
+
+static address get_target_of_movptr(address insn_addr) {
+  assert_cond(insn_addr != NULL);
+  intptr_t target_address = (((int64_t)Assembler::sextract(((unsigned*)insn_addr)[0], 31, 12)) & 0xfffff) << 28;    // Lui.
+  target_address += ((int64_t)Assembler::sextract(((unsigned*)insn_addr)[1], 31, 20)) << 16;                        // Addi.
+  target_address += ((int64_t)Assembler::sextract(((unsigned*)insn_addr)[3], 31, 20)) << 5;                         // Addi.
+  target_address += ((int64_t)Assembler::sextract(((unsigned*)insn_addr)[5], 31, 20));                              // Addi/Jalr/Load.
+  return (address) target_address;
+}
+
+static address get_target_of_li64(address insn_addr) {
+  assert_cond(insn_addr != NULL);
+  intptr_t target_address = (((int64_t)Assembler::sextract(((unsigned*)insn_addr)[0], 31, 12)) & 0xfffff) << 44;    // Lui.
+  target_address += ((int64_t)Assembler::sextract(((unsigned*)insn_addr)[1], 31, 20)) << 32;                        // Addi.
+  target_address += ((int64_t)Assembler::sextract(((unsigned*)insn_addr)[3], 31, 20)) << 20;                        // Addi.
+  target_address += ((int64_t)Assembler::sextract(((unsigned*)insn_addr)[5], 31, 20)) << 8;                         // Addi.
+  target_address += ((int64_t)Assembler::sextract(((unsigned*)insn_addr)[7], 31, 20));                              // Addi.
+  return (address)target_address;
+}
+
+static address get_target_of_li32(address insn_addr) {
+  assert_cond(insn_addr != NULL);
+  intptr_t target_address = (((int64_t)Assembler::sextract(((unsigned*)insn_addr)[0], 31, 12)) & 0xfffff) << 12;    // Lui.
+  target_address += ((int64_t)Assembler::sextract(((unsigned*)insn_addr)[1], 31, 20));                              // Addiw.
+  return (address)target_address;
+}
+
+// Patch any kind of instruction; there may be several instructions.
+// Return the total length (in bytes) of the instructions.
+int MacroAssembler::pd_patch_instruction_size(address branch, address target) {
+  assert_cond(branch != NULL);
+  int64_t offset = target - branch;
+  if (NativeInstruction::is_jal_at(branch)) {                         // jal
+    return patch_offset_in_jal(branch, offset);
+  } else if (NativeInstruction::is_branch_at(branch)) {               // beq/bge/bgeu/blt/bltu/bne
+    return patch_offset_in_conditional_branch(branch, offset);
+  } else if (NativeInstruction::is_pc_relative_at(branch)) {          // auipc, addi/jalr/load
+    return patch_offset_in_pc_relative(branch, offset);
+  } else if (NativeInstruction::is_movptr_at(branch)) {               // movptr
+    return patch_addr_in_movptr(branch, target);
+  } else if (NativeInstruction::is_li64_at(branch)) {                 // li64
+    return patch_imm_in_li64(branch, target);
+  } else if (NativeInstruction::is_li32_at(branch)) {                 // li32
+    int64_t imm = (intptr_t)target;
+    return patch_imm_in_li32(branch, (int32_t)imm);
+  } else {
+#ifdef ASSERT
+    tty->print_cr("pd_patch_instruction_size: instruction 0x%x at " INTPTR_FORMAT " could not be patched!\n",
+                  *(unsigned*)branch, p2i(branch));
+    Disassembler::decode(branch - 16, branch + 16);
+#endif
+    ShouldNotReachHere();
+    return -1;
+  }
+}
+
+address MacroAssembler::target_addr_for_insn(address insn_addr) {
+  long offset = 0;
+  assert_cond(insn_addr != NULL);
+  if (NativeInstruction::is_jal_at(insn_addr)) {                     // jal
+    offset = get_offset_of_jal(insn_addr);
+  } else if (NativeInstruction::is_branch_at(insn_addr)) {           // beq/bge/bgeu/blt/bltu/bne
+    offset = get_offset_of_conditional_branch(insn_addr);
+  } else if (NativeInstruction::is_pc_relative_at(insn_addr)) {      // auipc, addi/jalr/load
+    offset = get_offset_of_pc_relative(insn_addr);
+  } else if (NativeInstruction::is_movptr_at(insn_addr)) {           // movptr
+    return get_target_of_movptr(insn_addr);
+  } else if (NativeInstruction::is_li64_at(insn_addr)) {             // li64
+    return get_target_of_li64(insn_addr);
+  } else if (NativeInstruction::is_li32_at(insn_addr)) {             // li32
+    return get_target_of_li32(insn_addr);
+  } else {
+    ShouldNotReachHere();
+  }
+  return address(((uintptr_t)insn_addr + offset));
+}
+
+int MacroAssembler::patch_oop(address insn_addr, address o) {
+  // OOPs are either narrow (32 bits) or wide (48 bits).  We encode
+  // narrow OOPs by setting the upper 16 bits in the first
+  // instruction.
+  if (NativeInstruction::is_li32_at(insn_addr)) {
+    // Move narrow OOP
+    uint32_t n = CompressedOops::narrow_oop_value(cast_to_oop(o));
+    return patch_imm_in_li32(insn_addr, (int32_t)n);
+  } else if (NativeInstruction::is_movptr_at(insn_addr)) {
+    // Move wide OOP
+    return patch_addr_in_movptr(insn_addr, o);
+  }
+  ShouldNotReachHere();
+  return -1;
+}
+
+void MacroAssembler::reinit_heapbase() {
+  if (UseCompressedOops) {
+    if (Universe::is_fully_initialized()) {
+      mv(xheapbase, CompressedOops::ptrs_base());
+    } else {
+      int32_t offset = 0;
+      la_patchable(xheapbase, ExternalAddress((address)CompressedOops::ptrs_base_addr()), offset);
+      ld(xheapbase, Address(xheapbase, offset));
+    }
+  }
+}
+
+void MacroAssembler::mv(Register Rd, Address dest) {
+  assert(dest.getMode() == Address::literal, "Address mode should be Address::literal");
+  code_section()->relocate(pc(), dest.rspec());
+  movptr(Rd, dest.target());
+}
+
+void MacroAssembler::mv(Register Rd, address addr) {
+  // Here in case of use with relocation, use fix length instruciton
+  // movptr instead of li
+  movptr(Rd, addr);
+}
+
+void MacroAssembler::mv(Register Rd, RegisterOrConstant src) {
+  if (src.is_register()) {
+    mv(Rd, src.as_register());
+  } else {
+    mv(Rd, src.as_constant());
+  }
+}
+
+void MacroAssembler::andrw(Register Rd, Register Rs1, Register Rs2) {
+  andr(Rd, Rs1, Rs2);
+  // addw: The result is clipped to 32 bits, then the sign bit is extended,
+  // and the result is stored in Rd
+  addw(Rd, Rd, zr);
+}
+
+void MacroAssembler::orrw(Register Rd, Register Rs1, Register Rs2) {
+  orr(Rd, Rs1, Rs2);
+  // addw: The result is clipped to 32 bits, then the sign bit is extended,
+  // and the result is stored in Rd
+  addw(Rd, Rd, zr);
+}
+
+void MacroAssembler::xorrw(Register Rd, Register Rs1, Register Rs2) {
+  xorr(Rd, Rs1, Rs2);
+  // addw: The result is clipped to 32 bits, then the sign bit is extended,
+  // and the result is stored in Rd
+  addw(Rd, Rd, zr);
+}
+
+// Note: load_unsigned_short used to be called load_unsigned_word.
+int MacroAssembler::load_unsigned_short(Register dst, Address src) {
+  int off = offset();
+  lhu(dst, src);
+  return off;
+}
+
+int MacroAssembler::load_unsigned_byte(Register dst, Address src) {
+  int off = offset();
+  lbu(dst, src);
+  return off;
+}
+
+int MacroAssembler::load_signed_short(Register dst, Address src) {
+  int off = offset();
+  lh(dst, src);
+  return off;
+}
+
+int MacroAssembler::load_signed_byte(Register dst, Address src) {
+  int off = offset();
+  lb(dst, src);
+  return off;
+}
+
+void MacroAssembler::load_sized_value(Register dst, Address src, size_t size_in_bytes, bool is_signed, Register dst2) {
+  switch (size_in_bytes) {
+    case  8:  ld(dst, src); break;
+    case  4:  is_signed ? lw(dst, src) : lwu(dst, src); break;
+    case  2:  is_signed ? load_signed_short(dst, src) : load_unsigned_short(dst, src); break;
+    case  1:  is_signed ? load_signed_byte( dst, src) : load_unsigned_byte( dst, src); break;
+    default:  ShouldNotReachHere();
+  }
+}
+
+void MacroAssembler::store_sized_value(Address dst, Register src, size_t size_in_bytes, Register src2) {
+  switch (size_in_bytes) {
+    case  8:  sd(src, dst); break;
+    case  4:  sw(src, dst); break;
+    case  2:  sh(src, dst); break;
+    case  1:  sb(src, dst); break;
+    default:  ShouldNotReachHere();
+  }
+}
+
+// reverse bytes in halfword in lower 16 bits and sign-extend
+// Rd[15:0] = Rs[7:0] Rs[15:8] (sign-extend to 64 bits)
+void MacroAssembler::revb_h_h(Register Rd, Register Rs, Register tmp) {
+  if (UseRVB) {
+    rev8(Rd, Rs);
+    srai(Rd, Rd, 48);
+    return;
+  }
+  assert_different_registers(Rs, tmp);
+  assert_different_registers(Rd, tmp);
+  srli(tmp, Rs, 8);
+  andi(tmp, tmp, 0xFF);
+  slli(Rd, Rs, 56);
+  srai(Rd, Rd, 48); // sign-extend
+  orr(Rd, Rd, tmp);
+}
+
+// reverse bytes in lower word and sign-extend
+// Rd[31:0] = Rs[7:0] Rs[15:8] Rs[23:16] Rs[31:24] (sign-extend to 64 bits)
+void MacroAssembler::revb_w_w(Register Rd, Register Rs, Register tmp1, Register tmp2) {
+  if (UseRVB) {
+    rev8(Rd, Rs);
+    srai(Rd, Rd, 32);
+    return;
+  }
+  assert_different_registers(Rs, tmp1, tmp2);
+  assert_different_registers(Rd, tmp1, tmp2);
+  revb_h_w_u(Rd, Rs, tmp1, tmp2);
+  slli(tmp2, Rd, 48);
+  srai(tmp2, tmp2, 32); // sign-extend
+  srli(Rd, Rd, 16);
+  orr(Rd, Rd, tmp2);
+}
+
+// reverse bytes in halfword in lower 16 bits and zero-extend
+// Rd[15:0] = Rs[7:0] Rs[15:8] (zero-extend to 64 bits)
+void MacroAssembler::revb_h_h_u(Register Rd, Register Rs, Register tmp) {
+  if (UseRVB) {
+    rev8(Rd, Rs);
+    srli(Rd, Rd, 48);
+    return;
+  }
+  assert_different_registers(Rs, tmp);
+  assert_different_registers(Rd, tmp);
+  srli(tmp, Rs, 8);
+  andi(tmp, tmp, 0xFF);
+  andi(Rd, Rs, 0xFF);
+  slli(Rd, Rd, 8);
+  orr(Rd, Rd, tmp);
+}
+
+// reverse bytes in halfwords in lower 32 bits and zero-extend
+// Rd[31:0] = Rs[23:16] Rs[31:24] Rs[7:0] Rs[15:8] (zero-extend to 64 bits)
+void MacroAssembler::revb_h_w_u(Register Rd, Register Rs, Register tmp1, Register tmp2) {
+  if (UseRVB) {
+    rev8(Rd, Rs);
+    rori(Rd, Rd, 32);
+    roriw(Rd, Rd, 16);
+    zext_w(Rd, Rd);
+    return;
+  }
+  assert_different_registers(Rs, tmp1, tmp2);
+  assert_different_registers(Rd, tmp1, tmp2);
+  srli(tmp2, Rs, 16);
+  revb_h_h_u(tmp2, tmp2, tmp1);
+  revb_h_h_u(Rd, Rs, tmp1);
+  slli(tmp2, tmp2, 16);
+  orr(Rd, Rd, tmp2);
+}
+
+// This method is only used for revb_h
+// Rd = Rs[47:0] Rs[55:48] Rs[63:56]
+void MacroAssembler::revb_h_helper(Register Rd, Register Rs, Register tmp1, Register tmp2) {
+  assert_different_registers(Rs, tmp1, tmp2);
+  assert_different_registers(Rd, tmp1);
+  srli(tmp1, Rs, 48);
+  andi(tmp2, tmp1, 0xFF);
+  slli(tmp2, tmp2, 8);
+  srli(tmp1, tmp1, 8);
+  orr(tmp1, tmp1, tmp2);
+  slli(Rd, Rs, 16);
+  orr(Rd, Rd, tmp1);
+}
+
+// reverse bytes in each halfword
+// Rd[63:0] = Rs[55:48] Rs[63:56] Rs[39:32] Rs[47:40] Rs[23:16] Rs[31:24] Rs[7:0] Rs[15:8]
+void MacroAssembler::revb_h(Register Rd, Register Rs, Register tmp1, Register tmp2) {
+  if (UseRVB) {
+    assert_different_registers(Rs, tmp1);
+    assert_different_registers(Rd, tmp1);
+    rev8(Rd, Rs);
+    zext_w(tmp1, Rd);
+    roriw(tmp1, tmp1, 16);
+    slli(tmp1, tmp1, 32);
+    srli(Rd, Rd, 32);
+    roriw(Rd, Rd, 16);
+    zext_w(Rd, Rd);
+    orr(Rd, Rd, tmp1);
+    return;
+  }
+  assert_different_registers(Rs, tmp1, tmp2);
+  assert_different_registers(Rd, tmp1, tmp2);
+  revb_h_helper(Rd, Rs, tmp1, tmp2);
+  for (int i = 0; i < 3; ++i) {
+    revb_h_helper(Rd, Rd, tmp1, tmp2);
+  }
+}
+
+// reverse bytes in each word
+// Rd[63:0] = Rs[39:32] Rs[47:40] Rs[55:48] Rs[63:56] Rs[7:0] Rs[15:8] Rs[23:16] Rs[31:24]
+void MacroAssembler::revb_w(Register Rd, Register Rs, Register tmp1, Register tmp2) {
+  if (UseRVB) {
+    rev8(Rd, Rs);
+    rori(Rd, Rd, 32);
+    return;
+  }
+  assert_different_registers(Rs, tmp1, tmp2);
+  assert_different_registers(Rd, tmp1, tmp2);
+  revb(Rd, Rs, tmp1, tmp2);
+  ror_imm(Rd, Rd, 32);
+}
+
+// reverse bytes in doubleword
+// Rd[63:0] = Rs[7:0] Rs[15:8] Rs[23:16] Rs[31:24] Rs[39:32] Rs[47,40] Rs[55,48] Rs[63:56]
+void MacroAssembler::revb(Register Rd, Register Rs, Register tmp1, Register tmp2) {
+  if (UseRVB) {
+    rev8(Rd, Rs);
+    return;
+  }
+  assert_different_registers(Rs, tmp1, tmp2);
+  assert_different_registers(Rd, tmp1, tmp2);
+  andi(tmp1, Rs, 0xFF);
+  slli(tmp1, tmp1, 8);
+  for (int step = 8; step < 56; step += 8) {
+    srli(tmp2, Rs, step);
+    andi(tmp2, tmp2, 0xFF);
+    orr(tmp1, tmp1, tmp2);
+    slli(tmp1, tmp1, 8);
+  }
+  srli(Rd, Rs, 56);
+  andi(Rd, Rd, 0xFF);
+  orr(Rd, tmp1, Rd);
+}
+
+// rotate right with shift bits
+void MacroAssembler::ror_imm(Register dst, Register src, uint32_t shift, Register tmp)
+{
+  if (UseRVB) {
+    rori(dst, src, shift);
+    return;
+  }
+
+  assert_different_registers(dst, tmp);
+  assert_different_registers(src, tmp);
+  assert(shift < 64, "shift amount must be < 64");
+  slli(tmp, src, 64 - shift);
+  srli(dst, src, shift);
+  orr(dst, dst, tmp);
+}
+
+void MacroAssembler::andi(Register Rd, Register Rn, int64_t imm, Register tmp) {
+  if (is_imm_in_range(imm, 12, 0)) {
+    and_imm12(Rd, Rn, imm);
+  } else {
+    assert_different_registers(Rn, tmp);
+    li(tmp, imm);
+    andr(Rd, Rn, tmp);
+  }
+}
+
+void MacroAssembler::orptr(Address adr, RegisterOrConstant src, Register tmp1, Register tmp2) {
+  ld(tmp1, adr);
+  if (src.is_register()) {
+    orr(tmp1, tmp1, src.as_register());
+  } else {
+    if (is_imm_in_range(src.as_constant(), 12, 0)) {
+      ori(tmp1, tmp1, src.as_constant());
+    } else {
+      assert_different_registers(tmp1, tmp2);
+      li(tmp2, src.as_constant());
+      orr(tmp1, tmp1, tmp2);
+    }
+  }
+  sd(tmp1, adr);
+}
+
+void MacroAssembler::cmp_klass(Register oop, Register trial_klass, Register tmp, Label &L) {
+  if (UseCompressedClassPointers) {
+      lwu(tmp, Address(oop, oopDesc::klass_offset_in_bytes()));
+    if (CompressedKlassPointers::base() == NULL) {
+      slli(tmp, tmp, CompressedKlassPointers::shift());
+      beq(trial_klass, tmp, L);
+      return;
+    }
+    decode_klass_not_null(tmp);
+  } else {
+    ld(tmp, Address(oop, oopDesc::klass_offset_in_bytes()));
+  }
+  beq(trial_klass, tmp, L);
+}
+
+// Move an oop into a register. immediate is true if we want
+// immediate instructions and nmethod entry barriers are not enabled.
+// i.e. we are not going to patch this instruction while the code is being
+// executed by another thread.
+void MacroAssembler::movoop(Register dst, jobject obj, bool immediate) {
+  int oop_index;
+  if (obj == NULL) {
+    oop_index = oop_recorder()->allocate_oop_index(obj);
+  } else {
+#ifdef ASSERT
+    {
+      ThreadInVMfromUnknown tiv;
+      assert(Universe::heap()->is_in(JNIHandles::resolve(obj)), "should be real oop");
+    }
+#endif
+    oop_index = oop_recorder()->find_index(obj);
+  }
+  RelocationHolder rspec = oop_Relocation::spec(oop_index);
+
+  // nmethod entry barrier necessitate using the constant pool. They have to be
+  // ordered with respected to oop access.
+  // Using immediate literals would necessitate fence.i.
+  if (BarrierSet::barrier_set()->barrier_set_nmethod() != NULL || !immediate) {
+    address dummy = address(uintptr_t(pc()) & -wordSize); // A nearby aligned address
+    ld_constant(dst, Address(dummy, rspec));
+  } else
+    mv(dst, Address((address)obj, rspec));
+}
+
+// Move a metadata address into a register.
+void MacroAssembler::mov_metadata(Register dst, Metadata* obj) {
+  int oop_index;
+  if (obj == NULL) {
+    oop_index = oop_recorder()->allocate_metadata_index(obj);
+  } else {
+    oop_index = oop_recorder()->find_index(obj);
+  }
+  RelocationHolder rspec = metadata_Relocation::spec(oop_index);
+  mv(dst, Address((address)obj, rspec));
+}
+
+// Writes to stack successive pages until offset reached to check for
+// stack overflow + shadow pages.  This clobbers tmp.
+void MacroAssembler::bang_stack_size(Register size, Register tmp) {
+  assert_different_registers(tmp, size, t0);
+  // Bang stack for total size given plus shadow page size.
+  // Bang one page at a time because large size can bang beyond yellow and
+  // red zones.
+  mv(t0, os::vm_page_size());
+  Label loop;
+  bind(loop);
+  sub(tmp, sp, t0);
+  subw(size, size, t0);
+  sd(size, Address(tmp));
+  bgtz(size, loop);
+
+  // Bang down shadow pages too.
+  // At this point, (tmp-0) is the last address touched, so don't
+  // touch it again.  (It was touched as (tmp-pagesize) but then tmp
+  // was post-decremented.)  Skip this address by starting at i=1, and
+  // touch a few more pages below.  N.B.  It is important to touch all
+  // the way down to and including i=StackShadowPages.
+  for (int i = 0; i < (int)(StackOverflow::stack_shadow_zone_size() / os::vm_page_size()) - 1; i++) {
+    // this could be any sized move but this is can be a debugging crumb
+    // so the bigger the better.
+    sub(tmp, tmp, os::vm_page_size());
+    sd(size, Address(tmp, 0));
+  }
+}
+
+SkipIfEqual::SkipIfEqual(MacroAssembler* masm, const bool* flag_addr, bool value) {
+  assert_cond(masm != NULL);
+  int32_t offset = 0;
+  _masm = masm;
+  _masm->la_patchable(t0, ExternalAddress((address)flag_addr), offset);
+  _masm->lbu(t0, Address(t0, offset));
+  _masm->beqz(t0, _label);
+}
+
+SkipIfEqual::~SkipIfEqual() {
+  assert_cond(_masm != NULL);
+  _masm->bind(_label);
+  _masm = NULL;
+}
+
+void MacroAssembler::load_mirror(Register dst, Register method, Register tmp) {
+  const int mirror_offset = in_bytes(Klass::java_mirror_offset());
+  ld(dst, Address(xmethod, Method::const_offset()));
+  ld(dst, Address(dst, ConstMethod::constants_offset()));
+  ld(dst, Address(dst, ConstantPool::pool_holder_offset_in_bytes()));
+  ld(dst, Address(dst, mirror_offset));
+  resolve_oop_handle(dst, tmp);
+}
+
+void MacroAssembler::resolve_oop_handle(Register result, Register tmp) {
+  // OopHandle::resolve is an indirection.
+  assert_different_registers(result, tmp);
+  access_load_at(T_OBJECT, IN_NATIVE, result, Address(result, 0), tmp, noreg);
+}
+
+// ((WeakHandle)result).resolve()
+void MacroAssembler::resolve_weak_handle(Register result, Register tmp) {
+  assert_different_registers(result, tmp);
+  Label resolved;
+
+  // A null weak handle resolves to null.
+  beqz(result, resolved);
+
+  // Only 64 bit platforms support GCs that require a tmp register
+  // Only IN_HEAP loads require a thread_tmp register
+  // WeakHandle::resolve is an indirection like jweak.
+  access_load_at(T_OBJECT, IN_NATIVE | ON_PHANTOM_OOP_REF,
+                 result, Address(result), tmp, noreg /* tmp_thread */);
+  bind(resolved);
+}
+
+void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,
+                                    Register dst, Address src,
+                                    Register tmp1, Register thread_tmp) {
+  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
+  bool as_raw = (decorators & AS_RAW) != 0;
+  if (as_raw) {
+    bs->BarrierSetAssembler::load_at(this, decorators, type, dst, src, tmp1, thread_tmp);
+  } else {
+    bs->load_at(this, decorators, type, dst, src, tmp1, thread_tmp);
+  }
+}
+
+void MacroAssembler::null_check(Register reg, int offset) {
+  if (needs_explicit_null_check(offset)) {
+    // provoke OS NULL exception if reg = NULL by
+    // accessing M[reg] w/o changing any registers
+    // NOTE: this is plenty to provoke a segv
+    ld(zr, Address(reg, 0));
+  } else {
+    // nothing to do, (later) access of M[reg + offset]
+    // will provoke OS NULL exception if reg = NULL
+  }
+}
+
+void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
+                                     Address dst, Register src,
+                                     Register tmp1, Register thread_tmp) {
+  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  decorators = AccessInternal::decorator_fixup(decorators);
+  bool as_raw = (decorators & AS_RAW) != 0;
+  if (as_raw) {
+    bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, thread_tmp);
+  } else {
+    bs->store_at(this, decorators, type, dst, src, tmp1, thread_tmp);
+  }
+}
+
+// Algorithm must match CompressedOops::encode.
+void MacroAssembler::encode_heap_oop(Register d, Register s) {
+  verify_oop(s, "broken oop in encode_heap_oop");
+  if (CompressedOops::base() == NULL) {
+    if (CompressedOops::shift() != 0) {
+      assert (LogMinObjAlignmentInBytes == CompressedOops::shift(), "decode alg wrong");
+      srli(d, s, LogMinObjAlignmentInBytes);
+    } else {
+      mv(d, s);
+    }
+  } else {
+    Label notNull;
+    sub(d, s, xheapbase);
+    bgez(d, notNull);
+    mv(d, zr);
+    bind(notNull);
+    if (CompressedOops::shift() != 0) {
+      assert (LogMinObjAlignmentInBytes == CompressedOops::shift(), "decode alg wrong");
+      srli(d, d, CompressedOops::shift());
+    }
+  }
+}
+
+void MacroAssembler::load_klass(Register dst, Register src) {
+  if (UseCompressedClassPointers) {
+    lwu(dst, Address(src, oopDesc::klass_offset_in_bytes()));
+    decode_klass_not_null(dst);
+  } else {
+    ld(dst, Address(src, oopDesc::klass_offset_in_bytes()));
+  }
+}
+
+void MacroAssembler::store_klass(Register dst, Register src) {
+  // FIXME: Should this be a store release? concurrent gcs assumes
+  // klass length is valid if klass field is not null.
+  if (UseCompressedClassPointers) {
+    encode_klass_not_null(src);
+    sw(src, Address(dst, oopDesc::klass_offset_in_bytes()));
+  } else {
+    sd(src, Address(dst, oopDesc::klass_offset_in_bytes()));
+  }
+}
+
+void MacroAssembler::store_klass_gap(Register dst, Register src) {
+  if (UseCompressedClassPointers) {
+    // Store to klass gap in destination
+    sw(src, Address(dst, oopDesc::klass_gap_offset_in_bytes()));
+  }
+}
+
+void  MacroAssembler::decode_klass_not_null(Register r) {
+  decode_klass_not_null(r, r);
+}
+
+void MacroAssembler::decode_klass_not_null(Register dst, Register src, Register tmp) {
+  assert(UseCompressedClassPointers, "should only be used for compressed headers");
+
+  if (CompressedKlassPointers::base() == NULL) {
+    if (CompressedKlassPointers::shift() != 0) {
+      assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
+      slli(dst, src, LogKlassAlignmentInBytes);
+    } else {
+      mv(dst, src);
+    }
+    return;
+  }
+
+  Register xbase = dst;
+  if (dst == src) {
+    xbase = tmp;
+  }
+
+  assert_different_registers(src, xbase);
+  li(xbase, (uintptr_t)CompressedKlassPointers::base());
+
+  if (CompressedKlassPointers::shift() != 0) {
+    assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
+    assert_different_registers(t0, xbase);
+    shadd(dst, src, xbase, t0, LogKlassAlignmentInBytes);
+  } else {
+    add(dst, xbase, src);
+  }
+
+  if (xbase == xheapbase) { reinit_heapbase(); }
+}
+
+void MacroAssembler::encode_klass_not_null(Register r) {
+  encode_klass_not_null(r, r);
+}
+
+void MacroAssembler::encode_klass_not_null(Register dst, Register src, Register tmp) {
+  assert(UseCompressedClassPointers, "should only be used for compressed headers");
+
+  if (CompressedKlassPointers::base() == NULL) {
+    if (CompressedKlassPointers::shift() != 0) {
+      assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
+      srli(dst, src, LogKlassAlignmentInBytes);
+    } else {
+      mv(dst, src);
+    }
+    return;
+  }
+
+  if (((uint64_t)(uintptr_t)CompressedKlassPointers::base() & 0xffffffff) == 0 &&
+      CompressedKlassPointers::shift() == 0) {
+    zero_extend(dst, src, 32);
+    return;
+  }
+
+  Register xbase = dst;
+  if (dst == src) {
+    xbase = tmp;
+  }
+
+  assert_different_registers(src, xbase);
+  li(xbase, (intptr_t)CompressedKlassPointers::base());
+  sub(dst, src, xbase);
+  if (CompressedKlassPointers::shift() != 0) {
+    assert(LogKlassAlignmentInBytes == CompressedKlassPointers::shift(), "decode alg wrong");
+    srli(dst, dst, LogKlassAlignmentInBytes);
+  }
+  if (xbase == xheapbase) {
+    reinit_heapbase();
+  }
+}
+
+void  MacroAssembler::decode_heap_oop_not_null(Register r) {
+  decode_heap_oop_not_null(r, r);
+}
+
+void MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) {
+  assert(UseCompressedOops, "should only be used for compressed headers");
+  assert(Universe::heap() != NULL, "java heap should be initialized");
+  // Cannot assert, unverified entry point counts instructions (see .ad file)
+  // vtableStubs also counts instructions in pd_code_size_limit.
+  // Also do not verify_oop as this is called by verify_oop.
+  if (CompressedOops::shift() != 0) {
+    assert(LogMinObjAlignmentInBytes == CompressedOops::shift(), "decode alg wrong");
+    slli(dst, src, LogMinObjAlignmentInBytes);
+    if (CompressedOops::base() != NULL) {
+      add(dst, xheapbase, dst);
+    }
+  } else {
+    assert(CompressedOops::base() == NULL, "sanity");
+    mv(dst, src);
+  }
+}
+
+void  MacroAssembler::decode_heap_oop(Register d, Register s) {
+  if (CompressedOops::base() == NULL) {
+    if (CompressedOops::shift() != 0 || d != s) {
+      slli(d, s, CompressedOops::shift());
+    }
+  } else {
+    Label done;
+    mv(d, s);
+    beqz(s, done);
+    shadd(d, s, xheapbase, d, LogMinObjAlignmentInBytes);
+    bind(done);
+  }
+  verify_oop(d, "broken oop in decode_heap_oop");
+}
+
+void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,
+                                    Register thread_tmp, DecoratorSet decorators) {
+  access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, thread_tmp);
+}
+
+void MacroAssembler::load_heap_oop(Register dst, Address src, Register tmp1,
+                                   Register thread_tmp, DecoratorSet decorators) {
+  access_load_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, thread_tmp);
+}
+
+void MacroAssembler::load_heap_oop_not_null(Register dst, Address src, Register tmp1,
+                                            Register thread_tmp, DecoratorSet decorators) {
+  access_load_at(T_OBJECT, IN_HEAP | IS_NOT_NULL, dst, src, tmp1, thread_tmp);
+}
+
+// Used for storing NULLs.
+void MacroAssembler::store_heap_oop_null(Address dst) {
+  access_store_at(T_OBJECT, IN_HEAP, dst, noreg, noreg, noreg);
+}
+
+int MacroAssembler::corrected_idivl(Register result, Register rs1, Register rs2,
+                                    bool want_remainder)
+{
+  // Full implementation of Java idiv and irem.  The function
+  // returns the (pc) offset of the div instruction - may be needed
+  // for implicit exceptions.
+  //
+  // input : rs1: dividend
+  //         rs2: divisor
+  //
+  // result: either
+  //         quotient  (= rs1 idiv rs2)
+  //         remainder (= rs1 irem rs2)
+
+
+  int idivl_offset = offset();
+  if (!want_remainder) {
+    divw(result, rs1, rs2);
+  } else {
+    remw(result, rs1, rs2); // result = rs1 % rs2;
+  }
+  return idivl_offset;
+}
+
+int MacroAssembler::corrected_idivq(Register result, Register rs1, Register rs2,
+                                    bool want_remainder)
+{
+  // Full implementation of Java ldiv and lrem.  The function
+  // returns the (pc) offset of the div instruction - may be needed
+  // for implicit exceptions.
+  //
+  // input : rs1: dividend
+  //         rs2: divisor
+  //
+  // result: either
+  //         quotient  (= rs1 idiv rs2)
+  //         remainder (= rs1 irem rs2)
+
+  int idivq_offset = offset();
+  if (!want_remainder) {
+    div(result, rs1, rs2);
+  } else {
+    rem(result, rs1, rs2); // result = rs1 % rs2;
+  }
+  return idivq_offset;
+}
+
+// Look up the method for a megamorpic invkkeinterface call.
+// The target method is determined by <intf_klass, itable_index>.
+// The receiver klass is in recv_klass.
+// On success, the result will be in method_result, and execution falls through.
+// On failure, execution transfers to the given label.
+void MacroAssembler::lookup_interface_method(Register recv_klass,
+                                             Register intf_klass,
+                                             RegisterOrConstant itable_index,
+                                             Register method_result,
+                                             Register scan_tmp,
+                                             Label& L_no_such_interface,
+                                             bool return_method) {
+  assert_different_registers(recv_klass, intf_klass, scan_tmp);
+  assert_different_registers(method_result, intf_klass, scan_tmp);
+  assert(recv_klass != method_result || !return_method,
+         "recv_klass can be destroyed when mehtid isn't needed");
+  assert(itable_index.is_constant() || itable_index.as_register() == method_result,
+         "caller must be same register for non-constant itable index as for method");
+
+  // Compute start of first itableOffsetEntry (which is at the end of the vtable).
+  int vtable_base = in_bytes(Klass::vtable_start_offset());
+  int itentry_off = itableMethodEntry::method_offset_in_bytes();
+  int scan_step   = itableOffsetEntry::size() * wordSize;
+  int vte_size    = vtableEntry::size_in_bytes();
+  assert(vte_size == wordSize, "else adjust times_vte_scale");
+
+  lwu(scan_tmp, Address(recv_klass, Klass::vtable_length_offset()));
+
+  // %%% Could store the aligned, prescaled offset in the klassoop.
+  shadd(scan_tmp, scan_tmp, recv_klass, scan_tmp, 3);
+  add(scan_tmp, scan_tmp, vtable_base);
+
+  if (return_method) {
+    // Adjust recv_klass by scaled itable_index, so we can free itable_index.
+    assert(itableMethodEntry::size() * wordSize == wordSize, "adjust the scaling in the code below");
+    if (itable_index.is_register()) {
+      slli(t0, itable_index.as_register(), 3);
+    } else {
+      li(t0, itable_index.as_constant() << 3);
+    }
+    add(recv_klass, recv_klass, t0);
+    if (itentry_off) {
+      add(recv_klass, recv_klass, itentry_off);
+    }
+  }
+
+  Label search, found_method;
+
+  ld(method_result, Address(scan_tmp, itableOffsetEntry::interface_offset_in_bytes()));
+  beq(intf_klass, method_result, found_method);
+  bind(search);
+  // Check that the previous entry is non-null. A null entry means that
+  // the receiver class doens't implement the interface, and wasn't the
+  // same as when the caller was compiled.
+  beqz(method_result, L_no_such_interface, /* is_far */ true);
+  addi(scan_tmp, scan_tmp, scan_step);
+  ld(method_result, Address(scan_tmp, itableOffsetEntry::interface_offset_in_bytes()));
+  bne(intf_klass, method_result, search);
+
+  bind(found_method);
+
+  // Got a hit.
+  if (return_method) {
+    lwu(scan_tmp, Address(scan_tmp, itableOffsetEntry::offset_offset_in_bytes()));
+    add(method_result, recv_klass, scan_tmp);
+    ld(method_result, Address(method_result));
+  }
+}
+
+// virtual method calling
+void MacroAssembler::lookup_virtual_method(Register recv_klass,
+                                           RegisterOrConstant vtable_index,
+                                           Register method_result) {
+  const int base = in_bytes(Klass::vtable_start_offset());
+  assert(vtableEntry::size() * wordSize == 8,
+         "adjust the scaling in the code below");
+  int vtable_offset_in_bytes = base + vtableEntry::method_offset_in_bytes();
+
+  if (vtable_index.is_register()) {
+    shadd(method_result, vtable_index.as_register(), recv_klass, method_result, LogBytesPerWord);
+    ld(method_result, Address(method_result, vtable_offset_in_bytes));
+  } else {
+    vtable_offset_in_bytes += vtable_index.as_constant() * wordSize;
+    ld(method_result, form_address(method_result, recv_klass, vtable_offset_in_bytes));
+  }
+}
+
+void MacroAssembler::membar(uint32_t order_constraint) {
+  address prev = pc() - NativeMembar::instruction_size;
+  address last = code()->last_insn();
+
+  if (last != NULL && nativeInstruction_at(last)->is_membar() && prev == last) {
+    NativeMembar *bar = NativeMembar_at(prev);
+    // We are merging two memory barrier instructions.  On RISCV we
+    // can do this simply by ORing them together.
+    bar->set_kind(bar->get_kind() | order_constraint);
+    BLOCK_COMMENT("merged membar");
+  } else {
+    code()->set_last_insn(pc());
+
+    uint32_t predecessor = 0;
+    uint32_t successor = 0;
+
+    membar_mask_to_pred_succ(order_constraint, predecessor, successor);
+    fence(predecessor, successor);
+  }
+}
+
+// Form an addres from base + offset in Rd. Rd my or may not
+// actually be used: you must use the Address that is returned. It
+// is up to you to ensure that the shift provided mathces the size
+// of your data.
+Address MacroAssembler::form_address(Register Rd, Register base, long byte_offset) {
+  if (is_offset_in_range(byte_offset, 12)) { // 12: imm in range 2^12
+    return Address(base, byte_offset);
+  }
+
+  // Do it the hard way
+  mv(Rd, byte_offset);
+  add(Rd, base, Rd);
+  return Address(Rd);
+}
+
+void MacroAssembler::check_klass_subtype(Register sub_klass,
+                                         Register super_klass,
+                                         Register tmp_reg,
+                                         Label& L_success) {
+  Label L_failure;
+  check_klass_subtype_fast_path(sub_klass, super_klass, tmp_reg, &L_success, &L_failure, NULL);
+  check_klass_subtype_slow_path(sub_klass, super_klass, tmp_reg, noreg, &L_success, NULL);
+  bind(L_failure);
+}
+
+void MacroAssembler::safepoint_poll(Label& slow_path, bool at_return, bool acquire, bool in_nmethod) {
+  ld(t0, Address(xthread, JavaThread::polling_word_offset()));
+  if (acquire) {
+    membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+  }
+  if (at_return) {
+    bgtu(in_nmethod ? sp : fp, t0, slow_path, true /* is_far */);
+  } else {
+    andi(t0, t0, SafepointMechanism::poll_bit());
+    bnez(t0, slow_path, true /* is_far */);
+  }
+}
+
+void MacroAssembler::cmpxchgptr(Register oldv, Register newv, Register addr, Register tmp,
+                                Label &succeed, Label *fail) {
+  // oldv holds comparison value
+  // newv holds value to write in exchange
+  // addr identifies memory word to compare against/update
+  Label retry_load, nope;
+  bind(retry_load);
+  // Load reserved from the memory location
+  lr_d(tmp, addr, Assembler::aqrl);
+  // Fail and exit if it is not what we expect
+  bne(tmp, oldv, nope);
+  // If the store conditional succeeds, tmp will be zero
+  sc_d(tmp, newv, addr, Assembler::rl);
+  beqz(tmp, succeed);
+  // Retry only when the store conditional failed
+  j(retry_load);
+
+  bind(nope);
+  membar(AnyAny);
+  mv(oldv, tmp);
+  if (fail != NULL) {
+    j(*fail);
+  }
+}
+
+void MacroAssembler::cmpxchg_obj_header(Register oldv, Register newv, Register obj, Register tmp,
+                                        Label &succeed, Label *fail) {
+  assert(oopDesc::mark_offset_in_bytes() == 0, "assumption");
+  cmpxchgptr(oldv, newv, obj, tmp, succeed, fail);
+}
+
+void MacroAssembler::load_reserved(Register addr,
+                                   enum operand_size size,
+                                   Assembler::Aqrl acquire) {
+  switch (size) {
+    case int64:
+      lr_d(t0, addr, acquire);
+      break;
+    case int32:
+      lr_w(t0, addr, acquire);
+      break;
+    case uint32:
+      lr_w(t0, addr, acquire);
+      zero_extend(t0, t0, 32);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void MacroAssembler::store_conditional(Register addr,
+                                       Register new_val,
+                                       enum operand_size size,
+                                       Assembler::Aqrl release) {
+  switch (size) {
+    case int64:
+      sc_d(t0, new_val, addr, release);
+      break;
+    case int32:
+    case uint32:
+      sc_w(t0, new_val, addr, release);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+
+void MacroAssembler::cmpxchg_narrow_value_helper(Register addr, Register expected,
+                                                 Register new_val,
+                                                 enum operand_size size,
+                                                 Register tmp1, Register tmp2, Register tmp3) {
+  assert(size == int8 || size == int16, "unsupported operand size");
+
+  Register aligned_addr = t1, shift = tmp1, mask = tmp2, not_mask = tmp3;
+
+  andi(shift, addr, 3);
+  slli(shift, shift, 3);
+
+  andi(aligned_addr, addr, ~3);
+
+  if (size == int8) {
+    addi(mask, zr, 0xff);
+  } else {
+    // size == int16 case
+    addi(mask, zr, -1);
+    zero_extend(mask, mask, 16);
+  }
+  sll(mask, mask, shift);
+
+  xori(not_mask, mask, -1);
+
+  sll(expected, expected, shift);
+  andr(expected, expected, mask);
+
+  sll(new_val, new_val, shift);
+  andr(new_val, new_val, mask);
+}
+
+// cmpxchg_narrow_value will kill t0, t1, expected, new_val and tmps.
+// It's designed to implement compare and swap byte/boolean/char/short by lr.w/sc.w,
+// which are forced to work with 4-byte aligned address.
+void MacroAssembler::cmpxchg_narrow_value(Register addr, Register expected,
+                                          Register new_val,
+                                          enum operand_size size,
+                                          Assembler::Aqrl acquire, Assembler::Aqrl release,
+                                          Register result, bool result_as_bool,
+                                          Register tmp1, Register tmp2, Register tmp3) {
+  Register aligned_addr = t1, shift = tmp1, mask = tmp2, not_mask = tmp3, old = result, tmp = t0;
+  assert_different_registers(addr, old, mask, not_mask, new_val, expected, shift, tmp);
+  cmpxchg_narrow_value_helper(addr, expected, new_val, size, tmp1, tmp2, tmp3);
+
+  Label retry, fail, done;
+
+  bind(retry);
+  lr_w(old, aligned_addr, acquire);
+  andr(tmp, old, mask);
+  bne(tmp, expected, fail);
+
+  andr(tmp, old, not_mask);
+  orr(tmp, tmp, new_val);
+  sc_w(tmp, tmp, aligned_addr, release);
+  bnez(tmp, retry);
+
+  if (result_as_bool) {
+    addi(result, zr, 1);
+    j(done);
+
+    bind(fail);
+    mv(result, zr);
+
+    bind(done);
+  } else {
+    andr(tmp, old, mask);
+
+    bind(fail);
+    srl(result, tmp, shift);
+
+    if (size == int8) {
+      sign_extend(result, result, 8);
+    } else {
+      // size == int16 case
+      sign_extend(result, result, 16);
+    }
+  }
+}
+
+// weak_cmpxchg_narrow_value is a weak version of cmpxchg_narrow_value, to implement
+// the weak CAS stuff. The major difference is that it just failed when store conditional
+// failed.
+void MacroAssembler::weak_cmpxchg_narrow_value(Register addr, Register expected,
+                                               Register new_val,
+                                               enum operand_size size,
+                                               Assembler::Aqrl acquire, Assembler::Aqrl release,
+                                               Register result,
+                                               Register tmp1, Register tmp2, Register tmp3) {
+  Register aligned_addr = t1, shift = tmp1, mask = tmp2, not_mask = tmp3, old = result, tmp = t0;
+  assert_different_registers(addr, old, mask, not_mask, new_val, expected, shift, tmp);
+  cmpxchg_narrow_value_helper(addr, expected, new_val, size, tmp1, tmp2, tmp3);
+
+  Label succ, fail, done;
+
+  lr_w(old, aligned_addr, acquire);
+  andr(tmp, old, mask);
+  bne(tmp, expected, fail);
+
+  andr(tmp, old, not_mask);
+  orr(tmp, tmp, new_val);
+  sc_w(tmp, tmp, aligned_addr, release);
+  beqz(tmp, succ);
+
+  bind(fail);
+  addi(result, zr, 1);
+  j(done);
+
+  bind(succ);
+  mv(result, zr);
+
+  bind(done);
+}
+
+void MacroAssembler::cmpxchg(Register addr, Register expected,
+                             Register new_val,
+                             enum operand_size size,
+                             Assembler::Aqrl acquire, Assembler::Aqrl release,
+                             Register result, bool result_as_bool) {
+  assert(size != int8 && size != int16, "unsupported operand size");
+
+  Label retry_load, done, ne_done;
+  bind(retry_load);
+  load_reserved(addr, size, acquire);
+  bne(t0, expected, ne_done);
+  store_conditional(addr, new_val, size, release);
+  bnez(t0, retry_load);
+
+  // equal, succeed
+  if (result_as_bool) {
+    li(result, 1);
+  } else {
+    mv(result, expected);
+  }
+  j(done);
+
+  // not equal, failed
+  bind(ne_done);
+  if (result_as_bool) {
+    mv(result, zr);
+  } else {
+    mv(result, t0);
+  }
+
+  bind(done);
+}
+
+void MacroAssembler::cmpxchg_weak(Register addr, Register expected,
+                                  Register new_val,
+                                  enum operand_size size,
+                                  Assembler::Aqrl acquire, Assembler::Aqrl release,
+                                  Register result) {
+  Label fail, done, sc_done;
+  load_reserved(addr, size, acquire);
+  bne(t0, expected, fail);
+  store_conditional(addr, new_val, size, release);
+  beqz(t0, sc_done);
+
+  // fail
+  bind(fail);
+  li(result, 1);
+  j(done);
+
+  // sc_done
+  bind(sc_done);
+  mv(result, 0);
+  bind(done);
+}
+
+#define ATOMIC_OP(NAME, AOP, ACQUIRE, RELEASE)                                              \
+void MacroAssembler::atomic_##NAME(Register prev, RegisterOrConstant incr, Register addr) { \
+  prev = prev->is_valid() ? prev : zr;                                                      \
+  if (incr.is_register()) {                                                                 \
+    AOP(prev, addr, incr.as_register(), (Assembler::Aqrl)(ACQUIRE | RELEASE));              \
+  } else {                                                                                  \
+    mv(t0, incr.as_constant());                                                             \
+    AOP(prev, addr, t0, (Assembler::Aqrl)(ACQUIRE | RELEASE));                              \
+  }                                                                                         \
+  return;                                                                                   \
+}
+
+ATOMIC_OP(add, amoadd_d, Assembler::relaxed, Assembler::relaxed)
+ATOMIC_OP(addw, amoadd_w, Assembler::relaxed, Assembler::relaxed)
+ATOMIC_OP(addal, amoadd_d, Assembler::aq, Assembler::rl)
+ATOMIC_OP(addalw, amoadd_w, Assembler::aq, Assembler::rl)
+
+#undef ATOMIC_OP
+
+#define ATOMIC_XCHG(OP, AOP, ACQUIRE, RELEASE)                                       \
+void MacroAssembler::atomic_##OP(Register prev, Register newv, Register addr) {      \
+  prev = prev->is_valid() ? prev : zr;                                               \
+  AOP(prev, addr, newv, (Assembler::Aqrl)(ACQUIRE | RELEASE));                       \
+  return;                                                                            \
+}
+
+ATOMIC_XCHG(xchg, amoswap_d, Assembler::relaxed, Assembler::relaxed)
+ATOMIC_XCHG(xchgw, amoswap_w, Assembler::relaxed, Assembler::relaxed)
+ATOMIC_XCHG(xchgal, amoswap_d, Assembler::aq, Assembler::rl)
+ATOMIC_XCHG(xchgalw, amoswap_w, Assembler::aq, Assembler::rl)
+
+#undef ATOMIC_XCHG
+
+#define ATOMIC_XCHGU(OP1, OP2)                                                       \
+void MacroAssembler::atomic_##OP1(Register prev, Register newv, Register addr) {     \
+  atomic_##OP2(prev, newv, addr);                                                    \
+  zero_extend(prev, prev, 32);                                                       \
+  return;                                                                            \
+}
+
+ATOMIC_XCHGU(xchgwu, xchgw)
+ATOMIC_XCHGU(xchgalwu, xchgalw)
+
+#undef ATOMIC_XCHGU
+
+void MacroAssembler::far_jump(Address entry, CodeBuffer *cbuf, Register tmp) {
+  assert(ReservedCodeCacheSize < 4*G, "branch out of range");
+  assert(CodeCache::find_blob(entry.target()) != NULL,
+         "destination of far call not found in code cache");
+  int32_t offset = 0;
+  if (far_branches()) {
+    // We can use auipc + jalr here because we know that the total size of
+    // the code cache cannot exceed 2Gb.
+    la_patchable(tmp, entry, offset);
+    if (cbuf != NULL) { cbuf->set_insts_mark(); }
+    jalr(x0, tmp, offset);
+  } else {
+    if (cbuf != NULL) { cbuf->set_insts_mark(); }
+    j(entry);
+  }
+}
+
+void MacroAssembler::far_call(Address entry, CodeBuffer *cbuf, Register tmp) {
+  assert(ReservedCodeCacheSize < 4*G, "branch out of range");
+  assert(CodeCache::find_blob(entry.target()) != NULL,
+         "destination of far call not found in code cache");
+  int32_t offset = 0;
+  if (far_branches()) {
+    // We can use auipc + jalr here because we know that the total size of
+    // the code cache cannot exceed 2Gb.
+    la_patchable(tmp, entry, offset);
+    if (cbuf != NULL) { cbuf->set_insts_mark(); }
+    jalr(x1, tmp, offset); // link
+  } else {
+    if (cbuf != NULL) { cbuf->set_insts_mark(); }
+    jal(entry); // link
+  }
+}
+
+void MacroAssembler::check_klass_subtype_fast_path(Register sub_klass,
+                                                   Register super_klass,
+                                                   Register tmp_reg,
+                                                   Label* L_success,
+                                                   Label* L_failure,
+                                                   Label* L_slow_path,
+                                                   Register super_check_offset) {
+  assert_different_registers(sub_klass, super_klass, tmp_reg);
+  bool must_load_sco = (super_check_offset == noreg);
+  if (must_load_sco) {
+    assert(tmp_reg != noreg, "supply either a temp or a register offset");
+  } else {
+    assert_different_registers(sub_klass, super_klass, super_check_offset);
+  }
+
+  Label L_fallthrough;
+  int label_nulls = 0;
+  if (L_success == NULL)   { L_success   = &L_fallthrough; label_nulls++; }
+  if (L_failure == NULL)   { L_failure   = &L_fallthrough; label_nulls++; }
+  if (L_slow_path == NULL) { L_slow_path = &L_fallthrough; label_nulls++; }
+  assert(label_nulls <= 1, "at most one NULL in batch");
+
+  int sc_offset = in_bytes(Klass::secondary_super_cache_offset());
+  int sco_offset = in_bytes(Klass::super_check_offset_offset());
+  Address super_check_offset_addr(super_klass, sco_offset);
+
+  // Hacked jmp, which may only be used just before L_fallthrough.
+#define final_jmp(label)                                                \
+  if (&(label) == &L_fallthrough) { /*do nothing*/ }                    \
+  else                            j(label)             /*omit semi*/
+
+  // If the pointers are equal, we are done (e.g., String[] elements).
+  // This self-check enables sharing of secondary supertype arrays among
+  // non-primary types such as array-of-interface. Otherwise, each such
+  // type would need its own customized SSA.
+  // We move this check to the front fo the fast path because many
+  // type checks are in fact trivially successful in this manner,
+  // so we get a nicely predicted branch right at the start of the check.
+  beq(sub_klass, super_klass, *L_success);
+
+  // Check the supertype display:
+  if (must_load_sco) {
+    lwu(tmp_reg, super_check_offset_addr);
+    super_check_offset = tmp_reg;
+  }
+  add(t0, sub_klass, super_check_offset);
+  Address super_check_addr(t0);
+  ld(t0, super_check_addr); // load displayed supertype
+
+  // Ths check has worked decisively for primary supers.
+  // Secondary supers are sought in the super_cache ('super_cache_addr').
+  // (Secondary supers are interfaces and very deeply nested subtypes.)
+  // This works in the same check above because of a tricky aliasing
+  // between the super_Cache and the primary super dispaly elements.
+  // (The 'super_check_addr' can address either, as the case requires.)
+  // Note that the cache is updated below if it does not help us find
+  // what we need immediately.
+  // So if it was a primary super, we can just fail immediately.
+  // Otherwise, it's the slow path for us (no success at this point).
+
+  beq(super_klass, t0, *L_success);
+  mv(t1, sc_offset);
+  if (L_failure == &L_fallthrough) {
+    beq(super_check_offset, t1, *L_slow_path);
+  } else {
+    bne(super_check_offset, t1, *L_failure, /* is_far */ true);
+    final_jmp(*L_slow_path);
+  }
+
+  bind(L_fallthrough);
+
+#undef final_jmp
+}
+
+// Scans count pointer sized words at [addr] for occurence of value,
+// generic
+void MacroAssembler::repne_scan(Register addr, Register value, Register count,
+                                Register tmp) {
+  Label Lloop, Lexit;
+  beqz(count, Lexit);
+  bind(Lloop);
+  ld(tmp, addr);
+  beq(value, tmp, Lexit);
+  add(addr, addr, wordSize);
+  sub(count, count, 1);
+  bnez(count, Lloop);
+  bind(Lexit);
+}
+
+void MacroAssembler::check_klass_subtype_slow_path(Register sub_klass,
+                                                   Register super_klass,
+                                                   Register tmp1_reg,
+                                                   Register tmp2_reg,
+                                                   Label* L_success,
+                                                   Label* L_failure) {
+  assert_different_registers(sub_klass, super_klass, tmp1_reg);
+  if (tmp2_reg != noreg) {
+    assert_different_registers(sub_klass, super_klass, tmp1_reg, tmp2_reg, t0);
+  }
+#define IS_A_TEMP(reg) ((reg) == tmp1_reg || (reg) == tmp2_reg)
+
+  Label L_fallthrough;
+  int label_nulls = 0;
+  if (L_success == NULL)   { L_success   = &L_fallthrough; label_nulls++; }
+  if (L_failure == NULL)   { L_failure   = &L_fallthrough; label_nulls++; }
+
+  assert(label_nulls <= 1, "at most one NULL in the batch");
+
+  // A couple of usefule fields in sub_klass:
+  int ss_offset = in_bytes(Klass::secondary_supers_offset());
+  int sc_offset = in_bytes(Klass::secondary_super_cache_offset());
+  Address secondary_supers_addr(sub_klass, ss_offset);
+  Address super_cache_addr(     sub_klass, sc_offset);
+
+  BLOCK_COMMENT("check_klass_subtype_slow_path");
+
+  // Do a linear scan of the secondary super-klass chain.
+  // This code is rarely used, so simplicity is a virtue here.
+  // The repne_scan instruction uses fixed registers, which we must spill.
+  // Don't worry too much about pre-existing connecitons with the input regs.
+
+  assert(sub_klass != x10, "killed reg"); // killed by mv(x10, super)
+  assert(sub_klass != x12, "killed reg"); // killed by la(x12, &pst_counter)
+
+  RegSet pushed_registers;
+  if (!IS_A_TEMP(x12)) {
+    pushed_registers += x12;
+  }
+  if (!IS_A_TEMP(x15)) {
+    pushed_registers += x15;
+  }
+
+  if (super_klass != x10 || UseCompressedOops) {
+    if (!IS_A_TEMP(x10)) {
+      pushed_registers += x10;
+    }
+  }
+
+  push_reg(pushed_registers, sp);
+
+  // Get super_klass value into x10 (even if it was in x15 or x12)
+  mv(x10, super_klass);
+
+#ifndef PRODUCT
+  mv(t1, (address)&SharedRuntime::_partial_subtype_ctr);
+  Address pst_counter_addr(t1);
+  ld(t0, pst_counter_addr);
+  add(t0, t0, 1);
+  sd(t0, pst_counter_addr);
+#endif // PRODUCT
+
+  // We will consult the secondary-super array.
+  ld(x15, secondary_supers_addr);
+  // Load the array length.
+  lwu(x12, Address(x15, Array<Klass*>::length_offset_in_bytes()));
+  // Skip to start of data.
+  add(x15, x15, Array<Klass*>::base_offset_in_bytes());
+
+  // Set t0 to an obvious invalid value, falling through by default
+  li(t0, -1);
+  // Scan X12 words at [X15] for an occurrence of X10.
+  repne_scan(x15, x10, x12, t0);
+
+  // pop will restore x10, so we should use a temp register to keep its value
+  mv(t1, x10);
+
+  // Unspill the temp registers:
+  pop_reg(pushed_registers, sp);
+
+  bne(t1, t0, *L_failure);
+
+  // Success. Cache the super we found an proceed in triumph.
+  sd(super_klass, super_cache_addr);
+
+  if (L_success != &L_fallthrough) {
+    j(*L_success);
+  }
+
+#undef IS_A_TEMP
+
+  bind(L_fallthrough);
+}
+
+// Defines obj, preserves var_size_in_bytes, okay for tmp2 == var_size_in_bytes.
+void MacroAssembler::tlab_allocate(Register obj,
+                                   Register var_size_in_bytes,
+                                   int con_size_in_bytes,
+                                   Register tmp1,
+                                   Register tmp2,
+                                   Label& slow_case,
+                                   bool is_far) {
+  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  bs->tlab_allocate(this, obj, var_size_in_bytes, con_size_in_bytes, tmp1, tmp2, slow_case, is_far);
+}
+
+// Defines obj, preserves var_size_in_bytes
+void MacroAssembler::eden_allocate(Register obj,
+                                   Register var_size_in_bytes,
+                                   int con_size_in_bytes,
+                                   Register tmp,
+                                   Label& slow_case,
+                                   bool is_far) {
+  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  bs->eden_allocate(this, obj, var_size_in_bytes, con_size_in_bytes, tmp, slow_case, is_far);
+}
+
+
+// get_thread() can be called anywhere inside generated code so we
+// need to save whatever non-callee save context might get clobbered
+// by the call to Thread::current() or, indeed, the call setup code.
+void MacroAssembler::get_thread(Register thread) {
+  // save all call-clobbered regs except thread
+  RegSet saved_regs = RegSet::range(x5, x7) + RegSet::range(x10, x17) +
+                      RegSet::range(x28, x31) + ra - thread;
+  push_reg(saved_regs, sp);
+
+  int32_t offset = 0;
+  movptr_with_offset(ra, CAST_FROM_FN_PTR(address, Thread::current), offset);
+  jalr(ra, ra, offset);
+  if (thread != x10) {
+    mv(thread, x10);
+  }
+
+  // restore pushed registers
+  pop_reg(saved_regs, sp);
+}
+
+void MacroAssembler::load_byte_map_base(Register reg) {
+  CardTable::CardValue* byte_map_base =
+    ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base();
+  li(reg, (uint64_t)byte_map_base);
+}
+
+void MacroAssembler::la_patchable(Register reg1, const Address &dest, int32_t &offset) {
+  relocInfo::relocType rtype = dest.rspec().reloc()->type();
+  unsigned long low_address = (uintptr_t)CodeCache::low_bound();
+  unsigned long high_address = (uintptr_t)CodeCache::high_bound();
+  unsigned long dest_address = (uintptr_t)dest.target();
+  long offset_low = dest_address - low_address;
+  long offset_high = dest_address - high_address;
+
+  assert(is_valid_riscv64_address(dest.target()), "bad address");
+  assert(dest.getMode() == Address::literal, "la_patchable must be applied to a literal address");
+
+  InstructionMark im(this);
+  code_section()->relocate(inst_mark(), dest.rspec());
+  // 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)) {
+    int64_t distance = dest.target() - pc();
+    auipc(reg1, (int32_t)distance + 0x800);
+    offset = ((int32_t)distance << 20) >> 20;
+  } else {
+    movptr_with_offset(reg1, dest.target(), offset);
+  }
+}
+
+void MacroAssembler::build_frame(int framesize) {
+  assert(framesize >= 2, "framesize must include space for FP/RA");
+  assert(framesize % (2*wordSize) == 0, "must preserve 2*wordSize alignment");
+  sub(sp, sp, framesize);
+  sd(fp, Address(sp, framesize - 2 * wordSize));
+  sd(ra, Address(sp, framesize - wordSize));
+  if (PreserveFramePointer) { add(fp, sp, framesize); }
+  verify_cross_modify_fence_not_required();
+}
+
+void MacroAssembler::remove_frame(int framesize) {
+  assert(framesize >= 2, "framesize must include space for FP/RA");
+  assert(framesize % (2*wordSize) == 0, "must preserve 2*wordSize alignment");
+  ld(fp, Address(sp, framesize - 2 * wordSize));
+  ld(ra, Address(sp, framesize - wordSize));
+  add(sp, sp, framesize);
+}
+
+void MacroAssembler::reserved_stack_check() {
+    // testing if reserved zone needs to be enabled
+    Label no_reserved_zone_enabling;
+
+    ld(t0, Address(xthread, JavaThread::reserved_stack_activation_offset()));
+    bltu(sp, t0, no_reserved_zone_enabling);
+
+    enter();   // RA and FP are live.
+    mv(c_rarg0, xthread);
+    int32_t offset = 0;
+    la_patchable(t0, RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone)), offset);
+    jalr(x1, t0, offset);
+    leave();
+
+    // We have already removed our own frame.
+    // throw_delayed_StackOverflowError will think that it's been
+    // called by our caller.
+    offset = 0;
+    la_patchable(t0, RuntimeAddress(StubRoutines::throw_delayed_StackOverflowError_entry()), offset);
+    jalr(x0, t0, offset);
+    should_not_reach_here();
+
+    bind(no_reserved_zone_enabling);
+}
+
+// Move the address of the polling page into dest.
+void MacroAssembler::get_polling_page(Register dest, relocInfo::relocType rtype) {
+  ld(dest, Address(xthread, JavaThread::polling_page_offset()));
+}
+
+// Read the polling page.  The address of the polling page must
+// already be in r.
+address MacroAssembler::read_polling_page(Register r, int32_t offset, relocInfo::relocType rtype) {
+  address mark;
+  {
+    InstructionMark im(this);
+    code_section()->relocate(inst_mark(), rtype);
+    lwu(zr, Address(r, offset));
+    mark = inst_mark();
+  }
+  verify_cross_modify_fence_not_required();
+  return mark;
+}
+
+void  MacroAssembler::set_narrow_oop(Register dst, jobject obj) {
+#ifdef ASSERT
+  {
+    ThreadInVMfromUnknown tiv;
+    assert (UseCompressedOops, "should only be used for compressed oops");
+    assert (Universe::heap() != NULL, "java heap should be initialized");
+    assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
+    assert(Universe::heap()->is_in(JNIHandles::resolve(obj)), "should be real oop");
+  }
+#endif
+  int oop_index = oop_recorder()->find_index(obj);
+  InstructionMark im(this);
+  RelocationHolder rspec = oop_Relocation::spec(oop_index);
+  code_section()->relocate(inst_mark(), rspec);
+  li32(dst, 0xDEADBEEF);
+  zero_extend(dst, dst, 32);
+}
+
+void  MacroAssembler::set_narrow_klass(Register dst, Klass* k) {
+  assert (UseCompressedClassPointers, "should only be used for compressed headers");
+  assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
+  int index = oop_recorder()->find_index(k);
+  assert(!Universe::heap()->is_in(k), "should not be an oop");
+
+  InstructionMark im(this);
+  RelocationHolder rspec = metadata_Relocation::spec(index);
+  code_section()->relocate(inst_mark(), rspec);
+  narrowKlass nk = CompressedKlassPointers::encode(k);
+  li32(dst, nk);
+  zero_extend(dst, dst, 32);
+}
+
+// Maybe emit a call via a trampoline.  If the code cache is small
+// trampolines won't be emitted.
+address MacroAssembler::trampoline_call(Address entry, CodeBuffer* cbuf) {
+  assert(JavaThread::current()->is_Compiler_thread(), "just checking");
+  assert(entry.rspec().type() == relocInfo::runtime_call_type ||
+         entry.rspec().type() == relocInfo::opt_virtual_call_type ||
+         entry.rspec().type() == relocInfo::static_call_type ||
+         entry.rspec().type() == relocInfo::virtual_call_type, "wrong reloc type");
+
+  // We need a trampoline if branches are far.
+  if (far_branches()) {
+    bool in_scratch_emit_size = false;
+#ifdef COMPILER2
+    // We don't want to emit a trampoline if C2 is generating dummy
+    // code during its branch shortening phase.
+    CompileTask* task = ciEnv::current()->task();
+    in_scratch_emit_size =
+      (task != NULL && is_c2_compile(task->comp_level()) &&
+       Compile::current()->output()->in_scratch_emit_size());
+#endif
+    if (!in_scratch_emit_size) {
+      address stub = emit_trampoline_stub(offset(), entry.target());
+      if (stub == NULL) {
+        postcond(pc() == badAddress);
+        return NULL; // CodeCache is full
+      }
+    }
+  }
+
+  if (cbuf != NULL) { cbuf->set_insts_mark(); }
+  relocate(entry.rspec());
+  if (!far_branches()) {
+    jal(entry.target());
+  } else {
+    jal(pc());
+  }
+  // just need to return a non-null address
+  postcond(pc() != badAddress);
+  return pc();
+}
+
+address MacroAssembler::ic_call(address entry, jint method_index) {
+  RelocationHolder rh = virtual_call_Relocation::spec(pc(), method_index);
+  movptr(t1, (address)Universe::non_oop_word());
+  assert_cond(entry != NULL);
+  return trampoline_call(Address(entry, rh));
+}
+
+// Emit a trampoline stub for a call to a target which is too far away.
+//
+// code sequences:
+//
+// call-site:
+//   branch-and-link to <destination> or <trampoline stub>
+//
+// Related trampoline stub for this call site in the stub section:
+//   load the call target from the constant pool
+//   branch (RA still points to the call site above)
+
+address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
+                                             address dest) {
+  address stub = start_a_stub(NativeInstruction::instruction_size
+                            + NativeCallTrampolineStub::instruction_size);
+  if (stub == NULL) {
+    return NULL;  // CodeBuffer::expand failed
+  }
+
+  // Create a trampoline stub relocation which relates this trampoline stub
+  // with the call instruction at insts_call_instruction_offset in the
+  // instructions code-section.
+
+  // make sure 4 byte aligned here, so that the destination address would be
+  // 8 byte aligned after 3 intructions
+  // when we reach here we may get a 2-byte alignment so need to align it
+  align(wordSize, NativeCallTrampolineStub::data_offset);
+
+  relocate(trampoline_stub_Relocation::spec(code()->insts()->start() +
+                                            insts_call_instruction_offset));
+  const int stub_start_offset = offset();
+
+  // Now, create the trampoline stub's code:
+  // - load the call
+  // - call
+  Label target;
+  ld(t0, target);  // auipc + ld
+  jr(t0);          // jalr
+  bind(target);
+  assert(offset() - stub_start_offset == NativeCallTrampolineStub::data_offset,
+         "should be");
+  assert(offset() % wordSize == 0, "bad alignment");
+  emit_int64((intptr_t)dest);
+
+  const address stub_start_addr = addr_at(stub_start_offset);
+
+  assert(is_NativeCallTrampolineStub_at(stub_start_addr), "doesn't look like a trampoline");
+
+  end_a_stub();
+  return stub_start_addr;
+}
+
+Address MacroAssembler::add_memory_helper(const Address dst) {
+  switch (dst.getMode()) {
+    case Address::base_plus_offset:
+      // This is the expected mode, although we allow all the other
+      // forms below.
+      return form_address(t1, dst.base(), dst.offset());
+    default:
+      la(t1, dst);
+      return Address(t1);
+  }
+}
+
+void MacroAssembler::add_memory_int64(const Address dst, int64_t imm) {
+  Address adr = add_memory_helper(dst);
+  assert_different_registers(adr.base(), t0);
+  ld(t0, adr);
+  addi(t0, t0, imm);
+  sd(t0, adr);
+}
+
+void MacroAssembler::add_memory_int32(const Address dst, int32_t imm) {
+  Address adr = add_memory_helper(dst);
+  assert_different_registers(adr.base(), t0);
+  lwu(t0, adr);
+  addiw(t0, t0, imm);
+  sw(t0, adr);
+}
+
+void MacroAssembler::cmpptr(Register src1, Address src2, Label& equal) {
+  assert_different_registers(src1, t0);
+  int32_t offset;
+  la_patchable(t0, src2, offset);
+  ld(t0, Address(t0, offset));
+  beq(src1, t0, equal);
+}
+
+void MacroAssembler::load_method_holder_cld(Register result, Register method) {
+  load_method_holder(result, method);
+  ld(result, Address(result, InstanceKlass::class_loader_data_offset()));
+}
+
+void MacroAssembler::load_method_holder(Register holder, Register method) {
+  ld(holder, Address(method, Method::const_offset()));                      // ConstMethod*
+  ld(holder, Address(holder, ConstMethod::constants_offset()));             // ConstantPool*
+  ld(holder, Address(holder, ConstantPool::pool_holder_offset_in_bytes())); // InstanceKlass*
+}
+
+// string indexof
+// compute index by trailing zeros
+void MacroAssembler::compute_index(Register haystack, Register trailing_zeros,
+                                   Register match_mask, Register result,
+                                   Register ch2, Register tmp,
+                                   bool haystack_isL)
+{
+  int haystack_chr_shift = haystack_isL ? 0 : 1;
+  srl(match_mask, match_mask, trailing_zeros);
+  srli(match_mask, match_mask, 1);
+  srli(tmp, trailing_zeros, LogBitsPerByte);
+  if (!haystack_isL) andi(tmp, tmp, 0xE);
+  add(haystack, haystack, tmp);
+  ld(ch2, Address(haystack));
+  if (!haystack_isL) srli(tmp, tmp, haystack_chr_shift);
+  add(result, result, tmp);
+}
+
+// string indexof
+// Find pattern element in src, compute match mask,
+// only the first occurrence of 0x80/0x8000 at low bits is the valid match index
+// match mask patterns and corresponding indices would be like:
+// - 0x8080808080808080 (Latin1)
+// -   7 6 5 4 3 2 1 0  (match index)
+// - 0x8000800080008000 (UTF16)
+// -   3   2   1   0    (match index)
+void MacroAssembler::compute_match_mask(Register src, Register pattern, Register match_mask,
+                                        Register mask1, Register mask2)
+{
+  xorr(src, pattern, src);
+  sub(match_mask, src, mask1);
+  orr(src, src, mask2);
+  notr(src, src);
+  andr(match_mask, match_mask, src);
+}
+
+#ifdef COMPILER2
+// Code for BigInteger::mulAdd instrinsic
+// out     = x10
+// in      = x11
+// offset  = x12  (already out.length-offset)
+// len     = x13
+// k       = x14
+// tmp     = x28
+//
+// pseudo code from java implementation:
+// long kLong = k & LONG_MASK;
+// carry = 0;
+// offset = out.length-offset - 1;
+// for (int j = len - 1; j >= 0; j--) {
+//     product = (in[j] & LONG_MASK) * kLong + (out[offset] & LONG_MASK) + carry;
+//     out[offset--] = (int)product;
+//     carry = product >>> 32;
+// }
+// return (int)carry;
+void MacroAssembler::mul_add(Register out, Register in, Register offset,
+                             Register len, Register k, Register tmp) {
+  Label L_tail_loop, L_unroll, L_end;
+  mv(tmp, out);
+  mv(out, zr);
+  blez(len, L_end);
+  zero_extend(k, k, 32);
+  slliw(t0, offset, LogBytesPerInt);
+  add(offset, tmp, t0);
+  slliw(t0, len, LogBytesPerInt);
+  add(in, in, t0);
+
+  const int unroll = 8;
+  li(tmp, unroll);
+  blt(len, tmp, L_tail_loop);
+  bind(L_unroll);
+  for (int i = 0; i < unroll; i++) {
+    sub(in, in, BytesPerInt);
+    lwu(t0, Address(in, 0));
+    mul(t1, t0, k);
+    add(t0, t1, out);
+    sub(offset, offset, BytesPerInt);
+    lwu(t1, Address(offset, 0));
+    add(t0, t0, t1);
+    sw(t0, Address(offset, 0));
+    srli(out, t0, 32);
+  }
+  subw(len, len, tmp);
+  bge(len, tmp, L_unroll);
+
+  bind(L_tail_loop);
+  blez(len, L_end);
+  sub(in, in, BytesPerInt);
+  lwu(t0, Address(in, 0));
+  mul(t1, t0, k);
+  add(t0, t1, out);
+  sub(offset, offset, BytesPerInt);
+  lwu(t1, Address(offset, 0));
+  add(t0, t0, t1);
+  sw(t0, Address(offset, 0));
+  srli(out, t0, 32);
+  subw(len, len, 1);
+  j(L_tail_loop);
+
+  bind(L_end);
+}
+
+// add two unsigned input and output carry
+void MacroAssembler::cad(Register dst, Register src1, Register src2, Register carry)
+{
+  assert_different_registers(dst, carry);
+  assert_different_registers(dst, src2);
+  add(dst, src1, src2);
+  sltu(carry, dst, src2);
+}
+
+// add two input with carry
+void MacroAssembler::adc(Register dst, Register src1, Register src2, Register carry)
+{
+  assert_different_registers(dst, carry);
+  add(dst, src1, src2);
+  add(dst, dst, carry);
+}
+
+// add two unsigned input with carry and output carry
+void MacroAssembler::cadc(Register dst, Register src1, Register src2, Register carry)
+{
+  assert_different_registers(dst, src2);
+  adc(dst, src1, src2, carry);
+  sltu(carry, dst, src2);
+}
+
+void MacroAssembler::add2_with_carry(Register final_dest_hi, Register dest_hi, Register dest_lo,
+                                     Register src1, Register src2, Register carry)
+{
+  cad(dest_lo, dest_lo, src1, carry);
+  add(dest_hi, dest_hi, carry);
+  cad(dest_lo, dest_lo, src2, carry);
+  add(final_dest_hi, dest_hi, carry);
+}
+
+/**
+ * Multiply 32 bit by 32 bit first loop.
+ */
+void MacroAssembler::multiply_32_x_32_loop(Register x, Register xstart, Register x_xstart,
+                                           Register y, Register y_idx, Register z,
+                                           Register carry, Register product,
+                                           Register idx, Register kdx)
+{
+  // jlong carry, x[], y[], z[];
+  // for (int idx=ystart, kdx=ystart+1+xstart; idx >= 0; idx--, kdx--) {
+  //     long product = y[idx] * x[xstart] + carry;
+  //     z[kdx] = (int)product;
+  //     carry = product >>> 32;
+  // }
+  // z[xstart] = (int)carry;
+
+  Label L_first_loop, L_first_loop_exit;
+  blez(idx, L_first_loop_exit);
+
+  shadd(t0, xstart, x, t0, LogBytesPerInt);
+  lwu(x_xstart, Address(t0, 0));
+
+  bind(L_first_loop);
+  subw(idx, idx, 1);
+  shadd(t0, idx, y, t0, LogBytesPerInt);
+  lwu(y_idx, Address(t0, 0));
+  mul(product, x_xstart, y_idx);
+  add(product, product, carry);
+  srli(carry, product, 32);
+  subw(kdx, kdx, 1);
+  shadd(t0, kdx, z, t0, LogBytesPerInt);
+  sw(product, Address(t0, 0));
+  bgtz(idx, L_first_loop);
+
+  bind(L_first_loop_exit);
+}
+
+/**
+ * Multiply 64 bit by 64 bit first loop.
+ */
+void MacroAssembler::multiply_64_x_64_loop(Register x, Register xstart, Register x_xstart,
+                                           Register y, Register y_idx, Register z,
+                                           Register carry, Register product,
+                                           Register idx, Register kdx)
+{
+  //
+  //  jlong carry, x[], y[], z[];
+  //  for (int idx=ystart, kdx=ystart+1+xstart; idx >= 0; idx--, kdx--) {
+  //    huge_128 product = y[idx] * x[xstart] + carry;
+  //    z[kdx] = (jlong)product;
+  //    carry  = (jlong)(product >>> 64);
+  //  }
+  //  z[xstart] = carry;
+  //
+
+  Label L_first_loop, L_first_loop_exit;
+  Label L_one_x, L_one_y, L_multiply;
+
+  subw(xstart, xstart, 1);
+  bltz(xstart, L_one_x);
+
+  shadd(t0, xstart, x, t0, LogBytesPerInt);
+  ld(x_xstart, Address(t0, 0));
+  ror_imm(x_xstart, x_xstart, 32); // convert big-endian to little-endian
+
+  bind(L_first_loop);
+  subw(idx, idx, 1);
+  bltz(idx, L_first_loop_exit);
+  subw(idx, idx, 1);
+  bltz(idx, L_one_y);
+
+  shadd(t0, idx, y, t0, LogBytesPerInt);
+  ld(y_idx, Address(t0, 0));
+  ror_imm(y_idx, y_idx, 32); // convert big-endian to little-endian
+  bind(L_multiply);
+
+  mulhu(t0, x_xstart, y_idx);
+  mul(product, x_xstart, y_idx);
+  cad(product, product, carry, t1);
+  adc(carry, t0, zr, t1);
+
+  subw(kdx, kdx, 2);
+  ror_imm(product, product, 32); // back to big-endian
+  shadd(t0, kdx, z, t0, LogBytesPerInt);
+  sd(product, Address(t0, 0));
+
+  j(L_first_loop);
+
+  bind(L_one_y);
+  lwu(y_idx, Address(y, 0));
+  j(L_multiply);
+
+  bind(L_one_x);
+  lwu(x_xstart, Address(x, 0));
+  j(L_first_loop);
+
+  bind(L_first_loop_exit);
+}
+
+/**
+ * Multiply 128 bit by 128 bit. Unrolled inner loop.
+ *
+ */
+void MacroAssembler::multiply_128_x_128_loop(Register y, Register z,
+                                             Register carry, Register carry2,
+                                             Register idx, Register jdx,
+                                             Register yz_idx1, Register yz_idx2,
+                                             Register tmp, Register tmp3, Register tmp4,
+                                             Register tmp6, Register product_hi)
+{
+  //   jlong carry, x[], y[], z[];
+  //   int kdx = xstart+1;
+  //   for (int idx=ystart-2; idx >= 0; idx -= 2) { // Third loop
+  //     huge_128 tmp3 = (y[idx+1] * product_hi) + z[kdx+idx+1] + carry;
+  //     jlong carry2  = (jlong)(tmp3 >>> 64);
+  //     huge_128 tmp4 = (y[idx]   * product_hi) + z[kdx+idx] + carry2;
+  //     carry  = (jlong)(tmp4 >>> 64);
+  //     z[kdx+idx+1] = (jlong)tmp3;
+  //     z[kdx+idx] = (jlong)tmp4;
+  //   }
+  //   idx += 2;
+  //   if (idx > 0) {
+  //     yz_idx1 = (y[idx] * product_hi) + z[kdx+idx] + carry;
+  //     z[kdx+idx] = (jlong)yz_idx1;
+  //     carry  = (jlong)(yz_idx1 >>> 64);
+  //   }
+  //
+
+  Label L_third_loop, L_third_loop_exit, L_post_third_loop_done;
+
+  srliw(jdx, idx, 2);
+
+  bind(L_third_loop);
+
+  subw(jdx, jdx, 1);
+  bltz(jdx, L_third_loop_exit);
+  subw(idx, idx, 4);
+
+  shadd(t0, idx, y, t0, LogBytesPerInt);
+  ld(yz_idx2, Address(t0, 0));
+  ld(yz_idx1, Address(t0, wordSize));
+
+  shadd(tmp6, idx, z, t0, LogBytesPerInt);
+
+  ror_imm(yz_idx1, yz_idx1, 32); // convert big-endian to little-endian
+  ror_imm(yz_idx2, yz_idx2, 32);
+
+  ld(t1, Address(tmp6, 0));
+  ld(t0, Address(tmp6, wordSize));
+
+  mul(tmp3, product_hi, yz_idx1); //  yz_idx1 * product_hi -> tmp4:tmp3
+  mulhu(tmp4, product_hi, yz_idx1);
+
+  ror_imm(t0, t0, 32, tmp); // convert big-endian to little-endian
+  ror_imm(t1, t1, 32, tmp);
+
+  mul(tmp, product_hi, yz_idx2); //  yz_idx2 * product_hi -> carry2:tmp
+  mulhu(carry2, product_hi, yz_idx2);
+
+  cad(tmp3, tmp3, carry, carry);
+  adc(tmp4, tmp4, zr, carry);
+  cad(tmp3, tmp3, t0, t0);
+  cadc(tmp4, tmp4, tmp, t0);
+  adc(carry, carry2, zr, t0);
+  cad(tmp4, tmp4, t1, carry2);
+  adc(carry, carry, zr, carry2);
+
+  ror_imm(tmp3, tmp3, 32); // convert little-endian to big-endian
+  ror_imm(tmp4, tmp4, 32);
+  sd(tmp4, Address(tmp6, 0));
+  sd(tmp3, Address(tmp6, wordSize));
+
+  j(L_third_loop);
+
+  bind(L_third_loop_exit);
+
+  andi(idx, idx, 0x3);
+  beqz(idx, L_post_third_loop_done);
+
+  Label L_check_1;
+  subw(idx, idx, 2);
+  bltz(idx, L_check_1);
+
+  shadd(t0, idx, y, t0, LogBytesPerInt);
+  ld(yz_idx1, Address(t0, 0));
+  ror_imm(yz_idx1, yz_idx1, 32);
+
+  mul(tmp3, product_hi, yz_idx1); //  yz_idx1 * product_hi -> tmp4:tmp3
+  mulhu(tmp4, product_hi, yz_idx1);
+
+  shadd(t0, idx, z, t0, LogBytesPerInt);
+  ld(yz_idx2, Address(t0, 0));
+  ror_imm(yz_idx2, yz_idx2, 32, tmp);
+
+  add2_with_carry(carry, tmp4, tmp3, carry, yz_idx2, tmp);
+
+  ror_imm(tmp3, tmp3, 32, tmp);
+  sd(tmp3, Address(t0, 0));
+
+  bind(L_check_1);
+
+  andi(idx, idx, 0x1);
+  subw(idx, idx, 1);
+  bltz(idx, L_post_third_loop_done);
+  shadd(t0, idx, y, t0, LogBytesPerInt);
+  lwu(tmp4, Address(t0, 0));
+  mul(tmp3, tmp4, product_hi); //  tmp4 * product_hi -> carry2:tmp3
+  mulhu(carry2, tmp4, product_hi);
+
+  shadd(t0, idx, z, t0, LogBytesPerInt);
+  lwu(tmp4, Address(t0, 0));
+
+  add2_with_carry(carry2, carry2, tmp3, tmp4, carry, t0);
+
+  shadd(t0, idx, z, t0, LogBytesPerInt);
+  sw(tmp3, Address(t0, 0));
+
+  slli(t0, carry2, 32);
+  srli(carry, tmp3, 32);
+  orr(carry, carry, t0);
+
+  bind(L_post_third_loop_done);
+}
+
+/**
+ * Code for BigInteger::multiplyToLen() intrinsic.
+ *
+ * x10: x
+ * x11: xlen
+ * x12: y
+ * x13: ylen
+ * x14: z
+ * x15: zlen
+ * x16: tmp1
+ * x17: tmp2
+ * x7:  tmp3
+ * x28: tmp4
+ * x29: tmp5
+ * x30: tmp6
+ * x31: tmp7
+ */
+void MacroAssembler::multiply_to_len(Register x, Register xlen, Register y, Register ylen,
+                                     Register z, Register zlen,
+                                     Register tmp1, Register tmp2, Register tmp3, Register tmp4,
+                                     Register tmp5, Register tmp6, Register product_hi)
+{
+  assert_different_registers(x, xlen, y, ylen, z, zlen, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6);
+
+  const Register idx = tmp1;
+  const Register kdx = tmp2;
+  const Register xstart = tmp3;
+
+  const Register y_idx = tmp4;
+  const Register carry = tmp5;
+  const Register product = xlen;
+  const Register x_xstart = zlen; // reuse register
+
+  mv(idx, ylen); // idx = ylen;
+  mv(kdx, zlen); // kdx = xlen+ylen;
+  mv(carry, zr); // carry = 0;
+
+  Label L_multiply_64_x_64_loop, L_done;
+
+  subw(xstart, xlen, 1);
+  bltz(xstart, L_done);
+
+  const Register jdx = tmp1;
+
+  if (AvoidUnalignedAccesses) {
+    // Check if x and y are both 8-byte aligned.
+    orr(t0, xlen, ylen);
+    andi(t0, t0, 0x1);
+    beqz(t0, L_multiply_64_x_64_loop);
+
+    multiply_32_x_32_loop(x, xstart, x_xstart, y, y_idx, z, carry, product, idx, kdx);
+    shadd(t0, xstart, z, t0, LogBytesPerInt);
+    sw(carry, Address(t0, 0));
+
+    Label L_second_loop_unaligned;
+    bind(L_second_loop_unaligned);
+    mv(carry, zr);
+    mv(jdx, ylen);
+    subw(xstart, xstart, 1);
+    bltz(xstart, L_done);
+    sub(sp, sp, 2 * wordSize);
+    sd(z, Address(sp, 0));
+    sd(zr, Address(sp, wordSize));
+    shadd(t0, xstart, z, t0, LogBytesPerInt);
+    addi(z, t0, 4);
+    shadd(t0, xstart, x, t0, LogBytesPerInt);
+    lwu(product, Address(t0, 0));
+    Label L_third_loop, L_third_loop_exit;
+
+    blez(jdx, L_third_loop_exit);
+
+    bind(L_third_loop);
+    subw(jdx, jdx, 1);
+    shadd(t0, jdx, y, t0, LogBytesPerInt);
+    lwu(t0, Address(t0, 0));
+    mul(t1, t0, product);
+    add(t0, t1, carry);
+    shadd(tmp6, jdx, z, t1, LogBytesPerInt);
+    lwu(t1, Address(tmp6, 0));
+    add(t0, t0, t1);
+    sw(t0, Address(tmp6, 0));
+    srli(carry, t0, 32);
+    bgtz(jdx, L_third_loop);
+
+    bind(L_third_loop_exit);
+    ld(z, Address(sp, 0));
+    addi(sp, sp, 2 * wordSize);
+    shadd(t0, xstart, z, t0, LogBytesPerInt);
+    sw(carry, Address(t0, 0));
+
+    j(L_second_loop_unaligned);
+  }
+
+  bind(L_multiply_64_x_64_loop);
+  multiply_64_x_64_loop(x, xstart, x_xstart, y, y_idx, z, carry, product, idx, kdx);
+
+  Label L_second_loop_aligned;
+  beqz(kdx, L_second_loop_aligned);
+
+  Label L_carry;
+  subw(kdx, kdx, 1);
+  beqz(kdx, L_carry);
+
+  shadd(t0, kdx, z, t0, LogBytesPerInt);
+  sw(carry, Address(t0, 0));
+  srli(carry, carry, 32);
+  subw(kdx, kdx, 1);
+
+  bind(L_carry);
+  shadd(t0, kdx, z, t0, LogBytesPerInt);
+  sw(carry, Address(t0, 0));
+
+  // Second and third (nested) loops.
+  //
+  // for (int i = xstart-1; i >= 0; i--) { // Second loop
+  //   carry = 0;
+  //   for (int jdx=ystart, k=ystart+1+i; jdx >= 0; jdx--, k--) { // Third loop
+  //     long product = (y[jdx] & LONG_MASK) * (x[i] & LONG_MASK) +
+  //                    (z[k] & LONG_MASK) + carry;
+  //     z[k] = (int)product;
+  //     carry = product >>> 32;
+  //   }
+  //   z[i] = (int)carry;
+  // }
+  //
+  // i = xlen, j = tmp1, k = tmp2, carry = tmp5, x[i] = product_hi
+
+  bind(L_second_loop_aligned);
+  mv(carry, zr); // carry = 0;
+  mv(jdx, ylen); // j = ystart+1
+
+  subw(xstart, xstart, 1); // i = xstart-1;
+  bltz(xstart, L_done);
+
+  sub(sp, sp, 4 * wordSize);
+  sd(z, Address(sp, 0));
+
+  Label L_last_x;
+  shadd(t0, xstart, z, t0, LogBytesPerInt);
+  addi(z, t0, 4);
+  subw(xstart, xstart, 1); // i = xstart-1;
+  bltz(xstart, L_last_x);
+
+  shadd(t0, xstart, x, t0, LogBytesPerInt);
+  ld(product_hi, Address(t0, 0));
+  ror_imm(product_hi, product_hi, 32); // convert big-endian to little-endian
+
+  Label L_third_loop_prologue;
+  bind(L_third_loop_prologue);
+
+  sd(ylen, Address(sp, wordSize));
+  sd(x, Address(sp, 2 * wordSize));
+  sd(xstart, Address(sp, 3 * wordSize));
+  multiply_128_x_128_loop(y, z, carry, x, jdx, ylen, product,
+                          tmp2, x_xstart, tmp3, tmp4, tmp6, product_hi);
+  ld(z, Address(sp, 0));
+  ld(ylen, Address(sp, wordSize));
+  ld(x, Address(sp, 2 * wordSize));
+  ld(xlen, Address(sp, 3 * wordSize)); // copy old xstart -> xlen
+  addi(sp, sp, 4 * wordSize);
+
+  addiw(tmp3, xlen, 1);
+  shadd(t0, tmp3, z, t0, LogBytesPerInt);
+  sw(carry, Address(t0, 0));
+
+  subw(tmp3, tmp3, 1);
+  bltz(tmp3, L_done);
+
+  srli(carry, carry, 32);
+  shadd(t0, tmp3, z, t0, LogBytesPerInt);
+  sw(carry, Address(t0, 0));
+  j(L_second_loop_aligned);
+
+  // Next infrequent code is moved outside loops.
+  bind(L_last_x);
+  lwu(product_hi, Address(x, 0));
+  j(L_third_loop_prologue);
+
+  bind(L_done);
+}
+#endif
+
+// Count bits of trailing zero chars from lsb to msb until first non-zero element.
+// For LL case, one byte for one element, so shift 8 bits once, and for other case,
+// shift 16 bits once.
+void MacroAssembler::ctzc_bit(Register Rd, Register Rs, bool isLL, Register tmp1, Register tmp2)
+{
+  if (UseRVB) {
+    assert_different_registers(Rd, Rs, tmp1);
+    int step = isLL ? 8 : 16;
+    ctz(Rd, Rs);
+    andi(tmp1, Rd, step - 1);
+    sub(Rd, Rd, tmp1);
+    return;
+  }
+  assert_different_registers(Rd, Rs, tmp1, tmp2);
+  Label Loop;
+  int step = isLL ? 8 : 16;
+  li(Rd, -step);
+  mv(tmp2, Rs);
+
+  bind(Loop);
+  addi(Rd, Rd, step);
+  andi(tmp1, tmp2, ((1 << step) - 1));
+  srli(tmp2, tmp2, step);
+  beqz(tmp1, Loop);
+}
+
+// This instruction reads adjacent 4 bytes from the lower half of source register,
+// inflate into a register, for example:
+// Rs: A7A6A5A4A3A2A1A0
+// Rd: 00A300A200A100A0
+void MacroAssembler::inflate_lo32(Register Rd, Register Rs, Register tmp1, Register tmp2)
+{
+  assert_different_registers(Rd, Rs, tmp1, tmp2);
+  li(tmp1, 0xFF);
+  mv(Rd, zr);
+  for (int i = 0; i <= 3; i++)
+  {
+    andr(tmp2, Rs, tmp1);
+    if (i) {
+      slli(tmp2, tmp2, i * 8);
+    }
+    orr(Rd, Rd, tmp2);
+    if (i != 3) {
+      slli(tmp1, tmp1, 8);
+    }
+  }
+}
+
+// This instruction reads adjacent 4 bytes from the upper half of source register,
+// inflate into a register, for example:
+// Rs: A7A6A5A4A3A2A1A0
+// Rd: 00A700A600A500A4
+void MacroAssembler::inflate_hi32(Register Rd, Register Rs, Register tmp1, Register tmp2)
+{
+  assert_different_registers(Rd, Rs, tmp1, tmp2);
+  li(tmp1, 0xFF00000000);
+  mv(Rd, zr);
+  for (int i = 0; i <= 3; i++)
+  {
+    andr(tmp2, Rs, tmp1);
+    orr(Rd, Rd, tmp2);
+    srli(Rd, Rd, 8);
+    if (i != 3) {
+      slli(tmp1, tmp1, 8);
+    }
+  }
+}
+
+// The size of the blocks erased by the zero_blocks stub.  We must
+// handle anything smaller than this ourselves in zero_words().
+const int MacroAssembler::zero_words_block_size = 8;
+
+// zero_words() is used by C2 ClearArray patterns.  It is as small as
+// possible, handling small word counts locally and delegating
+// anything larger to the zero_blocks stub.  It is expanded many times
+// in compiled code, so it is important to keep it short.
+
+// ptr:   Address of a buffer to be zeroed.
+// cnt:   Count in HeapWords.
+//
+// ptr, cnt, and t0 are clobbered.
+address MacroAssembler::zero_words(Register ptr, Register cnt)
+{
+  assert(is_power_of_2(zero_words_block_size), "adjust this");
+  assert(ptr == x28 && cnt == x29, "mismatch in register usage");
+  assert_different_registers(cnt, t0);
+
+  BLOCK_COMMENT("zero_words {");
+  mv(t0, zero_words_block_size);
+  Label around, done, done16;
+  bltu(cnt, t0, around);
+  {
+    RuntimeAddress zero_blocks = RuntimeAddress(StubRoutines::riscv::zero_blocks());
+    assert(zero_blocks.target() != NULL, "zero_blocks stub has not been generated");
+    if (StubRoutines::riscv::complete()) {
+      address tpc = trampoline_call(zero_blocks);
+      if (tpc == NULL) {
+        DEBUG_ONLY(reset_labels(around));
+        postcond(pc() == badAddress);
+        return NULL;
+      }
+    } else {
+      jal(zero_blocks);
+    }
+  }
+  bind(around);
+  for (int i = zero_words_block_size >> 1; i > 1; i >>= 1) {
+    Label l;
+    andi(t0, cnt, i);
+    beqz(t0, l);
+    for (int j = 0; j < i; j++) {
+      sd(zr, Address(ptr, 0));
+      addi(ptr, ptr, 8);
+    }
+    bind(l);
+  }
+  {
+    Label l;
+    andi(t0, cnt, 1);
+    beqz(t0, l);
+    sd(zr, Address(ptr, 0));
+    bind(l);
+  }
+  BLOCK_COMMENT("} zero_words");
+  postcond(pc() != badAddress);
+  return pc();
+}
+
+#define SmallArraySize (18 * BytesPerLong)
+
+// base:  Address of a buffer to be zeroed, 8 bytes aligned.
+// cnt:   Immediate count in HeapWords.
+void MacroAssembler::zero_words(Register base, u_int64_t cnt)
+{
+  assert_different_registers(base, t0, t1);
+
+  BLOCK_COMMENT("zero_words {");
+
+  if (cnt <= SmallArraySize / BytesPerLong) {
+    for (int i = 0; i < (int)cnt; i++) {
+      sd(zr, Address(base, i * wordSize));
+    }
+  } else {
+    const int unroll = 8; // Number of sd(zr, adr), instructions we'll unroll
+    int remainder = cnt % unroll;
+    for (int i = 0; i < remainder; i++) {
+      sd(zr, Address(base, i * wordSize));
+    }
+
+    Label loop;
+    Register cnt_reg = t0;
+    Register loop_base = t1;
+    cnt = cnt - remainder;
+    li(cnt_reg, cnt);
+    add(loop_base, base, remainder * wordSize);
+    bind(loop);
+    sub(cnt_reg, cnt_reg, unroll);
+    for (int i = 0; i < unroll; i++) {
+      sd(zr, Address(loop_base, i * wordSize));
+    }
+    add(loop_base, loop_base, unroll * wordSize);
+    bnez(cnt_reg, loop);
+  }
+
+  BLOCK_COMMENT("} zero_words");
+}
+
+// base:   Address of a buffer to be filled, 8 bytes aligned.
+// cnt:    Count in 8-byte unit.
+// value:  Value to be filled with.
+// base will point to the end of the buffer after filling.
+void MacroAssembler::fill_words(Register base, Register cnt, Register value)
+{
+//  Algorithm:
+//
+//    t0 = cnt & 7
+//    cnt -= t0
+//    p += t0
+//    switch (t0):
+//      switch start:
+//      do while cnt
+//        cnt -= 8
+//          p[-8] = value
+//        case 7:
+//          p[-7] = value
+//        case 6:
+//          p[-6] = value
+//          // ...
+//        case 1:
+//          p[-1] = value
+//        case 0:
+//          p += 8
+//      do-while end
+//    switch end
+
+  assert_different_registers(base, cnt, value, t0, t1);
+
+  Label fini, skip, entry, loop;
+  const int unroll = 8; // Number of sd instructions we'll unroll
+
+  beqz(cnt, fini);
+
+  andi(t0, cnt, unroll - 1);
+  sub(cnt, cnt, t0);
+  // align 8, so first sd n % 8 = mod, next loop sd 8 * n.
+  shadd(base, t0, base, t1, 3);
+  la(t1, entry);
+  slli(t0, t0, 2); // sd_inst_nums * 4; t0 is cnt % 8, so t1 = t1 - sd_inst_nums * 4, 4 is sizeof(inst)
+  sub(t1, t1, t0);
+  jr(t1);
+
+  bind(loop);
+  add(base, base, unroll * 8);
+  for (int i = -unroll; i < 0; i++) {
+    sd(value, Address(base, i * 8));
+  }
+  bind(entry);
+  sub(cnt, cnt, unroll);
+  bgez(cnt, loop);
+
+  bind(fini);
+}
+
+#define FCVT_SAFE(FLOATCVT, FLOATEQ)                                                             \
+void MacroAssembler:: FLOATCVT##_safe(Register dst, FloatRegister src, Register tmp) {           \
+  Label L_Okay;                                                                                  \
+  fscsr(zr);                                                                                     \
+  FLOATCVT(dst, src);                                                                            \
+  frcsr(tmp);                                                                                    \
+  andi(tmp, tmp, 0x1E);                                                                          \
+  beqz(tmp, L_Okay);                                                                             \
+  FLOATEQ(tmp, src, src);                                                                        \
+  bnez(tmp, L_Okay);                                                                             \
+  mv(dst, zr);                                                                                   \
+  bind(L_Okay);                                                                                  \
+}
+
+FCVT_SAFE(fcvt_w_s, feq_s)
+FCVT_SAFE(fcvt_l_s, feq_s)
+FCVT_SAFE(fcvt_w_d, feq_d)
+FCVT_SAFE(fcvt_l_d, feq_d)
+
+#undef FCVT_SAFE
+
+#define FCMP(FLOATTYPE, FLOATSIG)                                                       \
+void MacroAssembler::FLOATTYPE##_compare(Register result, FloatRegister Rs1,            \
+                                         FloatRegister Rs2, int unordered_result) {     \
+  Label Ldone;                                                                          \
+  if (unordered_result < 0) {                                                           \
+    /* we want -1 for unordered or less than, 0 for equal and 1 for greater than. */    \
+    /* installs 1 if gt else 0 */                                                       \
+    flt_##FLOATSIG(result, Rs2, Rs1);                                                   \
+    /* Rs1 > Rs2, install 1 */                                                          \
+    bgtz(result, Ldone);                                                                \
+    feq_##FLOATSIG(result, Rs1, Rs2);                                                   \
+    addi(result, result, -1);                                                           \
+    /* Rs1 = Rs2, install 0 */                                                          \
+    /* NaN or Rs1 < Rs2, install -1 */                                                  \
+    bind(Ldone);                                                                        \
+  } else {                                                                              \
+    /* we want -1 for less than, 0 for equal and 1 for unordered or greater than. */    \
+    /* installs 1 if gt or unordered else 0 */                                          \
+    flt_##FLOATSIG(result, Rs1, Rs2);                                                   \
+    /* Rs1 < Rs2, install -1 */                                                         \
+    bgtz(result, Ldone);                                                                \
+    feq_##FLOATSIG(result, Rs1, Rs2);                                                   \
+    addi(result, result, -1);                                                           \
+    /* Rs1 = Rs2, install 0 */                                                          \
+    /* NaN or Rs1 > Rs2, install 1 */                                                   \
+    bind(Ldone);                                                                        \
+    neg(result, result);                                                                \
+  }                                                                                     \
+}
+
+FCMP(float, s);
+FCMP(double, d);
+
+#undef FCMP
+
+// Zero words; len is in bytes
+// Destroys all registers except addr
+// len must be a nonzero multiple of wordSize
+void MacroAssembler::zero_memory(Register addr, Register len, Register tmp) {
+  assert_different_registers(addr, len, tmp, t0, t1);
+
+#ifdef ASSERT
+  {
+    Label L;
+    andi(t0, len, BytesPerWord - 1);
+    beqz(t0, L);
+    stop("len is not a multiple of BytesPerWord");
+    bind(L);
+  }
+#endif // ASSERT
+
+#ifndef PRODUCT
+  block_comment("zero memory");
+#endif // PRODUCT
+
+  Label loop;
+  Label entry;
+
+  // Algorithm:
+  //
+  //  t0 = cnt & 7
+  //  cnt -= t0
+  //  p += t0
+  //  switch (t0) {
+  //    do {
+  //      cnt -= 8
+  //        p[-8] = 0
+  //      case 7:
+  //        p[-7] = 0
+  //      case 6:
+  //        p[-6] = 0
+  //        ...
+  //      case 1:
+  //        p[-1] = 0
+  //      case 0:
+  //        p += 8
+  //     } while (cnt)
+  //  }
+
+  const int unroll = 8;   // Number of sd(zr) instructions we'll unroll
+
+  srli(len, len, LogBytesPerWord);
+  andi(t0, len, unroll - 1);  // t0 = cnt % unroll
+  sub(len, len, t0);          // cnt -= unroll
+  // tmp always points to the end of the region we're about to zero
+  shadd(tmp, t0, addr, t1, LogBytesPerWord);
+  la(t1, entry);
+  slli(t0, t0, 2);
+  sub(t1, t1, t0);
+  jr(t1);
+  bind(loop);
+  sub(len, len, unroll);
+  for (int i = -unroll; i < 0; i++) {
+    Assembler::sd(zr, Address(tmp, i * wordSize));
+  }
+  bind(entry);
+  add(tmp, tmp, unroll * wordSize);
+  bnez(len, loop);
+}
+
+// shift left by shamt and add
+// Rd = (Rs1 << shamt) + Rs2
+void MacroAssembler::shadd(Register Rd, Register Rs1, Register Rs2, Register tmp, int shamt) {
+  if (UseRVB) {
+    if (shamt == 1) {
+      sh1add(Rd, Rs1, Rs2);
+      return;
+    } else if (shamt == 2) {
+      sh2add(Rd, Rs1, Rs2);
+      return;
+    } else if (shamt == 3) {
+      sh3add(Rd, Rs1, Rs2);
+      return;
+    }
+  }
+
+  if (shamt != 0) {
+    slli(tmp, Rs1, shamt);
+    add(Rd, Rs2, tmp);
+  } else {
+    add(Rd, Rs1, Rs2);
+  }
+}
+
+void MacroAssembler::zero_extend(Register dst, Register src, int bits) {
+  if (UseRVB) {
+    if (bits == 16) {
+      zext_h(dst, src);
+      return;
+    } else if (bits == 32) {
+      zext_w(dst, src);
+      return;
+    }
+  }
+
+  if (bits == 8) {
+    zext_b(dst, src);
+  } else {
+    slli(dst, src, XLEN - bits);
+    srli(dst, dst, XLEN - bits);
+  }
+}
+
+void MacroAssembler::sign_extend(Register dst, Register src, int bits) {
+  if (UseRVB) {
+    if (bits == 8) {
+      sext_b(dst, src);
+      return;
+    } else if (bits == 16) {
+      sext_h(dst, src);
+      return;
+    }
+  }
+
+  if (bits == 32) {
+    sext_w(dst, src);
+  } else {
+    slli(dst, src, XLEN - bits);
+    srai(dst, dst, XLEN - bits);
+  }
+}
+
+void MacroAssembler::cmp_l2i(Register dst, Register src1, Register src2, Register tmp)
+{
+  if (src1 == src2) {
+    mv(dst, zr);
+    return;
+  }
+  Label done;
+  Register left = src1;
+  Register right = src2;
+  if (dst == src1) {
+    assert_different_registers(dst, src2, tmp);
+    mv(tmp, src1);
+    left = tmp;
+  } else if (dst == src2) {
+    assert_different_registers(dst, src1, tmp);
+    mv(tmp, src2);
+    right = tmp;
+  }
+
+  // installs 1 if gt else 0
+  slt(dst, right, left);
+  bnez(dst, done);
+  slt(dst, left, right);
+  // dst = -1 if lt; else if eq , dst = 0
+  neg(dst, dst);
+  bind(done);
+}
+
+void MacroAssembler::safepoint_ifence() {
+  ifence();
+#ifndef PRODUCT
+  if (VerifyCrossModifyFence) {
+    // Clear the thread state.
+    sb(zr, Address(xthread, in_bytes(JavaThread::requires_cross_modify_fence_offset())));
+  }
+#endif
+}
+
+#ifndef PRODUCT
+void MacroAssembler::verify_cross_modify_fence_not_required() {
+  if (VerifyCrossModifyFence) {
+    // Check if thread needs a cross modify fence.
+    lbu(t0, Address(xthread, in_bytes(JavaThread::requires_cross_modify_fence_offset())));
+    Label fence_not_required;
+    beqz(t0, fence_not_required);
+    // If it does then fail.
+    la(t0, RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::verify_cross_modify_fence_failure)));
+    mv(c_rarg0, xthread);
+    jalr(t0);
+    bind(fence_not_required);
+  }
+}
+#endif
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
new file mode 100644
index 00000000000..23e09475be1
--- /dev/null
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -0,0 +1,858 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_MACROASSEMBLER_RISCV_HPP
+#define CPU_RISCV_MACROASSEMBLER_RISCV_HPP
+
+#include "asm/assembler.hpp"
+#include "metaprogramming/enableIf.hpp"
+#include "oops/compressedOops.hpp"
+#include "utilities/powerOfTwo.hpp"
+
+// MacroAssembler extends Assembler by frequently used macros.
+//
+// Instructions for which a 'better' code sequence exists depending
+// on arguments should also go in here.
+
+class MacroAssembler: public Assembler {
+
+ public:
+  MacroAssembler(CodeBuffer* code) : Assembler(code) {
+  }
+  virtual ~MacroAssembler() {}
+
+  void safepoint_poll(Label& slow_path, bool at_return, bool acquire, bool in_nmethod);
+
+  // Place a fence.i after code may have been modified due to a safepoint.
+  void safepoint_ifence();
+
+  // Alignment
+  void align(int modulus, int extra_offset = 0);
+
+  // Stack frame creation/removal
+  // Note that SP must be updated to the right place before saving/restoring RA and FP
+  // because signal based thread suspend/resume could happen asynchronously.
+  void enter() {
+    addi(sp, sp, - 2 * wordSize);
+    sd(ra, Address(sp, wordSize));
+    sd(fp, Address(sp));
+    addi(fp, sp, 2 * wordSize);
+  }
+
+  void leave() {
+    addi(sp, fp, - 2 * wordSize);
+    ld(fp, Address(sp));
+    ld(ra, Address(sp, wordSize));
+    addi(sp, sp, 2 * wordSize);
+  }
+
+
+  // Support for getting the JavaThread pointer (i.e.; a reference to thread-local information)
+  // The pointer will be loaded into the thread register.
+  void get_thread(Register thread);
+
+  // Support for VM calls
+  //
+  // It is imperative that all calls into the VM are handled via the call_VM macros.
+  // They make sure that the stack linkage is setup correctly. call_VM's correspond
+  // to ENTRY/ENTRY_X entry points while call_VM_leaf's correspond to LEAF entry points.
+
+  void call_VM(Register oop_result,
+               address entry_point,
+               bool check_exceptions = true);
+  void call_VM(Register oop_result,
+               address entry_point,
+               Register arg_1,
+               bool check_exceptions = true);
+  void call_VM(Register oop_result,
+               address entry_point,
+               Register arg_1, Register arg_2,
+               bool check_exceptions = true);
+  void call_VM(Register oop_result,
+               address entry_point,
+               Register arg_1, Register arg_2, Register arg_3,
+               bool check_exceptions = true);
+
+  // Overloadings with last_Java_sp
+  void call_VM(Register oop_result,
+               Register last_java_sp,
+               address entry_point,
+               int number_of_arguments = 0,
+               bool check_exceptions = true);
+  void call_VM(Register oop_result,
+               Register last_java_sp,
+               address entry_point,
+               Register arg_1,
+               bool check_exceptions = true);
+  void call_VM(Register oop_result,
+               Register last_java_sp,
+               address entry_point,
+               Register arg_1, Register arg_2,
+               bool check_exceptions = true);
+  void call_VM(Register oop_result,
+               Register last_java_sp,
+               address entry_point,
+               Register arg_1, Register arg_2, Register arg_3,
+               bool check_exceptions = true);
+
+  void get_vm_result(Register oop_result, Register java_thread);
+  void get_vm_result_2(Register metadata_result, Register java_thread);
+
+  // These always tightly bind to MacroAssembler::call_VM_leaf_base
+  // bypassing the virtual implementation
+  void call_VM_leaf(address entry_point,
+                    int number_of_arguments = 0);
+  void call_VM_leaf(address entry_point,
+                    Register arg_0);
+  void call_VM_leaf(address entry_point,
+                    Register arg_0, Register arg_1);
+  void call_VM_leaf(address entry_point,
+                    Register arg_0, Register arg_1, Register arg_2);
+
+  // These always tightly bind to MacroAssembler::call_VM_base
+  // bypassing the virtual implementation
+  void super_call_VM_leaf(address entry_point, Register arg_0);
+  void super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1);
+  void super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2);
+  void super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2, Register arg_3);
+
+  // last Java Frame (fills frame anchor)
+  void set_last_Java_frame(Register last_java_sp, Register last_java_fp, address last_java_pc, Register tmp);
+  void set_last_Java_frame(Register last_java_sp, Register last_java_fp, Label &last_java_pc, Register tmp);
+  void set_last_Java_frame(Register last_java_sp, Register last_java_fp, Register last_java_pc, Register tmp);
+
+  // thread in the default location (xthread)
+  void reset_last_Java_frame(bool clear_fp);
+
+  void call_native(address entry_point,
+                   Register arg_0);
+  void call_native_base(
+    address entry_point,                // the entry point
+    Label*  retaddr = NULL
+  );
+
+  virtual void call_VM_leaf_base(
+    address entry_point,                // the entry point
+    int     number_of_arguments,        // the number of arguments to pop after the call
+    Label*  retaddr = NULL
+  );
+
+  virtual void call_VM_leaf_base(
+    address entry_point,                // the entry point
+    int     number_of_arguments,        // the number of arguments to pop after the call
+    Label&  retaddr) {
+    call_VM_leaf_base(entry_point, number_of_arguments, &retaddr);
+  }
+
+  virtual void call_VM_base(           // returns the register containing the thread upon return
+    Register oop_result,               // where an oop-result ends up if any; use noreg otherwise
+    Register java_thread,              // the thread if computed before     ; use noreg otherwise
+    Register last_java_sp,             // to set up last_Java_frame in stubs; use noreg otherwise
+    address  entry_point,              // the entry point
+    int      number_of_arguments,      // the number of arguments (w/o thread) to pop after the call
+    bool     check_exceptions          // whether to check for pending exceptions after return
+  );
+
+  void call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions);
+
+  virtual void check_and_handle_earlyret(Register java_thread);
+  virtual void check_and_handle_popframe(Register java_thread);
+
+  void resolve_weak_handle(Register result, Register tmp);
+  void resolve_oop_handle(Register result, Register tmp = x15);
+  void resolve_jobject(Register value, Register thread, Register tmp);
+
+  void movoop(Register dst, jobject obj, bool immediate = false);
+  void mov_metadata(Register dst, Metadata* obj);
+  void bang_stack_size(Register size, Register tmp);
+  void set_narrow_oop(Register dst, jobject obj);
+  void set_narrow_klass(Register dst, Klass* k);
+
+  void load_mirror(Register dst, Register method, Register tmp = x15);
+  void access_load_at(BasicType type, DecoratorSet decorators, Register dst,
+                      Address src, Register tmp1, Register thread_tmp);
+  void access_store_at(BasicType type, DecoratorSet decorators, Address dst,
+                       Register src, Register tmp1, Register thread_tmp);
+  void load_klass(Register dst, Register src);
+  void store_klass(Register dst, Register src);
+  void cmp_klass(Register oop, Register trial_klass, Register tmp, Label &L);
+
+  void encode_klass_not_null(Register r);
+  void decode_klass_not_null(Register r);
+  void encode_klass_not_null(Register dst, Register src, Register tmp = xheapbase);
+  void decode_klass_not_null(Register dst, Register src, Register tmp = xheapbase);
+  void decode_heap_oop_not_null(Register r);
+  void decode_heap_oop_not_null(Register dst, Register src);
+  void decode_heap_oop(Register d, Register s);
+  void decode_heap_oop(Register r) { decode_heap_oop(r, r); }
+  void encode_heap_oop(Register d, Register s);
+  void encode_heap_oop(Register r) { encode_heap_oop(r, r); };
+  void load_heap_oop(Register dst, Address src, Register tmp1 = noreg,
+                     Register thread_tmp = noreg, DecoratorSet decorators = 0);
+  void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg,
+                              Register thread_tmp = noreg, DecoratorSet decorators = 0);
+  void store_heap_oop(Address dst, Register src, Register tmp1 = noreg,
+                      Register thread_tmp = noreg, DecoratorSet decorators = 0);
+
+  void store_klass_gap(Register dst, Register src);
+
+  // currently unimplemented
+  // Used for storing NULL. All other oop constants should be
+  // stored using routines that take a jobject.
+  void store_heap_oop_null(Address dst);
+
+  // This dummy is to prevent a call to store_heap_oop from
+  // converting a zero (linke NULL) into a Register by giving
+  // the compiler two choices it can't resolve
+
+  void store_heap_oop(Address dst, void* dummy);
+
+  // Support for NULL-checks
+  //
+  // Generates code that causes a NULL OS exception if the content of reg is NULL.
+  // If the accessed location is M[reg + offset] and the offset is known, provide the
+  // offset. No explicit code generateion is needed if the offset is within a certain
+  // range (0 <= offset <= page_size).
+
+  virtual void null_check(Register reg, int offset = -1);
+  static bool needs_explicit_null_check(intptr_t offset);
+  static bool uses_implicit_null_check(void* address);
+
+  // idiv variant which deals with MINLONG as dividend and -1 as divisor
+  int corrected_idivl(Register result, Register rs1, Register rs2,
+                      bool want_remainder);
+  int corrected_idivq(Register result, Register rs1, Register rs2,
+                      bool want_remainder);
+
+  // interface method calling
+  void lookup_interface_method(Register recv_klass,
+                               Register intf_klass,
+                               RegisterOrConstant itable_index,
+                               Register method_result,
+                               Register scan_tmp,
+                               Label& no_such_interface,
+                               bool return_method = true);
+
+  // virtual method calling
+  // n.n. x86 allows RegisterOrConstant for vtable_index
+  void lookup_virtual_method(Register recv_klass,
+                             RegisterOrConstant vtable_index,
+                             Register method_result);
+
+  // Form an addres from base + offset in Rd. Rd my or may not
+  // actually be used: you must use the Address that is returned. It
+  // is up to you to ensure that the shift provided mathces the size
+  // of your data.
+  Address form_address(Register Rd, Register base, long byte_offset);
+
+  // allocation
+  void tlab_allocate(
+    Register obj,                   // result: pointer to object after successful allocation
+    Register var_size_in_bytes,     // object size in bytes if unknown at compile time; invalid otherwise
+    int      con_size_in_bytes,     // object size in bytes if   known at compile time
+    Register tmp1,                  // temp register
+    Register tmp2,                  // temp register
+    Label&   slow_case,             // continuation point of fast allocation fails
+    bool is_far = false
+  );
+
+  void eden_allocate(
+    Register obj,                   // result: pointer to object after successful allocation
+    Register var_size_in_bytes,     // object size in bytes if unknown at compile time; invalid otherwise
+    int      con_size_in_bytes,     // object size in bytes if   known at compile time
+    Register tmp,                   // temp register
+    Label&   slow_case,             // continuation point if fast allocation fails
+    bool is_far = false
+  );
+
+  // Test sub_klass against super_klass, with fast and slow paths.
+
+  // The fast path produces a tri-state answer: yes / no / maybe-slow.
+  // One of the three labels can be NULL, meaning take the fall-through.
+  // If super_check_offset is -1, the value is loaded up from super_klass.
+  // No registers are killed, except tmp_reg
+  void check_klass_subtype_fast_path(Register sub_klass,
+                                     Register super_klass,
+                                     Register tmp_reg,
+                                     Label* L_success,
+                                     Label* L_failure,
+                                     Label* L_slow_path,
+                                     Register super_check_offset = noreg);
+
+  // The reset of the type cehck; must be wired to a corresponding fast path.
+  // It does not repeat the fast path logic, so don't use it standalone.
+  // The tmp1_reg and tmp2_reg can be noreg, if no temps are avaliable.
+  // Updates the sub's secondary super cache as necessary.
+  void check_klass_subtype_slow_path(Register sub_klass,
+                                     Register super_klass,
+                                     Register tmp1_reg,
+                                     Register tmp2_reg,
+                                     Label* L_success,
+                                     Label* L_failure);
+
+  void check_klass_subtype(Register sub_klass,
+                           Register super_klass,
+                           Register tmp_reg,
+                           Label& L_success);
+
+  Address argument_address(RegisterOrConstant arg_slot, int extra_slot_offset = 0);
+
+  // only if +VerifyOops
+  void verify_oop(Register reg, const char* s = "broken oop");
+  void verify_oop_addr(Address addr, const char* s = "broken oop addr");
+
+  void _verify_method_ptr(Register reg, const char* msg, const char* file, int line) {}
+  void _verify_klass_ptr(Register reg, const char* msg, const char* file, int line) {}
+
+#define verify_method_ptr(reg) _verify_method_ptr(reg, "broken method " #reg, __FILE__, __LINE__)
+#define verify_klass_ptr(reg) _verify_method_ptr(reg, "broken klass " #reg, __FILE__, __LINE__)
+
+  // A more convenient access to fence for our purposes
+  // We used four bit to indicate the read and write bits in the predecessors and successors,
+  // and extended i for r, o for w if UseConservativeFence enabled.
+  enum Membar_mask_bits {
+    StoreStore = 0b0101,               // (pred = ow   + succ =   ow)
+    LoadStore  = 0b1001,               // (pred = ir   + succ =   ow)
+    StoreLoad  = 0b0110,               // (pred = ow   + succ =   ir)
+    LoadLoad   = 0b1010,               // (pred = ir   + succ =   ir)
+    AnyAny     = LoadStore | StoreLoad // (pred = iorw + succ = iorw)
+  };
+
+  void membar(uint32_t order_constraint);
+
+  static void membar_mask_to_pred_succ(uint32_t order_constraint, uint32_t& predecessor, uint32_t& successor) {
+    predecessor = (order_constraint >> 2) & 0x3;
+    successor = order_constraint & 0x3;
+
+    // extend rw -> iorw:
+    // 01(w) -> 0101(ow)
+    // 10(r) -> 1010(ir)
+    // 11(rw)-> 1111(iorw)
+    if (UseConservativeFence) {
+      predecessor |= predecessor << 2;
+      successor |= successor << 2;
+    }
+  }
+
+  static int pred_succ_to_membar_mask(uint32_t predecessor, uint32_t successor) {
+    return ((predecessor & 0x3) << 2) | (successor & 0x3);
+  }
+
+  // prints msg, dumps registers and stops execution
+  void stop(const char* msg);
+
+  static void debug64(char* msg, int64_t pc, int64_t regs[]);
+
+  void unimplemented(const char* what = "");
+
+  void should_not_reach_here() { stop("should not reach here"); }
+
+  static address target_addr_for_insn(address insn_addr);
+
+  // Required platform-specific helpers for Label::patch_instructions.
+  // They _shadow_ the declarations in AbstractAssembler, which are undefined.
+  static int pd_patch_instruction_size(address branch, address target);
+  static void pd_patch_instruction(address branch, address target, const char* file = NULL, int line = 0) {
+    pd_patch_instruction_size(branch, target);
+  }
+  static address pd_call_destination(address branch) {
+    return target_addr_for_insn(branch);
+  }
+
+  static int patch_oop(address insn_addr, address o);
+  address emit_trampoline_stub(int insts_call_instruction_offset, address target);
+  void emit_static_call_stub();
+
+  // The following 4 methods return the offset of the appropriate move instruction
+
+  // Support for fast byte/short loading with zero extension (depending on particular CPU)
+  int load_unsigned_byte(Register dst, Address src);
+  int load_unsigned_short(Register dst, Address src);
+
+  // Support for fast byte/short loading with sign extension (depending on particular CPU)
+  int load_signed_byte(Register dst, Address src);
+  int load_signed_short(Register dst, Address src);
+
+  // Load and store values by size and signed-ness
+  void load_sized_value(Register dst, Address src, size_t size_in_bytes, bool is_signed, Register dst2 = noreg);
+  void store_sized_value(Address dst, Register src, size_t size_in_bytes, Register src2 = noreg);
+
+ public:
+  // Standard pseudoinstruction
+  void nop();
+  void mv(Register Rd, Register Rs);
+  void notr(Register Rd, Register Rs);
+  void neg(Register Rd, Register Rs);
+  void negw(Register Rd, Register Rs);
+  void sext_w(Register Rd, Register Rs);
+  void zext_b(Register Rd, Register Rs);
+  void seqz(Register Rd, Register Rs);          // set if = zero
+  void snez(Register Rd, Register Rs);          // set if != zero
+  void sltz(Register Rd, Register Rs);          // set if < zero
+  void sgtz(Register Rd, Register Rs);          // set if > zero
+
+  // Float pseudoinstruction
+  void fmv_s(FloatRegister Rd, FloatRegister Rs);
+  void fabs_s(FloatRegister Rd, FloatRegister Rs);    // single-precision absolute value
+  void fneg_s(FloatRegister Rd, FloatRegister Rs);
+
+  // Double pseudoinstruction
+  void fmv_d(FloatRegister Rd, FloatRegister Rs);
+  void fabs_d(FloatRegister Rd, FloatRegister Rs);
+  void fneg_d(FloatRegister Rd, FloatRegister Rs);
+
+  // Pseudoinstruction for control and status register
+  void rdinstret(Register Rd);                  // read instruction-retired counter
+  void rdcycle(Register Rd);                    // read cycle counter
+  void rdtime(Register Rd);                     // read time
+  void csrr(Register Rd, unsigned csr);         // read csr
+  void csrw(unsigned csr, Register Rs);         // write csr
+  void csrs(unsigned csr, Register Rs);         // set bits in csr
+  void csrc(unsigned csr, Register Rs);         // clear bits in csr
+  void csrwi(unsigned csr, unsigned imm);
+  void csrsi(unsigned csr, unsigned imm);
+  void csrci(unsigned csr, unsigned imm);
+  void frcsr(Register Rd);                      // read float-point csr
+  void fscsr(Register Rd, Register Rs);         // swap float-point csr
+  void fscsr(Register Rs);                      // write float-point csr
+  void frrm(Register Rd);                       // read float-point rounding mode
+  void fsrm(Register Rd, Register Rs);          // swap float-point rounding mode
+  void fsrm(Register Rs);                       // write float-point rounding mode
+  void fsrmi(Register Rd, unsigned imm);
+  void fsrmi(unsigned imm);
+  void frflags(Register Rd);                    // read float-point exception flags
+  void fsflags(Register Rd, Register Rs);       // swap float-point exception flags
+  void fsflags(Register Rs);                    // write float-point exception flags
+  void fsflagsi(Register Rd, unsigned imm);
+  void fsflagsi(unsigned imm);
+
+  void beqz(Register Rs, const address &dest);
+  void bnez(Register Rs, const address &dest);
+  void blez(Register Rs, const address &dest);
+  void bgez(Register Rs, const address &dest);
+  void bltz(Register Rs, const address &dest);
+  void bgtz(Register Rs, const address &dest);
+  void la(Register Rd, Label &label);
+  void la(Register Rd, const address &dest);
+  void la(Register Rd, const Address &adr);
+  //label
+  void beqz(Register Rs, Label &l, bool is_far = false);
+  void bnez(Register Rs, Label &l, bool is_far = false);
+  void blez(Register Rs, Label &l, bool is_far = false);
+  void bgez(Register Rs, Label &l, bool is_far = false);
+  void bltz(Register Rs, Label &l, bool is_far = false);
+  void bgtz(Register Rs, Label &l, bool is_far = false);
+  void float_beq(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void float_bne(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void float_ble(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void float_bge(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void float_blt(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void float_bgt(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void double_beq(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void double_bne(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void double_ble(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void double_bge(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void double_blt(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+  void double_bgt(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
+
+  void push_reg(RegSet regs, Register stack) { if (regs.bits()) { push_reg(regs.bits(), stack); } }
+  void pop_reg(RegSet regs, Register stack) { if (regs.bits()) { pop_reg(regs.bits(), stack); } }
+  void push_reg(Register Rs);
+  void pop_reg(Register Rd);
+  int  push_reg(unsigned int bitset, Register stack);
+  int  pop_reg(unsigned int bitset, Register stack);
+  void push_fp(FloatRegSet regs, Register stack) { if (regs.bits()) push_fp(regs.bits(), stack); }
+  void pop_fp(FloatRegSet regs, Register stack) { if (regs.bits()) pop_fp(regs.bits(), stack); }
+#ifdef COMPILER2
+  void push_vp(VectorRegSet regs, Register stack) { if (regs.bits()) push_vp(regs.bits(), stack); }
+  void pop_vp(VectorRegSet regs, Register stack) { if (regs.bits()) pop_vp(regs.bits(), stack); }
+#endif // COMPILER2
+
+  // Push and pop everything that might be clobbered by a native
+  // runtime call except t0 and t1. (They are always
+  // temporary registers, so we don't have to protect them.)
+  // Additional registers can be excluded in a passed RegSet.
+  void push_call_clobbered_registers_except(RegSet exclude);
+  void pop_call_clobbered_registers_except(RegSet exclude);
+
+  void push_call_clobbered_registers() {
+    push_call_clobbered_registers_except(RegSet());
+  }
+  void pop_call_clobbered_registers() {
+    pop_call_clobbered_registers_except(RegSet());
+  }
+
+  void pusha();
+  void popa();
+  void push_CPU_state(bool save_vectors = false, int vector_size_in_bytes = 0);
+  void pop_CPU_state(bool restore_vectors = false, int vector_size_in_bytes = 0);
+
+  // if heap base register is used - reinit it with the correct value
+  void reinit_heapbase();
+
+  void bind(Label& L) {
+    Assembler::bind(L);
+    // fences across basic blocks should not be merged
+    code()->clear_last_insn();
+  }
+
+  // mv
+  template<typename T, ENABLE_IF(std::is_integral<T>::value)>
+  inline void mv(Register Rd, T o) {
+    li(Rd, (int64_t)o);
+  }
+
+  inline void mvw(Register Rd, int32_t imm32) { mv(Rd, imm32); }
+
+  void mv(Register Rd, Address dest);
+  void mv(Register Rd, address addr);
+  void mv(Register Rd, RegisterOrConstant src);
+
+  // logic
+  void andrw(Register Rd, Register Rs1, Register Rs2);
+  void orrw(Register Rd, Register Rs1, Register Rs2);
+  void xorrw(Register Rd, Register Rs1, Register Rs2);
+
+  // revb
+  void revb_h_h(Register Rd, Register Rs, Register tmp = t0);                           // reverse bytes in halfword in lower 16 bits, sign-extend
+  void revb_w_w(Register Rd, Register Rs, Register tmp1 = t0, Register tmp2 = t1);      // reverse bytes in lower word, sign-extend
+  void revb_h_h_u(Register Rd, Register Rs, Register tmp = t0);                         // reverse bytes in halfword in lower 16 bits, zero-extend
+  void revb_h_w_u(Register Rd, Register Rs, Register tmp1 = t0, Register tmp2 = t1);    // reverse bytes in halfwords in lower 32 bits, zero-extend
+  void revb_h_helper(Register Rd, Register Rs, Register tmp1 = t0, Register tmp2= t1);  // reverse bytes in upper 16 bits (48:63) and move to lower
+  void revb_h(Register Rd, Register Rs, Register tmp1 = t0, Register tmp2= t1);         // reverse bytes in each halfword
+  void revb_w(Register Rd, Register Rs, Register tmp1 = t0, Register tmp2= t1);         // reverse bytes in each word
+  void revb(Register Rd, Register Rs, Register tmp1 = t0, Register tmp2 = t1);          // reverse bytes in doubleword
+
+  void ror_imm(Register dst, Register src, uint32_t shift, Register tmp = t0);
+  void andi(Register Rd, Register Rn, int64_t imm, Register tmp = t0);
+  void orptr(Address adr, RegisterOrConstant src, Register tmp1 = t0, Register tmp2 = t1);
+
+  void cmpxchg_obj_header(Register oldv, Register newv, Register obj, Register tmp, Label &succeed, Label *fail);
+  void cmpxchgptr(Register oldv, Register newv, Register addr, Register tmp, Label &succeed, Label *fail);
+  void cmpxchg(Register addr, Register expected,
+               Register new_val,
+               enum operand_size size,
+               Assembler::Aqrl acquire, Assembler::Aqrl release,
+               Register result, bool result_as_bool = false);
+  void cmpxchg_weak(Register addr, Register expected,
+                    Register new_val,
+                    enum operand_size size,
+                    Assembler::Aqrl acquire, Assembler::Aqrl release,
+                    Register result);
+  void cmpxchg_narrow_value_helper(Register addr, Register expected,
+                                   Register new_val,
+                                   enum operand_size size,
+                                   Register tmp1, Register tmp2, Register tmp3);
+  void cmpxchg_narrow_value(Register addr, Register expected,
+                            Register new_val,
+                            enum operand_size size,
+                            Assembler::Aqrl acquire, Assembler::Aqrl release,
+                            Register result, bool result_as_bool,
+                            Register tmp1, Register tmp2, Register tmp3);
+  void weak_cmpxchg_narrow_value(Register addr, Register expected,
+                                 Register new_val,
+                                 enum operand_size size,
+                                 Assembler::Aqrl acquire, Assembler::Aqrl release,
+                                 Register result,
+                                 Register tmp1, Register tmp2, Register tmp3);
+
+  void atomic_add(Register prev, RegisterOrConstant incr, Register addr);
+  void atomic_addw(Register prev, RegisterOrConstant incr, Register addr);
+  void atomic_addal(Register prev, RegisterOrConstant incr, Register addr);
+  void atomic_addalw(Register prev, RegisterOrConstant incr, Register addr);
+
+  void atomic_xchg(Register prev, Register newv, Register addr);
+  void atomic_xchgw(Register prev, Register newv, Register addr);
+  void atomic_xchgal(Register prev, Register newv, Register addr);
+  void atomic_xchgalw(Register prev, Register newv, Register addr);
+  void atomic_xchgwu(Register prev, Register newv, Register addr);
+  void atomic_xchgalwu(Register prev, Register newv, Register addr);
+
+  static bool far_branches() {
+    return ReservedCodeCacheSize > branch_range;
+  }
+
+  // Jumps that can reach anywhere in the code cache.
+  // Trashes tmp.
+  void far_call(Address entry, CodeBuffer *cbuf = NULL, Register tmp = t0);
+  void far_jump(Address entry, CodeBuffer *cbuf = NULL, Register tmp = t0);
+
+  static int far_branch_size() {
+    if (far_branches()) {
+      return 2 * 4;  // auipc + jalr, see far_call() & far_jump()
+    } else {
+      return 4;
+    }
+  }
+
+  void load_byte_map_base(Register reg);
+
+  void bang_stack_with_offset(int offset) {
+    // stack grows down, caller passes positive offset
+    assert(offset > 0, "must bang with negative offset");
+    sub(t0, sp, offset);
+    sd(zr, Address(t0));
+  }
+
+  void la_patchable(Register reg1, const Address &dest, int32_t &offset);
+
+  virtual void _call_Unimplemented(address call_site) {
+    mv(t1, call_site);
+  }
+
+  #define call_Unimplemented() _call_Unimplemented((address)__PRETTY_FUNCTION__)
+
+  // Frame creation and destruction shared between JITs.
+  void build_frame(int framesize);
+  void remove_frame(int framesize);
+
+  void reserved_stack_check();
+
+  void get_polling_page(Register dest, relocInfo::relocType rtype);
+  address read_polling_page(Register r, int32_t offset, relocInfo::relocType rtype);
+
+  address trampoline_call(Address entry, CodeBuffer* cbuf = NULL);
+  address ic_call(address entry, jint method_index = 0);
+
+  void add_memory_int64(const Address dst, int64_t imm);
+  void add_memory_int32(const Address dst, int32_t imm);
+
+  void cmpptr(Register src1, Address src2, Label& equal);
+
+  void clinit_barrier(Register klass, Register tmp, Label* L_fast_path = NULL, Label* L_slow_path = NULL);
+  void load_method_holder_cld(Register result, Register method);
+  void load_method_holder(Register holder, Register method);
+
+  void compute_index(Register str1, Register trailing_zeros, Register match_mask,
+                     Register result, Register char_tmp, Register tmp,
+                     bool haystack_isL);
+  void compute_match_mask(Register src, Register pattern, Register match_mask,
+                          Register mask1, Register mask2);
+
+#ifdef COMPILER2
+  void mul_add(Register out, Register in, Register offset,
+               Register len, Register k, Register tmp);
+  void cad(Register dst, Register src1, Register src2, Register carry);
+  void cadc(Register dst, Register src1, Register src2, Register carry);
+  void adc(Register dst, Register src1, Register src2, Register carry);
+  void add2_with_carry(Register final_dest_hi, Register dest_hi, Register dest_lo,
+                       Register src1, Register src2, Register carry);
+  void multiply_32_x_32_loop(Register x, Register xstart, Register x_xstart,
+                             Register y, Register y_idx, Register z,
+                             Register carry, Register product,
+                             Register idx, Register kdx);
+  void multiply_64_x_64_loop(Register x, Register xstart, Register x_xstart,
+                             Register y, Register y_idx, Register z,
+                             Register carry, Register product,
+                             Register idx, Register kdx);
+  void multiply_128_x_128_loop(Register y, Register z,
+                               Register carry, Register carry2,
+                               Register idx, Register jdx,
+                               Register yz_idx1, Register yz_idx2,
+                               Register tmp, Register tmp3, Register tmp4,
+                               Register tmp6, Register product_hi);
+  void multiply_to_len(Register x, Register xlen, Register y, Register ylen,
+                       Register z, Register zlen,
+                       Register tmp1, Register tmp2, Register tmp3, Register tmp4,
+                       Register tmp5, Register tmp6, Register product_hi);
+#endif
+
+  void inflate_lo32(Register Rd, Register Rs, Register tmp1 = t0, Register tmp2 = t1);
+  void inflate_hi32(Register Rd, Register Rs, Register tmp1 = t0, Register tmp2 = t1);
+
+  void ctzc_bit(Register Rd, Register Rs, bool isLL = false, Register tmp1 = t0, Register tmp2 = t1);
+
+  void zero_words(Register base, u_int64_t cnt);
+  address zero_words(Register ptr, Register cnt);
+  void fill_words(Register base, Register cnt, Register value);
+  void zero_memory(Register addr, Register len, Register tmp);
+
+  // shift left by shamt and add
+  void shadd(Register Rd, Register Rs1, Register Rs2, Register tmp, int shamt);
+
+  // Here the float instructions with safe deal with some exceptions.
+  // e.g. convert from NaN, +Inf, -Inf to int, float, double
+  // will trigger exception, we need to deal with these situations
+  // to get correct results.
+  void fcvt_w_s_safe(Register dst, FloatRegister src, Register tmp = t0);
+  void fcvt_l_s_safe(Register dst, FloatRegister src, Register tmp = t0);
+  void fcvt_w_d_safe(Register dst, FloatRegister src, Register tmp = t0);
+  void fcvt_l_d_safe(Register dst, FloatRegister src, Register tmp = t0);
+
+  // vector load/store unit-stride instructions
+  void vlex_v(VectorRegister vd, Register base, Assembler::SEW sew, VectorMask vm = unmasked) {
+    switch (sew) {
+      case Assembler::e64:
+        vle64_v(vd, base, vm);
+        break;
+      case Assembler::e32:
+        vle32_v(vd, base, vm);
+        break;
+      case Assembler::e16:
+        vle16_v(vd, base, vm);
+        break;
+      case Assembler::e8: // fall through
+      default:
+        vle8_v(vd, base, vm);
+        break;
+    }
+  }
+
+  void vsex_v(VectorRegister store_data, Register base, Assembler::SEW sew, VectorMask vm = unmasked) {
+    switch (sew) {
+      case Assembler::e64:
+        vse64_v(store_data, base, vm);
+        break;
+      case Assembler::e32:
+        vse32_v(store_data, base, vm);
+        break;
+      case Assembler::e16:
+        vse16_v(store_data, base, vm);
+        break;
+      case Assembler::e8: // fall through
+      default:
+        vse8_v(store_data, base, vm);
+        break;
+    }
+  }
+
+  static const int zero_words_block_size;
+
+  void cast_primitive_type(BasicType type, Register Rt) {
+    switch (type) {
+      case T_BOOLEAN:
+        sltu(Rt, zr, Rt);
+        break;
+      case T_CHAR   :
+        zero_extend(Rt, Rt, 16);
+        break;
+      case T_BYTE   :
+        sign_extend(Rt, Rt, 8);
+        break;
+      case T_SHORT  :
+        sign_extend(Rt, Rt, 16);
+        break;
+      case T_INT    :
+        addw(Rt, Rt, zr);
+        break;
+      case T_LONG   : /* nothing to do */        break;
+      case T_VOID   : /* nothing to do */        break;
+      case T_FLOAT  : /* nothing to do */        break;
+      case T_DOUBLE : /* nothing to do */        break;
+      default: ShouldNotReachHere();
+    }
+  }
+
+  // float cmp with unordered_result
+  void float_compare(Register result, FloatRegister Rs1, FloatRegister Rs2, int unordered_result);
+  void double_compare(Register result, FloatRegister Rs1, FloatRegister Rs2, int unordered_result);
+
+  // Zero/Sign-extend
+  void zero_extend(Register dst, Register src, int bits);
+  void sign_extend(Register dst, Register src, int bits);
+
+  // compare src1 and src2 and get -1/0/1 in dst.
+  // if [src1 > src2], dst = 1;
+  // if [src1 == src2], dst = 0;
+  // if [src1 < src2], dst = -1;
+  void cmp_l2i(Register dst, Register src1, Register src2, Register tmp = t0);
+
+  int push_fp(unsigned int bitset, Register stack);
+  int pop_fp(unsigned int bitset, Register stack);
+
+  int push_vp(unsigned int bitset, Register stack);
+  int pop_vp(unsigned int bitset, Register stack);
+
+  // vext
+  void vmnot_m(VectorRegister vd, VectorRegister vs);
+  void vncvt_x_x_w(VectorRegister vd, VectorRegister vs, VectorMask vm = unmasked);
+  void vfneg_v(VectorRegister vd, VectorRegister vs);
+
+private:
+
+#ifdef ASSERT
+  // Template short-hand support to clean-up after a failed call to trampoline
+  // call generation (see trampoline_call() below), when a set of Labels must
+  // be reset (before returning).
+  template<typename Label, typename... More>
+  void reset_labels(Label& lbl, More&... more) {
+    lbl.reset(); reset_labels(more...);
+  }
+  template<typename Label>
+  void reset_labels(Label& lbl) {
+    lbl.reset();
+  }
+#endif
+  void repne_scan(Register addr, Register value, Register count, Register tmp);
+
+  // Return true if an address is within the 48-bit RISCV64 address space.
+  bool is_valid_riscv64_address(address addr) {
+    return ((uintptr_t)addr >> 48) == 0;
+  }
+
+  void ld_constant(Register dest, const Address &const_addr) {
+    if (NearCpool) {
+      ld(dest, const_addr);
+    } else {
+      int32_t offset = 0;
+      la_patchable(dest, InternalAddress(const_addr.target()), offset);
+      ld(dest, Address(dest, offset));
+    }
+  }
+
+  int bitset_to_regs(unsigned int bitset, unsigned char* regs);
+  Address add_memory_helper(const Address dst);
+
+  void load_reserved(Register addr, enum operand_size size, Assembler::Aqrl acquire);
+  void store_conditional(Register addr, Register new_val, enum operand_size size, Assembler::Aqrl release);
+
+  // Check the current thread doesn't need a cross modify fence.
+  void verify_cross_modify_fence_not_required() PRODUCT_RETURN;
+};
+
+#ifdef ASSERT
+inline bool AbstractAssembler::pd_check_instruction_mark() { return false; }
+#endif
+
+/**
+ * class SkipIfEqual:
+ *
+ * Instantiating this class will result in assembly code being output that will
+ * jump around any code emitted between the creation of the instance and it's
+ * automatic destruction at the end of a scope block, depending on the value of
+ * the flag passed to the constructor, which will be checked at run-time.
+ */
+class SkipIfEqual {
+ private:
+  MacroAssembler* _masm;
+  Label _label;
+
+ public:
+   SkipIfEqual(MacroAssembler*, const bool* flag_addr, bool value);
+   ~SkipIfEqual();
+};
+
+#endif // CPU_RISCV_MACROASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.inline.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.inline.hpp
new file mode 100644
index 00000000000..ef968ccd96d
--- /dev/null
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.inline.hpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_MACROASSEMBLER_RISCV_INLINE_HPP
+#define CPU_RISCV_MACROASSEMBLER_RISCV_INLINE_HPP
+
+// Still empty.
+
+#endif // CPU_RISCV_MACROASSEMBLER_RISCV_INLINE_HPP
diff --git a/src/hotspot/cpu/riscv/matcher_riscv.hpp b/src/hotspot/cpu/riscv/matcher_riscv.hpp
new file mode 100644
index 00000000000..23a75d20502
--- /dev/null
+++ b/src/hotspot/cpu/riscv/matcher_riscv.hpp
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_MATCHER_RISCV_HPP
+#define CPU_RISCV_MATCHER_RISCV_HPP
+
+  // Defined within class Matcher
+
+  // false => size gets scaled to BytesPerLong, ok.
+  static const bool init_array_count_is_in_bytes = false;
+
+  // Whether this platform implements the scalable vector feature
+  static const bool implements_scalable_vector = true;
+
+  static const bool supports_scalable_vector() {
+    return UseRVV;
+  }
+
+  // riscv supports misaligned vectors store/load.
+  static constexpr bool misaligned_vectors_ok() {
+    return true;
+  }
+
+  // Whether code generation need accurate ConvI2L types.
+  static const bool convi2l_type_required = false;
+
+  // Does the CPU require late expand (see block.cpp for description of late expand)?
+  static const bool require_postalloc_expand = false;
+
+  // Do we need to mask the count passed to shift instructions or does
+  // the cpu only look at the lower 5/6 bits anyway?
+  static const bool need_masked_shift_count = false;
+
+  // No support for generic vector operands.
+  static const bool supports_generic_vector_operands = false;
+
+  static constexpr bool isSimpleConstant64(jlong value) {
+    // Will one (StoreL ConL) be cheaper than two (StoreI ConI)?.
+    // Probably always true, even if a temp register is required.
+    return true;
+  }
+
+  // Use conditional move (CMOVL)
+  static constexpr int long_cmove_cost() {
+    // long cmoves are no more expensive than int cmoves
+    return 0;
+  }
+
+  static constexpr int float_cmove_cost() {
+    // float cmoves are no more expensive than int cmoves
+    return 0;
+  }
+
+  // This affects two different things:
+  //  - how Decode nodes are matched
+  //  - how ImplicitNullCheck opportunities are recognized
+  // If true, the matcher will try to remove all Decodes and match them
+  // (as operands) into nodes. NullChecks are not prepared to deal with
+  // Decodes by final_graph_reshaping().
+  // If false, final_graph_reshaping() forces the decode behind the Cmp
+  // for a NullCheck. The matcher matches the Decode node into a register.
+  // Implicit_null_check optimization moves the Decode along with the
+  // memory operation back up before the NullCheck.
+  static bool narrow_oop_use_complex_address() {
+    return CompressedOops::shift() == 0;
+  }
+
+  static bool narrow_klass_use_complex_address() {
+    return false;
+  }
+
+  static bool const_oop_prefer_decode() {
+    // Prefer ConN+DecodeN over ConP in simple compressed oops mode.
+    return CompressedOops::base() == NULL;
+  }
+
+  static bool const_klass_prefer_decode() {
+    // Prefer ConNKlass+DecodeNKlass over ConP in simple compressed klass mode.
+    return CompressedKlassPointers::base() == NULL;
+  }
+
+  // Is it better to copy float constants, or load them directly from
+  // memory?  Intel can load a float constant from a direct address,
+  // requiring no extra registers.  Most RISCs will have to materialize
+  // an address into a register first, so they would do better to copy
+  // the constant from stack.
+  static const bool rematerialize_float_constants = false;
+
+  // If CPU can load and store mis-aligned doubles directly then no
+  // fixup is needed.  Else we split the double into 2 integer pieces
+  // and move it piece-by-piece.  Only happens when passing doubles into
+  // C code as the Java calling convention forces doubles to be aligned.
+  static const bool misaligned_doubles_ok = true;
+
+  // Advertise here if the CPU requires explicit rounding operations to implement strictfp mode.
+  static const bool strict_fp_requires_explicit_rounding = false;
+
+  // Are floats converted to double when stored to stack during
+  // deoptimization?
+  static constexpr bool float_in_double() { return false; }
+
+  // Do ints take an entire long register or just half?
+  // The relevant question is how the int is callee-saved:
+  // the whole long is written but de-opt'ing will have to extract
+  // the relevant 32 bits.
+  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;
+  }
+
+  // Does the CPU supports vector variable rotate instructions?
+  static constexpr bool supports_vector_variable_rotates(void) {
+    return false;
+  }
+
+  // Does the CPU supports vector constant rotate instructions?
+  static constexpr bool supports_vector_constant_rotates(int shift) {
+    return false;
+  }
+
+  // Does the CPU supports vector unsigned comparison instructions?
+  static const bool supports_vector_comparison_unsigned(int vlen, BasicType bt) {
+    return false;
+  }
+
+  // Some microarchitectures have mask registers used on vectors
+  static const bool has_predicated_vectors(void) {
+    return false;
+  }
+
+  // true means we have fast l2f convers
+  // false means that conversion is done by runtime call
+  static constexpr bool convL2FSupported(void) {
+      return true;
+  }
+
+  // Implements a variant of EncodeISOArrayNode that encode ASCII only
+  static const bool supports_encode_ascii_array = false;
+
+  // Returns pre-selection estimated size of a vector operation.
+  static int vector_op_pre_select_sz_estimate(int vopc, BasicType ety, int vlen) {
+    return 0;
+  }
+
+#endif // CPU_RISCV_MATCHER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/methodHandles_riscv.cpp b/src/hotspot/cpu/riscv/methodHandles_riscv.cpp
new file mode 100644
index 00000000000..1f7c0c87c21
--- /dev/null
+++ b/src/hotspot/cpu/riscv/methodHandles_riscv.cpp
@@ -0,0 +1,461 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "classfile/javaClasses.inline.hpp"
+#include "classfile/vmClasses.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
+#include "memory/allocation.inline.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "prims/methodHandles.hpp"
+#include "runtime/flags/flagSetting.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/stubRoutines.hpp"
+
+#define __ _masm->
+
+#ifdef PRODUCT
+#define BLOCK_COMMENT(str) /* nothing */
+#else
+#define BLOCK_COMMENT(str) __ block_comment(str)
+#endif
+
+#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
+
+void MethodHandles::load_klass_from_Class(MacroAssembler* _masm, Register klass_reg) {
+  assert_cond(_masm != NULL);
+  if (VerifyMethodHandles) {
+    verify_klass(_masm, klass_reg, VM_CLASS_ID(java_lang_Class),
+                 "MH argument is a Class");
+  }
+  __ ld(klass_reg, Address(klass_reg, java_lang_Class::klass_offset()));
+}
+
+#ifdef ASSERT
+static int check_nonzero(const char* xname, int x) {
+  assert(x != 0, "%s should be nonzero", xname);
+  return x;
+}
+#define NONZERO(x) check_nonzero(#x, x)
+#else //ASSERT
+#define NONZERO(x) (x)
+#endif //PRODUCT
+
+#ifdef ASSERT
+void MethodHandles::verify_klass(MacroAssembler* _masm,
+                                 Register obj, vmClassID klass_id,
+                                 const char* error_message) {
+  assert_cond(_masm != NULL);
+  InstanceKlass** klass_addr = vmClasses::klass_addr_at(klass_id);
+  Klass* klass = vmClasses::klass_at(klass_id);
+  Register temp = t1;
+  Register temp2 = t0; // used by MacroAssembler::cmpptr
+  Label L_ok, L_bad;
+  BLOCK_COMMENT("verify_klass {");
+  __ verify_oop(obj);
+  __ beqz(obj, L_bad);
+  __ push_reg(RegSet::of(temp, temp2), sp);
+  __ load_klass(temp, obj);
+  __ cmpptr(temp, ExternalAddress((address) klass_addr), L_ok);
+  intptr_t super_check_offset = klass->super_check_offset();
+  __ ld(temp, Address(temp, super_check_offset));
+  __ cmpptr(temp, ExternalAddress((address) klass_addr), L_ok);
+  __ pop_reg(RegSet::of(temp, temp2), sp);
+  __ bind(L_bad);
+  __ stop(error_message);
+  __ BIND(L_ok);
+  __ pop_reg(RegSet::of(temp, temp2), sp);
+  BLOCK_COMMENT("} verify_klass");
+}
+
+void MethodHandles::verify_ref_kind(MacroAssembler* _masm, int ref_kind, Register member_reg, Register temp) {}
+
+#endif //ASSERT
+
+void MethodHandles::jump_from_method_handle(MacroAssembler* _masm, Register method, Register temp,
+                                            bool for_compiler_entry) {
+  assert_cond(_masm != NULL);
+  assert(method == xmethod, "interpreter calling convention");
+  Label L_no_such_method;
+  __ beqz(xmethod, L_no_such_method);
+  __ verify_method_ptr(method);
+
+  if (!for_compiler_entry && JvmtiExport::can_post_interpreter_events()) {
+    Label run_compiled_code;
+    // JVMTI events, such as single-stepping, are implemented partly by avoiding running
+    // compiled code in threads for which the event is enabled.  Check here for
+    // interp_only_mode if these events CAN be enabled.
+
+    __ lwu(t0, Address(xthread, JavaThread::interp_only_mode_offset()));
+    __ beqz(t0, run_compiled_code);
+    __ ld(t0, Address(method, Method::interpreter_entry_offset()));
+    __ jr(t0);
+    __ BIND(run_compiled_code);
+  }
+
+  const ByteSize entry_offset = for_compiler_entry ? Method::from_compiled_offset() :
+                                                     Method::from_interpreted_offset();
+  __ ld(t0,Address(method, entry_offset));
+  __ jr(t0);
+  __ bind(L_no_such_method);
+  __ far_jump(RuntimeAddress(StubRoutines::throw_AbstractMethodError_entry()));
+}
+
+void MethodHandles::jump_to_lambda_form(MacroAssembler* _masm,
+                                        Register recv, Register method_temp,
+                                        Register temp2,
+                                        bool for_compiler_entry) {
+  assert_cond(_masm != NULL);
+  BLOCK_COMMENT("jump_to_lambda_form {");
+  // This is the initial entry point of a lazy method handle.
+  // After type checking, it picks up the invoker from the LambdaForm.
+  assert_different_registers(recv, method_temp, temp2);
+  assert(recv != noreg, "required register");
+  assert(method_temp == xmethod, "required register for loading method");
+
+  // Load the invoker, as MH -> MH.form -> LF.vmentry
+  __ verify_oop(recv);
+  __ load_heap_oop(method_temp, Address(recv, NONZERO(java_lang_invoke_MethodHandle::form_offset())), temp2);
+  __ verify_oop(method_temp);
+  __ load_heap_oop(method_temp, Address(method_temp, NONZERO(java_lang_invoke_LambdaForm::vmentry_offset())), temp2);
+  __ verify_oop(method_temp);
+  __ load_heap_oop(method_temp, Address(method_temp, NONZERO(java_lang_invoke_MemberName::method_offset())), temp2);
+  __ verify_oop(method_temp);
+  __ access_load_at(T_ADDRESS, IN_HEAP, method_temp, Address(method_temp, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset())), noreg, noreg);
+
+  if (VerifyMethodHandles && !for_compiler_entry) {
+    // make sure recv is already on stack
+    __ ld(temp2, Address(method_temp, Method::const_offset()));
+    __ load_sized_value(temp2,
+                        Address(temp2, ConstMethod::size_of_parameters_offset()),
+                        sizeof(u2), /*is_signed*/ false);
+    Label L;
+    __ ld(t0, __ argument_address(temp2, -1));
+    __ beq(recv, t0, L);
+    __ ld(x10, __ argument_address(temp2, -1));
+    __ ebreak();
+    __ BIND(L);
+  }
+
+  jump_from_method_handle(_masm, method_temp, temp2, for_compiler_entry);
+  BLOCK_COMMENT("} jump_to_lambda_form");
+}
+
+// Code generation
+address MethodHandles::generate_method_handle_interpreter_entry(MacroAssembler* _masm,
+                                                                vmIntrinsics::ID iid) {
+  assert_cond(_masm != NULL);
+  const bool not_for_compiler_entry = false;  // this is the interpreter entry
+  assert(is_signature_polymorphic(iid), "expected invoke iid");
+  if (iid == vmIntrinsics::_invokeGeneric ||
+      iid == vmIntrinsics::_compiledLambdaForm) {
+    // Perhaps surprisingly, the symbolic references visible to Java are not directly used.
+    // They are linked to Java-generated adapters via MethodHandleNatives.linkMethod.
+    // They all allow an appendix argument.
+    __ ebreak();           // empty stubs make SG sick
+    return NULL;
+  }
+
+  // No need in interpreter entry for linkToNative for now.
+  // Interpreter calls compiled entry through i2c.
+  if (iid == vmIntrinsics::_linkToNative) {
+    __ ebreak();
+    return NULL;
+  }
+
+  // x30: sender SP (must preserve; see prepare_to_jump_from_interpreted)
+  // xmethod: Method*
+  // x13: argument locator (parameter slot count, added to sp)
+  // x11: used as temp to hold mh or receiver
+  // x10, x29: garbage temps, blown away
+  Register argp   = x13;   // argument list ptr, live on error paths
+  Register mh     = x11;   // MH receiver; dies quickly and is recycled
+
+  // here's where control starts out:
+  __ align(CodeEntryAlignment);
+  address entry_point = __ pc();
+
+  if (VerifyMethodHandles) {
+    assert(Method::intrinsic_id_size_in_bytes() == 2, "assuming Method::_intrinsic_id is u2");
+
+    Label L;
+    BLOCK_COMMENT("verify_intrinsic_id {");
+    __ lhu(t0, Address(xmethod, Method::intrinsic_id_offset_in_bytes()));
+    __ mv(t1, (int) iid);
+    __ beq(t0, t1, L);
+    if (iid == vmIntrinsics::_linkToVirtual ||
+        iid == vmIntrinsics::_linkToSpecial) {
+      // could do this for all kinds, but would explode assembly code size
+      trace_method_handle(_masm, "bad Method*::intrinsic_id");
+    }
+    __ ebreak();
+    __ bind(L);
+    BLOCK_COMMENT("} verify_intrinsic_id");
+  }
+
+  // First task:  Find out how big the argument list is.
+  Address x13_first_arg_addr;
+  int ref_kind = signature_polymorphic_intrinsic_ref_kind(iid);
+  assert(ref_kind != 0 || iid == vmIntrinsics::_invokeBasic, "must be _invokeBasic or a linkTo intrinsic");
+  if (ref_kind == 0 || MethodHandles::ref_kind_has_receiver(ref_kind)) {
+    __ ld(argp, Address(xmethod, Method::const_offset()));
+    __ load_sized_value(argp,
+                        Address(argp, ConstMethod::size_of_parameters_offset()),
+                        sizeof(u2), /*is_signed*/ false);
+    x13_first_arg_addr = __ argument_address(argp, -1);
+  } else {
+    DEBUG_ONLY(argp = noreg);
+  }
+
+  if (!is_signature_polymorphic_static(iid)) {
+    __ ld(mh, x13_first_arg_addr);
+    DEBUG_ONLY(argp = noreg);
+  }
+
+  // x13_first_arg_addr is live!
+
+  trace_method_handle_interpreter_entry(_masm, iid);
+  if (iid == vmIntrinsics::_invokeBasic) {
+    generate_method_handle_dispatch(_masm, iid, mh, noreg, not_for_compiler_entry);
+  } else {
+    // Adjust argument list by popping the trailing MemberName argument.
+    Register recv = noreg;
+    if (MethodHandles::ref_kind_has_receiver(ref_kind)) {
+      // Load the receiver (not the MH; the actual MemberName's receiver) up from the interpreter stack.
+      __ ld(recv = x12, x13_first_arg_addr);
+    }
+    DEBUG_ONLY(argp = noreg);
+    Register xmember = xmethod;  // MemberName ptr; incoming method ptr is dead now
+    __ pop_reg(xmember);             // extract last argument
+    generate_method_handle_dispatch(_masm, iid, recv, xmember, not_for_compiler_entry);
+  }
+
+  return entry_point;
+}
+
+
+void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
+                                                    vmIntrinsics::ID iid,
+                                                    Register receiver_reg,
+                                                    Register member_reg,
+                                                    bool for_compiler_entry) {
+  assert_cond(_masm != NULL);
+  assert(is_signature_polymorphic(iid), "expected invoke iid");
+  // temps used in this code are not used in *either* compiled or interpreted calling sequences
+  Register temp1 = x7;
+  Register temp2 = x28;
+  Register temp3 = x29;  // x30 is live by this point: it contains the sender SP
+  if (for_compiler_entry) {
+    assert(receiver_reg == (iid == vmIntrinsics::_linkToStatic ? noreg : j_rarg0), "only valid assignment");
+    assert_different_registers(temp1, j_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4, j_rarg5, j_rarg6, j_rarg7);
+    assert_different_registers(temp2, j_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4, j_rarg5, j_rarg6, j_rarg7);
+    assert_different_registers(temp3, j_rarg0, j_rarg1, j_rarg2, j_rarg3, j_rarg4, j_rarg5, j_rarg6, j_rarg7);
+  }
+
+  assert_different_registers(temp1, temp2, temp3, receiver_reg);
+  assert_different_registers(temp1, temp2, temp3, member_reg);
+
+  if (iid == vmIntrinsics::_invokeBasic || iid == vmIntrinsics::_linkToNative) {
+    if (iid == vmIntrinsics::_linkToNative) {
+      assert(for_compiler_entry, "only compiler entry is supported");
+    }
+    // indirect through MH.form.vmentry.vmtarget
+    jump_to_lambda_form(_masm, receiver_reg, xmethod, temp1, for_compiler_entry);
+  } else {
+    // The method is a member invoker used by direct method handles.
+    if (VerifyMethodHandles) {
+      // make sure the trailing argument really is a MemberName (caller responsibility)
+      verify_klass(_masm, member_reg, VM_CLASS_ID(java_lang_invoke_MemberName),
+                   "MemberName required for invokeVirtual etc.");
+    }
+
+    Address member_clazz(    member_reg, NONZERO(java_lang_invoke_MemberName::clazz_offset()));
+    Address member_vmindex(  member_reg, NONZERO(java_lang_invoke_MemberName::vmindex_offset()));
+    Address member_vmtarget( member_reg, NONZERO(java_lang_invoke_MemberName::method_offset()));
+    Address vmtarget_method( xmethod, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset()));
+
+    Register temp1_recv_klass = temp1;
+    if (iid != vmIntrinsics::_linkToStatic) {
+      __ verify_oop(receiver_reg);
+      if (iid == vmIntrinsics::_linkToSpecial) {
+        // Don't actually load the klass; just null-check the receiver.
+        __ null_check(receiver_reg);
+      } else {
+        // load receiver klass itself
+        __ null_check(receiver_reg, oopDesc::klass_offset_in_bytes());
+        __ load_klass(temp1_recv_klass, receiver_reg);
+        __ verify_klass_ptr(temp1_recv_klass);
+      }
+      BLOCK_COMMENT("check_receiver {");
+      // The receiver for the MemberName must be in receiver_reg.
+      // Check the receiver against the MemberName.clazz
+      if (VerifyMethodHandles && iid == vmIntrinsics::_linkToSpecial) {
+        // Did not load it above...
+        __ load_klass(temp1_recv_klass, receiver_reg);
+        __ verify_klass_ptr(temp1_recv_klass);
+      }
+      if (VerifyMethodHandles && iid != vmIntrinsics::_linkToInterface) {
+        Label L_ok;
+        Register temp2_defc = temp2;
+        __ load_heap_oop(temp2_defc, member_clazz, temp3);
+        load_klass_from_Class(_masm, temp2_defc);
+        __ verify_klass_ptr(temp2_defc);
+        __ check_klass_subtype(temp1_recv_klass, temp2_defc, temp3, L_ok);
+        // If we get here, the type check failed!
+        __ ebreak();
+        __ bind(L_ok);
+      }
+      BLOCK_COMMENT("} check_receiver");
+    }
+    if (iid == vmIntrinsics::_linkToSpecial ||
+        iid == vmIntrinsics::_linkToStatic) {
+      DEBUG_ONLY(temp1_recv_klass = noreg);  // these guys didn't load the recv_klass
+    }
+
+    // Live registers at this point:
+    //  member_reg - MemberName that was the trailing argument
+    //  temp1_recv_klass - klass of stacked receiver, if needed
+    //  x30 - interpreter linkage (if interpreted)
+    //  x11 ... x10 - compiler arguments (if compiled)
+
+    Label L_incompatible_class_change_error;
+    switch (iid) {
+      case vmIntrinsics::_linkToSpecial:
+        if (VerifyMethodHandles) {
+          verify_ref_kind(_masm, JVM_REF_invokeSpecial, member_reg, temp3);
+        }
+        __ load_heap_oop(xmethod, member_vmtarget);
+        __ access_load_at(T_ADDRESS, IN_HEAP, xmethod, vmtarget_method, noreg, noreg);
+        break;
+
+      case vmIntrinsics::_linkToStatic:
+        if (VerifyMethodHandles) {
+          verify_ref_kind(_masm, JVM_REF_invokeStatic, member_reg, temp3);
+        }
+        __ load_heap_oop(xmethod, member_vmtarget);
+        __ access_load_at(T_ADDRESS, IN_HEAP, xmethod, vmtarget_method, noreg, noreg);
+        break;
+
+      case vmIntrinsics::_linkToVirtual:
+      {
+        // same as TemplateTable::invokevirtual,
+        // minus the CP setup and profiling:
+
+        if (VerifyMethodHandles) {
+          verify_ref_kind(_masm, JVM_REF_invokeVirtual, member_reg, temp3);
+        }
+
+        // pick out the vtable index from the MemberName, and then we can discard it:
+        Register temp2_index = temp2;
+        __ access_load_at(T_ADDRESS, IN_HEAP, temp2_index, member_vmindex, noreg, noreg);
+
+        if (VerifyMethodHandles) {
+          Label L_index_ok;
+          __ bgez(temp2_index, L_index_ok);
+          __ ebreak();
+          __ BIND(L_index_ok);
+        }
+
+        // Note:  The verifier invariants allow us to ignore MemberName.clazz and vmtarget
+        // at this point.  And VerifyMethodHandles has already checked clazz, if needed.
+
+        // get target Method* & entry point
+        __ lookup_virtual_method(temp1_recv_klass, temp2_index, xmethod);
+        break;
+      }
+
+      case vmIntrinsics::_linkToInterface:
+      {
+        // same as TemplateTable::invokeinterface
+        // (minus the CP setup and profiling, with different argument motion)
+        if (VerifyMethodHandles) {
+          verify_ref_kind(_masm, JVM_REF_invokeInterface, member_reg, temp3);
+        }
+
+        Register temp3_intf = temp3;
+        __ load_heap_oop(temp3_intf, member_clazz);
+        load_klass_from_Class(_masm, temp3_intf);
+        __ verify_klass_ptr(temp3_intf);
+
+        Register rindex = xmethod;
+        __ access_load_at(T_ADDRESS, IN_HEAP, rindex, member_vmindex, noreg, noreg);
+        if (VerifyMethodHandles) {
+          Label L;
+          __ bgez(rindex, L);
+          __ ebreak();
+          __ bind(L);
+        }
+
+        // given intf, index, and recv klass, dispatch to the implementation method
+        __ lookup_interface_method(temp1_recv_klass, temp3_intf,
+                                   // note: next two args must be the same:
+                                   rindex, xmethod,
+                                   temp2,
+                                   L_incompatible_class_change_error);
+        break;
+      }
+
+      default:
+        fatal("unexpected intrinsic %d: %s", vmIntrinsics::as_int(iid), vmIntrinsics::name_at(iid));
+        break;
+    }
+
+    // live at this point:  xmethod, x30 (if interpreted)
+
+    // After figuring out which concrete method to call, jump into it.
+    // Note that this works in the interpreter with no data motion.
+    // But the compiled version will require that r2_recv be shifted out.
+    __ verify_method_ptr(xmethod);
+    jump_from_method_handle(_masm, xmethod, temp1, for_compiler_entry);
+    if (iid == vmIntrinsics::_linkToInterface) {
+      __ bind(L_incompatible_class_change_error);
+      __ far_jump(RuntimeAddress(StubRoutines::throw_IncompatibleClassChangeError_entry()));
+    }
+  }
+
+}
+
+#ifndef PRODUCT
+void trace_method_handle_stub(const char* adaptername,
+                              oopDesc* mh,
+                              intptr_t* saved_regs,
+                              intptr_t* entry_sp) {  }
+
+// The stub wraps the arguments in a struct on the stack to avoid
+// dealing with the different calling conventions for passing 6
+// arguments.
+struct MethodHandleStubArguments {
+  const char* adaptername;
+  oopDesc* mh;
+  intptr_t* saved_regs;
+  intptr_t* entry_sp;
+};
+void trace_method_handle_stub_wrapper(MethodHandleStubArguments* args) {  }
+
+void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) {  }
+#endif //PRODUCT
diff --git a/src/hotspot/cpu/riscv/methodHandles_riscv.hpp b/src/hotspot/cpu/riscv/methodHandles_riscv.hpp
new file mode 100644
index 00000000000..f73aba29d67
--- /dev/null
+++ b/src/hotspot/cpu/riscv/methodHandles_riscv.hpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+// Platform-specific definitions for method handles.
+// These definitions are inlined into class MethodHandles.
+
+// Adapters
+enum /* platform_dependent_constants */ {
+  adapter_code_size = 32000 DEBUG_ONLY(+ 120000)
+};
+
+public:
+
+  static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg);
+
+  static void verify_klass(MacroAssembler* _masm,
+                           Register obj, vmClassID klass_id,
+                           const char* error_message = "wrong klass") NOT_DEBUG_RETURN;
+
+  static void verify_method_handle(MacroAssembler* _masm, Register mh_reg) {
+    verify_klass(_masm, mh_reg, VM_CLASS_ID(java_lang_invoke_MethodHandle),
+                 "reference is a MH");
+  }
+
+  static void verify_ref_kind(MacroAssembler* _masm, int ref_kind, Register member_reg, Register temp) NOT_DEBUG_RETURN;
+
+  // Similar to InterpreterMacroAssembler::jump_from_interpreted.
+  // Takes care of special dispatch from single stepping too.
+  static void jump_from_method_handle(MacroAssembler* _masm, Register method, Register temp,
+                                      bool for_compiler_entry);
+
+  static void jump_to_lambda_form(MacroAssembler* _masm,
+                                  Register recv, Register method_temp,
+                                  Register temp2,
+                                  bool for_compiler_entry);
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
new file mode 100644
index 00000000000..0a05c577860
--- /dev/null
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "code/compiledIC.hpp"
+#include "memory/resourceArea.hpp"
+#include "nativeInst_riscv.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/handles.hpp"
+#include "runtime/orderAccess.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "utilities/ostream.hpp"
+#ifdef COMPILER1
+#include "c1/c1_Runtime1.hpp"
+#endif
+
+Register NativeInstruction::extract_rs1(address instr) {
+  assert_cond(instr != NULL);
+  return as_Register(Assembler::extract(((unsigned*)instr)[0], 19, 15));
+}
+
+Register NativeInstruction::extract_rs2(address instr) {
+  assert_cond(instr != NULL);
+  return as_Register(Assembler::extract(((unsigned*)instr)[0], 24, 20));
+}
+
+Register NativeInstruction::extract_rd(address instr) {
+  assert_cond(instr != NULL);
+  return as_Register(Assembler::extract(((unsigned*)instr)[0], 11, 7));
+}
+
+uint32_t NativeInstruction::extract_opcode(address instr) {
+  assert_cond(instr != NULL);
+  return Assembler::extract(((unsigned*)instr)[0], 6, 0);
+}
+
+uint32_t NativeInstruction::extract_funct3(address instr) {
+  assert_cond(instr != NULL);
+  return Assembler::extract(((unsigned*)instr)[0], 14, 12);
+}
+
+bool NativeInstruction::is_pc_relative_at(address instr) {
+  // auipc + jalr
+  // auipc + addi
+  // auipc + load
+  // auipc + fload_load
+  return (is_auipc_at(instr)) &&
+         (is_addi_at(instr + instruction_size) ||
+          is_jalr_at(instr + instruction_size) ||
+          is_load_at(instr + instruction_size) ||
+          is_float_load_at(instr + instruction_size)) &&
+         check_pc_relative_data_dependency(instr);
+}
+
+// ie:ld(Rd, Label)
+bool NativeInstruction::is_load_pc_relative_at(address instr) {
+  return is_auipc_at(instr) && // auipc
+         is_ld_at(instr + instruction_size) && // ld
+         check_load_pc_relative_data_dependency(instr);
+}
+
+bool NativeInstruction::is_movptr_at(address instr) {
+  return is_lui_at(instr) && // Lui
+         is_addi_at(instr + instruction_size) && // Addi
+         is_slli_shift_at(instr + instruction_size * 2, 11) && // Slli Rd, Rs, 11
+         is_addi_at(instr + instruction_size * 3) && // Addi
+         is_slli_shift_at(instr + instruction_size * 4, 5) && // Slli Rd, Rs, 5
+         (is_addi_at(instr + instruction_size * 5) ||
+          is_jalr_at(instr + instruction_size * 5) ||
+          is_load_at(instr + instruction_size * 5)) && // Addi/Jalr/Load
+         check_movptr_data_dependency(instr);
+}
+
+bool NativeInstruction::is_li32_at(address instr) {
+  return is_lui_at(instr) && // lui
+         is_addiw_at(instr + instruction_size) && // addiw
+         check_li32_data_dependency(instr);
+}
+
+bool NativeInstruction::is_li64_at(address instr) {
+  return is_lui_at(instr) && // lui
+         is_addi_at(instr + instruction_size) && // addi
+         is_slli_shift_at(instr + instruction_size * 2, 12) &&  // Slli Rd, Rs, 12
+         is_addi_at(instr + instruction_size * 3) && // addi
+         is_slli_shift_at(instr + instruction_size * 4, 12) &&  // Slli Rd, Rs, 12
+         is_addi_at(instr + instruction_size * 5) && // addi
+         is_slli_shift_at(instr + instruction_size * 6, 8) &&   // Slli Rd, Rs, 8
+         is_addi_at(instr + instruction_size * 7) && // addi
+         check_li64_data_dependency(instr);
+}
+
+void NativeCall::verify() {
+  assert(NativeCall::is_call_at((address)this), "unexpected code at call site");
+}
+
+address NativeCall::destination() const {
+  address addr = (address)this;
+  assert(NativeInstruction::is_jal_at(instruction_address()), "inst must be jal.");
+  address destination = MacroAssembler::target_addr_for_insn(instruction_address());
+
+  // Do we use a trampoline stub for this call?
+  CodeBlob* cb = CodeCache::find_blob_unsafe(addr);   // Else we get assertion if nmethod is zombie.
+  assert(cb && cb->is_nmethod(), "sanity");
+  nmethod *nm = (nmethod *)cb;
+  if (nm != NULL && nm->stub_contains(destination) && is_NativeCallTrampolineStub_at(destination)) {
+    // Yes we do, so get the destination from the trampoline stub.
+    const address trampoline_stub_addr = destination;
+    destination = nativeCallTrampolineStub_at(trampoline_stub_addr)->destination();
+  }
+
+  return destination;
+}
+
+// Similar to replace_mt_safe, but just changes the destination. The
+// important thing is that free-running threads are able to execute this
+// call instruction at all times.
+//
+// Used in the runtime linkage of calls; see class CompiledIC.
+//
+// Add parameter assert_lock to switch off assertion
+// during code generation, where no patching lock is needed.
+void NativeCall::set_destination_mt_safe(address dest, bool assert_lock) {
+  assert(!assert_lock ||
+         (Patching_lock->is_locked() || SafepointSynchronize::is_at_safepoint()) ||
+         CompiledICLocker::is_safe(addr_at(0)),
+         "concurrent code patching");
+
+  ResourceMark rm;
+  address addr_call = addr_at(0);
+  assert(NativeCall::is_call_at(addr_call), "unexpected code at call site");
+
+  // Patch the constant in the call's trampoline stub.
+  address trampoline_stub_addr = get_trampoline();
+  if (trampoline_stub_addr != NULL) {
+    assert (!is_NativeCallTrampolineStub_at(dest), "chained trampolines");
+    nativeCallTrampolineStub_at(trampoline_stub_addr)->set_destination(dest);
+  }
+
+  // Patch the call.
+  if (Assembler::reachable_from_branch_at(addr_call, dest)) {
+    set_destination(dest);
+  } else {
+    assert (trampoline_stub_addr != NULL, "we need a trampoline");
+    set_destination(trampoline_stub_addr);
+  }
+
+  ICache::invalidate_range(addr_call, instruction_size);
+}
+
+address NativeCall::get_trampoline() {
+  address call_addr = addr_at(0);
+
+  CodeBlob *code = CodeCache::find_blob(call_addr);
+  assert(code != NULL, "Could not find the containing code blob");
+
+  address jal_destination = MacroAssembler::pd_call_destination(call_addr);
+  if (code != NULL && code->contains(jal_destination) && is_NativeCallTrampolineStub_at(jal_destination)) {
+    return jal_destination;
+  }
+
+  if (code != NULL && code->is_nmethod()) {
+    return trampoline_stub_Relocation::get_trampoline_for(call_addr, (nmethod*)code);
+  }
+
+  return NULL;
+}
+
+// Inserts a native call instruction at a given pc
+void NativeCall::insert(address code_pos, address entry) { Unimplemented(); }
+
+//-------------------------------------------------------------------
+
+void NativeMovConstReg::verify() {
+  if (!(nativeInstruction_at(instruction_address())->is_movptr() ||
+        is_auipc_at(instruction_address()))) {
+    fatal("should be MOVPTR or AUIPC");
+  }
+}
+
+intptr_t NativeMovConstReg::data() const {
+  address addr = MacroAssembler::target_addr_for_insn(instruction_address());
+  if (maybe_cpool_ref(instruction_address())) {
+    return *(intptr_t*)addr;
+  } else {
+    return (intptr_t)addr;
+  }
+}
+
+void NativeMovConstReg::set_data(intptr_t x) {
+  if (maybe_cpool_ref(instruction_address())) {
+    address addr = MacroAssembler::target_addr_for_insn(instruction_address());
+    *(intptr_t*)addr = x;
+  } else {
+    // Store x into the instruction stream.
+    MacroAssembler::pd_patch_instruction_size(instruction_address(), (address)x);
+    ICache::invalidate_range(instruction_address(), movptr_instruction_size);
+  }
+
+  // Find and replace the oop/metadata corresponding to this
+  // instruction in oops section.
+  CodeBlob* cb = CodeCache::find_blob(instruction_address());
+  nmethod* nm = cb->as_nmethod_or_null();
+  if (nm != NULL) {
+    RelocIterator iter(nm, instruction_address(), next_instruction_address());
+    while (iter.next()) {
+      if (iter.type() == relocInfo::oop_type) {
+        oop* oop_addr = iter.oop_reloc()->oop_addr();
+        *oop_addr = cast_to_oop(x);
+        break;
+      } else if (iter.type() == relocInfo::metadata_type) {
+        Metadata** metadata_addr = iter.metadata_reloc()->metadata_addr();
+        *metadata_addr = (Metadata*)x;
+        break;
+      }
+    }
+  }
+}
+
+void NativeMovConstReg::print() {
+  tty->print_cr(PTR_FORMAT ": mov reg, " INTPTR_FORMAT,
+                p2i(instruction_address()), data());
+}
+
+//-------------------------------------------------------------------
+
+int NativeMovRegMem::offset() const  {
+  Unimplemented();
+  return 0;
+}
+
+void NativeMovRegMem::set_offset(int x) { Unimplemented(); }
+
+void NativeMovRegMem::verify() {
+  Unimplemented();
+}
+
+//--------------------------------------------------------------------------------
+
+void NativeJump::verify() { }
+
+
+void NativeJump::check_verified_entry_alignment(address entry, address verified_entry) {
+}
+
+
+address NativeJump::jump_destination() const {
+  address dest = MacroAssembler::target_addr_for_insn(instruction_address());
+
+  // We use jump to self as the unresolved address which the inline
+  // cache code (and relocs) know about
+  // As a special case we also use sequence movptr_with_offset(r,0), jalr(r,0)
+  // i.e. jump to 0 when we need leave space for a wide immediate
+  // load
+
+  // return -1 if jump to self or to 0
+  if ((dest == (address) this) || dest == 0) {
+    dest = (address) -1;
+  }
+
+  return dest;
+};
+
+void NativeJump::set_jump_destination(address dest) {
+  // We use jump to self as the unresolved address which the inline
+  // cache code (and relocs) know about
+  if (dest == (address) -1)
+    dest = instruction_address();
+
+  MacroAssembler::pd_patch_instruction(instruction_address(), dest);
+  ICache::invalidate_range(instruction_address(), instruction_size);
+}
+
+//-------------------------------------------------------------------
+
+address NativeGeneralJump::jump_destination() const {
+  NativeMovConstReg* move = nativeMovConstReg_at(instruction_address());
+  address dest = (address) move->data();
+
+  // We use jump to self as the unresolved address which the inline
+  // cache code (and relocs) know about
+  // As a special case we also use jump to 0 when first generating
+  // a general jump
+
+  // return -1 if jump to self or to 0
+  if ((dest == (address) this) || dest == 0) {
+    dest = (address) -1;
+  }
+
+  return dest;
+}
+
+//-------------------------------------------------------------------
+
+bool NativeInstruction::is_safepoint_poll() {
+  return is_lwu_to_zr(address(this));
+}
+
+bool NativeInstruction::is_lwu_to_zr(address instr) {
+  assert_cond(instr != NULL);
+  return (extract_opcode(instr) == 0b0000011 &&
+          extract_funct3(instr) == 0b110 &&
+          extract_rd(instr) == zr);         // zr
+}
+
+// A 16-bit instruction with all bits ones is permanently reserved as an illegal instruction.
+bool NativeInstruction::is_sigill_zombie_not_entrant() {
+  // jvmci
+  return uint_at(0) == 0xffffffff;
+}
+
+void NativeIllegalInstruction::insert(address code_pos) {
+  assert_cond(code_pos != NULL);
+  *(juint*)code_pos = 0xffffffff; // all bits ones is permanently reserved as an illegal instruction
+}
+
+bool NativeInstruction::is_stop() {
+  return uint_at(0) == 0xffffffff; // an illegal instruction
+}
+
+//-------------------------------------------------------------------
+
+// MT-safe inserting of a jump over a jump or a nop (used by
+// nmethod::make_not_entrant_or_zombie)
+
+void NativeJump::patch_verified_entry(address entry, address verified_entry, address dest) {
+
+  assert(dest == SharedRuntime::get_handle_wrong_method_stub(), "expected fixed destination of patch");
+
+  assert(nativeInstruction_at(verified_entry)->is_jump_or_nop() ||
+         nativeInstruction_at(verified_entry)->is_sigill_zombie_not_entrant(),
+         "riscv cannot replace non-jump with jump");
+
+  // Patch this nmethod atomically.
+  if (Assembler::reachable_from_branch_at(verified_entry, dest)) {
+    ptrdiff_t offset = dest - verified_entry;
+    guarantee(is_imm_in_range(offset, 20, 1), "offset is too large to be patched in one jal insrusction."); // 1M
+
+    uint32_t insn = 0;
+    address pInsn = (address)&insn;
+    Assembler::patch(pInsn, 31, 31, (offset >> 20) & 0x1);
+    Assembler::patch(pInsn, 30, 21, (offset >> 1) & 0x3ff);
+    Assembler::patch(pInsn, 20, 20, (offset >> 11) & 0x1);
+    Assembler::patch(pInsn, 19, 12, (offset >> 12) & 0xff);
+    Assembler::patch(pInsn, 11, 7, 0); // zero, no link jump
+    Assembler::patch(pInsn, 6, 0, 0b1101111); // j, (jal x0 offset)
+    *(unsigned int*)verified_entry = insn;
+  } else {
+    // We use an illegal instruction for marking a method as
+    // not_entrant or zombie.
+    NativeIllegalInstruction::insert(verified_entry);
+  }
+
+  ICache::invalidate_range(verified_entry, instruction_size);
+}
+
+void NativeGeneralJump::insert_unconditional(address code_pos, address entry) {
+  CodeBuffer cb(code_pos, instruction_size);
+  MacroAssembler a(&cb);
+
+  int32_t offset = 0;
+  a.movptr_with_offset(t0, entry, offset); // lui, addi, slli, addi, slli
+  a.jalr(x0, t0, offset); // jalr
+
+  ICache::invalidate_range(code_pos, instruction_size);
+}
+
+// MT-safe patching of a long jump instruction.
+void NativeGeneralJump::replace_mt_safe(address instr_addr, address code_buffer) {
+  ShouldNotCallThis();
+}
+
+
+address NativeCallTrampolineStub::destination(nmethod *nm) const {
+  return ptr_at(data_offset);
+}
+
+void NativeCallTrampolineStub::set_destination(address new_destination) {
+  set_ptr_at(data_offset, new_destination);
+  OrderAccess::release();
+}
+
+uint32_t NativeMembar::get_kind() {
+  uint32_t insn = uint_at(0);
+
+  uint32_t predecessor = Assembler::extract(insn, 27, 24);
+  uint32_t successor = Assembler::extract(insn, 23, 20);
+
+  return MacroAssembler::pred_succ_to_membar_mask(predecessor, successor);
+}
+
+void NativeMembar::set_kind(uint32_t order_kind) {
+  uint32_t predecessor = 0;
+  uint32_t successor = 0;
+
+  MacroAssembler::membar_mask_to_pred_succ(order_kind, predecessor, successor);
+
+  uint32_t insn = uint_at(0);
+  address pInsn = (address) &insn;
+  Assembler::patch(pInsn, 27, 24, predecessor);
+  Assembler::patch(pInsn, 23, 20, successor);
+
+  address membar = addr_at(0);
+  *(unsigned int*) membar = insn;
+}
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
new file mode 100644
index 00000000000..718b2e3de6c
--- /dev/null
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
@@ -0,0 +1,572 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_NATIVEINST_RISCV_HPP
+#define CPU_RISCV_NATIVEINST_RISCV_HPP
+
+#include "asm/assembler.hpp"
+#include "runtime/icache.hpp"
+#include "runtime/os.hpp"
+
+// We have interfaces for the following instructions:
+// - NativeInstruction
+// - - NativeCall
+// - - NativeMovConstReg
+// - - NativeMovRegMem
+// - - NativeJump
+// - - NativeGeneralJump
+// - - NativeIllegalInstruction
+// - - NativeCallTrampolineStub
+// - - NativeMembar
+// - - NativeFenceI
+
+// The base class for different kinds of native instruction abstractions.
+// Provides the primitive operations to manipulate code relative to this.
+
+class NativeCall;
+
+class NativeInstruction {
+  friend class Relocation;
+  friend bool is_NativeCallTrampolineStub_at(address);
+ public:
+  enum {
+    instruction_size = 4,
+    compressed_instruction_size = 2,
+  };
+
+  juint encoding() const {
+    return uint_at(0);
+  }
+
+  bool is_jal()                             const { return is_jal_at(addr_at(0));         }
+  bool is_movptr()                          const { return is_movptr_at(addr_at(0));      }
+  bool is_call()                            const { return is_call_at(addr_at(0));        }
+  bool is_jump()                            const { return is_jump_at(addr_at(0));        }
+
+  static bool is_jal_at(address instr)        { assert_cond(instr != NULL); return extract_opcode(instr) == 0b1101111; }
+  static bool is_jalr_at(address instr)       { assert_cond(instr != NULL); return extract_opcode(instr) == 0b1100111 && extract_funct3(instr) == 0b000; }
+  static bool is_branch_at(address instr)     { assert_cond(instr != NULL); return extract_opcode(instr) == 0b1100011; }
+  static bool is_ld_at(address instr)         { assert_cond(instr != NULL); return is_load_at(instr) && extract_funct3(instr) == 0b011; }
+  static bool is_load_at(address instr)       { assert_cond(instr != NULL); return extract_opcode(instr) == 0b0000011; }
+  static bool is_float_load_at(address instr) { assert_cond(instr != NULL); return extract_opcode(instr) == 0b0000111; }
+  static bool is_auipc_at(address instr)      { assert_cond(instr != NULL); return extract_opcode(instr) == 0b0010111; }
+  static bool is_jump_at(address instr)       { assert_cond(instr != NULL); return is_branch_at(instr) || is_jal_at(instr) || is_jalr_at(instr); }
+  static bool is_addi_at(address instr)       { assert_cond(instr != NULL); return extract_opcode(instr) == 0b0010011 && extract_funct3(instr) == 0b000; }
+  static bool is_addiw_at(address instr)      { assert_cond(instr != NULL); return extract_opcode(instr) == 0b0011011 && extract_funct3(instr) == 0b000; }
+  static bool is_lui_at(address instr)        { assert_cond(instr != NULL); return extract_opcode(instr) == 0b0110111; }
+  static bool is_slli_shift_at(address instr, uint32_t shift) {
+    assert_cond(instr != NULL);
+    return (extract_opcode(instr) == 0b0010011 && // opcode field
+            extract_funct3(instr) == 0b001 &&     // funct3 field, select the type of operation
+            Assembler::extract(((unsigned*)instr)[0], 25, 20) == shift);    // shamt field
+  }
+
+  static Register extract_rs1(address instr);
+  static Register extract_rs2(address instr);
+  static Register extract_rd(address instr);
+  static uint32_t extract_opcode(address instr);
+  static uint32_t extract_funct3(address instr);
+
+  // the instruction sequence of movptr is as below:
+  //     lui
+  //     addi
+  //     slli
+  //     addi
+  //     slli
+  //     addi/jalr/load
+  static bool check_movptr_data_dependency(address instr) {
+    address lui = instr;
+    address addi1 = lui + instruction_size;
+    address slli1 = addi1 + instruction_size;
+    address addi2 = slli1 + instruction_size;
+    address slli2 = addi2 + instruction_size;
+    address last_instr = slli2 + instruction_size;
+    return extract_rs1(addi1) == extract_rd(lui) &&
+           extract_rs1(addi1) == extract_rd(addi1) &&
+           extract_rs1(slli1) == extract_rd(addi1) &&
+           extract_rs1(slli1) == extract_rd(slli1) &&
+           extract_rs1(addi2) == extract_rd(slli1) &&
+           extract_rs1(addi2) == extract_rd(addi2) &&
+           extract_rs1(slli2) == extract_rd(addi2) &&
+           extract_rs1(slli2) == extract_rd(slli2) &&
+           extract_rs1(last_instr) == extract_rd(slli2);
+  }
+
+  // the instruction sequence of li64 is as below:
+  //     lui
+  //     addi
+  //     slli
+  //     addi
+  //     slli
+  //     addi
+  //     slli
+  //     addi
+  static bool check_li64_data_dependency(address instr) {
+    address lui = instr;
+    address addi1 = lui + instruction_size;
+    address slli1 = addi1 + instruction_size;
+    address addi2 = slli1 + instruction_size;
+    address slli2 = addi2 + instruction_size;
+    address addi3 = slli2 + instruction_size;
+    address slli3 = addi3 + instruction_size;
+    address addi4 = slli3 + instruction_size;
+    return extract_rs1(addi1) == extract_rd(lui) &&
+           extract_rs1(addi1) == extract_rd(addi1) &&
+           extract_rs1(slli1) == extract_rd(addi1) &&
+           extract_rs1(slli1) == extract_rd(slli1) &&
+           extract_rs1(addi2) == extract_rd(slli1) &&
+           extract_rs1(addi2) == extract_rd(addi2) &&
+           extract_rs1(slli2) == extract_rd(addi2) &&
+           extract_rs1(slli2) == extract_rd(slli2) &&
+           extract_rs1(addi3) == extract_rd(slli2) &&
+           extract_rs1(addi3) == extract_rd(addi3) &&
+           extract_rs1(slli3) == extract_rd(addi3) &&
+           extract_rs1(slli3) == extract_rd(slli3) &&
+           extract_rs1(addi4) == extract_rd(slli3) &&
+           extract_rs1(addi4) == extract_rd(addi4);
+  }
+
+  // the instruction sequence of li32 is as below:
+  //     lui
+  //     addiw
+  static bool check_li32_data_dependency(address instr) {
+    address lui = instr;
+    address addiw = lui + instruction_size;
+
+    return extract_rs1(addiw) == extract_rd(lui) &&
+           extract_rs1(addiw) == extract_rd(addiw);
+  }
+
+  // the instruction sequence of pc-relative is as below:
+  //     auipc
+  //     jalr/addi/load/float_load
+  static bool check_pc_relative_data_dependency(address instr) {
+    address auipc = instr;
+    address last_instr = auipc + instruction_size;
+
+    return extract_rs1(last_instr) == extract_rd(auipc);
+  }
+
+  // the instruction sequence of load_label is as below:
+  //     auipc
+  //     load
+  static bool check_load_pc_relative_data_dependency(address instr) {
+    address auipc = instr;
+    address load = auipc + instruction_size;
+
+    return extract_rd(load) == extract_rd(auipc) &&
+           extract_rs1(load) == extract_rd(load);
+  }
+
+  static bool is_movptr_at(address instr);
+  static bool is_li32_at(address instr);
+  static bool is_li64_at(address instr);
+  static bool is_pc_relative_at(address branch);
+  static bool is_load_pc_relative_at(address branch);
+
+  static bool is_call_at(address instr) {
+    if (is_jal_at(instr) || is_jalr_at(instr)) {
+      return true;
+    }
+    return false;
+  }
+  static bool is_lwu_to_zr(address instr);
+
+  inline bool is_nop();
+  inline bool is_jump_or_nop();
+  bool is_safepoint_poll();
+  bool is_sigill_zombie_not_entrant();
+  bool is_stop();
+
+ protected:
+  address addr_at(int offset) const    { return address(this) + offset; }
+
+  jint int_at(int offset) const        { return *(jint*) addr_at(offset); }
+  juint uint_at(int offset) const      { return *(juint*) addr_at(offset); }
+
+  address ptr_at(int offset) const     { return *(address*) addr_at(offset); }
+
+  oop  oop_at (int offset) const       { return *(oop*) addr_at(offset); }
+
+
+  void set_int_at(int offset, jint  i)        { *(jint*)addr_at(offset) = i; }
+  void set_uint_at(int offset, jint  i)       { *(juint*)addr_at(offset) = i; }
+  void set_ptr_at (int offset, address  ptr)  { *(address*) addr_at(offset) = ptr; }
+  void set_oop_at (int offset, oop  o)        { *(oop*) addr_at(offset) = o; }
+
+ public:
+
+  inline friend NativeInstruction* nativeInstruction_at(address addr);
+
+  static bool maybe_cpool_ref(address instr) {
+    return is_auipc_at(instr);
+  }
+
+  bool is_membar() {
+    return (uint_at(0) & 0x7f) == 0b1111 && extract_funct3(addr_at(0)) == 0;
+  }
+};
+
+inline NativeInstruction* nativeInstruction_at(address addr) {
+  return (NativeInstruction*)addr;
+}
+
+// The natural type of an RISCV instruction is uint32_t
+inline NativeInstruction* nativeInstruction_at(uint32_t *addr) {
+  return (NativeInstruction*)addr;
+}
+
+inline NativeCall* nativeCall_at(address addr);
+// The NativeCall is an abstraction for accessing/manipulating native
+// call instructions (used to manipulate inline caches, primitive &
+// DSO calls, etc.).
+
+class NativeCall: public NativeInstruction {
+ public:
+  enum RISCV_specific_constants {
+    instruction_size            =    4,
+    instruction_offset          =    0,
+    displacement_offset         =    0,
+    return_address_offset       =    4
+  };
+
+  address instruction_address() const       { return addr_at(instruction_offset); }
+  address next_instruction_address() const  { return addr_at(return_address_offset); }
+  address return_address() const            { return addr_at(return_address_offset); }
+  address destination() const;
+
+  void set_destination(address dest) {
+    assert(is_jal(), "Should be jal instruction!");
+    intptr_t offset = (intptr_t)(dest - instruction_address());
+    assert((offset & 0x1) == 0, "bad alignment");
+    assert(is_imm_in_range(offset, 20, 1), "encoding constraint");
+    unsigned int insn = 0b1101111; // jal
+    address pInsn = (address)(&insn);
+    Assembler::patch(pInsn, 31, 31, (offset >> 20) & 0x1);
+    Assembler::patch(pInsn, 30, 21, (offset >> 1) & 0x3ff);
+    Assembler::patch(pInsn, 20, 20, (offset >> 11) & 0x1);
+    Assembler::patch(pInsn, 19, 12, (offset >> 12) & 0xff);
+    Assembler::patch(pInsn, 11, 7, ra->encoding()); // Rd must be x1, need ra
+    set_int_at(displacement_offset, insn);
+  }
+
+  void verify_alignment() {} // do nothing on riscv
+  void verify();
+  void print();
+
+  // Creation
+  inline friend NativeCall* nativeCall_at(address addr);
+  inline friend NativeCall* nativeCall_before(address return_address);
+
+  static bool is_call_before(address return_address) {
+    return is_call_at(return_address - NativeCall::return_address_offset);
+  }
+
+  // MT-safe patching of a call instruction.
+  static void insert(address code_pos, address entry);
+
+  static void replace_mt_safe(address instr_addr, address code_buffer);
+
+  // Similar to replace_mt_safe, but just changes the destination.  The
+  // important thing is that free-running threads are able to execute
+  // this call instruction at all times.  If the call is an immediate BL
+  // instruction we can simply rely on atomicity of 32-bit writes to
+  // make sure other threads will see no intermediate states.
+
+  // We cannot rely on locks here, since the free-running threads must run at
+  // full speed.
+  //
+  // Used in the runtime linkage of calls; see class CompiledIC.
+  // (Cf. 4506997 and 4479829, where threads witnessed garbage displacements.)
+
+  // The parameter assert_lock disables the assertion during code generation.
+  void set_destination_mt_safe(address dest, bool assert_lock = true);
+
+  address get_trampoline();
+};
+
+inline NativeCall* nativeCall_at(address addr) {
+  assert_cond(addr != NULL);
+  NativeCall* call = (NativeCall*)(addr - NativeCall::instruction_offset);
+#ifdef ASSERT
+  call->verify();
+#endif
+  return call;
+}
+
+inline NativeCall* nativeCall_before(address return_address) {
+  assert_cond(return_address != NULL);
+  NativeCall* call = (NativeCall*)(return_address - NativeCall::return_address_offset);
+#ifdef ASSERT
+  call->verify();
+#endif
+  return call;
+}
+
+// An interface for accessing/manipulating native mov reg, imm instructions.
+// (used to manipulate inlined 64-bit data calls, etc.)
+class NativeMovConstReg: public NativeInstruction {
+ public:
+  enum RISCV_specific_constants {
+    movptr_instruction_size             =    6 * NativeInstruction::instruction_size, // lui, addi, slli, addi, slli, addi.  See movptr().
+    movptr_with_offset_instruction_size =    5 * NativeInstruction::instruction_size, // lui, addi, slli, addi, slli. See movptr_with_offset().
+    load_pc_relative_instruction_size   =    2 * NativeInstruction::instruction_size, // auipc, ld
+    instruction_offset                  =    0,
+    displacement_offset                 =    0
+  };
+
+  address instruction_address() const       { return addr_at(instruction_offset); }
+  address next_instruction_address() const  {
+    // if the instruction at 5 * instruction_size is addi,
+    // it means a lui + addi + slli + addi + slli + addi instruction sequence,
+    // and the next instruction address should be addr_at(6 * instruction_size).
+    // However, when the instruction at 5 * instruction_size isn't addi,
+    // the next instruction address should be addr_at(5 * instruction_size)
+    if (nativeInstruction_at(instruction_address())->is_movptr()) {
+      if (is_addi_at(addr_at(movptr_with_offset_instruction_size))) {
+        // Assume: lui, addi, slli, addi, slli, addi
+        return addr_at(movptr_instruction_size);
+      } else {
+        // Assume: lui, addi, slli, addi, slli
+        return addr_at(movptr_with_offset_instruction_size);
+      }
+    } else if (is_load_pc_relative_at(instruction_address())) {
+      // Assume: auipc, ld
+      return addr_at(load_pc_relative_instruction_size);
+    }
+    guarantee(false, "Unknown instruction in NativeMovConstReg");
+    return NULL;
+  }
+
+  intptr_t data() const;
+  void  set_data(intptr_t x);
+
+  void flush() {
+    if (!maybe_cpool_ref(instruction_address())) {
+      ICache::invalidate_range(instruction_address(), movptr_instruction_size);
+    }
+  }
+
+  void  verify();
+  void  print();
+
+  // Creation
+  inline friend NativeMovConstReg* nativeMovConstReg_at(address addr);
+  inline friend NativeMovConstReg* nativeMovConstReg_before(address addr);
+};
+
+inline NativeMovConstReg* nativeMovConstReg_at(address addr) {
+  assert_cond(addr != NULL);
+  NativeMovConstReg* test = (NativeMovConstReg*)(addr - NativeMovConstReg::instruction_offset);
+#ifdef ASSERT
+  test->verify();
+#endif
+  return test;
+}
+
+inline NativeMovConstReg* nativeMovConstReg_before(address addr) {
+  assert_cond(addr != NULL);
+  NativeMovConstReg* test = (NativeMovConstReg*)(addr - NativeMovConstReg::instruction_size - NativeMovConstReg::instruction_offset);
+#ifdef ASSERT
+  test->verify();
+#endif
+  return test;
+}
+
+// RISCV should not use C1 runtime patching, so just leave NativeMovRegMem Unimplemented.
+class NativeMovRegMem: public NativeInstruction {
+ public:
+  int instruction_start() const {
+    Unimplemented();
+    return 0;
+  }
+
+  address instruction_address() const {
+    Unimplemented();
+    return NULL;
+  }
+
+  int num_bytes_to_end_of_patch() const {
+    Unimplemented();
+    return 0;
+  }
+
+  int offset() const;
+
+  void set_offset(int x);
+
+  void add_offset_in_bytes(int add_offset) { Unimplemented(); }
+
+  void verify();
+  void print();
+
+ private:
+  inline friend NativeMovRegMem* nativeMovRegMem_at (address addr);
+};
+
+inline NativeMovRegMem* nativeMovRegMem_at (address addr) {
+  Unimplemented();
+  return NULL;
+}
+
+class NativeJump: public NativeInstruction {
+ public:
+  enum RISCV_specific_constants {
+    instruction_size            =    NativeInstruction::instruction_size,
+    instruction_offset          =    0,
+    data_offset                 =    0,
+    next_instruction_offset     =    NativeInstruction::instruction_size
+  };
+
+  address instruction_address() const       { return addr_at(instruction_offset); }
+  address next_instruction_address() const  { return addr_at(instruction_size); }
+  address jump_destination() const;
+  void set_jump_destination(address dest);
+
+  // Creation
+  inline friend NativeJump* nativeJump_at(address address);
+
+  void verify();
+
+  // Insertion of native jump instruction
+  static void insert(address code_pos, address entry);
+  // MT-safe insertion of native jump at verified method entry
+  static void check_verified_entry_alignment(address entry, address verified_entry);
+  static void patch_verified_entry(address entry, address verified_entry, address dest);
+};
+
+inline NativeJump* nativeJump_at(address addr) {
+  NativeJump* jump = (NativeJump*)(addr - NativeJump::instruction_offset);
+#ifdef ASSERT
+  jump->verify();
+#endif
+  return jump;
+}
+
+class NativeGeneralJump: public NativeJump {
+public:
+  enum RISCV_specific_constants {
+    instruction_size            =    6 * NativeInstruction::instruction_size, // lui, addi, slli, addi, slli, jalr
+    instruction_offset          =    0,
+    data_offset                 =    0,
+    next_instruction_offset     =    6 * NativeInstruction::instruction_size  // lui, addi, slli, addi, slli, jalr
+  };
+
+  address jump_destination() const;
+
+  static void insert_unconditional(address code_pos, address entry);
+  static void replace_mt_safe(address instr_addr, address code_buffer);
+};
+
+inline NativeGeneralJump* nativeGeneralJump_at(address addr) {
+  assert_cond(addr != NULL);
+  NativeGeneralJump* jump = (NativeGeneralJump*)(addr);
+  debug_only(jump->verify();)
+  return jump;
+}
+
+class NativeIllegalInstruction: public NativeInstruction {
+ public:
+  // Insert illegal opcode as specific address
+  static void insert(address code_pos);
+};
+
+inline bool NativeInstruction::is_nop()         {
+  uint32_t insn = *(uint32_t*)addr_at(0);
+  return insn == 0x13;
+}
+
+inline bool NativeInstruction::is_jump_or_nop() {
+  return is_nop() || is_jump();
+}
+
+// Call trampoline stubs.
+class NativeCallTrampolineStub : public NativeInstruction {
+ public:
+
+  enum RISCV_specific_constants {
+    // Refer to function emit_trampoline_stub.
+    instruction_size = 3 * NativeInstruction::instruction_size + wordSize, // auipc + ld + jr + target address
+    data_offset      = 3 * NativeInstruction::instruction_size,            // auipc + ld + jr
+  };
+
+  address destination(nmethod *nm = NULL) const;
+  void set_destination(address new_destination);
+  ptrdiff_t destination_offset() const;
+};
+
+inline bool is_NativeCallTrampolineStub_at(address addr) {
+  // Ensure that the stub is exactly
+  //      ld   t0, L--->auipc + ld
+  //      jr   t0
+  // L:
+
+  // judge inst + register + imm
+  // 1). check the instructions: auipc + ld + jalr
+  // 2). check if auipc[11:7] == t0 and ld[11:7] == t0 and ld[19:15] == t0 && jr[19:15] == t0
+  // 3). check if the offset in ld[31:20] equals the data_offset
+  assert_cond(addr != NULL);
+  const int instr_size = NativeInstruction::instruction_size;
+  if (NativeInstruction::is_auipc_at(addr) &&
+      NativeInstruction::is_ld_at(addr + instr_size) &&
+      NativeInstruction::is_jalr_at(addr + 2 * instr_size) &&
+      (NativeInstruction::extract_rd(addr)                    == x5) &&
+      (NativeInstruction::extract_rd(addr + instr_size)       == x5) &&
+      (NativeInstruction::extract_rs1(addr + instr_size)      == x5) &&
+      (NativeInstruction::extract_rs1(addr + 2 * instr_size)  == x5) &&
+      (Assembler::extract(((unsigned*)addr)[1], 31, 20) == NativeCallTrampolineStub::data_offset)) {
+    return true;
+  }
+  return false;
+}
+
+inline NativeCallTrampolineStub* nativeCallTrampolineStub_at(address addr) {
+  assert_cond(addr != NULL);
+  assert(is_NativeCallTrampolineStub_at(addr), "no call trampoline found");
+  return (NativeCallTrampolineStub*)addr;
+}
+
+class NativeMembar : public NativeInstruction {
+public:
+  uint32_t get_kind();
+  void set_kind(uint32_t order_kind);
+};
+
+inline NativeMembar *NativeMembar_at(address addr) {
+  assert_cond(addr != NULL);
+  assert(nativeInstruction_at(addr)->is_membar(), "no membar found");
+  return (NativeMembar*)addr;
+}
+
+class NativeFenceI : public NativeInstruction {
+public:
+  static inline int instruction_size() {
+    // 2 for fence.i + fence
+    return (UseConservativeFence ? 2 : 1) * NativeInstruction::instruction_size;
+  }
+};
+
+#endif // CPU_RISCV_NATIVEINST_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/registerMap_riscv.cpp b/src/hotspot/cpu/riscv/registerMap_riscv.cpp
new file mode 100644
index 00000000000..26c1edc36ff
--- /dev/null
+++ b/src/hotspot/cpu/riscv/registerMap_riscv.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/registerMap.hpp"
+#include "vmreg_riscv.inline.hpp"
+
+address RegisterMap::pd_location(VMReg base_reg, int slot_idx) const {
+  if (base_reg->is_VectorRegister()) {
+    assert(base_reg->is_concrete(), "must pass base reg");
+    int base_reg_enc = (base_reg->value() - ConcreteRegisterImpl::max_fpr) /
+                       VectorRegisterImpl::max_slots_per_register;
+    intptr_t offset_in_bytes = slot_idx * VMRegImpl::stack_slot_size;
+    address base_location = location(base_reg);
+    if (base_location != NULL) {
+      return base_location + offset_in_bytes;
+    } else {
+      return NULL;
+    }
+  } else {
+    return location(base_reg->next(slot_idx));
+  }
+}
diff --git a/src/hotspot/cpu/riscv/registerMap_riscv.hpp b/src/hotspot/cpu/riscv/registerMap_riscv.hpp
new file mode 100644
index 00000000000..f34349811a9
--- /dev/null
+++ b/src/hotspot/cpu/riscv/registerMap_riscv.hpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_REGISTERMAP_RISCV_HPP
+#define CPU_RISCV_REGISTERMAP_RISCV_HPP
+
+// machine-dependent implemention for register maps
+  friend class frame;
+
+ private:
+  // This is the hook for finding a register in an "well-known" location,
+  // such as a register block of a predetermined format.
+  address pd_location(VMReg reg) const { return NULL; }
+  address pd_location(VMReg base_reg, int slot_idx) const;
+
+  // no PD state to clear or copy:
+  void pd_clear() {}
+  void pd_initialize() {}
+  void pd_initialize_from(const RegisterMap* map) {}
+
+#endif // CPU_RISCV_REGISTERMAP_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/register_riscv.cpp b/src/hotspot/cpu/riscv/register_riscv.cpp
new file mode 100644
index 00000000000..f8116e9df8c
--- /dev/null
+++ b/src/hotspot/cpu/riscv/register_riscv.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "register_riscv.hpp"
+
+REGISTER_IMPL_DEFINITION(Register, RegisterImpl, RegisterImpl::number_of_registers);
+REGISTER_IMPL_DEFINITION(FloatRegister, FloatRegisterImpl, FloatRegisterImpl::number_of_registers);
+REGISTER_IMPL_DEFINITION(VectorRegister, VectorRegisterImpl, VectorRegisterImpl::number_of_registers);
+
+const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers *
+                                          RegisterImpl::max_slots_per_register;
+
+const int ConcreteRegisterImpl::max_fpr =
+    ConcreteRegisterImpl::max_gpr +
+    FloatRegisterImpl::number_of_registers * FloatRegisterImpl::max_slots_per_register;
+
+const int ConcreteRegisterImpl::max_vpr =
+    ConcreteRegisterImpl::max_fpr +
+    VectorRegisterImpl::number_of_registers * VectorRegisterImpl::max_slots_per_register;
+
+
+const char* RegisterImpl::name() const {
+  static const char *const names[number_of_registers] = {
+    "zr", "ra", "sp", "gp", "tp", "t0", "t1", "t2", "fp", "x9",
+    "c_rarg0", "c_rarg1", "c_rarg2", "c_rarg3", "c_rarg4", "c_rarg5", "c_rarg6", "c_rarg7",
+    "x18", "x19", "esp", "xdispatch", "xbcp", "xthread", "xlocals",
+    "xmonitors", "xcpool", "xheapbase", "x28", "x29", "x30", "xmethod"
+  };
+  return is_valid() ? names[encoding()] : "noreg";
+}
+
+const char* FloatRegisterImpl::name() const {
+  static const char *const names[number_of_registers] = {
+    "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
+    "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",
+    "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",
+    "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31"
+  };
+  return is_valid() ? names[encoding()] : "noreg";
+}
+
+const char* VectorRegisterImpl::name() const {
+  static const char *const names[number_of_registers] = {
+    "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7",
+    "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15",
+    "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23",
+    "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31"
+  };
+  return is_valid() ? names[encoding()] : "noreg";
+}
diff --git a/src/hotspot/cpu/riscv/register_riscv.hpp b/src/hotspot/cpu/riscv/register_riscv.hpp
new file mode 100644
index 00000000000..a9200cac647
--- /dev/null
+++ b/src/hotspot/cpu/riscv/register_riscv.hpp
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_REGISTER_RISCV_HPP
+#define CPU_RISCV_REGISTER_RISCV_HPP
+
+#include "asm/register.hpp"
+
+#define CSR_FFLAGS   0x001        // Floating-Point Accrued Exceptions.
+#define CSR_FRM      0x002        // Floating-Point Dynamic Rounding Mode.
+#define CSR_FCSR     0x003        // Floating-Point Control and Status Register (frm + fflags).
+#define CSR_VSTART   0x008        // Vector start position
+#define CSR_VXSAT    0x009        // Fixed-Point Saturate Flag
+#define CSR_VXRM     0x00A        // Fixed-Point Rounding Mode
+#define CSR_VCSR     0x00F        // Vector control and status register
+#define CSR_VL       0xC20        // Vector length
+#define CSR_VTYPE    0xC21        // Vector data type register
+#define CSR_VLENB    0xC22        // VLEN/8 (vector register length in bytes)
+#define CSR_CYCLE    0xc00        // Cycle counter for RDCYCLE instruction.
+#define CSR_TIME     0xc01        // Timer for RDTIME instruction.
+#define CSR_INSTERT  0xc02        // Instructions-retired counter for RDINSTRET instruction.
+
+class VMRegImpl;
+typedef VMRegImpl* VMReg;
+
+// Use Register as shortcut
+class RegisterImpl;
+typedef const RegisterImpl* Register;
+
+inline constexpr Register as_Register(int encoding);
+
+class RegisterImpl: public AbstractRegisterImpl {
+  static constexpr Register first();
+
+ public:
+  enum {
+    number_of_registers      = 32,
+    max_slots_per_register   = 2,
+
+    // integer registers x8 - x15 and floating-point registers f8 - f15 are allocatable
+    // for compressed instructions. See Table 17.2 in spec.
+    compressed_register_base = 8,
+    compressed_register_top  = 15,
+  };
+
+  // derived registers, offsets, and addresses
+  const Register successor() const { return this + 1; }
+
+  // construction
+  inline friend constexpr Register as_Register(int encoding);
+
+  VMReg as_VMReg() const;
+
+  // accessors
+  int encoding() const            { assert(is_valid(), "invalid register"); return encoding_nocheck(); }
+  int encoding_nocheck() const    { return this - first(); }
+  bool is_valid() const           { return (unsigned)encoding_nocheck() < number_of_registers; }
+  const char* name() const;
+
+  // for rvc
+  int compressed_encoding() const {
+    assert(is_compressed_valid(), "invalid compressed register");
+    return encoding() - compressed_register_base;
+  }
+
+  int compressed_encoding_nocheck() const {
+    return encoding_nocheck() - compressed_register_base;
+  }
+
+  bool is_compressed_valid() const {
+    return encoding_nocheck() >= compressed_register_base &&
+           encoding_nocheck() <= compressed_register_top;
+  }
+};
+
+REGISTER_IMPL_DECLARATION(Register, RegisterImpl, RegisterImpl::number_of_registers);
+
+// The integer registers of the RISCV architecture
+
+CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
+
+CONSTANT_REGISTER_DECLARATION(Register, x0,    (0));
+CONSTANT_REGISTER_DECLARATION(Register, x1,    (1));
+CONSTANT_REGISTER_DECLARATION(Register, x2,    (2));
+CONSTANT_REGISTER_DECLARATION(Register, x3,    (3));
+CONSTANT_REGISTER_DECLARATION(Register, x4,    (4));
+CONSTANT_REGISTER_DECLARATION(Register, x5,    (5));
+CONSTANT_REGISTER_DECLARATION(Register, x6,    (6));
+CONSTANT_REGISTER_DECLARATION(Register, x7,    (7));
+CONSTANT_REGISTER_DECLARATION(Register, x8,    (8));
+CONSTANT_REGISTER_DECLARATION(Register, x9,    (9));
+CONSTANT_REGISTER_DECLARATION(Register, x10,  (10));
+CONSTANT_REGISTER_DECLARATION(Register, x11,  (11));
+CONSTANT_REGISTER_DECLARATION(Register, x12,  (12));
+CONSTANT_REGISTER_DECLARATION(Register, x13,  (13));
+CONSTANT_REGISTER_DECLARATION(Register, x14,  (14));
+CONSTANT_REGISTER_DECLARATION(Register, x15,  (15));
+CONSTANT_REGISTER_DECLARATION(Register, x16,  (16));
+CONSTANT_REGISTER_DECLARATION(Register, x17,  (17));
+CONSTANT_REGISTER_DECLARATION(Register, x18,  (18));
+CONSTANT_REGISTER_DECLARATION(Register, x19,  (19));
+CONSTANT_REGISTER_DECLARATION(Register, x20,  (20));
+CONSTANT_REGISTER_DECLARATION(Register, x21,  (21));
+CONSTANT_REGISTER_DECLARATION(Register, x22,  (22));
+CONSTANT_REGISTER_DECLARATION(Register, x23,  (23));
+CONSTANT_REGISTER_DECLARATION(Register, x24,  (24));
+CONSTANT_REGISTER_DECLARATION(Register, x25,  (25));
+CONSTANT_REGISTER_DECLARATION(Register, x26,  (26));
+CONSTANT_REGISTER_DECLARATION(Register, x27,  (27));
+CONSTANT_REGISTER_DECLARATION(Register, x28,  (28));
+CONSTANT_REGISTER_DECLARATION(Register, x29,  (29));
+CONSTANT_REGISTER_DECLARATION(Register, x30,  (30));
+CONSTANT_REGISTER_DECLARATION(Register, x31,  (31));
+
+// Use FloatRegister as shortcut
+class FloatRegisterImpl;
+typedef const FloatRegisterImpl* FloatRegister;
+
+inline constexpr FloatRegister as_FloatRegister(int encoding);
+
+// The implementation of floating point registers for the architecture
+class FloatRegisterImpl: public AbstractRegisterImpl {
+  static constexpr FloatRegister first();
+
+ public:
+  enum {
+    number_of_registers     = 32,
+    max_slots_per_register  = 2,
+
+    // float registers in the range of [f8~f15] correspond to RVC. Please see Table 16.2 in spec.
+    compressed_register_base = 8,
+    compressed_register_top  = 15,
+  };
+
+  // construction
+  inline friend constexpr FloatRegister as_FloatRegister(int encoding);
+
+  VMReg as_VMReg() const;
+
+  // derived registers, offsets, and addresses
+  FloatRegister successor() const {
+    return as_FloatRegister((encoding() + 1) % (unsigned)number_of_registers);
+  }
+
+  // accessors
+  int encoding() const            { assert(is_valid(), "invalid register"); return encoding_nocheck(); }
+  int encoding_nocheck() const    { return this - first(); }
+  int is_valid() const            { return (unsigned)encoding_nocheck() < number_of_registers; }
+  const char* name() const;
+
+  // for rvc
+  int compressed_encoding() const {
+    assert(is_compressed_valid(), "invalid compressed register");
+    return encoding() - compressed_register_base;
+  }
+
+  int compressed_encoding_nocheck() const {
+    return encoding_nocheck() - compressed_register_base;
+  }
+
+  bool is_compressed_valid() const {
+    return encoding_nocheck() >= compressed_register_base &&
+           encoding_nocheck() <= compressed_register_top;
+  }
+};
+
+REGISTER_IMPL_DECLARATION(FloatRegister, FloatRegisterImpl, FloatRegisterImpl::number_of_registers);
+
+// The float registers of the RISCV architecture
+
+CONSTANT_REGISTER_DECLARATION(FloatRegister, fnoreg , (-1));
+
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f0     , ( 0));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f1     , ( 1));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f2     , ( 2));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f3     , ( 3));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f4     , ( 4));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f5     , ( 5));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f6     , ( 6));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f7     , ( 7));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f8     , ( 8));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f9     , ( 9));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f10    , (10));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f11    , (11));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f12    , (12));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f13    , (13));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f14    , (14));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f15    , (15));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f16    , (16));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f17    , (17));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f18    , (18));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f19    , (19));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f20    , (20));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f21    , (21));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f22    , (22));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f23    , (23));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f24    , (24));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f25    , (25));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f26    , (26));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f27    , (27));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f28    , (28));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f29    , (29));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f30    , (30));
+CONSTANT_REGISTER_DECLARATION(FloatRegister, f31    , (31));
+
+// Use VectorRegister as shortcut
+class VectorRegisterImpl;
+typedef const VectorRegisterImpl* VectorRegister;
+
+inline constexpr VectorRegister as_VectorRegister(int encoding);
+
+// The implementation of vector registers for RVV
+class VectorRegisterImpl: public AbstractRegisterImpl {
+  static constexpr VectorRegister first();
+
+ public:
+  enum {
+    number_of_registers    = 32,
+    max_slots_per_register = 4
+  };
+
+  // construction
+  inline friend constexpr VectorRegister as_VectorRegister(int encoding);
+
+  VMReg as_VMReg() const;
+
+  // derived registers, offsets, and addresses
+  VectorRegister successor() const { return this + 1; }
+
+  // accessors
+  int encoding() const            { assert(is_valid(), "invalid register"); return encoding_nocheck(); }
+  int encoding_nocheck() const    { return this - first(); }
+  bool is_valid() const           { return (unsigned)encoding_nocheck() < number_of_registers; }
+  const char* name() const;
+
+};
+
+REGISTER_IMPL_DECLARATION(VectorRegister, VectorRegisterImpl, VectorRegisterImpl::number_of_registers);
+
+// The vector registers of RVV
+CONSTANT_REGISTER_DECLARATION(VectorRegister, vnoreg , (-1));
+
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v0     , ( 0));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v1     , ( 1));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v2     , ( 2));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v3     , ( 3));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v4     , ( 4));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v5     , ( 5));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v6     , ( 6));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v7     , ( 7));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v8     , ( 8));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v9     , ( 9));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v10    , (10));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v11    , (11));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v12    , (12));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v13    , (13));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v14    , (14));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v15    , (15));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v16    , (16));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v17    , (17));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v18    , (18));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v19    , (19));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v20    , (20));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v21    , (21));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v22    , (22));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v23    , (23));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v24    , (24));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v25    , (25));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v26    , (26));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v27    , (27));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v28    , (28));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v29    , (29));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v30    , (30));
+CONSTANT_REGISTER_DECLARATION(VectorRegister, v31    , (31));
+
+
+// Need to know the total number of registers of all sorts for SharedInfo.
+// Define a class that exports it.
+class ConcreteRegisterImpl : public AbstractRegisterImpl {
+ public:
+  enum {
+  // A big enough number for C2: all the registers plus flags
+  // This number must be large enough to cover REG_COUNT (defined by c2) registers.
+  // There is no requirement that any ordering here matches any ordering c2 gives
+  // it's optoregs.
+
+    number_of_registers = (RegisterImpl::max_slots_per_register * RegisterImpl::number_of_registers +
+                           FloatRegisterImpl::max_slots_per_register * FloatRegisterImpl::number_of_registers +
+                           VectorRegisterImpl::max_slots_per_register * VectorRegisterImpl::number_of_registers)
+  };
+
+  // added to make it compile
+  static const int max_gpr;
+  static const int max_fpr;
+  static const int max_vpr;
+};
+
+typedef AbstractRegSet<Register> RegSet;
+typedef AbstractRegSet<FloatRegister> FloatRegSet;
+typedef AbstractRegSet<VectorRegister> VectorRegSet;
+
+#endif // CPU_RISCV_REGISTER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/relocInfo_riscv.cpp b/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
new file mode 100644
index 00000000000..228a64eae2c
--- /dev/null
+++ b/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "code/relocInfo.hpp"
+#include "nativeInst_riscv.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/safepoint.hpp"
+
+void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
+  if (verify_only) {
+    return;
+  }
+
+  int bytes;
+
+  switch (type()) {
+    case relocInfo::oop_type: {
+      oop_Relocation *reloc = (oop_Relocation *)this;
+      // in movoop when BarrierSet::barrier_set()->barrier_set_nmethod() != NULL || !immediate
+      if (NativeInstruction::is_load_pc_relative_at(addr())) {
+        address constptr = (address)code()->oop_addr_at(reloc->oop_index());
+        bytes = MacroAssembler::pd_patch_instruction_size(addr(), constptr);
+        assert(*(address*)constptr == x, "error in oop relocation");
+      } else {
+        bytes = MacroAssembler::patch_oop(addr(), x);
+      }
+      break;
+    }
+    default:
+      bytes = MacroAssembler::pd_patch_instruction_size(addr(), x);
+      break;
+  }
+  ICache::invalidate_range(addr(), bytes);
+}
+
+address Relocation::pd_call_destination(address orig_addr) {
+  assert(is_call(), "should be an address instruction here");
+  if (NativeCall::is_call_at(addr())) {
+    address trampoline = nativeCall_at(addr())->get_trampoline();
+    if (trampoline != NULL) {
+      return nativeCallTrampolineStub_at(trampoline)->destination();
+    }
+  }
+  if (orig_addr != NULL) {
+    // the extracted address from the instructions in address orig_addr
+    address new_addr = MacroAssembler::pd_call_destination(orig_addr);
+    // If call is branch to self, don't try to relocate it, just leave it
+    // as branch to self. This happens during code generation if the code
+    // buffer expands. It will be relocated to the trampoline above once
+    // code generation is complete.
+    new_addr = (new_addr == orig_addr) ? addr() : new_addr;
+    return new_addr;
+  }
+  return MacroAssembler::pd_call_destination(addr());
+}
+
+void Relocation::pd_set_call_destination(address x) {
+  assert(is_call(), "should be an address instruction here");
+  if (NativeCall::is_call_at(addr())) {
+    address trampoline = nativeCall_at(addr())->get_trampoline();
+    if (trampoline != NULL) {
+      nativeCall_at(addr())->set_destination_mt_safe(x, /* assert_lock */false);
+      return;
+    }
+  }
+  MacroAssembler::pd_patch_instruction_size(addr(), x);
+  address pd_call = pd_call_destination(addr());
+  assert(pd_call == x, "fail in reloc");
+}
+
+address* Relocation::pd_address_in_code() {
+  assert(NativeCall::is_load_pc_relative_at(addr()), "Not the expected instruction sequence!");
+  return (address*)(MacroAssembler::target_addr_for_insn(addr()));
+}
+
+address Relocation::pd_get_address_from_code() {
+  return MacroAssembler::pd_call_destination(addr());
+}
+
+void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
+  if (NativeInstruction::maybe_cpool_ref(addr())) {
+    address old_addr = old_addr_for(addr(), src, dest);
+    MacroAssembler::pd_patch_instruction_size(addr(), MacroAssembler::target_addr_for_insn(old_addr));
+  }
+}
+
+void metadata_Relocation::pd_fix_value(address x) {
+}
diff --git a/src/hotspot/cpu/riscv/relocInfo_riscv.hpp b/src/hotspot/cpu/riscv/relocInfo_riscv.hpp
new file mode 100644
index 00000000000..840ed935d88
--- /dev/null
+++ b/src/hotspot/cpu/riscv/relocInfo_riscv.hpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_RELOCINFO_RISCV_HPP
+#define CPU_RISCV_RELOCINFO_RISCV_HPP
+
+  // machine-dependent parts of class relocInfo
+ private:
+  enum {
+    // Relocations are byte-aligned.
+    offset_unit        =  1,
+    // Must be at least 1 for RelocInfo::narrow_oop_in_const.
+    format_width       =  1
+  };
+
+ public:
+
+  // This platform has no oops in the code that are not also
+  // listed in the oop section.
+  static bool mustIterateImmediateOopsInCode() { return false; }
+
+#endif // CPU_RISCV_RELOCINFO_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
new file mode 100644
index 00000000000..588887e1d96
--- /dev/null
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -0,0 +1,10611 @@
+//
+// Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+// Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+//
+
+// RISCV Architecture Description File
+
+//----------REGISTER DEFINITION BLOCK------------------------------------------
+// This information is used by the matcher and the register allocator to
+// describe individual registers and classes of registers within the target
+// archtecture.
+
+register %{
+//----------Architecture Description Register Definitions----------------------
+// General Registers
+// "reg_def"  name ( register save type, C convention save type,
+//                   ideal register type, encoding );
+// Register Save Types:
+//
+// NS  = No-Save:       The register allocator assumes that these registers
+//                      can be used without saving upon entry to the method, &
+//                      that they do not need to be saved at call sites.
+//
+// SOC = Save-On-Call:  The register allocator assumes that these registers
+//                      can be used without saving upon entry to the method,
+//                      but that they must be saved at call sites.
+//
+// SOE = Save-On-Entry: The register allocator assumes that these registers
+//                      must be saved before using them upon entry to the
+//                      method, but they do not need to be saved at call
+//                      sites.
+//
+// AS  = Always-Save:   The register allocator assumes that these registers
+//                      must be saved before using them upon entry to the
+//                      method, & that they must be saved at call sites.
+//
+// Ideal Register Type is used to determine how to save & restore a
+// register.  Op_RegI will get spilled with LoadI/StoreI, Op_RegP will get
+// spilled with LoadP/StoreP.  If the register supports both, use Op_RegI.
+//
+// The encoding number is the actual bit-pattern placed into the opcodes.
+
+// We must define the 64 bit int registers in two 32 bit halves, the
+// real lower register and a virtual upper half register. upper halves
+// are used by the register allocator but are not actually supplied as
+// operands to memory ops.
+//
+// follow the C1 compiler in making registers
+//
+//   x7, x9-x17, x27-x31 volatile (caller save)
+//   x0-x4, x8, x23 system (no save, no allocate)
+//   x5-x6 non-allocatable (so we can use them as temporary regs)
+
+//
+// as regards Java usage. we don't use any callee save registers
+// because this makes it difficult to de-optimise a frame (see comment
+// in x86 implementation of Deoptimization::unwind_callee_save_values)
+//
+
+// General Registers
+
+reg_def R0      ( NS,  NS,  Op_RegI, 0,  x0->as_VMReg()         ); // zr
+reg_def R0_H    ( NS,  NS,  Op_RegI, 0,  x0->as_VMReg()->next() );
+reg_def R1      ( NS,  SOC, Op_RegI, 1,  x1->as_VMReg()         ); // ra
+reg_def R1_H    ( NS,  SOC, Op_RegI, 1,  x1->as_VMReg()->next() );
+reg_def R2      ( NS,  SOE, Op_RegI, 2,  x2->as_VMReg()         ); // sp
+reg_def R2_H    ( NS,  SOE, Op_RegI, 2,  x2->as_VMReg()->next() );
+reg_def R3      ( NS,  NS,  Op_RegI, 3,  x3->as_VMReg()         ); // gp
+reg_def R3_H    ( NS,  NS,  Op_RegI, 3,  x3->as_VMReg()->next() );
+reg_def R4      ( NS,  NS,  Op_RegI, 4,  x4->as_VMReg()         ); // tp
+reg_def R4_H    ( NS,  NS,  Op_RegI, 4,  x4->as_VMReg()->next() );
+reg_def R7      ( SOC, SOC, Op_RegI, 7,  x7->as_VMReg()         );
+reg_def R7_H    ( SOC, SOC, Op_RegI, 7,  x7->as_VMReg()->next() );
+reg_def R8      ( NS,  SOE, Op_RegI, 8,  x8->as_VMReg()         ); // fp
+reg_def R8_H    ( NS,  SOE, Op_RegI, 8,  x8->as_VMReg()->next() );
+reg_def R9      ( SOC, SOE, Op_RegI, 9,  x9->as_VMReg()         );
+reg_def R9_H    ( SOC, SOE, Op_RegI, 9,  x9->as_VMReg()->next() );
+reg_def R10     ( SOC, SOC, Op_RegI, 10, x10->as_VMReg()        );
+reg_def R10_H   ( SOC, SOC, Op_RegI, 10, x10->as_VMReg()->next());
+reg_def R11     ( SOC, SOC, Op_RegI, 11, x11->as_VMReg()        );
+reg_def R11_H   ( SOC, SOC, Op_RegI, 11, x11->as_VMReg()->next());
+reg_def R12     ( SOC, SOC, Op_RegI, 12, x12->as_VMReg()        );
+reg_def R12_H   ( SOC, SOC, Op_RegI, 12, x12->as_VMReg()->next());
+reg_def R13     ( SOC, SOC, Op_RegI, 13, x13->as_VMReg()        );
+reg_def R13_H   ( SOC, SOC, Op_RegI, 13, x13->as_VMReg()->next());
+reg_def R14     ( SOC, SOC, Op_RegI, 14, x14->as_VMReg()        );
+reg_def R14_H   ( SOC, SOC, Op_RegI, 14, x14->as_VMReg()->next());
+reg_def R15     ( SOC, SOC, Op_RegI, 15, x15->as_VMReg()        );
+reg_def R15_H   ( SOC, SOC, Op_RegI, 15, x15->as_VMReg()->next());
+reg_def R16     ( SOC, SOC, Op_RegI, 16, x16->as_VMReg()        );
+reg_def R16_H   ( SOC, SOC, Op_RegI, 16, x16->as_VMReg()->next());
+reg_def R17     ( SOC, SOC, Op_RegI, 17, x17->as_VMReg()        );
+reg_def R17_H   ( SOC, SOC, Op_RegI, 17, x17->as_VMReg()->next());
+reg_def R18     ( SOC, SOE, Op_RegI, 18, x18->as_VMReg()        );
+reg_def R18_H   ( SOC, SOE, Op_RegI, 18, x18->as_VMReg()->next());
+reg_def R19     ( SOC, SOE, Op_RegI, 19, x19->as_VMReg()        );
+reg_def R19_H   ( SOC, SOE, Op_RegI, 19, x19->as_VMReg()->next());
+reg_def R20     ( SOC, SOE, Op_RegI, 20, x20->as_VMReg()        ); // caller esp
+reg_def R20_H   ( SOC, SOE, Op_RegI, 20, x20->as_VMReg()->next());
+reg_def R21     ( SOC, SOE, Op_RegI, 21, x21->as_VMReg()        );
+reg_def R21_H   ( SOC, SOE, Op_RegI, 21, x21->as_VMReg()->next());
+reg_def R22     ( SOC, SOE, Op_RegI, 22, x22->as_VMReg()        );
+reg_def R22_H   ( SOC, SOE, Op_RegI, 22, x22->as_VMReg()->next());
+reg_def R23     ( NS,  SOE, Op_RegI, 23, x23->as_VMReg()        ); // java thread
+reg_def R23_H   ( NS,  SOE, Op_RegI, 23, x23->as_VMReg()->next());
+reg_def R24     ( SOC, SOE, Op_RegI, 24, x24->as_VMReg()        );
+reg_def R24_H   ( SOC, SOE, Op_RegI, 24, x24->as_VMReg()->next());
+reg_def R25     ( SOC, SOE, Op_RegI, 25, x25->as_VMReg()        );
+reg_def R25_H   ( SOC, SOE, Op_RegI, 25, x25->as_VMReg()->next());
+reg_def R26     ( SOC, SOE, Op_RegI, 26, x26->as_VMReg()        );
+reg_def R26_H   ( SOC, SOE, Op_RegI, 26, x26->as_VMReg()->next());
+reg_def R27     ( SOC, SOE, Op_RegI, 27, x27->as_VMReg()        ); // heapbase
+reg_def R27_H   ( SOC, SOE, Op_RegI, 27, x27->as_VMReg()->next());
+reg_def R28     ( SOC, SOC, Op_RegI, 28, x28->as_VMReg()        );
+reg_def R28_H   ( SOC, SOC, Op_RegI, 28, x28->as_VMReg()->next());
+reg_def R29     ( SOC, SOC, Op_RegI, 29, x29->as_VMReg()        );
+reg_def R29_H   ( SOC, SOC, Op_RegI, 29, x29->as_VMReg()->next());
+reg_def R30     ( SOC, SOC, Op_RegI, 30, x30->as_VMReg()        );
+reg_def R30_H   ( SOC, SOC, Op_RegI, 30, x30->as_VMReg()->next());
+reg_def R31     ( SOC, SOC, Op_RegI, 31, x31->as_VMReg()        );
+reg_def R31_H   ( SOC, SOC, Op_RegI, 31, x31->as_VMReg()->next());
+
+// ----------------------------
+// Float/Double Registers
+// ----------------------------
+
+// Double Registers
+
+// The rules of ADL require that double registers be defined in pairs.
+// Each pair must be two 32-bit values, but not necessarily a pair of
+// single float registers. In each pair, ADLC-assigned register numbers
+// must be adjacent, with the lower number even. Finally, when the
+// CPU stores such a register pair to memory, the word associated with
+// the lower ADLC-assigned number must be stored to the lower address.
+
+// RISCV has 32 floating-point registers. Each can store a single
+// or double precision floating-point value.
+
+// for Java use float registers f0-f31 are always save on call whereas
+// the platform ABI treats f8-f9 and f18-f27 as callee save). Other
+// float registers are SOC as per the platform spec
+
+reg_def F0    ( SOC, SOC, Op_RegF,  0,  f0->as_VMReg()          );
+reg_def F0_H  ( SOC, SOC, Op_RegF,  0,  f0->as_VMReg()->next()  );
+reg_def F1    ( SOC, SOC, Op_RegF,  1,  f1->as_VMReg()          );
+reg_def F1_H  ( SOC, SOC, Op_RegF,  1,  f1->as_VMReg()->next()  );
+reg_def F2    ( SOC, SOC, Op_RegF,  2,  f2->as_VMReg()          );
+reg_def F2_H  ( SOC, SOC, Op_RegF,  2,  f2->as_VMReg()->next()  );
+reg_def F3    ( SOC, SOC, Op_RegF,  3,  f3->as_VMReg()          );
+reg_def F3_H  ( SOC, SOC, Op_RegF,  3,  f3->as_VMReg()->next()  );
+reg_def F4    ( SOC, SOC, Op_RegF,  4,  f4->as_VMReg()          );
+reg_def F4_H  ( SOC, SOC, Op_RegF,  4,  f4->as_VMReg()->next()  );
+reg_def F5    ( SOC, SOC, Op_RegF,  5,  f5->as_VMReg()          );
+reg_def F5_H  ( SOC, SOC, Op_RegF,  5,  f5->as_VMReg()->next()  );
+reg_def F6    ( SOC, SOC, Op_RegF,  6,  f6->as_VMReg()          );
+reg_def F6_H  ( SOC, SOC, Op_RegF,  6,  f6->as_VMReg()->next()  );
+reg_def F7    ( SOC, SOC, Op_RegF,  7,  f7->as_VMReg()          );
+reg_def F7_H  ( SOC, SOC, Op_RegF,  7,  f7->as_VMReg()->next()  );
+reg_def F8    ( SOC, SOE, Op_RegF,  8,  f8->as_VMReg()          );
+reg_def F8_H  ( SOC, SOE, Op_RegF,  8,  f8->as_VMReg()->next()  );
+reg_def F9    ( SOC, SOE, Op_RegF,  9,  f9->as_VMReg()          );
+reg_def F9_H  ( SOC, SOE, Op_RegF,  9,  f9->as_VMReg()->next()  );
+reg_def F10   ( SOC, SOC, Op_RegF,  10, f10->as_VMReg()         );
+reg_def F10_H ( SOC, SOC, Op_RegF,  10, f10->as_VMReg()->next() );
+reg_def F11   ( SOC, SOC, Op_RegF,  11, f11->as_VMReg()         );
+reg_def F11_H ( SOC, SOC, Op_RegF,  11, f11->as_VMReg()->next() );
+reg_def F12   ( SOC, SOC, Op_RegF,  12, f12->as_VMReg()         );
+reg_def F12_H ( SOC, SOC, Op_RegF,  12, f12->as_VMReg()->next() );
+reg_def F13   ( SOC, SOC, Op_RegF,  13, f13->as_VMReg()         );
+reg_def F13_H ( SOC, SOC, Op_RegF,  13, f13->as_VMReg()->next() );
+reg_def F14   ( SOC, SOC, Op_RegF,  14, f14->as_VMReg()         );
+reg_def F14_H ( SOC, SOC, Op_RegF,  14, f14->as_VMReg()->next() );
+reg_def F15   ( SOC, SOC, Op_RegF,  15, f15->as_VMReg()         );
+reg_def F15_H ( SOC, SOC, Op_RegF,  15, f15->as_VMReg()->next() );
+reg_def F16   ( SOC, SOC, Op_RegF,  16, f16->as_VMReg()         );
+reg_def F16_H ( SOC, SOC, Op_RegF,  16, f16->as_VMReg()->next() );
+reg_def F17   ( SOC, SOC, Op_RegF,  17, f17->as_VMReg()         );
+reg_def F17_H ( SOC, SOC, Op_RegF,  17, f17->as_VMReg()->next() );
+reg_def F18   ( SOC, SOE, Op_RegF,  18, f18->as_VMReg()         );
+reg_def F18_H ( SOC, SOE, Op_RegF,  18, f18->as_VMReg()->next() );
+reg_def F19   ( SOC, SOE, Op_RegF,  19, f19->as_VMReg()         );
+reg_def F19_H ( SOC, SOE, Op_RegF,  19, f19->as_VMReg()->next() );
+reg_def F20   ( SOC, SOE, Op_RegF,  20, f20->as_VMReg()         );
+reg_def F20_H ( SOC, SOE, Op_RegF,  20, f20->as_VMReg()->next() );
+reg_def F21   ( SOC, SOE, Op_RegF,  21, f21->as_VMReg()         );
+reg_def F21_H ( SOC, SOE, Op_RegF,  21, f21->as_VMReg()->next() );
+reg_def F22   ( SOC, SOE, Op_RegF,  22, f22->as_VMReg()         );
+reg_def F22_H ( SOC, SOE, Op_RegF,  22, f22->as_VMReg()->next() );
+reg_def F23   ( SOC, SOE, Op_RegF,  23, f23->as_VMReg()         );
+reg_def F23_H ( SOC, SOE, Op_RegF,  23, f23->as_VMReg()->next() );
+reg_def F24   ( SOC, SOE, Op_RegF,  24, f24->as_VMReg()         );
+reg_def F24_H ( SOC, SOE, Op_RegF,  24, f24->as_VMReg()->next() );
+reg_def F25   ( SOC, SOE, Op_RegF,  25, f25->as_VMReg()         );
+reg_def F25_H ( SOC, SOE, Op_RegF,  25, f25->as_VMReg()->next() );
+reg_def F26   ( SOC, SOE, Op_RegF,  26, f26->as_VMReg()         );
+reg_def F26_H ( SOC, SOE, Op_RegF,  26, f26->as_VMReg()->next() );
+reg_def F27   ( SOC, SOE, Op_RegF,  27, f27->as_VMReg()         );
+reg_def F27_H ( SOC, SOE, Op_RegF,  27, f27->as_VMReg()->next() );
+reg_def F28   ( SOC, SOC, Op_RegF,  28, f28->as_VMReg()         );
+reg_def F28_H ( SOC, SOC, Op_RegF,  28, f28->as_VMReg()->next() );
+reg_def F29   ( SOC, SOC, Op_RegF,  29, f29->as_VMReg()         );
+reg_def F29_H ( SOC, SOC, Op_RegF,  29, f29->as_VMReg()->next() );
+reg_def F30   ( SOC, SOC, Op_RegF,  30, f30->as_VMReg()         );
+reg_def F30_H ( SOC, SOC, Op_RegF,  30, f30->as_VMReg()->next() );
+reg_def F31   ( SOC, SOC, Op_RegF,  31, f31->as_VMReg()         );
+reg_def F31_H ( SOC, SOC, Op_RegF,  31, f31->as_VMReg()->next() );
+
+// ----------------------------
+// Vector Registers
+// ----------------------------
+
+// For RVV vector registers, we simply extend vector register size to 4
+// 'logical' slots. This is nominally 128 bits but it actually covers
+// all possible 'physical' RVV vector register lengths from 128 ~ 1024
+// bits. The 'physical' RVV vector register length is detected during
+// startup, so the register allocator is able to identify the correct
+// number of bytes needed for an RVV spill/unspill.
+
+reg_def V0    ( SOC, SOC, Op_VecA, 0,  v0->as_VMReg()           );
+reg_def V0_H  ( SOC, SOC, Op_VecA, 0,  v0->as_VMReg()->next()   );
+reg_def V0_J  ( SOC, SOC, Op_VecA, 0,  v0->as_VMReg()->next(2)  );
+reg_def V0_K  ( SOC, SOC, Op_VecA, 0,  v0->as_VMReg()->next(3)  );
+
+reg_def V1    ( SOC, SOC, Op_VecA, 1,  v1->as_VMReg() 	        );
+reg_def V1_H  ( SOC, SOC, Op_VecA, 1,  v1->as_VMReg()->next()   );
+reg_def V1_J  ( SOC, SOC, Op_VecA, 1,  v1->as_VMReg()->next(2)  );
+reg_def V1_K  ( SOC, SOC, Op_VecA, 1,  v1->as_VMReg()->next(3)  );
+
+reg_def V2    ( SOC, SOC, Op_VecA, 2,  v2->as_VMReg()           );
+reg_def V2_H  ( SOC, SOC, Op_VecA, 2,  v2->as_VMReg()->next()   );
+reg_def V2_J  ( SOC, SOC, Op_VecA, 2,  v2->as_VMReg()->next(2)  );
+reg_def V2_K  ( SOC, SOC, Op_VecA, 2,  v2->as_VMReg()->next(3)  );
+
+reg_def V3    ( SOC, SOC, Op_VecA, 3,  v3->as_VMReg()           );
+reg_def V3_H  ( SOC, SOC, Op_VecA, 3,  v3->as_VMReg()->next()   );
+reg_def V3_J  ( SOC, SOC, Op_VecA, 3,  v3->as_VMReg()->next(2)  );
+reg_def V3_K  ( SOC, SOC, Op_VecA, 3,  v3->as_VMReg()->next(3)  );
+
+reg_def V4    ( SOC, SOC, Op_VecA, 4,  v4->as_VMReg()           );
+reg_def V4_H  ( SOC, SOC, Op_VecA, 4,  v4->as_VMReg()->next()   );
+reg_def V4_J  ( SOC, SOC, Op_VecA, 4,  v4->as_VMReg()->next(2)  );
+reg_def V4_K  ( SOC, SOC, Op_VecA, 4,  v4->as_VMReg()->next(3)  );
+
+reg_def V5    ( SOC, SOC, Op_VecA, 5,  v5->as_VMReg() 	        );
+reg_def V5_H  ( SOC, SOC, Op_VecA, 5,  v5->as_VMReg()->next()   );
+reg_def V5_J  ( SOC, SOC, Op_VecA, 5,  v5->as_VMReg()->next(2)  );
+reg_def V5_K  ( SOC, SOC, Op_VecA, 5,  v5->as_VMReg()->next(3)  );
+
+reg_def V6    ( SOC, SOC, Op_VecA, 6,  v6->as_VMReg()           );
+reg_def V6_H  ( SOC, SOC, Op_VecA, 6,  v6->as_VMReg()->next()   );
+reg_def V6_J  ( SOC, SOC, Op_VecA, 6,  v6->as_VMReg()->next(2)  );
+reg_def V6_K  ( SOC, SOC, Op_VecA, 6,  v6->as_VMReg()->next(3)  );
+
+reg_def V7    ( SOC, SOC, Op_VecA, 7,  v7->as_VMReg() 	        );
+reg_def V7_H  ( SOC, SOC, Op_VecA, 7,  v7->as_VMReg()->next()   );
+reg_def V7_J  ( SOC, SOC, Op_VecA, 7,  v7->as_VMReg()->next(2)  );
+reg_def V7_K  ( SOC, SOC, Op_VecA, 7,  v7->as_VMReg()->next(3)  );
+
+reg_def V8    ( SOC, SOC, Op_VecA, 8,  v8->as_VMReg()           );
+reg_def V8_H  ( SOC, SOC, Op_VecA, 8,  v8->as_VMReg()->next()   );
+reg_def V8_J  ( SOC, SOC, Op_VecA, 8,  v8->as_VMReg()->next(2)  );
+reg_def V8_K  ( SOC, SOC, Op_VecA, 8,  v8->as_VMReg()->next(3)  );
+
+reg_def V9    ( SOC, SOC, Op_VecA, 9,  v9->as_VMReg()           );
+reg_def V9_H  ( SOC, SOC, Op_VecA, 9,  v9->as_VMReg()->next()   );
+reg_def V9_J  ( SOC, SOC, Op_VecA, 9,  v9->as_VMReg()->next(2)  );
+reg_def V9_K  ( SOC, SOC, Op_VecA, 9,  v9->as_VMReg()->next(3)  );
+
+reg_def V10   ( SOC, SOC, Op_VecA, 10, v10->as_VMReg()          );
+reg_def V10_H ( SOC, SOC, Op_VecA, 10, v10->as_VMReg()->next()  );
+reg_def V10_J ( SOC, SOC, Op_VecA, 10, v10->as_VMReg()->next(2) );
+reg_def V10_K ( SOC, SOC, Op_VecA, 10, v10->as_VMReg()->next(3) );
+
+reg_def V11   ( SOC, SOC, Op_VecA, 11, v11->as_VMReg()          );
+reg_def V11_H ( SOC, SOC, Op_VecA, 11, v11->as_VMReg()->next()  );
+reg_def V11_J ( SOC, SOC, Op_VecA, 11, v11->as_VMReg()->next(2) );
+reg_def V11_K ( SOC, SOC, Op_VecA, 11, v11->as_VMReg()->next(3) );
+
+reg_def V12   ( SOC, SOC, Op_VecA, 12, v12->as_VMReg()          );
+reg_def V12_H ( SOC, SOC, Op_VecA, 12, v12->as_VMReg()->next()  );
+reg_def V12_J ( SOC, SOC, Op_VecA, 12, v12->as_VMReg()->next(2) );
+reg_def V12_K ( SOC, SOC, Op_VecA, 12, v12->as_VMReg()->next(3) );
+
+reg_def V13   ( SOC, SOC, Op_VecA, 13, v13->as_VMReg()          );
+reg_def V13_H ( SOC, SOC, Op_VecA, 13, v13->as_VMReg()->next()  );
+reg_def V13_J ( SOC, SOC, Op_VecA, 13, v13->as_VMReg()->next(2) );
+reg_def V13_K ( SOC, SOC, Op_VecA, 13, v13->as_VMReg()->next(3) );
+
+reg_def V14   ( SOC, SOC, Op_VecA, 14, v14->as_VMReg()          );
+reg_def V14_H ( SOC, SOC, Op_VecA, 14, v14->as_VMReg()->next()  );
+reg_def V14_J ( SOC, SOC, Op_VecA, 14, v14->as_VMReg()->next(2) );
+reg_def V14_K ( SOC, SOC, Op_VecA, 14, v14->as_VMReg()->next(3) );
+
+reg_def V15   ( SOC, SOC, Op_VecA, 15, v15->as_VMReg()          );
+reg_def V15_H ( SOC, SOC, Op_VecA, 15, v15->as_VMReg()->next()  );
+reg_def V15_J ( SOC, SOC, Op_VecA, 15, v15->as_VMReg()->next(2) );
+reg_def V15_K ( SOC, SOC, Op_VecA, 15, v15->as_VMReg()->next(3) );
+
+reg_def V16   ( SOC, SOC, Op_VecA, 16, v16->as_VMReg()          );
+reg_def V16_H ( SOC, SOC, Op_VecA, 16, v16->as_VMReg()->next()  );
+reg_def V16_J ( SOC, SOC, Op_VecA, 16, v16->as_VMReg()->next(2) );
+reg_def V16_K ( SOC, SOC, Op_VecA, 16, v16->as_VMReg()->next(3) );
+
+reg_def V17   ( SOC, SOC, Op_VecA, 17, v17->as_VMReg()          );
+reg_def V17_H ( SOC, SOC, Op_VecA, 17, v17->as_VMReg()->next()  );
+reg_def V17_J ( SOC, SOC, Op_VecA, 17, v17->as_VMReg()->next(2) );
+reg_def V17_K ( SOC, SOC, Op_VecA, 17, v17->as_VMReg()->next(3) );
+
+reg_def V18   ( SOC, SOC, Op_VecA, 18, v18->as_VMReg()          );
+reg_def V18_H ( SOC, SOC, Op_VecA, 18, v18->as_VMReg()->next()  );
+reg_def V18_J ( SOC, SOC, Op_VecA, 18, v18->as_VMReg()->next(2) );
+reg_def V18_K ( SOC, SOC, Op_VecA, 18, v18->as_VMReg()->next(3) );
+
+reg_def V19   ( SOC, SOC, Op_VecA, 19, v19->as_VMReg()          );
+reg_def V19_H ( SOC, SOC, Op_VecA, 19, v19->as_VMReg()->next()  );
+reg_def V19_J ( SOC, SOC, Op_VecA, 19, v19->as_VMReg()->next(2) );
+reg_def V19_K ( SOC, SOC, Op_VecA, 19, v19->as_VMReg()->next(3) );
+
+reg_def V20   ( SOC, SOC, Op_VecA, 20, v20->as_VMReg()          );
+reg_def V20_H ( SOC, SOC, Op_VecA, 20, v20->as_VMReg()->next()  );
+reg_def V20_J ( SOC, SOC, Op_VecA, 20, v20->as_VMReg()->next(2) );
+reg_def V20_K ( SOC, SOC, Op_VecA, 20, v20->as_VMReg()->next(3) );
+
+reg_def V21   ( SOC, SOC, Op_VecA, 21, v21->as_VMReg()          );
+reg_def V21_H ( SOC, SOC, Op_VecA, 21, v21->as_VMReg()->next()  );
+reg_def V21_J ( SOC, SOC, Op_VecA, 21, v21->as_VMReg()->next(2) );
+reg_def V21_K ( SOC, SOC, Op_VecA, 21, v21->as_VMReg()->next(3) );
+
+reg_def V22   ( SOC, SOC, Op_VecA, 22, v22->as_VMReg()          );
+reg_def V22_H ( SOC, SOC, Op_VecA, 22, v22->as_VMReg()->next()  );
+reg_def V22_J ( SOC, SOC, Op_VecA, 22, v22->as_VMReg()->next(2) );
+reg_def V22_K ( SOC, SOC, Op_VecA, 22, v22->as_VMReg()->next(3) );
+
+reg_def V23   ( SOC, SOC, Op_VecA, 23, v23->as_VMReg()          );
+reg_def V23_H ( SOC, SOC, Op_VecA, 23, v23->as_VMReg()->next()  );
+reg_def V23_J ( SOC, SOC, Op_VecA, 23, v23->as_VMReg()->next(2) );
+reg_def V23_K ( SOC, SOC, Op_VecA, 23, v23->as_VMReg()->next(3) );
+
+reg_def V24   ( SOC, SOC, Op_VecA, 24, v24->as_VMReg()          );
+reg_def V24_H ( SOC, SOC, Op_VecA, 24, v24->as_VMReg()->next()  );
+reg_def V24_J ( SOC, SOC, Op_VecA, 24, v24->as_VMReg()->next(2) );
+reg_def V24_K ( SOC, SOC, Op_VecA, 24, v24->as_VMReg()->next(3) );
+
+reg_def V25   ( SOC, SOC, Op_VecA, 25, v25->as_VMReg()          );
+reg_def V25_H ( SOC, SOC, Op_VecA, 25, v25->as_VMReg()->next()  );
+reg_def V25_J ( SOC, SOC, Op_VecA, 25, v25->as_VMReg()->next(2) );
+reg_def V25_K ( SOC, SOC, Op_VecA, 25, v25->as_VMReg()->next(3) );
+
+reg_def V26   ( SOC, SOC, Op_VecA, 26, v26->as_VMReg()          );
+reg_def V26_H ( SOC, SOC, Op_VecA, 26, v26->as_VMReg()->next()  );
+reg_def V26_J ( SOC, SOC, Op_VecA, 26, v26->as_VMReg()->next(2) );
+reg_def V26_K ( SOC, SOC, Op_VecA, 26, v26->as_VMReg()->next(3) );
+
+reg_def V27   ( SOC, SOC, Op_VecA, 27, v27->as_VMReg()          );
+reg_def V27_H ( SOC, SOC, Op_VecA, 27, v27->as_VMReg()->next()  );
+reg_def V27_J ( SOC, SOC, Op_VecA, 27, v27->as_VMReg()->next(2) );
+reg_def V27_K ( SOC, SOC, Op_VecA, 27, v27->as_VMReg()->next(3) );
+
+reg_def V28   ( SOC, SOC, Op_VecA, 28, v28->as_VMReg()          );
+reg_def V28_H ( SOC, SOC, Op_VecA, 28, v28->as_VMReg()->next()  );
+reg_def V28_J ( SOC, SOC, Op_VecA, 28, v28->as_VMReg()->next(2) );
+reg_def V28_K ( SOC, SOC, Op_VecA, 28, v28->as_VMReg()->next(3) );
+
+reg_def V29   ( SOC, SOC, Op_VecA, 29, v29->as_VMReg()          );
+reg_def V29_H ( SOC, SOC, Op_VecA, 29, v29->as_VMReg()->next()  );
+reg_def V29_J ( SOC, SOC, Op_VecA, 29, v29->as_VMReg()->next(2) );
+reg_def V29_K ( SOC, SOC, Op_VecA, 29, v29->as_VMReg()->next(3) );
+
+reg_def V30   ( SOC, SOC, Op_VecA, 30, v30->as_VMReg()          );
+reg_def V30_H ( SOC, SOC, Op_VecA, 30, v30->as_VMReg()->next()  );
+reg_def V30_J ( SOC, SOC, Op_VecA, 30, v30->as_VMReg()->next(2) );
+reg_def V30_K ( SOC, SOC, Op_VecA, 30, v30->as_VMReg()->next(3) );
+
+reg_def V31   ( SOC, SOC, Op_VecA, 31, v31->as_VMReg()          );
+reg_def V31_H ( SOC, SOC, Op_VecA, 31, v31->as_VMReg()->next()  );
+reg_def V31_J ( SOC, SOC, Op_VecA, 31, v31->as_VMReg()->next(2) );
+reg_def V31_K ( SOC, SOC, Op_VecA, 31, v31->as_VMReg()->next(3) );
+
+// ----------------------------
+// Special Registers
+// ----------------------------
+
+// On riscv, the physical flag register is missing, so we use t1 instead,
+// to bridge the RegFlag semantics in share/opto
+
+reg_def RFLAGS   (SOC, SOC, Op_RegFlags, 6, x6->as_VMReg()        );
+
+// Specify priority of register selection within phases of register
+// allocation.  Highest priority is first.  A useful heuristic is to
+// give registers a low priority when they are required by machine
+// instructions, like EAX and EDX on I486, and choose no-save registers
+// before save-on-call, & save-on-call before save-on-entry.  Registers
+// which participate in fixed calling sequences should come last.
+// Registers which are used as pairs must fall on an even boundary.
+
+alloc_class chunk0(
+    // volatiles
+    R7,  R7_H,
+    R28, R28_H,
+    R29, R29_H,
+    R30, R30_H,
+    R31, R31_H,
+
+    // arg registers
+    R10, R10_H,
+    R11, R11_H,
+    R12, R12_H,
+    R13, R13_H,
+    R14, R14_H,
+    R15, R15_H,
+    R16, R16_H,
+    R17, R17_H,
+
+    // non-volatiles
+    R9,  R9_H,
+    R18, R18_H,
+    R19, R19_H,
+    R20, R20_H,
+    R21, R21_H,
+    R22, R22_H,
+    R24, R24_H,
+    R25, R25_H,
+    R26, R26_H,
+
+    // non-allocatable registers
+    R23, R23_H, // java thread
+    R27, R27_H, // heapbase
+    R4,  R4_H,  // thread
+    R8,  R8_H,  // fp
+    R0,  R0_H,  // zero
+    R1,  R1_H,  // ra
+    R2,  R2_H,  // sp
+    R3,  R3_H,  // gp
+);
+
+alloc_class chunk1(
+
+    // no save
+    F0,  F0_H,
+    F1,  F1_H,
+    F2,  F2_H,
+    F3,  F3_H,
+    F4,  F4_H,
+    F5,  F5_H,
+    F6,  F6_H,
+    F7,  F7_H,
+    F28, F28_H,
+    F29, F29_H,
+    F30, F30_H,
+    F31, F31_H,
+
+    // arg registers
+    F10, F10_H,
+    F11, F11_H,
+    F12, F12_H,
+    F13, F13_H,
+    F14, F14_H,
+    F15, F15_H,
+    F16, F16_H,
+    F17, F17_H,
+
+    // non-volatiles
+    F8,  F8_H,
+    F9,  F9_H,
+    F18, F18_H,
+    F19, F19_H,
+    F20, F20_H,
+    F21, F21_H,
+    F22, F22_H,
+    F23, F23_H,
+    F24, F24_H,
+    F25, F25_H,
+    F26, F26_H,
+    F27, F27_H,
+);
+
+alloc_class chunk2(
+    V0, V0_H, V0_J, V0_K,
+    V1, V1_H, V1_J, V1_K,
+    V2, V2_H, V2_J, V2_K,
+    V3, V3_H, V3_J, V3_K,
+    V4, V4_H, V4_J, V4_K,
+    V5, V5_H, V5_J, V5_K,
+    V6, V6_H, V6_J, V6_K,
+    V7, V7_H, V7_J, V7_K,
+    V8, V8_H, V8_J, V8_K,
+    V9, V9_H, V9_J, V9_K,
+    V10, V10_H, V10_J, V10_K,
+    V11, V11_H, V11_J, V11_K,
+    V12, V12_H, V12_J, V12_K,
+    V13, V13_H, V13_J, V13_K,
+    V14, V14_H, V14_J, V14_K,
+    V15, V15_H, V15_J, V15_K,
+    V16, V16_H, V16_J, V16_K,
+    V17, V17_H, V17_J, V17_K,
+    V18, V18_H, V18_J, V18_K,
+    V19, V19_H, V19_J, V19_K,
+    V20, V20_H, V20_J, V20_K,
+    V21, V21_H, V21_J, V21_K,
+    V22, V22_H, V22_J, V22_K,
+    V23, V23_H, V23_J, V23_K,
+    V24, V24_H, V24_J, V24_K,
+    V25, V25_H, V25_J, V25_K,
+    V26, V26_H, V26_J, V26_K,
+    V27, V27_H, V27_J, V27_K,
+    V28, V28_H, V28_J, V28_K,
+    V29, V29_H, V29_J, V29_K,
+    V30, V30_H, V30_J, V30_K,
+    V31, V31_H, V31_J, V31_K,
+);
+
+alloc_class chunk3(RFLAGS);
+
+//----------Architecture Description Register Classes--------------------------
+// Several register classes are automatically defined based upon information in
+// this architecture description.
+// 1) reg_class inline_cache_reg           ( /* as def'd in frame section */ )
+// 2) reg_class stack_slots( /* one chunk of stack-based "registers" */ )
+//
+
+// Class for all 32 bit general purpose registers
+reg_class all_reg32(
+    R0,
+    R1,
+    R2,
+    R3,
+    R4,
+    R7,
+    R8,
+    R9,
+    R10,
+    R11,
+    R12,
+    R13,
+    R14,
+    R15,
+    R16,
+    R17,
+    R18,
+    R19,
+    R20,
+    R21,
+    R22,
+    R23,
+    R24,
+    R25,
+    R26,
+    R27,
+    R28,
+    R29,
+    R30,
+    R31
+);
+
+// Class for any 32 bit integer registers (excluding zr)
+reg_class any_reg32 %{
+  return _ANY_REG32_mask;
+%}
+
+// Singleton class for R10 int register
+reg_class int_r10_reg(R10);
+
+// Singleton class for R12 int register
+reg_class int_r12_reg(R12);
+
+// Singleton class for R13 int register
+reg_class int_r13_reg(R13);
+
+// Singleton class for R14 int register
+reg_class int_r14_reg(R14);
+
+// Class for all long integer registers
+reg_class all_reg(
+    R0,  R0_H,
+    R1,  R1_H,
+    R2,  R2_H,
+    R3,  R3_H,
+    R4,  R4_H,
+    R7,  R7_H,
+    R8,  R8_H,
+    R9,  R9_H,
+    R10, R10_H,
+    R11, R11_H,
+    R12, R12_H,
+    R13, R13_H,
+    R14, R14_H,
+    R15, R15_H,
+    R16, R16_H,
+    R17, R17_H,
+    R18, R18_H,
+    R19, R19_H,
+    R20, R20_H,
+    R21, R21_H,
+    R22, R22_H,
+    R23, R23_H,
+    R24, R24_H,
+    R25, R25_H,
+    R26, R26_H,
+    R27, R27_H,
+    R28, R28_H,
+    R29, R29_H,
+    R30, R30_H,
+    R31, R31_H
+);
+
+// Class for all long integer registers (excluding zr)
+reg_class any_reg %{
+  return _ANY_REG_mask;
+%}
+
+// Class for non-allocatable 32 bit registers
+reg_class non_allocatable_reg32(
+    R0,                       // zr
+    R1,                       // ra
+    R2,                       // sp
+    R3,                       // gp
+    R4,                       // tp
+    R23                       // java thread
+);
+
+// Class for non-allocatable 64 bit registers
+reg_class non_allocatable_reg(
+    R0,  R0_H,                // zr
+    R1,  R1_H,                // ra
+    R2,  R2_H,                // sp
+    R3,  R3_H,                // gp
+    R4,  R4_H,                // tp
+    R23, R23_H                // java thread
+);
+
+reg_class no_special_reg32 %{
+  return _NO_SPECIAL_REG32_mask;
+%}
+
+reg_class no_special_reg %{
+  return _NO_SPECIAL_REG_mask;
+%}
+
+reg_class ptr_reg %{
+  return _PTR_REG_mask;
+%}
+
+reg_class no_special_ptr_reg %{
+  return _NO_SPECIAL_PTR_REG_mask;
+%}
+
+// Class for 64 bit register r10
+reg_class r10_reg(
+    R10, R10_H
+);
+
+// Class for 64 bit register r11
+reg_class r11_reg(
+    R11, R11_H
+);
+
+// Class for 64 bit register r12
+reg_class r12_reg(
+    R12, R12_H
+);
+
+// Class for 64 bit register r13
+reg_class r13_reg(
+    R13, R13_H
+);
+
+// Class for 64 bit register r14
+reg_class r14_reg(
+    R14, R14_H
+);
+
+// Class for 64 bit register r15
+reg_class r15_reg(
+    R15, R15_H
+);
+
+// Class for 64 bit register r16
+reg_class r16_reg(
+    R16, R16_H
+);
+
+// Class for method register
+reg_class method_reg(
+    R31, R31_H
+);
+
+// Class for heapbase register
+reg_class heapbase_reg(
+    R27, R27_H
+);
+
+// Class for java thread register
+reg_class java_thread_reg(
+    R23, R23_H
+);
+
+reg_class r28_reg(
+    R28, R28_H
+);
+
+reg_class r29_reg(
+    R29, R29_H
+);
+
+reg_class r30_reg(
+    R30, R30_H
+);
+
+// Class for zero registesr
+reg_class zr_reg(
+    R0, R0_H
+);
+
+// Class for thread register
+reg_class thread_reg(
+    R4, R4_H
+);
+
+// Class for frame pointer register
+reg_class fp_reg(
+    R8, R8_H
+);
+
+// Class for link register
+reg_class ra_reg(
+    R1, R1_H
+);
+
+// Class for long sp register
+reg_class sp_reg(
+    R2, R2_H
+);
+
+// Class for all float registers
+reg_class float_reg(
+    F0,
+    F1,
+    F2,
+    F3,
+    F4,
+    F5,
+    F6,
+    F7,
+    F8,
+    F9,
+    F10,
+    F11,
+    F12,
+    F13,
+    F14,
+    F15,
+    F16,
+    F17,
+    F18,
+    F19,
+    F20,
+    F21,
+    F22,
+    F23,
+    F24,
+    F25,
+    F26,
+    F27,
+    F28,
+    F29,
+    F30,
+    F31
+);
+
+// Double precision float registers have virtual `high halves' that
+// are needed by the allocator.
+// Class for all double registers
+reg_class double_reg(
+    F0,  F0_H,
+    F1,  F1_H,
+    F2,  F2_H,
+    F3,  F3_H,
+    F4,  F4_H,
+    F5,  F5_H,
+    F6,  F6_H,
+    F7,  F7_H,
+    F8,  F8_H,
+    F9,  F9_H,
+    F10, F10_H,
+    F11, F11_H,
+    F12, F12_H,
+    F13, F13_H,
+    F14, F14_H,
+    F15, F15_H,
+    F16, F16_H,
+    F17, F17_H,
+    F18, F18_H,
+    F19, F19_H,
+    F20, F20_H,
+    F21, F21_H,
+    F22, F22_H,
+    F23, F23_H,
+    F24, F24_H,
+    F25, F25_H,
+    F26, F26_H,
+    F27, F27_H,
+    F28, F28_H,
+    F29, F29_H,
+    F30, F30_H,
+    F31, F31_H
+);
+
+// Class for all RVV vector registers
+reg_class vectora_reg(
+    V1, V1_H, V1_J, V1_K,
+    V2, V2_H, V2_J, V2_K,
+    V3, V3_H, V3_J, V3_K,
+    V4, V4_H, V4_J, V4_K,
+    V5, V5_H, V5_J, V5_K,
+    V6, V6_H, V6_J, V6_K,
+    V7, V7_H, V7_J, V7_K,
+    V8, V8_H, V8_J, V8_K,
+    V9, V9_H, V9_J, V9_K,
+    V10, V10_H, V10_J, V10_K,
+    V11, V11_H, V11_J, V11_K,
+    V12, V12_H, V12_J, V12_K,
+    V13, V13_H, V13_J, V13_K,
+    V14, V14_H, V14_J, V14_K,
+    V15, V15_H, V15_J, V15_K,
+    V16, V16_H, V16_J, V16_K,
+    V17, V17_H, V17_J, V17_K,
+    V18, V18_H, V18_J, V18_K,
+    V19, V19_H, V19_J, V19_K,
+    V20, V20_H, V20_J, V20_K,
+    V21, V21_H, V21_J, V21_K,
+    V22, V22_H, V22_J, V22_K,
+    V23, V23_H, V23_J, V23_K,
+    V24, V24_H, V24_J, V24_K,
+    V25, V25_H, V25_J, V25_K,
+    V26, V26_H, V26_J, V26_K,
+    V27, V27_H, V27_J, V27_K,
+    V28, V28_H, V28_J, V28_K,
+    V29, V29_H, V29_J, V29_K,
+    V30, V30_H, V30_J, V30_K,
+    V31, V31_H, V31_J, V31_K
+);
+
+// Class for 64 bit register f0
+reg_class f0_reg(
+    F0, F0_H
+);
+
+// Class for 64 bit register f1
+reg_class f1_reg(
+    F1, F1_H
+);
+
+// Class for 64 bit register f2
+reg_class f2_reg(
+    F2, F2_H
+);
+
+// Class for 64 bit register f3
+reg_class f3_reg(
+    F3, F3_H
+);
+
+// class for vector register v1
+reg_class v1_reg(
+    V1, V1_H, V1_J, V1_K
+);
+
+// class for vector register v2
+reg_class v2_reg(
+    V2, V2_H, V2_J, V2_K
+);
+
+// class for vector register v3
+reg_class v3_reg(
+    V3, V3_H, V3_J, V3_K
+);
+
+// class for vector register v4
+reg_class v4_reg(
+    V4, V4_H, V4_J, V4_K
+);
+
+// class for vector register v5
+reg_class v5_reg(
+    V5, V5_H, V5_J, V5_K
+);
+
+// class for condition codes
+reg_class reg_flags(RFLAGS);
+%}
+
+//----------DEFINITION BLOCK---------------------------------------------------
+// Define name --> value mappings to inform the ADLC of an integer valued name
+// Current support includes integer values in the range [0, 0x7FFFFFFF]
+// Format:
+//        int_def  <name>         ( <int_value>, <expression>);
+// Generated Code in ad_<arch>.hpp
+//        #define  <name>   (<expression>)
+//        // value == <int_value>
+// Generated code in ad_<arch>.cpp adlc_verification()
+//        assert( <name> == <int_value>, "Expect (<expression>) to equal <int_value>");
+//
+
+// we follow the ppc-aix port in using a simple cost model which ranks
+// register operations as cheap, memory ops as more expensive and
+// branches as most expensive. the first two have a low as well as a
+// normal cost. huge cost appears to be a way of saying don't do
+// something
+
+definitions %{
+  // The default cost (of a register move instruction).
+  int_def DEFAULT_COST         (  100,               100);
+  int_def ALU_COST             (  100,  1 * DEFAULT_COST);          // unknown, const, arith, shift, slt,
+                                                                    // multi, auipc, nop, logical, move
+  int_def LOAD_COST            (  300,  3 * DEFAULT_COST);          // load, fpload
+  int_def STORE_COST           (  100,  1 * DEFAULT_COST);          // store, fpstore
+  int_def XFER_COST            (  300,  3 * DEFAULT_COST);          // mfc, mtc, fcvt, fmove, fcmp
+  int_def BRANCH_COST          (  100,  1 * DEFAULT_COST);          // branch, jmp, call
+  int_def IMUL_COST            ( 1000, 10 * DEFAULT_COST);          // imul
+  int_def IDIVSI_COST          ( 3400, 34 * DEFAULT_COST);          // idivdi
+  int_def IDIVDI_COST          ( 6600, 66 * DEFAULT_COST);          // idivsi
+  int_def FMUL_SINGLE_COST     (  500,  5 * DEFAULT_COST);          // fadd, fmul, fmadd
+  int_def FMUL_DOUBLE_COST     (  700,  7 * DEFAULT_COST);          // fadd, fmul, fmadd
+  int_def FDIV_COST            ( 2000, 20 * DEFAULT_COST);          // fdiv
+  int_def FSQRT_COST           ( 2500, 25 * DEFAULT_COST);          // fsqrt
+  int_def VOLATILE_REF_COST    ( 1000, 10 * DEFAULT_COST);
+%}
+
+
+
+//----------SOURCE BLOCK-------------------------------------------------------
+// This is a block of C++ code which provides values, functions, and
+// definitions necessary in the rest of the architecture description
+
+source_hpp %{
+
+#include "asm/macroAssembler.hpp"
+#include "gc/shared/cardTable.hpp"
+#include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "opto/addnode.hpp"
+#include "opto/convertnode.hpp"
+
+extern RegMask _ANY_REG32_mask;
+extern RegMask _ANY_REG_mask;
+extern RegMask _PTR_REG_mask;
+extern RegMask _NO_SPECIAL_REG32_mask;
+extern RegMask _NO_SPECIAL_REG_mask;
+extern RegMask _NO_SPECIAL_PTR_REG_mask;
+
+class CallStubImpl {
+
+  //--------------------------------------------------------------
+  //---<  Used for optimization in Compile::shorten_branches  >---
+  //--------------------------------------------------------------
+
+ public:
+  // Size of call trampoline stub.
+  static uint size_call_trampoline() {
+    return 0; // no call trampolines on this platform
+  }
+
+  // number of relocations needed by a call trampoline stub
+  static uint reloc_call_trampoline() {
+    return 0; // no call trampolines on this platform
+  }
+};
+
+class HandlerImpl {
+
+ public:
+
+  static int emit_exception_handler(CodeBuffer &cbuf);
+  static int emit_deopt_handler(CodeBuffer& cbuf);
+
+  static uint size_exception_handler() {
+    return MacroAssembler::far_branch_size();
+  }
+
+  static uint size_deopt_handler() {
+    // count auipc + far branch
+    return NativeInstruction::instruction_size + MacroAssembler::far_branch_size();
+  }
+};
+
+class Node::PD {
+public:
+  enum NodeFlags {
+    _last_flag = Node::_last_flag
+  };
+};
+
+bool is_CAS(int opcode, bool maybe_volatile);
+
+// predicate controlling translation of CompareAndSwapX
+bool needs_acquiring_load_reserved(const Node *load);
+
+// predicate controlling addressing modes
+bool size_fits_all_mem_uses(AddPNode* addp, int shift);
+%}
+
+source %{
+
+// Derived RegMask with conditionally allocatable registers
+
+RegMask _ANY_REG32_mask;
+RegMask _ANY_REG_mask;
+RegMask _PTR_REG_mask;
+RegMask _NO_SPECIAL_REG32_mask;
+RegMask _NO_SPECIAL_REG_mask;
+RegMask _NO_SPECIAL_PTR_REG_mask;
+
+void reg_mask_init() {
+
+  _ANY_REG32_mask = _ALL_REG32_mask;
+  _ANY_REG32_mask.Remove(OptoReg::as_OptoReg(x0->as_VMReg()));
+
+  _ANY_REG_mask = _ALL_REG_mask;
+  _ANY_REG_mask.SUBTRACT(_ZR_REG_mask);
+
+  _PTR_REG_mask = _ALL_REG_mask;
+  _PTR_REG_mask.SUBTRACT(_ZR_REG_mask);
+
+  _NO_SPECIAL_REG32_mask = _ALL_REG32_mask;
+  _NO_SPECIAL_REG32_mask.SUBTRACT(_NON_ALLOCATABLE_REG32_mask);
+
+  _NO_SPECIAL_REG_mask = _ALL_REG_mask;
+  _NO_SPECIAL_REG_mask.SUBTRACT(_NON_ALLOCATABLE_REG_mask);
+
+  _NO_SPECIAL_PTR_REG_mask = _ALL_REG_mask;
+  _NO_SPECIAL_PTR_REG_mask.SUBTRACT(_NON_ALLOCATABLE_REG_mask);
+
+  // x27 is not allocatable when compressed oops is on
+  if (UseCompressedOops) {
+    _NO_SPECIAL_REG32_mask.Remove(OptoReg::as_OptoReg(x27->as_VMReg()));
+    _NO_SPECIAL_REG_mask.SUBTRACT(_HEAPBASE_REG_mask);
+    _NO_SPECIAL_PTR_REG_mask.SUBTRACT(_HEAPBASE_REG_mask);
+  }
+
+  // x8 is not allocatable when PreserveFramePointer is on
+  if (PreserveFramePointer) {
+    _NO_SPECIAL_REG32_mask.Remove(OptoReg::as_OptoReg(x8->as_VMReg()));
+    _NO_SPECIAL_REG_mask.SUBTRACT(_FP_REG_mask);
+    _NO_SPECIAL_PTR_REG_mask.SUBTRACT(_FP_REG_mask);
+  }
+}
+
+void PhaseOutput::pd_perform_mach_node_analysis() {
+}
+
+int MachNode::pd_alignment_required() const {
+  return 1;
+}
+
+int MachNode::compute_padding(int current_offset) const {
+  return 0;
+}
+
+// is_CAS(int opcode, bool maybe_volatile)
+//
+// return true if opcode is one of the possible CompareAndSwapX
+// values otherwise false.
+bool is_CAS(int opcode, bool maybe_volatile)
+{
+  switch (opcode) {
+    // We handle these
+    case Op_CompareAndSwapI:
+    case Op_CompareAndSwapL:
+    case Op_CompareAndSwapP:
+    case Op_CompareAndSwapN:
+    case Op_ShenandoahCompareAndSwapP:
+    case Op_ShenandoahCompareAndSwapN:
+    case Op_CompareAndSwapB:
+    case Op_CompareAndSwapS:
+    case Op_GetAndSetI:
+    case Op_GetAndSetL:
+    case Op_GetAndSetP:
+    case Op_GetAndSetN:
+    case Op_GetAndAddI:
+    case Op_GetAndAddL:
+      return true;
+    case Op_CompareAndExchangeI:
+    case Op_CompareAndExchangeN:
+    case Op_CompareAndExchangeB:
+    case Op_CompareAndExchangeS:
+    case Op_CompareAndExchangeL:
+    case Op_CompareAndExchangeP:
+    case Op_WeakCompareAndSwapB:
+    case Op_WeakCompareAndSwapS:
+    case Op_WeakCompareAndSwapI:
+    case Op_WeakCompareAndSwapL:
+    case Op_WeakCompareAndSwapP:
+    case Op_WeakCompareAndSwapN:
+    case Op_ShenandoahWeakCompareAndSwapP:
+    case Op_ShenandoahWeakCompareAndSwapN:
+    case Op_ShenandoahCompareAndExchangeP:
+    case Op_ShenandoahCompareAndExchangeN:
+      return maybe_volatile;
+    default:
+      return false;
+  }
+}
+
+// predicate controlling translation of CAS
+//
+// returns true if CAS needs to use an acquiring load otherwise false
+bool needs_acquiring_load_reserved(const Node *n)
+{
+  assert(n != NULL && is_CAS(n->Opcode(), true), "expecting a compare and swap");
+
+  LoadStoreNode* ldst = n->as_LoadStore();
+  if (n != NULL && is_CAS(n->Opcode(), false)) {
+    assert(ldst != NULL && ldst->trailing_membar() != NULL, "expected trailing membar");
+  } else {
+    return ldst != NULL && ldst->trailing_membar() != NULL;
+  }
+  // so we can just return true here
+  return true;
+}
+#define __ _masm.
+
+// advance declarations for helper functions to convert register
+// indices to register objects
+
+// the ad file has to provide implementations of certain methods
+// expected by the generic code
+//
+// REQUIRED FUNCTIONALITY
+
+//=============================================================================
+
+// !!!!! Special hack to get all types of calls to specify the byte offset
+//       from the start of the call to the point where the return address
+//       will point.
+
+int MachCallStaticJavaNode::ret_addr_offset()
+{
+  // jal
+  return 1 * NativeInstruction::instruction_size;
+}
+
+int MachCallDynamicJavaNode::ret_addr_offset()
+{
+  return 7 * NativeInstruction::instruction_size; // movptr, jal
+}
+
+int MachCallRuntimeNode::ret_addr_offset() {
+  // for generated stubs the call will be
+  //   jal(addr)
+  // or with far branches
+  //   jal(trampoline_stub)
+  // for real runtime callouts it will be 11 instructions
+  // see riscv_enc_java_to_runtime
+  //   la(t1, retaddr)                ->  auipc + addi
+  //   la(t0, RuntimeAddress(addr))   ->  lui + addi + slli + addi + slli + addi
+  //   addi(sp, sp, -2 * wordSize)    ->  addi
+  //   sd(t1, Address(sp, wordSize))  ->  sd
+  //   jalr(t0)                       ->  jalr
+  CodeBlob *cb = CodeCache::find_blob(_entry_point);
+  if (cb != NULL) {
+    return 1 * NativeInstruction::instruction_size;
+  } else {
+    return 11 * NativeInstruction::instruction_size;
+  }
+}
+
+int MachCallNativeNode::ret_addr_offset() {
+  Unimplemented();
+  return -1;
+}
+
+//
+// Compute padding required for nodes which need alignment
+//
+
+// With RVC a call instruction may get 2-byte aligned.
+// The address of the call instruction needs to be 4-byte aligned to
+// ensure that it does not span a cache line so that it can be patched.
+int CallStaticJavaDirectNode::compute_padding(int current_offset) const
+{
+  // to make sure the address of jal 4-byte aligned.
+  return align_up(current_offset, alignment_required()) - current_offset;
+}
+
+// With RVC a call instruction may get 2-byte aligned.
+// The address of the call instruction needs to be 4-byte aligned to
+// ensure that it does not span a cache line so that it can be patched.
+int CallDynamicJavaDirectNode::compute_padding(int current_offset) const
+{
+  // skip the movptr in MacroAssembler::ic_call():
+  // lui + addi + slli + addi + slli + addi
+  // Though movptr() has already 4-byte aligned with or without RVC,
+  // We need to prevent from further changes by explicitly calculating the size.
+  const int movptr_size = 6 * NativeInstruction::instruction_size;
+  current_offset += movptr_size;
+  // to make sure the address of jal 4-byte aligned.
+  return align_up(current_offset, alignment_required()) - current_offset;
+}
+
+//=============================================================================
+
+#ifndef PRODUCT
+void MachBreakpointNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
+  assert_cond(st != NULL);
+  st->print("BREAKPOINT");
+}
+#endif
+
+void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+  C2_MacroAssembler _masm(&cbuf);
+  Assembler::CompressibleRegion cr(&_masm);
+  __ ebreak();
+}
+
+uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
+  return MachNode::size(ra_);
+}
+
+//=============================================================================
+
+#ifndef PRODUCT
+  void MachNopNode::format(PhaseRegAlloc*, outputStream* st) const {
+    st->print("nop \t# %d bytes pad for loops and calls", _count);
+  }
+#endif
+
+  void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc*) const {
+    C2_MacroAssembler _masm(&cbuf);
+    Assembler::CompressibleRegion cr(&_masm); // nops shall be 2-byte under RVC for alignment purposes.
+    for (int i = 0; i < _count; i++) {
+      __ nop();
+    }
+  }
+
+  uint MachNopNode::size(PhaseRegAlloc*) const {
+    return _count * (UseRVC ? NativeInstruction::compressed_instruction_size : NativeInstruction::instruction_size);
+  }
+
+//=============================================================================
+const RegMask& MachConstantBaseNode::_out_RegMask = RegMask::Empty;
+
+int ConstantTable::calculate_table_base_offset() const {
+  return 0;  // absolute addressing, no offset
+}
+
+bool MachConstantBaseNode::requires_postalloc_expand() const { return false; }
+void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, PhaseRegAlloc *ra_) {
+  ShouldNotReachHere();
+}
+
+void MachConstantBaseNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
+  // Empty encoding
+}
+
+uint MachConstantBaseNode::size(PhaseRegAlloc* ra_) const {
+  return 0;
+}
+
+#ifndef PRODUCT
+void MachConstantBaseNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
+  assert_cond(st != NULL);
+  st->print("-- \t// MachConstantBaseNode (empty encoding)");
+}
+#endif
+
+#ifndef PRODUCT
+void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
+  assert_cond(st != NULL && ra_ != NULL);
+  Compile* C = ra_->C;
+
+  int framesize = C->output()->frame_slots() << LogBytesPerInt;
+
+  if (C->output()->need_stack_bang(framesize)) {
+    st->print("# stack bang size=%d\n\t", framesize);
+  }
+
+  st->print("sd  fp, [sp, #%d]\n\t", - 2 * wordSize);
+  st->print("sd  ra, [sp, #%d]\n\t", - wordSize);
+  if (PreserveFramePointer) { st->print("sub  fp, sp, #%d\n\t", 2 * wordSize); }
+  st->print("sub sp, sp, #%d\n\t", framesize);
+
+  if (C->stub_function() == NULL && BarrierSet::barrier_set()->barrier_set_nmethod() != NULL) {
+    st->print("ld  t0, [guard]\n\t");
+    st->print("membar LoadLoad\n\t");
+    st->print("ld  t1, [xthread, #thread_disarmed_offset]\n\t");
+    st->print("beq t0, t1, skip\n\t");
+    st->print("jalr #nmethod_entry_barrier_stub\n\t");
+    st->print("j skip\n\t");
+    st->print("guard: int\n\t");
+    st->print("skip:\n\t");
+  }
+}
+#endif
+
+void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+  assert_cond(ra_ != NULL);
+  Compile* C = ra_->C;
+  C2_MacroAssembler _masm(&cbuf);
+
+  // n.b. frame size includes space for return pc and fp
+  const int framesize = C->output()->frame_size_in_bytes();
+
+  // insert a nop at the start of the prolog so we can patch in a
+  // branch if we need to invalidate the method later
+  __ nop();
+
+  assert_cond(C != NULL);
+
+  if (C->clinit_barrier_on_entry()) {
+    assert(!C->method()->holder()->is_not_initialized(), "initialization should have been started");
+
+    Label L_skip_barrier;
+
+    __ mov_metadata(t1, C->method()->holder()->constant_encoding());
+    __ clinit_barrier(t1, t0, &L_skip_barrier);
+    __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+    __ bind(L_skip_barrier);
+  }
+
+  int bangsize = C->output()->bang_size_in_bytes();
+  if (C->output()->need_stack_bang(bangsize)) {
+    __ generate_stack_overflow_check(bangsize);
+  }
+
+  __ build_frame(framesize);
+
+  if (C->stub_function() == NULL) {
+    BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+    bs->nmethod_entry_barrier(&_masm);
+  }
+
+  if (VerifyStackAtCalls) {
+    Unimplemented();
+  }
+
+  C->output()->set_frame_complete(cbuf.insts_size());
+
+  if (C->has_mach_constant_base_node()) {
+    // NOTE: We set the table base offset here because users might be
+    // emitted before MachConstantBaseNode.
+    ConstantTable& constant_table = C->output()->constant_table();
+    constant_table.set_table_base_offset(constant_table.calculate_table_base_offset());
+  }
+}
+
+uint MachPrologNode::size(PhaseRegAlloc* ra_) const
+{
+  assert_cond(ra_ != NULL);
+  return MachNode::size(ra_); // too many variables; just compute it
+                              // the hard way
+}
+
+int MachPrologNode::reloc() const
+{
+  return 0;
+}
+
+//=============================================================================
+
+#ifndef PRODUCT
+void MachEpilogNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
+  assert_cond(st != NULL && ra_ != NULL);
+  Compile* C = ra_->C;
+  assert_cond(C != NULL);
+  int framesize = C->output()->frame_size_in_bytes();
+
+  st->print("# pop frame %d\n\t", framesize);
+
+  if (framesize == 0) {
+    st->print("ld  ra, [sp,#%d]\n\t", (2 * wordSize));
+    st->print("ld  fp, [sp,#%d]\n\t", (3 * wordSize));
+    st->print("add sp, sp, #%d\n\t", (2 * wordSize));
+  } else {
+    st->print("add  sp, sp, #%d\n\t", framesize);
+    st->print("ld  ra, [sp,#%d]\n\t", - 2 * wordSize);
+    st->print("ld  fp, [sp,#%d]\n\t", - wordSize);
+  }
+
+  if (do_polling() && C->is_method_compilation()) {
+    st->print("# test polling word\n\t");
+    st->print("ld t0, [xthread,#%d]\n\t", in_bytes(JavaThread::polling_word_offset()));
+    st->print("bgtu sp, t0, #slow_path");
+  }
+}
+#endif
+
+void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+  assert_cond(ra_ != NULL);
+  Compile* C = ra_->C;
+  C2_MacroAssembler _masm(&cbuf);
+  assert_cond(C != NULL);
+  int framesize = C->output()->frame_size_in_bytes();
+
+  __ remove_frame(framesize);
+
+  if (StackReservedPages > 0 && C->has_reserved_stack_access()) {
+    __ reserved_stack_check();
+  }
+
+  if (do_polling() && C->is_method_compilation()) {
+    Label dummy_label;
+    Label* code_stub = &dummy_label;
+    if (!C->output()->in_scratch_emit_size()) {
+      code_stub = &C->output()->safepoint_poll_table()->add_safepoint(__ offset());
+    }
+    __ relocate(relocInfo::poll_return_type);
+    __ safepoint_poll(*code_stub, true /* at_return */, false /* acquire */, true /* in_nmethod */);
+  }
+}
+
+uint MachEpilogNode::size(PhaseRegAlloc *ra_) const {
+  assert_cond(ra_ != NULL);
+  // Variable size. Determine dynamically.
+  return MachNode::size(ra_);
+}
+
+int MachEpilogNode::reloc() const {
+  // Return number of relocatable values contained in this instruction.
+  return 1; // 1 for polling page.
+}
+const Pipeline * MachEpilogNode::pipeline() const {
+  return MachNode::pipeline_class();
+}
+
+//=============================================================================
+
+// Figure out which register class each belongs in: rc_int, rc_float or
+// rc_stack.
+enum RC { rc_bad, rc_int, rc_float, rc_vector, rc_stack };
+
+static enum RC rc_class(OptoReg::Name reg) {
+
+  if (reg == OptoReg::Bad) {
+    return rc_bad;
+  }
+
+  // we have 30 int registers * 2 halves
+  // (t0 and t1 are omitted)
+  int slots_of_int_registers = RegisterImpl::max_slots_per_register * (RegisterImpl::number_of_registers - 2);
+  if (reg < slots_of_int_registers) {
+    return rc_int;
+  }
+
+  // we have 32 float register * 2 halves
+  int slots_of_float_registers = FloatRegisterImpl::max_slots_per_register * FloatRegisterImpl::number_of_registers;
+  if (reg < slots_of_int_registers + slots_of_float_registers) {
+    return rc_float;
+  }
+
+  // we have 32 vector register * 4 halves
+  int slots_of_vector_registers = VectorRegisterImpl::max_slots_per_register * VectorRegisterImpl::number_of_registers;
+  if (reg < slots_of_int_registers + slots_of_float_registers + slots_of_vector_registers) {
+    return rc_vector;
+  }
+
+  // Between vector regs & stack is the flags regs.
+  assert(OptoReg::is_stack(reg), "blow up if spilling flags");
+
+  return rc_stack;
+}
+
+uint MachSpillCopyNode::implementation(CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream *st) const {
+  assert_cond(ra_ != NULL);
+  Compile* C = ra_->C;
+
+  // Get registers to move.
+  OptoReg::Name src_hi = ra_->get_reg_second(in(1));
+  OptoReg::Name src_lo = ra_->get_reg_first(in(1));
+  OptoReg::Name dst_hi = ra_->get_reg_second(this);
+  OptoReg::Name dst_lo = ra_->get_reg_first(this);
+
+  enum RC src_hi_rc = rc_class(src_hi);
+  enum RC src_lo_rc = rc_class(src_lo);
+  enum RC dst_hi_rc = rc_class(dst_hi);
+  enum RC dst_lo_rc = rc_class(dst_lo);
+
+  assert(src_lo != OptoReg::Bad && dst_lo != OptoReg::Bad, "must move at least 1 register");
+
+  if (src_hi != OptoReg::Bad) {
+    assert((src_lo & 1) == 0 && src_lo + 1 == src_hi &&
+           (dst_lo & 1) == 0 && dst_lo + 1 == dst_hi,
+           "expected aligned-adjacent pairs");
+  }
+
+  if (src_lo == dst_lo && src_hi == dst_hi) {
+    return 0;            // Self copy, no move.
+  }
+
+  bool is64 = (src_lo & 1) == 0 && src_lo + 1 == src_hi &&
+              (dst_lo & 1) == 0 && dst_lo + 1 == dst_hi;
+  int src_offset = ra_->reg2offset(src_lo);
+  int dst_offset = ra_->reg2offset(dst_lo);
+
+  if (bottom_type()->isa_vect() != NULL) {
+    uint ireg = ideal_reg();
+    if (ireg == Op_VecA && cbuf) {
+      C2_MacroAssembler _masm(cbuf);
+      Assembler::CompressibleRegion cr(&_masm);
+      int vector_reg_size_in_bytes = Matcher::scalable_vector_reg_size(T_BYTE);
+      if (src_lo_rc == rc_stack && dst_lo_rc == rc_stack) {
+        // stack to stack
+        __ spill_copy_vector_stack_to_stack(src_offset, dst_offset,
+                                            vector_reg_size_in_bytes);
+      } else if (src_lo_rc == rc_vector && dst_lo_rc == rc_stack) {
+        // vpr to stack
+        __ spill(as_VectorRegister(Matcher::_regEncode[src_lo]), ra_->reg2offset(dst_lo));
+      } else if (src_lo_rc == rc_stack && dst_lo_rc == rc_vector) {
+        // stack to vpr
+        __ unspill(as_VectorRegister(Matcher::_regEncode[dst_lo]), ra_->reg2offset(src_lo));
+      } else if (src_lo_rc == rc_vector && dst_lo_rc == rc_vector) {
+        // vpr to vpr
+        __ vmv1r_v(as_VectorRegister(Matcher::_regEncode[dst_lo]), as_VectorRegister(Matcher::_regEncode[src_lo]));
+      } else {
+        ShouldNotReachHere();
+      }
+    }
+  } else if (cbuf != NULL) {
+    C2_MacroAssembler _masm(cbuf);
+    Assembler::CompressibleRegion cr(&_masm);
+    switch (src_lo_rc) {
+      case rc_int:
+        if (dst_lo_rc == rc_int) {  // gpr --> gpr copy
+          if (!is64 && this->ideal_reg() != Op_RegI) { // zero extended for narrow oop or klass
+            __ zero_extend(as_Register(Matcher::_regEncode[dst_lo]), as_Register(Matcher::_regEncode[src_lo]), 32);
+          } else {
+            __ mv(as_Register(Matcher::_regEncode[dst_lo]), as_Register(Matcher::_regEncode[src_lo]));
+          }
+        } else if (dst_lo_rc == rc_float) { // gpr --> fpr copy
+          if (is64) {
+            __ fmv_d_x(as_FloatRegister(Matcher::_regEncode[dst_lo]),
+                       as_Register(Matcher::_regEncode[src_lo]));
+          } else {
+            __ fmv_w_x(as_FloatRegister(Matcher::_regEncode[dst_lo]),
+                       as_Register(Matcher::_regEncode[src_lo]));
+          }
+        } else {                    // gpr --> stack spill
+          assert(dst_lo_rc == rc_stack, "spill to bad register class");
+          __ spill(as_Register(Matcher::_regEncode[src_lo]), is64, dst_offset);
+        }
+        break;
+      case rc_float:
+        if (dst_lo_rc == rc_int) {  // fpr --> gpr copy
+          if (is64) {
+            __ fmv_x_d(as_Register(Matcher::_regEncode[dst_lo]),
+                       as_FloatRegister(Matcher::_regEncode[src_lo]));
+          } else {
+            __ fmv_x_w(as_Register(Matcher::_regEncode[dst_lo]),
+                       as_FloatRegister(Matcher::_regEncode[src_lo]));
+          }
+        } else if (dst_lo_rc == rc_float) { // fpr --> fpr copy
+          if (is64) {
+            __ fmv_d(as_FloatRegister(Matcher::_regEncode[dst_lo]),
+                     as_FloatRegister(Matcher::_regEncode[src_lo]));
+          } else {
+            __ fmv_s(as_FloatRegister(Matcher::_regEncode[dst_lo]),
+                     as_FloatRegister(Matcher::_regEncode[src_lo]));
+          }
+        } else {                    // fpr --> stack spill
+          assert(dst_lo_rc == rc_stack, "spill to bad register class");
+          __ spill(as_FloatRegister(Matcher::_regEncode[src_lo]),
+                   is64, dst_offset);
+        }
+        break;
+      case rc_stack:
+        if (dst_lo_rc == rc_int) {  // stack --> gpr load
+          if (this->ideal_reg() == Op_RegI) {
+            __ unspill(as_Register(Matcher::_regEncode[dst_lo]), is64, src_offset);
+          } else { // // zero extended for narrow oop or klass
+            __ unspillu(as_Register(Matcher::_regEncode[dst_lo]), is64, src_offset);
+          }
+        } else if (dst_lo_rc == rc_float) { // stack --> fpr load
+          __ unspill(as_FloatRegister(Matcher::_regEncode[dst_lo]),
+                     is64, src_offset);
+        } else {                    // stack --> stack copy
+          assert(dst_lo_rc == rc_stack, "spill to bad register class");
+          if (this->ideal_reg() == Op_RegI) {
+            __ unspill(t0, is64, src_offset);
+          } else { // zero extended for narrow oop or klass
+            __ unspillu(t0, is64, src_offset);
+          }
+          __ spill(t0, is64, dst_offset);
+        }
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  }
+
+  if (st != NULL) {
+    st->print("spill ");
+    if (src_lo_rc == rc_stack) {
+      st->print("[sp, #%d] -> ", src_offset);
+    } else {
+      st->print("%s -> ", Matcher::regName[src_lo]);
+    }
+    if (dst_lo_rc == rc_stack) {
+      st->print("[sp, #%d]", dst_offset);
+    } else {
+      st->print("%s", Matcher::regName[dst_lo]);
+    }
+    if (bottom_type()->isa_vect() != NULL) {
+      int vsize = 0;
+      if (ideal_reg() == Op_VecA) {
+        vsize = Matcher::scalable_vector_reg_size(T_BYTE) * 8;
+      } else {
+        ShouldNotReachHere();
+      }
+      st->print("\t# vector spill size = %d", vsize);
+    } else {
+      st->print("\t# spill size = %d", is64 ? 64 : 32);
+    }
+  }
+
+  return 0;
+}
+
+#ifndef PRODUCT
+void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
+  if (ra_ == NULL) {
+    st->print("N%d = SpillCopy(N%d)", _idx, in(1)->_idx);
+  } else {
+    implementation(NULL, ra_, false, st);
+  }
+}
+#endif
+
+void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+  implementation(&cbuf, ra_, false, NULL);
+}
+
+uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
+  return MachNode::size(ra_);
+}
+
+//=============================================================================
+
+#ifndef PRODUCT
+void BoxLockNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
+  assert_cond(ra_ != NULL && st != NULL);
+  int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
+  int reg = ra_->get_reg_first(this);
+  st->print("add %s, sp, #%d\t# box lock",
+            Matcher::regName[reg], offset);
+}
+#endif
+
+void BoxLockNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+  C2_MacroAssembler _masm(&cbuf);
+
+  assert_cond(ra_ != NULL);
+  int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
+  int reg    = ra_->get_encode(this);
+
+  if (is_imm_in_range(offset, 12, 0)) {
+    __ addi(as_Register(reg), sp, offset);
+  } else if (is_imm_in_range(offset, 32, 0)) {
+    __ li32(t0, offset);
+    __ add(as_Register(reg), sp, t0);
+  } else {
+    ShouldNotReachHere();
+  }
+}
+
+uint BoxLockNode::size(PhaseRegAlloc *ra_) const {
+  // BoxLockNode is not a MachNode, so we can't just call MachNode::size(ra_).
+  int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
+
+  if (is_imm_in_range(offset, 12, 0)) {
+    return NativeInstruction::instruction_size;
+  } else {
+    return 3 * NativeInstruction::instruction_size; // lui + addiw + add;
+  }
+}
+
+//=============================================================================
+
+#ifndef PRODUCT
+void MachUEPNode::format(PhaseRegAlloc* ra_, outputStream* st) const
+{
+  assert_cond(st != NULL);
+  st->print_cr("# MachUEPNode");
+  if (UseCompressedClassPointers) {
+    st->print_cr("\tlwu t0, [j_rarg0, oopDesc::klass_offset_in_bytes()]\t# compressed klass");
+    if (CompressedKlassPointers::shift() != 0) {
+      st->print_cr("\tdecode_klass_not_null t0, t0");
+    }
+  } else {
+    st->print_cr("\tld t0, [j_rarg0, oopDesc::klass_offset_in_bytes()]\t# compressed klass");
+  }
+  st->print_cr("\tbeq t0, t1, ic_hit");
+  st->print_cr("\tj, SharedRuntime::_ic_miss_stub\t # Inline cache check");
+  st->print_cr("\tic_hit:");
+}
+#endif
+
+void MachUEPNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
+{
+  // This is the unverified entry point.
+  C2_MacroAssembler _masm(&cbuf);
+
+  Label skip;
+  __ cmp_klass(j_rarg0, t1, t0, skip);
+  __ far_jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
+  __ bind(skip);
+}
+
+uint MachUEPNode::size(PhaseRegAlloc* ra_) const
+{
+  assert_cond(ra_ != NULL);
+  return MachNode::size(ra_);
+}
+
+// REQUIRED EMIT CODE
+
+//=============================================================================
+
+// Emit exception handler code.
+int HandlerImpl::emit_exception_handler(CodeBuffer& cbuf)
+{
+  // la_patchable t0, #exception_blob_entry_point
+  // jr (offset)t0
+  // or
+  // j #exception_blob_entry_point
+  // Note that the code buffer's insts_mark is always relative to insts.
+  // That's why we must use the macroassembler to generate a handler.
+  C2_MacroAssembler _masm(&cbuf);
+  address base = __ start_a_stub(size_exception_handler());
+  if (base == NULL) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
+  int offset = __ offset();
+  __ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
+  assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
+  __ end_a_stub();
+  return offset;
+}
+
+// Emit deopt handler code.
+int HandlerImpl::emit_deopt_handler(CodeBuffer& cbuf)
+{
+  // Note that the code buffer's insts_mark is always relative to insts.
+  // That's why we must use the macroassembler to generate a handler.
+  C2_MacroAssembler _masm(&cbuf);
+  address base = __ start_a_stub(size_deopt_handler());
+  if (base == NULL) {
+    ciEnv::current()->record_failure("CodeCache is full");
+    return 0;  // CodeBuffer::expand failed
+  }
+  int offset = __ offset();
+
+  __ auipc(ra, 0);
+  __ far_jump(RuntimeAddress(SharedRuntime::deopt_blob()->unpack()));
+
+  assert(__ offset() - offset <= (int) size_deopt_handler(), "overflow");
+  __ end_a_stub();
+  return offset;
+
+}
+// REQUIRED MATCHER CODE
+
+//=============================================================================
+
+const bool Matcher::match_rule_supported(int opcode) {
+  if (!has_match_rule(opcode)) {
+    return false;
+  }
+
+  switch (opcode) {
+    case Op_CacheWB:           // fall through
+    case Op_CacheWBPreSync:    // fall through
+    case Op_CacheWBPostSync:
+      if (!VM_Version::supports_data_cache_line_flush()) {
+        return false;
+      }
+      break;
+
+    case Op_StrCompressedCopy: // fall through
+    case Op_StrInflatedCopy:   // fall through
+    case Op_CountPositives:
+      return UseRVV;
+
+    case Op_EncodeISOArray:
+      return UseRVV && SpecialEncodeISOArray;
+
+    case Op_PopCountI:
+    case Op_PopCountL:
+      return UsePopCountInstruction;
+
+    case Op_RotateRight:
+    case Op_RotateLeft:
+    case Op_CountLeadingZerosI:
+    case Op_CountLeadingZerosL:
+    case Op_CountTrailingZerosI:
+    case Op_CountTrailingZerosL:
+      return UseRVB;
+  }
+
+  return true; // Per default match rules are supported.
+}
+
+// Identify extra cases that we might want to provide match rules for vector nodes and
+// other intrinsics guarded with vector length (vlen) and element type (bt).
+const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
+  if (!match_rule_supported(opcode) || !vector_size_supported(bt, vlen)) {
+    return false;
+  }
+
+  return op_vec_supported(opcode);
+}
+
+const bool Matcher::match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt) {
+  return false;
+}
+
+const RegMask* Matcher::predicate_reg_mask(void) {
+  return NULL;
+}
+
+const TypeVectMask* Matcher::predicate_reg_type(const Type* elemTy, int length) {
+  return NULL;
+}
+
+// Vector calling convention not yet implemented.
+const bool Matcher::supports_vector_calling_convention(void) {
+  return false;
+}
+
+OptoRegPair Matcher::vector_return_value(uint ideal_reg) {
+  Unimplemented();
+  return OptoRegPair(0, 0);
+}
+
+// Is this branch offset short enough that a short branch can be used?
+//
+// NOTE: If the platform does not provide any short branch variants, then
+//       this method should return false for offset 0.
+// |---label(L1)-----|
+// |-----------------|
+// |-----------------|----------eq: float-------------------
+// |-----------------| // far_cmpD_branch   |   cmpD_branch
+// |------- ---------|    feq;              |      feq;
+// |-far_cmpD_branch-|    beqz done;        |      bnez L;
+// |-----------------|    j L;              |
+// |-----------------|    bind(done);       |
+// |-----------------|--------------------------------------
+// |-----------------| // so shortBrSize = br_size - 4;
+// |-----------------| // so offs = offset - shortBrSize + 4;
+// |---label(L2)-----|
+bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
+  // The passed offset is relative to address of the branch.
+  int shortBrSize = br_size - 4;
+  int offs = offset - shortBrSize + 4;
+  return (-4096 <= offs && offs < 4096);
+}
+
+// Vector width in bytes.
+const int Matcher::vector_width_in_bytes(BasicType bt) {
+  if (UseRVV) {
+    // The MaxVectorSize should have been set by detecting RVV max vector register size when check UseRVV.
+    // MaxVectorSize == VM_Version::_initial_vector_length
+    return MaxVectorSize;
+  }
+  return 0;
+}
+
+// Limits on vector size (number of elements) loaded into vector.
+const int Matcher::max_vector_size(const BasicType bt) {
+  return vector_width_in_bytes(bt) / type2aelembytes(bt);
+}
+const int Matcher::min_vector_size(const BasicType bt) {
+  return max_vector_size(bt);
+}
+
+// Vector ideal reg.
+const uint Matcher::vector_ideal_reg(int len) {
+  assert(MaxVectorSize >= len, "");
+  if (UseRVV) {
+    return Op_VecA;
+  }
+
+  ShouldNotReachHere();
+  return 0;
+}
+
+const int Matcher::scalable_vector_reg_size(const BasicType bt) {
+  return Matcher::max_vector_size(bt);
+}
+
+MachOper* Matcher::pd_specialize_generic_vector_operand(MachOper* original_opnd, uint ideal_reg, bool is_temp) {
+  ShouldNotReachHere(); // generic vector operands not supported
+  return NULL;
+}
+
+bool Matcher::is_reg2reg_move(MachNode* m) {
+  ShouldNotReachHere(); // generic vector operands not supported
+  return false;
+}
+
+bool Matcher::is_generic_vector(MachOper* opnd) {
+  ShouldNotReachHere(); // generic vector operands not supported
+  return false;
+}
+
+// Return whether or not this register is ever used as an argument.
+// This function is used on startup to build the trampoline stubs in
+// generateOptoStub.  Registers not mentioned will be killed by the VM
+// call in the trampoline, and arguments in those registers not be
+// available to the callee.
+bool Matcher::can_be_java_arg(int reg)
+{
+  return
+    reg ==  R10_num || reg == R10_H_num ||
+    reg ==  R11_num || reg == R11_H_num ||
+    reg ==  R12_num || reg == R12_H_num ||
+    reg ==  R13_num || reg == R13_H_num ||
+    reg ==  R14_num || reg == R14_H_num ||
+    reg ==  R15_num || reg == R15_H_num ||
+    reg ==  R16_num || reg == R16_H_num ||
+    reg ==  R17_num || reg == R17_H_num ||
+    reg ==  F10_num || reg == F10_H_num ||
+    reg ==  F11_num || reg == F11_H_num ||
+    reg ==  F12_num || reg == F12_H_num ||
+    reg ==  F13_num || reg == F13_H_num ||
+    reg ==  F14_num || reg == F14_H_num ||
+    reg ==  F15_num || reg == F15_H_num ||
+    reg ==  F16_num || reg == F16_H_num ||
+    reg ==  F17_num || reg == F17_H_num;
+}
+
+bool Matcher::is_spillable_arg(int reg)
+{
+  return can_be_java_arg(reg);
+}
+
+uint Matcher::int_pressure_limit()
+{
+  // A derived pointer is live at CallNode and then is flagged by RA
+  // as a spilled LRG. Spilling heuristics(Spill-USE) explicitly skip
+  // derived pointers and lastly fail to spill after reaching maximum
+  // number of iterations. Lowering the default pressure threshold to
+  // (_NO_SPECIAL_REG32_mask.Size() minus 1) forces CallNode to become
+  // a high register pressure area of the code so that split_DEF can
+  // generate DefinitionSpillCopy for the derived pointer.
+  uint default_int_pressure_threshold = _NO_SPECIAL_REG32_mask.Size() - 1;
+  if (!PreserveFramePointer) {
+    // When PreserveFramePointer is off, frame pointer is allocatable,
+    // but different from other SOC registers, it is excluded from
+    // fatproj's mask because its save type is No-Save. Decrease 1 to
+    // ensure high pressure at fatproj when PreserveFramePointer is off.
+    // See check_pressure_at_fatproj().
+    default_int_pressure_threshold--;
+  }
+  return (INTPRESSURE == -1) ? default_int_pressure_threshold : INTPRESSURE;
+}
+
+uint Matcher::float_pressure_limit()
+{
+  // _FLOAT_REG_mask is generated by adlc from the float_reg register class.
+  return (FLOATPRESSURE == -1) ? _FLOAT_REG_mask.Size() : FLOATPRESSURE;
+}
+
+bool Matcher::use_asm_for_ldiv_by_con(jlong divisor) {
+  return false;
+}
+
+RegMask Matcher::divI_proj_mask() {
+  ShouldNotReachHere();
+  return RegMask();
+}
+
+// Register for MODI projection of divmodI.
+RegMask Matcher::modI_proj_mask() {
+  ShouldNotReachHere();
+  return RegMask();
+}
+
+// Register for DIVL projection of divmodL.
+RegMask Matcher::divL_proj_mask() {
+  ShouldNotReachHere();
+  return RegMask();
+}
+
+// Register for MODL projection of divmodL.
+RegMask Matcher::modL_proj_mask() {
+  ShouldNotReachHere();
+  return RegMask();
+}
+
+const RegMask Matcher::method_handle_invoke_SP_save_mask() {
+  return FP_REG_mask();
+}
+
+bool size_fits_all_mem_uses(AddPNode* addp, int shift) {
+  assert_cond(addp != NULL);
+  for (DUIterator_Fast imax, i = addp->fast_outs(imax); i < imax; i++) {
+    Node* u = addp->fast_out(i);
+    if (u != NULL && u->is_Mem()) {
+      int opsize = u->as_Mem()->memory_size();
+      assert(opsize > 0, "unexpected memory operand size");
+      if (u->as_Mem()->memory_size() != (1 << shift)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+// Should the Matcher clone input 'm' of node 'n'?
+bool Matcher::pd_clone_node(Node* n, Node* m, Matcher::MStack& mstack) {
+  assert_cond(m != NULL);
+  if (is_vshift_con_pattern(n, m)) { // ShiftV src (ShiftCntV con)
+    mstack.push(m, Visit);           // m = ShiftCntV
+    return true;
+  }
+  return false;
+}
+
+// Should the Matcher clone shifts on addressing modes, expecting them
+// to be subsumed into complex addressing expressions or compute them
+// into registers?
+bool Matcher::pd_clone_address_expressions(AddPNode* m, Matcher::MStack& mstack, VectorSet& address_visited) {
+  return clone_base_plus_offset_address(m, mstack, address_visited);
+}
+
+%}
+
+
+
+//----------ENCODING BLOCK-----------------------------------------------------
+// This block specifies the encoding classes used by the compiler to
+// output byte streams.  Encoding classes are parameterized macros
+// used by Machine Instruction Nodes in order to generate the bit
+// encoding of the instruction.  Operands specify their base encoding
+// interface with the interface keyword.  There are currently
+// supported four interfaces, REG_INTER, CONST_INTER, MEMORY_INTER, &
+// COND_INTER.  REG_INTER causes an operand to generate a function
+// which returns its register number when queried.  CONST_INTER causes
+// an operand to generate a function which returns the value of the
+// constant when queried.  MEMORY_INTER causes an operand to generate
+// four functions which return the Base Register, the Index Register,
+// the Scale Value, and the Offset Value of the operand when queried.
+// COND_INTER causes an operand to generate six functions which return
+// the encoding code (ie - encoding bits for the instruction)
+// associated with each basic boolean condition for a conditional
+// instruction.
+//
+// Instructions specify two basic values for encoding.  Again, a
+// function is available to check if the constant displacement is an
+// oop. They use the ins_encode keyword to specify their encoding
+// classes (which must be a sequence of enc_class names, and their
+// parameters, specified in the encoding block), and they use the
+// opcode keyword to specify, in order, their primary, secondary, and
+// tertiary opcode.  Only the opcode sections which a particular
+// instruction needs for encoding need to be specified.
+encode %{
+  // BEGIN Non-volatile memory access
+
+  enc_class riscv_enc_li_imm(iRegIorL dst, immIorL src) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Assembler::CompressibleRegion cr(&_masm);
+    int64_t con = (int64_t)$src$$constant;
+    Register dst_reg = as_Register($dst$$reg);
+    __ li(dst_reg, con);
+  %}
+
+  enc_class riscv_enc_mov_p(iRegP dst, immP src) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register dst_reg = as_Register($dst$$reg);
+    address con = (address)$src$$constant;
+    if (con == NULL || con == (address)1) {
+      ShouldNotReachHere();
+    } else {
+      relocInfo::relocType rtype = $src->constant_reloc();
+      if (rtype == relocInfo::oop_type) {
+        __ movoop(dst_reg, (jobject)con, /*immediate*/true);
+      } else if (rtype == relocInfo::metadata_type) {
+        __ mov_metadata(dst_reg, (Metadata*)con);
+      } else {
+        assert(rtype == relocInfo::none, "unexpected reloc type");
+        __ li(dst_reg, $src$$constant);
+      }
+    }
+  %}
+
+  enc_class riscv_enc_mov_p1(iRegP dst) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Assembler::CompressibleRegion cr(&_masm);
+    Register dst_reg = as_Register($dst$$reg);
+    __ li(dst_reg, 1);
+  %}
+
+  enc_class riscv_enc_mov_byte_map_base(iRegP dst) %{
+    C2_MacroAssembler _masm(&cbuf);
+    __ load_byte_map_base($dst$$Register);
+  %}
+
+  enc_class riscv_enc_mov_n(iRegN dst, immN src) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register dst_reg = as_Register($dst$$reg);
+    address con = (address)$src$$constant;
+    if (con == NULL) {
+      ShouldNotReachHere();
+    } else {
+      relocInfo::relocType rtype = $src->constant_reloc();
+      assert(rtype == relocInfo::oop_type, "unexpected reloc type");
+      __ set_narrow_oop(dst_reg, (jobject)con);
+    }
+  %}
+
+  enc_class riscv_enc_mov_zero(iRegNorP dst) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register dst_reg = as_Register($dst$$reg);
+    __ mv(dst_reg, zr);
+  %}
+
+  enc_class riscv_enc_mov_nk(iRegN dst, immNKlass src) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register dst_reg = as_Register($dst$$reg);
+    address con = (address)$src$$constant;
+    if (con == NULL) {
+      ShouldNotReachHere();
+    } else {
+      relocInfo::relocType rtype = $src->constant_reloc();
+      assert(rtype == relocInfo::metadata_type, "unexpected reloc type");
+      __ set_narrow_klass(dst_reg, (Klass *)con);
+    }
+  %}
+
+  enc_class riscv_enc_cmpxchgw(iRegINoSp res, memory mem, iRegINoSp oldval, iRegINoSp newval) %{
+    C2_MacroAssembler _masm(&cbuf);
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
+
+  enc_class riscv_enc_cmpxchgn(iRegINoSp res, memory mem, iRegINoSp oldval, iRegINoSp newval) %{
+    C2_MacroAssembler _masm(&cbuf);
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
+
+  enc_class riscv_enc_cmpxchg(iRegINoSp res, memory mem, iRegLNoSp oldval, iRegLNoSp newval) %{
+    C2_MacroAssembler _masm(&cbuf);
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
+
+  enc_class riscv_enc_cmpxchgw_acq(iRegINoSp res, memory mem, iRegINoSp oldval, iRegINoSp newval) %{
+    C2_MacroAssembler _masm(&cbuf);
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
+
+  enc_class riscv_enc_cmpxchgn_acq(iRegINoSp res, memory mem, iRegINoSp oldval, iRegINoSp newval) %{
+    C2_MacroAssembler _masm(&cbuf);
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
+
+  enc_class riscv_enc_cmpxchg_acq(iRegINoSp res, memory mem, iRegLNoSp oldval, iRegLNoSp newval) %{
+    C2_MacroAssembler _masm(&cbuf);
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
+
+  // compare and branch instruction encodings
+
+  enc_class riscv_enc_j(label lbl) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Label* L = $lbl$$label;
+    __ j(*L);
+  %}
+
+  enc_class riscv_enc_far_cmpULtGe_imm0_branch(cmpOpULtGe cmp, iRegIorL op1, label lbl) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Label* L = $lbl$$label;
+    switch ($cmp$$cmpcode) {
+      case(BoolTest::ge):
+        __ j(*L);
+        break;
+      case(BoolTest::lt):
+        break;
+      default:
+        Unimplemented();
+    }
+  %}
+
+  // call instruction encodings
+
+  enc_class riscv_enc_partial_subtype_check(iRegP sub, iRegP super, iRegP temp, iRegP result) %{
+    Register sub_reg = as_Register($sub$$reg);
+    Register super_reg = as_Register($super$$reg);
+    Register temp_reg = as_Register($temp$$reg);
+    Register result_reg = as_Register($result$$reg);
+    Register cr_reg = t1;
+
+    Label miss;
+    Label done;
+    C2_MacroAssembler _masm(&cbuf);
+    __ check_klass_subtype_slow_path(sub_reg, super_reg, temp_reg, result_reg,
+                                     NULL, &miss);
+    if ($primary) {
+      __ mv(result_reg, zr);
+    } else {
+      __ mv(cr_reg, zr);
+      __ j(done);
+    }
+
+    __ bind(miss);
+    if (!$primary) {
+      __ li(cr_reg, 1);
+    }
+
+    __ bind(done);
+  %}
+
+  enc_class riscv_enc_java_static_call(method meth) %{
+    C2_MacroAssembler _masm(&cbuf);
+
+    address addr = (address)$meth$$method;
+    address call = NULL;
+    assert_cond(addr != NULL);
+    if (!_method) {
+      // A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap.
+      call = __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf);
+      if (call == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full");
+        return;
+      }
+    } else {
+      int method_index = resolved_method_index(cbuf);
+      RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
+                                                  : static_call_Relocation::spec(method_index);
+      call = __ trampoline_call(Address(addr, rspec), &cbuf);
+      if (call == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full");
+        return;
+      }
+
+      // Emit stub for static call
+      address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+      if (stub == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full");
+        return;
+      }
+    }
+  %}
+
+  enc_class riscv_enc_java_dynamic_call(method meth) %{
+    C2_MacroAssembler _masm(&cbuf);
+    int method_index = resolved_method_index(cbuf);
+    address call = __ ic_call((address)$meth$$method, method_index);
+    if (call == NULL) {
+      ciEnv::current()->record_failure("CodeCache is full");
+      return;
+    }
+  %}
+
+  enc_class riscv_enc_call_epilog() %{
+    C2_MacroAssembler _masm(&cbuf);
+    if (VerifyStackAtCalls) {
+      // Check that stack depth is unchanged: find majik cookie on stack
+      __ call_Unimplemented();
+    }
+  %}
+
+  enc_class riscv_enc_java_to_runtime(method meth) %{
+    C2_MacroAssembler _masm(&cbuf);
+
+    // some calls to generated routines (arraycopy code) are scheduled
+    // by C2 as runtime calls. if so we can call them using a jr (they
+    // will be in a reachable segment) otherwise we have to use a jalr
+    // which loads the absolute address into a register.
+    address entry = (address)$meth$$method;
+    CodeBlob *cb = CodeCache::find_blob(entry);
+    if (cb != NULL) {
+      address call = __ trampoline_call(Address(entry, relocInfo::runtime_call_type));
+      if (call == NULL) {
+        ciEnv::current()->record_failure("CodeCache is full");
+        return;
+      }
+    } else {
+      Label retaddr;
+      __ la(t1, retaddr);
+      __ la(t0, RuntimeAddress(entry));
+      // Leave a breadcrumb for JavaFrameAnchor::capture_last_Java_pc()
+      __ addi(sp, sp, -2 * wordSize);
+      __ sd(t1, Address(sp, wordSize));
+      __ jalr(t0);
+      __ bind(retaddr);
+      __ addi(sp, sp, 2 * wordSize);
+    }
+  %}
+
+  // using the cr register as the bool result: 0 for success; others failed.
+  enc_class riscv_enc_fast_lock(iRegP object, iRegP box, iRegP tmp1, iRegP tmp2) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register flag = t1;
+    Register oop = as_Register($object$$reg);
+    Register box = as_Register($box$$reg);
+    Register disp_hdr = as_Register($tmp1$$reg);
+    Register tmp = as_Register($tmp2$$reg);
+    Label cont;
+    Label object_has_monitor;
+
+    assert_different_registers(oop, box, tmp, disp_hdr, t0);
+
+    // Load markWord from object into displaced_header.
+    __ ld(disp_hdr, Address(oop, oopDesc::mark_offset_in_bytes()));
+
+    if (DiagnoseSyncOnValueBasedClasses != 0) {
+      __ load_klass(flag, oop);
+      __ lwu(flag, Address(flag, Klass::access_flags_offset()));
+      __ andi(flag, flag, JVM_ACC_IS_VALUE_BASED_CLASS, tmp /* tmp */);
+      __ bnez(flag, cont, true /* is_far */);
+    }
+
+    // Check for existing monitor
+    __ andi(t0, disp_hdr, markWord::monitor_value);
+    __ bnez(t0, object_has_monitor);
+
+    if (!UseHeavyMonitors) {
+      // Set tmp to be (markWord of object | UNLOCK_VALUE).
+      __ ori(tmp, disp_hdr, markWord::unlocked_value);
+
+      // Initialize the box. (Must happen before we update the object mark!)
+      __ sd(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+
+      // Compare object markWord with an unlocked value (tmp) and if
+      // equal exchange the stack address of our box with object markWord.
+      // On failure disp_hdr contains the possibly locked markWord.
+      __ cmpxchg(/*memory address*/oop, /*expected value*/tmp, /*new value*/box, Assembler::int64, Assembler::aq,
+                 Assembler::rl, /*result*/disp_hdr);
+      __ mv(flag, zr);
+      __ beq(disp_hdr, tmp, cont); // prepare zero flag and goto cont if we won the cas
+
+      assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
+
+      // If the compare-and-exchange succeeded, then we found an unlocked
+      // object, will have now locked it will continue at label cont
+      // We did not see an unlocked object so try the fast recursive case.
+
+      // Check if the owner is self by comparing the value in the
+      // markWord of object (disp_hdr) with the stack pointer.
+      __ sub(disp_hdr, disp_hdr, sp);
+      __ li(tmp, (intptr_t) (~(os::vm_page_size()-1) | (uintptr_t)markWord::lock_mask_in_place));
+      // If (mark & lock_mask) == 0 and mark - sp < page_size, we are stack-locking and goto cont,
+      // hence we can store 0 as the displaced header in the box, which indicates that it is a
+      // recursive lock.
+      __ andr(tmp/*==0?*/, disp_hdr, tmp);
+      __ sd(tmp/*==0, perhaps*/, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+      __ mv(flag, tmp); // we can use the value of tmp as the result here
+    } else {
+      __ mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow-path
+    }
+
+    __ j(cont);
+
+    // Handle existing monitor.
+    __ bind(object_has_monitor);
+    // The object's monitor m is unlocked iff m->owner == NULL,
+    // otherwise m->owner may contain a thread or a stack address.
+    //
+    // Try to CAS m->owner from NULL to current thread.
+    __ add(tmp, disp_hdr, (ObjectMonitor::owner_offset_in_bytes() - markWord::monitor_value));
+    __ cmpxchg(/*memory address*/tmp, /*expected value*/zr, /*new value*/xthread, Assembler::int64, Assembler::aq,
+             Assembler::rl, /*result*/flag); // cas succeeds if flag == zr(expected)
+
+    // Store a non-null value into the box to avoid looking like a re-entrant
+    // lock. The fast-path monitor unlock code checks for
+    // markWord::monitor_value so use markWord::unused_mark which has the
+    // relevant bit set, and also matches ObjectSynchronizer::slow_enter.
+    __ mv(tmp, (address)markWord::unused_mark().value());
+    __ sd(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+
+    __ beqz(flag, cont); // CAS success means locking succeeded
+
+    __ bne(flag, xthread, cont); // Check for recursive locking
+
+    // Recursive lock case
+    __ mv(flag, zr);
+    __ ld(tmp, Address(disp_hdr, ObjectMonitor::recursions_offset_in_bytes() - markWord::monitor_value));
+    __ add(tmp, tmp, 1u);
+    __ sd(tmp, Address(disp_hdr, ObjectMonitor::recursions_offset_in_bytes() - markWord::monitor_value));
+
+    __ bind(cont);
+  %}
+
+  // using cr flag to indicate the fast_unlock result: 0 for success; others failed.
+  enc_class riscv_enc_fast_unlock(iRegP object, iRegP box, iRegP tmp1, iRegP tmp2) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register flag = t1;
+    Register oop = as_Register($object$$reg);
+    Register box = as_Register($box$$reg);
+    Register disp_hdr = as_Register($tmp1$$reg);
+    Register tmp = as_Register($tmp2$$reg);
+    Label cont;
+    Label object_has_monitor;
+
+    assert_different_registers(oop, box, tmp, disp_hdr, flag);
+
+    if (!UseHeavyMonitors) {
+      // Find the lock address and load the displaced header from the stack.
+      __ ld(disp_hdr, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+
+      // If the displaced header is 0, we have a recursive unlock.
+      __ mv(flag, disp_hdr);
+      __ beqz(disp_hdr, cont);
+    }
+
+    // Handle existing monitor.
+    __ ld(tmp, Address(oop, oopDesc::mark_offset_in_bytes()));
+    __ andi(t0, disp_hdr, markWord::monitor_value);
+    __ bnez(t0, object_has_monitor);
+
+    if (!UseHeavyMonitors) {
+      // Check if it is still a light weight lock, this is true if we
+      // see the stack address of the basicLock in the markWord of the
+      // object.
+
+      __ cmpxchg(/*memory address*/oop, /*expected value*/box, /*new value*/disp_hdr, Assembler::int64, Assembler::relaxed,
+                 Assembler::rl, /*result*/tmp);
+      __ xorr(flag, box, tmp); // box == tmp if cas succeeds
+    } else {
+      __ mv(flag, 1); // Set non-zero flag to indicate 'failure' -> take slow path
+    }
+    __ j(cont);
+
+    assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
+
+    // Handle existing monitor.
+    __ bind(object_has_monitor);
+    STATIC_ASSERT(markWord::monitor_value <= INT_MAX);
+    __ add(tmp, tmp, -(int)markWord::monitor_value); // monitor
+    __ ld(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));
+
+    Label notRecursive;
+    __ beqz(disp_hdr, notRecursive); // Will be 0 if not recursive.
+
+    // Recursive lock
+    __ addi(disp_hdr, disp_hdr, -1);
+    __ sd(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));
+    __ mv(flag, zr);
+    __ j(cont);
+
+    __ bind(notRecursive);
+    __ ld(flag, Address(tmp, ObjectMonitor::EntryList_offset_in_bytes()));
+    __ ld(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset_in_bytes()));
+    __ orr(flag, flag, disp_hdr); // Will be 0 if both are 0.
+    __ bnez(flag, cont);
+    // need a release store here
+    __ la(tmp, Address(tmp, ObjectMonitor::owner_offset_in_bytes()));
+    __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+    __ sd(zr, Address(tmp)); // set unowned
+
+    __ bind(cont);
+  %}
+
+  // arithmetic encodings
+
+  enc_class riscv_enc_divw(iRegI dst, iRegI src1, iRegI src2) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register dst_reg = as_Register($dst$$reg);
+    Register src1_reg = as_Register($src1$$reg);
+    Register src2_reg = as_Register($src2$$reg);
+    __ corrected_idivl(dst_reg, src1_reg, src2_reg, false);
+  %}
+
+  enc_class riscv_enc_div(iRegI dst, iRegI src1, iRegI src2) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register dst_reg = as_Register($dst$$reg);
+    Register src1_reg = as_Register($src1$$reg);
+    Register src2_reg = as_Register($src2$$reg);
+    __ corrected_idivq(dst_reg, src1_reg, src2_reg, false);
+  %}
+
+  enc_class riscv_enc_modw(iRegI dst, iRegI src1, iRegI src2) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register dst_reg = as_Register($dst$$reg);
+    Register src1_reg = as_Register($src1$$reg);
+    Register src2_reg = as_Register($src2$$reg);
+    __ corrected_idivl(dst_reg, src1_reg, src2_reg, true);
+  %}
+
+  enc_class riscv_enc_mod(iRegI dst, iRegI src1, iRegI src2) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Register dst_reg = as_Register($dst$$reg);
+    Register src1_reg = as_Register($src1$$reg);
+    Register src2_reg = as_Register($src2$$reg);
+    __ corrected_idivq(dst_reg, src1_reg, src2_reg, true);
+  %}
+
+  enc_class riscv_enc_tail_call(iRegP jump_target) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Assembler::CompressibleRegion cr(&_masm);
+    Register target_reg = as_Register($jump_target$$reg);
+    __ jr(target_reg);
+  %}
+
+  enc_class riscv_enc_tail_jmp(iRegP jump_target) %{
+    C2_MacroAssembler _masm(&cbuf);
+    Assembler::CompressibleRegion cr(&_masm);
+    Register target_reg = as_Register($jump_target$$reg);
+    // exception oop should be in x10
+    // ret addr has been popped into ra
+    // callee expects it in x13
+    __ mv(x13, ra);
+    __ jr(target_reg);
+  %}
+
+  enc_class riscv_enc_rethrow() %{
+    C2_MacroAssembler _masm(&cbuf);
+    __ far_jump(RuntimeAddress(OptoRuntime::rethrow_stub()));
+  %}
+
+  enc_class riscv_enc_ret() %{
+    C2_MacroAssembler _masm(&cbuf);
+    Assembler::CompressibleRegion cr(&_masm);
+    __ ret();
+  %}
+
+%}
+
+//----------FRAME--------------------------------------------------------------
+// Definition of frame structure and management information.
+//
+//  S T A C K   L A Y O U T    Allocators stack-slot number
+//                             |   (to get allocators register number
+//  G  Owned by    |        |  v    add OptoReg::stack0())
+//  r   CALLER     |        |
+//  o     |        +--------+      pad to even-align allocators stack-slot
+//  w     V        |  pad0  |        numbers; owned by CALLER
+//  t   -----------+--------+----> Matcher::_in_arg_limit, unaligned
+//  h     ^        |   in   |  5
+//        |        |  args  |  4   Holes in incoming args owned by SELF
+//  |     |        |        |  3
+//  |     |        +--------+
+//  V     |        | old out|      Empty on Intel, window on Sparc
+//        |    old |preserve|      Must be even aligned.
+//        |     SP-+--------+----> Matcher::_old_SP, even aligned
+//        |        |   in   |  3   area for Intel ret address
+//     Owned by    |preserve|      Empty on Sparc.
+//       SELF      +--------+
+//        |        |  pad2  |  2   pad to align old SP
+//        |        +--------+  1
+//        |        | locks  |  0
+//        |        +--------+----> OptoReg::stack0(), even aligned
+//        |        |  pad1  | 11   pad to align new SP
+//        |        +--------+
+//        |        |        | 10
+//        |        | spills |  9   spills
+//        V        |        |  8   (pad0 slot for callee)
+//      -----------+--------+----> Matcher::_out_arg_limit, unaligned
+//        ^        |  out   |  7
+//        |        |  args  |  6   Holes in outgoing args owned by CALLEE
+//     Owned by    +--------+
+//      CALLEE     | new out|  6   Empty on Intel, window on Sparc
+//        |    new |preserve|      Must be even-aligned.
+//        |     SP-+--------+----> Matcher::_new_SP, even aligned
+//        |        |        |
+//
+// Note 1: Only region 8-11 is determined by the allocator.  Region 0-5 is
+//         known from SELF's arguments and the Java calling convention.
+//         Region 6-7 is determined per call site.
+// Note 2: If the calling convention leaves holes in the incoming argument
+//         area, those holes are owned by SELF.  Holes in the outgoing area
+//         are owned by the CALLEE.  Holes should not be nessecary in the
+//         incoming area, as the Java calling convention is completely under
+//         the control of the AD file.  Doubles can be sorted and packed to
+//         avoid holes.  Holes in the outgoing arguments may be nessecary for
+//         varargs C calling conventions.
+// Note 3: Region 0-3 is even aligned, with pad2 as needed.  Region 3-5 is
+//         even aligned with pad0 as needed.
+//         Region 6 is even aligned.  Region 6-7 is NOT even aligned;
+//           (the latter is true on Intel but is it false on RISCV?)
+//         region 6-11 is even aligned; it may be padded out more so that
+//         the region from SP to FP meets the minimum stack alignment.
+// Note 4: For I2C adapters, the incoming FP may not meet the minimum stack
+//         alignment.  Region 11, pad1, may be dynamically extended so that
+//         SP meets the minimum alignment.
+
+frame %{
+  // These three registers define part of the calling convention
+  // between compiled code and the interpreter.
+
+  // Inline Cache Register or methodOop for I2C.
+  inline_cache_reg(R31);
+
+  // Optional: name the operand used by cisc-spilling to access [stack_pointer + offset]
+  cisc_spilling_operand_name(indOffset);
+
+  // Number of stack slots consumed by locking an object
+  // generate Compile::sync_stack_slots
+  // VMRegImpl::slots_per_word = wordSize / stack_slot_size = 8 / 4 = 2
+  sync_stack_slots(1 * VMRegImpl::slots_per_word);
+
+  // Compiled code's Frame Pointer
+  frame_pointer(R2);
+
+  // Interpreter stores its frame pointer in a register which is
+  // stored to the stack by I2CAdaptors.
+  // I2CAdaptors convert from interpreted java to compiled java.
+  interpreter_frame_pointer(R8);
+
+  // Stack alignment requirement
+  stack_alignment(StackAlignmentInBytes); // Alignment size in bytes (128-bit -> 16 bytes)
+
+  // Number of outgoing stack slots killed above the out_preserve_stack_slots
+  // for calls to C.  Supports the var-args backing area for register parms.
+  varargs_C_out_slots_killed(frame::arg_reg_save_area_bytes / BytesPerInt);
+
+  // The after-PROLOG location of the return address.  Location of
+  // return address specifies a type (REG or STACK) and a number
+  // representing the register number (i.e. - use a register name) or
+  // stack slot.
+  // Ret Addr is on stack in slot 0 if no locks or verification or alignment.
+  // Otherwise, it is above the locks and verification slot and alignment word
+  // TODO this may well be correct but need to check why that - 2 is there
+  // ppc port uses 0 but we definitely need to allow for fixed_slots
+  // which folds in the space used for monitors
+  return_addr(STACK - 2 +
+              align_up((Compile::current()->in_preserve_stack_slots() +
+                        Compile::current()->fixed_slots()),
+                       stack_alignment_in_slots()));
+
+  // Location of compiled Java return values.  Same as C for now.
+  return_value
+  %{
+    assert(ideal_reg >= Op_RegI && ideal_reg <= Op_RegL,
+           "only return normal values");
+
+    static const int lo[Op_RegL + 1] = { // enum name
+      0,                                 // Op_Node
+      0,                                 // Op_Set
+      R10_num,                           // Op_RegN
+      R10_num,                           // Op_RegI
+      R10_num,                           // Op_RegP
+      F10_num,                           // Op_RegF
+      F10_num,                           // Op_RegD
+      R10_num                            // Op_RegL
+    };
+
+    static const int hi[Op_RegL + 1] = { // enum name
+      0,                                 // Op_Node
+      0,                                 // Op_Set
+      OptoReg::Bad,                      // Op_RegN
+      OptoReg::Bad,                      // Op_RegI
+      R10_H_num,                         // Op_RegP
+      OptoReg::Bad,                      // Op_RegF
+      F10_H_num,                         // Op_RegD
+      R10_H_num                          // Op_RegL
+    };
+
+    return OptoRegPair(hi[ideal_reg], lo[ideal_reg]);
+  %}
+%}
+
+//----------ATTRIBUTES---------------------------------------------------------
+//----------Operand Attributes-------------------------------------------------
+op_attrib op_cost(1);        // Required cost attribute
+
+//----------Instruction Attributes---------------------------------------------
+ins_attrib ins_cost(DEFAULT_COST); // Required cost attribute
+ins_attrib ins_size(32);        // Required size attribute (in bits)
+ins_attrib ins_short_branch(0); // Required flag: is this instruction
+                                // a non-matching short branch variant
+                                // of some long branch?
+ins_attrib ins_alignment(4);    // Required alignment attribute (must
+                                // be a power of 2) specifies the
+                                // alignment that some part of the
+                                // instruction (not necessarily the
+                                // start) requires.  If > 1, a
+                                // compute_padding() function must be
+                                // provided for the instruction
+
+//----------OPERANDS-----------------------------------------------------------
+// Operand definitions must precede instruction definitions for correct parsing
+// in the ADLC because operands constitute user defined types which are used in
+// instruction definitions.
+
+//----------Simple Operands----------------------------------------------------
+
+// Integer operands 32 bit
+// 32 bit immediate
+operand immI()
+%{
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 32 bit zero
+operand immI0()
+%{
+  predicate(n->get_int() == 0);
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 32 bit unit increment
+operand immI_1()
+%{
+  predicate(n->get_int() == 1);
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 32 bit unit decrement
+operand immI_M1()
+%{
+  predicate(n->get_int() == -1);
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Unsigned Integer Immediate:  6-bit int, greater than 32
+operand uimmI6_ge32() %{
+  predicate(((unsigned int)(n->get_int()) < 64) && (n->get_int() >= 32));
+  match(ConI);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+operand immI_le_4()
+%{
+  predicate(n->get_int() <= 4);
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+operand immI_16()
+%{
+  predicate(n->get_int() == 16);
+  match(ConI);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+operand immI_24()
+%{
+  predicate(n->get_int() == 24);
+  match(ConI);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+operand immI_31()
+%{
+  predicate(n->get_int() == 31);
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+operand immI_63()
+%{
+  predicate(n->get_int() == 63);
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 32 bit integer valid for add immediate
+operand immIAdd()
+%{
+  predicate(Assembler::operand_valid_for_add_immediate((int64_t)n->get_int()));
+  match(ConI);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 32 bit integer valid for sub immediate
+operand immISub()
+%{
+  predicate(Assembler::operand_valid_for_add_immediate(-(int64_t)n->get_int()));
+  match(ConI);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 5 bit signed value.
+operand immI5()
+%{
+  predicate(n->get_int() <= 15 && n->get_int() >= -16);
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 5 bit signed value (simm5)
+operand immL5()
+%{
+  predicate(n->get_long() <= 15 && n->get_long() >= -16);
+  match(ConL);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Integer operands 64 bit
+// 64 bit immediate
+operand immL()
+%{
+  match(ConL);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 64 bit zero
+operand immL0()
+%{
+  predicate(n->get_long() == 0);
+  match(ConL);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Pointer operands
+// Pointer Immediate
+operand immP()
+%{
+  match(ConP);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// NULL Pointer Immediate
+operand immP0()
+%{
+  predicate(n->get_ptr() == 0);
+  match(ConP);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Pointer Immediate One
+// this is used in object initialization (initial object header)
+operand immP_1()
+%{
+  predicate(n->get_ptr() == 1);
+  match(ConP);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Card Table Byte Map Base
+operand immByteMapBase()
+%{
+  // Get base of card map
+  predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
+            (CardTable::CardValue*)n->get_ptr() ==
+             ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
+  match(ConP);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Int Immediate: low 16-bit mask
+operand immI_16bits()
+%{
+  predicate(n->get_int() == 0xFFFF);
+  match(ConI);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Long Immediate: low 32-bit mask
+operand immL_32bits()
+%{
+  predicate(n->get_long() == 0xFFFFFFFFL);
+  match(ConL);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 64 bit unit decrement
+operand immL_M1()
+%{
+  predicate(n->get_long() == -1);
+  match(ConL);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+
+// 32 bit offset of pc in thread anchor
+
+operand immL_pc_off()
+%{
+  predicate(n->get_long() == in_bytes(JavaThread::frame_anchor_offset()) +
+                             in_bytes(JavaFrameAnchor::last_Java_pc_offset()));
+  match(ConL);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 64 bit integer valid for add immediate
+operand immLAdd()
+%{
+  predicate(Assembler::operand_valid_for_add_immediate(n->get_long()));
+  match(ConL);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// 64 bit integer valid for sub immediate
+operand immLSub()
+%{
+  predicate(Assembler::operand_valid_for_add_immediate(-(n->get_long())));
+  match(ConL);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Narrow pointer operands
+// Narrow Pointer Immediate
+operand immN()
+%{
+  match(ConN);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Narrow NULL Pointer Immediate
+operand immN0()
+%{
+  predicate(n->get_narrowcon() == 0);
+  match(ConN);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+operand immNKlass()
+%{
+  match(ConNKlass);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Float and Double operands
+// Double Immediate
+operand immD()
+%{
+  match(ConD);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Double Immediate: +0.0d
+operand immD0()
+%{
+  predicate(jlong_cast(n->getd()) == 0);
+  match(ConD);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Float Immediate
+operand immF()
+%{
+  match(ConF);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Float Immediate: +0.0f.
+operand immF0()
+%{
+  predicate(jint_cast(n->getf()) == 0);
+  match(ConF);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+operand immIOffset()
+%{
+  predicate(is_imm_in_range(n->get_int(), 12, 0));
+  match(ConI);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+operand immLOffset()
+%{
+  predicate(is_imm_in_range(n->get_long(), 12, 0));
+  match(ConL);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Scale values
+operand immIScale()
+%{
+  predicate(1 <= n->get_int() && (n->get_int() <= 3));
+  match(ConI);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Integer 32 bit Register Operands
+operand iRegI()
+%{
+  constraint(ALLOC_IN_RC(any_reg32));
+  match(RegI);
+  match(iRegINoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Integer 32 bit Register not Special
+operand iRegINoSp()
+%{
+  constraint(ALLOC_IN_RC(no_special_reg32));
+  match(RegI);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Register R10 only
+operand iRegI_R10()
+%{
+  constraint(ALLOC_IN_RC(int_r10_reg));
+  match(RegI);
+  match(iRegINoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Register R12 only
+operand iRegI_R12()
+%{
+  constraint(ALLOC_IN_RC(int_r12_reg));
+  match(RegI);
+  match(iRegINoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Register R13 only
+operand iRegI_R13()
+%{
+  constraint(ALLOC_IN_RC(int_r13_reg));
+  match(RegI);
+  match(iRegINoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Register R14 only
+operand iRegI_R14()
+%{
+  constraint(ALLOC_IN_RC(int_r14_reg));
+  match(RegI);
+  match(iRegINoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Integer 64 bit Register Operands
+operand iRegL()
+%{
+  constraint(ALLOC_IN_RC(any_reg));
+  match(RegL);
+  match(iRegLNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Integer 64 bit Register not Special
+operand iRegLNoSp()
+%{
+  constraint(ALLOC_IN_RC(no_special_reg));
+  match(RegL);
+  match(iRegL_R10);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Long 64 bit Register R28 only
+operand iRegL_R28()
+%{
+  constraint(ALLOC_IN_RC(r28_reg));
+  match(RegL);
+  match(iRegLNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Long 64 bit Register R29 only
+operand iRegL_R29()
+%{
+  constraint(ALLOC_IN_RC(r29_reg));
+  match(RegL);
+  match(iRegLNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Long 64 bit Register R30 only
+operand iRegL_R30()
+%{
+  constraint(ALLOC_IN_RC(r30_reg));
+  match(RegL);
+  match(iRegLNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Pointer Register Operands
+// Pointer Register
+operand iRegP()
+%{
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(RegP);
+  match(iRegPNoSp);
+  match(iRegP_R10);
+  match(javaThread_RegP);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Pointer 64 bit Register not Special
+operand iRegPNoSp()
+%{
+  constraint(ALLOC_IN_RC(no_special_ptr_reg));
+  match(RegP);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand iRegP_R10()
+%{
+  constraint(ALLOC_IN_RC(r10_reg));
+  match(RegP);
+  // match(iRegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Pointer 64 bit Register R11 only
+operand iRegP_R11()
+%{
+  constraint(ALLOC_IN_RC(r11_reg));
+  match(RegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand iRegP_R12()
+%{
+  constraint(ALLOC_IN_RC(r12_reg));
+  match(RegP);
+  // match(iRegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Pointer 64 bit Register R13 only
+operand iRegP_R13()
+%{
+  constraint(ALLOC_IN_RC(r13_reg));
+  match(RegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand iRegP_R14()
+%{
+  constraint(ALLOC_IN_RC(r14_reg));
+  match(RegP);
+  // match(iRegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand iRegP_R15()
+%{
+  constraint(ALLOC_IN_RC(r15_reg));
+  match(RegP);
+  // match(iRegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand iRegP_R16()
+%{
+  constraint(ALLOC_IN_RC(r16_reg));
+  match(RegP);
+  // match(iRegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Pointer 64 bit Register R28 only
+operand iRegP_R28()
+%{
+  constraint(ALLOC_IN_RC(r28_reg));
+  match(RegP);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Pointer Register Operands
+// Narrow Pointer Register
+operand iRegN()
+%{
+  constraint(ALLOC_IN_RC(any_reg32));
+  match(RegN);
+  match(iRegNNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Integer 64 bit Register not Special
+operand iRegNNoSp()
+%{
+  constraint(ALLOC_IN_RC(no_special_reg32));
+  match(RegN);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// heap base register -- used for encoding immN0
+operand iRegIHeapbase()
+%{
+  constraint(ALLOC_IN_RC(heapbase_reg));
+  match(RegI);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Long 64 bit Register R10 only
+operand iRegL_R10()
+%{
+  constraint(ALLOC_IN_RC(r10_reg));
+  match(RegL);
+  match(iRegLNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Float Register
+// Float register operands
+operand fRegF()
+%{
+  constraint(ALLOC_IN_RC(float_reg));
+  match(RegF);
+
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Double Register
+// Double register operands
+operand fRegD()
+%{
+  constraint(ALLOC_IN_RC(double_reg));
+  match(RegD);
+
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Generic vector class. This will be used for
+// all vector operands.
+operand vReg()
+%{
+  constraint(ALLOC_IN_RC(vectora_reg));
+  match(VecA);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand vReg_V1()
+%{
+  constraint(ALLOC_IN_RC(v1_reg));
+  match(VecA);
+  match(vReg);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand vReg_V2()
+%{
+  constraint(ALLOC_IN_RC(v2_reg));
+  match(VecA);
+  match(vReg);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand vReg_V3()
+%{
+  constraint(ALLOC_IN_RC(v3_reg));
+  match(VecA);
+  match(vReg);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand vReg_V4()
+%{
+  constraint(ALLOC_IN_RC(v4_reg));
+  match(VecA);
+  match(vReg);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand vReg_V5()
+%{
+  constraint(ALLOC_IN_RC(v5_reg));
+  match(VecA);
+  match(vReg);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+// Java Thread Register
+operand javaThread_RegP(iRegP reg)
+%{
+  constraint(ALLOC_IN_RC(java_thread_reg)); // java_thread_reg
+  match(reg);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+//----------Memory Operands----------------------------------------------------
+// RISCV has only base_plus_offset and literal address mode, so no need to use
+// index and scale. Here set index as 0xffffffff and scale as 0x0.
+operand indirect(iRegP reg)
+%{
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(reg);
+  op_cost(0);
+  format %{ "[$reg]" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp(0x0);
+  %}
+%}
+
+operand indOffI(iRegP reg, immIOffset off)
+%{
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(AddP reg off);
+  op_cost(0);
+  format %{ "[$reg, $off]" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp($off);
+  %}
+%}
+
+operand indOffL(iRegP reg, immLOffset off)
+%{
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(AddP reg off);
+  op_cost(0);
+  format %{ "[$reg, $off]" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp($off);
+  %}
+%}
+
+operand indirectN(iRegN reg)
+%{
+  predicate(CompressedOops::shift() == 0);
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(DecodeN reg);
+  op_cost(0);
+  format %{ "[$reg]\t# narrow" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp(0x0);
+  %}
+%}
+
+operand indOffIN(iRegN reg, immIOffset off)
+%{
+  predicate(CompressedOops::shift() == 0);
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(AddP (DecodeN reg) off);
+  op_cost(0);
+  format %{ "[$reg, $off]\t# narrow" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp($off);
+  %}
+%}
+
+operand indOffLN(iRegN reg, immLOffset off)
+%{
+  predicate(CompressedOops::shift() == 0);
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(AddP (DecodeN reg) off);
+  op_cost(0);
+  format %{ "[$reg, $off]\t# narrow" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp($off);
+  %}
+%}
+
+// RISCV opto stubs need to write to the pc slot in the thread anchor
+operand thread_anchor_pc(javaThread_RegP reg, immL_pc_off off)
+%{
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(AddP reg off);
+  op_cost(0);
+  format %{ "[$reg, $off]" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp($off);
+  %}
+%}
+
+
+//----------Special Memory Operands--------------------------------------------
+// Stack Slot Operand - This operand is used for loading and storing temporary
+//                      values on the stack where a match requires a value to
+//                      flow through memory.
+operand stackSlotI(sRegI reg)
+%{
+  constraint(ALLOC_IN_RC(stack_slots));
+  // No match rule because this operand is only generated in matching
+  // match(RegI);
+  format %{ "[$reg]" %}
+  interface(MEMORY_INTER) %{
+    base(0x02);  // RSP
+    index(0xffffffff);  // No Index
+    scale(0x0);  // No Scale
+    disp($reg);  // Stack Offset
+  %}
+%}
+
+operand stackSlotF(sRegF reg)
+%{
+  constraint(ALLOC_IN_RC(stack_slots));
+  // No match rule because this operand is only generated in matching
+  // match(RegF);
+  format %{ "[$reg]" %}
+  interface(MEMORY_INTER) %{
+    base(0x02);  // RSP
+    index(0xffffffff);  // No Index
+    scale(0x0);  // No Scale
+    disp($reg);  // Stack Offset
+  %}
+%}
+
+operand stackSlotD(sRegD reg)
+%{
+  constraint(ALLOC_IN_RC(stack_slots));
+  // No match rule because this operand is only generated in matching
+  // match(RegD);
+  format %{ "[$reg]" %}
+  interface(MEMORY_INTER) %{
+    base(0x02);  // RSP
+    index(0xffffffff);  // No Index
+    scale(0x0);  // No Scale
+    disp($reg);  // Stack Offset
+  %}
+%}
+
+operand stackSlotL(sRegL reg)
+%{
+  constraint(ALLOC_IN_RC(stack_slots));
+  // No match rule because this operand is only generated in matching
+  // match(RegL);
+  format %{ "[$reg]" %}
+  interface(MEMORY_INTER) %{
+    base(0x02);  // RSP
+    index(0xffffffff);  // No Index
+    scale(0x0);  // No Scale
+    disp($reg);  // Stack Offset
+  %}
+%}
+
+// Special operand allowing long args to int ops to be truncated for free
+
+operand iRegL2I(iRegL reg) %{
+
+  op_cost(0);
+
+  match(ConvL2I reg);
+
+  format %{ "l2i($reg)" %}
+
+  interface(REG_INTER)
+%}
+
+
+// Comparison Operands
+// NOTE: Label is a predefined operand which should not be redefined in
+//       the AD file. It is generically handled within the ADLC.
+
+//----------Conditional Branch Operands----------------------------------------
+// Comparison Op  - This is the operation of the comparison, and is limited to
+//                  the following set of codes:
+//                  L (<), LE (<=), G (>), GE (>=), E (==), NE (!=)
+//
+// Other attributes of the comparison, such as unsignedness, are specified
+// by the comparison instruction that sets a condition code flags register.
+// That result is represented by a flags operand whose subtype is appropriate
+// to the unsignedness (etc.) of the comparison.
+//
+// Later, the instruction which matches both the Comparison Op (a Bool) and
+// the flags (produced by the Cmp) specifies the coding of the comparison op
+// by matching a specific subtype of Bool operand below, such as cmpOpU.
+
+
+// used for signed integral comparisons and fp comparisons
+operand cmpOp()
+%{
+  match(Bool);
+
+  format %{ "" %}
+
+  // the values in interface derives from struct BoolTest::mask
+  interface(COND_INTER) %{
+    equal(0x0, "eq");
+    greater(0x1, "gt");
+    overflow(0x2, "overflow");
+    less(0x3, "lt");
+    not_equal(0x4, "ne");
+    less_equal(0x5, "le");
+    no_overflow(0x6, "no_overflow");
+    greater_equal(0x7, "ge");
+  %}
+%}
+
+// used for unsigned integral comparisons
+operand cmpOpU()
+%{
+  match(Bool);
+
+  format %{ "" %}
+  // the values in interface derives from struct BoolTest::mask
+  interface(COND_INTER) %{
+    equal(0x0, "eq");
+    greater(0x1, "gtu");
+    overflow(0x2, "overflow");
+    less(0x3, "ltu");
+    not_equal(0x4, "ne");
+    less_equal(0x5, "leu");
+    no_overflow(0x6, "no_overflow");
+    greater_equal(0x7, "geu");
+  %}
+%}
+
+// used for certain integral comparisons which can be
+// converted to bxx instructions
+operand cmpOpEqNe()
+%{
+  match(Bool);
+  op_cost(0);
+  predicate(n->as_Bool()->_test._test == BoolTest::ne ||
+            n->as_Bool()->_test._test == BoolTest::eq);
+
+  format %{ "" %}
+  interface(COND_INTER) %{
+    equal(0x0, "eq");
+    greater(0x1, "gt");
+    overflow(0x2, "overflow");
+    less(0x3, "lt");
+    not_equal(0x4, "ne");
+    less_equal(0x5, "le");
+    no_overflow(0x6, "no_overflow");
+    greater_equal(0x7, "ge");
+  %}
+%}
+
+operand cmpOpULtGe()
+%{
+  match(Bool);
+  op_cost(0);
+  predicate(n->as_Bool()->_test._test == BoolTest::lt ||
+            n->as_Bool()->_test._test == BoolTest::ge);
+
+  format %{ "" %}
+  interface(COND_INTER) %{
+    equal(0x0, "eq");
+    greater(0x1, "gt");
+    overflow(0x2, "overflow");
+    less(0x3, "lt");
+    not_equal(0x4, "ne");
+    less_equal(0x5, "le");
+    no_overflow(0x6, "no_overflow");
+    greater_equal(0x7, "ge");
+  %}
+%}
+
+operand cmpOpUEqNeLeGt()
+%{
+  match(Bool);
+  op_cost(0);
+  predicate(n->as_Bool()->_test._test == BoolTest::ne ||
+            n->as_Bool()->_test._test == BoolTest::eq ||
+            n->as_Bool()->_test._test == BoolTest::le ||
+            n->as_Bool()->_test._test == BoolTest::gt);
+
+  format %{ "" %}
+  interface(COND_INTER) %{
+    equal(0x0, "eq");
+    greater(0x1, "gt");
+    overflow(0x2, "overflow");
+    less(0x3, "lt");
+    not_equal(0x4, "ne");
+    less_equal(0x5, "le");
+    no_overflow(0x6, "no_overflow");
+    greater_equal(0x7, "ge");
+  %}
+%}
+
+
+// Flags register, used as output of compare logic
+operand rFlagsReg()
+%{
+  constraint(ALLOC_IN_RC(reg_flags));
+  match(RegFlags);
+
+  op_cost(0);
+  format %{ "RFLAGS" %}
+  interface(REG_INTER);
+%}
+
+// Special Registers
+
+// Method Register
+operand inline_cache_RegP(iRegP reg)
+%{
+  constraint(ALLOC_IN_RC(method_reg)); // inline_cache_reg
+  match(reg);
+  match(iRegPNoSp);
+  op_cost(0);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+//----------OPERAND CLASSES----------------------------------------------------
+// Operand Classes are groups of operands that are used as to simplify
+// instruction definitions by not requiring the AD writer to specify
+// separate instructions for every form of operand when the
+// instruction accepts multiple operand types with the same basic
+// encoding and format. The classic case of this is memory operands.
+
+// memory is used to define read/write location for load/store
+// instruction defs. we can turn a memory op into an Address
+
+opclass memory(indirect, indOffI, indOffL, indirectN, indOffIN, indOffLN);
+
+// iRegIorL2I is used for src inputs in rules for 32 bit int (I)
+// operations. it allows the src to be either an iRegI or a (ConvL2I
+// iRegL). in the latter case the l2i normally planted for a ConvL2I
+// can be elided because the 32-bit instruction will just employ the
+// lower 32 bits anyway.
+//
+// n.b. this does not elide all L2I conversions. if the truncated
+// value is consumed by more than one operation then the ConvL2I
+// cannot be bundled into the consuming nodes so an l2i gets planted
+// (actually a mvw $dst $src) and the downstream instructions consume
+// the result of the l2i as an iRegI input. That's a shame since the
+// mvw is actually redundant but its not too costly.
+
+opclass iRegIorL2I(iRegI, iRegL2I);
+opclass iRegIorL(iRegI, iRegL);
+opclass iRegNorP(iRegN, iRegP);
+opclass iRegILNP(iRegI, iRegL, iRegN, iRegP);
+opclass iRegILNPNoSp(iRegINoSp, iRegLNoSp, iRegNNoSp, iRegPNoSp);
+opclass immIorL(immI, immL);
+
+//----------PIPELINE-----------------------------------------------------------
+// Rules which define the behavior of the target architectures pipeline.
+
+// For specific pipelines, e.g. generic RISC-V, define the stages of that pipeline
+//pipe_desc(ID, EX, MEM, WR);
+#define ID   S0
+#define EX   S1
+#define MEM  S2
+#define WR   S3
+
+// Integer ALU reg operation
+pipeline %{
+
+attributes %{
+  // RISC-V instructions are of fixed length
+  fixed_size_instructions;           // Fixed size instructions TODO does
+  max_instructions_per_bundle = 2;   // Generic RISC-V 1, Sifive Series 7 2
+  // RISC-V instructions come in 32-bit word units
+  instruction_unit_size = 4;         // An instruction is 4 bytes long
+  instruction_fetch_unit_size = 64;  // The processor fetches one line
+  instruction_fetch_units = 1;       // of 64 bytes
+
+  // List of nop instructions
+  nops( MachNop );
+%}
+
+// We don't use an actual pipeline model so don't care about resources
+// or description. we do use pipeline classes to introduce fixed
+// latencies
+
+//----------RESOURCES----------------------------------------------------------
+// Resources are the functional units available to the machine
+
+// Generic RISC-V pipeline
+// 1 decoder
+// 1 instruction decoded per cycle
+// 1 load/store ops per cycle, 1 branch, 1 FPU
+// 1 mul, 1 div
+
+resources ( DECODE,
+            ALU,
+            MUL,
+            DIV,
+            BRANCH,
+            LDST,
+            FPU);
+
+//----------PIPELINE DESCRIPTION-----------------------------------------------
+// Pipeline Description specifies the stages in the machine's pipeline
+
+// Define the pipeline as a generic 6 stage pipeline
+pipe_desc(S0, S1, S2, S3, S4, S5);
+
+//----------PIPELINE CLASSES---------------------------------------------------
+// Pipeline Classes describe the stages in which input and output are
+// referenced by the hardware pipeline.
+
+pipe_class fp_dop_reg_reg_s(fRegF dst, fRegF src1, fRegF src2)
+%{
+  single_instruction;
+  src1   : S1(read);
+  src2   : S2(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_dop_reg_reg_d(fRegD dst, fRegD src1, fRegD src2)
+%{
+  src1   : S1(read);
+  src2   : S2(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_uop_s(fRegF dst, fRegF src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_uop_d(fRegD dst, fRegD src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_d2f(fRegF dst, fRegD src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_f2d(fRegD dst, fRegF src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_f2i(iRegINoSp dst, fRegF src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_f2l(iRegLNoSp dst, fRegF src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_i2f(fRegF dst, iRegIorL2I src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_l2f(fRegF dst, iRegL src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_d2i(iRegINoSp dst, fRegD src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_d2l(iRegLNoSp dst, fRegD src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_i2d(fRegD dst, iRegIorL2I src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_l2d(fRegD dst, iRegIorL2I src)
+%{
+  single_instruction;
+  src    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_div_s(fRegF dst, fRegF src1, fRegF src2)
+%{
+  single_instruction;
+  src1   : S1(read);
+  src2   : S2(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_div_d(fRegD dst, fRegD src1, fRegD src2)
+%{
+  single_instruction;
+  src1   : S1(read);
+  src2   : S2(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_sqrt_s(fRegF dst, fRegF src1, fRegF src2)
+%{
+  single_instruction;
+  src1   : S1(read);
+  src2   : S2(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_sqrt_d(fRegD dst, fRegD src1, fRegD src2)
+%{
+  single_instruction;
+  src1   : S1(read);
+  src2   : S2(read);
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_load_constant_s(fRegF dst)
+%{
+  single_instruction;
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_load_constant_d(fRegD dst)
+%{
+  single_instruction;
+  dst    : S5(write);
+  DECODE : ID;
+  FPU    : S5;
+%}
+
+pipe_class fp_load_mem_s(fRegF dst, memory mem)
+%{
+  single_instruction;
+  mem    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+pipe_class fp_load_mem_d(fRegD dst, memory mem)
+%{
+  single_instruction;
+  mem    : S1(read);
+  dst    : S5(write);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+pipe_class fp_store_reg_s(fRegF src, memory mem)
+%{
+  single_instruction;
+  src    : S1(read);
+  mem    : S5(write);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+pipe_class fp_store_reg_d(fRegD src, memory mem)
+%{
+  single_instruction;
+  src    : S1(read);
+  mem    : S5(write);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+//------- Integer ALU operations --------------------------
+
+// Integer ALU reg-reg operation
+// Operands needs in ID, result generated in EX
+// E.g.  ADD   Rd, Rs1, Rs2
+pipe_class ialu_reg_reg(iRegI dst, iRegI src1, iRegI src2)
+%{
+  single_instruction;
+  dst    : EX(write);
+  src1   : ID(read);
+  src2   : ID(read);
+  DECODE : ID;
+  ALU    : EX;
+%}
+
+// Integer ALU reg operation with constant shift
+// E.g. SLLI    Rd, Rs1, #shift
+pipe_class ialu_reg_shift(iRegI dst, iRegI src1)
+%{
+  single_instruction;
+  dst    : EX(write);
+  src1   : ID(read);
+  DECODE : ID;
+  ALU    : EX;
+%}
+
+// Integer ALU reg-reg operation with variable shift
+// both operands must be available in ID
+// E.g. SLL   Rd, Rs1, Rs2
+pipe_class ialu_reg_reg_vshift(iRegI dst, iRegI src1, iRegI src2)
+%{
+  single_instruction;
+  dst    : EX(write);
+  src1   : ID(read);
+  src2   : ID(read);
+  DECODE : ID;
+  ALU    : EX;
+%}
+
+// Integer ALU reg operation
+// E.g. NEG   Rd, Rs2
+pipe_class ialu_reg(iRegI dst, iRegI src)
+%{
+  single_instruction;
+  dst    : EX(write);
+  src    : ID(read);
+  DECODE : ID;
+  ALU    : EX;
+%}
+
+// Integer ALU reg immediate operation
+// E.g. ADDI   Rd, Rs1, #imm
+pipe_class ialu_reg_imm(iRegI dst, iRegI src1)
+%{
+  single_instruction;
+  dst    : EX(write);
+  src1   : ID(read);
+  DECODE : ID;
+  ALU    : EX;
+%}
+
+// Integer ALU immediate operation (no source operands)
+// E.g. LI    Rd, #imm
+pipe_class ialu_imm(iRegI dst)
+%{
+  single_instruction;
+  dst    : EX(write);
+  DECODE : ID;
+  ALU    : EX;
+%}
+
+//------- Multiply pipeline operations --------------------
+
+// Multiply reg-reg
+// E.g. MULW   Rd, Rs1, Rs2
+pipe_class imul_reg_reg(iRegI dst, iRegI src1, iRegI src2)
+%{
+  single_instruction;
+  dst    : WR(write);
+  src1   : ID(read);
+  src2   : ID(read);
+  DECODE : ID;
+  MUL    : WR;
+%}
+
+// E.g. MUL   RD, Rs1, Rs2
+pipe_class lmul_reg_reg(iRegI dst, iRegI src1, iRegI src2)
+%{
+  single_instruction;
+  fixed_latency(3); // Maximum latency for 64 bit mul
+  dst    : WR(write);
+  src1   : ID(read);
+  src2   : ID(read);
+  DECODE : ID;
+  MUL    : WR;
+%}
+
+//------- Divide pipeline operations --------------------
+
+// E.g. DIVW   Rd, Rs1, Rs2
+pipe_class idiv_reg_reg(iRegI dst, iRegI src1, iRegI src2)
+%{
+  single_instruction;
+  fixed_latency(8); // Maximum latency for 32 bit divide
+  dst    : WR(write);
+  src1   : ID(read);
+  src2   : ID(read);
+  DECODE : ID;
+  DIV    : WR;
+%}
+
+// E.g. DIV   RD, Rs1, Rs2
+pipe_class ldiv_reg_reg(iRegI dst, iRegI src1, iRegI src2)
+%{
+  single_instruction;
+  fixed_latency(16); // Maximum latency for 64 bit divide
+  dst    : WR(write);
+  src1   : ID(read);
+  src2   : ID(read);
+  DECODE : ID;
+  DIV    : WR;
+%}
+
+//------- Load pipeline operations ------------------------
+
+// Load - reg, mem
+// E.g. LA    Rd, mem
+pipe_class iload_reg_mem(iRegI dst, memory mem)
+%{
+  single_instruction;
+  dst    : WR(write);
+  mem    : ID(read);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+// Load - reg, reg
+// E.g. LD    Rd, Rs
+pipe_class iload_reg_reg(iRegI dst, iRegI src)
+%{
+  single_instruction;
+  dst    : WR(write);
+  src    : ID(read);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+//------- Store pipeline operations -----------------------
+
+// Store - zr, mem
+// E.g. SD    zr, mem
+pipe_class istore_mem(memory mem)
+%{
+  single_instruction;
+  mem    : ID(read);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+// Store - reg, mem
+// E.g. SD    Rs, mem
+pipe_class istore_reg_mem(iRegI src, memory mem)
+%{
+  single_instruction;
+  mem    : ID(read);
+  src    : EX(read);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+// Store - reg, reg
+// E.g. SD    Rs2, Rs1
+pipe_class istore_reg_reg(iRegI dst, iRegI src)
+%{
+  single_instruction;
+  dst    : ID(read);
+  src    : EX(read);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+//------- Store pipeline operations -----------------------
+
+// Branch
+pipe_class pipe_branch()
+%{
+  single_instruction;
+  DECODE : ID;
+  BRANCH : EX;
+%}
+
+// Branch
+pipe_class pipe_branch_reg(iRegI src)
+%{
+  single_instruction;
+  src    : ID(read);
+  DECODE : ID;
+  BRANCH : EX;
+%}
+
+// Compare & Branch
+// E.g. BEQ   Rs1, Rs2, L
+pipe_class pipe_cmp_branch(iRegI src1, iRegI src2)
+%{
+  single_instruction;
+  src1   : ID(read);
+  src2   : ID(read);
+  DECODE : ID;
+  BRANCH : EX;
+%}
+
+// E.g. BEQZ Rs, L
+pipe_class pipe_cmpz_branch(iRegI src)
+%{
+  single_instruction;
+  src    : ID(read);
+  DECODE : ID;
+  BRANCH : EX;
+%}
+
+//------- Synchronisation operations ----------------------
+// Any operation requiring serialization
+// E.g. FENCE/Atomic Ops/Load Acquire/Store Release
+pipe_class pipe_serial()
+%{
+  single_instruction;
+  force_serialization;
+  fixed_latency(16);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+pipe_class pipe_slow()
+%{
+  instruction_count(10);
+  multiple_bundles;
+  force_serialization;
+  fixed_latency(16);
+  DECODE : ID;
+  LDST   : MEM;
+%}
+
+// Empty pipeline class
+pipe_class pipe_class_empty()
+%{
+  single_instruction;
+  fixed_latency(0);
+%}
+
+// Default pipeline class.
+pipe_class pipe_class_default()
+%{
+  single_instruction;
+  fixed_latency(2);
+%}
+
+// Pipeline class for compares.
+pipe_class pipe_class_compare()
+%{
+  single_instruction;
+  fixed_latency(16);
+%}
+
+// Pipeline class for memory operations.
+pipe_class pipe_class_memory()
+%{
+  single_instruction;
+  fixed_latency(16);
+%}
+
+// Pipeline class for call.
+pipe_class pipe_class_call()
+%{
+  single_instruction;
+  fixed_latency(100);
+%}
+
+// Define the class for the Nop node.
+define %{
+   MachNop = pipe_class_empty;
+%}
+%}
+//----------INSTRUCTIONS-------------------------------------------------------
+//
+// match      -- States which machine-independent subtree may be replaced
+//               by this instruction.
+// ins_cost   -- The estimated cost of this instruction is used by instruction
+//               selection to identify a minimum cost tree of machine
+//               instructions that matches a tree of machine-independent
+//               instructions.
+// format     -- A string providing the disassembly for this instruction.
+//               The value of an instruction's operand may be inserted
+//               by referring to it with a '$' prefix.
+// opcode     -- Three instruction opcodes may be provided.  These are referred
+//               to within an encode class as $primary, $secondary, and $tertiary
+//               rrspectively.  The primary opcode is commonly used to
+//               indicate the type of machine instruction, while secondary
+//               and tertiary are often used for prefix options or addressing
+//               modes.
+// ins_encode -- A list of encode classes with parameters. The encode class
+//               name must have been defined in an 'enc_class' specification
+//               in the encode section of the architecture description.
+
+// ============================================================================
+// Memory (Load/Store) Instructions
+
+// Load Instructions
+
+// Load Byte (8 bit signed)
+instruct loadB(iRegINoSp dst, memory mem)
+%{
+  match(Set dst (LoadB mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "lb  $dst, $mem\t# byte, #@loadB" %}
+
+  ins_encode %{
+    __ lb(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Byte (8 bit signed) into long
+instruct loadB2L(iRegLNoSp dst, memory mem)
+%{
+  match(Set dst (ConvI2L (LoadB mem)));
+
+  ins_cost(LOAD_COST);
+  format %{ "lb  $dst, $mem\t# byte, #@loadB2L" %}
+
+  ins_encode %{
+    __ lb(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Byte (8 bit unsigned)
+instruct loadUB(iRegINoSp dst, memory mem)
+%{
+  match(Set dst (LoadUB mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "lbu  $dst, $mem\t# byte, #@loadUB" %}
+
+  ins_encode %{
+    __ lbu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Byte (8 bit unsigned) into long
+instruct loadUB2L(iRegLNoSp dst, memory mem)
+%{
+  match(Set dst (ConvI2L (LoadUB mem)));
+
+  ins_cost(LOAD_COST);
+  format %{ "lbu  $dst, $mem\t# byte, #@loadUB2L" %}
+
+  ins_encode %{
+    __ lbu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Short (16 bit signed)
+instruct loadS(iRegINoSp dst, memory mem)
+%{
+  match(Set dst (LoadS mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "lh  $dst, $mem\t# short, #@loadS" %}
+
+  ins_encode %{
+    __ lh(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Short (16 bit signed) into long
+instruct loadS2L(iRegLNoSp dst, memory mem)
+%{
+  match(Set dst (ConvI2L (LoadS mem)));
+
+  ins_cost(LOAD_COST);
+  format %{ "lh  $dst, $mem\t# short, #@loadS2L" %}
+
+  ins_encode %{
+    __ lh(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Char (16 bit unsigned)
+instruct loadUS(iRegINoSp dst, memory mem)
+%{
+  match(Set dst (LoadUS mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "lhu  $dst, $mem\t# short, #@loadUS" %}
+
+  ins_encode %{
+    __ lhu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Short/Char (16 bit unsigned) into long
+instruct loadUS2L(iRegLNoSp dst, memory mem)
+%{
+  match(Set dst (ConvI2L (LoadUS mem)));
+
+  ins_cost(LOAD_COST);
+  format %{ "lhu  $dst, $mem\t# short, #@loadUS2L" %}
+
+  ins_encode %{
+    __ lhu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Integer (32 bit signed)
+instruct loadI(iRegINoSp dst, memory mem)
+%{
+  match(Set dst (LoadI mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "lw  $dst, $mem\t# int, #@loadI" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ lw(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Integer (32 bit signed) into long
+instruct loadI2L(iRegLNoSp dst, memory mem)
+%{
+  match(Set dst (ConvI2L (LoadI mem)));
+
+  ins_cost(LOAD_COST);
+  format %{ "lw  $dst, $mem\t# int, #@loadI2L" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ lw(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Integer (32 bit unsigned) into long
+instruct loadUI2L(iRegLNoSp dst, memory mem, immL_32bits mask)
+%{
+  match(Set dst (AndL (ConvI2L (LoadI mem)) mask));
+
+  ins_cost(LOAD_COST);
+  format %{ "lwu  $dst, $mem\t# int, #@loadUI2L" %}
+
+  ins_encode %{
+    __ lwu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Long (64 bit signed)
+instruct loadL(iRegLNoSp dst, memory mem)
+%{
+  match(Set dst (LoadL mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "ld  $dst, $mem\t# int, #@loadL" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ ld(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Range
+instruct loadRange(iRegINoSp dst, memory mem)
+%{
+  match(Set dst (LoadRange mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "lwu  $dst, $mem\t# range, #@loadRange" %}
+
+  ins_encode %{
+    __ lwu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Pointer
+instruct loadP(iRegPNoSp dst, memory mem)
+%{
+  match(Set dst (LoadP mem));
+  predicate(n->as_Load()->barrier_data() == 0);
+
+  ins_cost(LOAD_COST);
+  format %{ "ld  $dst, $mem\t# ptr, #@loadP" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ ld(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Compressed Pointer
+instruct loadN(iRegNNoSp dst, memory mem)
+%{
+  match(Set dst (LoadN mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "lwu  $dst, $mem\t# loadN, compressed ptr, #@loadN" %}
+
+  ins_encode %{
+    __ lwu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Klass Pointer
+instruct loadKlass(iRegPNoSp dst, memory mem)
+%{
+  match(Set dst (LoadKlass mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "ld  $dst, $mem\t# class, #@loadKlass" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ ld(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Narrow Klass Pointer
+instruct loadNKlass(iRegNNoSp dst, memory mem)
+%{
+  match(Set dst (LoadNKlass mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "lwu  $dst, $mem\t# loadNKlass, compressed class ptr, #@loadNKlass" %}
+
+  ins_encode %{
+    __ lwu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(iload_reg_mem);
+%}
+
+// Load Float
+instruct loadF(fRegF dst, memory mem)
+%{
+  match(Set dst (LoadF mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "flw  $dst, $mem\t# float, #@loadF" %}
+
+  ins_encode %{
+    __ flw(as_FloatRegister($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(fp_load_mem_s);
+%}
+
+// Load Double
+instruct loadD(fRegD dst, memory mem)
+%{
+  match(Set dst (LoadD mem));
+
+  ins_cost(LOAD_COST);
+  format %{ "fld  $dst, $mem\t# double, #@loadD" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ fld(as_FloatRegister($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(fp_load_mem_d);
+%}
+
+// Load Int Constant
+instruct loadConI(iRegINoSp dst, immI src)
+%{
+  match(Set dst src);
+
+  ins_cost(ALU_COST);
+  format %{ "li $dst, $src\t# int, #@loadConI" %}
+
+  ins_encode(riscv_enc_li_imm(dst, src));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Long Constant
+instruct loadConL(iRegLNoSp dst, immL src)
+%{
+  match(Set dst src);
+
+  ins_cost(ALU_COST);
+  format %{ "li $dst, $src\t# long, #@loadConL" %}
+
+  ins_encode(riscv_enc_li_imm(dst, src));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Pointer Constant
+instruct loadConP(iRegPNoSp dst, immP con)
+%{
+  match(Set dst con);
+
+  ins_cost(ALU_COST);
+  format %{ "mv  $dst, $con\t# ptr, #@loadConP" %}
+
+  ins_encode(riscv_enc_mov_p(dst, con));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Null Pointer Constant
+instruct loadConP0(iRegPNoSp dst, immP0 con)
+%{
+  match(Set dst con);
+
+  ins_cost(ALU_COST);
+  format %{ "mv  $dst, $con\t# NULL ptr, #@loadConP0" %}
+
+  ins_encode(riscv_enc_mov_zero(dst));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Pointer Constant One
+instruct loadConP1(iRegPNoSp dst, immP_1 con)
+%{
+  match(Set dst con);
+
+  ins_cost(ALU_COST);
+  format %{ "mv  $dst, $con\t# load ptr constant one, #@loadConP1" %}
+
+  ins_encode(riscv_enc_mov_p1(dst));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Byte Map Base Constant
+instruct loadByteMapBase(iRegPNoSp dst, immByteMapBase con)
+%{
+  match(Set dst con);
+  ins_cost(ALU_COST);
+  format %{ "mv  $dst, $con\t# Byte Map Base, #@loadByteMapBase" %}
+
+  ins_encode(riscv_enc_mov_byte_map_base(dst));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Narrow Pointer Constant
+instruct loadConN(iRegNNoSp dst, immN con)
+%{
+  match(Set dst con);
+
+  ins_cost(ALU_COST * 4);
+  format %{ "mv  $dst, $con\t# compressed ptr, #@loadConN" %}
+
+  ins_encode(riscv_enc_mov_n(dst, con));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Narrow Null Pointer Constant
+instruct loadConN0(iRegNNoSp dst, immN0 con)
+%{
+  match(Set dst con);
+
+  ins_cost(ALU_COST);
+  format %{ "mv  $dst, $con\t# compressed NULL ptr, #@loadConN0" %}
+
+  ins_encode(riscv_enc_mov_zero(dst));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Narrow Klass Constant
+instruct loadConNKlass(iRegNNoSp dst, immNKlass con)
+%{
+  match(Set dst con);
+
+  ins_cost(ALU_COST * 6);
+  format %{ "mv  $dst, $con\t# compressed klass ptr, #@loadConNKlass" %}
+
+  ins_encode(riscv_enc_mov_nk(dst, con));
+
+  ins_pipe(ialu_imm);
+%}
+
+// Load Float Constant
+instruct loadConF(fRegF dst, immF con) %{
+  match(Set dst con);
+
+  ins_cost(LOAD_COST);
+  format %{
+    "flw $dst, [$constantaddress]\t# load from constant table: float=$con, #@loadConF"
+  %}
+
+  ins_encode %{
+    __ flw(as_FloatRegister($dst$$reg), $constantaddress($con));
+  %}
+
+  ins_pipe(fp_load_constant_s);
+%}
+
+instruct loadConF0(fRegF dst, immF0 con) %{
+  match(Set dst con);
+
+  ins_cost(XFER_COST);
+
+  format %{ "fmv.w.x $dst, zr\t# float, #@loadConF0" %}
+
+  ins_encode %{
+    __ fmv_w_x(as_FloatRegister($dst$$reg), zr);
+  %}
+
+  ins_pipe(fp_load_constant_s);
+%}
+
+// Load Double Constant
+instruct loadConD(fRegD dst, immD con) %{
+  match(Set dst con);
+
+  ins_cost(LOAD_COST);
+  format %{
+    "fld $dst, [$constantaddress]\t# load from constant table: double=$con, #@loadConD"
+  %}
+
+  ins_encode %{
+    __ fld(as_FloatRegister($dst$$reg), $constantaddress($con));
+  %}
+
+  ins_pipe(fp_load_constant_d);
+%}
+
+instruct loadConD0(fRegD dst, immD0 con) %{
+  match(Set dst con);
+
+  ins_cost(XFER_COST);
+
+  format %{ "fmv.d.x $dst, zr\t# double, #@loadConD0" %}
+
+  ins_encode %{
+    __ fmv_d_x(as_FloatRegister($dst$$reg), zr);
+  %}
+
+  ins_pipe(fp_load_constant_d);
+%}
+
+// Store Instructions
+// Store CMS card-mark Immediate
+instruct storeimmCM0(immI0 zero, memory mem)
+%{
+  match(Set mem (StoreCM mem zero));
+
+  ins_cost(STORE_COST);
+  format %{ "storestore (elided)\n\t"
+            "sb zr, $mem\t# byte, #@storeimmCM0" %}
+
+  ins_encode %{
+    __ sb(zr, Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_mem);
+%}
+
+// Store CMS card-mark Immediate with intervening StoreStore
+// needed when using CMS with no conditional card marking
+instruct storeimmCM0_ordered(immI0 zero, memory mem)
+%{
+  match(Set mem (StoreCM mem zero));
+
+  ins_cost(ALU_COST + STORE_COST);
+  format %{ "membar(StoreStore)\n\t"
+            "sb zr, $mem\t# byte, #@storeimmCM0_ordered" %}
+
+  ins_encode %{
+    __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+    __ sb(zr, Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_mem);
+%}
+
+// Store Byte
+instruct storeB(iRegIorL2I src, memory mem)
+%{
+  match(Set mem (StoreB mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "sb  $src, $mem\t# byte, #@storeB" %}
+
+  ins_encode %{
+    __ sb(as_Register($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_reg_mem);
+%}
+
+instruct storeimmB0(immI0 zero, memory mem)
+%{
+  match(Set mem (StoreB mem zero));
+
+  ins_cost(STORE_COST);
+  format %{ "sb zr, $mem\t# byte, #@storeimmB0" %}
+
+  ins_encode %{
+    __ sb(zr, Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_mem);
+%}
+
+// Store Char/Short
+instruct storeC(iRegIorL2I src, memory mem)
+%{
+  match(Set mem (StoreC mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "sh  $src, $mem\t# short, #@storeC" %}
+
+  ins_encode %{
+    __ sh(as_Register($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_reg_mem);
+%}
+
+instruct storeimmC0(immI0 zero, memory mem)
+%{
+  match(Set mem (StoreC mem zero));
+
+  ins_cost(STORE_COST);
+  format %{ "sh  zr, $mem\t# short, #@storeimmC0" %}
+
+  ins_encode %{
+    __ sh(zr, Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_mem);
+%}
+
+// Store Integer
+instruct storeI(iRegIorL2I src, memory mem)
+%{
+  match(Set mem(StoreI mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "sw  $src, $mem\t# int, #@storeI" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ sw(as_Register($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_reg_mem);
+%}
+
+instruct storeimmI0(immI0 zero, memory mem)
+%{
+  match(Set mem(StoreI mem zero));
+
+  ins_cost(STORE_COST);
+  format %{ "sw  zr, $mem\t# int, #@storeimmI0" %}
+
+  ins_encode %{
+    __ sw(zr, Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_mem);
+%}
+
+// Store Long (64 bit signed)
+instruct storeL(iRegL src, memory mem)
+%{
+  match(Set mem (StoreL mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "sd  $src, $mem\t# long, #@storeL" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ sd(as_Register($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_reg_mem);
+%}
+
+// Store Long (64 bit signed)
+instruct storeimmL0(immL0 zero, memory mem)
+%{
+  match(Set mem (StoreL mem zero));
+
+  ins_cost(STORE_COST);
+  format %{ "sd  zr, $mem\t# long, #@storeimmL0" %}
+
+  ins_encode %{
+    __ sd(zr, Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_mem);
+%}
+
+// Store Pointer
+instruct storeP(iRegP src, memory mem)
+%{
+  match(Set mem (StoreP mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "sd  $src, $mem\t# ptr, #@storeP" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ sd(as_Register($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_reg_mem);
+%}
+
+// Store Pointer
+instruct storeimmP0(immP0 zero, memory mem)
+%{
+  match(Set mem (StoreP mem zero));
+
+  ins_cost(STORE_COST);
+  format %{ "sd zr, $mem\t# ptr, #@storeimmP0" %}
+
+  ins_encode %{
+    __ sd(zr, Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_mem);
+%}
+
+// Store Compressed Pointer
+instruct storeN(iRegN src, memory mem)
+%{
+  match(Set mem (StoreN mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "sw  $src, $mem\t# compressed ptr, #@storeN" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ sw(as_Register($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_reg_mem);
+%}
+
+instruct storeImmN0(iRegIHeapbase heapbase, immN0 zero, memory mem)
+%{
+  match(Set mem (StoreN mem zero));
+
+  ins_cost(STORE_COST);
+  format %{ "sw  rheapbase, $mem\t# compressed ptr (rheapbase==0), #@storeImmN0" %}
+
+  ins_encode %{
+    __ sw(as_Register($heapbase$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_reg_mem);
+%}
+
+// Store Float
+instruct storeF(fRegF src, memory mem)
+%{
+  match(Set mem (StoreF mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "fsw  $src, $mem\t# float, #@storeF" %}
+
+  ins_encode %{
+    __ fsw(as_FloatRegister($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(fp_store_reg_s);
+%}
+
+// Store Double
+instruct storeD(fRegD src, memory mem)
+%{
+  match(Set mem (StoreD mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "fsd  $src, $mem\t# double, #@storeD" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ fsd(as_FloatRegister($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(fp_store_reg_d);
+%}
+
+// Store Compressed Klass Pointer
+instruct storeNKlass(iRegN src, memory mem)
+%{
+  match(Set mem (StoreNKlass mem src));
+
+  ins_cost(STORE_COST);
+  format %{ "sw  $src, $mem\t# compressed klass ptr, #@storeNKlass" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ sw(as_Register($src$$reg), Address(as_Register($mem$$base), $mem$$disp));
+  %}
+
+  ins_pipe(istore_reg_mem);
+%}
+
+// ============================================================================
+// Atomic operation instructions
+//
+// Intel and SPARC both implement Ideal Node LoadPLocked and
+// Store{PIL}Conditional instructions using a normal load for the
+// LoadPLocked and a CAS for the Store{PIL}Conditional.
+//
+// The ideal code appears only to use LoadPLocked/storePConditional as a
+// pair to lock object allocations from Eden space when not using
+// TLABs.
+//
+// There does not appear to be a Load{IL}Locked Ideal Node and the
+// Ideal code appears to use Store{IL}Conditional as an alias for CAS
+// and to use StoreIConditional only for 32-bit and StoreLConditional
+// only for 64-bit.
+//
+// We implement LoadPLocked and storePConditional instructions using,
+// respectively the RISCV hw load-reserve and store-conditional
+// instructions. Whereas we must implement each of
+// Store{IL}Conditional using a CAS which employs a pair of
+// instructions comprising a load-reserve followed by a
+// store-conditional.
+
+
+// Locked-load (load reserved) of the current heap-top
+// used when updating the eden heap top
+// implemented using lr_d on RISCV64
+instruct loadPLocked(iRegPNoSp dst, indirect mem)
+%{
+  match(Set dst (LoadPLocked mem));
+
+  ins_cost(ALU_COST * 2 + LOAD_COST);
+
+  format %{ "lr.d $dst, $mem\t# ptr load reserved, #@loadPLocked" %}
+
+  ins_encode %{
+    __ la(t0, Address(as_Register($mem$$base), $mem$$disp));
+    __ lr_d($dst$$Register, t0, Assembler::aq);
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+// Conditional-store of the updated heap-top.
+// Used during allocation of the shared heap.
+// implemented using sc_d on RISCV64.
+instruct storePConditional(memory heap_top_ptr, iRegP oldval, iRegP newval, rFlagsReg cr)
+%{
+  match(Set cr (StorePConditional heap_top_ptr (Binary oldval newval)));
+
+  ins_cost(ALU_COST * 2 + STORE_COST);
+
+  format %{
+    "sc_d t1, $newval $heap_top_ptr,\t# ptr store conditional, #@storePConditional"
+  %}
+
+  ins_encode %{
+    __ la(t0, Address(as_Register($heap_top_ptr$$base), $heap_top_ptr$$disp));
+    __ sc_d($cr$$Register, $newval$$Register, t0, Assembler::rl);
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct storeLConditional(indirect mem, iRegLNoSp oldval, iRegLNoSp newval, rFlagsReg cr)
+%{
+  match(Set cr (StoreLConditional mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + 2 * BRANCH_COST);
+
+  format %{
+    "cmpxchg t1, $mem, $oldval, $newval, $mem\t# if $mem == $oldval then $mem <-- $newval"
+    "xorr $cr, $cr, $oldval\t# $cr == 0 on successful write, #@storeLConditional"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $cr$$Register);
+    __ xorr($cr$$Register,$cr$$Register, $oldval$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+// storeIConditional also has acquire semantics, for no better reason
+// than matching storeLConditional.
+instruct storeIConditional(indirect mem, iRegINoSp oldval, iRegINoSp newval, rFlagsReg cr)
+%{
+  match(Set cr (StoreIConditional mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2);
+
+  format %{
+    "cmpxchgw t1, $mem, $oldval, $newval, $mem\t# if $mem == $oldval then $mem <-- $newval"
+    "xorr $cr, $cr, $oldval\t# $cr == 0 on successful write, #@storeIConditional"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $cr$$Register);
+    __ xorr($cr$$Register,$cr$$Register, $oldval$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+// standard CompareAndSwapX when we are using barriers
+// these have higher priority than the rules selected by a predicate
+instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                         iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  match(Set res (CompareAndSwapB mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 10 + BRANCH_COST * 4);
+
+  effect(TEMP_DEF res, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3, KILL cr);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapB"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+                            Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register,
+                            true /* result as bool */, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                         iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  match(Set res (CompareAndSwapS mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 11 + BRANCH_COST * 4);
+
+  effect(TEMP_DEF res, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3, KILL cr);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapS"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+                            Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register,
+                            true /* result as bool */, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapI(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoSp newval)
+%{
+  match(Set res (CompareAndSwapI mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapI"
+  %}
+
+  ins_encode(riscv_enc_cmpxchgw(res, mem, oldval, newval));
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapL(iRegINoSp res, indirect mem, iRegLNoSp oldval, iRegLNoSp newval)
+%{
+  match(Set res (CompareAndSwapL mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapL"
+  %}
+
+  ins_encode(riscv_enc_cmpxchg(res, mem, oldval, newval));
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval)
+%{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+
+  match(Set res (CompareAndSwapP mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapP"
+  %}
+
+  ins_encode(riscv_enc_cmpxchg(res, mem, oldval, newval));
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapN(iRegINoSp res, indirect mem, iRegNNoSp oldval, iRegNNoSp newval)
+%{
+  match(Set res (CompareAndSwapN mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 8 + BRANCH_COST * 4);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapN"
+  %}
+
+  ins_encode(riscv_enc_cmpxchgn(res, mem, oldval, newval));
+
+  ins_pipe(pipe_slow);
+%}
+
+// alternative CompareAndSwapX when we are eliding barriers
+instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                            iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndSwapB mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 10 + BRANCH_COST * 4);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg_acq $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapBAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+                            Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register,
+                            true /* result as bool */, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                            iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndSwapS mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 11 + BRANCH_COST * 4);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg_acq $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapSAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+                            Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register,
+                            true /* result as bool */, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapIAcq(iRegINoSp res, indirect mem, iRegINoSp oldval, iRegINoSp newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndSwapI mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+
+  format %{
+    "cmpxchg_acq $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapIAcq"
+  %}
+
+  ins_encode(riscv_enc_cmpxchgw_acq(res, mem, oldval, newval));
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapLAcq(iRegINoSp res, indirect mem, iRegLNoSp oldval, iRegLNoSp newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndSwapL mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+
+  format %{
+    "cmpxchg_acq $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapLAcq"
+  %}
+
+  ins_encode(riscv_enc_cmpxchg_acq(res, mem, oldval, newval));
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval)
+%{
+  predicate(needs_acquiring_load_reserved(n) && (n->as_LoadStore()->barrier_data() == 0));
+
+  match(Set res (CompareAndSwapP mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+
+  format %{
+    "cmpxchg_acq $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapPAcq"
+  %}
+
+  ins_encode(riscv_enc_cmpxchg_acq(res, mem, oldval, newval));
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapNAcq(iRegINoSp res, indirect mem, iRegNNoSp oldval, iRegNNoSp newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndSwapN mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 8 + BRANCH_COST * 4);
+
+  format %{
+    "cmpxchg_acq $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapNAcq"
+  %}
+
+  ins_encode(riscv_enc_cmpxchgn_acq(res, mem, oldval, newval));
+
+  ins_pipe(pipe_slow);
+%}
+
+// Sundry CAS operations.  Note that release is always true,
+// regardless of the memory ordering of the CAS.  This is because we
+// need the volatile case to be sequentially consistent but there is
+// no trailing StoreLoad barrier emitted by C2.  Unfortunately we
+// can't check the type of memory ordering here, so we always emit a
+// sc_d(w) with rl bit set.
+instruct compareAndExchangeB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                             iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 5);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeB"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+                            /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+                            /*result_as_bool*/ false, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                             iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 6);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeS"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+                            /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+                            /*result_as_bool*/ false, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  match(Set res (CompareAndExchangeI mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
+
+  effect(TEMP_DEF res);
+
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeI"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeL(iRegLNoSp res, indirect mem, iRegL oldval, iRegL newval)
+%{
+  match(Set res (CompareAndExchangeL mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
+
+  effect(TEMP_DEF res);
+
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeL"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeN(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval)
+%{
+  match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 3);
+
+  effect(TEMP_DEF res);
+
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeN"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval)
+%{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
+
+  effect(TEMP_DEF res);
+
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeP"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 5);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeBAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+                            /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+                            /*result_as_bool*/ false, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 6);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeSAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+                            /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+                            /*result_as_bool*/ false, $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndExchangeI mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
+
+  effect(TEMP_DEF res);
+
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeIAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeLAcq(iRegLNoSp res, indirect mem, iRegL oldval, iRegL newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndExchangeL mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
+
+  effect(TEMP_DEF res);
+
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeLAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeNAcq(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
+
+  effect(TEMP_DEF res);
+
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeNAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval)
+%{
+  predicate(needs_acquiring_load_reserved(n) && (n->as_LoadStore()->barrier_data() == 0));
+
+  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
+
+  effect(TEMP_DEF res);
+
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangePAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                             iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 6);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg_weak $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapB"
+  %}
+
+  ins_encode %{
+    __ weak_cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+                                 /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+                                 $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                             iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 7);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg_weak $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapS"
+  %}
+
+  ins_encode %{
+    __ weak_cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+                                 /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+                                 $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  match(Set res (WeakCompareAndSwapI mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+
+  format %{
+    "cmpxchg_weak $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapI"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_weak(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+                    /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval)
+%{
+  match(Set res (WeakCompareAndSwapL mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+
+  format %{
+    "cmpxchg_weak $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapL"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_weak(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+                    /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval)
+%{
+  match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 4);
+
+  format %{
+    "cmpxchg_weak $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapN"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_weak(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
+                    /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval)
+%{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+
+  format %{
+    "cmpxchg_weak $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapP"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_weak(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+                    /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 6);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg_weak_acq $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapBAcq"
+  %}
+
+  ins_encode %{
+    __ weak_cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+                                 /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+                                 $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                iRegI tmp1, iRegI tmp2, iRegI tmp3, rFlagsReg cr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 7);
+
+  effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
+
+  format %{
+    "cmpxchg_weak_acq $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapSAcq"
+  %}
+
+  ins_encode %{
+    __ weak_cmpxchg_narrow_value(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+                                 /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+                                 $tmp1$$Register, $tmp2$$Register, $tmp3$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (WeakCompareAndSwapI mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+
+  format %{
+    "cmpxchg_weak_acq $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapIAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_weak(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+                    /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapLAcq(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (WeakCompareAndSwapL mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+
+  format %{
+    "cmpxchg_weak_acq $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapLAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_weak(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+                    /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 4);
+
+  format %{
+    "cmpxchg_weak_acq $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapNAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_weak(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
+                    /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval)
+%{
+  predicate(needs_acquiring_load_reserved(n) && (n->as_LoadStore()->barrier_data() == 0));
+
+  match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
+
+  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+
+  format %{
+    "cmpxchg_weak_acq $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "xori $res, $res, 1\t# $res == 1 when success, #@weakCompareAndSwapPAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg_weak(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+                    /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+    __ xori($res$$Register, $res$$Register, 1);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct get_and_setI(indirect mem, iRegI newv, iRegINoSp prev)
+%{
+  match(Set prev (GetAndSetI mem newv));
+
+  ins_cost(ALU_COST);
+
+  format %{ "atomic_xchgw  $prev, $newv, [$mem]\t#@get_and_setI" %}
+
+  ins_encode %{
+    __ atomic_xchgw($prev$$Register, $newv$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_setL(indirect mem, iRegL newv, iRegLNoSp prev)
+%{
+  match(Set prev (GetAndSetL mem newv));
+
+  ins_cost(ALU_COST);
+
+  format %{ "atomic_xchg  $prev, $newv, [$mem]\t#@get_and_setL" %}
+
+  ins_encode %{
+    __ atomic_xchg($prev$$Register, $newv$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_setN(indirect mem, iRegN newv, iRegINoSp prev)
+%{
+  match(Set prev (GetAndSetN mem newv));
+
+  ins_cost(ALU_COST);
+
+  format %{ "atomic_xchgwu $prev, $newv, [$mem]\t#@get_and_setN" %}
+
+  ins_encode %{
+    __ atomic_xchgwu($prev$$Register, $newv$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_setP(indirect mem, iRegP newv, iRegPNoSp prev)
+%{
+  predicate(n->as_LoadStore()->barrier_data() == 0);
+  match(Set prev (GetAndSetP mem newv));
+
+  ins_cost(ALU_COST);
+
+  format %{ "atomic_xchg  $prev, $newv, [$mem]\t#@get_and_setP" %}
+
+  ins_encode %{
+    __ atomic_xchg($prev$$Register, $newv$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_setIAcq(indirect mem, iRegI newv, iRegINoSp prev)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set prev (GetAndSetI mem newv));
+
+  ins_cost(ALU_COST);
+
+  format %{ "atomic_xchgw_acq  $prev, $newv, [$mem]\t#@get_and_setIAcq" %}
+
+  ins_encode %{
+    __ atomic_xchgalw($prev$$Register, $newv$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_setLAcq(indirect mem, iRegL newv, iRegLNoSp prev)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set prev (GetAndSetL mem newv));
+
+  ins_cost(ALU_COST);
+
+  format %{ "atomic_xchg_acq  $prev, $newv, [$mem]\t#@get_and_setLAcq" %}
+
+  ins_encode %{
+    __ atomic_xchgal($prev$$Register, $newv$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_setNAcq(indirect mem, iRegN newv, iRegINoSp prev)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set prev (GetAndSetN mem newv));
+
+  ins_cost(ALU_COST);
+
+  format %{ "atomic_xchgwu_acq $prev, $newv, [$mem]\t#@get_and_setNAcq" %}
+
+  ins_encode %{
+    __ atomic_xchgalwu($prev$$Register, $newv$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_setPAcq(indirect mem, iRegP newv, iRegPNoSp prev)
+%{
+  predicate(needs_acquiring_load_reserved(n) && (n->as_LoadStore()->barrier_data() == 0));
+
+  match(Set prev (GetAndSetP mem newv));
+
+  ins_cost(ALU_COST);
+
+  format %{ "atomic_xchg_acq  $prev, $newv, [$mem]\t#@get_and_setPAcq" %}
+
+  ins_encode %{
+    __ atomic_xchgal($prev$$Register, $newv$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addL(indirect mem, iRegLNoSp newval, iRegL incr)
+%{
+  match(Set newval (GetAndAddL mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addL $newval, [$mem], $incr\t#@get_and_addL" %}
+
+  ins_encode %{
+    __ atomic_add($newval$$Register, $incr$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addL_no_res(indirect mem, Universe dummy, iRegL incr)
+%{
+  predicate(n->as_LoadStore()->result_not_used());
+
+  match(Set dummy (GetAndAddL mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addL [$mem], $incr\t#@get_and_addL_no_res" %}
+
+  ins_encode %{
+    __ atomic_add(noreg, $incr$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addLi(indirect mem, iRegLNoSp newval, immLAdd incr)
+%{
+  match(Set newval (GetAndAddL mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addL $newval, [$mem], $incr\t#@get_and_addLi" %}
+
+  ins_encode %{
+    __ atomic_add($newval$$Register, $incr$$constant, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addLi_no_res(indirect mem, Universe dummy, immLAdd incr)
+%{
+  predicate(n->as_LoadStore()->result_not_used());
+
+  match(Set dummy (GetAndAddL mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addL [$mem], $incr\t#@get_and_addLi_no_res" %}
+
+  ins_encode %{
+    __ atomic_add(noreg, $incr$$constant, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addI(indirect mem, iRegINoSp newval, iRegIorL2I incr)
+%{
+  match(Set newval (GetAndAddI mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addI $newval, [$mem], $incr\t#@get_and_addI" %}
+
+  ins_encode %{
+    __ atomic_addw($newval$$Register, $incr$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addI_no_res(indirect mem, Universe dummy, iRegIorL2I incr)
+%{
+  predicate(n->as_LoadStore()->result_not_used());
+
+  match(Set dummy (GetAndAddI mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addI [$mem], $incr\t#@get_and_addI_no_res" %}
+
+  ins_encode %{
+    __ atomic_addw(noreg, $incr$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addIi(indirect mem, iRegINoSp newval, immIAdd incr)
+%{
+  match(Set newval (GetAndAddI mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addI $newval, [$mem], $incr\t#@get_and_addIi" %}
+
+  ins_encode %{
+    __ atomic_addw($newval$$Register, $incr$$constant, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addIi_no_res(indirect mem, Universe dummy, immIAdd incr)
+%{
+  predicate(n->as_LoadStore()->result_not_used());
+
+  match(Set dummy (GetAndAddI mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addI [$mem], $incr\t#@get_and_addIi_no_res" %}
+
+  ins_encode %{
+    __ atomic_addw(noreg, $incr$$constant, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addLAcq(indirect mem, iRegLNoSp newval, iRegL incr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set newval (GetAndAddL mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addL_acq $newval, [$mem], $incr\t#@get_and_addLAcq" %}
+
+  ins_encode %{
+    __ atomic_addal($newval$$Register, $incr$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addL_no_resAcq(indirect mem, Universe dummy, iRegL incr) %{
+  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_reserved(n));
+
+  match(Set dummy (GetAndAddL mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addL_acq [$mem], $incr\t#@get_and_addL_no_resAcq" %}
+
+  ins_encode %{
+    __ atomic_addal(noreg, $incr$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addLiAcq(indirect mem, iRegLNoSp newval, immLAdd incr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set newval (GetAndAddL mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addL_acq $newval, [$mem], $incr\t#@get_and_addLiAcq" %}
+
+  ins_encode %{
+    __ atomic_addal($newval$$Register, $incr$$constant, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addLi_no_resAcq(indirect mem, Universe dummy, immLAdd incr)
+%{
+  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_reserved(n));
+
+  match(Set dummy (GetAndAddL mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addL_acq [$mem], $incr\t#@get_and_addLi_no_resAcq" %}
+
+  ins_encode %{
+    __ atomic_addal(noreg, $incr$$constant, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addIAcq(indirect mem, iRegINoSp newval, iRegIorL2I incr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set newval (GetAndAddI mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addI_acq $newval, [$mem], $incr\t#@get_and_addIAcq" %}
+
+  ins_encode %{
+    __ atomic_addalw($newval$$Register, $incr$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addI_no_resAcq(indirect mem, Universe dummy, iRegIorL2I incr)
+%{
+  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_reserved(n));
+
+  match(Set dummy (GetAndAddI mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addI_acq [$mem], $incr\t#@get_and_addI_no_resAcq" %}
+
+  ins_encode %{
+    __ atomic_addalw(noreg, $incr$$Register, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addIiAcq(indirect mem, iRegINoSp newval, immIAdd incr)
+%{
+  predicate(needs_acquiring_load_reserved(n));
+
+  match(Set newval (GetAndAddI mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addI_acq $newval, [$mem], $incr\t#@get_and_addIiAcq" %}
+
+  ins_encode %{
+    __ atomic_addalw($newval$$Register, $incr$$constant, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct get_and_addIi_no_resAcq(indirect mem, Universe dummy, immIAdd incr)
+%{
+  predicate(n->as_LoadStore()->result_not_used() && needs_acquiring_load_reserved(n));
+
+  match(Set dummy (GetAndAddI mem incr));
+
+  ins_cost(ALU_COST);
+
+  format %{ "get_and_addI_acq [$mem], $incr\t#@get_and_addIi_no_resAcq" %}
+
+  ins_encode %{
+    __ atomic_addalw(noreg, $incr$$constant, as_Register($mem$$base));
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+// ============================================================================
+// Arithmetic Instructions
+//
+
+// Integer Addition
+
+// TODO
+// these currently employ operations which do not set CR and hence are
+// not flagged as killing CR but we would like to isolate the cases
+// where we want to set flags from those where we don't. need to work
+// out how to do that.
+instruct addI_reg_reg(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
+  match(Set dst (AddI src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "addw  $dst, $src1, $src2\t#@addI_reg_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ addw(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct addI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immIAdd src2) %{
+  match(Set dst (AddI src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "addiw  $dst, $src1, $src2\t#@addI_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    int32_t con = (int32_t)$src2$$constant;
+    __ addiw(as_Register($dst$$reg),
+             as_Register($src1$$reg),
+             $src2$$constant);
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+instruct addI_reg_imm_l2i(iRegINoSp dst, iRegL src1, immIAdd src2) %{
+  match(Set dst (AddI (ConvL2I src1) src2));
+
+  ins_cost(ALU_COST);
+  format %{ "addiw  $dst, $src1, $src2\t#@addI_reg_imm_l2i" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ addiw(as_Register($dst$$reg),
+             as_Register($src1$$reg),
+             $src2$$constant);
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Pointer Addition
+instruct addP_reg_reg(iRegPNoSp dst, iRegP src1, iRegL src2) %{
+  match(Set dst (AddP src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "add $dst, $src1, $src2\t# ptr, #@addP_reg_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ add(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// If we shift more than 32 bits, we need not convert I2L.
+instruct lShiftL_regI_immGE32(iRegLNoSp dst, iRegI src, uimmI6_ge32 scale) %{
+  match(Set dst (LShiftL (ConvI2L src) scale));
+  ins_cost(ALU_COST);
+  format %{ "slli  $dst, $src, $scale & 63\t#@lShiftL_regI_immGE32" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ slli(as_Register($dst$$reg), as_Register($src$$reg), $scale$$constant & 63);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// Pointer Immediate Addition
+// n.b. this needs to be more expensive than using an indirect memory
+// operand
+instruct addP_reg_imm(iRegPNoSp dst, iRegP src1, immLAdd src2) %{
+  match(Set dst (AddP src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "addi  $dst, $src1, $src2\t# ptr, #@addP_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    // src2 is imm, so actually call the addi
+    __ add(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           $src2$$constant);
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Long Addition
+instruct addL_reg_reg(iRegLNoSp dst, iRegL src1, iRegL src2) %{
+  match(Set dst (AddL src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "add  $dst, $src1, $src2\t#@addL_reg_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ add(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// No constant pool entries requiredLong Immediate Addition.
+instruct addL_reg_imm(iRegLNoSp dst, iRegL src1, immLAdd src2) %{
+  match(Set dst (AddL src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "addi  $dst, $src1, $src2\t#@addL_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    // src2 is imm, so actually call the addi
+    __ add(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           $src2$$constant);
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Integer Subtraction
+instruct subI_reg_reg(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
+  match(Set dst (SubI src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "subw  $dst, $src1, $src2\t#@subI_reg_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ subw(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Immediate Subtraction
+instruct subI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immISub src2) %{
+  match(Set dst (SubI src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "addiw  $dst, $src1, -$src2\t#@subI_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    // src2 is imm, so actually call the addiw
+    __ subw(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            $src2$$constant);
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Long Subtraction
+instruct subL_reg_reg(iRegLNoSp dst, iRegL src1, iRegL src2) %{
+  match(Set dst (SubL src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "sub  $dst, $src1, $src2\t#@subL_reg_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ sub(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// No constant pool entries requiredLong Immediate Subtraction.
+instruct subL_reg_imm(iRegLNoSp dst, iRegL src1, immLSub src2) %{
+  match(Set dst (SubL src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "addi  $dst, $src1, -$src2\t#@subL_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    // src2 is imm, so actually call the addi
+    __ sub(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           $src2$$constant);
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Integer Negation (special case for sub)
+
+instruct negI_reg(iRegINoSp dst, iRegIorL2I src, immI0 zero) %{
+  match(Set dst (SubI zero src));
+  ins_cost(ALU_COST);
+  format %{ "subw  $dst, x0, $src\t# int, #@negI_reg" %}
+
+  ins_encode %{
+    // actually call the subw
+    __ negw(as_Register($dst$$reg),
+            as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// Long Negation
+
+instruct negL_reg(iRegLNoSp dst, iRegL src, immL0 zero) %{
+  match(Set dst (SubL zero src));
+  ins_cost(ALU_COST);
+  format %{ "sub  $dst, x0, $src\t# long, #@negL_reg" %}
+
+  ins_encode %{
+    // actually call the sub
+    __ neg(as_Register($dst$$reg),
+           as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// Integer Multiply
+
+instruct mulI(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
+  match(Set dst (MulI src1 src2));
+  ins_cost(IMUL_COST);
+  format %{ "mulw  $dst, $src1, $src2\t#@mulI" %}
+
+  //this means 2 word multi, and no sign extend to 64 bits
+  ins_encode %{
+    // riscv64 mulw will sign-extension to high 32 bits in dst reg
+    __ mulw(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(imul_reg_reg);
+%}
+
+// Long Multiply
+
+instruct mulL(iRegLNoSp dst, iRegL src1, iRegL src2) %{
+  match(Set dst (MulL src1 src2));
+  ins_cost(IMUL_COST);
+  format %{ "mul  $dst, $src1, $src2\t#@mulL" %}
+
+  ins_encode %{
+    __ mul(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(lmul_reg_reg);
+%}
+
+instruct mulHiL_rReg(iRegLNoSp dst, iRegL src1, iRegL src2)
+%{
+  match(Set dst (MulHiL src1 src2));
+  ins_cost(IMUL_COST);
+  format %{ "mulh  $dst, $src1, $src2\t# mulhi, #@mulHiL_rReg" %}
+
+  ins_encode %{
+    __ mulh(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(lmul_reg_reg);
+%}
+
+// Integer Divide
+
+instruct divI(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
+  match(Set dst (DivI src1 src2));
+  ins_cost(IDIVSI_COST);
+  format %{ "divw  $dst, $src1, $src2\t#@divI"%}
+
+  ins_encode(riscv_enc_divw(dst, src1, src2));
+  ins_pipe(idiv_reg_reg);
+%}
+
+instruct signExtract(iRegINoSp dst, iRegIorL2I src1, immI_31 div1, immI_31 div2) %{
+  match(Set dst (URShiftI (RShiftI src1 div1) div2));
+  ins_cost(ALU_COST);
+  format %{ "srliw $dst, $src1, $div1\t# int signExtract, #@signExtract" %}
+
+  ins_encode %{
+    __ srliw(as_Register($dst$$reg), as_Register($src1$$reg), 31);
+  %}
+  ins_pipe(ialu_reg_shift);
+%}
+
+// Long Divide
+
+instruct divL(iRegLNoSp dst, iRegL src1, iRegL src2) %{
+  match(Set dst (DivL src1 src2));
+  ins_cost(IDIVDI_COST);
+  format %{ "div  $dst, $src1, $src2\t#@divL" %}
+
+  ins_encode(riscv_enc_div(dst, src1, src2));
+  ins_pipe(ldiv_reg_reg);
+%}
+
+instruct signExtractL(iRegLNoSp dst, iRegL src1, immI_63 div1, immI_63 div2) %{
+  match(Set dst (URShiftL (RShiftL src1 div1) div2));
+  ins_cost(ALU_COST);
+  format %{ "srli $dst, $src1, $div1\t# long signExtract, #@signExtractL" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ srli(as_Register($dst$$reg), as_Register($src1$$reg), 63);
+  %}
+  ins_pipe(ialu_reg_shift);
+%}
+
+// Integer Remainder
+
+instruct modI(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
+  match(Set dst (ModI src1 src2));
+  ins_cost(IDIVSI_COST);
+  format %{ "remw  $dst, $src1, $src2\t#@modI" %}
+
+  ins_encode(riscv_enc_modw(dst, src1, src2));
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Long Remainder
+
+instruct modL(iRegLNoSp dst, iRegL src1, iRegL src2) %{
+  match(Set dst (ModL src1 src2));
+  ins_cost(IDIVDI_COST);
+  format %{ "rem  $dst, $src1, $src2\t#@modL" %}
+
+  ins_encode(riscv_enc_mod(dst, src1, src2));
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Integer Shifts
+
+// Shift Left Register
+// In RV64I, only the low 5 bits of src2 are considered for the shift amount
+instruct lShiftI_reg_reg(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
+  match(Set dst (LShiftI src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "sllw  $dst, $src1, $src2\t#@lShiftI_reg_reg" %}
+
+  ins_encode %{
+    __ sllw(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg_vshift);
+%}
+
+// Shift Left Immediate
+instruct lShiftI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immI src2) %{
+  match(Set dst (LShiftI src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "slliw  $dst, $src1, ($src2 & 0x1f)\t#@lShiftI_reg_imm" %}
+
+  ins_encode %{
+    // the shift amount is encoded in the lower
+    // 5 bits of the I-immediate field for RV32I
+    __ slliw(as_Register($dst$$reg),
+             as_Register($src1$$reg),
+             (unsigned) $src2$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// Shift Right Logical Register
+// In RV64I, only the low 5 bits of src2 are considered for the shift amount
+instruct urShiftI_reg_reg(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
+  match(Set dst (URShiftI src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "srlw  $dst, $src1, $src2\t#@urShiftI_reg_reg" %}
+
+  ins_encode %{
+    __ srlw(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg_vshift);
+%}
+
+// Shift Right Logical Immediate
+instruct urShiftI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immI src2) %{
+  match(Set dst (URShiftI src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "srliw  $dst, $src1, ($src2 & 0x1f)\t#@urShiftI_reg_imm" %}
+
+  ins_encode %{
+    // the shift amount is encoded in the lower
+    // 6 bits of the I-immediate field for RV64I
+    __ srliw(as_Register($dst$$reg),
+             as_Register($src1$$reg),
+             (unsigned) $src2$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// Shift Right Arithmetic Register
+// In RV64I, only the low 5 bits of src2 are considered for the shift amount
+instruct rShiftI_reg_reg(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
+  match(Set dst (RShiftI src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "sraw  $dst, $src1, $src2\t#@rShiftI_reg_reg" %}
+
+  ins_encode %{
+    // riscv will sign-ext dst high 32 bits
+    __ sraw(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg_vshift);
+%}
+
+// Shift Right Arithmetic Immediate
+instruct rShiftI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immI src2) %{
+  match(Set dst (RShiftI src1 src2));
+  ins_cost(ALU_COST);
+  format %{ "sraiw  $dst, $src1, ($src2 & 0x1f)\t#@rShiftI_reg_imm" %}
+
+  ins_encode %{
+    // riscv will sign-ext dst high 32 bits
+    __ sraiw(as_Register($dst$$reg),
+             as_Register($src1$$reg),
+             (unsigned) $src2$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// Long Shifts
+
+// Shift Left Register
+// In RV64I, only the low 6 bits of src2 are considered for the shift amount
+instruct lShiftL_reg_reg(iRegLNoSp dst, iRegL src1, iRegIorL2I src2) %{
+  match(Set dst (LShiftL src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "sll  $dst, $src1, $src2\t#@lShiftL_reg_reg" %}
+
+  ins_encode %{
+    __ sll(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg_vshift);
+%}
+
+// Shift Left Immediate
+instruct lShiftL_reg_imm(iRegLNoSp dst, iRegL src1, immI src2) %{
+  match(Set dst (LShiftL src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "slli  $dst, $src1, ($src2 & 0x3f)\t#@lShiftL_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    // the shift amount is encoded in the lower
+    // 6 bits of the I-immediate field for RV64I
+    __ slli(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            (unsigned) $src2$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// Shift Right Logical Register
+// In RV64I, only the low 6 bits of src2 are considered for the shift amount
+instruct urShiftL_reg_reg(iRegLNoSp dst, iRegL src1, iRegIorL2I src2) %{
+  match(Set dst (URShiftL src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "srl  $dst, $src1, $src2\t#@urShiftL_reg_reg" %}
+
+  ins_encode %{
+    __ srl(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg_vshift);
+%}
+
+// Shift Right Logical Immediate
+instruct urShiftL_reg_imm(iRegLNoSp dst, iRegL src1, immI src2) %{
+  match(Set dst (URShiftL src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "srli  $dst, $src1, ($src2 & 0x3f)\t#@urShiftL_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    // the shift amount is encoded in the lower
+    // 6 bits of the I-immediate field for RV64I
+    __ srli(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            (unsigned) $src2$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// A special-case pattern for card table stores.
+instruct urShiftP_reg_imm(iRegLNoSp dst, iRegP src1, immI src2) %{
+  match(Set dst (URShiftL (CastP2X src1) src2));
+
+  ins_cost(ALU_COST);
+  format %{ "srli  $dst, p2x($src1), ($src2 & 0x3f)\t#@urShiftP_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    // the shift amount is encoded in the lower
+    // 6 bits of the I-immediate field for RV64I
+    __ srli(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            (unsigned) $src2$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// Shift Right Arithmetic Register
+// In RV64I, only the low 6 bits of src2 are considered for the shift amount
+instruct rShiftL_reg_reg(iRegLNoSp dst, iRegL src1, iRegIorL2I src2) %{
+  match(Set dst (RShiftL src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "sra  $dst, $src1, $src2\t#@rShiftL_reg_reg" %}
+
+  ins_encode %{
+    __ sra(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg_vshift);
+%}
+
+// Shift Right Arithmetic Immediate
+instruct rShiftL_reg_imm(iRegLNoSp dst, iRegL src1, immI src2) %{
+  match(Set dst (RShiftL src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "srai  $dst, $src1, ($src2 & 0x3f)\t#@rShiftL_reg_imm" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    // the shift amount is encoded in the lower
+    // 6 bits of the I-immediate field for RV64I
+    __ srai(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            (unsigned) $src2$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+instruct regI_not_reg(iRegINoSp dst, iRegI src1, immI_M1 m1) %{
+  match(Set dst (XorI src1 m1));
+  ins_cost(ALU_COST);
+  format %{ "xori  $dst, $src1, -1\t#@regI_not_reg" %}
+
+  ins_encode %{
+    __ xori(as_Register($dst$$reg), as_Register($src1$$reg), -1);
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct regL_not_reg(iRegLNoSp dst, iRegL src1, immL_M1 m1) %{
+  match(Set dst (XorL src1 m1));
+  ins_cost(ALU_COST);
+  format %{ "xori  $dst, $src1, -1\t#@regL_not_reg" %}
+
+  ins_encode %{
+    __ xori(as_Register($dst$$reg), as_Register($src1$$reg), -1);
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+
+// ============================================================================
+// Floating Point Arithmetic Instructions
+
+instruct addF_reg_reg(fRegF dst, fRegF src1, fRegF src2) %{
+  match(Set dst (AddF src1 src2));
+
+  ins_cost(FMUL_SINGLE_COST);
+  format %{ "fadd.s  $dst, $src1, $src2\t#@addF_reg_reg" %}
+
+  ins_encode %{
+    __ fadd_s(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src1$$reg),
+              as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
+instruct addD_reg_reg(fRegD dst, fRegD src1, fRegD src2) %{
+  match(Set dst (AddD src1 src2));
+
+  ins_cost(FMUL_DOUBLE_COST);
+  format %{ "fadd.d  $dst, $src1, $src2\t#@addD_reg_reg" %}
+
+  ins_encode %{
+    __ fadd_d(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src1$$reg),
+              as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(fp_dop_reg_reg_d);
+%}
+
+instruct subF_reg_reg(fRegF dst, fRegF src1, fRegF src2) %{
+  match(Set dst (SubF src1 src2));
+
+  ins_cost(FMUL_SINGLE_COST);
+  format %{ "fsub.s  $dst, $src1, $src2\t#@subF_reg_reg" %}
+
+  ins_encode %{
+    __ fsub_s(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src1$$reg),
+              as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
+instruct subD_reg_reg(fRegD dst, fRegD src1, fRegD src2) %{
+  match(Set dst (SubD src1 src2));
+
+  ins_cost(FMUL_DOUBLE_COST);
+  format %{ "fsub.d  $dst, $src1, $src2\t#@subD_reg_reg" %}
+
+  ins_encode %{
+    __ fsub_d(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src1$$reg),
+              as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(fp_dop_reg_reg_d);
+%}
+
+instruct mulF_reg_reg(fRegF dst, fRegF src1, fRegF src2) %{
+  match(Set dst (MulF src1 src2));
+
+  ins_cost(FMUL_SINGLE_COST);
+  format %{ "fmul.s  $dst, $src1, $src2\t#@mulF_reg_reg" %}
+
+  ins_encode %{
+    __ fmul_s(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src1$$reg),
+              as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
+instruct mulD_reg_reg(fRegD dst, fRegD src1, fRegD src2) %{
+  match(Set dst (MulD src1 src2));
+
+  ins_cost(FMUL_DOUBLE_COST);
+  format %{ "fmul.d  $dst, $src1, $src2\t#@mulD_reg_reg" %}
+
+  ins_encode %{
+    __ fmul_d(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src1$$reg),
+              as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(fp_dop_reg_reg_d);
+%}
+
+// src1 * src2 + src3
+instruct maddF_reg_reg(fRegF dst, fRegF src1, fRegF src2, fRegF src3) %{
+  predicate(UseFMA);
+  match(Set dst (FmaF src3 (Binary src1 src2)));
+
+  ins_cost(FMUL_SINGLE_COST);
+  format %{ "fmadd.s  $dst, $src1, $src2, $src3\t#@maddF_reg_reg" %}
+
+  ins_encode %{
+    __ fmadd_s(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg),
+               as_FloatRegister($src2$$reg),
+               as_FloatRegister($src3$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+// src1 * src2 + src3
+instruct maddD_reg_reg(fRegD dst, fRegD src1, fRegD src2, fRegD src3) %{
+  predicate(UseFMA);
+  match(Set dst (FmaD src3 (Binary src1 src2)));
+
+  ins_cost(FMUL_DOUBLE_COST);
+  format %{ "fmadd.d  $dst, $src1, $src2, $src3\t#@maddD_reg_reg" %}
+
+  ins_encode %{
+    __ fmadd_d(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg),
+               as_FloatRegister($src2$$reg),
+               as_FloatRegister($src3$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+// src1 * src2 - src3
+instruct msubF_reg_reg(fRegF dst, fRegF src1, fRegF src2, fRegF src3) %{
+  predicate(UseFMA);
+  match(Set dst (FmaF (NegF src3) (Binary src1 src2)));
+
+  ins_cost(FMUL_SINGLE_COST);
+  format %{ "fmsub.s  $dst, $src1, $src2, $src3\t#@msubF_reg_reg" %}
+
+  ins_encode %{
+    __ fmsub_s(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg),
+               as_FloatRegister($src2$$reg),
+               as_FloatRegister($src3$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+// src1 * src2 - src3
+instruct msubD_reg_reg(fRegD dst, fRegD src1, fRegD src2, fRegD src3) %{
+  predicate(UseFMA);
+  match(Set dst (FmaD (NegD src3) (Binary src1 src2)));
+
+  ins_cost(FMUL_DOUBLE_COST);
+  format %{ "fmsub.d  $dst, $src1, $src2, $src3\t#@msubD_reg_reg" %}
+
+  ins_encode %{
+    __ fmsub_d(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg),
+               as_FloatRegister($src2$$reg),
+               as_FloatRegister($src3$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+// -src1 * src2 + src3
+instruct nmsubF_reg_reg(fRegF dst, fRegF src1, fRegF src2, fRegF src3) %{
+  predicate(UseFMA);
+  match(Set dst (FmaF src3 (Binary (NegF src1) src2)));
+  match(Set dst (FmaF src3 (Binary src1 (NegF src2))));
+
+  ins_cost(FMUL_SINGLE_COST);
+  format %{ "fnmsub.s  $dst, $src1, $src2, $src3\t#@nmsubF_reg_reg" %}
+
+  ins_encode %{
+    __ fnmsub_s(as_FloatRegister($dst$$reg),
+                as_FloatRegister($src1$$reg),
+                as_FloatRegister($src2$$reg),
+                as_FloatRegister($src3$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+// -src1 * src2 + src3
+instruct nmsubD_reg_reg(fRegD dst, fRegD src1, fRegD src2, fRegD src3) %{
+  predicate(UseFMA);
+  match(Set dst (FmaD src3 (Binary (NegD src1) src2)));
+  match(Set dst (FmaD src3 (Binary src1 (NegD src2))));
+
+  ins_cost(FMUL_DOUBLE_COST);
+  format %{ "fnmsub.d  $dst, $src1, $src2, $src3\t#@nmsubD_reg_reg" %}
+
+  ins_encode %{
+    __ fnmsub_d(as_FloatRegister($dst$$reg),
+                as_FloatRegister($src1$$reg),
+                as_FloatRegister($src2$$reg),
+                as_FloatRegister($src3$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+// -src1 * src2 - src3
+instruct nmaddF_reg_reg(fRegF dst, fRegF src1, fRegF src2, fRegF src3) %{
+  predicate(UseFMA);
+  match(Set dst (FmaF (NegF src3) (Binary (NegF src1) src2)));
+  match(Set dst (FmaF (NegF src3) (Binary src1 (NegF src2))));
+
+  ins_cost(FMUL_SINGLE_COST);
+  format %{ "fnmadd.s  $dst, $src1, $src2, $src3\t#@nmaddF_reg_reg" %}
+
+  ins_encode %{
+    __ fnmadd_s(as_FloatRegister($dst$$reg),
+                as_FloatRegister($src1$$reg),
+                as_FloatRegister($src2$$reg),
+                as_FloatRegister($src3$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+// -src1 * src2 - src3
+instruct nmaddD_reg_reg(fRegD dst, fRegD src1, fRegD src2, fRegD src3) %{
+  predicate(UseFMA);
+  match(Set dst (FmaD (NegD src3) (Binary (NegD src1) src2)));
+  match(Set dst (FmaD (NegD src3) (Binary src1 (NegD src2))));
+
+  ins_cost(FMUL_DOUBLE_COST);
+  format %{ "fnmadd.d  $dst, $src1, $src2, $src3\t#@nmaddD_reg_reg" %}
+
+  ins_encode %{
+    __ fnmadd_d(as_FloatRegister($dst$$reg),
+                as_FloatRegister($src1$$reg),
+                as_FloatRegister($src2$$reg),
+                as_FloatRegister($src3$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+// Math.max(FF)F
+instruct maxF_reg_reg(fRegF dst, fRegF src1, fRegF src2) %{
+  match(Set dst (MaxF src1 src2));
+  effect(TEMP_DEF dst);
+
+  format %{ "maxF $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ minmax_FD(as_FloatRegister($dst$$reg),
+                 as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
+                 false /* is_double */, false /* is_min */);
+  %}
+
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
+// Math.min(FF)F
+instruct minF_reg_reg(fRegF dst, fRegF src1, fRegF src2) %{
+  match(Set dst (MinF src1 src2));
+  effect(TEMP_DEF dst);
+
+  format %{ "minF $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ minmax_FD(as_FloatRegister($dst$$reg),
+                 as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
+                 false /* is_double */, true /* is_min */);
+  %}
+
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
+// Math.max(DD)D
+instruct maxD_reg_reg(fRegD dst, fRegD src1, fRegD src2) %{
+  match(Set dst (MaxD src1 src2));
+  effect(TEMP_DEF dst);
+
+  format %{ "maxD $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ minmax_FD(as_FloatRegister($dst$$reg),
+                 as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
+                 true /* is_double */, false /* is_min */);
+  %}
+
+  ins_pipe(fp_dop_reg_reg_d);
+%}
+
+// Math.min(DD)D
+instruct minD_reg_reg(fRegD dst, fRegD src1, fRegD src2) %{
+  match(Set dst (MinD src1 src2));
+  effect(TEMP_DEF dst);
+
+  format %{ "minD $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ minmax_FD(as_FloatRegister($dst$$reg),
+                 as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
+                 true /* is_double */, true /* is_min */);
+  %}
+
+  ins_pipe(fp_dop_reg_reg_d);
+%}
+
+instruct divF_reg_reg(fRegF dst, fRegF src1, fRegF src2) %{
+  match(Set dst (DivF src1  src2));
+
+  ins_cost(FDIV_COST);
+  format %{ "fdiv.s  $dst, $src1, $src2\t#@divF_reg_reg" %}
+
+  ins_encode %{
+    __ fdiv_s(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src1$$reg),
+              as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(fp_div_s);
+%}
+
+instruct divD_reg_reg(fRegD dst, fRegD src1, fRegD src2) %{
+  match(Set dst (DivD src1  src2));
+
+  ins_cost(FDIV_COST);
+  format %{ "fdiv.d  $dst, $src1, $src2\t#@divD_reg_reg" %}
+
+  ins_encode %{
+    __ fdiv_d(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src1$$reg),
+              as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(fp_div_d);
+%}
+
+instruct negF_reg_reg(fRegF dst, fRegF src) %{
+  match(Set dst (NegF src));
+
+  ins_cost(XFER_COST);
+  format %{ "fsgnjn.s  $dst, $src, $src\t#@negF_reg_reg" %}
+
+  ins_encode %{
+    __ fneg_s(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_uop_s);
+%}
+
+instruct negD_reg_reg(fRegD dst, fRegD src) %{
+  match(Set dst (NegD src));
+
+  ins_cost(XFER_COST);
+  format %{ "fsgnjn.d  $dst, $src, $src\t#@negD_reg_reg" %}
+
+  ins_encode %{
+    __ fneg_d(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_uop_d);
+%}
+
+instruct absI_reg(iRegINoSp dst, iRegIorL2I src) %{
+  match(Set dst (AbsI src));
+
+  ins_cost(ALU_COST * 3);
+  format %{
+    "sraiw  t0, $src, 0x1f\n\t"
+    "addw  $dst, $src, t0\n\t"
+    "xorr  $dst, $dst, t0\t#@absI_reg"
+  %}
+
+  ins_encode %{
+    __ sraiw(t0, as_Register($src$$reg), 0x1f);
+    __ addw(as_Register($dst$$reg), as_Register($src$$reg), t0);
+    __ xorr(as_Register($dst$$reg), as_Register($dst$$reg), t0);
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct absL_reg(iRegLNoSp dst, iRegL src) %{
+  match(Set dst (AbsL src));
+
+  ins_cost(ALU_COST * 3);
+  format %{
+    "srai  t0, $src, 0x3f\n\t"
+    "add  $dst, $src, t0\n\t"
+    "xorr  $dst, $dst, t0\t#@absL_reg"
+  %}
+
+  ins_encode %{
+    __ srai(t0, as_Register($src$$reg), 0x3f);
+    __ add(as_Register($dst$$reg), as_Register($src$$reg), t0);
+    __ xorr(as_Register($dst$$reg), as_Register($dst$$reg), t0);
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct absF_reg(fRegF dst, fRegF src) %{
+  match(Set dst (AbsF src));
+
+  ins_cost(XFER_COST);
+  format %{ "fsgnjx.s  $dst, $src, $src\t#@absF_reg" %}
+  ins_encode %{
+    __ fabs_s(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_uop_s);
+%}
+
+instruct absD_reg(fRegD dst, fRegD src) %{
+  match(Set dst (AbsD src));
+
+  ins_cost(XFER_COST);
+  format %{ "fsgnjx.d  $dst, $src, $src\t#@absD_reg" %}
+  ins_encode %{
+    __ fabs_d(as_FloatRegister($dst$$reg),
+              as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_uop_d);
+%}
+
+instruct sqrtF_reg(fRegF dst, fRegF src) %{
+  match(Set dst (ConvD2F (SqrtD (ConvF2D src))));
+
+  ins_cost(FSQRT_COST);
+  format %{ "fsqrt.s  $dst, $src\t#@sqrtF_reg" %}
+  ins_encode %{
+    __ fsqrt_s(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_sqrt_s);
+%}
+
+instruct sqrtD_reg(fRegD dst, fRegD src) %{
+  match(Set dst (SqrtD src));
+
+  ins_cost(FSQRT_COST);
+  format %{ "fsqrt.d  $dst, $src\t#@sqrtD_reg" %}
+  ins_encode %{
+    __ fsqrt_d(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_sqrt_d);
+%}
+
+// Arithmetic Instructions End
+
+// ============================================================================
+// Logical Instructions
+
+// Register And
+instruct andI_reg_reg(iRegINoSp dst, iRegI src1, iRegI src2) %{
+  match(Set dst (AndI src1 src2));
+
+  format %{ "andr  $dst, $src1, $src2\t#@andI_reg_reg" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ andr(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Immediate And
+instruct andI_reg_imm(iRegINoSp dst, iRegI src1, immIAdd src2) %{
+  match(Set dst (AndI src1 src2));
+
+  format %{ "andi  $dst, $src1, $src2\t#@andI_reg_imm" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ andi(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            (int32_t)($src2$$constant));
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Register Or
+instruct orI_reg_reg(iRegINoSp dst, iRegI src1, iRegI src2) %{
+  match(Set dst (OrI src1 src2));
+
+  format %{ "orr  $dst, $src1, $src2\t#@orI_reg_reg" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ orr(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Immediate Or
+instruct orI_reg_imm(iRegINoSp dst, iRegI src1, immIAdd src2) %{
+  match(Set dst (OrI src1 src2));
+
+  format %{ "ori  $dst, $src1, $src2\t#@orI_reg_imm" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ ori(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           (int32_t)($src2$$constant));
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Register Xor
+instruct xorI_reg_reg(iRegINoSp dst, iRegI src1, iRegI src2) %{
+  match(Set dst (XorI src1 src2));
+
+  format %{ "xorr  $dst, $src1, $src2\t#@xorI_reg_reg" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ xorr(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Immediate Xor
+instruct xorI_reg_imm(iRegINoSp dst, iRegI src1, immIAdd src2) %{
+  match(Set dst (XorI src1 src2));
+
+  format %{ "xori  $dst, $src1, $src2\t#@xorI_reg_imm" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ xori(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            (int32_t)($src2$$constant));
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Register And Long
+instruct andL_reg_reg(iRegLNoSp dst, iRegL src1, iRegL src2) %{
+  match(Set dst (AndL src1 src2));
+
+  format %{ "andr  $dst, $src1, $src2\t#@andL_reg_reg" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ andr(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Immediate And Long
+instruct andL_reg_imm(iRegLNoSp dst, iRegL src1, immLAdd src2) %{
+  match(Set dst (AndL src1 src2));
+
+  format %{ "andi  $dst, $src1, $src2\t#@andL_reg_imm" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ andi(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            (int32_t)($src2$$constant));
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Register Or Long
+instruct orL_reg_reg(iRegLNoSp dst, iRegL src1, iRegL src2) %{
+  match(Set dst (OrL src1 src2));
+
+  format %{ "orr  $dst, $src1, $src2\t#@orL_reg_reg" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ orr(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Immediate Or Long
+instruct orL_reg_imm(iRegLNoSp dst, iRegL src1, immLAdd src2) %{
+  match(Set dst (OrL src1 src2));
+
+  format %{ "ori  $dst, $src1, $src2\t#@orL_reg_imm" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ ori(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           (int32_t)($src2$$constant));
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// Register Xor Long
+instruct xorL_reg_reg(iRegLNoSp dst, iRegL src1, iRegL src2) %{
+  match(Set dst (XorL src1 src2));
+
+  format %{ "xorr  $dst, $src1, $src2\t#@xorL_reg_reg" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ xorr(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Immediate Xor Long
+instruct xorL_reg_imm(iRegLNoSp dst, iRegL src1, immLAdd src2) %{
+  match(Set dst (XorL src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "xori  $dst, $src1, $src2\t#@xorL_reg_imm" %}
+
+  ins_encode %{
+    __ xori(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            (int32_t)($src2$$constant));
+  %}
+
+  ins_pipe(ialu_reg_imm);
+%}
+
+// ============================================================================
+// BSWAP Instructions
+
+instruct bytes_reverse_int(iRegINoSp dst, iRegIorL2I src, rFlagsReg cr) %{
+  match(Set dst (ReverseBytesI src));
+  effect(TEMP cr);
+
+  ins_cost(ALU_COST * 13);
+  format %{ "revb_w_w  $dst, $src\t#@bytes_reverse_int" %}
+
+  ins_encode %{
+    __ revb_w_w(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct bytes_reverse_long(iRegLNoSp dst, iRegL src, rFlagsReg cr) %{
+  match(Set dst (ReverseBytesL src));
+  effect(TEMP cr);
+
+  ins_cost(ALU_COST * 29);
+  format %{ "revb  $dst, $src\t#@bytes_reverse_long" %}
+
+  ins_encode %{
+    __ revb(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct bytes_reverse_unsigned_short(iRegINoSp dst, iRegIorL2I src) %{
+  match(Set dst (ReverseBytesUS src));
+
+  ins_cost(ALU_COST * 5);
+  format %{ "revb_h_h_u  $dst, $src\t#@bytes_reverse_unsigned_short" %}
+
+  ins_encode %{
+    __ revb_h_h_u(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct bytes_reverse_short(iRegINoSp dst, iRegIorL2I src) %{
+  match(Set dst (ReverseBytesS src));
+
+  ins_cost(ALU_COST * 5);
+  format %{ "revb_h_h  $dst, $src\t#@bytes_reverse_short" %}
+
+  ins_encode %{
+    __ revb_h_h(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// ============================================================================
+// MemBar Instruction
+
+instruct load_fence() %{
+  match(LoadFence);
+  ins_cost(ALU_COST);
+
+  format %{ "#@load_fence" %}
+
+  ins_encode %{
+    __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct membar_acquire() %{
+  match(MemBarAcquire);
+  ins_cost(ALU_COST);
+
+  format %{ "#@membar_acquire\n\t"
+            "fence ir iorw" %}
+
+  ins_encode %{
+    __ block_comment("membar_acquire");
+    __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct membar_acquire_lock() %{
+  match(MemBarAcquireLock);
+  ins_cost(0);
+
+  format %{ "#@membar_acquire_lock (elided)" %}
+
+  ins_encode %{
+    __ block_comment("membar_acquire_lock (elided)");
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct store_fence() %{
+  match(StoreFence);
+  ins_cost(ALU_COST);
+
+  format %{ "#@store_fence" %}
+
+  ins_encode %{
+    __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct membar_release() %{
+  match(MemBarRelease);
+  ins_cost(ALU_COST);
+
+  format %{ "#@membar_release\n\t"
+            "fence iorw ow" %}
+
+  ins_encode %{
+    __ block_comment("membar_release");
+    __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct membar_storestore() %{
+  match(MemBarStoreStore);
+  match(StoreStoreFence);
+  ins_cost(ALU_COST);
+
+  format %{ "MEMBAR-store-store\t#@membar_storestore" %}
+
+  ins_encode %{
+    __ membar(MacroAssembler::StoreStore);
+  %}
+  ins_pipe(pipe_serial);
+%}
+
+instruct membar_release_lock() %{
+  match(MemBarReleaseLock);
+  ins_cost(0);
+
+  format %{ "#@membar_release_lock (elided)" %}
+
+  ins_encode %{
+    __ block_comment("membar_release_lock (elided)");
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+instruct membar_volatile() %{
+  match(MemBarVolatile);
+  ins_cost(ALU_COST);
+
+  format %{ "#@membar_volatile\n\t"
+             "fence iorw iorw"%}
+
+  ins_encode %{
+    __ block_comment("membar_volatile");
+    __ membar(MacroAssembler::StoreLoad);
+  %}
+
+  ins_pipe(pipe_serial);
+%}
+
+// ============================================================================
+// Cast Instructions (Java-level type cast)
+
+instruct castX2P(iRegPNoSp dst, iRegL src) %{
+  match(Set dst (CastX2P src));
+
+  ins_cost(ALU_COST);
+  format %{ "mv  $dst, $src\t# long -> ptr, #@castX2P" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    if ($dst$$reg != $src$$reg) {
+      __ mv(as_Register($dst$$reg), as_Register($src$$reg));
+    }
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct castP2X(iRegLNoSp dst, iRegP src) %{
+  match(Set dst (CastP2X src));
+
+  ins_cost(ALU_COST);
+  format %{ "mv  $dst, $src\t# ptr -> long, #@castP2X" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    if ($dst$$reg != $src$$reg) {
+      __ mv(as_Register($dst$$reg), as_Register($src$$reg));
+    }
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct castPP(iRegPNoSp dst)
+%{
+  match(Set dst (CastPP dst));
+  ins_cost(0);
+
+  size(0);
+  format %{ "# castPP of $dst, #@castPP" %}
+  ins_encode(/* empty encoding */);
+  ins_pipe(pipe_class_empty);
+%}
+
+instruct castLL(iRegL dst)
+%{
+  match(Set dst (CastLL dst));
+
+  size(0);
+  format %{ "# castLL of $dst, #@castLL" %}
+  ins_encode(/* empty encoding */);
+  ins_cost(0);
+  ins_pipe(pipe_class_empty);
+%}
+
+instruct castII(iRegI dst)
+%{
+  match(Set dst (CastII dst));
+
+  size(0);
+  format %{ "# castII of $dst, #@castII" %}
+  ins_encode(/* empty encoding */);
+  ins_cost(0);
+  ins_pipe(pipe_class_empty);
+%}
+
+instruct checkCastPP(iRegPNoSp dst)
+%{
+  match(Set dst (CheckCastPP dst));
+
+  size(0);
+  ins_cost(0);
+  format %{ "# checkcastPP of $dst, #@checkCastPP" %}
+  ins_encode(/* empty encoding */);
+  ins_pipe(pipe_class_empty);
+%}
+
+instruct castFF(fRegF dst)
+%{
+  match(Set dst (CastFF dst));
+
+  size(0);
+  format %{ "# castFF of $dst" %}
+  ins_encode(/* empty encoding */);
+  ins_cost(0);
+  ins_pipe(pipe_class_empty);
+%}
+
+instruct castDD(fRegD dst)
+%{
+  match(Set dst (CastDD dst));
+
+  size(0);
+  format %{ "# castDD of $dst" %}
+  ins_encode(/* empty encoding */);
+  ins_cost(0);
+  ins_pipe(pipe_class_empty);
+%}
+
+instruct castVV(vReg dst)
+%{
+  match(Set dst (CastVV dst));
+
+  size(0);
+  format %{ "# castVV of $dst" %}
+  ins_encode(/* empty encoding */);
+  ins_cost(0);
+  ins_pipe(pipe_class_empty);
+%}
+
+// ============================================================================
+// Convert Instructions
+
+// int to bool
+instruct convI2Bool(iRegINoSp dst, iRegI src)
+%{
+  match(Set dst (Conv2B src));
+
+  ins_cost(ALU_COST);
+  format %{ "snez  $dst, $src\t#@convI2Bool" %}
+
+  ins_encode %{
+    __ snez(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// pointer to bool
+instruct convP2Bool(iRegINoSp dst, iRegP src)
+%{
+  match(Set dst (Conv2B src));
+
+  ins_cost(ALU_COST);
+  format %{ "snez  $dst, $src\t#@convP2Bool" %}
+
+  ins_encode %{
+    __ snez(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// int <-> long
+
+instruct convI2L_reg_reg(iRegLNoSp dst, iRegIorL2I src)
+%{
+  match(Set dst (ConvI2L src));
+
+  ins_cost(ALU_COST);
+  format %{ "addw  $dst, $src, zr\t#@convI2L_reg_reg" %}
+  ins_encode %{
+    __ addw(as_Register($dst$$reg), as_Register($src$$reg), zr);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct convL2I_reg(iRegINoSp dst, iRegL src) %{
+  match(Set dst (ConvL2I src));
+
+  ins_cost(ALU_COST);
+  format %{ "addw  $dst, $src, zr\t#@convL2I_reg" %}
+
+  ins_encode %{
+    __ addw(as_Register($dst$$reg), as_Register($src$$reg), zr);
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// int to unsigned long (Zero-extend)
+instruct convI2UL_reg_reg(iRegLNoSp dst, iRegIorL2I src, immL_32bits mask)
+%{
+  match(Set dst (AndL (ConvI2L src) mask));
+
+  ins_cost(ALU_COST * 2);
+  format %{ "zero_extend $dst, $src, 32\t# i2ul, #@convI2UL_reg_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ zero_extend(as_Register($dst$$reg), as_Register($src$$reg), 32);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// float <-> double
+
+instruct convF2D_reg(fRegD dst, fRegF src) %{
+  match(Set dst (ConvF2D src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.d.s  $dst, $src\t#@convF2D_reg" %}
+
+  ins_encode %{
+    __ fcvt_d_s(as_FloatRegister($dst$$reg), as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_f2d);
+%}
+
+instruct convD2F_reg(fRegF dst, fRegD src) %{
+  match(Set dst (ConvD2F src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.s.d  $dst, $src\t#@convD2F_reg" %}
+
+  ins_encode %{
+    __ fcvt_s_d(as_FloatRegister($dst$$reg), as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_d2f);
+%}
+
+// float <-> int
+
+instruct convF2I_reg_reg(iRegINoSp dst, fRegF src) %{
+  match(Set dst (ConvF2I src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.w.s  $dst, $src\t#@convF2I_reg_reg" %}
+
+  ins_encode %{
+    __ fcvt_w_s_safe($dst$$Register, $src$$FloatRegister);
+  %}
+
+  ins_pipe(fp_f2i);
+%}
+
+instruct convI2F_reg_reg(fRegF dst, iRegIorL2I src) %{
+  match(Set dst (ConvI2F src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.s.w  $dst, $src\t#@convI2F_reg_reg" %}
+
+  ins_encode %{
+    __ fcvt_s_w(as_FloatRegister($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(fp_i2f);
+%}
+
+// float <-> long
+
+instruct convF2L_reg_reg(iRegLNoSp dst, fRegF src) %{
+  match(Set dst (ConvF2L src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.l.s  $dst, $src\t#@convF2L_reg_reg" %}
+
+  ins_encode %{
+    __ fcvt_l_s_safe($dst$$Register, $src$$FloatRegister);
+  %}
+
+  ins_pipe(fp_f2l);
+%}
+
+instruct convL2F_reg_reg(fRegF dst, iRegL src) %{
+  match(Set dst (ConvL2F src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.s.l  $dst, $src\t#@convL2F_reg_reg" %}
+
+  ins_encode %{
+    __ fcvt_s_l(as_FloatRegister($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(fp_l2f);
+%}
+
+// double <-> int
+
+instruct convD2I_reg_reg(iRegINoSp dst, fRegD src) %{
+  match(Set dst (ConvD2I src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.w.d  $dst, $src\t#@convD2I_reg_reg" %}
+
+  ins_encode %{
+    __ fcvt_w_d_safe($dst$$Register, $src$$FloatRegister);
+  %}
+
+  ins_pipe(fp_d2i);
+%}
+
+instruct convI2D_reg_reg(fRegD dst, iRegIorL2I src) %{
+  match(Set dst (ConvI2D src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.d.w  $dst, $src\t#@convI2D_reg_reg" %}
+
+  ins_encode %{
+    __ fcvt_d_w(as_FloatRegister($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(fp_i2d);
+%}
+
+// double <-> long
+
+instruct convD2L_reg_reg(iRegLNoSp dst, fRegD src) %{
+  match(Set dst (ConvD2L src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.l.d  $dst, $src\t#@convD2L_reg_reg" %}
+
+  ins_encode %{
+    __ fcvt_l_d_safe($dst$$Register, $src$$FloatRegister);
+  %}
+
+  ins_pipe(fp_d2l);
+%}
+
+instruct convL2D_reg_reg(fRegD dst, iRegL src) %{
+  match(Set dst (ConvL2D src));
+
+  ins_cost(XFER_COST);
+  format %{ "fcvt.d.l  $dst, $src\t#@convL2D_reg_reg" %}
+
+  ins_encode %{
+    __ fcvt_d_l(as_FloatRegister($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(fp_l2d);
+%}
+
+// Convert oop into int for vectors alignment masking
+instruct convP2I(iRegINoSp dst, iRegP src) %{
+  match(Set dst (ConvL2I (CastP2X src)));
+
+  ins_cost(ALU_COST * 2);
+  format %{ "zero_extend $dst, $src, 32\t# ptr -> int, #@convP2I" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ zero_extend($dst$$Register, $src$$Register, 32);
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// Convert compressed oop into int for vectors alignment masking
+// in case of 32bit oops (heap < 4Gb).
+instruct convN2I(iRegINoSp dst, iRegN src)
+%{
+  predicate(CompressedOops::shift() == 0);
+  match(Set dst (ConvL2I (CastP2X (DecodeN src))));
+
+  ins_cost(ALU_COST);
+  format %{ "mv  $dst, $src\t# compressed ptr -> int, #@convN2I" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ mv($dst$$Register, $src$$Register);
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// Convert oop pointer into compressed form
+instruct encodeHeapOop(iRegNNoSp dst, iRegP src) %{
+  match(Set dst (EncodeP src));
+  ins_cost(ALU_COST);
+  format %{ "encode_heap_oop  $dst, $src\t#@encodeHeapOop" %}
+  ins_encode %{
+    Register s = $src$$Register;
+    Register d = $dst$$Register;
+    __ encode_heap_oop(d, s);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct decodeHeapOop(iRegPNoSp dst, iRegN src) %{
+  predicate(n->bottom_type()->is_ptr()->ptr() != TypePtr::NotNull &&
+            n->bottom_type()->is_ptr()->ptr() != TypePtr::Constant);
+  match(Set dst (DecodeN src));
+
+  ins_cost(0);
+  format %{ "decode_heap_oop  $dst, $src\t#@decodeHeapOop" %}
+  ins_encode %{
+    Register s = $src$$Register;
+    Register d = $dst$$Register;
+    __ decode_heap_oop(d, s);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct decodeHeapOop_not_null(iRegPNoSp dst, iRegN src) %{
+  predicate(n->bottom_type()->is_ptr()->ptr() == TypePtr::NotNull ||
+            n->bottom_type()->is_ptr()->ptr() == TypePtr::Constant);
+  match(Set dst (DecodeN src));
+
+  ins_cost(0);
+  format %{ "decode_heap_oop_not_null $dst, $src\t#@decodeHeapOop_not_null" %}
+  ins_encode %{
+    Register s = $src$$Register;
+    Register d = $dst$$Register;
+    __ decode_heap_oop_not_null(d, s);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+// Convert klass pointer into compressed form.
+instruct encodeKlass_not_null(iRegNNoSp dst, iRegP src) %{
+  match(Set dst (EncodePKlass src));
+
+  ins_cost(ALU_COST);
+  format %{ "encode_klass_not_null  $dst, $src\t#@encodeKlass_not_null" %}
+
+  ins_encode %{
+    Register src_reg = as_Register($src$$reg);
+    Register dst_reg = as_Register($dst$$reg);
+    __ encode_klass_not_null(dst_reg, src_reg, t0);
+  %}
+
+   ins_pipe(ialu_reg);
+%}
+
+instruct decodeKlass_not_null(iRegPNoSp dst, iRegN src, iRegPNoSp tmp) %{
+  match(Set dst (DecodeNKlass src));
+
+  effect(TEMP tmp);
+
+  ins_cost(ALU_COST);
+  format %{ "decode_klass_not_null  $dst, $src\t#@decodeKlass_not_null" %}
+
+  ins_encode %{
+    Register src_reg = as_Register($src$$reg);
+    Register dst_reg = as_Register($dst$$reg);
+    Register tmp_reg = as_Register($tmp$$reg);
+    __ decode_klass_not_null(dst_reg, src_reg, tmp_reg);
+  %}
+
+   ins_pipe(ialu_reg);
+%}
+
+// stack <-> reg and reg <-> reg shuffles with no conversion
+
+instruct MoveF2I_stack_reg(iRegINoSp dst, stackSlotF src) %{
+
+  match(Set dst (MoveF2I src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(LOAD_COST);
+
+  format %{ "lw  $dst, $src\t#@MoveF2I_stack_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ lw(as_Register($dst$$reg), Address(sp, $src$$disp));
+  %}
+
+  ins_pipe(iload_reg_reg);
+
+%}
+
+instruct MoveI2F_stack_reg(fRegF dst, stackSlotI src) %{
+
+  match(Set dst (MoveI2F src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(LOAD_COST);
+
+  format %{ "flw  $dst, $src\t#@MoveI2F_stack_reg" %}
+
+  ins_encode %{
+    __ flw(as_FloatRegister($dst$$reg), Address(sp, $src$$disp));
+  %}
+
+  ins_pipe(pipe_class_memory);
+
+%}
+
+instruct MoveD2L_stack_reg(iRegLNoSp dst, stackSlotD src) %{
+
+  match(Set dst (MoveD2L src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(LOAD_COST);
+
+  format %{ "ld  $dst, $src\t#@MoveD2L_stack_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ ld(as_Register($dst$$reg), Address(sp, $src$$disp));
+  %}
+
+  ins_pipe(iload_reg_reg);
+
+%}
+
+instruct MoveL2D_stack_reg(fRegD dst, stackSlotL src) %{
+
+  match(Set dst (MoveL2D src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(LOAD_COST);
+
+  format %{ "fld  $dst, $src\t#@MoveL2D_stack_reg" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ fld(as_FloatRegister($dst$$reg), Address(sp, $src$$disp));
+  %}
+
+  ins_pipe(pipe_class_memory);
+
+%}
+
+instruct MoveF2I_reg_stack(stackSlotI dst, fRegF src) %{
+
+  match(Set dst (MoveF2I src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(STORE_COST);
+
+  format %{ "fsw  $src, $dst\t#@MoveF2I_reg_stack" %}
+
+  ins_encode %{
+    __ fsw(as_FloatRegister($src$$reg), Address(sp, $dst$$disp));
+  %}
+
+  ins_pipe(pipe_class_memory);
+
+%}
+
+instruct MoveI2F_reg_stack(stackSlotF dst, iRegI src) %{
+
+  match(Set dst (MoveI2F src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(STORE_COST);
+
+  format %{ "sw  $src, $dst\t#@MoveI2F_reg_stack" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ sw(as_Register($src$$reg), Address(sp, $dst$$disp));
+  %}
+
+  ins_pipe(istore_reg_reg);
+
+%}
+
+instruct MoveD2L_reg_stack(stackSlotL dst, fRegD src) %{
+
+  match(Set dst (MoveD2L src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(STORE_COST);
+
+  format %{ "fsd  $dst, $src\t#@MoveD2L_reg_stack" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ fsd(as_FloatRegister($src$$reg), Address(sp, $dst$$disp));
+  %}
+
+  ins_pipe(pipe_class_memory);
+
+%}
+
+instruct MoveL2D_reg_stack(stackSlotD dst, iRegL src) %{
+
+  match(Set dst (MoveL2D src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(STORE_COST);
+
+  format %{ "sd  $src, $dst\t#@MoveL2D_reg_stack" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    __ sd(as_Register($src$$reg), Address(sp, $dst$$disp));
+  %}
+
+  ins_pipe(istore_reg_reg);
+
+%}
+
+instruct MoveF2I_reg_reg(iRegINoSp dst, fRegF src) %{
+
+  match(Set dst (MoveF2I src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(XFER_COST);
+
+  format %{ "fmv.x.w  $dst, $src\t#@MoveL2D_reg_stack" %}
+
+  ins_encode %{
+    __ fmv_x_w(as_Register($dst$$reg), as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_f2i);
+
+%}
+
+instruct MoveI2F_reg_reg(fRegF dst, iRegI src) %{
+
+  match(Set dst (MoveI2F src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(XFER_COST);
+
+  format %{ "fmv.w.x  $dst, $src\t#@MoveI2F_reg_reg" %}
+
+  ins_encode %{
+    __ fmv_w_x(as_FloatRegister($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(fp_i2f);
+
+%}
+
+instruct MoveD2L_reg_reg(iRegLNoSp dst, fRegD src) %{
+
+  match(Set dst (MoveD2L src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(XFER_COST);
+
+  format %{ "fmv.x.d $dst, $src\t#@MoveD2L_reg_reg" %}
+
+  ins_encode %{
+    __ fmv_x_d(as_Register($dst$$reg), as_FloatRegister($src$$reg));
+  %}
+
+  ins_pipe(fp_d2l);
+
+%}
+
+instruct MoveL2D_reg_reg(fRegD dst, iRegL src) %{
+
+  match(Set dst (MoveL2D src));
+
+  effect(DEF dst, USE src);
+
+  ins_cost(XFER_COST);
+
+  format %{ "fmv.d.x  $dst, $src\t#@MoveD2L_reg_reg" %}
+
+  ins_encode %{
+    __ fmv_d_x(as_FloatRegister($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(fp_l2d);
+%}
+
+// ============================================================================
+// Compare Instructions which set the result float comparisons in dest register.
+
+instruct cmpF3_reg_reg(iRegINoSp dst, fRegF op1, fRegF op2)
+%{
+  match(Set dst (CmpF3 op1 op2));
+
+  ins_cost(XFER_COST * 2 + BRANCH_COST + ALU_COST);
+  format %{ "flt.s  $dst, $op2, $op1\t#@cmpF3_reg_reg\n\t"
+            "bgtz   $dst, done\n\t"
+            "feq.s  $dst, $op1, $op2\n\t"
+            "addi   $dst, $dst, -1\t#@cmpF3_reg_reg"
+  %}
+
+  ins_encode %{
+    // we want -1 for unordered or less than, 0 for equal and 1 for greater than.
+    __ float_compare(as_Register($dst$$reg), as_FloatRegister($op1$$reg),
+                     as_FloatRegister($op2$$reg), -1 /*unordered_result < 0*/);
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+instruct cmpD3_reg_reg(iRegINoSp dst, fRegD op1, fRegD op2)
+%{
+  match(Set dst (CmpD3 op1 op2));
+
+  ins_cost(XFER_COST * 2 + BRANCH_COST + ALU_COST);
+  format %{ "flt.d  $dst, $op2, $op1\t#@cmpD3_reg_reg\n\t"
+            "bgtz   $dst, done\n\t"
+            "feq.d  $dst, $op1, $op2\n\t"
+            "addi   $dst, $dst, -1\t#@cmpD3_reg_reg"
+  %}
+
+  ins_encode %{
+    // we want -1 for unordered or less than, 0 for equal and 1 for greater than.
+    __ double_compare(as_Register($dst$$reg), as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg), -1 /*unordered_result < 0*/);
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+instruct cmpL3_reg_reg(iRegINoSp dst, iRegL op1, iRegL op2)
+%{
+  match(Set dst (CmpL3 op1 op2));
+
+  ins_cost(ALU_COST * 3 + BRANCH_COST);
+  format %{ "slt   $dst, $op2, $op1\t#@cmpL3_reg_reg\n\t"
+            "bnez  $dst, done\n\t"
+            "slt  $dst, $op1, $op2\n\t"
+            "neg   $dst, $dst\t#@cmpL3_reg_reg"
+  %}
+  ins_encode %{
+    __ cmp_l2i(t0, as_Register($op1$$reg), as_Register($op2$$reg));
+    __ mv(as_Register($dst$$reg), t0);
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+instruct cmpLTMask_reg_reg(iRegINoSp dst, iRegI p, iRegI q)
+%{
+  match(Set dst (CmpLTMask p q));
+
+  ins_cost(2 * ALU_COST);
+
+  format %{ "slt $dst, $p, $q\t#@cmpLTMask_reg_reg\n\t"
+            "subw $dst, zr, $dst\t#@cmpLTMask_reg_reg"
+  %}
+
+  ins_encode %{
+    __ slt(as_Register($dst$$reg), as_Register($p$$reg), as_Register($q$$reg));
+    __ subw(as_Register($dst$$reg), zr, as_Register($dst$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct cmpLTMask_reg_zero(iRegINoSp dst, iRegIorL2I op, immI0 zero)
+%{
+  match(Set dst (CmpLTMask op zero));
+
+  ins_cost(ALU_COST);
+
+  format %{ "sraiw $dst, $dst, 31\t#@cmpLTMask_reg_reg" %}
+
+  ins_encode %{
+    __ sraiw(as_Register($dst$$reg), as_Register($op$$reg), 31);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+
+// ============================================================================
+// Max and Min
+
+instruct minI_rReg(iRegINoSp dst, iRegI src1, iRegI src2)
+%{
+  match(Set dst (MinI src1 src2));
+
+  effect(DEF dst, USE src1, USE src2);
+
+  ins_cost(BRANCH_COST + ALU_COST * 2);
+  format %{
+    "ble $src1, $src2, Lsrc1.\t#@minI_rReg\n\t"
+    "mv $dst, $src2\n\t"
+    "j Ldone\n\t"
+    "bind Lsrc1\n\t"
+    "mv $dst, $src1\n\t"
+    "bind\t#@minI_rReg"
+  %}
+
+  ins_encode %{
+    Label Lsrc1, Ldone;
+    __ ble(as_Register($src1$$reg), as_Register($src2$$reg), Lsrc1);
+    __ mv(as_Register($dst$$reg), as_Register($src2$$reg));
+    __ j(Ldone);
+    __ bind(Lsrc1);
+    __ mv(as_Register($dst$$reg), as_Register($src1$$reg));
+    __ bind(Ldone);
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct maxI_rReg(iRegINoSp dst, iRegI src1, iRegI src2)
+%{
+  match(Set dst (MaxI src1 src2));
+
+  effect(DEF dst, USE src1, USE src2);
+
+  ins_cost(BRANCH_COST + ALU_COST * 2);
+  format %{
+    "bge $src1, $src2, Lsrc1\t#@maxI_rReg\n\t"
+    "mv $dst, $src2\n\t"
+    "j Ldone\n\t"
+    "bind Lsrc1\n\t"
+    "mv $dst, $src1\n\t"
+    "bind\t#@maxI_rReg"
+  %}
+
+  ins_encode %{
+    Label Lsrc1, Ldone;
+    __ bge(as_Register($src1$$reg), as_Register($src2$$reg), Lsrc1);
+    __ mv(as_Register($dst$$reg), as_Register($src2$$reg));
+    __ j(Ldone);
+    __ bind(Lsrc1);
+    __ mv(as_Register($dst$$reg), as_Register($src1$$reg));
+    __ bind(Ldone);
+
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// ============================================================================
+// Branch Instructions
+// Direct Branch.
+instruct branch(label lbl)
+%{
+  match(Goto);
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "j  $lbl\t#@branch" %}
+
+  ins_encode(riscv_enc_j(lbl));
+
+  ins_pipe(pipe_branch);
+%}
+
+// ============================================================================
+// Compare and Branch Instructions
+
+// Patterns for short (< 12KiB) variants
+
+// Compare flags and branch near instructions.
+instruct cmpFlag_branch(cmpOpEqNe cmp, rFlagsReg cr, label lbl) %{
+  match(If cmp cr);
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "b$cmp  $cr, zr, $lbl\t#@cmpFlag_branch" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($cr$$reg), *($lbl$$label));
+  %}
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+// Compare signed int and branch near instructions
+instruct cmpI_branch(cmpOp cmp, iRegI op1, iRegI op2, label lbl)
+%{
+  // Same match rule as `far_cmpI_branch'.
+  match(If cmp (CmpI op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpI_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpI_loop(cmpOp cmp, iRegI op1, iRegI op2, label lbl)
+%{
+  // Same match rule as `far_cmpI_loop'.
+  match(CountedLoopEnd cmp (CmpI op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpI_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+// Compare unsigned int and branch near instructions
+instruct cmpU_branch(cmpOpU cmp, iRegI op1, iRegI op2, label lbl)
+%{
+  // Same match rule as `far_cmpU_branch'.
+  match(If cmp (CmpU op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpU_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpU_loop(cmpOpU cmp, iRegI op1, iRegI op2, label lbl)
+%{
+  // Same match rule as `far_cmpU_loop'.
+  match(CountedLoopEnd cmp (CmpU op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpU_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+// Compare signed long and branch near instructions
+instruct cmpL_branch(cmpOp cmp, iRegL op1, iRegL op2, label lbl)
+%{
+  // Same match rule as `far_cmpL_branch'.
+  match(If cmp (CmpL op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpL_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpL_loop(cmpOp cmp, iRegL op1, iRegL op2, label lbl)
+%{
+  // Same match rule as `far_cmpL_loop'.
+  match(CountedLoopEnd cmp (CmpL op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpL_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+// Compare unsigned long and branch near instructions
+instruct cmpUL_branch(cmpOpU cmp, iRegL op1, iRegL op2, label lbl)
+%{
+  // Same match rule as `far_cmpUL_branch'.
+  match(If cmp (CmpUL op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpUL_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpUL_loop(cmpOpU cmp, iRegL op1, iRegL op2, label lbl)
+%{
+  // Same match rule as `far_cmpUL_loop'.
+  match(CountedLoopEnd cmp (CmpUL op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpUL_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+// Compare pointer and branch near instructions
+instruct cmpP_branch(cmpOpU cmp, iRegP op1, iRegP op2, label lbl)
+%{
+  // Same match rule as `far_cmpP_branch'.
+  match(If cmp (CmpP op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpP_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpP_loop(cmpOpU cmp, iRegP op1, iRegP op2, label lbl)
+%{
+  // Same match rule as `far_cmpP_loop'.
+  match(CountedLoopEnd cmp (CmpP op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpP_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+// Compare narrow pointer and branch near instructions
+instruct cmpN_branch(cmpOpU cmp, iRegN op1, iRegN op2, label lbl)
+%{
+  // Same match rule as `far_cmpN_branch'.
+  match(If cmp (CmpN op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpN_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpN_loop(cmpOpU cmp, iRegN op1, iRegN op2, label lbl)
+%{
+  // Same match rule as `far_cmpN_loop'.
+  match(CountedLoopEnd cmp (CmpN op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, $op2, $lbl\t#@cmpN_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+  ins_short_branch(1);
+%}
+
+// Compare float and branch near instructions
+instruct cmpF_branch(cmpOp cmp, fRegF op1, fRegF op2, label lbl)
+%{
+  // Same match rule as `far_cmpF_branch'.
+  match(If cmp (CmpF op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(XFER_COST + BRANCH_COST);
+  format %{ "float_b$cmp $op1, $op2 \t#@cmpF_branch"%}
+
+  ins_encode %{
+    __ float_cmp_branch($cmp$$cmpcode, as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_class_compare);
+  ins_short_branch(1);
+%}
+
+instruct cmpF_loop(cmpOp cmp, fRegF op1, fRegF op2, label lbl)
+%{
+  // Same match rule as `far_cmpF_loop'.
+  match(CountedLoopEnd cmp (CmpF op1 op2));
+  effect(USE lbl);
+
+  ins_cost(XFER_COST + BRANCH_COST);
+  format %{ "float_b$cmp $op1, $op2\t#@cmpF_loop"%}
+
+  ins_encode %{
+    __ float_cmp_branch($cmp$$cmpcode, as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_class_compare);
+  ins_short_branch(1);
+%}
+
+// Compare double and branch near instructions
+instruct cmpD_branch(cmpOp cmp, fRegD op1, fRegD op2, label lbl)
+%{
+  // Same match rule as `far_cmpD_branch'.
+  match(If cmp (CmpD op1 op2));
+  effect(USE lbl);
+
+  ins_cost(XFER_COST + BRANCH_COST);
+  format %{ "double_b$cmp $op1, $op2\t#@cmpD_branch"%}
+
+  ins_encode %{
+    __ float_cmp_branch($cmp$$cmpcode | C2_MacroAssembler::double_branch_mask, as_FloatRegister($op1$$reg),
+                        as_FloatRegister($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_class_compare);
+  ins_short_branch(1);
+%}
+
+instruct cmpD_loop(cmpOp cmp, fRegD op1, fRegD op2, label lbl)
+%{
+  // Same match rule as `far_cmpD_loop'.
+  match(CountedLoopEnd cmp (CmpD op1 op2));
+  effect(USE lbl);
+
+  ins_cost(XFER_COST + BRANCH_COST);
+  format %{ "double_b$cmp $op1, $op2\t#@cmpD_loop"%}
+
+  ins_encode %{
+    __ float_cmp_branch($cmp$$cmpcode | C2_MacroAssembler::double_branch_mask, as_FloatRegister($op1$$reg),
+                        as_FloatRegister($op2$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_class_compare);
+  ins_short_branch(1);
+%}
+
+// Compare signed int with zero and branch near instructions
+instruct cmpI_reg_imm0_branch(cmpOp cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  // Same match rule as `far_cmpI_reg_imm0_branch'.
+  match(If cmp (CmpI op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpI_reg_imm0_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), zr, *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpI_reg_imm0_loop(cmpOp cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  // Same match rule as `far_cmpI_reg_imm0_loop'.
+  match(CountedLoopEnd cmp (CmpI op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpI_reg_imm0_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), zr, *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+// Compare unsigned int with zero and branch near instructions
+instruct cmpUEqNeLeGt_reg_imm0_branch(cmpOpUEqNeLeGt cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  // Same match rule as `far_cmpUEqNeLeGt_reg_imm0_branch'.
+  match(If cmp (CmpU op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpUEqNeLeGt_reg_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpUEqNeLeGt_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpUEqNeLeGt_reg_imm0_loop(cmpOpUEqNeLeGt cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  // Same match rule as `far_cmpUEqNeLeGt_reg_imm0_loop'.
+  match(CountedLoopEnd cmp (CmpU op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpUEqNeLeGt_reg_imm0_loop" %}
+
+
+  ins_encode %{
+    __ enc_cmpUEqNeLeGt_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+// Compare signed long with zero and branch near instructions
+instruct cmpL_reg_imm0_branch(cmpOp cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  // Same match rule as `far_cmpL_reg_imm0_branch'.
+  match(If cmp (CmpL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpL_reg_imm0_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), zr, *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpL_reg_imm0_loop(cmpOp cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  // Same match rule as `far_cmpL_reg_imm0_loop'.
+  match(CountedLoopEnd cmp (CmpL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpL_reg_imm0_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), zr, *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+// Compare unsigned long with zero and branch near instructions
+instruct cmpULEqNeLeGt_reg_imm0_branch(cmpOpUEqNeLeGt cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  // Same match rule as `far_cmpULEqNeLeGt_reg_imm0_branch'.
+  match(If cmp (CmpUL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpULEqNeLeGt_reg_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpUEqNeLeGt_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpULEqNeLeGt_reg_imm0_loop(cmpOpUEqNeLeGt cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  // Same match rule as `far_cmpULEqNeLeGt_reg_imm0_loop'.
+  match(CountedLoopEnd cmp (CmpUL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpULEqNeLeGt_reg_imm0_loop" %}
+
+  ins_encode %{
+    __ enc_cmpUEqNeLeGt_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+// Compare pointer with zero and branch near instructions
+instruct cmpP_imm0_branch(cmpOpEqNe cmp, iRegP op1, immP0 zero, label lbl) %{
+  // Same match rule as `far_cmpP_reg_imm0_branch'.
+  match(If cmp (CmpP op1 zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "b$cmp   $op1, zr, $lbl\t#@cmpP_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpP_imm0_loop(cmpOpEqNe cmp, iRegP op1, immP0 zero, label lbl) %{
+  // Same match rule as `far_cmpP_reg_imm0_loop'.
+  match(CountedLoopEnd cmp (CmpP op1 zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "b$cmp   $op1, zr, $lbl\t#@cmpP_imm0_loop" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+// Compare narrow pointer with zero and branch near instructions
+instruct cmpN_imm0_branch(cmpOpEqNe cmp, iRegN op1, immN0 zero, label lbl) %{
+  // Same match rule as `far_cmpN_reg_imm0_branch'.
+  match(If cmp (CmpN op1 zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpN_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpN_imm0_loop(cmpOpEqNe cmp, iRegN op1, immN0 zero, label lbl) %{
+  // Same match rule as `far_cmpN_reg_imm0_loop'.
+  match(CountedLoopEnd cmp (CmpN op1 zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "b$cmp  $op1, zr, $lbl\t#@cmpN_imm0_loop" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+// Compare narrow pointer with pointer zero and branch near instructions
+instruct cmpP_narrowOop_imm0_branch(cmpOpEqNe cmp, iRegN op1, immP0 zero, label lbl) %{
+  // Same match rule as `far_cmpP_narrowOop_imm0_branch'.
+  match(If cmp (CmpP (DecodeN op1) zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "b$cmp   $op1, zr, $lbl\t#@cmpP_narrowOop_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+instruct cmpP_narrowOop_imm0_loop(cmpOpEqNe cmp, iRegN op1, immP0 zero, label lbl) %{
+  // Same match rule as `far_cmpP_narrowOop_imm0_loop'.
+  match(CountedLoopEnd cmp (CmpP (DecodeN op1) zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "b$cmp   $op1, zr, $lbl\t#@cmpP_narrowOop_imm0_loop" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label));
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+  ins_short_branch(1);
+%}
+
+// Patterns for far (20KiB) variants
+
+instruct far_cmpFlag_branch(cmpOp cmp, rFlagsReg cr, label lbl) %{
+  match(If cmp cr);
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST);
+  format %{ "far_b$cmp $cr, zr, L\t#@far_cmpFlag_branch"%}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($cr$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+// Compare signed int and branch far instructions
+instruct far_cmpI_branch(cmpOp cmp, iRegI op1, iRegI op2, label lbl) %{
+  match(If cmp (CmpI op1 op2));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  // the format instruction [far_b$cmp] here is be used as two insructions
+  // in macroassembler: b$not_cmp(op1, op2, done), j($lbl), bind(done)
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpI_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpI_loop(cmpOp cmp, iRegI op1, iRegI op2, label lbl) %{
+  match(CountedLoopEnd cmp (CmpI op1 op2));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpI_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpU_branch(cmpOpU cmp, iRegI op1, iRegI op2, label lbl) %{
+  match(If cmp (CmpU op1 op2));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp $op1, $op2, $lbl\t#@far_cmpU_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                       as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpU_loop(cmpOpU cmp, iRegI op1, iRegI op2, label lbl) %{
+  match(CountedLoopEnd cmp (CmpU op1 op2));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp $op1, $op2, $lbl\t#@far_cmpU_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                       as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpL_branch(cmpOp cmp, iRegL op1, iRegL op2, label lbl) %{
+  match(If cmp (CmpL op1 op2));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpL_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpLloop(cmpOp cmp, iRegL op1, iRegL op2, label lbl) %{
+  match(CountedLoopEnd cmp (CmpL op1 op2));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpL_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpUL_branch(cmpOpU cmp, iRegL op1, iRegL op2, label lbl) %{
+  match(If cmp (CmpUL op1 op2));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpUL_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                       as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpUL_loop(cmpOpU cmp, iRegL op1, iRegL op2, label lbl) %{
+  match(CountedLoopEnd cmp (CmpUL op1 op2));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpUL_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                       as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpP_branch(cmpOpU cmp, iRegP op1, iRegP op2, label lbl)
+%{
+  match(If cmp (CmpP op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpP_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                       as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpP_loop(cmpOpU cmp, iRegP op1, iRegP op2, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpP op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpP_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                       as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpN_branch(cmpOpU cmp, iRegN op1, iRegN op2, label lbl)
+%{
+  match(If cmp (CmpN op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpN_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                       as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+instruct far_cmpN_loop(cmpOpU cmp, iRegN op1, iRegN op2, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpN op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, $op2, $lbl\t#@far_cmpN_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode | C2_MacroAssembler::unsigned_branch_mask, as_Register($op1$$reg),
+                  as_Register($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmp_branch);
+%}
+
+// Float compare and branch instructions
+instruct far_cmpF_branch(cmpOp cmp, fRegF op1, fRegF op2, label lbl)
+%{
+  match(If cmp (CmpF op1 op2));
+
+  effect(USE lbl);
+
+  ins_cost(XFER_COST + BRANCH_COST * 2);
+  format %{ "far_float_b$cmp $op1, $op2\t#@far_cmpF_branch"%}
+
+  ins_encode %{
+    __ float_cmp_branch($cmp$$cmpcode, as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg),
+                        *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
+instruct far_cmpF_loop(cmpOp cmp, fRegF op1, fRegF op2, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpF op1 op2));
+  effect(USE lbl);
+
+  ins_cost(XFER_COST + BRANCH_COST * 2);
+  format %{ "far_float_b$cmp $op1, $op2\t#@far_cmpF_loop"%}
+
+  ins_encode %{
+    __ float_cmp_branch($cmp$$cmpcode, as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg),
+                        *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
+// Double compare and branch instructions
+instruct far_cmpD_branch(cmpOp cmp, fRegD op1, fRegD op2, label lbl)
+%{
+  match(If cmp (CmpD op1 op2));
+  effect(USE lbl);
+
+  ins_cost(XFER_COST + BRANCH_COST * 2);
+  format %{ "far_double_b$cmp $op1, $op2\t#@far_cmpD_branch"%}
+
+  ins_encode %{
+    __ float_cmp_branch($cmp$$cmpcode | C2_MacroAssembler::double_branch_mask, as_FloatRegister($op1$$reg),
+                        as_FloatRegister($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
+instruct far_cmpD_loop(cmpOp cmp, fRegD op1, fRegD op2, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpD op1 op2));
+  effect(USE lbl);
+
+  ins_cost(XFER_COST + BRANCH_COST * 2);
+  format %{ "far_double_b$cmp $op1, $op2\t#@far_cmpD_loop"%}
+
+  ins_encode %{
+    __ float_cmp_branch($cmp$$cmpcode | C2_MacroAssembler::double_branch_mask, as_FloatRegister($op1$$reg),
+                        as_FloatRegister($op2$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
+instruct far_cmpI_reg_imm0_branch(cmpOp cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  match(If cmp (CmpI op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpI_reg_imm0_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), zr, *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpI_reg_imm0_loop(cmpOp cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpI op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpI_reg_imm0_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), zr, *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpUEqNeLeGt_imm0_branch(cmpOpUEqNeLeGt cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  match(If cmp (CmpU op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpUEqNeLeGt_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpUEqNeLeGt_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpUEqNeLeGt_reg_imm0_loop(cmpOpUEqNeLeGt cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpU op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpUEqNeLeGt_reg_imm0_loop" %}
+
+
+  ins_encode %{
+    __ enc_cmpUEqNeLeGt_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+// compare lt/ge unsigned instructs has no short instruct with same match
+instruct far_cmpULtGe_reg_imm0_branch(cmpOpULtGe cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  match(If cmp (CmpU op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "j  $lbl if $cmp == ge\t#@far_cmpULtGe_reg_imm0_branch" %}
+
+  ins_encode(riscv_enc_far_cmpULtGe_imm0_branch(cmp, op1, lbl));
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpULtGe_reg_imm0_loop(cmpOpULtGe cmp, iRegI op1, immI0 zero, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpU op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "j  $lbl if $cmp == ge\t#@far_cmpULtGe_reg_imm0_loop" %}
+
+  ins_encode(riscv_enc_far_cmpULtGe_imm0_branch(cmp, op1, lbl));
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpL_reg_imm0_branch(cmpOp cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  match(If cmp (CmpL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpL_reg_imm0_branch" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), zr, *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpL_reg_imm0_loop(cmpOp cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpL_reg_imm0_loop" %}
+
+  ins_encode %{
+    __ cmp_branch($cmp$$cmpcode, as_Register($op1$$reg), zr, *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpULEqNeLeGt_reg_imm0_branch(cmpOpUEqNeLeGt cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  match(If cmp (CmpUL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpULEqNeLeGt_reg_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpUEqNeLeGt_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpULEqNeLeGt_reg_imm0_loop(cmpOpUEqNeLeGt cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpUL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpULEqNeLeGt_reg_imm0_loop" %}
+
+  ins_encode %{
+    __ enc_cmpUEqNeLeGt_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+// compare lt/ge unsigned instructs has no short instruct with same match
+instruct far_cmpULLtGe_reg_imm0_branch(cmpOpULtGe cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  match(If cmp (CmpUL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "j  $lbl if $cmp == ge\t#@far_cmpULLtGe_reg_imm0_branch" %}
+
+  ins_encode(riscv_enc_far_cmpULtGe_imm0_branch(cmp, op1, lbl));
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpULLtGe_reg_imm0_loop(cmpOpULtGe cmp, iRegL op1, immL0 zero, label lbl)
+%{
+  match(CountedLoopEnd cmp (CmpUL op1 zero));
+
+  effect(USE op1, USE lbl);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "j  $lbl if $cmp == ge\t#@far_cmpULLtGe_reg_imm0_loop" %}
+
+  ins_encode(riscv_enc_far_cmpULtGe_imm0_branch(cmp, op1, lbl));
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpP_imm0_branch(cmpOpEqNe cmp, iRegP op1, immP0 zero, label lbl) %{
+  match(If cmp (CmpP op1 zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp   $op1, zr, $lbl\t#@far_cmpP_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpP_imm0_loop(cmpOpEqNe cmp, iRegP op1, immP0 zero, label lbl) %{
+  match(CountedLoopEnd cmp (CmpP op1 zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp   $op1, zr, $lbl\t#@far_cmpP_imm0_loop" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpN_imm0_branch(cmpOpEqNe cmp, iRegN op1, immN0 zero, label lbl) %{
+  match(If cmp (CmpN op1 zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpN_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpN_imm0_loop(cmpOpEqNe cmp, iRegN op1, immN0 zero, label lbl) %{
+  match(CountedLoopEnd cmp (CmpN op1 zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+
+  format %{ "far_b$cmp  $op1, zr, $lbl\t#@far_cmpN_imm0_loop" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpP_narrowOop_imm0_branch(cmpOpEqNe cmp, iRegN op1, immP0 zero, label lbl) %{
+  match(If cmp (CmpP (DecodeN op1) zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp   $op1, zr, $lbl\t#@far_cmpP_narrowOop_imm0_branch" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+instruct far_cmpP_narrowOop_imm0_loop(cmpOpEqNe cmp, iRegN op1, immP0 zero, label lbl) %{
+  match(CountedLoopEnd cmp (CmpP (DecodeN op1) zero));
+  effect(USE lbl);
+
+  ins_cost(BRANCH_COST * 2);
+  format %{ "far_b$cmp   $op1, zr, $lbl\t#@far_cmpP_narrowOop_imm0_loop" %}
+
+  ins_encode %{
+    __ enc_cmpEqNe_imm0_branch($cmp$$cmpcode, as_Register($op1$$reg), *($lbl$$label), /* is_far */ true);
+  %}
+
+  ins_pipe(pipe_cmpz_branch);
+%}
+
+// ============================================================================
+// Conditional Move Instructions
+instruct cmovI_cmpI(iRegINoSp dst, iRegI src, iRegI op1, iRegI op2, cmpOp cop) %{
+  match(Set dst (CMoveI (Binary cop (CmpI op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+             "bneg$cop $op1, $op2, skip\t#@cmovI_cmpI\n\t"
+             "mv $dst, $src\n\t"
+             "skip:"
+         %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct cmovI_cmpU(iRegINoSp dst, iRegI src, iRegI op1, iRegI op2, cmpOpU cop) %{
+  match(Set dst (CMoveI (Binary cop (CmpU op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+             "bneg$cop $op1, $op2, skip\t#@cmovI_cmpU\n\t"
+             "mv $dst, $src\n\t"
+             "skip:"
+         %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode | C2_MacroAssembler::unsigned_branch_mask,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct cmovI_cmpL(iRegINoSp dst, iRegI src, iRegL op1, iRegL op2, cmpOp cop) %{
+  match(Set dst (CMoveI (Binary cop (CmpL op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+             "bneg$cop $op1, $op2, skip\t#@cmovI_cmpL\n\t"
+             "mv $dst, $src\n\t"
+             "skip:"
+         %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct cmovL_cmpL(iRegLNoSp dst, iRegL src, iRegL op1, iRegL op2, cmpOp cop) %{
+  match(Set dst (CMoveL (Binary cop (CmpL op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+             "bneg$cop $op1, $op2, skip\t#@cmovL_cmpL\n\t"
+             "mv $dst, $src\n\t"
+             "skip:"
+         %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct cmovL_cmpUL(iRegLNoSp dst, iRegL src, iRegL op1, iRegL op2, cmpOpU cop) %{
+  match(Set dst (CMoveL (Binary cop (CmpUL op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+             "bneg$cop $op1, $op2, skip\t#@cmovL_cmpUL\n\t"
+             "mv $dst, $src\n\t"
+             "skip:"
+         %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode | C2_MacroAssembler::unsigned_branch_mask,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct cmovI_cmpUL(iRegINoSp dst, iRegI src, iRegL op1, iRegL op2, cmpOpU cop) %{
+  match(Set dst (CMoveI (Binary cop (CmpUL op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+  format %{
+             "bneg$cop $op1, $op2\t#@cmovI_cmpUL\n\t"
+             "mv $dst, $src\n\t"
+             "skip:"
+         %}
+
+  ins_encode %{
+    __ enc_cmove($cop$$cmpcode | C2_MacroAssembler::unsigned_branch_mask,
+                 as_Register($op1$$reg), as_Register($op2$$reg),
+                 as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+
+// ============================================================================
+// Procedure Call/Return Instructions
+
+// Call Java Static Instruction
+// Note: If this code changes, the corresponding ret_addr_offset() and
+//       compute_padding() functions will have to be adjusted.
+instruct CallStaticJavaDirect(method meth)
+%{
+  match(CallStaticJava);
+
+  effect(USE meth);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "CALL,static $meth\t#@CallStaticJavaDirect" %}
+
+  ins_encode(riscv_enc_java_static_call(meth),
+             riscv_enc_call_epilog);
+
+  ins_pipe(pipe_class_call);
+  ins_alignment(4);
+%}
+
+// TO HERE
+
+// Call Java Dynamic Instruction
+// Note: If this code changes, the corresponding ret_addr_offset() and
+//       compute_padding() functions will have to be adjusted.
+instruct CallDynamicJavaDirect(method meth, rFlagsReg cr)
+%{
+  match(CallDynamicJava);
+
+  effect(USE meth, KILL cr);
+
+  ins_cost(BRANCH_COST + ALU_COST * 6);
+
+  format %{ "CALL,dynamic $meth\t#@CallDynamicJavaDirect" %}
+
+  ins_encode(riscv_enc_java_dynamic_call(meth),
+             riscv_enc_call_epilog);
+
+  ins_pipe(pipe_class_call);
+  ins_alignment(4);
+%}
+
+// Call Runtime Instruction
+
+instruct CallRuntimeDirect(method meth, rFlagsReg cr)
+%{
+  match(CallRuntime);
+
+  effect(USE meth, KILL cr);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "CALL, runtime $meth\t#@CallRuntimeDirect" %}
+
+  ins_encode(riscv_enc_java_to_runtime(meth));
+
+  ins_pipe(pipe_class_call);
+%}
+
+// Call Runtime Instruction
+
+instruct CallLeafDirect(method meth, rFlagsReg cr)
+%{
+  match(CallLeaf);
+
+  effect(USE meth, KILL cr);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "CALL, runtime leaf $meth\t#@CallLeafDirect" %}
+
+  ins_encode(riscv_enc_java_to_runtime(meth));
+
+  ins_pipe(pipe_class_call);
+%}
+
+// Call Runtime Instruction
+
+instruct CallLeafNoFPDirect(method meth, rFlagsReg cr)
+%{
+  match(CallLeafNoFP);
+
+  effect(USE meth, KILL cr);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "CALL, runtime leaf nofp $meth\t#@CallLeafNoFPDirect" %}
+
+  ins_encode(riscv_enc_java_to_runtime(meth));
+
+  ins_pipe(pipe_class_call);
+%}
+
+// ============================================================================
+// Partial Subtype Check
+//
+// superklass array for an instance of the superklass.  Set a hidden
+// internal cache on a hit (cache is checked with exposed code in
+// gen_subtype_check()).  Return zero for a hit.  The encoding
+// ALSO sets flags.
+
+instruct partialSubtypeCheck(iRegP_R15 result, iRegP_R14 sub, iRegP_R10 super, iRegP_R12 tmp, rFlagsReg cr)
+%{
+  match(Set result (PartialSubtypeCheck sub super));
+  effect(KILL tmp, KILL cr);
+
+  ins_cost(2 * STORE_COST + 3 * LOAD_COST + 4 * ALU_COST + BRANCH_COST * 4);
+  format %{ "partialSubtypeCheck $result, $sub, $super\t#@partialSubtypeCheck" %}
+
+  ins_encode(riscv_enc_partial_subtype_check(sub, super, tmp, result));
+
+  opcode(0x1); // Force zero of result reg on hit
+
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct partialSubtypeCheckVsZero(iRegP_R15 result, iRegP_R14 sub, iRegP_R10 super, iRegP_R12 tmp,
+                                   immP0 zero, rFlagsReg cr)
+%{
+  match(Set cr (CmpP (PartialSubtypeCheck sub super) zero));
+  effect(KILL tmp, KILL result);
+
+  ins_cost(2 * STORE_COST + 3 * LOAD_COST + 4 * ALU_COST + BRANCH_COST * 4);
+  format %{ "partialSubtypeCheck $result, $sub, $super == 0\t#@partialSubtypeCheckVsZero" %}
+
+  ins_encode(riscv_enc_partial_subtype_check(sub, super, tmp, result));
+
+  opcode(0x0); // Don't zero result reg on hit
+
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_compareU(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                         iRegI_R10 result, iRegP_R28 tmp1, iRegL_R29 tmp2, iRegL_R30 tmp3, rFlagsReg cr)
+%{
+  predicate(!UseRVV && ((StrCompNode *)n)->encoding() == StrIntrinsicNode::UU);
+  match(Set result (StrComp(Binary str1 cnt1)(Binary str2 cnt2)));
+  effect(KILL tmp1, KILL tmp2, KILL tmp3, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
+
+  format %{ "String Compare $str1, $cnt1, $str2, $cnt2 -> $result\t#@string_compareU" %}
+  ins_encode %{
+    // Count is in 8-bit bytes; non-Compact chars are 16 bits.
+    __ string_compare($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                      $tmp1$$Register, $tmp2$$Register, $tmp3$$Register,
+                      StrIntrinsicNode::UU);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_compareL(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                         iRegI_R10 result, iRegP_R28 tmp1, iRegL_R29 tmp2, iRegL_R30 tmp3, rFlagsReg cr)
+%{
+  predicate(!UseRVV && ((StrCompNode *)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (StrComp(Binary str1 cnt1)(Binary str2 cnt2)));
+  effect(KILL tmp1, KILL tmp2, KILL tmp3, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
+
+  format %{ "String Compare $str1, $cnt1, $str2, $cnt2 -> $result\t#@string_compareL" %}
+  ins_encode %{
+    __ string_compare($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                      $tmp1$$Register, $tmp2$$Register, $tmp3$$Register,
+                      StrIntrinsicNode::LL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_compareUL(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                          iRegI_R10 result, iRegP_R28 tmp1, iRegL_R29 tmp2, iRegL_R30 tmp3, rFlagsReg cr)
+%{
+  predicate(!UseRVV && ((StrCompNode *)n)->encoding() == StrIntrinsicNode::UL);
+  match(Set result (StrComp(Binary str1 cnt1)(Binary str2 cnt2)));
+  effect(KILL tmp1, KILL tmp2, KILL tmp3, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
+
+  format %{"String Compare $str1, $cnt1, $str2, $cnt2 -> $result\t#@string_compareUL" %}
+  ins_encode %{
+    __ string_compare($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                      $tmp1$$Register, $tmp2$$Register, $tmp3$$Register,
+                      StrIntrinsicNode::UL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_compareLU(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                          iRegI_R10 result, iRegP_R28 tmp1, iRegL_R29 tmp2, iRegL_R30 tmp3,
+                          rFlagsReg cr)
+%{
+  predicate(!UseRVV && ((StrCompNode *)n)->encoding() == StrIntrinsicNode::LU);
+  match(Set result (StrComp(Binary str1 cnt1)(Binary str2 cnt2)));
+  effect(KILL tmp1, KILL tmp2, KILL tmp3, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
+
+  format %{ "String Compare $str1, $cnt1, $str2, $cnt2 -> $result\t#@string_compareLU" %}
+  ins_encode %{
+    __ string_compare($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                      $tmp1$$Register, $tmp2$$Register, $tmp3$$Register,
+                      StrIntrinsicNode::LU);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexofUU(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                          iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3,
+                          iRegINoSp tmp4, iRegINoSp tmp5, iRegINoSp tmp6, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UU);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, TEMP_DEF result,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5, TEMP tmp6, KILL cr);
+
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result (UU)" %}
+  ins_encode %{
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      $tmp5$$Register, $tmp6$$Register,
+                      $result$$Register, StrIntrinsicNode::UU);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexofLL(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                          iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3,
+                          iRegINoSp tmp4, iRegINoSp tmp5, iRegINoSp tmp6, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, TEMP_DEF result,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5, TEMP tmp6, KILL cr);
+
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result (LL)" %}
+  ins_encode %{
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      $tmp5$$Register, $tmp6$$Register,
+                      $result$$Register, StrIntrinsicNode::LL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexofUL(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                          iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3,
+                          iRegINoSp tmp4, iRegINoSp tmp5, iRegINoSp tmp6, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UL);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, TEMP_DEF result,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5, TEMP tmp6, KILL cr);
+  format %{ "String IndexOf $str1,$cnt1,$str2,$cnt2 -> $result (UL)" %}
+
+  ins_encode %{
+    __ string_indexof($str1$$Register, $str2$$Register,
+                      $cnt1$$Register, $cnt2$$Register,
+                      $tmp1$$Register, $tmp2$$Register,
+                      $tmp3$$Register, $tmp4$$Register,
+                      $tmp5$$Register, $tmp6$$Register,
+                      $result$$Register, StrIntrinsicNode::UL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexof_conUU(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2,
+                              immI_le_4 int_cnt2, iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2,
+                              iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UU);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, TEMP_DEF result,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+
+  format %{ "String IndexOf $str1,$cnt1,$str2,$int_cnt2 -> $result (UU)" %}
+
+  ins_encode %{
+    int icnt2 = (int)$int_cnt2$$constant;
+    __ string_indexof_linearscan($str1$$Register, $str2$$Register,
+                                 $cnt1$$Register, zr,
+                                 $tmp1$$Register, $tmp2$$Register,
+                                 $tmp3$$Register, $tmp4$$Register,
+                                 icnt2, $result$$Register, StrIntrinsicNode::UU);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexof_conLL(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2,
+                              immI_le_4 int_cnt2, iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2,
+                              iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, TEMP_DEF result,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+
+  format %{ "String IndexOf $str1,$cnt1,$str2,$int_cnt2 -> $result (LL)" %}
+  ins_encode %{
+    int icnt2 = (int)$int_cnt2$$constant;
+    __ string_indexof_linearscan($str1$$Register, $str2$$Register,
+                                 $cnt1$$Register, zr,
+                                 $tmp1$$Register, $tmp2$$Register,
+                                 $tmp3$$Register, $tmp4$$Register,
+                                 icnt2, $result$$Register, StrIntrinsicNode::LL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_indexof_conUL(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2,
+                              immI_1 int_cnt2, iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2,
+                              iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr)
+%{
+  predicate(((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UL);
+  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt1, TEMP_DEF result,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+
+  format %{ "String IndexOf $str1,$cnt1,$str2,$int_cnt2 -> $result (UL)" %}
+  ins_encode %{
+    int icnt2 = (int)$int_cnt2$$constant;
+    __ string_indexof_linearscan($str1$$Register, $str2$$Register,
+                                 $cnt1$$Register, zr,
+                                 $tmp1$$Register, $tmp2$$Register,
+                                 $tmp3$$Register, $tmp4$$Register,
+                                 icnt2, $result$$Register, StrIntrinsicNode::UL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct stringU_indexof_char(iRegP_R11 str1, iRegI_R12 cnt1, iRegI_R13 ch,
+                              iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2,
+                              iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr)
+%{
+  match(Set result (StrIndexOfChar (Binary str1 cnt1) ch));
+  predicate(!UseRVV && (((StrIndexOfCharNode*)n)->encoding() == StrIntrinsicNode::U));
+  effect(USE_KILL str1, USE_KILL cnt1, USE_KILL ch, TEMP_DEF result,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+
+  format %{ "StringUTF16 IndexOf char[] $str1,$cnt1,$ch -> $result" %}
+  ins_encode %{
+    __ string_indexof_char($str1$$Register, $cnt1$$Register, $ch$$Register,
+                           $result$$Register, $tmp1$$Register, $tmp2$$Register,
+                           $tmp3$$Register, $tmp4$$Register, false /* isU */);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+
+instruct stringL_indexof_char(iRegP_R11 str1, iRegI_R12 cnt1, iRegI_R13 ch,
+                              iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2,
+                              iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr)
+%{
+  match(Set result (StrIndexOfChar (Binary str1 cnt1) ch));
+  predicate(!UseRVV && (((StrIndexOfCharNode*)n)->encoding() == StrIntrinsicNode::L));
+  effect(USE_KILL str1, USE_KILL cnt1, USE_KILL ch, TEMP_DEF result,
+         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);
+
+  format %{ "StringUTF16 IndexOf char[] $str1,$cnt1,$ch -> $result" %}
+  ins_encode %{
+    __ string_indexof_char($str1$$Register, $cnt1$$Register, $ch$$Register,
+                           $result$$Register, $tmp1$$Register, $tmp2$$Register,
+                           $tmp3$$Register, $tmp4$$Register, true /* isL */);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+// clearing of an array
+instruct clearArray_reg_reg(iRegL_R29 cnt, iRegP_R28 base, Universe dummy)
+%{
+  predicate(!UseRVV);
+  match(Set dummy (ClearArray cnt base));
+  effect(USE_KILL cnt, USE_KILL base);
+
+  ins_cost(4 * DEFAULT_COST);
+  format %{ "ClearArray $cnt, $base\t#@clearArray_reg_reg" %}
+
+  ins_encode %{
+    address tpc = __ zero_words($base$$Register, $cnt$$Register);
+    if (tpc == NULL) {
+      ciEnv::current()->record_failure("CodeCache is full");
+      return;
+    }
+  %}
+
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct clearArray_imm_reg(immL cnt, iRegP_R28 base, Universe dummy, rFlagsReg cr)
+%{
+  predicate(!UseRVV && (uint64_t)n->in(2)->get_long()
+            < (uint64_t)(BlockZeroingLowLimit >> LogBytesPerWord));
+  match(Set dummy (ClearArray cnt base));
+  effect(USE_KILL base, KILL cr);
+
+  ins_cost(4 * DEFAULT_COST);
+  format %{ "ClearArray $cnt, $base\t#@clearArray_imm_reg" %}
+
+  ins_encode %{
+    __ zero_words($base$$Register, (uint64_t)$cnt$$constant);
+  %}
+
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_equalsL(iRegP_R11 str1, iRegP_R13 str2, iRegI_R14 cnt,
+                        iRegI_R10 result, rFlagsReg cr)
+%{
+  predicate(!UseRVV && ((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (StrEquals (Binary str1 str2) cnt));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL cr);
+
+  format %{ "String Equals $str1, $str2, $cnt -> $result\t#@string_equalsL" %}
+  ins_encode %{
+    // Count is in 8-bit bytes; non-Compact chars are 16 bits.
+    __ string_equals($str1$$Register, $str2$$Register,
+                     $result$$Register, $cnt$$Register, 1);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct string_equalsU(iRegP_R11 str1, iRegP_R13 str2, iRegI_R14 cnt,
+                        iRegI_R10 result, rFlagsReg cr)
+%{
+  predicate(!UseRVV && ((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::UU);
+  match(Set result (StrEquals (Binary str1 str2) cnt));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL cr);
+
+  format %{ "String Equals $str1, $str2, $cnt -> $result\t#@string_equalsU" %}
+  ins_encode %{
+    // Count is in 8-bit bytes; non-Compact chars are 16 bits.
+    __ string_equals($str1$$Register, $str2$$Register,
+                     $result$$Register, $cnt$$Register, 2);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct array_equalsB(iRegP_R11 ary1, iRegP_R12 ary2, iRegI_R10 result,
+                       iRegP_R13 tmp1, iRegP_R14 tmp2, iRegP_R15 tmp3,
+                       iRegP_R16 tmp4, iRegP_R28 tmp5, rFlagsReg cr)
+%{
+  predicate(!UseRVV && ((AryEqNode*)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (AryEq ary1 ary2));
+  effect(USE_KILL ary1, USE_KILL ary2, TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL tmp5, KILL cr);
+
+  format %{ "Array Equals $ary1, ary2 -> $result\t#@array_equalsB // KILL $tmp5" %}
+  ins_encode %{
+    __ arrays_equals($ary1$$Register, $ary2$$Register,
+                     $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register,
+                     $result$$Register, $tmp5$$Register, 1);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct array_equalsC(iRegP_R11 ary1, iRegP_R12 ary2, iRegI_R10 result,
+                       iRegP_R13 tmp1, iRegP_R14 tmp2, iRegP_R15 tmp3,
+                       iRegP_R16 tmp4, iRegP_R28 tmp5, rFlagsReg cr)
+%{
+  predicate(!UseRVV && ((AryEqNode*)n)->encoding() == StrIntrinsicNode::UU);
+  match(Set result (AryEq ary1 ary2));
+  effect(USE_KILL ary1, USE_KILL ary2, TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL tmp5, KILL cr);
+
+  format %{ "Array Equals $ary1, ary2 -> $result\t#@array_equalsC // KILL $tmp5" %}
+  ins_encode %{
+    __ arrays_equals($ary1$$Register, $ary2$$Register,
+                     $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register,
+                     $result$$Register, $tmp5$$Register, 2);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+// ============================================================================
+// Safepoint Instructions
+
+instruct safePoint(iRegP poll)
+%{
+  match(SafePoint poll);
+
+  ins_cost(2 * LOAD_COST);
+  format %{
+    "lwu zr, [$poll]\t# Safepoint: poll for GC, #@safePoint"
+  %}
+  ins_encode %{
+    __ read_polling_page(as_Register($poll$$reg), 0, relocInfo::poll_type);
+  %}
+  ins_pipe(pipe_serial); // ins_pipe(iload_reg_mem);
+%}
+
+// ============================================================================
+// This name is KNOWN by the ADLC and cannot be changed.
+// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
+// for this guy.
+instruct tlsLoadP(javaThread_RegP dst)
+%{
+  match(Set dst (ThreadLocal));
+
+  ins_cost(0);
+
+  format %{ " -- \t// $dst=Thread::current(), empty, #@tlsLoadP" %}
+
+  size(0);
+
+  ins_encode( /*empty*/ );
+
+  ins_pipe(pipe_class_empty);
+%}
+
+// inlined locking and unlocking
+// using t1 as the 'flag' register to bridge the BoolNode producers and consumers
+instruct cmpFastLock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2)
+%{
+  match(Set cr (FastLock object box));
+  effect(TEMP tmp1, TEMP tmp2);
+
+  ins_cost(LOAD_COST * 2 + STORE_COST * 3 + ALU_COST * 6 + BRANCH_COST * 3);
+  format %{ "fastlock $object,$box\t! kills $tmp1,$tmp2, #@cmpFastLock" %}
+
+  ins_encode(riscv_enc_fast_lock(object, box, tmp1, tmp2));
+
+  ins_pipe(pipe_serial);
+%}
+
+// using t1 as the 'flag' register to bridge the BoolNode producers and consumers
+instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp1, iRegPNoSp tmp2)
+%{
+  match(Set cr (FastUnlock object box));
+  effect(TEMP tmp1, TEMP tmp2);
+
+  ins_cost(LOAD_COST * 2 + STORE_COST + ALU_COST * 2 + BRANCH_COST * 4);
+  format %{ "fastunlock $object,$box\t! kills $tmp1, $tmp2, #@cmpFastUnlock" %}
+
+  ins_encode(riscv_enc_fast_unlock(object, box, tmp1, tmp2));
+
+  ins_pipe(pipe_serial);
+%}
+
+// Tail Call; Jump from runtime stub to Java code.
+// Also known as an 'interprocedural jump'.
+// Target of jump will eventually return to caller.
+// TailJump below removes the return address.
+instruct TailCalljmpInd(iRegPNoSp jump_target, inline_cache_RegP method_oop)
+%{
+  match(TailCall jump_target method_oop);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "jalr $jump_target\t# $method_oop holds method oop, #@TailCalljmpInd." %}
+
+  ins_encode(riscv_enc_tail_call(jump_target));
+
+  ins_pipe(pipe_class_call);
+%}
+
+instruct TailjmpInd(iRegPNoSp jump_target, iRegP_R10 ex_oop)
+%{
+  match(TailJump jump_target ex_oop);
+
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{ "jalr $jump_target\t# $ex_oop holds exception oop, #@TailjmpInd." %}
+
+  ins_encode(riscv_enc_tail_jmp(jump_target));
+
+  ins_pipe(pipe_class_call);
+%}
+
+// Create exception oop: created by stack-crawling runtime code.
+// Created exception is now available to this handler, and is setup
+// just prior to jumping to this handler. No code emitted.
+instruct CreateException(iRegP_R10 ex_oop)
+%{
+  match(Set ex_oop (CreateEx));
+
+  ins_cost(0);
+  format %{ " -- \t// exception oop; no code emitted, #@CreateException" %}
+
+  size(0);
+
+  ins_encode( /*empty*/ );
+
+  ins_pipe(pipe_class_empty);
+%}
+
+// Rethrow exception: The exception oop will come in the first
+// argument position. Then JUMP (not call) to the rethrow stub code.
+instruct RethrowException()
+%{
+  match(Rethrow);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "j rethrow_stub\t#@RethrowException" %}
+
+  ins_encode(riscv_enc_rethrow());
+
+  ins_pipe(pipe_class_call);
+%}
+
+// Return Instruction
+// epilog node loads ret address into ra as part of frame pop
+instruct Ret()
+%{
+  match(Return);
+
+  ins_cost(BRANCH_COST);
+  format %{ "ret\t// return register, #@Ret" %}
+
+  ins_encode(riscv_enc_ret());
+
+  ins_pipe(pipe_branch);
+%}
+
+// Die now.
+instruct ShouldNotReachHere() %{
+  match(Halt);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "#@ShouldNotReachHere" %}
+
+  ins_encode %{
+    Assembler::CompressibleRegion cr(&_masm);
+    if (is_reachable()) {
+      __ halt();
+    }
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+
+//----------PEEPHOLE RULES-----------------------------------------------------
+// These must follow all instruction definitions as they use the names
+// defined in the instructions definitions.
+//
+// peepmatch ( root_instr_name [preceding_instruction]* );
+//
+// peepconstraint %{
+// (instruction_number.operand_name relational_op instruction_number.operand_name
+//  [, ...] );
+// // instruction numbers are zero-based using left to right order in peepmatch
+//
+// peepreplace ( instr_name  ( [instruction_number.operand_name]* ) );
+// // provide an instruction_number.operand_name for each operand that appears
+// // in the replacement instruction's match rule
+//
+// ---------VM FLAGS---------------------------------------------------------
+//
+// All peephole optimizations can be turned off using -XX:-OptoPeephole
+//
+// Each peephole rule is given an identifying number starting with zero and
+// increasing by one in the order seen by the parser.  An individual peephole
+// can be enabled, and all others disabled, by using -XX:OptoPeepholeAt=#
+// on the command-line.
+//
+// ---------CURRENT LIMITATIONS----------------------------------------------
+//
+// Only match adjacent instructions in same basic block
+// Only equality constraints
+// Only constraints between operands, not (0.dest_reg == RAX_enc)
+// Only one replacement instruction
+//
+//----------SMARTSPILL RULES---------------------------------------------------
+// These must follow all instruction definitions as they use the names
+// defined in the instructions definitions.
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/src/hotspot/cpu/riscv/riscv_b.ad b/src/hotspot/cpu/riscv/riscv_b.ad
new file mode 100644
index 00000000000..4488c1c4031
--- /dev/null
+++ b/src/hotspot/cpu/riscv/riscv_b.ad
@@ -0,0 +1,527 @@
+//
+// Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2022, Huawei Technologies Co., Ltd. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+//
+
+// RISCV Bit-Manipulation Extension Architecture Description File
+
+instruct rorI_imm_rvb(iRegINoSp dst, iRegI src, immI shift) %{
+  predicate(UseRVB);
+  match(Set dst (RotateRight src shift));
+
+  format %{ "roriw  $dst, $src, ($shift & 0x1f)\t#@rorI_imm_rvb" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ roriw(as_Register($dst$$reg), as_Register($src$$reg), $shift$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+instruct rorL_imm_rvb(iRegLNoSp dst, iRegL src, immI shift) %{
+  predicate(UseRVB);
+  match(Set dst (RotateRight src shift));
+
+  format %{ "rori  $dst, $src, ($shift & 0x3f)\t#@rorL_imm_rvb" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ rori(as_Register($dst$$reg), as_Register($src$$reg), $shift$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+instruct rorI_reg_rvb(iRegINoSp dst, iRegI src, iRegI shift) %{
+  predicate(UseRVB);
+  match(Set dst (RotateRight src shift));
+
+  format %{ "rorw  $dst, $src, $shift\t#@rorI_reg_rvb" %}
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ rorw(as_Register($dst$$reg), as_Register($src$$reg), as_Register($shift$$reg));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct rorL_reg_rvb(iRegLNoSp dst, iRegL src, iRegI shift) %{
+  predicate(UseRVB);
+  match(Set dst (RotateRight src shift));
+
+  format %{ "ror  $dst, $src, $shift\t#@rorL_reg_rvb" %}
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ ror(as_Register($dst$$reg), as_Register($src$$reg), as_Register($shift$$reg));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct rolI_reg_rvb(iRegINoSp dst, iRegI src, iRegI shift) %{
+  predicate(UseRVB);
+  match(Set dst (RotateLeft src shift));
+
+  format %{ "rolw  $dst, $src, $shift\t#@rolI_reg_rvb" %}
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ rolw(as_Register($dst$$reg), as_Register($src$$reg), as_Register($shift$$reg));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct rolL_reg_rvb(iRegLNoSp dst, iRegL src, iRegI shift) %{
+  predicate(UseRVB);
+  match(Set dst (RotateLeft src shift));
+
+  format %{ "rol  $dst, $src, $shift\t#@rolL_reg_rvb" %}
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ rol(as_Register($dst$$reg), as_Register($src$$reg), as_Register($shift$$reg));
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Convert oop into int for vectors alignment masking
+instruct convP2I_rvb(iRegINoSp dst, iRegP src) %{
+  predicate(UseRVB);
+  match(Set dst (ConvL2I (CastP2X src)));
+
+  format %{ "zext.w  $dst, $src\t# ptr -> int @convP2I_rvb" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ zext_w(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// byte to int
+instruct convB2I_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_24 lshift, immI_24 rshift) %{
+  predicate(UseRVB);
+  match(Set dst (RShiftI (LShiftI src lshift) rshift));
+
+  format %{ "sext.b  $dst, $src\t# b2i, #@convB2I_reg_reg_rvb" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ sext_b(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// int to short
+instruct convI2S_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_16 lshift, immI_16 rshift) %{
+  predicate(UseRVB);
+  match(Set dst (RShiftI (LShiftI src lshift) rshift));
+
+  format %{ "sext.h  $dst, $src\t# i2s, #@convI2S_reg_reg_rvb" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ sext_h(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// short to unsigned int
+instruct convS2UI_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_16bits mask) %{
+  predicate(UseRVB);
+  match(Set dst (AndI src mask));
+
+  format %{ "zext.h  $dst, $src\t# s2ui, #@convS2UI_reg_reg_rvb" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ zext_h(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// int to unsigned long (zero extend)
+instruct convI2UL_reg_reg_rvb(iRegLNoSp dst, iRegIorL2I src, immL_32bits mask) %{
+  predicate(UseRVB);
+  match(Set dst (AndL (ConvI2L src) mask));
+
+  format %{ "zext.w  $dst, $src\t# i2ul, #@convI2UL_reg_reg_rvb" %}
+
+  ins_cost(ALU_COST);
+  ins_encode %{
+    __ zext_w(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg_shift);
+%}
+
+// BSWAP instructions
+instruct bytes_reverse_int_rvb(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseRVB);
+  match(Set dst (ReverseBytesI src));
+
+  ins_cost(ALU_COST * 2);
+  format %{ "revb_w_w  $dst, $src\t#@bytes_reverse_int_rvb" %}
+
+  ins_encode %{
+    __ revb_w_w(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct bytes_reverse_long_rvb(iRegLNoSp dst, iRegL src) %{
+  predicate(UseRVB);
+  match(Set dst (ReverseBytesL src));
+
+  ins_cost(ALU_COST);
+  format %{ "rev8  $dst, $src\t#@bytes_reverse_long_rvb" %}
+
+  ins_encode %{
+    __ rev8(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct bytes_reverse_unsigned_short_rvb(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseRVB);
+  match(Set dst (ReverseBytesUS src));
+
+  ins_cost(ALU_COST * 2);
+  format %{ "revb_h_h_u  $dst, $src\t#@bytes_reverse_unsigned_short_rvb" %}
+
+  ins_encode %{
+    __ revb_h_h_u(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct bytes_reverse_short_rvb(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseRVB);
+  match(Set dst (ReverseBytesS src));
+
+  ins_cost(ALU_COST * 2);
+  format %{ "revb_h_h  $dst, $src\t#@bytes_reverse_short_rvb" %}
+
+  ins_encode %{
+    __ revb_h_h(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// Shift Add Pointer
+instruct shaddP_reg_reg_rvb(iRegPNoSp dst, iRegP src1, iRegL src2, immIScale imm) %{
+  predicate(UseRVB);
+  match(Set dst (AddP src1 (LShiftL src2 imm)));
+
+  ins_cost(ALU_COST);
+  format %{ "shadd  $dst, $src2, $src1, $imm\t# ptr, #@shaddP_reg_reg_rvb" %}
+
+  ins_encode %{
+    __ shadd(as_Register($dst$$reg),
+             as_Register($src2$$reg),
+             as_Register($src1$$reg),
+             t0,
+             $imm$$constant);
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct shaddP_reg_reg_ext_rvb(iRegPNoSp dst, iRegP src1, iRegI src2, immIScale imm) %{
+  predicate(UseRVB);
+  match(Set dst (AddP src1 (LShiftL (ConvI2L src2) imm)));
+
+  ins_cost(ALU_COST);
+  format %{ "shadd  $dst, $src2, $src1, $imm\t# ptr, #@shaddP_reg_reg_ext_rvb" %}
+
+  ins_encode %{
+    __ shadd(as_Register($dst$$reg),
+             as_Register($src2$$reg),
+             as_Register($src1$$reg),
+             t0,
+             $imm$$constant);
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Shift Add Long
+instruct shaddL_reg_reg_rvb(iRegLNoSp dst, iRegL src1, iRegL src2, immIScale imm) %{
+  predicate(UseRVB);
+  match(Set dst (AddL src1 (LShiftL src2 imm)));
+
+  ins_cost(ALU_COST);
+  format %{ "shadd  $dst, $src2, $src1, $imm\t#@shaddL_reg_reg_rvb" %}
+
+  ins_encode %{
+    __ shadd(as_Register($dst$$reg),
+             as_Register($src2$$reg),
+             as_Register($src1$$reg),
+             t0,
+             $imm$$constant);
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct shaddL_reg_reg_ext_rvb(iRegLNoSp dst, iRegL src1, iRegI src2, immIScale imm) %{
+  predicate(UseRVB);
+  match(Set dst (AddL src1 (LShiftL (ConvI2L src2) imm)));
+
+  ins_cost(ALU_COST);
+  format %{ "shadd  $dst, $src2, $src1, $imm\t#@shaddL_reg_reg_ext_rvb" %}
+
+  ins_encode %{
+    __ shadd(as_Register($dst$$reg),
+             as_Register($src2$$reg),
+             as_Register($src1$$reg),
+             t0,
+             $imm$$constant);
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Zeros Count instructions
+instruct countLeadingZerosI_rvb(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseRVB);
+  match(Set dst (CountLeadingZerosI src));
+
+  ins_cost(ALU_COST);
+  format %{ "clzw  $dst, $src\t#@countLeadingZerosI_rvb" %}
+
+  ins_encode %{
+    __ clzw(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct countLeadingZerosL_rvb(iRegINoSp dst, iRegL src) %{
+  predicate(UseRVB);
+  match(Set dst (CountLeadingZerosL src));
+
+  ins_cost(ALU_COST);
+  format %{ "clz  $dst, $src\t#@countLeadingZerosL_rvb" %}
+
+  ins_encode %{
+    __ clz(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct countTrailingZerosI_rvb(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseRVB);
+  match(Set dst (CountTrailingZerosI src));
+
+  ins_cost(ALU_COST);
+  format %{ "ctzw  $dst, $src\t#@countTrailingZerosI_rvb" %}
+
+  ins_encode %{
+    __ ctzw(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+instruct countTrailingZerosL_rvb(iRegINoSp dst, iRegL src) %{
+  predicate(UseRVB);
+  match(Set dst (CountTrailingZerosL src));
+
+  ins_cost(ALU_COST);
+  format %{ "ctz  $dst, $src\t#@countTrailingZerosL_rvb" %}
+
+  ins_encode %{
+    __ ctz(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// Population Count instructions
+instruct popCountI_rvb(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UsePopCountInstruction);
+  match(Set dst (PopCountI src));
+
+  ins_cost(ALU_COST);
+  format %{ "cpopw  $dst, $src\t#@popCountI_rvb" %}
+
+  ins_encode %{
+    __ cpopw(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// Note: Long/bitCount(long) returns an int.
+instruct popCountL_rvb(iRegINoSp dst, iRegL src) %{
+  predicate(UsePopCountInstruction);
+  match(Set dst (PopCountL src));
+
+  ins_cost(ALU_COST);
+  format %{ "cpop  $dst, $src\t#@popCountL_rvb" %}
+
+  ins_encode %{
+    __ cpop(as_Register($dst$$reg), as_Register($src$$reg));
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// Max and Min
+instruct minI_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2) %{
+  predicate(UseRVB);
+  match(Set dst (MinI src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "min  $dst, $src1, $src2\t#@minI_reg_rvb" %}
+
+  ins_encode %{
+    __ min(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct maxI_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2) %{
+  predicate(UseRVB);
+  match(Set dst (MaxI src1 src2));
+
+  ins_cost(ALU_COST);
+  format %{ "max  $dst, $src1, $src2\t#@maxI_reg_rvb" %}
+
+  ins_encode %{
+    __ max(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Abs
+instruct absI_reg_rvb(iRegINoSp dst, iRegI src) %{
+  predicate(UseRVB);
+  match(Set dst (AbsI src));
+
+  ins_cost(ALU_COST * 2);
+  format %{
+    "negw  t0, $src\n\t"
+    "max  $dst, $src, t0\t#@absI_reg_rvb"
+  %}
+
+  ins_encode %{
+    __ negw(t0, as_Register($src$$reg));
+    __ max(as_Register($dst$$reg), as_Register($src$$reg), t0);
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct absL_reg_rvb(iRegLNoSp dst, iRegL src) %{
+  predicate(UseRVB);
+  match(Set dst (AbsL src));
+
+  ins_cost(ALU_COST * 2);
+  format %{
+    "neg  t0, $src\n\t"
+    "max $dst, $src, t0\t#@absL_reg_rvb"
+  %}
+
+  ins_encode %{
+    __ neg(t0, as_Register($src$$reg));
+    __ max(as_Register($dst$$reg), as_Register($src$$reg), t0);
+  %}
+
+  ins_pipe(ialu_reg);
+%}
+
+// And Not
+instruct andnI_reg_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2, immI_M1 m1) %{
+  predicate(UseRVB);
+  match(Set dst (AndI src1 (XorI src2 m1)));
+
+  ins_cost(ALU_COST);
+  format %{ "andn  $dst, $src1, $src2\t#@andnI_reg_reg_rvb" %}
+
+  ins_encode %{
+    __ andn(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct andnL_reg_reg_rvb(iRegLNoSp dst, iRegL src1, iRegL src2, immL_M1 m1) %{
+  predicate(UseRVB);
+  match(Set dst (AndL src1 (XorL src2 m1)));
+
+  ins_cost(ALU_COST);
+  format %{ "andn  $dst, $src1, $src2\t#@andnL_reg_reg_rvb" %}
+
+  ins_encode %{
+    __ andn(as_Register($dst$$reg),
+            as_Register($src1$$reg),
+            as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+// Or Not
+instruct ornI_reg_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2, immI_M1 m1) %{
+  predicate(UseRVB);
+  match(Set dst (OrI src1 (XorI src2 m1)));
+
+  ins_cost(ALU_COST);
+  format %{ "orn  $dst, $src1, $src2\t#@ornI_reg_reg_rvb" %}
+
+  ins_encode %{
+    __ orn(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct ornL_reg_reg_rvb(iRegLNoSp dst, iRegL src1, iRegL src2, immL_M1 m1) %{
+  predicate(UseRVB);
+  match(Set dst (OrL src1 (XorL src2 m1)));
+
+  ins_cost(ALU_COST);
+  format %{ "orn  $dst, $src1, $src2\t#@ornL_reg_reg_rvb" %}
+
+  ins_encode %{
+    __ orn(as_Register($dst$$reg),
+           as_Register($src1$$reg),
+           as_Register($src2$$reg));
+  %}
+
+  ins_pipe(ialu_reg_reg);
+%}
\ No newline at end of file
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
new file mode 100644
index 00000000000..3828e096b21
--- /dev/null
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -0,0 +1,2065 @@
+//
+// Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 2 only, as
+// published by the Free Software Foundation.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+//
+
+// RISCV Vector Extension Architecture Description File
+
+opclass vmemA(indirect);
+
+source_hpp %{
+  bool op_vec_supported(int opcode);
+%}
+
+source %{
+
+  static void loadStore(C2_MacroAssembler masm, bool is_store,
+                        VectorRegister reg, BasicType bt, Register base) {
+    Assembler::SEW sew = Assembler::elemtype_to_sew(bt);
+    masm.vsetvli(t0, x0, sew);
+    if (is_store) {
+      masm.vsex_v(reg, base, sew);
+    } else {
+      masm.vlex_v(reg, base, sew);
+    }
+  }
+
+  bool op_vec_supported(int opcode) {
+    switch (opcode) {
+      // No multiply reduction instructions
+      case Op_MulReductionVD:
+      case Op_MulReductionVF:
+      case Op_MulReductionVI:
+      case Op_MulReductionVL:
+      // Others
+      case Op_Extract:
+      case Op_ExtractB:
+      case Op_ExtractC:
+      case Op_ExtractD:
+      case Op_ExtractF:
+      case Op_ExtractI:
+      case Op_ExtractL:
+      case Op_ExtractS:
+      case Op_ExtractUB:
+      // Vector API specific
+      case Op_AndReductionV:
+      case Op_OrReductionV:
+      case Op_XorReductionV:
+      case Op_LoadVectorGather:
+      case Op_StoreVectorScatter:
+      case Op_VectorBlend:
+      case Op_VectorCast:
+      case Op_VectorCastB2X:
+      case Op_VectorCastD2X:
+      case Op_VectorCastF2X:
+      case Op_VectorCastI2X:
+      case Op_VectorCastL2X:
+      case Op_VectorCastS2X:
+      case Op_VectorInsert:
+      case Op_VectorLoadConst:
+      case Op_VectorLoadMask:
+      case Op_VectorLoadShuffle:
+      case Op_VectorMaskCmp:
+      case Op_VectorRearrange:
+      case Op_VectorReinterpret:
+      case Op_VectorStoreMask:
+      case Op_VectorTest:
+        return false;
+      default:
+        return UseRVV;
+    }
+  }
+
+%}
+
+definitions %{
+  int_def VEC_COST             (200, 200);
+%}
+
+// All VEC instructions
+
+// vector load/store
+instruct loadV(vReg dst, vmemA mem) %{
+  match(Set dst (LoadVector mem));
+  ins_cost(VEC_COST);
+  format %{ "vle $dst, $mem\t#@loadV" %}
+  ins_encode %{
+    VectorRegister dst_reg = as_VectorRegister($dst$$reg);
+    loadStore(C2_MacroAssembler(&cbuf), false, dst_reg,
+              Matcher::vector_element_basic_type(this), as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct storeV(vReg src, vmemA mem) %{
+  match(Set mem (StoreVector mem src));
+  ins_cost(VEC_COST);
+  format %{ "vse $src, $mem\t#@storeV" %}
+  ins_encode %{
+    VectorRegister src_reg = as_VectorRegister($src$$reg);
+    loadStore(C2_MacroAssembler(&cbuf), true, src_reg,
+              Matcher::vector_element_basic_type(this, $src), as_Register($mem$$base));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector abs
+
+instruct vabsB(vReg dst, vReg src, vReg tmp) %{
+  match(Set dst (AbsVB src));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vrsub.vi $tmp, 0, $src\t#@vabsB\n\t"
+            "vmax.vv $dst, $tmp, $src" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vrsub_vi(as_VectorRegister($tmp$$reg), 0, as_VectorRegister($src$$reg));
+    __ vmax_vv(as_VectorRegister($dst$$reg), as_VectorRegister($tmp$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vabsS(vReg dst, vReg src, vReg tmp) %{
+  match(Set dst (AbsVS src));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vrsub.vi $tmp, 0, $src\t#@vabsS\n\t"
+            "vmax.vv $dst, $tmp, $src" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vrsub_vi(as_VectorRegister($tmp$$reg), 0, as_VectorRegister($src$$reg));
+    __ vmax_vv(as_VectorRegister($dst$$reg), as_VectorRegister($tmp$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vabsI(vReg dst, vReg src, vReg tmp) %{
+  match(Set dst (AbsVI src));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vrsub.vi $tmp, 0, $src\t#@vabsI\n\t"
+            "vmax.vv $dst, $tmp, $src" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vrsub_vi(as_VectorRegister($tmp$$reg), 0, as_VectorRegister($src$$reg));
+    __ vmax_vv(as_VectorRegister($dst$$reg), as_VectorRegister($tmp$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vabsL(vReg dst, vReg src, vReg tmp) %{
+  match(Set dst (AbsVL src));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vrsub.vi $tmp, 0, $src\t#@vabsL\n\t"
+            "vmax.vv $dst, $tmp, $src" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vrsub_vi(as_VectorRegister($tmp$$reg), 0, as_VectorRegister($src$$reg));
+    __ vmax_vv(as_VectorRegister($dst$$reg), as_VectorRegister($tmp$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vabsF(vReg dst, vReg src) %{
+  match(Set dst (AbsVF src));
+  ins_cost(VEC_COST);
+  format %{ "vfsgnjx.vv $dst, $src, $src, vm\t#@vabsF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfsgnjx_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vabsD(vReg dst, vReg src) %{
+  match(Set dst (AbsVD src));
+  ins_cost(VEC_COST);
+  format %{ "vfsgnjx.vv $dst, $src, $src, vm\t#@vabsD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfsgnjx_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector add
+
+instruct vaddB(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AddVB src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vadd.vv $dst, $src1, $src2\t#@vaddB" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vadd_vv(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vaddS(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AddVS src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vadd.vv $dst, $src1, $src2\t#@vaddS" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vadd_vv(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vaddI(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AddVI src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vadd.vv $dst, $src1, $src2\t#@vaddI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vadd_vv(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vaddL(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AddVL src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vadd.vv $dst, $src1, $src2\t#@vaddL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vadd_vv(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vaddF(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AddVF src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vfadd.vv $dst, $src1, $src2\t#@vaddF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfadd_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vaddD(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AddVD src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vfadd.vv $dst, $src1, $src2\t#@vaddD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfadd_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector and
+
+instruct vand(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AndV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vand.vv  $dst, $src1, $src2\t#@vand" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vand_vv(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector or
+
+instruct vor(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (OrV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vor.vv  $dst, $src1, $src2\t#@vor" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vor_vv(as_VectorRegister($dst$$reg),
+              as_VectorRegister($src1$$reg),
+              as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector xor
+
+instruct vxor(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (XorV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vxor.vv  $dst, $src1, $src2\t#@vxor" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vxor_vv(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector float div
+
+instruct vdivF(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (DivVF src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vfdiv.vv  $dst, $src1, $src2\t#@vdivF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfdiv_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vdivD(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (DivVD src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vfdiv.vv  $dst, $src1, $src2\t#@vdivD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfdiv_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector integer max/min
+
+instruct vmax(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() != T_FLOAT &&
+            n->bottom_type()->is_vect()->element_basic_type() != T_DOUBLE);
+  match(Set dst (MaxV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vmax.vv $dst, $src1, $src2\t#@vmax" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    Assembler::SEW sew = Assembler::elemtype_to_sew(bt);
+    __ vsetvli(t0, x0, sew);
+    __ vmax_vv(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmin(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() != T_FLOAT &&
+            n->bottom_type()->is_vect()->element_basic_type() != T_DOUBLE);
+  match(Set dst (MinV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vmin.vv $dst, $src1, $src2\t#@vmin" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    Assembler::SEW sew = Assembler::elemtype_to_sew(bt);
+    __ vsetvli(t0, x0, sew);
+    __ vmin_vv(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector float-point max/min
+
+instruct vmaxF(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+  match(Set dst (MaxV src1 src2));
+  effect(TEMP_DEF dst);
+  ins_cost(VEC_COST);
+  format %{ "vmaxF $dst, $src1, $src2\t#@vmaxF" %}
+  ins_encode %{
+    __ minmax_FD_v(as_VectorRegister($dst$$reg),
+                   as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg),
+                   false /* is_double */, false /* is_min */);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmaxD(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+  match(Set dst (MaxV src1 src2));
+  effect(TEMP_DEF dst);
+  ins_cost(VEC_COST);
+  format %{ "vmaxD $dst, $src1, $src2\t#@vmaxD" %}
+  ins_encode %{
+    __ minmax_FD_v(as_VectorRegister($dst$$reg),
+                   as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg),
+                   true /* is_double */, false /* is_min */);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vminF(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+  match(Set dst (MinV src1 src2));
+  effect(TEMP_DEF dst);
+  ins_cost(VEC_COST);
+  format %{ "vminF $dst, $src1, $src2\t#@vminF" %}
+  ins_encode %{
+    __ minmax_FD_v(as_VectorRegister($dst$$reg),
+                   as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg),
+                   false /* is_double */, true /* is_min */);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vminD(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+  match(Set dst (MinV src1 src2));
+  effect(TEMP_DEF dst);
+  ins_cost(VEC_COST);
+  format %{ "vminD $dst, $src1, $src2\t#@vminD" %}
+  ins_encode %{
+    __ minmax_FD_v(as_VectorRegister($dst$$reg),
+                   as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg),
+                   true /* is_double */, true /* is_min */);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector fmla
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vfmlaF(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA);
+  match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vfmacc.vv $dst_src1, $src2, $src3\t#@vfmlaF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfmacc_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vfmlaD(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA);
+  match(Set dst_src1 (FmaVD dst_src1 (Binary src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vfmacc.vv $dst_src1, $src2, $src3\t#@vfmlaD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfmacc_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector fmls
+
+// dst_src1 = dst_src1 + -src2 * src3
+// dst_src1 = dst_src1 + src2 * -src3
+instruct vfmlsF(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA);
+  match(Set dst_src1 (FmaVF dst_src1 (Binary (NegVF src2) src3)));
+  match(Set dst_src1 (FmaVF dst_src1 (Binary src2 (NegVF src3))));
+  ins_cost(VEC_COST);
+  format %{ "vfnmsac.vv $dst_src1, $src2, $src3\t#@vfmlsF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfnmsac_vv(as_VectorRegister($dst_src1$$reg),
+                  as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + -src2 * src3
+// dst_src1 = dst_src1 + src2 * -src3
+instruct vfmlsD(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA);
+  match(Set dst_src1 (FmaVD dst_src1 (Binary (NegVD src2) src3)));
+  match(Set dst_src1 (FmaVD dst_src1 (Binary src2 (NegVD src3))));
+  ins_cost(VEC_COST);
+  format %{ "vfnmsac.vv $dst_src1, $src2, $src3\t#@vfmlsD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfnmsac_vv(as_VectorRegister($dst_src1$$reg),
+                  as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector fnmla
+
+// dst_src1 = -dst_src1 + -src2 * src3
+// dst_src1 = -dst_src1 + src2 * -src3
+instruct vfnmlaF(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA);
+  match(Set dst_src1 (FmaVF (NegVF dst_src1) (Binary (NegVF src2) src3)));
+  match(Set dst_src1 (FmaVF (NegVF dst_src1) (Binary src2 (NegVF src3))));
+  ins_cost(VEC_COST);
+  format %{ "vfnmacc.vv $dst_src1, $src2, $src3\t#@vfnmlaF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfnmacc_vv(as_VectorRegister($dst_src1$$reg),
+                  as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = -dst_src1 + -src2 * src3
+// dst_src1 = -dst_src1 + src2 * -src3
+instruct vfnmlaD(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA);
+  match(Set dst_src1 (FmaVD (NegVD dst_src1) (Binary (NegVD src2) src3)));
+  match(Set dst_src1 (FmaVD (NegVD dst_src1) (Binary src2 (NegVD src3))));
+  ins_cost(VEC_COST);
+  format %{ "vfnmacc.vv $dst_src1, $src2, $src3\t#@vfnmlaD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfnmacc_vv(as_VectorRegister($dst_src1$$reg),
+                  as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector fnmls
+
+// dst_src1 = -dst_src1 + src2 * src3
+instruct vfnmlsF(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA);
+  match(Set dst_src1 (FmaVF (NegVF dst_src1) (Binary src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vfmsac.vv $dst_src1, $src2, $src3\t#@vfnmlsF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfmsac_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = -dst_src1 + src2 * src3
+instruct vfnmlsD(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA);
+  match(Set dst_src1 (FmaVD (NegVD dst_src1) (Binary src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vfmsac.vv $dst_src1, $src2, $src3\t#@vfnmlsD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfmsac_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector mla
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmlaB(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (AddVB dst_src1 (MulVB src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vmacc.vv $dst_src1, src2, src3\t#@vmlaB" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vmacc_vv(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmlaS(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (AddVS dst_src1 (MulVS src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vmacc.vv $dst_src1, src2, src3\t#@vmlaS" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vmacc_vv(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmlaI(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (AddVI dst_src1 (MulVI src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vmacc.vv $dst_src1, src2, src3\t#@vmlaI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vmacc_vv(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmlaL(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (AddVL dst_src1 (MulVL src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vmacc.vv $dst_src1, src2, src3\t#@vmlaL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vmacc_vv(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector mls
+
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmlsB(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (SubVB dst_src1 (MulVB src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vnmsac.vv $dst_src1, src2, src3\t#@vmlsB" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vnmsac_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmlsS(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (SubVS dst_src1 (MulVS src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vnmsac.vv $dst_src1, src2, src3\t#@vmlsS" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vnmsac_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmlsI(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (SubVI dst_src1 (MulVI src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vnmsac.vv $dst_src1, src2, src3\t#@vmlsI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vnmsac_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmlsL(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (SubVL dst_src1 (MulVL src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vnmsac.vv $dst_src1, src2, src3\t#@vmlsL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vnmsac_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector mul
+
+instruct vmulB(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (MulVB src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vmul.vv $dst, $src1, $src2\t#@vmulB" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vmul_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmulS(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (MulVS src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vmul.vv $dst, $src1, $src2\t#@vmulS" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vmul_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmulI(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (MulVI src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vmul.vv $dst, $src1, $src2\t#@vmulI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vmul_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmulL(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (MulVL src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vmul.vv $dst, $src1, $src2\t#@vmulL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vmul_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmulF(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (MulVF src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vfmul.vv $dst, $src1, $src2\t#@vmulF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfmul_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmulD(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (MulVD src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vfmul.vv $dst, $src1, $src2\t#@vmulD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfmul_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector fneg
+
+instruct vnegF(vReg dst, vReg src) %{
+  match(Set dst (NegVF src));
+  ins_cost(VEC_COST);
+  format %{ "vfsgnjn.vv $dst, $src, $src\t#@vnegF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfneg_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vnegD(vReg dst, vReg src) %{
+  match(Set dst (NegVD src));
+  ins_cost(VEC_COST);
+  format %{ "vfsgnjn.vv $dst, $src, $src\t#@vnegD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfneg_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// popcount vector
+
+instruct vpopcountI(iRegINoSp dst, vReg src) %{
+  match(Set dst (PopCountVI src));
+  format %{ "vpopc.m $dst, $src\t#@vpopcountI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vpopc_m(as_Register($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector add reduction
+
+instruct reduce_addB(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
+  match(Set dst (AddReductionVI src1 src2));
+  effect(TEMP tmp);
+  ins_cost(VEC_COST);
+  format %{ "vmv.s.x $tmp, $src1\t#@reduce_addB\n\t"
+            "vredsum.vs $tmp, $src2, $tmp\n\t"
+            "vmv.x.s  $dst, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vmv_s_x(as_VectorRegister($tmp$$reg), $src1$$Register);
+    __ vredsum_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg),
+                  as_VectorRegister($tmp$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_addS(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
+  match(Set dst (AddReductionVI src1 src2));
+  effect(TEMP tmp);
+  ins_cost(VEC_COST);
+  format %{ "vmv.s.x $tmp, $src1\t#@reduce_addS\n\t"
+            "vredsum.vs $tmp, $src2, $tmp\n\t"
+            "vmv.x.s  $dst, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vmv_s_x(as_VectorRegister($tmp$$reg), $src1$$Register);
+    __ vredsum_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg),
+                  as_VectorRegister($tmp$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_addI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_INT);
+  match(Set dst (AddReductionVI src1 src2));
+  effect(TEMP tmp);
+  ins_cost(VEC_COST);
+  format %{ "vmv.s.x $tmp, $src1\t#@reduce_addI\n\t"
+            "vredsum.vs $tmp, $src2, $tmp\n\t"
+            "vmv.x.s  $dst, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vmv_s_x(as_VectorRegister($tmp$$reg), $src1$$Register);
+    __ vredsum_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg),
+                  as_VectorRegister($tmp$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_addL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
+  match(Set dst (AddReductionVL src1 src2));
+  effect(TEMP tmp);
+  ins_cost(VEC_COST);
+  format %{ "vmv.s.x $tmp, $src1\t#@reduce_addL\n\t"
+            "vredsum.vs $tmp, $src2, $tmp\n\t"
+            "vmv.x.s  $dst, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vmv_s_x(as_VectorRegister($tmp$$reg), $src1$$Register);
+    __ vredsum_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg),
+                  as_VectorRegister($tmp$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_addF(fRegF src1_dst, vReg src2, vReg tmp) %{
+  match(Set src1_dst (AddReductionVF src1_dst src2));
+  effect(TEMP tmp);
+  ins_cost(VEC_COST);
+  format %{ "vfmv.s.f $tmp, $src1_dst\t#@reduce_addF\n\t"
+            "vfredosum.vs $tmp, $src2, $tmp\n\t"
+            "vfmv.f.s $src1_dst, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfmv_s_f(as_VectorRegister($tmp$$reg), $src1_dst$$FloatRegister);
+    __ vfredosum_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg),
+                    as_VectorRegister($tmp$$reg));
+    __ vfmv_f_s($src1_dst$$FloatRegister, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_addD(fRegD src1_dst, vReg src2, vReg tmp) %{
+  match(Set src1_dst (AddReductionVD src1_dst src2));
+  effect(TEMP tmp);
+  ins_cost(VEC_COST);
+  format %{ "vfmv.s.f $tmp, $src1_dst\t#@reduce_addD\n\t"
+            "vfredosum.vs $tmp, $src2, $tmp\n\t"
+            "vfmv.f.s $src1_dst, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfmv_s_f(as_VectorRegister($tmp$$reg), $src1_dst$$FloatRegister);
+    __ vfredosum_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg),
+                    as_VectorRegister($tmp$$reg));
+    __ vfmv_f_s($src1_dst$$FloatRegister, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector integer max reduction
+instruct vreduce_maxB(iRegINoSp dst, iRegI src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
+  match(Set dst (MaxReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vreduce_maxB $dst, $src1, $src2, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vredmax_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg), as_VectorRegister($src2$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+    Label Ldone;
+    __ ble(as_Register($src1$$reg), as_Register($dst$$reg), Ldone);
+    __ mv(as_Register($dst$$reg), as_Register($src1$$reg));
+    __ bind(Ldone);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreduce_maxS(iRegINoSp dst, iRegI src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
+  match(Set dst (MaxReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vreduce_maxS $dst, $src1, $src2, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vredmax_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg), as_VectorRegister($src2$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+    Label Ldone;
+    __ ble(as_Register($src1$$reg), as_Register($dst$$reg), Ldone);
+    __ mv(as_Register($dst$$reg), as_Register($src1$$reg));
+    __ bind(Ldone);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreduce_maxI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_INT);
+  match(Set dst (MaxReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vreduce_maxI $dst, $src1, $src2, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vmv_s_x(as_VectorRegister($tmp$$reg), $src1$$Register);
+    __ vredmax_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg), as_VectorRegister($tmp$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreduce_maxL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
+  match(Set dst (MaxReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vreduce_maxL $dst, $src1, $src2, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vmv_s_x(as_VectorRegister($tmp$$reg), $src1$$Register);
+    __ vredmax_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg), as_VectorRegister($tmp$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector integer min reduction
+instruct vreduce_minB(iRegINoSp dst, iRegI src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
+  match(Set dst (MinReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vreduce_minB $dst, $src1, $src2, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vredmin_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg), as_VectorRegister($src2$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+    Label Ldone;
+    __ bge(as_Register($src1$$reg), as_Register($dst$$reg), Ldone);
+    __ mv(as_Register($dst$$reg), as_Register($src1$$reg));
+    __ bind(Ldone);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreduce_minS(iRegINoSp dst, iRegI src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_SHORT);
+  match(Set dst (MinReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vreduce_minS $dst, $src1, $src2, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vredmin_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg), as_VectorRegister($src2$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+    Label Ldone;
+    __ bge(as_Register($src1$$reg), as_Register($dst$$reg), Ldone);
+    __ mv(as_Register($dst$$reg), as_Register($src1$$reg));
+    __ bind(Ldone);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreduce_minI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_INT);
+  match(Set dst (MinReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vreduce_minI $dst, $src1, $src2, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vmv_s_x(as_VectorRegister($tmp$$reg), $src1$$Register);
+    __ vredmin_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg), as_VectorRegister($tmp$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreduce_minL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_LONG);
+  match(Set dst (MinReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP tmp);
+  format %{ "vreduce_minL $dst, $src1, $src2, $tmp" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vmv_s_x(as_VectorRegister($tmp$$reg), $src1$$Register);
+    __ vredmin_vs(as_VectorRegister($tmp$$reg), as_VectorRegister($src2$$reg), as_VectorRegister($tmp$$reg));
+    __ vmv_x_s($dst$$Register, as_VectorRegister($tmp$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector float max reduction
+
+instruct vreduce_maxF(fRegF dst, fRegF src1, vReg src2, vReg tmp1, vReg tmp2) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+  match(Set dst (MaxReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
+  format %{ "reduce_maxF $dst, $src1, $src2, $tmp1, $tmp2" %}
+  ins_encode %{
+    __ reduce_minmax_FD_v($dst$$FloatRegister,
+                          $src1$$FloatRegister, as_VectorRegister($src2$$reg),
+                          as_VectorRegister($tmp1$$reg), as_VectorRegister($tmp2$$reg),
+                          false /* is_double */, false /* is_min */);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreduce_maxD(fRegD dst, fRegD src1, vReg src2, vReg tmp1, vReg tmp2) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+  match(Set dst (MaxReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
+  format %{ "reduce_maxD $dst, $src1, $src2, $tmp1, $tmp2" %}
+  ins_encode %{
+    __ reduce_minmax_FD_v($dst$$FloatRegister,
+                          $src1$$FloatRegister, as_VectorRegister($src2$$reg),
+                          as_VectorRegister($tmp1$$reg), as_VectorRegister($tmp2$$reg),
+                          true /* is_double */, false /* is_min */);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector float min reduction
+
+instruct vreduce_minF(fRegF dst, fRegF src1, vReg src2, vReg tmp1, vReg tmp2) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+  match(Set dst (MinReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
+  format %{ "reduce_minF $dst, $src1, $src2, $tmp1, $tmp2" %}
+  ins_encode %{
+    __ reduce_minmax_FD_v($dst$$FloatRegister,
+                          $src1$$FloatRegister, as_VectorRegister($src2$$reg),
+                          as_VectorRegister($tmp1$$reg), as_VectorRegister($tmp2$$reg),
+                          false /* is_double */, true /* is_min */);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreduce_minD(fRegD dst, fRegD src1, vReg src2, vReg tmp1, vReg tmp2) %{
+  predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+  match(Set dst (MinReductionV src1 src2));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
+  format %{ "reduce_minD $dst, $src1, $src2, $tmp1, $tmp2" %}
+  ins_encode %{
+    __ reduce_minmax_FD_v($dst$$FloatRegister,
+                          $src1$$FloatRegister, as_VectorRegister($src2$$reg),
+                          as_VectorRegister($tmp1$$reg), as_VectorRegister($tmp2$$reg),
+                          true /* is_double */, true /* is_min */);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector Math.rint, floor, ceil
+
+instruct vroundD(vReg dst, vReg src, immI rmode) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+  match(Set dst (RoundDoubleModeV src rmode));
+  format %{ "vroundD $dst, $src, $rmode" %}
+  ins_encode %{
+    switch ($rmode$$constant) {
+      case RoundDoubleModeNode::rmode_rint:
+        __ csrwi(CSR_FRM, C2_MacroAssembler::rne);
+        __ vfcvt_rtz_x_f_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+        break;
+      case RoundDoubleModeNode::rmode_floor:
+        __ csrwi(CSR_FRM, C2_MacroAssembler::rdn);
+        __ vfcvt_rtz_x_f_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+        break;
+      case RoundDoubleModeNode::rmode_ceil:
+        __ csrwi(CSR_FRM, C2_MacroAssembler::rup);
+        __ vfcvt_rtz_x_f_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+        break;
+      default:
+        ShouldNotReachHere();
+        break;
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector replicate
+
+instruct replicateB(vReg dst, iRegIorL2I src) %{
+  match(Set dst (ReplicateB src));
+  ins_cost(VEC_COST);
+  format %{ "vmv.v.x  $dst, $src\t#@replicateB" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vmv_v_x(as_VectorRegister($dst$$reg), as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateS(vReg dst, iRegIorL2I src) %{
+  match(Set dst (ReplicateS src));
+  ins_cost(VEC_COST);
+  format %{ "vmv.v.x  $dst, $src\t#@replicateS" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vmv_v_x(as_VectorRegister($dst$$reg), as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateI(vReg dst, iRegIorL2I src) %{
+  match(Set dst (ReplicateI src));
+  ins_cost(VEC_COST);
+  format %{ "vmv.v.x  $dst, $src\t#@replicateI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vmv_v_x(as_VectorRegister($dst$$reg), as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateL(vReg dst, iRegL src) %{
+  match(Set dst (ReplicateL src));
+  ins_cost(VEC_COST);
+  format %{ "vmv.v.x  $dst, $src\t#@replicateL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vmv_v_x(as_VectorRegister($dst$$reg), as_Register($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateB_imm5(vReg dst, immI5 con) %{
+  match(Set dst (ReplicateB con));
+  ins_cost(VEC_COST);
+  format %{ "vmv.v.i  $dst, $con\t#@replicateB_imm5" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vmv_v_i(as_VectorRegister($dst$$reg), $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateS_imm5(vReg dst, immI5 con) %{
+  match(Set dst (ReplicateS con));
+  ins_cost(VEC_COST);
+  format %{ "vmv.v.i  $dst, $con\t#@replicateS_imm5" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vmv_v_i(as_VectorRegister($dst$$reg), $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateI_imm5(vReg dst, immI5 con) %{
+  match(Set dst (ReplicateI con));
+  ins_cost(VEC_COST);
+  format %{ "vmv.v.i  $dst, $con\t#@replicateI_imm5" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vmv_v_i(as_VectorRegister($dst$$reg), $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateL_imm5(vReg dst, immL5 con) %{
+  match(Set dst (ReplicateL con));
+  ins_cost(VEC_COST);
+  format %{ "vmv.v.i  $dst, $con\t#@replicateL_imm5" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vmv_v_i(as_VectorRegister($dst$$reg), $con$$constant);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateF(vReg dst, fRegF src) %{
+  match(Set dst (ReplicateF src));
+  ins_cost(VEC_COST);
+  format %{ "vfmv.v.f  $dst, $src\t#@replicateF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfmv_v_f(as_VectorRegister($dst$$reg), $src$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct replicateD(vReg dst, fRegD src) %{
+  match(Set dst (ReplicateD src));
+  ins_cost(VEC_COST);
+  format %{ "vfmv.v.f  $dst, $src\t#@replicateD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfmv_v_f(as_VectorRegister($dst$$reg), $src$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector shift
+
+instruct vasrB(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (RShiftVB src shift));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst);
+  format %{ "vmsgtu.vi v0, $shift 7\t#@vasrB\n\t"
+            "vsra.vi $dst, $src, 7, Assembler::v0_t\n\t"
+            "vmnot.m v0, v0\n\t"
+            "vsra.vv $dst, $src, $shift, Assembler::v0_t" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    // if shift > BitsPerByte - 1, clear the low BitsPerByte - 1 bits
+    __ vmsgtu_vi(v0, as_VectorRegister($shift$$reg), BitsPerByte - 1);
+    __ vsra_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               BitsPerByte - 1, Assembler::v0_t);
+    // otherwise, shift
+    __ vmnot_m(v0, v0);
+    __ vsra_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vasrS(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (RShiftVS src shift));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst);
+  format %{ "vmsgtu.vi v0, $shift, 15\t#@vasrS\n\t"
+            "vsra.vi $dst, $src, 15, Assembler::v0_t\n\t"
+            "vmnot.m v0, v0\n\t"
+            "vsra.vv $dst, $src, $shift, Assembler::v0_t" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    // if shift > BitsPerShort - 1, clear the low BitsPerShort - 1 bits
+    __ vmsgtu_vi(v0, as_VectorRegister($shift$$reg), BitsPerShort - 1);
+    __ vsra_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               BitsPerShort - 1, Assembler::v0_t);
+    // otherwise, shift
+    __ vmnot_m(v0, v0);
+    __ vsra_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vasrI(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (RShiftVI src shift));
+  ins_cost(VEC_COST);
+  format %{ "vsra.vv $dst, $src, $shift\t#@vasrI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vsra_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vasrL(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (RShiftVL src shift));
+  ins_cost(VEC_COST);
+  format %{ "vsra.vv $dst, $src, $shift\t#@vasrL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vsra_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+         as_VectorRegister($shift$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlslB(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (LShiftVB src shift));
+  ins_cost(VEC_COST);
+  effect( TEMP_DEF dst);
+  format %{ "vmsgtu.vi v0, $shift, 7\t#@vlslB\n\t"
+            "vxor.vv $dst, $src, $src, Assembler::v0_t\n\t"
+            "vmnot.m v0, v0\n\t"
+            "vsll.vv $dst, $src, $shift, Assembler::v0_t" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    // if shift > BitsPerByte - 1, clear the element
+    __ vmsgtu_vi(v0, as_VectorRegister($shift$$reg), BitsPerByte - 1);
+    __ vxor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($src$$reg), Assembler::v0_t);
+    // otherwise, shift
+    __ vmnot_m(v0, v0);
+    __ vsll_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlslS(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (LShiftVS src shift));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst);
+  format %{ "vmsgtu.vi v0, $shift, 15\t#@vlslS\n\t"
+            "vxor.vv $dst, $src, $src, Assembler::v0_t\n\t"
+            "vmnot.m v0, v0\n\t"
+            "vsll.vv $dst, $src, $shift, Assembler::v0_t" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    // if shift > BitsPerShort - 1, clear the element
+    __ vmsgtu_vi(v0, as_VectorRegister($shift$$reg), BitsPerShort - 1);
+    __ vxor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($src$$reg), Assembler::v0_t);
+    // otherwise, shift
+    __ vmnot_m(v0, v0);
+    __ vsll_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlslI(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (LShiftVI src shift));
+  ins_cost(VEC_COST);
+  format %{ "vsll.vv $dst, $src, $shift\t#@vlslI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vsll_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlslL(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (LShiftVL src shift));
+  ins_cost(VEC_COST);
+  format %{ "vsll.vv $dst, $src, $shift\t# vector (D)" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vsll_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlsrB(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (URShiftVB src shift));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst);
+  format %{ "vmsgtu.vi v0, $shift, 7\t#@vlsrB\n\t"
+            "vxor.vv $dst, $src, $src, Assembler::v0_t\n\t"
+            "vmnot.m v0, v0, v0\n\t"
+            "vsll.vv $dst, $src, $shift, Assembler::v0_t" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    // if shift > BitsPerByte - 1, clear the element
+    __ vmsgtu_vi(v0, as_VectorRegister($shift$$reg), BitsPerByte - 1);
+    __ vxor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($src$$reg), Assembler::v0_t);
+    // otherwise, shift
+    __ vmnot_m(v0, v0);
+    __ vsrl_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlsrS(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (URShiftVS src shift));
+  ins_cost(VEC_COST);
+  effect(TEMP_DEF dst);
+  format %{ "vmsgtu.vi v0, $shift, 15\t#@vlsrS\n\t"
+            "vxor.vv $dst, $src, $src, Assembler::v0_t\n\t"
+            "vmnot.m v0, v0\n\t"
+            "vsll.vv $dst, $src, $shift, Assembler::v0_t" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    // if shift > BitsPerShort - 1, clear the element
+    __ vmsgtu_vi(v0, as_VectorRegister($shift$$reg), BitsPerShort - 1);
+    __ vxor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($src$$reg), Assembler::v0_t);
+    // otherwise, shift
+    __ vmnot_m(v0, v0);
+    __ vsrl_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+
+instruct vlsrI(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (URShiftVI src shift));
+  ins_cost(VEC_COST);
+  format %{ "vsrl.vv $dst, $src, $shift\t#@vlsrI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vsrl_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+
+instruct vlsrL(vReg dst, vReg src, vReg shift) %{
+  match(Set dst (URShiftVL src shift));
+  ins_cost(VEC_COST);
+  format %{ "vsrl.vv $dst, $src, $shift\t#@vlsrL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vsrl_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+               as_VectorRegister($shift$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vasrB_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (RShiftVB src (RShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsra.vi $dst, $src, $shift\t#@vasrB_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e8);
+    if (con == 0) {
+      __ vor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                as_VectorRegister($src$$reg));
+      return;
+    }
+    if (con >= BitsPerByte) con = BitsPerByte - 1;
+    __ vsra_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vasrS_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (RShiftVS src (RShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsra.vi $dst, $src, $shift\t#@vasrS_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e16);
+    if (con == 0) {
+      __ vor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                as_VectorRegister($src$$reg));
+      return;
+    }
+    if (con >= BitsPerShort) con = BitsPerShort - 1;
+    __ vsra_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vasrI_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (RShiftVI src (RShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsrl.vi $dst, $src, $shift\t#@vasrI_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e32);
+    if (con == 0) {
+      __ vor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                as_VectorRegister($src$$reg));
+      return;
+    }
+    __ vsra_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vasrL_imm(vReg dst, vReg src, immI shift) %{
+  predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
+  match(Set dst (RShiftVL src (RShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsrl.vi $dst, $src, $shift\t#@vasrL_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e64);
+    if (con == 0) {
+      __ vor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                as_VectorRegister($src$$reg));
+      return;
+    }
+    __ vsra_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlsrB_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (URShiftVB src (RShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsrl.vi $dst, $src, $shift\t#@vlsrB_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e8);
+    if (con == 0) {
+      __ vor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                as_VectorRegister($src$$reg));
+      return;
+    }
+    if (con >= BitsPerByte) {
+      __ vxor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                 as_VectorRegister($src$$reg));
+      return;
+    }
+    __ vsrl_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlsrS_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (URShiftVS src (RShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsrl.vi $dst, $src, $shift\t#@vlsrS_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e16);
+    if (con == 0) {
+      __ vor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                as_VectorRegister($src$$reg));
+      return;
+    }
+    if (con >= BitsPerShort) {
+      __ vxor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                 as_VectorRegister($src$$reg));
+      return;
+    }
+    __ vsrl_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlsrI_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (URShiftVI src (RShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsrl.vi $dst, $src, $shift\t#@vlsrI_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e32);
+    if (con == 0) {
+      __ vor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                as_VectorRegister($src$$reg));
+      return;
+    }
+    __ vsrl_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlsrL_imm(vReg dst, vReg src, immI shift) %{
+  predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
+  match(Set dst (URShiftVL src (RShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsrl.vi $dst, $src, $shift\t#@vlsrL_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e64);
+    if (con == 0) {
+      __ vor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                as_VectorRegister($src$$reg));
+      return;
+    }
+    __ vsrl_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlslB_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (LShiftVB src (LShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsll.vi $dst, $src, $shift\t#@vlslB_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e8);
+    if (con >= BitsPerByte) {
+      __ vxor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                 as_VectorRegister($src$$reg));
+      return;
+    }
+    __ vsll_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlslS_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (LShiftVS src (LShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsll.vi $dst, $src, $shift\t#@vlslS_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e16);
+    if (con >= BitsPerShort) {
+      __ vxor_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg),
+                 as_VectorRegister($src$$reg));
+      return;
+    }
+    __ vsll_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlslI_imm(vReg dst, vReg src, immI shift) %{
+  match(Set dst (LShiftVI src (LShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsll.vi $dst, $src, $shift\t#@vlslI_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vsll_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vlslL_imm(vReg dst, vReg src, immI shift) %{
+  predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
+  match(Set dst (LShiftVL src (LShiftCntV shift)));
+  ins_cost(VEC_COST);
+  format %{ "vsll.vi $dst, $src, $shift\t#@vlslL_imm" %}
+  ins_encode %{
+    uint32_t con = (unsigned)$shift$$constant & 0x1f;
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vsll_vi(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg), con);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vshiftcntB(vReg dst, iRegIorL2I cnt) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_BYTE);
+  match(Set dst (LShiftCntV cnt));
+  match(Set dst (RShiftCntV cnt));
+  format %{ "vmv.v.x $dst, $cnt\t#@vshiftcntB" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vmv_v_x(as_VectorRegister($dst$$reg), as_Register($cnt$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vshiftcntS(vReg dst, iRegIorL2I cnt) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_SHORT ||
+            n->bottom_type()->is_vect()->element_basic_type() == T_CHAR);
+  match(Set dst (LShiftCntV cnt));
+  match(Set dst (RShiftCntV cnt));
+  format %{ "vmv.v.x $dst, $cnt\t#@vshiftcntS" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vmv_v_x(as_VectorRegister($dst$$reg), as_Register($cnt$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vshiftcntI(vReg dst, iRegIorL2I cnt) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_INT);
+  match(Set dst (LShiftCntV cnt));
+  match(Set dst (RShiftCntV cnt));
+  format %{ "vmv.v.x $dst, $cnt\t#@vshiftcntI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vmv_v_x(as_VectorRegister($dst$$reg), as_Register($cnt$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vshiftcntL(vReg dst, iRegIorL2I cnt) %{
+  predicate(n->bottom_type()->is_vect()->element_basic_type() == T_LONG);
+  match(Set dst (LShiftCntV cnt));
+  match(Set dst (RShiftCntV cnt));
+  format %{ "vmv.v.x $dst, $cnt\t#@vshiftcntL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vmv_v_x(as_VectorRegister($dst$$reg), as_Register($cnt$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector sqrt
+
+instruct vsqrtF(vReg dst, vReg src) %{
+  match(Set dst (SqrtVF src));
+  ins_cost(VEC_COST);
+  format %{ "vfsqrt.v $dst, $src\t#@vsqrtF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfsqrt_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vsqrtD(vReg dst, vReg src) %{
+  match(Set dst (SqrtVD src));
+  ins_cost(VEC_COST);
+  format %{ "vfsqrt.v $dst, $src\t#@vsqrtD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfsqrt_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector sub
+
+instruct vsubB(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (SubVB src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vsub.vv $dst, $src1, $src2\t#@vsubB" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e8);
+    __ vsub_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vsubS(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (SubVS src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vsub.vv $dst, $src1, $src2\t#@vsubS" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e16);
+    __ vsub_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vsubI(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (SubVI src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vsub.vv $dst, $src1, $src2\t#@vsubI" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vsub_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vsubL(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (SubVL src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vsub.vv $dst, $src1, $src2\t#@vsubL" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vsub_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+               as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vsubF(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (SubVF src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vfsub.vv $dst, $src1, $src2\t@vsubF" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e32);
+    __ vfsub_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vsubD(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (SubVD src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vfsub.vv $dst, $src1, $src2\t#@vsubD" %}
+  ins_encode %{
+    __ vsetvli(t0, x0, Assembler::e64);
+    __ vfsub_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vstring_equalsL(iRegP_R11 str1, iRegP_R13 str2, iRegI_R14 cnt,
+                         iRegI_R10 result, vReg_V1 v1,
+                         vReg_V2 v2, vReg_V3 v3, rFlagsReg cr)
+%{
+  predicate(UseRVV && ((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (StrEquals (Binary str1 str2) cnt));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt, TEMP v1, TEMP v2, TEMP v3, KILL cr);
+
+  format %{ "String Equals $str1, $str2, $cnt -> $result\t#@string_equalsL" %}
+  ins_encode %{
+    // Count is in 8-bit bytes; non-Compact chars are 16 bits.
+    __ string_equals_v($str1$$Register, $str2$$Register,
+                       $result$$Register, $cnt$$Register, 1);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct vstring_equalsU(iRegP_R11 str1, iRegP_R13 str2, iRegI_R14 cnt,
+                         iRegI_R10 result, vReg_V1 v1,
+                         vReg_V2 v2, vReg_V3 v3, rFlagsReg cr)
+%{
+  predicate(UseRVV && ((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::UU);
+  match(Set result (StrEquals (Binary str1 str2) cnt));
+  effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt, TEMP v1, TEMP v2, TEMP v3, KILL cr);
+
+  format %{ "String Equals $str1, $str2, $cnt -> $result\t#@string_equalsU" %}
+  ins_encode %{
+    // Count is in 8-bit bytes; non-Compact chars are 16 bits.
+    __ string_equals_v($str1$$Register, $str2$$Register,
+                       $result$$Register, $cnt$$Register, 2);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct varray_equalsB(iRegP_R11 ary1, iRegP_R12 ary2, iRegI_R10 result,
+                        vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, iRegP_R28 tmp, rFlagsReg cr)
+%{
+  predicate(UseRVV && ((AryEqNode*)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result (AryEq ary1 ary2));
+  effect(KILL tmp, USE_KILL ary1, USE_KILL ary2, TEMP v1, TEMP v2, TEMP v3, KILL cr);
+
+  format %{ "Array Equals $ary1, ary2 -> $result\t#@array_equalsB // KILL $tmp" %}
+  ins_encode %{
+    __ arrays_equals_v($ary1$$Register, $ary2$$Register,
+                       $result$$Register, $tmp$$Register, 1);
+    %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct varray_equalsC(iRegP_R11 ary1, iRegP_R12 ary2, iRegI_R10 result,
+                        vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, iRegP_R28 tmp, rFlagsReg cr)
+%{
+  predicate(UseRVV && ((AryEqNode*)n)->encoding() == StrIntrinsicNode::UU);
+  match(Set result (AryEq ary1 ary2));
+  effect(KILL tmp, USE_KILL ary1, USE_KILL ary2, TEMP v1, TEMP v2, TEMP v3, KILL cr);
+
+  format %{ "Array Equals $ary1, ary2 -> $result\t#@array_equalsC // KILL $tmp" %}
+  ins_encode %{
+    __ arrays_equals_v($ary1$$Register, $ary2$$Register,
+                       $result$$Register, $tmp$$Register, 2);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct vstring_compareU(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                          iRegI_R10 result, vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, vReg_V4 v4, vReg_V5 v5,
+                          iRegP_R28 tmp1, iRegL_R29 tmp2)
+%{
+  predicate(UseRVV && ((StrCompNode *)n)->encoding() == StrIntrinsicNode::UU);
+  match(Set result(StrComp(Binary str1 cnt1)(Binary str2 cnt2)));
+  effect(KILL tmp1, KILL tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
+         TEMP v1, TEMP v2, TEMP v3, TEMP v4, TEMP v5);
+
+  format %{ "String Compare $str1, $cnt1, $str2, $cnt2 -> $result\t#@string_compareU" %}
+  ins_encode %{
+    // Count is in 8-bit bytes; non-Compact chars are 16 bits.
+    __ string_compare_v($str1$$Register, $str2$$Register,
+                        $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                        $tmp1$$Register, $tmp2$$Register,
+                        StrIntrinsicNode::UU);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+instruct vstring_compareL(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                          iRegI_R10 result, vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, vReg_V4 v4, vReg_V5 v5,
+                          iRegP_R28 tmp1, iRegL_R29 tmp2)
+%{
+  predicate(UseRVV && ((StrCompNode *)n)->encoding() == StrIntrinsicNode::LL);
+  match(Set result(StrComp(Binary str1 cnt1)(Binary str2 cnt2)));
+  effect(KILL tmp1, KILL tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
+         TEMP v1, TEMP v2, TEMP v3, TEMP v4, TEMP v5);
+
+  format %{ "String Compare $str1, $cnt1, $str2, $cnt2 -> $result\t#@string_compareL" %}
+  ins_encode %{
+    __ string_compare_v($str1$$Register, $str2$$Register,
+                        $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                        $tmp1$$Register, $tmp2$$Register,
+                        StrIntrinsicNode::LL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct vstring_compareUL(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                           iRegI_R10 result, vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, vReg_V4 v4, vReg_V5 v5,
+                           iRegP_R28 tmp1, iRegL_R29 tmp2)
+%{
+  predicate(UseRVV && ((StrCompNode *)n)->encoding() == StrIntrinsicNode::UL);
+  match(Set result(StrComp(Binary str1 cnt1)(Binary str2 cnt2)));
+  effect(KILL tmp1, KILL tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
+         TEMP v1, TEMP v2, TEMP v3, TEMP v4, TEMP v5);
+
+  format %{"String Compare $str1, $cnt1, $str2, $cnt2 -> $result\t#@string_compareUL" %}
+  ins_encode %{
+    __ string_compare_v($str1$$Register, $str2$$Register,
+                        $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                        $tmp1$$Register, $tmp2$$Register,
+                        StrIntrinsicNode::UL);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+instruct vstring_compareLU(iRegP_R11 str1, iRegI_R12 cnt1, iRegP_R13 str2, iRegI_R14 cnt2,
+                           iRegI_R10 result, vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, vReg_V4 v4, vReg_V5 v5,
+                           iRegP_R28 tmp1, iRegL_R29 tmp2)
+%{
+  predicate(UseRVV && ((StrCompNode *)n)->encoding() == StrIntrinsicNode::LU);
+  match(Set result(StrComp(Binary str1 cnt1)(Binary str2 cnt2)));
+  effect(KILL tmp1, KILL tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2,
+         TEMP v1, TEMP v2, TEMP v3, TEMP v4, TEMP v5);
+
+  format %{ "String Compare $str1, $cnt1, $str2, $cnt2 -> $result\t#@string_compareLU" %}
+  ins_encode %{
+    __ string_compare_v($str1$$Register, $str2$$Register,
+                        $cnt1$$Register, $cnt2$$Register, $result$$Register,
+                        $tmp1$$Register, $tmp2$$Register,
+                        StrIntrinsicNode::LU);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+// fast byte[] to char[] inflation
+instruct vstring_inflate(Universe dummy, iRegP_R10 src, iRegP_R11 dst, iRegI_R12 len,
+                         vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, iRegL tmp)
+%{
+  predicate(UseRVV);
+  match(Set dummy (StrInflatedCopy src (Binary dst len)));
+  effect(TEMP v1, TEMP v2, TEMP v3, TEMP tmp, USE_KILL src, USE_KILL dst, USE_KILL len);
+
+  format %{ "String Inflate $src,$dst" %}
+  ins_encode %{
+    __ byte_array_inflate_v($src$$Register, $dst$$Register, $len$$Register, $tmp$$Register);
+  %}
+  ins_pipe(pipe_class_memory);
+%}
+
+// encode char[] to byte[] in ISO_8859_1
+instruct vencode_iso_array(iRegP_R12 src, iRegP_R11 dst, iRegI_R13 len, iRegI_R10 result,
+                           vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, iRegL tmp)
+%{
+  predicate(UseRVV);
+  match(Set result (EncodeISOArray src (Binary dst len)));
+  effect(TEMP_DEF result, USE_KILL src, USE_KILL dst, USE_KILL len,
+         TEMP v1, TEMP v2, TEMP v3, TEMP tmp);
+
+  format %{ "Encode array $src,$dst,$len -> $result" %}
+  ins_encode %{
+    __ encode_iso_array_v($src$$Register, $dst$$Register, $len$$Register,
+                          $result$$Register, $tmp$$Register);
+  %}
+  ins_pipe( pipe_class_memory );
+%}
+
+// fast char[] to byte[] compression
+instruct vstring_compress(iRegP_R12 src, iRegP_R11 dst, iRegI_R13 len, iRegI_R10 result,
+                          vReg_V1 v1, vReg_V2 v2, vReg_V3 v3, iRegL tmp)
+%{
+  predicate(UseRVV);
+  match(Set result (StrCompressedCopy src (Binary dst len)));
+  effect(TEMP_DEF result, USE_KILL src, USE_KILL dst, USE_KILL len,
+         TEMP v1, TEMP v2, TEMP v3, TEMP tmp);
+
+  format %{ "String Compress $src,$dst -> $result    // KILL R11, R12, R13" %}
+  ins_encode %{
+    __ char_array_compress_v($src$$Register, $dst$$Register, $len$$Register,
+                             $result$$Register, $tmp$$Register);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vcount_positives(iRegP_R11 ary, iRegI_R12 len, iRegI_R10 result, iRegL tmp)
+%{
+  predicate(UseRVV);
+  match(Set result (CountPositives ary len));
+  effect(USE_KILL ary, USE_KILL len, TEMP tmp);
+
+  format %{ "count positives byte[] $ary, $len -> $result" %}
+  ins_encode %{
+    __ count_positives_v($ary$$Register, $len$$Register, $result$$Register, $tmp$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct vstringU_indexof_char(iRegP_R11 str1, iRegI_R12 cnt1, iRegI_R13 ch,
+                               iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2,
+                               vReg_V1 v1, vReg_V2 v2, vReg_V3 v3)
+%{
+  predicate(UseRVV && (((StrIndexOfCharNode*)n)->encoding() == StrIntrinsicNode::U));
+  match(Set result (StrIndexOfChar (Binary str1 cnt1) ch));
+  effect(TEMP_DEF result, USE_KILL str1, USE_KILL cnt1, USE_KILL ch,
+         TEMP tmp1, TEMP tmp2, TEMP v1, TEMP v2, TEMP v3);
+
+  format %{ "StringUTF16 IndexOf char[] $str1, $cnt1, $ch -> $result" %}
+
+  ins_encode %{
+    __ string_indexof_char_v($str1$$Register, $cnt1$$Register, $ch$$Register,
+                             $result$$Register, $tmp1$$Register, $tmp2$$Register,
+                             false /* isL */);
+  %}
+
+  ins_pipe(pipe_class_memory);
+%}
+
+instruct vstringL_indexof_char(iRegP_R11 str1, iRegI_R12 cnt1, iRegI_R13 ch,
+                               iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2,
+                               vReg_V1 v1, vReg_V2 v2, vReg_V3 v3)
+%{
+  predicate(UseRVV && (((StrIndexOfCharNode*)n)->encoding() == StrIntrinsicNode::L));
+  match(Set result (StrIndexOfChar (Binary str1 cnt1) ch));
+  effect(TEMP_DEF result, USE_KILL str1, USE_KILL cnt1, USE_KILL ch,
+         TEMP tmp1, TEMP tmp2, TEMP v1, TEMP v2, TEMP v3);
+
+  format %{ "StringLatin1 IndexOf char[] $str1, $cnt1, $ch -> $result" %}
+
+  ins_encode %{
+    __ string_indexof_char_v($str1$$Register, $cnt1$$Register, $ch$$Register,
+                             $result$$Register, $tmp1$$Register, $tmp2$$Register,
+                             true /* isL */);
+  %}
+
+  ins_pipe(pipe_class_memory);
+%}
+
+// clearing of an array
+instruct vclearArray_reg_reg(iRegL_R29 cnt, iRegP_R28 base, Universe dummy,
+                             vReg_V1 vReg1, vReg_V2 vReg2, vReg_V3 vReg3)
+%{
+  predicate(UseRVV);
+  match(Set dummy (ClearArray cnt base));
+  effect(USE_KILL cnt, USE_KILL base, TEMP vReg1, TEMP vReg2, TEMP vReg3);
+
+  format %{ "ClearArray $cnt, $base\t#@clearArray_reg_reg" %}
+
+  ins_encode %{
+    __ clear_array_v($base$$Register, $cnt$$Register);
+  %}
+
+  ins_pipe(pipe_class_memory);
+%}
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
new file mode 100644
index 00000000000..f85d4b25a76
--- /dev/null
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -0,0 +1,2761 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "code/debugInfoRec.hpp"
+#include "code/icBuffer.hpp"
+#include "code/vtableStubs.hpp"
+#include "compiler/oopMap.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "interpreter/interp_masm.hpp"
+#include "interpreter/interpreter.hpp"
+#include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
+#include "nativeInst_riscv.hpp"
+#include "oops/compiledICHolder.hpp"
+#include "oops/klass.inline.hpp"
+#include "prims/methodHandles.hpp"
+#include "runtime/jniHandles.hpp"
+#include "runtime/safepointMechanism.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/signature.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/vframeArray.hpp"
+#include "utilities/align.hpp"
+#include "utilities/formatBuffer.hpp"
+#include "vmreg_riscv.inline.hpp"
+#ifdef COMPILER1
+#include "c1/c1_Runtime1.hpp"
+#endif
+#ifdef COMPILER2
+#include "adfiles/ad_riscv.hpp"
+#include "opto/runtime.hpp"
+#endif
+
+#define __ masm->
+
+const int StackAlignmentInSlots = StackAlignmentInBytes / VMRegImpl::stack_slot_size;
+
+class SimpleRuntimeFrame {
+public:
+
+  // Most of the runtime stubs have this simple frame layout.
+  // This class exists to make the layout shared in one place.
+  // Offsets are for compiler stack slots, which are jints.
+  enum layout {
+    // The frame sender code expects that fp will be in the "natural" place and
+    // will override any oopMap setting for it. We must therefore force the layout
+    // so that it agrees with the frame sender code.
+    // we don't expect any arg reg save area so riscv asserts that
+    // frame::arg_reg_save_area_bytes == 0
+    fp_off = 0, fp_off2,
+    return_off, return_off2,
+    framesize
+  };
+};
+
+class RegisterSaver {
+  const bool _save_vectors;
+ public:
+  RegisterSaver(bool save_vectors) : _save_vectors(UseRVV && save_vectors) {}
+  ~RegisterSaver() {}
+  OopMap* save_live_registers(MacroAssembler* masm, int additional_frame_words, int* total_frame_words);
+  void restore_live_registers(MacroAssembler* masm);
+
+  // Offsets into the register save area
+  // Used by deoptimization when it is managing result register
+  // values on its own
+  // gregs:28, float_register:32; except: x1(ra) & x2(sp) & gp(x3) & tp(x4)
+  // |---v0---|<---SP
+  // |---v1---|save vectors only in generate_handler_blob
+  // |-- .. --|
+  // |---v31--|-----
+  // |---f0---|
+  // |---f1---|
+  // |   ..   |
+  // |---f31--|
+  // |---reserved slot for stack alignment---|
+  // |---x5---|
+  // |   x6   |
+  // |---.. --|
+  // |---x31--|
+  // |---fp---|
+  // |---ra---|
+  int v0_offset_in_bytes(void) { return 0; }
+  int f0_offset_in_bytes(void) {
+    int f0_offset = 0;
+#ifdef COMPILER2
+    if (_save_vectors) {
+      f0_offset += Matcher::scalable_vector_reg_size(T_INT) * VectorRegisterImpl::number_of_registers *
+                   BytesPerInt;
+    }
+#endif
+    return f0_offset;
+  }
+  int reserved_slot_offset_in_bytes(void) {
+    return f0_offset_in_bytes() +
+           FloatRegisterImpl::max_slots_per_register *
+           FloatRegisterImpl::number_of_registers *
+           BytesPerInt;
+  }
+
+  int reg_offset_in_bytes(Register r) {
+    assert (r->encoding() > 4, "ra, sp, gp and tp not saved");
+    return reserved_slot_offset_in_bytes() + (r->encoding() - 4 /* x1, x2, x3, x4 */) * wordSize;
+  }
+
+  int freg_offset_in_bytes(FloatRegister f) {
+    return f0_offset_in_bytes() + f->encoding() * wordSize;
+  }
+
+  int ra_offset_in_bytes(void) {
+    return reserved_slot_offset_in_bytes() +
+           (RegisterImpl::number_of_registers - 3) *
+           RegisterImpl::max_slots_per_register *
+           BytesPerInt;
+  }
+};
+
+OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_frame_words, int* total_frame_words) {
+  int vector_size_in_bytes = 0;
+  int vector_size_in_slots = 0;
+#ifdef COMPILER2
+  if (_save_vectors) {
+    vector_size_in_bytes += Matcher::scalable_vector_reg_size(T_BYTE);
+    vector_size_in_slots += Matcher::scalable_vector_reg_size(T_INT);
+  }
+#endif
+
+  assert_cond(masm != NULL && total_frame_words != NULL);
+  int frame_size_in_bytes = align_up(additional_frame_words * wordSize + ra_offset_in_bytes() + wordSize, 16);
+  // OopMap frame size is in compiler stack slots (jint's) not bytes or words
+  int frame_size_in_slots = frame_size_in_bytes / BytesPerInt;
+  // The caller will allocate additional_frame_words
+  int additional_frame_slots = additional_frame_words * wordSize / BytesPerInt;
+  // CodeBlob frame size is in words.
+  int frame_size_in_words = frame_size_in_bytes / wordSize;
+  *total_frame_words = frame_size_in_words;
+
+  // Save Integer, Float and Vector registers.
+  __ enter();
+  __ push_CPU_state(_save_vectors, vector_size_in_bytes);
+
+  // Set an oopmap for the call site.  This oopmap will map all
+  // oop-registers and debug-info registers as callee-saved.  This
+  // will allow deoptimization at this safepoint to find all possible
+  // debug-info recordings, as well as let GC find all oops.
+
+  OopMapSet *oop_maps = new OopMapSet();
+  OopMap* oop_map = new OopMap(frame_size_in_slots, 0);
+  assert_cond(oop_maps != NULL && oop_map != NULL);
+
+  int sp_offset_in_slots = 0;
+  int step_in_slots = 0;
+  if (_save_vectors) {
+    step_in_slots = vector_size_in_slots;
+    for (int i = 0; i < VectorRegisterImpl::number_of_registers; i++, sp_offset_in_slots += step_in_slots) {
+      VectorRegister r = as_VectorRegister(i);
+      oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset_in_slots), r->as_VMReg());
+    }
+  }
+
+  step_in_slots = FloatRegisterImpl::max_slots_per_register;
+  for (int i = 0; i < FloatRegisterImpl::number_of_registers; i++, sp_offset_in_slots += step_in_slots) {
+    FloatRegister r = as_FloatRegister(i);
+    oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset_in_slots), r->as_VMReg());
+  }
+
+  step_in_slots = RegisterImpl::max_slots_per_register;
+  // skip the slot reserved for alignment, see MacroAssembler::push_reg;
+  // also skip x5 ~ x6 on the stack because they are caller-saved registers.
+  sp_offset_in_slots += RegisterImpl::max_slots_per_register * 3;
+  // besides, we ignore x0 ~ x4 because push_CPU_state won't push them on the stack.
+  for (int i = 7; i < RegisterImpl::number_of_registers; i++, sp_offset_in_slots += step_in_slots) {
+    Register r = as_Register(i);
+    if (r != xthread) {
+      oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset_in_slots + additional_frame_slots), r->as_VMReg());
+    }
+  }
+
+  return oop_map;
+}
+
+void RegisterSaver::restore_live_registers(MacroAssembler* masm) {
+  assert_cond(masm != NULL);
+#ifdef COMPILER2
+  __ pop_CPU_state(_save_vectors, Matcher::scalable_vector_reg_size(T_BYTE));
+#else
+  __ pop_CPU_state(_save_vectors);
+#endif
+  __ leave();
+}
+
+// Is vector's size (in bytes) bigger than a size saved by default?
+// riscv does not ovlerlay the floating-point registers on vector registers like aarch64.
+bool SharedRuntime::is_wide_vector(int size) {
+  return UseRVV;
+}
+
+// The java_calling_convention describes stack locations as ideal slots on
+// a frame with no abi restrictions. Since we must observe abi restrictions
+// (like the placement of the register window) the slots must be biased by
+// the following value.
+static int reg2offset_in(VMReg r) {
+  // Account for saved fp and ra
+  // This should really be in_preserve_stack_slots
+  return r->reg2stack() * VMRegImpl::stack_slot_size;
+}
+
+static int reg2offset_out(VMReg r) {
+  return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
+}
+
+// ---------------------------------------------------------------------------
+// Read the array of BasicTypes from a signature, and compute where the
+// arguments should go.  Values in the VMRegPair regs array refer to 4-byte
+// quantities.  Values less than VMRegImpl::stack0 are registers, those above
+// refer to 4-byte stack slots.  All stack slots are based off of the stack pointer
+// as framesizes are fixed.
+// VMRegImpl::stack0 refers to the first slot 0(sp).
+// and VMRegImpl::stack0+1 refers to the memory word 4-byes higher.  Register
+// up to RegisterImpl::number_of_registers) are the 64-bit
+// integer registers.
+
+// Note: the INPUTS in sig_bt are in units of Java argument words,
+// which are 64-bit.  The OUTPUTS are in 32-bit units.
+
+// The Java calling convention is a "shifted" version of the C ABI.
+// By skipping the first C ABI register we can call non-static jni
+// methods with small numbers of arguments without having to shuffle
+// the arguments at all. Since we control the java ABI we ought to at
+// least get some advantage out of it.
+
+int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
+                                           VMRegPair *regs,
+                                           int total_args_passed) {
+  // Create the mapping between argument positions and
+  // registers.
+  static const Register INT_ArgReg[Argument::n_int_register_parameters_j] = {
+    j_rarg0, j_rarg1, j_rarg2, j_rarg3,
+    j_rarg4, j_rarg5, j_rarg6, j_rarg7
+  };
+  static const FloatRegister FP_ArgReg[Argument::n_float_register_parameters_j] = {
+    j_farg0, j_farg1, j_farg2, j_farg3,
+    j_farg4, j_farg5, j_farg6, j_farg7
+  };
+
+  uint int_args = 0;
+  uint fp_args = 0;
+  uint stk_args = 0; // inc by 2 each time
+
+  for (int i = 0; i < total_args_passed; i++) {
+    switch (sig_bt[i]) {
+      case T_BOOLEAN: // fall through
+      case T_CHAR:    // fall through
+      case T_BYTE:    // fall through
+      case T_SHORT:   // fall through
+      case T_INT:
+        if (int_args < Argument::n_int_register_parameters_j) {
+          regs[i].set1(INT_ArgReg[int_args++]->as_VMReg());
+        } else {
+          regs[i].set1(VMRegImpl::stack2reg(stk_args));
+          stk_args += 2;
+        }
+        break;
+      case T_VOID:
+        // halves of T_LONG or T_DOUBLE
+        assert(i != 0 && (sig_bt[i - 1] == T_LONG || sig_bt[i - 1] == T_DOUBLE), "expecting half");
+        regs[i].set_bad();
+        break;
+      case T_LONG:      // fall through
+        assert((i + 1) < total_args_passed && sig_bt[i + 1] == T_VOID, "expecting half");
+      case T_OBJECT:    // fall through
+      case T_ARRAY:     // fall through
+      case T_ADDRESS:
+        if (int_args < Argument::n_int_register_parameters_j) {
+          regs[i].set2(INT_ArgReg[int_args++]->as_VMReg());
+        } else {
+          regs[i].set2(VMRegImpl::stack2reg(stk_args));
+          stk_args += 2;
+        }
+        break;
+      case T_FLOAT:
+        if (fp_args < Argument::n_float_register_parameters_j) {
+          regs[i].set1(FP_ArgReg[fp_args++]->as_VMReg());
+        } else {
+          regs[i].set1(VMRegImpl::stack2reg(stk_args));
+          stk_args += 2;
+        }
+        break;
+      case T_DOUBLE:
+        assert((i + 1) < total_args_passed && sig_bt[i + 1] == T_VOID, "expecting half");
+        if (fp_args < Argument::n_float_register_parameters_j) {
+          regs[i].set2(FP_ArgReg[fp_args++]->as_VMReg());
+        } else {
+          regs[i].set2(VMRegImpl::stack2reg(stk_args));
+          stk_args += 2;
+        }
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  }
+
+  return align_up(stk_args, 2);
+}
+
+// Patch the callers callsite with entry to compiled code if it exists.
+static void patch_callers_callsite(MacroAssembler *masm) {
+  assert_cond(masm != NULL);
+  Label L;
+  __ ld(t0, Address(xmethod, in_bytes(Method::code_offset())));
+  __ beqz(t0, L);
+
+  __ enter();
+  __ push_CPU_state();
+
+  // VM needs caller's callsite
+  // VM needs target method
+  // This needs to be a long call since we will relocate this adapter to
+  // the codeBuffer and it may not reach
+
+#ifndef PRODUCT
+  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+
+  __ mv(c_rarg0, xmethod);
+  __ mv(c_rarg1, ra);
+  int32_t offset = 0;
+  __ la_patchable(t0, RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::fixup_callers_callsite)), offset);
+  __ jalr(x1, t0, offset);
+
+  // Explicit fence.i required because fixup_callers_callsite may change the code
+  // stream.
+  __ safepoint_ifence();
+
+  __ pop_CPU_state();
+  // restore sp
+  __ leave();
+  __ bind(L);
+}
+
+static void gen_c2i_adapter(MacroAssembler *masm,
+                            int total_args_passed,
+                            int comp_args_on_stack,
+                            const BasicType *sig_bt,
+                            const VMRegPair *regs,
+                            Label& skip_fixup) {
+  // Before we get into the guts of the C2I adapter, see if we should be here
+  // at all.  We've come from compiled code and are attempting to jump to the
+  // interpreter, which means the caller made a static call to get here
+  // (vcalls always get a compiled target if there is one).  Check for a
+  // compiled target.  If there is one, we need to patch the caller's call.
+  patch_callers_callsite(masm);
+
+  __ bind(skip_fixup);
+
+  int words_pushed = 0;
+
+  // Since all args are passed on the stack, total_args_passed *
+  // Interpreter::stackElementSize is the space we need.
+
+  int extraspace = total_args_passed * Interpreter::stackElementSize;
+
+  __ mv(x30, sp);
+
+  // stack is aligned, keep it that way
+  extraspace = align_up(extraspace, 2 * wordSize);
+
+  if (extraspace) {
+    __ sub(sp, sp, extraspace);
+  }
+
+  // Now write the args into the outgoing interpreter space
+  for (int i = 0; i < total_args_passed; i++) {
+    if (sig_bt[i] == T_VOID) {
+      assert(i > 0 && (sig_bt[i - 1] == T_LONG || sig_bt[i - 1] == T_DOUBLE), "missing half");
+      continue;
+    }
+
+    // offset to start parameters
+    int st_off   = (total_args_passed - i - 1) * Interpreter::stackElementSize;
+    int next_off = st_off - Interpreter::stackElementSize;
+
+    // Say 4 args:
+    // i   st_off
+    // 0   32 T_LONG
+    // 1   24 T_VOID
+    // 2   16 T_OBJECT
+    // 3    8 T_BOOL
+    // -    0 return address
+    //
+    // However to make thing extra confusing. Because we can fit a Java long/double in
+    // a single slot on a 64 bt vm and it would be silly to break them up, the interpreter
+    // leaves one slot empty and only stores to a single slot. In this case the
+    // slot that is occupied is the T_VOID slot. See I said it was confusing.
+
+    VMReg r_1 = regs[i].first();
+    VMReg r_2 = regs[i].second();
+    if (!r_1->is_valid()) {
+      assert(!r_2->is_valid(), "");
+      continue;
+    }
+    if (r_1->is_stack()) {
+      // memory to memory use t0
+      int ld_off = (r_1->reg2stack() * VMRegImpl::stack_slot_size
+                    + extraspace
+                    + words_pushed * wordSize);
+      if (!r_2->is_valid()) {
+        __ lwu(t0, Address(sp, ld_off));
+        __ sd(t0, Address(sp, st_off), /*temp register*/esp);
+      } else {
+        __ ld(t0, Address(sp, ld_off), /*temp register*/esp);
+
+        // Two VMREgs|OptoRegs can be T_OBJECT, T_ADDRESS, T_DOUBLE, T_LONG
+        // T_DOUBLE and T_LONG use two slots in the interpreter
+        if ( sig_bt[i] == T_LONG || sig_bt[i] == T_DOUBLE) {
+          // ld_off == LSW, ld_off+wordSize == MSW
+          // st_off == MSW, next_off == LSW
+          __ sd(t0, Address(sp, next_off), /*temp register*/esp);
+#ifdef ASSERT
+          // Overwrite the unused slot with known junk
+          __ li(t0, 0xdeadffffdeadaaaaul);
+          __ sd(t0, Address(sp, st_off), /*temp register*/esp);
+#endif /* ASSERT */
+        } else {
+          __ sd(t0, Address(sp, st_off), /*temp register*/esp);
+        }
+      }
+    } else if (r_1->is_Register()) {
+      Register r = r_1->as_Register();
+      if (!r_2->is_valid()) {
+        // must be only an int (or less ) so move only 32bits to slot
+        __ sd(r, Address(sp, st_off));
+      } else {
+        // Two VMREgs|OptoRegs can be T_OBJECT, T_ADDRESS, T_DOUBLE, T_LONG
+        // T_DOUBLE and T_LONG use two slots in the interpreter
+        if ( sig_bt[i] == T_LONG || sig_bt[i] == T_DOUBLE) {
+          // long/double in gpr
+#ifdef ASSERT
+          // Overwrite the unused slot with known junk
+          __ li(t0, 0xdeadffffdeadaaabul);
+          __ sd(t0, Address(sp, st_off), /*temp register*/esp);
+#endif /* ASSERT */
+          __ sd(r, Address(sp, next_off));
+        } else {
+          __ sd(r, Address(sp, st_off));
+        }
+      }
+    } else {
+      assert(r_1->is_FloatRegister(), "");
+      if (!r_2->is_valid()) {
+        // only a float use just part of the slot
+        __ fsw(r_1->as_FloatRegister(), Address(sp, st_off));
+      } else {
+#ifdef ASSERT
+        // Overwrite the unused slot with known junk
+        __ li(t0, 0xdeadffffdeadaaacul);
+        __ sd(t0, Address(sp, st_off), /*temp register*/esp);
+#endif /* ASSERT */
+        __ fsd(r_1->as_FloatRegister(), Address(sp, next_off));
+      }
+    }
+  }
+
+  __ mv(esp, sp); // Interp expects args on caller's expression stack
+
+  __ ld(t0, Address(xmethod, in_bytes(Method::interpreter_entry_offset())));
+  __ jr(t0);
+}
+
+void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
+                                    int total_args_passed,
+                                    int comp_args_on_stack,
+                                    const BasicType *sig_bt,
+                                    const VMRegPair *regs) {
+  // Cut-out for having no stack args.
+  int comp_words_on_stack = align_up(comp_args_on_stack * VMRegImpl::stack_slot_size, wordSize) >> LogBytesPerWord;
+  if (comp_args_on_stack != 0) {
+    __ sub(t0, sp, comp_words_on_stack * wordSize);
+    __ andi(sp, t0, -16);
+  }
+
+  // Will jump to the compiled code just as if compiled code was doing it.
+  // Pre-load the register-jump target early, to schedule it better.
+  __ ld(t1, Address(xmethod, in_bytes(Method::from_compiled_offset())));
+
+  // Now generate the shuffle code.
+  for (int i = 0; i < total_args_passed; i++) {
+    if (sig_bt[i] == T_VOID) {
+      assert(i > 0 && (sig_bt[i - 1] == T_LONG || sig_bt[i - 1] == T_DOUBLE), "missing half");
+      continue;
+    }
+
+    // Pick up 0, 1 or 2 words from SP+offset.
+
+    assert(!regs[i].second()->is_valid() || regs[i].first()->next() == regs[i].second(),
+           "scrambled load targets?");
+    // Load in argument order going down.
+    int ld_off = (total_args_passed - i - 1) * Interpreter::stackElementSize;
+    // Point to interpreter value (vs. tag)
+    int next_off = ld_off - Interpreter::stackElementSize;
+
+    VMReg r_1 = regs[i].first();
+    VMReg r_2 = regs[i].second();
+    if (!r_1->is_valid()) {
+      assert(!r_2->is_valid(), "");
+      continue;
+    }
+    if (r_1->is_stack()) {
+      // Convert stack slot to an SP offset (+ wordSize to account for return address )
+      int st_off = regs[i].first()->reg2stack() * VMRegImpl::stack_slot_size;
+      if (!r_2->is_valid()) {
+        __ lw(t0, Address(esp, ld_off));
+        __ sd(t0, Address(sp, st_off), /*temp register*/t2);
+      } else {
+        //
+        // We are using two optoregs. This can be either T_OBJECT,
+        // T_ADDRESS, T_LONG, or T_DOUBLE the interpreter allocates
+        // two slots but only uses one for thr T_LONG or T_DOUBLE case
+        // So we must adjust where to pick up the data to match the
+        // interpreter.
+        //
+        // Interpreter local[n] == MSW, local[n+1] == LSW however locals
+        // are accessed as negative so LSW is at LOW address
+
+        // ld_off is MSW so get LSW
+        const int offset = (sig_bt[i] == T_LONG || sig_bt[i] == T_DOUBLE) ?
+                           next_off : ld_off;
+        __ ld(t0, Address(esp, offset));
+        // st_off is LSW (i.e. reg.first())
+        __ sd(t0, Address(sp, st_off), /*temp register*/t2);
+      }
+    } else if (r_1->is_Register()) {  // Register argument
+      Register r = r_1->as_Register();
+      if (r_2->is_valid()) {
+        //
+        // We are using two VMRegs. This can be either T_OBJECT,
+        // T_ADDRESS, T_LONG, or T_DOUBLE the interpreter allocates
+        // two slots but only uses one for thr T_LONG or T_DOUBLE case
+        // So we must adjust where to pick up the data to match the
+        // interpreter.
+
+        const int offset = (sig_bt[i] == T_LONG || sig_bt[i] == T_DOUBLE) ?
+                           next_off : ld_off;
+
+        // this can be a misaligned move
+        __ ld(r, Address(esp, offset));
+      } else {
+        // sign extend and use a full word?
+        __ lw(r, Address(esp, ld_off));
+      }
+    } else {
+      if (!r_2->is_valid()) {
+        __ flw(r_1->as_FloatRegister(), Address(esp, ld_off));
+      } else {
+        __ fld(r_1->as_FloatRegister(), Address(esp, next_off));
+      }
+    }
+  }
+
+  // 6243940 We might end up in handle_wrong_method if
+  // the callee is deoptimized as we race thru here. If that
+  // happens we don't want to take a safepoint because the
+  // caller frame will look interpreted and arguments are now
+  // "compiled" so it is much better to make this transition
+  // invisible to the stack walking code. Unfortunately if
+  // we try and find the callee by normal means a safepoint
+  // is possible. So we stash the desired callee in the thread
+  // and the vm will find there should this case occur.
+
+  __ sd(xmethod, Address(xthread, JavaThread::callee_target_offset()));
+
+  __ jr(t1);
+}
+
+// ---------------------------------------------------------------
+AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                                            int total_args_passed,
+                                                            int comp_args_on_stack,
+                                                            const BasicType *sig_bt,
+                                                            const VMRegPair *regs,
+                                                            AdapterFingerPrint* fingerprint) {
+  address i2c_entry = __ pc();
+  gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
+
+  address c2i_unverified_entry = __ pc();
+  Label skip_fixup;
+
+  Label ok;
+
+  const Register holder = t1;
+  const Register receiver = j_rarg0;
+  const Register tmp = t2;  // A call-clobbered register not used for arg passing
+
+  // -------------------------------------------------------------------------
+  // Generate a C2I adapter.  On entry we know xmethod holds the Method* during calls
+  // to the interpreter.  The args start out packed in the compiled layout.  They
+  // need to be unpacked into the interpreter layout.  This will almost always
+  // require some stack space.  We grow the current (compiled) stack, then repack
+  // the args.  We  finally end in a jump to the generic interpreter entry point.
+  // On exit from the interpreter, the interpreter will restore our SP (lest the
+  // compiled code, which relys solely on SP and not FP, get sick).
+
+  {
+    __ block_comment("c2i_unverified_entry {");
+    __ load_klass(t0, receiver);
+    __ ld(tmp, Address(holder, CompiledICHolder::holder_klass_offset()));
+    __ ld(xmethod, Address(holder, CompiledICHolder::holder_metadata_offset()));
+    __ beq(t0, tmp, ok);
+    __ far_jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
+
+    __ bind(ok);
+    // Method might have been compiled since the call site was patched to
+    // interpreted; if that is the case treat it as a miss so we can get
+    // the call site corrected.
+    __ ld(t0, Address(xmethod, in_bytes(Method::code_offset())));
+    __ beqz(t0, skip_fixup);
+    __ far_jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
+    __ block_comment("} c2i_unverified_entry");
+  }
+
+  address c2i_entry = __ pc();
+
+  // Class initialization barrier for static methods
+  address c2i_no_clinit_check_entry = NULL;
+  if (VM_Version::supports_fast_class_init_checks()) {
+    Label L_skip_barrier;
+
+    { // Bypass the barrier for non-static methods
+      __ lwu(t0, Address(xmethod, Method::access_flags_offset()));
+      __ andi(t1, t0, JVM_ACC_STATIC);
+      __ beqz(t1, L_skip_barrier); // non-static
+    }
+
+    __ load_method_holder(t1, xmethod);
+    __ clinit_barrier(t1, t0, &L_skip_barrier);
+    __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+
+    __ bind(L_skip_barrier);
+    c2i_no_clinit_check_entry = __ pc();
+  }
+
+  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  bs->c2i_entry_barrier(masm);
+
+  gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
+
+  __ flush();
+  return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
+}
+
+int SharedRuntime::vector_calling_convention(VMRegPair *regs,
+                                             uint num_bits,
+                                             uint total_args_passed) {
+  Unimplemented();
+  return 0;
+}
+
+int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
+                                         VMRegPair *regs,
+                                         VMRegPair *regs2,
+                                         int total_args_passed) {
+  assert(regs2 == NULL, "not needed on riscv");
+
+  // We return the amount of VMRegImpl stack slots we need to reserve for all
+  // the arguments NOT counting out_preserve_stack_slots.
+
+  static const Register INT_ArgReg[Argument::n_int_register_parameters_c] = {
+    c_rarg0, c_rarg1, c_rarg2, c_rarg3,
+    c_rarg4, c_rarg5,  c_rarg6,  c_rarg7
+  };
+  static const FloatRegister FP_ArgReg[Argument::n_float_register_parameters_c] = {
+    c_farg0, c_farg1, c_farg2, c_farg3,
+    c_farg4, c_farg5, c_farg6, c_farg7
+  };
+
+  uint int_args = 0;
+  uint fp_args = 0;
+  uint stk_args = 0; // inc by 2 each time
+
+  for (int i = 0; i < total_args_passed; i++) {
+    switch (sig_bt[i]) {
+      case T_BOOLEAN:  // fall through
+      case T_CHAR:     // fall through
+      case T_BYTE:     // fall through
+      case T_SHORT:    // fall through
+      case T_INT:
+        if (int_args < Argument::n_int_register_parameters_c) {
+          regs[i].set1(INT_ArgReg[int_args++]->as_VMReg());
+        } else {
+          regs[i].set1(VMRegImpl::stack2reg(stk_args));
+          stk_args += 2;
+        }
+        break;
+      case T_LONG:      // fall through
+        assert((i + 1) < total_args_passed && sig_bt[i + 1] == T_VOID, "expecting half");
+      case T_OBJECT:    // fall through
+      case T_ARRAY:     // fall through
+      case T_ADDRESS:   // fall through
+      case T_METADATA:
+        if (int_args < Argument::n_int_register_parameters_c) {
+          regs[i].set2(INT_ArgReg[int_args++]->as_VMReg());
+        } else {
+          regs[i].set2(VMRegImpl::stack2reg(stk_args));
+          stk_args += 2;
+        }
+        break;
+      case T_FLOAT:
+        if (fp_args < Argument::n_float_register_parameters_c) {
+          regs[i].set1(FP_ArgReg[fp_args++]->as_VMReg());
+        } else if (int_args < Argument::n_int_register_parameters_c) {
+          regs[i].set1(INT_ArgReg[int_args++]->as_VMReg());
+        } else {
+          regs[i].set1(VMRegImpl::stack2reg(stk_args));
+          stk_args += 2;
+        }
+        break;
+      case T_DOUBLE:
+        assert((i + 1) < total_args_passed && sig_bt[i + 1] == T_VOID, "expecting half");
+        if (fp_args < Argument::n_float_register_parameters_c) {
+          regs[i].set2(FP_ArgReg[fp_args++]->as_VMReg());
+        } else if (int_args < Argument::n_int_register_parameters_c) {
+          regs[i].set2(INT_ArgReg[int_args++]->as_VMReg());
+        } else {
+          regs[i].set2(VMRegImpl::stack2reg(stk_args));
+          stk_args += 2;
+        }
+        break;
+      case T_VOID: // Halves of longs and doubles
+        assert(i != 0 && (sig_bt[i - 1] == T_LONG || sig_bt[i - 1] == T_DOUBLE), "expecting half");
+        regs[i].set_bad();
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  }
+
+  return stk_args;
+}
+
+// On 64 bit we will store integer like items to the stack as
+// 64 bits items (riscv64 abi) even though java would only store
+// 32bits for a parameter. On 32bit it will simply be 32 bits
+// So this routine will do 32->32 on 32bit and 32->64 on 64bit
+static void move32_64(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
+  assert_cond(masm != NULL);
+  if (src.first()->is_stack()) {
+    if (dst.first()->is_stack()) {
+      // stack to stack
+      __ ld(t0, Address(fp, reg2offset_in(src.first())));
+      __ sd(t0, Address(sp, reg2offset_out(dst.first())));
+    } else {
+      // stack to reg
+      __ lw(dst.first()->as_Register(), Address(fp, reg2offset_in(src.first())));
+    }
+  } else if (dst.first()->is_stack()) {
+    // reg to stack
+    __ sd(src.first()->as_Register(), Address(sp, reg2offset_out(dst.first())));
+  } else {
+    if (dst.first() != src.first()) {
+      // 32bits extend sign
+      __ addw(dst.first()->as_Register(), src.first()->as_Register(), zr);
+    }
+  }
+}
+
+// An oop arg. Must pass a handle not the oop itself
+static void object_move(MacroAssembler* masm,
+                        OopMap* map,
+                        int oop_handle_offset,
+                        int framesize_in_slots,
+                        VMRegPair src,
+                        VMRegPair dst,
+                        bool is_receiver,
+                        int* receiver_offset) {
+  assert_cond(masm != NULL && map != NULL && receiver_offset != NULL);
+  // must pass a handle. First figure out the location we use as a handle
+  Register rHandle = dst.first()->is_stack() ? t1 : dst.first()->as_Register();
+
+  // See if oop is NULL if it is we need no handle
+
+  if (src.first()->is_stack()) {
+
+    // Oop is already on the stack as an argument
+    int offset_in_older_frame = src.first()->reg2stack() + SharedRuntime::out_preserve_stack_slots();
+    map->set_oop(VMRegImpl::stack2reg(offset_in_older_frame + framesize_in_slots));
+    if (is_receiver) {
+      *receiver_offset = (offset_in_older_frame + framesize_in_slots) * VMRegImpl::stack_slot_size;
+    }
+
+    __ ld(t0, Address(fp, reg2offset_in(src.first())));
+    __ la(rHandle, Address(fp, reg2offset_in(src.first())));
+    // conditionally move a NULL
+    Label notZero1;
+    __ bnez(t0, notZero1);
+    __ mv(rHandle, zr);
+    __ bind(notZero1);
+  } else {
+
+    // Oop is in an a register we must store it to the space we reserve
+    // on the stack for oop_handles and pass a handle if oop is non-NULL
+
+    const Register rOop = src.first()->as_Register();
+    int oop_slot = -1;
+    if (rOop == j_rarg0) {
+      oop_slot = 0;
+    } else if (rOop == j_rarg1) {
+      oop_slot = 1;
+    } else if (rOop == j_rarg2) {
+      oop_slot = 2;
+    } else if (rOop == j_rarg3) {
+      oop_slot = 3;
+    } else if (rOop == j_rarg4) {
+      oop_slot = 4;
+    } else if (rOop == j_rarg5) {
+      oop_slot = 5;
+    } else if (rOop == j_rarg6) {
+      oop_slot = 6;
+    } else {
+      assert(rOop == j_rarg7, "wrong register");
+      oop_slot = 7;
+    }
+
+    oop_slot = oop_slot * VMRegImpl::slots_per_word + oop_handle_offset;
+    int offset = oop_slot * VMRegImpl::stack_slot_size;
+
+    map->set_oop(VMRegImpl::stack2reg(oop_slot));
+    // Store oop in handle area, may be NULL
+    __ sd(rOop, Address(sp, offset));
+    if (is_receiver) {
+      *receiver_offset = offset;
+    }
+
+    //rOop maybe the same as rHandle
+    if (rOop == rHandle) {
+      Label isZero;
+      __ beqz(rOop, isZero);
+      __ la(rHandle, Address(sp, offset));
+      __ bind(isZero);
+    } else {
+      Label notZero2;
+      __ la(rHandle, Address(sp, offset));
+      __ bnez(rOop, notZero2);
+      __ mv(rHandle, zr);
+      __ bind(notZero2);
+    }
+  }
+
+  // If arg is on the stack then place it otherwise it is already in correct reg.
+  if (dst.first()->is_stack()) {
+    __ sd(rHandle, Address(sp, reg2offset_out(dst.first())));
+  }
+}
+
+// A float arg may have to do float reg int reg conversion
+static void float_move(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
+  assert(src.first()->is_stack() && dst.first()->is_stack() ||
+         src.first()->is_reg() && dst.first()->is_reg() || src.first()->is_stack() && dst.first()->is_reg(), "Unexpected error");
+  assert_cond(masm != NULL);
+  if (src.first()->is_stack()) {
+    if (dst.first()->is_stack()) {
+      __ lwu(t0, Address(fp, reg2offset_in(src.first())));
+      __ sw(t0, Address(sp, reg2offset_out(dst.first())));
+    } else if (dst.first()->is_Register()) {
+      __ lwu(dst.first()->as_Register(), Address(fp, reg2offset_in(src.first())));
+    } else {
+      ShouldNotReachHere();
+    }
+  } else if (src.first() != dst.first()) {
+    if (src.is_single_phys_reg() && dst.is_single_phys_reg()) {
+      __ fmv_s(dst.first()->as_FloatRegister(), src.first()->as_FloatRegister());
+    } else {
+      ShouldNotReachHere();
+    }
+  }
+}
+
+// A long move
+static void long_move(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
+  assert_cond(masm != NULL);
+  if (src.first()->is_stack()) {
+    if (dst.first()->is_stack()) {
+      // stack to stack
+      __ ld(t0, Address(fp, reg2offset_in(src.first())));
+      __ sd(t0, Address(sp, reg2offset_out(dst.first())));
+    } else {
+      // stack to reg
+      __ ld(dst.first()->as_Register(), Address(fp, reg2offset_in(src.first())));
+    }
+  } else if (dst.first()->is_stack()) {
+    // reg to stack
+    __ sd(src.first()->as_Register(), Address(sp, reg2offset_out(dst.first())));
+  } else {
+    if (dst.first() != src.first()) {
+      __ mv(dst.first()->as_Register(), src.first()->as_Register());
+    }
+  }
+}
+
+// A double move
+static void double_move(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
+  assert(src.first()->is_stack() && dst.first()->is_stack() ||
+         src.first()->is_reg() && dst.first()->is_reg() || src.first()->is_stack() && dst.first()->is_reg(), "Unexpected error");
+  assert_cond(masm != NULL);
+  if (src.first()->is_stack()) {
+    if (dst.first()->is_stack()) {
+      __ ld(t0, Address(fp, reg2offset_in(src.first())));
+      __ sd(t0, Address(sp, reg2offset_out(dst.first())));
+    } else if (dst.first()-> is_Register()) {
+      __ ld(dst.first()->as_Register(), Address(fp, reg2offset_in(src.first())));
+    } else {
+      ShouldNotReachHere();
+    }
+  } else if (src.first() != dst.first()) {
+    if (src.is_single_phys_reg() && dst.is_single_phys_reg()) {
+      __ fmv_d(dst.first()->as_FloatRegister(), src.first()->as_FloatRegister());
+    } else {
+      ShouldNotReachHere();
+    }
+  }
+}
+
+void SharedRuntime::save_native_result(MacroAssembler *masm, BasicType ret_type, int frame_slots) {
+  assert_cond(masm != NULL);
+  // We always ignore the frame_slots arg and just use the space just below frame pointer
+  // which by this time is free to use
+  switch (ret_type) {
+    case T_FLOAT:
+      __ fsw(f10, Address(fp, -3 * wordSize));
+      break;
+    case T_DOUBLE:
+      __ fsd(f10, Address(fp, -3 * wordSize));
+      break;
+    case T_VOID:  break;
+    default: {
+      __ sd(x10, Address(fp, -3 * wordSize));
+    }
+  }
+}
+
+void SharedRuntime::restore_native_result(MacroAssembler *masm, BasicType ret_type, int frame_slots) {
+  assert_cond(masm != NULL);
+  // We always ignore the frame_slots arg and just use the space just below frame pointer
+  // which by this time is free to use
+  switch (ret_type) {
+    case T_FLOAT:
+      __ flw(f10, Address(fp, -3 * wordSize));
+      break;
+    case T_DOUBLE:
+      __ fld(f10, Address(fp, -3 * wordSize));
+      break;
+    case T_VOID:  break;
+    default: {
+      __ ld(x10, Address(fp, -3 * wordSize));
+    }
+  }
+}
+
+static void save_args(MacroAssembler *masm, int arg_count, int first_arg, VMRegPair *args) {
+  assert_cond(masm != NULL && args != NULL);
+  RegSet x;
+  for ( int i = first_arg ; i < arg_count ; i++ ) {
+    if (args[i].first()->is_Register()) {
+      x = x + args[i].first()->as_Register();
+    } else if (args[i].first()->is_FloatRegister()) {
+      __ addi(sp, sp, -2 * wordSize);
+      __ fsd(args[i].first()->as_FloatRegister(), Address(sp, 0));
+    }
+  }
+  __ push_reg(x, sp);
+}
+
+static void restore_args(MacroAssembler *masm, int arg_count, int first_arg, VMRegPair *args) {
+  assert_cond(masm != NULL && args != NULL);
+  RegSet x;
+  for ( int i = first_arg ; i < arg_count ; i++ ) {
+    if (args[i].first()->is_Register()) {
+      x = x + args[i].first()->as_Register();
+    } else {
+      ;
+    }
+  }
+  __ pop_reg(x, sp);
+  for ( int i = arg_count - 1 ; i >= first_arg ; i-- ) {
+    if (args[i].first()->is_Register()) {
+      ;
+    } else if (args[i].first()->is_FloatRegister()) {
+      __ fld(args[i].first()->as_FloatRegister(), Address(sp, 0));
+      __ add(sp, sp, 2 * wordSize);
+    }
+  }
+}
+
+static void rt_call(MacroAssembler* masm, address dest) {
+  assert_cond(masm != NULL);
+  CodeBlob *cb = CodeCache::find_blob(dest);
+  if (cb) {
+    __ far_call(RuntimeAddress(dest));
+  } else {
+    int32_t offset = 0;
+    __ la_patchable(t0, RuntimeAddress(dest), offset);
+    __ jalr(x1, t0, offset);
+  }
+}
+
+static void verify_oop_args(MacroAssembler* masm,
+                            const methodHandle& method,
+                            const BasicType* sig_bt,
+                            const VMRegPair* regs) {
+  const Register temp_reg = x9;  // not part of any compiled calling seq
+  if (VerifyOops) {
+    for (int i = 0; i < method->size_of_parameters(); i++) {
+      if (sig_bt[i] == T_OBJECT ||
+          sig_bt[i] == T_ARRAY) {
+        VMReg r = regs[i].first();
+        assert(r->is_valid(), "bad oop arg");
+        if (r->is_stack()) {
+          __ ld(temp_reg, Address(sp, r->reg2stack() * VMRegImpl::stack_slot_size));
+          __ verify_oop(temp_reg);
+        } else {
+          __ verify_oop(r->as_Register());
+        }
+      }
+    }
+  }
+}
+
+static void gen_special_dispatch(MacroAssembler* masm,
+                                 const methodHandle& method,
+                                 const BasicType* sig_bt,
+                                 const VMRegPair* regs) {
+  verify_oop_args(masm, method, sig_bt, regs);
+  vmIntrinsics::ID iid = method->intrinsic_id();
+
+  // Now write the args into the outgoing interpreter space
+  bool     has_receiver   = false;
+  Register receiver_reg   = noreg;
+  int      member_arg_pos = -1;
+  Register member_reg     = noreg;
+  int      ref_kind       = MethodHandles::signature_polymorphic_intrinsic_ref_kind(iid);
+  if (ref_kind != 0) {
+    member_arg_pos = method->size_of_parameters() - 1;  // trailing MemberName argument
+    member_reg = x9;  // known to be free at this point
+    has_receiver = MethodHandles::ref_kind_has_receiver(ref_kind);
+  } else if (iid == vmIntrinsics::_invokeBasic || iid == vmIntrinsics::_linkToNative) {
+    has_receiver = true;
+  } else {
+    fatal("unexpected intrinsic id %d", vmIntrinsics::as_int(iid));
+  }
+
+  if (member_reg != noreg) {
+    // Load the member_arg into register, if necessary.
+    SharedRuntime::check_member_name_argument_is_last_argument(method, sig_bt, regs);
+    VMReg r = regs[member_arg_pos].first();
+    if (r->is_stack()) {
+      __ ld(member_reg, Address(sp, r->reg2stack() * VMRegImpl::stack_slot_size));
+    } else {
+      // no data motion is needed
+      member_reg = r->as_Register();
+    }
+  }
+
+  if (has_receiver) {
+    // Make sure the receiver is loaded into a register.
+    assert(method->size_of_parameters() > 0, "oob");
+    assert(sig_bt[0] == T_OBJECT, "receiver argument must be an object");
+    VMReg r = regs[0].first();
+    assert(r->is_valid(), "bad receiver arg");
+    if (r->is_stack()) {
+      // Porting note:  This assumes that compiled calling conventions always
+      // pass the receiver oop in a register.  If this is not true on some
+      // platform, pick a temp and load the receiver from stack.
+      fatal("receiver always in a register");
+      receiver_reg = x12;  // known to be free at this point
+      __ ld(receiver_reg, Address(sp, r->reg2stack() * VMRegImpl::stack_slot_size));
+    } else {
+      // no data motion is needed
+      receiver_reg = r->as_Register();
+    }
+  }
+
+  // Figure out which address we are really jumping to:
+  MethodHandles::generate_method_handle_dispatch(masm, iid,
+                                                 receiver_reg, member_reg, /*for_compiler_entry:*/ true);
+}
+
+// ---------------------------------------------------------------------------
+// Generate a native wrapper for a given method.  The method takes arguments
+// in the Java compiled code convention, marshals them to the native
+// convention (handlizes oops, etc), transitions to native, makes the call,
+// returns to java state (possibly blocking), unhandlizes any result and
+// returns.
+//
+// Critical native functions are a shorthand for the use of
+// GetPrimtiveArrayCritical and disallow the use of any other JNI
+// functions.  The wrapper is expected to unpack the arguments before
+// passing them to the callee and perform checks before and after the
+// native call to ensure that they GCLocker
+// lock_critical/unlock_critical semantics are followed.  Some other
+// parts of JNI setup are skipped like the tear down of the JNI handle
+// block and the check for pending exceptions it's impossible for them
+// to be thrown.
+//
+// They are roughly structured like this:
+//    if (GCLocker::needs_gc()) SharedRuntime::block_for_jni_critical()
+//    tranistion to thread_in_native
+//    unpack arrray arguments and call native entry point
+//    check for safepoint in progress
+//    check if any thread suspend flags are set
+//      call into JVM and possible unlock the JNI critical
+//      if a GC was suppressed while in the critical native.
+//    transition back to thread_in_Java
+//    return to caller
+//
+nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
+                                                const methodHandle& method,
+                                                int compile_id,
+                                                BasicType* in_sig_bt,
+                                                VMRegPair* in_regs,
+                                                BasicType ret_type) {
+  if (method->is_method_handle_intrinsic()) {
+    vmIntrinsics::ID iid = method->intrinsic_id();
+    intptr_t start = (intptr_t)__ pc();
+    int vep_offset = ((intptr_t)__ pc()) - start;
+
+    // First instruction must be a nop as it may need to be patched on deoptimisation
+    __ nop();
+    gen_special_dispatch(masm,
+                         method,
+                         in_sig_bt,
+                         in_regs);
+    int frame_complete = ((intptr_t)__ pc()) - start;  // not complete, period
+    __ flush();
+    int stack_slots = SharedRuntime::out_preserve_stack_slots();  // no out slots at all, actually
+    return nmethod::new_native_nmethod(method,
+                                       compile_id,
+                                       masm->code(),
+                                       vep_offset,
+                                       frame_complete,
+                                       stack_slots / VMRegImpl::slots_per_word,
+                                       in_ByteSize(-1),
+                                       in_ByteSize(-1),
+                                       (OopMapSet*)NULL);
+  }
+  address native_func = method->native_function();
+  assert(native_func != NULL, "must have function");
+
+  // An OopMap for lock (and class if static)
+  OopMapSet *oop_maps = new OopMapSet();
+  assert_cond(oop_maps != NULL);
+  intptr_t start = (intptr_t)__ pc();
+
+  // We have received a description of where all the java arg are located
+  // on entry to the wrapper. We need to convert these args to where
+  // the jni function will expect them. To figure out where they go
+  // we convert the java signature to a C signature by inserting
+  // the hidden arguments as arg[0] and possibly arg[1] (static method)
+
+  const int total_in_args = method->size_of_parameters();
+  int total_c_args = total_in_args + (method->is_static() ? 2 : 1);
+
+  BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
+  VMRegPair* out_regs   = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
+  BasicType* in_elem_bt = NULL;
+
+  int argc = 0;
+  out_sig_bt[argc++] = T_ADDRESS;
+  if (method->is_static()) {
+    out_sig_bt[argc++] = T_OBJECT;
+  }
+
+  for (int i = 0; i < total_in_args ; i++) {
+    out_sig_bt[argc++] = in_sig_bt[i];
+  }
+
+  // Now figure out where the args must be stored and how much stack space
+  // they require.
+  int out_arg_slots = c_calling_convention(out_sig_bt, out_regs, NULL, total_c_args);
+
+  // Compute framesize for the wrapper.  We need to handlize all oops in
+  // incoming registers
+
+  // Calculate the total number of stack slots we will need.
+
+  // First count the abi requirement plus all of the outgoing args
+  int stack_slots = SharedRuntime::out_preserve_stack_slots() + out_arg_slots;
+
+  // Now the space for the inbound oop handle area
+  int total_save_slots = 8 * VMRegImpl::slots_per_word;  // 8 arguments passed in registers
+
+  int oop_handle_offset = stack_slots;
+  stack_slots += total_save_slots;
+
+  // Now any space we need for handlizing a klass if static method
+
+  int klass_slot_offset = 0;
+  int klass_offset = -1;
+  int lock_slot_offset = 0;
+  bool is_static = false;
+
+  if (method->is_static()) {
+    klass_slot_offset = stack_slots;
+    stack_slots += VMRegImpl::slots_per_word;
+    klass_offset = klass_slot_offset * VMRegImpl::stack_slot_size;
+    is_static = true;
+  }
+
+  // Plus a lock if needed
+
+  if (method->is_synchronized()) {
+    lock_slot_offset = stack_slots;
+    stack_slots += VMRegImpl::slots_per_word;
+  }
+
+  // Now a place (+2) to save return values or temp during shuffling
+  // + 4 for return address (which we own) and saved fp
+  stack_slots += 6;
+
+  // Ok The space we have allocated will look like:
+  //
+  //
+  // FP-> |                     |
+  //      | 2 slots (ra)        |
+  //      | 2 slots (fp)        |
+  //      |---------------------|
+  //      | 2 slots for moves   |
+  //      |---------------------|
+  //      | lock box (if sync)  |
+  //      |---------------------| <- lock_slot_offset
+  //      | klass (if static)   |
+  //      |---------------------| <- klass_slot_offset
+  //      | oopHandle area      |
+  //      |---------------------| <- oop_handle_offset (8 java arg registers)
+  //      | outbound memory     |
+  //      | based arguments     |
+  //      |                     |
+  //      |---------------------|
+  //      |                     |
+  // SP-> | out_preserved_slots |
+  //
+  //
+
+
+  // Now compute actual number of stack words we need rounding to make
+  // stack properly aligned.
+  stack_slots = align_up(stack_slots, StackAlignmentInSlots);
+
+  int stack_size = stack_slots * VMRegImpl::stack_slot_size;
+
+  // First thing make an ic check to see if we should even be here
+
+  // We are free to use all registers as temps without saving them and
+  // restoring them except fp. fp is the only callee save register
+  // as far as the interpreter and the compiler(s) are concerned.
+
+
+  const Register ic_reg = t1;
+  const Register receiver = j_rarg0;
+
+  Label hit;
+  Label exception_pending;
+
+  assert_different_registers(ic_reg, receiver, t0);
+  __ verify_oop(receiver);
+  __ cmp_klass(receiver, ic_reg, t0, hit);
+
+  __ far_jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
+
+  // Verified entry point must be aligned
+  __ align(8);
+
+  __ bind(hit);
+
+  int vep_offset = ((intptr_t)__ pc()) - start;
+
+  // If we have to make this method not-entrant we'll overwrite its
+  // first instruction with a jump.
+  __ nop();
+
+  if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
+    Label L_skip_barrier;
+    __ mov_metadata(t1, method->method_holder()); // InstanceKlass*
+    __ clinit_barrier(t1, t0, &L_skip_barrier);
+    __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+
+    __ bind(L_skip_barrier);
+  }
+
+  // Generate stack overflow check
+  __ bang_stack_with_offset(checked_cast<int>(StackOverflow::stack_shadow_zone_size()));
+
+  // Generate a new frame for the wrapper.
+  __ enter();
+  // -2 because return address is already present and so is saved fp
+  __ sub(sp, sp, stack_size - 2 * wordSize);
+
+  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  assert_cond(bs != NULL);
+  bs->nmethod_entry_barrier(masm);
+
+  // Frame is now completed as far as size and linkage.
+  int frame_complete = ((intptr_t)__ pc()) - start;
+
+  // We use x18 as the oop handle for the receiver/klass
+  // It is callee save so it survives the call to native
+
+  const Register oop_handle_reg = x18;
+
+  //
+  // We immediately shuffle the arguments so that any vm call we have to
+  // make from here on out (sync slow path, jvmti, etc.) we will have
+  // captured the oops from our caller and have a valid oopMap for
+  // them.
+
+  // -----------------
+  // The Grand Shuffle
+
+  // The Java calling convention is either equal (linux) or denser (win64) than the
+  // c calling convention. However the because of the jni_env argument the c calling
+  // convention always has at least one more (and two for static) arguments than Java.
+  // Therefore if we move the args from java -> c backwards then we will never have
+  // a register->register conflict and we don't have to build a dependency graph
+  // and figure out how to break any cycles.
+  //
+
+  // Record esp-based slot for receiver on stack for non-static methods
+  int receiver_offset = -1;
+
+  // This is a trick. We double the stack slots so we can claim
+  // the oops in the caller's frame. Since we are sure to have
+  // more args than the caller doubling is enough to make
+  // sure we can capture all the incoming oop args from the
+  // caller.
+  //
+  OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
+  assert_cond(map != NULL);
+
+  int float_args = 0;
+  int int_args = 0;
+
+#ifdef ASSERT
+  bool reg_destroyed[RegisterImpl::number_of_registers];
+  bool freg_destroyed[FloatRegisterImpl::number_of_registers];
+  for ( int r = 0 ; r < RegisterImpl::number_of_registers ; r++ ) {
+    reg_destroyed[r] = false;
+  }
+  for ( int f = 0 ; f < FloatRegisterImpl::number_of_registers ; f++ ) {
+    freg_destroyed[f] = false;
+  }
+
+#endif /* ASSERT */
+
+  // For JNI natives the incoming and outgoing registers are offset upwards.
+  GrowableArray<int> arg_order(2 * total_in_args);
+  VMRegPair tmp_vmreg;
+  tmp_vmreg.set2(x9->as_VMReg());
+
+  for (int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0; i--, c_arg--) {
+    arg_order.push(i);
+    arg_order.push(c_arg);
+  }
+
+  int temploc = -1;
+  for (int ai = 0; ai < arg_order.length(); ai += 2) {
+    int i = arg_order.at(ai);
+    int c_arg = arg_order.at(ai + 1);
+    __ block_comment(err_msg("mv %d -> %d", i, c_arg));
+    assert(c_arg != -1 && i != -1, "wrong order");
+#ifdef ASSERT
+    if (in_regs[i].first()->is_Register()) {
+      assert(!reg_destroyed[in_regs[i].first()->as_Register()->encoding()], "destroyed reg!");
+    } else if (in_regs[i].first()->is_FloatRegister()) {
+      assert(!freg_destroyed[in_regs[i].first()->as_FloatRegister()->encoding()], "destroyed reg!");
+    }
+    if (out_regs[c_arg].first()->is_Register()) {
+      reg_destroyed[out_regs[c_arg].first()->as_Register()->encoding()] = true;
+    } else if (out_regs[c_arg].first()->is_FloatRegister()) {
+      freg_destroyed[out_regs[c_arg].first()->as_FloatRegister()->encoding()] = true;
+    }
+#endif /* ASSERT */
+    switch (in_sig_bt[i]) {
+      case T_ARRAY:
+      case T_OBJECT:
+        object_move(masm, map, oop_handle_offset, stack_slots, in_regs[i], out_regs[c_arg],
+                    ((i == 0) && (!is_static)),
+                    &receiver_offset);
+        int_args++;
+        break;
+      case T_VOID:
+        break;
+
+      case T_FLOAT:
+        float_move(masm, in_regs[i], out_regs[c_arg]);
+        float_args++;
+        break;
+
+      case T_DOUBLE:
+        assert( i + 1 < total_in_args &&
+                in_sig_bt[i + 1] == T_VOID &&
+                out_sig_bt[c_arg + 1] == T_VOID, "bad arg list");
+        double_move(masm, in_regs[i], out_regs[c_arg]);
+        float_args++;
+        break;
+
+      case T_LONG :
+        long_move(masm, in_regs[i], out_regs[c_arg]);
+        int_args++;
+        break;
+
+      case T_ADDRESS:
+        assert(false, "found T_ADDRESS in java args");
+        break;
+
+      default:
+        move32_64(masm, in_regs[i], out_regs[c_arg]);
+        int_args++;
+    }
+  }
+
+  // point c_arg at the first arg that is already loaded in case we
+  // need to spill before we call out
+  int c_arg = total_c_args - total_in_args;
+
+  // Pre-load a static method's oop into c_rarg1.
+  if (method->is_static()) {
+
+    //  load oop into a register
+    __ movoop(c_rarg1,
+              JNIHandles::make_local(method->method_holder()->java_mirror()),
+              /*immediate*/true);
+
+    // Now handlize the static class mirror it's known not-null.
+    __ sd(c_rarg1, Address(sp, klass_offset));
+    map->set_oop(VMRegImpl::stack2reg(klass_slot_offset));
+
+    // Now get the handle
+    __ la(c_rarg1, Address(sp, klass_offset));
+    // and protect the arg if we must spill
+    c_arg--;
+  }
+
+  // Change state to native (we save the return address in the thread, since it might not
+  // be pushed on the stack when we do a stack traversal).
+  // We use the same pc/oopMap repeatedly when we call out
+
+  Label native_return;
+  __ set_last_Java_frame(sp, noreg, native_return, t0);
+
+  Label dtrace_method_entry, dtrace_method_entry_done;
+  {
+    int32_t offset = 0;
+    __ la_patchable(t0, ExternalAddress((address)&DTraceMethodProbes), offset);
+    __ lbu(t0, Address(t0, offset));
+    __ addw(t0, t0, zr);
+    __ bnez(t0, dtrace_method_entry);
+    __ bind(dtrace_method_entry_done);
+  }
+
+  // RedefineClasses() tracing support for obsolete method entry
+  if (log_is_enabled(Trace, redefine, class, obsolete)) {
+    // protect the args we've loaded
+    save_args(masm, total_c_args, c_arg, out_regs);
+    __ mov_metadata(c_rarg1, method());
+    __ call_VM_leaf(
+      CAST_FROM_FN_PTR(address, SharedRuntime::rc_trace_method_entry),
+      xthread, c_rarg1);
+    restore_args(masm, total_c_args, c_arg, out_regs);
+  }
+
+  // Lock a synchronized method
+
+  // Register definitions used by locking and unlocking
+
+  const Register swap_reg = x10;
+  const Register obj_reg  = x9;  // Will contain the oop
+  const Register lock_reg = x30;  // Address of compiler lock object (BasicLock)
+  const Register old_hdr  = x30;  // value of old header at unlock time
+  const Register tmp      = ra;
+
+  Label slow_path_lock;
+  Label lock_done;
+
+  if (method->is_synchronized()) {
+
+    const int mark_word_offset = BasicLock::displaced_header_offset_in_bytes();
+
+    // Get the handle (the 2nd argument)
+    __ mv(oop_handle_reg, c_rarg1);
+
+    // Get address of the box
+
+    __ la(lock_reg, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size));
+
+    // Load the oop from the handle
+    __ ld(obj_reg, Address(oop_handle_reg, 0));
+
+    if (!UseHeavyMonitors) {
+      // Load (object->mark() | 1) into swap_reg % x10
+      __ ld(t0, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
+      __ ori(swap_reg, t0, 1);
+
+      // Save (object->mark() | 1) into BasicLock's displaced header
+      __ sd(swap_reg, Address(lock_reg, mark_word_offset));
+
+      // src -> dest if dest == x10 else x10 <- dest
+      {
+        Label here;
+        __ cmpxchg_obj_header(x10, lock_reg, obj_reg, t0, lock_done, /*fallthrough*/NULL);
+      }
+
+      // Test if the oopMark is an obvious stack pointer, i.e.,
+      //  1) (mark & 3) == 0, and
+      //  2) sp <= mark < mark + os::pagesize()
+      // These 3 tests can be done by evaluating the following
+      // expression: ((mark - sp) & (3 - os::vm_page_size())),
+      // assuming both stack pointer and pagesize have their
+      // least significant 2 bits clear.
+      // NOTE: the oopMark is in swap_reg % 10 as the result of cmpxchg
+
+      __ sub(swap_reg, swap_reg, sp);
+      __ andi(swap_reg, swap_reg, 3 - os::vm_page_size());
+
+      // Save the test result, for recursive case, the result is zero
+      __ sd(swap_reg, Address(lock_reg, mark_word_offset));
+      __ bnez(swap_reg, slow_path_lock);
+    } else {
+      __ j(slow_path_lock);
+    }
+
+    // Slow path will re-enter here
+    __ bind(lock_done);
+  }
+
+
+  // Finally just about ready to make the JNI call
+
+  // get JNIEnv* which is first argument to native
+  __ la(c_rarg0, Address(xthread, in_bytes(JavaThread::jni_environment_offset())));
+
+  // Now set thread in native
+  __ la(t1, Address(xthread, JavaThread::thread_state_offset()));
+  __ mv(t0, _thread_in_native);
+  __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+  __ sw(t0, Address(t1));
+
+  rt_call(masm, native_func);
+
+  __ bind(native_return);
+
+  intptr_t return_pc = (intptr_t) __ pc();
+  oop_maps->add_gc_map(return_pc - start, map);
+
+  // Unpack native results.
+  if (ret_type != T_OBJECT && ret_type != T_ARRAY) {
+    __ cast_primitive_type(ret_type, x10);
+  }
+
+  Label safepoint_in_progress, safepoint_in_progress_done;
+  Label after_transition;
+
+  // Switch thread to "native transition" state before reading the synchronization state.
+  // This additional state is necessary because reading and testing the synchronization
+  // state is not atomic w.r.t. GC, as this scenario demonstrates:
+  //     Java thread A, in _thread_in_native state, loads _not_synchronized and is preempted.
+  //     VM thread changes sync state to synchronizing and suspends threads for GC.
+  //     Thread A is resumed to finish this native method, but doesn't block here since it
+  //     didn't see any synchronization is progress, and escapes.
+  __ mv(t0, _thread_in_native_trans);
+
+  __ sw(t0, Address(xthread, JavaThread::thread_state_offset()));
+
+  // Force this write out before the read below
+  __ membar(MacroAssembler::AnyAny);
+
+  // check for safepoint operation in progress and/or pending suspend requests
+  {
+    // We need an acquire here to ensure that any subsequent load of the
+    // global SafepointSynchronize::_state flag is ordered after this load
+    // of the thread-local polling word. We don't want this poll to
+    // return false (i.e. not safepointing) and a later poll of the global
+    // SafepointSynchronize::_state spuriously to return true.
+    // This is to avoid a race when we're in a native->Java transition
+    // racing the code which wakes up from a safepoint.
+
+    __ safepoint_poll(safepoint_in_progress, true /* at_return */, true /* acquire */, false /* in_nmethod */);
+    __ lwu(t0, Address(xthread, JavaThread::suspend_flags_offset()));
+    __ bnez(t0, safepoint_in_progress);
+    __ bind(safepoint_in_progress_done);
+  }
+
+  // change thread state
+  __ la(t1, Address(xthread, JavaThread::thread_state_offset()));
+  __ mv(t0, _thread_in_Java);
+  __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+  __ sw(t0, Address(t1));
+  __ bind(after_transition);
+
+  Label reguard;
+  Label reguard_done;
+  __ lbu(t0, Address(xthread, JavaThread::stack_guard_state_offset()));
+  __ mv(t1, StackOverflow::stack_guard_yellow_reserved_disabled);
+  __ beq(t0, t1, reguard);
+  __ bind(reguard_done);
+
+  // native result if any is live
+
+  // Unlock
+  Label unlock_done;
+  Label slow_path_unlock;
+  if (method->is_synchronized()) {
+
+    // Get locked oop from the handle we passed to jni
+    __ ld(obj_reg, Address(oop_handle_reg, 0));
+
+    Label done;
+
+    if (!UseHeavyMonitors) {
+      // Simple recursive lock?
+      __ ld(t0, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size));
+      __ beqz(t0, done);
+    }
+
+
+    // Must save x10 if if it is live now because cmpxchg must use it
+    if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) {
+      save_native_result(masm, ret_type, stack_slots);
+    }
+
+    if (!UseHeavyMonitors) {
+      // get address of the stack lock
+      __ la(x10, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size));
+      //  get old displaced header
+      __ ld(old_hdr, Address(x10, 0));
+
+      // Atomic swap old header if oop still contains the stack lock
+      Label succeed;
+      __ cmpxchg_obj_header(x10, old_hdr, obj_reg, t0, succeed, &slow_path_unlock);
+      __ bind(succeed);
+    } else {
+      __ j(slow_path_unlock);
+    }
+
+    // slow path re-enters here
+    __ bind(unlock_done);
+    if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) {
+      restore_native_result(masm, ret_type, stack_slots);
+    }
+
+    __ bind(done);
+  }
+
+  Label dtrace_method_exit, dtrace_method_exit_done;
+  {
+    int32_t offset = 0;
+    __ la_patchable(t0, ExternalAddress((address)&DTraceMethodProbes), offset);
+    __ lbu(t0, Address(t0, offset));
+    __ bnez(t0, dtrace_method_exit);
+    __ bind(dtrace_method_exit_done);
+  }
+
+  __ reset_last_Java_frame(false);
+
+  // Unbox oop result, e.g. JNIHandles::resolve result.
+  if (is_reference_type(ret_type)) {
+    __ resolve_jobject(x10, xthread, t1);
+  }
+
+  if (CheckJNICalls) {
+    // clear_pending_jni_exception_check
+    __ sd(zr, Address(xthread, JavaThread::pending_jni_exception_check_fn_offset()));
+  }
+
+  // reset handle block
+  __ ld(x12, Address(xthread, JavaThread::active_handles_offset()));
+  __ sd(zr, Address(x12, JNIHandleBlock::top_offset_in_bytes()));
+
+  __ leave();
+
+  // Any exception pending?
+  __ ld(t0, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+  __ bnez(t0, exception_pending);
+
+  // We're done
+  __ ret();
+
+  // Unexpected paths are out of line and go here
+
+  // forward the exception
+  __ bind(exception_pending);
+
+  // and forward the exception
+  __ far_jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+
+  // Slow path locking & unlocking
+  if (method->is_synchronized()) {
+
+    __ block_comment("Slow path lock {");
+    __ bind(slow_path_lock);
+
+    // has last_Java_frame setup. No exceptions so do vanilla call not call_VM
+    // args are (oop obj, BasicLock* lock, JavaThread* thread)
+
+    // protect the args we've loaded
+    save_args(masm, total_c_args, c_arg, out_regs);
+
+    __ mv(c_rarg0, obj_reg);
+    __ mv(c_rarg1, lock_reg);
+    __ mv(c_rarg2, xthread);
+
+    // Not a leaf but we have last_Java_frame setup as we want
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_locking_C), 3);
+    restore_args(masm, total_c_args, c_arg, out_regs);
+
+#ifdef ASSERT
+    { Label L;
+      __ ld(t0, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+      __ beqz(t0, L);
+      __ stop("no pending exception allowed on exit from monitorenter");
+      __ bind(L);
+    }
+#endif
+    __ j(lock_done);
+
+    __ block_comment("} Slow path lock");
+
+    __ block_comment("Slow path unlock {");
+    __ bind(slow_path_unlock);
+
+    if (ret_type == T_FLOAT || ret_type == T_DOUBLE) {
+      save_native_result(masm, ret_type, stack_slots);
+    }
+
+    __ mv(c_rarg2, xthread);
+    __ la(c_rarg1, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size));
+    __ mv(c_rarg0, obj_reg);
+
+    // Save pending exception around call to VM (which contains an EXCEPTION_MARK)
+    // NOTE that obj_reg == x9 currently
+    __ ld(x9, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+    __ sd(zr, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+
+    rt_call(masm, CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_unlocking_C));
+
+#ifdef ASSERT
+    {
+      Label L;
+      __ ld(t0, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+      __ beqz(t0, L);
+      __ stop("no pending exception allowed on exit complete_monitor_unlocking_C");
+      __ bind(L);
+    }
+#endif /* ASSERT */
+
+    __ sd(x9, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+
+    if (ret_type == T_FLOAT || ret_type == T_DOUBLE) {
+      restore_native_result(masm, ret_type, stack_slots);
+    }
+    __ j(unlock_done);
+
+    __ block_comment("} Slow path unlock");
+
+  } // synchronized
+
+  // SLOW PATH Reguard the stack if needed
+
+  __ bind(reguard);
+  save_native_result(masm, ret_type, stack_slots);
+  rt_call(masm, CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
+  restore_native_result(masm, ret_type, stack_slots);
+  // and continue
+  __ j(reguard_done);
+
+  // SLOW PATH safepoint
+  {
+    __ block_comment("safepoint {");
+    __ bind(safepoint_in_progress);
+
+    // Don't use call_VM as it will see a possible pending exception and forward it
+    // and never return here preventing us from clearing _last_native_pc down below.
+    //
+    save_native_result(masm, ret_type, stack_slots);
+    __ mv(c_rarg0, xthread);
+#ifndef PRODUCT
+    assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+    int32_t offset = 0;
+    __ la_patchable(t0, RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans)), offset);
+    __ jalr(x1, t0, offset);
+
+    // Restore any method result value
+    restore_native_result(masm, ret_type, stack_slots);
+
+    __ j(safepoint_in_progress_done);
+    __ block_comment("} safepoint");
+  }
+
+  // SLOW PATH dtrace support
+  {
+    __ block_comment("dtrace entry {");
+    __ bind(dtrace_method_entry);
+
+    // We have all of the arguments setup at this point. We must not touch any register
+    // argument registers at this point (what if we save/restore them there are no oop?
+
+    save_args(masm, total_c_args, c_arg, out_regs);
+    __ mov_metadata(c_rarg1, method());
+    __ call_VM_leaf(
+      CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
+      xthread, c_rarg1);
+    restore_args(masm, total_c_args, c_arg, out_regs);
+    __ j(dtrace_method_entry_done);
+    __ block_comment("} dtrace entry");
+  }
+
+  {
+    __ block_comment("dtrace exit {");
+    __ bind(dtrace_method_exit);
+    save_native_result(masm, ret_type, stack_slots);
+    __ mov_metadata(c_rarg1, method());
+    __ call_VM_leaf(
+         CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
+         xthread, c_rarg1);
+    restore_native_result(masm, ret_type, stack_slots);
+    __ j(dtrace_method_exit_done);
+    __ block_comment("} dtrace exit");
+  }
+
+  __ flush();
+
+  nmethod *nm = nmethod::new_native_nmethod(method,
+                                            compile_id,
+                                            masm->code(),
+                                            vep_offset,
+                                            frame_complete,
+                                            stack_slots / VMRegImpl::slots_per_word,
+                                            (is_static ? in_ByteSize(klass_offset) : in_ByteSize(receiver_offset)),
+                                            in_ByteSize(lock_slot_offset*VMRegImpl::stack_slot_size),
+                                            oop_maps);
+  assert(nm != NULL, "create native nmethod fail!");
+  return nm;
+}
+
+// this function returns the adjust size (in number of words) to a c2i adapter
+// activation for use during deoptimization
+int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals) {
+  assert(callee_locals >= callee_parameters,
+         "test and remove; got more parms than locals");
+  if (callee_locals < callee_parameters) {
+    return 0;                   // No adjustment for negative locals
+  }
+  int diff = (callee_locals - callee_parameters) * Interpreter::stackElementWords;
+  // diff is counted in stack words
+  return align_up(diff, 2);
+}
+
+//------------------------------generate_deopt_blob----------------------------
+void SharedRuntime::generate_deopt_blob() {
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  int pad = 0;
+  CodeBuffer buffer("deopt_blob", 2048 + pad, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+  int frame_size_in_words = -1;
+  OopMap* map = NULL;
+  OopMapSet *oop_maps = new OopMapSet();
+  assert_cond(masm != NULL && oop_maps != NULL);
+  RegisterSaver reg_saver(COMPILER2_OR_JVMCI != 0);
+
+  // -------------
+  // This code enters when returning to a de-optimized nmethod.  A return
+  // address has been pushed on the the stack, and return values are in
+  // registers.
+  // If we are doing a normal deopt then we were called from the patched
+  // nmethod from the point we returned to the nmethod. So the return
+  // address on the stack is wrong by NativeCall::instruction_size
+  // We will adjust the value so it looks like we have the original return
+  // address on the stack (like when we eagerly deoptimized).
+  // In the case of an exception pending when deoptimizing, we enter
+  // with a return address on the stack that points after the call we patched
+  // into the exception handler. We have the following register state from,
+  // e.g., the forward exception stub (see stubGenerator_riscv.cpp).
+  //    x10: exception oop
+  //    x9: exception handler
+  //    x13: throwing pc
+  // So in this case we simply jam x13 into the useless return address and
+  // the stack looks just like we want.
+  //
+  // At this point we need to de-opt.  We save the argument return
+  // registers.  We call the first C routine, fetch_unroll_info().  This
+  // routine captures the return values and returns a structure which
+  // describes the current frame size and the sizes of all replacement frames.
+  // The current frame is compiled code and may contain many inlined
+  // functions, each with their own JVM state.  We pop the current frame, then
+  // push all the new frames.  Then we call the C routine unpack_frames() to
+  // populate these frames.  Finally unpack_frames() returns us the new target
+  // address.  Notice that callee-save registers are BLOWN here; they have
+  // already been captured in the vframeArray at the time the return PC was
+  // patched.
+  address start = __ pc();
+  Label cont;
+
+  // Prolog for non exception case!
+
+  // Save everything in sight.
+  map = reg_saver.save_live_registers(masm, 0, &frame_size_in_words);
+
+  // Normal deoptimization.  Save exec mode for unpack_frames.
+  __ mvw(xcpool, Deoptimization::Unpack_deopt); // callee-saved
+  __ j(cont);
+
+  int reexecute_offset = __ pc() - start;
+
+  // Reexecute case
+  // return address is the pc describes what bci to do re-execute at
+
+  // No need to update map as each call to save_live_registers will produce identical oopmap
+  (void) reg_saver.save_live_registers(masm, 0, &frame_size_in_words);
+
+  __ mvw(xcpool, Deoptimization::Unpack_reexecute); // callee-saved
+  __ j(cont);
+
+  int exception_offset = __ pc() - start;
+
+  // Prolog for exception case
+
+  // all registers are dead at this entry point, except for x10, and
+  // x13 which contain the exception oop and exception pc
+  // respectively.  Set them in TLS and fall thru to the
+  // unpack_with_exception_in_tls entry point.
+
+  __ sd(x13, Address(xthread, JavaThread::exception_pc_offset()));
+  __ sd(x10, Address(xthread, JavaThread::exception_oop_offset()));
+
+  int exception_in_tls_offset = __ pc() - start;
+
+  // new implementation because exception oop is now passed in JavaThread
+
+  // Prolog for exception case
+  // All registers must be preserved because they might be used by LinearScan
+  // Exceptiop oop and throwing PC are passed in JavaThread
+  // tos: stack at point of call to method that threw the exception (i.e. only
+  // args are on the stack, no return address)
+
+  // The return address pushed by save_live_registers will be patched
+  // later with the throwing pc. The correct value is not available
+  // now because loading it from memory would destroy registers.
+
+  // NB: The SP at this point must be the SP of the method that is
+  // being deoptimized.  Deoptimization assumes that the frame created
+  // here by save_live_registers is immediately below the method's SP.
+  // This is a somewhat fragile mechanism.
+
+  // Save everything in sight.
+  map = reg_saver.save_live_registers(masm, 0, &frame_size_in_words);
+
+  // Now it is safe to overwrite any register
+
+  // Deopt during an exception.  Save exec mode for unpack_frames.
+  __ li(xcpool, Deoptimization::Unpack_exception); // callee-saved
+
+  // load throwing pc from JavaThread and patch it as the return address
+  // of the current frame. Then clear the field in JavaThread
+
+  __ ld(x13, Address(xthread, JavaThread::exception_pc_offset()));
+  __ sd(x13, Address(fp, frame::return_addr_offset * wordSize));
+  __ sd(zr, Address(xthread, JavaThread::exception_pc_offset()));
+
+#ifdef ASSERT
+  // verify that there is really an exception oop in JavaThread
+  __ ld(x10, Address(xthread, JavaThread::exception_oop_offset()));
+  __ verify_oop(x10);
+
+  // verify that there is no pending exception
+  Label no_pending_exception;
+  __ ld(t0, Address(xthread, Thread::pending_exception_offset()));
+  __ beqz(t0, no_pending_exception);
+  __ stop("must not have pending exception here");
+  __ bind(no_pending_exception);
+#endif
+
+  __ bind(cont);
+
+  // Call C code.  Need thread and this frame, but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.
+  //
+  // UnrollBlock* fetch_unroll_info(JavaThread* thread)
+
+  // fetch_unroll_info needs to call last_java_frame().
+
+  Label retaddr;
+  __ set_last_Java_frame(sp, noreg, retaddr, t0);
+#ifdef ASSERT
+  {
+    Label L;
+    __ ld(t0, Address(xthread,
+                              JavaThread::last_Java_fp_offset()));
+    __ beqz(t0, L);
+    __ stop("SharedRuntime::generate_deopt_blob: last_Java_fp not cleared");
+    __ bind(L);
+  }
+#endif // ASSERT
+  __ mv(c_rarg0, xthread);
+  __ mv(c_rarg1, xcpool);
+  int32_t offset = 0;
+  __ la_patchable(t0, RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::fetch_unroll_info)), offset);
+  __ jalr(x1, t0, offset);
+  __ bind(retaddr);
+
+  // Need to have an oopmap that tells fetch_unroll_info where to
+  // find any register it might need.
+  oop_maps->add_gc_map(__ pc() - start, map);
+
+  __ reset_last_Java_frame(false);
+
+  // Load UnrollBlock* into x15
+  __ mv(x15, x10);
+
+  __ lwu(xcpool, Address(x15, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes()));
+  Label noException;
+  __ li(t0, Deoptimization::Unpack_exception);
+  __ bne(xcpool, t0, noException); // Was exception pending?
+  __ ld(x10, Address(xthread, JavaThread::exception_oop_offset()));
+  __ ld(x13, Address(xthread, JavaThread::exception_pc_offset()));
+  __ sd(zr, Address(xthread, JavaThread::exception_oop_offset()));
+  __ sd(zr, Address(xthread, JavaThread::exception_pc_offset()));
+
+  __ verify_oop(x10);
+
+  // Overwrite the result registers with the exception results.
+  __ sd(x10, Address(sp, reg_saver.reg_offset_in_bytes(x10)));
+
+  __ bind(noException);
+
+  // Only register save data is on the stack.
+  // Now restore the result registers.  Everything else is either dead
+  // or captured in the vframeArray.
+
+  // Restore fp result register
+  __ fld(f10, Address(sp, reg_saver.freg_offset_in_bytes(f10)));
+  // Restore integer result register
+  __ ld(x10, Address(sp, reg_saver.reg_offset_in_bytes(x10)));
+
+  // Pop all of the register save area off the stack
+  __ add(sp, sp, frame_size_in_words * wordSize);
+
+  // All of the register save area has been popped of the stack. Only the
+  // return address remains.
+
+  // Pop all the frames we must move/replace.
+  //
+  // Frame picture (youngest to oldest)
+  // 1: self-frame (no frame link)
+  // 2: deopting frame  (no frame link)
+  // 3: caller of deopting frame (could be compiled/interpreted).
+  //
+  // Note: by leaving the return address of self-frame on the stack
+  // and using the size of frame 2 to adjust the stack
+  // when we are done the return to frame 3 will still be on the stack.
+
+  // Pop deoptimized frame
+  __ lwu(x12, Address(x15, Deoptimization::UnrollBlock::size_of_deoptimized_frame_offset_in_bytes()));
+  __ sub(x12, x12, 2 * wordSize);
+  __ add(sp, sp, x12);
+  __ ld(fp, Address(sp, 0));
+  __ ld(ra, Address(sp, wordSize));
+  __ addi(sp, sp, 2 * wordSize);
+  // RA should now be the return address to the caller (3)
+
+#ifdef ASSERT
+  // Compilers generate code that bang the stack by as much as the
+  // interpreter would need. So this stack banging should never
+  // trigger a fault. Verify that it does not on non product builds.
+  __ lwu(x9, Address(x15, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
+  __ bang_stack_size(x9, x12);
+#endif
+  // Load address of array of frame pcs into x12
+  __ ld(x12, Address(x15, Deoptimization::UnrollBlock::frame_pcs_offset_in_bytes()));
+
+  // Load address of array of frame sizes into x14
+  __ ld(x14, Address(x15, Deoptimization::UnrollBlock::frame_sizes_offset_in_bytes()));
+
+  // Load counter into x13
+  __ lwu(x13, Address(x15, Deoptimization::UnrollBlock::number_of_frames_offset_in_bytes()));
+
+  // Now adjust the caller's stack to make up for the extra locals
+  // but record the original sp so that we can save it in the skeletal interpreter
+  // frame and the stack walking of interpreter_sender will get the unextended sp
+  // value and not the "real" sp value.
+
+  const Register sender_sp = x16;
+
+  __ mv(sender_sp, sp);
+  __ lwu(x9, Address(x15,
+                     Deoptimization::UnrollBlock::
+                     caller_adjustment_offset_in_bytes()));
+  __ sub(sp, sp, x9);
+
+  // Push interpreter frames in a loop
+  __ li(t0, 0xDEADDEAD);               // Make a recognizable pattern
+  __ mv(t1, t0);
+  Label loop;
+  __ bind(loop);
+  __ ld(x9, Address(x14, 0));          // Load frame size
+  __ addi(x14, x14, wordSize);
+  __ sub(x9, x9, 2 * wordSize);        // We'll push pc and fp by hand
+  __ ld(ra, Address(x12, 0));          // Load pc
+  __ addi(x12, x12, wordSize);
+  __ enter();                          // Save old & set new fp
+  __ sub(sp, sp, x9);                  // Prolog
+  // This value is corrected by layout_activation_impl
+  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ sd(sender_sp, Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize)); // Make it walkable
+  __ mv(sender_sp, sp);                // Pass sender_sp to next frame
+  __ addi(x13, x13, -1);               // Decrement counter
+  __ bnez(x13, loop);
+
+    // Re-push self-frame
+  __ ld(ra, Address(x12));
+  __ enter();
+
+  // Allocate a full sized register save area.  We subtract 2 because
+  // enter() just pushed 2 words
+  __ sub(sp, sp, (frame_size_in_words - 2) * wordSize);
+
+  // Restore frame locals after moving the frame
+  __ fsd(f10, Address(sp, reg_saver.freg_offset_in_bytes(f10)));
+  __ sd(x10, Address(sp, reg_saver.reg_offset_in_bytes(x10)));
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // restore return values to their stack-slots with the new SP.
+  //
+  // void Deoptimization::unpack_frames(JavaThread* thread, int exec_mode)
+
+  // Use fp because the frames look interpreted now
+  // Don't need the precise return PC here, just precise enough to point into this code blob.
+  address the_pc = __ pc();
+  __ set_last_Java_frame(sp, fp, the_pc, t0);
+
+  __ mv(c_rarg0, xthread);
+  __ mv(c_rarg1, xcpool); // second arg: exec_mode
+  offset = 0;
+  __ la_patchable(t0, RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)), offset);
+  __ jalr(x1, t0, offset);
+
+  // Set an oopmap for the call site
+  // Use the same PC we used for the last java frame
+  oop_maps->add_gc_map(the_pc - start,
+                       new OopMap(frame_size_in_words, 0));
+
+  // Clear fp AND pc
+  __ reset_last_Java_frame(true);
+
+  // Collect return values
+  __ fld(f10, Address(sp, reg_saver.freg_offset_in_bytes(f10)));
+  __ ld(x10, Address(sp, reg_saver.reg_offset_in_bytes(x10)));
+
+  // Pop self-frame.
+  __ leave();                           // Epilog
+
+  // Jump to interpreter
+  __ ret();
+
+  // Make sure all code is generated
+  masm->flush();
+
+  _deopt_blob = DeoptimizationBlob::create(&buffer, oop_maps, 0, exception_offset, reexecute_offset, frame_size_in_words);
+  assert(_deopt_blob != NULL, "create deoptimization blob fail!");
+  _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset);
+}
+
+// Number of stack slots between incoming argument block and the start of
+// a new frame. The PROLOG must add this many slots to the stack. The
+// EPILOG must remove this many slots.
+// RISCV needs two words for RA (return address) and FP (frame pointer).
+uint SharedRuntime::in_preserve_stack_slots() {
+  return 2 * VMRegImpl::slots_per_word;
+}
+
+uint SharedRuntime::out_preserve_stack_slots() {
+  return 0;
+}
+
+#ifdef COMPILER2
+//------------------------------generate_uncommon_trap_blob--------------------
+void SharedRuntime::generate_uncommon_trap_blob() {
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+  assert_cond(masm != NULL);
+
+  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
+
+  address start = __ pc();
+
+  // Push self-frame.  We get here with a return address in RA
+  // and sp should be 16 byte aligned
+  // push fp and retaddr by hand
+  __ addi(sp, sp, -2 * wordSize);
+  __ sd(ra, Address(sp, wordSize));
+  __ sd(fp, Address(sp, 0));
+  // we don't expect an arg reg save area
+#ifndef PRODUCT
+  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+  // compiler left unloaded_class_index in j_rarg0 move to where the
+  // runtime expects it.
+  __ addiw(c_rarg1, j_rarg0, 0);
+
+  // we need to set the past SP to the stack pointer of the stub frame
+  // and the pc to the address where this runtime call will return
+  // although actually any pc in this code blob will do).
+  Label retaddr;
+  __ set_last_Java_frame(sp, noreg, retaddr, t0);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // capture callee-saved registers as well as return values.
+  //
+  // UnrollBlock* uncommon_trap(JavaThread* thread, jint unloaded_class_index, jint exec_mode)
+  //
+  // n.b. 3 gp args, 0 fp args, integral return type
+
+  __ mv(c_rarg0, xthread);
+  __ mvw(c_rarg2, (unsigned)Deoptimization::Unpack_uncommon_trap);
+  int32_t offset = 0;
+  __ la_patchable(t0,
+        RuntimeAddress(CAST_FROM_FN_PTR(address,
+                                        Deoptimization::uncommon_trap)), offset);
+  __ jalr(x1, t0, offset);
+  __ bind(retaddr);
+
+  // Set an oopmap for the call site
+  OopMapSet* oop_maps = new OopMapSet();
+  OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
+  assert_cond(oop_maps != NULL && map != NULL);
+
+  // location of fp is known implicitly by the frame sender code
+
+  oop_maps->add_gc_map(__ pc() - start, map);
+
+  __ reset_last_Java_frame(false);
+
+  // move UnrollBlock* into x14
+  __ mv(x14, x10);
+
+#ifdef ASSERT
+  { Label L;
+    __ lwu(t0, Address(x14, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes()));
+    __ mvw(t1, Deoptimization::Unpack_uncommon_trap);
+    __ beq(t0, t1, L);
+    __ stop("SharedRuntime::generate_deopt_blob: last_Java_fp not cleared");
+    __ bind(L);
+  }
+#endif
+
+  // Pop all the frames we must move/replace.
+  //
+  // Frame picture (youngest to oldest)
+  // 1: self-frame (no frame link)
+  // 2: deopting frame  (no frame link)
+  // 3: caller of deopting frame (could be compiled/interpreted).
+
+  __ add(sp, sp, (SimpleRuntimeFrame::framesize) << LogBytesPerInt); // Epilog!
+
+  // Pop deoptimized frame (int)
+  __ lwu(x12, Address(x14,
+                      Deoptimization::UnrollBlock::
+                      size_of_deoptimized_frame_offset_in_bytes()));
+  __ sub(x12, x12, 2 * wordSize);
+  __ add(sp, sp, x12);
+  __ ld(fp, sp, 0);
+  __ ld(ra, sp, wordSize);
+  __ addi(sp, sp, 2 * wordSize);
+  // RA should now be the return address to the caller (3) frame
+
+#ifdef ASSERT
+  // Compilers generate code that bang the stack by as much as the
+  // interpreter would need. So this stack banging should never
+  // trigger a fault. Verify that it does not on non product builds.
+  __ lwu(x11, Address(x14,
+                      Deoptimization::UnrollBlock::
+                      total_frame_sizes_offset_in_bytes()));
+  __ bang_stack_size(x11, x12);
+#endif
+
+  // Load address of array of frame pcs into x12 (address*)
+  __ ld(x12, Address(x14,
+                     Deoptimization::UnrollBlock::frame_pcs_offset_in_bytes()));
+
+  // Load address of array of frame sizes into x15 (intptr_t*)
+  __ ld(x15, Address(x14,
+                     Deoptimization::UnrollBlock::
+                     frame_sizes_offset_in_bytes()));
+
+  // Counter
+  __ lwu(x13, Address(x14,
+                      Deoptimization::UnrollBlock::
+                      number_of_frames_offset_in_bytes())); // (int)
+
+  // Now adjust the caller's stack to make up for the extra locals but
+  // record the original sp so that we can save it in the skeletal
+  // interpreter frame and the stack walking of interpreter_sender
+  // will get the unextended sp value and not the "real" sp value.
+
+  const Register sender_sp = t1; // temporary register
+
+  __ lwu(x11, Address(x14,
+                      Deoptimization::UnrollBlock::
+                      caller_adjustment_offset_in_bytes())); // (int)
+  __ mv(sender_sp, sp);
+  __ sub(sp, sp, x11);
+
+  // Push interpreter frames in a loop
+  Label loop;
+  __ bind(loop);
+  __ ld(x11, Address(x15, 0));       // Load frame size
+  __ sub(x11, x11, 2 * wordSize);    // We'll push pc and fp by hand
+  __ ld(ra, Address(x12, 0));        // Save return address
+  __ enter();                        // and old fp & set new fp
+  __ sub(sp, sp, x11);               // Prolog
+  __ sd(sender_sp, Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize)); // Make it walkable
+  // This value is corrected by layout_activation_impl
+  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ mv(sender_sp, sp);              // Pass sender_sp to next frame
+  __ add(x15, x15, wordSize);        // Bump array pointer (sizes)
+  __ add(x12, x12, wordSize);        // Bump array pointer (pcs)
+  __ subw(x13, x13, 1);              // Decrement counter
+  __ bgtz(x13, loop);
+  __ ld(ra, Address(x12, 0));        // save final return address
+  // Re-push self-frame
+  __ enter();                        // & old fp & set new fp
+
+  // Use fp because the frames look interpreted now
+  // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
+  // Don't need the precise return PC here, just precise enough to point into this code blob.
+  address the_pc = __ pc();
+  __ set_last_Java_frame(sp, fp, the_pc, t0);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // restore return values to their stack-slots with the new SP.
+  //
+  // BasicType unpack_frames(JavaThread* thread, int exec_mode)
+  //
+
+  // n.b. 2 gp args, 0 fp args, integral return type
+
+  // sp should already be aligned
+  __ mv(c_rarg0, xthread);
+  __ mvw(c_rarg1, (unsigned)Deoptimization::Unpack_uncommon_trap);
+  offset = 0;
+  __ la_patchable(t0, RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)), offset);
+  __ jalr(x1, t0, offset);
+
+  // Set an oopmap for the call site
+  // Use the same PC we used for the last java frame
+  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+
+  // Clear fp AND pc
+  __ reset_last_Java_frame(true);
+
+  // Pop self-frame.
+  __ leave();                 // Epilog
+
+  // Jump to interpreter
+  __ ret();
+
+  // Make sure all code is generated
+  masm->flush();
+
+  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
+                                                  SimpleRuntimeFrame::framesize >> 1);
+}
+#endif // COMPILER2
+
+//------------------------------generate_handler_blob------
+//
+// Generate a special Compile2Runtime blob that saves all registers,
+// and setup oopmap.
+//
+SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, int poll_type) {
+  ResourceMark rm;
+  OopMapSet *oop_maps = new OopMapSet();
+  assert_cond(oop_maps != NULL);
+  OopMap* map = NULL;
+
+  // Allocate space for the code.  Setup code generation tools.
+  CodeBuffer buffer("handler_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+  assert_cond(masm != NULL);
+
+  address start   = __ pc();
+  address call_pc = NULL;
+  int frame_size_in_words = -1;
+  bool cause_return = (poll_type == POLL_AT_RETURN);
+  RegisterSaver reg_saver(poll_type == POLL_AT_VECTOR_LOOP /* save_vectors */);
+
+  // Save Integer and Float registers.
+  map = reg_saver.save_live_registers(masm, 0, &frame_size_in_words);
+
+  // The following is basically a call_VM.  However, we need the precise
+  // address of the call in order to generate an oopmap. Hence, we do all the
+  // work outselves.
+
+  Label retaddr;
+  __ set_last_Java_frame(sp, noreg, retaddr, t0);
+
+  // The return address must always be correct so that frame constructor never
+  // sees an invalid pc.
+
+  if (!cause_return) {
+    // overwrite the return address pushed by save_live_registers
+    // Additionally, x18 is a callee-saved register so we can look at
+    // it later to determine if someone changed the return address for
+    // us!
+    __ ld(x18, Address(xthread, JavaThread::saved_exception_pc_offset()));
+    __ sd(x18, Address(fp, frame::return_addr_offset * wordSize));
+  }
+
+  // Do the call
+  __ mv(c_rarg0, xthread);
+  int32_t offset = 0;
+  __ la_patchable(t0, RuntimeAddress(call_ptr), offset);
+  __ jalr(x1, t0, offset);
+  __ bind(retaddr);
+
+  // Set an oopmap for the call site.  This oopmap will map all
+  // oop-registers and debug-info registers as callee-saved.  This
+  // will allow deoptimization at this safepoint to find all possible
+  // debug-info recordings, as well as let GC find all oops.
+
+  oop_maps->add_gc_map( __ pc() - start, map);
+
+  Label noException;
+
+  __ reset_last_Java_frame(false);
+
+  __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+
+  __ ld(t0, Address(xthread, Thread::pending_exception_offset()));
+  __ beqz(t0, noException);
+
+  // Exception pending
+
+  reg_saver.restore_live_registers(masm);
+
+  __ far_jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+
+  // No exception case
+  __ bind(noException);
+
+  Label no_adjust, bail;
+  if (!cause_return) {
+    // If our stashed return pc was modified by the runtime we avoid touching it
+    __ ld(t0, Address(fp, frame::return_addr_offset * wordSize));
+    __ bne(x18, t0, no_adjust);
+
+#ifdef ASSERT
+    // Verify the correct encoding of the poll we're about to skip.
+    // See NativeInstruction::is_lwu_to_zr()
+    __ lwu(t0, Address(x18));
+    __ andi(t1, t0, 0b0000011);
+    __ mv(t2, 0b0000011);
+    __ bne(t1, t2, bail); // 0-6:0b0000011
+    __ srli(t1, t0, 7);
+    __ andi(t1, t1, 0b00000);
+    __ bnez(t1, bail);    // 7-11:0b00000
+    __ srli(t1, t0, 12);
+    __ andi(t1, t1, 0b110);
+    __ mv(t2, 0b110);
+    __ bne(t1, t2, bail); // 12-14:0b110
+#endif
+    // Adjust return pc forward to step over the safepoint poll instruction
+    __ add(x18, x18, NativeInstruction::instruction_size);
+    __ sd(x18, Address(fp, frame::return_addr_offset * wordSize));
+  }
+
+  __ bind(no_adjust);
+  // Normal exit, restore registers and exit.
+
+  reg_saver.restore_live_registers(masm);
+  __ ret();
+
+#ifdef ASSERT
+  __ bind(bail);
+  __ stop("Attempting to adjust pc to skip safepoint poll but the return point is not what we expected");
+#endif
+
+  // Make sure all code is generated
+  masm->flush();
+
+  // Fill-out other meta info
+  return SafepointBlob::create(&buffer, oop_maps, frame_size_in_words);
+}
+
+//
+// generate_resolve_blob - call resolution (static/virtual/opt-virtual/ic-miss
+//
+// Generate a stub that calls into vm to find out the proper destination
+// of a java call. All the argument registers are live at this point
+// but since this is generic code we don't know what they are and the caller
+// must do any gc of the args.
+//
+RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const char* name) {
+  assert (StubRoutines::forward_exception_entry() != NULL, "must be generated before");
+
+  // allocate space for the code
+  ResourceMark rm;
+
+  CodeBuffer buffer(name, 1000, 512);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+  assert_cond(masm != NULL);
+
+  int frame_size_in_words = -1;
+  RegisterSaver reg_saver(false /* save_vectors */);
+
+  OopMapSet *oop_maps = new OopMapSet();
+  assert_cond(oop_maps != NULL);
+  OopMap* map = NULL;
+
+  int start = __ offset();
+
+  map = reg_saver.save_live_registers(masm, 0, &frame_size_in_words);
+
+  int frame_complete = __ offset();
+
+  {
+    Label retaddr;
+    __ set_last_Java_frame(sp, noreg, retaddr, t0);
+
+    __ mv(c_rarg0, xthread);
+    int32_t offset = 0;
+    __ la_patchable(t0, RuntimeAddress(destination), offset);
+    __ jalr(x1, t0, offset);
+    __ bind(retaddr);
+  }
+
+  // Set an oopmap for the call site.
+  // We need this not only for callee-saved registers, but also for volatile
+  // registers that the compiler might be keeping live across a safepoint.
+
+  oop_maps->add_gc_map( __ offset() - start, map);
+
+  // x10 contains the address we are going to jump to assuming no exception got installed
+
+  // clear last_Java_sp
+  __ reset_last_Java_frame(false);
+  // check for pending exceptions
+  Label pending;
+  __ ld(t0, Address(xthread, Thread::pending_exception_offset()));
+  __ bnez(t0, pending);
+
+  // get the returned Method*
+  __ get_vm_result_2(xmethod, xthread);
+  __ sd(xmethod, Address(sp, reg_saver.reg_offset_in_bytes(xmethod)));
+
+  // x10 is where we want to jump, overwrite t0 which is saved and temporary
+  __ sd(x10, Address(sp, reg_saver.reg_offset_in_bytes(t0)));
+  reg_saver.restore_live_registers(masm);
+
+  // We are back the the original state on entry and ready to go.
+
+  __ jr(t0);
+
+  // Pending exception after the safepoint
+
+  __ bind(pending);
+
+  reg_saver.restore_live_registers(masm);
+
+  // exception pending => remove activation and forward to exception handler
+
+  __ sd(zr, Address(xthread, JavaThread::vm_result_offset()));
+
+  __ ld(x10, Address(xthread, Thread::pending_exception_offset()));
+  __ far_jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+
+  // -------------
+  // make sure all code is generated
+  masm->flush();
+
+  // return the  blob
+  return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_words, oop_maps, true);
+}
+
+#ifdef COMPILER2
+RuntimeStub* SharedRuntime::make_native_invoker(address call_target,
+                                                int shadow_space_bytes,
+                                                const GrowableArray<VMReg>& input_registers,
+                                                const GrowableArray<VMReg>& output_registers) {
+  Unimplemented();
+  return nullptr;
+}
+
+//------------------------------generate_exception_blob---------------------------
+// creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in riscv.ad file)
+//
+// Given an exception pc at a call we call into the runtime for the
+// handler in this method. This handler might merely restore state
+// (i.e. callee save registers) unwind the frame and jump to the
+// exception handler for the nmethod if there is no Java level handler
+// for the nmethod.
+//
+// This code is entered with a jmp.
+//
+// Arguments:
+//   x10: exception oop
+//   x13: exception pc
+//
+// Results:
+//   x10: exception oop
+//   x13: exception pc in caller
+//   destination: exception handler of caller
+//
+// Note: the exception pc MUST be at a call (precise debug information)
+//       Registers x10, x13, x12, x14, x15, t0 are not callee saved.
+//
+
+void OptoRuntime::generate_exception_blob() {
+  assert(!OptoRuntime::is_callee_saved_register(R13_num), "");
+  assert(!OptoRuntime::is_callee_saved_register(R10_num), "");
+  assert(!OptoRuntime::is_callee_saved_register(R12_num), "");
+
+  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
+
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  CodeBuffer buffer("exception_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+  assert_cond(masm != NULL);
+
+  // TODO check various assumptions made here
+  //
+  // make sure we do so before running this
+
+  address start = __ pc();
+
+  // push fp and retaddr by hand
+  // Exception pc is 'return address' for stack walker
+  __ addi(sp, sp, -2 * wordSize);
+  __ sd(ra, Address(sp, wordSize));
+  __ sd(fp, Address(sp));
+  // there are no callee save registers and we don't expect an
+  // arg reg save area
+#ifndef PRODUCT
+  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+  // Store exception in Thread object. We cannot pass any arguments to the
+  // handle_exception call, since we do not want to make any assumption
+  // about the size of the frame where the exception happened in.
+  __ sd(x10, Address(xthread, JavaThread::exception_oop_offset()));
+  __ sd(x13, Address(xthread, JavaThread::exception_pc_offset()));
+
+  // This call does all the hard work.  It checks if an exception handler
+  // exists in the method.
+  // If so, it returns the handler address.
+  // If not, it prepares for stack-unwinding, restoring the callee-save
+  // registers of the frame being removed.
+  //
+  // address OptoRuntime::handle_exception_C(JavaThread* thread)
+  //
+  // n.b. 1 gp arg, 0 fp args, integral return type
+
+  // the stack should always be aligned
+  address the_pc = __ pc();
+  __ set_last_Java_frame(sp, noreg, the_pc, t0);
+  __ mv(c_rarg0, xthread);
+  int32_t offset = 0;
+  __ la_patchable(t0, RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)), offset);
+  __ jalr(x1, t0, offset);
+
+
+  // handle_exception_C is a special VM call which does not require an explicit
+  // instruction sync afterwards.
+
+  // Set an oopmap for the call site.  This oopmap will only be used if we
+  // are unwinding the stack.  Hence, all locations will be dead.
+  // Callee-saved registers will be the same as the frame above (i.e.,
+  // handle_exception_stub), since they were restored when we got the
+  // exception.
+
+  OopMapSet* oop_maps = new OopMapSet();
+  assert_cond(oop_maps != NULL);
+
+  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+
+  __ reset_last_Java_frame(false);
+
+  // Restore callee-saved registers
+
+  // fp is an implicitly saved callee saved register (i.e. the calling
+  // convention will save restore it in prolog/epilog) Other than that
+  // there are no callee save registers now that adapter frames are gone.
+  // and we dont' expect an arg reg save area
+  __ ld(fp, Address(sp));
+  __ ld(x13, Address(sp, wordSize));
+  __ addi(sp, sp , 2 * wordSize);
+
+  // x10: exception handler
+
+  // We have a handler in x10 (could be deopt blob).
+  __ mv(t0, x10);
+
+  // Get the exception oop
+  __ ld(x10, Address(xthread, JavaThread::exception_oop_offset()));
+  // Get the exception pc in case we are deoptimized
+  __ ld(x14, Address(xthread, JavaThread::exception_pc_offset()));
+#ifdef ASSERT
+  __ sd(zr, Address(xthread, JavaThread::exception_handler_pc_offset()));
+  __ sd(zr, Address(xthread, JavaThread::exception_pc_offset()));
+#endif
+  // Clear the exception oop so GC no longer processes it as a root.
+  __ sd(zr, Address(xthread, JavaThread::exception_oop_offset()));
+
+  // x10: exception oop
+  // t0:  exception handler
+  // x14: exception pc
+  // Jump to handler
+
+  __ jr(t0);
+
+  // Make sure all code is generated
+  masm->flush();
+
+  // Set exception blob
+  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+}
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
new file mode 100644
index 00000000000..b3fdd04db1b
--- /dev/null
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -0,0 +1,3864 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "compiler/oopMap.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "interpreter/interpreter.hpp"
+#include "memory/universe.hpp"
+#include "nativeInst_riscv.hpp"
+#include "oops/instanceOop.hpp"
+#include "oops/method.hpp"
+#include "oops/objArrayKlass.hpp"
+#include "oops/oop.inline.hpp"
+#include "prims/methodHandles.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubCodeGenerator.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/thread.inline.hpp"
+#include "utilities/align.hpp"
+#include "utilities/powerOfTwo.hpp"
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
+#if INCLUDE_ZGC
+#include "gc/z/zThreadLocalData.hpp"
+#endif
+
+// Declaration and definition of StubGenerator (no .hpp file).
+// For a more detailed description of the stub routine structure
+// see the comment in stubRoutines.hpp
+
+#undef __
+#define __ _masm->
+
+#ifdef PRODUCT
+#define BLOCK_COMMENT(str) /* nothing */
+#else
+#define BLOCK_COMMENT(str) __ block_comment(str)
+#endif
+
+#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
+
+// Stub Code definitions
+
+class StubGenerator: public StubCodeGenerator {
+ private:
+
+#ifdef PRODUCT
+#define inc_counter_np(counter) ((void)0)
+#else
+  void inc_counter_np_(int& counter) {
+    __ la(t1, ExternalAddress((address)&counter));
+    __ lwu(t0, Address(t1, 0));
+    __ addiw(t0, t0, 1);
+    __ sw(t0, Address(t1, 0));
+  }
+#define inc_counter_np(counter) \
+  BLOCK_COMMENT("inc_counter " #counter); \
+  inc_counter_np_(counter);
+#endif
+
+  // Call stubs are used to call Java from C
+  //
+  // Arguments:
+  //    c_rarg0:   call wrapper address                   address
+  //    c_rarg1:   result                                 address
+  //    c_rarg2:   result type                            BasicType
+  //    c_rarg3:   method                                 Method*
+  //    c_rarg4:   (interpreter) entry point              address
+  //    c_rarg5:   parameters                             intptr_t*
+  //    c_rarg6:   parameter size (in words)              int
+  //    c_rarg7:   thread                                 Thread*
+  //
+  // There is no return from the stub itself as any Java result
+  // is written to result
+  //
+  // we save x1 (ra) as the return PC at the base of the frame and
+  // link x8 (fp) below it as the frame pointer installing sp (x2)
+  // into fp.
+  //
+  // we save x10-x17, which accounts for all the c arguments.
+  //
+  // TODO: strictly do we need to save them all? they are treated as
+  // volatile by C so could we omit saving the ones we are going to
+  // place in global registers (thread? method?) or those we only use
+  // during setup of the Java call?
+  //
+  // we don't need to save x5 which C uses as an indirect result location
+  // return register.
+  //
+  // we don't need to save x6-x7 and x28-x31 which both C and Java treat as
+  // volatile
+  //
+  // we save x18-x27 which Java uses as temporary registers and C
+  // expects to be callee-save
+  //
+  // so the stub frame looks like this when we enter Java code
+  //
+  //     [ return_from_Java     ] <--- sp
+  //     [ argument word n      ]
+  //      ...
+  // -22 [ argument word 1      ]
+  // -21 [ saved x27            ] <--- sp_after_call
+  // -20 [ saved x26            ]
+  // -19 [ saved x25            ]
+  // -18 [ saved x24            ]
+  // -17 [ saved x23            ]
+  // -16 [ saved x22            ]
+  // -15 [ saved x21            ]
+  // -14 [ saved x20            ]
+  // -13 [ saved x19            ]
+  // -12 [ saved x18            ]
+  // -11 [ saved x9             ]
+  // -10 [ call wrapper   (x10) ]
+  //  -9 [ result         (x11) ]
+  //  -8 [ result type    (x12) ]
+  //  -7 [ method         (x13) ]
+  //  -6 [ entry point    (x14) ]
+  //  -5 [ parameters     (x15) ]
+  //  -4 [ parameter size (x16) ]
+  //  -3 [ thread         (x17) ]
+  //  -2 [ saved fp       (x8)  ]
+  //  -1 [ saved ra       (x1)  ]
+  //   0 [                      ] <--- fp == saved sp (x2)
+
+  // Call stub stack layout word offsets from fp
+  enum call_stub_layout {
+    sp_after_call_off  = -21,
+
+    x27_off            = -21,
+    x26_off            = -20,
+    x25_off            = -19,
+    x24_off            = -18,
+    x23_off            = -17,
+    x22_off            = -16,
+    x21_off            = -15,
+    x20_off            = -14,
+    x19_off            = -13,
+    x18_off            = -12,
+    x9_off             = -11,
+
+    call_wrapper_off   = -10,
+    result_off         = -9,
+    result_type_off    = -8,
+    method_off         = -7,
+    entry_point_off    = -6,
+    parameters_off     = -5,
+    parameter_size_off = -4,
+    thread_off         = -3,
+    fp_f               = -2,
+    retaddr_off        = -1,
+  };
+
+  address generate_call_stub(address& return_address) {
+    assert((int)frame::entry_frame_after_call_words == -(int)sp_after_call_off + 1 &&
+           (int)frame::entry_frame_call_wrapper_offset == (int)call_wrapper_off,
+           "adjust this code");
+
+    StubCodeMark mark(this, "StubRoutines", "call_stub");
+    address start = __ pc();
+
+    const Address sp_after_call (fp, sp_after_call_off  * wordSize);
+
+    const Address call_wrapper  (fp, call_wrapper_off   * wordSize);
+    const Address result        (fp, result_off         * wordSize);
+    const Address result_type   (fp, result_type_off    * wordSize);
+    const Address method        (fp, method_off         * wordSize);
+    const Address entry_point   (fp, entry_point_off    * wordSize);
+    const Address parameters    (fp, parameters_off     * wordSize);
+    const Address parameter_size(fp, parameter_size_off * wordSize);
+
+    const Address thread        (fp, thread_off         * wordSize);
+
+    const Address x27_save      (fp, x27_off            * wordSize);
+    const Address x26_save      (fp, x26_off            * wordSize);
+    const Address x25_save      (fp, x25_off            * wordSize);
+    const Address x24_save      (fp, x24_off            * wordSize);
+    const Address x23_save      (fp, x23_off            * wordSize);
+    const Address x22_save      (fp, x22_off            * wordSize);
+    const Address x21_save      (fp, x21_off            * wordSize);
+    const Address x20_save      (fp, x20_off            * wordSize);
+    const Address x19_save      (fp, x19_off            * wordSize);
+    const Address x18_save      (fp, x18_off            * wordSize);
+
+    const Address x9_save       (fp, x9_off             * wordSize);
+
+    // stub code
+
+    address riscv_entry = __ pc();
+
+    // set up frame and move sp to end of save area
+    __ enter();
+    __ addi(sp, fp, sp_after_call_off * wordSize);
+
+    // save register parameters and Java temporary/global registers
+    // n.b. we save thread even though it gets installed in
+    // xthread because we want to sanity check tp later
+    __ sd(c_rarg7, thread);
+    __ sw(c_rarg6, parameter_size);
+    __ sd(c_rarg5, parameters);
+    __ sd(c_rarg4, entry_point);
+    __ sd(c_rarg3, method);
+    __ sd(c_rarg2, result_type);
+    __ sd(c_rarg1, result);
+    __ sd(c_rarg0, call_wrapper);
+
+    __ sd(x9, x9_save);
+
+    __ sd(x18, x18_save);
+    __ sd(x19, x19_save);
+    __ sd(x20, x20_save);
+    __ sd(x21, x21_save);
+    __ sd(x22, x22_save);
+    __ sd(x23, x23_save);
+    __ sd(x24, x24_save);
+    __ sd(x25, x25_save);
+    __ sd(x26, x26_save);
+    __ sd(x27, x27_save);
+
+    // install Java thread in global register now we have saved
+    // whatever value it held
+    __ mv(xthread, c_rarg7);
+
+    // And method
+    __ mv(xmethod, c_rarg3);
+
+    // set up the heapbase register
+    __ reinit_heapbase();
+
+#ifdef ASSERT
+    // make sure we have no pending exceptions
+    {
+      Label L;
+      __ ld(t0, Address(xthread, in_bytes(Thread::pending_exception_offset())));
+      __ beqz(t0, L);
+      __ stop("StubRoutines::call_stub: entered with pending exception");
+      __ BIND(L);
+    }
+#endif
+    // pass parameters if any
+    __ mv(esp, sp);
+    __ slli(t0, c_rarg6, LogBytesPerWord);
+    __ sub(t0, sp, t0); // Move SP out of the way
+    __ andi(sp, t0, -2 * wordSize);
+
+    BLOCK_COMMENT("pass parameters if any");
+    Label parameters_done;
+    // parameter count is still in c_rarg6
+    // and parameter pointer identifying param 1 is in c_rarg5
+    __ beqz(c_rarg6, parameters_done);
+
+    address loop = __ pc();
+    __ ld(t0, c_rarg5, 0);
+    __ addi(c_rarg5, c_rarg5, wordSize);
+    __ addi(c_rarg6, c_rarg6, -1);
+    __ push_reg(t0);
+    __ bgtz(c_rarg6, loop);
+
+    __ BIND(parameters_done);
+
+    // call Java entry -- passing methdoOop, and current sp
+    //      xmethod: Method*
+    //      x30: sender sp
+    BLOCK_COMMENT("call Java function");
+    __ mv(x30, sp);
+    __ jalr(c_rarg4);
+
+    // save current address for use by exception handling code
+
+    return_address = __ pc();
+
+    // store result depending on type (everything that is not
+    // T_OBJECT, T_LONG, T_FLOAT or T_DOUBLE is treated as T_INT)
+    // n.b. this assumes Java returns an integral result in x10
+    // and a floating result in j_farg0
+    __ ld(j_rarg2, result);
+    Label is_long, is_float, is_double, exit;
+    __ ld(j_rarg1, result_type);
+    __ li(t0, (u1)T_OBJECT);
+    __ beq(j_rarg1, t0, is_long);
+    __ li(t0, (u1)T_LONG);
+    __ beq(j_rarg1, t0, is_long);
+    __ li(t0, (u1)T_FLOAT);
+    __ beq(j_rarg1, t0, is_float);
+    __ li(t0, (u1)T_DOUBLE);
+    __ beq(j_rarg1, t0, is_double);
+
+    // handle T_INT case
+    __ sw(x10, Address(j_rarg2));
+
+    __ BIND(exit);
+
+    // pop parameters
+    __ addi(esp, fp, sp_after_call_off * wordSize);
+
+#ifdef ASSERT
+    // verify that threads correspond
+    {
+      Label L, S;
+      __ ld(t0, thread);
+      __ bne(xthread, t0, S);
+      __ get_thread(t0);
+      __ beq(xthread, t0, L);
+      __ BIND(S);
+      __ stop("StubRoutines::call_stub: threads must correspond");
+      __ BIND(L);
+    }
+#endif
+
+    // restore callee-save registers
+    __ ld(x27, x27_save);
+    __ ld(x26, x26_save);
+    __ ld(x25, x25_save);
+    __ ld(x24, x24_save);
+    __ ld(x23, x23_save);
+    __ ld(x22, x22_save);
+    __ ld(x21, x21_save);
+    __ ld(x20, x20_save);
+    __ ld(x19, x19_save);
+    __ ld(x18, x18_save);
+
+    __ ld(x9, x9_save);
+
+    __ ld(c_rarg0, call_wrapper);
+    __ ld(c_rarg1, result);
+    __ ld(c_rarg2, result_type);
+    __ ld(c_rarg3, method);
+    __ ld(c_rarg4, entry_point);
+    __ ld(c_rarg5, parameters);
+    __ ld(c_rarg6, parameter_size);
+    __ ld(c_rarg7, thread);
+
+    // leave frame and return to caller
+    __ leave();
+    __ ret();
+
+    // handle return types different from T_INT
+
+    __ BIND(is_long);
+    __ sd(x10, Address(j_rarg2, 0));
+    __ j(exit);
+
+    __ BIND(is_float);
+    __ fsw(j_farg0, Address(j_rarg2, 0), t0);
+    __ j(exit);
+
+    __ BIND(is_double);
+    __ fsd(j_farg0, Address(j_rarg2, 0), t0);
+    __ j(exit);
+
+    return start;
+  }
+
+  // Return point for a Java call if there's an exception thrown in
+  // Java code.  The exception is caught and transformed into a
+  // pending exception stored in JavaThread that can be tested from
+  // within the VM.
+  //
+  // Note: Usually the parameters are removed by the callee. In case
+  // of an exception crossing an activation frame boundary, that is
+  // not the case if the callee is compiled code => need to setup the
+  // sp.
+  //
+  // x10: exception oop
+
+  address generate_catch_exception() {
+    StubCodeMark mark(this, "StubRoutines", "catch_exception");
+    address start = __ pc();
+
+    // same as in generate_call_stub():
+    const Address thread(fp, thread_off * wordSize);
+
+#ifdef ASSERT
+    // verify that threads correspond
+    {
+      Label L, S;
+      __ ld(t0, thread);
+      __ bne(xthread, t0, S);
+      __ get_thread(t0);
+      __ beq(xthread, t0, L);
+      __ bind(S);
+      __ stop("StubRoutines::catch_exception: threads must correspond");
+      __ bind(L);
+    }
+#endif
+
+    // set pending exception
+    __ verify_oop(x10);
+
+    __ sd(x10, Address(xthread, Thread::pending_exception_offset()));
+    __ mv(t0, (address)__FILE__);
+    __ sd(t0, Address(xthread, Thread::exception_file_offset()));
+    __ mv(t0, (int)__LINE__);
+    __ sw(t0, Address(xthread, Thread::exception_line_offset()));
+
+    // complete return to VM
+    assert(StubRoutines::_call_stub_return_address != NULL,
+           "_call_stub_return_address must have been generated before");
+    __ j(StubRoutines::_call_stub_return_address);
+
+    return start;
+  }
+
+  // Continuation point for runtime calls returning with a pending
+  // exception.  The pending exception check happened in the runtime
+  // or native call stub.  The pending exception in Thread is
+  // converted into a Java-level exception.
+  //
+  // Contract with Java-level exception handlers:
+  // x10: exception
+  // x13: throwing pc
+  //
+  // NOTE: At entry of this stub, exception-pc must be in RA !!
+
+  // NOTE: this is always used as a jump target within generated code
+  // so it just needs to be generated code with no x86 prolog
+
+  address generate_forward_exception() {
+    StubCodeMark mark(this, "StubRoutines", "forward exception");
+    address start = __ pc();
+
+    // Upon entry, RA points to the return address returning into
+    // Java (interpreted or compiled) code; i.e., the return address
+    // becomes the throwing pc.
+    //
+    // Arguments pushed before the runtime call are still on the stack
+    // but the exception handler will reset the stack pointer ->
+    // ignore them.  A potential result in registers can be ignored as
+    // well.
+
+#ifdef ASSERT
+    // make sure this code is only executed if there is a pending exception
+    {
+      Label L;
+      __ ld(t0, Address(xthread, Thread::pending_exception_offset()));
+      __ bnez(t0, L);
+      __ stop("StubRoutines::forward exception: no pending exception (1)");
+      __ bind(L);
+    }
+#endif
+
+    // compute exception handler into x9
+
+    // call the VM to find the handler address associated with the
+    // caller address. pass thread in x10 and caller pc (ret address)
+    // in x11. n.b. the caller pc is in ra, unlike x86 where it is on
+    // the stack.
+    __ mv(c_rarg1, ra);
+    // ra will be trashed by the VM call so we move it to x9
+    // (callee-saved) because we also need to pass it to the handler
+    // returned by this call.
+    __ mv(x9, ra);
+    BLOCK_COMMENT("call exception_handler_for_return_address");
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address,
+                         SharedRuntime::exception_handler_for_return_address),
+                    xthread, c_rarg1);
+    // we should not really care that ra is no longer the callee
+    // address. we saved the value the handler needs in x9 so we can
+    // just copy it to x13. however, the C2 handler will push its own
+    // frame and then calls into the VM and the VM code asserts that
+    // the PC for the frame above the handler belongs to a compiled
+    // Java method. So, we restore ra here to satisfy that assert.
+    __ mv(ra, x9);
+    // setup x10 & x13 & clear pending exception
+    __ mv(x13, x9);
+    __ mv(x9, x10);
+    __ ld(x10, Address(xthread, Thread::pending_exception_offset()));
+    __ sd(zr, Address(xthread, Thread::pending_exception_offset()));
+
+#ifdef ASSERT
+    // make sure exception is set
+    {
+      Label L;
+      __ bnez(x10, L);
+      __ stop("StubRoutines::forward exception: no pending exception (2)");
+      __ bind(L);
+    }
+#endif
+
+    // continue at exception handler
+    // x10: exception
+    // x13: throwing pc
+    // x9: exception handler
+    __ verify_oop(x10);
+    __ jr(x9);
+
+    return start;
+  }
+
+  // Non-destructive plausibility checks for oops
+  //
+  // Arguments:
+  //    x10: oop to verify
+  //    t0: error message
+  //
+  // Stack after saving c_rarg3:
+  //    [tos + 0]: saved c_rarg3
+  //    [tos + 1]: saved c_rarg2
+  //    [tos + 2]: saved ra
+  //    [tos + 3]: saved t1
+  //    [tos + 4]: saved x10
+  //    [tos + 5]: saved t0
+  address generate_verify_oop() {
+
+    StubCodeMark mark(this, "StubRoutines", "verify_oop");
+    address start = __ pc();
+
+    Label exit, error;
+
+    __ push_reg(0x3000, sp);   // save c_rarg2 and c_rarg3
+
+    __ la(c_rarg2, ExternalAddress((address) StubRoutines::verify_oop_count_addr()));
+    __ ld(c_rarg3, Address(c_rarg2));
+    __ add(c_rarg3, c_rarg3, 1);
+    __ sd(c_rarg3, Address(c_rarg2));
+
+    // object is in x10
+    // make sure object is 'reasonable'
+    __ beqz(x10, exit); // if obj is NULL it is OK
+
+#if INCLUDE_ZGC
+    if (UseZGC) {
+      // Check if mask is good.
+      // verifies that ZAddressBadMask & x10 == 0
+      __ ld(c_rarg3, Address(xthread, ZThreadLocalData::address_bad_mask_offset()));
+      __ andr(c_rarg2, x10, c_rarg3);
+      __ bnez(c_rarg2, error);
+    }
+#endif
+
+    // Check if the oop is in the right area of memory
+    __ mv(c_rarg3, (intptr_t) Universe::verify_oop_mask());
+    __ andr(c_rarg2, x10, c_rarg3);
+    __ mv(c_rarg3, (intptr_t) Universe::verify_oop_bits());
+
+    // Compare c_rarg2 and c_rarg3.
+    __ bne(c_rarg2, c_rarg3, error);
+
+    // make sure klass is 'reasonable', which is not zero.
+    __ load_klass(x10, x10);  // get klass
+    __ beqz(x10, error);      // if klass is NULL it is broken
+
+    // return if everything seems ok
+    __ bind(exit);
+
+    __ pop_reg(0x3000, sp);   // pop c_rarg2 and c_rarg3
+    __ ret();
+
+    // handle errors
+    __ bind(error);
+    __ pop_reg(0x3000, sp);   // pop c_rarg2 and c_rarg3
+
+    __ pusha();
+    // debug(char* msg, int64_t pc, int64_t regs[])
+    __ mv(c_rarg0, t0);             // pass address of error message
+    __ mv(c_rarg1, ra);             // pass return address
+    __ mv(c_rarg2, sp);             // pass address of regs on stack
+#ifndef PRODUCT
+    assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+    BLOCK_COMMENT("call MacroAssembler::debug");
+    int32_t offset = 0;
+    __ movptr_with_offset(t0, CAST_FROM_FN_PTR(address, MacroAssembler::debug64), offset);
+    __ jalr(x1, t0, offset);
+    __ ebreak();
+
+    return start;
+  }
+
+  // The inner part of zero_words().
+  //
+  // Inputs:
+  // x28: the HeapWord-aligned base address of an array to zero.
+  // x29: the count in HeapWords, x29 > 0.
+  //
+  // Returns x28 and x29, adjusted for the caller to clear.
+  // x28: the base address of the tail of words left to clear.
+  // x29: the number of words in the tail.
+  //      x29 < MacroAssembler::zero_words_block_size.
+
+  address generate_zero_blocks() {
+    Label done;
+
+    const Register base = x28, cnt = x29;
+
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "zero_blocks");
+    address start = __ pc();
+
+    {
+      // Clear the remaining blocks.
+      Label loop;
+      __ sub(cnt, cnt, MacroAssembler::zero_words_block_size);
+      __ bltz(cnt, done);
+      __ bind(loop);
+      for (int i = 0; i < MacroAssembler::zero_words_block_size; i++) {
+        __ sd(zr, Address(base, 0));
+        __ add(base, base, 8);
+      }
+      __ sub(cnt, cnt, MacroAssembler::zero_words_block_size);
+      __ bgez(cnt, loop);
+      __ bind(done);
+      __ add(cnt, cnt, MacroAssembler::zero_words_block_size);
+    }
+
+    __ ret();
+
+    return start;
+  }
+
+  typedef enum {
+    copy_forwards = 1,
+    copy_backwards = -1
+  } copy_direction;
+
+  // Bulk copy of blocks of 8 words.
+  //
+  // count is a count of words.
+  //
+  // Precondition: count >= 8
+  //
+  // Postconditions:
+  //
+  // The least significant bit of count contains the remaining count
+  // of words to copy.  The rest of count is trash.
+  //
+  // s and d are adjusted to point to the remaining words to copy
+  //
+  void generate_copy_longs(Label &start, Register s, Register d, Register count,
+                           copy_direction direction) {
+    int unit = wordSize * direction;
+    int bias = wordSize;
+
+    const Register tmp_reg0 = x13, tmp_reg1 = x14, tmp_reg2 = x15, tmp_reg3 = x16,
+      tmp_reg4 = x17, tmp_reg5 = x7, tmp_reg6 = x28, tmp_reg7 = x29;
+
+    const Register stride = x30;
+
+    assert_different_registers(t0, tmp_reg0, tmp_reg1, tmp_reg2, tmp_reg3,
+      tmp_reg4, tmp_reg5, tmp_reg6, tmp_reg7);
+    assert_different_registers(s, d, count, t0);
+
+    Label again, drain;
+    const char* stub_name = NULL;
+    if (direction == copy_forwards) {
+      stub_name = "forward_copy_longs";
+    } else {
+      stub_name = "backward_copy_longs";
+    }
+    StubCodeMark mark(this, "StubRoutines", stub_name);
+    __ align(CodeEntryAlignment);
+    __ bind(start);
+
+    if (direction == copy_forwards) {
+      __ sub(s, s, bias);
+      __ sub(d, d, bias);
+    }
+
+#ifdef ASSERT
+    // Make sure we are never given < 8 words
+    {
+      Label L;
+
+      __ li(t0, 8);
+      __ bge(count, t0, L);
+      __ stop("genrate_copy_longs called with < 8 words");
+      __ bind(L);
+    }
+#endif
+
+    __ ld(tmp_reg0, Address(s, 1 * unit));
+    __ ld(tmp_reg1, Address(s, 2 * unit));
+    __ ld(tmp_reg2, Address(s, 3 * unit));
+    __ ld(tmp_reg3, Address(s, 4 * unit));
+    __ ld(tmp_reg4, Address(s, 5 * unit));
+    __ ld(tmp_reg5, Address(s, 6 * unit));
+    __ ld(tmp_reg6, Address(s, 7 * unit));
+    __ ld(tmp_reg7, Address(s, 8 * unit));
+    __ addi(s, s, 8 * unit);
+
+    __ sub(count, count, 16);
+    __ bltz(count, drain);
+
+    __ bind(again);
+
+    __ sd(tmp_reg0, Address(d, 1 * unit));
+    __ sd(tmp_reg1, Address(d, 2 * unit));
+    __ sd(tmp_reg2, Address(d, 3 * unit));
+    __ sd(tmp_reg3, Address(d, 4 * unit));
+    __ sd(tmp_reg4, Address(d, 5 * unit));
+    __ sd(tmp_reg5, Address(d, 6 * unit));
+    __ sd(tmp_reg6, Address(d, 7 * unit));
+    __ sd(tmp_reg7, Address(d, 8 * unit));
+
+    __ ld(tmp_reg0, Address(s, 1 * unit));
+    __ ld(tmp_reg1, Address(s, 2 * unit));
+    __ ld(tmp_reg2, Address(s, 3 * unit));
+    __ ld(tmp_reg3, Address(s, 4 * unit));
+    __ ld(tmp_reg4, Address(s, 5 * unit));
+    __ ld(tmp_reg5, Address(s, 6 * unit));
+    __ ld(tmp_reg6, Address(s, 7 * unit));
+    __ ld(tmp_reg7, Address(s, 8 * unit));
+
+    __ addi(s, s, 8 * unit);
+    __ addi(d, d, 8 * unit);
+
+    __ sub(count, count, 8);
+    __ bgez(count, again);
+
+    // Drain
+    __ bind(drain);
+
+    __ sd(tmp_reg0, Address(d, 1 * unit));
+    __ sd(tmp_reg1, Address(d, 2 * unit));
+    __ sd(tmp_reg2, Address(d, 3 * unit));
+    __ sd(tmp_reg3, Address(d, 4 * unit));
+    __ sd(tmp_reg4, Address(d, 5 * unit));
+    __ sd(tmp_reg5, Address(d, 6 * unit));
+    __ sd(tmp_reg6, Address(d, 7 * unit));
+    __ sd(tmp_reg7, Address(d, 8 * unit));
+    __ addi(d, d, 8 * unit);
+
+    {
+      Label L1, L2;
+      __ andi(t0, count, 4);
+      __ beqz(t0, L1);
+
+      __ ld(tmp_reg0, Address(s, 1 * unit));
+      __ ld(tmp_reg1, Address(s, 2 * unit));
+      __ ld(tmp_reg2, Address(s, 3 * unit));
+      __ ld(tmp_reg3, Address(s, 4 * unit));
+      __ addi(s, s, 4 * unit);
+
+      __ sd(tmp_reg0, Address(d, 1 * unit));
+      __ sd(tmp_reg1, Address(d, 2 * unit));
+      __ sd(tmp_reg2, Address(d, 3 * unit));
+      __ sd(tmp_reg3, Address(d, 4 * unit));
+      __ addi(d, d, 4 * unit);
+
+      __ bind(L1);
+
+      if (direction == copy_forwards) {
+        __ addi(s, s, bias);
+        __ addi(d, d, bias);
+      }
+
+      __ andi(t0, count, 2);
+      __ beqz(t0, L2);
+      if (direction == copy_backwards) {
+        __ addi(s, s, 2 * unit);
+        __ ld(tmp_reg0, Address(s));
+        __ ld(tmp_reg1, Address(s, wordSize));
+        __ addi(d, d, 2 * unit);
+        __ sd(tmp_reg0, Address(d));
+        __ sd(tmp_reg1, Address(d, wordSize));
+      } else {
+        __ ld(tmp_reg0, Address(s));
+        __ ld(tmp_reg1, Address(s, wordSize));
+        __ addi(s, s, 2 * unit);
+        __ sd(tmp_reg0, Address(d));
+        __ sd(tmp_reg1, Address(d, wordSize));
+        __ addi(d, d, 2 * unit);
+      }
+      __ bind(L2);
+    }
+
+    __ ret();
+  }
+
+  Label copy_f, copy_b;
+
+  // All-singing all-dancing memory copy.
+  //
+  // Copy count units of memory from s to d.  The size of a unit is
+  // step, which can be positive or negative depending on the direction
+  // of copy.  If is_aligned is false, we align the source address.
+  //
+  /*
+   * if (is_aligned) {
+   *   goto copy_8_bytes;
+   * }
+   * bool is_backwards = step < 0;
+   * int granularity = uabs(step);
+   * count = count  *  granularity;   * count bytes
+   *
+   * if (is_backwards) {
+   *   s += count;
+   *   d += count;
+   * }
+   *
+   * count limit maybe greater than 16, for better performance
+   * if (count < 16) {
+   *   goto copy_small;
+   * }
+   *
+   * if ((dst % 8) == (src % 8)) {
+   *   aligned;
+   *   goto copy8;
+   * }
+   *
+   * copy_small:
+   *   load element one by one;
+   * done;
+   */
+
+  typedef void (MacroAssembler::*copy_insn)(Register Rd, const Address &adr, Register temp);
+
+  void copy_memory_v(Register s, Register d, Register count, Register tmp, int step) {
+    bool is_backward = step < 0;
+    int granularity = uabs(step);
+
+    const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17;
+    assert_different_registers(s, d, cnt, vl, tmp, tmp1, tmp2);
+    Assembler::SEW sew = Assembler::elembytes_to_sew(granularity);
+    Label loop_forward, loop_backward, done;
+
+    __ mv(dst, d);
+    __ mv(src, s);
+    __ mv(cnt, count);
+
+    __ bind(loop_forward);
+    __ vsetvli(vl, cnt, sew, Assembler::m8);
+    if (is_backward) {
+      __ bne(vl, cnt, loop_backward);
+    }
+
+    __ vlex_v(v0, src, sew);
+    __ sub(cnt, cnt, vl);
+    __ slli(vl, vl, (int)sew);
+    __ add(src, src, vl);
+
+    __ vsex_v(v0, dst, sew);
+    __ add(dst, dst, vl);
+    __ bnez(cnt, loop_forward);
+
+    if (is_backward) {
+      __ j(done);
+
+      __ bind(loop_backward);
+      __ sub(tmp, cnt, vl);
+      __ slli(tmp, tmp, sew);
+      __ add(tmp1, s, tmp);
+      __ vlex_v(v0, tmp1, sew);
+      __ add(tmp2, d, tmp);
+      __ vsex_v(v0, tmp2, sew);
+      __ sub(cnt, cnt, vl);
+      __ bnez(cnt, loop_forward);
+      __ bind(done);
+    }
+  }
+
+  void copy_memory(bool is_aligned, Register s, Register d,
+                   Register count, Register tmp, int step) {
+    if (UseRVV) {
+      return copy_memory_v(s, d, count, tmp, step);
+    }
+
+    bool is_backwards = step < 0;
+    int granularity = uabs(step);
+
+    const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17;
+
+    Label same_aligned;
+    Label copy8, copy_small, done;
+
+    copy_insn ld_arr = NULL, st_arr = NULL;
+    switch (granularity) {
+      case 1 :
+        ld_arr = (copy_insn)&MacroAssembler::lbu;
+        st_arr = (copy_insn)&MacroAssembler::sb;
+        break;
+      case 2 :
+        ld_arr = (copy_insn)&MacroAssembler::lhu;
+        st_arr = (copy_insn)&MacroAssembler::sh;
+        break;
+      case 4 :
+        ld_arr = (copy_insn)&MacroAssembler::lwu;
+        st_arr = (copy_insn)&MacroAssembler::sw;
+        break;
+      case 8 :
+        ld_arr = (copy_insn)&MacroAssembler::ld;
+        st_arr = (copy_insn)&MacroAssembler::sd;
+        break;
+      default :
+        ShouldNotReachHere();
+    }
+
+    __ beqz(count, done);
+    __ slli(cnt, count, exact_log2(granularity));
+    if (is_backwards) {
+      __ add(src, s, cnt);
+      __ add(dst, d, cnt);
+    } else {
+      __ mv(src, s);
+      __ mv(dst, d);
+    }
+
+    if (is_aligned) {
+      __ addi(tmp, cnt, -8);
+      __ bgez(tmp, copy8);
+      __ j(copy_small);
+    }
+
+    __ mv(tmp, 16);
+    __ blt(cnt, tmp, copy_small);
+
+    __ xorr(tmp, src, dst);
+    __ andi(tmp, tmp, 0b111);
+    __ bnez(tmp, copy_small);
+
+    __ bind(same_aligned);
+    __ andi(tmp, src, 0b111);
+    __ beqz(tmp, copy8);
+    if (is_backwards) {
+      __ addi(src, src, step);
+      __ addi(dst, dst, step);
+    }
+    (_masm->*ld_arr)(tmp3, Address(src), t0);
+    (_masm->*st_arr)(tmp3, Address(dst), t0);
+    if (!is_backwards) {
+      __ addi(src, src, step);
+      __ addi(dst, dst, step);
+    }
+    __ addi(cnt, cnt, -granularity);
+    __ beqz(cnt, done);
+    __ j(same_aligned);
+
+    __ bind(copy8);
+    if (is_backwards) {
+      __ addi(src, src, -wordSize);
+      __ addi(dst, dst, -wordSize);
+    }
+    __ ld(tmp3, Address(src));
+    __ sd(tmp3, Address(dst));
+    if (!is_backwards) {
+      __ addi(src, src, wordSize);
+      __ addi(dst, dst, wordSize);
+    }
+    __ addi(cnt, cnt, -wordSize);
+    __ addi(tmp4, cnt, -8);
+    __ bgez(tmp4, copy8); // cnt >= 8, do next loop
+
+    __ beqz(cnt, done);
+
+    __ bind(copy_small);
+    if (is_backwards) {
+      __ addi(src, src, step);
+      __ addi(dst, dst, step);
+    }
+    (_masm->*ld_arr)(tmp3, Address(src), t0);
+    (_masm->*st_arr)(tmp3, Address(dst), t0);
+    if (!is_backwards) {
+      __ addi(src, src, step);
+      __ addi(dst, dst, step);
+    }
+    __ addi(cnt, cnt, -granularity);
+    __ bgtz(cnt, copy_small);
+
+    __ bind(done);
+  }
+
+  // Scan over array at a for count oops, verifying each one.
+  // Preserves a and count, clobbers t0 and t1.
+  void verify_oop_array(size_t size, Register a, Register count, Register temp) {
+    Label loop, end;
+    __ mv(t1, zr);
+    __ slli(t0, count, exact_log2(size));
+    __ bind(loop);
+    __ bgeu(t1, t0, end);
+
+    __ add(temp, a, t1);
+    if (size == (size_t)wordSize) {
+      __ ld(temp, Address(temp, 0));
+      __ verify_oop(temp);
+    } else {
+      __ lwu(temp, Address(temp, 0));
+      __ decode_heap_oop(temp); // calls verify_oop
+    }
+    __ add(t1, t1, size);
+    __ j(loop);
+    __ bind(end);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord == 8-byte boundary
+  //             ignored
+  //   is_oop  - true => oop array, so generate store check code
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as ssize_t, can be zero
+  //
+  // If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
+  // the hardware handle it.  The two dwords within qwords that span
+  // cache line boundaries will still be loaded and stored atomicly.
+  //
+  // Side Effects:
+  //   disjoint_int_copy_entry is set to the no-overlap entry point
+  //   used by generate_conjoint_int_oop_copy().
+  //
+  address generate_disjoint_copy(size_t size, bool aligned, bool is_oop, address* entry,
+                                 const char* name, bool dest_uninitialized = false) {
+    const Register s = c_rarg0, d = c_rarg1, count = c_rarg2;
+    RegSet saved_reg = RegSet::of(s, d, count);
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", name);
+    address start = __ pc();
+    __ enter();
+
+    if (entry != NULL) {
+      *entry = __ pc();
+      // caller can pass a 64-bit byte count here (from Unsafe.copyMemory)
+      BLOCK_COMMENT("Entry:");
+    }
+
+    DecoratorSet decorators = IN_HEAP | IS_ARRAY | ARRAYCOPY_DISJOINT;
+    if (dest_uninitialized) {
+      decorators |= IS_DEST_UNINITIALIZED;
+    }
+    if (aligned) {
+      decorators |= ARRAYCOPY_ALIGNED;
+    }
+
+    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+    bs->arraycopy_prologue(_masm, decorators, is_oop, s, d, count, saved_reg);
+
+    if (is_oop) {
+      // save regs before copy_memory
+      __ push_reg(RegSet::of(d, count), sp);
+    }
+
+    {
+      // UnsafeCopyMemory page error: continue after ucm
+      bool add_entry = !is_oop && (!aligned || sizeof(jlong) == size);
+      UnsafeCopyMemoryMark ucmm(this, add_entry, true);
+      copy_memory(aligned, s, d, count, t0, size);
+    }
+
+    if (is_oop) {
+      __ pop_reg(RegSet::of(d, count), sp);
+      if (VerifyOops) {
+        verify_oop_array(size, d, count, t2);
+      }
+    }
+
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, t0, RegSet());
+
+    __ leave();
+    __ mv(x10, zr); // return 0
+    __ ret();
+    return start;
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord == 8-byte boundary
+  //             ignored
+  //   is_oop  - true => oop array, so generate store check code
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as ssize_t, can be zero
+  //
+  // If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
+  // the hardware handle it.  The two dwords within qwords that span
+  // cache line boundaries will still be loaded and stored atomicly.
+  //
+  address generate_conjoint_copy(size_t size, bool aligned, bool is_oop, address nooverlap_target,
+                                 address* entry, const char* name,
+                                 bool dest_uninitialized = false) {
+    const Register s = c_rarg0, d = c_rarg1, count = c_rarg2;
+    RegSet saved_regs = RegSet::of(s, d, count);
+    StubCodeMark mark(this, "StubRoutines", name);
+    address start = __ pc();
+    __ enter();
+
+    if (entry != NULL) {
+      *entry = __ pc();
+      // caller can pass a 64-bit byte count here (from Unsafe.copyMemory)
+      BLOCK_COMMENT("Entry:");
+    }
+
+    // use fwd copy when (d-s) above_equal (count*size)
+    __ sub(t0, d, s);
+    __ slli(t1, count, exact_log2(size));
+    __ bgeu(t0, t1, nooverlap_target);
+
+    DecoratorSet decorators = IN_HEAP | IS_ARRAY;
+    if (dest_uninitialized) {
+      decorators |= IS_DEST_UNINITIALIZED;
+    }
+    if (aligned) {
+      decorators |= ARRAYCOPY_ALIGNED;
+    }
+
+    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+    bs->arraycopy_prologue(_masm, decorators, is_oop, s, d, count, saved_regs);
+
+    if (is_oop) {
+      // save regs before copy_memory
+      __ push_reg(RegSet::of(d, count), sp);
+    }
+
+    {
+      // UnsafeCopyMemory page error: continue after ucm
+      bool add_entry = !is_oop && (!aligned || sizeof(jlong) == size);
+      UnsafeCopyMemoryMark ucmm(this, add_entry, true);
+      copy_memory(aligned, s, d, count, t0, -size);
+    }
+
+    if (is_oop) {
+      __ pop_reg(RegSet::of(d, count), sp);
+      if (VerifyOops) {
+        verify_oop_array(size, d, count, t2);
+      }
+    }
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, d, count, t0, RegSet());
+    __ leave();
+    __ mv(x10, zr); // return 0
+    __ ret();
+    return start;
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord == 8-byte boundary
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as ssize_t, can be zero
+  //
+  // If 'from' and/or 'to' are aligned on 4-, 2-, or 1-byte boundaries,
+  // we let the hardware handle it.  The one to eight bytes within words,
+  // dwords or qwords that span cache line boundaries will still be loaded
+  // and stored atomically.
+  //
+  // Side Effects:
+  //   disjoint_byte_copy_entry is set to the no-overlap entry point  //
+  // If 'from' and/or 'to' are aligned on 4-, 2-, or 1-byte boundaries,
+  // we let the hardware handle it.  The one to eight bytes within words,
+  // dwords or qwords that span cache line boundaries will still be loaded
+  // and stored atomically.
+  //
+  // Side Effects:
+  //   disjoint_byte_copy_entry is set to the no-overlap entry point
+  //   used by generate_conjoint_byte_copy().
+  //
+  address generate_disjoint_byte_copy(bool aligned, address* entry, const char* name) {
+    const bool not_oop = false;
+    return generate_disjoint_copy(sizeof (jbyte), aligned, not_oop, entry, name);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord == 8-byte boundary
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as ssize_t, can be zero
+  //
+  // If 'from' and/or 'to' are aligned on 4-, 2-, or 1-byte boundaries,
+  // we let the hardware handle it.  The one to eight bytes within words,
+  // dwords or qwords that span cache line boundaries will still be loaded
+  // and stored atomically.
+  //
+  address generate_conjoint_byte_copy(bool aligned, address nooverlap_target,
+                                      address* entry, const char* name) {
+    const bool not_oop = false;
+    return generate_conjoint_copy(sizeof (jbyte), aligned, not_oop, nooverlap_target, entry, name);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord == 8-byte boundary
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as ssize_t, can be zero
+  //
+  // If 'from' and/or 'to' are aligned on 4- or 2-byte boundaries, we
+  // let the hardware handle it.  The two or four words within dwords
+  // or qwords that span cache line boundaries will still be loaded
+  // and stored atomically.
+  //
+  // Side Effects:
+  //   disjoint_short_copy_entry is set to the no-overlap entry point
+  //   used by generate_conjoint_short_copy().
+  //
+  address generate_disjoint_short_copy(bool aligned,
+                                       address* entry, const char* name) {
+    const bool not_oop = false;
+    return generate_disjoint_copy(sizeof (jshort), aligned, not_oop, entry, name);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord == 8-byte boundary
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as ssize_t, can be zero
+  //
+  // If 'from' and/or 'to' are aligned on 4- or 2-byte boundaries, we
+  // let the hardware handle it.  The two or four words within dwords
+  // or qwords that span cache line boundaries will still be loaded
+  // and stored atomically.
+  //
+  address generate_conjoint_short_copy(bool aligned, address nooverlap_target,
+                                       address* entry, const char* name) {
+    const bool not_oop = false;
+    return generate_conjoint_copy(sizeof (jshort), aligned, not_oop, nooverlap_target, entry, name);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord == 8-byte boundary
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as ssize_t, can be zero
+  //
+  // If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
+  // the hardware handle it.  The two dwords within qwords that span
+  // cache line boundaries will still be loaded and stored atomicly.
+  //
+  // Side Effects:
+  //   disjoint_int_copy_entry is set to the no-overlap entry point
+  //   used by generate_conjoint_int_oop_copy().
+  //
+  address generate_disjoint_int_copy(bool aligned, address* entry,
+                                     const char* name, bool dest_uninitialized = false) {
+    const bool not_oop = false;
+    return generate_disjoint_copy(sizeof (jint), aligned, not_oop, entry, name);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord == 8-byte boundary
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as ssize_t, can be zero
+  //
+  // If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
+  // the hardware handle it.  The two dwords within qwords that span
+  // cache line boundaries will still be loaded and stored atomicly.
+  //
+  address generate_conjoint_int_copy(bool aligned, address nooverlap_target,
+                                     address* entry, const char* name,
+                                     bool dest_uninitialized = false) {
+    const bool not_oop = false;
+    return generate_conjoint_copy(sizeof (jint), aligned, not_oop, nooverlap_target, entry, name);
+  }
+
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord boundary == 8 bytes
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as size_t, can be zero
+  //
+  // Side Effects:
+  //   disjoint_oop_copy_entry or disjoint_long_copy_entry is set to the
+  //   no-overlap entry point used by generate_conjoint_long_oop_copy().
+  //
+  address generate_disjoint_long_copy(bool aligned, address* entry,
+                                      const char* name, bool dest_uninitialized = false) {
+    const bool not_oop = false;
+    return generate_disjoint_copy(sizeof (jlong), aligned, not_oop, entry, name);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord boundary == 8 bytes
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as size_t, can be zero
+  //
+  address generate_conjoint_long_copy(bool aligned,
+                                      address nooverlap_target, address* entry,
+                                      const char* name, bool dest_uninitialized = false) {
+    const bool not_oop = false;
+    return generate_conjoint_copy(sizeof (jlong), aligned, not_oop, nooverlap_target, entry, name);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord boundary == 8 bytes
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as size_t, can be zero
+  //
+  // Side Effects:
+  //   disjoint_oop_copy_entry or disjoint_long_copy_entry is set to the
+  //   no-overlap entry point used by generate_conjoint_long_oop_copy().
+  //
+  address generate_disjoint_oop_copy(bool aligned, address* entry,
+                                     const char* name, bool dest_uninitialized) {
+    const bool is_oop = true;
+    const size_t size = UseCompressedOops ? sizeof (jint) : sizeof (jlong);
+    return generate_disjoint_copy(size, aligned, is_oop, entry, name, dest_uninitialized);
+  }
+
+  // Arguments:
+  //   aligned - true => Input and output aligned on a HeapWord boundary == 8 bytes
+  //             ignored
+  //   name    - stub name string
+  //
+  // Inputs:
+  //   c_rarg0   - source array address
+  //   c_rarg1   - destination array address
+  //   c_rarg2   - element count, treated as size_t, can be zero
+  //
+  address generate_conjoint_oop_copy(bool aligned,
+                                     address nooverlap_target, address* entry,
+                                     const char* name, bool dest_uninitialized) {
+    const bool is_oop = true;
+    const size_t size = UseCompressedOops ? sizeof (jint) : sizeof (jlong);
+    return generate_conjoint_copy(size, aligned, is_oop, nooverlap_target, entry,
+                                  name, dest_uninitialized);
+  }
+
+  // Helper for generating a dynamic type check.
+  // Smashes t0, t1.
+  void generate_type_check(Register sub_klass,
+                           Register super_check_offset,
+                           Register super_klass,
+                           Label& L_success) {
+    assert_different_registers(sub_klass, super_check_offset, super_klass);
+
+    BLOCK_COMMENT("type_check:");
+
+    Label L_miss;
+
+    __ check_klass_subtype_fast_path(sub_klass, super_klass, noreg, &L_success, &L_miss, NULL, super_check_offset);
+    __ check_klass_subtype_slow_path(sub_klass, super_klass, noreg, noreg, &L_success, NULL);
+
+    // Fall through on failure!
+    __ BIND(L_miss);
+  }
+
+  //
+  //  Generate checkcasting array copy stub
+  //
+  //  Input:
+  //    c_rarg0   - source array address
+  //    c_rarg1   - destination array address
+  //    c_rarg2   - element count, treated as ssize_t, can be zero
+  //    c_rarg3   - size_t ckoff (super_check_offset)
+  //    c_rarg4   - oop ckval (super_klass)
+  //
+  //  Output:
+  //    x10 ==  0  -  success
+  //    x10 == -1^K - failure, where K is partial transfer count
+  //
+  address generate_checkcast_copy(const char* name, address* entry,
+                                  bool dest_uninitialized = false) {
+    Label L_load_element, L_store_element, L_do_card_marks, L_done, L_done_pop;
+
+    // Input registers (after setup_arg_regs)
+    const Register from        = c_rarg0;   // source array address
+    const Register to          = c_rarg1;   // destination array address
+    const Register count       = c_rarg2;   // elementscount
+    const Register ckoff       = c_rarg3;   // super_check_offset
+    const Register ckval       = c_rarg4;   // super_klass
+
+    RegSet wb_pre_saved_regs   = RegSet::range(c_rarg0, c_rarg4);
+    RegSet wb_post_saved_regs  = RegSet::of(count);
+
+    // Registers used as temps (x7, x9, x18 are save-on-entry)
+    const Register count_save  = x19;       // orig elementscount
+    const Register start_to    = x18;       // destination array start address
+    const Register copied_oop  = x7;        // actual oop copied
+    const Register r9_klass    = x9;        // oop._klass
+
+    //---------------------------------------------------------------
+    // Assembler stub will be used for this call to arraycopy
+    // if the two arrays are subtypes of Object[] but the
+    // destination array type is not equal to or a supertype
+    // of the source type.  Each element must be separately
+    // checked.
+
+    assert_different_registers(from, to, count, ckoff, ckval, start_to,
+                               copied_oop, r9_klass, count_save);
+
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", name);
+    address start = __ pc();
+
+    __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+    // Caller of this entry point must set up the argument registers.
+    if (entry != NULL) {
+      *entry = __ pc();
+      BLOCK_COMMENT("Entry:");
+    }
+
+    // Empty array:  Nothing to do
+    __ beqz(count, L_done);
+
+    __ push_reg(RegSet::of(x7, x9, x18, x19), sp);
+
+#ifdef ASSERT
+    BLOCK_COMMENT("assert consistent ckoff/ckval");
+    // The ckoff and ckval must be mutually consistent,
+    // even though caller generates both.
+    { Label L;
+      int sco_offset = in_bytes(Klass::super_check_offset_offset());
+      __ lwu(start_to, Address(ckval, sco_offset));
+      __ beq(ckoff, start_to, L);
+      __ stop("super_check_offset inconsistent");
+      __ bind(L);
+    }
+#endif //ASSERT
+
+    DecoratorSet decorators = IN_HEAP | IS_ARRAY | ARRAYCOPY_CHECKCAST | ARRAYCOPY_DISJOINT;
+    bool is_oop = true;
+    if (dest_uninitialized) {
+      decorators |= IS_DEST_UNINITIALIZED;
+    }
+
+    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+    bs->arraycopy_prologue(_masm, decorators, is_oop, from, to, count, wb_pre_saved_regs);
+
+    // save the original count
+    __ mv(count_save, count);
+
+    // Copy from low to high addresses
+    __ mv(start_to, to);              // Save destination array start address
+    __ j(L_load_element);
+
+    // ======== begin loop ========
+    // (Loop is rotated; its entry is L_load_element.)
+    // Loop control:
+    //   for count to 0 do
+    //     copied_oop = load_heap_oop(from++)
+    //     ... generate_type_check ...
+    //     store_heap_oop(to++, copied_oop)
+    //   end
+
+    __ align(OptoLoopAlignment);
+
+    __ BIND(L_store_element);
+    __ store_heap_oop(Address(to, 0), copied_oop, noreg, noreg, AS_RAW);  // store the oop
+    __ add(to, to, UseCompressedOops ? 4 : 8);
+    __ sub(count, count, 1);
+    __ beqz(count, L_do_card_marks);
+
+    // ======== loop entry is here ========
+    __ BIND(L_load_element);
+    __ load_heap_oop(copied_oop, Address(from, 0), noreg, noreg, AS_RAW); // load the oop
+    __ add(from, from, UseCompressedOops ? 4 : 8);
+    __ beqz(copied_oop, L_store_element);
+
+    __ load_klass(r9_klass, copied_oop);// query the object klass
+    generate_type_check(r9_klass, ckoff, ckval, L_store_element);
+    // ======== end loop ========
+
+    // It was a real error; we must depend on the caller to finish the job.
+    // Register count = remaining oops, count_orig = total oops.
+    // Emit GC store barriers for the oops we have copied and report
+    // their number to the caller.
+
+    __ sub(count, count_save, count);     // K = partially copied oop count
+    __ xori(count, count, -1);                   // report (-1^K) to caller
+    __ beqz(count, L_done_pop);
+
+    __ BIND(L_do_card_marks);
+    bs->arraycopy_epilogue(_masm, decorators, is_oop, start_to, count_save, t0, wb_post_saved_regs);
+
+    __ bind(L_done_pop);
+    __ pop_reg(RegSet::of(x7, x9, x18, x19), sp);
+    inc_counter_np(SharedRuntime::_checkcast_array_copy_ctr);
+
+    __ bind(L_done);
+    __ mv(x10, count);
+    __ leave();
+    __ ret();
+
+    return start;
+  }
+
+  // Perform range checks on the proposed arraycopy.
+  // Kills temp, but nothing else.
+  // Also, clean the sign bits of src_pos and dst_pos.
+  void arraycopy_range_checks(Register src,     // source array oop (c_rarg0)
+                              Register src_pos, // source position (c_rarg1)
+                              Register dst,     // destination array oo (c_rarg2)
+                              Register dst_pos, // destination position (c_rarg3)
+                              Register length,
+                              Register temp,
+                              Label& L_failed) {
+    BLOCK_COMMENT("arraycopy_range_checks:");
+
+    assert_different_registers(t0, temp);
+
+    // if [src_pos + length > arrayOop(src)->length()] then FAIL
+    __ lwu(t0, Address(src, arrayOopDesc::length_offset_in_bytes()));
+    __ addw(temp, length, src_pos);
+    __ bgtu(temp, t0, L_failed);
+
+    // if [dst_pos + length > arrayOop(dst)->length()] then FAIL
+    __ lwu(t0, Address(dst, arrayOopDesc::length_offset_in_bytes()));
+    __ addw(temp, length, dst_pos);
+    __ bgtu(temp, t0, L_failed);
+
+    // Have to clean up high 32 bits of 'src_pos' and 'dst_pos'.
+    __ zero_extend(src_pos, src_pos, 32);
+    __ zero_extend(dst_pos, dst_pos, 32);
+
+    BLOCK_COMMENT("arraycopy_range_checks done");
+  }
+
+  //
+  //  Generate 'unsafe' array copy stub
+  //  Though just as safe as the other stubs, it takes an unscaled
+  //  size_t argument instead of an element count.
+  //
+  //  Input:
+  //    c_rarg0   - source array address
+  //    c_rarg1   - destination array address
+  //    c_rarg2   - byte count, treated as ssize_t, can be zero
+  //
+  // Examines the alignment of the operands and dispatches
+  // to a long, int, short, or byte copy loop.
+  //
+  address generate_unsafe_copy(const char* name,
+                               address byte_copy_entry,
+                               address short_copy_entry,
+                               address int_copy_entry,
+                               address long_copy_entry) {
+    assert_cond(byte_copy_entry != NULL && short_copy_entry != NULL &&
+                int_copy_entry != NULL && long_copy_entry != NULL);
+    Label L_long_aligned, L_int_aligned, L_short_aligned;
+    const Register s = c_rarg0, d = c_rarg1, count = c_rarg2;
+
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", name);
+    address start = __ pc();
+    __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+    // bump this on entry, not on exit:
+    inc_counter_np(SharedRuntime::_unsafe_array_copy_ctr);
+
+    __ orr(t0, s, d);
+    __ orr(t0, t0, count);
+
+    __ andi(t0, t0, BytesPerLong - 1);
+    __ beqz(t0, L_long_aligned);
+    __ andi(t0, t0, BytesPerInt - 1);
+    __ beqz(t0, L_int_aligned);
+    __ andi(t0, t0, 1);
+    __ beqz(t0, L_short_aligned);
+    __ j(RuntimeAddress(byte_copy_entry));
+
+    __ BIND(L_short_aligned);
+    __ srli(count, count, LogBytesPerShort);  // size => short_count
+    __ j(RuntimeAddress(short_copy_entry));
+    __ BIND(L_int_aligned);
+    __ srli(count, count, LogBytesPerInt);    // size => int_count
+    __ j(RuntimeAddress(int_copy_entry));
+    __ BIND(L_long_aligned);
+    __ srli(count, count, LogBytesPerLong);   // size => long_count
+    __ j(RuntimeAddress(long_copy_entry));
+
+    return start;
+  }
+
+  //
+  //  Generate generic array copy stubs
+  //
+  //  Input:
+  //    c_rarg0    -  src oop
+  //    c_rarg1    -  src_pos (32-bits)
+  //    c_rarg2    -  dst oop
+  //    c_rarg3    -  dst_pos (32-bits)
+  //    c_rarg4    -  element count (32-bits)
+  //
+  //  Output:
+  //    x10 ==  0  -  success
+  //    x10 == -1^K - failure, where K is partial transfer count
+  //
+  address generate_generic_copy(const char* name,
+                                address byte_copy_entry, address short_copy_entry,
+                                address int_copy_entry, address oop_copy_entry,
+                                address long_copy_entry, address checkcast_copy_entry) {
+    assert_cond(byte_copy_entry != NULL && short_copy_entry != NULL &&
+                int_copy_entry != NULL && oop_copy_entry != NULL &&
+                long_copy_entry != NULL && checkcast_copy_entry != NULL);
+    Label L_failed, L_failed_0, L_objArray;
+    Label L_copy_bytes, L_copy_shorts, L_copy_ints, L_copy_longs;
+
+    // Input registers
+    const Register src        = c_rarg0;  // source array oop
+    const Register src_pos    = c_rarg1;  // source position
+    const Register dst        = c_rarg2;  // destination array oop
+    const Register dst_pos    = c_rarg3;  // destination position
+    const Register length     = c_rarg4;
+
+    // Registers used as temps
+    const Register dst_klass = c_rarg5;
+
+    __ align(CodeEntryAlignment);
+
+    StubCodeMark mark(this, "StubRoutines", name);
+
+    address start = __ pc();
+
+    __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+    // bump this on entry, not on exit:
+    inc_counter_np(SharedRuntime::_generic_array_copy_ctr);
+
+    //-----------------------------------------------------------------------
+    // Assembler stub will be used for this call to arraycopy
+    // if the following conditions are met:
+    //
+    // (1) src and dst must not be null.
+    // (2) src_pos must not be negative.
+    // (3) dst_pos must not be negative.
+    // (4) length  must not be negative.
+    // (5) src klass and dst klass should be the same and not NULL.
+    // (6) src and dst should be arrays.
+    // (7) src_pos + length must not exceed length of src.
+    // (8) dst_pos + length must not exceed length of dst.
+    //
+
+    // if [src == NULL] then return -1
+    __ beqz(src, L_failed);
+
+    // if [src_pos < 0] then return -1
+    // i.e. sign bit set
+    __ andi(t0, src_pos, 1UL << 31);
+    __ bnez(t0, L_failed);
+
+    // if [dst == NULL] then return -1
+    __ beqz(dst, L_failed);
+
+    // if [dst_pos < 0] then return -1
+    // i.e. sign bit set
+    __ andi(t0, dst_pos, 1UL << 31);
+    __ bnez(t0, L_failed);
+
+    // registers used as temp
+    const Register scratch_length    = x28; // elements count to copy
+    const Register scratch_src_klass = x29; // array klass
+    const Register lh                = x30; // layout helper
+
+    // if [length < 0] then return -1
+    __ addw(scratch_length, length, zr);    // length (elements count, 32-bits value)
+    // i.e. sign bit set
+    __ andi(t0, scratch_length, 1UL << 31);
+    __ bnez(t0, L_failed);
+
+    __ load_klass(scratch_src_klass, src);
+#ifdef ASSERT
+    {
+      BLOCK_COMMENT("assert klasses not null {");
+      Label L1, L2;
+      __ bnez(scratch_src_klass, L2);   // it is broken if klass is NULL
+      __ bind(L1);
+      __ stop("broken null klass");
+      __ bind(L2);
+      __ load_klass(t0, dst);
+      __ beqz(t0, L1);     // this would be broken also
+      BLOCK_COMMENT("} assert klasses not null done");
+    }
+#endif
+
+    // Load layout helper (32-bits)
+    //
+    //  |array_tag|     | header_size | element_type |     |log2_element_size|
+    // 32        30    24            16              8     2                 0
+    //
+    //   array_tag: typeArray = 0x3, objArray = 0x2, non-array = 0x0
+    //
+
+    const int lh_offset = in_bytes(Klass::layout_helper_offset());
+
+    // Handle objArrays completely differently...
+    const jint objArray_lh = Klass::array_layout_helper(T_OBJECT);
+    __ lw(lh, Address(scratch_src_klass, lh_offset));
+    __ mvw(t0, objArray_lh);
+    __ beq(lh, t0, L_objArray);
+
+    // if [src->klass() != dst->klass()] then return -1
+    __ load_klass(t1, dst);
+    __ bne(t1, scratch_src_klass, L_failed);
+
+    // if [src->is_Array() != NULL] then return -1
+    // i.e. (lh >= 0)
+    __ andi(t0, lh, 1UL << 31);
+    __ beqz(t0, L_failed);
+
+    // At this point, it is known to be a typeArray (array_tag 0x3).
+#ifdef ASSERT
+    {
+      BLOCK_COMMENT("assert primitive array {");
+      Label L;
+      __ mvw(t1, Klass::_lh_array_tag_type_value << Klass::_lh_array_tag_shift);
+      __ bge(lh, t1, L);
+      __ stop("must be a primitive array");
+      __ bind(L);
+      BLOCK_COMMENT("} assert primitive array done");
+    }
+#endif
+
+    arraycopy_range_checks(src, src_pos, dst, dst_pos, scratch_length,
+                           t1, L_failed);
+
+    // TypeArrayKlass
+    //
+    // src_addr = (src + array_header_in_bytes()) + (src_pos << log2elemsize)
+    // dst_addr = (dst + array_header_in_bytes()) + (dst_pos << log2elemsize)
+    //
+
+    const Register t0_offset = t0;    // array offset
+    const Register x22_elsize = lh;   // element size
+
+    // Get array_header_in_bytes()
+    int lh_header_size_width = exact_log2(Klass::_lh_header_size_mask + 1);
+    int lh_header_size_msb = Klass::_lh_header_size_shift + lh_header_size_width;
+    __ slli(t0_offset, lh, XLEN - lh_header_size_msb);          // left shift to remove 24 ~ 32;
+    __ srli(t0_offset, t0_offset, XLEN - lh_header_size_width); // array_offset
+
+    __ add(src, src, t0_offset);           // src array offset
+    __ add(dst, dst, t0_offset);           // dst array offset
+    BLOCK_COMMENT("choose copy loop based on element size");
+
+    // next registers should be set before the jump to corresponding stub
+    const Register from     = c_rarg0;  // source array address
+    const Register to       = c_rarg1;  // destination array address
+    const Register count    = c_rarg2;  // elements count
+
+    // 'from', 'to', 'count' registers should be set in such order
+    // since they are the same as 'src', 'src_pos', 'dst'.
+
+    assert(Klass::_lh_log2_element_size_shift == 0, "fix this code");
+
+    // The possible values of elsize are 0-3, i.e. exact_log2(element
+    // size in bytes).  We do a simple bitwise binary search.
+  __ BIND(L_copy_bytes);
+    __ andi(t0, x22_elsize, 2);
+    __ bnez(t0, L_copy_ints);
+    __ andi(t0, x22_elsize, 1);
+    __ bnez(t0, L_copy_shorts);
+    __ add(from, src, src_pos); // src_addr
+    __ add(to, dst, dst_pos); // dst_addr
+    __ addw(count, scratch_length, zr); // length
+    __ j(RuntimeAddress(byte_copy_entry));
+
+  __ BIND(L_copy_shorts);
+    __ shadd(from, src_pos, src, t0, 1); // src_addr
+    __ shadd(to, dst_pos, dst, t0, 1); // dst_addr
+    __ addw(count, scratch_length, zr); // length
+    __ j(RuntimeAddress(short_copy_entry));
+
+  __ BIND(L_copy_ints);
+    __ andi(t0, x22_elsize, 1);
+    __ bnez(t0, L_copy_longs);
+    __ shadd(from, src_pos, src, t0, 2); // src_addr
+    __ shadd(to, dst_pos, dst, t0, 2); // dst_addr
+    __ addw(count, scratch_length, zr); // length
+    __ j(RuntimeAddress(int_copy_entry));
+
+  __ BIND(L_copy_longs);
+#ifdef ASSERT
+    {
+      BLOCK_COMMENT("assert long copy {");
+      Label L;
+      __ andi(lh, lh, Klass::_lh_log2_element_size_mask); // lh -> x22_elsize
+      __ addw(lh, lh, zr);
+      __ mvw(t0, LogBytesPerLong);
+      __ beq(x22_elsize, t0, L);
+      __ stop("must be long copy, but elsize is wrong");
+      __ bind(L);
+      BLOCK_COMMENT("} assert long copy done");
+    }
+#endif
+    __ shadd(from, src_pos, src, t0, 3); // src_addr
+    __ shadd(to, dst_pos, dst, t0, 3); // dst_addr
+    __ addw(count, scratch_length, zr); // length
+    __ j(RuntimeAddress(long_copy_entry));
+
+    // ObjArrayKlass
+  __ BIND(L_objArray);
+    // live at this point:  scratch_src_klass, scratch_length, src[_pos], dst[_pos]
+
+    Label L_plain_copy, L_checkcast_copy;
+    // test array classes for subtyping
+    __ load_klass(t2, dst);
+    __ bne(scratch_src_klass, t2, L_checkcast_copy); // usual case is exact equality
+
+    // Identically typed arrays can be copied without element-wise checks.
+    arraycopy_range_checks(src, src_pos, dst, dst_pos, scratch_length,
+                           t1, L_failed);
+
+    __ shadd(from, src_pos, src, t0, LogBytesPerHeapOop);
+    __ add(from, from, arrayOopDesc::base_offset_in_bytes(T_OBJECT));
+    __ shadd(to, dst_pos, dst, t0, LogBytesPerHeapOop);
+    __ add(to, to, arrayOopDesc::base_offset_in_bytes(T_OBJECT));
+    __ addw(count, scratch_length, zr); // length
+  __ BIND(L_plain_copy);
+    __ j(RuntimeAddress(oop_copy_entry));
+
+  __ BIND(L_checkcast_copy);
+    // live at this point:  scratch_src_klass, scratch_length, t2 (dst_klass)
+    {
+      // Before looking at dst.length, make sure dst is also an objArray.
+      __ lwu(t0, Address(t2, lh_offset));
+      __ mvw(t1, objArray_lh);
+      __ bne(t0, t1, L_failed);
+
+      // It is safe to examine both src.length and dst.length.
+      arraycopy_range_checks(src, src_pos, dst, dst_pos, scratch_length,
+                             t2, L_failed);
+
+      __ load_klass(dst_klass, dst); // reload
+
+      // Marshal the base address arguments now, freeing registers.
+      __ shadd(from, src_pos, src, t0, LogBytesPerHeapOop);
+      __ add(from, from, arrayOopDesc::base_offset_in_bytes(T_OBJECT));
+      __ shadd(to, dst_pos, dst, t0, LogBytesPerHeapOop);
+      __ add(to, to, arrayOopDesc::base_offset_in_bytes(T_OBJECT));
+      __ addw(count, length, zr);           // length (reloaded)
+      const Register sco_temp = c_rarg3;      // this register is free now
+      assert_different_registers(from, to, count, sco_temp,
+                                 dst_klass, scratch_src_klass);
+
+      // Generate the type check.
+      const int sco_offset = in_bytes(Klass::super_check_offset_offset());
+      __ lwu(sco_temp, Address(dst_klass, sco_offset));
+
+      // Smashes t0, t1
+      generate_type_check(scratch_src_klass, sco_temp, dst_klass, L_plain_copy);
+
+      // Fetch destination element klass from the ObjArrayKlass header.
+      int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset());
+      __ ld(dst_klass, Address(dst_klass, ek_offset));
+      __ lwu(sco_temp, Address(dst_klass, sco_offset));
+
+      // the checkcast_copy loop needs two extra arguments:
+      assert(c_rarg3 == sco_temp, "#3 already in place");
+      // Set up arguments for checkcast_copy_entry.
+      __ mv(c_rarg4, dst_klass);  // dst.klass.element_klass
+      __ j(RuntimeAddress(checkcast_copy_entry));
+    }
+
+  __ BIND(L_failed);
+    __ li(x10, -1);
+    __ leave();   // required for proper stackwalking of RuntimeStub frame
+    __ ret();
+
+    return start;
+  }
+
+  //
+  // Generate stub for array fill. If "aligned" is true, the
+  // "to" address is assumed to be heapword aligned.
+  //
+  // Arguments for generated stub:
+  //   to:    c_rarg0
+  //   value: c_rarg1
+  //   count: c_rarg2 treated as signed
+  //
+  address generate_fill(BasicType t, bool aligned, const char* name) {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", name);
+    address start = __ pc();
+
+    BLOCK_COMMENT("Entry:");
+
+    const Register to        = c_rarg0;  // source array address
+    const Register value     = c_rarg1;  // value
+    const Register count     = c_rarg2;  // elements count
+
+    const Register bz_base   = x28;      // base for block_zero routine
+    const Register cnt_words = x29;      // temp register
+    const Register tmp_reg   = t1;
+
+    __ enter();
+
+    Label L_fill_elements, L_exit1;
+
+    int shift = -1;
+    switch (t) {
+      case T_BYTE:
+        shift = 0;
+
+        // Zero extend value
+        // 8 bit -> 16 bit
+        __ andi(value, value, 0xff);
+        __ mv(tmp_reg, value);
+        __ slli(tmp_reg, tmp_reg, 8);
+        __ orr(value, value, tmp_reg);
+
+        // 16 bit -> 32 bit
+        __ mv(tmp_reg, value);
+        __ slli(tmp_reg, tmp_reg, 16);
+        __ orr(value, value, tmp_reg);
+
+        __ mv(tmp_reg, 8 >> shift); // Short arrays (< 8 bytes) fill by element
+        __ bltu(count, tmp_reg, L_fill_elements);
+        break;
+      case T_SHORT:
+        shift = 1;
+        // Zero extend value
+        // 16 bit -> 32 bit
+        __ andi(value, value, 0xffff);
+        __ mv(tmp_reg, value);
+        __ slli(tmp_reg, tmp_reg, 16);
+        __ orr(value, value, tmp_reg);
+
+        // Short arrays (< 8 bytes) fill by element
+        __ mv(tmp_reg, 8 >> shift);
+        __ bltu(count, tmp_reg, L_fill_elements);
+        break;
+      case T_INT:
+        shift = 2;
+
+        // Short arrays (< 8 bytes) fill by element
+        __ mv(tmp_reg, 8 >> shift);
+        __ bltu(count, tmp_reg, L_fill_elements);
+        break;
+      default: ShouldNotReachHere();
+    }
+
+    // Align source address at 8 bytes address boundary.
+    Label L_skip_align1, L_skip_align2, L_skip_align4;
+    if (!aligned) {
+      switch (t) {
+        case T_BYTE:
+          // One byte misalignment happens only for byte arrays.
+          __ andi(t0, to, 1);
+          __ beqz(t0, L_skip_align1);
+          __ sb(value, Address(to, 0));
+          __ addi(to, to, 1);
+          __ addiw(count, count, -1);
+          __ bind(L_skip_align1);
+          // Fallthrough
+        case T_SHORT:
+          // Two bytes misalignment happens only for byte and short (char) arrays.
+          __ andi(t0, to, 2);
+          __ beqz(t0, L_skip_align2);
+          __ sh(value, Address(to, 0));
+          __ addi(to, to, 2);
+          __ addiw(count, count, -(2 >> shift));
+          __ bind(L_skip_align2);
+          // Fallthrough
+        case T_INT:
+          // Align to 8 bytes, we know we are 4 byte aligned to start.
+          __ andi(t0, to, 4);
+          __ beqz(t0, L_skip_align4);
+          __ sw(value, Address(to, 0));
+          __ addi(to, to, 4);
+          __ addiw(count, count, -(4 >> shift));
+          __ bind(L_skip_align4);
+          break;
+        default: ShouldNotReachHere();
+      }
+    }
+
+    //
+    //  Fill large chunks
+    //
+    __ srliw(cnt_words, count, 3 - shift); // number of words
+
+    // 32 bit -> 64 bit
+    __ andi(value, value, 0xffffffff);
+    __ mv(tmp_reg, value);
+    __ slli(tmp_reg, tmp_reg, 32);
+    __ orr(value, value, tmp_reg);
+
+    __ slli(tmp_reg, cnt_words, 3 - shift);
+    __ subw(count, count, tmp_reg);
+    {
+      __ fill_words(to, cnt_words, value);
+    }
+
+    // Remaining count is less than 8 bytes. Fill it by a single store.
+    // Note that the total length is no less than 8 bytes.
+    if (t == T_BYTE || t == T_SHORT) {
+      __ beqz(count, L_exit1);
+      __ shadd(to, count, to, tmp_reg, shift); // points to the end
+      __ sd(value, Address(to, -8)); // overwrite some elements
+      __ bind(L_exit1);
+      __ leave();
+      __ ret();
+    }
+
+    // Handle copies less than 8 bytes.
+    Label L_fill_2, L_fill_4, L_exit2;
+    __ bind(L_fill_elements);
+    switch (t) {
+      case T_BYTE:
+        __ andi(t0, count, 1);
+        __ beqz(t0, L_fill_2);
+        __ sb(value, Address(to, 0));
+        __ addi(to, to, 1);
+        __ bind(L_fill_2);
+        __ andi(t0, count, 2);
+        __ beqz(t0, L_fill_4);
+        __ sh(value, Address(to, 0));
+        __ addi(to, to, 2);
+        __ bind(L_fill_4);
+        __ andi(t0, count, 4);
+        __ beqz(t0, L_exit2);
+        __ sw(value, Address(to, 0));
+        break;
+      case T_SHORT:
+        __ andi(t0, count, 1);
+        __ beqz(t0, L_fill_4);
+        __ sh(value, Address(to, 0));
+        __ addi(to, to, 2);
+        __ bind(L_fill_4);
+        __ andi(t0, count, 2);
+        __ beqz(t0, L_exit2);
+        __ sw(value, Address(to, 0));
+        break;
+      case T_INT:
+        __ beqz(count, L_exit2);
+        __ sw(value, Address(to, 0));
+        break;
+      default: ShouldNotReachHere();
+    }
+    __ bind(L_exit2);
+    __ leave();
+    __ ret();
+    return start;
+  }
+
+  void generate_arraycopy_stubs() {
+    address entry                     = NULL;
+    address entry_jbyte_arraycopy     = NULL;
+    address entry_jshort_arraycopy    = NULL;
+    address entry_jint_arraycopy      = NULL;
+    address entry_oop_arraycopy       = NULL;
+    address entry_jlong_arraycopy     = NULL;
+    address entry_checkcast_arraycopy = NULL;
+
+    generate_copy_longs(copy_f, c_rarg0, c_rarg1, t1, copy_forwards);
+    generate_copy_longs(copy_b, c_rarg0, c_rarg1, t1, copy_backwards);
+
+    StubRoutines::riscv::_zero_blocks = generate_zero_blocks();
+
+    //*** jbyte
+    // Always need aligned and unaligned versions
+    StubRoutines::_jbyte_disjoint_arraycopy          = generate_disjoint_byte_copy(false, &entry,
+                                                                                   "jbyte_disjoint_arraycopy");
+    StubRoutines::_jbyte_arraycopy                   = generate_conjoint_byte_copy(false, entry,
+                                                                                   &entry_jbyte_arraycopy,
+                                                                                   "jbyte_arraycopy");
+    StubRoutines::_arrayof_jbyte_disjoint_arraycopy  = generate_disjoint_byte_copy(true, &entry,
+                                                                                   "arrayof_jbyte_disjoint_arraycopy");
+    StubRoutines::_arrayof_jbyte_arraycopy           = generate_conjoint_byte_copy(true, entry, NULL,
+                                                                                   "arrayof_jbyte_arraycopy");
+
+    //*** jshort
+    // Always need aligned and unaligned versions
+    StubRoutines::_jshort_disjoint_arraycopy         = generate_disjoint_short_copy(false, &entry,
+                                                                                    "jshort_disjoint_arraycopy");
+    StubRoutines::_jshort_arraycopy                  = generate_conjoint_short_copy(false, entry,
+                                                                                    &entry_jshort_arraycopy,
+                                                                                    "jshort_arraycopy");
+    StubRoutines::_arrayof_jshort_disjoint_arraycopy = generate_disjoint_short_copy(true, &entry,
+                                                                                    "arrayof_jshort_disjoint_arraycopy");
+    StubRoutines::_arrayof_jshort_arraycopy          = generate_conjoint_short_copy(true, entry, NULL,
+                                                                                    "arrayof_jshort_arraycopy");
+
+    //*** jint
+    // Aligned versions
+    StubRoutines::_arrayof_jint_disjoint_arraycopy   = generate_disjoint_int_copy(true, &entry,
+                                                                                  "arrayof_jint_disjoint_arraycopy");
+    StubRoutines::_arrayof_jint_arraycopy            = generate_conjoint_int_copy(true, entry, &entry_jint_arraycopy,
+                                                                                  "arrayof_jint_arraycopy");
+    // In 64 bit we need both aligned and unaligned versions of jint arraycopy.
+    // entry_jint_arraycopy always points to the unaligned version
+    StubRoutines::_jint_disjoint_arraycopy           = generate_disjoint_int_copy(false, &entry,
+                                                                                  "jint_disjoint_arraycopy");
+    StubRoutines::_jint_arraycopy                    = generate_conjoint_int_copy(false, entry,
+                                                                                  &entry_jint_arraycopy,
+                                                                                  "jint_arraycopy");
+
+    //*** jlong
+    // It is always aligned
+    StubRoutines::_arrayof_jlong_disjoint_arraycopy  = generate_disjoint_long_copy(true, &entry,
+                                                                                   "arrayof_jlong_disjoint_arraycopy");
+    StubRoutines::_arrayof_jlong_arraycopy           = generate_conjoint_long_copy(true, entry, &entry_jlong_arraycopy,
+                                                                                   "arrayof_jlong_arraycopy");
+    StubRoutines::_jlong_disjoint_arraycopy          = StubRoutines::_arrayof_jlong_disjoint_arraycopy;
+    StubRoutines::_jlong_arraycopy                   = StubRoutines::_arrayof_jlong_arraycopy;
+
+    //*** oops
+    {
+      // With compressed oops we need unaligned versions; notice that
+      // we overwrite entry_oop_arraycopy.
+      bool aligned = !UseCompressedOops;
+
+      StubRoutines::_arrayof_oop_disjoint_arraycopy
+        = generate_disjoint_oop_copy(aligned, &entry, "arrayof_oop_disjoint_arraycopy",
+                                     /*dest_uninitialized*/false);
+      StubRoutines::_arrayof_oop_arraycopy
+        = generate_conjoint_oop_copy(aligned, entry, &entry_oop_arraycopy, "arrayof_oop_arraycopy",
+                                     /*dest_uninitialized*/false);
+      // Aligned versions without pre-barriers
+      StubRoutines::_arrayof_oop_disjoint_arraycopy_uninit
+        = generate_disjoint_oop_copy(aligned, &entry, "arrayof_oop_disjoint_arraycopy_uninit",
+                                     /*dest_uninitialized*/true);
+      StubRoutines::_arrayof_oop_arraycopy_uninit
+        = generate_conjoint_oop_copy(aligned, entry, NULL, "arrayof_oop_arraycopy_uninit",
+                                     /*dest_uninitialized*/true);
+    }
+
+    StubRoutines::_oop_disjoint_arraycopy            = StubRoutines::_arrayof_oop_disjoint_arraycopy;
+    StubRoutines::_oop_arraycopy                     = StubRoutines::_arrayof_oop_arraycopy;
+    StubRoutines::_oop_disjoint_arraycopy_uninit     = StubRoutines::_arrayof_oop_disjoint_arraycopy_uninit;
+    StubRoutines::_oop_arraycopy_uninit              = StubRoutines::_arrayof_oop_arraycopy_uninit;
+
+    StubRoutines::_checkcast_arraycopy        = generate_checkcast_copy("checkcast_arraycopy", &entry_checkcast_arraycopy);
+    StubRoutines::_checkcast_arraycopy_uninit = generate_checkcast_copy("checkcast_arraycopy_uninit", NULL,
+                                                                        /*dest_uninitialized*/true);
+
+
+    StubRoutines::_unsafe_arraycopy    = generate_unsafe_copy("unsafe_arraycopy",
+                                                              entry_jbyte_arraycopy,
+                                                              entry_jshort_arraycopy,
+                                                              entry_jint_arraycopy,
+                                                              entry_jlong_arraycopy);
+
+    StubRoutines::_generic_arraycopy   = generate_generic_copy("generic_arraycopy",
+                                                               entry_jbyte_arraycopy,
+                                                               entry_jshort_arraycopy,
+                                                               entry_jint_arraycopy,
+                                                               entry_oop_arraycopy,
+                                                               entry_jlong_arraycopy,
+                                                               entry_checkcast_arraycopy);
+
+    StubRoutines::_jbyte_fill = generate_fill(T_BYTE, false, "jbyte_fill");
+    StubRoutines::_jshort_fill = generate_fill(T_SHORT, false, "jshort_fill");
+    StubRoutines::_jint_fill = generate_fill(T_INT, false, "jint_fill");
+    StubRoutines::_arrayof_jbyte_fill = generate_fill(T_BYTE, true, "arrayof_jbyte_fill");
+    StubRoutines::_arrayof_jshort_fill = generate_fill(T_SHORT, true, "arrayof_jshort_fill");
+    StubRoutines::_arrayof_jint_fill = generate_fill(T_INT, true, "arrayof_jint_fill");
+  }
+
+  // Safefetch stubs.
+  void generate_safefetch(const char* name, int size, address* entry,
+                          address* fault_pc, address* continuation_pc) {
+    // safefetch signatures:
+    //   int      SafeFetch32(int*      adr, int      errValue)
+    //   intptr_t SafeFetchN (intptr_t* adr, intptr_t errValue)
+    //
+    // arguments:
+    //   c_rarg0 = adr
+    //   c_rarg1 = errValue
+    //
+    // result:
+    //   PPC_RET  = *adr or errValue
+    assert_cond(entry != NULL && fault_pc != NULL && continuation_pc != NULL);
+    StubCodeMark mark(this, "StubRoutines", name);
+
+    // Entry point, pc or function descriptor.
+    *entry = __ pc();
+
+    // Load *adr into c_rarg1, may fault.
+    *fault_pc = __ pc();
+    switch (size) {
+      case 4:
+        // int32_t
+        __ lw(c_rarg1, Address(c_rarg0, 0));
+        break;
+      case 8:
+        // int64_t
+        __ ld(c_rarg1, Address(c_rarg0, 0));
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+
+    // return errValue or *adr
+    *continuation_pc = __ pc();
+    __ mv(x10, c_rarg1);
+    __ ret();
+  }
+
+  // code for comparing 16 bytes of strings with same encoding
+  void compare_string_16_bytes_same(Label &DIFF1, Label &DIFF2) {
+    const Register result = x10, str1 = x11, cnt1 = x12, str2 = x13, tmp1 = x28, tmp2 = x29, tmp4 = x7, tmp5 = x31;
+    __ ld(tmp5, Address(str1));
+    __ addi(str1, str1, 8);
+    __ xorr(tmp4, tmp1, tmp2);
+    __ ld(cnt1, Address(str2));
+    __ addi(str2, str2, 8);
+    __ bnez(tmp4, DIFF1);
+    __ ld(tmp1, Address(str1));
+    __ addi(str1, str1, 8);
+    __ xorr(tmp4, tmp5, cnt1);
+    __ ld(tmp2, Address(str2));
+    __ addi(str2, str2, 8);
+    __ bnez(tmp4, DIFF2);
+  }
+
+  // code for comparing 8 characters of strings with Latin1 and Utf16 encoding
+  void compare_string_8_x_LU(Register tmpL, Register tmpU, Label &DIFF1,
+                              Label &DIFF2) {
+    const Register strU = x12, curU = x7, strL = x29, tmp = x30;
+    __ ld(tmpL, Address(strL));
+    __ addi(strL, strL, 8);
+    __ ld(tmpU, Address(strU));
+    __ addi(strU, strU, 8);
+    __ inflate_lo32(tmp, tmpL);
+    __ mv(t0, tmp);
+    __ xorr(tmp, curU, t0);
+    __ bnez(tmp, DIFF2);
+
+    __ ld(curU, Address(strU));
+    __ addi(strU, strU, 8);
+    __ inflate_hi32(tmp, tmpL);
+    __ mv(t0, tmp);
+    __ xorr(tmp, tmpU, t0);
+    __ bnez(tmp, DIFF1);
+  }
+
+  // x10  = result
+  // x11  = str1
+  // x12  = cnt1
+  // x13  = str2
+  // x14  = cnt2
+  // x28  = tmp1
+  // x29  = tmp2
+  // x30  = tmp3
+  address generate_compare_long_string_different_encoding(bool isLU) {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", isLU ? "compare_long_string_different_encoding LU" : "compare_long_string_different_encoding UL");
+    address entry = __ pc();
+    Label SMALL_LOOP, TAIL, TAIL_LOAD_16, LOAD_LAST, DIFF1, DIFF2,
+          DONE, CALCULATE_DIFFERENCE;
+    const Register result = x10, str1 = x11, cnt1 = x12, str2 = x13, cnt2 = x14,
+                   tmp1 = x28, tmp2 = x29, tmp3 = x30, tmp4 = x7, tmp5 = x31;
+    RegSet spilled_regs = RegSet::of(tmp4, tmp5);
+
+    // cnt2 == amount of characters left to compare
+    // Check already loaded first 4 symbols
+    __ inflate_lo32(tmp3, isLU ? tmp1 : tmp2);
+    __ mv(isLU ? tmp1 : tmp2, tmp3);
+    __ addi(str1, str1, isLU ? wordSize / 2 : wordSize);
+    __ addi(str2, str2, isLU ? wordSize : wordSize / 2);
+    __ sub(cnt2, cnt2, 8); // Already loaded 4 symbols. Last 4 is special case.
+    __ push_reg(spilled_regs, sp);
+
+    if (isLU) {
+      __ add(str1, str1, cnt2);
+      __ shadd(str2, cnt2, str2, t0, 1);
+    } else {
+      __ shadd(str1, cnt2, str1, t0, 1);
+      __ add(str2, str2, cnt2);
+    }
+    __ xorr(tmp3, tmp1, tmp2);
+    __ mv(tmp5, tmp2);
+    __ bnez(tmp3, CALCULATE_DIFFERENCE);
+
+    Register strU = isLU ? str2 : str1,
+             strL = isLU ? str1 : str2,
+             tmpU = isLU ? tmp5 : tmp1, // where to keep U for comparison
+             tmpL = isLU ? tmp1 : tmp5; // where to keep L for comparison
+
+    __ sub(tmp2, strL, cnt2); // strL pointer to load from
+    __ slli(t0, cnt2, 1);
+    __ sub(cnt1, strU, t0); // strU pointer to load from
+
+    __ ld(tmp4, Address(cnt1));
+    __ addi(cnt1, cnt1, 8);
+    __ beqz(cnt2, LOAD_LAST); // no characters left except last load
+    __ sub(cnt2, cnt2, 16);
+    __ bltz(cnt2, TAIL);
+    __ bind(SMALL_LOOP); // smaller loop
+      __ sub(cnt2, cnt2, 16);
+      compare_string_8_x_LU(tmpL, tmpU, DIFF1, DIFF2);
+      compare_string_8_x_LU(tmpL, tmpU, DIFF1, DIFF2);
+      __ bgez(cnt2, SMALL_LOOP);
+      __ addi(t0, cnt2, 16);
+      __ beqz(t0, LOAD_LAST);
+    __ bind(TAIL); // 1..15 characters left until last load (last 4 characters)
+      // Address of 8 bytes before last 4 characters in UTF-16 string
+      __ shadd(cnt1, cnt2, cnt1, t0, 1);
+      // Address of 16 bytes before last 4 characters in Latin1 string
+      __ add(tmp2, tmp2, cnt2);
+      __ ld(tmp4, Address(cnt1, -8));
+      // last 16 characters before last load
+      compare_string_8_x_LU(tmpL, tmpU, DIFF1, DIFF2);
+      compare_string_8_x_LU(tmpL, tmpU, DIFF1, DIFF2);
+      __ j(LOAD_LAST);
+    __ bind(DIFF2);
+      __ mv(tmpU, tmp4);
+    __ bind(DIFF1);
+      __ mv(tmpL, t0);
+      __ j(CALCULATE_DIFFERENCE);
+    __ bind(LOAD_LAST);
+      // Last 4 UTF-16 characters are already pre-loaded into tmp4 by compare_string_8_x_LU.
+      // No need to load it again
+      __ mv(tmpU, tmp4);
+      __ ld(tmpL, Address(strL));
+      __ inflate_lo32(tmp3, tmpL);
+      __ mv(tmpL, tmp3);
+      __ xorr(tmp3, tmpU, tmpL);
+      __ beqz(tmp3, DONE);
+
+      // Find the first different characters in the longwords and
+      // compute their difference.
+    __ bind(CALCULATE_DIFFERENCE);
+      __ ctzc_bit(tmp4, tmp3);
+      __ srl(tmp1, tmp1, tmp4);
+      __ srl(tmp5, tmp5, tmp4);
+      __ andi(tmp1, tmp1, 0xFFFF);
+      __ andi(tmp5, tmp5, 0xFFFF);
+      __ sub(result, tmp1, tmp5);
+    __ bind(DONE);
+      __ pop_reg(spilled_regs, sp);
+      __ ret();
+    return entry;
+  }
+
+  address generate_method_entry_barrier() {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "nmethod_entry_barrier");
+
+    Label deoptimize_label;
+
+    address start = __ pc();
+
+    __ set_last_Java_frame(sp, fp, ra, t0);
+
+    __ enter();
+    __ add(t1, sp, wordSize);
+
+    __ sub(sp, sp, 4 * wordSize);
+
+    __ push_call_clobbered_registers();
+
+    __ mv(c_rarg0, t1);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSetNMethod::nmethod_stub_entry_barrier), 1);
+
+    __ reset_last_Java_frame(true);
+
+    __ mv(t0, x10);
+
+    __ pop_call_clobbered_registers();
+
+    __ bnez(t0, deoptimize_label);
+
+    __ leave();
+    __ ret();
+
+    __ BIND(deoptimize_label);
+
+    __ ld(t0, Address(sp, 0));
+    __ ld(fp, Address(sp, wordSize));
+    __ ld(ra, Address(sp, wordSize * 2));
+    __ ld(t1, Address(sp, wordSize * 3));
+
+    __ mv(sp, t0);
+    __ jr(t1);
+
+    return start;
+  }
+
+  // x10  = result
+  // x11  = str1
+  // x12  = cnt1
+  // x13  = str2
+  // x14  = cnt2
+  // x28  = tmp1
+  // x29  = tmp2
+  // x30  = tmp3
+  // x31  = tmp4
+  address generate_compare_long_string_same_encoding(bool isLL) {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", isLL ?
+                      "compare_long_string_same_encoding LL" : "compare_long_string_same_encoding UU");
+    address entry = __ pc();
+    Label SMALL_LOOP, CHECK_LAST, DIFF2, TAIL,
+          LENGTH_DIFF, DIFF, LAST_CHECK_AND_LENGTH_DIFF;
+    const Register result = x10, str1 = x11, cnt1 = x12, str2 = x13, cnt2 = x14,
+                   tmp1 = x28, tmp2 = x29, tmp3 = x30, tmp4 = x7, tmp5 = x31;
+    RegSet spilled_regs = RegSet::of(tmp4, tmp5);
+
+    // cnt1/cnt2 contains amount of characters to compare. cnt1 can be re-used
+    // update cnt2 counter with already loaded 8 bytes
+    __ sub(cnt2, cnt2, wordSize / (isLL ? 1 : 2));
+    // update pointers, because of previous read
+    __ add(str1, str1, wordSize);
+    __ add(str2, str2, wordSize);
+    // less than 16 bytes left?
+    __ sub(cnt2, cnt2, isLL ? 16 : 8);
+    __ push_reg(spilled_regs, sp);
+    __ bltz(cnt2, TAIL);
+    __ bind(SMALL_LOOP);
+      compare_string_16_bytes_same(DIFF, DIFF2);
+      __ sub(cnt2, cnt2, isLL ? 16 : 8);
+      __ bgez(cnt2, SMALL_LOOP);
+    __ bind(TAIL);
+      __ addi(cnt2, cnt2, isLL ? 16 : 8);
+      __ beqz(cnt2, LAST_CHECK_AND_LENGTH_DIFF);
+      __ sub(cnt2, cnt2, isLL ? 8 : 4);
+      __ blez(cnt2, CHECK_LAST);
+      __ xorr(tmp4, tmp1, tmp2);
+      __ bnez(tmp4, DIFF);
+      __ ld(tmp1, Address(str1));
+      __ addi(str1, str1, 8);
+      __ ld(tmp2, Address(str2));
+      __ addi(str2, str2, 8);
+      __ sub(cnt2, cnt2, isLL ? 8 : 4);
+    __ bind(CHECK_LAST);
+      if (!isLL) {
+        __ add(cnt2, cnt2, cnt2); // now in bytes
+      }
+      __ xorr(tmp4, tmp1, tmp2);
+      __ bnez(tmp4, DIFF);
+      __ add(str1, str1, cnt2);
+      __ ld(tmp5, Address(str1));
+      __ add(str2, str2, cnt2);
+      __ ld(cnt1, Address(str2));
+      __ xorr(tmp4, tmp5, cnt1);
+      __ beqz(tmp4, LENGTH_DIFF);
+      // Find the first different characters in the longwords and
+      // compute their difference.
+    __ bind(DIFF2);
+      __ ctzc_bit(tmp3, tmp4, isLL); // count zero from lsb to msb
+      __ srl(tmp5, tmp5, tmp3);
+      __ srl(cnt1, cnt1, tmp3);
+      if (isLL) {
+        __ andi(tmp5, tmp5, 0xFF);
+        __ andi(cnt1, cnt1, 0xFF);
+      } else {
+        __ andi(tmp5, tmp5, 0xFFFF);
+        __ andi(cnt1, cnt1, 0xFFFF);
+      }
+      __ sub(result, tmp5, cnt1);
+      __ j(LENGTH_DIFF);
+    __ bind(DIFF);
+      __ ctzc_bit(tmp3, tmp4, isLL); // count zero from lsb to msb
+      __ srl(tmp1, tmp1, tmp3);
+      __ srl(tmp2, tmp2, tmp3);
+      if (isLL) {
+        __ andi(tmp1, tmp1, 0xFF);
+        __ andi(tmp2, tmp2, 0xFF);
+      } else {
+        __ andi(tmp1, tmp1, 0xFFFF);
+        __ andi(tmp2, tmp2, 0xFFFF);
+      }
+      __ sub(result, tmp1, tmp2);
+      __ j(LENGTH_DIFF);
+    __ bind(LAST_CHECK_AND_LENGTH_DIFF);
+      __ xorr(tmp4, tmp1, tmp2);
+      __ bnez(tmp4, DIFF);
+    __ bind(LENGTH_DIFF);
+      __ pop_reg(spilled_regs, sp);
+      __ ret();
+    return entry;
+  }
+
+  void generate_compare_long_strings() {
+    StubRoutines::riscv::_compare_long_string_LL = generate_compare_long_string_same_encoding(true);
+    StubRoutines::riscv::_compare_long_string_UU = generate_compare_long_string_same_encoding(false);
+    StubRoutines::riscv::_compare_long_string_LU = generate_compare_long_string_different_encoding(true);
+    StubRoutines::riscv::_compare_long_string_UL = generate_compare_long_string_different_encoding(false);
+  }
+
+  // x10 result
+  // x11 src
+  // x12 src count
+  // x13 pattern
+  // x14 pattern count
+  address generate_string_indexof_linear(bool needle_isL, bool haystack_isL)
+  {
+    const char* stubName = needle_isL
+           ? (haystack_isL ? "indexof_linear_ll" : "indexof_linear_ul")
+           : "indexof_linear_uu";
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", stubName);
+    address entry = __ pc();
+
+    int needle_chr_size = needle_isL ? 1 : 2;
+    int haystack_chr_size = haystack_isL ? 1 : 2;
+    int needle_chr_shift = needle_isL ? 0 : 1;
+    int haystack_chr_shift = haystack_isL ? 0 : 1;
+    bool isL = needle_isL && haystack_isL;
+    // parameters
+    Register result = x10, haystack = x11, haystack_len = x12, needle = x13, needle_len = x14;
+    // temporary registers
+    Register mask1 = x20, match_mask = x21, first = x22, trailing_zeros = x23, mask2 = x24, tmp = x25;
+    // redefinitions
+    Register ch1 = x28, ch2 = x29;
+    RegSet spilled_regs = RegSet::range(x20, x25) + RegSet::range(x28, x29);
+
+    __ push_reg(spilled_regs, sp);
+
+    Label L_LOOP, L_LOOP_PROCEED, L_SMALL, L_HAS_ZERO,
+          L_HAS_ZERO_LOOP, L_CMP_LOOP, L_CMP_LOOP_NOMATCH, L_SMALL_PROCEED,
+          L_SMALL_HAS_ZERO_LOOP, L_SMALL_CMP_LOOP_NOMATCH, L_SMALL_CMP_LOOP,
+          L_POST_LOOP, L_CMP_LOOP_LAST_CMP, L_HAS_ZERO_LOOP_NOMATCH,
+          L_SMALL_CMP_LOOP_LAST_CMP, L_SMALL_CMP_LOOP_LAST_CMP2,
+          L_CMP_LOOP_LAST_CMP2, DONE, NOMATCH;
+
+    __ ld(ch1, Address(needle));
+    __ ld(ch2, Address(haystack));
+    // src.length - pattern.length
+    __ sub(haystack_len, haystack_len, needle_len);
+
+    // first is needle[0]
+    __ andi(first, ch1, needle_isL ? 0xFF : 0xFFFF, first);
+    uint64_t mask0101 = UCONST64(0x0101010101010101);
+    uint64_t mask0001 = UCONST64(0x0001000100010001);
+    __ mv(mask1, haystack_isL ? mask0101 : mask0001);
+    __ mul(first, first, mask1);
+    uint64_t mask7f7f = UCONST64(0x7f7f7f7f7f7f7f7f);
+    uint64_t mask7fff = UCONST64(0x7fff7fff7fff7fff);
+    __ mv(mask2, haystack_isL ? mask7f7f : mask7fff);
+    if (needle_isL != haystack_isL) {
+      __ mv(tmp, ch1);
+    }
+    __ sub(haystack_len, haystack_len, wordSize / haystack_chr_size - 1);
+    __ blez(haystack_len, L_SMALL);
+
+    if (needle_isL != haystack_isL) {
+      __ inflate_lo32(ch1, tmp, match_mask, trailing_zeros);
+    }
+    // xorr, sub, orr, notr, andr
+    // compare and set match_mask[i] with 0x80/0x8000 (Latin1/UTF16) if ch2[i] == first[i]
+    // eg:
+    // first:        aa aa aa aa aa aa aa aa
+    // ch2:          aa aa li nx jd ka aa aa
+    // match_mask:   80 80 00 00 00 00 80 80
+    __ compute_match_mask(ch2, first, match_mask, mask1, mask2);
+
+    // search first char of needle, if success, goto L_HAS_ZERO;
+    __ bnez(match_mask, L_HAS_ZERO);
+    __ sub(haystack_len, haystack_len, wordSize / haystack_chr_size);
+    __ add(result, result, wordSize / haystack_chr_size);
+    __ add(haystack, haystack, wordSize);
+    __ bltz(haystack_len, L_POST_LOOP);
+
+    __ bind(L_LOOP);
+    __ ld(ch2, Address(haystack));
+    __ compute_match_mask(ch2, first, match_mask, mask1, mask2);
+    __ bnez(match_mask, L_HAS_ZERO);
+
+    __ bind(L_LOOP_PROCEED);
+    __ sub(haystack_len, haystack_len, wordSize / haystack_chr_size);
+    __ add(haystack, haystack, wordSize);
+    __ add(result, result, wordSize / haystack_chr_size);
+    __ bgez(haystack_len, L_LOOP);
+
+    __ bind(L_POST_LOOP);
+    __ mv(ch2, -wordSize / haystack_chr_size);
+    __ ble(haystack_len, ch2, NOMATCH); // no extra characters to check
+    __ ld(ch2, Address(haystack));
+    __ slli(haystack_len, haystack_len, LogBitsPerByte + haystack_chr_shift);
+    __ neg(haystack_len, haystack_len);
+    __ xorr(ch2, first, ch2);
+    __ sub(match_mask, ch2, mask1);
+    __ orr(ch2, ch2, mask2);
+    __ mv(trailing_zeros, -1); // all bits set
+    __ j(L_SMALL_PROCEED);
+
+    __ align(OptoLoopAlignment);
+    __ bind(L_SMALL);
+    __ slli(haystack_len, haystack_len, LogBitsPerByte + haystack_chr_shift);
+    __ neg(haystack_len, haystack_len);
+    if (needle_isL != haystack_isL) {
+      __ inflate_lo32(ch1, tmp, match_mask, trailing_zeros);
+    }
+    __ xorr(ch2, first, ch2);
+    __ sub(match_mask, ch2, mask1);
+    __ orr(ch2, ch2, mask2);
+    __ mv(trailing_zeros, -1); // all bits set
+
+    __ bind(L_SMALL_PROCEED);
+    __ srl(trailing_zeros, trailing_zeros, haystack_len); // mask. zeroes on useless bits.
+    __ notr(ch2, ch2);
+    __ andr(match_mask, match_mask, ch2);
+    __ andr(match_mask, match_mask, trailing_zeros); // clear useless bits and check
+    __ beqz(match_mask, NOMATCH);
+
+    __ bind(L_SMALL_HAS_ZERO_LOOP);
+    __ ctzc_bit(trailing_zeros, match_mask, haystack_isL, ch2, tmp); // count trailing zeros
+    __ addi(trailing_zeros, trailing_zeros, haystack_isL ? 7 : 15);
+    __ mv(ch2, wordSize / haystack_chr_size);
+    __ ble(needle_len, ch2, L_SMALL_CMP_LOOP_LAST_CMP2);
+    __ compute_index(haystack, trailing_zeros, match_mask, result, ch2, tmp, haystack_isL);
+    __ mv(trailing_zeros, wordSize / haystack_chr_size);
+    __ bne(ch1, ch2, L_SMALL_CMP_LOOP_NOMATCH);
+
+    __ bind(L_SMALL_CMP_LOOP);
+    __ shadd(first, trailing_zeros, needle, first, needle_chr_shift);
+    __ shadd(ch2, trailing_zeros, haystack, ch2, haystack_chr_shift);
+    needle_isL ? __ lbu(first, Address(first)) : __ lhu(first, Address(first));
+    haystack_isL ? __ lbu(ch2, Address(ch2)) : __ lhu(ch2, Address(ch2));
+    __ add(trailing_zeros, trailing_zeros, 1);
+    __ bge(trailing_zeros, needle_len, L_SMALL_CMP_LOOP_LAST_CMP);
+    __ beq(first, ch2, L_SMALL_CMP_LOOP);
+
+    __ bind(L_SMALL_CMP_LOOP_NOMATCH);
+    __ beqz(match_mask, NOMATCH);
+    __ ctzc_bit(trailing_zeros, match_mask, haystack_isL, tmp, ch2);
+    __ addi(trailing_zeros, trailing_zeros, haystack_isL ? 7 : 15);
+    __ add(result, result, 1);
+    __ add(haystack, haystack, haystack_chr_size);
+    __ j(L_SMALL_HAS_ZERO_LOOP);
+
+    __ align(OptoLoopAlignment);
+    __ bind(L_SMALL_CMP_LOOP_LAST_CMP);
+    __ bne(first, ch2, L_SMALL_CMP_LOOP_NOMATCH);
+    __ j(DONE);
+
+    __ align(OptoLoopAlignment);
+    __ bind(L_SMALL_CMP_LOOP_LAST_CMP2);
+    __ compute_index(haystack, trailing_zeros, match_mask, result, ch2, tmp, haystack_isL);
+    __ bne(ch1, ch2, L_SMALL_CMP_LOOP_NOMATCH);
+    __ j(DONE);
+
+    __ align(OptoLoopAlignment);
+    __ bind(L_HAS_ZERO);
+    __ ctzc_bit(trailing_zeros, match_mask, haystack_isL, tmp, ch2);
+    __ addi(trailing_zeros, trailing_zeros, haystack_isL ? 7 : 15);
+    __ slli(needle_len, needle_len, BitsPerByte * wordSize / 2);
+    __ orr(haystack_len, haystack_len, needle_len); // restore needle_len(32bits)
+    __ sub(result, result, 1); // array index from 0, so result -= 1
+
+    __ bind(L_HAS_ZERO_LOOP);
+    __ mv(needle_len, wordSize / haystack_chr_size);
+    __ srli(ch2, haystack_len, BitsPerByte * wordSize / 2);
+    __ bge(needle_len, ch2, L_CMP_LOOP_LAST_CMP2);
+    // load next 8 bytes from haystack, and increase result index
+    __ compute_index(haystack, trailing_zeros, match_mask, result, ch2, tmp, haystack_isL);
+    __ add(result, result, 1);
+    __ mv(trailing_zeros, wordSize / haystack_chr_size);
+    __ bne(ch1, ch2, L_CMP_LOOP_NOMATCH);
+
+    // compare one char
+    __ bind(L_CMP_LOOP);
+    __ shadd(needle_len, trailing_zeros, needle, needle_len, needle_chr_shift);
+    needle_isL ? __ lbu(needle_len, Address(needle_len)) : __ lhu(needle_len, Address(needle_len));
+    __ shadd(ch2, trailing_zeros, haystack, ch2, haystack_chr_shift);
+    haystack_isL ? __ lbu(ch2, Address(ch2)) : __ lhu(ch2, Address(ch2));
+    __ add(trailing_zeros, trailing_zeros, 1); // next char index
+    __ srli(tmp, haystack_len, BitsPerByte * wordSize / 2);
+    __ bge(trailing_zeros, tmp, L_CMP_LOOP_LAST_CMP);
+    __ beq(needle_len, ch2, L_CMP_LOOP);
+
+    __ bind(L_CMP_LOOP_NOMATCH);
+    __ beqz(match_mask, L_HAS_ZERO_LOOP_NOMATCH);
+    __ ctzc_bit(trailing_zeros, match_mask, haystack_isL, needle_len, ch2); // find next "first" char index
+    __ addi(trailing_zeros, trailing_zeros, haystack_isL ? 7 : 15);
+    __ add(haystack, haystack, haystack_chr_size);
+    __ j(L_HAS_ZERO_LOOP);
+
+    __ align(OptoLoopAlignment);
+    __ bind(L_CMP_LOOP_LAST_CMP);
+    __ bne(needle_len, ch2, L_CMP_LOOP_NOMATCH);
+    __ j(DONE);
+
+    __ align(OptoLoopAlignment);
+    __ bind(L_CMP_LOOP_LAST_CMP2);
+    __ compute_index(haystack, trailing_zeros, match_mask, result, ch2, tmp, haystack_isL);
+    __ add(result, result, 1);
+    __ bne(ch1, ch2, L_CMP_LOOP_NOMATCH);
+    __ j(DONE);
+
+    __ align(OptoLoopAlignment);
+    __ bind(L_HAS_ZERO_LOOP_NOMATCH);
+    // 1) Restore "result" index. Index was wordSize/str2_chr_size * N until
+    // L_HAS_ZERO block. Byte octet was analyzed in L_HAS_ZERO_LOOP,
+    // so, result was increased at max by wordSize/str2_chr_size - 1, so,
+    // respective high bit wasn't changed. L_LOOP_PROCEED will increase
+    // result by analyzed characters value, so, we can just reset lower bits
+    // in result here. Clear 2 lower bits for UU/UL and 3 bits for LL
+    // 2) restore needle_len and haystack_len values from "compressed" haystack_len
+    // 3) advance haystack value to represent next haystack octet. result & 7/3 is
+    // index of last analyzed substring inside current octet. So, haystack in at
+    // respective start address. We need to advance it to next octet
+    __ andi(match_mask, result, wordSize / haystack_chr_size - 1);
+    __ srli(needle_len, haystack_len, BitsPerByte * wordSize / 2);
+    __ andi(result, result, haystack_isL ? -8 : -4);
+    __ slli(tmp, match_mask, haystack_chr_shift);
+    __ sub(haystack, haystack, tmp);
+    __ addw(haystack_len, haystack_len, zr);
+    __ j(L_LOOP_PROCEED);
+
+    __ align(OptoLoopAlignment);
+    __ bind(NOMATCH);
+    __ mv(result, -1);
+
+    __ bind(DONE);
+    __ pop_reg(spilled_regs, sp);
+    __ ret();
+    return entry;
+  }
+
+  void generate_string_indexof_stubs()
+  {
+    StubRoutines::riscv::_string_indexof_linear_ll = generate_string_indexof_linear(true, true);
+    StubRoutines::riscv::_string_indexof_linear_uu = generate_string_indexof_linear(false, false);
+    StubRoutines::riscv::_string_indexof_linear_ul = generate_string_indexof_linear(true, false);
+  }
+
+#ifdef COMPILER2
+  address generate_mulAdd()
+  {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "mulAdd");
+
+    address entry = __ pc();
+
+    const Register out     = x10;
+    const Register in      = x11;
+    const Register offset  = x12;
+    const Register len     = x13;
+    const Register k       = x14;
+    const Register tmp     = x28;
+
+    BLOCK_COMMENT("Entry:");
+    __ enter();
+    __ mul_add(out, in, offset, len, k, tmp);
+    __ leave();
+    __ ret();
+
+    return entry;
+  }
+
+  /**
+   *  Arguments:
+   *
+   *  Input:
+   *    c_rarg0   - x address
+   *    c_rarg1   - x length
+   *    c_rarg2   - y address
+   *    c_rarg3   - y length
+   *    c_rarg4   - z address
+   *    c_rarg5   - z length
+   */
+  address generate_multiplyToLen()
+  {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "multiplyToLen");
+    address entry = __ pc();
+
+    const Register x     = x10;
+    const Register xlen  = x11;
+    const Register y     = x12;
+    const Register ylen  = x13;
+    const Register z     = x14;
+    const Register zlen  = x15;
+
+    const Register tmp1  = x16;
+    const Register tmp2  = x17;
+    const Register tmp3  = x7;
+    const Register tmp4  = x28;
+    const Register tmp5  = x29;
+    const Register tmp6  = x30;
+    const Register tmp7  = x31;
+
+    BLOCK_COMMENT("Entry:");
+    __ enter(); // required for proper stackwalking of RuntimeStub frame
+    __ multiply_to_len(x, xlen, y, ylen, z, zlen, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7);
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ ret();
+
+    return entry;
+  }
+
+  address generate_squareToLen()
+  {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "squareToLen");
+    address entry = __ pc();
+
+    const Register x     = x10;
+    const Register xlen  = x11;
+    const Register z     = x12;
+    const Register zlen  = x13;
+    const Register y     = x14; // == x
+    const Register ylen  = x15; // == xlen
+
+    const Register tmp1  = x16;
+    const Register tmp2  = x17;
+    const Register tmp3  = x7;
+    const Register tmp4  = x28;
+    const Register tmp5  = x29;
+    const Register tmp6  = x30;
+    const Register tmp7  = x31;
+
+    BLOCK_COMMENT("Entry:");
+    __ enter();
+    __ mv(y, x);
+    __ mv(ylen, xlen);
+    __ multiply_to_len(x, xlen, y, ylen, z, zlen, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7);
+    __ leave();
+    __ ret();
+
+    return entry;
+  }
+
+  // Arguments:
+  //
+  // Input:
+  //   c_rarg0   - newArr address
+  //   c_rarg1   - oldArr address
+  //   c_rarg2   - newIdx
+  //   c_rarg3   - shiftCount
+  //   c_rarg4   - numIter
+  //
+  address generate_bigIntegerLeftShift() {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "bigIntegerLeftShiftWorker");
+    address entry = __ pc();
+
+    Label loop, exit;
+
+    Register newArr        = c_rarg0;
+    Register oldArr        = c_rarg1;
+    Register newIdx        = c_rarg2;
+    Register shiftCount    = c_rarg3;
+    Register numIter       = c_rarg4;
+
+    Register shiftRevCount = c_rarg5;
+    Register oldArrNext    = t1;
+
+    __ beqz(numIter, exit);
+    __ shadd(newArr, newIdx, newArr, t0, 2);
+
+    __ li(shiftRevCount, 32);
+    __ sub(shiftRevCount, shiftRevCount, shiftCount);
+
+    __ bind(loop);
+    __ addi(oldArrNext, oldArr, 4);
+    __ vsetvli(t0, numIter, Assembler::e32, Assembler::m4);
+    __ vle32_v(v0, oldArr);
+    __ vle32_v(v4, oldArrNext);
+    __ vsll_vx(v0, v0, shiftCount);
+    __ vsrl_vx(v4, v4, shiftRevCount);
+    __ vor_vv(v0, v0, v4);
+    __ vse32_v(v0, newArr);
+    __ sub(numIter, numIter, t0);
+    __ shadd(oldArr, t0, oldArr, t1, 2);
+    __ shadd(newArr, t0, newArr, t1, 2);
+    __ bnez(numIter, loop);
+
+    __ bind(exit);
+    __ ret();
+
+    return entry;
+  }
+
+  // Arguments:
+  //
+  // Input:
+  //   c_rarg0   - newArr address
+  //   c_rarg1   - oldArr address
+  //   c_rarg2   - newIdx
+  //   c_rarg3   - shiftCount
+  //   c_rarg4   - numIter
+  //
+  address generate_bigIntegerRightShift() {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "bigIntegerRightShiftWorker");
+    address entry = __ pc();
+
+    Label loop, exit;
+
+    Register newArr        = c_rarg0;
+    Register oldArr        = c_rarg1;
+    Register newIdx        = c_rarg2;
+    Register shiftCount    = c_rarg3;
+    Register numIter       = c_rarg4;
+    Register idx           = numIter;
+
+    Register shiftRevCount = c_rarg5;
+    Register oldArrNext    = c_rarg6;
+    Register newArrCur     = t0;
+    Register oldArrCur     = t1;
+
+    __ beqz(idx, exit);
+    __ shadd(newArr, newIdx, newArr, t0, 2);
+
+    __ li(shiftRevCount, 32);
+    __ sub(shiftRevCount, shiftRevCount, shiftCount);
+
+    __ bind(loop);
+    __ vsetvli(t0, idx, Assembler::e32, Assembler::m4);
+    __ sub(idx, idx, t0);
+    __ shadd(oldArrNext, idx, oldArr, t1, 2);
+    __ shadd(newArrCur, idx, newArr, t1, 2);
+    __ addi(oldArrCur, oldArrNext, 4);
+    __ vle32_v(v0, oldArrCur);
+    __ vle32_v(v4, oldArrNext);
+    __ vsrl_vx(v0, v0, shiftCount);
+    __ vsll_vx(v4, v4, shiftRevCount);
+    __ vor_vv(v0, v0, v4);
+    __ vse32_v(v0, newArrCur);
+    __ bnez(idx, loop);
+
+    __ bind(exit);
+    __ ret();
+
+    return entry;
+  }
+#endif
+
+#ifdef COMPILER2
+  class MontgomeryMultiplyGenerator : public MacroAssembler {
+
+    Register Pa_base, Pb_base, Pn_base, Pm_base, inv, Rlen, Ra, Rb, Rm, Rn,
+      Pa, Pb, Pn, Pm, Rhi_ab, Rlo_ab, Rhi_mn, Rlo_mn, tmp0, tmp1, tmp2, Ri, Rj;
+
+    RegSet _toSave;
+    bool _squaring;
+
+  public:
+    MontgomeryMultiplyGenerator (Assembler *as, bool squaring)
+      : MacroAssembler(as->code()), _squaring(squaring) {
+
+      // Register allocation
+
+      Register reg = c_rarg0;
+      Pa_base = reg;       // Argument registers
+      if (squaring) {
+        Pb_base = Pa_base;
+      } else {
+        Pb_base = ++reg;
+      }
+      Pn_base = ++reg;
+      Rlen= ++reg;
+      inv = ++reg;
+      Pm_base = ++reg;
+
+                        // Working registers:
+      Ra =  ++reg;      // The current digit of a, b, n, and m.
+      Rb =  ++reg;
+      Rm =  ++reg;
+      Rn =  ++reg;
+
+      Pa =  ++reg;      // Pointers to the current/next digit of a, b, n, and m.
+      Pb =  ++reg;
+      Pm =  ++reg;
+      Pn =  ++reg;
+
+      tmp0 =  ++reg;    // Three registers which form a
+      tmp1 =  ++reg;    // triple-precision accumuator.
+      tmp2 =  ++reg;
+
+      Ri =  x6;         // Inner and outer loop indexes.
+      Rj =  x7;
+
+      Rhi_ab = x28;     // Product registers: low and high parts
+      Rlo_ab = x29;     // of a*b and m*n.
+      Rhi_mn = x30;
+      Rlo_mn = x31;
+
+      // x18 and up are callee-saved.
+      _toSave = RegSet::range(x18, reg) + Pm_base;
+    }
+
+  private:
+    void save_regs() {
+      push_reg(_toSave, sp);
+    }
+
+    void restore_regs() {
+      pop_reg(_toSave, sp);
+    }
+
+    template <typename T>
+    void unroll_2(Register count, T block) {
+      Label loop, end, odd;
+      beqz(count, end);
+      andi(t0, count, 0x1);
+      bnez(t0, odd);
+      align(16);
+      bind(loop);
+      (this->*block)();
+      bind(odd);
+      (this->*block)();
+      addi(count, count, -2);
+      bgtz(count, loop);
+      bind(end);
+    }
+
+    template <typename T>
+    void unroll_2(Register count, T block, Register d, Register s, Register tmp) {
+      Label loop, end, odd;
+      beqz(count, end);
+      andi(tmp, count, 0x1);
+      bnez(tmp, odd);
+      align(16);
+      bind(loop);
+      (this->*block)(d, s, tmp);
+      bind(odd);
+      (this->*block)(d, s, tmp);
+      addi(count, count, -2);
+      bgtz(count, loop);
+      bind(end);
+    }
+
+    void pre1(RegisterOrConstant i) {
+      block_comment("pre1");
+      // Pa = Pa_base;
+      // Pb = Pb_base + i;
+      // Pm = Pm_base;
+      // Pn = Pn_base + i;
+      // Ra = *Pa;
+      // Rb = *Pb;
+      // Rm = *Pm;
+      // Rn = *Pn;
+      if (i.is_register()) {
+        slli(t0, i.as_register(), LogBytesPerWord);
+      } else {
+        mv(t0, i.as_constant());
+        slli(t0, t0, LogBytesPerWord);
+      }
+
+      mv(Pa, Pa_base);
+      add(Pb, Pb_base, t0);
+      mv(Pm, Pm_base);
+      add(Pn, Pn_base, t0);
+
+      ld(Ra, Address(Pa));
+      ld(Rb, Address(Pb));
+      ld(Rm, Address(Pm));
+      ld(Rn, Address(Pn));
+
+      // Zero the m*n result.
+      mv(Rhi_mn, zr);
+      mv(Rlo_mn, zr);
+    }
+
+    // The core multiply-accumulate step of a Montgomery
+    // multiplication.  The idea is to schedule operations as a
+    // pipeline so that instructions with long latencies (loads and
+    // multiplies) have time to complete before their results are
+    // used.  This most benefits in-order implementations of the
+    // architecture but out-of-order ones also benefit.
+    void step() {
+      block_comment("step");
+      // MACC(Ra, Rb, tmp0, tmp1, tmp2);
+      // Ra = *++Pa;
+      // Rb = *--Pb;
+      mulhu(Rhi_ab, Ra, Rb);
+      mul(Rlo_ab, Ra, Rb);
+      addi(Pa, Pa, wordSize);
+      ld(Ra, Address(Pa));
+      addi(Pb, Pb, -wordSize);
+      ld(Rb, Address(Pb));
+      acc(Rhi_mn, Rlo_mn, tmp0, tmp1, tmp2); // The pending m*n from the
+                                            // previous iteration.
+      // MACC(Rm, Rn, tmp0, tmp1, tmp2);
+      // Rm = *++Pm;
+      // Rn = *--Pn;
+      mulhu(Rhi_mn, Rm, Rn);
+      mul(Rlo_mn, Rm, Rn);
+      addi(Pm, Pm, wordSize);
+      ld(Rm, Address(Pm));
+      addi(Pn, Pn, -wordSize);
+      ld(Rn, Address(Pn));
+      acc(Rhi_ab, Rlo_ab, tmp0, tmp1, tmp2);
+    }
+
+    void post1() {
+      block_comment("post1");
+
+      // MACC(Ra, Rb, tmp0, tmp1, tmp2);
+      // Ra = *++Pa;
+      // Rb = *--Pb;
+      mulhu(Rhi_ab, Ra, Rb);
+      mul(Rlo_ab, Ra, Rb);
+      acc(Rhi_mn, Rlo_mn, tmp0, tmp1, tmp2);  // The pending m*n
+      acc(Rhi_ab, Rlo_ab, tmp0, tmp1, tmp2);
+
+      // *Pm = Rm = tmp0 * inv;
+      mul(Rm, tmp0, inv);
+      sd(Rm, Address(Pm));
+
+      // MACC(Rm, Rn, tmp0, tmp1, tmp2);
+      // tmp0 = tmp1; tmp1 = tmp2; tmp2 = 0;
+      mulhu(Rhi_mn, Rm, Rn);
+
+#ifndef PRODUCT
+      // assert(m[i] * n[0] + tmp0 == 0, "broken Montgomery multiply");
+      {
+        mul(Rlo_mn, Rm, Rn);
+        add(Rlo_mn, tmp0, Rlo_mn);
+        Label ok;
+        beqz(Rlo_mn, ok);
+        stop("broken Montgomery multiply");
+        bind(ok);
+      }
+#endif
+      // We have very carefully set things up so that
+      // m[i]*n[0] + tmp0 == 0 (mod b), so we don't have to calculate
+      // the lower half of Rm * Rn because we know the result already:
+      // it must be -tmp0.  tmp0 + (-tmp0) must generate a carry iff
+      // tmp0 != 0.  So, rather than do a mul and an cad we just set
+      // the carry flag iff tmp0 is nonzero.
+      //
+      // mul(Rlo_mn, Rm, Rn);
+      // cad(zr, tmp0, Rlo_mn);
+      addi(t0, tmp0, -1);
+      sltu(t0, t0, tmp0); // Set carry iff tmp0 is nonzero
+      cadc(tmp0, tmp1, Rhi_mn, t0);
+      adc(tmp1, tmp2, zr, t0);
+      mv(tmp2, zr);
+    }
+
+    void pre2(Register i, Register len) {
+      block_comment("pre2");
+      // Pa = Pa_base + i-len;
+      // Pb = Pb_base + len;
+      // Pm = Pm_base + i-len;
+      // Pn = Pn_base + len;
+
+      sub(Rj, i, len);
+      // Rj == i-len
+
+      // Ra as temp register
+      slli(Ra, Rj, LogBytesPerWord);
+      add(Pa, Pa_base, Ra);
+      add(Pm, Pm_base, Ra);
+      slli(Ra, len, LogBytesPerWord);
+      add(Pb, Pb_base, Ra);
+      add(Pn, Pn_base, Ra);
+
+      // Ra = *++Pa;
+      // Rb = *--Pb;
+      // Rm = *++Pm;
+      // Rn = *--Pn;
+      add(Pa, Pa, wordSize);
+      ld(Ra, Address(Pa));
+      add(Pb, Pb, -wordSize);
+      ld(Rb, Address(Pb));
+      add(Pm, Pm, wordSize);
+      ld(Rm, Address(Pm));
+      add(Pn, Pn, -wordSize);
+      ld(Rn, Address(Pn));
+
+      mv(Rhi_mn, zr);
+      mv(Rlo_mn, zr);
+    }
+
+    void post2(Register i, Register len) {
+      block_comment("post2");
+      sub(Rj, i, len);
+
+      cad(tmp0, tmp0, Rlo_mn, t0); // The pending m*n, low part
+
+      // As soon as we know the least significant digit of our result,
+      // store it.
+      // Pm_base[i-len] = tmp0;
+      // Rj as temp register
+      slli(Rj, Rj, LogBytesPerWord);
+      add(Rj, Pm_base, Rj);
+      sd(tmp0, Address(Rj));
+
+      // tmp0 = tmp1; tmp1 = tmp2; tmp2 = 0;
+      cadc(tmp0, tmp1, Rhi_mn, t0); // The pending m*n, high part
+      adc(tmp1, tmp2, zr, t0);
+      mv(tmp2, zr);
+    }
+
+    // A carry in tmp0 after Montgomery multiplication means that we
+    // should subtract multiples of n from our result in m.  We'll
+    // keep doing that until there is no carry.
+    void normalize(Register len) {
+      block_comment("normalize");
+      // while (tmp0)
+      //   tmp0 = sub(Pm_base, Pn_base, tmp0, len);
+      Label loop, post, again;
+      Register cnt = tmp1, i = tmp2; // Re-use registers; we're done with them now
+      beqz(tmp0, post); {
+        bind(again); {
+          mv(i, zr);
+          mv(cnt, len);
+          slli(Rn, i, LogBytesPerWord);
+          add(Rm, Pm_base, Rn);
+          ld(Rm, Address(Rm));
+          add(Rn, Pn_base, Rn);
+          ld(Rn, Address(Rn));
+          li(t0, 1); // set carry flag, i.e. no borrow
+          align(16);
+          bind(loop); {
+            notr(Rn, Rn);
+            add(Rm, Rm, t0);
+            add(Rm, Rm, Rn);
+            sltu(t0, Rm, Rn);
+            slli(Rn, i, LogBytesPerWord); // Rn as temp register
+            add(Rn, Pm_base, Rn);
+            sd(Rm, Address(Rn));
+            add(i, i, 1);
+            slli(Rn, i, LogBytesPerWord);
+            add(Rm, Pm_base, Rn);
+            ld(Rm, Address(Rm));
+            add(Rn, Pn_base, Rn);
+            ld(Rn, Address(Rn));
+            sub(cnt, cnt, 1);
+          } bnez(cnt, loop);
+          addi(tmp0, tmp0, -1);
+          add(tmp0, tmp0, t0);
+        } bnez(tmp0, again);
+      } bind(post);
+    }
+
+    // Move memory at s to d, reversing words.
+    //    Increments d to end of copied memory
+    //    Destroys tmp1, tmp2
+    //    Preserves len
+    //    Leaves s pointing to the address which was in d at start
+    void reverse(Register d, Register s, Register len, Register tmp1, Register tmp2) {
+      assert(tmp1 < x28 && tmp2 < x28, "register corruption");
+
+      slli(tmp1, len, LogBytesPerWord);
+      add(s, s, tmp1);
+      mv(tmp1, len);
+      unroll_2(tmp1,  &MontgomeryMultiplyGenerator::reverse1, d, s, tmp2);
+      slli(tmp1, len, LogBytesPerWord);
+      sub(s, d, tmp1);
+    }
+    // [63...0] -> [31...0][63...32]
+    void reverse1(Register d, Register s, Register tmp) {
+      addi(s, s, -wordSize);
+      ld(tmp, Address(s));
+      ror_imm(tmp, tmp, 32, t0);
+      sd(tmp, Address(d));
+      addi(d, d, wordSize);
+    }
+
+    void step_squaring() {
+      // An extra ACC
+      step();
+      acc(Rhi_ab, Rlo_ab, tmp0, tmp1, tmp2);
+    }
+
+    void last_squaring(Register i) {
+      Label dont;
+      // if ((i & 1) == 0) {
+      andi(t0, i, 0x1);
+      bnez(t0, dont); {
+        // MACC(Ra, Rb, tmp0, tmp1, tmp2);
+        // Ra = *++Pa;
+        // Rb = *--Pb;
+        mulhu(Rhi_ab, Ra, Rb);
+        mul(Rlo_ab, Ra, Rb);
+        acc(Rhi_ab, Rlo_ab, tmp0, tmp1, tmp2);
+      } bind(dont);
+    }
+
+    void extra_step_squaring() {
+      acc(Rhi_mn, Rlo_mn, tmp0, tmp1, tmp2);  // The pending m*n
+
+      // MACC(Rm, Rn, tmp0, tmp1, tmp2);
+      // Rm = *++Pm;
+      // Rn = *--Pn;
+      mulhu(Rhi_mn, Rm, Rn);
+      mul(Rlo_mn, Rm, Rn);
+      addi(Pm, Pm, wordSize);
+      ld(Rm, Address(Pm));
+      addi(Pn, Pn, -wordSize);
+      ld(Rn, Address(Pn));
+    }
+
+    void post1_squaring() {
+      acc(Rhi_mn, Rlo_mn, tmp0, tmp1, tmp2);  // The pending m*n
+
+      // *Pm = Rm = tmp0 * inv;
+      mul(Rm, tmp0, inv);
+      sd(Rm, Address(Pm));
+
+      // MACC(Rm, Rn, tmp0, tmp1, tmp2);
+      // tmp0 = tmp1; tmp1 = tmp2; tmp2 = 0;
+      mulhu(Rhi_mn, Rm, Rn);
+
+#ifndef PRODUCT
+      // assert(m[i] * n[0] + tmp0 == 0, "broken Montgomery multiply");
+      {
+        mul(Rlo_mn, Rm, Rn);
+        add(Rlo_mn, tmp0, Rlo_mn);
+        Label ok;
+        beqz(Rlo_mn, ok); {
+          stop("broken Montgomery multiply");
+        } bind(ok);
+      }
+#endif
+      // We have very carefully set things up so that
+      // m[i]*n[0] + tmp0 == 0 (mod b), so we don't have to calculate
+      // the lower half of Rm * Rn because we know the result already:
+      // it must be -tmp0.  tmp0 + (-tmp0) must generate a carry iff
+      // tmp0 != 0.  So, rather than do a mul and a cad we just set
+      // the carry flag iff tmp0 is nonzero.
+      //
+      // mul(Rlo_mn, Rm, Rn);
+      // cad(zr, tmp, Rlo_mn);
+      addi(t0, tmp0, -1);
+      sltu(t0, t0, tmp0); // Set carry iff tmp0 is nonzero
+      cadc(tmp0, tmp1, Rhi_mn, t0);
+      adc(tmp1, tmp2, zr, t0);
+      mv(tmp2, zr);
+    }
+
+    // use t0 as carry
+    void acc(Register Rhi, Register Rlo,
+             Register tmp0, Register tmp1, Register tmp2) {
+      cad(tmp0, tmp0, Rlo, t0);
+      cadc(tmp1, tmp1, Rhi, t0);
+      adc(tmp2, tmp2, zr, t0);
+    }
+
+  public:
+    /**
+     * Fast Montgomery multiplication.  The derivation of the
+     * algorithm is in A Cryptographic Library for the Motorola
+     * DSP56000, Dusse and Kaliski, Proc. EUROCRYPT 90, pp. 230-237.
+     *
+     * Arguments:
+     *
+     * Inputs for multiplication:
+     *   c_rarg0   - int array elements a
+     *   c_rarg1   - int array elements b
+     *   c_rarg2   - int array elements n (the modulus)
+     *   c_rarg3   - int length
+     *   c_rarg4   - int inv
+     *   c_rarg5   - int array elements m (the result)
+     *
+     * Inputs for squaring:
+     *   c_rarg0   - int array elements a
+     *   c_rarg1   - int array elements n (the modulus)
+     *   c_rarg2   - int length
+     *   c_rarg3   - int inv
+     *   c_rarg4   - int array elements m (the result)
+     *
+     */
+    address generate_multiply() {
+      Label argh, nothing;
+      bind(argh);
+      stop("MontgomeryMultiply total_allocation must be <= 8192");
+
+      align(CodeEntryAlignment);
+      address entry = pc();
+
+      beqz(Rlen, nothing);
+
+      enter();
+
+      // Make room.
+      li(Ra, 512);
+      bgt(Rlen, Ra, argh);
+      slli(Ra, Rlen, exact_log2(4 * sizeof(jint)));
+      sub(Ra, sp, Ra);
+      andi(sp, Ra, -2 * wordSize);
+
+      srliw(Rlen, Rlen, 1);  // length in longwords = len/2
+
+      {
+        // Copy input args, reversing as we go.  We use Ra as a
+        // temporary variable.
+        reverse(Ra, Pa_base, Rlen, Ri, Rj);
+        if (!_squaring)
+          reverse(Ra, Pb_base, Rlen, Ri, Rj);
+        reverse(Ra, Pn_base, Rlen, Ri, Rj);
+      }
+
+      // Push all call-saved registers and also Pm_base which we'll need
+      // at the end.
+      save_regs();
+
+#ifndef PRODUCT
+      // assert(inv * n[0] == -1UL, "broken inverse in Montgomery multiply");
+      {
+        ld(Rn, Address(Pn_base));
+        mul(Rlo_mn, Rn, inv);
+        li(t0, -1);
+        Label ok;
+        beq(Rlo_mn, t0, ok);
+        stop("broken inverse in Montgomery multiply");
+        bind(ok);
+      }
+#endif
+
+      mv(Pm_base, Ra);
+
+      mv(tmp0, zr);
+      mv(tmp1, zr);
+      mv(tmp2, zr);
+
+      block_comment("for (int i = 0; i < len; i++) {");
+      mv(Ri, zr); {
+        Label loop, end;
+        bge(Ri, Rlen, end);
+
+        bind(loop);
+        pre1(Ri);
+
+        block_comment("  for (j = i; j; j--) {"); {
+          mv(Rj, Ri);
+          unroll_2(Rj, &MontgomeryMultiplyGenerator::step);
+        } block_comment("  } // j");
+
+        post1();
+        addw(Ri, Ri, 1);
+        blt(Ri, Rlen, loop);
+        bind(end);
+        block_comment("} // i");
+      }
+
+      block_comment("for (int i = len; i < 2*len; i++) {");
+      mv(Ri, Rlen); {
+        Label loop, end;
+        slli(t0, Rlen, 1);
+        bge(Ri, t0, end);
+
+        bind(loop);
+        pre2(Ri, Rlen);
+
+        block_comment("  for (j = len*2-i-1; j; j--) {"); {
+          slliw(Rj, Rlen, 1);
+          subw(Rj, Rj, Ri);
+          subw(Rj, Rj, 1);
+          unroll_2(Rj, &MontgomeryMultiplyGenerator::step);
+        } block_comment("  } // j");
+
+        post2(Ri, Rlen);
+        addw(Ri, Ri, 1);
+        slli(t0, Rlen, 1);
+        blt(Ri, t0, loop);
+        bind(end);
+      }
+      block_comment("} // i");
+
+      normalize(Rlen);
+
+      mv(Ra, Pm_base);  // Save Pm_base in Ra
+      restore_regs();  // Restore caller's Pm_base
+
+      // Copy our result into caller's Pm_base
+      reverse(Pm_base, Ra, Rlen, Ri, Rj);
+
+      leave();
+      bind(nothing);
+      ret();
+
+      return entry;
+    }
+
+    /**
+     *
+     * Arguments:
+     *
+     * Inputs:
+     *   c_rarg0   - int array elements a
+     *   c_rarg1   - int array elements n (the modulus)
+     *   c_rarg2   - int length
+     *   c_rarg3   - int inv
+     *   c_rarg4   - int array elements m (the result)
+     *
+     */
+    address generate_square() {
+      Label argh;
+      bind(argh);
+      stop("MontgomeryMultiply total_allocation must be <= 8192");
+
+      align(CodeEntryAlignment);
+      address entry = pc();
+
+      enter();
+
+      // Make room.
+      li(Ra, 512);
+      bgt(Rlen, Ra, argh);
+      slli(Ra, Rlen, exact_log2(4 * sizeof(jint)));
+      sub(Ra, sp, Ra);
+      andi(sp, Ra, -2 * wordSize);
+
+      srliw(Rlen, Rlen, 1);  // length in longwords = len/2
+
+      {
+        // Copy input args, reversing as we go.  We use Ra as a
+        // temporary variable.
+        reverse(Ra, Pa_base, Rlen, Ri, Rj);
+        reverse(Ra, Pn_base, Rlen, Ri, Rj);
+      }
+
+      // Push all call-saved registers and also Pm_base which we'll need
+      // at the end.
+      save_regs();
+
+      mv(Pm_base, Ra);
+
+      mv(tmp0, zr);
+      mv(tmp1, zr);
+      mv(tmp2, zr);
+
+      block_comment("for (int i = 0; i < len; i++) {");
+      mv(Ri, zr); {
+        Label loop, end;
+        bind(loop);
+        bge(Ri, Rlen, end);
+
+        pre1(Ri);
+
+        block_comment("for (j = (i+1)/2; j; j--) {"); {
+          addi(Rj, Ri, 1);
+          srliw(Rj, Rj, 1);
+          unroll_2(Rj, &MontgomeryMultiplyGenerator::step_squaring);
+        } block_comment("  } // j");
+
+        last_squaring(Ri);
+
+        block_comment("  for (j = i/2; j; j--) {"); {
+          srliw(Rj, Ri, 1);
+          unroll_2(Rj, &MontgomeryMultiplyGenerator::extra_step_squaring);
+        } block_comment("  } // j");
+
+        post1_squaring();
+        addi(Ri, Ri, 1);
+        blt(Ri, Rlen, loop);
+
+        bind(end);
+        block_comment("} // i");
+      }
+
+      block_comment("for (int i = len; i < 2*len; i++) {");
+      mv(Ri, Rlen); {
+        Label loop, end;
+        bind(loop);
+        slli(t0, Rlen, 1);
+        bge(Ri, t0, end);
+
+        pre2(Ri, Rlen);
+
+        block_comment("  for (j = (2*len-i-1)/2; j; j--) {"); {
+          slli(Rj, Rlen, 1);
+          sub(Rj, Rj, Ri);
+          sub(Rj, Rj, 1);
+          srliw(Rj, Rj, 1);
+          unroll_2(Rj, &MontgomeryMultiplyGenerator::step_squaring);
+        } block_comment("  } // j");
+
+        last_squaring(Ri);
+
+        block_comment("  for (j = (2*len-i)/2; j; j--) {"); {
+          slli(Rj, Rlen, 1);
+          sub(Rj, Rj, Ri);
+          srliw(Rj, Rj, 1);
+          unroll_2(Rj, &MontgomeryMultiplyGenerator::extra_step_squaring);
+        } block_comment("  } // j");
+
+        post2(Ri, Rlen);
+        addi(Ri, Ri, 1);
+        slli(t0, Rlen, 1);
+        blt(Ri, t0, loop);
+
+        bind(end);
+        block_comment("} // i");
+      }
+
+      normalize(Rlen);
+
+      mv(Ra, Pm_base);  // Save Pm_base in Ra
+      restore_regs();  // Restore caller's Pm_base
+
+      // Copy our result into caller's Pm_base
+      reverse(Pm_base, Ra, Rlen, Ri, Rj);
+
+      leave();
+      ret();
+
+      return entry;
+    }
+  };
+#endif // COMPILER2
+
+  // Continuation point for throwing of implicit exceptions that are
+  // not handled in the current activation. Fabricates an exception
+  // oop and initiates normal exception dispatching in this
+  // frame. Since we need to preserve callee-saved values (currently
+  // only for C2, but done for C1 as well) we need a callee-saved oop
+  // map and therefore have to make these stubs into RuntimeStubs
+  // rather than BufferBlobs.  If the compiler needs all registers to
+  // be preserved between the fault point and the exception handler
+  // then it must assume responsibility for that in
+  // AbstractCompiler::continuation_for_implicit_null_exception or
+  // continuation_for_implicit_division_by_zero_exception. All other
+  // implicit exceptions (e.g., NullPointerException or
+  // AbstractMethodError on entry) are either at call sites or
+  // otherwise assume that stack unwinding will be initiated, so
+  // caller saved registers were assumed volatile in the compiler.
+
+#undef __
+#define __ masm->
+
+  address generate_throw_exception(const char* name,
+                                   address runtime_entry,
+                                   Register arg1 = noreg,
+                                   Register arg2 = noreg) {
+    // Information about frame layout at time of blocking runtime call.
+    // Note that we only have to preserve callee-saved registers since
+    // the compilers are responsible for supplying a continuation point
+    // if they expect all registers to be preserved.
+    // n.b. riscv asserts that frame::arg_reg_save_area_bytes == 0
+    assert_cond(runtime_entry != NULL);
+    enum layout {
+      fp_off = 0,
+      fp_off2,
+      return_off,
+      return_off2,
+      framesize // inclusive of return address
+    };
+
+    const int insts_size = 512;
+    const int locs_size  = 64;
+
+    CodeBuffer code(name, insts_size, locs_size);
+    OopMapSet* oop_maps  = new OopMapSet();
+    MacroAssembler* masm = new MacroAssembler(&code);
+    assert_cond(oop_maps != NULL && masm != NULL);
+
+    address start = __ pc();
+
+    // This is an inlined and slightly modified version of call_VM
+    // which has the ability to fetch the return PC out of
+    // thread-local storage and also sets up last_Java_sp slightly
+    // differently than the real call_VM
+
+    __ enter(); // Save FP and RA before call
+
+    assert(is_even(framesize / 2), "sp not 16-byte aligned");
+
+    // ra and fp are already in place
+    __ addi(sp, fp, 0 - ((unsigned)framesize << LogBytesPerInt)); // prolog
+
+    int frame_complete = __ pc() - start;
+
+    // Set up last_Java_sp and last_Java_fp
+    address the_pc = __ pc();
+    __ set_last_Java_frame(sp, fp, the_pc, t0);
+
+    // Call runtime
+    if (arg1 != noreg) {
+      assert(arg2 != c_rarg1, "clobbered");
+      __ mv(c_rarg1, arg1);
+    }
+    if (arg2 != noreg) {
+      __ mv(c_rarg2, arg2);
+    }
+    __ mv(c_rarg0, xthread);
+    BLOCK_COMMENT("call runtime_entry");
+    int32_t offset = 0;
+    __ movptr_with_offset(t0, runtime_entry, offset);
+    __ jalr(x1, t0, offset);
+
+    // Generate oop map
+    OopMap* map = new OopMap(framesize, 0);
+    assert_cond(map != NULL);
+
+    oop_maps->add_gc_map(the_pc - start, map);
+
+    __ reset_last_Java_frame(true);
+
+    __ leave();
+
+    // check for pending exceptions
+#ifdef ASSERT
+    Label L;
+    __ ld(t0, Address(xthread, Thread::pending_exception_offset()));
+    __ bnez(t0, L);
+    __ should_not_reach_here();
+    __ bind(L);
+#endif // ASSERT
+    __ far_jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+
+
+    // codeBlob framesize is in words (not VMRegImpl::slot_size)
+    RuntimeStub* stub =
+      RuntimeStub::new_runtime_stub(name,
+                                    &code,
+                                    frame_complete,
+                                    (framesize >> (LogBytesPerWord - LogBytesPerInt)),
+                                    oop_maps, false);
+    assert(stub != NULL, "create runtime stub fail!");
+    return stub->entry_point();
+  }
+
+  // Initialization
+  void generate_initial() {
+    // Generate initial stubs and initializes the entry points
+
+    // entry points that exist in all platforms Note: This is code
+    // that could be shared among different platforms - however the
+    // benefit seems to be smaller than the disadvantage of having a
+    // much more complicated generator structure. See also comment in
+    // stubRoutines.hpp.
+
+    StubRoutines::_forward_exception_entry = generate_forward_exception();
+
+    StubRoutines::_call_stub_entry =
+      generate_call_stub(StubRoutines::_call_stub_return_address);
+
+    // is referenced by megamorphic call
+    StubRoutines::_catch_exception_entry = generate_catch_exception();
+
+    // Build this early so it's available for the interpreter.
+    StubRoutines::_throw_StackOverflowError_entry =
+      generate_throw_exception("StackOverflowError throw_exception",
+                               CAST_FROM_FN_PTR(address,
+                                                SharedRuntime::throw_StackOverflowError));
+    StubRoutines::_throw_delayed_StackOverflowError_entry =
+      generate_throw_exception("delayed StackOverflowError throw_exception",
+                               CAST_FROM_FN_PTR(address,
+                                                SharedRuntime::throw_delayed_StackOverflowError));
+    // Safefetch stubs.
+    generate_safefetch("SafeFetch32", sizeof(int),     &StubRoutines::_safefetch32_entry,
+                                                       &StubRoutines::_safefetch32_fault_pc,
+                                                       &StubRoutines::_safefetch32_continuation_pc);
+    generate_safefetch("SafeFetchN", sizeof(intptr_t), &StubRoutines::_safefetchN_entry,
+                                                       &StubRoutines::_safefetchN_fault_pc,
+                                                       &StubRoutines::_safefetchN_continuation_pc);
+  }
+
+  void generate_all() {
+    // support for verify_oop (must happen after universe_init)
+    StubRoutines::_verify_oop_subroutine_entry     = generate_verify_oop();
+    StubRoutines::_throw_AbstractMethodError_entry =
+      generate_throw_exception("AbstractMethodError throw_exception",
+                               CAST_FROM_FN_PTR(address,
+                                                SharedRuntime::
+                                                throw_AbstractMethodError));
+
+    StubRoutines::_throw_IncompatibleClassChangeError_entry =
+      generate_throw_exception("IncompatibleClassChangeError throw_exception",
+                               CAST_FROM_FN_PTR(address,
+                                                SharedRuntime::
+                                                throw_IncompatibleClassChangeError));
+
+    StubRoutines::_throw_NullPointerException_at_call_entry =
+      generate_throw_exception("NullPointerException at call throw_exception",
+                               CAST_FROM_FN_PTR(address,
+                                                SharedRuntime::
+                                                throw_NullPointerException_at_call));
+    // arraycopy stubs used by compilers
+    generate_arraycopy_stubs();
+
+#ifdef COMPILER2
+    if (UseMulAddIntrinsic) {
+      StubRoutines::_mulAdd = generate_mulAdd();
+    }
+
+    if (UseMultiplyToLenIntrinsic) {
+      StubRoutines::_multiplyToLen = generate_multiplyToLen();
+    }
+
+    if (UseSquareToLenIntrinsic) {
+      StubRoutines::_squareToLen = generate_squareToLen();
+    }
+
+    if (UseMontgomeryMultiplyIntrinsic) {
+      StubCodeMark mark(this, "StubRoutines", "montgomeryMultiply");
+      MontgomeryMultiplyGenerator g(_masm, /*squaring*/false);
+      StubRoutines::_montgomeryMultiply = g.generate_multiply();
+    }
+
+    if (UseMontgomerySquareIntrinsic) {
+      StubCodeMark mark(this, "StubRoutines", "montgomerySquare");
+      MontgomeryMultiplyGenerator g(_masm, /*squaring*/true);
+      StubRoutines::_montgomerySquare = g.generate_square();
+    }
+
+    if (UseRVVForBigIntegerShiftIntrinsics) {
+      StubRoutines::_bigIntegerLeftShiftWorker = generate_bigIntegerLeftShift();
+      StubRoutines::_bigIntegerRightShiftWorker = generate_bigIntegerRightShift();
+    }
+#endif
+
+    generate_compare_long_strings();
+
+    generate_string_indexof_stubs();
+
+    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+    if (bs_nm != NULL) {
+      StubRoutines::riscv::_method_entry_barrier = generate_method_entry_barrier();
+    }
+
+    StubRoutines::riscv::set_completed();
+  }
+
+ public:
+  StubGenerator(CodeBuffer* code, bool all) : StubCodeGenerator(code) {
+    if (all) {
+      generate_all();
+    } else {
+      generate_initial();
+    }
+  }
+
+  ~StubGenerator() {}
+}; // end class declaration
+
+#define UCM_TABLE_MAX_ENTRIES 8
+void StubGenerator_generate(CodeBuffer* code, bool all) {
+  if (UnsafeCopyMemory::_table == NULL) {
+    UnsafeCopyMemory::create_table(UCM_TABLE_MAX_ENTRIES);
+  }
+
+  StubGenerator g(code, all);
+}
diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
new file mode 100644
index 00000000000..395a2d338e4
--- /dev/null
+++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/deoptimization.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/thread.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+// Implementation of the platform-specific part of StubRoutines - for
+// a description of how to extend it, see the stubRoutines.hpp file.
+
+address StubRoutines::riscv::_get_previous_sp_entry = NULL;
+
+address StubRoutines::riscv::_f2i_fixup = NULL;
+address StubRoutines::riscv::_f2l_fixup = NULL;
+address StubRoutines::riscv::_d2i_fixup = NULL;
+address StubRoutines::riscv::_d2l_fixup = NULL;
+address StubRoutines::riscv::_float_sign_mask = NULL;
+address StubRoutines::riscv::_float_sign_flip = NULL;
+address StubRoutines::riscv::_double_sign_mask = NULL;
+address StubRoutines::riscv::_double_sign_flip = NULL;
+address StubRoutines::riscv::_zero_blocks = NULL;
+address StubRoutines::riscv::_compare_long_string_LL = NULL;
+address StubRoutines::riscv::_compare_long_string_UU = NULL;
+address StubRoutines::riscv::_compare_long_string_LU = NULL;
+address StubRoutines::riscv::_compare_long_string_UL = NULL;
+address StubRoutines::riscv::_string_indexof_linear_ll = NULL;
+address StubRoutines::riscv::_string_indexof_linear_uu = NULL;
+address StubRoutines::riscv::_string_indexof_linear_ul = NULL;
+address StubRoutines::riscv::_large_byte_array_inflate = NULL;
+address StubRoutines::riscv::_method_entry_barrier = NULL;
+
+bool StubRoutines::riscv::_completed = false;
diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
new file mode 100644
index 00000000000..51f07819c33
--- /dev/null
+++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_STUBROUTINES_RISCV_HPP
+#define CPU_RISCV_STUBROUTINES_RISCV_HPP
+
+// This file holds the platform specific parts of the StubRoutines
+// definition. See stubRoutines.hpp for a description on how to
+// extend it.
+
+static bool returns_to_call_stub(address return_pc) {
+  return return_pc == _call_stub_return_address;
+}
+
+enum platform_dependent_constants {
+  code_size1 = 19000,          // simply increase if too small (assembler will crash if too small)
+  code_size2 = 28000           // simply increase if too small (assembler will crash if too small)
+};
+
+class riscv {
+ friend class StubGenerator;
+
+ private:
+  static address _get_previous_sp_entry;
+
+  static address _f2i_fixup;
+  static address _f2l_fixup;
+  static address _d2i_fixup;
+  static address _d2l_fixup;
+
+  static address _float_sign_mask;
+  static address _float_sign_flip;
+  static address _double_sign_mask;
+  static address _double_sign_flip;
+
+  static address _zero_blocks;
+
+  static address _compare_long_string_LL;
+  static address _compare_long_string_LU;
+  static address _compare_long_string_UL;
+  static address _compare_long_string_UU;
+  static address _string_indexof_linear_ll;
+  static address _string_indexof_linear_uu;
+  static address _string_indexof_linear_ul;
+  static address _large_byte_array_inflate;
+
+  static address _method_entry_barrier;
+
+  static bool _completed;
+
+ public:
+
+  static address get_previous_sp_entry() {
+    return _get_previous_sp_entry;
+  }
+
+  static address f2i_fixup() {
+    return _f2i_fixup;
+  }
+
+  static address f2l_fixup() {
+    return _f2l_fixup;
+  }
+
+  static address d2i_fixup() {
+    return _d2i_fixup;
+  }
+
+  static address d2l_fixup() {
+    return _d2l_fixup;
+  }
+
+  static address float_sign_mask() {
+    return _float_sign_mask;
+  }
+
+  static address float_sign_flip() {
+    return _float_sign_flip;
+  }
+
+  static address double_sign_mask() {
+    return _double_sign_mask;
+  }
+
+  static address double_sign_flip() {
+    return _double_sign_flip;
+  }
+
+  static address zero_blocks() {
+    return _zero_blocks;
+  }
+
+  static address compare_long_string_LL() {
+    return _compare_long_string_LL;
+  }
+
+  static address compare_long_string_LU() {
+    return _compare_long_string_LU;
+  }
+
+  static address compare_long_string_UL() {
+    return _compare_long_string_UL;
+  }
+
+  static address compare_long_string_UU() {
+    return _compare_long_string_UU;
+  }
+
+  static address string_indexof_linear_ul() {
+    return _string_indexof_linear_ul;
+  }
+
+  static address string_indexof_linear_ll() {
+    return _string_indexof_linear_ll;
+  }
+
+  static address string_indexof_linear_uu() {
+    return _string_indexof_linear_uu;
+  }
+
+  static address large_byte_array_inflate() {
+    return _large_byte_array_inflate;
+  }
+
+  static address method_entry_barrier() {
+    return _method_entry_barrier;
+  }
+
+  static bool complete() {
+    return _completed;
+  }
+
+  static void set_completed() {
+    _completed = true;
+  }
+};
+
+#endif // CPU_RISCV_STUBROUTINES_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
new file mode 100644
index 00000000000..6537b2dbd94
--- /dev/null
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -0,0 +1,1794 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "interpreter/bytecodeHistogram.hpp"
+#include "interpreter/bytecodeTracer.hpp"
+#include "interpreter/interp_masm.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
+#include "interpreter/templateInterpreterGenerator.hpp"
+#include "interpreter/templateTable.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/arrayOop.hpp"
+#include "oops/method.hpp"
+#include "oops/methodData.hpp"
+#include "oops/oop.inline.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "prims/jvmtiThreadState.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/deoptimization.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/jniHandles.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/synchronizer.hpp"
+#include "runtime/timer.hpp"
+#include "runtime/vframeArray.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/powerOfTwo.hpp"
+#include <sys/types.h>
+
+#ifndef PRODUCT
+#include "oops/method.hpp"
+#endif // !PRODUCT
+
+// Size of interpreter code.  Increase if too small.  Interpreter will
+// fail with a guarantee ("not enough space for interpreter generation");
+// if too small.
+// Run with +PrintInterpreter to get the VM to print out the size.
+// Max size with JVMTI
+int TemplateInterpreter::InterpreterCodeSize = 256 * 1024;
+
+#define __ _masm->
+
+//-----------------------------------------------------------------------------
+
+address TemplateInterpreterGenerator::generate_slow_signature_handler() {
+  address entry = __ pc();
+
+  __ andi(esp, esp, -16);
+  __ mv(c_rarg3, esp);
+  // xmethod
+  // xlocals
+  // c_rarg3: first stack arg - wordSize
+  // adjust sp
+
+  __ addi(sp, c_rarg3, -18 * wordSize);
+  __ addi(sp, sp, -2 * wordSize);
+  __ sd(ra, Address(sp, 0));
+
+  __ call_VM(noreg,
+             CAST_FROM_FN_PTR(address,
+                              InterpreterRuntime::slow_signature_handler),
+             xmethod, xlocals, c_rarg3);
+
+  // x10: result handler
+
+  // Stack layout:
+  // sp: return address           <- sp
+  //      1 garbage
+  //      8 integer args (if static first is unused)
+  //      1 float/double identifiers
+  //      8 double args
+  //        stack args              <- esp
+  //        garbage
+  //        expression stack bottom
+  //        bcp (NULL)
+  //        ...
+
+  // Restore ra
+  __ ld(ra, Address(sp, 0));
+  __ addi(sp, sp , 2 * wordSize);
+
+  // Do FP first so we can use c_rarg3 as temp
+  __ lwu(c_rarg3, Address(sp, 9 * wordSize)); // float/double identifiers
+
+  for (int i = 0; i < Argument::n_float_register_parameters_c; i++) {
+    const FloatRegister r = g_FPArgReg[i];
+    Label d, done;
+
+    __ andi(t0, c_rarg3, 1UL << i);
+    __ bnez(t0, d);
+    __ flw(r, Address(sp, (10 + i) * wordSize));
+    __ j(done);
+    __ bind(d);
+    __ fld(r, Address(sp, (10 + i) * wordSize));
+    __ bind(done);
+  }
+
+  // c_rarg0 contains the result from the call of
+  // InterpreterRuntime::slow_signature_handler so we don't touch it
+  // here.  It will be loaded with the JNIEnv* later.
+  for (int i = 1; i < Argument::n_int_register_parameters_c; i++) {
+    const Register rm = g_INTArgReg[i];
+    __ ld(rm, Address(sp, i * wordSize));
+  }
+
+  __ addi(sp, sp, 18 * wordSize);
+  __ ret();
+
+  return entry;
+}
+
+// Various method entries
+address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
+  // xmethod: Method*
+  // x30: sender sp
+  // esp: args
+
+  if (!InlineIntrinsics) {
+    return NULL; // Generate a vanilla entry
+  }
+
+  // These don't need a safepoint check because they aren't virtually
+  // callable. We won't enter these intrinsics from compiled code.
+  // If in the future we added an intrinsic which was virtually callable
+  // we'd have to worry about how to safepoint so that this code is used.
+
+  // mathematical functions inlined by compiler
+  // (interpreter must provide identical implementation
+  // in order to avoid monotonicity bugs when switching
+  // from interpreter to compiler in the middle of some
+  // computation)
+  //
+  // stack:
+  //        [ arg ] <-- esp
+  //        [ arg ]
+  // retaddr in ra
+
+  address fn = NULL;
+  address entry_point = NULL;
+  Register continuation = ra;
+  switch (kind) {
+    case Interpreter::java_lang_math_abs:
+      entry_point = __ pc();
+      __ fld(f10, Address(esp));
+      __ fabs_d(f10, f10);
+      __ mv(sp, x30); // Restore caller's SP
+      break;
+    case Interpreter::java_lang_math_sqrt:
+      entry_point = __ pc();
+      __ fld(f10, Address(esp));
+      __ fsqrt_d(f10, f10);
+      __ mv(sp, x30);
+      break;
+    case Interpreter::java_lang_math_sin :
+      entry_point = __ pc();
+      __ fld(f10, Address(esp));
+      __ mv(sp, x30);
+      __ mv(x9, ra);
+      continuation = x9;  // The first callee-saved register
+      if (StubRoutines::dsin() == NULL) {
+        fn = CAST_FROM_FN_PTR(address, SharedRuntime::dsin);
+      } else {
+        fn = CAST_FROM_FN_PTR(address, StubRoutines::dsin());
+      }
+      __ mv(t0, fn);
+      __ jalr(t0);
+      break;
+    case Interpreter::java_lang_math_cos :
+      entry_point = __ pc();
+      __ fld(f10, Address(esp));
+      __ mv(sp, x30);
+      __ mv(x9, ra);
+      continuation = x9;  // The first callee-saved register
+      if (StubRoutines::dcos() == NULL) {
+        fn = CAST_FROM_FN_PTR(address, SharedRuntime::dcos);
+      } else {
+        fn = CAST_FROM_FN_PTR(address, StubRoutines::dcos());
+      }
+      __ mv(t0, fn);
+      __ jalr(t0);
+      break;
+    case Interpreter::java_lang_math_tan :
+      entry_point = __ pc();
+      __ fld(f10, Address(esp));
+      __ mv(sp, x30);
+      __ mv(x9, ra);
+      continuation = x9;  // The first callee-saved register
+      if (StubRoutines::dtan() == NULL) {
+        fn = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);
+      } else {
+        fn = CAST_FROM_FN_PTR(address, StubRoutines::dtan());
+      }
+      __ mv(t0, fn);
+      __ jalr(t0);
+      break;
+    case Interpreter::java_lang_math_log :
+      entry_point = __ pc();
+      __ fld(f10, Address(esp));
+      __ mv(sp, x30);
+      __ mv(x9, ra);
+      continuation = x9;  // The first callee-saved register
+      if (StubRoutines::dlog() == NULL) {
+        fn = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);
+      } else {
+        fn = CAST_FROM_FN_PTR(address, StubRoutines::dlog());
+      }
+      __ mv(t0, fn);
+      __ jalr(t0);
+      break;
+    case Interpreter::java_lang_math_log10 :
+      entry_point = __ pc();
+      __ fld(f10, Address(esp));
+      __ mv(sp, x30);
+      __ mv(x9, ra);
+      continuation = x9;  // The first callee-saved register
+      if (StubRoutines::dlog10() == NULL) {
+        fn = CAST_FROM_FN_PTR(address, SharedRuntime::dlog10);
+      } else {
+        fn = CAST_FROM_FN_PTR(address, StubRoutines::dlog10());
+      }
+      __ mv(t0, fn);
+      __ jalr(t0);
+      break;
+    case Interpreter::java_lang_math_exp :
+      entry_point = __ pc();
+      __ fld(f10, Address(esp));
+      __ mv(sp, x30);
+      __ mv(x9, ra);
+      continuation = x9;  // The first callee-saved register
+      if (StubRoutines::dexp() == NULL) {
+        fn = CAST_FROM_FN_PTR(address, SharedRuntime::dexp);
+      } else {
+        fn = CAST_FROM_FN_PTR(address, StubRoutines::dexp());
+      }
+      __ mv(t0, fn);
+      __ jalr(t0);
+      break;
+    case Interpreter::java_lang_math_pow :
+      entry_point = __ pc();
+      __ mv(x9, ra);
+      continuation = x9;
+      __ fld(f10, Address(esp, 2 * Interpreter::stackElementSize));
+      __ fld(f11, Address(esp));
+      __ mv(sp, x30);
+      if (StubRoutines::dpow() == NULL) {
+        fn = CAST_FROM_FN_PTR(address, SharedRuntime::dpow);
+      } else {
+        fn = CAST_FROM_FN_PTR(address, StubRoutines::dpow());
+      }
+      __ mv(t0, fn);
+      __ jalr(t0);
+      break;
+    case Interpreter::java_lang_math_fmaD :
+      if (UseFMA) {
+        entry_point = __ pc();
+        __ fld(f10, Address(esp, 4 * Interpreter::stackElementSize));
+        __ fld(f11, Address(esp, 2 * Interpreter::stackElementSize));
+        __ fld(f12, Address(esp));
+        __ fmadd_d(f10, f10, f11, f12);
+        __ mv(sp, x30); // Restore caller's SP
+      }
+      break;
+    case Interpreter::java_lang_math_fmaF :
+      if (UseFMA) {
+        entry_point = __ pc();
+        __ flw(f10, Address(esp, 2 * Interpreter::stackElementSize));
+        __ flw(f11, Address(esp, Interpreter::stackElementSize));
+        __ flw(f12, Address(esp));
+        __ fmadd_s(f10, f10, f11, f12);
+        __ mv(sp, x30); // Restore caller's SP
+      }
+      break;
+    default:
+      ;
+  }
+  if (entry_point != NULL) {
+    __ jr(continuation);
+  }
+
+  return entry_point;
+}
+
+// Abstract method entry
+// Attempt to execute abstract method. Throw exception
+address TemplateInterpreterGenerator::generate_abstract_entry(void) {
+  // xmethod: Method*
+  // x30: sender SP
+
+  address entry_point = __ pc();
+
+  // abstract method entry
+
+  //  pop return address, reset last_sp to NULL
+  __ empty_expression_stack();
+  __ restore_bcp();      // bcp must be correct for exception handler   (was destroyed)
+  __ restore_locals();   // make sure locals pointer is correct as well (was destroyed)
+
+  // throw exception
+  __ call_VM(noreg, CAST_FROM_FN_PTR(address,
+                                     InterpreterRuntime::throw_AbstractMethodErrorWithMethod),
+                                     xmethod);
+  // the call_VM checks for exception, so we should never return here.
+  __ should_not_reach_here();
+
+  return entry_point;
+}
+
+address TemplateInterpreterGenerator::generate_StackOverflowError_handler() {
+  address entry = __ pc();
+
+#ifdef ASSERT
+  {
+    Label L;
+    __ ld(t0, Address(fp, frame::interpreter_frame_monitor_block_top_offset * wordSize));
+    __ mv(t1, sp);
+    // maximal sp for current fp (stack grows negative)
+    // check if frame is complete
+    __ bge(t0, t1, L);
+    __ stop ("interpreter frame not set up");
+    __ bind(L);
+  }
+#endif // ASSERT
+  // Restore bcp under the assumption that the current frame is still
+  // interpreted
+  __ restore_bcp();
+
+  // expression stack must be empty before entering the VM if an
+  // exception happened
+  __ empty_expression_stack();
+  // throw exception
+  __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_StackOverflowError));
+  return entry;
+}
+
+address TemplateInterpreterGenerator::generate_ArrayIndexOutOfBounds_handler() {
+  address entry = __ pc();
+  // expression stack must be empty before entering the VM if an
+  // exception happened
+  __ empty_expression_stack();
+  // setup parameters
+
+  // convention: expect aberrant index in register x11
+  __ zero_extend(c_rarg2, x11, 32);
+  // convention: expect array in register x13
+  __ mv(c_rarg1, x13);
+  __ call_VM(noreg,
+             CAST_FROM_FN_PTR(address,
+                              InterpreterRuntime::
+                              throw_ArrayIndexOutOfBoundsException),
+             c_rarg1, c_rarg2);
+  return entry;
+}
+
+address TemplateInterpreterGenerator::generate_ClassCastException_handler() {
+  address entry = __ pc();
+
+  // object is at TOS
+  __ pop_reg(c_rarg1);
+
+  // expression stack must be empty before entering the VM if an
+  // exception happened
+  __ empty_expression_stack();
+
+  __ call_VM(noreg,
+             CAST_FROM_FN_PTR(address,
+                              InterpreterRuntime::
+                              throw_ClassCastException),
+             c_rarg1);
+  return entry;
+}
+
+address TemplateInterpreterGenerator::generate_exception_handler_common(
+  const char* name, const char* message, bool pass_oop) {
+  assert(!pass_oop || message == NULL, "either oop or message but not both");
+  address entry = __ pc();
+  if (pass_oop) {
+    // object is at TOS
+    __ pop_reg(c_rarg2);
+  }
+  // expression stack must be empty before entering the VM if an
+  // exception happened
+  __ empty_expression_stack();
+  // setup parameters
+  __ la(c_rarg1, Address((address)name));
+  if (pass_oop) {
+    __ call_VM(x10, CAST_FROM_FN_PTR(address,
+                                     InterpreterRuntime::
+                                     create_klass_exception),
+               c_rarg1, c_rarg2);
+  } else {
+    // kind of lame ExternalAddress can't take NULL because
+    // external_word_Relocation will assert.
+    if (message != NULL) {
+      __ la(c_rarg2, Address((address)message));
+    } else {
+      __ mv(c_rarg2, NULL_WORD);
+    }
+    __ call_VM(x10,
+               CAST_FROM_FN_PTR(address, InterpreterRuntime::create_exception),
+               c_rarg1, c_rarg2);
+  }
+  // throw exception
+  __ j(address(Interpreter::throw_exception_entry()));
+  return entry;
+}
+
+address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
+  address entry = __ pc();
+
+  // Restore stack bottom in case i2c adjusted stack
+  __ ld(esp, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  // and NULL it as marker that esp is now tos until next java call
+  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ restore_bcp();
+  __ restore_locals();
+  __ restore_constant_pool_cache();
+  __ get_method(xmethod);
+
+  if (state == atos) {
+    Register obj = x10;
+    Register mdp = x11;
+    Register tmp = x12;
+    __ ld(mdp, Address(xmethod, Method::method_data_offset()));
+    __ profile_return_type(mdp, obj, tmp);
+  }
+
+  // Pop N words from the stack
+  __ get_cache_and_index_at_bcp(x11, x12, 1, index_size);
+  __ ld(x11, Address(x11, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset()));
+  __ andi(x11, x11, ConstantPoolCacheEntry::parameter_size_mask);
+
+  __ shadd(esp, x11, esp, t0, 3);
+
+  // Restore machine SP
+  __ ld(t0, Address(xmethod, Method::const_offset()));
+  __ lhu(t0, Address(t0, ConstMethod::max_stack_offset()));
+  __ addi(t0, t0, frame::interpreter_frame_monitor_size() + 2);
+  __ ld(t1,
+        Address(fp, frame::interpreter_frame_initial_sp_offset * wordSize));
+  __ slli(t0, t0, 3);
+  __ sub(t0, t1, t0);
+  __ andi(sp, t0, -16);
+
+ __ check_and_handle_popframe(xthread);
+ __ check_and_handle_earlyret(xthread);
+
+  __ get_dispatch();
+  __ dispatch_next(state, step);
+
+  return entry;
+}
+
+address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state,
+                                                               int step,
+                                                               address continuation) {
+  address entry = __ pc();
+  __ restore_bcp();
+  __ restore_locals();
+  __ restore_constant_pool_cache();
+  __ get_method(xmethod);
+  __ get_dispatch();
+
+  // Calculate stack limit
+  __ ld(t0, Address(xmethod, Method::const_offset()));
+  __ lhu(t0, Address(t0, ConstMethod::max_stack_offset()));
+  __ addi(t0, t0, frame::interpreter_frame_monitor_size() + 2);
+  __ ld(t1, Address(fp, frame::interpreter_frame_initial_sp_offset * wordSize));
+  __ slli(t0, t0, 3);
+  __ sub(t0, t1, t0);
+  __ andi(sp, t0, -16);
+
+  // Restore expression stack pointer
+  __ ld(esp, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  // NULL last_sp until next java call
+  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+
+  // handle exceptions
+  {
+    Label L;
+    __ ld(t0, Address(xthread, Thread::pending_exception_offset()));
+    __ beqz(t0, L);
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_pending_exception));
+    __ should_not_reach_here();
+    __ bind(L);
+  }
+
+  if (continuation == NULL) {
+    __ dispatch_next(state, step);
+  } else {
+    __ jump_to_entry(continuation);
+  }
+  return entry;
+}
+
+address TemplateInterpreterGenerator::generate_result_handler_for(BasicType type) {
+  address entry = __ pc();
+  if (type == T_OBJECT) {
+    // retrieve result from frame
+    __ ld(x10, Address(fp, frame::interpreter_frame_oop_temp_offset * wordSize));
+    // and verify it
+    __ verify_oop(x10);
+  } else {
+   __ cast_primitive_type(type, x10);
+  }
+
+  __ ret();                                  // return from result handler
+  return entry;
+}
+
+address TemplateInterpreterGenerator::generate_safept_entry_for(TosState state,
+                                                                address runtime_entry) {
+  assert_cond(runtime_entry != NULL);
+  address entry = __ pc();
+  __ push(state);
+  __ call_VM(noreg, runtime_entry);
+  __ fence(0xf, 0xf);
+  __ dispatch_via(vtos, Interpreter::_normal_table.table_for(vtos));
+  return entry;
+}
+
+// Helpers for commoning out cases in the various type of method entries.
+//
+
+
+// increment invocation count & check for overflow
+//
+// Note: checking for negative value instead of overflow
+//       so we have a 'sticky' overflow test
+//
+// xmethod: method
+//
+void TemplateInterpreterGenerator::generate_counter_incr(Label* overflow) {
+  Label done;
+  // Note: In tiered we increment either counters in Method* or in MDO depending if we're profiling or not.
+  int increment = InvocationCounter::count_increment;
+  Label no_mdo;
+  if (ProfileInterpreter) {
+    // Are we profiling?
+    __ ld(x10, Address(xmethod, Method::method_data_offset()));
+    __ beqz(x10, no_mdo);
+    // Increment counter in the MDO
+    const Address mdo_invocation_counter(x10, in_bytes(MethodData::invocation_counter_offset()) +
+                                         in_bytes(InvocationCounter::counter_offset()));
+    const Address mask(x10, in_bytes(MethodData::invoke_mask_offset()));
+    __ increment_mask_and_jump(mdo_invocation_counter, increment, mask, t0, t1, false, overflow);
+    __ j(done);
+  }
+  __ bind(no_mdo);
+  // Increment counter in MethodCounters
+  const Address invocation_counter(t1,
+                                   MethodCounters::invocation_counter_offset() +
+                                   InvocationCounter::counter_offset());
+  __ get_method_counters(xmethod, t1, done);
+  const Address mask(t1, in_bytes(MethodCounters::invoke_mask_offset()));
+  __ increment_mask_and_jump(invocation_counter, increment, mask, t0, x11, false, overflow);
+  __ bind(done);
+}
+
+void TemplateInterpreterGenerator::generate_counter_overflow(Label& do_continue) {
+  __ mv(c_rarg1, zr);
+  __ call_VM(noreg,
+             CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), c_rarg1);
+  __ j(do_continue);
+}
+
+// See if we've got enough room on the stack for locals plus overhead
+// below JavaThread::stack_overflow_limit(). If not, throw a StackOverflowError
+// without going through the signal handler, i.e., reserved and yellow zones
+// will not be made usable. The shadow zone must suffice to handle the
+// overflow.
+// The expression stack grows down incrementally, so the normal guard
+// page mechanism will work for that.
+//
+// NOTE: Since the additional locals are also always pushed (wasn't
+// obvious in generate_method_entry) so the guard should work for them
+// too.
+//
+// Args:
+//      x13: number of additional locals this frame needs (what we must check)
+//      xmethod: Method*
+//
+// Kills:
+//      x10
+void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
+
+  // monitor entry size: see picture of stack set
+  // (generate_method_entry) and frame_amd64.hpp
+  const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
+
+  // total overhead size: entry_size + (saved fp through expr stack
+  // bottom).  be sure to change this if you add/subtract anything
+  // to/from the overhead area
+  const int overhead_size =
+    -(frame::interpreter_frame_initial_sp_offset * wordSize) + entry_size;
+
+  const int page_size = os::vm_page_size();
+
+  Label after_frame_check;
+
+  // see if the frame is greater than one page in size. If so,
+  // then we need to verify there is enough stack space remaining
+  // for the additional locals.
+  __ mv(t0, (page_size - overhead_size) / Interpreter::stackElementSize);
+  __ bleu(x13, t0, after_frame_check);
+
+  // compute sp as if this were going to be the last frame on
+  // the stack before the red zone
+
+  // locals + overhead, in bytes
+  __ mv(x10, overhead_size);
+  __ shadd(x10, x13, x10, t0, Interpreter::logStackElementSize);  // 2 slots per parameter.
+
+  const Address stack_limit(xthread, JavaThread::stack_overflow_limit_offset());
+  __ ld(t0, stack_limit);
+
+#ifdef ASSERT
+  Label limit_okay;
+  // Verify that thread stack limit is non-zero.
+  __ bnez(t0, limit_okay);
+  __ stop("stack overflow limit is zero");
+  __ bind(limit_okay);
+#endif
+
+  // Add stack limit to locals.
+  __ add(x10, x10, t0);
+
+  // Check against the current stack bottom.
+  __ bgtu(sp, x10, after_frame_check);
+
+  // Remove the incoming args, peeling the machine SP back to where it
+  // was in the caller.  This is not strictly necessary, but unless we
+  // do so the stack frame may have a garbage FP; this ensures a
+  // correct call stack that we can always unwind.  The ANDI should be
+  // unnecessary because the sender SP in x30 is always aligned, but
+  // it doesn't hurt.
+  __ andi(sp, x30, -16);
+
+  // Note: the restored frame is not necessarily interpreted.
+  // Use the shared runtime version of the StackOverflowError.
+  assert(StubRoutines::throw_StackOverflowError_entry() != NULL, "stub not yet generated");
+  __ far_jump(RuntimeAddress(StubRoutines::throw_StackOverflowError_entry()));
+
+  // all done with frame size check
+  __ bind(after_frame_check);
+}
+
+// Allocate monitor and lock method (asm interpreter)
+//
+// Args:
+//      xmethod: Method*
+//      xlocals: locals
+//
+// Kills:
+//      x10
+//      c_rarg0, c_rarg1, c_rarg2, c_rarg3, ...(param regs)
+//      t0, t1 (temporary regs)
+void TemplateInterpreterGenerator::lock_method() {
+  // synchronize method
+  const Address access_flags(xmethod, Method::access_flags_offset());
+  const Address monitor_block_top(fp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+  const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
+
+#ifdef ASSERT
+  __ lwu(x10, access_flags);
+  __ verify_access_flags(x10, JVM_ACC_SYNCHRONIZED, "method doesn't need synchronization", false);
+#endif // ASSERT
+
+  // get synchronization object
+  {
+    Label done;
+    __ lwu(x10, access_flags);
+    __ andi(t0, x10, JVM_ACC_STATIC);
+    // get receiver (assume this is frequent case)
+    __ ld(x10, Address(xlocals, Interpreter::local_offset_in_bytes(0)));
+    __ beqz(t0, done);
+    __ load_mirror(x10, xmethod);
+
+#ifdef ASSERT
+    {
+      Label L;
+      __ bnez(x10, L);
+      __ stop("synchronization object is NULL");
+      __ bind(L);
+    }
+#endif // ASSERT
+
+    __ bind(done);
+  }
+
+  // add space for monitor & lock
+  __ add(sp, sp, - entry_size); // add space for a monitor entry
+  __ add(esp, esp, - entry_size);
+  __ mv(t0, esp);
+  __ sd(t0, monitor_block_top);  // set new monitor block top
+  // store object
+  __ sd(x10, Address(esp, BasicObjectLock::obj_offset_in_bytes()));
+  __ mv(c_rarg1, esp); // object address
+  __ lock_object(c_rarg1);
+}
+
+// Generate a fixed interpreter frame. This is identical setup for
+// interpreted methods and for native methods hence the shared code.
+//
+// Args:
+//      ra: return address
+//      xmethod: Method*
+//      xlocals: pointer to locals
+//      xcpool: cp cache
+//      stack_pointer: previous sp
+void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
+  // initialize fixed part of activation frame
+  if (native_call) {
+    __ add(esp, sp, - 14 * wordSize);
+    __ mv(xbcp, zr);
+    __ add(sp, sp, - 14 * wordSize);
+    // add 2 zero-initialized slots for native calls
+    __ sd(zr, Address(sp, 13 * wordSize));
+    __ sd(zr, Address(sp, 12 * wordSize));
+  } else {
+    __ add(esp, sp, - 12 * wordSize);
+    __ ld(t0, Address(xmethod, Method::const_offset()));     // get ConstMethod
+    __ add(xbcp, t0, in_bytes(ConstMethod::codes_offset())); // get codebase
+    __ add(sp, sp, - 12 * wordSize);
+  }
+  __ sd(xbcp, Address(sp, wordSize));
+  __ sd(esp, Address(sp, 0));
+
+  if (ProfileInterpreter) {
+    Label method_data_continue;
+    __ ld(t0, Address(xmethod, Method::method_data_offset()));
+    __ beqz(t0, method_data_continue);
+    __ la(t0, Address(t0, in_bytes(MethodData::data_offset())));
+    __ bind(method_data_continue);
+  }
+
+  __ sd(xmethod, Address(sp, 7 * wordSize));
+  __ sd(ProfileInterpreter ? t0 : zr, Address(sp, 6 * wordSize));
+
+  // Get mirror and store it in the frame as GC root for this Method*
+  __ load_mirror(t2, xmethod);
+  __ sd(zr, Address(sp, 5 * wordSize));
+  __ sd(t2, Address(sp, 4 * wordSize));
+
+  __ ld(xcpool, Address(xmethod, Method::const_offset()));
+  __ ld(xcpool, Address(xcpool, ConstMethod::constants_offset()));
+  __ ld(xcpool, Address(xcpool, ConstantPool::cache_offset_in_bytes()));
+  __ sd(xcpool, Address(sp, 3 * wordSize));
+  __ sd(xlocals, Address(sp, 2 * wordSize));
+
+  __ sd(ra, Address(sp, 11 * wordSize));
+  __ sd(fp, Address(sp, 10 * wordSize));
+  __ la(fp, Address(sp, 12 * wordSize)); // include ra & fp
+
+  // set sender sp
+  // leave last_sp as null
+  __ sd(x30, Address(sp, 9 * wordSize));
+  __ sd(zr, Address(sp, 8 * wordSize));
+
+  // Move SP out of the way
+  if (!native_call) {
+    __ ld(t0, Address(xmethod, Method::const_offset()));
+    __ lhu(t0, Address(t0, ConstMethod::max_stack_offset()));
+    __ add(t0, t0, frame::interpreter_frame_monitor_size() + 2);
+    __ slli(t0, t0, 3);
+    __ sub(t0, sp, t0);
+    __ andi(sp, t0, -16);
+  }
+}
+
+// End of helpers
+
+// Various method entries
+//------------------------------------------------------------------------------------------------------------------------
+//
+//
+
+// Method entry for java.lang.ref.Reference.get.
+address TemplateInterpreterGenerator::generate_Reference_get_entry(void) {
+  // Code: _aload_0, _getfield, _areturn
+  // parameter size = 1
+  //
+  // The code that gets generated by this routine is split into 2 parts:
+  //    1. The "intrinsified" code for G1 (or any SATB based GC),
+  //    2. The slow path - which is an expansion of the regular method entry.
+  //
+  // Notes:-
+  // * In the G1 code we do not check whether we need to block for
+  //   a safepoint. If G1 is enabled then we must execute the specialized
+  //   code for Reference.get (except when the Reference object is null)
+  //   so that we can log the value in the referent field with an SATB
+  //   update buffer.
+  //   If the code for the getfield template is modified so that the
+  //   G1 pre-barrier code is executed when the current method is
+  //   Reference.get() then going through the normal method entry
+  //   will be fine.
+  // * The G1 code can, however, check the receiver object (the instance
+  //   of java.lang.Reference) and jump to the slow path if null. If the
+  //   Reference object is null then we obviously cannot fetch the referent
+  //   and so we don't need to call the G1 pre-barrier. Thus we can use the
+  //   regular method entry code to generate the NPE.
+  //
+  // This code is based on generate_accessor_entry.
+  //
+  // xmethod: Method*
+  // x30: senderSP must preserve for slow path, set SP to it on fast path
+
+  // ra is live.  It must be saved around calls.
+
+  address entry = __ pc();
+
+  const int referent_offset = java_lang_ref_Reference::referent_offset();
+  guarantee(referent_offset > 0, "referent offset not initialized");
+
+  Label slow_path;
+  const Register local_0 = c_rarg0;
+  // Check if local 0 != NULL
+  // If the receiver is null then it is OK to jump to the slow path.
+  __ ld(local_0, Address(esp, 0));
+  __ beqz(local_0, slow_path);
+
+  __ mv(x9, x30);   // Move senderSP to a callee-saved register
+
+  // Load the value of the referent field.
+  const Address field_address(local_0, referent_offset);
+  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
+  bs->load_at(_masm, IN_HEAP | ON_WEAK_OOP_REF, T_OBJECT, local_0, field_address, /*tmp1*/ t1, /*tmp2*/ t0);
+
+  // areturn
+  __ andi(sp, x9, -16);  // done with stack
+  __ ret();
+
+  // generate a vanilla interpreter entry as the slow path
+  __ bind(slow_path);
+  __ jump_to_entry(Interpreter::entry_for_kind(Interpreter::zerolocals));
+  return entry;
+}
+
+/**
+ * Method entry for static native methods:
+ *   int java.util.zip.CRC32.update(int crc, int b)
+ */
+address TemplateInterpreterGenerator::generate_CRC32_update_entry() {
+  // TODO: Unimplemented generate_CRC32_update_entry
+  return 0;
+}
+
+/**
+ * Method entry for static native methods:
+ *   int java.util.zip.CRC32.updateBytes(int crc, byte[] b, int off, int len)
+ *   int java.util.zip.CRC32.updateByteBuffer(int crc, long buf, int off, int len)
+ */
+address TemplateInterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
+  // TODO: Unimplemented generate_CRC32_updateBytes_entry
+  return 0;
+}
+
+/**
+ * Method entry for intrinsic-candidate (non-native) methods:
+ *   int java.util.zip.CRC32C.updateBytes(int crc, byte[] b, int off, int end)
+ *   int java.util.zip.CRC32C.updateDirectByteBuffer(int crc, long buf, int off, int end)
+ * Unlike CRC32, CRC32C does not have any methods marked as native
+ * CRC32C also uses an "end" variable instead of the length variable CRC32 uses
+ */
+address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
+  // TODO: Unimplemented generate_CRC32C_updateBytes_entry
+  return 0;
+}
+
+void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
+  // See more discussion in stackOverflow.hpp.
+
+  const int shadow_zone_size = checked_cast<int>(StackOverflow::stack_shadow_zone_size());
+  const int page_size = os::vm_page_size();
+  const int n_shadow_pages = shadow_zone_size / page_size;
+
+#ifdef ASSERT
+  Label L_good_limit;
+  __ ld(t0, Address(xthread, JavaThread::shadow_zone_safe_limit()));
+  __ bnez(t0, L_good_limit);
+  __ stop("shadow zone safe limit is not initialized");
+  __ bind(L_good_limit);
+
+  Label L_good_watermark;
+  __ ld(t0, Address(xthread, JavaThread::shadow_zone_growth_watermark()));
+  __ bnez(t0, L_good_watermark);
+  __ stop("shadow zone growth watermark is not initialized");
+  __ bind(L_good_watermark);
+#endif
+
+  Label L_done;
+
+  __ ld(t0, Address(xthread, JavaThread::shadow_zone_growth_watermark()));
+  __ bgtu(sp, t0, L_done);
+
+  for (int p = 1; p <= n_shadow_pages; p++) {
+    __ bang_stack_with_offset(p * page_size);
+  }
+
+  // Record the new watermark, but only if the update is above the safe limit.
+  // Otherwise, the next time around the check above would pass the safe limit.
+  __ ld(t0, Address(xthread, JavaThread::shadow_zone_safe_limit()));
+  __ bleu(sp, t0, L_done);
+  __ sd(sp, Address(xthread, JavaThread::shadow_zone_growth_watermark()));
+
+  __ bind(L_done);
+}
+
+// Interpreter stub for calling a native method. (asm interpreter)
+// This sets up a somewhat different looking stack for calling the
+// native method than the typical interpreter frame setup.
+address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
+  // determine code generation flags
+  bool inc_counter = UseCompiler || CountCompiledCalls || LogTouchedMethods;
+
+  // x11: Method*
+  // x30: sender sp
+
+  address entry_point = __ pc();
+
+  const Address constMethod       (xmethod, Method::const_offset());
+  const Address access_flags      (xmethod, Method::access_flags_offset());
+  const Address size_of_parameters(x12, ConstMethod::
+                                   size_of_parameters_offset());
+
+  // get parameter size (always needed)
+  __ ld(x12, constMethod);
+  __ load_unsigned_short(x12, size_of_parameters);
+
+  // Native calls don't need the stack size check since they have no
+  // expression stack and the arguments are already on the stack and
+  // we only add a handful of words to the stack.
+
+  // xmethod: Method*
+  // x12: size of parameters
+  // x30: sender sp
+
+  // for natives the size of locals is zero
+
+  // compute beginning of parameters (xlocals)
+  __ shadd(xlocals, x12, esp, xlocals, 3);
+  __ addi(xlocals, xlocals, -wordSize);
+
+  // Pull SP back to minimum size: this avoids holes in the stack
+  __ andi(sp, esp, -16);
+
+  // initialize fixed part of activation frame
+  generate_fixed_frame(true);
+
+  // make sure method is native & not abstract
+#ifdef ASSERT
+  __ lwu(x10, access_flags);
+  __ verify_access_flags(x10, JVM_ACC_NATIVE, "tried to execute non-native method as native", false);
+  __ verify_access_flags(x10, JVM_ACC_ABSTRACT, "tried to execute abstract method in interpreter");
+#endif
+
+  // Since at this point in the method invocation the exception
+  // handler would try to exit the monitor of synchronized methods
+  // which hasn't been entered yet, we set the thread local variable
+  // _do_not_unlock_if_synchronized to true. The remove_activation
+  // will check this flag.
+
+  const Address do_not_unlock_if_synchronized(xthread,
+                                              in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
+  __ mv(t1, true);
+  __ sb(t1, do_not_unlock_if_synchronized);
+
+  // increment invocation count & check for overflow
+  Label invocation_counter_overflow;
+  if (inc_counter) {
+    generate_counter_incr(&invocation_counter_overflow);
+  }
+
+  Label continue_after_compile;
+  __ bind(continue_after_compile);
+
+  bang_stack_shadow_pages(true);
+
+  // reset the _do_not_unlock_if_synchronized flag
+  __ sb(zr, do_not_unlock_if_synchronized);
+
+  // check for synchronized methods
+  // Must happen AFTER invocation_counter check and stack overflow check,
+  // so method is not locked if overflows.
+  if (synchronized) {
+    lock_method();
+  } else {
+    // no synchronization necessary
+#ifdef ASSERT
+    __ lwu(x10, access_flags);
+    __ verify_access_flags(x10, JVM_ACC_SYNCHRONIZED, "method needs synchronization");
+#endif
+  }
+
+  // start execution
+#ifdef ASSERT
+  __ verify_frame_setup();
+#endif
+
+  // jvmti support
+  __ notify_method_entry();
+
+  // work registers
+  const Register t = x18;
+  const Register result_handler = x19;
+
+  // allocate space for parameters
+  __ ld(t, Address(xmethod, Method::const_offset()));
+  __ load_unsigned_short(t, Address(t, ConstMethod::size_of_parameters_offset()));
+
+  __ slli(t, t, Interpreter::logStackElementSize);
+  __ sub(x30, esp, t);
+  __ andi(sp, x30, -16);
+  __ mv(esp, x30);
+
+  // get signature handler
+  {
+    Label L;
+    __ ld(t, Address(xmethod, Method::signature_handler_offset()));
+    __ bnez(t, L);
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address,
+                                InterpreterRuntime::prepare_native_call),
+               xmethod);
+    __ ld(t, Address(xmethod, Method::signature_handler_offset()));
+    __ bind(L);
+  }
+
+  // call signature handler
+  assert(InterpreterRuntime::SignatureHandlerGenerator::from() == xlocals,
+         "adjust this code");
+  assert(InterpreterRuntime::SignatureHandlerGenerator::to() == sp,
+         "adjust this code");
+  assert(InterpreterRuntime::SignatureHandlerGenerator::temp() == t0,
+          "adjust this code");
+
+  // The generated handlers do not touch xmethod (the method).
+  // However, large signatures cannot be cached and are generated
+  // each time here.  The slow-path generator can do a GC on return,
+  // so we must reload it after the call.
+  __ jalr(t);
+  __ get_method(xmethod);        // slow path can do a GC, reload xmethod
+
+
+  // result handler is in x10
+  // set result handler
+  __ mv(result_handler, x10);
+  // pass mirror handle if static call
+  {
+    Label L;
+    __ lwu(t, Address(xmethod, Method::access_flags_offset()));
+    __ andi(t0, t, JVM_ACC_STATIC);
+    __ beqz(t0, L);
+    // get mirror
+    __ load_mirror(t, xmethod);
+    // copy mirror into activation frame
+    __ sd(t, Address(fp, frame::interpreter_frame_oop_temp_offset * wordSize));
+    // pass handle to mirror
+    __ addi(c_rarg1, fp, frame::interpreter_frame_oop_temp_offset * wordSize);
+    __ bind(L);
+  }
+
+  // get native function entry point in x28
+  {
+    Label L;
+    __ ld(x28, Address(xmethod, Method::native_function_offset()));
+    address unsatisfied = (SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
+    __ mv(t1, unsatisfied);
+    __ ld(t1, t1);
+    __ bne(x28, t1, L);
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address,
+                                InterpreterRuntime::prepare_native_call),
+               xmethod);
+    __ get_method(xmethod);
+    __ ld(x28, Address(xmethod, Method::native_function_offset()));
+    __ bind(L);
+  }
+
+  // pass JNIEnv
+  __ add(c_rarg0, xthread, in_bytes(JavaThread::jni_environment_offset()));
+
+  // It is enough that the pc() points into the right code
+  // segment. It does not have to be the correct return pc.
+  Label native_return;
+  __ set_last_Java_frame(esp, fp, native_return, x30);
+
+  // change thread state
+#ifdef ASSERT
+  {
+    Label L;
+    __ lwu(t, Address(xthread, JavaThread::thread_state_offset()));
+    __ addi(t0, zr, (u1)_thread_in_Java);
+    __ beq(t, t0, L);
+    __ stop("Wrong thread state in native stub");
+    __ bind(L);
+  }
+#endif
+
+  // Change state to native
+  __ la(t1, Address(xthread, JavaThread::thread_state_offset()));
+  __ mv(t0, _thread_in_native);
+  __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+  __ sw(t0, Address(t1));
+
+  // Call the native method.
+  __ jalr(x28);
+  __ bind(native_return);
+  __ get_method(xmethod);
+  // result potentially in x10 or f10
+
+  // make room for the pushes we're about to do
+  __ sub(t0, esp, 4 * wordSize);
+  __ andi(sp, t0, -16);
+
+  // NOTE: The order of these pushes is known to frame::interpreter_frame_result
+  // in order to extract the result of a method call. If the order of these
+  // pushes change or anything else is added to the stack then the code in
+  // interpreter_frame_result must also change.
+  __ push(dtos);
+  __ push(ltos);
+
+  // change thread state
+  // Force all preceding writes to be observed prior to thread state change
+  __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+
+  __ mv(t0, _thread_in_native_trans);
+  __ sw(t0, Address(xthread, JavaThread::thread_state_offset()));
+
+  // Force this write out before the read below
+  __ membar(MacroAssembler::AnyAny);
+
+  // check for safepoint operation in progress and/or pending suspend requests
+  {
+    Label L, Continue;
+
+    // We need an acquire here to ensure that any subsequent load of the
+    // global SafepointSynchronize::_state flag is ordered after this load
+    // of the thread-local polling word. We don't want this poll to
+    // return false (i.e. not safepointing) and a later poll of the global
+    // SafepointSynchronize::_state spuriously to return true.
+    //
+    // This is to avoid a race when we're in a native->Java transition
+    // racing the code which wakes up from a safepoint.
+    __ safepoint_poll(L, true /* at_return */, true /* acquire */, false /* in_nmethod */);
+    __ lwu(t1, Address(xthread, JavaThread::suspend_flags_offset()));
+    __ beqz(t1, Continue);
+    __ bind(L);
+
+    // Don't use call_VM as it will see a possible pending exception
+    // and forward it and never return here preventing us from
+    // clearing _last_native_pc down below. So we do a runtime call by
+    // hand.
+    //
+    __ mv(c_rarg0, xthread);
+    __ mv(t1, CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans));
+    __ jalr(t1);
+    __ get_method(xmethod);
+    __ reinit_heapbase();
+    __ bind(Continue);
+  }
+
+  // change thread state
+  // Force all preceding writes to be observed prior to thread state change
+  __ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
+
+  __ mv(t0, _thread_in_Java);
+  __ sw(t0, Address(xthread, JavaThread::thread_state_offset()));
+
+  // reset_last_Java_frame
+  __ reset_last_Java_frame(true);
+
+  if (CheckJNICalls) {
+    // clear_pending_jni_exception_check
+    __ sd(zr, Address(xthread, JavaThread::pending_jni_exception_check_fn_offset()));
+  }
+
+  // reset handle block
+  __ ld(t, Address(xthread, JavaThread::active_handles_offset()));
+  __ sd(zr, Address(t, JNIHandleBlock::top_offset_in_bytes()));
+
+  // If result is an oop unbox and store it in frame where gc will see it
+  // and result handler will pick it up
+
+  {
+    Label no_oop;
+    __ la(t, ExternalAddress(AbstractInterpreter::result_handler(T_OBJECT)));
+    __ bne(t, result_handler, no_oop);
+    // Unbox oop result, e.g. JNIHandles::resolve result.
+    __ pop(ltos);
+    __ resolve_jobject(x10, xthread, t);
+    __ sd(x10, Address(fp, frame::interpreter_frame_oop_temp_offset * wordSize));
+    // keep stack depth as expected by pushing oop which will eventually be discarded
+    __ push(ltos);
+    __ bind(no_oop);
+  }
+
+  {
+    Label no_reguard;
+    __ lwu(t0, Address(xthread, in_bytes(JavaThread::stack_guard_state_offset())));
+    __ addi(t1, zr, (u1)StackOverflow::stack_guard_yellow_reserved_disabled);
+    __ bne(t0, t1, no_reguard);
+
+    __ pusha(); // only save smashed registers
+    __ mv(c_rarg0, xthread);
+    __ mv(t1, CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
+    __ jalr(t1);
+    __ popa(); // only restore smashed registers
+    __ bind(no_reguard);
+  }
+
+  // The method register is junk from after the thread_in_native transition
+  // until here.  Also can't call_VM until the bcp has been
+  // restored.  Need bcp for throwing exception below so get it now.
+  __ get_method(xmethod);
+
+  // restore bcp to have legal interpreter frame, i.e., bci == 0 <=>
+  // xbcp == code_base()
+  __ ld(xbcp, Address(xmethod, Method::const_offset()));   // get ConstMethod*
+  __ add(xbcp, xbcp, in_bytes(ConstMethod::codes_offset()));          // get codebase
+  // handle exceptions (exception handling will handle unlocking!)
+  {
+    Label L;
+    __ ld(t0, Address(xthread, Thread::pending_exception_offset()));
+    __ beqz(t0, L);
+    // Note: At some point we may want to unify this with the code
+    // used in call_VM_base(); i.e., we should use the
+    // StubRoutines::forward_exception code. For now this doesn't work
+    // here because the sp is not correctly set at this point.
+    __ MacroAssembler::call_VM(noreg,
+                               CAST_FROM_FN_PTR(address,
+                               InterpreterRuntime::throw_pending_exception));
+    __ should_not_reach_here();
+    __ bind(L);
+  }
+
+  // do unlocking if necessary
+  {
+    Label L;
+    __ lwu(t, Address(xmethod, Method::access_flags_offset()));
+    __ andi(t0, t, JVM_ACC_SYNCHRONIZED);
+    __ beqz(t0, L);
+    // the code below should be shared with interpreter macro
+    // assembler implementation
+    {
+      Label unlock;
+      // BasicObjectLock will be first in list, since this is a
+      // synchronized method. However, need to check that the object
+      // has not been unlocked by an explicit monitorexit bytecode.
+
+      // monitor expect in c_rarg1 for slow unlock path
+      __ la(c_rarg1, Address(fp,   // address of first monitor
+                             (intptr_t)(frame::interpreter_frame_initial_sp_offset *
+                                        wordSize - sizeof(BasicObjectLock))));
+
+      __ ld(t, Address(c_rarg1, BasicObjectLock::obj_offset_in_bytes()));
+      __ bnez(t, unlock);
+
+      // Entry already unlocked, need to throw exception
+      __ MacroAssembler::call_VM(noreg,
+                                 CAST_FROM_FN_PTR(address,
+                                                  InterpreterRuntime::throw_illegal_monitor_state_exception));
+      __ should_not_reach_here();
+
+      __ bind(unlock);
+      __ unlock_object(c_rarg1);
+    }
+    __ bind(L);
+  }
+
+  // jvmti support
+  // Note: This must happen _after_ handling/throwing any exceptions since
+  //       the exception handler code notifies the runtime of method exits
+  //       too. If this happens before, method entry/exit notifications are
+  //       not properly paired (was bug - gri 11/22/99).
+  __ notify_method_exit(vtos, InterpreterMacroAssembler::NotifyJVMTI);
+
+  __ pop(ltos);
+  __ pop(dtos);
+
+  __ jalr(result_handler);
+
+  // remove activation
+  __ ld(esp, Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize)); // get sender sp
+  // remove frame anchor
+  __ leave();
+
+  // restore sender sp
+  __ mv(sp, esp);
+
+  __ ret();
+
+  if (inc_counter) {
+    // Handle overflow of counter and compile method
+    __ bind(invocation_counter_overflow);
+    generate_counter_overflow(continue_after_compile);
+  }
+
+  return entry_point;
+}
+
+//
+// Generic interpreted method entry to (asm) interpreter
+//
+address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
+
+  // determine code generation flags
+  const bool inc_counter  = UseCompiler || CountCompiledCalls || LogTouchedMethods;
+
+  // t0: sender sp
+  address entry_point = __ pc();
+
+  const Address constMethod(xmethod, Method::const_offset());
+  const Address access_flags(xmethod, Method::access_flags_offset());
+  const Address size_of_parameters(x13,
+                                   ConstMethod::size_of_parameters_offset());
+  const Address size_of_locals(x13, ConstMethod::size_of_locals_offset());
+
+  // get parameter size (always needed)
+  // need to load the const method first
+  __ ld(x13, constMethod);
+  __ load_unsigned_short(x12, size_of_parameters);
+
+  // x12: size of parameters
+
+  __ load_unsigned_short(x13, size_of_locals); // get size of locals in words
+  __ sub(x13, x13, x12); // x13 = no. of additional locals
+
+  // see if we've got enough room on the stack for locals plus overhead.
+  generate_stack_overflow_check();
+
+  // compute beginning of parameters (xlocals)
+  __ shadd(xlocals, x12, esp, t1, 3);
+  __ add(xlocals, xlocals, -wordSize);
+
+  // Make room for additional locals
+  __ slli(t1, x13, 3);
+  __ sub(t0, esp, t1);
+
+  // Padding between locals and fixed part of activation frame to ensure
+  // SP is always 16-byte aligned.
+  __ andi(sp, t0, -16);
+
+  // x13 - # of additional locals
+  // allocate space for locals
+  // explicitly initialize locals
+  {
+    Label exit, loop;
+    __ blez(x13, exit); // do nothing if x13 <= 0
+    __ bind(loop);
+    __ sd(zr, Address(t0));
+    __ add(t0, t0, wordSize);
+    __ add(x13, x13, -1); // until everything initialized
+    __ bnez(x13, loop);
+    __ bind(exit);
+  }
+
+  // And the base dispatch table
+  __ get_dispatch();
+
+  // initialize fixed part of activation frame
+  generate_fixed_frame(false);
+
+  // make sure method is not native & not abstract
+#ifdef ASSERT
+  __ lwu(x10, access_flags);
+  __ verify_access_flags(x10, JVM_ACC_NATIVE, "tried to execute native method as non-native");
+  __ verify_access_flags(x10, JVM_ACC_ABSTRACT, "tried to execute abstract method in interpreter");
+#endif
+
+  // Since at this point in the method invocation the exception
+  // handler would try to exit the monitor of synchronized methods
+  // which hasn't been entered yet, we set the thread local variable
+  // _do_not_unlock_if_synchronized to true. The remove_activation
+  // will check this flag.
+
+  const Address do_not_unlock_if_synchronized(xthread,
+                                              in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
+  __ mv(t1, true);
+  __ sb(t1, do_not_unlock_if_synchronized);
+
+  Label no_mdp;
+  const Register mdp = x13;
+  __ ld(mdp, Address(xmethod, Method::method_data_offset()));
+  __ beqz(mdp, no_mdp);
+  __ add(mdp, mdp, in_bytes(MethodData::data_offset()));
+  __ profile_parameters_type(mdp, x11, x12, x14); // use x11, x12, x14 as tmp registers
+  __ bind(no_mdp);
+
+  // increment invocation count & check for overflow
+  Label invocation_counter_overflow;
+  if (inc_counter) {
+    generate_counter_incr(&invocation_counter_overflow);
+  }
+
+  Label continue_after_compile;
+  __ bind(continue_after_compile);
+
+  bang_stack_shadow_pages(false);
+
+  // reset the _do_not_unlock_if_synchronized flag
+  __ sb(zr, do_not_unlock_if_synchronized);
+
+  // check for synchronized methods
+  // Must happen AFTER invocation_counter check and stack overflow check,
+  // so method is not locked if overflows.
+  if (synchronized) {
+    // Allocate monitor and lock method
+    lock_method();
+  } else {
+    // no synchronization necessary
+#ifdef ASSERT
+    __ lwu(x10, access_flags);
+    __ verify_access_flags(x10, JVM_ACC_SYNCHRONIZED, "method needs synchronization");
+#endif
+  }
+
+  // start execution
+#ifdef ASSERT
+  __ verify_frame_setup();
+#endif
+
+  // jvmti support
+  __ notify_method_entry();
+
+  __ dispatch_next(vtos);
+
+  // invocation counter overflow
+  if (inc_counter) {
+    // Handle overflow of counter and compile method
+    __ bind(invocation_counter_overflow);
+    generate_counter_overflow(continue_after_compile);
+  }
+
+  return entry_point;
+}
+
+//-----------------------------------------------------------------------------
+// Exceptions
+
+void TemplateInterpreterGenerator::generate_throw_exception() {
+  // Entry point in previous activation (i.e., if the caller was
+  // interpreted)
+  Interpreter::_rethrow_exception_entry = __ pc();
+  // Restore sp to interpreter_frame_last_sp even though we are going
+  // to empty the expression stack for the exception processing.
+  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  // x10: exception
+  // x13: return address/pc that threw exception
+  __ restore_bcp();    // xbcp points to call/send
+  __ restore_locals();
+  __ restore_constant_pool_cache();
+  __ reinit_heapbase();  // restore xheapbase as heapbase.
+  __ get_dispatch();
+
+  // Entry point for exceptions thrown within interpreter code
+  Interpreter::_throw_exception_entry = __ pc();
+  // If we came here via a NullPointerException on the receiver of a
+  // method, xthread may be corrupt.
+  __ get_method(xmethod);
+  // expression stack is undefined here
+  // x10: exception
+  // xbcp: exception bcp
+  __ verify_oop(x10);
+  __ mv(c_rarg1, x10);
+
+  // expression stack must be empty before entering the VM in case of
+  // an exception
+  __ empty_expression_stack();
+  // find exception handler address and preserve exception oop
+  __ call_VM(x13,
+             CAST_FROM_FN_PTR(address,
+                          InterpreterRuntime::exception_handler_for_exception),
+             c_rarg1);
+
+  // Calculate stack limit
+  __ ld(t0, Address(xmethod, Method::const_offset()));
+  __ lhu(t0, Address(t0, ConstMethod::max_stack_offset()));
+  __ add(t0, t0, frame::interpreter_frame_monitor_size() + 4);
+  __ ld(t1, Address(fp, frame::interpreter_frame_initial_sp_offset * wordSize));
+  __ slli(t0, t0, 3);
+  __ sub(t0, t1, t0);
+  __ andi(sp, t0, -16);
+
+  // x10: exception handler entry point
+  // x13: preserved exception oop
+  // xbcp: bcp for exception handler
+  __ push_ptr(x13); // push exception which is now the only value on the stack
+  __ jr(x10); // jump to exception handler (may be _remove_activation_entry!)
+
+  // If the exception is not handled in the current frame the frame is
+  // removed and the exception is rethrown (i.e. exception
+  // continuation is _rethrow_exception).
+  //
+  // Note: At this point the bci is still the bxi for the instruction
+  // which caused the exception and the expression stack is
+  // empty. Thus, for any VM calls at this point, GC will find a legal
+  // oop map (with empty expression stack).
+
+  //
+  // JVMTI PopFrame support
+  //
+
+  Interpreter::_remove_activation_preserving_args_entry = __ pc();
+  __ empty_expression_stack();
+  // Set the popframe_processing bit in pending_popframe_condition
+  // indicating that we are currently handling popframe, so that
+  // call_VMs that may happen later do not trigger new popframe
+  // handling cycles.
+  __ lwu(x13, Address(xthread, JavaThread::popframe_condition_offset()));
+  __ ori(x13, x13, JavaThread::popframe_processing_bit);
+  __ sw(x13, Address(xthread, JavaThread::popframe_condition_offset()));
+
+  {
+    // Check to see whether we are returning to a deoptimized frame.
+    // (The PopFrame call ensures that the caller of the popped frame is
+    // either interpreted or compiled and deoptimizes it if compiled.)
+    // In this case, we can't call dispatch_next() after the frame is
+    // popped, but instead must save the incoming arguments and restore
+    // them after deoptimization has occurred.
+    //
+    // Note that we don't compare the return PC against the
+    // deoptimization blob's unpack entry because of the presence of
+    // adapter frames in C2.
+    Label caller_not_deoptimized;
+    __ ld(c_rarg1, Address(fp, frame::return_addr_offset * wordSize));
+    __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::interpreter_contains), c_rarg1);
+    __ bnez(x10, caller_not_deoptimized);
+
+    // Compute size of arguments for saving when returning to
+    // deoptimized caller
+    __ get_method(x10);
+    __ ld(x10, Address(x10, Method::const_offset()));
+    __ load_unsigned_short(x10, Address(x10, in_bytes(ConstMethod::
+                                                      size_of_parameters_offset())));
+    __ slli(x10, x10, Interpreter::logStackElementSize);
+    __ restore_locals();
+    __ sub(xlocals, xlocals, x10);
+    __ add(xlocals, xlocals, wordSize);
+    // Save these arguments
+    __ super_call_VM_leaf(CAST_FROM_FN_PTR(address,
+                                           Deoptimization::
+                                           popframe_preserve_args),
+                          xthread, x10, xlocals);
+
+    __ remove_activation(vtos,
+                         /* throw_monitor_exception */ false,
+                         /* install_monitor_exception */ false,
+                         /* notify_jvmdi */ false);
+
+    // Inform deoptimization that it is responsible for restoring
+    // these arguments
+    __ mv(t0, JavaThread::popframe_force_deopt_reexecution_bit);
+    __ sw(t0, Address(xthread, JavaThread::popframe_condition_offset()));
+
+    // Continue in deoptimization handler
+    __ ret();
+
+    __ bind(caller_not_deoptimized);
+  }
+
+  __ remove_activation(vtos,
+                       /* throw_monitor_exception */ false,
+                       /* install_monitor_exception */ false,
+                       /* notify_jvmdi */ false);
+
+  // Restore the last_sp and null it out
+  __ ld(esp, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+
+  __ restore_bcp();
+  __ restore_locals();
+  __ restore_constant_pool_cache();
+  __ get_method(xmethod);
+  __ get_dispatch();
+
+  // The method data pointer was incremented already during
+  // call profiling. We have to restore the mdp for the current bcp.
+  if (ProfileInterpreter) {
+    __ set_method_data_pointer_for_bcp();
+  }
+
+  // Clear the popframe condition flag
+  __ sw(zr, Address(xthread, JavaThread::popframe_condition_offset()));
+  assert(JavaThread::popframe_inactive == 0, "fix popframe_inactive");
+
+#if INCLUDE_JVMTI
+  {
+    Label L_done;
+
+    __ lbu(t0, Address(xbcp, 0));
+    __ li(t1, Bytecodes::_invokestatic);
+    __ bne(t1, t0, L_done);
+
+    // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
+    // Detect such a case in the InterpreterRuntime function and return the member name argument,or NULL.
+
+    __ ld(c_rarg0, Address(xlocals, 0));
+    __ call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null),c_rarg0, xmethod, xbcp);
+
+    __ beqz(x10, L_done);
+
+    __ sd(x10, Address(esp, 0));
+    __ bind(L_done);
+  }
+#endif // INCLUDE_JVMTI
+
+  // Restore machine SP
+  __ ld(t0, Address(xmethod, Method::const_offset()));
+  __ lhu(t0, Address(t0, ConstMethod::max_stack_offset()));
+  __ add(t0, t0, frame::interpreter_frame_monitor_size() + 4);
+  __ ld(t1, Address(fp, frame::interpreter_frame_initial_sp_offset * wordSize));
+  __ slliw(t0, t0, 3);
+  __ sub(t0, t1, t0);
+  __ andi(sp, t0, -16);
+
+  __ dispatch_next(vtos);
+  // end of PopFrame support
+
+  Interpreter::_remove_activation_entry = __ pc();
+
+  // preserve exception over this code sequence
+  __ pop_ptr(x10);
+  __ sd(x10, Address(xthread, JavaThread::vm_result_offset()));
+  // remove the activation (without doing throws on illegalMonitorExceptions)
+  __ remove_activation(vtos, false, true, false);
+  // restore exception
+  __ get_vm_result(x10, xthread);
+
+  // In between activations - previous activation type unknown yet
+  // compute continuation point - the continuation point expects the
+  // following registers set up:
+  //
+  // x10: exception
+  // ra: return address/pc that threw exception
+  // sp: expression stack of caller
+  // fp: fp of caller
+  // FIXME: There's no point saving ra here because VM calls don't trash it
+  __ sub(sp, sp, 2 * wordSize);
+  __ sd(x10, Address(sp, 0));                   // save exception
+  __ sd(ra, Address(sp, wordSize));             // save return address
+  __ super_call_VM_leaf(CAST_FROM_FN_PTR(address,
+                                         SharedRuntime::exception_handler_for_return_address),
+                        xthread, ra);
+  __ mv(x11, x10);                              // save exception handler
+  __ ld(x10, Address(sp, 0));                   // restore exception
+  __ ld(ra, Address(sp, wordSize));             // restore return address
+  __ add(sp, sp, 2 * wordSize);
+  // We might be returning to a deopt handler that expects x13 to
+  // contain the exception pc
+  __ mv(x13, ra);
+  // Note that an "issuing PC" is actually the next PC after the call
+  __ jr(x11);                                   // jump to exception
+                                                // handler of caller
+}
+
+//
+// JVMTI ForceEarlyReturn support
+//
+address TemplateInterpreterGenerator::generate_earlyret_entry_for(TosState state)  {
+  address entry = __ pc();
+
+  __ restore_bcp();
+  __ restore_locals();
+  __ empty_expression_stack();
+  __ load_earlyret_value(state);
+
+  __ ld(t0, Address(xthread, JavaThread::jvmti_thread_state_offset()));
+  Address cond_addr(t0, JvmtiThreadState::earlyret_state_offset());
+
+  // Clear the earlyret state
+  assert(JvmtiThreadState::earlyret_inactive == 0, "should be");
+  __ sd(zr, cond_addr);
+
+  __ remove_activation(state,
+                       false, /* throw_monitor_exception */
+                       false, /* install_monitor_exception */
+                       true); /* notify_jvmdi */
+  __ ret();
+
+  return entry;
+}
+// end of ForceEarlyReturn support
+
+//-----------------------------------------------------------------------------
+// Helper for vtos entry point generation
+
+void TemplateInterpreterGenerator::set_vtos_entry_points(Template* t,
+                                                         address& bep,
+                                                         address& cep,
+                                                         address& sep,
+                                                         address& aep,
+                                                         address& iep,
+                                                         address& lep,
+                                                         address& fep,
+                                                         address& dep,
+                                                         address& vep) {
+  assert(t != NULL && t->is_valid() && t->tos_in() == vtos, "illegal template");
+  Label L;
+  aep = __ pc();  __ push_ptr();  __ j(L);
+  fep = __ pc();  __ push_f();    __ j(L);
+  dep = __ pc();  __ push_d();    __ j(L);
+  lep = __ pc();  __ push_l();    __ j(L);
+  bep = cep = sep =
+  iep = __ pc();  __ push_i();
+  vep = __ pc();
+  __ bind(L);
+  generate_and_dispatch(t);
+}
+
+//-----------------------------------------------------------------------------
+
+// Non-product code
+#ifndef PRODUCT
+address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
+  address entry = __ pc();
+
+  __ push_reg(ra);
+  __ push(state);
+  __ push_reg(RegSet::range(x10, x17) + RegSet::range(x5, x7) + RegSet::range(x28, x31), sp);
+  __ mv(c_rarg2, x10);  // Pass itos
+  __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::trace_bytecode), c_rarg1, c_rarg2, c_rarg3);
+  __ pop_reg(RegSet::range(x10, x17) + RegSet::range(x5, x7) + RegSet::range(x28, x31), sp);
+  __ pop(state);
+  __ pop_reg(ra);
+  __ ret();                                   // return from result handler
+
+  return entry;
+}
+
+void TemplateInterpreterGenerator::count_bytecode() {
+  __ push_reg(t0);
+  __ push_reg(x10);
+  __ mv(x10, (address) &BytecodeCounter::_counter_value);
+  __ li(t0, 1);
+  __ amoadd_d(zr, x10, t0, Assembler::aqrl);
+  __ pop_reg(x10);
+  __ pop_reg(t0);
+}
+
+void TemplateInterpreterGenerator::histogram_bytecode(Template* t) { ; }
+
+void TemplateInterpreterGenerator::histogram_bytecode_pair(Template* t) { ; }
+
+void TemplateInterpreterGenerator::trace_bytecode(Template* t) {
+  // Call a little run-time stub to avoid blow-up for each bytecode.
+  // The run-time runtime saves the right registers, depending on
+  // the tosca in-state for the given template.
+
+  assert(Interpreter::trace_code(t->tos_in()) != NULL, "entry must have been generated");
+  __ jal(Interpreter::trace_code(t->tos_in()));
+  __ reinit_heapbase();
+}
+
+void TemplateInterpreterGenerator::stop_interpreter_at() {
+  Label L;
+  __ push_reg(t0);
+  __ mv(t0, (address) &BytecodeCounter::_counter_value);
+  __ ld(t0, Address(t0));
+  __ mv(t1, StopInterpreterAt);
+  __ bne(t0, t1, L);
+  __ ebreak();
+  __ bind(L);
+  __ pop_reg(t0);
+}
+
+#endif // !PRODUCT
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
new file mode 100644
index 00000000000..d2a301c6e74
--- /dev/null
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -0,0 +1,3951 @@
+/*
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/tlab_globals.hpp"
+#include "interpreter/interp_masm.hpp"
+#include "interpreter/interpreter.hpp"
+#include "interpreter/interpreterRuntime.hpp"
+#include "interpreter/templateTable.hpp"
+#include "memory/universe.hpp"
+#include "oops/method.hpp"
+#include "oops/methodData.hpp"
+#include "oops/objArrayKlass.hpp"
+#include "oops/oop.inline.hpp"
+#include "prims/jvmtiExport.hpp"
+#include "prims/methodHandles.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/synchronizer.hpp"
+#include "utilities/powerOfTwo.hpp"
+
+#define __ _masm->
+
+// Address computation: local variables
+
+static inline Address iaddress(int n) {
+  return Address(xlocals, Interpreter::local_offset_in_bytes(n));
+}
+
+static inline Address laddress(int n) {
+  return iaddress(n + 1);
+}
+
+static inline Address faddress(int n) {
+  return iaddress(n);
+}
+
+static inline Address daddress(int n) {
+  return laddress(n);
+}
+
+static inline Address aaddress(int n) {
+  return iaddress(n);
+}
+
+static inline Address iaddress(Register r,  Register temp, InterpreterMacroAssembler* _masm) {
+  assert_cond(_masm != NULL);
+  _masm->shadd(temp, r, xlocals, temp, 3);
+  return Address(temp, 0);
+}
+
+static inline Address laddress(Register r, Register temp,
+                               InterpreterMacroAssembler* _masm) {
+  assert_cond(_masm != NULL);
+  _masm->shadd(temp, r, xlocals, temp, 3);
+  return Address(temp, Interpreter::local_offset_in_bytes(1));;
+}
+
+static inline Address faddress(Register r, Register temp, InterpreterMacroAssembler* _masm) {
+  return iaddress(r, temp, _masm);
+}
+
+static inline Address daddress(Register r, Register temp,
+                               InterpreterMacroAssembler* _masm) {
+  return laddress(r, temp, _masm);
+}
+
+static inline Address aaddress(Register r, Register temp, InterpreterMacroAssembler* _masm) {
+  return iaddress(r, temp, _masm);
+}
+
+static inline Address at_rsp() {
+  return Address(esp, 0);
+}
+
+// At top of Java expression stack which may be different than esp().  It
+// isn't for category 1 objects.
+static inline Address at_tos   () {
+  return Address(esp,  Interpreter::expr_offset_in_bytes(0));
+}
+
+static inline Address at_tos_p1() {
+  return Address(esp,  Interpreter::expr_offset_in_bytes(1));
+}
+
+static inline Address at_tos_p2() {
+  return Address(esp,  Interpreter::expr_offset_in_bytes(2));
+}
+
+static inline Address at_tos_p3() {
+  return Address(esp,  Interpreter::expr_offset_in_bytes(3));
+}
+
+static inline Address at_tos_p4() {
+  return Address(esp,  Interpreter::expr_offset_in_bytes(4));
+}
+
+static inline Address at_tos_p5() {
+  return Address(esp,  Interpreter::expr_offset_in_bytes(5));
+}
+
+// Miscelaneous helper routines
+// Store an oop (or NULL) at the Address described by obj.
+// If val == noreg this means store a NULL
+static void do_oop_store(InterpreterMacroAssembler* _masm,
+                         Address dst,
+                         Register val,
+                         DecoratorSet decorators) {
+  assert(val == noreg || val == x10, "parameter is just for looks");
+  assert_cond(_masm != NULL);
+  __ store_heap_oop(dst, val, x29, x11, decorators);
+}
+
+static void do_oop_load(InterpreterMacroAssembler* _masm,
+                        Address src,
+                        Register dst,
+                        DecoratorSet decorators) {
+  assert_cond(_masm != NULL);
+  __ load_heap_oop(dst, src, x7, x11, decorators);
+}
+
+Address TemplateTable::at_bcp(int offset) {
+  assert(_desc->uses_bcp(), "inconsistent uses_bcp information");
+  return Address(xbcp, offset);
+}
+
+void TemplateTable::patch_bytecode(Bytecodes::Code bc, Register bc_reg,
+                                   Register temp_reg, bool load_bc_into_bc_reg/*=true*/,
+                                   int byte_no)
+{
+  if (!RewriteBytecodes)  { return; }
+  Label L_patch_done;
+
+  switch (bc) {
+    case Bytecodes::_fast_aputfield:  // fall through
+    case Bytecodes::_fast_bputfield:  // fall through
+    case Bytecodes::_fast_zputfield:  // fall through
+    case Bytecodes::_fast_cputfield:  // fall through
+    case Bytecodes::_fast_dputfield:  // fall through
+    case Bytecodes::_fast_fputfield:  // fall through
+    case Bytecodes::_fast_iputfield:  // fall through
+    case Bytecodes::_fast_lputfield:  // fall through
+    case Bytecodes::_fast_sputfield: {
+      // We skip bytecode quickening for putfield instructions when
+      // the put_code written to the constant pool cache is zero.
+      // This is required so that every execution of this instruction
+      // calls out to InterpreterRuntime::resolve_get_put to do
+      // additional, required work.
+      assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
+      assert(load_bc_into_bc_reg, "we use bc_reg as temp");
+      __ get_cache_and_index_and_bytecode_at_bcp(temp_reg, bc_reg, temp_reg, byte_no, 1);
+      __ mv(bc_reg, bc);
+      __ beqz(temp_reg, L_patch_done);
+      break;
+    }
+    default:
+      assert(byte_no == -1, "sanity");
+      // the pair bytecodes have already done the load.
+      if (load_bc_into_bc_reg) {
+        __ mv(bc_reg, bc);
+      }
+  }
+
+  if (JvmtiExport::can_post_breakpoint()) {
+    Label L_fast_patch;
+    // if a breakpoint is present we can't rewrite the stream directly
+    __ load_unsigned_byte(temp_reg, at_bcp(0));
+    __ addi(temp_reg, temp_reg, -Bytecodes::_breakpoint); // temp_reg is temporary register.
+    __ bnez(temp_reg, L_fast_patch);
+    // Let breakpoint table handling rewrite to quicker bytecode
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), xmethod, xbcp, bc_reg);
+    __ j(L_patch_done);
+    __ bind(L_fast_patch);
+  }
+
+#ifdef ASSERT
+  Label L_okay;
+  __ load_unsigned_byte(temp_reg, at_bcp(0));
+  __ beq(temp_reg, bc_reg, L_okay);
+  __ addi(temp_reg, temp_reg, -(int) Bytecodes::java_code(bc));
+  __ beqz(temp_reg, L_okay);
+  __ stop("patching the wrong bytecode");
+  __ bind(L_okay);
+#endif
+
+  // patch bytecode
+  __ sb(bc_reg, at_bcp(0));
+  __ bind(L_patch_done);
+}
+
+// Individual instructions
+
+void TemplateTable::nop() {
+  transition(vtos, vtos);
+  // nothing to do
+}
+
+void TemplateTable::shouldnotreachhere() {
+  transition(vtos, vtos);
+  __ stop("should not reach here bytecode");
+}
+
+void TemplateTable::aconst_null()
+{
+  transition(vtos, atos);
+  __ mv(x10, zr);
+}
+
+void TemplateTable::iconst(int value)
+{
+  transition(vtos, itos);
+  __ li(x10, value);
+}
+
+void TemplateTable::lconst(int value)
+{
+  transition(vtos, ltos);
+  __ li(x10, value);
+}
+
+void TemplateTable::fconst(int value)
+{
+  transition(vtos, ftos);
+  static float fBuf[2] = {1.0, 2.0};
+  __ mv(t0, (intptr_t)fBuf);
+  switch (value) {
+    case 0:
+      __ fmv_w_x(f10, zr);
+      break;
+    case 1:
+      __ flw(f10, t0, 0);
+      break;
+    case 2:
+      __ flw(f10, t0, sizeof(float));
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void TemplateTable::dconst(int value)
+{
+  transition(vtos, dtos);
+  static double dBuf[2] = {1.0, 2.0};
+  __ mv(t0, (intptr_t)dBuf);
+  switch (value) {
+    case 0:
+      __ fmv_d_x(f10, zr);
+      break;
+    case 1:
+      __ fld(f10, t0, 0);
+      break;
+    case 2:
+      __ fld(f10, t0, sizeof(double));
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void TemplateTable::bipush()
+{
+  transition(vtos, itos);
+  __ load_signed_byte(x10, at_bcp(1));
+}
+
+void TemplateTable::sipush()
+{
+  transition(vtos, itos);
+  __ load_unsigned_short(x10, at_bcp(1));
+  __ revb_w_w(x10, x10);
+  __ sraiw(x10, x10, 16);
+}
+
+void TemplateTable::ldc(bool wide)
+{
+  transition(vtos, vtos);
+  Label call_ldc, notFloat, notClass, notInt, Done;
+
+  if (wide) {
+   __ get_unsigned_2_byte_index_at_bcp(x11, 1);
+  } else {
+   __ load_unsigned_byte(x11, at_bcp(1));
+  }
+  __ get_cpool_and_tags(x12, x10);
+
+  const int base_offset = ConstantPool::header_size() * wordSize;
+  const int tags_offset = Array<u1>::base_offset_in_bytes();
+
+  // get type
+  __ addi(x13, x11, tags_offset);
+  __ add(x13, x10, x13);
+  __ membar(MacroAssembler::AnyAny);
+  __ lbu(x13, Address(x13, 0));
+  __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+
+  // unresolved class - get the resolved class
+  __ mv(t1, (u1)JVM_CONSTANT_UnresolvedClass);
+  __ beq(x13, t1, call_ldc);
+
+  // unresolved class in error state - call into runtime to throw the error
+  // from the first resolution attempt
+  __ mv(t1, (u1)JVM_CONSTANT_UnresolvedClassInError);
+  __ beq(x13, t1, call_ldc);
+
+  // resolved class - need to call vm to get java mirror of the class
+  __ mv(t1, (u1)JVM_CONSTANT_Class);
+  __ bne(x13, t1, notClass);
+
+  __ bind(call_ldc);
+  __ mv(c_rarg1, wide);
+  call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::ldc), c_rarg1);
+  __ push_ptr(x10);
+  __ verify_oop(x10);
+  __ j(Done);
+
+  __ bind(notClass);
+  __ mv(t1, (u1)JVM_CONSTANT_Float);
+  __ bne(x13, t1, notFloat);
+
+  // ftos
+  __ shadd(x11, x11, x12, x11, 3);
+  __ flw(f10, Address(x11, base_offset));
+  __ push_f(f10);
+  __ j(Done);
+
+  __ bind(notFloat);
+
+  __ mv(t1, (u1)JVM_CONSTANT_Integer);
+  __ bne(x13, t1, notInt);
+
+  // itos
+  __ shadd(x11, x11, x12, x11, 3);
+  __ lw(x10, Address(x11, base_offset));
+  __ push_i(x10);
+  __ j(Done);
+
+  __ bind(notInt);
+  condy_helper(Done);
+
+  __ bind(Done);
+}
+
+// Fast path for caching oop constants.
+void TemplateTable::fast_aldc(bool wide)
+{
+  transition(vtos, atos);
+
+  const Register result = x10;
+  const Register tmp = x11;
+  const Register rarg = x12;
+
+  const int index_size = wide ? sizeof(u2) : sizeof(u1);
+
+  Label resolved;
+
+  // We are resolved if the resolved reference cache entry contains a
+  // non-null object (String, MethodType, etc.)
+  assert_different_registers(result, tmp);
+  __ get_cache_index_at_bcp(tmp, 1, index_size);
+  __ load_resolved_reference_at_index(result, tmp);
+  __ bnez(result, resolved);
+
+  const address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_ldc);
+
+  // first time invocation - must resolve first
+  __ mv(rarg, (int)bytecode());
+  __ call_VM(result, entry, rarg);
+
+  __ bind(resolved);
+
+  { // Check for the null sentinel.
+    // If we just called the VM, it already did the mapping for us,
+    // but it's harmless to retry.
+    Label notNull;
+
+    // Stash null_sentinel address to get its value later
+    int32_t offset = 0;
+    __ movptr_with_offset(rarg, Universe::the_null_sentinel_addr(), offset);
+    __ ld(tmp, Address(rarg, offset));
+    __ resolve_oop_handle(tmp);
+    __ bne(result, tmp, notNull);
+    __ mv(result, zr);  // NULL object reference
+    __ bind(notNull);
+  }
+
+  if (VerifyOops) {
+    // Safe to call with 0 result
+    __ verify_oop(result);
+  }
+}
+
+void TemplateTable::ldc2_w()
+{
+    transition(vtos, vtos);
+    Label notDouble, notLong, Done;
+    __ get_unsigned_2_byte_index_at_bcp(x10, 1);
+
+    __ get_cpool_and_tags(x11, x12);
+    const int base_offset = ConstantPool::header_size() * wordSize;
+    const int tags_offset = Array<u1>::base_offset_in_bytes();
+
+    // get type
+    __ add(x12, x12, x10);
+    __ load_unsigned_byte(x12, Address(x12, tags_offset));
+    __ mv(t1, JVM_CONSTANT_Double);
+    __ bne(x12, t1, notDouble);
+
+    // dtos
+    __ shadd(x12, x10, x11, x12, 3);
+    __ fld(f10, Address(x12, base_offset));
+    __ push_d(f10);
+    __ j(Done);
+
+    __ bind(notDouble);
+    __ mv(t1, (int)JVM_CONSTANT_Long);
+    __ bne(x12, t1, notLong);
+
+    // ltos
+    __ shadd(x10, x10, x11, x10, 3);
+    __ ld(x10, Address(x10, base_offset));
+    __ push_l(x10);
+    __ j(Done);
+
+    __ bind(notLong);
+    condy_helper(Done);
+    __ bind(Done);
+}
+
+void TemplateTable::condy_helper(Label& Done)
+{
+  const Register obj = x10;
+  const Register rarg = x11;
+  const Register flags = x12;
+  const Register off = x13;
+
+  const address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_ldc);
+
+  __ mv(rarg, (int) bytecode());
+  __ call_VM(obj, entry, rarg);
+
+  __ get_vm_result_2(flags, xthread);
+
+  // VMr = obj = base address to find primitive value to push
+  // VMr2 = flags = (tos, off) using format of CPCE::_flags
+  __ mv(off, flags);
+  __ mv(t0, ConstantPoolCacheEntry::field_index_mask);
+  __ andrw(off, off, t0);
+
+  __ add(off, obj, off);
+  const Address field(off, 0); // base + R---->base + offset
+
+  __ slli(flags, flags, XLEN - (ConstantPoolCacheEntry::tos_state_shift + ConstantPoolCacheEntry::tos_state_bits));
+  __ srli(flags, flags, XLEN - ConstantPoolCacheEntry::tos_state_bits); // (1 << 5) - 4 --> 28~31==> flags:0~3
+
+  switch (bytecode()) {
+    case Bytecodes::_ldc:   // fall through
+    case Bytecodes::_ldc_w: {
+      // tos in (itos, ftos, stos, btos, ctos, ztos)
+      Label notInt, notFloat, notShort, notByte, notChar, notBool;
+      __ mv(t1, itos);
+      __ bne(flags, t1, notInt);
+      // itos
+      __ lw(x10, field);
+      __ push(itos);
+      __ j(Done);
+
+      __ bind(notInt);
+      __ mv(t1, ftos);
+      __ bne(flags, t1, notFloat);
+      // ftos
+      __ load_float(field);
+      __ push(ftos);
+      __ j(Done);
+
+      __ bind(notFloat);
+      __ mv(t1, stos);
+      __ bne(flags, t1, notShort);
+      // stos
+      __ load_signed_short(x10, field);
+      __ push(stos);
+      __ j(Done);
+
+      __ bind(notShort);
+      __ mv(t1, btos);
+      __ bne(flags, t1, notByte);
+      // btos
+      __ load_signed_byte(x10, field);
+      __ push(btos);
+      __ j(Done);
+
+      __ bind(notByte);
+      __ mv(t1, ctos);
+      __ bne(flags, t1, notChar);
+      // ctos
+      __ load_unsigned_short(x10, field);
+      __ push(ctos);
+      __ j(Done);
+
+      __ bind(notChar);
+      __ mv(t1, ztos);
+      __ bne(flags, t1, notBool);
+      // ztos
+      __ load_signed_byte(x10, field);
+      __ push(ztos);
+      __ j(Done);
+
+      __ bind(notBool);
+      break;
+    }
+
+    case Bytecodes::_ldc2_w: {
+      Label notLong, notDouble;
+      __ mv(t1, ltos);
+      __ bne(flags, t1, notLong);
+      // ltos
+      __ ld(x10, field);
+      __ push(ltos);
+      __ j(Done);
+
+      __ bind(notLong);
+      __ mv(t1, dtos);
+      __ bne(flags, t1, notDouble);
+      // dtos
+      __ load_double(field);
+      __ push(dtos);
+      __ j(Done);
+
+      __ bind(notDouble);
+      break;
+    }
+
+    default:
+      ShouldNotReachHere();
+  }
+
+  __ stop("bad ldc/condy");
+}
+
+void TemplateTable::locals_index(Register reg, int offset)
+{
+  __ lbu(reg, at_bcp(offset));
+  __ neg(reg, reg);
+}
+
+void TemplateTable::iload() {
+  iload_internal();
+}
+
+void TemplateTable::nofast_iload() {
+  iload_internal(may_not_rewrite);
+}
+
+void TemplateTable::iload_internal(RewriteControl rc) {
+  transition(vtos, itos);
+  if (RewriteFrequentPairs && rc == may_rewrite) {
+    Label rewrite, done;
+    const Register bc = x14;
+
+    // get next bytecode
+    __ load_unsigned_byte(x11, at_bcp(Bytecodes::length_for(Bytecodes::_iload)));
+
+    // if _iload, wait to rewrite to iload2.  We only want to rewrite the
+    // last two iloads in a pair.  Comparing against fast_iload means that
+    // the next bytecode is neither an iload or a caload, and therefore
+    // an iload pair.
+    __ mv(t1, Bytecodes::_iload);
+    __ beq(x11, t1, done);
+
+    // if _fast_iload rewrite to _fast_iload2
+    __ mv(t1, Bytecodes::_fast_iload);
+    __ mv(bc, Bytecodes::_fast_iload2);
+    __ beq(x11, t1, rewrite);
+
+    // if _caload rewrite to _fast_icaload
+    __ mv(t1, Bytecodes::_caload);
+    __ mv(bc, Bytecodes::_fast_icaload);
+    __ beq(x11, t1, rewrite);
+
+    // else rewrite to _fast_iload
+    __ mv(bc, Bytecodes::_fast_iload);
+
+    // rewrite
+    // bc: new bytecode
+    __ bind(rewrite);
+    patch_bytecode(Bytecodes::_iload, bc, x11, false);
+    __ bind(done);
+
+  }
+
+  // do iload, get the local value into tos
+  locals_index(x11);
+  __ lw(x10, iaddress(x11, x10, _masm));
+}
+
+void TemplateTable::fast_iload2()
+{
+  transition(vtos, itos);
+  locals_index(x11);
+  __ lw(x10, iaddress(x11, x10, _masm));
+  __ push(itos);
+  locals_index(x11, 3);
+  __ lw(x10, iaddress(x11, x10, _masm));
+}
+
+void TemplateTable::fast_iload()
+{
+  transition(vtos, itos);
+  locals_index(x11);
+  __ lw(x10, iaddress(x11, x10, _masm));
+}
+
+void TemplateTable::lload()
+{
+  transition(vtos, ltos);
+  __ lbu(x11, at_bcp(1));
+  __ slli(x11, x11, LogBytesPerWord);
+  __ sub(x11, xlocals, x11);
+  __ ld(x10, Address(x11, Interpreter::local_offset_in_bytes(1)));
+}
+
+void TemplateTable::fload()
+{
+  transition(vtos, ftos);
+  locals_index(x11);
+  __ flw(f10, faddress(x11, t0, _masm));
+}
+
+void TemplateTable::dload()
+{
+  transition(vtos, dtos);
+  __ lbu(x11, at_bcp(1));
+  __ slli(x11, x11, LogBytesPerWord);
+  __ sub(x11, xlocals, x11);
+  __ fld(f10, Address(x11, Interpreter::local_offset_in_bytes(1)));
+}
+
+void TemplateTable::aload()
+{
+  transition(vtos, atos);
+  locals_index(x11);
+  __ ld(x10, iaddress(x11, x10, _masm));
+
+}
+
+void TemplateTable::locals_index_wide(Register reg) {
+  __ lhu(reg, at_bcp(2));
+  __ revb_h_h_u(reg, reg); // reverse bytes in half-word and zero-extend
+  __ neg(reg, reg);
+}
+
+void TemplateTable::wide_iload() {
+  transition(vtos, itos);
+  locals_index_wide(x11);
+  __ lw(x10, iaddress(x11, t0, _masm));
+}
+
+void TemplateTable::wide_lload()
+{
+  transition(vtos, ltos);
+  __ lhu(x11, at_bcp(2));
+  __ revb_h_h_u(x11, x11); // reverse bytes in half-word and zero-extend
+  __ slli(x11, x11, LogBytesPerWord);
+  __ sub(x11, xlocals, x11);
+  __ ld(x10, Address(x11, Interpreter::local_offset_in_bytes(1)));
+}
+
+void TemplateTable::wide_fload()
+{
+  transition(vtos, ftos);
+  locals_index_wide(x11);
+  __ flw(f10, faddress(x11, t0, _masm));
+}
+
+void TemplateTable::wide_dload()
+{
+  transition(vtos, dtos);
+  __ lhu(x11, at_bcp(2));
+  __ revb_h_h_u(x11, x11); // reverse bytes in half-word and zero-extend
+  __ slli(x11, x11, LogBytesPerWord);
+  __ sub(x11, xlocals, x11);
+  __ fld(f10, Address(x11, Interpreter::local_offset_in_bytes(1)));
+}
+
+void TemplateTable::wide_aload()
+{
+  transition(vtos, atos);
+  locals_index_wide(x11);
+  __ ld(x10, aaddress(x11, t0, _masm));
+}
+
+void TemplateTable::index_check(Register array, Register index)
+{
+  // destroys x11, t0
+  // check array
+  __ null_check(array, arrayOopDesc::length_offset_in_bytes());
+  // sign extend index for use by indexed load
+  // check index
+  const Register length = t0;
+  __ lwu(length, Address(array, arrayOopDesc::length_offset_in_bytes()));
+  if (index != x11) {
+    assert(x11 != array, "different registers");
+    __ mv(x11, index);
+  }
+  Label ok;
+  __ addw(index, index, zr);
+  __ bltu(index, length, ok);
+  __ mv(x13, array);
+  __ mv(t0, Interpreter::_throw_ArrayIndexOutOfBoundsException_entry);
+  __ jr(t0);
+  __ bind(ok);
+}
+
+void TemplateTable::iaload()
+{
+  transition(itos, itos);
+  __ mv(x11, x10);
+  __ pop_ptr(x10);
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_INT) >> 2);
+  __ shadd(x10, x11, x10, t0, 2);
+  __ access_load_at(T_INT, IN_HEAP | IS_ARRAY, x10, Address(x10), noreg, noreg);
+  __ addw(x10, x10, zr); // signed extended
+}
+
+void TemplateTable::laload()
+{
+  transition(itos, ltos);
+  __ mv(x11, x10);
+  __ pop_ptr(x10);
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_LONG) >> 3);
+  __ shadd(x10, x11, x10, t0, 3);
+  __ access_load_at(T_LONG, IN_HEAP | IS_ARRAY, x10, Address(x10), noreg, noreg);
+}
+
+void TemplateTable::faload()
+{
+  transition(itos, ftos);
+  __ mv(x11, x10);
+  __ pop_ptr(x10);
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_FLOAT) >> 2);
+  __ shadd(x10, x11, x10, t0, 2);
+  __ access_load_at(T_FLOAT, IN_HEAP | IS_ARRAY, x10, Address(x10), noreg, noreg);
+}
+
+void TemplateTable::daload()
+{
+  transition(itos, dtos);
+  __ mv(x11, x10);
+  __ pop_ptr(x10);
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_DOUBLE) >> 3);
+  __ shadd(x10, x11, x10, t0, 3);
+  __ access_load_at(T_DOUBLE, IN_HEAP | IS_ARRAY, x10, Address(x10), noreg, noreg);
+}
+
+void TemplateTable::aaload()
+{
+  transition(itos, atos);
+  __ mv(x11, x10);
+  __ pop_ptr(x10);
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_OBJECT) >> LogBytesPerHeapOop);
+  __ shadd(x10, x11, x10, t0, LogBytesPerHeapOop);
+  do_oop_load(_masm,
+              Address(x10),
+              x10,
+              IS_ARRAY);
+}
+
+void TemplateTable::baload()
+{
+  transition(itos, itos);
+  __ mv(x11, x10);
+  __ pop_ptr(x10);
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_BYTE) >> 0);
+  __ shadd(x10, x11, x10, t0, 0);
+  __ access_load_at(T_BYTE, IN_HEAP | IS_ARRAY, x10, Address(x10), noreg, noreg);
+}
+
+void TemplateTable::caload()
+{
+ transition(itos, itos);
+  __ mv(x11, x10);
+  __ pop_ptr(x10);
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_CHAR) >> 1);
+  __ shadd(x10, x11, x10, t0, 1);
+  __ access_load_at(T_CHAR, IN_HEAP | IS_ARRAY, x10, Address(x10), noreg, noreg);
+}
+
+// iload followed by caload frequent pair
+void TemplateTable::fast_icaload()
+{
+  transition(vtos, itos);
+  // load index out of locals
+  locals_index(x12);
+  __ lw(x11, iaddress(x12, x11, _masm));
+  __ pop_ptr(x10);
+
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11, kills t0
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_CHAR) >> 1); // addi, max imm is 2^11
+  __ shadd(x10, x11, x10, t0, 1);
+  __ access_load_at(T_CHAR, IN_HEAP | IS_ARRAY, x10, Address(x10), noreg, noreg);
+}
+
+void TemplateTable::saload()
+{
+  transition(itos, itos);
+  __ mv(x11, x10);
+  __ pop_ptr(x10);
+  // x10: array
+  // x11: index
+  index_check(x10, x11); // leaves index in x11, kills t0
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_SHORT) >> 1);
+  __ shadd(x10, x11, x10, t0, 1);
+  __ access_load_at(T_SHORT, IN_HEAP | IS_ARRAY, x10, Address(x10), noreg, noreg);
+}
+
+void TemplateTable::iload(int n)
+{
+  transition(vtos, itos);
+  __ lw(x10, iaddress(n));
+}
+
+void TemplateTable::lload(int n)
+{
+  transition(vtos, ltos);
+  __ ld(x10, laddress(n));
+}
+
+void TemplateTable::fload(int n)
+{
+  transition(vtos, ftos);
+  __ flw(f10, faddress(n));
+}
+
+void TemplateTable::dload(int n)
+{
+  transition(vtos, dtos);
+  __ fld(f10, daddress(n));
+}
+
+void TemplateTable::aload(int n)
+{
+  transition(vtos, atos);
+  __ ld(x10, iaddress(n));
+}
+
+void TemplateTable::aload_0() {
+  aload_0_internal();
+}
+
+void TemplateTable::nofast_aload_0() {
+  aload_0_internal(may_not_rewrite);
+}
+
+void TemplateTable::aload_0_internal(RewriteControl rc) {
+  // According to bytecode histograms, the pairs:
+  //
+  // _aload_0, _fast_igetfield
+  // _aload_0, _fast_agetfield
+  // _aload_0, _fast_fgetfield
+  //
+  // occur frequently. If RewriteFrequentPairs is set, the (slow)
+  // _aload_0 bytecode checks if the next bytecode is either
+  // _fast_igetfield, _fast_agetfield or _fast_fgetfield and then
+  // rewrites the current bytecode into a pair bytecode; otherwise it
+  // rewrites the current bytecode into _fast_aload_0 that doesn't do
+  // the pair check anymore.
+  //
+  // Note: If the next bytecode is _getfield, the rewrite must be
+  //       delayed, otherwise we may miss an opportunity for a pair.
+  //
+  // Also rewrite frequent pairs
+  //   aload_0, aload_1
+  //   aload_0, iload_1
+  // These bytecodes with a small amount of code are most profitable
+  // to rewrite
+  if (RewriteFrequentPairs && rc == may_rewrite) {
+    Label rewrite, done;
+    const Register bc = x14;
+
+    // get next bytecode
+    __ load_unsigned_byte(x11, at_bcp(Bytecodes::length_for(Bytecodes::_aload_0)));
+
+    // if _getfield then wait with rewrite
+    __ mv(t1, Bytecodes::Bytecodes::_getfield);
+    __ beq(x11, t1, done);
+
+    // if _igetfield then rewrite to _fast_iaccess_0
+    assert(Bytecodes::java_code(Bytecodes::_fast_iaccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
+    __ mv(t1, Bytecodes::_fast_igetfield);
+    __ mv(bc, Bytecodes::_fast_iaccess_0);
+    __ beq(x11, t1, rewrite);
+
+    // if _agetfield then rewrite to _fast_aaccess_0
+    assert(Bytecodes::java_code(Bytecodes::_fast_aaccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
+    __ mv(t1, Bytecodes::_fast_agetfield);
+    __ mv(bc, Bytecodes::_fast_aaccess_0);
+    __ beq(x11, t1, rewrite);
+
+    // if _fgetfield then rewrite to _fast_faccess_0
+    assert(Bytecodes::java_code(Bytecodes::_fast_faccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
+    __ mv(t1, Bytecodes::_fast_fgetfield);
+    __ mv(bc, Bytecodes::_fast_faccess_0);
+    __ beq(x11, t1, rewrite);
+
+    // else rewrite to _fast_aload0
+    assert(Bytecodes::java_code(Bytecodes::_fast_aload_0) == Bytecodes::_aload_0, "fix bytecode definition");
+    __ mv(bc, Bytecodes::Bytecodes::_fast_aload_0);
+
+    // rewrite
+    // bc: new bytecode
+    __ bind(rewrite);
+    patch_bytecode(Bytecodes::_aload_0, bc, x11, false);
+
+    __ bind(done);
+  }
+
+  // Do actual aload_0 (must do this after patch_bytecode which might call VM and GC might change oop).
+  aload(0);
+}
+
+void TemplateTable::istore()
+{
+  transition(itos, vtos);
+  locals_index(x11);
+  __ sw(x10, iaddress(x11, t0, _masm));
+}
+
+void TemplateTable::lstore()
+{
+  transition(ltos, vtos);
+  locals_index(x11);
+  __ sd(x10, laddress(x11, t0, _masm));
+}
+
+void TemplateTable::fstore() {
+  transition(ftos, vtos);
+  locals_index(x11);
+  __ fsw(f10, iaddress(x11, t0, _masm));
+}
+
+void TemplateTable::dstore() {
+  transition(dtos, vtos);
+  locals_index(x11);
+  __ fsd(f10, daddress(x11, t0, _masm));
+}
+
+void TemplateTable::astore()
+{
+  transition(vtos, vtos);
+  __ pop_ptr(x10);
+  locals_index(x11);
+  __ sd(x10, aaddress(x11, t0, _masm));
+}
+
+void TemplateTable::wide_istore() {
+  transition(vtos, vtos);
+  __ pop_i();
+  locals_index_wide(x11);
+  __ sw(x10, iaddress(x11, t0, _masm));
+}
+
+void TemplateTable::wide_lstore() {
+  transition(vtos, vtos);
+  __ pop_l();
+  locals_index_wide(x11);
+  __ sd(x10, laddress(x11, t0, _masm));
+}
+
+void TemplateTable::wide_fstore() {
+  transition(vtos, vtos);
+  __ pop_f();
+  locals_index_wide(x11);
+  __ fsw(f10, faddress(x11, t0, _masm));
+}
+
+void TemplateTable::wide_dstore() {
+  transition(vtos, vtos);
+  __ pop_d();
+  locals_index_wide(x11);
+  __ fsd(f10, daddress(x11, t0, _masm));
+}
+
+void TemplateTable::wide_astore() {
+  transition(vtos, vtos);
+  __ pop_ptr(x10);
+  locals_index_wide(x11);
+  __ sd(x10, aaddress(x11, t0, _masm));
+}
+
+void TemplateTable::iastore() {
+  transition(itos, vtos);
+  __ pop_i(x11);
+  __ pop_ptr(x13);
+  // x10: value
+  // x11: index
+  // x13: array
+  index_check(x13, x11); // prefer index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_INT) >> 2);
+  __ shadd(t0, x11, x13, t0, 2);
+  __ access_store_at(T_INT, IN_HEAP | IS_ARRAY, Address(t0, 0), x10, noreg, noreg);
+}
+
+void TemplateTable::lastore() {
+  transition(ltos, vtos);
+  __ pop_i(x11);
+  __ pop_ptr(x13);
+  // x10: value
+  // x11: index
+  // x13: array
+  index_check(x13, x11); // prefer index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_LONG) >> 3);
+  __ shadd(t0, x11, x13, t0, 3);
+  __ access_store_at(T_LONG, IN_HEAP | IS_ARRAY, Address(t0, 0), x10, noreg, noreg);
+}
+
+void TemplateTable::fastore() {
+  transition(ftos, vtos);
+  __ pop_i(x11);
+  __ pop_ptr(x13);
+  // f10: value
+  // x11:  index
+  // x13:  array
+  index_check(x13, x11); // prefer index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_FLOAT) >> 2);
+  __ shadd(t0, x11, x13, t0, 2);
+  __ access_store_at(T_FLOAT, IN_HEAP | IS_ARRAY, Address(t0, 0), noreg /* ftos */, noreg, noreg);
+}
+
+void TemplateTable::dastore() {
+  transition(dtos, vtos);
+  __ pop_i(x11);
+  __ pop_ptr(x13);
+  // f10: value
+  // x11:  index
+  // x13:  array
+  index_check(x13, x11); // prefer index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_DOUBLE) >> 3);
+  __ shadd(t0, x11, x13, t0, 3);
+  __ access_store_at(T_DOUBLE, IN_HEAP | IS_ARRAY, Address(t0, 0), noreg /* dtos */, noreg, noreg);
+}
+
+void TemplateTable::aastore() {
+  Label is_null, ok_is_subtype, done;
+  transition(vtos, vtos);
+  // stack: ..., array, index, value
+  __ ld(x10, at_tos());    // value
+  __ ld(x12, at_tos_p1()); // index
+  __ ld(x13, at_tos_p2()); // array
+
+  index_check(x13, x12);     // kills x11
+  __ add(x14, x12, arrayOopDesc::base_offset_in_bytes(T_OBJECT) >> LogBytesPerHeapOop);
+  __ shadd(x14, x14, x13, x14, LogBytesPerHeapOop);
+
+  Address element_address(x14, 0);
+
+  // do array store check - check for NULL value first
+  __ beqz(x10, is_null);
+
+  // Move subklass into x11
+  __ load_klass(x11, x10);
+  // Move superklass into x10
+  __ load_klass(x10, x13);
+  __ ld(x10, Address(x10,
+                     ObjArrayKlass::element_klass_offset()));
+  // Compress array + index * oopSize + 12 into a single register.  Frees x12.
+
+  // Generate subtype check.  Blows x12, x15
+  // Superklass in x10.  Subklass in x11.
+  __ gen_subtype_check(x11, ok_is_subtype); //todo
+
+  // Come here on failure
+  // object is at TOS
+  __ j(Interpreter::_throw_ArrayStoreException_entry);
+
+  // Come here on success
+  __ bind(ok_is_subtype);
+
+  // Get the value we will store
+  __ ld(x10, at_tos());
+  // Now store using the appropriate barrier
+  do_oop_store(_masm, element_address, x10, IS_ARRAY);
+  __ j(done);
+
+  // Have a NULL in x10, x13=array, x12=index.  Store NULL at ary[idx]
+  __ bind(is_null);
+  __ profile_null_seen(x12);
+
+  // Store a NULL
+  do_oop_store(_masm, element_address, noreg, IS_ARRAY);
+
+  // Pop stack arguments
+  __ bind(done);
+  __ add(esp, esp, 3 * Interpreter::stackElementSize);
+
+}
+
+void TemplateTable::bastore()
+{
+  transition(itos, vtos);
+  __ pop_i(x11);
+  __ pop_ptr(x13);
+  // x10: value
+  // x11: index
+  // x13: array
+  index_check(x13, x11); // prefer index in x11
+
+  // Need to check whether array is boolean or byte
+  // since both types share the bastore bytecode.
+  __ load_klass(x12, x13);
+  __ lwu(x12, Address(x12, Klass::layout_helper_offset()));
+  Label L_skip;
+  __ andi(t0, x12, Klass::layout_helper_boolean_diffbit());
+  __ beqz(t0, L_skip);
+  __ andi(x10, x10, 1);  // if it is a T_BOOLEAN array, mask the stored value to 0/1
+  __ bind(L_skip);
+
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_BYTE) >> 0);
+
+  __ add(x11, x13, x11);
+  __ access_store_at(T_BYTE, IN_HEAP | IS_ARRAY, Address(x11, 0), x10, noreg, noreg);
+}
+
+void TemplateTable::castore()
+{
+  transition(itos, vtos);
+  __ pop_i(x11);
+  __ pop_ptr(x13);
+  // x10: value
+  // x11: index
+  // x13: array
+  index_check(x13, x11); // prefer index in x11
+  __ add(x11, x11, arrayOopDesc::base_offset_in_bytes(T_CHAR) >> 1);
+  __ shadd(t0, x11, x13, t0, 1);
+  __ access_store_at(T_CHAR, IN_HEAP | IS_ARRAY, Address(t0, 0), x10, noreg, noreg);
+}
+
+void TemplateTable::sastore()
+{
+  castore();
+}
+
+void TemplateTable::istore(int n)
+{
+  transition(itos, vtos);
+  __ sd(x10, iaddress(n));
+}
+
+void TemplateTable::lstore(int n)
+{
+  transition(ltos, vtos);
+  __ sd(x10, laddress(n));
+}
+
+void TemplateTable::fstore(int n)
+{
+  transition(ftos, vtos);
+  __ fsw(f10, faddress(n));
+}
+
+void TemplateTable::dstore(int n)
+{
+  transition(dtos, vtos);
+  __ fsd(f10, daddress(n));
+}
+
+void TemplateTable::astore(int n)
+{
+  transition(vtos, vtos);
+  __ pop_ptr(x10);
+  __ sd(x10, iaddress(n));
+}
+
+void TemplateTable::pop()
+{
+  transition(vtos, vtos);
+  __ addi(esp, esp, Interpreter::stackElementSize);
+}
+
+void TemplateTable::pop2()
+{
+  transition(vtos, vtos);
+  __ addi(esp, esp, 2 * Interpreter::stackElementSize);
+}
+
+void TemplateTable::dup()
+{
+  transition(vtos, vtos);
+  __ ld(x10, Address(esp, 0));
+  __ push_reg(x10);
+  // stack: ..., a, a
+}
+
+void TemplateTable::dup_x1()
+{
+  transition(vtos, vtos);
+  // stack: ..., a, b
+  __ ld(x10, at_tos());  // load b
+  __ ld(x12, at_tos_p1());  // load a
+  __ sd(x10, at_tos_p1());  // store b
+  __ sd(x12, at_tos());  // store a
+  __ push_reg(x10);                  // push b
+  // stack: ..., b, a, b
+}
+
+void TemplateTable::dup_x2()
+{
+  transition(vtos, vtos);
+  // stack: ..., a, b, c
+  __ ld(x10, at_tos());  // load c
+  __ ld(x12, at_tos_p2());  // load a
+  __ sd(x10, at_tos_p2());  // store c in a
+  __ push_reg(x10);      // push c
+  // stack: ..., c, b, c, c
+  __ ld(x10, at_tos_p2());  // load b
+  __ sd(x12, at_tos_p2());  // store a in b
+  // stack: ..., c, a, c, c
+  __ sd(x10, at_tos_p1());  // store b in c
+  // stack: ..., c, a, b, c
+}
+
+void TemplateTable::dup2()
+{
+  transition(vtos, vtos);
+  // stack: ..., a, b
+  __ ld(x10, at_tos_p1());  // load a
+  __ push_reg(x10);                  // push a
+  __ ld(x10, at_tos_p1());  // load b
+  __ push_reg(x10);                  // push b
+  // stack: ..., a, b, a, b
+}
+
+void TemplateTable::dup2_x1()
+{
+  transition(vtos, vtos);
+  // stack: ..., a, b, c
+  __ ld(x12, at_tos());     // load c
+  __ ld(x10, at_tos_p1());  // load b
+  __ push_reg(x10);             // push b
+  __ push_reg(x12);             // push c
+  // stack: ..., a, b, c, b, c
+  __ sd(x12, at_tos_p3());  // store c in b
+  // stack: ..., a, c, c, b, c
+  __ ld(x12, at_tos_p4());  // load a
+  __ sd(x12, at_tos_p2());  // store a in 2nd c
+  // stack: ..., a, c, a, b, c
+  __ sd(x10, at_tos_p4());  // store b in a
+  // stack: ..., b, c, a, b, c
+}
+
+void TemplateTable::dup2_x2()
+{
+  transition(vtos, vtos);
+  // stack: ..., a, b, c, d
+  __ ld(x12, at_tos());     // load d
+  __ ld(x10, at_tos_p1());  // load c
+  __ push_reg(x10);             // push c
+  __ push_reg(x12);             // push d
+  // stack: ..., a, b, c, d, c, d
+  __ ld(x10, at_tos_p4());  // load b
+  __ sd(x10, at_tos_p2());  // store b in d
+  __ sd(x12, at_tos_p4());  // store d in b
+  // stack: ..., a, d, c, b, c, d
+  __ ld(x12, at_tos_p5());  // load a
+  __ ld(x10, at_tos_p3());  // load c
+  __ sd(x12, at_tos_p3());  // store a in c
+  __ sd(x10, at_tos_p5());  // store c in a
+  // stack: ..., c, d, a, b, c, d
+}
+
+void TemplateTable::swap()
+{
+  transition(vtos, vtos);
+  // stack: ..., a, b
+  __ ld(x12, at_tos_p1());  // load a
+  __ ld(x10, at_tos());     // load b
+  __ sd(x12, at_tos());     // store a in b
+  __ sd(x10, at_tos_p1());  // store b in a
+  // stack: ..., b, a
+}
+
+void TemplateTable::iop2(Operation op)
+{
+  transition(itos, itos);
+  // x10 <== x11 op x10
+  __ pop_i(x11);
+  switch (op) {
+    case add  : __ addw(x10, x11, x10);  break;
+    case sub  : __ subw(x10, x11, x10);  break;
+    case mul  : __ mulw(x10, x11, x10);  break;
+    case _and : __ andrw(x10, x11, x10); break;
+    case _or  : __ orrw(x10, x11, x10);  break;
+    case _xor : __ xorrw(x10, x11, x10); break;
+    case shl  : __ sllw(x10, x11, x10);  break;
+    case shr  : __ sraw(x10, x11, x10);  break;
+    case ushr : __ srlw(x10, x11, x10);  break;
+    default   : ShouldNotReachHere();
+  }
+}
+
+void TemplateTable::lop2(Operation op)
+{
+  transition(ltos, ltos);
+  // x10 <== x11 op x10
+  __ pop_l(x11);
+  switch (op) {
+    case add  : __ add(x10, x11, x10);  break;
+    case sub  : __ sub(x10, x11, x10);  break;
+    case mul  : __ mul(x10, x11, x10);  break;
+    case _and : __ andr(x10, x11, x10); break;
+    case _or  : __ orr(x10, x11, x10);  break;
+    case _xor : __ xorr(x10, x11, x10); break;
+    default   : ShouldNotReachHere();
+  }
+}
+
+void TemplateTable::idiv()
+{
+  transition(itos, itos);
+  // explicitly check for div0
+  Label no_div0;
+  __ bnez(x10, no_div0);
+  __ mv(t0, Interpreter::_throw_ArithmeticException_entry);
+  __ jr(t0);
+  __ bind(no_div0);
+  __ pop_i(x11);
+  // x10 <== x11 idiv x10
+  __ corrected_idivl(x10, x11, x10, /* want_remainder */ false);
+}
+
+void TemplateTable::irem()
+{
+  transition(itos, itos);
+  // explicitly check for div0
+  Label no_div0;
+  __ bnez(x10, no_div0);
+  __ mv(t0, Interpreter::_throw_ArithmeticException_entry);
+  __ jr(t0);
+  __ bind(no_div0);
+  __ pop_i(x11);
+  // x10 <== x11 irem x10
+  __ corrected_idivl(x10, x11, x10, /* want_remainder */ true);
+}
+
+void TemplateTable::lmul()
+{
+  transition(ltos, ltos);
+  __ pop_l(x11);
+  __ mul(x10, x10, x11);
+}
+
+void TemplateTable::ldiv()
+{
+  transition(ltos, ltos);
+  // explicitly check for div0
+  Label no_div0;
+  __ bnez(x10, no_div0);
+  __ mv(t0, Interpreter::_throw_ArithmeticException_entry);
+  __ jr(t0);
+  __ bind(no_div0);
+  __ pop_l(x11);
+  // x10 <== x11 ldiv x10
+  __ corrected_idivq(x10, x11, x10, /* want_remainder */ false);
+}
+
+void TemplateTable::lrem()
+{
+  transition(ltos, ltos);
+  // explicitly check for div0
+  Label no_div0;
+  __ bnez(x10, no_div0);
+  __ mv(t0, Interpreter::_throw_ArithmeticException_entry);
+  __ jr(t0);
+  __ bind(no_div0);
+  __ pop_l(x11);
+  // x10 <== x11 lrem x10
+  __ corrected_idivq(x10, x11, x10, /* want_remainder */ true);
+}
+
+void TemplateTable::lshl()
+{
+  transition(itos, ltos);
+  // shift count is in x10
+  __ pop_l(x11);
+  __ sll(x10, x11, x10);
+}
+
+void TemplateTable::lshr()
+{
+  transition(itos, ltos);
+  // shift count is in x10
+  __ pop_l(x11);
+  __ sra(x10, x11, x10);
+}
+
+void TemplateTable::lushr()
+{
+  transition(itos, ltos);
+  // shift count is in x10
+  __ pop_l(x11);
+  __ srl(x10, x11, x10);
+}
+
+void TemplateTable::fop2(Operation op)
+{
+  transition(ftos, ftos);
+  switch (op) {
+    case add:
+      __ pop_f(f11);
+      __ fadd_s(f10, f11, f10);
+      break;
+    case sub:
+      __ pop_f(f11);
+      __ fsub_s(f10, f11, f10);
+      break;
+    case mul:
+      __ pop_f(f11);
+      __ fmul_s(f10, f11, f10);
+      break;
+    case div:
+      __ pop_f(f11);
+      __ fdiv_s(f10, f11, f10);
+      break;
+    case rem:
+      __ fmv_s(f11, f10);
+      __ pop_f(f10);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::frem));
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void TemplateTable::dop2(Operation op)
+{
+  transition(dtos, dtos);
+  switch (op) {
+    case add:
+      __ pop_d(f11);
+      __ fadd_d(f10, f11, f10);
+      break;
+    case sub:
+      __ pop_d(f11);
+      __ fsub_d(f10, f11, f10);
+      break;
+    case mul:
+      __ pop_d(f11);
+      __ fmul_d(f10, f11, f10);
+      break;
+    case div:
+      __ pop_d(f11);
+      __ fdiv_d(f10, f11, f10);
+      break;
+    case rem:
+      __ fmv_d(f11, f10);
+      __ pop_d(f10);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::drem));
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void TemplateTable::ineg()
+{
+  transition(itos, itos);
+  __ negw(x10, x10);
+}
+
+void TemplateTable::lneg()
+{
+  transition(ltos, ltos);
+  __ neg(x10, x10);
+}
+
+void TemplateTable::fneg()
+{
+  transition(ftos, ftos);
+  __ fneg_s(f10, f10);
+}
+
+void TemplateTable::dneg()
+{
+  transition(dtos, dtos);
+  __ fneg_d(f10, f10);
+}
+
+void TemplateTable::iinc()
+{
+  transition(vtos, vtos);
+  __ load_signed_byte(x11, at_bcp(2)); // get constant
+  locals_index(x12);
+  __ ld(x10, iaddress(x12, x10, _masm));
+  __ addw(x10, x10, x11);
+  __ sd(x10, iaddress(x12, t0, _masm));
+}
+
+void TemplateTable::wide_iinc()
+{
+  transition(vtos, vtos);
+  __ lwu(x11, at_bcp(2)); // get constant and index
+  __ revb_h_w_u(x11, x11); // reverse bytes in half-word (32bit) and zero-extend
+  __ zero_extend(x12, x11, 16);
+  __ neg(x12, x12);
+  __ slli(x11, x11, 32);
+  __ srai(x11, x11, 48);
+  __ ld(x10, iaddress(x12, t0, _masm));
+  __ addw(x10, x10, x11);
+  __ sd(x10, iaddress(x12, t0, _masm));
+}
+
+void TemplateTable::convert()
+{
+  // Checking
+#ifdef ASSERT
+  {
+    TosState tos_in  = ilgl;
+    TosState tos_out = ilgl;
+    switch (bytecode()) {
+      case Bytecodes::_i2l: // fall through
+      case Bytecodes::_i2f: // fall through
+      case Bytecodes::_i2d: // fall through
+      case Bytecodes::_i2b: // fall through
+      case Bytecodes::_i2c: // fall through
+      case Bytecodes::_i2s: tos_in = itos; break;
+      case Bytecodes::_l2i: // fall through
+      case Bytecodes::_l2f: // fall through
+      case Bytecodes::_l2d: tos_in = ltos; break;
+      case Bytecodes::_f2i: // fall through
+      case Bytecodes::_f2l: // fall through
+      case Bytecodes::_f2d: tos_in = ftos; break;
+      case Bytecodes::_d2i: // fall through
+      case Bytecodes::_d2l: // fall through
+      case Bytecodes::_d2f: tos_in = dtos; break;
+      default             : ShouldNotReachHere();
+    }
+    switch (bytecode()) {
+      case Bytecodes::_l2i: // fall through
+      case Bytecodes::_f2i: // fall through
+      case Bytecodes::_d2i: // fall through
+      case Bytecodes::_i2b: // fall through
+      case Bytecodes::_i2c: // fall through
+      case Bytecodes::_i2s: tos_out = itos; break;
+      case Bytecodes::_i2l: // fall through
+      case Bytecodes::_f2l: // fall through
+      case Bytecodes::_d2l: tos_out = ltos; break;
+      case Bytecodes::_i2f: // fall through
+      case Bytecodes::_l2f: // fall through
+      case Bytecodes::_d2f: tos_out = ftos; break;
+      case Bytecodes::_i2d: // fall through
+      case Bytecodes::_l2d: // fall through
+      case Bytecodes::_f2d: tos_out = dtos; break;
+      default             : ShouldNotReachHere();
+    }
+    transition(tos_in, tos_out);
+  }
+#endif // ASSERT
+
+  // Conversion
+  switch (bytecode()) {
+    case Bytecodes::_i2l:
+      __ sign_extend(x10, x10, 32);
+      break;
+    case Bytecodes::_i2f:
+      __ fcvt_s_w(f10, x10);
+      break;
+    case Bytecodes::_i2d:
+      __ fcvt_d_w(f10, x10);
+      break;
+    case Bytecodes::_i2b:
+      __ sign_extend(x10, x10, 8);
+      break;
+    case Bytecodes::_i2c:
+      __ zero_extend(x10, x10, 16);
+      break;
+    case Bytecodes::_i2s:
+      __ sign_extend(x10, x10, 16);
+      break;
+    case Bytecodes::_l2i:
+      __ addw(x10, x10, zr);
+      break;
+    case Bytecodes::_l2f:
+      __ fcvt_s_l(f10, x10);
+      break;
+    case Bytecodes::_l2d:
+      __ fcvt_d_l(f10, x10);
+      break;
+    case Bytecodes::_f2i:
+      __ fcvt_w_s_safe(x10, f10);
+      break;
+    case Bytecodes::_f2l:
+      __ fcvt_l_s_safe(x10, f10);
+      break;
+    case Bytecodes::_f2d:
+      __ fcvt_d_s(f10, f10);
+      break;
+    case Bytecodes::_d2i:
+      __ fcvt_w_d_safe(x10, f10);
+      break;
+    case Bytecodes::_d2l:
+      __ fcvt_l_d_safe(x10, f10);
+      break;
+    case Bytecodes::_d2f:
+      __ fcvt_s_d(f10, f10);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void TemplateTable::lcmp()
+{
+  transition(ltos, itos);
+  __ pop_l(x11);
+  __ cmp_l2i(t0, x11, x10);
+  __ mv(x10, t0);
+}
+
+void TemplateTable::float_cmp(bool is_float, int unordered_result)
+{
+  // For instruction feq, flt and fle, the result is 0 if either operand is NaN
+  if (is_float) {
+    __ pop_f(f11);
+    // if unordered_result < 0:
+    //   we want -1 for unordered or less than, 0 for equal and 1 for
+    //   greater than.
+    // else:
+    //   we want -1 for less than, 0 for equal and 1 for unordered or
+    //   greater than.
+    // f11 primary, f10 secondary
+    __ float_compare(x10, f11, f10, unordered_result);
+  } else {
+    __ pop_d(f11);
+    // if unordered_result < 0:
+    //   we want -1 for unordered or less than, 0 for equal and 1 for
+    //   greater than.
+    // else:
+    //   we want -1 for less than, 0 for equal and 1 for unordered or
+    //   greater than.
+    // f11 primary, f10 secondary
+    __ double_compare(x10, f11, f10, unordered_result);
+  }
+}
+
+void TemplateTable::branch(bool is_jsr, bool is_wide)
+{
+  // We might be moving to a safepoint.  The thread which calls
+  // Interpreter::notice_safepoints() will effectively flush its cache
+  // when it makes a system call, but we need to do something to
+  // ensure that we see the changed dispatch table.
+  __ membar(MacroAssembler::LoadLoad);
+
+  __ profile_taken_branch(x10, x11);
+  const ByteSize be_offset = MethodCounters::backedge_counter_offset() +
+                             InvocationCounter::counter_offset();
+  const ByteSize inv_offset = MethodCounters::invocation_counter_offset() +
+                              InvocationCounter::counter_offset();
+
+  // load branch displacement
+  if (!is_wide) {
+    __ lhu(x12, at_bcp(1));
+    __ revb_h_h(x12, x12); // reverse bytes in half-word and sign-extend
+  } else {
+    __ lwu(x12, at_bcp(1));
+    __ revb_w_w(x12, x12); // reverse bytes in word and sign-extend
+  }
+
+  // Handle all the JSR stuff here, then exit.
+  // It's much shorter and cleaner than intermingling with the non-JSR
+  // normal-branch stuff occurring below.
+
+  if (is_jsr) {
+    // compute return address as bci
+    __ ld(t1, Address(xmethod, Method::const_offset()));
+    __ add(t1, t1,
+           in_bytes(ConstMethod::codes_offset()) - (is_wide ? 5 : 3));
+    __ sub(x11, xbcp, t1);
+    __ push_i(x11);
+    // Adjust the bcp by the 16-bit displacement in x12
+    __ add(xbcp, xbcp, x12);
+    __ load_unsigned_byte(t0, Address(xbcp, 0));
+    // load the next target bytecode into t0, it is the argument of dispatch_only
+    __ dispatch_only(vtos, /*generate_poll*/true);
+    return;
+  }
+
+  // Normal (non-jsr) branch handling
+
+  // Adjust the bcp by the displacement in x12
+  __ add(xbcp, xbcp, x12);
+
+  assert(UseLoopCounter || !UseOnStackReplacement,
+         "on-stack-replacement requires loop counters");
+  Label backedge_counter_overflow;
+  Label dispatch;
+  if (UseLoopCounter) {
+    // increment backedge counter for backward branches
+    // x10: MDO
+    // x11: MDO bumped taken-count
+    // x12: target offset
+    __ bgtz(x12, dispatch); // count only if backward branch
+
+    // check if MethodCounters exists
+    Label has_counters;
+    __ ld(t0, Address(xmethod, Method::method_counters_offset()));
+    __ bnez(t0, has_counters);
+    __ push_reg(x10);
+    __ push_reg(x11);
+    __ push_reg(x12);
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address,
+            InterpreterRuntime::build_method_counters), xmethod);
+    __ pop_reg(x12);
+    __ pop_reg(x11);
+    __ pop_reg(x10);
+    __ ld(t0, Address(xmethod, Method::method_counters_offset()));
+    __ beqz(t0, dispatch); // No MethodCounters allocated, OutOfMemory
+    __ bind(has_counters);
+
+    Label no_mdo;
+    int increment = InvocationCounter::count_increment;
+    if (ProfileInterpreter) {
+      // Are we profiling?
+      __ ld(x11, Address(xmethod, in_bytes(Method::method_data_offset())));
+      __ beqz(x11, no_mdo);
+      // Increment the MDO backedge counter
+      const Address mdo_backedge_counter(x11, in_bytes(MethodData::backedge_counter_offset()) +
+                                         in_bytes(InvocationCounter::counter_offset()));
+      const Address mask(x11, in_bytes(MethodData::backedge_mask_offset()));
+      __ increment_mask_and_jump(mdo_backedge_counter, increment, mask,
+                                 x10, t0, false,
+                                 UseOnStackReplacement ? &backedge_counter_overflow : &dispatch);
+      __ j(dispatch);
+    }
+    __ bind(no_mdo);
+    // Increment backedge counter in MethodCounters*
+    __ ld(t0, Address(xmethod, Method::method_counters_offset()));
+    const Address mask(t0, in_bytes(MethodCounters::backedge_mask_offset()));
+    __ increment_mask_and_jump(Address(t0, be_offset), increment, mask,
+                               x10, t1, false,
+                               UseOnStackReplacement ? &backedge_counter_overflow : &dispatch);
+    __ bind(dispatch);
+  }
+
+  // Pre-load the next target bytecode into t0
+  __ load_unsigned_byte(t0, Address(xbcp, 0));
+
+  // continue with the bytecode @ target
+  // t0: target bytecode
+  // xbcp: target bcp
+  __ dispatch_only(vtos, /*generate_poll*/true);
+
+  if (UseLoopCounter && UseOnStackReplacement) {
+    // invocation counter overflow
+    __ bind(backedge_counter_overflow);
+    __ neg(x12, x12);
+    __ add(x12, x12, xbcp);     // branch xbcp
+    // IcoResult frequency_counter_overflow([JavaThread*], address branch_bcp)
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address,
+                                InterpreterRuntime::frequency_counter_overflow),
+               x12);
+    __ load_unsigned_byte(x11, Address(xbcp, 0));  // restore target bytecode
+
+    // x10: osr nmethod (osr ok) or NULL (osr not possible)
+    // w11: target bytecode
+    // x12: temporary
+    __ beqz(x10, dispatch);     // test result -- no osr if null
+    // nmethod may have been invalidated (VM may block upon call_VM return)
+    __ lbu(x12, Address(x10, nmethod::state_offset()));
+    if (nmethod::in_use != 0) {
+      __ sub(x12, x12, nmethod::in_use);
+    }
+    __ bnez(x12, dispatch);
+
+    // We have the address of an on stack replacement routine in x10
+    // We need to prepare to execute the OSR method. First we must
+    // migrate the locals and monitors off of the stack.
+
+    __ mv(x9, x10);                             // save the nmethod
+
+    call_VM(noreg, CAST_FROM_FN_PTR(address, SharedRuntime::OSR_migration_begin));
+
+    // x10 is OSR buffer, move it to expected parameter location
+    __ mv(j_rarg0, x10);
+
+    // remove activation
+    // get sender esp
+    __ ld(esp,
+        Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize));
+    // remove frame anchor
+    __ leave();
+    // Ensure compiled code always sees stack at proper alignment
+    __ andi(sp, esp, -16);
+
+    // and begin the OSR nmethod
+    __ ld(t0, Address(x9, nmethod::osr_entry_point_offset()));
+    __ jr(t0);
+  }
+}
+
+void TemplateTable::if_0cmp(Condition cc)
+{
+  transition(itos, vtos);
+  // assume branch is more often taken than not (loops use backward branches)
+  Label not_taken;
+
+  __ addw(x10, x10, zr);
+  switch (cc) {
+    case equal:
+      __ bnez(x10, not_taken);
+      break;
+    case not_equal:
+      __ beqz(x10, not_taken);
+      break;
+    case less:
+      __ bgez(x10, not_taken);
+      break;
+    case less_equal:
+      __ bgtz(x10, not_taken);
+      break;
+    case greater:
+      __ blez(x10, not_taken);
+      break;
+    case greater_equal:
+      __ bltz(x10, not_taken);
+      break;
+    default:
+      break;
+  }
+
+  branch(false, false);
+  __ bind(not_taken);
+  __ profile_not_taken_branch(x10);
+}
+
+void TemplateTable::if_icmp(Condition cc)
+{
+  transition(itos, vtos);
+  // assume branch is more often taken than not (loops use backward branches)
+  Label not_taken;
+  __ pop_i(x11);
+  __ addw(x10, x10, zr);
+  switch (cc) {
+    case equal:
+      __ bne(x11, x10, not_taken);
+      break;
+    case not_equal:
+      __ beq(x11, x10, not_taken);
+      break;
+    case less:
+      __ bge(x11, x10, not_taken);
+      break;
+    case less_equal:
+      __ bgt(x11, x10, not_taken);
+      break;
+    case greater:
+      __ ble(x11, x10, not_taken);
+      break;
+    case greater_equal:
+      __ blt(x11, x10, not_taken);
+      break;
+    default:
+      break;
+  }
+
+  branch(false, false);
+  __ bind(not_taken);
+  __ profile_not_taken_branch(x10);
+}
+
+void TemplateTable::if_nullcmp(Condition cc)
+{
+  transition(atos, vtos);
+  // assume branch is more often taken than not (loops use backward branches)
+  Label not_taken;
+  if (cc == equal) {
+    __ bnez(x10, not_taken);
+  } else {
+    __ beqz(x10, not_taken);
+  }
+  branch(false, false);
+  __ bind(not_taken);
+  __ profile_not_taken_branch(x10);
+}
+
+void TemplateTable::if_acmp(Condition cc)
+{
+  transition(atos, vtos);
+  // assume branch is more often taken than not (loops use backward branches)
+  Label not_taken;
+  __ pop_ptr(x11);
+
+  if (cc == equal) {
+    __ bne(x11, x10, not_taken);
+  } else if (cc == not_equal) {
+    __ beq(x11, x10, not_taken);
+  }
+  branch(false, false);
+  __ bind(not_taken);
+  __ profile_not_taken_branch(x10);
+}
+
+void TemplateTable::ret() {
+  transition(vtos, vtos);
+  // We might be moving to a safepoint.  The thread which calls
+  // Interpreter::notice_safepoints() will effectively flush its cache
+  // when it makes a system call, but we need to do something to
+  // ensure that we see the changed dispatch table.
+  __ membar(MacroAssembler::LoadLoad);
+
+  locals_index(x11);
+  __ ld(x11, aaddress(x11, t1, _masm)); // get return bci, compute return bcp
+  __ profile_ret(x11, x12);
+  __ ld(xbcp, Address(xmethod, Method::const_offset()));
+  __ add(xbcp, xbcp, x11);
+  __ addi(xbcp, xbcp, in_bytes(ConstMethod::codes_offset()));
+  __ dispatch_next(vtos, 0, /*generate_poll*/true);
+}
+
+void TemplateTable::wide_ret() {
+  transition(vtos, vtos);
+  locals_index_wide(x11);
+  __ ld(x11, aaddress(x11, t0, _masm)); // get return bci, compute return bcp
+  __ profile_ret(x11, x12);
+  __ ld(xbcp, Address(xmethod, Method::const_offset()));
+  __ add(xbcp, xbcp, x11);
+  __ add(xbcp, xbcp, in_bytes(ConstMethod::codes_offset()));
+  __ dispatch_next(vtos, 0, /*generate_poll*/true);
+}
+
+void TemplateTable::tableswitch() {
+  Label default_case, continue_execution;
+  transition(itos, vtos);
+  // align xbcp
+  __ la(x11, at_bcp(BytesPerInt));
+  __ andi(x11, x11, -BytesPerInt);
+  // load lo & hi
+  __ lwu(x12, Address(x11, BytesPerInt));
+  __ lwu(x13, Address(x11, 2 * BytesPerInt));
+  __ revb_w_w(x12, x12); // reverse bytes in word (32bit) and sign-extend
+  __ revb_w_w(x13, x13); // reverse bytes in word (32bit) and sign-extend
+  // check against lo & hi
+  __ blt(x10, x12, default_case);
+  __ bgt(x10, x13, default_case);
+  // lookup dispatch offset
+  __ subw(x10, x10, x12);
+  __ shadd(x13, x10, x11, t0, 2);
+  __ lwu(x13, Address(x13, 3 * BytesPerInt));
+  __ profile_switch_case(x10, x11, x12);
+  // continue execution
+  __ bind(continue_execution);
+  __ revb_w_w(x13, x13); // reverse bytes in word (32bit) and sign-extend
+  __ add(xbcp, xbcp, x13);
+  __ load_unsigned_byte(t0, Address(xbcp));
+  __ dispatch_only(vtos, /*generate_poll*/true);
+  // handle default
+  __ bind(default_case);
+  __ profile_switch_default(x10);
+  __ lwu(x13, Address(x11, 0));
+  __ j(continue_execution);
+}
+
+void TemplateTable::lookupswitch() {
+  transition(itos, itos);
+  __ stop("lookupswitch bytecode should have been rewritten");
+}
+
+void TemplateTable::fast_linearswitch() {
+  transition(itos, vtos);
+  Label loop_entry, loop, found, continue_execution;
+  // bswap x10 so we can avoid bswapping the table entries
+  __ revb_w_w(x10, x10); // reverse bytes in word (32bit) and sign-extend
+  // align xbcp
+  __ la(x9, at_bcp(BytesPerInt)); // btw: should be able to get rid of
+                                    // this instruction (change offsets
+                                    // below)
+  __ andi(x9, x9, -BytesPerInt);
+  // set counter
+  __ lwu(x11, Address(x9, BytesPerInt));
+  __ revb_w(x11, x11);
+  __ j(loop_entry);
+  // table search
+  __ bind(loop);
+  __ shadd(t0, x11, x9, t0, 3);
+  __ lw(t0, Address(t0, 2 * BytesPerInt));
+  __ beq(x10, t0, found);
+  __ bind(loop_entry);
+  __ addi(x11, x11, -1);
+  __ bgez(x11, loop);
+  // default case
+  __ profile_switch_default(x10);
+  __ lwu(x13, Address(x9, 0));
+  __ j(continue_execution);
+  // entry found -> get offset
+  __ bind(found);
+  __ shadd(t0, x11, x9, t0, 3);
+  __ lwu(x13, Address(t0, 3 * BytesPerInt));
+  __ profile_switch_case(x11, x10, x9);
+  // continue execution
+  __ bind(continue_execution);
+  __ revb_w_w(x13, x13); // reverse bytes in word (32bit) and sign-extend
+  __ add(xbcp, xbcp, x13);
+  __ lbu(t0, Address(xbcp, 0));
+  __ dispatch_only(vtos, /*generate_poll*/true);
+}
+
+void TemplateTable::fast_binaryswitch() {
+  transition(itos, vtos);
+  // Implementation using the following core algorithm:
+  //
+  // int binary_search(int key, LookupswitchPair* array, int n)
+  //   binary_search start:
+  //   #Binary search according to "Methodik des Programmierens" by
+  //   # Edsger W. Dijkstra and W.H.J. Feijen, Addison Wesley Germany 1985.
+  //   int i = 0;
+  //   int j = n;
+  //   while (i + 1 < j) do
+  //     # invariant P: 0 <= i < j <= n and (a[i] <= key < a[j] or Q)
+  //     # with      Q: for all i: 0 <= i < n: key < a[i]
+  //     # where a stands for the array and assuming that the (inexisting)
+  //     # element a[n] is infinitely big.
+  //     int h = (i + j) >> 1
+  //     # i < h < j
+  //     if (key < array[h].fast_match())
+  //     then [j = h]
+  //     else [i = h]
+  //   end
+  //   # R: a[i] <= key < a[i+1] or Q
+  //   # (i.e., if key is within array, i is the correct index)
+  //   return i
+  // binary_search end
+
+
+  // Register allocation
+  const Register key   = x10; // already set (tosca)
+  const Register array = x11;
+  const Register i     = x12;
+  const Register j     = x13;
+  const Register h     = x14;
+  const Register temp  = x15;
+
+  // Find array start
+  __ la(array, at_bcp(3 * BytesPerInt));  // btw: should be able to
+                                          // get rid of this
+                                          // instruction (change
+                                          // offsets below)
+  __ andi(array, array, -BytesPerInt);
+
+  // Initialize i & j
+  __ mv(i, zr);                            // i = 0
+  __ lwu(j, Address(array, -BytesPerInt)); // j = length(array)
+
+  // Convert j into native byteordering
+  __ revb_w(j, j);
+
+  // And start
+  Label entry;
+  __ j(entry);
+
+  // binary search loop
+  {
+    Label loop;
+    __ bind(loop);
+    __ addw(h, i, j);                           // h = i + j
+    __ srliw(h, h, 1);                          // h = (i + j) >> 1
+    // if [key < array[h].fast_match()]
+    // then [j = h]
+    // else [i = h]
+    // Convert array[h].match to native byte-ordering before compare
+    __ shadd(temp, h, array, temp, 3);
+    __ ld(temp, Address(temp, 0));
+    __ revb_w_w(temp, temp); // reverse bytes in word (32bit) and sign-extend
+
+    Label L_done, L_greater;
+    __ bge(key, temp, L_greater);
+    // if [key < array[h].fast_match()] then j = h
+    __ mv(j, h);
+    __ j(L_done);
+    __ bind(L_greater);
+    // if [key >= array[h].fast_match()] then i = h
+    __ mv(i, h);
+    __ bind(L_done);
+
+    // while [i + 1 < j]
+    __ bind(entry);
+    __ addiw(h, i, 1);         // i + 1
+    __ blt(h, j, loop);        // i + 1 < j
+  }
+
+  // end of binary search, result index is i (must check again!)
+  Label default_case;
+  // Convert array[i].match to native byte-ordering before compare
+  __ shadd(temp, i, array, temp, 3);
+  __ ld(temp, Address(temp, 0));
+  __ revb_w_w(temp, temp); // reverse bytes in word (32bit) and sign-extend
+  __ bne(key, temp, default_case);
+
+  // entry found -> j = offset
+  __ shadd(temp, i, array, temp, 3);
+  __ lwu(j, Address(temp, BytesPerInt));
+  __ profile_switch_case(i, key, array);
+  __ revb_w_w(j, j); // reverse bytes in word (32bit) and sign-extend
+
+  __ add(temp, xbcp, j);
+  __ load_unsigned_byte(t0, Address(temp, 0));
+
+  __ add(xbcp, xbcp, j);
+  __ la(xbcp, Address(xbcp, 0));
+  __ dispatch_only(vtos, /*generate_poll*/true);
+
+  // default case -> j = default offset
+  __ bind(default_case);
+  __ profile_switch_default(i);
+  __ lwu(j, Address(array, -2 * BytesPerInt));
+  __ revb_w_w(j, j); // reverse bytes in word (32bit) and sign-extend
+
+  __ add(temp, xbcp, j);
+  __ load_unsigned_byte(t0, Address(temp, 0));
+
+  __ add(xbcp, xbcp, j);
+  __ la(xbcp, Address(xbcp, 0));
+  __ dispatch_only(vtos, /*generate_poll*/true);
+}
+
+void TemplateTable::_return(TosState state)
+{
+  transition(state, state);
+  assert(_desc->calls_vm(),
+         "inconsistent calls_vm information"); // call in remove_activation
+
+  if (_desc->bytecode() == Bytecodes::_return_register_finalizer) {
+    assert(state == vtos, "only valid state");
+
+    __ ld(c_rarg1, aaddress(0));
+    __ load_klass(x13, c_rarg1);
+    __ lwu(x13, Address(x13, Klass::access_flags_offset()));
+    Label skip_register_finalizer;
+    __ andi(t0, x13, JVM_ACC_HAS_FINALIZER);
+    __ beqz(t0, skip_register_finalizer);
+
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::register_finalizer), c_rarg1);
+
+    __ bind(skip_register_finalizer);
+  }
+
+  // Issue a StoreStore barrier after all stores but before return
+  // from any constructor for any class with a final field. We don't
+  // know if this is a finalizer, so we always do so.
+  if (_desc->bytecode() == Bytecodes::_return) {
+    __ membar(MacroAssembler::StoreStore);
+  }
+
+  // Narrow result if state is itos but result type is smaller.
+  // Need to narrow in the return bytecode rather than in generate_return_entry
+  // since compiled code callers expect the result to already be narrowed.
+  if (state == itos) {
+    __ narrow(x10);
+  }
+
+  __ remove_activation(state);
+  __ ret();
+}
+
+
+// ----------------------------------------------------------------------------
+// Volatile variables demand their effects be made known to all CPU's
+// in order.  Store buffers on most chips allow reads & writes to
+// reorder; the JMM's ReadAfterWrite.java test fails in -Xint mode
+// without some kind of memory barrier (i.e., it's not sufficient that
+// the interpreter does not reorder volatile references, the hardware
+// also must not reorder them).
+//
+// According to the new Java Memory Model (JMM):
+// (1) All volatiles are serialized wrt to each other.  ALSO reads &
+//     writes act as aquire & release, so:
+// (2) A read cannot let unrelated NON-volatile memory refs that
+//     happen after the read float up to before the read.  It's OK for
+//     non-volatile memory refs that happen before the volatile read to
+//     float down below it.
+// (3) Similar a volatile write cannot let unrelated NON-volatile
+//     memory refs that happen BEFORE the write float down to after the
+//     write.  It's OK for non-volatile memory refs that happen after the
+//     volatile write to float up before it.
+//
+// We only put in barriers around volatile refs (they are expensive),
+// not _between_ memory refs (that would require us to track the
+// flavor of the previous memory refs).  Requirements (2) and (3)
+// require some barriers before volatile stores and after volatile
+// loads.  These nearly cover requirement (1) but miss the
+// volatile-store-volatile-load case.  This final case is placed after
+// volatile-stores although it could just as well go before
+// volatile-loads.
+
+void TemplateTable::resolve_cache_and_index(int byte_no,
+                                            Register Rcache,
+                                            Register index,
+                                            size_t index_size) {
+  const Register temp = x9;
+  assert_different_registers(Rcache, index, temp);
+
+  Label resolved, clinit_barrier_slow;
+
+  Bytecodes::Code code = bytecode();
+  switch (code) {
+    case Bytecodes::_nofast_getfield: code = Bytecodes::_getfield; break;
+    case Bytecodes::_nofast_putfield: code = Bytecodes::_putfield; break;
+    default: break;
+  }
+
+  assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
+  __ get_cache_and_index_and_bytecode_at_bcp(Rcache, index, temp, byte_no, 1, index_size);
+  __ mv(t0, (int) code);
+  __ beq(temp, t0, resolved);
+
+  // resolve first time through
+  // Class initialization barrier slow path lands here as well.
+  __ bind(clinit_barrier_slow);
+
+  address entry = CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache);
+  __ mv(temp, (int) code);
+  __ call_VM(noreg, entry, temp);
+
+  // Update registers with resolved info
+  __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size);
+  // n.b. unlike x86 Rcache is now rcpool plus the indexed offset
+  // so all clients ofthis method must be modified accordingly
+  __ bind(resolved);
+
+  // Class initialization barrier for static methods
+  if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
+    __ load_resolved_method_at_index(byte_no, temp, Rcache);
+    __ load_method_holder(temp, temp);
+    __ clinit_barrier(temp, t0, NULL, &clinit_barrier_slow);
+  }
+}
+
+// The Rcache and index registers must be set before call
+// n.b unlike x86 cache already includes the index offset
+void TemplateTable::load_field_cp_cache_entry(Register obj,
+                                              Register cache,
+                                              Register index,
+                                              Register off,
+                                              Register flags,
+                                              bool is_static = false) {
+  assert_different_registers(cache, index, flags, off);
+
+  ByteSize cp_base_offset = ConstantPoolCache::base_offset();
+  // Field offset
+  __ ld(off, Address(cache, in_bytes(cp_base_offset +
+                                     ConstantPoolCacheEntry::f2_offset())));
+  // Flags
+  __ lwu(flags, Address(cache, in_bytes(cp_base_offset +
+                                        ConstantPoolCacheEntry::flags_offset())));
+
+  // klass overwrite register
+  if (is_static) {
+    __ ld(obj, Address(cache, in_bytes(cp_base_offset +
+                                       ConstantPoolCacheEntry::f1_offset())));
+    const int mirror_offset = in_bytes(Klass::java_mirror_offset());
+    __ ld(obj, Address(obj, mirror_offset));
+    __ resolve_oop_handle(obj);
+  }
+}
+
+void TemplateTable::load_invoke_cp_cache_entry(int byte_no,
+                                               Register method,
+                                               Register itable_index,
+                                               Register flags,
+                                               bool is_invokevirtual,
+                                               bool is_invokevfinal, /*unused*/
+                                               bool is_invokedynamic) {
+  // setup registers
+  const Register cache = t1;
+  const Register index = x14;
+  assert_different_registers(method, flags);
+  assert_different_registers(method, cache, index);
+  assert_different_registers(itable_index, flags);
+  assert_different_registers(itable_index, cache, index);
+  // determine constant pool cache field offsets
+  assert(is_invokevirtual == (byte_no == f2_byte), "is_invokevirtual flag redundant");
+  const int method_offset = in_bytes(ConstantPoolCache::base_offset() +
+                                     (is_invokevirtual ?
+                                      ConstantPoolCacheEntry::f2_offset() :
+                                      ConstantPoolCacheEntry::f1_offset()));
+  const int flags_offset = in_bytes(ConstantPoolCache::base_offset() +
+                                    ConstantPoolCacheEntry::flags_offset());
+  // access constant pool cache fields
+  const int index_offset = in_bytes(ConstantPoolCache::base_offset() +
+                                    ConstantPoolCacheEntry::f2_offset());
+
+  const size_t index_size = (is_invokedynamic ? sizeof(u4) : sizeof(u2));
+  resolve_cache_and_index(byte_no, cache, index, index_size);
+  __ ld(method, Address(cache, method_offset));
+
+  if (itable_index != noreg) {
+    __ ld(itable_index, Address(cache, index_offset));
+  }
+  __ lwu(flags, Address(cache, flags_offset));
+}
+
+// The registers cache and index expected to be set before call.
+// Correct values of the cache and index registers are preserved.
+void TemplateTable::jvmti_post_field_access(Register cache, Register index,
+                                            bool is_static, bool has_tos) {
+  // do the JVMTI work here to avoid disturbing the register state below
+  // We use c_rarg registers here beacause we want to use the register used in
+  // the call to the VM
+  if (JvmtiExport::can_post_field_access()) {
+    // Check to see if a field access watch has been set before we
+    // take the time to call into the VM.
+    Label L1;
+    assert_different_registers(cache, index, x10);
+    int32_t offset = 0;
+    __ la_patchable(t0, ExternalAddress((address) JvmtiExport::get_field_access_count_addr()), offset);
+    __ lwu(x10, Address(t0, offset));
+
+    __ beqz(x10, L1);
+
+    __ get_cache_and_index_at_bcp(c_rarg2, c_rarg3, 1);
+    __ la(c_rarg2, Address(c_rarg2, in_bytes(ConstantPoolCache::base_offset())));
+
+    if (is_static) {
+      __ mv(c_rarg1, zr); // NULL object reference
+    } else {
+      __ ld(c_rarg1, at_tos()); // get object pointer without popping it
+      __ verify_oop(c_rarg1);
+    }
+    // c_rarg1: object pointer or NULL
+    // c_rarg2: cache entry pointer
+    // c_rarg3: jvalue object on the stack
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address,
+                                       InterpreterRuntime::post_field_access),
+                                       c_rarg1, c_rarg2, c_rarg3);
+    __ get_cache_and_index_at_bcp(cache, index, 1);
+    __ bind(L1);
+  }
+}
+
+void TemplateTable::pop_and_check_object(Register r)
+{
+  __ pop_ptr(r);
+  __ null_check(r);  // for field access must check obj.
+  __ verify_oop(r);
+}
+
+void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteControl rc)
+{
+  const Register cache     = x12;
+  const Register index     = x13;
+  const Register obj       = x14;
+  const Register off       = x9;
+  const Register flags     = x10;
+  const Register raw_flags = x16;
+  const Register bc        = x14; // uses same reg as obj, so don't mix them
+
+  resolve_cache_and_index(byte_no, cache, index, sizeof(u2));
+  jvmti_post_field_access(cache, index, is_static, false);
+  load_field_cp_cache_entry(obj, cache, index, off, raw_flags, is_static);
+
+  if (!is_static) {
+    // obj is on the stack
+    pop_and_check_object(obj);
+  }
+
+  __ add(off, obj, off);
+  const Address field(off);
+
+  Label Done, notByte, notBool, notInt, notShort, notChar,
+              notLong, notFloat, notObj, notDouble;
+
+  __ slli(flags, raw_flags, XLEN - (ConstantPoolCacheEntry::tos_state_shift +
+                                    ConstantPoolCacheEntry::tos_state_bits));
+  __ srli(flags, flags, XLEN - ConstantPoolCacheEntry::tos_state_bits);
+
+  assert(btos == 0, "change code, btos != 0");
+  __ bnez(flags, notByte);
+
+  // Dont't rewrite getstatic, only getfield
+  if (is_static) {
+    rc = may_not_rewrite;
+  }
+
+  // btos
+  __ access_load_at(T_BYTE, IN_HEAP, x10, field, noreg, noreg);
+  __ push(btos);
+  // Rewrite bytecode to be faster
+  if (rc == may_rewrite) {
+    patch_bytecode(Bytecodes::_fast_bgetfield, bc, x11);
+  }
+  __ j(Done);
+
+  __ bind(notByte);
+  __ sub(t0, flags, (u1)ztos);
+  __ bnez(t0, notBool);
+
+  // ztos (same code as btos)
+  __ access_load_at(T_BOOLEAN, IN_HEAP, x10, field, noreg, noreg);
+  __ push(ztos);
+  // Rewirte bytecode to be faster
+  if (rc == may_rewrite) {
+    // uses btos rewriting, no truncating to t/f bit is needed for getfield
+    patch_bytecode(Bytecodes::_fast_bgetfield, bc, x11);
+  }
+  __ j(Done);
+
+  __ bind(notBool);
+  __ sub(t0, flags, (u1)atos);
+  __ bnez(t0, notObj);
+  // atos
+  do_oop_load(_masm, field, x10, IN_HEAP);
+  __ push(atos);
+  if (rc == may_rewrite) {
+    patch_bytecode(Bytecodes::_fast_agetfield, bc, x11);
+  }
+  __ j(Done);
+
+  __ bind(notObj);
+  __ sub(t0, flags, (u1)itos);
+  __ bnez(t0, notInt);
+  // itos
+  __ access_load_at(T_INT, IN_HEAP, x10, field, noreg, noreg);
+  __ addw(x10, x10, zr); // signed extended
+  __ push(itos);
+  // Rewrite bytecode to be faster
+  if (rc == may_rewrite) {
+    patch_bytecode(Bytecodes::_fast_igetfield, bc, x11);
+  }
+  __ j(Done);
+
+  __ bind(notInt);
+  __ sub(t0, flags, (u1)ctos);
+  __ bnez(t0, notChar);
+  // ctos
+  __ access_load_at(T_CHAR, IN_HEAP, x10, field, noreg, noreg);
+  __ push(ctos);
+  // Rewrite bytecode to be faster
+  if (rc == may_rewrite) {
+    patch_bytecode(Bytecodes::_fast_cgetfield, bc, x11);
+  }
+  __ j(Done);
+
+  __ bind(notChar);
+  __ sub(t0, flags, (u1)stos);
+  __ bnez(t0, notShort);
+  // stos
+  __ access_load_at(T_SHORT, IN_HEAP, x10, field, noreg, noreg);
+  __ push(stos);
+  // Rewrite bytecode to be faster
+  if (rc == may_rewrite) {
+    patch_bytecode(Bytecodes::_fast_sgetfield, bc, x11);
+  }
+  __ j(Done);
+
+  __ bind(notShort);
+  __ sub(t0, flags, (u1)ltos);
+  __ bnez(t0, notLong);
+  // ltos
+  __ access_load_at(T_LONG, IN_HEAP, x10, field, noreg, noreg);
+  __ push(ltos);
+  // Rewrite bytecode to be faster
+  if (rc == may_rewrite) {
+    patch_bytecode(Bytecodes::_fast_lgetfield, bc, x11);
+  }
+  __ j(Done);
+
+  __ bind(notLong);
+  __ sub(t0, flags, (u1)ftos);
+  __ bnez(t0, notFloat);
+  // ftos
+  __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
+  __ push(ftos);
+  // Rewrite bytecode to be faster
+  if (rc == may_rewrite) {
+    patch_bytecode(Bytecodes::_fast_fgetfield, bc, x11);
+  }
+  __ j(Done);
+
+  __ bind(notFloat);
+#ifdef ASSERT
+  __ sub(t0, flags, (u1)dtos);
+  __ bnez(t0, notDouble);
+#endif
+  // dtos
+  __ access_load_at(T_DOUBLE, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
+  __ push(dtos);
+  // Rewrite bytecode to be faster
+  if (rc == may_rewrite) {
+    patch_bytecode(Bytecodes::_fast_dgetfield, bc, x11);
+  }
+#ifdef ASSERT
+  __ j(Done);
+
+  __ bind(notDouble);
+  __ stop("Bad state");
+#endif
+
+  __ bind(Done);
+
+  Label notVolatile;
+  __ andi(t0, raw_flags, 1UL << ConstantPoolCacheEntry::is_volatile_shift);
+  __ beqz(t0, notVolatile);
+  __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+  __ bind(notVolatile);
+}
+
+void TemplateTable::getfield(int byte_no)
+{
+  getfield_or_static(byte_no, false);
+}
+
+void TemplateTable::nofast_getfield(int byte_no) {
+  getfield_or_static(byte_no, false, may_not_rewrite);
+}
+
+void TemplateTable::getstatic(int byte_no)
+{
+  getfield_or_static(byte_no, true);
+}
+
+// The registers cache and index expected to be set before call.
+// The function may destroy various registers, just not the cache and index registers.
+void TemplateTable::jvmti_post_field_mod(Register cache, Register index, bool is_static) {
+  transition(vtos, vtos);
+
+  ByteSize cp_base_offset = ConstantPoolCache::base_offset();
+
+  if (JvmtiExport::can_post_field_modification()) {
+    // Check to see if a field modification watch has been set before
+    // we take the time to call into the VM.
+    Label L1;
+    assert_different_registers(cache, index, x10);
+    int32_t offset = 0;
+    __ la_patchable(t0, ExternalAddress((address)JvmtiExport::get_field_modification_count_addr()), offset);
+    __ lwu(x10, Address(t0, offset));
+    __ beqz(x10, L1);
+
+    __ get_cache_and_index_at_bcp(c_rarg2, t0, 1);
+
+    if (is_static) {
+      // Life is simple. Null out the object pointer.
+      __ mv(c_rarg1, zr);
+    } else {
+      // Life is harder. The stack holds the value on top, followed by
+      // the object. We don't know the size of the value, though; it
+      // could be one or two words depending on its type. As a result,
+      // we must find the type to determine where the object is.
+      __ lwu(c_rarg3, Address(c_rarg2,
+                              in_bytes(cp_base_offset +
+                                       ConstantPoolCacheEntry::flags_offset())));
+      __ srli(c_rarg3, c_rarg3, ConstantPoolCacheEntry::tos_state_shift);
+      ConstantPoolCacheEntry::verify_tos_state_shift();
+      Label nope2, done, ok;
+      __ ld(c_rarg1, at_tos_p1());   // initially assume a one word jvalue
+      __ sub(t0, c_rarg3, ltos);
+      __ beqz(t0, ok);
+      __ sub(t0, c_rarg3, dtos);
+      __ bnez(t0, nope2);
+      __ bind(ok);
+      __ ld(c_rarg1, at_tos_p2());  // ltos (two word jvalue);
+      __ bind(nope2);
+    }
+    // cache entry pointer
+    __ add(c_rarg2, c_rarg2, in_bytes(cp_base_offset));
+    // object (tos)
+    __ mv(c_rarg3, esp);
+    // c_rarg1: object pointer set up above (NULL if static)
+    // c_rarg2: cache entry pointer
+    // c_rarg3: jvalue object on  the stack
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address,
+                                InterpreterRuntime::post_field_modification),
+                                c_rarg1, c_rarg2, c_rarg3);
+    __ get_cache_and_index_at_bcp(cache, index, 1);
+    __ bind(L1);
+  }
+}
+
+void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteControl rc) {
+  transition(vtos, vtos);
+
+  const Register cache = x12;
+  const Register index = x13;
+  const Register obj   = x12;
+  const Register off   = x9;
+  const Register flags = x10;
+  const Register bc    = x14;
+
+  resolve_cache_and_index(byte_no, cache, index, sizeof(u2));
+  jvmti_post_field_mod(cache, index, is_static);
+  load_field_cp_cache_entry(obj, cache, index, off, flags, is_static);
+
+  Label Done;
+  __ mv(x15, flags);
+
+  {
+    Label notVolatile;
+    __ andi(t0, x15, 1UL << ConstantPoolCacheEntry::is_volatile_shift);
+    __ beqz(t0, notVolatile);
+    __ membar(MacroAssembler::StoreStore | MacroAssembler::LoadStore);
+    __ bind(notVolatile);
+  }
+
+  Label notByte, notBool, notInt, notShort, notChar,
+        notLong, notFloat, notObj, notDouble;
+
+  __ slli(flags, flags, XLEN - (ConstantPoolCacheEntry::tos_state_shift +
+                                ConstantPoolCacheEntry::tos_state_bits));
+  __ srli(flags, flags, XLEN - ConstantPoolCacheEntry::tos_state_bits);
+
+  assert(btos == 0, "change code, btos != 0");
+  __ bnez(flags, notByte);
+
+  // Don't rewrite putstatic, only putfield
+  if (is_static) {
+    rc = may_not_rewrite;
+  }
+
+  // btos
+  {
+    __ pop(btos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0); // off register as temparator register.
+    __ access_store_at(T_BYTE, IN_HEAP, field, x10, noreg, noreg);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_bputfield, bc, x11, true, byte_no);
+    }
+    __ j(Done);
+  }
+
+  __ bind(notByte);
+  __ sub(t0, flags, (u1)ztos);
+  __ bnez(t0, notBool);
+
+  // ztos
+  {
+    __ pop(ztos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0);
+    __ access_store_at(T_BOOLEAN, IN_HEAP, field, x10, noreg, noreg);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_zputfield, bc, x11, true, byte_no);
+    }
+    __ j(Done);
+  }
+
+  __ bind(notBool);
+  __ sub(t0, flags, (u1)atos);
+  __ bnez(t0, notObj);
+
+  // atos
+  {
+    __ pop(atos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0);
+    // Store into the field
+    do_oop_store(_masm, field, x10, IN_HEAP);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_aputfield, bc, x11, true, byte_no);
+    }
+    __ j(Done);
+  }
+
+  __ bind(notObj);
+  __ sub(t0, flags, (u1)itos);
+  __ bnez(t0, notInt);
+
+  // itos
+  {
+    __ pop(itos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0);
+    __ access_store_at(T_INT, IN_HEAP, field, x10, noreg, noreg);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_iputfield, bc, x11, true, byte_no);
+    }
+    __ j(Done);
+  }
+
+  __ bind(notInt);
+  __ sub(t0, flags, (u1)ctos);
+  __ bnez(t0, notChar);
+
+  // ctos
+  {
+    __ pop(ctos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0);
+    __ access_store_at(T_CHAR, IN_HEAP, field, x10, noreg, noreg);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_cputfield, bc, x11, true, byte_no);
+    }
+    __ j(Done);
+  }
+
+  __ bind(notChar);
+  __ sub(t0, flags, (u1)stos);
+  __ bnez(t0, notShort);
+
+  // stos
+  {
+    __ pop(stos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0);
+    __ access_store_at(T_SHORT, IN_HEAP, field, x10, noreg, noreg);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_sputfield, bc, x11, true, byte_no);
+    }
+    __ j(Done);
+  }
+
+  __ bind(notShort);
+  __ sub(t0, flags, (u1)ltos);
+  __ bnez(t0, notLong);
+
+  // ltos
+  {
+    __ pop(ltos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0);
+    __ access_store_at(T_LONG, IN_HEAP, field, x10, noreg, noreg);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_lputfield, bc, x11, true, byte_no);
+    }
+    __ j(Done);
+  }
+
+  __ bind(notLong);
+  __ sub(t0, flags, (u1)ftos);
+  __ bnez(t0, notFloat);
+
+  // ftos
+  {
+    __ pop(ftos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0);
+    __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos */, noreg, noreg);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_fputfield, bc, x11, true, byte_no);
+    }
+    __ j(Done);
+  }
+
+  __ bind(notFloat);
+#ifdef ASSERT
+  __ sub(t0, flags, (u1)dtos);
+  __ bnez(t0, notDouble);
+#endif
+
+  // dtos
+  {
+    __ pop(dtos);
+    // field address
+    if (!is_static) {
+      pop_and_check_object(obj);
+    }
+    __ add(off, obj, off); // if static, obj from cache, else obj from stack.
+    const Address field(off, 0);
+    __ access_store_at(T_DOUBLE, IN_HEAP, field, noreg /* dtos */, noreg, noreg);
+    if (rc == may_rewrite) {
+      patch_bytecode(Bytecodes::_fast_dputfield, bc, x11, true, byte_no);
+    }
+  }
+
+#ifdef ASSERT
+  __ j(Done);
+
+  __ bind(notDouble);
+  __ stop("Bad state");
+#endif
+
+  __ bind(Done);
+
+  {
+    Label notVolatile;
+    __ andi(t0, x15, 1UL << ConstantPoolCacheEntry::is_volatile_shift);
+    __ beqz(t0, notVolatile);
+    __ membar(MacroAssembler::StoreLoad | MacroAssembler::StoreStore);
+    __ bind(notVolatile);
+  }
+}
+
+void TemplateTable::putfield(int byte_no)
+{
+  putfield_or_static(byte_no, false);
+}
+
+void TemplateTable::nofast_putfield(int byte_no) {
+  putfield_or_static(byte_no, false, may_not_rewrite);
+}
+
+void TemplateTable::putstatic(int byte_no) {
+  putfield_or_static(byte_no, true);
+}
+
+void TemplateTable::jvmti_post_fast_field_mod()
+{
+  if (JvmtiExport::can_post_field_modification()) {
+    // Check to see if a field modification watch has been set before
+    // we take the time to call into the VM.
+    Label L2;
+    int32_t offset = 0;
+    __ la_patchable(t0, ExternalAddress((address)JvmtiExport::get_field_modification_count_addr()), offset);
+    __ lwu(c_rarg3, Address(t0, offset));
+    __ beqz(c_rarg3, L2);
+    __ pop_ptr(x9);                  // copy the object pointer from tos
+    __ verify_oop(x9);
+    __ push_ptr(x9);                 // put the object pointer back on tos
+    // Save tos values before call_VM() clobbers them. Since we have
+    // to do it for every data type, we use the saved values as the
+    // jvalue object.
+    switch (bytecode()) {          // load values into the jvalue object
+      case Bytecodes::_fast_aputfield: __ push_ptr(x10); break;
+      case Bytecodes::_fast_bputfield: // fall through
+      case Bytecodes::_fast_zputfield: // fall through
+      case Bytecodes::_fast_sputfield: // fall through
+      case Bytecodes::_fast_cputfield: // fall through
+      case Bytecodes::_fast_iputfield: __ push_i(x10); break;
+      case Bytecodes::_fast_dputfield: __ push_d(); break;
+      case Bytecodes::_fast_fputfield: __ push_f(); break;
+      case Bytecodes::_fast_lputfield: __ push_l(x10); break;
+
+      default:
+        ShouldNotReachHere();
+    }
+    __ mv(c_rarg3, esp);             // points to jvalue on the stack
+    // access constant pool cache entry
+    __ get_cache_entry_pointer_at_bcp(c_rarg2, x10, 1);
+    __ verify_oop(x9);
+    // x9: object pointer copied above
+    // c_rarg2: cache entry pointer
+    // c_rarg3: jvalue object on the stack
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address,
+                                InterpreterRuntime::post_field_modification),
+               x9, c_rarg2, c_rarg3);
+
+    switch (bytecode()) {             // restore tos values
+      case Bytecodes::_fast_aputfield: __ pop_ptr(x10); break;
+      case Bytecodes::_fast_bputfield: // fall through
+      case Bytecodes::_fast_zputfield: // fall through
+      case Bytecodes::_fast_sputfield: // fall through
+      case Bytecodes::_fast_cputfield: // fall through
+      case Bytecodes::_fast_iputfield: __ pop_i(x10); break;
+      case Bytecodes::_fast_dputfield: __ pop_d(); break;
+      case Bytecodes::_fast_fputfield: __ pop_f(); break;
+      case Bytecodes::_fast_lputfield: __ pop_l(x10); break;
+      default: break;
+    }
+    __ bind(L2);
+  }
+}
+
+void TemplateTable::fast_storefield(TosState state)
+{
+  transition(state, vtos);
+
+  ByteSize base = ConstantPoolCache::base_offset();
+
+  jvmti_post_fast_field_mod();
+
+  // access constant pool cache
+  __ get_cache_and_index_at_bcp(x12, x11, 1);
+
+  // Must prevent reordering of the following cp cache loads with bytecode load
+  __ membar(MacroAssembler::LoadLoad);
+
+  // test for volatile with x13
+  __ lwu(x13, Address(x12, in_bytes(base +
+                                    ConstantPoolCacheEntry::flags_offset())));
+
+  // replace index with field offset from cache entry
+  __ ld(x11, Address(x12, in_bytes(base + ConstantPoolCacheEntry::f2_offset())));
+
+  {
+    Label notVolatile;
+    __ andi(t0, x13, 1UL << ConstantPoolCacheEntry::is_volatile_shift);
+    __ beqz(t0, notVolatile);
+    __ membar(MacroAssembler::StoreStore | MacroAssembler::LoadStore);
+    __ bind(notVolatile);
+  }
+
+  // Get object from stack
+  pop_and_check_object(x12);
+
+  // field address
+  __ add(x11, x12, x11);
+  const Address field(x11, 0);
+
+  // access field
+  switch (bytecode()) {
+    case Bytecodes::_fast_aputfield:
+      do_oop_store(_masm, field, x10, IN_HEAP);
+      break;
+    case Bytecodes::_fast_lputfield:
+      __ access_store_at(T_LONG, IN_HEAP, field, x10, noreg, noreg);
+      break;
+    case Bytecodes::_fast_iputfield:
+      __ access_store_at(T_INT, IN_HEAP, field, x10, noreg, noreg);
+      break;
+    case Bytecodes::_fast_zputfield:
+      __ access_store_at(T_BOOLEAN, IN_HEAP, field, x10, noreg, noreg);
+      break;
+    case Bytecodes::_fast_bputfield:
+      __ access_store_at(T_BYTE, IN_HEAP, field, x10, noreg, noreg);
+      break;
+    case Bytecodes::_fast_sputfield:
+      __ access_store_at(T_SHORT, IN_HEAP, field, x10, noreg, noreg);
+      break;
+    case Bytecodes::_fast_cputfield:
+      __ access_store_at(T_CHAR, IN_HEAP, field, x10, noreg, noreg);
+      break;
+    case Bytecodes::_fast_fputfield:
+      __ access_store_at(T_FLOAT, IN_HEAP, field, noreg /* ftos */, noreg, noreg);
+      break;
+    case Bytecodes::_fast_dputfield:
+      __ access_store_at(T_DOUBLE, IN_HEAP, field, noreg /* dtos */, noreg, noreg);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+
+  {
+    Label notVolatile;
+    __ andi(t0, x13, 1UL << ConstantPoolCacheEntry::is_volatile_shift);
+    __ beqz(t0, notVolatile);
+    __ membar(MacroAssembler::StoreLoad | MacroAssembler::StoreStore);
+    __ bind(notVolatile);
+  }
+}
+
+void TemplateTable::fast_accessfield(TosState state)
+{
+  transition(atos, state);
+  // Do the JVMTI work here to avoid disturbing the register state below
+  if (JvmtiExport::can_post_field_access()) {
+    // Check to see if a field access watch has been set before we
+    // take the time to call into the VM.
+    Label L1;
+    int32_t offset = 0;
+    __ la_patchable(t0, ExternalAddress((address)JvmtiExport::get_field_access_count_addr()), offset);
+    __ lwu(x12, Address(t0, offset));
+    __ beqz(x12, L1);
+    // access constant pool cache entry
+    __ get_cache_entry_pointer_at_bcp(c_rarg2, t1, 1);
+    __ verify_oop(x10);
+    __ push_ptr(x10);  // save object pointer before call_VM() clobbers it
+    __ mv(c_rarg1, x10);
+    // c_rarg1: object pointer copied above
+    // c_rarg2: cache entry pointer
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address,
+                                InterpreterRuntime::post_field_access),
+               c_rarg1, c_rarg2);
+    __ pop_ptr(x10); // restore object pointer
+    __ bind(L1);
+  }
+
+  // access constant pool cache
+  __ get_cache_and_index_at_bcp(x12, x11, 1);
+
+  // Must prevent reordering of the following cp cache loads with bytecode load
+  __ membar(MacroAssembler::LoadLoad);
+
+  __ ld(x11, Address(x12, in_bytes(ConstantPoolCache::base_offset() +
+                                   ConstantPoolCacheEntry::f2_offset())));
+  __ lwu(x13, Address(x12, in_bytes(ConstantPoolCache::base_offset() +
+                                    ConstantPoolCacheEntry::flags_offset())));
+
+  // x10: object
+  __ verify_oop(x10);
+  __ null_check(x10);
+  __ add(x11, x10, x11);
+  const Address field(x11, 0);
+
+  // access field
+  switch (bytecode()) {
+    case Bytecodes::_fast_agetfield:
+      do_oop_load(_masm, field, x10, IN_HEAP);
+      __ verify_oop(x10);
+      break;
+    case Bytecodes::_fast_lgetfield:
+      __ access_load_at(T_LONG, IN_HEAP, x10, field, noreg, noreg);
+      break;
+    case Bytecodes::_fast_igetfield:
+      __ access_load_at(T_INT, IN_HEAP, x10, field, noreg, noreg);
+      __ addw(x10, x10, zr); // signed extended
+      break;
+    case Bytecodes::_fast_bgetfield:
+      __ access_load_at(T_BYTE, IN_HEAP, x10, field, noreg, noreg);
+      break;
+    case Bytecodes::_fast_sgetfield:
+      __ access_load_at(T_SHORT, IN_HEAP, x10, field, noreg, noreg);
+      break;
+    case Bytecodes::_fast_cgetfield:
+      __ access_load_at(T_CHAR, IN_HEAP, x10, field, noreg, noreg);
+      break;
+    case Bytecodes::_fast_fgetfield:
+      __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, field, noreg, noreg);
+      break;
+    case Bytecodes::_fast_dgetfield:
+      __ access_load_at(T_DOUBLE, IN_HEAP, noreg /* dtos */, field, noreg, noreg);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+  {
+    Label notVolatile;
+    __ andi(t0, x13, 1UL << ConstantPoolCacheEntry::is_volatile_shift);
+    __ beqz(t0, notVolatile);
+    __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+    __ bind(notVolatile);
+  }
+}
+
+void TemplateTable::fast_xaccess(TosState state)
+{
+  transition(vtos, state);
+
+  // get receiver
+  __ ld(x10, aaddress(0));
+  // access constant pool cache
+  __ get_cache_and_index_at_bcp(x12, x13, 2);
+  __ ld(x11, Address(x12, in_bytes(ConstantPoolCache::base_offset() +
+                                   ConstantPoolCacheEntry::f2_offset())));
+
+  // make sure exception is reported in correct bcp range (getfield is
+  // next instruction)
+  __ addi(xbcp, xbcp, 1);
+  __ null_check(x10);
+  switch (state) {
+    case itos:
+      __ add(x10, x10, x11);
+      __ access_load_at(T_INT, IN_HEAP, x10, Address(x10, 0), noreg, noreg);
+      __ addw(x10, x10, zr); // signed extended
+      break;
+    case atos:
+      __ add(x10, x10, x11);
+      do_oop_load(_masm, Address(x10, 0), x10, IN_HEAP);
+      __ verify_oop(x10);
+      break;
+    case ftos:
+      __ add(x10, x10, x11);
+      __ access_load_at(T_FLOAT, IN_HEAP, noreg /* ftos */, Address(x10), noreg, noreg);
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+
+  {
+    Label notVolatile;
+    __ lwu(x13, Address(x12, in_bytes(ConstantPoolCache::base_offset() +
+                                      ConstantPoolCacheEntry::flags_offset())));
+    __ andi(t0, x13, 1UL << ConstantPoolCacheEntry::is_volatile_shift);
+    __ beqz(t0, notVolatile);
+    __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+    __ bind(notVolatile);
+  }
+
+  __ sub(xbcp, xbcp, 1);
+}
+
+//-----------------------------------------------------------------------------
+// Calls
+
+void TemplateTable::prepare_invoke(int byte_no,
+                                   Register method, // linked method (or i-klass)
+                                   Register index,  // itable index, MethodType, etc.
+                                   Register recv,   // if caller wants to see it
+                                   Register flags   // if caller wants to test it
+                                   ) {
+  // determine flags
+  const Bytecodes::Code code = bytecode();
+  const bool is_invokeinterface  = code == Bytecodes::_invokeinterface;
+  const bool is_invokedynamic    = code == Bytecodes::_invokedynamic;
+  const bool is_invokehandle     = code == Bytecodes::_invokehandle;
+  const bool is_invokevirtual    = code == Bytecodes::_invokevirtual;
+  const bool is_invokespecial    = code == Bytecodes::_invokespecial;
+  const bool load_receiver       = (recv  != noreg);
+  const bool save_flags          = (flags != noreg);
+  assert(load_receiver == (code != Bytecodes::_invokestatic && code != Bytecodes::_invokedynamic), "");
+  assert(save_flags    == (is_invokeinterface || is_invokevirtual), "need flags for vfinal");
+  assert(flags == noreg || flags == x13, "");
+  assert(recv  == noreg || recv  == x12, "");
+
+  // setup registers & access constant pool cache
+  if (recv == noreg) {
+    recv = x12;
+  }
+  if (flags == noreg) {
+    flags = x13;
+  }
+  assert_different_registers(method, index, recv, flags);
+
+  // save 'interpreter return address'
+  __ save_bcp();
+
+  load_invoke_cp_cache_entry(byte_no, method, index, flags, is_invokevirtual, false, is_invokedynamic);
+
+  // maybe push appendix to arguments (just before return address)
+  if (is_invokedynamic || is_invokehandle) {
+    Label L_no_push;
+    __ andi(t0, flags, 1UL << ConstantPoolCacheEntry::has_appendix_shift);
+    __ beqz(t0, L_no_push);
+    // Push the appendix as a trailing parameter.
+    // This must be done before we get the receiver,
+    // since the parameter_size includes it.
+    __ push_reg(x9);
+    __ mv(x9, index);
+    __ load_resolved_reference_at_index(index, x9);
+    __ pop_reg(x9);
+    __ push_reg(index);  // push appendix (MethodType, CallSite, etc.)
+    __ bind(L_no_push);
+  }
+
+  // load receiver if needed (note: no return address pushed yet)
+  if (load_receiver) {
+    __ andi(recv, flags, ConstantPoolCacheEntry::parameter_size_mask); // parameter_size_mask = 1 << 8
+    __ shadd(t0, recv, esp, t0, 3);
+    __ ld(recv, Address(t0, -Interpreter::expr_offset_in_bytes(1)));
+    __ verify_oop(recv);
+  }
+
+  // compute return type
+  __ slli(t1, flags, XLEN - (ConstantPoolCacheEntry::tos_state_shift + ConstantPoolCacheEntry::tos_state_bits));
+  __ srli(t1, t1, XLEN - ConstantPoolCacheEntry::tos_state_bits); // (1 << 5) - 4 --> 28~31==> t1:0~3
+
+  // load return address
+  {
+    const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
+    __ mv(t0, table_addr);
+    __ shadd(t0, t1, t0, t1, 3);
+    __ ld(ra, Address(t0, 0));
+  }
+}
+
+void TemplateTable::invokevirtual_helper(Register index,
+                                         Register recv,
+                                         Register flags)
+{
+  // Uses temporary registers x10, x13
+  assert_different_registers(index, recv, x10, x13);
+  // Test for an invoke of a final method
+  Label notFinal;
+  __ andi(t0, flags, 1UL << ConstantPoolCacheEntry::is_vfinal_shift);
+  __ beqz(t0, notFinal);
+
+  const Register method = index;  // method must be xmethod
+  assert(method == xmethod, "Method must be xmethod for interpreter calling convention");
+
+  // do the call - the index is actually the method to call
+  // that is, f2 is a vtable index if !is_vfinal, else f2 is a Method*
+
+  // It's final, need a null check here!
+  __ null_check(recv);
+
+  // profile this call
+  __ profile_final_call(x10);
+  __ profile_arguments_type(x10, method, x14, true);
+
+  __ jump_from_interpreted(method);
+
+  __ bind(notFinal);
+
+  // get receiver klass
+  __ null_check(recv, oopDesc::klass_offset_in_bytes());
+  __ load_klass(x10, recv);
+
+  // profile this call
+  __ profile_virtual_call(x10, xlocals, x13);
+
+  // get target Method & entry point
+  __ lookup_virtual_method(x10, index, method);
+  __ profile_arguments_type(x13, method, x14, true);
+  __ jump_from_interpreted(method);
+}
+
+void TemplateTable::invokevirtual(int byte_no)
+{
+  transition(vtos, vtos);
+  assert(byte_no == f2_byte, "use this argument");
+
+  prepare_invoke(byte_no, xmethod, noreg, x12, x13);
+
+  // xmethod: index (actually a Method*)
+  // x12: receiver
+  // x13: flags
+
+  invokevirtual_helper(xmethod, x12, x13);
+}
+
+void TemplateTable::invokespecial(int byte_no)
+{
+  transition(vtos, vtos);
+  assert(byte_no == f1_byte, "use this argument");
+
+  prepare_invoke(byte_no, xmethod, noreg,  // get f1 Method*
+                 x12);  // get receiver also for null check
+  __ verify_oop(x12);
+  __ null_check(x12);
+  // do the call
+  __ profile_call(x10);
+  __ profile_arguments_type(x10, xmethod, xbcp, false);
+  __ jump_from_interpreted(xmethod);
+}
+
+void TemplateTable::invokestatic(int byte_no)
+{
+  transition(vtos, vtos);
+  assert(byte_no == f1_byte, "use this arugment");
+
+  prepare_invoke(byte_no, xmethod);  // get f1 Method*
+  // do the call
+  __ profile_call(x10);
+  __ profile_arguments_type(x10, xmethod, x14, false);
+  __ jump_from_interpreted(xmethod);
+}
+
+void TemplateTable::fast_invokevfinal(int byte_no)
+{
+  __ call_Unimplemented();
+}
+
+void TemplateTable::invokeinterface(int byte_no) {
+  transition(vtos, vtos);
+  assert(byte_no == f1_byte, "use this argument");
+
+  prepare_invoke(byte_no, x10, xmethod,  // get f1 Klass*, f2 Method*
+                 x12, x13);  // recv, flags
+
+  // x10: interface klass (from f1)
+  // xmethod: method (from f2)
+  // x12: receiver
+  // x13: flags
+
+  // First check for Object case, then private interface method,
+  // then regular interface method.
+
+  // Special case of invokeinterface called for virtual method of
+  // java.lang.Object. See cpCache.cpp for details
+  Label notObjectMethod;
+  __ andi(t0, x13, 1UL << ConstantPoolCacheEntry::is_forced_virtual_shift);
+  __ beqz(t0, notObjectMethod);
+
+  invokevirtual_helper(xmethod, x12, x13);
+  __ bind(notObjectMethod);
+
+  Label no_such_interface;
+
+  // Check for private method invocation - indicated by vfinal
+  Label notVFinal;
+  __ andi(t0, x13, 1UL << ConstantPoolCacheEntry::is_vfinal_shift);
+  __ beqz(t0, notVFinal);
+
+  // Check receiver klass into x13 - also a null check
+  __ null_check(x12, oopDesc::klass_offset_in_bytes());
+  __ load_klass(x13, x12);
+
+  Label subtype;
+  __ check_klass_subtype(x13, x10, x14, subtype);
+  // If we get here the typecheck failed
+  __ j(no_such_interface);
+  __ bind(subtype);
+
+  __ profile_final_call(x10);
+  __ profile_arguments_type(x10, xmethod, x14, true);
+  __ jump_from_interpreted(xmethod);
+
+  __ bind(notVFinal);
+
+  // Get receiver klass into x13 - also a null check
+  __ restore_locals();
+  __ null_check(x12, oopDesc::klass_offset_in_bytes());
+  __ load_klass(x13, x12);
+
+  Label no_such_method;
+
+  // Preserve method for the throw_AbstractMethodErrorVerbose.
+  __ mv(x28, xmethod);
+  // Receiver subtype check against REFC.
+  // Superklass in x10. Subklass in x13. Blows t1, x30
+  __ lookup_interface_method(// inputs: rec. class, interface, itable index
+                             x13, x10, noreg,
+                             // outputs: scan temp. reg, scan temp. reg
+                             t1, x30,
+                             no_such_interface,
+                             /*return_method=*/false);
+
+  // profile this call
+  __ profile_virtual_call(x13, x30, x9);
+
+  // Get declaring interface class from method, and itable index
+  __ load_method_holder(x10, xmethod);
+  __ lwu(xmethod, Address(xmethod, Method::itable_index_offset()));
+  __ subw(xmethod, xmethod, Method::itable_index_max);
+  __ negw(xmethod, xmethod);
+
+  // Preserve recvKlass for throw_AbstractMethodErrorVerbose
+  __ mv(xlocals, x13);
+  __ lookup_interface_method(// inputs: rec. class, interface, itable index
+                             xlocals, x10, xmethod,
+                             // outputs: method, scan temp. reg
+                             xmethod, x30,
+                             no_such_interface);
+
+  // xmethod: Method to call
+  // x12: receiver
+  // Check for abstract method error
+  // Note: This should be done more efficiently via a throw_abstract_method_error
+  //       interpreter entry point and a conditional jump to it in case of a null
+  //       method.
+  __ beqz(xmethod, no_such_method);
+
+  __ profile_arguments_type(x13, xmethod, x30, true);
+
+  // do the call
+  // x12: receiver
+  // xmethod: Method
+  __ jump_from_interpreted(xmethod);
+  __ should_not_reach_here();
+
+  // exception handling code follows ...
+  // note: must restore interpreter registers to canonical
+  //       state for exception handling to work correctly!
+
+  __ bind(no_such_method);
+  // throw exception
+  __ restore_bcp();    // bcp must be correct for exception handler   (was destroyed)
+  __ restore_locals(); // make sure locals pointer is correct as well (was destroyed)
+  // Pass arguments for generating a verbose error message.
+  __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodErrorVerbose), x13, x28);
+  // the call_VM checks for exception, so we should never return here.
+  __ should_not_reach_here();
+
+  __ bind(no_such_interface);
+  // throw exceptiong
+  __ restore_bcp();    // bcp must be correct for exception handler   (was destroyed)
+  __ restore_locals(); // make sure locals pointer is correct as well (was destroyed)
+  // Pass arguments for generating a verbose error message.
+  __ call_VM(noreg, CAST_FROM_FN_PTR(address,
+                                     InterpreterRuntime::throw_IncompatibleClassChangeErrorVerbose), x13, x10);
+  // the call_VM checks for exception, so we should never return here.
+  __ should_not_reach_here();
+  return;
+}
+
+void TemplateTable::invokehandle(int byte_no) {
+  transition(vtos, vtos);
+  assert(byte_no == f1_byte, "use this argument");
+
+  prepare_invoke(byte_no, xmethod, x10, x12);
+  __ verify_method_ptr(x12);
+  __ verify_oop(x12);
+  __ null_check(x12);
+
+  // FIXME: profile the LambdaForm also
+
+  // x30 is safe to use here as a temp reg because it is about to
+  // be clobbered by jump_from_interpreted().
+  __ profile_final_call(x30);
+  __ profile_arguments_type(x30, xmethod, x14, true);
+
+  __ jump_from_interpreted(xmethod);
+}
+
+void TemplateTable::invokedynamic(int byte_no) {
+  transition(vtos, vtos);
+  assert(byte_no == f1_byte, "use this argument");
+
+  prepare_invoke(byte_no, xmethod, x10);
+
+  // x10: CallSite object (from cpool->resolved_references[])
+  // xmethod: MH.linkToCallSite method (from f2)
+
+  // Note: x10_callsite is already pushed by prepare_invoke
+
+  // %%% should make a type profile for any invokedynamic that takes a ref argument
+  // profile this call
+  __ profile_call(xbcp);
+  __ profile_arguments_type(x13, xmethod, x30, false);
+
+  __ verify_oop(x10);
+
+  __ jump_from_interpreted(xmethod);
+}
+
+//-----------------------------------------------------------------------------
+// Allocation
+
+void TemplateTable::_new() {
+  transition(vtos, atos);
+
+  __ get_unsigned_2_byte_index_at_bcp(x13, 1);
+  Label slow_case;
+  Label done;
+  Label initialize_header;
+  Label initialize_object; // including clearing the fields
+
+  __ get_cpool_and_tags(x14, x10);
+  // Make sure the class we're about to instantiate has been resolved.
+  // This is done before loading InstanceKlass to be consistent with the order
+  // how Constant Pool is update (see ConstantPool::klass_at_put)
+  const int tags_offset = Array<u1>::base_offset_in_bytes();
+  __ add(t0, x10, x13);
+  __ la(t0, Address(t0, tags_offset));
+  __ membar(MacroAssembler::AnyAny);
+  __ lbu(t0, t0);
+  __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+  __ sub(t1, t0, (u1)JVM_CONSTANT_Class);
+  __ bnez(t1, slow_case);
+
+  // get InstanceKlass
+  __ load_resolved_klass_at_offset(x14, x13, x14, t0);
+
+  // make sure klass is initialized & doesn't have finalizer
+  // make sure klass is fully initialized
+  __ lbu(t0, Address(x14, InstanceKlass::init_state_offset()));
+  __ sub(t1, t0, (u1)InstanceKlass::fully_initialized);
+  __ bnez(t1, slow_case);
+
+  // get instance_size in InstanceKlass (scaled to a count of bytes)
+  __ lwu(x13, Address(x14, Klass::layout_helper_offset()));
+  // test to see if it has a finalizer or is malformed in some way
+  __ andi(t0, x13, Klass::_lh_instance_slow_path_bit);
+  __ bnez(t0, slow_case);
+
+  // Allocate the instance:
+  //  If TLAB is enabled:
+  //    Try to allocate in the TLAB.
+  //    If fails, go to the slow path.
+  //  Else If inline contiguous allocations are enabled:
+  //    Try to allocate in eden.
+  //    If fails due to heap end, go to slow path
+  //
+  //  If TLAB is enabled OR inline contiguous is enabled:
+  //    Initialize the allocation.
+  //    Exit.
+  //  Go to slow path.
+  const bool allow_shared_alloc = Universe::heap()->supports_inline_contig_alloc();
+
+  if (UseTLAB) {
+    __ tlab_allocate(x10, x13, 0, noreg, x11, slow_case);
+
+    if (ZeroTLAB) {
+      // the fields have been already cleared
+      __ j(initialize_header);
+    } else {
+      // initialize both the header and fields
+      __ j(initialize_object);
+    }
+  } else {
+    // Allocation in the shared Eden, if allowed.
+    //
+    // x13: instance size in bytes
+    if (allow_shared_alloc) {
+      __ eden_allocate(x10, x13, 0, x28, slow_case);
+    }
+  }
+
+  // If USETLAB or allow_shared_alloc are true, the object is created above and
+  // there is an initialized need. Otherwise, skip and go to the slow path.
+  if (UseTLAB || allow_shared_alloc) {
+    // The object is initialized before the header. If the object size is
+    // zero, go directly to the header initialization.
+    __ bind(initialize_object);
+    __ sub(x13, x13, sizeof(oopDesc));
+    __ beqz(x13, initialize_header);
+
+    // Initialize obejct fields
+    {
+      __ add(x12, x10, sizeof(oopDesc));
+      Label loop;
+      __ bind(loop);
+      __ sd(zr, Address(x12));
+      __ add(x12, x12, BytesPerLong);
+      __ sub(x13, x13, BytesPerLong);
+      __ bnez(x13, loop);
+    }
+
+    // initialize object hader only.
+    __ bind(initialize_header);
+    __ mv(t0, (intptr_t)markWord::prototype().value());
+    __ sd(t0, Address(x10, oopDesc::mark_offset_in_bytes()));
+    __ store_klass_gap(x10, zr);   // zero klass gap for compressed oops
+    __ store_klass(x10, x14);      // store klass last
+
+    {
+      SkipIfEqual skip(_masm, &DTraceAllocProbes, false);
+      // Trigger dtrace event for fastpath
+      __ push(atos); // save the return value
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), x10);
+      __ pop(atos); // restore the return value
+    }
+    __ j(done);
+  }
+
+  // slow case
+  __ bind(slow_case);
+  __ get_constant_pool(c_rarg1);
+  __ get_unsigned_2_byte_index_at_bcp(c_rarg2, 1);
+  call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), c_rarg1, c_rarg2);
+  __ verify_oop(x10);
+
+  // continue
+  __ bind(done);
+  // Must prevent reordering of stores for object initialization with stores that publish the new object.
+  __ membar(MacroAssembler::StoreStore);
+}
+
+void TemplateTable::newarray() {
+  transition(itos, atos);
+  __ load_unsigned_byte(c_rarg1, at_bcp(1));
+  __ mv(c_rarg2, x10);
+  call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::newarray),
+          c_rarg1, c_rarg2);
+  // Must prevent reordering of stores for object initialization with stores that publish the new object.
+  __ membar(MacroAssembler::StoreStore);
+}
+
+void TemplateTable::anewarray() {
+  transition(itos, atos);
+  __ get_unsigned_2_byte_index_at_bcp(c_rarg2, 1);
+  __ get_constant_pool(c_rarg1);
+  __ mv(c_rarg3, x10);
+  call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::anewarray),
+          c_rarg1, c_rarg2, c_rarg3);
+  // Must prevent reordering of stores for object initialization with stores that publish the new object.
+  __ membar(MacroAssembler::StoreStore);
+}
+
+void TemplateTable::arraylength() {
+  transition(atos, itos);
+  __ null_check(x10, arrayOopDesc::length_offset_in_bytes());
+  __ lwu(x10, Address(x10, arrayOopDesc::length_offset_in_bytes()));
+}
+
+void TemplateTable::checkcast()
+{
+  transition(atos, atos);
+  Label done, is_null, ok_is_subtype, quicked, resolved;
+  __ beqz(x10, is_null);
+
+  // Get cpool & tags index
+  __ get_cpool_and_tags(x12, x13); // x12=cpool, x13=tags array
+  __ get_unsigned_2_byte_index_at_bcp(x9, 1); // x9=index
+  // See if bytecode has already been quicked
+  __ add(t0, x13, Array<u1>::base_offset_in_bytes());
+  __ add(x11, t0, x9);
+  __ membar(MacroAssembler::AnyAny);
+  __ lbu(x11, x11);
+  __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+  __ sub(t0, x11, (u1)JVM_CONSTANT_Class);
+  __ beqz(t0, quicked);
+
+  __ push(atos); // save receiver for result, and for GC
+  call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
+  // vm_result_2 has metadata result
+  __ get_vm_result_2(x10, xthread);
+  __ pop_reg(x13); // restore receiver
+  __ j(resolved);
+
+  // Get superklass in x10 and subklass in x13
+  __ bind(quicked);
+  __ mv(x13, x10); // Save object in x13; x10 needed for subtype check
+  __ load_resolved_klass_at_offset(x12, x9, x10, t0); // x10 = klass
+
+  __ bind(resolved);
+  __ load_klass(x9, x13);
+
+  // Generate subtype check.  Blows x12, x15.  Object in x13.
+  // Superklass in x10.  Subklass in x9.
+  __ gen_subtype_check(x9, ok_is_subtype);
+
+  // Come here on failure
+  __ push_reg(x13);
+  // object is at TOS
+  __ j(Interpreter::_throw_ClassCastException_entry);
+
+  // Come here on success
+  __ bind(ok_is_subtype);
+  __ mv(x10, x13); // Restore object in x13
+
+  // Collect counts on whether this test sees NULLs a lot or not.
+  if (ProfileInterpreter) {
+    __ j(done);
+    __ bind(is_null);
+    __ profile_null_seen(x12);
+  } else {
+    __ bind(is_null);   // same as 'done'
+  }
+  __ bind(done);
+}
+
+void TemplateTable::instanceof() {
+  transition(atos, itos);
+  Label done, is_null, ok_is_subtype, quicked, resolved;
+  __ beqz(x10, is_null);
+
+  // Get cpool & tags index
+  __ get_cpool_and_tags(x12, x13); // x12=cpool, x13=tags array
+  __ get_unsigned_2_byte_index_at_bcp(x9, 1); // x9=index
+  // See if bytecode has already been quicked
+  __ add(t0, x13, Array<u1>::base_offset_in_bytes());
+  __ add(x11, t0, x9);
+  __ membar(MacroAssembler::AnyAny);
+  __ lbu(x11, x11);
+  __ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
+  __ sub(t0, x11, (u1)JVM_CONSTANT_Class);
+  __ beqz(t0, quicked);
+
+  __ push(atos); // save receiver for result, and for GC
+  call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
+  // vm_result_2 has metadata result
+  __ get_vm_result_2(x10, xthread);
+  __ pop_reg(x13); // restore receiver
+  __ verify_oop(x13);
+  __ load_klass(x13, x13);
+  __ j(resolved);
+
+  // Get superklass in x10 and subklass in x13
+  __ bind(quicked);
+  __ load_klass(x13, x10);
+  __ load_resolved_klass_at_offset(x12, x9, x10, t0);
+
+  __ bind(resolved);
+
+  // Generate subtype check.  Blows x12, x15
+  // Superklass in x10.  Subklass in x13.
+  __ gen_subtype_check(x13, ok_is_subtype);
+
+  // Come here on failure
+  __ mv(x10, zr);
+  __ j(done);
+  // Come here on success
+  __ bind(ok_is_subtype);
+  __ li(x10, 1);
+
+  // Collect counts on whether this test sees NULLs a lot or not.
+  if (ProfileInterpreter) {
+    __ j(done);
+    __ bind(is_null);
+    __ profile_null_seen(x12);
+  } else {
+    __ bind(is_null);   // same as 'done'
+  }
+  __ bind(done);
+  // x10 = 0: obj == NULL or  obj is not an instanceof the specified klass
+  // x10 = 1: obj != NULL and obj is     an instanceof the specified klass
+}
+
+//-----------------------------------------------------------------------------
+// Breakpoints
+void TemplateTable::_breakpoint() {
+  // Note: We get here even if we are single stepping..
+  // jbug inists on setting breakpoints at every bytecode
+  // even if we are in single step mode.
+
+  transition(vtos, vtos);
+
+  // get the unpatched byte code
+  __ get_method(c_rarg1);
+  __ call_VM(noreg,
+             CAST_FROM_FN_PTR(address,
+                              InterpreterRuntime::get_original_bytecode_at),
+             c_rarg1, xbcp);
+  __ mv(x9, x10);
+
+  // post the breakpoint event
+  __ call_VM(noreg,
+             CAST_FROM_FN_PTR(address, InterpreterRuntime::_breakpoint),
+             xmethod, xbcp);
+
+  // complete the execution of original bytecode
+  __ mv(t0, x9);
+  __ dispatch_only_normal(vtos);
+}
+
+//-----------------------------------------------------------------------------
+// Exceptions
+
+void TemplateTable::athrow() {
+  transition(atos, vtos);
+  __ null_check(x10);
+  __ j(Interpreter::throw_exception_entry());
+}
+
+//-----------------------------------------------------------------------------
+// Synchronization
+//
+// Note: monitorenter & exit are symmetric routines; which is reflected
+//       in the assembly code structure as well
+//
+// Stack layout:
+//
+// [expressions  ] <--- esp               = expression stack top
+// ..
+// [expressions  ]
+// [monitor entry] <--- monitor block top = expression stack bot
+// ..
+// [monitor entry]
+// [frame data   ] <--- monitor block bot
+// ...
+// [saved fp     ] <--- fp
+void TemplateTable::monitorenter()
+{
+  transition(atos, vtos);
+
+   // check for NULL object
+   __ null_check(x10);
+
+   const Address monitor_block_top(
+         fp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+   const Address monitor_block_bot(
+         fp, frame::interpreter_frame_initial_sp_offset * wordSize);
+   const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
+
+   Label allocated;
+
+   // initialize entry pointer
+   __ mv(c_rarg1, zr); // points to free slot or NULL
+
+   // find a free slot in the monitor block (result in c_rarg1)
+   {
+     Label entry, loop, exit, notUsed;
+     __ ld(c_rarg3, monitor_block_top); // points to current entry,
+                                        // starting with top-most entry
+     __ la(c_rarg2, monitor_block_bot); // points to word before bottom
+
+     __ j(entry);
+
+     __ bind(loop);
+     // check if current entry is used
+     // if not used then remember entry in c_rarg1
+     __ ld(t0, Address(c_rarg3, BasicObjectLock::obj_offset_in_bytes()));
+     __ bnez(t0, notUsed);
+     __ mv(c_rarg1, c_rarg3);
+     __ bind(notUsed);
+     // check if current entry is for same object
+     // if same object then stop searching
+     __ beq(x10, t0, exit);
+     // otherwise advance to next entry
+     __ add(c_rarg3, c_rarg3, entry_size);
+     __ bind(entry);
+     // check if bottom reached
+     // if not at bottom then check this entry
+     __ bne(c_rarg3, c_rarg2, loop);
+     __ bind(exit);
+   }
+
+   __ bnez(c_rarg1, allocated); // check if a slot has been found and
+                             // if found, continue with that on
+
+   // allocate one if there's no free slot
+   {
+     Label entry, loop;
+     // 1. compute new pointers            // esp: old expression stack top
+     __ ld(c_rarg1, monitor_block_bot);    // c_rarg1: old expression stack bottom
+     __ sub(esp, esp, entry_size);         // move expression stack top
+     __ sub(c_rarg1, c_rarg1, entry_size); // move expression stack bottom
+     __ mv(c_rarg3, esp);                  // set start value for copy loop
+     __ sd(c_rarg1, monitor_block_bot);    // set new monitor block bottom
+     __ sub(sp, sp, entry_size);           // make room for the monitor
+
+     __ j(entry);
+     // 2. move expression stack contents
+     __ bind(loop);
+     __ ld(c_rarg2, Address(c_rarg3, entry_size)); // load expression stack
+                                                   // word from old location
+     __ sd(c_rarg2, Address(c_rarg3, 0));          // and store it at new location
+     __ add(c_rarg3, c_rarg3, wordSize);           // advance to next word
+     __ bind(entry);
+     __ bne(c_rarg3, c_rarg1, loop);    // check if bottom reached.if not at bottom
+                                        // then copy next word
+   }
+
+   // call run-time routine
+   // c_rarg1: points to monitor entry
+   __ bind(allocated);
+
+   // Increment bcp to point to the next bytecode, so exception
+   // handling for async. exceptions work correctly.
+   // The object has already been poped from the stack, so the
+   // expression stack looks correct.
+   __ addi(xbcp, xbcp, 1);
+
+   // store object
+   __ sd(x10, Address(c_rarg1, BasicObjectLock::obj_offset_in_bytes()));
+   __ lock_object(c_rarg1);
+
+   // check to make sure this monitor doesn't cause stack overflow after locking
+   __ save_bcp();  // in case of exception
+   __ generate_stack_overflow_check(0);
+
+   // The bcp has already been incremented. Just need to dispatch to
+   // next instruction.
+   __ dispatch_next(vtos);
+}
+
+void TemplateTable::monitorexit()
+{
+  transition(atos, vtos);
+
+  // check for NULL object
+  __ null_check(x10);
+
+  const Address monitor_block_top(
+        fp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
+  const Address monitor_block_bot(
+        fp, frame::interpreter_frame_initial_sp_offset * wordSize);
+  const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
+
+  Label found;
+
+  // find matching slot
+  {
+    Label entry, loop;
+    __ ld(c_rarg1, monitor_block_top); // points to current entry,
+                                        // starting with top-most entry
+    __ la(c_rarg2, monitor_block_bot); // points to word before bottom
+                                        // of monitor block
+    __ j(entry);
+
+    __ bind(loop);
+    // check if current entry is for same object
+    __ ld(t0, Address(c_rarg1, BasicObjectLock::obj_offset_in_bytes()));
+    // if same object then stop searching
+    __ beq(x10, t0, found);
+    // otherwise advance to next entry
+    __ add(c_rarg1, c_rarg1, entry_size);
+    __ bind(entry);
+    // check if bottom reached
+    // if not at bottom then check this entry
+    __ bne(c_rarg1, c_rarg2, loop);
+  }
+
+  // error handling. Unlocking was not block-structured
+  __ call_VM(noreg, CAST_FROM_FN_PTR(address,
+                   InterpreterRuntime::throw_illegal_monitor_state_exception));
+  __ should_not_reach_here();
+
+  // call run-time routine
+  __ bind(found);
+  __ push_ptr(x10); // make sure object is on stack (contract with oopMaps)
+  __ unlock_object(c_rarg1);
+  __ pop_ptr(x10); // discard object
+}
+
+// Wide instructions
+void TemplateTable::wide()
+{
+  __ load_unsigned_byte(x9, at_bcp(1));
+  __ mv(t0, (address)Interpreter::_wentry_point);
+  __ shadd(t0, x9, t0, t1, 3);
+  __ ld(t0, Address(t0));
+  __ jr(t0);
+}
+
+// Multi arrays
+void TemplateTable::multianewarray() {
+  transition(vtos, atos);
+  __ load_unsigned_byte(x10, at_bcp(3)); // get number of dimensions
+  // last dim is on top of stack; we want address of first one:
+  // first_addr = last_addr + (ndims - 1) * wordSize
+  __ shadd(c_rarg1, x10, esp, c_rarg1, 3);
+  __ sub(c_rarg1, c_rarg1, wordSize);
+  call_VM(x10,
+          CAST_FROM_FN_PTR(address, InterpreterRuntime::multianewarray),
+          c_rarg1);
+  __ load_unsigned_byte(x11, at_bcp(3));
+  __ shadd(esp, x11, esp, t0, 3);
+}
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.hpp b/src/hotspot/cpu/riscv/templateTable_riscv.hpp
new file mode 100644
index 00000000000..fcc86108d28
--- /dev/null
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_TEMPLATETABLE_RISCV_HPP
+#define CPU_RISCV_TEMPLATETABLE_RISCV_HPP
+
+static void prepare_invoke(int byte_no,
+                           Register method,         // linked method (or i-klass)
+                           Register index = noreg,  // itable index, MethodType, etc.
+                           Register recv  = noreg,  // if caller wants to see it
+                           Register flags = noreg   // if caller wants to test it
+                           );
+static void invokevirtual_helper(Register index, Register recv,
+                                 Register flags);
+
+// Helpers
+static void index_check(Register array, Register index);
+
+#endif // CPU_RISCV_TEMPLATETABLE_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/universalNativeInvoker_riscv.cpp b/src/hotspot/cpu/riscv/universalNativeInvoker_riscv.cpp
new file mode 100644
index 00000000000..4f50adb05c3
--- /dev/null
+++ b/src/hotspot/cpu/riscv/universalNativeInvoker_riscv.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "prims/universalNativeInvoker.hpp"
+#include "utilities/debug.hpp"
+
+address ProgrammableInvoker::generate_adapter(jobject jabi, jobject jlayout) {
+  Unimplemented();
+  return nullptr;
+}
diff --git a/src/hotspot/cpu/riscv/universalUpcallHandle_riscv.cpp b/src/hotspot/cpu/riscv/universalUpcallHandle_riscv.cpp
new file mode 100644
index 00000000000..ce70da72f2e
--- /dev/null
+++ b/src/hotspot/cpu/riscv/universalUpcallHandle_riscv.cpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "prims/universalUpcallHandler.hpp"
+#include "utilities/debug.hpp"
+
+address ProgrammableUpcallHandler::generate_upcall_stub(jobject jrec, jobject jabi, jobject jlayout) {
+  Unimplemented();
+  return nullptr;
+}
+
+address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject mh, Method* entry, jobject jabi, jobject jconv) {
+  ShouldNotCallThis();
+  return nullptr;
+}
+
+bool ProgrammableUpcallHandler::supports_optimized_upcalls() {
+  return false;
+}
diff --git a/src/hotspot/cpu/riscv/vmStructs_riscv.hpp b/src/hotspot/cpu/riscv/vmStructs_riscv.hpp
new file mode 100644
index 00000000000..6c89133de02
--- /dev/null
+++ b/src/hotspot/cpu/riscv/vmStructs_riscv.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_VMSTRUCTS_RISCV_HPP
+#define CPU_RISCV_VMSTRUCTS_RISCV_HPP
+
+// These are the CPU-specific fields, types and integer
+// constants required by the Serviceability Agent. This file is
+// referenced by vmStructs.cpp.
+
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+  volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
+
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+
+#endif // CPU_RISCV_VMSTRUCTS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
new file mode 100644
index 00000000000..768c7633ca6
--- /dev/null
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/java.hpp"
+#include "runtime/os.hpp"
+#include "runtime/vm_version.hpp"
+#include "utilities/formatBuffer.hpp"
+#include "utilities/macros.hpp"
+
+#include OS_HEADER_INLINE(os)
+
+const char* VM_Version::_uarch = "";
+uint32_t VM_Version::_initial_vector_length = 0;
+
+void VM_Version::initialize() {
+  get_os_cpu_info();
+
+  if (FLAG_IS_DEFAULT(UseFMA)) {
+    FLAG_SET_DEFAULT(UseFMA, true);
+  }
+
+  if (FLAG_IS_DEFAULT(AllocatePrefetchDistance)) {
+    FLAG_SET_DEFAULT(AllocatePrefetchDistance, 0);
+  }
+
+  if (UseAES || UseAESIntrinsics) {
+    if (UseAES && !FLAG_IS_DEFAULT(UseAES)) {
+      warning("AES instructions are not available on this CPU");
+      FLAG_SET_DEFAULT(UseAES, false);
+    }
+    if (UseAESIntrinsics && !FLAG_IS_DEFAULT(UseAESIntrinsics)) {
+      warning("AES intrinsics are not available on this CPU");
+      FLAG_SET_DEFAULT(UseAESIntrinsics, false);
+    }
+  }
+
+  if (UseAESCTRIntrinsics) {
+    warning("AES/CTR intrinsics are not available on this CPU");
+    FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
+  }
+
+  if (UseSHA) {
+    warning("SHA instructions are not available on this CPU");
+    FLAG_SET_DEFAULT(UseSHA, false);
+  }
+
+  if (UseSHA1Intrinsics) {
+    warning("Intrinsics for SHA-1 crypto hash functions not available on this CPU.");
+    FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
+  }
+
+  if (UseSHA256Intrinsics) {
+    warning("Intrinsics for SHA-224 and SHA-256 crypto hash functions not available on this CPU.");
+    FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
+  }
+
+  if (UseSHA512Intrinsics) {
+    warning("Intrinsics for SHA-384 and SHA-512 crypto hash functions not available on this CPU.");
+    FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
+  }
+
+  if (UseSHA3Intrinsics) {
+    warning("Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU.");
+    FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
+  }
+
+  if (UseCRC32Intrinsics) {
+    warning("CRC32 intrinsics are not available on this CPU.");
+    FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
+  }
+
+  if (UseCRC32CIntrinsics) {
+    warning("CRC32C intrinsics are not available on this CPU.");
+    FLAG_SET_DEFAULT(UseCRC32CIntrinsics, false);
+  }
+
+  if (UseMD5Intrinsics) {
+    warning("MD5 intrinsics are not available on this CPU.");
+    FLAG_SET_DEFAULT(UseMD5Intrinsics, false);
+  }
+
+  if (UseRVV) {
+    if (!(_features & CPU_V)) {
+      warning("RVV is not supported on this CPU");
+      FLAG_SET_DEFAULT(UseRVV, false);
+    } else {
+      // read vector length from vector CSR vlenb
+      _initial_vector_length = get_current_vector_length();
+    }
+  }
+
+  if (UseRVB && !(_features & CPU_B)) {
+    warning("RVB is not supported on this CPU");
+    FLAG_SET_DEFAULT(UseRVB, false);
+  }
+
+  if (UseRVC && !(_features & CPU_C)) {
+    warning("RVC is not supported on this CPU");
+    FLAG_SET_DEFAULT(UseRVC, false);
+  }
+
+  if (FLAG_IS_DEFAULT(AvoidUnalignedAccesses)) {
+    FLAG_SET_DEFAULT(AvoidUnalignedAccesses, true);
+  }
+
+  if (UseRVB) {
+    if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
+      FLAG_SET_DEFAULT(UsePopCountInstruction, true);
+    }
+  } else {
+    FLAG_SET_DEFAULT(UsePopCountInstruction, false);
+  }
+
+  char buf[512];
+  buf[0] = '\0';
+  if (_uarch != NULL && strcmp(_uarch, "") != 0) snprintf(buf, sizeof(buf), "%s,", _uarch);
+  strcat(buf, "rv64");
+#define ADD_FEATURE_IF_SUPPORTED(id, name, bit) if (_features & CPU_##id) strcat(buf, name);
+  CPU_FEATURE_FLAGS(ADD_FEATURE_IF_SUPPORTED)
+#undef ADD_FEATURE_IF_SUPPORTED
+
+  _features_string = os::strdup(buf);
+
+#ifdef COMPILER2
+  c2_initialize();
+#endif // COMPILER2
+}
+
+#ifdef COMPILER2
+void VM_Version::c2_initialize() {
+  if (UseCMoveUnconditionally) {
+    FLAG_SET_DEFAULT(UseCMoveUnconditionally, false);
+  }
+
+  if (ConditionalMoveLimit > 0) {
+    FLAG_SET_DEFAULT(ConditionalMoveLimit, 0);
+  }
+
+  if (!UseRVV) {
+    FLAG_SET_DEFAULT(SpecialEncodeISOArray, false);
+  }
+
+  if (!UseRVV && MaxVectorSize) {
+    FLAG_SET_DEFAULT(MaxVectorSize, 0);
+  }
+
+  if (!UseRVV) {
+    FLAG_SET_DEFAULT(UseRVVForBigIntegerShiftIntrinsics, false);
+  }
+
+  if (UseRVV) {
+    if (FLAG_IS_DEFAULT(MaxVectorSize)) {
+      MaxVectorSize = _initial_vector_length;
+    } else if (MaxVectorSize < 16) {
+      warning("RVV does not support vector length less than 16 bytes. Disabling RVV.");
+      UseRVV = false;
+    } else if (is_power_of_2(MaxVectorSize)) {
+      if (MaxVectorSize > _initial_vector_length) {
+        warning("Current system only supports max RVV vector length %d. Set MaxVectorSize to %d",
+                _initial_vector_length, _initial_vector_length);
+      }
+      MaxVectorSize = _initial_vector_length;
+    } else {
+      vm_exit_during_initialization(err_msg("Unsupported MaxVectorSize: %d", (int)MaxVectorSize));
+    }
+  }
+
+  // disable prefetch
+  if (FLAG_IS_DEFAULT(AllocatePrefetchStyle)) {
+    FLAG_SET_DEFAULT(AllocatePrefetchStyle, 0);
+  }
+
+  if (FLAG_IS_DEFAULT(UseMulAddIntrinsic)) {
+    FLAG_SET_DEFAULT(UseMulAddIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
+    FLAG_SET_DEFAULT(UseMultiplyToLenIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {
+    FLAG_SET_DEFAULT(UseSquareToLenIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
+    FLAG_SET_DEFAULT(UseMontgomeryMultiplyIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
+    FLAG_SET_DEFAULT(UseMontgomerySquareIntrinsic, true);
+  }
+}
+#endif // COMPILER2
+
+void VM_Version::initialize_cpu_information(void) {
+  // do nothing if cpu info has been initialized
+  if (_initialized) {
+    return;
+  }
+
+  _no_of_cores  = os::processor_count();
+  _no_of_threads = _no_of_cores;
+  _no_of_sockets = _no_of_cores;
+  snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE - 1, "RISCV64");
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "RISCV64 %s", _features_string);
+  _initialized = true;
+}
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
new file mode 100644
index 00000000000..8e35530359a
--- /dev/null
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_VM_VERSION_RISCV_HPP
+#define CPU_RISCV_VM_VERSION_RISCV_HPP
+
+#include "runtime/abstract_vm_version.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/globals_extension.hpp"
+#include "utilities/sizes.hpp"
+
+class VM_Version : public Abstract_VM_Version {
+#ifdef COMPILER2
+private:
+  static void c2_initialize();
+#endif // COMPILER2
+
+protected:
+  static const char* _uarch;
+  static uint32_t _initial_vector_length;
+  static void get_os_cpu_info();
+  static uint32_t get_current_vector_length();
+
+public:
+  // Initialization
+  static void initialize();
+
+  constexpr static bool supports_stack_watermark_barrier() { return true; }
+
+  enum Feature_Flag {
+#define CPU_FEATURE_FLAGS(decl)               \
+    decl(I,            "i",            8)     \
+    decl(M,            "m",           12)     \
+    decl(A,            "a",            0)     \
+    decl(F,            "f",            5)     \
+    decl(D,            "d",            3)     \
+    decl(C,            "c",            2)     \
+    decl(V,            "v",           21)     \
+    decl(B,            "b",            1)
+
+#define DECLARE_CPU_FEATURE_FLAG(id, name, bit) CPU_##id = (1 << bit),
+    CPU_FEATURE_FLAGS(DECLARE_CPU_FEATURE_FLAG)
+#undef DECLARE_CPU_FEATURE_FLAG
+  };
+
+  static void initialize_cpu_information(void);
+};
+
+#endif // CPU_RISCV_VM_VERSION_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/vmreg_riscv.cpp b/src/hotspot/cpu/riscv/vmreg_riscv.cpp
new file mode 100644
index 00000000000..aa7222dc64a
--- /dev/null
+++ b/src/hotspot/cpu/riscv/vmreg_riscv.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "code/vmreg.hpp"
+
+void VMRegImpl::set_regName() {
+  int i = 0;
+  Register reg = ::as_Register(0);
+  for ( ; i < ConcreteRegisterImpl::max_gpr ; ) {
+    for (int j = 0 ; j < RegisterImpl::max_slots_per_register ; j++) {
+      regName[i++] = reg->name();
+    }
+    reg = reg->successor();
+  }
+
+  FloatRegister freg = ::as_FloatRegister(0);
+  for ( ; i < ConcreteRegisterImpl::max_fpr ; ) {
+    for (int j = 0 ; j < FloatRegisterImpl::max_slots_per_register ; j++) {
+      regName[i++] = reg->name();
+    }
+    freg = freg->successor();
+  }
+
+  VectorRegister vreg = ::as_VectorRegister(0);
+  for ( ; i < ConcreteRegisterImpl::max_vpr ; ) {
+    for (int j = 0 ; j < VectorRegisterImpl::max_slots_per_register ; j++) {
+      regName[i++] = reg->name();
+    }
+    vreg = vreg->successor();
+  }
+
+  for ( ; i < ConcreteRegisterImpl::number_of_registers ; i++) {
+    regName[i] = "NON-GPR-FPR-VPR";
+  }
+}
+
+VMReg VMRegImpl::vmStorageToVMReg(int type, int index) {
+  Unimplemented();
+  return VMRegImpl::Bad();
+}
diff --git a/src/hotspot/cpu/riscv/vmreg_riscv.hpp b/src/hotspot/cpu/riscv/vmreg_riscv.hpp
new file mode 100644
index 00000000000..9e611b1f671
--- /dev/null
+++ b/src/hotspot/cpu/riscv/vmreg_riscv.hpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_VMREG_RISCV_HPP
+#define CPU_RISCV_VMREG_RISCV_HPP
+
+inline bool is_Register() {
+  return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
+}
+
+inline bool is_FloatRegister() {
+  return value() >= ConcreteRegisterImpl::max_gpr && value() < ConcreteRegisterImpl::max_fpr;
+}
+
+inline bool is_VectorRegister() {
+  return value() >= ConcreteRegisterImpl::max_fpr && value() < ConcreteRegisterImpl::max_vpr;
+}
+
+inline Register as_Register() {
+  assert(is_Register(), "must be");
+  return ::as_Register(value() / RegisterImpl::max_slots_per_register);
+}
+
+inline FloatRegister as_FloatRegister() {
+  assert(is_FloatRegister() && is_even(value()), "must be");
+  return ::as_FloatRegister((value() - ConcreteRegisterImpl::max_gpr) /
+                            FloatRegisterImpl::max_slots_per_register);
+}
+
+inline VectorRegister as_VectorRegister() {
+  assert(is_VectorRegister() && ((value() & (VectorRegisterImpl::max_slots_per_register - 1)) == 0), "must be");
+  return ::as_VectorRegister((value() - ConcreteRegisterImpl::max_fpr) /
+                             VectorRegisterImpl::max_slots_per_register);
+}
+
+inline bool is_concrete() {
+  assert(is_reg(), "must be");
+  if (is_VectorRegister()) {
+    int base = value() - ConcreteRegisterImpl::max_fpr;
+    return (base % VectorRegisterImpl::max_slots_per_register) == 0;
+  } else {
+    return is_even(value());
+  }
+}
+
+#endif // CPU_RISCV_VMREG_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/vmreg_riscv.inline.hpp b/src/hotspot/cpu/riscv/vmreg_riscv.inline.hpp
new file mode 100644
index 00000000000..06b70020b4b
--- /dev/null
+++ b/src/hotspot/cpu/riscv/vmreg_riscv.inline.hpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef CPU_RISCV_VM_VMREG_RISCV_INLINE_HPP
+#define CPU_RISCV_VM_VMREG_RISCV_INLINE_HPP
+
+inline VMReg RegisterImpl::as_VMReg() const {
+  if (this == noreg) {
+    return VMRegImpl::Bad();
+  }
+  return VMRegImpl::as_VMReg(encoding() * RegisterImpl::max_slots_per_register);
+}
+
+inline VMReg FloatRegisterImpl::as_VMReg() const {
+  return VMRegImpl::as_VMReg((encoding() * FloatRegisterImpl::max_slots_per_register) +
+                             ConcreteRegisterImpl::max_gpr);
+}
+
+inline VMReg VectorRegisterImpl::as_VMReg() const {
+  return VMRegImpl::as_VMReg((encoding() * VectorRegisterImpl::max_slots_per_register) +
+                             ConcreteRegisterImpl::max_fpr);
+}
+
+#endif // CPU_RISCV_VM_VMREG_RISCV_INLINE_HPP
diff --git a/src/hotspot/cpu/riscv/vtableStubs_riscv.cpp b/src/hotspot/cpu/riscv/vtableStubs_riscv.cpp
new file mode 100644
index 00000000000..78b81138003
--- /dev/null
+++ b/src/hotspot/cpu/riscv/vtableStubs_riscv.cpp
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "assembler_riscv.inline.hpp"
+#include "code/vtableStubs.hpp"
+#include "interp_masm_riscv.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/compiledICHolder.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/klassVtable.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "vmreg_riscv.inline.hpp"
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
+
+// machine-dependent part of VtableStubs: create VtableStub of correct size and
+// initialize its code
+
+#define __ masm->
+
+#ifndef PRODUCT
+extern "C" void bad_compiled_vtable_index(JavaThread* thread, oop receiver, int index);
+#endif
+
+VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
+  // Read "A word on VtableStub sizing" in share/code/vtableStubs.hpp for details on stub sizing.
+  const int stub_code_length = code_size_limit(true);
+  VtableStub* s = new(stub_code_length) VtableStub(true, vtable_index);
+  // Can be NULL if there is no free space in the code cache.
+  if (s == NULL) {
+    return NULL;
+  }
+
+  // Count unused bytes in instruction sequences of variable size.
+  // We add them to the computed buffer size in order to avoid
+  // overflow in subsequently generated stubs.
+  address   start_pc = NULL;
+  int       slop_bytes = 0;
+  int       slop_delta = 0;
+
+  ResourceMark    rm;
+  CodeBuffer      cb(s->entry_point(), stub_code_length);
+  MacroAssembler* masm = new MacroAssembler(&cb);
+  assert_cond(masm != NULL);
+
+#if (!defined(PRODUCT) && defined(COMPILER2))
+  if (CountCompiledCalls) {
+    __ la(t2, ExternalAddress((address) SharedRuntime::nof_megamorphic_calls_addr()));
+    __ add_memory_int64(Address(t2), 1);
+  }
+#endif
+
+  // get receiver (need to skip return address on top of stack)
+  assert(VtableStub::receiver_location() == j_rarg0->as_VMReg(), "receiver expected in j_rarg0");
+
+  // get receiver klass
+  address npe_addr = __ pc();
+  __ load_klass(t2, j_rarg0);
+
+#ifndef PRODUCT
+  if (DebugVtables) {
+    Label L;
+    start_pc = __ pc();
+
+    // check offset vs vtable length
+    __ lwu(t0, Address(t2, Klass::vtable_length_offset()));
+    __ mvw(t1, vtable_index * vtableEntry::size());
+    __ bgt(t0, t1, L);
+    __ enter();
+    __ mv(x12, vtable_index);
+
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address, bad_compiled_vtable_index), j_rarg0, x12);
+    const ptrdiff_t estimate = 256;
+    const ptrdiff_t codesize = __ pc() - start_pc;
+    slop_delta = estimate - codesize;  // call_VM varies in length, depending on data
+    slop_bytes += slop_delta;
+    assert(slop_delta >= 0, "vtable #%d: Code size estimate (%d) for DebugVtables too small, required: %d", vtable_index, (int)estimate, (int)codesize);
+
+    __ leave();
+    __ bind(L);
+  }
+#endif // PRODUCT
+
+  start_pc = __ pc();
+  __ lookup_virtual_method(t2, vtable_index, xmethod);
+  // lookup_virtual_method generates
+  // 4 instructions (maximum value encountered in normal case):li(lui + addiw) + add + ld
+  // 1 instruction (best case):ld * 1
+  slop_delta = 16 - (int)(__ pc() - start_pc);
+  slop_bytes += slop_delta;
+  assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
+
+#ifndef PRODUCT
+  if (DebugVtables) {
+    Label L;
+    __ beqz(xmethod, L);
+    __ ld(t0, Address(xmethod, Method::from_compiled_offset()));
+    __ bnez(t0, L);
+    __ stop("Vtable entry is NULL");
+    __ bind(L);
+  }
+#endif // PRODUCT
+
+  // x10: receiver klass
+  // xmethod: Method*
+  // x12: receiver
+  address ame_addr = __ pc();
+  __ ld(t0, Address(xmethod, Method::from_compiled_offset()));
+  __ jr(t0);
+
+  masm->flush();
+  bookkeeping(masm, tty, s, npe_addr, ame_addr, true, vtable_index, slop_bytes, 0);
+
+  return s;
+}
+
+VtableStub* VtableStubs::create_itable_stub(int itable_index) {
+  // Read "A word on VtableStub sizing" in share/code/vtableStubs.hpp for details on stub sizing.
+  const int stub_code_length = code_size_limit(false);
+  VtableStub* s = new(stub_code_length) VtableStub(false, itable_index);
+  // Can be NULL if there is no free space in the code cache.
+  if (s == NULL) {
+    return NULL;
+  }
+  // Count unused bytes in instruction sequences of variable size.
+  // We add them to the computed buffer size in order to avoid
+  // overflow in subsequently generated stubs.
+  address   start_pc = NULL;
+  int       slop_bytes = 0;
+  int       slop_delta = 0;
+
+  ResourceMark    rm;
+  CodeBuffer      cb(s->entry_point(), stub_code_length);
+  MacroAssembler* masm = new MacroAssembler(&cb);
+  assert_cond(masm != NULL);
+
+#if (!defined(PRODUCT) && defined(COMPILER2))
+  if (CountCompiledCalls) {
+    __ la(x18, ExternalAddress((address) SharedRuntime::nof_megamorphic_calls_addr()));
+    __ add_memory_int64(Address(x18), 1);
+  }
+#endif
+
+  // get receiver (need to skip return address on top of stack)
+  assert(VtableStub::receiver_location() == j_rarg0->as_VMReg(), "receiver expected in j_rarg0");
+
+  // Entry arguments:
+  //  t2: CompiledICHolder
+  //  j_rarg0: Receiver
+
+  // This stub is called from compiled code which has no callee-saved registers,
+  // so all registers except arguments are free at this point.
+  const Register recv_klass_reg     = x18;
+  const Register holder_klass_reg   = x19; // declaring interface klass (DECC)
+  const Register resolved_klass_reg = xmethod; // resolved interface klass (REFC)
+  const Register temp_reg           = x28;
+  const Register temp_reg2          = x29;
+  const Register icholder_reg       = t1;
+
+  Label L_no_such_interface;
+
+  __ ld(resolved_klass_reg, Address(icholder_reg, CompiledICHolder::holder_klass_offset()));
+  __ ld(holder_klass_reg,   Address(icholder_reg, CompiledICHolder::holder_metadata_offset()));
+
+  start_pc = __ pc();
+
+  // get receiver klass (also an implicit null-check)
+  address npe_addr = __ pc();
+  __ load_klass(recv_klass_reg, j_rarg0);
+
+  // Receiver subtype check against REFC.
+  __ lookup_interface_method(// inputs: rec. class, interface
+                             recv_klass_reg, resolved_klass_reg, noreg,
+                             // outputs:  scan temp. reg1, scan temp. reg2
+                             temp_reg2, temp_reg,
+                             L_no_such_interface,
+                             /*return_method=*/false);
+
+  const ptrdiff_t typecheckSize = __ pc() - start_pc;
+  start_pc = __ pc();
+
+  // Get selected method from declaring class and itable index
+  __ lookup_interface_method(// inputs: rec. class, interface, itable index
+                             recv_klass_reg, holder_klass_reg, itable_index,
+                             // outputs: method, scan temp. reg
+                             xmethod, temp_reg,
+                             L_no_such_interface);
+
+  const ptrdiff_t lookupSize = __ pc() - start_pc;
+
+  // Reduce "estimate" such that "padding" does not drop below 8.
+  const ptrdiff_t estimate = 256;
+  const ptrdiff_t codesize = typecheckSize + lookupSize;
+  slop_delta = (int)(estimate - codesize);
+  slop_bytes += slop_delta;
+  assert(slop_delta >= 0, "itable #%d: Code size estimate (%d) for lookup_interface_method too small, required: %d", itable_index, (int)estimate, (int)codesize);
+
+#ifdef ASSERT
+  if (DebugVtables) {
+    Label L2;
+    __ beqz(xmethod, L2);
+    __ ld(t0, Address(xmethod, Method::from_compiled_offset()));
+    __ bnez(t0, L2);
+    __ stop("compiler entrypoint is null");
+    __ bind(L2);
+  }
+#endif // ASSERT
+
+  // xmethod: Method*
+  // j_rarg0: receiver
+  address ame_addr = __ pc();
+  __ ld(t0, Address(xmethod, Method::from_compiled_offset()));
+  __ jr(t0);
+
+  __ bind(L_no_such_interface);
+  // Handle IncompatibleClassChangeError in itable stubs.
+  // More detailed error message.
+  // We force resolving of the call site by jumping to the "handle
+  // wrong method" stub, and so let the interpreter runtime do all the
+  // dirty work.
+  assert(SharedRuntime::get_handle_wrong_method_stub() != NULL, "check initialization order");
+  __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+
+  masm->flush();
+  bookkeeping(masm, tty, s, npe_addr, ame_addr, false, itable_index, slop_bytes, 0);
+
+  return s;
+}
+
+int VtableStub::pd_code_alignment() {
+  // RISCV cache line size is not an architected constant. We just align on word size.
+  const unsigned int icache_line_size = wordSize;
+  return icache_line_size;
+}
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index 1d1f163826e..efa142332ef 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2019 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1440,7 +1440,10 @@ void LIR_Assembler::comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Op
 }
 
 // result = condition ? opr1 : opr2
-void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
+                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
+  assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on s390");
+
   Assembler::branch_condition acond = Assembler::bcondEqual, ncond = Assembler::bcondNotEqual;
   switch (condition) {
     case lir_cond_equal:        acond = Assembler::bcondEqual;    ncond = Assembler::bcondNotEqual; break;
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index eaeeae235f0..9619a7711e9 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2010,7 +2010,10 @@ void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op) {
   }
 }
 
-void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
+void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
+                          LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
+  assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on x86");
+
   Assembler::Condition acond, ncond;
   switch (condition) {
     case lir_cond_equal:        acond = Assembler::equal;        ncond = Assembler::notEqual;     break;
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index f2ecca92c82..cba539caf42 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -2496,6 +2496,8 @@ void os::get_summary_cpu_info(char* cpuinfo, size_t length) {
   strncpy(cpuinfo, "IA64", length);
 #elif defined(PPC)
   strncpy(cpuinfo, "PPC64", length);
+#elif defined(RISCV)
+  strncpy(cpuinfo, "RISCV64", length);
 #elif defined(S390)
   strncpy(cpuinfo, "S390", length);
 #elif defined(SPARC)
diff --git a/src/hotspot/os_cpu/linux_riscv/assembler_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/assembler_linux_riscv.cpp
new file mode 100644
index 00000000000..f2610af6cdd
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/assembler_linux_riscv.cpp
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+// nothing required here
diff --git a/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
new file mode 100644
index 00000000000..761da5d743e
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_HPP
+
+#include "runtime/vm_version.hpp"
+
+// Implementation of class atomic
+
+// Note that memory_order_conservative requires a full barrier after atomic stores.
+// See https://patchwork.kernel.org/patch/3575821/
+
+template<size_t byte_size>
+struct Atomic::PlatformAdd {
+  template<typename D, typename I>
+  D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
+    D res = __atomic_add_fetch(dest, add_value, __ATOMIC_RELEASE);
+    FULL_MEM_BARRIER;
+    return res;
+  }
+
+  template<typename D, typename I>
+  D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
+    return add_and_fetch(dest, add_value, order) - add_value;
+  }
+};
+
+template<size_t byte_size>
+template<typename T>
+inline T Atomic::PlatformXchg<byte_size>::operator()(T volatile* dest,
+                                                     T exchange_value,
+                                                     atomic_memory_order order) const {
+  STATIC_ASSERT(byte_size == sizeof(T));
+  T res = __atomic_exchange_n(dest, exchange_value, __ATOMIC_RELEASE);
+  FULL_MEM_BARRIER;
+  return res;
+}
+
+// __attribute__((unused)) on dest is to get rid of spurious GCC warnings.
+template<size_t byte_size>
+template<typename T>
+inline T Atomic::PlatformCmpxchg<byte_size>::operator()(T volatile* dest __attribute__((unused)),
+                                                        T compare_value,
+                                                        T exchange_value,
+                                                        atomic_memory_order order) const {
+  STATIC_ASSERT(byte_size == sizeof(T));
+  T value = compare_value;
+  if (order != memory_order_relaxed) {
+    FULL_MEM_BARRIER;
+  }
+
+  __atomic_compare_exchange(dest, &value, &exchange_value, /* weak */ false,
+                            __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+
+  if (order != memory_order_relaxed) {
+    FULL_MEM_BARRIER;
+  }
+  return value;
+}
+
+template<>
+template<typename T>
+inline T Atomic::PlatformCmpxchg<4>::operator()(T volatile* dest __attribute__((unused)),
+                                                T compare_value,
+                                                T exchange_value,
+                                                atomic_memory_order order) const {
+  STATIC_ASSERT(4 == sizeof(T));
+  if (order != memory_order_relaxed) {
+    FULL_MEM_BARRIER;
+  }
+  T rv;
+  int tmp;
+  __asm volatile(
+    "1:\n\t"
+    " addiw     %[tmp], %[cv], 0\n\t" // make sure compare_value signed_extend
+    " lr.w.aq   %[rv], (%[dest])\n\t"
+    " bne       %[rv], %[tmp], 2f\n\t"
+    " sc.w.rl   %[tmp], %[ev], (%[dest])\n\t"
+    " bnez      %[tmp], 1b\n\t"
+    "2:\n\t"
+    : [rv] "=&r" (rv), [tmp] "=&r" (tmp)
+    : [ev] "r" (exchange_value), [dest] "r" (dest), [cv] "r" (compare_value)
+    : "memory");
+  if (order != memory_order_relaxed) {
+    FULL_MEM_BARRIER;
+  }
+  return rv;
+}
+
+template<size_t byte_size>
+struct Atomic::PlatformOrderedLoad<byte_size, X_ACQUIRE>
+{
+  template <typename T>
+  T operator()(const volatile T* p) const { T data; __atomic_load(const_cast<T*>(p), &data, __ATOMIC_ACQUIRE); return data; }
+};
+
+template<size_t byte_size>
+struct Atomic::PlatformOrderedStore<byte_size, RELEASE_X>
+{
+  template <typename T>
+  void operator()(volatile T* p, T v) const { __atomic_store(const_cast<T*>(p), &v, __ATOMIC_RELEASE); }
+};
+
+template<size_t byte_size>
+struct Atomic::PlatformOrderedStore<byte_size, RELEASE_X_FENCE>
+{
+  template <typename T>
+  void operator()(volatile T* p, T v) const { release_store(p, v); OrderAccess::fence(); }
+};
+
+#endif // OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/bytes_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/bytes_linux_riscv.hpp
new file mode 100644
index 00000000000..28868c76406
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/bytes_linux_riscv.hpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_BYTES_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_BYTES_LINUX_RISCV_HPP
+
+#include <byteswap.h>
+
+// Efficient swapping of data bytes from Java byte
+// ordering to native byte ordering and vice versa.
+inline u2   Bytes::swap_u2(u2 x) {
+  return bswap_16(x);
+}
+
+inline u4   Bytes::swap_u4(u4 x) {
+  return bswap_32(x);
+}
+
+inline u8 Bytes::swap_u8(u8 x) {
+  return bswap_64(x);
+}
+
+#endif // OS_CPU_LINUX_RISCV_BYTES_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/copy_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/copy_linux_riscv.hpp
new file mode 100644
index 00000000000..147cfdf3c10
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/copy_linux_riscv.hpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_VM_COPY_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_VM_COPY_LINUX_RISCV_HPP
+
+// Empty for build system
+
+#endif // OS_CPU_LINUX_RISCV_VM_COPY_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/gc/z/zSyscall_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/gc/z/zSyscall_linux_riscv.hpp
new file mode 100644
index 00000000000..1aa58f27871
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/gc/z/zSyscall_linux_riscv.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_GC_Z_ZSYSCALL_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_GC_Z_ZSYSCALL_LINUX_RISCV_HPP
+
+#include <sys/syscall.h>
+
+//
+// Support for building on older Linux systems
+//
+
+#ifndef SYS_memfd_create
+#define SYS_memfd_create     279
+#endif
+#ifndef SYS_fallocate
+#define SYS_fallocate        47
+#endif
+
+#endif // OS_CPU_LINUX_RISCV_GC_Z_ZSYSCALL_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/globals_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/globals_linux_riscv.hpp
new file mode 100644
index 00000000000..297414bfcd5
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/globals_linux_riscv.hpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_VM_GLOBALS_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_VM_GLOBALS_LINUX_RISCV_HPP
+
+// Sets the default values for platform dependent flags used by the runtime system.
+// (see globals.hpp)
+
+define_pd_global(bool,  DontYieldALot,            false);
+define_pd_global(intx,  ThreadStackSize,          2048); // 0 => use system default
+define_pd_global(intx,  VMThreadStackSize,        2048);
+
+define_pd_global(intx,  CompilerThreadStackSize,  2048);
+
+define_pd_global(uintx, JVMInvokeMethodSlack,     8192);
+
+// Used on 64 bit platforms for UseCompressedOops base address
+define_pd_global(uintx, HeapBaseMinAddress,       2 * G);
+
+#endif // OS_CPU_LINUX_RISCV_VM_GLOBALS_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
new file mode 100644
index 00000000000..1c33dc1e87f
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/orderAccess_linux_riscv.hpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_ORDERACCESS_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_ORDERACCESS_LINUX_RISCV_HPP
+
+// Included in orderAccess.hpp header file.
+
+#include "runtime/vm_version.hpp"
+
+// Implementation of class OrderAccess.
+
+inline void OrderAccess::loadload()   { acquire(); }
+inline void OrderAccess::storestore() { release(); }
+inline void OrderAccess::loadstore()  { acquire(); }
+inline void OrderAccess::storeload()  { fence(); }
+
+#define FULL_MEM_BARRIER  __sync_synchronize()
+#define READ_MEM_BARRIER  __atomic_thread_fence(__ATOMIC_ACQUIRE);
+#define WRITE_MEM_BARRIER __atomic_thread_fence(__ATOMIC_RELEASE);
+
+inline void OrderAccess::acquire() {
+  READ_MEM_BARRIER;
+}
+
+inline void OrderAccess::release() {
+  WRITE_MEM_BARRIER;
+}
+
+inline void OrderAccess::fence() {
+  FULL_MEM_BARRIER;
+}
+
+inline void OrderAccess::cross_modify_fence_impl() {
+  asm volatile("fence.i" : : : "memory");
+  if (UseConservativeFence) {
+    asm volatile("fence ir, ir" : : : "memory");
+  }
+}
+
+#endif // OS_CPU_LINUX_RISCV_ORDERACCESS_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
new file mode 100644
index 00000000000..1f46bbab0a2
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+// no precompiled headers
+#include "asm/macroAssembler.hpp"
+#include "classfile/vmSymbols.hpp"
+#include "code/codeCache.hpp"
+#include "code/icBuffer.hpp"
+#include "code/nativeInst.hpp"
+#include "code/vtableStubs.hpp"
+#include "interpreter/interpreter.hpp"
+#include "jvm.h"
+#include "memory/allocation.inline.hpp"
+#include "os_share_linux.hpp"
+#include "prims/jniFastGetField.hpp"
+#include "prims/jvm_misc.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/java.hpp"
+#include "runtime/javaCalls.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/osThread.hpp"
+#include "runtime/safepointMechanism.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/thread.inline.hpp"
+#include "runtime/timer.hpp"
+#include "signals_posix.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/events.hpp"
+#include "utilities/vmError.hpp"
+
+// put OS-includes here
+# include <dlfcn.h>
+# include <fpu_control.h>
+# include <errno.h>
+# include <pthread.h>
+# include <signal.h>
+# include <stdio.h>
+# include <stdlib.h>
+# include <sys/mman.h>
+# include <sys/resource.h>
+# include <sys/socket.h>
+# include <sys/stat.h>
+# include <sys/time.h>
+# include <sys/types.h>
+# include <sys/utsname.h>
+# include <sys/wait.h>
+# include <poll.h>
+# include <pwd.h>
+# include <ucontext.h>
+# include <unistd.h>
+
+#define REG_LR       1
+#define REG_FP       8
+
+NOINLINE address os::current_stack_pointer() {
+  return (address)__builtin_frame_address(0);
+}
+
+char* os::non_memory_address_word() {
+  // Must never look like an address returned by reserve_memory,
+  return (char*) -1;
+}
+
+address os::Posix::ucontext_get_pc(const ucontext_t * uc) {
+  return (address)uc->uc_mcontext.__gregs[REG_PC];
+}
+
+void os::Posix::ucontext_set_pc(ucontext_t * uc, address pc) {
+  uc->uc_mcontext.__gregs[REG_PC] = (intptr_t)pc;
+}
+
+intptr_t* os::Linux::ucontext_get_sp(const ucontext_t * uc) {
+  return (intptr_t*)uc->uc_mcontext.__gregs[REG_SP];
+}
+
+intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) {
+  return (intptr_t*)uc->uc_mcontext.__gregs[REG_FP];
+}
+
+address os::fetch_frame_from_context(const void* ucVoid,
+                                     intptr_t** ret_sp, intptr_t** ret_fp) {
+  address epc;
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+
+  if (uc != NULL) {
+    epc = os::Posix::ucontext_get_pc(uc);
+    if (ret_sp != NULL) {
+      *ret_sp = os::Linux::ucontext_get_sp(uc);
+    }
+    if (ret_fp != NULL) {
+      *ret_fp = os::Linux::ucontext_get_fp(uc);
+    }
+  } else {
+    epc = NULL;
+    if (ret_sp != NULL) {
+      *ret_sp = (intptr_t *)NULL;
+    }
+    if (ret_fp != NULL) {
+      *ret_fp = (intptr_t *)NULL;
+    }
+  }
+
+  return epc;
+}
+
+frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  // In compiled code, the stack banging is performed before RA
+  // has been saved in the frame. RA is live, and SP and FP
+  // belong to the caller.
+  intptr_t* frame_fp = os::Linux::ucontext_get_fp(uc);
+  intptr_t* frame_sp = os::Linux::ucontext_get_sp(uc);
+  address frame_pc = (address)(uc->uc_mcontext.__gregs[REG_LR]
+                         - NativeInstruction::instruction_size);
+  return frame(frame_sp, frame_fp, frame_pc);
+}
+
+frame os::fetch_frame_from_context(const void* ucVoid) {
+  intptr_t* frame_sp = NULL;
+  intptr_t* frame_fp = NULL;
+  address epc = fetch_frame_from_context(ucVoid, &frame_sp, &frame_fp);
+  return frame(frame_sp, frame_fp, epc);
+}
+
+// By default, gcc always saves frame pointer rfp on this stack. This
+// may get turned off by -fomit-frame-pointer.
+frame os::get_sender_for_C_frame(frame* fr) {
+  return frame(fr->sender_sp(), fr->link(), fr->sender_pc());
+}
+
+NOINLINE frame os::current_frame() {
+  intptr_t **sender_sp = (intptr_t **)__builtin_frame_address(0);
+  if (sender_sp != NULL) {
+    frame myframe((intptr_t*)os::current_stack_pointer(),
+                  sender_sp[frame::link_offset],
+                  CAST_FROM_FN_PTR(address, os::current_frame));
+    if (os::is_first_C_frame(&myframe)) {
+      // stack is not walkable
+      return frame();
+    } else {
+      return os::get_sender_for_C_frame(&myframe);
+    }
+  } else {
+    ShouldNotReachHere();
+    return frame();
+  }
+}
+
+// Utility functions
+bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
+                                             ucontext_t* uc, JavaThread* thread) {
+
+  // decide if this trap can be handled by a stub
+  address stub = NULL;
+
+  address pc = NULL;
+
+  //%note os_trap_1
+  if (info != NULL && uc != NULL && thread != NULL) {
+    pc = (address) os::Posix::ucontext_get_pc(uc);
+
+    address addr = (address) info->si_addr;
+
+    // Make sure the high order byte is sign extended, as it may be masked away by the hardware.
+    if ((uintptr_t(addr) & (uintptr_t(1) << 55)) != 0) {
+      addr = address(uintptr_t(addr) | (uintptr_t(0xFF) << 56));
+    }
+
+    // Handle ALL stack overflow variations here
+    if (sig == SIGSEGV) {
+      // check if fault address is within thread stack
+      if (thread->is_in_full_stack(addr)) {
+        if (os::Posix::handle_stack_overflow(thread, addr, pc, uc, &stub)) {
+          return true; // continue
+        }
+      }
+    }
+
+    if (thread->thread_state() == _thread_in_Java) {
+      // Java thread running in Java code => find exception handler if any
+      // a fault inside compiled code, the interpreter, or a stub
+
+      // Handle signal from NativeJump::patch_verified_entry().
+      if ((sig == SIGILL || sig == SIGTRAP)
+          && nativeInstruction_at(pc)->is_sigill_zombie_not_entrant()) {
+        if (TraceTraps) {
+          tty->print_cr("trap: zombie_not_entrant (%s)", (sig == SIGTRAP) ? "SIGTRAP" : "SIGILL");
+        }
+        stub = SharedRuntime::get_handle_wrong_method_stub();
+      } else if (sig == SIGSEGV && SafepointMechanism::is_poll_address((address)info->si_addr)) {
+        stub = SharedRuntime::get_poll_stub(pc);
+      } else if (sig == SIGBUS /* && info->si_code == BUS_OBJERR */) {
+        // BugId 4454115: A read from a MappedByteBuffer can fault
+        // here if the underlying file has been truncated.
+        // Do not crash the VM in such a case.
+        CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
+        CompiledMethod* nm = (cb != NULL) ? cb->as_compiled_method_or_null() : NULL;
+        bool is_unsafe_arraycopy = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc));
+        if ((nm != NULL && nm->has_unsafe_access()) || is_unsafe_arraycopy) {
+          address next_pc = pc + NativeCall::instruction_size;
+          if (is_unsafe_arraycopy) {
+            next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+          }
+          stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
+        }
+      } else if (sig == SIGILL && nativeInstruction_at(pc)->is_stop()) {
+        // Pull a pointer to the error message out of the instruction
+        // stream.
+        const uint64_t *detail_msg_ptr
+          = (uint64_t*)(pc + NativeInstruction::instruction_size);
+        const char *detail_msg = (const char *)*detail_msg_ptr;
+        const char *msg = "stop";
+        if (TraceTraps) {
+          tty->print_cr("trap: %s: (SIGILL)", msg);
+        }
+
+        // End life with a fatal error, message and detail message and the context.
+        // Note: no need to do any post-processing here (e.g. signal chaining)
+        va_list va_dummy;
+        VMError::report_and_die(thread, uc, NULL, 0, msg, detail_msg, va_dummy);
+        va_end(va_dummy);
+
+        ShouldNotReachHere();
+      } else if (sig == SIGFPE  &&
+          (info->si_code == FPE_INTDIV || info->si_code == FPE_FLTDIV)) {
+        stub =
+          SharedRuntime::
+          continuation_for_implicit_exception(thread,
+                                              pc,
+                                              SharedRuntime::
+                                              IMPLICIT_DIVIDE_BY_ZERO);
+      } else if (sig == SIGSEGV &&
+                 MacroAssembler::uses_implicit_null_check((void*)addr)) {
+          // Determination of interpreter/vtable stub/compiled code null exception
+          stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
+      }
+    } else if ((thread->thread_state() == _thread_in_vm ||
+                thread->thread_state() == _thread_in_native) &&
+                sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
+                thread->doing_unsafe_access()) {
+      address next_pc = pc + NativeCall::instruction_size;
+      if (UnsafeCopyMemory::contains_pc(pc)) {
+        next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
+      }
+      stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
+    }
+
+    // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in
+    // and the heap gets shrunk before the field access.
+    if ((sig == SIGSEGV) || (sig == SIGBUS)) {
+      address addr_slow = JNI_FastGetField::find_slowcase_pc(pc);
+      if (addr_slow != (address)-1) {
+        stub = addr_slow;
+      }
+    }
+  }
+
+  if (stub != NULL) {
+    // save all thread context in case we need to restore it
+    if (thread != NULL) {
+      thread->set_saved_exception_pc(pc);
+    }
+
+    os::Posix::ucontext_set_pc(uc, stub);
+    return true;
+  }
+
+  return false; // Mute compiler
+}
+
+void os::Linux::init_thread_fpu_state(void) {
+}
+
+int os::Linux::get_fpu_control_word(void) {
+  return 0;
+}
+
+void os::Linux::set_fpu_control_word(int fpu_control) {
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// thread stack
+
+// Minimum usable stack sizes required to get to user code. Space for
+// HotSpot guard pages is added later.
+size_t os::Posix::_compiler_thread_min_stack_allowed = 72 * K;
+size_t os::Posix::_java_thread_min_stack_allowed = 72 * K;
+size_t os::Posix::_vm_internal_thread_min_stack_allowed = 72 * K;
+
+// return default stack size for thr_type
+size_t os::Posix::default_stack_size(os::ThreadType thr_type) {
+  // default stack size (compiler thread needs larger stack)
+  size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M);
+  return s;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// helper functions for fatal error handler
+
+static const char* reg_abi_names[] = {
+  "pc",
+  "x1(ra)", "x2(sp)", "x3(gp)", "x4(tp)",
+  "x5(t0)", "x6(t1)", "x7(t2)",
+  "x8(s0)", "x9(s1)",
+  "x10(a0)", "x11(a1)", "x12(a2)", "x13(a3)", "x14(a4)", "x15(a5)", "x16(a6)", "x17(a7)",
+  "x18(s2)", "x19(s3)", "x20(s4)", "x21(s5)", "x22(s6)", "x23(s7)", "x24(s8)", "x25(s9)", "x26(s10)", "x27(s11)",
+  "x28(t3)", "x29(t4)","x30(t5)", "x31(t6)"
+};
+
+void os::print_context(outputStream *st, const void *context) {
+  if (context == NULL) {
+    return;
+  }
+
+  const ucontext_t *uc = (const ucontext_t*)context;
+  st->print_cr("Registers:");
+  for (int r = 0; r < 32; r++) {
+    st->print("%-*.*s=", 8, 8, reg_abi_names[r]);
+    print_location(st, uc->uc_mcontext.__gregs[r]);
+  }
+  st->cr();
+
+  intptr_t *frame_sp = (intptr_t *)os::Linux::ucontext_get_sp(uc);
+  st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", p2i(frame_sp));
+  print_hex_dump(st, (address)frame_sp, (address)(frame_sp + 64), sizeof(intptr_t));
+  st->cr();
+
+  // Note: it may be unsafe to inspect memory near pc. For example, pc may
+  // point to garbage if entry point in an nmethod is corrupted. Leave
+  // this at the end, and hope for the best.
+  address pc = os::Posix::ucontext_get_pc(uc);
+  print_instructions(st, pc, sizeof(char));
+  st->cr();
+}
+
+void os::print_register_info(outputStream *st, const void *context) {
+  if (context == NULL) {
+    return;
+  }
+
+  const ucontext_t *uc = (const ucontext_t*)context;
+
+  st->print_cr("Register to memory mapping:");
+  st->cr();
+
+  // this is horrendously verbose but the layout of the registers in the
+  // context does not match how we defined our abstract Register set, so
+  // we can't just iterate through the gregs area
+
+  // this is only for the "general purpose" registers
+
+  for (int r = 0; r < 32; r++)
+    st->print_cr("%-*.*s=" INTPTR_FORMAT, 8, 8, reg_abi_names[r], (uintptr_t)uc->uc_mcontext.__gregs[r]);
+  st->cr();
+}
+
+void os::setup_fpu() {
+}
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+  assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
+}
+#endif
+
+int os::extra_bang_size_in_bytes() {
+  return 0;
+}
+
+extern "C" {
+  int SpinPause() {
+    return 0;
+  }
+
+  void _Copy_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) {
+    if (from > to) {
+      const jshort *end = from + count;
+      while (from < end) {
+        *(to++) = *(from++);
+      }
+    } else if (from < to) {
+      const jshort *end = from;
+      from += count - 1;
+      to   += count - 1;
+      while (from >= end) {
+        *(to--) = *(from--);
+      }
+    }
+  }
+  void _Copy_conjoint_jints_atomic(const jint* from, jint* to, size_t count) {
+    if (from > to) {
+      const jint *end = from + count;
+      while (from < end) {
+        *(to++) = *(from++);
+      }
+    } else if (from < to) {
+      const jint *end = from;
+      from += count - 1;
+      to   += count - 1;
+      while (from >= end) {
+        *(to--) = *(from--);
+      }
+    }
+  }
+  void _Copy_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) {
+    if (from > to) {
+      const jlong *end = from + count;
+      while (from < end) {
+        os::atomic_copy64(from++, to++);
+      }
+    } else if (from < to) {
+      const jlong *end = from;
+      from += count - 1;
+      to   += count - 1;
+      while (from >= end) {
+        os::atomic_copy64(from--, to--);
+      }
+    }
+  }
+
+  void _Copy_arrayof_conjoint_bytes(const HeapWord* from,
+                                    HeapWord* to,
+                                    size_t    count) {
+    memmove(to, from, count);
+  }
+  void _Copy_arrayof_conjoint_jshorts(const HeapWord* from,
+                                      HeapWord* to,
+                                      size_t    count) {
+    memmove(to, from, count * 2);
+  }
+  void _Copy_arrayof_conjoint_jints(const HeapWord* from,
+                                    HeapWord* to,
+                                    size_t    count) {
+    memmove(to, from, count * 4);
+  }
+  void _Copy_arrayof_conjoint_jlongs(const HeapWord* from,
+                                     HeapWord* to,
+                                     size_t    count) {
+    memmove(to, from, count * 8);
+  }
+};
diff --git a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.hpp
new file mode 100644
index 00000000000..6d415630661
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.hpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_VM_OS_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_VM_OS_LINUX_RISCV_HPP
+
+  static void setup_fpu();
+
+  // Used to register dynamic code cache area with the OS
+  // Note: Currently only used in 64 bit Windows implementations
+  static bool register_code_area(char *low, char *high) { return true; }
+
+  // Atomically copy 64 bits of data
+  static void atomic_copy64(const volatile void *src, volatile void *dst) {
+    *(jlong *) dst = *(const jlong *) src;
+  }
+
+  // SYSCALL_RISCV_FLUSH_ICACHE is used to flush instruction cache. The "fence.i" instruction
+  // only work on the current hart, so kernel provides the icache flush syscall to flush icache
+  // on each hart. You can pass a flag to determine a global or local icache flush.
+  static void icache_flush(long int start, long int end)
+  {
+    const int SYSCALL_RISCV_FLUSH_ICACHE = 259;
+    register long int __a7 asm ("a7") = SYSCALL_RISCV_FLUSH_ICACHE;
+    register long int __a0 asm ("a0") = start;
+    register long int __a1 asm ("a1") = end;
+    // the flush can be applied to either all threads or only the current.
+    // 0 means a global icache flush, and the icache flush will be applied
+    // to other harts concurrently executing.
+    register long int __a2 asm ("a2") = 0;
+    __asm__ volatile ("ecall\n\t"
+                      : "+r" (__a0)
+                      : "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a7)
+                      : "memory");
+  }
+
+#endif // OS_CPU_LINUX_RISCV_VM_OS_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/prefetch_linux_riscv.inline.hpp b/src/hotspot/os_cpu/linux_riscv/prefetch_linux_riscv.inline.hpp
new file mode 100644
index 00000000000..a6432c84ec7
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/prefetch_linux_riscv.inline.hpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_VM_PREFETCH_LINUX_RISCV_INLINE_HPP
+#define OS_CPU_LINUX_RISCV_VM_PREFETCH_LINUX_RISCV_INLINE_HPP
+
+#include "runtime/prefetch.hpp"
+
+
+inline void Prefetch::read (const void *loc, intx interval) {
+}
+
+inline void Prefetch::write(void *loc, intx interval) {
+}
+
+#endif // OS_CPU_LINUX_RISCV_VM_PREFETCH_LINUX_RISCV_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.cpp
new file mode 100644
index 00000000000..3100572e9fd
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.cpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/thread.inline.hpp"
+
+frame JavaThread::pd_last_frame() {
+  assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
+  return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
+}
+
+// For Forte Analyzer AsyncGetCallTrace profiling support - thread is
+// currently interrupted by SIGPROF
+bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr,
+  void* ucontext, bool isInJava) {
+
+  assert(Thread::current() == this, "caller must be current thread");
+  return pd_get_top_frame(fr_addr, ucontext, isInJava);
+}
+
+bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava) {
+  return pd_get_top_frame(fr_addr, ucontext, isInJava);
+}
+
+bool JavaThread::pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava) {
+  // If we have a last_Java_frame, then we should use it even if
+  // isInJava == true.  It should be more reliable than ucontext info.
+  if (has_last_Java_frame() && frame_anchor()->walkable()) {
+    *fr_addr = pd_last_frame();
+    return true;
+  }
+
+  // At this point, we don't have a last_Java_frame, so
+  // we try to glean some information out of the ucontext
+  // if we were running Java code when SIGPROF came in.
+  if (isInJava) {
+    ucontext_t* uc = (ucontext_t*) ucontext;
+
+    intptr_t* ret_fp = NULL;
+    intptr_t* ret_sp = NULL;
+    address addr = os::fetch_frame_from_context(uc, &ret_sp, &ret_fp);
+    if (addr == NULL || ret_sp == NULL ) {
+      // ucontext wasn't useful
+      return false;
+    }
+
+    frame ret_frame(ret_sp, ret_fp, addr);
+    if (!ret_frame.safe_for_sender(this)) {
+#ifdef COMPILER2
+      frame ret_frame2(ret_sp, NULL, addr);
+      if (!ret_frame2.safe_for_sender(this)) {
+        // nothing else to try if the frame isn't good
+        return false;
+      }
+      ret_frame = ret_frame2;
+#else
+      // nothing else to try if the frame isn't good
+      return false;
+#endif /* COMPILER2 */
+    }
+    *fr_addr = ret_frame;
+    return true;
+  }
+
+  // nothing else to try
+  return false;
+}
+
+void JavaThread::cache_global_variables() { }
diff --git a/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.hpp
new file mode 100644
index 00000000000..61e2cf85b63
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/thread_linux_riscv.hpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_THREAD_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_THREAD_LINUX_RISCV_HPP
+
+ private:
+  void pd_initialize() {
+    _anchor.clear();
+  }
+
+  frame pd_last_frame();
+
+ public:
+  static ByteSize last_Java_fp_offset()          {
+    return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_Java_fp_offset();
+  }
+
+  bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext,
+    bool isInJava);
+
+  bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);
+private:
+  bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava);
+
+#endif // OS_CPU_LINUX_RISCV_THREAD_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
new file mode 100644
index 00000000000..6cf7683a586
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_RISCV_VM_VMSTRUCTS_LINUX_RISCV_HPP
+#define OS_CPU_LINUX_RISCV_VM_VMSTRUCTS_LINUX_RISCV_HPP
+
+// These are the OS and CPU-specific fields, types and integer
+// constants required by the Serviceability Agent. This file is
+// referenced by vmStructs.cpp.
+
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+                                                                                                                                     \
+  /******************************/                                                                                                   \
+  /* Threads (NOTE: incomplete) */                                                                                                   \
+  /******************************/                                                                                                   \
+  nonstatic_field(OSThread,                      _thread_id,                                      OSThread::thread_id_t)             \
+  nonstatic_field(OSThread,                      _pthread_id,                                     pthread_t)
+
+
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
+                                                                          \
+  /**********************/                                                \
+  /* Posix Thread IDs   */                                                \
+  /**********************/                                                \
+                                                                          \
+  declare_integer_type(OSThread::thread_id_t)                             \
+  declare_unsigned_integer_type(pthread_t)
+
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+
+#endif // OS_CPU_LINUX_RISCV_VM_VMSTRUCTS_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
new file mode 100644
index 00000000000..4623dbfad42
--- /dev/null
+++ b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/register.hpp"
+#include "runtime/os.hpp"
+#include "runtime/os.inline.hpp"
+#include "runtime/vm_version.hpp"
+
+#include <asm/hwcap.h>
+#include <sys/auxv.h>
+
+#ifndef HWCAP_ISA_I
+#define HWCAP_ISA_I  (1 << ('I' - 'A'))
+#endif
+
+#ifndef HWCAP_ISA_M
+#define HWCAP_ISA_M  (1 << ('M' - 'A'))
+#endif
+
+#ifndef HWCAP_ISA_A
+#define HWCAP_ISA_A  (1 << ('A' - 'A'))
+#endif
+
+#ifndef HWCAP_ISA_F
+#define HWCAP_ISA_F  (1 << ('F' - 'A'))
+#endif
+
+#ifndef HWCAP_ISA_D
+#define HWCAP_ISA_D  (1 << ('D' - 'A'))
+#endif
+
+#ifndef HWCAP_ISA_C
+#define HWCAP_ISA_C  (1 << ('C' - 'A'))
+#endif
+
+#ifndef HWCAP_ISA_V
+#define HWCAP_ISA_V  (1 << ('V' - 'A'))
+#endif
+
+#ifndef HWCAP_ISA_B
+#define HWCAP_ISA_B  (1 << ('B' - 'A'))
+#endif
+
+#define read_csr(csr)                                           \
+({                                                              \
+        register unsigned long __v;                             \
+        __asm__ __volatile__ ("csrr %0, %1"                     \
+                              : "=r" (__v)                      \
+                              : "i" (csr)                       \
+                              : "memory");                      \
+        __v;                                                    \
+})
+
+uint32_t VM_Version::get_current_vector_length() {
+  assert(_features & CPU_V, "should not call this");
+  return (uint32_t)read_csr(CSR_VLENB);
+}
+
+void VM_Version::get_os_cpu_info() {
+
+  uint64_t auxv = getauxval(AT_HWCAP);
+
+  static_assert(CPU_I == HWCAP_ISA_I, "Flag CPU_I must follow Linux HWCAP");
+  static_assert(CPU_M == HWCAP_ISA_M, "Flag CPU_M must follow Linux HWCAP");
+  static_assert(CPU_A == HWCAP_ISA_A, "Flag CPU_A must follow Linux HWCAP");
+  static_assert(CPU_F == HWCAP_ISA_F, "Flag CPU_F must follow Linux HWCAP");
+  static_assert(CPU_D == HWCAP_ISA_D, "Flag CPU_D must follow Linux HWCAP");
+  static_assert(CPU_C == HWCAP_ISA_C, "Flag CPU_C must follow Linux HWCAP");
+  static_assert(CPU_V == HWCAP_ISA_V, "Flag CPU_V must follow Linux HWCAP");
+  static_assert(CPU_B == HWCAP_ISA_B, "Flag CPU_B must follow Linux HWCAP");
+  _features = auxv & (
+      HWCAP_ISA_I |
+      HWCAP_ISA_M |
+      HWCAP_ISA_A |
+      HWCAP_ISA_F |
+      HWCAP_ISA_D |
+      HWCAP_ISA_C |
+      HWCAP_ISA_V |
+      HWCAP_ISA_B);
+
+  if (FILE *f = fopen("/proc/cpuinfo", "r")) {
+    char buf[512], *p;
+    while (fgets(buf, sizeof (buf), f) != NULL) {
+      if ((p = strchr(buf, ':')) != NULL) {
+        if (strncmp(buf, "uarch", sizeof "uarch" - 1) == 0) {
+          char* uarch = os::strdup(p + 2);
+          uarch[strcspn(uarch, "\n")] = '\0';
+          _uarch = uarch;
+          break;
+        }
+      }
+    }
+    fclose(f);
+  }
+}
diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index d27b9175c9d..33f0a59c758 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -186,7 +186,6 @@ bool LIR_Opr::is_oop() const {
 void LIR_Op2::verify() const {
 #ifdef ASSERT
   switch (code()) {
-    case lir_cmove:
     case lir_xchg:
       break;
 
@@ -237,8 +236,7 @@ void LIR_Op2::verify() const {
 
 
 LIR_OpBranch::LIR_OpBranch(LIR_Condition cond, BlockBegin* block)
-  : LIR_Op(lir_branch, LIR_OprFact::illegalOpr, (CodeEmitInfo*)NULL)
-  , _cond(cond)
+  : LIR_Op2(lir_branch, cond, LIR_OprFact::illegalOpr, LIR_OprFact::illegalOpr, (CodeEmitInfo*)NULL)
   , _label(block->label())
   , _block(block)
   , _ublock(NULL)
@@ -246,8 +244,7 @@ LIR_OpBranch::LIR_OpBranch(LIR_Condition cond, BlockBegin* block)
 }
 
 LIR_OpBranch::LIR_OpBranch(LIR_Condition cond, CodeStub* stub) :
-  LIR_Op(lir_branch, LIR_OprFact::illegalOpr, (CodeEmitInfo*)NULL)
-  , _cond(cond)
+  LIR_Op2(lir_branch, cond, LIR_OprFact::illegalOpr, LIR_OprFact::illegalOpr, (CodeEmitInfo*)NULL)
   , _label(stub->entry())
   , _block(NULL)
   , _ublock(NULL)
@@ -255,8 +252,7 @@ LIR_OpBranch::LIR_OpBranch(LIR_Condition cond, CodeStub* stub) :
 }
 
 LIR_OpBranch::LIR_OpBranch(LIR_Condition cond, BlockBegin* block, BlockBegin* ublock)
-  : LIR_Op(lir_cond_float_branch, LIR_OprFact::illegalOpr, (CodeEmitInfo*)NULL)
-  , _cond(cond)
+  : LIR_Op2(lir_cond_float_branch, cond, LIR_OprFact::illegalOpr, LIR_OprFact::illegalOpr, (CodeEmitInfo*)NULL)
   , _label(block->label())
   , _block(block)
   , _ublock(ublock)
@@ -278,13 +274,13 @@ void LIR_OpBranch::change_ublock(BlockBegin* b) {
 }
 
 void LIR_OpBranch::negate_cond() {
-  switch (_cond) {
-    case lir_cond_equal:        _cond = lir_cond_notEqual;     break;
-    case lir_cond_notEqual:     _cond = lir_cond_equal;        break;
-    case lir_cond_less:         _cond = lir_cond_greaterEqual; break;
-    case lir_cond_lessEqual:    _cond = lir_cond_greater;      break;
-    case lir_cond_greaterEqual: _cond = lir_cond_less;         break;
-    case lir_cond_greater:      _cond = lir_cond_lessEqual;    break;
+  switch (cond()) {
+    case lir_cond_equal:        set_cond(lir_cond_notEqual);     break;
+    case lir_cond_notEqual:     set_cond(lir_cond_equal);        break;
+    case lir_cond_less:         set_cond(lir_cond_greaterEqual); break;
+    case lir_cond_lessEqual:    set_cond(lir_cond_greater);      break;
+    case lir_cond_greaterEqual: set_cond(lir_cond_less);         break;
+    case lir_cond_greater:      set_cond(lir_cond_lessEqual);    break;
     default: ShouldNotReachHere();
   }
 }
@@ -507,6 +503,13 @@ void LIR_OpVisitState::visit(LIR_Op* op) {
       assert(op->as_OpBranch() != NULL, "must be");
       LIR_OpBranch* opBranch = (LIR_OpBranch*)op;
 
+      assert(opBranch->_tmp1->is_illegal() && opBranch->_tmp2->is_illegal() &&
+             opBranch->_tmp3->is_illegal() && opBranch->_tmp4->is_illegal() &&
+             opBranch->_tmp5->is_illegal(), "not used");
+
+      if (opBranch->_opr1->is_valid()) do_input(opBranch->_opr1);
+      if (opBranch->_opr2->is_valid()) do_input(opBranch->_opr2);
+
       if (opBranch->_info != NULL)     do_info(opBranch->_info);
       assert(opBranch->_result->is_illegal(), "not used");
       if (opBranch->_stub != NULL)     opBranch->stub()->visit(this);
@@ -595,17 +598,19 @@ void LIR_OpVisitState::visit(LIR_Op* op) {
     // to the result operand, otherwise the backend fails
     case lir_cmove:
     {
-      assert(op->as_Op2() != NULL, "must be");
-      LIR_Op2* op2 = (LIR_Op2*)op;
+      assert(op->as_Op4() != NULL, "must be");
+      LIR_Op4* op4 = (LIR_Op4*)op;
 
-      assert(op2->_info == NULL && op2->_tmp1->is_illegal() && op2->_tmp2->is_illegal() &&
-             op2->_tmp3->is_illegal() && op2->_tmp4->is_illegal() && op2->_tmp5->is_illegal(), "not used");
-      assert(op2->_opr1->is_valid() && op2->_opr2->is_valid() && op2->_result->is_valid(), "used");
+      assert(op4->_info == NULL && op4->_tmp1->is_illegal() && op4->_tmp2->is_illegal() &&
+             op4->_tmp3->is_illegal() && op4->_tmp4->is_illegal() && op4->_tmp5->is_illegal(), "not used");
+      assert(op4->_opr1->is_valid() && op4->_opr2->is_valid() && op4->_result->is_valid(), "used");
 
-      do_input(op2->_opr1);
-      do_input(op2->_opr2);
-      do_temp(op2->_opr2);
-      do_output(op2->_result);
+      do_input(op4->_opr1);
+      do_input(op4->_opr2);
+      if (op4->_opr3->is_valid()) do_input(op4->_opr3);
+      if (op4->_opr4->is_valid()) do_input(op4->_opr4);
+      do_temp(op4->_opr2);
+      do_output(op4->_result);
 
       break;
     }
@@ -1049,6 +1054,10 @@ void LIR_Op3::emit_code(LIR_Assembler* masm) {
   masm->emit_op3(this);
 }
 
+void LIR_Op4::emit_code(LIR_Assembler* masm) {
+  masm->emit_op4(this);
+}
+
 void LIR_OpLock::emit_code(LIR_Assembler* masm) {
   masm->emit_lock(this);
   if (stub()) {
@@ -1089,6 +1098,10 @@ LIR_List::LIR_List(Compilation* compilation, BlockBegin* block)
   , _file(NULL)
   , _line(0)
 #endif
+#ifdef RISCV
+  , _cmp_opr1(LIR_OprFact::illegalOpr)
+  , _cmp_opr2(LIR_OprFact::illegalOpr)
+#endif
 { }
 
 
@@ -1106,6 +1119,38 @@ void LIR_List::set_file_and_line(const char * file, int line) {
 }
 #endif
 
+#ifdef RISCV
+void LIR_List::set_cmp_oprs(LIR_Op* op) {
+  switch (op->code()) {
+    case lir_cmp:
+      _cmp_opr1 = op->as_Op2()->in_opr1();
+      _cmp_opr2 = op->as_Op2()->in_opr2();
+      break;
+    case lir_branch: // fall through
+    case lir_cond_float_branch:
+      assert(op->as_OpBranch()->cond() == lir_cond_always ||
+            (_cmp_opr1 != LIR_OprFact::illegalOpr && _cmp_opr2 != LIR_OprFact::illegalOpr),
+            "conditional branches must have legal operands");
+      if (op->as_OpBranch()->cond() != lir_cond_always) {
+        op->as_Op2()->set_in_opr1(_cmp_opr1);
+        op->as_Op2()->set_in_opr2(_cmp_opr2);
+      }
+      break;
+    case lir_cmove:
+      op->as_Op4()->set_in_opr3(_cmp_opr1);
+      op->as_Op4()->set_in_opr4(_cmp_opr2);
+      break;
+#if INCLUDE_ZGC
+    case lir_zloadbarrier_test:
+      _cmp_opr1 = FrameMap::as_opr(t1);
+      _cmp_opr2 = LIR_OprFact::intConst(0);
+      break;
+#endif
+    default:
+      break;
+  }
+}
+#endif
 
 void LIR_List::append(LIR_InsertionBuffer* buffer) {
   assert(this == buffer->lir_list(), "wrong lir list");
@@ -1677,7 +1722,6 @@ const char * LIR_Op::name() const {
      case lir_cmp_l2i:               s = "cmp_l2i";       break;
      case lir_ucmp_fd2i:             s = "ucomp_fd2i";    break;
      case lir_cmp_fd2i:              s = "comp_fd2i";     break;
-     case lir_cmove:                 s = "cmove";         break;
      case lir_add:                   s = "add";           break;
      case lir_sub:                   s = "sub";           break;
      case lir_mul:                   s = "mul";           break;
@@ -1700,6 +1744,8 @@ const char * LIR_Op::name() const {
      case lir_irem:                  s = "irem";          break;
      case lir_fmad:                  s = "fmad";          break;
      case lir_fmaf:                  s = "fmaf";          break;
+     // LIR_Op4
+     case lir_cmove:                 s = "cmove";         break;
      // LIR_OpJavaCall
      case lir_static_call:           s = "static";        break;
      case lir_optvirtual_call:       s = "optvirtual";    break;
@@ -1833,6 +1879,8 @@ void LIR_Op1::print_patch_code(outputStream* out, LIR_PatchCode code) {
 // LIR_OpBranch
 void LIR_OpBranch::print_instr(outputStream* out) const {
   print_condition(out, cond());             out->print(" ");
+  in_opr1()->print(out); out->print(" ");
+  in_opr2()->print(out); out->print(" ");
   if (block() != NULL) {
     out->print("[B%d] ", block()->block_id());
   } else if (stub() != NULL) {
@@ -1913,7 +1961,7 @@ void LIR_OpRoundFP::print_instr(outputStream* out) const {
 
 // LIR_Op2
 void LIR_Op2::print_instr(outputStream* out) const {
-  if (code() == lir_cmove || code() == lir_cmp) {
+  if (code() == lir_cmp || code() == lir_branch || code() == lir_cond_float_branch) {
     print_condition(out, condition());         out->print(" ");
   }
   in_opr1()->print(out);    out->print(" ");
@@ -1964,6 +2012,15 @@ void LIR_Op3::print_instr(outputStream* out) const {
   result_opr()->print(out);
 }
 
+// LIR_Op4
+void LIR_Op4::print_instr(outputStream* out) const {
+  print_condition(out, condition()); out->print(" ");
+  in_opr1()->print(out);             out->print(" ");
+  in_opr2()->print(out);             out->print(" ");
+  in_opr3()->print(out);             out->print(" ");
+  in_opr4()->print(out);             out->print(" ");
+  result_opr()->print(out);
+}
 
 void LIR_OpLock::print_instr(outputStream* out) const {
   hdr_opr()->print(out);   out->print(" ");
diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp
index c4504b7b8b5..c3afd5553a1 100644
--- a/src/hotspot/share/c1/c1_LIR.hpp
+++ b/src/hotspot/share/c1/c1_LIR.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -887,6 +887,7 @@ class    LIR_Op2;
 class    LIR_OpDelay;
 class    LIR_Op3;
 class      LIR_OpAllocArray;
+class    LIR_Op4;
 class    LIR_OpCall;
 class      LIR_OpJavaCall;
 class      LIR_OpRTCall;
@@ -931,8 +932,6 @@ enum LIR_Code {
       , lir_null_check
       , lir_return
       , lir_leal
-      , lir_branch
-      , lir_cond_float_branch
       , lir_move
       , lir_convert
       , lir_alloc_object
@@ -943,11 +942,12 @@ enum LIR_Code {
       , lir_load_klass
   , end_op1
   , begin_op2
+      , lir_branch
+      , lir_cond_float_branch
       , lir_cmp
       , lir_cmp_l2i
       , lir_ucmp_fd2i
       , lir_cmp_fd2i
-      , lir_cmove
       , lir_add
       , lir_sub
       , lir_mul
@@ -975,6 +975,9 @@ enum LIR_Code {
       , lir_fmad
       , lir_fmaf
   , end_op3
+  , begin_op4
+      , lir_cmove
+  , end_op4
   , begin_opJavaCall
       , lir_static_call
       , lir_optvirtual_call
@@ -1011,6 +1014,11 @@ enum LIR_Code {
   , begin_opAssert
     , lir_assert
   , end_opAssert
+#ifdef INCLUDE_ZGC
+  , begin_opZLoadBarrierTest
+    , lir_zloadbarrier_test
+  , end_opZLoadBarrierTest
+#endif
 };
 
 
@@ -1146,6 +1154,7 @@ class LIR_Op: public CompilationResourceObj {
   virtual LIR_Op1* as_Op1() { return NULL; }
   virtual LIR_Op2* as_Op2() { return NULL; }
   virtual LIR_Op3* as_Op3() { return NULL; }
+  virtual LIR_Op4* as_Op4() { return NULL; }
   virtual LIR_OpArrayCopy* as_OpArrayCopy() { return NULL; }
   virtual LIR_OpUpdateCRC32* as_OpUpdateCRC32() { return NULL; }
   virtual LIR_OpTypeCheck* as_OpTypeCheck() { return NULL; }
@@ -1419,45 +1428,6 @@ class LIR_OpRTCall: public LIR_OpCall {
 };
 
 
-class LIR_OpBranch: public LIR_Op {
- friend class LIR_OpVisitState;
-
- private:
-  LIR_Condition _cond;
-  Label*        _label;
-  BlockBegin*   _block;  // if this is a branch to a block, this is the block
-  BlockBegin*   _ublock; // if this is a float-branch, this is the unorderd block
-  CodeStub*     _stub;   // if this is a branch to a stub, this is the stub
-
- public:
-  LIR_OpBranch(LIR_Condition cond, Label* lbl)
-    : LIR_Op(lir_branch, LIR_OprFact::illegalOpr, (CodeEmitInfo*) NULL)
-    , _cond(cond)
-    , _label(lbl)
-    , _block(NULL)
-    , _ublock(NULL)
-    , _stub(NULL) { }
-
-  LIR_OpBranch(LIR_Condition cond, BlockBegin* block);
-  LIR_OpBranch(LIR_Condition cond, CodeStub* stub);
-
-  // for unordered comparisons
-  LIR_OpBranch(LIR_Condition cond, BlockBegin* block, BlockBegin* ublock);
-
-  LIR_Condition cond()        const              { return _cond;        }
-  Label*        label()       const              { return _label;       }
-  BlockBegin*   block()       const              { return _block;       }
-  BlockBegin*   ublock()      const              { return _ublock;      }
-  CodeStub*     stub()        const              { return _stub;       }
-
-  void          change_block(BlockBegin* b);
-  void          change_ublock(BlockBegin* b);
-  void          negate_cond();
-
-  virtual void emit_code(LIR_Assembler* masm);
-  virtual LIR_OpBranch* as_OpBranch() { return this; }
-  virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
-};
 
 class LIR_OpReturn: public LIR_Op1 {
  friend class LIR_OpVisitState;
@@ -1631,19 +1601,19 @@ class LIR_Op2: public LIR_Op {
   void verify() const;
 
  public:
-  LIR_Op2(LIR_Code code, LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, CodeEmitInfo* info = NULL)
+  LIR_Op2(LIR_Code code, LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, CodeEmitInfo* info = NULL, BasicType type = T_ILLEGAL)
     : LIR_Op(code, LIR_OprFact::illegalOpr, info)
     , _fpu_stack_size(0)
     , _opr1(opr1)
     , _opr2(opr2)
-    , _type(T_ILLEGAL)
+    , _type(type)
     , _tmp1(LIR_OprFact::illegalOpr)
     , _tmp2(LIR_OprFact::illegalOpr)
     , _tmp3(LIR_OprFact::illegalOpr)
     , _tmp4(LIR_OprFact::illegalOpr)
     , _tmp5(LIR_OprFact::illegalOpr)
     , _condition(condition) {
-    assert(code == lir_cmp || code == lir_assert, "code check");
+    assert(code == lir_cmp || code == lir_branch || code == lir_cond_float_branch || code == lir_assert, "code check");
   }
 
   LIR_Op2(LIR_Code code, LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type)
@@ -1675,7 +1645,7 @@ class LIR_Op2: public LIR_Op {
     , _tmp4(LIR_OprFact::illegalOpr)
     , _tmp5(LIR_OprFact::illegalOpr)
     , _condition(lir_cond_unknown) {
-    assert(code != lir_cmp && is_in_range(code, begin_op2, end_op2), "code check");
+    assert(code != lir_cmp && code != lir_branch && code != lir_cond_float_branch && is_in_range(code, begin_op2, end_op2), "code check");
   }
 
   LIR_Op2(LIR_Code code, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, LIR_Opr tmp1, LIR_Opr tmp2 = LIR_OprFact::illegalOpr,
@@ -1691,7 +1661,7 @@ class LIR_Op2: public LIR_Op {
     , _tmp4(tmp4)
     , _tmp5(tmp5)
     , _condition(lir_cond_unknown) {
-    assert(code != lir_cmp && is_in_range(code, begin_op2, end_op2), "code check");
+    assert(code != lir_cmp && code != lir_branch && code != lir_cond_float_branch && is_in_range(code, begin_op2, end_op2), "code check");
   }
 
   LIR_Opr in_opr1() const                        { return _opr1; }
@@ -1703,10 +1673,10 @@ class LIR_Op2: public LIR_Op {
   LIR_Opr tmp4_opr() const                       { return _tmp4; }
   LIR_Opr tmp5_opr() const                       { return _tmp5; }
   LIR_Condition condition() const  {
-    assert(code() == lir_cmp || code() == lir_cmove || code() == lir_assert, "only valid for cmp and cmove and assert"); return _condition;
+    assert(code() == lir_cmp || code() == lir_branch || code() == lir_cond_float_branch || code() == lir_assert, "only valid for branch and assert"); return _condition;
   }
   void set_condition(LIR_Condition condition) {
-    assert(code() == lir_cmp || code() == lir_cmove, "only valid for cmp and cmove");  _condition = condition;
+    assert(code() == lir_cmp || code() == lir_branch || code() == lir_cond_float_branch, "only valid for branch"); _condition = condition;
   }
 
   void set_fpu_stack_size(int size)              { _fpu_stack_size = size; }
@@ -1720,6 +1690,51 @@ class LIR_Op2: public LIR_Op {
   virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
 };
 
+class LIR_OpBranch: public LIR_Op2 {
+ friend class LIR_OpVisitState;
+
+ private:
+  Label*        _label;
+  BlockBegin*   _block;  // if this is a branch to a block, this is the block
+  BlockBegin*   _ublock; // if this is a float-branch, this is the unorderd block
+  CodeStub*     _stub;   // if this is a branch to a stub, this is the stub
+
+ public:
+  LIR_OpBranch(LIR_Condition cond, Label* lbl)
+    : LIR_Op2(lir_branch, cond, LIR_OprFact::illegalOpr, LIR_OprFact::illegalOpr, (CodeEmitInfo*) NULL)
+    , _label(lbl)
+    , _block(NULL)
+    , _ublock(NULL)
+    , _stub(NULL) { }
+
+  LIR_OpBranch(LIR_Condition cond, BlockBegin* block);
+  LIR_OpBranch(LIR_Condition cond, CodeStub* stub);
+
+  // for unordered comparisons
+  LIR_OpBranch(LIR_Condition cond, BlockBegin* block, BlockBegin* ublock);
+
+  LIR_Condition cond() const {
+    return condition();
+  }
+
+  void set_cond(LIR_Condition cond) {
+    set_condition(cond);
+  }
+
+  Label*        label()       const              { return _label;       }
+  BlockBegin*   block()       const              { return _block;       }
+  BlockBegin*   ublock()      const              { return _ublock;      }
+  CodeStub*     stub()        const              { return _stub;        }
+
+  void          change_block(BlockBegin* b);
+  void          change_ublock(BlockBegin* b);
+  void          negate_cond();
+
+  virtual void emit_code(LIR_Assembler* masm);
+  virtual LIR_OpBranch* as_OpBranch() { return this; }
+  virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
+};
+
 class LIR_OpAllocArray : public LIR_Op {
  friend class LIR_OpVisitState;
 
@@ -1783,6 +1798,63 @@ class LIR_Op3: public LIR_Op {
   virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
 };
 
+class LIR_Op4: public LIR_Op {
+  friend class LIR_OpVisitState;
+ protected:
+  LIR_Opr   _opr1;
+  LIR_Opr   _opr2;
+  LIR_Opr   _opr3;
+  LIR_Opr   _opr4;
+  BasicType _type;
+  LIR_Opr   _tmp1;
+  LIR_Opr   _tmp2;
+  LIR_Opr   _tmp3;
+  LIR_Opr   _tmp4;
+  LIR_Opr   _tmp5;
+  LIR_Condition _condition;
+
+ public:
+  LIR_Op4(LIR_Code code, LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr opr3, LIR_Opr opr4,
+          LIR_Opr result, BasicType type)
+    : LIR_Op(code, result, NULL)
+    , _opr1(opr1)
+    , _opr2(opr2)
+    , _opr3(opr3)
+    , _opr4(opr4)
+    , _type(type)
+    , _tmp1(LIR_OprFact::illegalOpr)
+    , _tmp2(LIR_OprFact::illegalOpr)
+    , _tmp3(LIR_OprFact::illegalOpr)
+    , _tmp4(LIR_OprFact::illegalOpr)
+    , _tmp5(LIR_OprFact::illegalOpr)
+    , _condition(condition) {
+    assert(code == lir_cmove, "code check");
+    assert(type != T_ILLEGAL, "cmove should have type");
+  }
+
+  LIR_Opr in_opr1() const                        { return _opr1; }
+  LIR_Opr in_opr2() const                        { return _opr2; }
+  LIR_Opr in_opr3() const                        { return _opr3; }
+  LIR_Opr in_opr4() const                        { return _opr4; }
+  BasicType type()  const                        { return _type; }
+  LIR_Opr tmp1_opr() const                       { return _tmp1; }
+  LIR_Opr tmp2_opr() const                       { return _tmp2; }
+  LIR_Opr tmp3_opr() const                       { return _tmp3; }
+  LIR_Opr tmp4_opr() const                       { return _tmp4; }
+  LIR_Opr tmp5_opr() const                       { return _tmp5; }
+
+  LIR_Condition condition() const                { return _condition; }
+  void set_condition(LIR_Condition condition)    { _condition = condition; }
+
+  void set_in_opr1(LIR_Opr opr)                  { _opr1 = opr; }
+  void set_in_opr2(LIR_Opr opr)                  { _opr2 = opr; }
+  void set_in_opr3(LIR_Opr opr)                  { _opr3 = opr; }
+  void set_in_opr4(LIR_Opr opr)                  { _opr4 = opr; }
+  virtual void emit_code(LIR_Assembler* masm);
+  virtual LIR_Op4* as_Op4() { return this; }
+
+  virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
+};
 
 //--------------------------------
 class LabelObj: public CompilationResourceObj {
@@ -2022,6 +2094,10 @@ class LIR_List: public CompilationResourceObj {
   const char *  _file;
   int           _line;
 #endif
+#ifdef RISCV
+  LIR_Opr       _cmp_opr1;
+  LIR_Opr       _cmp_opr2;
+#endif
 
  public:
   void append(LIR_Op* op) {
@@ -2034,6 +2110,12 @@ class LIR_List: public CompilationResourceObj {
     }
 #endif // PRODUCT
 
+#ifdef RISCV
+    set_cmp_oprs(op);
+    // lir_cmp set cmp oprs only on riscv
+    if (op->code() == lir_cmp) return;
+#endif
+
     _operations.append(op);
 
 #ifdef ASSERT
@@ -2050,6 +2132,10 @@ class LIR_List: public CompilationResourceObj {
   void set_file_and_line(const char * file, int line);
 #endif
 
+#ifdef RISCV
+  void set_cmp_oprs(LIR_Op* op);
+#endif
+
   //---------- accessors ---------------
   LIR_OpList* instructions_list()                { return &_operations; }
   int         length() const                     { return _operations.length(); }
@@ -2166,8 +2252,9 @@ class LIR_List: public CompilationResourceObj {
   void cmp_mem_int(LIR_Condition condition, LIR_Opr base, int disp, int c, CodeEmitInfo* info);
   void cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Address* addr, CodeEmitInfo* info);
 
-  void cmove(LIR_Condition condition, LIR_Opr src1, LIR_Opr src2, LIR_Opr dst, BasicType type) {
-    append(new LIR_Op2(lir_cmove, condition, src1, src2, dst, type));
+  void cmove(LIR_Condition condition, LIR_Opr src1, LIR_Opr src2, LIR_Opr dst, BasicType type,
+             LIR_Opr cmp_opr1 = LIR_OprFact::illegalOpr, LIR_Opr cmp_opr2 = LIR_OprFact::illegalOpr) {
+    append(new LIR_Op4(lir_cmove, condition, src1, src2, cmp_opr1, cmp_opr2, dst, type));
   }
 
   void cas_long(LIR_Opr addr, LIR_Opr cmp_value, LIR_Opr new_value,
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.cpp b/src/hotspot/share/c1/c1_LIRAssembler.cpp
index 1c4e0d09306..331db648756 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.cpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp
@@ -689,10 +689,6 @@ void LIR_Assembler::emit_op2(LIR_Op2* op) {
       comp_fl2i(op->code(), op->in_opr1(), op->in_opr2(), op->result_opr(), op);
       break;
 
-    case lir_cmove:
-      cmove(op->condition(), op->in_opr1(), op->in_opr2(), op->result_opr(), op->type());
-      break;
-
     case lir_shl:
     case lir_shr:
     case lir_ushr:
@@ -754,6 +750,17 @@ void LIR_Assembler::emit_op2(LIR_Op2* op) {
   }
 }
 
+void LIR_Assembler::emit_op4(LIR_Op4* op) {
+  switch(op->code()) {
+    case lir_cmove:
+      cmove(op->condition(), op->in_opr1(), op->in_opr2(), op->result_opr(), op->type(), op->in_opr3(), op->in_opr4());
+      break;
+
+    default:
+      Unimplemented();
+      break;
+  }
+}
 
 void LIR_Assembler::build_frame() {
   _masm->build_frame(initial_frame_size_in_bytes(), bang_size_in_bytes());
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.hpp b/src/hotspot/share/c1/c1_LIRAssembler.hpp
index 1d873b9638d..8a50667c88a 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.hpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp
@@ -184,6 +184,7 @@ class LIR_Assembler: public CompilationResourceObj {
   void emit_op1(LIR_Op1* op);
   void emit_op2(LIR_Op2* op);
   void emit_op3(LIR_Op3* op);
+  void emit_op4(LIR_Op4* op);
   void emit_opBranch(LIR_OpBranch* op);
   void emit_opLabel(LIR_OpLabel* op);
   void emit_arraycopy(LIR_OpArrayCopy* op);
@@ -217,8 +218,8 @@ class LIR_Assembler: public CompilationResourceObj {
   void volatile_move_op(LIR_Opr src, LIR_Opr result, BasicType type, CodeEmitInfo* info);
   void comp_mem_op(LIR_Opr src, LIR_Opr result, BasicType type, CodeEmitInfo* info);  // info set for null exceptions
   void comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr result, LIR_Op2* op);
-  void cmove(LIR_Condition code, LIR_Opr left, LIR_Opr right, LIR_Opr result, BasicType type);
-
+  void cmove(LIR_Condition code, LIR_Opr left, LIR_Opr right, LIR_Opr result, BasicType type,
+             LIR_Opr cmp_opr1 = LIR_OprFact::illegalOpr, LIR_Opr cmp_opr2 = LIR_OprFact::illegalOpr);
   void call(        LIR_OpJavaCall* op, relocInfo::relocType rtype);
   void ic_call(     LIR_OpJavaCall* op);
   void vtable_call( LIR_OpJavaCall* op);
diff --git a/src/hotspot/share/c1/c1_LinearScan.cpp b/src/hotspot/share/c1/c1_LinearScan.cpp
index d2386d7cbb6..9f0d264f2fa 100644
--- a/src/hotspot/share/c1/c1_LinearScan.cpp
+++ b/src/hotspot/share/c1/c1_LinearScan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1240,11 +1240,11 @@ void LinearScan::add_register_hints(LIR_Op* op) {
       break;
     }
     case lir_cmove: {
-      assert(op->as_Op2() != NULL, "lir_cmove must be LIR_Op2");
-      LIR_Op2* cmove = (LIR_Op2*)op;
+      assert(op->as_Op4() != NULL, "lir_cmove must be LIR_Op4");
+      LIR_Op4* cmove = (LIR_Op4*)op;
 
       LIR_Opr move_from = cmove->in_opr1();
-      LIR_Opr move_to = cmove->result_opr();
+      LIR_Opr move_to   = cmove->result_opr();
 
       if (move_to->is_register() && move_from->is_register()) {
         Interval* from = interval_at(reg_num(move_from));
@@ -3131,6 +3131,9 @@ void LinearScan::do_linear_scan() {
     }
   }
 
+#ifndef RISCV
+  // Disable these optimizations on riscv temporarily, because it does not
+  // work when the comparison operands are bound to branches or cmoves.
   { TIME_LINEAR_SCAN(timer_optimize_lir);
 
     EdgeMoveOptimizer::optimize(ir()->code());
@@ -3138,6 +3141,7 @@ void LinearScan::do_linear_scan() {
     // check that cfg is still correct after optimizations
     ir()->verify();
   }
+#endif
 
   NOT_PRODUCT(print_lir(1, "Before Code Generation", false));
   NOT_PRODUCT(LinearScanStatistic::compute(this, _stat_final));
@@ -6361,14 +6365,14 @@ void ControlFlowOptimizer::delete_unnecessary_jumps(BlockList* code) {
               // There might be a cmove inserted for profiling which depends on the same
               // compare. If we change the condition of the respective compare, we have
               // to take care of this cmove as well.
-              LIR_Op2* prev_cmove = NULL;
+              LIR_Op4* prev_cmove = NULL;
 
               for(int j = instructions->length() - 3; j >= 0 && prev_cmp == NULL; j--) {
                 prev_op = instructions->at(j);
                 // check for the cmove
                 if (prev_op->code() == lir_cmove) {
-                  assert(prev_op->as_Op2() != NULL, "cmove must be of type LIR_Op2");
-                  prev_cmove = (LIR_Op2*)prev_op;
+                  assert(prev_op->as_Op4() != NULL, "cmove must be of type LIR_Op4");
+                  prev_cmove = (LIR_Op4*)prev_op;
                   assert(prev_branch->cond() == prev_cmove->condition(), "should be the same");
                 }
                 if (prev_op->code() == lir_cmp) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
index c7e0c9b0cd9..7d31ff02e1a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -35,7 +35,7 @@
 #include "utilities/defaultStream.hpp"
 
 void ShenandoahArguments::initialize() {
-#if !(defined AARCH64 || defined AMD64 || defined IA32 || defined PPC64)
+#if !(defined AARCH64 || defined AMD64 || defined IA32 || defined PPC64 || defined RISCV64)
   vm_exit_during_initialization("Shenandoah GC is not supported on this platform.");
 #endif
 
diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
index 4f2e36a8304..705d498399a 100644
--- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@ private:
 
 public:
   LIR_OpZLoadBarrierTest(LIR_Opr opr) :
-      LIR_Op(),
+      LIR_Op(lir_zloadbarrier_test, LIR_OprFact::illegalOpr, NULL),
       _opr(opr) {}
 
   virtual void visit(LIR_OpVisitState* state) {
diff --git a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
index b2e641269e0..15ae3046721 100644
--- a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
@@ -102,7 +102,7 @@ inline T JfrBigEndian::read_unaligned(const address location) {
 inline bool JfrBigEndian::platform_supports_unaligned_reads(void) {
 #if defined(IA32) || defined(AMD64) || defined(PPC) || defined(S390)
   return true;
-#elif defined(ARM) || defined(AARCH64)
+#elif defined(ARM) || defined(AARCH64) || defined(RISCV)
   return false;
 #else
   #warning "Unconfigured platform"
diff --git a/src/hotspot/share/opto/regmask.hpp b/src/hotspot/share/opto/regmask.hpp
index 1694367554d..233dd0da2d7 100644
--- a/src/hotspot/share/opto/regmask.hpp
+++ b/src/hotspot/share/opto/regmask.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,7 +99,7 @@ class RegMask {
   // requirement is internal to the allocator, and independent of any
   // particular platform.
   enum { SlotsPerLong = 2,
-         SlotsPerVecA = 8,
+         SlotsPerVecA = RISCV_ONLY(4) NOT_RISCV(8),
          SlotsPerVecS = 1,
          SlotsPerVecD = 2,
          SlotsPerVecX = 4,
diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp
index 319f1eba26b..41fada6988b 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.cpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.cpp
@@ -183,7 +183,8 @@ const char* Abstract_VM_Version::jre_release_version() {
                  AMD64_ONLY("amd64")             \
                  IA32_ONLY("x86")                \
                  IA64_ONLY("ia64")               \
-                 S390_ONLY("s390")
+                 S390_ONLY("s390")               \
+                 RISCV64_ONLY("riscv64")
 #endif // !ZERO
 #endif // !CPU
 
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 1d7fb5f983a..3a75c0d0804 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -2085,7 +2085,7 @@ bool Arguments::check_vm_args_consistency() {
   }
 #endif
 
-#if !defined(X86) && !defined(AARCH64) && !defined(PPC64)
+#if !defined(X86) && !defined(AARCH64) && !defined(PPC64) && !defined(RISCV64)
   if (UseHeavyMonitors) {
     jio_fprintf(defaultStream::error_stream(),
                 "UseHeavyMonitors is not fully implemented on this architecture");
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index d4234575fc0..b7fc180ee44 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -452,7 +452,7 @@ void ObjectSynchronizer::handle_sync_on_value_based_class(Handle obj, JavaThread
 }
 
 static bool useHeavyMonitors() {
-#if defined(X86) || defined(AARCH64) || defined(PPC64)
+#if defined(X86) || defined(AARCH64) || defined(PPC64) || defined(RISCV64)
   return UseHeavyMonitors;
 #else
   return false;
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index cdb8d9abb23..92dfdfa3dbe 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -150,7 +150,7 @@ inline JavaThread::NoAsyncExceptionDeliveryMark::~NoAsyncExceptionDeliveryMark()
 }
 
 inline JavaThreadState JavaThread::thread_state() const    {
-#if defined(PPC64) || defined (AARCH64)
+#if defined(PPC64) || defined (AARCH64) || defined(RISCV64)
   // Use membars when accessing volatile _thread_state. See
   // Threads::create_vm() for size checks.
   return (JavaThreadState) Atomic::load_acquire((volatile jint*)&_thread_state);
diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp
index 8dea1a754fa..bf647fbf65b 100644
--- a/src/hotspot/share/utilities/macros.hpp
+++ b/src/hotspot/share/utilities/macros.hpp
@@ -545,6 +545,32 @@
 
 #define MACOS_AARCH64_ONLY(x) MACOS_ONLY(AARCH64_ONLY(x))
 
+#if defined(RISCV32) || defined(RISCV64)
+#define RISCV
+#define RISCV_ONLY(code) code
+#define NOT_RISCV(code)
+#else
+#undef RISCV
+#define RISCV_ONLY(code)
+#define NOT_RISCV(code) code
+#endif
+
+#ifdef RISCV32
+#define RISCV32_ONLY(code) code
+#define NOT_RISCV32(code)
+#else
+#define RISCV32_ONLY(code)
+#define NOT_RISCV32(code) code
+#endif
+
+#ifdef RISCV64
+#define RISCV64_ONLY(code) code
+#define NOT_RISCV64(code)
+#else
+#define RISCV64_ONLY(code)
+#define NOT_RISCV64(code) code
+#endif
+
 #ifdef VM_LITTLE_ENDIAN
 #define LITTLE_ENDIAN_ONLY(code) code
 #define BIG_ENDIAN_ONLY(code)
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
index b7a2c6dde8f..9accba375a2 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, 2021, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -60,6 +60,10 @@
 #include "sun_jvm_hotspot_debugger_aarch64_AARCH64ThreadContext.h"
 #endif
 
+#ifdef riscv64
+#include "sun_jvm_hotspot_debugger_riscv64_RISCV64ThreadContext.h"
+#endif
+
 class AutoJavaString {
   JNIEnv* m_env;
   jstring m_str;
@@ -408,7 +412,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo
   return (err == PS_OK)? array : 0;
 }
 
-#if defined(i586) || defined(amd64) || defined(ppc64) || defined(ppc64le) || defined(aarch64)
+#if defined(i586) || defined(amd64) || defined(ppc64) || defined(ppc64le) || defined(aarch64) || defined(riscv64)
 extern "C"
 JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLocal_getThreadIntegerRegisterSet0
   (JNIEnv *env, jobject this_obj, jint lwp_id) {
@@ -440,6 +444,9 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo
 #ifdef aarch64
 #define NPRGREG sun_jvm_hotspot_debugger_aarch64_AARCH64ThreadContext_NPRGREG
 #endif
+#ifdef riscv64
+#define NPRGREG sun_jvm_hotspot_debugger_riscv64_RISCV64ThreadContext_NPRGREG
+#endif
 #if defined(ppc64) || defined(ppc64le)
 #define NPRGREG sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext_NPRGREG
 #endif
@@ -516,6 +523,44 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo
   }
 #endif /* aarch64 */
 
+#if defined(riscv64)
+#define REG_INDEX(reg)  sun_jvm_hotspot_debugger_riscv64_RISCV64ThreadContext_##reg
+
+  regs[REG_INDEX(PC)]  = gregs.pc;
+  regs[REG_INDEX(LR)]  = gregs.ra;
+  regs[REG_INDEX(SP)]  = gregs.sp;
+  regs[REG_INDEX(R3)]  = gregs.gp;
+  regs[REG_INDEX(R4)]  = gregs.tp;
+  regs[REG_INDEX(R5)]  = gregs.t0;
+  regs[REG_INDEX(R6)]  = gregs.t1;
+  regs[REG_INDEX(R7)]  = gregs.t2;
+  regs[REG_INDEX(R8)]  = gregs.s0;
+  regs[REG_INDEX(R9)]  = gregs.s1;
+  regs[REG_INDEX(R10)]  = gregs.a0;
+  regs[REG_INDEX(R11)]  = gregs.a1;
+  regs[REG_INDEX(R12)]  = gregs.a2;
+  regs[REG_INDEX(R13)]  = gregs.a3;
+  regs[REG_INDEX(R14)]  = gregs.a4;
+  regs[REG_INDEX(R15)]  = gregs.a5;
+  regs[REG_INDEX(R16)]  = gregs.a6;
+  regs[REG_INDEX(R17)]  = gregs.a7;
+  regs[REG_INDEX(R18)]  = gregs.s2;
+  regs[REG_INDEX(R19)]  = gregs.s3;
+  regs[REG_INDEX(R20)]  = gregs.s4;
+  regs[REG_INDEX(R21)]  = gregs.s5;
+  regs[REG_INDEX(R22)]  = gregs.s6;
+  regs[REG_INDEX(R23)]  = gregs.s7;
+  regs[REG_INDEX(R24)]  = gregs.s8;
+  regs[REG_INDEX(R25)]  = gregs.s9;
+  regs[REG_INDEX(R26)]  = gregs.s10;
+  regs[REG_INDEX(R27)]  = gregs.s11;
+  regs[REG_INDEX(R28)]  = gregs.t3;
+  regs[REG_INDEX(R29)]  = gregs.t4;
+  regs[REG_INDEX(R30)]  = gregs.t5;
+  regs[REG_INDEX(R31)]  = gregs.t6;
+
+#endif /* riscv64 */
+
 #if defined(ppc64) || defined(ppc64le)
 #define REG_INDEX(reg) sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext_##reg
 
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h
index b0fcfb1e4d5..a69496e77a4 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,8 @@
 #elif defined(arm)
 #include <asm/ptrace.h>
 #define user_regs_struct  pt_regs
+#elif defined(riscv64)
+#include <asm/ptrace.h>
 #endif
 
 // This C bool type must be int for compatibility with Linux calls and
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
index 04db854c84d..0890dcf8893 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
@@ -36,6 +36,7 @@ import sun.jvm.hotspot.debugger.MachineDescription;
 import sun.jvm.hotspot.debugger.MachineDescriptionAMD64;
 import sun.jvm.hotspot.debugger.MachineDescriptionPPC64;
 import sun.jvm.hotspot.debugger.MachineDescriptionAArch64;
+import sun.jvm.hotspot.debugger.MachineDescriptionRISCV64;
 import sun.jvm.hotspot.debugger.MachineDescriptionIntelX86;
 import sun.jvm.hotspot.debugger.NoSuchSymbolException;
 import sun.jvm.hotspot.debugger.bsd.BsdDebuggerLocal;
@@ -558,6 +559,8 @@ public class HotSpotAgent {
             machDesc = new MachineDescriptionPPC64();
         } else if (cpu.equals("aarch64")) {
             machDesc = new MachineDescriptionAArch64();
+        } else if (cpu.equals("riscv64")) {
+            machDesc = new MachineDescriptionRISCV64();
         } else {
           try {
             machDesc = (MachineDescription)
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionRISCV64.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionRISCV64.java
new file mode 100644
index 00000000000..a972516dee3
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionRISCV64.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger;
+
+public class MachineDescriptionRISCV64 extends MachineDescriptionTwosComplement implements MachineDescription {
+  public long getAddressSize() {
+    return 8;
+  }
+
+  public boolean isLP64() {
+    return true;
+  }
+
+  public boolean isBigEndian() {
+    return false;
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
index 491e3d5dc2c..469bb6e0665 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -33,11 +33,13 @@ import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.x86.*;
 import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.aarch64.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
 import sun.jvm.hotspot.debugger.ppc64.*;
 import sun.jvm.hotspot.debugger.linux.x86.*;
 import sun.jvm.hotspot.debugger.linux.amd64.*;
 import sun.jvm.hotspot.debugger.linux.ppc64.*;
 import sun.jvm.hotspot.debugger.linux.aarch64.*;
+import sun.jvm.hotspot.debugger.linux.riscv64.*;
 import sun.jvm.hotspot.utilities.*;
 
 class LinuxCDebugger implements CDebugger {
@@ -105,7 +107,14 @@ class LinuxCDebugger implements CDebugger {
        Address pc  = context.getRegisterAsAddress(AARCH64ThreadContext.PC);
        if (pc == null) return null;
        return new LinuxAARCH64CFrame(dbg, fp, pc);
-     } else {
+    } else if (cpu.equals("riscv64")) {
+       RISCV64ThreadContext context = (RISCV64ThreadContext) thread.getContext();
+       Address fp = context.getRegisterAsAddress(RISCV64ThreadContext.FP);
+       if (fp == null) return null;
+       Address pc  = context.getRegisterAsAddress(RISCV64ThreadContext.PC);
+       if (pc == null) return null;
+       return new LinuxRISCV64CFrame(dbg, fp, pc);
+    } else {
        // Runtime exception thrown by LinuxThreadContextFactory if unknown cpu
        ThreadContext context = (ThreadContext) thread.getContext();
        return context.getTopFrame(dbg);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64CFrame.java
new file mode 100644
index 00000000000..f06da24bd0e
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64CFrame.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.linux.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
+import sun.jvm.hotspot.debugger.linux.*;
+import sun.jvm.hotspot.debugger.cdbg.*;
+import sun.jvm.hotspot.debugger.cdbg.basic.*;
+
+public final class LinuxRISCV64CFrame extends BasicCFrame {
+   private static final int C_FRAME_LINK_OFFSET        = -2;
+   private static final int C_FRAME_RETURN_ADDR_OFFSET = -1;
+
+   public LinuxRISCV64CFrame(LinuxDebugger dbg, Address fp, Address pc) {
+      super(dbg.getCDebugger());
+      this.fp = fp;
+      this.pc = pc;
+      this.dbg = dbg;
+   }
+
+   // override base class impl to avoid ELF parsing
+   public ClosestSymbol closestSymbolToPC() {
+      // try native lookup in debugger.
+      return dbg.lookup(dbg.getAddressValue(pc()));
+   }
+
+   public Address pc() {
+      return pc;
+   }
+
+   public Address localVariableBase() {
+      return fp;
+   }
+
+   public CFrame sender(ThreadProxy thread) {
+      RISCV64ThreadContext context = (RISCV64ThreadContext) thread.getContext();
+      Address rsp = context.getRegisterAsAddress(RISCV64ThreadContext.SP);
+
+      if ((fp == null) || fp.lessThan(rsp)) {
+        return null;
+      }
+
+      // Check alignment of fp
+      if (dbg.getAddressValue(fp) % (2 * ADDRESS_SIZE) != 0) {
+        return null;
+      }
+
+      Address nextFP = fp.getAddressAt(C_FRAME_LINK_OFFSET * ADDRESS_SIZE);
+      if (nextFP == null || nextFP.lessThanOrEqual(fp)) {
+        return null;
+      }
+      Address nextPC  = fp.getAddressAt(C_FRAME_RETURN_ADDR_OFFSET * ADDRESS_SIZE);
+      if (nextPC == null) {
+        return null;
+      }
+      return new LinuxRISCV64CFrame(dbg, nextFP, nextPC);
+   }
+
+   // package/class internals only
+   private static final int ADDRESS_SIZE = 8;
+   private Address pc;
+   private Address sp;
+   private Address fp;
+   private LinuxDebugger dbg;
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64ThreadContext.java
new file mode 100644
index 00000000000..fdb841ccf3d
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/riscv64/LinuxRISCV64ThreadContext.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.linux.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
+import sun.jvm.hotspot.debugger.linux.*;
+
+public class LinuxRISCV64ThreadContext extends RISCV64ThreadContext {
+  private LinuxDebugger debugger;
+
+  public LinuxRISCV64ThreadContext(LinuxDebugger debugger) {
+    super();
+    this.debugger = debugger;
+  }
+
+  public void setRegisterAsAddress(int index, Address value) {
+    setRegister(index, debugger.getAddressValue(value));
+  }
+
+  public Address getRegisterAsAddress(int index) {
+    return debugger.newAddress(getRegister(index));
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64Thread.java
new file mode 100644
index 00000000000..96d5dee47ce
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64Thread.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.proc.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
+import sun.jvm.hotspot.debugger.proc.*;
+import sun.jvm.hotspot.utilities.*;
+
+public class ProcRISCV64Thread implements ThreadProxy {
+    private ProcDebugger debugger;
+    private int         id;
+
+    public ProcRISCV64Thread(ProcDebugger debugger, Address addr) {
+        this.debugger = debugger;
+
+        // FIXME: the size here should be configurable. However, making it
+        // so would produce a dependency on the "types" package from the
+        // debugger package, which is not desired.
+        this.id       = (int) addr.getCIntegerAt(0, 4, true);
+    }
+
+    public ProcRISCV64Thread(ProcDebugger debugger, long id) {
+        this.debugger = debugger;
+        this.id = (int) id;
+    }
+
+    public ThreadContext getContext() throws IllegalThreadStateException {
+        ProcRISCV64ThreadContext context = new ProcRISCV64ThreadContext(debugger);
+        long[] regs = debugger.getThreadIntegerRegisterSet(id);
+        if (Assert.ASSERTS_ENABLED) {
+            Assert.that(regs.length == RISCV64ThreadContext.NPRGREG, "size mismatch");
+        }
+        for (int i = 0; i < regs.length; i++) {
+            context.setRegister(i, regs[i]);
+        }
+        return context;
+    }
+
+    public boolean canSetContext() throws DebuggerException {
+        return false;
+    }
+
+    public void setContext(ThreadContext context)
+    throws IllegalThreadStateException, DebuggerException {
+        throw new DebuggerException("Unimplemented");
+    }
+
+    public String toString() {
+        return "t@" + id;
+    }
+
+    public boolean equals(Object obj) {
+        if ((obj == null) || !(obj instanceof ProcRISCV64Thread)) {
+            return false;
+        }
+
+        return (((ProcRISCV64Thread) obj).id == id);
+    }
+
+    public int hashCode() {
+        return id;
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64ThreadContext.java
new file mode 100644
index 00000000000..f2aa845e665
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64ThreadContext.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.proc.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
+import sun.jvm.hotspot.debugger.proc.*;
+
+public class ProcRISCV64ThreadContext extends RISCV64ThreadContext {
+    private ProcDebugger debugger;
+
+    public ProcRISCV64ThreadContext(ProcDebugger debugger) {
+        super();
+        this.debugger = debugger;
+    }
+
+    public void setRegisterAsAddress(int index, Address value) {
+        setRegister(index, debugger.getAddressValue(value));
+    }
+
+    public Address getRegisterAsAddress(int index) {
+        return debugger.newAddress(getRegister(index));
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64ThreadFactory.java
new file mode 100644
index 00000000000..19f64b8ce2d
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/riscv64/ProcRISCV64ThreadFactory.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.proc.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.proc.*;
+
+public class ProcRISCV64ThreadFactory implements ProcThreadFactory {
+    private ProcDebugger debugger;
+
+    public ProcRISCV64ThreadFactory(ProcDebugger debugger) {
+        this.debugger = debugger;
+    }
+
+    public ThreadProxy createThreadWrapper(Address threadIdentifierAddr) {
+        return new ProcRISCV64Thread(debugger, threadIdentifierAddr);
+    }
+
+    public ThreadProxy createThreadWrapper(long id) {
+        return new ProcRISCV64Thread(debugger, id);
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64Thread.java
new file mode 100644
index 00000000000..aecbda59023
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64Thread.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.remote.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
+import sun.jvm.hotspot.debugger.remote.*;
+import sun.jvm.hotspot.utilities.*;
+
+public class RemoteRISCV64Thread extends RemoteThread  {
+  public RemoteRISCV64Thread(RemoteDebuggerClient debugger, Address addr) {
+     super(debugger, addr);
+  }
+
+  public RemoteRISCV64Thread(RemoteDebuggerClient debugger, long id) {
+     super(debugger, id);
+  }
+
+  public ThreadContext getContext() throws IllegalThreadStateException {
+    RemoteRISCV64ThreadContext context = new RemoteRISCV64ThreadContext(debugger);
+    long[] regs = (addr != null)? debugger.getThreadIntegerRegisterSet(addr) :
+                                  debugger.getThreadIntegerRegisterSet(id);
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(regs.length == RISCV64ThreadContext.NPRGREG, "size of register set must match");
+    }
+    for (int i = 0; i < regs.length; i++) {
+      context.setRegister(i, regs[i]);
+    }
+    return context;
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64ThreadContext.java
new file mode 100644
index 00000000000..1d3da6be5af
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64ThreadContext.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.remote.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
+import sun.jvm.hotspot.debugger.remote.*;
+
+public class RemoteRISCV64ThreadContext extends RISCV64ThreadContext {
+  private RemoteDebuggerClient debugger;
+
+  public RemoteRISCV64ThreadContext(RemoteDebuggerClient debugger) {
+    super();
+    this.debugger = debugger;
+  }
+
+  public void setRegisterAsAddress(int index, Address value) {
+    setRegister(index, debugger.getAddressValue(value));
+  }
+
+  public Address getRegisterAsAddress(int index) {
+    return debugger.newAddress(getRegister(index));
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64ThreadFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64ThreadFactory.java
new file mode 100644
index 00000000000..725b94e25a3
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/riscv64/RemoteRISCV64ThreadFactory.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.remote.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.remote.*;
+
+public class RemoteRISCV64ThreadFactory implements RemoteThreadFactory {
+  private RemoteDebuggerClient debugger;
+
+  public RemoteRISCV64ThreadFactory(RemoteDebuggerClient debugger) {
+    this.debugger = debugger;
+  }
+
+  public ThreadProxy createThreadWrapper(Address threadIdentifierAddr) {
+    return new RemoteRISCV64Thread(debugger, threadIdentifierAddr);
+  }
+
+  public ThreadProxy createThreadWrapper(long id) {
+    return new RemoteRISCV64Thread(debugger, id);
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/risv64/RISCV64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/risv64/RISCV64ThreadContext.java
new file mode 100644
index 00000000000..fb60a70427a
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/risv64/RISCV64ThreadContext.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.riscv64;
+
+import java.lang.annotation.Native;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.cdbg.*;
+
+/** Specifies the thread context on riscv64 platforms; only a sub-portion
+ * of the context is guaranteed to be present on all operating
+ * systems. */
+
+public abstract class RISCV64ThreadContext implements ThreadContext {
+    // Taken from /usr/include/asm/sigcontext.h on Linux/RISCV64.
+
+    //  /*
+    //   * Signal context structure - contains all info to do with the state
+    //   * before the signal handler was invoked.
+    //   */
+    // struct sigcontext {
+    //   struct user_regs_struct sc_regs;
+    //   union __riscv_fp_state sc_fpregs;
+    // };
+    //
+    // struct user_regs_struct {
+    //    unsigned long pc;
+    //    unsigned long ra;
+    //    unsigned long sp;
+    //    unsigned long gp;
+    //    unsigned long tp;
+    //    unsigned long t0;
+    //    unsigned long t1;
+    //    unsigned long t2;
+    //    unsigned long s0;
+    //    unsigned long s1;
+    //    unsigned long a0;
+    //    unsigned long a1;
+    //    unsigned long a2;
+    //    unsigned long a3;
+    //    unsigned long a4;
+    //    unsigned long a5;
+    //    unsigned long a6;
+    //    unsigned long a7;
+    //    unsigned long s2;
+    //    unsigned long s3;
+    //    unsigned long s4;
+    //    unsigned long s5;
+    //    unsigned long s6;
+    //    unsigned long s7;
+    //    unsigned long s8;
+    //    unsigned long s9;
+    //    unsigned long s10;
+    //    unsigned long s11;
+    //    unsigned long t3;
+    //    unsigned long t4;
+    //    unsigned long t5;
+    //    unsigned long t6;
+    // };
+
+    // NOTE: the indices for the various registers must be maintained as
+    // listed across various operating systems. However, only a small
+    // subset of the registers' values are guaranteed to be present (and
+    // must be present for the SA's stack walking to work)
+
+    // One instance of the Native annotation is enough to trigger header generation
+    // for this file.
+    @Native
+    public static final int R0 = 0;
+    public static final int R1 = 1;
+    public static final int R2 = 2;
+    public static final int R3 = 3;
+    public static final int R4 = 4;
+    public static final int R5 = 5;
+    public static final int R6 = 6;
+    public static final int R7 = 7;
+    public static final int R8 = 8;
+    public static final int R9 = 9;
+    public static final int R10 = 10;
+    public static final int R11 = 11;
+    public static final int R12 = 12;
+    public static final int R13 = 13;
+    public static final int R14 = 14;
+    public static final int R15 = 15;
+    public static final int R16 = 16;
+    public static final int R17 = 17;
+    public static final int R18 = 18;
+    public static final int R19 = 19;
+    public static final int R20 = 20;
+    public static final int R21 = 21;
+    public static final int R22 = 22;
+    public static final int R23 = 23;
+    public static final int R24 = 24;
+    public static final int R25 = 25;
+    public static final int R26 = 26;
+    public static final int R27 = 27;
+    public static final int R28 = 28;
+    public static final int R29 = 29;
+    public static final int R30 = 30;
+    public static final int R31 = 31;
+
+    public static final int NPRGREG = 32;
+
+    public static final int PC = R0;
+    public static final int LR = R1;
+    public static final int SP = R2;
+    public static final int FP = R8;
+
+    private long[] data;
+
+    public RISCV64ThreadContext() {
+        data = new long[NPRGREG];
+    }
+
+    public int getNumRegisters() {
+        return NPRGREG;
+    }
+
+    public String getRegisterName(int index) {
+        switch (index) {
+        case LR: return "lr";
+        case SP: return "sp";
+        case PC: return "pc";
+        default:
+            return "r" + index;
+        }
+    }
+
+    public void setRegister(int index, long value) {
+        data[index] = value;
+    }
+
+    public long getRegister(int index) {
+        return data[index];
+    }
+
+    public CFrame getTopFrame(Debugger dbg) {
+        return null;
+    }
+
+    /** This can't be implemented in this class since we would have to
+     * tie the implementation to, for example, the debugging system */
+    public abstract void setRegisterAsAddress(int index, Address value);
+
+    /** This can't be implemented in this class since we would have to
+     * tie the implementation to, for example, the debugging system */
+    public abstract Address getRegisterAsAddress(int index);
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
index 4a2fa691d3f..d16ac8aae51 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Threads.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ import sun.jvm.hotspot.runtime.win32_aarch64.Win32AARCH64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_x86.LinuxX86JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_aarch64.LinuxAARCH64JavaThreadPDAccess;
+import sun.jvm.hotspot.runtime.linux_riscv64.LinuxRISCV64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.linux_ppc64.LinuxPPC64JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess;
 import sun.jvm.hotspot.runtime.bsd_amd64.BsdAMD64JavaThreadPDAccess;
@@ -113,6 +114,8 @@ public class Threads {
                 access = new LinuxPPC64JavaThreadPDAccess();
             } else if (cpu.equals("aarch64")) {
                 access = new LinuxAARCH64JavaThreadPDAccess();
+            } else if (cpu.equals("riscv64")) {
+                access = new LinuxRISCV64JavaThreadPDAccess();
             } else {
               try {
                 access = (JavaThreadPDAccess)
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_riscv64/LinuxRISCV64JavaThreadPDAccess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_riscv64/LinuxRISCV64JavaThreadPDAccess.java
new file mode 100644
index 00000000000..f2e224f28ee
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/linux_riscv64/LinuxRISCV64JavaThreadPDAccess.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.linux_riscv64;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.riscv64.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+import sun.jvm.hotspot.utilities.Observable;
+import sun.jvm.hotspot.utilities.Observer;
+
+public class LinuxRISCV64JavaThreadPDAccess implements JavaThreadPDAccess {
+  private static AddressField  lastJavaFPField;
+  private static AddressField  osThreadField;
+
+  // Field from OSThread
+  private static CIntegerField osThreadThreadIDField;
+
+  // This is currently unneeded but is being kept in case we change
+  // the currentFrameGuess algorithm
+  private static final long GUESS_SCAN_RANGE = 128 * 1024;
+
+  static {
+    VM.registerVMInitializedObserver(new Observer() {
+        public void update(Observable o, Object data) {
+          initialize(VM.getVM().getTypeDataBase());
+        }
+      });
+  }
+
+  private static synchronized void initialize(TypeDataBase db) {
+    Type type = db.lookupType("JavaThread");
+    osThreadField           = type.getAddressField("_osthread");
+
+    Type anchorType = db.lookupType("JavaFrameAnchor");
+    lastJavaFPField         = anchorType.getAddressField("_last_Java_fp");
+
+    Type osThreadType = db.lookupType("OSThread");
+    osThreadThreadIDField   = osThreadType.getCIntegerField("_thread_id");
+  }
+
+  public Address getLastJavaFP(Address addr) {
+    return lastJavaFPField.getValue(addr.addOffsetTo(sun.jvm.hotspot.runtime.JavaThread.getAnchorField().getOffset()));
+  }
+
+  public Address getLastJavaPC(Address addr) {
+    return null;
+  }
+
+  public Address getBaseOfStackPointer(Address addr) {
+    return null;
+  }
+
+  public Frame getLastFramePD(JavaThread thread, Address addr) {
+    Address fp = thread.getLastJavaFP();
+    if (fp == null) {
+      return null; // no information
+    }
+    return new RISCV64Frame(thread.getLastJavaSP(), fp);
+  }
+
+  public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
+    return new RISCV64RegisterMap(thread, updateMap);
+  }
+
+  public Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
+    ThreadProxy t = getThreadProxy(addr);
+    RISCV64ThreadContext context = (RISCV64ThreadContext) t.getContext();
+    RISCV64CurrentFrameGuess guesser = new RISCV64CurrentFrameGuess(context, thread);
+    if (!guesser.run(GUESS_SCAN_RANGE)) {
+      return null;
+    }
+    if (guesser.getPC() == null) {
+      return new RISCV64Frame(guesser.getSP(), guesser.getFP());
+    } else {
+      return new RISCV64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+    }
+  }
+
+  public void printThreadIDOn(Address addr, PrintStream tty) {
+    tty.print(getThreadProxy(addr));
+  }
+
+  public void printInfoOn(Address threadAddr, PrintStream tty) {
+    tty.print("Thread id: ");
+    printThreadIDOn(threadAddr, tty);
+  }
+
+  public Address getLastSP(Address addr) {
+    ThreadProxy t = getThreadProxy(addr);
+    RISCV64ThreadContext context = (RISCV64ThreadContext) t.getContext();
+    return context.getRegisterAsAddress(RISCV64ThreadContext.SP);
+  }
+
+  public ThreadProxy getThreadProxy(Address addr) {
+    // Addr is the address of the JavaThread.
+    // Fetch the OSThread (for now and for simplicity, not making a
+    // separate "OSThread" class in this package)
+    Address osThreadAddr = osThreadField.getValue(addr);
+    // Get the address of the _thread_id from the OSThread
+    Address threadIdAddr = osThreadAddr.addOffsetTo(osThreadThreadIDField.getOffset());
+
+    JVMDebugger debugger = VM.getVM().getDebugger();
+    return debugger.getThreadForIdentifierAddress(threadIdAddr);
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64CurrentFrameGuess.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64CurrentFrameGuess.java
new file mode 100644
index 00000000000..34701c6922f
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64CurrentFrameGuess.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.riscv64.*;
+import sun.jvm.hotspot.code.*;
+import sun.jvm.hotspot.interpreter.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.riscv64.*;
+
+/** <P> Should be able to be used on all riscv64 platforms we support
+    (Linux/riscv64) to implement JavaThread's "currentFrameGuess()"
+    functionality. Input is an RISCV64ThreadContext; output is SP, FP,
+    and PC for an RISCV64Frame. Instantiation of the RISCV64Frame is
+    left to the caller, since we may need to subclass RISCV64Frame to
+    support signal handler frames on Unix platforms. </P>
+
+    <P> Algorithm is to walk up the stack within a given range (say,
+    512K at most) looking for a plausible PC and SP for a Java frame,
+    also considering those coming in from the context. If we find a PC
+    that belongs to the VM (i.e., in generated code like the
+    interpreter or CodeCache) then we try to find an associated FP.
+    We repeat this until we either find a complete frame or run out of
+    stack to look at. </P> */
+
+public class RISCV64CurrentFrameGuess {
+  private RISCV64ThreadContext context;
+  private JavaThread       thread;
+  private Address          spFound;
+  private Address          fpFound;
+  private Address          pcFound;
+
+  private static final boolean DEBUG = System.getProperty("sun.jvm.hotspot.runtime.riscv64.RISCV64Frame.DEBUG")
+                                       != null;
+
+  public RISCV64CurrentFrameGuess(RISCV64ThreadContext context,
+                              JavaThread thread) {
+    this.context = context;
+    this.thread  = thread;
+  }
+
+  /** Returns false if not able to find a frame within a reasonable range. */
+  public boolean run(long regionInBytesToSearch) {
+    Address sp  = context.getRegisterAsAddress(RISCV64ThreadContext.SP);
+    Address pc  = context.getRegisterAsAddress(RISCV64ThreadContext.PC);
+    Address fp  = context.getRegisterAsAddress(RISCV64ThreadContext.FP);
+    if (sp == null) {
+      // Bail out if no last java frame either
+      if (thread.getLastJavaSP() != null) {
+        setValues(thread.getLastJavaSP(), thread.getLastJavaFP(), null);
+        return true;
+      }
+      return false;
+    }
+    Address end = sp.addOffsetTo(regionInBytesToSearch);
+    VM vm       = VM.getVM();
+
+    setValues(null, null, null); // Assume we're not going to find anything
+
+    if (vm.isJavaPCDbg(pc)) {
+      if (vm.isClientCompiler()) {
+        // If the topmost frame is a Java frame, we are (pretty much)
+        // guaranteed to have a viable FP. We should be more robust
+        // than this (we have the potential for losing entire threads'
+        // stack traces) but need to see how much work we really have
+        // to do here. Searching the stack for an (SP, FP) pair is
+        // hard since it's easy to misinterpret inter-frame stack
+        // pointers as base-of-frame pointers; we also don't know the
+        // sizes of C1 frames (not registered in the nmethod) so can't
+        // derive them from SP.
+
+        setValues(sp, fp, pc);
+        return true;
+      } else {
+        if (vm.getInterpreter().contains(pc)) {
+          if (DEBUG) {
+            System.out.println("CurrentFrameGuess: choosing interpreter frame: sp = " +
+                               sp + ", fp = " + fp + ", pc = " + pc);
+          }
+          setValues(sp, fp, pc);
+          return true;
+        }
+
+        // For the server compiler, FP is not guaranteed to be valid
+        // for compiled code. In addition, an earlier attempt at a
+        // non-searching algorithm (see below) failed because the
+        // stack pointer from the thread context was pointing
+        // (considerably) beyond the ostensible end of the stack, into
+        // garbage; walking from the topmost frame back caused a crash.
+        //
+        // This algorithm takes the current PC as a given and tries to
+        // find the correct corresponding SP by walking up the stack
+        // and repeatedly performing stackwalks (very inefficient).
+        //
+        // FIXME: there is something wrong with stackwalking across
+        // adapter frames...this is likely to be the root cause of the
+        // failure with the simpler algorithm below.
+
+        for (long offset = 0;
+             offset < regionInBytesToSearch;
+             offset += vm.getAddressSize()) {
+          try {
+            Address curSP = sp.addOffsetTo(offset);
+            Frame frame = new RISCV64Frame(curSP, null, pc);
+            RegisterMap map = thread.newRegisterMap(false);
+            while (frame != null) {
+              if (frame.isEntryFrame() && frame.entryFrameIsFirst()) {
+                // We were able to traverse all the way to the
+                // bottommost Java frame.
+                // This sp looks good. Keep it.
+                if (DEBUG) {
+                  System.out.println("CurrentFrameGuess: Choosing sp = " + curSP + ", pc = " + pc);
+                }
+                setValues(curSP, null, pc);
+                return true;
+              }
+              frame = frame.sender(map);
+            }
+          } catch (Exception e) {
+            if (DEBUG) {
+              System.out.println("CurrentFrameGuess: Exception " + e + " at offset " + offset);
+            }
+            // Bad SP. Try another.
+          }
+        }
+
+        // Were not able to find a plausible SP to go with this PC.
+        // Bail out.
+        return false;
+      }
+    } else {
+      // If the current program counter was not known to us as a Java
+      // PC, we currently assume that we are in the run-time system
+      // and attempt to look to thread-local storage for saved SP and
+      // FP. Note that if these are null (because we were, in fact,
+      // in Java code, i.e., vtable stubs or similar, and the SA
+      // didn't have enough insight into the target VM to understand
+      // that) then we are going to lose the entire stack trace for
+      // the thread, which is sub-optimal. FIXME.
+
+      if (DEBUG) {
+        System.out.println("CurrentFrameGuess: choosing last Java frame: sp = " +
+                           thread.getLastJavaSP() + ", fp = " + thread.getLastJavaFP());
+      }
+      if (thread.getLastJavaSP() == null) {
+        return false; // No known Java frames on stack
+      }
+
+      // The runtime has a nasty habit of not saving fp in the frame
+      // anchor, leaving us to grovel about in the stack to find a
+      // plausible address.  Fortunately, this only happens in
+      // compiled code; there we always have a valid PC, and we always
+      // push LR and FP onto the stack as a pair, with FP at the lower
+      // address.
+      pc = thread.getLastJavaPC();
+      fp = thread.getLastJavaFP();
+      sp = thread.getLastJavaSP();
+
+      if (fp == null) {
+        CodeCache cc = vm.getCodeCache();
+        if (cc.contains(pc)) {
+          CodeBlob cb = cc.findBlob(pc);
+          if (DEBUG) {
+            System.out.println("FP is null.  Found blob frame size " + cb.getFrameSize());
+          }
+          // See if we can derive a frame pointer from SP and PC
+          long link_offset = cb.getFrameSize() - 2 * VM.getVM().getAddressSize();
+          if (link_offset >= 0) {
+            fp = sp.addOffsetTo(link_offset);
+          }
+        }
+      }
+
+      // We found a PC in the frame anchor. Check that it's plausible, and
+      // if it is, use it.
+      if (vm.isJavaPCDbg(pc)) {
+        setValues(sp, fp, pc);
+      } else {
+        setValues(sp, fp, null);
+      }
+
+      return true;
+    }
+  }
+
+  public Address getSP() { return spFound; }
+  public Address getFP() { return fpFound; }
+  /** May be null if getting values from thread-local storage; take
+      care to call the correct RISCV64Frame constructor to recover this if
+      necessary */
+  public Address getPC() { return pcFound; }
+
+  private void setValues(Address sp, Address fp, Address pc) {
+    spFound = sp;
+    fpFound = fp;
+    pcFound = pc;
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java
new file mode 100644
index 00000000000..df280005d72
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java
@@ -0,0 +1,556 @@
+/*
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Red Hat Inc.
+ * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.riscv64;
+
+import java.util.*;
+import sun.jvm.hotspot.code.*;
+import sun.jvm.hotspot.compiler.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+import sun.jvm.hotspot.utilities.Observable;
+import sun.jvm.hotspot.utilities.Observer;
+
+/** Specialization of and implementation of abstract methods of the
+    Frame class for the riscv64 family of CPUs. */
+
+public class RISCV64Frame extends Frame {
+  private static final boolean DEBUG;
+  static {
+    DEBUG = System.getProperty("sun.jvm.hotspot.runtime.RISCV64.RISCV64Frame.DEBUG") != null;
+  }
+
+  // Java frames
+  private static final int LINK_OFFSET                =  -2;
+  private static final int RETURN_ADDR_OFFSET         =  -1;
+  private static final int SENDER_SP_OFFSET           =   0;
+
+  // Interpreter frames
+  private static final int INTERPRETER_FRAME_SENDER_SP_OFFSET = -3;
+  private static final int INTERPRETER_FRAME_LAST_SP_OFFSET   = INTERPRETER_FRAME_SENDER_SP_OFFSET - 1;
+  private static final int INTERPRETER_FRAME_METHOD_OFFSET    = INTERPRETER_FRAME_LAST_SP_OFFSET - 1;
+  private static       int INTERPRETER_FRAME_MDX_OFFSET;         // Non-core builds only
+  private static       int INTERPRETER_FRAME_PADDING_OFFSET;
+  private static       int INTERPRETER_FRAME_MIRROR_OFFSET;
+  private static       int INTERPRETER_FRAME_CACHE_OFFSET;
+  private static       int INTERPRETER_FRAME_LOCALS_OFFSET;
+  private static       int INTERPRETER_FRAME_BCX_OFFSET;
+  private static       int INTERPRETER_FRAME_INITIAL_SP_OFFSET;
+  private static       int INTERPRETER_FRAME_MONITOR_BLOCK_TOP_OFFSET;
+  private static       int INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET;
+
+  // Entry frames
+  private static       int ENTRY_FRAME_CALL_WRAPPER_OFFSET = -10;
+
+  // Native frames
+  private static final int NATIVE_FRAME_INITIAL_PARAM_OFFSET =  2;
+
+  private static VMReg fp = new VMReg(8);
+
+  static {
+    VM.registerVMInitializedObserver(new Observer() {
+        public void update(Observable o, Object data) {
+          initialize(VM.getVM().getTypeDataBase());
+        }
+      });
+  }
+
+  private static synchronized void initialize(TypeDataBase db) {
+    INTERPRETER_FRAME_MDX_OFFSET                  = INTERPRETER_FRAME_METHOD_OFFSET - 1;
+    INTERPRETER_FRAME_PADDING_OFFSET              = INTERPRETER_FRAME_MDX_OFFSET - 1;
+    INTERPRETER_FRAME_MIRROR_OFFSET               = INTERPRETER_FRAME_PADDING_OFFSET - 1;
+    INTERPRETER_FRAME_CACHE_OFFSET                = INTERPRETER_FRAME_MIRROR_OFFSET - 1;
+    INTERPRETER_FRAME_LOCALS_OFFSET               = INTERPRETER_FRAME_CACHE_OFFSET - 1;
+    INTERPRETER_FRAME_BCX_OFFSET                  = INTERPRETER_FRAME_LOCALS_OFFSET - 1;
+    INTERPRETER_FRAME_INITIAL_SP_OFFSET           = INTERPRETER_FRAME_BCX_OFFSET - 1;
+    INTERPRETER_FRAME_MONITOR_BLOCK_TOP_OFFSET    = INTERPRETER_FRAME_INITIAL_SP_OFFSET;
+    INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET = INTERPRETER_FRAME_INITIAL_SP_OFFSET;
+  }
+
+
+  // an additional field beyond sp and pc:
+  Address raw_fp; // frame pointer
+  private Address raw_unextendedSP;
+
+  private RISCV64Frame() {
+  }
+
+  private void adjustForDeopt() {
+    if ( pc != null) {
+      // Look for a deopt pc and if it is deopted convert to original pc
+      CodeBlob cb = VM.getVM().getCodeCache().findBlob(pc);
+      if (cb != null && cb.isJavaMethod()) {
+        NMethod nm = (NMethod) cb;
+        if (pc.equals(nm.deoptHandlerBegin())) {
+          if (Assert.ASSERTS_ENABLED) {
+            Assert.that(this.getUnextendedSP() != null, "null SP in Java frame");
+          }
+          // adjust pc if frame is deoptimized.
+          pc = this.getUnextendedSP().getAddressAt(nm.origPCOffset());
+          deoptimized = true;
+        }
+      }
+    }
+  }
+
+  public RISCV64Frame(Address raw_sp, Address raw_fp, Address pc) {
+    this.raw_sp = raw_sp;
+    this.raw_unextendedSP = raw_sp;
+    this.raw_fp = raw_fp;
+    this.pc = pc;
+    adjustUnextendedSP();
+
+    // Frame must be fully constructed before this call
+    adjustForDeopt();
+
+    if (DEBUG) {
+      System.out.println("RISCV64Frame(sp, fp, pc): " + this);
+      dumpStack();
+    }
+  }
+
+  public RISCV64Frame(Address raw_sp, Address raw_fp) {
+    this.raw_sp = raw_sp;
+    this.raw_unextendedSP = raw_sp;
+    this.raw_fp = raw_fp;
+
+    // We cannot assume SP[-1] always contains a valid return PC (e.g. if
+    // the callee is a C/C++ compiled frame). If the PC is not known to
+    // Java then this.pc is null.
+    Address savedPC = raw_sp.getAddressAt(-1 * VM.getVM().getAddressSize());
+    if (VM.getVM().isJavaPCDbg(savedPC)) {
+      this.pc = savedPC;
+    }
+
+    adjustUnextendedSP();
+
+    // Frame must be fully constructed before this call
+    adjustForDeopt();
+
+    if (DEBUG) {
+      System.out.println("RISCV64Frame(sp, fp): " + this);
+      dumpStack();
+    }
+  }
+
+  public RISCV64Frame(Address raw_sp, Address raw_unextendedSp, Address raw_fp, Address pc) {
+    this.raw_sp = raw_sp;
+    this.raw_unextendedSP = raw_unextendedSp;
+    this.raw_fp = raw_fp;
+    this.pc = pc;
+    adjustUnextendedSP();
+
+    // Frame must be fully constructed before this call
+    adjustForDeopt();
+
+    if (DEBUG) {
+      System.out.println("RISCV64Frame(sp, unextendedSP, fp, pc): " + this);
+      dumpStack();
+    }
+
+  }
+
+  public Object clone() {
+    RISCV64Frame frame = new RISCV64Frame();
+    frame.raw_sp = raw_sp;
+    frame.raw_unextendedSP = raw_unextendedSP;
+    frame.raw_fp = raw_fp;
+    frame.pc = pc;
+    frame.deoptimized = deoptimized;
+    return frame;
+  }
+
+  public boolean equals(Object arg) {
+    if (arg == null) {
+      return false;
+    }
+
+    if (!(arg instanceof RISCV64Frame)) {
+      return false;
+    }
+
+    RISCV64Frame other = (RISCV64Frame) arg;
+
+    return (AddressOps.equal(getSP(), other.getSP()) &&
+            AddressOps.equal(getUnextendedSP(), other.getUnextendedSP()) &&
+            AddressOps.equal(getFP(), other.getFP()) &&
+            AddressOps.equal(getPC(), other.getPC()));
+  }
+
+  public int hashCode() {
+    if (raw_sp == null) {
+      return 0;
+    }
+
+    return raw_sp.hashCode();
+  }
+
+  public String toString() {
+    return "sp: " + (getSP() == null? "null" : getSP().toString()) +
+         ", unextendedSP: " + (getUnextendedSP() == null? "null" : getUnextendedSP().toString()) +
+         ", fp: " + (getFP() == null? "null" : getFP().toString()) +
+         ", pc: " + (pc == null? "null" : pc.toString());
+  }
+
+  // accessors for the instance variables
+  public Address getFP() { return raw_fp; }
+  public Address getSP() { return raw_sp; }
+  public Address getID() { return raw_sp; }
+
+  // FIXME: not implemented yet
+  public boolean isSignalHandlerFrameDbg() { return false; }
+  public int     getSignalNumberDbg()      { return 0;     }
+  public String  getSignalNameDbg()        { return null;  }
+
+  public boolean isInterpretedFrameValid() {
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(isInterpretedFrame(), "Not an interpreted frame");
+    }
+
+    // These are reasonable sanity checks
+    if (getFP() == null || getFP().andWithMask(0x3) != null) {
+      return false;
+    }
+
+    if (getSP() == null || getSP().andWithMask(0x3) != null) {
+      return false;
+    }
+
+    if (getFP().addOffsetTo(INTERPRETER_FRAME_INITIAL_SP_OFFSET * VM.getVM().getAddressSize()).lessThan(getSP())) {
+      return false;
+    }
+
+    // These are hacks to keep us out of trouble.
+    // The problem with these is that they mask other problems
+    if (getFP().lessThanOrEqual(getSP())) {
+      // this attempts to deal with unsigned comparison above
+      return false;
+    }
+
+    if (getFP().minus(getSP()) > 4096 * VM.getVM().getAddressSize()) {
+      // stack frames shouldn't be large.
+      return false;
+    }
+
+    return true;
+  }
+
+  public Frame sender(RegisterMap regMap, CodeBlob cb) {
+    RISCV64RegisterMap map = (RISCV64RegisterMap) regMap;
+
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(map != null, "map must be set");
+    }
+
+    // Default is we done have to follow them. The sender_for_xxx will
+    // update it accordingly
+    map.setIncludeArgumentOops(false);
+
+    if (isEntryFrame())       return senderForEntryFrame(map);
+    if (isInterpretedFrame()) return senderForInterpreterFrame(map);
+
+    if(cb == null) {
+      cb = VM.getVM().getCodeCache().findBlob(getPC());
+    } else {
+      if (Assert.ASSERTS_ENABLED) {
+        Assert.that(cb.equals(VM.getVM().getCodeCache().findBlob(getPC())), "Must be the same");
+      }
+    }
+
+    if (cb != null) {
+      return senderForCompiledFrame(map, cb);
+    }
+
+    // Must be native-compiled frame, i.e. the marshaling code for native
+    // methods that exists in the core system.
+    return new RISCV64Frame(getSenderSP(), getLink(), getSenderPC());
+  }
+
+  private Frame senderForEntryFrame(RISCV64RegisterMap map) {
+    if (DEBUG) {
+      System.out.println("senderForEntryFrame");
+    }
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(map != null, "map must be set");
+    }
+    // Java frame called from C; skip all C frames and return top C
+    // frame of that chunk as the sender
+    RISCV64JavaCallWrapper jcw = (RISCV64JavaCallWrapper) getEntryFrameCallWrapper();
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(!entryFrameIsFirst(), "next Java fp must be non zero");
+      Assert.that(jcw.getLastJavaSP().greaterThan(getSP()), "must be above this frame on stack");
+    }
+    RISCV64Frame fr;
+    if (jcw.getLastJavaPC() != null) {
+      fr = new RISCV64Frame(jcw.getLastJavaSP(), jcw.getLastJavaFP(), jcw.getLastJavaPC());
+    } else {
+      fr = new RISCV64Frame(jcw.getLastJavaSP(), jcw.getLastJavaFP());
+    }
+    map.clear();
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(map.getIncludeArgumentOops(), "should be set by clear");
+    }
+    return fr;
+  }
+
+  //------------------------------------------------------------------------------
+  // frame::adjust_unextended_sp
+  private void adjustUnextendedSP() {
+    // If we are returning to a compiled MethodHandle call site, the
+    // saved_fp will in fact be a saved value of the unextended SP.  The
+    // simplest way to tell whether we are returning to such a call site
+    // is as follows:
+
+    CodeBlob cb = cb();
+    NMethod senderNm = (cb == null) ? null : cb.asNMethodOrNull();
+    if (senderNm != null) {
+      // If the sender PC is a deoptimization point, get the original
+      // PC.  For MethodHandle call site the unextended_sp is stored in
+      // saved_fp.
+      if (senderNm.isDeoptMhEntry(getPC())) {
+        raw_unextendedSP = getFP();
+      }
+      else if (senderNm.isDeoptEntry(getPC())) {
+      }
+      else if (senderNm.isMethodHandleReturn(getPC())) {
+        raw_unextendedSP = getFP();
+      }
+    }
+  }
+
+  private Frame senderForInterpreterFrame(RISCV64RegisterMap map) {
+    if (DEBUG) {
+      System.out.println("senderForInterpreterFrame");
+    }
+    Address unextendedSP = addressOfStackSlot(INTERPRETER_FRAME_SENDER_SP_OFFSET).getAddressAt(0);
+    Address sp = addressOfStackSlot(SENDER_SP_OFFSET);
+    // We do not need to update the callee-save register mapping because above
+    // us is either another interpreter frame or a converter-frame, but never
+    // directly a compiled frame.
+    // 11/24/04 SFG. With the removal of adapter frames this is no longer true.
+    // However c2 no longer uses callee save register for java calls so there
+    // are no callee register to find.
+
+    if (map.getUpdateMap())
+      updateMapWithSavedLink(map, addressOfStackSlot(LINK_OFFSET));
+
+    return new RISCV64Frame(sp, unextendedSP, getLink(), getSenderPC());
+  }
+
+  private void updateMapWithSavedLink(RegisterMap map, Address savedFPAddr) {
+    map.setLocation(fp, savedFPAddr);
+  }
+
+  private Frame senderForCompiledFrame(RISCV64RegisterMap map, CodeBlob cb) {
+    if (DEBUG) {
+      System.out.println("senderForCompiledFrame");
+    }
+
+    //
+    // NOTE: some of this code is (unfortunately) duplicated  RISCV64CurrentFrameGuess
+    //
+
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(map != null, "map must be set");
+    }
+
+    // frame owned by optimizing compiler
+    if (Assert.ASSERTS_ENABLED) {
+        Assert.that(cb.getFrameSize() >= 0, "must have non-zero frame size");
+    }
+    Address senderSP = getUnextendedSP().addOffsetTo(cb.getFrameSize());
+
+    // The return_address is always the word on the stack
+    Address senderPC = senderSP.getAddressAt(-1 * VM.getVM().getAddressSize());
+
+    // This is the saved value of FP which may or may not really be an FP.
+    // It is only an FP if the sender is an interpreter frame.
+    Address savedFPAddr = senderSP.addOffsetTo(-2 * VM.getVM().getAddressSize());
+
+    if (map.getUpdateMap()) {
+      // Tell GC to use argument oopmaps for some runtime stubs that need it.
+      // For C1, the runtime stub might not have oop maps, so set this flag
+      // outside of update_register_map.
+      map.setIncludeArgumentOops(cb.callerMustGCArguments());
+
+      if (cb.getOopMaps() != null) {
+        ImmutableOopMapSet.updateRegisterMap(this, cb, map, true);
+      }
+
+      // Since the prolog does the save and restore of FP there is no oopmap
+      // for it so we must fill in its location as if there was an oopmap entry
+      // since if our caller was compiled code there could be live jvm state in it.
+      updateMapWithSavedLink(map, savedFPAddr);
+    }
+
+    return new RISCV64Frame(senderSP, savedFPAddr.getAddressAt(0), senderPC);
+  }
+
+  protected boolean hasSenderPD() {
+    return true;
+  }
+
+  public long frameSize() {
+    return (getSenderSP().minus(getSP()) / VM.getVM().getAddressSize());
+  }
+
+    public Address getLink() {
+        try {
+            if (DEBUG) {
+                System.out.println("Reading link at " + addressOfStackSlot(LINK_OFFSET)
+                        + " = " + addressOfStackSlot(LINK_OFFSET).getAddressAt(0));
+            }
+            return addressOfStackSlot(LINK_OFFSET).getAddressAt(0);
+        } catch (Exception e) {
+            if (DEBUG)
+                System.out.println("Returning null");
+            return null;
+        }
+    }
+
+  public Address getUnextendedSP() { return raw_unextendedSP; }
+
+  // Return address:
+  public Address getSenderPCAddr() { return addressOfStackSlot(RETURN_ADDR_OFFSET); }
+  public Address getSenderPC()     { return getSenderPCAddr().getAddressAt(0);      }
+
+  // return address of param, zero origin index.
+  public Address getNativeParamAddr(int idx) {
+    return addressOfStackSlot(NATIVE_FRAME_INITIAL_PARAM_OFFSET + idx);
+  }
+
+  public Address getSenderSP()     { return addressOfStackSlot(SENDER_SP_OFFSET); }
+
+  public Address addressOfInterpreterFrameLocals() {
+    return addressOfStackSlot(INTERPRETER_FRAME_LOCALS_OFFSET);
+  }
+
+  private Address addressOfInterpreterFrameBCX() {
+    return addressOfStackSlot(INTERPRETER_FRAME_BCX_OFFSET);
+  }
+
+  public int getInterpreterFrameBCI() {
+    // FIXME: this is not atomic with respect to GC and is unsuitable
+    // for use in a non-debugging, or reflective, system. Need to
+    // figure out how to express this.
+    Address bcp = addressOfInterpreterFrameBCX().getAddressAt(0);
+    Address methodHandle = addressOfInterpreterFrameMethod().getAddressAt(0);
+    Method method = (Method)Metadata.instantiateWrapperFor(methodHandle);
+    return bcpToBci(bcp, method);
+  }
+
+  public Address addressOfInterpreterFrameMDX() {
+    return addressOfStackSlot(INTERPRETER_FRAME_MDX_OFFSET);
+  }
+
+  // expression stack
+  // (the max_stack arguments are used by the GC; see class FrameClosure)
+
+  public Address addressOfInterpreterFrameExpressionStack() {
+    Address monitorEnd = interpreterFrameMonitorEnd().address();
+    return monitorEnd.addOffsetTo(-1 * VM.getVM().getAddressSize());
+  }
+
+  public int getInterpreterFrameExpressionStackDirection() { return -1; }
+
+  // top of expression stack
+  public Address addressOfInterpreterFrameTOS() {
+    return getSP();
+  }
+
+  /** Expression stack from top down */
+  public Address addressOfInterpreterFrameTOSAt(int slot) {
+    return addressOfInterpreterFrameTOS().addOffsetTo(slot * VM.getVM().getAddressSize());
+  }
+
+  public Address getInterpreterFrameSenderSP() {
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(isInterpretedFrame(), "interpreted frame expected");
+    }
+    return addressOfStackSlot(INTERPRETER_FRAME_SENDER_SP_OFFSET).getAddressAt(0);
+  }
+
+  // Monitors
+  public BasicObjectLock interpreterFrameMonitorBegin() {
+    return new BasicObjectLock(addressOfStackSlot(INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET));
+  }
+
+  public BasicObjectLock interpreterFrameMonitorEnd() {
+    Address result = addressOfStackSlot(INTERPRETER_FRAME_MONITOR_BLOCK_TOP_OFFSET).getAddressAt(0);
+    if (Assert.ASSERTS_ENABLED) {
+      // make sure the pointer points inside the frame
+      Assert.that(AddressOps.gt(getFP(), result), "result must <  than frame pointer");
+      Assert.that(AddressOps.lte(getSP(), result), "result must >= than stack pointer");
+    }
+    return new BasicObjectLock(result);
+  }
+
+  public int interpreterFrameMonitorSize() {
+    return BasicObjectLock.size();
+  }
+
+  // Method
+  public Address addressOfInterpreterFrameMethod() {
+    return addressOfStackSlot(INTERPRETER_FRAME_METHOD_OFFSET);
+  }
+
+  // Constant pool cache
+  public Address addressOfInterpreterFrameCPCache() {
+    return addressOfStackSlot(INTERPRETER_FRAME_CACHE_OFFSET);
+  }
+
+  // Entry frames
+  public JavaCallWrapper getEntryFrameCallWrapper() {
+    return new RISCV64JavaCallWrapper(addressOfStackSlot(ENTRY_FRAME_CALL_WRAPPER_OFFSET).getAddressAt(0));
+  }
+
+  protected Address addressOfSavedOopResult() {
+    // offset is 2 for compiler2 and 3 for compiler1
+    return getSP().addOffsetTo((VM.getVM().isClientCompiler() ? 2 : 3) *
+                               VM.getVM().getAddressSize());
+  }
+
+  protected Address addressOfSavedReceiver() {
+    return getSP().addOffsetTo(-4 * VM.getVM().getAddressSize());
+  }
+
+  private void dumpStack() {
+    for (Address addr = getSP().addOffsetTo(-4 * VM.getVM().getAddressSize());
+         AddressOps.lt(addr, getSP());
+         addr = addr.addOffsetTo(VM.getVM().getAddressSize())) {
+      System.out.println(addr + ": " + addr.getAddressAt(0));
+    }
+    System.out.println("-----------------------");
+    for (Address addr = getSP();
+         AddressOps.lte(addr, getSP().addOffsetTo(20 * VM.getVM().getAddressSize()));
+         addr = addr.addOffsetTo(VM.getVM().getAddressSize())) {
+      System.out.println(addr + ": " + addr.getAddressAt(0));
+    }
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64JavaCallWrapper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64JavaCallWrapper.java
new file mode 100644
index 00000000000..d0ad2b559a6
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64JavaCallWrapper.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.riscv64;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.utilities.*;
+import sun.jvm.hotspot.utilities.Observable;
+import sun.jvm.hotspot.utilities.Observer;
+
+public class RISCV64JavaCallWrapper extends JavaCallWrapper {
+  private static AddressField lastJavaFPField;
+
+  static {
+    VM.registerVMInitializedObserver(new Observer() {
+        public void update(Observable o, Object data) {
+          initialize(VM.getVM().getTypeDataBase());
+        }
+      });
+  }
+
+  private static synchronized void initialize(TypeDataBase db) {
+    Type type = db.lookupType("JavaFrameAnchor");
+
+    lastJavaFPField  = type.getAddressField("_last_Java_fp");
+  }
+
+  public RISCV64JavaCallWrapper(Address addr) {
+    super(addr);
+  }
+
+  public Address getLastJavaFP() {
+    return lastJavaFPField.getValue(addr.addOffsetTo(anchorField.getOffset()));
+  }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64RegisterMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64RegisterMap.java
new file mode 100644
index 00000000000..4aeb1c6f557
--- /dev/null
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64RegisterMap.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.riscv64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+
+public class RISCV64RegisterMap extends RegisterMap {
+
+  /** This is the only public constructor */
+  public RISCV64RegisterMap(JavaThread thread, boolean updateMap) {
+    super(thread, updateMap);
+  }
+
+  protected RISCV64RegisterMap(RegisterMap map) {
+    super(map);
+  }
+
+  public Object clone() {
+    RISCV64RegisterMap retval = new RISCV64RegisterMap(this);
+    return retval;
+  }
+
+  // no PD state to clear or copy:
+  protected void clearPD() {}
+  protected void initializePD() {}
+  protected void initializeFromPD(RegisterMap map) {}
+  protected Address getLocationPD(VMReg reg) { return null; }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
index 3e66e24700b..f4cd4873207 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ public class PlatformInfo {
 
   public static boolean knownCPU(String cpu) {
     final String[] KNOWN =
-        new String[] {"i386", "x86", "x86_64", "amd64", "ppc64", "ppc64le", "aarch64"};
+        new String[] {"i386", "x86", "x86_64", "amd64", "ppc64", "ppc64le", "aarch64", "riscv64"};
 
     for(String s : KNOWN) {
       if(s.equals(cpu))
diff --git a/test/hotspot/jtreg/compiler/c2/TestBit.java b/test/hotspot/jtreg/compiler/c2/TestBit.java
index f8af537a62f..02596b7ee55 100644
--- a/test/hotspot/jtreg/compiler/c2/TestBit.java
+++ b/test/hotspot/jtreg/compiler/c2/TestBit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import jdk.test.lib.process.ProcessTools;
  * @library /test/lib /
  *
  * @requires vm.flagless
- * @requires os.arch=="aarch64" | os.arch=="amd64" | os.arch == "ppc64le"
+ * @requires os.arch=="aarch64" | os.arch=="amd64" | os.arch == "ppc64le" | os.arch == "riscv64"
  * @requires vm.debug == true & vm.compiler2.enabled
  *
  * @run driver compiler.c2.TestBit
@@ -55,7 +55,8 @@ public class TestBit {
         String expectedTestBitInstruction =
             "ppc64le".equals(System.getProperty("os.arch")) ? "ANDI" :
             "aarch64".equals(System.getProperty("os.arch")) ? "tb"   :
-            "amd64".equals(System.getProperty("os.arch"))   ? "test" : null;
+            "amd64".equals(System.getProperty("os.arch"))   ? "test" :
+            "riscv64".equals(System.getProperty("os.arch")) ? "andi" : null;
 
         if (expectedTestBitInstruction != null) {
             output.shouldContain(expectedTestBitInstruction);
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
index 6329ed74e9e..50294e068cb 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ package compiler.intrinsics.sha.cli;
 
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForOtherCPU;
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedAArch64CPU;
+import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedRISCV64CPU;
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedX86CPU;
 import compiler.intrinsics.sha.cli.testcases.UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU;
 
@@ -49,6 +50,8 @@ public class TestUseSHA1IntrinsicsOptionOnUnsupportedCPU {
                         DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION),
                 new GenericTestCaseForUnsupportedAArch64CPU(
                         DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION),
+                new GenericTestCaseForUnsupportedRISCV64CPU(
+                        DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION),
                 new UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU(
                         DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION),
                 new GenericTestCaseForOtherCPU(
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
index dbc938d2b54..9ce909185f2 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ package compiler.intrinsics.sha.cli;
 
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForOtherCPU;
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedAArch64CPU;
+import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedRISCV64CPU;
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedX86CPU;
 import compiler.intrinsics.sha.cli.testcases.UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU;
 
@@ -49,6 +50,8 @@ public class TestUseSHA256IntrinsicsOptionOnUnsupportedCPU {
                         DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION),
                 new GenericTestCaseForUnsupportedAArch64CPU(
                         DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION),
+                new GenericTestCaseForUnsupportedRISCV64CPU(
+                        DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION),
                 new UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU(
                         DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION),
                 new GenericTestCaseForOtherCPU(
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
index eef34f01d84..1ab05caca4e 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ package compiler.intrinsics.sha.cli;
 
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForOtherCPU;
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedAArch64CPU;
+import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedRISCV64CPU;
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedX86CPU;
 import compiler.intrinsics.sha.cli.testcases.UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU;
 
@@ -49,6 +50,8 @@ public class TestUseSHA512IntrinsicsOptionOnUnsupportedCPU {
                         DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION),
                 new GenericTestCaseForUnsupportedAArch64CPU(
                         DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION),
+                new GenericTestCaseForUnsupportedRISCV64CPU(
+                        DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION),
                 new UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU(
                         DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION),
                 new GenericTestCaseForOtherCPU(
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
index df471c4bf03..e6131d6c0ae 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,7 @@ package compiler.intrinsics.sha.cli;
 
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForOtherCPU;
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedAArch64CPU;
+import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedRISCV64CPU;
 import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedX86CPU;
 import compiler.intrinsics.sha.cli.testcases.UseSHASpecificTestCaseForUnsupportedCPU;
 
@@ -49,6 +50,8 @@ public class TestUseSHAOptionOnUnsupportedCPU {
                         DigestOptionsBase.USE_SHA_OPTION),
                 new GenericTestCaseForUnsupportedAArch64CPU(
                         DigestOptionsBase.USE_SHA_OPTION),
+                new GenericTestCaseForUnsupportedRISCV64CPU(
+                        DigestOptionsBase.USE_SHA_OPTION),
                 new UseSHASpecificTestCaseForUnsupportedCPU(
                         DigestOptionsBase.USE_SHA_OPTION),
                 new GenericTestCaseForOtherCPU(
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java
index 2b8d143dd68..468cd83d7a2 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import jdk.test.lib.cli.predicate.OrPredicate;
 
 /**
  * Generic test case for SHA-related options targeted to any CPU except
- * AArch64, PPC, S390x, and X86.
+ * AArch64, RISCV64, PPC, S390x, and X86.
  */
 public class GenericTestCaseForOtherCPU extends
         DigestOptionsBase.TestCase {
@@ -44,13 +44,14 @@ public class GenericTestCaseForOtherCPU extends
     }
 
     public GenericTestCaseForOtherCPU(String optionName, boolean checkUseSHA) {
-        // Execute the test case on any CPU except AArch64, PPC, S390x, and X86.
+        // Execute the test case on any CPU except AArch64, RISCV64, PPC, S390x, and X86.
         super(optionName, new NotPredicate(
                               new OrPredicate(Platform::isAArch64,
+                              new OrPredicate(Platform::isRISCV64,
                               new OrPredicate(Platform::isS390x,
                               new OrPredicate(Platform::isPPC,
                               new OrPredicate(Platform::isX64,
-                                              Platform::isX86))))));
+                                              Platform::isX86)))))));
 
         this.checkUseSHA = checkUseSHA;
     }
@@ -59,7 +60,7 @@ public class GenericTestCaseForOtherCPU extends
     protected void verifyWarnings() throws Throwable {
         String shouldPassMessage = String.format("JVM should start with "
                 + "option '%s' without any warnings", optionName);
-        // Verify that on non-x86 and non-AArch64 CPU usage of SHA-related
+        // Verify that on non-x86, non-RISCV64 and non-AArch64 CPU usage of SHA-related
         // options will not cause any warnings.
         CommandLineOptionTest.verifySameJVMStartup(null,
                 new String[] { ".*" + optionName + ".*" }, shouldPassMessage,
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedRISCV64CPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedRISCV64CPU.java
new file mode 100644
index 00000000000..2ecfec07a4c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedRISCV64CPU.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.intrinsics.sha.cli.testcases;
+
+import compiler.intrinsics.sha.cli.DigestOptionsBase;
+import jdk.test.lib.process.ExitCode;
+import jdk.test.lib.Platform;
+import jdk.test.lib.cli.CommandLineOptionTest;
+import jdk.test.lib.cli.predicate.AndPredicate;
+import jdk.test.lib.cli.predicate.NotPredicate;
+
+/**
+ * Generic test case for SHA-related options targeted to RISCV64 CPUs
+ * which don't support instruction required by the tested option.
+ */
+public class GenericTestCaseForUnsupportedRISCV64CPU extends
+        DigestOptionsBase.TestCase {
+
+    final private boolean checkUseSHA;
+
+    public GenericTestCaseForUnsupportedRISCV64CPU(String optionName) {
+        this(optionName, true);
+    }
+
+    public GenericTestCaseForUnsupportedRISCV64CPU(String optionName, boolean checkUseSHA) {
+        super(optionName, new AndPredicate(Platform::isRISCV64,
+                new NotPredicate(DigestOptionsBase.getPredicateForOption(
+                        optionName))));
+
+        this.checkUseSHA = checkUseSHA;
+    }
+
+    @Override
+    protected void verifyWarnings() throws Throwable {
+        String shouldPassMessage = String.format("JVM startup should pass with"
+                + "option '-XX:-%s' without any warnings", optionName);
+        //Verify that option could be disabled without any warnings.
+        CommandLineOptionTest.verifySameJVMStartup(null, new String[] {
+                        DigestOptionsBase.getWarningForUnsupportedCPU(optionName)
+                }, shouldPassMessage, shouldPassMessage, ExitCode.OK,
+                DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
+                CommandLineOptionTest.prepareBooleanFlag(optionName, false));
+
+        if (checkUseSHA) {
+            shouldPassMessage = String.format("If JVM is started with '-XX:-"
+                    + "%s' '-XX:+%s', output should contain warning.",
+                    DigestOptionsBase.USE_SHA_OPTION, optionName);
+
+            // Verify that when the tested option is enabled, then
+            // a warning will occur in VM output if UseSHA is disabled.
+            if (!optionName.equals(DigestOptionsBase.USE_SHA_OPTION)) {
+                CommandLineOptionTest.verifySameJVMStartup(
+                        new String[] { DigestOptionsBase.getWarningForUnsupportedCPU(optionName) },
+                        null,
+                        shouldPassMessage,
+                        shouldPassMessage,
+                        ExitCode.OK,
+                        DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
+                        CommandLineOptionTest.prepareBooleanFlag(DigestOptionsBase.USE_SHA_OPTION, false),
+                        CommandLineOptionTest.prepareBooleanFlag(optionName, true));
+            }
+        }
+    }
+
+    @Override
+    protected void verifyOptionValues() throws Throwable {
+        // Verify that option is disabled by default.
+        CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
+                String.format("Option '%s' should be disabled by default",
+                        optionName),
+                DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS);
+
+        if (checkUseSHA) {
+            // Verify that option is disabled even if it was explicitly enabled
+            // using CLI options.
+            CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
+                    String.format("Option '%s' should be off on unsupported "
+                            + "RISCV64CPU even if set to true directly", optionName),
+                    DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
+                    CommandLineOptionTest.prepareBooleanFlag(optionName, true));
+
+            // Verify that option is disabled when +UseSHA was passed to JVM.
+            CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
+                    String.format("Option '%s' should be off on unsupported "
+                            + "RISCV64CPU even if %s flag set to JVM",
+                            optionName, CommandLineOptionTest.prepareBooleanFlag(
+                                DigestOptionsBase.USE_SHA_OPTION, true)),
+                    DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
+                    CommandLineOptionTest.prepareBooleanFlag(
+                            DigestOptionsBase.USE_SHA_OPTION, true));
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java
index 2e3e2717a65..7be8af6d035 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8074981
  * @summary Add C2 x86 Superword support for scalar product reduction optimizations : float test
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java
index 0e06a9e4327..797927b42bf 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8074981
  * @summary Add C2 x86 Superword support for scalar product reduction optimizations : float test
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
index c3cdbf37464..be8f7d586c2 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8074981
  * @summary Add C2 x86 Superword support for scalar product reduction optimizations : int test
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java b/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
index d33bd411f16..d96d5e29c00 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8074981
  * @summary Add C2 x86 Superword support for scalar product reduction optimizations : int test
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions
  *      -XX:LoopUnrollLimit=250 -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java
index 992fa4b5161..b09c873d05d 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8138583
  * @summary Add C2 AArch64 Superword support for scalar sum reduction optimizations : double abs & neg test
- * @requires os.arch=="aarch64"
+ * @requires os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java
index 3e79b3528b7..fe40ed6f98d 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8138583
  * @summary Add C2 AArch64 Superword support for scalar sum reduction optimizations : float abs & neg test
- * @requires os.arch=="aarch64"
+ * @requires os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java
index 6603dd224ef..51631910493 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8135028
  * @summary Add C2 x86 Superword support for scalar sum reduction optimizations : double sqrt test
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java
index d9a0c988004..d999ae423cf 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8074981
  * @summary Add C2 x86 Superword support for scalar sum reduction optimizations : double test
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java
index 722db95aed3..65912a5c7fa 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8074981
  * @summary Add C2 x86 Superword support for scalar sum reduction optimizations : float test
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java
index f58f21feb23..fffdc2f7565 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8074981
  * @summary Add C2 x86 Superword support for scalar sum reduction optimizations : int test
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  *
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=250
  *      -XX:CompileThresholdScaling=0.1
diff --git a/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java b/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java
index 782ab6b9b46..e922c5b8853 100644
--- a/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java
+++ b/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,14 +68,16 @@ public class IntrinsicPredicates {
 
     public static final BooleanSupplier SHA1_INSTRUCTION_AVAILABLE
             = new OrPredicate(new CPUSpecificPredicate("aarch64.*", new String[] { "sha1" }, null),
+              new OrPredicate(new CPUSpecificPredicate("riscv64.*", new String[] { "sha1" }, null),
               new OrPredicate(new CPUSpecificPredicate("s390.*",    new String[] { "sha1" }, null),
               // x86 variants
               new OrPredicate(new CPUSpecificPredicate("amd64.*",   new String[] { "sha" },  null),
               new OrPredicate(new CPUSpecificPredicate("i386.*",    new String[] { "sha" },  null),
-                              new CPUSpecificPredicate("x86.*",     new String[] { "sha" },  null)))));
+                              new CPUSpecificPredicate("x86.*",     new String[] { "sha" },  null))))));
 
     public static final BooleanSupplier SHA256_INSTRUCTION_AVAILABLE
             = new OrPredicate(new CPUSpecificPredicate("aarch64.*", new String[] { "sha256"       }, null),
+              new OrPredicate(new CPUSpecificPredicate("riscv64.*", new String[] { "sha256"       }, null),
               new OrPredicate(new CPUSpecificPredicate("s390.*",    new String[] { "sha256"       }, null),
               new OrPredicate(new CPUSpecificPredicate("ppc64.*",   new String[] { "sha"          }, null),
               new OrPredicate(new CPUSpecificPredicate("ppc64le.*", new String[] { "sha"          }, null),
@@ -84,10 +86,11 @@ public class IntrinsicPredicates {
               new OrPredicate(new CPUSpecificPredicate("i386.*",    new String[] { "sha"          }, null),
               new OrPredicate(new CPUSpecificPredicate("x86.*",     new String[] { "sha"          }, null),
               new OrPredicate(new CPUSpecificPredicate("amd64.*",   new String[] { "avx2", "bmi2" }, null),
-                              new CPUSpecificPredicate("x86_64",    new String[] { "avx2", "bmi2" }, null)))))))));
+                              new CPUSpecificPredicate("x86_64",    new String[] { "avx2", "bmi2" }, null))))))))));
 
     public static final BooleanSupplier SHA512_INSTRUCTION_AVAILABLE
             = new OrPredicate(new CPUSpecificPredicate("aarch64.*", new String[] { "sha512"       }, null),
+              new OrPredicate(new CPUSpecificPredicate("riscv64.*", new String[] { "sha512"       }, null),
               new OrPredicate(new CPUSpecificPredicate("s390.*",    new String[] { "sha512"       }, null),
               new OrPredicate(new CPUSpecificPredicate("ppc64.*",   new String[] { "sha"          }, null),
               new OrPredicate(new CPUSpecificPredicate("ppc64le.*", new String[] { "sha"          }, null),
@@ -96,7 +99,7 @@ public class IntrinsicPredicates {
               new OrPredicate(new CPUSpecificPredicate("i386.*",    new String[] { "sha"          }, null),
               new OrPredicate(new CPUSpecificPredicate("x86.*",     new String[] { "sha"          }, null),
               new OrPredicate(new CPUSpecificPredicate("amd64.*",   new String[] { "avx2", "bmi2" }, null),
-                              new CPUSpecificPredicate("x86_64",    new String[] { "avx2", "bmi2" }, null)))))))));
+                              new CPUSpecificPredicate("x86_64",    new String[] { "avx2", "bmi2" }, null))))))))));
 
     public static final BooleanSupplier SHA3_INSTRUCTION_AVAILABLE
             // sha3 is only implemented on aarch64 for now
diff --git a/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java b/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java
index dfc84241beb..b96e3a80aba 100644
--- a/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java
+++ b/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@ public class CheckForProperDetailStackTrace {
             // It's ok for ARM not to have symbols, because it does not support NMT detail
             // when targeting thumb2. It's also ok for Windows not to have symbols, because
             // they are only available if the symbols file is included with the build.
-            if (Platform.isWindows() || Platform.isARM()) {
+            if (Platform.isWindows() || Platform.isARM() || Platform.isRISCV64()) {
                 return; // we are done
             }
             output.reportDiagnosticSummary();
diff --git a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java
index c11472a0918..36f74d01b54 100644
--- a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java
+++ b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -240,7 +240,7 @@ public class ReservedStackTest {
         return Platform.isAix() ||
             (Platform.isLinux() &&
              (Platform.isPPC() || Platform.isS390x() || Platform.isX64() ||
-              Platform.isX86() || Platform.isAArch64())) ||
+              Platform.isX86() || Platform.isAArch64() || Platform.isRISCV64())) ||
             Platform.isOSX();
     }
 
diff --git a/test/hotspot/jtreg/serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java b/test/hotspot/jtreg/serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java
index 5653b735273..5c41565db8d 100644
--- a/test/hotspot/jtreg/serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java
+++ b/test/hotspot/jtreg/serviceability/AsyncGetCallTrace/MyPackage/ASGCTBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, Google and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,7 +29,7 @@ package MyPackage;
  * @summary Verifies that AsyncGetCallTrace is call-able and provides sane information.
  * @compile ASGCTBaseTest.java
  * @requires os.family == "linux"
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="arm" | os.arch=="aarch64" | os.arch=="ppc64" | os.arch=="s390"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="arm" | os.arch=="aarch64" | os.arch=="ppc64" | os.arch=="s390" | os.arch=="riscv64"
  * @requires vm.jvmti
  * @run main/othervm/native -agentlib:AsyncGetCallTraceTest MyPackage.ASGCTBaseTest
  */
diff --git a/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java
index 922b18836dd..c078acbaff8 100644
--- a/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java
+++ b/test/jdk/java/util/concurrent/ConcurrentHashMap/MapLoops.java
@@ -48,7 +48,7 @@
 /*
  * @test
  * @summary Exercise multithreaded maps, using only heavy monitors.
- * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch == "ppc64" | os.arch == "ppc64le"
+ * @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "riscv64"
  * @library /test/lib
  * @run main/othervm/timeout=1600 -XX:+IgnoreUnrecognizedVMOptions -XX:+UseHeavyMonitors -XX:+VerifyHeavyMonitors MapLoops
  */
diff --git a/test/jdk/jdk/jfr/event/os/TestCPUInformation.java b/test/jdk/jdk/jfr/event/os/TestCPUInformation.java
index a4b5169ca4a..c5166580010 100644
--- a/test/jdk/jdk/jfr/event/os/TestCPUInformation.java
+++ b/test/jdk/jdk/jfr/event/os/TestCPUInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,8 @@ public class TestCPUInformation {
             Events.assertField(event, "hwThreads").atLeast(1);
             Events.assertField(event, "cores").atLeast(1);
             Events.assertField(event, "sockets").atLeast(1);
-            Events.assertField(event, "cpu").containsAny("Intel", "AMD", "Unknown x86", "ARM", "PPC", "PowerPC", "AArch64", "s390");
-            Events.assertField(event, "description").containsAny("Intel", "AMD", "Unknown x86", "ARM", "PPC", "PowerPC", "AArch64", "s390");
+            Events.assertField(event, "cpu").containsAny("Intel", "AMD", "Unknown x86", "ARM", "PPC", "PowerPC", "AArch64", "RISCV64", "s390");
+            Events.assertField(event, "description").containsAny("Intel", "AMD", "Unknown x86", "ARM", "PPC", "PowerPC", "AArch64", "RISCV64", "s390");
         }
     }
 }
diff --git a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
index 3ca1de653a4..219d3797453 100644
--- a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
+++ b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
@@ -45,7 +45,7 @@ import java.util.Set;
  */
 public class TestMutuallyExclusivePlatformPredicates {
     private static enum MethodGroup {
-        ARCH("isAArch64", "isARM", "isPPC", "isS390x", "isX64", "isX86"),
+        ARCH("isAArch64", "isARM", "isRISCV64", "isPPC", "isS390x", "isX64", "isX86"),
         BITNESS("is32bit", "is64bit"),
         OS("isAix", "isLinux", "isOSX", "isWindows"),
         VM_TYPE("isClient", "isServer", "isMinimal", "isZero", "isEmbedded"),
diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index a8405c93722..3084634018b 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -197,6 +197,10 @@ public class Platform {
         return isArch("arm.*");
     }
 
+    public static boolean isRISCV64() {
+        return isArch("riscv64");
+    }
+
     public static boolean isPPC() {
         return isArch("ppc.*");
     }
-- 
GitLab


From 2c43ecb43fa3c94b69478039f1cd70ed4a577768 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 24 Mar 2022 09:49:33 +0000
Subject: [PATCH 196/345] 8283323: libharfbuzz optimization level results in
 extreme build times

Reviewed-by: erikj, prr
---
 make/modules/java.desktop/lib/Awt2dLibraries.gmk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
index 3cf8ca8a820..c410e390fc9 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -470,7 +470,6 @@ else
 
 endif
 
-
 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
     libharfbuzz \
     common/awt \
@@ -485,6 +484,14 @@ BUILD_LIBFONTMANAGER_FONTLIB +=  $(LIBFREETYPE_LIBS)
 
 LIBFONTMANAGER_OPTIMIZATION := HIGHEST
 
+ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
+  # gcc (and to an extent clang) is particularly bad at optimizing these files,
+  # causing a massive spike in compile time. We don't care about these
+  # particular files anyway, so lower optimization level.
+  BUILD_LIBFONTMANAGER_hb-subset.cc_OPTIMIZATION := SIZE
+  BUILD_LIBFONTMANAGER_hb-subset-plan.cc_OPTIMIZATION := SIZE
+endif
+
 ifeq ($(call isTargetOs, windows), true)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
       X11TextRenderer.c
-- 
GitLab


From 1c4f5fcb88892e6c76074eac87b63d81d53647b2 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Thu, 24 Mar 2022 12:48:12 +0000
Subject: [PATCH 197/345] 8283575: Check for GNU time fails for version >1.7

Reviewed-by: shade, ihse
---
 make/autoconf/basic_tools.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4
index 1611e9fd531..953f29bddd5 100644
--- a/make/autoconf/basic_tools.m4
+++ b/make/autoconf/basic_tools.m4
@@ -348,7 +348,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   UTIL_LOOKUP_PROGS(DTRACE, dtrace, $PATH:/usr/sbin)
   UTIL_LOOKUP_PROGS(PATCH, gpatch patch)
   # Check if it's GNU time
-  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
+  [ IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU [Tt]ime'` ]
   if test "x$IS_GNU_TIME" != x; then
     IS_GNU_TIME=yes
   else
-- 
GitLab


From 14c20bc0e0ee32b82ffe653ae9e4a0be52d578cb Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Thu, 24 Mar 2022 12:53:44 +0000
Subject: [PATCH 198/345] 8283187: C2: loop candidate for superword not always
 unrolled fully if superword fails

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/loopnode.cpp           |  9 +-
 src/hotspot/share/opto/superword.cpp          | 92 ++++++++++---------
 src/hotspot/share/opto/superword.hpp          |  6 +-
 .../irTests/TestSuperwordFailsUnrolling.java  | 66 +++++++++++++
 .../compiler/lib/ir_framework/IRNode.java     |  1 +
 5 files changed, 129 insertions(+), 45 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/irTests/TestSuperwordFailsUnrolling.java

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index f08b1d46b1c..28ed035b82b 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -4568,7 +4568,14 @@ void PhaseIdealLoop::build_and_optimize() {
             sw.transform_loop(lpt, true);
           }
         } else if (cl->is_main_loop()) {
-          sw.transform_loop(lpt, true);
+          if (!sw.transform_loop(lpt, true)) {
+            // Instigate more unrolling for optimization when vectorization fails.
+            if (cl->has_passed_slp()) {
+              C->set_major_progress();
+              cl->set_notpassed_slp();
+              cl->mark_do_unroll_only();
+            }
+          }
         }
       }
     }
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 1bf4c7a3282..8a116212783 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -95,38 +95,48 @@ SuperWord::SuperWord(PhaseIdealLoop* phase) :
 static const bool _do_vector_loop_experimental = false; // Experimental vectorization which uses data from loop unrolling.
 
 //------------------------------transform_loop---------------------------
-void SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) {
+bool SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) {
   assert(UseSuperWord, "should be");
   // SuperWord only works with power of two vector sizes.
   int vector_width = Matcher::vector_width_in_bytes(T_BYTE);
   if (vector_width < 2 || !is_power_of_2(vector_width)) {
-    return;
+    return false;
   }
 
   assert(lpt->_head->is_CountedLoop(), "must be");
   CountedLoopNode *cl = lpt->_head->as_CountedLoop();
 
-  if (!cl->is_valid_counted_loop(T_INT)) return; // skip malformed counted loop
+  if (!cl->is_valid_counted_loop(T_INT)) {
+    return false; // skip malformed counted loop
+  }
 
   bool post_loop_allowed = (PostLoopMultiversioning && Matcher::has_predicated_vectors() && cl->is_post_loop());
   if (post_loop_allowed) {
-    if (cl->is_reduction_loop()) return; // no predication mapping
+    if (cl->is_reduction_loop()) {
+      return false; // no predication mapping
+    }
     Node *limit = cl->limit();
-    if (limit->is_Con()) return; // non constant limits only
+    if (limit->is_Con()) {
+      return false; // non constant limits only
+    }
     // Now check the limit for expressions we do not handle
     if (limit->is_Add()) {
       Node *in2 = limit->in(2);
       if (in2->is_Con()) {
         int val = in2->get_int();
         // should not try to program these cases
-        if (val < 0) return;
+        if (val < 0) {
+          return false;
+        }
       }
     }
   }
 
   // skip any loop that has not been assigned max unroll by analysis
   if (do_optimization) {
-    if (SuperWordLoopUnrollAnalysis && cl->slp_max_unroll() == 0) return;
+    if (SuperWordLoopUnrollAnalysis && cl->slp_max_unroll() == 0) {
+      return false;
+    }
   }
 
   // Check for no control flow in body (other than exit)
@@ -141,28 +151,32 @@ void SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) {
         lpt->dump_head();
       }
     #endif
-    return;
+    return false;
   }
 
   // Make sure the are no extra control users of the loop backedge
   if (cl->back_control()->outcnt() != 1) {
-    return;
+    return false;
   }
 
   // Skip any loops already optimized by slp
-  if (cl->is_vectorized_loop()) return;
+  if (cl->is_vectorized_loop()) {
+    return false;
+  }
 
-  if (cl->is_unroll_only()) return;
+  if (cl->is_unroll_only()) {
+    return false;
+  }
 
   if (cl->is_main_loop()) {
     // Check for pre-loop ending with CountedLoopEnd(Bool(Cmp(x,Opaque1(limit))))
     CountedLoopEndNode* pre_end = find_pre_loop_end(cl);
     if (pre_end == NULL) {
-      return;
+      return false;
     }
     Node* pre_opaq1 = pre_end->limit();
     if (pre_opaq1->Opcode() != Op_Opaque1) {
-      return;
+      return false;
     }
     set_pre_loop_end(pre_end);
   }
@@ -175,9 +189,10 @@ void SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) {
   // For now, define one block which is the entire loop body
   set_bb(cl);
 
+  bool success = true;
   if (do_optimization) {
     assert(_packset.length() == 0, "packset must be empty");
-    SLP_extract();
+    success = SLP_extract();
     if (PostLoopMultiversioning && Matcher::has_predicated_vectors()) {
       if (cl->is_vectorized_loop() && cl->is_main_loop() && !cl->is_reduction_loop()) {
         IdealLoopTree *lpt_next = lpt->_next;
@@ -192,6 +207,7 @@ void SuperWord::transform_loop(IdealLoopTree* lpt, bool do_optimization) {
       }
     }
   }
+  return success;
 }
 
 //------------------------------early unrolling analysis------------------------------
@@ -451,7 +467,7 @@ void SuperWord::unrolling_analysis(int &local_loop_unroll_factor) {
 //    inserting scalar promotion, vector creation from multiple scalars, and
 //    extraction of scalar values from vectors.
 //
-void SuperWord::SLP_extract() {
+bool SuperWord::SLP_extract() {
 
 #ifndef PRODUCT
   if (_do_vector_loop && TraceSuperWord) {
@@ -466,7 +482,7 @@ void SuperWord::SLP_extract() {
 #endif
   // Ready the block
   if (!construct_bb()) {
-    return; // Exit if no interesting nodes or complex graph.
+    return false; // Exit if no interesting nodes or complex graph.
   }
 
   // build    _dg, _disjoint_ptrs
@@ -483,7 +499,7 @@ void SuperWord::SLP_extract() {
         hoist_loads_in_graph(); // this only rebuild the graph; all basic structs need rebuild explicitly
 
         if (!construct_bb()) {
-          return; // Exit if no interesting nodes or complex graph.
+          return false; // Exit if no interesting nodes or complex graph.
         }
         dependence_graph();
         compute_max_depth();
@@ -511,7 +527,7 @@ void SuperWord::SLP_extract() {
     find_adjacent_refs();
 
     if (align_to_ref() == NULL) {
-      return; // Did not find memory reference to align vectors
+      return false; // Did not find memory reference to align vectors
     }
 
     extend_packlist();
@@ -563,15 +579,15 @@ void SuperWord::SLP_extract() {
         // map base types for vector usage
         compute_vector_element_type();
       } else {
-        return;
+        return false;
       }
     } else {
       // for some reason we could not map the slp analysis state of the vectorized loop
-      return;
+      return false;
     }
   }
 
-  output();
+  return output();
 }
 
 //------------------------------find_adjacent_refs---------------------------
@@ -2385,17 +2401,11 @@ void SuperWord::print_loop(bool whole) {
 
 //------------------------------output---------------------------
 // Convert packs into vector node operations
-void SuperWord::output() {
+bool SuperWord::output() {
   CountedLoopNode *cl = lpt()->_head->as_CountedLoop();
   Compile* C = _phase->C;
   if (_packset.length() == 0) {
-    if (cl->is_main_loop()) {
-      // Instigate more unrolling for optimization when vectorization fails.
-      C->set_major_progress();
-      cl->set_notpassed_slp();
-      cl->mark_do_unroll_only();
-    }
-    return;
+    return false;
   }
 
 #ifndef PRODUCT
@@ -2429,7 +2439,7 @@ void SuperWord::output() {
 
   if (do_reserve_copy() && !make_reversable.has_reserved()) {
     NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: loop was not reserved correctly, exiting SuperWord");})
-    return;
+    return false;
   }
 
   for (int i = 0; i < _block.length(); i++) {
@@ -2474,7 +2484,7 @@ void SuperWord::output() {
         if (val == NULL) {
           if (do_reserve_copy()) {
             NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: val should not be NULL, exiting SuperWord");})
-            return; //and reverse to backup IG
+            return false; //and reverse to backup IG
           }
           ShouldNotReachHere();
         }
@@ -2518,7 +2528,7 @@ void SuperWord::output() {
           if (in1 == NULL) {
             if (do_reserve_copy()) {
               NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: in1 should not be NULL, exiting SuperWord");})
-              return; //and reverse to backup IG
+              return false; //and reverse to backup IG
             }
             ShouldNotReachHere();
           }
@@ -2527,7 +2537,7 @@ void SuperWord::output() {
         if (in2 == NULL) {
           if (do_reserve_copy()) {
             NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: in2 should not be NULL, exiting SuperWord");})
-            return; //and reverse to backup IG
+            return false; //and reverse to backup IG
           }
           ShouldNotReachHere();
         }
@@ -2569,7 +2579,7 @@ void SuperWord::output() {
       } else if (is_cmov_pack(p)) {
         if (can_process_post_loop) {
           // do not refactor of flow in post loop context
-          return;
+          return false;
         }
         if (!n->is_CMove()) {
           continue;
@@ -2586,7 +2596,7 @@ void SuperWord::output() {
         if (!bol->is_Bool()) {
           if (do_reserve_copy()) {
             NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: expected %d bool node, exiting SuperWord", bol->_idx); bol->dump();})
-            return; //and reverse to backup IG
+            return false; //and reverse to backup IG
           }
           ShouldNotReachHere();
         }
@@ -2602,7 +2612,7 @@ void SuperWord::output() {
         if (src1 == NULL) {
           if (do_reserve_copy()) {
             NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: src1 should not be NULL, exiting SuperWord");})
-            return; //and reverse to backup IG
+            return false; //and reverse to backup IG
           }
           ShouldNotReachHere();
         }
@@ -2610,7 +2620,7 @@ void SuperWord::output() {
         if (src2 == NULL) {
           if (do_reserve_copy()) {
             NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: src2 should not be NULL, exiting SuperWord");})
-            return; //and reverse to backup IG
+            return false; //and reverse to backup IG
           }
           ShouldNotReachHere();
         }
@@ -2634,7 +2644,7 @@ void SuperWord::output() {
       } else {
         if (do_reserve_copy()) {
           NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: ShouldNotReachHere, exiting SuperWord");})
-          return; //and reverse to backup IG
+          return false; //and reverse to backup IG
         }
         ShouldNotReachHere();
       }
@@ -2643,7 +2653,7 @@ void SuperWord::output() {
       if (vn == NULL) {
         if (do_reserve_copy()){
           NOT_PRODUCT(if(is_trace_loop_reverse() || TraceLoopOpts) {tty->print_cr("SWPointer::output: got NULL node, cannot proceed, exiting SuperWord");})
-          return; //and reverse to backup IG
+          return false; //and reverse to backup IG
         }
         ShouldNotReachHere();
       }
@@ -2661,7 +2671,7 @@ void SuperWord::output() {
         // first check if the vector size if the maximum vector which we can use on the machine,
         // other vector size have reduced values for predicated data mapping.
         if (vlen_in_bytes != (uint)MaxVectorSize) {
-          return;
+          return false;
         }
       }
 
@@ -2734,7 +2744,7 @@ void SuperWord::output() {
     make_reversable.use_new();
   }
   NOT_PRODUCT(if(is_trace_loop_reverse()) {tty->print_cr("\n Final loop after SuperWord"); print_loop(true);})
-  return;
+  return true;
 }
 
 //------------------------------vector_opd---------------------------
diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp
index ddddfc83663..9c92365865a 100644
--- a/src/hotspot/share/opto/superword.hpp
+++ b/src/hotspot/share/opto/superword.hpp
@@ -286,7 +286,7 @@ class SuperWord : public ResourceObj {
  public:
   SuperWord(PhaseIdealLoop* phase);
 
-  void transform_loop(IdealLoopTree* lpt, bool do_optimization);
+  bool transform_loop(IdealLoopTree* lpt, bool do_optimization);
 
   void unrolling_analysis(int &local_loop_unroll_factor);
 
@@ -422,7 +422,7 @@ class SuperWord : public ResourceObj {
   // methods
 
   // Extract the superword level parallelism
-  void SLP_extract();
+  bool SLP_extract();
   // Find the adjacent memory references and create pack pairs for them.
   void find_adjacent_refs();
   // Tracing support
@@ -509,7 +509,7 @@ class SuperWord : public ResourceObj {
   Node* find_last_mem_state(Node_List* pk, Node* first_mem);
 
   // Convert packs into vector node operations
-  void output();
+  bool output();
   // Create a vector operand for the nodes in pack p for operand: in(opd_idx)
   Node* vector_opd(Node_List* p, int opd_idx);
   // Can code be generated for pack p?
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestSuperwordFailsUnrolling.java b/test/hotspot/jtreg/compiler/c2/irTests/TestSuperwordFailsUnrolling.java
new file mode 100644
index 00000000000..2ba5e4e7340
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestSuperwordFailsUnrolling.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2022, 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.
+ */
+
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+import sun.hotspot.WhiteBox;
+
+/*
+ * @test
+ * @bug 8283187
+ * @summary C2: loop candidate for superword not always unrolled fully if superword fails
+ * @library /test/lib /
+ * @build sun.hotspot.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -DSkipWhiteBoxInstall=true -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.c2.irTests.TestSuperwordFailsUnrolling
+ */
+
+public class TestSuperwordFailsUnrolling {
+    private static int v = 0;
+    private final static WhiteBox wb = WhiteBox.getWhiteBox();
+
+    public static void main(String[] args) {
+        Object avx = wb.getVMFlag("UseAVX");
+        if (avx != null && ((Long)avx) > 2) {
+            TestFramework.runWithFlags("-XX:UseAVX=2", "-XX:LoopMaxUnroll=8");
+        }
+        TestFramework.runWithFlags("-XX:LoopMaxUnroll=8");
+    }
+
+    @Test
+    @IR(applyIf = { "UsePopCountInstruction", "true" }, counts = { IRNode.POPCOUNT_L, "10" })
+    private static int test(long[] array1, long[] array2) {
+        v = 0;
+        for (int i = 0; i < array1.length; i++) {
+            v += Long.bitCount(array1[i]);
+        }
+        return v;
+    }
+
+    @Run(test = "test")
+    void test_runner() {
+        long[] array = new long[1000];
+        test(array, array);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 033ed28d2e5..de91a0054b2 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -173,6 +173,7 @@ public class IRNode {
     public static final String DIV_L = START + "DivL" + MID + END;
     public static final String CONV_I2L = START + "ConvI2L" + MID + END;
     public static final String CONV_L2I = START + "ConvL2I" + MID + END;
+    public static final String POPCOUNT_L = START + "PopCountL" + MID + END;
 
     public static final String VECTOR_CAST_B2X = START + "VectorCastB2X" + MID + END;
     public static final String VECTOR_CAST_S2X = START + "VectorCastS2X" + MID + END;
-- 
GitLab


From 929b6a3556ce6f6ffb1a5ae14b7f87d21598eb21 Mon Sep 17 00:00:00 2001
From: Aleksei Efimov <aefimov@openjdk.org>
Date: Thu, 24 Mar 2022 13:50:50 +0000
Subject: [PATCH 199/345] 8282917: Remove InetAddressImplFactory from
 InetAddress

Reviewed-by: dfuchs, jpai
---
 .../share/classes/java/net/InetAddress.java   | 19 ++------
 .../share/native/libnet/InetAddress.c         | 13 +++++-
 .../native/libnet/InetAddressImplFactory.c    | 46 -------------------
 .../native/libnet/InetAddressImplFactory.c    | 46 -------------------
 4 files changed, 17 insertions(+), 107 deletions(-)
 delete mode 100644 src/java.base/unix/native/libnet/InetAddressImplFactory.c
 delete mode 100644 src/java.base/windows/native/libnet/InetAddressImplFactory.c

diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java
index 3bad2755978..2ff3d3375a3 100644
--- a/src/java.base/share/classes/java/net/InetAddress.java
+++ b/src/java.base/share/classes/java/net/InetAddress.java
@@ -412,6 +412,9 @@ public sealed class InetAddress implements Serializable permits Inet4Address, In
     // Native method to check if IPv4 is available
     private static native boolean isIPv4Available();
 
+    // Native method to check if IPv6 is available
+    private static native boolean isIPv6Supported();
+
     /**
      * The {@code RuntimePermission("inetAddressResolverProvider")} is
      * necessary to subclass and instantiate the {@code InetAddressResolverProvider}
@@ -1270,7 +1273,8 @@ public sealed class InetAddress implements Serializable permits Inet4Address, In
 
     static {
         // create the impl
-        impl = InetAddressImplFactory.create();
+        impl = isIPv6Supported() ?
+                new Inet6AddressImpl() : new Inet4AddressImpl();
 
         // impl must be initialized before calling this method
         PLATFORM_LOOKUP_POLICY = initializePlatformLookupPolicy();
@@ -1826,16 +1830,3 @@ public sealed class InetAddress implements Serializable permits Inet4Address, In
         s.writeFields();
     }
 }
-
-/*
- * Simple factory to create the impl
- */
-class InetAddressImplFactory {
-
-    static InetAddressImpl create() {
-        return isIPv6Supported() ?
-                new Inet6AddressImpl() : new Inet4AddressImpl();
-    }
-
-    static native boolean isIPv6Supported();
-}
diff --git a/src/java.base/share/native/libnet/InetAddress.c b/src/java.base/share/native/libnet/InetAddress.c
index 39b419d600e..e759a064d25 100644
--- a/src/java.base/share/native/libnet/InetAddress.c
+++ b/src/java.base/share/native/libnet/InetAddress.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,8 +76,19 @@ Java_java_net_InetAddress_init(JNIEnv *env, jclass cls) {
 /*
  * Class:     java_net_InetAddress
  * Method:    isIPv4Available
+ * Signature: ()Z
  */
 JNIEXPORT jboolean JNICALL
 Java_java_net_InetAddress_isIPv4Available(JNIEnv *env, jclass clazz) {
     return ipv4_available();
 }
+
+/*
+ * Class:     java_net_InetAddress
+ * Method:    isIPv6Supported
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_java_net_InetAddress_isIPv6Supported(JNIEnv *env, jclass clazz) {
+    return ipv6_available();
+}
diff --git a/src/java.base/unix/native/libnet/InetAddressImplFactory.c b/src/java.base/unix/native/libnet/InetAddressImplFactory.c
deleted file mode 100644
index 2c799feb105..00000000000
--- a/src/java.base/unix/native/libnet/InetAddressImplFactory.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1997, 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.
- */
-
-#include "java_net_InetAddressImplFactory.h"
-
-#include "net_util.h"
-
-/************************************************************************
- * InetAddressImplFactory
- */
-
-/*
- * Class:     java_net_InetAddressImplFactory
- * Method:    isIPv6Supported
- * Signature: ()I
- */
-JNIEXPORT jboolean JNICALL
-Java_java_net_InetAddressImplFactory_isIPv6Supported(JNIEnv *env, jclass cls) {
-    if (ipv6_available()) {
-        return JNI_TRUE;
-    } else {
-        return JNI_FALSE;
-    }
-}
diff --git a/src/java.base/windows/native/libnet/InetAddressImplFactory.c b/src/java.base/windows/native/libnet/InetAddressImplFactory.c
deleted file mode 100644
index 9d76762ca6c..00000000000
--- a/src/java.base/windows/native/libnet/InetAddressImplFactory.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "java_net_InetAddressImplFactory.h"
-#include "net_util.h"
-
-/*
- * InetAddressImplFactory
- */
-
-
-/*
- * Class:     java_net_InetAddressImplFactory
- * Method:    isIPv6Supported
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL
-Java_java_net_InetAddressImplFactory_isIPv6Supported(JNIEnv *env, jobject this)
-{
-    if (ipv6_available()) {
-        return JNI_TRUE;
-    } else {
-        return JNI_FALSE;
-    }
-}
-- 
GitLab


From 19f01ab70133d244422684f63f118249178bce4a Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 24 Mar 2022 14:35:39 +0000
Subject: [PATCH 200/345] 8283555: G1: Concurrent mark accesses uninitialized
 BOT of closed archive regions

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/cds/filemap.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index b8e28f30b72..3879f933613 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -2330,6 +2330,11 @@ void FileMapInfo::fixup_mapped_heap_regions() {
            "Null closed_heap_regions array with non-zero count");
     G1CollectedHeap::heap()->fill_archive_regions(closed_heap_regions,
                                                   num_closed_heap_regions);
+    // G1 marking uses the BOT for object chunking during marking in
+    // G1CMObjArrayProcessor::process_slice(); for this reason we need to
+    // initialize the BOT for closed archive regions too.
+    G1CollectedHeap::heap()->populate_archive_regions_bot_part(closed_heap_regions,
+                                                               num_closed_heap_regions);
   }
 
   // do the same for mapped open archive heap regions
@@ -2342,11 +2347,6 @@ void FileMapInfo::fixup_mapped_heap_regions() {
     // fast G1BlockOffsetTablePart::block_start operations for any given address
     // within the open archive regions when trying to find start of an object
     // (e.g. during card table scanning).
-    //
-    // This is only needed for open archive regions but not the closed archive
-    // regions, because objects in closed archive regions never reference objects
-    // outside the closed archive regions and they are immutable. So we never
-    // need their BOT during garbage collection.
     G1CollectedHeap::heap()->populate_archive_regions_bot_part(open_heap_regions,
                                                                num_open_heap_regions);
   }
-- 
GitLab


From b36cf35ad938f9bab7cbb9752c0b15c49bd50407 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 24 Mar 2022 16:11:57 +0000
Subject: [PATCH 201/345] 8283417: Update java.nio buffers to use sealed
 classes

Reviewed-by: rriggs, darcy, iris, alanb
---
 src/java.base/share/classes/java/nio/Buffer.java   |  6 ++++--
 .../java/nio/ByteBufferAs-X-Buffer.java.template   | 10 +++++++++-
 .../classes/java/nio/Direct-X-Buffer.java.template | 10 +++++++++-
 .../classes/java/nio/Heap-X-Buffer.java.template   |  8 ++++++++
 .../share/classes/java/nio/MappedByteBuffer.java   |  3 ++-
 .../share/classes/java/nio/StringCharBuffer.java   |  2 +-
 .../share/classes/java/nio/X-Buffer.java.template  | 14 ++++++++++++--
 7 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/Buffer.java b/src/java.base/share/classes/java/nio/Buffer.java
index a452b1a28dd..4df2f620611 100644
--- a/src/java.base/share/classes/java/nio/Buffer.java
+++ b/src/java.base/share/classes/java/nio/Buffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -191,7 +191,9 @@ import java.util.Spliterator;
  * @since 1.4
  */
 
-public abstract class Buffer {
+public abstract sealed class Buffer
+    permits ByteBuffer, CharBuffer, DoubleBuffer, FloatBuffer, IntBuffer,
+        LongBuffer, ShortBuffer {
     // Cached unsafe-access object
     static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
diff --git a/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template b/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template
index 12788a2b998..6040ac79411 100644
--- a/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,16 @@ import java.util.Objects;
 import jdk.internal.access.foreign.MemorySegmentProxy;
 import jdk.internal.misc.Unsafe;
 
+#if[rw]
+sealed
+#else[rw]
+final
+#end[rw]
 class ByteBufferAs$Type$Buffer$RW$$BO$                  // package-private
     extends {#if[ro]?ByteBufferAs}$Type$Buffer{#if[ro]?$BO$}
+#if[rw]
+    permits ByteBufferAs$Type$BufferR$BO$
+#end[rw]
 {
 
 #if[rw]
diff --git a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
index c227cec8e15..38697b39480 100644
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,11 @@ import jdk.internal.ref.Cleaner;
 import sun.nio.ch.DirectBuffer;
 
 
+#if[rw]
+sealed
+#else[rw]
+final
+#end[rw]
 class Direct$Type$Buffer$RW$$BO$
 #if[rw]
     extends {#if[byte]?Mapped$Type$Buffer:$Type$Buffer}
@@ -44,6 +49,9 @@ class Direct$Type$Buffer$RW$$BO$
     extends Direct$Type$Buffer$BO$
 #end[rw]
     implements DirectBuffer
+#if[rw]
+    permits Direct$Type$BufferR$BO$
+#end[rw]
 {
 
 #if[rw]
diff --git a/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
index 38e18ac625b..541dbd6c8f8 100644
--- a/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
@@ -40,8 +40,16 @@ import jdk.internal.access.foreign.MemorySegmentProxy;
  * instance of this class rather than of the superclass.
 #end[rw]
  */
+#if[rw]
+sealed
+#else[rw]
+final
+#end[rw]
 class Heap$Type$Buffer$RW$
     extends {#if[ro]?Heap}$Type$Buffer
+#if[rw]
+    permits Heap$Type$BufferR
+#end[rw]
 {
 #if[rw]
     // Cached array base offset
diff --git a/src/java.base/share/classes/java/nio/MappedByteBuffer.java b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
index 54fb6c869e0..8f9ca9f8fe6 100644
--- a/src/java.base/share/classes/java/nio/MappedByteBuffer.java
+++ b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
@@ -70,8 +70,9 @@ import jdk.internal.misc.Unsafe;
  * @since 1.4
  */
 
-public abstract class MappedByteBuffer
+public abstract sealed class MappedByteBuffer
     extends ByteBuffer
+    permits DirectByteBuffer
 {
 
     // This is a little bit backwards: By rights MappedByteBuffer should be a
diff --git a/src/java.base/share/classes/java/nio/StringCharBuffer.java b/src/java.base/share/classes/java/nio/StringCharBuffer.java
index 40d807a6532..a62e8023363 100644
--- a/src/java.base/share/classes/java/nio/StringCharBuffer.java
+++ b/src/java.base/share/classes/java/nio/StringCharBuffer.java
@@ -29,7 +29,7 @@ import java.util.Objects;
 
 // ## If the sequence is a string, use reflection to share its array
 
-class StringCharBuffer                                  // package-private
+final class StringCharBuffer                                  // package-private
     extends CharBuffer
 {
     CharSequence str;
diff --git a/src/java.base/share/classes/java/nio/X-Buffer.java.template b/src/java.base/share/classes/java/nio/X-Buffer.java.template
index cfedf970f43..e559b46f37c 100644
--- a/src/java.base/share/classes/java/nio/X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/X-Buffer.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -264,9 +264,19 @@ import jdk.internal.util.ArraysSupport;
  * @since 1.4
  */
 
-public abstract class $Type$Buffer
+public abstract sealed class $Type$Buffer
     extends Buffer
     implements Comparable<$Type$Buffer>{#if[char]?, Appendable, CharSequence, Readable}
+    permits
+#if[byte]
+    Heap$Type$Buffer, MappedByteBuffer
+#else[byte]
+#if[char]
+    StringCharBuffer,
+#end[char]
+    Heap$Type$Buffer, Direct$Type$BufferS, Direct$Type$BufferU,
+    ByteBufferAs$Type$BufferB, ByteBufferAs$Type$BufferL
+#end[byte]
 {
     // Cached array base offset
     private static final long ARRAY_BASE_OFFSET = UNSAFE.arrayBaseOffset($type$[].class);
-- 
GitLab


From a7e988343c7fda5b0f37e477f29cb172b908394d Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Thu, 24 Mar 2022 17:06:35 +0000
Subject: [PATCH 202/345] 8283467: runtime/Thread/StopAtExit.java needs
 updating

Reviewed-by: dholmes, pchilanomate
---
 .../jtreg/runtime/Thread/StopAtExit.java      | 50 ++++++++++----
 .../jtreg/runtime/Thread/libStopAtExit.cpp    | 68 +++++++++++++++++++
 2 files changed, 106 insertions(+), 12 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/Thread/libStopAtExit.cpp

diff --git a/test/hotspot/jtreg/runtime/Thread/StopAtExit.java b/test/hotspot/jtreg/runtime/Thread/StopAtExit.java
index b997890e347..86771cf9496 100644
--- a/test/hotspot/jtreg/runtime/Thread/StopAtExit.java
+++ b/test/hotspot/jtreg/runtime/Thread/StopAtExit.java
@@ -23,10 +23,11 @@
 
 /**
  * @test
- * @bug 8167108 8266130 8282704
- * @summary Stress test java.lang.Thread.stop() at thread exit.
+ * @bug 8167108 8266130 8282704 8283467
+ * @summary Stress test JVM/TI StopThread() at thread exit.
+ * @requires vm.jvmti
  * @modules java.base/java.lang:open
- * @run main/othervm StopAtExit
+ * @run main/othervm/native -agentlib:StopAtExit StopAtExit
  */
 
 import java.lang.reflect.Method;
@@ -36,10 +37,13 @@ import java.util.concurrent.TimeUnit;
 public class StopAtExit extends Thread {
     private final static int DEF_TIME_MAX = 30;  // default max # secs to test
     private final static String PROG_NAME = "StopAtExit";
+    private final static int JVMTI_ERROR_THREAD_NOT_ALIVE = 15;
 
     public CountDownLatch exitSyncObj = new CountDownLatch(1);
     public CountDownLatch startSyncObj = new CountDownLatch(1);
 
+    native static int stopThread(StopAtExit thr, Throwable exception);
+
     public StopAtExit(ThreadGroup group, Runnable target) {
         super(group, target);
     }
@@ -56,9 +60,9 @@ public class StopAtExit extends Thread {
                 throw new RuntimeException("Unexpected: " + e);
             }
         } catch (ThreadDeath td) {
-            // ignore because we're testing Thread.stop() which throws it
+            // ignore because we're testing JVM/TI StopThread() which throws it
         } catch (NoClassDefFoundError ncdfe) {
-            // ignore because we're testing Thread.stop() which can cause it
+            // ignore because we're testing JVM/TI StopThread() which can cause it
         }
     }
 
@@ -89,19 +93,32 @@ public class StopAtExit extends Thread {
             // the thread is terminated.
             ThreadGroup myTG = new ThreadGroup("myTG-" + count);
             myTG.setDaemon(true);
+            Throwable myException = new ThreadDeath();
+            int retCode;
             StopAtExit thread = new StopAtExit(myTG, null);
             thread.start();
             try {
                 // Wait for the worker thread to get going.
                 thread.startSyncObj.await();
                 // Tell the worker thread to race to the exit and the
-                // Thread.stop() calls will come in during thread exit.
+                // JVM/TI StopThread() calls will come in during thread exit.
                 thread.exitSyncObj.countDown();
                 while (true) {
-                    thread.stop();
+                    retCode = stopThread(thread, myException);
+
+                    if (retCode == JVMTI_ERROR_THREAD_NOT_ALIVE) {
+                        // Done with JVM/TI StopThread() calls since
+                        // thread is not alive.
+                        break;
+                    } else if (retCode != 0) {
+                        throw new RuntimeException("thread " + thread.getName()
+                                                   + ": stopThread() " +
+                                                   "retCode=" + retCode +
+                                                   ": unexpected value.");
+                    }
 
                     if (!thread.isAlive()) {
-                        // Done with Thread.stop() calls since
+                        // Done with JVM/TI StopThread() calls since
                         // thread is not alive.
                         break;
                     }
@@ -109,7 +126,7 @@ public class StopAtExit extends Thread {
             } catch (InterruptedException e) {
                 throw new Error("Unexpected: " + e);
             } catch (NoClassDefFoundError ncdfe) {
-                // Ignore because we're testing Thread.stop() which can
+                // Ignore because we're testing JVM/TI StopThread() which can
                 // cause it. Yes, a NoClassDefFoundError that happens
                 // in a worker thread can subsequently be seen in the
                 // main thread.
@@ -120,9 +137,18 @@ public class StopAtExit extends Thread {
             } catch (InterruptedException e) {
                 throw new Error("Unexpected: " + e);
             }
-            // This stop() call happens after the join() so it should do
-            // nothing, but let's make sure.
-            thread.stop();
+            // This JVM/TI StopThread() happens after the join() so it
+            // should do nothing, but let's make sure.
+            retCode = stopThread(thread, myException);
+
+            if (retCode != JVMTI_ERROR_THREAD_NOT_ALIVE) {
+                throw new RuntimeException("thread " + thread.getName()
+                                           + ": stopThread() " +
+                                           "retCode=" + retCode +
+                                           ": unexpected value; " +
+                                           "expected JVMTI_ERROR_THREAD_NOT_ALIVE(" +
+                                           JVMTI_ERROR_THREAD_NOT_ALIVE + ").");
+            }
 
             if (myTG.activeCount() != 0) {
                 // If the ThreadGroup still has a count, then the thread
diff --git a/test/hotspot/jtreg/runtime/Thread/libStopAtExit.cpp b/test/hotspot/jtreg/runtime/Thread/libStopAtExit.cpp
new file mode 100644
index 00000000000..1204915050b
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/Thread/libStopAtExit.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <string.h>
+#include "jvmti.h"
+
+extern "C" {
+
+static jvmtiEnv* jvmti = NULL;
+
+#define LOG(...) \
+  do { \
+    printf(__VA_ARGS__); \
+    printf("\n"); \
+    fflush(stdout); \
+  } while (0)
+
+JNIEXPORT jint JNICALL
+Java_StopAtExit_stopThread(JNIEnv *jni, jclass cls, jthread thr, jobject exception) {
+  return jvmti->StopThread(thr, exception);
+}
+
+
+/** Agent library initialization. */
+
+JNIEXPORT jint JNICALL
+Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+  LOG("\nAgent_OnLoad started");
+
+  // create JVMTI environment
+  if (jvm->GetEnv((void **) (&jvmti), JVMTI_VERSION) != JNI_OK) {
+    return JNI_ERR;
+  }
+
+  // add specific capabilities for stoping thread
+  jvmtiCapabilities stopCaps;
+  memset(&stopCaps, 0, sizeof(stopCaps));
+  stopCaps.can_signal_thread = 1;
+
+  jvmtiError err = jvmti->AddCapabilities(&stopCaps);
+  if (err != JVMTI_ERROR_NONE) {
+    return JNI_ERR;
+  }
+  LOG("Agent_OnLoad finished\n");
+  return JNI_OK;
+}
+
+}
-- 
GitLab


From 90750decb47772420eaf127b19efa9b5cdacccfe Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Thu, 24 Mar 2022 18:35:13 +0000
Subject: [PATCH 203/345] 8272477: Additional cleanup of
 test/jdk/java/nio/file/spi/SetDefaultProvider.java

Reviewed-by: bpb
---
 .../java/nio/file/spi/SetDefaultProvider.java | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/test/jdk/java/nio/file/spi/SetDefaultProvider.java b/test/jdk/java/nio/file/spi/SetDefaultProvider.java
index 0c012b24bf8..5af47da4f19 100644
--- a/test/jdk/java/nio/file/spi/SetDefaultProvider.java
+++ b/test/jdk/java/nio/file/spi/SetDefaultProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.spi.ToolProvider;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import jdk.test.lib.process.ProcessTools;
@@ -51,7 +50,7 @@ import static org.testng.Assert.*;
 @Test
 public class SetDefaultProvider {
 
-    private static String SET_DEFAULT_FSP =
+    private static final String SET_DEFAULT_FSP =
         "-Djava.nio.file.spi.DefaultFileSystemProvider=TestProvider";
 
     private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
@@ -73,7 +72,7 @@ public class SetDefaultProvider {
         String testClasses = System.getProperty("test.classes");
         String classpath = moduleClasses + File.pathSeparator + testClasses;
         int exitValue = exec(SET_DEFAULT_FSP, "-cp", classpath, "p.Main");
-        assertTrue(exitValue == 0);
+        assertEquals(exitValue, 0);
     }
 
     /**
@@ -88,7 +87,7 @@ public class SetDefaultProvider {
         String classpath = jar + File.pathSeparator + testClasses
                 + File.separator + "modules" + File.separator + "m";
         int exitValue = exec(SET_DEFAULT_FSP, "-cp", classpath, "p.Main");
-        assertTrue(exitValue == 0);
+        assertEquals(exitValue, 0);
     }
 
     /**
@@ -112,7 +111,7 @@ public class SetDefaultProvider {
             }
         }
         int ret = JAR_TOOL.run(System.out, System.out, args.toArray(new String[0]));
-        assertTrue(ret == 0);
+        assertEquals(ret, 0);
     }
 
     /**
@@ -128,7 +127,7 @@ public class SetDefaultProvider {
         int exitValue = exec(SET_DEFAULT_FSP, "-cp", classpath,
             "-Dtest.classes=" + testClasses, "-Djava.security.manager",
             "-Djava.security.policy==" + policyFile, "p.Main");
-        assertTrue(exitValue == 0);
+        assertEquals(exitValue, 0);
     }
 
     /**
@@ -138,7 +137,7 @@ public class SetDefaultProvider {
     public void testExplodedModule() throws Exception {
         String modulePath = System.getProperty("jdk.module.path");
         int exitValue = exec(SET_DEFAULT_FSP, "-p", modulePath, "-m", "m/p.Main");
-        assertTrue(exitValue == 0);
+        assertEquals(exitValue, 0);
     }
 
     /**
@@ -148,7 +147,7 @@ public class SetDefaultProvider {
     public void testModularJar() throws Exception {
         String jarFile = createModularJar();
         int exitValue = exec(SET_DEFAULT_FSP, "-p", jarFile, "-m", "m/p.Main");
-        assertTrue(exitValue == 0);
+        assertEquals(exitValue, 0);
     }
 
     /**
@@ -162,7 +161,7 @@ public class SetDefaultProvider {
                              "--patch-module", "m=" + patchdir,
                              "-p", modulePath,
                              "-m", "m/p.Main");
-        assertTrue(exitValue == 0);
+        assertEquals(exitValue, 0);
     }
 
     /**
@@ -178,7 +177,7 @@ public class SetDefaultProvider {
                              "--patch-module", "m=" + patch,
                              "-p", modulePath,
                              "-m", "m/p.Main");
-        assertTrue(exitValue == 0);
+        assertEquals(exitValue, 0);
     }
 
     /**
@@ -190,7 +189,7 @@ public class SetDefaultProvider {
             Path m = Paths.get(dir, "m");
             if (Files.exists(m)) return m.toString();
         }
-        assertFalse(true);
+        fail();
         return null;
     }
 
@@ -210,7 +209,7 @@ public class SetDefaultProvider {
         Path jar = createTempDirectory("tmp").resolve("m.jar");
         String[] args = { "--create", "--file=" + jar, "-C", dir.toString(), "." };
         int ret = JAR_TOOL.run(System.out, System.out, args);
-        assertTrue(ret == 0);
+        assertEquals(ret, 0);
         return jar;
     }
 
-- 
GitLab


From f16244509df7659572bfd23e55a62bb9a891000a Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 24 Mar 2022 19:08:23 +0000
Subject: [PATCH 204/345] 8283416: Update java.lang.invoke.MethodHandle to use
 sealed classes

Reviewed-by: sundar, mchung
---
 .../java/lang/invoke/BoundMethodHandle.java        |  4 ++--
 .../java/lang/invoke/DelegatingMethodHandle.java   |  8 ++++++--
 .../java/lang/invoke/DirectMethodHandle.java       | 14 +++++++-------
 .../classes/java/lang/invoke/MethodHandle.java     |  4 +++-
 .../classes/java/lang/invoke/MethodHandleImpl.java |  6 +++---
 .../java/lang/invoke/NativeMethodHandle.java       |  4 ++--
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java
index 9a4393eea27..bb15f3cfbf3 100644
--- a/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ import static java.lang.invoke.MethodHandleStatics.uncaughtException;
  * All bound arguments are encapsulated in dedicated species.
  */
 /*non-public*/
-abstract class BoundMethodHandle extends MethodHandle {
+abstract non-sealed class BoundMethodHandle extends MethodHandle {
 
     /*non-public*/
     BoundMethodHandle(MethodType type, LambdaForm form) {
diff --git a/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java
index 458810f3c10..d3986a38dab 100644
--- a/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,11 @@ import static java.lang.invoke.MethodHandleStatics.*;
  * @author jrose
  */
 /*non-public*/
-abstract class DelegatingMethodHandle extends MethodHandle {
+abstract sealed class DelegatingMethodHandle extends MethodHandle
+    permits MethodHandleImpl.AsVarargsCollector,
+            MethodHandleImpl.WrappedMember,
+            MethodHandleImpl.IntrinsicMethodHandle,
+            MethodHandleImpl.CountingWrapper {
     protected DelegatingMethodHandle(MethodHandle target) {
         this(target.type(), target);
     }
diff --git a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
index d760e6e64c0..e2106883e5a 100644
--- a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ import static java.lang.invoke.MethodTypeForm.*;
  * to a class member.
  * @author jrose
  */
-class DirectMethodHandle extends MethodHandle {
+sealed class DirectMethodHandle extends MethodHandle {
     final MemberName member;
     final boolean crackable;
 
@@ -395,7 +395,7 @@ class DirectMethodHandle extends MethodHandle {
     }
 
     /** This subclass represents invokespecial instructions. */
-    static class Special extends DirectMethodHandle {
+    static final class Special extends DirectMethodHandle {
         private final Class<?> caller;
         private Special(MethodType mtype, LambdaForm form, MemberName member, boolean crackable, Class<?> caller) {
             super(mtype, form, member, crackable);
@@ -425,7 +425,7 @@ class DirectMethodHandle extends MethodHandle {
     }
 
     /** This subclass represents invokeinterface instructions. */
-    static class Interface extends DirectMethodHandle {
+    static final class Interface extends DirectMethodHandle {
         private final Class<?> refc;
         private Interface(MethodType mtype, LambdaForm form, MemberName member, boolean crackable, Class<?> refc) {
             super(mtype, form, member, crackable);
@@ -458,7 +458,7 @@ class DirectMethodHandle extends MethodHandle {
     }
 
     /** This subclass handles constructor references. */
-    static class Constructor extends DirectMethodHandle {
+    static final class Constructor extends DirectMethodHandle {
         final MemberName initMethod;
         final Class<?>   instanceClass;
 
@@ -493,7 +493,7 @@ class DirectMethodHandle extends MethodHandle {
     }
 
     /** This subclass handles non-static field references. */
-    static class Accessor extends DirectMethodHandle {
+    static final class Accessor extends DirectMethodHandle {
         final Class<?> fieldType;
         final int      fieldOffset;
         private Accessor(MethodType mtype, LambdaForm form, MemberName member,
@@ -539,7 +539,7 @@ class DirectMethodHandle extends MethodHandle {
     }
 
     /** This subclass handles static field references. */
-    static class StaticAccessor extends DirectMethodHandle {
+    static final class StaticAccessor extends DirectMethodHandle {
         private final Class<?> fieldType;
         private final Object   staticBase;
         private final long     staticOffset;
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
index fb7ef0afbac..812f26f58cc 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
@@ -440,7 +440,9 @@ mh.invokeExact(System.out, "Hello, world.");
  * @author John Rose, JSR 292 EG
  * @since 1.7
  */
-public abstract class MethodHandle implements Constable {
+public abstract sealed class MethodHandle implements Constable
+    permits NativeMethodHandle, DirectMethodHandle,
+            DelegatingMethodHandle, BoundMethodHandle {
 
     /**
      * Internal marker interface which distinguishes (to the Java compiler)
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index 404782c047e..cdbc26200a1 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -448,7 +448,7 @@ abstract class MethodHandleImpl {
         return new AsVarargsCollector(target, arrayType);
     }
 
-    private static final class AsVarargsCollector extends DelegatingMethodHandle {
+    static final class AsVarargsCollector extends DelegatingMethodHandle {
         private final MethodHandle target;
         private final Class<?> arrayType;
         private @Stable MethodHandle asCollectorCache;
@@ -705,7 +705,7 @@ abstract class MethodHandleImpl {
      * Behavior in counting and non-counting states is determined by lambda forms produced by
      * countingFormProducer & nonCountingFormProducer respectively.
      */
-    static class CountingWrapper extends DelegatingMethodHandle {
+    static final class CountingWrapper extends DelegatingMethodHandle {
         private final MethodHandle target;
         private int count;
         private Function<MethodHandle, LambdaForm> countingFormProducer;
@@ -1299,7 +1299,7 @@ abstract class MethodHandleImpl {
     }
 
     /** This subclass allows a wrapped method handle to be re-associated with an arbitrary member name. */
-    private static final class WrappedMember extends DelegatingMethodHandle {
+    static final class WrappedMember extends DelegatingMethodHandle {
         private final MethodHandle target;
         private final MemberName member;
         private final Class<?> callerClass;
diff --git a/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java
index 4c4cd474e19..11acea6e508 100644
--- a/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ import static java.lang.invoke.MethodHandleStatics.newInternalError;
  * or whether a native transition is required) and a <em>fallback</em> method handle, which can be used
  * when intrinsification of this method handle is not possible.
  */
-/*non-public*/ class NativeMethodHandle extends MethodHandle {
+/*non-public*/ final class NativeMethodHandle extends MethodHandle {
     final NativeEntryPoint nep;
     final MethodHandle fallback;
 
-- 
GitLab


From dc5a65ab378f0780f7760965f2b52cbbd7c62aad Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Thu, 24 Mar 2022 19:52:16 +0000
Subject: [PATCH 205/345] 8283426: Fix 'exeption' typo

Reviewed-by: xuelei, iris, dholmes, wetmore, aivanov
---
 src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp             | 6 +++---
 src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp    | 4 ++--
 src/hotspot/share/code/exceptionHandlerTable.cpp            | 4 ++--
 src/hotspot/share/jfr/dcmd/jfrDcmds.cpp                     | 4 ++--
 src/java.base/share/classes/javax/crypto/Cipher.java        | 4 ++--
 src/java.base/share/classes/jdk/internal/misc/CDS.java      | 5 ++---
 .../classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java    | 5 ++---
 .../share/classes/sun/security/krb5/KrbCryptoException.java | 4 ++--
 .../jdi/ThreadReference/ownedMonitors/ownedmonitors001.java | 4 ++--
 .../vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001.java   | 4 ++--
 .../hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmOOMTest.java | 4 ++--
 .../jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java | 4 ++--
 test/jdk/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java     | 6 +++---
 .../java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java   | 4 ++--
 test/jdk/java/lang/Throwable/StackTraceSerialization.java   | 4 ++--
 test/jdk/java/text/BreakIterator/Bug7104012.java            | 4 ++--
 .../testng/test/rowset/serial/SerialJavaObjectTests.java    | 4 ++--
 17 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
index 53b017d2217..26ec71d258a 100644
--- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
+++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2019 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -304,7 +304,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
         CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
         CompiledMethod* nm = (cb != NULL) ? cb->as_compiled_method_or_null() : NULL;
         if (nm != NULL && nm->has_unsafe_access()) {
-          // We don't really need a stub here! Just set the pending exeption and
+          // We don't really need a stub here! Just set the pending exception and
           // continue at the next instruction after the faulting read. Returning
           // garbage from this read is ok.
           thread->set_pending_unsafe_access_error();
@@ -329,7 +329,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
       } else if ((thread->thread_state() == _thread_in_vm ||
                   thread->thread_state() == _thread_in_native) &&
                  sig == SIGBUS && thread->doing_unsafe_access()) {
-        // We don't really need a stub here! Just set the pending exeption and
+        // We don't really need a stub here! Just set the pending exception and
         // continue at the next instruction after the faulting read. Returning
         // garbage from this read is ok.
         thread->set_pending_unsafe_access_error();
diff --git a/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp
index 8045f792b76..3cc0003cd4c 100644
--- a/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp
+++ b/src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ void MacroAssembler::int3() {
 // Warning: This mechanism assumes that we only attempt to get the
 //          thread when we are nested below a call wrapper.
 //
-// movl reg, fs:[0]                        Get exeception pointer
+// movl reg, fs:[0]                        Get exception pointer
 // movl reg, [reg + thread_ptr_offset]     Load thread
 //
 void MacroAssembler::get_thread(Register thread) {
diff --git a/src/hotspot/share/code/exceptionHandlerTable.cpp b/src/hotspot/share/code/exceptionHandlerTable.cpp
index f3c2a787044..d43d18e4b2b 100644
--- a/src/hotspot/share/code/exceptionHandlerTable.cpp
+++ b/src/hotspot/share/code/exceptionHandlerTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ ExceptionHandlerTable::ExceptionHandlerTable(int initial_size) {
 ExceptionHandlerTable::ExceptionHandlerTable(const CompiledMethod* cm) {
   _table  = (HandlerTableEntry*)cm->handler_table_begin();
   _length = cm->handler_table_size() / sizeof(HandlerTableEntry);
-  _size   = 0; // no space allocated by ExeptionHandlerTable!
+  _size   = 0; // no space allocated by ExceptionHandlerTable!
 }
 
 
diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
index 9b295536657..4790506bf97 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,7 +132,7 @@ static void handle_dcmd_result(outputStream* output,
   const bool startup = DCmd_Source_Internal == source;
   if (HAS_PENDING_EXCEPTION) {
     handle_pending_exception(output, startup, PENDING_EXCEPTION);
-    // Don't clear excption on startup, JVM should fail initialization.
+    // Don't clear exception on startup, JVM should fail initialization.
     if (!startup) {
       CLEAR_PENDING_EXCEPTION;
     }
diff --git a/src/java.base/share/classes/javax/crypto/Cipher.java b/src/java.base/share/classes/javax/crypto/Cipher.java
index a6751e886bd..e1cb75d5493 100644
--- a/src/java.base/share/classes/javax/crypto/Cipher.java
+++ b/src/java.base/share/classes/javax/crypto/Cipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1174,7 +1174,7 @@ public class Cipher {
     }
 
     // check if opmode is one of the defined constants
-    // throw InvalidParameterExeption if not
+    // throw InvalidParameterException if not
     private static void checkOpmode(int opmode) {
         if ((opmode < ENCRYPT_MODE) || (opmode > UNWRAP_MODE)) {
             throw new InvalidParameterException("Invalid operation mode");
diff --git a/src/java.base/share/classes/jdk/internal/misc/CDS.java b/src/java.base/share/classes/jdk/internal/misc/CDS.java
index 370086612cd..29b6a3cbce7 100644
--- a/src/java.base/share/classes/jdk/internal/misc/CDS.java
+++ b/src/java.base/share/classes/jdk/internal/misc/CDS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Stream;
 
-import jdk.internal.access.JavaLangInvokeAccess;
 import jdk.internal.access.SharedSecrets;
 
 public class CDS {
@@ -224,7 +223,7 @@ public class CDS {
                     prt.println(line);
                 }
             } catch (IOException e) {
-                throw new RuntimeException("IOExeption happens during drain stream to file " +
+                throw new RuntimeException("IOException happens during drain stream to file " +
                                            fileName + ": " + e.getMessage());
             }}).start();
         return fileName;
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
index 6a8076ee118..8570ecaa97a 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@ import sun.awt.CGraphicsDevice;
 import sun.java2d.SurfaceData;
 import sun.java2d.metal.MTLLayer;
 import sun.java2d.opengl.CGLLayer;
-import sun.lwawt.macosx.CFLayer;
 import sun.lwawt.LWWindowPeer;
 import sun.lwawt.PlatformWindow;
 import sun.util.logging.PlatformLogger;
@@ -199,7 +198,7 @@ public class CPlatformEmbeddedFrame implements PlatformWindow {
 
     /*
      * The method could not be implemented due to CALayer restrictions.
-     * The exeption enforce clients not to use it.
+     * The exception enforces clients not to use it.
      */
     @Override
     public boolean isUnderMouse() {
diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java b/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java
index 28522e8316d..eda5fcec397 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KrbCryptoException.java
@@ -31,7 +31,7 @@
 package sun.security.krb5;
 
 /**
- * KrbCryptoExceptoin is a wrapper exception for exceptions thrown by JCE.
+ * KrbCryptoException is a wrapper exception for exceptions thrown by JCE.
  *
  * @author Yanni Zhang
  */
@@ -39,7 +39,7 @@ public class KrbCryptoException extends KrbException {
 
     private static final long serialVersionUID = -1657367919979982250L;
 
-    public KrbCryptoException (String s) {
+    public KrbCryptoException(String s) {
         super(s);
     }
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java
index f5c721cfac7..608d3410639 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -281,7 +281,7 @@ public class ownedmonitors001 {
                 Value value = debuggeeRef.getValue(field);
                 expMonitors.add((ObjectReference)value);
             } catch (Exception e) {
-                log3("Unexpected excption while getting ObjectReference for monitors");
+                log3("Unexpected exception while getting ObjectReference for monitors");
                 testExitCode = FAILED;
             }
         }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001.java
index 4a482ab2164..2092256ef6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/Event/EXCEPTION/exception001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -267,7 +267,7 @@ public class exception001 {
                                                         JDWP.SuspendPolicy.ALL);
         log.display("  ... breakpoint reached with threadID: " + testedThreadID);
 
-        // get excepion objectID value for static field
+        // get exception objectID value for static field
         log.display("Getting exception objectID from static field: " + EXCEPTION_FIELD_NAME);
         JDWP.Value value = debugee.getStaticFieldValue(testedClassID,  EXCEPTION_FIELD_NAME, JDWP.Tag.OBJECT);
         exceptionObjectID = ((Long)value.getValue()).longValue();
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmOOMTest.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmOOMTest.java
index eb3cc9f89d6..fb44a54b825 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmOOMTest.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/MlvmOOMTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ public abstract class MlvmOOMTest extends MlvmTest {
 
     /**
      * Checks the OOME type is expected.
-     * Method just exits if OOME is expected and throws an exeption if not.
+     * Method just exits if OOME is expected and throws an exception if not.
      * @param oome thrown by {@link #eatMemory(List)}
      */
     protected abstract void checkOOME(OutOfMemoryError oome);
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java
index 10f9157eef7..9f360c38cec 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/Bug4987574.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ import org.testng.annotations.Test;
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow validation.Bug4987574
  * @run testng/othervm validation.Bug4987574
- * @summary Test schemaFactory.newSchema doesn't throw NullPointerExceptio for empty schema.
+ * @summary Test schemaFactory.newSchema doesn't throw NullPointerException for empty schema.
  */
 @Listeners({jaxp.library.FilePolicy.class})
 public class Bug4987574 {
diff --git a/test/jdk/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java b/test/jdk/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java
index fcec97d7fb1..aada6d7af8a 100644
--- a/test/jdk/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java
+++ b/test/jdk/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -672,7 +672,7 @@ public class AutoTestOnTop {
         } catch (Exception e) {
             error("Test failed: stage#" + stageNum + "action #" + actNum + ": " + msgCase + ": " + msgAction +
                                ": setAlwaysOnTop(" + value + ") called at state " + msgVisibility +
-                               " threw exeption " + e);
+                               " threw exception " + e);
         }
     }
 
@@ -685,7 +685,7 @@ public class AutoTestOnTop {
         } catch (Exception e) {
             error("Test failed: stage #" + stageNum + ", action # " + actNum + ": " + msgCase + ": " + msgAction +
                                ": isAlwaysOnTop() called at state " + msgVisibility +
-                               " threw exeption " + e);
+                               " threw exception " + e);
         }
         return result;
     }
diff --git a/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java
index c1548966ab5..750448c562d 100644
--- a/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java
+++ b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@ class DnDSource extends Button implements Transferable,
      * a Drag gesture has been recognized
      */
     int iProblem = 0;
-    String[] problem = {"unready", "throw exeption", "good"};
+    String[] problem = {"unready", "throw exception", "good"};
     public void dragGestureRecognized(DragGestureEvent dge) {
         System.out.println("starting Drag");
         if( !DragSource.isDragImageSupported() ) {
diff --git a/test/jdk/java/lang/Throwable/StackTraceSerialization.java b/test/jdk/java/lang/Throwable/StackTraceSerialization.java
index 29a4d2a8c13..015c39b202d 100644
--- a/test/jdk/java/lang/Throwable/StackTraceSerialization.java
+++ b/test/jdk/java/lang/Throwable/StackTraceSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -126,7 +126,7 @@ public class StackTraceSerialization {
      * Returns true if e1 and e2 have equal stack traces and their
      * causes are recursively equal (by the same definition) and their
      * suppressed exception information is equals.  Returns false or
-     * throws NullPointerExeption otherwise.
+     * throws NullPointerException otherwise.
      */
     private static boolean equal(Throwable t1, Throwable t2) {
         return t1==t2 ||
diff --git a/test/jdk/java/text/BreakIterator/Bug7104012.java b/test/jdk/java/text/BreakIterator/Bug7104012.java
index ced84b9edb7..8d5ac2969a3 100644
--- a/test/jdk/java/text/BreakIterator/Bug7104012.java
+++ b/test/jdk/java/text/BreakIterator/Bug7104012.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ public class Bug7104012 {
         }
 
         if (err) {
-            throw new RuntimeException("Unexpected exeption.");
+            throw new RuntimeException("Unexpected exception.");
         }
     }
 
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java
index cc2d184298d..c2fcf2fa48f 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java
+++ b/test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ public class SerialJavaObjectTests extends BaseTest {
     }
 
     /*
-     * Validate that an SerialExcepion is thrown when the object specified
+     * Validate that a SerialException is thrown when the object specified
      * contains public static fields
      */
     @Test(expectedExceptions = SerialException.class, enabled = false)
-- 
GitLab


From c1048021fe57b78bb1f300b977588e1a93a284b6 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 24 Mar 2022 21:42:35 +0000
Subject: [PATCH 206/345] 8283641: Large value for CompileThresholdScaling
 causes assert

Reviewed-by: kvn
---
 src/hotspot/share/compiler/compilerDefinitions.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/compiler/compilerDefinitions.cpp b/src/hotspot/share/compiler/compilerDefinitions.cpp
index aa8dd0a1be8..1bbff8fb77b 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.cpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.cpp
@@ -124,10 +124,17 @@ intx CompilerConfig::scaled_freq_log(intx freq_log) {
 // Returns threshold scaled with the value of scale.
 // If scale < 0.0, threshold is returned without scaling.
 intx CompilerConfig::scaled_compile_threshold(intx threshold, double scale) {
+  assert(threshold >= 0, "must be");
   if (scale == 1.0 || scale < 0.0) {
     return threshold;
   } else {
-    return (intx)(threshold * scale);
+    double v = threshold * scale;
+    assert(v >= 0, "must be");
+    if (v > max_intx) {
+      return max_intx;
+    } else {
+      return (intx)(v);
+    }
   }
 }
 
-- 
GitLab


From 313bc7f64f69d8f352d495d2c35bea62aca910e4 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Thu, 24 Mar 2022 22:50:26 +0000
Subject: [PATCH 207/345] 8267319: Use larger default key sizes and algorithms
 based on CNSA

Reviewed-by: weijun, xuelei
---
 .../sun/crypto/provider/AESKeyGenerator.java  |   7 +-
 .../sun/security/tools/keytool/Main.java      |   2 +
 .../util/SecurityProviderConstants.java       |  45 ++++++--
 .../sun/security/util/SignatureUtil.java      |  46 ++++----
 .../sun/security/pkcs11/P11KeyGenerator.java  |   6 +-
 .../security/pkcs11/P11KeyPairGenerator.java  |  40 ++++---
 .../jdk/security/jarsigner/JarSigner.java     |  21 ++--
 .../KeyAgreement/TestExponentSize.java        |  13 ++-
 .../provider/KeyGenerator/Test4628062.java    |   7 +-
 .../jdk/security/jarsigner/Properties.java    |  11 +-
 test/jdk/jdk/security/jarsigner/Spec.java     |  11 +-
 .../security/pkcs11/KeyGenerator/TestAES.java |  90 ++++++++++++++++
 .../KeyPairGenerator/TestDefaultSize.java     | 101 ++++++++++++++++++
 .../tools/jarsigner/CheckSignerCertChain.java |  25 +++--
 .../tools/jarsigner/DefaultSigalg.java        |  33 ++++--
 .../security/tools/jarsigner/NewSize7.java    |  14 ++-
 .../PreserveRawManifestEntryAndDigest.java    |  40 +++----
 .../SectionNameContinuedVsLineBreak.java      |  20 ++--
 .../security/tools/jarsigner/SignedAgain.java |  18 ++--
 .../tools/jarsigner/TimestampCheck.java       |  27 ++++-
 .../compatibility/Compatibility.java          |   8 +-
 .../jarsigner/compatibility/SignTwice.java    |  17 ++-
 .../tools/keytool/GenKeyPairSigner.java       |  14 +--
 .../security/tools/keytool/GenerateAll.java   |  12 +--
 .../sun/security/tools/keytool/GroupName.java |   9 +-
 .../sun/security/tools/keytool/KeyAlg.java    |   8 +-
 .../sun/security/tools/keytool/NewSize7.java  |  13 +--
 .../fakegen/DefaultSignatureAlgorithm.java    |   8 +-
 .../security/tools/keytool/fakegen/PSS.java   |   8 +-
 29 files changed, 496 insertions(+), 178 deletions(-)
 create mode 100644 test/jdk/sun/security/pkcs11/KeyGenerator/TestAES.java
 create mode 100644 test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDefaultSize.java

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
index 6ca4d929acb..2672807aadd 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ import java.util.Arrays;
 import javax.crypto.KeyGeneratorSpi;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
-
+import sun.security.util.SecurityProviderConstants;
 
 /**
  * This class generates a AES key.
@@ -46,7 +46,8 @@ import javax.crypto.spec.SecretKeySpec;
 public final class AESKeyGenerator extends KeyGeneratorSpi {
 
     private SecureRandom random = null;
-    private int keySize = 16; // default keysize (in number of bytes)
+    // default keysize (in number of bytes)
+    private int keySize = SecurityProviderConstants.getDefAESKeySize() >> 3;
 
     /**
      * Empty constructor.
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 462606c7f84..0a1b889db6d 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -1917,6 +1917,8 @@ public final class Main {
                     keysize = SecurityProviderConstants.DEF_EC_KEY_SIZE;
                 } else if ("RSA".equalsIgnoreCase(keyAlgName)) {
                     keysize = SecurityProviderConstants.DEF_RSA_KEY_SIZE;
+                } else if ("RSASSA-PSS".equalsIgnoreCase(keyAlgName)) {
+                    keysize = SecurityProviderConstants.DEF_RSASSA_PSS_KEY_SIZE;
                 } else if ("DSA".equalsIgnoreCase(keyAlgName)) {
                     keysize = SecurityProviderConstants.DEF_DSA_KEY_SIZE;
                 } else if ("EdDSA".equalsIgnoreCase(keyAlgName)) {
diff --git a/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java b/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java
index 166c4a5130f..c358cc66354 100644
--- a/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java
+++ b/src/java.base/share/classes/sun/security/util/SecurityProviderConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,12 @@ package sun.security.util;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.PatternSyntaxException;
 import java.security.InvalidParameterException;
 import java.security.ProviderException;
+import java.security.NoSuchAlgorithmException;
+import javax.crypto.Cipher;
 import sun.security.action.GetPropertyAction;
 
 /**
@@ -43,11 +46,11 @@ public final class SecurityProviderConstants {
     private static final Debug debug =
         Debug.getInstance("jca", "ProviderConfig");
 
-    // cache for provider aliases; key is the standard algorithm name
+    // Cache for provider aliases; key is the standard algorithm name
     // value is the associated aliases List
     private static final ConcurrentHashMap<String, List<String>> aliasesMap;
 
-    // utility method for generating aliases list using the supplied
+    // Utility method for generating aliases list using the supplied
     // 'oid' and 'extraAliases', then store into "aliasesMap" cache under the
     // key 'stdName'
     private static List<String> store(String stdName, KnownOIDs oid,
@@ -75,7 +78,7 @@ public final class SecurityProviderConstants {
         return value;
     }
 
-    // returns an aliases List for the specified algorithm name o
+    // Return an aliases List for the specified algorithm name o
     // NOTE: exception is thrown if no aliases nor oid found, so
     // only call this method if aliases are expected
     public static List<String> getAliases(String o) {
@@ -105,6 +108,25 @@ public final class SecurityProviderConstants {
         }
     }
 
+    public static final int getDefAESKeySize() {
+        int currVal = DEF_AES_KEY_SIZE.get();
+        if (currVal == -1) {
+            int v = 256; // default AES key size
+            try {
+                // adjust if crypto policy only allows a smaller value
+                int max = Cipher.getMaxAllowedKeyLength("AES");
+                if (v > max)  {
+                    v = max;
+                }
+            } catch (NoSuchAlgorithmException ne) {
+                // should never happen; ignore and use the default
+            }
+            DEF_AES_KEY_SIZE.compareAndSet(-1, v);
+            currVal = v;
+        }
+        return currVal;
+    }
+
     public static final int DEF_DSA_KEY_SIZE;
     public static final int DEF_RSA_KEY_SIZE;
     public static final int DEF_RSASSA_PSS_KEY_SIZE;
@@ -112,6 +134,11 @@ public final class SecurityProviderConstants {
     public static final int DEF_EC_KEY_SIZE;
     public static final int DEF_ED_KEY_SIZE;
     public static final int DEF_XEC_KEY_SIZE;
+    // The logic for finding the max allowable value in getDefAESKeySize()
+    // interferes with provider loading logic and may lead to deadlocks if
+    // called inside a static block. So, it is deferred to a later time when
+    // DEF_AES_KEY_SIZE is actually used/needed.
+    private static final AtomicInteger DEF_AES_KEY_SIZE;
 
     private static final String KEY_LENGTH_PROP =
         "jdk.security.defaultKeySize";
@@ -120,12 +147,13 @@ public final class SecurityProviderConstants {
         String keyLengthStr = GetPropertyAction.privilegedGetProperty
             (KEY_LENGTH_PROP);
         int dsaKeySize = 2048;
-        int rsaKeySize = 2048;
+        int rsaKeySize = 3072;
         int rsaSsaPssKeySize = rsaKeySize; // default to same value as RSA
-        int dhKeySize = 2048;
-        int ecKeySize = 256;
+        int dhKeySize = 3072;
+        int ecKeySize = 384;
         int edKeySize = 255;
         int xecKeySize = 255;
+        int aesKeySize = -1; // needs to check crypto policy
 
         if (keyLengthStr != null) {
             try {
@@ -167,6 +195,8 @@ public final class SecurityProviderConstants {
                         edKeySize = value;
                     } else if (algoName.equals("XDH")) {
                         xecKeySize = value;
+                    } else if (algoName.equals("AES")) {
+                        aesKeySize = value;
                     } else {
                         if (debug != null) {
                             debug.println("Ignoring unsupported algo in " +
@@ -195,6 +225,7 @@ public final class SecurityProviderConstants {
         DEF_EC_KEY_SIZE = ecKeySize;
         DEF_ED_KEY_SIZE = edKeySize;
         DEF_XEC_KEY_SIZE = xecKeySize;
+        DEF_AES_KEY_SIZE = new AtomicInteger(aesKeySize);
 
         // Set up aliases with default mappings
         // This is needed when the mapping contains non-oid
diff --git a/src/java.base/share/classes/sun/security/util/SignatureUtil.java b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
index ec86df854fc..8fe2d4deebe 100644
--- a/src/java.base/share/classes/sun/security/util/SignatureUtil.java
+++ b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
@@ -60,13 +60,11 @@ public class SignatureUtil {
             if (algName.startsWith("OID.")) {
                 algName = algName.substring(4);
             }
-
             KnownOIDs ko = KnownOIDs.findMatch(algName);
             if (ko != null) {
                 return ko.stdName().toUpperCase(Locale.ENGLISH);
             }
         }
-
         return algName;
     }
 
@@ -491,12 +489,11 @@ public class SignatureUtil {
      * @return the default alg, might be null if unsupported
      */
     public static String getDefaultSigAlgForKey(PrivateKey k) {
-        String kAlg = k.getAlgorithm();
-        return switch (kAlg.toUpperCase(Locale.ENGLISH)) {
-            case "DSA", "RSA" -> ifcFfcStrength(KeyUtil.getKeySize(k))
-                    + "with" + kAlg;
-            case "EC" -> ecStrength(KeyUtil.getKeySize(k))
-                    + "withECDSA";
+        String kAlg = k.getAlgorithm().toUpperCase(Locale.ENGLISH);
+        return switch (kAlg) {
+            case "DSA" -> "SHA256withDSA";
+            case "RSA" -> ifcFfcStrength(KeyUtil.getKeySize(k)) + "withRSA";
+            case "EC" -> ecStrength(KeyUtil.getKeySize(k)) + "withECDSA";
             case "EDDSA" -> k instanceof EdECPrivateKey
                     ? ((EdECPrivateKey) k).getParams().getName()
                     : kAlg;
@@ -521,11 +518,16 @@ public class SignatureUtil {
                 64, PSSParameterSpec.TRAILER_FIELD_BC);
     }
 
-    // The following values are from SP800-57 part 1 rev 4 tables 2 and 3
+    // SP800-57 part 1 rev5 table 2 "Comparable security strengths of
+    // symmetric block cipher and asymmetric-key algorithms", and table 3
+    // "Maximum security strengths for hash and hash-based functions"
+    // define security strength for various algorithms.
+    // Besides matching the security strength, the default algorithms may
+    // also be chosen based on various recommendations such as NIST CNSA.
 
     /**
-     * Return the default message digest algorithm with the same security
-     * strength as the specified EC key size.
+     * Return the default message digest algorithm based on the specified
+     * EC key size.
      *
      * Attention: sync with the @implNote inside
      * {@link jdk.security.jarsigner.JarSigner.Builder#getDefaultSignatureAlgorithm}.
@@ -533,27 +535,27 @@ public class SignatureUtil {
     private static String ecStrength (int bitLength) {
         if (bitLength >= 512) { // 256 bits of strength
             return "SHA512";
-        } else if (bitLength >= 384) {  // 192 bits of strength
+        } else {
+            // per CNSA, use SHA-384
             return "SHA384";
-        } else { // 128 bits of strength and less
-            return "SHA256";
         }
     }
 
     /**
-     * Return the default message digest algorithm with the same security
-     * strength as the specified IFC/FFC key size.
+     * Return the default message digest algorithm based on both the
+     * security strength of the specified IFC/FFC key size, i.e. RSA,
+     * RSASSA-PSS, and the recommendation from NIST CNSA, e.g. use SHA-384
+     * and min 3072-bit.
      *
      * Attention: sync with the @implNote inside
      * {@link jdk.security.jarsigner.JarSigner.Builder#getDefaultSignatureAlgorithm}.
      */
-    private static String ifcFfcStrength (int bitLength) {
-        if (bitLength > 7680) { // 256 bits
+    private static String ifcFfcStrength(int bitLength) {
+        if (bitLength > 7680) { // 256 bits security strength
             return "SHA512";
-        } else if (bitLength > 3072) {  // 192 bits
-            return "SHA384";
-        } else  { // 128 bits and less
-            return "SHA256";
+        } else {
+            // per CNSA, use SHA-384 unless keysize is too small
+            return (bitLength >= 624 ? "SHA384" : "SHA256");
         }
     }
 }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
index c7552402509..012eb25392c 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import java.security.spec.AlgorithmParameterSpec;
 
 import javax.crypto.*;
 
+import sun.security.util.SecurityProviderConstants;;
 import static sun.security.pkcs11.TemplateManager.*;
 import sun.security.pkcs11.wrapper.*;
 import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
@@ -225,7 +226,8 @@ final class P11KeyGenerator extends KeyGeneratorSpi {
             significantKeySize = 168;
             break;
         case (int)CKM_AES_KEY_GEN:
-            keySize = adjustKeySize(128, range);
+            keySize = adjustKeySize
+                    (SecurityProviderConstants.getDefAESKeySize(), range);
             keyType = CKK_AES;
             break;
         case (int)CKM_RC4_KEY_GEN:
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
index f13ae3cd67d..ba99d0bcb5c 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,29 +99,35 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi {
         // set default key sizes and apply our own algorithm-specific limits
         // override lower limit to disallow unsecure keys being generated
         // override upper limit to deter DOS attack
-        if (algorithm.equals("EC")) {
-            keySize = DEF_EC_KEY_SIZE;
-            if (minKeyLen < 112) {
-                minKeyLen = 112;
-            }
-            if (maxKeyLen > 2048) {
-                maxKeyLen = 2048;
+        int jdkMinKeyLen = 512;
+        int jdkMaxKeyLen = Integer.MAX_VALUE;
+        switch (algorithm) {
+            case "EC" -> {
+                keySize = DEF_EC_KEY_SIZE;
+                jdkMinKeyLen = 112;
+                jdkMaxKeyLen = 2048;
             }
-        } else {
-            if (algorithm.equals("DSA")) {
+            case "DSA" -> {
                 keySize = DEF_DSA_KEY_SIZE;
-            } else if (algorithm.equals("RSA")) {
+            }
+            case "RSA" -> {
                 keySize = DEF_RSA_KEY_SIZE;
-                if (maxKeyLen > 64 * 1024) {
-                    maxKeyLen = 64 * 1024;
-                }
-            } else {
+                jdkMaxKeyLen = 64 * 1024;
+            }
+            case "DH" -> {
                 keySize = DEF_DH_KEY_SIZE;
             }
-            if (minKeyLen < 512) {
-                minKeyLen = 512;
+            default -> {
+                throw new ProviderException
+                        ("Unrecognized algorithm for checking key size");
             }
         }
+        if (minKeyLen < jdkMinKeyLen) {
+            minKeyLen = jdkMinKeyLen;
+        }
+        if (maxKeyLen > jdkMaxKeyLen) {
+            maxKeyLen = jdkMaxKeyLen;
+        }
 
         // auto-adjust default keysize in case it's out-of-range
         if (keySize < minKeyLen) {
diff --git a/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java b/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java
index 08fad553cc9..74c687912fe 100644
--- a/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java
+++ b/src/jdk.jartool/share/classes/jdk/security/jarsigner/JarSigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -417,29 +417,30 @@ public final class JarSigner {
         /**
          * Gets the default digest algorithm.
          *
-         * @implNote This implementation returns "SHA-256". The value may
+         * @implNote This implementation returns "SHA-384". The value may
          * change in the future.
          *
          * @return the default digest algorithm.
          */
         public static String getDefaultDigestAlgorithm() {
-            return "SHA-256";
+            return "SHA-384";
         }
 
         /**
          * Gets the default signature algorithm for a private key.
-         * For example, SHA256withRSA for a 2048-bit RSA key, and
+         * For example, SHA384withRSA for a 2048-bit RSA key, and
          * SHA384withECDSA for a 384-bit EC key.
          *
          * @implNote This implementation makes use of comparable strengths
-         * as defined in Tables 2 and 3 of NIST SP 800-57 Part 1-Rev.4.
-         * Specifically, if a DSA or RSA key with a key size greater than 7680
+         * as defined in Tables 2 and 3 of NIST SP 800-57 Part 1-Rev.5 as
+         * well as NIST recommendations as appropriate.
+         * Specifically, if an RSA key with a key size greater than 7680
          * bits, or an EC key with a key size greater than or equal to 512 bits,
          * SHA-512 will be used as the hash function for the signature.
-         * If a DSA or RSA key has a key size greater than 3072 bits, or an
-         * EC key has a key size greater than or equal to 384 bits, SHA-384 will
-         * be used. Otherwise, SHA-256 will be used. The value may
-         * change in the future.
+         * Otherwise, SHA-384 will be used unless the key size is too small
+         * for resulting signature algorithm. As for DSA keys, the SHA256withDSA
+         * signature algorithm is returned regardless of key size.
+         * The value may change in the future.
          *
          * @param key the private key.
          * @return the default signature algorithm. Returns null if a default
diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
index b304121fa0c..2367c361d57 100644
--- a/test/jdk/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
+++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 6330287 6331386 7044060
+ * @bug 6330287 6331386 7044060 8267319
  * @summary verify that DHKeyPairGenerator returns keys of the expected size
  * (modulus and exponent)
  * -and-
@@ -58,7 +58,7 @@ public class TestExponentSize {
      */
     private enum Sizes {
         two56(256), three84(384), five12(512), seven68(768), ten24(1024),
-        twenty48(2048);
+        fifteen36(1536), twenty48(2048), thirty72(3072);
 
         private final int intSize;
         private final BigInteger bigIntValue;
@@ -83,11 +83,14 @@ public class TestExponentSize {
         KeyPair kp;
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("DH", "SunJCE");
 
-        // Sun's default uses a default psize of 2048 and
+        // Sun's default uses a default psize of 3072 and
         // lsize of (pSize / 2) but at least 384 bits
         kp = kpg.generateKeyPair();
-        checkKeyPair(kp, Sizes.twenty48, Sizes.ten24);
+        checkKeyPair(kp, Sizes.thirty72, Sizes.fifteen36);
 
+        kpg.initialize(Sizes.twenty48.getIntSize());
+        kp = kpg.generateKeyPair();
+        checkKeyPair(kp, Sizes.twenty48, Sizes.ten24);
         DHPublicKey publicKey = (DHPublicKey)kp.getPublic();
         BigInteger p = publicKey.getParams().getP();
         BigInteger g = publicKey.getParams().getG();
diff --git a/test/jdk/com/sun/crypto/provider/KeyGenerator/Test4628062.java b/test/jdk/com/sun/crypto/provider/KeyGenerator/Test4628062.java
index 3e93874a88a..10cb29b6db2 100644
--- a/test/jdk/com/sun/crypto/provider/KeyGenerator/Test4628062.java
+++ b/test/jdk/com/sun/crypto/provider/KeyGenerator/Test4628062.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4628062 4963723
+ * @bug 4628062 4963723 8267319
  * @summary Verify that AES KeyGenerator supports default initialization
  *      when init is not called
  * @author Valerie Peng
@@ -34,7 +34,8 @@ import java.util.*;
 
 public class Test4628062 {
 
-    private static final int[] AES_SIZES = { 16, 24, 32 }; // in bytes
+    // first value is the default key size
+    private static final int[] AES_SIZES = { 32, 16, 24 }; // in bytes
     private static final int[] HMACSHA224_SIZES = { 28 };
     private static final int[] HMACSHA256_SIZES = { 32 };
     private static final int[] HMACSHA384_SIZES = { 48 };
diff --git a/test/jdk/jdk/security/jarsigner/Properties.java b/test/jdk/jdk/security/jarsigner/Properties.java
index 05c50c16979..9de99759798 100644
--- a/test/jdk/jdk/security/jarsigner/Properties.java
+++ b/test/jdk/jdk/security/jarsigner/Properties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8242068
+ * @bug 8242068 8267319
  * @summary test the properties
  * @library /test/lib
  * @modules java.base/sun.security.tools.keytool
@@ -50,6 +50,9 @@ import java.util.zip.ZipFile;
 
 public class Properties {
 
+    private static final String DEF_DIGEST_STR =
+            JarSigner.Builder.getDefaultDigestAlgorithm() + "-Digest-Manifest:";
+
     public static void main(String[] args) throws Exception {
 
         Files.writeString(Path.of("anything"), "anything");
@@ -82,12 +85,12 @@ public class Properties {
         // Has a hash for the whole manifest
         byte[] s0 = sign(jsb.setProperty("sectionsonly", "false"));
         sf = new String(DerUtils.innerDerValue(s0, "10210").getOctetString());
-        Asserts.assertTrue(sf.contains("SHA-256-Digest-Manifest:"));
+        Asserts.assertTrue(sf.contains(DEF_DIGEST_STR));
 
         // Has no hash for the whole manifest
         byte[] s1 = sign(jsb.setProperty("sectionsonly", "true"));
         sf = new String(DerUtils.innerDerValue(s1, "10210").getOctetString());
-        Asserts.assertFalse(sf.contains("SHA-256-Digest-Manifest:"));
+        Asserts.assertFalse(sf.contains(DEF_DIGEST_STR));
     }
 
     // Sign and returns the content of the PKCS7 signature block inside
diff --git a/test/jdk/jdk/security/jarsigner/Spec.java b/test/jdk/jdk/security/jarsigner/Spec.java
index b089f4af929..0b41cc94be6 100644
--- a/test/jdk/jdk/security/jarsigner/Spec.java
+++ b/test/jdk/jdk/security/jarsigner/Spec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8056174 8242068 8255536
+ * @bug 8056174 8242068 8255536 8267319
  * @summary Make sure JarSigner impl conforms to spec
  * @library /test/lib
  * @modules java.base/sun.security.tools.keytool
@@ -178,14 +178,15 @@ public class Spec {
         assertTrue(js3.getProperty("altsigner").equals("MyContentSigner"));
         assertTrue(js3.getProperty("altsignerpath") == null);
 
-        assertTrue(JarSigner.Builder.getDefaultDigestAlgorithm().equals("SHA-256"));
+        assertTrue(JarSigner.Builder.getDefaultDigestAlgorithm()
+                .equals("SHA-384"));
 
         // Calculating large DSA and RSA keys are too slow.
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
         kpg.initialize(1024);
         assertTrue(JarSigner.Builder
                 .getDefaultSignatureAlgorithm(kpg.generateKeyPair().getPrivate())
-                    .equals("SHA256withRSA"));
+                    .equals("SHA384withRSA"));
 
         kpg = KeyPairGenerator.getInstance("DSA");
         kpg.initialize(1024);
@@ -197,7 +198,7 @@ public class Spec {
         kpg.initialize(256);
         assertTrue(JarSigner.Builder
                 .getDefaultSignatureAlgorithm(kpg.generateKeyPair().getPrivate())
-                .equals("SHA256withECDSA"));
+                .equals("SHA384withECDSA"));
         kpg.initialize(384);
         assertTrue(JarSigner.Builder
                 .getDefaultSignatureAlgorithm(kpg.generateKeyPair().getPrivate())
diff --git a/test/jdk/sun/security/pkcs11/KeyGenerator/TestAES.java b/test/jdk/sun/security/pkcs11/KeyGenerator/TestAES.java
new file mode 100644
index 00000000000..e74007a65e3
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/KeyGenerator/TestAES.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8267319
+ * @modules java.base/sun.security.util
+ *          jdk.crypto.cryptoki
+ * @summary Check AES key generator.
+ * @library /test/lib ..
+ * @run main TestAES
+ */
+import java.security.Provider;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidParameterException;
+import java.security.NoSuchAlgorithmException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import static sun.security.util.SecurityProviderConstants.*;
+
+public class TestAES extends PKCS11Test {
+
+    private static final String ALGO = "AES";
+
+    public static void main(String[] args) throws Exception {
+        main(new TestAES(), args);
+    }
+
+    @Override
+    public void main(Provider p) throws Exception {
+        System.out.println("Testing " + p.getName());
+        KeyGenerator kg;
+        try {
+            kg = KeyGenerator.getInstance(ALGO, p);
+        } catch (NoSuchAlgorithmException nsae) {
+            System.out.println("Skip; no support for " + ALGO);
+            return;
+        }
+
+        // first try w/o setting a key length and check if the generated key
+        // length matches
+        SecretKey key = kg.generateKey();
+        byte[] keyValue = key.getEncoded();
+        if (key.getEncoded().length != getDefAESKeySize() >> 3) {
+            throw new RuntimeException("Default AES key length should be " +
+                    getDefAESKeySize());
+        }
+
+        for (int keySize : new int[] { 16, 32, 64, 128, 256, 512, 1024 }) {
+            boolean isValid = (keySize == 128 || keySize == 192 ||
+                    keySize == 256);
+            try {
+                kg.init(keySize);
+                if (!isValid) {
+                    throw new RuntimeException(keySize + " is invalid keysize");
+                }
+                key = kg.generateKey();
+                if (key.getEncoded().length != keySize >> 3) {
+                    throw new RuntimeException("Generated key len mismatch!");
+                }
+            } catch (InvalidParameterException e) {
+                if (isValid) {
+                    throw new RuntimeException("IPE thrown for valid keySize");
+                } else {
+                    System.out.println("Expected IPE thrown for " + keySize);
+                }
+            }
+        }
+    }
+}
diff --git a/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDefaultSize.java b/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDefaultSize.java
new file mode 100644
index 00000000000..a359ff7a13c
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDefaultSize.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8267319
+ * @summary Ensure that DSA/RSA/DH/EC KPG in PKCS11 provider uses the
+ *     same default key length
+ * @library /test/lib ..
+ * @modules java.base/sun.security.util
+ *          jdk.crypto.cryptoki
+ * @run main TestDefaultSize
+ */
+
+import java.security.InvalidParameterException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.Provider;
+import java.security.PrivateKey;
+import java.security.interfaces.*;
+import javax.crypto.interfaces.DHKey;
+
+import static sun.security.util.SecurityProviderConstants.*;
+
+public class TestDefaultSize extends PKCS11Test {
+
+    @Override
+    public void main(Provider p) throws Exception {
+        System.out.println("Testing " + p.getName());
+
+        String[] ALGOS = { "DSA", "RSA", "DH", "EC" };
+
+        for (String algo : ALGOS) {
+            if (p.getService("KeyPairGenerator", algo) == null) {
+                System.out.println("Skip, no support for KPG: " + algo);
+                return;
+            }
+
+            KeyPairGenerator kpg = KeyPairGenerator.getInstance(algo, p);
+            KeyPair kp = kpg.generateKeyPair();
+            PrivateKey priv = kp.getPrivate();
+            int actualSize = -1;
+            int expectedSize;
+            if (algo == "DSA") {
+                expectedSize = DEF_DSA_KEY_SIZE;
+                if (priv instanceof DSAKey) {
+                    actualSize = ((DSAKey) priv).getParams().getP().bitLength();
+                }
+            } else if (algo == "RSA") {
+                expectedSize = DEF_RSA_KEY_SIZE;
+                if (priv instanceof RSAKey) {
+                    actualSize = ((RSAKey) priv).getModulus().bitLength();
+                }
+            } else if (algo == "DH") {
+                expectedSize = DEF_DH_KEY_SIZE;
+                if (priv instanceof DHKey) {
+                    actualSize = ((DHKey) priv).getParams().getP().bitLength();
+                }
+            } else if (algo == "EC") {
+                expectedSize = DEF_EC_KEY_SIZE;
+                if (priv instanceof ECKey) {
+                    actualSize = ((ECKey) priv).getParams().getCurve()
+                            .getField().getFieldSize();
+                }
+            } else {
+                throw new RuntimeException("Error: Unrecognized algo " +
+                    algo + " or opaque private key object " + priv);
+            }
+            if (actualSize != expectedSize) {
+                throw new RuntimeException("key size check failed, got " +
+                    actualSize);
+            } else {
+                System.out.println(algo + ": passed, " + actualSize);
+            }
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        main(new TestDefaultSize(), args);
+    }
+}
diff --git a/test/jdk/sun/security/tools/jarsigner/CheckSignerCertChain.java b/test/jdk/sun/security/tools/jarsigner/CheckSignerCertChain.java
index 8465f36261b..da409612efe 100644
--- a/test/jdk/sun/security/tools/jarsigner/CheckSignerCertChain.java
+++ b/test/jdk/sun/security/tools/jarsigner/CheckSignerCertChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8259401 8266225
+ * @bug 8259401 8266225 8267319
  * @summary Check certificates in signer's cert chain to see if warning emitted
  * @library /test/lib
  */
@@ -40,6 +40,8 @@ public class CheckSignerCertChain {
 
     private static final String JAVA_SECURITY_FILE = "java.security";
 
+    private static final String keysizeOpt = "-keysize 2048";
+
     static OutputAnalyzer kt(String cmd, String ks) throws Exception {
         return SecurityTools.keytool("-storepass changeit " + cmd +
                 " -keystore " + ks);
@@ -57,8 +59,11 @@ public class CheckSignerCertChain {
         System.out.println("Generating a root cert using SHA1withRSA and 1024-bit key");
         kt("-genkeypair -keyalg rsa -alias ca -dname CN=CA -ext bc:c " +
                 "-keysize 1024 -sigalg SHA1withRSA", "ks");
-        kt("-genkeypair -keyalg rsa -alias ca1 -dname CN=CA1", "ks");
-        kt("-genkeypair -keyalg rsa -alias e1 -dname CN=E1", "ks");
+
+        kt("-genkeypair -keyalg rsa -alias ca1 -dname CN=CA1 " + keysizeOpt,
+                "ks");
+        kt("-genkeypair -keyalg rsa -alias e1 -dname CN=E1 " + keysizeOpt,
+                "ks");
 
         // intermediate certificate using SHA1withRSA and 2048-bit key
         System.out.println("Generating an intermediate cert using SHA1withRSA and 2048-bit key");
@@ -97,8 +102,10 @@ public class CheckSignerCertChain {
          * Generate a non-self-signed certificate using MD5withRSA as its signature
          * algorithm to sign a JAR file.
          */
-        kt("-genkeypair -keyalg rsa -alias cacert -dname CN=CACERT -ext bc:c ", "ks");
-        kt("-genkeypair -keyalg rsa -alias ee -dname CN=EE -ext bc:c ", "ks");
+        kt("-genkeypair -keyalg rsa -alias cacert -dname CN=CACERT -ext bc:c "
+                + keysizeOpt, "ks");
+        kt("-genkeypair -keyalg rsa -alias ee -dname CN=EE -ext bc:c "
+                + keysizeOpt, "ks");
         gencert("ee", "-alias cacert -ext san=dns:ee -sigalg MD5withRSA");
 
         Files.writeString(Files.createFile(Paths.get(JAVA_SECURITY_FILE)),
@@ -112,7 +119,7 @@ public class CheckSignerCertChain {
                 JAVA_SECURITY_FILE +
                 " a.jar ee")
                 .shouldNotContain("Signature algorithm: MD5withRSA (disabled), 2048-bit key")
-                .shouldContain("Signature algorithm: SHA256withRSA, 2048-bit key")
+                .shouldContain("Signature algorithm: SHA384withRSA, 2048-bit key")
                 .shouldNotContain("Invalid certificate chain: Algorithm constraints check failed on signature algorithm: MD5withRSA")
                 .shouldHaveExitValue(0);
 
@@ -128,7 +135,7 @@ public class CheckSignerCertChain {
                 JAVA_SECURITY_FILE +
                 " a.jar ee")
                 .shouldContain("Signature algorithm: MD5withRSA (disabled), 2048-bit key")
-                .shouldContain("Signature algorithm: SHA256withRSA, 2048-bit key")
+                .shouldContain("Signature algorithm: SHA384withRSA, 2048-bit key")
                 .shouldContain("Invalid certificate chain: Algorithm constraints check failed on disabled algorithm: MD5 used with certificate: CN=EE")
                 .shouldHaveExitValue(0);
 
@@ -138,7 +145,7 @@ public class CheckSignerCertChain {
         SecurityTools.jarsigner("-verify -certs signeda.jar " +
                 "-keystore caks1 -storepass changeit -verbose -debug")
                 .shouldContain("Signature algorithm: MD5withRSA (disabled), 2048-bit key")
-                .shouldContain("Signature algorithm: SHA256withRSA, 2048-bit key")
+                .shouldContain("Signature algorithm: SHA384withRSA, 2048-bit key")
                 .shouldContain("Invalid certificate chain: Algorithm constraints check failed on disabled algorithm: MD5 used with certificate: CN=EE")
                 .shouldHaveExitValue(0);
     }
diff --git a/test/jdk/sun/security/tools/jarsigner/DefaultSigalg.java b/test/jdk/sun/security/tools/jarsigner/DefaultSigalg.java
index 1d8919934d5..6880a95a503 100644
--- a/test/jdk/sun/security/tools/jarsigner/DefaultSigalg.java
+++ b/test/jdk/sun/security/tools/jarsigner/DefaultSigalg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
 
 /**
  * @test
- * @bug 8057810
- * @summary New defaults for DSA keys in jarsigner and keytool
+ * @bug 8057810 8267319
+ * @summary New defaults for DSA, RSA, EC keys in jarsigner and keytool
  * @modules java.base/sun.security.pkcs
  *          java.base/sun.security.tools.keytool
  *          java.base/sun.security.util
@@ -42,20 +42,22 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
-import java.util.jar.JarFile;
+import java.util.jar.*;
+import java.util.Enumeration;
 
 public class DefaultSigalg {
 
     public static void main(String[] args) throws Exception {
 
         // Three test cases
-        String[] keyalgs = {"DSA", "RSA", "EC"};
+        String[] keyalgs = {"DSA", "RSA", "EC", "RSASSA-PSS"};
         // Expected default keytool sigalg
-        String[] sigalgs = {"SHA256withDSA", "SHA256withRSA", "SHA256withECDSA"};
+        String[] sigalgs = {"SHA256withDSA", "SHA384withRSA",
+                "SHA384withECDSA", "RSASSA-PSS"};
         // Expected keysizes
-        int[] keysizes = {2048, 2048, 256};
+        int[] keysizes = {2048, 3072, 384, 3072};
         // Expected jarsigner digest alg used in signature
-        String[] digestalgs = {"SHA-256", "SHA-256", "SHA-256"};
+        String[] digestalgs = {"SHA-256", "SHA-384", "SHA-384", "SHA-384"};
 
         // Create a jar file
         sun.tools.jar.Main m =
@@ -96,7 +98,20 @@ public class DefaultSigalg {
                             "keytool keysize for " + keyalg + " is " + keysize);
                 }
                 // jarsigner
-                String bk = "META-INF/" + keyalg + "." + keyalg;
+                // truncated to the first 8 chars if alias name is longer
+                String jeName = (keyalg.equals("RSASSA-PSS")? "RSASSA-P.RSA" :
+                        keyalg + "." + keyalg);
+                String bk = "META-INF/" + jeName;
+                if (jf.getEntry(bk) == null) {
+                    System.out.println("JarFile entries:");
+                    Enumeration<JarEntry> entries = jf.entries();
+                    while (entries.hasMoreElements()) {
+                        System.out.println("je: " +
+                                entries.nextElement().getRealName());
+                    }
+                    throw new Exception("Expected jarfile entry name " +
+                            jeName + " not found");
+                }
                 try (InputStream is = jf.getInputStream(jf.getEntry(bk))) {
                     String digestalg = new PKCS7(is).getSignerInfos()[0]
                             .getDigestAlgorithmId().toString();
diff --git a/test/jdk/sun/security/tools/jarsigner/NewSize7.java b/test/jdk/sun/security/tools/jarsigner/NewSize7.java
index 8dbf15f4a38..1b75e08807a 100644
--- a/test/jdk/sun/security/tools/jarsigner/NewSize7.java
+++ b/test/jdk/sun/security/tools/jarsigner/NewSize7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,8 @@
 
 /*
  * @test
- * @bug 6561126
+ * @bug 6561126 8267319
+ * @modules jdk.jartool/jdk.security.jarsigner
  * @summary keytool should use larger default keysize for keypairs
  * @library /test/lib
  */
@@ -37,8 +38,13 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+import jdk.security.jarsigner.JarSigner;
 
 public class NewSize7 {
+
+    private static final String DEF_DIGEST_ALGO =
+            JarSigner.Builder.getDefaultDigestAlgorithm();
+
     public static void main(String[] args) throws Exception {
         String common = "-storepass changeit -keypass changeit -keystore ks ";
         SecurityTools.keytool(common
@@ -53,13 +59,13 @@ public class NewSize7 {
                     jf.getEntry("META-INF/MANIFEST.MF"))) {
                 Asserts.assertTrue(new Manifest(is).getAttributes("ns7.txt")
                         .keySet().stream()
-                        .anyMatch(s -> s.toString().contains("SHA-256")));
+                        .anyMatch(s -> s.toString().contains(DEF_DIGEST_ALGO)));
             }
             try (InputStream is = jf.getInputStream(
                     jf.getEntry("META-INF/ME.SF"))) {
                 Asserts.assertTrue(new Manifest(is).getAttributes("ns7.txt")
                         .keySet().stream()
-                        .anyMatch(s -> s.toString().contains("SHA-256")));
+                        .anyMatch(s -> s.toString().contains(DEF_DIGEST_ALGO)));
             }
         }
     }
diff --git a/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java b/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java
index 85f185ebd0c..ed47231e004 100644
--- a/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java
+++ b/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipEntry;
+import jdk.security.jarsigner.JarSigner;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.Platform;
 import jdk.test.lib.SecurityTools;
@@ -57,7 +58,7 @@ import static org.testng.Assert.*;
 
 /**
  * @test
- * @bug 8217375
+ * @bug 8217375 8267319
  * @library /test/lib
  * @modules jdk.jartool/sun.security.tools.jarsigner
  * @run testng/timeout=1200 PreserveRawManifestEntryAndDigest
@@ -87,6 +88,8 @@ public class PreserveRawManifestEntryAndDigest {
     static final String KEYSTORE_FILENAME = "test.jks";
     static final String FILENAME_INITIAL_CONTENTS = "initial-contents";
     static final String FILENAME_UPDATED_CONTENTS = "updated-contents";
+    private static final String DEF_DIGEST_STR =
+            JarSigner.Builder.getDefaultDigestAlgorithm() + "-Digest";
 
     /**
      * @see sun.security.tools.jarsigner.Main#run
@@ -373,9 +376,9 @@ public class PreserveRawManifestEntryAndDigest {
             ZipEntry eb = zip.getEntry("META-INF/B.SF");
             Manifest sfb = new Manifest(zip.getInputStream(eb));
             if (assertMainAttrsDigestsUnchanged) {
-                String mainAttrsDigKey =
-                        (digestalg != null ? digestalg : "SHA-256") +
-                        "-Digest-Manifest-Main-Attributes";
+                String mainAttrsDigKey = (digestalg != null ?
+                        (digestalg + "-Digest") : DEF_DIGEST_STR) +
+                        "-Manifest-Main-Attributes";
                 assertEquals(sfa.getMainAttributes().getValue(mainAttrsDigKey),
                              sfb.getMainAttributes().getValue(mainAttrsDigKey));
             }
@@ -418,8 +421,9 @@ public class PreserveRawManifestEntryAndDigest {
                 "Name: " + FILENAME_INITIAL_CONTENTS.substring(0, 1) + "\r\n" +
                 " " + FILENAME_INITIAL_CONTENTS.substring(1, 8) + "\r\n" +
                 " " + FILENAME_INITIAL_CONTENTS.substring(8) + "\r\n" +
-                "SHA-256-Digest: " + m.getAttributes(FILENAME_INITIAL_CONTENTS)
-                        .getValue("SHA-256-Digest") + "\r\n" +
+                DEF_DIGEST_STR + ": " +
+                m.getAttributes(FILENAME_INITIAL_CONTENTS)
+                        .getValue(DEF_DIGEST_STR) + "\r\n" +
                 "\r\n"
             ).getBytes(UTF_8);
         });
@@ -442,7 +446,7 @@ public class PreserveRawManifestEntryAndDigest {
     public void arbitraryLineBreaksHeader() throws Exception {
         test("arbitraryLineBreaksHeader", m -> {
             String digest = m.getAttributes(FILENAME_INITIAL_CONTENTS)
-                    .getValue("SHA-256-Digest");
+                    .getValue(DEF_DIGEST_STR);
             return (
                 Name.MANIFEST_VERSION + ": 1.0\r\n" +
                 "Created-By: " +
@@ -455,7 +459,7 @@ public class PreserveRawManifestEntryAndDigest {
                 " line breaks.\r\n" +
                 "\r\n" +
                 "Name: " + FILENAME_INITIAL_CONTENTS + "\r\n" +
-                "SHA-256-Digest: " + digest.substring(0, 11) + "\r\n" +
+                DEF_DIGEST_STR + ": " + digest.substring(0, 11) + "\r\n" +
                 " " + digest.substring(11) + "\r\n" +
                 "\r\n"
             ).getBytes(UTF_8);
@@ -491,7 +495,7 @@ public class PreserveRawManifestEntryAndDigest {
      * <li>simulate a manifest as it would have been written by a JDK before 11
      * by re-positioning line breaks at 70 bytes (which makes a difference by
      * digests that grow headers longer than 70 characters such as SHA-512 as
-     * opposed to default SHA-256, long file names, or manual editing)</li>
+     * opposed to default SHA-384, long file names, or manual editing)</li>
      * <li>add a new file to the jar</li>
      * <li>sign the jar with a JDK 11 or 12 with a different signer</li>
      * </ol><p>&rarr;
@@ -787,8 +791,8 @@ public class PreserveRawManifestEntryAndDigest {
         // with either digest or digestWorkaround has been checked by test
         // before.
         assertEquals(abSigFilesEqual(jarFilename, sf -> sf.getMainAttributes()
-                        .getValue("SHA-256-Digest-Manifest-Main-Attributes")),
-                     expectUnchangedDigests);
+                    .getValue(DEF_DIGEST_STR + "-Manifest-Main-Attributes")),
+                expectUnchangedDigests);
     }
 
     /**
@@ -817,7 +821,7 @@ public class PreserveRawManifestEntryAndDigest {
                 replaceTrailingLineBreaksManipulation(trailingSeq));
 
         assertTrue(abSigFilesEqual(jarFilename, sf -> sf.getAttributes(
-                FILENAME_INITIAL_CONTENTS).getValue("SHA-256-Digest")));
+                FILENAME_INITIAL_CONTENTS).getValue(DEF_DIGEST_STR)));
     }
 
     /**
@@ -857,7 +861,7 @@ public class PreserveRawManifestEntryAndDigest {
         });
 
         assertTrue(abSigFilesEqual(jarFilename, sf -> sf.getAttributes(
-                FILENAME_INITIAL_CONTENTS).getValue("SHA-256-Digest")));
+                FILENAME_INITIAL_CONTENTS).getValue(DEF_DIGEST_STR)));
     }
 
     /**
@@ -886,7 +890,7 @@ public class PreserveRawManifestEntryAndDigest {
         });
 
         assertTrue(abSigFilesEqual(jarFilename, sf -> sf.getAttributes(
-                FILENAME_INITIAL_CONTENTS).getValue("SHA-256-Digest")));
+                FILENAME_INITIAL_CONTENTS).getValue(DEF_DIGEST_STR)));
     }
 
     /**
@@ -917,7 +921,7 @@ public class PreserveRawManifestEntryAndDigest {
                 null, true, true);
 
         assertTrue(abSigFilesEqual(jarFilename, sf -> sf.getAttributes(
-                        FILENAME_INITIAL_CONTENTS).getValue("SHA-256-Digest")));
+                        FILENAME_INITIAL_CONTENTS).getValue(DEF_DIGEST_STR)));
     }
 
     /**
@@ -957,7 +961,7 @@ public class PreserveRawManifestEntryAndDigest {
         });
 
         assertTrue(abSigFilesEqual(jarFilename, sf -> sf.getAttributes(
-                FILENAME_INITIAL_CONTENTS).getValue("SHA-256-Digest")));
+                FILENAME_INITIAL_CONTENTS).getValue(DEF_DIGEST_STR)));
     }
 
     /**
@@ -993,7 +997,7 @@ public class PreserveRawManifestEntryAndDigest {
         }, null, true, true);
 
         assertTrue(abSigFilesEqual(jarFilename, sf -> sf.getAttributes(
-                FILENAME_INITIAL_CONTENTS).getValue("SHA-256-Digest")));
+                FILENAME_INITIAL_CONTENTS).getValue(DEF_DIGEST_STR)));
     }
 
     String manifestToString(Manifest mf) {
diff --git a/test/jdk/sun/security/tools/jarsigner/SectionNameContinuedVsLineBreak.java b/test/jdk/sun/security/tools/jarsigner/SectionNameContinuedVsLineBreak.java
index c2beff2c317..4464314bf28 100644
--- a/test/jdk/sun/security/tools/jarsigner/SectionNameContinuedVsLineBreak.java
+++ b/test/jdk/sun/security/tools/jarsigner/SectionNameContinuedVsLineBreak.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.util.jar.Manifest;
 import java.util.jar.JarFile;
 import jdk.test.lib.util.JarUtils;
 import jdk.test.lib.SecurityTools;
+import jdk.security.jarsigner.JarSigner;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -39,8 +40,9 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
  * @test
- * @bug 8217375
+ * @bug 8217375 8267319
  * @library /test/lib
+ * @modules jdk.jartool/jdk.security.jarsigner
  * @run testng SectionNameContinuedVsLineBreak
  * @summary Checks some specific line break character sequences in section name
  * continuation line breaks.
@@ -48,6 +50,8 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 public class SectionNameContinuedVsLineBreak {
 
     static final String KEYSTORE_FILENAME = "test.jks";
+    private static final String DEF_DIGEST_STR =
+            JarSigner.Builder.getDefaultDigestAlgorithm() + "-Digest";
 
     @BeforeTest
     public void prepareCertificate() throws Exception {
@@ -107,12 +111,12 @@ public class SectionNameContinuedVsLineBreak {
     public void testContinueNameAfterCr() throws Exception {
         String filename = "abc";
         test("testContinueNameAfterCr", m -> {
-            String digest = m.getAttributes("abc").getValue("SHA-256-Digest");
+            String digest = m.getAttributes("abc").getValue(DEF_DIGEST_STR);
             m.getEntries().remove("abc");
             return (manifestToString(m)
                     + "Name: a\r"
                     + " bc\r\n"
-                    + "SHA-256-Digest: " + digest + "\r\n"
+                    + DEF_DIGEST_STR + ": " + digest + "\r\n"
                     + "\r\n").getBytes(UTF_8);
         }, filename);
     }
@@ -126,13 +130,13 @@ public class SectionNameContinuedVsLineBreak {
     public void testContinueNameAfterCrOnContinuationLine() throws Exception {
         String filename = "abc";
         test("testContinueNameAfterCr", m -> {
-            String digest = m.getAttributes("abc").getValue("SHA-256-Digest");
+            String digest = m.getAttributes("abc").getValue(DEF_DIGEST_STR);
             m.getEntries().remove("abc");
             return (manifestToString(m)
                     + "Name: a\r\n"
                     + " b\r"
                     + " c\r\n"
-                    + "SHA-256-Digest: " + digest + "\r\n"
+                    + DEF_DIGEST_STR + ": " + digest + "\r\n"
                     + "\r\n").getBytes(UTF_8);
         }, filename);
     }
@@ -146,12 +150,12 @@ public class SectionNameContinuedVsLineBreak {
     public void testEndNameWithCrOnContinuationLine() throws Exception {
         String filename = "abc";
         test("testContinueNameAfterCr", m -> {
-            String digest = m.getAttributes("abc").getValue("SHA-256-Digest");
+            String digest = m.getAttributes("abc").getValue(DEF_DIGEST_STR);
             m.getEntries().remove("abc");
             return (manifestToString(m)
                     + "Name: a\r\n"
                     + " bc\r"
-                    + "SHA-256-Digest: " + digest + "\r\n"
+                    + DEF_DIGEST_STR + ": " + digest + "\r\n"
                     + "\r\n").getBytes(UTF_8);
         }, filename);
     }
diff --git a/test/jdk/sun/security/tools/jarsigner/SignedAgain.java b/test/jdk/sun/security/tools/jarsigner/SignedAgain.java
index 54cf52148c6..584712c90cc 100644
--- a/test/jdk/sun/security/tools/jarsigner/SignedAgain.java
+++ b/test/jdk/sun/security/tools/jarsigner/SignedAgain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,8 @@
 
 /*
  * @test
- * @bug 8215922
+ * @bug 8215922 8267319
+ * @modules jdk.jartool/jdk.security.jarsigner
  * @summary jar spec is not precise when describing jar file re-signing
  * @library /test/lib
  */
@@ -37,10 +38,15 @@ import java.util.Base64;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+import jdk.security.jarsigner.JarSigner;
 
 import static jdk.test.lib.SecurityTools.*;
 
 public class SignedAgain {
+
+    private static final String DEF_DIGEST =
+            JarSigner.Builder.getDefaultDigestAlgorithm();
+
     public static void main(String[] args) throws Exception {
 
         String opt = "-storepass changeit -keystore ks";
@@ -73,20 +79,20 @@ public class SignedAgain {
 
             // Hash of manifest for 2 signed JAR files
             String da = Base64.getEncoder().encodeToString(MessageDigest
-                    .getInstance("SHA-256").digest(ma.readAllBytes()));
+                    .getInstance(DEF_DIGEST).digest(ma.readAllBytes()));
             String db = Base64.getEncoder().encodeToString(MessageDigest
-                    .getInstance("SHA-256").digest(mb.readAllBytes()));
+                    .getInstance(DEF_DIGEST).digest(mb.readAllBytes()));
 
             // They are not the same
             Asserts.assertNotEquals(da, db);
 
             // Digest-Manifest in A.SF matches da
             Asserts.assertEQ(new Manifest(sa).getMainAttributes()
-                    .getValue("SHA-256-Digest-Manifest"), da);
+                    .getValue(DEF_DIGEST + "-Digest-Manifest"), da);
 
             // Digest-Manifest in B.SF matches db
             Asserts.assertEQ(new Manifest(sb).getMainAttributes()
-                    .getValue("SHA-256-Digest-Manifest"), db);
+                    .getValue(DEF_DIGEST + "-Digest-Manifest"), db);
         }
     }
 }
diff --git a/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java b/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java
index e6794550b90..c4cf1ef6a98 100644
--- a/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java
+++ b/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.security.KeyStoreUtils;
 import jdk.test.lib.security.timestamp.*;
 import jdk.test.lib.util.JarUtils;
+import jdk.security.jarsigner.JarSigner;
 import sun.security.pkcs.PKCS7;
 import sun.security.pkcs.PKCS9Attribute;
 import sun.security.pkcs.SignerInfo;
@@ -55,13 +56,14 @@ import sun.security.timestamp.TimestampToken;
 /*
  * @test
  * @bug 6543842 6543440 6939248 8009636 8024302 8163304 8169911 8180289 8172404
- *      8247960 8242068 8269039 8275887
+ *      8247960 8242068 8269039 8275887 8267319
  * @summary checking response of timestamp
  * @modules java.base/sun.security.pkcs
  *          java.base/sun.security.timestamp
  *          java.base/sun.security.x509
  *          java.base/sun.security.util
  *          java.base/sun.security.tools.keytool
+ *          jdk.jartool/jdk.security.jarsigner
  * @library /lib/testlibrary
  * @library /test/lib
  * @build jdk.test.lib.util.JarUtils
@@ -80,6 +82,18 @@ public class TimestampCheck {
     private static final String PASSWORD = "changeit";
     private static final String defaultPolicyId = "2.3.4";
     private static String host = null;
+    private static final String getDefaultSigAlg(String keyAlg) {
+        switch(keyAlg) {
+            case "DSA":
+                return "SHA256withDSA";
+            case "RSA":
+                return "SHA384withRSA";
+            case "EC":
+                return "SHA384withECDSA";
+            default:
+                throw new RuntimeException("Error: unsupported algo " + keyAlg);
+        }
+    }
 
     private static class Interceptor implements RespInterceptor {
 
@@ -291,7 +305,8 @@ public class TimestampCheck {
 
                 sign("policy", "-tsapolicyid",  "1.2.3")
                         .shouldHaveExitValue(0);
-                checkTimestamp("policy.jar", "1.2.3", "SHA-256");
+                checkTimestamp("policy.jar", "1.2.3",
+                        JarSigner.Builder.getDefaultDigestAlgorithm());
 
                 sign("diffpolicy", "-tsapolicyid", "1.2.3")
                         .shouldContain("TSAPolicyID changed in timestamp token")
@@ -378,9 +393,11 @@ public class TimestampCheck {
                         .shouldHaveExitValue(0)
                         .shouldContain("Signature algorithm: SHA3-256withRSA")
                         .shouldContain("Signature algorithm: RSASSA-PSS")
-                        .shouldContain("Signature algorithm: SHA256withECDSA")
+                        .shouldContain("Signature algorithm: " +
+                                getDefaultSigAlg("EC"))
                         .shouldContain("Signature algorithm: Ed25519")
-                        .shouldContain("Signature algorithm: SHA256withDSA");
+                        .shouldContain("Signature algorithm: " +
+                                getDefaultSigAlg("DSA"));
 
                 // Disabled algorithms
                 sign("tsweak", "-digestalg", "SHA1",
diff --git a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
index 4d5b28533f5..9b4b3cb785f 100644
--- a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
+++ b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8217375 8260286
+ * @bug 8217375 8260286 8267319
  * @summary This test is used to verify the compatibility of jarsigner across
  *     different JDK releases. It also can be used to check jar signing (w/
  *     and w/o TSA) and to verify some specific signing and digest algorithms.
@@ -1192,9 +1192,9 @@ public class Compatibility {
 
             // defaults
             if (RSA.equals(keyAlgorithm) || DSA.equals(keyAlgorithm)) {
-                return 2048;
+                return 3072;
             } else if (EC.equals(keyAlgorithm)) {
-                return 256;
+                return 384;
             } else {
                 throw new RuntimeException("problem determining key size");
             }
diff --git a/test/jdk/sun/security/tools/jarsigner/compatibility/SignTwice.java b/test/jdk/sun/security/tools/jarsigner/compatibility/SignTwice.java
index e948eb6e8d3..0b4d0668edc 100644
--- a/test/jdk/sun/security/tools/jarsigner/compatibility/SignTwice.java
+++ b/test/jdk/sun/security/tools/jarsigner/compatibility/SignTwice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /**
- * @bug 8217375
+ * @bug 8217375 8267319
  * @summary This test runs those test cases of {@link Compatibility} test nearby
  * which can be executed within the currently built and tested JDK and without
  * TSA, with only one digest algorithm and with only one key (algorithm and
@@ -47,6 +47,19 @@
  *  -DtestJarUpdate=true
  *  -Dstrict=true
  *  -DkeyAlgs=EC;0
+ *  -DdigestAlgs=SHA-384
+ *  SignTwice
+ * @run main/othervm/timeout=600
+ *  -Djava.security.properties=./java.security
+ *  -Duser.language=en
+ *  -Duser.country=US
+ *  -DjdkList=TEST_JDK
+ *  -DtsaList=notsa
+ *  -Dexpired=false
+ *  -DtestComprehensiveJarContents=true
+ *  -DtestJarUpdate=true
+ *  -Dstrict=true
+ *  -DkeyAlgs=EC;0
  *  -DdigestAlgs=SHA-256
  *  SignTwice
  */
diff --git a/test/jdk/sun/security/tools/keytool/GenKeyPairSigner.java b/test/jdk/sun/security/tools/keytool/GenKeyPairSigner.java
index 46a55e4d6fb..52ca1ead82c 100644
--- a/test/jdk/sun/security/tools/keytool/GenKeyPairSigner.java
+++ b/test/jdk/sun/security/tools/keytool/GenKeyPairSigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8260693
+ * @bug 8260693 8267319
  * @summary Test for keytool -genkeypair with -signer and -signerkeypass options
  * @library /test/lib
  * @modules java.base/sun.security.util
@@ -186,7 +186,7 @@ public class GenKeyPairSigner {
         System.out.println("Generating a DH cert with -signer option");
         SecurityTools.keytool("-keystore ks -storepass changeit " +
                 "-genkeypair -keyalg DH -alias e3 -dname CN=E3 -signer ca3")
-                .shouldContain("Generating 2,048 bit DH key pair and a certificate (SHA256withDSA) issued by <ca3> with a validity of 90 days")
+                .shouldContain("Generating 3,072 bit DH key pair and a certificate (SHA256withDSA) issued by <ca3> with a validity of 90 days")
                 .shouldContain("for: CN=E3")
                 .shouldHaveExitValue(0);
 
@@ -200,7 +200,7 @@ public class GenKeyPairSigner {
 
         pKey = cert.getPublicKey();
         keyLen = KeyUtil.getKeySize(pKey);
-        if (keyLen != 2048) {
+        if (keyLen != 3072) {
             throw new Exception("Key size is in error");
         }
 
@@ -212,8 +212,8 @@ public class GenKeyPairSigner {
         SecurityTools.keytool("-keystore ks -storepass changeit " +
                 "-list -v")
                 .shouldContain("Alias name: e3")
-                .shouldContain("Signature algorithm name: SHA256withRSA")
-                .shouldContain("Subject Public Key Algorithm: 2048-bit DH key")
+                .shouldContain("Signature algorithm name: SHA384withRSA")
+                .shouldContain("Subject Public Key Algorithm: 3072-bit DH key")
                 .shouldHaveExitValue(0);
     }
 
@@ -239,7 +239,7 @@ public class GenKeyPairSigner {
         SecurityTools.keytool("-keystore ksjks -storepass changeit -storetype jks " +
                 "-genkeypair -keyalg DSA -keysize 1024 -alias ca1 -dname CN=CA1 " +
                 "-keypass ca1keypass -signer ca -signerkeypass cakeypass")
-                .shouldContain("Generating 1,024 bit DSA key pair and a certificate (SHA256withRSA) issued by <ca> with a validity of 90 days")
+                .shouldContain("Generating 1,024 bit DSA key pair and a certificate (SHA384withRSA) issued by <ca> with a validity of 90 days")
                 .shouldContain("for: CN=CA1")
                 .shouldContain("The generated certificate #1 of 2 uses a 1024-bit DSA key which is considered a security risk")
                 .shouldContain("The generated certificate #2 of 2 uses a 1024-bit RSA key which is considered a security risk")
diff --git a/test/jdk/sun/security/tools/keytool/GenerateAll.java b/test/jdk/sun/security/tools/keytool/GenerateAll.java
index a9d05813f4b..5435372cdcf 100644
--- a/test/jdk/sun/security/tools/keytool/GenerateAll.java
+++ b/test/jdk/sun/security/tools/keytool/GenerateAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8242184 8242068
+ * @bug 8242184 8242068 8267319
  * @summary keytool and jarsigner for all algorithms
  * @library /test/lib
  * @modules java.base/sun.security.util
@@ -117,11 +117,11 @@ public class GenerateAll {
     @DataProvider(name = "all")
     public Object[][] dataProvider() {
         return new Object[][]{
-                {"rsa", "rsa", null, "RSA", SHA_256, SHA256withRSA},
+                {"rsa", "rsa", null, "RSA", SHA_384, SHA384withRSA},
                 {"dsa", "dsa", null, "DSA", SHA_256, SHA256withDSA},
-                {"r", "rsa", "rsassa-pss", "RSA", SHA_256, RSASSA_PSS},
-                {"pss", "rsassa-pss", null, "RSA", SHA_256, RSASSA_PSS},
-                {"ec", "ec", null, "EC", SHA_256, SHA256withECDSA},
+                {"r", "rsa", "rsassa-pss", "RSA", SHA_384, RSASSA_PSS},
+                {"pss", "rsassa-pss", null, "RSA", SHA_384, RSASSA_PSS},
+                {"ec", "ec", null, "EC", SHA_384, SHA384withECDSA},
                 {"ed25519", "ed25519", null, "EC", SHA_512, Ed25519},
                 {"ed448", "ed448", null, "EC", SHAKE256_LEN, Ed448},
         };
diff --git a/test/jdk/sun/security/tools/keytool/GroupName.java b/test/jdk/sun/security/tools/keytool/GroupName.java
index 2251ca47fe9..938d28b6d8f 100644
--- a/test/jdk/sun/security/tools/keytool/GroupName.java
+++ b/test/jdk/sun/security/tools/keytool/GroupName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ import java.security.interfaces.ECKey;
 
 /**
  * @test
- * @bug 8213400 8214179
+ * @bug 8213400 8214179 8267319
  * @summary Support choosing group name in keytool keypair generation
  * @library /test/lib
  */
@@ -48,7 +48,7 @@ public class GroupName {
         gen("b", "-keyalg EC")
                 .shouldHaveExitValue(0)
                 .shouldNotContain("Specifying -keysize for generating EC keys is deprecated");
-        checkCurveName("b", "secp256r1");
+        checkCurveName("b", "secp384r1"); // default; if none specified
 
         gen("c", "-keyalg EC -keysize 256")
                 .shouldHaveExitValue(0)
@@ -67,7 +67,8 @@ public class GroupName {
 
         kt("-list -v")
                 .shouldHaveExitValue(0)
-                .shouldContain("Subject Public Key Algorithm: 256-bit EC (secp256r1) key");
+                .shouldContain("Subject Public Key Algorithm: 256-bit EC (secp256r1) key")
+                .shouldContain("Subject Public Key Algorithm: 384-bit EC (secp384r1) key");
     }
 
     private static void checkCurveName(String a, String name)
diff --git a/test/jdk/sun/security/tools/keytool/KeyAlg.java b/test/jdk/sun/security/tools/keytool/KeyAlg.java
index 044568ca624..ed5061949bf 100644
--- a/test/jdk/sun/security/tools/keytool/KeyAlg.java
+++ b/test/jdk/sun/security/tools/keytool/KeyAlg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8029659 8214179
+ * @bug 8029659 8214179 8267319
  * @summary Keytool, print key algorithm of certificate or key entry
  * @library /test/lib
  */
@@ -41,9 +41,9 @@ public class KeyAlg {
         keytool("-printcert -file user.crt")
                 .shouldMatch("Signature algorithm name:.*SHA1withECDSA")
                 .shouldMatch("Subject Public Key Algorithm:.*1024.*RSA");
-        keytool("-genkeypair -alias f -dname CN=f -keyalg EC")
+        keytool("-genkeypair -alias g -dname CN=g -keyalg EC -keysize 256")
                 .shouldContain("Generating 256 bit EC (secp256r1) key pair");
-        keytool("-genkeypair -alias g -dname CN=g -keyalg EC -keysize 384")
+        keytool("-genkeypair -alias f -dname CN=f -keyalg EC")
                 .shouldContain("Generating 384 bit EC (secp384r1) key pair");
     }
 
diff --git a/test/jdk/sun/security/tools/keytool/NewSize7.java b/test/jdk/sun/security/tools/keytool/NewSize7.java
index 5a7dcfa57d9..09c0f9a289a 100644
--- a/test/jdk/sun/security/tools/keytool/NewSize7.java
+++ b/test/jdk/sun/security/tools/keytool/NewSize7.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
 
 /*
  * @test
- * @bug 6561126
+ * @bug 6561126 8267319
  * @summary keytool should use larger default keysize for keypairs
- * @modules java.base/sun.security.tools.keytool
- * @compile -XDignore.symbol.file NewSize7.java
+ * @modules java.base/sun.security.util
+ *          java.base/sun.security.tools.keytool
  * @run main NewSize7
  */
 
@@ -37,6 +37,7 @@ import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPublicKey;
+import sun.security.util.SecurityProviderConstants;
 
 public class NewSize7 {
     public static void main(String[] args) throws Exception {
@@ -52,11 +53,11 @@ public class NewSize7 {
         }
         Files.delete(Paths.get(FILE));
         RSAPublicKey r = (RSAPublicKey)ks.getCertificate("a").getPublicKey();
-        if (r.getModulus().bitLength() != 2048) {
+        if (r.getModulus().bitLength() != 3072) {
             throw new Exception("Bad keysize");
         }
         X509Certificate x = (X509Certificate)ks.getCertificate("a");
-        if (!x.getSigAlgName().equals("SHA256withRSA")) {
+        if (!x.getSigAlgName().equals("SHA384withRSA")) {
             throw new Exception("Bad sigalg");
         }
     }
diff --git a/test/jdk/sun/security/tools/keytool/fakegen/DefaultSignatureAlgorithm.java b/test/jdk/sun/security/tools/keytool/fakegen/DefaultSignatureAlgorithm.java
index b4ae0e21c76..5f0822440fc 100644
--- a/test/jdk/sun/security/tools/keytool/fakegen/DefaultSignatureAlgorithm.java
+++ b/test/jdk/sun/security/tools/keytool/fakegen/DefaultSignatureAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8138766 8227059 8227595
+ * @bug 8138766 8227059 8227595 8267319
  * @summary New default -sigalg for keytool
  * @library /test/lib
  * @build java.base/sun.security.rsa.RSAKeyPairGenerator
@@ -46,8 +46,8 @@ public class DefaultSignatureAlgorithm {
     static int pos = 0;
 
     public static void main(String[] args) throws Exception {
-        check("RSA", 1024, null, "SHA256withRSA");
-        check("RSA", 3072, null, "SHA256withRSA");
+        check("RSA", 1024, null, "SHA384withRSA");
+        check("RSA", 3072, null, "SHA384withRSA");
         check("RSA", 3073, null, "SHA384withRSA");
         check("RSA", 7680, null, "SHA384withRSA");
         check("RSA", 7681, null, "SHA512withRSA");
diff --git a/test/jdk/sun/security/tools/keytool/fakegen/PSS.java b/test/jdk/sun/security/tools/keytool/fakegen/PSS.java
index 72f74526189..9e7de9b757d 100644
--- a/test/jdk/sun/security/tools/keytool/fakegen/PSS.java
+++ b/test/jdk/sun/security/tools/keytool/fakegen/PSS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8215694 8222987 8225257
+ * @bug 8215694 8222987 8225257 8267319
  * @summary keytool cannot generate RSASSA-PSS certificates
  * @library /test/lib
  * @build java.base/sun.security.rsa.RSAKeyPairGenerator
@@ -63,10 +63,10 @@ public class PSS {
                 new File("ks"), "changeit".toCharArray());
 
         check((X509Certificate)ks.getCertificate("p"), "RSASSA-PSS",
-                AlgorithmId.SHA256_oid);
+                AlgorithmId.SHA384_oid);
 
         check((X509Certificate)ks.getCertificate("a"), "RSA",
-                AlgorithmId.SHA256_oid);
+                AlgorithmId.SHA384_oid);
 
         check((X509Certificate)ks.getCertificate("b"), "RSA",
                 AlgorithmId.SHA384_oid);
-- 
GitLab


From 6b59760da69ff769d30950cb4ec6ebf684d1bf50 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Fri, 25 Mar 2022 05:18:26 +0000
Subject: [PATCH 208/345] 8283608: Refactor 2d, beans classes javadoc to use
 @throws instead of @exception

Reviewed-by: iris, prr
---
 .../com/sun/media/sound/AiffFileReader.java      |  2 +-
 .../com/sun/media/sound/AiffFileWriter.java      |  2 +-
 .../com/sun/media/sound/SunFileReader.java       |  4 ++--
 .../com/sun/media/sound/SunFileWriter.java       |  4 ++--
 .../share/classes/java/beans/Beans.java          | 16 ++++++++--------
 .../classes/java/beans/EventSetDescriptor.java   | 12 ++++++------
 .../java/beans/IndexedPropertyDescriptor.java    |  6 +++---
 .../share/classes/java/beans/Introspector.java   | 10 +++++-----
 .../classes/java/beans/PropertyDescriptor.java   |  6 +++---
 .../java/beans/PropertyEditorManager.java        |  2 +-
 .../java/beans/VetoableChangeListener.java       |  2 +-
 .../java/beans/VetoableChangeListenerProxy.java  |  2 +-
 .../beancontext/BeanContextMembershipEvent.java  |  2 +-
 .../share/classes/sun/awt/AppContext.java        |  4 ++--
 .../share/classes/sun/awt/im/InputContext.java   | 14 +++++++-------
 .../classes/sun/awt/im/InputMethodAdapter.java   |  2 +-
 .../share/classes/sun/awt/shell/ShellFolder.java |  3 +--
 .../classes/sun/awt/util/IdentityArrayList.java  |  2 +-
 .../share/classes/sun/java2d/SunGraphics2D.java  |  2 +-
 .../share/classes/sun/print/PSPrinterJob.java    |  2 +-
 .../share/classes/sun/print/PrintJob2D.java      |  2 +-
 .../classes/sun/print/RasterPrinterJob.java      | 10 +++++-----
 22 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
index c8d9cd8d2db..6ef0695c70d 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
@@ -172,7 +172,7 @@ public final class AiffFileReader extends SunFileReader {
      * Extended precision IEEE floating-point conversion routine.
      * @argument DataInputStream
      * @return double
-     * @exception IOException
+     * @throws IOException
      */
     private double read_ieee_extended(DataInputStream dis) throws IOException {
 
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java
index d384bf279c4..3738a557aef 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java
@@ -392,7 +392,7 @@ public final class AiffFileWriter extends SunFileWriter {
      * Extended precision IEEE floating-point conversion routine.
      * @argument DataOutputStream
      * @argument double
-     * @exception IOException
+     * @throws IOException
      */
     private void write_ieee_extended(DataOutputStream dos, float f) throws IOException {
         /* The special cases NaN, Infinity and Zero are ignored, since
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
index ef995f81294..89323cfe3c3 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
@@ -164,7 +164,7 @@ abstract class SunFileReader extends AudioFileReader {
      * Protected helper method to read 64 bits and changing the order of
      * each bytes.
      * @return 32 bits swapped value.
-     * @exception IOException
+     * @throws IOException
      */
     final int rllong(DataInputStream dis) throws IOException {
 
@@ -206,7 +206,7 @@ abstract class SunFileReader extends AudioFileReader {
      * rlshort
      * Protected helper method to read 16 bits value. Swap high with low byte.
      * @return the swapped value.
-     * @exception IOException
+     * @throws IOException
      */
     final short rlshort(DataInputStream dis)  throws IOException {
 
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java b/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java
index 1d54bcfe91c..8e85f1e743f 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java
@@ -70,7 +70,7 @@ abstract class SunFileWriter extends AudioFileWriter {
      * Protected helper method to read 64 bits and changing the order of
      * each bytes.
      * @return 32 bits swapped value.
-     * @exception IOException
+     * @throws IOException
      */
     final int rllong(DataInputStream dis) throws IOException {
 
@@ -112,7 +112,7 @@ abstract class SunFileWriter extends AudioFileWriter {
      * rlshort
      * Protected helper method to read 16 bits value. Swap high with low byte.
      * @return the swapped value.
-     * @exception IOException
+     * @throws IOException
      */
     final short rlshort(DataInputStream dis)  throws IOException {
 
diff --git a/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java
index dbe678b7092..36a424664de 100644
--- a/src/java.desktop/share/classes/java/beans/Beans.java
+++ b/src/java.desktop/share/classes/java/beans/Beans.java
@@ -75,9 +75,9 @@ public class Beans {
      * @param     beanName    the name of the bean within the class-loader.
      *                        For example "sun.beanbox.foobah"
      *
-     * @exception ClassNotFoundException if the class of a serialized
+     * @throws ClassNotFoundException if the class of a serialized
      *              object could not be found.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
 
     public static Object instantiate(ClassLoader cls, String beanName) throws IOException, ClassNotFoundException {
@@ -97,9 +97,9 @@ public class Beans {
      *                        For example "sun.beanbox.foobah"
      * @param     beanContext The BeanContext in which to nest the new bean
      *
-     * @exception ClassNotFoundException if the class of a serialized
+     * @throws ClassNotFoundException if the class of a serialized
      *              object could not be found.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      * @since 1.2
      */
     @SuppressWarnings("deprecation")
@@ -156,9 +156,9 @@ public class Beans {
      * @param     beanContext The BeanContext in which to nest the new bean
      * @param     initializer The AppletInitializer for the new bean
      *
-     * @exception ClassNotFoundException if the class of a serialized
+     * @throws ClassNotFoundException if the class of a serialized
      *              object could not be found.
-     * @exception IOException if an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      * @since 1.2
      *
      * @deprecated It is recommended to use
@@ -432,7 +432,7 @@ public class Beans {
      * method is called. This could result in a SecurityException.
      *
      * @param isDesignTime  True if we're in an application builder tool.
-     * @exception  SecurityException  if a security manager exists and its
+     * @throws  SecurityException  if a security manager exists and its
      *             {@code checkPropertiesAccess} method doesn't allow setting
      *              of system properties.
      * @see SecurityManager#checkPropertiesAccess
@@ -459,7 +459,7 @@ public class Beans {
      * method is called. This could result in a SecurityException.
      *
      * @param isGuiAvailable  True if GUI interaction is available.
-     * @exception  SecurityException  if a security manager exists and its
+     * @throws  SecurityException  if a security manager exists and its
      *             {@code checkPropertiesAccess} method doesn't allow setting
      *              of system properties.
      * @see SecurityManager#checkPropertiesAccess
diff --git a/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java b/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java
index 87fa860cf7c..8826ff27902 100644
--- a/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java
@@ -69,7 +69,7 @@ public class EventSetDescriptor extends FeatureDescriptor {
      *          will get delivered to.
      * @param listenerMethodName  The method that will get called when the event gets
      *          delivered to its target listener interface.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public EventSetDescriptor(Class<?> sourceClass, String eventSetName,
@@ -114,7 +114,7 @@ public class EventSetDescriptor extends FeatureDescriptor {
      *          that can be used to register an event listener object.
      * @param removeListenerMethodName  The name of the method on the event source
      *          that can be used to de-register an event listener object.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public EventSetDescriptor(Class<?> sourceClass,
@@ -146,7 +146,7 @@ public class EventSetDescriptor extends FeatureDescriptor {
      *          that can be used to de-register an event listener object.
      * @param getListenerMethodName The method on the event source that
      *          can be used to access the array of event listener objects.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      * @since 1.4
      */
@@ -210,7 +210,7 @@ public class EventSetDescriptor extends FeatureDescriptor {
      *          that can be used to register an event listener object.
      * @param removeListenerMethod  The method on the event source
      *          that can be used to de-register an event listener object.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public EventSetDescriptor(String eventSetName,
@@ -237,7 +237,7 @@ public class EventSetDescriptor extends FeatureDescriptor {
      *          that can be used to de-register an event listener object.
      * @param getListenerMethod The method on the event source
      *          that can be used to access the array of event listener objects.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      * @since 1.4
      */
@@ -280,7 +280,7 @@ public class EventSetDescriptor extends FeatureDescriptor {
      *          that can be used to register an event listener object.
      * @param removeListenerMethod  The method on the event source
      *          that can be used to de-register an event listener object.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public EventSetDescriptor(String eventSetName,
diff --git a/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java b/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java
index b49b1cb07a9..a46c8ec9d6e 100644
--- a/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java
@@ -63,7 +63,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor {
      *
      * @param propertyName The programmatic name of the property.
      * @param beanClass The Class object for the target bean.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public IndexedPropertyDescriptor(String propertyName, Class<?> beanClass)
@@ -94,7 +94,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor {
      * @param indexedWriteMethodName The name of the method used for writing
      *          an indexed property value.
      *          May be null if the property is read-only.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public IndexedPropertyDescriptor(String propertyName, Class<?> beanClass,
@@ -129,7 +129,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor {
      *          May be null if the property is write-only.
      * @param indexedWriteMethod The method used for writing an indexed property value.
      *          May be null if the property is read-only.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public IndexedPropertyDescriptor(String propertyName, Method readMethod, Method writeMethod,
diff --git a/src/java.desktop/share/classes/java/beans/Introspector.java b/src/java.desktop/share/classes/java/beans/Introspector.java
index f73444a54ef..88225ab01d4 100644
--- a/src/java.desktop/share/classes/java/beans/Introspector.java
+++ b/src/java.desktop/share/classes/java/beans/Introspector.java
@@ -178,7 +178,7 @@ public class Introspector {
      *
      * @param beanClass  The bean class to be analyzed.
      * @return  A BeanInfo object describing the target bean.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      * @see #flushCaches
      * @see #flushFromCaches
@@ -216,7 +216,7 @@ public class Introspector {
      *           associated with the specified beanClass or any of its
      *           parent classes.
      * @return  A BeanInfo object describing the target bean.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      * @since 1.2
      */
@@ -237,7 +237,7 @@ public class Introspector {
      * @param stopClass The baseclass at which to stop the analysis.  Any
      *    methods/properties/events in the stopClass or in its baseclasses
      *    will be ignored in the analysis.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public static BeanInfo getBeanInfo(Class<?> beanClass, Class<?> stopClass)
@@ -269,7 +269,7 @@ public class Introspector {
      * @param stopClass  the parent class at which to stop the analysis
      * @param flags      flags to control the introspection
      * @return a BeanInfo object describing the target bean
-     * @exception IntrospectionException if an exception occurs during introspection
+     * @throws IntrospectionException if an exception occurs during introspection
      *
      * @since 1.7
      */
@@ -339,7 +339,7 @@ public class Introspector {
      * method is called. This could result in a SecurityException.
      *
      * @param path  Array of package names.
-     * @exception  SecurityException  if a security manager exists and its
+     * @throws  SecurityException  if a security manager exists and its
      *             {@code checkPropertiesAccess} method doesn't allow setting
      *              of system properties.
      * @see SecurityManager#checkPropertiesAccess
diff --git a/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java b/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
index d63c446f373..ae4bb69c18c 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
@@ -66,7 +66,7 @@ public class PropertyDescriptor extends FeatureDescriptor {
      * @param propertyName The programmatic name of the property.
      * @param beanClass The Class object for the target bean.  For
      *          example sun.beans.OurButton.class.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public PropertyDescriptor(String propertyName, Class<?> beanClass)
@@ -87,7 +87,7 @@ public class PropertyDescriptor extends FeatureDescriptor {
      *           value.  May be null if the property is write-only.
      * @param writeMethodName The name of the method used for writing the property
      *           value.  May be null if the property is read-only.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public PropertyDescriptor(String propertyName, Class<?> beanClass,
@@ -129,7 +129,7 @@ public class PropertyDescriptor extends FeatureDescriptor {
      *          May be null if the property is write-only.
      * @param writeMethod The method used for writing the property value.
      *          May be null if the property is read-only.
-     * @exception IntrospectionException if an exception occurs during
+     * @throws IntrospectionException if an exception occurs during
      *              introspection.
      */
     public PropertyDescriptor(String propertyName, Method readMethod, Method writeMethod)
diff --git a/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java b/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java
index 3642c0c58be..a692c921421 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyEditorManager.java
@@ -118,7 +118,7 @@ public class PropertyEditorManager {
      * method is called. This could result in a SecurityException.
      *
      * @param path  Array of package names.
-     * @exception  SecurityException  if a security manager exists and its
+     * @throws  SecurityException  if a security manager exists and its
      *             {@code checkPropertiesAccess} method doesn't allow setting
      *              of system properties.
      * @see SecurityManager#checkPropertiesAccess
diff --git a/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java b/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java
index ae473becad9..1c20a9926e5 100644
--- a/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java
+++ b/src/java.desktop/share/classes/java/beans/VetoableChangeListener.java
@@ -37,7 +37,7 @@ public interface VetoableChangeListener extends java.util.EventListener {
      *
      * @param     evt a {@code PropertyChangeEvent} object describing the
      *                event source and the property that has changed.
-     * @exception PropertyVetoException if the recipient wishes the property
+     * @throws PropertyVetoException if the recipient wishes the property
      *              change to be rolled back.
      */
     void vetoableChange(PropertyChangeEvent evt)
diff --git a/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java b/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java
index 9a0438790c1..4e4ad96ebd8 100644
--- a/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java
+++ b/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java
@@ -66,7 +66,7 @@ public class VetoableChangeListenerProxy
     *
     * @param event  the property change event
     *
-    * @exception PropertyVetoException if the recipient wishes the property
+    * @throws PropertyVetoException if the recipient wishes the property
     *                                  change to be rolled back
     */
     public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException{
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 13279894ce6..ecdd4794d38 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
@@ -81,7 +81,7 @@ public class BeanContextMembershipEvent extends BeanContextEvent {
      *
      * @param bc        The BeanContext source
      * @param changes   The Children effected
-     * @exception       NullPointerException if changes associated with this
+     * @throws       NullPointerException if changes associated with this
      *                  event are null.
      */
 
diff --git a/src/java.desktop/share/classes/sun/awt/AppContext.java b/src/java.desktop/share/classes/sun/awt/AppContext.java
index 6ed0b2b325e..741b52d8bae 100644
--- a/src/java.desktop/share/classes/sun/awt/AppContext.java
+++ b/src/java.desktop/share/classes/sun/awt/AppContext.java
@@ -391,7 +391,7 @@ public final class AppContext {
      * This method must be called from a Thread which is not contained
      * within this AppContext.
      *
-     * @exception  IllegalThreadStateException  if the current thread is
+     * @throws  IllegalThreadStateException  if the current thread is
      *                                    contained within this AppContext
      * @since      1.2
      */
@@ -660,7 +660,7 @@ public final class AppContext {
      * @param      value   the value.
      * @return     the previous value of the specified key in this
      *             AppContext, or {@code null} if it did not have one.
-     * @exception  NullPointerException  if the key or value is
+     * @throws  NullPointerException  if the key or value is
      *               {@code null}.
      * @see     #get(Object)
      * @since   1.2
diff --git a/src/java.desktop/share/classes/sun/awt/im/InputContext.java b/src/java.desktop/share/classes/sun/awt/im/InputContext.java
index c35d17bfae3..237164a9d42 100644
--- a/src/java.desktop/share/classes/sun/awt/im/InputContext.java
+++ b/src/java.desktop/share/classes/sun/awt/im/InputContext.java
@@ -133,7 +133,7 @@ public class InputContext extends java.awt.im.InputContext
 
     /**
      * @see java.awt.im.InputContext#selectInputMethod
-     * @exception NullPointerException when the locale is null.
+     * @throws NullPointerException when the locale is null.
      */
     public synchronized boolean selectInputMethod(Locale locale) {
         if (locale == null) {
@@ -206,7 +206,7 @@ public class InputContext extends java.awt.im.InputContext
     /**
      * @see java.awt.im.InputContext#reconvert
      * @since 1.3
-     * @exception UnsupportedOperationException when input method is null
+     * @throws UnsupportedOperationException when input method is null
      */
     public synchronized void reconvert() {
         InputMethod inputMethod = getInputMethod();
@@ -610,7 +610,7 @@ public class InputContext extends java.awt.im.InputContext
 
     /**
      * @see java.awt.im.InputContext#removeNotify
-     * @exception NullPointerException when the component is null.
+     * @throws NullPointerException when the component is null.
      */
     public synchronized void removeNotify(Component component) {
         if (component == null) {
@@ -662,7 +662,7 @@ public class InputContext extends java.awt.im.InputContext
 
     /**
      * @see java.awt.im.InputContext#dispose
-     * @exception IllegalStateException when the currentClientComponent is not null
+     * @throws IllegalStateException when the currentClientComponent is not null
      */
     public synchronized void dispose() {
         if (currentClientComponent != null) {
@@ -723,7 +723,7 @@ public class InputContext extends java.awt.im.InputContext
 
     /**
      * @see java.awt.im.InputContext#setCompositionEnabled(boolean)
-     * @exception UnsupportedOperationException when input method is null
+     * @throws UnsupportedOperationException when input method is null
      */
     public void setCompositionEnabled(boolean enable) {
         InputMethod inputMethod = getInputMethod();
@@ -736,7 +736,7 @@ public class InputContext extends java.awt.im.InputContext
 
     /**
      * @see java.awt.im.InputContext#isCompositionEnabled
-     * @exception UnsupportedOperationException when input method is null
+     * @throws UnsupportedOperationException when input method is null
      */
     public boolean isCompositionEnabled() {
         InputMethod inputMethod = getInputMethod();
@@ -749,7 +749,7 @@ public class InputContext extends java.awt.im.InputContext
 
     /**
      * @return a string with information about the current input method.
-     * @exception UnsupportedOperationException when input method is null
+     * @throws UnsupportedOperationException when input method is null
      */
     public String getInputMethodInfo() {
         InputMethod inputMethod = getInputMethod();
diff --git a/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java
index dfc31799bfb..b70f5bbbf71 100644
--- a/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java
+++ b/src/java.desktop/share/classes/sun/awt/im/InputMethodAdapter.java
@@ -93,7 +93,7 @@ public abstract class InputMethodAdapter implements InputMethod {
     /**
      * Starts reconvertion. An implementing host adapter has to override
      * this method if it can support reconvert().
-     * @exception UnsupportedOperationException when the adapter does not override
+     * @throws UnsupportedOperationException when the adapter does not override
      * the method.
      */
     public void reconvert() {
diff --git a/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java b/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
index 3aa91dcb600..1f95995a222 100644
--- a/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
+++ b/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java
@@ -253,13 +253,12 @@ public abstract class ShellFolder extends File {
 
     /**
      * Return a shell folder from a file object
-     * @exception FileNotFoundException if file does not exist
+     * @throws FileNotFoundException if file does not exist
      */
     public static ShellFolder getShellFolder(File file) throws FileNotFoundException {
         if (file instanceof ShellFolder) {
             return (ShellFolder)file;
         }
-
         if (!Files.exists(Paths.get(file.getPath()), LinkOption.NOFOLLOW_LINKS)) {
             throw new FileNotFoundException();
         }
diff --git a/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java b/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java
index 98f93cc3ec7..202a55a8135 100644
--- a/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java
+++ b/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java
@@ -113,7 +113,7 @@ public class IdentityArrayList<E> extends AbstractList<E>
      * Constructs an empty list with the specified initial capacity.
      *
      * @param   initialCapacity   the initial capacity of the list
-     * @exception IllegalArgumentException if the specified initial capacity
+     * @throws IllegalArgumentException if the specified initial capacity
      *            is negative
      */
     public IdentityArrayList(int initialCapacity) {
diff --git a/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
index 193a8a38587..5c681b454b9 100644
--- a/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
+++ b/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
@@ -409,7 +409,7 @@ public final class SunGraphics2D
      * drawback of the workaround is that the resulting
      * clip and device origin cannot be "enforced".
      *
-     * @exception IllegalStateException If the Graphics
+     * @throws IllegalStateException If the Graphics
      * to be constrained has a complex transform.
      */
     @Override
diff --git a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
index 61450e49553..01a24adfda4 100644
--- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
@@ -418,7 +418,7 @@ public class PSPrinterJob extends RasterPrinterJob {
      * print job interactively.
      * @return false if the user cancels the dialog and
      *         true otherwise.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
diff --git a/src/java.desktop/share/classes/sun/print/PrintJob2D.java b/src/java.desktop/share/classes/sun/print/PrintJob2D.java
index 9083bd3e269..7a238383ce8 100644
--- a/src/java.desktop/share/classes/sun/print/PrintJob2D.java
+++ b/src/java.desktop/share/classes/sun/print/PrintJob2D.java
@@ -966,7 +966,7 @@ public class PrintJob2D extends PrintJob implements Printable, Runnable {
      * @return PAGE_EXISTS if the page is rendered successfully
      *         or NO_SUCH_PAGE if {@code pageIndex} specifies a
      *         non-existent page.
-     * @exception java.awt.print.PrinterException
+     * @throws java.awt.print.PrinterException
      *         thrown when the print job is terminated.
      */
     public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
diff --git a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
index 6ceeb48df85..ffdebb82d0b 100644
--- a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
@@ -714,7 +714,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
      *            is cancelled, or a new PageFormat object containing
      *            the format indicated by the user if the dialog is
      *            acknowledged
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      * @since     1.2
@@ -947,7 +947,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
      *
      * @param attributes to store changed properties.
      * @return false if the user cancels the dialog and true otherwise.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -1100,7 +1100,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
      * print job interactively.
      * @return false if the user cancels the dialog and
      *         true otherwise.
-     * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+     * @throws HeadlessException if GraphicsEnvironment.isHeadless()
      * returns true.
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
@@ -1183,7 +1183,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
      * for the number of pages as well as the PageFormat and
      * Printable for each page.
      * @param document The document to be printed. It may not be null.
-     * @exception NullPointerException the Pageable passed in was null.
+     * @throws NullPointerException the Pageable passed in was null.
      * @see PageFormat
      * @see Printable
      */
@@ -1477,7 +1477,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
 
     /**
      * Prints a set of pages.
-     * @exception java.awt.print.PrinterException an error in the print system
+     * @throws java.awt.print.PrinterException an error in the print system
      *                                          caused the job to be aborted
      * @see java.awt.print.Book
      * @see java.awt.print.Pageable
-- 
GitLab


From 636225b8151d1bd53349a314fb50b682d6effcd2 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Fri, 25 Mar 2022 08:17:45 +0000
Subject: [PATCH 209/345] 8283607: Rename KlassID to KlassKind

Reviewed-by: dholmes, tschatzl
---
 src/hotspot/share/memory/iterator.inline.hpp  | 40 ++++++++--------
 src/hotspot/share/oops/arrayKlass.cpp         |  4 +-
 src/hotspot/share/oops/arrayKlass.hpp         |  2 +-
 .../share/oops/instanceClassLoaderKlass.hpp   |  4 +-
 src/hotspot/share/oops/instanceKlass.cpp      |  4 +-
 src/hotspot/share/oops/instanceKlass.hpp      |  4 +-
 .../share/oops/instanceMirrorKlass.hpp        |  4 +-
 src/hotspot/share/oops/instanceRefKlass.hpp   |  4 +-
 src/hotspot/share/oops/klass.cpp              |  2 +-
 src/hotspot/share/oops/klass.hpp              | 46 ++++++++++---------
 src/hotspot/share/oops/objArrayKlass.cpp      |  2 +-
 src/hotspot/share/oops/objArrayKlass.hpp      |  2 +-
 src/hotspot/share/oops/typeArrayKlass.cpp     |  2 +-
 src/hotspot/share/oops/typeArrayKlass.hpp     |  2 +-
 14 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/src/hotspot/share/memory/iterator.inline.hpp b/src/hotspot/share/memory/iterator.inline.hpp
index cc339f2213d..90d705ccab6 100644
--- a/src/hotspot/share/memory/iterator.inline.hpp
+++ b/src/hotspot/share/memory/iterator.inline.hpp
@@ -174,7 +174,7 @@ void Devirtualizer::do_cld(OopClosureType* closure, ClassLoaderData* cld) {
 // It allows for a single call to do a multi-dispatch to an optimized version
 //   of oop_oop_iterate that statically know all these types:
 //   - OopClosureType    : static type give at call site
-//   - Klass*            : dynamic to static type through Klass::id() -> table index
+//   - Klass*            : dynamic to static type through Klass::kind() -> table index
 //   - UseCompressedOops : dynamic to static value determined once
 //
 // when users call obj->oop_iterate(&cl).
@@ -190,7 +190,7 @@ void Devirtualizer::do_cld(OopClosureType* closure, ClassLoaderData* cld) {
 //   used when calling do_oop.
 //
 // Klass* :
-//   A table mapping from *Klass::ID to function is setup. This happens once
+//   A table mapping from *Klass::Kind to function is setup. This happens once
 //   when the program starts, when the static _table instance is initialized for
 //   the OopOopIterateDispatch specialized with the OopClosureType.
 //
@@ -223,7 +223,7 @@ private:
 
     template <typename KlassType>
     void set_init_function() {
-      _function[KlassType::ID] = &init<KlassType>;
+      _function[KlassType::Kind] = &init<KlassType>;
     }
 
     template <typename KlassType>
@@ -232,20 +232,20 @@ private:
       // when functions pointers are updated.
       STATIC_ASSERT(sizeof(_function[0]) == sizeof(void*));
       if (UseCompressedOops) {
-        _function[KlassType::ID] = &oop_oop_iterate<KlassType, narrowOop>;
+        _function[KlassType::Kind] = &oop_oop_iterate<KlassType, narrowOop>;
       } else {
-        _function[KlassType::ID] = &oop_oop_iterate<KlassType, oop>;
+        _function[KlassType::Kind] = &oop_oop_iterate<KlassType, oop>;
       }
     }
 
     template <typename KlassType>
     void set_resolve_function_and_execute(OopClosureType* cl, oop obj, Klass* k) {
       set_resolve_function<KlassType>();
-      _function[KlassType::ID](cl, obj, k);
+      _function[KlassType::Kind](cl, obj, k);
     }
 
   public:
-    FunctionType _function[KLASS_ID_COUNT];
+    FunctionType _function[KLASS_KIND_COUNT];
 
     Table(){
       set_init_function<InstanceKlass>();
@@ -261,7 +261,7 @@ private:
 public:
 
   static FunctionType function(Klass* klass) {
-    return _table._function[klass->id()];
+    return _table._function[klass->kind()];
   }
 };
 
@@ -288,26 +288,26 @@ private:
 
     template <typename KlassType>
     void set_init_function() {
-      _function[KlassType::ID] = &init<KlassType>;
+      _function[KlassType::Kind] = &init<KlassType>;
     }
 
     template <typename KlassType>
     void set_resolve_function() {
       if (UseCompressedOops) {
-        _function[KlassType::ID] = &oop_oop_iterate_bounded<KlassType, narrowOop>;
+        _function[KlassType::Kind] = &oop_oop_iterate_bounded<KlassType, narrowOop>;
       } else {
-        _function[KlassType::ID] = &oop_oop_iterate_bounded<KlassType, oop>;
+        _function[KlassType::Kind] = &oop_oop_iterate_bounded<KlassType, oop>;
       }
     }
 
     template <typename KlassType>
     void set_resolve_function_and_execute(OopClosureType* cl, oop obj, Klass* k, MemRegion mr) {
       set_resolve_function<KlassType>();
-      _function[KlassType::ID](cl, obj, k, mr);
+      _function[KlassType::Kind](cl, obj, k, mr);
     }
 
   public:
-    FunctionType _function[KLASS_ID_COUNT];
+    FunctionType _function[KLASS_KIND_COUNT];
 
     Table(){
       set_init_function<InstanceKlass>();
@@ -323,7 +323,7 @@ private:
 public:
 
   static FunctionType function(Klass* klass) {
-    return _table._function[klass->id()];
+    return _table._function[klass->kind()];
   }
 };
 
@@ -350,26 +350,26 @@ private:
 
     template <typename KlassType>
     void set_init_function() {
-      _function[KlassType::ID] = &init<KlassType>;
+      _function[KlassType::Kind] = &init<KlassType>;
     }
 
     template <typename KlassType>
     void set_resolve_function() {
       if (UseCompressedOops) {
-        _function[KlassType::ID] = &oop_oop_iterate_backwards<KlassType, narrowOop>;
+        _function[KlassType::Kind] = &oop_oop_iterate_backwards<KlassType, narrowOop>;
       } else {
-        _function[KlassType::ID] = &oop_oop_iterate_backwards<KlassType, oop>;
+        _function[KlassType::Kind] = &oop_oop_iterate_backwards<KlassType, oop>;
       }
     }
 
     template <typename KlassType>
     void set_resolve_function_and_execute(OopClosureType* cl, oop obj, Klass* k) {
       set_resolve_function<KlassType>();
-      _function[KlassType::ID](cl, obj, k);
+      _function[KlassType::Kind](cl, obj, k);
     }
 
   public:
-    FunctionType _function[KLASS_ID_COUNT];
+    FunctionType _function[KLASS_KIND_COUNT];
 
     Table(){
       set_init_function<InstanceKlass>();
@@ -385,7 +385,7 @@ private:
 public:
 
   static FunctionType function(Klass* klass) {
-    return _table._function[klass->id()];
+    return _table._function[klass->kind()];
   }
 };
 
diff --git a/src/hotspot/share/oops/arrayKlass.cpp b/src/hotspot/share/oops/arrayKlass.cpp
index c28ce0323b7..5a276fda3d6 100644
--- a/src/hotspot/share/oops/arrayKlass.cpp
+++ b/src/hotspot/share/oops/arrayKlass.cpp
@@ -83,8 +83,8 @@ Method* ArrayKlass::uncached_lookup_method(const Symbol* name,
   return super()->uncached_lookup_method(name, signature, OverpassLookupMode::skip, private_mode);
 }
 
-ArrayKlass::ArrayKlass(Symbol* name, KlassID id) :
-  Klass(id),
+ArrayKlass::ArrayKlass(Symbol* name, KlassKind kind) :
+  Klass(kind),
   _dimension(1),
   _higher_dimension(NULL),
   _lower_dimension(NULL) {
diff --git a/src/hotspot/share/oops/arrayKlass.hpp b/src/hotspot/share/oops/arrayKlass.hpp
index bed87db0d2a..62138ce862d 100644
--- a/src/hotspot/share/oops/arrayKlass.hpp
+++ b/src/hotspot/share/oops/arrayKlass.hpp
@@ -45,7 +45,7 @@ class ArrayKlass: public Klass {
   // Constructors
   // The constructor with the Symbol argument does the real array
   // initialization, the other is a dummy
-  ArrayKlass(Symbol* name, KlassID id);
+  ArrayKlass(Symbol* name, KlassKind kind);
   ArrayKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for cds"); }
 
  public:
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
index e1a42ae3181..559878a1c67 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
@@ -40,10 +40,10 @@ class InstanceClassLoaderKlass: public InstanceKlass {
   friend class VMStructs;
   friend class InstanceKlass;
 public:
-  static const KlassID ID = InstanceClassLoaderKlassID;
+  static const KlassKind Kind = InstanceClassLoaderKlassKind;
 
 private:
-  InstanceClassLoaderKlass(const ClassFileParser& parser) : InstanceKlass(parser, ID) {}
+  InstanceClassLoaderKlass(const ClassFileParser& parser) : InstanceKlass(parser, Kind) {}
 
 public:
   InstanceClassLoaderKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index f5dcaebd96a..7e761c07f66 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -485,8 +485,8 @@ Array<int>* InstanceKlass::create_new_default_vtable_indices(int len, TRAPS) {
   return vtable_indices;
 }
 
-InstanceKlass::InstanceKlass(const ClassFileParser& parser, KlassID id) :
-  Klass(id),
+InstanceKlass::InstanceKlass(const ClassFileParser& parser, KlassKind kind) :
+  Klass(kind),
   _nest_members(NULL),
   _nest_host(NULL),
   _permitted_subclasses(NULL),
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 623c3e24a95..91465272631 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -133,10 +133,10 @@ class InstanceKlass: public Klass {
   friend class CompileReplay;
 
  public:
-  static const KlassID ID = InstanceKlassID;
+  static const KlassKind Kind = InstanceKlassKind;
 
  protected:
-  InstanceKlass(const ClassFileParser& parser, KlassID id = ID);
+  InstanceKlass(const ClassFileParser& parser, KlassKind kind = Kind);
 
  public:
   InstanceKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp
index 00258e13bc3..cb1ee2efba4 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.hpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp
@@ -45,12 +45,12 @@ class InstanceMirrorKlass: public InstanceKlass {
   friend class InstanceKlass;
 
  public:
-  static const KlassID ID = InstanceMirrorKlassID;
+  static const KlassKind Kind = InstanceMirrorKlassKind;
 
  private:
   static int _offset_of_static_fields;
 
-  InstanceMirrorKlass(const ClassFileParser& parser) : InstanceKlass(parser, ID) {}
+  InstanceMirrorKlass(const ClassFileParser& parser) : InstanceKlass(parser, Kind) {}
 
  public:
   InstanceMirrorKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
diff --git a/src/hotspot/share/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp
index 5e271ebb762..5965e072a22 100644
--- a/src/hotspot/share/oops/instanceRefKlass.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.hpp
@@ -50,10 +50,10 @@ class ClassFileParser;
 class InstanceRefKlass: public InstanceKlass {
   friend class InstanceKlass;
  public:
-  static const KlassID ID = InstanceRefKlassID;
+  static const KlassKind Kind = InstanceRefKlassKind;
 
  private:
-  InstanceRefKlass(const ClassFileParser& parser) : InstanceKlass(parser, ID) {}
+  InstanceRefKlass(const ClassFileParser& parser) : InstanceKlass(parser, Kind) {}
 
  public:
   InstanceRefKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index f431c2425d8..856669e44ca 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -201,7 +201,7 @@ void* Klass::operator new(size_t size, ClassLoaderData* loader_data, size_t word
 // which zeros out memory - calloc equivalent.
 // The constructor is also used from CppVtableCloner,
 // which doesn't zero out the memory before calling the constructor.
-Klass::Klass(KlassID id) : _id(id),
+Klass::Klass(KlassKind kind) : _kind(kind),
                            _shared_class_path_index(-1) {
   CDS_ONLY(_shared_class_flags = 0;)
   CDS_JAVA_HEAP_ONLY(_archived_mirror_index = -1;)
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index f82ba4d9970..3d1d98c7037 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -37,17 +37,17 @@
 #include "jfr/support/jfrTraceIdExtension.hpp"
 #endif
 
-// Klass IDs for all subclasses of Klass
-enum KlassID {
-  InstanceKlassID,
-  InstanceRefKlassID,
-  InstanceMirrorKlassID,
-  InstanceClassLoaderKlassID,
-  TypeArrayKlassID,
-  ObjArrayKlassID
+// Klass Kinds for all subclasses of Klass
+enum KlassKind {
+  InstanceKlassKind,
+  InstanceRefKlassKind,
+  InstanceMirrorKlassKind,
+  InstanceClassLoaderKlassKind,
+  TypeArrayKlassKind,
+  ObjArrayKlassKind
 };
 
-const uint KLASS_ID_COUNT = 6;
+const uint KLASS_KIND_COUNT = ObjArrayKlassKind + 1;
 
 //
 // A Klass provides:
@@ -114,8 +114,10 @@ class Klass : public Metadata {
   // because it is frequently queried.
   jint        _layout_helper;
 
-  // Klass identifier used to implement devirtualized oop closure dispatching.
-  const KlassID _id;
+  // Klass kind used to resolve the runtime type of the instance.
+  //  - Used to implement devirtualized oop closure dispatching.
+  //  - Various type checking in the JVM
+  const KlassKind _kind;
 
   // Processed access flags, for use by Class.getModifiers.
   jint        _modifier_flags;
@@ -186,13 +188,13 @@ private:
 protected:
 
   // Constructor
-  Klass(KlassID id);
-  Klass() : _id(KlassID(-1)) { assert(DumpSharedSpaces || UseSharedSpaces, "only for cds"); }
+  Klass(KlassKind kind);
+  Klass() : _kind(KlassKind(-1)) { assert(DumpSharedSpaces || UseSharedSpaces, "only for cds"); }
 
   void* operator new(size_t size, ClassLoaderData* loader_data, size_t word_size, TRAPS) throw();
 
  public:
-  int id() { return _id; }
+  int kind() { return _kind; }
 
   enum class DefaultsLookupMode { find, skip };
   enum class OverpassLookupMode { find, skip };
@@ -615,15 +617,15 @@ protected:
  public:
   #endif
 
-  bool is_instance_klass()              const { return assert_same_query(_id <= InstanceClassLoaderKlassID, is_instance_klass_slow()); }
+  bool is_instance_klass()              const { return assert_same_query(_kind <= InstanceClassLoaderKlassKind, is_instance_klass_slow()); }
   // Other is anything that is not one of the more specialized kinds of InstanceKlass.
-  bool is_other_instance_klass()        const { return _id == InstanceKlassID; }
-  bool is_reference_instance_klass()    const { return _id == InstanceRefKlassID; }
-  bool is_mirror_instance_klass()       const { return _id == InstanceMirrorKlassID; }
-  bool is_class_loader_instance_klass() const { return _id == InstanceClassLoaderKlassID; }
-  bool is_array_klass()                 const { return assert_same_query( _id >= TypeArrayKlassID, is_array_klass_slow()); }
-  bool is_objArray_klass()              const { return assert_same_query( _id == ObjArrayKlassID,  is_objArray_klass_slow()); }
-  bool is_typeArray_klass()             const { return assert_same_query( _id == TypeArrayKlassID, is_typeArray_klass_slow()); }
+  bool is_other_instance_klass()        const { return _kind == InstanceKlassKind; }
+  bool is_reference_instance_klass()    const { return _kind == InstanceRefKlassKind; }
+  bool is_mirror_instance_klass()       const { return _kind == InstanceMirrorKlassKind; }
+  bool is_class_loader_instance_klass() const { return _kind == InstanceClassLoaderKlassKind; }
+  bool is_array_klass()                 const { return assert_same_query( _kind >= TypeArrayKlassKind, is_array_klass_slow()); }
+  bool is_objArray_klass()              const { return assert_same_query( _kind == ObjArrayKlassKind,  is_objArray_klass_slow()); }
+  bool is_typeArray_klass()             const { return assert_same_query( _kind == TypeArrayKlassKind, is_typeArray_klass_slow()); }
   #undef assert_same_query
 
   // Access flags
diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp
index fab9bd35487..a43816476e8 100644
--- a/src/hotspot/share/oops/objArrayKlass.cpp
+++ b/src/hotspot/share/oops/objArrayKlass.cpp
@@ -136,7 +136,7 @@ ObjArrayKlass* ObjArrayKlass::allocate_objArray_klass(ClassLoaderData* loader_da
   return oak;
 }
 
-ObjArrayKlass::ObjArrayKlass(int n, Klass* element_klass, Symbol* name) : ArrayKlass(name, ID) {
+ObjArrayKlass::ObjArrayKlass(int n, Klass* element_klass, Symbol* name) : ArrayKlass(name, Kind) {
   set_dimension(n);
   set_element_klass(element_klass);
 
diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp
index e4bd54b9ed1..0c031725e4c 100644
--- a/src/hotspot/share/oops/objArrayKlass.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.hpp
@@ -37,7 +37,7 @@ class ObjArrayKlass : public ArrayKlass {
   friend class JVMCIVMStructs;
 
  public:
-  static const KlassID ID = ObjArrayKlassID;
+  static const KlassKind Kind = ObjArrayKlassKind;
 
  private:
   // If you add a new field that points to any metaspace object, you
diff --git a/src/hotspot/share/oops/typeArrayKlass.cpp b/src/hotspot/share/oops/typeArrayKlass.cpp
index c79cc61e39a..fa67b4876d9 100644
--- a/src/hotspot/share/oops/typeArrayKlass.cpp
+++ b/src/hotspot/share/oops/typeArrayKlass.cpp
@@ -75,7 +75,7 @@ TypeArrayKlass* TypeArrayKlass::allocate(ClassLoaderData* loader_data, BasicType
   return new (loader_data, size, THREAD) TypeArrayKlass(type, name);
 }
 
-TypeArrayKlass::TypeArrayKlass(BasicType type, Symbol* name) : ArrayKlass(name, ID) {
+TypeArrayKlass::TypeArrayKlass(BasicType type, Symbol* name) : ArrayKlass(name, Kind) {
   set_layout_helper(array_layout_helper(type));
   assert(is_array_klass(), "sanity");
   assert(is_typeArray_klass(), "sanity");
diff --git a/src/hotspot/share/oops/typeArrayKlass.hpp b/src/hotspot/share/oops/typeArrayKlass.hpp
index 1ba4613adff..389c5ddbd74 100644
--- a/src/hotspot/share/oops/typeArrayKlass.hpp
+++ b/src/hotspot/share/oops/typeArrayKlass.hpp
@@ -36,7 +36,7 @@ class TypeArrayKlass : public ArrayKlass {
   friend class VMStructs;
 
  public:
-  static const KlassID ID = TypeArrayKlassID;
+  static const KlassKind Kind = TypeArrayKlassKind;
 
  private:
   jint _max_length;            // maximum number of elements allowed in an array
-- 
GitLab


From 70648a6a153e5d321f78cf6445a9703f41083725 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Fri, 25 Mar 2022 09:41:20 +0000
Subject: [PATCH 210/345] 8283368: G1: Remove G1SegmentedArraySegment MEMFLAGS
 template parameter

Reviewed-by: tschatzl, ayang
---
 src/hotspot/share/gc/g1/g1CardSetMemory.hpp   |  10 +-
 src/hotspot/share/gc/g1/g1SegmentedArray.cpp  | 246 ++++++++++++++++++
 src/hotspot/share/gc/g1/g1SegmentedArray.hpp  |  88 ++++---
 .../share/gc/g1/g1SegmentedArray.inline.hpp   | 232 +----------------
 .../gc/g1/g1SegmentedArrayFreeMemoryTask.cpp  |   6 +-
 .../gc/g1/g1SegmentedArrayFreeMemoryTask.hpp  |   6 +-
 .../share/gc/g1/g1SegmentedArrayFreePool.cpp  |  48 ++--
 .../share/gc/g1/g1SegmentedArrayFreePool.hpp  |  16 +-
 src/hotspot/share/gc/g1/heapRegionRemSet.cpp  |   4 +-
 9 files changed, 344 insertions(+), 312 deletions(-)
 create mode 100644 src/hotspot/share/gc/g1/g1SegmentedArray.cpp

diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.hpp b/src/hotspot/share/gc/g1/g1CardSetMemory.hpp
index c2663b41cf1..4b5638c3363 100644
--- a/src/hotspot/share/gc/g1/g1CardSetMemory.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetMemory.hpp
@@ -50,7 +50,7 @@ public:
   static const uint SlotAlignment = 8;
 
   G1CardSetAllocOptions(uint slot_size, uint initial_num_slots = MinimumNumSlots, uint max_num_slots = MaximumNumSlots) :
-    G1SegmentedArrayAllocOptions(align_up(slot_size, SlotAlignment), initial_num_slots, max_num_slots, SlotAlignment) {
+    G1SegmentedArrayAllocOptions(mtGCCardSet, slot_size, initial_num_slots, max_num_slots, SlotAlignment) {
   }
 
   virtual uint next_num_slots(uint prev_num_slots) const override {
@@ -58,16 +58,16 @@ public:
   }
 };
 
-typedef G1SegmentedArraySegment<mtGCCardSet> G1CardSetSegment;
+using G1CardSetSegment = G1SegmentedArraySegment;
 
-typedef G1SegmentedArrayFreeList<mtGCCardSet> G1CardSetFreeList;
+using G1CardSetFreeList = G1SegmentedArrayFreeList;
 
 // Arena-like allocator for (card set) heap memory objects.
 //
 // Allocation occurs from an internal free list of objects first. If the free list is
 // empty then tries to allocate from the G1SegmentedArray.
 class G1CardSetAllocator {
-  G1SegmentedArray<mtGCCardSet> _segmented_array;
+  G1SegmentedArray _segmented_array;
   FreeListAllocator _free_slots_list;
 
 public:
@@ -92,7 +92,7 @@ public:
   void print(outputStream* os);
 };
 
-typedef G1SegmentedArrayFreePool<mtGCCardSet> G1CardSetFreePool;
+using G1CardSetFreePool = G1SegmentedArrayFreePool;
 
 class G1CardSetMemoryManager : public CHeapObj<mtGCCardSet> {
   G1CardSetConfiguration* _config;
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArray.cpp b/src/hotspot/share/gc/g1/g1SegmentedArray.cpp
new file mode 100644
index 00000000000..5a77fab8a21
--- /dev/null
+++ b/src/hotspot/share/gc/g1/g1SegmentedArray.cpp
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+
+#include "gc/g1/g1SegmentedArray.inline.hpp"
+#include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/globalCounter.inline.hpp"
+
+G1SegmentedArraySegment::G1SegmentedArraySegment(uint slot_size, uint num_slots, G1SegmentedArraySegment* next, MEMFLAGS flag) :
+  _slot_size(slot_size),
+  _num_slots(num_slots),
+  _mem_flag(flag),
+  _next(next),
+  _next_allocate(0) {
+  _bottom = ((char*) this) + header_size();
+}
+
+G1SegmentedArraySegment* G1SegmentedArraySegment::create_segment(uint slot_size,
+                                                                 uint num_slots,
+                                                                 G1SegmentedArraySegment* next,
+                                                                 MEMFLAGS mem_flag) {
+  size_t block_size = size_in_bytes(slot_size, num_slots);
+  char* alloc_block = NEW_C_HEAP_ARRAY(char, block_size, mem_flag);
+  return new (alloc_block) G1SegmentedArraySegment(slot_size, num_slots, next, mem_flag);
+}
+
+void G1SegmentedArraySegment::delete_segment(G1SegmentedArraySegment* segment) {
+  segment->~G1SegmentedArraySegment();
+  FREE_C_HEAP_ARRAY(_mem_flag, segment);
+}
+
+void G1SegmentedArrayFreeList::bulk_add(G1SegmentedArraySegment& first,
+                                        G1SegmentedArraySegment& last,
+                                        size_t num,
+                                        size_t mem_size) {
+  _list.prepend(first, last);
+  Atomic::add(&_num_segments, num, memory_order_relaxed);
+  Atomic::add(&_mem_size, mem_size, memory_order_relaxed);
+}
+
+void G1SegmentedArrayFreeList::print_on(outputStream* out, const char* prefix) {
+  out->print_cr("%s: segments %zu size %zu",
+                prefix, Atomic::load(&_num_segments), Atomic::load(&_mem_size));
+}
+
+G1SegmentedArraySegment* G1SegmentedArrayFreeList::get_all(size_t& num_segments,
+                                                           size_t& mem_size) {
+  GlobalCounter::CriticalSection cs(Thread::current());
+
+  G1SegmentedArraySegment* result = _list.pop_all();
+  num_segments = Atomic::load(&_num_segments);
+  mem_size = Atomic::load(&_mem_size);
+
+  if (result != nullptr) {
+    Atomic::sub(&_num_segments, num_segments, memory_order_relaxed);
+    Atomic::sub(&_mem_size, mem_size, memory_order_relaxed);
+  }
+  return result;
+}
+
+void G1SegmentedArrayFreeList::free_all() {
+  size_t num_freed = 0;
+  size_t mem_size_freed = 0;
+  G1SegmentedArraySegment* cur;
+
+  while ((cur = _list.pop()) != nullptr) {
+    mem_size_freed += cur->mem_size();
+    num_freed++;
+    G1SegmentedArraySegment::delete_segment(cur);
+  }
+
+  Atomic::sub(&_num_segments, num_freed, memory_order_relaxed);
+  Atomic::sub(&_mem_size, mem_size_freed, memory_order_relaxed);
+}
+
+G1SegmentedArraySegment* G1SegmentedArray::create_new_segment(G1SegmentedArraySegment* const prev) {
+  // Take an existing segment if available.
+  G1SegmentedArraySegment* next = _free_segment_list->get();
+  if (next == nullptr) {
+    uint prev_num_slots = (prev != nullptr) ? prev->num_slots() : 0;
+    uint num_slots = _alloc_options->next_num_slots(prev_num_slots);
+
+    next = G1SegmentedArraySegment::create_segment(slot_size(), num_slots, prev, _alloc_options->mem_flag());
+  } else {
+    assert(slot_size() == next->slot_size() ,
+           "Mismatch %d != %d", slot_size(), next->slot_size());
+    next->reset(prev);
+  }
+
+  // Install it as current allocation segment.
+  G1SegmentedArraySegment* old = Atomic::cmpxchg(&_first, prev, next);
+  if (old != prev) {
+    // Somebody else installed the segment, use that one.
+    G1SegmentedArraySegment::delete_segment(next);
+    return old;
+  } else {
+    // Did we install the first segment in the list? If so, this is also the last.
+    if (prev == nullptr) {
+      _last = next;
+    }
+    // Successfully installed the segment into the list.
+    Atomic::inc(&_num_segments, memory_order_relaxed);
+    Atomic::add(&_mem_size, next->mem_size(), memory_order_relaxed);
+    Atomic::add(&_num_available_slots, next->num_slots(), memory_order_relaxed);
+    return next;
+  }
+}
+
+G1SegmentedArray::G1SegmentedArray(const G1SegmentedArrayAllocOptions* alloc_options,
+                                   G1SegmentedArrayFreeList* free_segment_list) :
+  _alloc_options(alloc_options),
+  _first(nullptr),
+  _last(nullptr),
+  _num_segments(0),
+  _mem_size(0),
+  _free_segment_list(free_segment_list),
+  _num_available_slots(0),
+  _num_allocated_slots(0) {
+  assert(_free_segment_list != nullptr, "precondition!");
+}
+
+G1SegmentedArray::~G1SegmentedArray() {
+  drop_all();
+}
+
+uint G1SegmentedArray::slot_size() const {
+  return _alloc_options->slot_size();
+}
+
+void G1SegmentedArray::drop_all() {
+  G1SegmentedArraySegment* cur = Atomic::load_acquire(&_first);
+
+  if (cur != nullptr) {
+    assert(_last != nullptr, "If there is at least one segment, there must be a last one.");
+
+    G1SegmentedArraySegment* first = cur;
+#ifdef ASSERT
+    // Check list consistency.
+    G1SegmentedArraySegment* last = cur;
+    uint num_segments = 0;
+    size_t mem_size = 0;
+    while (cur != nullptr) {
+      mem_size += cur->mem_size();
+      num_segments++;
+
+      G1SegmentedArraySegment* next = cur->next();
+      last = cur;
+      cur = next;
+    }
+#endif
+    assert(num_segments == _num_segments, "Segment count inconsistent %u %u", num_segments, _num_segments);
+    assert(mem_size == _mem_size, "Memory size inconsistent");
+    assert(last == _last, "Inconsistent last segment");
+
+    _free_segment_list->bulk_add(*first, *_last, _num_segments, _mem_size);
+  }
+
+  _first = nullptr;
+  _last = nullptr;
+  _num_segments = 0;
+  _mem_size = 0;
+  _num_available_slots = 0;
+  _num_allocated_slots = 0;
+}
+
+void* G1SegmentedArray::allocate() {
+  assert(slot_size() > 0, "instance size not set.");
+
+  G1SegmentedArraySegment* cur = Atomic::load_acquire(&_first);
+  if (cur == nullptr) {
+    cur = create_new_segment(cur);
+  }
+
+  while (true) {
+    void* slot = cur->get_new_slot();
+    if (slot != nullptr) {
+      Atomic::inc(&_num_allocated_slots, memory_order_relaxed);
+      guarantee(is_aligned(slot, _alloc_options->slot_alignment()),
+                "result " PTR_FORMAT " not aligned at %u", p2i(slot), _alloc_options->slot_alignment());
+      return slot;
+    }
+    // The segment is full. Next round.
+    assert(cur->is_full(), "must be");
+    cur = create_new_segment(cur);
+  }
+}
+
+uint G1SegmentedArray::num_segments() const {
+  return Atomic::load(&_num_segments);
+}
+
+#ifdef ASSERT
+class LengthClosure {
+  uint _total;
+public:
+  LengthClosure() : _total(0) {}
+  void do_segment(G1SegmentedArraySegment* segment, uint limit) {
+    _total += limit;
+  }
+  uint length() const {
+    return _total;
+  }
+};
+
+uint G1SegmentedArray::calculate_length() const {
+  LengthClosure closure;
+  iterate_segments(closure);
+  return closure.length();
+}
+#endif
+
+template <typename SegmentClosure>
+void G1SegmentedArray::iterate_segments(SegmentClosure& closure) const {
+  G1SegmentedArraySegment* cur = Atomic::load_acquire(&_first);
+
+  assert((cur != nullptr) == (_last != nullptr),
+         "If there is at least one segment, there must be a last one");
+
+  while (cur != nullptr) {
+    closure.do_segment(cur, cur->length());
+    cur = cur->next();
+  }
+}
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArray.hpp b/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
index 6c73e9855cc..6d1bcea9c90 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Huawei Technologies Co. Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,28 +28,38 @@
 
 #include "gc/shared/freeListAllocator.hpp"
 #include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
 #include "utilities/lockFreeStack.hpp"
 
 // A single segment/arena containing _num_slots blocks of memory of _slot_size.
 // G1SegmentedArraySegments can be linked together using a singly linked list.
-template<MEMFLAGS flag>
-class G1SegmentedArraySegment : public CHeapObj<flag> {
+class G1SegmentedArraySegment {
   const uint _slot_size;
   const uint _num_slots;
-
+  const MEMFLAGS _mem_flag;
   G1SegmentedArraySegment* volatile _next;
-
-  char* _segment;  // Actual data.
-
   // Index into the next free slot to allocate into. Full if equal (or larger)
   // to _num_slots (can be larger because we atomically increment this value and
   // check only afterwards if the allocation has been successful).
   uint volatile _next_allocate;
 
-public:
-  G1SegmentedArraySegment(uint slot_size, uint num_slots, G1SegmentedArraySegment* next);
-  ~G1SegmentedArraySegment();
+  char* _bottom;  // Actual data.
+  // Do not add class member variables beyond this point
+
+  static size_t header_size() { return align_up(offset_of(G1SegmentedArraySegment, _bottom), DEFAULT_CACHE_LINE_SIZE); }
+
+  static size_t payload_size(uint slot_size, uint num_slots) {
+    // The cast (size_t) is required to guard against overflow wrap around.
+    return (size_t)slot_size * num_slots;
+  }
+
+  size_t payload_size() const { return payload_size(_slot_size, _num_slots); }
 
+  NONCOPYABLE(G1SegmentedArraySegment);
+
+  G1SegmentedArraySegment(uint slot_size, uint num_slots, G1SegmentedArraySegment* next, MEMFLAGS flag);
+  ~G1SegmentedArraySegment() = default;
+public:
   G1SegmentedArraySegment* volatile* next_addr() { return &_next; }
 
   void* get_new_slot();
@@ -67,12 +77,12 @@ public:
     _next_allocate = 0;
     assert(next != this, " loop condition");
     set_next(next);
-    memset((void*)_segment, 0, (size_t)_num_slots * _slot_size);
+    memset((void*)_bottom, 0, payload_size());
   }
 
   uint slot_size() const { return _slot_size; }
 
-  size_t mem_size() const { return sizeof(*this) + (size_t)_num_slots * _slot_size; }
+  size_t mem_size() const { return header_size() + payload_size(); }
 
   uint length() const {
     // _next_allocate might grow larger than _num_slots in multi-thread environments
@@ -80,9 +90,16 @@ public:
     return MIN2(_next_allocate, _num_slots);
   }
 
+  static size_t size_in_bytes(uint slot_size, uint num_slots) {
+    return header_size() + payload_size(slot_size, num_slots);
+  }
+
+  static G1SegmentedArraySegment* create_segment(uint slot_size, uint num_slots, G1SegmentedArraySegment* next, MEMFLAGS mem_flag);
+  static void delete_segment(G1SegmentedArraySegment* segment);
+
   // Copies the (valid) contents of this segment into the destination.
   void copy_to(void* dest) const {
-    ::memcpy(dest, _segment, length() * _slot_size);
+    ::memcpy(dest, _bottom, length() * _slot_size);
   }
 
   bool is_full() const { return _next_allocate >= _num_slots; }
@@ -92,12 +109,11 @@ public:
 // to it and removal of segments is strictly separate, but every action may be
 // performed by multiple threads at the same time.
 // Counts and memory usage are current on a best-effort basis if accessed concurrently.
-template<MEMFLAGS flag>
 class G1SegmentedArrayFreeList {
-  static G1SegmentedArraySegment<flag>* volatile* next_ptr(G1SegmentedArraySegment<flag>& segment) {
+  static G1SegmentedArraySegment* volatile* next_ptr(G1SegmentedArraySegment& segment) {
     return segment.next_addr();
   }
-  typedef LockFreeStack<G1SegmentedArraySegment<flag>, &G1SegmentedArrayFreeList::next_ptr> SegmentStack;
+  using SegmentStack = LockFreeStack<G1SegmentedArraySegment, &G1SegmentedArrayFreeList::next_ptr>;
 
   SegmentStack _list;
 
@@ -108,10 +124,10 @@ public:
   G1SegmentedArrayFreeList() : _list(), _num_segments(0), _mem_size(0) { }
   ~G1SegmentedArrayFreeList() { free_all(); }
 
-  void bulk_add(G1SegmentedArraySegment<flag>& first, G1SegmentedArraySegment<flag>& last, size_t num, size_t mem_size);
+  void bulk_add(G1SegmentedArraySegment& first, G1SegmentedArraySegment& last, size_t num, size_t mem_size);
 
-  G1SegmentedArraySegment<flag>* get();
-  G1SegmentedArraySegment<flag>* get_all(size_t& num_segments, size_t& mem_size);
+  G1SegmentedArraySegment* get();
+  G1SegmentedArraySegment* get_all(size_t& num_segments, size_t& mem_size);
 
   // Give back all memory to the OS.
   void free_all();
@@ -126,6 +142,7 @@ public:
 class G1SegmentedArrayAllocOptions {
 
 protected:
+  const MEMFLAGS _mem_flag;
   const uint _slot_size;
   const uint _initial_num_slots;
   // Defines a limit to the number of slots in the segment
@@ -133,8 +150,9 @@ protected:
   const uint _slot_alignment;
 
 public:
-  G1SegmentedArrayAllocOptions(uint slot_size, uint initial_num_slots, uint max_num_slots, uint alignment) :
-    _slot_size(slot_size),
+  G1SegmentedArrayAllocOptions(MEMFLAGS mem_flag, uint slot_size, uint initial_num_slots, uint max_num_slots, uint alignment) :
+    _mem_flag(mem_flag),
+    _slot_size(align_up(slot_size, alignment)),
     _initial_num_slots(initial_num_slots),
     _max_num_slots(max_num_slots),
     _slot_alignment(alignment) {
@@ -151,6 +169,8 @@ public:
   uint slot_size() const { return _slot_size; }
 
   uint slot_alignment() const { return _slot_alignment; }
+
+  MEMFLAGS mem_flag() const {return _mem_flag; }
 };
 
 // A segmented array where G1SegmentedArraySegment is the segment, and
@@ -181,30 +201,30 @@ public:
 // The class also manages a few counters for statistics using atomic operations.
 // Their values are only consistent within each other with extra global
 // synchronization.
-template <MEMFLAGS flag>
+
 class G1SegmentedArray : public FreeListConfig  {
   // G1SegmentedArrayAllocOptions provides parameters for allocation segment
   // sizing and expansion.
   const G1SegmentedArrayAllocOptions* _alloc_options;
 
-  G1SegmentedArraySegment<flag>* volatile _first;       // The (start of the) list of all segments.
-  G1SegmentedArraySegment<flag>* _last;                 // The last segment of the list of all segments.
-  volatile uint _num_segments;                          // Number of assigned segments to this allocator.
-  volatile size_t _mem_size;                            // Memory used by all segments.
+  G1SegmentedArraySegment* volatile _first;       // The (start of the) list of all segments.
+  G1SegmentedArraySegment* _last;                 // The last segment of the list of all segments.
+  volatile uint _num_segments;                    // Number of assigned segments to this allocator.
+  volatile size_t _mem_size;                      // Memory used by all segments.
 
-  G1SegmentedArrayFreeList<flag>* _free_segment_list;   // The global free segment list to
-                                                        // preferentially get new segments from.
+  G1SegmentedArrayFreeList* _free_segment_list;   // The global free segment list to preferentially
+                                                  // get new segments from.
 
   volatile uint _num_available_slots; // Number of slots available in all segments (allocated + free + pending + not yet used).
   volatile uint _num_allocated_slots; // Number of total slots allocated and in use.
 
 private:
-  inline G1SegmentedArraySegment<flag>* create_new_segment(G1SegmentedArraySegment<flag>* const prev);
+  inline G1SegmentedArraySegment* create_new_segment(G1SegmentedArraySegment* const prev);
 
   DEBUG_ONLY(uint calculate_length() const;)
 
 public:
-  const G1SegmentedArraySegment<flag>* first_array_segment() const { return Atomic::load(&_first); }
+  const G1SegmentedArraySegment* first_array_segment() const { return Atomic::load(&_first); }
 
   uint num_available_slots() const { return Atomic::load(&_num_available_slots); }
   uint num_allocated_slots() const {
@@ -213,10 +233,10 @@ public:
     return allocated;
   }
 
-  inline uint slot_size() const;
+  uint slot_size() const;
 
   G1SegmentedArray(const G1SegmentedArrayAllocOptions* alloc_options,
-                   G1SegmentedArrayFreeList<flag>* free_segment_list);
+                   G1SegmentedArrayFreeList* free_segment_list);
   ~G1SegmentedArray();
 
   // Deallocate all segments to the free segment list and reset this allocator. Must
@@ -228,7 +248,7 @@ public:
   // We do not deallocate individual slots
   inline void deallocate(void* node) override { ShouldNotReachHere(); }
 
-  inline uint num_segments() const;
+  uint num_segments() const;
 
   template<typename SegmentClosure>
   void iterate_segments(SegmentClosure& closure) const;
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp b/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
index 69c3526e58d..1acb5060d4b 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Huawei Technologies Co. Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,20 +30,7 @@
 #include "runtime/atomic.hpp"
 #include "utilities/globalCounter.inline.hpp"
 
-template<MEMFLAGS flag>
-G1SegmentedArraySegment<flag>::G1SegmentedArraySegment(uint slot_size, uint num_slots, G1SegmentedArraySegment* next) :
-  _slot_size(slot_size), _num_slots(num_slots), _next(next), _next_allocate(0) {
-
-  _segment = NEW_C_HEAP_ARRAY(char, (size_t)_num_slots * slot_size, flag);
-}
-
-template<MEMFLAGS flag>
-G1SegmentedArraySegment<flag>::~G1SegmentedArraySegment() {
-  FREE_C_HEAP_ARRAY(flag, _segment);
-}
-
-template<MEMFLAGS flag>
-void* G1SegmentedArraySegment<flag>::get_new_slot() {
+inline void* G1SegmentedArraySegment::get_new_slot() {
   if (_next_allocate >= _num_slots) {
     return nullptr;
   }
@@ -51,31 +38,14 @@ void* G1SegmentedArraySegment<flag>::get_new_slot() {
   if (result >= _num_slots) {
     return nullptr;
   }
-  void* r = _segment + (uint)result * _slot_size;
+  void* r = _bottom + (size_t)result * _slot_size;
   return r;
 }
 
-template<MEMFLAGS flag>
-void G1SegmentedArrayFreeList<flag>::bulk_add(G1SegmentedArraySegment<flag>& first,
-                                              G1SegmentedArraySegment<flag>& last,
-                                              size_t num,
-                                              size_t mem_size) {
-  _list.prepend(first, last);
-  Atomic::add(&_num_segments, num, memory_order_relaxed);
-  Atomic::add(&_mem_size, mem_size, memory_order_relaxed);
-}
-
-template<MEMFLAGS flag>
-void G1SegmentedArrayFreeList<flag>::print_on(outputStream* out, const char* prefix) {
-  out->print_cr("%s: segments %zu size %zu",
-                prefix, Atomic::load(&_num_segments), Atomic::load(&_mem_size));
-}
-
-template<MEMFLAGS flag>
-G1SegmentedArraySegment<flag>* G1SegmentedArrayFreeList<flag>::get() {
+inline G1SegmentedArraySegment* G1SegmentedArrayFreeList::get() {
   GlobalCounter::CriticalSection cs(Thread::current());
 
-  G1SegmentedArraySegment<flag>* result = _list.pop();
+  G1SegmentedArraySegment* result = _list.pop();
   if (result != nullptr) {
     Atomic::dec(&_num_segments, memory_order_relaxed);
     Atomic::sub(&_mem_size, result->mem_size(), memory_order_relaxed);
@@ -83,194 +53,4 @@ G1SegmentedArraySegment<flag>* G1SegmentedArrayFreeList<flag>::get() {
   return result;
 }
 
-template<MEMFLAGS flag>
-G1SegmentedArraySegment<flag>* G1SegmentedArrayFreeList<flag>::get_all(size_t& num_segments,
-                                                                       size_t& mem_size) {
-  GlobalCounter::CriticalSection cs(Thread::current());
-
-  G1SegmentedArraySegment<flag>* result = _list.pop_all();
-  num_segments = Atomic::load(&_num_segments);
-  mem_size = Atomic::load(&_mem_size);
-
-  if (result != nullptr) {
-    Atomic::sub(&_num_segments, num_segments, memory_order_relaxed);
-    Atomic::sub(&_mem_size, mem_size, memory_order_relaxed);
-  }
-  return result;
-}
-
-template<MEMFLAGS flag>
-void G1SegmentedArrayFreeList<flag>::free_all() {
-  size_t num_freed = 0;
-  size_t mem_size_freed = 0;
-  G1SegmentedArraySegment<flag>* cur;
-
-  while ((cur = _list.pop()) != nullptr) {
-    mem_size_freed += cur->mem_size();
-    num_freed++;
-    delete cur;
-  }
-
-  Atomic::sub(&_num_segments, num_freed, memory_order_relaxed);
-  Atomic::sub(&_mem_size, mem_size_freed, memory_order_relaxed);
-}
-
-template <MEMFLAGS flag>
-G1SegmentedArraySegment<flag>* G1SegmentedArray<flag>::create_new_segment(G1SegmentedArraySegment<flag>* const prev) {
-  // Take an existing segment if available.
-  G1SegmentedArraySegment<flag>* next = _free_segment_list->get();
-  if (next == nullptr) {
-    uint prev_num_slots = (prev != nullptr) ? prev->num_slots() : 0;
-    uint num_slots = _alloc_options->next_num_slots(prev_num_slots);
-    next = new G1SegmentedArraySegment<flag>(slot_size(), num_slots, prev);
-  } else {
-    assert(slot_size() == next->slot_size() ,
-           "Mismatch %d != %d", slot_size(), next->slot_size());
-    next->reset(prev);
-  }
-
-  // Install it as current allocation segment.
-  G1SegmentedArraySegment<flag>* old = Atomic::cmpxchg(&_first, prev, next);
-  if (old != prev) {
-    // Somebody else installed the segment, use that one.
-    delete next;
-    return old;
-  } else {
-    // Did we install the first segment in the list? If so, this is also the last.
-    if (prev == nullptr) {
-      _last = next;
-    }
-    // Successfully installed the segment into the list.
-    Atomic::inc(&_num_segments, memory_order_relaxed);
-    Atomic::add(&_mem_size, next->mem_size(), memory_order_relaxed);
-    Atomic::add(&_num_available_slots, next->num_slots(), memory_order_relaxed);
-    return next;
-  }
-}
-
-template <MEMFLAGS flag>
-uint G1SegmentedArray<flag>::slot_size() const {
-  return _alloc_options->slot_size();
-}
-
-template <MEMFLAGS flag>
-G1SegmentedArray<flag>::G1SegmentedArray(const G1SegmentedArrayAllocOptions* alloc_options,
-                                         G1SegmentedArrayFreeList<flag>* free_segment_list) :
-     _alloc_options(alloc_options),
-     _first(nullptr),
-     _last(nullptr),
-     _num_segments(0),
-     _mem_size(0),
-     _free_segment_list(free_segment_list),
-     _num_available_slots(0),
-     _num_allocated_slots(0) {
-  assert(_free_segment_list != nullptr, "precondition!");
-}
-
-template <MEMFLAGS flag>
-G1SegmentedArray<flag>::~G1SegmentedArray() {
-  drop_all();
-}
-
-template <MEMFLAGS flag>
-void G1SegmentedArray<flag>::drop_all() {
-  G1SegmentedArraySegment<flag>* cur = Atomic::load_acquire(&_first);
-
-  if (cur != nullptr) {
-    assert(_last != nullptr, "If there is at least one segment, there must be a last one.");
-
-    G1SegmentedArraySegment<flag>* first = cur;
-#ifdef ASSERT
-    // Check list consistency.
-    G1SegmentedArraySegment<flag>* last = cur;
-    uint num_segments = 0;
-    size_t mem_size = 0;
-    while (cur != nullptr) {
-      mem_size += cur->mem_size();
-      num_segments++;
-
-      G1SegmentedArraySegment<flag>* next = cur->next();
-      last = cur;
-      cur = next;
-    }
-#endif
-    assert(num_segments == _num_segments, "Segment count inconsistent %u %u", num_segments, _num_segments);
-    assert(mem_size == _mem_size, "Memory size inconsistent");
-    assert(last == _last, "Inconsistent last segment");
-
-    _free_segment_list->bulk_add(*first, *_last, _num_segments, _mem_size);
-  }
-
-  _first = nullptr;
-  _last = nullptr;
-  _num_segments = 0;
-  _mem_size = 0;
-  _num_available_slots = 0;
-  _num_allocated_slots = 0;
-}
-
-template <MEMFLAGS flag>
-void* G1SegmentedArray<flag>::allocate() {
-  assert(slot_size() > 0, "instance size not set.");
-
-  G1SegmentedArraySegment<flag>* cur = Atomic::load_acquire(&_first);
-  if (cur == nullptr) {
-    cur = create_new_segment(cur);
-  }
-
-  while (true) {
-    void* slot = cur->get_new_slot();
-    if (slot != nullptr) {
-      Atomic::inc(&_num_allocated_slots, memory_order_relaxed);
-      guarantee(is_aligned(slot, _alloc_options->slot_alignment()),
-                "result " PTR_FORMAT " not aligned at %u", p2i(slot), _alloc_options->slot_alignment());
-      return slot;
-    }
-    // The segment is full. Next round.
-    assert(cur->is_full(), "must be");
-    cur = create_new_segment(cur);
-  }
-}
-
-template <MEMFLAGS flag>
-inline uint G1SegmentedArray<flag>::num_segments() const {
-  return Atomic::load(&_num_segments);
-}
-
-#ifdef ASSERT
-template <MEMFLAGS flag>
-class LengthClosure {
-  uint _total;
-public:
-  LengthClosure() : _total(0) {}
-  void do_segment(G1SegmentedArraySegment<flag>* segment, uint limit) {
-    _total += limit;
-  }
-  uint length() const {
-    return _total;
-  }
-};
-
-template <MEMFLAGS flag>
-uint G1SegmentedArray<flag>::calculate_length() const {
-  LengthClosure<flag> closure;
-  iterate_segments(closure);
-  return closure.length();
-}
-#endif
-
-template <MEMFLAGS flag>
-template <typename SegmentClosure>
-void G1SegmentedArray<flag>::iterate_segments(SegmentClosure& closure) const {
-  G1SegmentedArraySegment<flag>* cur = Atomic::load_acquire(&_first);
-
-  assert((cur != nullptr) == (_last != nullptr),
-         "If there is at least one segment, there must be a last one");
-
-  while (cur != nullptr) {
-    closure.do_segment(cur, cur->length());
-    cur = cur->next();
-  }
-}
-
 #endif //SHARE_GC_G1_G1SEGMENTEDARRAY_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp b/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp
index 4752adde74d..5bef0caca0b 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ bool G1SegmentedArrayFreeMemoryTask::calculate_return_infos(jlong deadline) {
   // Ignore the deadline in this step as it is very short.
 
   G1SegmentedArrayMemoryStats used = _total_used;
-  G1SegmentedArrayMemoryStats free = G1SegmentedArrayFreePool<mtGCCardSet>::free_list_sizes();
+  G1SegmentedArrayMemoryStats free = G1SegmentedArrayFreePool::free_list_sizes();
 
   _return_info = new G1ReturnMemoryProcessorSet(used.num_pools());
   for (uint i = 0; i < used.num_pools(); i++) {
@@ -68,7 +68,7 @@ bool G1SegmentedArrayFreeMemoryTask::calculate_return_infos(jlong deadline) {
     _return_info->append(new G1ReturnMemoryProcessor(return_to_vm_size));
   }
 
-  G1SegmentedArrayFreePool<mtGCCardSet>::update_unlink_processors(_return_info);
+  G1SegmentedArrayFreePool::update_unlink_processors(_return_info);
   return false;
 }
 
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.hpp b/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.hpp
index a4195cd424c..487f553ea7b 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.hpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,8 @@ class G1SegmentedArrayFreeMemoryTask : public G1ServiceTask {
   // Current total segmented array memory usage.
   G1SegmentedArrayMemoryStats _total_used;
 
-  typedef G1SegmentedArrayFreePool<mtGCCardSet>::G1ReturnMemoryProcessor G1ReturnMemoryProcessor;
-  typedef G1SegmentedArrayFreePool<mtGCCardSet>::G1ReturnMemoryProcessorSet G1ReturnMemoryProcessorSet;
+  using G1ReturnMemoryProcessor = G1SegmentedArrayFreePool::G1ReturnMemoryProcessor;
+  using G1ReturnMemoryProcessorSet = G1SegmentedArrayFreePool::G1ReturnMemoryProcessorSet;
 
   G1ReturnMemoryProcessorSet* _return_info;
 
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArrayFreePool.cpp b/src/hotspot/share/gc/g1/g1SegmentedArrayFreePool.cpp
index 118638da75b..10f69405569 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArrayFreePool.cpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArrayFreePool.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,7 @@ void G1SegmentedArrayMemoryStats::clear() {
   }
 }
 
-template<MEMFLAGS flag>
-void G1SegmentedArrayFreePool<flag>::update_unlink_processors(G1ReturnMemoryProcessorSet* unlink_processor) {
+void G1SegmentedArrayFreePool::update_unlink_processors(G1ReturnMemoryProcessorSet* unlink_processor) {
   uint num_free_lists = _freelist_pool.num_free_lists();
 
   for (uint i = 0; i < num_free_lists; i++) {
@@ -52,8 +51,7 @@ void G1SegmentedArrayFreePool<flag>::update_unlink_processors(G1ReturnMemoryProc
   }
 }
 
-template<MEMFLAGS flag>
-void G1SegmentedArrayFreePool<flag>::G1ReturnMemoryProcessor::visit_free_list(G1SegmentedArrayFreeList<flag>* source) {
+void G1SegmentedArrayFreePool::G1ReturnMemoryProcessor::visit_free_list(G1SegmentedArrayFreeList* source) {
   assert(_source == nullptr, "already visited");
   if (_return_to_vm_size > 0) {
     _source = source;
@@ -75,16 +73,15 @@ void G1SegmentedArrayFreePool<flag>::G1ReturnMemoryProcessor::visit_free_list(G1
   }
 }
 
-template<MEMFLAGS flag>
-bool G1SegmentedArrayFreePool<flag>::G1ReturnMemoryProcessor::return_to_vm(jlong deadline) {
+bool G1SegmentedArrayFreePool::G1ReturnMemoryProcessor::return_to_vm(jlong deadline) {
   assert(!finished_return_to_vm(), "already returned everything to the VM");
   assert(_first != nullptr, "must have segment to return");
 
   size_t keep_size = 0;
   size_t keep_num = 0;
 
-  G1SegmentedArraySegment<flag>* cur = _first;
-  G1SegmentedArraySegment<flag>* last = nullptr;
+  G1SegmentedArraySegment* cur = _first;
+  G1SegmentedArraySegment* last = nullptr;
 
   while (cur != nullptr && _return_to_vm_size > 0) {
     size_t cur_size = cur->mem_size();
@@ -125,8 +122,7 @@ bool G1SegmentedArrayFreePool<flag>::G1ReturnMemoryProcessor::return_to_vm(jlong
   return _source != nullptr;
 }
 
-template<MEMFLAGS flag>
-bool G1SegmentedArrayFreePool<flag>::G1ReturnMemoryProcessor::return_to_os(jlong deadline) {
+bool G1SegmentedArrayFreePool::G1ReturnMemoryProcessor::return_to_os(jlong deadline) {
   assert(finished_return_to_vm(), "not finished returning to VM");
   assert(!finished_return_to_os(), "already returned everything to the OS");
 
@@ -135,10 +131,10 @@ bool G1SegmentedArrayFreePool<flag>::G1ReturnMemoryProcessor::return_to_os(jlong
   size_t mem_size_deleted = 0;
 
   while (_first != nullptr) {
-    G1SegmentedArraySegment<flag>* next = _first->next();
+    G1SegmentedArraySegment* next = _first->next();
     num_delete++;
     mem_size_deleted += _first->mem_size();
-    delete _first;
+    G1SegmentedArraySegment::delete_segment(_first);
     _first = next;
 
     // To ensure progress, perform the deadline check here.
@@ -152,29 +148,25 @@ bool G1SegmentedArrayFreePool<flag>::G1ReturnMemoryProcessor::return_to_os(jlong
   return _first != nullptr;
 }
 
-template<MEMFLAGS flag>
-G1SegmentedArrayFreePool<flag> G1SegmentedArrayFreePool<flag>::_freelist_pool(G1CardSetConfiguration::num_mem_object_types());
+G1SegmentedArrayFreePool G1SegmentedArrayFreePool::_freelist_pool(G1CardSetConfiguration::num_mem_object_types());
 
-template<MEMFLAGS flag>
-G1SegmentedArrayFreePool<flag>::G1SegmentedArrayFreePool(uint num_free_lists) :
+G1SegmentedArrayFreePool::G1SegmentedArrayFreePool(uint num_free_lists) :
   _num_free_lists(num_free_lists) {
 
-  _free_lists = NEW_C_HEAP_ARRAY(G1SegmentedArrayFreeList < flag >, _num_free_lists, mtGC);
+  _free_lists = NEW_C_HEAP_ARRAY(G1SegmentedArrayFreeList, _num_free_lists, mtGC);
   for (uint i = 0; i < _num_free_lists; i++) {
-    new (&_free_lists[i]) G1SegmentedArrayFreeList<flag>();
+    new (&_free_lists[i]) G1SegmentedArrayFreeList();
   }
 }
 
-template<MEMFLAGS flag>
-G1SegmentedArrayFreePool<flag>::~G1SegmentedArrayFreePool() {
+G1SegmentedArrayFreePool::~G1SegmentedArrayFreePool() {
   for (uint i = 0; i < _num_free_lists; i++) {
-    _free_lists[i].~G1SegmentedArrayFreeList<flag>();
+    _free_lists[i].~G1SegmentedArrayFreeList();
   }
   FREE_C_HEAP_ARRAY(mtGC, _free_lists);
 }
 
-template<MEMFLAGS flag>
-G1SegmentedArrayMemoryStats G1SegmentedArrayFreePool<flag>::memory_sizes() const {
+G1SegmentedArrayMemoryStats G1SegmentedArrayFreePool::memory_sizes() const {
   G1SegmentedArrayMemoryStats free_list_stats;
   assert(free_list_stats.num_pools() == num_free_lists(), "must be");
   for (uint i = 0; i < num_free_lists(); i++) {
@@ -184,8 +176,7 @@ G1SegmentedArrayMemoryStats G1SegmentedArrayFreePool<flag>::memory_sizes() const
   return free_list_stats;
 }
 
-template<MEMFLAGS flag>
-size_t G1SegmentedArrayFreePool<flag>::mem_size() const {
+size_t G1SegmentedArrayFreePool::mem_size() const {
   size_t result = 0;
   for (uint i = 0; i < _num_free_lists; i++) {
     result += _free_lists[i].mem_size();
@@ -193,13 +184,10 @@ size_t G1SegmentedArrayFreePool<flag>::mem_size() const {
   return result;
 }
 
-template<MEMFLAGS flag>
-void G1SegmentedArrayFreePool<flag>::print_on(outputStream* out) {
+void G1SegmentedArrayFreePool::print_on(outputStream* out) {
   out->print_cr("  Free Pool: size %zu", free_list_pool()->mem_size());
   for (uint i = 0; i < _num_free_lists; i++) {
     FormatBuffer<> fmt("    %s", G1CardSetConfiguration::mem_object_type_name_str(i));
     _free_lists[i].print_on(out, fmt);
   }
 }
-
-template class G1SegmentedArrayFreePool<mtGCCardSet>;
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArrayFreePool.hpp b/src/hotspot/share/gc/g1/g1SegmentedArrayFreePool.hpp
index ba1b952875c..23079c3853f 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArrayFreePool.hpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArrayFreePool.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,13 +56,12 @@ public:
 
 // A set of free lists holding freed segments for use by G1SegmentedArray,
 // e.g. G1CardSetAllocators::SegmentedArray
-template<MEMFLAGS flag>
 class G1SegmentedArrayFreePool {
   // The global free pool.
   static G1SegmentedArrayFreePool _freelist_pool;
 
   const uint _num_free_lists;
-  G1SegmentedArrayFreeList<flag>* _free_lists;
+  G1SegmentedArrayFreeList* _free_lists;
 
 public:
   static G1SegmentedArrayFreePool* free_list_pool() { return &_freelist_pool; }
@@ -76,7 +75,7 @@ public:
   explicit G1SegmentedArrayFreePool(uint num_free_lists);
   ~G1SegmentedArrayFreePool();
 
-  G1SegmentedArrayFreeList<flag>* free_list(uint i) {
+  G1SegmentedArrayFreeList* free_list(uint i) {
     assert(i < _num_free_lists, "must be");
     return &_free_lists[i];
   }
@@ -91,12 +90,11 @@ public:
 
 // Data structure containing current in-progress state for returning memory to the
 // operating system for a single G1SegmentedArrayFreeList.
-template<MEMFLAGS flag>
-class G1SegmentedArrayFreePool<flag>::G1ReturnMemoryProcessor : public CHeapObj<mtGC> {
-  G1SegmentedArrayFreeList<flag>* _source;
+class G1SegmentedArrayFreePool::G1ReturnMemoryProcessor : public CHeapObj<mtGC> {
+  G1SegmentedArrayFreeList* _source;
   size_t _return_to_vm_size;
 
-  G1SegmentedArraySegment<flag>* _first;
+  G1SegmentedArraySegment* _first;
   size_t _unlinked_bytes;
   size_t _num_unlinked;
 
@@ -108,7 +106,7 @@ public:
   // Updates the instance members about the given free list for
   // the purpose of giving back memory. Only necessary members are updated,
   // e.g. if there is nothing to return to the VM, do not set the source list.
-  void visit_free_list(G1SegmentedArrayFreeList<flag>* source);
+  void visit_free_list(G1SegmentedArrayFreeList* source);
 
   bool finished_return_to_vm() const { return _return_to_vm_size == 0; }
   bool finished_return_to_os() const { return _first == nullptr; }
diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.cpp b/src/hotspot/share/gc/g1/heapRegionRemSet.cpp
index 9e6c31ffdc1..9b661768ae1 100644
--- a/src/hotspot/share/gc/g1/heapRegionRemSet.cpp
+++ b/src/hotspot/share/gc/g1/heapRegionRemSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,7 +81,7 @@ HeapRegionRemSet::HeapRegionRemSet(HeapRegion* hr,
                                    G1CardSetConfiguration* config) :
   _m(Mutex::service - 1, FormatBuffer<128>("HeapRegionRemSet#%u_lock", hr->hrm_index())),
   _code_roots(),
-  _card_set_mm(config, G1SegmentedArrayFreePool<mtGCCardSet>::free_list_pool()),
+  _card_set_mm(config, G1SegmentedArrayFreePool::free_list_pool()),
   _card_set(config, &_card_set_mm),
   _hr(hr),
   _state(Untracked) { }
-- 
GitLab


From f8a164915fff5e9e8f3c9c1996b51e7e4fe5d68d Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 25 Mar 2022 15:07:44 +0000
Subject: [PATCH 211/345] 8274735: javax.imageio.IIOException: Unsupported
 Image Type  while processing a valid JPEG image

Reviewed-by: kizune, serb
---
 .../plugins/common/SimpleCMYKColorSpace.java  |   2 +-
 .../imageio/plugins/jpeg/JPEGImageReader.java |  62 ++++++
 .../imageio/plugins/jpeg/JPEGImageWriter.java |  21 ++
 .../plugins/jpeg/CMYK/CMYKJPEGTest.java       | 200 ++++++++++++++++++
 .../imageio/plugins/jpeg/CMYK/black_cmyk.jpg  | Bin 0 -> 220 bytes
 .../imageio/plugins/jpeg/CMYK/blue_cmyk.jpg   | Bin 0 -> 220 bytes
 .../imageio/plugins/jpeg/CMYK/cyan_cmyk.jpg   | Bin 0 -> 220 bytes
 .../imageio/plugins/jpeg/CMYK/gray_cmyk.jpg   | Bin 0 -> 214 bytes
 .../imageio/plugins/jpeg/CMYK/green_cmyk.jpg  | Bin 0 -> 220 bytes
 .../plugins/jpeg/CMYK/magenta_cmyk.jpg        | Bin 0 -> 220 bytes
 .../imageio/plugins/jpeg/CMYK/red_cmyk.jpg    | Bin 0 -> 220 bytes
 .../imageio/plugins/jpeg/CMYK/white_cmyk.jpg  | Bin 0 -> 220 bytes
 .../imageio/plugins/jpeg/CMYK/yellow_cmyk.jpg | Bin 0 -> 220 bytes
 13 files changed, 284 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/CMYKJPEGTest.java
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/black_cmyk.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/blue_cmyk.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/cyan_cmyk.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/gray_cmyk.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/green_cmyk.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/magenta_cmyk.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/red_cmyk.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/white_cmyk.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/CMYK/yellow_cmyk.jpg

diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
index 75586561598..a5c283e6c9c 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleCMYKColorSpace.java
@@ -63,7 +63,7 @@ public final class SimpleCMYKColorSpace extends ColorSpace {
     }
 
     public int hashCode() {
-        return theInstance.hashCode();
+        return System.identityHashCode(theInstance);
     }
 
     public float[] toRGB(float[] colorvalue) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
index dac1b79d4ea..e1839777480 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
@@ -35,6 +35,7 @@ import javax.imageio.stream.ImageInputStream;
 import javax.imageio.plugins.jpeg.JPEGImageReadParam;
 import javax.imageio.plugins.jpeg.JPEGQTable;
 import javax.imageio.plugins.jpeg.JPEGHuffmanTable;
+import com.sun.imageio.plugins.common.SimpleCMYKColorSpace;
 
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -164,6 +165,12 @@ public class JPEGImageReader extends ImageReader {
     /** If we need to post-convert in Java, convert with this op */
     private ColorConvertOp convert = null;
 
+    /** If reading CMYK as an Image, flip the bytes */
+    private boolean invertCMYK = false;
+
+    /** Whether to read as a raster */
+    private boolean readAsRaster = false;
+
     /** The image we are going to fill */
     private BufferedImage image = null;
 
@@ -938,6 +945,32 @@ public class JPEGImageReader extends ImageReader {
         ArrayList<ImageTypeProducer> list = new ArrayList<ImageTypeProducer>(1);
 
         switch (colorSpaceCode) {
+        case JPEG.JCS_YCCK:
+        case JPEG.JCS_CMYK:
+            // There's no standard CMYK ColorSpace in JDK so raw.getType()
+            // will return null so skip that.
+            // And we can't add RGB because the number of bands is different.
+            // So need to create our own special that is 4 channels and uses
+            // the iccCS ColorSpace based on profile data in the image, and
+            // if there is none, on the internal CMYKColorSpace class
+            if (iccCS == null) {
+                iccCS = SimpleCMYKColorSpace.getInstance();
+            }
+            if (iccCS != null) {
+                list.add(new ImageTypeProducer(colorSpaceCode) {
+                    @Override
+                    protected ImageTypeSpecifier produce() {
+                        int [] bands = {0, 1, 2, 3};
+                        return ImageTypeSpecifier.createInterleaved
+                         (iccCS,
+                          bands,
+                          DataBuffer.TYPE_BYTE,
+                          false,
+                          false);
+                    }
+                });
+            }
+            break;
         case JPEG.JCS_GRAYSCALE:
             list.add(raw);
             list.add(getImageType(JPEG.JCS_RGB));
@@ -1019,6 +1052,8 @@ public class JPEGImageReader extends ImageReader {
         int csType = cs.getType();
         convert = null;
         switch (outColorSpaceCode) {
+        case JPEG.JCS_CMYK:  // Its CMYK in the file
+            break;
         case JPEG.JCS_GRAYSCALE:  // Its gray in the file
             if  (csType == ColorSpace.TYPE_RGB) { // We want RGB
                 // IJG can do this for us more efficiently
@@ -1144,6 +1179,8 @@ public class JPEGImageReader extends ImageReader {
     private Raster readInternal(int imageIndex,
                                 ImageReadParam param,
                                 boolean wantRaster) throws IOException {
+
+        readAsRaster = wantRaster;
         readHeader(imageIndex, false);
 
         WritableRaster imRas = null;
@@ -1186,6 +1223,16 @@ public class JPEGImageReader extends ImageReader {
             image = null;
         }
 
+         // Adobe seems to have decided that the bytes in CMYK JPEGs
+         // should be stored inverted. So we need some extra logic to
+         // flip them in that case. Don't flip for the raster case
+         // so code that is reading these as rasters today won't
+         // see a change in behaviour.
+         invertCMYK =
+             (!wantRaster &&
+              ((colorSpaceCode == JPEG.JCS_YCCK) ||
+               (colorSpaceCode == JPEG.JCS_CMYK)));
+
         // Create an intermediate 1-line Raster that will hold the decoded,
         // subsampled, clipped, band-selected image data in a single
         // byte-interleaved buffer.  The above transformations
@@ -1363,6 +1410,21 @@ public class JPEGImageReader extends ImageReader {
      * After the copy, we notify update listeners.
      */
     private void acceptPixels(int y, boolean progressive) {
+
+        /*
+         * CMYK JPEGs seems to be universally inverted at the byte level.
+         * Fix this here before storing.
+         * For "compatibility" don't do this if the target is a raster.
+         * Need to do this here in case the application is listening
+         * for line-by-line updates to the image.
+         */
+        if (invertCMYK) {
+            byte[] data = ((DataBufferByte)raster.getDataBuffer()).getData();
+            for (int i = 0, len = data.length; i < len; i++) {
+                data[i] = (byte)(0x0ff - (data[i] & 0xff));
+            }
+        }
+
         if (convert != null) {
             convert.filter(raster, raster);
         }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
index 31acae628a1..fcce8f60495 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
@@ -131,6 +131,7 @@ public class JPEGImageWriter extends ImageWriter {
     private int newAdobeTransform = JPEG.ADOBE_IMPOSSIBLE;  // Change if needed
     private boolean writeDefaultJFIF = false;
     private boolean writeAdobe = false;
+    private boolean invertCMYK = false;
     private JPEGMetadata metadata = null;
 
     private boolean sequencePrepared = false;
@@ -654,6 +655,7 @@ public class JPEGImageWriter extends ImageWriter {
         newAdobeTransform = JPEG.ADOBE_IMPOSSIBLE;  // Change if needed
         writeDefaultJFIF = false;
         writeAdobe = false;
+        invertCMYK = false;
 
         // By default we'll do no conversion:
         int inCsType = JPEG.JCS_UNKNOWN;
@@ -807,6 +809,14 @@ public class JPEGImageWriter extends ImageWriter {
                                 }
                             }
                             break;
+                         case ColorSpace.TYPE_CMYK:
+                             outCsType = JPEG.JCS_CMYK;
+                             if (jfif != null) {
+                                 ignoreJFIF = true;
+                                 warningOccurred
+                                 (WARNING_IMAGE_METADATA_JFIF_MISMATCH);
+                             }
+                             break;
                         }
                     }
                 } // else no dest, metadata, not an image.  Defaults ok
@@ -1013,6 +1023,11 @@ public class JPEGImageWriter extends ImageWriter {
             System.out.println("outCsType: " + outCsType);
         }
 
+        invertCMYK =
+            (!rasterOnly &&
+             ((outCsType == JPEG.JCS_YCCK) ||
+              (outCsType == JPEG.JCS_CMYK)));
+
         // Note that getData disables acceleration on buffer, but it is
         // just a 1-line intermediate data transfer buffer that does not
         // affect the acceleration of the source image.
@@ -1721,6 +1736,12 @@ public class JPEGImageWriter extends ImageWriter {
                                         srcBands);
         }
         raster.setRect(sourceLine);
+        if (invertCMYK) {
+            byte[] data = ((DataBufferByte)raster.getDataBuffer()).getData();
+            for (int i = 0, len = data.length; i < len; i++) {
+                data[i] = (byte)(0x0ff - (data[i] & 0xff));
+            }
+        }
         if ((y > 7) && (y%8 == 0)) {  // Every 8 scanlines
             cbLock.lock();
             try {
diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/CMYKJPEGTest.java b/test/jdk/javax/imageio/plugins/jpeg/CMYK/CMYKJPEGTest.java
new file mode 100644
index 00000000000..db4588d29c7
--- /dev/null
+++ b/test/jdk/javax/imageio/plugins/jpeg/CMYK/CMYKJPEGTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ *
+ * This test verifies that using the built-in ImageI/O JPEG plugin that JPEG images
+ * that are in a CMYK ColorSpace can be read into a BufferedImage using the convemience
+ * APIS and that and the colours are properly interpreted.
+ * Since there is no standard JDK CMYK ColorSpace, this requires that either the image
+ * contain an ICC_Profile which can be used by the plugin to create an ICC_ColorSpace
+ * or that the plugin provides a suitable default CMYK ColorSpace instance by some other means.
+ *
+ * The test further verifies that the resultant BufferedImage will be re-written as a CMYK
+ * BufferedImage. It can do this so long as the BufferedImage has that CMYK ColorSpace
+ * used by its ColorModel.
+ *
+ * The verification requires re-reading again the re-written image and checking the
+ * re-read image still has a CMYK ColorSpace and the same colours.
+ *
+ * Optionally - not for use in the test harness - the test can be passed a parameter
+ * -display to create a UI which renders all the images the test is
+ * verifying so it can be manually verified
+ */
+
+/*
+ * @test
+ * @bug 8274735
+ * @summary Verify CMYK JPEGs can be read and written
+ */
+
+import java.awt.Color;
+import static java.awt.Color.*;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.GridLayout;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+public class CMYKJPEGTest {
+
+    static String[] fileNames = {
+        "black_cmyk.jpg",
+        "white_cmyk.jpg",
+        "gray_cmyk.jpg",
+        "red_cmyk.jpg",
+        "blue_cmyk.jpg",
+        "green_cmyk.jpg",
+        "cyan_cmyk.jpg",
+        "magenta_cmyk.jpg",
+        "yellow_cmyk.jpg",
+    };
+
+    static Color[] colors = {
+         black,
+         white,
+         gray,
+         red,
+         blue,
+         green,
+         cyan,
+         magenta,
+         yellow,
+    };
+
+    static boolean display;
+
+    static BufferedImage[] readImages;
+    static BufferedImage[] writtenImages;
+    static int imageIndex = 0;
+
+    public static void main(String[] args) throws Exception {
+
+        if (args.length > 0) {
+            display = "-display".equals(args[0]);
+        }
+
+        String sep = System.getProperty("file.separator");
+        String dir = System.getProperty("test.src", ".");
+        String prefix = dir+sep;
+
+        readImages = new BufferedImage[fileNames.length];
+        writtenImages = new BufferedImage[fileNames.length];
+
+        for (String fileName : fileNames) {
+            String color = fileName.replace("_cmyk.jpg", "");
+            test(prefix+fileName, color, imageIndex++);
+        }
+        if (display) {
+            SwingUtilities.invokeAndWait(() -> createUI());
+        }
+    }
+
+    static void test(String fileName, String color, int index)
+                 throws IOException {
+
+        readImages[index] = ImageIO.read(new File(fileName));
+        verify(readImages[index], color, colors[index]);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ImageIO.write(readImages[index], "jpg", baos);
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        writtenImages[index] = ImageIO.read(bais);
+        verify(writtenImages[index], color, colors[index]);
+    }
+
+    static void verify(BufferedImage img, String colorName, Color c) {
+        ColorModel cm = img.getColorModel();
+        int tc = cm.getNumComponents();
+        int cc = cm.getNumColorComponents();
+        if (cc != 4 || tc != 4) {
+            throw new RuntimeException("Unexpected num comp for " + img);
+        }
+
+        int rgb = img.getRGB(0,0);
+        int c_red = c.getRed();
+        int c_green = c.getGreen();
+        int c_blue = c.getBlue();
+        int i_red =   (rgb & 0x0ff0000) >> 16;
+        int i_green = (rgb & 0x000ff00) >> 8;
+        int i_blue =  (rgb & 0x00000ff);
+        int tol = 16;
+        if ((Math.abs(i_red - c_red) > tol) ||
+            (Math.abs(i_green - c_green) > tol) ||
+            (Math.abs(i_blue - c_blue) > tol))
+        {
+           System.err.println("red="+i_red+" green="+i_green+" blue="+i_blue);
+           throw new RuntimeException("Too different " + img + " " + colorName + " " + c);
+        }
+    }
+
+    static class ImageComp extends JComponent {
+
+        BufferedImage img;
+
+        ImageComp(BufferedImage img) {
+           this.img = img;
+        }
+
+        public Dimension getPreferredSize() {
+            return new Dimension(img.getWidth(), img.getHeight());
+        }
+
+        public Dimension getMinimumSize() {
+           return getPreferredSize();
+        }
+
+        public void paintComponent(Graphics g) {
+           super.paintComponent(g);
+           g.drawImage(img, 0, 0, null);
+        }
+    }
+
+    static void createUI() {
+        JFrame f = new JFrame("CMYK JPEG Test");
+        JPanel p = new JPanel();
+        p.setLayout(new GridLayout(3, colors.length, 10, 10));
+        for (String s :  fileNames) {
+           p.add(new JLabel(s.replace("_cmyk.jpg", "")));
+        }
+        for (BufferedImage i : readImages) {
+            p.add(new ImageComp(i));
+        }
+        for (BufferedImage i : writtenImages) {
+            p.add(new ImageComp(i));
+        }
+        f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        f.add(p);
+        f.pack();
+        f.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/black_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/black_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1446f063bddf0c80a63a4a9da213b5560ad1d236
GIT binary patch
literal 220
zcmZ9FO%8%E6odz<O<#f10^WgJ7(+rt!p;p_gKJOYeO!15e>R@LD?D2_M8A2NOeT35
zzVQoo*LE$UD8kkY{D#>~r^68w0{ldSco7I5dxR7LCFN3*(wY>JPV-bJCLzjPW^!wt
z)oD={w)ENZ1(iaLS~L!W!|2dE@D(dR{GFMNd|lc97W{w_4F-(pfi=$E-rxN8oA~|#
DH1{1W

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/blue_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/blue_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..74aa67622e47c65cfeafda3faca6c913be204b39
GIT binary patch
literal 220
zcmZ9FOAdlC7=))%o3=n{0q?*qj3FT+VdsXe!L_Gx@7hzi@DM&Wp1>>owr+@ilT0R)
zOondsg55N21I8HEUZ6M3YCP=r7!jZ+YDBX@@W{gj4@e>ALP@QaR7xjVqGJ;)mAceq
z);g<`yvS|gv!x44i3%039eRhsp>v=s7XJ8qGnw*rY5!Z$1BTb=F`xsMIJVofK25XV
GME4IkcpXjv

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/cyan_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/cyan_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4e97acc33c29f5630927789afc21d3532d027f57
GIT binary patch
literal 220
zcmZ9FOAdlC7=#C@O<SO}fOp^)#*h$&Z~(RhH*P$QS76~OTzCi{8&BXBep@$0zey&O
zNhU)#dcidHu0{|9*gApU(3|l%>@mVaPgDpO9`B)papn=6FS!&-Ng<_*(^y41k}|Q0
zPK~if#aW)2++{--6apnmR#|iwy+vz5SFGIe_hvTf>cafDpa(Ro(4j{QtZ{0l^I@82
HzlrW2O;sKT

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/gray_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/gray_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a519437e702e9b6d097595ced0e8410f2864908c
GIT binary patch
literal 214
zcmZXNO$x#=6oe->h9phXm$rxKEkp`MEj>WDQrBM5g@^EG;|aXNGjUb)8yJRRVED!_
z(4pV=5JF%V1%AVC=kxJ|83}%(L$*pJ&mvOEgjQ;;jJDQjW2`Hk&3$f65ei=t1+uQH
tE2?8AzM#=)(aJ7h4449j0KTGu_`WPGwe;UU;AMvq69!<j*#AVne*jvT8odAj

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/green_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/green_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c5c4af371314eb9bc7dbcd8e35ab725fc3b76cd9
GIT binary patch
literal 220
zcmZ9FOAdlC7=#C@O<SO}fOp^)#*h$&Z~(Rh*WSZDSKu5jJcN&pC-4fttsA1>B$LS`
zlc5{EV4C_+BM1WQoj`Bs-FO;~7~!EODugSK_t3#O^9at@TneS6kW$5ItRfvrnb<_9
z##p1`EYD2tvY`tKff6OFEINzcqP3taHtzU)vzT;sVg6gt1DaLn(4z&mn3{Py&&%vL
G(ftEXbRH4_

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/magenta_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/magenta_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9209e1f82b9d3ed1fcc17619bb13f4bee987b13e
GIT binary patch
literal 220
zcmZ9FOAdlC7=))%o3=n{0q?*qj3FT^VdsXe!G$Yt<$_bV@DM&Wp1>>owr+@ilT0R)
zOondsg55To28=PRy+Ci6)o|J$Fd#rr)QDz*;E{(59*{!Jg_2q;sgzE#M8_spDs`#J
ztaVl=d6C<~XG<595)~?5J9G}cL+e0SEd25JW-{gL(*C!g2Mn*#p+^fWF&=lLK2NjX
GME4IrnjMJ%

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/red_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/red_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..594f2ac082355fcf437a9799a40b71ac6522e208
GIT binary patch
literal 220
zcmZ9FI|{-;7=$NgUH0F+c9VFA+(IM}G$EZ$T8Xu%vA6aV79PS!;|aXN@2*YIZ(tY(
zhT$8(VA^KWAP54ioxpFTtMRbgV}ysFs1eRQ-b06w!lR^|OHx{sBGPdd>nM$g5}Tx%
zG1llfFLG13Z1{pwp+Y5Ui{4_e=q&h(g**P<Oh&FQ&3_AiAQd%w4CsI*&a^$Yr)l<^
G`2GPm_Z?0E

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/white_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/white_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..319bbb364706102d0d45c886413bf38bfb005a79
GIT binary patch
literal 220
zcmZ9FO%8%E6odz<O<#f10^WgJ7(+r-!U5PC+_>>pE<A+`58=<o6L^JZ>xSqzFO$h6
zFT*!}!EW14izte)_5#0QR^xHE$A|zw(IB1$g2x^qML<b8m!z~NMWoX_)rm=nGMAa$
zT4!}yl!YyQwtPXQP@@)&L+>y+bPjyQ!ViCECL>>0_P+%`U_^r+13F-d^Wo%gdiza$
F{{U0f9y|a5

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/CMYK/yellow_cmyk.jpg b/test/jdk/javax/imageio/plugins/jpeg/CMYK/yellow_cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4a7a338b256997d8d84290a4418ac9ebd3862648
GIT binary patch
literal 220
zcmZ9FOAdlC7=#C@O<SO}fOp^)#*h$&Z~(RhH*P$QS76~OTzCi{8&BXBep@$0zey&O
zNhU)#dcidHu0{|9*gApU(3|l%>@mVaPgDpO9`B)papn=6FS!&-Ng<_*(^y41k}|Q0
zPK~if#aW)2++{--6apnmR#|iwy+vz5SFGIe_hvTf>cafDpa(Ro(4j{QtZ_a}r)HXG
HzlrW2P4pfI

literal 0
HcmV?d00001

-- 
GitLab


From 656cba7af376d6460202591230ac95d2366de9f3 Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Fri, 25 Mar 2022 17:08:25 +0000
Subject: [PATCH 212/345] 8283349: Robustness improvements to
 java/util/prefs/AddNodeChangeListener.jar

Reviewed-by: dfuchs, naoto, lancea
---
 .../util/prefs/AddNodeChangeListener.java     | 93 +++++++++++--------
 1 file changed, 53 insertions(+), 40 deletions(-)

diff --git a/test/jdk/java/util/prefs/AddNodeChangeListener.java b/test/jdk/java/util/prefs/AddNodeChangeListener.java
index d63ffed36b7..11a771f93e3 100644
--- a/test/jdk/java/util/prefs/AddNodeChangeListener.java
+++ b/test/jdk/java/util/prefs/AddNodeChangeListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,75 +34,88 @@ import java.util.prefs.*;
 public class AddNodeChangeListener {
 
     private static final int SLEEP_ITRS = 10;
+    private static final String N2_STR = "N2";
     private static boolean failed = false;
     private static Preferences userRoot, N2;
     private static NodeChangeListenerAdd ncla;
 
     public static void main(String[] args)
              throws BackingStoreException, InterruptedException {
-        userRoot = Preferences.userRoot();
-        ncla = new NodeChangeListenerAdd();
-        userRoot.addNodeChangeListener(ncla);
-        //Should initiate a node added event
-        addNode();
-        // Should not initiate a node added event
-        addNode();
-        //Should initate a child removed event
-        removeNode();
-
-        if (failed) {
-            throw new RuntimeException("Failed");
+        try {
+            userRoot = Preferences.userRoot();
+            // Make sure test node is not present before test
+            clearPrefs();
+
+            ncla = new NodeChangeListenerAdd();
+            userRoot.addNodeChangeListener(ncla);
+            //Should initiate a node added event
+            addNode();
+            // Should not initiate a node added event
+            addNode();
+            //Should initate a child removed event
+            removeNode();
+
+            if (failed) {
+                throw new RuntimeException("Failed");
+            }
+        } finally {
+            // Make sure test node is not present after the test
+            clearPrefs();
         }
     }
 
     private static void addNode()
             throws BackingStoreException, InterruptedException {
-        N2 = userRoot.node("N2");
+        N2 = userRoot.node(N2_STR);
         userRoot.flush();
-        int passItr = -1;
-
-        for (int i = 0; i < SLEEP_ITRS; i++) {
-            System.out.print("addNode sleep iteration " + i + "...");
-            Thread.sleep(3000);
-            System.out.println("done.");
-            if (ncla.getAddNumber() == 1) {
-                passItr = i;
-                break;
-            }
-        }
-        checkPassItr(passItr, "addNode()");
+        checkAndSleep(1, "addNode");
     }
 
     private static void removeNode()
             throws BackingStoreException, InterruptedException {
         N2.removeNode();
         userRoot.flush();
-        int passItr = -1;
+        checkAndSleep(0, "removeNode");
+    }
 
+    /* Check for the expected value in the listener (1 after addNode(), 0 after removeNode()).
+     * Sleep a few extra times in a loop, if needed, for debugging purposes, to
+     * see if the event gets delivered late.
+     */
+    private static void checkAndSleep(int expectedListenerVal, String methodName) throws InterruptedException {
+        int expectedItr = -1; // iteration in which the expected value was retrieved from the listener, or -1 if never
         for (int i = 0; i < SLEEP_ITRS; i++) {
-            System.out.print("removeNode sleep iteration " + i + "...");
+            System.out.print(methodName + " sleep iteration " + i + "...");
             Thread.sleep(3000);
             System.out.println("done.");
-            if (ncla.getAddNumber() == 0) {
-                passItr = i;
+            if (ncla.getAddNumber() == expectedListenerVal) {
+                expectedItr = i;
                 break;
             }
         }
-        checkPassItr(passItr, "removeNode()");
-    }
 
-    /* If the listener wasn't notified on iteration 0, throw a RuntimeException
-     * with some contextual information
-     */
-    private static void checkPassItr(int itr, String methodName) {
-        if (itr == 0) {
+        if (expectedItr == 0) {
             System.out.println(methodName + " test passed");
         } else {
             failed = true;
-            if (itr == -1) {
-                throw new RuntimeException("Failed in " + methodName + " - change listener never notified");
+            if (expectedItr == -1) {
+                System.out.println("Failed in " + methodName + " - change listener never notified");
             } else {
-                throw new RuntimeException("Failed in " + methodName + " - listener notified on iteration " + itr);
+                System.out.println("Failed in " + methodName + " - listener notified on iteration " + expectedItr);
+            }
+        }
+    }
+
+    /* Check if the node already exists in userRoot, and remove it if so. */
+    private static void clearPrefs() throws BackingStoreException {
+        if (userRoot.nodeExists(N2_STR)) {
+            System.out.println("Node " + N2_STR + " already/still exists; clearing");
+            Preferences clearNode = userRoot.node(N2_STR);
+            userRoot.flush();
+            clearNode.removeNode();
+            userRoot.flush();
+            if (userRoot.nodeExists(N2_STR)) {
+                throw new RuntimeException("Unable to clear pre-existing node." + (failed ? " Also, the test failed" : ""));
             }
         }
     }
-- 
GitLab


From 3b5dfee939dda02e14498baa2b52b0150326b938 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Fri, 25 Mar 2022 17:10:59 +0000
Subject: [PATCH 213/345] 8283665: Two Jarsigner tests needs to be updated with
 JDK-8267319

Reviewed-by: xuelei, ascarpino, hchao, weijun
---
 .../security/tools/jarsigner/CheckAlgParams.java   | 14 +++++++-------
 .../security/tools/jarsigner/DisableCurveTest.java | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/jdk/sun/security/tools/jarsigner/CheckAlgParams.java b/test/jdk/sun/security/tools/jarsigner/CheckAlgParams.java
index d0a4338fee3..9f96511182e 100644
--- a/test/jdk/sun/security/tools/jarsigner/CheckAlgParams.java
+++ b/test/jdk/sun/security/tools/jarsigner/CheckAlgParams.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8277474
+ * @bug 8277474 8283665
  * @summary jarsigner -verify should check if the algorithm parameters of
  *          its signature algorithm use disabled or legacy algorithms
  * @library /test/lib
@@ -56,29 +56,29 @@ public class CheckAlgParams {
                 .shouldHaveExitValue(0);
 
         Files.writeString(Files.createFile(Paths.get(JAVA_SECURITY_FILE)),
-                "jdk.jar.disabledAlgorithms=SHA256\n" +
+                "jdk.jar.disabledAlgorithms=SHA384\n" +
                 "jdk.security.legacyAlgorithms=\n");
 
         SecurityTools.jarsigner("-verify signeda.jar " +
                 "-J-Djava.security.properties=" +
                 JAVA_SECURITY_FILE +
                 " -keystore ks -storepass changeit -verbose -debug")
-                .shouldMatch("Digest algorithm: SHA-256.*(disabled)")
-                .shouldMatch("Signature algorithm: RSASSA-PSS using PSSParameterSpec.*hashAlgorithm=SHA-256.*(disabled)")
+                .shouldMatch("Digest algorithm: SHA-384.*(disabled)")
+                .shouldMatch("Signature algorithm: RSASSA-PSS using PSSParameterSpec.*hashAlgorithm=SHA-384.*(disabled)")
                 .shouldContain("The jar will be treated as unsigned")
                 .shouldHaveExitValue(0);
 
         Files.deleteIfExists(Paths.get(JAVA_SECURITY_FILE));
         Files.writeString(Files.createFile(Paths.get(JAVA_SECURITY_FILE)),
                 "jdk.jar.disabledAlgorithms=\n" +
-                "jdk.security.legacyAlgorithms=SHA256\n");
+                "jdk.security.legacyAlgorithms=SHA384\n");
 
         SecurityTools.jarsigner("-verify signeda.jar " +
                 "-J-Djava.security.properties=" +
                 JAVA_SECURITY_FILE +
                 " -keystore ks -storepass changeit -verbose -debug")
-                .shouldMatch("Digest algorithm: SHA-256.*(weak)")
-                .shouldMatch("Signature algorithm: RSASSA-PSS using PSSParameterSpec.*hashAlgorithm=SHA-256.*(weak)")
+                .shouldMatch("Digest algorithm: SHA-384.*(weak)")
+                .shouldMatch("Signature algorithm: RSASSA-PSS using PSSParameterSpec.*hashAlgorithm=SHA-384.*(weak)")
                 .shouldNotContain("The jar will be treated as unsigned")
                 .shouldHaveExitValue(0);
     }
diff --git a/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java b/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java
index 9270899182c..353f82ad4b2 100644
--- a/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java
+++ b/test/jdk/sun/security/tools/jarsigner/DisableCurveTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8282633
+ * @bug 8282633 8283665
  * @summary jarsigner should display the named curve to better explain why
  *          an EC key is disabled or will be disabled.
  * @library /test/lib
@@ -42,7 +42,7 @@ public class DisableCurveTest {
 
     public static void main(String[] args) throws Exception{
         SecurityTools.keytool("-keystore ks -storepass changeit " +
-                "-genkeypair -keyalg EC -alias ca -dname CN=CA " +
+                "-genkeypair -keyalg EC -keysize 256 -alias ca -dname CN=CA " +
                 "-ext bc:c")
                 .shouldHaveExitValue(0);
 
@@ -58,7 +58,7 @@ public class DisableCurveTest {
                 JAVA_SECURITY_FILE +
                 " a.jar ca")
                 .shouldContain(">>> Signer")
-                .shouldContain("Signature algorithm: SHA256withECDSA, 256-bit EC (secp256r1) key (disabled)")
+                .shouldContain("Signature algorithm: SHA384withECDSA, 256-bit EC (secp256r1) key (disabled)")
                 .shouldContain("Warning:")
                 .shouldContain("The EC (secp256r1) signing key has a keysize of 256 which is considered a security risk and is disabled")
                 .shouldHaveExitValue(0);
@@ -68,7 +68,7 @@ public class DisableCurveTest {
                 JAVA_SECURITY_FILE +
                 " -keystore ks -storepass changeit -verbose -debug")
                 .shouldContain("- Signed by")
-                .shouldContain("Signature algorithm: SHA256withECDSA, 256-bit EC (secp256r1) key (disabled)")
+                .shouldContain("Signature algorithm: SHA384withECDSA, 256-bit EC (secp256r1) key (disabled)")
                 .shouldContain("WARNING: The jar will be treated as unsigned")
                 .shouldHaveExitValue(0);
 
@@ -82,7 +82,7 @@ public class DisableCurveTest {
                 JAVA_SECURITY_FILE +
                 " a.jar ca")
                 .shouldContain(">>> Signer")
-                .shouldContain("Signature algorithm: SHA256withECDSA, 256-bit EC (secp256r1) key (weak)")
+                .shouldContain("Signature algorithm: SHA384withECDSA, 256-bit EC (secp256r1) key (weak)")
                 .shouldContain("Warning:")
                 .shouldContain("The EC (secp256r1) signing key has a keysize of 256 which is considered a security risk. This key size will be disabled in a future update")
                 .shouldHaveExitValue(0);
@@ -92,7 +92,7 @@ public class DisableCurveTest {
                 JAVA_SECURITY_FILE +
                 " -keystore ks -storepass changeit -verbose -debug")
                 .shouldContain("- Signed by")
-                .shouldContain("Signature algorithm: SHA256withECDSA, 256-bit EC (secp256r1) key (weak)")
+                .shouldContain("Signature algorithm: SHA384withECDSA, 256-bit EC (secp256r1) key (weak)")
                 .shouldContain("jar verified")
                 .shouldContain("The EC (secp256r1) signing key has a keysize of 256 which is considered a security risk. This key size will be disabled in a future update")
                 .shouldHaveExitValue(0);
-- 
GitLab


From f4fd53d0aee67319bf2c7bcaa671c2e97e66383f Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Fri, 25 Mar 2022 18:10:45 +0000
Subject: [PATCH 214/345] 8273370: Preferences.exportSubtree() generates
 invalid XML if value contains control char

Reviewed-by: lancea, naoto
---
 .../xml/internal/serializer/ToStream.java     |  23 ++-
 .../unittest/transform/OpenJDK100017Test.java |  14 +-
 .../unittest/transform/SerializationTest.java | 160 ++++++++++++++++++
 .../jaxp/unittest/transform/preferences.xml   |  12 ++
 4 files changed, 194 insertions(+), 15 deletions(-)
 create mode 100644 test/jaxp/javax/xml/jaxp/unittest/transform/SerializationTest.java
 create mode 100644 test/jaxp/javax/xml/jaxp/unittest/transform/preferences.xml

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
index 93a4dd8d301..126f5d15255 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,6 +20,7 @@
 
 package com.sun.org.apache.xml.internal.serializer;
 
+import com.sun.org.apache.xerces.internal.util.XMLChar;
 import com.sun.org.apache.xml.internal.serializer.dom3.DOMConstants;
 import com.sun.org.apache.xml.internal.serializer.utils.MsgKey;
 import com.sun.org.apache.xml.internal.serializer.utils.Utils;
@@ -54,7 +55,7 @@ import org.xml.sax.SAXException;
  * serializers (xml, html, text ...) that write output to a stream.
  *
  * @xsl.usage internal
- * @LastModified: June 2021
+ * @LastModified: Mar 2022
  */
 abstract public class ToStream extends SerializerBase {
 
@@ -1745,13 +1746,19 @@ abstract public class ToStream extends SerializerBase {
             }
             else
             {
-                /*  This if check is added to support control characters in XML 1.1.
-                 *  If a character is a Control Character within C0 and C1 range, it is desirable
-                 *  to write it out as Numeric Character Reference(NCR) regardless of XML Version
-                 *  being used for output document.
+                /*
+                 *  The check was added to support control characters in XML 1.1.
+                 *  It previously wrote Control Characters within C0 and C1 range
+                 *  as Numeric Character Reference(NCR) regardless of XML Version,
+                 *  which was incorrect as Control Characters are invalid in XML 1.0.
                  */
-                if (isCharacterInC0orC1Range(ch) ||
-                        (XMLVERSION11.equals(getVersion()) && isNELorLSEPCharacter(ch)))
+                boolean isVer11 = XMLVERSION11.equals(getVersion());
+                if (!isVer11 && XMLChar.isInvalid(ch)) {
+                    throw new org.xml.sax.SAXException(Utils.messages.createMessage(
+                            MsgKey.ER_WF_INVALID_CHARACTER_IN_TEXT,
+                            new Object[]{Integer.toHexString(ch)}));
+                }
+                if (isCharacterInC0orC1Range(ch) || (isVer11 && isNELorLSEPCharacter(ch)))
                 {
                     writeCharRef(writer, ch);
                 }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java b/test/jaxp/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
index 425468ef26a..f3802ec5c46 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 package transform;
 
+import com.sun.org.apache.xerces.internal.util.XMLChar;
 import java.io.IOException;
 
 import javax.xml.transform.TransformerConfigurationException;
@@ -32,19 +33,16 @@ import javax.xml.transform.sax.TransformerHandler;
 import javax.xml.transform.stream.StreamResult;
 
 import org.testng.Assert;
-import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
 /*
  * @test
- * @bug 6883209
- * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm -DrunSecMngr=true -Djava.security.manager=allow transform.OpenJDK100017Test
+ * @bug 6883209 8273370
+ * @modules java.xml/com.sun.org.apache.xerces.internal.util
  * @run testng/othervm transform.OpenJDK100017Test
  * @summary Test XSLT won't cause StackOverflow when it handle many characters.
  */
-@Listeners({jaxp.library.BasePolicy.class})
 public class OpenJDK100017Test {
 
     @Test
@@ -56,7 +54,9 @@ public class OpenJDK100017Test {
 
             StringBuilder sb = new StringBuilder(4096);
             for (int x = 4096; x > 0; x--) {
-                sb.append((char) x);
+                if (XMLChar.isValid(x)) {
+                    sb.append((char)x);
+                }
             }
             ser.characters(sb.toString().toCharArray(), 0, sb.toString().toCharArray().length);
             ser.endDocument();
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/SerializationTest.java b/test/jaxp/javax/xml/jaxp/unittest/transform/SerializationTest.java
new file mode 100644
index 00000000000..b13a9a2c93b
--- /dev/null
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/SerializationTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package transform;
+
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.prefs.InvalidPreferencesFormatException;
+import java.util.prefs.Preferences;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+
+/*
+ * @test
+ * @bug 8273370
+ * @run testng transform.SerializationTest
+ * @summary Verifies that the characters are written correctly during serialization.
+ */
+public class SerializationTest {
+
+    private static final String PREFS_DTD_URI
+            = "http://java.sun.com/dtd/preferences.dtd";
+    private static String CLS_DIR = System.getProperty("test.classes", ".");
+    private static String SRC_DIR = System.getProperty("test.src");
+
+    /**
+     * Verifies that the XMLSupport for exportSubtree handles control characters
+     * correctly by reporting en error.
+     *
+     * Note: exportSubtree currently throws AssertionError. It would be more
+     * appropriate to throw InvalidPreferencesFormatException as the import
+     * method does. Since this is an edge case however, we'll keep it as is to
+     * avoid signature change.
+     *
+     * The following was the original test:
+            Preferences p = Preferences.userRoot().node("test");
+            p.put("key", "[\u0018\u0019]");
+            p.exportSubtree(new ByteArrayOutputStream());
+     *
+     * The code however, hanged when running in JTReg. This test therefore replaced
+     * the above code with the process extracted from the exportSubtree routine.
+     *
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void testTrasformer() throws Exception {
+        Assert.assertThrows(AssertionError.class,
+                () -> export(new ByteArrayOutputStream()));
+    }
+
+    private void export(OutputStream os) throws IOException {
+        Document doc = createPrefsDoc("preferences");
+        Element preferences = doc.getDocumentElement();
+        preferences.setAttribute("EXTERNAL_XML_VERSION", "1.0");
+        Element xmlRoot = (Element) preferences.appendChild(doc.createElement("root"));
+        xmlRoot.setAttribute("type", "user");
+
+        Element e = xmlRoot;
+
+        e.appendChild(doc.createElement("map"));
+        e = (Element) e.appendChild(doc.createElement("node"));
+        e.setAttribute("name", "test");
+
+        putPreferencesInXml(e, doc);
+
+        writeDoc(doc, os);
+    }
+
+    private static Document createPrefsDoc(String qname) {
+        try {
+            DOMImplementation di = DocumentBuilderFactory.newInstance().
+                    newDocumentBuilder().getDOMImplementation();
+            DocumentType dt = di.createDocumentType(qname, null, PREFS_DTD_URI);
+            return di.createDocument(null, qname, dt);
+        } catch (ParserConfigurationException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private static void putPreferencesInXml(Element elt, Document doc) {
+        Element map = (Element) elt.appendChild(doc.createElement("map"));
+        Element entry = (Element) map.appendChild(doc.createElement("entry"));
+        entry.setAttribute("key", "key");
+        entry.setAttribute("value", "[\u0018\u0019]");
+    }
+
+    private void writeDoc(Document doc, OutputStream out)
+            throws IOException {
+        try {
+            TransformerFactory tf = TransformerFactory.newInstance();
+            tf.setAttribute("indent-number", 2);
+            Transformer t = tf.newTransformer();
+            t.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, doc.getDoctype().getSystemId());
+            t.setOutputProperty(OutputKeys.INDENT, "yes");
+            //Transformer resets the "indent" info if the "result" is a StreamResult with
+            //an OutputStream object embedded, creating a Writer object on top of that
+            //OutputStream object however works.
+            t.transform(new DOMSource(doc),
+                    new StreamResult(new BufferedWriter(new OutputStreamWriter(out, "UTF-8"))));
+        } catch (TransformerException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Verifies that the XMLSupport for importPreferences handles control
+     * characters correctly by reporting en error.
+     *
+     * Note: this is the existing behavior. This test is here to match with the
+     * export method.
+     *
+     * "preferences.xml" was generated by calling the exportSubtree method
+     * before the patch.
+     *
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void testParser() throws Exception {
+        Assert.assertThrows(InvalidPreferencesFormatException.class, () -> {
+            Preferences.importPreferences(
+                    new FileInputStream(new File(SRC_DIR + "/preferences.xml")));
+        });
+    }
+}
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/preferences.xml b/test/jaxp/javax/xml/jaxp/unittest/transform/preferences.xml
new file mode 100644
index 00000000000..f2ac3cf4860
--- /dev/null
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/preferences.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+<preferences EXTERNAL_XML_VERSION="1.0">
+  <root type="user">
+    <map/>
+    <node name="test">
+      <map>
+        <entry key="key" value="[&#24;&#25;]"/>
+      </map>
+    </node>
+  </root>
+</preferences>
-- 
GitLab


From 36b36efa12876c592d9bf4b381887ecbf49bc2c9 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 25 Mar 2022 21:16:51 +0000
Subject: [PATCH 215/345] 8283661: Unexpected TypeElement in ANALYZE TaskEvent

Reviewed-by: vromero, jlahoda
---
 .../sun/tools/javac/main/JavaCompiler.java    |  24 ++-
 .../sun/tools/javac/model/JavacElements.java  |  12 +-
 .../api/taskListeners/TestTypeElement.java    | 168 ++++++++++++++++++
 3 files changed, 195 insertions(+), 9 deletions(-)
 create mode 100644 test/langtools/tools/javac/api/taskListeners/TestTypeElement.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 1b8b7077ed8..fa849c08e97 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1305,7 +1305,7 @@ public class JavaCompiler {
             log.printVerbose("checking.attribution", env.enclClass.sym);
 
         if (!taskListener.isEmpty()) {
-            TaskEvent e = new TaskEvent(TaskEvent.Kind.ANALYZE, env.toplevel, env.enclClass.sym);
+            TaskEvent e = newAnalyzeTaskEvent(env);
             taskListener.started(e);
         }
 
@@ -1390,12 +1390,30 @@ public class JavaCompiler {
         }
         finally {
             if (!taskListener.isEmpty()) {
-                TaskEvent e = new TaskEvent(TaskEvent.Kind.ANALYZE, env.toplevel, env.enclClass.sym);
+                TaskEvent e = newAnalyzeTaskEvent(env);
                 taskListener.finished(e);
             }
         }
     }
 
+    private TaskEvent newAnalyzeTaskEvent(Env<AttrContext> env) {
+        JCCompilationUnit toplevel = env.toplevel;
+        ClassSymbol sym;
+        if (env.enclClass.sym == syms.predefClass) {
+            if (TreeInfo.isModuleInfo(toplevel)) {
+                sym = toplevel.modle.module_info;
+            } else if (TreeInfo.isPackageInfo(toplevel)) {
+                sym = toplevel.packge.package_info;
+            } else {
+                throw new IllegalStateException("unknown env.toplevel");
+            }
+        } else {
+            sym = env.enclClass.sym;
+        }
+
+        return new TaskEvent(TaskEvent.Kind.ANALYZE, toplevel, sym);
+    }
+
     /**
      * Prepare attributed parse trees, in conjunction with their attribution contexts,
      * for source or code generation.
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 ed909c8b80f..a691f44cdab 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -445,10 +445,8 @@ public class JavacElements implements Elements {
 
     @DefinedBy(Api.LANGUAGE_MODEL)
     public PackageElement getPackageOf(Element e) {
-        if (e.getKind() == ElementKind.MODULE)
-            return null;
-        else
-            return cast(Symbol.class, e).packge();
+        Symbol sym = cast(Symbol.class, e);
+        return (sym.kind == MDL || sym.owner.kind == MDL) ? null : sym.packge();
     }
 
     @DefinedBy(Api.LANGUAGE_MODEL)
@@ -456,7 +454,9 @@ public class JavacElements implements Elements {
         Symbol sym = cast(Symbol.class, e);
         if (modules.getDefaultModule() == syms.noModule)
             return null;
-        return (sym.kind == MDL) ? ((ModuleElement) e) : sym.packge().modle;
+        return (sym.kind == MDL) ? ((ModuleElement) e)
+                : (sym.owner.kind == MDL) ? (ModuleElement) sym.owner
+                : sym.packge().modle;
     }
 
     @DefinedBy(Api.LANGUAGE_MODEL)
diff --git a/test/langtools/tools/javac/api/taskListeners/TestTypeElement.java b/test/langtools/tools/javac/api/taskListeners/TestTypeElement.java
new file mode 100644
index 00000000000..058cbecd628
--- /dev/null
+++ b/test/langtools/tools/javac/api/taskListeners/TestTypeElement.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8283661
+ * @summary Unexpected TypeElement in ANALYZE TaskEvent
+ * @modules jdk.compiler
+ * @run main TestTypeElement
+ */
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskListener;
+
+public class TestTypeElement {
+    public static void main(String... args) throws Exception {
+        new TestTypeElement().run();
+    }
+
+    private PrintStream log;
+    private Elements elements;
+    private int errors;
+
+    void run() throws Exception {
+        log = System.err;
+
+        List<JavaFileObject> files = List.of(
+                createFileObject("module-info.java", "module m { }"),
+                createFileObject("p/package-info.java", "/** Comment. */ package p;"),
+                createFileObject("p/C.java", "package p; public class C { }")
+        );
+
+        JavaCompiler c = ToolProvider.getSystemJavaCompiler();
+        JavacTask t = (JavacTask) c.getTask(null, null, null,  List.of("-d", "classes"), null, files);
+        t.addTaskListener(new TaskListener() {
+            @Override
+            public void started(TaskEvent e) {
+                log.println("started: " + e);
+                checkTypeElement(e);
+            }
+            @Override
+            public void finished(TaskEvent e) {
+                log.println("finished: " + e);
+                checkTypeElement(e);
+            }
+        });
+        elements = t.getElements();
+        t.call();
+
+        if (errors > 0) {
+            log.println(errors + " errors occurred");
+            throw new Exception(errors + " errors occurred");
+        }
+    }
+
+    private void checkTypeElement(TaskEvent e) {
+        TypeElement te = e.getTypeElement();
+
+        if (te != null) {
+            showTypeElement(e.getTypeElement());
+        }
+
+        switch (e.getKind()) {
+            case COMPILATION, PARSE, ENTER -> {
+                checkEqual(te, null);
+            }
+
+            case ANALYZE, GENERATE -> {
+                if (te == null) {
+                    error("type element is null");
+                    return;
+                }
+
+
+                switch (te.getQualifiedName().toString()) {
+                    case "m.module-info" -> {
+                        checkEqual(elements.getModuleOf(te), elements.getModuleElement("m"));
+                        checkEqual(elements.getPackageOf(te), null);
+                    }
+                    case "p.package-info", "p.C" -> {
+                        checkEqual(elements.getModuleOf(te), elements.getModuleElement("m"));
+                        checkEqual(elements.getPackageOf(te), elements.getPackageElement("p"));
+                    }
+                }
+            }
+        }
+    }
+
+    private void showTypeElement(TypeElement e) {
+        log.println("type element: " + e);
+
+        try {
+            log.println("    module element: " + elements.getModuleOf(e));
+        } catch (Throwable t) {
+            log.println("    module element: " + t);
+        }
+
+        try {
+            log.println("    package element: " + elements.getPackageOf(e));
+        } catch (Throwable t) {
+            log.println("    package element: " + t);
+        }
+    }
+
+    private <T> void checkEqual(T found, T expected) {
+        if (found != expected) {
+            error("mismatch");
+            log.println("   found: " + found);
+            log.println("expected: " + expected);
+        }
+    }
+
+    private void error(String message) {
+        log.println("Error: " + message);
+        errors++;
+    }
+
+    private JavaFileObject createFileObject(String name, String body) {
+        return createFileObject(name, JavaFileObject.Kind.SOURCE, body);
+    }
+
+    private JavaFileObject createFileObject(String name, JavaFileObject.Kind kind, String body) {
+        try {
+            return new SimpleJavaFileObject(new URI("myfo:///" + name), kind) {
+                @Override
+                public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                    return body;
+                }
+            };
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException(name, e);
+        }
+    }
+}
\ No newline at end of file
-- 
GitLab


From cb012a5b625a7707c429f1e95db59018a6dcb992 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 25 Mar 2022 21:20:02 +0000
Subject: [PATCH 216/345] 8283648: Improve the snippet "file not found"
 message.

Reviewed-by: prappo
---
 .../doclets/toolkit/resources/doclets.properties       |  3 ++-
 .../doclets/toolkit/taglets/SnippetTaglet.java         |  4 ++--
 .../javadoc/doclet/testSnippetTag/TestSnippetTag.java  | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index c67865344ee..55ce24edd87 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@ Please file a bug against the javadoc tool via the Java bug reporting page\n\
 (http://bugreport.java.com) after checking the Bug Database (http://bugs.java.com)\n\
 for duplicates. Include error messages and the following diagnostic in your report. Thank you.
 doclet.File_not_found=File not found: {0}
+doclet.snippet_file_not_found=file not found on source path or snippet path: {0}
 doclet.Copy_Overwrite_warning=File {0} not copied to {1} due to existing file with same name...
 doclet.Copy_Ignored_warning=File {0} not copied: invalid name
 doclet.Copy_snippet_to_clipboard=Copy
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SnippetTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SnippetTaglet.java
index 3c13b194c22..a10f369c1b1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SnippetTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SnippetTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -240,7 +240,7 @@ public class SnippetTaglet extends BaseTaglet {
 
             if (fileObject == null) {
                 // i.e. the file does not exist
-                throw new BadSnippetException(a, "doclet.File_not_found", v);
+                throw new BadSnippetException(a, "doclet.snippet_file_not_found", v);
             }
 
             try {
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
index 4b0dd06a2a2..9923a191a57 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1079,11 +1079,11 @@ public class TestSnippetTag extends SnippetTester {
         checkExit(Exit.ERROR);
         checkOutput(Output.OUT, true,
                     """
-                    A.java:4: error: File not found: %s""".formatted(fileName));
+                    A.java:4: error: file not found on source path or snippet path: %s""".formatted(fileName));
         checkOutput("pkg/A.html", true, """
                         <details class="invalid-tag">
                         <summary>invalid @snippet</summary>
-                        <pre>File not found: text.txt</pre>
+                        <pre>file not found on source path or snippet path: text.txt</pre>
                         </details>
                         """);
         checkNoCrashes();
@@ -1140,7 +1140,7 @@ public class TestSnippetTag extends SnippetTester {
         checkExit(Exit.ERROR);
         checkOutput(Output.OUT, true,
                     """
-                    A.java:4: error: File not found: %s""".formatted(fileName));
+                    A.java:4: error: file not found on source path or snippet path: %s""".formatted(fileName));
         checkNoCrashes();
     }
 
@@ -1869,7 +1869,7 @@ public class TestSnippetTag extends SnippetTester {
         checkExit(Exit.ERROR);
         checkOutput(Output.OUT, true,
                     """
-                    A.java:4: error: File not found: %s""".formatted(fileName));
+                    A.java:4: error: file not found on source path or snippet path: %s""".formatted(fileName));
         checkNoCrashes();
     }
 
-- 
GitLab


From e97cf157cf20aeaef4a8c16fed6f3bb2bc933819 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Fri, 25 Mar 2022 21:21:05 +0000
Subject: [PATCH 217/345] 8283691: Classes in java.security still reference
 deprecated classes in spec

Reviewed-by: hchao, mullan, wetmore
---
 src/java.base/share/classes/java/security/Key.java        | 2 --
 src/java.base/share/classes/java/security/PrivateKey.java | 4 ++--
 src/java.base/share/classes/java/security/PublicKey.java  | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/security/Key.java b/src/java.base/share/classes/java/security/Key.java
index 4ea5ae0887b..1c01095caf9 100644
--- a/src/java.base/share/classes/java/security/Key.java
+++ b/src/java.base/share/classes/java/security/Key.java
@@ -93,8 +93,6 @@ package java.security;
  * @see KeyFactory
  * @see KeyRep
  * @see java.security.spec.KeySpec
- * @see Identity
- * @see Signer
  *
  * @author Benjamin Renaud
  * @since 1.1
diff --git a/src/java.base/share/classes/java/security/PrivateKey.java b/src/java.base/share/classes/java/security/PrivateKey.java
index 3402aa66c8b..2fb07ab816e 100644
--- a/src/java.base/share/classes/java/security/PrivateKey.java
+++ b/src/java.base/share/classes/java/security/PrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@ package java.security;
  *
  * @see Key
  * @see PublicKey
- * @see Certificate
+ * @see java.security.cert.Certificate
  * @see Signature#initVerify
  * @see java.security.interfaces.DSAPrivateKey
  * @see java.security.interfaces.RSAPrivateKey
diff --git a/src/java.base/share/classes/java/security/PublicKey.java b/src/java.base/share/classes/java/security/PublicKey.java
index dca5bece1bd..737273bdbbc 100644
--- a/src/java.base/share/classes/java/security/PublicKey.java
+++ b/src/java.base/share/classes/java/security/PublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ package java.security;
  * @since 1.1
  * @see Key
  * @see PrivateKey
- * @see Certificate
+ * @see java.security.cert.Certificate
  * @see Signature#initVerify
  * @see java.security.interfaces.DSAPublicKey
  * @see java.security.interfaces.RSAPublicKey
-- 
GitLab


From 2600f99fece951259fa3ef4deeb8da4aa2cc436e Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Fri, 25 Mar 2022 21:31:21 +0000
Subject: [PATCH 218/345] 8282685: fileToEncodedURL_[name|signature] symbols
 are unused

Reviewed-by: hseigel
---
 src/hotspot/share/classfile/vmSymbols.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index e0402392467..d962eda50a2 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -465,8 +465,6 @@
   template(security_manager_signature,                "Ljava/lang/SecurityManager;")              \
   template(defineOrCheckPackage_name,                 "defineOrCheckPackage")                     \
   template(defineOrCheckPackage_signature,            "(Ljava/lang/String;Ljava/util/jar/Manifest;Ljava/net/URL;)Ljava/lang/Package;") \
-  template(fileToEncodedURL_name,                     "fileToEncodedURL")                         \
-  template(fileToEncodedURL_signature,                "(Ljava/io/File;)Ljava/net/URL;")           \
   template(getProtectionDomain_name,                  "getProtectionDomain")                      \
   template(getProtectionDomain_signature,             "(Ljava/security/CodeSource;)Ljava/security/ProtectionDomain;") \
   template(java_lang_Integer_array_signature,         "[Ljava/lang/Integer;")                     \
-- 
GitLab


From 7bac0a878d918745ed036954cbbee590ce810c71 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Fri, 25 Mar 2022 22:37:55 +0000
Subject: [PATCH 219/345] 8283681: Improve ZonedDateTime offset handling

Reviewed-by: scolebourne, naoto, rriggs
---
 .../share/classes/java/time/ZoneId.java       |   5 +
 .../share/classes/java/time/ZoneOffset.java   |  23 +++-
 .../share/classes/java/time/ZoneRegion.java   |   5 +
 .../classes/java/time/ZonedDateTime.java      |   6 +-
 .../openjdk/bench/java/time/GetYearBench.java | 121 ++++++++++++++++++
 5 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/time/GetYearBench.java

diff --git a/src/java.base/share/classes/java/time/ZoneId.java b/src/java.base/share/classes/java/time/ZoneId.java
index 829ed5f2fdf..14196c160fb 100644
--- a/src/java.base/share/classes/java/time/ZoneId.java
+++ b/src/java.base/share/classes/java/time/ZoneId.java
@@ -584,6 +584,11 @@ public abstract sealed class ZoneId implements Serializable permits ZoneOffset,
         return this;
     }
 
+    /**
+     * Get the effective offset for an instant at the given epochSecond.
+     */
+    /* package-private */ abstract ZoneOffset getOffset(long epochSecond);
+
     //-----------------------------------------------------------------------
     /**
      * Checks if this time-zone ID is equal to another time-zone ID.
diff --git a/src/java.base/share/classes/java/time/ZoneOffset.java b/src/java.base/share/classes/java/time/ZoneOffset.java
index f061040b9e2..9dd64789409 100644
--- a/src/java.base/share/classes/java/time/ZoneOffset.java
+++ b/src/java.base/share/classes/java/time/ZoneOffset.java
@@ -86,6 +86,8 @@ import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import jdk.internal.vm.annotation.Stable;
+
 /**
  * A time-zone offset from Greenwich/UTC, such as {@code +02:00}.
  * <p>
@@ -168,6 +170,11 @@ public final class ZoneOffset
      * The string form of the time-zone offset.
      */
     private final transient String id;
+    /**
+     * The zone rules for an offset will always return this offset. Cache it for efficiency.
+     */
+    @Stable
+    private transient ZoneRules rules;
 
     //-----------------------------------------------------------------------
     /**
@@ -504,7 +511,21 @@ public final class ZoneOffset
      */
     @Override
     public ZoneRules getRules() {
-        return ZoneRules.of(this);
+        ZoneRules rules = this.rules;
+        if (rules == null) {
+            rules = this.rules = ZoneRules.of(this);
+        }
+        return rules;
+    }
+
+    @Override
+    public ZoneId normalized() {
+        return this;
+    }
+
+    @Override
+    /* package-private */ ZoneOffset getOffset(long epochSecond) {
+        return this;
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/ZoneRegion.java b/src/java.base/share/classes/java/time/ZoneRegion.java
index aec8a2b108b..9a7e66f0943 100644
--- a/src/java.base/share/classes/java/time/ZoneRegion.java
+++ b/src/java.base/share/classes/java/time/ZoneRegion.java
@@ -178,6 +178,11 @@ final class ZoneRegion extends ZoneId implements Serializable {
         return (rules != null ? rules : ZoneRulesProvider.getRules(id, false));
     }
 
+    @Override
+    /* package-private */ ZoneOffset getOffset(long epochSecond) {
+        return getRules().getOffset(Instant.ofEpochSecond(epochSecond));
+    }
+
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
diff --git a/src/java.base/share/classes/java/time/ZonedDateTime.java b/src/java.base/share/classes/java/time/ZonedDateTime.java
index acd68706b1c..555392cf513 100644
--- a/src/java.base/share/classes/java/time/ZonedDateTime.java
+++ b/src/java.base/share/classes/java/time/ZonedDateTime.java
@@ -452,9 +452,9 @@ public final class ZonedDateTime
      * @throws DateTimeException if the result exceeds the supported range
      */
     private static ZonedDateTime create(long epochSecond, int nanoOfSecond, ZoneId zone) {
-        ZoneRules rules = zone.getRules();
-        Instant instant = Instant.ofEpochSecond(epochSecond, nanoOfSecond);  // TODO: rules should be queryable by epochSeconds
-        ZoneOffset offset = rules.getOffset(instant);
+        // nanoOfSecond is in a range that'll not affect epochSecond, validated
+        // by LocalDateTime.ofEpochSecond
+        ZoneOffset offset = zone.getOffset(epochSecond);
         LocalDateTime ldt = LocalDateTime.ofEpochSecond(epochSecond, nanoOfSecond, offset);
         return new ZonedDateTime(ldt, offset, zone);
     }
diff --git a/test/micro/org/openjdk/bench/java/time/GetYearBench.java b/test/micro/org/openjdk/bench/java/time/GetYearBench.java
new file mode 100644
index 00000000000..59d3b84a297
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/time/GetYearBench.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.time;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZonedDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
+import java.util.Locale;
+import java.util.Random;
+import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+/**
+ * Examine ability to perform escape analysis on expressions
+ * such as {@code Instant.ofEpochMilli(value).atZone(ZoneOffset.UTC).getYear()}
+ */
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Warmup(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
+@Fork(3)
+@State(Scope.Benchmark)
+public class GetYearBench {
+
+    private TimeZone UTC = TimeZone.getTimeZone("UTC");
+
+    private TimeZone LONDON = TimeZone.getTimeZone("Europe/London");
+
+    private long[] INSTANT_MILLIS;
+
+    private int[] YEARS;
+
+    @Setup
+    public void createInstants() {
+        // Various instants during the same day
+        final Instant loInstant = Instant.EPOCH.plus(Duration.ofDays(365*50)); // 2020-01-01
+        final Instant hiInstant = loInstant.plus(Duration.ofDays(1));
+        final long maxOffsetNanos = Duration.between(loInstant, hiInstant).toNanos();
+        final Random random = new Random(0);
+        INSTANT_MILLIS = IntStream
+                .range(0, 1_000)
+                .mapToObj(ignored -> {
+                    final long offsetNanos = (long) Math.floor(random.nextDouble() * maxOffsetNanos);
+                    return loInstant.plus(offsetNanos, ChronoUnit.NANOS);
+                })
+                .mapToLong(instant -> instant.toEpochMilli())
+                .toArray();
+        YEARS = new int[INSTANT_MILLIS.length];
+    }
+
+    @Benchmark
+    public int[] getYearFromMillisZoneOffset() {
+        for (int i = 0; i < YEARS.length; i++) {
+            YEARS[i] = Instant.ofEpochMilli(INSTANT_MILLIS[i]).atZone(ZoneOffset.UTC).getYear();
+        }
+        return YEARS;
+    }
+
+    @Benchmark
+    public int[] getYearFromMillisZoneRegionUTC() {
+        for (int i = 0; i < YEARS.length; i++) {
+            YEARS[i] = Instant.ofEpochMilli(INSTANT_MILLIS[i]).atZone(UTC.toZoneId()).getYear();
+        }
+        return YEARS;
+    }
+
+    @Benchmark
+    public int[] getYearFromMillisZoneRegion() {
+        for (int i = 0; i < YEARS.length; i++) {
+            YEARS[i] = Instant.ofEpochMilli(INSTANT_MILLIS[i]).atZone(LONDON.toZoneId()).getYear();
+        }
+        return YEARS;
+    }
+
+    @Benchmark
+    public int[] getYearFromMillisZoneRegionNormalized() {
+        for (int i = 0; i < YEARS.length; i++) {
+            YEARS[i] = Instant.ofEpochMilli(INSTANT_MILLIS[i]).atZone(UTC.toZoneId().normalized()).getYear();
+        }
+        return YEARS;
+    }
+}
-- 
GitLab


From 5ca8b91898cfdcff1e44df3b7f3070a2111f770b Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 25 Mar 2022 23:21:08 +0000
Subject: [PATCH 220/345] 8283713: [BACKOUT] Unexpected TypeElement in ANALYZE
 TaskEvent

Reviewed-by: prr
---
 .../sun/tools/javac/main/JavaCompiler.java    |  24 +--
 .../sun/tools/javac/model/JavacElements.java  |  12 +-
 .../api/taskListeners/TestTypeElement.java    | 168 ------------------
 3 files changed, 9 insertions(+), 195 deletions(-)
 delete mode 100644 test/langtools/tools/javac/api/taskListeners/TestTypeElement.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index fa849c08e97..1b8b7077ed8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1305,7 +1305,7 @@ public class JavaCompiler {
             log.printVerbose("checking.attribution", env.enclClass.sym);
 
         if (!taskListener.isEmpty()) {
-            TaskEvent e = newAnalyzeTaskEvent(env);
+            TaskEvent e = new TaskEvent(TaskEvent.Kind.ANALYZE, env.toplevel, env.enclClass.sym);
             taskListener.started(e);
         }
 
@@ -1390,30 +1390,12 @@ public class JavaCompiler {
         }
         finally {
             if (!taskListener.isEmpty()) {
-                TaskEvent e = newAnalyzeTaskEvent(env);
+                TaskEvent e = new TaskEvent(TaskEvent.Kind.ANALYZE, env.toplevel, env.enclClass.sym);
                 taskListener.finished(e);
             }
         }
     }
 
-    private TaskEvent newAnalyzeTaskEvent(Env<AttrContext> env) {
-        JCCompilationUnit toplevel = env.toplevel;
-        ClassSymbol sym;
-        if (env.enclClass.sym == syms.predefClass) {
-            if (TreeInfo.isModuleInfo(toplevel)) {
-                sym = toplevel.modle.module_info;
-            } else if (TreeInfo.isPackageInfo(toplevel)) {
-                sym = toplevel.packge.package_info;
-            } else {
-                throw new IllegalStateException("unknown env.toplevel");
-            }
-        } else {
-            sym = env.enclClass.sym;
-        }
-
-        return new TaskEvent(TaskEvent.Kind.ANALYZE, toplevel, sym);
-    }
-
     /**
      * Prepare attributed parse trees, in conjunction with their attribution contexts,
      * for source or code generation.
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 a691f44cdab..ed909c8b80f 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, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -445,8 +445,10 @@ public class JavacElements implements Elements {
 
     @DefinedBy(Api.LANGUAGE_MODEL)
     public PackageElement getPackageOf(Element e) {
-        Symbol sym = cast(Symbol.class, e);
-        return (sym.kind == MDL || sym.owner.kind == MDL) ? null : sym.packge();
+        if (e.getKind() == ElementKind.MODULE)
+            return null;
+        else
+            return cast(Symbol.class, e).packge();
     }
 
     @DefinedBy(Api.LANGUAGE_MODEL)
@@ -454,9 +456,7 @@ public class JavacElements implements Elements {
         Symbol sym = cast(Symbol.class, e);
         if (modules.getDefaultModule() == syms.noModule)
             return null;
-        return (sym.kind == MDL) ? ((ModuleElement) e)
-                : (sym.owner.kind == MDL) ? (ModuleElement) sym.owner
-                : sym.packge().modle;
+        return (sym.kind == MDL) ? ((ModuleElement) e) : sym.packge().modle;
     }
 
     @DefinedBy(Api.LANGUAGE_MODEL)
diff --git a/test/langtools/tools/javac/api/taskListeners/TestTypeElement.java b/test/langtools/tools/javac/api/taskListeners/TestTypeElement.java
deleted file mode 100644
index 058cbecd628..00000000000
--- a/test/langtools/tools/javac/api/taskListeners/TestTypeElement.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8283661
- * @summary Unexpected TypeElement in ANALYZE TaskEvent
- * @modules jdk.compiler
- * @run main TestTypeElement
- */
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.util.Elements;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.ToolProvider;
-
-import com.sun.source.util.JavacTask;
-import com.sun.source.util.TaskEvent;
-import com.sun.source.util.TaskListener;
-
-public class TestTypeElement {
-    public static void main(String... args) throws Exception {
-        new TestTypeElement().run();
-    }
-
-    private PrintStream log;
-    private Elements elements;
-    private int errors;
-
-    void run() throws Exception {
-        log = System.err;
-
-        List<JavaFileObject> files = List.of(
-                createFileObject("module-info.java", "module m { }"),
-                createFileObject("p/package-info.java", "/** Comment. */ package p;"),
-                createFileObject("p/C.java", "package p; public class C { }")
-        );
-
-        JavaCompiler c = ToolProvider.getSystemJavaCompiler();
-        JavacTask t = (JavacTask) c.getTask(null, null, null,  List.of("-d", "classes"), null, files);
-        t.addTaskListener(new TaskListener() {
-            @Override
-            public void started(TaskEvent e) {
-                log.println("started: " + e);
-                checkTypeElement(e);
-            }
-            @Override
-            public void finished(TaskEvent e) {
-                log.println("finished: " + e);
-                checkTypeElement(e);
-            }
-        });
-        elements = t.getElements();
-        t.call();
-
-        if (errors > 0) {
-            log.println(errors + " errors occurred");
-            throw new Exception(errors + " errors occurred");
-        }
-    }
-
-    private void checkTypeElement(TaskEvent e) {
-        TypeElement te = e.getTypeElement();
-
-        if (te != null) {
-            showTypeElement(e.getTypeElement());
-        }
-
-        switch (e.getKind()) {
-            case COMPILATION, PARSE, ENTER -> {
-                checkEqual(te, null);
-            }
-
-            case ANALYZE, GENERATE -> {
-                if (te == null) {
-                    error("type element is null");
-                    return;
-                }
-
-
-                switch (te.getQualifiedName().toString()) {
-                    case "m.module-info" -> {
-                        checkEqual(elements.getModuleOf(te), elements.getModuleElement("m"));
-                        checkEqual(elements.getPackageOf(te), null);
-                    }
-                    case "p.package-info", "p.C" -> {
-                        checkEqual(elements.getModuleOf(te), elements.getModuleElement("m"));
-                        checkEqual(elements.getPackageOf(te), elements.getPackageElement("p"));
-                    }
-                }
-            }
-        }
-    }
-
-    private void showTypeElement(TypeElement e) {
-        log.println("type element: " + e);
-
-        try {
-            log.println("    module element: " + elements.getModuleOf(e));
-        } catch (Throwable t) {
-            log.println("    module element: " + t);
-        }
-
-        try {
-            log.println("    package element: " + elements.getPackageOf(e));
-        } catch (Throwable t) {
-            log.println("    package element: " + t);
-        }
-    }
-
-    private <T> void checkEqual(T found, T expected) {
-        if (found != expected) {
-            error("mismatch");
-            log.println("   found: " + found);
-            log.println("expected: " + expected);
-        }
-    }
-
-    private void error(String message) {
-        log.println("Error: " + message);
-        errors++;
-    }
-
-    private JavaFileObject createFileObject(String name, String body) {
-        return createFileObject(name, JavaFileObject.Kind.SOURCE, body);
-    }
-
-    private JavaFileObject createFileObject(String name, JavaFileObject.Kind kind, String body) {
-        try {
-            return new SimpleJavaFileObject(new URI("myfo:///" + name), kind) {
-                @Override
-                public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-                    return body;
-                }
-            };
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException(name, e);
-        }
-    }
-}
\ No newline at end of file
-- 
GitLab


From f520b4f891b71c630bc13f5db4f305194ef227e5 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Fri, 25 Mar 2022 23:29:56 +0000
Subject: [PATCH 221/345] 8283668: Update IllegalFormatException to use sealed
 classes

Reviewed-by: iris, jpai
---
 .../java/util/DuplicateFormatFlagsException.java |  4 ++--
 .../FormatFlagsConversionMismatchException.java  |  4 ++--
 .../IllegalFormatArgumentIndexException.java     |  4 ++--
 .../util/IllegalFormatCodePointException.java    |  4 ++--
 .../util/IllegalFormatConversionException.java   |  4 ++--
 .../java/util/IllegalFormatException.java        | 16 ++++++++++++++--
 .../java/util/IllegalFormatFlagsException.java   |  4 ++--
 .../util/IllegalFormatPrecisionException.java    |  4 ++--
 .../java/util/IllegalFormatWidthException.java   |  4 ++--
 .../util/MissingFormatArgumentException.java     |  4 ++--
 .../java/util/MissingFormatWidthException.java   |  4 ++--
 .../util/UnknownFormatConversionException.java   |  4 ++--
 .../java/util/UnknownFormatFlagsException.java   |  4 ++--
 13 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java b/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
index 356ea209c92..ebeb3d5c44c 100644
--- a/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
+++ b/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class DuplicateFormatFlagsException extends IllegalFormatException {
+public non-sealed class DuplicateFormatFlagsException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 18890531L;
diff --git a/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java b/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
index 6f2464d4fb6..cca7b3eb553 100644
--- a/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
+++ b/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class FormatFlagsConversionMismatchException
+public non-sealed class FormatFlagsConversionMismatchException
     extends IllegalFormatException
 {
     @java.io.Serial
diff --git a/src/java.base/share/classes/java/util/IllegalFormatArgumentIndexException.java b/src/java.base/share/classes/java/util/IllegalFormatArgumentIndexException.java
index 02d5449098d..64b24411592 100644
--- a/src/java.base/share/classes/java/util/IllegalFormatArgumentIndexException.java
+++ b/src/java.base/share/classes/java/util/IllegalFormatArgumentIndexException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ package java.util;
  *
  * @since 16
  */
-class IllegalFormatArgumentIndexException extends IllegalFormatException {
+final class IllegalFormatArgumentIndexException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 4191767811181838112L;
diff --git a/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java b/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
index 14ec9137f1e..2f1803d220e 100644
--- a/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
+++ b/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class IllegalFormatCodePointException extends IllegalFormatException {
+public non-sealed class IllegalFormatCodePointException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 19080630L;
diff --git a/src/java.base/share/classes/java/util/IllegalFormatConversionException.java b/src/java.base/share/classes/java/util/IllegalFormatConversionException.java
index 2dacf2094b4..67237f63cdf 100644
--- a/src/java.base/share/classes/java/util/IllegalFormatConversionException.java
+++ b/src/java.base/share/classes/java/util/IllegalFormatConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class IllegalFormatConversionException extends IllegalFormatException {
+public non-sealed class IllegalFormatConversionException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 17000126L;
diff --git a/src/java.base/share/classes/java/util/IllegalFormatException.java b/src/java.base/share/classes/java/util/IllegalFormatException.java
index 97b85cc107e..f5be4ad268b 100644
--- a/src/java.base/share/classes/java/util/IllegalFormatException.java
+++ b/src/java.base/share/classes/java/util/IllegalFormatException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,19 @@ package java.util;
  *
  * @since 1.5
  */
-public class IllegalFormatException extends IllegalArgumentException {
+public sealed class IllegalFormatException extends IllegalArgumentException
+    permits DuplicateFormatFlagsException,
+            FormatFlagsConversionMismatchException,
+            IllegalFormatArgumentIndexException,
+            IllegalFormatCodePointException,
+            IllegalFormatConversionException,
+            IllegalFormatFlagsException,
+            IllegalFormatPrecisionException,
+            IllegalFormatWidthException,
+            MissingFormatArgumentException,
+            MissingFormatWidthException,
+            UnknownFormatConversionException,
+            UnknownFormatFlagsException {
 
     @java.io.Serial
     private static final long serialVersionUID = 18830826L;
diff --git a/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java b/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
index 38e4e2d577e..408fa1efa5c 100644
--- a/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
+++ b/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class IllegalFormatFlagsException extends IllegalFormatException {
+public non-sealed class IllegalFormatFlagsException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 790824L;
diff --git a/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java b/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
index bdf3de6f528..4527953790c 100644
--- a/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
+++ b/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class IllegalFormatPrecisionException extends IllegalFormatException {
+public non-sealed class IllegalFormatPrecisionException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 18711008L;
diff --git a/src/java.base/share/classes/java/util/IllegalFormatWidthException.java b/src/java.base/share/classes/java/util/IllegalFormatWidthException.java
index e00ec01eee0..df8d59b9e81 100644
--- a/src/java.base/share/classes/java/util/IllegalFormatWidthException.java
+++ b/src/java.base/share/classes/java/util/IllegalFormatWidthException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class IllegalFormatWidthException extends IllegalFormatException {
+public non-sealed class IllegalFormatWidthException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 16660902L;
diff --git a/src/java.base/share/classes/java/util/MissingFormatArgumentException.java b/src/java.base/share/classes/java/util/MissingFormatArgumentException.java
index dcb0847833b..6363566216b 100644
--- a/src/java.base/share/classes/java/util/MissingFormatArgumentException.java
+++ b/src/java.base/share/classes/java/util/MissingFormatArgumentException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class MissingFormatArgumentException extends IllegalFormatException {
+public non-sealed class MissingFormatArgumentException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 19190115L;
diff --git a/src/java.base/share/classes/java/util/MissingFormatWidthException.java b/src/java.base/share/classes/java/util/MissingFormatWidthException.java
index 0ce9c3af83c..b553a3876ac 100644
--- a/src/java.base/share/classes/java/util/MissingFormatWidthException.java
+++ b/src/java.base/share/classes/java/util/MissingFormatWidthException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class MissingFormatWidthException extends IllegalFormatException {
+public non-sealed class MissingFormatWidthException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 15560123L;
diff --git a/src/java.base/share/classes/java/util/UnknownFormatConversionException.java b/src/java.base/share/classes/java/util/UnknownFormatConversionException.java
index 07519ade170..13d428e0b60 100644
--- a/src/java.base/share/classes/java/util/UnknownFormatConversionException.java
+++ b/src/java.base/share/classes/java/util/UnknownFormatConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class UnknownFormatConversionException extends IllegalFormatException {
+public non-sealed class UnknownFormatConversionException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 19060418L;
diff --git a/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java b/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
index c498711fa21..93eaf85b389 100644
--- a/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
+++ b/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ package java.util;
  *
  * @since 1.5
  */
-public class UnknownFormatFlagsException extends IllegalFormatException {
+public non-sealed class UnknownFormatFlagsException extends IllegalFormatException {
 
     @java.io.Serial
     private static final long serialVersionUID = 19370506L;
-- 
GitLab


From d5f90590323613b8b572ab5097365e005ba4f5ca Mon Sep 17 00:00:00 2001
From: Tyler Steele <tyler.steele@ibm.com>
Date: Sat, 26 Mar 2022 07:37:42 +0000
Subject: [PATCH 222/345] 8283695: [AIX] Build failure due to name conflict in
 test_arguments.cpp

Reviewed-by: iklam, stuefe
---
 test/hotspot/gtest/runtime/test_arguments.cpp | 212 +++++++++---------
 1 file changed, 106 insertions(+), 106 deletions(-)

diff --git a/test/hotspot/gtest/runtime/test_arguments.cpp b/test/hotspot/gtest/runtime/test_arguments.cpp
index 234bb2a015b..0919df6e8dd 100644
--- a/test/hotspot/gtest/runtime/test_arguments.cpp
+++ b/test/hotspot/gtest/runtime/test_arguments.cpp
@@ -214,7 +214,7 @@ TEST_VM_F(ArgumentsTest, parse_xss) {
 }
 
 struct Dummy {};
-static Dummy BAD;
+static Dummy BAD_INT;
 
 template <typename T>
 struct NumericArgument {
@@ -292,143 +292,143 @@ void check_numeric_flag(JVMFlag* flag, T getvalue(JVMFlag* flag),
 #define INTEGER_TEST_TABLE(f) \
   /*input                      i32           u32           i64                      u64 */ \
   f("0",                       0,            0,            0,                       0                        ) \
-  f("-0",                      0,            BAD,          0,                       BAD                      ) \
-  f("-1",                     -1,            BAD,         -1,                       BAD                      ) \
+  f("-0",                      0,            BAD_INT,      0,                       BAD_INT                  ) \
+  f("-1",                     -1,            BAD_INT,      -1,                      BAD_INT                  ) \
   f("0x1",                     1,            1,            1,                       1                        ) \
-  f("-0x1",                   -1,            BAD,         -1,                       BAD                      ) \
+  f("-0x1",                   -1,            BAD_INT,      -1,                      BAD_INT                  ) \
   f("4711",                    4711,         4711,         4711,                    4711                     ) \
   f("1K",                      1024,         1024,         1024,                    1024                     ) \
   f("1k",                      1024,         1024,         1024,                    1024                     ) \
   f("2M",                      2097152,      2097152,      2097152,                 2097152                  ) \
   f("2m",                      2097152,      2097152,      2097152,                 2097152                  ) \
   f("1G",                      1073741824,   1073741824,   1073741824,              1073741824               ) \
-  f("2G",                      BAD,          0x80000000,   2147483648LL,            2147483648ULL            ) \
-  f("1T",                      BAD,          BAD,          1099511627776LL,         1099511627776ULL         ) \
-  f("1t",                      BAD,          BAD,          1099511627776LL,         1099511627776ULL         ) \
-  f("-1K",                    -1024,         BAD,         -1024,                    BAD                      ) \
+  f("2G",                      BAD_INT,      0x80000000,   2147483648LL,            2147483648ULL            ) \
+  f("1T",                      BAD_INT,      BAD_INT,      1099511627776LL,         1099511627776ULL         ) \
+  f("1t",                      BAD_INT,      BAD_INT,      1099511627776LL,         1099511627776ULL         ) \
+  f("-1K",                    -1024,         BAD_INT,     -1024,                    BAD_INT                  ) \
   f("0x1K",                    1024,         1024,         1024,                    1024                     ) \
-  f("-0x1K",                  -1024,         BAD,         -1024,                    BAD                      ) \
+  f("-0x1K",                  -1024,         BAD_INT,     -1024,                    BAD_INT                  ) \
   f("0K",                      0,            0,            0,                       0                        ) \
-  f("0x1000000k",              BAD,          BAD,          17179869184LL,           17179869184ULL           ) \
-  f("0x800000m",               BAD,          BAD,          0x80000000000LL,         0x80000000000ULL         ) \
-  f("0x8000g",                 BAD,          BAD,          0x200000000000LL,        0x200000000000ULL        ) \
-  f("0x8000t",                 BAD,          BAD,          0x80000000000000LL,      0x80000000000000ULL      ) \
-  f("-0x1000000k",             BAD,          BAD,         -17179869184LL,           BAD                      ) \
-  f("-0x800000m",              BAD,          BAD,         -0x80000000000LL,         BAD                      ) \
-  f("-0x8000g",                BAD,          BAD,         -0x200000000000LL,        BAD                      ) \
-  f("-0x8000t",                BAD,          BAD,         -0x80000000000000LL,      BAD                      ) \
+  f("0x1000000k",              BAD_INT,      BAD_INT,      17179869184LL,           17179869184ULL           ) \
+  f("0x800000m",               BAD_INT,      BAD_INT,      0x80000000000LL,         0x80000000000ULL         ) \
+  f("0x8000g",                 BAD_INT,      BAD_INT,      0x200000000000LL,        0x200000000000ULL        ) \
+  f("0x8000t",                 BAD_INT,      BAD_INT,      0x80000000000000LL,      0x80000000000000ULL      ) \
+  f("-0x1000000k",             BAD_INT,      BAD_INT,     -17179869184LL,           BAD_INT                  ) \
+  f("-0x800000m",              BAD_INT,      BAD_INT,     -0x80000000000LL,         BAD_INT                  ) \
+  f("-0x8000g",                BAD_INT,      BAD_INT,     -0x200000000000LL,        BAD_INT                  ) \
+  f("-0x8000t",                BAD_INT,      BAD_INT,     -0x80000000000000LL,      BAD_INT                  ) \
   f("0x7fffffff",              0x7fffffff,   0x7fffffff,   0x7fffffff,              0x7fffffff               ) \
-  f("0xffffffff",              BAD,          0xffffffff,   0xffffffff,              0xffffffff               ) \
-  f("0x80000000",              BAD,          0x80000000,   0x80000000,              0x80000000               ) \
-  f("-0x7fffffff",            -2147483647,   BAD,         -2147483647LL,            BAD                      ) \
-  f("-0x80000000",            -2147483648,   BAD,         -2147483648LL,            BAD                      ) \
-  f("-0x80000001",             BAD,          BAD,         -2147483649LL,            BAD                      ) \
-  f("0x100000000",             BAD,          BAD,          0x100000000LL,           0x100000000ULL           ) \
-  f("0xcafebabe",              BAD,          0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
-  f("0XCAFEBABE",              BAD,          0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
-  f("0XCAFEbabe",              BAD,          0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
-  f("0xcafebabe1",             BAD,          BAD,          0xcafebabe1,             0xcafebabe1              ) \
-  f("0x7fffffffffffffff",      BAD,          BAD,          max_jlong,               9223372036854775807ULL   ) \
-  f("0x8000000000000000",      BAD,          BAD,          BAD,                     9223372036854775808ULL   ) \
-  f("0xffffffffffffffff",      BAD,          BAD,          BAD,                     max_julong               ) \
-  f("9223372036854775807",     BAD,          BAD,          9223372036854775807LL,   9223372036854775807ULL   ) \
-  f("9223372036854775808",     BAD,          BAD,          BAD,                     9223372036854775808ULL   ) \
-  f("-9223372036854775808",    BAD,          BAD,          min_jlong,               BAD                      ) \
-  f("18446744073709551615",    BAD,          BAD,          BAD,                     max_julong               ) \
+  f("0xffffffff",              BAD_INT,      0xffffffff,   0xffffffff,              0xffffffff               ) \
+  f("0x80000000",              BAD_INT,      0x80000000,   0x80000000,              0x80000000               ) \
+  f("-0x7fffffff",            -2147483647,   BAD_INT,     -2147483647LL,            BAD_INT                  ) \
+  f("-0x80000000",            -2147483648,   BAD_INT,     -2147483648LL,            BAD_INT                  ) \
+  f("-0x80000001",             BAD_INT,      BAD_INT,     -2147483649LL,            BAD_INT                  ) \
+  f("0x100000000",             BAD_INT,      BAD_INT,      0x100000000LL,           0x100000000ULL           ) \
+  f("0xcafebabe",              BAD_INT,      0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
+  f("0XCAFEBABE",              BAD_INT,      0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
+  f("0XCAFEbabe",              BAD_INT,      0xcafebabe,   0xcafebabe,              0xcafebabe               ) \
+  f("0xcafebabe1",             BAD_INT,      BAD_INT,      0xcafebabe1,             0xcafebabe1              ) \
+  f("0x7fffffffffffffff",      BAD_INT,      BAD_INT,      max_jlong,               9223372036854775807ULL   ) \
+  f("0x8000000000000000",      BAD_INT,      BAD_INT,      BAD_INT,                 9223372036854775808ULL   ) \
+  f("0xffffffffffffffff",      BAD_INT,      BAD_INT,      BAD_INT,                 max_julong               ) \
+  f("9223372036854775807",     BAD_INT,      BAD_INT,      9223372036854775807LL,   9223372036854775807ULL   ) \
+  f("9223372036854775808",     BAD_INT,      BAD_INT,      BAD_INT,                 9223372036854775808ULL   ) \
+  f("-9223372036854775808",    BAD_INT,      BAD_INT,      min_jlong,               BAD_INT                  ) \
+  f("18446744073709551615",    BAD_INT,      BAD_INT,      BAD_INT,                 max_julong               ) \
                                                                                                                \
   /* All edge cases without a k/m/g/t suffix */                                                                \
   f("0x7ffffffe",              max_jint-1,   0x7ffffffe,   0x7ffffffeLL,            0x7ffffffeULL            ) \
   f("0x7fffffff",              max_jint,     0x7fffffff,   0x7fffffffLL,            0x7fffffffULL            ) \
-  f("0x80000000",              BAD,          0x80000000,   0x80000000LL,            0x80000000ULL            ) \
-  f("0xfffffffe",              BAD,          max_juint-1,  0xfffffffeLL,            0xfffffffeULL            ) \
-  f("0xffffffff",              BAD,          max_juint,    0xffffffffLL,            0xffffffffULL            ) \
-  f("0x100000000",             BAD,          BAD,          0x100000000LL,           0x100000000ULL           ) \
-  f("-0x7fffffff",             min_jint+1,   BAD,         -0x7fffffffLL,            BAD                      ) \
-  f("-0x80000000",             min_jint,     BAD,         -0x80000000LL,            BAD                      ) \
-  f("-0x80000001",             BAD,          BAD,         -0x80000001LL,            BAD                      ) \
+  f("0x80000000",              BAD_INT,      0x80000000,   0x80000000LL,            0x80000000ULL            ) \
+  f("0xfffffffe",              BAD_INT,      max_juint-1,  0xfffffffeLL,            0xfffffffeULL            ) \
+  f("0xffffffff",              BAD_INT,      max_juint,    0xffffffffLL,            0xffffffffULL            ) \
+  f("0x100000000",             BAD_INT,      BAD_INT,      0x100000000LL,           0x100000000ULL           ) \
+  f("-0x7fffffff",             min_jint+1,   BAD_INT,     -0x7fffffffLL,            BAD_INT                  ) \
+  f("-0x80000000",             min_jint,     BAD_INT,     -0x80000000LL,            BAD_INT                  ) \
+  f("-0x80000001",             BAD_INT,      BAD_INT,     -0x80000001LL,            BAD_INT                  ) \
                                                                                                                \
-  f("0x7ffffffffffffffe",      BAD,          BAD,          max_jlong-1,             0x7ffffffffffffffeULL    ) \
-  f("0x7fffffffffffffff",      BAD,          BAD,          max_jlong,               0x7fffffffffffffffULL    ) \
-  f("0x8000000000000000",      BAD,          BAD,          BAD,                     0x8000000000000000ULL    ) \
-  f("0xfffffffffffffffe",      BAD,          BAD,          BAD,                     max_julong-1             ) \
-  f("0xffffffffffffffff",      BAD,          BAD,          BAD,                     max_julong               ) \
-  f("0x10000000000000000",     BAD,          BAD,          BAD,                     BAD                      ) \
-  f("-0x7fffffffffffffff",     BAD,          BAD,          min_jlong+1,             BAD                      ) \
-  f("-0x8000000000000000",     BAD,          BAD,          min_jlong,               BAD                      ) \
-  f("-0x8000000000000001",     BAD,          BAD,          BAD,                     BAD                      ) \
+  f("0x7ffffffffffffffe",      BAD_INT,      BAD_INT,      max_jlong-1,             0x7ffffffffffffffeULL    ) \
+  f("0x7fffffffffffffff",      BAD_INT,      BAD_INT,      max_jlong,               0x7fffffffffffffffULL    ) \
+  f("0x8000000000000000",      BAD_INT,      BAD_INT,      BAD_INT,                 0x8000000000000000ULL    ) \
+  f("0xfffffffffffffffe",      BAD_INT,      BAD_INT,      BAD_INT,                 max_julong-1             ) \
+  f("0xffffffffffffffff",      BAD_INT,      BAD_INT,      BAD_INT,                 max_julong               ) \
+  f("0x10000000000000000",     BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
+  f("-0x7fffffffffffffff",     BAD_INT,      BAD_INT,      min_jlong+1,             BAD_INT                  ) \
+  f("-0x8000000000000000",     BAD_INT,      BAD_INT,      min_jlong,               BAD_INT                  ) \
+  f("-0x8000000000000001",     BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
                                                                                                                \
   /* edge cases for suffix: K */                                                                               \
   f("0x1ffffek",               0x1ffffe * k, 0x1ffffeU * k,0x1ffffeLL * k,          0x1ffffeULL * k          ) \
   f("0x1fffffk",               0x1fffff * k, 0x1fffffU * k,0x1fffffLL * k,          0x1fffffULL * k          ) \
-  f("0x200000k",               BAD,          0x200000U * k,0x200000LL * k,          0x200000ULL * k          ) \
-  f("0x3ffffek",               BAD,          0x3ffffeU * k,0x3ffffeLL * k,          0x3ffffeULL * k          ) \
-  f("0x3fffffk",               BAD,          0x3fffffU * k,0x3fffffLL * k,          0x3fffffULL * k          ) \
-  f("0x400000k",               BAD,          BAD,          0x400000LL * k,          0x400000ULL * k          ) \
-  f("-0x1fffffk",             -0x1fffff * k, BAD,         -0x1fffffLL * k,          BAD                      ) \
-  f("-0x200000k",             -0x200000 * k, BAD,         -0x200000LL * k,          BAD                      ) \
-  f("-0x200001k",              BAD,          BAD,         -0x200001LL * k,          BAD                      ) \
+  f("0x200000k",               BAD_INT,      0x200000U * k,0x200000LL * k,          0x200000ULL * k          ) \
+  f("0x3ffffek",               BAD_INT,      0x3ffffeU * k,0x3ffffeLL * k,          0x3ffffeULL * k          ) \
+  f("0x3fffffk",               BAD_INT,      0x3fffffU * k,0x3fffffLL * k,          0x3fffffULL * k          ) \
+  f("0x400000k",               BAD_INT,      BAD_INT,      0x400000LL * k,          0x400000ULL * k          ) \
+  f("-0x1fffffk",             -0x1fffff * k, BAD_INT,     -0x1fffffLL * k,          BAD_INT                  ) \
+  f("-0x200000k",             -0x200000 * k, BAD_INT,     -0x200000LL * k,          BAD_INT                  ) \
+  f("-0x200001k",              BAD_INT,      BAD_INT,     -0x200001LL * k,          BAD_INT                  ) \
                                                                                                                \
-  f("0x1ffffffffffffek",       BAD,          BAD,          0x1ffffffffffffeLL * k,  0x1ffffffffffffeULL * k  ) \
-  f("0x1fffffffffffffk",       BAD,          BAD,          0x1fffffffffffffLL * k,  0x1fffffffffffffULL * k  ) \
-  f("0x20000000000000k",       BAD,          BAD,          BAD,                     0x20000000000000ULL * k  ) \
-  f("0x3ffffffffffffek",       BAD,          BAD,          BAD,                     0x3ffffffffffffeULL * k  ) \
-  f("0x3fffffffffffffk",       BAD,          BAD,          BAD,                     0x3fffffffffffffULL * k  ) \
-  f("0x40000000000000k",       BAD,          BAD,          BAD,                     BAD                      ) \
-  f("-0x1fffffffffffffk",      BAD,          BAD,         -0x1fffffffffffffLL * k,  BAD                      ) \
-  f("-0x20000000000000k",      BAD,          BAD,         -0x20000000000000LL * k,  BAD                      ) \
-  f("-0x20000000000001k",      BAD,          BAD,          BAD,                     BAD                      ) \
+  f("0x1ffffffffffffek",       BAD_INT,      BAD_INT,      0x1ffffffffffffeLL * k,  0x1ffffffffffffeULL * k  ) \
+  f("0x1fffffffffffffk",       BAD_INT,      BAD_INT,      0x1fffffffffffffLL * k,  0x1fffffffffffffULL * k  ) \
+  f("0x20000000000000k",       BAD_INT,      BAD_INT,      BAD_INT,                 0x20000000000000ULL * k  ) \
+  f("0x3ffffffffffffek",       BAD_INT,      BAD_INT,      BAD_INT,                 0x3ffffffffffffeULL * k  ) \
+  f("0x3fffffffffffffk",       BAD_INT,      BAD_INT,      BAD_INT,                 0x3fffffffffffffULL * k  ) \
+  f("0x40000000000000k",       BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
+  f("-0x1fffffffffffffk",      BAD_INT,      BAD_INT,     -0x1fffffffffffffLL * k,  BAD_INT                  ) \
+  f("-0x20000000000000k",      BAD_INT,      BAD_INT,     -0x20000000000000LL * k,  BAD_INT                  ) \
+  f("-0x20000000000001k",      BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
                                                                                                                \
   /* edge cases for suffix: M */                                                                               \
   f("0x7fem",                  0x7fe * m,    0x7feU * m,   0x7feLL * m,             0x7feULL * m             ) \
   f("0x7ffm",                  0x7ff * m,    0x7ffU * m,   0x7ffLL * m,             0x7ffULL * m             ) \
-  f("0x800m",                  BAD,          0x800U * m,   0x800LL * m,             0x800ULL * m             ) \
-  f("0xffem",                  BAD,          0xffeU * m,   0xffeLL * m,             0xffeULL * m             ) \
-  f("0xfffm",                  BAD,          0xfffU * m,   0xfffLL * m,             0xfffULL * m             ) \
-  f("0x1000m",                 BAD,          BAD,          0x1000LL * m,            0x1000ULL * m            ) \
-  f("-0x7ffm",                -0x7ff * m,    BAD,         -0x7ffLL * m,             BAD                      ) \
-  f("-0x800m",                -0x800 * m,    BAD,         -0x800LL * m,             BAD                      ) \
-  f("-0x801m",                 BAD,          BAD,         -0x801LL * m,             BAD                      ) \
+  f("0x800m",                  BAD_INT,      0x800U * m,   0x800LL * m,             0x800ULL * m             ) \
+  f("0xffem",                  BAD_INT,      0xffeU * m,   0xffeLL * m,             0xffeULL * m             ) \
+  f("0xfffm",                  BAD_INT,      0xfffU * m,   0xfffLL * m,             0xfffULL * m             ) \
+  f("0x1000m",                 BAD_INT,      BAD_INT,      0x1000LL * m,            0x1000ULL * m            ) \
+  f("-0x7ffm",                -0x7ff * m,    BAD_INT,     -0x7ffLL * m,             BAD_INT                  ) \
+  f("-0x800m",                -0x800 * m,    BAD_INT,     -0x800LL * m,             BAD_INT                  ) \
+  f("-0x801m",                 BAD_INT,      BAD_INT,     -0x801LL * m,             BAD_INT                  ) \
                                                                                                                \
-  f("0x7fffffffffem",          BAD,          BAD,          0x7fffffffffeLL * m,     0x7fffffffffeULL * m     ) \
-  f("0x7ffffffffffm",          BAD,          BAD,          0x7ffffffffffLL * m,     0x7ffffffffffULL * m     ) \
-  f("0x80000000000m",          BAD,          BAD,          BAD,                     0x80000000000ULL * m     ) \
-  f("0xffffffffffem",          BAD,          BAD,          BAD,                     0xffffffffffeULL * m     ) \
-  f("0xfffffffffffm",          BAD,          BAD,          BAD,                     0xfffffffffffULL * m     ) \
-  f("0x100000000000m",         BAD,          BAD,          BAD,                     BAD                      ) \
-  f("-0x7ffffffffffm",         BAD,          BAD,         -0x7ffffffffffLL * m,     BAD                      ) \
-  f("-0x80000000000m",         BAD,          BAD,         -0x80000000000LL * m,     BAD                      ) \
-  f("-0x80000000001m",         BAD,          BAD,          BAD,                     BAD                      ) \
+  f("0x7fffffffffem",          BAD_INT,      BAD_INT,      0x7fffffffffeLL * m,     0x7fffffffffeULL * m     ) \
+  f("0x7ffffffffffm",          BAD_INT,      BAD_INT,      0x7ffffffffffLL * m,     0x7ffffffffffULL * m     ) \
+  f("0x80000000000m",          BAD_INT,      BAD_INT,      BAD_INT,                 0x80000000000ULL * m     ) \
+  f("0xffffffffffem",          BAD_INT,      BAD_INT,      BAD_INT,                 0xffffffffffeULL * m     ) \
+  f("0xfffffffffffm",          BAD_INT,      BAD_INT,      BAD_INT,                 0xfffffffffffULL * m     ) \
+  f("0x100000000000m",         BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
+  f("-0x7ffffffffffm",         BAD_INT,      BAD_INT,     -0x7ffffffffffLL * m,     BAD_INT                  ) \
+  f("-0x80000000000m",         BAD_INT,      BAD_INT,     -0x80000000000LL * m,     BAD_INT                  ) \
+  f("-0x80000000001m",         BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
                                                                                                                \
   /* edge cases for suffix: G */                                                                               \
   f("0x0g",                    0x0 * g,      0x0U * g,     0x0LL * g,               0x0ULL * g               ) \
   f("0x1g",                    0x1 * g,      0x1U * g,     0x1LL * g,               0x1ULL * g               ) \
-  f("0x2g",                    BAD,          0x2U * g,     0x2LL * g,               0x2ULL * g               ) \
-  f("0x3g",                    BAD,          0x3U * g,     0x3LL * g,               0x3ULL * g               ) \
-  f("0x4g",                    BAD,          BAD,          0x4LL * g,               0x4ULL * g               ) \
-  f("-0x1g",                  -0x1 * g,      BAD,         -0x1LL * g,               BAD                      ) \
-  f("-0x2g",                  -0x2 * g,      BAD,         -0x2LL * g,               BAD                      ) \
-  f("-0x3g",                   BAD,          BAD,         -0x3LL * g,               BAD                      ) \
+  f("0x2g",                    BAD_INT,      0x2U * g,     0x2LL * g,               0x2ULL * g               ) \
+  f("0x3g",                    BAD_INT,      0x3U * g,     0x3LL * g,               0x3ULL * g               ) \
+  f("0x4g",                    BAD_INT,      BAD_INT,      0x4LL * g,               0x4ULL * g               ) \
+  f("-0x1g",                  -0x1 * g,      BAD_INT,     -0x1LL * g,               BAD_INT                  ) \
+  f("-0x2g",                  -0x2 * g,      BAD_INT,     -0x2LL * g,               BAD_INT                  ) \
+  f("-0x3g",                   BAD_INT,      BAD_INT,     -0x3LL * g,               BAD_INT                  ) \
                                                                                                                \
-  f("0x1fffffffeg",            BAD,          BAD,          0x1fffffffeLL * g,       0x1fffffffeULL * g       ) \
-  f("0x1ffffffffg",            BAD,          BAD,          0x1ffffffffLL * g,       0x1ffffffffULL * g       ) \
-  f("0x200000000g",            BAD,          BAD,          BAD,                     0x200000000ULL * g       ) \
-  f("0x3fffffffeg",            BAD,          BAD,          BAD,                     0x3fffffffeULL * g       ) \
-  f("0x3ffffffffg",            BAD,          BAD,          BAD,                     0x3ffffffffULL * g       ) \
-  f("0x400000000g",            BAD,          BAD,          BAD,                     BAD                      ) \
-  f("-0x1ffffffffg",           BAD,          BAD,         -0x1ffffffffLL * g,       BAD                      ) \
-  f("-0x200000000g",           BAD,          BAD,         -0x200000000LL * g,       BAD                      ) \
-  f("-0x200000001g",           BAD,          BAD,          BAD,                     BAD                      ) \
+  f("0x1fffffffeg",            BAD_INT,      BAD_INT,      0x1fffffffeLL * g,       0x1fffffffeULL * g       ) \
+  f("0x1ffffffffg",            BAD_INT,      BAD_INT,      0x1ffffffffLL * g,       0x1ffffffffULL * g       ) \
+  f("0x200000000g",            BAD_INT,      BAD_INT,      BAD_INT,                 0x200000000ULL * g       ) \
+  f("0x3fffffffeg",            BAD_INT,      BAD_INT,      BAD_INT,                 0x3fffffffeULL * g       ) \
+  f("0x3ffffffffg",            BAD_INT,      BAD_INT,      BAD_INT,                 0x3ffffffffULL * g       ) \
+  f("0x400000000g",            BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
+  f("-0x1ffffffffg",           BAD_INT,      BAD_INT,     -0x1ffffffffLL * g,       BAD_INT                  ) \
+  f("-0x200000000g",           BAD_INT,      BAD_INT,     -0x200000000LL * g,       BAD_INT                  ) \
+  f("-0x200000001g",           BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
                                                                                                                \
   /* edge cases for suffix: T */                                                                               \
-  f("0x7ffffet",               BAD,          BAD,          0x7ffffeLL * t,          0x7ffffeULL * t          ) \
-  f("0x7ffffft",               BAD,          BAD,          0x7fffffLL * t,          0x7fffffULL * t          ) \
-  f("0x800000t",               BAD,          BAD,          BAD,                     0x800000ULL * t          ) \
-  f("0xfffffet",               BAD,          BAD,          BAD,                     0xfffffeULL * t          ) \
-  f("0xfffffft",               BAD,          BAD,          BAD,                     0xffffffULL * t          ) \
-  f("0x1000000t",              BAD,          BAD,          BAD,                     BAD                      ) \
-  f("-0x7ffffft",              BAD,          BAD,         -0x7fffffLL * t,          BAD                      ) \
-  f("-0x800000t",              BAD,          BAD,         -0x800000LL * t,          BAD                      ) \
-  f("-0x800001t",              BAD,          BAD,          BAD,                     BAD                      )
+  f("0x7ffffet",               BAD_INT,      BAD_INT,      0x7ffffeLL * t,          0x7ffffeULL * t          ) \
+  f("0x7ffffft",               BAD_INT,      BAD_INT,      0x7fffffLL * t,          0x7fffffULL * t          ) \
+  f("0x800000t",               BAD_INT,      BAD_INT,      BAD_INT,                 0x800000ULL * t          ) \
+  f("0xfffffet",               BAD_INT,      BAD_INT,      BAD_INT,                 0xfffffeULL * t          ) \
+  f("0xfffffft",               BAD_INT,      BAD_INT,      BAD_INT,                 0xffffffULL * t          ) \
+  f("0x1000000t",              BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  ) \
+  f("-0x7ffffft",              BAD_INT,      BAD_INT,     -0x7fffffLL * t,          BAD_INT                  ) \
+  f("-0x800000t",              BAD_INT,      BAD_INT,     -0x800000LL * t,          BAD_INT                  ) \
+  f("-0x800001t",              BAD_INT,      BAD_INT,      BAD_INT,                 BAD_INT                  )
 
 #define INTEGER_TEST_i32(s, i32, u32, i64, u64) NumericArgument<T>(s, i32),
 #define INTEGER_TEST_u32(s, i32, u32, i64, u64) NumericArgument<T>(s, u32),
-- 
GitLab


From c587b29bc9ca7e6d3879fda7df099b7411624f19 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Sat, 26 Mar 2022 13:32:10 +0000
Subject: [PATCH 223/345] 8283720: ProblemList
 java/time/test/java/time/TestZoneOffset.java

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

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 25858d1cb71..0626a952784 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -759,6 +759,8 @@ javax/swing/JTree/4908142/bug4908142.java 8278348 macosx-all
 
 # jdk_time
 
+java/time/test/java/time/TestZoneOffset.java                    8283716 generic-all
+
 
 ############################################################################
 
-- 
GitLab


From b0daf70a251ba0ca04ca757b98cffd5607a154d4 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Sat, 26 Mar 2022 21:46:22 +0000
Subject: [PATCH 224/345] 8263134: HotSpot Style Guide should disallow
 inheriting constructors

Reviewed-by: dholmes, dcubed, kvn
---
 doc/hotspot-style.html |  5 +++++
 doc/hotspot-style.md   | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index c93b941c988..3c0332e4b49 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -51,6 +51,7 @@
 <li><a href="#atomic">&lt;atomic&gt;</a></li>
 <li><a href="#uniform-initialization">Uniform Initialization</a></li>
 <li><a href="#local-function-objects">Local Function Objects</a></li>
+<li><a href="#inheriting-constructors">Inheriting constructors</a></li>
 <li><a href="#additional-permitted-features">Additional Permitted Features</a></li>
 <li><a href="#excluded-features">Excluded Features</a></li>
 <li><a href="#undecided-features">Undecided Features</a></li>
@@ -405,6 +406,10 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <ul>
 <li>Make () more optional for lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p1102r2.html">p1102r2</a>)</li>
 </ul>
+<h3 id="inheriting-constructors">Inheriting constructors</h3>
+<p>Do not use <em>inheriting constructors</em> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2540.htm">n2540</a>).</p>
+<p>C++11 provides simple syntax allowing a class to inherit the constructors of a base class. Unfortunately there are a number of problems with the original specification, and C++17 contains significant revisions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html" title="p0136r1">p0136r1</a> opens with a list of 8 Core Issues). Since HotSpot doesn't support use of C++17, use of inherited constructors could run into those problems. Such uses might also change behavior in a future HotSpot update to use C++17 or later, potentially in subtle ways that could lead to hard to diagnose problems. Because of this, HotSpot code must not use inherited constructors.</p>
+<p>Note that gcc7 provides the <code>-fnew-inheriting-ctors</code> option to use the <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html" title="p0136r1">p0136r1</a> semantics. This is enabled by default when using C++17 or later. It is also enabled by default for <code>fabi-version=11</code> (introduced by gcc7) or higher when using C++11/14, as the change is considered a Defect Report that applies to those versions. Earlier versions of gcc don't have that option, and other supported compilers may not have anything similar.</p>
 <h3 id="additional-permitted-features">Additional Permitted Features</h3>
 <ul>
 <li><p><code>constexpr</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf">n2235</a>) (<a href="https://isocpp.org/files/papers/N3652.html">n3652</a>)</p></li>
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 89d9684672d..f8825cbd07b 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -985,6 +985,30 @@ References from C++23
 
 [p1102r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p1102r2.html
 
+### Inheriting constructors
+
+Do not use _inheriting constructors_
+([n2540](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2540.htm)).
+
+C++11 provides simple syntax allowing a class to inherit the constructors of a
+base class.  Unfortunately there are a number of problems with the original
+specification, and C++17 contains significant revisions ([p0136r1] opens with
+a list of 8 Core Issues).  Since HotSpot doesn't support use of C++17, use of
+inherited constructors could run into those problems. Such uses might also
+change behavior in a future HotSpot update to use C++17 or later, potentially
+in subtle ways that could lead to hard to diagnose problems.  Because of this,
+HotSpot code must not use inherited constructors.
+
+Note that gcc7 provides the `-fnew-inheriting-ctors` option to use the
+[p0136r1] semantics.  This is enabled by default when using C++17 or later.
+It is also enabled by default for `fabi-version=11` (introduced by gcc7) or
+higher when using C++11/14, as the change is considered a Defect Report that
+applies to those versions.  Earlier versions of gcc don't have that option,
+and other supported compilers may not have anything similar.
+
+[p0136r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html
+  "p0136r1"
+
 ### Additional Permitted Features
 
 * `constexpr`
-- 
GitLab


From c2c0cb2a4372d78658326461562363de9a1a194f Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Sat, 26 Mar 2022 21:55:33 +0000
Subject: [PATCH 225/345] 8282668: HotSpot Style Guide should permit
 unrestricted unions

Reviewed-by: dholmes, dcubed, tschatzl, kvn
---
 doc/hotspot-style.html | 1 +
 doc/hotspot-style.md   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index 3c0332e4b49..f0dfad09eb8 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -428,6 +428,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><p><code>final</code> virtual specifiers for classes and virtual functions (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm">n2928</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm">n3206</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm">n3272</a>)</p></li>
 <li><p><code>override</code> virtual specifiers for virtual functions (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm">n2928</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm">n3206</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm">n3272</a>)</p></li>
 <li><p>Range-based <code>for</code> loops (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html">n2930</a>) (<a href="https://en.cppreference.com/w/cpp/language/range-for">range-for</a>)</p></li>
+<li><p>Unrestricted Unions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2544.pdf">n2544</a>)</p></li>
 </ul>
 <h3 id="excluded-features">Excluded Features</h3>
 <ul>
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index f8825cbd07b..9dfff6f3ff1 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -1067,6 +1067,9 @@ and other supported compilers may not have anything similar.
 ([n2930](http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html))
 ([range-for](https://en.cppreference.com/w/cpp/language/range-for))
 
+* Unrestricted Unions
+([n2544](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2544.pdf))
+
 ### Excluded Features
 
 * New string and character literals
-- 
GitLab


From 66f1da188514dc111e417c7e8071f051a9c9cc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rickard=20B=C3=A4ckman?= <rbackman@openjdk.org>
Date: Mon, 28 Mar 2022 07:34:11 +0000
Subject: [PATCH 226/345] 8281222: ciTypeFlow::profiled_count fails "assert(0
 <= i && i < _len) failed: illegal index"

Reviewed-by: roland, chagedorn, thartmann
---
 src/hotspot/share/ci/ciTypeFlow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/ci/ciTypeFlow.cpp b/src/hotspot/share/ci/ciTypeFlow.cpp
index 6ce6325cf91..e4ffd7dd9fe 100644
--- a/src/hotspot/share/ci/ciTypeFlow.cpp
+++ b/src/hotspot/share/ci/ciTypeFlow.cpp
@@ -2460,7 +2460,7 @@ int ciTypeFlow::profiled_count(ciTypeFlow::Loop* loop) {
     return 0;
   }
   ciTypeFlow::Block* tail = loop->tail();
-  if (tail->control() == -1) {
+  if (tail->control() == -1 || tail->has_trap()) {
     return 0;
   }
 
-- 
GitLab


From 7f125373a7f178d2ae7ebefe58a3a47b2792fcb6 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 28 Mar 2022 07:59:52 +0000
Subject: [PATCH 227/345] 8283558: Parallel: Pass PSIsAliveClosure to
 ReferenceProcessor constructor

Reviewed-by: tschatzl, kbarrett
---
 src/hotspot/share/gc/parallel/psScavenge.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index b6ca29adefc..4309b3af6c4 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -758,7 +758,7 @@ void PSScavenge::initialize() {
                            ParallelGCThreads,          // mt processing degree
                            ParallelGCThreads,          // mt discovery degree
                            false,                      // concurrent_discovery
-                           NULL);                      // header provides liveness info
+                           &_is_alive_closure);        // header provides liveness info
 
   // Cache the cardtable
   _card_table = heap->card_table();
-- 
GitLab


From cdef087aae5d0edb3ad3421107d7dc2b5e18dd28 Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Mon, 28 Mar 2022 09:49:05 +0000
Subject: [PATCH 228/345] 8283727: P11KeyGenerator has import statement with
 two semicolons after JDK-8267319

Reviewed-by: mullan
---
 .../share/classes/sun/security/pkcs11/P11KeyGenerator.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
index 012eb25392c..5bc199b55ad 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
@@ -30,7 +30,7 @@ import java.security.spec.AlgorithmParameterSpec;
 
 import javax.crypto.*;
 
-import sun.security.util.SecurityProviderConstants;;
+import sun.security.util.SecurityProviderConstants;
 import static sun.security.pkcs11.TemplateManager.*;
 import sun.security.pkcs11.wrapper.*;
 import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
-- 
GitLab


From f4eaa16c0fe0659376325cec1c912a13ef0f1be8 Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Mon, 28 Mar 2022 09:59:40 +0000
Subject: [PATCH 229/345] 8283728: jdk.hotspot.agent: Wrong location for
 RISCV64ThreadContext.java

Reviewed-by: fyang, jiefu, dholmes
---
 .../debugger/{risv64 => riscv64}/RISCV64ThreadContext.java        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/{risv64 => riscv64}/RISCV64ThreadContext.java (100%)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/risv64/RISCV64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/riscv64/RISCV64ThreadContext.java
similarity index 100%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/risv64/RISCV64ThreadContext.java
rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/riscv64/RISCV64ThreadContext.java
-- 
GitLab


From 8567266795cd1171f5b353d0e0813e7eeff319c2 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Mon, 28 Mar 2022 11:07:14 +0000
Subject: [PATCH 230/345] 8283683: Make ThreadLocalRandom a final class

Reviewed-by: smarks, chegar
---
 .../share/classes/java/util/concurrent/ThreadLocalRandom.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 de8dd5f8580..890d8a0824c 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -93,7 +93,7 @@ import jdk.internal.misc.VM;
         i = 64, j = 0, k = 0,
         equidistribution = 1
 )
-public class ThreadLocalRandom extends Random {
+public final class ThreadLocalRandom extends Random {
     /*
      * This class implements the java.util.Random API (and subclasses
      * Random) using a single static instance that accesses 64 bits of
-- 
GitLab


From d6fa8b004bcd0a2fc1015055d0177428889b4c31 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Mon, 28 Mar 2022 12:28:18 +0000
Subject: [PATCH 231/345] 8283469: Don't use memset to initialize members in
 FileMapInfo and fix memory leak

Reviewed-by: iklam, kbarrett
---
 src/hotspot/share/cds/filemap.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 3879f933613..efa0fd8275a 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -166,10 +166,9 @@ template <int N> static void get_header_version(char (&header_version) [N]) {
   assert(header_version[JVM_IDENT_MAX-1] == 0, "must be");
 }
 
-FileMapInfo::FileMapInfo(const char* full_path, bool is_static) {
-  memset((void*)this, 0, sizeof(FileMapInfo));
-  _full_path = full_path;
-  _is_static = is_static;
+FileMapInfo::FileMapInfo(const char* full_path, bool is_static) :
+  _is_static(is_static), _file_open(false), _is_mapped(false), _fd(-1), _file_offset(0),
+  _full_path(full_path), _base_archive_name(nullptr), _header(nullptr) {
   if (_is_static) {
     assert(_current_info == NULL, "must be singleton"); // not thread safe
     _current_info = this;
@@ -177,8 +176,6 @@ FileMapInfo::FileMapInfo(const char* full_path, bool is_static) {
     assert(_dynamic_archive_info == NULL, "must be singleton"); // not thread safe
     _dynamic_archive_info = this;
   }
-  _file_offset = 0;
-  _file_open = false;
 }
 
 FileMapInfo::~FileMapInfo() {
@@ -189,6 +186,11 @@ FileMapInfo::~FileMapInfo() {
     assert(_dynamic_archive_info == this, "must be singleton"); // not thread safe
     _dynamic_archive_info = NULL;
   }
+
+  if (_header != nullptr) {
+    os::free(_header);
+  }
+
   if (_file_open) {
     ::close(_fd);
   }
-- 
GitLab


From 0c472c8a4ff01b3bc8fba5df82c24c240586e5c5 Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Mon, 28 Mar 2022 13:41:18 +0000
Subject: [PATCH 232/345] 8283756: (zipfs)
 ZipFSOutputStreamTest.testOutputStream should only check inflated bytes

Reviewed-by: jpai, alanb, lancea
---
 test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java b/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java
index 77f866e9fdf..8175eec070d 100644
--- a/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java
+++ b/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java
@@ -117,7 +117,7 @@ public class ZipFSOutputStreamTest {
                     while ((numRead = is.read(buf)) != -1) {
                         totalRead += numRead;
                         // verify the content
-                        Assert.assertEquals(Arrays.mismatch(buf, chunk), -1,
+                        Assert.assertEquals(Arrays.mismatch(buf, 0, numRead, chunk, 0, numRead), -1,
                                 "Unexpected content in " + entryPath);
                     }
                     System.out.println("Read entry " + entryPath + " of bytes " + totalRead
-- 
GitLab


From 7f2a3ca289ae14bec1af24d0a51e98ba697ce9c1 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Mon, 28 Mar 2022 13:51:55 +0000
Subject: [PATCH 233/345] 8281561: Disable http DIGEST mechanism with MD5 and
 SHA-1 by default

Reviewed-by: weijun, dfuchs
---
 .../java/net/doc-files/net-properties.html    |   8 +
 .../protocol/http/DigestAuthentication.java   | 293 +++++++++++++++---
 .../share/conf/security/java.security         |  10 +
 test/jdk/java/net/Authenticator/B4722333.java |   2 +-
 test/jdk/java/net/Authenticator/B4759514.java |   4 +-
 test/jdk/java/net/Authenticator/B6870935.java |   6 +-
 test/jdk/java/net/Authenticator/B8034170.java |   8 +-
 .../HTTPSetAuthenticatorTest.java             |   8 +-
 .../SetAuthenticator/HTTPTest.java            |  19 +-
 .../SetAuthenticator/HTTPTestServer.java      |  43 ++-
 .../http/HttpURLConnection/DigestAuth.java    | 243 +++++++++++++--
 .../sun/net/www/http/HttpURLConnection/hosts  |   1 +
 .../sun/net/www/protocol/http/DigestTest.java |  16 +-
 .../jdk/sun/net/www/protocol/http/NoNTLM.java |   5 +-
 14 files changed, 571 insertions(+), 95 deletions(-)
 create mode 100644 test/jdk/sun/net/www/http/HttpURLConnection/hosts

diff --git a/src/java.base/share/classes/java/net/doc-files/net-properties.html b/src/java.base/share/classes/java/net/doc-files/net-properties.html
index e2d8bfe755c..ffc65492b51 100644
--- a/src/java.base/share/classes/java/net/doc-files/net-properties.html
+++ b/src/java.base/share/classes/java/net/doc-files/net-properties.html
@@ -224,6 +224,14 @@ of proxies.</P>
 	      property is defined, then its value will be used as the domain
 	      name.</P>
 	</OL>
+	<LI><P><B>{@systemProperty http.auth.digest.reEnabledAlgorithms}</B> (default: &lt;none&gt;)<BR>
+        By default, certain message digest algorithms are disabled for use in HTTP Digest
+        authentication due to their proven security limitations. This only applies to proxy
+        authentication and plain-text HTTP server authentication. Disabled algorithms are still
+        usable for HTTPS server authentication. The default list of disabled algorithms is specified
+        in the {@code java.security} properties file and currently comprises {@code MD5} and
+        {@code SHA-1}. If it is still required to use one of these algorithms, then they can be
+        re-enabled by setting this property to a comma separated list of the algorithm names.</P>
 	<LI><P><B>{@systemProperty jdk.https.negotiate.cbt}</B> (default: &lt;never&gt;)<BR>
 	This controls the generation and sending of TLS channel binding tokens (CBT) when Kerberos 
         or the Negotiate authentication scheme using Kerberos are employed over HTTPS with
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java b/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
index 843baea872c..151a28cd4db 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
@@ -29,17 +29,32 @@ import java.io.*;
 import java.net.PasswordAuthentication;
 import java.net.ProtocolException;
 import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.StandardCharsets;
 import java.security.AccessController;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivilegedAction;
+import java.security.Security;
+import java.text.Normalizer;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Random;
+import java.util.Set;
+import java.util.function.BiConsumer;
 
 import sun.net.NetProperties;
 import sun.net.www.HeaderParser;
 import sun.nio.cs.ISO_8859_1;
+import sun.security.util.KnownOIDs;
+import sun.util.logging.PlatformLogger;
 
 import static sun.net.www.protocol.http.HttpURLConnection.HTTP_CONNECT;
 
@@ -57,22 +72,67 @@ class DigestAuthentication extends AuthenticationInfo {
 
     private String authMethod;
 
-    private static final String compatPropName = "http.auth.digest." +
+    private static final String propPrefix = "http.auth.digest.";
+
+    private static final String compatPropName = propPrefix +
         "quoteParameters";
 
+    // Takes a set and input string containing comma separated values. converts to upper
+    // case, and trims each value, then applies given function to set and value
+    // (either add or delete element from set)
+    private static void processPropValue(String input,
+        Set<String> theSet,
+        BiConsumer<Set<String>,String> consumer)
+    {
+        if (input == null) {
+            return;
+        }
+        String[] values = input.toUpperCase(Locale.ROOT).split(",");
+        for (String v : values) {
+            consumer.accept(theSet, v.trim());
+        }
+    }
+
+    private static final String secPropName =
+        propPrefix + "disabledAlgorithms";
+
+    // A net property which overrides the disabled set above.
+    private static final String enabledAlgPropName =
+        propPrefix + "reEnabledAlgorithms";
+
+    // Set of disabled message digest algorithms
+    private static final Set<String> disabledDigests;
+
     // true if http.auth.digest.quoteParameters Net property is true
     private static final boolean delimCompatFlag;
 
+    private static final PlatformLogger logger =
+        HttpURLConnection.getHttpLogger();
+
     static {
         @SuppressWarnings("removal")
         Boolean b = AccessController.doPrivileged(
-            new PrivilegedAction<>() {
-                public Boolean run() {
-                    return NetProperties.getBoolean(compatPropName);
-                }
-            }
+            (PrivilegedAction<Boolean>) () -> NetProperties.getBoolean(compatPropName)
         );
         delimCompatFlag = (b == null) ? false : b.booleanValue();
+
+        @SuppressWarnings("removal")
+        String secprops = AccessController.doPrivileged(
+            (PrivilegedAction<String>) () -> Security.getProperty(secPropName)
+        );
+
+        Set<String> algs = new HashSet<>();
+
+        // add the default insecure algorithms to set
+        processPropValue(secprops, algs, (set, elem) -> set.add(elem));
+
+        @SuppressWarnings("removal")
+        String netprops = AccessController.doPrivileged(
+            (PrivilegedAction<String>) () -> NetProperties.get(enabledAlgPropName)
+        );
+        // remove any algorithms from disabled set that were opted-in by user
+        processPropValue(netprops, algs, (set, elem) -> set.remove(elem));
+        disabledDigests = Set.copyOf(algs);
     }
 
     // Authentication parameters defined in RFC2617.
@@ -90,9 +150,18 @@ class DigestAuthentication extends AuthenticationInfo {
         private String cnonce;
         private String nonce;
         private String algorithm;
+        // Normally same as algorithm, but excludes the -SESS suffix if present
+        private String digestName;
+        private String charset;
         private int NCcount=0;
 
-        // The H(A1) string used for MD5-sess
+        // true if the server supports user hashing
+        // in which case the username returned to server
+        // will be H(unq(username) ":" unq(realm))
+        // meaning the username doesn't appear in the clear
+        private boolean userhash;
+
+        // The H(A1) string used for XXX-sess
         private String  cachedHA1;
 
         // Force the HA1 value to be recalculated because the nonce has changed
@@ -112,8 +181,10 @@ class DigestAuthentication extends AuthenticationInfo {
             serverQop = false;
             opaque = null;
             algorithm = null;
+            digestName = null;
             cachedHA1 = null;
             nonce = null;
+            charset = null;
             setNewCnonce();
         }
 
@@ -151,6 +222,24 @@ class DigestAuthentication extends AuthenticationInfo {
             redoCachedHA1 = true;
         }
 
+        synchronized boolean getUserhash() {
+            return userhash;
+        }
+
+        synchronized void setUserhash(boolean userhash) {
+            this.userhash = userhash;
+        }
+
+        synchronized Charset getCharset() {
+            return "UTF-8".equals(charset)
+                ? StandardCharsets.UTF_8
+                : StandardCharsets.ISO_8859_1;
+        }
+
+        synchronized void setCharset(String charset) {
+            this.charset = charset;
+        }
+
         synchronized void setQop (String qop) {
             if (qop != null) {
                 String items[] = qop.split(",");
@@ -191,7 +280,13 @@ class DigestAuthentication extends AuthenticationInfo {
         }
 
         synchronized String getAlgorithm () { return algorithm;}
+        synchronized String getDigestName () {
+            return digestName;
+        }
         synchronized void setAlgorithm (String s) { algorithm=s;}
+        synchronized void setDigestName (String s) {
+            this.digestName = s;
+        }
     }
 
     Parameters params;
@@ -309,6 +404,16 @@ class DigestAuthentication extends AuthenticationInfo {
         params.setNonce (p.findValue("nonce"));
         params.setOpaque (p.findValue("opaque"));
         params.setQop (p.findValue("qop"));
+        params.setUserhash (Boolean.valueOf(p.findValue("userhash")));
+        String charset = p.findValue("charset");
+        if (charset == null) {
+            charset = "ISO_8859_1";
+        } else if (!charset.equalsIgnoreCase("UTF-8")) {
+            // UTF-8 is only valid value. ISO_8859_1 represents default behavior
+            // when the parameter is not set.
+            return false;
+        }
+        params.setCharset(charset.toUpperCase(Locale.ROOT));
 
         String uri="";
         String method;
@@ -333,11 +438,9 @@ class DigestAuthentication extends AuthenticationInfo {
             authMethod = Character.toUpperCase(authMethod.charAt(0))
                         + authMethod.substring(1).toLowerCase();
         }
-        String algorithm = p.findValue("algorithm");
-        if (algorithm == null || algorithm.isEmpty()) {
-            algorithm = "MD5";  // The default, accoriding to rfc2069
-        }
-        params.setAlgorithm (algorithm);
+
+        if (!setAlgorithmNames(p, params))
+            return false;
 
         // If authQop is true, then the server is doing RFC2617 and
         // has offered qop=auth. We do not support any other modes
@@ -356,6 +459,38 @@ class DigestAuthentication extends AuthenticationInfo {
         }
     }
 
+    // Algorithm name is stored in two separate fields (of Paramaeters)
+    // This allows for variations in digest algorithm name (aliases)
+    // and also allow for the -sess variant defined in HTTP Digest protocol
+    // returns false if algorithm not supported
+    private static boolean setAlgorithmNames(HeaderParser p, Parameters params) {
+        String algorithm = p.findValue("algorithm");
+        String digestName = algorithm;
+        if (algorithm == null || algorithm.isEmpty()) {
+            algorithm = "MD5";  // The default, accoriding to rfc2069
+            digestName = "MD5";
+        } else {
+            algorithm = algorithm.toUpperCase(Locale.ROOT);
+            digestName = algorithm;
+        }
+        if (algorithm.endsWith("-SESS")) {
+            digestName = algorithm.substring(0, algorithm.length() - 5);
+            algorithm = digestName + "-sess"; // suffix lower case
+        }
+        if (digestName.equals("SHA-512-256")) {
+            digestName = "SHA-512/256";
+        }
+        var oid = KnownOIDs.findMatch(digestName);
+        if (oid == null) {
+            log("unknown algorithm: " + algorithm);
+            return false;
+        }
+        digestName = oid.stdName();
+        params.setAlgorithm (algorithm);
+        params.setDigestName (digestName);
+        return true;
+    }
+
     /* Calculate the Authorization header field given the request URI
      * and based on the authorization information in params
      */
@@ -367,6 +502,14 @@ class DigestAuthentication extends AuthenticationInfo {
         String cnonce = params.getCnonce ();
         String nonce = params.getNonce ();
         String algorithm = params.getAlgorithm ();
+        String digest = params.getDigestName ();
+        try {
+            validateDigest(digest);
+        } catch (IOException e) {
+            return null;
+        }
+        Charset charset = params.getCharset();
+        boolean userhash = params.getUserhash ();
         params.incrementNC ();
         int  nccount = params.getNCCount ();
         String ncstring=null;
@@ -378,10 +521,14 @@ class DigestAuthentication extends AuthenticationInfo {
                 ncstring = zeroPad [len] + ncstring;
         }
 
+        boolean session = algorithm.endsWith ("-sess");
+
         try {
             response = computeDigest(true, pw.getUserName(),passwd,realm,
-                                        method, uri, nonce, cnonce, ncstring);
-        } catch (NoSuchAlgorithmException ex) {
+                                        method, uri, nonce, cnonce, ncstring,
+                                        digest, session, charset);
+        } catch (CharacterCodingException | NoSuchAlgorithmException ex) {
+            log(ex.getMessage());
             return null;
         }
 
@@ -402,11 +549,24 @@ class DigestAuthentication extends AuthenticationInfo {
             qopS = ", qop=auth";
         }
 
+        String user = pw.getUserName();
+        String userhashField = "";
+        try {
+            if (userhash) {
+                user = computeUserhash(digest, user, realm, charset);
+                userhashField = ", userhash=true";
+            }
+        } catch (CharacterCodingException | NoSuchAlgorithmException ex) {
+            log(ex.getMessage());
+            return null;
+        }
+
         String value = authMethod
-                        + " username=\"" + pw.getUserName()
+                        + " username=\"" + user
                         + "\", realm=\"" + realm
                         + "\", nonce=\"" + nonce
                         + ncfield
+                        + userhashField
                         + ", uri=\"" + uri
                         + "\", response=\"" + response + "\""
                         + algoS;
@@ -427,6 +587,27 @@ class DigestAuthentication extends AuthenticationInfo {
         checkResponse (header, method, url.getFile());
     }
 
+    private static void log(String msg) {
+        if (logger.isLoggable(PlatformLogger.Level.INFO)) {
+            logger.info(msg);
+        }
+    }
+
+    private void validateDigest(String name) throws IOException {
+        if (getAuthType() == AuthCacheValue.Type.Server &&
+                getProtocolScheme().equals("https")) {
+            // HTTPS server authentication can use any algorithm
+            return;
+        }
+        if (disabledDigests.contains(name)) {
+            String msg = "Rejecting digest authentication with insecure algorithm: "
+                + name;
+            log(msg + " This constraint may be relaxed by setting " +
+                     "the \"http.auth.digest.reEnabledAlgorithms\" system property.");
+            throw new IOException(msg);
+        }
+    }
+
     public void checkResponse (String header, String method, String uri)
                                                         throws IOException {
         char[] passwd = pw.getPassword();
@@ -436,6 +617,9 @@ class DigestAuthentication extends AuthenticationInfo {
         String cnonce = params.cnonce;
         String nonce = params.getNonce ();
         String algorithm = params.getAlgorithm ();
+        String digest = params.getDigestName ();
+        Charset charset = params.getCharset();
+        validateDigest(digest);
         int  nccount = params.getNCCount ();
         String ncstring=null;
 
@@ -443,15 +627,21 @@ class DigestAuthentication extends AuthenticationInfo {
             throw new ProtocolException ("No authentication information in response");
         }
 
+        boolean session = algorithm.endsWith ("-SESS");
+        if (session) {
+            algorithm = algorithm.substring(0, algorithm.length() - 5);
+        }
+
         if (nccount != -1) {
-            ncstring = Integer.toHexString (nccount).toUpperCase();
+            ncstring = Integer.toHexString (nccount).toUpperCase(Locale.ROOT);
             int len = ncstring.length();
             if (len < 8)
                 ncstring = zeroPad [len] + ncstring;
         }
         try {
-            String expected = computeDigest(false, username,passwd,realm,
-                                        method, uri, nonce, cnonce, ncstring);
+            String expected = computeDigest(false, username,passwd,realm, method, uri,
+                                           nonce, cnonce, ncstring, digest,
+                                           session, charset);
             HeaderParser p = new HeaderParser (header);
             String rspauth = p.findValue ("rspauth");
             if (rspauth == null) {
@@ -468,34 +658,45 @@ class DigestAuthentication extends AuthenticationInfo {
 
         } catch (NoSuchAlgorithmException ex) {
             throw new ProtocolException ("Unsupported algorithm in response");
+        } catch (CharacterCodingException ex) {
+            throw new ProtocolException ("Invalid characters in username or password");
         }
     }
 
+    private String computeUserhash(String digest, String user,
+                                   String realm, Charset charset)
+        throws NoSuchAlgorithmException, CharacterCodingException
+    {
+        MessageDigest md = MessageDigest.getInstance(digest);
+        String s = user + ":" + realm;
+        return encode(s, null, md, charset);
+    }
+
     private String computeDigest(
                         boolean isRequest, String userName, char[] password,
                         String realm, String connMethod,
                         String requestURI, String nonceString,
-                        String cnonce, String ncValue
-                    ) throws NoSuchAlgorithmException
+                        String cnonce, String ncValue,
+                        String algorithm, boolean session,
+                        Charset charset
+                    ) throws NoSuchAlgorithmException, CharacterCodingException
     {
 
         String A1, HashA1;
-        String algorithm = params.getAlgorithm ();
-        boolean md5sess = algorithm.equalsIgnoreCase ("MD5-sess");
 
-        MessageDigest md = MessageDigest.getInstance(md5sess?"MD5":algorithm);
+        MessageDigest md = MessageDigest.getInstance(algorithm);
 
-        if (md5sess) {
+        if (session) {
             if ((HashA1 = params.getCachedHA1 ()) == null) {
                 String s = userName + ":" + realm + ":";
-                String s1 = encode (s, password, md);
+                String s1 = encode (s, password, md, charset);
                 A1 = s1 + ":" + nonceString + ":" + cnonce;
-                HashA1 = encode(A1, null, md);
+                HashA1 = encode(A1, null, md, charset);
                 params.setCachedHA1 (HashA1);
             }
         } else {
             A1 = userName + ":" + realm + ":";
-            HashA1 = encode(A1, password, md);
+            HashA1 = encode(A1, password, md, charset);
         }
 
         String A2;
@@ -504,7 +705,7 @@ class DigestAuthentication extends AuthenticationInfo {
         } else {
             A2 = ":" + requestURI;
         }
-        String HashA2 = encode(A2, null, md);
+        String HashA2 = encode(A2, null, md, ISO_8859_1.INSTANCE);
         String combo, finalHash;
 
         if (params.authQop()) { /* RRC2617 when qop=auth */
@@ -516,7 +717,7 @@ class DigestAuthentication extends AuthenticationInfo {
                        nonceString + ":" +
                        HashA2;
         }
-        finalHash = encode(combo, null, md);
+        finalHash = encode(combo, null, md, ISO_8859_1.INSTANCE);
         return finalHash;
     }
 
@@ -530,17 +731,28 @@ class DigestAuthentication extends AuthenticationInfo {
         "00000000", "0000000", "000000", "00000", "0000", "000", "00", "0"
     };
 
-    private String encode(String src, char[] passwd, MessageDigest md) {
-        md.update(src.getBytes(ISO_8859_1.INSTANCE));
+    private String encode(String src, char[] passwd, MessageDigest md, Charset charset)
+        throws CharacterCodingException
+    {
+        boolean isUtf8 = charset.equals(StandardCharsets.UTF_8);
+
+        if (isUtf8) {
+            src = Normalizer.normalize(src, Normalizer.Form.NFC);
+        }
+        md.update(src.getBytes(charset));
         if (passwd != null) {
-            byte[] passwdBytes = new byte[passwd.length];
-            for (int i=0; i<passwd.length; i++)
-                passwdBytes[i] = (byte)passwd[i];
+            byte[] passwdBytes;
+            if (isUtf8) {
+                passwdBytes = getUtf8Bytes(passwd);
+            } else {
+                passwdBytes = new byte[passwd.length];
+                for (int i=0; i<passwd.length; i++)
+                    passwdBytes[i] = (byte)passwd[i];
+            }
             md.update(passwdBytes);
             Arrays.fill(passwdBytes, (byte)0x00);
         }
         byte[] digest = md.digest();
-
         StringBuilder res = new StringBuilder(digest.length * 2);
         for (int i = 0; i < digest.length; i++) {
             int hashchar = ((digest[i] >>> 4) & 0xf);
@@ -550,4 +762,15 @@ class DigestAuthentication extends AuthenticationInfo {
         }
         return res.toString();
     }
+
+    private static byte[] getUtf8Bytes(char[] passwd) throws CharacterCodingException {
+        CharBuffer cb = CharBuffer.wrap(passwd);
+        CharsetEncoder encoder = StandardCharsets.UTF_8.newEncoder();
+        ByteBuffer bb = encoder.encode(cb);
+        byte[] buf = new byte[bb.remaining()];
+        bb.get(buf);
+        if (bb.hasArray())
+            Arrays.fill(bb.array(), bb.arrayOffset(), bb.capacity(), (byte)0);
+        return buf;
+    }
 }
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index 91b3a01ee57..2c094c9f19d 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -701,6 +701,16 @@ jdk.security.legacyAlgorithms=SHA1, \
 jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
       DSA keySize < 1024, SHA1 denyAfter 2019-01-01
 
+#
+# Disabled message digest algorithms for use with plaintext
+# HTTP Digest authentication (java.net.HttpURLConnection).
+# This includes HTTPS Digest authentication to proxies.
+# This may be overridden by setting the networking (or system)
+# property "http.auth.digest.reEnabledAlgorithms" to a comma
+# separated list of algorithms to be allowed.
+#
+http.auth.digest.disabledAlgorithms = MD5, SHA-1
+
 #
 # Algorithm restrictions for Secure Socket Layer/Transport Layer Security
 # (SSL/TLS/DTLS) processing
diff --git a/test/jdk/java/net/Authenticator/B4722333.java b/test/jdk/java/net/Authenticator/B4722333.java
index 70b0fce70c6..143022995af 100644
--- a/test/jdk/java/net/Authenticator/B4722333.java
+++ b/test/jdk/java/net/Authenticator/B4722333.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 4722333
  * @library /test/lib
- * @run main/othervm B4722333
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 B4722333
  * @summary JRE Proxy Authentication Not Working with ISA2000
  */
 
diff --git a/test/jdk/java/net/Authenticator/B4759514.java b/test/jdk/java/net/Authenticator/B4759514.java
index a659da82482..174527c0e9b 100644
--- a/test/jdk/java/net/Authenticator/B4759514.java
+++ b/test/jdk/java/net/Authenticator/B4759514.java
@@ -25,8 +25,8 @@
  * @test
  * @bug 4759514
  * @library /test/lib
- * @run main/othervm B4759514
- * @run main/othervm -Djava.net.preferIPv6Addresses=true B4759514
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 B4759514
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 -Djava.net.preferIPv6Addresses=true B4759514
  * @summary Digest Authentication is erroniously quoting the nc value, contrary to RFC 2617
  */
 
diff --git a/test/jdk/java/net/Authenticator/B6870935.java b/test/jdk/java/net/Authenticator/B6870935.java
index 9f672775ad5..0033b70d75c 100644
--- a/test/jdk/java/net/Authenticator/B6870935.java
+++ b/test/jdk/java/net/Authenticator/B6870935.java
@@ -25,8 +25,10 @@
  * @test
  * @bug 6870935
  * @modules java.base/sun.net.www
- * @run main/othervm -Dhttp.nonProxyHosts="" -Dhttp.auth.digest.validateProxy=true B6870935
- * @run main/othervm -Djava.net.preferIPv6Addresses=true
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
+ *                   -Dhttp.nonProxyHosts="" -Dhttp.auth.digest.validateProxy=true B6870935
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
+ *                   -Djava.net.preferIPv6Addresses=true
  *                   -Dhttp.nonProxyHosts="" -Dhttp.auth.digest.validateProxy=true B6870935
  */
 
diff --git a/test/jdk/java/net/Authenticator/B8034170.java b/test/jdk/java/net/Authenticator/B8034170.java
index 964747e03e8..dde7b683dd2 100644
--- a/test/jdk/java/net/Authenticator/B8034170.java
+++ b/test/jdk/java/net/Authenticator/B8034170.java
@@ -31,9 +31,11 @@ import jdk.test.lib.net.URIBuilder;
  * @bug 8034170
  * @summary Digest authentication interop issue
  * @library /test/lib
- * @run main/othervm B8034170 unquoted
- * @run main/othervm -Dhttp.auth.digest.quoteParameters=true B8034170 quoted
- * @run main/othervm -Djava.net.preferIPv6Addresses=true B8034170 unquoted
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 B8034170 unquoted
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
+ *                   -Dhttp.auth.digest.quoteParameters=true B8034170 quoted
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
+ *                   -Djava.net.preferIPv6Addresses=true B8034170 unquoted
  */
 
 public class B8034170 {
diff --git a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java
index 48492099cc9..243c79d9644 100644
--- a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java
+++ b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java
@@ -63,10 +63,10 @@ import java.util.stream.Stream;
  *                 no real difference between BASICSERVER and BASIC - it should
  *                 be transparent on the client side.
  * @run main/othervm HTTPSetAuthenticatorTest NONE SERVER PROXY SERVER307 PROXY305
- * @run main/othervm HTTPSetAuthenticatorTest DIGEST SERVER
- * @run main/othervm HTTPSetAuthenticatorTest DIGEST PROXY
- * @run main/othervm HTTPSetAuthenticatorTest DIGEST PROXY305
- * @run main/othervm HTTPSetAuthenticatorTest DIGEST SERVER307
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 HTTPSetAuthenticatorTest DIGEST SERVER
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 HTTPSetAuthenticatorTest DIGEST PROXY
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 HTTPSetAuthenticatorTest DIGEST PROXY305
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 HTTPSetAuthenticatorTest DIGEST SERVER307
  * @run main/othervm HTTPSetAuthenticatorTest BASIC  SERVER
  * @run main/othervm HTTPSetAuthenticatorTest BASIC  PROXY
  * @run main/othervm HTTPSetAuthenticatorTest BASIC  PROXY305
diff --git a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java
index 6886ae0979e..2dc6963a63e 100644
--- a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java
+++ b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java
@@ -63,15 +63,16 @@ import static java.net.Proxy.NO_PROXY;
  *                    server that perform Digest authentication;
  *            PROXY305: The server attempts to redirect
  *                    the client to a proxy using 305 code;
- * @run main/othervm HTTPTest SERVER
- * @run main/othervm HTTPTest PROXY
- * @run main/othervm HTTPTest SERVER307
- * @run main/othervm HTTPTest PROXY305
+ * @run main/othervm -Dtest.debug=true -Dtest.digest.algorithm=SHA-512 HTTPTest SERVER
+ * @run main/othervm -Dtest.debug=true -Dtest.digest.algorithm=SHA-256 HTTPTest SERVER
+ * @run main/othervm -Dtest.debug=true -Dhttp.auth.digest.reEnabledAlgorithms=MD5 HTTPTest SERVER
+ * @run main/othervm -Dtest.debug=true -Dhttp.auth.digest.reEnabledAlgorithms=MD5 HTTPTest PROXY
+ * @run main/othervm -Dtest.debug=true -Dhttp.auth.digest.reEnabledAlgorithms=MD5 HTTPTest SERVER307
+ * @run main/othervm -Dtest.debug=true -Dhttp.auth.digest.reEnabledAlgorithms=MD5 HTTPTest PROXY305
  *
  * @author danielfuchs
  */
 public class HTTPTest {
-
     public static final boolean DEBUG =
          Boolean.parseBoolean(System.getProperty("test.debug", "false"));
     public static enum HttpAuthType { SERVER, PROXY, SERVER307, PROXY305 };
@@ -194,6 +195,10 @@ public class HTTPTest {
             // silently skip unsupported test combination
             return;
         }
+        String digestalg = System.getProperty("test.digest.algorithm");
+        if (digestalg == null || "".equals(digestalg))
+            digestalg = "MD5";
+
         System.out.println("\n**** Testing " + protocol + " "
                            + mode + " mode ****\n");
         int authCount = AUTHENTICATOR.count.get();
@@ -205,7 +210,9 @@ public class HTTPTest {
                     HTTPTestServer.create(protocol,
                                           mode,
                                           AUTHENTICATOR,
-                                          getHttpSchemeType());
+                                          getHttpSchemeType(),
+                                          null,
+                                          digestalg);
             try {
                 expectedIncrement += run(server, protocol, mode);
             } finally {
diff --git a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java
index 91efe8d736b..5bdc032280a 100644
--- a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java
+++ b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java
@@ -117,12 +117,22 @@ public class HTTPTestServer extends HTTPTest {
                                         HttpSchemeType schemeType,
                                         HttpHandler delegate)
             throws IOException {
+        return create(protocol, authType, auth, schemeType, null, "MD5");
+    }
+
+    public static HTTPTestServer create(HttpProtocolType protocol,
+                                        HttpAuthType authType,
+                                        HttpTestAuthenticator auth,
+                                        HttpSchemeType schemeType,
+                                        HttpHandler delegate,
+                                        String algorithm)
+            throws IOException {
         Objects.requireNonNull(authType);
         Objects.requireNonNull(auth);
         switch(authType) {
             // A server that performs Server Digest authentication.
             case SERVER: return createServer(protocol, authType, auth,
-                                             schemeType, delegate, "/");
+                                             schemeType, delegate, algorithm, "/");
             // A server that pretends to be a Proxy and performs
             // Proxy Digest authentication. If protocol is HTTPS,
             // then this will create a HttpsProxyTunnel that will
@@ -327,6 +337,7 @@ public class HTTPTestServer extends HTTPTest {
                                         HttpTestAuthenticator auth,
                                         HttpSchemeType schemeType,
                                         HttpHandler delegate,
+                                        String algorithm,
                                         String path)
             throws IOException {
         Objects.requireNonNull(authType);
@@ -336,7 +347,7 @@ public class HTTPTestServer extends HTTPTest {
         final HTTPTestServer server = new HTTPTestServer(impl, null, delegate);
         final HttpHandler hh = server.createHandler(schemeType, auth, authType);
         HttpContext ctxt = impl.createContext(path, hh);
-        server.configureAuthentication(ctxt, schemeType, auth, authType);
+        server.configureAuthentication(ctxt, schemeType, auth, authType, algorithm);
         impl.start();
         return server;
     }
@@ -357,7 +368,7 @@ public class HTTPTestServer extends HTTPTest {
                 : new HTTPTestServer(impl, null, delegate);
         final HttpHandler hh = server.createHandler(schemeType, auth, authType);
         HttpContext ctxt = impl.createContext(path, hh);
-        server.configureAuthentication(ctxt, schemeType, auth, authType);
+        server.configureAuthentication(ctxt, schemeType, auth, authType, null);
         impl.start();
 
         return server;
@@ -385,7 +396,7 @@ public class HTTPTestServer extends HTTPTest {
                 ? createProxy(protocol, targetAuthType,
                               auth, schemeType, targetDelegate, "/")
                 : createServer(targetProtocol, targetAuthType,
-                               auth, schemeType, targetDelegate, "/");
+                               auth, schemeType, targetDelegate, "MD5", "/");
         HttpServer impl = createHttpServer(protocol);
         final HTTPTestServer redirectingServer =
                  new HTTPTestServer(impl, redirectTarget, null);
@@ -431,11 +442,11 @@ public class HTTPTestServer extends HTTPTest {
     private void configureAuthentication(HttpContext ctxt,
                             HttpSchemeType schemeType,
                             HttpTestAuthenticator auth,
-                            HttpAuthType authType) {
+                            HttpAuthType authType, String algorithm) {
         switch(schemeType) {
             case DIGEST:
                 // DIGEST authentication is handled by the handler.
-                ctxt.getFilters().add(new HttpDigestFilter(auth, authType));
+                ctxt.getFilters().add(new HttpDigestFilter(auth, authType, algorithm));
                 break;
             case BASIC:
                 // BASIC authentication is handled by the filter.
@@ -603,15 +614,21 @@ public class HTTPTestServer extends HTTPTest {
         public static String computeDigest(boolean isRequest,
                                             String reqMethod,
                                             char[] password,
+                                            String expectedAlgorithm,
                                             DigestResponse params)
             throws NoSuchAlgorithmException
         {
 
             String A1, HashA1;
             String algorithm = params.getAlgorithm("MD5");
-            boolean md5sess = algorithm.equalsIgnoreCase ("MD5-sess");
+            if (algorithm.endsWith("-sess")) {
+                algorithm = algorithm.substring(0, algorithm.length() - 5);
+            }
+            if (!algorithm.equalsIgnoreCase(expectedAlgorithm)) {
+                throw new IllegalArgumentException("unexpected algorithm");
+            }
 
-            MessageDigest md = MessageDigest.getInstance(md5sess?"MD5":algorithm);
+            MessageDigest md = MessageDigest.getInstance(algorithm);
 
             if (params.username == null) {
                 throw new IllegalArgumentException("missing username");
@@ -776,13 +793,15 @@ public class HTTPTestServer extends HTTPTest {
         private final HttpTestAuthenticator auth;
         private final byte[] nonce;
         private final String ns;
-        public HttpDigestFilter(HttpTestAuthenticator auth, HttpAuthType authType) {
+        private final String algorithm;
+        public HttpDigestFilter(HttpTestAuthenticator auth, HttpAuthType authType, String algorithm) {
             super(authType, authType == HttpAuthType.SERVER
                             ? "Digest Server" : "Digest Proxy");
             this.auth = auth;
             nonce = new byte[16];
             new Random(Instant.now().toEpochMilli()).nextBytes(nonce);
             ns = new BigInteger(1, nonce).toString(16);
+            this.algorithm = (algorithm == null) ? "MD5" : algorithm;
         }
 
         @Override
@@ -790,7 +809,7 @@ public class HTTPTestServer extends HTTPTest {
             throws IOException {
             he.getResponseHeaders().add(getAuthenticate(),
                  "Digest realm=\"" + auth.getRealm() + "\","
-                 + "\r\n    qop=\"auth\","
+                 + "\r\n    qop=\"auth\", " + "algorithm=\"" + algorithm + "\", "
                  + "\r\n    nonce=\"" + ns +"\"");
             System.out.println(type + ": Requesting Digest Authentication "
                  + he.getResponseHeaders().getFirst(getAuthenticate()));
@@ -823,7 +842,7 @@ public class HTTPTestServer extends HTTPTest {
         }
 
         boolean validate(String reqMethod, DigestResponse dg) {
-            if (!"MD5".equalsIgnoreCase(dg.getAlgorithm("MD5"))) {
+            if (!this.algorithm.equalsIgnoreCase(dg.getAlgorithm("MD5"))) {
                 System.out.println(type + ": Unsupported algorithm "
                                    + dg.algorithm);
                 return false;
@@ -854,7 +873,7 @@ public class HTTPTestServer extends HTTPTest {
 
         boolean verify(String reqMethod, DigestResponse dg, char[] pw)
             throws NoSuchAlgorithmException {
-            String response = DigestResponse.computeDigest(true, reqMethod, pw, dg);
+            String response = DigestResponse.computeDigest(true, reqMethod, pw, algorithm, dg);
             if (!dg.response.equals(response)) {
                 System.out.println(type + ": bad response returned by client: "
                                     + dg.response + " expected " + response);
diff --git a/test/jdk/sun/net/www/http/HttpURLConnection/DigestAuth.java b/test/jdk/sun/net/www/http/HttpURLConnection/DigestAuth.java
index 597748662c5..15c729b4f7f 100644
--- a/test/jdk/sun/net/www/http/HttpURLConnection/DigestAuth.java
+++ b/test/jdk/sun/net/www/http/HttpURLConnection/DigestAuth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.IOException;
@@ -34,24 +35,51 @@ import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.HttpURLConnection;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Map;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+
+import static java.util.Map.entry;
 
 /*
  * @test
- * @bug 8138990
+ * @bug 8138990 8281561
  * @summary Tests for HTTP Digest auth
  *          The impl maintains a cache for auth info,
  *          the testcases run in a separate JVM to avoid cache hits
  * @modules jdk.httpserver
- * @run main/othervm DigestAuth good
- * @run main/othervm DigestAuth only_nonce
- * @run main/othervm DigestAuth sha1
- * @run main/othervm DigestAuth no_header
- * @run main/othervm DigestAuth no_nonce
- * @run main/othervm DigestAuth no_qop
- * @run main/othervm DigestAuth invalid_alg
- * @run main/othervm DigestAuth validate_server
- * @run main/othervm DigestAuth validate_server_no_qop
+ * @run main/othervm DigestAuth bad
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth good
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth only_nonce
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=SHA-1 DigestAuth sha1-good
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth sha1-bad
+ * @run main/othervm DigestAuth sha256
+ * @run main/othervm DigestAuth sha512
+ * @run main/othervm DigestAuth sha256-userhash
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth sha256
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth no_header
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth no_nonce
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth no_qop
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth invalid_alg
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth validate_server
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 DigestAuth validate_server_no_qop
+ */
+
+/*
+ * The sha512-256-userhash case must be run manually. It needs to run with sudo as the
+ * test must bind to port 80. You also need a modified JDK where
+ * sun.net.www.protocol.http.DigestAuthentication.getCnonce
+ * returns the hardcoded cnonce value below (normally it is chosen at random)
+ *  "NTg6RKcb9boFIAS3KrFK9BGeh+iDa/sm6jUMp2wds69v"
+ * It can be run from the command line directly as follows:
+ * sudo java -Djdk.net.hosts.file=hosts DigestAuth sha512-256-userhash port80
+ * assuming you are running in the test source directory
  */
 public class DigestAuth {
 
@@ -88,6 +116,28 @@ public class DigestAuth {
             + "nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\", "
             + "algorithm=\"SHA1\"";
 
+    static final String WWW_AUTH_HEADER_SHA256 = "Digest "
+            + "nonce=\"a69ae8a2e17c219bc6c118b673e93601616a6a"
+            + "4d8fde3a19996748d77ad0464b\", qop=\"auth\", "
+            + "opaque=\"efc62777cff802cb29252f626b041f381cd360"
+            + "7187115871ca25e7b51a3757e9\", algorithm=SHA-256";
+
+    static final String WWW_AUTH_HEADER_SHA512 = "Digest "
+            + "nonce=\"9aaa8d3ae53b54ce653a5d52d895afcd9c0e430"
+            + "a17bdf98bb34235af84fba268d31376a63e0c39079b519"
+            + "c14baa0429754266f35b62a47b9c8b5d3d36c638282\","
+            + " qop=\"auth\", opaque=\"28cdc6bae6c5dd7ec89dbf"
+            + "af4d4f26b70f41ebbb83dc7af0950d6de016c40f412224"
+            + "676cd45ebcf889a70e65a2b055a8b5232e50281272ba7c"
+            + "67628cc3bb3492\", algorithm=SHA-512";
+
+    static final String WWW_AUTH_HEADER_SHA_256_UHASH = "Digest "
+            + "realm=\"testrealm@host.com\", "
+            + "qop=\"auth\", algorithm=SHA-256,"
+            + "nonce=\"5TsQWLVdgBdmrQ0XsxbDODV+57QdFR34I9HAbC"
+            + "/RVvkK\", opaque=\"HRPCssKJSGjCrkzDg8OhwpzCiGP"
+            + "ChXYjwrI2QmXDnsOS\", charset=UTF-8, userhash=true";
+
     static final String WWW_AUTH_HEADER_INVALID_ALGORITHM = "Digest "
             + "nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\", "
             + "algorithm=\"SHA123\"";
@@ -106,23 +156,77 @@ public class DigestAuth {
             + "nc=00000001, "
             + "qop=auth";
 
+    // These two must be run manually with a modified JDK
+    // that generates the exact cnonce given below.
+    static final String SHA_512_256_FIRST = "Digest "
+            + "realm=\"api@example.org\", "
+            + "qop=\"auth\", "
+            + "algorithm=SHA-512-256, "
+            + "nonce=\"5TsQWLVdgBdmrQ0XsxbDODV+57QdFR34I9HAbC/RVvkK\", "
+            + "opaque=\"HRPCssKJSGjCrkzDg8OhwpzCiGPChXYjwrI2QmXDnsOS\", "
+            + "charset=UTF-8, "
+            + "userhash=true ";
+
+    // Below taken from corrected version of RFC 7616
+    static final Map<String,String> SHA_512_256_EXPECTED =
+        Map.ofEntries(
+            entry("username", "793263caabb707a56211940d90411ea4a575adeccb"
+                                + "7e360aeb624ed06ece9b0b"),
+            entry("realm", "api@example.org"),
+            entry("uri", "/doe.json"),
+            entry("algorithm", "SHA-512-256"),
+            entry("nonce", "5TsQWLVdgBdmrQ0XsxbDODV+57QdFR34I9HAbC/RVvkK"),
+            entry("nc", "00000001"),
+            entry("cnonce", "NTg6RKcb9boFIAS3KrFK9BGeh+iDa/sm6jUMp2wds69v"),
+            entry("qop", "auth"),
+            entry("response", "3798d4131c277846293534c3edc11bd8a5e4cdcbff78"
+                                + "b05db9d95eeb1cec68a5"),
+            entry("opaque", "HRPCssKJSGjCrkzDg8OhwpzCiGPChXYjwrI2QmXDnsOS"),
+            entry("userhash", "true"));
+
     public static void main(String[] args) throws Exception {
         if (args.length == 0) {
             throw new RuntimeException("No testcase specified");
         }
         String testcase = args[0];
+        System.out.println("Running test: " + testcase);
+        boolean usePort80 = args.length > 1 && args[1].equals("port80");
 
         // start a local HTTP server
-        try (LocalHttpServer server = LocalHttpServer.startServer()) {
+        try (LocalHttpServer server = LocalHttpServer.startServer(usePort80)) {
 
             // set authenticator
             AuthenticatorImpl auth = new AuthenticatorImpl();
-            Authenticator.setDefault(auth);
 
             String url = String.format("http://%s/test/", server.getAuthority());
 
             boolean success = true;
             switch (testcase) {
+                case "sha512-256-userhash":
+                    auth = new AuthenticatorImpl("J\u00e4s\u00f8n Doe", "Secret, or not?");
+                    // file based name service must be used so domain
+                    // below resolves to localhost
+                    if (usePort80) {
+                        url = "http://api.example.org/doe.json";
+                    } else {
+                        url = "http://api.example.org:" + server.getPort() + "/doe.json";
+                    }
+                    server.setWWWAuthHeader(SHA_512_256_FIRST);
+                    server.setExpectedRequestParams(SHA_512_256_EXPECTED);
+                    success = testAuth(url, auth, EXPECT_DIGEST);
+                    break;
+                case "bad":
+                    // server returns a good WWW-Authenticate header with MD5
+                    // but MD5 is disallowed by default
+                    server.setWWWAuthHeader(GOOD_WWW_AUTH_HEADER);
+                    success = testAuth(url, auth, EXPECT_FAILURE);
+                    if (auth.lastRequestedPrompt == null ||
+                            !auth.lastRequestedPrompt.equals(REALM)) {
+                        System.out.println("Unexpected realm: "
+                                + auth.lastRequestedPrompt);
+                        success = false;
+                    }
+                    break;
                 case "good":
                     // server returns a good WWW-Authenticate header
                     server.setWWWAuthHeader(GOOD_WWW_AUTH_HEADER);
@@ -201,11 +305,36 @@ public class DigestAuth {
                         success = false;
                     }
                     break;
-                case "sha1":
+                case "sha1-good":
                     // server returns a good WWW-Authenticate header with SHA-1
                     server.setWWWAuthHeader(WWW_AUTH_HEADER_SHA1);
                     success = testAuth(url, auth, EXPECT_DIGEST);
                     break;
+                case "sha1-bad":
+                    // server returns a WWW-Authenticate header with SHA-1
+                    // but SHA-1 disabled
+                    server.setWWWAuthHeader(WWW_AUTH_HEADER_SHA1);
+                    success = testAuth(url, auth, EXPECT_FAILURE);
+                    break;
+                case "sha256":
+                    // server returns a good WWW-Authenticate header with SHA-256
+                    server.setWWWAuthHeader(WWW_AUTH_HEADER_SHA256);
+                    success = testAuth(url, auth, EXPECT_DIGEST);
+                    break;
+                case "sha512":
+                    // server returns a good WWW-Authenticate header with SHA-512
+                    server.setWWWAuthHeader(WWW_AUTH_HEADER_SHA512);
+                    success = testAuth(url, auth, EXPECT_DIGEST);
+                    break;
+                case "sha256-userhash":
+                    // server returns a good WWW-Authenticate header with SHA-256
+                    // also sets the userhash=true parameter
+                    server.setWWWAuthHeader(WWW_AUTH_HEADER_SHA_256_UHASH);
+                    success = testAuth(url, auth, EXPECT_DIGEST);
+                    // make sure the userhash parameter was set correctly
+                    // and the username itself is the correct hash
+                    server.checkUserHash(getUserHash("SHA-256", "Mufasa", REALM));
+                    break;
                 case "no_header":
                     // server returns no WWW-Authenticate header
                     success = testAuth(url, auth, EXPECT_FAILURE);
@@ -251,7 +380,7 @@ public class DigestAuth {
         try {
             System.out.printf("Connect to %s, expected auth scheme is '%s'%n",
                     url, expectedScheme);
-            load(url);
+            load(url, auth);
 
             if (expectedScheme == null) {
                 System.out.println("Unexpected successful connection");
@@ -276,8 +405,9 @@ public class DigestAuth {
         return true;
     }
 
-    static void load(String url) throws IOException {
-        URLConnection conn = new URL(url).openConnection();
+    static void load(String url, Authenticator auth) throws IOException {
+        HttpURLConnection conn = (HttpURLConnection)(new URL(url).openConnection());
+        conn.setAuthenticator(auth);
         conn.setUseCaches(false);
         try (BufferedReader reader = new BufferedReader(
                 new InputStreamReader(conn.getInputStream()))) {
@@ -292,20 +422,47 @@ public class DigestAuth {
         }
     }
 
+    public static String getUserHash(String alg, String user, String realm) {
+        try {
+            MessageDigest md = MessageDigest.getInstance(alg);
+            String msg = user + ":" + realm;
+            //String msg = "Mufasa:testrealm@host.com";
+            byte[] output = md.digest(msg.getBytes(StandardCharsets.ISO_8859_1));
+            StringBuilder sb = new StringBuilder();
+            for (int i=0; i<output.length; i++) {
+                String s1 = Integer.toHexString(output[i] & 0xf);
+                String s2 = Integer.toHexString(Byte.toUnsignedInt(output[i]) >>> 4);
+                sb.append(s2).append(s1);
+            }
+            return sb.toString();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static class AuthenticatorImpl extends Authenticator {
 
         private String lastRequestedScheme;
         private String lastRequestedPrompt;
 
+        private final String user, pass;
+
+        AuthenticatorImpl() {
+            this("Mufasa", "Circle Of Life");
+        }
+
+        AuthenticatorImpl(String user, String pass) {
+            this.user = user;
+            this.pass = pass;
+        }
+
         @Override
         public PasswordAuthentication getPasswordAuthentication() {
             lastRequestedScheme = getRequestingScheme();
             lastRequestedPrompt = getRequestingPrompt();
             System.out.println("AuthenticatorImpl: requested "
                     + lastRequestedScheme);
-
-            return new PasswordAuthentication("Mufasa",
-                    "Circle Of Life".toCharArray());
+            return new PasswordAuthentication(user, pass.toCharArray());
         }
     }
 
@@ -316,6 +473,9 @@ public class DigestAuth {
         private volatile String wwwAuthHeader = null;
         private volatile String authInfoHeader = null;
         private volatile String lastRequestedNonce;
+        private volatile String lastRequestedUser;
+        private volatile String lastRequestedUserhash;
+        private volatile Map<String,String> expectedParams;
 
         private LocalHttpServer(HttpServer server) {
             this.server = server;
@@ -335,14 +495,49 @@ public class DigestAuth {
             this.wwwAuthHeader = wwwAuthHeader;
         }
 
+        void setExpectedRequestParams(Map<String,String> params) {
+            this.expectedParams = params;
+        }
+
         void setAuthInfoHeader(String authInfoHeader) {
             this.authInfoHeader = authInfoHeader;
         }
 
-        static LocalHttpServer startServer() throws IOException {
+        void checkUserHash(String expectedUser) {
+            boolean pass = true;
+            if (!expectedUser.equals(lastRequestedUser)) {
+                System.out.println("Username mismatch:");
+                System.out.println("Expected: " + expectedUser);
+                System.out.println("Received: " + lastRequestedUser);
+                pass = false;
+            }
+            if (!lastRequestedUserhash.equalsIgnoreCase("true")) {
+                System.out.println("Userhash mismatch:");
+                pass = false;
+            }
+            if (!pass) {
+                throw new RuntimeException("Test failed: checkUserHash");
+            }
+        }
+
+        void checkExpectedParams(String header) {
+            if (expectedParams == null)
+                return;
+            expectedParams.forEach((name, value) -> {
+                String rxValue = findParameter(header, name);
+                if (!rxValue.equalsIgnoreCase(value)) {
+                    throw new RuntimeException("value mismatch "
+                        + "name = " + name + " (" + rxValue + "/"
+                        + value + ")");
+                }
+            });
+        }
+
+        static LocalHttpServer startServer(boolean usePort80) throws IOException {
+            int port = usePort80 ? 80 : 0;
             InetAddress loopback = InetAddress.getLoopbackAddress();
             HttpServer httpServer = HttpServer.create(
-                    new InetSocketAddress(loopback, 0), 0);
+                    new InetSocketAddress(loopback, port), 0);
             LocalHttpServer localHttpServer = new LocalHttpServer(httpServer);
             localHttpServer.start();
 
@@ -351,6 +546,7 @@ public class DigestAuth {
 
         void start() {
             server.createContext("/test", this);
+            server.createContext("/", this);
             server.start();
             System.out.println("HttpServer: started on port " + getAuthority());
         }
@@ -385,7 +581,10 @@ public class DigestAuth {
                         t.getResponseHeaders().add("Authentication-Info",
                                 authInfoHeader);
                     }
+                    checkExpectedParams(header);
                     lastRequestedNonce = findParameter(header, "nonce");
+                    lastRequestedUser = findParameter(header, "username");
+                    lastRequestedUserhash = findParameter(header, "userhash");
                     byte[] output = "hello".getBytes();
                     t.sendResponseHeaders(200, output.length);
                     t.getResponseBody().write(output);
diff --git a/test/jdk/sun/net/www/http/HttpURLConnection/hosts b/test/jdk/sun/net/www/http/HttpURLConnection/hosts
new file mode 100644
index 00000000000..e2729d2e04f
--- /dev/null
+++ b/test/jdk/sun/net/www/http/HttpURLConnection/hosts
@@ -0,0 +1 @@
+127.0.0.1 api.example.org
diff --git a/test/jdk/sun/net/www/protocol/http/DigestTest.java b/test/jdk/sun/net/www/protocol/http/DigestTest.java
index b699c3ff476..5632a021123 100644
--- a/test/jdk/sun/net/www/protocol/http/DigestTest.java
+++ b/test/jdk/sun/net/www/protocol/http/DigestTest.java
@@ -25,14 +25,18 @@
  * @test
  * @bug 4432213
  * @modules java.base/sun.net.www
- * @run main/othervm -Dhttp.auth.digest.validateServer=true DigestTest
- * @run main/othervm -Djava.net.preferIPv6Addresses=true
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
  *                   -Dhttp.auth.digest.validateServer=true DigestTest
- * @run main/othervm -Dhttp.auth.digest.validateServer=true
-                     -Dtest.succeed=true DigestTest
- * @run main/othervm -Djava.net.preferIPv6Addresses=true
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
+ *                   -Djava.net.preferIPv6Addresses=true
+ *                   -Dhttp.auth.digest.validateServer=true DigestTest
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
+ *                   -Dhttp.auth.digest.validateServer=true
+ *                   -Dtest.succeed=true DigestTest
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
+ *                   -Djava.net.preferIPv6Addresses=true
  *                   -Dhttp.auth.digest.validateServer=true
-                     -Dtest.succeed=true DigestTest
+ *                   -Dtest.succeed=true DigestTest
  * @summary  Need to support Digest Authentication for Proxies
  */
 
diff --git a/test/jdk/sun/net/www/protocol/http/NoNTLM.java b/test/jdk/sun/net/www/protocol/http/NoNTLM.java
index 1ae7af670bf..6cca7db5c4c 100644
--- a/test/jdk/sun/net/www/protocol/http/NoNTLM.java
+++ b/test/jdk/sun/net/www/protocol/http/NoNTLM.java
@@ -27,8 +27,9 @@
  * @summary Sanity check that NTLM will not be selected by the http protocol
  *    handler when running on a profile that does not support NTLM
  * @modules java.base/sun.net.www.protocol.http:open
- * @run main/othervm NoNTLM
- * @run main/othervm -Djava.net.preferIPv6Addresses=true NoNTLM
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5 NoNTLM
+ * @run main/othervm -Dhttp.auth.digest.reEnabledAlgorithms=MD5
+ *                   -Djava.net.preferIPv6Addresses=true NoNTLM
  */
 
 import java.io.IOException;
-- 
GitLab


From a5776567720d66754002247101081c84b4f83442 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 28 Mar 2022 14:53:14 +0000
Subject: [PATCH 234/345] 8282943: Unused weird key in compiler.properties

Reviewed-by: vromero
---
 .../classes/com/sun/tools/javac/resources/compiler.properties  | 3 ---
 test/langtools/tools/javac/diags/examples.not-yet.txt          | 1 -
 2 files changed, 4 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index fddd3e935e1..0308f6a647e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1565,9 +1565,6 @@ compiler.misc.diamond.anonymous.methods.implicitly.override=\
 compiler.misc.source.unavailable=\
     (source unavailable)
 
-compiler.misc.base.membership=\
-    all your base class are belong to us
-
 # 0: string, 1: string, 2: boolean
 compiler.misc.x.print.processor.info=\
     Processor {0} matches {1} and returns {2}.
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index 9f9f8f78014..afceccad633 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -57,7 +57,6 @@ compiler.misc.bad.runtime.invisible.param.annotations   # bad class file
 compiler.misc.bad.signature                             # bad class file
 compiler.misc.bad.requires.flag                         # bad class file
 compiler.misc.bad.type.annotation.value
-compiler.misc.base.membership                           # UNUSED
 compiler.misc.class.file.not.found                      # ClassReader
 compiler.misc.class.file.wrong.class
 compiler.misc.exception.message                         # uncommon completion failure based on a string
-- 
GitLab


From f0282d7def8c043d95e9b86da926b7d45224c31c Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Mon, 28 Mar 2022 15:44:54 +0000
Subject: [PATCH 235/345] 8279488: ProcessBuilder inherits contextClassLoader
 when spawning a process reaper thread

Reviewed-by: alanb
---
 .../classes/java/lang/ProcessHandleImpl.java  | 14 ++--
 .../jdk/internal/misc/InnocuousThread.java    | 42 +++++++++---
 .../lang/ProcessBuilder/ProcessReaperCCL.java | 65 +++++++++++++++++++
 3 files changed, 103 insertions(+), 18 deletions(-)
 create mode 100644 test/jdk/java/lang/ProcessBuilder/ProcessReaperCCL.java

diff --git a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
index dad94430fda..8a3527c724b 100644
--- a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package java.lang;
 
+import jdk.internal.misc.InnocuousThread;
+
 import java.lang.annotation.Native;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -89,10 +91,6 @@ final class ProcessHandleImpl implements ProcessHandle {
                 // of the processReaper threads.
                 ThreadLocalRandom.current();
 
-                ThreadGroup tg = Thread.currentThread().getThreadGroup();
-                while (tg.getParent() != null) tg = tg.getParent();
-                ThreadGroup systemThreadGroup = tg;
-
                 // For a debug build, the stack shadow zone is larger;
                 // Increase the total stack size to avoid potential stack overflow.
                 int debugDelta = "release".equals(System.getProperty("jdk.debug")) ? 0 : (4*4096);
@@ -100,11 +98,9 @@ final class ProcessHandleImpl implements ProcessHandle {
                         ? 0 : REAPER_DEFAULT_STACKSIZE + debugDelta;
 
                 ThreadFactory threadFactory = grimReaper -> {
-                    Thread t = new Thread(systemThreadGroup, grimReaper,
-                            "process reaper", stackSize, false);
+                    Thread t = InnocuousThread.newSystemThread("process reaper", grimReaper,
+                            stackSize, Thread.MAX_PRIORITY);
                     t.setDaemon(true);
-                    // A small attempt (probably futile) to avoid priority inversion
-                    t.setPriority(Thread.MAX_PRIORITY);
                     return t;
                 };
 
diff --git a/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java b/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
index 81064a043e2..ab28c6339c4 100644
--- a/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
+++ b/src/java.base/share/classes/jdk/internal/misc/InnocuousThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,13 +72,15 @@ public final class InnocuousThread extends Thread {
      */
     public static Thread newThread(String name, Runnable target, int priority) {
         if (System.getSecurityManager() == null) {
-            return createThread(name, target, ClassLoader.getSystemClassLoader(), priority);
+            return createThread(name, target, 0L,
+                    ClassLoader.getSystemClassLoader(), priority);
         }
         return AccessController.doPrivileged(
                 new PrivilegedAction<Thread>() {
                     @Override
                     public Thread run() {
-                        return createThread(name, target, ClassLoader.getSystemClassLoader(), priority);
+                        return createThread(name, target, 0L,
+                                ClassLoader.getSystemClassLoader(), priority);
                     }
                 });
     }
@@ -104,28 +106,50 @@ public final class InnocuousThread extends Thread {
      */
     public static Thread newSystemThread(String name, Runnable target, int priority) {
         if (System.getSecurityManager() == null) {
-            return createThread(name, target, null, priority);
+            return createThread(name, target, 0L, null, priority);
         }
         return AccessController.doPrivileged(
                 new PrivilegedAction<Thread>() {
                     @Override
                     public Thread run() {
-                        return createThread(name, target, null, priority);
+                        return createThread(name, target, 0L,
+                                null, priority);
                     }
                 });
     }
 
-    private static Thread createThread(String name, Runnable target, ClassLoader loader, int priority) {
+    /**
+     * Returns a new InnocuousThread with null context class loader.
+     * Thread priority is set to the given priority.
+     */
+    public static Thread newSystemThread(String name, Runnable target,
+                                         long stackSize, int priority) {
+        if (System.getSecurityManager() == null) {
+            return createThread(name, target, stackSize, null, priority);
+        }
+        return AccessController.doPrivileged(
+                new PrivilegedAction<Thread>() {
+                    @Override
+                    public Thread run() {
+                        return createThread(name, target, 0L,
+                                null, priority);
+                    }
+                });
+    }
+
+    private static Thread createThread(String name, Runnable target, long stackSize,
+                                       ClassLoader loader, int priority) {
         Thread t = new InnocuousThread(INNOCUOUSTHREADGROUP,
-                target, name, loader);
+                target, name, stackSize, loader);
         if (priority >= 0) {
             t.setPriority(priority);
         }
         return t;
     }
 
-    private InnocuousThread(ThreadGroup group, Runnable target, String name, ClassLoader tccl) {
-        super(group, target, name, 0L, false);
+    private InnocuousThread(ThreadGroup group, Runnable target, String name,
+                            long stackSize, ClassLoader tccl) {
+        super(group, target, name, stackSize, false);
         UNSAFE.putReferenceRelease(this, INHERITEDACCESSCONTROLCONTEXT, ACC);
         UNSAFE.putReferenceRelease(this, CONTEXTCLASSLOADER, tccl);
     }
diff --git a/test/jdk/java/lang/ProcessBuilder/ProcessReaperCCL.java b/test/jdk/java/lang/ProcessBuilder/ProcessReaperCCL.java
new file mode 100644
index 00000000000..00fa38bdb0d
--- /dev/null
+++ b/test/jdk/java/lang/ProcessBuilder/ProcessReaperCCL.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8269488
+ * @summary verify that Process Reaper threads have a null CCL
+ * @run testng ProcessReaperCCL
+ */
+
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class ProcessReaperCCL {
+
+    @Test
+    static void test() throws Exception {
+        // create a class loader
+        File dir = new File(".");
+        URL[] urls = new URL[] {dir.toURI().toURL()};
+        ClassLoader cl = new URLClassLoader(urls);
+        Thread.currentThread().setContextClassLoader(cl);
+
+        // Invoke a subprocess with processBuilder
+        ProcessBuilder pb = new ProcessBuilder(List.of("echo", "abc", "xyz"));
+        Process p = pb.start();
+        CompletableFuture<Process> cf = p.onExit();
+        int exitValue = cf.get().exitValue();
+        Assert.assertEquals(exitValue, 0, "error exit value");
+
+        // Verify all "Process Reaper" threads have a null CCL
+        for (Thread th : Thread.getAllStackTraces().keySet()) {
+            if ("process reaper".equals(th.getName())) {
+                Assert.assertEquals(th.getContextClassLoader(), null, "CCL not null");
+            }
+        }
+    }
+}
-- 
GitLab


From c0aecd15ae8d7abf37901f785fccaff2317c3b23 Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Mon, 28 Mar 2022 18:31:17 +0000
Subject: [PATCH 236/345] 8280400: JDK 19 L10n resource files update - msgdrop
 10

Reviewed-by: naoto, kizune
---
 .../resources/codepoint_de.properties         |   36 +
 .../Notepad/resources/Notepad_de.properties   |   93 +
 .../Stylepad/resources/Stylepad_de.properties |   88 +
 .../resources/swingset_de.properties          |  674 ++++
 .../resources/swingset_ja.properties          |    4 +-
 .../launcher/resources/launcher_de.properties |   18 +-
 .../launcher/resources/launcher_ja.properties |   12 +-
 .../resources/launcher_zh_CN.properties       |    8 +-
 .../security/tools/keytool/Resources_de.java  |   93 +-
 .../security/tools/keytool/Resources_ja.java  |   15 +-
 .../tools/keytool/Resources_zh_CN.java        |   15 +-
 .../sun/security/util/AuthResources_de.java   |    2 +-
 .../sun/security/util/Resources_de.java       |   19 +-
 .../sun/security/util/Resources_ja.java       |   17 -
 .../sun/security/util/Resources_zh_CN.java    |   17 -
 .../apple/laf/resources/aqua_de.properties    |    4 +-
 .../resources/accessibility_de.properties     |    2 +-
 .../sun/awt/resources/awt_de.properties       |    4 +-
 .../resources/rmiregistry_de.properties       |    2 +-
 .../resources/rmiregistry_ja.properties       |    2 +-
 .../resources/rmiregistry_zh_CN.properties    |    2 +-
 .../rowset/RowSetResourceBundle_de.properties |    9 +-
 .../rowset/RowSetResourceBundle_ja.properties |    3 +-
 .../RowSetResourceBundle_zh_CN.properties     |    3 +-
 .../internal/res/XSLTErrorResources_de.java   |   22 +-
 .../xsltc/compiler/util/ErrorMessages_de.java |   12 +-
 .../xsltc/runtime/ErrorMessages_de.java       |    2 +-
 .../impl/msg/DOMMessages_de.properties        |   29 +-
 .../impl/msg/DOMMessages_ja.properties        |   25 -
 .../impl/msg/DOMMessages_zh_CN.properties     |   25 -
 .../impl/msg/DatatypeMessages_de.properties   |   25 -
 .../impl/msg/DatatypeMessages_ja.properties   |   25 -
 .../msg/DatatypeMessages_zh_CN.properties     |   25 -
 .../msg/JAXPValidationMessages_de.properties  |   25 -
 .../msg/JAXPValidationMessages_ja.properties  |   25 -
 .../JAXPValidationMessages_zh_CN.properties   |   25 -
 .../impl/msg/SAXMessages_de.properties        |   25 -
 .../impl/msg/SAXMessages_ja.properties        |   25 -
 .../impl/msg/SAXMessages_zh_CN.properties     |   25 -
 .../impl/msg/XIncludeMessages_de.properties   |   27 +-
 .../impl/msg/XIncludeMessages_ja.properties   |   25 -
 .../msg/XIncludeMessages_zh_CN.properties     |   25 -
 .../impl/msg/XMLMessages_de.properties        |    4 +-
 .../impl/msg/XMLMessages_ja.properties        |    2 +-
 .../impl/msg/XMLMessages_zh_CN.properties     |    2 +-
 .../impl/msg/XMLSchemaMessages_de.properties  |   36 +-
 .../impl/msg/XMLSchemaMessages_ja.properties  |   25 -
 .../msg/XMLSchemaMessages_zh_CN.properties    |   25 -
 .../msg/XMLSerializerMessages_de.properties   |   25 -
 .../msg/XMLSerializerMessages_ja.properties   |   25 -
 .../XMLSerializerMessages_zh_CN.properties    |   25 -
 .../impl/msg/XPointerMessages_de.properties   |   25 -
 .../impl/msg/XPointerMessages_ja.properties   |   25 -
 .../msg/XPointerMessages_zh_CN.properties     |   25 -
 .../impl/xpath/regex/message_de.properties    |   25 -
 .../impl/xpath/regex/message_ja.properties    |   25 -
 .../impl/xpath/regex/message_zh_CN.properties |   25 -
 .../internal/res/XMLErrorResources_de.java    |    2 +-
 .../utils/SerializerMessages_de.java          |    2 +-
 .../internal/res/XPATHErrorResources_de.java  |   44 +-
 .../internal/res/XPATHErrorResources_ja.java  |   28 +-
 .../res/XPATHErrorResources_zh_CN.java        |   28 +-
 .../javac/resources/compiler_de.properties    | 2785 +++++++++++++++++
 .../javac/resources/compiler_ja.properties    |  195 +-
 .../javac/resources/compiler_zh_CN.properties |  199 +-
 .../tools/javac/resources/javac_de.properties |  228 ++
 .../tools/javac/resources/javac_ja.properties |   10 +-
 .../javac/resources/javac_zh_CN.properties    |   10 +-
 .../javac/resources/launcher_de.properties    |  117 +
 .../resources/serialver_de.properties         |   31 +
 .../resources/simpleserver_de.properties      |   54 +
 .../resources/simpleserver_ja.properties      |   54 +
 .../resources/simpleserver_zh_CN.properties   |   54 +
 .../tools/jarsigner/Resources_de.java         |  338 ++
 .../tools/jarsigner/Resources_ja.java         |    9 +
 .../tools/jarsigner/Resources_zh_CN.java      |    9 +
 .../sun/tools/jar/resources/jar_de.properties |   19 +-
 .../sun/tools/jar/resources/jar_ja.properties |    8 +-
 .../tools/jar/resources/jar_zh_CN.properties  |    8 +-
 .../html/resources/standard_de.properties     |  445 +++
 .../html/resources/standard_ja.properties     |  132 +-
 .../html/resources/standard_zh_CN.properties  |  132 +-
 .../toolkit/resources/doclets_de.properties   |  330 ++
 .../toolkit/resources/doclets_ja.properties   |  111 +-
 .../resources/doclets_zh_CN.properties        |  113 +-
 .../doclint/resources/doclint_de.properties   |   95 +
 .../doclint/resources/doclint_ja.properties   |   15 +-
 .../resources/doclint_zh_CN.properties        |   15 +-
 .../tool/resources/javadoc_de.properties      |  210 ++
 .../tool/resources/javadoc_ja.properties      |   12 +-
 .../tool/resources/javadoc_zh_CN.properties   |   12 +-
 .../jconsole/resources/messages_de.properties |  307 ++
 .../resources/messages_zh_CN.properties       |    2 +-
 .../tools/javap/resources/javap_de.properties |  105 +
 .../tools/javap/resources/javap_ja.properties |    4 +-
 .../javap/resources/javap_zh_CN.properties    |    2 +-
 .../resources/jdeprscan_de.properties         |   82 +
 .../tools/jdeps/resources/jdeps_de.properties |  131 +
 .../example/debug/tty/TTYResources_de.java    |  350 +++
 .../example/debug/tty/TTYResources_ja.java    |   11 +-
 .../example/debug/tty/TTYResources_zh_CN.java |   19 +-
 .../sun/tools/jdi/resources/jdi_de.properties |   77 +
 .../tools/jlink/resources/jlink_de.properties |  105 +
 .../jlink/resources/plugins_de.properties     |  224 ++
 .../jlink/resources/plugins_ja.properties     |  224 ++
 .../jlink/resources/plugins_zh_CN.properties  |  224 ++
 .../tools/jmod/resources/jmod_de.properties   |  100 +
 .../tools/jmod/resources/jmod_ja.properties   |    3 +
 .../jmod/resources/jmod_zh_CN.properties      |    3 +
 .../resources/LinuxResources_de.properties    |   69 +
 .../resources/LinuxResources_ja.properties    |    2 +-
 .../resources/LinuxResources_zh_CN.properties |    2 +-
 .../resources/MacResources_de.properties      |   91 +
 .../resources/MacResources_ja.properties      |   11 +-
 .../resources/MacResources_zh_CN.properties   |   11 +-
 .../resources/HelpResources_de.properties     |   39 +
 .../resources/HelpResources_ja.properties     |  241 +-
 .../resources/HelpResources_zh_CN.properties  |  241 +-
 .../resources/MainResources_de.properties     |  110 +
 .../resources/MainResources_ja.properties     |    2 +-
 .../resources/MainResources_zh_CN.properties  |    2 +-
 .../resources/MsiInstallerStrings_de.wxl      |   15 +
 .../resources/MsiInstallerStrings_ja.wxl      |   30 +-
 .../resources/MsiInstallerStrings_zh_CN.wxl   |   30 +-
 .../resources/WinResources_de.properties      |   70 +
 .../resources/WinResources_ja.properties      |   10 +-
 .../resources/WinResources_zh_CN.properties   |   10 +-
 .../jshell/tool/resources/l10n_de.properties  |  322 ++
 .../jshell/tool/resources/l10n_ja.properties  |    4 +-
 .../tool/resources/l10n_zh_CN.properties      |    2 +-
 .../jdk/jshell/resources/l10n_de.properties   |   35 +
 .../jdk/jshell/resources/l10n_ja.properties   |    2 +-
 .../jshell/resources/l10n_zh_CN.properties    |    2 +-
 .../resources/ext/CurrencyNames_de.properties |  309 +-
 .../resources/ext/CurrencyNames_ja.properties |  440 +--
 .../ext/CurrencyNames_zh_CN.properties        |  443 +--
 .../agent/resources/agent_de.properties       |    2 +-
 .../agent/resources/agent_ja.properties       |    2 +-
 .../agent/resources/agent_zh_CN.properties    |    2 +-
 139 files changed, 10064 insertions(+), 2192 deletions(-)
 create mode 100644 src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
 create mode 100644 src/demo/share/jfc/Notepad/resources/Notepad_de.properties
 create mode 100644 src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
 create mode 100644 src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
 create mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
 create mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
 create mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
 create mode 100644 src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
 create mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
 create mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
 create mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
 create mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
 create mode 100644 src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
 create mode 100644 src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
 create mode 100644 src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
 create mode 100644 src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
 create mode 100644 src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties

diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
new file mode 100644
index 00000000000..84597bb758c
--- /dev/null
+++ b/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
@@ -0,0 +1,36 @@
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+#
+
+#
+# Resource strings for CodePointIM
+#
+
+warning=Diese Demoeingabemethode kann nicht direkt als Anwendung ausgef\u00FChrt werden.\nIn der Datei README.html in diesem Verzeichnis erfahren Sie, wie Sie diese \nEingabemethode verwenden.
+
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_de.properties b/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
new file mode 100644
index 00000000000..0c15bc05033
--- /dev/null
+++ b/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
@@ -0,0 +1,93 @@
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+#
+
+#
+# Resource strings for Notepad example
+
+Title=Notepad
+ElementTreeFrameTitle=Elemente
+
+# file Menu definition
+#
+# Each of the strings that follow form a key to be
+# used as the basis of a menu item definition.
+#
+# open ->  Notepad.openAction
+# new  ->  Notepad.newAction
+# save ->  Notepad.saveAction
+# exit ->  Notepad.exitAction
+
+fileLabel=Datei
+openLabel=\u00D6ffnen
+openImage=resources/open.gif
+newLabel=Neu
+newImage=resources/new.gif
+saveLabel=Speichern
+saveImage=resources/save.gif
+exitLabel=Beenden
+
+#
+# edit Menu definition
+#
+# cut   -> JTextComponent.cutAction
+# copy  -> JTextComponent.copyAction
+# paste -> JTextComponent.pasteAction
+
+editLabel=Bearbeiten
+cutLabel=Ausschneiden
+cutImage=resources/cut.gif
+copyLabel=Kopieren
+copyImage=resources/copy.gif
+pasteLabel=Einf\u00FCgen
+pasteImage=resources/paste.gif
+undoLabel=R\u00FCckg\u00E4ngig
+redoLabel=Wiederherstellen
+
+#
+# debug Menu definition
+#
+
+debugLabel=Debuggen
+dumpLabel=Modell in System.err ausgeben
+showElementTreeLabel=Elemente anzeigen
+
+# toolbar definition
+#
+# Each of the strings that follow form a key to be
+# used as the basis of the tool definition.  Actions
+# are of course sharable, and in this case are shared
+# with the menu items.
+
+newTooltip=Neue Datei erstellen
+openTooltip=Datei \u00F6ffnen
+saveTooltip=In Datei speichern
+cutTooltip=Auswahl in Zwischenablage verschieben
+copyTooltip=Auswahl in Zwischenablage kopieren
+pasteTooltip=Zwischenablage in Auswahl einf\u00FCgen
diff --git a/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties b/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
new file mode 100644
index 00000000000..7ab06001f6d
--- /dev/null
+++ b/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
@@ -0,0 +1,88 @@
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+#
+
+#
+# Resource strings for Stylepad example
+
+Title=Stylepad
+
+# Menu labels
+colorLabel=Farbe
+Red=Rot
+Green=Gr\u00FCn
+Blue=Blau
+
+boldLabel=Fett
+italicLabel=Kursiv
+
+# font menu
+
+fontLabel=Schriftart
+family1Label=SansSerif
+family2Label=Monospaced
+family3Label=Serif
+family4Label=Lucida Sans
+size1Label=10
+size2Label=12
+size3Label=18
+size4Label=24
+size5Label=48
+boldLabel=Fett
+italicLabel=Kursiv
+underlineLabel=Unterstrichen
+
+#
+# debug Menu definition
+#
+debugLabel=Debuggen
+dumpLabel=Modell in System.err ausgeben
+showElementTreeLabel=Elemente anzeigen
+
+
+# toolbar definition
+boldImage=resources/bold.gif
+boldTooltip=Fett
+italicImage=resources/italic.gif
+italicTooltip=Kursiv
+underlineImage=resources/underline.gif
+underlineTooltip=Unterstrichen
+foregroundImage=resources/fg.gif
+leftImage=resources/left.gif
+leftTooltip=Linksb\u00FCndig
+centerImage=resources/center.gif
+centerTooltip=Zentriert
+rightImage=resources/right.gif
+rightTooltip=Rechtsb\u00FCndig
+bulletsImage=resources/bullets.gif
+
+# wonderland example images
+aliceGif=resources/alice.gif
+caterpillarGif=resources/caterpillar.gif
+hatterGif=resources/hatter.gif
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
new file mode 100644
index 00000000000..509597076f7
--- /dev/null
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
@@ -0,0 +1,674 @@
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in the SwingSet demo.
+#
+# @author Jeff Dinkins
+
+#################################
+###  SwingSet Infrastructure  ###
+#################################
+
+### About Box ###
+
+AboutBox.title=Info zu Swing!
+AboutBox.ok_button_text=OK
+AboutBox.accessible_description=SwingSet2-Demo: Copyright (c) 2011, Oracle und/oder verbundene Unternehmen. All rights reserved. Alle Rechte vorbehalten.
+
+### Source Code ###
+SourceCode.loading=<html><body bgcolor="#ffffff">Quellcode wird geladen und formatiert. Bitte warten...</body></html>
+
+### Status ###
+
+Status.loading=Wird geladen:
+Status.popupMenuAccessible=Dr\u00FCcken Sie Umschalt-F10, um das Popup-Men\u00FC zu aktivieren
+
+### Menu Bar ###
+
+MenuBar.accessible_description=Men\u00FCleiste der Swing-Demo
+
+
+### Frame ###
+
+Frame.title=SwingSet2
+
+
+### Tabbed Pane ###
+
+TabbedPane.src.labelAndMnemonic=Quellcode
+TabbedPane.src_tooltip=Quellcode f\u00FCr diese Demo anzeigen
+
+
+### Look & Feel Menu ###
+
+LafMenu.laf.labelAndMnemonic=&Look-and-Feel
+LafMenu.laf_accessible_description=Men\u00FC, \u00FCber das Sie das Look-and-Feel wechseln k\u00F6nnen
+
+LafMenu.java.labelAndMnemonic=&Java-Look-and-Feel
+LafMenu.java_accessible_description=Das Java-Look-and-Feel
+
+LafMenu.nimbus.labelAndMnemonic=&Nimbus-Look-and-Feel
+LafMenu.nimbus_accessible_description=Das Nimbus-Look-and-Feel
+
+LafMenu.mac.labelAndMnemonic=&Mac OS X-Look-and-Feel
+LafMenu.mac_accessible_description=Das Mac OS X-Look-and-Feel
+
+LafMenu.motif.labelAndMnemonic=M&otif-Look-and-Feel
+LafMenu.motif_accessible_description=Das Motif-Look-and-Feel
+
+LafMenu.windows.labelAndMnemonic=&Windows-Look-and-Feel
+LafMenu.windows_accessible_description=Windows-Look-and-Feel
+
+LafMenu.gtk.labelAndMnemonic=&GTK-Look-and-Feel
+LafMenu.gtk_accessible_description=GTK-Look-and-Feel
+
+
+### Themes Menu ###
+
+ThemesMenu.themes.labelAndMnemonic=&Themes
+ThemesMenu.themes_accessible_description=Men\u00FC zum Wechseln der Metal-Farb-Themes
+
+ThemesMenu.aqua.labelAndMnemonic=A&qua
+ThemesMenu.aqua_accessible_description=Ein Metal-Theme mit blau-gr\u00FCnen Farben
+
+ThemesMenu.charcoal.labelAndMnemonic=&Anthrazit
+ThemesMenu.charcoal_accessible_description=Ein Metal-Theme mit dunkelgrauen Farben
+
+ThemesMenu.contrast.labelAndMnemonic=&Hoher Kontrast
+ThemesMenu.contrast_accessible_description=Ein Theme mit hohem Kontrast
+
+ThemesMenu.ocean.labelAndMnemonic=&Ozean
+ThemesMenu.ocean_accessible_description=Das Metal-Theme "Ozean"
+
+ThemesMenu.steel.labelAndMnemonic=&Stahl
+ThemesMenu.steel_accessible_description=Das blaue/violette Metal-Theme
+
+ThemesMenu.emerald.labelAndMnemonic=&Smaragdgr\u00FCn
+ThemesMenu.emerald_accessible_description=Ein Metal-Theme mit gr\u00FCnen Farben
+
+ThemesMenu.ruby.labelAndMnemonic=&Rubinrot
+ThemesMenu.ruby_accessible_description=Ein Metal-Theme mit roten Farben
+
+
+### Font SubMenu (under Themes) 
+FontMenu.fonts.labelAndMnemonic=Schri&ftarten
+FontMenu.fonts_accessible_description=Men\u00FC, in dem Sie Schriftarten f\u00FCr das Java-Look-and-Feel ausw\u00E4hlen
+
+FontMenu.bold.labelAndMnemonic=&Fett
+FontMenu.bold_accessible_description=Deaktiviert fettgedruckte Schriftarten f\u00FCr das Java-Look-and-Feel
+
+FontMenu.plain.labelAndMnemonic=&Normal
+FontMenu.plain_accessible_description=Deaktiviert normale Schriftarten f\u00FCr das Java-Look-and-Feel
+
+
+### Audio SubMenu (under Themes) ###
+
+AudioMenu.audio.labelAndMnemonic=&Audio
+AudioMenu.audio_accessible_description=Men\u00FC, in dem Sie die verf\u00FCgbare Audio-Feedbackmenge im Java-Look-and-Feel \u00E4ndern
+
+AudioMenu.on.labelAndMnemonic=&Ein
+AudioMenu.on_accessible_description=Aktiviert das gesamte Audiofeedback f\u00FCr das Java-Look-and-Feel
+
+AudioMenu.default.labelAndMnemonic=Stan&dard
+AudioMenu.default_accessible_description=Aktiviert die standardm\u00E4\u00DFige Audio-Feedbackmenge f\u00FCr das Java-Look-and-Feel
+
+AudioMenu.off.labelAndMnemonic=A&us
+AudioMenu.off_accessible_description=Deaktiviert das gesamte Audiofeedback f\u00FCr das Java-Look-and-Feel
+
+### Options Menu ###
+
+OptionsMenu.options.labelAndMnemonic=O&ptionen
+OptionsMenu.options_accessible_description=Men\u00FC mit anderen Optionen
+
+OptionsMenu.tooltip.labelAndMnemonic=QuickInfo ak&tivieren
+OptionsMenu.tooltip_accessible_description=QuickInfo aktivieren oder deaktivieren
+
+OptionsMenu.dragEnabled.labelAndMnemonic=&Drag-und-Drop aktivieren
+OptionsMenu.dragEnabled_accessible_description=Drag-und-Drop aktivieren oder deaktivieren
+
+### File Menu ###
+
+FileMenu.file.labelAndMnemonic=Dat&ei
+FileMenu.accessible_description=Men\u00FC "Datei"
+FileMenu.about.labelAndMnemonic=&Info
+FileMenu.about_accessible_description=Weitere Informationen zur SwingSet2-Anwendung
+FileMenu.open.labelAndMnemonic=\u00D6&ffnen
+FileMenu.open_accessible_description=Platzhaltermen\u00FCoption zum \u00D6ffnen einer Datei
+FileMenu.save.labelAndMnemonic=&Speichern
+FileMenu.save_accessible_description=Platzhaltermen\u00FCoption zum Speichern einer Datei
+FileMenu.save_as.labelAndMnemonic=Speichern &unter...
+FileMenu.save_as_accessible_description=Platzhaltermen\u00FCoption zum Speichern einer Datei mit einem neuen Namen
+FileMenu.exit.labelAndMnemonic=B&eenden
+FileMenu.exit_accessible_description=SwingSet2-Anwendung beenden
+
+### Multi-Screen menu ###
+MultiMenu.multi.labelAndMnemonic=&Multiscreen
+MultiMenu.multi_accessible_description=Multiscreen-Men\u00FC
+MultiMenu.all.labelAndMnemonic=SwingSet2 &auf allen Bildschirmen erstellen
+MultiMenu.all_accessible_description=SwingSet2-Fenster auf jedem Bildschirm erstellen
+MultiMenu.single.labelAndMnemonic=SwingSet2 auf Bildschirm erstellen
+MultiMenu.single_accessible_description=SwingSet2-Fenster auf Bildschirm erstellen
+
+
+################################
+###          DEMOS           ###
+################################
+
+### Button Demo ###
+
+ButtonDemo.accessible_description=Die ButtonDemo zeigt Beispiele f\u00FCr die Verwendung von JButton, JRadioButton, JToggleButton und JCheckBox
+ButtonDemo.tooltip=Demos f\u00FCr JButton, JRadioButton, JToggleButton, JCheckbox
+ButtonDemo.name=Schaltfl\u00E4chendemo
+
+ButtonDemo.buttons=Schaltfl\u00E4chen
+ButtonDemo.checkboxes=Kontrollk\u00E4stchen
+ButtonDemo.radiobuttons=Optionsfelder
+ButtonDemo.togglebuttons=Umschalt-Schaltfl\u00E4chen
+
+ButtonDemo.textbuttons=Textschaltfl\u00E4chen
+ButtonDemo.imagebuttons=Bildschaltfl\u00E4chen
+ButtonDemo.textradiobuttons=Textoptionsfelder
+ButtonDemo.imageradiobuttons=Bildoptionsfelder
+ButtonDemo.texttogglebuttons=Text-Umschalt-Schaltfl\u00E4chen
+ButtonDemo.imagetogglebuttons=Bild-Umschalt-Schaltfl\u00E4chen
+ButtonDemo.textcheckboxes=Textkontrollk\u00E4stchen
+ButtonDemo.imagecheckboxes=Bildkontrollk\u00E4stchen
+
+ButtonDemo.button1=Eins
+ButtonDemo.button2=Zwei
+ButtonDemo.button3=<html><font size=2 color=red><bold>Drei.</font></html>
+
+ButtonDemo.radio1=Optionsfeld Eins
+ButtonDemo.radio2=Optionsfeld Zwei
+ButtonDemo.radio3=Optionsfeld Drei
+ButtonDemo.radioX=<html><font size=2 color=red>Drei<bold>(HTML!)</bold></font></html>
+
+ButtonDemo.check1=Eins
+ButtonDemo.check2=Zwei
+ButtonDemo.check3=Drei
+ButtonDemo.checkX=<html><font size=2 color=red>Drei<bold>(HTML!)</bold></font></html>
+
+ButtonDemo.customradio=Ein benutzerdefiniertes "Chrome"-Optionsfeld.
+ButtonDemo.customcheck=Ein benutzerdefinierbares Gl\u00FChbirnenkontrollk\u00E4stchen.
+
+ButtonDemo.phone=Telefon
+ButtonDemo.write=Schreiben
+ButtonDemo.peace=Peace
+
+ButtonDemo.controlpanel.labelAndMnemonic=Anzeigeoptionen:
+ButtonDemo.paintborder.labelAndMnemonic=Rahmen f\u00E4r&ben
+ButtonDemo.paintborder_tooltip=Klicken Sie hier, um die Rahmenf\u00E4rbung ein- oder auszuschalten.
+ButtonDemo.paintfocus.labelAndMnemonic=&Fokus f\u00E4rben
+ButtonDemo.paintfocus_tooltip=Klicken Sie hier, um die Fokusf\u00E4rbung ein- oder auszuschalten.
+ButtonDemo.enabled.labelAndMnemonic=Aktivi&ert
+ButtonDemo.enabled_tooltip=Klicken Sie hier, um die Schaltfl\u00E4chen zu aktivieren oder zu deaktivieren.
+ButtonDemo.contentfilled.labelAndMnemonic=&Inhalt gef\u00FCllt
+ButtonDemo.contentfilled_tooltip=Klicken Sie hier, um die F\u00FCllung des Inhaltsbereichs zu steuern.
+
+ButtonDemo.padamount.labelAndMnemonic=Abstand:
+ButtonDemo.default.labelAndMnemonic=Stan&dard
+ButtonDemo.default_tooltip=Verwendet den Standardabstand zwischen Rahmen und Label.
+ButtonDemo.zero.labelAndMnemonic=&0
+ButtonDemo.zero_tooltip=Verwendet keinen Abstand zwischen Rahmen und Label.
+ButtonDemo.ten.labelAndMnemonic=&10
+ButtonDemo.ten_tooltip=Verwendet einen Abstand von 10 Pixel zwischen Rahmen und Label.
+
+LayoutControlPanel.textposition.labelAndMnemonic=Textposition:
+LayoutControlPanel.contentalignment.labelAndMnemonic=Inhaltsausrichtung:
+
+### ColorChooser Demo ###
+
+ColorChooserDemo.accessible_description=Mit dem ColorChooser k\u00F6nnen Sie eine Farbe \u00FCber eine Palette oder unter RGB- oder HSB-Werten ausw\u00E4hlen
+ColorChooserDemo.tooltip=JColorChooser-Demo
+ColorChooserDemo.name=ColorChooser-Demo
+ColorChooserDemo.chooser_title=Farbe w\u00E4hlen
+ColorChooserDemo.background=Hintergrund
+ColorChooserDemo.grad_a=Farbverlauf 1
+ColorChooserDemo.grad_b=Farbverlauf 2
+ColorChooserDemo.outer_line=Umfang
+ColorChooserDemo.cup=Bild der Kaffeetasse der Java-Marke
+
+### ComboBox Demo ###
+
+ComboBoxDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JComboBox-Komponente.
+ComboBoxDemo.tooltip=JComboBox-Demo
+ComboBoxDemo.name=ComboBox-Demo
+
+ComboBoxDemo.hair=Haare
+ComboBoxDemo.eyes=Augen
+ComboBoxDemo.mouth=Mund
+ComboBoxDemo.presets=Voreinstellungen:
+
+ComboBoxDemo.preset1=Philip, Howard, Jeff
+ComboBoxDemo.preset2=Jeff, Larry, Philip
+ComboBoxDemo.preset3=Howard, Scott, Hans
+ComboBoxDemo.preset4=Philip, Jeff, Hans
+ComboBoxDemo.preset5=Brent, Jon, Scott
+ComboBoxDemo.preset6=Lara, Larry, Lisa
+ComboBoxDemo.preset7=James, Philip, Michael
+ComboBoxDemo.preset8=Philip, Lisa, Brent
+ComboBoxDemo.preset9=James, Philip, Jon
+ComboBoxDemo.preset10=Lara, Jon, Scott
+
+
+ComboBoxDemo.hair_description=Haare:
+ComboBoxDemo.eyes_description=Augen und Nase:
+ComboBoxDemo.mouth_description=Mund:
+
+ComboBoxDemo.amy=Amy
+ComboBoxDemo.brent=Brent
+ComboBoxDemo.georges=Georges
+ComboBoxDemo.hans=Hans
+ComboBoxDemo.howard=Howard
+ComboBoxDemo.james=James
+ComboBoxDemo.jeff=Jeff
+ComboBoxDemo.jon=Jon
+ComboBoxDemo.lara=Lara
+ComboBoxDemo.larry=Larry
+ComboBoxDemo.lisa=Lisa
+ComboBoxDemo.michael=Michael
+ComboBoxDemo.philip=Philip
+ComboBoxDemo.scott=Scott
+
+### FileChooser Demo ###
+
+FileChooserDemo.accessible_description=\u00DCber den FileChooser k\u00F6nnen Benutzer eine Datei zum \u00D6ffnen oder Erstellen/Speichern ausw\u00E4hlen.
+FileChooserDemo.tooltip=JFileChooser-Demo
+FileChooserDemo.name=FileChooser-Demo
+
+FileChooserDemo.plainbutton=Einfachen JFileChooser anzeigen
+FileChooserDemo.previewbutton=Vorschau-JFileChooser anzeigen
+FileChooserDemo.custombutton=Benutzerdefinierten JFileChooser anzeigen
+
+FileChooserDemo.description=<html>&&nbsp &&nbsp Beachten Sie, dass Sie ganz einfach Ihren eigenen FileChooser<br> &&nbsp &&nbsp mit beliebig vielen Komponenten erstellen k\u00F6nnen. </html>
+
+FileChooserDemo.filterdescription=JPEG- und GIF-Bilddateien
+
+FileChooserDemo.nofileselected=W\u00E4hlen Sie zun\u00E4chst eine Datei aus.
+FileChooserDemo.thefile=die Datei:
+FileChooserDemo.isprobably=ist wahrscheinlich ein Bild.
+
+FileChooserDemo.helptext=<html>Suchen: Datei suchen.<br>Info: Weitere Informationen zur Datei.<br>OK: Diese Datei ausw\u00E4hlen.<br>Abbrechen: Dieses Dialogfeld ohne Aktion verlassen.</html>
+
+FileChooserDemo.findquestion=Datei suchen:
+FileChooserDemo.findresponse=<html><center>Sie m\u00F6chten wirklich eine Datei suchen? <br>Das ist mit dieser Demo nicht m\u00F6glich.</center></html>
+
+FileChooserDemo.dialogtitle=FileChooser mit benutzerdefiniertem Layout
+FileChooserDemo.help=Hilfe
+FileChooserDemo.find=Suchen
+FileChooserDemo.ok=OK
+FileChooserDemo.about=Info
+FileChooserDemo.cancel=Abbrechen
+
+### Html Demo ###
+
+HtmlDemo.accessible_description=Diese Demo zeigt, wie HTML-Text mit der JEditorPane-Komponente angezeigt wird.
+HtmlDemo.tooltip=JEditorPane-HTML-Demo
+HtmlDemo.name=JEditorPane-HTML-Demo
+HtmlDemo.filename=swing.html
+
+
+### Internal Frame Demo ###
+
+InternalFrameDemo.accessible_description=JInternal-Framedemo
+InternalFrameDemo.create_frames.labelAndMnemonic=Angepasste interne Frames erstellen
+InternalFrameDemo.title_text_field.labelAndMnemonic=Frametitel:
+InternalFrameDemo.frame.labelAndMnemonic=Frame
+InternalFrameDemo.palette.labelAndMnemonic=Generator f\u00FCr interne Frames
+InternalFrameDemo.name=Demo f\u00FCr interne Frames
+InternalFrameDemo.tooltip=JInternalFrame-Demo
+InternalFrameDemo.closable.labelAndMnemonic=Kann geschlossen werden
+InternalFrameDemo.resizable.labelAndMnemonic=Skalierbar
+InternalFrameDemo.iconifiable.labelAndMnemonic=Als Symbol darstellbar
+InternalFrameDemo.maximizable.labelAndMnemonic=Maximierbar
+InternalFrameDemo.toast=Prost
+InternalFrameDemo.duke=Euer Gnaden!
+InternalFrameDemo.duchess=Herzogin
+InternalFrameDemo.cab=Braucht jemand ein Taxi?
+
+
+### List Demo ###
+
+ListDemo.accessible_description=JList-Demo
+ListDemo.name=Listendemo
+ListDemo.tooltip=JList-Demo
+ListDemo.prefixes=Pr\u00E4fixe
+ListDemo.suffixes=Suffixe
+ListDemo.count.labelAndMnemonic=Anzahl generierte Listeneintr\u00E4ge:
+ListDemo.all=Alle
+ListDemo.none=Kein Wert
+ListDemo.red=Rotes Firmenlogobild
+ListDemo.yellow=Rotes Firmenlogobild
+ListDemo.blue=Blaues Firmenlogobild
+ListDemo.gray=Graues Firmenlogobild
+ListDemo.green=Gr\u00FCnes Firmenlogobild
+ListDemo.magenta=Firmenlogobild in Magenta
+ListDemo.cyan=Firmenlogobild in Zyan
+ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">Diese Demo zeigt die Pr\u00E4sentation von Datenlisten auf zwei verschiedene Arten. Links steht eine <b>JList</b>-Komponente mit Listenelementen, die aus den Permutationen der aktivierten Pr\u00E4fixe und Suffixe bestehen. Die Kontrollk\u00E4stchenspalten f\u00FCr Pr\u00E4fix und Suffix rechts werden mit einer <b>JPanel</b>-Komponente mit einem Y-Achsen-<b>BoxLayout</b> in einer <b>JScrollPane</b>-Komponente erstellt.</P></html>
+
+
+### OptionPane Demo ###
+
+OptionPaneDemo.accessible_description=Die OptionPane-Demo zeigt Beispiele f\u00FCr die Verwendung von JOptionPane zum Generieren verschiedener g\u00E4ngiger Optionsdialogfelder
+OptionPaneDemo.tooltip=JOptionPane-Demo
+OptionPaneDemo.name=Optionsbereichsdemo
+
+OptionPaneDemo.warningbutton=Warnungsdialogfeld anzeigen
+OptionPaneDemo.componentbutton=Komponentendialogfeld anzeigen
+OptionPaneDemo.inputbutton=Eingabedialogfeld anzeigen
+OptionPaneDemo.confirmbutton=Best\u00E4tigungsdialogfeld anzeigen
+OptionPaneDemo.messagebutton=Meldungsdialog anzeigen
+
+OptionPaneDemo.warningtitle=Beispiel f\u00FCr Warnungsdialogfeld
+OptionPaneDemo.warningtext=<html><P><font color=black>Das ist ein Test des <font color=red><b>Notfallwarnsystems</b></font>. <i><b>Das ist<br> nur ein Test</b></i>. Der Webmaster Ihres lokalen Intranets hat dieses System in freiwilliger <br> Zusammenarbeit mit den <font color=blue><b>Bundes-</b></font> und <font color=blue><b>L\u00E4nderbeh\u00F6rden</b></font> <br> entwickelt, um Sie bei Bedarf \u00FCber <br> Notf\u00E4lle zu informieren. Bei einem tats\u00E4chlichen Notfall w\u00FCrden auf das Signal, das Sie <br> eben geh\u00F6rt haben, offizielle Informationen, Nachrichten <br> oder Anweisungen folgen. Damit ist dieser Test des <font color=red><b><br>Notfallwarnsystems</b></font> abgeschlossen.</font></P><P><br>Entwicklerhinweis: Der Text in dieser Dialogfelddemo wurde mit HTML formatiert.</P></html>
+
+OptionPaneDemo.messagetext=Flaschenpost
+
+OptionPaneDemo.confirmquestion=Scheint heute die Sonne?
+OptionPaneDemo.confirmyes=<html>Warum sitzen Sie noch am Computer?<br> Gehen Sie raus! Machen Sie einen Ausflug zum Strand! Legen Sie sich in die Sonne!</html>
+OptionPaneDemo.confirmno=Gut, dass Sie hier drinnen vor dem Wetter gesch\u00FCtzt sind.
+
+OptionPaneDemo.inputquestion=Was ist Ihr Lieblingsfilm?
+OptionPaneDemo.inputresponse=Das ist ein guter Film!
+
+OptionPaneDemo.componenttitle=Beispiel f\u00FCr Komponentendialogfeld
+OptionPaneDemo.componentmessage=<html>JOptionPane kann beliebig viele Komponenten <br> enthalten, wie ein Textfeld:</html>
+OptionPaneDemo.componenttextfield=oder ein Kombinationsfeld:
+OptionPaneDemo.component_cb1=Element 1
+OptionPaneDemo.component_cb2=Element 2
+OptionPaneDemo.component_cb3=Element 3
+OptionPaneDemo.componentmessage2=<html>JOptionPane kann au\u00DFerdem beliebig viele <br> Optionen anzeigen:</html>
+OptionPaneDemo.component_op1=Ja
+OptionPaneDemo.component_op2=Nein
+OptionPaneDemo.component_op3=Vielleicht
+OptionPaneDemo.component_op4=Wahrscheinlich
+OptionPaneDemo.component_op5=Abbrechen
+
+OptionPaneDemo.component_r1=Optimistisch und positiv! Das ist gut.
+OptionPaneDemo.component_r2=Definitiv nicht. Da haben Sie ganz recht.
+OptionPaneDemo.component_r3=<html><font color=black> Ja, momentan ist die Situation <br> noch ungekl\u00E4rt. Sagen Sie sp\u00E4ter Bescheid, wenn Sie es genau wissen.</font></html>
+OptionPaneDemo.component_r4=<html><font color=black>Sie wollen doch "Ja" sagen. Sie h\u00E4tten sich <br> einfach darauf einlassen und "Ja" klicken sollen.</font></html>
+
+### ProgressBar Demo ###
+
+ProgressBarDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JProgressBar-Komponente.
+ProgressBarDemo.tooltip=JProgressBar-Demo
+ProgressBarDemo.name=ProgressBar-Demo
+ProgressBarDemo.start_button=Laden von Text starten
+ProgressBarDemo.stop_button=Laden von Text stoppen
+ProgressBarDemo.accessible_text_loading_progress=Ladefortschritt f\u00FCr Text
+ProgressBarDemo.accessible_text_area_name=Text wird progressiv geladen
+
+ProgressBarDemo.accessible_text_area_description=Diese JTextArea-Komponente wird progressiv mit Text aus einem Puffer gef\u00FCllt (ein Buchstabe nach dem anderen). Dabei wird der Ladefortschritt im Fortschrittsbalken unten im Fenster angezeigt
+
+ProgressBarDemo.text=Man sagt ja, dass unendlich viele Affen, die unendlich lange auf unendlich vielen Schreibmaschinen herumtippen, \nirgendwann alle Meisterwerke der Menschheit schreiben w\u00FCrden. Mit den modernen Hochgeschwindigkeitsrechnern k\u00F6nnen wir \ndiese Theorie endlich testen... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\nNun, das war scheinbar eine gute Idee...
+
+
+### ScrollPane Demo ###
+
+ScrollPaneDemo.accessible_description=JScrollPane-Demo
+ScrollPaneDemo.name=Demo f\u00FCr Bildlaufbereich
+ScrollPaneDemo.tooltip=JScrollPane-Demo
+ScrollPaneDemo.crayons=Viele Stifte
+ScrollPaneDemo.colheader=Spaltenheader
+ScrollPaneDemo.rowheader=Zeilenheader
+ScrollPaneDemo.upperleft=Oben links
+ScrollPaneDemo.upperright=Oben rechts im Spaltenheader
+ScrollPaneDemo.lowerleft=Unten links im Spaltenheader
+
+
+### Slider Demo ###
+
+SliderDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JSlider-Komponente.
+SliderDemo.tooltip=JSlider-Demo
+SliderDemo.name=Schiebereglerdemo
+
+SliderDemo.slidervalue=Schiebereglerwert:
+SliderDemo.horizontal=Horizontal
+SliderDemo.vertical=Vertikal
+SliderDemo.plain=Einfach
+SliderDemo.a_plain_slider=Ein einfacher Schieberegler
+SliderDemo.majorticks=Grobteilungen
+SliderDemo.majorticksdescription=Ein Schieberegler mit Grobteilungsmarkierungen
+SliderDemo.ticks=Feinteilungen, Teilungen zum Einrasten und Labels
+SliderDemo.minorticks=Feinteilungen
+SliderDemo.minorticksdescription=Ein Schieberegler mit Grob- und Feinteilungen, mit Teilungen, in die der Schieberegler einrastet, wobei einige Teilungen mit einem sichtbaren Label versehen sind
+SliderDemo.disabled=Deaktiviert
+SliderDemo.disableddescription=Ein Schieberegler mit Grob- und Feinteilungen, der nicht aktiviert ist (kann nicht bearbeitet werden)
+
+### SplitPane Demo ###
+
+SplitPaneDemo.accessible_description=JSplitPane-Demo
+SplitPaneDemo.name=Teilbereichdemo
+SplitPaneDemo.tooltip=JSplitPane-Demo
+SplitPaneDemo.earth=Mutter Erde
+SplitPaneDemo.moon=Ein Astronaut auf dem Mond
+SplitPaneDemo.vert_split.labelAndMnemonic=&Vertikal geteilt
+SplitPaneDemo.horz_split.labelAndMnemonic=Ho&rizontal geteilt
+SplitPaneDemo.cont_layout.labelAndMnemonic=Kontinuierli&ches Layout
+SplitPaneDemo.one_touch_expandable.labelAndMnemonic=&Mit einer Ber\u00FChrung einblendbar
+SplitPaneDemo.divider_size.labelAndMnemonic=Trennliniengr\u00F6\u00DFe
+SplitPaneDemo.invalid_divider_size=Ung\u00FCltige Trennliniengr\u00F6\u00DFe
+SplitPaneDemo.error=Fehler
+SplitPaneDemo.first_component_min_size.labelAndMnemonic=M&indestgr\u00F6\u00DFe der ersten Komponente
+SplitPaneDemo.second_component_min_size.labelAndMnemonic=Mi&ndestgr\u00F6\u00DFe der zweiten Komponente
+SplitPaneDemo.invalid_min_size=Ung\u00FCltige Mindestgr\u00F6\u00DFe
+SplitPaneDemo.must_be_greater_than=muss gr\u00F6\u00DFer sein als
+
+
+### TabbedPane Demo ###
+
+TabbedPaneDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JTabbedPane-Komponente.
+TabbedPaneDemo.tooltip=JTabbedPane-Demo
+TabbedPaneDemo.name=TabbedPane-Demo
+
+TabbedPaneDemo.bounce=<html><font color=blue><bold><center>Bouncing Babies!</center></bold></font></html>
+TabbedPaneDemo.stephen=Stephen
+TabbedPaneDemo.david=David
+TabbedPaneDemo.matthew=Matthew
+TabbedPaneDemo.ewan=Ewan
+TabbedPaneDemo.blake=Blake
+TabbedPaneDemo.brooke=Brooke
+TabbedPaneDemo.laine=Laine
+TabbedPaneDemo.hania=Hania
+
+TabbedPaneDemo.label=Platzierung der Registerkarten:
+TabbedPaneDemo.top=Oben
+TabbedPaneDemo.bottom=Unten
+TabbedPaneDemo.left=Links
+TabbedPaneDemo.right=Rechts
+
+
+### Table Demo ###
+
+TableDemo.accessible_description=JTable-Demo
+TableDemo.name=Tabellendemo
+TableDemo.tooltip=JTable-Demo
+TableDemo.all_columns=Alle Spalten
+TableDemo.autoresize_mode=Modus "Automatische Skalierung"
+TableDemo.cell_selection=Zellenauswahl
+TableDemo.column_boundaries=Spaltengrenzen
+TableDemo.column_selection=Spaltenauswahl
+TableDemo.horz_lines=Horizontale Linien
+TableDemo.intercell_spacing=Abstand zwischen Zellen
+TableDemo.intercell_spacing_colon=Abstand zwischen Zellen:
+TableDemo.last_column=Letzte Spalte
+TableDemo.multiple_ranges=Mehrere Bereiche
+TableDemo.one_range=Ein Bereich
+TableDemo.reordering_allowed=Neuanordnung zul\u00E4ssig
+TableDemo.row_height=Zeilenh\u00F6he
+TableDemo.row_height_colon=Zeilenh\u00F6he:
+TableDemo.row_selection=Zeilenauswahl
+TableDemo.selection_mode=Auswahlmodus
+TableDemo.subsequent_columns=Nachfolgende Spalten
+TableDemo.vert_lines=Vertikale Linien
+TableDemo.single=Einzeln
+TableDemo.none=Kein Wert
+TableDemo.off=Deaktiviert
+TableDemo.first_name=Vorname
+TableDemo.last_name=Nachname
+TableDemo.favorite_color=Lieblingsfarbe
+TableDemo.favorite_food=Lieblingsessen
+TableDemo.favorite_movie=Lieblingsfilm
+TableDemo.favorite_number=Lieblingszahl
+TableDemo.aqua=Aquamarin
+TableDemo.beige=Beige
+TableDemo.black=Schwarz
+TableDemo.blue=Blau
+TableDemo.cybergreen=Gr\u00FCn
+TableDemo.darkgreen=Dunkelgr\u00FCn
+TableDemo.eblue=Neonblau
+TableDemo.jfcblue=JFC prim\u00E4r
+TableDemo.jfcblue2=JFC sekund\u00E4r
+TableDemo.forestgreen=Waldgr\u00FCn
+TableDemo.gray=Grau
+TableDemo.green=Gr\u00FCn
+TableDemo.orange=Orange
+TableDemo.purple=Lila
+TableDemo.red=Rot
+TableDemo.rustred=Rostrot
+TableDemo.sunpurple=Purpur
+TableDemo.suspectpink=Pink
+TableDemo.turquoise=T\u00FCrkis
+TableDemo.violet=Violett
+TableDemo.yellow=Gelb
+TableDemo.2001=2001: Odyssee im Weltraum
+TableDemo.buckaroo=Buckaroo Banzai - Die 8. Dimension
+TableDemo.firstsight=Auf den ersten Blick
+TableDemo.airplane=Die unglaubliche Reise in einem verr\u00FCckten Flugzeug (und Fortsetzung)
+TableDemo.aliens=Aliens - Die R\u00FCckkehr
+TableDemo.bicycle=Fahrraddiebe
+TableDemo.bladerunner=Blade Runner (Director's Cut)
+TableDemo.bluesbros=Blues Brothers
+TableDemo.brazil=Brazil
+TableDemo.bugs=Das gro\u00DFe Krabbeln
+TableDemo.city=Die Stadt der verlorenen Kinder
+TableDemo.chusingura=Chusingura (1962)
+TableDemo.clock=Uhrwerk Orange
+TableDemo.curse=Der Fluch des D\u00E4monen
+TableDemo.dasboot=Das Boot
+TableDemo.dazed=Confusion - Sommer der Ausgeflippten
+TableDemo.defending=Rendezvous im Jenseits
+TableDemo.eraserhead=Eraserhead
+TableDemo.fifthelement=Das f\u00FCnfte Element
+TableDemo.goodfellas=GoodFellas - Drei Jahrzehnte in der Mafia
+TableDemo.harold=Harold und Maude
+TableDemo.joyluck=T\u00F6chter des Himmels
+TableDemo.jules=Jules und Jim
+TableDemo.ladyvanishes=Eine Dame verschwindet
+TableDemo.mohicans=Der letzte Mohikaner
+TableDemo.lonestar=Lone Star
+TableDemo.man=Der Mann, der zuviel wusste
+TableDemo.musicman=Music Man
+TableDemo.dog=Mein Leben als Hund
+TableDemo.oncewest=Spiel mir das Lied vom Tod
+TableDemo.pulpfiction=Pulp Fiction
+TableDemo.raiders=J\u00E4ger des verlorenen Schatzes
+TableDemo.reservoir=Reservoir Dogs - Wilde Hunde
+TableDemo.repoman=Repoman
+TableDemo.spinaltap=This is Spinal Tap
+TableDemo.schindlerslist=Schindlers Liste
+TableDemo.starwars=Star Wars
+TableDemo.stuntman=Der lange Tod des Stuntman Cameron
+TableDemo.thinman=Der d\u00FCnne Mann
+TableDemo.withnail=Withnail && I
+TableDemo.labyrinth=Die Reise ins Labyrinth
+TableDemo.shawshank=Die Verurteilten
+TableDemo.apple=Apfel
+TableDemo.asparagus=Spargel
+TableDemo.banana=Banane
+TableDemo.broccoli=Brokkoli
+TableDemo.carrot=Karotte
+TableDemo.cantaloupe=Cantaloupe-Melone
+TableDemo.corn=Mais
+TableDemo.grapes=Trauben
+TableDemo.grapefruit=Grapefruit
+TableDemo.kiwi=Kiwi
+TableDemo.onion=Zwiebel
+TableDemo.pear=Birne
+TableDemo.peach=Pfirsich
+TableDemo.pepper=Rote Paprika
+TableDemo.pickle=Essiggurke
+TableDemo.pineapple=Ananas
+TableDemo.raspberry=Himbeere
+TableDemo.sparegrass=Gr\u00FCnzeug
+TableDemo.strawberry=Erdbeere
+TableDemo.tomato=Tomate
+TableDemo.watermelon=Wassermelone
+
+TableDemo.printing=Drucken
+TableDemo.fitWidth=Breite anpassen
+TableDemo.print=Drucken
+TableDemo.header=Header
+
+# This string will be formatted by a MessageFormat and
+# printed at the top of each page of the printed result.
+# You can use {0} to insert a page number.
+TableDemo.headerText=JTable-Druck
+
+TableDemo.footer=Footer
+
+# This string will be formatted by a MessageFormat and
+# printed at the bottom of each page of the printed result.
+# You can use {0} to insert a page number.
+TableDemo.footerText=Seite {0}
+
+TableDemo.printingResult=Druckergebnis
+TableDemo.printingComplete=Druck abgeschlossen
+TableDemo.printingCancelled=Druck abgebrochen
+
+# This string will be formatted by a MessageFormat and
+# and displayed when an exception occurs.
+# {0} is used to place details of the exception.
+TableDemo.printingFailed=Druck nicht erfolgreich: {0}
+
+
+### ToolTip Demo ###
+
+ToolTipDemo.accessible_description=QuickInfos zeigen kurze Hilfebeschreibungen f\u00FCr eine Komponente an
+ToolTipDemo.accessible_cow=Das ist eine Kuh.
+ToolTipDemo.tooltip=QuickInfo-Demo
+ToolTipDemo.name=QuickInfo-Demo
+ToolTipDemo.bessie=Bessie, die Kuh
+ToolTipDemo.cow=Kuh.
+ToolTipDemo.got_milk=Milch gef\u00E4llig?
+ToolTipDemo.tail=Schweif.
+ToolTipDemo.moo=Muuuh
+ToolTipDemo.tooltip_features=<html>QuickInfos m\u00FCssen nicht immer<p>langweilige, einzeilige Beschreibungen sein. Das <font color=blue size=+2>Swing!</font>-Team<p> zeigt Ihnen gerne, dass es auch anders geht.<p>In Swing k\u00F6nnen QuickInfos HTML f\u00FCr Folgendes verwenden: <ul><li>Listen<li><b>fettgedruckten</b> Text<li><em>betonten</em> Text<li>Text mit <font color=red>Farben</font><li>Text in unterschiedlichen <font size=+3>Gr\u00F6\u00DFen</font><li>und <font face=AvantGarde>Schriftarten</font></ul>Au\u00DFerdem k\u00F6nnen sie auch mehrere Zeilen umfassen.</html>
+
+
+### Tree Demo ###
+
+TreeDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung einer JTree-Komponente.
+TreeDemo.tooltip=JTree-Demo
+TreeDemo.name=Baumdemo
+TreeDemo.music=Musik
+
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
index bc6a24781e9..ebb0409561b 100644
--- a/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -316,7 +316,7 @@ FileChooserDemo.nofileselected=\u6700\u521D\u306B\u30D5\u30A1\u30A4\u30EB\u3092\
 FileChooserDemo.thefile=\u30D5\u30A1\u30A4\u30EB\u540D:
 FileChooserDemo.isprobably=\u306F\u304A\u305D\u3089\u304F\u753B\u50CF\u30C7\u30FC\u30BF\u3067\u3059\u3002
 
-FileChooserDemo.helptext=<html>\u691C\u7D22: \u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u307E\u3059\u3002<br>\u8A73\u7D30: \u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002<br>OK: \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059\u3002<br>\u53D6\u6D88: \u4F55\u3082\u305B\u305A\u306B\u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u9589\u3058\u307E\u3059\u3002</html>
+FileChooserDemo.helptext=<html>\u691C\u7D22: \u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u307E\u3059\u3002<br>\u8A73\u7D30: \u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u3055\u3089\u306B\u5B66\u7FD2\u3057\u307E\u3059\u3002<br>OK: \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059\u3002<br>\u53D6\u6D88: \u4F55\u3082\u305B\u305A\u306B\u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u9589\u3058\u307E\u3059\u3002</html>
 
 FileChooserDemo.findquestion=\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22:
 FileChooserDemo.findresponse=<html><center>\u3042\u306A\u305F\u3001\u672C\u5F53\u306B\u79C1\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u3066\u307B\u3057\u3044\u3068\u601D\u3063\u3066\u308B\u3093\u3067\u3059\u304B\u3002<br>\u305D\u3093\u306A\u3053\u3068\u3067\u304D\u306A\u3044\u3067\u3059\u3088\u3001\u3084\u308A\u65B9\u77E5\u3089\u306A\u3044\u3093\u3067\u3059\u304B\u3089\u3002\u79C1\u306F\u305F\u3060\u306E\u30C7\u30E2\u30FB\u30D7\u30ED\u30B0\u30E9\u30E0\u3067\u3059\u3088\u3002</center></html>
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
index 85c7ead75fb..7edc4b16851 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,21 +24,21 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Verwendung: {0} [Optionen] <mainclass> [args...]\n           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [Optionen] -jar <jarfile> [args...]\n           (zur Ausf\u00FChrung einer JAR-Datei)\n   oder  {0} [Optionen] -m <module>[/<mainclass>] [args...]\n       {0} [Optionen] --module <module>[/<mainclass>] [args...]\n            (zur Ausf\u00FChrung der Hauptklasse in einem Modul)\n\n Argumente, die auf die Hauptklasse folgen, -jar <jarfile>, -m oder --module\n <module>/<mainclass> werden als Argumente f\u00FCr die Hauptklasse \u00FCbergeben.\n\n wobei "Optionen" Folgendes umfasst:\n\n
+java.launcher.opt.header  =   Verwendung: {0} [Optionen] <Hauptklasse> [args...]\n           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [Optionen] -jar <JAR-Datei> [args...]\n           (zur Ausf\u00FChrung einer JAR-Datei)\n   oder  {0} [Optionen] -m <Modul>[/<Hauptklasse>] [args...]\n       {0} [Optionen] --module <Modul>[/<Hauptklasse>] [args...]\n            (zur Ausf\u00FChrung der Hauptklasse in einem Modul)\n   oder  {0} [Optionen] <Quelldatei> [args]\n           (zur Ausf\u00FChrung eines Programms mit einer einzelnen Quelldatei)\n\n Argumente, die auf die Hauptklasse, die Quelldatei, -jar <JAR-Datei>, -m oder --module\n <Modul>/<Hauptklasse> folgen, werden als Argumente f\u00FCr die\nHauptklasse \u00FCbergeben.\n\n Dabei umfasst "Optionen" Folgendes:\n\n
 
 java.launcher.opt.vmselect   =\    {0}\t  zur Auswahl der "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  ist ein Synonym f\u00FCr die "{1}" VM  [verworfen]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist, die upgradef\u00E4hige\n                  Module im Laufzeitimage ersetzen\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Ausgabe im Verbose-Modus aktivieren\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch \
-unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    -disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
+java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist, die upgradef\u00E4hige\n                  Module im Laufzeitimage ersetzen\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Module, die eingeschr\u00E4nkte native Vorg\u00E4nge ausf\u00FChren d\u00FCrfen.\n                  <Modulname> kann auch ALL-UNNAMED lauten.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe f\u00FCr das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  \
+L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    -disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  L\u00E4sst zu, das Klassen von Vorschaufeatures dieses Release abh\u00E4ngig sind\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           Deaktiviert Hintergrundkompilierung\n    -Xbootclasspath/a:<Durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      an Ende von Bootstrap Classpath anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug           Wird zur Abw\u00E4rtskompatibilit\u00E4t bereitgestellt\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, wird als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet\n    -Xint              Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option "-version"\n    -Xloggc:<Datei>    Protokolliert GC-Status in einer Datei mit Zeitstempeln\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und die maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs              Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet, wenn m\u00F6glich, freigegebene Klassendaten (Standard)\n    -Xshare:off       Versucht nicht freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung von freigegebenen Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>         Legt Stackgr\u00F6\u00DFe des Java-Threads fest\n    -Xverify           Legt den Modus der Bytecodeverifizierung fest\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> ungeachtet der\n                      Moduldeklaration gelesen wird.\n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration in <Zielmodul>\n                      zu exportieren.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration in\n                      <Zielmodul> zu \u00F6ffnen.\n    --illegal-access=<Wert>\n                      L\u00E4sst Zugriff f\u00FCr Mitglieder mit den Typen in den benannten Modulen\n                       nach Code in unbenannten Modulen zu oder lehnt ihn ab.\n                      <Wert> ist entweder "deny", "permit", "warn" oder "debug"\n                      Diese Option wird in einem zuk\u00FCnftigen Release entfernt.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                       \u00DCberschreibt oder erweitert ein Modul in JAR-Dateien\n                      oder -Verzeichnissen mit \
-Klassen und Ressourcen.\n    --disable-@files  Deaktiviert die weitere Erweiterung von Argumentdateien\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
+java.launcher.X.usage=\n    -Xbatch           Deaktiviert die Hintergrundkompilierung\n    -Xbootclasspath/a:<durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      An das Ende des Bootstrap Classpaths anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt die Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug            F\u00FChrt nichts aus. Wird aus Gr\u00FCnden der Abw\u00E4rtskompatibilit\u00E4t bereitgestellt.\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden.\n    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option -version\n    -Xlog:<Optionen>      Konfiguriert oder aktiviert Logging mit dem einheitlichen Java Virtual\n                      Machine-(JVM-)Logging-Framework. Verwenden Sie -Xlog:help\n                      f\u00FCr weitere Einzelheiten.\n    -Xloggc:<Datei>    Protokolliert den GC-Status in einer Datei mit Zeitstempeln.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden. Wird durch -Xlog:gc:<Datei> ersetzt.\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs               Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet freigegebene Klassendaten, wenn m\u00F6glich (Standard)\n    -Xshare:off       Versucht nicht, freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung freigegebener Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n                      Diese Testoption kann zeitweise zu\n                      Fehlern f\u00FChren. Sie darf nicht in Produktionsumgebungen verwendet werden.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm\n                      Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:system\n                      (Nur Linux) Zeigt die Konfiguration des Hostsystems oder Containers an\n                      und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>        Legt die Stackgr\u00F6\u00DFe des Java-Threads fest\n    -Xverify          Legt den Modus der Bytecodeverifizierung fest\n                      Beachten Sie, dass die Option -Xverify:none veraltet ist und\n                      in einem zuk\u00FCnftigen Release entfernt werden kann.\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> gelesen wird, ungeachtet\n                      der Moduldeklaration. \n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in \
+<Zielmodul> zu exportieren,\n                      ungeachtet der Moduldeklaration.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in\n                      <Zielmodul> zu \u00F6ffnen, ungeachtet der Moduldeklaration.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                      \u00DCberschreibt oder erweitert ein Modul mit Klassen und Ressourcen\n                      in JAR-Dateien oder Verzeichnissen.\n    --source <Version>\n                      Legt die Version der Quelle im Quelldateimodus fest.\n    --finalization=<Wert>\n                      Steuert, ob die JVM Objekte finalisiert.\n                      Dabei ist <Wert> entweder "enabled" oder "disabled".\n                      Die Finalisierung ist standardm\u00E4\u00DFig aktiviert.\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n    -XstartOnFirstThread\n                      main()-Methode f\u00FCr den ersten (AppKit) Thread ausf\u00FChren\n    -Xdock:name=<application name>\n                      Den im Dock angezeigten Standardanwendungsnamen \u00FCberschreiben\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Das im Dock angezeigte Standardsymbol \u00FCberschreiben\n\n
+java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr macOS spezifisch:\n    -XstartOnFirstThread\n                      F\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit-)Thread aus\n    -Xdock:name=<Anwendungsname>\n                      Setzt den im Dock angezeigten Standardanwendungsnamen au\u00DFer Kraft\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Setzt das im Dock angezeigte Standardsymbol au\u00DFer Kraft\n\n
 
 java.launcher.cls.error1=Fehler: Hauptklasse {0} konnte nicht gefunden oder geladen werden\nUrsache: {1}: {2}
 java.launcher.cls.error2=Fehler: Hauptmethode ist nicht {0} in Klasse {1}. Definieren Sie die Hauptmethode als:\n   public static void main(String[] args)
@@ -53,8 +53,8 @@ java.launcher.jar.error3=kein Hauptmanifestattribut, in {0}
 java.launcher.jar.error4=Fehler beim Laden des Java-Agents in {0}
 java.launcher.init.error=Initialisierungsfehler
 java.launcher.javafx.error1=Fehler: Die JavaFX-Methode launchApplication hat die falsche Signatur, sie\nmuss als statisch deklariert werden und einen Wert vom Typ VOID zur\u00FCckgeben
-java.launcher.module.error1=Modul {0} weist kein MainClass-Attribut auf. Verwenden Sie -m <module>/<main-class>
+java.launcher.module.error1=Modul {0} weist kein ModuleMainClass-Attribut auf. Verwenden Sie -m <module>/<main-class>
 java.launcher.module.error2=Fehler: Hauptklasse {0} konnte in Modul {1} nicht gefunden oder geladen werden
 java.launcher.module.error3=Fehler: Hauptklasse {0} kann nicht in Modul {1} geladen werden\n\t{2}
 java.launcher.module.error4={0} nicht gefunden
-java.launcher.module.error5=Fehler: Hauptklasse {0} kann nicht in Modul {1} initialisiert werden\nUrsache: {1}: {2}
+java.launcher.module.error5=Fehler: Hauptklasse {0} kann nicht in Modul {1} initialisiert werden\nUrsache: {2}: {3}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
index 32d28144dff..542145ccbb0 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,14 @@ java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM\u3092\u9078\u629E\u3059\u308B
 java.launcher.opt.hotspot    =\    {0}\t  \u306F"{1}" VM\u306E\u30B7\u30CE\u30CB\u30E0\u3067\u3059  [\u975E\u63A8\u5968]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n    --upgrade-module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \
-\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  (\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \
-\u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    -disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
+java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n    --upgrade-module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5236\u9650\u3055\u308C\u305F\u30CD\u30A4\u30C6\u30A3\u30D6\u64CD\u4F5C\u306E\u5B9F\u884C\u3092\u8A31\u53EF\u3055\u308C\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306FALL-UNNAMED\u306B\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \
+\u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  \
+(\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    -disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3057\u307E\u3059\n    -Xcheck:jni       JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059\n    -Xcomp            \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3057\u307E\u3059\n    -Xdebug           \u4F55\u3082\u884C\u3044\u307E\u305B\u3093\u3002\u4E0B\u4F4D\u4E92\u63DB\u6027\u306E\u305F\u3081\u306B\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xdiag            \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059\n    -Xfuture          \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    -Xint             \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n    -Xinternalversion\n                      -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n                      \u8868\u793A\u3057\u307E\u3059\n    -Xlog:<opts>      Java Virtual Machine (JVM)\u7D71\u5408\u30ED\u30AE\u30F3\u30B0\u30FB\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3067\u306E\n                      \u30ED\u30AE\u30F3\u30B0\u3092\u69CB\u6210\u307E\u305F\u306F\u6709\u52B9\u5316\u3057\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-Xlog:help\u3092\n                      \u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n    -Xloggc:<file>    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002-Xlog:gc:<file>\u3067\u7F6E\u63DB\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xmixed           \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xmn<size>        \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u30B5\u30A4\u30BA\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA\n                      (\u30D0\u30A4\u30C8\u5358\u4F4D)\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xms<size>        Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xmx<size>        Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xnoclassgc       \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xrs              Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3057\u307E\u3059(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n    -Xshare:auto      \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xshare:off       \
-\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --illegal-access=<value>\n                      \
-\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30B3\u30FC\u30C9\u306B\u3088\u308B\u3001\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30BF\u30A4\u30D7\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u4E0D\u6B63\u30A2\u30AF\u30BB\u30B9\u3092\n                      \u8A31\u53EF\u307E\u305F\u306F\u62D2\u5426\u3057\u307E\u3059\u3002\n                      <value>\u306F"deny"\u3001"permit"\u3001"warn"\u307E\u305F\u306F"debug"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
+\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \
+\u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n    --finalization=<value>\n                      JVM\u304C\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\n                      <value>\u306F"enabled"\u307E\u305F\u306F"disabled"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n                      \u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FmacOS\u56FA\u6709\u3067\u3059:\n    -XstartOnFirstThread\n                      main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n    -Xdock:name=<application name>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n    -Xdock:icon=<path to icon file>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
index cdf9e09633d..35ec035c8d7 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,12 @@ java.launcher.opt.vmselect   =\    {0}\t  \u9009\u62E9 "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  \u662F "{1}" VM \u7684\u540C\u4E49\u8BCD [\u5DF2\u8FC7\u65F6]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n                  \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \
-\u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    -disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
+java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n                  \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5141\u8BB8\u6267\u884C\u53D7\u9650\u672C\u673A\u64CD\u4F5C\u7684\u6A21\u5757\u3002\n                  <module name> \u8FD8\u53EF\u4EE5\u4E3A ALL-UNNAMED\u3002\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \
+\u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    -disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n    -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n    -Xcheck:jni       \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n    -Xcomp            \u5F3A\u5236\u5728\u9996\u6B21\u8C03\u7528\u65F6\u7F16\u8BD1\u65B9\u6CD5\n    -Xdebug           \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C\u3002\u4E3A\u5B9E\u73B0\u5411\u540E\u517C\u5BB9\u800C\u63D0\u4F9B\u3002\n    -Xdiag            \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n    -Xfuture          \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5\uFF0C\u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    -Xint             \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n    -Xinternalversion\n                      \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684\n                      JVM \u7248\u672C\u4FE1\u606F\n    -Xlog:<opts>      \u914D\u7F6E\u6216\u542F\u7528\u91C7\u7528 Java \u865A\u62DF\n                      \u673A (Java Virtual Machine, JVM) \u7EDF\u4E00\u8BB0\u5F55\u6846\u67B6\u8FDB\u884C\u4E8B\u4EF6\u8BB0\u5F55\u3002\u4F7F\u7528 -Xlog:help\n                      \u53EF\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002\n    -Xloggc:<file>    \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D\uFF08\u5E26\u65F6\u95F4\u6233\uFF09\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u5C06\u6765\u7684\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\u5B83\u5C06\u66FF\u6362\u4E3A -Xlog:gc:<file>\u3002\n    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u6267\u884C\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xmn<size>        \u4E3A\u5E74\u8F7B\u4EE3\uFF08\u65B0\u751F\u4EE3\uFF09\u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n                      \uFF08\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D\uFF09\n    -Xms<size>        \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n    -Xmx<size>        \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n    -Xnoclassgc       \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n    -Xrs              \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528\uFF08\u8BF7\u53C2\u89C1\u6587\u6863\uFF09\n    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xshare:off       \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n    -Xshare:on        \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF0C\u5426\u5219\u5C06\u5931\u8D25\u3002\n                      \u8FD9\u662F\u4E00\u4E2A\u6D4B\u8BD5\u9009\u9879\uFF0C\u53EF\u80FD\u5BFC\u81F4\u95F4\u6B47\u6027\n                      \u6545\u969C\u3002\u4E0D\u5E94\u5728\u751F\u4EA7\u73AF\u5883\u4E2D\u4F7F\u7528\u5B83\u3002\n    -XshowSettings    \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:all\n                      \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:locale\n                      \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:properties\n                      \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:vm\n                      \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:system\n                      \uFF08\u4EC5 Linux\uFF09\u663E\u793A\u4E3B\u673A\u7CFB\u7EDF\u6216\u5BB9\u5668\n                      \u914D\u7F6E\u5E76\u7EE7\u7EED\n    -Xss<size>        \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n    -Xverify          \
-\u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --illegal-access=<value>\n                      \u5141\u8BB8\u6216\u62D2\u7EDD\u901A\u8FC7\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u4EE3\u7801\u5BF9\u547D\u540D\u6A21\u5757\u4E2D\u7684\n                      \u7C7B\u578B\u6210\u5458\u8FDB\u884C\u8BBF\u95EE\u3002\n                      <value> \u4E3A "deny"\u3001"permit"\u3001"warn" \u6216 "debug" \u4E4B\u4E00\n                      \u6B64\u9009\u9879\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+\u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n    --finalization=<value>\n                      \u63A7\u5236 JVM \u662F\u5426\u6267\u884C\u5BF9\u8C61\u6700\u7EC8\u5904\u7406\uFF0C\n                      \u5176\u4E2D <value> \u4E3A "enabled" \u6216 "disabled" \u4E4B\u4E00\u3002\n                      \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6700\u7EC8\u5904\u7406\u5904\u4E8E\u542F\u7528\u72B6\u6001\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u662F\u7279\u5B9A\u4E8E macOS \u7684\u9009\u9879\uFF1A\n    -XstartOnFirstThread\n                      \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n    -Xdock:name=<application name>\n                      \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n    -Xdock:icon=<path to icon file>\n                     \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
index 24cdbabc3a8..5479bc1df2d 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,15 +45,15 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"option.1.set.twice", "Die Option %s wurde mehrmals angegeben. Alle Angaben bis auf die letzte werden ignoriert."},
         {"multiple.commands.1.2", "Nur ein Befehl ist zul\u00E4ssig: Sowohl %1$s als auch %2$s wurden angegeben."},
         {"Use.keytool.help.for.all.available.commands",
-                 "\"keytool -help\" f\u00FCr alle verf\u00FCgbaren Befehle verwenden"},
+                 "Verwenden Sie \"keytool -?, -h, or --help\" f\u00FCr diese Hilfemeldung"},
         {"Key.and.Certificate.Management.Tool",
                  "Schl\u00FCssel- und Zertifikatsverwaltungstool"},
         {"Commands.", "Befehle:"},
         {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Verwenden Sie \"keytool -command_name -help\" f\u00FCr die Verwendung von command_name.\nVerwenden Sie die Option -conf <url>, um eine vorkonfigurierte Optionsdatei anzugeben."},
+                "Verwenden Sie \"keytool -command_name --help\" f\u00FCr die Verwendung von command_name.\nVerwenden Sie die Option -conf <url>, um eine vorkonfigurierte Optionsdatei anzugeben."},
         // keytool: help: commands
         {"Generates.a.certificate.request",
-                "Generiert eine Zertifikatanforderung"}, //-certreq
+                "Generiert eine Zertifikatsanforderung"}, //-certreq
         {"Changes.an.entry.s.alias",
                 "\u00C4ndert den Alias eines Eintrags"}, //-changealias
         {"Deletes.an.entry",
@@ -65,7 +65,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Generates.a.secret.key",
                 "Generiert einen Secret Key"}, //-genseckey
         {"Generates.certificate.from.a.certificate.request",
-                "Generiert ein Zertifikat aus einer Zertifikatanforderung"}, //-gencert
+                "Generiert ein Zertifikat aus einer Zertifikatsanforderung"}, //-gencert
         {"Generates.CRL", "Generiert eine CRL"}, //-gencrl
         {"Generated.keyAlgName.secret.key",
                 "{0} Secret Key generiert"}, //-genseckey
@@ -88,20 +88,25 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Prints.the.content.of.a.certificate",
                 "Druckt den Content eines Zertifikats"}, //-printcert
         {"Prints.the.content.of.a.certificate.request",
-                "Druckt den Content einer Zertifikatanforderung"}, //-printcertreq
+                "Druckt den Content einer Zertifikatsanforderung"}, //-printcertreq
         {"Prints.the.content.of.a.CRL.file",
                 "Druckt den Content einer CRL-Datei"}, //-printcrl
         {"Generates.a.self.signed.certificate",
                 "Generiert ein selbst signiertes Zertifikat"}, //-selfcert
         {"Changes.the.store.password.of.a.keystore",
                 "\u00C4ndert das Speicherkennwort eines Keystores"}, //-storepasswd
+        {"showinfo.command.help", "Zeigt sicherheitsbezogene Informationen an"},
+        {"Prints.the.program.version", "Gibt die Programmversion aus"},
+
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
                 "Aliasname des zu verarbeitenden Eintrags"}, //-alias
+        {"groupname.option.help",
+                "Gruppenname. Beispiel: der Name der elliptischen Kurve."}, //-groupname
         {"destination.alias",
                 "Zielalias"}, //-destalias
         {"destination.key.password",
-                "Zielschl\u00FCssel-Kennwort"}, //-destkeypass
+                "Zielschl\u00FCsselkennwort"}, //-destkeypass
         {"destination.keystore.name",
                 "Ziel-Keystore-Name"}, //-destkeystore
         {"destination.keystore.password.protected",
@@ -138,6 +143,7 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Kein Prompt"}, //-noprompt
         {"password.through.protected.mechanism",
                 "Kennwort \u00FCber gesch\u00FCtzten Mechanismus"}, //-protected
+        {"tls.option.help", "Zeigt TLS-Konfigurationsinformationen an"},
 
         // The following 2 values should span 2 lines, the first for the
         // option itself, the second for its -providerArg value.
@@ -154,10 +160,14 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Ausgabe in RFC-Stil"}, //-rfc
         {"signature.algorithm.name",
                 "Signaturalgorithmusname"}, //-sigalg
+        {"signer.alias",
+                "Signaturgeberalias"}, //-signer
+        {"signer.key.password",
+                "Signaturgeber-Schl\u00FCsselkennwort"}, //-signerkeypass
         {"source.alias",
                 "Quellalias"}, //-srcalias
         {"source.key.password",
-                "Quellschl\u00FCssel-Kennwort"}, //-srckeypass
+                "Quellschl\u00FCsselkennwort"}, //-srckeypass
         {"source.keystore.name",
                 "Quell-Keystore-Name"}, //-srckeystore
         {"source.keystore.password.protected",
@@ -173,7 +183,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"signed.jar.file",
                 "Signierte JAR-Datei"}, //=jarfile
         {"certificate.validity.start.date.time",
-                "Anfangsdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
+                "Startdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
         {"keystore.password",
                 "Keystore-Kennwort"}, //-storepass
         {"keystore.type",
@@ -188,8 +198,8 @@ public class Resources_de extends java.util.ListResourceBundle {
                  "Serielle ID des zu entziehenden Certs"}, //-id
         // keytool: Running part
         {"keytool.error.", "Keytool-Fehler: "},
-        {"Illegal.option.", "Ung\u00FCltige Option:  "},
-        {"Illegal.value.", "Ung\u00FCltiger Wert: "},
+        {"Illegal.option.", "Unzul\u00E4ssige Option:  "},
+        {"Illegal.value.", "Unzul\u00E4ssiger Wert: "},
         {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
         {"Cannot.find.environment.variable.",
                 "Umgebungsvariable kann nicht gefunden werden: "},
@@ -217,7 +227,7 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
         {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
                 "Wenn der Quell-Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
-        {"Illegal.startdate.value", "Ung\u00FCltiger Wert f\u00FCr Anfangsdatum"},
+        {"Illegal.startdate.value", "Unzul\u00E4ssiger Wert f\u00FCr Startdatum"},
         {"Validity.must.be.greater.than.zero",
                 "G\u00FCltigkeit muss gr\u00F6\u00DFer als null sein"},
         {"provclass.not.a.provider", "%s kein Provider"},
@@ -248,7 +258,6 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Keystore.password.is.too.short.must.be.at.least.6.characters",
          "Keystore-Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
         {"Unknown.Entry.Type", "Unbekannter Eintragstyp"},
-        {"Too.many.failures.Alias.not.changed", "Zu viele Fehler. Alias nicht ge\u00E4ndert"},
         {"Entry.for.alias.alias.successfully.imported.",
                  "Eintrag f\u00FCr Alias {0} erfolgreich importiert."},
         {"Entry.for.alias.alias.not.imported.", "Eintrag f\u00FCr Alias {0} nicht importiert."},
@@ -271,9 +280,9 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Certificate.stored.in.file.filename.",
                 "Zertifikat in Datei <{0}> gespeichert"},
         {"Certificate.reply.was.installed.in.keystore",
-                "Zertifikatantwort wurde in Keystore installiert"},
+                "Zertifikatsantwort wurde in Keystore installiert"},
         {"Certificate.reply.was.not.installed.in.keystore",
-                "Zertifikatantwort wurde nicht in Keystore installiert"},
+                "Zertifikatsantwort wurde nicht in Keystore installiert"},
         {"Certificate.was.added.to.keystore",
                 "Zertifikat wurde Keystore hinzugef\u00FCgt"},
         {"Certificate.was.not.added.to.keystore",
@@ -287,10 +296,16 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Alias <{0}> ist nicht vorhanden"},
         {"Alias.alias.has.no.certificate",
                 "Alias <{0}> hat kein Zertifikat"},
+        {"groupname.keysize.coexist",
+                "Es k\u00F6nnen nicht sowohl -groupname als auch -keysize angegeben werden"},
+        {"deprecate.keysize.for.ec",
+                "Das Angeben von -keysize zum Generieren von EC-Schl\u00FCsseln ist veraltet. Verwenden Sie stattdessen \"-groupname %s\"."},
         {"Key.pair.not.generated.alias.alias.already.exists",
                 "Schl\u00FCsselpaar wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und selbst signiertem Zertifikat ({2}) mit einer G\u00FCltigkeit von {3} Tagen\n\tf\u00FCr: {4}"},
+        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
+                "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und Zertifikat ({2}), ausgestellt von <{3}>, mit einer G\u00FCltigkeit von {4} Tagen\n\tf\u00FCr: {5}"},
         {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}> eingeben"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(RETURN, wenn identisch mit Keystore-Kennwort):  "},
@@ -303,12 +318,8 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Password.is.too.short.must.be.at.least.6.characters",
                 "Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
         {"Too.many.failures.Key.entry.not.cloned",
-                "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geclont"},
+                "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geklont"},
         {"key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}>"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "Keystore-Eintrag f\u00FCr <{0}> bereits vorhanden"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "Keystore-Eintrag f\u00FCr <{0}> wird erstellt..."},
         {"No.entries.from.identity.database.added",
                 "Keine Eintr\u00E4ge aus Identity-Datenbank hinzugef\u00FCgt"},
         {"Alias.name.alias", "Aliasname: {0}"},
@@ -346,7 +357,6 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
                 "M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]:  "},
         {"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]:  "},
-        {"YES", "JA"},
         {"New.prompt.", "Neues {0}: "},
         {"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"},
         {"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "},
@@ -379,15 +389,14 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Alias.alias.has.no.key",
                 "Alias <{0}> verf\u00FCgt \u00FCber keinen Schl\u00FCssel"},
         {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "Alias <{0}> verweist auf einen Eintragstyp, der kein Private Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Klonen von Private Key-Eintr\u00E4gen"},
+                 "Alias <{0}> verweist auf einen Eintragstyp, der kein Private-Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Klonen von Private-Key-Eintr\u00E4gen"},
 
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "Signaturgeber #%d:"},
+        {"Certificate.d.", "Zertifikat #%d:"},
         {"Timestamp.", "Zeitstempel:"},
-        {"Signature.", "Signatur:"},
-        {"CRLs.", "CRLs:"},
-        {"Certificate.owner.", "Zertifikateigent\u00FCmer: "},
+        {"Certificate.owner.", "Zertifikatseigent\u00FCmer: "},
         {"Not.a.signed.jar.file", "Keine signierte JAR-Datei"},
         {"No.certificate.from.the.SSL.server",
                 "Kein Zertifikat vom SSL-Server"},
@@ -398,20 +407,17 @@ public class Resources_de extends java.util.ListResourceBundle {
             "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben.                  *"},
 
         {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
+                "Zertifikatsantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
         {"Incomplete.certificate.chain.in.reply",
                 "Unvollst\u00E4ndige Zertifikatskette in Antwort"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "Zertifikatskette in Antwort verifiziert nicht: "},
         {"Top.level.certificate.in.reply.",
                 "Zertifikat der obersten Ebene in Antwort:\n"},
         {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
         {"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]:  "},
-        {"NO", "NEIN"},
         {"Public.keys.in.reply.and.keystore.don.t.match",
                 "Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"},
         {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "Zertifikatantwort und Zertifikat in Keystore sind identisch"},
+                "Zertifikatsantwort und Zertifikat in Keystore sind identisch"},
         {"Failed.to.establish.chain.from.reply",
                 "Kette konnte der Antwort nicht entnommen werden"},
         {"n", "N"},
@@ -419,10 +425,12 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Secret.key.not.generated.alias.alias.already.exists",
                 "Secret Key wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
         {"Please.provide.keysize.for.secret.key.generation",
-                "Geben Sie -keysize zum Erstellen eines Secret Keys an"},
+                "Geben Sie -keysize zum Erstellen eines Secret Key an"},
 
         {"warning.not.verified.make.sure.keystore.is.correct",
             "WARNUNG: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist."},
+        {"warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts",
+            "Warnung: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist, oder geben Sie -trustcacerts an."},
 
         {"Extensions.", "Erweiterungen: "},
         {".Empty.value.", "(Leerer Wert)"},
@@ -439,34 +447,43 @@ public class Resources_de extends java.util.ListResourceBundle {
 
         // 8171319: keytool should print out warnings when reading or
         // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "Die Zertifikatanforderung"},
+        {"the.certificate.request", "Die Zertifikatsanforderung"},
         {"the.issuer", "Der Aussteller"},
         {"the.generated.certificate", "Das generierte Zertifikat"},
         {"the.generated.crl", "Die generierte CRL"},
-        {"the.generated.certificate.request", "Die generierte Zertifikatanforderung"},
+        {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"},
         {"the.certificate", "Das Zertifikat"},
         {"the.crl", "Die CRL"},
         {"the.tsa.certificate", "Das TSA-Zertifikat"},
         {"the.input", "Die Eingabe"},
         {"reply", "Antwort"},
         {"one.in.many", "%1$s #%2$d von %3$d"},
+        {"one.in.many1", "%1$s #%2$d"},
+        {"one.in.many2", "%1$s von Signaturgeber #%2$d"},
+        {"one.in.many3", "%1$s #%2$d von Signaturgeber #%3$d"},
         {"alias.in.cacerts", "Aussteller <%s> in cacerts"},
         {"alias.in.keystore", "Aussteller <%s>"},
         {"with.weak", "%s (schwach)"},
+        {"with.disabled", "%s (deaktiviert)"},
         {"key.bit", "%1$d-Bit-%2$s-Schl\u00FCssel"},
         {"key.bit.weak", "%1$d-Bit-%2$s-Schl\u00FCssel (schwach)"},
-        {"unknown.size.1", "unbekannte Gr\u00F6\u00DFe: %s-Schl\u00FCssel"},
+        {"key.bit.disabled", "%1$d-Bit-%2$s-Schl\u00FCssel (deaktiviert)"},
+        {"unknown.size.1", "%s-Schl\u00FCssel mit unbekannter Gr\u00F6\u00DFe"},
         {".PATTERN.printX509Cert.with.weak",
-                "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic Key-Algorithmus von Subject: {8}\nVersion: {9}"},
+                "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic-Key-Algorithmus von Subject: {8}\nVersion: {9}"},
         {"PKCS.10.with.weak",
-                "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
+                "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
         {"verified.by.s.in.s.weak", "Von %1$s in %2$s mit %3$s verifiziert"},
-        {"whose.sigalg.risk", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."},
-        {"whose.key.risk", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko."},
+        {"whose.sigalg.disabled", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"whose.sigalg.weak", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"whose.key.disabled", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"whose.key.weak", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko. Diese Schl\u00FCsselgr\u00F6\u00DFe wird in einem zuk\u00FCnftigen Update deaktiviert."},
         {"jks.storetype.warning", "Der %1$s-Keystore verwendet ein propriet\u00E4res Format. Es wird empfohlen, auf PKCS12 zu migrieren, das ein Industriestandardformat mit \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" ist."},
         {"migrate.keystore.warning", "\"%1$s\" zu %4$s migriert. Der %2$s-Keystore wurde als \"%3$s\" gesichert."},
         {"backup.keystore.warning", "Der urspr\u00FCngliche Keystore \"%1$s\" wird als \"%3$s\" gesichert..."},
         {"importing.keystore.status", "Keystore %1$s wird in %2$s importiert..."},
+        {"keyalg.option.missing.error", "Die Option -keyalg muss angegeben werden."},
+        {"showinfo.no.option", "Fehlende Option f\u00FCr -showinfo. Verwenden Sie keytool -showinfo -tls."},
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
index 49980f3c480..43acdf4f2d3 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,6 +96,7 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"Changes.the.store.password.of.a.keystore",
                 "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-storepasswd
         {"showinfo.command.help", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u95A2\u9023\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059"},
+        {"Prints.the.program.version", "\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059"},
 
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
@@ -159,6 +160,10 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "RFC\u30B9\u30BF\u30A4\u30EB\u306E\u51FA\u529B"}, //-rfc
         {"signature.algorithm.name",
                 "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-sigalg
+        {"signer.alias",
+                "\u7F72\u540D\u8005\u306E\u5225\u540D"}, //-signer
+        {"signer.key.password",
+                "\u7F72\u540D\u8005\u306E\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-signerkeypass
         {"source.alias",
                 "\u30BD\u30FC\u30B9\u5225\u540D"}, //-srcalias
         {"source.key.password",
@@ -299,6 +304,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u30AD\u30FC\u30FB\u30DA\u30A2\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "{3}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u306E\u30AD\u30FC\u30FB\u30DA\u30A2\u3068\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {4}"},
+        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
+                "{4}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u30AD\u30FC\u30FB\u30DA\u30A2\u3068<{3}>\u306B\u3088\u3063\u3066\u767A\u884C\u3055\u308C\u308B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {5}"},
         {"Enter.key.password.for.alias.", "<{0}>\u306E\u30AD\u30FC\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044):  "},
@@ -387,8 +394,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"},
+        {"Certificate.d.", "\u8A3C\u660E\u66F8#%d:"},
         {"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"},
-        {"Signature.", "\u7F72\u540D:"},
         {"Certificate.owner.", "\u8A3C\u660E\u66F8\u306E\u6240\u6709\u8005: "},
         {"Not.a.signed.jar.file", "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
         {"No.certificate.from.the.SSL.server",
@@ -451,6 +458,9 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"the.input", "\u5165\u529B"},
         {"reply", "\u5FDC\u7B54"},
         {"one.in.many", "%1$s #%2$d / %3$d"},
+        {"one.in.many1", "%1$s #%2$d"},
+        {"one.in.many2", "\u7F72\u540D\u8005\u306E%1$s #%2$d"},
+        {"one.in.many3", "\u7F72\u540D\u8005\u306E%1$s #%2$d #%3$d"},
         {"alias.in.cacerts", "cacerts\u5185\u306E\u767A\u884C\u8005<%s>"},
         {"alias.in.keystore", "\u767A\u884C\u8005<%s>"},
         {"with.weak", "%s (\u5F31)"},
@@ -473,7 +483,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"backup.keystore.warning", "\u5143\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\"%1$s\"\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059..."},
         {"importing.keystore.status", "\u30AD\u30FC\u30B9\u30C8\u30A2%1$s\u3092%2$s\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059..."},
         {"keyalg.option.missing.error", "-keyalg\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
-
         {"showinfo.no.option", "-showinfo\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093\u3002\"keytool -showinfo -tls\"\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
     };
 
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
index dfe71431c28..520c55796ef 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,6 +96,7 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"Changes.the.store.password.of.a.keystore",
                 "\u66F4\u6539\u5BC6\u94A5\u5E93\u7684\u5B58\u50A8\u53E3\u4EE4"}, //-storepasswd
         {"showinfo.command.help", "\u663E\u793A\u5B89\u5168\u76F8\u5173\u4FE1\u606F"},
+        {"Prints.the.program.version", "\u8F93\u51FA\u7A0B\u5E8F\u7248\u672C"},
 
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
@@ -159,6 +160,10 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u4EE5 RFC \u6837\u5F0F\u8F93\u51FA"}, //-rfc
         {"signature.algorithm.name",
                 "\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0"}, //-sigalg
+        {"signer.alias",
+                "\u7B7E\u540D\u8005\u522B\u540D"}, //-signer
+        {"signer.key.password",
+                "\u7B7E\u540D\u8005\u5BC6\u94A5\u5BC6\u7801"}, //-signerkeypass
         {"source.alias",
                 "\u6E90\u522B\u540D"}, //-srcalias
         {"source.key.password",
@@ -299,6 +304,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u672A\u751F\u6210\u5BC6\u94A5\u5BF9, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D{1}\u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({2}) (\u6709\u6548\u671F\u4E3A {3} \u5929):\n\t {4}"},
+        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
+                "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D {1} \u5BC6\u94A5\u5BF9\u548C\u7531 <{3}> \u9881\u53D1\u7684\u8BC1\u4E66 ({2})\uFF08\u6709\u6548\u671F\u4E3A {4} \u5929\uFF09\uFF1A\n\t {5}"},
         {"Enter.key.password.for.alias.", "\u8F93\u5165 <{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(\u5982\u679C\u548C\u5BC6\u94A5\u5E93\u53E3\u4EE4\u76F8\u540C, \u6309\u56DE\u8F66):  "},
@@ -387,8 +394,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "\u7B7E\u540D\u8005 #%d:"},
+        {"Certificate.d.", "\u8BC1\u4E66 #%d\uFF1A"},
         {"Timestamp.", "\u65F6\u95F4\u6233:"},
-        {"Signature.", "\u7B7E\u540D:"},
         {"Certificate.owner.", "\u8BC1\u4E66\u6240\u6709\u8005: "},
         {"Not.a.signed.jar.file", "\u4E0D\u662F\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"},
         {"No.certificate.from.the.SSL.server",
@@ -451,6 +458,9 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"the.input", "\u8F93\u5165"},
         {"reply", "\u56DE\u590D"},
         {"one.in.many", "%1$s #%2$d/%3$d"},
+        {"one.in.many1", "%1$s #%2$d"},
+        {"one.in.many2", "\u7B7E\u540D\u8005 #%2$d \u7684 %1$s"},
+        {"one.in.many3", "\u7B7E\u540D\u8005 #%3$d \u7684 %1$s #%2$d"},
         {"alias.in.cacerts", "cacerts \u4E2D\u7684\u53D1\u5E03\u8005 <%s>"},
         {"alias.in.keystore", "\u53D1\u5E03\u8005 <%s>"},
         {"with.weak", "%s (\u5F31)"},
@@ -473,7 +483,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"backup.keystore.warning", "\u5DF2\u5C06\u539F\u59CB\u5BC6\u94A5\u5E93 \"%1$s\" \u5907\u4EFD\u4E3A \"%3$s\"..."},
         {"importing.keystore.status", "\u6B63\u5728\u5C06\u5BC6\u94A5\u5E93 %1$s \u5BFC\u5165\u5230 %2$s..."},
         {"keyalg.option.missing.error", "\u5FC5\u987B\u6307\u5B9A -keyalg \u9009\u9879\u3002"},
-
         {"showinfo.no.option", "-showinfo \u7F3A\u5C11\u9009\u9879\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 \"keytool -showinfo -tls\"\u3002"},
     };
 
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_de.java b/src/java.base/share/classes/sun/security/util/AuthResources_de.java
index 9775c7e4456..03b919626de 100644
--- a/src/java.base/share/classes/sun/security/util/AuthResources_de.java
+++ b/src/java.base/share/classes/sun/security/util/AuthResources_de.java
@@ -88,7 +88,7 @@ public class AuthResources_de extends java.util.ListResourceBundle {
         {"Keystore.alias.","Keystore-Alias: "},
         {"Keystore.password.","Keystore-Kennwort: "},
         {"Private.key.password.optional.",
-            "Private Key-Kennwort (optional): "},
+            "Private-Key-Kennwort (optional): "},
 
         // com.sun.security.auth.module.Krb5LoginModule
         {"Kerberos.username.defUsername.",
diff --git a/src/java.base/share/classes/sun/security/util/Resources_de.java b/src/java.base/share/classes/sun/security/util/Resources_de.java
index c36e24ac584..57e2c8da863 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_de.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -66,8 +66,6 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Subject.", "Subjekt:\n"},
         {".Principal.", "\tPrincipal: "},
         {".Public.Credential.", "\t\u00D6ffentliche Zugangsdaten: "},
-        {".Private.Credentials.inaccessible.",
-                "\tKein Zugriff auf private Zugangsdaten\n"},
         {".Private.Credential.", "\tPrivate Zugangsdaten: "},
         {".Private.Credential.inaccessible.",
                 "\tKein Zugriff auf private Zugangsdaten\n"},
@@ -89,16 +87,6 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Ung\u00FCltiger Nullwert f\u00FCr CallbackHandler angegeben"},
         {"null.subject.logout.called.before.login",
                 "Nullsubjekt - Abmeldung vor Anmeldung aufgerufen"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "LoginModule {0} kann nicht instanziiert werden, da es keinen argumentlosen Constructor angibt"},
-        {"unable.to.instantiate.LoginModule",
-                "LoginModule kann nicht instanziiert werden"},
-        {"unable.to.instantiate.LoginModule.",
-                "LoginModule kann nicht instanziiert werden: "},
-        {"unable.to.find.LoginModule.class.",
-                "LoginModule-Klasse kann nicht gefunden werden: "},
-        {"unable.to.access.LoginModule.",
-                "Kein Zugriff auf LoginModule m\u00F6glich: "},
         {"Login.Failure.all.modules.ignored",
                 "Anmeldefehler: Alle Module werden ignoriert"},
 
@@ -150,11 +138,6 @@ public class Resources_de extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "Kennwort f\u00FCr PKCS11-Token [{0}]: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "Subjektbasierte Policy kann nicht instanziiert werden"}
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/util/Resources_ja.java b/src/java.base/share/classes/sun/security/util/Resources_ja.java
index 195d71010a6..1293a48aabc 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_ja.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_ja.java
@@ -66,8 +66,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"Subject.", "\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8:\n"},
         {".Principal.", "\t\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB: "},
         {".Public.Credential.", "\t\u516C\u958B\u8CC7\u683C: "},
-        {".Private.Credentials.inaccessible.",
-                "\t\u975E\u516C\u958B\u8CC7\u683C\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n"},
         {".Private.Credential.", "\t\u975E\u516C\u958B\u8CC7\u683C: "},
         {".Private.Credential.inaccessible.",
                 "\t\u975E\u516C\u958B\u8CC7\u683C\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n"},
@@ -89,16 +87,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u7121\u52B9\u306Anull CallbackHandler\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
         {"null.subject.logout.called.before.login",
                 "null\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8 - \u30ED\u30B0\u30A4\u30F3\u3059\u308B\u524D\u306B\u30ED\u30B0\u30A2\u30A6\u30C8\u304C\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "LoginModule {0}\u306F\u5F15\u6570\u3092\u53D6\u3089\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u6307\u5B9A\u3067\u304D\u306A\u3044\u305F\u3081\u3001\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"},
-        {"unable.to.instantiate.LoginModule",
-                "LoginModule\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"},
-        {"unable.to.instantiate.LoginModule.",
-                "LoginModule\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093: "},
-        {"unable.to.find.LoginModule.class.",
-                "LoginModule\u30AF\u30E9\u30B9\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093: "},
-        {"unable.to.access.LoginModule.",
-                "LoginModule\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: "},
         {"Login.Failure.all.modules.ignored",
                 "\u30ED\u30B0\u30A4\u30F3\u5931\u6557: \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u7121\u8996\u3055\u308C\u307E\u3059"},
 
@@ -150,11 +138,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "PKCS11\u30C8\u30FC\u30AF\u30F3[{0}]\u30D1\u30B9\u30EF\u30FC\u30C9: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u30FB\u30D9\u30FC\u30B9\u306E\u30DD\u30EA\u30B7\u30FC\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"}
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
index 35d648bd3a4..5376ff5efd3 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
@@ -66,8 +66,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"Subject.", "\u4E3B\u4F53: \n"},
         {".Principal.", "\t\u4E3B\u7528\u6237: "},
         {".Public.Credential.", "\t\u516C\u5171\u8EAB\u4EFD\u8BC1\u660E: "},
-        {".Private.Credentials.inaccessible.",
-                "\t\u65E0\u6CD5\u8BBF\u95EE\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E\n"},
         {".Private.Credential.", "\t\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E: "},
         {".Private.Credential.inaccessible.",
                 "\t\u65E0\u6CD5\u8BBF\u95EE\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E\n"},
@@ -89,16 +87,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A CallbackHandler"},
         {"null.subject.logout.called.before.login",
                 "\u7A7A\u4E3B\u4F53 - \u5728\u767B\u5F55\u4E4B\u524D\u8C03\u7528\u4E86\u6CE8\u9500"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule, {0}, \u56E0\u4E3A\u5B83\u672A\u63D0\u4F9B\u4E00\u4E2A\u65E0\u53C2\u6570\u6784\u9020\u5668"},
-        {"unable.to.instantiate.LoginModule",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule"},
-        {"unable.to.instantiate.LoginModule.",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule: "},
-        {"unable.to.find.LoginModule.class.",
-                "\u65E0\u6CD5\u627E\u5230 LoginModule \u7C7B: "},
-        {"unable.to.access.LoginModule.",
-                "\u65E0\u6CD5\u8BBF\u95EE LoginModule: "},
         {"Login.Failure.all.modules.ignored",
                 "\u767B\u5F55\u5931\u8D25: \u5FFD\u7565\u6240\u6709\u6A21\u5757"},
 
@@ -150,11 +138,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "PKCS11 \u6807\u8BB0 [{0}] \u53E3\u4EE4: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316\u57FA\u4E8E\u4E3B\u9898\u7684\u7B56\u7565"}
     };
 
 
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
index 83105561c30..f4cb1f4d2b4 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ FileChooser.fileSizeGigaBytes={0} GB
 FileChooser.saveTitle.textAndMnemonic=Speichern
 FileChooser.openTitle.textAndMnemonic=\u00D6ffnen
 FileChooser.newFolderExistsError.textAndMnemonic=Dieser Name ist bereits vergeben
-FileChooser.chooseButton.textAndMnemonic=W\u00E4hlen
+FileChooser.chooseButton.textAndMnemonic=Ausw\u00E4hlen
 
 FileChooser.newFolderButton.textAndMnemonic=Neuer Ordner
 FileChooser.newFolderTitle.textAndMnemonic=Neuer Ordner
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
index 78c95becd1a..a58b033abe3 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
@@ -91,7 +91,7 @@ window=Fenster
 # accessible relations
 #
 labelFor=Label f\u00FCr
-labeledBy=beschriftet von
+labeledBy=gelabelt von
 memberOf=Mitglied von
 controlledBy=controlledBy
 controllerFor=controllerFor
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
index 471c4c2fc8b..80e22e5c8cf 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
@@ -201,8 +201,8 @@ AWT.HostInputMethodDisplayName=Systemeingabemethoden
 AWT.InputMethodLanguage.ja=Japanisch
 AWT.InputMethodLanguage.ko=Koreanisch
 AWT.InputMethodLanguage.zh=Chinesisch
-AWT.InputMethodLanguage.zh_CN=Vereinfachtes Chinesisch
-AWT.InputMethodLanguage.zh_TW=Traditionelles Chinesisch
+AWT.InputMethodLanguage.zh_CN=Chinesisch (vereinfacht)
+AWT.InputMethodLanguage.zh_TW=Chinesisch (traditionell)
 AWT.InputMethodCreationFailed={0} konnte nicht erstellt werden.  Grund: {1}
 
 # Property to select between on-the-spot and below-the-spot
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
index e8f4189062c..ae2c6bf5cd1 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
index ef6246e2e23..46261e666e4 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
index 445d5ba87cd..9a5a2bf4af4 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
index e1e43a16010..84fb41ce788 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,11 @@
 # CacheRowSetImpl exceptions
 cachedrowsetimpl.populate = Ung\u00FCltiges ResultSet-Objekt zum Auff\u00FCllen der Methode angegeben
 cachedrowsetimpl.invalidp = Ung\u00FCltiger Persistence-Provider generiert
-cachedrowsetimpl.nullhash = CachedRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hash-Tabelle f\u00FCr Constructor angegeben
+cachedrowsetimpl.nullhash = CachedRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle f\u00FCr Constructor angegeben
 cachedrowsetimpl.invalidop = Ung\u00FCltiger Vorgang beim Zeileneinf\u00FCgen
 cachedrowsetimpl.accfailed = acceptChanges nicht erfolgreich
 cachedrowsetimpl.invalidcp = Ung\u00FCltige Cursorposition
-cachedrowsetimpl.illegalop = Ung\u00FCltiger Vorgang bei nicht eingef\u00FCgter Zeile
+cachedrowsetimpl.illegalop = Unzul\u00E4ssiger Vorgang bei nicht eingef\u00FCgter Zeile
 cachedrowsetimpl.clonefail = Klonen nicht erfolgreich: {0}
 cachedrowsetimpl.invalidcol = Ung\u00FCltiger Spaltenindex
 cachedrowsetimpl.invalcolnm = Ung\u00FCltiger Spaltenname
@@ -60,6 +60,7 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: keine Metadaten
 cachedrowsetimpl.movetoins2 = moveToInsertRow: ung\u00FCltige Spaltenanzahl
 cachedrowsetimpl.tablename = Tabellenname darf nicht null sein
 cachedrowsetimpl.keycols = Ung\u00FCltige Schl\u00FCsselspalten
+cachedrowsetimpl.invalidcol = Ung\u00FCltiger Spaltenindex
 cachedrowsetimpl.opnotsupp = Vorgang nicht von Datenbank unterst\u00FCtzt
 cachedrowsetimpl.matchcols = \u00DCbereinstimmungsspalten entsprechen nicht den festgelegten Spalten
 cachedrowsetimpl.setmatchcols = \u00DCbereinstimmungsspalten m\u00FCssen vor dem Abrufen festgelegt werden
@@ -79,7 +80,7 @@ cachedrowsetimpl.opnotysupp = Vorgang noch nicht unterst\u00FCtzt
 cachedrowsetimpl.featnotsupp = Feature nicht unterst\u00FCtzt
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = WebRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hash-Tabelle f\u00FCr Constructor angegeben
+webrowsetimpl.nullhash = WebRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle f\u00FCr Constructor angegeben
 webrowsetimpl.invalidwr = Ung\u00FCltiger Writer
 webrowsetimpl.invalidrd = Ung\u00FCltiger Reader
 
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
index cd40ad2ef42..3181e64c1ff 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,7 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: \u30E1\u30BF\u30C7\u30FC\u30BF\u3
 cachedrowsetimpl.movetoins2 = moveToInsertRow: \u7121\u52B9\u306A\u5217\u6570
 cachedrowsetimpl.tablename = \u8868\u540D\u306Bnull\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 cachedrowsetimpl.keycols = \u7121\u52B9\u306A\u30AD\u30FC\u5217
+cachedrowsetimpl.invalidcol = \u7121\u52B9\u306A\u5217\u7D22\u5F15
 cachedrowsetimpl.opnotsupp = \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u3044\u64CD\u4F5C
 cachedrowsetimpl.matchcols = \u4E00\u81F4\u5217\u304C\u5217\u306E\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 cachedrowsetimpl.setmatchcols = \u4E00\u81F4\u5217\u3092\u53D6\u5F97\u3059\u308B\u524D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
index a9f1203518c..29d1823149d 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,7 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: \u65E0\u5143\u6570\u636E
 cachedrowsetimpl.movetoins2 = moveToInsertRow: \u5217\u6570\u65E0\u6548
 cachedrowsetimpl.tablename = \u8868\u540D\u4E0D\u80FD\u4E3A\u7A7A\u503C
 cachedrowsetimpl.keycols = \u5173\u952E\u5B57\u5217\u65E0\u6548
+cachedrowsetimpl.invalidcol = \u5217\u7D22\u5F15\u65E0\u6548
 cachedrowsetimpl.opnotsupp = \u64CD\u4F5C\u4E0D\u53D7\u6570\u636E\u5E93\u652F\u6301
 cachedrowsetimpl.matchcols = \u5339\u914D\u5217\u4E0E\u8BBE\u7F6E\u7684\u90A3\u4E9B\u5339\u914D\u5217\u4E0D\u540C
 cachedrowsetimpl.setmatchcols = \u5728\u83B7\u53D6\u5339\u914D\u5217\u4E4B\u524D\u5148\u8BBE\u7F6E\u5339\u914D\u5217
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
index f71357900f7..07ea3779a20 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
@@ -481,7 +481,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Fehler: \"{\" darf nicht im Ausdruck enthalten sein"},
 
     { ER_ILLEGAL_ATTRIBUTE ,
-     "{0} hat ein ung\u00FCltiges Attribut: {1}"},
+     "{0} hat ein unzul\u00E4ssiges Attribut: {1}"},
 
   {ER_NULL_SOURCENODE_APPLYIMPORTS ,
       "sourceNode ist null in xsl:apply-imports."},
@@ -526,7 +526,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Namespace-Pr\u00E4fix kann nicht aufgel\u00F6st werden: {0}"},
 
     { ER_ILLEGAL_VALUE,
-     "xml:space hat einen ung\u00FCltigen Wert: {0}"},
+     "xml:space hat einen unzul\u00E4ssigen Wert: {0}"},
 
     { ER_NO_OWNERDOC,
       "Der untergeordnete Knoten hat kein Eigent\u00FCmerdokument."},
@@ -646,7 +646,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Element in Ergebnisbaum kann nicht erstellt werden: {0}"},
 
     { ER_XMLSPACE_ILLEGAL_VALUE,
-      "xml:space in Quell-XML hat einen ung\u00FCltigen Wert: {0}"},
+      "xml:space in Quell-XML hat einen unzul\u00E4ssigen Wert: {0}"},
 
     { ER_NO_XSLKEY_DECLARATION,
       "Keine xsl:key-Deklaration f\u00FCr {0} vorhanden."},
@@ -673,7 +673,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "indent-result wird nicht mehr unterst\u00FCtzt. Verwenden Sie stattdessen xsl:output."},
 
     { ER_ILLEGAL_ATTRIB,
-      "(StylesheetHandler) {0} hat ein ung\u00FCltiges Attribut: {1}"},
+      "(StylesheetHandler) {0} hat ein unzul\u00E4ssiges Attribut: {1}"},
 
     { ER_UNKNOWN_XSL_ELEM,
      "Unbekanntes XSL-Element: {0}"},
@@ -706,7 +706,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "(StylesheetHandler) {0} importiert sich direkt oder indirekt selbst."},
 
     { ER_XMLSPACE_ILLEGAL_VAL,
-      "(StylesheetHandler) xml:space hat einen ung\u00FCltigen Wert: {0}"},
+      "(StylesheetHandler) xml:space hat einen unzul\u00E4ssigen Wert: {0}"},
 
     { ER_PROCESSSTYLESHEET_NOT_SUCCESSFUL,
       "processStylesheet nicht erfolgreich."},
@@ -740,7 +740,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Pr\u00E4fix in exclude-result-prefixes ist nicht g\u00FCltig: {0}"},
 
     { ER_MISSING_NS_URI,
-      "Fehlender Namespace-URI f\u00FCr angegebenes Pr\u00E4fix"},
+      "Fehlende Namespace-URI f\u00FCr angegebenes Pr\u00E4fix"},
 
     { ER_MISSING_ARG_FOR_OPTION,
       "Fehlendes Argument f\u00FCr Option: {0}"},
@@ -872,7 +872,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
              "Stylesheet-Root wurde nicht gefunden."},
 
     { ER_ILLEGAL_XMLSPACE_VALUE,
-         "Ung\u00FCltiger Wert f\u00FCr xml:space"},
+         "Unzul\u00E4ssiger Wert f\u00FCr xml:space"},
 
     { ER_PROCESSFROMNODE_FAILED,
          "processFromNode nicht erfolgreich"},
@@ -990,7 +990,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
      "{0}-Attributwert nicht erkannt "},
 
     { ER_NULL_URI_NAMESPACE,
-     "Versuch, ein Namespace-Pr\u00E4fix mit einem Null-URI zu generieren"},
+     "Versuch, ein Namespace-Pr\u00E4fix mit einer Null-URI zu generieren"},
 
     { ER_NUMBER_TOO_BIG,
      "Versuch, eine Zahl zu formatieren, die gr\u00F6\u00DFer als die gr\u00F6\u00DFte Long-Ganzzahl ist"},
@@ -1272,7 +1272,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "xsl:decimal-format-Namen m\u00FCssen eindeutig sein. Name \"{0}\" wurde dupliziert."},
 
     { WG_ILLEGAL_ATTRIBUTE,
-      "{0} hat ein ung\u00FCltiges Attribut: {1}"},
+      "{0} hat ein unzul\u00E4ssiges Attribut: {1}"},
 
     { WG_COULD_NOT_RESOLVE_PREFIX,
       "Namespace-Pr\u00E4fix konnte nicht aufgel\u00F6st werden: {0}. Der Knoten wird ignoriert."},
@@ -1281,10 +1281,10 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "xsl:stylesheet erfordert ein \"version\"-Attribut."},
 
     { WG_ILLEGAL_ATTRIBUTE_NAME,
-      "Ung\u00FCltiger Attributname: {0}"},
+      "Unzul\u00E4ssiger Attributname: {0}"},
 
     { WG_ILLEGAL_ATTRIBUTE_VALUE,
-      "Ung\u00FCltiger Wert f\u00FCr Attribut {0}: {1}"},
+      "Unzul\u00E4ssiger Wert f\u00FCr Attribut {0}: {1}"},
 
     { WG_EMPTY_SECOND_ARG,
       "Resultierendes NodeSet aus zweitem Argument von Dokumentfunktion ist leer. Geben Sie ein leeres NodeSet zur\u00FCck."},
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
index 425707e4792..ea6eecee48d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
@@ -167,7 +167,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * mentioned in the substitution text is not well-formed syntactically.
          */
         {ErrorMsg.INVALID_URI_ERR,
-        "Ung\u00FCltiger URI \"{0}\"."},
+        "Ung\u00FCltige URI \"{0}\"."},
 
         /*
          * Note to translators:  This message is displayed when the URI
@@ -234,7 +234,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text is the offending character.
          */
         {ErrorMsg.ILLEGAL_CHAR_ERR,
-        "Ung\u00FCltiges Zeichen \"{0}\" in XPath-Ausdruck."},
+        "Unzul\u00E4ssiges Zeichen \"{0}\" in XPath-Ausdruck."},
 
         /*
          * Note to translators:  A processing instruction is a mark-up item in
@@ -243,7 +243,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text is the name.
          */
         {ErrorMsg.ILLEGAL_PI_ERR,
-        "Ung\u00FCltiger Name \"{0}\" f\u00FCr Verarbeitungsanweisung."},
+        "Unzul\u00E4ssiger Name \"{0}\" f\u00FCr Verarbeitungsanweisung."},
 
         /*
          * Note to translators:  This message is reported if the stylesheet
@@ -261,7 +261,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text.
          */
         {ErrorMsg.ILLEGAL_ATTRIBUTE_ERR,
-        "Ung\u00FCltiges Attribut \"{0}\"."},
+        "Unzul\u00E4ssiges Attribut \"{0}\"."},
 
         /*
          * Note to translators:  "import" and "include" are keywords that should
@@ -321,7 +321,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * function has too many or too few arguments.
          */
         {ErrorMsg.ILLEGAL_ARG_ERR,
-        "Ung\u00FCltige Argumente f\u00FCr Funktionsaufruf."},
+        "Unzul\u00E4ssige Argumente f\u00FCr Funktionsaufruf."},
 
         /*
          * Note to translators:  "document()" is the name of function and must
@@ -383,7 +383,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * element of a type that it was not permitted to contain.
          */
         {ErrorMsg.ILLEGAL_CHILD_ERR,
-        "Ung\u00FCltiges untergeordnetes Element."},
+        "Unzul\u00E4ssiges untergeordnetes Element."},
 
         /*
          * Note to translators:  The stylesheet tried to create an element with
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
index 6b44ace762d..dadea4ba3b0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
@@ -149,7 +149,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * iterator.  (See definition of iterator above.)
          */
         {BasisLibrary.ITERATOR_CLONE_ERR,
-        "Iterator \"{0}\" kann nicht geclont werden."},
+        "Iterator \"{0}\" kann nicht geklont werden."},
 
         /*
          * Note to translators:  The following represents an internal error
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
index 0b8ee27b51e..5b802e6ea58 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
@@ -39,7 +14,7 @@ HIERARCHY_REQUEST_ERR  = Es wurde versucht, einen Knoten an einer Stelle einzuf\
 INDEX_SIZE_ERR = Index oder Gr\u00F6\u00DFe ist negativ oder gr\u00F6\u00DFer als der zul\u00E4ssige Wert.
 INUSE_ATTRIBUTE_ERR = Es wurde versucht, ein Attribut hinzuzuf\u00FCgen, das bereits an einer anderen Stelle verwendet wird.
 INVALID_ACCESS_ERR  = Ein Parameter oder Vorgang wird nicht vom zugrunde liegenden Objekt unterst\u00FCtzt. 
-INVALID_CHARACTER_ERR = Ung\u00FCltiges XML-Zeichen angegeben. 
+INVALID_CHARACTER_ERR = Ung\u00FCltiges oder unzul\u00E4ssiges XML-Zeichen angegeben. 
 INVALID_MODIFICATION_ERR =  Es wurde versucht, den Typ des zugrunde liegenden Objekts zu \u00E4ndern. 
 INVALID_STATE_ERR = Es wurde versucht, ein Objekt zu \u00E4ndern, das nicht verwendet werden kann. 
 NAMESPACE_ERR = Es wurde versucht, ein Objekt auf eine Weise zu erstellen oder zu \u00E4ndern, die falsch in Bezug auf Namespaces ist.
@@ -47,7 +22,7 @@ NOT_FOUND_ERR = Es wurde versucht, einen Knoten in einem Kontext zu referenziere
 NOT_SUPPORTED_ERR = Der angeforderte Typ des Objekts oder Vorgangs wird nicht von der Implementierung unterst\u00FCtzt. 
 NO_DATA_ALLOWED_ERR = Daten wurden f\u00FCr einen Knoten angegeben, der keine Daten unterst\u00FCtzt.
 NO_MODIFICATION_ALLOWED_ERR = Es wurde versucht, ein Objekt zu \u00E4ndern, bei dem \u00C4nderungen nicht zul\u00E4ssig sind.
-SYNTAX_ERR = Ung\u00FCltige Zeichenfolge angegeben. 
+SYNTAX_ERR = Ung\u00FCltige oder unzul\u00E4ssige Zeichenfolge angegeben. 
 VALIDATION_ERR = Aufruf einer Methode wie insertBefore oder removeChild w\u00FCrde die Dokumentgrammatik des Knotens ung\u00FCltig machen.
 WRONG_DOCUMENT_ERR = Ein Knoten wird in einem anderen Dokument verwendet als dem, von dem er erstellt wurde.
 TYPE_MISMATCH_ERR = Der Werttyp f\u00FCr diesen Parameternamen ist nicht mit dem erwarteten Werttyp kompatibel. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
index e2f923e6181..c6fe53e399b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
index c59decb1b3d..2f74f54fbab 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
index 1d9f1a082fa..4bbbaea3b1f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
index 84d90d0fd41..a8ef5dbddc0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
index 21a3e3c9919..e5b9aca2e70 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
index d9a740adbd8..820fc8fb2e3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
index 86120a72476..267c886ffed 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
index 9cc5ccb25f2..9ffbd1c608e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
index 2b99e3461e1..4f6a8717006 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
index 21978c587cb..0c6c98dc312 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
index cc07506f888..0d6e7a12242 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
index 45c47c62709..412d96f917e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 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.
-#
-
 # Messages for message reporting
 BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n  
@@ -51,7 +26,7 @@ MultipleRootElements = Ein ordnungsgem\u00E4\u00DF formatiertes Dokument darf ni
 ContentIllegalAtTopLevel = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine Zeichen enthalten.
 UnexpandedEntityReferenceIllegal = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine nicht erweiterten Entityreferenzen enthalten.
 HrefFragmentIdentifierIllegal = Fragment-IDs d\u00FCrfen nicht verwendet werden. Der "href"-Attributwert "{0}" ist nicht zul\u00E4ssig.
-HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ung\u00FCltige Syntax. Nach Anwenden der Escape-Regeln ist der Wert kein syntaktisch korrekter URI oder IRI.
+HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ung\u00FCltige Syntax. Nach Anwenden der Escape-Regeln ist der Wert keine syntaktisch korrekte URI oder IRI.
 XPointerStreamability = Es wurde ein xpointer angegeben, der auf eine Stelle im Quell-Infoset verweist. Auf diese Stelle kann aufgrund des Streamingcharakters des Prozessors nicht zugegriffen werden.
 
 XPointerResolutionUnsuccessful = XPointer-Aufl\u00F6sung nicht erfolgreich.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
index 2034e72751e..55abfda9b23 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 # Messages for message reporting
 BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n  
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
index 3231b731892..8e32a7337a1 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 # Messages for message reporting
 BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
 FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n  
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
index e535ffc74b2..3848d68aa2e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
@@ -123,7 +123,7 @@
         InvalidHighSurrogate = High-Surrogate-Bits in UTF-8-Sequenz d\u00FCrfen 0x10 nicht \u00FCberschreiten, gefunden wurde aber 0x{0}.
         OperationNotSupported = Vorgang "{0}" nicht unterst\u00FCtzt von {1}-Reader.
         InvalidASCII = Byte "{0}" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
-        CharConversionFailure = Eine Entity, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung ung\u00FCltig sind.
+        CharConversionFailure = Eine Entity, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung unzul\u00E4ssig sind.
         
 # DTD Messages
 # 2.2 Characters
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = Element oder Attribut stimmt nicht mit QName-Production \u00FCberein: QName::=(NCName':')?NCName. 
+        IllegalQName = Element oder Attribut "{0}" stimmt nicht mit QName-Produktion \u00FCberein: QName::=(NCName'':'')?NCName.
         ElementXMLNSPrefix = Element "{0}" darf nicht "xmlns" als Pr\u00E4fix enthalten.
         ElementPrefixUnbound = Pr\u00E4fix "{0}" f\u00FCr Element "{1}" ist nicht gebunden.
         AttributePrefixUnbound = Pr\u00E4fix "{2}" f\u00FCr Attribut "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, ist nicht gebunden.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
index 859b3530908..7001ef45266 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName':')?NCName\u3002 
+        IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027"{0}"\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName'':'')?NCName\u3002
         ElementXMLNSPrefix = \u8981\u7D20"{0}"\u306E\u63A5\u982D\u8F9E\u3068\u3057\u3066"xmlns"\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
         ElementPrefixUnbound = \u8981\u7D20"{1}"\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
         AttributePrefixUnbound = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u63A5\u982D\u8F9E"{2}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
index 781b2c640c8..ac05ad875c6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027\u4E0D\u5339\u914D QName \u751F\u4EA7: QName::=(NCName':')?NCName\u3002
+        IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027 "{0}" \u4E0D\u5339\u914D QName \u751F\u4EA7\uFF1AQName::=(NCName'':'')?NCName\u3002
         ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u4E3A\u524D\u7F00\u3002
         ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F00 "{0}" \u672A\u7ED1\u5B9A\u3002
         AttributePrefixUnbound = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u7684\u524D\u7F00 "{2}" \u672A\u7ED1\u5B9A\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
index 7c864068a94..9ca2596f92e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
@@ -64,7 +39,6 @@
         cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: Content des Elements ''{0}'' ist nicht vollst\u00E4ndig. ''{1}'' wird erwartet.
         cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: \u00DCbereinstimmungsplatzhalter ist streng, aber es kann keine Deklaration f\u00FCr Element ''{0}'' gefunden werden.
         cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Ung\u00FCltiger Content wurde beginnend mit Element ''{0}'' gefunden. An dieser Stelle wird kein untergeordnetes Element erwartet.
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Ung\u00FCltiger Content wurde beginnend mit Element ''{0}'' gefunden. An dieser Stelle wird kein untergeordnetes Element ''{1}'' erwartet.
         cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: "{0}" darf maximal "{2}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde \u00FCberschritten. An dieser Stelle wird eines von "{1}" erwartet.
         cvc-complex-type.2.4.f = cvc-complex-type.2.4.e: "{0}" darf maximal "{1}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde \u00FCberschritten. An dieser Stelle wird kein untergeordnetes Element erwartet.
         cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Ung\u00FCltigen Inhalt gefunden, der mit Element "{0}" beginnt. "{1}" soll erwartungsgem\u00E4\u00DF mindestens "{2}"-mal in der aktuellen Abfolge auftreten. Eine weitere Instanz ist erforderlich, um diesen Constraint zu erf\u00FCllen.
@@ -259,14 +233,14 @@
         rcase-MapAndSum.2 = rcase-MapAndSum.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
         rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Elemente haben Namen und Ziel-Namespaces, die nicht identisch sind: Element ''{0}'' in Namespace ''{1}'' und Element ''{2}'' in Namespace ''{3}''.
         rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. '{'nillable'}' ist bei der Elementdeklaration ''true'', aber das entsprechende Partikel im Basistyp hat eine Elementdeklaration, bei der '{'nillable'}' ''false'' ist.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
         rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: Element ''{0}'' ist nicht fest, aber das entsprechende Element im Basistyp ist fest mit Wert ''{1}''.
         rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: Element ''{0}'' ist fest mit dem Wert ''{1}'', aber das entsprechende Element im Basistyp ist fest mit Wert ''{2}''.
         rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Identity Constraints f\u00FCr Element ''{0}'' sind keine Teilmenge der Constraints in der Basis.
         rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: Die unzul\u00E4ssigen Substitutionen f\u00FCr Element ''{0}'' sind keine Obermenge der Substitutionen in der Basis.
         rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: Typ des Elements ''{0}'' ''{1}'' wurde nicht vom Typ des Basiselements ''{2}'' abgeleitet.
         rcase-NSCompat.1 = rcase-NSCompat.1: Element ''{0}'' hat den Namespace ''{1}''. Dies wird vom Platzhalter in der Basis nicht zugelassen.
-        rcase-NSCompat.2 = rcase-NSCompat.2: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
+        rcase-NSCompat.2 = rcase-NSCompat.2: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
         rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Es ist keine vollst\u00E4ndige Funktionszuordnung zwischen den Partikeln vorhanden.
         rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs des Basisplatzhalters ({2},{3}).
         rcase-NSSubset.1 = rcase-NSSubset.1: Platzhalter ist keine Teilmenge des entsprechenden Platzhalters in der Basis.
@@ -311,15 +285,15 @@
         EmptyTargetNamespace = EmptyTargetNamespace: In Schemadokument ''{0}'' kann der Wert des ''targetNamespace''-Attributs keine leere Zeichenfolge sein.
         FacetValueFromBase = FacetValueFromBase: In der Deklaration von Typ ''{0}'' muss der Wert ''{1}'' von Facet ''{2}'' aus dem Wertebereich des Basistyps ''{3}'' stammen.
         FixedFacetValue = FixedFacetValue: In der Definition von {3} ist der Wert ''{1}'' f\u00FCr Facet ''{0}'' ung\u00FCltig, da der Wert f\u00FCr ''{0}'' in einem der Vorg\u00E4ngertypen auf ''{2}'' gesetzt wurde und ''{''fixed'}''' = true ist.
-        InvalidRegex = InvalidRegex: Musterwert ''{0}'' ist kein g\u00FCltiger regul\u00E4rer Ausdruck. Der gemeldete Fehler war: ''{1}'' bei Spalte ''{2}''.
-        MaxOccurLimit = Aktuelle Konfiguration des Parsers l\u00E4sst nicht zu, dass ein maxOccurs-Attributwert auf einen h\u00F6heren Wert als {0} gesetzt wird.
+        InvalidRegex = InvalidRegex: Musterwert "{0}" ist kein g\u00FCltiger regul\u00E4rer Ausdruck. Der gemeldete Fehler war: "{1}".
+        MaxOccurLimit = Aktuelle Konfiguration des Parsers l\u00E4sst nicht zu, dass ein Inhaltsmodell so erweitert wird, dass ein komplexer Typ mehr als {0} Knoten enth\u00E4lt.
         PublicSystemOnNotation = PublicSystemOnNotation: Mindestens eines der Elemente 'public' und 'system' muss im Element 'notation' vorkommen.
         SchemaLocation = SchemaLocation: schemaLocation-Wert = ''{0}'' muss eine gerade Anzahl an URIs haben.
         TargetNamespace.1 = TargetNamespace.1: Namespace ''{0}'' wird erwartet, aber der Ziel-Namespace des Schemadokuments ist ''{1}''.
         TargetNamespace.2 = TargetNamespace.2: Kein Namespace wird erwartet, aber das Schemadokument hat den Ziel-Namespace ''{1}''.
         UndeclaredEntity = UndeclaredEntity: Entity ''{0}'' ist nicht deklariert.
         UndeclaredPrefix = UndeclaredPrefix: ''{0}'' kann nicht als QName aufgel\u00F6st werden: Pr\u00E4fix ''{1}'' ist nicht deklariert.
-
+        FacetsContradict = FacetsContradict: F\u00FCr simpleType-Definition "{2}" widerspricht der Enumerationswert "{0}" dem Wert von Facet "{1}".
 
 # JAXP 1.2 schema source property errors
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
index b4d9ffafe78..bcf6b336eb7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 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.
-#
-
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
index 602d1314ac6..4e9a16dcb4f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 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.
-#
-
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
index 3c1d9d8282c..c5b5cdbd949 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
index 341497c9a6f..b61a63b5b74 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
index d8b2eb0bba5..4db14a65c4d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
index dc787a6cd3d..3d33f7b8699 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
index e12a67655f8..a9348831605 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
index cbbaad08e7b..bbf46c70eb7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
index 549f517840c..816e86b09a8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 parser.parse.1=Falsches Zeichen.
 parser.parse.2=Ung\u00FCltige Referenznummer.
 parser.next.1=Nach \\ ist ein Zeichen erforderlich.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
index fcc5ed576fb..09ffd559f50 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 parser.parse.1=\u6587\u5B57\u304C\u9055\u3063\u3066\u3044\u307E\u3059\u3002
 parser.parse.2=\u7121\u52B9\u306A\u53C2\u7167\u756A\u53F7\u3067\u3059\u3002
 parser.next.1=\\\u306E\u5F8C\u306B\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
index ee68bbdbcea..ab2e56846a9 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 parser.parse.1=\u5B57\u7B26\u9519\u8BEF\u3002
 parser.parse.2=\u5F15\u7528\u53F7\u65E0\u6548\u3002
 parser.next.1=\\ \u540E\u9762\u5FC5\u987B\u6709\u5B57\u7B26\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
index 5b859177598..3c53ea08956 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
@@ -286,7 +286,7 @@ public class XMLErrorResources_de extends ListResourceBundle
        "Ung\u00FCltige Portnummer"},
 
     { ER_FRAG_FOR_GENERIC_URI,
-       "Fragment kann nur f\u00FCr einen generischen URI festgelegt werden"},
+       "Fragment kann nur f\u00FCr eine generische URI festgelegt werden"},
 
     { ER_FRAG_WHEN_PATH_NULL,
        "Fragment kann nicht festgelegt werden, wenn der Pfad null ist"},
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
index bc444738f1a..1874693ccfe 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
@@ -162,7 +162,7 @@ public class SerializerMessages_de extends ListResourceBundle {
                 "Fragment kann nicht festgelegt werden, wenn der Pfad null ist" },
 
             {   MsgKey.ER_FRAG_FOR_GENERIC_URI,
-                "Fragment kann nur f\u00FCr einen generischen URI festgelegt werden" },
+                "Fragment kann nur f\u00FCr eine generische URI festgelegt werden" },
 
             {   MsgKey.ER_NO_SCHEME_IN_URI,
                 "Kein Schema gefunden in URI" },
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
index db9a3fdbc2e..7b3c5473e5e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
+ * @LastModified: Nov 2021
  */
 public class XPATHErrorResources_de extends ListResourceBundle
 {
@@ -150,6 +150,10 @@ public class XPATHErrorResources_de extends ListResourceBundle
          "ER_FOUND_COMMA_BUT_NO_FOLLOWING_ARG";
   public static final String ER_PREDICATE_ILLEGAL_SYNTAX =
          "ER_PREDICATE_ILLEGAL_SYNTAX";
+  public static final String ER_PREDICATE_TOO_MANY_OPEN =
+         "ER_PREDICATE_TOO_MANY_OPEN";
+  public static final String ER_COMPILATION_TOO_MANY_OPERATION =
+         "ER_COMPILATION_TOO_MANY_OPERATION";
   public static final String ER_ILLEGAL_AXIS_NAME = "ER_ILLEGAL_AXIS_NAME";
   public static final String ER_UNKNOWN_NODETYPE = "ER_UNKNOWN_NODETYPE";
   public static final String ER_PATTERN_LITERAL_NEEDS_BE_QUOTED =
@@ -318,6 +322,10 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
+  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
+  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
+  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
+  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -435,7 +443,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
      "ERROR. Unbekannter Vorgangscode: {0}"},
 
   { ER_EXTRA_ILLEGAL_TOKENS,
-     "Zus\u00E4tzliche ung\u00FCltige Tokens: {0}"},
+     "Zus\u00E4tzliche unzul\u00E4ssige Tokens: {0}"},
 
   { ER_EXPECTED_DOUBLE_QUOTE,
       "Literal in falschen Anf\u00FChrungszeichen... Doppelte Anf\u00FChrungszeichen erwartet."},
@@ -462,10 +470,16 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
       "\",\" gefunden, aber kein folgendes Argument vorhanden."},
 
   { ER_PREDICATE_ILLEGAL_SYNTAX,
-      "\"..[predicate]\" oder \".[predicate]\" ist ung\u00FCltige Syntax. Verwenden Sie stattdessen \"self::node()[predicate]\"."},
+      "\"..[predicate]\" oder \".[predicate]\" ist unzul\u00E4ssige Syntax. Verwenden Sie stattdessen \"self::node()[predicate]\"."},
+
+  { ER_PREDICATE_TOO_MANY_OPEN,
+      "Stack\u00FCberlauf beim Parsen von {0} bei {1}. Es sind zu viele offene Pr\u00E4dikate vorhanden ({2})."},
+
+  { ER_COMPILATION_TOO_MANY_OPERATION,
+      "Stack\u00FCberlauf beim Kompilieren des Ausdrucks. Es sind zu viele Vorg\u00E4nge vorhanden ({0})."},
 
   { ER_ILLEGAL_AXIS_NAME,
-     "Ung\u00FCltiger Achsenname: {0}"},
+     "Unzul\u00E4ssiger Achsenname: {0}"},
 
   { ER_UNKNOWN_NODETYPE,
      "Unbekannter Knotentyp: {0}"},
@@ -826,6 +840,26 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "Versuch, Null-XPathVariableResolver festzulegen:{0}#setXPathVariableResolver(null)"},
 
+  /** Field ER_PROPERTY_NAME_NULL                       */
+
+  { ER_PROPERTY_NAME_NULL,
+       "Es wird versucht, eine Eigenschaft mit einem Nullnamen festzulegen: {0}#setProperty(null, {1})"},
+
+  /** Field ER_PROPERTY_UNKNOWN                       */
+
+  { ER_PROPERTY_UNKNOWN,
+       "Es wird versucht, die unbekannte Eigenschaft \"{0}\" festzulegen: {1}#setProperty({0},{2})"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_NULL_PROPERTY,
+       "Es wird versucht, eine Eigenschaft mit einem Nullnamen abzurufen: {0}#getProperty(null)"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_UNKNOWN_PROPERTY,
+       "Es wird versucht, die unbekannte Eigenschaft \"{0}\" abzurufen: {1}#getProperty({0})"},
+
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
index a8c681aaa37..bdb2501b69a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
- * @LastModified: May 2019
+ * @LastModified: Nov 2021
  */
 public class XPATHErrorResources_ja extends ListResourceBundle
 {
@@ -322,6 +322,10 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
+  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
+  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
+  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
+  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -836,6 +840,26 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "null\u306EXPathVariableResolver\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#setXPathVariableResolver(null)"},
 
+  /** Field ER_PROPERTY_NAME_NULL                       */
+
+  { ER_PROPERTY_NAME_NULL,
+       "\u30D7\u30ED\u30D1\u30C6\u30A3\u306Bnull\u306E\u540D\u524D\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#setProperty( null, {1})"},
+
+  /** Field ER_PROPERTY_UNKNOWN                       */
+
+  { ER_PROPERTY_UNKNOWN,
+       "\u4E0D\u660E\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\"{0}\"\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F:{1}#setProperty({0},{2})"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_NULL_PROPERTY,
+       "null\u540D\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u53D6\u5F97\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#getProperty(null)"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_UNKNOWN_PROPERTY,
+       "\u4E0D\u660E\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\"{0}\"\u3092\u53D6\u5F97\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F:{1}#getProperty({0})"},
+
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
index d1e370f0d82..5c76b4c9471 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
- * @LastModified: May 2019
+ * @LastModified: Nov 2021
  */
 public class XPATHErrorResources_zh_CN extends ListResourceBundle
 {
@@ -322,6 +322,10 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
+  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
+  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
+  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
+  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -836,6 +840,26 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "\u5C1D\u8BD5\u8BBE\u7F6E\u7A7A XPathVariableResolver:{0}#setXPathVariableResolver(null)"},
 
+  /** Field ER_PROPERTY_NAME_NULL                       */
+
+  { ER_PROPERTY_NAME_NULL,
+       "\u5C1D\u8BD5\u8BBE\u7F6E\u5177\u6709\u7A7A\u540D\u79F0\u7684\u5C5E\u6027\uFF1A{0}#setProperty( null, {1})"},
+
+  /** Field ER_PROPERTY_UNKNOWN                       */
+
+  { ER_PROPERTY_UNKNOWN,
+       "\u5C1D\u8BD5\u8BBE\u7F6E\u672A\u77E5\u5C5E\u6027 \"{0}\":{1}#setProperty({0},{2})"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_NULL_PROPERTY,
+       "\u5C1D\u8BD5\u83B7\u53D6\u5177\u6709\u7A7A\u540D\u79F0\u7684\u5C5E\u6027\uFF1A{0}#getProperty(null)"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_UNKNOWN_PROPERTY,
+       "\u5C1D\u8BD5\u83B7\u53D6\u672A\u77E5\u5C5E\u6027 \"{0}\":{1}#getProperty({0})"},
+
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
new file mode 100644
index 00000000000..023f83aea32
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
@@ -0,0 +1,2785 @@
+#
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
+# are preceded by a stylized comment describing the type of the corresponding
+# values.
+# The simple types currently in use are:
+#
+# annotation        annotation compound
+# boolean           true or false
+# diagnostic        a sub-message; see compiler.misc.*
+# fragment          similar to 'message segment', but with more specific type
+# modifier          a Java modifier; e.g. public, private, protected
+# file              a file URL
+# file object       a file URL - similar to 'file' but typically used for source/class files, hence more specific
+# flag              a Flags.Flag instance
+# name              a name, typically a Java identifier
+# number            an integer
+# option name       the name of a command line option
+# path              a path
+# profile           a profile name
+# source            a source version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.code.Source
+# source version    a source version number, such as 1.5, 1.6, 1.7, taken from a javax.lang.model.SourceVersion
+# string            a general string
+# symbol            the name of a declared type
+# symbol kind       the kind of a symbol (i.e. method, variable)
+# kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
+# target            a target version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.jvm.Target
+# token             the name of a non-terminal in source code; see compiler.misc.token.*
+# tree tag          the name of a non-terminal in source code; see compiler.misc.token.*
+# type              a Java type; e.g. int, X, X<T>
+# url               a URL
+# object            a Java object (unspecified)
+# unused            the value is not used in this message
+#
+# The following compound types are also used:
+#
+# collection of X   a comma-separated collection of items; e.g. collection of type
+# list of X         a comma-separated list of items; e.g. list of type
+# set of X          a comma-separated set of items; e.g. set of modifier
+#
+# These may be composed:
+#
+# list of type or message segment
+#
+# The following type aliases are supported:
+#
+# message segment --> diagnostic or fragment
+# file name --> file, path or file object
+#
+# Custom comments are supported in parenthesis i.e.
+#
+# number (classfile major version)
+#
+# These comments are used internally in order to generate an enum-like class declaration containing
+# a method/field for each of the diagnostic keys listed here. Those methods/fields can then be used
+# by javac code to build diagnostics in a type-safe fashion.
+#
+# In addition, these comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
+# using info derived from the collected set of examples in test/tools/javac/diags/examples.
+# MessageInfo can also be run as a standalone utility providing more facilities
+# for manipulating this file. For more details, see MessageInfo.java.
+
+##
+## errors
+##
+
+# 0: symbol
+compiler.err.abstract.cant.be.instantiated={0} ist abstrakt, kann nicht instanziiert werden
+
+compiler.err.abstract.meth.cant.have.body=Abstrakte Methoden k\u00F6nnen keinen Body enthalten
+
+# 0: kind name, 1: symbol
+compiler.err.already.annotated={0} {1} wurde bereits mit Annotation versehen
+
+# 0: kind name, 1: symbol, 2: kind name, 3: symbol
+compiler.err.already.defined={0} {1} ist bereits in {2} {3} definiert
+
+# 0: kind name, 1: symbol, 2: kind name, 3: kind name, 4: symbol
+compiler.err.already.defined.in.clinit={0} {1} ist bereits in {2} von {3} {4} definiert
+
+# 0: symbol
+compiler.err.already.defined.single.import=Es wurde bereits ein Typ mit demselben einfachen Namen durch den Einzeltypimport von {0} definiert
+
+# 0: symbol
+compiler.err.already.defined.static.single.import=Es wurde bereits ein Typ mit demselben einfachen Namen durch den statischen Einzeltypimport von {0} definiert
+
+# 0: symbol
+compiler.err.already.defined.this.unit={0} ist in dieser Kompilierungseinheit bereits definiert
+
+# 0: type, 1: list of name
+compiler.err.annotation.missing.default.value=In Annotation @{0} fehlt ein Standardwert f\u00FCr das Element "{1}"
+
+# 0: type, 1: list of name
+compiler.err.annotation.missing.default.value.1=In Annotation @{0} fehlen Standardwerte f\u00FCr Elemente {1}
+
+# 0: type
+compiler.err.annotation.not.valid.for.type=Annotation ist f\u00FCr Element des Typs {0} nicht g\u00FCltig
+
+compiler.err.annotation.type.not.applicable=Annotationsschnittstelle ist f\u00FCr diese Art Deklaration nicht anwendbar
+
+# 0: type
+compiler.err.annotation.type.not.applicable.to.type=Annotation @{0} ist in diesem Typkontext nicht anwendbar
+
+compiler.err.annotation.value.must.be.annotation=Annotationswert muss eine Annotation sein
+
+compiler.err.annotation.value.must.be.class.literal=Annotationswert muss ein Klassenliteral sein
+
+compiler.err.annotation.value.must.be.name.value=Annotationswerte m\u00FCssen das Format "Name=Wert" aufweisen
+
+compiler.err.annotation.value.not.allowable.type=Annotationswert hat keinen zul\u00E4ssigen Typ
+
+compiler.err.expression.not.allowable.as.annotation.value=Ausdruck ist als Annotationswert nicht zul\u00E4ssig
+
+compiler.err.anon.class.impl.intf.no.args=Anonyme Klasse implementiert Schnittstelle. Argumente sind nicht m\u00F6glich
+
+compiler.err.anon.class.impl.intf.no.typeargs=Anonyme Klasse implementiert Schnittstelle. Typargumente sind nicht m\u00F6glich
+
+compiler.err.anon.class.impl.intf.no.qual.for.new=Anonyme Klasse implementiert Schnittstelle. Qualifier f\u00FCr "Neu" ist nicht m\u00F6glich
+
+compiler.err.cant.inherit.from.anon=Erben aus anonymer Klasse nicht m\u00F6glich
+
+# 0: symbol, 1: symbol, 2: symbol
+compiler.err.array.and.varargs={0} und {1} k\u00F6nnen nicht beide in {2} deklariert werden
+
+compiler.err.array.dimension.missing=Arraydimension fehlt
+
+compiler.err.illegal.array.creation.both.dimension.and.initialization=Arrayerstellung mit Dimensionsausdruck und Initialisierung ist unzul\u00E4ssig
+
+# 0: type
+compiler.err.array.req.but.found=Array erforderlich, aber {0} gefunden
+
+compiler.err.attribute.value.must.be.constant=Elementwert muss ein Konstantenausdruck sein
+
+# 0: string (statement type)
+compiler.err.bad.initializer=Ung\u00FCltiger Initializer f\u00FCr {0}
+
+compiler.err.break.outside.switch.loop=Unterbrechung au\u00DFerhalb Switch oder Schleife
+
+compiler.err.break.outside.switch.expression=Versuch, Vorgang aus einem Switch-Ausdruck zu unterbrechen
+
+compiler.err.continue.outside.switch.expression=Versuch, Vorgang aus einem Switch-Ausdruck fortzusetzen
+
+compiler.err.return.outside.switch.expression=Versuch, aus einem Switch-Ausdruck zur\u00FCckzukehren
+
+compiler.err.rule.completes.normally=Switch-Regel wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Regeln in Switch-Ausdr\u00FCcken m\u00FCssen einen Wert oder Throw angeben)
+
+compiler.err.switch.expression.completes.normally=Switch-Ausdruck wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Ausdr\u00FCcke m\u00FCssen einen Wert angeben oder einen Throw f\u00FCr alle m\u00F6glichen Eingabewerte ausgeben)
+
+compiler.err.no.switch.expression ="yield" au\u00DFerhalb von Switch-Ausdruck
+
+compiler.err.no.switch.expression.qualify="yield" au\u00DFerhalb von Switch-Ausdruck\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+
+compiler.err.invalid.yield=Ung\u00FCltige Verwendung der eingeschr\u00E4nkten ID "yield"\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+
+compiler.warn.invalid.yield="yield" kann in einem zuk\u00FCnftigen Release zu einer eingeschr\u00E4nkten ID werden\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+
+compiler.err.switch.expression.empty=Switch-Ausdruck enth\u00E4lt keine CASE-Klauseln
+
+compiler.err.switch.expression.no.result.expressions=Switch-Ausdruck enth\u00E4lt keine Ergebnisausdr\u00FCcke
+
+# 0: name
+compiler.err.call.must.be.first.stmt.in.ctor=Aufruf von {0} muss die erste Anweisung im Konstruktor sein
+
+# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
+compiler.err.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebenen Typen angewendet werden.\nErforderlich: {2}\nErmittelt:    {3}\nGrund: {6}
+
+# 0: symbol kind, 1: name, 2: list of type
+compiler.err.cant.apply.symbols={0} f\u00FCr {1}({2}) nicht geeignet
+
+# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
+compiler.misc.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebenen Typen angewendet werden\nErforderlich: {2}\nErmittelt:    {3}\nGrund: {6}
+
+# 0: symbol kind, 1: name, 2: list of type
+compiler.misc.cant.apply.symbols={0} f\u00FCr {1}({2}) nicht geeignet
+
+# 0: kind name, 1: symbol
+compiler.misc.no.abstracts=Keine abstrakte Methode in {0} {1} gefunden
+
+# 0: kind name, 1: symbol
+compiler.misc.incompatible.abstracts=Mehrere nicht \u00FCberschreibende abstrakte Methoden in {0} {1} gefunden
+
+compiler.err.bad.functional.intf.anno=Unerwartete @FunctionalInterface-Annotation
+
+# 0: message segment
+compiler.err.bad.functional.intf.anno.1=Unerwartete @FunctionalInterface-Annotation\n{0}
+
+# 0: message segment
+compiler.err.anonymous.diamond.method.does.not.override.superclass=Methode \u00FCberschreibt oder implementiert keine Methode aus einem Supertyp\n{0}
+
+# 0: symbol
+compiler.misc.not.a.functional.intf={0} ist keine Funktionsschnittstelle
+
+# 0: symbol, 1: message segment
+compiler.misc.not.a.functional.intf.1={0} ist keine Funktionsschnittstelle\n{1}
+
+# 0: type, 1: kind name, 2: symbol
+compiler.misc.invalid.generic.lambda.target=Ung\u00FCltiger Funktionsdeskriptor f\u00FCr Lambda-Ausdruck\nMethode {0} in {1} {2} ist generisch
+
+# 0: kind name, 1: symbol
+compiler.misc.incompatible.descs.in.functional.intf=Inkompatible Funktionsdeskriptoren in {0} {1} gefunden
+
+# 0: name, 1: list of type, 2: type, 3: list of type
+compiler.misc.descriptor=Deskriptor: {2} {0}({1})
+
+# 0: name, 1: list of type, 2: type, 3: list of type
+compiler.misc.descriptor.throws=Deskriptor: {2} {0}({1}) l\u00F6st {3} aus
+
+# 0: type
+compiler.misc.no.suitable.functional.intf.inst=Funktionsschnittstellendeskriptor f\u00FCr {0} kann nicht abgeleitet werden
+
+# 0: message segment
+compiler.misc.bad.intersection.target.for.functional.expr=Ung\u00FCltiges Schnittmengentypziel f\u00FCr Lambda oder Methodenreferenz\n{0}
+
+# 0: symbol or type
+compiler.misc.not.an.intf.component=Komponententyp {0} ist keine Schnittstelle
+
+# 0: kind name, 1: message segment
+compiler.err.invalid.mref=Ung\u00FCltige {0}-Referenz\n{1}
+
+# 0: kind name, 1: message segment
+compiler.misc.invalid.mref=Ung\u00FCltige {0}-Referenz\n{1}
+
+compiler.misc.static.mref.with.targs=Parametrisierter Qualifier f\u00FCr statische Methodenreferenz
+
+# 0: symbol
+compiler.err.cant.assign.val.to.final.var=Der finalen Variable {0} kann kein Wert zugewiesen werden
+
+compiler.err.cant.assign.val.to.this=Zuweisen zu "this" nicht m\u00F6glich
+
+# 0: symbol, 1: message segment
+compiler.err.cant.ref.non.effectively.final.var=Von {1} referenzierte lokale Variablen m\u00FCssen final oder effektiv final sein
+
+compiler.err.try.with.resources.expr.needs.var=Die try-with-resources-Ressource muss eine Variablendeklaration oder ein Ausdruck mit einer Referenz zu einer finalen oder effektiv finalen Variable sein
+
+# 0: symbol
+compiler.err.try.with.resources.expr.effectively.final.var=Variable {0}, die als try-with-resources-Ressource verwendet wurde, ist weder final noch effektiv final
+
+
+compiler.misc.lambda=Lambda-Ausdruck
+
+compiler.misc.inner.cls=Innere Klasse
+
+compiler.misc.guard=Guard
+
+# 0: type
+compiler.err.cant.deref={0} kann nicht dereferenziert werden
+
+compiler.err.cant.extend.intf.annotation="extends" f\u00FCr @interfaces nicht zul\u00E4ssig
+
+compiler.err.annotation.decl.not.allowed.here=Annotationsschnittstellendeklaration hier nicht zul\u00E4ssig
+
+# 0: symbol
+compiler.err.cant.inherit.from.final=Erben aus finalem {0}-Element nicht m\u00F6glich
+
+# 0: symbol or string
+compiler.err.cant.ref.before.ctor.called={0} kann nicht referenziert werden, bevor der Supertypkonstruktor aufgerufen wurde
+
+compiler.err.cant.select.static.class.from.param.type=Statische Klasse kann nicht aus einem parametrisierten Typ ausgew\u00E4hlt werden
+
+# 0: symbol, 1: string, 2: string
+compiler.err.cant.inherit.diff.arg={0} kann nicht mit verschiedenen Argumenten geerbt werden: <{1}> und <{2}>
+
+compiler.err.catch.without.try="catch" ohne "try"
+
+# 0: kind name, 1: symbol
+compiler.err.clash.with.pkg.of.same.name={0} {1} steht in Konflikt mit Package desselben Namens
+
+compiler.err.class.not.allowed=Klassen-, Schnittstellen- oder Enum-Deklaration hier nicht zul\u00E4ssig
+
+compiler.err.const.expr.req=Konstantenausdruck erforderlich
+
+compiler.err.cont.outside.loop=Fortsetzung au\u00DFerhalb Schleife
+
+# 0: symbol or type
+compiler.err.cyclic.inheritance=Zyklische Vererbung mit {0}
+
+# 0: symbol
+compiler.err.cyclic.annotation.element=Typ von Element {0} ist zyklisch
+
+# 0: symbol
+compiler.err.call.to.super.not.allowed.in.enum.ctor=Aufruf von Super in Enum-Konstruktor nicht zul\u00E4ssig
+
+# 0: type
+compiler.err.no.superclass={0} weist keine Superklasse auf.
+
+# 0: symbol, 1: type, 2: symbol, 3: type, 4: type
+compiler.err.concrete.inheritance.conflict=Methoden {0} von {1} und {2} von {3} werden mit derselben Signatur geerbt
+
+compiler.err.default.allowed.in.intf.annotation.member=Standardwert nur in einer Annotationsschnittstellendeklaration zul\u00E4ssig
+
+# 0: symbol
+compiler.err.doesnt.exist=Package {0} ist nicht vorhanden
+
+# 0: type
+compiler.err.duplicate.annotation.invalid.repeated=Annotation {0} ist keine g\u00FCltige wiederholbare Annotation
+
+# 0: name, 1: type
+compiler.err.duplicate.annotation.member.value=Doppeltes Element "{0}" in Annotation @{1}.
+
+# 0: type
+compiler.err.duplicate.annotation.missing.container={0} ist keine wiederholbare Annotationsschnittstelle
+
+# 0: symbol
+compiler.err.invalid.repeatable.annotation=Doppelte Annotation: {0} ist mit einer ung\u00FCltigen @Repeatable-Annotation versehen
+
+# 0: symbol or type
+compiler.err.invalid.repeatable.annotation.no.value={0} ist keine g\u00FCltige @Repeatable-Annotation. Keine Wertelementmethode deklariert
+
+# 0: type, 1: number
+compiler.err.invalid.repeatable.annotation.multiple.values={0} ist keine g\u00FCltige @Repeatable-Annotation. {1} Elementmethoden namens "value" deklariert
+
+# 0: type
+compiler.err.invalid.repeatable.annotation.invalid.value={0} ist keine g\u00FCltige @Repeatable-Annotation. Ung\u00FCltiges Wertelement
+
+# 0: symbol or type, 1: type, 2: type
+compiler.err.invalid.repeatable.annotation.value.return=\u00DCbergeordnete Annotationsschnittstelle ({0}) muss ein Element namens "value" mit dem Typ {2} deklarieren
+
+# 0: symbol or type, 1: symbol
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\u00DCbergeordnete Annotationsschnittstelle ({0}) enth\u00E4lt keinen Standardwert f\u00FCr Element {1}
+
+# 0: symbol, 1: string, 2: symbol, 3: string
+compiler.err.invalid.repeatable.annotation.retention=Aufbewahrung der \u00FCbergeordneten Annotationsschnittstelle ({0}) ist k\u00FCrzer als die Aufbewahrung der wiederholbaren Annotationsschnittstelle ({2})
+
+# 0: symbol, 1: symbol
+compiler.err.invalid.repeatable.annotation.not.documented=Wiederholbare Annotationsschnittstelle ({1}) ist @Documented, die \u00FCbergeordnete Annotationsschnittstelle ({0}) aber nicht
+
+# 0: symbol, 1: symbol
+compiler.err.invalid.repeatable.annotation.not.inherited=Wiederholbare Annotationsschnittstelle ({1}) ist @Inherited, die \u00FCbergeordnete Annotationsschnittstelle ({0}) aber nicht
+
+# 0: symbol, 1: symbol
+compiler.err.invalid.repeatable.annotation.incompatible.target=\u00DCbergeordnete Annotationsschnittstelle ({0}) gilt f\u00FCr mehr Ziele als die wiederholbare Annotationsschnittstelle ({1})
+
+# 0: symbol
+compiler.err.invalid.repeatable.annotation.repeated.and.container.present=Container {0} darf nicht gleichzeitig mit dem darin enthaltenen Element vorhanden sein
+
+# 0: type, 1: symbol
+compiler.err.invalid.repeatable.annotation.not.applicable=Container {0} ist nicht anwendbar f\u00FCr Element {1}
+
+# 0: type
+compiler.err.invalid.repeatable.annotation.not.applicable.in.context=Container {0} ist in diesem Typkontext nicht anwendbar
+
+# 0: name
+compiler.err.duplicate.class=Doppelte Klasse: {0}
+
+# 0: name, 1: name
+compiler.err.same.binary.name=Klassen {0} und {1} haben denselben bin\u00E4ren Namen
+
+compiler.err.duplicate.case.label=Doppeltes CASE-Label
+
+compiler.err.pattern.dominated=Dieses CASE-Label wird von einem vorherigen CASE-Label dominiert
+
+compiler.err.duplicate.default.label=Doppeltes Standardlabel
+
+compiler.err.duplicate.total.pattern=Doppeltes Gesamtmuster
+
+compiler.err.total.pattern.and.default=Switch umfasst sowohl Gesamtmuster als auch Standardlabel
+
+# 0: type, 1: type
+compiler.err.constant.label.not.compatible=Konstantes Label des Typs {0} ist nicht mit Switch-Selektortyp {1} kompatibel
+
+compiler.err.flows.through.to.pattern=Ung\u00FCltiger Fallthrough zu einem Muster
+
+compiler.err.flows.through.from.pattern=Ung\u00FCltiger Fallthrough von einem Muster
+
+compiler.err.else.without.if="else" ohne "if"
+
+compiler.err.empty.char.lit=Leeres Zeichenliteral
+
+# 0: symbol
+compiler.err.encl.class.required=Eine einschlie\u00DFende Instanz mit {0} ist erforderlich
+
+compiler.err.enum.annotation.must.be.enum.constant=Ein Enum-Annotationswert muss eine Enum-Konstante sein
+
+compiler.err.enum.cant.be.instantiated=Enum-Klassen d\u00FCrfen nicht instanziiert werden
+
+compiler.err.enum.label.must.be.unqualified.enum=Das CASE-Label eines Enum-Switches muss der unqualifizierte Name einer Enumerationskonstante sein
+
+compiler.err.enum.no.subclassing=Klassen k\u00F6nnen java.lang.Enum nicht direkt erweitern
+
+compiler.err.enum.types.not.extensible=Enum-Klassen sind nicht erweiterbar
+
+compiler.err.enum.no.finalize=Enums k\u00F6nnen keine Finalisierungsmethoden aufweisen
+
+# 0: file name, 1: string
+compiler.err.error.reading.file=Fehler beim Lesen von {0}. {1}
+
+# 0: type
+compiler.err.except.already.caught=Ausnahme {0} wurde bereits abgefangen
+
+# 0: type
+compiler.err.except.never.thrown.in.try=Ausnahme {0} wird nie im Body der entsprechenden try-Anweisung ausgel\u00F6st
+
+# 0: symbol
+compiler.err.final.parameter.may.not.be.assigned=final-Parameter {0} darf nicht zugewiesen werden
+
+# 0: symbol
+compiler.err.try.resource.may.not.be.assigned=auto-closeable-Ressource {0} darf nicht zugewiesen werden
+
+# 0: symbol
+compiler.err.multicatch.parameter.may.not.be.assigned=multi-catch-Parameter {0} darf nicht zugewiesen werden
+
+# 0: type, 1: type
+compiler.err.multicatch.types.must.be.disjoint=Alternativen in einer multi-catch-Anweisung d\u00FCrfen nicht durch Unterklassen verkn\u00FCpft sein\nAlternative {0} ist eine Unterklasse der Alternative {1}
+
+compiler.err.finally.without.try="finally" ohne "try"
+
+# 0: type, 1: message segment
+compiler.err.foreach.not.applicable.to.type=for-each nicht auf Ausdruckstyp anwendbar\nErforderlich: {1}\nErmittelt:    {0}
+
+compiler.err.fp.number.too.large=Gleitkommazahl zu gro\u00DF
+
+compiler.err.fp.number.too.small=Gleitkommazahl zu klein
+
+compiler.err.generic.array.creation=Erstellung von generischem Array
+
+compiler.err.generic.throwable=Eine generische Klasse darf java.lang.Throwable nicht erweitern
+
+# 0: symbol
+compiler.err.icls.cant.have.static.decl=Unzul\u00E4ssige static-Deklaration in innerer Klasse {0}\nModifikator "static" ist nur in Konstantenvariablendeklarationen zul\u00E4ssig
+
+# 0: string
+compiler.err.illegal.char=Unzul\u00E4ssiges Zeichen: "{0}"
+
+# 0: string, 1: string
+compiler.err.illegal.char.for.encoding=Nicht zuordenbares Zeichen (0x{0}) f\u00FCr Codierung {1}
+
+# 0: set of flag, 1: set of flag
+compiler.err.illegal.combination.of.modifiers=Unzul\u00E4ssige Kombination aus Modifikatoren: {0} und {1}
+
+compiler.err.illegal.enum.static.ref=Unzul\u00E4ssige Referenz zu statischem Feld aus Initializer
+
+compiler.err.illegal.esc.char=Unzul\u00E4ssiges Escapezeichen
+
+compiler.err.illegal.forward.ref=Unzul\u00E4ssige Vorw\u00E4rtsreferenz
+
+# 0: symbol, 1: object
+compiler.err.not.in.profile={0} ist in Profil "{1}" nicht verf\u00FCgbar
+
+# 0: symbol
+compiler.warn.forward.ref=Referenz zu Variable "{0}", bevor sie initialisiert wurde
+
+compiler.err.illegal.self.ref=Selbstreferenz in Initializer
+
+# 0: symbol
+compiler.warn.self.ref=Selbstreferenz in Initializer von Variable "{0}"
+
+# 0: type
+compiler.err.illegal.initializer.for.type=Unzul\u00E4ssiger Initializer f\u00FCr {0}
+
+compiler.err.illegal.line.end.in.char.lit=Unzul\u00E4ssiges Zeilenende in Zeichenliteral
+
+compiler.err.illegal.text.block.open=Unzul\u00E4ssige Sequenz f\u00FCr \u00D6ffnungstrennzeichen von Textblock. Zeilenabschlusszeichen fehlt
+
+compiler.warn.inconsistent.white.space.indentation=Inkonsistenter Leerzeicheneinzug
+
+compiler.warn.trailing.white.space.will.be.removed=Nachgestelltes Leerzeichen wird entfernt
+
+compiler.err.illegal.nonascii.digit=Unzul\u00E4ssige Nicht-ASCII-Ziffer
+
+compiler.err.illegal.underscore=Unzul\u00E4ssiger Unterstrich
+
+compiler.err.illegal.dot="." unzul\u00E4ssig
+
+# 0: symbol
+compiler.err.illegal.qual.not.icls=Unzul\u00E4ssiger Qualifier. {0} ist keine innere Klasse
+
+compiler.err.illegal.start.of.expr=Unzul\u00E4ssiger Ausdrucksbeginn
+
+compiler.err.illegal.start.of.stmt=Unzul\u00E4ssiger Anweisungsbeginn
+
+compiler.err.illegal.start.of.type=Unzul\u00E4ssiger Typbeginn
+
+compiler.err.illegal.parenthesized.expression=Unzul\u00E4ssiger Ausdruck in Klammern
+
+compiler.err.illegal.unicode.esc=Unzul\u00E4ssiges Unicode-Escapezeichen
+
+# 0: symbol
+compiler.err.import.requires.canonical=Import erfordert kanonischen Namen f\u00FCr {0}
+
+compiler.err.improperly.formed.type.param.missing=Falsch formatierter Typ. Einige Parameter fehlen
+
+compiler.err.improperly.formed.type.inner.raw.param=Falsch formatierter Typ. Typargumente f\u00FCr Raw-Typ angegeben
+
+# 0: type, 1: type
+compiler.err.incomparable.types=Nicht vergleichbare Typen: {0} und {1}
+
+# 0: string
+compiler.err.int.number.too.large=Ganzzahl zu gro\u00DF
+
+compiler.err.intf.annotation.members.cant.have.params=Elemente in Annotationsschnittstellendeklarationen k\u00F6nnen keine formalen Parameter deklarieren
+
+# 0: symbol
+compiler.err.intf.annotation.cant.have.type.params=Annotationsschnittstelle {0} darf nicht generisch sein
+
+compiler.err.intf.annotation.members.cant.have.type.params=Elemente in Annotationsschnittstellendeklarationen k\u00F6nnen keine generischen Methoden sein
+
+# 0: symbol, 1: type
+compiler.err.intf.annotation.member.clash=Annotationsschnittstelle {1} deklariert ein Element mit demselben Namen wie Methode {0}
+
+compiler.err.intf.expected.here=Hier wird eine Schnittstelle erwartet
+
+compiler.err.intf.meth.cant.have.body=Abstrakte Schnittstellenmethoden k\u00F6nnen keinen Body enthalten
+
+compiler.err.invalid.annotation.member.type=Ung\u00FCltiger Typ f\u00FCr Annotationsschnittstellenelement
+
+compiler.err.invalid.binary.number=Bin\u00E4rzahlen m\u00FCssen mindestens eine Bin\u00E4rziffer enthalten
+
+compiler.err.invalid.hex.number=Hexadezimalzahlen m\u00FCssen mindestens eine Hexadezimalziffer enthalten
+
+compiler.err.invalid.meth.decl.ret.type.req=Ung\u00FCltige Methodendeklaration. R\u00FCckgabetyp erforderlich
+
+compiler.err.varargs.and.old.array.syntax=Legacy-Arraynotation f\u00FCr Parameter mit variabler Argumentanzahl nicht zul\u00E4ssig
+
+compiler.err.varargs.and.receiver =varargs-Notation f\u00FCr receiver-Parameter nicht zul\u00E4ssig
+
+compiler.err.varargs.must.be.last =varargs-Parameter muss der letzte Parameter sein
+
+compiler.err.array.and.receiver =Legacy-Arraynotation f\u00FCr receiver-Parameter nicht zul\u00E4ssig
+
+compiler.err.wrong.receiver =Falscher receiver-Parametername
+
+compiler.err.variable.not.allowed=Variablendeklaration hier nicht zul\u00E4ssig
+
+# 0: name
+compiler.err.label.already.in.use=Label {0} wird bereits verwendet
+
+# 0: symbol
+compiler.err.local.var.accessed.from.icls.needs.final=Auf lokale Variable {0} wird von innerer Klasse zugegriffen. Sie muss als final deklariert werden
+
+compiler.err.local.enum=Enum-Klassen d\u00FCrfen nicht lokal sein
+
+compiler.err.cannot.create.array.with.type.arguments=Array kann nicht mit Typargumenten erstellt werden
+
+compiler.err.cannot.create.array.with.diamond=Array kann nicht mit "<>" erstellt werden
+
+compiler.err.invalid.module.directive=Moduldirektiven-Schl\u00FCsselwort oder "}" erwartet
+
+#
+# limits.  We don't give the limits in the diagnostic because we expect
+# them to change, yet we want to use the same diagnostic.  These are all
+# detected during code generation.
+#
+compiler.err.limit.code=Code zu gro\u00DF
+
+compiler.err.limit.code.too.large.for.try.stmt=Code f\u00FCr try-Anweisung zu gro\u00DF
+
+compiler.err.limit.dimensions=Arraytyp hat zu viele Dimensionen
+
+compiler.err.limit.locals=Zu viele lokale Variablen
+
+compiler.err.limit.parameters=Zu viele Parameter
+
+compiler.err.limit.pool=Zu viele Konstanten
+
+compiler.err.limit.pool.in.class=Zu viele Konstanten in Klasse {0}
+
+compiler.err.limit.stack=Code erfordert zu viel Stack
+
+compiler.err.limit.string=Konstantenzeichenfolge zu lang
+
+# 0: string
+compiler.err.limit.string.overflow=UTF8-Darstellung f\u00FCr Zeichenfolge "{0}..." ist zu lang f\u00FCr den Konstantenpool
+
+compiler.err.malformed.fp.lit=Nicht wohlgeformtes Gleitkommaliteral
+
+compiler.err.method.does.not.override.superclass=Methode \u00FCberschreibt oder implementiert keine Methode aus einem Supertyp
+
+compiler.err.static.methods.cannot.be.annotated.with.override=Statische Methoden k\u00F6nnen nicht mit @Override-Annotation versehen werden
+
+compiler.err.missing.meth.body.or.decl.abstract=Methodenbody fehlt oder als abstrakt deklarieren
+
+compiler.err.missing.ret.stmt=R\u00FCckgabeanweisung fehlt
+
+# 0: type
+compiler.misc.missing.ret.val=R\u00FCckgabewert fehlt
+
+compiler.misc.unexpected.ret.val=Unerwarteter R\u00FCckgabewert
+
+# 0: set of flag
+compiler.err.mod.not.allowed.here=Modifikator {0} hier nicht zul\u00E4ssig
+
+# 0: name
+compiler.err.modifier.not.allowed.here=Modifikator {0} hier nicht zul\u00E4ssig
+
+compiler.err.intf.not.allowed.here=Schnittstelle hier nicht zul\u00E4ssig
+
+# 0: symbol, 1: symbol
+compiler.err.name.clash.same.erasure=Namenskonflikt: {0} und {1} haben dieselbe Erasure
+
+# 0: name, 1: list of type, 2: symbol, 3: name, 4: list of type, 5: symbol
+compiler.err.name.clash.same.erasure.no.override=Namenskonflikt: {0}({1}) in {2} und {3}({4}) in {5} haben dieselbe Erasure, aber keine setzt die andere au\u00DFer Kraft
+
+# 0: string, 1: name, 2: name, 3: list of type, 4: symbol, 5: name, 6: list of type, 7: symbol
+compiler.err.name.clash.same.erasure.no.override.1=Namenskonflikt: {0} {1} hat zwei Methoden mit derselben Erasure, aber keine setzt die andere au\u00DFer Kraft\nErste Methode: {2}({3}) in {4}\nZweite Methode: {5}({6}) in {7}
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.err.name.clash.same.erasure.no.hide=Namenskonflikt: {0} in {1} und {2} in {3} haben dieselbe Erasure, aber keine blendet die andere aus
+
+compiler.err.name.reserved.for.internal.use={0} ist f\u00FCr den internen Gebrauch reserviert
+
+compiler.err.native.meth.cant.have.body=Native Methoden k\u00F6nnen keinen Body enthalten
+
+
+# 0: message segment
+compiler.misc.incompatible.type.in.conditional=Ung\u00FCltiger Typ in Bedingungsausdruck\n{0}
+
+compiler.misc.conditional.target.cant.be.void=target-type f\u00FCr Bedingungsausdruck darf nicht "void" sein
+
+compiler.misc.switch.expression.target.cant.be.void=target-type f\u00FCr Switch-Ausdruck darf nicht "void" sein
+
+# 0: message segment
+compiler.misc.incompatible.type.in.switch.expression=Ung\u00FCltiger Typ in Switch-Ausdruck\n{0}
+
+# 0: message segment
+compiler.misc.incompatible.ret.type.in.lambda=Ung\u00FCltiger R\u00FCckgabetyp in Lambda-Ausdruck\n{0}
+
+compiler.misc.stat.expr.expected=Lambda-Body ist nicht mit einer void-Funktionsschnittstelle kompatibel\n(verwenden Sie stattdessen einen Block-Lambda-Body oder einen Anweisungsausdruck)
+
+# 0: message segment
+compiler.misc.incompatible.ret.type.in.mref=Ung\u00FCltiger R\u00FCckgabetyp in Methodenreferenz\n{0}
+
+compiler.err.lambda.body.neither.value.nor.void.compatible=Lambda-Body ist weder mit Wert noch mit "void "kompatibel
+
+# 0: list of type
+compiler.err.incompatible.thrown.types.in.mref=Inkompatible ausgel\u00F6ste Typen {0} in Funktionsausdruck
+
+compiler.misc.incompatible.arg.types.in.lambda=Inkompatible Parametertypen in Lambda-Ausdruck
+
+compiler.misc.incompatible.arg.types.in.mref=Inkompatible Parametertypen in Methodenreferenz
+
+compiler.err.new.not.allowed.in.annotation="new" in einer Annotation nicht zul\u00E4ssig
+
+# 0: name, 1: type
+compiler.err.no.annotation.member=Kein Annotationsmitglied {0} in {1}
+
+# 0: symbol
+compiler.err.no.encl.instance.of.type.in.scope=Keine einschlie\u00DFende Instanz vom Typ {0} im Geltungsbereich
+
+compiler.err.no.intf.expected.here=Hier wird keine Schnittstelle erwartet
+
+compiler.err.no.match.entry={0} hat keine \u00DCbereinstimmung im Eintrag in {1}. {2} erforderlich
+
+# 0: type
+compiler.err.not.annotation.type={0} ist keine Annotationsschnittstelle
+
+# 0: symbol, 1: symbol, 2: message segment
+compiler.err.not.def.access.package.cant.access={0} ist nicht sichtbar\n({2})
+
+# 0: symbol, 1: symbol, 2: message segment
+compiler.misc.not.def.access.package.cant.access={0} ist nicht sichtbar\n({2})
+
+# 0: symbol, 1: message segment
+compiler.err.package.not.visible=Package {0} ist nicht sichtbar\n({1})
+
+# 0: symbol, 1: message segment
+compiler.misc.package.not.visible=Package {0} ist nicht sichtbar\n({1})
+
+# {0} - current module
+# {1} - package in which the invisible class is declared
+# {2} - module in which {1} is declared
+# 0: symbol, 1: symbol, 2: symbol
+compiler.misc.not.def.access.does.not.read=Package {1} wird in Modul {2} deklariert, aber nicht von Modul {0} gelesen
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.does.not.read.from.unnamed=Package {0} wird in Modul {1} deklariert, das nicht im Moduldiagramm enthalten ist
+
+# {0} - package in which the invisible class is declared
+# {1} - current module
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.does.not.read.unnamed=Package {0} wird im unbenannten Modul deklariert, aber nicht von Modul {1} gelesen
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.not.exported=Package {0} wird in Modul {1} deklariert, aber nicht exportiert
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.not.exported.from.unnamed=Package {0} wird in Modul {1} deklariert, aber nicht exportiert
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# {2} - current module
+# 0: symbol, 1: symbol, 2: symbol
+compiler.misc.not.def.access.not.exported.to.module=Package {0} wird in Modul {1} deklariert, aber nicht in Modul {2} exportiert
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.not.exported.to.module.from.unnamed=Package {0} wird in Modul {1} deklariert, aber nicht in das unbenannte Modul exportiert
+
+# 0: symbol, 1: symbol
+compiler.err.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zug\u00E4nglichen Klasse oder Schnittstelle definiert
+
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zug\u00E4nglichen Klasse oder Schnittstelle definiert
+
+# 0: symbol, 1: symbol, 2: symbol, 3: message segment
+compiler.err.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zug\u00E4nglich\n({3})
+
+# 0: symbol, 1: symbol, 2: symbol, 3: message segment
+compiler.misc.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zug\u00E4nglich\n({3})
+
+# 0: symbol, 1: list of type, 2: type
+compiler.misc.cant.access.inner.cls.constr=Zugriff auf Konstruktor {0}({1}) nicht m\u00F6glich\nEinschlie\u00DFende Instanz vom Typ {2} ist nicht im Geltungsbereich
+
+# 0: symbol, 1: symbol
+compiler.err.not.def.public.cant.access={0} ist nicht \u00F6ffentlich in {1}. Zugriff von externem Package nicht m\u00F6glich
+
+# 0: symbol, 1: symbol
+compiler.err.not.def.public={0} ist nicht \u00F6ffentlich in {1}
+
+# 0: symbol, 1: symbol
+compiler.misc.not.def.public.cant.access={0} ist nicht \u00F6ffentlich in {1}. Zugriff von externem Package nicht m\u00F6glich
+
+# 0: name
+compiler.err.not.loop.label=Kein Schleifenlabel: {0}
+
+compiler.err.not.stmt=Keine Anweisung
+
+# 0: symbol
+compiler.err.not.encl.class=Keine einschlie\u00DFende Klasse: {0}
+
+# 0: name, 1: type
+compiler.err.operator.cant.be.applied=Ung\u00FCltiger Operandentyp {1} f\u00FCr un\u00E4ren Operator "{0}"
+
+# 0: name, 1: type, 2: type
+compiler.err.operator.cant.be.applied.1=Ung\u00FCltige Operandentypen f\u00FCr un\u00E4ren Operator "{0}"\nErster Typ: {1}\nZweiter Typ: {2}
+
+compiler.err.pkg.annotations.sb.in.package-info.java=Packageannotationen m\u00FCssen in der Datei package-info.java vorhanden sein
+
+compiler.err.no.pkg.in.module-info.java=Packagedeklarationen in Datei module-info.java nicht zul\u00E4ssig
+
+# 0: symbol
+compiler.err.pkg.clashes.with.class.of.same.name=Es besteht ein Konflikt zwischen dem Package {0} und einer gleichnamigen Klasse
+
+compiler.err.warnings.and.werror=Warnungen gefunden und -Werror angegeben
+
+# Errors related to annotation processing
+
+# 0: symbol, 1: message segment, 2: string (stack-trace)
+compiler.err.proc.cant.access=Kein Zugriff auf {0}\n{1}\nDetails finden Sie im folgenden Stacktrace.\n{2}
+
+# 0: symbol, 1: message segment
+compiler.err.proc.cant.access.1=Kein Zugriff auf {0}\n{1}
+
+# 0: string
+compiler.err.proc.cant.find.class=Klassendatei f\u00FCr "{0}" konnte nicht gefunden werden.
+
+# 0: string
+compiler.err.proc.cant.load.class=Prozessorklassendatei konnte nicht geladen werden. Grund: "{0}".
+
+# Print a client-generated error message; assumed to be localized, no translation required
+# 0: string
+compiler.err.proc.messager={0}
+
+# 0: string
+compiler.misc.exception.message={0}
+
+compiler.misc.user.selected.completion.failure=Von Benutzer ausgew\u00E4hlter Abschlussfehler nach Klassenname
+
+# 0: collection of string
+compiler.err.proc.no.explicit.annotation.processing.requested=Klassennamen "{0}" werden nur akzeptiert, wenn die Annotationsverarbeitung explizit angefordert wird
+
+compiler.err.proc.no.service=ServiceLoader konnte nicht verwendet werden und ist f\u00FCr Annotationsverarbeitung erforderlich.
+
+# 0: string, 1: string
+compiler.err.proc.processor.bad.option.name=Ung\u00FCltiger Optionsname "{0}" von Prozessor "{1}" angegeben
+
+# 0: string
+compiler.err.proc.processor.cant.instantiate=Instanz von Prozessor "{0}" konnte nicht instanziiert werden
+
+# 0: string
+compiler.err.proc.processor.not.found=Annotationsprozessor "{0}" nicht gefunden
+
+# 0: string
+compiler.err.proc.processor.wrong.type=Annotationsprozessor "{0}" implementiert nicht javax.annotation.processing.Processor
+
+compiler.err.proc.service.problem=Fehler beim Erstellen eines Service-Loaders zum Laden von Prozessoren.
+
+# 0: string
+compiler.err.proc.bad.config.file=Ung\u00FCltige Servicekonfigurationsdatei, oder Ausnahme beim Erstellen des Prozessorobjekts ausgel\u00F6st: {0}
+
+compiler.err.proc.cant.create.loader=Class Loader konnte nicht f\u00FCr Annotationsprozessoren erstellt werden: {0}
+
+# 0: symbol
+compiler.err.qualified.new.of.static.class="new" von statischer Klasse qualifiziert
+
+compiler.err.recursive.ctor.invocation=Rekursiver Konstruktoraufruf
+
+# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
+compiler.err.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen \u00FCberein
+
+# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
+compiler.misc.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen \u00FCberein
+
+compiler.err.repeated.annotation.target=Wiederholtes Annotationsziel
+
+compiler.err.repeated.interface=Wiederholte Schnittstelle
+
+compiler.err.repeated.modifier=Wiederholter Modifikator
+
+# 0: symbol, 1: set of modifier, 2: symbol
+compiler.err.report.access={0} hat {1}-Zugriff in {2}
+
+# 0: symbol, 1: set of modifier, 2: symbol
+compiler.misc.report.access={0} hat {1}-Zugriff in {2}
+
+compiler.err.ret.outside.meth=R\u00FCckgabe au\u00DFerhalb von Methode
+
+compiler.err.signature.doesnt.match.supertype=Signatur stimmt nicht mit {0} \u00FCberein. Inkompatibler Supertyp
+
+compiler.err.signature.doesnt.match.intf=Signatur stimmt nicht mit {0} \u00FCberein. Inkompatible Schnittstellen
+
+# 0: symbol, 1: symbol, 2: symbol
+compiler.err.does.not.override.abstract={0} ist nicht abstrakt und setzt die abstrakte Methode {1} in {2} nicht au\u00DFer Kraft
+
+# 0: file object
+compiler.err.source.cant.overwrite.input.file=Fehler beim Schreiben von Quelle. Eingabedatei {0} kann nicht \u00FCberschrieben werden
+
+# 0: symbol
+compiler.err.stack.sim.error=Interner Fehler: Stacksimulationsfehler in {0}
+
+compiler.err.static.imp.only.classes.and.interfaces=Statischer Import nur aus Klassen und Schnittstellen
+
+compiler.err.string.const.req=Konstanten-Zeichenfolgenausdruck erforderlich
+
+compiler.err.pattern.expected=Typmuster erwartet
+
+# 0: symbol, 1: fragment
+compiler.err.cannot.generate.class=Fehler beim Generieren der Klasse {0}\n({1})
+
+# 0: symbol, 1: symbol
+compiler.misc.synthetic.name.conflict=Das Symbol {0} steht mit einem vom Compiler synthetisierten Symbol in {1} in Konflikt
+
+# 0: symbol, 1: type
+compiler.misc.illegal.signature=Unzul\u00E4ssiges Signaturattribut f\u00FCr Typ {1}
+
+compiler.err.throws.not.allowed.in.intf.annotation=Throws-Klausel in @interface-Mitgliedern nicht zul\u00E4ssig
+
+compiler.err.try.without.catch.finally.or.resource.decls="try" ohne "catch", "finally" oder Ressourcendeklarationen
+
+# 0: symbol
+compiler.err.type.doesnt.take.params=Typ {0} akzeptiert keine Parameter
+
+compiler.err.type.var.cant.be.deref=Auswahl aus Typvariable nicht m\u00F6glich
+
+compiler.err.type.var.may.not.be.followed.by.other.bounds=Auf eine Typvariable d\u00FCrfen keine anderen Begrenzungen folgen
+
+compiler.err.type.var.more.than.once=Typvariable {0} tritt mehrmals im Ergebnistyp von {1} auf. Sie muss instanziiert werden
+
+compiler.err.type.var.more.than.once.in.result=Typvariable {0} tritt mehrmals im Typ von {1} auf. Sie muss instanziiert werden
+
+# 0: type, 1: type, 2: fragment
+compiler.err.types.incompatible=Die Typen {0} und {1} sind inkompatibel.\n{2}
+
+# 0: name, 1: list of type
+compiler.misc.incompatible.diff.ret=Beide definieren {0}({1}), aber mit nicht verwandten R\u00FCckgabetypen
+
+# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
+compiler.misc.incompatible.unrelated.defaults={0} {1} erbt nicht verwandte Standardwerte f\u00FCr {2}({3}) von Typen {4} und {5}
+
+# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
+compiler.misc.incompatible.abstract.default={0} {1} erbt abstrakte und Standardmethode f\u00FCr {2}({3}) von Typen {4} und {5}
+
+# 0: name, 1: kind name, 2: symbol
+compiler.err.default.overrides.object.member=Standardmethode {0} in {1} {2} setzt ein Mitglied von java.lang.Object au\u00DFer Kraft
+
+# 0: type
+compiler.err.illegal.static.intf.meth.call=Unzul\u00E4ssiger statischer Schnittstellenmethodenaufruf\nDer Empf\u00E4ngerausdruck muss durch den Typ-Qualifier "{0}" ersetzt werden
+
+# 0: symbol or type, 1: message segment
+compiler.err.illegal.default.super.call=Ung\u00FCltiger Typ-Qualifier {0} in Standardsuperaufruf\n{1}
+
+# 0: symbol, 1: type
+compiler.misc.overridden.default=Methode {0} wird in {1} au\u00DFer Kraft gesetzt
+
+# 0: symbol, 1: type or symbol
+compiler.misc.redundant.supertype=Redundante Schnittstelle {0} wird durch {1} erweitert
+
+compiler.err.unclosed.char.lit=Nicht geschlossenes Zeichenliteral
+
+compiler.err.unclosed.comment=Nicht geschlossener Kommentar
+
+compiler.err.unclosed.str.lit=Nicht geschlossenes Zeichenfolgenliteral
+
+compiler.err.unclosed.text.block=Nicht geschlossener Textblock
+
+# 0: string
+compiler.err.unsupported.encoding=Nicht unterst\u00FCtzte Codierung: {0}
+
+compiler.err.io.exception=Fehler beim Lesen der Quelldatei: {0}
+
+# 0: name
+compiler.err.undef.label=Nicht definiertes Label: {0}
+
+# 0: name
+compiler.err.illegal.ref.to.restricted.type=Unzul\u00E4ssige Referenz zu eingeschr\u00E4nktem Typ "{0}"
+
+# 0: name
+compiler.warn.illegal.ref.to.restricted.type=Unzul\u00E4ssige Referenz zu eingeschr\u00E4nktem Typ "{0}"
+
+# 0: name, 1: source
+compiler.err.restricted.type.not.allowed="{0}" ist hier nicht zul\u00E4ssig\nAb Release {1} ist "{0}" ein eingeschr\u00E4nkter Typname, der nicht f\u00FCr Typdeklarationen verwendet werden kann
+
+# 0: name, 1: source
+compiler.warn.restricted.type.not.allowed=Ab Release {1} ist "{0}" ein eingeschr\u00E4nkter Typname, der nicht f\u00FCr Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
+
+# 0: name, 1: source
+compiler.warn.restricted.type.not.allowed.preview="{0}" kann in einem zuk\u00FCnftigen Release ein eingeschr\u00E4nkter Typname werden, der nicht f\u00FCr Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
+
+# 0: name (variable), 1: message segment
+compiler.err.cant.infer.local.var.type=Typ f\u00FCr lokale Variable {0} kann nicht abgeleitet werden\n({1})
+
+# 0: name
+compiler.err.restricted.type.not.allowed.here="{0}" ist hier nicht zul\u00E4ssig
+
+# 0: name
+compiler.err.restricted.type.not.allowed.array="{0}" ist nicht als Elementtyp eines Arrays zul\u00E4ssig
+
+# 0: name
+compiler.err.restricted.type.not.allowed.compound="{0}" ist nicht in einer zusammengesetzten Deklaration zul\u00E4ssig
+
+# 0: fragment
+compiler.err.invalid.lambda.parameter.declaration=Ung\u00FCltige Lambda-Parameterdeklaration\n({0})
+
+compiler.misc.implicit.and.explicit.not.allowed=Implizit typisierte Parameter k\u00F6nnen nicht mit explizit typisierten Parametern gemischt werden
+
+compiler.misc.var.and.explicit.not.allowed="var" kann nicht mit explizit typisierten Parametern gemischt werden
+
+compiler.misc.var.and.implicit.not.allowed="var" kann nicht mit implizit typisierten Parametern gemischt werden
+
+compiler.misc.local.cant.infer.null=Variablen-Initializer ist "null"
+
+compiler.misc.local.cant.infer.void=Variablen-Initializer ist "void"
+
+compiler.misc.local.missing.init="var" kann nicht f\u00FCr Variable ohne Initializer verwendet werden
+
+compiler.misc.local.lambda.missing.target=Lambda-Ausdruck erfordert einen expliziten Zieltyp
+
+compiler.misc.local.mref.missing.target=Methodenreferenz erfordert einen expliziten Zieltyp
+
+compiler.misc.local.array.missing.target=Array-Initializer erfordert einen expliziten Zieltyp
+
+compiler.misc.local.self.ref="var" kann nicht f\u00FCr selbstreferenzierende Variable verwendet werden
+
+# 0: message segment, 1: unused
+compiler.err.cant.apply.diamond=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden
+
+# 0: message segment or type, 1: message segment
+compiler.err.cant.apply.diamond.1=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden\nGrund: {1}
+
+# 0: message segment or type, 1: message segment
+compiler.misc.cant.apply.diamond.1=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden\nGrund: {1}
+
+compiler.err.unreachable.stmt=Nicht erreichbare Anweisung
+
+compiler.err.not.exhaustive=Der Switch-Ausdruck deckt nicht alle m\u00F6glichen Eingabewerte ab
+
+compiler.err.not.exhaustive.statement=Die Switch-Anweisung deckt nicht alle m\u00F6glichen Eingabewerte ab
+
+compiler.err.initializer.must.be.able.to.complete.normally=Initializer muss normal abgeschlossen werden k\u00F6nnen
+
+compiler.err.initializer.not.allowed=Initializer in Schnittstellen nicht zul\u00E4ssig
+
+# 0: type
+compiler.err.unreported.exception.need.to.catch.or.throw=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgel\u00F6st zu werden
+
+# 0: type
+compiler.err.unreported.exception.default.constructor=Nicht gemeldete Ausnahme {0} in Standardkonstruktor
+
+# 0: type, 1: name
+compiler.err.unreported.exception.implicit.close=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgel\u00F6st zu werden\nAusnahme bei implizitem Aufruf von close() f\u00FCr Ressourcenvariable "{1}" ausgel\u00F6st
+
+compiler.err.void.not.allowed.here="void"-Typ hier nicht zul\u00E4ssig
+
+# 0: string
+compiler.err.wrong.number.type.args=Falsche Anzahl Typargumente. {0} erforderlich
+
+# 0: symbol
+compiler.err.var.might.already.be.assigned=Variable {0} wurde m\u00F6glicherweise bereits zugewiesen
+
+# 0: symbol
+compiler.err.var.might.not.have.been.initialized=Variable {0} wurde m\u00F6glicherweise nicht initialisiert
+
+# 0: symbol
+compiler.err.var.not.initialized.in.default.constructor=Variable {0} nicht im Standardkonstruktor initialisiert
+
+# 0: symbol
+compiler.err.var.might.be.assigned.in.loop=Variable {0} wurde m\u00F6glicherweise in Schleife zugewiesen
+
+# 0: symbol, 1: message segment
+compiler.err.varargs.invalid.trustme.anno=Ung\u00FCltige {0}-Annotation. {1}
+
+# 0: type
+compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs-Elementtyp {0} ist reifizierbar.
+
+# 0: type, 1: type
+compiler.err.instanceof.reifiable.not.safe={0} kann nicht sicher in {1} konvertiert werden
+
+# 0: type, 1: type
+compiler.err.instanceof.pattern.no.subtype=Ausdruckstyp {0} ist ein Subtyp des Mustertyps {1}
+
+# 0: symbol
+compiler.misc.varargs.trustme.on.non.varargs.meth=Methode {0} ist keine varargs-Methode.
+
+# 0: symbol
+compiler.misc.varargs.trustme.on.non.varargs.accessor=Accessor {0} ist keine varargs-Methode.
+
+# 0: symbol
+compiler.misc.varargs.trustme.on.virtual.varargs=Instanzmethode {0} ist weder final noch privat.
+
+# 0: symbol
+compiler.misc.varargs.trustme.on.virtual.varargs.final.only=Instanzmethode {0} ist nicht final.
+
+# 0: type, 1: symbol kind, 2: symbol
+compiler.misc.inaccessible.varargs.type=Auf den formalen varargs-Elementtyp {0} kann nicht von {1} {2} zugegriffen werden
+
+# In the following string, {1} will always be the detail message from
+# java.io.IOException.
+# 0: symbol, 1: string
+compiler.err.class.cant.write=Fehler beim Schreiben von {0}: {1}
+
+# In the following string, {0} is the name of the class in the Java source.
+# It really should be used two times..
+# 0: kind name, 1: name
+compiler.err.class.public.should.be.in.file={0} {1} ist \u00F6ffentlich und muss in einer Datei namens {1}.java deklariert werden
+
+## All errors which do not refer to a particular line in the source code are
+## preceded by this string.
+compiler.err.error=Fehler: 
+
+# The following error messages do not refer to a line in the source code.
+compiler.err.cant.read.file=Lesen nicht m\u00F6glich: {0}
+
+# 0: string
+compiler.err.plugin.not.found=Plug-in nicht gefunden: {0}
+
+# 0: path
+compiler.warn.locn.unknown.file.on.module.path=Unbekannte Datei in Modulpfad: {0}
+
+
+# 0: path
+compiler.err.locn.bad.module-info=Problem beim Lesen von module-info.class in {0}
+
+# 0: path
+compiler.err.locn.cant.read.directory=Verzeichnis {0} kann nicht gelesen werden
+
+# 0: path
+compiler.err.locn.cant.read.file=Datei {0} kann nicht gelesen werden
+
+# 0: path
+compiler.err.locn.cant.get.module.name.for.jar=Modulname f\u00FCr {0} kann nicht bestimmt werden
+
+# 0: path
+compiler.err.multi-module.outdir.cannot.be.exploded.module=Im Modus f\u00FCr mehrere Module kann das Ausgabeverzeichnis kein entpacktes Modul sein: {0}
+
+# 0: path
+compiler.warn.outdir.is.in.exploded.module=Das Ausgabeverzeichnis befindet sich in einem entpackten Modul: {0}
+
+# 0: file object
+compiler.err.locn.module-info.not.allowed.on.patch.path=module-info.class nicht in Patchpfad zul\u00E4ssig: {0}
+
+# 0: string
+compiler.err.locn.invalid.arg.for.xpatch=Ung\u00FCltiges Argument f\u00FCr --patch-module-Option: {0}
+
+compiler.err.file.sb.on.source.or.patch.path.for.module=Datei muss sich im Quellpfad oder im Patchpfad f\u00FCr das Modul befinden
+
+compiler.err.no.java.lang=Package java.lang kann in Plattformklassen nicht gefunden werden
+
+#####
+
+# Fatal Errors
+
+# 0: name
+compiler.misc.fatal.err.cant.locate.meth=Schwerwiegender Fehler: Methode {0} kann nicht gefunden werden
+
+# 0: name
+compiler.misc.fatal.err.cant.locate.field=Schwerwiegender Fehler: Feld {0} kann nicht gefunden werden
+
+# 0: type
+compiler.misc.fatal.err.cant.locate.ctor=Schwerwiegender Fehler: Konstruktor f\u00FCr {0} kann nicht gefunden werden
+
+compiler.misc.fatal.err.cant.close=Schwerwiegender Fehler: Compiler-Ressourcen k\u00F6nnen nicht geschlossen werden
+
+#####
+
+##
+## miscellaneous strings
+##
+
+compiler.misc.diamond.anonymous.methods.implicitly.override=(aufgrund von <> muss jede nicht private Methode, die in dieser anonymen Klasse deklariert ist, eine Methode aus einem Supertyp au\u00DFer Kraft setzen oder implementieren)
+
+compiler.misc.source.unavailable=(Quelle nicht verf\u00FCgbar)
+
+compiler.misc.base.membership=Alle Basisklassen geh\u00F6ren zu dieser Gruppe
+
+# 0: string, 1: string, 2: boolean
+compiler.misc.x.print.processor.info=Prozessor {0} entspricht {1} und gibt {2} zur\u00FCck.
+
+# 0: number, 1: string, 2: set of symbol, 3: boolean
+compiler.misc.x.print.rounds=Runde {0}:\n\tEingabedateien: {1}\n\tAnnotationen: {2}\n\tLetzte Runde: {3}
+
+# 0: file name
+compiler.warn.file.from.future=\u00C4nderungsdatum liegt in der Zukunft f\u00FCr Datei {0}
+
+#####
+
+## The following string will appear before all messages keyed as:
+## "compiler.note".
+
+compiler.note.compressed.diags=Einige Meldungen wurden vereinfacht. Wiederholen Sie die Kompilierung mit -Xdiags:verbose, um die vollst\u00E4ndige Ausgabe abzurufen
+
+# 0: boolean, 1: symbol
+compiler.note.lambda.stat=Lambda-Ausdruck wird \u00FCbersetzt\nAlternative Metafactory = {0}\nSynthetische Methode = {1}
+
+# 0: boolean, 1: unused
+compiler.note.mref.stat=Methodenreferenz wird \u00FCbersetzt\nAlternative Metafactory = {0}\n
+# 0: boolean, 1: symbol
+compiler.note.mref.stat.1=Methodenreferenz wird \u00FCbersetzt\nAlternative Metafactory = {0}\nBridgemethode = {1}
+
+compiler.note.note=Hinweis: 
+
+# 0: file name
+compiler.note.deprecated.filename={0} verwendet oder \u00FCberschreibt eine veraltete API.
+
+compiler.note.deprecated.plural=Einige Eingabedateien verwenden oder \u00FCberschreiben eine veraltete API.
+
+# The following string may appear after one of the above deprecation
+# messages.
+compiler.note.deprecated.recompile=Wiederholen Sie die Kompilierung mit -Xlint:deprecation, um Details zu erhalten.
+
+# 0: file name
+compiler.note.deprecated.filename.additional={0} hat weitere Verwendungen oder Overrides einer veralteten API.
+
+compiler.note.deprecated.plural.additional=Einige Eingabedateien verwenden oder \u00FCberschreiben zus\u00E4tzlich eine veraltete API.
+
+# 0: file name
+compiler.note.removal.filename={0} verwendet oder \u00FCberschreibt eine veraltete API, die zum Entfernen markiert ist.
+
+compiler.note.removal.plural=Einige Eingabedateien verwenden oder \u00FCberschreiben eine veraltete API, die zum Entfernen markiert ist.
+
+# The following string may appear after one of the above removal messages.
+compiler.note.removal.recompile=Wiederholen Sie die Kompilierung mit -Xlint:removal, um Details zu erhalten.
+
+# 0: file name
+compiler.note.removal.filename.additional={0} hat weitere Verwendungen oder Overrides einer veralteten API, die zum Entfernen markiert ist.
+
+compiler.note.removal.plural.additional=Einige Eingabedateien verwenden oder \u00FCberschreiben zus\u00E4tzlich eine veraltete API, die zum Entfernen markiert ist.
+
+# 0: file name
+compiler.note.unchecked.filename={0} verwendet nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+
+compiler.note.unchecked.plural=Einige Eingabedateien verwenden nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+
+# The following string may appear after one of the above unchecked messages.
+compiler.note.unchecked.recompile=Wiederholen Sie die Kompilierung mit -Xlint:unchecked, um Details zu erhalten.
+
+# 0: file name
+compiler.note.unchecked.filename.additional={0} weist weitere nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge auf.
+
+compiler.note.unchecked.plural.additional=Einige Eingabedateien verwenden zus\u00E4tzlich nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+
+# 0: file name, 1: source
+compiler.note.preview.filename={0} verwendet Vorschaufeatures von Java SE {1}.
+
+# 0: source
+compiler.note.preview.plural=Einige Eingabedateien verwenden Vorschaufeatures von Java SE {0}.
+
+# The following string may appear after one of the above deprecation
+# messages.
+compiler.note.preview.recompile=Wiederholen Sie die Kompilierung mit -Xlint:preview, um Details zu erhalten.
+
+# 0: file name, 1: source
+compiler.note.preview.filename.additional={0} hat weitere Verwendungen von Vorschaufeatures von Java SE {1}.
+
+# 0: source
+compiler.note.preview.plural.additional=Einige Eingabedateien verwenden zus\u00E4tzlich Vorschaufeatures von Java SE {0}.
+
+# Notes related to annotation processing
+
+# Print a client-generated note; assumed to be localized, no translation required
+# 0: string
+compiler.note.proc.messager={0}
+
+# 0: string, 1: string, 2: string
+compiler.note.multiple.elements=Mehrere Elemente namens "{1}" in Modulen "{2}" wurden von javax.lang.model.util.Elements.{0} gefunden.
+
+#####
+
+# 0: number
+compiler.misc.count.error={0} Fehler
+
+# 0: number
+compiler.misc.count.error.plural={0} Fehler
+
+# 0: number, 1: number
+compiler.misc.count.error.recompile=Nur die ersten {0} Fehler von insgesamt {1} werden angezeigt. Mit -Xmaxerrs k\u00F6nnen Sie mehr Fehler anzeigen
+
+# 0: number, 1: number
+compiler.misc.count.warn.recompile=Nur die ersten {0} Warnungen von insgesamt {1} werden angezeigt. Mit -Xmaxwarns k\u00F6nnen Sie mehr Warnungen anzeigen
+
+# 0: number
+compiler.misc.count.warn={0} Warnung
+
+# 0: number
+compiler.misc.count.warn.plural={0} Warnungen
+
+compiler.misc.version.not.available=(Versionsinformationen nicht verf\u00FCgbar)
+
+## extra output when using -verbose (JavaCompiler)
+
+# 0: symbol
+compiler.misc.verbose.checking.attribution=[{0} wird gepr\u00FCft]
+
+# 0: string
+compiler.misc.verbose.parsing.done=[Parsen abgeschlossen: {0} ms]
+
+# 0: file name
+compiler.misc.verbose.parsing.started=[Parsen gestartet: {0}]
+
+# 0: string
+compiler.misc.verbose.total=[{0} ms gesamt]
+
+# 0: file name
+compiler.misc.verbose.wrote.file=[{0} geschrieben]
+
+## extra output when using -verbose (code/ClassReader)
+# 0: string
+compiler.misc.verbose.loading=[{0} wird geladen]
+
+# 0: string
+compiler.misc.verbose.sourcepath=[Suchpfad f\u00FCr Quelldateien: {0}]
+
+# 0: string
+compiler.misc.verbose.classpath=[Suchpfad f\u00FCr Klassendateien: {0}]
+
+## extra output when using -prompt (util/Log)
+compiler.misc.resume.abort=F)ortsetzen, A)bbruch>
+
+#####
+
+##
+## warnings
+##
+
+## All warning messages are preceded by the following string.
+compiler.warn.warning=Warnung: 
+
+## Warning messages may also include the following prefix to identify a
+## lint option
+# 0: option name
+compiler.warn.lintOption=[{0}] 
+
+# 0: symbol
+compiler.warn.constant.SVUID=serialVersionUID muss Konstante in Klasse {0} sein
+
+# 0: path
+compiler.warn.dir.path.element.not.found=Ung\u00FCltiges Pfadelement "{0}": Verzeichnis nicht vorhanden
+
+# 0: file name
+compiler.warn.dir.path.element.not.directory=Ung\u00FCltiges Pfadelement "{0}": kein Verzeichnis
+
+# 0: symbol, 1: symbol, 2: symbol
+compiler.warn.missing-explicit-ctor=Klasse {0} in exportiertem Package {1} deklariert keine expliziten Konstruktoren und stellt daher einen Standardkonstruktor f\u00FCr Clients des Moduls {2} bereit
+
+compiler.warn.strictfp=Ab Release 17 werden alle Gleitkommaausdr\u00FCcke streng ausgewertet. Daher ist "strictfp" nicht erforderlich
+
+compiler.warn.finally.cannot.complete=Finally-Klausel kann nicht normal abgeschlossen werden
+
+# 0: name
+compiler.warn.poor.choice.for.module.name=Modulnamenskomponente {0} darf keine Ziffern am Ende enthalten
+
+# 0: string
+compiler.warn.incubating.modules=Inkubatormodul(e) verwendet: {0}
+
+# 0: symbol, 1: symbol
+compiler.warn.has.been.deprecated={0} in {1} ist veraltet
+
+# 0: symbol, 1: symbol
+compiler.warn.has.been.deprecated.for.removal={0} in {1} ist veraltet und wurde zum Entfernen markiert
+
+# 0: symbol
+compiler.warn.is.preview={0} ist eine Vorschau-API, die in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+# 0: symbol
+compiler.err.is.preview={0} ist eine Vorschau-API, die standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um Vorschau-APIs zu aktivieren)
+
+# 0: symbol
+compiler.warn.is.preview.reflective={0} ist eine reflektive Vorschau-API, die in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+# 0: symbol
+compiler.warn.has.been.deprecated.module=Modul {0} ist veraltet
+
+# 0: symbol
+compiler.warn.has.been.deprecated.for.removal.module=Modul {0} ist veraltet und wurde zum Entfernen markiert
+
+# 0: symbol
+compiler.warn.sun.proprietary={0} ist eine interne propriet\u00E4re API, die in einem zuk\u00FCnftigen Release entfernt werden kann
+
+compiler.warn.illegal.char.for.encoding=Nicht zuordenbares Zeichen f\u00FCr Codierung {0}
+
+# 0: symbol
+compiler.warn.improper.SVUID=serialVersionUID muss als "static final" in Klasse {0} deklariert sein
+
+compiler.warn.improper.SPF=serialPersistentFields muss als "private static final" deklariert sein, um in Kraft zu treten
+
+compiler.warn.SPF.null.init=serialPersistentFields tritt bei Initialisierung als Null nicht in Kraft.\nF\u00FChren Sie die Initialisierung zu einem leeren Array aus, um keine Felder anzugeben
+
+
+# 0: type, 1: type
+compiler.warn.inexact.non-varargs.call=Nicht-varargs-Aufruf von varargs-Methode mit ungenauem Argumenttyp f\u00FCr den letzten Parameter.\nF\u00FChren Sie f\u00FCr einen varargs-Aufruf eine Umwandlung mit Cast in {0} aus\nF\u00FChren Sie f\u00FCr einen Nicht-varargs-Aufruf eine Umwandlung mit Cast in {1} aus, um diese Warnung zu unterdr\u00FCcken
+
+# 0: list of type
+compiler.warn.unreachable.catch=Nicht erreichbare Catch-Klausel\nAusgel\u00F6ster Typ {0} wurde bereits abgefangen
+
+# 0: list of type
+compiler.warn.unreachable.catch.1=Nicht erreichbare Catch-Klausel\nAusgel\u00F6ste Typen {0} wurden bereits abgefangen
+
+# 0: symbol
+compiler.warn.long.SVUID=serialVersionUID muss den Typ "long" in Klasse {0} aufweisen
+
+compiler.warn.OSF.array.SPF=serialPersistentFields muss den Typ "java.io.ObjectStreamField[]" aufweisen, um in Kraft zu treten
+
+# 0: symbol
+compiler.warn.missing.SVUID=Serialisierbare Klasse {0} enth\u00E4lt keine Definition von serialVersionUID
+
+# 0: name
+compiler.warn.serializable.missing.access.no.arg.ctor=Zugriff auf einen no-arg-Konstruktor in der ersten nicht serialisierbaren Superklasse {0} nicht m\u00F6glich
+
+# 0: name
+compiler.warn.serial.method.not.private=Serialisierungsbezogene Methode {0} nicht als privat deklariert
+
+# 0: name
+compiler.warn.serial.concrete.instance.method=Serialisierungsbezogene Methode {0} muss eine konkrete Instanzmethode sein, um in Kraft zu treten. Sie darf nicht abstrakt oder statisch sein
+
+# 0: name
+compiler.warn.serial.method.static=Serialisierungsbezogene Methode {0} ist als statisch deklariert. Sie muss stattdessen eine Instanzmethode sein, um in Kraft zu treten.
+
+# 0: name
+compiler.warn.serial.method.no.args=Serialisierungsbezogene Methode {0} darf keine Parameter aufweisen, um in Kraft zu treten
+
+# 0: name, 1: number
+compiler.warn.serial.method.one.arg=Serialisierungsbezogene Methode {0} muss genau einen Parameter aufweisen, um in Kraft zu treten. Sie darf nicht {1} Parameter enthalten
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.parameter.type=Der einzige Parameter der serialisierungsbezogenen Methode {0} muss den Typ {1} haben, um in Kraft zu treten. Er darf nicht den Typ {2} aufweisen
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.unexpected.return.type=Serialisierungsbezogene Methode {0} wurde mit dem R\u00FCckgabetyp {1} und nicht dem erwarteten Typ {2} deklariert.\nMit dieser Deklaration ist die Methode ung\u00FCltig f\u00FCr die Serialisierung
+
+# 0: name, 1: type
+compiler.warn.serial.method.unexpected.exception=Serialisierungsbezogene Methode {0} wurde zum Ausl\u00F6sen eines unerwarteten Typs {1} deklariert
+
+compiler.warn.ineffectual.serial.field.interface=serialPersistentFields ist in einer Schnittstelle nicht effektiv
+
+# 0: string
+compiler.warn.ineffectual.serial.field.enum=Serialisierungsbezogenes Feld {0} ist in einer Enum-Klasse nicht effektiv
+
+# 0: string
+compiler.warn.ineffectual.serial.method.enum=Serialisierungsbezogene Methode {0} ist in einer Enum-Klasse nicht effektiv
+
+compiler.warn.ineffectual.serial.field.record=serialPersistentFields ist in einer Datensatzklasse nicht effektiv
+
+# 0: string
+compiler.warn.ineffectual.serial.method.record=Serialisierungsbezogene Methode {0} ist in einer Datensatzklasse nicht effektiv
+
+# 0: name
+compiler.warn.ineffectual.serial.method.externalizable=Serialisierungsbezogene Methode {0} ist in einer externalisierbaren Klasse nicht effektiv
+
+compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields ist in einer externalisierbaren Klasse nicht effektiv
+
+compiler.warn.externalizable.missing.public.no.arg.ctor=Eine externalisierbare Klasse erfordert einen \u00F6ffentlichen no-arg-Konstruktor
+
+compiler.warn.non.serializable.instance.field=Nicht transientes Instanzfeld einer serialisierbaren Klasse mit einem nicht serialisierbaren Typ deklariert
+
+# 0: type
+compiler.warn.non.serializable.instance.field.array=Nicht transientes Instanzfeld einer serialisierbaren Klasse wurde mit einem Array mit einem nicht serialisierbaren Basiskomponententyp {0} deklariert
+
+compiler.warn.non.private.method.weaker.access=Serialisierungsbezogene Methode, die in einer Schnittstelle als nicht privat deklariert ist, verhindert,\ndass Klassen, die die Schnittstelle implementieren, die Methode als privat deklarieren
+
+compiler.warn.default.ineffective=Serialisierungsbezogene Standardmethode aus einer Schnittstelle wird nicht von der Serialisierung f\u00FCr eine implementierende Klasse ausgef\u00FChrt
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.warn.potentially.ambiguous.overload={0} in {1} ist m\u00F6glicherweise mehrdeutig mit {2} in {3}
+
+# 0: message segment
+compiler.warn.override.varargs.missing={0}. Au\u00DFer Kraft gesetzte Methode umfasst kein "..."
+
+# 0: message segment
+compiler.warn.override.varargs.extra={0}. In au\u00DFer Kraft setzender Methode fehlt "..."
+
+# 0: message segment
+compiler.warn.override.bridge={0}. Au\u00DFer Kraft setzende Methode ist eine Bridgemethode
+
+# 0: symbol
+compiler.warn.pkg-info.already.seen=Die Datei package-info.java wurde bereits f\u00FCr Package {0} gefunden
+
+# 0: path
+compiler.warn.path.element.not.found=Ung\u00FCltiges Pfadelement "{0}": Datei oder Verzeichnis nicht vorhanden
+
+compiler.warn.possible.fall-through.into.case=M\u00F6glicher Fallthrough in Case
+
+# 0: type
+compiler.warn.redundant.cast=Redundantes Casting in {0}
+
+# 0: number
+compiler.warn.position.overflow=Positionscodierungs\u00FCberlauf bei Zeile {0}
+
+# 0: file name, 1: number, 2: number
+compiler.warn.big.major.version={0}: Hauptversion {1} ist neuer als {2}, die h\u00F6chste Hauptversion, die von diesem Compiler unterst\u00FCtzt wird.\nEs wird empfohlen, dass Sie den Compiler upgraden.
+
+# 0: kind name, 1: symbol
+compiler.warn.static.not.qualified.by.type=Statische {0} muss mit Typname {1} anstelle eines Ausdrucks qualifiziert werden
+
+# 0: string
+compiler.warn.source.no.bootclasspath=Bootstrap Classpath nicht zusammen mit -source {0} festgelegt
+
+# 0: string
+compiler.warn.source.no.system.modules.path=Systemmodulpfad nicht zusammen mit -source {0} festgelegt
+
+# 0: string
+compiler.warn.option.obsolete.source=Quellwert {0} ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt
+
+# 0: target
+compiler.warn.option.obsolete.target=Zielwert {0} ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt
+
+# 0: string, 1: string
+compiler.err.option.removed.source=Quelloption {0} wird nicht mehr unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
+
+# 0: target, 1: target
+compiler.err.option.removed.target=Zieloption {0} wird nicht mehr unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
+
+
+# 0: target, 1: target
+compiler.warn.option.parameters.unsupported=-parameters wird f\u00FCr Zielwert {0} nicht unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
+
+compiler.warn.option.obsolete.suppression=Verwenden Sie -Xlint:-options, um Warnungen zu veralteten Optionen zu unterdr\u00FCcken.
+
+# 0: name, 1: number, 2: number, 3: number, 4: number
+compiler.warn.future.attr={0}-Attribut, das in Klassendateien der Version {1}.{2} eingef\u00FChrt wurde, wird in Klassendateien der Version {3}.{4} ignoriert
+
+compiler.warn.requires.automatic=Erfordert Direktive f\u00FCr ein automatisches Modul
+
+compiler.warn.requires.transitive.automatic=Erfordert transitive-Direktive f\u00FCr ein automatisches Modul
+
+# Warnings related to annotation processing
+# 0: string
+compiler.warn.proc.package.does.not.exist=Package {0} ist nicht vorhanden
+
+# 0: string
+compiler.warn.proc.file.reopening=Versuch, mehrmals eine Datei f\u00FCr "{0}" zu erstellen
+
+# 0: string
+compiler.warn.proc.type.already.exists=Es ist bereits eine Datei f\u00FCr Typ "{0}" im Quellpfad oder Classpath vorhanden
+
+# 0: string
+compiler.warn.proc.type.recreate=Versuch, mehrmals eine Datei f\u00FCr Typ "{0}" zu erstellen
+
+# 0: string
+compiler.warn.proc.illegal.file.name=Datei kann nicht f\u00FCr unzul\u00E4ssigen Namen "{0}" erstellt werden.
+
+# 0: string, 1: string
+compiler.warn.proc.suspicious.class.name=Datei f\u00FCr einen Typ, dessen Name mit {1} endet, wird erstellt: "{0}"
+
+# 0: string
+compiler.warn.proc.file.create.last.round=Datei f\u00FCr Typ "{0}", die in der letzten Runde erstellt wurde, wird keiner Annotationsverarbeitung unterzogen.
+
+# 0: string, 1: string
+compiler.warn.proc.malformed.supported.string=Nicht wohlgeformte Zeichenfolge "{0}" f\u00FCr eine unterst\u00FCtzte Annotationsschnittstelle von Prozessor "{1}" zur\u00FCckgegeben
+
+# 0: set of string
+compiler.warn.proc.annotations.without.processors=Diese Annotationen wurden von keinem Prozessor beansprucht: {0}
+
+# 0: source version, 1: string, 2: string
+compiler.warn.proc.processor.incompatible.source.version=Unterst\u00FCtzte Quellversion "{0}" von Annotationsprozessor "{1}" kleiner als -source "{2}"
+
+# 0: string, 1: string
+compiler.warn.proc.duplicate.option.name=Doppelte unterst\u00FCtzte Option "{0}" von Annotationsprozessor "{1}" zur\u00FCckgegeben
+
+# 0: string, 1: string
+compiler.warn.proc.duplicate.supported.annotation=Doppelte unterst\u00FCtzte Annotationsschnittstelle "{0}" von Annotationsprozessor "{1}" zur\u00FCckgegeben
+
+# 0: string
+compiler.warn.proc.redundant.types.with.wildcard=Annotationsprozessor "{0}" unterst\u00FCtzt redundant sowohl "*" als auch andere Annotationsschnittstellen
+
+compiler.warn.proc.proc-only.requested.no.procs=Annotationsverarbeitung ohne Kompilierung angefordert, aber keine Prozessoren gefunden.
+
+compiler.warn.proc.use.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -implicit, um eine Policy f\u00FCr die implizite Kompilierung anzugeben.
+
+compiler.warn.proc.use.proc.or.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -proc:none, um die Annotationsverarbeitung zu deaktivieren, oder -implicit, um eine Policy f\u00FCr die implizite Kompilierung anzugeben.
+
+# Print a client-generated warning; assumed to be localized, no translation required
+# 0: string
+compiler.warn.proc.messager={0}
+
+# 0: set of string
+compiler.warn.proc.unclosed.type.files=Nicht geschlossene Dateien f\u00FCr die Typen "{0}". Diese Typen werden keiner Annotationsverarbeitung unterzogen
+
+# 0: string
+compiler.warn.proc.unmatched.processor.options=Die folgenden Optionen wurden von keinem Prozessor erkannt: "{0}"
+
+compiler.warn.try.explicit.close.call=Expliziter Aufruf von close() f\u00FCr eine automatisch schlie\u00DFbare Ressource
+
+# 0: symbol
+compiler.warn.try.resource.not.referenced=Automatisch schlie\u00DFbare Ressource {0} wird nie im Body der entsprechenden try-Anweisung referenziert
+
+# 0: type
+compiler.warn.try.resource.throws.interrupted.exc=Automatisch schlie\u00DFbare Ressource {0} umfasst die Mitgliedsmethode close(), die InterruptedException ausl\u00F6sen k\u00F6nnte
+
+compiler.warn.unchecked.assign=Nicht gepr\u00FCfte Zuweisung: {0} zu {1}
+
+# 0: symbol, 1: type
+compiler.warn.unchecked.assign.to.var=Nicht gepr\u00FCfte Zuweisung zu Variable {0} als Mitglied des Raw-Typs {1}
+
+# 0: symbol, 1: type
+compiler.warn.unchecked.call.mbr.of.raw.type=Nicht gepr\u00FCfter Aufruf von {0} als Mitglied des Raw-Typs {1}
+
+compiler.warn.unchecked.cast.to.type=Nicht gepr\u00FCftes Casting zu Typ {0}
+
+# 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
+compiler.warn.unchecked.meth.invocation.applied=Nicht gepr\u00FCfter Methodenaufruf: {0} {1} in {4} {5} wird auf die angegebenen Typen angewendet\nErforderlich: {2}\nErmittelt:    {3}
+
+# 0: type
+compiler.warn.unchecked.generic.array.creation=Nicht gepr\u00FCfte Erstellung eines generischen Arrays f\u00FCr varargs-Parameter des Typs {0}
+
+# 0: type
+compiler.warn.unchecked.varargs.non.reifiable.type=M\u00F6glich Heap-Besch\u00E4digung aus parametrisiertem vararg-Typ {0}
+
+# 0: symbol
+compiler.warn.varargs.unsafe.use.varargs.param=Varargs-Methode k\u00F6nnte Heap-Besch\u00E4digung aus nicht reifizierbarem varargs-Parameter {0} verursachen
+
+compiler.warn.missing.deprecated.annotation=Veraltetes Element ist nicht mit @Deprecated-Annotation versehen
+
+# 0: kind name
+compiler.warn.deprecated.annotation.has.no.effect=@Deprecated-Annotation hat keine Auswirkung auf diese {0}-Deklaration
+
+# 0: string
+compiler.warn.invalid.path=Ung\u00FCltiger Dateiname: {0}
+
+compiler.warn.doclint.not.available=Kein Serviceprovider f\u00FCr doclint verf\u00FCgbar
+
+# 0: string
+compiler.err.invalid.path=Ung\u00FCltiger Dateiname: {0}
+
+
+# 0: path
+compiler.warn.invalid.archive.file=Unerwartete Datei in Pfad: {0}
+
+# 0: path
+compiler.warn.unexpected.archive.file=Unerwartete Erweiterung f\u00FCr Archivdatei: {0}
+
+# 0: path
+compiler.err.no.zipfs.for.archive=Kein Dateisystemprovider zur Verarbeitung dieser Datei verf\u00FCgbar: {0}
+
+compiler.warn.div.zero=Division durch Null
+
+compiler.warn.empty.if=Leere Anweisung nach "if"
+
+# 0: type, 1: name
+compiler.warn.annotation.method.not.found=Annotationsmethode "{1}()" kann nicht in Typ "{0}" gefunden werden
+
+# 0: type, 1: name, 2: message segment
+compiler.warn.annotation.method.not.found.reason=Annotationsmethode "{1}()" kann nicht in Typ "{0}" gefunden werden: {2}
+
+# 0: file object, 1: symbol, 2: name
+compiler.warn.unknown.enum.constant=Unbekannte Enum-Konstante {1}.{2}
+
+# 0: file object, 1: symbol, 2: name, 3: message segment
+compiler.warn.unknown.enum.constant.reason=Unbekannte Enum-Konstante {1}.{2}\nGrund: {3}
+
+# 0: type, 1: type
+compiler.warn.raw.class.use=Raw-Typ gefunden: {0}\nTypargumente f\u00FCr generische Klasse {1} fehlen
+
+compiler.warn.diamond.redundant.args=Redundante Typargumente in neuem Ausdruck (verwenden Sie stattdessen den Rautenoperator).
+
+compiler.warn.local.redundant.type=Redundanter Typ f\u00FCr lokale Variable (ersetzen Sie den expliziten Typ durch "var").
+
+compiler.warn.potential.lambda.found=Die Erstellung dieser anonymen inneren Klasse kann in einen Lambda-Ausdruck umgewandelt werden.
+
+compiler.warn.method.redundant.typeargs=Redundante Typargumente in Methodenaufruf.
+
+# 0: symbol, 1: message segment
+compiler.warn.varargs.redundant.trustme.anno=Redundante {0}-Annotation. {1}
+
+# 0: symbol
+compiler.warn.access.to.member.from.serializable.element=Zugriff auf Mitglied {0} aus serialisierbarem Element kann \u00F6ffentlich f\u00FCr nicht vertrauensw\u00FCrdigen Code zug\u00E4nglich sein
+
+# 0: symbol
+compiler.warn.access.to.member.from.serializable.lambda=Zugriff auf Mitglied {0} aus serialisierbarem Lambda kann \u00F6ffentlich f\u00FCr nicht vertrauensw\u00FCrdigen Code zug\u00E4nglich sein
+
+#####
+
+## The following are tokens which are non-terminals in the language. They should
+## be named as JLS3 calls them when translated to the appropriate language.
+compiler.misc.token.identifier=<ID>
+
+compiler.misc.token.character=<Zeichen>
+
+compiler.misc.token.string=<Zeichenfolge>
+
+compiler.misc.token.integer=<Ganzzahl>
+
+compiler.misc.token.long-integer=<Ganzzahl vom Typ "long">
+
+compiler.misc.token.float=<Float>
+
+compiler.misc.token.double=<Double>
+
+compiler.misc.token.bad-symbol=<ung\u00FCltiges Symbol>
+
+compiler.misc.token.end-of-input=<Ende der Eingabe>
+
+## The argument to the following string will always be one of the following:
+## 1. one of the above non-terminals
+## 2. a keyword (JLS1.8)
+## 3. a boolean literal (JLS3.10.3)
+## 4. the null literal (JLS3.10.7)
+## 5. a Java separator (JLS3.11)
+## 6. an operator (JLS3.12)
+##
+## This is the only place these tokens will be used.
+# 0: token
+compiler.err.expected={0} erwartet
+
+# 0: string
+compiler.err.expected.str={0} erwartet
+
+# 0: token, 1: token
+compiler.err.expected2={0} oder {1} erwartet
+
+# 0: token, 1: token, 2: token
+compiler.err.expected3={0}, {1} oder {2} erwartet
+
+# 0: token, 1: token, 2: token, 3: string
+compiler.err.expected4={0}, {1}, {2} oder {3} erwartet
+
+compiler.err.premature.eof=Dateiende beim Parsen erreicht
+
+compiler.err.enum.constant.expected=Hier wird eine Enum-Konstante erwartet
+
+compiler.err.enum.constant.not.expected=Hier wird keine Enum-Konstante erwartet
+
+## The following are related in form, but do not easily fit the above paradigm.
+compiler.err.expected.module.or.open="module" oder "open" erwartet
+
+compiler.err.dot.class.expected=".class" erwartet
+
+## The argument to this string will always be either 'case' or 'default'.
+# 0: token
+compiler.err.orphaned={0} verwaist
+
+# 0: name
+compiler.misc.anonymous.class=<anonyme {0}>
+
+# 0: name, 1: type
+compiler.misc.type.captureof=capture#{0} von {1}
+
+compiler.misc.type.captureof.1=capture#{0}
+
+compiler.misc.type.none=<kein Wert>
+
+compiler.misc.unnamed.package=Unbenanntes Package
+
+compiler.misc.unnamed.module=Unbenanntes Modul
+
+#####
+
+# 0: symbol, 1: message segment
+compiler.err.cant.access=Kein Zugriff auf {0}\n{1}
+
+# 0: name
+compiler.misc.bad.class.file=Klassendatei ist ung\u00FCltig f\u00FCr Klasse {0}
+
+# 0: file name, 1: string (expected constant pool entry type), 2: number (constant pool index)
+compiler.misc.bad.const.pool.entry=Ung\u00FCltiger Konstantenpooleintrag in {0}\n{1} bei Index {2} erwartet
+
+# 0: file name, 1: number (constant pool index), 2: number (constant pool size)
+compiler.misc.bad.const.pool.index=Ung\u00FCltiger Konstantenpoolindex in {0}\nIndex {1} liegt nicht innerhalb der Poolgr\u00F6\u00DFe {2}.
+
+# 0: file name, 1: message segment
+compiler.misc.bad.class.file.header=Ung\u00FCltige Klassendatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Classpath vorhanden ist.
+
+# 0: file name, 1: message segment
+compiler.misc.bad.source.file.header=Ung\u00FCltige Quelldatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Quellpfades vorhanden ist.
+
+## The following are all possible strings for the second argument ({1}) of the
+## above strings.
+compiler.misc.bad.class.signature=Ung\u00FCltige Klassensignatur: {0}
+
+#0: symbol, 1: symbol
+compiler.misc.bad.enclosing.class=Ung\u00FCltige einschlie\u00DFende Klasse f\u00FCr {0}: {1}
+
+# 0: symbol
+compiler.misc.bad.enclosing.method=Ung\u00FCltiges einschlie\u00DFendes Methodenattribut f\u00FCr Klasse {0}
+
+compiler.misc.bad.runtime.invisible.param.annotations=Ung\u00FCltiges RuntimeInvisibleParameterAnnotations-Attribut: {0}
+
+compiler.misc.bad.const.pool.tag=Ung\u00FCltiges Konstantenpooltag: {0}
+
+compiler.misc.bad.const.pool.tag.at=Ung\u00FCltiges Konstantenpooltag {0} bei {1}
+
+compiler.misc.unexpected.const.pool.tag.at=Unerwartetes Konstantenpooltag {0} bei {1}
+
+compiler.misc.bad.signature=Ung\u00FCltige Signatur: {0}
+
+compiler.misc.bad.type.annotation.value=Ung\u00FCltiger Typ f\u00FCr Annotationszielwert: {0}
+
+compiler.misc.bad.module-info.name=Ung\u00FCltiger Klassenname
+
+compiler.misc.class.file.wrong.class=Klassendatei enth\u00E4lt falsche Klasse: {0}
+
+compiler.misc.module.info.invalid.super.class=module-info mit ung\u00FCltiger Superklasse
+
+# 0: name
+compiler.misc.class.file.not.found=Klassendatei f\u00FCr {0} nicht gefunden
+
+# 0: string (constant value), 1: symbol (constant field), 2: type (field type)
+compiler.misc.bad.constant.range=Konstantenwert "{0}" f\u00FCr {1} liegt au\u00DFerhalb des erwarteten Bereichs f\u00FCr {2}
+
+# 0: string (constant value), 1: symbol (constant field), 2: string (expected class)
+compiler.misc.bad.constant.value=Ung\u00FCltiger Konstantenwert "{0}" f\u00FCr {1}. {2} erwartet
+
+# 0: type (field type)
+compiler.misc.bad.constant.value.type=Variable des Typs "{0}" darf keinen Konstantenwert aufweisen, aber es wurde einer f\u00FCr sie angegeben
+
+# 0: string (classfile major version), 1: string (classfile minor version)
+compiler.misc.invalid.default.interface=Standardmethode in Klassendatei der Version {0}.{1} gefunden
+
+# 0: string (classfile major version), 1: string (classfile minor version)
+compiler.misc.invalid.static.interface=Statische Methode in Klassendatei der Version {0}.{1} gefunden
+
+# 0: string (classfile major version), 1: string (classfile minor version)
+compiler.misc.anachronistic.module.info=Moduldeklaration in Klassendatei der Version {0}.{1} gefunden
+
+compiler.misc.module.info.definition.expected=module-info-Definition erwartet
+
+# 0: name
+compiler.misc.file.doesnt.contain.class=Datei enth\u00E4lt nicht Klasse {0}
+
+# 0: symbol
+compiler.misc.file.does.not.contain.package=Datei enth\u00E4lt nicht Package {0}
+
+compiler.misc.file.does.not.contain.module=Datei enth\u00E4lt keine Moduldeklaration
+
+compiler.misc.illegal.start.of.class.file=Unzul\u00E4ssiger Klassendateibeginn
+
+# 0: name
+compiler.misc.method.descriptor.invalid=Methodendeskriptor ung\u00FCltig f\u00FCr {0}
+
+compiler.misc.unable.to.access.file=Zugriff auf Datei nicht m\u00F6glich: {0}
+
+compiler.misc.unicode.str.not.supported=Unicode-Zeichenfolge wird in Klassendatei nicht unterst\u00FCtzt
+
+compiler.misc.undecl.type.var=Nicht deklarierte Typvariable: {0}
+
+compiler.misc.malformed.vararg.method=Klassendatei enth\u00E4lt nicht wohlgeformte Methode mit variabler Argumentanzahl: {0}
+
+compiler.misc.wrong.version=Klassendatei hat die falsche Version {0}.{1}. Sie muss {2}.{3} lauten
+
+#####
+
+# 0: type, 1: type or symbol
+compiler.err.not.within.bounds=Typargument {0} liegt nicht innerhalb des g\u00FCltigen Bereichs von Typvariable {1}
+
+## The following are all possible strings for the second argument ({1}) of the
+## above string.
+
+## none yet...
+
+#####
+
+# 0: message segment
+compiler.err.prob.found.req=Inkompatible Typen: {0}
+
+# 0: message segment
+compiler.misc.prob.found.req=Inkompatible Typen: {0}
+
+# 0: message segment, 1: type, 2: type
+compiler.warn.prob.found.req={0}\nErforderlich: {2}\nErmittelt:    {1}
+
+# 0: type, 1: type
+compiler.misc.inconvertible.types={0} kann nicht in {1} konvertiert werden
+
+# 0: type, 1: type
+compiler.misc.possible.loss.of.precision=M\u00F6glicher Verlust bei Konvertierung von {0} in {1}
+
+compiler.misc.unchecked.assign=Nicht gepr\u00FCfte Konvertierung
+
+# compiler.misc.storecheck=\
+#     assignment might cause later store checks to fail
+# compiler.misc.unchecked=\
+#     assigned array cannot dynamically check its stores
+compiler.misc.unchecked.cast.to.type=Nicht gepr\u00FCftes Casting
+
+# compiler.err.star.expected=\
+#     ''*'' expected
+# compiler.err.no.elem.type=\
+#     \[\*\] cannot have a type
+
+# 0: message segment
+compiler.misc.try.not.applicable.to.type=try-with-resources nicht auf Variablentyp anwendbar\n({0})
+
+#####
+
+# 0: object, 1: message segment
+compiler.err.type.found.req=Unerwarteter Typ\nErforderlich: {1}\nErmittelt:    {0}
+
+## The following are all possible strings for the first argument ({0}) of the
+## above string.
+compiler.misc.type.req.class=Klasse
+
+compiler.misc.type.req.class.array=Klasse oder Array
+
+compiler.misc.type.req.array.or.iterable=Array oder java.lang.Iterable
+
+compiler.misc.type.req.ref=Referenz
+
+compiler.misc.type.req.exact=Klasse oder Schnittstelle ohne Grenzwerte
+
+# 0: type
+compiler.misc.type.parameter=Typparameter {0}
+
+#####
+
+## The following are all possible strings for the last argument of all those
+## diagnostics whose key ends in ".1"
+
+# 0: type, 1: list of type
+compiler.misc.no.unique.maximal.instance.exists=Keine eindeutige maximale Instanz f\u00FCr Typvariable {0} mit oberen Grenzwerten {1} vorhanden
+
+# 0: type, 1: list of type
+compiler.misc.no.unique.minimal.instance.exists=Keine eindeutige minimale Instanz f\u00FCr Typvariable {0} mit unteren Grenzwerten {1} vorhanden
+
+# 0: type, 1: list of type
+compiler.misc.incompatible.upper.bounds=Inferenzvariable {0} hat inkompatible obere Grenzwerte {1}
+
+# 0: type, 1: list of type
+compiler.misc.incompatible.eq.bounds=Inferenzvariable {0} hat inkompatible Gleichheits-Constraints {1}
+
+# 0: type, 1: fragment, 2: fragment
+compiler.misc.incompatible.bounds=Inferenzvariable {0} hat inkompatible Grenzwerte\n{1}\n{2}
+
+# 0: list of type
+compiler.misc.lower.bounds=Untere Grenzwerte: {0}
+
+# 0: list of type
+compiler.misc.eq.bounds=Gleichheits-Constraints: {0}
+
+# 0: list of type
+compiler.misc.upper.bounds=Untere Grenzwerte: {0}
+
+# 0: list of type, 1: type, 2: type
+compiler.misc.infer.no.conforming.instance.exists=Keine Instanzen von Typvariablen {0} vorhanden, sodass {1} {2} entspricht
+
+# 0: list of type, 1: message segment
+compiler.misc.infer.no.conforming.assignment.exists=Typvariable(n) {0} nicht ableitbar\n(nicht \u00FCbereinstimmende Argumente; {1})
+
+# 0: list of type
+compiler.misc.infer.arg.length.mismatch=Typvariable(n) {0} nicht ableitbar\n(Liste der tats\u00E4chlichen Argumente hat eine andere L\u00E4nge als die der formalen Argumente)
+
+# 0: list of type, 1: message segment
+compiler.misc.infer.varargs.argument.mismatch=Typvariable(n) {0} nicht ableitbar\n(nicht \u00FCbereinstimmende varargs, {1})
+
+# 0: type, 1: list of type
+compiler.misc.inferred.do.not.conform.to.upper.bounds=Abgeleiteter Typ entspricht nicht den oberen Grenzwerten\nAbgeleitet: {0}\nObere Grenzwerte: {1}
+
+# 0: type, 1: list of type
+compiler.misc.inferred.do.not.conform.to.lower.bounds=Abgeleiteter Typ entspricht nicht den unteren Grenzwerten\nAbgeleitet: {0}\nUntere Grenzwerte: {1}
+
+# 0: type, 1: list of type
+compiler.misc.inferred.do.not.conform.to.eq.bounds=Abgeleiteter Typ entspricht nicht den Gleichheits-Constraints\nAbgeleitet: {0}\nGleichheits-Constraint(s): {1}
+
+# 0: symbol
+compiler.misc.diamond={0}<>
+
+# 0: type
+compiler.misc.diamond.non.generic="<>" kann nicht mit der nicht generischen Klasse {0} verwendet werden
+
+# 0: list of type, 1: message segment
+compiler.misc.diamond.invalid.arg=Typargument {0}, das f\u00FCr {1} abgeleitet wurde, ist in diesem Kontext nicht zul\u00E4ssig\nDas abgeleitete Argument kann nicht im Signaturattribut ausgedr\u00FCckt werden
+
+# 0: list of type, 1: message segment
+compiler.misc.diamond.invalid.args=Typargumente {0}, die f\u00FCr {1} abgeleitet wurden, sind in diesem Kontext nicht zul\u00E4ssig\nAbgeleitete Argumente k\u00F6nnen nicht im Signaturattribut ausgedr\u00FCckt werden
+
+# 0: type
+compiler.misc.diamond.and.explicit.params="<>" kann nicht mit expliziten Typparametern f\u00FCr Konstruktor verwendet werden
+
+compiler.misc.mref.infer.and.explicit.params=Raw-Konstruktorreferenz kann nicht mit expliziten Typparametern f\u00FCr Konstruktor verwendet werden
+
+# 0: type, 1: list of type
+compiler.misc.explicit.param.do.not.conform.to.bounds=Explizites Typargument {0} entspricht nicht den deklarierten Grenzwerten {1}
+
+compiler.misc.arg.length.mismatch=Liste der tats\u00E4chlichen Argumente hat eine andere L\u00E4nge als die der formalen Argumente
+
+# 0: string
+compiler.misc.wrong.number.type.args=Falsche Anzahl Typargumente. {0} erforderlich
+
+# 0: message segment
+compiler.misc.no.conforming.assignment.exists=Keine \u00FCbereinstimmenden Argumente, {0}
+
+# 0: message segment
+compiler.misc.varargs.argument.mismatch=Keine \u00FCbereinstimmenden varargs; {0}
+
+#####
+
+# 0: symbol or type, 1: file name
+compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file=Auf Auxiliary-Klasse {0} in {1} darf nicht von au\u00DFerhalb der eigenen Quelldatei zugegriffen werden
+
+## The first argument ({0}) is a "kindname".
+# 0: kind name, 1: symbol, 2: symbol
+compiler.err.abstract.cant.be.accessed.directly={0} {1} in {2} ist abstrakt und kann nicht direkt aufgerufen werden
+
+## The first argument ({0}) is a "kindname".
+# 0: symbol kind, 1: symbol
+compiler.err.non-static.cant.be.ref={0} {1} ist nicht statisch und kann nicht aus einem statischen Kontext referenziert werden
+
+# 0: symbol kind, 1: symbol
+compiler.misc.bad.static.method.in.unbound.lookup=Unerwartete statische {0} {1} in ungebundenem Lookup gefunden
+
+# 0: symbol kind, 1: symbol
+compiler.misc.bad.instance.method.in.unbound.lookup=Unerwartete Instanz {0} {1} in ungebundenem Lookup gefunden
+
+# 0: symbol kind, 1: symbol
+compiler.misc.bad.static.method.in.bound.lookup=Unerwartete statische {0} {1} in gebundenem Lookup gefunden
+
+## Both arguments ({0}, {1}) are "kindname"s.  {0} is a comma-separated list
+## of kindnames (the list should be identical to that provided in source.
+# 0: set of kind name, 1: set of kind name
+compiler.err.unexpected.type=Unerwarteter Typ\nErforderlich: {0}\nErmittelt:    {1}
+
+compiler.err.unexpected.lambda=Hier wird kein Lambda-Ausdruck erwartet
+
+compiler.err.unexpected.mref=Hier wird keine Methodenreferenz erwartet
+
+## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
+## The second argument {1} is the non-resolved symbol
+## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
+## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
+# 0: kind name, 1: name, 2: unused, 3: unused
+compiler.err.cant.resolve=Symbol nicht gefunden\nSymbol: {0} {1}
+
+# 0: kind name, 1: name, 2: unused, 3: list of type
+compiler.err.cant.resolve.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})
+
+# 0: kind name, 1: name, 2: unused, 3: list of type
+compiler.misc.cant.resolve.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})
+
+# 0: kind name, 1: name, 2: list of type, 3: list of type
+compiler.err.cant.resolve.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})
+
+## arguments from {0} to {3} have the same meaning as above
+## The fifth argument {4} is a location subdiagnostic (see below)
+# 0: kind name, 1: name, 2: unused, 3: unused, 4: message segment
+compiler.err.cant.resolve.location=Symbol nicht gefunden\nSymbol: {0} {1}\nOrt: {4}
+
+# 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
+compiler.err.cant.resolve.location.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})\nOrt: {4}
+
+# 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
+compiler.err.cant.resolve.location.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})\nOrt: {4}
+
+### Following are replicated/used for method reference diagnostics
+
+# 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
+compiler.misc.cant.resolve.location.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})\nOrt: {4}
+
+# 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
+compiler.misc.cant.resolve.location.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})\nOrt: {4}
+
+##a location subdiagnostic is composed as follows:
+## The first argument {0} is the location "kindname" (e.g. 'constructor', 'field', etc.)
+## The second argument {1} is the location name
+## The third argument {2} is the location type (only when {1} is a variable name)
+
+# 0: kind name, 1: type or symbol, 2: unused
+compiler.misc.location={0} {1}
+
+# 0: kind name, 1: symbol, 2: type
+compiler.misc.location.1={0} {1} von Typ {2}
+
+## The following are all possible string for "kindname".
+## They should be called whatever the JLS calls them after it been translated
+## to the appropriate language.
+# compiler.misc.kindname.constructor=\
+#     static member
+compiler.misc.kindname.annotation=@interface
+
+compiler.misc.kindname.constructor=Konstruktor
+
+compiler.misc.kindname.enum=Enumeration
+
+compiler.misc.kindname.interface=Schnittstelle
+
+compiler.misc.kindname.static=statisch
+
+compiler.misc.kindname.type.variable=Typvariable
+
+compiler.misc.kindname.type.variable.bound=Grenzwert von Typvariable
+
+compiler.misc.kindname.variable=Variable
+
+compiler.misc.kindname.value=Wert
+
+compiler.misc.kindname.method=Methode
+
+compiler.misc.kindname.class=Klasse
+
+compiler.misc.kindname.package=Package
+
+compiler.misc.kindname.module=Modul
+
+compiler.misc.kindname.static.init=statischer Initializer
+
+compiler.misc.kindname.instance.init=Instanz-Initializer
+
+compiler.misc.kindname.record.component=Datensatzkomponente
+
+compiler.misc.kindname.record=Datensatz
+
+#####
+
+compiler.misc.no.args=keine Argumente
+
+# 0: message segment
+compiler.err.override.static={0}\nAu\u00DFer Kraft setzende Methode ist statisch
+
+# 0: message segment, 1: set of flag
+compiler.err.override.meth={0}\nAu\u00DFer Kraft gesetzte Methode ist {1}
+
+# 0: message segment, 1: type
+compiler.err.override.meth.doesnt.throw={0}\nAu\u00DFer Kraft gesetzte Methode l\u00F6st nicht {1} aus
+
+# In the following string {1} is a space separated list of Java Keywords, as
+# they would have been declared in the source code
+# 0: message segment, 1: set of flag or string
+compiler.err.override.weaker.access={0}\nVersuch, niedrigere Zugriffsberechtigungen zuzuweisen. War {1}
+
+# 0: message segment, 1: type, 2: type
+compiler.err.override.incompatible.ret={0}\nR\u00FCckgabetyp {1} ist nicht mit {2} kompatibel
+
+# 0: message segment, 1: type, 2: type
+compiler.warn.override.unchecked.ret={0}\nR\u00FCckgabetyp erfordert eine nicht gepr\u00FCfte Konvertierung von {1} in {2}
+
+# 0: message segment, 1: type
+compiler.warn.override.unchecked.thrown={0}\nAu\u00DFer Kraft gesetzte Methode l\u00F6st nicht {1} aus
+
+# 0: symbol
+compiler.warn.override.equals.but.not.hashcode=Klasse {0} setzt Gleichwertige au\u00DFer Kraft. hashCode-Methode wird aber weder von der Klasse noch einer Superklasse au\u00DFer Kraft gesetzt
+
+## The following are all possible strings for the first argument ({0}) of the
+## above strings.
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.cant.override={0} in {1} kann nicht {2} in {3} au\u00DFer Kraft setzen
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.cant.hide={0} in {1} kann nicht {2} in {3} ausblenden
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.cant.implement={0} in {1} kann nicht {2} in {3} implementieren
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.clashes.with={0} in {1} steht mit {2} in {3} in Konflikt
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.unchecked.override={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.unchecked.implement={0} in {1} implementiert {2} in {3}
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.unchecked.clash.with={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.varargs.override={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.varargs.implement={0} in {1} implementiert {2} in {3}
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.varargs.clash.with={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+
+# 0: kind name, 1: symbol, 2: symbol, 3: message segment
+compiler.misc.inapplicable.method={0} {1}.{2} ist nicht anwendbar\n({3})
+
+########################################
+# Diagnostics for language feature changes.
+# Such diagnostics have a common template which can be customized by using a feature
+# diagnostic fragment (one of those given below).
+########################################
+
+# 0: message segment (feature), 1: string (found version), 2: string (expected version)
+compiler.err.feature.not.supported.in.source={0} wird in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+
+# 0: message segment (feature), 1: string (found version), 2: string (expected version)
+compiler.err.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+
+# 0: message segment (feature), 1: string (found version), 2: string (expected version)
+compiler.misc.feature.not.supported.in.source={0} wird in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+
+# 0: message segment (feature), 1: string (found version), 2: string (expected version)
+compiler.misc.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+
+# 0: message segment (feature)
+compiler.err.preview.feature.disabled={0} ist ein Vorschaufeature, das standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
+
+# 0: message segment (feature)
+compiler.err.preview.feature.disabled.plural={0} sind ein Vorschaufeature, das standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
+
+# 0: file object (classfile), 1: string (expected version)
+compiler.err.preview.feature.disabled.classfile=Klassendatei f\u00FCr {0} verwendet Vorschaufeatures von Java SE {1}.\n(Verwenden Sie --enable-preview, um das Laden von Klassendateien mit Vorschaufeatures zu erm\u00F6glichen)
+
+# 0: message segment (feature)
+compiler.warn.preview.feature.use={0} ist ein Vorschaufeature, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+# 0: message segment (feature)
+compiler.warn.preview.feature.use.plural={0} sind ein Vorschaufeature, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+# 0: file object (classfile), 1: string (expected version)
+compiler.warn.preview.feature.use.classfile=Klassendatei f\u00FCr {0} verwendet Vorschaufeatures von Java SE {1}.
+
+
+compiler.misc.feature.modules=Module
+
+compiler.misc.feature.diamond.and.anon.class="<>" mit anonymen inneren Klassen
+
+compiler.misc.feature.var.in.try.with.resources=Variablen in try-with-resources
+
+compiler.misc.feature.type.annotations=Typannotationen
+
+compiler.misc.feature.annotations.after.type.params=Annotationen nach Methodentypparametern
+
+compiler.misc.feature.repeatable.annotations=Wiederholte Annotationen
+
+compiler.misc.feature.diamond=Rautenoperator
+
+compiler.misc.feature.lambda=Lambda-Ausdr\u00FCcke
+
+compiler.misc.feature.method.references=Methodenreferenzen
+
+compiler.misc.feature.default.methods=Standardmethoden
+
+compiler.misc.feature.intersection.types.in.cast=Schnittmengentypen
+
+compiler.misc.feature.static.intf.methods=Statische Schnittstellenmethoden
+
+compiler.misc.feature.static.intf.method.invoke=Aufrufe statischer Schnittstellenmethoden
+
+compiler.misc.feature.private.intf.methods=Private Schnittstellenmethoden
+
+compiler.misc.feature.text.blocks=Textbl\u00F6cke
+
+compiler.misc.feature.multiple.case.labels=Mehrere CASE-Labels
+
+compiler.misc.feature.switch.rules=Switch-Regeln
+
+compiler.misc.feature.switch.expressions=Switch-Ausdr\u00FCcke
+
+compiler.misc.feature.var.syntax.in.implicit.lambda=var-Syntax in impliziten Lambdas
+
+compiler.misc.feature.pattern.matching.instanceof=Musterabgleich in instanceof
+
+compiler.misc.feature.reifiable.types.instanceof=Reifizierbare Typen in instanceof
+
+compiler.misc.feature.records=Datens\u00E4tze
+
+compiler.misc.feature.sealed.classes=Verschl\u00FCsselte Klassen
+
+compiler.misc.feature.case.null=Null in Switch Cases
+
+compiler.misc.feature.pattern.switch=Muster in Switch-Anweisungen
+
+compiler.warn.underscore.as.identifier=Ab Release 9 ist "_" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+
+compiler.err.underscore.as.identifier=Ab Release 9 ist "_" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+
+compiler.err.underscore.as.identifier.in.lambda="_" als ID verwendet\n("_" darf nicht als ID f\u00FCr Lambda-Parameter verwendet werden)
+
+compiler.err.enum.as.identifier=Ab Release 5 ist "enum" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+
+compiler.err.assert.as.identifier=Ab Release 1.4 ist "assert" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+
+# TODO 308: make a better error message
+compiler.err.this.as.identifier=Ab Release 8 ist "this" nur als Parametername f\u00FCr den Empf\u00E4ngertyp zul\u00E4ssig.\nDas muss der erste Parameter sein und darf kein Lambda-Parameter sein
+
+compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=receiver-Parameter nicht f\u00FCr Konstruktor der obersten Klasse anwendbar
+
+# TODO 308: make a better error message
+# 0: annotation
+compiler.err.cant.type.annotate.scoping.1=Scoping-Konstrukt kann nicht mit type-use-Annotation versehen werden: {0}
+
+# TODO 308: make a better error message
+# 0: list of annotation
+compiler.err.cant.type.annotate.scoping=Scoping-Konstrukt kann nicht mit type-use-Annotationen versehen werden: {0}
+
+# 0: type, 1: type
+compiler.err.incorrect.receiver.name=Der Empf\u00E4ngername stimmt nicht mit dem einschlie\u00DFenden Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+
+# 0: type, 1: type
+compiler.err.incorrect.receiver.type=Der Empf\u00E4ngertyp stimmt nicht mit dem einschlie\u00DFenden Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+
+# 0: type, 1: type
+compiler.err.incorrect.constructor.receiver.type=Der Empf\u00E4ngertyp stimmt nicht mit dem einschlie\u00DFenden \u00E4u\u00DFeren Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+
+# 0: type, 1: type
+compiler.err.incorrect.constructor.receiver.name=Der Empf\u00E4ngername stimmt nicht mit dem einschlie\u00DFenden \u00E4u\u00DFeren Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+
+compiler.err.no.annotations.on.dot.class=Keine Annotationen im Typ eines Klassenliterals zul\u00E4ssig
+
+########################################
+# Diagnostics for verbose resolution
+# used by Resolve (debug only)
+########################################
+
+# 0: number, 1: symbol, 2: unused
+compiler.misc.applicable.method.found=#{0} anwendbare Methode gefunden: {1}
+
+# 0: number, 1: symbol, 2: message segment
+compiler.misc.applicable.method.found.1=#{0} anwendbare Methode gefunden: {1}\n({2})
+
+# 0: number, 1: symbol, 2: message segment
+compiler.misc.not.applicable.method.found=#{0} nicht anwendbare Methode gefunden: {1}\n({2})
+
+# 0: type
+compiler.misc.partial.inst.sig=Teilweise instanziiert in: {0}
+
+# 0: name, 1: symbol, 2: number, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
+compiler.note.verbose.resolve.multi=Methode {0} wird in Typ {1} als Kandidat {2} aufgel\u00F6st\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
+
+# 0: name, 1: symbol, 2: unused, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
+compiler.note.verbose.resolve.multi.1=Fehlerhafte Aufl\u00F6sung f\u00FCr Methode {0} in Typ {1}\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
+
+# 0: symbol, 1: type, 2: type
+compiler.note.deferred.method.inst=Instanziierung von Methode {0} verz\u00F6gert\nInstanziierte Signatur: {1}\ntarget-type: {2}
+
+########################################
+# Diagnostics for lambda deduplication
+# used by LambdaToMethod (debug only)
+########################################
+
+# 0: symbol
+compiler.note.verbose.l2m.deduplicate=Lambda-Implementierungsmethode {0} wird dedupliziert
+
+########################################
+# Diagnostics for method reference search
+# results used by Resolve (debug only)
+########################################
+
+# 0: fragment, 1: string, 2: number
+compiler.note.method.ref.search.results.multi={0} Suchergebnisse f\u00FCr {1}, mit spezifischsten {2}\nAnwendbare Kandidaten:
+
+# 0: number, 1: fragment, 2: symbol
+compiler.misc.applicable.method.found.2=#{0} anwendbare Methode gefunden: {1} {2}
+
+# 0: number, 1: fragment, 2: symbol, 3: message segment
+compiler.misc.applicable.method.found.3=#{0} anwendbare Methode gefunden: {1} {2}\n({3})
+
+compiler.misc.static=statisch
+
+compiler.misc.non.static=nicht statisch
+
+compiler.misc.bound=gebunden
+
+compiler.misc.unbound=ungebunden
+
+########################################
+# Diagnostics for where clause implementation
+# used by the RichDiagnosticFormatter.
+########################################
+
+compiler.misc.type.null=<Null>
+
+# X#n (where n is an int id) is disambiguated tvar name
+# 0: name, 1: number
+compiler.misc.type.var={0}#{1}
+
+# CAP#n (where n is an int id) is an abbreviation for 'captured type'
+# 0: number
+compiler.misc.captured.type=CAP#{0}
+
+# <INT#n> (where n is an int id) is an abbreviation for 'intersection type'
+# 0: number
+compiler.misc.intersection.type=INT#{0}
+
+# where clause for captured type: contains upper ('extends {1}') and lower
+# ('super {2}') bound along with the wildcard that generated this captured type ({3})
+# 0: type, 1: type, 2: type, 3: type
+compiler.misc.where.captured={0} erweitert {1} Super: {2} aus Erfassung von {3}
+
+# compact where clause for captured type: contains upper ('extends {1}') along
+# with the wildcard that generated this captured type ({3})
+# 0: type, 1: type, 2: unused, 3: type
+compiler.misc.where.captured.1={0} erweitert {1} aus Erfassung von {3}
+
+# where clause for type variable: contains upper bound(s) ('extends {1}') along with
+# the kindname ({2}) and location ({3}) in which the typevar has been declared
+# 0: type, 1: list of type, 2: symbol kind, 3: symbol
+compiler.misc.where.typevar={0} erweitert {1}, deklariert in {2} {3}
+
+# compact where clause for type variable: contains the kindname ({2}) and location ({3})
+# in which the typevar has been declared
+# 0: type, 1: list of type, 2: symbol kind, 3: symbol
+compiler.misc.where.typevar.1={0} deklariert in {2} {3}
+
+# where clause for fresh type variable: contains upper bound(s) ('extends {1}').
+# Since a fresh type-variable is synthetic - there's no location/kindname here.
+# 0: type, 1: list of type
+compiler.misc.where.fresh.typevar={0} erweitert {1}
+
+# where clause for type variable: contains all the upper bound(s) ('extends {1}')
+# of this intersection type
+# 0: type, 1: list of type
+compiler.misc.where.intersection={0} erweitert {1}
+
+### Where clause headers ###
+compiler.misc.where.description.captured=Dabei ist {0} eine neue Typvariable:
+
+# 0: set of type
+compiler.misc.where.description.typevar=Dabei ist {0} eine Typvariable:
+
+# 0: set of type
+compiler.misc.where.description.intersection=Dabei ist {0} ein Schnittmengentyp:
+
+# 0: set of type
+compiler.misc.where.description.captured.1=Dabei sind {0} neue Typvariablen:
+
+# 0: set of type
+compiler.misc.where.description.typevar.1=Dabei sind {0} Typvariablen:
+
+# 0: set of type
+compiler.misc.where.description.intersection.1=Dabei sind {0} Schnittmengentypen:
+
+###
+# errors related to doc comments
+
+compiler.err.dc.bad.entity=Ung\u00FCltige HTML-Entity
+
+compiler.err.dc.bad.inline.tag=Falsche Verwendung von Inlinetag
+
+compiler.err.dc.identifier.expected=ID erwartet
+
+compiler.err.dc.malformed.html=Nicht wohlgeformte HTML
+
+compiler.err.dc.missing.semicolon=Semikolon fehlt
+
+compiler.err.dc.no.content=kein Inhalt
+
+compiler.err.dc.no.tag.name=Kein Tagname nach "@"
+
+compiler.err.dc.gt.expected=">" erwartet
+
+compiler.err.dc.ref.bad.parens=Unerwarteter Text nach Klammer
+
+compiler.err.dc.ref.syntax.error=Syntaxfehler in Referenz
+
+compiler.err.dc.ref.unexpected.input=Unerwarteter Text
+
+compiler.err.dc.unexpected.content=Unerwarteter Inhalt
+
+compiler.err.dc.unterminated.inline.tag=Nicht abgeschlossenes Inlinetag
+
+compiler.err.dc.unterminated.signature=Nicht abgeschlossene Signatur
+
+compiler.err.dc.unterminated.string=Nicht abgeschlossene Zeichenfolge
+
+compiler.err.dc.ref.annotations.not.allowed=Annotationen nicht zul\u00E4ssig
+
+###
+# errors related to modules
+
+compiler.err.expected.module="module" erwartet
+
+# 0: symbol
+compiler.err.module.not.found=Modul nicht gefunden: {0}
+
+# 0: symbol
+compiler.warn.module.not.found=Modul nicht gefunden: {0}
+
+compiler.err.too.many.modules=Zu viele Moduldeklarationen gefunden
+
+compiler.err.module.not.found.on.module.source.path=Modul nicht in Modulquellpfad gefunden
+
+compiler.err.not.in.module.on.module.source.path=Nicht in einem Modul im Modulquellpfad
+
+# 0: symbol
+compiler.err.duplicate.module=Doppeltes Modul: {0}
+
+# 0: symbol
+compiler.err.duplicate.requires=Doppelte "requires": {0}
+
+# 0: symbol
+compiler.err.conflicting.exports=Doppelte oder unvereinbare Exporte: {0}
+
+# 0: symbol
+compiler.err.conflicting.opens=Doppelte oder unvereinbare "opens": {0}
+
+# 0: symbol
+compiler.err.conflicting.exports.to.module=Doppelte oder unvereinbare Exporte in Modul: {0}
+
+# 0: symbol
+compiler.err.conflicting.opens.to.module=Doppelte oder unvereinbare "opens" in Modul: {0}
+
+compiler.err.no.opens.unless.strong="opens" nur in starken Modulen zul\u00E4ssig
+
+# 0: symbol
+compiler.err.repeated.provides.for.service=Mehrere "provides" f\u00FCr Service {0}
+
+# 0: symbol, 1: symbol
+compiler.err.duplicate.provides=Doppelte "provides": Service {0}, Implementierung {1}
+
+# 0: symbol
+compiler.err.duplicate.uses=Doppelte Verwendungen: {0}
+
+# 0: symbol
+compiler.err.service.implementation.is.abstract=Die Serviceimplementierung ist eine abstrakte Klasse: {0}
+
+compiler.err.service.implementation.must.be.subtype.of.service.interface=Der Serviceimplementierungstyp muss ein Subtyp des Serviceschnittstellentyps sein oder eine \u00F6ffentliche statische no-args-Methode namens "provider" aufweisen, die die Serviceimplementierung zur\u00FCckgibt
+
+compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface=Der R\u00FCckgabetyp der "provider"-Methode muss ein Subtyp des Serviceschnittstellentyps sein
+
+# 0: symbol
+compiler.err.service.implementation.is.inner=Die Serviceimplementierung ist eine innere Klasse: {0}
+
+# 0: symbol
+compiler.err.service.definition.is.enum=Die Servicedefinition ist eine Enumeration: {0}
+
+# 0: symbol
+compiler.err.service.implementation.doesnt.have.a.no.args.constructor=Die Serviceimplementierung hat keinen Standardkonstruktor: {0}
+
+# 0: symbol
+compiler.err.service.implementation.no.args.constructor.not.public=Der "no arguments"-Konstruktor der Serviceimplementierung ist nicht \u00F6ffentlich: {0}
+
+# 0: symbol
+compiler.err.package.empty.or.not.found=Package ist leer oder nicht vorhanden: {0}
+
+# 0: symbol
+compiler.warn.package.empty.or.not.found=Package ist leer oder nicht vorhanden: {0}
+
+compiler.err.no.output.dir=Kein Klassenausgabeverzeichnis angegeben
+
+compiler.err.unnamed.pkg.not.allowed.named.modules=Unbenanntes Package ist in benannten Modulen nicht zul\u00E4ssig
+
+# 0: name, 1: name
+compiler.err.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} \u00FCberein
+
+# 0: name, 1: name
+compiler.misc.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} \u00FCberein
+
+# 0: name
+compiler.err.module.non.zero.opens=Bei ge\u00F6ffnetem Modul {0} ist opens_count ungleich Null
+
+# 0: name
+compiler.misc.module.non.zero.opens=Bei ge\u00F6ffnetem Modul {0} ist opens_count ungleich Null
+
+compiler.err.module.decl.sb.in.module-info.java=Moduldeklarationen m\u00FCssen in einer Datei namens module-info.java vorhanden sein
+
+# 0: set of string
+compiler.err.too.many.patched.modules=Zu viele gepatchte Module ({0}). Verwenden Sie --module-source-path
+
+# 0: name, 1: name
+compiler.err.file.patched.and.msp=Datei sowohl von --patch-module als auch von --module-source-path zug\u00E4nglich, geh\u00F6rt aber in jedem Pfad zu einem anderen Modul: {0}, {1}
+
+compiler.err.processorpath.no.processormodulepath=Unzul\u00E4ssige Kombination aus -processorpath und --processor-module-path
+
+# 0: symbol
+compiler.err.package.in.other.module=Package ist in einem anderen Modul vorhanden: {0}
+
+# 0: symbol, 1: name, 2: symbol, 3: symbol
+compiler.err.package.clash.from.requires=Modul {0} liest Package {1} sowohl aus {2} als auch aus {3}
+
+# 0: name, 1: symbol, 2: symbol
+compiler.err.package.clash.from.requires.in.unnamed=Das unbenannte Modul liest Package {0} sowohl aus {1} als auch aus {2}
+
+# 0: string
+compiler.err.module.not.found.in.module.source.path=Modul {0} nicht in Modulquellpfad gefunden
+
+compiler.err.output.dir.must.be.specified.with.dash.m.option=Klassenausgabeverzeichnis muss angegeben werden, wenn die Option -m verwendet wird
+
+compiler.err.modulesourcepath.must.be.specified.with.dash.m.option=Modulquellpfad muss angegeben werden, wenn die Option -m verwendet wird
+
+# 0: symbol
+compiler.err.service.implementation.not.in.right.module=Serviceimplementierung muss in demselben Modul wie die provides-Direktive definiert werden
+
+# 0: symbol
+compiler.err.cyclic.requires=Zyklische Abh\u00E4ngigkeit mit {0}
+
+# 0: fragment, 1: name
+compiler.err.duplicate.module.on.path=Doppeltes Modul in {0}\nModul in {1}
+
+# 0: option name, 1: string
+compiler.warn.bad.name.for.option=Ung\u00FCltiger Name im Wert f\u00FCr {0}-Option: "{1}"
+
+# 0: option name, 1: string
+compiler.err.bad.name.for.option=Ung\u00FCltiger Name im Wert f\u00FCr {0}-Option: "{1}"
+
+# 0: option name, 1: symbol
+compiler.warn.module.for.option.not.found=Modulname in {0}-Option nicht gefunden: {1}
+
+compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH kann nur beim Kompilieren des unbenannten Moduls oder beim Kompilieren im Kontext eines automatischen Moduls verwendet werden
+
+# 0: symbol
+compiler.err.add.exports.with.release=Export eines Packages aus Systemmodul {0} ist mit --release nicht zul\u00E4ssig
+
+# 0: symbol
+compiler.err.add.reads.with.release=Hinzuf\u00FCgen von Lese-Edges f\u00FCr Systemmodul {0} ist mit --release nicht zul\u00E4ssig
+
+compiler.warn.addopens.ignored=--add-opens hat zur Kompilierungszeit keine Auswirkungen
+
+compiler.misc.locn.module_source_path=Modulquellpfad
+
+compiler.misc.locn.upgrade_module_path=Upgrademodulpfad
+
+compiler.misc.locn.system_modules=Systemmodule
+
+compiler.misc.locn.module_path=Anwendungsmodulpfad
+
+compiler.misc.cant.resolve.modules=Module k\u00F6nnen nicht aufgel\u00F6st werden
+
+compiler.misc.bad.requires.flag=Ung\u00FCltiges requires-Kennzeichen: {0}
+
+# 0: string
+compiler.err.invalid.module.specifier=Modulbezeichner nicht zul\u00E4ssig: {0}
+
+# 0: symbol
+compiler.warn.service.provided.but.not.exported.or.used=Serviceschnittstelle angegeben, aber nicht exportiert oder verwendet
+
+# 0: kind name, 1: symbol, 2: symbol
+compiler.warn.leaks.not.accessible={0} {1} in Modul {2} ist nicht zug\u00E4nglich f\u00FCr Clients, die dieses Modul ben\u00F6tigen
+# 0: kind name, 1: symbol, 2: symbol
+compiler.warn.leaks.not.accessible.unexported={0} {1} in Modul {2} wird nicht exportiert
+# 0: kind name, 1: symbol, 2: symbol
+compiler.warn.leaks.not.accessible.not.required.transitive={0} {1} in Modul {2} wird nicht indirekt mit "requires transitive" exportiert
+# 0: kind name, 1: symbol, 2: symbol
+compiler.warn.leaks.not.accessible.unexported.qualified={0} {1} in Modul {2} ist m\u00F6glichweise nicht f\u00FCr alle Clients, die dieses Modul ben\u00F6tigen, sichtbar
+
+###
+# errors related to options
+
+# 0: string, 1: string
+compiler.err.illegal.argument.for.option=Unzul\u00E4ssiges Argument f\u00FCr {0}: {1}
+
+compiler.err.match.binding.exists=Unzul\u00E4ssiger Versuch, ein vorhandenes \u00DCbereinstimmungs-Binding neu zu definieren
+
+compiler.err.switch.case.unexpected.statement=Unerwartete Anweisung in Case. Ausdruck, Block oder throw-Anweisung erwartet
+
+compiler.err.switch.mixing.case.types=Unterschiedliche Case-Typen im Switch verwendet
+
+###
+# errors related to sealed classes
+
+# permits clause
+# 0: fragment
+compiler.err.invalid.permits.clause=Ung\u00FCltige PERMITS-Klausel\n({0})
+
+# 0: string
+compiler.misc.class.is.not.sealed={0} muss verschl\u00FCsselt sein
+
+# 0: type
+compiler.misc.is.a.type.variable=Darf keine Typvariablen enthalten: {0}
+
+# 0: type
+compiler.misc.is.duplicated=Darf keine Duplikate enthalten: {0}
+
+# 0: type
+compiler.misc.doesnt.extend.sealed=Unterklasse {0} muss verschl\u00FCsselte Klasse erweitern
+
+compiler.misc.must.not.be.same.class=Unzul\u00E4ssige Selbstreferenz in PERMITS-Klausel
+
+# 0: type
+compiler.misc.must.not.be.supertype=Unzul\u00E4ssige Referenz zu Supertyp {0}
+
+# other sealed types related errors
+
+compiler.err.sealed.class.must.have.subclasses=Verschl\u00FCsselte Klasse muss Unterklassen aufweisen
+
+# errors in subclasses of sealed classes
+# 0: symbol
+compiler.err.cant.inherit.from.sealed=Klasse darf nicht verschl\u00FCsselte Klasse erweitern: {0} (da diese nicht in der "permits"-Klausel enthalten ist)
+
+# 0: symbol
+compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=Klasse {0} in unbenanntem Modul darf keine verschl\u00FCsselte Klasse in einem anderen Package erweitern
+
+# 0: symbol, 1: symbol
+compiler.err.class.in.module.cant.extend.sealed.in.diff.module=Klasse {0} in Modul {1} darf keine verschl\u00FCsselte Klasse in einem anderen Modul erweitern
+
+# 0: symbol
+compiler.err.non.sealed.with.no.sealed.supertype=Modifikator "non-sealed" ist hier nicht zul\u00E4ssig\n(Klasse {0} hat keine verschl\u00FCsselten Supertypen)
+
+compiler.err.non.sealed.sealed.or.final.expected=Modifikator "sealed", "non-sealed" oder "final" erwartet
+
+compiler.err.non.sealed.or.sealed.expected=Modifikator "sealed" oder "non-sealed" erwartet
+
+compiler.err.sealed.or.non.sealed.local.classes.not.allowed=Lokale Klassen mit "sealed" oder "non-sealed" nicht zul\u00E4ssig
+
+# 0: fragment
+compiler.err.local.classes.cant.extend.sealed=Klassen vom Typ "{0}" d\u00FCrfen keine verschl\u00FCsselten Klassen erweitern
+compiler.misc.anonymous=Anonym
+
+compiler.misc.local=Lokal
+
+###
+# errors related to records
+
+# record components
+compiler.err.record.cant.declare.field.modifiers=Datensatzkomponenten k\u00F6nnen keine Modifikatoren aufweisen
+
+# 0: symbol
+compiler.err.illegal.record.component.name=Unzul\u00E4ssiger Datensatzkomponentenname {0}
+
+compiler.err.record.component.and.old.array.syntax=Legacy-Arraynotation f\u00FCr Datensatzkomponenten nicht zul\u00E4ssig
+
+# accessor methods
+# 0: symbol, 1: fragment
+compiler.err.invalid.accessor.method.in.record=Ung\u00FCltige Accessor-Methode in Datensatz {0}\n({1})
+
+compiler.misc.method.must.be.public=Accessor-Methode muss \u00F6ffentlich sein
+
+# 0: symbol, 1: symbol
+compiler.misc.accessor.return.type.doesnt.match=R\u00FCckgabetyp von Accessor-Methode {0} muss mit dem Typ der Datensatzkomponente {1} \u00FCbereinstimmen
+
+compiler.misc.accessor.method.cant.throw.exception=Throws-Klausel f\u00FCr Accessor-Methode nicht zul\u00E4ssig
+
+compiler.misc.accessor.method.must.not.be.generic=Accessor-Methode darf nicht generisch sein
+
+compiler.misc.accessor.method.must.not.be.static=Accessor-Methode darf nicht statisch sein
+
+# canonical constructors
+# 0: fragment, 1: name, 2: fragment
+compiler.err.invalid.canonical.constructor.in.record=Ung\u00FCltiger Konstruktor vom Typ {0} in Datensatz {1}\n({2})
+
+compiler.misc.canonical=Kanonisch
+
+compiler.misc.compact=Kompakt
+
+# 0: fragment
+compiler.misc.throws.clause.not.allowed.for.canonical.constructor=Throws-Klausel f\u00FCr Konstruktor des Typs {0} nicht zul\u00E4ssig
+
+compiler.misc.canonical.with.name.mismatch=Ung\u00FCltige Parameternamen in kanonischem Konstruktor
+
+compiler.misc.canonical.cant.have.return.statement=Kompakter Konstruktor darf keine return-Anweisungen verwenden
+
+compiler.misc.canonical.must.not.declare.type.variables=Kanonischer Konstruktor darf keine Typvariablen deklarieren
+
+compiler.misc.type.must.be.identical.to.corresponding.record.component.type=Typ und Argumentanzahl m\u00FCssen mit den Werten der entsprechenden Datensatzkomponente \u00FCbereinstimmen
+compiler.misc.canonical.must.not.contain.explicit.constructor.invocation=Kanonischer Konstruktor darf keinen expliziten Konstruktoraufruf enthalten
+
+# 0: set of flag or string
+compiler.misc.canonical.must.not.have.stronger.access=Versuch, h\u00F6here Zugriffsberechtigungen zuzuweisen. War {0}
+
+# other
+compiler.err.record.cannot.declare.instance.fields=Felddeklaration muss statisch sein\n(ersetzen Sie unter Umst\u00E4nden das Feld durch eine Datensatzkomponente)
+
+# 0: symbol
+compiler.err.invalid.supertype.record=Klassen k\u00F6nnen {0} nicht direkt erweitern
+
+# 0: symbol
+compiler.err.first.statement.must.be.call.to.another.constructor=Konstruktor ist nicht kanonisch. Daher muss die erste Anweisung einen anderen Konstruktor der Klasse {0} aufrufen
+
+compiler.err.instance.initializer.not.allowed.in.records=Instanz-Initializer in Datens\u00E4tzen nicht zul\u00E4ssig
+
+compiler.err.static.declaration.not.allowed.in.inner.classes=Statische Deklarationen in inneren Klassen nicht zul\u00E4ssig
+
+compiler.err.record.header.expected=Datensatzheader erwartet
+
+############################################
+# messages previously at javac.properties
+
+compiler.err.empty.A.argument=-A erfordert ein Argument. Verwenden Sie "-Akey" oder "-Akey=value"
+
+# 0: string
+compiler.err.invalid.A.key=Schl\u00FCssel in Annotationsprozessoroption "{0}" ist keine durch Punkt getrennte ID-Sequenz
+
+# 0: string
+compiler.err.invalid.flag=Ung\u00FCltiges Kennzeichen: {0}
+
+compiler.err.profile.bootclasspath.conflict=Optionen "profile" und "bootclasspath" k\u00F6nnen nicht zusammen verwendet werden
+
+# 0: string
+compiler.err.invalid.profile=Ung\u00FCltiges Profil: {0}
+
+# 0: string
+compiler.err.invalid.target=Ung\u00FCltiges Zielrelease: {0}
+
+# 0: option name, 1: target
+compiler.err.option.not.allowed.with.target=Option {0} mit Ziel {1} nicht zul\u00E4ssig
+
+# 0: string
+compiler.err.option.too.many=Option {0} kann nur einmal angegeben werden
+
+compiler.err.no.source.files=Keine Quelldateien
+
+compiler.err.no.source.files.classes=Keine Quelldateien oder Klassennamen
+
+# 0: string
+compiler.err.req.arg={0} erfordert ein Argument
+
+# 0: string
+compiler.err.invalid.source=Ung\u00FCltiges Quellrelease: {0}
+
+# 0: string, 1: string
+compiler.err.error.writing.file=Fehler beim Schreiben von {0}. {1}
+
+compiler.err.sourcepath.modulesourcepath.conflict=--source-path und --module-source-path k\u00F6nnen nicht beide angegeben werden
+
+# 0: string, 1: target
+compiler.warn.source.target.conflict=Quellrelease {0} erfordert Zielrelease {1}
+
+# 0: string, 1: target
+compiler.warn.target.default.source.conflict=Zielrelease {0} steht mit Standardquellrelease {1} in Konflikt
+
+# 0: profile, 1: target
+compiler.warn.profile.target.conflict=Profil {0} ist f\u00FCr Zielrelease {1} nicht g\u00FCltig
+
+# 0: string
+compiler.err.file.not.directory=Kein Verzeichnis: {0}
+
+# 0: object
+compiler.err.file.not.file=Keine Datei: {0}
+
+compiler.err.two.class.loaders.1=javac ist auf mehrere Class Loader aufgeteilt: Pr\u00FCfen Sie die Konfiguration
+
+# 0: url, 1: url
+compiler.err.two.class.loaders.2=javac ist auf mehrere Class Loader aufgeteilt:\nEine Klasse stammt aus Datei {0},\nw\u00E4hrend javac aus {1} stammt
+
+# 0: string, 1: string
+compiler.err.bad.value.for.option=Ung\u00FCltiger Wert f\u00FCr {0}-Option: "{1}"
+
+# 0: string
+compiler.err.no.value.for.option=Kein Wert f\u00FCr {0}-Option
+
+# 0: string
+compiler.err.repeated.value.for.patch.module=--patch-module mehrmals f\u00FCr Modul {0} angegeben
+
+# 0: string
+compiler.err.repeated.value.for.module.source.path=--module-source-path mehrmals f\u00FCr Modul {0} angegeben
+
+compiler.err.multiple.values.for.module.source.path=--module-source-path mehrmals mit Musterargument angegeben
+
+# 0: string
+compiler.err.unmatched.quote=Alleinstehendes Anf\u00FChrungszeichen in Umgebungsvariable {0}
+
+# 0: option name
+compiler.err.release.bootclasspath.conflict=Option {0} kann nicht zusammen mit --release verwendet werden
+
+# 0: string
+compiler.err.unsupported.release.version=Releaseversion {0} nicht unterst\u00FCtzt
+
+# 0: string
+compiler.err.file.not.found=Datei nicht gefunden: {0}
+
+# 0: string, 1: source
+compiler.err.preview.not.latest=Ung\u00FCltiges Quellrelease {0} mit --enable-preview\n(Vorschausprachfeatures werden nur f\u00FCr Release {1} unterst\u00FCtzt)
+
+compiler.err.preview.without.source.or.release=--enable-preview muss mit -source oder --release verwendet werden
+
+# 0: kind name, 1: symbol
+compiler.warn.declared.using.preview={0} {1} ist mit einem Vorschaufeature deklariert, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=Versuch der Synchronisierung f\u00FCr eine Instanz einer wertbasierten Klasse
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
index 2e071a4059a..86c65650c59 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
@@ -119,7 +119,7 @@ compiler.err.annotation.missing.default.value.1=\u6CE8\u91C8@{0}\u306B\u306F\u89
 # 0: type
 compiler.err.annotation.not.valid.for.type=\u6CE8\u91C8\u306F\u578B{0}\u306E\u8981\u7D20\u306B\u5BFE\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
-compiler.err.annotation.type.not.applicable=\u6CE8\u91C8\u578B\u306F\u3053\u306E\u7A2E\u985E\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.annotation.type.not.applicable=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3053\u306E\u7A2E\u985E\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 
 # 0: type
 compiler.err.annotation.type.not.applicable.to.type=\u6CE8\u91C8@{0}\u306F\u3053\u306E\u578B\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
@@ -263,12 +263,14 @@ compiler.misc.lambda=\u30E9\u30E0\u30C0\u5F0F
 
 compiler.misc.inner.cls=\u5185\u90E8\u30AF\u30E9\u30B9
 
+compiler.misc.guard=\u30AC\u30FC\u30C9
+
 # 0: type
 compiler.err.cant.deref={0}\u306F\u9593\u63A5\u53C2\u7167\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.cant.extend.intf.annotation=@interfaces\u3067\u306F''extends''\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
 
-compiler.err.annotation.decl.not.allowed.here=\u3053\u3053\u3067\u306F\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.annotation.decl.not.allowed.here=\u3053\u3053\u3067\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
 
 # 0: symbol
 compiler.err.cant.inherit.from.final=final {0}\u304B\u3089\u306F\u7D99\u627F\u3067\u304D\u307E\u305B\u3093
@@ -307,7 +309,7 @@ compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
 compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CB\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059
 
-compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
+compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
 
 # 0: symbol
 compiler.err.doesnt.exist=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
@@ -319,7 +321,7 @@ compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91C8{0}\u306F\u6709\u
 compiler.err.duplicate.annotation.member.value=\u6CE8\u91C8@{1}\u306B\u91CD\u8907\u3057\u305F\u8981\u7D20''{0}''\u304C\u3042\u308A\u307E\u3059\u3002
 
 # 0: type
-compiler.err.duplicate.annotation.missing.container={0}\u306F\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.duplicate.annotation.missing.container={0}\u306F\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}\u306F\u7121\u52B9\u306A@Repeatable\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3055\u308C\u3066\u3044\u307E\u3059
@@ -334,22 +336,22 @@ compiler.err.invalid.repeatable.annotation.multiple.values={0}\u306F\u6709\u52B9
 compiler.err.invalid.repeatable.annotation.invalid.value={0}\u306F\u6709\u52B9\u306A@Repeatable\u3067\u306F\u3042\u308A\u307E\u305B\u3093: \u5024\u8981\u7D20\u304C\u7121\u52B9\u3067\u3059
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u578B{2}\u306E\u8981\u7D20''value''\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u578B{2}\u306E\u8981\u7D20''value''\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306E\u4FDD\u6709\u304C\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({2})\u306E\u4FDD\u6709\u3088\u308A\u77ED\u304F\u306A\u3063\u3066\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306E\u4FDD\u6709\u304C\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({2})\u306E\u4FDD\u6709\u3088\u308A\u77ED\u304F\u306A\u3063\u3066\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u9055\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u9055\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u9055\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.not.inherited=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u9055\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u3088\u308A\u591A\u304F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059
+compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u3088\u308A\u591A\u304F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u30B3\u30F3\u30C6\u30CA{0}\u306F\u542B\u307E\u308C\u3066\u3044\u308B\u8981\u7D20\u3068\u540C\u6642\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093
@@ -368,8 +370,21 @@ compiler.err.same.binary.name=\u30AF\u30E9\u30B9: {0}\u3068{1}\u306E\u30D0\u30A4
 
 compiler.err.duplicate.case.label=case\u30E9\u30D9\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
 
+compiler.err.pattern.dominated=\u5148\u884C\u3059\u308Bcase\u30E9\u30D9\u30EB\u304C\u3001\u3053\u306Ecase\u30E9\u30D9\u30EB\u3088\u308A\u3082\u512A\u4F4D\u3067\u3059
+
 compiler.err.duplicate.default.label=default\u30E9\u30D9\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
 
+compiler.err.duplicate.total.pattern=\u5408\u8A08\u30D1\u30BF\u30FC\u30F3\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
+
+compiler.err.total.pattern.and.default=switch\u306B\u5408\u8A08\u30D1\u30BF\u30FC\u30F3\u3068default\u30E9\u30D9\u30EB\u306E\u4E21\u65B9\u304C\u3042\u308A\u307E\u3059
+
+# 0: type, 1: type
+compiler.err.constant.label.not.compatible=\u30BF\u30A4\u30D7{0}\u306E\u5B9A\u6570\u30E9\u30D9\u30EB\u304Cswitch\u30BB\u30EC\u30AF\u30BF\u30FB\u30BF\u30A4\u30D7{1}\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093
+
+compiler.err.flows.through.to.pattern=\u30D1\u30BF\u30FC\u30F3\u306B\u5BFE\u3057\u3066\u4E0D\u6B63\u306Afall-through
+
+compiler.err.flows.through.from.pattern=\u30D1\u30BF\u30FC\u30F3\u304B\u3089\u306E\u4E0D\u6B63\u306Afall-through
+
 compiler.err.else.without.if=''else''\u3078\u306E''if''\u304C\u3042\u308A\u307E\u305B\u3093
 
 compiler.err.empty.char.lit=\u7A7A\u306E\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u3067\u3059
@@ -379,13 +394,13 @@ compiler.err.encl.class.required={0}\u3092\u542B\u3080\u56F2\u3046\u30A4\u30F3\u
 
 compiler.err.enum.annotation.must.be.enum.constant=\u5217\u6319\u578B\u6CE8\u91C8\u5024\u306F\u3001\u5217\u6319\u578B\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.err.enum.cant.be.instantiated=\u5217\u6319\u578B\u306F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093
+compiler.err.enum.cant.be.instantiated=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.enum.label.must.be.unqualified.enum=\u5217\u6319\u578B\u306Eswitch case\u30E9\u30D9\u30EB\u306F\u5217\u6319\u578B\u5B9A\u6570\u306E\u975E\u4FEE\u98FE\u540D\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 compiler.err.enum.no.subclassing=\u30AF\u30E9\u30B9\u306F\u76F4\u63A5java.lang.Enum\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.enum.types.not.extensible=\u5217\u6319\u578B\u306F\u62E1\u5F35\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.enum.types.not.extensible=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u62E1\u5F35\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 compiler.err.enum.no.finalize=\u5217\u6319\u578B\u306Ffinalize\u30E1\u30BD\u30C3\u30C9\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
@@ -495,21 +510,21 @@ compiler.err.incomparable.types=\u578B{0}\u3068{1}\u306F\u6BD4\u8F03\u3067\u304D
 # 0: string
 compiler.err.int.number.too.large=\u6574\u6570\u304C\u5927\u304D\u3059\u304E\u307E\u3059\u3002
 
-compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91C8\u578B\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u304C\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u304C\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
 
 # 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u578B{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91C8\u578B\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u306F\u6C4E\u7528\u30E1\u30BD\u30C3\u30C9\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u306F\u6C4E\u7528\u30E1\u30BD\u30C3\u30C9\u306B\u3067\u304D\u307E\u305B\u3093
 
 # 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=\u6CE8\u91C8\u578B{1}\u3067\u30E1\u30BD\u30C3\u30C9{0}\u3068\u540C\u3058\u540D\u524D\u306E\u8981\u7D20\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.intf.annotation.member.clash=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{1}\u3067\u30E1\u30BD\u30C3\u30C9{0}\u3068\u540C\u3058\u540D\u524D\u306E\u8981\u7D20\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
 
 compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059
 
 compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u578B\u8981\u7D20\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
+compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
 
 compiler.err.invalid.binary.number=2\u9032\u6570\u5B57\u306F\u5C11\u306A\u304F\u3068\u30821\u6841\u306E2\u9032\u6570\u3092\u542B\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
@@ -535,7 +550,7 @@ compiler.err.label.already.in.use=\u30E9\u30D9\u30EB{0}\u306F\u3059\u3067\u306B\
 # 0: symbol
 compiler.err.local.var.accessed.from.icls.needs.final=\u30ED\u30FC\u30AB\u30EB\u5909\u6570{0}\u306F\u5185\u90E8\u30AF\u30E9\u30B9\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u307E\u3059\u3002final\u3067\u5BA3\u8A00\u3055\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.err.local.enum=\u5217\u6319\u578B\u306F\u30ED\u30FC\u30AB\u30EB\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.local.enum=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u30ED\u30FC\u30AB\u30EB\u306B\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.cannot.create.array.with.type.arguments=\u578B\u5F15\u6570\u3092\u6301\u3064\u914D\u5217\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
 
@@ -649,7 +664,7 @@ compiler.err.no.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u3
 compiler.err.no.match.entry={0}\u306F{1}\u306E\u30A8\u30F3\u30C8\u30EA\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002{2}\u304C\u5FC5\u8981\u3067\u3059
 
 # 0: type
-compiler.err.not.annotation.type={0}\u306F\u6CE8\u91C8\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.annotation.type={0}\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 # 0: symbol, 1: symbol, 2: message segment
 compiler.err.not.def.access.package.cant.access={0} \u306F\u8868\u793A\u4E0D\u53EF\u3067\u3059\n({2})
@@ -836,6 +851,8 @@ compiler.err.static.imp.only.classes.and.interfaces=static import\u306F\u30AF\u3
 
 compiler.err.string.const.req=\u5B9A\u6570\u306E\u6587\u5B57\u5217\u5F0F\u304C\u5FC5\u8981\u3067\u3059
 
+compiler.err.pattern.expected=\u30BF\u30A4\u30D7\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u5FC5\u8981\u3067\u3059
+
 # 0: symbol, 1: fragment
 compiler.err.cannot.generate.class=\u30AF\u30E9\u30B9{0}\u306E\u751F\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\n({1})
 
@@ -966,6 +983,8 @@ compiler.err.unreachable.stmt=\u3053\u306E\u6587\u306B\u5236\u5FA1\u304C\u79FB\u
 
 compiler.err.not.exhaustive=switch\u5F0F\u304C\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u3092\u30AB\u30D0\u30FC\u3057\u3066\u3044\u307E\u305B\u3093
 
+compiler.err.not.exhaustive.statement=switch\u6587\u304C\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u3092\u30AB\u30D0\u30FC\u3057\u3066\u3044\u307E\u305B\u3093
+
 compiler.err.initializer.must.be.able.to.complete.normally=\u521D\u671F\u5316\u5B50\u306F\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 compiler.err.initializer.not.allowed=\u30A4\u30CB\u30B7\u30E3\u30E9\u30A4\u30B6\u306Finterfaces\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
@@ -1006,7 +1025,7 @@ compiler.misc.varargs.trustme.on.reifiable.varargs=\u53EF\u5909\u5F15\u6570\u898
 compiler.err.instanceof.reifiable.not.safe={0}\u3092{1}\u306B\u5B89\u5168\u306B\u30AD\u30E3\u30B9\u30C8\u3067\u304D\u307E\u305B\u3093
 
 # 0: type, 1: type
-compiler.err.instanceof.pattern.no.subtype=\u30D1\u30BF\u30FC\u30F3\u30FB\u30BF\u30A4\u30D7{0}\u306F\u5F0F\u30BF\u30A4\u30D7{1}\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3059
+compiler.err.instanceof.pattern.no.subtype=\u5F0F\u30BF\u30A4\u30D7{0}\u306F\u30D1\u30BF\u30FC\u30F3\u30FB\u30BF\u30A4\u30D7{1}\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3059
 
 # 0: symbol
 compiler.misc.varargs.trustme.on.non.varargs.meth=\u30E1\u30BD\u30C3\u30C9{0}\u306F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
@@ -1073,12 +1092,12 @@ compiler.err.locn.invalid.arg.for.xpatch=--patch-module\u30AA\u30D7\u30B7\u30E7\
 
 compiler.err.file.sb.on.source.or.patch.path.for.module=\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3001\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30C1\u30FB\u30D1\u30B9\u306B\u5B58\u5728\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
+compiler.err.no.java.lang=\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30AF\u30E9\u30B9\u3067\u30D1\u30C3\u30B1\u30FC\u30B8java.lang\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
+
 #####
 
 # Fatal Errors
 
-compiler.misc.fatal.err.no.java.lang=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30AF\u30E9\u30B9\u30D1\u30B9\u307E\u305F\u306F\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u3067\u30D1\u30C3\u30B1\u30FC\u30B8java.lang\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
-
 # 0: name
 compiler.misc.fatal.err.cant.locate.meth=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30E1\u30BD\u30C3\u30C9{0}\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
 
@@ -1168,19 +1187,21 @@ compiler.note.unchecked.filename.additional={0}\u306B\u672A\u30C1\u30A7\u30C3\u3
 
 compiler.note.unchecked.plural.additional=\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u64CD\u4F5C\u306E\u3046\u3061\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u306A\u3044\u3082\u306E\u304C\u3055\u3089\u306B\u3042\u308A\u307E\u3059\u3002
 
-# 0: file name
-compiler.note.preview.filename={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: file name, 1: source
+compiler.note.preview.filename={0}\u306FJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
-compiler.note.preview.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: source
+compiler.note.preview.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306FJava SE {0}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 # The following string may appear after one of the above deprecation
 # messages.
 compiler.note.preview.recompile=\u8A73\u7D30\u306F\u3001-Xlint:preview\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-# 0: file name
-compiler.note.preview.filename.additional={0}\u306F\u8FFD\u52A0\u3067\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: file name, 1: source
+compiler.note.preview.filename.additional={0}\u306BJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u8FFD\u52A0\u4F7F\u7528\u304C\u3042\u308A\u307E\u3059\u3002
 
-compiler.note.preview.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u8FFD\u52A0\u3067\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: source
+compiler.note.preview.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306FJava SE {0}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u8FFD\u52A0\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 # Notes related to annotation processing
 
@@ -1269,6 +1290,8 @@ compiler.warn.dir.path.element.not.directory=\u4E0D\u6B63\u306A\u30D1\u30B9\u898
 # 0: symbol, 1: symbol, 2: symbol
 compiler.warn.missing-explicit-ctor=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8{1}\u306E\u30AF\u30E9\u30B9{0}\u306F\u660E\u793A\u7684\u306A\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u5BA3\u8A00\u3057\u306A\u3044\u305F\u3081\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306E\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306B\u516C\u958B\u3057\u307E\u3059
 
+compiler.warn.strictfp=\u30EA\u30EA\u30FC\u30B917\u4EE5\u964D\u3001\u3059\u3079\u3066\u306E\u6D6E\u52D5\u5C0F\u6570\u70B9\u5F0F\u306F\u53B3\u5BC6\u306B\u8A55\u4FA1\u3055\u308C\u3001''strictfp''\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
+
 compiler.warn.finally.cannot.complete=finally\u7BC0\u304C\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093
 
 # 0: name
@@ -1284,10 +1307,13 @@ compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u30
 compiler.warn.has.been.deprecated.for.removal={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u3066\u304A\u3089\u305A\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u3066\u3044\u307E\u3059
 
 # 0: symbol
-compiler.warn.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u4E00\u90E8\u3067\u3042\u308BAPI\u3067\u3059
+compiler.warn.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 
 # 0: symbol
-compiler.err.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u4E00\u90E8\u3067\u3042\u308BAPI\u3067\u3059
+compiler.err.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n(\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F--enable-preview\u3092\u4F7F\u7528\u3057\u307E\u3059)
+
+# 0: symbol
+compiler.warn.is.preview.reflective={0}\u306F\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 
 # 0: symbol
 compiler.warn.has.been.deprecated.module=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093
@@ -1303,6 +1329,11 @@ compiler.warn.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57\u306F\u3001\u30
 # 0: symbol
 compiler.warn.improper.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Bstatic final\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
+compiler.warn.improper.SPF=serialPersistentFields\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001private static final\u3068\u3057\u3066\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+compiler.warn.SPF.null.init=null\u306B\u521D\u671F\u5316\u3059\u308B\u3068serialPersistentFields\u306F\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u306A\u3044\u3053\u3068\u3092\u793A\u3059\u306B\u306F\u3001\u7A7A\u306E\u914D\u5217\u306B\u521D\u671F\u5316\u3057\u307E\u3059
+
+
 # 0: type, 1: type
 compiler.warn.inexact.non-varargs.call=\u6700\u7D42\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u4E0D\u6B63\u78BA\u306A\u5F15\u6570\u578B\u3092\u6301\u3063\u305F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306E\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u3002\n\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{0}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u307E\u3059\u3002\n\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059
 
@@ -1315,9 +1346,67 @@ compiler.warn.unreachable.catch.1=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304
 # 0: symbol
 compiler.warn.long.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Elong\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
+compiler.warn.OSF.array.SPF=serialPersistentFields\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30BF\u30A4\u30D7\u3092java.io.ObjectStreamField[]\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
 # 0: symbol
 compiler.warn.missing.SVUID=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9{0}\u306B\u306F\u3001serialVersionUID\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 
+# 0: name
+compiler.warn.serializable.missing.access.no.arg.ctor=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u4E0D\u53EF\u306E\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9{0}\u3067\u5F15\u6570\u306A\u3057\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+
+# 0: name
+compiler.warn.serial.method.not.private=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306Fprivate\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+
+# 0: name
+compiler.warn.serial.concrete.instance.method=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001concrete\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002abstract\u3067\u3082static\u3067\u3082\u3042\u308A\u307E\u305B\u3093
+
+# 0: name
+compiler.warn.serial.method.static=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u304Cstatic\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u304B\u308F\u308A\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+# 0: name
+compiler.warn.serial.method.no.args=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044
+
+# 0: name, 1: number
+compiler.warn.serial.method.one.arg=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306B\u3001{1}\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u306A\u304F\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30921\u3064\u306E\u307F\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.parameter.type=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306E1\u3064\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3001\u578B{2}\u3067\u306F\u306A\u304F\u3001\u578B{1}\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.unexpected.return.type=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u3001\u5FC5\u8981\u306A\u578B{2}\u3067\u306F\u306A\u304F\u3001{1}\u306E\u623B\u308A\u578B\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u3088\u3046\u306B\u3001\u30E1\u30BD\u30C3\u30C9\u306F\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u304C\u7121\u52B9\u306B\u306A\u308A\u307E\u3059
+
+# 0: name, 1: type
+compiler.warn.serial.method.unexpected.exception=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u4E88\u671F\u3057\u306A\u3044\u578B{1}\u3092\u30B9\u30ED\u30FC\u3059\u308B\u3088\u3046\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+
+compiler.warn.ineffectual.serial.field.interface=serialPersistentFields\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+# 0: string
+compiler.warn.ineffectual.serial.field.enum=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30D5\u30A3\u30FC\u30EB\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+# 0: string
+compiler.warn.ineffectual.serial.method.enum=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+compiler.warn.ineffectual.serial.field.record=serialPersistentFields\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+# 0: string
+compiler.warn.ineffectual.serial.method.record=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+# 0: name
+compiler.warn.ineffectual.serial.method.externalizable=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+compiler.warn.externalizable.missing.public.no.arg.ctor=\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306B\u306F\u5F15\u6570\u306A\u3057\u3067\u30D1\u30D6\u30EA\u30C3\u30AF\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u5FC5\u8981\u3067\u3059
+
+compiler.warn.non.serializable.instance.field=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306E\u5E38\u99D0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u76F4\u5217\u4E0D\u53EF\u30BF\u30A4\u30D7\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+
+# 0: type
+compiler.warn.non.serializable.instance.field.array=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306E\u5E38\u99D0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u76F4\u5217\u4E0D\u53EF\u306E\u30D9\u30FC\u30B9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7{0}\u3092\u6301\u3064\u914D\u5217\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+
+compiler.warn.non.private.method.weaker.access=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067private\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u305F\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9\u306B\u3088\u3063\u3066\u3001\n\u305D\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u30AF\u30E9\u30B9\u304C\u30E1\u30BD\u30C3\u30C9\u3092private\u3068\u3057\u3066\u5BA3\u8A00\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059
+
+compiler.warn.default.ineffective=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u30AF\u30E9\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u305F\u3081\u306E\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u3067\u5B9F\u884C\u3055\u308C\u307E\u305B\u3093
+
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.warn.potentially.ambiguous.overload={1}\u5185\u306E{0}\u306F{3}\u5185\u306E{2}\u3068\u77DB\u76FE\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
 
@@ -1404,7 +1493,7 @@ compiler.warn.proc.suspicious.class.name=\u540D\u524D\u304C{1}\u3067\u7D42\u308F
 compiler.warn.proc.file.create.last.round=\u6700\u5F8C\u306B\u4F5C\u6210\u3055\u308C\u305F\u30BF\u30A4\u30D7''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u6CE8\u91C8\u51E6\u7406\u306B\u6E21\u3055\u308C\u307E\u305B\u3093\u3002
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u304C\u8FD4\u3057\u305F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u6CE8\u91C8\u578B\u306E\u6587\u5B57\u5217''{0}''\u304C\u4E0D\u6B63\u3067\u3059
+compiler.warn.proc.malformed.supported.string=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u304C\u8FD4\u3057\u305F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6587\u5B57\u5217''{0}''\u304C\u4E0D\u6B63\u3067\u3059
 
 # 0: set of string
 compiler.warn.proc.annotations.without.processors=\u3053\u308C\u3089\u306E\u6CE8\u91C8\u3092\u8981\u6C42\u3059\u308B\u30D7\u30ED\u30BB\u30C3\u30B5\u306F\u3042\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}
@@ -1416,10 +1505,10 @@ compiler.warn.proc.processor.incompatible.source.version=\u6CE8\u91C8\u30D7\u30E
 compiler.warn.proc.duplicate.option.name=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u6CE8\u91C8\u578B''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
+compiler.warn.proc.duplicate.supported.annotation=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306F''*''\u3068\u4ED6\u306E\u6CE8\u91C8\u578B\u3092\u91CD\u8907\u3057\u3066\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
+compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306F''*''\u3068\u4ED6\u306E\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u91CD\u8907\u3057\u3066\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
 
 compiler.warn.proc.proc-only.requested.no.procs=\u30B3\u30F3\u30D1\u30A4\u30EB\u306A\u3057\u306E\u6CE8\u91C8\u51E6\u7406\u304C\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 
@@ -1475,6 +1564,8 @@ compiler.warn.deprecated.annotation.has.no.effect=@Deprecated\u6CE8\u91C8\u306F\
 # 0: string
 compiler.warn.invalid.path=\u30D5\u30A1\u30A4\u30EB\u540D\u304C\u7121\u52B9\u3067\u3059: {0}
 
+compiler.warn.doclint.not.available=\u4F7F\u7528\u53EF\u80FD\u306Adoclint\u306E\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u306F\u3042\u308A\u307E\u305B\u3093
+
 # 0: string
 compiler.err.invalid.path=\u30D5\u30A1\u30A4\u30EB\u540D\u304C\u7121\u52B9\u3067\u3059: {0}
 
@@ -1577,8 +1668,6 @@ compiler.err.enum.constant.expected=\u3053\u3053\u306B\u5217\u6319\u578B\u5B9A\u
 compiler.err.enum.constant.not.expected=\u3053\u3053\u306B\u5217\u6319\u578B\u5B9A\u6570\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
 
 ## The following are related in form, but do not easily fit the above paradigm.
-compiler.err.expected.module=''\u30E2\u30B8\u30E5\u30FC\u30EB''\u304C\u5FC5\u8981\u3067\u3059
-
 compiler.err.expected.module.or.open=''\u30E2\u30B8\u30E5\u30FC\u30EB''\u307E\u305F\u306F''\u30AA\u30FC\u30D7\u30F3''\u304C\u5FC5\u8981\u3067\u3059
 
 compiler.err.dot.class.expected=''.class''\u304C\u3042\u308A\u307E\u305B\u3093
@@ -2103,6 +2192,10 @@ compiler.misc.feature.records=\u30EC\u30B3\u30FC\u30C9
 
 compiler.misc.feature.sealed.classes=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
 
+compiler.misc.feature.case.null=switch case\u306Enull
+
+compiler.misc.feature.pattern.switch=switch\u6587\u306E\u30D1\u30BF\u30FC\u30F3
+
 compiler.warn.underscore.as.identifier=\u30EA\u30EA\u30FC\u30B99\u304B\u3089''_''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.underscore.as.identifier=\u30EA\u30EA\u30FC\u30B99\u304B\u3089''_''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
@@ -2174,6 +2267,28 @@ compiler.note.deferred.method.inst=\u30E1\u30BD\u30C3\u30C9{0}\u306E\u9045\u5EF6
 # 0: symbol
 compiler.note.verbose.l2m.deduplicate=\u91CD\u8907\u9664\u5916\u30E9\u30E0\u30C0\u5B9F\u88C5\u30E1\u30BD\u30C3\u30C9{0}
 
+########################################
+# Diagnostics for method reference search
+# results used by Resolve (debug only)
+########################################
+
+# 0: fragment, 1: string, 2: number
+compiler.note.method.ref.search.results.multi={1}\u306E{0}\u306E\u691C\u7D22\u7D50\u679C(\u6700\u3082\u53B3\u5BC6\u306A\u3082\u306E{2}\u500B)\n\u4F7F\u7528\u53EF\u80FD\u306A\u5019\u88DC:
+
+# 0: number, 1: fragment, 2: symbol
+compiler.misc.applicable.method.found.2=\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C#{0}\u500B\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} {2}
+
+# 0: number, 1: fragment, 2: symbol, 3: message segment
+compiler.misc.applicable.method.found.3=\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C#{0}\u500B\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} {2}\n({3})
+
+compiler.misc.static=static
+
+compiler.misc.non.static=static\u3067\u306A\u3044
+
+compiler.misc.bound=\u30D0\u30A4\u30F3\u30C9
+
+compiler.misc.unbound=\u30D0\u30A4\u30F3\u30C9\u306A\u3057
+
 ########################################
 # Diagnostics for where clause implementation
 # used by the RichDiagnosticFormatter.
@@ -2260,7 +2375,7 @@ compiler.err.dc.no.tag.name='@'\u306E\u5F8C\u306B\u30BF\u30B0\u540D\u304C\u3042\
 
 compiler.err.dc.gt.expected=''>''\u304C\u5FC5\u8981\u3067\u3059
 
-compiler.err.dc.ref.bad.parens=\u53C2\u7167\u306B'')''\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.dc.ref.bad.parens=\u30AB\u30C3\u30B3\u306E\u5F8C\u306E\u4E88\u671F\u3057\u306A\u3044\u30C6\u30AD\u30B9\u30C8\u3067\u3059
 
 compiler.err.dc.ref.syntax.error=\u53C2\u7167\u306B\u69CB\u6587\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059
 
@@ -2274,6 +2389,8 @@ compiler.err.dc.unterminated.signature=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u7D4
 
 compiler.err.dc.unterminated.string=\u6587\u5B57\u5217\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
 
+compiler.err.dc.ref.annotations.not.allowed=\u6CE8\u91C8\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+
 ###
 # errors related to modules
 
@@ -2450,8 +2567,6 @@ compiler.err.illegal.argument.for.option={0}\u306E\u5F15\u6570\u304C\u4E0D\u6B63
 
 compiler.err.match.binding.exists=\u65E2\u5B58\u306E\u4E00\u81F4\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u518D\u5B9A\u7FA9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.switch.null.not.allowed=case\u306Enull\u30E9\u30D9\u30EB\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
-
 compiler.err.switch.case.unexpected.statement=case\u306E\u4E88\u671F\u3057\u306A\u3044\u6587\u3067\u3059\u3002\u4E88\u671F\u3055\u308C\u308B\u306E\u306F\u3001\u5F0F\u3001\u30D6\u30ED\u30C3\u30AF\u307E\u305F\u306Fthrow\u6587\u3067\u3059
 
 compiler.err.switch.mixing.case.types=switch\u3067case\u306E\u7570\u306A\u308B\u7A2E\u985E\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
@@ -2664,5 +2779,7 @@ compiler.err.preview.not.latest=--enable-preview\u304C\u6307\u5B9A\u3055\u308C\u
 
 compiler.err.preview.without.source.or.release=--enable-preview\u306F-source\u307E\u305F\u306F--release\u3068\u3068\u3082\u306B\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5024\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u540C\u671F\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
+# 0: kind name, 1: symbol
+compiler.warn.declared.using.preview={0} {1}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u304A\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5024\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u540C\u671F\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
index 3c6e2ca34d3..01c92e9e0b3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
@@ -119,7 +119,7 @@ compiler.err.annotation.missing.default.value.1=\u5BF9\u4E8E\u5143\u7D20{1}, \u6
 # 0: type
 compiler.err.annotation.not.valid.for.type=\u6CE8\u91CA\u5BF9\u4E8E\u7C7B\u578B{0}\u7684\u5143\u7D20\u65E0\u6548
 
-compiler.err.annotation.type.not.applicable=\u6CE8\u91CA\u7C7B\u578B\u4E0D\u9002\u7528\u4E8E\u8BE5\u7C7B\u578B\u7684\u58F0\u660E
+compiler.err.annotation.type.not.applicable=\u6CE8\u91CA\u63A5\u53E3\u4E0D\u9002\u7528\u4E8E\u6B64\u7C7B\u578B\u7684\u58F0\u660E
 
 # 0: type
 compiler.err.annotation.type.not.applicable.to.type=\u6CE8\u91CA @{0} \u5728\u6B64\u7C7B\u578B\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u9002\u7528
@@ -263,12 +263,14 @@ compiler.misc.lambda=lambda \u8868\u8FBE\u5F0F
 
 compiler.misc.inner.cls=\u5185\u90E8\u7C7B
 
+compiler.misc.guard=\u536B\u58EB
+
 # 0: type
 compiler.err.cant.deref=\u65E0\u6CD5\u53D6\u6D88\u5F15\u7528{0}
 
 compiler.err.cant.extend.intf.annotation=\u5BF9\u4E8E @interfaces, \u4E0D\u5141\u8BB8 ''extends''
 
-compiler.err.annotation.decl.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
+compiler.err.annotation.decl.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E
 
 # 0: symbol
 compiler.err.cant.inherit.from.final=\u65E0\u6CD5\u4ECE\u6700\u7EC8{0}\u8FDB\u884C\u7EE7\u627F
@@ -307,7 +309,7 @@ compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B\u3002
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
 compiler.err.concrete.inheritance.conflict={1}\u4E2D\u7684\u65B9\u6CD5{0}\u548C{3}\u4E2D\u7684\u65B9\u6CD5{2}\u662F\u4F7F\u7528\u76F8\u540C\u7684\u7B7E\u540D\u7EE7\u627F\u7684
 
-compiler.err.default.allowed.in.intf.annotation.member=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
+compiler.err.default.allowed.in.intf.annotation.member=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
 
 # 0: symbol
 compiler.err.doesnt.exist=\u7A0B\u5E8F\u5305{0}\u4E0D\u5B58\u5728
@@ -319,7 +321,7 @@ compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91CA{0}\u4E0D\u662F\u
 compiler.err.duplicate.annotation.member.value=\u6CE8\u91CA@{1}\u4E2D\u7684\u5143\u7D20 ''{0}'' \u91CD\u590D\u3002
 
 # 0: type
-compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B
+compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6CE8\u91CA\u63A5\u53E3
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation=\u6CE8\u91CA\u91CD\u590D: \u4F7F\u7528\u65E0\u6548\u7684 @Repeatable \u6CE8\u91CA\u5BF9{0}\u8FDB\u884C\u4E86\u6CE8\u91CA
@@ -334,22 +336,22 @@ compiler.err.invalid.repeatable.annotation.multiple.values={0}\u4E0D\u662F\u6709
 compiler.err.invalid.repeatable.annotation.invalid.value={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable: \u503C\u5143\u7D20\u65E0\u6548
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5FC5\u987B\u58F0\u660E\u7C7B\u578B{2}\u7684\u540D\u4E3A ''value'' \u7684\u5143\u7D20
+compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5FC5\u987B\u58F0\u660E\u7C7B\u578B {2} \u7684\u540D\u4E3A ''value'' \u7684\u5143\u7D20
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5BF9\u4E8E\u5143\u7D20 {1}, \u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u6CA1\u6709\u9ED8\u8BA4\u503C
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u6CA1\u6709\u5143\u7D20 {1} \u7684\u9ED8\u8BA4\u503C
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u7684\u4FDD\u7559\u671F\u77ED\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({2}) \u7684\u4FDD\u7559\u671F
+compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u7684\u4FDD\u7559\u671F\u77ED\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({2}) \u7684\u4FDD\u7559\u671F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1}) \u662F @Documented, \u800C\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5219\u4E0D\u662F
+compiler.err.invalid.repeatable.annotation.not.documented=\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1}) \u662F @Documented\uFF0C\u800C\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5219\u4E0D\u662F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1}) \u662F @Inherited, \u800C\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5219\u4E0D\u662F
+compiler.err.invalid.repeatable.annotation.not.inherited=\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1}) \u662F @Inherited\uFF0C\u800C\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5219\u4E0D\u662F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u9002\u7528\u7684\u76EE\u6807\u591A\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1})
+compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u9002\u7528\u7684\u76EE\u6807\u591A\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1})
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u5BB9\u5668 {0} \u4E0D\u5F97\u4E0E\u5176\u5305\u542B\u7684\u5143\u7D20\u540C\u65F6\u5B58\u5728
@@ -368,8 +370,21 @@ compiler.err.same.binary.name=\u7C7B\uFF1A{0} \u548C {1} \u5177\u6709\u76F8\u540
 
 compiler.err.duplicate.case.label=case \u6807\u7B7E\u91CD\u590D
 
+compiler.err.pattern.dominated=\u6B64 case \u6807\u7B7E\u7531\u524D\u4E00\u4E2A case \u6807\u7B7E\u652F\u914D
+
 compiler.err.duplicate.default.label=default \u6807\u7B7E\u91CD\u590D
 
+compiler.err.duplicate.total.pattern=\u603B\u8BA1\u6A21\u5F0F\u91CD\u590D
+
+compiler.err.total.pattern.and.default=switch \u6709\u4E00\u4E2A\u603B\u8BA1\u6A21\u5F0F\u548C\u4E00\u4E2A\u9ED8\u8BA4\u6807\u7B7E
+
+# 0: type, 1: type
+compiler.err.constant.label.not.compatible={0} \u7C7B\u578B\u7684\u5E38\u91CF\u6807\u7B7E\u4E0E switch \u9009\u62E9\u5668\u7C7B\u578B {1} \u4E0D\u517C\u5BB9
+
+compiler.err.flows.through.to.pattern=\u8D2F\u7A7F (fall-through) \u5230\u6A21\u5F0F\u975E\u6CD5
+
+compiler.err.flows.through.from.pattern=\u4ECE\u6A21\u5F0F\u8D2F\u7A7F (fall-through) \u975E\u6CD5
+
 compiler.err.else.without.if=\u6709 ''if'', \u4F46\u662F\u6CA1\u6709 ''else''
 
 compiler.err.empty.char.lit=\u7A7A\u5B57\u7B26\u6587\u5B57
@@ -379,13 +394,13 @@ compiler.err.encl.class.required=\u9700\u8981\u5305\u542B{0}\u7684\u5C01\u95ED\u
 
 compiler.err.enum.annotation.must.be.enum.constant=\u679A\u4E3E\u6CE8\u91CA\u503C\u5FC5\u987B\u662F\u679A\u4E3E\u5E38\u91CF
 
-compiler.err.enum.cant.be.instantiated=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u679A\u4E3E\u7C7B\u578B
+compiler.err.enum.cant.be.instantiated=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u679A\u4E3E\u7C7B
 
 compiler.err.enum.label.must.be.unqualified.enum=\u679A\u4E3E switch case \u6807\u7B7E\u5FC5\u987B\u4E3A\u679A\u4E3E\u5E38\u91CF\u7684\u975E\u9650\u5B9A\u540D\u79F0
 
 compiler.err.enum.no.subclassing=\u7C7B\u65E0\u6CD5\u76F4\u63A5\u6269\u5C55 java.lang.Enum
 
-compiler.err.enum.types.not.extensible=\u679A\u4E3E\u7C7B\u578B\u4E0D\u53EF\u7EE7\u627F
+compiler.err.enum.types.not.extensible=\u679A\u4E3E\u7C7B\u4E0D\u53EF\u6269\u5C55
 
 compiler.err.enum.no.finalize=\u679A\u4E3E\u4E0D\u80FD\u6709 finalize \u65B9\u6CD5
 
@@ -415,9 +430,9 @@ compiler.err.finally.without.try=\u6709 ''finally'', \u4F46\u662F\u6CA1\u6709 ''
 # 0: type, 1: message segment
 compiler.err.foreach.not.applicable.to.type=for-each \u4E0D\u9002\u7528\u4E8E\u8868\u8FBE\u5F0F\u7C7B\u578B\n\u8981\u6C42: {1}\n\u627E\u5230:    {0}
 
-compiler.err.fp.number.too.large=\u6D6E\u70B9\u6570\u8FC7\u5927
+compiler.err.fp.number.too.large=\u6D6E\u70B9\u6570\u592A\u5927
 
-compiler.err.fp.number.too.small=\u6D6E\u70B9\u6570\u8FC7\u5C0F
+compiler.err.fp.number.too.small=\u6D6E\u70B9\u6570\u592A\u5C0F
 
 compiler.err.generic.array.creation=\u521B\u5EFA\u6CDB\u578B\u6570\u7EC4
 
@@ -495,21 +510,21 @@ compiler.err.incomparable.types=\u4E0D\u53EF\u6BD4\u8F83\u7684\u7C7B\u578B: {0}\
 # 0: string
 compiler.err.int.number.too.large=\u6574\u6570\u592A\u5927
 
-compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u65E0\u6CD5\u58F0\u660E\u5F62\u53C2
+compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u65E0\u6CD5\u58F0\u660E\u5F62\u53C2
 
 # 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
+compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91CA\u63A5\u53E3 {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
 
-compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
+compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
 
 # 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=\u6CE8\u91CA\u7C7B\u578B{1}\u58F0\u660E\u4E0E\u65B9\u6CD5 {0} \u540C\u540D\u7684\u5143\u7D20
+compiler.err.intf.annotation.member.clash=\u6CE8\u91CA\u63A5\u53E3 {1} \u58F0\u660E\u7684\u5143\u7D20\u4E0E\u65B9\u6CD5 {0} \u540C\u540D
 
 compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3
 
 compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53
 
-compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20\u7684\u7C7B\u578B\u65E0\u6548
+compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20\u7684\u7C7B\u578B\u65E0\u6548
 
 compiler.err.invalid.binary.number=\u4E8C\u8FDB\u5236\u6570\u5B57\u4E2D\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u4E8C\u8FDB\u5236\u6570
 
@@ -535,7 +550,7 @@ compiler.err.label.already.in.use=\u6807\u7B7E{0}\u5DF2\u4F7F\u7528
 # 0: symbol
 compiler.err.local.var.accessed.from.icls.needs.final=\u4ECE\u5185\u90E8\u7C7B\u4E2D\u8BBF\u95EE\u672C\u5730\u53D8\u91CF{0}; \u9700\u8981\u88AB\u58F0\u660E\u4E3A\u6700\u7EC8\u7C7B\u578B
 
-compiler.err.local.enum=\u679A\u4E3E\u7C7B\u578B\u4E0D\u80FD\u4E3A\u672C\u5730\u7C7B\u578B
+compiler.err.local.enum=\u679A\u4E3E\u7C7B\u4E0D\u80FD\u4E3A\u672C\u5730\u7C7B
 
 compiler.err.cannot.create.array.with.type.arguments=\u65E0\u6CD5\u521B\u5EFA\u5177\u6709\u7C7B\u578B\u53D8\u91CF\u7684\u6570\u7EC4
 
@@ -649,7 +664,7 @@ compiler.err.no.intf.expected.here=\u6B64\u5904\u4E0D\u9700\u8981\u63A5\u53E3
 compiler.err.no.match.entry={0}\u5728{1}\u7684\u6761\u76EE\u4E2D\u6CA1\u6709\u5339\u914D\u9879; \u9700\u8981{2}
 
 # 0: type
-compiler.err.not.annotation.type={0}\u4E0D\u662F\u6CE8\u91CA\u7C7B\u578B
+compiler.err.not.annotation.type={0} \u4E0D\u662F\u6CE8\u91CA\u63A5\u53E3
 
 # 0: symbol, 1: symbol, 2: message segment
 compiler.err.not.def.access.package.cant.access={0} \u4E0D\u53EF\u89C1\n({2})
@@ -836,6 +851,8 @@ compiler.err.static.imp.only.classes.and.interfaces=\u4EC5\u4ECE\u7C7B\u548C\u63
 
 compiler.err.string.const.req=\u9700\u8981\u5E38\u91CF\u5B57\u7B26\u4E32\u8868\u8FBE\u5F0F
 
+compiler.err.pattern.expected=\u9700\u8981\u7C7B\u578B\u6A21\u5F0F
+
 # 0: symbol, 1: fragment
 compiler.err.cannot.generate.class=\u751F\u6210\u7C7B {0} \u65F6\u51FA\u9519\n({1})
 
@@ -966,6 +983,8 @@ compiler.err.unreachable.stmt=\u65E0\u6CD5\u8BBF\u95EE\u7684\u8BED\u53E5
 
 compiler.err.not.exhaustive=switch \u8868\u8FBE\u5F0F\u4E0D\u5305\u542B\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C
 
+compiler.err.not.exhaustive.statement=\u5E76\u975E\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C\u90FD\u5305\u542B\u5728 switch \u8BED\u53E5\u4E2D
+
 compiler.err.initializer.must.be.able.to.complete.normally=\u521D\u59CB\u5316\u7A0B\u5E8F\u5FC5\u987B\u80FD\u591F\u6B63\u5E38\u5B8C\u6210
 
 compiler.err.initializer.not.allowed=\u63A5\u53E3\u4E2D\u4E0D\u5141\u8BB8\u6709\u521D\u59CB\u5316\u7A0B\u5E8F
@@ -1006,7 +1025,7 @@ compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs \u5143\u7D20\u7C7B\u5
 compiler.err.instanceof.reifiable.not.safe={0} \u65E0\u6CD5\u5B89\u5168\u5730\u8F6C\u6362\u4E3A {1}
 
 # 0: type, 1: type
-compiler.err.instanceof.pattern.no.subtype=\u6A21\u5F0F\u7C7B\u578B {0} \u662F\u8868\u8FBE\u5F0F\u7C7B\u578B {1} \u7684\u5B50\u7C7B\u578B
+compiler.err.instanceof.pattern.no.subtype=\u8868\u8FBE\u5F0F\u7C7B\u578B {0} \u662F\u6A21\u5F0F\u7C7B\u578B {1} \u7684\u5B50\u7C7B\u578B
 
 # 0: symbol
 compiler.misc.varargs.trustme.on.non.varargs.meth=\u65B9\u6CD5 {0} \u4E0D\u662F varargs \u65B9\u6CD5\u3002
@@ -1073,12 +1092,12 @@ compiler.err.locn.invalid.arg.for.xpatch=--patch-module \u9009\u9879\u7684\u53C2
 
 compiler.err.file.sb.on.source.or.patch.path.for.module=\u6587\u4EF6\u5E94\u5728\u6E90\u8DEF\u5F84\u6216\u6A21\u5757\u7684\u8865\u4E01\u7A0B\u5E8F\u8DEF\u5F84\u4E2D
 
+compiler.err.no.java.lang=\u5728\u5E73\u53F0\u7C7B\u4E2D\u627E\u4E0D\u5230\u7A0B\u5E8F\u5305 java.lang
+
 #####
 
 # Fatal Errors
 
-compiler.misc.fatal.err.no.java.lang=\u81F4\u547D\u9519\u8BEF: \u5728\u7C7B\u8DEF\u5F84\u6216\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u7A0B\u5E8F\u5305 java.lang
-
 # 0: name
 compiler.misc.fatal.err.cant.locate.meth=\u81F4\u547D\u9519\u8BEF: \u627E\u4E0D\u5230\u65B9\u6CD5{0}
 
@@ -1168,19 +1187,21 @@ compiler.note.unchecked.filename.additional={0}\u8FD8\u6709\u672A\u7ECF\u68C0\u6
 
 compiler.note.unchecked.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528\u4E86\u672A\u7ECF\u68C0\u67E5\u6216\u4E0D\u5B89\u5168\u7684\u64CD\u4F5C\u3002
 
-# 0: file name
-compiler.note.preview.filename={0} \u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
+# 0: file name, 1: source
+compiler.note.preview.filename={0} \u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
 
-compiler.note.preview.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
+# 0: source
+compiler.note.preview.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528 Java SE {0} \u7684\u9884\u89C8\u529F\u80FD\u3002
 
 # The following string may appear after one of the above deprecation
 # messages.
 compiler.note.preview.recompile=\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u4F7F\u7528 -Xlint:preview \u91CD\u65B0\u7F16\u8BD1\u3002
 
-# 0: file name
-compiler.note.preview.filename.additional={0} \u8FD8\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
+# 0: file name, 1: source
+compiler.note.preview.filename.additional={0} \u8FD8\u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
 
-compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
+# 0: source
+compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528 Java SE {0} \u7684\u9884\u89C8\u529F\u80FD\u3002
 
 # Notes related to annotation processing
 
@@ -1269,6 +1290,8 @@ compiler.warn.dir.path.element.not.directory=\u9519\u8BEF\u7684\u8DEF\u5F84\u514
 # 0: symbol, 1: symbol, 2: symbol
 compiler.warn.missing-explicit-ctor=\u5BFC\u51FA\u7684\u7A0B\u5E8F\u5305 {1} \u4E2D\u7684\u7C7B {0} \u672A\u58F0\u660E\u663E\u5F0F\u6784\u9020\u5668\uFF0C\u56E0\u6B64\u5C06\u5411\u6A21\u5757 {2} \u7684\u5BA2\u6237\u673A\u516C\u5F00\u9ED8\u8BA4\u6784\u9020\u5668
 
+compiler.warn.strictfp=\u4ECE\u53D1\u884C\u7248 17 \u5F00\u59CB\uFF0C\u6240\u6709\u6D6E\u70B9\u8868\u8FBE\u5F0F\u90FD\u7ECF\u8FC7\u4E25\u683C\u8BA1\u7B97\uFF0C\u4E0D\u9700\u8981 ''strictfp''
+
 compiler.warn.finally.cannot.complete=finally \u5B50\u53E5\u65E0\u6CD5\u6B63\u5E38\u5B8C\u6210
 
 # 0: name
@@ -1284,10 +1307,13 @@ compiler.warn.has.been.deprecated={1}\u4E2D\u7684{0}\u5DF2\u8FC7\u65F6
 compiler.warn.has.been.deprecated.for.removal={1} \u4E2D\u7684 {0} \u5DF2\u8FC7\u65F6, \u4E14\u6807\u8BB0\u4E3A\u5F85\u5220\u9664
 
 # 0: symbol
-compiler.warn.is.preview={0} \u662F\u67D0\u9884\u89C8\u529F\u80FD\u4E2D\u7684\u4E00\u4E2A API
+compiler.warn.is.preview={0} \u662F\u9884\u89C8 API\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
 
 # 0: symbol
-compiler.err.is.preview={0} \u662F\u67D0\u9884\u89C8\u529F\u80FD\u4E2D\u7684\u4E00\u4E2A API
+compiler.err.is.preview={0} \u662F\u9884\u89C8 API\uFF0C\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5904\u4E8E\u7981\u7528\u72B6\u6001\u3002\n\uFF08\u8BF7\u4F7F\u7528 --enable-preview \u4EE5\u542F\u7528\u9884\u89C8 API\uFF09
+
+# 0: symbol
+compiler.warn.is.preview.reflective={0} \u662F\u53CD\u5C04\u9884\u89C8 API\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
 
 # 0: symbol
 compiler.warn.has.been.deprecated.module=\u6A21\u5757 {0} \u5DF2\u8FC7\u65F6
@@ -1303,6 +1329,11 @@ compiler.warn.illegal.char.for.encoding=\u7F16\u7801{0}\u7684\u4E0D\u53EF\u6620\
 # 0: symbol
 compiler.warn.improper.SVUID=\u5FC5\u987B\u5728\u7C7B{0}\u4E2D\u5C06 serialVersionUID \u58F0\u660E\u4E3A static final
 
+compiler.warn.improper.SPF=serialPersistentFields \u5FC5\u987B\u58F0\u660E\u4E3A private static final \u624D\u80FD\u751F\u6548
+
+compiler.warn.SPF.null.init=serialPersistentFields \u5982\u679C\u521D\u59CB\u5316\u4E3A\u7A7A\u503C\uFF0C\u5219\u65E0\u6548\u3002\n\u8BF7\u521D\u59CB\u5316\u4E3A\u7A7A\u6570\u7EC4\u4EE5\u6307\u793A\u6CA1\u6709\u5B57\u6BB5
+
+
 # 0: type, 1: type
 compiler.warn.inexact.non-varargs.call=\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u4F7F\u7528\u4E86\u4E0D\u51C6\u786E\u7684\u53D8\u91CF\u7C7B\u578B\u7684 varargs \u65B9\u6CD5\u7684\u975E varargs \u8C03\u7528; \n\u5BF9\u4E8E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {0}\n\u5BF9\u4E8E\u975E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {1}, \u8FD9\u6837\u4E5F\u53EF\u4EE5\u6291\u5236\u6B64\u8B66\u544A
 
@@ -1315,9 +1346,67 @@ compiler.warn.unreachable.catch.1=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u
 # 0: symbol
 compiler.warn.long.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F long \u7C7B\u578B
 
+compiler.warn.OSF.array.SPF=serialPersistentFields \u7684\u7C7B\u578B\u5FC5\u987B\u4E3A java.io.ObjectStreamField[] \u624D\u80FD\u751F\u6548
+
 # 0: symbol
 compiler.warn.missing.SVUID=\u53EF\u5E8F\u5217\u5316\u7C7B{0}\u6CA1\u6709 serialVersionUID \u7684\u5B9A\u4E49
 
+# 0: name
+compiler.warn.serializable.missing.access.no.arg.ctor=\u65E0\u6CD5\u8BBF\u95EE\u7B2C\u4E00\u4E2A\u4E0D\u53EF\u5E8F\u5217\u5316\u8D85\u7C7B {0} \u4E2D\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
+
+# 0: name
+compiler.warn.serial.method.not.private=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u672A\u58F0\u660E\u4E3A private
+
+# 0: name
+compiler.warn.serial.concrete.instance.method=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u662F\u5177\u4F53\u7684\u5B9E\u4F8B\u65B9\u6CD5\u624D\u80FD\u751F\u6548\uFF0C\u65E2\u4E0D\u80FD\u662F\u62BD\u8C61\u65B9\u6CD5\u4E5F\u4E0D\u80FD\u662F\u9759\u6001\u65B9\u6CD5
+
+# 0: name
+compiler.warn.serial.method.static=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u58F0\u660E\u4E3A static\uFF1B\u5FC5\u987B\u6539\u4E3A\u5B9E\u4F8B\u65B9\u6CD5\u624D\u80FD\u6709\u6548
+
+# 0: name
+compiler.warn.serial.method.no.args=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u6CA1\u6709\u53C2\u6570\u624D\u80FD\u751F\u6548
+
+# 0: name, 1: number
+compiler.warn.serial.method.one.arg=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u53EA\u6709\u4E00\u4E2A\u53C2\u6570\uFF08\u800C\u975E {1} \u4E2A\u53C2\u6570\uFF09\u624D\u80FD\u751F\u6548
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.parameter.type=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u7684\u552F\u4E00\u53C2\u6570\u7684\u7C7B\u578B\u5FC5\u987B\u4E3A {1}\uFF08\u800C\u975E {2}\uFF09\u624D\u80FD\u751F\u6548
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.unexpected.return.type=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u662F\u7528\u8FD4\u56DE\u7C7B\u578B {1}\uFF08\u800C\u4E0D\u662F\u9884\u671F\u7C7B\u578B {2}\uFF09\u58F0\u660E\u7684\u3002\n\u5982\u58F0\u660E\u7684\u90A3\u6837\uFF0C\u8BE5\u65B9\u6CD5\u5BF9\u5E8F\u5217\u5316\u65E0\u6548
+
+# 0: name, 1: type
+compiler.warn.serial.method.unexpected.exception=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u58F0\u660E\u4E3A\u629B\u51FA\u610F\u5916\u7C7B\u578B {1}
+
+compiler.warn.ineffectual.serial.field.interface=serialPersistentFields \u5728\u63A5\u53E3\u4E2D\u65E0\u6548
+
+# 0: string
+compiler.warn.ineffectual.serial.field.enum=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u5B57\u6BB5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
+
+# 0: string
+compiler.warn.ineffectual.serial.method.enum=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
+
+compiler.warn.ineffectual.serial.field.record=serialPersistentFields \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
+
+# 0: string
+compiler.warn.ineffectual.serial.method.record=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
+
+# 0: name
+compiler.warn.ineffectual.serial.method.externalizable=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u4E2D\u65E0\u6548
+
+compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields \u5728\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u4E2D\u65E0\u6548
+
+compiler.warn.externalizable.missing.public.no.arg.ctor=\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u9700\u8981\u4E00\u4E2A\u516C\u5171\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
+
+compiler.warn.non.serializable.instance.field=\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u975E\u77AC\u65F6\u5B9E\u4F8B\u5B57\u6BB5\u662F\u7528\u4E0D\u53EF\u5E8F\u5217\u5316\u7684\u7C7B\u578B\u58F0\u660E\u7684
+
+# 0: type
+compiler.warn.non.serializable.instance.field.array=\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u975E\u77AC\u65F6\u5B9E\u4F8B\u5B57\u6BB5\u662F\u7528\u5177\u6709\u4E0D\u53EF\u5E8F\u5217\u5316\u57FA\u672C\u7EC4\u4EF6\u7C7B\u578B {0} \u7684\u6570\u7EC4\u58F0\u660E\u7684
+
+compiler.warn.non.private.method.weaker.access=\u5728\u63A5\u53E3\u4E2D\u58F0\u660E\u4E3A non-private \u7684\u5E8F\u5217\u5316\u76F8\u5173\u65B9\u6CD5\u5C06\u963B\u6B62\n\u5B9E\u73B0\u63A5\u53E3\u7684\u7C7B\u5C06\u65B9\u6CD5\u58F0\u660E\u4E3A private
+
+compiler.warn.default.ineffective=\u5B9E\u73B0\u7C7B\u7684\u5E8F\u5217\u5316\u4E0D\u4F1A\u8FD0\u884C\u63A5\u53E3\u4E2D\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u9ED8\u8BA4\u65B9\u6CD5
+
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.warn.potentially.ambiguous.overload={1} \u4E2D\u7684 {0} \u53EF\u80FD\u4E0E {3} \u4E2D\u7684 {2} \u6DF7\u6DC6
 
@@ -1404,7 +1493,7 @@ compiler.warn.proc.suspicious.class.name=\u6B63\u5728\u4E3A\u540D\u79F0\u4EE5{1}
 compiler.warn.proc.file.create.last.round=\u5C06\u4E0D\u5BF9\u5728\u6700\u540E\u4E00\u4E2A\u5FAA\u73AF\u4E2D\u521B\u5EFA\u7684\u7C7B\u578B\u4E3A ''{0}'' \u7684\u6587\u4EF6\u8FDB\u884C\u6CE8\u91CA\u5904\u7406\u3002
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u4E3A\u652F\u6301\u7684\u6CE8\u91CA\u7C7B\u578B\u8FD4\u56DE\u683C\u5F0F\u9519\u8BEF\u7684\u5B57\u7B26\u4E32 ''{0}''
+compiler.warn.proc.malformed.supported.string=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u4E3A\u652F\u6301\u7684\u6CE8\u91CA\u63A5\u53E3\u8FD4\u56DE\u683C\u5F0F\u9519\u8BEF\u7684\u5B57\u7B26\u4E32 ''{0}''
 
 # 0: set of string
 compiler.warn.proc.annotations.without.processors=\u6CA1\u6709\u5904\u7406\u7A0B\u5E8F\u8981\u4F7F\u7528\u4EE5\u4E0B\u4EFB\u4F55\u6CE8\u91CA: {0}
@@ -1416,10 +1505,10 @@ compiler.warn.proc.processor.incompatible.source.version=\u6765\u81EA\u6CE8\u91C
 compiler.warn.proc.duplicate.option.name=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u652F\u6301\u7684\u9009\u9879 ''{0}''
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u652F\u6301\u7684\u6CE8\u91CA\u7C7B\u578B ''{0}''
+compiler.warn.proc.duplicate.supported.annotation=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u53D7\u652F\u6301\u6CE8\u91CA\u63A5\u53E3 ''{0}''
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' \u91CD\u590D\u652F\u6301 ''*'' \u548C\u5176\u4ED6\u6CE8\u91CA\u7C7B\u578B
+compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' \u91CD\u590D\u652F\u6301 ''*'' \u548C\u5176\u4ED6\u6CE8\u91CA\u63A5\u53E3
 
 compiler.warn.proc.proc-only.requested.no.procs=\u5728\u672A\u8BF7\u6C42\u7F16\u8BD1\u7684\u60C5\u51B5\u4E0B\u8FDB\u884C\u6CE8\u91CA\u5904\u7406, \u4F46\u627E\u4E0D\u5230\u5904\u7406\u7A0B\u5E8F\u3002
 
@@ -1475,6 +1564,8 @@ compiler.warn.deprecated.annotation.has.no.effect=@Deprecated \u6CE8\u91CA\u5BF9
 # 0: string
 compiler.warn.invalid.path=\u65E0\u6548\u6587\u4EF6\u540D: {0}
 
+compiler.warn.doclint.not.available=\u6CA1\u6709 doclint \u670D\u52A1\u63D0\u4F9B\u65B9\u53EF\u7528
+
 # 0: string
 compiler.err.invalid.path=\u65E0\u6548\u6587\u4EF6\u540D: {0}
 
@@ -1577,8 +1668,6 @@ compiler.err.enum.constant.expected=\u6B64\u5904\u9700\u8981\u679A\u4E3E\u5E38\u
 compiler.err.enum.constant.not.expected=\u6B64\u5904\u4E0D\u9700\u8981\u679A\u4E3E\u5E38\u91CF
 
 ## The following are related in form, but do not easily fit the above paradigm.
-compiler.err.expected.module=\u9700\u8981 ''module''
-
 compiler.err.expected.module.or.open=\u9700\u8981 ''module'' \u6216 ''open''
 
 compiler.err.dot.class.expected=\u9700\u8981 ''.class''
@@ -2103,6 +2192,10 @@ compiler.misc.feature.records=\u8BB0\u5F55
 
 compiler.misc.feature.sealed.classes=\u5BC6\u5C01\u7C7B
 
+compiler.misc.feature.case.null=switch case \u4E2D\u7684\u7A7A\u503C
+
+compiler.misc.feature.pattern.switch=switch \u8BED\u53E5\u4E2D\u7684\u6A21\u5F0F
+
 compiler.warn.underscore.as.identifier=\u4ECE\u53D1\u884C\u7248 9 \u5F00\u59CB, ''_'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
 
 compiler.err.underscore.as.identifier=\u4ECE\u53D1\u884C\u7248 9 \u5F00\u59CB, ''_'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
@@ -2174,6 +2267,28 @@ compiler.note.deferred.method.inst=\u65B9\u6CD5 {0} \u7684\u5EF6\u8FDF\u5B9E\u4F
 # 0: symbol
 compiler.note.verbose.l2m.deduplicate=\u6B63\u5728\u5BF9 lambda \u51FD\u6570\u5B9E\u73B0\u65B9\u6CD5 {0} \u8FDB\u884C\u91CD\u590D\u6570\u636E\u5220\u9664
 
+########################################
+# Diagnostics for method reference search
+# results used by Resolve (debug only)
+########################################
+
+# 0: fragment, 1: string, 2: number
+compiler.note.method.ref.search.results.multi={1} \u7684 {0} \u641C\u7D22\u7ED3\u679C\uFF0C\u6709 {2} \u4E2A\n\u6700\u660E\u786E\u7684\u9002\u7528\u5019\u9009\u9879\uFF1A
+
+# 0: number, 1: fragment, 2: symbol
+compiler.misc.applicable.method.found.2=\u627E\u5230\u7684\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5\uFF1A{1} {2}
+
+# 0: number, 1: fragment, 2: symbol, 3: message segment
+compiler.misc.applicable.method.found.3=\u627E\u5230\u7684\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5\uFF1A{1} {2}\n({3})
+
+compiler.misc.static=\u9759\u6001
+
+compiler.misc.non.static=\u975E\u9759\u6001
+
+compiler.misc.bound=\u7ED1\u5B9A
+
+compiler.misc.unbound=\u672A\u7ED1\u5B9A
+
 ########################################
 # Diagnostics for where clause implementation
 # used by the RichDiagnosticFormatter.
@@ -2260,7 +2375,7 @@ compiler.err.dc.no.tag.name='@' \u540E\u6CA1\u6709\u6807\u8BB0\u540D
 
 compiler.err.dc.gt.expected=\u9700\u8981 ''>''
 
-compiler.err.dc.ref.bad.parens=\u5F15\u7528\u4E2D\u7F3A\u5C11 '')''
+compiler.err.dc.ref.bad.parens=\u62EC\u53F7\u4E4B\u540E\u51FA\u73B0\u610F\u5916\u7684\u6587\u672C
 
 compiler.err.dc.ref.syntax.error=\u5F15\u7528\u4E2D\u51FA\u73B0\u8BED\u6CD5\u9519\u8BEF
 
@@ -2274,6 +2389,8 @@ compiler.err.dc.unterminated.signature=\u672A\u7EC8\u6B62\u7684\u7B7E\u540D
 
 compiler.err.dc.unterminated.string=\u672A\u7EC8\u6B62\u7684\u5B57\u7B26\u4E32
 
+compiler.err.dc.ref.annotations.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u6CE8\u91CA
+
 ###
 # errors related to modules
 
@@ -2450,8 +2567,6 @@ compiler.err.illegal.argument.for.option={0} \u7684\u53C2\u6570\u975E\u6CD5: {1}
 
 compiler.err.match.binding.exists=\u5C1D\u8BD5\u91CD\u65B0\u5B9A\u4E49\u73B0\u6709\u7684\u5339\u914D\u7ED1\u5B9A\uFF0C\u8FD9\u662F\u975E\u6CD5\u7684
 
-compiler.err.switch.null.not.allowed=case \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u7A7A\u6807\u7B7E
-
 compiler.err.switch.case.unexpected.statement=case \u4E2D\u5B58\u5728\u610F\u5916\u8BED\u53E5\uFF0C\u5E94\u4E3A\u8868\u8FBE\u5F0F\u3001\u5757\u6216\u629B\u51FA\u8BED\u53E5
 
 compiler.err.switch.mixing.case.types=\u5728 switch \u4E2D\u4F7F\u7528\u4E86\u4E0D\u540C case \u7C7B\u578B
@@ -2664,5 +2779,7 @@ compiler.err.preview.not.latest=\u6E90\u53D1\u884C\u7248 {0} \u4E0E --enable-pre
 
 compiler.err.preview.without.source.or.release=--enable-preview \u5FC5\u987B\u4E0E -source \u6216 --release \u4E00\u8D77\u4F7F\u7528
 
-compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5C1D\u8BD5\u5728\u57FA\u4E8E\u503C\u7684\u7C7B\u7684\u5B9E\u4F8B\u4E0A\u540C\u6B65
+# 0: kind name, 1: symbol
+compiler.warn.declared.using.preview={0} {1} \u662F\u4F7F\u7528\u9884\u89C8\u529F\u80FD\u58F0\u660E\u7684\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
 
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5C1D\u8BD5\u5728\u57FA\u4E8E\u503C\u7684\u7C7B\u7684\u5B9E\u4F8B\u4E0A\u540C\u6B65
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
new file mode 100644
index 00000000000..85b76234891
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
@@ -0,0 +1,228 @@
+#
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+## standard options
+
+javac.opt.g=Generiert alle Debugginginformationen
+javac.opt.g.none=Generiert keine Debugginginformationen
+javac.opt.g.lines.vars.source=Generiert nur einige Debugginginformationen
+javac.opt.nowarn=Generiert keine Warnungen
+javac.opt.verbose=Gibt Nachrichten zu den Compilervorg\u00E4ngen aus
+javac.opt.deprecation=Gibt Quellspeicherorte aus, wo veraltete APIs verwendet werden
+javac.opt.classpath=Gibt an, wo sich die Benutzerklassendateien und Annotationsprozessoren befinden
+javac.opt.modulepath=Gibt an, wo sich die Anwendungsmodule befinden
+javac.opt.sourcepath=Gibt an, wo sich die Eingabequelldateien befinden
+javac.opt.m=Kompiliert nur die angegebenen Module und pr\u00FCft die Zeitstempel
+javac.opt.modulesourcepath=Gib an, wo sich die Eingabequelldateien f\u00FCr mehrere Module befinden
+javac.opt.bootclasspath=Setzt den Speicherort der Bootstrap-Klassendateien au\u00DFer Kraft
+javac.opt.system=Setzt den Speicherort der Systemmodule au\u00DFer Kraft
+javac.opt.upgrademodulepath=Setzt den Speicherort der upgradef\u00E4higen Module au\u00DFer Kraft
+javac.opt.endorseddirs=Setzt den Speicherort der unterst\u00FCtzten Standardpfade au\u00DFer Kraft
+javac.opt.extdirs=Setzt den Speicherort der installierten Erweiterungen au\u00DFer Kraft
+javac.opt.processorpath=Gibt an, wo sich die Annotationsprozessoren befinden
+javac.opt.processormodulepath=Gibt einen Modulpfad an, wo sich die Annotationsprozessoren befinden
+javac.opt.processor=Namen der auszuf\u00FChrenden Annotationsprozessoren; Standard-Discovery-Prozess wird umgangen
+javac.opt.parameters=Generiert Metadaten zur Reflexion auf Methodenparameter
+javac.opt.proc.none.only=Steuert, wo die Verarbeitung von Annotationen und/oder die Kompilierung ausgef\u00FChrt wird
+javac.opt.d=Gibt an, wo generierte Klassendateien abgelegt werden
+javac.opt.sourceDest=Gibt an, wo generierte Quelldateien abgelegt werden
+javac.opt.headerDest=Gibt an, wo generierte native Headerdateien abgelegt werden
+javac.opt.J=\u00DCbergibt <Flag> direkt an das Laufzeitsystem
+javac.opt.encoding=Gibt die von den Quelldateien verwendete Zeichencodierung an
+javac.opt.profile=Vergewissern Sie sich, dass die verwendete API im angegebenen Profil verf\u00FCgbar ist
+javac.opt.target=Generiert Klassendateien, die sich f\u00FCr das angegebene Java SE-Release eignen. Unterst\u00FCtzte Releases: {0}
+javac.opt.release=Kompiliert f\u00FCr das angegebene Java SE-Release. Unterst\u00FCtzte Releases: {0}
+javac.opt.source=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release von Java SE. Unterst\u00FCtzte Releases: {0}
+javac.opt.Werror=Kompilierung beenden, wenn Warnungen auftreten
+javac.opt.A=Optionen zur \u00DCbergabe an die Annotationsprozessoren
+javac.opt.implicit=Gibt an, ob Klassendateien f\u00FCr implizit referenzierte Dateien generiert werden oder nicht
+javac.opt.pkginfo=Gibt an, wie package-info-Dateien behandelt werden sollen
+javac.opt.multi-release=Gibt an, welches Release in Multi-Release-JAR-Dateien verwendet werden soll
+javac.opt.arg.class=<Klasse>
+javac.opt.arg.class.list=<Klasse1>[,<Klasse2>,<Klasse3>...]
+javac.opt.arg.flag=<Flag>
+javac.opt.arg.key.equals.value=key[=value]
+javac.opt.arg.path=<Pfad>
+javac.opt.arg.mspath=<Modulquellpfad>
+javac.opt.arg.m=<Modul>(,<Modul>)*
+javac.opt.arg.jdk=<JDK>|none
+javac.opt.arg.dirs=<Verzeichnisse>
+javac.opt.arg.directory=<Verzeichnis>
+javac.opt.arg.encoding=<Codierung>
+javac.opt.arg.profile=<Profil>
+javac.opt.arg.release=<Release>
+javac.opt.arg.release=<Release>
+javac.opt.arg.number=<Nummer>
+javac.opt.plugin=Der Name und optional die Argumente f\u00FCr die Ausf\u00FChrung eines Plug-ins
+javac.opt.arg.plugin="name args"
+javac.opt.arg.multi-release=<Release>
+javac.opt.arg.default.module.for.created.files=<Modulname>
+
+## extended options
+
+javac.opt.maxerrs=Legt die maximale Anzahl der zu auszugebenden Fehler fest
+javac.opt.maxwarns=Legt die maximale Anzahl der auszugebenden Warnungen fest
+javac.opt.nogj=Akzeptiert keine Generics in der Sprache
+javac.opt.moreinfo=Gibt erweiterte Informationen f\u00FCr Typvariablen aus
+javac.opt.printsearch=Gibt Informationen dazu aus, wo Klassendateien gesucht werden
+javac.opt.prompt=Stoppt nach jedem Fehler
+javac.opt.s=Gibt Java-Quellen statt Klassendateien aus
+javac.opt.version=Versionsinformationen
+javac.opt.arg.pathname=<Pfadname>
+javac.opt.arg.file=<Dateiname>
+javac.opt.Xbootclasspath.p=Dem Bootstrap Classpath voranstellen
+javac.opt.Xbootclasspath.a=An Bootstrap Classpath anh\u00E4ngen
+javac.opt.Xlint=Aktiviert die empfohlenen Warnungen
+javac.opt.Xlint.all=Alle Warnungen aktivieren
+javac.opt.Xlint.none=Alle Warnungen deaktivieren
+#L10N: do not localize: -Xlint
+javac.opt.arg.Xlint=<Schl\u00FCssel>(,<Schl\u00FCssel>)*
+javac.opt.Xlint.custom=Warnungen, die aktiviert oder deaktiviert werden sollen, durch Komma getrennt.\nStellen Sie einem Schl\u00FCssel "-" voran, um die angegebene Warnung zu deaktivieren.\nVerwenden Sie --help-lint, um die unterst\u00FCtzten Schl\u00FCssel zu sehen.
+javac.opt.Xlint.desc.auxiliaryclass=Warnt vor Auxiliary-Klassen, die in einer Quelldatei verborgen sind und aus anderen Dateien heraus verwendet werden.
+
+javac.opt.Xlint.desc.cast=Warnt vor unn\u00F6tigen Umwandlungen mit Cast.
+
+javac.opt.Xlint.desc.classfile=Warnt vor Problemen im Zusammenhang mit Klassendateiinhalten.
+
+javac.opt.Xlint.desc.missing-explicit-ctor=Warnt vor fehlenden expliziten Konstruktoren in \u00F6ffentlichen und gesch\u00FCtzten Klassen in exportierten Packages.
+
+javac.opt.Xlint.desc.deprecation=Warnt vor der Verwendung veralteter Elemente.
+
+javac.opt.Xlint.desc.dep-ann=Warnt vor Elementen, die in JavaDoc als veraltet markiert sind, jedoch nicht mit der Annotation @Deprecated versehen sind.
+
+javac.opt.Xlint.desc.divzero=Warnt vor Division durch Ganzzahlkonstante 0.
+
+javac.opt.Xlint.desc.empty=Warnt vor leerer Anweisung nach "if".
+
+javac.opt.Xlint.desc.exports=Warnt vor Problemen in Bezug auf Modulexporte.
+
+javac.opt.Xlint.desc.fallthrough=Warnt vor Weitergabe von einem Case einer Switch-Anweisung zum n\u00E4chsten.
+
+javac.opt.Xlint.desc.finally=Warnt vor Finally-Klauseln, die nicht normal beendet werden.
+
+javac.opt.Xlint.desc.module=Warnt vor Problemen im Zusammenhang mit dem Modulsystem.
+
+javac.opt.Xlint.desc.opens=Warnt vor Problemen in Bezug auf Modul\u00F6ffnungen.
+
+javac.opt.Xlint.desc.options=Warnt vor Problemen im Zusammenhang mit der Verwendung von Befehlszeilenoptionen.
+
+javac.opt.Xlint.desc.overloads=Warnt vor Problemen in Bezug auf Methoden\u00FCberladung.
+
+javac.opt.Xlint.desc.overrides=Warnt vor Problemen in Bezug auf Methodenau\u00DFerkraftsetzung.
+
+javac.opt.Xlint.desc.path=Warnt vor ung\u00FCltigen Pfadelementen in der Befehlszeile.
+
+javac.opt.Xlint.desc.processing=Warnt vor Problemen in Bezug auf die Annotationsverarbeitung.
+
+javac.opt.Xlint.desc.rawtypes=Warnt vor der Verwendung von Raw-Typen.
+
+javac.opt.Xlint.desc.removal=Warnt vor der Verwendung einer API, die zum Entfernen markiert wurde.
+
+javac.opt.Xlint.desc.requires-automatic=Warnt vor der Verwendung automatischer Module in den "Requires"-Klauseln.
+
+javac.opt.Xlint.desc.requires-transitive-automatic=Warnt vor automatischen Modulen in "requires transitive".
+
+javac.opt.Xlint.desc.serial=Warnt vor serialisierbaren Klassen, die kein serialVersionUID-Feld haben. \n                         Warnt auch vor anderen verd\u00E4chtigen Deklarationen in serialisierbaren und externalisierbaren Klassen und Schnittstellen.
+
+javac.opt.Xlint.desc.static=Warnt vor Zugriff auf ein statisches Mitglied mit einer Instanz.
+
+javac.opt.Xlint.desc.strictfp=Warnt vor unn\u00F6tiger Verwendung des strictfp-Modifizierers.
+
+javac.opt.Xlint.desc.text-blocks=Warnt vor inkonsistenten Leerzeichen in Textblockeinr\u00FCckung.
+
+javac.opt.Xlint.desc.try=Warnt vor Problemen im Zusammenhang mit try-Bl\u00F6cken (d.h. try-with-resources).
+
+javac.opt.Xlint.desc.unchecked=Warnt vor deaktivierten Vorg\u00E4ngen.
+
+javac.opt.Xlint.desc.varargs=Warnt vor m\u00F6glicherweise nicht sicheren vararg-Methoden.
+
+javac.opt.Xlint.desc.preview=Warnt vor Verwendung von Vorschausprachfeatures.
+
+javac.opt.Xlint.desc.synchronization=Warnt vor Synchronisierungsversuchen mit Instanzen wertbasierter Klassen.
+
+javac.opt.Xdoclint=Empfohlene Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren
+# L10N: do not localize: all none
+javac.opt.Xdoclint.subopts = (all|none|[-]<Gruppe>)[/<Zugriff>]
+
+# L10N: do not localize: accessibility html missing reference syntax
+# L10N: do not localize: public protected package private
+javac.opt.Xdoclint.custom=Aktiviert oder deaktiviert bestimmte Pr\u00FCfungen auf Probleme in javadoc-Kommentaren,\nwobei <Gruppe> f\u00FCr accessibility, html, missing, reference oder syntax\nund <Zugriff> f\u00FCr public, protected, package oder private steht.
+
+javac.opt.Xdoclint.package.args = [-]<Packages>(,[-]<Package>)*
+
+javac.opt.Xdoclint.package.desc=Aktiviert oder deaktiviert Pr\u00FCfungen in bestimmten Packages. Jedes <Package> ist entweder der\nqualifizierte Name eines Packages oder ein Namenspr\u00E4fix, gefolgt von ".*", und bezieht sich auf\nalle Subpackages des angegebenen Packages. Jedem Package kann <Package>\nvorangestellt werden, um Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.
+
+javac.opt.Xstdout=Leitet die Standardausgabe um
+javac.opt.X=Gibt Hilfe zu zus\u00E4tzlichen Optionen aus
+javac.opt.help=Gibt diese Hilfemeldung aus
+javac.opt.help.lint=Gibt die unterst\u00FCtzten Schl\u00FCssel f\u00FCr -Xlint aus
+javac.opt.help.lint.header=Die unterst\u00FCtzten Schl\u00FCssel f\u00FCr -Xlint sind:
+javac.opt.print=Gibt eine Textdarstellung der angegebenen Typen aus
+javac.opt.printRounds=Gibt Informationen zu Durchl\u00E4ufen der Annotationsverarbeitung aus
+javac.opt.printProcessorInfo=Gibt Informationen dazu aus, welche Annotationen ein Prozessor verarbeiten soll
+javac.opt.userpathsfirst=Durchsucht classpath und sourcepath vor anstatt nach bootclasspath nach Klassen
+javac.opt.prefer=Gibt an, welche Datei gelesen werden soll, wenn sowohl eine Quell- als auch eine Klassendatei f\u00FCr eine implizit kompilierte Klasse gefunden werden
+javac.opt.preview=Aktiviert Vorschausprachfeatures. Wird in Verbindung mit -source oder --release verwendet.
+javac.opt.AT=Liest Optionen und Dateinamen aus Datei
+javac.opt.diags=W\u00E4hlt einen Diagnosemodus aus
+javac.opt.addExports=Gibt an, dass ein Package als aus seinem definierenden Modul in weitere Module oder, wenn\n<Anderes Modul> ALL-UNNAMED lautet, in alle unbenannten Module exportiert betrachtet werden soll.
+javac.opt.arg.addExports=<Modul>/<Package>=<Anderes Modul>(,<Anderes Modul>)*
+javac.opt.addReads=Gibt weitere Module an, die als von einem gegebenen Modul angefordert betrachtet werden sollen.\n<Anderes Modul> kann ALL-UNNAMED lauten, um das unbenannte Modul anzufordern.
+javac.opt.arg.addReads=<Modul>=<Anderes Modul>(,<Anderes Modul>)*
+javac.opt.patch=Setzt ein Modul au\u00DFer Kraft oder erweitert es mit Klassen und Ressourcen\nin JAR-Dateien oder Verzeichnissen
+javac.opt.arg.patch=<Modul>=<Datei>(:<Datei>)*
+javac.opt.addmods=Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen Modulen aufgel\u00F6st werden sollen, oder alle Module\nim Modulpfad, wenn <Modul> ALL-MODULE-PATH lautet.
+javac.opt.arg.addmods=<Modul>(,<Modul>)*
+javac.opt.limitmods=Begrenzt die Gesamtzahl der beobachtbaren Module
+javac.opt.arg.limitmods=<Modul>(,<Modul>)*
+javac.opt.module.version=Gibt die Version der Module an, die kompiliert werden
+javac.opt.arg.module.version=<Version>
+javac.opt.inherit_runtime_environment=Vererbt Modulsystemkonfigurationsoptionen aus der Laufzeitumgebung.
+javac.opt.default.module.for.created.files=Fallback-Zielmodul f\u00FCr Dateien, die von Annotationsprozessoren erstellt werden, falls keines angegeben ist oder abgeleitet werden kann.
+
+## messages
+
+javac.msg.usage.header=Verwendung: {0} <Optionen> <Quelldateien>,\nwobei folgende Optionen m\u00F6glich sind:
+
+javac.msg.usage=Verwendung: {0} <Optionen> <Quelldateien>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+javac.msg.usage.nonstandard.footer=Diese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.
+
+javac.msg.bug=Im Compiler ({0}) ist eine Ausnahme aufgetreten. Erstellen Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bugbericht, nachdem Sie die Bugdatenbank (http://bugs.java.com) auf Duplikate gepr\u00FCft haben. Geben Sie in Ihrem Bericht Ihr Programm, die folgende Diagnose und die Parameter an, die Sie dem Java-Compiler \u00FCbergeben haben. Vielen Dank.
+
+javac.msg.io=\n\nEin Eingabe-/Ausgabefehler ist aufgetreten.\nDetails finden Sie im folgenden Stacktrace.\n
+
+javac.msg.proc.annotation.uncaught.exception=\n\nEin Annotationsprozessor hat eine nicht abgefangene Ausnahme ausgel\u00F6st.\nDetails finden Sie im folgenden Stacktrace.\n
+
+javac.msg.plugin.uncaught.exception=\n\nEin Plug-in hat eine nicht abgefangene Ausnahme ausgel\u00F6st.\nDetails finden Sie im folgenden Stacktrace.\n
+
+javac.msg.resource=\n\nDas System hat keine Ressourcen mehr.\nDetails finden Sie im folgenden Stacktrace.\n
+
+javac.version={0} {1}
+javac.fullVersion={0} Vollversion "{1}"
+
+javac.msg.parameters.output=Ausgabe von javac-Parametern an: {0}
+
+javac.msg.parameters.output.error=Fehler beim Versuch, javac-Parameter auszugeben an: {0}. Die Parameter folgen:
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
index 231bbc69df8..0628340ea2b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
@@ -99,7 +99,7 @@ javac.opt.Xlint.all=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u6709\u52B9\u306B
 javac.opt.Xlint.none=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<key>(,<key>)*
-javac.opt.Xlint.custom=\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3059\u308B\u8B66\u544A(\u30AB\u30F3\u30DE\u533A\u5207\u308A)\u3002\n        \u6307\u5B9A\u3057\u305F\u8B66\u544A\u3092\u7121\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n        \u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
+javac.opt.Xlint.custom=\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3059\u308B\u8B66\u544A(\u30AB\u30F3\u30DE\u533A\u5207\u308A)\u3002\n\u6307\u5B9A\u3057\u305F\u8B66\u544A\u3092\u7121\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u3092\u8868\u793A\u3059\u308B\u306B\u306F--help-lint\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 javac.opt.Xlint.desc.auxiliaryclass=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u975E\u8868\u793A\u306B\u306A\u3063\u3066\u3044\u308B\u304C\u4ED6\u306E\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u88DC\u52A9\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.cast=\u4E0D\u8981\u306A\u30AD\u30E3\u30B9\u30C8\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
@@ -144,10 +144,12 @@ javac.opt.Xlint.desc.requires-automatic=requires\u53E5\u5185\u306E\u81EA\u52D5\u
 
 javac.opt.Xlint.desc.requires-transitive-automatic=requires transitive\u5185\u306E\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
-javac.opt.Xlint.desc.serial=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3ID\u3092\u6307\u5B9A\u3057\u306A\u3044\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002 \n                             \u307E\u305F\u3001\u76F4\u5217\u5316\u53EF\u80FD\u8981\u7D20\u304B\u3089public\u4EE5\u5916\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.serial=serialVersionUID\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u306A\u3044\u76F4\u5217\u5316\u53EF\u80FD\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002 \n                         \u76F4\u5217\u5316\u53EF\u80FD\u304A\u3088\u3073\u5916\u90E8\u5316\u53EF\u80FD\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306E\u4ED6\u306E\u8981\u6CE8\u610F\u5BA3\u8A00\u306B\u3064\u3044\u3066\u3082\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.static=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F7F\u7528\u3057\u305Fstatic\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
+javac.opt.Xlint.desc.strictfp=strictfp\u4FEE\u98FE\u5B50\u306E\u4E0D\u8981\u306A\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+
 javac.opt.Xlint.desc.text-blocks=\u30C6\u30AD\u30B9\u30C8\u30FB\u30D6\u30ED\u30C3\u30AF\u30FB\u30A4\u30F3\u30C7\u30F3\u30C8\u5185\u306E\u4E00\u8CAB\u6027\u306E\u306A\u3044\u7A7A\u767D\u6587\u5B57\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.try=try\u30D6\u30ED\u30C3\u30AF(try-with-resources\u306A\u3069)\u306E\u4F7F\u7528\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
@@ -172,11 +174,11 @@ javac.opt.Xdoclint.package.args = [-]<packages>(,[-]<package>)*
 
 javac.opt.Xdoclint.package.desc=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\u5404<package>\u306F\u3001\n\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B''.*''\u3092\u6307\u5B9A\n(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u5404<package>\u306E\u524D\u306B\n'-'\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u6307\u5B9A\u3057\u305F1\u3064\u4EE5\u4E0A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002
 
-javac.opt.doclint.format=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306E\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u307E\u3059
-
 javac.opt.Xstdout=\u6A19\u6E96\u51FA\u529B\u3092\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3059\u308B
 javac.opt.X=\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u307E\u3059
 javac.opt.help=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
+javac.opt.help.lint=-Xlint\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u3092\u51FA\u529B\u3057\u307E\u3059
+javac.opt.help.lint.header=-Xlint\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
 javac.opt.print=\u6307\u5B9A\u3057\u305F\u578B\u306E\u30C6\u30AD\u30B9\u30C8\u8868\u793A\u3092\u51FA\u529B\u3059\u308B
 javac.opt.printRounds=\u6CE8\u91C8\u51E6\u7406\u306E\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
 javac.opt.printProcessorInfo=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
index 3160e948639..0fa374e3f65 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
@@ -99,7 +99,7 @@ javac.opt.Xlint.all=\u542F\u7528\u6240\u6709\u8B66\u544A
 javac.opt.Xlint.none=\u7981\u7528\u6240\u6709\u8B66\u544A
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<\u5BC6\u94A5>(,<\u5BC6\u94A5>)*
-javac.opt.Xlint.custom=\u8981\u542F\u7528\u6216\u7981\u7528\u7684\u8B66\u544A, \u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n        \u5728\u5173\u952E\u5B57\u524D\u9762\u52A0\u4E0A '-' \u53EF\u7981\u7528\u6307\u5B9A\u7684\u8B66\u544A\u3002\n        \u652F\u6301\u7684\u5173\u952E\u5B57\u5305\u62EC:
+javac.opt.Xlint.custom=\u8981\u542F\u7528\u6216\u7981\u7528\u7684\u8B66\u544A\uFF0C\u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n\u5728\u5173\u952E\u5B57\u524D\u9762\u52A0\u4E0A '-' \u53EF\u7981\u7528\u6307\u5B9A\u7684\u8B66\u544A\u3002\n\u4F7F\u7528 --help-lint \u53EF\u67E5\u770B\u53D7\u652F\u6301\u7684\u5173\u952E\u5B57\u3002
 javac.opt.Xlint.desc.auxiliaryclass=\u6709\u5173\u8F85\u52A9\u7C7B\u5728\u6E90\u6587\u4EF6\u4E2D\u9690\u85CF, \u4F46\u5728\u5176\u4ED6\u6587\u4EF6\u4E2D\u4F7F\u7528\u7684\u8B66\u544A\u3002
 
 javac.opt.Xlint.desc.cast=\u6709\u5173\u4F7F\u7528\u4E86\u4E0D\u5FC5\u8981\u8F6C\u6362\u7684\u8B66\u544A\u3002
@@ -144,10 +144,12 @@ javac.opt.Xlint.desc.requires-automatic=\u6709\u5173\u5728 requires \u5B50\u53E5
 
 javac.opt.Xlint.desc.requires-transitive-automatic=\u6709\u5173 requires \u8FC7\u6E21\u4E2D\u7684\u81EA\u52A8\u6A21\u5757\u7684\u8B66\u544A\u3002
 
-javac.opt.Xlint.desc.serial=\u6709\u5173\u672A\u63D0\u4F9B\u5E8F\u5217\u7248\u672C ID \u7684\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u8B66\u544A\u3002\n                             \u6B64\u5916\u8FD8\u8B66\u544A\u6709\u5173\u53EF\u4E32\u884C\u5316\u5143\u7D20\u5BF9\u975E\u516C\u5171\u6210\u5458\u7684\u8BBF\u95EE\u3002
+javac.opt.Xlint.desc.serial=\u6709\u5173\u6CA1\u6709 serialVersionUID \u5B57\u6BB5\u7684\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u8B66\u544A\u3002\n                         \u4EE5\u53CA\u6709\u5173\u53EF\u5E8F\u5217\u5316\u548C\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u548C\u63A5\u53E3\u4E2D\u5176\u4ED6\u53EF\u7591\u58F0\u660E\u7684\u8B66\u544A\u3002
 
 javac.opt.Xlint.desc.static=\u6709\u5173\u4F7F\u7528\u5B9E\u4F8B\u6765\u8BBF\u95EE\u9759\u6001\u6210\u5458\u7684\u8B66\u544A\u3002
 
+javac.opt.Xlint.desc.strictfp=\u6709\u5173\u4E0D\u5FC5\u8981\u5730\u4F7F\u7528\u4E86 strictfp \u4FEE\u9970\u7B26\u7684\u8B66\u544A\u3002
+
 javac.opt.Xlint.desc.text-blocks=\u6709\u5173\u6587\u672C\u5757\u7F29\u8FDB\u4E2D\u7684\u7A7A\u683C\u5B57\u7B26\u4E0D\u4E00\u81F4\u7684\u8B66\u544A\u3002
 
 javac.opt.Xlint.desc.try=\u6709\u5173\u4E0E\u4F7F\u7528 try \u5757 (\u4F8B\u5982 try-with-resources) \u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
@@ -172,11 +174,11 @@ javac.opt.Xdoclint.package.args = [-]<\u7A0B\u5E8F\u5305>(,[-]<\u7A0B\u5E8F\u530
 
 javac.opt.Xdoclint.package.desc=\u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002\u6BCF\u4E2A <\u7A0B\u5E8F\u5305> \u662F\n\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0, \u6216\u7A0B\u5E8F\u5305\u540D\u79F0\u524D\u7F00\u540E\u8DDF '.*', \n\u5B83\u6269\u5C55\u5230\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\u6240\u6709\u5B50\u7A0B\u5E8F\u5305\u3002\u5728\u6BCF\u4E2A <\u7A0B\u5E8F\u5305>\n\u524D\u9762\u52A0\u4E0A '-' \u53EF\u4EE5\u4E3A\u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002
 
-javac.opt.doclint.format=\u6307\u5B9A\u6587\u6863\u6CE8\u91CA\u7684\u683C\u5F0F
-
 javac.opt.Xstdout=\u91CD\u5B9A\u5411\u6807\u51C6\u8F93\u51FA
 javac.opt.X=\u8F93\u51FA\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
 javac.opt.help=\u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F
+javac.opt.help.lint=\u8F93\u51FA -Xlint \u652F\u6301\u7684\u5173\u952E\u5B57
+javac.opt.help.lint.header=-Xlint \u652F\u6301\u7684\u5173\u952E\u5B57\u5305\u62EC\uFF1A
 javac.opt.print=\u8F93\u51FA\u6307\u5B9A\u7C7B\u578B\u7684\u6587\u672C\u8868\u793A
 javac.opt.printRounds=\u8F93\u51FA\u6709\u5173\u6CE8\u91CA\u5904\u7406\u5FAA\u73AF\u7684\u4FE1\u606F
 javac.opt.printProcessorInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5904\u7406\u7A0B\u5E8F\u5904\u7406\u54EA\u4E9B\u6CE8\u91CA\u7684\u4FE1\u606F
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
new file mode 100644
index 00000000000..a5796a168df
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
@@ -0,0 +1,117 @@
+#
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
+# are preceded by a stylized comment describing the type of the corresponding
+# values.
+# The simple types currently in use are:
+#
+# annotation        annotation compound
+# boolean           true or false
+# diagnostic        a sub-message; see compiler.misc.*
+# fragment          similar to 'message segment', but with more specific type
+# modifier          a Java modifier; e.g. public, private, protected
+# file              a file URL
+# file object       a file URL - similar to 'file' but typically used for source/class files, hence more specific
+# flag              a Flags.Flag instance
+# name              a name, typically a Java identifier
+# number            an integer
+# option name       the name of a command line option
+# source version    a source version number, such as 1.5, 1.6, 1.7
+# string            a general string
+# symbol            the name of a declared type
+# symbol kind       the kind of a symbol (i.e. method, variable)
+# kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
+# token             the name of a non-terminal in source code; see compiler.misc.token.*
+# type              a Java type; e.g. int, X, X<T>
+# object            a Java object (unspecified)
+# unused            the value is not used in this message
+#
+# The following compound types are also used:
+#
+# collection of X   a comma-separated collection of items; e.g. collection of type
+# list of X         a comma-separated list of items; e.g. list of type
+# set of X          a comma-separated set of items; e.g. set of modifier
+#
+# These may be composed:
+#
+# list of type or message segment
+#
+# The following type aliases are supported:
+#
+# message segment --> diagnostic or fragment
+# file name --> file, path or file object
+#
+# Custom comments are supported in parenthesis i.e.
+#
+# number (classfile major version)
+#
+# These comments are used internally in order to generate an enum-like class declaration containing
+# a method/field for each of the diagnostic keys listed here. Those methods/fields can then be used
+# by javac code to build diagnostics in a type-safe fashion.
+#
+# In addition, these comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
+# using info derived from the collected set of examples in test/tools/javac/diags/examples.
+# MessageInfo can also be run as a standalone utility providing more facilities
+# for manipulating this file. For more details, see MessageInfo.java.
+
+## All errors are preceded by this string.
+launcher.error=Fehler: 
+
+launcher.err.no.args=kein Pfad f\u00FCr Quelldatei
+
+# 0: string
+launcher.err.invalid.filename=ung\u00FCltiger Pfad f\u00FCr Quelldatei: {0}
+
+# 0: path
+launcher.err.file.not.found=Quelldatei nicht gefunden: {0}
+
+launcher.err.compilation.failed=Kompilierung nicht erfolgreich
+
+launcher.err.no.class=keine Klasse deklariert in Quelldatei
+
+launcher.err.main.not.public.static=Methode "main" ist nicht als "public static" deklariert
+
+launcher.err.main.not.void=Methode "main" ist nicht mit R\u00FCckgabetyp "void" deklariert
+
+# 0: string
+launcher.err.cant.find.class=Klasse nicht gefunden: {0}
+
+# 0: string
+launcher.err.cant.find.main.method=Methode "main(String[])" nicht gefunden in Klasse: {0}
+
+# 0: string
+launcher.err.cant.access.main.method=kein Zugriff auf Methode "main" in Klasse: {0}
+
+# 0: path, 1: object
+launcher.err.cant.read.file=Fehler beim Lesen von Quelldatei {0}: {1}
+
+# 0: string
+launcher.err.no.value.for.option=kein Wert angegeben f\u00FCr Option: {0}
+
+# 0: string
+launcher.err.invalid.value.for.source=ung\u00FCltiger Wert f\u00FCr Option --source: {0}
+
+launcher.err.enable.preview.requires.source=--enable-preview muss mit --source verwendet werden
diff --git a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
new file mode 100644
index 00000000000..fac9b7e1e2e
--- /dev/null
+++ b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2010, 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.
+#
+
+NotSerializable=Klasse {0} ist nicht serialisierbar.
+ClassNotFound=Klasse {0} nicht gefunden.
+error.parsing.classpath=Fehler beim Parsen von Classpath {0}.
+error.missing.classpath=Fehlendes Argument bei Option -classpath
+invalid.flag=Ung\u00FCltiges Flag {0}.
+usage=Verwendung: serialver [-classpath classpath] [classname...]
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
new file mode 100644
index 00000000000..e72f5370369
--- /dev/null
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+usage.java=Verwendung: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]\n                              [-o none|info|verbose] [-h zum Anzeigen von Optionen]\n                              [-version zum Anzeigen der Versionsinformationen]
+
+usage.jwebserver=Verwendung: jwebserver [-b bind address] [-p port] [-d directory]\n                  [-o none|info|verbose] [-h zum Anzeigen von Optionen]\n                  [-version zum Anzeigen von Versionsinformationen]
+
+version={0} {1}
+
+options=Optionen:\n-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".\n-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.\n-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.\n-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.\n-h, -?, --help        - Gibt diese Hilfemeldung aus und beendet.\n-version, --version   - Gibt Versionsinformationen aus und beendet.\nDr\u00FCcken Sie zum Stoppen des Servers Strg+C.
+
+opt.bindaddress=-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
+opt.directory=-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.
+opt.output=-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.
+opt.port=-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.
+
+loopback.info=Binding an Loopback als Standard. Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
+
+msg.start.anylocal=Bedient {0} und Unterverzeichnisse auf 0.0.0.0 (alle Schnittstellen) Port {2}\nURL http://{1}:{2}/
+
+msg.start.other=Bedient {0} und Unterverzeichnisse auf {1} Port {2}\nURL http://{1}:{2}/
+
+error.prefix=Fehler:
+
+err.unknown.option=unbekannte Option: {0}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.invalid.arg=ung\u00FCltiger Wert angegeben f\u00FCr {0}: {1}
+err.server.config.failed=Serverkonfiguration nicht erfolgreich: {0}
+err.server.handle.failed=Handling des Serveraustauschs nicht erfolgreich: {0}
+
+html.dir.list=Verzeichnisliste f\u00FCr
+html.not.found=Datei wurde nicht gefunden
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
new file mode 100644
index 00000000000..974707493a5
--- /dev/null
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+usage.java=\u4F7F\u7528\u65B9\u6CD5: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]\n                              [-o none|info|verbose] [-h to show options]\n                              [-version to show version information]
+
+usage.jwebserver=\u4F7F\u7528\u65B9\u6CD5: jwebserver [-b bind address] [-p port] [-d directory]\n                  [-o none|info|verbose] [-h to show options]\n                  [-version to show version information]
+
+version={0} {1}
+
+options=\u30AA\u30D7\u30B7\u30E7\u30F3:\n-b, --bind-address    - \u30D0\u30A4\u30F3\u30C9\u5148\u30A2\u30C9\u30EC\u30B9\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: {0} (\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF)\u3002\n                        \u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n-d, --directory       - \u4F7F\u7528\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: \u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\n-o, --output          - \u51FA\u529B\u5F62\u5F0F\u3002none|info|verbose\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: info\u3002\n-p, --port            - \u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: 8000\u3002\n-h, -?, --help        - \u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n-version, --version   - \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n\u30B5\u30FC\u30D0\u30FC\u3092\u505C\u6B62\u3059\u308B\u306B\u306F\u3001[Ctrl]+[C]\u3092\u62BC\u3057\u307E\u3059\u3002
+
+opt.bindaddress=-b, --bind-address    - \u30D0\u30A4\u30F3\u30C9\u5148\u30A2\u30C9\u30EC\u30B9\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: {0} (\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF).\n                        \u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+opt.directory=-d, --directory       - \u4F7F\u7528\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: \u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002
+opt.output=-o, --output          - \u51FA\u529B\u5F62\u5F0F\u3002none|info|verbose. \u30C7\u30D5\u30A9\u30EB\u30C8: info\u3002
+opt.port=-p, --port            - \u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: 8000\u3002
+
+loopback.info=\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF\u306B\u30D0\u30A4\u30F3\u30C9\u3057\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+
+msg.start.anylocal={0}\u304A\u3088\u3073\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30920.0.0.0 (\u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9)\u30DD\u30FC\u30C8{2}\u3067\u4F7F\u7528\u3057\u307E\u3059\nURL http://{1}:{2}/
+
+msg.start.other={0}\u304A\u3088\u3073\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092{1}\u30DD\u30FC\u30C8{2}\u3067\u4F7F\u7528\u3057\u307E\u3059\nURL http://{1}:{2}/
+
+error.prefix=\u30A8\u30E9\u30FC:
+
+err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
+err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+err.invalid.arg={0}\u306B\u7121\u52B9\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F: {1}
+err.server.config.failed=\u30B5\u30FC\u30D0\u30FC\u306E\u69CB\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
+err.server.handle.failed=\u30B5\u30FC\u30D0\u30FC\u4EA4\u63DB\u51E6\u7406\u304C\u5931\u6557\u3057\u307E\u3057\u305F: {0}
+
+html.dir.list=\u6B21\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30EA\u30B9\u30C8
+html.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
new file mode 100644
index 00000000000..1d35a7ecd1b
--- /dev/null
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+usage.java=\u7528\u6CD5\uFF1Ajava -m jdk.httpserver [-b \u7ED1\u5B9A\u5730\u5740] [-p \u7AEF\u53E3] [-d \u76EE\u5F55]\n                              [-o none|info|verbose] [-h \u663E\u793A\u9009\u9879]\n                              [-version \u663E\u793A\u7248\u672C\u4FE1\u606F]
+
+usage.jwebserver=\u7528\u6CD5\uFF1Ajwebserver [-b \u7ED1\u5B9A\u5730\u5740] [-p \u7AEF\u53E3] [-d \u76EE\u5F55]\n                              [-o none|info|verbose] [-h \u663E\u793A\u9009\u9879]\n                              [-version \u663E\u793A\u7248\u672C\u4FE1\u606F]
+
+version={0} {1}
+
+options=\u9009\u9879\uFF1A\n-b, --bind-address    - \u8981\u7ED1\u5B9A\u5230\u7684\u5730\u5740\u3002\u9ED8\u8BA4\u503C\uFF1A{0}\uFF08\u73AF\u56DE\uFF09\u3002\n                        \u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002\n-d, --directory       - \u8981\u4E3A\u5176\u63D0\u4F9B\u670D\u52A1\u7684\u76EE\u5F55\u3002\u9ED8\u8BA4\u503C\uFF1A\u5F53\u524D\u76EE\u5F55\u3002\n-o, --output          - \u8F93\u51FA\u683C\u5F0F\u3002none|info|verbose\u3002\u9ED8\u8BA4\u503C\uFF1Ainfo\u3002\n-p, --port            - \u8981\u76D1\u542C\u7684\u7AEF\u53E3\u3002\u9ED8\u8BA4\u503C\uFF1A8000\u3002\n-h, -?, --help        - \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F\u5E76\u9000\u51FA\u3002\n-version, --version   - \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\u3002\n\u8981\u505C\u6B62\u670D\u52A1\u5668\uFF0C\u8BF7\u6309 Ctrl + C\u3002
+
+opt.bindaddress=-b, --bind-address    - \u8981\u7ED1\u5B9A\u5230\u7684\u5730\u5740\u3002\u9ED8\u8BA4\u503C\uFF1A{0}\uFF08\u73AF\u56DE\uFF09\u3002\n                        \u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002
+opt.directory=-d, --directory       - \u8981\u4E3A\u5176\u63D0\u4F9B\u670D\u52A1\u7684\u76EE\u5F55\u3002\u9ED8\u8BA4\u503C\uFF1A\u5F53\u524D\u76EE\u5F55\u3002
+opt.output=-o, --output          - \u8F93\u51FA\u683C\u5F0F\u3002none|info|verbose\u3002\u9ED8\u8BA4\u503C\uFF1Ainfo\u3002
+opt.port=-p, --port            - \u8981\u76D1\u542C\u7684\u7AEF\u53E3\u3002\u9ED8\u8BA4\u503C\uFF1A8000\u3002
+
+loopback.info=\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u7ED1\u5B9A\u5230\u73AF\u56DE\u3002\u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002
+
+msg.start.anylocal=\u4E3A 0.0.0.0\uFF08\u6240\u6709\u63A5\u53E3\uFF09\u7AEF\u53E3 {2} \u4E0A\u7684 {0} \u53CA\u5B50\u76EE\u5F55\u63D0\u4F9B\u670D\u52A1\nURL http://{1}:{2}/
+
+msg.start.other=\u4E3A {1} \u7AEF\u53E3 {2} \u4E0A\u7684 {0} \u53CA\u5B50\u76EE\u5F55\u63D0\u4F9B\u670D\u52A1\nURL http://{1}:{2}/
+
+error.prefix=\u9519\u8BEF:
+
+err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
+err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
+err.invalid.arg=\u4E3A {0} \u63D0\u4F9B\u7684\u503C\u65E0\u6548\uFF1A{1}
+err.server.config.failed=\u670D\u52A1\u5668\u914D\u7F6E\u5931\u8D25\uFF1A{0}
+err.server.handle.failed=\u670D\u52A1\u5668\u4EA4\u6362\u5904\u7406\u5931\u8D25\uFF1A{0}
+
+html.dir.list=\u4EE5\u4E0B\u9879\u7684\u76EE\u5F55\u5217\u8868
+html.not.found=\u627E\u4E0D\u5230\u6587\u4EF6
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
new file mode 100644
index 00000000000..b66ce1a4dee
--- /dev/null
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.tools.jarsigner;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for JarSigner.
+ *
+ */
+public class Resources_de extends java.util.ListResourceBundle {
+
+    private static final Object[][] contents = {
+
+        // shared (from jarsigner)
+        {"SPACE", " "},
+        {"6SPACE", "      "},
+        {"COMMA", ", "},
+
+        {"provclass.not.a.provider", "%s kein Provider"},
+        {"provider.name.not.found", "Provider namens \"%s\" nicht gefunden"},
+        {"provider.class.not.found", "Provider \"%s\" nicht gefunden"},
+        {"jarsigner.error.", "jarsigner-Fehler: "},
+        {"Illegal.option.", "Unzul\u00E4ssige Option: "},
+        {"This.option.is.forremoval", "Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt: "},
+        {".keystore.must.be.NONE.if.storetype.is.{0}",
+                "-keystore muss NONE sein, wenn -storetype {0} ist"},
+        {".keypass.can.not.be.specified.if.storetype.is.{0}",
+                "-keypass kann nicht angegeben werden, wenn -storetype \"{0}\" ist"},
+        {"If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified",
+                "Wenn -protected angegeben ist, d\u00FCrfen -storepass und -keypass nicht angegeben werden"},
+        {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
+                 "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass und -keypass nicht angegeben werden"},
+        {"Usage.jarsigner.options.jar.file.alias",
+                "Verwendung: jarsigner [options] jar-file alias"},
+        {".jarsigner.verify.options.jar.file.alias.",
+                "       jarsigner -verify [options] jar-file [alias...]"},
+        {".jarsigner.version",
+                "       jarsigner -version"},
+        {".keystore.url.keystore.location",
+                "[-keystore <URL>]           Keystore-Speicherort"},
+        {".storepass.password.password.for.keystore.integrity",
+            "[-storepass <Kennwort>]     Kennwort f\u00FCr Keystore-Integrit\u00E4t"},
+        {".storetype.type.keystore.type",
+                "[-storetype <Typ>]         Keystore-Typ"},
+        {".keypass.password.password.for.private.key.if.different.",
+                "[-keypass <Kennwort>]       Kennwort f\u00FCr Private Key (falls unterschiedlich)"},
+        {".certchain.file.name.of.alternative.certchain.file",
+                "[-certchain <Datei>]         Name der alternativen certchain-Datei"},
+        {".sigfile.file.name.of.SF.DSA.file",
+                "[-sigfile <Datei>]           Name der SF/DSA-Datei"},
+        {".signedjar.file.name.of.signed.JAR.file",
+                "[-signedjar <Datei>]         Name der signierten JAR-Datei"},
+        {".digestalg.algorithm.name.of.digest.algorithm",
+                "[-digestalg <Algorithmus>]    Name des Digestalgorithmus"},
+        {".sigalg.algorithm.name.of.signature.algorithm",
+                "[-sigalg <Algorithmus>]       Name des Signaturalgorithmus"},
+        {".verify.verify.a.signed.JAR.file",
+                "[-verify]                   Verifiziert eine signierte JAR-Datei"},
+        {".version.print.the.program.version",
+                "[-version]                  Gibt die Programmversion aus"},
+        {".verbose.suboptions.verbose.output.when.signing.verifying.",
+                "[-verbose[:suboptions]]     Verbose-Ausgabe beim Signieren/Verifizieren."},
+        {".suboptions.can.be.all.grouped.or.summary",
+                "                            Als Unteroptionen sind \"all\", \"grouped\" und \"summary\" m\u00F6glich"},
+        {".certs.display.certificates.when.verbose.and.verifying",
+                "[-certs]                    Zeigt Zertifikate bei Verbose und Verifizierung an"},
+        {".certs.revocation.check",
+                "[-revCheck]                 Aktiviert die Zertifikatswiderrufpr\u00FCfung"},
+        {".tsa.url.location.of.the.Timestamping.Authority",
+                "[-tsa <URL>]                Ort der Zeitstempelautorit\u00E4t"},
+        {".tsacert.alias.public.key.certificate.for.Timestamping.Authority",
+                "[-tsacert <Alias>]          Public-Key-Zertifikat f\u00FCr Zeitstempelautorit\u00E4t"},
+        {".tsapolicyid.tsapolicyid.for.Timestamping.Authority",
+                "[-tsapolicyid <OID>]        TSAPolicyID f\u00FCr Zeitstempelautorit\u00E4t"},
+        {".tsadigestalg.algorithm.of.digest.data.in.timestamping.request",
+                "[-tsadigestalg <Algorithmus>] Algorithmus der Digestdaten in Zeitstempelanforderung"},
+        {".altsigner.class.class.name.of.an.alternative.signing.mechanism",
+                "[-altsigner <Klasse>]        Klassenname eines alternativen Signiermechanismus\n                            (Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt.)"},
+        {".altsignerpath.pathlist.location.of.an.alternative.signing.mechanism",
+                "[-altsignerpath <Pfadliste>] Speicherort eines alternativen Signiermechanismus\n                            (Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt.)"},
+        {".internalsf.include.the.SF.file.inside.the.signature.block",
+                "[-internalsf]               SF-Datei in Signaturblock aufnehmen"},
+        {".sectionsonly.don.t.compute.hash.of.entire.manifest",
+                "[-sectionsonly]             Berechnet nicht den Hash des gesamten Manifests"},
+        {".protected.keystore.has.protected.authentication.path",
+                "[-protected]                Keystore hat gesch\u00FCtzten Authentifizierungspfad"},
+        {".providerName.name.provider.name",
+                "[-providerName <Name>]      Providername"},
+        {".add.provider.option",
+                "[-addprovider <Name>        F\u00FCgt einen Sicherheitsprovider nach Name hinzu (z.B. SunPKCS11)"},
+        {".providerArg.option.1",
+                "  [-providerArg <Argument>]] ... Konfiguriert Argument f\u00FCr -addprovider"},
+        {".providerClass.option",
+                "[-providerClass <Klasse>     F\u00FCgt einen Sicherheitsprovider nach vollqualifiziertem Klassennamen hinzu"},
+        {".providerArg.option.2",
+                "  [-providerArg <Argument>]] ... Konfiguriert Argument f\u00FCr -providerClass"},
+        {".strict.treat.warnings.as.errors",
+                "[-strict]                   Behandelt Warnungen als Fehler"},
+        {".conf.url.specify.a.pre.configured.options.file",
+                "[-conf <URL>]               Vorkonfigurierte Optionsdatei angeben"},
+        {".print.this.help.message",
+                "[-? -h --help]              Gibt diese Hilfemeldung aus"},
+        {"Option.lacks.argument", "Argument fehlt in Option"},
+        {"Please.type.jarsigner.help.for.usage", "Geben Sie jarsigner --help ein, um Verwendungsinformationen anzuzeigen"},
+        {"Please.specify.jarfile.name", "Geben Sie den Namen der JAR-Datei an"},
+        {"Please.specify.alias.name", "Geben Sie einen Aliasnamen an"},
+        {"Only.one.alias.can.be.specified", "Nur ein Alias kann angegeben werden"},
+        {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
+                 "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge, die nicht von den angegebenen Aliasnamen signiert wurden."},
+        {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
+                  "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge, die nicht vom Alias in diesem Keystore signiert wurden."},
+        {"s", "s"},
+        {"m", "m"},
+        {"k", "k"},
+        {"X", "X"},
+        {"q", "?"},
+        {".and.d.more.", "(und %d mehr)"},
+        {".s.signature.was.verified.",
+                "  s = Signatur wurde verifiziert "},
+        {".m.entry.is.listed.in.manifest",
+                "  m = Eintrag ist in Manifest aufgef\u00FChrt"},
+        {".k.at.least.one.certificate.was.found.in.keystore",
+                "  k = Mindestens ein Zertifikat im Keystore gefunden"},
+        {".X.not.signed.by.specified.alias.es.",
+                "  X = Nicht von den angegebenen Aliasnamen signiert"},
+        {".q.unsigned.entry",
+                "  ? = Nicht signierter Eintrag"},
+        {"no.manifest.", "Kein Manifest."},
+        {".Signature.related.entries.","(Signaturbezogene Eintr\u00E4ge)"},
+        {".Unsigned.entries.", "(Nicht signierte Eintr\u00E4ge)"},
+        {".Directory.entries.", "(Verzeichniseintr\u00E4ge)"},
+        {"jar.is.unsigned",
+                "JAR-Datei ist nicht signiert."},
+        {"jar.treated.unsigned",
+                "Warnung: Signatur kann entweder nicht geparst oder nicht verifiziert werden. Die JAR-Datei wird als nicht signiert behandelt. Weitere Informationen erhalten Sie, indem Sie \"jarsigner\" mit aktiviertem Debugging erneut ausf\u00FChren (-J-Djava.security.debug=jar)."},
+        {"jar.treated.unsigned.see.weak",
+                "Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der jetzt deaktiviert ist.\n\nF\u00FChren Sie \"jarsigner\" mit der Option \"-verbose\" erneut aus, um weitere Einzelheiten zu erhalten."},
+        {"jar.treated.unsigned.see.weak.verbose",
+                "Warnung: Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der mittlerweile von der folgenden Sicherheitseigenschaft deaktiviert wurde:"},
+        {"jar.signed.", "JAR-Datei signiert."},
+        {"jar.signed.with.signer.errors.", "JAR-Datei signiert, mit Signaturgeberfehlern."},
+        {"jar.verified.", "JAR-Datei verifiziert."},
+        {"jar.verified.with.signer.errors.", "JAR-Datei verifiziert, mit Signaturgeberfehlern."},
+
+        {"history.with.ts", "- Von \"%1$s\" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s\n  Zeitstempel von \"%6$s\" am %5$tc\n    Digestalgorithmus f\u00FCr Zeitstempel: %7$s\n    Signaturalgorithmus f\u00FCr Zeitstempel: %8$s, %9$s"},
+        {"history.without.ts", "- Von \"%1$s\" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s"},
+        {"history.unparsable", "- Signaturbezogene Datei %s kann nicht geparst werden"},
+        {"history.nosf", "- Signaturbezogene Datei META-INF/%s.SF fehlt"},
+        {"history.nobk", "- Blockdatei f\u00FCr signaturbezogene Datei META-INF/%s.SF fehlt"},
+
+        {"with.weak", "%s (schwach)"},
+        {"with.disabled", "%s (deaktiviert)"},
+        {"key.bit", "%d-Bit-Schl\u00FCssel"},
+        {"key.bit.weak", "%d-Bit-Schl\u00FCssel (schwach)"},
+        {"key.bit.disabled", "%d-Bit-Schl\u00FCssel (deaktiviert)"},
+        {"unknown.size", "unbekannte Gr\u00F6\u00DFe"},
+        {"extra.attributes.detected", "POSIX-Dateiberechtigung und/oder Symlink-Attribute erkannt. Diese Attribute werden bei der Signatur ignoriert und sind nicht durch die Signatur gesch\u00FCtzt."},
+
+        {"jarsigner.", "jarsigner: "},
+        {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
+                "Signaturdateiname muss aus den folgenden Zeichen bestehen: A-Z, 0-9, _ oder -"},
+        {"unable.to.open.jar.file.", "JAR-Datei kann nicht ge\u00F6ffnet werden: "},
+        {"unable.to.create.", "Erstellen nicht m\u00F6glich: "},
+        {".adding.", "   Wird hinzugef\u00FCgt: "},
+        {".updating.", " Wird aktualisiert: "},
+        {".signing.", "  Wird signiert: "},
+        {"attempt.to.rename.signedJarFile.to.jarFile.failed",
+                "Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich"},
+        {"attempt.to.rename.jarFile.to.origJar.failed",
+                "Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich"},
+        {"unable.to.sign.jar.", "JAR-Datei kann nicht signiert werden: "},
+        {"Enter.Passphrase.for.keystore.", "Passphrase f\u00FCr Keystore eingeben: "},
+        {"keystore.load.", "Keystore-Ladevorgang: "},
+        {"certificate.exception.", "Zertifikatsausnahme: "},
+        {"unable.to.instantiate.keystore.class.",
+                "Keystore-Klasse kann nicht instanziiert werden: "},
+        {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
+                "Zertifikatskette nicht gefunden f\u00FCr: {0}. {1} muss einen g\u00FCltigen Keystore-Schl\u00FCssel referenzieren, der einen Private Key und eine zugeh\u00F6rige Public-Key-Zertifikatskette enth\u00E4lt."},
+        {"File.specified.by.certchain.does.not.exist",
+                "Von -certchain angegebene Datei ist nicht vorhanden"},
+        {"Cannot.restore.certchain.from.file.specified",
+                "Zertifikatskette kann nicht aus angegebener Datei wiederhergestellt werden"},
+        {"Certificate.chain.not.found.in.the.file.specified.",
+                "Zertifikatskette nicht in der angegebenen Datei gefunden."},
+        {"found.non.X.509.certificate.in.signer.s.chain",
+                "Nicht-X.509-Zertifikat in Kette des Signaturgebers gefunden"},
+        {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr {0} eingeben: "},
+        {"unable.to.recover.key.from.keystore",
+                "Schl\u00FCssel kann nicht aus Keystore wiederhergestellt werden"},
+        {"key.associated.with.alias.not.a.private.key",
+                "Mit {0} verkn\u00FCpfter Schl\u00FCssel ist kein Private Key"},
+        {"you.must.enter.key.password", "Sie m\u00FCssen ein Schl\u00FCsselkennwort eingeben"},
+        {"unable.to.read.password.", "Kennwort kann nicht gelesen werden: "},
+        {"certificate.is.valid.from", "Zertifikat ist von {0} bis {1} g\u00FCltig"},
+        {"certificate.expired.on", "Zertifikat ist am {0} abgelaufen"},
+        {"certificate.is.not.valid.until",
+                "Zertifikat ist erst ab {0} g\u00FCltig"},
+        {"certificate.will.expire.on", "Zertifikat l\u00E4uft am {0} ab"},
+        {".Invalid.certificate.chain.", "[Ung\u00FCltige Zertifikatskette: "},
+        {".Invalid.TSA.certificate.chain.", "[Ung\u00FCltige TSA-Zertifikatskette: "},
+        {"requesting.a.signature.timestamp",
+                "Signaturzeitstempel wird angefordert"},
+        {"TSA.location.", "TSA-Ort: "},
+        {"TSA.certificate.", "TSA-Zertifikat: "},
+        {"no.response.from.the.Timestamping.Authority.",
+                "Keine Antwort von der Zeitstempelautorit\u00E4t. Bei Verbindungen hinter einer Firewall muss m\u00F6glicherweise ein HTTP- oder HTTPS-Proxy angegeben werden. Geben Sie die folgenden Optionen f\u00FCr \"jarsigner\" an:"},
+        {"or", "oder"},
+        {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
+                "Zertifikat nicht gefunden f\u00FCr: {0}. {1} muss einen g\u00FCltigen Keystore-Eintrag referenzieren, der ein X.509-Public-Key-Zertifikat f\u00FCr die Zeitstempelautorit\u00E4t enth\u00E4lt."},
+        {"using.an.alternative.signing.mechanism",
+                "Verwendung eines alternativen Signaturmechanismus"},
+        {"entry.was.signed.on", "Eintrag wurde signiert am {0}"},
+        {"Warning.", "Warnung: "},
+        {"Error.", "Fehler: "},
+        {"...Signer", ">>> Signaturgeber"},
+        {"...TSA", ">>> TSA"},
+        {"trusted.certificate", "vertrauensw\u00FCrdiges Zertifikat"},
+        {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
+                "Diese JAR-Datei enth\u00E4lt nicht signierte Eintr\u00E4ge, deren Integrit\u00E4t nicht gepr\u00FCft wurde. "},
+        {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat abgelaufen ist."},
+        {"This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat innerhalb der n\u00E4chsten sechs Monate abl\u00E4uft. "},
+        {"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat noch nicht g\u00FCltig ist. "},
+        {"This.jar.contains.entries.whose.signer.certificate.is.self.signed.",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat selbstsigniert ist."},
+        {"Re.run.with.the.verbose.and.certs.options.for.more.details.",
+                "F\u00FChren Sie den Befehl erneut mit den Optionen -verbose und -certs aus, um weitere Details zu erhalten."},
+        {"The.signer.certificate.has.expired.",
+                "Das Signaturgeberzertifikat ist abgelaufen."},
+        {"The.timestamp.expired.1.but.usable.2",
+                "Der Zeitstempel ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber g\u00FCltig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abl\u00E4uft."},
+        {"The.timestamp.has.expired.",
+                "Der Zeitstempel ist abgelaufen."},
+        {"The.signer.certificate.will.expire.within.six.months.",
+                "Das Signaturgeberzertifikat l\u00E4uft innerhalb der n\u00E4chsten sechs Monate ab."},
+        {"The.timestamp.will.expire.within.one.year.on.1",
+                "Der Zeitstempel l\u00E4uft innerhalb des n\u00E4chsten Jahres am %1$tY-%1$tm-%1$td ab."},
+        {"The.timestamp.will.expire.within.one.year.on.1.but.2",
+                "Der Zeitstempel l\u00E4uft innerhalb des n\u00E4chsten Jahres am %1$tY-%1$tm-%1$td ab. Die JAR-Datei bleibt aber g\u00FCltig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abl\u00E4uft."},
+        {"The.signer.certificate.is.not.yet.valid.",
+                "Das Signaturgeberzertifikat ist noch nicht g\u00FCltig."},
+        {"The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
+                 "Die KeyUsage-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
+        {"The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
+                 "Die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
+        {"The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
+                 "Die NetscapeCertType-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
+        {"This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
+                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die KeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
+        {"This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
+                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
+        {"This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
+                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die NetscapeCertType-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
+        {".{0}.extension.does.not.support.code.signing.",
+                 "[{0}-Erweiterung unterst\u00FCtzt keine Codesignatur]"},
+        {"The.signer.s.certificate.chain.is.invalid.reason.1",
+                "Die Zertifikatskette des Signaturgebers ist ung\u00FCltig. Grund: %s"},
+        {"The.tsa.certificate.chain.is.invalid.reason.1",
+                "Die TSA-Zertifikatskette ist ung\u00FCltig. Grund: %s"},
+        {"The.signer.s.certificate.is.self.signed.",
+                "Das Zertifikat des Signaturgebers ist selbstsigniert."},
+        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
+                "Der f\u00FCr die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.",
+                "Der f\u00FCr die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
+                "Der %1$s-Digestalgorithmus des Zeitstempels gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
+                "Der %1$s-Digestalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
+                "Der %1$s-Signaturalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update.",
+                "Der %1$s-Signaturschl\u00FCssel hat eine Schl\u00FCsselgr\u00F6\u00DFe von %2$d. Das gilt als Sicherheitsrisiko. Diese Schl\u00FCsselgr\u00F6\u00DFe wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.and.is.disabled.",
+                "Der %1$s-Signaturschl\u00FCssel hat eine Schl\u00FCsselgr\u00F6\u00DFe von %2$d. Das gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
+                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Zertifikatskette ung\u00FCltig ist. Grund: %s"},
+        {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren TSA-Zertifikatskette ung\u00FCltig ist. Grund: %s"},
+        {"no.timestamp.signing",
+                "Weder -tsa noch -tsacert wurde angegeben, und diese JAR-Datei hat keinen Zeitstempel. Ohne Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
+        {"invalid.timestamp.signing",
+                "Der Zeitstempel ist ung\u00FCltig. Ohne einen g\u00FCltigen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
+        {"no.timestamp.verifying",
+                "Diese JAR-Datei enth\u00E4lt Signaturen ohne Zeitstempel. Ohne einen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (fr\u00FChestens %1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
+        {"bad.timestamp.verifying",
+                "Diese JAR-Datei enth\u00E4lt Signaturen mit einem ung\u00FCltigen Zeitstempel. Ohne einen g\u00FCltigen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (fr\u00FChestens %1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren.\nF\u00FChren Sie \"jarsigner\" mit -J-Djava.security.debug=jar erneut aus, um weitere Informationen zu erhalten."},
+        {"The.signer.certificate.will.expire.on.1.",
+                "Das Signaturgeberzertifikat l\u00E4uft am %1$tY-%1$tm-%1$td ab."},
+        {"The.timestamp.will.expire.on.1.",
+                "Der Zeitstempel l\u00E4uft am %1$tY-%1$tm-%1$td ab."},
+        {"signer.cert.expired.1.but.timestamp.good.2.",
+                "Das Signaturgeberzertifikat ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber g\u00FCltig, bis der Zeitstempel am %2$tY-%2$tm-%2$td abl\u00E4uft."},
+        {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
+        {"Cannot.find.environment.variable.",
+                "Umgebungsvariable kann nicht gefunden werden: "},
+        {"Cannot.find.file.", "Datei kann nicht gefunden werden: "},
+        {"event.ocsp.check", "Verbindung zu OCSP-Server bei %s wird hergestellt..."},
+        {"event.crl.check", "CRL wird von %s heruntergeladen..."},
+    };
+
+    /**
+     * Returns the contents of this <code>ResourceBundle</code>.
+     *
+     * <p>
+     *
+     * @return the contents of this <code>ResourceBundle</code>.
+     */
+    @Override
+    public Object[][] getContents() {
+        return contents;
+    }
+}
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
index 65422c0e686..aca0727297c 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
@@ -57,6 +57,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u4F7F\u7528\u65B9\u6CD5: jarsigner [options] jar-file alias"},
         {".jarsigner.verify.options.jar.file.alias.",
                 "       jarsigner -verify [options] jar-file [alias...]"},
+        {".jarsigner.version",
+                "       jarsigner -version"},
         {".keystore.url.keystore.location",
                 "[-keystore <url>]           \u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4F4D\u7F6E"},
         {".storepass.password.password.for.keystore.integrity",
@@ -77,6 +79,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "[-sigalg <algorithm>]       \u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]                   \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u8A3C"},
+        {".version.print.the.program.version",
+                "[-version]                  \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
                 "[-verbose[:suboptions]]     \u7F72\u540D/\u691C\u8A3C\u6642\u306E\u8A73\u7D30\u51FA\u529B\u3002"},
         {".suboptions.can.be.all.grouped.or.summary",
@@ -131,6 +135,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"s", "s"},
         {"m", "m"},
         {"k", "k"},
+        {"X", "X"},
+        {"q", "?"},
         {".and.d.more.", "(\u4ED6\u306B\u3082%d\u500B)"},
         {".s.signature.was.verified.",
                 "  s=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F "},
@@ -140,9 +146,12 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "  k=1\u3064\u4EE5\u4E0A\u306E\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u3067\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
         {".X.not.signed.by.specified.alias.es.",
                 "  X =\u6307\u5B9A\u3057\u305F\u5225\u540D\u3067\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
+        {".q.unsigned.entry",
+                "  ? = \u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA"},
         {"no.manifest.", "\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002"},
         {".Signature.related.entries.","(\u30B7\u30B0\u30CD\u30C1\u30E3\u95A2\u9023\u30A8\u30F3\u30C8\u30EA)"},
         {".Unsigned.entries.", "(\u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA)"},
+        {".Directory.entries.", "(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30A8\u30F3\u30C8\u30EA)"},
         {"jar.is.unsigned",
                 "jar\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"jar.treated.unsigned",
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
index 0cdd2b96cee..47dacd6a8a5 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
@@ -57,6 +57,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u7528\u6CD5: jarsigner [\u9009\u9879] jar-file \u522B\u540D"},
         {".jarsigner.verify.options.jar.file.alias.",
                 "       jarsigner -verify [\u9009\u9879] jar-file [\u522B\u540D...]"},
+        {".jarsigner.version",
+                "       jarsigner -version"},
         {".keystore.url.keystore.location",
                 "[-keystore <url>]           \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
         {".storepass.password.password.for.keystore.integrity",
@@ -77,6 +79,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "[-sigalg <\u7B97\u6CD5>]           \u7B7E\u540D\u7B97\u6CD5\u7684\u540D\u79F0"},
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]                   \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"},
+        {".version.print.the.program.version",
+                "[-version]                  \u8F93\u51FA\u7A0B\u5E8F\u7248\u672C"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
                 "[-verbose[:suboptions]]     \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
         {".suboptions.can.be.all.grouped.or.summary",
@@ -131,6 +135,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"s", "s"},
         {"m", "m"},
         {"k", "k"},
+        {"X", "X"},
+        {"q", "?"},
         {".and.d.more.", "(%d \u53CA\u4EE5\u4E0A)"},
         {".s.signature.was.verified.",
                 "  s = \u5DF2\u9A8C\u8BC1\u7B7E\u540D "},
@@ -140,9 +146,12 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "  k = \u5728\u5BC6\u94A5\u5E93\u4E2D\u81F3\u5C11\u627E\u5230\u4E86\u4E00\u4E2A\u8BC1\u4E66"},
         {".X.not.signed.by.specified.alias.es.",
                 "  X = \u672A\u7531\u6307\u5B9A\u522B\u540D\u7B7E\u540D"},
+        {".q.unsigned.entry",
+                "  ? = \u672A\u7B7E\u540D\u6761\u76EE"},
         {"no.manifest.", "\u6CA1\u6709\u6E05\u5355\u3002"},
         {".Signature.related.entries.","(\u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6761\u76EE)"},
         {".Unsigned.entries.", "(\u672A\u7B7E\u540D\u6761\u76EE)"},
+        {".Directory.entries.", "\uFF08\u76EE\u5F55\u6761\u76EE\uFF09"},
         {"jar.is.unsigned",
                 "jar \u672A\u7B7E\u540D\u3002"},
         {"jar.treated.unsigned",
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
index 10f634baa08..95744421c89 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
 
 error.multiple.main.operations=Es ist nicht m\u00F6glich, mehrere "-cuxtid"-Optionen anzugeben
 error.cant.open=\u00D6ffnen nicht m\u00F6glich: {0}
-error.illegal.option=Ung\u00FCltige Option: {0}
+error.illegal.option=Unzul\u00E4ssige Option: {0}
 error.unrecognized.option=Unbekannte Option: {0}
 error.missing.arg=F\u00FCr die Option {0} ist ein Argument erforderlich
 error.bad.file.arg=Fehler beim Parsen der Dateiargumente
-error.bad.option=Eine der Optionen -{ctxuid} muss angegeben werden.
+error.bad.option=Eine der Optionen -{ctxuid} oder --validate muss angegeben werden.
 error.bad.cflag=Kennzeichen "c" erfordert Angabe von Manifest oder Eingabedateien.
 error.bad.uflag=Kennzeichen "u" erfordert Angabe von Manifest, Kennzeichen "e" oder Eingabedateien.
 error.bad.eflag=Kennzeichen "e" und Manifest mit dem Attribut "Main-Class" k\u00F6nnen nicht zusammen angegeben\nwerden.
@@ -43,7 +43,7 @@ error.create.tempfile=Es konnte keine tempor\u00E4re Datei erstellt werden
 error.hash.dep=Abh\u00E4ngigkeiten bei Hashing-Modul {0}. Modul {1} kann nicht im Modulpfad gefunden werden
 error.module.options.without.info=--module-version oder --hash-modules ohne module-info.class
 error.no.operative.descriptor=Kein operativer Deskriptor f\u00FCr Release: {0}
-error.no.root.descriptor=Kein Root-Moduldeskriptor. Geben Sie "--release" an
+error.no.root.descriptor=Kein Root-Moduldeskriptor. Geben Sie --release an
 error.unable.derive.automodule=Moduldeskriptor kann nicht abgeleitet werden f\u00FCr: {0}
 error.unexpected.module-info=Unerwarteter Moduldeskriptor {0}
 error.module.descriptor.not.found=Moduldeskriptor nicht gefunden
@@ -52,6 +52,8 @@ error.missing.provider=Serviceprovider nicht gefunden: {0}
 error.release.value.notnumber=Release {0} nicht g\u00FCltig
 error.release.value.toosmall=Release {0} nicht g\u00FCltig, muss >= 9 sein
 error.release.unexpected.versioned.entry=Unerwarteter versionierte Eintrag {0} f\u00FCr Release {1}
+error.date.notvalid=Datum {0} ist keine g\u00FCltige erweiterte Datums-/Uhrzeitangabe mit Zeitunterschied und optionaler Zeitzone nach ISO-8601
+error.date.out.of.range=Datum {0} liegt nicht im g\u00FCltigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
 error.validator.jarfile.exception={0} kann nicht validiert werden: {1}
 error.validator.jarfile.invalid=ung\u00FCltige Multi-Release-JAR-Datei {0} gel\u00F6scht
 error.validator.bad.entry.name=Eintragsname hat das falsche Format, {0}
@@ -75,6 +77,7 @@ warn.validator.identical.entry=Warnung: Eintrag {0} enth\u00E4lt eine Klasse, di
 warn.validator.resources.with.same.name=Warnung: Eintrag {0}, mehrere Ressourcen mit demselben Namen
 warn.validator.concealed.public.class=Warnung: Eintrag {0} ist eine \u00F6ffentliche Klasse\nin einem verdeckten Package. Wenn Sie diese JAR-Datei in den Classpath einf\u00FCgen, kommt es\nzu nicht kompatiblen \u00F6ffentlichen Schnittstellen
 warn.release.unexpected.versioned.entry=Unerwarteter versionierter Eintrag {0}
+warn.flag.is.deprecated=Warnung: Die Option {0} ist veraltet, und ihre Entfernung in einem k\u00FCnftigen JDK-Release ist geplant\n
 out.added.manifest=Manifest wurde hinzugef\u00FCgt
 out.added.module-info=module-info hinzugef\u00FCgt: {0}
 out.automodule=Kein Moduldeskriptor gefunden. Automatisches Modul wurde abgeleitet.
@@ -89,7 +92,7 @@ out.extracted=extrahiert: {0}
 out.inflated=\ vergr\u00F6\u00DFert: {0}
 out.size=(ein = {0}) (aus = {1})
 
-usage.compat=Kompatibilit\u00E4tsschnittstelle:\nVerwendung:  jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] Dateien] ...\nOptionen:\n    -c  Neues Archiv erstellen\n    -t  Inhaltsverzeichnis f\u00FCr Archiv anzeigen\n    -x  Benannte (oder alle) Dateien aus Archiv extrahieren\n    -u  Vorhandenes Archiv aktualisieren\n    -v  Ausgabe im Verbose-Modus aus Standardausgabe generieren\n    -f  Dateinamen f\u00FCr Archiv angeben\n    -m  Manifestinformationen aus angegebener Manifestdatei aufnehmen\n    -n  Pack200-Normalisierung nach Erstellung eines neuen Archivs ausf\u00FChren\n    -e  Anwendungseinstiegspunkt f\u00FCr in ausf\u00FChrbare JAR-Datei \n        geb\u00FCndelte Standalone-Anwendung angeben\n    -0  Nur speichern; keine ZIP-Komprimierung verwenden\n    -P  Komponenten mit vorangestelltem "/" (absoluter Pfad) und ".." (\u00FCbergeordnetes Verzeichnis) aus Dateinamen beibehalten\n        -M  Keine Manifestdatei f\u00FCr die Eintr\u00E4ge erstellen\n    -i  Indexinformationen f\u00FCr die angegebenen JAR-Dateien erstellen\n    -C  Zum angegebenen Verzeichnis wechseln und folgende Datei ber\u00FCcksichtigen\nDateien, die Verzeichnisse sind, werden rekursiv verarbeitet.\nDer Name der Manifestdatei, der Name der Archivdatei und der Name des Einstiegspunktes werden\nin derselben Reihenfolge wie die Kennzeichen "m", "f" und "e" angegeben.\n\nBeispiel 1: Zwei Klassendateien in ein Archiv "classes.jar" archivieren: \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Mit der vorhandenen Manifestdatei "mymanifest" alle\n           Dateien im Verzeichnis foo/ in "classes.jar" archivieren: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Kompatibilit\u00E4tsschnittstelle\nVerwendung: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\nOptionen:\n    -c  erstellt ein neues Archiv\n    -t  listet das Inhaltsverzeichnis f\u00FCr das Archiv auf\n    -x  extrahiert die benannten (oder alle) Dateien aus dem Archiv\n    -u  aktualisiert ein vorhandenes Archiv\n    -v  generiert Verbose-Ausgabe zur Standardausgabe\n    -f  gibt den Archivdateinamen an\n    -m  schlie\u00DFt Manifestinformationen aus der angegebenen Manifestdatei ein\n    -e  gibt den Anwendungseinstiegspunkt f\u00FCr Standalone-Anwendungen an,\n        die in einer ausf\u00FChrbaren JAR-Datei geb\u00FCndelt sind\n    -0  speichert nur, keine ZIP-Komprimierung\n    -P  beh\u00E4lt die vorangestellten Komponenten "/" (absoluter Pfad) und ".." (\u00FCbergeordnetes Verzeichnis) aus dem Dateinamen bei\n    -M  generiert keine Manifestdatei f\u00FCr die Eintr\u00E4ge\n    -i  generiert Indexinformationen f\u00FCr die angegebenen JAR-Dateien\n    -C  wechselt zum angegebenen Verzeichnis und schlie\u00DFt die folgende Datei ein\nDateien, die Verzeichnisse sind, werden rekursiv verarbeitet.\nDie Namen der Manifestdatei, der Archivdatei und des Einstiegspunkts werden\nin der gleichen Reihenfolge wie die Flags "m", "f" und "e" verarbeitet.\n\nBeispiel 1: Zwei Klassendateien in einem Archiv classes.jar archivieren: \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Eine vorhandene Manifestdatei "mymanifest" verwenden und alle\n           Dateien im Verzeichnis foo/ directory in "classes.jar" archivieren: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Verwendung: jar [OPTION...] [ [--release VERSION] [-C dir] Dateien] ...
 main.usage.summary.try=Verwenden Sie "jar --help", um weitere Informationen anzuzeigen.
@@ -102,11 +105,12 @@ main.help.opt.main.list=\  -t, --list                 Das Inhaltsverzeichnis f\u
 main.help.opt.main.update=\  -u, --update               Ein vorhandenes JAR-Archiv aktualisieren
 main.help.opt.main.extract=\  -x, --extract              Benannte (oder alle) Dateien aus dem Archiv extrahieren
 main.help.opt.main.describe-module=\  -d, --describe-module      Gibt den Moduldeskriptor oder automatischen Modulnamen aus
+main.help.opt.main.validate=\      --validate             Validiert den Inhalt des JAR-Archivs. Diese Option\n                             validiert, dass die von einem Multi-Release-JAR-Archiv\n                             exportierte API \u00FCber die verschiedenen Releaseversionen\n                             hinweg konsistent ist.
 main.help.opt.any=\ In jedem Modus g\u00FCltige Vorgangsmodifikatoren:\n\n  -C DIR                     Zum angegebenen Verzeichnis wechseln und die folgende\n                             Datei aufnehmen
 main.help.opt.any.file=\  -f, --file=FILE            Der Name der Archivdatei. Wenn Sie dies lauslassen, wird entweder stdin oder\n                             stdout verwendet, je nach Vorgang\n      --release VERSION      Speichert alle der folgenden Dateien in einem versionierten Verzeichnis\n                             der JAR-Datei (d.h. META-INF/versions/VERSION/)
 main.help.opt.any.verbose=\  -v, --verbose              Verbose-Ausgabe bei Standardausgabe generieren
 main.help.opt.create=\ Vorgangsmodifikatoren, die nur im Erstellungsmodus g\u00FCltig sind:\n
-main.help.opt.create.normalize=\  -n, --normalize            Normalisiert Informationen im neuen JAR-Archiv\n                             nach der Erstellung
+main.help.opt.create.normalize=\  -n, --normalize            Normalisiert Informationen im neuen JAR-Archiv\n                             nach der Erstellung. Diese Option ist veraltet, und ihre\n                             Entfernung in einem k\u00FCnftigen JDK-Release ist geplant
 main.help.opt.create.update=\ Vorgangsmodifikatoren, die nur im Erstellungs- und Aktualisierungsmodus g\u00FCltig sind:\n
 main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Der Anwendungseinstiegspunkt f\u00FCr Standalone-\n                             Anwendungen, die in einem modularen oder ausf\u00FChrbaren\n                             JAR-Archiv geb\u00FCndelt sind
 main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Die Manifestinformationen aus der angegebenen\n                             Manifestdatei aufnehmen
@@ -118,8 +122,9 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Hinweis f\u00FCr ein Tool, eine Warnung auszugeben,\n                             wenn das Modul aufgel\u00F6st wird, entweder "deprecated", "deprecated-for-removal"\n                             oder "incubating"
 main.help.opt.create.update.index=\ Vorgangsmodifikatoren, die nur im Erstellungs-, Aktualisierungs- und Indexgenerierungsmodus g\u00FCltig sind:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Nur speichern, keine ZIP-Komprimierung verwenden
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP        Zeitstempel im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied\n                             und optionaler Zeitzone nach ISO-8601, zur Verwendung f\u00FCr die Zeitstempel von\n                             Eintr\u00E4gen, z.B. "2022-02-12T12:30:00-05:00"
 main.help.opt.other=\ Weitere Optionen:\n
-main.help.opt.other.help=\  -h, --help[:compat]        Gibt diese Meldung oder optional die Kompatibilit\u00E4t, Hilfe an
+main.help.opt.other.help=\  -?, -h, --help[:compat]    Gibt diese Meldung oder optional die Kompatibilit\u00E4t, Hilfe an
 main.help.opt.other.help-extra=\      --help-extra           Hilfe zu zus\u00E4tzlichen Optionen
 main.help.opt.other.version=\      --version              Programmversion ausgeben
 main.help.postopt=\ Ein Archiv ist ein modulares JAR-Archiv, wenn der Moduldeskriptor "module-info.class"\n in der Root der angegebenen Verzeichnisse oder in der Root des JAR-Archivs selbst\n vorhanden ist. Die folgenden Vorg\u00E4nge sind nur g\u00FCltig, wenn Sie ein modulares JAR-Archiv\n erstellen oder ein vorhandenes nicht modulares JAR-Archiv aktualisieren: "--module-version",\n "--hash-modules" und "--modulepath".\n\n Obligatorische oder optionale Argumente zu langen Optionen sind auch f\u00FCr die jeweils\n zugeh\u00F6rigen kurzen Optionen obligatorisch oder optional.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
index b17d8c1e08d..a4cdec838f8 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ error.illegal.option=\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 error.unrecognized.option=\u8A8D\u8B58\u3055\u308C\u306A\u3044\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 error.missing.arg=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.file.arg=\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306E\u89E3\u6790\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-error.bad.option=\u30AA\u30D7\u30B7\u30E7\u30F3-{ctxuid}\u306E\u3046\u3061\u306E1\u3064\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+error.bad.option=\u30AA\u30D7\u30B7\u30E7\u30F3-{ctxuid}\u307E\u305F\u306F--validate\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 error.bad.cflag=\u30D5\u30E9\u30B0'c'\u3067\u306F\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u307E\u305F\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.uflag=\u30D5\u30E9\u30B0'u'\u3067\u306F\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304B'e'\u30D5\u30E9\u30B0\u3001\u307E\u305F\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.eflag='e'\u30D5\u30E9\u30B0\u3068'Main-Class'\u5C5E\u6027\u3092\u6301\u3064\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u540C\u6642\u306B\n\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
@@ -52,6 +52,8 @@ error.missing.provider=\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u3
 error.release.value.notnumber=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 error.release.value.toosmall=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u30029\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.release.unexpected.versioned.entry=\u30EA\u30EA\u30FC\u30B9{1}\u3067\u4E88\u671F\u3057\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u6E08\u30A8\u30F3\u30C8\u30EA{0}
+error.date.notvalid=\u65E5\u4ED8{0}\u304C\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u3092\u6307\u5B9A\u3057\u305F\u3001\u6709\u52B9\u306AISO-8601\u306E\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+error.date.out.of.range=\u65E5\u4ED8{0}\u304C\u6709\u52B9\u306A\u7BC4\u56F21980-01-01T00:00:02Z to 2099-12-31T23:59:59Z\u306B\u3042\u308A\u307E\u305B\u3093
 error.validator.jarfile.exception={0}\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093: {1}
 error.validator.jarfile.invalid=\u7121\u52B9\u306A\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u30D5\u30A1\u30A4\u30EB{0}\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F
 error.validator.bad.entry.name=\u30A8\u30F3\u30C8\u30EA\u540D\u304C\u4E0D\u6B63\u3067\u3059: {0}
@@ -103,6 +105,7 @@ main.help.opt.main.list=\  -t\u3001--list                 \u30A2\u30FC\u30AB\u30
 main.help.opt.main.update=\  -u\u3001--update               \u65E2\u5B58\u306Ejar\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3057\u307E\u3059
 main.help.opt.main.extract=\  -x\u3001--extract              \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3057\u307E\u3059
 main.help.opt.main.describe-module=\  -d, --describe-module      \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u307E\u305F\u306F\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u3092\u51FA\u529B\u3057\u307E\u3059
+main.help.opt.main.validate=\      --validate            jar\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u691C\u8A3C\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n                             \u8907\u6570\u30EA\u30EA\u30FC\u30B9\u306Ejar\u30A2\u30FC\u30AB\u30A4\u30D6\u3067\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305FAPI\u304C\n                             \u3059\u3079\u3066\u306E\u7570\u306A\u308B\u30EA\u30EA\u30FC\u30B9\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u4E00\u8CAB\u3057\u3066\u3044\u308B\u3053\u3068\u3092\n                             \u691C\u8A3C\u3057\u307E\u3059\u3002
 main.help.opt.any=\ \u3069\u306E\u30E2\u30FC\u30C9\u3067\u3082\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n\n  -C DIR                     \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u6B21\u306E\u30D5\u30A1\u30A4\u30EB\u3092\n                             \u53D6\u308A\u8FBC\u307F\u307E\u3059
 main.help.opt.any.file=\  -f\u3001--file=FILE            \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u7701\u7565\u3057\u305F\u5834\u5408\u3001stdin\u307E\u305F\u306F\n                             stdout\u306E\u3044\u305A\u308C\u304B\u304C\u64CD\u4F5C\u306B\u57FA\u3065\u3044\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n      --release VERSION      \u6B21\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092jar\u306E\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                             (\u3064\u307E\u308A\u3001META-INF/versions/VERSION/)\u306B\u914D\u7F6E\u3057\u307E\u3059
 main.help.opt.any.verbose=\  -v\u3001--verbose              \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3057\u307E\u3059
@@ -119,6 +122,7 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u8B66\u544A\u3092\u767A\u884C\u3059\u308B\n                             \u30C4\u30FC\u30EB\u306E\u30D2\u30F3\u30C8\u3002\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\n                             \u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B
 main.help.opt.create.update.index=\ \u4F5C\u6210\u3001\u66F4\u65B0\u304A\u3088\u3073\u7D22\u5F15\u751F\u6210\u30E2\u30FC\u30C9\u3067\u306E\u307F\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u307E\u305B\u3093
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP       \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u305FISO-8601\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\n                            \u306E\u65E5\u6642\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3002\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u4F7F\u7528\u4F8B\u306F\u3001\n                             "2022-02-12T12:30:00-05:00"\u3067\u3059
 main.help.opt.other=\ \u305D\u306E\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n
 main.help.opt.other.help=\  -?\u3001-h\u3001--help[:compat]        \u3053\u308C(\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u4E92\u63DB\u6027)\u3092help\u306B\u6307\u5B9A\u3057\u307E\u3059
 main.help.opt.other.help-extra=\      --help-extra           \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u63D0\u4F9B\u3057\u307E\u3059
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
index 36889f522cb..5a4832d0bd4 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ error.illegal.option=\u975E\u6CD5\u9009\u9879: {0}
 error.unrecognized.option=\u65E0\u6CD5\u8BC6\u522B\u7684\u9009\u9879: {0}
 error.missing.arg=\u9009\u9879{0}\u9700\u8981\u53C2\u6570
 error.bad.file.arg=\u89E3\u6790\u6587\u4EF6\u53C2\u6570\u65F6\u51FA\u9519
-error.bad.option=\u5FC5\u987B\u6307\u5B9A {ctxuid} \u4E2D\u7684\u4EFB\u4E00\u9009\u9879\u3002
+error.bad.option=\u5FC5\u987B\u6307\u5B9A -{ctxuid} \u6216 --validate \u9009\u9879\u4E4B\u4E00\u3002
 error.bad.cflag='c' \u6807\u8BB0\u8981\u6C42\u6307\u5B9A\u6E05\u5355\u6216\u8F93\u5165\u6587\u4EF6!
 error.bad.uflag='u' \u6807\u8BB0\u8981\u6C42\u6307\u5B9A\u6E05\u5355, 'e' \u6807\u8BB0\u6216\u8F93\u5165\u6587\u4EF6!
 error.bad.eflag=\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A 'e' \u6807\u8BB0\u548C\u5177\u6709 'Main-Class' \u5C5E\u6027\u7684\n\u6E05\u5355!
@@ -52,6 +52,8 @@ error.missing.provider=\u672A\u627E\u5230\u670D\u52A1\u63D0\u4F9B\u65B9: {0}
 error.release.value.notnumber=\u53D1\u884C\u7248 {0} \u65E0\u6548
 error.release.value.toosmall=\u53D1\u884C\u7248 {0} \u65E0\u6548, \u5FC5\u987B >= 9
 error.release.unexpected.versioned.entry=\u53D1\u884C\u7248 {1} \u5B58\u5728\u610F\u5916\u7684\u7248\u672C\u5316\u6761\u76EE {0}
+error.date.notvalid=\u65E5\u671F {0} \u4E0D\u662F\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684\u6709\u6548 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4
+error.date.out.of.range=\u65E5\u671F {0} \u4E0D\u5728 1980-01-01T00:00:02Z \u5230 2099-12-31T23:59:59Z \u8FD9\u4E00\u6709\u6548\u8303\u56F4\u5185
 error.validator.jarfile.exception=\u65E0\u6CD5\u9A8C\u8BC1 {0}: {1}
 error.validator.jarfile.invalid=\u5220\u9664\u7684\u591A\u53D1\u884C\u7248 jar \u6587\u4EF6 {0} \u65E0\u6548
 error.validator.bad.entry.name=\u6761\u76EE\u540D\u79F0\u683C\u5F0F\u9519\u8BEF, {0}
@@ -103,6 +105,7 @@ main.help.opt.main.list=\  -t, --list                 \u5217\u51FA\u6863\u6848\u
 main.help.opt.main.update=\  -u, --update               \u66F4\u65B0\u73B0\u6709 jar \u6863\u6848
 main.help.opt.main.extract=\  -x, --extract              \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u5168\u90E8) \u6587\u4EF6
 main.help.opt.main.describe-module=\  -d, --describe-module      \u8F93\u51FA\u6A21\u5757\u63CF\u8FF0\u7B26\u6216\u81EA\u52A8\u6A21\u5757\u540D\u79F0
+main.help.opt.main.validate=\      --validate             \u9A8C\u8BC1 jar \u6863\u6848\u7684\u5185\u5BB9\u3002\u6B64\u9009\u9879\n                             \u5C06\u9A8C\u8BC1\u7531\u591A\u53D1\u884C\u7248 jar \u6863\u6848\u5BFC\u51FA\n                             \u7684 API \u5728\u6240\u6709\u4E0D\u540C\u7684\u53D1\u884C\u7248\u672C\u4E2D\n                             \u662F\u5426\u4E00\u81F4\u3002
 main.help.opt.any=\ \u5728\u4EFB\u610F\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n\n  -C DIR                     \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\n                             \u4EE5\u4E0B\u6587\u4EF6
 main.help.opt.any.file=\  -f, --file=FILE            \u6863\u6848\u6587\u4EF6\u540D\u3002\u7701\u7565\u65F6, \u57FA\u4E8E\u64CD\u4F5C\n                             \u4F7F\u7528 stdin \u6216 stdout\n      --release VERSION      \u5C06\u4E0B\u9762\u7684\u6240\u6709\u6587\u4EF6\u90FD\u653E\u5728\n                             jar \u7684\u7248\u672C\u5316\u76EE\u5F55\u4E2D (\u5373 META-INF/versions/VERSION/)
 main.help.opt.any.verbose=\  -v, --verbose              \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA
@@ -119,6 +122,7 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u63D0\u793A\u5DE5\u5177\u5728\u89E3\u6790\u6A21\u5757\u540E\u53D1\u51FA\u8B66\u544A\u3002\n                             \u53EF\u4EE5\u4E3A deprecated, deprecated-for-removal\n                             \u6216 incubating \u4E4B\u4E00
 main.help.opt.create.update.index=\ \u53EA\u5728\u521B\u5EFA, \u66F4\u65B0\u548C\u751F\u6210\u7D22\u5F15\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528 ZIP \u538B\u7F29
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP       \u5177\u6709\u53EF\u9009\u65F6\u533A\u7684 ISO-8601 \u6269\u5C55\u504F\u79FB\n                             \u65E5\u671F\u65F6\u95F4\u683C\u5F0F\u7684\u65F6\u95F4\u6233\uFF08\u7528\u4E8E\u6761\u76EE\u7684\u65F6\u95F4\u6233\uFF09\uFF0C\n                             \u4F8B\u5982\uFF0C"2022-02-12T12:30:00-05:00"
 main.help.opt.other=\ \u5176\u4ED6\u9009\u9879:\n
 main.help.opt.other.help=\  -?, -h, --help[:compat]    \u63D0\u4F9B\u6B64\u5E2E\u52A9\uFF0C\u4E5F\u53EF\u4EE5\u9009\u62E9\u6027\u5730\u63D0\u4F9B\u517C\u5BB9\u6027\u5E2E\u52A9
 main.help.opt.other.help-extra=\      --help-extra           \u63D0\u4F9B\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
new file mode 100644
index 00000000000..4cf302da7b9
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
@@ -0,0 +1,445 @@
+#
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+doclet.build_version=Standard-Doclet-Version {0}
+doclet.Contents=Inhalt
+doclet.Overview=\u00DCberblick
+doclet.Window_Overview_Summary=\u00DCberblick
+doclet.Element=Element
+doclet.Package=Package
+doclet.Unnamed_Package=Unbenanntes Package
+doclet.Module=Modul
+doclet.Open_Module=Modul \u00F6ffnen
+doclet.All_Packages=Alle Packages
+doclet.All_Modules=Alle Module
+doclet.None=Kein Wert
+doclet.Tree=Baum
+doclet.Class_Hierarchy=Klassenhierarchie
+doclet.Window_Class_Hierarchy=Klassenhierarchie
+doclet.Interface_Hierarchy=Schnittstellenhierarchie
+doclet.Enum_Hierarchy=Enum-Hierarchie
+doclet.Enum_Class_Hierarchy=Enum-Klassenhierarchie
+doclet.Annotation_Type_Hierarchy=Annotationstyphierarchie
+doclet.Annotation_Interface_Hierarchy=Annotationsschnittstellenhierarchie
+doclet.Href_Class_Title=Klasse in {0}
+doclet.Href_Interface_Title=Schnittstelle in {0}
+doclet.Href_Annotation_Title=Annotation in {0}
+doclet.Href_Annotation_Interface_Title=Annotationsschnittstelle in {0}
+doclet.Href_Enum_Title=Enum in {0}
+doclet.Href_Enum_Class_Title=Enum-Klasse in {0}
+doclet.Href_Type_Param_Title=Typparameter in {0}
+doclet.Href_Class_Or_Interface_Title=Klasse oder Schnittstelle in {0}
+doclet.Summary=\u00DCbersicht:
+doclet.Detail=Details:
+doclet.Module_Sub_Nav=Modul:
+doclet.Help_Sub_Nav=Hilfe:
+doclet.Package_Sub_Nav=Package:
+doclet.navClassesAndInterfaces=Klassen und Schnittstellen
+doclet.navDescription=Beschreibung
+doclet.navModules=Module
+doclet.navPackages=Packages
+doclet.navServices=Services
+doclet.navNested=Verschachtelt
+doclet.navAnnotationTypeOptionalMember=Optional
+doclet.navAnnotationTypeRequiredMember=Erforderlich
+doclet.navAnnotationTypeMember=Element
+doclet.navField=Feld
+doclet.navProperty=Eigenschaft
+doclet.navEnum=Enum-Konstanten
+doclet.navConstructor=Konstruktor
+doclet.navMethod=Methode
+doclet.navNavigation=Navigation
+doclet.navPages=Seiten
+doclet.not.exhaustive=(nicht umfassend)
+doclet.Index=Index
+doclet.Window_Single_Index=Index
+doclet.Window_Split_Index={0}-Index
+doclet.Help=Hilfe
+doclet.Skip_navigation_links=Navigations-Links \u00FCberspringen
+doclet.Toggle_navigation_links=Navigationslinks umschalten
+doclet.Navigation=Navigation
+doclet.navDeprecated=Veraltet
+doclet.Window_Deprecated_List=Veraltete Liste
+doclet.Window_New_List=Neue API-Liste
+doclet.Window_Preview_List=Vorschauliste
+doclet.Overrides=Setzt au\u00DFer Kraft:
+doclet.in_class=in Klasse
+doclet.Element_in=Element in {0}
+doclet.Enum_constant_in=Enum-Konstante in {0}
+doclet.Static_variable_in=Statische Variable in {0}
+doclet.Variable_in=Variable in {0}
+doclet.Constructor_for=Konstruktor f\u00FCr {0}
+doclet.Record_component_in=Komponente von {0} erfassen
+doclet.Static_method_in=Statische Methode in {0}
+doclet.Search_tag_in=Tag suchen in {0}
+doclet.Method_in=Methode in {0}
+doclet.module=Modul
+doclet.package=Package
+doclet.MalformedURL=Nicht wohlgeformte URL: {0}
+doclet.File_error=Fehler beim Lesen der Datei: {0}
+doclet.URL_error=Fehler beim Abrufen der URL: {0}
+doclet.Resource_error=Fehler beim Lesen der Ressource: {0}
+doclet.see.class_or_package_not_found=Tag {0}: Referenz nicht gefunden: {1}
+doclet.see.class_or_package_not_accessible=Tag {0}: Referenz nicht zug\u00E4nglich: {1}
+doclet.see.nested_link=Tag {0}: Verschachtelter Link
+doclet.tag.invalid_usage=Ung\u00FCltige Verwendung des Tags {0}
+doclet.tag.invalid_input=Ung\u00FCltige Eingabe: "{0}"
+doclet.tag.invalid=ung\u00FCltiges @{0}
+doclet.Deprecated_API=Veraltete API
+doclet.Deprecated_Elements=Veraltete {0}
+doclet.Deprecated_In_Release=Veraltet in {0}
+doclet.Deprecated_Tabs_Intro=(Die Registerkarte "Veraltet ..." ganz links zeigt alle veralteten Elemente, unabh\u00E4ngig von dem Release, seit dem sie veraltet sind. Jede der anderen Registerkarten "Veraltet in ..." zeigt die Elemente, die seit einem bestimmten Release veraltet sind.)
+doclet.New_API=Neue API
+doclet.New_Elements=Neue {0}
+doclet.New_Elements_Added_In_Release=Hinzugef\u00FCgt in {0}
+doclet.New_Label=Neu
+doclet.New_Tabs_Intro=(Die Registerkarte "Neu ..." ganz links zeigt alle neuen Elemente, unabh\u00E4ngig von dem Release, in dem sie hinzugef\u00FCgt wurden. Jede der anderen Registerkarten "Hinzugef\u00FCgt in ..." zeigt die Elemente, die in einem bestimmten Release hinzugef\u00FCgt wurden. Elemente, die auf der Registerkarte ganz links angezeigt werden, werden auch auf einer der Registerkarten weiter rechts angezeigt.)
+doclet.Preview_API=Vorschau-API
+doclet.Preview_Label=Vorschau
+doclet.Preview_Mark=PREVIEW
+doclet.Terminally_Deprecated=Endg\u00FCltig veraltet
+doclet.Terminally_Deprecated_Elements=Endg\u00FCltig veraltete Elemente
+doclet.Terminally_Deprecated_In_Release=Endg\u00FCltig veraltet in {0}
+doclet.Annotation_Types=Annotationstypen
+doclet.Annotation_Interfaces=Annotationsschnittstellen
+doclet.Annotation_Type_Members=Annotationstypelemente
+doclet.Annotation_Interface_Members=Annotationsschnittstellenelemente
+doclet.annotation_types=Annotationstypen
+doclet.annotation_interfaces=Annotationsschnittstellen
+doclet.annotation_type_members=Annotationstypelemente
+doclet.annotation_interface_members=Annotationsschnittstellenelemente
+doclet.Generated_Docs_Untitled=Generierte Dokumentation (unbenannt)
+doclet.Other_Packages=Andere Packages
+doclet.Description=Beschreibung
+doclet.Specified_By=Angegeben von:
+doclet.in_interface=in Schnittstelle
+doclet.Subclasses=Bekannte direkte Unterklassen:
+doclet.Subinterfaces=Alle bekannten Unterschnittstellen:
+doclet.Implementing_Classes=Alle bekannten Implementierungsklassen:
+doclet.Functional_Interface=Funktionsschnittstelle:
+doclet.Functional_Interface_Message=Dies ist eine funktionale Schnittstelle, die somit als Zuweisungsziel f\u00FCr einen Lambdaausdruck oder eine Methodenreferenz verwendet werden kann.
+doclet.also=auch
+doclet.Package_Hierarchies=Packagehierarchien:
+doclet.Hierarchy_For_Package=Hierarchie f\u00FCr Package {0}
+doclet.Hierarchy_For_All_Packages=Hierarchie f\u00FCr alle Packages
+doclet.Hierarchy_For_Unnamed_Package=Hierarchie f\u00FCr unbenanntes Package
+doclet.No_Script_Message=JavaScript ist im Browser deaktiviert.
+doclet.Description_From_Interface=Beschreibung aus Schnittstelle kopiert:
+doclet.Description_From_Class=Beschreibung aus Klasse kopiert:
+doclet.No_Non_Deprecated_Classes_To_Document=Keine zu dokumentierenden nicht veralteten Klassen gefunden.
+doclet.Interfaces=Schnittstellen
+doclet.Enclosing_Class=Umschlie\u00DFende Klasse:
+doclet.Enclosing_Interface=Umschlie\u00DFende Schnittstelle:
+doclet.Inheritance_Tree=Vererbungsbaum
+doclet.ReferencedIn=Referenziert in
+doclet.System_Property=Systemeigenschaft
+doclet.systemProperties=Systemeigenschaften
+doclet.systemPropertiesSummary=Systemeigenschaften - \u00DCbersicht
+doclet.Window_Source_title=Quellcode
+doclet.Window_Help_title=API-Hilfe
+
+doclet.help.main_heading=Hilfe zu JavaDoc
+doclet.help.navigation.head=Navigation
+# 0: link to the Overview page
+doclet.help.navigation.intro=Ausgehend von der Seite {0} k\u00F6nnen Sie die Dokumentation mithilfe der Links durchsuchen, die sich auf jeder Seite und in der Navigationsleiste oben auf jeder Seite befinden.
+# 0: link to the Index;  1: short list of links
+doclet.help.navigation.index=Mit {0} und dem Suchfeld k\u00F6nnen Sie zu spezifischen Deklarationen und \u00DCbersichtsseiten navigieren, wie {1}
+doclet.help.page_kinds.head=Seitenarten
+doclet.help.page_kinds.intro=Die folgenden Abschnitte beschreiben die verschiedenen Seitenarten in dieser Collection.
+# 0: link to the Overview page
+doclet.help.overview.modules.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enth\u00E4lt eine Liste aller Module mit einer \u00DCbersicht f\u00FCr jedes Modul. Diese Seite kann auch eine Gesamtbeschreibung des Modulsets enthalten.
+# 0: link to the Overview page
+doclet.help.overview.packages.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enth\u00E4lt eine Liste aller Packages mit einer \u00DCbersicht f\u00FCr jedes Packages. Diese Seite kann auch eine Gesamtbeschreibung des Packagesets enthalten.
+doclet.help.package.intro=F\u00FCr jedes Package ist eine Seite vorhanden, die eine Liste der Klassen und Schnittstellen mit jeweils einer \u00DCbersicht daf\u00FCr enth\u00E4lt. Diese Seiten k\u00F6nnen die folgenden Kategorien enthalten:
+doclet.help.module.intro=F\u00FCr jedes Modul ist eine Seite vorhanden, die eine Liste der Packages, Abh\u00E4ngigkeiten von anderen Modulen und Services mit jeweils einer \u00DCbersicht daf\u00FCr enth\u00E4lt. Diese Seiten k\u00F6nnen die folgenden Kategorien enthalten:
+doclet.help.class_interface.head=Klasse oder Schnittstelle
+doclet.help.class_interface.intro=F\u00FCr jede Klasse, Schnittstelle, verschachtelte Klasse und verschachtelte Schnittstelle ist eine separate Seite vorhanden. Jede dieser Seiten enth\u00E4lt drei Abschnitte, die aus einer Deklaration und Beschreibung, Mitglieder\u00FCbersichtstabellen und detaillierten Mitgliederbeschreibungen bestehen. Die Eintr\u00E4ge in diesen Abschnitten werden weggelassen, wenn sie leer oder nicht anwendbar sind.
+doclet.help.class_interface.inheritance_diagram=Klassenvererbungsdiagramm
+doclet.help.class_interface.subclasses=Direkte Unterklassen
+doclet.help.class_interface.subinterfaces=Alle bekannten Unterschnittstellen
+doclet.help.class_interface.implementations=Alle bekannten Implementierungsklassen
+doclet.help.class_interface.declaration=Klassen- oder Schnittstellendeklaration
+doclet.help.class_interface.description=Klassen- oder Schnittstellenbeschreibung
+doclet.help.class_interface.member_order=Die \u00DCbersichtseintr\u00E4ge sind alphabetisch geordnet, w\u00E4hrend die detaillierten Beschreibungen in der Reihenfolge aufgef\u00FChrt werden, in der sie im Quellcode auftreten. So werden die vom Programmierer festgelegten logischen Gruppierungen beibehalten.
+doclet.help.class_interface.note=Hinweis:
+doclet.help.class_interface.anno=Annotationsschnittstellen haben erforderliche und optionale Elemente, aber nicht Methoden.
+doclet.help.class_interface.enum=Nur Enum-Klassen haben Enum-Konstanten.
+doclet.help.class_interface.record=Die Komponenten einer Datensatzklasse werden als Teil der Deklaration der Datensatzklasse angezeigt.
+doclet.help.class_interface.property=Eigenschaften sind ein Feature von JavaFX.
+doclet.help.other_files.head=Weitere Dateien
+doclet.help.other_files.body=Packages und Module k\u00F6nnen Seiten mit weiteren Informationen zu den Deklarationen in der N\u00E4he enthalten.
+doclet.help.use.head=Verwendung
+doclet.help.use.body=F\u00FCr jedes dokumentierte Package sowie jede Klasse und jede Schnittstelle ist eine eigene Verwendungsseite vorhanden. Auf dieser Seite wird beschrieben, welche Packages, Klassen, Methoden, Konstruktoren und Felder einen Teil der angegebenen Klasse oder des angegebenen Packages verwenden. Bei der Klasse oder Schnittstelle A enth\u00E4lt die Verwendungsseite die Unterklassen von A, als A deklarierte Felder, Methoden, die A zur\u00FCckgeben, sowie Methoden und Konstruktoren mit Parametern des Typs A. Sie k\u00F6nnen diese Seite aufrufen, indem Sie zun\u00E4chst das Package, die Klasse oder die Schnittstelle aufrufen und anschlie\u00DFend in der Navigationsleiste auf den Link "Verwendung" klicken.
+doclet.help.tree.head=Baum (Klassenhierarchie)
+# 0: link to main Class Hierarchy page;  1: java.lang.Object
+doclet.help.tree.intro=Es gibt eine Seite {0} f\u00FCr alle Packages, und f\u00FCr jedes Package gibt es eine Hierarchie. Jede Hierarchieseite enth\u00E4lt eine Klassen- und eine Schnittstellenliste. Die Klassen sind nach Vererbungsstruktur organisiert, beginnend mit {1}. Die Schnittstellen erben nicht von {1}.
+doclet.help.tree.overview=Wenn Sie auf der \u00DCbersichtsseite auf "Baum" klicken, wird die Hierarchie f\u00FCr alle Packages angezeigt.
+doclet.help.tree.package=Wenn Sie eine bestimmte Package-, Klassen- oder Schnittstellenseite anzeigen und auf "Baum" klicken, wird die Hierarchie nur f\u00FCr dieses Package angezeigt.
+# 0: link to the Deprecated summary page
+doclet.help.deprecated.body=Auf der Seite {0} werden alle APIs aufgef\u00FChrt, die veraltet sind. Die Verwendung einer veralteten API ist nicht empfehlenswert, im Allgemeinen aufgrund von M\u00E4ngeln. In der Regel wird eine Ersatz-API angegeben. Veraltete APIs werden in k\u00FCnftigen Implementierungen m\u00F6glicherweise entfernt.
+# 0: link to the Preview summary page
+doclet.help.preview.body=Die Seite {0} listet alle Vorschau-APIs auf. Vorschau-APIs k\u00F6nnen in k\u00FCnftigen Implementierungen entfernt werden.
+doclet.help.new.body=Die Seite {0} listet APIs auf, die in neueren Releases hinzugef\u00FCgt wurden.
+doclet.help.index.head=Index
+# 0: link to Index page;  1: list of links to pages
+doclet.help.index.body=Die {0} enth\u00E4lt einen alphabetischen Index aller Klassen, Schnittstellen, Konstruktoren, Methoden und Felder in der Dokumentation sowie \u00DCbersichtsseiten wie {1}.
+doclet.help.all_classes.head=Alle Klassen und Schnittstellen
+# 0: link to All Classes page
+doclet.help.all_classes.body=Die Seite {0} enth\u00E4lt einen alphabetischen Index aller Klassen und Schnittstellen in der Dokumentation, einschlie\u00DFlich Annotationsschnittstellen, Enum-Klassen und Datensatzklassen.
+doclet.help.all_packages.head=Alle Packages
+# 0: link to All Packages page
+doclet.help.all_packages.body=Die Seite {0} enth\u00E4lt einen alphabetischen Index aller Packages, die in der Dokumentation enthalten sind.
+doclet.help.serial_form.body=Jede serialisierbare oder externalisierbare Klasse verf\u00FCgt \u00FCber eine Beschreibung der zugeh\u00F6rigen Serialisierungsfelder und -methoden. Diese Informationen sind eher f\u00FCr Implementierer als f\u00FCr Benutzer der API von Interesse. Die Navigationsleiste enth\u00E4lt zwar keinen Link, Sie k\u00F6nnen diese Informationen jedoch abrufen, indem Sie zu einer beliebigen serialisierten Klasse navigieren und im Abschnitt "Siehe auch" der Klassenbeschreibung auf "Serialisierte Form" klicken.
+# 0: link to Constant Values page
+doclet.help.constants.body=Auf der Seite {0} sind die statischen endg\u00FCltigen Felder und deren Werte aufgef\u00FChrt.
+# 0: link to System Properties page
+doclet.help.systemProperties.body=Die Seite {0} listet Referenzen auf Systemeigenschaften auf.
+doclet.help.footnote=Diese Hilfedatei gilt f\u00FCr die vom Standard-Doclet generierte API-Dokumentation.
+doclet.help.enum.intro=F\u00FCr jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.enum.class.intro=F\u00FCr jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.annotation_type.intro=F\u00FCr jeden Annotationstyp ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.annotation_interface.intro=F\u00FCr jede Annotationsschnittstelle ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.annotation_type.declaration=Deklaration des Annotationstyps
+doclet.help.annotation_interface.declaration=Deklaration der Annotationsschnittstelle
+doclet.help.annotation_type.description=Beschreibung des Annotationstyps
+doclet.help.annotation_interface.description=Beschreibung der Annotationsschnittstelle
+doclet.help.search.head=Suchen
+# Introduction to Javadoc search features, followed by a list of examples
+doclet.help.search.intro=Sie k\u00F6nnen nach Definitionen von Modulen, Packages, Typen, Feldern, Methoden, Systemeigenschaften und anderen Ausdr\u00FCcken suchen, die in der API definiert sind. Dazu k\u00F6nnen Sie denn Namen ganz oder teilweise oder optional auch Abk\u00FCrzungen mit Binnenmajuskeln ("camelCase") eingeben. Beispiel:
+# Used to list search examples, {0} is a search term and {1} the matching result
+doclet.help.search.example={0} findet {1}
+# {0} contains a link to the current Javadoc Search Specification
+doclet.help.search.refer=Eine vollst\u00E4ndige Beschreibung der Suchfeatures finden Sie in der {0}.
+# The URL for the Javadoc Search Specification. {0} will be replaced by the JDK version number
+doclet.help.search.spec.url=https://docs.oracle.com/en/java/javase/{0}/docs/specs/javadoc/javadoc-search-spec.html
+# The title for the Javadoc Search Specification
+doclet.help.search.spec.title=Javadoc-Suchspezifikation
+
+doclet.ClassUse_Packages.that.use.0=Packages, die {0} verwenden
+doclet.ClassUse_Uses.of.0.in.1=Verwendungen von {0} in {1}
+doclet.ClassUse_Classes.in.0.used.by.1=Von {1} verwendete Klassen in {0}
+doclet.ClassUse_PackageAnnotation=Packages mit Annotationen vom Typ {0}
+doclet.ClassUse_Annotation=Klassen in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_TypeParameter=Klassen in {1} mit Typparametern vom Typ {0}
+doclet.ClassUse_MethodTypeParameter=Methoden in {1} mit Typparametern vom Typ {0}
+doclet.ClassUse_FieldTypeParameter=Felder in {1} mit Typparametern vom Typ {0}
+doclet.ClassUse_FieldAnnotations=Felder in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_MethodAnnotations=Methoden in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_MethodParameterAnnotations=Methodenparameter in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_MethodReturnTypeParameter=Methoden in {1}, die Typen mit Argumenten vom Typ {0} zur\u00FCckgeben
+doclet.ClassUse_Subclass=Unterklassen von {0} in {1}
+doclet.ClassUse_Subinterface=Unterschnittstellen von {0} in {1}
+doclet.ClassUse_ImplementingClass=Klassen in {1}, die {0} implementieren
+doclet.ClassUse_Field=Felder in {1}, die deklariert sind als {0}
+doclet.ClassUse_MethodReturn=Methoden in {1}, die {0} zur\u00FCckgeben
+doclet.ClassUse_MethodArgs=Methoden in {1} mit Parametern vom Typ {0}
+doclet.ClassUse_MethodArgsTypeParameters=Methodenparameter in {1} mit Typargumenten vom Typ {0}
+doclet.ClassUse_MethodThrows=Methoden in {1}, die {0} ausl\u00F6sen
+doclet.ClassUse_ConstructorAnnotations=Konstruktoren in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_ConstructorParameterAnnotations=Konstruktorparameter in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_ConstructorArgs=Konstruktoren in {1} mit Parametern vom Typ {0}
+doclet.ClassUse_ConstructorArgsTypeParameters=Konstruktorparameter in {1} mit Typargumenten vom Typ {0}
+doclet.ClassUse_ConstructorThrows=Konstruktoren in {1}, die {0} ausl\u00F6sen
+doclet.ClassUse_No.usage.of.0=Keine Verwendung von {0}
+doclet.Window_ClassUse_Header=Verwendungsweise von {0} {1}
+doclet.ClassUse_Title=Verwendungen von {0}
+doclet.navClassUse=Verwendung
+doclet.Error_in_grouplist=Ung\u00FCltige Option -group: {0} {1}
+doclet.Groupname_already_used=In der Option -group wird der Gruppenname bereits verwendet: {0}
+doclet.Same_element_name_used=Elementname oder Muster zweimal verwendet: {0}
+doclet.PreviewLeadingNote={0} basiert auf Vorschaufeatures der Java-Plattform:
+doclet.Declared_Using_Preview={0} wird mit {1} deklariert, einem Vorschaufeature der Programmiersprache Java ({2}).
+doclet.PreviewAPI={0} bezieht sich auf mindestens eine Vorschau-API: {1}.
+doclet.ReflectivePreviewAPI={0} bezieht sich auf mindestens eine reflektive Vorschau-API: {1}.
+doclet.UsesDeclaredUsingPreview={0} bezieht sich auf mindestens einen Typ, der mit einem Vorschaufeature der Programmiersprache Java deklariert wird: {1}.
+doclet.PreviewTrailingNote1=Programme k\u00F6nnen {0} nur verwenden, wenn Vorschaufeatures aktiviert sind.
+doclet.PreviewTrailingNote2=Vorschaufeatures k\u00F6nnen in k\u00FCnftigen Releases entfernt oder zu permanenten Features der Java-Plattform hochgestuft werden.
+doclet.Declared_Using_Preview.SEALED=Verschl\u00FCsselte Klassen
+doclet.Declared_Using_Preview.SEALED_PERMITS=Verschl\u00FCsselte Klassen
+doclet.PreviewPlatformLeadingNote={0} ist eine Vorschau-API der Java-Plattform.
+doclet.ReflectivePreviewPlatformLeadingNote={0} ist eine reflektive Vorschau-API der Java-Plattform.
+
+# 0: an exception
+doclet.Error_copying_legal_notices=Fehler beim Kopieren der rechtlichen Hinweise: {0}
+# 0: the path; 1: the detail message for the exception
+doclet.Error_invalid_path_for_legal_notices=Ung\u00FCltiger Pfad "{0}" f\u00FCr rechtliche Hinweise: {1}
+
+# option specifiers
+doclet.usage.add-script.parameters=<Datei>
+doclet.usage.add-script.description=F\u00FCgt der generierten Dokumentation eine Skriptdatei hinzu
+doclet.usage.add-stylesheet.parameters=<Datei>
+doclet.usage.add-stylesheet.description=F\u00FCgt der generierten Dokumentation eine Stylesheet-Datei hinzu
+doclet.usage.d.parameters=<Verzeichnis>
+doclet.usage.d.description=Zielverzeichnis f\u00FCr Ausgabedateien
+
+doclet.usage.use.description=Verwendungsseiten f\u00FCr Klassen und Packages erstellen
+
+doclet.usage.version.description=@version-Abs\u00E4tze aufnehmen
+
+doclet.usage.author.description=@author-Abs\u00E4tze aufnehmen
+
+doclet.usage.docfilessubdirs.description=doc-file-Unterverzeichnisse rekursiv kopieren
+
+doclet.usage.splitindex.description=Index in eine Datei pro Buchstabe aufteilen
+
+doclet.usage.overview.parameters=<Datei>
+doclet.usage.overview.description=\u00DCberblickdokumentation aus HTML-Datei lesen
+
+doclet.usage.windowtitle.parameters=<Text>
+doclet.usage.windowtitle.description=Browserfenstertitel f\u00FCr die Dokumentation
+
+doclet.usage.doctitle.parameters=<HTML-Code>
+doclet.usage.doctitle.description=Titel f\u00FCr die \u00DCberblickseite aufnehmen
+
+doclet.usage.header.parameters=<HTML-Code>
+doclet.usage.header.description=Headertext f\u00FCr jede Seite aufnehmen
+
+doclet.usage.html5.description=Generiert eine HTML 5-Ausgabe. Diese Option wird nicht mehr ben\u00F6tigt.
+
+doclet.usage.footer.parameters=<HTML-Code>
+doclet.usage.footer.description=Footertext f\u00FCr jede Seite aufnehmen
+
+doclet.usage.top.parameters=<HTML-Code>
+doclet.usage.top.description=Oberen Text f\u00FCr jede Seite aufnehmen
+
+doclet.usage.bottom.parameters=<HTML-Code>
+doclet.usage.bottom.description=Unteren Text f\u00FCr jede Seite aufnehmen
+
+doclet.usage.link.parameters=< URL>
+doclet.usage.link.description=Links zur javadoc-Ausgabe unter <url> erstellen
+
+doclet.usage.linkoffline.parameters=<URL1> <URL2>
+doclet.usage.linkoffline.description=Link zu Dokumenten unter <url> mit Packageliste unter <url2> erstellen
+
+# L10N: do not localize the option parameters: warn info
+doclet.usage.link-modularity-mismatch.parameters=(warn|info)
+doclet.usage.link-modularity-mismatch.description=Meldet externe Dokumentation mit der falschen Modularit\u00E4t mit einer\nWarn- oder Informationsmeldung. Das Standardverhalten ist\nWarnen.
+
+doclet.usage.link-platform-properties.parameters=< URL>
+doclet.usage.link-platform-properties.description=Link zu Plattformdokumentations-URLs, die in der Eigenschaftendatei auf <URL> deklariert sind
+
+doclet.usage.excludedocfilessubdir.parameters=<Name>:...
+doclet.usage.excludedocfilessubdir.description=doc-files-Unterverzeichnisse mit angegebenem Namen ausschlie\u00DFen
+
+doclet.usage.group.parameters=<Name> <g1>:<g2>...
+doclet.usage.group.description=Angegebene Elemente auf \u00DCberblickseite gruppieren
+
+doclet.usage.legal-notices.parameters='default' | 'none' | <Verzeichnis>
+doclet.usage.legal-notices.description=Steuert die rechtlichen Hinweise in der generierten Ausgabe
+
+doclet.usage.nocomment.description=Beschreibung und Tags unterdr\u00FCcken und nur Deklarationen generieren
+
+doclet.usage.nodeprecated.description=@deprecated-Informationen nicht aufnehmen
+
+doclet.usage.noqualifier.parameters=<Name1>:<Name2>:...
+doclet.usage.noqualifier.description=Liste der Qualifier aus der Ausgabe ausschlie\u00DFen
+
+doclet.usage.nosince.description=@since-Informationen nicht aufnehmen
+
+doclet.usage.notimestamp.description=Ausgeblendeten Zeitstempel nicht aufnehmen
+
+doclet.usage.nodeprecatedlist.description=Veraltet-Liste nicht generieren
+
+doclet.usage.no-module-directories.description=Gruppiert Dateien f\u00FCr die Moduldokumentation nicht in \nmodulspezifischen Verzeichnisse
+
+doclet.usage.no-platform-links.description=Generiert keine Links zur Plattformdokumentation
+
+doclet.usage.notree.description=Klassenhierarchie nicht generieren
+
+doclet.usage.noindex.description=Index nicht generieren
+
+doclet.usage.nohelp.description=Hilfelink nicht generieren
+
+doclet.usage.nonavbar.description=Navigationsleiste nicht generieren
+
+doclet.usage.nooverview.description=\u00DCberblickseiten nicht generieren
+
+doclet.usage.serialwarn.description=Warnung wegen @serial-Tag generieren
+
+doclet.usage.since.parameters=<Release>(,<Release>)*
+doclet.usage.since.description=Dokumentiert die neue und die veraltete API in den angegebenen Releases
+
+doclet.usage.since-label.parameters=<Text>
+doclet.usage.since-label.description=Liefert Text f\u00FCr die \u00DCberschrift der Seite "Neue API"
+
+doclet.usage.tag.parameters=<Name>:<Positionen>:<Header>
+doclet.usage.tag.description=Benutzerdefinierte Tags mit einem Argument angeben
+
+doclet.usage.taglet.description=Vollqualifizierter Name des zu registrierenden Taglets
+
+doclet.usage.tagletpath.description=Pfad zu Taglets
+
+doclet.usage.snippet-path.parameters=<Pfad>
+
+doclet.usage.snippet-path.description=Der Pfad f\u00FCr externe Snippets
+
+doclet.usage.charset.parameters=<Zeichensatz>
+doclet.usage.charset.description=Zeichensatz f\u00FCr plattform\u00FCbergreifende Anzeige der generierten Dokumentation
+
+doclet.usage.javafx.description=Aktiviert die JavaFX-Funktionalit\u00E4t
+
+doclet.usage.helpfile.parameters=<Datei>
+doclet.usage.helpfile.description=Datei aufnehmen, zu der der Hilfelink verlinkt
+
+doclet.usage.linksource.description=Quelle in HTML generieren
+
+doclet.usage.sourcetab.parameters=<Tabulatorl\u00E4nge>
+doclet.usage.sourcetab.description=Anzahl der Leerzeichen angeben, die jedes Register in der Quelle beansprucht
+
+doclet.usage.keywords.description=HTML-Metatags mit Informationen zu Package, Klasse und Member aufnehmen
+
+doclet.usage.main-stylesheet.parameters=<Datei>
+doclet.usage.main-stylesheet.description=Datei zum \u00C4ndern des Stils der generierten Dokumentation
+
+doclet.usage.docencoding.parameters=<Name>
+doclet.usage.docencoding.description=Zeichensatzcodierung f\u00FCr die Ausgabe angeben
+
+doclet.usage.frames.description=Aktiviert die Verwendung von Frames in der generierten Ausgabe
+
+doclet.usage.no-frames.description=Deaktiviert die Verwendung von Frames in der generierten Ausgabe (Standard)
+
+doclet.usage.override-methods.parameters=(detail|summary)
+
+doclet.usage.override-methods.description=Au\u00DFer Kraft gesetzte Methoden im Abschnitt "detail" oder "summary" dokumentieren
+
+doclet.usage.allow-script-in-comments.description=JavaScript in Optionen und Kommentaren zulassen
+
+doclet.usage.xdocrootparent.parameters=< URL>
+doclet.usage.xdocrootparent.description=Ersetzt alle Vorkommen von @docRoot gefolgt von /.. in doc-Kommentaren durch\n<url>
+
+doclet.usage.xdoclint.description=Empfohlene Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren
+
+doclet.usage.xdoclint-extended.parameters=(all|none|[-]<Gruppe>)
+# L10N: do not localize these words: all none accessibility html missing reference syntax
+doclet.usage.xdoclint-extended.description=Bestimmte Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren\noder deaktivieren, wobei <group> einen der folgenden Werte hat:\naccessibility, html, missing, reference oder syntax.
+
+doclet.usage.xdoclint-package.parameters=([-]<Packages>)
+doclet.usage.xdoclint-package.description=Pr\u00FCfungen in bestimmten Packages aktivieren oder deaktivieren.\n<packages> ist eine durch Komma getrennte Liste von Packagebezeichnern.\nEin Packagebezeichner ist entweder ein vollst\u00E4ndiger Name oder ein Namenspr\u00E4fix\neines Packages, gefolgt von .*, und bezieht sich auf alle Unterpackages\ndes angegebenen Packages. Stellen Sie dem Packagebezeichner - voran,\num Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.
+
+# L10N: do not localize the option name --no-frames
+doclet.NoFrames_specified=Die Option --no-frames wird nicht mehr ben\u00F6tigt und wird m\u00F6glicherweise\nin einem zuk\u00FCnftigen Release entfernt.
+
+# L10N: do not localize the option name -footer
+doclet.footer_specified=Die Option -footer wird nicht mehr unterst\u00FCtzt und wird ignoriert.\nSie wird m\u00F6glicherweise in einem zuk\u00FCnftigen Release entfernt.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
index ec702dad3e4..648985e4234 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
@@ -29,6 +29,7 @@ doclet.Overview=\u6982\u8981
 doclet.Window_Overview_Summary=\u6982\u8981
 doclet.Element=\u8981\u7D20
 doclet.Package=\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.Unnamed_Package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.Module=\u30E2\u30B8\u30E5\u30FC\u30EB
 doclet.Open_Module=\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u958B\u304F
 doclet.All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
@@ -39,17 +40,24 @@ doclet.Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Window_Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
 doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64
+doclet.Enum_Class_Hierarchy=\u5217\u6319\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64
+doclet.Annotation_Interface_Hierarchy=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
 doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9
 doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8
+doclet.Href_Annotation_Interface_Title={0}\u5185\u306E\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
+doclet.Href_Enum_Class_Title={0}\u306E\u5217\u6319\u30AF\u30E9\u30B9
 doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
 doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Summary=\u6982\u8981:
 doclet.Detail=\u8A73\u7D30:
 doclet.Module_Sub_Nav=\u30E2\u30B8\u30E5\u30FC\u30EB:
-doclet.navModuleDescription=\u8AAC\u660E
+doclet.Help_Sub_Nav=\u30D8\u30EB\u30D7:
+doclet.Package_Sub_Nav=\u30D1\u30C3\u30B1\u30FC\u30B8:
+doclet.navClassesAndInterfaces=\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.navDescription=\u8AAC\u660E
 doclet.navModules=\u30E2\u30B8\u30E5\u30FC\u30EB
 doclet.navPackages=\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.navServices=\u30B5\u30FC\u30D3\u30B9
@@ -62,16 +70,20 @@ doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.navEnum=\u5217\u6319\u5B9A\u6570
 doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
+doclet.navNavigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+doclet.navPages=\u30DA\u30FC\u30B8
 doclet.not.exhaustive=(\u7DB2\u7F85\u7684\u3067\u306A\u3044)
 doclet.Index=\u7D22\u5F15
 doclet.Window_Single_Index=\u7D22\u5F15
 doclet.Window_Split_Index={0}\u306E\u7D22\u5F15
 doclet.Help=\u30D8\u30EB\u30D7
 doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
+doclet.Toggle_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u306E\u5207\u66FF\u3048
 doclet.Navigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-doclet.New_Page=NewPage
 doclet.navDeprecated=\u975E\u63A8\u5968
 doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
+doclet.Window_New_List=\u65B0\u898FAPI\u30EA\u30B9\u30C8
+doclet.Window_Preview_List=\u30EA\u30B9\u30C8\u306E\u30D7\u30EC\u30D3\u30E5\u30FC
 doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9:
 doclet.in_class=\u30AF\u30E9\u30B9\u5185
 doclet.Element_in={0}\u306E\u8981\u7D20
@@ -91,14 +103,33 @@ doclet.URL_error=URL\u53D6\u51FA\u3057\u30A8\u30E9\u30FC: {0}
 doclet.Resource_error=\u30EA\u30BD\u30FC\u30B9\u8AAD\u53D6\u308A\u30A8\u30E9\u30FC: {0}
 doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1}
 doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
+doclet.see.nested_link=\u30BF\u30B0{0}: \u30EA\u30F3\u30AF\u304C\u30CD\u30B9\u30C8\u3055\u308C\u3066\u3044\u307E\u3059
 doclet.tag.invalid_usage=\u30BF\u30B0{0}\u306E\u4F7F\u7528\u65B9\u6CD5\u304C\u7121\u52B9\u3067\u3059
+doclet.tag.invalid_input=\u5165\u529B\u304C\u7121\u52B9\u3067\u3059: ''{0}''
+doclet.tag.invalid=@{0}\u304C\u7121\u52B9\u3067\u3059
 doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API
-doclet.For_Removal=\u524A\u9664\u7528
+doclet.Deprecated_Elements=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044{0}
+doclet.Deprecated_In_Release={0}\u3067\u975E\u63A8\u5968
+doclet.Deprecated_Tabs_Intro=(\u5DE6\u7AEF\u306E\u30BF\u30D6\u300C\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044...\u300D\u306F\u3001\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u30EA\u30EA\u30FC\u30B9\u306B\u95A2\u4FC2\u306A\u304F\u3001\u3059\u3079\u3066\u306E\u975E\u63A8\u5968\u306E\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30BF\u30D6\u300C...\u3067\u975E\u63A8\u5968\u300D\u306E\u305D\u308C\u305E\u308C\u306F\u3001\u7279\u5B9A\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002)
+doclet.New_API=\u65B0\u898FAPI
+doclet.New_Elements=\u65B0\u898F{0}
+doclet.New_Elements_Added_In_Release={0}\u3067\u8FFD\u52A0
+doclet.New_Label=\u65B0\u898F
+doclet.New_Tabs_Intro=(\u5DE6\u7AEF\u306E\u30BF\u30D6\u300C\u65B0\u898F...\u300D\u306F\u3001\u8FFD\u52A0\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u306B\u95A2\u4FC2\u306A\u304F\u3001\u3059\u3079\u3066\u306E\u65B0\u898F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30BF\u30D6\u300C...\u3067\u8FFD\u52A0\u300D\u306E\u305D\u308C\u305E\u308C\u306F\u3001\u7279\u5B9A\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u8FFD\u52A0\u3055\u308C\u305F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u5DE6\u7AEF\u306E\u30BF\u30D6\u3067\u8868\u793A\u3055\u308C\u305F\u8981\u7D20\u306F\u53F3\u7AEF\u306E\u30BF\u30D6\u306E\u3044\u305A\u308C\u304B\u306E\u4E0B\u306B\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002)
+doclet.Preview_API=\u30D7\u30EC\u30D3\u30E5\u30FCAPI
+doclet.Preview_Label=\u30D7\u30EC\u30D3\u30E5\u30FC
+doclet.Preview_Mark=PREVIEW
+doclet.Terminally_Deprecated=\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968
+doclet.Terminally_Deprecated_Elements=\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u8981\u7D20
+doclet.Terminally_Deprecated_In_Release={0}\u3067\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968
 doclet.Annotation_Types=\u6CE8\u91C8\u578B
+doclet.Annotation_Interfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Annotation_Type_Members=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.for_removal=\u524A\u9664\u7528
+doclet.Annotation_Interface_Members=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
 doclet.annotation_types=\u6CE8\u91C8\u578B
+doclet.annotation_interfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotation_type_members=\u6CE8\u91C8\u578B\u8981\u7D20
+doclet.annotation_interface_members=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
 doclet.Generated_Docs_Untitled=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8(\u30BF\u30A4\u30C8\u30EB\u306A\u3057)
 doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.Description=\u8AAC\u660E
@@ -113,6 +144,7 @@ doclet.also=\u540C\u69D8\u306B
 doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64:
 doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64
 doclet.Hierarchy_For_All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
+doclet.Hierarchy_For_Unnamed_Package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
 doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
 doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
 doclet.Description_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
@@ -128,43 +160,74 @@ doclet.systemPropertiesSummary=\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\
 doclet.Window_Source_title=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9
 doclet.Window_Help_title=API\u30D8\u30EB\u30D7
 
-doclet.help.main_heading=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
-doclet.help.intro=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.main_heading=JavaDoc\u30D8\u30EB\u30D7
+doclet.help.navigation.head=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+# 0: link to the Overview page
+doclet.help.navigation.intro={0}\u30DA\u30FC\u30B8\u304B\u3089\u3001\u5404\u30DA\u30FC\u30B8\u304A\u3088\u3073\u5404\u30DA\u30FC\u30B8\u306E\u4E0A\u90E8\u306B\u3042\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3067\u30EA\u30F3\u30AF\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3067\u304D\u307E\u3059\u3002
+# 0: link to the Index;  1: short list of links
+doclet.help.navigation.index={0}\u304A\u3088\u3073\u691C\u7D22\u30DC\u30C3\u30AF\u30B9\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u6B21\u3092\u542B\u3081\u3001\u7279\u5B9A\u306E\u5BA3\u8A00\u304A\u3088\u3073\u6982\u8981\u30DA\u30FC\u30B8\u306B\u30CA\u30D3\u30B2\u30FC\u30C8\u3067\u304D\u307E\u3059: {1}
+doclet.help.page_kinds.head=\u30DA\u30FC\u30B8\u306E\u7A2E\u985E
+doclet.help.page_kinds.intro=\u6B21\u306E\u5404\u30BB\u30AF\u30B7\u30E7\u30F3\u3067\u306F\u3001\u3053\u306E\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u69D8\u3005\u306A\u7A2E\u985E\u306E\u30DA\u30FC\u30B8\u306B\u3064\u3044\u3066\u8AAC\u660E\u3057\u307E\u3059\u3002
+# 0: link to the Overview page
 doclet.help.overview.modules.body={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30E2\u30B8\u30E5\uFF0D\u30EB\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+# 0: link to the Overview page
 doclet.help.overview.packages.body={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.help.package.intro=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
-doclet.help.module.intro=\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u305D\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u4F9D\u5B58\u6027\u3001\u304A\u3088\u3073\u30B5\u30FC\u30D3\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F3\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
+doclet.help.package.intro=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F\u6B21\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
+doclet.help.module.intro=\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u305D\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u4F9D\u5B58\u6027\u3001\u304A\u3088\u3073\u30B5\u30FC\u30D3\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F\u6B21\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
 doclet.help.class_interface.head=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.help.class_interface.intro=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.class_interface.intro=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u5BA3\u8A00\u304A\u3088\u3073\u8AAC\u660E\u3068\u3001\u30E1\u30F3\u30D0\u30FC\u306E\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304B\u3089\u69CB\u6210\u3055\u308C\u308B3\u3064\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u5404\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u7A7A\u304B\u9069\u7528\u3067\u304D\u306A\u3044\u5834\u5408\u306F\u7701\u7565\u3055\u308C\u307E\u3059\u3002
 doclet.help.class_interface.inheritance_diagram=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
 doclet.help.class_interface.subclasses=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
 doclet.help.class_interface.subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8
 doclet.help.class_interface.implementations=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8
 doclet.help.class_interface.declaration=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
 doclet.help.class_interface.description=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
-doclet.help.class_interface.summary=\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
+doclet.help.class_interface.member_order=\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
+doclet.help.class_interface.note=\u30CE\u30FC\u30C8:
+doclet.help.class_interface.anno=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u3001\u5FC5\u9808\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8981\u7D20\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u30E1\u30BD\u30C3\u30C9\u306F\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+doclet.help.class_interface.enum=\u5217\u6319\u30AF\u30E9\u30B9\u306E\u307F\u306B\u5217\u6319\u5B9A\u6570\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.help.class_interface.record=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u5BA3\u8A00\u306E\u4E00\u90E8\u3068\u3057\u3066\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.help.class_interface.property=\u30D7\u30ED\u30D1\u30C6\u30A3\u306FJavaFX\u306E\u6A5F\u80FD\u3067\u3059\u3002
+doclet.help.other_files.head=\u305D\u306E\u4ED6\u306E\u30D5\u30A1\u30A4\u30EB
+doclet.help.other_files.body=\u30D1\u30C3\u30B1\u30FC\u30B8\u304A\u3088\u3073\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u5468\u8FBA\u306E\u5BA3\u8A00\u306B\u95A2\u9023\u3059\u308B\u8FFD\u52A0\u60C5\u5831\u304C\u8A18\u8F09\u3055\u308C\u3066\u3044\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
 doclet.help.use.head=\u4F7F\u7528
-doclet.help.use.body=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+doclet.help.use.body=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 doclet.help.tree.head=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64)
+# 0: link to main Class Hierarchy page;  1: java.lang.Object
 doclet.help.tree.intro=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F{0}\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u3055\u3089\u306B\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u968E\u5C64\u30DA\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3092\u542B\u307F\u307E\u3059\u3002\u30AF\u30E9\u30B9\u306F{1}\u3092\u958B\u59CB\u70B9\u3068\u3059\u308B\u7D99\u627F\u69CB\u9020\u3067\u7DE8\u6210\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3001{1}\u304B\u3089\u306F\u7D99\u627F\u3057\u307E\u305B\u3093\u3002
 doclet.help.tree.overview=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
 doclet.help.tree.package=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u8A72\u5F53\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u307F\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+# 0: link to the Deprecated summary page
 doclet.help.deprecated.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u3059\u3079\u3066\u306EAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u975E\u63A8\u5968API\u3068\u306F\u3001\u6A5F\u80FD\u304C\u4E0D\u5341\u5206\u3067\u3042\u308B\u3068\u3044\u3063\u305F\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968API\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+# 0: link to the Preview summary page
+doclet.help.preview.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u3059\u3079\u3066\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.help.new.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u6700\u8FD1\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u8FFD\u52A0\u3055\u308C\u305FAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002
 doclet.help.index.head=\u7D22\u5F15
-doclet.help.index.body={0}\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3068\u3001\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u304A\u3088\u3073\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+# 0: link to Index page;  1: list of links to pages
+doclet.help.index.body={0}\u306B\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u3068\u3001{1}\u306A\u3069\u306E\u6982\u8981\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.all_classes.head=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+# 0: link to All Classes page
+doclet.help.all_classes.body={0}\u306B\u306F\u3001\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u5217\u6319\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306A\u3069\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u542B\u307E\u308C\u308B\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.all_packages.head=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
+# 0: link to All Packages page
+doclet.help.all_packages.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u542B\u307E\u308C\u308B\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u304C\u542B\u307E\u308C\u307E\u3059\u3002
 doclet.help.serial_form.body=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u306E\u3067\u306F\u306A\u304F\u3001\u5B9F\u88C5\u3059\u308B\u30E6\u30FC\u30B6\u30FC\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
+# 0: link to Constant Values page
 doclet.help.constants.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
+# 0: link to System Properties page
 doclet.help.systemProperties.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3078\u306E\u53C2\u7167\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
 doclet.help.footnote=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u306B\u3088\u3063\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
-doclet.help.enum.intro=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
-doclet.help.enum.declaration=\u5217\u6319\u5BA3\u8A00
-doclet.help.enum.definition=\u5217\u6319\u578B\u306E\u8AAC\u660E
+doclet.help.enum.intro=\u5404\u5217\u6319\u30AF\u30E9\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
+doclet.help.enum.class.intro=\u5404\u5217\u6319\u30AF\u30E9\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
 doclet.help.annotation_type.intro=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
+doclet.help.annotation_interface.intro=\u5404\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
 doclet.help.annotation_type.declaration=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00
+doclet.help.annotation_interface.declaration=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
 doclet.help.annotation_type.description=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E
+doclet.help.annotation_interface.description=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
 doclet.help.search.head=\u691C\u7D22
 # Introduction to Javadoc search features, followed by a list of examples
-doclet.help.search.intro=\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30BF\u30A4\u30D7\u3001\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u304A\u3088\u3073API\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u305D\u306E\u4ED6\u306E\u8A9E\u3092\u3001\u540D\u524D\u306E\u4E00\u90E8\u307E\u305F\u306F\u5168\u4F53\u3092\u4F7F\u7528\u3057\u3066(\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u30AD\u30E3\u30E1\u30EB\u30B1\u30FC\u30B9\u306E\u7701\u7565\u5F62\u3092\u4F7F\u7528\u3057\u3066)\u691C\u7D22\u3067\u304D\u307E\u3059\u3002\u4F8B:
+doclet.help.search.intro=\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30BF\u30A4\u30D7\u3001\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5B9A\u7FA9\u304A\u3088\u3073API\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u305D\u306E\u4ED6\u306E\u8A9E\u3092\u3001\u540D\u524D\u306E\u4E00\u90E8\u307E\u305F\u306F\u5168\u4F53\u3092\u4F7F\u7528\u3057\u3066(\u5FC5\u8981\u306B\u5FDC\u3058\u3066camelCase\u306E\u7701\u7565\u5F62\u3092\u4F7F\u7528\u3057\u3066)\u691C\u7D22\u3067\u304D\u307E\u3059\u3002\u4F8B:
 # Used to list search examples, {0} is a search term and {1} the matching result
 doclet.help.search.example={0}\u306F{1}\u3068\u4E00\u81F4\u3057\u307E\u3059
 # {0} contains a link to the current Javadoc Search Specification
@@ -206,10 +269,28 @@ doclet.navClassUse=\u4F7F\u7528
 doclet.Error_in_grouplist=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059: {0} {1}
 doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3001\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
 doclet.Same_element_name_used=\u8981\u7D20\u540D\u307E\u305F\u306F\u30D1\u30BF\u30FC\u30F3\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
+doclet.PreviewLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3057\u307E\u3059\u3002
+doclet.Declared_Using_Preview={0}\u306F{1}\u3001Java\u8A00\u8A9E\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD({2})\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u307E\u3059\u3002
+doclet.PreviewAPI={0}\u306F1\u3064\u4EE5\u4E0A\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059:  {1}\u3002
+doclet.ReflectivePreviewAPI={0}\u306F1\u3064\u4EE5\u4E0A\u306E\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059:  {1}\u3002
+doclet.UsesDeclaredUsingPreview={0}\u306F\u3001Java\u8A00\u8A9E\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30011\u3064\u4EE5\u4E0A\u306E\u30BF\u30A4\u30D7\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: {1}\u3002
+doclet.PreviewTrailingNote1=\u30D7\u30ED\u30B0\u30E9\u30E0\u306F\u3001\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u306B\u306E\u307F{0}\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+doclet.PreviewTrailingNote2=\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306F\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u304B\u3001Java\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u6C38\u7D9A\u7684\u306A\u6A5F\u80FD\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.Declared_Using_Preview.SEALED=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
+doclet.Declared_Using_Preview.SEALED_PERMITS=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
+doclet.PreviewPlatformLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3059\u3002
+doclet.ReflectivePreviewPlatformLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3059\u3002
+
+# 0: an exception
+doclet.Error_copying_legal_notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u30B3\u30D4\u30FC\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
+# 0: the path; 1: the detail message for the exception
+doclet.Error_invalid_path_for_legal_notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u30D1\u30B9''{0}''\u304C\u7121\u52B9\u3067\u3059: {1}
 
 # option specifiers
+doclet.usage.add-script.parameters=<file>
+doclet.usage.add-script.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30B9\u30AF\u30EA\u30D7\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059
 doclet.usage.add-stylesheet.parameters=<file>
-doclet.usage.add-stylesheet.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u8FFD\u52A0\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
+doclet.usage.add-stylesheet.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059
 doclet.usage.d.parameters=<directory>
 doclet.usage.d.description=\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
 
@@ -252,6 +333,10 @@ doclet.usage.link.description=<url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u
 doclet.usage.linkoffline.parameters=<url1> <url2>
 doclet.usage.linkoffline.description=<url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url1>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059
 
+# L10N: do not localize the option parameters: warn info
+doclet.usage.link-modularity-mismatch.parameters=(warn|info)
+doclet.usage.link-modularity-mismatch.description=\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u305F\u306F\u60C5\u5831\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u542B\u3080\u4E0D\u6B63\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u6027\u306E\n\u5916\u90E8\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u5831\u544A\u3067\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u52D5\u4F5C\u306F\n\u8B66\u544A\u306E\u5831\u544A\u3067\u3059\u3002
+
 doclet.usage.link-platform-properties.parameters=<url>
 doclet.usage.link-platform-properties.description=<url>\u306B\u3042\u308B\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306EURL\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059
 
@@ -261,6 +346,9 @@ doclet.usage.excludedocfilessubdir.description=\u6307\u5B9A\u3055\u308C\u305F\u5
 doclet.usage.group.parameters=<name> <g1>:<g2>...
 doclet.usage.group.description=\u6307\u5B9A\u3059\u308B\u8981\u7D20\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3057\u307E\u3059
 
+doclet.usage.legal-notices.parameters='default' | 'none' | <directory>
+doclet.usage.legal-notices.description=\u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u3092\u5236\u5FA1\u3057\u307E\u3059
+
 doclet.usage.nocomment.description=\u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3057\u307E\u3059
 
 doclet.usage.nodeprecated.description=@deprecated\u60C5\u5831\u3092\u9664\u5916\u3057\u307E\u3059
@@ -290,6 +378,12 @@ doclet.usage.nooverview.description=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u751F\u
 
 doclet.usage.serialwarn.description=@serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3057\u307E\u305B\u3093
 
+doclet.usage.since.parameters=<release>(,<release>)*
+doclet.usage.since.description=\u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u306E\u65B0\u898F\u304A\u3088\u3073\u975E\u63A8\u5968\u306EAPI\u3092\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u307E\u3059
+
+doclet.usage.since-label.parameters=<text>
+doclet.usage.since-label.description=\u300C\u65B0\u898FAPI\u300D\u30DA\u30FC\u30B8\u306E\u898B\u51FA\u3057\u3067\u4F7F\u7528\u3059\u308B\u30C6\u30AD\u30B9\u30C8\u3092\u6307\u5B9A\u3057\u307E\u3059
+
 doclet.usage.tag.parameters=<name>:<locations>:<header>
 doclet.usage.tag.description=\u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059
 
@@ -297,6 +391,10 @@ doclet.usage.taglet.description=\u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168
 
 doclet.usage.tagletpath.description=\u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9
 
+doclet.usage.snippet-path.parameters=<path>
+
+doclet.usage.snippet-path.description=\u5916\u90E8\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9
+
 doclet.usage.charset.parameters=<charset>
 doclet.usage.charset.description=\u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30BB\u30C3\u30C8
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
index 0615fb283e5..e2a26b0dfcd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
@@ -29,6 +29,7 @@ doclet.Overview=\u6982\u89C8
 doclet.Window_Overview_Summary=\u6982\u89C8
 doclet.Element=\u5143\u7D20
 doclet.Package=\u7A0B\u5E8F\u5305
+doclet.Unnamed_Package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305
 doclet.Module=\u6A21\u5757
 doclet.Open_Module=\u6253\u5F00\u6A21\u5757
 doclet.All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305
@@ -39,17 +40,24 @@ doclet.Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Window_Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
 doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784
+doclet.Enum_Class_Hierarchy=\u679A\u4E3E\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Annotation_Type_Hierarchy=\u6CE8\u91CA\u7C7B\u578B\u5206\u5C42\u7ED3\u6784
+doclet.Annotation_Interface_Hierarchy=\u6CE8\u91CA\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
 doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B
 doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3
 doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6CE8\u91CA
+doclet.Href_Annotation_Interface_Title={0} \u4E2D\u7684\u6CE8\u91CA\u63A5\u53E3
 doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E
+doclet.Href_Enum_Class_Title={0} \u4E2D\u7684\u679A\u4E3E\u7C7B
 doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570
 doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3
 doclet.Summary=\u6982\u8981:
 doclet.Detail=\u8BE6\u7EC6\u8D44\u6599:
 doclet.Module_Sub_Nav=\u6A21\u5757:
-doclet.navModuleDescription=\u8BF4\u660E
+doclet.Help_Sub_Nav=\u5E2E\u52A9\uFF1A
+doclet.Package_Sub_Nav=\u7A0B\u5E8F\u5305\uFF1A
+doclet.navClassesAndInterfaces=\u7C7B\u548C\u63A5\u53E3
+doclet.navDescription=\u8BF4\u660E
 doclet.navModules=\u6A21\u5757
 doclet.navPackages=\u7A0B\u5E8F\u5305
 doclet.navServices=\u670D\u52A1
@@ -62,16 +70,20 @@ doclet.navProperty=\u5C5E\u6027
 doclet.navEnum=\u679A\u4E3E\u5E38\u91CF
 doclet.navConstructor=\u6784\u9020\u5668
 doclet.navMethod=\u65B9\u6CD5
+doclet.navNavigation=\u5BFC\u822A
+doclet.navPages=\u9875
 doclet.not.exhaustive=\uFF08\u975E\u8BE6\u5C3D\uFF09
 doclet.Index=\u7D22\u5F15
 doclet.Window_Single_Index=\u7D22\u5F15
 doclet.Window_Split_Index={0} - \u7D22\u5F15
 doclet.Help=\u5E2E\u52A9
 doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
+doclet.Toggle_navigation_links=\u5207\u6362\u5BFC\u822A\u94FE\u63A5
 doclet.Navigation=\u5BFC\u822A
-doclet.New_Page=NewPage
 doclet.navDeprecated=\u5DF2\u8FC7\u65F6
 doclet.Window_Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
+doclet.Window_New_List=\u65B0 API \u5217\u8868
+doclet.Window_Preview_List=\u9884\u89C8\u5217\u8868
 doclet.Overrides=\u8986\u76D6:
 doclet.in_class=\u5728\u7C7B\u4E2D
 doclet.Element_in={0} \u4E2D\u7684\u5143\u7D20
@@ -91,14 +103,33 @@ doclet.URL_error=\u83B7\u53D6 URL \u65F6\u51FA\u9519: {0}
 doclet.Resource_error=\u8BFB\u53D6\u8D44\u6E90\u65F6\u51FA\u9519\uFF1A{0}
 doclet.see.class_or_package_not_found=\u6807\u8BB0{0}: \u627E\u4E0D\u5230\u5F15\u7528: {1}
 doclet.see.class_or_package_not_accessible=\u6807\u8BB0{0}: \u65E0\u6CD5\u8BBF\u95EE\u5F15\u7528: {1}
+doclet.see.nested_link=\u6807\u8BB0 {0}\uFF1A\u5D4C\u5957\u94FE\u63A5
 doclet.tag.invalid_usage=\u6807\u8BB0 {0} \u7684\u7528\u6CD5\u65E0\u6548
+doclet.tag.invalid_input=\u65E0\u6548\u8F93\u5165\uFF1A''{0}''
+doclet.tag.invalid=@{0} \u65E0\u6548
 doclet.Deprecated_API=\u5DF2\u8FC7\u65F6\u7684 API
-doclet.For_Removal=\u5F85\u5220\u9664
+doclet.Deprecated_Elements=\u5DF2\u8FC7\u65F6\u7684 {0}
+doclet.Deprecated_In_Release=\u5728 {0} \u4E2D\u5DF2\u8FC7\u65F6
+doclet.Deprecated_Tabs_Intro=\uFF08\u6700\u5DE6\u4FA7\u7684\u9009\u9879\u5361\u201C\u5DF2\u8FC7\u65F6...\u201D\u6307\u793A\u6240\u6709\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20\uFF0C\u65E0\u8BBA\u5B83\u4EEC\u5728\u54EA\u4E2A\u53D1\u884C\u7248\u4E2D\u5DF2\u8FC7\u65F6\u3002\u5176\u4ED6\u6BCF\u4E2A\u201C\u5728...\u4E2D\u5DF2\u8FC7\u65F6\u201D\u9009\u9879\u5361\u6307\u793A\u5728\u7279\u5B9A\u53D1\u884C\u7248\u4E2D\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20\u3002\uFF09
+doclet.New_API=\u65B0\u5EFA API
+doclet.New_Elements=\u65B0\u5EFA {0}
+doclet.New_Elements_Added_In_Release=\u5728 {0} \u4E2D\u5DF2\u6DFB\u52A0
+doclet.New_Label=\u65B0\u5EFA
+doclet.New_Tabs_Intro=\uFF08\u6700\u5DE6\u4FA7\u7684\u9009\u9879\u5361\u201C\u65B0\u5EFA...\u201D\u6307\u793A\u6240\u6709\u65B0\u5143\u7D20\uFF0C\u65E0\u8BBA\u5B83\u4EEC\u662F\u54EA\u4E2A\u53D1\u884C\u7248\u4E2D\u6DFB\u52A0\u7684\u3002\u5176\u4ED6\u6BCF\u4E2A\u201C\u5728...\u4E2D\u5DF2\u6DFB\u52A0\u201D\u9009\u9879\u5361\u6307\u793A\u5728\u7279\u5B9A\u53D1\u884C\u7248\u4E2D\u6DFB\u52A0\u7684\u65B0\u5143\u7D20\u3002\u6700\u5DE6\u4FA7\u9009\u9879\u5361\u4E0B\u663E\u793A\u7684\u4EFB\u4F55\u5143\u7D20\u4E5F\u4F1A\u663E\u793A\u5728\u53F3\u4FA7\u9009\u9879\u5361\u4E4B\u4E00\u4E0B\u3002\uFF09
+doclet.Preview_API=\u9884\u89C8 API
+doclet.Preview_Label=\u9884\u89C8
+doclet.Preview_Mark=PREVIEW
+doclet.Terminally_Deprecated=\u6700\u7EC8\u5DF2\u8FC7\u65F6
+doclet.Terminally_Deprecated_Elements=\u6700\u7EC8\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20
+doclet.Terminally_Deprecated_In_Release=\u6700\u7EC8\u5728 {0} \u4E2D\u5DF2\u8FC7\u65F6
 doclet.Annotation_Types=\u6CE8\u91CA\u7C7B\u578B
+doclet.Annotation_Interfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.Annotation_Type_Members=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
-doclet.for_removal=\u5F85\u5220\u9664
+doclet.Annotation_Interface_Members=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
 doclet.annotation_types=\u6CE8\u91CA\u7C7B\u578B
+doclet.annotation_interfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotation_type_members=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
+doclet.annotation_interface_members=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
 doclet.Generated_Docs_Untitled=\u751F\u6210\u7684\u6587\u6863 (\u65E0\u6807\u9898)
 doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
 doclet.Description=\u8BF4\u660E
@@ -113,6 +144,7 @@ doclet.also=\u5E76
 doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784:
 doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784
 doclet.Hierarchy_For_All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
+doclet.Hierarchy_For_Unnamed_Package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
 doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002
 doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E:
 doclet.Description_From_Class=\u4ECE\u7C7B\u590D\u5236\u7684\u8BF4\u660E:
@@ -128,40 +160,71 @@ doclet.systemPropertiesSummary=\u7CFB\u7EDF\u5C5E\u6027\u6982\u8981
 doclet.Window_Source_title=\u6E90\u4EE3\u7801
 doclet.Window_Help_title=API \u5E2E\u52A9
 
-doclet.help.main_heading=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F
-doclet.help.intro=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002
+doclet.help.main_heading=JavaDoc \u5E2E\u52A9
+doclet.help.navigation.head=\u5BFC\u822A
+# 0: link to the Overview page
+doclet.help.navigation.intro=\u4ECE {0} \u9875\u5F00\u59CB\uFF0C\u60A8\u53EF\u4EE5\u4F7F\u7528\u6BCF\u9875\u4E2D\u7684\u94FE\u63A5\u4EE5\u53CA\u6BCF\u9875\u9876\u90E8\u5BFC\u822A\u680F\u4E2D\u7684\u94FE\u63A5\u6765\u6D4F\u89C8\u6587\u6863\u3002
+# 0: link to the Index;  1: short list of links
+doclet.help.navigation.index=\u4F7F\u7528 {0} \u548C\u641C\u7D22\u6846\u53EF\u4EE5\u5BFC\u822A\u5230\u7279\u5B9A\u58F0\u660E\u548C\u6982\u8981\u9875\uFF0C\u5305\u62EC\uFF1A{1}
+doclet.help.page_kinds.head=\u9875\u9762\u7C7B\u578B
+doclet.help.page_kinds.intro=\u4EE5\u4E0B\u5404\u90E8\u5206\u4ECB\u7ECD\u4E86\u6B64\u96C6\u5408\u4E2D\u4E0D\u540C\u7C7B\u578B\u7684\u9875\u9762\u3002
+# 0: link to the Overview page
 doclet.help.overview.modules.body={0} \u9875\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875\uFF0C\u63D0\u4F9B\u4E86\u6240\u6709\u6A21\u5757\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u6A21\u5757\u7684\u603B\u4F53\u8BF4\u660E\u3002
+# 0: link to the Overview page
 doclet.help.overview.packages.body={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002
-doclet.help.package.intro=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u516D\u4E2A\u7C7B\u522B\uFF1A
-doclet.help.module.intro=\u6BCF\u4E2A\u6A21\u5757\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7A0B\u5E8F\u5305\u3001\u4E0E\u5176\u4ED6\u6A21\u5757\u7684\u4F9D\u8D56\u5173\u7CFB\u548C\u670D\u52A1\u7684\u5217\u8868\u4EE5\u53CA\u6A21\u5757\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4E09\u4E2A\u7C7B\u522B\uFF1A
+doclet.help.package.intro=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4EE5\u4E0B\u7C7B\u522B\uFF1A
+doclet.help.module.intro=\u6BCF\u4E2A\u6A21\u5757\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7A0B\u5E8F\u5305\u3001\u4E0E\u5176\u4ED6\u6A21\u5757\u7684\u4F9D\u8D56\u5173\u7CFB\u548C\u670D\u52A1\u7684\u5217\u8868\u4EE5\u53CA\u5404\u4E2A\u6A21\u5757\u7684\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4EE5\u4E0B\u7C7B\u522B\uFF1A
 doclet.help.class_interface.head=\u7C7B\u6216\u63A5\u53E3
-doclet.help.class_interface.intro=\u6BCF\u4E2A\u7C7B, \u63A5\u53E3, \u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\u3002\u5176\u4E2D\u6BCF\u4E2A\u9875\u9762\u90FD\u7531\u4E09\u90E8\u5206 (\u7C7B/\u63A5\u53E3\u8BF4\u660E, \u6982\u8981\u8868, \u4EE5\u53CA\u8BE6\u7EC6\u7684\u6210\u5458\u8BF4\u660E) \u7EC4\u6210:
+doclet.help.class_interface.intro=\u6BCF\u4E2A\u7C7B\u3001\u63A5\u53E3\u3001\u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u81EA\u5DF1\u72EC\u7ACB\u7684\u9875\u9762\u3002\u5982\u679C\u8FD9\u4E9B\u90E8\u5206\u4E2D\u6BCF\u4E2A\u90E8\u5206\u7684\u6761\u76EE\u4E3A\u7A7A\u6216\u4E0D\u9002\u7528\uFF0C\u5219\u7701\u7565\u8FD9\u4E9B\u6761\u76EE\u3002
 doclet.help.class_interface.inheritance_diagram=\u7C7B\u7EE7\u627F\u56FE
 doclet.help.class_interface.subclasses=\u76F4\u63A5\u5B50\u7C7B
 doclet.help.class_interface.subinterfaces=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3
 doclet.help.class_interface.implementations=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B
 doclet.help.class_interface.declaration=\u7C7B\u6216\u63A5\u53E3\u58F0\u660E
 doclet.help.class_interface.description=\u7C7B\u6216\u63A5\u53E3\u8BF4\u660E
-doclet.help.class_interface.summary=\u6982\u8981\u6761\u76EE\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\uFF0C\u800C\u8BE6\u7EC6\u8BF4\u660E\u5219\u6309\u5176\u5728\u6E90\u4EE3\u7801\u4E2D\u51FA\u73B0\u7684\u987A\u5E8F\u6392\u5217\u3002\u8FD9\u6709\u52A9\u4E8E\u4FDD\u6301\u7A0B\u5E8F\u5458\u6240\u5EFA\u7ACB\u7684\u903B\u8F91\u5206\u7EC4\u3002
+doclet.help.class_interface.member_order=\u6982\u8981\u6761\u76EE\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\uFF0C\u800C\u8BE6\u7EC6\u8BF4\u660E\u5219\u6309\u5176\u5728\u6E90\u4EE3\u7801\u4E2D\u51FA\u73B0\u7684\u987A\u5E8F\u6392\u5217\u3002\u8FD9\u6709\u52A9\u4E8E\u4FDD\u6301\u7A0B\u5E8F\u5458\u6240\u5EFA\u7ACB\u7684\u903B\u8F91\u5206\u7EC4\u3002
+doclet.help.class_interface.note=\u6CE8:
+doclet.help.class_interface.anno=\u6CE8\u91CA\u63A5\u53E3\u6709\u5FC5\u9700\u7684\u5143\u7D20\u548C\u53EF\u9009\u7684\u5143\u7D20\uFF0C\u4F46\u6CA1\u6709\u65B9\u6CD5\u3002
+doclet.help.class_interface.enum=\u53EA\u6709\u679A\u4E3E\u7C7B\u6709\u679A\u4E3E\u5E38\u91CF\u3002
+doclet.help.class_interface.record=\u8BB0\u5F55\u7C7B\u7684\u7EC4\u4EF6\u663E\u793A\u4E3A\u8BB0\u5F55\u7C7B\u58F0\u660E\u7684\u4E00\u90E8\u5206\u3002
+doclet.help.class_interface.property=\u5C5E\u6027\u662F JavaFX \u7684\u4E00\u4E2A\u7279\u6027\u3002
+doclet.help.other_files.head=\u5176\u4ED6\u6587\u4EF6
+doclet.help.other_files.body=\u7A0B\u5E8F\u5305\u548C\u6A21\u5757\u6240\u5305\u542B\u7684\u9875\u9762\u4E2D\u53EF\u80FD\u5E26\u6709\u4E0E\u9644\u8FD1\u58F0\u660E\u76F8\u5173\u7684\u9644\u52A0\u4FE1\u606F\u3002
 doclet.help.use.head=\u4F7F\u7528
-doclet.help.use.body=\u6BCF\u4E2A\u5DF2\u6587\u6863\u5316\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u548C\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u201C\u4F7F\u7528\u201D\u9875\u3002\u6B64\u9875\u4ECB\u7ECD\u4E86\u4F7F\u7528\u7ED9\u5B9A\u7C7B\u6216\u7A0B\u5E8F\u5305\u7684\u4EFB\u4F55\u90E8\u5206\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u3001\u65B9\u6CD5\u3001\u6784\u9020\u5668\u548C\u5B57\u6BB5\u3002\u5BF9\u4E8E\u7ED9\u5B9A\u7684\u7C7B\u6216\u63A5\u53E3 A\uFF0C\u5176\u201C\u4F7F\u7528\u201D\u9875\u5305\u542B A \u7684\u5B50\u7C7B\u3001\u58F0\u660E\u4E3A A \u7684\u5B57\u6BB5\u3001\u8FD4\u56DE A \u7684\u65B9\u6CD5\u4EE5\u53CA\u5E26\u6709\u7C7B\u578B\u4E3A A \u7684\u53C2\u6570\u7684\u65B9\u6CD5\u548C\u6784\u9020\u5668\u3002\u8BBF\u95EE\u6B64\u9875\u7684\u65B9\u6CD5\u662F\uFF1A\u9996\u5148\u8F6C\u81F3\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\uFF0C\u7136\u540E\u5355\u51FB\u5BFC\u822A\u680F\u4E2D\u7684\u201C\u4F7F\u7528\u201D\u94FE\u63A5\u3002
+doclet.help.use.body=\u6BCF\u4E2A\u5DF2\u6587\u6863\u5316\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u548C\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u201C\u4F7F\u7528\u201D\u9875\u9762\u3002\u6B64\u9875\u9762\u4ECB\u7ECD\u4E86\u4F7F\u7528\u7ED9\u5B9A\u7C7B\u6216\u7A0B\u5E8F\u5305\u7684\u4EFB\u4F55\u90E8\u5206\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u3001\u65B9\u6CD5\u3001\u6784\u9020\u5668\u548C\u5B57\u6BB5\u3002\u5BF9\u4E8E\u7ED9\u5B9A\u7684\u7C7B\u6216\u63A5\u53E3 A\uFF0C\u5176\u201C\u4F7F\u7528\u201D\u9875\u9762\u5305\u542B A \u7684\u5B50\u7C7B\u3001\u58F0\u660E\u4E3A A \u7684\u5B57\u6BB5\u3001\u8FD4\u56DE A \u7684\u65B9\u6CD5\uFF0C\u4EE5\u53CA\u5E26\u6709\u7C7B\u578B\u4E3A A \u7684\u53C2\u6570\u7684\u65B9\u6CD5\u548C\u6784\u9020\u5668\u3002\u8BBF\u95EE\u6B64\u9875\u9762\u7684\u65B9\u6CD5\u662F\uFF1A\u9996\u5148\u8F6C\u81F3\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\uFF0C\u7136\u540E\u5355\u51FB\u5BFC\u822A\u680F\u4E2D\u7684\u201C\u4F7F\u7528\u201D\u94FE\u63A5\u3002
 doclet.help.tree.head=\u6811 (\u7C7B\u5206\u5C42\u7ED3\u6784)
+# 0: link to main Class Hierarchy page;  1: java.lang.Object
 doclet.help.tree.intro=\u5BF9\u4E8E\u6240\u6709\u7A0B\u5E8F\u5305\uFF0C\u90FD\u6709\u4E00\u4E2A {0} \u9875\uFF0C\u4EE5\u53CA\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002\u6BCF\u4E2A\u5206\u5C42\u7ED3\u6784\u9875\u90FD\u5305\u542B\u7C7B\u7684\u5217\u8868\u548C\u63A5\u53E3\u7684\u5217\u8868\u3002\u4ECE {1} \u5F00\u59CB\uFF0C\u6309\u7EE7\u627F\u7ED3\u6784\u5BF9\u7C7B\u8FDB\u884C\u6392\u5217\u3002\u63A5\u53E3\u4E0D\u4ECE {1} \u7EE7\u627F\u3002
-doclet.help.tree.overview=\u67E5\u770B\u201C\u6982\u89C8\u201D\u9875\u9762\u65F6, \u5355\u51FB "\u6811" \u5C06\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
+doclet.help.tree.overview=\u67E5\u770B\u201C\u6982\u89C8\u201D\u9875\u9762\u65F6\uFF0C\u5355\u51FB\u201C\u6811\u201D\u5C06\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
 doclet.help.tree.package=\u67E5\u770B\u7279\u5B9A\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\u9875\u65F6\uFF0C\u5355\u51FB\u201C\u6811\u201D\u5C06\u4EC5\u663E\u793A\u8BE5\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
+# 0: link to the Deprecated summary page
 doclet.help.deprecated.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u5DF2\u8FC7\u65F6\u7684 API\u3002\u901A\u5E38\uFF0C\u7531\u4E8E\u5DF2\u8FC7\u65F6\u7684 API \u5B58\u5728\u7F3A\u70B9\u5E76\u4E14\u5DF2\u63D0\u4F9B\u66FF\u4EE3 API\uFF0C\u4E0D\u5EFA\u8BAE\u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u65BD\u4E2D\uFF0C\u53EF\u80FD\u4F1A\u5220\u9664\u5DF2\u8FC7\u65F6\u7684 API\u3002
+# 0: link to the Preview summary page
+doclet.help.preview.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u9884\u89C8 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u65BD\u4E2D\uFF0C\u53EF\u80FD\u4F1A\u5220\u9664\u9884\u89C8 API\u3002
+doclet.help.new.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6700\u8FD1\u7684\u53D1\u884C\u7248\u4E2D\u5DF2\u6DFB\u52A0\u7684 API\u3002
 doclet.help.index.head=\u7D22\u5F15
-doclet.help.index.body={0} \u5305\u542B\u6240\u6709\u7C7B\u3001\u63A5\u53E3\u3001\u6784\u9020\u5668\u3001\u65B9\u6CD5\u548C\u5B57\u6BB5\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\uFF0C\u4EE5\u53CA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u6240\u6709\u7C7B\u7684\u5217\u8868\u3002
+# 0: link to Index page;  1: list of links to pages
+doclet.help.index.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7C7B\u3001\u63A5\u53E3\u3001\u6784\u9020\u5668\u3001\u65B9\u6CD5\u548C\u5B57\u6BB5\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\uFF0C\u4EE5\u53CA\u6982\u8981\u9875\uFF08\u4F8B\u5982 {1}\uFF09\u3002
+doclet.help.all_classes.head=\u6240\u6709\u7C7B\u548C\u63A5\u53E3
+# 0: link to All Classes page
+doclet.help.all_classes.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7C7B\u548C\u63A5\u53E3\uFF08\u5305\u62EC\u6CE8\u91CA\u63A5\u53E3\u3001\u679A\u4E3E\u7C7B\u548C\u8BB0\u5F55\u7C7B\uFF09\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\u3002
+doclet.help.all_packages.head=\u6240\u6709\u7A0B\u5E8F\u5305
+# 0: link to All Packages page
+doclet.help.all_packages.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\u3002
 doclet.help.serial_form.body=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u5B9E\u65BD\uFF08\u800C\u975E\u4F7F\u7528\uFF09API \u7684\u4EBA\u5458\u6709\u7528\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5\uFF0C\u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F\uFF1A\u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B\uFF0C\u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684\u201C\u53E6\u8BF7\u53C2\u9605\u201D\u90E8\u5206\u4E2D\u7684\u201C\u5E8F\u5217\u5316\u5F62\u5F0F\u201D\u3002
+# 0: link to Constant Values page
 doclet.help.constants.body={0}\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
+# 0: link to System Properties page
 doclet.help.systemProperties.body={0} \u9875\u9762\u5217\u51FA\u4E86\u5BF9\u7CFB\u7EDF\u5C5E\u6027\u7684\u5F15\u7528\u3002
 doclet.help.footnote=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u7531\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
-doclet.help.enum.intro=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
-doclet.help.enum.declaration=\u679A\u4E3E\u58F0\u660E
-doclet.help.enum.definition=\u679A\u4E3E\u8BF4\u660E
+doclet.help.enum.intro=\u6BCF\u4E2A\u679A\u4E3E\u7C7B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
+doclet.help.enum.class.intro=\u6BCF\u4E2A\u679A\u4E3E\u7C7B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
 doclet.help.annotation_type.intro=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
+doclet.help.annotation_interface.intro=\u6BCF\u4E2A\u6CE8\u91CA\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
 doclet.help.annotation_type.declaration=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
+doclet.help.annotation_interface.declaration=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E
 doclet.help.annotation_type.description=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E
+doclet.help.annotation_interface.description=\u6CE8\u91CA\u63A5\u53E3\u8BF4\u660E
 doclet.help.search.head=\u641C\u7D22
 # Introduction to Javadoc search features, followed by a list of examples
 doclet.help.search.intro=\u53EF\u4EE5\u4F7F\u7528\u90E8\u5206\u6216\u5B8C\u6574\u540D\u79F0\u641C\u7D22\u6A21\u5757\u3001\u7A0B\u5E8F\u5305\u3001\u7C7B\u578B\u3001\u5B57\u6BB5\u3001\u65B9\u6CD5\u3001\u7CFB\u7EDF\u5C5E\u6027\u4EE5\u53CA API \u4E2D\u5B9A\u4E49\u7684\u5176\u4ED6\u672F\u8BED\u7684\u5B9A\u4E49\uFF0C\uFF08\u53EF\u9009\uFF09\u4E5F\u53EF\u4EE5\u4F7F\u7528\u201C\u9A7C\u5CF0\u5927\u5C0F\u5199\u5F0F\u201D\u7F29\u5199\u8FDB\u884C\u641C\u7D22\u3002\u4F8B\u5982\uFF1A
@@ -206,10 +269,28 @@ doclet.navClassUse=\u4F7F\u7528
 doclet.Error_in_grouplist=\u9519\u8BEF\u7684 -group \u9009\u9879: {0} {1}
 doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, \u7EC4\u540D\u5DF2\u4F7F\u7528: {0}
 doclet.Same_element_name_used=\u5143\u7D20\u540D\u79F0\u6216\u6A21\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0}
+doclet.PreviewLeadingNote={0} \u4F9D\u8D56\u4E8E Java \u5E73\u53F0\u7684\u9884\u89C8\u529F\u80FD\uFF1A
+doclet.Declared_Using_Preview={0} \u662F\u4F7F\u7528 {1}\uFF08Java \u8BED\u8A00 ({2}) \u7684\u9884\u89C8\u529F\u80FD\uFF09\u58F0\u660E\u7684\u3002
+doclet.PreviewAPI={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u9884\u89C8 API\uFF1A{1}\u3002
+doclet.ReflectivePreviewAPI={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u53CD\u5C04\u9884\u89C8 API\uFF1A{1}\u3002
+doclet.UsesDeclaredUsingPreview={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u7C7B\u578B\uFF0C\u8FD9\u4E9B\u7C7B\u578B\u662F\u4F7F\u7528 Java \u8BED\u8A00 {1} \u7684\u9884\u89C8\u529F\u80FD\u58F0\u660E\u7684\u3002
+doclet.PreviewTrailingNote1=\u53EA\u6709\u5728\u542F\u7528\u4E86\u9884\u89C8\u529F\u80FD\u65F6\uFF0C\u7A0B\u5E8F\u624D\u80FD\u4F7F\u7528 {0}\u3002
+doclet.PreviewTrailingNote2=\u9884\u89C8\u529F\u80FD\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\uFF0C\u4E5F\u53EF\u80FD\u4F1A\u5347\u7EA7\u4E3A Java \u5E73\u53F0\u7684\u6C38\u4E45\u529F\u80FD\u3002
+doclet.Declared_Using_Preview.SEALED=\u5BC6\u5C01\u7C7B
+doclet.Declared_Using_Preview.SEALED_PERMITS=\u5BC6\u5C01\u7C7B
+doclet.PreviewPlatformLeadingNote={0} \u662F Java \u5E73\u53F0\u7684\u9884\u89C8 API\u3002
+doclet.ReflectivePreviewPlatformLeadingNote={0} \u662F Java \u5E73\u53F0\u7684\u53CD\u5C04\u9884\u89C8 API\u3002
+
+# 0: an exception
+doclet.Error_copying_legal_notices=\u590D\u5236\u6CD5\u5F8B\u58F0\u660E\u65F6\u51FA\u9519\uFF1A{0}
+# 0: the path; 1: the detail message for the exception
+doclet.Error_invalid_path_for_legal_notices=\u6CD5\u5F8B\u58F0\u660E\u7684\u8DEF\u5F84 ''{0}'' \u65E0\u6548\uFF1A{1}
 
 # option specifiers
+doclet.usage.add-script.parameters=<file>
+doclet.usage.add-script.description=\u5411\u751F\u6210\u7684\u6587\u6863\u6DFB\u52A0\u811A\u672C\u6587\u4EF6
 doclet.usage.add-stylesheet.parameters=<file>
-doclet.usage.add-stylesheet.description=\u7528\u4E8E\u6240\u751F\u6210\u6587\u6863\u7684\u5176\u4ED6\u6837\u5F0F\u8868\u6587\u4EF6
+doclet.usage.add-stylesheet.description=\u5411\u751F\u6210\u7684\u6587\u6863\u6DFB\u52A0\u6837\u5F0F\u8868\u6587\u4EF6
 doclet.usage.d.parameters=<directory>
 doclet.usage.d.description=\u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55
 
@@ -252,6 +333,10 @@ doclet.usage.link.description=\u521B\u5EFA\u6307\u5411 <url> \u4E2D\u7684 javado
 doclet.usage.linkoffline.parameters=<url1> <url2>
 doclet.usage.linkoffline.description=\u4F7F\u7528 <url2> \u4E2D\u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u5230 <url1> \u4E2D\u7684\u6587\u6863
 
+# L10N: do not localize the option parameters: warn info
+doclet.usage.link-modularity-mismatch.parameters=(warn|info)
+doclet.usage.link-modularity-mismatch.description=\u7528\u8B66\u544A\u6216\u4FE1\u606F\u6027\u6D88\u606F\u62A5\u544A\u5177\u6709\n\u6A21\u5757\u5316\u9519\u8BEF\u7684\u5916\u90E8\u6587\u6863\u3002\u9ED8\u8BA4\n\u884C\u4E3A\u662F\u62A5\u544A\u8B66\u544A\u3002
+
 doclet.usage.link-platform-properties.parameters=<url>
 doclet.usage.link-platform-properties.description=\u94FE\u63A5\u5230\u4F4D\u4E8E <url> \u7684\u5C5E\u6027\u6587\u4EF6\u4E2D\u58F0\u660E\u7684\u5E73\u53F0\u6587\u6863 URL
 
@@ -261,6 +346,9 @@ doclet.usage.excludedocfilessubdir.description=\u6392\u9664\u5177\u6709\u7ED9\u5
 doclet.usage.group.parameters=<name> <g1>:<g2>...
 doclet.usage.group.description=\u5C06\u6307\u5B9A\u7684\u5143\u7D20\u5728\u6982\u89C8\u9875\u9762\u4E0A\u5206\u7EC4\u5728\u4E00\u8D77
 
+doclet.usage.legal-notices.parameters='default' | 'none' | <directory>
+doclet.usage.legal-notices.description=\u63A7\u5236\u6240\u751F\u6210\u8F93\u51FA\u4E2D\u7684\u6CD5\u5F8B\u58F0\u660E
+
 doclet.usage.nocomment.description=\u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E
 
 doclet.usage.nodeprecated.description=\u4E0D\u5305\u542B @deprecated \u4FE1\u606F
@@ -290,6 +378,12 @@ doclet.usage.nooverview.description=\u4E0D\u751F\u6210\u6982\u89C8\u9875\u9762
 
 doclet.usage.serialwarn.description=\u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A
 
+doclet.usage.since.parameters=<release>(,<release>)*
+doclet.usage.since.description=\u8BB0\u5F55\u6240\u6307\u5B9A\u53D1\u884C\u7248\u4E2D\u65B0\u589E\u548C\u5DF2\u8FC7\u65F6\u7684 API
+
+doclet.usage.since-label.parameters=<text>
+doclet.usage.since-label.description=\u63D0\u4F9B\u8981\u5728\u201C\u65B0\u589E API\u201D\u9875\u7684\u6807\u9898\u4E2D\u4F7F\u7528\u7684\u6587\u672C
+
 doclet.usage.tag.parameters=<name>:<locations>:<header>
 doclet.usage.tag.description=\u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0
 
@@ -297,6 +391,10 @@ doclet.usage.taglet.description=\u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u96
 
 doclet.usage.tagletpath.description=Taglet \u7684\u8DEF\u5F84
 
+doclet.usage.snippet-path.parameters=<path>
+
+doclet.usage.snippet-path.description=\u5916\u90E8\u7247\u6BB5\u7684\u8DEF\u5F84
+
 doclet.usage.charset.parameters=<charset>
 doclet.usage.charset.description=\u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
new file mode 100644
index 00000000000..8fbb1af8a88
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
@@ -0,0 +1,330 @@
+#
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+doclet.Generating_0={0} wird generiert...
+doclet.Toolkit_Usage_Violation=Das Doclet-Toolkit kann nur von {0} verwendet werden
+doclet.MissingSerialTag=in Klasse {0} fehlt das Tag @serial f\u00FCr standardm\u00E4\u00DFig serialisierbares Feld: {1}.
+doclet.MissingSerialDataTag=in Klasse {0} fehlt das Tag @serialData in Methode {1}.
+doclet.Serializable_no_customization=Keine readObject- oder writeObject-Methode deklariert.
+doclet.Serialized_Form=Serialisierte Form
+doclet.Serialized_Form_methods=Serialisierungsmethoden
+doclet.Serialized_Form_fields=Serialisierte Felder
+doclet.Serialized_Form_class=Serialisierungs\u00FCberblick
+doclet.Option_conflict=Option {0} steht in Konflikt mit {1}
+doclet.Option_reuse=Option wiederverwendet: {0}
+doclet.Option_invalid=Ung\u00FCltiges Argument {0} f\u00FCr Option {1}
+doclet.Option_doclint_no_qualifiers=Zugriffs-Qualifier f\u00FCr Argumente f\u00FCr -Xdoclint nicht zul\u00E4ssig
+doclet.Option_doclint_invalid_arg=Ung\u00FCltiges Argument f\u00FCr Option -Xdoclint
+doclet.Option_doclint_package_invalid_arg=Ung\u00FCltiges Argument f\u00FCr Option -Xdoclint/package
+doclet.error.initializing.dest.dir=Fehler beim Initialisieren des Zielverzeichnisses: {0}
+doclet.exception.read.file=Fehler beim Lesen der Datei: {0}\n\t({1})
+doclet.exception.write.file=Fehler beim Schreiben der Datei: {0}\n\t({1})
+doclet.exception.read.resource=Fehler beim Lesen der Systemressource: {0}\n\t({1})
+doclet.internal.exception=Eine interne Ausnahme ist aufgetreten.\n\t({0})
+doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bug\nf\u00FCr das javadoc-Tool, nachdem Sie in der Bugdatenbank (http://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
+doclet.File_not_found=Datei nicht gefunden: {0}
+doclet.Copy_Overwrite_warning=Datei {0} wurde nicht in {1} kopiert, da bereits eine Datei mit demselben Namen vorhanden ist...
+doclet.Copy_Ignored_warning=Die Datei {0} wurde nicht kopiert: ung\u00FCltiger Name
+doclet.Copy_snippet_to_clipboard=Kopieren
+doclet.Copied_snippet_to_clipboard=Kopiert.
+doclet.Copying_File_0_To_Dir_1=Datei {0} wird in Verzeichnis {1} kopiert...
+doclet.Copying_File_0_To_File_1=Datei {0} wird in Datei {1} kopiert...
+doclet.No_Public_Classes_To_Document=Keine \u00F6ffentlichen oder gesch\u00FCtzten Klassen zur Dokumentation gefunden.
+doclet.destination_directory_not_directory_0=Ziel ist kein Verzeichnis: {0}
+doclet.destination_directory_not_writable_0=Zielverzeichnis ist schreibgesch\u00FCtzt: {0}
+doclet.Encoding_not_supported=Codierung nicht unterst\u00FCtzt: {0}
+doclet.Building_Tree=Baum f\u00FCr alle Packages und Klassen wird erstellt...
+doclet.Building_Index=Index f\u00FCr alle Packages und Klassen wird erstellt...
+doclet.Building_Index_For_All_Classes=Index f\u00FCr alle Klassen wird erstellt...
+doclet.sourcetab_warning=Das Argument f\u00FCr -sourcetab muss eine Ganzzahl sein, die gr\u00F6\u00DFer als 0 ist.
+doclet.JavaScript_in_comment=JavaScript in Dokumentationskommentar gefunden.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
+doclet.JavaScript_in_option=Option {0} enth\u00E4lt JavaScript.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
+doclet.Packages=Packages
+doclet.All_Packages=Alle Packages
+doclet.Modules=Module
+doclet.All_Modules=Alle Module
+doclet.Other_Packages=Andere Packages
+doclet.Other_Modules=Andere Module
+doclet.Notice_taglet_registered=Taglet {0} wurde registriert...
+doclet.Notice_taglet_unseen=Hinweis: Nicht gefundene benutzerdefinierte Tags: {0}
+doclet.Notice_taglet_overridden=Hinweis: Benutzerdefinierte Tags, die Standardtags au\u00DFer Kraft setzen: {0}
+doclet.Notice_taglet_conflict_warn=Hinweis: Benutzerdefinierte Tags, die zuk\u00FCnftige Standardtags au\u00DFer Kraft setzen k\u00F6nnten: {0}. Um potenzielle Overrides zu vermeiden, verwenden Sie in den Namen benutzerdefinierter Tags mindestens einen Punkt (.).
+doclet.Error_taglet_not_registered=Fehler - Ausnahme {0} wurde beim Versuch ausgel\u00F6st, Taglet {1} zu registrieren...
+doclet.Error_invalid_custom_tag_argument=Fehler - {0} ist ein ung\u00FCltiges Argument f\u00FCr die Option -tag...
+doclet.taglet_could_not_set_location = Taglet-Pfad konnte nicht festgelegt werden: {0}
+doclet.not_standard_file_manager = Taglet-Pfad kann nicht festgelegt werden, der Dateimanager ist kein StandardJavaFileManager
+doclet.Author=Autor:
+doclet.DefaultValue=Standardwert:
+doclet.PropertyDescription=Eigenschaftsbeschreibung:
+doclet.PropertyGetterWithName=Ruft den Wert der {0}-Eigenschaft ab.
+doclet.PropertyGetterReturn=Wert der Eigenschaft {0}
+doclet.PropertySetterWithName=Legt den Wert der {0}-Eigenschaft fest.
+doclet.PropertySetterParam=Wert f\u00FCr die Eigenschaft {0}
+doclet.PropertyMethodReturn=die Eigenschaft {0}
+doclet.Default=Standard:
+doclet.Parameters=Parameter:
+doclet.TypeParameters=Typparameter:
+doclet.RecordComponents=Datensatzkomponenten:
+doclet.Parameters_warn=@param-Argument "{0}" ist kein Parametername.
+doclet.Parameters_dup_warn=Parameter "{0}" ist mehrmals dokumentiert.
+doclet.TypeParameters_warn=@param-Argument "{0}" ist nicht der Name eines Typparameters.
+doclet.TypeParameters_dup_warn=Typparameter "{0}" ist mehrmals dokumentiert.
+doclet.RecordComponents_warn=@param-Argument "{0}" ist nicht der Name einer Datensatzkomponente.
+doclet.RecordComponents_dup_warn=Datensatzkomponente "{0}" ist mehrmals dokumentiert.
+doclet.Returns=Gibt zur\u00FCck:
+doclet.Returns_0=Gibt {0} zur\u00FCck.
+doclet.Return_tag_on_void_method=@return-Tag kann nicht in Methode mit ung\u00FCltigem R\u00FCckgabetyp verwendet werden.
+doclet.See_Also=Siehe auch:
+doclet.SerialData=Serielle Daten:
+doclet.Services=Services
+doclet.Since=Seit:
+doclet.Throws=L\u00F6st aus:
+doclet.Version=Version:
+doclet.Factory=Factory:
+doclet.UnknownTag={0} ist ein unbekanntes Tag.
+doclet.UnknownTagLowercase={0} ist ein unbekanntes Tag - bis auf die Gro\u00DF-/Kleinschreibung identisch mit einem bekannten Tag.
+doclet.noInheritedDoc=@inheritDoc wurde verwendet, aber mit {0} wird keine Methode au\u00DFer Kraft gesetzt oder implementiert.
+doclet.tag_misuse=Tag {0} kann nicht in {1}-Dokumentation verwendet werden. Es kann nur in folgenden Dokumentationstypen verwendet werden: {2}.
+doclet.Package_Summary=Package\u00FCbersicht
+doclet.Requires_Summary=Erfordernisse
+doclet.Indirect_Requires_Summary=Indirekte Erfordernisse
+doclet.Indirect_Exports_Summary=Indirekte Exportvorg\u00E4nge
+doclet.Indirect_Opens_Summary=Indirekte \u00D6ffnungsvorg\u00E4nge
+doclet.Exported_Packages_Summary=Exporte
+doclet.Opened_Packages_Summary=\u00D6ffnungsvorg\u00E4nge
+doclet.Concealed_Packages_Summary=Ausgeblendet
+doclet.From=Von
+doclet.Uses_Summary=Verwendungen
+doclet.Provides_Summary=Bereitstellungen
+doclet.Nested_Class_Summary=Verschachtelte Klassen - \u00DCbersicht
+doclet.Annotation_Type_Optional_Member_Summary=Optionale Elemente - \u00DCbersicht
+doclet.Annotation_Type_Required_Member_Summary=Erforderliche Elemente - \u00DCbersicht
+doclet.Field_Summary=Feld\u00FCbersicht
+doclet.Property_Summary=Eigenschafts\u00FCbersicht
+doclet.Enum_Constant_Summary=Enum-Konstanten - \u00DCbersicht
+doclet.Constructor_Summary=Konstruktor\u00FCbersicht
+doclet.Method_Summary=Methoden\u00FCbersicht
+doclet.Interfaces=Schnittstellen
+doclet.Enums=Enums
+doclet.EnumClasses=Enum-Klassen
+doclet.RecordClasses=Datensatzklassen
+doclet.Related_Packages=Zugeh\u00F6rige Packages
+doclet.AnnotationTypes=Annotationstypen
+doclet.AnnotationInterfaces=Annotationsschnittstellen
+doclet.ExceptionClasses=Ausnahmeklassen
+doclet.Classes=Klassen
+doclet.All_Classes_And_Interfaces=Alle Klassen und Schnittstellen
+doclet.All_Superinterfaces=Alle Superschnittstellen:
+doclet.All_Implemented_Interfaces=Alle implementierten Schnittstellen:
+doclet.Interface=Schnittstelle
+doclet.Class=Klasse
+doclet.AnnotationType=Annotationstyp
+doclet.AnnotationInterface=Annotationsschnittstelle
+doclet.annotationtype=Annotationstyp
+doclet.annotationinterface=Annotationsschnittstellen
+doclet.annotationtypes=Annotationstypen
+doclet.annotationinterfaces=Annotationsschnittstellen
+doclet.Enum=Enum
+doclet.EnumClass=Enum-Klasse
+doclet.enum=Enumeration
+doclet.enumclass=Enum-Klasse
+doclet.enums=Enums
+doclet.enumclasses=Enum-Klassen
+doclet.interface=Schnittstelle
+doclet.class=Klasse
+doclet.RecordClass=Datensatzklasse
+doclet.recordclass=Datensatzklasse
+doclet.ExceptionClass=Ausnahmeklasse
+doclet.exceptionclass=Ausnahmeklasse
+doclet.ExportedTo=In Module exportiert
+doclet.OpenedTo=In Modulen ge\u00F6ffnet
+doclet.Package_private=(Package privat)
+doclet.Nested_Classes_Interfaces_Inherited_From_Class=Von Klasse geerbte verschachtelte Klassen/Schnittstellen
+doclet.Nested_Classes_Interfaces_Inherited_From_Interface=Von Schnittstelle geerbte verschachtelte Klassen/Schnittstellen
+doclet.Nested_Classes_Interfaces_Declared_In_Class=In Klasse deklarierte verschachtelte Klassen/Schnittstellen
+doclet.Nested_Classes_Interfaces_Declared_In_Interface=In Schnittstelle deklarierte verschachtelte Klassen/Schnittstellen
+doclet.Methods_Inherited_From_Class=Von Klasse geerbte Methoden
+doclet.Methods_Inherited_From_Interface=Von Schnittstelle geerbte Methoden
+doclet.Methods_Declared_In_Class=In Klasse deklarierte Methoden
+doclet.Methods_Declared_In_Interface=In Schnittstelle deklarierte Methoden
+doclet.Fields_Inherited_From_Class=Von Klasse geerbte Felder
+doclet.Fields_Inherited_From_Interface=Von Schnittstelle geerbte Felder
+doclet.Fields_Declared_In_Class=In Klasse deklarierte Felder
+doclet.Fields_Declared_In_Interface=In Schnittstelle deklarierte Felder
+doclet.Properties_Inherited_From_Class=Von Klasse geerbte Eigenschaften
+doclet.Properties_Inherited_From_Interface=Von Schnittstelle geerbte Eigenschaften
+doclet.Properties_Declared_In_Class=In Klasse deklarierte Eigenschaften
+doclet.Properties_Declared_In_Interface=In Schnittstelle deklarierte Eigenschaften
+doclet.Annotation_Type_Member_Detail=Elementdetails
+doclet.Enum_Constant_Detail=Enum-Konstanten - Details
+doclet.Constants_Summary=Konstantenfeldwerte
+doclet.Field_Detail=Felddetails
+doclet.Property_Detail=Eigenschaftsdetails
+doclet.Method_Detail=Methodendetails
+doclet.Constructor_Detail=Konstruktordetails
+doclet.Deprecated=Veraltet.
+doclet.DeprecatedForRemoval=Veraltet, zur Entfernung: Dieses API-Element wird in einer zuk\u00FCnftigen Version entfernt.
+doclet.Groupname_already_used=In der Option -group wird der Gruppenname bereits verwendet: {0}
+doclet.value_tag_invalid_reference={0} (referenziert von @value-Tag) ist eine unbekannte Referenz.
+doclet.value_tag_invalid_constant=@value-Tag (das {0} referenziert) kann nur in Konstanten verwendet werden.
+doclet.value_tag_invalid_use=@value-Tag kann hier nicht verwendet werden.
+doclet.dest_dir_create=Zielverzeichnis wird erstellt: "{0}"
+doclet.in={0} in {1}
+doclet.Fields=Felder
+doclet.Preview=Vorschau.
+doclet.Properties=Eigenschaften
+doclet.Constructors=Konstruktoren
+doclet.Methods=Methoden
+doclet.All_Methods=Alle Methoden
+doclet.Static_Methods=Statische Methoden
+doclet.Instance_Methods=Instanzmethoden
+doclet.Abstract_Methods=Abstrakte Methoden
+doclet.Concrete_Methods=Konkrete Methoden
+doclet.Default_Methods=Standardmethoden
+doclet.Deprecated_Methods=Veraltete Methoden
+doclet.Annotation_Type_Optional_Members=Optionale Elemente
+doclet.Annotation_Type_Required_Members=Erforderliche Elemente
+doclet.Enum_Constants=Enum-Konstanten
+doclet.Nested_Classes=Verschachtelte Klassen
+doclet.Modifier=Modifizierer
+doclet.Type=Typ
+doclet.Modifier_and_Type=Modifizierer und Typ
+doclet.Implementation=Implementierung(en):
+doclet.search=SEARCH:
+doclet.search_placeholder=Suchen
+doclet.Field=Feld
+doclet.Property=Eigenschaft
+doclet.Constructor=Konstruktor
+doclet.Method=Methode
+doclet.Annotation_Type_Optional_Member=Optionales Element
+doclet.Annotation_Type_Required_Member=Erforderliches Element
+doclet.Annotation_Type_Member=Annotationstypelement
+doclet.Annotation_Interface_Member=Annotationsschnittstellenelement
+doclet.Enum_Constant=Enum-Konstante
+doclet.Description=Beschreibung
+doclet.ConstantField=Konstantenfeld
+doclet.Value=Wert
+doclet.linkMismatch_PackagedLinkedtoModule=Der Code, der dokumentiert wird, verwendet Packages im unbenannten Modul, aber die in {0} definierten Packages befinden sich in benannten Modulen.
+doclet.linkMismatch_ModuleLinkedtoPackage=Der Code, der dokumentiert wird, verwendet Module, aber die in {0} definierten Packages befinden sich im unbenannten Modul.
+doclet.urlRedirected=URL {0} wurde umgeleitet an {1} - Aktualisieren Sie die Befehlszeilenoptionen, um diese Warnung zu unterdr\u00FCcken.
+doclet.duplicate.comment.for.property=Doppelter Kommentar f\u00FCr Eigenschaft.\nEntfernen Sie den Kommentar auf dem Eigenschaftsfeld oder in dieser Methode, um diese Warnung zu unterdr\u00FCcken.
+
+#Documentation for Enums
+doclet.enum_values_doc.fullbody=Gibt ein Array mit den Konstanten dieses Enum-Typs in\nder Reihenfolge ihrer Deklaration zur\u00FCck.
+doclet.enum_class_values_doc.fullbody=Gibt ein Array mit den Konstanten dieser Enum-Klasse in\nder Reihenfolge ihrer Deklaration zur\u00FCck.
+
+doclet.enum_values_doc.return=ein Array mit den Konstanten dieses Enumerationstyps in der Reihenfolge ihrer Deklaration
+doclet.enum_class_values_doc.return=ein Array mit den Konstanten dieser Enum-Klasse in der Reihenfolge ihrer Deklaration
+
+doclet.enum_valueof_doc.fullbody=Gibt die Enumerationskonstante dieses Typs mit dem angegebenen Namen zur\u00FCck.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID \u00FCbereinstimmen,\nmit der eine Enumerationskonstante in diesem Typ deklariert wird.\n(Zus\u00E4tzliche Leerzeichen sind nicht zul\u00E4ssig.)
+doclet.enum_class_valueof_doc.fullbody=Gibt die Enum-Konstante dieser Klasse mit dem angegebenen Namen zur\u00FCck.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID \u00FCbereinstimmen,\nmit der eine Enum-Konstante in dieser Klasse deklariert wird.\n(Zus\u00E4tzliche Leerzeichen sind nicht zul\u00E4ssig.)
+
+doclet.enum_valueof_doc.param_name=Name der zur\u00FCckzugebenden Enumerationskonstante.
+
+doclet.enum_valueof_doc.return=Enumerationskonstante mit dem angegebenen Namen
+
+doclet.enum_valueof_doc.throws_ila=wenn dieser Enumerationstyp keine Konstante mit dem angegebenen Namen enth\u00E4lt
+doclet.enum_class_valueof_doc.throws_ila=wenn diese Enum-Klasse keine Konstante mit dem angegebenen Namen enth\u00E4lt
+
+doclet.enum_valueof_doc.throws_npe=wenn das Argument nicht angegeben wird
+
+
+#Documentation for records
+doclet.record_constructor_doc.fullbody=Erstellt eine Instanz einer Datensatzklasse {0}.
+
+doclet.record_constructor_doc.param_name=Wert f\u00FCr die Datensatzkomponente {0}
+
+doclet.record_equals_doc.fullbody.head=Gibt an, ob ein anderes Objekt diesem gleich ("equal to") ist. Die Objekte sind gleich, wenn das andere Objekt der gleichen Klasse angeh\u00F6rt und alle Datensatzkomponenten gleich sind.
+
+doclet.record_equals_doc.fullbody.tail.both=Referenzkomponenten werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}; primitive Komponenten werden verglichen mit "==".
+
+doclet.record_equals_doc.fullbody.tail.primitive=Alle Komponenten in dieser Datensatzklasse werden verglichen mit "==".
+
+doclet.record_equals_doc.fullbody.tail.reference=Alle Komponenten in dieser Datensatzklasse werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}.
+
+doclet.record_equals_doc.param_name=das Objekt, mit dem verglichen wird
+
+doclet.record_equals_doc.return=<code>true</code>, wenn dieses Objekt gleich dem Argument {0} ist, andernfalls <code>false</code>.
+
+doclet.record_hashCode_doc.fullbody=Gibt einen Hashcodewert f\u00FCr diese Objekt zur\u00FCck. Der Wert wird vom Hashcode jeder der Datensatzkomponenten abgeleitet.
+
+doclet.record_hashCode_doc.return=ein Hashcodewert f\u00FCr dieses Objekt
+
+doclet.record_toString_doc.fullbody=Gibt eine Zeichenfolgendarstellung dieser Datensatzklasse zur\u00FCck. Die Darstellung enth\u00E4lt den Namen der Klasse, gefolgt vom Namen und Wert jeder der Datensatzkomponenten.
+
+doclet.record_toString_doc.return=eine Zeichenfolgendarstellung dieses Objekts
+
+doclet.record_accessor_doc.fullbody=Gibt den Wert f\u00FCr die Datensatzkomponente {0} zur\u00FCck.
+
+doclet.record_accessor_doc.return=Wert der Datensatzkomponente {0}
+
+doclet.record_field_doc.fullbody=Das Feld f\u00FCr die Datensatzkomponente {0}.
+
+doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
+doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
+doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
+
+doclet.search.no_results=Keine Ergebnisse gefunden
+doclet.search.loading=Suchindex wird geladen...
+doclet.search.modules=Module
+doclet.search.packages=Packages
+doclet.search.classes_and_interfaces=Klassen und Schnittstellen
+doclet.search.types=Typen
+doclet.search.members=Mitglieder
+doclet.search.search_tags=Tags suchen
+
+doclet.snippet.contents.none=@snippet gibt keinen Inhalt an
+
+doclet.snippet.contents.ambiguity.external=@snippet gibt mehrere externe Inhalte an, was nicht eindeutig ist
+
+doclet.snippet.region.not_found=Region nicht gefunden: "{0}"
+
+doclet.tag.attribute.value.illegal=ung\u00FCltiger Wert f\u00FCr Attribut "{0}": "{1}"
+
+doclet.tag.attribute.value.missing=fehlender Wert f\u00FCr Attribut "{0}"
+
+doclet.tag.attribute.repeated=wiederholtes Attribut: "{0}"
+
+doclet.snippet.contents.mismatch=Inhalt stimmt nicht \u00FCberein:\n{0}
+
+doclet.snippet.markup=snippet-Markup: {0}
+
+doclet.snippet.markup.spurious=falsches Markup
+doclet.snippet.markup.attribute.absent=Attribut "{0}" fehlt
+doclet.snippet.markup.attribute.simultaneous.use=Attribute "{0}" und "{1}" gleichzeitig verwendet
+doclet.snippet.markup.attribute.unexpected=unerwartetes Attribut
+doclet.snippet.markup.attribute.value.invalid=Ung\u00FCltiger Attributwert
+doclet.snippet.markup.attribute.value.unterminated=nicht beendeter Attributwert
+doclet.snippet.markup.regex.invalid=ung\u00FCltiger regul\u00E4rer Ausdruck
+doclet.snippet.markup.region.duplicated=doppelte Region
+doclet.snippet.markup.region.none=keine Region zum Beenden
+doclet.snippet.markup.region.unpaired=nicht gepaarte Region
+doclet.snippet.markup.tag.non.existent.lines=Tag bezieht sich auf nicht vorhandene Zeilen
+
+# 0: path
+doclet.cannot_use_snippet_path=Option --snippet-path kann mit dem gegebenen Dateimanager nicht verwendet werden: {0}
+
+# 0: path; 1: exception
+doclet.error_setting_snippet_path=Fehler beim Festlegen von Snippet-Pfad {0}: {1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
index 05c406d4421..e062f714f15 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
@@ -32,8 +32,6 @@ doclet.Serialized_Form=\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F
 doclet.Serialized_Form_methods=\u76F4\u5217\u5316\u30E1\u30BD\u30C3\u30C9
 doclet.Serialized_Form_fields=\u76F4\u5217\u5316\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Serialized_Form_class=\u76F4\u5217\u5316\u306E\u6982\u8981
-doclet.Class_0_implements_serializable=Class {0} implements Serializable
-doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable
 doclet.Option_conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u304C{1}\u3068\u77DB\u76FE\u3057\u307E\u3059
 doclet.Option_reuse=\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u518D\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
 doclet.Option_invalid={1}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570{0}\u304C\u7121\u52B9\u3067\u3059
@@ -44,11 +42,13 @@ doclet.error.initializing.dest.dir=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u3
 doclet.exception.read.file=\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
 doclet.exception.write.file=\u30D5\u30A1\u30A4\u30EB\u306E\u66F8\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
 doclet.exception.read.resource=\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
-doclet.internal.exception=\u5185\u90E8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002 \n\t({0})
+doclet.internal.exception=\u5185\u90E8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\t({0})
 doclet.internal.report.bug=Bug Database (http://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java bug\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8\n(http://bugreport.java.com)\u3067javadoc\u30C4\u30FC\u30EB\u306B\u5BFE\u3059\u308Bbug\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\n\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
 doclet.File_not_found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
 doclet.Copy_Overwrite_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u540C\u3058\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308B\u306E\u3067{1}\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F...
 doclet.Copy_Ignored_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F: \u540D\u524D\u304C\u7121\u52B9\u3067\u3059
+doclet.Copy_snippet_to_clipboard=\u30B3\u30D4\u30FC
+doclet.Copied_snippet_to_clipboard=\u30B3\u30D4\u30FC\u6E08
 doclet.Copying_File_0_To_Dir_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
 doclet.Copying_File_0_To_File_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30D5\u30A1\u30A4\u30EB{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
 doclet.No_Public_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308Bpublic\u307E\u305F\u306Fprotected\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
@@ -78,8 +78,11 @@ doclet.not_standard_file_manager = \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D1\u3
 doclet.Author=\u4F5C\u6210\u8005:
 doclet.DefaultValue=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024:
 doclet.PropertyDescription=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8AAC\u660E:
-doclet.PropertyGetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
-doclet.PropertySetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
+doclet.PropertyGetterWithName={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
+doclet.PropertyGetterReturn={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024
+doclet.PropertySetterWithName={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
+doclet.PropertySetterParam={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024
+doclet.PropertyMethodReturn={0}\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.Default=\u30C7\u30D5\u30A9\u30EB\u30C8:
 doclet.Parameters=\u30D1\u30E9\u30E1\u30FC\u30BF:
 doclet.TypeParameters=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF:
@@ -103,7 +106,6 @@ doclet.Factory=\u30D5\u30A1\u30AF\u30C8\u30EA:
 doclet.UnknownTag={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002
 doclet.UnknownTagLowercase={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002\u5927\u6587\u5B57\u3068\u5C0F\u6587\u5B57\u306E\u533A\u5225\u3092\u9664\u3044\u3066\u306F\u65E2\u77E5\u306E\u30BF\u30B0\u3068\u540C\u3058\u3067\u3059\u3002
 doclet.noInheritedDoc=@inheritDoc\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u306F\u3069\u306E\u30E1\u30BD\u30C3\u30C9\u3082\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-# doclet.malformed_html_link_tag=<a> tag is malformed:\n"{0}"
 doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002
 doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981
 doclet.Requires_Summary=\u5FC5\u8981
@@ -116,12 +118,6 @@ doclet.Concealed_Packages_Summary=\u975E\u8868\u793A
 doclet.From=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5143
 doclet.Uses_Summary=\u4F7F\u7528
 doclet.Provides_Summary=\u63D0\u4F9B
-doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6982\u8981
-doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u6982\u8981
-doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u6982\u8981
-doclet.Exception_Summary=\u4F8B\u5916\u306E\u6982\u8981
-doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u6982\u8981
-doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u6982\u8981
 doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u6982\u8981
 doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981
 doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981
@@ -130,32 +126,38 @@ doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981
 doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
 doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
 doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
-doclet.Record_Summary=\u30EC\u30B3\u30FC\u30C9\u30FB\u30B5\u30DE\u30EA\u30FC
 doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Enums=\u5217\u6319
+doclet.EnumClasses=\u5217\u6319\u30AF\u30E9\u30B9
+doclet.RecordClasses=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
+doclet.Related_Packages=\u95A2\u9023\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.AnnotationTypes=\u6CE8\u91C8\u578B
-doclet.Exceptions=\u4F8B\u5916
-doclet.Errors=\u30A8\u30E9\u30FC
+doclet.AnnotationInterfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.ExceptionClasses=\u4F8B\u5916\u30AF\u30E9\u30B9
 doclet.Classes=\u30AF\u30E9\u30B9
-doclet.packages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.modules=\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.All_Classes=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9
+doclet.All_Classes_And_Interfaces=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.All_Superinterfaces=\u3059\u3079\u3066\u306E\u30B9\u30FC\u30D1\u30FC\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
 doclet.All_Implemented_Interfaces=\u3059\u3079\u3066\u306E\u5B9F\u88C5\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
 doclet.Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Class=\u30AF\u30E9\u30B9
 doclet.AnnotationType=\u6CE8\u91C8\u578B
+doclet.AnnotationInterface=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotationtype=\u6CE8\u91C8\u578B
+doclet.annotationinterface=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotationtypes=\u6CE8\u91C8\u578B
+doclet.annotationinterfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Enum=\u5217\u6319
+doclet.EnumClass=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.enum=\u5217\u6319
+doclet.enumclass=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.enums=\u5217\u6319
+doclet.enumclasses=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.class=\u30AF\u30E9\u30B9
-doclet.classes=\u30AF\u30E9\u30B9
-doclet.Record=\u30EC\u30B3\u30FC\u30C9
-doclet.record=\u30EC\u30B3\u30FC\u30C9
+doclet.RecordClass=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
+doclet.recordclass=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
+doclet.ExceptionClass=\u4F8B\u5916\u30AF\u30E9\u30B9
+doclet.exceptionclass=\u4F8B\u5916\u30AF\u30E9\u30B9
 doclet.ExportedTo=\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 doclet.OpenedTo=\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30AA\u30FC\u30D7\u30F3
 doclet.Package_private=(package private)
@@ -190,14 +192,10 @@ doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057
 doclet.value_tag_invalid_use=@value\u30BF\u30B0\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
 doclet.dest_dir_create=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4F5C\u6210\u4E2D: "{0}"
 doclet.in={1}\u306E{0}
-doclet.Use_Table_Summary=\u8868\u3001{0}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E\u306E\u4F7F\u7528
-doclet.Member_Table_Summary={0}\u8868\u3001{1}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E
-doclet.fields=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Fields=\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.Preview=\u30D7\u30EC\u30D3\u30E5\u30FC\u3002
 doclet.Properties=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.Constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.methods=\u30E1\u30BD\u30C3\u30C9
 doclet.Methods=\u30E1\u30BD\u30C3\u30C9
 doclet.All_Methods=\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9
 doclet.Static_Methods=static\u30E1\u30BD\u30C3\u30C9
@@ -208,7 +206,6 @@ doclet.Default_Methods=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u3
 doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
 doclet.Annotation_Type_Optional_Members=\u4EFB\u610F\u8981\u7D20
 doclet.Annotation_Type_Required_Members=\u5FC5\u9808\u8981\u7D20
-doclet.enum_constants=\u5217\u6319\u578B\u5B9A\u6570
 doclet.Enum_Constants=\u5217\u6319\u5B9A\u6570
 doclet.Nested_Classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9
 doclet.Modifier=\u4FEE\u98FE\u5B50
@@ -216,6 +213,7 @@ doclet.Type=\u30BF\u30A4\u30D7
 doclet.Modifier_and_Type=\u4FEE\u98FE\u5B50\u3068\u30BF\u30A4\u30D7
 doclet.Implementation=\u5B9F\u88C5:
 doclet.search=SEARCH:
+doclet.search_placeholder=\u691C\u7D22
 doclet.Field=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Property=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.Constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
@@ -223,6 +221,7 @@ doclet.Method=\u30E1\u30BD\u30C3\u30C9
 doclet.Annotation_Type_Optional_Member=\u4EFB\u610F\u8981\u7D20
 doclet.Annotation_Type_Required_Member=\u5FC5\u9808\u8981\u7D20
 doclet.Annotation_Type_Member=\u6CE8\u91C8\u578B\u8981\u7D20
+doclet.Annotation_Interface_Member=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
 doclet.Enum_Constant=\u5217\u6319\u578B\u5B9A\u6570
 doclet.Description=\u8AAC\u660E
 doclet.ConstantField=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9
@@ -230,25 +229,30 @@ doclet.Value=\u5024
 doclet.linkMismatch_PackagedLinkedtoModule=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u30B3\u30FC\u30C9\u3067\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3082\u306E\u3067\u3059\u3002
 doclet.linkMismatch_ModuleLinkedtoPackage=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u30B3\u30FC\u30C9\u3067\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3082\u306E\u3067\u3059\u3002
 doclet.urlRedirected=URL {0}\u306F{1}\u306B\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3055\u308C\u307E\u3057\u305F -- \u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u66F4\u65B0\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u8868\u793A\u3057\u306A\u3044\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+doclet.duplicate.comment.for.property=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30B3\u30E1\u30F3\u30C8\u304C\u91CD\u8907\u3057\u3066\n\u3044\u307E\u3059\u3002\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u307E\u305F\u306F\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8\u3092\u524A\u9664\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 #Documentation for Enums
 doclet.enum_values_doc.fullbody=\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u8FD4\u3057\u307E\u3059\u3002
+doclet.enum_class_values_doc.fullbody=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u8FD4\u3057\u307E\u3059\u3002
 
 doclet.enum_values_doc.return=\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u306E\u914D\u5217
+doclet.enum_class_values_doc.return=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u542B\u3080\u914D\u5217
 
 doclet.enum_valueof_doc.fullbody=\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\n\u3067\u304D\u307E\u305B\u3093\u3002)
+doclet.enum_class_valueof_doc.fullbody=\u3053\u306E\u30AF\u30E9\u30B9\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u6307\u5B9A\u3057\u305F\u540D\u524D\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u30AF\u30E9\u30B9\u306E\u5217\u6319\u578B\u5B9A\u6570\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3055\u308C\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u306F\u4F7F\u7528\n\u3067\u304D\u307E\u305B\u3093\u3002)
 
 doclet.enum_valueof_doc.param_name=\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\u3002
 
 doclet.enum_valueof_doc.return=\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5217\u6319\u578B\u5B9A\u6570
 
 doclet.enum_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u578B\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
+doclet.enum_class_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
 
 doclet.enum_valueof_doc.throws_npe=\u5F15\u6570\u304Cnull\u306E\u5834\u5408
 
 
 #Documentation for records
-doclet.record_constructor_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
+doclet.record_constructor_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
 
 doclet.record_constructor_doc.param_name={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5024
 
@@ -256,9 +260,9 @@ doclet.record_equals_doc.fullbody.head=\u4ED6\u306E\u30AA\u30D6\u30B8\u30A7\u30A
 
 doclet.record_equals_doc.fullbody.tail.both=\u53C2\u7167\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u3001\u30D7\u30EA\u30DF\u30C6\u30A3\u30D6\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
-doclet.record_equals_doc.fullbody.tail.primitive=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u5185\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.primitive=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
-doclet.record_equals_doc.fullbody.tail.reference=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u5185\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.reference=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
 doclet.record_equals_doc.param_name=\u6BD4\u8F03\u3059\u308B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
 
@@ -268,7 +272,7 @@ doclet.record_hashCode_doc.fullbody=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u
 
 doclet.record_hashCode_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30CF\u30C3\u30B7\u30E5\u30FB\u30B3\u30FC\u30C9\u5024
 
-doclet.record_toString_doc.fullbody=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u306E\u6587\u5B57\u5217\u8868\u73FE\u3092\u8FD4\u3057\u307E\u3059\u3002\u8868\u73FE\u306B\u306F\u3001\u578B\u306E\u540D\u524D\u306B\u7D9A\u3051\u3066\u5404\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u540D\u524D\u3068\u5024\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.record_toString_doc.fullbody=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u6587\u5B57\u5217\u8868\u73FE\u3092\u8FD4\u3057\u307E\u3059\u3002\u3053\u306E\u8868\u73FE\u3067\u306F\u3001\u30AF\u30E9\u30B9\u540D\u306E\u5F8C\u306B\u3001\u5404\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u540D\u524D\u3068\u5024\u304C\u7D9A\u3044\u3066\u3044\u307E\u3059\u3002
 
 doclet.record_toString_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u6587\u5B57\u5217\u8868\u73FE
 
@@ -281,3 +285,46 @@ doclet.record_field_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
 doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
+
+doclet.search.no_results=\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
+doclet.search.loading=\u691C\u7D22\u7D22\u5F15\u3092\u30ED\u30FC\u30C9\u4E2D...
+doclet.search.modules=\u30E2\u30B8\u30E5\u30FC\u30EB
+doclet.search.packages=\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.search.classes_and_interfaces=\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.search.types=\u30BF\u30A4\u30D7
+doclet.search.members=\u30E1\u30F3\u30D0\u30FC
+doclet.search.search_tags=\u30BF\u30B0\u306E\u691C\u7D22
+
+doclet.snippet.contents.none=@snippet\u306B\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+
+doclet.snippet.contents.ambiguity.external=@snippet\u306B\u3001\u4E0D\u660E\u306A\u8907\u6570\u306E\u5916\u90E8\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+
+doclet.snippet.region.not_found=\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "{0}"
+
+doclet.tag.attribute.value.illegal=\u5C5E\u6027"{0}"\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: "{1}"
+
+doclet.tag.attribute.value.missing=\u5C5E\u6027"{0}"\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+
+doclet.tag.attribute.repeated=\u5C5E\u6027\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059: "{0}"
+
+doclet.snippet.contents.mismatch=\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093:\n{0}
+
+doclet.snippet.markup=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7: {0}
+
+doclet.snippet.markup.spurious=\u7591\u4F3C\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7
+doclet.snippet.markup.attribute.absent=\u5C5E\u6027"{0}"\u304C\u3042\u308A\u307E\u305B\u3093
+doclet.snippet.markup.attribute.simultaneous.use=\u5C5E\u6027"{0}"\u3068"{1}"\u304C\u540C\u6642\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+doclet.snippet.markup.attribute.unexpected=\u4E88\u671F\u3057\u306A\u3044\u5C5E\u6027
+doclet.snippet.markup.attribute.value.invalid=\u7121\u52B9\u306A\u5C5E\u6027\u5024
+doclet.snippet.markup.attribute.value.unterminated=\u5C5E\u6027\u5024\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
+doclet.snippet.markup.regex.invalid=\u6B63\u898F\u8868\u73FE\u304C\u7121\u52B9\u3067\u3059
+doclet.snippet.markup.region.duplicated=\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
+doclet.snippet.markup.region.none=\u7D42\u4E86\u3059\u308B\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
+doclet.snippet.markup.region.unpaired=\u30DA\u30A2\u306B\u306A\u3063\u3066\u3044\u306A\u3044\u30EA\u30FC\u30B8\u30E7\u30F3
+doclet.snippet.markup.tag.non.existent.lines=\u5B58\u5728\u3057\u306A\u3044\u884C\u3092\u30BF\u30B0\u304C\u53C2\u7167\u3057\u3066\u3044\u307E\u3059
+
+# 0: path
+doclet.cannot_use_snippet_path=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067''--snippet-path''\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+
+# 0: path; 1: exception
+doclet.error_setting_snippet_path=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9{0}\u306E\u8A2D\u5B9A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
index 2a0f2b1c714..963a8763071 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
@@ -32,8 +32,6 @@ doclet.Serialized_Form=\u5E8F\u5217\u5316\u8868\u683C
 doclet.Serialized_Form_methods=\u5E8F\u5217\u5316\u65B9\u6CD5
 doclet.Serialized_Form_fields=\u5E8F\u5217\u5316\u5B57\u6BB5
 doclet.Serialized_Form_class=\u5E8F\u5217\u5316\u6982\u89C8
-doclet.Class_0_implements_serializable=\u7C7B{0}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
-doclet.Class_0_extends_implements_serializable=\u7C7B{0}\u6269\u5C55{1}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
 doclet.Option_conflict=\u9009\u9879{0}\u4E0E{1}\u51B2\u7A81
 doclet.Option_reuse=\u91CD\u590D\u4F7F\u7528\u7684\u9009\u9879: {0}
 doclet.Option_invalid={1} \u9009\u9879\u7684 {0} \u53C2\u6570\u65E0\u6548
@@ -49,6 +47,8 @@ doclet.internal.report.bug=\u5982\u679C\u5728 Bug Database (http://bugs.java.com
 doclet.File_not_found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
 doclet.Copy_Overwrite_warning=\u672A\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230 {1}, \u56E0\u4E3A\u73B0\u6709\u6587\u4EF6\u5177\u6709\u76F8\u540C\u540D\u79F0...
 doclet.Copy_Ignored_warning=\u672A\u590D\u5236\u6587\u4EF6 {0}\uFF1A\u540D\u79F0\u65E0\u6548
+doclet.Copy_snippet_to_clipboard=\u590D\u5236
+doclet.Copied_snippet_to_clipboard=\u5DF2\u590D\u5236\uFF01
 doclet.Copying_File_0_To_Dir_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u76EE\u5F55 {1}...
 doclet.Copying_File_0_To_File_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u6587\u4EF6{1}...
 doclet.No_Public_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u516C\u5171\u6216\u53D7\u4FDD\u62A4\u7684\u7C7B\u3002
@@ -78,8 +78,11 @@ doclet.not_standard_file_manager = \u65E0\u6CD5\u8BBE\u7F6E taglet \u8DEF\u5F84\
 doclet.Author=\u4F5C\u8005:
 doclet.DefaultValue=\u9ED8\u8BA4\u503C:
 doclet.PropertyDescription=\u5C5E\u6027\u8BF4\u660E:
-doclet.PropertyGetterWithName=\u83B7\u53D6\u5C5E\u6027{0}\u7684\u503C\u3002
-doclet.PropertySetterWithName=\u8BBE\u7F6E\u5C5E\u6027{0}\u7684\u503C\u3002
+doclet.PropertyGetterWithName=\u83B7\u53D6{0}\u5C5E\u6027\u7684\u503C\u3002
+doclet.PropertyGetterReturn={0} \u5C5E\u6027\u7684\u503C
+doclet.PropertySetterWithName=\u8BBE\u7F6E{0}\u5C5E\u6027\u7684\u503C\u3002
+doclet.PropertySetterParam={0} \u5C5E\u6027\u7684\u503C
+doclet.PropertyMethodReturn={0} \u5C5E\u6027
 doclet.Default=\u9ED8\u8BA4\u503C:
 doclet.Parameters=\u53C2\u6570:
 doclet.TypeParameters=\u7C7B\u578B\u53C2\u6570:
@@ -103,7 +106,6 @@ doclet.Factory=\u5DE5\u5382:
 doclet.UnknownTag={0}\u662F\u672A\u77E5\u6807\u8BB0\u3002
 doclet.UnknownTagLowercase={0}\u662F\u672A\u77E5\u6807\u8BB0 - \u9664\u4E86\u5927\u5C0F\u5199\u4E4B\u5916\u5176\u4ED6\u65B9\u9762\u4E0E\u5DF2\u77E5\u6807\u8BB0\u76F8\u540C\u3002
 doclet.noInheritedDoc=\u4F7F\u7528\u4E86 @inheritDoc, \u4F46{0}\u672A\u8986\u76D6\u6216\u5B9E\u73B0\u4EFB\u4F55\u65B9\u6CD5\u3002
-# doclet.malformed_html_link_tag=<a> tag is malformed:\n"{0}"
 doclet.tag_misuse=\u4E0D\u80FD\u5728{1}\u6587\u6863\u4E2D\u4F7F\u7528\u6807\u8BB0{0}\u3002\u53EA\u80FD\u5728\u4EE5\u4E0B\u7C7B\u578B\u7684\u6587\u6863\u4E2D\u4F7F\u7528\u8BE5\u6807\u8BB0: {2}\u3002
 doclet.Package_Summary=\u7A0B\u5E8F\u5305\u6982\u8981
 doclet.Requires_Summary=\u5FC5\u9700\u9879
@@ -116,12 +118,6 @@ doclet.Concealed_Packages_Summary=\u5DF2\u9690\u85CF
 doclet.From=\u4ECE
 doclet.Uses_Summary=\u4F7F\u7528
 doclet.Provides_Summary=\u63D0\u4F9B
-doclet.Interface_Summary=\u63A5\u53E3\u6982\u8981
-doclet.Annotation_Types_Summary=\u6CE8\u91CA\u7C7B\u578B\u6982\u8981
-doclet.Enum_Summary=\u679A\u4E3E\u6982\u8981
-doclet.Exception_Summary=\u5F02\u5E38\u9519\u8BEF\u6982\u8981
-doclet.Error_Summary=\u9519\u8BEF\u6982\u8981
-doclet.Class_Summary=\u7C7B\u6982\u8981
 doclet.Nested_Class_Summary=\u5D4C\u5957\u7C7B\u6982\u8981
 doclet.Annotation_Type_Optional_Member_Summary=\u53EF\u9009\u5143\u7D20\u6982\u8981
 doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9700\u5143\u7D20\u6982\u8981
@@ -130,32 +126,38 @@ doclet.Property_Summary=\u5C5E\u6027\u6982\u8981
 doclet.Enum_Constant_Summary=\u679A\u4E3E\u5E38\u91CF\u6982\u8981
 doclet.Constructor_Summary=\u6784\u9020\u5668\u6982\u8981
 doclet.Method_Summary=\u65B9\u6CD5\u6982\u8981
-doclet.Record_Summary=\u8BB0\u5F55\u6982\u8981
 doclet.Interfaces=\u63A5\u53E3
 doclet.Enums=\u679A\u4E3E
+doclet.EnumClasses=\u679A\u4E3E\u7C7B
+doclet.RecordClasses=\u8BB0\u5F55\u7C7B
+doclet.Related_Packages=\u76F8\u5173\u7A0B\u5E8F\u5305
 doclet.AnnotationTypes=\u6CE8\u91CA\u7C7B\u578B
-doclet.Exceptions=\u5F02\u5E38\u9519\u8BEF
-doclet.Errors=\u9519\u8BEF
+doclet.AnnotationInterfaces=\u6CE8\u91CA\u63A5\u53E3
+doclet.ExceptionClasses=\u5F02\u5E38\u9519\u8BEF\u7C7B
 doclet.Classes=\u7C7B
-doclet.packages=\u7A0B\u5E8F\u5305
-doclet.modules=\u6A21\u5757
-doclet.All_Classes=\u6240\u6709\u7C7B
+doclet.All_Classes_And_Interfaces=\u6240\u6709\u7C7B\u548C\u63A5\u53E3
 doclet.All_Superinterfaces=\u6240\u6709\u8D85\u7EA7\u63A5\u53E3:
 doclet.All_Implemented_Interfaces=\u6240\u6709\u5DF2\u5B9E\u73B0\u7684\u63A5\u53E3:
 doclet.Interface=\u63A5\u53E3
 doclet.Class=\u7C7B
 doclet.AnnotationType=\u6CE8\u91CA\u7C7B\u578B
+doclet.AnnotationInterface=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotationtype=\u6CE8\u91CA\u7C7B\u578B
+doclet.annotationinterface=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotationtypes=\u6CE8\u91CA\u7C7B\u578B
+doclet.annotationinterfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.Enum=\u679A\u4E3E
+doclet.EnumClass=\u679A\u4E3E\u7C7B
 doclet.enum=\u679A\u4E3E
+doclet.enumclass=\u679A\u4E3E\u7C7B
 doclet.enums=\u679A\u4E3E
+doclet.enumclasses=\u679A\u4E3E\u7C7B
 doclet.interface=\u63A5\u53E3
-doclet.interfaces=\u63A5\u53E3
 doclet.class=\u7C7B
-doclet.classes=\u7C7B
-doclet.Record=\u8BB0\u5F55
-doclet.record=\u8BB0\u5F55
+doclet.RecordClass=\u8BB0\u5F55\u7C7B
+doclet.recordclass=\u8BB0\u5F55\u7C7B
+doclet.ExceptionClass=\u5F02\u5E38\u9519\u8BEF\u7C7B
+doclet.exceptionclass=\u5F02\u5E38\u9519\u8BEF\u7C7B
 doclet.ExportedTo=\u5DF2\u5BFC\u51FA\u5230\u6A21\u5757
 doclet.OpenedTo=\u5DF2\u6253\u5F00\u5230\u6A21\u5757
 doclet.Package_private=(\u4E13\u7528\u7A0B\u5E8F\u5305)
@@ -190,14 +192,10 @@ doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u
 doclet.value_tag_invalid_use=\u6B64\u5904\u4E0D\u80FD\u4F7F\u7528 @value \u6807\u8BB0\u3002
 doclet.dest_dir_create=\u6B63\u5728\u521B\u5EFA\u76EE\u6807\u76EE\u5F55: "{0}"
 doclet.in={1}\u4E2D\u7684{0}
-doclet.Use_Table_Summary=\u4F7F\u7528\u8868, \u5217\u8868{0}\u548C\u89E3\u91CA
-doclet.Member_Table_Summary={0}\u8868, \u5217\u8868{1}\u548C\u89E3\u91CA
-doclet.fields=\u5B57\u6BB5
 doclet.Fields=\u5B57\u6BB5
+doclet.Preview=\u9884\u89C8\u3002
 doclet.Properties=\u5C5E\u6027
-doclet.constructors=\u6784\u9020\u5668
 doclet.Constructors=\u6784\u9020\u5668
-doclet.methods=\u65B9\u6CD5
 doclet.Methods=\u65B9\u6CD5
 doclet.All_Methods=\u6240\u6709\u65B9\u6CD5
 doclet.Static_Methods=\u9759\u6001\u65B9\u6CD5
@@ -208,7 +206,6 @@ doclet.Default_Methods=\u9ED8\u8BA4\u65B9\u6CD5
 doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
 doclet.Annotation_Type_Optional_Members=\u53EF\u9009\u5143\u7D20
 doclet.Annotation_Type_Required_Members=\u6240\u9700\u5143\u7D20
-doclet.enum_constants=\u679A\u4E3E\u5E38\u91CF
 doclet.Enum_Constants=\u679A\u4E3E\u5E38\u91CF
 doclet.Nested_Classes=\u5D4C\u5957\u7C7B
 doclet.Modifier=\u9650\u5B9A\u7B26
@@ -216,6 +213,7 @@ doclet.Type=\u7C7B\u578B
 doclet.Modifier_and_Type=\u4FEE\u9970\u7B26\u548C\u7C7B\u578B
 doclet.Implementation=\u5B9E\u73B0:
 doclet.search=SEARCH:
+doclet.search_placeholder=\u641C\u7D22
 doclet.Field=\u5B57\u6BB5
 doclet.Property=\u5C5E\u6027
 doclet.Constructor=\u6784\u9020\u5668
@@ -223,6 +221,7 @@ doclet.Method=\u65B9\u6CD5
 doclet.Annotation_Type_Optional_Member=\u53EF\u9009\u5143\u7D20
 doclet.Annotation_Type_Required_Member=\u5FC5\u9700\u7684\u5143\u7D20
 doclet.Annotation_Type_Member=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
+doclet.Annotation_Interface_Member=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
 doclet.Enum_Constant=\u679A\u4E3E\u5E38\u91CF
 doclet.Description=\u8BF4\u660E
 doclet.ConstantField=\u5E38\u91CF\u5B57\u6BB5
@@ -230,25 +229,30 @@ doclet.Value=\u503C
 doclet.linkMismatch_PackagedLinkedtoModule=\u8FDB\u884C\u6587\u6863\u5316\u7684\u4EE3\u7801\u4F7F\u7528\u4E86\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u7A0B\u5E8F\u5305\uFF0C\u4F46\u5728 {0} \u4E2D\u5B9A\u4E49\u7684\u7A0B\u5E8F\u5305\u5728\u547D\u540D\u6A21\u5757\u4E2D\u3002
 doclet.linkMismatch_ModuleLinkedtoPackage=\u8FDB\u884C\u6587\u6863\u5316\u7684\u4EE3\u7801\u4F7F\u7528\u4E86\u6A21\u5757\uFF0C\u4F46\u5728 {0} \u4E2D\u5B9A\u4E49\u7684\u7A0B\u5E8F\u5305\u5728\u672A\u547D\u540D\u6A21\u5757\u4E2D\u3002
 doclet.urlRedirected=URL {0} \u5DF2\u91CD\u5B9A\u5411\u5230 {1} \u2014 \u66F4\u65B0\u547D\u4EE4\u884C\u9009\u9879\u4EE5\u9690\u85CF\u6B64\u8B66\u544A\u3002
+doclet.duplicate.comment.for.property=\u5C5E\u6027\u6CE8\u91CA\u91CD\u590D\u3002\n\u5220\u9664\u5C5E\u6027\u5B57\u6BB5\u6216\u6B64\u65B9\u6CD5\u7684\u6CE8\u91CA\u4EE5\u9690\u85CF\u6B64\u8B66\u544A\u3002
 
 #Documentation for Enums
-doclet.enum_values_doc.fullbody=\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \n\u8FD4\u56DE\u4E00\u4E2A\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002
+doclet.enum_values_doc.fullbody=\u8FD4\u56DE\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\n\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
+doclet.enum_class_values_doc.fullbody=\u8FD4\u56DE\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\n\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
 
-doclet.enum_values_doc.return=\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F\u8FD4\u56DE\u7684\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
+doclet.enum_values_doc.return=\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
+doclet.enum_class_values_doc.return=\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
 
 doclet.enum_valueof_doc.fullbody=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)
+doclet.enum_class_valueof_doc.fullbody=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002\uFF08\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002\uFF09
 
 doclet.enum_valueof_doc.param_name=\u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002
 
 doclet.enum_valueof_doc.return=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF
 
 doclet.enum_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
+doclet.enum_class_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
 
 doclet.enum_valueof_doc.throws_npe=\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C
 
 
 #Documentation for records
-doclet.record_constructor_doc.fullbody=\u521B\u5EFA {0} \u8BB0\u5F55\u7684\u5B9E\u4F8B\u3002
+doclet.record_constructor_doc.fullbody=\u521B\u5EFA {0} \u8BB0\u5F55\u7C7B\u7684\u5B9E\u4F8B\u3002
 
 doclet.record_constructor_doc.param_name={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u503C
 
@@ -256,9 +260,9 @@ doclet.record_equals_doc.fullbody.head=\u6307\u793A\u67D0\u4E2A\u5176\u4ED6\u5BF
 
 doclet.record_equals_doc.fullbody.tail.both=\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u5BF9\u53C2\u8003\u7EC4\u4EF6\u8FDB\u884C\u6BD4\u8F83\uFF1B\u4F7F\u7528 '==' \u5BF9\u57FA\u5143\u7EC4\u4EF6\u8FDB\u884C\u6BD4\u8F83
 
-doclet.record_equals_doc.fullbody.tail.primitive=\u6B64\u8BB0\u5F55\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 '==' \u8FDB\u884C\u6BD4\u8F83\u3002
+doclet.record_equals_doc.fullbody.tail.primitive=\u6B64\u8BB0\u5F55\u7C7B\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 '==' \u8FDB\u884C\u6BD4\u8F83\u3002
 
-doclet.record_equals_doc.fullbody.tail.reference=\u6B64\u8BB0\u5F55\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u8FDB\u884C\u6BD4\u8F83\u3002
+doclet.record_equals_doc.fullbody.tail.reference=\u6B64\u8BB0\u5F55\u7C7B\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u8FDB\u884C\u6BD4\u8F83\u3002
 
 doclet.record_equals_doc.param_name=\u8981\u4E0E\u4E4B\u8FDB\u884C\u6BD4\u8F83\u7684\u5BF9\u8C61
 
@@ -268,7 +272,7 @@ doclet.record_hashCode_doc.fullbody=\u8FD4\u56DE\u6B64\u5BF9\u8C61\u7684\u54C8\u
 
 doclet.record_hashCode_doc.return=\u6B64\u5BF9\u8C61\u7684\u54C8\u5E0C\u4EE3\u7801\u503C
 
-doclet.record_toString_doc.fullbody=\u8FD4\u56DE\u6B64\u8BB0\u5F55\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F\u3002\u6B64\u8868\u793A\u5F62\u5F0F\u5305\u542B\u7C7B\u578B\u7684\u540D\u79F0\uFF0C\u540E\u8DDF\u6BCF\u4E2A\u8BB0\u5F55\u7EC4\u4EF6\u7684\u540D\u79F0\u548C\u503C\u3002
+doclet.record_toString_doc.fullbody=\u8FD4\u56DE\u6B64\u8BB0\u5F55\u7C7B\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F\u3002\u6B64\u8868\u793A\u5F62\u5F0F\u5305\u542B\u7C7B\u7684\u540D\u79F0\uFF0C\u540E\u8DDF\u6BCF\u4E2A\u8BB0\u5F55\u7EC4\u4EF6\u7684\u540D\u79F0\u548C\u503C\u3002
 
 doclet.record_toString_doc.return=\u6B64\u5BF9\u8C61\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F
 
@@ -281,3 +285,46 @@ doclet.record_field_doc.fullbody={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u5B57\u6BB5\
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
 doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
+
+doclet.search.no_results=\u672A\u627E\u5230\u7ED3\u679C
+doclet.search.loading=\u6B63\u5728\u52A0\u8F7D\u641C\u7D22\u7D22\u5F15...
+doclet.search.modules=\u6A21\u5757
+doclet.search.packages=\u7A0B\u5E8F\u5305
+doclet.search.classes_and_interfaces=\u7C7B\u548C\u63A5\u53E3
+doclet.search.types=\u7C7B\u578B
+doclet.search.members=\u6210\u5458
+doclet.search.search_tags=\u641C\u7D22\u6807\u8BB0
+
+doclet.snippet.contents.none=@snippet \u672A\u6307\u5B9A\u5185\u5BB9
+
+doclet.snippet.contents.ambiguity.external=@snippet \u6307\u5B9A\u4E86\u591A\u4E2A\u5916\u90E8\u5185\u5BB9\uFF0C\u8FD9\u4F1A\u5F15\u8D77\u6DF7\u6DC6
+
+doclet.snippet.region.not_found=\u627E\u4E0D\u5230\u533A\u57DF\uFF1A"{0}"
+
+doclet.tag.attribute.value.illegal=\u5C5E\u6027 "{0}" \u7684\u503C\u975E\u6CD5\uFF1A"{1}"
+
+doclet.tag.attribute.value.missing=\u5C5E\u6027 "{0}" \u7F3A\u5C11\u503C
+
+doclet.tag.attribute.repeated=\u91CD\u590D\u5C5E\u6027\uFF1A"{0}"
+
+doclet.snippet.contents.mismatch=\u5185\u5BB9\u4E0D\u5339\u914D\uFF1A\n{0}
+
+doclet.snippet.markup=\u7247\u6BB5\u6807\u8BB0\uFF1A{0}
+
+doclet.snippet.markup.spurious=\u865A\u5047\u6807\u8BB0
+doclet.snippet.markup.attribute.absent=\u7F3A\u5C11\u5C5E\u6027 "{0}"
+doclet.snippet.markup.attribute.simultaneous.use=\u540C\u65F6\u4F7F\u7528\u4E86\u5C5E\u6027 "{0}" \u548C "{1}"
+doclet.snippet.markup.attribute.unexpected=\u610F\u5916\u7684\u5C5E\u6027
+doclet.snippet.markup.attribute.value.invalid=\u5C5E\u6027\u503C\u65E0\u6548
+doclet.snippet.markup.attribute.value.unterminated=\u672A\u7EC8\u6B62\u7684\u5C5E\u6027\u503C
+doclet.snippet.markup.regex.invalid=\u6B63\u5219\u8868\u8FBE\u5F0F\u65E0\u6548
+doclet.snippet.markup.region.duplicated=\u91CD\u590D\u7684\u533A\u57DF
+doclet.snippet.markup.region.none=\u6CA1\u6709\u7ED3\u675F\u533A\u57DF
+doclet.snippet.markup.region.unpaired=\u533A\u57DF\u4E0D\u914D\u5BF9
+doclet.snippet.markup.tag.non.existent.lines=\u6807\u8BB0\u5F15\u7528\u4E0D\u5B58\u5728\u7684\u884C
+
+# 0: path
+doclet.cannot_use_snippet_path=\u4E0D\u80FD\u5C06 ''--snippet-path'' \u9009\u9879\u4E0E\u7ED9\u5B9A\u7684\u6587\u4EF6\u7BA1\u7406\u5668 {0} \u4E00\u8D77\u4F7F\u7528
+
+# 0: path; 1: exception
+doclet.error_setting_snippet_path=\u8BBE\u7F6E\u7247\u6BB5\u8DEF\u5F84 {0} \u65F6\u51FA\u9519\uFF1A{1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
new file mode 100644
index 00000000000..ddd24f74484
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
@@ -0,0 +1,95 @@
+#
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+dc.anchor.already.defined = Anker bereits definiert: "{0}"
+dc.anchor.value.missing = kein Wert f\u00FCr Anker angegeben
+dc.attr.lacks.value = Attribut hat keinen Wert
+dc.attr.not.number = Attributwert ist keine Zahl
+dc.attr.not.supported.html5 = Attribut wird in HTML5 nicht unterst\u00FCtzt: {0}
+dc.attr.obsolete = Attribut veraltet: {0}
+dc.attr.repeated = wiederholtes Attribut: {0}
+dc.attr.img.border.not.valid = Attribut "border" f\u00FCr img akzeptiert nur "0": {0}
+dc.attr.img.border.not.number = ung\u00FCltiger Wert f\u00FCr Attribut "border": {0}
+dc.attr.table.border.not.valid = Attribut "border" f\u00FCr Tabelle akzeptiert nur "" oder "1": {0}
+dc.attr.table.border.not.number = ung\u00FCltiger Wert f\u00FCr Attribut "border": {0}
+dc.attr.unknown = unbekanntes Attribut: {0}
+dc.bad.option = ung\u00FCltige Option: {0}
+dc.bad.value.for.option = ung\u00FCltiger Wert f\u00FCr Option: {0} {1}
+dc.default.constructor = Verwendung von Standardkonstruktor, der keinen Kommentar bereitstellt
+dc.empty = keine Beschreibung f\u00FCr @{0}
+dc.empty.comment = leerer Kommentar
+dc.empty.description = keine anf\u00E4ngliche Beschreibung
+dc.entity.invalid = ung\u00FCltige Entity &{0};
+dc.exception.not.thrown = Ausnahme nicht ausgel\u00F6st: {0}
+dc.exists.param = @param "{0}" wurde bereits angegeben
+dc.exists.return = @return wurde bereits angegeben
+dc.invalid.anchor = ung\u00FCltiger Name f\u00FCr Anker: "{0}"
+dc.invalid.param = ung\u00FCltige Verwendung von @param
+dc.invalid.provides = ung\u00FCltige Verwendung von @provides
+dc.invalid.return = ung\u00FCltige Verwendung von @return
+dc.invalid.summary = ung\u00FCltige Verwendung von @summary
+dc.invalid.throws = ung\u00FCltige Verwendung von @throws
+dc.invalid.uses = ung\u00FCltige Verwendung von @uses
+dc.invalid.uri = ung\u00FCltige URI: "{0}"
+dc.missing.comment = kein Kommentar
+dc.missing.param = kein @param f\u00FCr {0}
+dc.missing.return = kein @return
+dc.missing.throws = kein @throws f\u00FCr {0}
+dc.no.alt.attr.for.image = kein Attribut "alt" f\u00FCr Bild
+dc.no.summary.or.caption.for.table=keine Beschriftung f\u00FCr Tabelle
+dc.param.name.not.found = @param-Name nicht gefunden
+dc.ref.not.found = Referenz nicht gefunden
+dc.return.not.first = '{@return} nicht am Anfang der Beschreibung
+dc.service.not.found = service-type nicht gefunden
+dc.tag.code.within.code = '{@code} in <code>
+dc.tag.empty = leeres <{0}>-Tag
+dc.tag.a.within.a = {0}-Tag, das zu <a> erweitert wird, in <a>
+dc.tag.end.not.permitted = ung\u00FCltiges Endtag: </{0}>
+dc.tag.end.unexpected = unerwartetes Endtag: </{0}>
+dc.tag.heading.sequence.1 = \u00DCberschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden \u00DCberschrift: <H{1}>
+dc.tag.heading.sequence.2 = \u00DCberschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur vorhergehenden \u00DCberschrift: <{1}>
+dc.tag.heading.sequence.3 = unerwartete \u00DCberschrift verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden \u00DCberschrift: <H{1}>
+dc.tag.nested.not.allowed=verschachteltes Tag nicht zul\u00E4ssig: <{0}>
+dc.tag.nested.tag=verschachteltes Tag: {0}
+dc.tag.not.allowed.here = Tag hier nicht zul\u00E4ssig: <{0}>
+dc.tag.not.allowed = Element nicht zul\u00E4ssig in Dokumentationskommentaren: <{0}>
+dc.tag.not.allowed.inline.element = Blockelement nicht zul\u00E4ssig in Inlineelement <{1}>: {0}
+dc.tag.not.allowed.inline.tag = Blockelement nicht zul\u00E4ssig in @{1}: {0}
+dc.tag.not.allowed.inline.other = Blockelement hier nicht zul\u00E4ssig: {0}
+dc.tag.not.closed= Element nicht geschlossen: {0}
+dc.tag.p.in.pre= unerwartete Verwendung von <p> in <pre>-Element
+dc.tag.requires.heading = \u00DCberschrift nicht gefunden f\u00FCr </{0}>
+dc.tag.self.closing = selbstschlie\u00DFendes Element nicht zul\u00E4ssig
+dc.tag.start.unmatched = Endtag fehlt: </{0}>
+dc.tag.unknown = unbekanntes Tag: {0}
+dc.tag.not.supported.html5 = Tag nicht unterst\u00FCtzt in HTML5: {0}
+dc.text.not.allowed = Text nicht zul\u00E4ssig in <{0}>-Element
+dc.unexpected.comment=Dokumentationskommentar hier nicht erwartet
+dc.value.not.allowed.here='{@value} hier nicht zul\u00E4ssig
+dc.value.not.a.constant=Wert bezieht sich nicht auf eine Konstante
+
+dc.main.ioerror=I/O-Fehler: {0}
+dc.main.no.files.given=Keine Dateien angegeben
+dc.main.usage=Verwendung:\n    doclint [Optionen] source-files...\n\nOptionen:\n  -Xmsgs  \n    Gleich wie -Xmsgs:all\n  -Xmsgs:values\n    Gibt Kategorien von zu pr\u00FCfenden Problemen an, wobei "values"\n    eine kommagetrennte Liste ist, die Folgendes enthalten kann:\n      reference      zeigt Stellen, wo Kommentare falsche Referenzen\n                     auf Java-Quellcodeelemente enthalten\n      syntax         zeigt grundlegende Syntaxfehler in Kommentaren\n      html           zeigt Probleme bei HTML-Tags und Attributen\n      accessibility  zeigt Probleme bei der Barrierefreiheit\n      missing        zeigt Probleme aufgrund fehlender Dokumentation\n      all            alles Obengenannte\n    Stellen Sie Werten zur Negierung "-" voran\n    Kategorien k\u00F6nnen durch eine der folgenden Angaben qualifiziert werden:\n      /public /protected /package /private\n    Bei positiven Kategorien (die nicht mit "-" beginnen)\n    gilt der Qualifier f\u00FCr diese und h\u00F6here Zugriffsebenen.\n    Bei negativen Kategorien (die mit "-" beginnen)\n    gilt der Qualifier f\u00FCr diese und niedrigere Zugriffsebenen.\n    Wenn ein Qualifier fehlt, gilt die Kategorie f\u00FCr\n    alle Zugriffsebenen.\n    Beispiel: -Xmsgs:all,-syntax/private\n    So werden alle Meldungen au\u00DFer Syntaxfehlermeldungen\n    in den Dokumentkommentaren privater Methoden aktiviert.\n    Werden keine -Xmsgs-Optionen angegeben, ist der Standard\n    \u00E4quivalent zu -Xmsgs:all/protected, d.h.\n    alle Meldungen werden nur f\u00FCr gesch\u00FCtzte und \u00F6ffentliche\n    Deklarationen ausgegeben.\n  -XcheckPackage:<Packages>\n    Aktiviert oder deaktiviert Pr\u00FCfungen in bestimmten Packages.\n    <Packages> ist eine kommagetrennte Liste von Packagebezeichnern.\n    Der Packagebezeichner ist entweder ein qualifizierter Name eines Packages\n    oder ein Packagenamenspr\u00E4fix, gefolgt von ".*", das auf alle\n    Subpackages des angegebenen Packages erweitert wird. Stellen Sie dem Packagebezeichner\n     "-" voran, um Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.\n  -stats\n    Meldet Statistiken zu den gemeldeten Problemen.\n  -h -help --help -usage -?\n    Zeigt diese Meldung an.\n\nDie folgenden Javac-Optionen werden ebenfalls unterst\u00FCtzt:\n  -bootclasspath, -classpath, -cp, -sourcepath, -Xmaxerrs, -Xmaxwarns\n\nUm doclint f\u00FCr einen Teil eines Projekts auszuf\u00FChren, stellen Sie die kompilierten Klassen f\u00FCr das\nProjekt in den Classpath (oder Boot Classpath), und geben Sie dann in der Befehlszeile\ndie zu pr\u00FCfenden Quelldateien an.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
index 3821b0eb9f8..273105b73e3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
@@ -29,14 +29,18 @@ dc.attr.lacks.value = \u5C5E\u6027\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u30
 dc.attr.not.number = \u5C5E\u6027\u5024\u304C\u6570\u5B57\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 dc.attr.not.supported.html5 = \u5C5E\u6027\u306FHTML5\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.attr.obsolete = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-dc.attr.obsolete.use.css = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
 dc.attr.repeated = \u7E70\u308A\u8FD4\u3055\u308C\u305F\u5C5E\u6027: {0}
-dc.attr.img.border = \u753b\u50cf\u306e\u5c5e\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
-dc.attr.table.border = \u8868\u306E\u5C5E\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
+dc.attr.img.border.not.valid = img\u306E\u5C5E\u6027"border"\u306F"0"\u306E\u307F\u3092\u53D7\u3051\u5165\u308C\u307E\u3059: {0}
+dc.attr.img.border.not.number = \u5C5E\u6027"border"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
+dc.attr.table.border.not.valid = \u8868\u306E\u5C5E\u6027"border"\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u3092\u53D7\u3051\u5165\u308C\u307E\u3059: {0}
+dc.attr.table.border.not.number = \u5C5E\u6027"border"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
 dc.attr.unknown = \u4E0D\u660E\u306A\u5C5E\u6027: {0}
 dc.bad.option = \u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 dc.bad.value.for.option = \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: {0} {1}
+dc.default.constructor = \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u4F7F\u7528\u3067\u3001\u30B3\u30E1\u30F3\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 dc.empty = @{0}\u306E\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+dc.empty.comment = \u30B3\u30E1\u30F3\u30C8\u304C\u7A7A\u3067\u3059
+dc.empty.description = \u521D\u671F\u306E\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
 dc.entity.invalid = \u7121\u52B9\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3&{0};
 dc.exception.not.thrown = \u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.exists.param = @param "{0}"\u306F\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
@@ -54,7 +58,7 @@ dc.missing.param = {0}\u306E@param\u304C\u3042\u308A\u307E\u305B\u3093
 dc.missing.return = @return\u304C\u3042\u308A\u307E\u305B\u3093
 dc.missing.throws = {0}\u306E@throws\u304C\u3042\u308A\u307E\u305B\u3093
 dc.no.alt.attr.for.image = \u30A4\u30E1\u30FC\u30B8\u306E"alt"\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
-dc.no.summary.or.caption.for.table=\u8868\u306E\u8981\u7D04\u307E\u305F\u306F\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
+dc.no.summary.or.caption.for.table=\u8868\u306E\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
 dc.param.name.not.found = @param name\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 dc.ref.not.found = \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 dc.return.not.first = '{@return}\u304C\u8AAC\u660E\u306E\u5148\u982D\u306B\u3042\u308A\u307E\u305B\u3093
@@ -68,6 +72,7 @@ dc.tag.heading.sequence.1 = \u6697\u9ED9\u7684\u306A\u5148\u884C\u898B\u51FA\u30
 dc.tag.heading.sequence.2 = \u524D\u306E\u898B\u51FA\u3057: <{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u898B\u51FA\u3057: <{0}>\u306E\u9806\u5E8F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
 dc.tag.heading.sequence.3 = \u6697\u9ED9\u7684\u306A\u5148\u884C\u898B\u51FA\u3057: <H{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4E88\u671F\u3057\u306A\u3044\u898B\u51FA\u3057: <{0}>\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
 dc.tag.nested.not.allowed=\u30CD\u30B9\u30C8\u3057\u305F\u30BF\u30B0\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: <{0}>
+dc.tag.nested.tag=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30BF\u30B0: {0}
 dc.tag.not.allowed.here = \u3053\u3053\u3067\u306F\u30BF\u30B0\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: <{0}>
 dc.tag.not.allowed = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u3067\u4F7F\u7528\u3067\u304D\u306A\u3044\u8981\u7D20\u3067\u3059: <{0}>
 dc.tag.not.allowed.inline.element = \u30A4\u30F3\u30E9\u30A4\u30F3\u8981\u7D20<{1}>\u5185\u3067\u4F7F\u7528\u3067\u304D\u306A\u3044\u30D6\u30ED\u30C3\u30AF\u8981\u7D20\u3067\u3059: {0}
@@ -79,7 +84,7 @@ dc.tag.requires.heading = </{0}>\u306E\u898B\u51FA\u3057\u304C\u898B\u3064\u304B
 dc.tag.self.closing = \u81EA\u5DF1\u7D42\u4E86\u8981\u7D20\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.tag.start.unmatched = \u7D42\u4E86\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093: </{0}>
 dc.tag.unknown = \u4E0D\u660E\u306A\u30BF\u30B0: {0}
-dc.tag.not.supported.html5 = \u30bf\u30b0\u306fHTML5\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093: {0}
+dc.tag.not.supported.html5 = \u30BF\u30B0\u306FHTML5\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.text.not.allowed = <{0}>\u8981\u7D20\u3067\u306F\u30C6\u30AD\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.unexpected.comment=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306F\u3053\u3053\u3067\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
 dc.value.not.allowed.here='{@value}\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
index 55c2bbfa8ee..58c307c9aa6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
@@ -29,14 +29,18 @@ dc.attr.lacks.value = \u5C5E\u6027\u7F3A\u5C11\u503C
 dc.attr.not.number = \u5C5E\u6027\u503C\u4E0D\u662F\u6570\u5B57
 dc.attr.not.supported.html5 = \u5C5E\u6027\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301: {0}
 dc.attr.obsolete = \u5C5E\u6027\u5DF2\u8FC7\u65F6: {0}
-dc.attr.obsolete.use.css = \u5C5E\u6027\u5DF2\u8FC7\u65F6, \u8BF7\u6539\u7528 CSS: {0}
 dc.attr.repeated = \u5C5E\u6027\u91CD\u590D: {0}
-dc.attr.img.border = \u56FE\u50CF\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
-dc.attr.table.border = \u8868\u7684\u5C5E\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
+dc.attr.img.border.not.valid = \u56FE\u50CF\u7684\u5C5E\u6027 "border" \u53EA\u63A5\u53D7 "0"\uFF1A{0}
+dc.attr.img.border.not.number = \u5C5E\u6027 "border" \u7684\u503C\u65E0\u6548\uFF1A"{0}"
+dc.attr.table.border.not.valid = \u8868\u7684\u5C5E\u6027 "border" \u53EA\u63A5\u53D7 "" \u6216 "1"\uFF1A{0}
+dc.attr.table.border.not.number = \u5C5E\u6027 "border" \u7684\u503C\u65E0\u6548\uFF1A"{0}"
 dc.attr.unknown = \u672A\u77E5\u5C5E\u6027: {0}
 dc.bad.option = \u9009\u9879\u9519\u8BEF: {0}
 dc.bad.value.for.option = \u9009\u9879\u7684\u503C\u9519\u8BEF: {0} {1}
+dc.default.constructor = \u4F7F\u7528\u4E0D\u63D0\u4F9B\u6CE8\u91CA\u7684\u9ED8\u8BA4\u6784\u9020\u5668
 dc.empty = @{0} \u6CA1\u6709\u8BF4\u660E
+dc.empty.comment = \u7A7A\u6CE8\u91CA
+dc.empty.description = \u6CA1\u6709\u521D\u59CB\u8BF4\u660E
 dc.entity.invalid = \u5B9E\u4F53 &{0}; \u65E0\u6548
 dc.exception.not.thrown = \u672A\u629B\u51FA\u5F02\u5E38\u9519\u8BEF: {0}
 dc.exists.param = \u5DF2\u6307\u5B9A @param "{0}"
@@ -54,7 +58,7 @@ dc.missing.param = {0}\u6CA1\u6709 @param
 dc.missing.return = \u6CA1\u6709 @return
 dc.missing.throws = {0}\u6CA1\u6709 @throws
 dc.no.alt.attr.for.image = \u56FE\u50CF\u6CA1\u6709 "alt" \u5C5E\u6027
-dc.no.summary.or.caption.for.table=\u8868\u6CA1\u6709\u6982\u8981\u6216\u6807\u9898
+dc.no.summary.or.caption.for.table=\u8868\u6CA1\u6709\u6807\u9898
 dc.param.name.not.found = @param name \u672A\u627E\u5230
 dc.ref.not.found = \u627E\u4E0D\u5230\u5F15\u7528
 dc.return.not.first = '{@return} \u4E0D\u5728\u8BF4\u660E\u7684\u5F00\u5934
@@ -68,6 +72,7 @@ dc.tag.heading.sequence.1 = \u4F7F\u7528\u7684\u6807\u9898\u8D85\u51FA\u5E8F\u52
 dc.tag.heading.sequence.2 = \u4F7F\u7528\u7684\u6807\u9898\u8D85\u51FA\u5E8F\u5217\uFF1A<{0}>\uFF08\u4E0E\u524D\u4E00\u4E2A\u6807\u9898\u76F8\u6BD4\uFF1A<{1}>\uFF09
 dc.tag.heading.sequence.3 = \u4F7F\u7528\u4E86\u610F\u5916\u7684\u6807\u9898\uFF1A<{0}>\uFF08\u4E0E\u9690\u5F0F\u524D\u5BFC\u6807\u9898\u76F8\u6BD4\uFF1A<H{1}>\uFF09
 dc.tag.nested.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u5D4C\u5957\u6807\u8BB0: <{0}>
+dc.tag.nested.tag=\u5D4C\u5957\u6807\u8BB0\uFF1A{0}
 dc.tag.not.allowed.here = \u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u6807\u8BB0: <{0}>
 dc.tag.not.allowed = \u6587\u6863\u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5143\u7D20: <{0}>
 dc.tag.not.allowed.inline.element = \u5185\u5D4C\u5143\u7D20 <{1}> \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5757\u5143\u7D20: {0}
@@ -79,7 +84,7 @@ dc.tag.requires.heading = \u672A\u627E\u5230 </{0}> \u7684\u6807\u9898
 dc.tag.self.closing = \u4E0D\u5141\u8BB8\u4F7F\u7528\u81EA\u5173\u95ED\u5143\u7D20
 dc.tag.start.unmatched = \u7F3A\u5C11\u7ED3\u675F\u6807\u8BB0: </{0}>
 dc.tag.unknown = \u672A\u77E5\u6807\u8BB0: {0}
-dc.tag.not.supported.html5 = \u6807\u8BB0\u5728\u751F\u6210\u7684 HTML \u7248\u672C\u4E2D\u4E0D\u53D7\u652F\u6301: {0}
+dc.tag.not.supported.html5 = \u6807\u8BB0\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301\uFF1A{0}
 dc.text.not.allowed = <{0}> \u5143\u7D20\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u6587\u672C
 dc.unexpected.comment=\u6B64\u5904\u672A\u9884\u671F\u6587\u6863\u6CE8\u91CA
 dc.value.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 '{@value}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
new file mode 100644
index 00000000000..9e410603c81
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
@@ -0,0 +1,210 @@
+#
+# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.errors={0} Fehler
+main.error={0} Fehler
+main.warnings={0} Warnungen
+main.warning={0} Warnung
+
+main.usage=Verwendung:\n    javadoc [options] [packagenames] [sourcefiles] [@files]\nmit folgenden Optionen:
+
+main.opt.at.arg=<Datei>
+main.opt.at.desc=Liest Optionen und Dateinamen aus Datei
+
+main.opt.public.desc=Zeigt nur \u00F6ffentliche Typen und Mitglieder. Zeigt bei benannten Modulen\nnur exportierte Packages und die API des Moduls.
+
+main.opt.protected.desc=Zeigt gesch\u00FCtzte/\u00F6ffentliche Typen und Mitglieder (Standard). Zeigt\nbei benannten Modulen exportierte Packages und die API des Moduls.
+
+main.opt.package.desc=Zeigt Package-/gesch\u00FCtzte/\u00F6ffentliche Typen und Mitglieder. Zeigt\nbei benannten Modulen alle Packages und alle Moduldetails.
+
+main.opt.private.desc=Zeigt alle Typen und Mitglieder. Zeigt bei benannten Modulen\nalle Packages und alle Moduldetails.
+
+main.opt.show.members.arg=<Wert>
+main.opt.show.members.desc=Gibt an, welche Mitglieder (Felder, Methoden usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt \u00F6ffentliche und gesch\u00FCtzte Mitglieder, "public" zeigt nur\n\u00F6ffentliche Mitglieder, "package" zeigt \u00F6ffentliche, gesch\u00FCtzte und\nPackagemitglieder, und "private" zeigt alle Mitglieder.
+
+main.opt.show.types.arg=<Wert>
+main.opt.show.types.desc=Gibt an, welche Typen (Klassen, Schnittstellen usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt \u00F6ffentliche und gesch\u00FCtzte Typen, "public" zeigt nur\n\u00F6ffentliche Typen, "package" zeigt \u00F6ffentliche, gesch\u00FCtzte und\nPackagetypen, und "private" zeigt alle Typen.
+
+main.opt.show.packages.arg=<Wert>
+main.opt.show.packages.desc=Gibt das Modul an, dessen Packages dokumentiert werden. M\u00F6gliche\nWerte sind "exported" oder "all" (exportierte oder alle Packages).
+
+main.opt.show.module.contents.arg=<Wert>
+main.opt.show.module.contents.desc=Gibt die Dokumentationsgranularit\u00E4t von Moduldeklarationen\nan. M\u00F6gliche Werte sind "api" oder "all".
+
+main.opt.expand.requires.arg=<Wert>
+main.opt.expand.requires.desc=Anweisungen im Tool zum Erweitern des zu dokumentierenden\nModulsets. Standardm\u00E4\u00DFig werden nur die Module dokumentiert,\ndie in der Befehlszeile ausdr\u00FCcklich angegeben werden. Der Wert\n"transitive" schlie\u00DFt zus\u00E4tzlich alle "requires transitive"-Abh\u00E4ngigkeiten\nder Module ein. Der Wert "all" schlie\u00DFt\nalle Abh\u00E4ngigkeiten der Module ein.
+
+main.opt.help.desc=Zeigt die Befehlszeilenoptionen an und beendet
+
+main.opt.module.arg=<Modul>(,<Modul>)*
+main.opt.module.desc=Dokumentiert die angegebenen Module
+
+main.opt.doclet.arg=<Klasse>
+main.opt.doclet.desc=Generiert die Ausgabe \u00FCber ein alternatives Doclet
+
+main.opt.docletpath.arg=<Pfad>
+main.opt.docletpath.desc=Gibt an, wo sich Doclet-Klassendateien befinden
+
+main.opt.module.source.path.arg=<Pfad>
+main.opt.module.source.path.desc=Gib an, wo sich die Eingabequelldateien f\u00FCr mehrere Module befinden
+
+main.opt.upgrade.module.path.arg=<Pfad>
+main.opt.upgrade.module.path.desc=Setzt den Speicherort der upgradef\u00E4higen Module au\u00DFer Kraft
+
+main.opt.module.path.arg=<Pfad>
+main.opt.module.path.desc=Gibt an, wo sich die Anwendungsmodule befinden
+
+main.opt.add.modules.arg=<Modul>(,<Modul>)*
+main.opt.add.modules.desc=Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen Modulen\naufgel\u00F6st werden sollen, oder alle Module im Modulpfad,\nwenn <Modul> ALL-MODULE-PATH lautet.
+
+main.opt.limit.modules.arg=<Modul>(,<Modul>)*
+main.opt.limit.modules.desc=Begrenzt die Gesamtzahl der beobachtbaren Module
+
+main.opt.source.path.arg=<Pfad>
+main.opt.source.path.desc=Gibt an, wo sich die Quelldateien befinden
+
+main.opt.class.path.arg=<Pfad>
+main.opt.class.path.desc=Gibt an, wo sich die Benutzerklassendateien befinden
+
+main.opt.exclude.arg=<Packageliste>
+main.opt.exclude.desc=Liste der auszuschlie\u00DFenden Packages
+
+main.opt.subpackages.arg=<Subpackageliste>
+main.opt.subpackages.desc=Gibt die Subpackages an, die rekursiv geladen werden sollen
+
+main.opt.breakiterator.desc=Berechnet den ersten Satz mit BreakIterator
+
+main.opt.bootclasspath.arg=<Pfad>
+main.opt.bootclasspath.desc=Setzt den Speicherort der f\u00FCr nicht modulare Releases\nverwendeten Plattformklassendateien au\u00DFer Kraft
+
+main.opt.system.arg=<JDK>
+main.opt.system.desc=Setzt den Speicherort der f\u00FCr modulare Releases verwendeten Systemmodule au\u00DFer Kraft
+
+main.opt.release.arg=<Release>
+main.opt.release.desc=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release
+
+main.opt.source.arg=<Release>
+main.opt.source.desc=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release
+
+main.opt.enable.preview.desc=Aktiviert Vorschausprachfeatures. Wird in Verbindung\nmit -source oder --release verwendet.
+
+main.opt.extdirs.arg=<Verzeichnisliste>
+main.opt.extdirs.desc=Setzt den Speicherort der installierten Erweiterungen au\u00DFer Kraft
+
+main.opt.verbose.desc=Gibt Meldungen \u00FCber die Javadoc-Vorg\u00E4nge aus
+
+main.opt.locale.arg=<Name>
+main.opt.locale.desc=Zu verwendendes Gebietsschema, z.B. en_US oder en_US_WIN
+
+main.opt.encoding.arg=<Name>
+main.opt.encoding.desc=Quelldateicodierungsname
+
+main.opt.quiet.desc=Zeigt keine Statusmeldungen an
+
+main.opt.version.desc=Gibt Versionsinformationen aus
+
+main.opt.J.arg=<Flag>
+main.opt.J.desc=\u00DCbergibt <Flag> direkt an das Laufzeitsystem
+
+main.opt.help.extra.desc=Gibt eine Zusammenfassung nicht standardm\u00E4\u00DFiger Optionen aus und beendet
+
+main.opt.Werror.desc=Meldet einen Fehler beim Auftreten von Warnungen
+
+main.usage.foot=\nIn Optionen im GNU-Stil kann "=" statt Leerzeichen verwendet werden, um den Namen einer Option\nvon ihrem Wert zu trennen.\n
+
+main.Xusage=
+
+main.opt.Xmaxerrs.arg=<Nummer>
+main.opt.Xmaxerrs.desc=Legt die maximale Anzahl der zu auszugebenden Fehler fest
+
+main.opt.Xmaxwarns.arg=<Nummer>
+main.opt.Xmaxwarns.desc=Legt die maximale Anzahl der auszugebenden Warnungen fest
+
+main.opt.add.exports.arg=<Modul>/<Package>=<Anderes Modul>(,<Anderes Modul>)*
+main.opt.add.exports.desc=Gibt an, dass ein Package als aus seinem definierenden Modul\nin weitere Module oder, wenn <Anderes Modul> ALL-UNNAMED\nlautet, in alle unbenannten Module exportiert betrachtet werden soll
+
+main.opt.add.reads.arg=<Modul>=<Anderes Modul>(,<Anderes Modul>)*
+main.opt.add.reads.desc=Gibt weitere Module an, die als von einem angegebenen Modul angefordert\nbetrachtet werden sollen. <Anderes Modul> kann ALL-UNNAMED lauten,\num das unbenannte Modul anzufordern.
+
+main.opt.patch.module.arg=<Modul>=<Datei>(:<Datei>)*
+main.opt.patch.module.desc=Setzt ein Modul au\u00DFer Kraft oder erweitert es mit Klassen\nund Ressourcen in JAR-Dateien oder Verzeichnissen
+
+main.Xusage.foot=\nDies sind keine Standardoptionen, und sie k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.
+
+main.doclet.usage.header=\nBereitgestellt vom Doclet {0}:
+
+main.requires_argument=F\u00FCr die Option {0} ist ein Argument erforderlich.
+main.unnecessary_arg_provided=Option {0} erfordert kein Argument
+main.only_one_argument_with_equals=Syntax mit "=" kann nicht f\u00FCr Optionen verwendet werden, die mehrere Argumente erfordern
+main.invalid_flag=Ung\u00FCltiges Kennzeichen: {0}
+main.No_modules_packages_or_classes_specified=Keine Module, Packages oder Klassen angegeben.
+main.module_not_found=Modul {0} nicht gefunden
+main.module_source_not_found=Quelldateien f\u00FCr Modul {0} nicht gefunden
+main.cannot_use_sourcepath_for_modules=Quellpfad kann nicht f\u00FCr mehrere Module {0} verwendet werden
+main.module_not_found_on_sourcepath=Modul {0} in Quellpfad nicht gefunden
+main.sourcepath_does_not_contain_module=Quellpfad enth\u00E4lt nicht Modul {0}
+main.cant.read={0} kann nicht gelesen werden
+main.Loading_source_files_for_package=Quelldateien werden geladen f\u00FCr Package {0}...
+main.Loading_source_file=Quelldatei {0} wird geladen...
+main.Building_tree=Javadoc-Informationen werden erstellt...
+main.no_source_files_for_package=Keine Quelldateien f\u00FCr Package {0}
+main.package_not_found=Package {0} nicht gefunden
+main.fatal.error=schwerwiegender Fehler aufgetreten: {0}
+main.out.of.memory=java.lang.OutOfMemoryError: Erweitern Sie den Speicher.\nBeispiel: F\u00FCgen Sie bei JDK Classic- oder HotSpot-VMs die Option -J-Xmx\nhinzu, zum Beispiel -J-Xmx32m.
+main.done_in=[fertig in {0} ms]
+main.more_than_one_doclet_specified_0_and_1=Mehr als ein Doclet angegeben: ({0} und {1}).
+main.doclet_could_not_get_location=Speicherort f\u00FCr {0} konnte nicht abgerufen werden
+main.doclet_could_not_set_location=Speicherort f\u00FCr {0} konnte nicht festgelegt werden
+main.doclet_no_classloader_found=Class Loader zum Laden von {0} konnte nicht abgerufen werden
+main.could_not_instantiate_class=Klasse {0} konnte nicht instanziiert werden
+main.doclet_class_not_found=Doclet-Klasse {0} nicht gefunden
+main.malformed_locale_name=Nicht wohlgeformter Gebietsschemaname: {0}
+main.file_not_found=Datei nicht gefunden: "{0}"
+main.illegal_class_name=Ung\u00FCltiger Klassenname: "{0}"
+main.illegal_package_name=Ung\u00FCltiger Packagename: "{0}"
+main.illegal_option_value=Ung\u00FCltiger Optionswert: "{0}"
+main.file.manager.list=FileManager-Fehler beim Auflisten von Dateien: "{0}"
+main.assertion.error=Assertion-Fehler: "{0}"
+main.warnings.Werror=Warnungen gefunden und -Werror angegeben
+main.unknown.error=ein unbekannter Fehler ist aufgetreten
+main.internal.error=ein interner Fehler ist aufgetreten
+main.unexpected.exception=eine unerwartete Ausnahme wurde abgefangen: {0}
+main.unknown.option.for.filemanager=Option wird von Dateimanager nicht unterst\u00FCtzt: {0}
+main.bad.arg.for.filemanager.option=ung\u00FCltiger Wert f\u00FCr Dateimanageroption {0}: "{1}"
+doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bug\nf\u00FCr das javadoc-Tool, nachdem Sie in der Bugdatenbank (http://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
+main.not_a_doclet=Klasse {0} ist kein g\u00FCltiges Doclet.\nHinweis: Ab JDK 13 wird die API com.sun.javadoc nicht mehr unterst\u00FCtzt.
+
+javadoc.class_not_found=Klasse {0} nicht gefunden.
+
+javadoc.error.msg={0}: Fehler - {1}
+javadoc.warning.msg={0}: Warnung - {1}
+javadoc.note.msg = {1}
+javadoc.note.pos.msg= {0}: {1}
+javadoc.version={0} {1}
+javadoc.fullversion={0} Vollversion "{1}"
+
+javadoc.err.message={0}
+javadoc.warn.message={0}
+javadoc.note.message={0}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
index c55cdd66bfd..6afc97aa512 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -191,14 +191,20 @@ main.warnings.Werror=\u8B66\u544A\u304C\u898B\u3064\u304B\u308A-Werror\u304C\u63
 main.unknown.error=\u4E0D\u660E\u306A\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 main.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 main.unexpected.exception=\u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916\u304C\u6355\u6349\u3055\u308C\u307E\u3057\u305F: {0}
+main.unknown.option.for.filemanager=\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
+main.bad.arg.for.filemanager.option=\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u306E\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: "{1}"
 doclet.internal.report.bug=Bug Database (http://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java bug\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8\n(http://bugreport.java.com)\u3067javadoc\u30C4\u30FC\u30EB\u306B\u5BFE\u3059\u308Bbug\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\n\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
 main.not_a_doclet=\u30AF\u30E9\u30B9{0}\u306F\u6709\u52B9\u306A\u30C9\u30C3\u30AF\u30EC\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n\u30CE\u30FC\u30C8: JDK 13\u304B\u3089\u3001com.sun.javadoc API\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u304F\u306A\u308A\u307E\u3057\u305F\u3002
+
 javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-javadoc.error=\u30A8\u30E9\u30FC
-javadoc.warning=\u8B66\u544A
+
 javadoc.error.msg={0}: \u30A8\u30E9\u30FC - {1}
 javadoc.warning.msg={0}: \u8B66\u544A - {1}
 javadoc.note.msg = {1}
 javadoc.note.pos.msg= {0}: {1}
 javadoc.version={0} {1}
 javadoc.fullversion={0}\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"{1}"
+
+javadoc.err.message={0}
+javadoc.warn.message={0}
+javadoc.note.message={0}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
index e5927af84e4..d17a11541d5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -191,14 +191,20 @@ main.warnings.Werror=\u53D1\u73B0\u8B66\u544A, \u4F46\u6307\u5B9A\u4E86 -Werror
 main.unknown.error=\u51FA\u73B0\u672A\u77E5\u9519\u8BEF
 main.internal.error=\u51FA\u73B0\u5185\u90E8\u9519\u8BEF
 main.unexpected.exception=\u6355\u83B7\u5230\u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF: {0}
+main.unknown.option.for.filemanager=\u9009\u9879\u4E0D\u53D7\u6587\u4EF6\u7BA1\u7406\u5668\u652F\u6301\uFF1A{0}
+main.bad.arg.for.filemanager.option=\u6587\u4EF6\u7BA1\u7406\u5668\u9009\u9879 {0} \u7684\u503C\u9519\u8BEF\uFF1A"{1}"
 doclet.internal.report.bug=\u5982\u679C\u5728 Bug Database (http://bugs.java.com) \u4E2D\u6CA1\u6709\u627E\u5230\u91CD\u590D\u9879, \n\u8BF7\u901A\u8FC7 Java Bug \u62A5\u544A\u9875 (http://bugreport.java.com) \u9488\u5BF9\u8BE5 \njavadoc \u5DE5\u5177\u5EFA\u7ACB Bug\u3002\u8BF7\u5728\u62A5\u544A\u4E2D\u9644\u4E0A\u9519\u8BEF\u6D88\u606F\u548C\u4EE5\u4E0B\u8BCA\u65AD\u4FE1\u606F\u3002\u8C22\u8C22\u3002
 main.not_a_doclet=\u7C7B {0} \u4E0D\u662F\u6709\u6548 doclet\u3002\n\u6CE8\u610F\uFF1A\u4ECE JDK 13 \u5F00\u59CB\uFF0C\u4E0D\u518D\u652F\u6301 com.sun.javadoc API\u3002
+
 javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002
-javadoc.error=\u9519\u8BEF
-javadoc.warning=\u8B66\u544A
+
 javadoc.error.msg={0}: \u9519\u8BEF - {1}
 javadoc.warning.msg={0}: \u8B66\u544A - {1}
 javadoc.note.msg = {1}
 javadoc.note.pos.msg= {0}: {1}
 javadoc.version={0} {1}
 javadoc.fullversion={0}\u5B8C\u6574\u7248\u672C "{1}"
+
+javadoc.err.message={0}
+javadoc.warn.message={0}
+javadoc.note.message={0}
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
new file mode 100644
index 00000000000..4097efbad90
--- /dev/null
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
@@ -0,0 +1,307 @@
+#
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+ONE_DAY=\ 1 Tag
+ONE_HOUR=\ 1 Stunde 
+ONE_MIN=\ 1 Min.
+ONE_MONTH=\ 1 Monat
+ONE_YEAR=\ 1 Jahr
+TWO_HOURS=\ 2 Stunden
+THREE_HOURS=\ 3 Stunden
+THREE_MONTHS=\ 3 Monate
+FIVE_MIN=\ 5 Min.
+SIX_HOURS=\ 6 Stunden
+SIX_MONTHS=\ 6 Monate
+SEVEN_DAYS=\ 7 Tage
+TEN_MIN=10 Min.
+TWELVE_HOURS=12 Stunden
+THIRTY_MIN=30 Min.
+LESS_THAN=<
+A_LOT_LESS_THAN=<<
+GREATER_THAN=>
+ACTION_CAPITALIZED=ACTION
+ACTION_INFO_CAPITALIZED=ACTION_INFO
+ALL=Alle
+ARCHITECTURE=Architektur
+ATTRIBUTE=Attribut
+ATTRIBUTE_VALUE=Attributwert
+ATTRIBUTE_VALUES=Attributwerte
+ATTRIBUTES=Attribute
+BLANK=Leer
+BLOCKED_COUNT_WAITED_COUNT=Blockiert gesamt: {0}  Gewartet gesamt: {1}\n
+BOOT_CLASS_PATH=Boot Classpath
+BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=Umschalten, um mehr oder weniger Informationen anzuzeigen
+CPU_USAGE=CPU-Auslastung
+CPU_USAGE_FORMAT=CPU-Auslastung: {0} %
+CANCEL=Abbrechen
+CASCADE=&\u00DCberlappend
+CHART_COLON=&Diagramm:
+CLASS_PATH=Classpath
+CLASS_NAME=ClassName
+CLASS_TAB_INFO_LABEL_FORMAT=<html>Geladen: {0}    Entfernt: {1}    Gesamt: {2}</html>
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr geladene Klassen.
+CLASSES=Klassen
+CLOSE=Schlie\u00DFen
+COLUMN_NAME=Name
+COLUMN_PID=PID
+COMMITTED_MEMORY=Festgeschriebener Speicher
+COMMITTED_VIRTUAL_MEMORY=Festgeschriebener virtueller Speicher
+COMMITTED=Festgeschrieben
+CONNECT=&Verbinden
+CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=Mit Java Virtual Machine verbinden
+CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld zum Herstellen einer neuen Verbindung zu einer lokalen oder Remote-Java Virtual Machine
+CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Produktleistengrafik
+CONNECT_DIALOG_MASTHEAD_TITLE=Neue Verbindung
+CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=Statusleiste
+CONNECT_DIALOG_TITLE=JConsole: Neue Verbindung
+CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=Verbunden. Klicken, um die Verbindung zu trennen.
+CONNECTION_FAILED=Verbindung nicht erfolgreich
+CONNECTION=&Verbindung
+CONNECTION_NAME=Verbindungsname
+CONNECTION_NAME__DISCONNECTED_={0} (getrennt)
+CONSTRUCTOR=Konstruktor
+CURRENT_CLASSES_LOADED=Aktuell geladene Klassen
+CURRENT_HEAP_SIZE=Aktuelle Heap-Gr\u00F6\u00DFe
+CURRENT_VALUE=Aktueller Wert: {0}
+CREATE=Erstellen
+DAEMON_THREADS=Daemon-Threads
+DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=Getrennt. Zum Verbinden klicken.
+DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=Zum Ein-/Ausblenden doppelklicken
+DOUBLE_CLICK_TO_VISUALIZE=Zum Visualisieren doppelklicken
+DESCRIPTION=Beschreibung
+DESCRIPTOR=Deskriptor
+DETAILS=Details
+DETECT_DEADLOCK=&Deadlock ermitteln
+DETECT_DEADLOCK_TOOLTIP=Sich gegenseitig blockierende Threads erkennen
+DIMENSION_IS_NOT_SUPPORTED_COLON=Dimension wird nicht unterst\u00FCtzt:
+DISCARD_CHART=Diagramm verwerfen
+DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} Tag |1.0<{0,number,integer} Tage }{1,choice,0<{1,number,integer} Stunden |1#{1,number,integer} Stunde |1<{1,number,integer} Stunden }{2,choice,0<{2,number,integer} Minuten|1#{2,number,integer} Minute|1.0<{2,number,integer} Minuten}
+DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} Stunde |1<{0,number,integer} Stunden }{1,choice,0<{1,number,integer} Minuten|1#{1,number,integer} Minute|1.0<{1,number,integer} Minuten}
+DURATION_MINUTES={0,choice,1#{0,number,integer} Minute|1.0<{0,number,integer} Minuten}
+DURATION_SECONDS={0} Sekunden
+EMPTY_ARRAY=Leeres Array
+ERROR=Fehler
+ERROR_COLON_MBEANS_ALREADY_EXIST=Fehler: MBeans sind bereits vorhanden
+ERROR_COLON_MBEANS_DO_NOT_EXIST=Fehler: MBeans sind nicht vorhanden
+EVENT=Ereignis
+EXIT=B&eenden
+FAIL_TO_LOAD_PLUGIN=Warnung: Fehler beim Laden von Plug-in: {0}
+FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=Abbrechen
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>Datei ist bereits vorhanden:<br>{0}<br>M\u00F6chten Sie sie ersetzen?
+FILE_CHOOSER_FILE_EXISTS_OK_OPTION=Ersetzen
+FILE_CHOOSER_FILE_EXISTS_TITLE=Datei vorhanden
+FILE_CHOOSER_SAVED_FILE=<html>Gespeichert in Datei:<br>{0}<br>({1} Byte)
+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>Speichern in Datei nicht erfolgreich:<br>{0}<br>{1}
+FILE_CHOOSER_SAVE_FAILED_TITLE=Speichern nicht erfolgreich
+FREE_PHYSICAL_MEMORY=Freier physischer Speicher
+FREE_SWAP_SPACE=Freier Swap-Bereich
+GARBAGE_COLLECTOR=Garbage Collector
+GC_INFO=Name = "{0}", Collections = {1,choice,-1#Unavailable|0#{1,number,integer}}, Insgesamt aufgewendete Zeit = {2}
+GC_TIME=GC-Zeit
+GC_TIME_DETAILS={0} f\u00FCr {1} ({2} Collections)
+HEAP_MEMORY_USAGE=Heap-Nutzung
+HEAP=Heap
+HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld mit Informationen zu den Versionen von JConsole und JDK
+HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole-Version:<br>{0}
+HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM-Version:<br>{0}
+HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Produktleistengrafik
+HELP_ABOUT_DIALOG_MASTHEAD_TITLE=Info zu JConsole
+HELP_ABOUT_DIALOG_TITLE=JConsole: Info
+HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://www.oracle.com/pls/topic/lookup?ctx=javase{0}&&id=using_jconsole
+HELP_MENU_ABOUT_TITLE=&Info zu JConsole
+HELP_MENU_USER_GUIDE_TITLE=Online-&Benutzerdokumentation
+HELP_MENU_TITLE=&Hilfe
+HOTSPOT_MBEANS_ELLIPSIS=&Hotspot-MBeans...
+HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld zum Verwalten von Hotspot-MBeans
+IMPACT=Auswirkung
+INFO=Information
+INFO_CAPITALIZED=INFO
+INSECURE=Unsichere Verbindung
+INVALID_PLUGIN_PATH=Warnung: Ung\u00FCltiger Plug-in-Pfad: {0}
+INVALID_URL=Ung\u00FCltige URL: {0}
+IS=Ist
+JAVA_MONITORING___MANAGEMENT_CONSOLE=Java-Monitoring- und Managementkonsole
+JCONSOLE_COLON_=JConsole: {0}
+JCONSOLE_VERSION=JConsole-Version "{0}"
+JCONSOLE_ACCESSIBLE_DESCRIPTION=Java-Monitoring- und Managementkonsole
+JIT_COMPILER=JIT-Compiler
+LIBRARY_PATH=Library-Pfad
+LIVE_THREADS=Livethreads
+LOADED=Geladen
+LOCAL_PROCESS_COLON=&Lokaler Prozess:
+MASTHEAD_FONT=Dialog-PLAIN-25
+MANAGEMENT_NOT_ENABLED=<b>Hinweis</b>: Der Management Agent ist f\u00FCr diesen Prozess nicht aktiviert.
+MANAGEMENT_WILL_BE_ENABLED=<b>Hinweis</b>: Der Management Agent wird f\u00FCr diesen Prozess aktiviert.
+MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
+MBEAN_INFO=MBeanInfo
+MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
+MBEAN_OPERATION_INFO=MBeanOperationInfo
+MBEANS=MBeans
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=L\u00F6s&chen
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=Benachrichtigungen l\u00F6schen
+MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=Composite-Datennavigation {0}/{1}
+MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=Composite-Datennavigation
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=Ak&tualisieren
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=Attribute aktualisieren
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=&Abonnieren
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=Listening auf Benachrichtigungen starten
+MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=Tabellendatennavigation {0}/{1}
+MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=Tabellendatennavigation
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=Abonnement &k\u00FCndigen
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=Listening auf Benachrichtigungen stoppen
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot-MBeans verwalten in:
+MAX=Max.
+MAXIMUM_HEAP_SIZE=Maximale Heap-Gr\u00F6\u00DFe
+MEMORY=Arbeitsspeicher
+MEMORY_POOL_LABEL=Memory-Pool "{0}"
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr Heap.
+MEMORY_TAB_INFO_LABEL_FORMAT=<html>Belegt: {0}    Festgeschrieben: {1}    Max: {2}</html>
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr Nicht-Heap.
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=was \u00FCber dem Schwellenwert {0} liegt.\n
+MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=Memory-Poolbelegungsdiagramm.
+MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=was unter dem Schwellenwert {0} liegt.\n
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr {0}.
+MESSAGE=Meldung
+METHOD_SUCCESSFULLY_INVOKED=Methode erfolgreich aufgerufen
+MINIMIZE_ALL=Alle &minimieren
+MONITOR_LOCKED=\   - {0} gesperrt\n
+NAME=Name
+NAME_AND_BUILD={0} (Build {1})
+NAME_STATE=Name: {0}\nStatus: {1}\n
+NAME_STATE_LOCK_NAME=Name: {0}\nStatus: {1} auf {2}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=Name: {0}\nStatus: {1} auf {2}, Eigent\u00FCmer: {3}\n
+NEW_CONNECTION_ELLIPSIS=&Neue Verbindung...
+NO_DEADLOCK_DETECTED=Kein Deadlock ermittelt
+NON_HEAP_MEMORY_USAGE=Nicht-Heap-Speicherauslastung
+NON_HEAP=Nicht-Heap
+NOTIFICATION=Benachrichtigung
+NOTIFICATION_BUFFER=Benachrichtigungspuffer
+NOTIFICATIONS=Benachrichtigungen
+NOTIF_TYPES=NotifTypes
+NUMBER_OF_THREADS=Anzahl Threads
+NUMBER_OF_LOADED_CLASSES=Anzahl geladene Klassen
+NUMBER_OF_PROCESSORS=Anzahl Prozessoren
+OBJECT_NAME=ObjectName
+OPERATING_SYSTEM=Betriebssystem
+OPERATION=Vorgang
+OPERATION_INVOCATION=Vorgangsaufruf
+OPERATION_RETURN_VALUE=R\u00FCckgabewert von Vorgang
+OPERATIONS=Vorg\u00E4nge
+OVERVIEW=\u00DCberblick
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr {0}.
+PARAMETER=Parameter
+PASSWORD_ACCESSIBLE_NAME=Kennwort
+PASSWORD_COLON_=&Kennwort:
+PEAK=Spitze
+PERFORM_GC=&GC ausf\u00FChren
+PERFORM_GC_TOOLTIP=Garbage Collection anfordern
+PLOTTER_ACCESSIBLE_NAME=Diagramm
+PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
+PLOTTER_ACCESSIBLE_NAME_NO_DATA=Keine Daten dargestellt.
+PLOTTER_SAVE_AS_MENU_ITEM=Daten speichern &unter...
+PLOTTER_TIME_RANGE_MENU=&Zeitraum
+PLUGIN_EXCEPTION_DIALOG_BUTTON_EXIT=Beenden
+PLUGIN_EXCEPTION_DIALOG_BUTTON_IGNORE=Ignorieren
+PLUGIN_EXCEPTION_DIALOG_BUTTON_OK=OK
+PLUGIN_EXCEPTION_DIALOG_MESSAGE=Eine unerwartete Ausnahme ist aufgetreten in %s:\n\n%s\n\nBeginnen Sie mit -debug, um Details aufzurufen. Durch Ignorieren werden zuk\u00FCnftige Ausnahmen unterdr\u00FCckt.
+PLUGIN_EXCEPTION_DIALOG_TITLE=Plug-in-Ausnahme
+PROBLEM_ADDING_LISTENER=Problem beim Hinzuf\u00FCgen von Listener
+PROBLEM_DISPLAYING_MBEAN=Problem beim Anzeigen von MBean
+PROBLEM_INVOKING=Problem beim Aufrufen
+PROBLEM_REMOVING_LISTENER=Problem beim Entfernen von Listener
+PROBLEM_SETTING_ATTRIBUTE=Problem beim Festlegen von Attribut
+PROCESS_CPU_TIME=Prozess-CPU-Zeit
+READABLE=Lesbar
+RECONNECT=Erneut verbinden
+REMOTE_PROCESS_COLON=&Remoteprozess:
+REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=Remoteprozess
+RESTORE_ALL=&Alle wiederherstellen
+RETURN_TYPE=ReturnType
+SEQ_NUM=SeqNum
+SIZE_BYTES={0,number,integer} Byte
+SIZE_GB={0} GB
+SIZE_KB={0} KB
+SIZE_MB={0} MB
+SOURCE=Quelle
+STACK_TRACE=\nStacktrace: \n
+SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
+SUMMARY_TAB_PENDING_FINALIZATION_LABEL=Beenden ausstehend
+SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0} Objekte
+SUMMARY_TAB_TAB_NAME=VM-\u00DCbersicht
+SUMMARY_TAB_VM_VERSION={0} Version {1}
+THREADS=Threads
+THREAD_TAB_INFO_LABEL_FORMAT=<html>Live: {0}    Spitze: {1}    Gesamt: {2}</html>
+THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=Threadinformationen
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr Threadanzahl.
+THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[Kein Thread ausgew\u00E4hlt]
+THRESHOLD=Schwellenwert
+TILE=&Nebeneinander
+TIME_RANGE_COLON=&Zeitraum:
+TIME=Zeit
+TIME_STAMP=TimeStamp
+TOTAL_LOADED=Insgesamt geladen
+TOTAL_CLASSES_LOADED=Insgesamt geladene Klassen
+TOTAL_CLASSES_UNLOADED=Insgesamt entfernte Klassen
+TOTAL_COMPILE_TIME=Gesamte Kompilierungszeit
+TOTAL_PHYSICAL_MEMORY=Physischer Gesamtspeicher
+TOTAL_THREADS_STARTED=Insgesamt gestartete Threads
+TOTAL_SWAP_SPACE=Gesamter Swap-Bereich
+TYPE=Typ
+UNAVAILABLE=Nicht verf\u00FCgbar
+UNKNOWN_CAPITALIZED=UNKNOWN
+UNKNOWN_HOST=Unbekannter Host: {0}
+UNREGISTER=Registrierung aufheben
+UPTIME=Betriebszeit
+USAGE_THRESHOLD=Auslastungsschwellenwert
+REMOTE_TF_USAGE=<b>Verwendung</b>: &&lt;hostname&&gt;:&&lt;port&&gt; ODER service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
+USED=Verwendet
+USERNAME_COLON_=&Benutzername:
+USERNAME_ACCESSIBLE_NAME=Benutzername
+USER_DATA=UserData
+VIRTUAL_MACHINE=Virtuelle Maschine
+VM_ARGUMENTS=VM-Argumente
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Innerer Frame f\u00FCr die \u00DCberwachung einer Java Virtual Machine
+VALUE=Wert
+VENDOR=Hersteller
+VERBOSE_OUTPUT=Verbose-Ausgabe
+VERBOSE_OUTPUT_TOOLTIP=Verbose-Ausgabe f\u00FCr Klassenladesystem aktivieren
+VIEW=Ansicht
+WINDOW=&Fenster
+WINDOWS=Windows
+WRITABLE=Nicht schreibgesch\u00FCtzt
+CONNECTION_FAILED1=Die Verbindung konnte nicht hergestellt werden: Wiederholen?
+CONNECTION_FAILED2=Die Verbindung {0} war nicht erfolgreich.<br>M\u00F6chten Sie den Vorgang wiederholen?
+CONNECTION_FAILED_SSL1=Sichere Verbindung war nicht erfolgreich. Unsichere Verbindung versuchen?
+CONNECTION_FAILED_SSL2=Die Verbindung {0} konnte \u00FCber SSL nicht hergestellt werden.<br>M\u00F6chten Sie die Verbindung ohne SSL versuchen?<br>(Benutzername und Kennwort werden im Klartext \u00FCbermittelt.)
+CONNECTION_LOST1=Verbindung unterbrochen: Erneut verbinden?
+CONNECTING_TO1=Verbindung mit {0}
+CONNECTING_TO2=Sie werden gegenw\u00E4rtig mit {0} verbunden.<br>Dies wird einige Sekunden dauern.
+DEADLOCK_TAB=Deadlock
+DEADLOCK_TAB_N=Deadlock {0}
+EXPAND=einblenden
+KBYTES={0} KB
+PLOT=Darstellung
+VISUALIZE=Visualisieren
+ZZ_USAGE_TEXT=Verwendung: {0} [ -interval=n ] [ -notile ] [ -pluginpath <Pfad> ] [ -version ] [ connection ... ]\n\n  -interval   Legt ein Aktualisierungsintervall von n Sekunden fest (der Standardwert ist 4 Sekunden)\n  -notile     Ordnet die Fenster anfangs nicht nebeneinander an (bei zwei oder mehr Verbindungen)\n  -pluginpath Gibt den Pfad an, in dem jconsole die Plug-ins sucht\n  -version    Gibt die Programmversion aus\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         Prozess-ID eines Zielprozesses\n  host        Name oder IP-Adresse eines Remotehosts\n  port        Portnummer f\u00FCr die Remoteverbindung\n\n  -J          Gibt die Eingabeargumente f\u00FCr die Java Virtual Machine an,\n              auf der jconsole ausgef\u00FChrt wird
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
index 529a5787c23..00aee7806de 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
@@ -171,7 +171,7 @@ MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u8868\u683C\u5F0F\u6570\u636E\u5BFC\u822
 MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u8868\u683C\u5F0F\u6570\u636E\u5BFC\u822A
 MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u53D6\u6D88\u8BA2\u9605(&U)
 MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u505C\u6B62\u76D1\u542C\u901A\u77E5
-MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean:
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean: 
 MAX=\u6700\u5927\u503C
 MAXIMUM_HEAP_SIZE=\u6700\u5927\u5806\u5927\u5C0F
 MEMORY=\u5185\u5B58
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
new file mode 100644
index 00000000000..4114d8e90a1
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
@@ -0,0 +1,105 @@
+#
+# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+err.prefix=Fehler:
+
+err.bad.constant.pool=Fehler beim Lesen von Konstantenpool f\u00FCr {0}: {1}
+err.class.not.found=Klasse nicht gefunden: {0}
+err.crash=Ein schwerwiegender interner Fehler ist aufgetreten: {0}\nMelden Sie einen Bug mit den folgenden Informationen:\n{1}
+err.end.of.file=unerwartetes Dateiende beim Lesen von {0}
+err.file.not.found=Datei nicht gefunden: {0}
+err.incompatible.options=ung\u00FCltige Optionenkombination: {0}
+err.internal.error=interner Fehler: {0} {1} {2}
+err.invalid.arg.for.option=ung\u00FCltiges Argument f\u00FCr Option: {0}
+err.ioerror=I/O-Fehler beim Lesen von {0}: {1}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.no.classes.specified=keine Klassen angegeben
+err.not.standard.file.manager=Klassendateien k\u00F6nnen nur angegeben werden, wenn ein Standarddateimanager verwendet wird
+err.invalid.use.of.option=ung\u00FCltige Verwendung von Option: {0}
+err.unknown.option=unbekannte Option: {0}
+err.no.SourceFile.attribute=kein SourceFile-Attribut
+err.source.file.not.found=Quelldatei nicht gefunden
+err.bad.innerclasses.attribute=ung\u00FCltiges InnerClasses-Attribut f\u00FCr {0}
+err.nomem=Nicht gen\u00FCgend Speicher. Verwenden Sie die Option -J-Xmx zum Erweitern des Speichers.
+err.cant.find.module=Modul {0} nicht gefunden
+err.cant.find.module.ex=Problem beim Auffinden von Modul {0}: {1}
+err.only.for.launcher=Diese Option kann nur verwendet werden, wenn javap \u00FCber den Befehlszeilen-Launcher aufgerufen wird.
+err.fatal.err=Schwerwiegender Fehler: {0}
+
+main.usage.summary=Verwendung: {0} <Optionen> <Klassen>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+warn.prefix=Warnung:
+warn.unexpected.class=Datei {0} enth\u00E4lt nicht die Klasse {1}
+
+note.prefix=Hinweis:
+
+main.usage=Verwendung: {0} <Optionen> <Klassen>\nwobei folgende Optionen m\u00F6glich sind:
+
+
+main.opt.help=\  --help -help -h -?               Gibt diese Hilfemeldung aus
+
+main.opt.version=\  -version                         Versionsinformationen
+
+main.opt.v=\  -v  -verbose                     Gibt zus\u00E4tzliche Informationen aus
+
+main.opt.l=\  -l                               Gibt die Zeilennummer und lokale Variablentabellen aus
+
+main.opt.public=\  -public                          Zeigt nur \u00F6ffentliche Klassen und Mitglieder
+
+main.opt.protected=\  -protected                       Zeigt gesch\u00FCtzte/\u00F6ffentliche Klassen und Mitglieder
+
+main.opt.package=\  -package                         Zeigt Package/gesch\u00FCtzte/\u00F6ffentliche Klassen\n                                   und Mitglieder (Standard)
+
+main.opt.p=\  -p  -private                     Zeigt alle Klassen und Mitglieder
+
+main.opt.c=\  -c                               Disassembliert den Code
+
+main.opt.s=\  -s                               Gibt Signaturen vom Typ "intern" aus
+
+main.opt.class_path=\  --class-path <Pfad>              Gibt an, wo sich Benutzerklassendateien befinden
+
+main.opt.classpath=\  -classpath <Pfad>                Gibt an, wo sich Benutzerklassendateien befinden
+
+main.opt.cp=\  -cp <Pfad>                       Gibt an, wo sich Benutzerklassendateien befinden
+
+main.opt.bootclasspath=\  -bootclasspath <Pfad>            Setzt den Speicherort von Bootstrap-Klassendateien au\u00DFer Kraft
+
+main.opt.upgrade_module_path=\  --upgrade-module-path <Pfad>     Gibt an, wo sich die upgradef\u00E4higen Module befinden
+
+main.opt.system=\  --system <JDK>                   Gibt an, wo sich die Systemmodule befinden
+
+main.opt.module_path=\  --module-path <Pfad>             Gibt an, wo sich die Anwendungsmodule befinden
+
+main.opt.multi_release=\  --multi-release <version>        Gibt die Version an, die in Multi-Release-JAR-Dateien verwendet werden soll
+
+main.opt.constants=\  -constants                       Zeigt die endg\u00FCltigen Konstanten
+
+main.opt.sysinfo=\  -sysinfo                         Zeigt die Systeminformationen (Pfad, Gr\u00F6\u00DFe, Datum, SHA-256-Hash)\n                                   der Klasse, die verarbeitet wird
+
+main.opt.module=\  --module <Modul>, -m <Modul>   Zeigt das Modul, das die zu disassemblierenden Klassen enth\u00E4lt
+
+main.opt.J=\  -J<vm-option>                    Gibt eine VM-Option an
+
+main.usage.foot=\nF\u00FCr Optionen im GNU-Stil kann "=" statt Leerzeichen verwendet werden, um den Namen einer Option\nvon ihrem Wert zu trennen.\n\nJede zu zeigende Klasse kann durch einen Dateinamen, eine URL oder durch ihren vollst\u00E4ndig\nqualifizierten Klassennamen angegeben werden. Beispiele:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
index 4f1c2b82f42..c45dfdbe7a8 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u75
 warn.prefix=\u8B66\u544A:
 warn.unexpected.class=\u30D5\u30A1\u30A4\u30EB{0}\u306B\u30AF\u30E9\u30B9{1}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
 
-note.prefix=\u6CE8:
+note.prefix=\u30CE\u30FC\u30C8:
 
 main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:
 
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
index 59713c46486..b803c6b6210 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
new file mode 100644
index 00000000000..350f3b5ca4e
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.usage=Verwendung: jdeprscan [Optionen] ''{dir|jar|class}'' ...\n\nOptionen:\n        --class-path PATH\n        --for-removal\n        --full-version\n  -? -h --help\n  -l    --list\n        --release {0}\n  -v    --verbose\n        --version
+
+main.help=Scannt jedes Argument auf die Verwendung veralteter APIs. Ein Argument\nkann ein Verzeichnis, das die Root einer Packagehierarchie angibt,\neine JAR-Datei, eine Klassendatei oder ein Klassenname sein. Der Klassenname\nmuss durch einen vollst\u00E4ndig qualifizierten Klassennamen mit $ als Trennzeichen\nf\u00FCr verschachtelte Klassen angegeben werden. Beispiel:\n\n    java.lang.Thread$State\n\nDie Option --class-path liefert einen Suchpfad f\u00FCr die Aufl\u00F6sung\nvon abh\u00E4ngigen Klassen.\n\nDie Option --for-removal begrenzt das Scannen oder Auflisten auf APIs, die veraltet sind\nund entfernt werden sollen. Kann nicht mit den Releasewerten 6, 7, oder 8 verwendet werden.\n\nDie Option --full-version gibt die vollst\u00E4ndige Versionszeichenfolge des Tools aus.\n\nDie Option --help (-? -h) gibt eine vollst\u00E4ndige Hilfemeldung aus.\n\nDie Option --list (-l) gibt die Gruppe der veralteten APIs aus. Es wird nicht gescannt,\ndaher d\u00FCrfen keine Verzeichnis-, JAR- oder Klassenargumente angegeben werden.\n\nDie Option --release gibt das Java SE-Release an, das die Gruppe\nder veralteten APIS zum Scannen liefert.\n\nDie Option --verbose (-v) aktiviert die Ausgabe zus\u00E4tzlicher Meldungen w\u00E4hrend der Verarbeitung.\n\nDie Option --version gibt die verk\u00FCrzte Versionszeichenfolge des Tools aus.
+
+main.xhelp=Nicht unterst\u00FCtzte Optionen:\n\n  --Xload-class CLASS\n      L\u00E4dt Veraltungsinformationen aus der benannten Klasse.\n  --Xload-csv CSVFILE\n      L\u00E4dt Veraltungsinformationen aus der benannten CSV-Datei.\n  --Xload-dir DIR\n      L\u00E4dt Veraltungsinformationen aus der Klassenhierarchie\n      im benannten Verzeichnis.\n  --Xload-jar JARFILE\n      L\u00E4dt Veraltungsinformationen aus der benannten JAR-Datei.\n  --Xload-jdk9 JAVA_HOME\n      L\u00E4dt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das ein modulares JDK sein muss.\n  --Xload-old-jdk JAVA_HOME\n      L\u00E4dt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das kein modulares JDK sein darf. Stattdessen\n      muss das benannte JDK ein "klassisches" JDK mit einer rt.jar-Datei sein.\n  --Xload-self\n      L\u00E4dt Veraltungsinformationen durch Traversieren des jrt:-\n      Dateisystems des ausgef\u00FChrten JDK-Images.\n  --Xcompiler-arg ARG\n      F\u00FCgt ARG der Liste der Compilerargumente hinzu.\n  --Xcsv-comment COMMENT\n      F\u00FCgt COMMENT als Kommentarzeile der CSV-Ausgabedatei hinzu.\n      Nur effektiv, wenn auch -Xprint-csv angegeben wird.\n  --Xhelp\n      Gibt diese Meldung aus.\n  --Xprint-csv\n      Gibt eine CSV-Datei aus, welche die geladenen Veraltungsinformationen enth\u00E4lt,\n      statt Klassen oder JAR-Dateien zu scannen.
+
+scan.process.class=Klasse {0} wird verarbeitet...
+
+# The "removal tag": empty for normal deprecations,
+# nonempty for removal deprecations; do not translate.
+scan.dep.normal=
+scan.dep.removal=(forRemoval=true)
+
+scan.err.exception=Fehler: unerwartete Ausnahme {0}
+scan.err.noclass=Fehler: Klasse {0} nicht gefunden
+scan.err.nofile=Fehler: Datei {0} nicht gefunden
+
+# 0: class name, 1: method name, 2: parameter and return types
+scan.err.nomethod=Fehler: Methodref {0}.{1}:{2} kann nicht aufgel\u00F6st werden
+
+scan.head.jar=JAR-Datei {0}:
+scan.head.dir=Verzeichnis {0}:
+
+# In all of the messages below, 0 and 1 are as follows:
+#   0: type kind (class, interface, enum, or annotation type)
+#   1: type name
+# The last element is generally a "removal tag"; see above.
+
+# 2: class name, 3: removal tag
+scan.out.extends={0} {1} erweitert die veraltete Klasse {2} {3}
+
+# 2: interface name, 3: removal tag
+scan.out.implements={0} {1} implementiert die veraltete Schnittstelle {2} {3}
+
+# 2: class name, 3: removal tag
+scan.out.usesclass={0} {1} verwendet die veraltete Klasse {2} {3}
+
+# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
+scan.out.usesmethod={0} {1} verwendet die veraltete Methode {2}::{3}{4} {5}
+
+# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
+scan.out.usesintfmethod={0} {1} verwendet die veraltete Methode {2}::{3}{4} {5}
+
+# 2: class name, 3: field name, 4: removal tag
+scan.out.usesfield={0} {1} verwendet das veraltete Feld {2}::{3} {4}
+
+# 2: field name, 3: type name, 4: removal tag
+scan.out.hasfield={0} {1} hat den Feldnamen {2} des veralteten Typs {3} {4}
+
+# 2: method name, 3: parameter type, 4: removal tag
+scan.out.methodparmtype={0} {1} hat eine Methode namens {2} mit dem veralteten Parametertyp {3} {4}
+
+# 2: method name, 3: return type, 4: removal tag
+scan.out.methodrettype={0} {1} hat eine Methode namens {2} mit dem veralteten R\u00FCckgabetyp {3} {4}
+
+# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
+scan.out.methodoverride={0} {1} setzt die veraltete Methode {2}::{3}{4} {5} au\u00DFer Kraft
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
new file mode 100644
index 00000000000..2a44e4c660c
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
@@ -0,0 +1,131 @@
+#
+# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.usage.summary=Verwendung: {0} <Optionen> <Pfad ...>]\nmit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+main.usage=Verwendung: {0} <Optionen> <Pfad ...>]\n<Pfad> kann ein Pfad zu einer Klassendatei, einem Verzeichnis oder einer JAR-Datei sein.\n\nM\u00F6gliche Optionen:
+
+error.prefix=Fehler:
+warn.prefix=Warnung:
+
+main.opt.h=\  -h -? --help                  Gibt diese Hilfemeldung aus
+
+main.opt.version=\  -version --version            Versionsinformationen
+
+main.opt.v=\  -v       -verbose             Gibt alle Abh\u00E4ngigkeiten auf Klassenebene aus\n                                \u00C4quivalent zu -verbose:class -filter:none.\n  -verbose:package              Gibt standardm\u00E4\u00DFig Abh\u00E4ngigkeiten auf Packageebene, ausgenommen\n                                Abh\u00E4ngigkeiten innerhalb eines Packages, aus\n  -verbose:class                Gib standardm\u00E4\u00DFig Abh\u00E4ngigkeiten auf Klassenebene, ausgenommen\n                                Abh\u00E4ngigkeiten innerhalb einer Klasse, aus
+
+main.opt.s=\  -s       -summary             Gibt nur die Abh\u00E4ngigkeits\u00FCbersicht aus.
+
+main.opt.f=\  -f <Regex> -filter <Regex>    Filtert Abh\u00E4ngigkeiten nach dem angegebenen\n                                Muster. Bei Angabe mehrerer Muster wird das\n                                letzte Muster verwendet.\n  -filter:package               Filtert Abh\u00E4ngigkeiten innerhalb eines Packages.\n                                Dies ist die Standardoption.\n  -filter:archive               Filtert Abh\u00E4ngigkeiten innerhalb eines Archivs.\n  -filter:module                Filtert Abh\u00E4ngigkeiten innerhalb eines Moduls.\n  -filter:none                  Kein Filtern nach -filter:package oder -filter:archive\n                                Die mit der Option -filter angegebene Filterung\n                                wird jedoch angewendet.\n
+main.opt.p=\nOptionen zum Filtern von Abh\u00E4ngigkeiten:\n  -p <Pkg>\n  -package <Pkg>\n  --package <Pkg>               Findet Abh\u00E4ngigkeiten, die mit dem angegebenen\n                                Packagenamen \u00FCbereinstimmen (kann mehrfach angegeben werden).
+
+main.opt.e=\  -e <Regex>\n  -regex <Regex>\n  --regex <Regex>               Findet Abh\u00E4ngigkeiten, die dem angegebenen Muster entsprechen.
+
+main.opt.require=\  --require <Modulname>       Findet Abh\u00E4ngigkeiten, die dem angegebenen Modulnamen\n                                entsprechen (kann mehrfach angegeben werden). --package,\n                                --regex, --require schlie\u00DFen sich gegenseitig aus.
+
+main.opt.missing-deps=\  --missing-deps                Findet fehlende Abh\u00E4ngigkeiten. Diese Option\n                                kann nicht mit den Optionen -p, -e und -s verwendet werden.
+
+main.opt.ignore-missing-deps=\  --ignore-missing-deps         Ignoriert fehlende Abh\u00E4ngigkeiten.
+
+main.opt.include=\nOptionen zum Filtern der zu analysierenden Klassen:\n  -include <Regex>              Beschr\u00E4nkt die Analyse auf Klassen, die dem Muster entsprechen\n                                Diese Option filtert die Liste der zu analysierenden\n                                Klassen. Sie kann zusammen mit -p und -e verwendet\n                                werden, die das Muster auf die Abh\u00E4ngigkeiten anwenden
+
+main.opt.P=\  -P       -profile             Zeigt das Profil, das ein Package enth\u00E4lt
+
+main.opt.cp=\  -cp <Pfad>\n  -classpath <Pfad>\n  --class-path <Pfad>           Gibt an, wo sich die Klassendateien befinden
+
+main.opt.module-path=\  --module-path <Modulpfad>   Gibt den Modulpfad an
+
+main.opt.upgrade-module-path=\  --upgrade-module-path <Modulpfad>  Gibt den Upgrademodulpfad an
+
+main.opt.system=\  --system <Java-Home>          Gibt einen alternativen Systemmodulpfad an
+
+main.opt.add-modules=\  --add-modules <Modulname>[,<Modulname>...]\n                                F\u00FCgt dem Root-Set Module zur Analyse hinzu
+
+main.opt.R=\  -R\n  --recursive                   Traversiert rekursiv alle Laufzeitabh\u00E4ngigkeiten.\n                                Die Option -R impliziert -filter:none. Falls eine Option -p,\n                                -e, -f angegeben ist, werden nur die \u00FCbereinstimmenden\n                                Abh\u00E4ngigkeiten analysiert.
+
+main.opt.no-recursive=\  --no-recursive                Kein rekursives Traversieren von Abh\u00E4ngigkeiten.
+
+main.opt.I=\  -I\n  --inverse                     Analysiert die Abh\u00E4ngigkeiten gem\u00E4\u00DF den anderen angegebenen\n                                Optionen und findet alle Artefakte, die direkt und\n                                indirekt von den \u00FCbereinstimmenden Knoten abh\u00E4ngen.\n                                Dies entspricht der Umkehrung der\n                                Analyse der Kompilierungszeitansicht und gibt die\n                                Abh\u00E4ngigkeits\u00FCbersicht aus. Diese Option muss mit der Option\n                                --require, --package oder --regex verwendet werden.
+
+main.opt.compile-time=\  --compile-time                Kompilierungszeitansicht transitiver Abh\u00E4ngigkeiten,\n                                d.h. Kompilierungszeitansicht der Option -R.\n                                Analysiert die Abh\u00E4ngigkeiten gem\u00E4\u00DF den anderen angegebenen Optionen\n                                Wird eine Abh\u00E4ngigkeit von einem Verzeichnis,\n                                einer JAR-Datei oder einem Modul gefunden, werden alle Klassen im \n                                entsprechenden beinhaltenden Archiv analysiert.
+
+main.opt.apionly=\  -apionly\n  --api-only                    Beschr\u00E4nkt die Analyse auf APIs, d.h. Abh\u00E4ngigkeiten\n                                von der Signatur \u00F6ffentlicher und gesch\u00FCtzter\n                                Mitglieder von \u00F6ffentlichen Klassen, einschlie\u00DFlich von\n                                Feldtyp, Methodenparametertypen, R\u00FCckgabetyp,\n                                aktivierten Ausnahmetypen usw.
+
+main.opt.m=\nOptionen f\u00FCr die Modulabh\u00E4ngigkeitsanalyse:\n  -m <Modulname>\n  --module <Modulname>        Gibt das Root-Modul f\u00FCr die Analyse an
+
+main.opt.generate-module-info=\  --generate-module-info <Verzeichnis>  Generiert module-info.java im angegebenen\n                                Verzeichnis. Die angegebenen JAR-Dateien werden\n                                analysiert. Diese Option kann nicht zusammen mit\n                                --dot-output oder --class-path verwendet werden. Verwenden Sie\n                                f\u00FCr offene Module die Option --generate-open-module.
+
+main.opt.generate-open-module=\  --generate-open-module <Verzeichnis>  Generiert module-info.java f\u00FCr die angegebenen\n                                JAR-Dateien im angegebenen Verzeichnis als\n                                offene Module. Diese Option kann nicht mit\n                                --dot-output oder --class-path verwendet werden.
+
+main.opt.check=\  --check <Modulname>[,<Modulname>...\n                                Analysiert die Abh\u00E4ngigkeit der angegebenen Module\n                                Gibt den Moduldeskriptor, die aus der Analyse resultierenden\n                                Modulabh\u00E4ngigkeiten und das Diagramm nach\n                                der \u00DCbergangsreduktion aus. Identifiziert auch\n                                nicht verwendete qualifizierte Exporte.
+
+main.opt.dotoutput=\  -dotoutput <Verzeichnis>\n  --dot-output <Verzeichnis>            Zielverzeichnis f\u00FCr DOT-Dateiausgabe
+
+main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               Findet Abh\u00E4ngigkeiten auf Klassenebene auf JDK-internen\n                                APIs. Analysiert standardm\u00E4\u00DFig alle Klassen\n                                in --class-path und Eingabedateien, es sei denn, die Option\n                                -include ist angegeben. Diese Option kann nicht mit\n                                den Optionen -p, -e und -s verwendet werden.\n                                WARNUNG: Auf JDK-interne APIs besteht kein Zugriff.
+
+main.opt.list-deps=\  --list-deps                   Listet die Modulabh\u00E4ngigkeiten auf. Gibt auch\n                                interne API-Packages aus, falls referenziert.\n                                Diese Option analysiert transitiv die Librarys im\n                                Classpath und im Modulpfad, falls referenziert.\n                                Verwenden Sie die Option --no-recursive f\u00FCr eine\n                                nicht transitive Abh\u00E4ngigkeitsanalyse.
+
+main.opt.list-reduced-deps=\  --list-reduced-deps           Gleich wie --list-deps, listet jedoch die Kanten f\u00FCr die\n                                implizierten Lesevorg\u00E4nge aus dem Moduldiagramm nicht auf.\n                                Wenn Modul M1 M2 liest und M2 \u00FCber M3\n                                transitiv sein muss, dann wird impliziert, dass M1 M3 liest,\n                                und dies wird im Diagramm nicht angezeigt.
+
+main.opt.print-module-deps=\  --print-module-deps           Gleich wie --list-reduced-deps, und es wird\n                                eine kommagetrennte Liste von Modulabh\u00E4ngigkeiten ausgegeben.\n                                Dies Ausgabe kann von der jlink-Option --add-modules\n                                verwendet werden, um ein benutzerdefiniertes Image zu erstellen,\n                                das diese Module und ihre transitiven Abh\u00E4ngigkeiten enth\u00E4lt.
+
+main.opt.depth=\  -depth=<Tiefe>                Gibt die Tiefe der transitiven\n                                Abh\u00E4ngigkeitsanalyse an
+
+main.opt.q=\  -q       -quiet               Unterdr\u00FCckt Warnmeldungen
+
+main.opt.multi-release=\  --multi-release <Version>     Gibt bei Verarbeitung von Multi-Release-JAR-Dateien\n                                die Version an. <Version> muss eine\n                                Ganzzahl >= 9 oder ein Basiswert sein.
+
+err.command.set=Die Optionen {0} und {1} werden angegeben.
+err.unknown.option=unbekannte Option: {0}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.invalid.arg.for.option=ung\u00FCltiges Argument f\u00FCr Option: {0}
+err.option.after.class=Option muss angegeben werden vor den Klassen: {0}
+err.genmoduleinfo.not.jarfile={0} ist eine modulare JAR-Datei, die nicht mit der Option --generate-module-info angegeben werden kann
+err.genmoduleinfo.unnamed.package={0} enth\u00E4lt ein unbenanntes Package, das in einem Modul nicht zul\u00E4ssig ist
+err.profiles.msg=Keine Profilinformationen
+err.exception.message={0}
+err.invalid.path=ung\u00FCltiger Pfad: {0}
+err.invalid.options={0} kann nicht mit der Option {1} verwendet werden
+err.module.not.found=Modul nicht gefunden: {0}
+err.root.module.not.set=Root-Modulset leer
+err.option.already.specified=Option {0} wurde mehrmals angegeben.
+err.filter.not.specified=Die Optionen --package (-p), --regex (-e), --require m\u00FCssen angegeben werden
+err.multirelease.option.exists={0} ist keine Multi-Release-JAR-Datei, aber die Option --multi-release ist festgelegt
+err.multirelease.option.notfound={0} ist eine Multi-Release-JAR-Datei, aber die Option --multi-release ist nicht festgelegt
+err.multirelease.version.associated=Klasse {0} ist bereits mit Version {1} verkn\u00FCpft, und es wird versucht, Version {2} hinzuzuf\u00FCgen
+err.multirelease.jar.malformed=nicht wohlgeformte Multi-Release-JAR, {0}, ung\u00FCltiger Eintrag: {1}
+err.missing.dependences=Fehlende Abh\u00E4ngigkeiten: Klassen wurden im Modulpfad und Klassenpfad nicht gefunden.\nUm diesen Fehler zu unterdr\u00FCcken und fortzufahren, verwenden Sie --ignore-missing-deps.
+
+warn.invalid.arg=Pfad ist nicht vorhanden: {0}
+warn.skipped.entry={0}
+warn.split.package=geteiltes Package: {0} {1}
+warn.replace.useJDKInternals=JDK-interne APIs werden nicht unterst\u00FCtzt und sind privat f\u00FCr JDK-Implementierungen.\nSie k\u00F6nnten ohne Ber\u00FCcksichtigung der Kompatibilit\u00E4t ge\u00E4ndert oder entfernt werden und die Anwendung besch\u00E4digen.\n\u00C4ndern Sie den Code, um Abh\u00E4ngigkeiten von JDK-internen APIs zu beseitigen.\nDie neuesten Informationen zu JDK-internen API-Ersetzungen finden Sie hier:\n{0}
+
+inverse.transitive.dependencies.on=Inverse transitive Abh\u00E4ngigkeiten von {0}
+inverse.transitive.dependencies.matching=Inverse transitive Abh\u00E4ngigkeiten, die \u00FCbereinstimmen mit {0}
+internal.api.column.header=JDK-interne API
+public.api.replacement.column.header=Vorgeschlagene Ersetzung
+artifact.not.found=nicht gefunden
+jdeps.wiki.url=https://wiki.openjdk.java.net/display/JDK8/Java+Dependency+Analysis+Tool
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
new file mode 100644
index 00000000000..87d433ba4a7
--- /dev/null
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 source code is provided to illustrate the usage of a given feature
+ * or technique and has been deliberately simplified. Additional steps
+ * required for a production-quality application, such as security checks,
+ * input validation and proper error handling, might not be present in
+ * this sample code.
+ */
+
+
+package com.sun.tools.example.debug.tty;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the following package(s):
+ *
+ * <ol>
+ * <li> com.sun.tools.example.debug.tty
+ * </ol>
+ *
+ */
+public class TTYResources_de extends java.util.ListResourceBundle {
+
+
+    /**
+     * Returns the contents of this <code>ResourceBundle</code>.
+     *
+     * <p>
+     *
+     * @return the contents of this <code>ResourceBundle</code>.
+     */
+    @Override
+    public Object[][] getContents() {
+        Object[][] temp = new Object[][] {
+        // NOTE: The value strings in this file containing "{0}" are
+        //       processed by the java.text.MessageFormat class.  Any
+        //       single quotes appearing in these strings need to be
+        //       doubled up.
+        //
+        // LOCALIZE THIS
+        {"** classes list **", "** Klassenliste **\n{0}"},
+        {"** fields list **", "** Feldliste **\n{0}"},
+        {"** methods list **", "** Methodenliste **\n{0}"},
+        {"*** Reading commands from", "*** Befehle aus {0} werden gelesen"},
+        {"All threads resumed.", "Alle Threads fortgesetzt."},
+        {"All threads suspended.", "Alle Threads unterbrochen."},
+        {"Argument is not defined for connector:", "Argument {0} ist f\u00FCr Connector {1} nicht definiert"},
+        {"Arguments match no method", "Argumente entsprechen keiner Methode"},
+        {"Array:", "Array: {0}"},
+        {"Array element is not a method", "Arrayelement ist keine Methode"},
+        {"Array index must be a integer type", "Arrayindex muss eine Ganzzahl sein"},
+        {"base directory:", "Basisverzeichnis: {0}"},
+        {"Breakpoint hit:", "Breakpoint erreicht: "},
+        {"breakpoint", "Breakpoint {0}"},
+        {"Breakpoints set:", "Breakpoints festgelegt:"},
+        {"Breakpoints can be located only in classes.", "Breakpoints k\u00F6nnen sich nur in Klassen befinden. {0} ist eine Schnittstelle oder ein Array."},
+        {"Can only trace", "Kann nur \"methods\" oder \"method exit\" oder \"method exits\" tracen"},
+        {"cannot redefine existing connection", "{0} kann keine vorhandene Verbindung neu definieren"},
+        {"Cannot assign to a method invocation", "Zuweisung zu einem Methodenaufruf nicht m\u00F6glich"},
+        {"Cannot specify command line with connector:", "Befehlszeile kann nicht mit Connector: {0} angegeben werden"},
+        {"Cannot specify target vm arguments with connector:", "Ziel-VM-Argumente k\u00F6nnen nicht mit Connector {0} angegeben werden"},
+        {"Class containing field must be specified.", "Klasse, die das Feld enth\u00E4lt, muss angegeben werden."},
+        {"Class:", "Klasse: {0}"},
+        {"Classic VM no longer supported.", "Klassische VM wird nicht mehr unterst\u00FCtzt."},
+        {"classpath:", "Classpath: {0}"},
+        {"colon mark", ":"},
+        {"colon space", ": "},
+        {"Command is not supported on the target VM", "Befehl \"{0}\" wird in der Ziel-VM nicht unterst\u00FCtzt"},
+        {"Command is not supported on a read-only VM connection", "Befehl \"{0}\" wird bei einer schreibgesch\u00FCtzten VM-Verbindung nicht unterst\u00FCtzt"},
+        {"Command not valid until the VM is started with the run command", "Befehl \"{0}\" ist erst g\u00FCltig, wenn die VM mit dem Befehl \"run\" gestartet wurde"},
+        {"Condition must be boolean", "Bedingung muss ein boolescher Wert sein"},
+        {"Connector and Transport name", "  Connector: {0}  Transport: {1}"},
+        {"Connector argument nodefault", "    Argument: {0} (kein Standard)"},
+        {"Connector argument default", "    Argument: {0} Standardwert: {1}"},
+        {"Connector description", "    Beschreibung: {0}"},
+        {"Connector required argument nodefault", "    Erforderliches Argument: {0} (kein Standard)"},
+        {"Connector required argument default", "    Erforderliches Argument: {0} Standardwert: {1}"},
+        {"Connectors available", "Verf\u00FCgbare Connectors:"},
+        {"Constant is not a method", "Konstante ist keine Methode"},
+        {"Could not open:", "\u00D6ffnen nicht m\u00F6glich: {0}"},
+        {"Current method is native", "Aktuelle Methode ist nativ"},
+        {"Current thread died. Execution continuing...", "Aktueller Thread {0} abgebrochen. Ausf\u00FChrung wird fortgesetzt..."},
+        {"Current thread isnt suspended.", "Aktueller Thread ist nicht unterbrochen."},
+        {"Current thread not set.", "Aktueller Thread nicht festgelegt."},
+        {"dbgtrace flag value must be an integer:", "dbgtrace-Kennzeichenwert muss eine Ganzzahl sein: {0}"},
+        {"dbgtrace command value must be an integer:", "dbgtrace-Befehlswert muss eine Ganzzahl sein: {0}"},
+        {"Deferring.", "{0} wird verz\u00F6gert.\nWird nach Laden der Klasse festgelegt."},
+        {"End of stack.", "Stackende."},
+        {"EOF", "EOF"},
+        {"Error popping frame", "Fehler bei Anzeige von Frame - {0}"},
+        {"Error reading file", "Fehler beim Lesen von \"{0}\" - {1}"},
+        {"Error redefining class to file", "Fehler beim Neudefinieren von {0} als {1} - {2}"},
+        {"exceptionSpec all", "alle {0}"},
+        {"exceptionSpec caught", "abgefangene {0}"},
+        {"exceptionSpec uncaught", "nicht abgefangene {0}"},
+        {"Exception in expression:", "Ausnahme in Ausdruck: {0}"},
+        {"Exception occurred caught", "Ausnahme aufgetreten: {0} (abzufangen bei: {1})"},
+        {"Exception occurred uncaught", "Ausnahme aufgetreten: {0} (nicht abgefangen)"},
+        {"Exceptions caught:", "Break bei diesen Ausnahmen:"},
+        {"Expected at, in, or an integer <thread_id>:", "\"at\", \"in\" oder ganzzahlige <thread_id> erwartet: {0}"},
+        {"expr is null", "{0} = Null"},
+        {"expr is value", "{0} = {1}"},
+        {"expr is value <collected>", "  {0} = {1} <erfasst>"},
+        {"Expression cannot be void", "Ausdruck darf nicht \"void\" sein"},
+        {"Expression must evaluate to an object", "Auswertung des Ausdrucks muss ein Objekt ergeben"},
+        {"extends:", "erweitert: {0}"},
+        {"Extra tokens after breakpoint location", "Zus\u00E4tzliche Token nach Breakpoint-Ort"},
+        {"Failed reading output", "Ausgabe des untergeordneten Java-Interpreters konnte nicht gelesen werden."},
+        {"Fatal error", "Schwerwiegender Fehler:"},
+        {"Field access encountered before after", "Feld ({0}) ist {1}, wird {2} sein: "},
+        {"Field access encountered", "Feldzugriff ({0}) aufgetreten: "},
+        {"Field to unwatch not specified", "Feld f\u00FCr Ende der \u00DCberwachung nicht angegeben."},
+        {"Field to watch not specified", "Feld f\u00FCr \u00DCberwachung nicht angegeben."},
+        {"GC Disabled for", "GC deaktiviert f\u00FCr {0}:"},
+        {"GC Enabled for", "GC aktiviert f\u00FCr {0}:"},
+        {"grouping begin character", "{"},
+        {"grouping end character", "}"},
+        {"Illegal Argument Exception", "Ausnahme wegen ung\u00FCltigen Arguments"},
+        {"Illegal connector argument", "Ung\u00FCltiges Connector-Argument: {0}"},
+        {"implementor:", "Implementierer: {0}"},
+        {"implements:", "implementiert: {0}"},
+        {"Initializing progname", "{0} wird initialisiert..."},
+        {"Input stream closed.", "Inputstream geschlossen."},
+        {"Interface:", "Schnittstelle: {0}"},
+        {"Internal debugger error.", "Interner Debuggerfehler."},
+        {"Internal error: null ThreadInfo created", "Interner Fehler: Null-ThreadInfo erstellt"},
+        {"Internal error; unable to set", "Interner Fehler: {0} konnte nicht festgelegt werden"},
+        {"Internal exception during operation:", "Interne Ausnahme bei Vorgang:\n    {0}"},
+        {"Internal exception:", "Interne Ausnahme:"},
+        {"Invalid argument type name", "Ung\u00FCltiger Argumenttypname"},
+        {"Invalid assignment syntax", "Ung\u00FCltige Zuweisungssyntax"},
+        {"Invalid command syntax", "Ung\u00FCltige Befehlssyntax"},
+        {"Invalid connect type", "Ung\u00FCltiger Verbindungstyp"},
+        {"Invalid consecutive invocations", "Ung\u00FCltige aufeinander folgende Aufrufe"},
+        {"Invalid exception object", "Ung\u00FCltiges Ausnahmeobjekt"},
+        {"Invalid line number specified", "Ung\u00FCltige Zeilennummer angegeben"},
+        {"Invalid <method_name> specification:", "Ung\u00FCltige <method_name>-Spezifikation: {0}"},
+        {"Invalid option on class command", "Ung\u00FCltige Option in Klassenbefehl"},
+        {"invalid option", "Ung\u00FCltige Option: {0}"},
+        {"Invalid thread status.", "Ung\u00FCltiger Threadstatus."},
+        {"Invalid <thread_id>:", "<thread_id> ung\u00FCltig: {0}"},
+        {"Invalid transport name:", "Ung\u00FCltiger Transportname: {0}"},
+        {"Invalid <class>.<method_name> specification", "Ung\u00FCltige <class>.<method_name>-Spezifikation"},
+        {"I/O exception occurred:", "I/O-Ausnahme aufgetreten: {0}"},
+        {"is an ambiguous method name in", "\"{0}\" ist ein mehrdeutiger Methodenname in \"{1}\""},
+        {"is an invalid line number for",  "{0,number,integer} ist eine ung\u00FCltige Zeilennummer f\u00FCr {1}"},
+        {"is not a valid class name", "\"{0}\" ist kein g\u00FCltiger Klassenname."},
+        {"is not a valid field name", "\"{0}\" ist kein g\u00FCltiger Feldname."},
+        {"is not a valid id or class name", "\"{0}\" ist keine g\u00FCltige ID oder kein g\u00FCltiger Klassenname."},
+        {"is not a valid line number or method name for", "\"{0}\" ist keine g\u00FCltige Zeilennummer oder kein g\u00FCltiger Methodenname f\u00FCr Klasse \"{1}\""},
+        {"is not a valid method name", "\"{0}\" ist kein g\u00FCltiger Methodenname."},
+        {"is not a valid thread id", "\"{0}\" ist keine g\u00FCltige Thread-ID."},
+        {"is not a valid threadgroup name", "\"{0}\" ist kein g\u00FCltiger Threadgruppenname."},
+        {"jdb prompt with no current thread", "> "},
+        {"jdb prompt thread name and current stack frame", "{0}[{1,number,integer}] "},
+        {"killed", "{0} abgebrochen"},
+        {"killing thread:", "Thread wird abgebrochen: {0}"},
+        {"Line number information not available for", "F\u00FCr diese Position sind keine Quellenzeilennummern verf\u00FCgbar."},
+        {"line number", ":{0,number,integer}"},
+        {"list field typename and name", "{0} {1}\n"},
+        {"list field typename and name inherited", "{0} {1} (geerbt von {2})\n"},
+        {"list field typename and name hidden", "{0} {1} (ausgeblendet)\n"},
+        {"Listening at address:", "Listening-Adresse: {0}"},
+        {"Local variable information not available.", "Keine lokalen Variableninformationen verf\u00FCgbar. Kompilieren Sie mit -g, um Variableninformationen zu generieren"},
+        {"Local variables:", "Lokale Variablen:"},
+        {"<location unavailable>", "<Ort nicht verf\u00FCgbar>"},
+        {"location", "\"Thread={0}\", {1}"},
+        {"locationString", "{0}.{1}(), Zeile={2,number,integer} BCI={3,number,integer}"},
+        {"Main class and arguments must be specified", "Hauptklasse und Argumente m\u00FCssen angegeben werden"},
+        {"Method arguments:", "Methodenargumente:"},
+        {"Method entered:", "Methode gestartet: "},
+        {"Method exited:",  "Methode beendet"},
+        {"Method exitedValue:", "Methode beendet: R\u00FCckgabewert = {0}, "},
+        {"Method is overloaded; specify arguments", "Methode {0} ist \u00FCberladen. Geben Sie Argumente an"},
+        {"minus version", "Diese Version ist {0} {1,number,integer}.{2,number,integer} (Java SE Version {3})"},
+        {"Missing at or in", "\"at\" oder \"in\" fehlt"},
+        {"Monitor information for thread", "\u00DCberwachungsinformationen f\u00FCr Thread {0}:"},
+        {"Monitor information for expr", "\u00DCberwachungsinformationen f\u00FCr {0} ({1}):"},
+        {"More than one class named", "Mehrere Klassen mit dem Namen: \"{0}\""},
+        {"native method", "native Methode"},
+        {"nested:", "verschachtelt: {0}"},
+        {"No attach address specified.", "Keine Anhangsadresse angegeben."},
+        {"No breakpoints set.", "Keine Breakpoints festgelegt."},
+        {"No class named", "Keine Klasse namens \"{0}\""},
+        {"No class specified.", "Keine Klasse angegeben."},
+        {"No classpath specified.", "Kein Classpath angegeben."},
+        {"No code at line", "Kein Code bei Zeile {0,number,integer} in {1}"},
+        {"No connect specification.", "Keine Verbindungsspezifikation."},
+        {"No connector named:", "Kein Connector namens: {0}"},
+        {"No current thread", "Kein aktueller Thread"},
+        {"No default thread specified:", "Kein Standardthread angegeben: Verwenden Sie zun\u00E4chst den Befehl \"thread\"."},
+        {"No exception object specified.", "Kein Ausnahmeobjekt angegeben."},
+        {"No exceptions caught.", "Keine Ausnahmen abgefangen."},
+        {"No expression specified.", "Kein Ausdruck angegeben."},
+        {"No field in", "Kein Feld {0} in {1}"},
+        {"No frames on the current call stack", "Keine Frames im aktuellen Aufrufstack"},
+        {"No linenumber information for", "Keine Zeilennummerninformationen f\u00FCr {0}. F\u00FChren Sie die Kompilierung mit aktiviertem Debugging aus."},
+        {"No local variables", "Keine lokalen Variablen"},
+        {"No method in", "Keine Methode {0} in {1}"},
+        {"No method specified.", "Keine Methode angegeben."},
+        {"No monitor numbered:", "Kein Monitor mit Nummer: {0}"},
+        {"No monitors owned", "  Keine Monitore im Eigentum"},
+        {"No object specified.", "Kein Objekt angegeben."},
+        {"No objects specified.", "Keine Objekte angegeben."},
+        {"No save index specified.", "Kein Speicherindex angegeben."},
+        {"No saved values", "Keine gespeicherten Werte"},
+        {"No source information available for:", "Keine Quellinformationen f\u00FCr {0} verf\u00FCgbar"},
+        {"No sourcedebugextension specified", "Keine SourceDebugExtension angegeben"},
+        {"No sourcepath specified.", "Kein Quellpfad angegeben."},
+        {"No thread specified.", "Kein Thread angegeben."},
+        {"No VM connected", "Keine VM verbunden"},
+        {"No waiters", "  Keine Waiter"},
+        {"not a class", "{0} ist keine Klasse"},
+        {"Not a monitor number:", "Keine Monitornummer: \"{0}\""},
+        {"not found (try the full name)", "{0} nicht gefunden (verwenden Sie den vollst\u00E4ndigen Namen)"},
+        {"Not found:", "Nicht gefunden: {0}"},
+        {"not found", "{0} nicht gefunden"},
+        {"Not owned", "  Nicht im Eigentum"},
+        {"Not waiting for a monitor", "  Nicht auf einen Monitor wartend"},
+        {"Nothing suspended.", "Nichts unterbrochen."},
+        {"object description and id", "({0}){1}"},
+        {"Operation is not supported on the target VM", "Vorgang wird in der Ziel-VM nicht unterst\u00FCtzt"},
+        {"operation not yet supported", "Vorgang noch nicht unterst\u00FCtzt"},
+        {"Owned by:", "  Eigent\u00FCmer: {0}, Anzahl Eintr\u00E4ge: {1,number,integer}"},
+        {"Owned monitor:", "  Monitor im Eigentum: {0}"},
+        {"Parse exception:", "Parseausnahme: {0}"},
+        {"printclearcommandusage", "Verwendung: clear <class>:<line_number> oder\n      clear <class>.<method_name>[(argument_type,...)]"},
+        {"printstopcommandusage",
+         "Verwendung: stop [go|thread] [<thread_id>] <at|in> <Position>\n  Wenn \"go\" angegeben ist, wird der Thread nach dem Stoppen sofort fortgesetzt\n  Wenn \"thread\" angegeben ist, wird nur der Thread unterbrochen, in dem der Stopp ausgef\u00FChrt wird\n  Wenn weder \"go\" noch \"thread\" angegeben ist, werden alle Threads unterbrochen\n  Wenn eine ganzzahlige <thread_id> angegeben ist, wird nur der angegebene Thread gestoppt\n  \"at\" und \"in\" haben dieselbe Bedeutung\n  <Position> kann eine Zeilennummer oder eine Methode sein:\n    <class_id>:<line_number>\n    <class_id>.<Methode>[(argument_type,...)]"
+        },
+        {"Removed:", "Entfernt: {0}"},
+        {"repeat is on", "Wiederholung ist aktiviert"},
+        {"repeat is off", "Wiederholung ist deaktiviert"},
+        {"repeat usage", "Verwendung: repeat <on|off>"},
+        {"Requested stack frame is no longer active:", "Angeforderter Stackframe ist nicht mehr aktiv: {0,number,integer}"},
+        {"run <args> command is valid only with launched VMs", "Der Befehl \"run <args>\" ist nur mit gestarteten VMs g\u00FCltig"},
+        {"run", "{0} ausf\u00FChren"},
+        {"saved", "{0} gespeichert"},
+        {"Set deferred", "{0} mit Verz\u00F6gerung festlegen"},
+        {"Set", "{0} festlegen"},
+        {"Source file not found:", "Quelldatei nicht gefunden: {0}"},
+        {"source line number and line", "{0,number,integer}    {1}"},
+        {"source line number current line and line", "{0,number,integer} => {1}"},
+        {"sourcedebugextension", "SourceDebugExtension -- {0}"},
+        {"Specify class and method", "Klasse und Methode angeben"},
+        {"Specify classes to redefine", "Klassen f\u00FCr Neudefinition angeben"},
+        {"Specify file name for class", "Dateinamen f\u00FCr Klasse {0} angeben"},
+        {"stack frame dump with pc", "  [{0,number,integer}] {1}.{2} ({3}), PC = {4}"},
+        {"stack frame dump", "  [{0,number,integer}] {1}.{2} ({3})"},
+        {"Step completed:", "Schritt abgeschlossen: "},
+        {"Stopping due to deferred breakpoint errors.", "Stoppen aufgrund von verz\u00F6gerten Breakpoint-Fehlern.\n"},
+        {"subclass:", "Unterklasse: {0}"},
+        {"subinterface:", "Unterschnittstelle: {0}"},
+        {"tab", "\t{0}"},
+        {"Target VM failed to initialize.", "Ziel-VM konnte nicht initialisiert werden."},
+        {"The application exited", "Anwendung beendet"},
+        {"The application has been disconnected", "Die Anwendung wurde getrennt"},
+        {"The gc command is no longer necessary.", "Der Befehl \"gc\" ist nicht mehr erforderlich.\nDie Garbage Collection wird wie gew\u00F6hnlich f\u00FCr alle Objekte durchgef\u00FChrt. Verwenden Sie die Befehle \"enablegc\" und \"disablegc\",\num die Garbage Collection einzelner Objekte zu steuern."},
+        {"The load command is no longer supported.", "Der Befehl \"load\" wird nicht mehr unterst\u00FCtzt."},
+        {"The memory command is no longer supported.", "Der Befehl \"memory\" wird nicht mehr unterst\u00FCtzt."},
+        {"The VM does not use paths", "Die VM verwendet keine Pfade"},
+        {"Thread is not running (no stack).", "Thread wird nicht ausgef\u00FChrt (kein Stack)."},
+        {"Thread number not specified.", "Threadnummer nicht angegeben."},
+        {"Thread:", "{0}:"},
+        {"Thread Group:", "Gruppe {0}:"},
+        {"Thread description name unknownStatus BP",  "  {0} {1} unbekannt (bei Breakpoint)"},
+        {"Thread description name unknownStatus",     "  {0} {1} unbekannt"},
+        {"Thread description name zombieStatus BP",   "  {0} {1} Zombie (bei Breakpoint)"},
+        {"Thread description name zombieStatus",      "  {0} {1} Zombie"},
+        {"Thread description name runningStatus BP",  "  {0} {1} wird ausgef\u00FChrt (bei Breakpoint)"},
+        {"Thread description name runningStatus",     "  {0} {1} wird ausgef\u00FChrt"},
+        {"Thread description name sleepingStatus BP", "  {0} {1} inaktiv (bei Breakpoint)"},
+        {"Thread description name sleepingStatus",    "  {0} {1} inaktiv"},
+        {"Thread description name waitingStatus BP",  "  {0} {1} wartet in einem Monitor (bei Breakpoint)"},
+        {"Thread description name waitingStatus",     "  {0} {1} wartet in einem Monitor"},
+        {"Thread description name condWaitstatus BP", "  {0} {1} wartet bedingt (bei Breakpoint)"},
+        {"Thread description name condWaitstatus",    "  {0} {1} wartet bedingt"},
+        {"Thread has been resumed", "Thread wurde wiederaufgenommen"},
+        {"Thread not suspended", "Thread nicht unterbrochen"},
+        {"thread group number description name", "{0,number,integer}. {1} {2}"},
+        {"Threadgroup name not specified.", "Name der Threadgruppe nicht angegeben."},
+        {"<thread_id> option not valid until the VM is started with the run command",
+         "<thread_id>-Option ist erst g\u00FCltig, wenn die VM mit dem Befehl \"run\" gestartet wurde"},
+        {"Threads must be suspended", "Threads m\u00FCssen unterbrochen sein"},
+        {"trace method exit in effect for", "\"trace method exit\" in Kraft f\u00FCr {0}"},
+        {"trace method exits in effect", "\"trace method exits\" in Kraft"},
+        {"trace methods in effect", "\"trace methods\" in Kraft"},
+        {"trace go method exit in effect for", "\"trace go method exit\" in Kraft f\u00FCr {0}"},
+        {"trace go method exits in effect", "\"trace go method exits\" in Kraft"},
+        {"trace go methods in effect", "\"trace go methods\" in Kraft"},
+        {"trace not in effect", "\"trace\" nicht in Kraft"},
+        {"Unable to attach to target VM.", "Anh\u00E4ngen an Ziel-VM nicht m\u00F6glich."},
+        {"Unable to display process output:", "Prozessausgabe kann nicht angezeigt werden: {0}"},
+        {"Unable to launch target VM.", "Ziel-VM kann nicht gestartet werden."},
+        {"Unable to set deferred", "{0} mit Verz\u00F6gerung kann nicht festgelegt werden: {1}"},
+        {"Unable to set main class and arguments", "Hauptklasse und Argument k\u00F6nnen nicht festgelegt werden"},
+        {"Unable to set", "{0} kann nicht festgelegt werden: {1}"},
+        {"Unexpected event type", "Unerwarteter Ereignistyp: {0}"},
+        {"unknown", "unbekannt"},
+        {"Unmonitoring", "\u00DCberwachung von {0} aufheben"},
+        {"Unrecognized command.  Try help...", "Nicht erkannter Befehl: \"{0}\". Rufen Sie \"help\" auf..."},
+        {"Usage: catch exception", "Verwendung: catch [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>"},
+        {"Usage: ignore exception", "Verwendung: ignore [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>"},
+        {"Usage: down [n frames]", "Verwendung: down [n frames]"},
+        {"Usage: kill <thread id> <throwable>", "Verwendung: kill <Thread-ID> <Throwable>"},
+        {"Usage: read <command-filename>", "Verwendung: read <Befehlsdateiname>"},
+        {"Usage: unmonitor <monitor#>", "Verwendung: unmonitor <Monitornummer>"},
+        {"Usage: up [n frames]", "Verwendung: up [n frames]"},
+        {"Use java minus X to see", "Verwenden Sie \"java -X\", um die verf\u00FCgbaren nicht standardm\u00E4\u00DFigen Optionen anzuzeigen"},
+        {"VM already running. use cont to continue after events.", "VM wird bereits ausgef\u00FChrt. Verwenden Sie \"cont\", um nach Ereignissen fortzufahren."},
+        {"VM Started:", "VM gestartet: "},
+        {"vmstartexception", "VM-Startausnahme: {0}"},
+        {"Waiting for monitor:", "   Warten auf Monitor: {0}"},
+        {"Waiting thread:", " Wartender Thread: {0}"},
+        {"watch accesses of", "Zugriffe von {0}.{1} \u00FCberwachen"},
+        {"watch modification of", "\u00C4nderung von {0}.{1} \u00FCberwachen"},
+        {"zz help text",
+             "** Befehlsliste **\nconnectors                -- Listet verf\u00FCgbare Connectors und Transporte in dieser VM auf\n\nrun [class [args]]        -- Startet die Ausf\u00FChrung der Hauptklasse der Anwendung\n\nthreads [threadgroup]     -- Listet Threads auf\nthread <Thread-ID>        -- Legt den Standardthread fest\nsuspend [thread id(s)]    -- Unterbricht Threads (Standard: all)\nresume [thread id(s)]    -- Nimmt Threads wieder auf (Standard: all)\nwhere [<Thread-ID> | all] -- Gibt den Stack eines Threads aus\nwherei [<Thread-ID> | all] -- Gibt den Stack eines Threads mit PC-Informationen aus\nup [n frames]             -- Verschiebt den Stack eines Threads nach oben\ndown [n frames]             -- Verschiebt den Stack eines Threads nach unten\nkill <Thread-ID> <Ausdruck>   -- Bricht einen Thread mit dem angegebenen Ausnahmeobjekt ab\ninterrupt <Thread-ID>     -- Unterbricht einen Thread\n\nprint <Ausdruck>              -- Gibt den Wert eines Ausdrucks aus\ndump <Ausdruck>               -- Gibt alle Objektinformationen aus\neval <Ausdruck>               -- Bewertet einen Ausdruck (wie \"print\")\nset <lvalue> = <Ausdruck>     -- Weist einem Feld/einer Variablen/einem Arrayelement einen neuen Wert zu\nlocals                    -- Gibt alle lokalen Variablen im aktuellen Stackframe aus\n\nclasses                   -- Listet derzeit bekannte Klassen auf\nclass <Klassen-ID>          -- Zeigt Details einer benannten Klasse an\nmethods <Klassen-ID>        -- Listet die Methoden einer Klasse auf\nfields <Klassen-ID>        -- Listet die Felder einer Klasse auf\n\nthreadgroups              -- Listet Threadgruppen auf\nthreadgroup <Name>        -- Legt die aktuelle Threadgruppe fest\n\nstop [go|thread] [<thread_id>] <at|in> <Position>\n                          -- Legt einen Breakpoint fest\n                          -- Wenn Sie keine Optionen angeben, wird die aktuelle Breakpoint-Liste ausgegeben\n                          -- Wenn Sie \"go\" angeben, wird der Vorgang nach dem Stoppen sofort wiederaufgenommen\n                          -- Wenn Sie \"thread\" angeben, wird nur der Thread unterbrochen, in dem gestoppt wurde\n                          -- Wenn Sie weder \"go\" noch \"thread\" angeben, werden alle Threads unterbrochen\n                          -- Wenn Sie eine ganzzahlige <thread_id> angeben, wird der Vorgang nur im angegebenen Thread gestoppt\n                          -- \"at\" und \"in\" haben die gleiche Bedeutung\n                          -- <Position> kann eine Zeilennummer oder eine Methode sein:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<Methode>[(argument_type,...)]\nclear <class id>.<Methode>[(argument_type,...)]\n                          -- L\u00F6scht einen Breakpoint in einer Methode\nclear <Klassen-ID>:<Zeile>   -- L\u00F6scht einen Breakpoint bei einer Zeile\nclear                     -- Listet Breakpoints auf\ncatch [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>\n                          -- Break bei der angegebenen Ausnahme\nignore [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>\n                          -- Bricht \"catch\" f\u00FCr die angegebene Ausnahme ab\nwatch [access|all] <Klassen-ID>.<Feldname>\n                          -- \u00DCberwacht Zugriffe/\u00C4nderungen eines Feldes\nunwatch [access|all] <Klassen-ID>.<Feldname>\n                          -- Hebt die \u00DCberwachung der Zugriffe/\u00C4nderungen eines Feldes auf\ntrace [go] methods [thread]\n                          -- Verfolgt Methodenstarts und -beendigungen.\n                          -- Alle Threads werden unterbrochen, es sei denn, \"go\" ist angegeben\ntrace [go] method exit | exits [thread]\n                          -- Verfolgt die Beendigung der aktuellen Methode oder die Beendigungen aller Methoden\n                          -- Alle Threads werden unterbrochen, es sei denn, \"go\" ist angegeben\nuntrace [methods]         -- Stoppt das Tracing von Methodenstarts und/oder -beendigungen\nstep                      -- F\u00FChrt die aktuelle Zeile aus\nstep up                   -- Ausf\u00FChren, bis die aktuelle Methode an den Aufrufer zur\u00FCckgegeben wird\nstepi                     -- F\u00FChrt die aktuelle Anweisung aus\nnext                      -- Eine Zeile weiter (Aufrufe auslassen)\ncont                      -- Setzt die Ausf\u00FChrung ab dem Breakpoint fort\n\nlist [line number|method] -- Gibt den Quellcode aus\nuse (or sourcepath) [source file path]\n                          -- Zeigt den Quellpfad an oder \u00E4ndert diesen\nexclude [<Klassenmuster>, ... | \"none\"]\n                          -- Meldet keine Schritt- oder Methodenereignisse f\u00FCr angegebene Klassen\nclasspath                 -- Gibt Classpath-Informationen aus der Ziel-VM aus\n\nmonitor <Befehl>         -- F\u00FChrt bei jedem Programmstopp einen Befehl aus\nmonitor                   -- Listet Monitore auf\nunmonitor <Monitornummer>      -- L\u00F6scht einen Monitor\nread <Dateiname>           -- Liest eine Befehlsdatei und f\u00FChrt diese aus\n\nlock <Ausdruck>               -- Gibt Sperrinformationen f\u00FCr ein Objekt aus\nthreadlocks [thread id]   -- Gibt Sperrinformationen f\u00FCr einen Thread aus\n\npop                       -- Holt den Stack bis zum aktuellen Frame (einschlie\u00DFlich)\nreenter                   -- Wie \"pop\", aber der aktuelle Frame wird wieder eingegeben\nredefine <Klassen-ID> <Klassendateiname>\n                          -- Definiert den Code f\u00FCr eine Klasse neu\n\ndisablegc <Ausdruck>          -- Verhindert die Garbage Collection eines Objekts\nenablegc <Ausdruck>          -- L\u00E4sst die Garbage Collection eines Objekts zu\n\n!!                        -- Wiederholt den letzten Befehl\n<n> <Befehl>             -- Wiederholt einen Befehl n-mal\nrepeat                    -- Zeigt an, ob die Wiederholung durch leeren Befehl im GDB-Stil aktiviert ist\nrepeat <on|off>           -- Aktiviert/deaktiviert die Wiederholung im GDB-Stil\n# <Befehl>               -- Verwerfen (kein Vorgang)\nhelp (oder ?)               -- Listet Befehle auf\ndbgtrace [flag]           -- Identisch mit der Befehlszeilenoption \"dbgtrace\"\nversion                   -- Gibt Versionsinformationen aus\nexit (oder quit)            -- Beendet den Debugger\n\n<Klassen-ID>: Ein vollst\u00E4ndiger Klassenname mit Package-Qualifiers\n<Klassenmuster>: Ein Klassenname mit einem Platzhalter am Anfang oder Ende (\"*\")\n<Thread-ID>: Threadnummer aus dem Befehl \"threads\"\n<Ausdruck>: Ein Ausdruck der Java(TM)-Programmiersprache.\nDer Gro\u00DFteil der g\u00E4ngigen Syntax wird unterst\u00FCtzt.\n\nStartbefehle k\u00F6nnen in \"jdb.ini\" oder \".jdbrc\" abgelegt werden\nin user.home oder user.dir"},
+        {"zz usage text",
+             "Verwendung: {0} <Optionen> <Klasse> <Argumente>\n\nVerf\u00FCgbare Optionen:\n    -? -h --help -help Gibt diese Hilfemeldung aus und beendet den Vorgang\n    -sourcepath <durch \"{1}\" getrennte Verzeichnisse>\n                      Verzeichnisse, in denen nach Quelldateien gesucht werden soll\n    -attach <Adresse>\n                      Anh\u00E4ngen an aktive VM unter der angegebenen Adresse mit Standard-Connector\n    -listen <Adresse>\n                      Wartet auf Verbindung der aktiven VM unter der angegebenen Adresse mit Standard-Connector\n    -listenany\n                      Wartet auf Verbindung einer aktiven VM unter einer beliebigen verf\u00FCgbaren Adresse mit Standard-Connector\n    -launch\n                      Startet die VM sofort, anstatt auf den Befehl \"run\" zu warten\n    -listconnectors   Listet die in dieser VM verf\u00FCgbaren Connectors auf\n    -connect <connector-name>:<name1>=<value1>,...\n                      Stellt die Verbindung zur Ziel-VM mit dem benannten Connector und den aufgelisteten Argumentwerten her\n    -dbgtrace [flags] Gibt Informationen zum Debugging von {0} aus\n    -tclient          F\u00FChrt die Anwendung im HotSpot(TM) Client Compiler aus\n    -tserver          F\u00FChrt die Anwendung im HotSpot(TM) Server Compiler aus\n\nAn Debuggerprozess weitergeleitete Optionen:\n    -v -verbose[:class|gc|jni]\n                      Aktiviert den Verbose-Modus\n    -D<Name>=<Wert>  Legt eine Systemeigenschaft fest\n    -classpath <durch \"{1}\" getrennte Verzeichnisse>\n                      Listet Verzeichnisse auf, in denen nach Klassen gesucht werden soll\n    -X<Option>        Nicht standardm\u00E4\u00DFige Ziel-VM-Option\n\n<Klasse> ist der Name der Klasse zum Start des Debuggings\n<Argumente> sind die Argumente, die an die main()-Methode der <Klasse> \u00FCbergeben werden\n\nGeben Sie \"help\" beim {0}-Prompt ein, um Befehlshilfe anzuzeigen"},
+        // END OF MATERIAL TO LOCALIZE
+        };
+
+        return temp;
+    }
+}
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
index 330fc33a820..a9364b853a5 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -253,9 +253,9 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
          "\u4F7F\u7528\u65B9\u6CD5: stop [go|thread] [<thread_id>] <at|in> <location>\n  \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n  \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n  \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n  \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n  \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n  <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n    <class_id>:<line_number>\n    <class_id>.<method>[(argument_type,...)]"
         },
         {"Removed:", "{0}\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F"},
-        {"repeat is on", "Repeat is on"},
-        {"repeat is off", "Repeat is off"},
-        {"repeat usage", "Usage: repeat <on|off>"},
+        {"repeat is on", "\u7E70\u8FD4\u3057\u306F\u30AA\u30F3\u3067\u3059"},
+        {"repeat is off", "\u7E70\u8FD4\u3057\u306F\u30AA\u30D5\u3067\u3059"},
+        {"repeat usage", "\u4F7F\u7528\u65B9\u6CD5: repeat <on|off>"},
         {"Requested stack frame is no longer active:", "\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u305F\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u306F\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0,number,integer}"},
         {"run <args> command is valid only with launched VMs", "'run <args>'\u30B3\u30DE\u30F3\u30C9\u306F\u8D77\u52D5\u6E08\u306EVM\u3067\u306E\u307F\u6709\u52B9\u3067\u3059"},
         {"run", "{0}\u306E\u5B9F\u884C"},
@@ -302,6 +302,7 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
         {"Thread has been resumed", "\u30B9\u30EC\u30C3\u30C9\u304C\u518D\u958B\u3057\u307E\u3057\u305F"},
         {"Thread not suspended", "\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u3066\u3044\u307E\u305B\u3093"},
         {"thread group number description name", "{0,number,integer}. {1} {2}"},
+        {"Threadgroup name not specified.", "\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"<thread_id> option not valid until the VM is started with the run command",
          "<thread_id>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001VM\u304Crun\u30B3\u30DE\u30F3\u30C9\u3067\u958B\u59CB\u3055\u308C\u308B\u307E\u3067\u7121\u52B9\u3067\u3059"},
         {"Threads must be suspended", "\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
@@ -338,7 +339,7 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
         {"watch accesses of", "{0}.{1}\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u30A6\u30A9\u30C3\u30C1"},
         {"watch modification of", "{0}.{1}\u306E\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1"},
         {"zz help text",
-             "** \u30B3\u30DE\u30F3\u30C9\u30FB\u30EA\u30B9\u30C8 **\nconnectors                -- \u3053\u306EVM\u5185\u306E\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3068\u30C8\u30E9\u30F3\u30B9\u30DD\u30FC\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nrun [class [args]]        -- \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u5B9F\u884C\u3092\u958B\u59CB\u3057\u307E\u3059\n\nthreads [threadgroup]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthread <thread id>        -- \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\nsuspend [thread id(s)]    -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nresume [thread id(s)]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u518D\u958B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nwhere [<thread id> | all] -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30C0\u30F3\u30D7\u3057\u307E\u3059\nwherei [<thread id> | all]-- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092pc\u60C5\u5831\u3068\u3068\u3082\u306B\u30C0\u30F3\u30D7\u3057\u307E\u3059\nup [n frames]             -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0A\u306B\u79FB\u52D5\u3057\u307E\u3059\ndown [n frames]           -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0B\u306B\u79FB\u52D5\u3057\u307E\u3059\nkill <thread id> <expr>   -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u30B9\u30EC\u30C3\u30C9\u3092\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\ninterrupt <thread id>     -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n\nprint <expr>              -- \u5F0F\u306E\u5024\u3092\u51FA\u529B\u3057\u307E\u3059\ndump <expr>               -- \u3059\u3079\u3066\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\neval <expr>               -- \u5F0F\u3092\u8A55\u4FA1\u3057\u307E\u3059(print\u3068\u540C\u3058)\nset <lvalue> = <expr>     -- \u65B0\u3057\u3044\u5024\u3092\u30D5\u30A3\u30FC\u30EB\u30C9/\u5909\u6570/\u914D\u5217\u8981\u7D20\u306B\u4EE3\u5165\u3057\u307E\u3059\nlocals                    -- \u73FE\u5728\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u5185\u306E\u3059\u3079\u3066\u306E\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u3092\u51FA\u529B\u3057\u307E\u3059\n\nclasses                   -- \u73FE\u5728\u65E2\u77E5\u306E\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nclass <class id>          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\nmethods <class id>        -- \u30AF\u30E9\u30B9\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nfields <class id>         -- \u30AF\u30E9\u30B9\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nthreadgroups              -- \u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthreadgroup <name>        -- \u73FE\u5728\u306E\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                          -- \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u306E\u73FE\u5728\u306E\u30EA\u30B9\u30C8\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\n                          -- \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n                          -- \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n                          -- \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n                          -- <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u30E1\u30BD\u30C3\u30C9\u5185\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear <class id>:<line>   -- \u884C\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear                     -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u3068\u304D\u306B\u30D6\u30EC\u30FC\u30AF\u3057\u307E\u3059\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u306E'catch'\u3092\u53D6\u308A\u6D88\u3057\u307E\u3059\nwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u3092\u30A6\u30A9\u30C3\u30C1\u3057\u307E\u3059\nunwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1\u3092\u4E2D\u6B62\u3057\u307E\u3059\ntrace [go] methods [thread]\n                          -- \u30E1\u30BD\u30C3\u30C9\u306E\u5165\u308A\u53E3\u3068\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\u3002\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\ntrace [go] method exit | exits [thread]\n                          -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\nuntrace [methods]         -- \u30E1\u30BD\u30C3\u30C9\u306E\u958B\u59CB\u307E\u305F\u306F\u7D42\u4E86\u306E\u30C8\u30EC\u30FC\u30B9\u3092\u505C\u6B62\u3057\u307E\u3059\nstep                      -- \u73FE\u5728\u306E\u884C\u3092\u5B9F\u884C\u3057\u307E\u3059\nstep up                   -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u5143\u306B\u623B\u308B\u307E\u3067\u5B9F\u884C\u3057\u307E\u3059\nstepi                     -- \u73FE\u5728\u306E\u547D\u4EE4\u3092\u5B9F\u884C\u3057\u307E\u3059\nnext                      -- 1\u884C\u3092\u30B9\u30C6\u30C3\u30D7\u5B9F\u884C\u3057\u307E\u3059(\u547C\u51FA\u3057\u3092\u30B9\u30C6\u30C3\u30D7\u30AA\u30FC\u30D0\u30FC)\ncont                      -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u304B\u3089\u5B9F\u884C\u3092\u7D9A\u884C\u3057\u307E\u3059\n\nlist [line number|method] -- \u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u3092\u51FA\u529B\u3057\u307E\u3059\nuse (or sourcepath) [source file path]\n                          -- \u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u30B9\u30C6\u30C3\u30D7\u3084\u30E1\u30BD\u30C3\u30C9\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u5831\u544A\u3057\u307E\u305B\u3093\nclasspath                 -- \u30BF\u30FC\u30B2\u30C3\u30C8VM\u304B\u3089\u30AF\u30E9\u30B9\u30D1\u30B9\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\nmonitor <command>         -- \u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u505C\u6B62\u3059\u308B\u305F\u3073\u306B\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059\nmonitor                   -- \u30E2\u30CB\u30BF\u30FC\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nunmonitor <monitor#>      -- \u30E2\u30CB\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\nread <filename>           -- \u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u3063\u3066\u5B9F\u884C\u3057\u307E\u3059\n\nlock <expr>               -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nthreadlocks [thread id]   -- \u30B9\u30EC\u30C3\u30C9\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\npop                       -- \u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u307E\u3067\u306E\u3059\u3079\u3066\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30DD\u30C3\u30D7\u3057\u307E\u3059\nreenter                   -- pop\u3068\u540C\u3058\u3067\u3059\u304C\u3001\u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u304C\u518D\u5165\u529B\u3055\u308C\u307E\u3059\nredefine <class id> <class file name>\n                          -- \u30AF\u30E9\u30B9\u306E\u30B3\u30FC\u30C9\u3092\u518D\u5B9A\u7FA9\u3057\u307E\u3059\n\ndisablegc <expr>          -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6291\u5236\u3057\u307E\u3059\nenablegc <expr>           -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u8A31\u53EF\u3057\u307E\u3059\n\n!!                        -- \u6700\u5F8C\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u7E70\u308A\u8FD4\u3057\u307E\u3059\n<n> <command>             -- \u30B3\u30DE\u30F3\u30C9\u3092n\u56DE\u7E70\u308A\u8FD4\u3057\u307E\u3059\n# <command>               -- \u7834\u68C4\u3057\u307E\u3059(\u64CD\u4F5C\u306A\u3057)\nhelp (\u307E\u305F\u306F?)               -- \u30B3\u30DE\u30F3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ndbgtrace [flag]           -- dbgtrace\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u540C\u3058\u3067\u3059\nversion                   -- \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nexit (\u307E\u305F\u306Fquit)            -- \u30C7\u30D0\u30C3\u30AC\u3092\u7D42\u4E86\u3057\u307E\u3059\n\n<class id>: \u30D1\u30C3\u30B1\u30FC\u30B8\u4FEE\u98FE\u5B50\u3092\u542B\u3080\u5B8C\u5168\u30AF\u30E9\u30B9\u540D\n<class pattern>: \u5148\u982D\u307E\u305F\u306F\u672B\u5C3E\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9('*')\u3092\u542B\u3080\u30AF\u30E9\u30B9\u540D\n<thread id>: 'threads'\u30B3\u30DE\u30F3\u30C9\u3067\u5831\u544A\u3055\u308C\u308B\u30B9\u30EC\u30C3\u30C9\u756A\u53F7\n<expr>: Java(TM)\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u306E\u5F0F\u3002\n\u307B\u3068\u3093\u3069\u306E\u4E00\u822C\u7684\u306A\u69CB\u6587\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\n\u8D77\u52D5\u30B3\u30DE\u30F3\u30C9\u306F\u3001\"jdb.ini\"\u307E\u305F\u306F\".jdbrc\"\u306B\u914D\u7F6E\u3067\u304D\u307E\u3059\n(user.home\u307E\u305F\u306Fuser.dir\u5185)"},
+             "** \u30B3\u30DE\u30F3\u30C9\u30FB\u30EA\u30B9\u30C8 **\nconnectors                -- \u3053\u306EVM\u5185\u306E\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3068\u30C8\u30E9\u30F3\u30B9\u30DD\u30FC\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nrun [class [args]]        -- \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u5B9F\u884C\u3092\u958B\u59CB\u3057\u307E\u3059\n\nthreads [threadgroup]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthread <thread id>        -- \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\nsuspend [thread id(s)]    -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nresume [thread id(s)]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u518D\u958B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nwhere [<thread id> | all] -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30C0\u30F3\u30D7\u3057\u307E\u3059\nwherei [<thread id> | all]-- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092pc\u60C5\u5831\u3068\u3068\u3082\u306B\u30C0\u30F3\u30D7\u3057\u307E\u3059\nup [n frames]             -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0A\u306B\u79FB\u52D5\u3057\u307E\u3059\ndown [n frames]           -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0B\u306B\u79FB\u52D5\u3057\u307E\u3059\nkill <thread id> <expr>   -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u30B9\u30EC\u30C3\u30C9\u3092\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\ninterrupt <thread id>     -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n\nprint <expr>              -- \u5F0F\u306E\u5024\u3092\u51FA\u529B\u3057\u307E\u3059\ndump <expr>               -- \u3059\u3079\u3066\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\neval <expr>               -- \u5F0F\u3092\u8A55\u4FA1\u3057\u307E\u3059(print\u3068\u540C\u3058)\nset <lvalue> = <expr>     -- \u65B0\u3057\u3044\u5024\u3092\u30D5\u30A3\u30FC\u30EB\u30C9/\u5909\u6570/\u914D\u5217\u8981\u7D20\u306B\u4EE3\u5165\u3057\u307E\u3059\nlocals                    -- \u73FE\u5728\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u5185\u306E\u3059\u3079\u3066\u306E\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u3092\u51FA\u529B\u3057\u307E\u3059\n\nclasses                   -- \u73FE\u5728\u65E2\u77E5\u306E\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nclass <class id>          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\nmethods <class id>        -- \u30AF\u30E9\u30B9\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nfields <class id>         -- \u30AF\u30E9\u30B9\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nthreadgroups              -- \u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthreadgroup <name>        -- \u73FE\u5728\u306E\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                          -- \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u306E\u73FE\u5728\u306E\u30EA\u30B9\u30C8\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\n                          -- \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n                          -- \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n                          -- \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n                          -- <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u30E1\u30BD\u30C3\u30C9\u5185\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear <class id>:<line>   -- \u884C\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear                     -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u3068\u304D\u306B\u30D6\u30EC\u30FC\u30AF\u3057\u307E\u3059\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u306E'catch'\u3092\u53D6\u308A\u6D88\u3057\u307E\u3059\nwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u3092\u30A6\u30A9\u30C3\u30C1\u3057\u307E\u3059\nunwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1\u3092\u4E2D\u6B62\u3057\u307E\u3059\ntrace [go] methods [thread]\n                          -- \u30E1\u30BD\u30C3\u30C9\u306E\u5165\u308A\u53E3\u3068\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\u3002\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\ntrace [go] method exit | exits [thread]\n                          -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\nuntrace [methods]         -- \u30E1\u30BD\u30C3\u30C9\u306E\u958B\u59CB\u307E\u305F\u306F\u7D42\u4E86\u306E\u30C8\u30EC\u30FC\u30B9\u3092\u505C\u6B62\u3057\u307E\u3059\nstep                      -- \u73FE\u5728\u306E\u884C\u3092\u5B9F\u884C\u3057\u307E\u3059\nstep up                   -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u5143\u306B\u623B\u308B\u307E\u3067\u5B9F\u884C\u3057\u307E\u3059\nstepi                     -- \u73FE\u5728\u306E\u547D\u4EE4\u3092\u5B9F\u884C\u3057\u307E\u3059\nnext                      -- 1\u884C\u3092\u30B9\u30C6\u30C3\u30D7\u5B9F\u884C\u3057\u307E\u3059(\u547C\u51FA\u3057\u3092\u30B9\u30C6\u30C3\u30D7\u30AA\u30FC\u30D0\u30FC)\ncont                      -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u304B\u3089\u5B9F\u884C\u3092\u7D9A\u884C\u3057\u307E\u3059\n\nlist [line number|method] -- \u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u3092\u51FA\u529B\u3057\u307E\u3059\nuse (or sourcepath) [source file path]\n                          -- \u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u30B9\u30C6\u30C3\u30D7\u3084\u30E1\u30BD\u30C3\u30C9\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u5831\u544A\u3057\u307E\u305B\u3093\nclasspath                 -- \u30BF\u30FC\u30B2\u30C3\u30C8VM\u304B\u3089\u30AF\u30E9\u30B9\u30D1\u30B9\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\nmonitor <command>         -- \u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u505C\u6B62\u3059\u308B\u305F\u3073\u306B\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059\nmonitor                   -- \u30E2\u30CB\u30BF\u30FC\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nunmonitor <monitor#>      -- \u30E2\u30CB\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\nread <filename>           -- \u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u3063\u3066\u5B9F\u884C\u3057\u307E\u3059\n\nlock <expr>               -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nthreadlocks [thread id]   -- \u30B9\u30EC\u30C3\u30C9\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\npop                       -- \u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u307E\u3067\u306E\u3059\u3079\u3066\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30DD\u30C3\u30D7\u3057\u307E\u3059\nreenter                   -- pop\u3068\u540C\u3058\u3067\u3059\u304C\u3001\u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u304C\u518D\u5165\u529B\u3055\u308C\u307E\u3059\nredefine <class id> <class file name>\n                          -- \u30AF\u30E9\u30B9\u306E\u30B3\u30FC\u30C9\u3092\u518D\u5B9A\u7FA9\u3057\u307E\u3059\n\ndisablegc <expr>          -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6291\u5236\u3057\u307E\u3059\nenablegc <expr>           -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u8A31\u53EF\u3057\u307E\u3059\n\n!!                        -- \u6700\u5F8C\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u7E70\u308A\u8FD4\u3057\u307E\u3059\n<n> <command>             -- \u30B3\u30DE\u30F3\u30C9\u3092n\u56DE\u7E70\u308A\u8FD4\u3057\u307E\u3059\nrepeat                    -- GDB\u5F62\u5F0F\u306E\u7A7A\u306E\u30B3\u30DE\u30F3\u30C9\u306E\u7E70\u8FD4\u3057\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u304B\u3069\u3046\u304B\u3092\u793A\u3057\u307E\u3059\nrepeat <on|off>           -- GDB\u5F62\u5F0F\u306E\u7E70\u8FD4\u3057\u3092\u6709\u52B9/\u7121\u52B9\u306B\u3057\u307E\u3059\n# <command>               -- \u7834\u68C4\u3057\u307E\u3059(\u64CD\u4F5C\u306A\u3057)\nhelp (\u307E\u305F\u306F?)               -- \u30B3\u30DE\u30F3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ndbgtrace [flag]           -- dbgtrace\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u540C\u3058\u3067\u3059\nversion                   -- \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nexit (\u307E\u305F\u306Fquit)            -- \u30C7\u30D0\u30C3\u30AC\u3092\u7D42\u4E86\u3057\u307E\u3059\n\n<class id>: \u30D1\u30C3\u30B1\u30FC\u30B8\u4FEE\u98FE\u5B50\u3092\u542B\u3080\u5B8C\u5168\u30AF\u30E9\u30B9\u540D\n<class pattern>: \u5148\u982D\u307E\u305F\u306F\u672B\u5C3E\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9('*')\u3092\u542B\u3080\u30AF\u30E9\u30B9\u540D\n<thread id>: 'threads'\u30B3\u30DE\u30F3\u30C9\u3067\u5831\u544A\u3055\u308C\u308B\u30B9\u30EC\u30C3\u30C9\u756A\u53F7\n<expr>: Java(TM)\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u306E\u5F0F\u3002\n\u307B\u3068\u3093\u3069\u306E\u4E00\u822C\u7684\u306A\u69CB\u6587\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\n\u8D77\u52D5\u30B3\u30DE\u30F3\u30C9\u306F\u3001\"jdb.ini\"\u307E\u305F\u306F\".jdbrc\"\u306B\u914D\u7F6E\u3067\u304D\u307E\u3059\n(user.home\u307E\u305F\u306Fuser.dir\u5185)"},
         {"zz usage text",
              "\u4F7F\u7528\u65B9\u6CD5: {0} <options> <class> <arguments>\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n    -? -h --help -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n    -sourcepath <directories separated by \"{1}\">\n                      \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n    -attach <address>\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306B\u63A5\u7D9A\u3059\u308B\n    -listen <address>\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306E\u63A5\u7D9A\u3092\u5F85\u6A5F\u3059\u308B\n    -listenany\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u4F7F\u7528\u53EF\u80FD\u306A\u4EFB\u610F\u306E\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306E\u63A5\u7D9A\u3092\u5F85\u6A5F\u3059\u308B\n    -launch\n                      ''run''\u30B3\u30DE\u30F3\u30C9\u3092\u5F85\u6A5F\u305B\u305A\u306BVM\u3092\u5373\u6642\u306B\u8D77\u52D5\u3059\u308B\n    -listconnectors   \u3053\u306EVM\u3067\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3092\u30EA\u30B9\u30C8\u3059\u308B\n    -connect <connector-name>:<name1>=<value1>,...\n                      \u6307\u5B9A\u3055\u308C\u305F\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u30EA\u30B9\u30C8\u3055\u308C\u305F\u5F15\u6570\u5024\u3067\u30BF\u30FC\u30B2\u30C3\u30C8VM\u306B\u63A5\u7D9A\u3059\u308B\n    -dbgtrace [flags] {0}\u306E\u30C7\u30D0\u30C3\u30B0\u306E\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B\n    -tclient          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092HotSpot(TM) Client Compiler\u3067\u5B9F\u884C\u3059\u308B\n    -tserver          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092HotSpot(TM) Server Compiler\u3067\u5B9F\u884C\u3059\u308B\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u8EE2\u9001\u3055\u308C\u307E\u3059:\n    -v -verbose[:class|gc|jni]\n                      \u8A73\u7D30\u30E2\u30FC\u30C9\u3092\u30AA\u30F3\u306B\u3059\u308B\n    -D<name>=<value>  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n    -classpath <directories separated by \"{1}\">\n                      \u30AF\u30E9\u30B9\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u30EA\u30B9\u30C8\u3059\u308B\n    -X<option>        \u975E\u6A19\u6E96\u306E\u30BF\u30FC\u30B2\u30C3\u30C8VM\u30AA\u30D7\u30B7\u30E7\u30F3\n\n<class>\u306F\u30C7\u30D0\u30C3\u30B0\u3092\u958B\u59CB\u3059\u308B\u30AF\u30E9\u30B9\u306E\u540D\u524D\u3067\u3059\n<arguments>\u306F<class>\u306Emain()\u30E1\u30BD\u30C3\u30C9\u306B\u6E21\u3055\u308C\u308B\u5F15\u6570\u3067\u3059\n\n\u30B3\u30DE\u30F3\u30C9\u306E\u30D8\u30EB\u30D7\u306B\u3064\u3044\u3066\u306F{0}\u30D7\u30ED\u30F3\u30D7\u30C8\u3067''help''\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
         // END OF MATERIAL TO LOCALIZE
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
index 6c4be977705..5de5fdd990e 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"breakpoint", "\u65AD\u70B9{0}"},
         {"Breakpoints set:", "\u65AD\u70B9\u96C6:"},
         {"Breakpoints can be located only in classes.", "\u65AD\u70B9\u53EA\u80FD\u4F4D\u4E8E\u7C7B\u4E2D\u3002{0}\u662F\u63A5\u53E3\u6216\u6570\u7EC4\u3002"},
-        {"Can only trace", "\u53EA\u80FD\u8DDF\u8E2A 'methods', 'method exit' \u6216 'method exits'"},
+        {"Can only trace", "\u53EA\u80FD\u8DDF\u8E2A 'methods'\u3001'method exit' \u6216 'method exits'"},
         {"cannot redefine existing connection", "{0}\u65E0\u6CD5\u91CD\u65B0\u5B9A\u4E49\u73B0\u6709\u8FDE\u63A5"},
         {"Cannot assign to a method invocation", "\u65E0\u6CD5\u5206\u914D\u5230\u65B9\u6CD5\u8C03\u7528"},
         {"Cannot specify command line with connector:", "\u65E0\u6CD5\u6307\u5B9A\u5E26\u6709\u8FDE\u63A5\u5668\u7684\u547D\u4EE4\u884C: {0}"},
@@ -115,8 +115,8 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"Error reading file", "\u8BFB\u53D6 ''{0}'' \u65F6\u51FA\u9519 - {1}"},
         {"Error redefining class to file", "\u5C06{0}\u91CD\u65B0\u5B9A\u4E49\u4E3A{1}\u65F6\u51FA\u9519 - {2}"},
         {"exceptionSpec all", "\u6240\u6709{0}"},
-        {"exceptionSpec caught", "\u6355\u83B7\u7684{0}"},
-        {"exceptionSpec uncaught", "\u672A\u6355\u83B7\u7684{0}"},
+        {"exceptionSpec caught", "\u6355\u83B7\u7684 {0}"},
+        {"exceptionSpec uncaught", "\u672A\u6355\u83B7\u7684 {0}"},
         {"Exception in expression:", "\u8868\u8FBE\u5F0F\u4E2D\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0}"},
         {"Exception occurred caught", "\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0} (\u5C06\u5728\u4EE5\u4E0B\u4F4D\u7F6E\u6355\u83B7: {1})"},
         {"Exception occurred uncaught", "\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0} (\u672A\u6355\u83B7)"},
@@ -192,7 +192,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"locationString", "{0}.{1}(), \u884C={2,number,integer} bci={3,number,integer}"},
         {"Main class and arguments must be specified", "\u5FC5\u987B\u6307\u5B9A\u4E3B\u7C7B\u548C\u53C2\u6570"},
         {"Method arguments:", "\u65B9\u6CD5\u53C2\u6570:"},
-        {"Method entered:", "\u5DF2\u8FDB\u5165\u65B9\u6CD5: "},
+        {"Method entered:", "\u5DF2\u8FDB\u5165\u65B9\u6CD5\uFF1A"},
         {"Method exited:",  "\u5DF2\u9000\u51FA\u65B9\u6CD5"},
         {"Method exitedValue:", "\u5DF2\u9000\u51FA\u65B9\u6CD5: \u8FD4\u56DE\u503C = {0}, "},
         {"Method is overloaded; specify arguments", "\u5DF2\u91CD\u8F7D\u65B9\u6CD5{0}; \u8BF7\u6307\u5B9A\u53C2\u6570"},
@@ -253,9 +253,9 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
          "\u7528\u6CD5\uFF1Astop [go|thread] [<thread_id>] <at|in> <location>\n  \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n  \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n  \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n  \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n  \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n  <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n    <class_id>:<line_number>\n    <class_id>.<method>[(argument_type,...)]"
         },
         {"Removed:", "\u5DF2\u5220\u9664: {0}"},
-        {"repeat is on", "Repeat is on"},
-        {"repeat is off", "Repeat is off"},
-        {"repeat usage", "Usage: repeat <on|off>"},
+        {"repeat is on", "\u91CD\u590D\u5904\u4E8E\u542F\u7528\u72B6\u6001"},
+        {"repeat is off", "\u91CD\u590D\u5904\u4E8E\u7981\u7528\u72B6\u6001"},
+        {"repeat usage", "\u7528\u6CD5\uFF1Arepeat <on|off>"},
         {"Requested stack frame is no longer active:", "\u8BF7\u6C42\u7684\u5806\u6808\u5E27\u4E0D\u518D\u6709\u6548: {0,number,integer}"},
         {"run <args> command is valid only with launched VMs", "'run <args>' \u547D\u4EE4\u4EC5\u5BF9\u542F\u52A8\u7684 VM \u6709\u6548"},
         {"run", "\u8FD0\u884C{0}"},
@@ -302,6 +302,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"Thread has been resumed", "\u5DF2\u6062\u590D\u7EBF\u7A0B"},
         {"Thread not suspended", "\u672A\u6302\u8D77\u7EBF\u7A0B"},
         {"thread group number description name", "{0,number,integer}\u3002{1} {2}"},
+        {"Threadgroup name not specified.", "\u672A\u6307\u5B9A\u7EBF\u7A0B\u7EC4\u540D\u3002"},
         {"<thread_id> option not valid until the VM is started with the run command",
          "\u5728\u4F7F\u7528 run \u547D\u4EE4\u542F\u52A8 VM \u524D\uFF0C<thread_id> \u9009\u9879\u65E0\u6548"},
         {"Threads must be suspended", "\u5FC5\u987B\u6302\u8D77\u7EBF\u7A0B"},
@@ -338,7 +339,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"watch accesses of", "\u76D1\u89C6{0}.{1}\u7684\u8BBF\u95EE"},
         {"watch modification of", "\u76D1\u89C6{0}.{1}\u7684\u4FEE\u6539"},
         {"zz help text",
-             "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u8BBE\u7F6E\u65AD\u70B9\n                          -- \u5982\u679C\u672A\u63D0\u4F9B\u4EFB\u4F55\u9009\u9879\uFF0C\u5219\u5C06\u6253\u5370\u5F53\u524D\u65AD\u70B9\u5217\u8868\n                          -- \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n                          -- \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n                          -- \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n                          -- \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n                          -- \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n                          -- <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\n\u4E0B\u4E00\u6B65                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\ndbgtrace [flag]           -- \u4E0E dbgtrace \u547D\u4EE4\u884C\u9009\u9879\u76F8\u540C\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
+             "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u8BBE\u7F6E\u65AD\u70B9\n                          -- \u5982\u679C\u672A\u63D0\u4F9B\u4EFB\u4F55\u9009\u9879\uFF0C\u5219\u5C06\u6253\u5370\u5F53\u524D\u65AD\u70B9\u5217\u8868\n                          -- \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n                          -- \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n                          -- \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n                          -- \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n                          -- \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n                          -- <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\n\u4E0B\u4E00\u6B65                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\nrepeat                    -- \u663E\u793A\u662F\u5426\u542F\u7528\u4E86 GDB \u6837\u5F0F\u7684\u7A7A\u547D\u4EE4\u91CD\u590D\nrepeat <on|off>           -- \u542F\u7528/\u7981\u7528 GDB \u6837\u5F0F\u7684\u91CD\u590D\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\ndbgtrace [flag]           -- \u4E0E dbgtrace \u547D\u4EE4\u884C\u9009\u9879\u76F8\u540C\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
         {"zz usage text",
              "\u7528\u6CD5\uFF1A{0} <\u9009\u9879> <\u7C7B> <\u53C2\u6570>\n\n\u5176\u4E2D\uFF0C\u9009\u9879\u5305\u62EC\uFF1A\n    -? -h --help -help \u8F93\u51FA\u6B64\u6D88\u606F\u5E76\u9000\u51FA\n    -sourcepath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u8981\u5728\u5176\u4E2D\u67E5\u627E\u6E90\u6587\u4EF6\u7684\u76EE\u5F55\n    -attach <\u5730\u5740>\n                      \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u9644\u52A0\u5230\u6307\u5B9A\u5730\u5740\u5904\u6B63\u5728\u8FD0\u884C\u7684 VM\n    -listen <\u5730\u5740>\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u6307\u5B9A\u5730\u5740\u5904\u8FDE\u63A5\n    -listenany\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u4EFB\u4F55\u53EF\u7528\u5730\u5740\u5904\u8FDE\u63A5\n    -launch\n                      \u7ACB\u5373\u542F\u52A8 VM \u800C\u4E0D\u662F\u7B49\u5F85 ''run'' \u547D\u4EE4\n    -listconnectors   \u5217\u51FA\u6B64 VM \u4E2D\u7684\u53EF\u7528\u8FDE\u63A5\u5668\n    -connect <\u8FDE\u63A5\u5668\u540D\u79F0>:<\u540D\u79F0 1>=<\u503C 1>,...\n                      \u4F7F\u7528\u6240\u5217\u53C2\u6570\u503C\u901A\u8FC7\u6307\u5B9A\u7684\u8FDE\u63A5\u5668\u8FDE\u63A5\u5230\u76EE\u6807 VM\n    -dbgtrace [flags] \u8F93\u51FA\u8C03\u8BD5 {0} \u7684\u4FE1\u606F\n    -tclient          \u5728 HotSpot(TM) \u5BA2\u6237\u673A\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n    -tserver          \u5728 HotSpot(TM) \u670D\u52A1\u5668\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n\n\u8F6C\u53D1\u5230\u88AB\u8C03\u8BD5\u8FDB\u7A0B\u7684\u9009\u9879\uFF1A\n    -v -verbose[:class|gc|jni]\n                      \u542F\u7528\u8BE6\u7EC6\u6A21\u5F0F\n    -D<\u540D\u79F0>=<\u503C>  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -classpath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u5217\u51FA\u8981\u5728\u5176\u4E2D\u67E5\u627E\u7C7B\u7684\u76EE\u5F55\n    -X<\u9009\u9879>        \u975E\u6807\u51C6\u76EE\u6807 VM \u9009\u9879\n\n<\u7C7B> \u662F\u8981\u5F00\u59CB\u8C03\u8BD5\u7684\u7C7B\u7684\u540D\u79F0\n<\u53C2\u6570> \u662F\u4F20\u9012\u5230 <\u7C7B> \u7684 main() \u65B9\u6CD5\u7684\u53C2\u6570\n\n\u8981\u83B7\u5F97\u547D\u4EE4\u7684\u5E2E\u52A9\uFF0C\u8BF7\u5728 {0} \u63D0\u793A\u4E0B\u952E\u5165 ''help''"},
         // END OF MATERIAL TO LOCALIZE
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
new file mode 100644
index 00000000000..28c0afa3894
--- /dev/null
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
@@ -0,0 +1,77 @@
+#
+# Copyright (c) 2010, 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.
+#
+
+true = true
+false = false
+version_format = Java Debug Interface (Referenzimplementierung) Version {0}.{1} \n{2}
+raw.command = Raw-Befehl zum Starten der Anwendungs-VM nach dem Debuggen
+raw.command.label = Befehl
+raw.address = Adresse, von der aus nach einer Verbindung gehorcht wird, wenn der Raw-Befehl ausgef\u00FChrt wurde
+raw.address.label = Adresse
+raw.quote = Zeichen, das verwendet wird, um leerzeichengetrennten Text zu einem einzigen Befehlszeilenargument zu kombinieren
+raw.quote.label = Anf\u00FChrungszeichen
+raw.description = Startet das Ziel mit einer vom Benutzer angegebenen Befehlszeile und wird daran angeh\u00E4ngt
+sun.home = Home-Verzeichnis des SDK oder der Laufzeitumgebung, die zum Starten der Anwendung verwendet wird
+sun.home.label = Home 
+sun.options = Gestartete VM-Optionen
+sun.options.label = Optionen
+sun.main = Hauptklasse und Argumente, oder, wenn -jar eine Option ist, die Haupt-JAR-Datei und Argumente
+sun.main.label = Haupt
+sun.init_suspend = Alle Threads werden vor der Ausf\u00FChrung von "main" unterbrochen
+sun.init_suspend.label = Unterbrechen
+sun.quote = Zeichen, das verwendet wird, um leerzeichengetrennten Text zu einem einzigen Befehlszeilenargument zu kombinieren
+sun.quote.label = Anf\u00FChrungszeichen
+sun.vm_exec = Name des Java-VM-Launchers
+sun.vm_exec.label = Launcher
+sun.description = Startet das Ziel mit einer Sun Java VM-Befehlszeile und wird daran angeh\u00E4ngt
+generic_attaching.address = Adresse zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+generic_attaching.address.label = Adresse
+generic_attaching.timeout = Timeout beim Warten auf das Anh\u00E4ngen 
+generic_attaching.timeout.label = Timeout
+generic_listening.address = Adresse f\u00FCr das Horchen nach VM-Verbindungen
+generic_listening.address.label = Adresse
+generic_listening.timeout = Timeout beim Warten auf Verbindung
+generic_listening.timeout.label = Timeout
+socket_transportservice.description = Verbindet Debugger und zu debuggendes Programm \u00FCber eine TCP-Verbindung
+memory_transportservice.description = Verbindet Debugger und zu debuggendes Programm \u00FCber eine gemeinsame Speicherverbindung
+socket_attaching.host = Rechnername zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+socket_attaching.host.label = Host
+socket_attaching.port = Portnummer zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+socket_attaching.port.label = Port
+socket_attaching.description = Wird \u00FCber das Socket an andere VMs angeh\u00E4ngt
+socket_listening.localaddr = Lokale Adresse, an die der Listener gebunden wird
+socket_listening.localaddr.label = Lokale Adresse
+socket_listening.port = Portnummer f\u00FCr das Horchen nach VM-Verbindungen
+socket_listening.port.label = Port
+socket_listening.description = Akzeptiert Socket-Verbindungen, die von anderen VMs initiiert werden
+memory_attaching.name = Name des gemeinsamen Speicherbereichs zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+memory_attaching.name.label = Name
+memory_attaching.description = Wird \u00FCber gemeinsamen Speicher an andere VMs angeh\u00E4ngt
+memory_listening.name = Name des gemeinsamen Speicherbereichs f\u00FCr das Horchen nach VM-Verbindungen
+memory_listening.name.label = Name
+memory_listening.description = Akzeptiert gemeinsame Speicherverbindungen, die von anderen VMs initiiert werden
+process_attaching.description = Wird \u00FCber die Prozess-ID (pid) an das zu debuggende Programm angeh\u00E4ngt
+process_attaching.pid = pid
+process_attaching.pid.label = Prozess-ID (pid) des zu debuggenden Programms
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
new file mode 100644
index 00000000000..4c5ae6c3814
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
@@ -0,0 +1,105 @@
+#
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.usage.summary=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+main.usage=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nM\u00F6gliche Optionen:
+
+main.opt.help=\  -h, --help, -?                        Gibt diese Hilfemeldung aus
+
+main.opt.version=\      --version                         Versionsinformationen
+
+main.opt.module-path=\  -p, --module-path <Pfad>              Modulpfad.\n                                        Wird er nicht angegeben, wird das jmods-Verzeichnis des JDK\n                                        verwendet, falls vorhanden. Wird er angegeben,\n                                        aber enth\u00E4lt er nicht das Modul java.base,\n                                        wird das jmods-Verzeichnis des JDK hinzugef\u00FCgt,\n                                        falls vorhanden.
+
+main.opt.add-modules=\      --add-modules <Mod>[,<Mod>...]    Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen\n                                        Modulen aufgel\u00F6st werden. <Mod> kann auch ALL-MODULE-PATH sein.
+
+main.opt.limit-modules=\      --limit-modules <Mod>[,<Mod>...]  Begrenzt den Bereich der beobachtbaren\n                                        Module
+
+main.opt.output=\      --output <Pfad>                   Ort des Ausgabepfads
+
+main.opt.launcher=\      --launcher <Name>=<Modul>[/<Hauptklasse>]\n                                        F\u00FCgt einen Launcher-Befehl mit dem angegebenen\n                                        Namen f\u00FCr das Modul und die Hauptklasse hinzu,\n                                        falls angegeben  
+
+main.opt.bind-services=\      --bind-services                   Bindet Serviceprovidermodule und ihre\n                                        Abh\u00E4ngigkeiten ein
+
+main.opt.suggest-providers=\      --suggest-providers [<Name>,...]  Schl\u00E4gt Provider vor, welche die angegebenen\n                                        Servicetypen aus dem Modulpfad implementieren
+
+main.command.files=\      @<Dateiname>                       Liest Optionen aus der Datei
+
+main.opt.endian=\      --endian <little|big>             Bytereihenfolge des generierten jimage\n                                        (Standard: nativ)
+
+main.opt.save-opts=\      --save-opts <Dateiname>            Speichert jlink-Optionen in der angegebenen Datei
+
+main.opt.ignore-signing-information=\      --ignore-signing-information      Unterdr\u00FCckt einen schwerwiegenden Fehler, wenn signierte\n                                        modulare JAR-Dateien in das Image eingebunden werden.\n                                        Die signaturbezogenen Dateien der signierten\n                                        modularen JAR-Dateien werden nicht in das\n                                        Laufzeitimage kopiert.
+
+main.opt.verbose=\  -v, --verbose                         Aktiviert Verbose-Tracing
+
+main.msg.bug=Eine Ausnahme ist in jlink aufgetreten. Melden Sie in der Java-Bugdatenbank (http://bugreport.java.com/bugreport/) einen Bug, nachdem Sie die Bugdatenbank auf Duplikate gepr\u00FCft haben. Geben Sie in Ihrem Bericht Ihr Programm und die folgende Diagnose an. Vielen Dank.
+
+main.extended.help=Liste der verf\u00FCgbaren Plug-ins:
+
+main.extended.help.footer=Bei Optionen, die eine <Musterliste> erfordern, ist der Wert eine kommagetrennte\nListe von Elementen, die jeweils eines der folgenden Formate verwenden:\n  <Globales Muster>\n  glob:<Globales Muster>\n  regex:<Regex-Muster>\n  @<Dateiname>, wobei der Dateiname der Name einer Datei mit zu verwendenden Mustern ist,\n              ein Muster pro Zeile\n\n
+
+error.prefix=Fehler:
+warn.prefix=Warnung:
+
+err.empty.module.path=leerer Modulpfad
+err.jlink.version.mismatch=jlink-Version {0}.{1} stimmt nicht mit Ziel-java.base-Version {2}.{3} \u00FCberein
+err.automatic.module:automatisches Modul kann nicht mit jlink verwendet werden: {0} aus {1}
+err.unknown.byte.order:unbekannte Bytereihenfolge {0}
+err.launcher.main.class.empty:Launcher-Hauptklassenname darf nicht leer sein: {0}
+err.launcher.module.name.empty:Launcher-Modulname darf nicht leer sein: {0}
+err.launcher.value.format:Launcher-Wert muss folgendes Format haben: <Befehl>=<Modul>[/<Hauptklasse>]: {0}
+err.output.must.be.specified:--output muss angegeben werden
+err.modulepath.must.be.specified:--module-path ist nicht angegeben, und dieses Laufzeitimage enth\u00E4lt nicht das jmods-Verzeichnis.
+err.mods.must.be.specified:keine Module zum {0} angegeben
+err.path.not.found=Pfad nicht gefunden: {0}
+err.path.not.valid=ung\u00FCltiger Pfad: {0}
+err.image.must.exist=Image {0} ist nicht vorhanden oder ist kein Verzeichnis
+err.existing.image.invalid=vorhandenes Image ist ung\u00FCltig
+err.file.not.found=Datei nicht gefunden: {0}
+err.file.error=Zugriff nicht m\u00F6glich auf Datei: {0}
+err.dir.exists={0} ist bereits vorhanden
+err.badpattern=ung\u00FCltiges Muster {0}
+err.unknown.option=unbekannte Option: {0}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.internal.error=interner Fehler: {0} {1} {2}
+err.invalid.arg.for.option={0} akzeptiert nicht das Argument "{1}"
+err.option.after.class=Option muss angegeben werden vor den Klassen: {0}
+err.option.unsupported={0} nicht unterst\u00FCtzt: {1}
+err.orphan.arguments=ung\u00FCltiges Argument: {0}
+err.config.defaults=Eigenschaft {0} fehlt in der Konfiguration
+err.config.defaults.value=falscher Wert in Standardeigenschaft: {0}
+err.bom.generation=Generierung der BOM-Datei nicht erfolgreich: {0}
+err.not.a.module.directory=Unter Verzeichnis {0} ist keine Datei module-info.class vorhanden
+err.cannot.read.module.info=Moduldeskriptor kann nicht gelesen werden aus {0}
+err.not.modular.format=ausgew\u00E4hltes Modul {0} ({1}) hat nicht das jmod- oder modulare JAR-Format
+err.signing=signierte modulare JAR-Datei {0} wird gegenw\u00E4rtig nicht unterst\u00FCtzt, verwenden Sie --ignore-signing-information, um den Fehler zu unterdr\u00FCcken
+warn.signing=WARNUNG: Signierte modulare JAR-Datei {0} wird gegenw\u00E4rtig nicht unterst\u00FCtzt
+warn.invalid.arg=ung\u00FCltiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
+warn.split.package=Package {0}, definiert in {1} {2}
+warn.provider.notfound=Kein Provider f\u00FCr Service angegeben f\u00FCr --suggest-providers: {0}
+no.suggested.providers=Option --bind-services ist angegeben. Keine weiteren Provider vorgeschlagen.
+suggested.providers.header=Vorgeschlagene Provider
+providers.header=Provider
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
new file mode 100644
index 00000000000..c2414078270
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
@@ -0,0 +1,224 @@
+#
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+add-options.argument=<Optionen>
+
+add-options.description=Stellt die angegebene <Optionen>-Zeichenfolge, die Leerzeichen enthalten\nkann, anderen Optionen voran, wenn die virtuelle Maschine im\nresultierenden Image aufgerufen wird.
+
+add-options.usage=\  --add-options <Optionen>   Stellt die angegebene <Optionen>-Zeichenfolge,\n                            die Leerzeichen enthalten kann, anderen Optionen voran, wenn\n                            die virtuelle Maschine im resultierenden Image aufgerufen wird.
+
+release-info.argument=<Datei>|add:<Schl\u00FCssel1>=<Wert1>:<Schl\u00FCssel2>=<Wert2>:...|del:<Schl\u00FCsselliste>
+
+release-info.description=<Datei>-Option l\u00E4dt Releaseeigenschaften aus der angegebenen Datei.\nadd: f\u00FCgt der Datei "release" Eigenschaften hinzu.\nEine beliebige Anzahl von <Schl\u00FCssel>=<Wert>-Paaren kann \u00FCbergeben werden.\ndel: l\u00F6scht die Liste der Schl\u00FCssel in der Releasedatei.
+
+release-info.usage=\  --release-info <Datei>|add:<Schl\u00FCssel1>=<Wert1>:<Schl\u00FCssel2>=<Wert2>:...|del:<Schl\u00FCsselliste>\n                            Option <Datei> l\u00F6scht Releaseeigenschaften aus\n                            der angegebenen Datei.\n                            add: f\u00FCgt Eigenschaften der Datei "release" hinzu.\n                            Eine beliebige Anzahl <Schl\u00FCssel>=<Wert>-Paare kann \u00FCbergeben werden.\n                            del: l\u00F6scht die Liste der Schl\u00FCssel in der Releasedatei.
+
+class-for-name.argument=
+
+class-for-name.description=Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorg\u00E4nge.
+
+class-for-name.usage=\  --class-for-name          Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorg\u00E4nge.
+
+compress.argument=<0|1|2>[:filter=<Musterliste>]
+
+compress.description=Komprimiert alle Ressourcen im Ausgabeimage.\nEbene 0: Keine Komprimierung\nEbene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\nEbene 2: ZIP.\nEin optionaler <Musterliste>-Filter kann angegeben werden, um das Muster der\neinzuschlie\u00DFenden Dateien aufzulisten.
+
+compress.usage=\  --compress <0|1|2>[:filter=<Musterliste>]\n                            Komprimiert alle Ressourcen im Ausgabeimage.\n                            Ebene 0: Keine Komprimierung\n                            Ebene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                            Ebene 2: ZIP.\n                            Ein optionaler <Musterliste>-Filter kann angegeben\n                            werden, um das Muster der einzuschlie\u00DFenden\n                            Dateien aufzulisten.
+
+compact-cp.argument=<Ressourcenpfade>
+
+compact-cp.description=Gemeinsame Verwendung von Zeichenfolgen im Konstantenpool.\nStandardm\u00E4\u00DFig werden alle Ressourcen komprimiert. Sie k\u00F6nnen ausdr\u00FCcken, dass\nein Ressourcenset komprimiert oder nicht komprimiert werden soll (mit ^ f\u00FCr Negierung).
+
+compact-cp.usage=\ --compact-cp <Ressourcenpfade>\n                            Gemeinsame Verwendung von Zeichenfolgen im Konstantenpool.\n                            Standardm\u00E4\u00DFig werden alle Ressourcen komprimiert.\n                            Sie k\u00F6nnen ausdr\u00FCcken, dass ein Ressourcenset komprimiert\n                            oder nicht komprimiert werden soll (mit ^ f\u00FCr Negierung).
+
+dedup-legal-notices.argument=[error-if-not-same-content]
+
+dedup-legal-notices.description=Dedupliziert alle rechtlichen Hinweise. Wenn error-if-not-same-content\nangegeben wird, tritt ein Fehler auf, wenn zwei Dateien mit dem gleichen\nDateinamen unterschiedlich sind.
+
+dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            Dedupliziert alle rechtlichen Hinweise.\n                            Wenn error-if-not-same-content angegeben wird,\n                            tritt ein Fehler auf, wenn zwei Dateien mit dem gleichen\n                            Dateinamen unterschiedlich sind.
+
+exclude-files.argument=<Musterliste> der auszuschlie\u00DFenden Dateien
+
+exclude-files.description=Gibt die auszuschlie\u00DFenden Dateien an. Beispiel: **.java,glob:/java.base/lib/client/**
+
+exclude-files.usage=\  --exclude-files <Musterliste>\n                            Gibt die auszuschlie\u00DFenden Dateien an.\n                            Beispiel: **.java,glob:/java.base/lib/client/**
+
+exclude-resources.argument=<Musterliste> f\u00FCr auszuschlie\u00DFende Ressourcen
+
+exclude-resources.description=Gibt die auszuschlie\u00DFenden Ressourcen an. Beispiel: **.jcov,glob:**/META-INF/**
+
+exclude-resources.usage=\  --exclude-resources <Musterliste>\n                            Gibt die auszuschlie\u00DFenden Ressourcen an.\n                            Beispiel: **.jcov,glob:**/META-INF/**
+
+exclude-jmod-section.argument=<Abschnittname>\nwobei <Abschnittname> "man" oder "headers" lautet.
+
+exclude-jmod-section.description=Gibt einen auszuschlie\u00DFenden JMOD-Abschnitt an
+
+exclude-jmod-section.usage=\  --exclude-jmod-section <Abschnittname>\n                            Gibt einen auszuschlie\u00DFenden JMOD-Abschnitt an.\n                            Dabei lautet <Abschnittname> "man" oder "headers".
+
+
+generate-cds-archive.description=CDS-Plug-in: Generiert CDS-Archive, wenn das Laufzeitimage das CDS-Feature unterst\u00FCtzt.\n
+generate-cds-archive.usage=\  --generate-cds-archive    Generiert ein CDS-Archiv, wenn das Laufzeitimage das\n                            CDS-Feature unterst\u00FCtzt.
+
+generate-jli-classes.argument=@filename
+
+generate-jli-classes.description=Gibt eine Datei an, die java.lang.invoke-Klassen f\u00FCr die Vorabgenerierung auflistet. \nStandardm\u00E4\u00DFig kann dieses Plug-in eine integrierte Liste vorab zu generierender Klassen sein. \nWenn dieses Plug-in in einer anderen Laufzeitversion als das erstellte Image ausgef\u00FChrt wird, \nwird die Codegenerierung standardm\u00E4\u00DFig deaktiviert, damit die Richtigkeit gew\u00E4hrleistet \nist - kann durch Hinzuf\u00FCgen von ignore-version=true au\u00DFer Kraft gesetzt werden.
+
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                           Gibt eine Datei an, welche die java.lang.invoke-Klassen f\u00FCr die\n                           Vorabgenerierung auflistet. Standardm\u00E4\u00DFig kann dieses\n                           Plug-in eine integrierte Liste vorab zu generierender Klassen sein.\n                           Wenn dieses Plug-in in einer anderen Laufzeitversion als das\n                           erstellte Image ausgef\u00FChrt wird, wird die Codegenerierung standardm\u00E4\u00DFig\n                          deaktiviert, damit die Richtigkeit gew\u00E4hrleistet ist - kann durch\n                           Hinzuf\u00FCgen von ignore-version=true au\u00DFer Kraft gesetzt werden.
+
+system-modules.argument=retainModuleTarget
+
+system-modules.description=Schnelles Laden der Moduldeskriptoren (immer aktiviert)
+
+system-modules.usage=\  --system-modules retainModuleTarget\n                            Schnelles Laden der Moduldeskriptoren (immer aktiviert)
+
+onoff.argument=<on|off>
+
+order-resources.argument=<Musterliste> der Pfade in der Reihenfolge ihrer Priorit\u00E4t. Wenn eine @file\nangegeben wird, muss jede Zeile genau \u00FCbereinstimmen, damit die Pfadsortierung m\u00F6glich ist
+
+order-resources.description=Sortiert Ressourcen. Beispiel: **/module-info.class,@classlist,/java.base/java/lang/**
+
+order-resources.usage=\  --order-resources <Musterliste>\n                            Sortiert Ressourcen. \n                            Beispiel: **/module-info.class,@classlist,\n                            /java.base/java/lang/**
+
+strip-debug.description=Entfernt Debuginformationen aus dem Ausgabeimage
+
+strip-debug.usage=\  --strip-debug             Entfernt Debuginformationen aus dem Ausgabeimage
+
+strip-java-debug-attributes.description=Entfernt Java-Debugattribute aus Klassen im Ausgabeimage
+
+strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            Entfernt Java-Debugattribute aus\n                            Klassen im Ausgabeimage
+
+strip-native-commands.description=Schlie\u00DFt native Befehle (wie java/java.exe) aus dem Image aus
+
+strip-native-commands.usage=\  --strip-native-commands   Schlie\u00DFt native Befehle (wie java/java.exe)\n                            aus dem Image aus.
+
+vendor-version.argument=<Herstellerversion>
+
+vendor-version.description=\u00DCberschreibt die Zeichenfolge f\u00FCr die Herstellerversion, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.version" lautet dann <Herstellerversion>.
+
+vendor-version.usage=\  --vendor-version <Herstellerversion>\n                            \u00DCberschreibt die Zeichenfolge f\u00FCr die Herstellerversion, die im\n                            Build enthalten ist, falls zutreffend. Der Wert der Systemeigenschaft\n                            "java.vendor.version" lautet dann <Herstellerversion>.
+
+vendor-bug-url.argument=<Bug-URL Hersteller>
+
+vendor-bug-url.description=\u00DCberschreibt die Bug-URL des Herstellers, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
+
+vendor-bug-url.usage=\  --vendor-bug-url <Bug-URL Hersteller>\n                            \u00DCberschreibt die Bug-URL des Herstellers, die im Build enthalten ist.\n                            Der Wert der Systemeigenschaft\n                            "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
+
+vendor-vm-bug-url.argument=<Hersteller-VM-Bug-URL>
+
+vendor-vm-bug-url.description=\u00DCberschreibt die VM-Bug-URL, die im Build enthalten ist. Die in\nVM-Fehlerlogs angezeigte URL lautet dann <Hersteller-VM-Bug-URL>.
+
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u00DCberschreibt die VM-Bug-URL, die im Build \n                            enthalten ist. Die in VM-Fehlerlogs angezeigte \n                            URL lautet dann <Hersteller-VM-Bug-URL>.
+
+vm.argument=<client|server|minimal|all>
+
+vm.description=W\u00E4hlt die HotSpot-VM im Ausgabeimage aus. Standardm\u00E4\u00DFig werden alle ausgew\u00E4hlt
+
+vm.usage=\  --vm <client|server|minimal|all>\n                            W\u00E4hlt die HotSpot-VM im Ausgabeimage aus.\n                            Standardm\u00E4\u00DFig werden alle ausgew\u00E4hlt
+
+zip.argument=[kommagetrennte Liste von Ressourcenpfaden]
+
+zip.description=ZIP-Komprimierung
+
+zip.usage=\  --zip [kommagetrennte Liste von Ressourcenpfaden]\n                            ZIP-Komprimierung
+
+include-locales.argument=<Sprachtag>[,<Sprachtag>]*
+
+include-locales.description=BCP 47-Sprachtags, durch Komma getrennt, die eine Gebietsschemazuordnung erlauben,\nwie in RFC 4647 definiert. Beispiel: en,ja,*-IN
+
+include-locales.usage=\  --include-locales <Sprachtag>[,<Sprachtag>]*\n                            BCP 47-Sprachtags durch Komma getrennt,\n                            die eine Gebietsschemazuordnung erlauben,\n                            wie in RFC 4647 definiert.\n                            Beispiel: en,ja,*-IN
+
+include-locales.missingpackages=fehlende Gebietsschema-Datenpackages in jdk.localedata:\n\t
+
+include-locales.nomatchinglocales=Keine \u00FCbereinstimmenden Gebietsschemas gefunden f\u00FCr "%s". Pr\u00FCfen Sie das angegebene Muster.
+
+include-locales.invalidtag=Ung\u00FCltiges Sprachtag: %s
+
+include-locales.localedatanotfound=Modul jdk.localedata wurde mit der Option --add-modules nicht angegeben
+
+main.status.ok=Funktional.
+
+main.status.not.ok= Nicht funktional.
+
+plugin.plugins.header=Liste der verf\u00FCgbaren Plug-in-Optionen:
+
+plugin.opt.list-plugins=\      --list-plugins                    Listet die verf\u00FCgbaren Plug-ins auf
+
+plugin.opt.post-process-path=\      --post-process-path <Imagedatei>   F\u00FChrt Nachverarbeitung eines vorhandenen Images aus
+
+plugin.opt.resources-last-sorter=\      --resources-last-sorter <Name>    Das letzte Plug-in, das Ressourcen\n                                        sortieren darf
+
+plugin.opt.disable-plugin=\      --disable-plugin <Plug-in-Name>     Deaktiviert das angegebene Plug-in
+
+plugin.opt.compress=\  -c, --compress=<0|1|2>                Aktiviert die Komprimierung von Ressourcen:\n                                          Ebene 0: Keine Komprimierung\n                                          Ebene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                                          Ebene 2: ZIP
+
+plugin.opt.strip-debug=\  -G, --strip-debug                     Entfernt Debuginformationen
+
+plugin.opt.no-man-pages=\      --no-man-pages                    Schlie\u00DFt Manpages aus
+
+plugin.opt.no-header-files=\      --no-header-files                 Schlie\u00DFt Headerdateien aus
+
+main.plugin.name=Plug-in-Name
+
+main.plugin.class=Plug-in-Klasse
+
+main.plugin.module=Plug-in-Modul
+
+main.plugin.category=Kategorie
+
+main.plugin.description=Beschreibung
+
+main.plugin.post.processors=Imagepostprozessoren:
+
+main.plugin.argument=Argument
+
+main.plugin.range.from=Bereich von
+
+main.plugin.range.to=bis
+
+main.plugin.option=Option
+
+main.plugin.no.value=<leer>
+
+main.plugin.state=Funktionsstatus
+
+err.no.such.plugin=Plug-in nicht vorhanden: {0}
+
+err.provider.not.functional=Der Provider {0} ist nicht funktionsf\u00E4hig.
+
+err.plugin.mutiple.options=Mehrere Plug-ins aktiviert von Option {0}
+err.plugin.conflicts={0} ({1}) steht im Konflikt mit {2}. Verwenden Sie nur eine der Optionen, nicht beide.
+err.provider.additional.arg.error=Fehler bei der Angabe eines zus\u00E4tzlichen Arguments in der {0}-Option: {1}
+
+err.no.plugins.path=Kein Argument f\u00FCr Plug-in-Pfad.
+
+err.dir.already.exits=Verzeichnis ist bereits vorhanden: {0}
+
+err.invalid.index=ung\u00FCltiger Index f\u00FCr Option {0}
+
+err.plugin.option.not.set=Option {0} muss festgelegt werden
+
+warn.thirdparty.plugins=Das Aktivieren von Plug-ins anderer Hersteller kann dazu f\u00FChren, dass ein nicht verwendbares Image generiert wird.
+
+warn.thirdparty.plugins.enabled=Sie haben Plug-ins anderer Hersteller aktiviert.
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
new file mode 100644
index 00000000000..4b290ad2eb2
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
@@ -0,0 +1,224 @@
+#
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+add-options.argument=<options>
+
+add-options.description=\u6307\u5B9A\u3057\u305F<options>\u6587\u5B57\u5217\u3092\u5148\u982D\u306B\u4ED8\u52A0\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\n\u751F\u6210\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8D77\u52D5\u3059\u308B\u969B\u306B\u3001\n\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u524D\u306B\u7A7A\u767D\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
+
+add-options.usage=\  --add-options <options>   \u6307\u5B9A\u3057\u305F<options>\u6587\u5B57\u5217\u3092\u5148\u982D\u306B\u4ED8\u52A0\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\n                            \u751F\u6210\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8D77\u52D5\u3059\u308B\u969B\u306B\u3001\n                            \u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u524D\u306B\u7A7A\u767D\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
+
+release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
+
+release-info.description=<file>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EA\u30EA\u30FC\u30B9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\nadd:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n\u4EFB\u610F\u306E\u6570\u306E<key>=<value>\u306E\u30DA\u30A2\u3092\u6E21\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\ndel:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AD\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002
+
+release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EA\u30EA\u30FC\u30B9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\n                            \u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n                            add:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n                            \u4EFB\u610F\u306E\u6570\u306E<key>=<value>\u30DA\u30A2\u3092\u6E21\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n                            del:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AD\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002
+
+class-for-name.argument=
+
+class-for-name.description=\u30AF\u30E9\u30B9\u306E\u6700\u9069\u5316: Class.forName\u547C\u51FA\u3057\u3092\u5B9A\u6570\u306E\u30ED\u30FC\u30C9\u306B\u5909\u63DB\u3057\u307E\u3059\u3002
+
+class-for-name.usage=\  --class-for-name          \u30AF\u30E9\u30B9\u306E\u6700\u9069\u5316: Class.forName\u547C\u51FA\u3057\u3092\u5B9A\u6570\u306E\u30ED\u30FC\u30C9\u306B\u5909\u63DB\u3057\u307E\u3059\u3002
+
+compress.argument=<0|1|2>[:filter=<pattern-list>]
+
+compress.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n\u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n\u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n\u30EC\u30D9\u30EB2: ZIP\u3002\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306E<pattern-list>\u30D5\u30A3\u30EB\u30BF\u3092\u6307\u5B9A\u3057\u3066\u3001\u542B\u3081\u308B\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30BF\u30FC\u30F3\u3092\n\u30EA\u30B9\u30C8\u3067\u304D\u307E\u3059\u3002
+
+compress.usage=\  --compress <0|1|2>[:filter=<pattern-list>]\n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n                            \u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n                            \u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n                            \u30EC\u30D9\u30EB2: ZIP\u3002\n                            \u30AA\u30D7\u30B7\u30E7\u30F3\u306E<pattern-list>\u30D5\u30A3\u30EB\u30BF\u3092\n                            \u6307\u5B9A\u3057\u3066\u3001\u542B\u3081\u308B\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30BF\u30FC\u30F3\u3092\n                            \u30EA\u30B9\u30C8\u3067\u304D\u307E\u3059\u3002
+
+compact-cp.argument=<resource paths>
+
+compact-cp.description=\u5B9A\u6570\u30D7\u30FC\u30EB\u6587\u5B57\u5217\u3092\u5171\u6709\u3057\u307E\u3059\u3002\n\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\u30EA\u30BD\u30FC\u30B9\u306E\u30BB\u30C3\u30C8\u3092\n\u5727\u7E2E\u3059\u308B\u304B\u3057\u306A\u3044\u304B\u3092\u8868\u3057\u307E\u3059(\u5426\u5B9A\u306E\u5834\u5408\u306F^\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002
+
+compact-cp.usage=\ --compact-cp <resource paths>\n                             \u5B9A\u6570\u30D7\u30FC\u30EB\u6587\u5B57\u5217\u3092\u5171\u6709\u3057\u307E\u3059\u3002\n                             \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n                             \u30EA\u30BD\u30FC\u30B9\u306E\u30BB\u30C3\u30C8\u3092\u5727\u7E2E\u3059\u308B\u304B\u3057\u306A\u3044\u304B\n                             \u3092\u8868\u3057\u307E\u3059(\u5426\u5B9A\u306E\u5834\u5408\u306F^\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002
+
+dedup-legal-notices.argument=[error-if-not-same-content]
+
+dedup-legal-notices.description=\u3059\u3079\u3066\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u91CD\u8907\u3092\u9664\u5916\u3057\u307E\u3059\u3002\nerror-if-not-same-content\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u540D\u306E2\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304C\n\u7570\u306A\u3063\u3066\u3044\u308B\u3068\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
+
+dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            \u3059\u3079\u3066\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u91CD\u8907\u3092\u9664\u5916\u3057\u307E\u3059\u3002\n                            error-if-not-same-content\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\n                            \u540C\u3058\u30D5\u30A1\u30A4\u30EB\u540D\u306E2\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u7570\u306A\u3063\u3066\u3044\u308B\u3068\n                            \u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
+
+exclude-files.argument=\u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u306E<pattern-list> 
+
+exclude-files.description=\u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B: **.java,glob:/java.base/lib/client/**
+
+exclude-files.usage=\  --exclude-files <pattern-list>\n                            \u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u4F8B: **.java,glob:/java.base/lib/client/**
+
+exclude-resources.argument=\u9664\u5916\u3059\u308B<pattern-list>\u306E\u30EA\u30BD\u30FC\u30B9
+
+exclude-resources.description=\u9664\u5916\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B: **.jcov,glob:**/META-INF/**
+
+exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            \u9664\u5916\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u4F8B: **.jcov,glob:**/META-INF/**
+
+exclude-jmod-section.argument=<section-name>\n\u3053\u3053\u3067\u3001<section-name>\u306F"man"\u307E\u305F\u306F"headers"\u3067\u3059\u3002
+
+exclude-jmod-section.description=\u9664\u5916\u3059\u308BJMOD\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
+
+exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            \u9664\u5916\u3059\u308BJMOD\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u3053\u3053\u3067\u3001<section-name> \u306F"man"\u307E\u305F\u306F"headers"\u3067\u3059\u3002
+
+
+generate-cds-archive.description=CDS\u30D7\u30E9\u30B0\u30A4\u30F3: \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3067CDS\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001cds\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n
+generate-cds-archive.usage=\  --generate-cds-archive    \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3067CDS\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001\n                            cds\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u751F\u6210\u3057\u307E\u3059\u3002
+
+generate-jli-classes.argument=@filename
+
+generate-jli-classes.description=\u4E8B\u524D\u751F\u6210\u3059\u308Bjava.lang.invoke\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002 \n\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u4E8B\u524D\u751F\u6210\u3059\u308B\u30AF\u30E9\u30B9\u306E\u7D44\u8FBC\u307F\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 \n\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u3001\u4F5C\u6210\u3055\u308C\u308B\u30A4\u30E1\u30FC\u30B8\u3068\u7570\u306A\u308B\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u3001\n\u30B3\u30FC\u30C9\u306E\u751F\u6210\u306F\u6B63\u78BA\u6027\u3092\u4FDD\u8A3C\u3059\u308B\u305F\u3081\u306B\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n\u3053\u308C\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306Fignore-version=true\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002
+
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            \u4E8B\u524D\u751F\u6210\u3059\u308Bjava.lang.invoke\u30AF\u30E9\u30B9\u3092\n                            \u30EA\u30B9\u30C8\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\n                            \u4E8B\u524D\u751F\u6210\u3059\u308B\u30AF\u30E9\u30B9\u306E\u7D44\u8FBC\u307F\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n                            \u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u3001\u4F5C\u6210\u3055\u308C\u308B\u30A4\u30E1\u30FC\u30B8\u3068\u7570\u306A\u308B\n                            \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u3001\u30B3\u30FC\u30C9\u306E\u751F\u6210\u306F\u6B63\u78BA\u6027\u3092\u4FDD\u8A3C\u3059\u308B\u305F\u3081\u306B\u3001\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n                            \u3053\u308C\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306Fignore-version=true\n                            \u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002
+
+system-modules.argument=retainModuleTarget
+
+system-modules.description=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306E\u9AD8\u901F\u30ED\u30FC\u30C9(\u5E38\u306B\u6709\u52B9)
+
+system-modules.usage=\  --system-modules retainModuleTarget\n                            \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306E\u9AD8\u901F\u30ED\u30FC\u30C9(\u5E38\u306B\u6709\u52B9)
+
+onoff.argument=<on|off>
+
+order-resources.argument=\u512A\u5148\u5EA6\u9806\u306E\u30D1\u30B9\u306E<pattern-list>\u3002@file\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\n\u5404\u884C\u306F\u3001\u30D1\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u308B\u305F\u3081\u306B\u5B8C\u5168\u306B\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+order-resources.description=\u30EA\u30BD\u30FC\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u307E\u3059\u3002\u4F8B: **/module-info.class,@classlist,/java.base/java/lang/**
+
+order-resources.usage=\  --order-resources <pattern-list>\n                            \u30EA\u30BD\u30FC\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u307E\u3059\u3002 \n                            \u4F8B: **/module-info.class,@classlist,\n                            /java.base/java/lang/**
+
+strip-debug.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+
+strip-debug.usage=\  --strip-debug             \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+
+strip-java-debug-attributes.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304B\u3089Java\u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059
+
+strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304B\u3089Java\n                            \u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059
+
+strip-native-commands.description=\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9(java/java.exe\u306A\u3069)\u3092\u9664\u5916\u3057\u307E\u3059
+
+strip-native-commands.usage=\  --strip-native-commands   \u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9(java/java.exe\u306A\u3069)\n                            \u3092\u9664\u5916\u3057\u307E\u3059\u3002
+
+vendor-version.argument=<vendor-version>
+
+vendor-version.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217(\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408)\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3"java.vendor.version"\u306E\u5024\u306F<vendor-version>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-version.usage=\  --vendor-version <vendor-version>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217(\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408)\u3092\n                            \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\n                            "java.vendor.version"\u306E\u5024\u306F<vendor-version>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-bug-url.argument=<vendor-bug-url>
+
+vendor-bug-url.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3"java.vendor.url.bug"\u306E\u5024\u306F<vendor-url-bug>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n                            \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\n                            "java.vendor.url.bug"\u306E\u5024\u306F<vendor-url-bug>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-vm-bug-url.argument=<vendor-vm-bug-url>
+
+vendor-vm-bug-url.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FCVM\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\nVM\u30A8\u30E9\u30FC\u30FB\u30ED\u30B0\u306B\u8868\u793A\u3055\u308C\u308BURL\u306F<vendor-vm-bug-url>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FCVM\u30D0\u30B0URL\u3092\n                            \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002VM\u30A8\u30E9\u30FC\u30FB\u30ED\u30B0\u306B\n                           \u8868\u793A\u3055\u308C\u305FURL\u306F<vendor-vm-bug-url>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vm.argument=<client|server|minimal|all>
+
+vm.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067HotSpot VM\u3092\u9078\u629E\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306Fall\u3067\u3059
+
+vm.usage=\  --vm <client|server|minimal|all>\n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067HotSpot VM\u3092\u9078\u629E\u3057\u307E\u3059\u3002\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u306Fall\u3067\u3059
+
+zip.argument=[\u30EA\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8]
+
+zip.description=ZIP\u5727\u7E2E
+
+zip.usage=\  --zip [\u30EA\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8]\n                            ZIP\u5727\u7E2E
+
+include-locales.argument=<langtag>[,<langtag>]*
+
+include-locales.description=BCP 47\u8A00\u8A9E\u30BF\u30B0\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001RFC 4647\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\n\u30ED\u30B1\u30FC\u30EB\u306E\u4E00\u81F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4F8B: en,ja,*-IN
+
+include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            BCP 47\u8A00\u8A9E\u30BF\u30B0\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001RFC 4647\u3067\n                            \u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\n                            \u30ED\u30B1\u30FC\u30EB\u306E\u4E00\u81F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n                            \u4F8B: en,ja,*-IN
+
+include-locales.missingpackages=jdk.localedata\u306B\u30ED\u30B1\u30FC\u30EB\u30FB\u30C7\u30FC\u30BF\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u3042\u308A\u307E\u305B\u3093:\n\t
+
+include-locales.nomatchinglocales="%s"\u306B\u4E00\u81F4\u3059\u308B\u30ED\u30B1\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6307\u5B9A\u3057\u305F\u30D1\u30BF\u30FC\u30F3\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+
+include-locales.invalidtag=\u8A00\u8A9E\u30BF\u30B0\u304C\u7121\u52B9\u3067\u3059: %s
+
+include-locales.localedatanotfound=jdk.localedata\u30E2\u30B8\u30E5\u30FC\u30EB\u306F--add-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+
+main.status.ok=\u52D5\u4F5C\u3057\u3066\u3044\u307E\u3059\u3002
+
+main.status.not.ok= \u52D5\u4F5C\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+
+plugin.plugins.header=\u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8:
+
+plugin.opt.list-plugins=\      --list-plugins                    \u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+
+plugin.opt.post-process-path=\      --post-process-path <imagefile>   \u65E2\u5B58\u306E\u30A4\u30E1\u30FC\u30B8\u306E\u5F8C\u51E6\u7406\u3092\u884C\u3044\u307E\u3059
+
+plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    \u6700\u5F8C\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u30EA\u30BD\u30FC\u30B9\u306E\u30BD\u30FC\u30C8\u3092\n                                        \u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059
+
+plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     \u6307\u5B9A\u3057\u305F\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
+
+plugin.opt.compress=\  -c, --compress=<0|1|2>                \u30EA\u30BD\u30FC\u30B9\u306E\u5727\u7E2E\u3092\u6709\u52B9\u306B\u3057\u307E\u3059:\n                                          \u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n                                          \u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n                                          \u30EC\u30D9\u30EB2: ZIP
+
+plugin.opt.strip-debug=\  -G, --strip-debug                     \u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+
+plugin.opt.no-man-pages=\      --no-man-pages                    man\u30DA\u30FC\u30B8\u3092\u9664\u5916\u3057\u307E\u3059
+
+plugin.opt.no-header-files=\      --no-header-files                 \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u30FB\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u9664\u5916\u3057\u307E\u3059
+
+main.plugin.name=\u30D7\u30E9\u30B0\u30A4\u30F3\u540D
+
+main.plugin.class=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9
+
+main.plugin.module=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB
+
+main.plugin.category=\u30AB\u30C6\u30B4\u30EA
+
+main.plugin.description=\u8AAC\u660E
+
+main.plugin.post.processors=\u30A4\u30E1\u30FC\u30B8\u30FB\u30DD\u30B9\u30C8\u30FB\u30D7\u30ED\u30BB\u30C3\u30B5:
+
+main.plugin.argument=\u5F15\u6570
+
+main.plugin.range.from=\u7BC4\u56F2: \u81EA
+
+main.plugin.range.to=\u81F3
+
+main.plugin.option=\u30AA\u30D7\u30B7\u30E7\u30F3
+
+main.plugin.no.value=<empty>
+
+main.plugin.state=\u6A5F\u80FD\u72B6\u614B
+
+err.no.such.plugin=\u3053\u306E\u3088\u3046\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u3042\u308A\u307E\u305B\u3093: {0}
+
+err.provider.not.functional=\u30D7\u30ED\u30D0\u30A4\u30C0{0}\u306F\u6A5F\u80FD\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+
+err.plugin.mutiple.options=\u8907\u6570\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C{0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3088\u3063\u3066\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059
+err.plugin.conflicts={0} ({1})\u304C{2}\u3068\u77DB\u76FE\u3057\u3066\u3044\u307E\u3059\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3057\u3001\u4E21\u65B9\u3092\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+err.provider.additional.arg.error={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8FFD\u52A0\u306E\u5F15\u6570\u6307\u5B9A\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059: {1}
+
+err.no.plugins.path=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30D1\u30B9\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+
+err.dir.already.exits=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059: {0}
+
+err.invalid.index=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306E\u7D22\u5F15\u304C\u7121\u52B9\u3067\u3059
+
+err.plugin.option.not.set=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+
+warn.thirdparty.plugins=\u30B5\u30FC\u30C9\u30FB\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\u3068\u3001\u4F7F\u7528\u3067\u304D\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u304C\u751F\u6210\u3055\u308C\u307E\u3059\u3002
+
+warn.thirdparty.plugins.enabled=\u30B5\u30FC\u30C9\u30FB\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3057\u305F\u3002
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
new file mode 100644
index 00000000000..9d92ffae362
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
@@ -0,0 +1,224 @@
+#
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+add-options.argument=<options>
+
+add-options.description=\u5728\u751F\u6210\u7684\u6620\u50CF\u4E2D\u8C03\u7528\u865A\u62DF\u673A\u65F6\uFF0C\u5728\u4EFB\u4F55\n\u5176\u4ED6\u9009\u9879\u4E4B\u524D\u6DFB\u52A0\u6307\u5B9A\u7684 <options> \u5B57\u7B26\u4E32\n\uFF08\u53EF\u80FD\u5305\u542B\u7A7A\u683C\uFF09\u3002
+
+add-options.usage=\  --add-options <options>   \u5728\u751F\u6210\u7684\u6620\u50CF\u4E2D\u8C03\u7528\u865A\u62DF\u673A\u65F6\uFF0C\u5728\u4EFB\u4F55\u5176\u4ED6\n                            \u9009\u9879\u4E4B\u524D\u6DFB\u52A0\u6307\u5B9A\u7684 <options> \u5B57\u7B26\u4E32\n                            \uFF08\u53EF\u80FD\u5305\u542B\u7A7A\u683C\uFF09\u3002
+
+release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
+
+release-info.description=<file> \u9009\u9879\uFF1A\u4ECE\u63D0\u4F9B\u7684\u6587\u4EF6\u52A0\u8F7D release \u5C5E\u6027\u3002\nadd\uFF1A\u5411 'release' \u6587\u4EF6\u4E2D\u6DFB\u52A0\u5C5E\u6027\u3002\n\u53EF\u4EE5\u4F20\u9012\u4EFB\u610F\u6570\u91CF\u7684 <key>=<value> \u5BF9\u3002\ndel\uFF1A\u5220\u9664 release \u6587\u4EF6\u4E2D\u7684\u5173\u952E\u5B57\u5217\u8868\u3002
+
+release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file> \u9009\u9879\uFF1A\u4ECE\u63D0\u4F9B\u7684\u6587\u4EF6\n                            \u52A0\u8F7D release \u5C5E\u6027\u3002\n                            add\uFF1A\u5411 'release' \u6587\u4EF6\u4E2D\u6DFB\u52A0\u5C5E\u6027\u3002\n                            \u53EF\u4EE5\u4F20\u9012\u4EFB\u610F\u6570\u91CF\u7684 <key>=<value> \u5BF9\u3002\n                            del\uFF1A\u5220\u9664 release \u6587\u4EF6\u4E2D\u7684\u5173\u952E\u5B57\u5217\u8868\u3002
+
+class-for-name.argument=
+
+class-for-name.description=\u7C7B\u4F18\u5316\uFF1A\u5C06 Class.forName \u8C03\u7528\u8F6C\u6362\u4E3A\u5E38\u91CF\u8D1F\u8F7D\u3002
+
+class-for-name.usage=\  --class-for-name          \u7C7B\u4F18\u5316\uFF1A\u5C06 Class.forName \u8C03\u7528\u8F6C\u6362\u4E3A\u5E38\u91CF\u8D1F\u8F7D\u3002
+
+compress.argument=<0|1|2>[:filter=<pattern-list>]
+
+compress.description=\u538B\u7F29\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u6240\u6709\u8D44\u6E90\u3002\n\u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n\u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n\u7EA7\u522B 2\uFF1AZIP\u3002\n\u53EF\u4EE5\u5C06\u53EF\u9009 <pattern-list> \u7B5B\u9009\u5668\u6307\u5B9A\u4E3A\u8981\u5305\u62EC\u7684\n\u6587\u4EF6\u7684\u6A21\u5F0F\u3002
+
+compress.usage=\  --compress <0|1|2>[:filter=<pattern-list>]\n                            \u538B\u7F29\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u6240\u6709\u8D44\u6E90\u3002\n                            \u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n                            \u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n                            \u7EA7\u522B 2\uFF1AZIP\u3002\n                            \u53EF\u4EE5\u5C06\u53EF\u9009 <pattern-list> \n                            \u7B5B\u9009\u5668\u6307\u5B9A\u4E3A\u8981\u5305\u62EC\u7684\n                            \u6587\u4EF6\u7684\u6A21\u5F0F\u3002
+
+compact-cp.argument=<resource paths>
+
+compact-cp.description=\u5E38\u91CF\u6C60\u5B57\u7B26\u4E32\u5171\u4EAB\u3002\n\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u4F1A\u538B\u7F29\u6240\u6709\u8D44\u6E90\u3002\u60A8\u53EF\u4EE5\u8868\u793A\u8981\u538B\u7F29\u6216\n\u4E0D\u538B\u7F29\u7684\u8D44\u6E90\u96C6\uFF08\u4F7F\u7528 ^ \u8868\u793A\u5426\u5B9A\uFF09\u3002
+
+compact-cp.usage=\ --compact-cp <resource paths>\n                             \u5E38\u91CF\u6C60\u5B57\u7B26\u4E32\u5171\u4EAB\u3002\n                             \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u4F1A\u538B\u7F29\u6240\u6709\u8D44\u6E90\u3002\n                             \u60A8\u53EF\u4EE5\u8868\u793A\u8981\u538B\u7F29\u6216\u4E0D\u538B\u7F29\u7684\n                             \u8D44\u6E90\u96C6\uFF08\u4F7F\u7528 ^ \u8868\u793A\u5426\u5B9A\uFF09\u3002
+
+dedup-legal-notices.argument=[error-if-not-same-content]
+
+dedup-legal-notices.description=\u5220\u9664\u6240\u6709\u6CD5\u5F8B\u58F0\u660E\u4E2D\u7684\u91CD\u590D\u6570\u636E\u3002\u5982\u679C\u6307\u5B9A\n\u4E86 error-if-not-same-content\uFF0C\u5219\u5728\u4E24\u4E2A\u540C\u540D\u7684\u6587\u4EF6\n\u4E0D\u540C\u65F6\u5C06\u51FA\u73B0\u9519\u8BEF\u3002
+
+dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            \u5220\u9664\u6240\u6709\u6CD5\u5F8B\u58F0\u660E\u4E2D\u7684\u91CD\u590D\u6570\u636E\u3002\n                            \u5982\u679C\u6307\u5B9A\u4E86 error-if-not-same-content\uFF0C\n                            \u5219\u5728\u4E24\u4E2A\u540C\u540D\u7684\u6587\u4EF6\u4E0D\u540C\u65F6\n                            \u5C06\u51FA\u73B0\u9519\u8BEF\u3002
+
+exclude-files.argument=\u8981\u6392\u9664\u7684\u6587\u4EF6\u7684 <pattern-list>
+
+exclude-files.description=\u6307\u5B9A\u8981\u6392\u9664\u7684\u6587\u4EF6\u3002\u4F8B\u5982\uFF1A**.java,glob:/java.base/lib/client/**
+
+exclude-files.usage=\  --exclude-files <pattern-list>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684\u6587\u4EF6\u3002\n                            \u4F8B\u5982\uFF1A**.java,glob:/java.base/lib/client/**
+
+exclude-resources.argument=\u8981\u6392\u9664\u7684 <pattern-list> \u8D44\u6E90
+
+exclude-resources.description=\u6307\u5B9A\u8981\u6392\u9664\u7684\u8D44\u6E90\u3002\u4F8B\u5982\uFF1A**.jcov,glob:**/META-INF/**
+
+exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684\u8D44\u6E90\u3002\n                            \u4F8B\u5982\uFF1A**.jcov,glob:**/META-INF/**
+
+exclude-jmod-section.argument=<section-name>\n\u5176\u4E2D\uFF0C<section-name> \u662F "man" \u6216 "headers"\u3002
+
+exclude-jmod-section.description=\u6307\u5B9A\u8981\u6392\u9664\u7684 JMOD \u8282
+
+exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684 JMOD \u8282\u3002\n                            \u5176\u4E2D\uFF0C<section-name> \u662F "man" \u6216 "headers"\u3002
+
+
+generate-cds-archive.description=CDS \u63D2\u4EF6\uFF1A\u5982\u679C\u8FD0\u884C\u65F6\u6620\u50CF\u652F\u6301 CDS \u529F\u80FD\uFF0C\u5219\u751F\u6210 CDS \u6863\u6848\u3002\n
+generate-cds-archive.usage=\  --generate-cds-archive    \u5982\u679C\u8FD0\u884C\u65F6\u6620\u50CF\u652F\u6301 CDS \u529F\u80FD\uFF0C\n                            \u5219\u751F\u6210 CDS \u6863\u6848\u3002
+
+generate-jli-classes.argument=@filename
+
+generate-jli-classes.description=\u6307\u5B9A\u4E00\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D\u5217\u51FA\u4E86\u8981\u9884\u5148\u751F\u6210\u7684 java.lang.invoke \u7C7B\u3002\n\u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6B64\u63D2\u4EF6\u53EF\u4EE5\u4F7F\u7528\u8981\u9884\u5148\u751F\u6210\u7684\u5185\u7F6E\u7C7B\u5217\u8868\u3002\n\u5982\u679C\u6B64\u63D2\u4EF6\u4E0E\u6B63\u5728\u521B\u5EFA\u7684\u6620\u50CF\u5728\u4E0D\u540C\u7684\u8FD0\u884C\u65F6\u7248\u672C\u4E0A\u8FD0\u884C\uFF0C\n\u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5C06\u7981\u7528\u4EE3\u7801\u751F\u6210\u4EE5\u786E\u4FDD\n\u6B63\u786E\u6027 - \u6DFB\u52A0 iignore-version=true \u53EF\u8986\u76D6\u6B64\u9879\u3002
+
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            \u6307\u5B9A\u4E00\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D\u5217\u51FA\u4E86\u8981\n                            \u9884\u5148\u751F\u6210\u7684 java.lang.invoke \u7C7B\u3002\n                            \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6B64\u63D2\u4EF6\u53EF\u4EE5\u4F7F\u7528\n                            \u8981\u9884\u5148\u751F\u6210\u7684\u5185\u7F6E\u7C7B\u5217\u8868\u3002\u5982\u679C\u6B64\u63D2\u4EF6\u4E0E\n                            \u6B63\u5728\u521B\u5EFA\u7684\u6620\u50CF\u5728\u4E0D\u540C\u7684\u8FD0\u884C\u65F6\u7248\u672C\u4E0A\u8FD0\u884C\uFF0C\n                            \u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5C06\u7981\u7528\u4EE3\u7801\u751F\u6210\u4EE5\u786E\u4FDD\n                            \u6B63\u786E\u6027 - \u6DFB\u52A0 iignore-version=true\n                            \u53EF\u8986\u76D6\u6B64\u9009\u9879\u3002
+
+system-modules.argument=retainModuleTarget
+
+system-modules.description=\u5FEB\u901F\u52A0\u8F7D\u6A21\u5757\u63CF\u8FF0\u7B26\uFF08\u59CB\u7EC8\u542F\u7528\uFF09
+
+system-modules.usage=\  --system-modules retainModuleTarget\n                            \u5FEB\u901F\u52A0\u8F7D\u6A21\u5757\u63CF\u8FF0\u7B26\uFF08\u59CB\u7EC8\u542F\u7528\uFF09
+
+onoff.argument=<on|off>
+
+order-resources.argument=\u4F18\u5148\u7EA7\u987A\u5E8F\u4E2D\u8DEF\u5F84\u7684 <pattern-list>\u3002\u5982\u679C\n\u6307\u5B9A\u4E86 @file\uFF0C\u5219\u6BCF\u884C\u90FD\u5E94\u662F\u8981\u6392\u5E8F\u7684\u8DEF\u5F84\u7684\u5B8C\u5168\u5339\u914D\u9879
+
+order-resources.description=\u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u3002\u4F8B\u5982\uFF1A**/module-info.class,@classlist,/java.base/java/lang/**
+
+order-resources.usage=\  --order-resources <pattern-list>\n                            \u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u3002\n                            \u4F8B\u5982\uFF1A**/module-info.class,@classlist,\n                            /java.base/java/lang/**
+
+strip-debug.description=\u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+
+strip-debug.usage=\  --strip-debug             \u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+
+strip-java-debug-attributes.description=\u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u7C7B\u4E2D\u53BB\u9664 Java \u8C03\u8BD5\u4FE1\u606F
+
+strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            \u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u7C7B\u4E2D\n                            \u53BB\u9664 Java \u8C03\u8BD5\u5C5E\u6027
+
+strip-native-commands.description=\u4ECE\u6620\u50CF\u4E2D\u6392\u9664\u672C\u673A\u547D\u4EE4\uFF08\u5982 java/java.exe\uFF09
+
+strip-native-commands.usage=\  --strip-native-commands   \u4ECE\u6620\u50CF\u4E2D\u6392\u9664\u672C\u673A\u547D\u4EE4\n                            \uFF08\u5982 java/java.exe\uFF09\u3002
+
+vendor-version.argument=<vendor-version>
+
+vendor-version.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546\u7248\u672C\u5B57\u7B26\u4E32\uFF08\u5982\u679C\u6709\uFF09\u3002\n\u7CFB\u7EDF\u5C5E\u6027 "java.vendor.version" \u7684\u503C\u5C06\u4E3A <vendor-version>\u3002
+
+vendor-version.usage=\  --vendor-version <vendor-version>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546\u7248\u672C\u5B57\u7B26\u4E32\n                            \uFF08\u5982\u679C\u6709\uFF09\u3002\u7CFB\u7EDF\u5C5E\u6027 "java.vendor.version" \u7684\n                            \u503C\u5C06\u4E3A <vendor-version>\u3002
+
+vendor-bug-url.argument=<vendor-bug-url>
+
+vendor-bug-url.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 Bug URL\u3002\u7CFB\u7EDF\n\u5C5E\u6027 "java.vendor.url.bug" \u7684\u503C\u5C06\u4E3A <vendor-url-bug>\u3002
+
+vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 Bug URL\u3002\n                            \u7CFB\u7EDF\u5C5E\u6027 "java.vendor.url.bug" \u7684\n                            \u503C\u5C06\u4E3A <vendor-url-bug>\u3002
+
+vendor-vm-bug-url.argument=<vendor-vm-bug-url>
+
+vendor-vm-bug-url.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 VM Bug URL\u3002VM \u9519\u8BEF\n\u65E5\u5FD7\u4E2D\u663E\u793A\u7684 URL \u5C06\u4E3A <vendor-vm-bug-url>\u3002
+
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 VM Bug URL\u3002\n                            VM \u9519\u8BEF\u65E5\u5FD7\u4E2D\u663E\u793A\u7684 URL \u5C06\n                            \u4E3A <vendor-vm-bug-url>\u3002
+
+vm.argument=<client|server|minimal|all>
+
+vm.description=\u5728\u8F93\u51FA\u6620\u50CF\u4E2D\u9009\u62E9 HotSpot VM\u3002\u9ED8\u8BA4\u503C\u4E3A all
+
+vm.usage=\  --vm <client|server|minimal|all>\n                            \u5728\u8F93\u51FA\u6620\u50CF\u4E2D\u9009\u62E9 HotSpot VM\u3002\n                            \u9ED8\u8BA4\u503C\u4E3A all
+
+zip.argument=[\u9017\u53F7\u5206\u9694\u7684\u8D44\u6E90\u8DEF\u5F84\u5217\u8868]
+
+zip.description=ZIP \u538B\u7F29
+
+zip.usage=\  --zip [\u9017\u53F7\u5206\u9694\u7684\u8D44\u6E90\u8DEF\u5F84\u5217\u8868]\n                            ZIP \u538B\u7F29
+
+include-locales.argument=<langtag>[,<langtag>]*
+
+include-locales.description=\u9017\u53F7\u5206\u9694\u7684 BCP 47 \u8BED\u8A00\u6807\u8BB0\uFF0C\u5141\u8BB8\u4F7F\u7528\u5728 RFC 4647 \u4E2D\u5B9A\u4E49\u7684\n\u533A\u57DF\u8BBE\u7F6E\u5339\u914D\u3002\u4F8B\u5982\uFF1Aen,ja,*-IN
+
+include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            \u9017\u53F7\u5206\u9694\u7684 BCP 47 \u8BED\u8A00\u6807\u8BB0\uFF0C\n                            \u5141\u8BB8\u4F7F\u7528\n                            \u5728 RFC 4647 \u4E2D\u5B9A\u4E49\u7684\u533A\u57DF\u8BBE\u7F6E\u5339\u914D\u3002\n                            \u4F8B\u5982\uFF1Aen,ja,*-IN
+
+include-locales.missingpackages=jdk.localedata \u4E2D\u7F3A\u5C11\u533A\u57DF\u8BBE\u7F6E\u6570\u636E\u7A0B\u5E8F\u5305\uFF1A\n\t
+
+include-locales.nomatchinglocales=\u5BF9\u4E8E "%s"\uFF0C\u627E\u4E0D\u5230\u5339\u914D\u7684\u533A\u57DF\u8BBE\u7F6E\u3002\u8BF7\u68C0\u67E5\u6307\u5B9A\u7684\u6A21\u5F0F\u3002
+
+include-locales.invalidtag=\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BB0\uFF1A%s
+
+include-locales.localedatanotfound=\u672A\u4F7F\u7528 --add-modules \u9009\u9879\u6307\u5B9A jdk.localedata \u6A21\u5757
+
+main.status.ok=\u8D77\u4F5C\u7528\u3002
+
+main.status.not.ok= \u4E0D\u8D77\u4F5C\u7528\u3002
+
+plugin.plugins.header=\u53EF\u7528\u63D2\u4EF6\u9009\u9879\u7684\u5217\u8868\uFF1A
+
+plugin.opt.list-plugins=\      --list-plugins                    \u5217\u51FA\u53EF\u7528\u63D2\u4EF6
+
+plugin.opt.post-process-path=\      --post-process-path <imagefile>   \u5BF9\u73B0\u6709\u6620\u50CF\u8FDB\u884C\u540E\u5904\u7406
+
+plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    \u5141\u8BB8\u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u7684\n                                        \u6700\u540E\u4E00\u4E2A\u63D2\u4EF6
+
+plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     \u7981\u7528\u6240\u63D0\u53CA\u7684\u63D2\u4EF6
+
+plugin.opt.compress=\  -c, --compress=<0|1|2>                \u5BF9\u8D44\u6E90\u542F\u7528\u538B\u7F29\uFF1A\n                                          \u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n                                          \u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n                                          \u7EA7\u522B 2\uFF1AZIP
+
+plugin.opt.strip-debug=\  -G, --strip-debug                     \u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+
+plugin.opt.no-man-pages=\      --no-man-pages                    \u6392\u9664\u624B\u518C\u9875
+
+plugin.opt.no-header-files=\      --no-header-files                 \u6392\u9664\u5305\u542B\u6807\u5934\u6587\u4EF6
+
+main.plugin.name=\u63D2\u4EF6\u540D\u79F0
+
+main.plugin.class=\u63D2\u4EF6\u7C7B
+
+main.plugin.module=\u63D2\u4EF6\u6A21\u5757
+
+main.plugin.category=\u7C7B\u522B 
+
+main.plugin.description=\u8BF4\u660E
+
+main.plugin.post.processors=\u6620\u50CF\u540E\u5904\u7406\u7A0B\u5E8F\uFF1A
+
+main.plugin.argument=\u53C2\u6570
+
+main.plugin.range.from=\u8303\u56F4\u8D77\u70B9
+
+main.plugin.range.to=\u5230
+
+main.plugin.option=\u9009\u9879
+
+main.plugin.no.value=<\u7A7A>
+
+main.plugin.state=\u529F\u80FD\u72B6\u6001
+
+err.no.such.plugin=\u6CA1\u6709\u8FD9\u6837\u7684\u63D2\u4EF6\uFF1A{0}
+
+err.provider.not.functional=\u63D0\u4F9B\u65B9 {0} \u4E0D\u8D77\u4F5C\u7528\u3002
+
+err.plugin.mutiple.options={0} \u9009\u9879\u542F\u7528\u4E86\u591A\u4E2A\u63D2\u4EF6
+err.plugin.conflicts={0} ({1}) \u4E0E {2} \u51B2\u7A81\u3002\u8BF7\u4F7F\u7528\u5176\u4E2D\u7684\u4EFB\u610F\u4E00\u4E2A\uFF0C\u4F46\u4E0D\u80FD\u540C\u65F6\u4F7F\u7528\u4E8C\u8005\u3002
+err.provider.additional.arg.error={0} \u9009\u9879\u4E2D\u7684\u5176\u4ED6\u53C2\u6570\u89C4\u8303\u6709\u8BEF\uFF1A{1}
+
+err.no.plugins.path=\u6CA1\u6709\u63D2\u4EF6\u8DEF\u5F84\u53C2\u6570\u3002
+
+err.dir.already.exits=\u76EE\u5F55\u5DF2\u5B58\u5728\uFF1A{0}
+
+err.invalid.index=\u9009\u9879 {0} \u7684\u7D22\u5F15\u65E0\u6548
+
+err.plugin.option.not.set=\u5FC5\u987B\u8BBE\u7F6E\u9009\u9879 {0}\u3002
+
+warn.thirdparty.plugins=\u542F\u7528\u7B2C\u4E09\u65B9\u63D2\u4EF6\u53EF\u80FD\u4F1A\u5BFC\u81F4\u751F\u6210\u7684\u6620\u50CF\u65E0\u6CD5\u4F7F\u7528\u3002
+
+warn.thirdparty.plugins.enabled=\u60A8\u5DF2\u542F\u7528\u7B2C\u4E09\u65B9\u63D2\u4EF6\u3002
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
new file mode 100644
index 00000000000..993184fa2eb
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
@@ -0,0 +1,100 @@
+#
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.usage.summary=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-file>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+main.usage=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-Datei>\n
+error.prefix=Fehler:
+warn.prefix=Warnung:
+
+main.opt.mode=Hauptvorgangsmodi:
+main.opt.mode.create=create    - Erstellt ein neues jmod-Archiv
+main.opt.mode.extract=extract   - Extrahiert alle Dateien aus dem Archiv
+main.opt.mode.list=list      - Gibt die Namen aller Eintr\u00E4ge aus
+main.opt.mode.describe=describe  - Gibt die Moduldetails aus
+main.opt.mode.hash=hash      - Erfasst die Hashes gebundener Module.
+
+main.opt.help=Gibt diese Hilfemeldung aus
+main.opt.help-extra=Gibt Hilfe zu zus\u00E4tzlichen Optionen aus
+main.opt.version=Versionsinformationen
+main.opt.class-path=Anwendungs-JAR-Dateien|Verzeichnis mit den Klassen
+main.opt.libs=Speicherort der nativen Librarys
+main.opt.cmds=Speicherort der nativen Befehle
+main.opt.config=Speicherort der vom Benutzer editierbaren Konfigurationsdateien
+main.opt.extractDir=Zielverzeichnis f\u00FCr Extraktion
+main.opt.dry-run=Testlauf des Hashmodus
+main.opt.exclude=Schlie\u00DFt Dateien aus, die der angegebenen kommagetrennten Musterliste entsprechen. Jedes Element verwendet eines der folgenden Formate: <Globales Muster>, glob:<Globales Muster> oder regex:<Regex-Muster>
+main.opt.header-files=Speicherort der Headerdateien
+main.opt.legal-notices=Speicherort der rechtlichen Hinweise
+main.opt.module-version= Modulversion
+main.opt.main-class=Hauptklasse
+main.opt.main-class.arg=class-name
+main.opt.man-pages=Speicherort der Manpages
+main.opt.target-platform=Zielplattform
+main.opt.target-platform.arg=target-platform
+main.opt.module-path=Modulpfad
+main.opt.hash-modules=Berechnet und erfasst Hashes zur Bindung eines in ein Package integrierten Moduls an Module, die dem angegebenen <Regex-Muster> entsprechen und direkt oder indirekt davon abh\u00E4ngen. Die Hashes werden in der erstellten JMOD-Datei oder in einer JMOD- oder modularen JAR-Datei in dem Modulpfad erfasst, der im jmod-Hashbefehl angegeben ist.
+main.opt.do-not-resolve-by-default=Aus dem Standard-Root-Set von Modulen ausschlie\u00DFen
+main.opt.warn-if-resolved=Hinweis f\u00FCr ein Tool, eine Warnung auszugeben, wenn das Modul aufgel\u00F6st wird, entweder "deprecated", "deprecated-for-removal" oder "incubating"
+main.opt.date=Datum und Uhrzeit f\u00FCr die Zeitstempel von Eintr\u00E4gen, angegeben im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-8601. Beispiel: "2022-02-12T12:30:00-05:00"
+
+main.opt.cmdfile=Liest Optionen aus der angegebenen Datei
+
+module.hashes.recorded=Hashes werden im Modul {0} erfasst
+
+err.missing.mode=Eine der Modusangaben create, extract, list, describe oder hash muss angegeben werden
+err.invalid.mode=Als Modus muss create, extract, list, describe oder hash angegeben werden: {0}
+err.cannot.create.dir=Verzeichnis {0} kann nicht erstellt werden
+err.classpath.must.be.specified=--class-path muss angegeben werden
+err.jmod.must.be.specified=jmod-file muss angegeben werden
+err.invalid.version=ung\u00FCltige Modulversion {0}
+err.output.must.be.specified=--output muss angegeben werden
+err.mods.must.be.specified=--mods muss angegeben werden
+err.modulepath.must.be.specified=--module-path muss beim Hashing von Modulen angegeben werden
+err.invalid.main-class=ung\u00FCltiger main-class-Name: {0}
+err.path.not.found=Pfad nicht gefunden: {0}
+err.path.not.valid=ung\u00FCltiger Pfad: {0}
+err.path.not.a.dir=Pfad muss ein Verzeichnis sein: {0}
+err.invalid.class.path.entry=ung\u00FCltiger Classpath-Eintrag: {0}
+err.file.already.exists=Datei ist bereits vorhanden: {0}
+err.jmod.not.found=keine jmod-Datei gefunden: {0}
+err.bad.pattern=ung\u00FCltiges Muster {0}
+err.bad.WarnIfResolvedReason=Schlechter Grund: {0}, Grund muss entweder "deprecated", "deprecated-for-removal" oder "incubating" sein
+err.unknown.option=unbekannte Option(en): {0}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.internal.error=interner Fehler: {0} {1} {2}
+err.invalid.dryrun.option=--dry-run kann nur mit dem Hashmodus verwendet werden
+err.module.descriptor.not.found=Moduldeskriptor nicht gefunden
+err.missing.export.or.open.packages=Packages, die exportiert werden oder in {0} ge\u00F6ffnet sind, sind nicht vorhanden: {1}
+err.module.resolution.fail=Aufl\u00F6sung nicht erfolgreich: {0}
+err.no.moduleToHash=Keine Hashes erfasst: Kein mit {0} \u00FCbereinstimmendes Modul zum Erfassen von Hashes gefunden
+err.invalid.date=--date {0} ist kein erweitertes Datums- und Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-860: {1}
+err.date.out.of.range=--date {0} liegt nicht im g\u00FCltigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
+warn.invalid.arg=Ung\u00FCltiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
+warn.no.module.hashes=Keine Hashes erfasst: Kein Modul f\u00FCr Hashing angegeben, abh\u00E4ngig von {0}
+warn.ignore.entry=Eintrag {0} in Abschnitt {1} wird ignoriert
+warn.ignore.duplicate.entry=doppelter Eintrag {0} in Abschnitt {1} wird ignoriert
+
+
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
index 673526df269..e173a3e3a82 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
@@ -58,6 +58,7 @@ main.opt.module-path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9
 main.opt.hash-modules=\u6307\u5B9A\u306E<regex-pattern>\u306B\u4E00\u81F4\u3057\u3001\u76F4\u63A5\u307E\u305F\u306F\u9593\u63A5\u7684\u306B\u4F9D\u5B58\u3057\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7D50\u5408\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u3092\u8A08\u7B97\u304A\u3088\u3073\u8A18\u9332\u3057\u307E\u3059\u3002\u30CF\u30C3\u30B7\u30E5\u306F\u3001\u4F5C\u6210\u3055\u308C\u3066\u3044\u308BJMOD\u30D5\u30A1\u30A4\u30EB\u3001jmod hash\u30B3\u30DE\u30F3\u30C9\u3067\u6307\u5B9A\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306EJMOD\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30E9JAR\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
 main.opt.do-not-resolve-by-default=\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30EB\u30FC\u30C8\u8A2D\u5B9A\u304B\u3089\u9664\u5916\u3057\u307E\u3059
 main.opt.warn-if-resolved=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u8B66\u544A\u3092\u767A\u884C\u3059\u308B\u30C4\u30FC\u30EB\u306E\u30D2\u30F3\u30C8\u3002\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B
+main.opt.date=\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u65E5\u6642\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u66F8\u5F0F("2022-02-12T12:30:00-05:00"\u306A\u3069)\u3067ISO-8601\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
 
 main.opt.cmdfile=\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059
 
@@ -89,6 +90,8 @@ err.module.descriptor.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3
 err.missing.export.or.open.packages={0}\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u304B\u305D\u3053\u3067\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {1}
 err.module.resolution.fail=\u89E3\u6C7A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
 err.no.moduleToHash=\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}\u306B\u4E00\u81F4\u3057\u3001\u30CF\u30C3\u30B7\u30E5\u3092\u8A18\u9332\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+err.invalid.date=--date {0}\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u66F8\u5F0F: {1}\u3092\u6307\u5B9A\u3057\u305F\u3001\u6709\u52B9\u306AISO-8601\u306E\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+err.date.out.of.range=--date {0}\u306F\u6709\u52B9\u306A\u7BC4\u56F21980-01-01T00:00:02Z\u304B\u30892099-12-31T23:59:59Z\u306B\u3042\u308A\u307E\u305B\u3093
 warn.invalid.arg=\u7121\u52B9\u306A\u30AF\u30E9\u30B9\u540D\u307E\u305F\u306F\u30D1\u30B9\u540D\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
 warn.no.module.hashes=\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}\u306B\u4F9D\u5B58\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u306B\u5BFE\u3057\u3066\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 warn.ignore.entry=\u30BB\u30AF\u30B7\u30E7\u30F3{1}\u306E\u30A8\u30F3\u30C8\u30EA{0}\u3092\u7121\u8996\u3057\u307E\u3059
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
index 04a1b36b3b6..df4e0b27493 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
@@ -58,6 +58,7 @@ main.opt.module-path=\u6A21\u5757\u8DEF\u5F84
 main.opt.hash-modules=\u8BA1\u7B97\u548C\u8BB0\u5F55\u6563\u5217, \u4EE5\u5C06\u6253\u5305\u6A21\u5757\u7ED1\u5B9A\u5230\u4E0E\u6307\u5B9A <\u6B63\u5219\u8868\u8FBE\u5F0F\u6A21\u5F0F> \u5339\u914D\u5E76\u76F4\u63A5\u6216\u95F4\u63A5\u4F9D\u8D56\u4E8E\u7684\u6A21\u5757\u3002\u6563\u5217\u8BB0\u5F55\u5728\u6240\u521B\u5EFA\u7684 JMOD \u6587\u4EF6\u4E2D, \u6216\u8005\u8BB0\u5F55\u5728 jmod hash \u547D\u4EE4\u6307\u5B9A\u7684\u6A21\u5757\u8DEF\u5F84\u7684 JMOD \u6587\u4EF6\u6216\u6A21\u5757\u5316 JAR \u4E2D\u3002
 main.opt.do-not-resolve-by-default=\u4ECE\u9ED8\u8BA4\u6839\u6A21\u5757\u96C6\u4E2D\u6392\u9664
 main.opt.warn-if-resolved=\u63D0\u793A\u5DE5\u5177\u5728\u89E3\u6790\u6A21\u5757\u540E\u53D1\u51FA\u8B66\u544A\u3002\u53EF\u4EE5\u4E3A deprecated, deprecated-for-removal \u6216 incubating \u4E4B\u4E00
+main.opt.date=\u6761\u76EE\u65F6\u95F4\u6233\u7684\u65E5\u671F\u548C\u65F6\u95F4\uFF0C\u4EE5\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\u6307\u5B9A\uFF0C\u4F8B\u5982 "2022-02-12T12:30:00-05:00"
 
 main.opt.cmdfile=\u4ECE\u6307\u5B9A\u6587\u4EF6\u8BFB\u53D6\u9009\u9879
 
@@ -89,6 +90,8 @@ err.module.descriptor.not.found=\u627E\u4E0D\u5230\u6A21\u5757\u63CF\u8FF0\u7B26
 err.missing.export.or.open.packages=\u5728 {0} \u4E2D\u5BFC\u51FA\u6216\u6253\u5F00\u7684\u7A0B\u5E8F\u5305\u4E0D\u5B58\u5728: {1}
 err.module.resolution.fail=\u89E3\u6790\u5931\u8D25: {0}
 err.no.moduleToHash=\u672A\u8BB0\u5F55\u6563\u5217\uFF1A\u627E\u4E0D\u5230\u4E0E {0} \u5339\u914D\u7684\u6A21\u5757\u6765\u8BB0\u5F55\u6563\u5217
+err.invalid.date=--date {0} \u4E0D\u662F\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684\u6709\u6548 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\uFF1A{1}
+err.date.out.of.range=--date {0} \u4E0D\u5728 1980-01-01T00:00:02Z \u5230 2099-12-31T23:59:59Z \u8FD9\u4E00\u6709\u6548\u8303\u56F4\u5185
 warn.invalid.arg=\u7C7B\u540D\u65E0\u6548\u6216\u8DEF\u5F84\u540D\u4E0D\u5B58\u5728: {0}
 warn.no.module.hashes=\u672A\u8BB0\u5F55\u4EFB\u4F55\u6563\u5217: \u6CA1\u6709\u4E3A\u4F9D\u8D56\u4E8E {0} \u7684\u6563\u5217\u5904\u7406\u6307\u5B9A\u6A21\u5757
 warn.ignore.entry=\u6B63\u5728\u5FFD\u7565\u8282 {1} \u4E2D\u7684\u6761\u76EE {0}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
new file mode 100644
index 00000000000..5038d505e3b
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+app.bundler.name=Linux-Anwendungsimage
+deb.bundler.name=DEB-Bundle
+rpm.bundler.name=RPM-Bundle
+
+param.license-type.default=Unbekannt
+param.menu-group.default=Unbekannt
+
+resource.deb-control-file=DEB-Kontrolldatei
+resource.deb-preinstall-script=DEB-Preinstall-Skript
+resource.deb-prerm-script=DEB-Prerm-Skript
+resource.deb-postinstall-script=DEB-Postinstall-Skript
+resource.deb-postrm-script=DEB-Postrm-Skript
+resource.copyright-file=Copyright-Datei
+resource.menu-shortcut-descriptor=Men\u00FCverkn\u00FCpfungsdeskriptor
+resource.menu-icon=Men\u00FCsymbol
+resource.rpm-spec-file=RPM-Spezifikationsdatei
+
+error.tool-not-found.advice=Installieren Sie die erforderlichen Packages
+error.tool-old-version.advice=Installieren Sie die erforderlichen Packages
+
+error.invalid-install-dir=Ung\u00FCltiges Installationsverzeichnis "{0}"
+
+error.invalid-value-for-package-name=Ung\u00FCltiger Wert "{0}" f\u00FCr den Bundle-Namen.
+error.invalid-value-for-package-name.advice=Setzen Sie die Option "linux-bundle-name" auf einen g\u00FCltigen Debian-Packagenamen. Die Packagenamen d\u00FCrfen nur Kleinbuchstaben (a-z), Ziffern (0-9), Pluszeichen (+), Minuszeichen (-) und Punkte (.) umfassen. Sie m\u00FCssen mindestens zwei Zeichen lang sein und mit einem alphanumerischen Zeichen beginnen.
+
+message.icon-not-png=Das angegebene Symbol "{0}" ist keine PNG-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
+message.test-for-tool=Test f\u00FCr [{0}]. Ergebnis: {1}
+message.outputting-to-location=DEB f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.output-to-location=Package (.deb) gespeichert in: {0}.
+message.debs-like-licenses=Debian-Packages m\u00FCssen eine Lizenz angeben. Bei fehlender Lizenz geben einige Linux-Distributionen eine Meldung \u00FCber eine Beeintr\u00E4chtigung der Anwendungsqualit\u00E4t aus.
+message.outputting-bundle-location=RPM f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.output-bundle-location=Package (.rpm) gespeichert in: {0}.
+message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
+
+message.ldd-not-available=ldd-Befehl nicht gefunden. Packageabh\u00E4ngigkeiten werden nicht generiert.
+message.deb-ldd-not-available.advice=Installieren Sie das DEB-Package "libc-bin", um ldd abzurufen.
+message.rpm-ldd-not-available.advice=Installieren Sie das RPM-Package "glibc-common", um ldd abzurufen.
+
+warning.foreign-app-image=Warnung: app-image-Verzeichnis wurde von jpackage nicht generiert.
+message.not-default-bundler-no-dependencies-lookup={0} ist nicht der Standardpackagetyp. Packageabh\u00E4ngigkeiten werden nicht generiert.
+
+error.unexpected-package-property=Erwarteter Wert der Eigenschaft "{0}": [{1}]. Tats\u00E4chlicher Wert in Ausgabepackage: [{2}]. Anscheinend enthielt die benutzerdefinierte Datei "{3}" aus dem Ressourcenverzeichnis einen hartcodierten Wert der Eigenschaft "{0}"
+error.unexpected-package-property.advice=Verwenden Sie die Musterzeichenfolge [{0}] anstelle des hartcodierten Wertes [{1}] der {2}-Eigenschaft in der benutzerdefinierten Datei "{3}"
+error.unexpected-default-package-property.advice=Legen Sie den Wert der {0}-Eigenschaft in der benutzerdefinierten Datei "{1}" nicht explizit fest
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
index 739ca7b365e..0ced3733f41 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
index 3ce20c774f5..63ba81270b2 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
new file mode 100644
index 00000000000..48f01addb4a
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
@@ -0,0 +1,91 @@
+#
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+app.bundler.name=Mac-Anwendungsimage
+store.bundler.name=Mac App Store-f\u00E4higer Bundler
+dmg.bundler.name=Mac-DMG-Package
+pkg.bundler.name=Mac-PKG-Package
+
+error.invalid-cfbundle-version.advice=Legen Sie einen kompatiblen Wert f\u00FCr "app-version" fest. G\u00FCltige Versionsnummern sind ein bis drei durch Punkte getrennte Ganzzahlen.
+error.explicit-sign-no-cert=Signatur wurde explizit angefordert, doch es wurde kein Signaturzertifikat gefunden
+error.explicit-sign-no-cert.advice=Geben Sie g\u00FCltige Werte f\u00FCr mac-signing-key-user-name und mac-signing-keychain an
+error.must-sign-app-store=Mac App Store-Apps m\u00FCssen signiert werden. Die Signierung wurde von der Bundler-Konfiguration deaktiviert
+error.must-sign-app-store.advice=Verwenden Sie die Option --mac-sign mit entsprechenden Werten f\u00FCr user-name und keychain
+error.no-app-signing-key=Kein Signaturschl\u00FCssel f\u00FCr Mac App Store-App
+error.no-app-signing-key.advice=Installieren Sie Ihre App-Signaturschl\u00FCssel mit XCode in Ihrem Mac-Schl\u00FCsselbund.
+error.no-pkg-signing-key=Kein Signaturschl\u00FCssel f\u00FCr Mac App Store-Installationsprogramm
+error.no-pkg-signing-key.advice=Installieren Sie Ihre App-Signaturschl\u00FCssel mit XCode in Ihrem Mac-Schl\u00FCsselbund.
+error.certificate.expired=Fehler: Zertifikat abgelaufen {0}
+error.no.xcode.signing=F\u00FCr die Signatur ist Xcode mit Befehlszeilen-Entwicklertools erforderlich
+error.no.xcode.signing.advice=Installieren Sie Xcode mit Befehlszeilen-Entwicklertools.
+error.cert.not.found=Kein Zertifikat gefunden, das [{0}] mit Schl\u00FCsselbund [{1}] entspricht
+error.multiple.certs.found=WARNUNG: Mehrere Zertifikate gefunden, die [{0}] mit Schl\u00FCsselbund [{1}] entsprechen. Es wird das erste Zertifikat verwendet
+resource.bundle-config-file=Bundle-Konfigurationsdatei
+resource.app-info-plist=Info.plist der Anwendung
+resource.runtime-info-plist=Info.plist der Java-Laufzeit
+resource.entitlements=Mac-Berechtigungen
+resource.dmg-setup-script=DMG-Setupskript
+resource.license-setup=Lizenzsetup
+resource.dmg-background=DMG-Hintergrund
+resource.volume-icon=Symbol "Datentr\u00E4ger"
+resource.post-install-script=Auszuf\u00FChrendes Skript nach dem Auff\u00FCllen des Anwendungsimages
+resource.pkg-preinstall-script=PKG-Preinstall-Skript
+resource.pkg-postinstall-script=PKG-Postinstall-Skript
+resource.pkg-background-image=PKG-Hintergrundbild
+resource.pkg-pdf=Projektdefinitionsdatei
+
+
+message.bundle-name-too-long-warning={0} ist auf "{1}" gesetzt. Dies ist l\u00E4nger als 16 Zeichen. K\u00FCrzen Sie den Wert, um die Mac-Nutzungserfahrung zu verbessern.
+message.preparing-info-plist=Info.plist wird vorbereitet: {0}.
+message.icon-not-icns= Das angegebene Symbol "{0}" ist keine ICNS-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
+message.version-string-too-many-components="app-version" darf ein bis drei Zahlen aufweisen: 1, 1.2, 1.2.3.
+message.version-string-first-number-not-zero=Die erste Zahl in app-version darf nicht null oder negativ sein.
+message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
+message.ignoring.symlink=Warnung: codesign \u00FCberspringt den Symlink {0}.
+message.already.signed=Datei ist bereits signiert: {0}.
+message.keychain.error=Fehler: Schl\u00FCsselbundliste kann nicht abgerufen werden.
+message.building-bundle=Mac App Store-Package f\u00FCr {0} wird erstellt.
+message.app-image-dir-does-not-exist=Angegebenes Anwendungsimageverzeichnis {0}: {1} ist nicht vorhanden.
+message.app-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist.
+message.app-image-requires-app-name=Beim Verwenden eines internen Anwendungsimages m\u00FCssen Sie den Anwendungsnamen angeben.
+message.app-image-requires-app-name.advice=Legen Sie den Anwendungsnamen mit dem CLI-Kennzeichen -name, dem fx:application/@name ANT-Attribut oder dem Bundler-Argument "appName" fest.
+message.app-image-requires-identifier=ID kann nicht aus Anwendungsimage extrahiert werden.
+message.app-image-requires-identifier.advice=Verwenden Sie "--verbose" f\u00FCr eine erweiterte Fehlermeldung, oder geben Sie sie mit "--mac-package-identifier" an.
+message.invalid-identifier=Ung\u00FCltige Mac-Bundle-ID [{0}].
+message.invalid-identifier.advice=Geben Sie die ID mit "--mac-package-identifier" an.
+message.building-dmg=DMG-Package f\u00FCr {0} wird erstellt.
+message.running-script=Shellskript wird auf Anwendungsimage [{0}] ausgef\u00FChrt.
+message.preparing-dmg-setup=DMG-Setup wird vorbereitet: {0}.
+message.creating-dmg-file=DMG-Datei wird erstellt: {0}.
+message.dmg-cannot-be-overwritten=DMG-Datei ({0}) ist vorhanden und kann nicht entfernt werden.
+message.output-to-location=Ergebnis von DMG-Installationsprogramm f\u00FCr {0}: {1}.
+message.building-pkg=PKG-Package f\u00FCr {0} wird erstellt.
+message.preparing-scripts=Packageskripte werden vorbereitet.
+message.preparing-distribution-dist=distribution.dist wird vorbereitet: {0}.
+message.signing.pkg=Warnung: Zum Signieren von PKG m\u00FCssen Sie m\u00F6glicherweise mit dem Schl\u00FCsselbundverwaltungstool die Option "Immer vertrauen" f\u00FCr Ihr Zertifikat festlegen.
+message.setfile.dmg=Das Festlegen des benutzerdefinierten Symbols f\u00FCr die DMG-Datei wurde \u00FCbersprungen, weil das Utility "SetFile" nicht gefunden wurde. Durch Installieren von Xcode mit Befehlszeilentools sollte dieses Problem behoben werden.
+message.install-dir-ignored=Warnung: "--install-dir" wird von DMG nicht unterst\u00FCtzt. Stattdessen wird standardm\u00E4\u00DFig /Applications verwendet.
+warning.unsigned.app.image=Warnung: Nicht signiertes app-image wird zum Erstellen von signiertem {0} verwendet.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
index 291130fb237..3ae48d25700 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
@@ -29,7 +29,7 @@ store.bundler.name=Mac App Store\u306E\u6E96\u5099\u5B8C\u4E86\u30D0\u30F3\u30C9
 dmg.bundler.name=Mac DMG\u30D1\u30C3\u30B1\u30FC\u30B8
 pkg.bundler.name=Mac PKG\u30D1\u30C3\u30B1\u30FC\u30B8
 
-error.invalid-cfbundle-version.advice=Set a compatible 'app-version'. Valid versions are one to three integers separated by dots.
+error.invalid-cfbundle-version.advice=\u4E92\u63DB\u6027\u306E\u3042\u308B'app-version'\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\u6709\u52B9\u306A\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001\u30C9\u30C3\u30C8\u3067\u533A\u5207\u3089\u308C\u305F1\u304B\u30893\u3064\u306E\u6574\u6570\u3067\u3059\u3002
 error.explicit-sign-no-cert=\u7F72\u540D\u304C\u660E\u793A\u7684\u306B\u8981\u6C42\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u7F72\u540D\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 error.explicit-sign-no-cert.advice=\u6709\u52B9\u306Amac-signing-key-user-name\u304A\u3088\u3073mac-signing-keychain\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 error.must-sign-app-store=Mac App Store\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u304C\u3001\u7F72\u540D\u306F\u30D0\u30F3\u30C9\u30E9\u69CB\u6210\u306B\u3088\u3063\u3066\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059
@@ -55,13 +55,14 @@ resource.post-install-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3
 resource.pkg-preinstall-script=PKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u524D\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.pkg-postinstall-script=PKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5F8C\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.pkg-background-image=pkg\u80CC\u666F\u30A4\u30E1\u30FC\u30B8
+resource.pkg-pdf=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5B9A\u7FA9\u30D5\u30A1\u30A4\u30EB
 
 
 message.bundle-name-too-long-warning={0}\u304C16\u6587\u5B57\u3092\u8D85\u3048\u308B''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002Mac\u3067\u306E\u64CD\u4F5C\u6027\u3092\u3088\u308A\u826F\u304F\u3059\u308B\u305F\u3081\u306B\u77ED\u304F\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 message.preparing-info-plist=Info.plist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}\u3002
 message.icon-not-icns= \u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICNS\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-message.version-string-too-many-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217\u306B\u306F\u30011\u30011.2\u30011.2.3\u306A\u30691\u304B\u30893\u306E\u6570\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-message.version-string-first-number-not-zero='app-version' \u306E\u6700\u521D\u306E\u6570\u5B57\u306F\u3001\u30BC\u30ED\u307E\u305F\u306F\u8CA0\u306E\u5024\u306B\u3067\u304D\u307E\u305B\u3093\u3002
+message.version-string-too-many-components='app-version'\u306B\u306F\u30011\u30011.2\u30011.2.3\u306A\u30691\u304B\u30893\u306E\u6570\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+message.version-string-first-number-not-zero=pp-version\u306E\u6700\u521D\u306E\u6570\u5B57\u306F\u3001\u30BC\u30ED\u307E\u305F\u306F\u8CA0\u306E\u5024\u306B\u3067\u304D\u307E\u305B\u3093\u3002
 message.creating-association-with-null-extension=null\u62E1\u5F35\u5B50\u3068\u306E\u95A2\u9023\u4ED8\u3051\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
 message.ignoring.symlink=\u8B66\u544A: codesign\u304Csymlink {0}\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059
 message.already.signed=\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u3059: {0}\u3002
@@ -86,5 +87,5 @@ message.preparing-scripts=\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B9\u30AF\u30EA
 message.preparing-distribution-dist=distribution.dist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
 message.signing.pkg=\u8B66\u544A: PKG\u3078\u306E\u7F72\u540D\u306E\u5834\u5408\u3001\u300C\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u30FB\u30A2\u30AF\u30BB\u30B9\u300D\u30C4\u30FC\u30EB\u3092\u4F7F\u7528\u3057\u3066\u8A3C\u660E\u66F8\u306B\u300C\u5E38\u306B\u4FE1\u983C\u3059\u308B\u300D\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 message.setfile.dmg='SetFile'\u30E6\u30FC\u30C6\u30A3\u30EA\u30C6\u30A3\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u305F\u3081\u3001DMG\u30D5\u30A1\u30A4\u30EB\u3067\u306E\u30AB\u30B9\u30BF\u30E0\u30FB\u30A2\u30A4\u30B3\u30F3\u306E\u8A2D\u5B9A\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F\u3002Xcode\u3068\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30C4\u30FC\u30EB\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u3068\u3001\u3053\u306E\u554F\u984C\u306F\u89E3\u6C7A\u3055\u308C\u307E\u3059\u3002
-message.install-dir-ignored=Warning: "--install-dir" is not supported by DMG and will be default to /Applications.
-warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {0}.
+message.install-dir-ignored=\u8B66\u544A: "--install-dir"\u306FDMG\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002/Applications\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002
+warning.unsigned.app.image=\u8B66\u544A: \u7F72\u540D\u3055\u308C\u3066\u3044\u306A\u3044app-image\u3092\u4F7F\u7528\u3057\u3066\u7F72\u540D\u3055\u308C\u305F{0}\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
index ecf9e8796d5..0d832583c0e 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
@@ -29,7 +29,7 @@ store.bundler.name=\u652F\u6301 Mac App Store \u7684\u6253\u5305\u7A0B\u5E8F
 dmg.bundler.name=Mac DMG \u7A0B\u5E8F\u5305
 pkg.bundler.name=Mac PKG \u7A0B\u5E8F\u5305
 
-error.invalid-cfbundle-version.advice=Set a compatible 'app-version'. Valid versions are one to three integers separated by dots.
+error.invalid-cfbundle-version.advice=\u8BBE\u7F6E\u517C\u5BB9\u7684 'app-version' \u503C\u3002\u6709\u6548\u7248\u672C\u5305\u542B\u4E00\u5230\u4E09\u4E2A\u7528\u70B9\u5206\u9694\u7684\u6574\u6570\u3002
 error.explicit-sign-no-cert=\u5DF2\u660E\u786E\u8BF7\u6C42\u7B7E\u540D\uFF0C\u4F46\u627E\u4E0D\u5230\u7B7E\u540D\u8BC1\u4E66
 error.explicit-sign-no-cert.advice=\u6307\u5B9A\u6709\u6548\u7684 mac-signing-key-user-name \u548C mac-signing-keychain
 error.must-sign-app-store=Mac App Store \u5E94\u7528\u7A0B\u5E8F\u5FC5\u987B\u7B7E\u540D, \u800C\u6253\u5305\u7A0B\u5E8F\u914D\u7F6E\u5DF2\u7981\u7528\u7B7E\u540D
@@ -55,13 +55,14 @@ resource.post-install-script=\u8981\u5728\u586B\u5145\u5E94\u7528\u7A0B\u5E8F\u6
 resource.pkg-preinstall-script=PKG \u5B89\u88C5\u524D\u811A\u672C
 resource.pkg-postinstall-script=PKG \u5B89\u88C5\u540E\u811A\u672C
 resource.pkg-background-image=pkg \u80CC\u666F\u56FE\u50CF
+resource.pkg-pdf=\u9879\u76EE\u5B9A\u4E49\u6587\u4EF6
 
 
 message.bundle-name-too-long-warning={0}\u5DF2\u8BBE\u7F6E\u4E3A ''{1}'', \u5176\u957F\u5EA6\u8D85\u8FC7\u4E86 16 \u4E2A\u5B57\u7B26\u3002\u4E3A\u4E86\u83B7\u5F97\u66F4\u597D\u7684 Mac \u4F53\u9A8C, \u8BF7\u8003\u8651\u5C06\u5176\u7F29\u77ED\u3002
 message.preparing-info-plist=\u6B63\u5728\u51C6\u5907 Info.plist: {0}\u3002
 message.icon-not-icns= \u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICNS \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
-message.version-string-too-many-components=\u7248\u672C\u5B57\u7B26\u4E32\u53EF\u4EE5\u5305\u542B 1 \u5230 3 \u4E2A\u6570\u5B57: 1, 1.2, 1.2.3\u3002
-message.version-string-first-number-not-zero='app-version' \u4E2D\u7684\u7B2C\u4E00\u4E2A\u6570\u5B57\u4E0D\u80FD\u4E3A\u96F6\u6216\u8D1F\u6570\u3002
+message.version-string-too-many-components='app-version' \u53EF\u4EE5\u5305\u542B 1 \u5230 3 \u4E2A\u6570\u5B57\uFF1A1\u30011.2\u30011.2.3\u3002
+message.version-string-first-number-not-zero=app-version \u4E2D\u7684\u7B2C\u4E00\u4E2A\u6570\u5B57\u4E0D\u80FD\u4E3A\u96F6\u6216\u8D1F\u6570\u3002
 message.creating-association-with-null-extension=\u6B63\u5728\u4F7F\u7528\u7A7A\u6269\u5C55\u540D\u521B\u5EFA\u5173\u8054\u3002
 message.ignoring.symlink=\u8B66\u544A: codesign \u6B63\u5728\u8DF3\u8FC7\u7B26\u53F7\u94FE\u63A5 {0}\u3002
 message.already.signed=\u6587\u4EF6\u5DF2\u7B7E\u540D\uFF1A{0}\u3002
@@ -86,5 +87,5 @@ message.preparing-scripts=\u6B63\u5728\u51C6\u5907\u7A0B\u5E8F\u5305\u811A\u672C
 message.preparing-distribution-dist=\u6B63\u5728\u51C6\u5907 distribution.dist: {0}\u3002
 message.signing.pkg=\u8B66\u544A\uFF1A\u8981\u5BF9 PKG \u8FDB\u884C\u7B7E\u540D\uFF0C\u53EF\u80FD\u9700\u8981\u4F7F\u7528\u201C\u5BC6\u94A5\u94FE\u8BBF\u95EE\u201D\u5DE5\u5177\u4E3A\u8BC1\u4E66\u8BBE\u7F6E\u201C\u59CB\u7EC8\u4FE1\u4EFB\u201D\u3002
 message.setfile.dmg=\u7531\u4E8E\u672A\u627E\u5230 'SetFile' \u5B9E\u7528\u7A0B\u5E8F\uFF0C\u8DF3\u8FC7\u4E86\u9488\u5BF9 DMG \u6587\u4EF6\u8BBE\u7F6E\u5B9A\u5236\u56FE\u6807\u7684\u64CD\u4F5C\u3002\u5B89\u88C5\u5E26\u547D\u4EE4\u884C\u5DE5\u5177\u7684 Xcode \u5E94\u80FD\u89E3\u51B3\u6B64\u95EE\u9898\u3002
-message.install-dir-ignored=Warning: "--install-dir" is not supported by DMG and will be default to /Applications.
-warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {0}.
+message.install-dir-ignored=\u8B66\u544A\uFF1A"--install-dir" \u4E0D\u53D7 DMG \u652F\u6301\uFF0C\u5C06\u9ED8\u8BA4\u4E3A /Applications\u3002
+warning.unsigned.app.image=\u8B66\u544A\uFF1A\u4F7F\u7528\u672A\u7B7E\u540D\u7684 app-image \u751F\u6210\u5DF2\u7B7E\u540D\u7684 {0}\u3002
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
new file mode 100644
index 00000000000..16540e2f002
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+MSG_Help=Verwendung: jpackage <Optionen>\n\nBeispielverwendungen:\n--------------\n    Generiert ein f\u00FCr das Hostsystem geeignetes Anwendungspackage:\n        F\u00FCr eine modulare Anwendung:\n            jpackage -n name -p modulePath -m moduleName/className\n        F\u00FCr eine nicht modulare Anwendung:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Aus einem vorab erstellten Anwendungsimage:\n            jpackage -n name --app-image appImageDir\n    Generiert ein Anwendungsimage:\n        F\u00FCr eine modulare Anwendung:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        F\u00FCr eine nicht modulare Anwendung:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Um eigene Optionen f\u00FCr jlink anzugeben, f\u00FChren Sie jlink separat aus:\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<zus\u00E4tzliche jlink-Optionen>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Generiert ein Java-Laufzeitpackage:\n        jpackage -n name --runtime-image <Laufzeitimage>\n\nAllgemeine Optionen:\n  @<Dateiname > \n          Liest Optionen und/oder Modus aus einer Datei \n          Diese Option kann mehrmals verwendet werden.\n  --type -t <Typ> \n          Der zu erstellende Packagetyp\n          G\u00FCltige Werte: {1} \n          Bei fehlender Angabe dieser Option wird ein plattformabh\u00E4ngiger\n          Standardtyp erstellt.\n  --app-version <Version>\n          Version der Anwendung und/oder des Packages\n  --copyright <Copyright-Zeichenfolge>\n          Copyright f\u00FCr die Anwendung\n  --description <Zeichenfolge f\u00FCr Beschreibung>\n          Beschreibung der Anwendung\n  --help -h \n          Gibt den Verwendungstext mit einer Liste und Beschreibung jeder g\u00FCltigen\n          Option f\u00FCr die aktuelle Plattform an den Ausgabestream aus und beendet den Vorgang\n  --icon <Dateipfad>\n          Pfad des Symbols f\u00FCr das Anwendungspackage\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --name -n <Name>\n          Name der Anwendung und/oder des Packages\n  --dest -d <Zielpfad>\n          Pfad, in den die generierte Ausgabedatei abgelegt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Standardm\u00E4\u00DFig wird das aktuelle Arbeitsverzeichnis verwendet.\n  --temp <Verzeichnispfad>\n          Pfad eines neuen oder leeren Verzeichnisses zum Erstellen tempor\u00E4rer Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Falls angegeben, wird das tempor\u00E4re Verzeichnis beim Abschlie\u00DFen der Aufgabe\n          nicht entfernt und muss manuell entfernt werden.\n          Bei fehlender Angabe wird ein tempor\u00E4res Verzeichnis erstellt und\n          beim Abschlie\u00DFen der Aufgabe entfernt.\n  --vendor <Zeichenfolge f\u00FCr Anbieter>\n          Anbieter der Anwendung\n  --verbose\n          Aktiviert Ausgabe im Verbose-Modus\n  --version\n          Gibt die Produktversion an den Outputstream aus und beendet den Vorgang.\n\nOptionen f\u00FCr das Erstellen des Laufzeitimages:\n  --add-modules <Modulname>[,<Modulname>...]\n          Eine per Komma (",") getrennte Liste hinzuzuf\u00FCgender Module\n          Diese Modulliste wird zusammen mit dem Hauptmodul (sofern angegeben)\n          als Argument --add-module an jlink \u00FCbergeben.\n          Bei fehlender Angabe wird entweder nur das Hauptmodul (sofern --module\n          angegeben ist) oder das Standardset an Modulen (sofern --main-jar \n          angegeben ist) verwendet.\n          Diese Option kann mehrmals verwendet werden.\n  --module-path -p <Modulpfad>...\n          \
+Eine per {0} getrennte Pfadliste\n          Jeder Pfad ist entweder ein Verzeichnis mit Modulen oder der Pfad zu einer\n          JAR-Datei eines Moduls.\n          (Jeder Pfad ist absolut oder relativ zum aktuellen Verzeichnis.)\n          Diese Option kann mehrmals verwendet werden.\n  --jlink-options <jlink-Optionen> \n          Eine per Leerzeichen getrennte Liste mit an jlink zu \u00FCbergebenden Optionen \n          Bei fehlender Angabe wird standardm\u00E4\u00DFig "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files" verwendet. \n          Diese Option kann mehrmals verwendet werden.\n  --runtime-image <Verzeichnispfad>\n          Pfad des vordefinierten Laufzeitimages, das in\n          das Anwendungsimage kopiert wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Wenn --runtime-image nicht angegeben wird, f\u00FChrt jpackage jlink aus, um\n          das Laufzeitimage mit folgenden Optionen zu erstellen:\n          --strip-debug, --no-header-files, --no-man-pages und\n          --strip-native-commands.\n\nOptionen f\u00FCr das Erstellen des Anwendungsimages:\n  --input -i <Verzeichnispfad>\n          Pfad des Eingabeverzeichnisses mit den in das Package zu integrierenden Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Alle Dateien im Eingabeverzeichnis werden in das Package f\u00FCr das\n          Anwendungsimage integriert.\n  --app-content <zus\u00E4tzlicher Inhalt>[,<zus\u00E4tzlicher Inhalt>...]\n          Eine per Komma getrennte Liste mit Pfaden zu Dateien und/oder Verzeichnissen,\n          die zur Anwendungs-Payload hinzugef\u00FCgt werden sollen.\n          Diese Option kann mehrmals verwendet werden.\n\nOptionen f\u00FCr das Erstellen des Anwendungs-Launchers:\n  --add-launcher <Launcher-Name>=<Dateipfad>\n          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n          einer Liste von Schl\u00FCssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Die Schl\u00FCssel "module", "main-jar", "main-class",\n          "arguments", "java-options", "app-version", "icon",\n          "win-console", "win-shortcut", "win-menu",\n          "linux-app-category" und "linux-shortcut" k\u00F6nnen verwendet werden.\n          Diese Optionen werden den urspr\u00FCnglichen Befehlszeilenoptionen hinzugef\u00FCgt\n          (oder \u00FCberschreiben diese), um einen zus\u00E4tzlichen, alternativen Launcher zu erstellen.\n          Der Hauptanwendungs-Launcher wird aus den Befehlszeilenoptionen\n          erstellt. Mit dieser Option k\u00F6nnen zus\u00E4tzliche alternative Launcher\n          erstellt werden. Au\u00DFerdem kann diese Option mehrmals verwendet werden,\n          um mehrere zus\u00E4tzliche Launcher zu erstellen. \n  --arguments <Hauptklassenargumente>\n          Befehlszeilenargumente, die an die Hauptklasse \u00FCbergeben werden, falls\n          keine Befehlszeilenargumente an den Launcher \u00FCbergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --java-options <Java-Optionen>\n          Optionen, die an die Java-Laufzeit \u00FCbergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --main-class <Klassenname>\n          Qualifizierter Name der auszuf\u00FChrenden Anwendungshauptklasse\n          Diese Option kann nur bei Angabe von --main-jar verwendet werden.\n  --main-jar <Haupt-JAR-Datei>\n          Die Haupt-JAR-Datei der Anwendung, die die Hauptklasse enth\u00E4lt\n          (angegeben als Pfad relativ zum Eingabepfad)\n          Es kann entweder die Option --module oder die Option --main-jar angegeben werden, nicht jedoch\n          beides.\n  --module -m <Modulname>[/<Hauptklasse>]\n          Das Hauptmodul (und optional die Hauptklasse) der Anwendung\n          Dieses Modul muss unter dem Modulpfad gespeichert sein.\n          Bei Angabe dieser Option wird das Hauptmodul\n          im \
+Java-Laufzeitimage verkn\u00FCpft. Es kann entweder die Option --module oder die Option --main-jar\n          angegeben werden, nicht jedoch beides.\n{2}\nOptionen f\u00FCr das Erstellen des Anwendungspackages:\n  --about-url <URL>\n          URL der Homepage der Anwendung\n  --app-image <Verzeichnispfad>\n          Speicherort des vordefinierten Anwendungsimages, mit dem\n          ein installierbares Package erstellt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --file-associations <Dateipfad>\n          Pfad zu einer Eigenschaftendatei mit einer Liste von Schl\u00FCssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Mit den Schl\u00FCsseln "extension", "mime-type", "icon" und "description"\n          kann die Verkn\u00FCpfung beschrieben werden.\n          Diese Option kann mehrmals verwendet werden.\n  --install-dir <Verzeichnispfad>\n          {4}  --license-file <Dateipfad>\n          Pfad zur Lizenzdatei\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --resource-dir <Verzeichnispfad>\n          Pfad zum \u00DCberschreiben von jpackage-Ressourcen\n          Symbole, Vorlagendateien und weitere Ressourcen von jpackage k\u00F6nnen\n          durch Hinzuf\u00FCgen von Ersetzungsressourcen zu diesem Verzeichnis \u00FCberschrieben werden.\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --runtime-image <Verzeichnispfad>\n          Pfad des zu installierenden vordefinierten Laufzeitimages\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Option muss beim Erstellen eines Laufzeitpackages angegeben werden.\n\nPlattformabh\u00E4ngige Optionen f\u00FCr das Erstellen des Anwendungspackages:\n{3}
+
+MSG_Help_win_launcher=\nPlattformabh\u00E4ngige Option f\u00FCr das Erstellen des Anwendungs-Launchers:\n  --win-console\n          Erstellt einen Konsolen-Launcher f\u00FCr die Anwendung. Sollte f\u00FCr\n          Anwendungen angegeben werden, die Konsoleninteraktionen erfordern\n
+MSG_Help_win_install=\  --win-dir-chooser\n          F\u00FCgt ein Dialogfeld hinzu, in dem der Benutzer das Verzeichnis ausw\u00E4hlen kann, in dem\n          das Produkt installiert wird.\n  --win-help-url <URL>\n          URL, unter der der Benutzer weitere Informationen oder technische Unterst\u00FCtzung erh\u00E4lt\n  --win-menu\n          Anforderung zum Hinzuf\u00FCgen einer Startmen\u00FCverkn\u00FCpfung f\u00FCr diese Anwendung\n  --win-menu-group <Men\u00FCgruppenname>\n          Startmen\u00FCgruppe, in der diese Anwendung abgelegt wird\n  --win-per-user-install\n          Anforderung zum Ausf\u00FChren einer Installation pro Benutzer\n  --win-shortcut\n          Anforderung zum Hinzuf\u00FCgen einer Desktopverkn\u00FCpfung f\u00FCr diese Anwendung\n  --win-shortcut-prompt\n          F\u00FCgt ein Dialogfeld hinzu, in dem der Benutzer ausw\u00E4hlen kann, ob Verkn\u00FCpfungen\n          vom Installationsprogramm erstellt werden sollen.\n  --win-update-url <URL>\n          URL verf\u00FCgbarer Anwendungsupdateinformationen\n  --win-upgrade-uuid <ID-Zeichenfolge>\n          UUID, die mit Upgrades f\u00FCr dieses Package verkn\u00FCpft ist\n
+MSG_Help_win_install_dir=Relativer Unterpfad unter dem Standardinstallationsverzeichnis\n
+MSG_Help_mac_install=\  --mac-dmg-content <Pfad zu zus\u00E4tzlichem Inhalt>[,<Pfad zu zus\u00E4tzlichem Inhalt>...]\n          Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n          Diese Option kann mehrmals verwendet werden. \n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID-Zeichenfolge>\n          Eine ID, die die Anwendung f\u00FCr macOS eindeutig identifiziert\n          Standardwert ist der Hauptklassenname.\n          Es d\u00FCrfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n          und Punkte (.) verwendet werden.\n  --mac-package-name <Namenszeichenfolge>\n          Name der Anwendung, wie in der Men\u00FCleiste angezeigt\n          Dieser kann vom Anwendungsnamen abweichen.\n          Er darf maximal 15 Zeichen enthalten und muss f\u00FCr die Anzeige\n          in der Men\u00FCleiste und im Infofenster der Anwendung geeignet sein.\n          Standardwert: Anwendungsname.\n  --mac-package-signing-prefix <Pr\u00E4fixzeichenfolge>\n          Beim Signieren des Anwendungspackages wird dieser Wert\n          allen zu signierenden Komponenten ohne vorhandene\n          Package-ID als Pr\u00E4fix vorangestellt.\n  --mac-sign\n          Anforderung zum Signieren des Packages\n  --mac-signing-keychain <Schl\u00FCsselbundname>\n          Name des Schl\u00FCsselbundes f\u00FCr die Suche nach der Signaturidentit\u00E4t\n          Bei fehlender Angabe werden die Standardschl\u00FCsselbunde verwendet.\n  --mac-signing-key-user-name <Teamname>\n          Team- oder Benutzernamensteil der Apple-Signaturidentit\u00E4ten.\n  --mac-app-store\n          Gibt an, dass die jpackage-Ausgabe f\u00FCr den\n          Mac App Store bestimmt ist.\n  --mac-entitlements <Dateipfad>\n          Pfad zu einer Datei mit Berechtigungen, die beim Signieren\n          von ausf\u00FChrbaren Dateien und Librarys im Bundle verwendet werden sollen.\n  --mac-app-category <Kategoriezeichenfolge>\n          Zeichenfolge f\u00FCr das Erstellen von LSApplicationCategoryType in\n          Anwendungs-plist. Standardwert: "utilities".\n
+MSG_Help_linux_install=\  --linux-package-name <Packagename>\n          Name f\u00FCr das Linux-Package, Standardwert: Anwendungsname\n  --linux-deb-maintainer <E-Mail-Adresse>\n          Maintainer f\u00FCr .deb-Package\n  --linux-menu-group <Men\u00FCgruppenname>\n          Men\u00FCgruppe, in der diese Anwendung abgelegt wird\n  --linux-package-deps\n          Erforderliche Packages oder Funktionen f\u00FCr die Anwendung\n  --linux-rpm-license-type <Typzeichenfolge>\n          Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n  --linux-app-release <Releasewert>\n          Releasewert der RPM-SPEC-Datei <Name> oder \n          Debian-Revisionswert der DEB-Kontrolldatei\n  --linux-app-category <Kategoriewert>\n          Gruppenwert der RPM-SPEC-Datei <Name> oder \n          Abschnittswert der DEB-Kontrolldatei\n  --linux-shortcut\n          Erstellt eine Verkn\u00FCpfung f\u00FCr die Anwendung.\n
+MSG_Help_mac_linux_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung\n
+MSG_Help_default_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung auf OS X\n          oder Linux. Relativer Unterpfad des Installationsverzeichnisses der\n          Anwendung wie "Programme" oder "AppData" unter Windows.\n
+MSG_Help_no_args=Verwendung: jpackage <Optionen>\nVerwenden Sie jpackage --help (oder -h), um eine Liste m\u00F6glicher Optionen aufzurufen
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
index 6ed6c2c90a9..8a7239cab95 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,239 +24,18 @@
 #
 #
 
-MSG_Help=Usage: jpackage <options>\n\
-\n\
-Sample usages:\n\
---------------\n\
-\    Generate an application package suitable for the host system:\n\
-\        For a modular application:\n\
-\            jpackage -n name -p modulePath -m moduleName/className\n\
-\        For a non-modular application:\n\
-\            jpackage -i inputDir -n name \\\n\
-\                --main-class className --main-jar myJar.jar\n\
-\        From a pre-built application image:\n\
-\            jpackage -n name --app-image appImageDir\n\
-\    Generate an application image:\n\
-\        For a modular application:\n\
-\            jpackage --type app-image -n name -p modulePath \\\n\
-\                -m moduleName/className\n\
-\        For a non-modular application:\n\
-\            jpackage --type app-image -i inputDir -n name \\\n\
-\                --main-class className --main-jar myJar.jar\n\
-\        To provide your own options to jlink, run jlink separately:\n\
-\            jlink --output appRuntimeImage -p modulePath \\\n\
-\                --add-modules moduleName \\\n\
-\                --no-header-files [<additional jlink options>...]\n\
-\            jpackage --type app-image -n name \\\n\
-\                -m moduleName/className --runtime-image appRuntimeImage\n\
-\    Generate a Java runtime package:\n\
-\        jpackage -n name --runtime-image <runtime-image>\n\
-\n\
-Generic Options:\n\
-\  @<filename> \n\
-\          Read options and/or mode from a file \n\
-\          This option can be used multiple times.\n\
-\  --type -t <type> \n\
-\          The type of package to create\n\
-\          Valid values are: {1} \n\
-\          If this option is not specified a platform dependent\n\
-\          default type will be created.\n\
-\  --app-version <version>\n\
-\          Version of the application and/or package\n\
-\  --copyright <copyright string>\n\
-\          Copyright for the application\n\
-\  --description <description string>\n\
-\          Description of the application\n\
-\  --help -h \n\
-\          Print the usage text with a list and description of each valid\n\
-\          option for the current platform to the output stream, and exit\n\
-\  --icon <file path>\n\
-\          Path of the icon of the application package\n\
-\          (absolute path or relative to the current directory)\n\
-\  --name -n <name>\n\
-\          Name of the application and/or package\n\
-\  --dest -d <destination path>\n\
-\          Path where generated output file is placed\n\
-\          (absolute path or relative to the current directory)\n\
-\          Defaults to the current working directory.\n\
-\  --temp <directory path>\n\
-\          Path of a new or empty directory used to create temporary files\n\
-\          (absolute path or relative to the current directory)\n\
-\          If specified, the temp dir will not be removed upon the task\n\
-\          completion and must be removed manually.\n\
-\          If not specified, a temporary directory will be created and\n\
-\          removed upon the task completion.\n\
-\  --vendor <vendor string>\n\
-\          Vendor of the application\n\
-\  --verbose\n\
-\          Enables verbose output\n\
-\  --version\n\
-\          Print the product version to the output stream and exit.\n\
-\n\
-\Options for creating the runtime image:\n\
-\  --add-modules <module name>[,<module name>...]\n\
-\          A comma (",") separated list of modules to add\n\
-\          This module list, along with the main module (if specified)\n\
-\          will be passed to jlink as the --add-module argument.\n\
-\          If not specified, either just the main module (if --module is\n\
-\          specified), or the default set of modules (if --main-jar is \n\
-\          specified) are used.\n\
-\          This option can be used multiple times.\n\
-\  --module-path -p <module path>...\n\
-\          A {0} separated list of paths\n\
-\          Each path is either a directory of modules or the path to a\n\
-\          modular jar.\n\
-\          (Each path is absolute or relative to the current directory.)\n\
-\          This option can be used multiple times.\n\
-\  --jlink-options <jlink options> \n\
-\          A space separated list of options to pass to jlink \n\
-\          If not specified, defaults to "--strip-native-commands \n\
-\          --strip-debug --no-man-pages --no-header-files". \n\
-\          This option can be used multiple times.\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image that will be copied into\n\
-\          the application image\n\
-\          (absolute path or relative to the current directory)\n\
-\          If --runtime-image is not specified, jpackage will run jlink to\n\
-\          create the runtime image using options:\n\
-\          --strip-debug, --no-header-files, --no-man-pages, and\n\
-\          --strip-native-commands.\n\
-\n\
-\Options for creating the application image:\n\
-\  --input -i <directory path>\n\
-\          Path of the input directory that contains the files to be packaged\n\
-\          (absolute path or relative to the current directory)\n\
-\          All files in the input directory will be packaged into the\n\
-\          application image.\n\
-\  --app-content <additional content>[,<additional content>...]\n\
-\          A comma separated list of paths to files and/or directories\n\
-\          to add to the application payload.\n\
-\          This option can be used more than once.\n\
-\n\
-\Options for creating the application launcher(s):\n\
-\  --add-launcher <launcher name>=<file path>\n\
-\          Name of launcher, and a path to a Properties file that contains\n\
-\          a list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "module", "main-jar", "main-class", "description",\n\
-\          "arguments", "java-options", "app-version", "icon",\n\
-\          "win-console", "win-shortcut", "win-menu",\n\
-\          "linux-app-category", and "linux-shortcut" can be used.\n\
-\          These options are added to, or used to overwrite, the original\n\
-\          command line options to build an additional alternative launcher.\n\
-\          The main application launcher will be built from the command line\n\
-\          options. Additional alternative launchers can be built using\n\
-\          this option, and this option can be used multiple times to\n\
-\          build multiple additional launchers. \n\
-\  --arguments <main class arguments>\n\
-\          Command line arguments to pass to the main class if no command\n\
-\          line arguments are given to the launcher\n\
-\          This option can be used multiple times.\n\
-\  --java-options <java options>\n\
-\          Options to pass to the Java runtime\n\
-\          This option can be used multiple times.\n\
-\  --main-class <class name>\n\
-\          Qualified name of the application main class to execute\n\
-\          This option can only be used if --main-jar is specified.\n\
-\  --main-jar <main jar file>\n\
-\          The main JAR of the application; containing the main class\n\
-\          (specified as a path relative to the input path)\n\
-\          Either --module or --main-jar option can be specified but not\n\
-\          both.\n\
-\  --module -m <module name>[/<main class>]\n\
-\          The main module (and optionally main class) of the application\n\
-\          This module must be located on the module path.\n\
-\          When this option is specified, the main module will be linked\n\
-\          in the Java runtime image.  Either --module or --main-jar\n\
-\          option can be specified but not both.\n\
-{2}\n\
-\Options for creating the application package:\n\
-\  --about-url <url>\n\
-\          URL of the application''s home page\n\
-\  --app-image <directory path>\n\
-\          Location of the predefined application image that is used\n\
-\          to build an installable package\n\
-\          (absolute path or relative to the current directory)\n\
-\  --file-associations <file path>\n\
-\          Path to a Properties file that contains list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "extension", "mime-type", "icon", and "description"\n\
-\          can be used to describe the association.\n\
-\          This option can be used multiple times.\n\
-\  --install-dir <directory path>\n\
-\          {4}\
-\  --license-file <file path>\n\
-\          Path to the license file\n\
-\          (absolute path or relative to the current directory)\n\
-\  --resource-dir <directory path>\n\
-\          Path to override jpackage resources\n\
-\          Icons, template files, and other resources of jpackage can be\n\
-\          over-ridden by adding replacement resources to this directory.\n\
-\          (absolute path or relative to the current directory)\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image to install\n\
-\          (absolute path or relative to the current directory)\n\
-\          Option is required when creating a runtime package.\n\
-\n\
-\Platform dependent options for creating the application package:\n\
-{3}
+MSG_Help=\u4F7F\u7528\u65B9\u6CD5: jpackage <options>\n\n\u4F7F\u7528\u4F8B:\n--------------\n    \u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u306B\u9069\u3057\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n        \u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage -n name -p modulePath -m moduleName/className\n        \u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u4E8B\u524D\u4F5C\u6210\u3055\u308C\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u304B\u3089:\n            jpackage -n name --app-image appImageDir\n    \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u751F\u6210:\n        \u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        \u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        jlink\u306B\u72EC\u81EA\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u306B\u306F\u3001jlink\u3092\u5225\u500B\u306B\u5B9F\u884C\u3057\u307E\u3059\u3002\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Java\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n        jpackage -n name --runtime-image <runtime-image>\n\n\u4E00\u822C\u7684\u306A\u30AA\u30D7\u30B7\u30E7\u30F3:\n  @<filename> \n          \u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30E2\u30FC\u30C9 \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --type -t <type> \n          \u4F5C\u6210\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30BF\u30A4\u30D7\n          \u6709\u52B9\u306A\u5024: {1} \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u306E\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30BF\u30A4\u30D7\u304C\u4F5C\u6210\u3055\u308C\u307E\u3059\n  --app-version <version>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\n  --copyright <copyright string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B3\u30D4\u30FC\u30E9\u30A4\u30C8\n  --description <description string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8AAC\u660E\n  --help -h \n          \u4F7F\u7528\u65B9\u6CD5\u30C6\u30AD\u30B9\u30C8\u3068\u73FE\u5728\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u3068\u8AAC\u660E\u3092\n          \u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u3001\u7D42\u4E86\u3057\u307E\u3059\n  --icon <file path>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30A4\u30B3\u30F3\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --name \
+-n <name>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\n  --dest -d <destination path>\n          \u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u914D\u7F6E\u3055\u308C\u308B\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u73FE\u5728\u306E\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n  --temp <directory path>\n          \u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3055\u308C\u308B\u65B0\u898F\u307E\u305F\u306F\u7A7A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u6307\u5B9A\u3057\u305F\u5834\u5408\u3001\u30BF\u30B9\u30AF\u5B8C\u4E86\u6642\u306B\u4E00\u6642\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u524A\u9664\u3055\u308C\u306A\u3044\u305F\u3081\n          \u624B\u52D5\u3067\u524A\u9664\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u4E00\u6642\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4F5C\u6210\u3055\u308C\n          \u30BF\u30B9\u30AF\u5B8C\u4E86\u6642\u306B\u524A\u9664\u3055\u308C\u307E\u3059\u3002\n  --vendor <vendor string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30D9\u30F3\u30C0\u30FC\n  --verbose\n          \u8A73\u7D30\u306A\u51FA\u529B\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n  --version\n          \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n\n\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --add-modules <module name>[,<module name>...]\n          \u8FFD\u52A0\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30AB\u30F3\u30DE(",")\u533A\u5207\u308A\u30EA\u30B9\u30C8\n          \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30EA\u30B9\u30C8\u3068\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB(\u6307\u5B9A\u3057\u305F\u5834\u5408)\n          \u304C--add-module\u5F15\u6570\u3068\u3057\u3066jlink\u306B\u6E21\u3055\u308C\u307E\u3059\u3002\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u307F(--module\u304C\n          \u6307\u5B9A\u3055\u308C\u305F\u5834\u5408)\u3001\u307E\u305F\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BB\u30C3\u30C8(--main-jar\u304C \n          \u6307\u5B9A\u3055\u308C\u305F\u5834\u5408)\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --module-path -p <module path>...\n          \u30D1\u30B9\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\n          \u5404\u30D1\u30B9\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u307E\u305F\u306F\n          \u30E2\u30B8\u30E5\u30E9jar\u3078\u306E\u30D1\u30B9\u3067\u3059\u3002\n          (\u5404\u30D1\u30B9\u306F\u3001\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9\u3067\u3059\u3002)\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --jlink-options <jlink options> \n          jlink\u306B\u6E21\u3059\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30B9\u30DA\u30FC\u30B9\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8 \n          \u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001"--strip-native-commands \n          --strip-debug --no-man-pages \
+--no-header-files"\u3002 \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --runtime-image <directory path>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\u30B3\u30D4\u30FC\u3055\u308C\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\n          \u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          --runtime-image\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001jpackage\u306Fjlink\u3092\u5B9F\u884C\u3057\u3001\n          \u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u307E\u3059:\n          --strip-debug\u3001--no-header-files\u3001--no-man-pages\u304A\u3088\u3073\n          --strip-native-commands\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --input -i <directory path>\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3080\u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3055\u308C\u307E\u3059\u3002\n  --app-content <additional content>[,<additional content>...]\n          \u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA(\u3042\u308B\u3044\u306F\u4E21\u65B9)\u306E\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30DA\u30A4\u30ED\u30FC\u30C9\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --add-launcher <launcher name>=<file path>\n          \u30E9\u30F3\u30C1\u30E3\u306E\u540D\u524D\u3001\u304A\u3088\u3073\u30AD\u30FC\u3001\u5024\u306E\u30DA\u30A2\u306E\u30EA\u30B9\u30C8\n          \u3092\u542B\u3080\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30AD\u30FC"module"\u3001"main-jar"\u3001"main-class"\u3001\n          "arguments"\u3001"java-options"\u3001"app-version"\u3001"icon"\u3001\n          "win-console"\u3001"win-shortcut"\u3001"win-menu"\u3001\n          "linux-app-category"\u304A\u3088\u3073"linux-shortcut"\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n          \u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u5143\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u8FFD\u52A0\u3059\u308B\u304B\u3001\u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\n          \u4F7F\u7528\u3057\u3066\u5143\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4E0A\u66F8\u304D\u3057\u3066\u3001\u8FFD\u52A0\u306E\u4EE3\u66FF\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\n          \
+\u30E1\u30A4\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u306F\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u304B\u3089\u4F5C\u6210\u3055\u308C\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u8FFD\u52A0\u306E\u4EE3\u66FF\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3067\u304D\u3001\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8907\u6570\u56DE\u4F7F\u7528\u3057\u3066\n          \u8907\u6570\u306E\u8FFD\u52A0\u306E\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3067\u304D\u307E\u3059\u3002 \n  --arguments <main class arguments>\n          \u30E9\u30F3\u30C1\u30E3\u306B\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u5F15\u6570\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306B\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306B\u6E21\u3059\n          \u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u5F15\u6570\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --java-options <java options>\n          Java\u30E9\u30F3\u30BF\u30A4\u30E0\u306B\u6E21\u3059\u30AA\u30D7\u30B7\u30E7\u30F3\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --main-class <class name>\n          \u5B9F\u884C\u3059\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u4FEE\u98FE\u540D\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u3001--main-jar\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3060\u3051\u3067\u3059\u3002\n  --main-jar <main jar file>\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u542B\u3080\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3JAR\n          (\u5165\u529B\u30D1\u30B9\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9\u3068\u3057\u3066\u6307\u5B9A)\n          --module\u307E\u305F\u306F--main-jar\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u4E21\u65B9\u306F\n          \u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n  --module -m <module name>[/<main class>]\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB(\u304A\u3088\u3073\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9)\n          \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306B\u7F6E\u304B\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\n          Java\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u3067\u30EA\u30F3\u30AF\u3055\u308C\u307E\u3059\u3002--module\u307E\u305F\u306F--main-jar\n          \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u4E21\u65B9\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n{2}\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --about-url <url>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30DB\u30FC\u30E0\u30DA\u30FC\u30B8\u306EURL\n  --app-image <directory path>\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u53EF\u80FD\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3059\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u5834\u6240\n          \
+(\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --file-associations <file path>\n          \u30AD\u30FC\u3001\u5024\u306E\u30DA\u30A2\u306E\u30EA\u30B9\u30C8\u3092\u542B\u3080\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30AD\u30FC"extension"\u3001"mime-type"\u3001"icon"\u3001"description"\n          \u3092\u4F7F\u7528\u3057\u3066\u95A2\u9023\u4ED8\u3051\u3092\u8A18\u8FF0\u3067\u304D\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --resource-dir <directory path>\n          \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9jpackage\u30EA\u30BD\u30FC\u30B9\u3078\u306E\u30D1\u30B9\n          \u30A2\u30A4\u30B3\u30F3\u3001\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073jpackage\u306E\u305D\u306E\u4ED6\u306E\u30EA\u30BD\u30FC\u30B9\u306F\u3001\n          \u3053\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u7F6E\u63DB\u30EA\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u3067\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3067\u304D\u307E\u3059\u3002\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --runtime-image <directory path>\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u6642\u306B\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u30AA\u30D7\u30B7\u30E7\u30F3:\n{3}
 
 MSG_Help_win_launcher=\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --win-console\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B3\u30F3\u30BD\u30FC\u30EB\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u30B3\u30F3\u30BD\u30FC\u30EB\u30FB\n          \u30A4\u30F3\u30BF\u30E9\u30AF\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n
-MSG_Help_win_install=\
-\  --win-dir-chooser\n\
-\          Adds a dialog to enable the user to choose a directory in which\n\
-\          the product is installed.\n\
-\  --win-help-url <url>\n\
-\          URL where user can obtain further information or technical support\n\
-\  --win-menu\n\
-\          Request to add a Start menu shortcut for this application\n\
-\  --win-menu-group <menu group name>\n\
-\          Start Menu group this application is placed in\n\
-\  --win-per-user-install\n\
-\          Request to perform an install on a per-user basis\n\
-\  --win-shortcut\n\
-\          Request to add desktop shortcut for this application\n\
-\  --win-shortcut-prompt\n\
-\          Adds a dialog to enable the user to choose if shortcuts\n\
-\          will be created by installer.\n\
-\  --win-update-url <url>\n\
-\          URL of available application update information\n\
-\  --win-upgrade-uuid <id string>\n\
-\          UUID associated with upgrades for this package\n\
-
+MSG_Help_win_install=\  --win-dir-chooser\n          \u30E6\u30FC\u30B6\u30FC\u304C\u88FD\u54C1\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E\u3059\u308B\u305F\u3081\u306E\n          \u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --win-help-url <url>\n          \u30E6\u30FC\u30B6\u30FC\u304C\u8A73\u7D30\u60C5\u5831\u307E\u305F\u306F\u6280\u8853\u7684\u306A\u30B5\u30DD\u30FC\u30C8\u3092\u53D6\u5F97\u3067\u304D\u308BURL\n  --win-menu\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B9\u30BF\u30FC\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-menu-group <menu group name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u914D\u7F6E\u3059\u308B\u30B9\u30BF\u30FC\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --win-per-user-install\n          \u30E6\u30FC\u30B6\u30FC\u3054\u3068\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u5B9F\u884C\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-shortcut\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-shortcut-prompt\n          \u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u3067\u4F5C\u6210\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u30E6\u30FC\u30B6\u30FC\u304C\u9078\u629E\u3067\u304D\u308B\u3088\u3046\u306B\u3059\u308B\n          \u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --win-update-url <url>\n          \u4F7F\u7528\u53EF\u80FD\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u66F4\u65B0\u60C5\u5831\u306EURL\n  --win-upgrade-uuid <id string>\n          \u3053\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u305FUUID\n
 MSG_Help_win_install_dir=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240\u306E\u4E0B\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\n
-
-MSG_Help_mac_install=\
-\  --mac-dmg-content <additional content path>[,<additional content path>...]\n\
-\          Include all the referenced content in the dmg.\n\
-\          This option can be used multiple times. \n\
-
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          MacOS\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E00\u610F\u306B\u8B58\u5225\u3059\u308BID\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n          \u82F1\u6570\u5B57(A-Z\u3001a-z\u30010-9)\u3001\u30CF\u30A4\u30D5\u30F3(-)\n          \u304A\u3088\u3073\u30D4\u30EA\u30AA\u30C9(.)\u6587\u5B57\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --mac-package-name <name string>\n          \u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u306B\u8868\u793A\u3055\u308C\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\n          \u3053\u306E\u540D\u524D\u306F16\u6587\u5B57\u672A\u6E80\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\n          \u304A\u3088\u3073\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A\u3059\u308B\u306E\u306B\u9069\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u969B\u3001\u65E2\u5B58\u306E\u30D1\u30C3\u30B1\u30FC\u30B8ID\u306E\u306A\u3044\n          \u7F72\u540D\u304C\u5FC5\u8981\u306A\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3001\n          \u3053\u306E\u5024\u304C\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4ED8\u3051\u3089\u308C\u307E\u3059\u3002\n  --mac-sign\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u3088\u3046\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  \n\
-\  --mac-signing-keychain <keychain name>\n\
-\          Name of the keychain to search for the signing identity\n\
-\          If not specified, the standard keychains are used.\n\
-\  --mac-signing-key-user-name <team name>\n\
-\          Team or user name portion of Apple signing identities.\n\
-\  --mac-app-store\n\
-\          Indicates that the jpackage output is intended for the\n\
-\          Mac App Store.\n\
-\  --mac-entitlements <file path>\n\
-\          Path to file containing entitlements to use when signing\n\
-\          executables and libraries in the bundle.\n\
-\  --mac-app-category <category string>\n\
-\          String used to construct LSApplicationCategoryType in\n\
-\          application plist.  The default value is "utilities".\n\
-
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\n  --linux-deb-maintainer <email address>\n          .deb\u30D1\u30C3\u30B1\u30FC\u30B8\u306EMaintainer\n  --linux-menu-group <menu-group-name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u914D\u7F6E\u3055\u308C\u3066\u3044\u308B\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --linux-package-deps\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u6A5F\u80FD\n  --linux-rpm-license-type <type string>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u30BF\u30A4\u30D7(RPM .spec\u306E"License: <value>")\n\
-\  --linux-app-release <release value>\n\
-\          Release value of the RPM <name>.spec file or \n\
-\          Debian revision value of the DEB control file\n\
-\  --linux-app-category <category value>\n\
-\          Group value of the RPM <name>.spec file or \n\
-\          Section value of DEB control file\n\
-\  --linux-shortcut\n\
-\          Creates a shortcut for the application.\n\
-
+MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          dmg\u306B\u53C2\u7167\u3055\u308C\u305F\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u3059\u3079\u3066\u542B\u3081\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 \n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          macOS\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E00\u610F\u306B\u8B58\u5225\u3059\u308BID\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n          \u82F1\u6570\u5B57(A-Z\u3001a-z\u30010-9)\u3001\u30CF\u30A4\u30D5\u30F3(-)\u304A\u3088\u3073\u30D4\u30EA\u30AA\u30C9(.)\u6587\u5B57\u306E\u307F\n          \u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --mac-package-name <name string>\n          \u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u306B\u8868\u793A\u3055\u308C\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\n          \u3053\u306E\u540D\u524D\u306F16\u6587\u5B57\u672A\u6E80\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u304A\u3088\u3073\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\n          \u8868\u793A\u3059\u308B\u306E\u306B\u9069\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u969B\u3001\n          \u65E2\u5B58\u306E\u30D1\u30C3\u30B1\u30FC\u30B8ID\u306E\u306A\u3044\u7F72\u540D\u304C\u5FC5\u8981\u306A\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3001\n          \u3053\u306E\u5024\u304C\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4ED8\u3051\u3089\u308C\u307E\u3059\u3002\n  --mac-sign\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u3088\u3046\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --mac-signing-keychain <keychain name>\n          \u7F72\u540D\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u3092\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u306E\u540D\u524D\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u6A19\u6E96\u306E\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n  --mac-signing-key-user-name <team name>\n          Apple\u7F72\u540D\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u30C1\u30FC\u30E0\u307E\u305F\u306F\u30E6\u30FC\u30B6\u30FC\u540D\u90E8\u5206\u3002\n  --mac-app-store\n          jpackage\u51FA\u529B\u304CMac App Store\u7528\u3067\u3042\u308B\u3053\u3068\n          \u3092\u793A\u3057\u307E\u3059\u3002\n  --mac-entitlements <file path>\n          \u30D0\u30F3\u30C9\u30EB\u306E\u5B9F\u884C\u53EF\u80FD\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30E9\u30A4\u30D6\u30E9\u30EA\u306E\u7F72\u540D\u6642\u306B\n          \u4F7F\u7528\u3059\u308B\u6A29\u9650\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3002\n  --mac-app-category <category string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306Eplist\u306ELSApplicationCategoryType\u3092\u751F\u6210\u3059\u308B\u969B\u306B\u4F7F\u7528\u3059\u308B\u6587\u5B57\u5217\u3002\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F"utilities"\u3067\u3059\u3002\n
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\n  --linux-deb-maintainer <email address>\n          .deb\u30D1\u30C3\u30B1\u30FC\u30B8\u306EMaintainer\n  --linux-menu-group <menu-group-name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u914D\u7F6E\u3055\u308C\u3066\u3044\u308B\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --linux-package-deps\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u6A5F\u80FD\n  --linux-rpm-license-type <type string>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u30BF\u30A4\u30D7(RPM .spec\u306E"License: <value>")\n  --linux-app-release <release value>\n          RPM <name>.spec\u30D5\u30A1\u30A4\u30EB\u306E\u30EA\u30EA\u30FC\u30B9\u5024\u307E\u305F\u306F\n          DEB\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u30FB\u30D5\u30A1\u30A4\u30EB\u306EDebian\u30EA\u30D3\u30B8\u30E7\u30F3\u5024\u3002\n  --linux-app-category <category value>\n          RPM <name>.spec\u30D5\u30A1\u30A4\u30EB\u306E\u30B0\u30EB\u30FC\u30D7\u5024\u307E\u305F\u306F \n           DEB\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u5024\n  --linux-shortcut\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\n
 MSG_Help_mac_linux_install_dir=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u7D76\u5BFE\u30D1\u30B9\n
 MSG_Help_default_install_dir=OS X\u307E\u305F\u306FLinux\u4E0A\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u7D76\u5BFE\u30D1\u30B9\u3002\n          "\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D5\u30A1\u30A4\u30EB"\u3084"AppData"\u306A\u3069\u3001Windows\u4E0A\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\u3002\n
 MSG_Help_no_args=\u4F7F\u7528\u65B9\u6CD5: jpackage <options>\n\u5229\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001jpackage --help (or -h)\u3092\u4F7F\u7528\u3057\u307E\u3059
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
index 73a3db560ed..c863bd5e6f4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,238 +24,17 @@
 #
 #
 
-MSG_Help=Usage: jpackage <options>\n\
-\n\
-Sample usages:\n\
---------------\n\
-\    Generate an application package suitable for the host system:\n\
-\        For a modular application:\n\
-\            jpackage -n name -p modulePath -m moduleName/className\n\
-\        For a non-modular application:\n\
-\            jpackage -i inputDir -n name \\\n\
-\                --main-class className --main-jar myJar.jar\n\
-\        From a pre-built application image:\n\
-\            jpackage -n name --app-image appImageDir\n\
-\    Generate an application image:\n\
-\        For a modular application:\n\
-\            jpackage --type app-image -n name -p modulePath \\\n\
-\                -m moduleName/className\n\
-\        For a non-modular application:\n\
-\            jpackage --type app-image -i inputDir -n name \\\n\
-\                --main-class className --main-jar myJar.jar\n\
-\        To provide your own options to jlink, run jlink separately:\n\
-\            jlink --output appRuntimeImage -p modulePath \\\n\
-\                --add-modules moduleName \\\n\
-\                --no-header-files [<additional jlink options>...]\n\
-\            jpackage --type app-image -n name \\\n\
-\                -m moduleName/className --runtime-image appRuntimeImage\n\
-\    Generate a Java runtime package:\n\
-\        jpackage -n name --runtime-image <runtime-image>\n\
-\n\
-Generic Options:\n\
-\  @<filename> \n\
-\          Read options and/or mode from a file \n\
-\          This option can be used multiple times.\n\
-\  --type -t <type> \n\
-\          The type of package to create\n\
-\          Valid values are: {1} \n\
-\          If this option is not specified a platform dependent\n\
-\          default type will be created.\n\
-\  --app-version <version>\n\
-\          Version of the application and/or package\n\
-\  --copyright <copyright string>\n\
-\          Copyright for the application\n\
-\  --description <description string>\n\
-\          Description of the application\n\
-\  --help -h \n\
-\          Print the usage text with a list and description of each valid\n\
-\          option for the current platform to the output stream, and exit\n\
-\  --icon <file path>\n\
-\          Path of the icon of the application package\n\
-\          (absolute path or relative to the current directory)\n\
-\  --name -n <name>\n\
-\          Name of the application and/or package\n\
-\  --dest -d <destination path>\n\
-\          Path where generated output file is placed\n\
-\          (absolute path or relative to the current directory)\n\
-\          Defaults to the current working directory.\n\
-\  --temp <directory path>\n\
-\          Path of a new or empty directory used to create temporary files\n\
-\          (absolute path or relative to the current directory)\n\
-\          If specified, the temp dir will not be removed upon the task\n\
-\          completion and must be removed manually.\n\
-\          If not specified, a temporary directory will be created and\n\
-\          removed upon the task completion.\n\
-\  --vendor <vendor string>\n\
-\          Vendor of the application\n\
-\  --verbose\n\
-\          Enables verbose output\n\
-\  --version\n\
-\          Print the product version to the output stream and exit.\n\
-\n\
-\Options for creating the runtime image:\n\
-\  --add-modules <module name>[,<module name>...]\n\
-\          A comma (",") separated list of modules to add\n\
-\          This module list, along with the main module (if specified)\n\
-\          will be passed to jlink as the --add-module argument.\n\
-\          If not specified, either just the main module (if --module is\n\
-\          specified), or the default set of modules (if --main-jar is \n\
-\          specified) are used.\n\
-\          This option can be used multiple times.\n\
-\  --module-path -p <module path>...\n\
-\          A {0} separated list of paths\n\
-\          Each path is either a directory of modules or the path to a\n\
-\          modular jar.\n\
-\          (Each path is absolute or relative to the current directory.)\n\
-\          This option can be used multiple times.\n\
-\  --jlink-options <jlink options> \n\
-\          A space separated list of options to pass to jlink \n\
-\          If not specified, defaults to "--strip-native-commands \n\
-\          --strip-debug --no-man-pages --no-header-files". \n\
-\          This option can be used multiple times.\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image that will be copied into\n\
-\          the application image\n\
-\          (absolute path or relative to the current directory)\n\
-\          If --runtime-image is not specified, jpackage will run jlink to\n\
-\          create the runtime image using options:\n\
-\          --strip-debug, --no-header-files, --no-man-pages, and\n\
-\          --strip-native-commands.\n\
-\n\
-\Options for creating the application image:\n\
-\  --input -i <directory path>\n\
-\          Path of the input directory that contains the files to be packaged\n\
-\          (absolute path or relative to the current directory)\n\
-\          All files in the input directory will be packaged into the\n\
-\          application image.\n\
-\  --app-content <additional content>[,<additional content>...]\n\
-\          A comma separated list of paths to files and/or directories\n\
-\          to add to the application payload.\n\
-\          This option can be used more than once.\n\
-\n\
-\Options for creating the application launcher(s):\n\
-\  --add-launcher <launcher name>=<file path>\n\
-\          Name of launcher, and a path to a Properties file that contains\n\
-\          a list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "module", "main-jar", "main-class", "description",\n\
-\          "arguments", "java-options", "app-version", "icon",\n\
-\          "win-console", "win-shortcut", "win-menu",\n\
-\          "linux-app-category", and "linux-shortcut" can be used.\n\
-\          These options are added to, or used to overwrite, the original\n\
-\          command line options to build an additional alternative launcher.\n\
-\          The main application launcher will be built from the command line\n\
-\          options. Additional alternative launchers can be built using\n\
-\          this option, and this option can be used multiple times to\n\
-\          build multiple additional launchers. \n\
-\  --arguments <main class arguments>\n\
-\          Command line arguments to pass to the main class if no command\n\
-\          line arguments are given to the launcher\n\
-\          This option can be used multiple times.\n\
-\  --java-options <java options>\n\
-\          Options to pass to the Java runtime\n\
-\          This option can be used multiple times.\n\
-\  --main-class <class name>\n\
-\          Qualified name of the application main class to execute\n\
-\          This option can only be used if --main-jar is specified.\n\
-\  --main-jar <main jar file>\n\
-\          The main JAR of the application; containing the main class\n\
-\          (specified as a path relative to the input path)\n\
-\          Either --module or --main-jar option can be specified but not\n\
-\          both.\n\
-\  --module -m <module name>[/<main class>]\n\
-\          The main module (and optionally main class) of the application\n\
-\          This module must be located on the module path.\n\
-\          When this option is specified, the main module will be linked\n\
-\          in the Java runtime image.  Either --module or --main-jar\n\
-\          option can be specified but not both.\n\
-{2}\n\
-\Options for creating the application package:\n\
-\  --about-url <url>\n\
-\          URL of the application''s home page\n\
-\  --app-image <directory path>\n\
-\          Location of the predefined application image that is used\n\
-\          to build an installable package\n\
-\          (absolute path or relative to the current directory)\n\
-\  --file-associations <file path>\n\
-\          Path to a Properties file that contains list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "extension", "mime-type", "icon", and "description"\n\
-\          can be used to describe the association.\n\
-\          This option can be used multiple times.\n\
-\  --install-dir <directory path>\n\
-\          {4}\
-\  --license-file <file path>\n\
-\          Path to the license file\n\
-\          (absolute path or relative to the current directory)\n\
-\  --resource-dir <directory path>\n\
-\          Path to override jpackage resources\n\
-\          Icons, template files, and other resources of jpackage can be\n\
-\          over-ridden by adding replacement resources to this directory.\n\
-\          (absolute path or relative to the current directory)\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image to install\n\
-\          (absolute path or relative to the current directory)\n\
-\          Option is required when creating a runtime package.\n\
-\n\
-\Platform dependent options for creating the application package:\n\
-{3}
-MSG_Help_win_launcher=\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n  --win-console\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u63A7\u5236\u53F0\u542F\u52A8\u7A0B\u5E8F\uFF0C\u5E94\u5F53\u4E3A\n          \u9700\u8981\u63A7\u5236\u53F0\u4EA4\u4E92\u7684\u5E94\u7528\u7A0B\u5E8F\u6307\u5B9A\n
-MSG_Help_win_install=\
-\  --win-dir-chooser\n\
-\          Adds a dialog to enable the user to choose a directory in which\n\
-\          the product is installed.\n\
-\  --win-help-url <url>\n\
-\          URL where user can obtain further information or technical support\n\
-\  --win-menu\n\
-\          Request to add a Start menu shortcut for this application\n\
-\  --win-menu-group <menu group name>\n\
-\          Start Menu group this application is placed in\n\
-\  --win-per-user-install\n\
-\          Request to perform an install on a per-user basis\n\
-\  --win-shortcut\n\
-\          Request to add desktop shortcut for this application\n\
-\  --win-shortcut-prompt\n\
-\          Adds a dialog to enable the user to choose if shortcuts\n\
-\          will be created by installer.\n\
-\  --win-update-url <url>\n\
-\          URL of available application update information\n\
-\  --win-upgrade-uuid <id string>\n\
-\          UUID associated with upgrades for this package\n\
+MSG_Help=\u7528\u6CD5\uFF1Ajpackage <options>\n\n\u793A\u4F8B\u7528\u6CD5:\n--------------\n    \u751F\u6210\u9002\u5408\u4E3B\u673A\u7CFB\u7EDF\u7684\u5E94\u7528\u7A0B\u5E8F\u5305\uFF1A\n        \u5BF9\u4E8E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage -n name -p modulePath -m moduleName/className\n        \u5BF9\u4E8E\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u4ECE\u9884\u6784\u5EFA\u7684\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\uFF1A\n            jpackage -n name --app-image appImageDir\n    \u751F\u6210\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\uFF1A\n        \u5BF9\u4E8E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        \u5BF9\u4E8E\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u8981\u4E3A jlink \u63D0\u4F9B\u60A8\u81EA\u5DF1\u7684\u9009\u9879\uFF0C\u8BF7\u5355\u72EC\u8FD0\u884C jlink\uFF1A\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    \u751F\u6210 Java \u8FD0\u884C\u65F6\u7A0B\u5E8F\u5305\uFF1A\n        jpackage -n name --runtime-image <runtime-image>\n\n\u4E00\u822C\u9009\u9879\uFF1A\n  @<filename> \n          \u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C/\u6216\u6A21\u5F0F \n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --type -t <type> \n          \u8981\u521B\u5EFA\u7684\u7A0B\u5E8F\u5305\u7684\u7C7B\u578B\n          \u6709\u6548\u503C\u4E3A\uFF1A{1} \n          \u5982\u679C\u672A\u6307\u5B9A\u6B64\u9009\u9879\uFF0C\u5219\u5C06\u521B\u5EFA\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\n          \u9ED8\u8BA4\u7C7B\u578B\u3002\n  --app-version <version>\n          \u5E94\u7528\u7A0B\u5E8F\u548C/\u6216\u7A0B\u5E8F\u5305\u7684\u7248\u672C\n  --copyright <copyright string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u7248\u6743\n  --description <description string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u8BF4\u660E\n  --help -h \n          \u5C06\u7528\u6CD5\u6587\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\uFF0C\u7528\u6CD5\u6587\u672C\u4E2D\u5305\u542B\n          \u9002\u7528\u4E8E\u5F53\u524D\u5E73\u53F0\u7684\u6BCF\u4E2A\u6709\u6548\u9009\u9879\u7684\u5217\u8868\u548C\u8BF4\u660E\n  --icon <file path>\n          \u5E94\u7528\u7A0B\u5E8F\u5305\u56FE\u6807\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --name -n <name>\n          \u5E94\u7528\u7A0B\u5E8F\u548C/\u6216\u7A0B\u5E8F\u5305\u7684\u540D\u79F0\n  --dest -d <destination path>\n          \u7528\u6765\u653E\u7F6E\u6240\u751F\u6210\u7684\u8F93\u51FA\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u9ED8\u8BA4\u4E3A\u5F53\u524D\u7684\u5DE5\u4F5C\u76EE\u5F55\u3002\n  --temp <directory path>\n          \u7528\u6765\u521B\u5EFA\u4E34\u65F6\u6587\u4EF6\u7684\u65B0\u76EE\u5F55\u6216\u7A7A\u767D\u76EE\u5F55\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5982\u679C\u6307\u5B9A\uFF0C\u5219\u5728\u4EFB\u52A1\u5B8C\u6210\u65F6\u5C06\u4E0D\u5220\u9664\u4E34\u65F6\u76EE\u5F55\uFF0C\n          \u5FC5\u987B\u624B\u52A8\u5220\u9664\u4E34\u65F6\u76EE\u5F55\u3002\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u5C06\u521B\u5EFA\u4E00\u4E2A\u4E34\u65F6\u76EE\u5F55\uFF0C\n          \
+\u5E76\u5728\u4EFB\u52A1\u5B8C\u6210\u65F6\u5220\u9664\u8BE5\u4E34\u65F6\u76EE\u5F55\u3002\n  --vendor <vendor string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4F9B\u5E94\u5546\n  --verbose\n          \u542F\u7528\u8BE6\u7EC6\u7684\u8F93\u51FA\n  --version\n          \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\u3002\n\n\u7528\u6765\u521B\u5EFA\u8FD0\u884C\u65F6\u6620\u50CF\u7684\u9009\u9879\uFF1A\n  --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n          \u8981\u6DFB\u52A0\u7684\u6A21\u5757\u7684\u9017\u53F7 (",") \u5206\u9694\u5217\u8868\n          \u6B64\u6A21\u5757\u5217\u8868\u8FDE\u540C\u4E3B\u6A21\u5757\uFF08\u5982\u679C\u6307\u5B9A\uFF09\n          \u5C06\u4F5C\u4E3A --add-module \u53C2\u6570\u4F20\u9012\u5230 jlink\u3002\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u4EC5\u4F7F\u7528\u4E3B\u6A21\u5757\uFF08\u5982\u679C\u6307\u5B9A\u4E86 --module\uFF09\uFF0C\n          \u6216\u8005\u4F7F\u7528\u9ED8\u8BA4\u7684\u6A21\u5757\u96C6\uFF08\u5982\u679C\u6307\u5B9A\u4E86  \n          --main-jar\uFF09\u3002\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --module-path -p <module path>...\n          \u8DEF\u5F84\u7684 {0} \u5206\u9694\u5217\u8868\n          \u6BCF\u4E2A\u8DEF\u5F84\u8981\u4E48\u662F\u6A21\u5757\u7684\u76EE\u5F55\uFF0C\u8981\u4E48\u662F\n          \u6A21\u5757 jar \u7684\u8DEF\u5F84\u3002\n          \uFF08\u6BCF\u4E2A\u8DEF\u5F84\u53EF\u4EE5\u662F\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u4E5F\u53EF\u4EE5\u662F\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\u3002\uFF09\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --jlink-options <jlink \u9009\u9879> \n          \u8981\u4F20\u9012\u7ED9 jlink \u7684\u9009\u9879\u5217\u8868\uFF08\u7528\u7A7A\u683C\u5206\u9694\uFF09 \n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u9ED8\u8BA4\u4E3A "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files"\u3002 \n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --runtime-image <directory path>\n          \u5C06\u590D\u5236\u5230\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u9884\u5B9A\u4E49\n          \u8FD0\u884C\u65F6\u6620\u50CF\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5982\u679C\u672A\u6307\u5B9A --runtime-image\uFF0Cjpackage \u5C06\u8FD0\u884C jlink \u4EE5\n          \u4F7F\u7528\u5982\u4E0B\u9009\u9879\u521B\u5EFA\u8FD0\u884C\u65F6\u6620\u50CF\uFF1A\n          --strip-debug\u3001--no-header-files\u3001--no-man-pages \u548C \n          --strip-native-commands\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u9009\u9879\uFF1A\n  --input -i <directory path>\n          \u5305\u542B\u8981\u6253\u5305\u7684\u6587\u4EF6\u7684\u8F93\u5165\u76EE\u5F55\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u8F93\u5165\u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5C06\u6253\u5305\u5230\n          \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E2D\u3002\n  --app-content <additional content>[,<additional content>...]\n          \u8981\u6DFB\u52A0\u5230\u5E94\u7528\u7A0B\u5E8F\u6709\u6548\u8D1F\u8F7D\u4E2D\u7684\u6587\u4EF6\u548C/\u6216\n          \u76EE\u5F55\u7684\u9017\u53F7\u5206\u9694\u8DEF\u5F84\u5217\u8868\u3002\n          \u6B64\u9009\u9879\u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u9009\u9879\uFF1A\n  --add-launcher <launcher name>=<file path>\n          \u542F\u52A8\u7A0B\u5E8F\u7684\u540D\u79F0\u548C\u5305\u542B\u5173\u952E\u5B57-\u503C\u5BF9\u5217\u8868\u7684\n          \u5C5E\u6027\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \
+\u53EF\u4EE5\u4F7F\u7528\u5173\u952E\u5B57 "module"\u3001"main-jar"\u3001"main-class"\u3001\n          "arguments"\u3001"java-options"\u3001"app-version"\u3001"icon"\u3001\n          "win-console"\u3001"win-shortcut"\u3001"win-menu"\u3001\n          "linux-app-category" \u548C "linux-shortcut"\u3002\n          \u8FD9\u4E9B\u9009\u9879\u5C06\u6DFB\u52A0\u5230\u539F\u59CB\u547D\u4EE4\u884C\u9009\u9879\u4E2D\u6216\u8005\u7528\u6765\u8986\u76D6\n          \u539F\u59CB\u547D\u4EE4\u884C\u9009\u9879\uFF0C\u4EE5\u6784\u5EFA\u989D\u5916\u7684\u66FF\u4EE3\u542F\u52A8\u7A0B\u5E8F\u3002\n          \u5C06\u4ECE\u547D\u4EE4\u884C\u9009\u9879\u6784\u5EFA\u4E3B\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u3002\n          \u53EF\u4EE5\u4F7F\u7528\u6B64\u9009\u9879\u6784\u5EFA\u989D\u5916\u7684\u66FF\u4EE3\u542F\u52A8\u7A0B\u5E8F\uFF0C\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u6765\u6784\u5EFA\n          \u591A\u4E2A\u989D\u5916\u7684\u542F\u52A8\u7A0B\u5E8F\u3002 \n  --arguments <main class arguments>\n          \u5728\u6CA1\u6709\u4E3A\u542F\u52A8\u7A0B\u5E8F\u63D0\u4F9B\u547D\u4EE4\u884C\u53C2\u6570\u65F6\uFF0C\n          \u8981\u4F20\u9012\u5230\u4E3B\u7C7B\u7684\u547D\u4EE4\u884C\u53C2\u6570\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --java-options <java options>\n          \u8981\u4F20\u9012\u5230 Java \u8FD0\u884C\u65F6\u7684\u9009\u9879\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --main-class <class name>\n          \u8981\u6267\u884C\u7684\u5E94\u7528\u7A0B\u5E8F\u4E3B\u7C7B\u7684\u9650\u5B9A\u540D\u79F0\n          \u53EA\u6709\u5728\u6307\u5B9A\u4E86 --main-jar \u65F6\u624D\u80FD\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --main-jar <main jar file>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B JAR\uFF1B\u5305\u542B\u4E3B\u7C7B\n          \uFF08\u6307\u5B9A\u4E3A\u76F8\u5BF9\u4E8E\u8F93\u5165\u8DEF\u5F84\u7684\u8DEF\u5F84\uFF09\n          \u53EF\u4EE5\u6307\u5B9A --module \u6216 --main-jar \u9009\u9879\uFF0C\u4F46\u662F\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A\n          \u4E24\u8005\u3002\n  --module -m <module name>[/<main class>]\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u6A21\u5757\uFF08\u4EE5\u53CA\u53EF\u9009\u7684\u4E3B\u7C7B\uFF09\n          \u6B64\u6A21\u5757\u5FC5\u987B\u4F4D\u4E8E\u6A21\u5757\u8DEF\u5F84\u4E2D\u3002\n          \u5982\u679C\u6307\u5B9A\u4E86\u6B64\u9009\u9879\uFF0C\u5219\u5C06\u5728 Java \u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\n          \u94FE\u63A5\u4E3B\u6A21\u5757\u3002\u53EF\u4EE5\u6307\u5B9A --module \u6216 --main-jar \u9009\u9879\uFF0C\n          \u4F46\u662F\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A\u8FD9\u4E24\u4E2A\u9009\u9879\u3002\n{2}\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305\u7684\u9009\u9879\uFF1A\n  --about-url <url>\n          \u5E94\u7528\u7A0B\u5E8F\u4E3B\u9875\u7684 URL\n  --app-image <directory path>\n          \u7528\u6765\u6784\u5EFA\u53EF\u5B89\u88C5\u7A0B\u5E8F\u5305\u7684\n          \u9884\u5B9A\u4E49\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u4F4D\u7F6E\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --file-associations <file path>\n          \u5305\u542B\u5173\u952E\u5B57-\u503C\u5BF9\u5217\u8868\u7684\u5C5E\u6027\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u53EF\u4EE5\u4F7F\u7528\u5173\u952E\u5B57 "extension"\u3001"mime-type"\u3001"icon" \u548C "description" \n          \u6765\u63CF\u8FF0\u6B64\u5173\u8054\u3002\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          \u8BB8\u53EF\u8BC1\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --resource-dir <directory path>\n          \u8986\u76D6 jpackage \
+\u8D44\u6E90\u7684\u8DEF\u5F84\n          \u53EF\u4EE5\u901A\u8FC7\u5411\u8BE5\u76EE\u5F55\u4E2D\u6DFB\u52A0\u66FF\u4EE3\u8D44\u6E90\u6765\u8986\u76D6 jpackage \u7684\n          \u56FE\u6807\u3001\u6A21\u677F\u6587\u4EF6\u548C\u5176\u4ED6\u8D44\u6E90\u3002\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --runtime-image <directory path>\n          \u8981\u5B89\u88C5\u7684\u9884\u5B9A\u4E49\u8FD0\u884C\u65F6\u6620\u50CF\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5728\u521B\u5EFA\u8FD0\u884C\u65F6\u7A0B\u5E8F\u5305\u65F6\u9700\u8981\u4F7F\u7528\u9009\u9879\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n{3}
 
+MSG_Help_win_launcher=\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n  --win-console\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u63A7\u5236\u53F0\u542F\u52A8\u7A0B\u5E8F\uFF0C\u5E94\u5F53\u4E3A\n          \u9700\u8981\u63A7\u5236\u53F0\u4EA4\u4E92\u7684\u5E94\u7528\u7A0B\u5E8F\u6307\u5B9A\n
+MSG_Help_win_install=\  --win-dir-chooser\n          \u6DFB\u52A0\u4E00\u4E2A\u5BF9\u8BDD\u6846\u4EE5\u5141\u8BB8\u7528\u6237\u9009\u62E9\n          \u4EA7\u54C1\u7684\u5B89\u88C5\u76EE\u5F55\u3002\n  --win-help-url <url>\n          \u7528\u6237\u53EF\u4EE5\u4ECE\u4E2D\u83B7\u53D6\u66F4\u591A\u4FE1\u606F\u6216\u6280\u672F\u652F\u6301\u7684 URL\n  --win-menu\n          \u8BF7\u6C42\u4E3A\u6B64\u5E94\u7528\u7A0B\u5E8F\u6DFB\u52A0\u5F00\u59CB\u83DC\u5355\u5FEB\u6377\u65B9\u5F0F\n  --win-menu-group <menu group name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u5F00\u59CB\u83DC\u5355\u7EC4\n  --win-per-user-install\n          \u8BF7\u6C42\u57FA\u4E8E\u6BCF\u4E2A\u7528\u6237\u6267\u884C\u5B89\u88C5\n  --win-shortcut\n          \u8BF7\u6C42\u4E3A\u6B64\u5E94\u7528\u7A0B\u5E8F\u6DFB\u52A0\u684C\u9762\u5FEB\u6377\u65B9\u5F0F\n  --win-shortcut-prompt\n          \u6DFB\u52A0\u4E00\u4E2A\u5BF9\u8BDD\u6846\u4EE5\u5141\u8BB8\u7528\u6237\u9009\u62E9\u662F\u5426\u5C06\u7531\u5B89\u88C5\u7A0B\u5E8F\n          \u521B\u5EFA\u5FEB\u6377\u65B9\u5F0F\u3002\n  --win-update-url <url>\n          \u53EF\u7528\u5E94\u7528\u7A0B\u5E8F\u66F4\u65B0\u4FE1\u606F\u7684 URL\n  --win-upgrade-uuid <id string>\n          \u4E0E\u6B64\u7A0B\u5E8F\u5305\u7684\u5347\u7EA7\u76F8\u5173\u8054\u7684 UUID\n
 MSG_Help_win_install_dir=\u9ED8\u8BA4\u5B89\u88C5\u4F4D\u7F6E\u4E0B\u9762\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\n
-
-MSG_Help_mac_install=\
-\  --mac-dmg-content <additional content path>[,<additional content path>...]\n\
-\          Include all the referenced content in the dmg.\n\
-\          This option can be used multiple times. \n\
-
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          \u7528\u6765\u552F\u4E00\u5730\u6807\u8BC6 macOS \u5E94\u7528\u7A0B\u5E8F\u7684\u6807\u8BC6\u7B26\n          \u9ED8\u8BA4\u4E3A\u4E3B\u7C7B\u540D\u79F0\u3002\n          \u53EA\u80FD\u4F7F\u7528\u5B57\u6BCD\u6570\u5B57\uFF08A-Z\u3001a-z\u30010-9\uFF09\u3001\u8FDE\u5B57\u7B26 (-) \u548C\n          \u53E5\u70B9 (.) \u5B57\u7B26\u3002\n  --mac-package-name <name string>\n          \u51FA\u73B0\u5728\u83DC\u5355\u680F\u4E2D\u7684\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n          \u8FD9\u53EF\u4EE5\u4E0E\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u4E0D\u540C\u3002\n          \u6B64\u540D\u79F0\u7684\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E 16 \u4E2A\u5B57\u7B26\uFF0C\u9002\u5408\n          \u663E\u793A\u5728\u83DC\u5355\u680F\u4E2D\u548C\u5E94\u7528\u7A0B\u5E8F\u201C\u4FE1\u606F\u201D\u7A97\u53E3\u4E2D\u3002\n          \u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u5728\u5BF9\u5E94\u7528\u7A0B\u5E8F\u5305\u7B7E\u540D\u65F6\uFF0C\u4F1A\u5728\u6240\u6709\u9700\u8981\u7B7E\u540D\n          \u4F46\u5F53\u524D\u6CA1\u6709\u7A0B\u5E8F\u5305\u6807\u8BC6\u7B26\u7684\u7EC4\u4EF6\u7684\n          \u524D\u9762\u52A0\u4E0A\u6B64\u503C\u3002\n  --mac-sign\n          \u8BF7\u6C42\u5BF9\u7A0B\u5E8F\u5305\u8FDB\u884C\u7B7E\u540D\n\
-\  --mac-signing-keychain <keychain name>\n\
-\          Name of the keychain to search for the signing identity\n\
-\          If not specified, the standard keychains are used.\n\
-\  --mac-signing-key-user-name <team name>\n\
-\          Team or user name portion of Apple signing identities.\n\
-\  --mac-app-store\n\
-\          Indicates that the jpackage output is intended for the\n\
-\          Mac App Store.\n\
-\  --mac-entitlements <file path>\n\
-\          Path to file containing entitlements to use when signing\n\
-\          executables and libraries in the bundle.\n\
-\  --mac-app-category <category string>\n\
-\          String used to construct LSApplicationCategoryType in\n\
-\          application plist.  The default value is "utilities".\n\
-
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux \u7A0B\u5E8F\u5305\u7684\u540D\u79F0\uFF0C\u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n  --linux-deb-maintainer <email address>\n          .deb \u7A0B\u5E8F\u5305\u7684\u7EF4\u62A4\u7A0B\u5E8F\n  --linux-menu-group <menu-group-name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u83DC\u5355\u7EC4\n  --linux-package-deps\n          \u5E94\u7528\u7A0B\u5E8F\u6240\u9700\u7684\u7A0B\u5E8F\u5305\u6216\u529F\u80FD\n  --linux-rpm-license-type <type string>\n          \u8BB8\u53EF\u8BC1\u7684\u7C7B\u578B\uFF08RPM .spec \u7684 "License: <value>"\uFF09\n\
-\  --linux-app-release <release value>\n\
-\          Release value of the RPM <name>.spec file or \n\
-\          Debian revision value of the DEB control file\n\
-\  --linux-app-category <category value>\n\
-\          Group value of the RPM <name>.spec file or \n\
-\          Section value of DEB control file\n\
-\  --linux-shortcut\n\
-\          Creates a shortcut for the application.\n\
-
+MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          \u5305\u62EC DMG \u4E2D\u5F15\u7528\u7684\u6240\u6709\u5185\u5BB9\u3002\n          \u6B64\u9009\u9879\u53EF\u4EE5\u4F7F\u7528\u591A\u6B21\u3002\n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          \u7528\u6765\u552F\u4E00\u5730\u6807\u8BC6 macOS \u5E94\u7528\u7A0B\u5E8F\u7684\u6807\u8BC6\u7B26\n          \u9ED8\u8BA4\u4E3A\u4E3B\u7C7B\u540D\u79F0\u3002\n          \u53EA\u80FD\u4F7F\u7528\u5B57\u6BCD\u6570\u5B57 (A-Z,a-z,0-9)\u3001\u8FDE\u5B57\u7B26 (-) \u548C\n          \u53E5\u70B9 (.) \u5B57\u7B26\u3002\n  --mac-package-name <name string>\n          \u51FA\u73B0\u5728\u83DC\u5355\u680F\u4E2D\u7684\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n          \u8FD9\u53EF\u4EE5\u4E0E\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u4E0D\u540C\u3002\n          \u6B64\u540D\u79F0\u7684\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E 16 \u4E2A\u5B57\u7B26\uFF0C\u9002\u5408\n          \u663E\u793A\u5728\u83DC\u5355\u680F\u4E2D\u548C\u5E94\u7528\u7A0B\u5E8F\u201C\u4FE1\u606F\u201D\u7A97\u53E3\u4E2D\u3002\n          \u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u5728\u5BF9\u5E94\u7528\u7A0B\u5E8F\u5305\u7B7E\u540D\u65F6\uFF0C\u4F1A\u5728\u6240\u6709\u9700\u8981\u7B7E\u540D\n          \u4F46\u5F53\u524D\u6CA1\u6709\u7A0B\u5E8F\u5305\u6807\u8BC6\u7B26\u7684\u7EC4\u4EF6\u7684\n          \u524D\u9762\u52A0\u4E0A\u6B64\u503C\u3002\n  --mac-sign\n          \u8BF7\u6C42\u5BF9\u7A0B\u5E8F\u5305\u8FDB\u884C\u7B7E\u540D\n  --mac-signing-keychain <keychain name>\n          \u8981\u7528\u6765\u641C\u7D22\u7B7E\u540D\u8EAB\u4EFD\u7684\u5BC6\u94A5\u94FE\u7684\u540D\u79F0\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u4F7F\u7528\u6807\u51C6\u7684\u5BC6\u94A5\u94FE\u3002\n  --mac-signing-key-user-name <team name>\n          Apple \u7B7E\u540D\u8EAB\u4EFD\u7684\u56E2\u961F\u6216\u7528\u6237\u540D\u79F0\u90E8\u5206\u3002\n  --mac-app-store\n          \u6307\u793A jpackage \u8F93\u51FA\u9762\u5411 \n          Mac App Store\u3002\n  --mac-entitlements <file path>\n          \u5305\u542B\u4E00\u4E9B\u6743\u5229\u7684\u6587\u4EF6\u7684\u8DEF\u5F84\uFF0C\u5728\u5BF9\u6346\u7ED1\u5305\u4E2D\u7684\u53EF\u6267\u884C\u6587\u4EF6\n          \u548C\u5E93\u8FDB\u884C\u7B7E\u540D\u65F6\u4F1A\u4F7F\u7528\u8FD9\u4E9B\u6743\u5229\u3002\n  --mac-app-category <category string>\n          \u7528\u4E8E\u6784\u9020\u5E94\u7528\u7A0B\u5E8F plist \u4E2D LSApplicationCategoryType \u7684\n          \u5B57\u7B26\u4E32\u3002\u9ED8\u8BA4\u503C\u4E3A "utilities"\u3002\n
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux \u7A0B\u5E8F\u5305\u7684\u540D\u79F0\uFF0C\u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n  --linux-deb-maintainer <email address>\n          .deb \u7A0B\u5E8F\u5305\u7684\u7EF4\u62A4\u7A0B\u5E8F\n  --linux-menu-group <menu-group-name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u83DC\u5355\u7EC4\n  --linux-package-deps\n          \u5E94\u7528\u7A0B\u5E8F\u6240\u9700\u7684\u7A0B\u5E8F\u5305\u6216\u529F\u80FD\n  --linux-rpm-license-type <type string>\n          \u8BB8\u53EF\u8BC1\u7684\u7C7B\u578B\uFF08RPM .spec \u7684 "License: <value>"\uFF09\n  --linux-app-release <release value>\n          RPM <name>.spec \u6587\u4EF6\u7684\u53D1\u884C\u7248\u503C\u6216 \n          DEB \u63A7\u5236\u6587\u4EF6\u7684 Debian \u4FEE\u8BA2\u7248\u503C\n  --linux-app-category <category value>\n          RPM <name>.spec \u6587\u4EF6\u7684\u7EC4\u503C\u6216 \n          DEB \u63A7\u5236\u6587\u4EF6\u7684\u8282\u503C\n  --linux-shortcut\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u5FEB\u6377\u65B9\u5F0F\u3002\n
 MSG_Help_mac_linux_install_dir=\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u76EE\u5F55\u7684\u7EDD\u5BF9\u8DEF\u5F84\n
 MSG_Help_default_install_dir=OS X \u6216 Linux \u4E0A\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u76EE\u5F55\u7684\u7EDD\u5BF9\u8DEF\u5F84\u3002\n          Windows \u4E0A\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u4F4D\u7F6E\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\n          \uFF08\u5982 "Program Files" \u6216 "AppData"\uFF09\u3002\n
 MSG_Help_no_args=\u7528\u6CD5\uFF1Ajpackage <options>\n\u4F7F\u7528 jpackage --help\uFF08\u6216 -h\uFF09\u53EF\u83B7\u53D6\u53EF\u80FD\u9009\u9879\u7684\u5217\u8868
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
new file mode 100644
index 00000000000..72245cc578a
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+param.copyright.default=Copyright (C) {0,date,YYYY}
+param.description.default=Kein Wert
+param.vendor.default=Unbekannt
+
+message.using-default-resource=Standardpackageressource {0} {1} wird verwendet (durch Hinzuf\u00FCgen von {2} zu resource-dir ist eine Anpassung m\u00F6glich).
+message.no-default-resource=Keine Standardpackageressource {0} {1} (durch Hinzuf\u00FCgen von {2} zu resource-dir ist eine Anpassung m\u00F6glich).
+message.using-custom-resource-from-file=Benutzerdefinierte Packageressource {0} wird verwendet (aus Datei {1} geladen).
+message.using-custom-resource=Benutzerdefinierte Packageressource {0} wird verwendet (aus {1} geladen).
+message.creating-app-bundle=Anwendungspackage {0} wird in {1} erstellt
+message.app-image-dir-does-not-exist=Angegebenes Anwendungsimageverzeichnis {0}: {1} ist nicht vorhanden
+message.app-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist
+message.runtime-image-dir-does-not-exist=Angegebenes Laufzeitimageverzeichnis {0}: {1} ist nicht vorhanden
+message.runtime-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist
+message.resource-dir-does-not-exist=Angegebenes Ressourcenverzeichnis {0}: {1} ist nicht vorhanden
+message.debug-working-directory=Arbeitsverzeichnis f\u00FCr Debug beibehalten: {0}
+message.bundle-created={0}-Package wurde erfolgreich erstellt
+message.module-version=Version "{0}" aus Modul "{1}" wird als Anwendungsversion verwendet
+message.module-class=Klasse "{0}" aus Modul "{1}" wird als Anwendungshauptklasse verwendet
+
+error.version-string-empty="Version darf keine leere Zeichenfolge sein"
+error.version-string-zero-length-component="Version [{0}] enth\u00E4lt eine Komponente mit einer Nulll\u00E4nge"
+error.version-string-invalid-component="Version [{0}] enth\u00E4lt ung\u00FCltige Komponente [{1}]"
+
+error.cannot-create-output-dir=Zielverzeichnis {0} kann nicht erstellt werden
+error.cannot-write-to-output-dir=Zielverzeichnis {0} ist schreibgesch\u00FCtzt
+error.root-exists=Fehler: Anwendungszielverzeichnis {0} ist bereits vorhanden
+error.no-main-class-with-main-jar=Es wurde keine Hauptklasse angegeben oder in der JAR-Datei {0} gefunden
+error.no-main-class-with-main-jar.advice=Geben Sie eine Hauptklasse an, oder stellen Sie sicher, dass die JAR-Datei {0} eine Hauptklasse im Manifest angibt
+error.no-main-class=Es wurde keine Hauptklasse angegeben oder in den angegebenen Anwendungsressourcen gefunden
+error.no-main-class.advice=Geben Sie eine Anwendungsklasse an, oder stellen Sie sicher, dass die appResources eine JAR-Datei mit einer Anwendungsklasse im Manifest enthalten
+error.main-jar-does-not-exist=Die konfigurierte Haupt-JAR-Datei ist im Eingabeverzeichnis nicht vorhanden {0}
+error.main-jar-does-not-exist.advice=Die Haupt-JAR-Datei muss relativ zum Eingabeverzeichnis (nicht als absoluter Pfad) angegeben werden und muss in diesem Verzeichnis vorhanden sein
+error.no-module-in-path="{0}-Modul im Modulpfad nicht gefunden"
+error.not-path-parameter="Ung\u00FCltiger Wert f\u00FCr Parameter {0}: {1}"
+error.no-input-parameter="--input-Parameter f\u00FCr nicht modulare Anwendung fehlt"
+error.no-main-jar-parameter="--main-jar-Parameter f\u00FCr nicht modulare Anwendung fehlt"
+
+error.no-content-types-for-file-association=F\u00FCr Dateiverkn\u00FCpfungsnummer {0} wurden keine MIME-Typen angegeben
+error.no-content-types-for-file-association.advice=Geben Sie einen MIME-Typ f\u00FCr Dateiverkn\u00FCpfungsnummer {0} an
+error.too-many-content-types-for-file-association=F\u00FCr Dateiverkn\u00FCpfungsnummer {0} wurde mehr als ein MIME-Typ angegeben
+error.too-many-content-types-for-file-association.advice=Geben Sie nur einen MIME-Typ f\u00FCr Dateiverkn\u00FCpfungsnummer {0} an
+
+error.tool-not-found={0} kann nicht gefunden werden. Grund: {1}
+error.tool-not-found.advice=Installieren Sie {0}
+error.tool-old-version={0} {1} oder eine neuere Version kann nicht gefunden werden
+error.tool-old-version.advice=Installieren Sie {0} {1} oder eine neuere Version
+error.jlink.failed=jlink nicht erfolgreich mit: {0}
+error.blocked.option=jlink-Option [{0}] ist in --jlink-options nicht zul\u00E4ssig
+error.no.name=Name nicht mit --name angegeben. Es kann auch kein Name aus app-image abgeleitet werden
+
+warning.no.jdk.modules.found=Warnung: Keine JDK-Module gefunden
+warning.foreign-app-image=Warnung: app-image-Verzeichnis ({0}) wurde von jpackage nicht generiert.
+warning.invalid-app-image=Warnung: .jpackage.xml kann in app-image-Verzeichnis ({0}) nicht geparst werden
+
+MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
+MSG_BundlerConfigException=Bundler {0} aufgrund eines Konfigurationsproblems \u00FCbersprungen: {1} \nEmpfehlung zur Behebung: {2}
+MSG_BundlerConfigExceptionNoAdvice=Bundler {0} aufgrund eines Konfigurationsproblems \u00FCbersprungen: {1}
+MSG_BundlerRuntimeException=Bundler {0} nicht erfolgreich. Grund: {1}
+MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
+
+ERR_NoMainClass=Fehler: Hauptanwendungsklasse fehlt
+ERR_UnsupportedOption=Fehler: Option [{0}] ist auf dieser Plattform ung\u00FCltig
+ERR_InvalidTypeOption=Fehler: Option [{0}] ist nicht g\u00FCltig mit Typ [{1}]
+ERR_NoInstallerEntryPoint=Fehler: Option [{0}] ist nicht g\u00FCltig ohne Einstiegspunktoption --module oder --main-jar
+ERR_MutuallyExclusiveOptions="Fehler: Optionen [{0}] und [{1}] schlie\u00DFen sich gegenseitig aus
+
+ERR_MissingArgument=Fehler: Fehlendes Argument: {0}
+ERR_MissingAppResources=Fehler: Keine Anwendungs-JAR-Dateien gefunden
+ERR_AppImageNotExist=Fehler: Anwendungsimageverzeichnis "{0}" ist nicht vorhanden
+ERR_NoAddLauncherName=Fehler: F\u00FCr Option --add-launcher m\u00FCssen ein Name und ein Dateipfad angegeben werden (--add-launcher <Name>=<Dateipfad>)
+ERR_NoUniqueName=Fehler: F\u00FCr --add-launcher <Name>=<Dateipfad> ist ein eindeutiger Name erforderlich
+ERR_NoJreInstallerName=Fehler: F\u00FCr JRE-Installationsprogramme ist ein Namensparameter erforderlich
+ERR_InvalidAppName=Fehler: Ung\u00FCltiger Anwendungsname: {0}
+ERR_InvalidSLName=Fehler: Ung\u00FCltiger Name f\u00FCr hinzuzuf\u00FCgenden Launcher: {0}
+ERR_IconFileNotExit=Fehler: Die angegebene Symboldatei [{0}] ist nicht vorhanden
+ERR_LicenseFileNotExit=Fehler: Die angegebene Lizenzdatei ist nicht vorhanden
+ERR_BuildRootInvalid=Fehler: Das tempor\u00E4re Verzeichnis ({0}) darf nicht vorhanden oder muss leer sein
+ERR_InvalidOption=Fehler: Ung\u00FCltige Option: [{0}]
+ERR_InvalidInstallerType=Fehler: Ung\u00FCltiger oder nicht unterst\u00FCtzter Typ: [{0}]
+ERR_BothMainJarAndModule=Fehler: Die Optionen --main-jar und --module d\u00FCrfen nicht beide vorhanden sein
+ERR_NoEntryPoint=Fehler: F\u00FCr das Erstellen des Anwendungsimages muss entweder die Option --main-jar oder die Option --module angegeben werden
+ERR_InputNotDirectory=Fehler: Das angegebene Eingabeverzeichnis ist kein Verzeichnis: {0}
+ERR_CannotReadInputDir=Fehler: Keine Berechtigung zum Lesen aus Eingabeverzeichnis vorhanden: {0}
+ERR_CannotParseOptions=Fehler: Option @filename wird verarbeitet: {0}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
index dfd3721613b..3224699b000 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
index 16768d37ef5..e4cfb62da04 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
new file mode 100644
index 00000000000..cfc86152834
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
@@ -0,0 +1,15 @@
+<?xml version = '1.0' encoding = 'utf-8'?>
+<WixLocalization Culture="de" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="1252">
+  <String Id="message.install.dir.exist">Der Ordner [INSTALLDIR] ist bereits vorhanden. Möchten Sie diesen Ordner trotzdem installieren?</String>
+  <String Id="MainFeatureTitle">Hauptfeature</String>
+  <String Id="DowngradeErrorMessage">Eine höhere Version von [ProductName] ist bereits installiert. Downgrades sind deaktiviert. Setup wird jetzt beendet.</String>
+  <String Id="DisallowUpgradeErrorMessage">Eine niedrigere Version von [ProductName] ist bereits installiert. Upgrades sind deaktiviert. Setup wird jetzt beendet.</String>
+
+  <String Id="ShortcutPromptDlg_Title">[ProductName]-Setup</String>
+  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}-Verknüpfungen</String>
+  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutPromptDlgDescription">Wählen Sie die zu erstellenden Verknüpfungen aus.</String>
+  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Desktopverknüpfung(en) erstellen</String>
+  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Startmenüverknüpfung(en) erstellen</String>
+  <String Id="InstallDirNotEmptyDlg_Title">[ProductName]-Setup</String>
+</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
index a8403e5ba48..9e7e5cfd03e 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="ja-JP" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="932">
-  <String Id="message.install.dir.exist">フォルダ[INSTALLDIR]はすでに存在します。そのフォルダにインストールしますか?</String>
-  <String Id="MainFeatureTitle">主な機能</String>
-  <String Id="DowngradeErrorMessage">[ProductName]のより上位のバージョンがすでにインストールされています。ダウングレードは無効です。セットアップを終了します。</String>
-  <String Id="DisallowUpgradeErrorMessage">[ProductName]のより下位のバージョンがすでにインストールされています。アップグレードは無効です。セットアップを終了します。</String>
-
-  <String Id="ShortcutPromptDlg_Title">[ProductName] Setup</String>
-  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}Shortcuts</String>
-  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
-  <String Id="ShortcutPromptDlgDescription">Select shortcuts to create.</String>
-  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Create desktop shortcut(s)</String>
-  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Create start menu shortcut(s)</String>
-  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] Setup</String>  
-</WixLocalization>
+<?xml version = '1.0' encoding = 'utf-8'?>
+<WixLocalization Culture="ja" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="932">
+  <String Id="message.install.dir.exist">フォルダ[INSTALLDIR]はすでに存在します。そのフォルダにインストールしますか?</String>
+  <String Id="MainFeatureTitle">主な機能</String>
+  <String Id="DowngradeErrorMessage">[ProductName]のより上位のバージョンがすでにインストールされています。ダウングレードは無効です。セットアップを終了します。</String>
+  <String Id="DisallowUpgradeErrorMessage">[ProductName]のより下位のバージョンがすでにインストールされています。アップグレードは無効です。セットアップを終了します。</String>
+
+  <String Id="ShortcutPromptDlg_Title">[ProductName]セットアップ</String>
+  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}ショートカット</String>
+  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutPromptDlgDescription">作成するショートカットを選択します。</String>
+  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">デスクトップ・ショートカットの作成</String>
+  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">スタート・メニューのショートカットの作成</String>
+  <String Id="InstallDirNotEmptyDlg_Title">[ProductName]セットアップ</String>
+</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
index ca52140fff4..8b9910e0cf1 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="zh-CN" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="936">
-  <String Id="message.install.dir.exist">文件夹 [INSTALLDIR] 已存在。是否仍要安装到该文件夹？</String>
-  <String Id="MainFeatureTitle">主要功能</String>
-  <String Id="DowngradeErrorMessage">已安装更高版本的 [ProductName]。降级已禁用。现在将退出安装。</String>
-  <String Id="DisallowUpgradeErrorMessage">已安装更低版本的 [ProductName]。升级已禁用。现在将退出安装。</String>
-
-  <String Id="ShortcutPromptDlg_Title">[ProductName] Setup</String>
-  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}Shortcuts</String>
-  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
-  <String Id="ShortcutPromptDlgDescription">Select shortcuts to create.</String>
-  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Create desktop shortcut(s)</String>
-  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Create start menu shortcut(s)</String>
-  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] Setup</String>
-</WixLocalization>
+<?xml version = '1.0' encoding = 'utf-8'?>
+<WixLocalization Culture="zh-CN" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="936">
+  <String Id="message.install.dir.exist">文件夹 [INSTALLDIR] 已存在。是否仍要安装到该文件夹？</String>
+  <String Id="MainFeatureTitle">主要功能</String>
+  <String Id="DowngradeErrorMessage">已安装更高版本的 [ProductName]。降级已禁用。现在将退出安装。</String>
+  <String Id="DisallowUpgradeErrorMessage">已安装更低版本的 [ProductName]。升级已禁用。现在将退出安装。</String>
+
+  <String Id="ShortcutPromptDlg_Title">[ProductName] 安装程序</String>
+  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}快捷方式</String>
+  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutPromptDlgDescription">选择要创建的快捷方式。</String>
+  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">创建桌面快捷方式</String>
+  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">创建开始菜单快捷方式</String>
+  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] 安装程序</String>
+</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
new file mode 100644
index 00000000000..a84d2b2cb4f
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
@@ -0,0 +1,70 @@
+#
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+app.bundler.name=Windows-Anwendungsimage
+exe.bundler.name=EXE-Installationsprogrammpackage
+msi.bundler.name=MSI-Installationsprogrammpackage
+
+param.menu-group.default=Unbekannt
+
+resource.executable-properties-template=Vorlage f\u00FCr das Erstellen der ausf\u00FChrbaren Eigenschaftendatei
+resource.setup-icon=Symbol f\u00FCr Dialogfeld "Setup"
+resource.post-app-image-script=Auszuf\u00FChrendes Skript nach dem Auff\u00FCllen des Anwendungsimages
+resource.post-msi-script=Auszuf\u00FChrendes Skript nach dem Erstellen der MSI-Datei f\u00FCr das EXE-Installationsprogramm
+resource.wxl-file-name=MsiInstallerStrings_en.wxl
+resource.main-wix-file=Haupt-WiX-Projektdatei
+resource.overrides-wix-file=\u00DCberschreibt WiX-Projektdatei
+resource.shortcutpromptdlg-wix-file=Dialogfeld f\u00FCr Verkn\u00FCpfungs-Prompt der WiX-Projektdatei
+resource.installdirnotemptydlg-wix-file=Nicht leeres Installationsverzeichnis in Dialogfeld f\u00FCr WiX-Projektdatei
+
+error.no-wix-tools=WiX-Tools (light.exe, candle.exe) nicht gefunden
+error.no-wix-tools.advice=Laden Sie WiX 3.0 oder h\u00F6her von https://wixtoolset.org herunter, und f\u00FCgen Sie es zu PATH hinzu.
+error.version-string-wrong-format.advice=Setzen Sie den Wert des --app-version-Parameters auf eine g\u00FCltige ProductVersion des Windows-Installationsprogramms.
+error.msi-product-version-components=Versionszeichenfolge [{0}] muss zwischen 2 und 4 Komponenten aufweisen.
+error.msi-product-version-major-out-of-range=Hauptversion muss im Bereich [0, 255] liegen
+error.msi-product-version-build-out-of-range=Build-Teil der Version muss im Bereich [0, 65535] liegen
+error.msi-product-version-minor-out-of-range=Nebenversion muss im Bereich [0, 255] liegen
+error.version-swap=Versionsinformationen f\u00FCr {0} konnten nicht aktualisiert werden
+error.invalid-envvar=Ung\u00FCltiger Wert der {0}-Umgebungsvariable
+error.lock-resource=Sperren nicht erfolgreich: {0}
+error.read-wix-l10n-file=Datei {0} konnte nicht geparst werden
+error.extract-culture-from-wix-l10n-file=Kulturwert konnte nicht aus Datei {0} gelesen werden
+
+message.icon-not-ico=Das angegebene Symbol "{0}" ist keine ICO-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
+message.potential.windows.defender.issue=Warnung: Windows Defender verhindert eventuell die korrekte Ausf\u00FChrung von jpackage. Wenn ein Problem auftritt, deaktivieren Sie die Echtzeit\u00FCberwachung, oder f\u00FCgen Sie einen Ausschluss f\u00FCr das Verzeichnis "{0}" hinzu.
+message.outputting-to-location=EXE f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.output-location=Installationsprogramm (.exe) gespeichert in: {0}
+message.tool-version=[{0}]-Version [{1}] erkannt.
+message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
+message.wrong-tool-version=[{0}]-Version {1} wurde erkannt. Erforderlich ist jedoch Version {2}.
+message.version-string-too-many-components=Versionszeichenfolge kann bis zu 3 Komponenten aufweisen: major.minor.build.
+message.use-wix36-features=WiX {0} erkannt. Erweiterte Bereinigungsaktion wird aktiviert.
+message.product-code=MSI-ProductCode: {0}.
+message.upgrade-code=MSI-UpgradeCode: {0}.
+message.preparing-msi-config=MSI-Konfiguration wird vorbereitet: {0}.
+message.generating-msi=MSI wird generiert: {0}.
+message.invalid.install.dir=Warnung: Ung\u00FCltiges Installationsverzeichnis {0}. Installationsverzeichnis muss ein relativer Unterpfad unter dem Standardinstallationsverzeichnis wie "Programme" sein. Der Anwendungsname "{1}" wird als Standardwert verwendet.
+
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
index f0e5e3e370b..bce8ca2cb17 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
@@ -34,16 +34,16 @@ resource.executable-properties-template=\u5B9F\u884C\u53EF\u80FD\u306A\u30D7\u30
 resource.setup-icon=\u8A2D\u5B9A\u30C0\u30A4\u30A2\u30ED\u30B0\u30FB\u30A2\u30A4\u30B3\u30F3
 resource.post-app-image-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u79FB\u5165\u3057\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.post-msi-script=exe\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306Emsi\u30D5\u30A1\u30A4\u30EB\u304C\u4F5C\u6210\u3055\u308C\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.wxl-file-name=MsiInstallerStrings_ja.wxl
+resource.wxl-file-name=MsiInstallerStrings_en.wxl
 resource.main-wix-file=\u30E1\u30A4\u30F3WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
 resource.overrides-wix-file=WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9
-resource.shortcutpromptdlg-wix-file=Shortcut prompt dialog WiX project file
-resource.installdirnotemptydlg-wix-file=Not empty install directory dialog WiX project file
+resource.shortcutpromptdlg-wix-file=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30FB\u30D7\u30ED\u30F3\u30D7\u30C8\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
+resource.installdirnotemptydlg-wix-file=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u306EWiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u7A7A\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 error.no-wix-tools=WiX\u30C4\u30FC\u30EB(light.exe\u3001candle.exe)\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 error.no-wix-tools.advice=WiX 3.0\u4EE5\u964D\u3092https://wixtoolset.org\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3001PATH\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002
-error.version-string-wrong-format.advice=Set value of --app-version parameter to a valid Windows Installer ProductVersion.
-error.msi-product-version-components=Version string [{0}] must have between 2 and 4 components.
+error.version-string-wrong-format.advice=--app-version\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u5024\u3092\u6709\u52B9\u306AWindows Installer ProductVersion\u306B\u8A2D\u5B9A\u3057\u307E\u3059\u3002
+error.msi-product-version-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217[{0}]\u306B\u306F\u30012\u304B\u30894\u3064\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 error.msi-product-version-major-out-of-range=\u30E1\u30B8\u30E3\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.msi-product-version-build-out-of-range=\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u30D3\u30EB\u30C9\u90E8\u5206\u306F\u7BC4\u56F2[0, 65535]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.msi-product-version-minor-out-of-range=\u30DE\u30A4\u30CA\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
index d0461b9996c..788026ecb97 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
@@ -34,16 +34,16 @@ resource.executable-properties-template=\u7528\u4E8E\u521B\u5EFA\u53EF\u6267\u88
 resource.setup-icon=\u8BBE\u7F6E\u5BF9\u8BDD\u6846\u56FE\u6807
 resource.post-app-image-script=\u8981\u5728\u586B\u5145\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E4B\u540E\u8FD0\u884C\u7684\u811A\u672C
 resource.post-msi-script=\u5728\u4E3A exe \u5B89\u88C5\u7A0B\u5E8F\u521B\u5EFA msi \u6587\u4EF6\u4E4B\u540E\u8981\u8FD0\u884C\u7684\u811A\u672C
-resource.wxl-file-name=MsiInstallerStrings_zh_CN.wxl
+resource.wxl-file-name=MsiInstallerStrings_en.wxl
 resource.main-wix-file=\u4E3B WiX \u9879\u76EE\u6587\u4EF6
 resource.overrides-wix-file=\u8986\u76D6 WiX \u9879\u76EE\u6587\u4EF6
-resource.shortcutpromptdlg-wix-file=Shortcut prompt dialog WiX project file
-resource.installdirnotemptydlg-wix-file=Not empty install directory dialog WiX project file
+resource.shortcutpromptdlg-wix-file=\u5FEB\u6377\u65B9\u5F0F\u63D0\u793A\u5BF9\u8BDD\u6846 WiX \u9879\u76EE\u6587\u4EF6
+resource.installdirnotemptydlg-wix-file=\u5B89\u88C5\u76EE\u5F55\u5BF9\u8BDD\u6846 WiX \u9879\u76EE\u6587\u4EF6\u975E\u7A7A
 
 error.no-wix-tools=\u627E\u4E0D\u5230 WiX \u5DE5\u5177 (light.exe, candle.exe)
 error.no-wix-tools.advice=\u4ECE https://wixtoolset.org \u4E0B\u8F7D WiX 3.0 \u6216\u66F4\u9AD8\u7248\u672C\uFF0C\u7136\u540E\u5C06\u5176\u6DFB\u52A0\u5230 PATH\u3002
-error.version-string-wrong-format.advice=Set value of --app-version parameter to a valid Windows Installer ProductVersion.
-error.msi-product-version-components=Version string [{0}] must have between 2 and 4 components.
+error.version-string-wrong-format.advice=\u5C06 --app-version \u53C2\u6570\u7684\u503C\u8BBE\u7F6E\u4E3A\u6709\u6548\u7684 Windows Installer ProductVersion\u3002
+error.msi-product-version-components=\u7248\u672C\u5B57\u7B26\u4E32 [{0}] \u5FC5\u987B\u5305\u542B 2 \u5230 4 \u4E2A\u7EC4\u6210\u90E8\u5206\u3002
 error.msi-product-version-major-out-of-range=\u4E3B\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
 error.msi-product-version-build-out-of-range=\u7248\u672C\u7684\u5DE5\u4F5C\u7248\u672C\u90E8\u5206\u5FC5\u987B\u4F4D\u4E8E [0, 65535] \u8303\u56F4\u4E2D
 error.msi-product-version-minor-out-of-range=\u6B21\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
new file mode 100644
index 00000000000..3deef2ab65e
--- /dev/null
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
@@ -0,0 +1,322 @@
+#
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+jshell.msg.welcome =Willkommen bei JShell - Version {0}\nGeben Sie f\u00FCr eine Einf\u00FChrung Folgendes ein: /help intro
+jshell.err.opt.arg = Argument f\u00FCr {0} fehlt.
+jshell.err.opt.invalid = Ung\u00FCltige Optionen: {0}.
+jshell.err.opt.one = Es darf nur eine {0}-Option verwendet werden.
+jshell.err.opt.startup.conflict = Nicht miteinander vereinbare Optionen: Es wurde sowohl --startup als auch --no-startup verwendet.
+jshell.err.opt.feedback.one = Es darf nur eine Feedbackoption (--feedback, -q, -s oder -v) verwendet werden.
+jshell.err.opt.unknown = Unbekannte Option: {0}
+
+jshell.msg.terminated = Status-Engine beendet.
+jshell.msg.terminated.restore = Stellen Sie Definitionen wieder her mit: /reload -restore
+
+jshell.msg.use.one.of = Verwenden Sie eine der folgenden Optionen: {0}
+jshell.msg.see.classes.etc = Siehe /types, /methods, /vars oder /list
+jshell.err.arg = Ung\u00FCltiges "{0}"-Argument: {1}
+jshell.msg.see = Hilfe finden Sie unter {0}.
+
+jshell.err.file.not.accessible = Auf Datei "{1}" f\u00FCr "{0}" kann nicht zugegriffen werden: {2}
+jshell.err.file.not.found = Datei "{1}" f\u00FCr "{0}" nicht gefunden.
+jshell.err.file.exception = Datei "{1}" f\u00FCr "{0}" hat eine Ausnahme ausgel\u00F6st: {2}
+jshell.err.file.filename = F\u00FCr "{0}" muss ein Dateinamenargument angegeben werden.
+
+jshell.err.startup.unexpected.exception = Unerwartete Ausnahme beim Lesen von Startinformationen: {0}
+jshell.err.unexpected.exception = Unerwartete Ausnahme: {0}
+
+jshell.err.invalid.command = Ung\u00FCltiger Befehl: {0}
+jshell.err.command.ambiguous = Befehl "{0}" ist mehrdeutig: {1}
+jshell.msg.set.restore = Es werden neue Optionen festgelegt, und der Status wird wiederhergestellt.
+jshell.msg.set.editor.set = Editor gesetzt auf: {0}
+jshell.msg.set.editor.retain = Editoreinstellung beibehalten: {0}
+jshell.msg.set.indent.set = Einzugsebene gesetzt auf: {0}
+jshell.err.invalid.indent = Ung\u00FCltige Einzugsebene: {0}
+jshell.err.no.builtin.editor = Integrierter Editor nicht verf\u00FCgbar.
+jshell.err.cant.launch.editor = Integrierter Editor kann nicht gestartet werden - unerwartete Ausnahme: {0}
+jshell.msg.try.set.editor = Informationen zum Verwenden des externen Editors finden Sie unter "/help /set editor".
+jshell.msg.press.return.to.leave.edit.mode = Dr\u00FCcken Sie die Eingabetaste, um den Bearbeitungsmodus zu verlassen.
+jshell.err.wait.applies.to.external.editor = -wait gilt f\u00FCr externe Editoren
+jshell.label.editpad = JShell-Bearbeitungs-Pad
+
+jshell.err.setting.to.retain.must.be.specified = Die beizubehaltende Einstellung muss angegeben werden - {0}
+jshell.msg.set.show.mode.settings = \nVerwenden Sie zum Anzeigen der Moduseinstellungen "/set prompt", "/set truncation", ...,\noder verwenden Sie "/set mode" gefolgt von dem Feedbackmodusnamen.
+jshell.err.continuation.prompt.required = Fortsetzungs-Prompt erforderlich - {0}
+
+jshell.msg.try.command.without.args = Verwenden Sie "{0}" ohne Argumente.
+jshell.msg.no.active = Keine aktiven Definitionen vorhanden.
+
+jshell.msg.resetting = Wird zur\u00FCckgesetzt...
+jshell.msg.resetting.state = Status wird zur\u00FCckgesetzt.
+
+jshell.err.reload.no.previous = Keine vorherige Historie zum Wiederherstellen vorhanden
+jshell.err.reload.restarting.previous.state = Es wird ein Neustart ausgef\u00FChrt und der vorherige Status wiederhergestellt.
+jshell.err.reload.restarting.state = Neustart wird ausgef\u00FChrt und Status wiederhergestellt.
+
+jshell.err.restart.failed = Neustart nicht erfolgreich: {0}\n\nVorherige Einstellungen werden wiederhergestellt, und ein Neustart wird ausgef\u00FChrt...
+
+jshell.msg.vars.not.active = (nicht aktiv)
+
+jshell.err.out.of.range = Au\u00DFerhalb des zul\u00E4ssigen Bereichs
+
+jshell.msg.error = Fehler:
+jshell.msg.warning = Warnung:
+
+jshell.err.sub.arg = F\u00FCr den Befehl "{0}" ist ein Unterbefehl erforderlich. Siehe: "/help {0}"
+jshell.err.sub.ambiguous = Mehrdeutiges Unterbefehlsargument f\u00FCr "{0}": {1}
+
+jshell.err.classpath.arg = F\u00FCr den /classpath-Befehl ist ein Pfadargument erforderlich.
+jshell.msg.classpath = Pfad "{0}" zu Classpath hinzugef\u00FCgt
+
+jshell.err.help.arg = Es beginnen keine Befehle oder Themen mit dem angegebenen Argument: {0}
+jshell.msg.help.begin =Geben Sie einen Java-Sprachausdruck, eine Anweisung oder eine Deklaration ein.\nSie k\u00F6nnen auch einen der folgenden Befehle eingeben:\n
+jshell.msg.help.subject =\nUm weitere Informationen zu erhalten, geben Sie "/help" gefolgt von dem Namen\neines Befehls oder Themas ein.\nBeispiel: "/help /list" oder "/help intro".\n\nThemen:\n\n
+
+jshell.err.no.snippet.with.id = Kein Snippet mit ID: {0}
+jshell.err.end.snippet.range.less.than.start = Snippet-Bereichsende niedriger als Bereichsanfang: {0} - {1}
+jshell.err.range.requires.id = F\u00FCr Snippet-Bereiche sind Snippet-IDs erforderlich: {0}
+
+jshell.err.exit.not.expression = Das Argument f\u00FCr /exit muss ein g\u00FCltiger ganzzahliger Ausdruck sein. Es ist jedoch kein Ausdruck: {0}
+jshell.err.exit.bad.type = Das Argument f\u00FCr /exit muss ein g\u00FCltiger ganzzahliger Ausdruck sein. Der Typ ist {1} : {0}
+jshell.err.exit.bad.value = Das Argument f\u00FCr /exit besitzt den ung\u00FCltigen Wert {1} : {0}
+
+jshell.err.drop.arg =Geben Sie im /drop-Argument einen zu l\u00F6schenden Import oder eine zu l\u00F6schende Variable, Methode oder Klasse an.\nGeben Sie die Elemente nach ID oder Name an. Verwenden Sie /list, um IDs anzuzeigen. Verwenden Sie /reset, um den gesamten Status zur\u00FCckzusetzen.
+jshell.err.failed = Nicht erfolgreich.
+jshell.msg.native.method = Native Methode
+jshell.msg.unknown.source = Unbekannte Quelle 
+jshell.msg.goodbye = Auf Wiedersehen
+jshell.msg.goodbye.value = Auf Wiedersehen ({0})
+
+jshell.msg.help.for.help = Geben Sie /help f\u00FCr einen Hilfetext ein.
+
+jshell.err.mode.name = Feedbackmodusname erwartet: {0}
+jshell.err.missing.mode = Feedbackmodus fehlt - {0}
+jshell.err.field.name = Feldname erwartet: {0} - {1}
+jshell.err.mode.unknown = Kein Feedbackmodus benannt: {0} - {1}
+
+jshell.err.feedback.does.not.match.mode = Entspricht keinem aktuellen Feedbackmodus: {0} - {1}
+jshell.err.feedback.ambiguous.mode = Entspricht mehr als einem aktuellen Feedbackmodus: {0} - {1}
+jshell.err.feedback.must.be.quoted = Format "{0}" muss in Anf\u00FChrungszeichen gesetzt werden - {1}
+jshell.err.feedback.not.a.valid.selector = Kein g\u00FCltiger Selektor "{0}" in "{1}" - {2}
+jshell.err.feedback.multiple.sections = Art des Selektors in mehreren Abschnitten der Selektorliste "{0}" in "{1}" - {2}
+jshell.err.feedback.different.selector.kinds = Unterschiedliche Arten von Selektoren in denselben Abschnitten der Selektorliste "{0}" in "{1}" - {2}
+
+jshell.msg.feedback.new.mode = Neuen Feedbackmodus erstellt: {0}
+jshell.msg.feedback.mode = Feedbackmodus: {0}
+jshell.msg.feedback.mode.following = Verf\u00FCgbare Feedbackmodi:
+jshell.msg.feedback.retained.mode.following = Beibehaltene Feedbackmodi:
+jshell.err.mode.creation = Zum Erstellen eines neuen Modus muss entweder die Option -command oder die Option -quiet verwendet werden - {0}
+jshell.err.mode.exists = Zu erstellender Modus ist bereits vorhanden: {0} - {1}
+
+jshell.err.truncation.expected.length = Erwartete Abschneidel\u00E4nge - {0}
+jshell.err.truncation.length.not.integer = Abschneidel\u00E4nge muss eine Ganzzahl sein: {0} - {1}
+
+jshell.err.not.valid.with.predefined.mode = Nicht g\u00FCltig mit einem vordefinierten Modus: {0} - {1}
+jshell.err.retained.feedback.mode.must.be.retained.or.predefined = F\u00FCr "/set feedback -retain <Modus>" muss <Modus> vordefiniert werden oder mit "/set mode -retain" beibehalten worden sein - {0}
+
+jshell.err.unknown.option = Unbekannte Option: {0} - {1}
+jshell.err.default.option.or.program = Geben Sie Option -default, Option -delete oder das Programm an - {0}
+jshell.err.option.or.filename = Geben Sie maximal eine der Optionen -default, -none oder einen Startdateinamen an - {0}
+jshell.err.unexpected.at.end = Unerwartete Argumente am Ende des Befehls: {0} - {1}
+jshell.err.conflicting.options = Nicht miteinander vereinbare Optionen - {0}
+jshell.err.cannot.delete.current.mode = Der aktuelle Feedbackmodus "{0}" kann nicht gel\u00F6scht werden. Verwenden Sie zun\u00E4chst "/set feedback" - {1}
+jshell.err.cannot.delete.retained.mode = Der beibehaltene Feedbackmodus "{0}" kann nicht gel\u00F6scht werden. Verwenden Sie zun\u00E4chst "/set feedback -retain" - {1}
+jshell.err.may.not.specify.options.and.snippets = Optionen und Snippets d\u00FCrfen nicht gemeinsam verwendet werden: {0}
+jshell.err.no.such.snippets = Snippet nicht vorhanden: {0}
+jshell.err.the.snippet.cannot.be.used.with.this.command = Dieser Befehl akzeptiert das Snippet "{0}" nicht: {1}
+jshell.err.retained.mode.failure = Fehler in beibehaltenen Modi (Modi gel\u00F6scht) - {0} {1}
+
+jshell.err.corrupted.stored.startup = Gespeicherter Start besch\u00E4digt. Standardwert wird verwendet - {0}
+
+jshell.err.exception.thrown = Ausnahme {0}
+jshell.err.exception.thrown.message = Ausnahme {0}: {1}
+jshell.err.exception.cause = Verursacht von: {0}
+jshell.err.exception.cause.message = Verursacht von: {0}: {1}
+
+jshell.console.see.synopsis = <Erneut Tabulatortaste dr\u00FCcken, um Zusammenfassung anzuzeigen>
+jshell.console.see.full.documentation = <Erneut Tabulatortaste dr\u00FCcken, um vollst\u00E4ndige Dokumentation anzuzeigen>
+jshell.console.see.documentation = <Erneut Tabulatortaste dr\u00FCcken, um Dokumentation anzuzeigen>
+jshell.console.see.next.page = <Erneut Tabulatortaste dr\u00FCcken, um n\u00E4chste Seite anzuzeigen>
+jshell.console.see.next.javadoc = <Tabulatortaste dr\u00FCcken, um n\u00E4chste Dokumentation anzuzeigen>
+jshell.console.see.next.command.doc = <Tabulatortaste dr\u00FCcken, um n\u00E4chsten Befehl anzuzeigen>
+jshell.console.no.such.command = Befehl nicht vorhanden
+jshell.console.completion.current.signatures = Signaturen:
+jshell.console.completion.all.completions.number = <Erneut Tabulatortaste dr\u00FCcken, um alle m\u00F6glichen Abschl\u00FCsse anzuzeigen. Insgesamt m\u00F6gliche Abschl\u00FCsse: {0}>
+jshell.console.completion.all.completions = <Erneut Tabulatortaste dr\u00FCcken, um alle m\u00F6glichen Abschl\u00FCsse anzuzeigen>
+jshell.console.no.javadoc = <Keine Dokumentation gefunden>
+jshell.console.do.nothing = Nichts machen
+jshell.console.choice = Auswahl: 
+jshell.console.create.variable = Variable erstellen
+jshell.console.create.method = Methode erstellen
+jshell.console.resolvable = \nDie ID kann in diesem Kontext aufgel\u00F6st werden.
+jshell.console.no.candidate = \nKeine vollqualifizierten Kandidatennamen f\u00FCr Import gefunden.
+jshell.console.incomplete = \nErgebnisse sind m\u00F6glicherweise unvollst\u00E4ndig. Wiederholen Sie den Vorgang sp\u00E4ter, um vollst\u00E4ndige Ergebnisse zu erhalten.
+jshell.console.erroneous = \nUnvollst\u00E4ndig oder fehlerhaft. Ein einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+jshell.console.exprstmt = \nEin einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+jshell.console.empty = \nLeerer Eintrag. Ein einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+
+jshell.fix.wrong.shortcut =Unerwartetes Zeichen nach Umschalt+Tab.\nVerwenden Sie "I" f\u00FCr automatischen Import, "V" zur Variablenerstellung oder "M" zur Methodenerstellung.\nWeitere Informationen finden Sie unter:\n/help shortcuts
+
+help.usage = Verwendung:   jshell <Option>... <Ladedatei>...\nM\u00F6gliche Optionen:\n    --class-path <Pfad>   Gibt an, wo die Benutzerklassendateien gespeichert sind\n    --module-path <Pfad>  Gibt an, wo die Anwendungsmodule gespeichert sind\n    --add-modules <Modul>(,<Modul>)*\n                          Gibt aufzul\u00F6sende Module oder alle Module im\n                            Modulpfad an, wenn <Modul> ALL-MODULE-PATHs ist\n    --enable-native-access\n                          Erm\u00F6glicht Ausf\u00FChrung eingeschr\u00E4nkter nativer Methoden durch Code\n    --enable-preview      Code kann Vorschaufeatures in diesem Release nutzen\n    --startup <Datei>      Ersetzung der Startdefinitionen mit einer Ausf\u00FChrung\n    --no-startup          Startdefinitionen werden nicht ausgef\u00FChrt\n    --feedback <Modus>     Gibt den anf\u00E4nglichen Feedbackmodus an. Der Modus kann\n                            vordefiniert (Silent, Concise, Normal oder Verbose) oder\n                            vorab benutzerdefiniert sein\n    -q                    Stilles Feedback. Identisch mit: --feedback concise\n    -s                    \u00C4u\u00DFerst stilles Feedback. Identisch mit: --feedback silent\n    -v                    Verbose-Feedback. Identisch mit: --feedback verbose\n    -J<Kennzeichen>              \u00DCbergibt <Kennzeichen> direkt an das Laufzeitsystem.\n                            Verwenden Sie ein -J pro Laufzeitkennzeichen oder Kennzeichenargument\n    -R<Kennzeichen>              \u00DCbergibt <Kennzeichen> an das Remotelaufzeitsystem.\n                            Verwenden Sie ein -R pro Remotekennzeichen oder Kennzeichenargument\n    -C<Kennzeichen>              \u00DCbergibt <Kennzeichen> an den Compiler.\n                            Verwenden Sie ein -C pro Compiler-Kennzeichen oder Kennzeichenargument\n    --version             Gibt Versionsinformationen aus und beendet den Vorgang\n    --show-version        Gibt Versionsinformationen aus und setzt den Vorgang fort\n    --help, -?, -h        Gibt diese Zusammenfassung der Standardoptionen aus und beendet den Vorgang\n    --help-extra, -X      Gibt Hilfetext zu Nicht-Standardoptionen aus und beendet den Vorgang\n\nEin Dateiargument kann ein Dateiname oder einer der vordefinierten Dateinamen sein: DEFAULT,\nPRINTING oder JAVASE.\nEine Ladedatei kann auch "-" zur Angabe einer Standardeingabe ohne interaktiven I/O sein.\n\nWeitere Informationen zu den Auswertungskontextoptionen (--class-path,\n--module-path und --add-modules) finden Sie unter:\n\t/help context\n\nEin Pfad listet die zu durchsuchenden Verzeichnisse und Archive auf. Verwenden Sie unter Windows ein\nSemikolon (;), um Elemente im Pfad zu trennen. Verwenden Sie auf anderen Plattformen einen\nDoppelpunkt (:), um Elemente zu trennen.\n
+help.usage.x = \    --add-exports <Modul>/<Package>   Gibt ein Package an, das als\n                                         Export aus seinem definierenden Modul gelten soll \n    --execution <Spezifikation>                 Gibt eine alternative Ausf\u00FChrungs-Engine an.\n                                         Dabei gilt: <Spezifikation> ist eine ExecutionControl-Spezifikation.\n                                         In der Dokumentation zu dem Package\n                                         jdk.jshell.spi finden Sie Informationen zur Syntax der Spezifikation\n    \nDies sind keine Standardoptionen und k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
+
+help.list.summary = Listet die eingegebene Quelle auf
+help.list.args = [<Name oder ID>|-all|-start]
+help.list =Zeigt die Snippets mit vorangestellten Snippet-IDs an.\n\n/list\n\tListet die derzeit aktiven Code-Snippets auf, die Sie eingegeben oder mit /open eingelesen haben\n\n/list -start\n\tListet die ausgewerteten Start-Snippets auf\n\n/list -all\n\tListet alle Snippets auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets\n\n/list <Name>\n\tListet Snippets mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/list <ID>\n\tF\u00FChrt das Snippet mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+
+help.edit.summary = Bearbeitet einen Quelleintrag
+help.edit.args = <Name oder ID>
+help.edit =Bearbeitet ein oder mehrere Code-Snippets in einem externen Editor.\nDer zu verwendende Editor wird mit /set editor festgelegt. Wenn kein Editor festgelegt wird, werden\ndie folgenden Umgebungsvariablen in der folgenden Reihenfolge gepr\u00FCft: JSHELLEDITOR, VISUAL\nund EDITOR. Wenn kein Editor und auch keine der Editorumgebungsvariablen festgelegt wurde,\nwird ein einfacher Editor gestartet.\n\n/edit <Name>\n\tBearbeitet die Snippets mit den angegebenen Namen (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/edit <ID>\n\tBearbeitet das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/edit -start\n\tBearbeitet die Start-Snippets. Vorgenommene \u00C4nderungen gelten nur f\u00FCr diese Session und\n\twirken sich nicht auf die Starteinstellung aus\n\n/edit -all\n\tBearbeitet alle Snippets, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets\n\n/edit\n\tBearbeitet das derzeit aktive Code-Snippet, das Sie eingegeben oder mit /open eingelesen haben
+
+help.drop.summary = L\u00F6scht einen Quelleintrag
+help.drop.args = <Name oder ID>
+help.drop =L\u00F6scht ein Snippet (deaktiviert es).\n\n/drop <Name>\n\tL\u00F6scht das Snippet mit dem angegebenen Namen\n\n/drop <ID>\n\tL\u00F6scht das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+
+help.save.summary = Speichert die Snippet-Quelle in einer Datei
+help.save.args = [-all|-history|-start] <Datei>
+help.save =Speichert die angegebenen Snippets und/oder Befehle in der angegebenen Datei.\n\n/save <Datei>\n\tSpeichert die Quelle derzeit aktiver Snippets in der Datei.\n\n/save -all <Datei>\n\tSpeichert die Quelle aller Snippets in der Datei.\n\tUmfasst die Quelle von \u00FCberschriebenem, nicht erfolgreichem und Startcode\n\n/save -history <Datei>\n\tSpeichert die sequenzielle Historie aller Befehle und Snippets, die seit dem\n\tStart des JShell-Tools eingegeben wurden.\n\n/save -start <Datei>\n\tSpeichert die aktuellen Startdefinitionen in der Datei\n\n/save <ID> <Datei>\n\tSpeichert das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+
+help.open.summary = \u00D6ffnet eine Datei als Quelleingabe
+help.open.args = <Datei>
+help.open =\u00D6ffnet eine Datei und liest deren Inhalt als Snippets und Befehle.\n\n/open <Datei>\n\tLiest die angegebene Datei als JShell-Tooleingabe.\n\nDie <Datei> kann der Name einer Betriebssystemdatei oder einer der folgenden vordefinierten\nDateinamen sein: DEFAULT, PRINTING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf() bzw.\nImporte aller Java SE-Packages.\n
+
+help.vars.summary = Listet die deklarierten Variablen und ihre zugeh\u00F6rigen Werte auf
+help.vars.args = [<Name oder ID>|-all|-start]
+help.vars =Listet den Typ, Namen und Wert der eingegebenen Variablen auf.\n\n/vars\n\tListet den Typ, Namen und Wert der derzeit aktiven Variablen auf\n\n/vars <Name>\n\tListet Variablen mit dem angegebenen Namen auf (aktive Variablen werden bevorzugt aufgef\u00FChrt)\n\n/vars <ID>\n\tListet die Variable mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/vars -start\n\tListet die Variablen in den ausgewerteten Start-Snippets auf\n\n/vars -all\n\tListet alle Variablen auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Startvariablen
+
+help.methods.summary = Listet die deklarierten Methoden und ihre zugeh\u00F6rigen Signaturen auf
+help.methods.args = [<Name oder ID>|-all|-start]
+help.methods =Listet den Namen, die Parametertypen und den R\u00FCckgabetyp der eingegebenen Methoden auf.\n\n/methods\n\tListet den Namen, die Parametertypen und den R\u00FCckgabetyp der derzeit aktiven Methoden auf\n\n/methods <Name>\n\tListet die Methoden mit dem angegebenen Namen auf (aktive Methoden werden bevorzugt aufgef\u00FChrt)\n\n/methods <ID>\n\tListet die Methode mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/methods -start\n\tListet die Methoden in den ausgewerteten Start-Snippets auf\n\n/methods -all\n\tListet alle Snippets auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets
+
+help.types.summary = Listet die Typdeklarationen auf
+help.types.args =[<Name oder ID>|-all|-start]
+help.types =Listet eingegebene Klassen und Schnittstellen auf.\n\n/types\n\tListet die derzeit aktiven Typdeklarationen auf\n\n/types <Name>\n\tListet die Typdeklarationen mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/types <ID>\n\tListet die Typdeklaration mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/types -start\n\tListet die Typdeklarationen in den ausgewerteten Start-Snippets auf\n\n/types -all\n\tListet alle Typdeklarationen auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Starttypdeklarationen
+
+help.imports.summary = Listet die importierten Elemente auf
+help.imports.args =
+help.imports =Listet die derzeit aktiven Importe auf. Dies umfasst Importe aus\nStart-Snippets.
+
+help.exit.summary = Beendet das JShell-Tool
+help.exit.args =[<Snippet mit ganzzahligem Ausdruck>]
+help.exit =Beendet das JShell-Tool. \u00C4nderungen werden nicht gespeichert.\nSpeichern Sie Ihre \u00C4nderungen, bevor Sie diesen Befehl ausf\u00FChren\n\n/exit\n\tBeendet das JShell-Tool. Der Beendigungsstatus ist null\n\n/exit <Snippet mit ganzzahligem Ausdruck>\n\tWertet das Snippet aus. Wenn das Snippet nicht erfolgreich oder kein ganzzahliger Ausdruck ist,\n\twird der Fehler angezeigt. Andernfalls wird das JShell-Tool mit dem\n\tAusdruckswert als Beendigungsstatus beendet
+
+help.reset.summary = Setzt das JShell-Tool zur\u00FCck
+help.reset.args = [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>]...
+help.reset =Setzt den Code und den Ausf\u00FChrungsstatus des JShell-Tools zur\u00FCck:\n\t* Der gesamte eingegebene Code geht verloren\n\t* Der Ausf\u00FChrungsstatus wird neu gestartet\n\t* Der Startcode wird erneut ausgef\u00FChrt\nSpeichern Sie Ihre \u00C4nderungen, bevor Sie diesen Befehl verwenden.\nDer /reset-Befehl akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n
+
+help.reload.summary = Setzt die relevante Historie (derzeitige oder vorherige) zur\u00FCck und gibt sie erneut wieder (-restore)
+help.reload.args = [-restore] [-quiet] [-class-path <Pfad>] [-module-path <Pfad>]...
+help.reload =Setzt den Code und den Ausf\u00FChrungsstatus des JShell-Tools zur\u00FCck und gibt anschlie\u00DFend jedes g\u00FCltige Snippet\nsowie alle /drop-Befehle in der Reihenfolge wieder, in der sie eingegeben wurden.\n\n/reload\n\tDient zum Zur\u00FCcksetzen und Wiedergeben der g\u00FCltigen Historie seit Starten des JShell-Tools bzw.\n\tseit Ausf\u00FChrung eines /reset- oder /reload-Befehls - je nachdem, was\n\tals Letztes erfolgt ist\n\n/reload -restore\n\tDient zum Zur\u00FCcksetzen und Wiedergeben der g\u00FCltigen Historie zwischen dem vorherigen und aktuellen\n\tStarten des JShell-Tools bzw. der Ausf\u00FChrung eines /reset-, /reload- oder /env-\n\tBefehls. Diese Wiedergabe kann somit zum Wiederherstellen einer vorherigen\n\tJShell-Toolsession verwendet werden\n\n/reload [-restore] -quiet\n\tMit dem Argument "-quiet" wird die Wiedergabe nicht angezeigt, etwaige Fehler\n\thingegen schon\n\nJeder der obigen Befehle akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n\nBeispiel:\n\n\t/reload -add-modules com.greetings -restore
+
+help.env.summary = Zeigt den Auswertungskonzept an oder \u00E4ndert ihn
+help.env.args = [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...
+help.env =Zeigt den Auswertungskontext an oder \u00E4ndert ihn. Der Auswertungskontext ist der Classpath,\nModulpfad usw.\n\n/env\n\tZeigt den Auswertungskontext als Kontextoptionen an\n\n/env [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...\n\tDurch Festlegen mindestens einer Option wird der Auswertungskontext festgelegt. Wenn Snippets\n\tdefiniert wurden, wird der Ausf\u00FChrungsstatus auf den neuen Auswertungskontext\n\tzur\u00FCckgesetzt, und die Snippets werden erneut wiedergegeben. Die Wiedergabe wird nicht \n\tangezeigt, etwaige Fehler hingegen schon. Dies entspricht:\n\n\t\t/reload -quiet ...\n\nWeitere Einzelheiten zu Auswertungskontextoptionen finden Sie unter:\n\n\t/help context\n\nBeispiel:\n\n\t/env -add-modules com.greetings
+
+help.history.summary = Historie Ihrer Eingaben
+help.history.args = [-all]
+help.history =Zeigt die Historie der Snippet- und Befehlseingaben an.\n\n/history\n\tListet die Historie der Snippet- und Befehlseingaben seit Start des JShell-Tools auf\n\n/history -all\n\tListet die gesamte Historie der Snippet- und Befehlseingaben aus dieser und vorherigen Sessions auf
+
+help.debug.summary = Schaltet Debugging des JShell-Tools um
+help.debug.args = [0][r][g][f][c][d][e]
+help.debug =Zeigt Debugginginformationen f\u00FCr die JShell-Toolimplementierung an.\n0: Debugging deaktiviert\nr: Debugging auf Toolebene aktiviert\ng: Allgemeines Debugging aktiviert\nf: Dateimanagerdebugging aktiviert\nc: Abschlussanalysedebugging aktiviert\nd: Abh\u00E4ngigkeitsdebugging aktiviert\ne: Ereignisdebugging aktiviert
+
+help.help.summary = Ruft Informationen zur Verwendung des JShell-Tools ab
+help.help.args = [<Befehl>|<Thema>]
+help.help =Zeigt Informationen zur Verwendung des JShell-Tools an.\n/help\n\tListet die Befehle und Hilfethemen des JShell-Tools auf\n\n/help <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden ben\u00F6tigt - bei mehr als einer\n\t\u00DCbereinstimmung wird jede einzelne angezeigt. Beispiel: /help /li\n\n/help <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /help intro
+
+help.set.summary = Legt Konfigurationsinformationen fest
+help.set.args = editor|start|feedback|mode|prompt|truncation|format ...
+help.set =Legt die Konfigurationsinformationen f\u00FCr das JShell-Tool fest, darunter:\nden zu verwendenden externen Editor, die zu verwendenden Startdefinitionen, einen neuen Feedbackmodus,\nden Befehls-Prompt, den zu verwendenden Feedbackmodus oder das Ausgabeformat.\n\n/set editor [-wait] <Befehl> <optionales Argument>...\n\tGibt den Befehl an, der f\u00FCr den /edit-Befehl gestartet werden soll.\n\tDer <Befehl> ist eine betriebssystemabh\u00E4ngige Zeichenfolge\n\n/set start <Datei>\n\tDer Inhalt der angegebenen <Datei> wird zu den Standardstart-Snippets und -befehlen\n\n/set feedback <Modus>\n\tLegt den Feedbackmodus fest, der das angezeigte Feedback f\u00FCr eingegebene Snippets und Befehle beschreibt\n\n/set mode <Modus> [<alter Modus>] -command|-quiet|-delete\n\tErstellt oder aktualisiert einen benutzerdefinierten Feedbackmodus. Optional kann er auch von einem vorhandenen Modus kopiert werden\n\n/set prompt <Modus> "<Prompt>" "<Fortsetzungs-Prompt>"\n\tLegt die angezeigten Prompts f\u00FCr einen angegebenen Feedbackmodus fest\n\n/set truncation <Modus> <L\u00E4nge> <Selektor>...\n\tLegt die maximale L\u00E4nge eines angezeigten Wertes fest\n\n/set format <Modus> <Feld> "<Format>" <Selektor>...\n\tKonfiguriert einen Feedbackmodus durch Festlegen des Formats eines Feldes, wenn der Selektor \u00FCbereinstimmt\n\n/set indent <Anzahl>\n\tLegt die Anzahl der Leerzeichen fest, mit denen Snippets automatisch einger\u00FCckt werden sollen\n\n/set\n\tZeigt Editor-, Start- und Feedbackeinstellungen als /set-Befehle an.\n\tLassen Sie den festgelegten Wert weg, um die Einstellungen eines der oben genannten Befehle anzuzeigen\n\nUm weitere Informationen zu einem dieser Formate zu erhalten, verwenden Sie /help mit dem angegebenen Format.\nBeispiel:   /help /set format
+
+help.quest.summary = Ruft Informationen zur Verwendung des JShell-Tools ab
+help.quest.args = [<Befehl>|<Thema>]
+help.quest =Zeigt Informationen zur Verwendung des JShell-Tools an (Abk\u00FCrzung f\u00FCr /help).\n/?\n\tZeigt eine Liste der Befehle und Hilfethemen an\n/? <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden ben\u00F6tigt - bei mehr als einer\n\t\u00DCbereinstimmung wird jeder einzelne angezeigt. Beispiel: /? /li\n\n/? <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /? intro
+
+help.bang.summary = F\u00FChrt das letzte Snippet erneut aus, siehe: /help rerun
+help.bang.args =
+help.bang =Wertet das zuletzt eingegebene Snippet erneut aus.
+
+help.slashID.summary = F\u00FChrt Snippets nach ID oder ID-Bereich erneut aus, siehe: /help rerun
+help.slashID.args =
+help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\nWertet die durch die ID oder den ID-Bereich angegebenen Snippets erneut aus.\nEin ID-Bereich wird als zwei per Bindestrich getrennte IDs dargestellt. Beispiel:  3-17\nStart- und Fehler-Snippets k\u00F6nnen verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs k\u00F6nnen beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe "/help id".
+
+help.previous.summary = F\u00FChrt das n-te vorherige Snippet erneut aus, siehe: /help rerun
+help.previous.args =
+help.previous =Wertet das n-te zuletzt eingegebene Snippet erneut aus.
+
+help.intro.summary = Einf\u00FChrung in das JShell-Tool
+help.intro =Mit dem JShell-Toll k\u00F6nnen Sie Java-Code ausf\u00FChren und umgehend Ergebnisse erhalten.\nSie k\u00F6nnen eine Java-Definition (Variable, Methode, Klasse usw.) wie int x = 8,\neinen Java-Ausdruck wie x + x,\neine Java-Anweisung oder einen Java-Import eingeben.\nDiese kleinen Java-Code-Chunks werden als "Snippets" bezeichnet.\n\nAu\u00DFerdem stehen Ihnen die JShell-Toolbefehle zur Verf\u00FCgung, mit denen Sie Ihr Vorgehen\nbesser verstehen und steuern k\u00F6nnen. Beispiel: /list\n\nEine Liste der Befehle k\u00F6nnen Sie aufrufen mit: /help
+
+help.keys.summary = Beschreibung der Readline-\u00E4hnlichen Eingabebearbeitung
+help.keys =Das JShell-Tool bietet Unterst\u00FCtzung f\u00FCr Zeilenbearbeitung, damit Sie in Snippets\nund Befehlen navigieren und diese bearbeiten k\u00F6nnen. Sie k\u00F6nnen den aktuellen Befehl/das aktuelle Snippet bearbeiten\noder vorherige Befehle/Snippets aus der Historie abrufen, bearbeiten und ausf\u00FChren.\nDiese Unterst\u00FCtzung \u00E4hnelt Readline/Editline mit einfachen Emacs-\u00E4hnlichen Bindings.\nEs gibt auch f\u00FCr das JShell-Tool spezifische Schl\u00FCsselsequenzen.\n\nZeilen- und Historiennavigation:\n\n\tEingabetaste\n\t\tGibt das aktuelle Snippet ein\n\tNach-links-Taste oder Strg+B\n\t\tNavigiert ein Zeichen zur\u00FCck\n\tNach-rechts-Taste oder Strg+F\n\t\tNavigiert ein Zeichen vorw\u00E4rts\n\tNach-oben-Taste oder Strg+P\n\t\tNavigiert eine Zeile nach oben, r\u00FCckw\u00E4rts in der Historie\n\tNach-unten-Taste oder Strg+N\n\t\tNavigiert eine Zeile nach unten, vorw\u00E4rts in der Historie\n\tStrg+A\n\t\tNavigiert an den Anfang der Zeile\n\tStrg+E\n\t\tNavigiert an das Ende der Zeile\n\tMeta+B\n\t\tNavigiert ein Wort zur\u00FCck\n\tMeta+F\n\t\tNavigiert ein Wort vorw\u00E4rts\n\tStrg+R\n\t\tDurchsucht die Historie r\u00FCckw\u00E4rts\n\n\nEinfache Zeilen- und Historienbearbeitung:\n\n\tMeta+Eingabetaste oder Strg+Eingabetaste (je nach Plattform)\n\t\tF\u00FCgt eine neue Zeile in das Snippet ein\n\tStrg+_ (f\u00FCr Unterstrich kann Umschalttaste erforderlich sein) oder Strg+X gefolgt von Strg+U\n\t\tMacht \u00C4nderung r\u00FCckg\u00E4ngig. Wiederholen Sie die Eingabe, um weitere \u00C4nderungen r\u00FCckg\u00E4ngig zu machen\n\tEntf\n\t\tL\u00F6scht das Zeichen bei dem oder hinter dem Cursor, je nach Betriebssystem\n\tR\u00FCcktaste\n\t\tL\u00F6scht das Zeichen vor dem Cursor\n\tStrg+K\n\t\tL\u00F6scht den Text vom Cursor bis zum Ende der Zeile\n\tMeta+D\n\t\tL\u00F6scht den Text vom Cursor bis zum Ende des Wortes\n\tStrg+W\n\t\tL\u00F6scht den Text vom Cursor bis zum vorangegangenen Leerzeichen\n\tStrg+Y\n\t\tF\u00FCgt den zuletzt gel\u00F6schten Text in die Zeile ein\n\tMeta+Y\n\t\tNach Strg+Y durchl\u00E4uft Meta+Y den zuletzt gel\u00F6schten Text\n\tStrg+X gefolgt von Strg+K\n\t\tL\u00F6scht das gesamte Snippet\n\n\nTastenkombinationen f\u00FCr JShell-Tool:\n\n\tWeitere Einzelheiten k\u00F6nnen Sie aufrufen \u00FCber: /help shortcuts\n\n\tTab\n\t\tSchlie\u00DFt Java-ID oder JShell-Befehl ab\n\tUmschalt+Tab gefolgt von V\n\t\tKonvertiert den Ausdruck in eine Variablendeklaration\n\tUmschalt+Tab gefolgt von M\n\t\tKonvertiert die Anweisung in eine Methodendeklaration\n\tUmschalt+Tab gefolgt von I\n\t\tF\u00FCgt Importe f\u00FCr diese ID hinzu\n\t\n\nWeitere Zeilen- und Historienbearbeitung:\n\n\tStrg+L\n\t\tBereinigt den Bildschirm und gibt das Snippet erneut aus\n\tStrg+U\n\t\tL\u00F6scht die gesamte Zeile\n\tStrg+T\n\t\tTransponiert Zeichen\n\tStrg+X gefolgt von Strg+B\n\t\tNavigiert zur entsprechenden Klammer, eckigen Klammer, ...\n\tStrg+X gefolgt von =\n\t\tAktiviert den Modus zum Anzeigen der aktuellen Zeichenposition\n\tStrg+X gefolgt von Strg+O\n\t\tSchaltet um zwischen \u00DCberschreiben und Einf\u00FCgen von Zeichen\n\tMeta+C\n\t\tSetzt Anfangsbuchstaben eines Wortes in Gro\u00DFbuchstaben\n\tMeta+U\n\t\tKonvertiert ein Wort in Gro\u00DFbuchstaben\n\tMeta+L\n\t\tKonvertiert ein Wort in Kleinbuchstaben\n\tMeta+0 bis Meta+9 gefolgt von Taste\n\t\tWiederholt den Vorgang die angegebene Anzahl von Malen\n\nDabei gilt z.B.: "Strg+A" bedeutet, dass Sie die Steuerungstaste gedr\u00FCckt halten und A dr\u00FCcken.\nAuf vielen Tastaturen ist die Taste "Meta" gleichbedeutend mit der Taste "Alt".\nUnterst\u00FCtzung f\u00FCr Zeilenbearbeitung wird von JLine 3 abgeleitet.
+
+help.shortcuts.summary = Beschreibung der Tastenanschl\u00E4ge f\u00FCr Snippet- und Befehlsabschluss,\nZugriff auf Informationen und automatische Codegenerierung
+help.shortcuts =Unterst\u00FCtzte Tastenkombinationen:\n\n\tTab\n\t\tDr\u00FCcken Sie nach Eingabe der ersten paar Buchstaben einer Java-ID,\n\t\teines JShell-Toolbefehls oder, in einigen F\u00E4llen, eines JShell-\n\t\tToolbefehlsarguments die Tabulatortaste, um die Eingabe abzuschlie\u00DFen.\n\t\tWenn mehrere Abschl\u00FCsse vorhanden sind, werden m\u00F6gliche Abschl\u00FCsse\n\t\tangezeigt.\n\t\tDurch erneutes Dr\u00FCcken der Tabulatortaste wird Dokumentation angezeigt, sofern vorhanden und relevant.\n\n\tUmschalt+Tab gefolgt von V\n\t\tHalten Sie nach einem abgeschlossenen Ausdruck die Umschalttaste gedr\u00FCckt,\n\t\tund dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken Sie die Taste V.\n\t\tDer Ausdruck wird in eine Variablendeklaration konvertiert, \n\t\tderen Typ auf dem Typ des Ausdrucks basiert.\n\n\tUmschalt+Tab gefolgt von M\n\t\tHalten Sie nach Abschluss eines Ausdrucks oder einer Anweisung die\n\t\tUmschalttaste gedr\u00FCckt, und dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken\n\t\tSie die Taste M. Der Ausdruck bzw. die Anweisung wird in eine\n\t\tMethodendeklaration konvertiert. Bei einem Ausdruck basiert der\n\t\tR\u00FCckgabetyp der Methode auf dem Typ des Ausdrucks.\n\n\tUmschalt+Tab gefolgt von I\n\t\tHalten Sie nach einer nicht aufl\u00F6sbaren ID die Umschalttaste gedr\u00FCckt,\n\t\tund dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken Sie die Taste I.\n\t\tDas JShell-Tool schl\u00E4gt daraufhin m\u00F6gliche Importe vor, die die\n\t\tID basierend auf dem Inhalt des angegebenen Classpath aufl\u00F6sen werden.\n\t\tGeben Sie die Ziffer ein, die dem gew\u00FCnschten Import entspricht,\n\t\toder dr\u00FCcken Sie die Taste 0, um keine Importe hinzuzuf\u00FCgen.\n\nInformationen zu weiteren Sondertasten k\u00F6nnen Sie aufrufen durch: /help keys
+
+help.context.summary = Beschreibung der Auswertungskontextoptionen f\u00FCr /env /reload und /reset
+help.context =Mit diesen Optionen wird der Auswertungskontext konfiguriert. Sie k\u00F6nnen beim Starten des \nJShell-Tools in der Befehlszeile oder beim Neustarten des JShell-Tools mit den Befehlen\n/env, /reload oder /reset als Befehlsoptionen angegeben werden.\n\nSie lauten:\n\t--class-path <Pfad>\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Klassendateien durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--module-path <Pfad>...\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Modulen durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--add-modules <Modulname>[,<Modulname>...]\n\t\tRoot-Module, die zus\u00E4tzlich zum Ausgangsmodul aufgel\u00F6st werden sollen.\n\t\t<Modulname> kann auch ALL-DEFAULT, ALL-SYSTEM,\n\t\tALL-MODULE-PATH sein.\n\t--add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n\t\taktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n\t\tunabh\u00E4ngig von der Moduldeklaration.\n\t\t<Zielmodul> kann ALL-UNNAMED sein, um in alle unbenannten\n\t\tModule zu exportieren. Wenn in JShell das <Zielmodul> nicht angegeben\n\t\twird (no =), wird ALL-UNNAMED verwendet.\n\nAuswertungskontextoptionen, die in der Befehlszeile eingegeben oder mit einem vorherigen\n/reset-, /env- oder /reload-Befehl angegeben werden, werden beibehalten, es sei denn,\nes wird eine Option eingegeben, die die Einstellung au\u00DFer Kraft setzt.\n\nIn der Befehlszeile ben\u00F6tigen diese Optionen zwei Bindestriche. Beispiel: --module-path\nIn den JShell-Toolbefehlen k\u00F6nnen sie ein oder zwei Bindestriche aufweisen. Beispiel: -module-path
+
+help.id.summary = Beschreibung der Snippet-IDs und deren Verwendung
+help.id =Jedes eingegebene Code-Snippet hat eine eindeutige Snippet-ID. Auch wenn Sie\ndasselbe Snippet erneut eingeben, erh\u00E4lt es eine neue ID. Bei normalen Snippets ist die ID\neine aufsteigende Zahl. Snippets, die mit einem Fehler nicht erfolgreich verlaufen, haben eine\nmit "e" beginnende Snippet-ID. Start-Snippets haben eine mit "s" beginnende ID.\n\nEine Snippet-ID stellt eine der M\u00F6glichkeiten dar, in einem Befehl auf ein Snippet zu verweisen. Beispiel:\nMit dem folgenden Befehl wird das Snippet mit der ID "14" gel\u00F6scht:\n\n\t/drop 14\n\nMit dem Befehl "/list" zeigen Sie die ID eines oder mehrerer Snippets an. Um die ID\naller Snippets anzuzeigen, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen und Start-Snippets,\nverwenden Sie den Befehl "/list -all".\n\nSie k\u00F6nnen auch auf einen ID-Bereich verweisen, indem Sie die Anfangs-ID und die End-ID mit einem\nBindestrich trennen. Beispiel: "1-4" entspricht "1 2 3 4". F\u00FCr alle Befehle,\ndie auf Snippets verweisen, kann eine Liste mit IDs, ID-Bereichen und Snippet-Namen\nals Argumenten angegeben werden. Diese Befehle sind: /list, /edit, /drop, /save, /vars, /methods,\n/types und /<id>. Einige Beispiele:\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\nSiehe "/help /edit", "/help /save" bzw. "/help rerun".
+
+help.rerun.summary = Beschreibung von M\u00F6glichkeiten zur erneuten Auswertung zuvor eingegebener Snippets
+help.rerun =Es gibt vier M\u00F6glichkeiten zur erneuten Auswertung zuvor eingegebener Snippets.\nDas letzte Snippet kann erneut ausgewertet werden mit: /!\nDas n-te vorherige Snippet kann mit Schr\u00E4gstrich-Minus und der jeweiligen Ziffer f\u00FCr n erneut ausgewertet werden. Beispiel: /-4\nBeispiel:\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\nDie erneut auszuwertenden Snippets k\u00F6nnen per Snippet-ID oder ID-Bereich angegeben werden.\nEin ID-Bereich wird als zwei durch Bindestrich getrennte IDs dargestellt. Beispiel: 3-17\nEs k\u00F6nnen auch Start- und Fehler-Snippets verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs k\u00F6nnen beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe auch "/help id".\n\nAu\u00DFerdem k\u00F6nnen Sie die Historie auch r\u00FCckw\u00E4rts durchsuchen, indem Sie Strg+R gefolgt von der zu suchenden Zeichenfolge eingeben.
+
+help.set._retain = Mit der Option "-retain" wird eine Einstellung zur Verwendung in zuk\u00FCnftigen Sessions gespeichert.\nDie -retain-Option kann f\u00FCr die folgenden Formen von /set verwendet werden:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\nWeitere Einzelheiten zu diesen Befehlen - Beispiel: /help /set editor
+
+help.set.format.summary = Legt das Format zum Melden eines Snippet-Ereignisses fest
+
+help.set.format = Legt das Format zum Melden eines Snippet-Ereignisses fest:\n\n\t/set format <Modus> <Feld> "<Format>" <Selektor>...\n\nZeigt Formateinstellungen an:\n\n\t/set format [<Modus> [<Feld>]]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<Feld> ist der Name des zu definierenden kontextspezifischen Formats.\n<Format> ist eine in Anf\u00FChrungszeichen gesetzte Zeichenfolge, die zum Wert des Feldes wird, wenn einer der\nSelektoren \u00FCbereinstimmt (oder keine Selektoren vorhanden sind). Bei Verwendung dieses Formats\nwerden in geschweiften Klammern eingeschlossene Feldnamen durch den Wert des Feldes zu diesem\nZeitpunkt ersetzt. Diese Felder k\u00F6nnen zuvor mit diesem Befehl definiert worden sein oder k\u00F6nnen\neines der folgenden vordefinierten, kontextspezifischen Felder sein:\n\t{name}       == Der Name. Beispiel: Variablenname, ...\n\t{type}       == Der Typname. Der Typ einer Variablen oder eines Ausdrucks, die\n\t\t\tParametertypen einer Methode\n\t{value}      == Der Ergebniswert eines Ausdrucks oder einer Variableninitialisierung\n\t{unresolved} == Die Liste nicht aufgel\u00F6ster Referenzen\n\t{errors}     == Die Liste behebbarer Fehler (nur w\u00E4hrend der Verarbeitung\n\t\t\tdes Feldes "display")\n\t{err}        == Eine nicht formatierte Fehlerzeile (nur w\u00E4hrend der Verarbeitung\n\t\t\tdes Feldes "errorline")\nZur Bestimmung des angezeigten Feedbacks greift das Tool auf folgende Felder zu:\n\t{display}    == Die angezeigte Meldung f\u00FCr ein Snippet-Ereignis\n\t{errorline}  == Das Format einer Fehlerzeile im Feld "errors"\n\t{pre}        == Das Feedbackpr\u00E4fix (am Beginn des Befehlsfeedbacks)\n\t{post}       == Das Feedback-Postfix (am Ende des Befehlsfeedbacks)\n\t{errorpre}   == Das Fehlerpr\u00E4fix (am Beginn des Fehlerfeedbacks)\n\t{errorpost}  == Das Fehler-Postfix (am Ende des Fehlerfeedbacks)\nDiese Fehler haben Standardeinstellungen (die \u00FCberschrieben werden k\u00F6nnen).\nDabei gilt: <Selektor> ist der Kontext, in dem das Format angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt \u00FCberein, wenn jede Selektortypliste \u00FCbereinstimmt. Eine Selektortypliste\nstimmt \u00FCberein, wenn einer der Werte \u00FCbereinstimmt.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\timport     -- Importdeklaration\n\tclass      -- Klassendeklaration\n\tinterface  -- Schnittstellendeklaration\n\tenum       -- Enum-Deklaration\n\tannotation -- Annotationsschnittstellendeklaration\n\trecord     -- Datensatzdeklaration\n\tmethod     -- Methodendeklaration -- Hinweis: {type}==parameter-types\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\n\tstatement  -- Anweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugef\u00FCgt\n\tmodified  -- Ein vorhandenes Snippet wurde ge\u00E4ndert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\n\toverwrote -- Ein vorhandenes Snippet wurde \u00FCberschrieben\n\tdropped   -- Snippet wurde gel\u00F6scht\n\tused      -- Snippet wurde verwendet, wo es nicht zul\u00E4ssig war\nDer when-did-it-occur-Selektortyp beschreibt, ob es sich um eine direkte oder indirekte Aktion handelt. Die Werte lauten:\n\tprimary -- Das eingegebene Snippet\n\tupdate  -- Ein Update eines abh\u00E4ngigen Snippets\nDer resolution-state-Selektortyp beschreibt den Aufl\u00F6sungs-/Definitionsstatus des Snippets. Die Werte lauten:\n\tok         -- Korrekt aufgel\u00F6st\n\tdefined    -- Trotz \
+behebbarer nicht aufgel\u00F6ster Referenzen definiert\n\tnotdefined -- Aufgrund behebbarer nicht aufgel\u00F6ster Referenzen nicht definiert\nDer unresolved-count-Selektortyp beschreibt die Anzahl nicht aufgel\u00F6ster Referenzen. Die Werte lauten:\n\tunresolved0 -- Es sind keine nicht aufgel\u00F6sten Namen vorhanden\n\tunresolved1 -- Es ist ein nicht aufgel\u00F6ster Name vorhanden\n\tunresolved2 -- Es sind mindestens zwei nicht aufgel\u00F6ste Namen vorhanden\nDer errors-count-Selektortyp beschreibt die Anzahl der Fehler. Die Werte lauten:\n\terror0 -- Keine Fehler\n\terror1 -- Ein Fehler\n\terror2 -- Mindestens zwei Fehler\n\nBeispiele:\n\t/set format mymode action 'Erstellt' added-primary\n\t/set format mymode action 'Update ersetzt' replaced-update\n\t/set format mymode display '{pre}{action} Klasse {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}' replaced-vardecl,varinit-ok-update\n\nNachfolgende Selektoren f\u00FCr ein Feld k\u00F6nnen einige oder alle zuvor verwendeten Selektoren \u00FCberschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <Format> werden die aktuellen Formateinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Formateinstellungen f\u00FCr diesen Modus angezeigt.\nBei Angabe von sowohl <Modus> als auch <Feld> werden nur die Formateinstellungen f\u00FCr\ndiesen Modus und dieses Feld angezeigt. Beispiel:\n\t/set format mymode\nzeigt die Formateinstellungen f\u00FCr den Modus "mymode" an\n
+
+help.set.truncation.summary = Legt die maximale L\u00E4nge eines angezeigten Wertes fest
+
+help.set.truncation = Legt die maximale L\u00E4nge eines angezeigten Wertes fest:\n\n\t/set truncation <Modus> <L\u00E4nge> <Selektor>...\n\nAktuelle Abschneideeinstellungen anzeigen:\n\n\t/set truncation [<Modus>]\n\nHier gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<L\u00E4nge> ist eine Ganzzahl ohne Vorzeichen, die eine Maximall\u00E4nge angibt.\n<Selektor> ist nur erforderlich, wenn Sie die Abschneidel\u00E4nge des Wertes nach Kontext\noptimieren m\u00F6chten. In diesem Fall ist <Selektor> der Kontext, in dem das Abschneiden angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt \u00FCberein, wenn jede Selektortypliste \u00FCbereinstimmt. Eine Selektortypliste\nstimmt \u00FCberein, wenn einer der Werte \u00FCbereinstimmt.\n\nNachfolgend sind die entsprechenden Selektortypen f\u00FCr das Abschneiden aufgelistet.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugef\u00FCgt\n\tmodified  -- Ein vorhandenes Snippet wurde ge\u00E4ndert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\nBeispiele:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\nNachfolgende Selektoren f\u00FCr ein Feld k\u00F6nnen einige oder alle zuvor verwendeten Selektoren \u00FCberschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <L\u00E4nge> werden die Abschneideeinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Abschneideeinstellungen f\u00FCr diesen Modus angezeigt.\nBeispiel:\n\t/set truncation mymode\nZeigt die Abschneideeinstellungen f\u00FCr den Modus "mymode" an\n
+
+help.set.feedback.summary = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks f\u00FCr eingegebene Snippets und Befehle fest
+
+help.set.feedback = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks f\u00FCr eingegebene Snippets und Befehle fest:\n\n\t/set feedback [-retain] <Modus>\n\nBeh\u00E4lt den aktuellen Feedbackmodus f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set feedback -retain\n\nZeigt den Feedbackmodus an und listet verf\u00FCgbare Modi auf:\n\n\t/set feedback\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\nSie d\u00FCrfen nur gerade gen\u00FCgend Buchstaben verwenden, um den Namen eindeutig zu machen.\nBenutzerdefinierte Modi k\u00F6nnen hinzugef\u00FCgt werden, siehe "/help /set mode"\n\nBei Verwendung der -retain-Option wird diese Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Modus> oder -retain werden der aktuelle Feedbackmodus und verf\u00FCgbare Modi angezeigt.\n
+
+help.set.mode.summary = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus)
+
+help.set.mode = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus):\n\n\t/set mode <neuer Modus> [<alter Modus>] (-command|-quiet)\n\nBeh\u00E4lt einen benutzerdefinierten Feedbackmodus f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set mode -retain <Modus>\n\nL\u00F6scht einen benutzerdefinierten Feedbackmodus:\n\n\t/set mode -delete [-retain] <Modus>\n\nZeigt Feedbackmoduseinstellungen an:\n\n\t/set mode [<Modus>]\n\nDabei gilt: <neuer Modus> ist der Name des zu erstellenden Modus.\n<alter Modus> ist der Name eines vorhandenen Feedbackmodus.\n<Modus> ist der Name eines vorhandenen Feedbackmodus.\n\nBei Angabe von <alter Modus> werden die zugeh\u00F6rigen Einstellungen in den neuen Modus kopiert.\n\nDas Feedback, das ein Modus f\u00FCr eingegebene Snippets bereitstellt, wird von den "/set format"-Einstellungen\nbestimmt. F\u00FCr eingegebene Befehle ist das Feedback dagegen entweder aktiviert oder deaktiviert.\nDies wird durch die beim Erstellen des Modus verwendete Option bestimmt. Es muss entweder die Option "-command"\noder die Option "-quiet" angegeben werden. Bei Verwendung von "-command" wird im neuen Modus informatives\nund best\u00E4tigendes Befehlsfeedback angezeigt. Bei Verwendung von "-quiet" wird bei Befehlen\nnur erforderliches Feedback angegeben (z.B. Fehler).\n\nNach dem Erstellen des neuen Modus k\u00F6nnen Sie diesen mit "/set format", "/set prompt und "/set truncation"\nkonfigurieren. Verwenden Sie "/set feedback", um den neuen Modus zu verwenden.\n\nBei Verwendung der Option "-retain" (ohne Option "-delete") wird der Modus (einschlie\u00DFlich\ndes aktuellen Prompts, Formats und der Abschneideeinstellungen) zur Verwendung in\nzuk\u00FCnftigen Ausf\u00FChrungen des JShell-Tools gespeichert. Wenn "-retain" nicht verwendet wird, wird der Modus nur in\nder aktuellen Session definiert. Verwenden Sie "-retain" nach dem Aktualisieren der Moduseinstellungen erneut,\num die Updates session\u00FCbergreifend beizubehalten.\n\nWenn nur die Option "-delete" verwendet wird, wird der Modus aus der aktuellen Session gel\u00F6scht.\nWenn sowohl "-retain" als auch "-delete" verwendet werden, wird der Modus aus der aktuellen und aus\nzuk\u00FCnftigen Sessions gel\u00F6scht.\n\nBei fehlender Angabe von Optionen werden die Moduseinstellungen angezeigt.\nBei Angabe des <Modus> werden nur die Moduseinstellungen f\u00FCr diesen Modus angezeigt.\nHinweis: Die Einstellungen f\u00FCr den Modus umfassen die Einstellungen f\u00FCr Prompt, Format und\nAbschneiden.\nBeispiel:\n\t/set mode mymode\n\nZeigt Modus, Prompt, Format und Abschneideeinstellungen f\u00FCr den Modus "mymode" an
+
+help.set.prompt.summary = Legt die Prompts fest
+
+help.set.prompt = Legt die Prompts fest. Es m\u00FCssen sowohl der normale als auch der Fortsetzungs-Prompt festgelegt werden:\n\n\t/set prompt <mode> "<Prompt>" "<Fortsetzungs-Prompt>"\n\nZeigt den normalen und den Fortsetzungs-Prompt an:\n\n\t/set prompt [<Modus>]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\n<Prompt> und <Fortsetzungs-Prompt> sind in Anf\u00FChrungszeichen gesetzte Zeichenfolgen, die als Eingabe-Prompts ausgegeben werden.\nOptional k\u00F6nnen beide "%%s" enthalten. Dies wird durch die n\u00E4chste Snippet-ID ersetzt.\nDer Eingabe wird unter Umst\u00E4nden keine ID zugewiesen, wenn es sich z.B. um einen Fehler oder Befehl handelt.\nDer Fortsetzungs-Prompt wird in einem mehrzeiligen Snippet in der zweiten und allen nachfolgenden Zeilen verwendet.\n\nBei fehlender Angabe von <Prompt> werden die aktuell festgelegten Prompts angezeigt.\nBei Angabe des <Modus> werden nur die Prompts f\u00FCr diesen Modus angezeigt.\nBeispiel:\n\t/set prompt mymode\nZeigt die f\u00FCr den Modus "mymode" festgelegten Prompts an\n
+
+help.set.editor.summary =Legt den mit dem /edit-Befehl zu startenden Befehl fest
+
+help.set.editor =Legt den mit dem /edit-Befehl zu startenden Befehl fest:\n\n\t/set editor [-retain] [-wait] <Befehl>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\nBeh\u00E4lt die aktuelle Editoreinstellung f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set editor -retain\n\nZeigt den mit dem /edit-Befehl zu startenden Befehl an:\n\n\t/set editor\n\nDer <Befehl> ist eine betriebssystemabh\u00E4ngige Zeichenfolge.\nDer <Befehl> kann durch Leerzeichen getrennte Argumente (z.B. Kennzeichen) enthalten\n\nBei Angabe der Option -default wird der integrierte Standardeditor verwendet.\n\nBei Angabe der Option -delete werden vorherige Einstellungen ignoriert - die Editoreinstellungen\nwerden wie beim Starten des JShell-Tools initialisiert. Insbesondere wird eine eventuell vorhandene\nbeibehaltene Einstellung verwendet (es sei denn, es werden sowohl -retain als auch -delete angegeben - \nin diesem Fall wird die beibehaltene Einstellung gel\u00F6scht). Ist eine der folgenden Umgebungsvariablen festgelegt,\nwird sie verwendet: JSHELLEDITOR, VISUAL oder EDITOR (in dieser Reihenfolge). Andernfalls\nwird der integrierte Standardeditor verwendet.\n\nBei Angabe von <Befehl> wird dieser als externer Editor verwendet. Der <Befehl>\nbesteht aus dem Programm und null oder mehr Programmargumenten. Bei Verwendung von <Befehl>\nwird die zu bearbeitende tempor\u00E4re Datei als letztes Argument angeh\u00E4ngt.\nNormalerweise wird der Bearbeitungsmodus fortgesetzt, bis der externe Editor beendet wird. Einige externe Editoren\nwerden umgehend beendet (z.B. wenn das Bearbeitungsfenster vorhanden ist). Es m\u00FCssen entweder Kennzeichen\nf\u00FCr externe Editoren verwendet werden, um ein umgehendes Beenden zu verhindern, oder die Option -wait muss\nverwendet werden, um den Benutzer zur Angabe aufzufordern, wann der Bearbeitungsmodus beendet werden soll.\n\nHinweis: Bei aktivem Bearbeitungsmodus werden keine Befehlseingaben angezeigt. Nach Beenden des Bearbeitungsmodus\nwerden keine \u00C4nderungen an den bearbeiteten Snippets angezeigt.\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Befehl> oder Optionen wird die Editoreinstellung angezeigt.\n
+
+help.set.start.summary =Legt die Startkonfiguration fest
+
+help.set.start =Legt die Startkonfiguration fest - eine Abfolge aus Snippets und Befehlen, die beim Hochfahren gelesen werden:\n\n\t/set start [-retain] <Datei>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\nBeh\u00E4lt die Startkonfiguration f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set start -retain\n\nZeigt die Starteinstellung an:\n\n\t/set start\n\nDer Inhalt der angegebenen <Datei> wird zu den verwendeten Start-Snippets und -befehlen,\nwenn die Befehle /reset, /reload oder /env in dieser Session verwendet werden.\nWird stattdessen die Option -default angegeben, werden die vordefinierten Startimport-\nSnippets verwendet.\nBei Verwendung der Option -none sind die Starteinstellungen leer - es werden keine\nStart-Snippets oder -befehle verwendet.\nDieser Befehl eignet sich gut zum Testen der Starteinstellungen. Um sie f\u00FCr zuk\u00FCnftige\nAusf\u00FChrungen des JShell-Tools beizubehalten, verwenden Sie den Befehl:\n\t/set start -retain\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Datei> oder Optionen werden die Starteinstellungen angezeigt.\nHinweis: Wenn der Start zuletzt von einer Datei festgelegt wurde, wird dies mit dem\nBefehl "set start" gefolgt vom Inhalt der Datei angezeigt.\n\nDie <Datei> kann der Name einer Betriebssystemdatei oder einer der vordefinierten\nStartdateinamen sein: DEFAULT, PRINTING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf() bzw.\nImporte aller Java SE-Packages.\nEs kann mehr als eine <Datei> angegeben werden. Beispiel:\n\n\t/set start -retain DEFAULT PRINTING
+
+help.set.indent.summary =Gibt die Anzahl der Leerzeichen zum Einr\u00FCcken der Snippets an
+
+help.set.indent =Gibt die Anzahl der Leerzeichen zum Einr\u00FCcken der Snippets an:\n\n\t/set indent <Anzahl>\n\nZeigt die Einzugseinstellung an:\n\n\t/set indent\n
+startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action 'Erstellt' added-primary    \n/set format verbose action 'Ge\u00E4ndert' modified-primary    \n/set format verbose action 'Ersetzt' replaced-primary    \n/set format verbose action '\u00DCberschrieben' overwrote-primary    \n/set format verbose action 'Gel\u00F6scht' dropped-primary    \n/set format verbose action '  Update erstellt' added-update    \n/set format verbose action '  Update ge\u00E4ndert' modified-update    \n/set format verbose action '  Update ersetzt' replaced-update    \n/set format verbose action '  Update \u00FCberschrieben' overwrote-update    \n/set format verbose action '  Update gel\u00F6scht' dropped-update    \n\n/set format verbose until ', Instanziierung oder Aufruf der zugeh\u00F6rigen Methoden ist jedoch nicht m\u00F6glich bis'   defined-class,record-primary    \n/set format verbose until ', Aufruf der zugeh\u00F6rigen Methoden ist jedoch nicht m\u00F6glich bis'                      defined-interface-primary    \n/set format verbose until ', Verwendung ist jedoch nicht m\u00F6glich bis'                                  defined-enum,annotation-primary    \n/set format verbose until ', Aufruf ist jedoch nicht m\u00F6glich bis'                               defined-method-primary    \n/set format verbose until ', Referenzierung ist jedoch nicht m\u00F6glich bis'                            notdefined-primary    \n/set format verbose until ' Instanziierung oder Aufruf der zugeh\u00F6rigen Methoden ist nicht m\u00F6glich bis'          defined-class,record-update    \n/set format verbose until ' Aufruf der zugeh\u00F6rigen Methoden ist nicht m\u00F6glich bis'                              defined-interface-update    \n/set format verbose until ' Aufruf ist nicht m\u00F6glich bis'                                      defined-method-update    \n/set format verbose until ' Referenzierung ist nicht m\u00F6glich bis'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved} ist deklariert'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved} sind deklariert'                                          unresolved2-error0    \n/set format verbose unrerr ' dieser Fehler ist behoben: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved} ist deklariert, und dieser Fehler ist behoben: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved} sind deklariert, und dieser Fehler ist behoben: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' diese Fehler sind behoben: {errors}'                              unresolved0-error2    \n/set format verbose unrerr '{unresolved} ist deklariert, und diese Fehler sind behoben: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved} sind deklariert, und diese Fehler sind behoben: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind 'Klasse'                  class    \n/set format verbose typeKind 'Schnittstelle'              interface    \n/set format verbose typeKind 'Enum'                   enum    \n/set format verbose typeKind 'Annotationsschnittstelle'   annotation    \n/set format verbose typeKind 'Datensatz'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}Scratch-Variable {name} erstellt: {type}{post}'    \
+expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Wert von {name}: {type}{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Zugewiesen zu {name}: {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} Variable {name}: {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} Variable {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} Variable {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} Methode {name}({type}){resolve}{post}'             method    \n\n/set format verbose display '{pre}Verwendung von {typeKind} {name} wurde versucht{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}Aufruf der Methode {name} ({type}) wurde versucht{resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} Variable {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,record,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set truncation silent 80\n/set truncation silent 1000                                                                  varvalue,expression\n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
index 6e942910536..9ae0333fdea 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
@@ -179,8 +179,8 @@ jshell.console.empty = \n\u7A7A\u306E\u30A8\u30F3\u30C8\u30EA\u3002\u5358\u4E00\
 
 jshell.fix.wrong.shortcut =[Shift]+[Tab]\u306E\u5F8C\u306E\u6587\u5B57\u304C\u4E88\u671F\u3057\u306A\u3044\u6587\u5B57\u3067\u3059\u3002\n\u81EA\u52D5\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u306F"i"\u3001\u5909\u6570\u306E\u4F5C\u6210\u306B\u306F"v"\u3001\u30E1\u30BD\u30C3\u30C9\u306E\u4F5C\u6210\u306B\u306F"m"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u8A73\u7D30\u306F\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n/help shortcuts
 
-help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell <option>... <load-file>...\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n    --class-path <path>   \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --module-path <path>  \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --add-modules <module>(,<module>)*\n                           \u89E3\u6C7A\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<module>\u304CALL-MODULE-PATH\n                            \u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --enable-preview      \u30B3\u30FC\u30C9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --startup <file>      \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u307E\u3059\n    --no-startup          \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u307E\u305B\u3093\n    --feedback <mode>     \u521D\u671F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306F\n                            \u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B(silent\u3001concise\u3001normal\u307E\u305F\u306Fverbose)\u304B\u3001\n                            \u4E8B\u524D\u306B\u30E6\u30FC\u30B6\u30FC\u304C\u5B9A\u7FA9\u3067\u304D\u307E\u3059\n    -q                    \u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback concise\u3068\u540C\u3058\n    -s                    \u975E\u5E38\u306B\u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback silent\u3068\u540C\u3058\n    -v                    \u8A73\u7D30\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback verbose\u3068\u540C\u3058\n    -J<flag>              <flag>\u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3057\u307E\u3059\u3002\n                            \u5B9F\u884C\u6642\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-J\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -R<flag>              <flag>\u3092\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30EA\u30E2\u30FC\u30C8\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-R\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -C<flag>              <flag>\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-C\u3092\u4F7F\u7528\u3057\u307E\u3059\n    --version              \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --show-version        \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D9A\u884C\u3057\u307E\u3059\n    --help, -?, -h        \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3053\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --help-extra, -X      \
-\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n\n\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306B\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u540D(DEFAULT\u3001\nPRINTING\u307E\u305F\u306FJAVASE)\u306E1\u3064\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\nload-file\u3067\u3082\u3001\u5BFE\u8A71\u578BI/O\u3092\u4F7F\u7528\u305B\u305A\u306B\u3001"-"\u3092\u6307\u5B9A\u3057\u3066\u6A19\u6E96\u5165\u529B\u3092\u793A\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n\n\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(--class-path\u3001--module-path\u3001--add-modules)\u306E\n\u8A73\u7D30\u306F\u3001\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\t/help context\n\n\u30D1\u30B9\u306B\u306F\u3001\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3068\u30A2\u30FC\u30AB\u30A4\u30D6\u304C\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002Windows\u306E\u5834\u5408\u306F\u3001\n\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\n\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n
+help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell <option>... <load-file>...\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n    --class-path <path>   \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --module-path <path>  \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --add-modules <module>(,<module>)*\n                          \u89E3\u6C7A\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<module>\u304CALL-MODULE-PATH\n                            \u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --enable-native-access\n                          \u30B3\u30FC\u30C9\u3067\u5236\u9650\u4ED8\u304D\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30E1\u30BD\u30C3\u30C9\u5B9F\u884C\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --enable-preview      \u30B3\u30FC\u30C9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --startup <file>      \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u307E\u3059\n    --no-startup          \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u307E\u305B\u3093\n    --feedback <mode>     \u521D\u671F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306F\n                            \u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B(silent\u3001concise\u3001normal\u307E\u305F\u306Fverbose)\u304B\u3001\n                            \u4E8B\u524D\u306B\u30E6\u30FC\u30B6\u30FC\u304C\u5B9A\u7FA9\u3067\u304D\u307E\u3059\n    -q                    \u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback concise\u3068\u540C\u3058\n    -s                   \u975E\u5E38\u306B\u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback silent\u3068\u540C\u3058\n    -v                     \u8A73\u7D30\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback verbose\u3068\u540C\u3058\n    -J<flag>               <flag>\u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3057\u307E\u3059\u3002\n                            \u5B9F\u884C\u6642\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-J\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -R<flag>               <flag>\u3092\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30EA\u30E2\u30FC\u30C8\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-R\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -C<flag>              <flag>\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-C\u3092\u4F7F\u7528\u3057\u307E\u3059\n    --version             \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --show-version        \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D9A\u884C\u3057\u307E\u3059\n    --help, -?, -h        \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3053\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --help-extra, -X      \
+\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n\n\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306B\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u540D(DEFAULT\u3001\nPRINTING\u307E\u305F\u306FJAVASE)\u306E1\u3064\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\nload-file\u3067\u3082\u3001\u5BFE\u8A71\u578BI/O\u3092\u4F7F\u7528\u305B\u305A\u306B\u3001"-"\u3092\u6307\u5B9A\u3057\u3066\u6A19\u6E96\u5165\u529B\u3092\u793A\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n\n\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(--class-path\u3001--module-path\u3001\n--add-modules)\u306E\u8A73\u7D30\u306F\u3001\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\t/help context\n\n\u30D1\u30B9\u306B\u306F\u3001\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3068\u30A2\u30FC\u30AB\u30A4\u30D6\u304C\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002Windows\u306E\u5834\u5408\u306F\u3001\n\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\n\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n
 help.usage.x = \    --add-exports <module>/<package>   \u5B9A\u7FA9\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u308B\u3068\n                                         \u307F\u306A\u3055\u308C\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --execution <spec>                 \u4EE3\u66FF\u5B9F\u884C\u30A8\u30F3\u30B8\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                                         \u3053\u3053\u3067\u3001<spec>\u306FExecutionControl spec\u3067\u3059\u3002\n                                         spec\u306E\u69CB\u6587\u306B\u3064\u3044\u3066\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8jdk.jshell.spi\u306E\n                                         \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    \n\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 help.list.summary = \u5165\u529B\u3057\u305F\u30BD\u30FC\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
index 168311a8100..92eaaaf4cf5 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
@@ -179,7 +179,7 @@ jshell.console.empty = \n\u7A7A\u6761\u76EE\u3002Shift+Tab m \u524D\u5FC5\u987B\
 
 jshell.fix.wrong.shortcut =Shift+Tab \u540E\u51FA\u73B0\u610F\u5916\u7684\u5B57\u7B26\u3002\n\u4F7F\u7528 "i" \u8868\u793A\u81EA\u52A8\u5BFC\u5165\uFF0C\u4F7F\u7528 "v" \u8868\u793A\u53D8\u91CF\u521B\u5EFA\uFF0C\u4F7F\u7528 "i" \u8868\u793A\u65B9\u6CD5\u521B\u5EFA\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u9605\uFF1A\n/help \u5FEB\u6377\u65B9\u5F0F
 
-help.usage = \u7528\u6CD5\uFF1A   jshell <\u9009\u9879>... <\u52A0\u8F7D\u6587\u4EF6>...\n\u5176\u4E2D\uFF0C\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC\uFF1A\n    --class-path <\u8DEF\u5F84>   \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n    --module-path <\u8DEF\u5F84>  \u6307\u5B9A\u67E5\u627E\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u4F4D\u7F6E\n    --add-modules <\u6A21\u5757>(,<\u6A21\u5757>)*\n                          \u6307\u5B9A\u8981\u89E3\u6790\u7684\u6A21\u5757\uFF1B\u5982\u679C <\u6A21\u5757> \n                          \u4E3A ALL-MODULE-PATH\uFF0C\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\n    --enable-preview      \u5141\u8BB8\u4EE3\u7801\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n    --startup <\u6587\u4EF6>      \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n    --no-startup          \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n    --feedback <\u6A21\u5F0F>     \u6307\u5B9A\u521D\u59CB\u53CD\u9988\u6A21\u5F0F\u3002\u8BE5\u6A21\u5F0F\u53EF\u4EE5\u662F\n                            \u9884\u5B9A\u4E49\u7684\uFF08silent\u3001concise\u3001normal \u6216 verbose\uFF09\uFF0C\n                            \u4E5F\u53EF\u662F\u4EE5\u524D\u7528\u6237\u5B9A\u4E49\u7684\n    -q                    \u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback concise\n    -s                    \u771F\u6B63\u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback silent\n    -v                    \u8BE6\u7EC6\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback verbose\n    -J<\u6807\u8BB0>              \u76F4\u63A5\u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FD0\u884C\u65F6\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -J\n    -R<\u6807\u8BB0>              \u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FDC\u7A0B\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FDC\u7A0B\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -R\n    -C<\u6807\u8BB0>              \u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u7F16\u8BD1\u5668\u3002\n                            \u4E3A\u6BCF\u4E2A\u7F16\u8BD1\u5668\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -C\n    --version             \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\n    --show-version        \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u7EE7\u7EED\n    --help, -?, -h        \u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u6B64\u63D0\u8981\u5E76\u9000\u51FA\n    --help-extra, -X      \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\u5E76\u9000\u51FA\n\n\u6587\u4EF6\u53C2\u6570\u53EF\u4EE5\u662F\u6587\u4EF6\u540D\uFF0C\u6216\u8005\u662F\u9884\u5B9A\u4E49\u7684\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001\nPRINTING \u6216 JAVASE\u3002\n\u52A0\u8F7D\u6587\u4EF6\u4E5F\u53EF\u4EE5\u662F "-"\uFF0C\u7528\u4E8E\u6307\u660E\u6807\u51C6\u8F93\u5165\uFF0C\u6CA1\u6709\u4EA4\u4E92\u5F0F I/O\u3002\n\n\u6709\u5173\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF08--class-path\u3001\n--module-path \u548C --add-modules\uFF09\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\t/help context\n\n\u8DEF\u5F84\u5217\u51FA\u8981\u641C\u7D22\u7684\u76EE\u5F55\u548C\u6863\u6848\u3002\u5BF9\u4E8E Windows\uFF0C\u8BF7\u4F7F\u7528\n\u5206\u53F7 (;) \u6765\u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u8BF7\u4F7F\u7528\n\u5192\u53F7 (:) \u6765\u5206\u9694\u5404\u9879\u3002\n
+help.usage = \u7528\u6CD5\uFF1A   jshell <option>... <load-file>...\n\u5176\u4E2D\uFF0C\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC\uFF1A\n    --class-path <path>   \u6307\u5B9A\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u67E5\u627E\u4F4D\u7F6E\n    --module-path <path>  \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u67E5\u627E\u4F4D\u7F6E\n    --add-modules <module>(,<module>)*\n                          \u6307\u5B9A\u8981\u89E3\u6790\u7684\u6A21\u5757\uFF1B\u5982\u679C \n                            <module> \u4E3A ALL-MODULE-PATHs\uFF0C\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\n    --enable-native-access\n                          \u5141\u8BB8\u4EE3\u7801\u8FD0\u884C\u53D7\u9650\u7684\u672C\u673A\u65B9\u6CD5\n    --enable-preview      \u5141\u8BB8\u4EE3\u7801\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n    --startup <file>      \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n    --no-startup          \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n    --feedback <mode>     \u6307\u5B9A\u521D\u59CB\u53CD\u9988\u6A21\u5F0F\u3002\u8BE5\u6A21\u5F0F\u53EF\u4EE5\u662F\n                            \u9884\u5B9A\u4E49\u7684\uFF08silent\u3001concise\u3001normal \u6216 verbose\uFF09\uFF0C\n                            \u4E5F\u53EF\u4EE5\u662F\u7528\u6237\u5728\u4EE5\u524D\u5B9A\u4E49\u7684\n    -q                    \u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback concise\n    -s                    \u771F\u6B63\u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback silent\n    -v                    \u8BE6\u7EC6\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback verbose\n    -J<flag>              \u76F4\u63A5\u5C06 <flag> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FD0\u884C\u65F6\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -J\n    -R<flag>              \u5C06 <flag> \u4F20\u9012\u5230\u8FDC\u7A0B\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FDC\u7A0B\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -R\n    -C<flag>              \u5C06 <flag> \u4F20\u9012\u5230\u7F16\u8BD1\u5668\u3002\n                            \u4E3A\u6BCF\u4E2A\u7F16\u8BD1\u5668\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -C\n    --version             \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\n    --show-version        \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u7EE7\u7EED\n    --help, -?, -h        \u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u6B64\u63D0\u8981\u5E76\u9000\u51FA\n    --help-extra, -X      \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\u5E76\u9000\u51FA\n\n\u6587\u4EF6\u53C2\u6570\u53EF\u4EE5\u662F\u6587\u4EF6\u540D\uFF0C\u6216\u8005\u662F\u9884\u5B9A\u4E49\u7684\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001\nPRINTING \u6216 JAVASE\u3002\n\u52A0\u8F7D\u6587\u4EF6\u4E5F\u53EF\u4EE5\u662F "-"\uFF0C\u7528\u4E8E\u6307\u660E\u6807\u51C6\u8F93\u5165\uFF0C\u6CA1\u6709\u4EA4\u4E92\u5F0F I/O\u3002\n\n\u6709\u5173\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF08--class-path\u3001\n--module-path \u548C --add-modules\uFF09\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\t/help context\n\n\u8DEF\u5F84\u5217\u51FA\u8981\u641C\u7D22\u7684\u76EE\u5F55\u548C\u6863\u6848\u3002\u5BF9\u4E8E Windows\uFF0C\u8BF7\u4F7F\u7528\n\u5206\u53F7 (;) \u6765\u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u8BF7\u4F7F\u7528\n\u5192\u53F7 (:) \u6765\u5206\u9694\u5404\u9879\u3002\n
 help.usage.x = \    --add-exports <\u6A21\u5757>/<\u7A0B\u5E8F\u5305>      \u6307\u5B9A\u8981\u8003\u8651\u4ECE\u5176\u5B9A\u4E49\u6A21\u5757\u5BFC\u51FA\n                                         \u7684\u7A0B\u5E8F\u5305\n    --execution <\u89C4\u8303>                 \u6307\u5B9A\u66FF\u4EE3\u6267\u884C\u5F15\u64CE\u3002\n                                         \u5176\u4E2D <\u89C4\u8303> \u662F ExecutionControl \u89C4\u8303\u3002\n                                         \u6709\u5173\u89C4\u8303\u7684\u8BED\u6CD5\uFF0C\u8BF7\u53C2\u9605\u7A0B\u5E8F\u5305\n                                         jdk.jshell.spi \u7684\u6587\u6863\n    \n\u8FD9\u4E9B\u9009\u9879\u662F\u975E\u6807\u51C6\u9009\u9879\uFF0C\u5982\u6709\u66F4\u6539\uFF0C\u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 help.list.summary = \u5217\u51FA\u60A8\u952E\u5165\u7684\u6E90
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
new file mode 100644
index 00000000000..9a20c08fefb
--- /dev/null
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+jshell.diag.modifier.plural.fatal = Modifikatoren {0} nicht zul\u00E4ssig
+jshell.diag.modifier.plural.ignore = Modifikatoren {0} nicht zul\u00E4ssig, ignoriert
+jshell.diag.modifier.single.fatal = Modifikator {0} nicht zul\u00E4ssig
+jshell.diag.modifier.single.ignore = Modifikator {0} nicht zul\u00E4ssig, ignoriert
+jshell.diag.object.method.fatal = JShell-Methodennamen d\u00FCrfen nicht mit Objektmethoden \u00FCbereinstimmen: {0}
+
+jshell.exc.null = Snippet darf nicht Null sein
+jshell.exc.alien = Snippet stammt nicht aus dieser JShell-Instanz: {0}
+jshell.exc.closed = JShell ({0}) wurde geschlossen.
+jshell.exc.var.not.valid = Snippet-Parameter von varValue() {0} muss g\u00FCltig (VALID) sein. Er lautet: {1}
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
index 1c2ad607267..c2378cc5b9f 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
index 7ee702c4fef..fdf1b7f6128 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
index d2d583d9252..b44ac5d7148 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,218 +60,225 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-#
-# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-#
 adp=Andorranische Pesete
-aed=UAE Dirham
+aed=VAE-Dirham
 afa=Afghani (1927-2002)
 afn=Afghani
-all=Lek
-amd=Dram
-ang=Niederl. Antillen Gulden
-aoa=Kwanza
+all=Albanischer Lek
+amd=Armenischer Dram
+ang=Gulden (Niederl\u00E4ndische Antillen)
+aoa=Kwanza (Angola)
 ars=Argentinischer Peso
-ats=\u00d6sterreichischer Schilling
-aud=Australischer Dollar
+ats=\u00D6sterreichischer Schilling
+aud=Australische Dollar
 awg=Aruba Florin
-azm=Aserbaidschan-Manat (1993-2006)
-azn=Aserbaidschan-Manat
-bam=Konvertierbare Mark
-bbd=Barbados-Dollar
-bdt=Taka
+azm=Aserbaidschainischer Manat (1993-2006)
+azn=Aserbaidschainischer Manat
+bam=Konvertible Mark (Bosnien und Herzegowina)
+bbd=Dollar (Barbados)
+bdt=Bangladeschischer Taka
 bef=Belgischer Franc
-bgl=Lew (1962-1999)
-bgn=Lew
+bgl=Bulgarischer Lew
+bgn=Bulgarischer Lew
 bhd=Bahrain-Dinar
 bif=Burundi-Franc
 bmd=Bermuda-Dollar
 bnd=Brunei-Dollar
-bob=Boliviano
-bov=Mvdol
-brl=Real
+bob=Bolivianischer Boliviano
+bov=Bolivianischer Mvdol
+brl=Brasilianischer Real
 bsd=Bahama-Dollar
-btn=Ngultrum
-bwp=Pula
-byb=Belarus Rubel (alt)
-byr=Belarus Rubel (neu)
+btn=Ngultrum (Bhutan)
+bwp=Botswanischer Pula
+byb=Wei\u00DFrussischer Rubel (1994-1999)
+byn=Wei\u00DFrussischer Rubel
+byr=Wei\u00DFrussischer Rubel (2000-2016)
 bzd=Belize-Dollar
 cad=Kanadischer Dollar
-cdf=Franc congolais
+cdf=Kongo-Franc
 chf=Schweizer Franken
-clf=Unidades de Fomento
+clf=Chilenische Unidad de Fomento (UF)
 clp=Chilenischer Peso
-cny=Renminbi Yuan
+cny=Chinesischer Yuan
 cop=Kolumbianischer Peso
-crc=Costa Rica Colon
-csd=Alter Serbischer Dinar
-cuc=Kubanischer Peso (konvertibel)
+crc=Costa-Rica-Col\u00F3n
+csd=Serbischer Dinar (2002-2006)
+cuc=Kubanischer konvertibler Peso
 cup=Kubanischer Peso
-cve=Kap Verde Escudo
+cve=Kap-Verde-Escudo
 cyp=Zypern-Pfund
-czk=Tschechische Krone
+czk=Tschechische Krone 
 dem=Deutsche Mark
 djf=Dschibuti-Franc
-dkk=D\u00e4nische Krone
+dkk=D\u00E4nische Krone
 dop=Dominikanischer Peso
 dzd=Algerischer Dinar
 eek=Estnische Krone
-egp=\u00c4gyptisches Pfund
-ern=Nakfa
-esp=Spanische Peseta
-etb=Birr
+egp=\u00C4gyptisches Pfund
+ern=Eritreischer Nakfa
+esp=Spanische Pesete
+etb=\u00C4thiopischer Birr
+eur=Euro
 fim=Finnische Mark
 fjd=Fidschi-Dollar
-fkp=Falkland-Pfund
-frf=Franz\u00f6sischer Franc
-gbp=Pfund Sterling
-gel=Georgischer Lari
-ghc=Cedi
-ghs=Ghanaische Cedi
+fkp=Falklandinseln-Pfund
+frf=Franz\u00F6sischer Franc
+gbp=Britisches Pfund
+gel=Georgische Lari
+ghc=Ghanaischer Cedi (1979-2007)
+ghs=Ghanaischer Cedi
 gip=Gibraltar-Pfund
-gmd=Dalasi
+gmd=Gambischer Dalasi
 gnf=Guinea-Franc
 grd=Griechische Drachme
-gtq=Quetzal
-gwp=Guinea Bissau Peso
+gtq=Guatemaltekischer Quetzal
+gwp=Guinea-Bissau-Peso
 gyd=Guyana-Dollar
 hkd=Hongkong-Dollar
-hnl=Lempira
+hnl=Honduranische Lempira
 hrk=Kuna
-htg=Gourde
-huf=Forint
-idr=Rupiah
+htg=Haitianische Gourde
+huf=Ungarischer Forint
+idr=Indonesische Rupiah
 iep=Irisches Pfund
-ils=Schekel
+ils=Neuer israelischer Schekel
 inr=Indische Rupie
-iqd=Irak Dinar
-irr=Rial
-isk=Isl\u00e4ndische Krone
-itl=Italienische Lira
-jmd=Jamaika-Dollar
+iqd=Irakischer Dinar
+irr=Iranischer Rial
+isk=Isl\u00E4ndische Krone
+itl=Italienische Lire
+jmd=Jamaikanischer Dollar
 jod=Jordanischer Dinar
-jpy=Yen
-kes=Kenia-Schilling
-kgs=Som
-khr=Riel
-kmf=Komoren Franc
+jpy=Japanischer Yen
+kes=Kenianischer Schilling
+kgs=Kirgisischer Som
+khr=Kambodschanischer Riel
+kmf=Komoren-Franc
 kpw=Nordkoreanischer Won
-krw=S\u00fcdkoreanischer Won
-kwd=Kuwait Dinar
+krw=S\u00FCdkoreanischer Won
+kwd=Kuwaitischer Dinar
 kyd=Kaiman-Dollar
-kzt=Tenge
-lak=Kip
+kzt=Kasachischer Tenge
+lak=Laotischer Kip
 lbp=Libanesisches Pfund
-lkr=Sri Lanka Rupie
+lkr=Sri-Lanka-Rupie
 lrd=Liberianischer Dollar
-lsl=Loti
-ltl=Litauischer Litas
+lsl=Lesothischer Loti
+ltl=Litauische Litas
 luf=Luxemburgischer Franc
-lvl=Lettischer Lats
+lvl=Lettische Lats
 lyd=Libyscher Dinar
 mad=Marokkanischer Dirham
-mdl=Moldau Leu
-mga=Madagaskar Ariary
+mdl=Moldova-Leu
+mga=Madagaskar-Ariary
 mgf=Madagaskar-Franc
-mkd=Denar
-mmk=Kyat
-mnt=Tugrik
-mop=Pataca
-mro=Ouguiya
-mtl=Maltesische Lira
+mkd=Mazedonischer Denar
+mmk=Myanmar-Kyat
+mnt=Mongolischer Tugrik
+mop=Macau-Pataca
+mro=Mauretanische Ouguiya
+mru=Mauretanische Ouguiya
+mtl=Maltesische Lire
 mur=Mauritius-Rupie
-mvr=Rufiyaa
-mwk=Malawi Kwacha
+mvr=Rufiyaa (Malediven)
+mwk=Malawi-Kwacha
 mxn=Mexikanischer Peso
-mxv=Mexican Unidad de Inversion (UDI)
+mxv=Unidad De Inversion (Mexiko)
 myr=Malaysischer Ringgit
-mzm=Alter Metical
-mzn=Metical
-nad=Namibia-Dollar
-ngn=Naira
-nio=Gold-Cordoba
-nlg=Holl\u00e4ndischer Gulden
+mzm=Mosambikanischer Metical (1980-2006)
+mzn=Mosambikanischer Metical
+nad=Namibischer Dollar
+ngn=Nigerianische Naira
+nio=C\u00F3rdoba Oro
+nlg=Niederl\u00E4ndischer Gulden
 nok=Norwegische Krone
 npr=Nepalesische Rupie
-nzd=Neuseeland-Dollar
-omr=Rial Omani
-pab=Balboa
-pen=Neuer Sol
-pgk=Kina
+nzd=Neuseel\u00E4ndischer Dollar
+omr=Omani-Rial
+pab=Panamaischer Balboa
+pen=Peruanischer Sol
+pgk=Kina (Papua-Neuguinea)
 php=Philippinischer Peso
 pkr=Pakistanische Rupie
-pln=Zloty
-pte=Portugiesischer Escudo
-pyg=Guarani
-qar=Katar Riyal
-rol=Leu
-ron=Rum\u00e4nischer Leu
+pln=Polnischer Zloty
+pte=Portuguiesischer Escudo
+pyg=Paraguayischer Guarani
+qar=Katar-Riyal
+rol=Rum\u00E4nischer Leu (1952-2006)
+ron=Rum\u00E4nischer Leu
 rsd=Serbischer Dinar
-rub=Russischer Rubel (neu)
-rur=Russischer Rubel (alt)
+rub=Russischer Rubel
+rur=Russischer Rubel (1991-1998)
 rwf=Ruanda-Franc
-sar=Saudi-Rial
+sar=Saudischer Rial
 sbd=Salomonen-Dollar
 scr=Seychellen-Rupie
-sdd=Sudanesischer Dinar
+sdd=Sudanesischer Dinar (1992-2007)
 sdg=Sudanesisches Pfund
 sek=Schwedische Krone
 sgd=Singapur-Dollar
-shp=St. Helena Pfund
-sit=Tolar
+shp=St. Helena-Pfund
+sit=Slowenischer Tolar
 skk=Slowakische Krone
-sll=Leone
-sos=Somalia-Schilling
-srd=Surinamischer Dollar
-srg=Suriname Gulden
-std=Dobra
-svc=El Salvador Colon
+sll=Sierra-leonischer Leone
+sos=Somalischer Schilling
+srd=Suriname-Dollar
+srg=Suriname-Gulden
+ssp=S\u00FCdsudanesisches Pfund
+std=Dobra (S\u00E3o Tom\u00E9 und Pr\u00EDncipe)
+stn=Dobra (S\u00E3o Tom\u00E9 und Pr\u00EDncipe)
+svc=El-Salvador-Col\u00F3n
 syp=Syrisches Pfund
-szl=Lilangeni
-thb=Baht
-tjs=Tadschikistan Somoni
-tmm=Turkmenistan-Manat
-tmt=Neuer Turkmenistan-Manat
+szl=Lilangeni (Swasiland)
+thb=Thail\u00E4ndischer Baht
+tjs=Somoni (Tadschikistan)
+tmm=Turkmenistan-Manat (1993-2009)
+tmt=Turkmenistan-Manat
 tnd=Tunesischer Dinar
-top=Pa\u02bbanga
-tpe=Timor-Escudo
-trl=Alte T\u00fcrkische Lira
-try=T\u00fcrkische Lira
-ttd=Trinidad- und Tobago-Dollar
-twd=Neuer Taiwan-Dollar
+top=Pa'anga (Tonga)
+tpe=Escudo (Portugiesisch-Timor)
+trl=T\u00FCrkische Lira (1922-2005)
+try=T\u00FCrkische Lira
+ttd=Trinidad/Tobago-Dollar
+twd=Neu-Taiwan Dollar
 tzs=Tansania-Schilling
-uah=Hryvnia
+uah=Ukrainische Hrywnja
 ugx=Uganda-Schilling
 usd=US-Dollar
-usn=US Dollar (N\u00e4chster Tag)
-uss=US Dollar (Gleicher Tag)
-uyu=Uruguayischer Peso
-uzs=Usbekistan Sum
-veb=Bolivar
-vef=Bol\u00edvar Fuerte
-vnd=Dong
-vuv=Vatu
-wst=Tala
-xaf=CFA Franc (\u00c4quatorial)
-xag=Unze Silber
-xau=Unze Gold
-xba=Europ\u00e4ische Rechnungseinheit
-xbb=Europ\u00e4ische W\u00e4hrungseinheit (XBB)
-xbc=Europ\u00e4ische Rechnungseinheit (XBC)
-xbd=Europ\u00e4ische Rechnungseinheit (XBD)
-xcd=Ostkaribischer Dollar
+usn=US-Dollar (n\u00E4chster Tag)
+uss=US-Dollar (gleicher Tag)
+uyu=Peso
+uzs=Usbekistan-Sum
+veb=Venezolanischer Bol\u00EDvar (1871-2008)
+ved=Venezolanischer Bol\u00EDvar
+vef=Venezolanischer Bol\u00EDvar Fuerte
+ves=Venezolanischer Bol\u00EDvar
+vnd=Vietnamesischer Dong
+vuv=Vanuatu-Vatu
+wst=Samoanischer Tala
+xaf=CFA-Franc BEAC
+xag=Silber
+xau=Gold
+xba=European Composite Unit
+xbb=European Monetary Unit
+xbc=Europ\u00E4ische Rechnungseinheit (XBC)
+xbd=Europ\u00E4ische Rechnungseinheit (XBD)
+xcd=Dollar, Ostkaribik
 xdr=Sonderziehungsrechte
-xfo=Franz\u00f6sischer Gold-Franc
-xfu=Franz\u00f6sischer UIC-Franc
-xof=CFA Franc (West)
-xpd=Unze Palladium
+xfo=Franz\u00F6sischer Goldfranken
+xfu=Franz\u00F6sischer UIC-Franc
+xof=CFA-Franc BCEAO
+xpd=Palladium
 xpf=CFP-Franc
-xpt=Unze Platin
-xts=Testw\u00e4hrung
-xxx=Unbekannte W\u00e4hrung
+xpt=Platin
+xsu=Sucre
+xts=Testw\u00E4hrungscode
+xua=ADB Unit of Account
+xxx=Unbekannte W\u00E4hrung
 yer=Jemen-Rial
-yum=Neuer Dinar
-zar=S\u00fcdafrikanischer Rand
-zmk=Kwacha
-zwd=Simbabwe-Dollar
+yum=Neuer jugoslawischer Dinar (1994-2002)
+zar=S\u00FCdafrikanischer Rand
+zmk=Sambischer Kwacha
+zwd=Simbabwe-Dollar (1980-2008)
 zwl=Simbabwe-Dollar (2009)
+zwr=Simbabwe-Dollar (2008)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
index 96f527d3e49..ee71a9eb17d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,219 +60,225 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-#
-# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-#
-adp=\u30a2\u30f3\u30c9\u30e9 \u30da\u30bb\u30bf
-aed=UAE \u30c7\u30a3\u30eb\u30cf\u30e0
-afa=\u30a2\u30d5\u30ac\u30cb\u30fc (1927-2002)
-afn=\u30a2\u30d5\u30ac\u30cb\u30fc
-all=\u30a2\u30eb\u30d0\u30cb\u30a2 \u30ec\u30af
-amd=\u30a2\u30eb\u30e1\u30cb\u30a2 \u30c9\u30e9\u30e0
-ang=\u30aa\u30e9\u30f3\u30c0\u9818\u30a2\u30f3\u30c6\u30a3\u30eb \u30ae\u30eb\u30c0\u30fc
-aoa=\u30af\u30ef\u30f3\u30b6
-ars=\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3 \u30da\u30bd
-ats=\u30aa\u30fc\u30b9\u30c8\u30ea\u30a2 \u30b7\u30ea\u30f3\u30b0
-aud=\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2 \u30c9\u30eb
-awg=\u30a2\u30eb\u30d0 \u30ae\u30eb\u30c0\u30fc
-azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8 (1993-2006)
-azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8
-bam=\u30dc\u30b9\u30cb\u30a2 \u30de\u30eb\u30af (BAM)
-bbd=\u30d0\u30eb\u30d0\u30c9\u30b9 \u30c9\u30eb
-bdt=\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5 \u30bf\u30ab
-bef=\u30d9\u30eb\u30ae\u30fc \u30d5\u30e9\u30f3
-bgl=\u30d6\u30eb\u30ac\u30ea\u30a2 \u30ec\u30d5
-bgn=\u30d6\u30eb\u30ac\u30ea\u30a2 \u65b0\u30ec\u30d5
-bhd=\u30d0\u30fc\u30ec\u30fc\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
-bif=\u30d6\u30eb\u30f3\u30b8 \u30d5\u30e9\u30f3
-bmd=\u30d0\u30df\u30e5\u30fc\u30c0 \u30c9\u30eb
-bnd=\u30d6\u30eb\u30cd\u30a4 \u30c9\u30eb
-bob=\u30dc\u30ea\u30d3\u30a2\u30fc\u30ce
-bov=\u30dc\u30ea\u30d3\u30a2 Mvdol
-brl=\u30d6\u30e9\u30b8\u30eb \u30ec\u30a2\u30eb
-bsd=\u30d0\u30cf\u30de \u30c9\u30eb
-btn=\u30d6\u30fc\u30bf\u30f3 \u30cb\u30e5\u30eb\u30bf\u30e0
-bwp=\u30dc\u30c4\u30ef\u30ca \u30d7\u30e9
-byb=\u30d9\u30e9\u30eb\u30fc\u30b7 \u30eb\u30fc\u30d6\u30eb (1994-1999)
-byr=\u30d9\u30e9\u30eb\u30fc\u30b7 \u30eb\u30fc\u30d6\u30eb
-bzd=\u30d9\u30ea\u30fc\u30ba \u30c9\u30eb
-cad=\u30ab\u30ca\u30c0 \u30c9\u30eb
-cdf=\u30b3\u30f3\u30b4 \u30d5\u30e9\u30f3
-chf=\u30b9\u30a4\u30b9 \u30d5\u30e9\u30f3
-clf=\u30c1\u30ea \u30a6\u30cb\u30c0 \u30c7 \u30d5\u30a9\u30e1\u30f3\u30c8
-clp=\u30c1\u30ea \u30da\u30bd
-cny=\u4e2d\u56fd\u4eba\u6c11\u5143
-cop=\u30b3\u30ed\u30f3\u30d3\u30a2 \u30da\u30bd
-crc=\u30b3\u30b9\u30bf\u30ea\u30ab \u30b3\u30ed\u30f3
-csd=\u30bb\u30eb\u30d3\u30a2\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
-cuc=\u30ad\u30e5\u30fc\u30d0 \u514c\u63db\u30da\u30bd
-cup=\u30ad\u30e5\u30fc\u30d0 \u30da\u30bd
-cve=\u30ab\u30fc\u30dc\u30d9\u30eb\u30c7 \u30a8\u30b9\u30af\u30fc\u30c9
-cyp=\u30ad\u30d7\u30ed\u30b9 \u30dd\u30f3\u30c9
-czk=\u30c1\u30a7\u30b3 \u30b3\u30eb\u30ca
-dem=\u30c9\u30a4\u30c4 \u30de\u30eb\u30af
-djf=\u30b8\u30d6\u30c1 \u30d5\u30e9\u30f3
-dkk=\u30c7\u30f3\u30de\u30fc\u30af \u30af\u30ed\u30fc\u30cd
-dop=\u30c9\u30df\u30cb\u30ab \u30da\u30bd
-dzd=\u30a2\u30eb\u30b8\u30a7\u30ea\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
-eek=\u30a8\u30b9\u30c8\u30cb\u30a2 \u30af\u30eb\u30fc\u30f3
-egp=\u30a8\u30b8\u30d7\u30c8 \u30dd\u30f3\u30c9
-ern=\u30a8\u30ea\u30c8\u30ea\u30a2 \u30ca\u30af\u30d5\u30a1
-esp=\u30b9\u30da\u30a4\u30f3 \u30da\u30bb\u30bf
-etb=\u30a8\u30c1\u30aa\u30d4\u30a2 \u30d6\u30eb
-eur=\u30e6\u30fc\u30ed
-fim=\u30d5\u30a3\u30f3\u30e9\u30f3\u30c9 \u30de\u30eb\u30ab
-fjd=\u30d5\u30a3\u30b8\u30fc\u8af8\u5cf6 \u30c9\u30eb
-fkp=\u30d5\u30a9\u30fc\u30af\u30e9\u30f3\u30c9\uff08\u30de\u30eb\u30d3\u30ca\u30b9\uff09\u8af8\u5cf6 \u30dd\u30f3\u30c9
-frf=\u30d5\u30e9\u30f3\u30b9 \u30d5\u30e9\u30f3
-gbp=\u82f1\u56fd\u30dd\u30f3\u30c9
-gel=\u30b0\u30eb\u30b8\u30a2 \u30e9\u30ea
-ghc=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3 (1979-2007)
-ghs=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3
-gip=\u30b8\u30d6\u30e9\u30eb\u30bf\u30eb \u30dd\u30f3\u30c9
-gmd=\u30ac\u30f3\u30d3\u30a2 \u30c0\u30e9\u30b7
-gnf=\u30ae\u30cb\u30a2 \u30d5\u30e9\u30f3
-grd=\u30ae\u30ea\u30b7\u30e3 \u30c9\u30e9\u30af\u30de
-gtq=\u30b0\u30a2\u30c6\u30de\u30e9 \u30b1\u30c4\u30a1\u30eb
-gwp=\u30ae\u30cb\u30a2\u30d3\u30b5\u30a6 \u30da\u30bd
-gyd=\u30ac\u30a4\u30a2\u30ca \u30c9\u30eb
-hkd=\u9999\u6e2f\u30c9\u30eb
-hnl=\u30db\u30f3\u30b8\u30e5\u30e9\u30b9 \u30ec\u30f3\u30d4\u30e9
-hrk=\u30af\u30ed\u30a2\u30c1\u30a2 \u30af\u30fc\u30ca
-htg=\u30cf\u30a4\u30c1 \u30b0\u30fc\u30eb\u30c9
-huf=\u30cf\u30f3\u30ac\u30ea\u30fc \u30d5\u30a9\u30ea\u30f3\u30c8
-idr=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2 \u30eb\u30d4\u30a2
-iep=\u30a2\u30a4\u30ea\u30c3\u30b7\u30e5 \u30dd\u30f3\u30c9
-ils=\u30a4\u30b9\u30e9\u30a8\u30eb\u65b0\u30b7\u30a7\u30b1\u30eb
-inr=\u30a4\u30f3\u30c9 \u30eb\u30d4\u30fc
-iqd=\u30a4\u30e9\u30af \u30c7\u30a3\u30ca\u30fc\u30eb
-irr=\u30a4\u30e9\u30f3 \u30ea\u30a2\u30eb
-isk=\u30a2\u30a4\u30b9\u30e9\u30f3\u30c9 \u30af\u30ed\u30fc\u30ca
-itl=\u30a4\u30bf\u30ea\u30a2 \u30ea\u30e9
-jmd=\u30b8\u30e3\u30de\u30a4\u30ab \u30c9\u30eb
-jod=\u30e8\u30eb\u30c0\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
-jpy=\u65e5\u672c\u5186
-kes=\u30b1\u30cb\u30a2 \u30b7\u30ea\u30f3\u30b0
-kgs=\u30ad\u30eb\u30ae\u30b9\u30bf\u30f3 \u30bd\u30e0
-khr=\u30ab\u30f3\u30dc\u30b8\u30a2 \u30ea\u30a8\u30eb
-kmf=\u30b3\u30e2\u30ed \u30d5\u30e9\u30f3
-kpw=\u5317\u671d\u9bae \u30a6\u30a9\u30f3
-krw=\u97d3\u56fd \u30a6\u30a9\u30f3
-kwd=\u30af\u30a6\u30a7\u30fc\u30c8 \u30c7\u30a3\u30ca\u30fc\u30eb
-kyd=\u30b1\u30a4\u30de\u30f3\u8af8\u5cf6 \u30c9\u30eb
-kzt=\u30ab\u30b6\u30d5\u30b9\u30bf\u30f3 \u30c6\u30f3\u30b2
-lak=\u30e9\u30aa\u30b9 \u30ad\u30fc\u30d7
-lbp=\u30ec\u30d0\u30ce\u30f3 \u30dd\u30f3\u30c9
-lkr=\u30b9\u30ea\u30e9\u30f3\u30ab \u30eb\u30d4\u30fc
-lrd=\u30ea\u30d9\u30ea\u30a2 \u30c9\u30eb
-lsl=\u30ec\u30bd\u30c8 \u30ed\u30c6\u30a3
-ltl=\u30ea\u30c8\u30a2\u30cb\u30a2 \u30ea\u30bf\u30b9
-luf=\u30eb\u30af\u30bb\u30f3\u30d6\u30eb\u30b0 \u30d5\u30e9\u30f3
-lvl=\u30e9\u30c8\u30d3\u30a2 \u30e9\u30c3\u30c4
-lyd=\u30ea\u30d3\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
-mad=\u30e2\u30ed\u30c3\u30b3 \u30c7\u30a3\u30eb\u30cf\u30e0
-mdl=\u30e2\u30eb\u30c9\u30d0 \u30ec\u30a4
-mga=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb \u30a2\u30ea\u30a2\u30ea
-mgf=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb \u30d5\u30e9\u30f3
-mkd=\u30de\u30b1\u30c9\u30cb\u30a2 \u30c7\u30ca\u30eb
-mmk=\u30df\u30e3\u30f3\u30de\u30fc \u30c1\u30e3\u30c3\u30c8
-mnt=\u30e2\u30f3\u30b4\u30eb \u30c8\u30b0\u30ed\u30b0
-mop=\u30de\u30ab\u30aa \u30d1\u30bf\u30ab
-mro=\u30e2\u30fc\u30ea\u30bf\u30cb\u30a2 \u30a6\u30ae\u30a2
-mtl=\u30de\u30eb\u30bf \u30ea\u30e9
-mur=\u30e2\u30fc\u30ea\u30b7\u30e3\u30b9 \u30eb\u30d4\u30fc
-mvr=\u30e2\u30eb\u30c7\u30a3\u30d6\u8af8\u5cf6 \u30eb\u30d5\u30a3\u30a2
-mwk=\u30de\u30e9\u30a6\u30a3 \u30af\u30ef\u30c1\u30e3
-mxn=\u30e1\u30ad\u30b7\u30b3 \u30da\u30bd
-mxv=\u30e1\u30ad\u30b7\u30b3 UDI
-myr=\u30de\u30ec\u30fc\u30b7\u30a2 \u30ea\u30f3\u30ae\u30c3\u30c8
-mzm=\u30e2\u30b6\u30f3\u30d4\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
-mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
-nad=\u30ca\u30df\u30d3\u30a2 \u30c9\u30eb
-ngn=\u30ca\u30a4\u30b8\u30a7\u30ea\u30a2 \u30ca\u30a4\u30e9
-nio=\u30cb\u30ab\u30e9\u30b0\u30a2 \u30b3\u30eb\u30c9\u30d0 \u30aa\u30ed
-nlg=\u30aa\u30e9\u30f3\u30c0 \u30ae\u30eb\u30c0\u30fc
-nok=\u30ce\u30eb\u30a6\u30a7\u30fc \u30af\u30ed\u30fc\u30cd
-npr=\u30cd\u30d1\u30fc\u30eb \u30eb\u30d4\u30fc
-nzd=\u30cb\u30e5\u30fc\u30b8\u30fc\u30e9\u30f3\u30c9 \u30c9\u30eb
-omr=\u30aa\u30de\u30fc\u30f3 \u30ea\u30a2\u30eb
-pab=\u30d1\u30ca\u30de \u30d0\u30eb\u30dc\u30a2
-pen=\u30da\u30eb\u30fc \u65b0\u30bd\u30eb
-pgk=\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2 \u30ad\u30ca
-php=\u30d5\u30a3\u30ea\u30d4\u30f3 \u30da\u30bd
-pkr=\u30d1\u30ad\u30b9\u30bf\u30f3 \u30eb\u30d4\u30fc
-pln=\u30dd\u30fc\u30e9\u30f3\u30c9 \u30ba\u30a6\u30a9\u30c6\u30a3
-pte=\u30dd\u30eb\u30c8\u30ac\u30eb \u30a8\u30b9\u30af\u30fc\u30c9
-pyg=\u30d1\u30e9\u30b0\u30a2\u30a4 \u30b0\u30a2\u30e9\u30cb
-qar=\u30ab\u30bf\u30fc\u30eb \u30ea\u30a2\u30eb
-rol=\u30eb\u30fc\u30de\u30cb\u30a2 \u65e7\u30ec\u30a4
-ron=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4
-rsd=\u30c7\u30a3\u30ca\u30fc\u30eb (\u30bb\u30eb\u30d3\u30a2)
-rub=\u30ed\u30b7\u30a2 \u30eb\u30fc\u30d6\u30eb
-rur=\u30ed\u30b7\u30a2 \u30eb\u30fc\u30d6\u30eb (1991-1998)
-rwf=\u30eb\u30ef\u30f3\u30c0 \u30d5\u30e9\u30f3
-sar=\u30b5\u30a6\u30b8 \u30ea\u30e4\u30eb
-sbd=\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6 \u30c9\u30eb
-scr=\u30bb\u30a4\u30b7\u30a7\u30eb \u30eb\u30d4\u30fc
-sdd=\u30b9\u30fc\u30c0\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
-sdg=\u30b9\u30fc\u30c0\u30f3 \u30dd\u30f3\u30c9
-sek=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3 \u30af\u30ed\u30fc\u30ca
-sgd=\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb \u30c9\u30eb
-shp=\u30bb\u30f3\u30c8\u30d8\u30ec\u30ca\u5cf6 \u30dd\u30f3\u30c9
-sit=\u30b9\u30ed\u30d9\u30cb\u30a2 \u30c8\u30e9\u30fc\u30eb
-skk=\u30b9\u30ed\u30d0\u30ad\u30a2 \u30b3\u30eb\u30ca
-sll=\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd \u30ec\u30aa\u30f3
-sos=\u30bd\u30de\u30ea\u30a2 \u30b7\u30ea\u30f3\u30b0
-srd=\u30b9\u30ea\u30ca\u30e0 \u30c9\u30eb
-srg=\u30b9\u30ea\u30ca\u30e0 \u30ae\u30eb\u30c0\u30fc
-std=\u30b5\u30f3\u30c8\u30e1\u30fb\u30d7\u30ea\u30f3\u30b7\u30da \u30c9\u30d6\u30e9
-svc=\u30a8\u30eb\u30b5\u30eb\u30d0\u30c9\u30eb \u30b3\u30ed\u30f3
-syp=\u30b7\u30ea\u30a2 \u30dd\u30f3\u30c9
-szl=\u30b9\u30ef\u30b8\u30e9\u30f3\u30c9 \u30ea\u30e9\u30f3\u30b2\u30cb
-thb=\u30bf\u30a4 \u30d0\u30fc\u30c4
-tjs=\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3 \u30bd\u30e2\u30cb
-tmm=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3 \u30de\u30ca\u30c8
-tmt=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3 \u65b0\u30de\u30ca\u30c8
-tnd=\u30c1\u30e5\u30cb\u30b8\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
-top=\u30c8\u30f3\u30ac \u30d1\u30fb\u30a2\u30f3\u30ac
-tpe=\u30c6\u30a3\u30e2\u30fc\u30eb \u30a8\u30b9\u30af\u30fc\u30c9
-trl=\u30c8\u30eb\u30b3 \u30ea\u30e9
-try=\u65b0\u30c8\u30eb\u30b3\u30ea\u30e9
-ttd=\u30c8\u30ea\u30cb\u30c0\u30fc\u30c9\u30c8\u30d0\u30b4 \u30c9\u30eb
-twd=\u65b0\u53f0\u6e7e\u30c9\u30eb
-tzs=\u30bf\u30f3\u30b6\u30cb\u30a2 \u30b7\u30ea\u30f3\u30b0
-uah=\u30a6\u30af\u30e9\u30a4\u30ca \u30b0\u30ea\u30d6\u30ca
-ugx=\u30a6\u30ac\u30f3\u30c0 \u30b7\u30ea\u30f3\u30b0
-usd=\u7c73\u30c9\u30eb
-usn=\u7c73\u30c9\u30eb (\u7fcc\u65e5)
-uss=\u7c73\u30c9\u30eb (\u5f53\u65e5)
-uyu=\u30a6\u30eb\u30b0\u30a2\u30a4 \u30da\u30bd
-uzs=\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3 \u30b9\u30e0
-veb=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb
-vef=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb\u30d5\u30a8\u30eb\u30c6
-vnd=\u30d9\u30c8\u30ca\u30e0 \u30c9\u30f3
-vuv=\u30d0\u30cc\u30a2\u30c4 \u30d0\u30c4
-wst=\u897f\u30b5\u30e2\u30a2 \u30bf\u30e9
-xaf=CFA \u30d5\u30e9\u30f3 BEAC
+adp=\u30A2\u30F3\u30C9\u30E9\u30FB\u30DA\u30BB\u30BF
+aed=\u30A2\u30E9\u30D6\u9996\u9577\u56FD\u9023\u90A6\u30C7\u30A3\u30EB\u30CF\u30E0
+afa=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u30FB\u30A2\u30D5\u30AC\u30CB\u30FC(1927-2002)
+afn=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u30FB\u30A2\u30D5\u30AC\u30CB\u30FC
+all=\u30A2\u30EB\u30D0\u30CB\u30A2\u30FB\u30EC\u30AF
+amd=\u30A2\u30EB\u30E1\u30CB\u30A2\u30FB\u30C9\u30E9\u30E0
+ang=\u30AA\u30E9\u30F3\u30C0\u9818\u30A2\u30F3\u30C6\u30A3\u30EB\u30FB\u30AE\u30EB\u30C0\u30FC
+aoa=\u30A2\u30F3\u30B4\u30E9\u30FB\u30AF\u30EF\u30F3\u30B6
+ars=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u30FB\u30DA\u30BD
+ats=\u30AA\u30FC\u30B9\u30C8\u30EA\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
+aud=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u30FB\u30C9\u30EB
+awg=\u30A2\u30EB\u30D0\u30FB\u30D5\u30ED\u30FC\u30EA\u30F3
+azm=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u30FB\u30DE\u30CA\u30C8(1993-2006)
+azn=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u30FB\u30DE\u30CA\u30C8
+bam=\u30DC\u30B9\u30CB\u30A2\u30FB\u30D8\u30EB\u30C4\u30A7\u30B4\u30D3\u30CA\u514C\u63DB\u30DE\u30EB\u30AF
+bbd=\u30D0\u30EB\u30D0\u30C9\u30B9\u30FB\u30C9\u30EB
+bdt=\u30D0\u30F3\u30B0\u30E9\u30C7\u30B7\u30E5\u30FB\u30BF\u30AB
+bef=\u30D9\u30EB\u30AE\u30FC\u30FB\u30D5\u30E9\u30F3
+bgl=\u30D6\u30EB\u30AC\u30EA\u30A2\u30FB\u30CF\u30FC\u30C9\u30FB\u30EC\u30D5
+bgn=\u30D6\u30EB\u30AC\u30EA\u30A2\u65B0\u30EC\u30D5
+bhd=\u30D0\u30FC\u30EC\u30FC\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+bif=\u30D6\u30EB\u30F3\u30B8\u30FB\u30D5\u30E9\u30F3
+bmd=\u30D0\u30EB\u30DF\u30E5\u30FC\u30C0\u30FB\u30C9\u30EB
+bnd=\u30D6\u30EB\u30CD\u30A4\u30FB\u30C9\u30EB
+bob=\u30DC\u30EA\u30D3\u30A2\u30FB\u30DC\u30EA\u30D3\u30A2\u30FC\u30CE
+bov=\u30DC\u30EA\u30D3\u30A2Mvdol
+brl=\u30D6\u30E9\u30B8\u30EB\u30FB\u30EC\u30A2\u30EB
+bsd=\u30D0\u30CF\u30DE\u30FB\u30C9\u30EB
+btn=\u30D6\u30FC\u30BF\u30F3\u30FB\u30CB\u30E5\u30EB\u30BF\u30E0
+bwp=\u30DC\u30C4\u30EF\u30CA\u30FB\u30D7\u30E9
+byb=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB(1994-1999)
+byn=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB
+byr=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB(2000-2016)
+bzd=\u30D9\u30EA\u30FC\u30BA\u30FB\u30C9\u30EB
+cad=\u30AB\u30CA\u30C0\u30FB\u30C9\u30EB
+cdf=\u30B3\u30F3\u30B4\u30FB\u30D5\u30E9\u30F3
+chf=\u30B9\u30A4\u30B9\u30FB\u30D5\u30E9\u30F3
+clf=\u30C1\u30EA\u8A08\u7B97\u5358\u4F4D(UF)
+clp=\u30C1\u30EA\u30FB\u30DA\u30BD
+cny=\u4E2D\u56FD\u4EBA\u6C11\u5143
+cop=\u30B3\u30ED\u30F3\u30D3\u30A2\u30FB\u30DA\u30BD
+crc=\u30B3\u30B9\u30BF\u30EA\u30AB\u30FB\u30B3\u30ED\u30F3
+csd=\u30BB\u30EB\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB(2002-2006)
+cuc=\u30AD\u30E5\u30FC\u30D0\u514C\u63DB\u30DA\u30BD
+cup=\u30AD\u30E5\u30FC\u30D0\u30FB\u30DA\u30BD
+cve=\u30AB\u30FC\u30DC\u30D9\u30EB\u30C7\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
+cyp=\u30AD\u30D7\u30ED\u30B9\u30FB\u30DD\u30F3\u30C9
+czk=\u30C1\u30A7\u30B3\u5171\u548C\u56FD\u30B3\u30EB\u30CA
+dem=\u30C9\u30A4\u30C4\u30FB\u30DE\u30EB\u30AF
+djf=\u30B8\u30D6\u30C1\u30FB\u30D5\u30E9\u30F3
+dkk=\u30C7\u30F3\u30DE\u30FC\u30AF\u30FB\u30AF\u30ED\u30FC\u30CD
+dop=\u30C9\u30DF\u30CB\u30AB\u30FB\u30DA\u30BD
+dzd=\u30A2\u30EB\u30B8\u30A7\u30EA\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+eek=\u30A8\u30B9\u30C8\u30CB\u30A2\u30FB\u30AF\u30EB\u30FC\u30F3
+egp=\u30A8\u30B8\u30D7\u30C8\u30FB\u30DD\u30F3\u30C9
+ern=\u30A8\u30EA\u30C8\u30EA\u30A2\u30FB\u30CA\u30AF\u30D5\u30A1
+esp=\u30B9\u30DA\u30A4\u30F3\u30FB\u30DA\u30BB\u30BF
+etb=\u30A8\u30C1\u30AA\u30D4\u30A2\u30FB\u30D6\u30EB
+eur=\u30E6\u30FC\u30ED
+fim=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9\u30FB\u30DE\u30EB\u30AB
+fjd=\u30D5\u30A3\u30B8\u30FC\u30FB\u30C9\u30EB
+fkp=\u30D5\u30A9\u30FC\u30AF\u30E9\u30F3\u30C9\u8AF8\u5CF6\u30DD\u30F3\u30C9
+frf=\u30D5\u30E9\u30F3\u30B9\u30FB\u30D5\u30E9\u30F3
+gbp=\u82F1\u30DD\u30F3\u30C9
+gel=\u30B8\u30E7\u30FC\u30B8\u30A2\u30FB\u30E9\u30EA
+ghc=\u30AC\u30FC\u30CA\u30FB\u30BB\u30C7\u30A3(1979-2007)
+ghs=\u30AC\u30FC\u30CA\u30FB\u30BB\u30C7\u30A3
+gip=\u30B8\u30D6\u30E9\u30EB\u30BF\u30EB\u30FB\u30DD\u30F3\u30C9
+gmd=\u30AC\u30F3\u30D3\u30A2\u30FB\u30C0\u30E9\u30B7
+gnf=\u30AE\u30CB\u30A2\u30FB\u30D5\u30E9\u30F3
+grd=\u30AE\u30EA\u30B7\u30E3\u30FB\u30C9\u30E9\u30AF\u30DE
+gtq=\u30B0\u30A2\u30C6\u30DE\u30E9\u30FB\u30B1\u30C4\u30A1\u30EB
+gwp=\u30AE\u30CB\u30A2\u30D3\u30B5\u30A6\u30FB\u30DA\u30BD
+gyd=\u30AC\u30A4\u30A2\u30CA\u30FB\u30C9\u30EB
+hkd=\u9999\u6E2F\u30C9\u30EB
+hnl=\u30DB\u30F3\u30B8\u30E5\u30E9\u30B9\u30FB\u30EC\u30F3\u30D4\u30E9
+hrk=\u30AF\u30FC\u30CA
+htg=\u30CF\u30A4\u30C1\u30FB\u30B0\u30FC\u30EB\u30C9
+huf=\u30CF\u30F3\u30AC\u30EA\u30FC\u30FB\u30D5\u30A9\u30EA\u30F3\u30C8
+idr=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u30FB\u30EB\u30D4\u30A2
+iep=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u30FB\u30DD\u30F3\u30C9
+ils=\u30A4\u30B9\u30E9\u30A8\u30EB\u65B0\u30B7\u30A7\u30B1\u30EB
+inr=\u30A4\u30F3\u30C9\u30FB\u30EB\u30D4\u30FC
+iqd=\u30A4\u30E9\u30AF\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+irr=\u30A4\u30E9\u30F3\u30FB\u30EA\u30A2\u30EB
+isk=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9\u30FB\u30AF\u30ED\u30FC\u30CA
+itl=\u30A4\u30BF\u30EA\u30A2\u30FB\u30EA\u30E9
+jmd=\u30B8\u30E3\u30DE\u30A4\u30AB\u30FB\u30C9\u30EB
+jod=\u30E8\u30EB\u30C0\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+jpy=\u65E5\u672C\u5186
+kes=\u30B1\u30CB\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
+kgs=\u30AD\u30EB\u30AE\u30B9\u30FB\u30BD\u30E0
+khr=\u30AB\u30F3\u30DC\u30B8\u30A2\u30FB\u30EA\u30A8\u30EB
+kmf=\u30B3\u30E2\u30ED\u30FB\u30D5\u30E9\u30F3
+kpw=\u5317\u671D\u9BAE\u30A6\u30A9\u30F3
+krw=\u97D3\u56FD\u30A6\u30A9\u30F3
+kwd=\u30AF\u30A6\u30A7\u30FC\u30C8\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+kyd=\u30B1\u30A4\u30DE\u30F3\u8AF8\u5CF6\u30C9\u30EB
+kzt=\u30AB\u30B6\u30D5\u30B9\u30BF\u30F3\u30FB\u30C6\u30F3\u30B2
+lak=\u30E9\u30AA\u30B9\u30FB\u30AD\u30FC\u30D7
+lbp=\u30EC\u30D0\u30CE\u30F3\u30FB\u30DD\u30F3\u30C9
+lkr=\u30B9\u30EA\u30E9\u30F3\u30AB\u30FB\u30EB\u30D4\u30FC
+lrd=\u30EA\u30D9\u30EA\u30A2\u30FB\u30C9\u30EB
+lsl=\u30EC\u30BD\u30C8\u30FB\u30ED\u30C6\u30A3
+ltl=\u30EA\u30C8\u30A2\u30CB\u30A2\u30FB\u30EA\u30BF\u30B9
+luf=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30AF\u30FB\u30D5\u30E9\u30F3
+lvl=\u30E9\u30C8\u30D3\u30A2\u30FB\u30E9\u30C3\u30C4
+lyd=\u30EA\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+mad=\u30E2\u30ED\u30C3\u30B3\u30FB\u30C7\u30A3\u30EB\u30CF\u30E0
+mdl=\u30E2\u30EB\u30C9\u30D0\u30FB\u30EC\u30A4
+mga=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u30FB\u30A2\u30EA\u30A2\u30EA
+mgf=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u30FB\u30D5\u30E9\u30F3
+mkd=\u30DE\u30B1\u30C9\u30CB\u30A2\u30FB\u30C7\u30CA\u30EB
+mmk=\u30DF\u30E3\u30F3\u30DE\u30FC\u30FB\u30C1\u30E3\u30C3\u30C8
+mnt=\u30E2\u30F3\u30B4\u30EB\u30FB\u30C8\u30B0\u30ED\u30B0
+mop=\u30DE\u30AB\u30AA\u30FB\u30D1\u30BF\u30AB
+mro=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2\u30FB\u30A6\u30AE\u30A2
+mru=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2\u30FB\u30A6\u30AE\u30A2
+mtl=\u30DE\u30EB\u30BF\u30FB\u30EA\u30E9
+mur=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u30FB\u30EB\u30D4\u30FC
+mvr=\u30E2\u30EB\u30B8\u30D6\u30FB\u30EB\u30D5\u30A3\u30A2
+mwk=\u30DE\u30E9\u30A6\u30A3\u30A2\u30F3\u30FB\u30DE\u30E9\u30A6\u30A4\u30FB\u30AF\u30EF\u30C1\u30E3
+mxn=\u30E1\u30AD\u30B7\u30B3\u30FB\u30DA\u30BD
+mxv=\u30E1\u30AD\u30B7\u30B3\u6295\u8CC7\u5358\u4F4D
+myr=\u30DE\u30EC\u30FC\u30B7\u30A2\u30FB\u30EA\u30F3\u30AE\u30C3\u30C8
+mzm=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u30FB\u30E1\u30C6\u30A3\u30AB\u30EB(1980-2006)
+mzn=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u30FB\u30E1\u30C6\u30A3\u30AB\u30EB
+nad=\u30CA\u30DF\u30D3\u30A2\u30FB\u30C9\u30EB
+ngn=\u30CA\u30A4\u30B8\u30A7\u30EA\u30A2\u30FB\u30CA\u30A4\u30E9
+nio=\u30CB\u30AB\u30E9\u30B0\u30A2\u30FB\u30B3\u30EB\u30C9\u30D0
+nlg=\u30AA\u30E9\u30F3\u30C0\u30FB\u30AE\u30EB\u30C0\u30FC
+nok=\u30CE\u30EB\u30A6\u30A7\u30FC\u30FB\u30AF\u30ED\u30FC\u30CD
+npr=\u30CD\u30D1\u30FC\u30EB\u30FB\u30EB\u30D4\u30FC
+nzd=\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9\u30FB\u30C9\u30EB
+omr=\u30AA\u30DE\u30FC\u30F3\u30FB\u30EA\u30A2\u30EB
+pab=\u30D1\u30CA\u30DE\u30FB\u30D0\u30EB\u30DC\u30A2
+pen=\u30DA\u30EB\u30FC\u30FB\u30BD\u30EB
+pgk=\u30D1\u30D7\u30A2\u30CB\u30E5\u30FC\u30AE\u30CB\u30A2\u30FB\u30AD\u30CA
+php=\u30D5\u30A3\u30EA\u30D4\u30F3\u30FB\u30DA\u30BD
+pkr=\u30D1\u30AD\u30B9\u30BF\u30F3\u30FB\u30EB\u30D4\u30FC
+pln=\u30DD\u30FC\u30E9\u30F3\u30C9\u30FB\u30BA\u30ED\u30C1
+pte=\u30DD\u30EB\u30C8\u30AC\u30EB\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
+pyg=\u30D1\u30E9\u30B0\u30A2\u30A4\u30FB\u30B0\u30A2\u30E9\u30CB\u30FC
+qar=\u30AB\u30BF\u30FC\u30EB\u30FB\u30EA\u30A2\u30EB
+rol=\u30EB\u30FC\u30DE\u30CB\u30A2\u30FB\u30EC\u30A4(1952-2006)
+ron=\u30EB\u30FC\u30DE\u30CB\u30A2\u30FB\u30EC\u30A4
+rsd=\u30BB\u30EB\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+rub=\u30ED\u30B7\u30A2\u30FB\u30EB\u30FC\u30D6\u30EB
+rur=\u30ED\u30B7\u30A2\u30FB\u30EB\u30FC\u30D6\u30EB(1991-1998)
+rwf=\u30EB\u30EF\u30F3\u30C0\u30FB\u30D5\u30E9\u30F3
+sar=\u30B5\u30A6\u30B8\u30FB\u30EA\u30E4\u30EB
+sbd=\u30BD\u30ED\u30E2\u30F3\u8AF8\u5CF6\u30C9\u30EB
+scr=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u30FB\u30EB\u30D4\u30FC
+sdd=\u30B9\u30FC\u30C0\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB(1992-2007)
+sdg=\u30B9\u30FC\u30C0\u30F3\u30FB\u30DD\u30F3\u30C9
+sek=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3\u30FB\u30AF\u30ED\u30FC\u30CA
+sgd=\u30B7\u30F3\u30AC\u30DD\u30FC\u30EB\u30FB\u30C9\u30EB
+shp=\u30BB\u30F3\u30C8\u30D8\u30EC\u30CA\u30FB\u30DD\u30F3\u30C9
+sit=\u30B9\u30ED\u30D9\u30CB\u30A2\u30FB\u30C8\u30E9\u30FC\u30EB
+skk=\u30B9\u30ED\u30D0\u30AD\u30A2\u30FB\u30B3\u30EB\u30CA
+sll=\u30B7\u30A8\u30E9\u30EC\u30AA\u30CD\u30FB\u30EC\u30AA\u30F3
+sos=\u30BD\u30DE\u30EA\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
+srd=\u30B9\u30EA\u30CA\u30E0\u30FB\u30C9\u30EB
+srg=\u30B9\u30EA\u30CA\u30E0\u30FB\u30AE\u30EB\u30C0\u30FC
+ssp=\u5357\u30B9\u30FC\u30C0\u30F3\u30FB\u30DD\u30F3\u30C9
+std=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA\u30FB\u30C9\u30D6\u30E9
+stn=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA\u30FB\u30C9\u30D6\u30E9
+svc=\u30A8\u30EB\u30B5\u30EB\u30D0\u30C9\u30EB\u30FB\u30B3\u30ED\u30F3
+syp=\u30B7\u30EA\u30A2\u30FB\u30DD\u30F3\u30C9
+szl=\u30B9\u30EF\u30B8\u30E9\u30F3\u30C9\u30FB\u30EA\u30E9\u30F3\u30B8\u30A7\u30CB
+thb=\u30BF\u30A4\u30FB\u30D0\u30FC\u30C4
+tjs=\u30BF\u30B8\u30AD\u30B9\u30BF\u30F3\u30FB\u30BD\u30E2\u30CB
+tmm=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u30FB\u30DE\u30CA\u30C8(1993-2009)
+tmt=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u30FB\u30DE\u30CA\u30C8
+tnd=\u30C1\u30E5\u30CB\u30B8\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+top=\u30C8\u30F3\u30AC\u30FB\u30D1\u30FB\u30A2\u30F3\u30AC
+tpe=\u30C6\u30A3\u30E2\u30FC\u30EB\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
+trl=\u30C8\u30EB\u30B3\u30EA\u30E9(1922-2005)
+try=\u30C8\u30EB\u30B3\u30FB\u30EA\u30E9
+ttd=\u30C8\u30EA\u30CB\u30C0\u30FC\u30C9\u30FB\u30C8\u30D0\u30B4\u30FB\u30C9\u30EB
+twd=\u65B0\u53F0\u6E7E\u30C9\u30EB
+tzs=\u30BF\u30F3\u30B6\u30CB\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
+uah=\u30A6\u30AF\u30E9\u30A4\u30CA\u30FB\u30B0\u30EA\u30D6\u30CA
+ugx=\u30A6\u30AC\u30F3\u30C0\u30FB\u30B7\u30EA\u30F3\u30B0
+usd=US\u30C9\u30EB
+usn=US\u30C9\u30EB(\u7FCC\u65E5)
+uss=US\u30C9\u30EB(\u540C\u65E5)
+uyu=\u30A6\u30EB\u30B0\u30A2\u30A4\u30FB\u30DA\u30BD
+uzs=\u30A6\u30BA\u30D9\u30AD\u30B9\u30BF\u30F3\u30FB\u30BD\u30E0
+veb=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB(1871-2008)
+ved=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB\u30FB\u30BD\u30D9\u30E9\u30CE
+vef=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB
+ves=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB\u30FB\u30BD\u30D9\u30E9\u30CE
+vnd=\u30D9\u30C8\u30CA\u30E0\u30FB\u30C9\u30F3
+vuv=\u30D0\u30CC\u30A2\u30C4\u30FB\u30D0\u30C4
+wst=\u30B5\u30E2\u30A2\u30FB\u30BF\u30E9
+xaf=CFA\u30D5\u30E9\u30F3BEAC
 xag=\u9280
-xau=\u91d1
-xba=\u30e8\u30fc\u30ed\u30c3\u30d1\u6df7\u5408\u5358\u4f4d (EURCO)
-xbb=\u30e8\u30fc\u30ed\u30c3\u30d1\u901a\u8ca8\u5358\u4f4d (EMU-6)
-xbc=\u30e8\u30fc\u30ed\u30c3\u30d1\u52d8\u5b9a\u5358\u4f4d (EUA-9)
-xbd=\u30e8\u30fc\u30ed\u30c3\u30d1\u52d8\u5b9a\u5358\u4f4d (EUA-17)
-xcd=\u6771\u30ab\u30ea\u30d6 \u30c9\u30eb
-xdr=\u7279\u5225\u5f15\u304d\u51fa\u3057\u6a29
-xfo=\u30d5\u30e9\u30f3\u30b9\u91d1\u30d5\u30e9\u30f3
-xfu=\u30d5\u30e9\u30f3\u30b9 UIC \u30d5\u30e9\u30f3
-xof=CFA \u30d5\u30e9\u30f3 BCEAO
-xpd=\u30d1\u30e9\u30b8\u30a6\u30e0
-xpf=CFP \u30d5\u30e9\u30f3
-xpt=\u30d7\u30e9\u30c1\u30ca
-xts=\u30c6\u30b9\u30c8\u7528\u901a\u8ca8\u30b3\u30fc\u30c9
-xxx=\u4e0d\u660e\u307e\u305f\u306f\u7121\u52b9\u306a\u901a\u8ca8
-yer=\u30a4\u30a8\u30e1\u30f3 \u30ea\u30a2\u30eb
-yum=\u30e6\u30fc\u30b4\u30b9\u30e9\u30d3\u30a2 \u30b9\u30fc\u30d1\u30fc \u30c7\u30a3\u30ca\u30fc\u30eb
-zar=\u5357\u30a2\u30d5\u30ea\u30ab \u30e9\u30f3\u30c9
-zmk=\u30b6\u30f3\u30d3\u30a2 \u30af\u30ef\u30c1\u30e3
-zwd=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb
-zwl=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb (2009)
+xau=\u91D1
+xba=\u6B27\u5DDE\u901A\u8CA8\u6DF7\u5408\u5358\u4F4D
+xbb=\u6B27\u5DDE\u901A\u8CA8\u8A08\u7B97\u5358\u4F4D
+xbc=\u6B27\u5DDE\u8A08\u7B97\u5358\u4F4D(XBC)
+xbd=\u6B27\u5DDE\u8A08\u7B97\u5358\u4F4D(XBD)
+xcd=\u6771\u30AB\u30EA\u30D6EC\u30C9\u30EB
+xdr=\u7279\u5225\u5F15\u51FA\u6A29
+xfo=\u30D5\u30E9\u30F3\u30B9\u91D1\u30D5\u30E9\u30F3
+xfu=\u30D5\u30E9\u30F3\u30B9UIC\u30D5\u30E9\u30F3
+xof=CFA\u30D5\u30E9\u30F3BCEAO
+xpd=\u30D1\u30E9\u30B8\u30A6\u30E0
+xpf=CFP\u30D5\u30E9\u30F3
+xpt=\u30D7\u30E9\u30C1\u30CA
+xsu=\u30B9\u30AF\u30EC
+xts=\u30C6\u30B9\u30C8\u901A\u8CA8\u30B3\u30FC\u30C9
+xua=ADB\u8A08\u7B97\u5358\u4F4D
+xxx=\u4E0D\u660E\u306A\u901A\u8CA8
+yer=\u30A4\u30A8\u30E1\u30F3\u30FB\u30EA\u30A2\u30EB
+yum=\u30E6\u30FC\u30B4\u30B9\u30E9\u30D3\u30A2\u65B0\u30C7\u30A3\u30CA\u30FC\u30EB(1994-2002)
+zar=\u5357\u30A2\u30D5\u30EA\u30AB\u30FB\u30E9\u30F3\u30C9
+zmk=\u30B6\u30F3\u30D3\u30A2\u30FB\u30AF\u30EF\u30C1\u30E3
+zwd=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(1980-2008)
+zwl=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(2009)
+zwr=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(2008)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
index b197882202b..0f64629df09 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,220 +60,225 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-#
-# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-#
-CNY=\uffe5
-cny=\u4eba\u6c11\u5e01
-adp=\u5b89\u9053\u5c14\u6bd4\u585e\u5854
-aed=\u963f\u8054\u914b\u8fea\u62c9\u59c6
-afa=\u963f\u5bcc\u6c57\u5c3c (1927-2002)
-afn=\u963f\u5bcc\u6c57\u5c3c
-all=\u963f\u5c14\u5df4\u5c3c\u4e9a\u5217\u514b
-amd=\u4e9a\u7f8e\u5c3c\u4e9a\u5fb7\u62c9\u59c6
-ang=\u8377\u5170\u5b89\u66ff\u5170\u76fe
-aoa=\u5b89\u54e5\u62c9\u5bbd\u624e
-ars=\u963f\u6839\u5ef7\u6bd4\u7d22
-ats=\u5965\u5730\u5229\u5148\u4ee4
-aud=\u6fb3\u5927\u5229\u4e9a\u5143
-awg=\u963f\u9c81\u5df4\u57fa\u5c14\u5fb7\u5143
-azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279 (1993-2006)
-azn=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
-bam=\u6ce2\u58eb\u5c3c\u4e9a-\u8d6b\u585e\u54e5\u7ef4\u7eb3\u5151\u6362\u5238
-bbd=\u5df4\u5df4\u591a\u65af\u5143
-bdt=\u5b5f\u52a0\u62c9\u5854\u5361
-bef=\u6bd4\u5229\u65f6\u6cd5\u90ce
-bgl=\u4fdd\u52a0\u5229\u4e9a\u786c\u5217\u5f17
-bgn=\u4fdd\u52a0\u5229\u4e9a\u65b0\u5217\u5f17
-bhd=\u5df4\u6797\u7b2c\u7eb3\u5c14
-bif=\u5e03\u9686\u8fea\u6cd5\u90ce
-bmd=\u767e\u6155\u5927\u5143
-bnd=\u6587\u83b1\u5143
-bob=\u73bb\u5229\u7ef4\u4e9a\u8bfa
-bov=\u73bb\u5229\u7ef4\u4e9a Mvdol\uff08\u8d44\u91d1\uff09
-brl=\u5df4\u897f\u96f7\u4e9a\u5c14
-bsd=\u5df4\u54c8\u9a6c\u5143
-btn=\u4e0d\u4e39\u52aa\u624e\u59c6
-bwp=\u535a\u8328\u74e6\u7eb3\u666e\u62c9
-byb=\u767d\u4fc4\u7f57\u65af\u65b0\u5362\u5e03 (1994-1999)
-byr=\u767d\u4fc4\u7f57\u65af\u5362\u5e03
-bzd=\u4f2f\u5229\u5179\u5143
-cad=\u52a0\u62ff\u5927\u5143
-cdf=\u521a\u679c\u6cd5\u90ce
-chf=\u745e\u58eb\u6cd5\u90ce
-clf=\u667a\u5229 Unidades de Fomento\uff08\u8d44\u91d1\uff09
-clp=\u667a\u5229\u6bd4\u7d22
-cop=\u54e5\u4f26\u6bd4\u4e9a\u6bd4\u7d22
-crc=\u54e5\u65af\u8fbe\u9ece\u52a0\u79d1\u6717
-csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
-cuc=\u53e4\u5df4\u53ef\u5151\u6362\u6bd4\u7d22
-cup=\u53e4\u5df4\u6bd4\u7d22
-cve=\u4f5b\u5f97\u89d2\u57c3\u65af\u5e93\u591a
-cyp=\u585e\u6d66\u8def\u65af\u9551
-czk=\u6377\u514b\u514b\u90ce
-dem=\u5fb7\u56fd\u9a6c\u514b
-djf=\u5409\u5e03\u63d0\u6cd5\u90ce
-dkk=\u4e39\u9ea6\u514b\u6717
-dop=\u591a\u7c73\u5c3c\u52a0\u6bd4\u7d22
-dzd=\u963f\u5c14\u53ca\u5229\u4e9a\u7b2c\u7eb3\u5c14
-eek=\u7231\u6c99\u5c3c\u4e9a\u514b\u6717
-egp=\u57c3\u53ca\u9551
-ern=\u5384\u7acb\u7279\u91cc\u4e9a\u7eb3\u514b\u6cd5
-esp=\u897f\u73ed\u7259\u6bd4\u585e\u5854
-etb=\u57c3\u585e\u4fc4\u6bd4\u4e9a\u6bd4\u5c14
-eur=\u6b27\u5143
-fim=\u82ac\u5170\u9a6c\u514b
-fjd=\u6590\u6d4e\u5143
-fkp=\u798f\u514b\u5170\u9551
-frf=\u6cd5\u56fd\u6cd5\u90ce
-gbp=\u82f1\u9551
-gel=\u4e54\u6cbb\u4e9a\u62c9\u745e
-ghc=\u52a0\u7eb3\u585e\u7b2c
-ghs=\u52a0\u7eb3\u585e\u5730
-gip=\u76f4\u5e03\u7f57\u9640\u9551
-gmd=\u5188\u6bd4\u4e9a\u8fbe\u62c9\u897f
-gnf=\u51e0\u5185\u4e9a\u6cd5\u90ce
-grd=\u5e0c\u814a\u5fb7\u62c9\u514b\u9a6c
-gtq=\u5371\u5730\u9a6c\u62c9\u683c\u67e5\u5c14
-gwp=\u51e0\u5185\u4e9a\u6bd4\u7ecd\u6bd4\u7d22
-gyd=\u572d\u4e9a\u90a3\u5143
-hkd=\u6e2f\u5143
-hnl=\u6d2a\u90fd\u62c9\u65af\u62c9\u4f26\u76ae\u62c9
-hrk=\u514b\u7f57\u5730\u4e9a\u5e93\u7eb3
-htg=\u6d77\u5730\u53e4\u5fb7
-huf=\u5308\u7259\u5229\u798f\u6797
-idr=\u5370\u5ea6\u5c3c\u897f\u4e9a\u76fe
-iep=\u7231\u5c14\u5170\u9551
-ils=\u4ee5\u8272\u5217\u65b0\u8c22\u514b\u5c14
-inr=\u5370\u5ea6\u5362\u6bd4
-iqd=\u4f0a\u62c9\u514b\u7b2c\u7eb3\u5c14
-irr=\u4f0a\u6717\u91cc\u4e9a\u5c14
-isk=\u51b0\u5c9b\u514b\u6717
-itl=\u610f\u5927\u5229\u91cc\u62c9
-jmd=\u7259\u4e70\u52a0\u5143
-jod=\u7ea6\u65e6\u7b2c\u7eb3\u5c14
-jpy=\u65e5\u5143
-kes=\u80af\u5c3c\u4e9a\u5148\u4ee4
-kgs=\u5409\u5c14\u5409\u65af\u65af\u5766\u7d22\u59c6
-khr=\u67ec\u57d4\u5be8\u745e\u5c14
-kmf=\u79d1\u6469\u7f57\u6cd5\u90ce
-kpw=\u671d\u9c9c\u5706
-krw=\u97e9\u5706
-kwd=\u79d1\u5a01\u7279\u7b2c\u7eb3\u5c14
-kyd=\u5f00\u66fc\u5143
-kzt=\u54c8\u8428\u514b\u65af\u5766\u575a\u6208
-lak=\u8001\u631d\u57fa\u666e
-lbp=\u9ece\u5df4\u5ae9\u9551
-lkr=\u65af\u91cc\u5170\u5361\u5362\u6bd4
-lrd=\u5229\u6bd4\u4e9a\u5143
-lsl=\u83b1\u7d22\u6258\u6d1b\u8482
-ltl=\u7acb\u9676\u5b9b\u7acb\u7279
-luf=\u5362\u68ee\u5821\u6cd5\u90ce
-lvl=\u62c9\u8131\u7ef4\u4e9a\u62c9\u7279
-lyd=\u5229\u6bd4\u4e9a\u7b2c\u7eb3\u5c14
-mad=\u6469\u6d1b\u54e5\u8fea\u62c9\u59c6
-mdl=\u6469\u5c14\u591a\u74e6\u5217\u4f0a
-mga=\u9a6c\u8fbe\u52a0\u65af\u52a0\u963f\u91cc\u4e9a\u91cc
-mgf=\u9a6c\u8fbe\u52a0\u65af\u52a0\u6cd5\u90ce
-mkd=\u9a6c\u5176\u987f\u6234\u4ee3\u7eb3\u5c14
-mmk=\u7f05\u7538\u5f00\u4e9a\u7279
-mnt=\u8499\u53e4\u56fe\u683c\u91cc\u514b
-mop=\u6fb3\u95e8\u5143
-mro=\u6bdb\u91cc\u5854\u5c3c\u4e9a\u4e4c\u5409\u4e9a
-mtl=\u9a6c\u8033\u4ed6\u91cc\u62c9
-mur=\u6bdb\u91cc\u6c42\u65af\u5362\u6bd4
-mvr=\u9a6c\u5c14\u4ee3\u592b\u62c9\u83f2\u4e9a
-mwk=\u9a6c\u62c9\u7ef4\u514b\u74e6\u67e5
-mxn=\u58a8\u897f\u54e5\u6bd4\u7d22
-mxv=\u58a8\u897f\u54e5 Unidad de Inversion (UDI)\uff08\u8d44\u91d1\uff09
-myr=\u9a6c\u6765\u897f\u4e9a\u6797\u5409\u7279
-mzm=\u65e7\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
-mzn=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
-nad=\u7eb3\u7c73\u6bd4\u4e9a\u5143
-ngn=\u5c3c\u65e5\u5229\u4e9a\u5948\u62c9
-nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
-nlg=\u8377\u5170\u76fe
-nok=\u632a\u5a01\u514b\u6717
-npr=\u5c3c\u6cca\u5c14\u5362\u6bd4
-nzd=\u65b0\u897f\u5170\u5143
-omr=\u963f\u66fc\u91cc\u4e9a\u5c14
-pab=\u5df4\u62ff\u9a6c\u5df4\u6ce2\u4e9a
-pen=\u79d8\u9c81\u65b0\u7d22\u5c14
-pgk=\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u57fa\u90a3
-php=\u83f2\u5f8b\u5bbe\u6bd4\u7d22
-pkr=\u5df4\u57fa\u65af\u5766\u5362\u6bd4
-pln=\u6ce2\u5170\u5179\u7f57\u63d0
-pte=\u8461\u8404\u7259\u57c3\u65af\u5e93\u591a
-pyg=\u5df4\u62c9\u572d\u74dc\u62c9\u5c3c
-qar=\u5361\u5854\u5c14\u91cc\u4e9a\u5c14
-rol=\u65e7\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
-ron=\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
-rsd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
-rub=\u4fc4\u56fd\u5362\u5e03
-rur=\u4fc4\u56fd\u5362\u5e03 (1991-1998)
-rwf=\u5362\u65fa\u8fbe\u6cd5\u90ce
-sar=\u6c99\u7279\u91cc\u4e9a\u5c14
-sbd=\u6240\u7f57\u95e8\u7fa4\u5c9b\u5143
-scr=\u585e\u820c\u5c14\u5362\u6bd4
-sdd=\u82cf\u4e39\u7b2c\u7eb3\u5c14
-sdg=\u82cf\u4e39\u9551
-sek=\u745e\u5178\u514b\u6717
-sgd=\u65b0\u52a0\u5761\u5143
-shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
-sit=\u65af\u6d1b\u6587\u5c3c\u4e9a\u6258\u62c9\u5c14
-skk=\u65af\u6d1b\u4f10\u514b\u514b\u6717
-sll=\u585e\u62c9\u5229\u6602\u5229\u6602
-sos=\u7d22\u9a6c\u91cc\u5148\u4ee4
-srd=\u82cf\u91cc\u5357\u5143
-srg=\u82cf\u91cc\u5357\u76fe
-std=\u5723\u591a\u7f8e\u548c\u666e\u6797\u897f\u6bd4\u591a\u5e03\u62c9
-svc=\u8428\u5c14\u74e6\u591a\u79d1\u6717
-syp=\u53d9\u5229\u4e9a\u9551
-szl=\u65af\u5a01\u58eb\u5170\u91cc\u5170\u5409\u5c3c
-thb=\u6cf0\u94e2
-tjs=\u5854\u5409\u514b\u65af\u5766\u7d22\u83ab\u5c3c
-tmm=\u571f\u5e93\u66fc\u65af\u5766\u9a6c\u7eb3\u7279
-tmt=\u571f\u5e93\u66fc\u65af\u5766\u65b0\u9a6c\u7eb3\u7279
-tnd=\u7a81\u5c3c\u65af\u7b2c\u7eb3\u5c14
-top=\u6c64\u52a0\u6f58\u52a0
-tpe=\u5e1d\u6c76\u57c3\u65af\u5e93\u591a
-trl=\u571f\u8033\u5176\u91cc\u62c9
-try=\u65b0\u571f\u8033\u5176\u91cc\u62c9
-ttd=\u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5\u5143
-twd=\u65b0\u53f0\u5e01
-tzs=\u5766\u6851\u5c3c\u4e9a\u5148\u4ee4
-uah=\u4e4c\u514b\u5170\u683c\u91cc\u592b\u5c3c\u4e9a
-ugx=\u4e4c\u5e72\u8fbe\u5148\u4ee4
-usd=\u7f8e\u5143
-usn=\u7f8e\u5143\uff08\u6b21\u65e5\uff09
-uss=\u7f8e\u5143\uff08\u5f53\u65e5\uff09
-uyu=\u4e4c\u62c9\u572d\u6bd4\u7d22
-uzs=\u4e4c\u5179\u522b\u514b\u65af\u82cf\u59c6
-veb=\u59d4\u5185\u745e\u62c9\u535a\u5229\u74e6
-vef=\u59d4\u5185\u745e\u62c9\u5f3a\u52bf\u73bb\u5229\u74e6
-vnd=\u8d8a\u5357\u76fe
-vuv=\u74e6\u52aa\u963f\u56fe\u74e6\u56fe
-wst=\u897f\u8428\u6469\u4e9a\u5854\u62c9
-xaf=\u4e2d\u975e\u91d1\u878d\u5408\u4f5c\u6cd5\u90ce
-xag=\u94f6
-xau=\u9ec4\u91d1
-xba=\u6b27\u6d32\u590d\u5408\u5355\u4f4d
-xbb=\u6b27\u6d32\u8d27\u5e01\u8054\u76df
-xbc=\u6b27\u6d32\u8ba1\u7b97\u5355\u4f4d (XBC)
-xbd=\u6b27\u6d32\u8ba1\u7b97\u5355\u4f4d (XBD)
-xcd=\u4e1c\u52a0\u52d2\u6bd4\u5143
-xdr=\u7279\u522b\u63d0\u6b3e\u6743
-xfo=\u6cd5\u56fd\u91d1\u6cd5\u90ce
-xfu=\u6cd5\u56fd UIC \u6cd5\u90ce
-xof=\u975e\u6d32\u91d1\u878d\u5171\u540c\u4f53\u6cd5\u90ce
-xpd=\u94af
-xpf=\u592a\u5e73\u6d0b\u6cd5\u90ce
-xpt=\u94c2
-xts=\u4e3a\u6d4b\u8bd5\u4fdd\u7559\u7684\u4ee3\u7801
-xxx=\u8d27\u5e01\u672a\u77e5\u6216\u65e0\u6548
-yer=\u4e5f\u95e8\u91cc\u4e9a\u5c14
-yum=\u5357\u65af\u62c9\u592b\u504c\u5a01\u7b2c\u7eb3\u5c14
-zar=\u5357\u975e\u5170\u7279
-zmk=\u8d5e\u6bd4\u4e9a\u514b\u74e6\u67e5
-zwd=\u6d25\u5df4\u5e03\u97e6\u5143
-zwl=\u6d25\u5df4\u5e03\u97e6\u5143 (2009)
+adp=\u5B89\u9053\u5C14\u6BD4\u585E\u5854
+aed=\u963F\u62C9\u4F2F\u8054\u5408\u914B\u957F\u56FD\u8FEA\u62C9\u59C6
+afa=\u963F\u5BCC\u6C57\u963F\u5BCC\u6C57\u5C3C (1927-2002)
+afn=\u963F\u5BCC\u6C57\u963F\u5BCC\u6C57\u5C3C
+all=\u963F\u5C14\u5DF4\u5C3C\u4E9A\u5217\u514B
+amd=\u4E9A\u7F8E\u5C3C\u4E9A\u5FB7\u62C9\u59C6
+ang=\u8377\u5C5E\u5B89\u7684\u5217\u65AF\u76FE
+aoa=\u5B89\u54E5\u62C9\u5BBD\u624E
+ars=\u963F\u6839\u5EF7\u6BD4\u7D22
+ats=\u5965\u5730\u5229\u5148\u4EE4
+aud=\u6FB3\u5927\u5229\u4E9A\u5143
+awg=\u963F\u9C81\u5DF4\u5C9B\u5F17\u7F57\u6797
+azm=\u963F\u585E\u62DC\u7586\u9A6C\u7EB3\u7279 (1993-2006)
+azn=\u963F\u585E\u62DC\u7586\u9A6C\u7EB3\u7279
+bam=\u6CE2\u65AF\u5C3C\u4E9A\u548C\u9ED1\u585E\u54E5\u7EF4\u90A3\u53EF\u5151\u6362\u9A6C\u514B
+bbd=\u5DF4\u5DF4\u591A\u65AF\u5143
+bdt=\u5B5F\u52A0\u62C9\u5854\u5361
+bef=\u6BD4\u5229\u65F6\u6CD5\u90CE
+bgl=\u4FDD\u52A0\u5229\u4E9A\u5217\u5F17\uFF08\u786C\u5E01\uFF09
+bgn=\u4FDD\u52A0\u5229\u4E9A\u5217\u5F17
+bhd=\u5DF4\u6797\u7B2C\u7EB3\u5C14
+bif=\u5E03\u9686\u8FEA\u6CD5\u90CE
+bmd=\u767E\u6155\u5927\u5143
+bnd=\u6587\u83B1\u5143
+bob=\u6CE2\u5229\u7EF4\u4E9A\u73BB\u5229\u7EF4\u4E9A\u8BFA
+bov=\u73BB\u5229\u7EF4\u4E9A Mvdol
+brl=\u5DF4\u897F\u96F7\u4E9A\u5C14
+bsd=\u5DF4\u54C8\u9A6C\u5143
+btn=\u4E0D\u4E39\u52AA\u624E\u59C6
+bwp=\u535A\u8328\u74E6\u7EB3\u666E\u62C9
+byb=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03 (1994-1999)
+byn=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03
+byr=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03 (2000-2016)
+bzd=\u4F2F\u5229\u5179\u5143
+cad=\u52A0\u62FF\u5927\u5143
+cdf=\u521A\u679C\u6CD5\u90CE
+chf=\u745E\u58EB\u6CD5\u90CE
+clf=\u667A\u5229\u8BB0\u8D26\u5355\u4F4D (UF)
+clp=\u667A\u5229\u6BD4\u7D22
+cny=\u4EBA\u6C11\u5E01
+cop=\u54E5\u4F26\u6BD4\u4E9A\u6BD4\u7D22
+crc=\u54E5\u65AF\u8FBE\u9ECE\u52A0\u79D1\u6717
+csd=\u585E\u5C14\u7EF4\u4E9A\u7B2C\u7EB3\u5C14 (2002-2006)
+cuc=\u53E4\u5DF4\u53EF\u5151\u6362\u6BD4\u7D22
+cup=\u53E4\u5DF4\u6BD4\u7D22
+cve=\u4F5B\u5F97\u89D2\u57C3\u65AF\u5E93\u591A
+cyp=\u585E\u6D66\u8DEF\u65AF\u9551
+czk=\u6377\u514B\u5171\u548C\u56FD\u514B\u90CE
+dem=\u5FB7\u56FD\u9A6C\u514B
+djf=\u5409\u5E03\u63D0\u6CD5\u90CE
+dkk=\u4E39\u9EA6\u514B\u6717
+dop=\u591A\u7C73\u5C3C\u52A0\u6BD4\u7D22
+dzd=\u963F\u5C14\u53CA\u5229\u4E9A\u7B2C\u7EB3\u5C14
+eek=\u7231\u6C99\u5C3C\u4E9A\u514B\u6717
+egp=\u57C3\u53CA\u9551
+ern=\u5384\u7ACB\u7279\u91CC\u4E9A\u7EB3\u514B\u6CD5
+esp=\u897F\u73ED\u7259\u6BD4\u585E\u5854
+etb=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u6BD4\u5C14
+eur=\u6B27\u5143
+fim=\u82AC\u5170\u9A6C\u514B
+fjd=\u6590\u6D4E\u5143
+fkp=\u798F\u514B\u5170\u7FA4\u5C9B\u9551
+frf=\u6CD5\u56FD\u6CD5\u90CE
+gbp=\u82F1\u9551
+gel=\u683C\u9C81\u5409\u4E9A\u62C9\u91CC
+ghc=\u52A0\u7EB3\u585E\u5730 (1979-2007)
+ghs=\u52A0\u7EB3\u585E\u5730
+gip=\u76F4\u5E03\u7F57\u9640\u9551
+gmd=\u5188\u6BD4\u4E9A\u8FBE\u62C9\u897F
+gnf=\u51E0\u5185\u4E9A\u6CD5\u90CE
+grd=\u5E0C\u814A\u5FB7\u62C9\u9A6C\u514B
+gtq=\u5371\u5730\u9A6C\u62C9\u683C\u67E5\u5C14
+gwp=\u51E0\u5185\u4E9A\u6BD4\u7ECD\u6BD4\u7D22
+gyd=\u572D\u4E9A\u90A3\u5143
+hkd=\u6E2F\u5143
+hnl=\u6D2A\u90FD\u62C9\u65AF\u4F26\u76AE\u62C9
+hrk=\u5E93\u7EB3
+htg=\u6D77\u5730\u53E4\u5FB7
+huf=\u5308\u7259\u5229\u798F\u6797
+idr=\u5370\u5EA6\u5C3C\u897F\u4E9A\u5362\u6BD4
+iep=\u7231\u5C14\u5170\u9551
+ils=\u4EE5\u8272\u5217\u65B0\u8C22\u514B\u5C14
+inr=\u5370\u5EA6\u5362\u6BD4
+iqd=\u4F0A\u62C9\u514B\u7B2C\u7EB3\u5C14
+irr=\u4F0A\u6717\u91CC\u4E9A\u5C14
+isk=\u51B0\u5C9B\u514B\u6717
+itl=\u610F\u5927\u5229\u91CC\u62C9
+jmd=\u7259\u4E70\u52A0\u5143
+jod=\u7EA6\u65E6\u7B2C\u7EB3\u5C14
+jpy=\u65E5\u5143
+kes=\u80AF\u5C3C\u4E9A\u5148\u4EE4
+kgs=\u5409\u5C14\u5409\u65AF\u65AF\u5766\u7D22\u59C6
+khr=\u67EC\u57D4\u5BE8\u745E\u5C14
+kmf=\u79D1\u6469\u7F57\u6CD5\u90CE
+kpw=\u5317\u671D\u9C9C\u5143
+krw=\u97E9\u5143
+kwd=\u79D1\u5A01\u7279\u7B2C\u7EB3\u5C14
+kyd=\u5F00\u66FC\u7FA4\u5C9B\u5143
+kzt=\u54C8\u8428\u514B\u65AF\u5766\u817E\u683C
+lak=\u8001\u631D\u57FA\u666E
+lbp=\u9ECE\u5DF4\u5AE9\u9551
+lkr=\u65AF\u91CC\u5170\u5361\u5362\u6BD4
+lrd=\u5229\u6BD4\u91CC\u4E9A\u5143
+lsl=\u83B1\u7D22\u6258\u6D1B\u63D0
+ltl=\u7ACB\u9676\u5B9B\u7ACB\u7279
+luf=\u5362\u68EE\u5821\u6CD5\u90CE
+lvl=\u62C9\u8131\u7EF4\u4E9A\u62C9\u7279
+lyd=\u5229\u6BD4\u4E9A\u7B2C\u7EB3\u5C14
+mad=\u6469\u6D1B\u54E5\u8FEA\u62C9\u59C6
+mdl=\u6469\u5C14\u591A\u74E6\u5217\u4F0A
+mga=\u9A6C\u8FBE\u52A0\u65AF\u52A0\u963F\u91CC\u4E9A\u91CC
+mgf=\u9A6C\u8FBE\u52A0\u65AF\u52A0\u6CD5\u90CE
+mkd=\u9A6C\u5176\u987F\u7B2C\u7EB3\u5C14
+mmk=\u7F05\u7538\u5143
+mnt=\u8499\u53E4\u56FE\u683C\u91CC\u514B
+mop=\u6FB3\u95E8\u5143
+mro=\u6BDB\u91CC\u5854\u5C3C\u4E9A\u4E4C\u5409\u4E9A
+mru=\u6BDB\u91CC\u5854\u5C3C\u4E9A\u4E4C\u5409\u4E9A
+mtl=\u9A6C\u8033\u4ED6\u91CC\u62C9
+mur=\u6BDB\u91CC\u6C42\u65AF\u5362\u6BD4
+mvr=\u9A6C\u5C14\u4EE3\u592B\u7F57\u975E\u4E9A
+mwk=\u9A6C\u62C9\u7EF4\u9A6C\u62C9\u7EF4\u514B\u74E6\u67E5
+mxn=\u58A8\u897F\u54E5\u6BD4\u7D22
+mxv=\u58A8\u897F\u54E5\u6295\u8D44\u5355\u4F4D
+myr=\u9A6C\u6765\u897F\u4E9A\u6797\u5409\u7279
+mzm=\u83AB\u6851\u6BD4\u514B\u7F8E\u63D0\u5361 (1980-2006)
+mzn=\u83AB\u6851\u6BD4\u514B\u7F8E\u63D0\u5361
+nad=\u7EB3\u7C73\u6BD4\u4E9A\u5143
+ngn=\u5C3C\u65E5\u5229\u4E9A\u5948\u62C9
+nio=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4
+nlg=\u8377\u5170\u76FE
+nok=\u632A\u5A01\u514B\u6717
+npr=\u5C3C\u6CCA\u5C14\u5362\u6BD4
+nzd=\u65B0\u897F\u5170\u5143
+omr=\u963F\u66FC\u91CC\u4E9A\u5C14
+pab=\u5DF4\u62FF\u9A6C\u5DF4\u6CE2\u4E9A
+pen=\u79D8\u9C81\u7D22\u5C14
+pgk=\u5DF4\u5E03\u4E9A\u65B0\u51E0\u5185\u4E9A\u57FA\u90A3
+php=\u83F2\u5F8B\u5BBE\u6BD4\u7D22
+pkr=\u5DF4\u57FA\u65AF\u5766\u5362\u6BD4
+pln=\u6CE2\u5170\u5179\u7F57\u63D0
+pte=\u8461\u8404\u7259\u57C3\u65AF\u5E93\u591A
+pyg=\u5DF4\u62C9\u572D\u74DC\u62C9\u5C3C
+qar=\u5361\u5854\u5C14\u91CC\u4E9A\u5C14
+rol=\u7F57\u9A6C\u5C3C\u4E9A\u5217\u4F0A (1952-2006)
+ron=\u7F57\u9A6C\u5C3C\u4E9A\u5217\u4F0A
+rsd=\u585E\u5C14\u7EF4\u4E9A\u7B2C\u7EB3\u5C14
+rub=\u4FC4\u7F57\u65AF\u5362\u5E03
+rur=\u4FC4\u7F57\u65AF\u5362\u5E03 (1991-1998)
+rwf=\u5362\u65FA\u8FBE\u6CD5\u90CE
+sar=\u6C99\u7279\u91CC\u4E9A\u5C14
+sbd=\u6240\u7F57\u95E8\u7FA4\u5C9B\u5143
+scr=\u585E\u820C\u5C14\u5362\u6BD4
+sdd=\u82CF\u4E39\u7B2C\u7EB3\u5C14 (1992-2007)
+sdg=\u82CF\u4E39\u9551
+sek=\u745E\u5178\u514B\u6717
+sgd=\u65B0\u52A0\u5761\u5143
+shp=\u5723\u8D6B\u52D2\u62FF\u9551
+sit=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u6258\u62C9\u5C14
+skk=\u65AF\u6D1B\u4F10\u514B\u514B\u6717
+sll=\u585E\u62C9\u5229\u6602\u5229\u6602
+sos=\u7D22\u9A6C\u91CC\u5148\u4EE4
+srd=\u82CF\u91CC\u5357\u5143
+srg=\u82CF\u91CC\u5357\u76FE
+ssp=\u5357\u82CF\u4E39\u9551
+std=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4\u591A\u5E03\u62C9
+stn=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4\u591A\u5E03\u62C9
+svc=\u8428\u5C14\u74E6\u591A\u79D1\u6717
+syp=\u53D9\u5229\u4E9A\u9551
+szl=\u65AF\u5A01\u58EB\u5170\u91CC\u5170\u5409\u5C3C
+thb=\u6CF0\u94E2
+tjs=\u5854\u5409\u514B\u65AF\u5766\u7D22\u6469\u5C3C
+tmm=\u571F\u5E93\u66FC\u65AF\u5766\u9A6C\u7EB3\u7279 (1993-2009)
+tmt=\u571F\u5E93\u66FC\u65AF\u5766\u9A6C\u7EB3\u7279
+tnd=\u7A81\u5C3C\u65AF\u7B2C\u7EB3\u5C14
+top=\u4E1C\u52A0\u5E01
+tpe=\u4E1C\u5E1D\u6C76\u57C3\u65AF\u5E93\u591A
+trl=\u571F\u8033\u5176\u91CC\u62C9 (1922-2005)
+try=\u571F\u8033\u5176\u91CC\u62C9
+ttd=\u7279\u7ACB\u5C3C\u8FBE\u591A\u5DF4\u54E5\u5143
+twd=\u65B0\u53F0\u5E01
+tzs=\u5766\u6851\u5C3C\u4E9A\u5148\u4EE4
+uah=\u4E4C\u514B\u5170\u683C\u91CC\u592B\u5C3C\u4E9A
+ugx=\u4E4C\u5E72\u8FBE\u5148\u4EE4
+usd=\u7F8E\u5143
+usn=\u7F8E\u5143\uFF08\u6B21\u65E5\uFF09
+uss=\u7F8E\u5143\uFF08\u540C\u65E5\uFF09
+uyu=\u4E4C\u62C9\u572D \u6BD4\u7D22
+uzs=\u4E4C\u5179\u522B\u514B\u671F\u5766\u7D22\u59C6
+veb=\u59D4\u5185\u745E\u62C9\u73BB\u5229\u74E6\u5C14 (1871-2008)
+ved=\u59D4\u5185\u745E\u62C9\u4E3B\u6743\u73BB\u5229\u74E6\u5C14
+vef=\u59D4\u5185\u745E\u62C9\u73BB\u5229\u74E6\u5C14
+ves=\u59D4\u5185\u745E\u62C9\u4E3B\u6743\u73BB\u5229\u74E6\u5C14
+vnd=\u8D8A\u5357\u76FE
+vuv=\u74E6\u52AA\u963F\u56FE\u74E6\u56FE
+wst=\u8428\u6469\u4E9A\u5854\u62C9
+xaf=CFA \u6CD5\u90CE BEAC
+xag=\u94F6\u8272
+xau=\u91D1\u8272
+xba=\u6B27\u6D32\u8D27\u5E01\u5408\u6210\u5355\u4F4D
+xbb=\u6B27\u6D32\u8D27\u5E01\u5355\u4F4D
+xbc=\u6B27\u6D32\u8BB0\u8D26\u5355\u4F4D (XBC)
+xbd=\u6B27\u6D32\u8BB0\u8D26\u5355\u4F4D (XBD)
+xcd=\u4E1C\u52A0\u52D2\u6BD4\u5143
+xdr=\u7279\u522B\u63D0\u6B3E\u6743
+xfo=\u6CD5\u56FD\u91D1\u6CD5\u90CE
+xfu=\u6CD5\u56FD UIC \u6CD5\u90CE
+xof=CFA \u6CD5\u90CE BCEAO
+xpd=\u94AF
+xpf=\u592A\u5E73\u6D0B\u6CD5\u90CE
+xpt=\u767D\u91D1
+xsu=\u82CF\u514B\u96F7
+xts=\u6D4B\u8BD5\u8D27\u5E01\u4EE3\u7801
+xua=ADB \u8BB0\u8D26\u5355\u4F4D
+xxx=\u672A\u77E5\u8D27\u5E01
+yer=\u4E5F\u95E8\u91CC\u4E9A\u5C14
+yum=\u5357\u65AF\u62C9\u592B\u65B0\u7B2C\u7EB3\u5C14 (1994-2002)
+zar=\u5357\u975E\u5170\u7279
+zmk=\u8D5E\u6BD4\u4E9A\u514B\u74E6\u67E5
+zwd=\u6D25\u5DF4\u5E03\u97E6\u5143 (1980-2008)
+zwl=\u6D25\u5DF4\u5E03\u97E6\u5143 (2009)
+zwr=\u6D25\u5DF4\u5E03\u97E6\u5143 (2008)
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
index 94195cbedfa..4def676fd9d 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
index eb8dd2cfc0a..6499da87c9c 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
index 0123ebc1439..f2e3599d13c 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
-- 
GitLab


From d472c019344524aa20c74bdc4ab7823b6940be67 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Mon, 28 Mar 2022 19:13:07 +0000
Subject: [PATCH 237/345] 8283711: Remove redundant 'new String' calls after
 concatenation

Reviewed-by: wetmore, vromero, xuelei
---
 .../sun/security/jgss/krb5/Krb5MechFactory.java  |  5 ++---
 .../classes/sun/security/krb5/EncryptionKey.java | 16 ++++++++--------
 .../com/sun/tools/javac/comp/LambdaToMethod.java |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
index 21b48d58fc2..d0acdd5c6e2 100644
--- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
+++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -146,8 +146,7 @@ public final class Krb5MechFactory implements MechanismFactory {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
             String realm = (name.getKrb5PrincipalName()).getRealmAsString();
-            String tgsPrincipal =
-                new String("krbtgt/" + realm + '@' + realm);
+            String tgsPrincipal = "krbtgt/" + realm + '@' + realm;
             ServicePermission perm =
                 new ServicePermission(tgsPrincipal, "initiate");
             try {
diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java b/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java
index 917f0449f17..58cc98c14ec 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/EncryptionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -497,13 +497,13 @@ public class EncryptionKey
     }
 
     public String toString() {
-        return new String("EncryptionKey: keyType=" + keyType
-                          + " kvno=" + kvno
-                          + " keyValue (hex dump)="
-                          + (keyValue == null || keyValue.length == 0 ?
-                        " Empty Key" : '\n'
-                        + Krb5.hexDumper.encodeBuffer(keyValue)
-                        + '\n'));
+        return "EncryptionKey: keyType=" + keyType
+                + " kvno=" + kvno
+                + " keyValue (hex dump)="
+                + (keyValue == null || keyValue.length == 0 ?
+                " Empty Key" : '\n'
+                + Krb5.hexDumper.encodeBuffer(keyValue)
+                + '\n');
     }
 
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 0638da66a89..28662fe2dcc 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2054,7 +2054,7 @@ public class LambdaToMethod extends TreeTranslator {
                         };
                         break;
                     case CAPTURED_OUTER_THIS:
-                        Name name = names.fromString(new String(sym.flatName().toString().replace('.', '$') + names.dollarThis));
+                        Name name = names.fromString(sym.flatName().toString().replace('.', '$') + names.dollarThis);
                         ret = new VarSymbol(SYNTHETIC | FINAL | PARAMETER, name, types.erasure(sym.type), translatedSym) {
                             @Override
                             public Symbol baseSymbol() {
-- 
GitLab


From d8fd22239bafecdaaedb8985ab6d709ed846e808 Mon Sep 17 00:00:00 2001
From: Olga Mikhaltsova <omikhaltcova@openjdk.org>
Date: Mon, 28 Mar 2022 19:27:26 +0000
Subject: [PATCH 238/345] 8282538: PKCS11 tests fail on CentOS Stream 9

Reviewed-by: mullan, xuelei
---
 test/jdk/sun/security/pkcs11/nss/db/cert9.db | Bin 0 -> 9216 bytes
 test/jdk/sun/security/pkcs11/nss/db/key4.db  | Bin 0 -> 11264 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/jdk/sun/security/pkcs11/nss/db/cert9.db
 create mode 100644 test/jdk/sun/security/pkcs11/nss/db/key4.db

diff --git a/test/jdk/sun/security/pkcs11/nss/db/cert9.db b/test/jdk/sun/security/pkcs11/nss/db/cert9.db
new file mode 100644
index 0000000000000000000000000000000000000000..a202bea21e99c8063fdce58c3fedff9c29bcc306
GIT binary patch
literal 9216
zcmeHL&r2IY6y9}{s0HyDN)MT%ffnY+?z*8+jJkzT8#Rqk4@Gv971E|kO#=N73O)4i
z>ABEj|CpY8>AY`eH|j+MEvC%EynHk7y>H%pJClsQIoumfGj@7@@iCb)<y0Kkb+#CD
z9LLpdRkz})YEUUU`jh-OJ+AZY_jgKky+0IN%Rg>Pvwo|9Rp9;=sJLr1$>mdh|C8Do
ztO8bn2cp0us>7cD2l6&-8CHRRtH7G~Q(xrQ9cNtw$N8e%<$9yxeha2aI?m1}lY?10
z9t}#cw9|{*{h0OJ+j}u9huOwx$PRj)*X`ahdletEqi*N$C}#UzwzJ=Tx!2k0v-b9W
zum6-KTsNVc)J+k_0F4M5il`e=H$s;}BA-k^CM2^-CL+@!laNWZX@QF87L1%Y1kdLo
z7Qu-|aN-f1hy*7l!HG(6;u4(51Rsz!<>mE(S>_nb63i0J63i0J63i0J3RwzS3RwzS
z3Rxk%A-o~HA-rMk1!oA(O+-Q;0f8h|Dmmp!tW=^}pX)~o8a9x46`~cQ6{58hA$cIh
z_)yB{G`A0>d?@8(Rv)wacrO8R1F!{P3y?d=0_CfKC=DcD18HFf(hLUD5)Gtv8b|^f
zNGj$Kq8K<&gFI$*o)#8q;k+CTi*ht9%F(bWN5g_w!=fAw3tkN`@zS25iS;OL90O_h
z7)V>lz~LNbb9h=pY=k^EotKkRIl~~~!xV}~^lmw1r&wQwt)@P>&u{;=u|g^K_y6|7
z*$k_||Dpi>{a;=B;dsBiuima#(a=6tfdx`vt5&Pm8}9MwY?yr>d`L#a@>aTPE~}mH
zZv2+PM>o>a&o=ZWPc~mv!EgkIagt`^GGgTl1ANyRRCBjdt3PSD?~p&4rSG%Bv}9Pm
z!eG4DIRqEYwpXh^F4i%cOlH|dNm9K+k~^<+M4~B{YW29`I(Z?V#`-_|C&_Gjj{Zr>
sb|OmX+28*K+UmActH2#AV9);@3u@`C0t=*oJ^u^zvTUhVfjd^<F9n2Ds{jB1

literal 0
HcmV?d00001

diff --git a/test/jdk/sun/security/pkcs11/nss/db/key4.db b/test/jdk/sun/security/pkcs11/nss/db/key4.db
new file mode 100644
index 0000000000000000000000000000000000000000..222adb32286ad793715fbbce368af63e54ba48f5
GIT binary patch
literal 11264
zcmeHL&1(}u6yMoRHqlzNA_S4ZL_``taAtS2O+myorZ!sJ8e9CtuxVC^rdFHOkCS?-
zAS#GgMGy}jy$FJWh!??&AmTqDc<~}Aii$Yz?XKHW3eti#ILq$rZ)e{7y*Iy|*%@}<
z-u_zCrN_o6#+)WKm54%!vYk>zQB-lYi7PmC0V2VJxRYskE~qM-KR$|rvGyHobniBo
zxvZB8NCp0$0uj;<!KTmZzZYCak_t!#7FmI%5MR#!MScr1yi{Ou6oB=gC_5E#u3SI{
zmu(VDq*CO1SJSD~-II;R&_wNw)0~FXe5sHdF3{mzPk(`i7PPZgr9-9So?Pi5-Ca0H
zM+S;}M+$UsfaV7Wdi#s{VVdh1EDdj>4igs_mmw|_FjhbfhpH?*X5lf5k6@CupvXXB
zL(v6A7K&~t94IQH=te5$mB`3|gEKD<uy6)6oB<DKK*Sj^aRyYJ0T*XL#@Q&8etKSh
z$ZU8RnGIw%kl8?H1DOqEHjvpwFB82?^fJ-QL@yg#ZEUr%)y7uaYeh~QIlIsj_2DRx
zfju=C_!`(#1GBZ5I1CQeJ_KG9txdEx(ONX3iDw8l7Aj>ih;5-#7Aj?7R12e8_+B#T
zn?be=vSrYB)XkWdnE^^40<RCDV?KlkK7=m%5c=su5YUI9q6bkFABJuyk6#<Q*@2rK
zrXygGj(|Zr0tV>_81M=hq$6O!E8sL<7&8!9)WX2=A&ed$!VvOdHH2;mkNt)?5IoyT
zm`(-Ksb(Bjt)Svrc()8?2V2XuyVG+0U%*#Sx=ICFT!D7=ff7?Y6z!!prEODxsE^bR
z^+JnxN~S-51?sU_BAFzYHsVHZ%xyY5oTd}pm(JM41+{;&g)0??`g8fhCMte6kBKE7
zZbo`bTu<baM5&#uy5}0F>!P;oOg6{yxg7A9d4S-5bR0U@qw9%8iX2A6(GyOs8ty2U
z_(>KAb`%a!Y=qrpXh1u~4$Vk!k0Qr@<fuCpw;r0rXK-NSEDkf>8_^SMQl#vqKUq2M
zjy6M%*bI(_*F1}bGoH?CdSZ3Zn_8nW=}v?+(HS&e>nxTmPn)Wq*qNG3%aE_kL#)a5
zfBsWNdP)UaT>&}&Tm22n{G|f(S3u7H`D-UVr2?(40RI2i?kM7vhg3i+@NX$lCefsI
zDSpanG|rAsRJUGx`r`8YyI+rVK3lPFWcjQ6yKcT_TUn>xwqdGo>PtIW79|>69a;7H
zaq-RbL+d}B|Fr*N?#j=1N89?os)R&VJX!np;SKB7x4x?{?!|kDZo~Rdv`>mS<slW2
P3j7BOv}wsD!58Hh(ImP`

literal 0
HcmV?d00001

-- 
GitLab


From 9b49900b581bae8529ab30f19e8d18fc8e9c5aad Mon Sep 17 00:00:00 2001
From: Julian Waters <jwaters@openjdk.org>
Date: Mon, 28 Mar 2022 23:30:24 +0000
Subject: [PATCH 239/345] 8283603: Remove redundant qualifier in Windows
 specific Attach Operation

Reviewed-by: dholmes
---
 src/hotspot/os/windows/attachListener_windows.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/os/windows/attachListener_windows.cpp b/src/hotspot/os/windows/attachListener_windows.cpp
index 710afc41005..07a214d4352 100644
--- a/src/hotspot/os/windows/attachListener_windows.cpp
+++ b/src/hotspot/os/windows/attachListener_windows.cpp
@@ -154,7 +154,7 @@ class Win32AttachOperation: public AttachOperation {
   }
 
  public:
-  void Win32AttachOperation::complete(jint result, bufferedStream* result_stream);
+  void complete(jint result, bufferedStream* result_stream);
 };
 
 
-- 
GitLab


From 634800a536e7f9d148a4caa2663a60a2c5fc4929 Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Mon, 28 Mar 2022 23:37:35 +0000
Subject: [PATCH 240/345] 8283806: [BACKOUT] JDK 19 L10n resource files update
 - msgdrop 10

Reviewed-by: kcr, naoto
---
 .../resources/codepoint_de.properties         |   36 -
 .../Notepad/resources/Notepad_de.properties   |   93 -
 .../Stylepad/resources/Stylepad_de.properties |   88 -
 .../resources/swingset_de.properties          |  674 ----
 .../resources/swingset_ja.properties          |    4 +-
 .../launcher/resources/launcher_de.properties |   18 +-
 .../launcher/resources/launcher_ja.properties |   12 +-
 .../resources/launcher_zh_CN.properties       |    8 +-
 .../security/tools/keytool/Resources_de.java  |   93 +-
 .../security/tools/keytool/Resources_ja.java  |   15 +-
 .../tools/keytool/Resources_zh_CN.java        |   15 +-
 .../sun/security/util/AuthResources_de.java   |    2 +-
 .../sun/security/util/Resources_de.java       |   19 +-
 .../sun/security/util/Resources_ja.java       |   17 +
 .../sun/security/util/Resources_zh_CN.java    |   17 +
 .../apple/laf/resources/aqua_de.properties    |    4 +-
 .../resources/accessibility_de.properties     |    2 +-
 .../sun/awt/resources/awt_de.properties       |    4 +-
 .../resources/rmiregistry_de.properties       |    2 +-
 .../resources/rmiregistry_ja.properties       |    2 +-
 .../resources/rmiregistry_zh_CN.properties    |    2 +-
 .../rowset/RowSetResourceBundle_de.properties |    9 +-
 .../rowset/RowSetResourceBundle_ja.properties |    3 +-
 .../RowSetResourceBundle_zh_CN.properties     |    3 +-
 .../internal/res/XSLTErrorResources_de.java   |   22 +-
 .../xsltc/compiler/util/ErrorMessages_de.java |   12 +-
 .../xsltc/runtime/ErrorMessages_de.java       |    2 +-
 .../impl/msg/DOMMessages_de.properties        |   29 +-
 .../impl/msg/DOMMessages_ja.properties        |   25 +
 .../impl/msg/DOMMessages_zh_CN.properties     |   25 +
 .../impl/msg/DatatypeMessages_de.properties   |   25 +
 .../impl/msg/DatatypeMessages_ja.properties   |   25 +
 .../msg/DatatypeMessages_zh_CN.properties     |   25 +
 .../msg/JAXPValidationMessages_de.properties  |   25 +
 .../msg/JAXPValidationMessages_ja.properties  |   25 +
 .../JAXPValidationMessages_zh_CN.properties   |   25 +
 .../impl/msg/SAXMessages_de.properties        |   25 +
 .../impl/msg/SAXMessages_ja.properties        |   25 +
 .../impl/msg/SAXMessages_zh_CN.properties     |   25 +
 .../impl/msg/XIncludeMessages_de.properties   |   27 +-
 .../impl/msg/XIncludeMessages_ja.properties   |   25 +
 .../msg/XIncludeMessages_zh_CN.properties     |   25 +
 .../impl/msg/XMLMessages_de.properties        |    4 +-
 .../impl/msg/XMLMessages_ja.properties        |    2 +-
 .../impl/msg/XMLMessages_zh_CN.properties     |    2 +-
 .../impl/msg/XMLSchemaMessages_de.properties  |   36 +-
 .../impl/msg/XMLSchemaMessages_ja.properties  |   25 +
 .../msg/XMLSchemaMessages_zh_CN.properties    |   25 +
 .../msg/XMLSerializerMessages_de.properties   |   25 +
 .../msg/XMLSerializerMessages_ja.properties   |   25 +
 .../XMLSerializerMessages_zh_CN.properties    |   25 +
 .../impl/msg/XPointerMessages_de.properties   |   25 +
 .../impl/msg/XPointerMessages_ja.properties   |   25 +
 .../msg/XPointerMessages_zh_CN.properties     |   25 +
 .../impl/xpath/regex/message_de.properties    |   25 +
 .../impl/xpath/regex/message_ja.properties    |   25 +
 .../impl/xpath/regex/message_zh_CN.properties |   25 +
 .../internal/res/XMLErrorResources_de.java    |    2 +-
 .../utils/SerializerMessages_de.java          |    2 +-
 .../internal/res/XPATHErrorResources_de.java  |   44 +-
 .../internal/res/XPATHErrorResources_ja.java  |   28 +-
 .../res/XPATHErrorResources_zh_CN.java        |   28 +-
 .../javac/resources/compiler_de.properties    | 2785 -----------------
 .../javac/resources/compiler_ja.properties    |  195 +-
 .../javac/resources/compiler_zh_CN.properties |  199 +-
 .../tools/javac/resources/javac_de.properties |  228 --
 .../tools/javac/resources/javac_ja.properties |   10 +-
 .../javac/resources/javac_zh_CN.properties    |   10 +-
 .../javac/resources/launcher_de.properties    |  117 -
 .../resources/serialver_de.properties         |   31 -
 .../resources/simpleserver_de.properties      |   54 -
 .../resources/simpleserver_ja.properties      |   54 -
 .../resources/simpleserver_zh_CN.properties   |   54 -
 .../tools/jarsigner/Resources_de.java         |  338 --
 .../tools/jarsigner/Resources_ja.java         |    9 -
 .../tools/jarsigner/Resources_zh_CN.java      |    9 -
 .../sun/tools/jar/resources/jar_de.properties |   19 +-
 .../sun/tools/jar/resources/jar_ja.properties |    8 +-
 .../tools/jar/resources/jar_zh_CN.properties  |    8 +-
 .../html/resources/standard_de.properties     |  445 ---
 .../html/resources/standard_ja.properties     |  132 +-
 .../html/resources/standard_zh_CN.properties  |  132 +-
 .../toolkit/resources/doclets_de.properties   |  330 --
 .../toolkit/resources/doclets_ja.properties   |  111 +-
 .../resources/doclets_zh_CN.properties        |  113 +-
 .../doclint/resources/doclint_de.properties   |   95 -
 .../doclint/resources/doclint_ja.properties   |   15 +-
 .../resources/doclint_zh_CN.properties        |   15 +-
 .../tool/resources/javadoc_de.properties      |  210 --
 .../tool/resources/javadoc_ja.properties      |   12 +-
 .../tool/resources/javadoc_zh_CN.properties   |   12 +-
 .../jconsole/resources/messages_de.properties |  307 --
 .../resources/messages_zh_CN.properties       |    2 +-
 .../tools/javap/resources/javap_de.properties |  105 -
 .../tools/javap/resources/javap_ja.properties |    4 +-
 .../javap/resources/javap_zh_CN.properties    |    2 +-
 .../resources/jdeprscan_de.properties         |   82 -
 .../tools/jdeps/resources/jdeps_de.properties |  131 -
 .../example/debug/tty/TTYResources_de.java    |  350 ---
 .../example/debug/tty/TTYResources_ja.java    |   11 +-
 .../example/debug/tty/TTYResources_zh_CN.java |   19 +-
 .../sun/tools/jdi/resources/jdi_de.properties |   77 -
 .../tools/jlink/resources/jlink_de.properties |  105 -
 .../jlink/resources/plugins_de.properties     |  224 --
 .../jlink/resources/plugins_ja.properties     |  224 --
 .../jlink/resources/plugins_zh_CN.properties  |  224 --
 .../tools/jmod/resources/jmod_de.properties   |  100 -
 .../tools/jmod/resources/jmod_ja.properties   |    3 -
 .../jmod/resources/jmod_zh_CN.properties      |    3 -
 .../resources/LinuxResources_de.properties    |   69 -
 .../resources/LinuxResources_ja.properties    |    2 +-
 .../resources/LinuxResources_zh_CN.properties |    2 +-
 .../resources/MacResources_de.properties      |   91 -
 .../resources/MacResources_ja.properties      |   11 +-
 .../resources/MacResources_zh_CN.properties   |   11 +-
 .../resources/HelpResources_de.properties     |   39 -
 .../resources/HelpResources_ja.properties     |  241 +-
 .../resources/HelpResources_zh_CN.properties  |  241 +-
 .../resources/MainResources_de.properties     |  110 -
 .../resources/MainResources_ja.properties     |    2 +-
 .../resources/MainResources_zh_CN.properties  |    2 +-
 .../resources/MsiInstallerStrings_de.wxl      |   15 -
 .../resources/MsiInstallerStrings_ja.wxl      |   30 +-
 .../resources/MsiInstallerStrings_zh_CN.wxl   |   30 +-
 .../resources/WinResources_de.properties      |   70 -
 .../resources/WinResources_ja.properties      |   10 +-
 .../resources/WinResources_zh_CN.properties   |   10 +-
 .../jshell/tool/resources/l10n_de.properties  |  322 --
 .../jshell/tool/resources/l10n_ja.properties  |    4 +-
 .../tool/resources/l10n_zh_CN.properties      |    2 +-
 .../jdk/jshell/resources/l10n_de.properties   |   35 -
 .../jdk/jshell/resources/l10n_ja.properties   |    2 +-
 .../jshell/resources/l10n_zh_CN.properties    |    2 +-
 .../resources/ext/CurrencyNames_de.properties |  309 +-
 .../resources/ext/CurrencyNames_ja.properties |  440 ++-
 .../ext/CurrencyNames_zh_CN.properties        |  443 ++-
 .../agent/resources/agent_de.properties       |    2 +-
 .../agent/resources/agent_ja.properties       |    2 +-
 .../agent/resources/agent_zh_CN.properties    |    2 +-
 139 files changed, 2192 insertions(+), 10064 deletions(-)
 delete mode 100644 src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
 delete mode 100644 src/demo/share/jfc/Notepad/resources/Notepad_de.properties
 delete mode 100644 src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
 delete mode 100644 src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
 delete mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
 delete mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
 delete mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
 delete mode 100644 src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
 delete mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
 delete mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
 delete mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
 delete mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
 delete mode 100644 src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
 delete mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
 delete mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
 delete mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
 delete mode 100644 src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
 delete mode 100644 src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
 delete mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
 delete mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
 delete mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
 delete mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
 delete mode 100644 src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
 delete mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
 delete mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
 delete mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
 delete mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
 delete mode 100644 src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
 delete mode 100644 src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties

diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
deleted file mode 100644
index 84597bb758c..00000000000
--- a/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
-#
-
-#
-# Resource strings for CodePointIM
-#
-
-warning=Diese Demoeingabemethode kann nicht direkt als Anwendung ausgef\u00FChrt werden.\nIn der Datei README.html in diesem Verzeichnis erfahren Sie, wie Sie diese \nEingabemethode verwenden.
-
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_de.properties b/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
deleted file mode 100644
index 0c15bc05033..00000000000
--- a/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
-#
-
-#
-# Resource strings for Notepad example
-
-Title=Notepad
-ElementTreeFrameTitle=Elemente
-
-# file Menu definition
-#
-# Each of the strings that follow form a key to be
-# used as the basis of a menu item definition.
-#
-# open ->  Notepad.openAction
-# new  ->  Notepad.newAction
-# save ->  Notepad.saveAction
-# exit ->  Notepad.exitAction
-
-fileLabel=Datei
-openLabel=\u00D6ffnen
-openImage=resources/open.gif
-newLabel=Neu
-newImage=resources/new.gif
-saveLabel=Speichern
-saveImage=resources/save.gif
-exitLabel=Beenden
-
-#
-# edit Menu definition
-#
-# cut   -> JTextComponent.cutAction
-# copy  -> JTextComponent.copyAction
-# paste -> JTextComponent.pasteAction
-
-editLabel=Bearbeiten
-cutLabel=Ausschneiden
-cutImage=resources/cut.gif
-copyLabel=Kopieren
-copyImage=resources/copy.gif
-pasteLabel=Einf\u00FCgen
-pasteImage=resources/paste.gif
-undoLabel=R\u00FCckg\u00E4ngig
-redoLabel=Wiederherstellen
-
-#
-# debug Menu definition
-#
-
-debugLabel=Debuggen
-dumpLabel=Modell in System.err ausgeben
-showElementTreeLabel=Elemente anzeigen
-
-# toolbar definition
-#
-# Each of the strings that follow form a key to be
-# used as the basis of the tool definition.  Actions
-# are of course sharable, and in this case are shared
-# with the menu items.
-
-newTooltip=Neue Datei erstellen
-openTooltip=Datei \u00F6ffnen
-saveTooltip=In Datei speichern
-cutTooltip=Auswahl in Zwischenablage verschieben
-copyTooltip=Auswahl in Zwischenablage kopieren
-pasteTooltip=Zwischenablage in Auswahl einf\u00FCgen
diff --git a/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties b/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
deleted file mode 100644
index 7ab06001f6d..00000000000
--- a/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
-#
-
-#
-# Resource strings for Stylepad example
-
-Title=Stylepad
-
-# Menu labels
-colorLabel=Farbe
-Red=Rot
-Green=Gr\u00FCn
-Blue=Blau
-
-boldLabel=Fett
-italicLabel=Kursiv
-
-# font menu
-
-fontLabel=Schriftart
-family1Label=SansSerif
-family2Label=Monospaced
-family3Label=Serif
-family4Label=Lucida Sans
-size1Label=10
-size2Label=12
-size3Label=18
-size4Label=24
-size5Label=48
-boldLabel=Fett
-italicLabel=Kursiv
-underlineLabel=Unterstrichen
-
-#
-# debug Menu definition
-#
-debugLabel=Debuggen
-dumpLabel=Modell in System.err ausgeben
-showElementTreeLabel=Elemente anzeigen
-
-
-# toolbar definition
-boldImage=resources/bold.gif
-boldTooltip=Fett
-italicImage=resources/italic.gif
-italicTooltip=Kursiv
-underlineImage=resources/underline.gif
-underlineTooltip=Unterstrichen
-foregroundImage=resources/fg.gif
-leftImage=resources/left.gif
-leftTooltip=Linksb\u00FCndig
-centerImage=resources/center.gif
-centerTooltip=Zentriert
-rightImage=resources/right.gif
-rightTooltip=Rechtsb\u00FCndig
-bulletsImage=resources/bullets.gif
-
-# wonderland example images
-aliceGif=resources/alice.gif
-caterpillarGif=resources/caterpillar.gif
-hatterGif=resources/hatter.gif
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
deleted file mode 100644
index 509597076f7..00000000000
--- a/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
+++ /dev/null
@@ -1,674 +0,0 @@
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
-#
-
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used in the SwingSet demo.
-#
-# @author Jeff Dinkins
-
-#################################
-###  SwingSet Infrastructure  ###
-#################################
-
-### About Box ###
-
-AboutBox.title=Info zu Swing!
-AboutBox.ok_button_text=OK
-AboutBox.accessible_description=SwingSet2-Demo: Copyright (c) 2011, Oracle und/oder verbundene Unternehmen. All rights reserved. Alle Rechte vorbehalten.
-
-### Source Code ###
-SourceCode.loading=<html><body bgcolor="#ffffff">Quellcode wird geladen und formatiert. Bitte warten...</body></html>
-
-### Status ###
-
-Status.loading=Wird geladen:
-Status.popupMenuAccessible=Dr\u00FCcken Sie Umschalt-F10, um das Popup-Men\u00FC zu aktivieren
-
-### Menu Bar ###
-
-MenuBar.accessible_description=Men\u00FCleiste der Swing-Demo
-
-
-### Frame ###
-
-Frame.title=SwingSet2
-
-
-### Tabbed Pane ###
-
-TabbedPane.src.labelAndMnemonic=Quellcode
-TabbedPane.src_tooltip=Quellcode f\u00FCr diese Demo anzeigen
-
-
-### Look & Feel Menu ###
-
-LafMenu.laf.labelAndMnemonic=&Look-and-Feel
-LafMenu.laf_accessible_description=Men\u00FC, \u00FCber das Sie das Look-and-Feel wechseln k\u00F6nnen
-
-LafMenu.java.labelAndMnemonic=&Java-Look-and-Feel
-LafMenu.java_accessible_description=Das Java-Look-and-Feel
-
-LafMenu.nimbus.labelAndMnemonic=&Nimbus-Look-and-Feel
-LafMenu.nimbus_accessible_description=Das Nimbus-Look-and-Feel
-
-LafMenu.mac.labelAndMnemonic=&Mac OS X-Look-and-Feel
-LafMenu.mac_accessible_description=Das Mac OS X-Look-and-Feel
-
-LafMenu.motif.labelAndMnemonic=M&otif-Look-and-Feel
-LafMenu.motif_accessible_description=Das Motif-Look-and-Feel
-
-LafMenu.windows.labelAndMnemonic=&Windows-Look-and-Feel
-LafMenu.windows_accessible_description=Windows-Look-and-Feel
-
-LafMenu.gtk.labelAndMnemonic=&GTK-Look-and-Feel
-LafMenu.gtk_accessible_description=GTK-Look-and-Feel
-
-
-### Themes Menu ###
-
-ThemesMenu.themes.labelAndMnemonic=&Themes
-ThemesMenu.themes_accessible_description=Men\u00FC zum Wechseln der Metal-Farb-Themes
-
-ThemesMenu.aqua.labelAndMnemonic=A&qua
-ThemesMenu.aqua_accessible_description=Ein Metal-Theme mit blau-gr\u00FCnen Farben
-
-ThemesMenu.charcoal.labelAndMnemonic=&Anthrazit
-ThemesMenu.charcoal_accessible_description=Ein Metal-Theme mit dunkelgrauen Farben
-
-ThemesMenu.contrast.labelAndMnemonic=&Hoher Kontrast
-ThemesMenu.contrast_accessible_description=Ein Theme mit hohem Kontrast
-
-ThemesMenu.ocean.labelAndMnemonic=&Ozean
-ThemesMenu.ocean_accessible_description=Das Metal-Theme "Ozean"
-
-ThemesMenu.steel.labelAndMnemonic=&Stahl
-ThemesMenu.steel_accessible_description=Das blaue/violette Metal-Theme
-
-ThemesMenu.emerald.labelAndMnemonic=&Smaragdgr\u00FCn
-ThemesMenu.emerald_accessible_description=Ein Metal-Theme mit gr\u00FCnen Farben
-
-ThemesMenu.ruby.labelAndMnemonic=&Rubinrot
-ThemesMenu.ruby_accessible_description=Ein Metal-Theme mit roten Farben
-
-
-### Font SubMenu (under Themes) 
-FontMenu.fonts.labelAndMnemonic=Schri&ftarten
-FontMenu.fonts_accessible_description=Men\u00FC, in dem Sie Schriftarten f\u00FCr das Java-Look-and-Feel ausw\u00E4hlen
-
-FontMenu.bold.labelAndMnemonic=&Fett
-FontMenu.bold_accessible_description=Deaktiviert fettgedruckte Schriftarten f\u00FCr das Java-Look-and-Feel
-
-FontMenu.plain.labelAndMnemonic=&Normal
-FontMenu.plain_accessible_description=Deaktiviert normale Schriftarten f\u00FCr das Java-Look-and-Feel
-
-
-### Audio SubMenu (under Themes) ###
-
-AudioMenu.audio.labelAndMnemonic=&Audio
-AudioMenu.audio_accessible_description=Men\u00FC, in dem Sie die verf\u00FCgbare Audio-Feedbackmenge im Java-Look-and-Feel \u00E4ndern
-
-AudioMenu.on.labelAndMnemonic=&Ein
-AudioMenu.on_accessible_description=Aktiviert das gesamte Audiofeedback f\u00FCr das Java-Look-and-Feel
-
-AudioMenu.default.labelAndMnemonic=Stan&dard
-AudioMenu.default_accessible_description=Aktiviert die standardm\u00E4\u00DFige Audio-Feedbackmenge f\u00FCr das Java-Look-and-Feel
-
-AudioMenu.off.labelAndMnemonic=A&us
-AudioMenu.off_accessible_description=Deaktiviert das gesamte Audiofeedback f\u00FCr das Java-Look-and-Feel
-
-### Options Menu ###
-
-OptionsMenu.options.labelAndMnemonic=O&ptionen
-OptionsMenu.options_accessible_description=Men\u00FC mit anderen Optionen
-
-OptionsMenu.tooltip.labelAndMnemonic=QuickInfo ak&tivieren
-OptionsMenu.tooltip_accessible_description=QuickInfo aktivieren oder deaktivieren
-
-OptionsMenu.dragEnabled.labelAndMnemonic=&Drag-und-Drop aktivieren
-OptionsMenu.dragEnabled_accessible_description=Drag-und-Drop aktivieren oder deaktivieren
-
-### File Menu ###
-
-FileMenu.file.labelAndMnemonic=Dat&ei
-FileMenu.accessible_description=Men\u00FC "Datei"
-FileMenu.about.labelAndMnemonic=&Info
-FileMenu.about_accessible_description=Weitere Informationen zur SwingSet2-Anwendung
-FileMenu.open.labelAndMnemonic=\u00D6&ffnen
-FileMenu.open_accessible_description=Platzhaltermen\u00FCoption zum \u00D6ffnen einer Datei
-FileMenu.save.labelAndMnemonic=&Speichern
-FileMenu.save_accessible_description=Platzhaltermen\u00FCoption zum Speichern einer Datei
-FileMenu.save_as.labelAndMnemonic=Speichern &unter...
-FileMenu.save_as_accessible_description=Platzhaltermen\u00FCoption zum Speichern einer Datei mit einem neuen Namen
-FileMenu.exit.labelAndMnemonic=B&eenden
-FileMenu.exit_accessible_description=SwingSet2-Anwendung beenden
-
-### Multi-Screen menu ###
-MultiMenu.multi.labelAndMnemonic=&Multiscreen
-MultiMenu.multi_accessible_description=Multiscreen-Men\u00FC
-MultiMenu.all.labelAndMnemonic=SwingSet2 &auf allen Bildschirmen erstellen
-MultiMenu.all_accessible_description=SwingSet2-Fenster auf jedem Bildschirm erstellen
-MultiMenu.single.labelAndMnemonic=SwingSet2 auf Bildschirm erstellen
-MultiMenu.single_accessible_description=SwingSet2-Fenster auf Bildschirm erstellen
-
-
-################################
-###          DEMOS           ###
-################################
-
-### Button Demo ###
-
-ButtonDemo.accessible_description=Die ButtonDemo zeigt Beispiele f\u00FCr die Verwendung von JButton, JRadioButton, JToggleButton und JCheckBox
-ButtonDemo.tooltip=Demos f\u00FCr JButton, JRadioButton, JToggleButton, JCheckbox
-ButtonDemo.name=Schaltfl\u00E4chendemo
-
-ButtonDemo.buttons=Schaltfl\u00E4chen
-ButtonDemo.checkboxes=Kontrollk\u00E4stchen
-ButtonDemo.radiobuttons=Optionsfelder
-ButtonDemo.togglebuttons=Umschalt-Schaltfl\u00E4chen
-
-ButtonDemo.textbuttons=Textschaltfl\u00E4chen
-ButtonDemo.imagebuttons=Bildschaltfl\u00E4chen
-ButtonDemo.textradiobuttons=Textoptionsfelder
-ButtonDemo.imageradiobuttons=Bildoptionsfelder
-ButtonDemo.texttogglebuttons=Text-Umschalt-Schaltfl\u00E4chen
-ButtonDemo.imagetogglebuttons=Bild-Umschalt-Schaltfl\u00E4chen
-ButtonDemo.textcheckboxes=Textkontrollk\u00E4stchen
-ButtonDemo.imagecheckboxes=Bildkontrollk\u00E4stchen
-
-ButtonDemo.button1=Eins
-ButtonDemo.button2=Zwei
-ButtonDemo.button3=<html><font size=2 color=red><bold>Drei.</font></html>
-
-ButtonDemo.radio1=Optionsfeld Eins
-ButtonDemo.radio2=Optionsfeld Zwei
-ButtonDemo.radio3=Optionsfeld Drei
-ButtonDemo.radioX=<html><font size=2 color=red>Drei<bold>(HTML!)</bold></font></html>
-
-ButtonDemo.check1=Eins
-ButtonDemo.check2=Zwei
-ButtonDemo.check3=Drei
-ButtonDemo.checkX=<html><font size=2 color=red>Drei<bold>(HTML!)</bold></font></html>
-
-ButtonDemo.customradio=Ein benutzerdefiniertes "Chrome"-Optionsfeld.
-ButtonDemo.customcheck=Ein benutzerdefinierbares Gl\u00FChbirnenkontrollk\u00E4stchen.
-
-ButtonDemo.phone=Telefon
-ButtonDemo.write=Schreiben
-ButtonDemo.peace=Peace
-
-ButtonDemo.controlpanel.labelAndMnemonic=Anzeigeoptionen:
-ButtonDemo.paintborder.labelAndMnemonic=Rahmen f\u00E4r&ben
-ButtonDemo.paintborder_tooltip=Klicken Sie hier, um die Rahmenf\u00E4rbung ein- oder auszuschalten.
-ButtonDemo.paintfocus.labelAndMnemonic=&Fokus f\u00E4rben
-ButtonDemo.paintfocus_tooltip=Klicken Sie hier, um die Fokusf\u00E4rbung ein- oder auszuschalten.
-ButtonDemo.enabled.labelAndMnemonic=Aktivi&ert
-ButtonDemo.enabled_tooltip=Klicken Sie hier, um die Schaltfl\u00E4chen zu aktivieren oder zu deaktivieren.
-ButtonDemo.contentfilled.labelAndMnemonic=&Inhalt gef\u00FCllt
-ButtonDemo.contentfilled_tooltip=Klicken Sie hier, um die F\u00FCllung des Inhaltsbereichs zu steuern.
-
-ButtonDemo.padamount.labelAndMnemonic=Abstand:
-ButtonDemo.default.labelAndMnemonic=Stan&dard
-ButtonDemo.default_tooltip=Verwendet den Standardabstand zwischen Rahmen und Label.
-ButtonDemo.zero.labelAndMnemonic=&0
-ButtonDemo.zero_tooltip=Verwendet keinen Abstand zwischen Rahmen und Label.
-ButtonDemo.ten.labelAndMnemonic=&10
-ButtonDemo.ten_tooltip=Verwendet einen Abstand von 10 Pixel zwischen Rahmen und Label.
-
-LayoutControlPanel.textposition.labelAndMnemonic=Textposition:
-LayoutControlPanel.contentalignment.labelAndMnemonic=Inhaltsausrichtung:
-
-### ColorChooser Demo ###
-
-ColorChooserDemo.accessible_description=Mit dem ColorChooser k\u00F6nnen Sie eine Farbe \u00FCber eine Palette oder unter RGB- oder HSB-Werten ausw\u00E4hlen
-ColorChooserDemo.tooltip=JColorChooser-Demo
-ColorChooserDemo.name=ColorChooser-Demo
-ColorChooserDemo.chooser_title=Farbe w\u00E4hlen
-ColorChooserDemo.background=Hintergrund
-ColorChooserDemo.grad_a=Farbverlauf 1
-ColorChooserDemo.grad_b=Farbverlauf 2
-ColorChooserDemo.outer_line=Umfang
-ColorChooserDemo.cup=Bild der Kaffeetasse der Java-Marke
-
-### ComboBox Demo ###
-
-ComboBoxDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JComboBox-Komponente.
-ComboBoxDemo.tooltip=JComboBox-Demo
-ComboBoxDemo.name=ComboBox-Demo
-
-ComboBoxDemo.hair=Haare
-ComboBoxDemo.eyes=Augen
-ComboBoxDemo.mouth=Mund
-ComboBoxDemo.presets=Voreinstellungen:
-
-ComboBoxDemo.preset1=Philip, Howard, Jeff
-ComboBoxDemo.preset2=Jeff, Larry, Philip
-ComboBoxDemo.preset3=Howard, Scott, Hans
-ComboBoxDemo.preset4=Philip, Jeff, Hans
-ComboBoxDemo.preset5=Brent, Jon, Scott
-ComboBoxDemo.preset6=Lara, Larry, Lisa
-ComboBoxDemo.preset7=James, Philip, Michael
-ComboBoxDemo.preset8=Philip, Lisa, Brent
-ComboBoxDemo.preset9=James, Philip, Jon
-ComboBoxDemo.preset10=Lara, Jon, Scott
-
-
-ComboBoxDemo.hair_description=Haare:
-ComboBoxDemo.eyes_description=Augen und Nase:
-ComboBoxDemo.mouth_description=Mund:
-
-ComboBoxDemo.amy=Amy
-ComboBoxDemo.brent=Brent
-ComboBoxDemo.georges=Georges
-ComboBoxDemo.hans=Hans
-ComboBoxDemo.howard=Howard
-ComboBoxDemo.james=James
-ComboBoxDemo.jeff=Jeff
-ComboBoxDemo.jon=Jon
-ComboBoxDemo.lara=Lara
-ComboBoxDemo.larry=Larry
-ComboBoxDemo.lisa=Lisa
-ComboBoxDemo.michael=Michael
-ComboBoxDemo.philip=Philip
-ComboBoxDemo.scott=Scott
-
-### FileChooser Demo ###
-
-FileChooserDemo.accessible_description=\u00DCber den FileChooser k\u00F6nnen Benutzer eine Datei zum \u00D6ffnen oder Erstellen/Speichern ausw\u00E4hlen.
-FileChooserDemo.tooltip=JFileChooser-Demo
-FileChooserDemo.name=FileChooser-Demo
-
-FileChooserDemo.plainbutton=Einfachen JFileChooser anzeigen
-FileChooserDemo.previewbutton=Vorschau-JFileChooser anzeigen
-FileChooserDemo.custombutton=Benutzerdefinierten JFileChooser anzeigen
-
-FileChooserDemo.description=<html>&&nbsp &&nbsp Beachten Sie, dass Sie ganz einfach Ihren eigenen FileChooser<br> &&nbsp &&nbsp mit beliebig vielen Komponenten erstellen k\u00F6nnen. </html>
-
-FileChooserDemo.filterdescription=JPEG- und GIF-Bilddateien
-
-FileChooserDemo.nofileselected=W\u00E4hlen Sie zun\u00E4chst eine Datei aus.
-FileChooserDemo.thefile=die Datei:
-FileChooserDemo.isprobably=ist wahrscheinlich ein Bild.
-
-FileChooserDemo.helptext=<html>Suchen: Datei suchen.<br>Info: Weitere Informationen zur Datei.<br>OK: Diese Datei ausw\u00E4hlen.<br>Abbrechen: Dieses Dialogfeld ohne Aktion verlassen.</html>
-
-FileChooserDemo.findquestion=Datei suchen:
-FileChooserDemo.findresponse=<html><center>Sie m\u00F6chten wirklich eine Datei suchen? <br>Das ist mit dieser Demo nicht m\u00F6glich.</center></html>
-
-FileChooserDemo.dialogtitle=FileChooser mit benutzerdefiniertem Layout
-FileChooserDemo.help=Hilfe
-FileChooserDemo.find=Suchen
-FileChooserDemo.ok=OK
-FileChooserDemo.about=Info
-FileChooserDemo.cancel=Abbrechen
-
-### Html Demo ###
-
-HtmlDemo.accessible_description=Diese Demo zeigt, wie HTML-Text mit der JEditorPane-Komponente angezeigt wird.
-HtmlDemo.tooltip=JEditorPane-HTML-Demo
-HtmlDemo.name=JEditorPane-HTML-Demo
-HtmlDemo.filename=swing.html
-
-
-### Internal Frame Demo ###
-
-InternalFrameDemo.accessible_description=JInternal-Framedemo
-InternalFrameDemo.create_frames.labelAndMnemonic=Angepasste interne Frames erstellen
-InternalFrameDemo.title_text_field.labelAndMnemonic=Frametitel:
-InternalFrameDemo.frame.labelAndMnemonic=Frame
-InternalFrameDemo.palette.labelAndMnemonic=Generator f\u00FCr interne Frames
-InternalFrameDemo.name=Demo f\u00FCr interne Frames
-InternalFrameDemo.tooltip=JInternalFrame-Demo
-InternalFrameDemo.closable.labelAndMnemonic=Kann geschlossen werden
-InternalFrameDemo.resizable.labelAndMnemonic=Skalierbar
-InternalFrameDemo.iconifiable.labelAndMnemonic=Als Symbol darstellbar
-InternalFrameDemo.maximizable.labelAndMnemonic=Maximierbar
-InternalFrameDemo.toast=Prost
-InternalFrameDemo.duke=Euer Gnaden!
-InternalFrameDemo.duchess=Herzogin
-InternalFrameDemo.cab=Braucht jemand ein Taxi?
-
-
-### List Demo ###
-
-ListDemo.accessible_description=JList-Demo
-ListDemo.name=Listendemo
-ListDemo.tooltip=JList-Demo
-ListDemo.prefixes=Pr\u00E4fixe
-ListDemo.suffixes=Suffixe
-ListDemo.count.labelAndMnemonic=Anzahl generierte Listeneintr\u00E4ge:
-ListDemo.all=Alle
-ListDemo.none=Kein Wert
-ListDemo.red=Rotes Firmenlogobild
-ListDemo.yellow=Rotes Firmenlogobild
-ListDemo.blue=Blaues Firmenlogobild
-ListDemo.gray=Graues Firmenlogobild
-ListDemo.green=Gr\u00FCnes Firmenlogobild
-ListDemo.magenta=Firmenlogobild in Magenta
-ListDemo.cyan=Firmenlogobild in Zyan
-ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">Diese Demo zeigt die Pr\u00E4sentation von Datenlisten auf zwei verschiedene Arten. Links steht eine <b>JList</b>-Komponente mit Listenelementen, die aus den Permutationen der aktivierten Pr\u00E4fixe und Suffixe bestehen. Die Kontrollk\u00E4stchenspalten f\u00FCr Pr\u00E4fix und Suffix rechts werden mit einer <b>JPanel</b>-Komponente mit einem Y-Achsen-<b>BoxLayout</b> in einer <b>JScrollPane</b>-Komponente erstellt.</P></html>
-
-
-### OptionPane Demo ###
-
-OptionPaneDemo.accessible_description=Die OptionPane-Demo zeigt Beispiele f\u00FCr die Verwendung von JOptionPane zum Generieren verschiedener g\u00E4ngiger Optionsdialogfelder
-OptionPaneDemo.tooltip=JOptionPane-Demo
-OptionPaneDemo.name=Optionsbereichsdemo
-
-OptionPaneDemo.warningbutton=Warnungsdialogfeld anzeigen
-OptionPaneDemo.componentbutton=Komponentendialogfeld anzeigen
-OptionPaneDemo.inputbutton=Eingabedialogfeld anzeigen
-OptionPaneDemo.confirmbutton=Best\u00E4tigungsdialogfeld anzeigen
-OptionPaneDemo.messagebutton=Meldungsdialog anzeigen
-
-OptionPaneDemo.warningtitle=Beispiel f\u00FCr Warnungsdialogfeld
-OptionPaneDemo.warningtext=<html><P><font color=black>Das ist ein Test des <font color=red><b>Notfallwarnsystems</b></font>. <i><b>Das ist<br> nur ein Test</b></i>. Der Webmaster Ihres lokalen Intranets hat dieses System in freiwilliger <br> Zusammenarbeit mit den <font color=blue><b>Bundes-</b></font> und <font color=blue><b>L\u00E4nderbeh\u00F6rden</b></font> <br> entwickelt, um Sie bei Bedarf \u00FCber <br> Notf\u00E4lle zu informieren. Bei einem tats\u00E4chlichen Notfall w\u00FCrden auf das Signal, das Sie <br> eben geh\u00F6rt haben, offizielle Informationen, Nachrichten <br> oder Anweisungen folgen. Damit ist dieser Test des <font color=red><b><br>Notfallwarnsystems</b></font> abgeschlossen.</font></P><P><br>Entwicklerhinweis: Der Text in dieser Dialogfelddemo wurde mit HTML formatiert.</P></html>
-
-OptionPaneDemo.messagetext=Flaschenpost
-
-OptionPaneDemo.confirmquestion=Scheint heute die Sonne?
-OptionPaneDemo.confirmyes=<html>Warum sitzen Sie noch am Computer?<br> Gehen Sie raus! Machen Sie einen Ausflug zum Strand! Legen Sie sich in die Sonne!</html>
-OptionPaneDemo.confirmno=Gut, dass Sie hier drinnen vor dem Wetter gesch\u00FCtzt sind.
-
-OptionPaneDemo.inputquestion=Was ist Ihr Lieblingsfilm?
-OptionPaneDemo.inputresponse=Das ist ein guter Film!
-
-OptionPaneDemo.componenttitle=Beispiel f\u00FCr Komponentendialogfeld
-OptionPaneDemo.componentmessage=<html>JOptionPane kann beliebig viele Komponenten <br> enthalten, wie ein Textfeld:</html>
-OptionPaneDemo.componenttextfield=oder ein Kombinationsfeld:
-OptionPaneDemo.component_cb1=Element 1
-OptionPaneDemo.component_cb2=Element 2
-OptionPaneDemo.component_cb3=Element 3
-OptionPaneDemo.componentmessage2=<html>JOptionPane kann au\u00DFerdem beliebig viele <br> Optionen anzeigen:</html>
-OptionPaneDemo.component_op1=Ja
-OptionPaneDemo.component_op2=Nein
-OptionPaneDemo.component_op3=Vielleicht
-OptionPaneDemo.component_op4=Wahrscheinlich
-OptionPaneDemo.component_op5=Abbrechen
-
-OptionPaneDemo.component_r1=Optimistisch und positiv! Das ist gut.
-OptionPaneDemo.component_r2=Definitiv nicht. Da haben Sie ganz recht.
-OptionPaneDemo.component_r3=<html><font color=black> Ja, momentan ist die Situation <br> noch ungekl\u00E4rt. Sagen Sie sp\u00E4ter Bescheid, wenn Sie es genau wissen.</font></html>
-OptionPaneDemo.component_r4=<html><font color=black>Sie wollen doch "Ja" sagen. Sie h\u00E4tten sich <br> einfach darauf einlassen und "Ja" klicken sollen.</font></html>
-
-### ProgressBar Demo ###
-
-ProgressBarDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JProgressBar-Komponente.
-ProgressBarDemo.tooltip=JProgressBar-Demo
-ProgressBarDemo.name=ProgressBar-Demo
-ProgressBarDemo.start_button=Laden von Text starten
-ProgressBarDemo.stop_button=Laden von Text stoppen
-ProgressBarDemo.accessible_text_loading_progress=Ladefortschritt f\u00FCr Text
-ProgressBarDemo.accessible_text_area_name=Text wird progressiv geladen
-
-ProgressBarDemo.accessible_text_area_description=Diese JTextArea-Komponente wird progressiv mit Text aus einem Puffer gef\u00FCllt (ein Buchstabe nach dem anderen). Dabei wird der Ladefortschritt im Fortschrittsbalken unten im Fenster angezeigt
-
-ProgressBarDemo.text=Man sagt ja, dass unendlich viele Affen, die unendlich lange auf unendlich vielen Schreibmaschinen herumtippen, \nirgendwann alle Meisterwerke der Menschheit schreiben w\u00FCrden. Mit den modernen Hochgeschwindigkeitsrechnern k\u00F6nnen wir \ndiese Theorie endlich testen... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\nNun, das war scheinbar eine gute Idee...
-
-
-### ScrollPane Demo ###
-
-ScrollPaneDemo.accessible_description=JScrollPane-Demo
-ScrollPaneDemo.name=Demo f\u00FCr Bildlaufbereich
-ScrollPaneDemo.tooltip=JScrollPane-Demo
-ScrollPaneDemo.crayons=Viele Stifte
-ScrollPaneDemo.colheader=Spaltenheader
-ScrollPaneDemo.rowheader=Zeilenheader
-ScrollPaneDemo.upperleft=Oben links
-ScrollPaneDemo.upperright=Oben rechts im Spaltenheader
-ScrollPaneDemo.lowerleft=Unten links im Spaltenheader
-
-
-### Slider Demo ###
-
-SliderDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JSlider-Komponente.
-SliderDemo.tooltip=JSlider-Demo
-SliderDemo.name=Schiebereglerdemo
-
-SliderDemo.slidervalue=Schiebereglerwert:
-SliderDemo.horizontal=Horizontal
-SliderDemo.vertical=Vertikal
-SliderDemo.plain=Einfach
-SliderDemo.a_plain_slider=Ein einfacher Schieberegler
-SliderDemo.majorticks=Grobteilungen
-SliderDemo.majorticksdescription=Ein Schieberegler mit Grobteilungsmarkierungen
-SliderDemo.ticks=Feinteilungen, Teilungen zum Einrasten und Labels
-SliderDemo.minorticks=Feinteilungen
-SliderDemo.minorticksdescription=Ein Schieberegler mit Grob- und Feinteilungen, mit Teilungen, in die der Schieberegler einrastet, wobei einige Teilungen mit einem sichtbaren Label versehen sind
-SliderDemo.disabled=Deaktiviert
-SliderDemo.disableddescription=Ein Schieberegler mit Grob- und Feinteilungen, der nicht aktiviert ist (kann nicht bearbeitet werden)
-
-### SplitPane Demo ###
-
-SplitPaneDemo.accessible_description=JSplitPane-Demo
-SplitPaneDemo.name=Teilbereichdemo
-SplitPaneDemo.tooltip=JSplitPane-Demo
-SplitPaneDemo.earth=Mutter Erde
-SplitPaneDemo.moon=Ein Astronaut auf dem Mond
-SplitPaneDemo.vert_split.labelAndMnemonic=&Vertikal geteilt
-SplitPaneDemo.horz_split.labelAndMnemonic=Ho&rizontal geteilt
-SplitPaneDemo.cont_layout.labelAndMnemonic=Kontinuierli&ches Layout
-SplitPaneDemo.one_touch_expandable.labelAndMnemonic=&Mit einer Ber\u00FChrung einblendbar
-SplitPaneDemo.divider_size.labelAndMnemonic=Trennliniengr\u00F6\u00DFe
-SplitPaneDemo.invalid_divider_size=Ung\u00FCltige Trennliniengr\u00F6\u00DFe
-SplitPaneDemo.error=Fehler
-SplitPaneDemo.first_component_min_size.labelAndMnemonic=M&indestgr\u00F6\u00DFe der ersten Komponente
-SplitPaneDemo.second_component_min_size.labelAndMnemonic=Mi&ndestgr\u00F6\u00DFe der zweiten Komponente
-SplitPaneDemo.invalid_min_size=Ung\u00FCltige Mindestgr\u00F6\u00DFe
-SplitPaneDemo.must_be_greater_than=muss gr\u00F6\u00DFer sein als
-
-
-### TabbedPane Demo ###
-
-TabbedPaneDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JTabbedPane-Komponente.
-TabbedPaneDemo.tooltip=JTabbedPane-Demo
-TabbedPaneDemo.name=TabbedPane-Demo
-
-TabbedPaneDemo.bounce=<html><font color=blue><bold><center>Bouncing Babies!</center></bold></font></html>
-TabbedPaneDemo.stephen=Stephen
-TabbedPaneDemo.david=David
-TabbedPaneDemo.matthew=Matthew
-TabbedPaneDemo.ewan=Ewan
-TabbedPaneDemo.blake=Blake
-TabbedPaneDemo.brooke=Brooke
-TabbedPaneDemo.laine=Laine
-TabbedPaneDemo.hania=Hania
-
-TabbedPaneDemo.label=Platzierung der Registerkarten:
-TabbedPaneDemo.top=Oben
-TabbedPaneDemo.bottom=Unten
-TabbedPaneDemo.left=Links
-TabbedPaneDemo.right=Rechts
-
-
-### Table Demo ###
-
-TableDemo.accessible_description=JTable-Demo
-TableDemo.name=Tabellendemo
-TableDemo.tooltip=JTable-Demo
-TableDemo.all_columns=Alle Spalten
-TableDemo.autoresize_mode=Modus "Automatische Skalierung"
-TableDemo.cell_selection=Zellenauswahl
-TableDemo.column_boundaries=Spaltengrenzen
-TableDemo.column_selection=Spaltenauswahl
-TableDemo.horz_lines=Horizontale Linien
-TableDemo.intercell_spacing=Abstand zwischen Zellen
-TableDemo.intercell_spacing_colon=Abstand zwischen Zellen:
-TableDemo.last_column=Letzte Spalte
-TableDemo.multiple_ranges=Mehrere Bereiche
-TableDemo.one_range=Ein Bereich
-TableDemo.reordering_allowed=Neuanordnung zul\u00E4ssig
-TableDemo.row_height=Zeilenh\u00F6he
-TableDemo.row_height_colon=Zeilenh\u00F6he:
-TableDemo.row_selection=Zeilenauswahl
-TableDemo.selection_mode=Auswahlmodus
-TableDemo.subsequent_columns=Nachfolgende Spalten
-TableDemo.vert_lines=Vertikale Linien
-TableDemo.single=Einzeln
-TableDemo.none=Kein Wert
-TableDemo.off=Deaktiviert
-TableDemo.first_name=Vorname
-TableDemo.last_name=Nachname
-TableDemo.favorite_color=Lieblingsfarbe
-TableDemo.favorite_food=Lieblingsessen
-TableDemo.favorite_movie=Lieblingsfilm
-TableDemo.favorite_number=Lieblingszahl
-TableDemo.aqua=Aquamarin
-TableDemo.beige=Beige
-TableDemo.black=Schwarz
-TableDemo.blue=Blau
-TableDemo.cybergreen=Gr\u00FCn
-TableDemo.darkgreen=Dunkelgr\u00FCn
-TableDemo.eblue=Neonblau
-TableDemo.jfcblue=JFC prim\u00E4r
-TableDemo.jfcblue2=JFC sekund\u00E4r
-TableDemo.forestgreen=Waldgr\u00FCn
-TableDemo.gray=Grau
-TableDemo.green=Gr\u00FCn
-TableDemo.orange=Orange
-TableDemo.purple=Lila
-TableDemo.red=Rot
-TableDemo.rustred=Rostrot
-TableDemo.sunpurple=Purpur
-TableDemo.suspectpink=Pink
-TableDemo.turquoise=T\u00FCrkis
-TableDemo.violet=Violett
-TableDemo.yellow=Gelb
-TableDemo.2001=2001: Odyssee im Weltraum
-TableDemo.buckaroo=Buckaroo Banzai - Die 8. Dimension
-TableDemo.firstsight=Auf den ersten Blick
-TableDemo.airplane=Die unglaubliche Reise in einem verr\u00FCckten Flugzeug (und Fortsetzung)
-TableDemo.aliens=Aliens - Die R\u00FCckkehr
-TableDemo.bicycle=Fahrraddiebe
-TableDemo.bladerunner=Blade Runner (Director's Cut)
-TableDemo.bluesbros=Blues Brothers
-TableDemo.brazil=Brazil
-TableDemo.bugs=Das gro\u00DFe Krabbeln
-TableDemo.city=Die Stadt der verlorenen Kinder
-TableDemo.chusingura=Chusingura (1962)
-TableDemo.clock=Uhrwerk Orange
-TableDemo.curse=Der Fluch des D\u00E4monen
-TableDemo.dasboot=Das Boot
-TableDemo.dazed=Confusion - Sommer der Ausgeflippten
-TableDemo.defending=Rendezvous im Jenseits
-TableDemo.eraserhead=Eraserhead
-TableDemo.fifthelement=Das f\u00FCnfte Element
-TableDemo.goodfellas=GoodFellas - Drei Jahrzehnte in der Mafia
-TableDemo.harold=Harold und Maude
-TableDemo.joyluck=T\u00F6chter des Himmels
-TableDemo.jules=Jules und Jim
-TableDemo.ladyvanishes=Eine Dame verschwindet
-TableDemo.mohicans=Der letzte Mohikaner
-TableDemo.lonestar=Lone Star
-TableDemo.man=Der Mann, der zuviel wusste
-TableDemo.musicman=Music Man
-TableDemo.dog=Mein Leben als Hund
-TableDemo.oncewest=Spiel mir das Lied vom Tod
-TableDemo.pulpfiction=Pulp Fiction
-TableDemo.raiders=J\u00E4ger des verlorenen Schatzes
-TableDemo.reservoir=Reservoir Dogs - Wilde Hunde
-TableDemo.repoman=Repoman
-TableDemo.spinaltap=This is Spinal Tap
-TableDemo.schindlerslist=Schindlers Liste
-TableDemo.starwars=Star Wars
-TableDemo.stuntman=Der lange Tod des Stuntman Cameron
-TableDemo.thinman=Der d\u00FCnne Mann
-TableDemo.withnail=Withnail && I
-TableDemo.labyrinth=Die Reise ins Labyrinth
-TableDemo.shawshank=Die Verurteilten
-TableDemo.apple=Apfel
-TableDemo.asparagus=Spargel
-TableDemo.banana=Banane
-TableDemo.broccoli=Brokkoli
-TableDemo.carrot=Karotte
-TableDemo.cantaloupe=Cantaloupe-Melone
-TableDemo.corn=Mais
-TableDemo.grapes=Trauben
-TableDemo.grapefruit=Grapefruit
-TableDemo.kiwi=Kiwi
-TableDemo.onion=Zwiebel
-TableDemo.pear=Birne
-TableDemo.peach=Pfirsich
-TableDemo.pepper=Rote Paprika
-TableDemo.pickle=Essiggurke
-TableDemo.pineapple=Ananas
-TableDemo.raspberry=Himbeere
-TableDemo.sparegrass=Gr\u00FCnzeug
-TableDemo.strawberry=Erdbeere
-TableDemo.tomato=Tomate
-TableDemo.watermelon=Wassermelone
-
-TableDemo.printing=Drucken
-TableDemo.fitWidth=Breite anpassen
-TableDemo.print=Drucken
-TableDemo.header=Header
-
-# This string will be formatted by a MessageFormat and
-# printed at the top of each page of the printed result.
-# You can use {0} to insert a page number.
-TableDemo.headerText=JTable-Druck
-
-TableDemo.footer=Footer
-
-# This string will be formatted by a MessageFormat and
-# printed at the bottom of each page of the printed result.
-# You can use {0} to insert a page number.
-TableDemo.footerText=Seite {0}
-
-TableDemo.printingResult=Druckergebnis
-TableDemo.printingComplete=Druck abgeschlossen
-TableDemo.printingCancelled=Druck abgebrochen
-
-# This string will be formatted by a MessageFormat and
-# and displayed when an exception occurs.
-# {0} is used to place details of the exception.
-TableDemo.printingFailed=Druck nicht erfolgreich: {0}
-
-
-### ToolTip Demo ###
-
-ToolTipDemo.accessible_description=QuickInfos zeigen kurze Hilfebeschreibungen f\u00FCr eine Komponente an
-ToolTipDemo.accessible_cow=Das ist eine Kuh.
-ToolTipDemo.tooltip=QuickInfo-Demo
-ToolTipDemo.name=QuickInfo-Demo
-ToolTipDemo.bessie=Bessie, die Kuh
-ToolTipDemo.cow=Kuh.
-ToolTipDemo.got_milk=Milch gef\u00E4llig?
-ToolTipDemo.tail=Schweif.
-ToolTipDemo.moo=Muuuh
-ToolTipDemo.tooltip_features=<html>QuickInfos m\u00FCssen nicht immer<p>langweilige, einzeilige Beschreibungen sein. Das <font color=blue size=+2>Swing!</font>-Team<p> zeigt Ihnen gerne, dass es auch anders geht.<p>In Swing k\u00F6nnen QuickInfos HTML f\u00FCr Folgendes verwenden: <ul><li>Listen<li><b>fettgedruckten</b> Text<li><em>betonten</em> Text<li>Text mit <font color=red>Farben</font><li>Text in unterschiedlichen <font size=+3>Gr\u00F6\u00DFen</font><li>und <font face=AvantGarde>Schriftarten</font></ul>Au\u00DFerdem k\u00F6nnen sie auch mehrere Zeilen umfassen.</html>
-
-
-### Tree Demo ###
-
-TreeDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung einer JTree-Komponente.
-TreeDemo.tooltip=JTree-Demo
-TreeDemo.name=Baumdemo
-TreeDemo.music=Musik
-
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
index ebb0409561b..bc6a24781e9 100644
--- a/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -316,7 +316,7 @@ FileChooserDemo.nofileselected=\u6700\u521D\u306B\u30D5\u30A1\u30A4\u30EB\u3092\
 FileChooserDemo.thefile=\u30D5\u30A1\u30A4\u30EB\u540D:
 FileChooserDemo.isprobably=\u306F\u304A\u305D\u3089\u304F\u753B\u50CF\u30C7\u30FC\u30BF\u3067\u3059\u3002
 
-FileChooserDemo.helptext=<html>\u691C\u7D22: \u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u307E\u3059\u3002<br>\u8A73\u7D30: \u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u3055\u3089\u306B\u5B66\u7FD2\u3057\u307E\u3059\u3002<br>OK: \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059\u3002<br>\u53D6\u6D88: \u4F55\u3082\u305B\u305A\u306B\u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u9589\u3058\u307E\u3059\u3002</html>
+FileChooserDemo.helptext=<html>\u691C\u7D22: \u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u307E\u3059\u3002<br>\u8A73\u7D30: \u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002<br>OK: \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059\u3002<br>\u53D6\u6D88: \u4F55\u3082\u305B\u305A\u306B\u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u9589\u3058\u307E\u3059\u3002</html>
 
 FileChooserDemo.findquestion=\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22:
 FileChooserDemo.findresponse=<html><center>\u3042\u306A\u305F\u3001\u672C\u5F53\u306B\u79C1\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u3066\u307B\u3057\u3044\u3068\u601D\u3063\u3066\u308B\u3093\u3067\u3059\u304B\u3002<br>\u305D\u3093\u306A\u3053\u3068\u3067\u304D\u306A\u3044\u3067\u3059\u3088\u3001\u3084\u308A\u65B9\u77E5\u3089\u306A\u3044\u3093\u3067\u3059\u304B\u3089\u3002\u79C1\u306F\u305F\u3060\u306E\u30C7\u30E2\u30FB\u30D7\u30ED\u30B0\u30E9\u30E0\u3067\u3059\u3088\u3002</center></html>
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
index 7edc4b16851..85c7ead75fb 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,21 +24,21 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Verwendung: {0} [Optionen] <Hauptklasse> [args...]\n           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [Optionen] -jar <JAR-Datei> [args...]\n           (zur Ausf\u00FChrung einer JAR-Datei)\n   oder  {0} [Optionen] -m <Modul>[/<Hauptklasse>] [args...]\n       {0} [Optionen] --module <Modul>[/<Hauptklasse>] [args...]\n            (zur Ausf\u00FChrung der Hauptklasse in einem Modul)\n   oder  {0} [Optionen] <Quelldatei> [args]\n           (zur Ausf\u00FChrung eines Programms mit einer einzelnen Quelldatei)\n\n Argumente, die auf die Hauptklasse, die Quelldatei, -jar <JAR-Datei>, -m oder --module\n <Modul>/<Hauptklasse> folgen, werden als Argumente f\u00FCr die\nHauptklasse \u00FCbergeben.\n\n Dabei umfasst "Optionen" Folgendes:\n\n
+java.launcher.opt.header  =   Verwendung: {0} [Optionen] <mainclass> [args...]\n           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [Optionen] -jar <jarfile> [args...]\n           (zur Ausf\u00FChrung einer JAR-Datei)\n   oder  {0} [Optionen] -m <module>[/<mainclass>] [args...]\n       {0} [Optionen] --module <module>[/<mainclass>] [args...]\n            (zur Ausf\u00FChrung der Hauptklasse in einem Modul)\n\n Argumente, die auf die Hauptklasse folgen, -jar <jarfile>, -m oder --module\n <module>/<mainclass> werden als Argumente f\u00FCr die Hauptklasse \u00FCbergeben.\n\n wobei "Optionen" Folgendes umfasst:\n\n
 
 java.launcher.opt.vmselect   =\    {0}\t  zur Auswahl der "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  ist ein Synonym f\u00FCr die "{1}" VM  [verworfen]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist, die upgradef\u00E4hige\n                  Module im Laufzeitimage ersetzen\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Module, die eingeschr\u00E4nkte native Vorg\u00E4nge ausf\u00FChren d\u00FCrfen.\n                  <Modulname> kann auch ALL-UNNAMED lauten.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe f\u00FCr das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  \
-L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    -disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  L\u00E4sst zu, das Klassen von Vorschaufeatures dieses Release abh\u00E4ngig sind\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
+java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist, die upgradef\u00E4hige\n                  Module im Laufzeitimage ersetzen\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Ausgabe im Verbose-Modus aktivieren\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch \
+unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    -disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           Deaktiviert die Hintergrundkompilierung\n    -Xbootclasspath/a:<durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      An das Ende des Bootstrap Classpaths anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt die Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug            F\u00FChrt nichts aus. Wird aus Gr\u00FCnden der Abw\u00E4rtskompatibilit\u00E4t bereitgestellt.\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden.\n    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option -version\n    -Xlog:<Optionen>      Konfiguriert oder aktiviert Logging mit dem einheitlichen Java Virtual\n                      Machine-(JVM-)Logging-Framework. Verwenden Sie -Xlog:help\n                      f\u00FCr weitere Einzelheiten.\n    -Xloggc:<Datei>    Protokolliert den GC-Status in einer Datei mit Zeitstempeln.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden. Wird durch -Xlog:gc:<Datei> ersetzt.\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs               Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet freigegebene Klassendaten, wenn m\u00F6glich (Standard)\n    -Xshare:off       Versucht nicht, freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung freigegebener Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n                      Diese Testoption kann zeitweise zu\n                      Fehlern f\u00FChren. Sie darf nicht in Produktionsumgebungen verwendet werden.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm\n                      Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:system\n                      (Nur Linux) Zeigt die Konfiguration des Hostsystems oder Containers an\n                      und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>        Legt die Stackgr\u00F6\u00DFe des Java-Threads fest\n    -Xverify          Legt den Modus der Bytecodeverifizierung fest\n                      Beachten Sie, dass die Option -Xverify:none veraltet ist und\n                      in einem zuk\u00FCnftigen Release entfernt werden kann.\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> gelesen wird, ungeachtet\n                      der Moduldeklaration. \n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in \
-<Zielmodul> zu exportieren,\n                      ungeachtet der Moduldeklaration.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in\n                      <Zielmodul> zu \u00F6ffnen, ungeachtet der Moduldeklaration.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                      \u00DCberschreibt oder erweitert ein Modul mit Klassen und Ressourcen\n                      in JAR-Dateien oder Verzeichnissen.\n    --source <Version>\n                      Legt die Version der Quelle im Quelldateimodus fest.\n    --finalization=<Wert>\n                      Steuert, ob die JVM Objekte finalisiert.\n                      Dabei ist <Wert> entweder "enabled" oder "disabled".\n                      Die Finalisierung ist standardm\u00E4\u00DFig aktiviert.\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
+java.launcher.X.usage=\n    -Xbatch           Deaktiviert Hintergrundkompilierung\n    -Xbootclasspath/a:<Durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      an Ende von Bootstrap Classpath anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug           Wird zur Abw\u00E4rtskompatibilit\u00E4t bereitgestellt\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, wird als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet\n    -Xint              Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option "-version"\n    -Xloggc:<Datei>    Protokolliert GC-Status in einer Datei mit Zeitstempeln\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und die maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs              Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet, wenn m\u00F6glich, freigegebene Klassendaten (Standard)\n    -Xshare:off       Versucht nicht freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung von freigegebenen Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>         Legt Stackgr\u00F6\u00DFe des Java-Threads fest\n    -Xverify           Legt den Modus der Bytecodeverifizierung fest\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> ungeachtet der\n                      Moduldeklaration gelesen wird.\n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration in <Zielmodul>\n                      zu exportieren.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration in\n                      <Zielmodul> zu \u00F6ffnen.\n    --illegal-access=<Wert>\n                      L\u00E4sst Zugriff f\u00FCr Mitglieder mit den Typen in den benannten Modulen\n                       nach Code in unbenannten Modulen zu oder lehnt ihn ab.\n                      <Wert> ist entweder "deny", "permit", "warn" oder "debug"\n                      Diese Option wird in einem zuk\u00FCnftigen Release entfernt.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                       \u00DCberschreibt oder erweitert ein Modul in JAR-Dateien\n                      oder -Verzeichnissen mit \
+Klassen und Ressourcen.\n    --disable-@files  Deaktiviert die weitere Erweiterung von Argumentdateien\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr macOS spezifisch:\n    -XstartOnFirstThread\n                      F\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit-)Thread aus\n    -Xdock:name=<Anwendungsname>\n                      Setzt den im Dock angezeigten Standardanwendungsnamen au\u00DFer Kraft\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Setzt das im Dock angezeigte Standardsymbol au\u00DFer Kraft\n\n
+java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n    -XstartOnFirstThread\n                      main()-Methode f\u00FCr den ersten (AppKit) Thread ausf\u00FChren\n    -Xdock:name=<application name>\n                      Den im Dock angezeigten Standardanwendungsnamen \u00FCberschreiben\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Das im Dock angezeigte Standardsymbol \u00FCberschreiben\n\n
 
 java.launcher.cls.error1=Fehler: Hauptklasse {0} konnte nicht gefunden oder geladen werden\nUrsache: {1}: {2}
 java.launcher.cls.error2=Fehler: Hauptmethode ist nicht {0} in Klasse {1}. Definieren Sie die Hauptmethode als:\n   public static void main(String[] args)
@@ -53,8 +53,8 @@ java.launcher.jar.error3=kein Hauptmanifestattribut, in {0}
 java.launcher.jar.error4=Fehler beim Laden des Java-Agents in {0}
 java.launcher.init.error=Initialisierungsfehler
 java.launcher.javafx.error1=Fehler: Die JavaFX-Methode launchApplication hat die falsche Signatur, sie\nmuss als statisch deklariert werden und einen Wert vom Typ VOID zur\u00FCckgeben
-java.launcher.module.error1=Modul {0} weist kein ModuleMainClass-Attribut auf. Verwenden Sie -m <module>/<main-class>
+java.launcher.module.error1=Modul {0} weist kein MainClass-Attribut auf. Verwenden Sie -m <module>/<main-class>
 java.launcher.module.error2=Fehler: Hauptklasse {0} konnte in Modul {1} nicht gefunden oder geladen werden
 java.launcher.module.error3=Fehler: Hauptklasse {0} kann nicht in Modul {1} geladen werden\n\t{2}
 java.launcher.module.error4={0} nicht gefunden
-java.launcher.module.error5=Fehler: Hauptklasse {0} kann nicht in Modul {1} initialisiert werden\nUrsache: {2}: {3}
+java.launcher.module.error5=Fehler: Hauptklasse {0} kann nicht in Modul {1} initialisiert werden\nUrsache: {1}: {2}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
index 542145ccbb0..32d28144dff 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
@@ -30,14 +30,14 @@ java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM\u3092\u9078\u629E\u3059\u308B
 java.launcher.opt.hotspot    =\    {0}\t  \u306F"{1}" VM\u306E\u30B7\u30CE\u30CB\u30E0\u3067\u3059  [\u975E\u63A8\u5968]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n    --upgrade-module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5236\u9650\u3055\u308C\u305F\u30CD\u30A4\u30C6\u30A3\u30D6\u64CD\u4F5C\u306E\u5B9F\u884C\u3092\u8A31\u53EF\u3055\u308C\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306FALL-UNNAMED\u306B\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \
-\u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  \
-(\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    -disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
+java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n    --upgrade-module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \
+\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  (\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \
+\u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    -disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3057\u307E\u3059\n    -Xcheck:jni       JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059\n    -Xcomp            \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3057\u307E\u3059\n    -Xdebug           \u4F55\u3082\u884C\u3044\u307E\u305B\u3093\u3002\u4E0B\u4F4D\u4E92\u63DB\u6027\u306E\u305F\u3081\u306B\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xdiag            \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059\n    -Xfuture          \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    -Xint             \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n    -Xinternalversion\n                      -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n                      \u8868\u793A\u3057\u307E\u3059\n    -Xlog:<opts>      Java Virtual Machine (JVM)\u7D71\u5408\u30ED\u30AE\u30F3\u30B0\u30FB\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3067\u306E\n                      \u30ED\u30AE\u30F3\u30B0\u3092\u69CB\u6210\u307E\u305F\u306F\u6709\u52B9\u5316\u3057\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-Xlog:help\u3092\n                      \u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n    -Xloggc:<file>    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002-Xlog:gc:<file>\u3067\u7F6E\u63DB\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xmixed           \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xmn<size>        \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u30B5\u30A4\u30BA\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA\n                      (\u30D0\u30A4\u30C8\u5358\u4F4D)\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xms<size>        Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xmx<size>        Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xnoclassgc       \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xrs              Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3057\u307E\u3059(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n    -Xshare:auto      \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xshare:off       \
-\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \
-\u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n    --finalization=<value>\n                      JVM\u304C\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\n                      <value>\u306F"enabled"\u307E\u305F\u306F"disabled"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n                      \u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
+\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --illegal-access=<value>\n                      \
+\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30B3\u30FC\u30C9\u306B\u3088\u308B\u3001\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30BF\u30A4\u30D7\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u4E0D\u6B63\u30A2\u30AF\u30BB\u30B9\u3092\n                      \u8A31\u53EF\u307E\u305F\u306F\u62D2\u5426\u3057\u307E\u3059\u3002\n                      <value>\u306F"deny"\u3001"permit"\u3001"warn"\u307E\u305F\u306F"debug"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FmacOS\u56FA\u6709\u3067\u3059:\n    -XstartOnFirstThread\n                      main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n    -Xdock:name=<application name>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n    -Xdock:icon=<path to icon file>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
index 35ec035c8d7..cdf9e09633d 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
@@ -30,12 +30,12 @@ java.launcher.opt.vmselect   =\    {0}\t  \u9009\u62E9 "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  \u662F "{1}" VM \u7684\u540C\u4E49\u8BCD [\u5DF2\u8FC7\u65F6]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n                  \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5141\u8BB8\u6267\u884C\u53D7\u9650\u672C\u673A\u64CD\u4F5C\u7684\u6A21\u5757\u3002\n                  <module name> \u8FD8\u53EF\u4EE5\u4E3A ALL-UNNAMED\u3002\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \
-\u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    -disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
+java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n                  \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \
+\u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    -disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n    -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n    -Xcheck:jni       \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n    -Xcomp            \u5F3A\u5236\u5728\u9996\u6B21\u8C03\u7528\u65F6\u7F16\u8BD1\u65B9\u6CD5\n    -Xdebug           \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C\u3002\u4E3A\u5B9E\u73B0\u5411\u540E\u517C\u5BB9\u800C\u63D0\u4F9B\u3002\n    -Xdiag            \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n    -Xfuture          \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5\uFF0C\u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    -Xint             \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n    -Xinternalversion\n                      \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684\n                      JVM \u7248\u672C\u4FE1\u606F\n    -Xlog:<opts>      \u914D\u7F6E\u6216\u542F\u7528\u91C7\u7528 Java \u865A\u62DF\n                      \u673A (Java Virtual Machine, JVM) \u7EDF\u4E00\u8BB0\u5F55\u6846\u67B6\u8FDB\u884C\u4E8B\u4EF6\u8BB0\u5F55\u3002\u4F7F\u7528 -Xlog:help\n                      \u53EF\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002\n    -Xloggc:<file>    \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D\uFF08\u5E26\u65F6\u95F4\u6233\uFF09\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u5C06\u6765\u7684\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\u5B83\u5C06\u66FF\u6362\u4E3A -Xlog:gc:<file>\u3002\n    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u6267\u884C\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xmn<size>        \u4E3A\u5E74\u8F7B\u4EE3\uFF08\u65B0\u751F\u4EE3\uFF09\u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n                      \uFF08\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D\uFF09\n    -Xms<size>        \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n    -Xmx<size>        \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n    -Xnoclassgc       \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n    -Xrs              \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528\uFF08\u8BF7\u53C2\u89C1\u6587\u6863\uFF09\n    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xshare:off       \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n    -Xshare:on        \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF0C\u5426\u5219\u5C06\u5931\u8D25\u3002\n                      \u8FD9\u662F\u4E00\u4E2A\u6D4B\u8BD5\u9009\u9879\uFF0C\u53EF\u80FD\u5BFC\u81F4\u95F4\u6B47\u6027\n                      \u6545\u969C\u3002\u4E0D\u5E94\u5728\u751F\u4EA7\u73AF\u5883\u4E2D\u4F7F\u7528\u5B83\u3002\n    -XshowSettings    \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:all\n                      \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:locale\n                      \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:properties\n                      \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:vm\n                      \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:system\n                      \uFF08\u4EC5 Linux\uFF09\u663E\u793A\u4E3B\u673A\u7CFB\u7EDF\u6216\u5BB9\u5668\n                      \u914D\u7F6E\u5E76\u7EE7\u7EED\n    -Xss<size>        \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n    -Xverify          \
-\u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n    --finalization=<value>\n                      \u63A7\u5236 JVM \u662F\u5426\u6267\u884C\u5BF9\u8C61\u6700\u7EC8\u5904\u7406\uFF0C\n                      \u5176\u4E2D <value> \u4E3A "enabled" \u6216 "disabled" \u4E4B\u4E00\u3002\n                      \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6700\u7EC8\u5904\u7406\u5904\u4E8E\u542F\u7528\u72B6\u6001\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+\u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --illegal-access=<value>\n                      \u5141\u8BB8\u6216\u62D2\u7EDD\u901A\u8FC7\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u4EE3\u7801\u5BF9\u547D\u540D\u6A21\u5757\u4E2D\u7684\n                      \u7C7B\u578B\u6210\u5458\u8FDB\u884C\u8BBF\u95EE\u3002\n                      <value> \u4E3A "deny"\u3001"permit"\u3001"warn" \u6216 "debug" \u4E4B\u4E00\n                      \u6B64\u9009\u9879\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u662F\u7279\u5B9A\u4E8E macOS \u7684\u9009\u9879\uFF1A\n    -XstartOnFirstThread\n                      \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n    -Xdock:name=<application name>\n                      \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n    -Xdock:icon=<path to icon file>\n                     \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
index 5479bc1df2d..24cdbabc3a8 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,15 +45,15 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"option.1.set.twice", "Die Option %s wurde mehrmals angegeben. Alle Angaben bis auf die letzte werden ignoriert."},
         {"multiple.commands.1.2", "Nur ein Befehl ist zul\u00E4ssig: Sowohl %1$s als auch %2$s wurden angegeben."},
         {"Use.keytool.help.for.all.available.commands",
-                 "Verwenden Sie \"keytool -?, -h, or --help\" f\u00FCr diese Hilfemeldung"},
+                 "\"keytool -help\" f\u00FCr alle verf\u00FCgbaren Befehle verwenden"},
         {"Key.and.Certificate.Management.Tool",
                  "Schl\u00FCssel- und Zertifikatsverwaltungstool"},
         {"Commands.", "Befehle:"},
         {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Verwenden Sie \"keytool -command_name --help\" f\u00FCr die Verwendung von command_name.\nVerwenden Sie die Option -conf <url>, um eine vorkonfigurierte Optionsdatei anzugeben."},
+                "Verwenden Sie \"keytool -command_name -help\" f\u00FCr die Verwendung von command_name.\nVerwenden Sie die Option -conf <url>, um eine vorkonfigurierte Optionsdatei anzugeben."},
         // keytool: help: commands
         {"Generates.a.certificate.request",
-                "Generiert eine Zertifikatsanforderung"}, //-certreq
+                "Generiert eine Zertifikatanforderung"}, //-certreq
         {"Changes.an.entry.s.alias",
                 "\u00C4ndert den Alias eines Eintrags"}, //-changealias
         {"Deletes.an.entry",
@@ -65,7 +65,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Generates.a.secret.key",
                 "Generiert einen Secret Key"}, //-genseckey
         {"Generates.certificate.from.a.certificate.request",
-                "Generiert ein Zertifikat aus einer Zertifikatsanforderung"}, //-gencert
+                "Generiert ein Zertifikat aus einer Zertifikatanforderung"}, //-gencert
         {"Generates.CRL", "Generiert eine CRL"}, //-gencrl
         {"Generated.keyAlgName.secret.key",
                 "{0} Secret Key generiert"}, //-genseckey
@@ -88,25 +88,20 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Prints.the.content.of.a.certificate",
                 "Druckt den Content eines Zertifikats"}, //-printcert
         {"Prints.the.content.of.a.certificate.request",
-                "Druckt den Content einer Zertifikatsanforderung"}, //-printcertreq
+                "Druckt den Content einer Zertifikatanforderung"}, //-printcertreq
         {"Prints.the.content.of.a.CRL.file",
                 "Druckt den Content einer CRL-Datei"}, //-printcrl
         {"Generates.a.self.signed.certificate",
                 "Generiert ein selbst signiertes Zertifikat"}, //-selfcert
         {"Changes.the.store.password.of.a.keystore",
                 "\u00C4ndert das Speicherkennwort eines Keystores"}, //-storepasswd
-        {"showinfo.command.help", "Zeigt sicherheitsbezogene Informationen an"},
-        {"Prints.the.program.version", "Gibt die Programmversion aus"},
-
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
                 "Aliasname des zu verarbeitenden Eintrags"}, //-alias
-        {"groupname.option.help",
-                "Gruppenname. Beispiel: der Name der elliptischen Kurve."}, //-groupname
         {"destination.alias",
                 "Zielalias"}, //-destalias
         {"destination.key.password",
-                "Zielschl\u00FCsselkennwort"}, //-destkeypass
+                "Zielschl\u00FCssel-Kennwort"}, //-destkeypass
         {"destination.keystore.name",
                 "Ziel-Keystore-Name"}, //-destkeystore
         {"destination.keystore.password.protected",
@@ -143,7 +138,6 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Kein Prompt"}, //-noprompt
         {"password.through.protected.mechanism",
                 "Kennwort \u00FCber gesch\u00FCtzten Mechanismus"}, //-protected
-        {"tls.option.help", "Zeigt TLS-Konfigurationsinformationen an"},
 
         // The following 2 values should span 2 lines, the first for the
         // option itself, the second for its -providerArg value.
@@ -160,14 +154,10 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Ausgabe in RFC-Stil"}, //-rfc
         {"signature.algorithm.name",
                 "Signaturalgorithmusname"}, //-sigalg
-        {"signer.alias",
-                "Signaturgeberalias"}, //-signer
-        {"signer.key.password",
-                "Signaturgeber-Schl\u00FCsselkennwort"}, //-signerkeypass
         {"source.alias",
                 "Quellalias"}, //-srcalias
         {"source.key.password",
-                "Quellschl\u00FCsselkennwort"}, //-srckeypass
+                "Quellschl\u00FCssel-Kennwort"}, //-srckeypass
         {"source.keystore.name",
                 "Quell-Keystore-Name"}, //-srckeystore
         {"source.keystore.password.protected",
@@ -183,7 +173,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"signed.jar.file",
                 "Signierte JAR-Datei"}, //=jarfile
         {"certificate.validity.start.date.time",
-                "Startdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
+                "Anfangsdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
         {"keystore.password",
                 "Keystore-Kennwort"}, //-storepass
         {"keystore.type",
@@ -198,8 +188,8 @@ public class Resources_de extends java.util.ListResourceBundle {
                  "Serielle ID des zu entziehenden Certs"}, //-id
         // keytool: Running part
         {"keytool.error.", "Keytool-Fehler: "},
-        {"Illegal.option.", "Unzul\u00E4ssige Option:  "},
-        {"Illegal.value.", "Unzul\u00E4ssiger Wert: "},
+        {"Illegal.option.", "Ung\u00FCltige Option:  "},
+        {"Illegal.value.", "Ung\u00FCltiger Wert: "},
         {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
         {"Cannot.find.environment.variable.",
                 "Umgebungsvariable kann nicht gefunden werden: "},
@@ -227,7 +217,7 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
         {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
                 "Wenn der Quell-Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
-        {"Illegal.startdate.value", "Unzul\u00E4ssiger Wert f\u00FCr Startdatum"},
+        {"Illegal.startdate.value", "Ung\u00FCltiger Wert f\u00FCr Anfangsdatum"},
         {"Validity.must.be.greater.than.zero",
                 "G\u00FCltigkeit muss gr\u00F6\u00DFer als null sein"},
         {"provclass.not.a.provider", "%s kein Provider"},
@@ -258,6 +248,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Keystore.password.is.too.short.must.be.at.least.6.characters",
          "Keystore-Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
         {"Unknown.Entry.Type", "Unbekannter Eintragstyp"},
+        {"Too.many.failures.Alias.not.changed", "Zu viele Fehler. Alias nicht ge\u00E4ndert"},
         {"Entry.for.alias.alias.successfully.imported.",
                  "Eintrag f\u00FCr Alias {0} erfolgreich importiert."},
         {"Entry.for.alias.alias.not.imported.", "Eintrag f\u00FCr Alias {0} nicht importiert."},
@@ -280,9 +271,9 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Certificate.stored.in.file.filename.",
                 "Zertifikat in Datei <{0}> gespeichert"},
         {"Certificate.reply.was.installed.in.keystore",
-                "Zertifikatsantwort wurde in Keystore installiert"},
+                "Zertifikatantwort wurde in Keystore installiert"},
         {"Certificate.reply.was.not.installed.in.keystore",
-                "Zertifikatsantwort wurde nicht in Keystore installiert"},
+                "Zertifikatantwort wurde nicht in Keystore installiert"},
         {"Certificate.was.added.to.keystore",
                 "Zertifikat wurde Keystore hinzugef\u00FCgt"},
         {"Certificate.was.not.added.to.keystore",
@@ -296,16 +287,10 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Alias <{0}> ist nicht vorhanden"},
         {"Alias.alias.has.no.certificate",
                 "Alias <{0}> hat kein Zertifikat"},
-        {"groupname.keysize.coexist",
-                "Es k\u00F6nnen nicht sowohl -groupname als auch -keysize angegeben werden"},
-        {"deprecate.keysize.for.ec",
-                "Das Angeben von -keysize zum Generieren von EC-Schl\u00FCsseln ist veraltet. Verwenden Sie stattdessen \"-groupname %s\"."},
         {"Key.pair.not.generated.alias.alias.already.exists",
                 "Schl\u00FCsselpaar wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und selbst signiertem Zertifikat ({2}) mit einer G\u00FCltigkeit von {3} Tagen\n\tf\u00FCr: {4}"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
-                "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und Zertifikat ({2}), ausgestellt von <{3}>, mit einer G\u00FCltigkeit von {4} Tagen\n\tf\u00FCr: {5}"},
         {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}> eingeben"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(RETURN, wenn identisch mit Keystore-Kennwort):  "},
@@ -318,8 +303,12 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Password.is.too.short.must.be.at.least.6.characters",
                 "Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
         {"Too.many.failures.Key.entry.not.cloned",
-                "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geklont"},
+                "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geclont"},
         {"key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}>"},
+        {"Keystore.entry.for.id.getName.already.exists",
+                "Keystore-Eintrag f\u00FCr <{0}> bereits vorhanden"},
+        {"Creating.keystore.entry.for.id.getName.",
+                "Keystore-Eintrag f\u00FCr <{0}> wird erstellt..."},
         {"No.entries.from.identity.database.added",
                 "Keine Eintr\u00E4ge aus Identity-Datenbank hinzugef\u00FCgt"},
         {"Alias.name.alias", "Aliasname: {0}"},
@@ -357,6 +346,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
                 "M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]:  "},
         {"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]:  "},
+        {"YES", "JA"},
         {"New.prompt.", "Neues {0}: "},
         {"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"},
         {"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "},
@@ -389,14 +379,15 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Alias.alias.has.no.key",
                 "Alias <{0}> verf\u00FCgt \u00FCber keinen Schl\u00FCssel"},
         {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "Alias <{0}> verweist auf einen Eintragstyp, der kein Private-Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Klonen von Private-Key-Eintr\u00E4gen"},
+                 "Alias <{0}> verweist auf einen Eintragstyp, der kein Private Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Klonen von Private Key-Eintr\u00E4gen"},
 
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "Signaturgeber #%d:"},
-        {"Certificate.d.", "Zertifikat #%d:"},
         {"Timestamp.", "Zeitstempel:"},
-        {"Certificate.owner.", "Zertifikatseigent\u00FCmer: "},
+        {"Signature.", "Signatur:"},
+        {"CRLs.", "CRLs:"},
+        {"Certificate.owner.", "Zertifikateigent\u00FCmer: "},
         {"Not.a.signed.jar.file", "Keine signierte JAR-Datei"},
         {"No.certificate.from.the.SSL.server",
                 "Kein Zertifikat vom SSL-Server"},
@@ -407,17 +398,20 @@ public class Resources_de extends java.util.ListResourceBundle {
             "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben.                  *"},
 
         {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "Zertifikatsantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
+                "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
         {"Incomplete.certificate.chain.in.reply",
                 "Unvollst\u00E4ndige Zertifikatskette in Antwort"},
+        {"Certificate.chain.in.reply.does.not.verify.",
+                "Zertifikatskette in Antwort verifiziert nicht: "},
         {"Top.level.certificate.in.reply.",
                 "Zertifikat der obersten Ebene in Antwort:\n"},
         {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
         {"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]:  "},
+        {"NO", "NEIN"},
         {"Public.keys.in.reply.and.keystore.don.t.match",
                 "Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"},
         {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "Zertifikatsantwort und Zertifikat in Keystore sind identisch"},
+                "Zertifikatantwort und Zertifikat in Keystore sind identisch"},
         {"Failed.to.establish.chain.from.reply",
                 "Kette konnte der Antwort nicht entnommen werden"},
         {"n", "N"},
@@ -425,12 +419,10 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Secret.key.not.generated.alias.alias.already.exists",
                 "Secret Key wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
         {"Please.provide.keysize.for.secret.key.generation",
-                "Geben Sie -keysize zum Erstellen eines Secret Key an"},
+                "Geben Sie -keysize zum Erstellen eines Secret Keys an"},
 
         {"warning.not.verified.make.sure.keystore.is.correct",
             "WARNUNG: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist."},
-        {"warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts",
-            "Warnung: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist, oder geben Sie -trustcacerts an."},
 
         {"Extensions.", "Erweiterungen: "},
         {".Empty.value.", "(Leerer Wert)"},
@@ -447,43 +439,34 @@ public class Resources_de extends java.util.ListResourceBundle {
 
         // 8171319: keytool should print out warnings when reading or
         // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "Die Zertifikatsanforderung"},
+        {"the.certificate.request", "Die Zertifikatanforderung"},
         {"the.issuer", "Der Aussteller"},
         {"the.generated.certificate", "Das generierte Zertifikat"},
         {"the.generated.crl", "Die generierte CRL"},
-        {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"},
+        {"the.generated.certificate.request", "Die generierte Zertifikatanforderung"},
         {"the.certificate", "Das Zertifikat"},
         {"the.crl", "Die CRL"},
         {"the.tsa.certificate", "Das TSA-Zertifikat"},
         {"the.input", "Die Eingabe"},
         {"reply", "Antwort"},
         {"one.in.many", "%1$s #%2$d von %3$d"},
-        {"one.in.many1", "%1$s #%2$d"},
-        {"one.in.many2", "%1$s von Signaturgeber #%2$d"},
-        {"one.in.many3", "%1$s #%2$d von Signaturgeber #%3$d"},
         {"alias.in.cacerts", "Aussteller <%s> in cacerts"},
         {"alias.in.keystore", "Aussteller <%s>"},
         {"with.weak", "%s (schwach)"},
-        {"with.disabled", "%s (deaktiviert)"},
         {"key.bit", "%1$d-Bit-%2$s-Schl\u00FCssel"},
         {"key.bit.weak", "%1$d-Bit-%2$s-Schl\u00FCssel (schwach)"},
-        {"key.bit.disabled", "%1$d-Bit-%2$s-Schl\u00FCssel (deaktiviert)"},
-        {"unknown.size.1", "%s-Schl\u00FCssel mit unbekannter Gr\u00F6\u00DFe"},
+        {"unknown.size.1", "unbekannte Gr\u00F6\u00DFe: %s-Schl\u00FCssel"},
         {".PATTERN.printX509Cert.with.weak",
-                "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic-Key-Algorithmus von Subject: {8}\nVersion: {9}"},
+                "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic Key-Algorithmus von Subject: {8}\nVersion: {9}"},
         {"PKCS.10.with.weak",
-                "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
+                "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
         {"verified.by.s.in.s.weak", "Von %1$s in %2$s mit %3$s verifiziert"},
-        {"whose.sigalg.disabled", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
-        {"whose.sigalg.weak", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"whose.key.disabled", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
-        {"whose.key.weak", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko. Diese Schl\u00FCsselgr\u00F6\u00DFe wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"whose.sigalg.risk", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."},
+        {"whose.key.risk", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko."},
         {"jks.storetype.warning", "Der %1$s-Keystore verwendet ein propriet\u00E4res Format. Es wird empfohlen, auf PKCS12 zu migrieren, das ein Industriestandardformat mit \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" ist."},
         {"migrate.keystore.warning", "\"%1$s\" zu %4$s migriert. Der %2$s-Keystore wurde als \"%3$s\" gesichert."},
         {"backup.keystore.warning", "Der urspr\u00FCngliche Keystore \"%1$s\" wird als \"%3$s\" gesichert..."},
         {"importing.keystore.status", "Keystore %1$s wird in %2$s importiert..."},
-        {"keyalg.option.missing.error", "Die Option -keyalg muss angegeben werden."},
-        {"showinfo.no.option", "Fehlende Option f\u00FCr -showinfo. Verwenden Sie keytool -showinfo -tls."},
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
index 43acdf4f2d3..49980f3c480 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"Changes.the.store.password.of.a.keystore",
                 "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-storepasswd
         {"showinfo.command.help", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u95A2\u9023\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059"},
-        {"Prints.the.program.version", "\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059"},
 
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
@@ -160,10 +159,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "RFC\u30B9\u30BF\u30A4\u30EB\u306E\u51FA\u529B"}, //-rfc
         {"signature.algorithm.name",
                 "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-sigalg
-        {"signer.alias",
-                "\u7F72\u540D\u8005\u306E\u5225\u540D"}, //-signer
-        {"signer.key.password",
-                "\u7F72\u540D\u8005\u306E\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-signerkeypass
         {"source.alias",
                 "\u30BD\u30FC\u30B9\u5225\u540D"}, //-srcalias
         {"source.key.password",
@@ -304,8 +299,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u30AD\u30FC\u30FB\u30DA\u30A2\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "{3}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u306E\u30AD\u30FC\u30FB\u30DA\u30A2\u3068\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {4}"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
-                "{4}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u30AD\u30FC\u30FB\u30DA\u30A2\u3068<{3}>\u306B\u3088\u3063\u3066\u767A\u884C\u3055\u308C\u308B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {5}"},
         {"Enter.key.password.for.alias.", "<{0}>\u306E\u30AD\u30FC\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044):  "},
@@ -394,8 +387,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"},
-        {"Certificate.d.", "\u8A3C\u660E\u66F8#%d:"},
         {"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"},
+        {"Signature.", "\u7F72\u540D:"},
         {"Certificate.owner.", "\u8A3C\u660E\u66F8\u306E\u6240\u6709\u8005: "},
         {"Not.a.signed.jar.file", "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
         {"No.certificate.from.the.SSL.server",
@@ -458,9 +451,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"the.input", "\u5165\u529B"},
         {"reply", "\u5FDC\u7B54"},
         {"one.in.many", "%1$s #%2$d / %3$d"},
-        {"one.in.many1", "%1$s #%2$d"},
-        {"one.in.many2", "\u7F72\u540D\u8005\u306E%1$s #%2$d"},
-        {"one.in.many3", "\u7F72\u540D\u8005\u306E%1$s #%2$d #%3$d"},
         {"alias.in.cacerts", "cacerts\u5185\u306E\u767A\u884C\u8005<%s>"},
         {"alias.in.keystore", "\u767A\u884C\u8005<%s>"},
         {"with.weak", "%s (\u5F31)"},
@@ -483,6 +473,7 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"backup.keystore.warning", "\u5143\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\"%1$s\"\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059..."},
         {"importing.keystore.status", "\u30AD\u30FC\u30B9\u30C8\u30A2%1$s\u3092%2$s\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059..."},
         {"keyalg.option.missing.error", "-keyalg\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
+
         {"showinfo.no.option", "-showinfo\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093\u3002\"keytool -showinfo -tls\"\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
     };
 
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
index 520c55796ef..dfe71431c28 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"Changes.the.store.password.of.a.keystore",
                 "\u66F4\u6539\u5BC6\u94A5\u5E93\u7684\u5B58\u50A8\u53E3\u4EE4"}, //-storepasswd
         {"showinfo.command.help", "\u663E\u793A\u5B89\u5168\u76F8\u5173\u4FE1\u606F"},
-        {"Prints.the.program.version", "\u8F93\u51FA\u7A0B\u5E8F\u7248\u672C"},
 
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
@@ -160,10 +159,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u4EE5 RFC \u6837\u5F0F\u8F93\u51FA"}, //-rfc
         {"signature.algorithm.name",
                 "\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0"}, //-sigalg
-        {"signer.alias",
-                "\u7B7E\u540D\u8005\u522B\u540D"}, //-signer
-        {"signer.key.password",
-                "\u7B7E\u540D\u8005\u5BC6\u94A5\u5BC6\u7801"}, //-signerkeypass
         {"source.alias",
                 "\u6E90\u522B\u540D"}, //-srcalias
         {"source.key.password",
@@ -304,8 +299,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u672A\u751F\u6210\u5BC6\u94A5\u5BF9, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D{1}\u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({2}) (\u6709\u6548\u671F\u4E3A {3} \u5929):\n\t {4}"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
-                "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D {1} \u5BC6\u94A5\u5BF9\u548C\u7531 <{3}> \u9881\u53D1\u7684\u8BC1\u4E66 ({2})\uFF08\u6709\u6548\u671F\u4E3A {4} \u5929\uFF09\uFF1A\n\t {5}"},
         {"Enter.key.password.for.alias.", "\u8F93\u5165 <{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(\u5982\u679C\u548C\u5BC6\u94A5\u5E93\u53E3\u4EE4\u76F8\u540C, \u6309\u56DE\u8F66):  "},
@@ -394,8 +387,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "\u7B7E\u540D\u8005 #%d:"},
-        {"Certificate.d.", "\u8BC1\u4E66 #%d\uFF1A"},
         {"Timestamp.", "\u65F6\u95F4\u6233:"},
+        {"Signature.", "\u7B7E\u540D:"},
         {"Certificate.owner.", "\u8BC1\u4E66\u6240\u6709\u8005: "},
         {"Not.a.signed.jar.file", "\u4E0D\u662F\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"},
         {"No.certificate.from.the.SSL.server",
@@ -458,9 +451,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"the.input", "\u8F93\u5165"},
         {"reply", "\u56DE\u590D"},
         {"one.in.many", "%1$s #%2$d/%3$d"},
-        {"one.in.many1", "%1$s #%2$d"},
-        {"one.in.many2", "\u7B7E\u540D\u8005 #%2$d \u7684 %1$s"},
-        {"one.in.many3", "\u7B7E\u540D\u8005 #%3$d \u7684 %1$s #%2$d"},
         {"alias.in.cacerts", "cacerts \u4E2D\u7684\u53D1\u5E03\u8005 <%s>"},
         {"alias.in.keystore", "\u53D1\u5E03\u8005 <%s>"},
         {"with.weak", "%s (\u5F31)"},
@@ -483,6 +473,7 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"backup.keystore.warning", "\u5DF2\u5C06\u539F\u59CB\u5BC6\u94A5\u5E93 \"%1$s\" \u5907\u4EFD\u4E3A \"%3$s\"..."},
         {"importing.keystore.status", "\u6B63\u5728\u5C06\u5BC6\u94A5\u5E93 %1$s \u5BFC\u5165\u5230 %2$s..."},
         {"keyalg.option.missing.error", "\u5FC5\u987B\u6307\u5B9A -keyalg \u9009\u9879\u3002"},
+
         {"showinfo.no.option", "-showinfo \u7F3A\u5C11\u9009\u9879\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 \"keytool -showinfo -tls\"\u3002"},
     };
 
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_de.java b/src/java.base/share/classes/sun/security/util/AuthResources_de.java
index 03b919626de..9775c7e4456 100644
--- a/src/java.base/share/classes/sun/security/util/AuthResources_de.java
+++ b/src/java.base/share/classes/sun/security/util/AuthResources_de.java
@@ -88,7 +88,7 @@ public class AuthResources_de extends java.util.ListResourceBundle {
         {"Keystore.alias.","Keystore-Alias: "},
         {"Keystore.password.","Keystore-Kennwort: "},
         {"Private.key.password.optional.",
-            "Private-Key-Kennwort (optional): "},
+            "Private Key-Kennwort (optional): "},
 
         // com.sun.security.auth.module.Krb5LoginModule
         {"Kerberos.username.defUsername.",
diff --git a/src/java.base/share/classes/sun/security/util/Resources_de.java b/src/java.base/share/classes/sun/security/util/Resources_de.java
index 57e2c8da863..c36e24ac584 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_de.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,8 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Subject.", "Subjekt:\n"},
         {".Principal.", "\tPrincipal: "},
         {".Public.Credential.", "\t\u00D6ffentliche Zugangsdaten: "},
+        {".Private.Credentials.inaccessible.",
+                "\tKein Zugriff auf private Zugangsdaten\n"},
         {".Private.Credential.", "\tPrivate Zugangsdaten: "},
         {".Private.Credential.inaccessible.",
                 "\tKein Zugriff auf private Zugangsdaten\n"},
@@ -87,6 +89,16 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Ung\u00FCltiger Nullwert f\u00FCr CallbackHandler angegeben"},
         {"null.subject.logout.called.before.login",
                 "Nullsubjekt - Abmeldung vor Anmeldung aufgerufen"},
+        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
+                "LoginModule {0} kann nicht instanziiert werden, da es keinen argumentlosen Constructor angibt"},
+        {"unable.to.instantiate.LoginModule",
+                "LoginModule kann nicht instanziiert werden"},
+        {"unable.to.instantiate.LoginModule.",
+                "LoginModule kann nicht instanziiert werden: "},
+        {"unable.to.find.LoginModule.class.",
+                "LoginModule-Klasse kann nicht gefunden werden: "},
+        {"unable.to.access.LoginModule.",
+                "Kein Zugriff auf LoginModule m\u00F6glich: "},
         {"Login.Failure.all.modules.ignored",
                 "Anmeldefehler: Alle Module werden ignoriert"},
 
@@ -138,6 +150,11 @@ public class Resources_de extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "Kennwort f\u00FCr PKCS11-Token [{0}]: "},
+
+        /* --- DEPRECATED --- */
+        // javax.security.auth.Policy
+        {"unable.to.instantiate.Subject.based.policy",
+                "Subjektbasierte Policy kann nicht instanziiert werden"}
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/util/Resources_ja.java b/src/java.base/share/classes/sun/security/util/Resources_ja.java
index 1293a48aabc..195d71010a6 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_ja.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_ja.java
@@ -66,6 +66,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"Subject.", "\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8:\n"},
         {".Principal.", "\t\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB: "},
         {".Public.Credential.", "\t\u516C\u958B\u8CC7\u683C: "},
+        {".Private.Credentials.inaccessible.",
+                "\t\u975E\u516C\u958B\u8CC7\u683C\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n"},
         {".Private.Credential.", "\t\u975E\u516C\u958B\u8CC7\u683C: "},
         {".Private.Credential.inaccessible.",
                 "\t\u975E\u516C\u958B\u8CC7\u683C\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n"},
@@ -87,6 +89,16 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u7121\u52B9\u306Anull CallbackHandler\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
         {"null.subject.logout.called.before.login",
                 "null\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8 - \u30ED\u30B0\u30A4\u30F3\u3059\u308B\u524D\u306B\u30ED\u30B0\u30A2\u30A6\u30C8\u304C\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F"},
+        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
+                "LoginModule {0}\u306F\u5F15\u6570\u3092\u53D6\u3089\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u6307\u5B9A\u3067\u304D\u306A\u3044\u305F\u3081\u3001\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"},
+        {"unable.to.instantiate.LoginModule",
+                "LoginModule\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"},
+        {"unable.to.instantiate.LoginModule.",
+                "LoginModule\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093: "},
+        {"unable.to.find.LoginModule.class.",
+                "LoginModule\u30AF\u30E9\u30B9\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093: "},
+        {"unable.to.access.LoginModule.",
+                "LoginModule\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: "},
         {"Login.Failure.all.modules.ignored",
                 "\u30ED\u30B0\u30A4\u30F3\u5931\u6557: \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u7121\u8996\u3055\u308C\u307E\u3059"},
 
@@ -138,6 +150,11 @@ public class Resources_ja extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "PKCS11\u30C8\u30FC\u30AF\u30F3[{0}]\u30D1\u30B9\u30EF\u30FC\u30C9: "},
+
+        /* --- DEPRECATED --- */
+        // javax.security.auth.Policy
+        {"unable.to.instantiate.Subject.based.policy",
+                "\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u30FB\u30D9\u30FC\u30B9\u306E\u30DD\u30EA\u30B7\u30FC\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"}
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
index 5376ff5efd3..35d648bd3a4 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
@@ -66,6 +66,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"Subject.", "\u4E3B\u4F53: \n"},
         {".Principal.", "\t\u4E3B\u7528\u6237: "},
         {".Public.Credential.", "\t\u516C\u5171\u8EAB\u4EFD\u8BC1\u660E: "},
+        {".Private.Credentials.inaccessible.",
+                "\t\u65E0\u6CD5\u8BBF\u95EE\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E\n"},
         {".Private.Credential.", "\t\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E: "},
         {".Private.Credential.inaccessible.",
                 "\t\u65E0\u6CD5\u8BBF\u95EE\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E\n"},
@@ -87,6 +89,16 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A CallbackHandler"},
         {"null.subject.logout.called.before.login",
                 "\u7A7A\u4E3B\u4F53 - \u5728\u767B\u5F55\u4E4B\u524D\u8C03\u7528\u4E86\u6CE8\u9500"},
+        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
+                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule, {0}, \u56E0\u4E3A\u5B83\u672A\u63D0\u4F9B\u4E00\u4E2A\u65E0\u53C2\u6570\u6784\u9020\u5668"},
+        {"unable.to.instantiate.LoginModule",
+                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule"},
+        {"unable.to.instantiate.LoginModule.",
+                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule: "},
+        {"unable.to.find.LoginModule.class.",
+                "\u65E0\u6CD5\u627E\u5230 LoginModule \u7C7B: "},
+        {"unable.to.access.LoginModule.",
+                "\u65E0\u6CD5\u8BBF\u95EE LoginModule: "},
         {"Login.Failure.all.modules.ignored",
                 "\u767B\u5F55\u5931\u8D25: \u5FFD\u7565\u6240\u6709\u6A21\u5757"},
 
@@ -138,6 +150,11 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "PKCS11 \u6807\u8BB0 [{0}] \u53E3\u4EE4: "},
+
+        /* --- DEPRECATED --- */
+        // javax.security.auth.Policy
+        {"unable.to.instantiate.Subject.based.policy",
+                "\u65E0\u6CD5\u5B9E\u4F8B\u5316\u57FA\u4E8E\u4E3B\u9898\u7684\u7B56\u7565"}
     };
 
 
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
index f4cb1f4d2b4..83105561c30 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -59,7 +59,7 @@ FileChooser.fileSizeGigaBytes={0} GB
 FileChooser.saveTitle.textAndMnemonic=Speichern
 FileChooser.openTitle.textAndMnemonic=\u00D6ffnen
 FileChooser.newFolderExistsError.textAndMnemonic=Dieser Name ist bereits vergeben
-FileChooser.chooseButton.textAndMnemonic=Ausw\u00E4hlen
+FileChooser.chooseButton.textAndMnemonic=W\u00E4hlen
 
 FileChooser.newFolderButton.textAndMnemonic=Neuer Ordner
 FileChooser.newFolderTitle.textAndMnemonic=Neuer Ordner
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
index a58b033abe3..78c95becd1a 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
@@ -91,7 +91,7 @@ window=Fenster
 # accessible relations
 #
 labelFor=Label f\u00FCr
-labeledBy=gelabelt von
+labeledBy=beschriftet von
 memberOf=Mitglied von
 controlledBy=controlledBy
 controllerFor=controllerFor
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
index 80e22e5c8cf..471c4c2fc8b 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
@@ -201,8 +201,8 @@ AWT.HostInputMethodDisplayName=Systemeingabemethoden
 AWT.InputMethodLanguage.ja=Japanisch
 AWT.InputMethodLanguage.ko=Koreanisch
 AWT.InputMethodLanguage.zh=Chinesisch
-AWT.InputMethodLanguage.zh_CN=Chinesisch (vereinfacht)
-AWT.InputMethodLanguage.zh_TW=Chinesisch (traditionell)
+AWT.InputMethodLanguage.zh_CN=Vereinfachtes Chinesisch
+AWT.InputMethodLanguage.zh_TW=Traditionelles Chinesisch
 AWT.InputMethodCreationFailed={0} konnte nicht erstellt werden.  Grund: {1}
 
 # Property to select between on-the-spot and below-the-spot
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
index ae2c6bf5cd1..e8f4189062c 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
index 46261e666e4..ef6246e2e23 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
index 9a5a2bf4af4..445d5ba87cd 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
index 84fb41ce788..e1e43a16010 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,11 @@
 # CacheRowSetImpl exceptions
 cachedrowsetimpl.populate = Ung\u00FCltiges ResultSet-Objekt zum Auff\u00FCllen der Methode angegeben
 cachedrowsetimpl.invalidp = Ung\u00FCltiger Persistence-Provider generiert
-cachedrowsetimpl.nullhash = CachedRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle f\u00FCr Constructor angegeben
+cachedrowsetimpl.nullhash = CachedRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hash-Tabelle f\u00FCr Constructor angegeben
 cachedrowsetimpl.invalidop = Ung\u00FCltiger Vorgang beim Zeileneinf\u00FCgen
 cachedrowsetimpl.accfailed = acceptChanges nicht erfolgreich
 cachedrowsetimpl.invalidcp = Ung\u00FCltige Cursorposition
-cachedrowsetimpl.illegalop = Unzul\u00E4ssiger Vorgang bei nicht eingef\u00FCgter Zeile
+cachedrowsetimpl.illegalop = Ung\u00FCltiger Vorgang bei nicht eingef\u00FCgter Zeile
 cachedrowsetimpl.clonefail = Klonen nicht erfolgreich: {0}
 cachedrowsetimpl.invalidcol = Ung\u00FCltiger Spaltenindex
 cachedrowsetimpl.invalcolnm = Ung\u00FCltiger Spaltenname
@@ -60,7 +60,6 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: keine Metadaten
 cachedrowsetimpl.movetoins2 = moveToInsertRow: ung\u00FCltige Spaltenanzahl
 cachedrowsetimpl.tablename = Tabellenname darf nicht null sein
 cachedrowsetimpl.keycols = Ung\u00FCltige Schl\u00FCsselspalten
-cachedrowsetimpl.invalidcol = Ung\u00FCltiger Spaltenindex
 cachedrowsetimpl.opnotsupp = Vorgang nicht von Datenbank unterst\u00FCtzt
 cachedrowsetimpl.matchcols = \u00DCbereinstimmungsspalten entsprechen nicht den festgelegten Spalten
 cachedrowsetimpl.setmatchcols = \u00DCbereinstimmungsspalten m\u00FCssen vor dem Abrufen festgelegt werden
@@ -80,7 +79,7 @@ cachedrowsetimpl.opnotysupp = Vorgang noch nicht unterst\u00FCtzt
 cachedrowsetimpl.featnotsupp = Feature nicht unterst\u00FCtzt
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = WebRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle f\u00FCr Constructor angegeben
+webrowsetimpl.nullhash = WebRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hash-Tabelle f\u00FCr Constructor angegeben
 webrowsetimpl.invalidwr = Ung\u00FCltiger Writer
 webrowsetimpl.invalidrd = Ung\u00FCltiger Reader
 
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
index 3181e64c1ff..cd40ad2ef42 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,6 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: \u30E1\u30BF\u30C7\u30FC\u30BF\u3
 cachedrowsetimpl.movetoins2 = moveToInsertRow: \u7121\u52B9\u306A\u5217\u6570
 cachedrowsetimpl.tablename = \u8868\u540D\u306Bnull\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 cachedrowsetimpl.keycols = \u7121\u52B9\u306A\u30AD\u30FC\u5217
-cachedrowsetimpl.invalidcol = \u7121\u52B9\u306A\u5217\u7D22\u5F15
 cachedrowsetimpl.opnotsupp = \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u3044\u64CD\u4F5C
 cachedrowsetimpl.matchcols = \u4E00\u81F4\u5217\u304C\u5217\u306E\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 cachedrowsetimpl.setmatchcols = \u4E00\u81F4\u5217\u3092\u53D6\u5F97\u3059\u308B\u524D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
index 29d1823149d..a9f1203518c 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,6 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: \u65E0\u5143\u6570\u636E
 cachedrowsetimpl.movetoins2 = moveToInsertRow: \u5217\u6570\u65E0\u6548
 cachedrowsetimpl.tablename = \u8868\u540D\u4E0D\u80FD\u4E3A\u7A7A\u503C
 cachedrowsetimpl.keycols = \u5173\u952E\u5B57\u5217\u65E0\u6548
-cachedrowsetimpl.invalidcol = \u5217\u7D22\u5F15\u65E0\u6548
 cachedrowsetimpl.opnotsupp = \u64CD\u4F5C\u4E0D\u53D7\u6570\u636E\u5E93\u652F\u6301
 cachedrowsetimpl.matchcols = \u5339\u914D\u5217\u4E0E\u8BBE\u7F6E\u7684\u90A3\u4E9B\u5339\u914D\u5217\u4E0D\u540C
 cachedrowsetimpl.setmatchcols = \u5728\u83B7\u53D6\u5339\u914D\u5217\u4E4B\u524D\u5148\u8BBE\u7F6E\u5339\u914D\u5217
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
index 07ea3779a20..f71357900f7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
@@ -481,7 +481,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Fehler: \"{\" darf nicht im Ausdruck enthalten sein"},
 
     { ER_ILLEGAL_ATTRIBUTE ,
-     "{0} hat ein unzul\u00E4ssiges Attribut: {1}"},
+     "{0} hat ein ung\u00FCltiges Attribut: {1}"},
 
   {ER_NULL_SOURCENODE_APPLYIMPORTS ,
       "sourceNode ist null in xsl:apply-imports."},
@@ -526,7 +526,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Namespace-Pr\u00E4fix kann nicht aufgel\u00F6st werden: {0}"},
 
     { ER_ILLEGAL_VALUE,
-     "xml:space hat einen unzul\u00E4ssigen Wert: {0}"},
+     "xml:space hat einen ung\u00FCltigen Wert: {0}"},
 
     { ER_NO_OWNERDOC,
       "Der untergeordnete Knoten hat kein Eigent\u00FCmerdokument."},
@@ -646,7 +646,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Element in Ergebnisbaum kann nicht erstellt werden: {0}"},
 
     { ER_XMLSPACE_ILLEGAL_VALUE,
-      "xml:space in Quell-XML hat einen unzul\u00E4ssigen Wert: {0}"},
+      "xml:space in Quell-XML hat einen ung\u00FCltigen Wert: {0}"},
 
     { ER_NO_XSLKEY_DECLARATION,
       "Keine xsl:key-Deklaration f\u00FCr {0} vorhanden."},
@@ -673,7 +673,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "indent-result wird nicht mehr unterst\u00FCtzt. Verwenden Sie stattdessen xsl:output."},
 
     { ER_ILLEGAL_ATTRIB,
-      "(StylesheetHandler) {0} hat ein unzul\u00E4ssiges Attribut: {1}"},
+      "(StylesheetHandler) {0} hat ein ung\u00FCltiges Attribut: {1}"},
 
     { ER_UNKNOWN_XSL_ELEM,
      "Unbekanntes XSL-Element: {0}"},
@@ -706,7 +706,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "(StylesheetHandler) {0} importiert sich direkt oder indirekt selbst."},
 
     { ER_XMLSPACE_ILLEGAL_VAL,
-      "(StylesheetHandler) xml:space hat einen unzul\u00E4ssigen Wert: {0}"},
+      "(StylesheetHandler) xml:space hat einen ung\u00FCltigen Wert: {0}"},
 
     { ER_PROCESSSTYLESHEET_NOT_SUCCESSFUL,
       "processStylesheet nicht erfolgreich."},
@@ -740,7 +740,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Pr\u00E4fix in exclude-result-prefixes ist nicht g\u00FCltig: {0}"},
 
     { ER_MISSING_NS_URI,
-      "Fehlende Namespace-URI f\u00FCr angegebenes Pr\u00E4fix"},
+      "Fehlender Namespace-URI f\u00FCr angegebenes Pr\u00E4fix"},
 
     { ER_MISSING_ARG_FOR_OPTION,
       "Fehlendes Argument f\u00FCr Option: {0}"},
@@ -872,7 +872,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
              "Stylesheet-Root wurde nicht gefunden."},
 
     { ER_ILLEGAL_XMLSPACE_VALUE,
-         "Unzul\u00E4ssiger Wert f\u00FCr xml:space"},
+         "Ung\u00FCltiger Wert f\u00FCr xml:space"},
 
     { ER_PROCESSFROMNODE_FAILED,
          "processFromNode nicht erfolgreich"},
@@ -990,7 +990,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
      "{0}-Attributwert nicht erkannt "},
 
     { ER_NULL_URI_NAMESPACE,
-     "Versuch, ein Namespace-Pr\u00E4fix mit einer Null-URI zu generieren"},
+     "Versuch, ein Namespace-Pr\u00E4fix mit einem Null-URI zu generieren"},
 
     { ER_NUMBER_TOO_BIG,
      "Versuch, eine Zahl zu formatieren, die gr\u00F6\u00DFer als die gr\u00F6\u00DFte Long-Ganzzahl ist"},
@@ -1272,7 +1272,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "xsl:decimal-format-Namen m\u00FCssen eindeutig sein. Name \"{0}\" wurde dupliziert."},
 
     { WG_ILLEGAL_ATTRIBUTE,
-      "{0} hat ein unzul\u00E4ssiges Attribut: {1}"},
+      "{0} hat ein ung\u00FCltiges Attribut: {1}"},
 
     { WG_COULD_NOT_RESOLVE_PREFIX,
       "Namespace-Pr\u00E4fix konnte nicht aufgel\u00F6st werden: {0}. Der Knoten wird ignoriert."},
@@ -1281,10 +1281,10 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "xsl:stylesheet erfordert ein \"version\"-Attribut."},
 
     { WG_ILLEGAL_ATTRIBUTE_NAME,
-      "Unzul\u00E4ssiger Attributname: {0}"},
+      "Ung\u00FCltiger Attributname: {0}"},
 
     { WG_ILLEGAL_ATTRIBUTE_VALUE,
-      "Unzul\u00E4ssiger Wert f\u00FCr Attribut {0}: {1}"},
+      "Ung\u00FCltiger Wert f\u00FCr Attribut {0}: {1}"},
 
     { WG_EMPTY_SECOND_ARG,
       "Resultierendes NodeSet aus zweitem Argument von Dokumentfunktion ist leer. Geben Sie ein leeres NodeSet zur\u00FCck."},
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
index ea6eecee48d..425707e4792 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
@@ -167,7 +167,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * mentioned in the substitution text is not well-formed syntactically.
          */
         {ErrorMsg.INVALID_URI_ERR,
-        "Ung\u00FCltige URI \"{0}\"."},
+        "Ung\u00FCltiger URI \"{0}\"."},
 
         /*
          * Note to translators:  This message is displayed when the URI
@@ -234,7 +234,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text is the offending character.
          */
         {ErrorMsg.ILLEGAL_CHAR_ERR,
-        "Unzul\u00E4ssiges Zeichen \"{0}\" in XPath-Ausdruck."},
+        "Ung\u00FCltiges Zeichen \"{0}\" in XPath-Ausdruck."},
 
         /*
          * Note to translators:  A processing instruction is a mark-up item in
@@ -243,7 +243,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text is the name.
          */
         {ErrorMsg.ILLEGAL_PI_ERR,
-        "Unzul\u00E4ssiger Name \"{0}\" f\u00FCr Verarbeitungsanweisung."},
+        "Ung\u00FCltiger Name \"{0}\" f\u00FCr Verarbeitungsanweisung."},
 
         /*
          * Note to translators:  This message is reported if the stylesheet
@@ -261,7 +261,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text.
          */
         {ErrorMsg.ILLEGAL_ATTRIBUTE_ERR,
-        "Unzul\u00E4ssiges Attribut \"{0}\"."},
+        "Ung\u00FCltiges Attribut \"{0}\"."},
 
         /*
          * Note to translators:  "import" and "include" are keywords that should
@@ -321,7 +321,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * function has too many or too few arguments.
          */
         {ErrorMsg.ILLEGAL_ARG_ERR,
-        "Unzul\u00E4ssige Argumente f\u00FCr Funktionsaufruf."},
+        "Ung\u00FCltige Argumente f\u00FCr Funktionsaufruf."},
 
         /*
          * Note to translators:  "document()" is the name of function and must
@@ -383,7 +383,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * element of a type that it was not permitted to contain.
          */
         {ErrorMsg.ILLEGAL_CHILD_ERR,
-        "Unzul\u00E4ssiges untergeordnetes Element."},
+        "Ung\u00FCltiges untergeordnetes Element."},
 
         /*
          * Note to translators:  The stylesheet tried to create an element with
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
index dadea4ba3b0..6b44ace762d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
@@ -149,7 +149,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * iterator.  (See definition of iterator above.)
          */
         {BasisLibrary.ITERATOR_CLONE_ERR,
-        "Iterator \"{0}\" kann nicht geklont werden."},
+        "Iterator \"{0}\" kann nicht geclont werden."},
 
         /*
          * Note to translators:  The following represents an internal error
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
index 5b802e6ea58..0b8ee27b51e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
@@ -14,7 +39,7 @@ HIERARCHY_REQUEST_ERR  = Es wurde versucht, einen Knoten an einer Stelle einzuf\
 INDEX_SIZE_ERR = Index oder Gr\u00F6\u00DFe ist negativ oder gr\u00F6\u00DFer als der zul\u00E4ssige Wert.
 INUSE_ATTRIBUTE_ERR = Es wurde versucht, ein Attribut hinzuzuf\u00FCgen, das bereits an einer anderen Stelle verwendet wird.
 INVALID_ACCESS_ERR  = Ein Parameter oder Vorgang wird nicht vom zugrunde liegenden Objekt unterst\u00FCtzt. 
-INVALID_CHARACTER_ERR = Ung\u00FCltiges oder unzul\u00E4ssiges XML-Zeichen angegeben. 
+INVALID_CHARACTER_ERR = Ung\u00FCltiges XML-Zeichen angegeben. 
 INVALID_MODIFICATION_ERR =  Es wurde versucht, den Typ des zugrunde liegenden Objekts zu \u00E4ndern. 
 INVALID_STATE_ERR = Es wurde versucht, ein Objekt zu \u00E4ndern, das nicht verwendet werden kann. 
 NAMESPACE_ERR = Es wurde versucht, ein Objekt auf eine Weise zu erstellen oder zu \u00E4ndern, die falsch in Bezug auf Namespaces ist.
@@ -22,7 +47,7 @@ NOT_FOUND_ERR = Es wurde versucht, einen Knoten in einem Kontext zu referenziere
 NOT_SUPPORTED_ERR = Der angeforderte Typ des Objekts oder Vorgangs wird nicht von der Implementierung unterst\u00FCtzt. 
 NO_DATA_ALLOWED_ERR = Daten wurden f\u00FCr einen Knoten angegeben, der keine Daten unterst\u00FCtzt.
 NO_MODIFICATION_ALLOWED_ERR = Es wurde versucht, ein Objekt zu \u00E4ndern, bei dem \u00C4nderungen nicht zul\u00E4ssig sind.
-SYNTAX_ERR = Ung\u00FCltige oder unzul\u00E4ssige Zeichenfolge angegeben. 
+SYNTAX_ERR = Ung\u00FCltige Zeichenfolge angegeben. 
 VALIDATION_ERR = Aufruf einer Methode wie insertBefore oder removeChild w\u00FCrde die Dokumentgrammatik des Knotens ung\u00FCltig machen.
 WRONG_DOCUMENT_ERR = Ein Knoten wird in einem anderen Dokument verwendet als dem, von dem er erstellt wurde.
 TYPE_MISMATCH_ERR = Der Werttyp f\u00FCr diesen Parameternamen ist nicht mit dem erwarteten Werttyp kompatibel. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
index c6fe53e399b..e2f923e6181 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
index 2f74f54fbab..c59decb1b3d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
index 4bbbaea3b1f..1d9f1a082fa 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
index a8ef5dbddc0..84d90d0fd41 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
index e5b9aca2e70..21a3e3c9919 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
index 820fc8fb2e3..d9a740adbd8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
index 267c886ffed..86120a72476 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
index 9ffbd1c608e..9cc5ccb25f2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
index 4f6a8717006..2b99e3461e1 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
index 0c6c98dc312..21978c587cb 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
index 0d6e7a12242..cc07506f888 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
index 412d96f917e..45c47c62709 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 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.
+#
+
 # Messages for message reporting
 BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n  
@@ -26,7 +51,7 @@ MultipleRootElements = Ein ordnungsgem\u00E4\u00DF formatiertes Dokument darf ni
 ContentIllegalAtTopLevel = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine Zeichen enthalten.
 UnexpandedEntityReferenceIllegal = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine nicht erweiterten Entityreferenzen enthalten.
 HrefFragmentIdentifierIllegal = Fragment-IDs d\u00FCrfen nicht verwendet werden. Der "href"-Attributwert "{0}" ist nicht zul\u00E4ssig.
-HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ung\u00FCltige Syntax. Nach Anwenden der Escape-Regeln ist der Wert keine syntaktisch korrekte URI oder IRI.
+HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ung\u00FCltige Syntax. Nach Anwenden der Escape-Regeln ist der Wert kein syntaktisch korrekter URI oder IRI.
 XPointerStreamability = Es wurde ein xpointer angegeben, der auf eine Stelle im Quell-Infoset verweist. Auf diese Stelle kann aufgrund des Streamingcharakters des Prozessors nicht zugegriffen werden.
 
 XPointerResolutionUnsuccessful = XPointer-Aufl\u00F6sung nicht erfolgreich.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
index 55abfda9b23..2034e72751e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
 # Messages for message reporting
 BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n  
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
index 8e32a7337a1..3231b731892 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
 # Messages for message reporting
 BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
 FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n  
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
index 3848d68aa2e..e535ffc74b2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
@@ -123,7 +123,7 @@
         InvalidHighSurrogate = High-Surrogate-Bits in UTF-8-Sequenz d\u00FCrfen 0x10 nicht \u00FCberschreiten, gefunden wurde aber 0x{0}.
         OperationNotSupported = Vorgang "{0}" nicht unterst\u00FCtzt von {1}-Reader.
         InvalidASCII = Byte "{0}" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
-        CharConversionFailure = Eine Entity, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung unzul\u00E4ssig sind.
+        CharConversionFailure = Eine Entity, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung ung\u00FCltig sind.
         
 # DTD Messages
 # 2.2 Characters
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = Element oder Attribut "{0}" stimmt nicht mit QName-Produktion \u00FCberein: QName::=(NCName'':'')?NCName.
+        IllegalQName = Element oder Attribut stimmt nicht mit QName-Production \u00FCberein: QName::=(NCName':')?NCName. 
         ElementXMLNSPrefix = Element "{0}" darf nicht "xmlns" als Pr\u00E4fix enthalten.
         ElementPrefixUnbound = Pr\u00E4fix "{0}" f\u00FCr Element "{1}" ist nicht gebunden.
         AttributePrefixUnbound = Pr\u00E4fix "{2}" f\u00FCr Attribut "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, ist nicht gebunden.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
index 7001ef45266..859b3530908 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027"{0}"\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName'':'')?NCName\u3002
+        IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName':')?NCName\u3002 
         ElementXMLNSPrefix = \u8981\u7D20"{0}"\u306E\u63A5\u982D\u8F9E\u3068\u3057\u3066"xmlns"\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
         ElementPrefixUnbound = \u8981\u7D20"{1}"\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
         AttributePrefixUnbound = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u63A5\u982D\u8F9E"{2}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
index ac05ad875c6..781b2c640c8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027 "{0}" \u4E0D\u5339\u914D QName \u751F\u4EA7\uFF1AQName::=(NCName'':'')?NCName\u3002
+        IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027\u4E0D\u5339\u914D QName \u751F\u4EA7: QName::=(NCName':')?NCName\u3002
         ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u4E3A\u524D\u7F00\u3002
         ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F00 "{0}" \u672A\u7ED1\u5B9A\u3002
         AttributePrefixUnbound = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u7684\u524D\u7F00 "{2}" \u672A\u7ED1\u5B9A\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
index 9ca2596f92e..7c864068a94 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
@@ -39,6 +64,7 @@
         cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: Content des Elements ''{0}'' ist nicht vollst\u00E4ndig. ''{1}'' wird erwartet.
         cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: \u00DCbereinstimmungsplatzhalter ist streng, aber es kann keine Deklaration f\u00FCr Element ''{0}'' gefunden werden.
         cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Ung\u00FCltiger Content wurde beginnend mit Element ''{0}'' gefunden. An dieser Stelle wird kein untergeordnetes Element erwartet.
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Ung\u00FCltiger Content wurde beginnend mit Element ''{0}'' gefunden. An dieser Stelle wird kein untergeordnetes Element ''{1}'' erwartet.
         cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: "{0}" darf maximal "{2}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde \u00FCberschritten. An dieser Stelle wird eines von "{1}" erwartet.
         cvc-complex-type.2.4.f = cvc-complex-type.2.4.e: "{0}" darf maximal "{1}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde \u00FCberschritten. An dieser Stelle wird kein untergeordnetes Element erwartet.
         cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Ung\u00FCltigen Inhalt gefunden, der mit Element "{0}" beginnt. "{1}" soll erwartungsgem\u00E4\u00DF mindestens "{2}"-mal in der aktuellen Abfolge auftreten. Eine weitere Instanz ist erforderlich, um diesen Constraint zu erf\u00FCllen.
@@ -233,14 +259,14 @@
         rcase-MapAndSum.2 = rcase-MapAndSum.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
         rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Elemente haben Namen und Ziel-Namespaces, die nicht identisch sind: Element ''{0}'' in Namespace ''{1}'' und Element ''{2}'' in Namespace ''{3}''.
         rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. '{'nillable'}' ist bei der Elementdeklaration ''true'', aber das entsprechende Partikel im Basistyp hat eine Elementdeklaration, bei der '{'nillable'}' ''false'' ist.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
         rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: Element ''{0}'' ist nicht fest, aber das entsprechende Element im Basistyp ist fest mit Wert ''{1}''.
         rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: Element ''{0}'' ist fest mit dem Wert ''{1}'', aber das entsprechende Element im Basistyp ist fest mit Wert ''{2}''.
         rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Identity Constraints f\u00FCr Element ''{0}'' sind keine Teilmenge der Constraints in der Basis.
         rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: Die unzul\u00E4ssigen Substitutionen f\u00FCr Element ''{0}'' sind keine Obermenge der Substitutionen in der Basis.
         rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: Typ des Elements ''{0}'' ''{1}'' wurde nicht vom Typ des Basiselements ''{2}'' abgeleitet.
         rcase-NSCompat.1 = rcase-NSCompat.1: Element ''{0}'' hat den Namespace ''{1}''. Dies wird vom Platzhalter in der Basis nicht zugelassen.
-        rcase-NSCompat.2 = rcase-NSCompat.2: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
+        rcase-NSCompat.2 = rcase-NSCompat.2: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
         rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Es ist keine vollst\u00E4ndige Funktionszuordnung zwischen den Partikeln vorhanden.
         rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs des Basisplatzhalters ({2},{3}).
         rcase-NSSubset.1 = rcase-NSSubset.1: Platzhalter ist keine Teilmenge des entsprechenden Platzhalters in der Basis.
@@ -285,15 +311,15 @@
         EmptyTargetNamespace = EmptyTargetNamespace: In Schemadokument ''{0}'' kann der Wert des ''targetNamespace''-Attributs keine leere Zeichenfolge sein.
         FacetValueFromBase = FacetValueFromBase: In der Deklaration von Typ ''{0}'' muss der Wert ''{1}'' von Facet ''{2}'' aus dem Wertebereich des Basistyps ''{3}'' stammen.
         FixedFacetValue = FixedFacetValue: In der Definition von {3} ist der Wert ''{1}'' f\u00FCr Facet ''{0}'' ung\u00FCltig, da der Wert f\u00FCr ''{0}'' in einem der Vorg\u00E4ngertypen auf ''{2}'' gesetzt wurde und ''{''fixed'}''' = true ist.
-        InvalidRegex = InvalidRegex: Musterwert "{0}" ist kein g\u00FCltiger regul\u00E4rer Ausdruck. Der gemeldete Fehler war: "{1}".
-        MaxOccurLimit = Aktuelle Konfiguration des Parsers l\u00E4sst nicht zu, dass ein Inhaltsmodell so erweitert wird, dass ein komplexer Typ mehr als {0} Knoten enth\u00E4lt.
+        InvalidRegex = InvalidRegex: Musterwert ''{0}'' ist kein g\u00FCltiger regul\u00E4rer Ausdruck. Der gemeldete Fehler war: ''{1}'' bei Spalte ''{2}''.
+        MaxOccurLimit = Aktuelle Konfiguration des Parsers l\u00E4sst nicht zu, dass ein maxOccurs-Attributwert auf einen h\u00F6heren Wert als {0} gesetzt wird.
         PublicSystemOnNotation = PublicSystemOnNotation: Mindestens eines der Elemente 'public' und 'system' muss im Element 'notation' vorkommen.
         SchemaLocation = SchemaLocation: schemaLocation-Wert = ''{0}'' muss eine gerade Anzahl an URIs haben.
         TargetNamespace.1 = TargetNamespace.1: Namespace ''{0}'' wird erwartet, aber der Ziel-Namespace des Schemadokuments ist ''{1}''.
         TargetNamespace.2 = TargetNamespace.2: Kein Namespace wird erwartet, aber das Schemadokument hat den Ziel-Namespace ''{1}''.
         UndeclaredEntity = UndeclaredEntity: Entity ''{0}'' ist nicht deklariert.
         UndeclaredPrefix = UndeclaredPrefix: ''{0}'' kann nicht als QName aufgel\u00F6st werden: Pr\u00E4fix ''{1}'' ist nicht deklariert.
-        FacetsContradict = FacetsContradict: F\u00FCr simpleType-Definition "{2}" widerspricht der Enumerationswert "{0}" dem Wert von Facet "{1}".
+
 
 # JAXP 1.2 schema source property errors
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
index bcf6b336eb7..b4d9ffafe78 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 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.
+#
+
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
index 4e9a16dcb4f..602d1314ac6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 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.
+#
+
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
index c5b5cdbd949..3c1d9d8282c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
index b61a63b5b74..341497c9a6f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
index 4db14a65c4d..d8b2eb0bba5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
index 3d33f7b8699..dc787a6cd3d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
index a9348831605..e12a67655f8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
index bbf46c70eb7..cbbaad08e7b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
index 816e86b09a8..549f517840c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
 parser.parse.1=Falsches Zeichen.
 parser.parse.2=Ung\u00FCltige Referenznummer.
 parser.next.1=Nach \\ ist ein Zeichen erforderlich.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
index 09ffd559f50..fcc5ed576fb 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
 parser.parse.1=\u6587\u5B57\u304C\u9055\u3063\u3066\u3044\u307E\u3059\u3002
 parser.parse.2=\u7121\u52B9\u306A\u53C2\u7167\u756A\u53F7\u3067\u3059\u3002
 parser.next.1=\\\u306E\u5F8C\u306B\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
index ab2e56846a9..ee68bbdbcea 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
@@ -1,3 +1,28 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
 parser.parse.1=\u5B57\u7B26\u9519\u8BEF\u3002
 parser.parse.2=\u5F15\u7528\u53F7\u65E0\u6548\u3002
 parser.next.1=\\ \u540E\u9762\u5FC5\u987B\u6709\u5B57\u7B26\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
index 3c53ea08956..5b859177598 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
@@ -286,7 +286,7 @@ public class XMLErrorResources_de extends ListResourceBundle
        "Ung\u00FCltige Portnummer"},
 
     { ER_FRAG_FOR_GENERIC_URI,
-       "Fragment kann nur f\u00FCr eine generische URI festgelegt werden"},
+       "Fragment kann nur f\u00FCr einen generischen URI festgelegt werden"},
 
     { ER_FRAG_WHEN_PATH_NULL,
        "Fragment kann nicht festgelegt werden, wenn der Pfad null ist"},
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
index 1874693ccfe..bc444738f1a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
@@ -162,7 +162,7 @@ public class SerializerMessages_de extends ListResourceBundle {
                 "Fragment kann nicht festgelegt werden, wenn der Pfad null ist" },
 
             {   MsgKey.ER_FRAG_FOR_GENERIC_URI,
-                "Fragment kann nur f\u00FCr eine generische URI festgelegt werden" },
+                "Fragment kann nur f\u00FCr einen generischen URI festgelegt werden" },
 
             {   MsgKey.ER_NO_SCHEME_IN_URI,
                 "Kein Schema gefunden in URI" },
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
index 7b3c5473e5e..db9a3fdbc2e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +32,6 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
- * @LastModified: Nov 2021
  */
 public class XPATHErrorResources_de extends ListResourceBundle
 {
@@ -150,10 +150,6 @@ public class XPATHErrorResources_de extends ListResourceBundle
          "ER_FOUND_COMMA_BUT_NO_FOLLOWING_ARG";
   public static final String ER_PREDICATE_ILLEGAL_SYNTAX =
          "ER_PREDICATE_ILLEGAL_SYNTAX";
-  public static final String ER_PREDICATE_TOO_MANY_OPEN =
-         "ER_PREDICATE_TOO_MANY_OPEN";
-  public static final String ER_COMPILATION_TOO_MANY_OPERATION =
-         "ER_COMPILATION_TOO_MANY_OPERATION";
   public static final String ER_ILLEGAL_AXIS_NAME = "ER_ILLEGAL_AXIS_NAME";
   public static final String ER_UNKNOWN_NODETYPE = "ER_UNKNOWN_NODETYPE";
   public static final String ER_PATTERN_LITERAL_NEEDS_BE_QUOTED =
@@ -322,10 +318,6 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
-  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
-  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
-  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
-  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -443,7 +435,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
      "ERROR. Unbekannter Vorgangscode: {0}"},
 
   { ER_EXTRA_ILLEGAL_TOKENS,
-     "Zus\u00E4tzliche unzul\u00E4ssige Tokens: {0}"},
+     "Zus\u00E4tzliche ung\u00FCltige Tokens: {0}"},
 
   { ER_EXPECTED_DOUBLE_QUOTE,
       "Literal in falschen Anf\u00FChrungszeichen... Doppelte Anf\u00FChrungszeichen erwartet."},
@@ -470,16 +462,10 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
       "\",\" gefunden, aber kein folgendes Argument vorhanden."},
 
   { ER_PREDICATE_ILLEGAL_SYNTAX,
-      "\"..[predicate]\" oder \".[predicate]\" ist unzul\u00E4ssige Syntax. Verwenden Sie stattdessen \"self::node()[predicate]\"."},
-
-  { ER_PREDICATE_TOO_MANY_OPEN,
-      "Stack\u00FCberlauf beim Parsen von {0} bei {1}. Es sind zu viele offene Pr\u00E4dikate vorhanden ({2})."},
-
-  { ER_COMPILATION_TOO_MANY_OPERATION,
-      "Stack\u00FCberlauf beim Kompilieren des Ausdrucks. Es sind zu viele Vorg\u00E4nge vorhanden ({0})."},
+      "\"..[predicate]\" oder \".[predicate]\" ist ung\u00FCltige Syntax. Verwenden Sie stattdessen \"self::node()[predicate]\"."},
 
   { ER_ILLEGAL_AXIS_NAME,
-     "Unzul\u00E4ssiger Achsenname: {0}"},
+     "Ung\u00FCltiger Achsenname: {0}"},
 
   { ER_UNKNOWN_NODETYPE,
      "Unbekannter Knotentyp: {0}"},
@@ -840,26 +826,6 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "Versuch, Null-XPathVariableResolver festzulegen:{0}#setXPathVariableResolver(null)"},
 
-  /** Field ER_PROPERTY_NAME_NULL                       */
-
-  { ER_PROPERTY_NAME_NULL,
-       "Es wird versucht, eine Eigenschaft mit einem Nullnamen festzulegen: {0}#setProperty(null, {1})"},
-
-  /** Field ER_PROPERTY_UNKNOWN                       */
-
-  { ER_PROPERTY_UNKNOWN,
-       "Es wird versucht, die unbekannte Eigenschaft \"{0}\" festzulegen: {1}#setProperty({0},{2})"},
-
-  /** Field ER_GETTING_NULL_PROPERTY                       */
-
-  { ER_GETTING_NULL_PROPERTY,
-       "Es wird versucht, eine Eigenschaft mit einem Nullnamen abzurufen: {0}#getProperty(null)"},
-
-  /** Field ER_GETTING_NULL_PROPERTY                       */
-
-  { ER_GETTING_UNKNOWN_PROPERTY,
-       "Es wird versucht, die unbekannte Eigenschaft \"{0}\" abzurufen: {1}#getProperty({0})"},
-
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
index bdb2501b69a..a8c681aaa37 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
- * @LastModified: Nov 2021
+ * @LastModified: May 2019
  */
 public class XPATHErrorResources_ja extends ListResourceBundle
 {
@@ -322,10 +322,6 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
-  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
-  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
-  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
-  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -840,26 +836,6 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "null\u306EXPathVariableResolver\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#setXPathVariableResolver(null)"},
 
-  /** Field ER_PROPERTY_NAME_NULL                       */
-
-  { ER_PROPERTY_NAME_NULL,
-       "\u30D7\u30ED\u30D1\u30C6\u30A3\u306Bnull\u306E\u540D\u524D\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#setProperty( null, {1})"},
-
-  /** Field ER_PROPERTY_UNKNOWN                       */
-
-  { ER_PROPERTY_UNKNOWN,
-       "\u4E0D\u660E\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\"{0}\"\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F:{1}#setProperty({0},{2})"},
-
-  /** Field ER_GETTING_NULL_PROPERTY                       */
-
-  { ER_GETTING_NULL_PROPERTY,
-       "null\u540D\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u53D6\u5F97\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#getProperty(null)"},
-
-  /** Field ER_GETTING_NULL_PROPERTY                       */
-
-  { ER_GETTING_UNKNOWN_PROPERTY,
-       "\u4E0D\u660E\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\"{0}\"\u3092\u53D6\u5F97\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F:{1}#getProperty({0})"},
-
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
index 5c76b4c9471..d1e370f0d82 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
- * @LastModified: Nov 2021
+ * @LastModified: May 2019
  */
 public class XPATHErrorResources_zh_CN extends ListResourceBundle
 {
@@ -322,10 +322,6 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
-  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
-  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
-  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
-  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -840,26 +836,6 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "\u5C1D\u8BD5\u8BBE\u7F6E\u7A7A XPathVariableResolver:{0}#setXPathVariableResolver(null)"},
 
-  /** Field ER_PROPERTY_NAME_NULL                       */
-
-  { ER_PROPERTY_NAME_NULL,
-       "\u5C1D\u8BD5\u8BBE\u7F6E\u5177\u6709\u7A7A\u540D\u79F0\u7684\u5C5E\u6027\uFF1A{0}#setProperty( null, {1})"},
-
-  /** Field ER_PROPERTY_UNKNOWN                       */
-
-  { ER_PROPERTY_UNKNOWN,
-       "\u5C1D\u8BD5\u8BBE\u7F6E\u672A\u77E5\u5C5E\u6027 \"{0}\":{1}#setProperty({0},{2})"},
-
-  /** Field ER_GETTING_NULL_PROPERTY                       */
-
-  { ER_GETTING_NULL_PROPERTY,
-       "\u5C1D\u8BD5\u83B7\u53D6\u5177\u6709\u7A7A\u540D\u79F0\u7684\u5C5E\u6027\uFF1A{0}#getProperty(null)"},
-
-  /** Field ER_GETTING_NULL_PROPERTY                       */
-
-  { ER_GETTING_UNKNOWN_PROPERTY,
-       "\u5C1D\u8BD5\u83B7\u53D6\u672A\u77E5\u5C5E\u6027 \"{0}\":{1}#getProperty({0})"},
-
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
deleted file mode 100644
index 023f83aea32..00000000000
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
+++ /dev/null
@@ -1,2785 +0,0 @@
-#
-# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
-# are preceded by a stylized comment describing the type of the corresponding
-# values.
-# The simple types currently in use are:
-#
-# annotation        annotation compound
-# boolean           true or false
-# diagnostic        a sub-message; see compiler.misc.*
-# fragment          similar to 'message segment', but with more specific type
-# modifier          a Java modifier; e.g. public, private, protected
-# file              a file URL
-# file object       a file URL - similar to 'file' but typically used for source/class files, hence more specific
-# flag              a Flags.Flag instance
-# name              a name, typically a Java identifier
-# number            an integer
-# option name       the name of a command line option
-# path              a path
-# profile           a profile name
-# source            a source version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.code.Source
-# source version    a source version number, such as 1.5, 1.6, 1.7, taken from a javax.lang.model.SourceVersion
-# string            a general string
-# symbol            the name of a declared type
-# symbol kind       the kind of a symbol (i.e. method, variable)
-# kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
-# target            a target version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.jvm.Target
-# token             the name of a non-terminal in source code; see compiler.misc.token.*
-# tree tag          the name of a non-terminal in source code; see compiler.misc.token.*
-# type              a Java type; e.g. int, X, X<T>
-# url               a URL
-# object            a Java object (unspecified)
-# unused            the value is not used in this message
-#
-# The following compound types are also used:
-#
-# collection of X   a comma-separated collection of items; e.g. collection of type
-# list of X         a comma-separated list of items; e.g. list of type
-# set of X          a comma-separated set of items; e.g. set of modifier
-#
-# These may be composed:
-#
-# list of type or message segment
-#
-# The following type aliases are supported:
-#
-# message segment --> diagnostic or fragment
-# file name --> file, path or file object
-#
-# Custom comments are supported in parenthesis i.e.
-#
-# number (classfile major version)
-#
-# These comments are used internally in order to generate an enum-like class declaration containing
-# a method/field for each of the diagnostic keys listed here. Those methods/fields can then be used
-# by javac code to build diagnostics in a type-safe fashion.
-#
-# In addition, these comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
-# using info derived from the collected set of examples in test/tools/javac/diags/examples.
-# MessageInfo can also be run as a standalone utility providing more facilities
-# for manipulating this file. For more details, see MessageInfo.java.
-
-##
-## errors
-##
-
-# 0: symbol
-compiler.err.abstract.cant.be.instantiated={0} ist abstrakt, kann nicht instanziiert werden
-
-compiler.err.abstract.meth.cant.have.body=Abstrakte Methoden k\u00F6nnen keinen Body enthalten
-
-# 0: kind name, 1: symbol
-compiler.err.already.annotated={0} {1} wurde bereits mit Annotation versehen
-
-# 0: kind name, 1: symbol, 2: kind name, 3: symbol
-compiler.err.already.defined={0} {1} ist bereits in {2} {3} definiert
-
-# 0: kind name, 1: symbol, 2: kind name, 3: kind name, 4: symbol
-compiler.err.already.defined.in.clinit={0} {1} ist bereits in {2} von {3} {4} definiert
-
-# 0: symbol
-compiler.err.already.defined.single.import=Es wurde bereits ein Typ mit demselben einfachen Namen durch den Einzeltypimport von {0} definiert
-
-# 0: symbol
-compiler.err.already.defined.static.single.import=Es wurde bereits ein Typ mit demselben einfachen Namen durch den statischen Einzeltypimport von {0} definiert
-
-# 0: symbol
-compiler.err.already.defined.this.unit={0} ist in dieser Kompilierungseinheit bereits definiert
-
-# 0: type, 1: list of name
-compiler.err.annotation.missing.default.value=In Annotation @{0} fehlt ein Standardwert f\u00FCr das Element "{1}"
-
-# 0: type, 1: list of name
-compiler.err.annotation.missing.default.value.1=In Annotation @{0} fehlen Standardwerte f\u00FCr Elemente {1}
-
-# 0: type
-compiler.err.annotation.not.valid.for.type=Annotation ist f\u00FCr Element des Typs {0} nicht g\u00FCltig
-
-compiler.err.annotation.type.not.applicable=Annotationsschnittstelle ist f\u00FCr diese Art Deklaration nicht anwendbar
-
-# 0: type
-compiler.err.annotation.type.not.applicable.to.type=Annotation @{0} ist in diesem Typkontext nicht anwendbar
-
-compiler.err.annotation.value.must.be.annotation=Annotationswert muss eine Annotation sein
-
-compiler.err.annotation.value.must.be.class.literal=Annotationswert muss ein Klassenliteral sein
-
-compiler.err.annotation.value.must.be.name.value=Annotationswerte m\u00FCssen das Format "Name=Wert" aufweisen
-
-compiler.err.annotation.value.not.allowable.type=Annotationswert hat keinen zul\u00E4ssigen Typ
-
-compiler.err.expression.not.allowable.as.annotation.value=Ausdruck ist als Annotationswert nicht zul\u00E4ssig
-
-compiler.err.anon.class.impl.intf.no.args=Anonyme Klasse implementiert Schnittstelle. Argumente sind nicht m\u00F6glich
-
-compiler.err.anon.class.impl.intf.no.typeargs=Anonyme Klasse implementiert Schnittstelle. Typargumente sind nicht m\u00F6glich
-
-compiler.err.anon.class.impl.intf.no.qual.for.new=Anonyme Klasse implementiert Schnittstelle. Qualifier f\u00FCr "Neu" ist nicht m\u00F6glich
-
-compiler.err.cant.inherit.from.anon=Erben aus anonymer Klasse nicht m\u00F6glich
-
-# 0: symbol, 1: symbol, 2: symbol
-compiler.err.array.and.varargs={0} und {1} k\u00F6nnen nicht beide in {2} deklariert werden
-
-compiler.err.array.dimension.missing=Arraydimension fehlt
-
-compiler.err.illegal.array.creation.both.dimension.and.initialization=Arrayerstellung mit Dimensionsausdruck und Initialisierung ist unzul\u00E4ssig
-
-# 0: type
-compiler.err.array.req.but.found=Array erforderlich, aber {0} gefunden
-
-compiler.err.attribute.value.must.be.constant=Elementwert muss ein Konstantenausdruck sein
-
-# 0: string (statement type)
-compiler.err.bad.initializer=Ung\u00FCltiger Initializer f\u00FCr {0}
-
-compiler.err.break.outside.switch.loop=Unterbrechung au\u00DFerhalb Switch oder Schleife
-
-compiler.err.break.outside.switch.expression=Versuch, Vorgang aus einem Switch-Ausdruck zu unterbrechen
-
-compiler.err.continue.outside.switch.expression=Versuch, Vorgang aus einem Switch-Ausdruck fortzusetzen
-
-compiler.err.return.outside.switch.expression=Versuch, aus einem Switch-Ausdruck zur\u00FCckzukehren
-
-compiler.err.rule.completes.normally=Switch-Regel wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Regeln in Switch-Ausdr\u00FCcken m\u00FCssen einen Wert oder Throw angeben)
-
-compiler.err.switch.expression.completes.normally=Switch-Ausdruck wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Ausdr\u00FCcke m\u00FCssen einen Wert angeben oder einen Throw f\u00FCr alle m\u00F6glichen Eingabewerte ausgeben)
-
-compiler.err.no.switch.expression ="yield" au\u00DFerhalb von Switch-Ausdruck
-
-compiler.err.no.switch.expression.qualify="yield" au\u00DFerhalb von Switch-Ausdruck\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
-
-compiler.err.invalid.yield=Ung\u00FCltige Verwendung der eingeschr\u00E4nkten ID "yield"\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
-
-compiler.warn.invalid.yield="yield" kann in einem zuk\u00FCnftigen Release zu einer eingeschr\u00E4nkten ID werden\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
-
-compiler.err.switch.expression.empty=Switch-Ausdruck enth\u00E4lt keine CASE-Klauseln
-
-compiler.err.switch.expression.no.result.expressions=Switch-Ausdruck enth\u00E4lt keine Ergebnisausdr\u00FCcke
-
-# 0: name
-compiler.err.call.must.be.first.stmt.in.ctor=Aufruf von {0} muss die erste Anweisung im Konstruktor sein
-
-# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
-compiler.err.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebenen Typen angewendet werden.\nErforderlich: {2}\nErmittelt:    {3}\nGrund: {6}
-
-# 0: symbol kind, 1: name, 2: list of type
-compiler.err.cant.apply.symbols={0} f\u00FCr {1}({2}) nicht geeignet
-
-# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
-compiler.misc.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebenen Typen angewendet werden\nErforderlich: {2}\nErmittelt:    {3}\nGrund: {6}
-
-# 0: symbol kind, 1: name, 2: list of type
-compiler.misc.cant.apply.symbols={0} f\u00FCr {1}({2}) nicht geeignet
-
-# 0: kind name, 1: symbol
-compiler.misc.no.abstracts=Keine abstrakte Methode in {0} {1} gefunden
-
-# 0: kind name, 1: symbol
-compiler.misc.incompatible.abstracts=Mehrere nicht \u00FCberschreibende abstrakte Methoden in {0} {1} gefunden
-
-compiler.err.bad.functional.intf.anno=Unerwartete @FunctionalInterface-Annotation
-
-# 0: message segment
-compiler.err.bad.functional.intf.anno.1=Unerwartete @FunctionalInterface-Annotation\n{0}
-
-# 0: message segment
-compiler.err.anonymous.diamond.method.does.not.override.superclass=Methode \u00FCberschreibt oder implementiert keine Methode aus einem Supertyp\n{0}
-
-# 0: symbol
-compiler.misc.not.a.functional.intf={0} ist keine Funktionsschnittstelle
-
-# 0: symbol, 1: message segment
-compiler.misc.not.a.functional.intf.1={0} ist keine Funktionsschnittstelle\n{1}
-
-# 0: type, 1: kind name, 2: symbol
-compiler.misc.invalid.generic.lambda.target=Ung\u00FCltiger Funktionsdeskriptor f\u00FCr Lambda-Ausdruck\nMethode {0} in {1} {2} ist generisch
-
-# 0: kind name, 1: symbol
-compiler.misc.incompatible.descs.in.functional.intf=Inkompatible Funktionsdeskriptoren in {0} {1} gefunden
-
-# 0: name, 1: list of type, 2: type, 3: list of type
-compiler.misc.descriptor=Deskriptor: {2} {0}({1})
-
-# 0: name, 1: list of type, 2: type, 3: list of type
-compiler.misc.descriptor.throws=Deskriptor: {2} {0}({1}) l\u00F6st {3} aus
-
-# 0: type
-compiler.misc.no.suitable.functional.intf.inst=Funktionsschnittstellendeskriptor f\u00FCr {0} kann nicht abgeleitet werden
-
-# 0: message segment
-compiler.misc.bad.intersection.target.for.functional.expr=Ung\u00FCltiges Schnittmengentypziel f\u00FCr Lambda oder Methodenreferenz\n{0}
-
-# 0: symbol or type
-compiler.misc.not.an.intf.component=Komponententyp {0} ist keine Schnittstelle
-
-# 0: kind name, 1: message segment
-compiler.err.invalid.mref=Ung\u00FCltige {0}-Referenz\n{1}
-
-# 0: kind name, 1: message segment
-compiler.misc.invalid.mref=Ung\u00FCltige {0}-Referenz\n{1}
-
-compiler.misc.static.mref.with.targs=Parametrisierter Qualifier f\u00FCr statische Methodenreferenz
-
-# 0: symbol
-compiler.err.cant.assign.val.to.final.var=Der finalen Variable {0} kann kein Wert zugewiesen werden
-
-compiler.err.cant.assign.val.to.this=Zuweisen zu "this" nicht m\u00F6glich
-
-# 0: symbol, 1: message segment
-compiler.err.cant.ref.non.effectively.final.var=Von {1} referenzierte lokale Variablen m\u00FCssen final oder effektiv final sein
-
-compiler.err.try.with.resources.expr.needs.var=Die try-with-resources-Ressource muss eine Variablendeklaration oder ein Ausdruck mit einer Referenz zu einer finalen oder effektiv finalen Variable sein
-
-# 0: symbol
-compiler.err.try.with.resources.expr.effectively.final.var=Variable {0}, die als try-with-resources-Ressource verwendet wurde, ist weder final noch effektiv final
-
-
-compiler.misc.lambda=Lambda-Ausdruck
-
-compiler.misc.inner.cls=Innere Klasse
-
-compiler.misc.guard=Guard
-
-# 0: type
-compiler.err.cant.deref={0} kann nicht dereferenziert werden
-
-compiler.err.cant.extend.intf.annotation="extends" f\u00FCr @interfaces nicht zul\u00E4ssig
-
-compiler.err.annotation.decl.not.allowed.here=Annotationsschnittstellendeklaration hier nicht zul\u00E4ssig
-
-# 0: symbol
-compiler.err.cant.inherit.from.final=Erben aus finalem {0}-Element nicht m\u00F6glich
-
-# 0: symbol or string
-compiler.err.cant.ref.before.ctor.called={0} kann nicht referenziert werden, bevor der Supertypkonstruktor aufgerufen wurde
-
-compiler.err.cant.select.static.class.from.param.type=Statische Klasse kann nicht aus einem parametrisierten Typ ausgew\u00E4hlt werden
-
-# 0: symbol, 1: string, 2: string
-compiler.err.cant.inherit.diff.arg={0} kann nicht mit verschiedenen Argumenten geerbt werden: <{1}> und <{2}>
-
-compiler.err.catch.without.try="catch" ohne "try"
-
-# 0: kind name, 1: symbol
-compiler.err.clash.with.pkg.of.same.name={0} {1} steht in Konflikt mit Package desselben Namens
-
-compiler.err.class.not.allowed=Klassen-, Schnittstellen- oder Enum-Deklaration hier nicht zul\u00E4ssig
-
-compiler.err.const.expr.req=Konstantenausdruck erforderlich
-
-compiler.err.cont.outside.loop=Fortsetzung au\u00DFerhalb Schleife
-
-# 0: symbol or type
-compiler.err.cyclic.inheritance=Zyklische Vererbung mit {0}
-
-# 0: symbol
-compiler.err.cyclic.annotation.element=Typ von Element {0} ist zyklisch
-
-# 0: symbol
-compiler.err.call.to.super.not.allowed.in.enum.ctor=Aufruf von Super in Enum-Konstruktor nicht zul\u00E4ssig
-
-# 0: type
-compiler.err.no.superclass={0} weist keine Superklasse auf.
-
-# 0: symbol, 1: type, 2: symbol, 3: type, 4: type
-compiler.err.concrete.inheritance.conflict=Methoden {0} von {1} und {2} von {3} werden mit derselben Signatur geerbt
-
-compiler.err.default.allowed.in.intf.annotation.member=Standardwert nur in einer Annotationsschnittstellendeklaration zul\u00E4ssig
-
-# 0: symbol
-compiler.err.doesnt.exist=Package {0} ist nicht vorhanden
-
-# 0: type
-compiler.err.duplicate.annotation.invalid.repeated=Annotation {0} ist keine g\u00FCltige wiederholbare Annotation
-
-# 0: name, 1: type
-compiler.err.duplicate.annotation.member.value=Doppeltes Element "{0}" in Annotation @{1}.
-
-# 0: type
-compiler.err.duplicate.annotation.missing.container={0} ist keine wiederholbare Annotationsschnittstelle
-
-# 0: symbol
-compiler.err.invalid.repeatable.annotation=Doppelte Annotation: {0} ist mit einer ung\u00FCltigen @Repeatable-Annotation versehen
-
-# 0: symbol or type
-compiler.err.invalid.repeatable.annotation.no.value={0} ist keine g\u00FCltige @Repeatable-Annotation. Keine Wertelementmethode deklariert
-
-# 0: type, 1: number
-compiler.err.invalid.repeatable.annotation.multiple.values={0} ist keine g\u00FCltige @Repeatable-Annotation. {1} Elementmethoden namens "value" deklariert
-
-# 0: type
-compiler.err.invalid.repeatable.annotation.invalid.value={0} ist keine g\u00FCltige @Repeatable-Annotation. Ung\u00FCltiges Wertelement
-
-# 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u00DCbergeordnete Annotationsschnittstelle ({0}) muss ein Element namens "value" mit dem Typ {2} deklarieren
-
-# 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u00DCbergeordnete Annotationsschnittstelle ({0}) enth\u00E4lt keinen Standardwert f\u00FCr Element {1}
-
-# 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=Aufbewahrung der \u00FCbergeordneten Annotationsschnittstelle ({0}) ist k\u00FCrzer als die Aufbewahrung der wiederholbaren Annotationsschnittstelle ({2})
-
-# 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=Wiederholbare Annotationsschnittstelle ({1}) ist @Documented, die \u00FCbergeordnete Annotationsschnittstelle ({0}) aber nicht
-
-# 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=Wiederholbare Annotationsschnittstelle ({1}) ist @Inherited, die \u00FCbergeordnete Annotationsschnittstelle ({0}) aber nicht
-
-# 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u00DCbergeordnete Annotationsschnittstelle ({0}) gilt f\u00FCr mehr Ziele als die wiederholbare Annotationsschnittstelle ({1})
-
-# 0: symbol
-compiler.err.invalid.repeatable.annotation.repeated.and.container.present=Container {0} darf nicht gleichzeitig mit dem darin enthaltenen Element vorhanden sein
-
-# 0: type, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.applicable=Container {0} ist nicht anwendbar f\u00FCr Element {1}
-
-# 0: type
-compiler.err.invalid.repeatable.annotation.not.applicable.in.context=Container {0} ist in diesem Typkontext nicht anwendbar
-
-# 0: name
-compiler.err.duplicate.class=Doppelte Klasse: {0}
-
-# 0: name, 1: name
-compiler.err.same.binary.name=Klassen {0} und {1} haben denselben bin\u00E4ren Namen
-
-compiler.err.duplicate.case.label=Doppeltes CASE-Label
-
-compiler.err.pattern.dominated=Dieses CASE-Label wird von einem vorherigen CASE-Label dominiert
-
-compiler.err.duplicate.default.label=Doppeltes Standardlabel
-
-compiler.err.duplicate.total.pattern=Doppeltes Gesamtmuster
-
-compiler.err.total.pattern.and.default=Switch umfasst sowohl Gesamtmuster als auch Standardlabel
-
-# 0: type, 1: type
-compiler.err.constant.label.not.compatible=Konstantes Label des Typs {0} ist nicht mit Switch-Selektortyp {1} kompatibel
-
-compiler.err.flows.through.to.pattern=Ung\u00FCltiger Fallthrough zu einem Muster
-
-compiler.err.flows.through.from.pattern=Ung\u00FCltiger Fallthrough von einem Muster
-
-compiler.err.else.without.if="else" ohne "if"
-
-compiler.err.empty.char.lit=Leeres Zeichenliteral
-
-# 0: symbol
-compiler.err.encl.class.required=Eine einschlie\u00DFende Instanz mit {0} ist erforderlich
-
-compiler.err.enum.annotation.must.be.enum.constant=Ein Enum-Annotationswert muss eine Enum-Konstante sein
-
-compiler.err.enum.cant.be.instantiated=Enum-Klassen d\u00FCrfen nicht instanziiert werden
-
-compiler.err.enum.label.must.be.unqualified.enum=Das CASE-Label eines Enum-Switches muss der unqualifizierte Name einer Enumerationskonstante sein
-
-compiler.err.enum.no.subclassing=Klassen k\u00F6nnen java.lang.Enum nicht direkt erweitern
-
-compiler.err.enum.types.not.extensible=Enum-Klassen sind nicht erweiterbar
-
-compiler.err.enum.no.finalize=Enums k\u00F6nnen keine Finalisierungsmethoden aufweisen
-
-# 0: file name, 1: string
-compiler.err.error.reading.file=Fehler beim Lesen von {0}. {1}
-
-# 0: type
-compiler.err.except.already.caught=Ausnahme {0} wurde bereits abgefangen
-
-# 0: type
-compiler.err.except.never.thrown.in.try=Ausnahme {0} wird nie im Body der entsprechenden try-Anweisung ausgel\u00F6st
-
-# 0: symbol
-compiler.err.final.parameter.may.not.be.assigned=final-Parameter {0} darf nicht zugewiesen werden
-
-# 0: symbol
-compiler.err.try.resource.may.not.be.assigned=auto-closeable-Ressource {0} darf nicht zugewiesen werden
-
-# 0: symbol
-compiler.err.multicatch.parameter.may.not.be.assigned=multi-catch-Parameter {0} darf nicht zugewiesen werden
-
-# 0: type, 1: type
-compiler.err.multicatch.types.must.be.disjoint=Alternativen in einer multi-catch-Anweisung d\u00FCrfen nicht durch Unterklassen verkn\u00FCpft sein\nAlternative {0} ist eine Unterklasse der Alternative {1}
-
-compiler.err.finally.without.try="finally" ohne "try"
-
-# 0: type, 1: message segment
-compiler.err.foreach.not.applicable.to.type=for-each nicht auf Ausdruckstyp anwendbar\nErforderlich: {1}\nErmittelt:    {0}
-
-compiler.err.fp.number.too.large=Gleitkommazahl zu gro\u00DF
-
-compiler.err.fp.number.too.small=Gleitkommazahl zu klein
-
-compiler.err.generic.array.creation=Erstellung von generischem Array
-
-compiler.err.generic.throwable=Eine generische Klasse darf java.lang.Throwable nicht erweitern
-
-# 0: symbol
-compiler.err.icls.cant.have.static.decl=Unzul\u00E4ssige static-Deklaration in innerer Klasse {0}\nModifikator "static" ist nur in Konstantenvariablendeklarationen zul\u00E4ssig
-
-# 0: string
-compiler.err.illegal.char=Unzul\u00E4ssiges Zeichen: "{0}"
-
-# 0: string, 1: string
-compiler.err.illegal.char.for.encoding=Nicht zuordenbares Zeichen (0x{0}) f\u00FCr Codierung {1}
-
-# 0: set of flag, 1: set of flag
-compiler.err.illegal.combination.of.modifiers=Unzul\u00E4ssige Kombination aus Modifikatoren: {0} und {1}
-
-compiler.err.illegal.enum.static.ref=Unzul\u00E4ssige Referenz zu statischem Feld aus Initializer
-
-compiler.err.illegal.esc.char=Unzul\u00E4ssiges Escapezeichen
-
-compiler.err.illegal.forward.ref=Unzul\u00E4ssige Vorw\u00E4rtsreferenz
-
-# 0: symbol, 1: object
-compiler.err.not.in.profile={0} ist in Profil "{1}" nicht verf\u00FCgbar
-
-# 0: symbol
-compiler.warn.forward.ref=Referenz zu Variable "{0}", bevor sie initialisiert wurde
-
-compiler.err.illegal.self.ref=Selbstreferenz in Initializer
-
-# 0: symbol
-compiler.warn.self.ref=Selbstreferenz in Initializer von Variable "{0}"
-
-# 0: type
-compiler.err.illegal.initializer.for.type=Unzul\u00E4ssiger Initializer f\u00FCr {0}
-
-compiler.err.illegal.line.end.in.char.lit=Unzul\u00E4ssiges Zeilenende in Zeichenliteral
-
-compiler.err.illegal.text.block.open=Unzul\u00E4ssige Sequenz f\u00FCr \u00D6ffnungstrennzeichen von Textblock. Zeilenabschlusszeichen fehlt
-
-compiler.warn.inconsistent.white.space.indentation=Inkonsistenter Leerzeicheneinzug
-
-compiler.warn.trailing.white.space.will.be.removed=Nachgestelltes Leerzeichen wird entfernt
-
-compiler.err.illegal.nonascii.digit=Unzul\u00E4ssige Nicht-ASCII-Ziffer
-
-compiler.err.illegal.underscore=Unzul\u00E4ssiger Unterstrich
-
-compiler.err.illegal.dot="." unzul\u00E4ssig
-
-# 0: symbol
-compiler.err.illegal.qual.not.icls=Unzul\u00E4ssiger Qualifier. {0} ist keine innere Klasse
-
-compiler.err.illegal.start.of.expr=Unzul\u00E4ssiger Ausdrucksbeginn
-
-compiler.err.illegal.start.of.stmt=Unzul\u00E4ssiger Anweisungsbeginn
-
-compiler.err.illegal.start.of.type=Unzul\u00E4ssiger Typbeginn
-
-compiler.err.illegal.parenthesized.expression=Unzul\u00E4ssiger Ausdruck in Klammern
-
-compiler.err.illegal.unicode.esc=Unzul\u00E4ssiges Unicode-Escapezeichen
-
-# 0: symbol
-compiler.err.import.requires.canonical=Import erfordert kanonischen Namen f\u00FCr {0}
-
-compiler.err.improperly.formed.type.param.missing=Falsch formatierter Typ. Einige Parameter fehlen
-
-compiler.err.improperly.formed.type.inner.raw.param=Falsch formatierter Typ. Typargumente f\u00FCr Raw-Typ angegeben
-
-# 0: type, 1: type
-compiler.err.incomparable.types=Nicht vergleichbare Typen: {0} und {1}
-
-# 0: string
-compiler.err.int.number.too.large=Ganzzahl zu gro\u00DF
-
-compiler.err.intf.annotation.members.cant.have.params=Elemente in Annotationsschnittstellendeklarationen k\u00F6nnen keine formalen Parameter deklarieren
-
-# 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=Annotationsschnittstelle {0} darf nicht generisch sein
-
-compiler.err.intf.annotation.members.cant.have.type.params=Elemente in Annotationsschnittstellendeklarationen k\u00F6nnen keine generischen Methoden sein
-
-# 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=Annotationsschnittstelle {1} deklariert ein Element mit demselben Namen wie Methode {0}
-
-compiler.err.intf.expected.here=Hier wird eine Schnittstelle erwartet
-
-compiler.err.intf.meth.cant.have.body=Abstrakte Schnittstellenmethoden k\u00F6nnen keinen Body enthalten
-
-compiler.err.invalid.annotation.member.type=Ung\u00FCltiger Typ f\u00FCr Annotationsschnittstellenelement
-
-compiler.err.invalid.binary.number=Bin\u00E4rzahlen m\u00FCssen mindestens eine Bin\u00E4rziffer enthalten
-
-compiler.err.invalid.hex.number=Hexadezimalzahlen m\u00FCssen mindestens eine Hexadezimalziffer enthalten
-
-compiler.err.invalid.meth.decl.ret.type.req=Ung\u00FCltige Methodendeklaration. R\u00FCckgabetyp erforderlich
-
-compiler.err.varargs.and.old.array.syntax=Legacy-Arraynotation f\u00FCr Parameter mit variabler Argumentanzahl nicht zul\u00E4ssig
-
-compiler.err.varargs.and.receiver =varargs-Notation f\u00FCr receiver-Parameter nicht zul\u00E4ssig
-
-compiler.err.varargs.must.be.last =varargs-Parameter muss der letzte Parameter sein
-
-compiler.err.array.and.receiver =Legacy-Arraynotation f\u00FCr receiver-Parameter nicht zul\u00E4ssig
-
-compiler.err.wrong.receiver =Falscher receiver-Parametername
-
-compiler.err.variable.not.allowed=Variablendeklaration hier nicht zul\u00E4ssig
-
-# 0: name
-compiler.err.label.already.in.use=Label {0} wird bereits verwendet
-
-# 0: symbol
-compiler.err.local.var.accessed.from.icls.needs.final=Auf lokale Variable {0} wird von innerer Klasse zugegriffen. Sie muss als final deklariert werden
-
-compiler.err.local.enum=Enum-Klassen d\u00FCrfen nicht lokal sein
-
-compiler.err.cannot.create.array.with.type.arguments=Array kann nicht mit Typargumenten erstellt werden
-
-compiler.err.cannot.create.array.with.diamond=Array kann nicht mit "<>" erstellt werden
-
-compiler.err.invalid.module.directive=Moduldirektiven-Schl\u00FCsselwort oder "}" erwartet
-
-#
-# limits.  We don't give the limits in the diagnostic because we expect
-# them to change, yet we want to use the same diagnostic.  These are all
-# detected during code generation.
-#
-compiler.err.limit.code=Code zu gro\u00DF
-
-compiler.err.limit.code.too.large.for.try.stmt=Code f\u00FCr try-Anweisung zu gro\u00DF
-
-compiler.err.limit.dimensions=Arraytyp hat zu viele Dimensionen
-
-compiler.err.limit.locals=Zu viele lokale Variablen
-
-compiler.err.limit.parameters=Zu viele Parameter
-
-compiler.err.limit.pool=Zu viele Konstanten
-
-compiler.err.limit.pool.in.class=Zu viele Konstanten in Klasse {0}
-
-compiler.err.limit.stack=Code erfordert zu viel Stack
-
-compiler.err.limit.string=Konstantenzeichenfolge zu lang
-
-# 0: string
-compiler.err.limit.string.overflow=UTF8-Darstellung f\u00FCr Zeichenfolge "{0}..." ist zu lang f\u00FCr den Konstantenpool
-
-compiler.err.malformed.fp.lit=Nicht wohlgeformtes Gleitkommaliteral
-
-compiler.err.method.does.not.override.superclass=Methode \u00FCberschreibt oder implementiert keine Methode aus einem Supertyp
-
-compiler.err.static.methods.cannot.be.annotated.with.override=Statische Methoden k\u00F6nnen nicht mit @Override-Annotation versehen werden
-
-compiler.err.missing.meth.body.or.decl.abstract=Methodenbody fehlt oder als abstrakt deklarieren
-
-compiler.err.missing.ret.stmt=R\u00FCckgabeanweisung fehlt
-
-# 0: type
-compiler.misc.missing.ret.val=R\u00FCckgabewert fehlt
-
-compiler.misc.unexpected.ret.val=Unerwarteter R\u00FCckgabewert
-
-# 0: set of flag
-compiler.err.mod.not.allowed.here=Modifikator {0} hier nicht zul\u00E4ssig
-
-# 0: name
-compiler.err.modifier.not.allowed.here=Modifikator {0} hier nicht zul\u00E4ssig
-
-compiler.err.intf.not.allowed.here=Schnittstelle hier nicht zul\u00E4ssig
-
-# 0: symbol, 1: symbol
-compiler.err.name.clash.same.erasure=Namenskonflikt: {0} und {1} haben dieselbe Erasure
-
-# 0: name, 1: list of type, 2: symbol, 3: name, 4: list of type, 5: symbol
-compiler.err.name.clash.same.erasure.no.override=Namenskonflikt: {0}({1}) in {2} und {3}({4}) in {5} haben dieselbe Erasure, aber keine setzt die andere au\u00DFer Kraft
-
-# 0: string, 1: name, 2: name, 3: list of type, 4: symbol, 5: name, 6: list of type, 7: symbol
-compiler.err.name.clash.same.erasure.no.override.1=Namenskonflikt: {0} {1} hat zwei Methoden mit derselben Erasure, aber keine setzt die andere au\u00DFer Kraft\nErste Methode: {2}({3}) in {4}\nZweite Methode: {5}({6}) in {7}
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.err.name.clash.same.erasure.no.hide=Namenskonflikt: {0} in {1} und {2} in {3} haben dieselbe Erasure, aber keine blendet die andere aus
-
-compiler.err.name.reserved.for.internal.use={0} ist f\u00FCr den internen Gebrauch reserviert
-
-compiler.err.native.meth.cant.have.body=Native Methoden k\u00F6nnen keinen Body enthalten
-
-
-# 0: message segment
-compiler.misc.incompatible.type.in.conditional=Ung\u00FCltiger Typ in Bedingungsausdruck\n{0}
-
-compiler.misc.conditional.target.cant.be.void=target-type f\u00FCr Bedingungsausdruck darf nicht "void" sein
-
-compiler.misc.switch.expression.target.cant.be.void=target-type f\u00FCr Switch-Ausdruck darf nicht "void" sein
-
-# 0: message segment
-compiler.misc.incompatible.type.in.switch.expression=Ung\u00FCltiger Typ in Switch-Ausdruck\n{0}
-
-# 0: message segment
-compiler.misc.incompatible.ret.type.in.lambda=Ung\u00FCltiger R\u00FCckgabetyp in Lambda-Ausdruck\n{0}
-
-compiler.misc.stat.expr.expected=Lambda-Body ist nicht mit einer void-Funktionsschnittstelle kompatibel\n(verwenden Sie stattdessen einen Block-Lambda-Body oder einen Anweisungsausdruck)
-
-# 0: message segment
-compiler.misc.incompatible.ret.type.in.mref=Ung\u00FCltiger R\u00FCckgabetyp in Methodenreferenz\n{0}
-
-compiler.err.lambda.body.neither.value.nor.void.compatible=Lambda-Body ist weder mit Wert noch mit "void "kompatibel
-
-# 0: list of type
-compiler.err.incompatible.thrown.types.in.mref=Inkompatible ausgel\u00F6ste Typen {0} in Funktionsausdruck
-
-compiler.misc.incompatible.arg.types.in.lambda=Inkompatible Parametertypen in Lambda-Ausdruck
-
-compiler.misc.incompatible.arg.types.in.mref=Inkompatible Parametertypen in Methodenreferenz
-
-compiler.err.new.not.allowed.in.annotation="new" in einer Annotation nicht zul\u00E4ssig
-
-# 0: name, 1: type
-compiler.err.no.annotation.member=Kein Annotationsmitglied {0} in {1}
-
-# 0: symbol
-compiler.err.no.encl.instance.of.type.in.scope=Keine einschlie\u00DFende Instanz vom Typ {0} im Geltungsbereich
-
-compiler.err.no.intf.expected.here=Hier wird keine Schnittstelle erwartet
-
-compiler.err.no.match.entry={0} hat keine \u00DCbereinstimmung im Eintrag in {1}. {2} erforderlich
-
-# 0: type
-compiler.err.not.annotation.type={0} ist keine Annotationsschnittstelle
-
-# 0: symbol, 1: symbol, 2: message segment
-compiler.err.not.def.access.package.cant.access={0} ist nicht sichtbar\n({2})
-
-# 0: symbol, 1: symbol, 2: message segment
-compiler.misc.not.def.access.package.cant.access={0} ist nicht sichtbar\n({2})
-
-# 0: symbol, 1: message segment
-compiler.err.package.not.visible=Package {0} ist nicht sichtbar\n({1})
-
-# 0: symbol, 1: message segment
-compiler.misc.package.not.visible=Package {0} ist nicht sichtbar\n({1})
-
-# {0} - current module
-# {1} - package in which the invisible class is declared
-# {2} - module in which {1} is declared
-# 0: symbol, 1: symbol, 2: symbol
-compiler.misc.not.def.access.does.not.read=Package {1} wird in Modul {2} deklariert, aber nicht von Modul {0} gelesen
-
-# {0} - package in which the invisible class is declared
-# {1} - module in which {0} is declared
-# 0: symbol, 1: symbol
-compiler.misc.not.def.access.does.not.read.from.unnamed=Package {0} wird in Modul {1} deklariert, das nicht im Moduldiagramm enthalten ist
-
-# {0} - package in which the invisible class is declared
-# {1} - current module
-# 0: symbol, 1: symbol
-compiler.misc.not.def.access.does.not.read.unnamed=Package {0} wird im unbenannten Modul deklariert, aber nicht von Modul {1} gelesen
-
-# {0} - package in which the invisible class is declared
-# {1} - module in which {0} is declared
-# 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported=Package {0} wird in Modul {1} deklariert, aber nicht exportiert
-
-# {0} - package in which the invisible class is declared
-# {1} - module in which {0} is declared
-# 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported.from.unnamed=Package {0} wird in Modul {1} deklariert, aber nicht exportiert
-
-# {0} - package in which the invisible class is declared
-# {1} - module in which {0} is declared
-# {2} - current module
-# 0: symbol, 1: symbol, 2: symbol
-compiler.misc.not.def.access.not.exported.to.module=Package {0} wird in Modul {1} deklariert, aber nicht in Modul {2} exportiert
-
-# {0} - package in which the invisible class is declared
-# {1} - module in which {0} is declared
-# 0: symbol, 1: symbol
-compiler.misc.not.def.access.not.exported.to.module.from.unnamed=Package {0} wird in Modul {1} deklariert, aber nicht in das unbenannte Modul exportiert
-
-# 0: symbol, 1: symbol
-compiler.err.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zug\u00E4nglichen Klasse oder Schnittstelle definiert
-
-# 0: symbol, 1: symbol
-compiler.misc.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zug\u00E4nglichen Klasse oder Schnittstelle definiert
-
-# 0: symbol, 1: symbol, 2: symbol, 3: message segment
-compiler.err.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zug\u00E4nglich\n({3})
-
-# 0: symbol, 1: symbol, 2: symbol, 3: message segment
-compiler.misc.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zug\u00E4nglich\n({3})
-
-# 0: symbol, 1: list of type, 2: type
-compiler.misc.cant.access.inner.cls.constr=Zugriff auf Konstruktor {0}({1}) nicht m\u00F6glich\nEinschlie\u00DFende Instanz vom Typ {2} ist nicht im Geltungsbereich
-
-# 0: symbol, 1: symbol
-compiler.err.not.def.public.cant.access={0} ist nicht \u00F6ffentlich in {1}. Zugriff von externem Package nicht m\u00F6glich
-
-# 0: symbol, 1: symbol
-compiler.err.not.def.public={0} ist nicht \u00F6ffentlich in {1}
-
-# 0: symbol, 1: symbol
-compiler.misc.not.def.public.cant.access={0} ist nicht \u00F6ffentlich in {1}. Zugriff von externem Package nicht m\u00F6glich
-
-# 0: name
-compiler.err.not.loop.label=Kein Schleifenlabel: {0}
-
-compiler.err.not.stmt=Keine Anweisung
-
-# 0: symbol
-compiler.err.not.encl.class=Keine einschlie\u00DFende Klasse: {0}
-
-# 0: name, 1: type
-compiler.err.operator.cant.be.applied=Ung\u00FCltiger Operandentyp {1} f\u00FCr un\u00E4ren Operator "{0}"
-
-# 0: name, 1: type, 2: type
-compiler.err.operator.cant.be.applied.1=Ung\u00FCltige Operandentypen f\u00FCr un\u00E4ren Operator "{0}"\nErster Typ: {1}\nZweiter Typ: {2}
-
-compiler.err.pkg.annotations.sb.in.package-info.java=Packageannotationen m\u00FCssen in der Datei package-info.java vorhanden sein
-
-compiler.err.no.pkg.in.module-info.java=Packagedeklarationen in Datei module-info.java nicht zul\u00E4ssig
-
-# 0: symbol
-compiler.err.pkg.clashes.with.class.of.same.name=Es besteht ein Konflikt zwischen dem Package {0} und einer gleichnamigen Klasse
-
-compiler.err.warnings.and.werror=Warnungen gefunden und -Werror angegeben
-
-# Errors related to annotation processing
-
-# 0: symbol, 1: message segment, 2: string (stack-trace)
-compiler.err.proc.cant.access=Kein Zugriff auf {0}\n{1}\nDetails finden Sie im folgenden Stacktrace.\n{2}
-
-# 0: symbol, 1: message segment
-compiler.err.proc.cant.access.1=Kein Zugriff auf {0}\n{1}
-
-# 0: string
-compiler.err.proc.cant.find.class=Klassendatei f\u00FCr "{0}" konnte nicht gefunden werden.
-
-# 0: string
-compiler.err.proc.cant.load.class=Prozessorklassendatei konnte nicht geladen werden. Grund: "{0}".
-
-# Print a client-generated error message; assumed to be localized, no translation required
-# 0: string
-compiler.err.proc.messager={0}
-
-# 0: string
-compiler.misc.exception.message={0}
-
-compiler.misc.user.selected.completion.failure=Von Benutzer ausgew\u00E4hlter Abschlussfehler nach Klassenname
-
-# 0: collection of string
-compiler.err.proc.no.explicit.annotation.processing.requested=Klassennamen "{0}" werden nur akzeptiert, wenn die Annotationsverarbeitung explizit angefordert wird
-
-compiler.err.proc.no.service=ServiceLoader konnte nicht verwendet werden und ist f\u00FCr Annotationsverarbeitung erforderlich.
-
-# 0: string, 1: string
-compiler.err.proc.processor.bad.option.name=Ung\u00FCltiger Optionsname "{0}" von Prozessor "{1}" angegeben
-
-# 0: string
-compiler.err.proc.processor.cant.instantiate=Instanz von Prozessor "{0}" konnte nicht instanziiert werden
-
-# 0: string
-compiler.err.proc.processor.not.found=Annotationsprozessor "{0}" nicht gefunden
-
-# 0: string
-compiler.err.proc.processor.wrong.type=Annotationsprozessor "{0}" implementiert nicht javax.annotation.processing.Processor
-
-compiler.err.proc.service.problem=Fehler beim Erstellen eines Service-Loaders zum Laden von Prozessoren.
-
-# 0: string
-compiler.err.proc.bad.config.file=Ung\u00FCltige Servicekonfigurationsdatei, oder Ausnahme beim Erstellen des Prozessorobjekts ausgel\u00F6st: {0}
-
-compiler.err.proc.cant.create.loader=Class Loader konnte nicht f\u00FCr Annotationsprozessoren erstellt werden: {0}
-
-# 0: symbol
-compiler.err.qualified.new.of.static.class="new" von statischer Klasse qualifiziert
-
-compiler.err.recursive.ctor.invocation=Rekursiver Konstruktoraufruf
-
-# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
-compiler.err.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen \u00FCberein
-
-# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
-compiler.misc.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen \u00FCberein
-
-compiler.err.repeated.annotation.target=Wiederholtes Annotationsziel
-
-compiler.err.repeated.interface=Wiederholte Schnittstelle
-
-compiler.err.repeated.modifier=Wiederholter Modifikator
-
-# 0: symbol, 1: set of modifier, 2: symbol
-compiler.err.report.access={0} hat {1}-Zugriff in {2}
-
-# 0: symbol, 1: set of modifier, 2: symbol
-compiler.misc.report.access={0} hat {1}-Zugriff in {2}
-
-compiler.err.ret.outside.meth=R\u00FCckgabe au\u00DFerhalb von Methode
-
-compiler.err.signature.doesnt.match.supertype=Signatur stimmt nicht mit {0} \u00FCberein. Inkompatibler Supertyp
-
-compiler.err.signature.doesnt.match.intf=Signatur stimmt nicht mit {0} \u00FCberein. Inkompatible Schnittstellen
-
-# 0: symbol, 1: symbol, 2: symbol
-compiler.err.does.not.override.abstract={0} ist nicht abstrakt und setzt die abstrakte Methode {1} in {2} nicht au\u00DFer Kraft
-
-# 0: file object
-compiler.err.source.cant.overwrite.input.file=Fehler beim Schreiben von Quelle. Eingabedatei {0} kann nicht \u00FCberschrieben werden
-
-# 0: symbol
-compiler.err.stack.sim.error=Interner Fehler: Stacksimulationsfehler in {0}
-
-compiler.err.static.imp.only.classes.and.interfaces=Statischer Import nur aus Klassen und Schnittstellen
-
-compiler.err.string.const.req=Konstanten-Zeichenfolgenausdruck erforderlich
-
-compiler.err.pattern.expected=Typmuster erwartet
-
-# 0: symbol, 1: fragment
-compiler.err.cannot.generate.class=Fehler beim Generieren der Klasse {0}\n({1})
-
-# 0: symbol, 1: symbol
-compiler.misc.synthetic.name.conflict=Das Symbol {0} steht mit einem vom Compiler synthetisierten Symbol in {1} in Konflikt
-
-# 0: symbol, 1: type
-compiler.misc.illegal.signature=Unzul\u00E4ssiges Signaturattribut f\u00FCr Typ {1}
-
-compiler.err.throws.not.allowed.in.intf.annotation=Throws-Klausel in @interface-Mitgliedern nicht zul\u00E4ssig
-
-compiler.err.try.without.catch.finally.or.resource.decls="try" ohne "catch", "finally" oder Ressourcendeklarationen
-
-# 0: symbol
-compiler.err.type.doesnt.take.params=Typ {0} akzeptiert keine Parameter
-
-compiler.err.type.var.cant.be.deref=Auswahl aus Typvariable nicht m\u00F6glich
-
-compiler.err.type.var.may.not.be.followed.by.other.bounds=Auf eine Typvariable d\u00FCrfen keine anderen Begrenzungen folgen
-
-compiler.err.type.var.more.than.once=Typvariable {0} tritt mehrmals im Ergebnistyp von {1} auf. Sie muss instanziiert werden
-
-compiler.err.type.var.more.than.once.in.result=Typvariable {0} tritt mehrmals im Typ von {1} auf. Sie muss instanziiert werden
-
-# 0: type, 1: type, 2: fragment
-compiler.err.types.incompatible=Die Typen {0} und {1} sind inkompatibel.\n{2}
-
-# 0: name, 1: list of type
-compiler.misc.incompatible.diff.ret=Beide definieren {0}({1}), aber mit nicht verwandten R\u00FCckgabetypen
-
-# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.misc.incompatible.unrelated.defaults={0} {1} erbt nicht verwandte Standardwerte f\u00FCr {2}({3}) von Typen {4} und {5}
-
-# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.misc.incompatible.abstract.default={0} {1} erbt abstrakte und Standardmethode f\u00FCr {2}({3}) von Typen {4} und {5}
-
-# 0: name, 1: kind name, 2: symbol
-compiler.err.default.overrides.object.member=Standardmethode {0} in {1} {2} setzt ein Mitglied von java.lang.Object au\u00DFer Kraft
-
-# 0: type
-compiler.err.illegal.static.intf.meth.call=Unzul\u00E4ssiger statischer Schnittstellenmethodenaufruf\nDer Empf\u00E4ngerausdruck muss durch den Typ-Qualifier "{0}" ersetzt werden
-
-# 0: symbol or type, 1: message segment
-compiler.err.illegal.default.super.call=Ung\u00FCltiger Typ-Qualifier {0} in Standardsuperaufruf\n{1}
-
-# 0: symbol, 1: type
-compiler.misc.overridden.default=Methode {0} wird in {1} au\u00DFer Kraft gesetzt
-
-# 0: symbol, 1: type or symbol
-compiler.misc.redundant.supertype=Redundante Schnittstelle {0} wird durch {1} erweitert
-
-compiler.err.unclosed.char.lit=Nicht geschlossenes Zeichenliteral
-
-compiler.err.unclosed.comment=Nicht geschlossener Kommentar
-
-compiler.err.unclosed.str.lit=Nicht geschlossenes Zeichenfolgenliteral
-
-compiler.err.unclosed.text.block=Nicht geschlossener Textblock
-
-# 0: string
-compiler.err.unsupported.encoding=Nicht unterst\u00FCtzte Codierung: {0}
-
-compiler.err.io.exception=Fehler beim Lesen der Quelldatei: {0}
-
-# 0: name
-compiler.err.undef.label=Nicht definiertes Label: {0}
-
-# 0: name
-compiler.err.illegal.ref.to.restricted.type=Unzul\u00E4ssige Referenz zu eingeschr\u00E4nktem Typ "{0}"
-
-# 0: name
-compiler.warn.illegal.ref.to.restricted.type=Unzul\u00E4ssige Referenz zu eingeschr\u00E4nktem Typ "{0}"
-
-# 0: name, 1: source
-compiler.err.restricted.type.not.allowed="{0}" ist hier nicht zul\u00E4ssig\nAb Release {1} ist "{0}" ein eingeschr\u00E4nkter Typname, der nicht f\u00FCr Typdeklarationen verwendet werden kann
-
-# 0: name, 1: source
-compiler.warn.restricted.type.not.allowed=Ab Release {1} ist "{0}" ein eingeschr\u00E4nkter Typname, der nicht f\u00FCr Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
-
-# 0: name, 1: source
-compiler.warn.restricted.type.not.allowed.preview="{0}" kann in einem zuk\u00FCnftigen Release ein eingeschr\u00E4nkter Typname werden, der nicht f\u00FCr Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
-
-# 0: name (variable), 1: message segment
-compiler.err.cant.infer.local.var.type=Typ f\u00FCr lokale Variable {0} kann nicht abgeleitet werden\n({1})
-
-# 0: name
-compiler.err.restricted.type.not.allowed.here="{0}" ist hier nicht zul\u00E4ssig
-
-# 0: name
-compiler.err.restricted.type.not.allowed.array="{0}" ist nicht als Elementtyp eines Arrays zul\u00E4ssig
-
-# 0: name
-compiler.err.restricted.type.not.allowed.compound="{0}" ist nicht in einer zusammengesetzten Deklaration zul\u00E4ssig
-
-# 0: fragment
-compiler.err.invalid.lambda.parameter.declaration=Ung\u00FCltige Lambda-Parameterdeklaration\n({0})
-
-compiler.misc.implicit.and.explicit.not.allowed=Implizit typisierte Parameter k\u00F6nnen nicht mit explizit typisierten Parametern gemischt werden
-
-compiler.misc.var.and.explicit.not.allowed="var" kann nicht mit explizit typisierten Parametern gemischt werden
-
-compiler.misc.var.and.implicit.not.allowed="var" kann nicht mit implizit typisierten Parametern gemischt werden
-
-compiler.misc.local.cant.infer.null=Variablen-Initializer ist "null"
-
-compiler.misc.local.cant.infer.void=Variablen-Initializer ist "void"
-
-compiler.misc.local.missing.init="var" kann nicht f\u00FCr Variable ohne Initializer verwendet werden
-
-compiler.misc.local.lambda.missing.target=Lambda-Ausdruck erfordert einen expliziten Zieltyp
-
-compiler.misc.local.mref.missing.target=Methodenreferenz erfordert einen expliziten Zieltyp
-
-compiler.misc.local.array.missing.target=Array-Initializer erfordert einen expliziten Zieltyp
-
-compiler.misc.local.self.ref="var" kann nicht f\u00FCr selbstreferenzierende Variable verwendet werden
-
-# 0: message segment, 1: unused
-compiler.err.cant.apply.diamond=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden
-
-# 0: message segment or type, 1: message segment
-compiler.err.cant.apply.diamond.1=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden\nGrund: {1}
-
-# 0: message segment or type, 1: message segment
-compiler.misc.cant.apply.diamond.1=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden\nGrund: {1}
-
-compiler.err.unreachable.stmt=Nicht erreichbare Anweisung
-
-compiler.err.not.exhaustive=Der Switch-Ausdruck deckt nicht alle m\u00F6glichen Eingabewerte ab
-
-compiler.err.not.exhaustive.statement=Die Switch-Anweisung deckt nicht alle m\u00F6glichen Eingabewerte ab
-
-compiler.err.initializer.must.be.able.to.complete.normally=Initializer muss normal abgeschlossen werden k\u00F6nnen
-
-compiler.err.initializer.not.allowed=Initializer in Schnittstellen nicht zul\u00E4ssig
-
-# 0: type
-compiler.err.unreported.exception.need.to.catch.or.throw=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgel\u00F6st zu werden
-
-# 0: type
-compiler.err.unreported.exception.default.constructor=Nicht gemeldete Ausnahme {0} in Standardkonstruktor
-
-# 0: type, 1: name
-compiler.err.unreported.exception.implicit.close=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgel\u00F6st zu werden\nAusnahme bei implizitem Aufruf von close() f\u00FCr Ressourcenvariable "{1}" ausgel\u00F6st
-
-compiler.err.void.not.allowed.here="void"-Typ hier nicht zul\u00E4ssig
-
-# 0: string
-compiler.err.wrong.number.type.args=Falsche Anzahl Typargumente. {0} erforderlich
-
-# 0: symbol
-compiler.err.var.might.already.be.assigned=Variable {0} wurde m\u00F6glicherweise bereits zugewiesen
-
-# 0: symbol
-compiler.err.var.might.not.have.been.initialized=Variable {0} wurde m\u00F6glicherweise nicht initialisiert
-
-# 0: symbol
-compiler.err.var.not.initialized.in.default.constructor=Variable {0} nicht im Standardkonstruktor initialisiert
-
-# 0: symbol
-compiler.err.var.might.be.assigned.in.loop=Variable {0} wurde m\u00F6glicherweise in Schleife zugewiesen
-
-# 0: symbol, 1: message segment
-compiler.err.varargs.invalid.trustme.anno=Ung\u00FCltige {0}-Annotation. {1}
-
-# 0: type
-compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs-Elementtyp {0} ist reifizierbar.
-
-# 0: type, 1: type
-compiler.err.instanceof.reifiable.not.safe={0} kann nicht sicher in {1} konvertiert werden
-
-# 0: type, 1: type
-compiler.err.instanceof.pattern.no.subtype=Ausdruckstyp {0} ist ein Subtyp des Mustertyps {1}
-
-# 0: symbol
-compiler.misc.varargs.trustme.on.non.varargs.meth=Methode {0} ist keine varargs-Methode.
-
-# 0: symbol
-compiler.misc.varargs.trustme.on.non.varargs.accessor=Accessor {0} ist keine varargs-Methode.
-
-# 0: symbol
-compiler.misc.varargs.trustme.on.virtual.varargs=Instanzmethode {0} ist weder final noch privat.
-
-# 0: symbol
-compiler.misc.varargs.trustme.on.virtual.varargs.final.only=Instanzmethode {0} ist nicht final.
-
-# 0: type, 1: symbol kind, 2: symbol
-compiler.misc.inaccessible.varargs.type=Auf den formalen varargs-Elementtyp {0} kann nicht von {1} {2} zugegriffen werden
-
-# In the following string, {1} will always be the detail message from
-# java.io.IOException.
-# 0: symbol, 1: string
-compiler.err.class.cant.write=Fehler beim Schreiben von {0}: {1}
-
-# In the following string, {0} is the name of the class in the Java source.
-# It really should be used two times..
-# 0: kind name, 1: name
-compiler.err.class.public.should.be.in.file={0} {1} ist \u00F6ffentlich und muss in einer Datei namens {1}.java deklariert werden
-
-## All errors which do not refer to a particular line in the source code are
-## preceded by this string.
-compiler.err.error=Fehler: 
-
-# The following error messages do not refer to a line in the source code.
-compiler.err.cant.read.file=Lesen nicht m\u00F6glich: {0}
-
-# 0: string
-compiler.err.plugin.not.found=Plug-in nicht gefunden: {0}
-
-# 0: path
-compiler.warn.locn.unknown.file.on.module.path=Unbekannte Datei in Modulpfad: {0}
-
-
-# 0: path
-compiler.err.locn.bad.module-info=Problem beim Lesen von module-info.class in {0}
-
-# 0: path
-compiler.err.locn.cant.read.directory=Verzeichnis {0} kann nicht gelesen werden
-
-# 0: path
-compiler.err.locn.cant.read.file=Datei {0} kann nicht gelesen werden
-
-# 0: path
-compiler.err.locn.cant.get.module.name.for.jar=Modulname f\u00FCr {0} kann nicht bestimmt werden
-
-# 0: path
-compiler.err.multi-module.outdir.cannot.be.exploded.module=Im Modus f\u00FCr mehrere Module kann das Ausgabeverzeichnis kein entpacktes Modul sein: {0}
-
-# 0: path
-compiler.warn.outdir.is.in.exploded.module=Das Ausgabeverzeichnis befindet sich in einem entpackten Modul: {0}
-
-# 0: file object
-compiler.err.locn.module-info.not.allowed.on.patch.path=module-info.class nicht in Patchpfad zul\u00E4ssig: {0}
-
-# 0: string
-compiler.err.locn.invalid.arg.for.xpatch=Ung\u00FCltiges Argument f\u00FCr --patch-module-Option: {0}
-
-compiler.err.file.sb.on.source.or.patch.path.for.module=Datei muss sich im Quellpfad oder im Patchpfad f\u00FCr das Modul befinden
-
-compiler.err.no.java.lang=Package java.lang kann in Plattformklassen nicht gefunden werden
-
-#####
-
-# Fatal Errors
-
-# 0: name
-compiler.misc.fatal.err.cant.locate.meth=Schwerwiegender Fehler: Methode {0} kann nicht gefunden werden
-
-# 0: name
-compiler.misc.fatal.err.cant.locate.field=Schwerwiegender Fehler: Feld {0} kann nicht gefunden werden
-
-# 0: type
-compiler.misc.fatal.err.cant.locate.ctor=Schwerwiegender Fehler: Konstruktor f\u00FCr {0} kann nicht gefunden werden
-
-compiler.misc.fatal.err.cant.close=Schwerwiegender Fehler: Compiler-Ressourcen k\u00F6nnen nicht geschlossen werden
-
-#####
-
-##
-## miscellaneous strings
-##
-
-compiler.misc.diamond.anonymous.methods.implicitly.override=(aufgrund von <> muss jede nicht private Methode, die in dieser anonymen Klasse deklariert ist, eine Methode aus einem Supertyp au\u00DFer Kraft setzen oder implementieren)
-
-compiler.misc.source.unavailable=(Quelle nicht verf\u00FCgbar)
-
-compiler.misc.base.membership=Alle Basisklassen geh\u00F6ren zu dieser Gruppe
-
-# 0: string, 1: string, 2: boolean
-compiler.misc.x.print.processor.info=Prozessor {0} entspricht {1} und gibt {2} zur\u00FCck.
-
-# 0: number, 1: string, 2: set of symbol, 3: boolean
-compiler.misc.x.print.rounds=Runde {0}:\n\tEingabedateien: {1}\n\tAnnotationen: {2}\n\tLetzte Runde: {3}
-
-# 0: file name
-compiler.warn.file.from.future=\u00C4nderungsdatum liegt in der Zukunft f\u00FCr Datei {0}
-
-#####
-
-## The following string will appear before all messages keyed as:
-## "compiler.note".
-
-compiler.note.compressed.diags=Einige Meldungen wurden vereinfacht. Wiederholen Sie die Kompilierung mit -Xdiags:verbose, um die vollst\u00E4ndige Ausgabe abzurufen
-
-# 0: boolean, 1: symbol
-compiler.note.lambda.stat=Lambda-Ausdruck wird \u00FCbersetzt\nAlternative Metafactory = {0}\nSynthetische Methode = {1}
-
-# 0: boolean, 1: unused
-compiler.note.mref.stat=Methodenreferenz wird \u00FCbersetzt\nAlternative Metafactory = {0}\n
-# 0: boolean, 1: symbol
-compiler.note.mref.stat.1=Methodenreferenz wird \u00FCbersetzt\nAlternative Metafactory = {0}\nBridgemethode = {1}
-
-compiler.note.note=Hinweis: 
-
-# 0: file name
-compiler.note.deprecated.filename={0} verwendet oder \u00FCberschreibt eine veraltete API.
-
-compiler.note.deprecated.plural=Einige Eingabedateien verwenden oder \u00FCberschreiben eine veraltete API.
-
-# The following string may appear after one of the above deprecation
-# messages.
-compiler.note.deprecated.recompile=Wiederholen Sie die Kompilierung mit -Xlint:deprecation, um Details zu erhalten.
-
-# 0: file name
-compiler.note.deprecated.filename.additional={0} hat weitere Verwendungen oder Overrides einer veralteten API.
-
-compiler.note.deprecated.plural.additional=Einige Eingabedateien verwenden oder \u00FCberschreiben zus\u00E4tzlich eine veraltete API.
-
-# 0: file name
-compiler.note.removal.filename={0} verwendet oder \u00FCberschreibt eine veraltete API, die zum Entfernen markiert ist.
-
-compiler.note.removal.plural=Einige Eingabedateien verwenden oder \u00FCberschreiben eine veraltete API, die zum Entfernen markiert ist.
-
-# The following string may appear after one of the above removal messages.
-compiler.note.removal.recompile=Wiederholen Sie die Kompilierung mit -Xlint:removal, um Details zu erhalten.
-
-# 0: file name
-compiler.note.removal.filename.additional={0} hat weitere Verwendungen oder Overrides einer veralteten API, die zum Entfernen markiert ist.
-
-compiler.note.removal.plural.additional=Einige Eingabedateien verwenden oder \u00FCberschreiben zus\u00E4tzlich eine veraltete API, die zum Entfernen markiert ist.
-
-# 0: file name
-compiler.note.unchecked.filename={0} verwendet nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
-
-compiler.note.unchecked.plural=Einige Eingabedateien verwenden nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
-
-# The following string may appear after one of the above unchecked messages.
-compiler.note.unchecked.recompile=Wiederholen Sie die Kompilierung mit -Xlint:unchecked, um Details zu erhalten.
-
-# 0: file name
-compiler.note.unchecked.filename.additional={0} weist weitere nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge auf.
-
-compiler.note.unchecked.plural.additional=Einige Eingabedateien verwenden zus\u00E4tzlich nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
-
-# 0: file name, 1: source
-compiler.note.preview.filename={0} verwendet Vorschaufeatures von Java SE {1}.
-
-# 0: source
-compiler.note.preview.plural=Einige Eingabedateien verwenden Vorschaufeatures von Java SE {0}.
-
-# The following string may appear after one of the above deprecation
-# messages.
-compiler.note.preview.recompile=Wiederholen Sie die Kompilierung mit -Xlint:preview, um Details zu erhalten.
-
-# 0: file name, 1: source
-compiler.note.preview.filename.additional={0} hat weitere Verwendungen von Vorschaufeatures von Java SE {1}.
-
-# 0: source
-compiler.note.preview.plural.additional=Einige Eingabedateien verwenden zus\u00E4tzlich Vorschaufeatures von Java SE {0}.
-
-# Notes related to annotation processing
-
-# Print a client-generated note; assumed to be localized, no translation required
-# 0: string
-compiler.note.proc.messager={0}
-
-# 0: string, 1: string, 2: string
-compiler.note.multiple.elements=Mehrere Elemente namens "{1}" in Modulen "{2}" wurden von javax.lang.model.util.Elements.{0} gefunden.
-
-#####
-
-# 0: number
-compiler.misc.count.error={0} Fehler
-
-# 0: number
-compiler.misc.count.error.plural={0} Fehler
-
-# 0: number, 1: number
-compiler.misc.count.error.recompile=Nur die ersten {0} Fehler von insgesamt {1} werden angezeigt. Mit -Xmaxerrs k\u00F6nnen Sie mehr Fehler anzeigen
-
-# 0: number, 1: number
-compiler.misc.count.warn.recompile=Nur die ersten {0} Warnungen von insgesamt {1} werden angezeigt. Mit -Xmaxwarns k\u00F6nnen Sie mehr Warnungen anzeigen
-
-# 0: number
-compiler.misc.count.warn={0} Warnung
-
-# 0: number
-compiler.misc.count.warn.plural={0} Warnungen
-
-compiler.misc.version.not.available=(Versionsinformationen nicht verf\u00FCgbar)
-
-## extra output when using -verbose (JavaCompiler)
-
-# 0: symbol
-compiler.misc.verbose.checking.attribution=[{0} wird gepr\u00FCft]
-
-# 0: string
-compiler.misc.verbose.parsing.done=[Parsen abgeschlossen: {0} ms]
-
-# 0: file name
-compiler.misc.verbose.parsing.started=[Parsen gestartet: {0}]
-
-# 0: string
-compiler.misc.verbose.total=[{0} ms gesamt]
-
-# 0: file name
-compiler.misc.verbose.wrote.file=[{0} geschrieben]
-
-## extra output when using -verbose (code/ClassReader)
-# 0: string
-compiler.misc.verbose.loading=[{0} wird geladen]
-
-# 0: string
-compiler.misc.verbose.sourcepath=[Suchpfad f\u00FCr Quelldateien: {0}]
-
-# 0: string
-compiler.misc.verbose.classpath=[Suchpfad f\u00FCr Klassendateien: {0}]
-
-## extra output when using -prompt (util/Log)
-compiler.misc.resume.abort=F)ortsetzen, A)bbruch>
-
-#####
-
-##
-## warnings
-##
-
-## All warning messages are preceded by the following string.
-compiler.warn.warning=Warnung: 
-
-## Warning messages may also include the following prefix to identify a
-## lint option
-# 0: option name
-compiler.warn.lintOption=[{0}] 
-
-# 0: symbol
-compiler.warn.constant.SVUID=serialVersionUID muss Konstante in Klasse {0} sein
-
-# 0: path
-compiler.warn.dir.path.element.not.found=Ung\u00FCltiges Pfadelement "{0}": Verzeichnis nicht vorhanden
-
-# 0: file name
-compiler.warn.dir.path.element.not.directory=Ung\u00FCltiges Pfadelement "{0}": kein Verzeichnis
-
-# 0: symbol, 1: symbol, 2: symbol
-compiler.warn.missing-explicit-ctor=Klasse {0} in exportiertem Package {1} deklariert keine expliziten Konstruktoren und stellt daher einen Standardkonstruktor f\u00FCr Clients des Moduls {2} bereit
-
-compiler.warn.strictfp=Ab Release 17 werden alle Gleitkommaausdr\u00FCcke streng ausgewertet. Daher ist "strictfp" nicht erforderlich
-
-compiler.warn.finally.cannot.complete=Finally-Klausel kann nicht normal abgeschlossen werden
-
-# 0: name
-compiler.warn.poor.choice.for.module.name=Modulnamenskomponente {0} darf keine Ziffern am Ende enthalten
-
-# 0: string
-compiler.warn.incubating.modules=Inkubatormodul(e) verwendet: {0}
-
-# 0: symbol, 1: symbol
-compiler.warn.has.been.deprecated={0} in {1} ist veraltet
-
-# 0: symbol, 1: symbol
-compiler.warn.has.been.deprecated.for.removal={0} in {1} ist veraltet und wurde zum Entfernen markiert
-
-# 0: symbol
-compiler.warn.is.preview={0} ist eine Vorschau-API, die in einem zuk\u00FCnftigen Release entfernt werden kann.
-
-# 0: symbol
-compiler.err.is.preview={0} ist eine Vorschau-API, die standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um Vorschau-APIs zu aktivieren)
-
-# 0: symbol
-compiler.warn.is.preview.reflective={0} ist eine reflektive Vorschau-API, die in einem zuk\u00FCnftigen Release entfernt werden kann.
-
-# 0: symbol
-compiler.warn.has.been.deprecated.module=Modul {0} ist veraltet
-
-# 0: symbol
-compiler.warn.has.been.deprecated.for.removal.module=Modul {0} ist veraltet und wurde zum Entfernen markiert
-
-# 0: symbol
-compiler.warn.sun.proprietary={0} ist eine interne propriet\u00E4re API, die in einem zuk\u00FCnftigen Release entfernt werden kann
-
-compiler.warn.illegal.char.for.encoding=Nicht zuordenbares Zeichen f\u00FCr Codierung {0}
-
-# 0: symbol
-compiler.warn.improper.SVUID=serialVersionUID muss als "static final" in Klasse {0} deklariert sein
-
-compiler.warn.improper.SPF=serialPersistentFields muss als "private static final" deklariert sein, um in Kraft zu treten
-
-compiler.warn.SPF.null.init=serialPersistentFields tritt bei Initialisierung als Null nicht in Kraft.\nF\u00FChren Sie die Initialisierung zu einem leeren Array aus, um keine Felder anzugeben
-
-
-# 0: type, 1: type
-compiler.warn.inexact.non-varargs.call=Nicht-varargs-Aufruf von varargs-Methode mit ungenauem Argumenttyp f\u00FCr den letzten Parameter.\nF\u00FChren Sie f\u00FCr einen varargs-Aufruf eine Umwandlung mit Cast in {0} aus\nF\u00FChren Sie f\u00FCr einen Nicht-varargs-Aufruf eine Umwandlung mit Cast in {1} aus, um diese Warnung zu unterdr\u00FCcken
-
-# 0: list of type
-compiler.warn.unreachable.catch=Nicht erreichbare Catch-Klausel\nAusgel\u00F6ster Typ {0} wurde bereits abgefangen
-
-# 0: list of type
-compiler.warn.unreachable.catch.1=Nicht erreichbare Catch-Klausel\nAusgel\u00F6ste Typen {0} wurden bereits abgefangen
-
-# 0: symbol
-compiler.warn.long.SVUID=serialVersionUID muss den Typ "long" in Klasse {0} aufweisen
-
-compiler.warn.OSF.array.SPF=serialPersistentFields muss den Typ "java.io.ObjectStreamField[]" aufweisen, um in Kraft zu treten
-
-# 0: symbol
-compiler.warn.missing.SVUID=Serialisierbare Klasse {0} enth\u00E4lt keine Definition von serialVersionUID
-
-# 0: name
-compiler.warn.serializable.missing.access.no.arg.ctor=Zugriff auf einen no-arg-Konstruktor in der ersten nicht serialisierbaren Superklasse {0} nicht m\u00F6glich
-
-# 0: name
-compiler.warn.serial.method.not.private=Serialisierungsbezogene Methode {0} nicht als privat deklariert
-
-# 0: name
-compiler.warn.serial.concrete.instance.method=Serialisierungsbezogene Methode {0} muss eine konkrete Instanzmethode sein, um in Kraft zu treten. Sie darf nicht abstrakt oder statisch sein
-
-# 0: name
-compiler.warn.serial.method.static=Serialisierungsbezogene Methode {0} ist als statisch deklariert. Sie muss stattdessen eine Instanzmethode sein, um in Kraft zu treten.
-
-# 0: name
-compiler.warn.serial.method.no.args=Serialisierungsbezogene Methode {0} darf keine Parameter aufweisen, um in Kraft zu treten
-
-# 0: name, 1: number
-compiler.warn.serial.method.one.arg=Serialisierungsbezogene Methode {0} muss genau einen Parameter aufweisen, um in Kraft zu treten. Sie darf nicht {1} Parameter enthalten
-
-# 0: name, 1: type, 2: type
-compiler.warn.serial.method.parameter.type=Der einzige Parameter der serialisierungsbezogenen Methode {0} muss den Typ {1} haben, um in Kraft zu treten. Er darf nicht den Typ {2} aufweisen
-
-# 0: name, 1: type, 2: type
-compiler.warn.serial.method.unexpected.return.type=Serialisierungsbezogene Methode {0} wurde mit dem R\u00FCckgabetyp {1} und nicht dem erwarteten Typ {2} deklariert.\nMit dieser Deklaration ist die Methode ung\u00FCltig f\u00FCr die Serialisierung
-
-# 0: name, 1: type
-compiler.warn.serial.method.unexpected.exception=Serialisierungsbezogene Methode {0} wurde zum Ausl\u00F6sen eines unerwarteten Typs {1} deklariert
-
-compiler.warn.ineffectual.serial.field.interface=serialPersistentFields ist in einer Schnittstelle nicht effektiv
-
-# 0: string
-compiler.warn.ineffectual.serial.field.enum=Serialisierungsbezogenes Feld {0} ist in einer Enum-Klasse nicht effektiv
-
-# 0: string
-compiler.warn.ineffectual.serial.method.enum=Serialisierungsbezogene Methode {0} ist in einer Enum-Klasse nicht effektiv
-
-compiler.warn.ineffectual.serial.field.record=serialPersistentFields ist in einer Datensatzklasse nicht effektiv
-
-# 0: string
-compiler.warn.ineffectual.serial.method.record=Serialisierungsbezogene Methode {0} ist in einer Datensatzklasse nicht effektiv
-
-# 0: name
-compiler.warn.ineffectual.serial.method.externalizable=Serialisierungsbezogene Methode {0} ist in einer externalisierbaren Klasse nicht effektiv
-
-compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields ist in einer externalisierbaren Klasse nicht effektiv
-
-compiler.warn.externalizable.missing.public.no.arg.ctor=Eine externalisierbare Klasse erfordert einen \u00F6ffentlichen no-arg-Konstruktor
-
-compiler.warn.non.serializable.instance.field=Nicht transientes Instanzfeld einer serialisierbaren Klasse mit einem nicht serialisierbaren Typ deklariert
-
-# 0: type
-compiler.warn.non.serializable.instance.field.array=Nicht transientes Instanzfeld einer serialisierbaren Klasse wurde mit einem Array mit einem nicht serialisierbaren Basiskomponententyp {0} deklariert
-
-compiler.warn.non.private.method.weaker.access=Serialisierungsbezogene Methode, die in einer Schnittstelle als nicht privat deklariert ist, verhindert,\ndass Klassen, die die Schnittstelle implementieren, die Methode als privat deklarieren
-
-compiler.warn.default.ineffective=Serialisierungsbezogene Standardmethode aus einer Schnittstelle wird nicht von der Serialisierung f\u00FCr eine implementierende Klasse ausgef\u00FChrt
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.warn.potentially.ambiguous.overload={0} in {1} ist m\u00F6glicherweise mehrdeutig mit {2} in {3}
-
-# 0: message segment
-compiler.warn.override.varargs.missing={0}. Au\u00DFer Kraft gesetzte Methode umfasst kein "..."
-
-# 0: message segment
-compiler.warn.override.varargs.extra={0}. In au\u00DFer Kraft setzender Methode fehlt "..."
-
-# 0: message segment
-compiler.warn.override.bridge={0}. Au\u00DFer Kraft setzende Methode ist eine Bridgemethode
-
-# 0: symbol
-compiler.warn.pkg-info.already.seen=Die Datei package-info.java wurde bereits f\u00FCr Package {0} gefunden
-
-# 0: path
-compiler.warn.path.element.not.found=Ung\u00FCltiges Pfadelement "{0}": Datei oder Verzeichnis nicht vorhanden
-
-compiler.warn.possible.fall-through.into.case=M\u00F6glicher Fallthrough in Case
-
-# 0: type
-compiler.warn.redundant.cast=Redundantes Casting in {0}
-
-# 0: number
-compiler.warn.position.overflow=Positionscodierungs\u00FCberlauf bei Zeile {0}
-
-# 0: file name, 1: number, 2: number
-compiler.warn.big.major.version={0}: Hauptversion {1} ist neuer als {2}, die h\u00F6chste Hauptversion, die von diesem Compiler unterst\u00FCtzt wird.\nEs wird empfohlen, dass Sie den Compiler upgraden.
-
-# 0: kind name, 1: symbol
-compiler.warn.static.not.qualified.by.type=Statische {0} muss mit Typname {1} anstelle eines Ausdrucks qualifiziert werden
-
-# 0: string
-compiler.warn.source.no.bootclasspath=Bootstrap Classpath nicht zusammen mit -source {0} festgelegt
-
-# 0: string
-compiler.warn.source.no.system.modules.path=Systemmodulpfad nicht zusammen mit -source {0} festgelegt
-
-# 0: string
-compiler.warn.option.obsolete.source=Quellwert {0} ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt
-
-# 0: target
-compiler.warn.option.obsolete.target=Zielwert {0} ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt
-
-# 0: string, 1: string
-compiler.err.option.removed.source=Quelloption {0} wird nicht mehr unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
-
-# 0: target, 1: target
-compiler.err.option.removed.target=Zieloption {0} wird nicht mehr unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
-
-
-# 0: target, 1: target
-compiler.warn.option.parameters.unsupported=-parameters wird f\u00FCr Zielwert {0} nicht unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
-
-compiler.warn.option.obsolete.suppression=Verwenden Sie -Xlint:-options, um Warnungen zu veralteten Optionen zu unterdr\u00FCcken.
-
-# 0: name, 1: number, 2: number, 3: number, 4: number
-compiler.warn.future.attr={0}-Attribut, das in Klassendateien der Version {1}.{2} eingef\u00FChrt wurde, wird in Klassendateien der Version {3}.{4} ignoriert
-
-compiler.warn.requires.automatic=Erfordert Direktive f\u00FCr ein automatisches Modul
-
-compiler.warn.requires.transitive.automatic=Erfordert transitive-Direktive f\u00FCr ein automatisches Modul
-
-# Warnings related to annotation processing
-# 0: string
-compiler.warn.proc.package.does.not.exist=Package {0} ist nicht vorhanden
-
-# 0: string
-compiler.warn.proc.file.reopening=Versuch, mehrmals eine Datei f\u00FCr "{0}" zu erstellen
-
-# 0: string
-compiler.warn.proc.type.already.exists=Es ist bereits eine Datei f\u00FCr Typ "{0}" im Quellpfad oder Classpath vorhanden
-
-# 0: string
-compiler.warn.proc.type.recreate=Versuch, mehrmals eine Datei f\u00FCr Typ "{0}" zu erstellen
-
-# 0: string
-compiler.warn.proc.illegal.file.name=Datei kann nicht f\u00FCr unzul\u00E4ssigen Namen "{0}" erstellt werden.
-
-# 0: string, 1: string
-compiler.warn.proc.suspicious.class.name=Datei f\u00FCr einen Typ, dessen Name mit {1} endet, wird erstellt: "{0}"
-
-# 0: string
-compiler.warn.proc.file.create.last.round=Datei f\u00FCr Typ "{0}", die in der letzten Runde erstellt wurde, wird keiner Annotationsverarbeitung unterzogen.
-
-# 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=Nicht wohlgeformte Zeichenfolge "{0}" f\u00FCr eine unterst\u00FCtzte Annotationsschnittstelle von Prozessor "{1}" zur\u00FCckgegeben
-
-# 0: set of string
-compiler.warn.proc.annotations.without.processors=Diese Annotationen wurden von keinem Prozessor beansprucht: {0}
-
-# 0: source version, 1: string, 2: string
-compiler.warn.proc.processor.incompatible.source.version=Unterst\u00FCtzte Quellversion "{0}" von Annotationsprozessor "{1}" kleiner als -source "{2}"
-
-# 0: string, 1: string
-compiler.warn.proc.duplicate.option.name=Doppelte unterst\u00FCtzte Option "{0}" von Annotationsprozessor "{1}" zur\u00FCckgegeben
-
-# 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=Doppelte unterst\u00FCtzte Annotationsschnittstelle "{0}" von Annotationsprozessor "{1}" zur\u00FCckgegeben
-
-# 0: string
-compiler.warn.proc.redundant.types.with.wildcard=Annotationsprozessor "{0}" unterst\u00FCtzt redundant sowohl "*" als auch andere Annotationsschnittstellen
-
-compiler.warn.proc.proc-only.requested.no.procs=Annotationsverarbeitung ohne Kompilierung angefordert, aber keine Prozessoren gefunden.
-
-compiler.warn.proc.use.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -implicit, um eine Policy f\u00FCr die implizite Kompilierung anzugeben.
-
-compiler.warn.proc.use.proc.or.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -proc:none, um die Annotationsverarbeitung zu deaktivieren, oder -implicit, um eine Policy f\u00FCr die implizite Kompilierung anzugeben.
-
-# Print a client-generated warning; assumed to be localized, no translation required
-# 0: string
-compiler.warn.proc.messager={0}
-
-# 0: set of string
-compiler.warn.proc.unclosed.type.files=Nicht geschlossene Dateien f\u00FCr die Typen "{0}". Diese Typen werden keiner Annotationsverarbeitung unterzogen
-
-# 0: string
-compiler.warn.proc.unmatched.processor.options=Die folgenden Optionen wurden von keinem Prozessor erkannt: "{0}"
-
-compiler.warn.try.explicit.close.call=Expliziter Aufruf von close() f\u00FCr eine automatisch schlie\u00DFbare Ressource
-
-# 0: symbol
-compiler.warn.try.resource.not.referenced=Automatisch schlie\u00DFbare Ressource {0} wird nie im Body der entsprechenden try-Anweisung referenziert
-
-# 0: type
-compiler.warn.try.resource.throws.interrupted.exc=Automatisch schlie\u00DFbare Ressource {0} umfasst die Mitgliedsmethode close(), die InterruptedException ausl\u00F6sen k\u00F6nnte
-
-compiler.warn.unchecked.assign=Nicht gepr\u00FCfte Zuweisung: {0} zu {1}
-
-# 0: symbol, 1: type
-compiler.warn.unchecked.assign.to.var=Nicht gepr\u00FCfte Zuweisung zu Variable {0} als Mitglied des Raw-Typs {1}
-
-# 0: symbol, 1: type
-compiler.warn.unchecked.call.mbr.of.raw.type=Nicht gepr\u00FCfter Aufruf von {0} als Mitglied des Raw-Typs {1}
-
-compiler.warn.unchecked.cast.to.type=Nicht gepr\u00FCftes Casting zu Typ {0}
-
-# 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
-compiler.warn.unchecked.meth.invocation.applied=Nicht gepr\u00FCfter Methodenaufruf: {0} {1} in {4} {5} wird auf die angegebenen Typen angewendet\nErforderlich: {2}\nErmittelt:    {3}
-
-# 0: type
-compiler.warn.unchecked.generic.array.creation=Nicht gepr\u00FCfte Erstellung eines generischen Arrays f\u00FCr varargs-Parameter des Typs {0}
-
-# 0: type
-compiler.warn.unchecked.varargs.non.reifiable.type=M\u00F6glich Heap-Besch\u00E4digung aus parametrisiertem vararg-Typ {0}
-
-# 0: symbol
-compiler.warn.varargs.unsafe.use.varargs.param=Varargs-Methode k\u00F6nnte Heap-Besch\u00E4digung aus nicht reifizierbarem varargs-Parameter {0} verursachen
-
-compiler.warn.missing.deprecated.annotation=Veraltetes Element ist nicht mit @Deprecated-Annotation versehen
-
-# 0: kind name
-compiler.warn.deprecated.annotation.has.no.effect=@Deprecated-Annotation hat keine Auswirkung auf diese {0}-Deklaration
-
-# 0: string
-compiler.warn.invalid.path=Ung\u00FCltiger Dateiname: {0}
-
-compiler.warn.doclint.not.available=Kein Serviceprovider f\u00FCr doclint verf\u00FCgbar
-
-# 0: string
-compiler.err.invalid.path=Ung\u00FCltiger Dateiname: {0}
-
-
-# 0: path
-compiler.warn.invalid.archive.file=Unerwartete Datei in Pfad: {0}
-
-# 0: path
-compiler.warn.unexpected.archive.file=Unerwartete Erweiterung f\u00FCr Archivdatei: {0}
-
-# 0: path
-compiler.err.no.zipfs.for.archive=Kein Dateisystemprovider zur Verarbeitung dieser Datei verf\u00FCgbar: {0}
-
-compiler.warn.div.zero=Division durch Null
-
-compiler.warn.empty.if=Leere Anweisung nach "if"
-
-# 0: type, 1: name
-compiler.warn.annotation.method.not.found=Annotationsmethode "{1}()" kann nicht in Typ "{0}" gefunden werden
-
-# 0: type, 1: name, 2: message segment
-compiler.warn.annotation.method.not.found.reason=Annotationsmethode "{1}()" kann nicht in Typ "{0}" gefunden werden: {2}
-
-# 0: file object, 1: symbol, 2: name
-compiler.warn.unknown.enum.constant=Unbekannte Enum-Konstante {1}.{2}
-
-# 0: file object, 1: symbol, 2: name, 3: message segment
-compiler.warn.unknown.enum.constant.reason=Unbekannte Enum-Konstante {1}.{2}\nGrund: {3}
-
-# 0: type, 1: type
-compiler.warn.raw.class.use=Raw-Typ gefunden: {0}\nTypargumente f\u00FCr generische Klasse {1} fehlen
-
-compiler.warn.diamond.redundant.args=Redundante Typargumente in neuem Ausdruck (verwenden Sie stattdessen den Rautenoperator).
-
-compiler.warn.local.redundant.type=Redundanter Typ f\u00FCr lokale Variable (ersetzen Sie den expliziten Typ durch "var").
-
-compiler.warn.potential.lambda.found=Die Erstellung dieser anonymen inneren Klasse kann in einen Lambda-Ausdruck umgewandelt werden.
-
-compiler.warn.method.redundant.typeargs=Redundante Typargumente in Methodenaufruf.
-
-# 0: symbol, 1: message segment
-compiler.warn.varargs.redundant.trustme.anno=Redundante {0}-Annotation. {1}
-
-# 0: symbol
-compiler.warn.access.to.member.from.serializable.element=Zugriff auf Mitglied {0} aus serialisierbarem Element kann \u00F6ffentlich f\u00FCr nicht vertrauensw\u00FCrdigen Code zug\u00E4nglich sein
-
-# 0: symbol
-compiler.warn.access.to.member.from.serializable.lambda=Zugriff auf Mitglied {0} aus serialisierbarem Lambda kann \u00F6ffentlich f\u00FCr nicht vertrauensw\u00FCrdigen Code zug\u00E4nglich sein
-
-#####
-
-## The following are tokens which are non-terminals in the language. They should
-## be named as JLS3 calls them when translated to the appropriate language.
-compiler.misc.token.identifier=<ID>
-
-compiler.misc.token.character=<Zeichen>
-
-compiler.misc.token.string=<Zeichenfolge>
-
-compiler.misc.token.integer=<Ganzzahl>
-
-compiler.misc.token.long-integer=<Ganzzahl vom Typ "long">
-
-compiler.misc.token.float=<Float>
-
-compiler.misc.token.double=<Double>
-
-compiler.misc.token.bad-symbol=<ung\u00FCltiges Symbol>
-
-compiler.misc.token.end-of-input=<Ende der Eingabe>
-
-## The argument to the following string will always be one of the following:
-## 1. one of the above non-terminals
-## 2. a keyword (JLS1.8)
-## 3. a boolean literal (JLS3.10.3)
-## 4. the null literal (JLS3.10.7)
-## 5. a Java separator (JLS3.11)
-## 6. an operator (JLS3.12)
-##
-## This is the only place these tokens will be used.
-# 0: token
-compiler.err.expected={0} erwartet
-
-# 0: string
-compiler.err.expected.str={0} erwartet
-
-# 0: token, 1: token
-compiler.err.expected2={0} oder {1} erwartet
-
-# 0: token, 1: token, 2: token
-compiler.err.expected3={0}, {1} oder {2} erwartet
-
-# 0: token, 1: token, 2: token, 3: string
-compiler.err.expected4={0}, {1}, {2} oder {3} erwartet
-
-compiler.err.premature.eof=Dateiende beim Parsen erreicht
-
-compiler.err.enum.constant.expected=Hier wird eine Enum-Konstante erwartet
-
-compiler.err.enum.constant.not.expected=Hier wird keine Enum-Konstante erwartet
-
-## The following are related in form, but do not easily fit the above paradigm.
-compiler.err.expected.module.or.open="module" oder "open" erwartet
-
-compiler.err.dot.class.expected=".class" erwartet
-
-## The argument to this string will always be either 'case' or 'default'.
-# 0: token
-compiler.err.orphaned={0} verwaist
-
-# 0: name
-compiler.misc.anonymous.class=<anonyme {0}>
-
-# 0: name, 1: type
-compiler.misc.type.captureof=capture#{0} von {1}
-
-compiler.misc.type.captureof.1=capture#{0}
-
-compiler.misc.type.none=<kein Wert>
-
-compiler.misc.unnamed.package=Unbenanntes Package
-
-compiler.misc.unnamed.module=Unbenanntes Modul
-
-#####
-
-# 0: symbol, 1: message segment
-compiler.err.cant.access=Kein Zugriff auf {0}\n{1}
-
-# 0: name
-compiler.misc.bad.class.file=Klassendatei ist ung\u00FCltig f\u00FCr Klasse {0}
-
-# 0: file name, 1: string (expected constant pool entry type), 2: number (constant pool index)
-compiler.misc.bad.const.pool.entry=Ung\u00FCltiger Konstantenpooleintrag in {0}\n{1} bei Index {2} erwartet
-
-# 0: file name, 1: number (constant pool index), 2: number (constant pool size)
-compiler.misc.bad.const.pool.index=Ung\u00FCltiger Konstantenpoolindex in {0}\nIndex {1} liegt nicht innerhalb der Poolgr\u00F6\u00DFe {2}.
-
-# 0: file name, 1: message segment
-compiler.misc.bad.class.file.header=Ung\u00FCltige Klassendatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Classpath vorhanden ist.
-
-# 0: file name, 1: message segment
-compiler.misc.bad.source.file.header=Ung\u00FCltige Quelldatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Quellpfades vorhanden ist.
-
-## The following are all possible strings for the second argument ({1}) of the
-## above strings.
-compiler.misc.bad.class.signature=Ung\u00FCltige Klassensignatur: {0}
-
-#0: symbol, 1: symbol
-compiler.misc.bad.enclosing.class=Ung\u00FCltige einschlie\u00DFende Klasse f\u00FCr {0}: {1}
-
-# 0: symbol
-compiler.misc.bad.enclosing.method=Ung\u00FCltiges einschlie\u00DFendes Methodenattribut f\u00FCr Klasse {0}
-
-compiler.misc.bad.runtime.invisible.param.annotations=Ung\u00FCltiges RuntimeInvisibleParameterAnnotations-Attribut: {0}
-
-compiler.misc.bad.const.pool.tag=Ung\u00FCltiges Konstantenpooltag: {0}
-
-compiler.misc.bad.const.pool.tag.at=Ung\u00FCltiges Konstantenpooltag {0} bei {1}
-
-compiler.misc.unexpected.const.pool.tag.at=Unerwartetes Konstantenpooltag {0} bei {1}
-
-compiler.misc.bad.signature=Ung\u00FCltige Signatur: {0}
-
-compiler.misc.bad.type.annotation.value=Ung\u00FCltiger Typ f\u00FCr Annotationszielwert: {0}
-
-compiler.misc.bad.module-info.name=Ung\u00FCltiger Klassenname
-
-compiler.misc.class.file.wrong.class=Klassendatei enth\u00E4lt falsche Klasse: {0}
-
-compiler.misc.module.info.invalid.super.class=module-info mit ung\u00FCltiger Superklasse
-
-# 0: name
-compiler.misc.class.file.not.found=Klassendatei f\u00FCr {0} nicht gefunden
-
-# 0: string (constant value), 1: symbol (constant field), 2: type (field type)
-compiler.misc.bad.constant.range=Konstantenwert "{0}" f\u00FCr {1} liegt au\u00DFerhalb des erwarteten Bereichs f\u00FCr {2}
-
-# 0: string (constant value), 1: symbol (constant field), 2: string (expected class)
-compiler.misc.bad.constant.value=Ung\u00FCltiger Konstantenwert "{0}" f\u00FCr {1}. {2} erwartet
-
-# 0: type (field type)
-compiler.misc.bad.constant.value.type=Variable des Typs "{0}" darf keinen Konstantenwert aufweisen, aber es wurde einer f\u00FCr sie angegeben
-
-# 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.invalid.default.interface=Standardmethode in Klassendatei der Version {0}.{1} gefunden
-
-# 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.invalid.static.interface=Statische Methode in Klassendatei der Version {0}.{1} gefunden
-
-# 0: string (classfile major version), 1: string (classfile minor version)
-compiler.misc.anachronistic.module.info=Moduldeklaration in Klassendatei der Version {0}.{1} gefunden
-
-compiler.misc.module.info.definition.expected=module-info-Definition erwartet
-
-# 0: name
-compiler.misc.file.doesnt.contain.class=Datei enth\u00E4lt nicht Klasse {0}
-
-# 0: symbol
-compiler.misc.file.does.not.contain.package=Datei enth\u00E4lt nicht Package {0}
-
-compiler.misc.file.does.not.contain.module=Datei enth\u00E4lt keine Moduldeklaration
-
-compiler.misc.illegal.start.of.class.file=Unzul\u00E4ssiger Klassendateibeginn
-
-# 0: name
-compiler.misc.method.descriptor.invalid=Methodendeskriptor ung\u00FCltig f\u00FCr {0}
-
-compiler.misc.unable.to.access.file=Zugriff auf Datei nicht m\u00F6glich: {0}
-
-compiler.misc.unicode.str.not.supported=Unicode-Zeichenfolge wird in Klassendatei nicht unterst\u00FCtzt
-
-compiler.misc.undecl.type.var=Nicht deklarierte Typvariable: {0}
-
-compiler.misc.malformed.vararg.method=Klassendatei enth\u00E4lt nicht wohlgeformte Methode mit variabler Argumentanzahl: {0}
-
-compiler.misc.wrong.version=Klassendatei hat die falsche Version {0}.{1}. Sie muss {2}.{3} lauten
-
-#####
-
-# 0: type, 1: type or symbol
-compiler.err.not.within.bounds=Typargument {0} liegt nicht innerhalb des g\u00FCltigen Bereichs von Typvariable {1}
-
-## The following are all possible strings for the second argument ({1}) of the
-## above string.
-
-## none yet...
-
-#####
-
-# 0: message segment
-compiler.err.prob.found.req=Inkompatible Typen: {0}
-
-# 0: message segment
-compiler.misc.prob.found.req=Inkompatible Typen: {0}
-
-# 0: message segment, 1: type, 2: type
-compiler.warn.prob.found.req={0}\nErforderlich: {2}\nErmittelt:    {1}
-
-# 0: type, 1: type
-compiler.misc.inconvertible.types={0} kann nicht in {1} konvertiert werden
-
-# 0: type, 1: type
-compiler.misc.possible.loss.of.precision=M\u00F6glicher Verlust bei Konvertierung von {0} in {1}
-
-compiler.misc.unchecked.assign=Nicht gepr\u00FCfte Konvertierung
-
-# compiler.misc.storecheck=\
-#     assignment might cause later store checks to fail
-# compiler.misc.unchecked=\
-#     assigned array cannot dynamically check its stores
-compiler.misc.unchecked.cast.to.type=Nicht gepr\u00FCftes Casting
-
-# compiler.err.star.expected=\
-#     ''*'' expected
-# compiler.err.no.elem.type=\
-#     \[\*\] cannot have a type
-
-# 0: message segment
-compiler.misc.try.not.applicable.to.type=try-with-resources nicht auf Variablentyp anwendbar\n({0})
-
-#####
-
-# 0: object, 1: message segment
-compiler.err.type.found.req=Unerwarteter Typ\nErforderlich: {1}\nErmittelt:    {0}
-
-## The following are all possible strings for the first argument ({0}) of the
-## above string.
-compiler.misc.type.req.class=Klasse
-
-compiler.misc.type.req.class.array=Klasse oder Array
-
-compiler.misc.type.req.array.or.iterable=Array oder java.lang.Iterable
-
-compiler.misc.type.req.ref=Referenz
-
-compiler.misc.type.req.exact=Klasse oder Schnittstelle ohne Grenzwerte
-
-# 0: type
-compiler.misc.type.parameter=Typparameter {0}
-
-#####
-
-## The following are all possible strings for the last argument of all those
-## diagnostics whose key ends in ".1"
-
-# 0: type, 1: list of type
-compiler.misc.no.unique.maximal.instance.exists=Keine eindeutige maximale Instanz f\u00FCr Typvariable {0} mit oberen Grenzwerten {1} vorhanden
-
-# 0: type, 1: list of type
-compiler.misc.no.unique.minimal.instance.exists=Keine eindeutige minimale Instanz f\u00FCr Typvariable {0} mit unteren Grenzwerten {1} vorhanden
-
-# 0: type, 1: list of type
-compiler.misc.incompatible.upper.bounds=Inferenzvariable {0} hat inkompatible obere Grenzwerte {1}
-
-# 0: type, 1: list of type
-compiler.misc.incompatible.eq.bounds=Inferenzvariable {0} hat inkompatible Gleichheits-Constraints {1}
-
-# 0: type, 1: fragment, 2: fragment
-compiler.misc.incompatible.bounds=Inferenzvariable {0} hat inkompatible Grenzwerte\n{1}\n{2}
-
-# 0: list of type
-compiler.misc.lower.bounds=Untere Grenzwerte: {0}
-
-# 0: list of type
-compiler.misc.eq.bounds=Gleichheits-Constraints: {0}
-
-# 0: list of type
-compiler.misc.upper.bounds=Untere Grenzwerte: {0}
-
-# 0: list of type, 1: type, 2: type
-compiler.misc.infer.no.conforming.instance.exists=Keine Instanzen von Typvariablen {0} vorhanden, sodass {1} {2} entspricht
-
-# 0: list of type, 1: message segment
-compiler.misc.infer.no.conforming.assignment.exists=Typvariable(n) {0} nicht ableitbar\n(nicht \u00FCbereinstimmende Argumente; {1})
-
-# 0: list of type
-compiler.misc.infer.arg.length.mismatch=Typvariable(n) {0} nicht ableitbar\n(Liste der tats\u00E4chlichen Argumente hat eine andere L\u00E4nge als die der formalen Argumente)
-
-# 0: list of type, 1: message segment
-compiler.misc.infer.varargs.argument.mismatch=Typvariable(n) {0} nicht ableitbar\n(nicht \u00FCbereinstimmende varargs, {1})
-
-# 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.upper.bounds=Abgeleiteter Typ entspricht nicht den oberen Grenzwerten\nAbgeleitet: {0}\nObere Grenzwerte: {1}
-
-# 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.lower.bounds=Abgeleiteter Typ entspricht nicht den unteren Grenzwerten\nAbgeleitet: {0}\nUntere Grenzwerte: {1}
-
-# 0: type, 1: list of type
-compiler.misc.inferred.do.not.conform.to.eq.bounds=Abgeleiteter Typ entspricht nicht den Gleichheits-Constraints\nAbgeleitet: {0}\nGleichheits-Constraint(s): {1}
-
-# 0: symbol
-compiler.misc.diamond={0}<>
-
-# 0: type
-compiler.misc.diamond.non.generic="<>" kann nicht mit der nicht generischen Klasse {0} verwendet werden
-
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.arg=Typargument {0}, das f\u00FCr {1} abgeleitet wurde, ist in diesem Kontext nicht zul\u00E4ssig\nDas abgeleitete Argument kann nicht im Signaturattribut ausgedr\u00FCckt werden
-
-# 0: list of type, 1: message segment
-compiler.misc.diamond.invalid.args=Typargumente {0}, die f\u00FCr {1} abgeleitet wurden, sind in diesem Kontext nicht zul\u00E4ssig\nAbgeleitete Argumente k\u00F6nnen nicht im Signaturattribut ausgedr\u00FCckt werden
-
-# 0: type
-compiler.misc.diamond.and.explicit.params="<>" kann nicht mit expliziten Typparametern f\u00FCr Konstruktor verwendet werden
-
-compiler.misc.mref.infer.and.explicit.params=Raw-Konstruktorreferenz kann nicht mit expliziten Typparametern f\u00FCr Konstruktor verwendet werden
-
-# 0: type, 1: list of type
-compiler.misc.explicit.param.do.not.conform.to.bounds=Explizites Typargument {0} entspricht nicht den deklarierten Grenzwerten {1}
-
-compiler.misc.arg.length.mismatch=Liste der tats\u00E4chlichen Argumente hat eine andere L\u00E4nge als die der formalen Argumente
-
-# 0: string
-compiler.misc.wrong.number.type.args=Falsche Anzahl Typargumente. {0} erforderlich
-
-# 0: message segment
-compiler.misc.no.conforming.assignment.exists=Keine \u00FCbereinstimmenden Argumente, {0}
-
-# 0: message segment
-compiler.misc.varargs.argument.mismatch=Keine \u00FCbereinstimmenden varargs; {0}
-
-#####
-
-# 0: symbol or type, 1: file name
-compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file=Auf Auxiliary-Klasse {0} in {1} darf nicht von au\u00DFerhalb der eigenen Quelldatei zugegriffen werden
-
-## The first argument ({0}) is a "kindname".
-# 0: kind name, 1: symbol, 2: symbol
-compiler.err.abstract.cant.be.accessed.directly={0} {1} in {2} ist abstrakt und kann nicht direkt aufgerufen werden
-
-## The first argument ({0}) is a "kindname".
-# 0: symbol kind, 1: symbol
-compiler.err.non-static.cant.be.ref={0} {1} ist nicht statisch und kann nicht aus einem statischen Kontext referenziert werden
-
-# 0: symbol kind, 1: symbol
-compiler.misc.bad.static.method.in.unbound.lookup=Unerwartete statische {0} {1} in ungebundenem Lookup gefunden
-
-# 0: symbol kind, 1: symbol
-compiler.misc.bad.instance.method.in.unbound.lookup=Unerwartete Instanz {0} {1} in ungebundenem Lookup gefunden
-
-# 0: symbol kind, 1: symbol
-compiler.misc.bad.static.method.in.bound.lookup=Unerwartete statische {0} {1} in gebundenem Lookup gefunden
-
-## Both arguments ({0}, {1}) are "kindname"s.  {0} is a comma-separated list
-## of kindnames (the list should be identical to that provided in source.
-# 0: set of kind name, 1: set of kind name
-compiler.err.unexpected.type=Unerwarteter Typ\nErforderlich: {0}\nErmittelt:    {1}
-
-compiler.err.unexpected.lambda=Hier wird kein Lambda-Ausdruck erwartet
-
-compiler.err.unexpected.mref=Hier wird keine Methodenreferenz erwartet
-
-## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
-## The second argument {1} is the non-resolved symbol
-## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
-## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
-# 0: kind name, 1: name, 2: unused, 3: unused
-compiler.err.cant.resolve=Symbol nicht gefunden\nSymbol: {0} {1}
-
-# 0: kind name, 1: name, 2: unused, 3: list of type
-compiler.err.cant.resolve.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})
-
-# 0: kind name, 1: name, 2: unused, 3: list of type
-compiler.misc.cant.resolve.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})
-
-# 0: kind name, 1: name, 2: list of type, 3: list of type
-compiler.err.cant.resolve.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})
-
-## arguments from {0} to {3} have the same meaning as above
-## The fifth argument {4} is a location subdiagnostic (see below)
-# 0: kind name, 1: name, 2: unused, 3: unused, 4: message segment
-compiler.err.cant.resolve.location=Symbol nicht gefunden\nSymbol: {0} {1}\nOrt: {4}
-
-# 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
-compiler.err.cant.resolve.location.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})\nOrt: {4}
-
-# 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
-compiler.err.cant.resolve.location.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})\nOrt: {4}
-
-### Following are replicated/used for method reference diagnostics
-
-# 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
-compiler.misc.cant.resolve.location.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})\nOrt: {4}
-
-# 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
-compiler.misc.cant.resolve.location.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})\nOrt: {4}
-
-##a location subdiagnostic is composed as follows:
-## The first argument {0} is the location "kindname" (e.g. 'constructor', 'field', etc.)
-## The second argument {1} is the location name
-## The third argument {2} is the location type (only when {1} is a variable name)
-
-# 0: kind name, 1: type or symbol, 2: unused
-compiler.misc.location={0} {1}
-
-# 0: kind name, 1: symbol, 2: type
-compiler.misc.location.1={0} {1} von Typ {2}
-
-## The following are all possible string for "kindname".
-## They should be called whatever the JLS calls them after it been translated
-## to the appropriate language.
-# compiler.misc.kindname.constructor=\
-#     static member
-compiler.misc.kindname.annotation=@interface
-
-compiler.misc.kindname.constructor=Konstruktor
-
-compiler.misc.kindname.enum=Enumeration
-
-compiler.misc.kindname.interface=Schnittstelle
-
-compiler.misc.kindname.static=statisch
-
-compiler.misc.kindname.type.variable=Typvariable
-
-compiler.misc.kindname.type.variable.bound=Grenzwert von Typvariable
-
-compiler.misc.kindname.variable=Variable
-
-compiler.misc.kindname.value=Wert
-
-compiler.misc.kindname.method=Methode
-
-compiler.misc.kindname.class=Klasse
-
-compiler.misc.kindname.package=Package
-
-compiler.misc.kindname.module=Modul
-
-compiler.misc.kindname.static.init=statischer Initializer
-
-compiler.misc.kindname.instance.init=Instanz-Initializer
-
-compiler.misc.kindname.record.component=Datensatzkomponente
-
-compiler.misc.kindname.record=Datensatz
-
-#####
-
-compiler.misc.no.args=keine Argumente
-
-# 0: message segment
-compiler.err.override.static={0}\nAu\u00DFer Kraft setzende Methode ist statisch
-
-# 0: message segment, 1: set of flag
-compiler.err.override.meth={0}\nAu\u00DFer Kraft gesetzte Methode ist {1}
-
-# 0: message segment, 1: type
-compiler.err.override.meth.doesnt.throw={0}\nAu\u00DFer Kraft gesetzte Methode l\u00F6st nicht {1} aus
-
-# In the following string {1} is a space separated list of Java Keywords, as
-# they would have been declared in the source code
-# 0: message segment, 1: set of flag or string
-compiler.err.override.weaker.access={0}\nVersuch, niedrigere Zugriffsberechtigungen zuzuweisen. War {1}
-
-# 0: message segment, 1: type, 2: type
-compiler.err.override.incompatible.ret={0}\nR\u00FCckgabetyp {1} ist nicht mit {2} kompatibel
-
-# 0: message segment, 1: type, 2: type
-compiler.warn.override.unchecked.ret={0}\nR\u00FCckgabetyp erfordert eine nicht gepr\u00FCfte Konvertierung von {1} in {2}
-
-# 0: message segment, 1: type
-compiler.warn.override.unchecked.thrown={0}\nAu\u00DFer Kraft gesetzte Methode l\u00F6st nicht {1} aus
-
-# 0: symbol
-compiler.warn.override.equals.but.not.hashcode=Klasse {0} setzt Gleichwertige au\u00DFer Kraft. hashCode-Methode wird aber weder von der Klasse noch einer Superklasse au\u00DFer Kraft gesetzt
-
-## The following are all possible strings for the first argument ({0}) of the
-## above strings.
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.override={0} in {1} kann nicht {2} in {3} au\u00DFer Kraft setzen
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.hide={0} in {1} kann nicht {2} in {3} ausblenden
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.cant.implement={0} in {1} kann nicht {2} in {3} implementieren
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.clashes.with={0} in {1} steht mit {2} in {3} in Konflikt
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.override={0} in {1} setzt {2} in {3} au\u00DFer Kraft
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.implement={0} in {1} implementiert {2} in {3}
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.unchecked.clash.with={0} in {1} setzt {2} in {3} au\u00DFer Kraft
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.override={0} in {1} setzt {2} in {3} au\u00DFer Kraft
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.implement={0} in {1} implementiert {2} in {3}
-
-# 0: symbol, 1: symbol, 2: symbol, 3: symbol
-compiler.misc.varargs.clash.with={0} in {1} setzt {2} in {3} au\u00DFer Kraft
-
-# 0: kind name, 1: symbol, 2: symbol, 3: message segment
-compiler.misc.inapplicable.method={0} {1}.{2} ist nicht anwendbar\n({3})
-
-########################################
-# Diagnostics for language feature changes.
-# Such diagnostics have a common template which can be customized by using a feature
-# diagnostic fragment (one of those given below).
-########################################
-
-# 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.err.feature.not.supported.in.source={0} wird in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
-
-# 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.err.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
-
-# 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.misc.feature.not.supported.in.source={0} wird in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
-
-# 0: message segment (feature), 1: string (found version), 2: string (expected version)
-compiler.misc.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
-
-# 0: message segment (feature)
-compiler.err.preview.feature.disabled={0} ist ein Vorschaufeature, das standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
-
-# 0: message segment (feature)
-compiler.err.preview.feature.disabled.plural={0} sind ein Vorschaufeature, das standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
-
-# 0: file object (classfile), 1: string (expected version)
-compiler.err.preview.feature.disabled.classfile=Klassendatei f\u00FCr {0} verwendet Vorschaufeatures von Java SE {1}.\n(Verwenden Sie --enable-preview, um das Laden von Klassendateien mit Vorschaufeatures zu erm\u00F6glichen)
-
-# 0: message segment (feature)
-compiler.warn.preview.feature.use={0} ist ein Vorschaufeature, das in einem zuk\u00FCnftigen Release entfernt werden kann.
-
-# 0: message segment (feature)
-compiler.warn.preview.feature.use.plural={0} sind ein Vorschaufeature, das in einem zuk\u00FCnftigen Release entfernt werden kann.
-
-# 0: file object (classfile), 1: string (expected version)
-compiler.warn.preview.feature.use.classfile=Klassendatei f\u00FCr {0} verwendet Vorschaufeatures von Java SE {1}.
-
-
-compiler.misc.feature.modules=Module
-
-compiler.misc.feature.diamond.and.anon.class="<>" mit anonymen inneren Klassen
-
-compiler.misc.feature.var.in.try.with.resources=Variablen in try-with-resources
-
-compiler.misc.feature.type.annotations=Typannotationen
-
-compiler.misc.feature.annotations.after.type.params=Annotationen nach Methodentypparametern
-
-compiler.misc.feature.repeatable.annotations=Wiederholte Annotationen
-
-compiler.misc.feature.diamond=Rautenoperator
-
-compiler.misc.feature.lambda=Lambda-Ausdr\u00FCcke
-
-compiler.misc.feature.method.references=Methodenreferenzen
-
-compiler.misc.feature.default.methods=Standardmethoden
-
-compiler.misc.feature.intersection.types.in.cast=Schnittmengentypen
-
-compiler.misc.feature.static.intf.methods=Statische Schnittstellenmethoden
-
-compiler.misc.feature.static.intf.method.invoke=Aufrufe statischer Schnittstellenmethoden
-
-compiler.misc.feature.private.intf.methods=Private Schnittstellenmethoden
-
-compiler.misc.feature.text.blocks=Textbl\u00F6cke
-
-compiler.misc.feature.multiple.case.labels=Mehrere CASE-Labels
-
-compiler.misc.feature.switch.rules=Switch-Regeln
-
-compiler.misc.feature.switch.expressions=Switch-Ausdr\u00FCcke
-
-compiler.misc.feature.var.syntax.in.implicit.lambda=var-Syntax in impliziten Lambdas
-
-compiler.misc.feature.pattern.matching.instanceof=Musterabgleich in instanceof
-
-compiler.misc.feature.reifiable.types.instanceof=Reifizierbare Typen in instanceof
-
-compiler.misc.feature.records=Datens\u00E4tze
-
-compiler.misc.feature.sealed.classes=Verschl\u00FCsselte Klassen
-
-compiler.misc.feature.case.null=Null in Switch Cases
-
-compiler.misc.feature.pattern.switch=Muster in Switch-Anweisungen
-
-compiler.warn.underscore.as.identifier=Ab Release 9 ist "_" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
-
-compiler.err.underscore.as.identifier=Ab Release 9 ist "_" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
-
-compiler.err.underscore.as.identifier.in.lambda="_" als ID verwendet\n("_" darf nicht als ID f\u00FCr Lambda-Parameter verwendet werden)
-
-compiler.err.enum.as.identifier=Ab Release 5 ist "enum" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
-
-compiler.err.assert.as.identifier=Ab Release 1.4 ist "assert" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
-
-# TODO 308: make a better error message
-compiler.err.this.as.identifier=Ab Release 8 ist "this" nur als Parametername f\u00FCr den Empf\u00E4ngertyp zul\u00E4ssig.\nDas muss der erste Parameter sein und darf kein Lambda-Parameter sein
-
-compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=receiver-Parameter nicht f\u00FCr Konstruktor der obersten Klasse anwendbar
-
-# TODO 308: make a better error message
-# 0: annotation
-compiler.err.cant.type.annotate.scoping.1=Scoping-Konstrukt kann nicht mit type-use-Annotation versehen werden: {0}
-
-# TODO 308: make a better error message
-# 0: list of annotation
-compiler.err.cant.type.annotate.scoping=Scoping-Konstrukt kann nicht mit type-use-Annotationen versehen werden: {0}
-
-# 0: type, 1: type
-compiler.err.incorrect.receiver.name=Der Empf\u00E4ngername stimmt nicht mit dem einschlie\u00DFenden Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
-
-# 0: type, 1: type
-compiler.err.incorrect.receiver.type=Der Empf\u00E4ngertyp stimmt nicht mit dem einschlie\u00DFenden Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
-
-# 0: type, 1: type
-compiler.err.incorrect.constructor.receiver.type=Der Empf\u00E4ngertyp stimmt nicht mit dem einschlie\u00DFenden \u00E4u\u00DFeren Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
-
-# 0: type, 1: type
-compiler.err.incorrect.constructor.receiver.name=Der Empf\u00E4ngername stimmt nicht mit dem einschlie\u00DFenden \u00E4u\u00DFeren Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
-
-compiler.err.no.annotations.on.dot.class=Keine Annotationen im Typ eines Klassenliterals zul\u00E4ssig
-
-########################################
-# Diagnostics for verbose resolution
-# used by Resolve (debug only)
-########################################
-
-# 0: number, 1: symbol, 2: unused
-compiler.misc.applicable.method.found=#{0} anwendbare Methode gefunden: {1}
-
-# 0: number, 1: symbol, 2: message segment
-compiler.misc.applicable.method.found.1=#{0} anwendbare Methode gefunden: {1}\n({2})
-
-# 0: number, 1: symbol, 2: message segment
-compiler.misc.not.applicable.method.found=#{0} nicht anwendbare Methode gefunden: {1}\n({2})
-
-# 0: type
-compiler.misc.partial.inst.sig=Teilweise instanziiert in: {0}
-
-# 0: name, 1: symbol, 2: number, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
-compiler.note.verbose.resolve.multi=Methode {0} wird in Typ {1} als Kandidat {2} aufgel\u00F6st\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
-
-# 0: name, 1: symbol, 2: unused, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
-compiler.note.verbose.resolve.multi.1=Fehlerhafte Aufl\u00F6sung f\u00FCr Methode {0} in Typ {1}\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
-
-# 0: symbol, 1: type, 2: type
-compiler.note.deferred.method.inst=Instanziierung von Methode {0} verz\u00F6gert\nInstanziierte Signatur: {1}\ntarget-type: {2}
-
-########################################
-# Diagnostics for lambda deduplication
-# used by LambdaToMethod (debug only)
-########################################
-
-# 0: symbol
-compiler.note.verbose.l2m.deduplicate=Lambda-Implementierungsmethode {0} wird dedupliziert
-
-########################################
-# Diagnostics for method reference search
-# results used by Resolve (debug only)
-########################################
-
-# 0: fragment, 1: string, 2: number
-compiler.note.method.ref.search.results.multi={0} Suchergebnisse f\u00FCr {1}, mit spezifischsten {2}\nAnwendbare Kandidaten:
-
-# 0: number, 1: fragment, 2: symbol
-compiler.misc.applicable.method.found.2=#{0} anwendbare Methode gefunden: {1} {2}
-
-# 0: number, 1: fragment, 2: symbol, 3: message segment
-compiler.misc.applicable.method.found.3=#{0} anwendbare Methode gefunden: {1} {2}\n({3})
-
-compiler.misc.static=statisch
-
-compiler.misc.non.static=nicht statisch
-
-compiler.misc.bound=gebunden
-
-compiler.misc.unbound=ungebunden
-
-########################################
-# Diagnostics for where clause implementation
-# used by the RichDiagnosticFormatter.
-########################################
-
-compiler.misc.type.null=<Null>
-
-# X#n (where n is an int id) is disambiguated tvar name
-# 0: name, 1: number
-compiler.misc.type.var={0}#{1}
-
-# CAP#n (where n is an int id) is an abbreviation for 'captured type'
-# 0: number
-compiler.misc.captured.type=CAP#{0}
-
-# <INT#n> (where n is an int id) is an abbreviation for 'intersection type'
-# 0: number
-compiler.misc.intersection.type=INT#{0}
-
-# where clause for captured type: contains upper ('extends {1}') and lower
-# ('super {2}') bound along with the wildcard that generated this captured type ({3})
-# 0: type, 1: type, 2: type, 3: type
-compiler.misc.where.captured={0} erweitert {1} Super: {2} aus Erfassung von {3}
-
-# compact where clause for captured type: contains upper ('extends {1}') along
-# with the wildcard that generated this captured type ({3})
-# 0: type, 1: type, 2: unused, 3: type
-compiler.misc.where.captured.1={0} erweitert {1} aus Erfassung von {3}
-
-# where clause for type variable: contains upper bound(s) ('extends {1}') along with
-# the kindname ({2}) and location ({3}) in which the typevar has been declared
-# 0: type, 1: list of type, 2: symbol kind, 3: symbol
-compiler.misc.where.typevar={0} erweitert {1}, deklariert in {2} {3}
-
-# compact where clause for type variable: contains the kindname ({2}) and location ({3})
-# in which the typevar has been declared
-# 0: type, 1: list of type, 2: symbol kind, 3: symbol
-compiler.misc.where.typevar.1={0} deklariert in {2} {3}
-
-# where clause for fresh type variable: contains upper bound(s) ('extends {1}').
-# Since a fresh type-variable is synthetic - there's no location/kindname here.
-# 0: type, 1: list of type
-compiler.misc.where.fresh.typevar={0} erweitert {1}
-
-# where clause for type variable: contains all the upper bound(s) ('extends {1}')
-# of this intersection type
-# 0: type, 1: list of type
-compiler.misc.where.intersection={0} erweitert {1}
-
-### Where clause headers ###
-compiler.misc.where.description.captured=Dabei ist {0} eine neue Typvariable:
-
-# 0: set of type
-compiler.misc.where.description.typevar=Dabei ist {0} eine Typvariable:
-
-# 0: set of type
-compiler.misc.where.description.intersection=Dabei ist {0} ein Schnittmengentyp:
-
-# 0: set of type
-compiler.misc.where.description.captured.1=Dabei sind {0} neue Typvariablen:
-
-# 0: set of type
-compiler.misc.where.description.typevar.1=Dabei sind {0} Typvariablen:
-
-# 0: set of type
-compiler.misc.where.description.intersection.1=Dabei sind {0} Schnittmengentypen:
-
-###
-# errors related to doc comments
-
-compiler.err.dc.bad.entity=Ung\u00FCltige HTML-Entity
-
-compiler.err.dc.bad.inline.tag=Falsche Verwendung von Inlinetag
-
-compiler.err.dc.identifier.expected=ID erwartet
-
-compiler.err.dc.malformed.html=Nicht wohlgeformte HTML
-
-compiler.err.dc.missing.semicolon=Semikolon fehlt
-
-compiler.err.dc.no.content=kein Inhalt
-
-compiler.err.dc.no.tag.name=Kein Tagname nach "@"
-
-compiler.err.dc.gt.expected=">" erwartet
-
-compiler.err.dc.ref.bad.parens=Unerwarteter Text nach Klammer
-
-compiler.err.dc.ref.syntax.error=Syntaxfehler in Referenz
-
-compiler.err.dc.ref.unexpected.input=Unerwarteter Text
-
-compiler.err.dc.unexpected.content=Unerwarteter Inhalt
-
-compiler.err.dc.unterminated.inline.tag=Nicht abgeschlossenes Inlinetag
-
-compiler.err.dc.unterminated.signature=Nicht abgeschlossene Signatur
-
-compiler.err.dc.unterminated.string=Nicht abgeschlossene Zeichenfolge
-
-compiler.err.dc.ref.annotations.not.allowed=Annotationen nicht zul\u00E4ssig
-
-###
-# errors related to modules
-
-compiler.err.expected.module="module" erwartet
-
-# 0: symbol
-compiler.err.module.not.found=Modul nicht gefunden: {0}
-
-# 0: symbol
-compiler.warn.module.not.found=Modul nicht gefunden: {0}
-
-compiler.err.too.many.modules=Zu viele Moduldeklarationen gefunden
-
-compiler.err.module.not.found.on.module.source.path=Modul nicht in Modulquellpfad gefunden
-
-compiler.err.not.in.module.on.module.source.path=Nicht in einem Modul im Modulquellpfad
-
-# 0: symbol
-compiler.err.duplicate.module=Doppeltes Modul: {0}
-
-# 0: symbol
-compiler.err.duplicate.requires=Doppelte "requires": {0}
-
-# 0: symbol
-compiler.err.conflicting.exports=Doppelte oder unvereinbare Exporte: {0}
-
-# 0: symbol
-compiler.err.conflicting.opens=Doppelte oder unvereinbare "opens": {0}
-
-# 0: symbol
-compiler.err.conflicting.exports.to.module=Doppelte oder unvereinbare Exporte in Modul: {0}
-
-# 0: symbol
-compiler.err.conflicting.opens.to.module=Doppelte oder unvereinbare "opens" in Modul: {0}
-
-compiler.err.no.opens.unless.strong="opens" nur in starken Modulen zul\u00E4ssig
-
-# 0: symbol
-compiler.err.repeated.provides.for.service=Mehrere "provides" f\u00FCr Service {0}
-
-# 0: symbol, 1: symbol
-compiler.err.duplicate.provides=Doppelte "provides": Service {0}, Implementierung {1}
-
-# 0: symbol
-compiler.err.duplicate.uses=Doppelte Verwendungen: {0}
-
-# 0: symbol
-compiler.err.service.implementation.is.abstract=Die Serviceimplementierung ist eine abstrakte Klasse: {0}
-
-compiler.err.service.implementation.must.be.subtype.of.service.interface=Der Serviceimplementierungstyp muss ein Subtyp des Serviceschnittstellentyps sein oder eine \u00F6ffentliche statische no-args-Methode namens "provider" aufweisen, die die Serviceimplementierung zur\u00FCckgibt
-
-compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface=Der R\u00FCckgabetyp der "provider"-Methode muss ein Subtyp des Serviceschnittstellentyps sein
-
-# 0: symbol
-compiler.err.service.implementation.is.inner=Die Serviceimplementierung ist eine innere Klasse: {0}
-
-# 0: symbol
-compiler.err.service.definition.is.enum=Die Servicedefinition ist eine Enumeration: {0}
-
-# 0: symbol
-compiler.err.service.implementation.doesnt.have.a.no.args.constructor=Die Serviceimplementierung hat keinen Standardkonstruktor: {0}
-
-# 0: symbol
-compiler.err.service.implementation.no.args.constructor.not.public=Der "no arguments"-Konstruktor der Serviceimplementierung ist nicht \u00F6ffentlich: {0}
-
-# 0: symbol
-compiler.err.package.empty.or.not.found=Package ist leer oder nicht vorhanden: {0}
-
-# 0: symbol
-compiler.warn.package.empty.or.not.found=Package ist leer oder nicht vorhanden: {0}
-
-compiler.err.no.output.dir=Kein Klassenausgabeverzeichnis angegeben
-
-compiler.err.unnamed.pkg.not.allowed.named.modules=Unbenanntes Package ist in benannten Modulen nicht zul\u00E4ssig
-
-# 0: name, 1: name
-compiler.err.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} \u00FCberein
-
-# 0: name, 1: name
-compiler.misc.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} \u00FCberein
-
-# 0: name
-compiler.err.module.non.zero.opens=Bei ge\u00F6ffnetem Modul {0} ist opens_count ungleich Null
-
-# 0: name
-compiler.misc.module.non.zero.opens=Bei ge\u00F6ffnetem Modul {0} ist opens_count ungleich Null
-
-compiler.err.module.decl.sb.in.module-info.java=Moduldeklarationen m\u00FCssen in einer Datei namens module-info.java vorhanden sein
-
-# 0: set of string
-compiler.err.too.many.patched.modules=Zu viele gepatchte Module ({0}). Verwenden Sie --module-source-path
-
-# 0: name, 1: name
-compiler.err.file.patched.and.msp=Datei sowohl von --patch-module als auch von --module-source-path zug\u00E4nglich, geh\u00F6rt aber in jedem Pfad zu einem anderen Modul: {0}, {1}
-
-compiler.err.processorpath.no.processormodulepath=Unzul\u00E4ssige Kombination aus -processorpath und --processor-module-path
-
-# 0: symbol
-compiler.err.package.in.other.module=Package ist in einem anderen Modul vorhanden: {0}
-
-# 0: symbol, 1: name, 2: symbol, 3: symbol
-compiler.err.package.clash.from.requires=Modul {0} liest Package {1} sowohl aus {2} als auch aus {3}
-
-# 0: name, 1: symbol, 2: symbol
-compiler.err.package.clash.from.requires.in.unnamed=Das unbenannte Modul liest Package {0} sowohl aus {1} als auch aus {2}
-
-# 0: string
-compiler.err.module.not.found.in.module.source.path=Modul {0} nicht in Modulquellpfad gefunden
-
-compiler.err.output.dir.must.be.specified.with.dash.m.option=Klassenausgabeverzeichnis muss angegeben werden, wenn die Option -m verwendet wird
-
-compiler.err.modulesourcepath.must.be.specified.with.dash.m.option=Modulquellpfad muss angegeben werden, wenn die Option -m verwendet wird
-
-# 0: symbol
-compiler.err.service.implementation.not.in.right.module=Serviceimplementierung muss in demselben Modul wie die provides-Direktive definiert werden
-
-# 0: symbol
-compiler.err.cyclic.requires=Zyklische Abh\u00E4ngigkeit mit {0}
-
-# 0: fragment, 1: name
-compiler.err.duplicate.module.on.path=Doppeltes Modul in {0}\nModul in {1}
-
-# 0: option name, 1: string
-compiler.warn.bad.name.for.option=Ung\u00FCltiger Name im Wert f\u00FCr {0}-Option: "{1}"
-
-# 0: option name, 1: string
-compiler.err.bad.name.for.option=Ung\u00FCltiger Name im Wert f\u00FCr {0}-Option: "{1}"
-
-# 0: option name, 1: symbol
-compiler.warn.module.for.option.not.found=Modulname in {0}-Option nicht gefunden: {1}
-
-compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH kann nur beim Kompilieren des unbenannten Moduls oder beim Kompilieren im Kontext eines automatischen Moduls verwendet werden
-
-# 0: symbol
-compiler.err.add.exports.with.release=Export eines Packages aus Systemmodul {0} ist mit --release nicht zul\u00E4ssig
-
-# 0: symbol
-compiler.err.add.reads.with.release=Hinzuf\u00FCgen von Lese-Edges f\u00FCr Systemmodul {0} ist mit --release nicht zul\u00E4ssig
-
-compiler.warn.addopens.ignored=--add-opens hat zur Kompilierungszeit keine Auswirkungen
-
-compiler.misc.locn.module_source_path=Modulquellpfad
-
-compiler.misc.locn.upgrade_module_path=Upgrademodulpfad
-
-compiler.misc.locn.system_modules=Systemmodule
-
-compiler.misc.locn.module_path=Anwendungsmodulpfad
-
-compiler.misc.cant.resolve.modules=Module k\u00F6nnen nicht aufgel\u00F6st werden
-
-compiler.misc.bad.requires.flag=Ung\u00FCltiges requires-Kennzeichen: {0}
-
-# 0: string
-compiler.err.invalid.module.specifier=Modulbezeichner nicht zul\u00E4ssig: {0}
-
-# 0: symbol
-compiler.warn.service.provided.but.not.exported.or.used=Serviceschnittstelle angegeben, aber nicht exportiert oder verwendet
-
-# 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible={0} {1} in Modul {2} ist nicht zug\u00E4nglich f\u00FCr Clients, die dieses Modul ben\u00F6tigen
-# 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.unexported={0} {1} in Modul {2} wird nicht exportiert
-# 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.not.required.transitive={0} {1} in Modul {2} wird nicht indirekt mit "requires transitive" exportiert
-# 0: kind name, 1: symbol, 2: symbol
-compiler.warn.leaks.not.accessible.unexported.qualified={0} {1} in Modul {2} ist m\u00F6glichweise nicht f\u00FCr alle Clients, die dieses Modul ben\u00F6tigen, sichtbar
-
-###
-# errors related to options
-
-# 0: string, 1: string
-compiler.err.illegal.argument.for.option=Unzul\u00E4ssiges Argument f\u00FCr {0}: {1}
-
-compiler.err.match.binding.exists=Unzul\u00E4ssiger Versuch, ein vorhandenes \u00DCbereinstimmungs-Binding neu zu definieren
-
-compiler.err.switch.case.unexpected.statement=Unerwartete Anweisung in Case. Ausdruck, Block oder throw-Anweisung erwartet
-
-compiler.err.switch.mixing.case.types=Unterschiedliche Case-Typen im Switch verwendet
-
-###
-# errors related to sealed classes
-
-# permits clause
-# 0: fragment
-compiler.err.invalid.permits.clause=Ung\u00FCltige PERMITS-Klausel\n({0})
-
-# 0: string
-compiler.misc.class.is.not.sealed={0} muss verschl\u00FCsselt sein
-
-# 0: type
-compiler.misc.is.a.type.variable=Darf keine Typvariablen enthalten: {0}
-
-# 0: type
-compiler.misc.is.duplicated=Darf keine Duplikate enthalten: {0}
-
-# 0: type
-compiler.misc.doesnt.extend.sealed=Unterklasse {0} muss verschl\u00FCsselte Klasse erweitern
-
-compiler.misc.must.not.be.same.class=Unzul\u00E4ssige Selbstreferenz in PERMITS-Klausel
-
-# 0: type
-compiler.misc.must.not.be.supertype=Unzul\u00E4ssige Referenz zu Supertyp {0}
-
-# other sealed types related errors
-
-compiler.err.sealed.class.must.have.subclasses=Verschl\u00FCsselte Klasse muss Unterklassen aufweisen
-
-# errors in subclasses of sealed classes
-# 0: symbol
-compiler.err.cant.inherit.from.sealed=Klasse darf nicht verschl\u00FCsselte Klasse erweitern: {0} (da diese nicht in der "permits"-Klausel enthalten ist)
-
-# 0: symbol
-compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=Klasse {0} in unbenanntem Modul darf keine verschl\u00FCsselte Klasse in einem anderen Package erweitern
-
-# 0: symbol, 1: symbol
-compiler.err.class.in.module.cant.extend.sealed.in.diff.module=Klasse {0} in Modul {1} darf keine verschl\u00FCsselte Klasse in einem anderen Modul erweitern
-
-# 0: symbol
-compiler.err.non.sealed.with.no.sealed.supertype=Modifikator "non-sealed" ist hier nicht zul\u00E4ssig\n(Klasse {0} hat keine verschl\u00FCsselten Supertypen)
-
-compiler.err.non.sealed.sealed.or.final.expected=Modifikator "sealed", "non-sealed" oder "final" erwartet
-
-compiler.err.non.sealed.or.sealed.expected=Modifikator "sealed" oder "non-sealed" erwartet
-
-compiler.err.sealed.or.non.sealed.local.classes.not.allowed=Lokale Klassen mit "sealed" oder "non-sealed" nicht zul\u00E4ssig
-
-# 0: fragment
-compiler.err.local.classes.cant.extend.sealed=Klassen vom Typ "{0}" d\u00FCrfen keine verschl\u00FCsselten Klassen erweitern
-compiler.misc.anonymous=Anonym
-
-compiler.misc.local=Lokal
-
-###
-# errors related to records
-
-# record components
-compiler.err.record.cant.declare.field.modifiers=Datensatzkomponenten k\u00F6nnen keine Modifikatoren aufweisen
-
-# 0: symbol
-compiler.err.illegal.record.component.name=Unzul\u00E4ssiger Datensatzkomponentenname {0}
-
-compiler.err.record.component.and.old.array.syntax=Legacy-Arraynotation f\u00FCr Datensatzkomponenten nicht zul\u00E4ssig
-
-# accessor methods
-# 0: symbol, 1: fragment
-compiler.err.invalid.accessor.method.in.record=Ung\u00FCltige Accessor-Methode in Datensatz {0}\n({1})
-
-compiler.misc.method.must.be.public=Accessor-Methode muss \u00F6ffentlich sein
-
-# 0: symbol, 1: symbol
-compiler.misc.accessor.return.type.doesnt.match=R\u00FCckgabetyp von Accessor-Methode {0} muss mit dem Typ der Datensatzkomponente {1} \u00FCbereinstimmen
-
-compiler.misc.accessor.method.cant.throw.exception=Throws-Klausel f\u00FCr Accessor-Methode nicht zul\u00E4ssig
-
-compiler.misc.accessor.method.must.not.be.generic=Accessor-Methode darf nicht generisch sein
-
-compiler.misc.accessor.method.must.not.be.static=Accessor-Methode darf nicht statisch sein
-
-# canonical constructors
-# 0: fragment, 1: name, 2: fragment
-compiler.err.invalid.canonical.constructor.in.record=Ung\u00FCltiger Konstruktor vom Typ {0} in Datensatz {1}\n({2})
-
-compiler.misc.canonical=Kanonisch
-
-compiler.misc.compact=Kompakt
-
-# 0: fragment
-compiler.misc.throws.clause.not.allowed.for.canonical.constructor=Throws-Klausel f\u00FCr Konstruktor des Typs {0} nicht zul\u00E4ssig
-
-compiler.misc.canonical.with.name.mismatch=Ung\u00FCltige Parameternamen in kanonischem Konstruktor
-
-compiler.misc.canonical.cant.have.return.statement=Kompakter Konstruktor darf keine return-Anweisungen verwenden
-
-compiler.misc.canonical.must.not.declare.type.variables=Kanonischer Konstruktor darf keine Typvariablen deklarieren
-
-compiler.misc.type.must.be.identical.to.corresponding.record.component.type=Typ und Argumentanzahl m\u00FCssen mit den Werten der entsprechenden Datensatzkomponente \u00FCbereinstimmen
-compiler.misc.canonical.must.not.contain.explicit.constructor.invocation=Kanonischer Konstruktor darf keinen expliziten Konstruktoraufruf enthalten
-
-# 0: set of flag or string
-compiler.misc.canonical.must.not.have.stronger.access=Versuch, h\u00F6here Zugriffsberechtigungen zuzuweisen. War {0}
-
-# other
-compiler.err.record.cannot.declare.instance.fields=Felddeklaration muss statisch sein\n(ersetzen Sie unter Umst\u00E4nden das Feld durch eine Datensatzkomponente)
-
-# 0: symbol
-compiler.err.invalid.supertype.record=Klassen k\u00F6nnen {0} nicht direkt erweitern
-
-# 0: symbol
-compiler.err.first.statement.must.be.call.to.another.constructor=Konstruktor ist nicht kanonisch. Daher muss die erste Anweisung einen anderen Konstruktor der Klasse {0} aufrufen
-
-compiler.err.instance.initializer.not.allowed.in.records=Instanz-Initializer in Datens\u00E4tzen nicht zul\u00E4ssig
-
-compiler.err.static.declaration.not.allowed.in.inner.classes=Statische Deklarationen in inneren Klassen nicht zul\u00E4ssig
-
-compiler.err.record.header.expected=Datensatzheader erwartet
-
-############################################
-# messages previously at javac.properties
-
-compiler.err.empty.A.argument=-A erfordert ein Argument. Verwenden Sie "-Akey" oder "-Akey=value"
-
-# 0: string
-compiler.err.invalid.A.key=Schl\u00FCssel in Annotationsprozessoroption "{0}" ist keine durch Punkt getrennte ID-Sequenz
-
-# 0: string
-compiler.err.invalid.flag=Ung\u00FCltiges Kennzeichen: {0}
-
-compiler.err.profile.bootclasspath.conflict=Optionen "profile" und "bootclasspath" k\u00F6nnen nicht zusammen verwendet werden
-
-# 0: string
-compiler.err.invalid.profile=Ung\u00FCltiges Profil: {0}
-
-# 0: string
-compiler.err.invalid.target=Ung\u00FCltiges Zielrelease: {0}
-
-# 0: option name, 1: target
-compiler.err.option.not.allowed.with.target=Option {0} mit Ziel {1} nicht zul\u00E4ssig
-
-# 0: string
-compiler.err.option.too.many=Option {0} kann nur einmal angegeben werden
-
-compiler.err.no.source.files=Keine Quelldateien
-
-compiler.err.no.source.files.classes=Keine Quelldateien oder Klassennamen
-
-# 0: string
-compiler.err.req.arg={0} erfordert ein Argument
-
-# 0: string
-compiler.err.invalid.source=Ung\u00FCltiges Quellrelease: {0}
-
-# 0: string, 1: string
-compiler.err.error.writing.file=Fehler beim Schreiben von {0}. {1}
-
-compiler.err.sourcepath.modulesourcepath.conflict=--source-path und --module-source-path k\u00F6nnen nicht beide angegeben werden
-
-# 0: string, 1: target
-compiler.warn.source.target.conflict=Quellrelease {0} erfordert Zielrelease {1}
-
-# 0: string, 1: target
-compiler.warn.target.default.source.conflict=Zielrelease {0} steht mit Standardquellrelease {1} in Konflikt
-
-# 0: profile, 1: target
-compiler.warn.profile.target.conflict=Profil {0} ist f\u00FCr Zielrelease {1} nicht g\u00FCltig
-
-# 0: string
-compiler.err.file.not.directory=Kein Verzeichnis: {0}
-
-# 0: object
-compiler.err.file.not.file=Keine Datei: {0}
-
-compiler.err.two.class.loaders.1=javac ist auf mehrere Class Loader aufgeteilt: Pr\u00FCfen Sie die Konfiguration
-
-# 0: url, 1: url
-compiler.err.two.class.loaders.2=javac ist auf mehrere Class Loader aufgeteilt:\nEine Klasse stammt aus Datei {0},\nw\u00E4hrend javac aus {1} stammt
-
-# 0: string, 1: string
-compiler.err.bad.value.for.option=Ung\u00FCltiger Wert f\u00FCr {0}-Option: "{1}"
-
-# 0: string
-compiler.err.no.value.for.option=Kein Wert f\u00FCr {0}-Option
-
-# 0: string
-compiler.err.repeated.value.for.patch.module=--patch-module mehrmals f\u00FCr Modul {0} angegeben
-
-# 0: string
-compiler.err.repeated.value.for.module.source.path=--module-source-path mehrmals f\u00FCr Modul {0} angegeben
-
-compiler.err.multiple.values.for.module.source.path=--module-source-path mehrmals mit Musterargument angegeben
-
-# 0: string
-compiler.err.unmatched.quote=Alleinstehendes Anf\u00FChrungszeichen in Umgebungsvariable {0}
-
-# 0: option name
-compiler.err.release.bootclasspath.conflict=Option {0} kann nicht zusammen mit --release verwendet werden
-
-# 0: string
-compiler.err.unsupported.release.version=Releaseversion {0} nicht unterst\u00FCtzt
-
-# 0: string
-compiler.err.file.not.found=Datei nicht gefunden: {0}
-
-# 0: string, 1: source
-compiler.err.preview.not.latest=Ung\u00FCltiges Quellrelease {0} mit --enable-preview\n(Vorschausprachfeatures werden nur f\u00FCr Release {1} unterst\u00FCtzt)
-
-compiler.err.preview.without.source.or.release=--enable-preview muss mit -source oder --release verwendet werden
-
-# 0: kind name, 1: symbol
-compiler.warn.declared.using.preview={0} {1} ist mit einem Vorschaufeature deklariert, das in einem zuk\u00FCnftigen Release entfernt werden kann.
-
-compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=Versuch der Synchronisierung f\u00FCr eine Instanz einer wertbasierten Klasse
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
index 86c65650c59..2e071a4059a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
@@ -119,7 +119,7 @@ compiler.err.annotation.missing.default.value.1=\u6CE8\u91C8@{0}\u306B\u306F\u89
 # 0: type
 compiler.err.annotation.not.valid.for.type=\u6CE8\u91C8\u306F\u578B{0}\u306E\u8981\u7D20\u306B\u5BFE\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
-compiler.err.annotation.type.not.applicable=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3053\u306E\u7A2E\u985E\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.annotation.type.not.applicable=\u6CE8\u91C8\u578B\u306F\u3053\u306E\u7A2E\u985E\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 
 # 0: type
 compiler.err.annotation.type.not.applicable.to.type=\u6CE8\u91C8@{0}\u306F\u3053\u306E\u578B\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
@@ -263,14 +263,12 @@ compiler.misc.lambda=\u30E9\u30E0\u30C0\u5F0F
 
 compiler.misc.inner.cls=\u5185\u90E8\u30AF\u30E9\u30B9
 
-compiler.misc.guard=\u30AC\u30FC\u30C9
-
 # 0: type
 compiler.err.cant.deref={0}\u306F\u9593\u63A5\u53C2\u7167\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.cant.extend.intf.annotation=@interfaces\u3067\u306F''extends''\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
 
-compiler.err.annotation.decl.not.allowed.here=\u3053\u3053\u3067\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.annotation.decl.not.allowed.here=\u3053\u3053\u3067\u306F\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
 
 # 0: symbol
 compiler.err.cant.inherit.from.final=final {0}\u304B\u3089\u306F\u7D99\u627F\u3067\u304D\u307E\u305B\u3093
@@ -309,7 +307,7 @@ compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
 compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CB\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059
 
-compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
+compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
 
 # 0: symbol
 compiler.err.doesnt.exist=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
@@ -321,7 +319,7 @@ compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91C8{0}\u306F\u6709\u
 compiler.err.duplicate.annotation.member.value=\u6CE8\u91C8@{1}\u306B\u91CD\u8907\u3057\u305F\u8981\u7D20''{0}''\u304C\u3042\u308A\u307E\u3059\u3002
 
 # 0: type
-compiler.err.duplicate.annotation.missing.container={0}\u306F\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.duplicate.annotation.missing.container={0}\u306F\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}\u306F\u7121\u52B9\u306A@Repeatable\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3055\u308C\u3066\u3044\u307E\u3059
@@ -336,22 +334,22 @@ compiler.err.invalid.repeatable.annotation.multiple.values={0}\u306F\u6709\u52B9
 compiler.err.invalid.repeatable.annotation.invalid.value={0}\u306F\u6709\u52B9\u306A@Repeatable\u3067\u306F\u3042\u308A\u307E\u305B\u3093: \u5024\u8981\u7D20\u304C\u7121\u52B9\u3067\u3059
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u578B{2}\u306E\u8981\u7D20''value''\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u578B{2}\u306E\u8981\u7D20''value''\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306E\u4FDD\u6709\u304C\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({2})\u306E\u4FDD\u6709\u3088\u308A\u77ED\u304F\u306A\u3063\u3066\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306E\u4FDD\u6709\u304C\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({2})\u306E\u4FDD\u6709\u3088\u308A\u77ED\u304F\u306A\u3063\u3066\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u9055\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u9055\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u9055\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.not.inherited=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u9055\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u3088\u308A\u591A\u304F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059
+compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u3088\u308A\u591A\u304F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u30B3\u30F3\u30C6\u30CA{0}\u306F\u542B\u307E\u308C\u3066\u3044\u308B\u8981\u7D20\u3068\u540C\u6642\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093
@@ -370,21 +368,8 @@ compiler.err.same.binary.name=\u30AF\u30E9\u30B9: {0}\u3068{1}\u306E\u30D0\u30A4
 
 compiler.err.duplicate.case.label=case\u30E9\u30D9\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
 
-compiler.err.pattern.dominated=\u5148\u884C\u3059\u308Bcase\u30E9\u30D9\u30EB\u304C\u3001\u3053\u306Ecase\u30E9\u30D9\u30EB\u3088\u308A\u3082\u512A\u4F4D\u3067\u3059
-
 compiler.err.duplicate.default.label=default\u30E9\u30D9\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
 
-compiler.err.duplicate.total.pattern=\u5408\u8A08\u30D1\u30BF\u30FC\u30F3\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
-
-compiler.err.total.pattern.and.default=switch\u306B\u5408\u8A08\u30D1\u30BF\u30FC\u30F3\u3068default\u30E9\u30D9\u30EB\u306E\u4E21\u65B9\u304C\u3042\u308A\u307E\u3059
-
-# 0: type, 1: type
-compiler.err.constant.label.not.compatible=\u30BF\u30A4\u30D7{0}\u306E\u5B9A\u6570\u30E9\u30D9\u30EB\u304Cswitch\u30BB\u30EC\u30AF\u30BF\u30FB\u30BF\u30A4\u30D7{1}\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093
-
-compiler.err.flows.through.to.pattern=\u30D1\u30BF\u30FC\u30F3\u306B\u5BFE\u3057\u3066\u4E0D\u6B63\u306Afall-through
-
-compiler.err.flows.through.from.pattern=\u30D1\u30BF\u30FC\u30F3\u304B\u3089\u306E\u4E0D\u6B63\u306Afall-through
-
 compiler.err.else.without.if=''else''\u3078\u306E''if''\u304C\u3042\u308A\u307E\u305B\u3093
 
 compiler.err.empty.char.lit=\u7A7A\u306E\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u3067\u3059
@@ -394,13 +379,13 @@ compiler.err.encl.class.required={0}\u3092\u542B\u3080\u56F2\u3046\u30A4\u30F3\u
 
 compiler.err.enum.annotation.must.be.enum.constant=\u5217\u6319\u578B\u6CE8\u91C8\u5024\u306F\u3001\u5217\u6319\u578B\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.err.enum.cant.be.instantiated=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093
+compiler.err.enum.cant.be.instantiated=\u5217\u6319\u578B\u306F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.enum.label.must.be.unqualified.enum=\u5217\u6319\u578B\u306Eswitch case\u30E9\u30D9\u30EB\u306F\u5217\u6319\u578B\u5B9A\u6570\u306E\u975E\u4FEE\u98FE\u540D\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 compiler.err.enum.no.subclassing=\u30AF\u30E9\u30B9\u306F\u76F4\u63A5java.lang.Enum\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.enum.types.not.extensible=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u62E1\u5F35\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.enum.types.not.extensible=\u5217\u6319\u578B\u306F\u62E1\u5F35\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 compiler.err.enum.no.finalize=\u5217\u6319\u578B\u306Ffinalize\u30E1\u30BD\u30C3\u30C9\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
@@ -510,21 +495,21 @@ compiler.err.incomparable.types=\u578B{0}\u3068{1}\u306F\u6BD4\u8F03\u3067\u304D
 # 0: string
 compiler.err.int.number.too.large=\u6574\u6570\u304C\u5927\u304D\u3059\u304E\u307E\u3059\u3002
 
-compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u304C\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91C8\u578B\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u304C\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
 
 # 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u578B{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u306F\u6C4E\u7528\u30E1\u30BD\u30C3\u30C9\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91C8\u578B\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u306F\u6C4E\u7528\u30E1\u30BD\u30C3\u30C9\u306B\u3067\u304D\u307E\u305B\u3093
 
 # 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{1}\u3067\u30E1\u30BD\u30C3\u30C9{0}\u3068\u540C\u3058\u540D\u524D\u306E\u8981\u7D20\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.intf.annotation.member.clash=\u6CE8\u91C8\u578B{1}\u3067\u30E1\u30BD\u30C3\u30C9{0}\u3068\u540C\u3058\u540D\u524D\u306E\u8981\u7D20\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
 
 compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059
 
 compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
+compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u578B\u8981\u7D20\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
 
 compiler.err.invalid.binary.number=2\u9032\u6570\u5B57\u306F\u5C11\u306A\u304F\u3068\u30821\u6841\u306E2\u9032\u6570\u3092\u542B\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
@@ -550,7 +535,7 @@ compiler.err.label.already.in.use=\u30E9\u30D9\u30EB{0}\u306F\u3059\u3067\u306B\
 # 0: symbol
 compiler.err.local.var.accessed.from.icls.needs.final=\u30ED\u30FC\u30AB\u30EB\u5909\u6570{0}\u306F\u5185\u90E8\u30AF\u30E9\u30B9\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u307E\u3059\u3002final\u3067\u5BA3\u8A00\u3055\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.err.local.enum=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u30ED\u30FC\u30AB\u30EB\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.local.enum=\u5217\u6319\u578B\u306F\u30ED\u30FC\u30AB\u30EB\u306B\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.cannot.create.array.with.type.arguments=\u578B\u5F15\u6570\u3092\u6301\u3064\u914D\u5217\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
 
@@ -664,7 +649,7 @@ compiler.err.no.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u3
 compiler.err.no.match.entry={0}\u306F{1}\u306E\u30A8\u30F3\u30C8\u30EA\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002{2}\u304C\u5FC5\u8981\u3067\u3059
 
 # 0: type
-compiler.err.not.annotation.type={0}\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.annotation.type={0}\u306F\u6CE8\u91C8\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 # 0: symbol, 1: symbol, 2: message segment
 compiler.err.not.def.access.package.cant.access={0} \u306F\u8868\u793A\u4E0D\u53EF\u3067\u3059\n({2})
@@ -851,8 +836,6 @@ compiler.err.static.imp.only.classes.and.interfaces=static import\u306F\u30AF\u3
 
 compiler.err.string.const.req=\u5B9A\u6570\u306E\u6587\u5B57\u5217\u5F0F\u304C\u5FC5\u8981\u3067\u3059
 
-compiler.err.pattern.expected=\u30BF\u30A4\u30D7\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u5FC5\u8981\u3067\u3059
-
 # 0: symbol, 1: fragment
 compiler.err.cannot.generate.class=\u30AF\u30E9\u30B9{0}\u306E\u751F\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\n({1})
 
@@ -983,8 +966,6 @@ compiler.err.unreachable.stmt=\u3053\u306E\u6587\u306B\u5236\u5FA1\u304C\u79FB\u
 
 compiler.err.not.exhaustive=switch\u5F0F\u304C\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u3092\u30AB\u30D0\u30FC\u3057\u3066\u3044\u307E\u305B\u3093
 
-compiler.err.not.exhaustive.statement=switch\u6587\u304C\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u3092\u30AB\u30D0\u30FC\u3057\u3066\u3044\u307E\u305B\u3093
-
 compiler.err.initializer.must.be.able.to.complete.normally=\u521D\u671F\u5316\u5B50\u306F\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 compiler.err.initializer.not.allowed=\u30A4\u30CB\u30B7\u30E3\u30E9\u30A4\u30B6\u306Finterfaces\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
@@ -1025,7 +1006,7 @@ compiler.misc.varargs.trustme.on.reifiable.varargs=\u53EF\u5909\u5F15\u6570\u898
 compiler.err.instanceof.reifiable.not.safe={0}\u3092{1}\u306B\u5B89\u5168\u306B\u30AD\u30E3\u30B9\u30C8\u3067\u304D\u307E\u305B\u3093
 
 # 0: type, 1: type
-compiler.err.instanceof.pattern.no.subtype=\u5F0F\u30BF\u30A4\u30D7{0}\u306F\u30D1\u30BF\u30FC\u30F3\u30FB\u30BF\u30A4\u30D7{1}\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3059
+compiler.err.instanceof.pattern.no.subtype=\u30D1\u30BF\u30FC\u30F3\u30FB\u30BF\u30A4\u30D7{0}\u306F\u5F0F\u30BF\u30A4\u30D7{1}\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3059
 
 # 0: symbol
 compiler.misc.varargs.trustme.on.non.varargs.meth=\u30E1\u30BD\u30C3\u30C9{0}\u306F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
@@ -1092,12 +1073,12 @@ compiler.err.locn.invalid.arg.for.xpatch=--patch-module\u30AA\u30D7\u30B7\u30E7\
 
 compiler.err.file.sb.on.source.or.patch.path.for.module=\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3001\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30C1\u30FB\u30D1\u30B9\u306B\u5B58\u5728\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.err.no.java.lang=\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30AF\u30E9\u30B9\u3067\u30D1\u30C3\u30B1\u30FC\u30B8java.lang\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
-
 #####
 
 # Fatal Errors
 
+compiler.misc.fatal.err.no.java.lang=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30AF\u30E9\u30B9\u30D1\u30B9\u307E\u305F\u306F\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u3067\u30D1\u30C3\u30B1\u30FC\u30B8java.lang\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
+
 # 0: name
 compiler.misc.fatal.err.cant.locate.meth=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30E1\u30BD\u30C3\u30C9{0}\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
 
@@ -1187,21 +1168,19 @@ compiler.note.unchecked.filename.additional={0}\u306B\u672A\u30C1\u30A7\u30C3\u3
 
 compiler.note.unchecked.plural.additional=\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u64CD\u4F5C\u306E\u3046\u3061\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u306A\u3044\u3082\u306E\u304C\u3055\u3089\u306B\u3042\u308A\u307E\u3059\u3002
 
-# 0: file name, 1: source
-compiler.note.preview.filename={0}\u306FJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: file name
+compiler.note.preview.filename={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
-# 0: source
-compiler.note.preview.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306FJava SE {0}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+compiler.note.preview.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 # The following string may appear after one of the above deprecation
 # messages.
 compiler.note.preview.recompile=\u8A73\u7D30\u306F\u3001-Xlint:preview\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-# 0: file name, 1: source
-compiler.note.preview.filename.additional={0}\u306BJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u8FFD\u52A0\u4F7F\u7528\u304C\u3042\u308A\u307E\u3059\u3002
+# 0: file name
+compiler.note.preview.filename.additional={0}\u306F\u8FFD\u52A0\u3067\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
-# 0: source
-compiler.note.preview.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306FJava SE {0}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u8FFD\u52A0\u4F7F\u7528\u3057\u307E\u3059\u3002
+compiler.note.preview.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u8FFD\u52A0\u3067\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 # Notes related to annotation processing
 
@@ -1290,8 +1269,6 @@ compiler.warn.dir.path.element.not.directory=\u4E0D\u6B63\u306A\u30D1\u30B9\u898
 # 0: symbol, 1: symbol, 2: symbol
 compiler.warn.missing-explicit-ctor=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8{1}\u306E\u30AF\u30E9\u30B9{0}\u306F\u660E\u793A\u7684\u306A\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u5BA3\u8A00\u3057\u306A\u3044\u305F\u3081\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306E\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306B\u516C\u958B\u3057\u307E\u3059
 
-compiler.warn.strictfp=\u30EA\u30EA\u30FC\u30B917\u4EE5\u964D\u3001\u3059\u3079\u3066\u306E\u6D6E\u52D5\u5C0F\u6570\u70B9\u5F0F\u306F\u53B3\u5BC6\u306B\u8A55\u4FA1\u3055\u308C\u3001''strictfp''\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
-
 compiler.warn.finally.cannot.complete=finally\u7BC0\u304C\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093
 
 # 0: name
@@ -1307,13 +1284,10 @@ compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u30
 compiler.warn.has.been.deprecated.for.removal={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u3066\u304A\u3089\u305A\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u3066\u3044\u307E\u3059
 
 # 0: symbol
-compiler.warn.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.warn.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u4E00\u90E8\u3067\u3042\u308BAPI\u3067\u3059
 
 # 0: symbol
-compiler.err.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n(\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F--enable-preview\u3092\u4F7F\u7528\u3057\u307E\u3059)
-
-# 0: symbol
-compiler.warn.is.preview.reflective={0}\u306F\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+compiler.err.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u4E00\u90E8\u3067\u3042\u308BAPI\u3067\u3059
 
 # 0: symbol
 compiler.warn.has.been.deprecated.module=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093
@@ -1329,11 +1303,6 @@ compiler.warn.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57\u306F\u3001\u30
 # 0: symbol
 compiler.warn.improper.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Bstatic final\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.warn.improper.SPF=serialPersistentFields\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001private static final\u3068\u3057\u3066\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-
-compiler.warn.SPF.null.init=null\u306B\u521D\u671F\u5316\u3059\u308B\u3068serialPersistentFields\u306F\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u306A\u3044\u3053\u3068\u3092\u793A\u3059\u306B\u306F\u3001\u7A7A\u306E\u914D\u5217\u306B\u521D\u671F\u5316\u3057\u307E\u3059
-
-
 # 0: type, 1: type
 compiler.warn.inexact.non-varargs.call=\u6700\u7D42\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u4E0D\u6B63\u78BA\u306A\u5F15\u6570\u578B\u3092\u6301\u3063\u305F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306E\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u3002\n\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{0}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u307E\u3059\u3002\n\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059
 
@@ -1346,67 +1315,9 @@ compiler.warn.unreachable.catch.1=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304
 # 0: symbol
 compiler.warn.long.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Elong\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.warn.OSF.array.SPF=serialPersistentFields\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30BF\u30A4\u30D7\u3092java.io.ObjectStreamField[]\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-
 # 0: symbol
 compiler.warn.missing.SVUID=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9{0}\u306B\u306F\u3001serialVersionUID\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 
-# 0: name
-compiler.warn.serializable.missing.access.no.arg.ctor=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u4E0D\u53EF\u306E\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9{0}\u3067\u5F15\u6570\u306A\u3057\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
-
-# 0: name
-compiler.warn.serial.method.not.private=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306Fprivate\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-
-# 0: name
-compiler.warn.serial.concrete.instance.method=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001concrete\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002abstract\u3067\u3082static\u3067\u3082\u3042\u308A\u307E\u305B\u3093
-
-# 0: name
-compiler.warn.serial.method.static=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u304Cstatic\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u304B\u308F\u308A\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-
-# 0: name
-compiler.warn.serial.method.no.args=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044
-
-# 0: name, 1: number
-compiler.warn.serial.method.one.arg=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306B\u3001{1}\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u306A\u304F\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30921\u3064\u306E\u307F\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-
-# 0: name, 1: type, 2: type
-compiler.warn.serial.method.parameter.type=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306E1\u3064\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3001\u578B{2}\u3067\u306F\u306A\u304F\u3001\u578B{1}\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-
-# 0: name, 1: type, 2: type
-compiler.warn.serial.method.unexpected.return.type=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u3001\u5FC5\u8981\u306A\u578B{2}\u3067\u306F\u306A\u304F\u3001{1}\u306E\u623B\u308A\u578B\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u3088\u3046\u306B\u3001\u30E1\u30BD\u30C3\u30C9\u306F\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u304C\u7121\u52B9\u306B\u306A\u308A\u307E\u3059
-
-# 0: name, 1: type
-compiler.warn.serial.method.unexpected.exception=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u4E88\u671F\u3057\u306A\u3044\u578B{1}\u3092\u30B9\u30ED\u30FC\u3059\u308B\u3088\u3046\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
-
-compiler.warn.ineffectual.serial.field.interface=serialPersistentFields\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-
-# 0: string
-compiler.warn.ineffectual.serial.field.enum=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30D5\u30A3\u30FC\u30EB\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-
-# 0: string
-compiler.warn.ineffectual.serial.method.enum=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-
-compiler.warn.ineffectual.serial.field.record=serialPersistentFields\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-
-# 0: string
-compiler.warn.ineffectual.serial.method.record=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-
-# 0: name
-compiler.warn.ineffectual.serial.method.externalizable=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-
-compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-
-compiler.warn.externalizable.missing.public.no.arg.ctor=\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306B\u306F\u5F15\u6570\u306A\u3057\u3067\u30D1\u30D6\u30EA\u30C3\u30AF\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u5FC5\u8981\u3067\u3059
-
-compiler.warn.non.serializable.instance.field=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306E\u5E38\u99D0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u76F4\u5217\u4E0D\u53EF\u30BF\u30A4\u30D7\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
-
-# 0: type
-compiler.warn.non.serializable.instance.field.array=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306E\u5E38\u99D0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u76F4\u5217\u4E0D\u53EF\u306E\u30D9\u30FC\u30B9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7{0}\u3092\u6301\u3064\u914D\u5217\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
-
-compiler.warn.non.private.method.weaker.access=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067private\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u305F\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9\u306B\u3088\u3063\u3066\u3001\n\u305D\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u30AF\u30E9\u30B9\u304C\u30E1\u30BD\u30C3\u30C9\u3092private\u3068\u3057\u3066\u5BA3\u8A00\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059
-
-compiler.warn.default.ineffective=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u30AF\u30E9\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u305F\u3081\u306E\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u3067\u5B9F\u884C\u3055\u308C\u307E\u305B\u3093
-
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.warn.potentially.ambiguous.overload={1}\u5185\u306E{0}\u306F{3}\u5185\u306E{2}\u3068\u77DB\u76FE\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
 
@@ -1493,7 +1404,7 @@ compiler.warn.proc.suspicious.class.name=\u540D\u524D\u304C{1}\u3067\u7D42\u308F
 compiler.warn.proc.file.create.last.round=\u6700\u5F8C\u306B\u4F5C\u6210\u3055\u308C\u305F\u30BF\u30A4\u30D7''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u6CE8\u91C8\u51E6\u7406\u306B\u6E21\u3055\u308C\u307E\u305B\u3093\u3002
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u304C\u8FD4\u3057\u305F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6587\u5B57\u5217''{0}''\u304C\u4E0D\u6B63\u3067\u3059
+compiler.warn.proc.malformed.supported.string=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u304C\u8FD4\u3057\u305F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u6CE8\u91C8\u578B\u306E\u6587\u5B57\u5217''{0}''\u304C\u4E0D\u6B63\u3067\u3059
 
 # 0: set of string
 compiler.warn.proc.annotations.without.processors=\u3053\u308C\u3089\u306E\u6CE8\u91C8\u3092\u8981\u6C42\u3059\u308B\u30D7\u30ED\u30BB\u30C3\u30B5\u306F\u3042\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}
@@ -1505,10 +1416,10 @@ compiler.warn.proc.processor.incompatible.source.version=\u6CE8\u91C8\u30D7\u30E
 compiler.warn.proc.duplicate.option.name=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
+compiler.warn.proc.duplicate.supported.annotation=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u6CE8\u91C8\u578B''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306F''*''\u3068\u4ED6\u306E\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u91CD\u8907\u3057\u3066\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
+compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306F''*''\u3068\u4ED6\u306E\u6CE8\u91C8\u578B\u3092\u91CD\u8907\u3057\u3066\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
 
 compiler.warn.proc.proc-only.requested.no.procs=\u30B3\u30F3\u30D1\u30A4\u30EB\u306A\u3057\u306E\u6CE8\u91C8\u51E6\u7406\u304C\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 
@@ -1564,8 +1475,6 @@ compiler.warn.deprecated.annotation.has.no.effect=@Deprecated\u6CE8\u91C8\u306F\
 # 0: string
 compiler.warn.invalid.path=\u30D5\u30A1\u30A4\u30EB\u540D\u304C\u7121\u52B9\u3067\u3059: {0}
 
-compiler.warn.doclint.not.available=\u4F7F\u7528\u53EF\u80FD\u306Adoclint\u306E\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u306F\u3042\u308A\u307E\u305B\u3093
-
 # 0: string
 compiler.err.invalid.path=\u30D5\u30A1\u30A4\u30EB\u540D\u304C\u7121\u52B9\u3067\u3059: {0}
 
@@ -1668,6 +1577,8 @@ compiler.err.enum.constant.expected=\u3053\u3053\u306B\u5217\u6319\u578B\u5B9A\u
 compiler.err.enum.constant.not.expected=\u3053\u3053\u306B\u5217\u6319\u578B\u5B9A\u6570\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
 
 ## The following are related in form, but do not easily fit the above paradigm.
+compiler.err.expected.module=''\u30E2\u30B8\u30E5\u30FC\u30EB''\u304C\u5FC5\u8981\u3067\u3059
+
 compiler.err.expected.module.or.open=''\u30E2\u30B8\u30E5\u30FC\u30EB''\u307E\u305F\u306F''\u30AA\u30FC\u30D7\u30F3''\u304C\u5FC5\u8981\u3067\u3059
 
 compiler.err.dot.class.expected=''.class''\u304C\u3042\u308A\u307E\u305B\u3093
@@ -2192,10 +2103,6 @@ compiler.misc.feature.records=\u30EC\u30B3\u30FC\u30C9
 
 compiler.misc.feature.sealed.classes=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
 
-compiler.misc.feature.case.null=switch case\u306Enull
-
-compiler.misc.feature.pattern.switch=switch\u6587\u306E\u30D1\u30BF\u30FC\u30F3
-
 compiler.warn.underscore.as.identifier=\u30EA\u30EA\u30FC\u30B99\u304B\u3089''_''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.underscore.as.identifier=\u30EA\u30EA\u30FC\u30B99\u304B\u3089''_''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
@@ -2267,28 +2174,6 @@ compiler.note.deferred.method.inst=\u30E1\u30BD\u30C3\u30C9{0}\u306E\u9045\u5EF6
 # 0: symbol
 compiler.note.verbose.l2m.deduplicate=\u91CD\u8907\u9664\u5916\u30E9\u30E0\u30C0\u5B9F\u88C5\u30E1\u30BD\u30C3\u30C9{0}
 
-########################################
-# Diagnostics for method reference search
-# results used by Resolve (debug only)
-########################################
-
-# 0: fragment, 1: string, 2: number
-compiler.note.method.ref.search.results.multi={1}\u306E{0}\u306E\u691C\u7D22\u7D50\u679C(\u6700\u3082\u53B3\u5BC6\u306A\u3082\u306E{2}\u500B)\n\u4F7F\u7528\u53EF\u80FD\u306A\u5019\u88DC:
-
-# 0: number, 1: fragment, 2: symbol
-compiler.misc.applicable.method.found.2=\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C#{0}\u500B\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} {2}
-
-# 0: number, 1: fragment, 2: symbol, 3: message segment
-compiler.misc.applicable.method.found.3=\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C#{0}\u500B\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} {2}\n({3})
-
-compiler.misc.static=static
-
-compiler.misc.non.static=static\u3067\u306A\u3044
-
-compiler.misc.bound=\u30D0\u30A4\u30F3\u30C9
-
-compiler.misc.unbound=\u30D0\u30A4\u30F3\u30C9\u306A\u3057
-
 ########################################
 # Diagnostics for where clause implementation
 # used by the RichDiagnosticFormatter.
@@ -2375,7 +2260,7 @@ compiler.err.dc.no.tag.name='@'\u306E\u5F8C\u306B\u30BF\u30B0\u540D\u304C\u3042\
 
 compiler.err.dc.gt.expected=''>''\u304C\u5FC5\u8981\u3067\u3059
 
-compiler.err.dc.ref.bad.parens=\u30AB\u30C3\u30B3\u306E\u5F8C\u306E\u4E88\u671F\u3057\u306A\u3044\u30C6\u30AD\u30B9\u30C8\u3067\u3059
+compiler.err.dc.ref.bad.parens=\u53C2\u7167\u306B'')''\u304C\u3042\u308A\u307E\u305B\u3093
 
 compiler.err.dc.ref.syntax.error=\u53C2\u7167\u306B\u69CB\u6587\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059
 
@@ -2389,8 +2274,6 @@ compiler.err.dc.unterminated.signature=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u7D4
 
 compiler.err.dc.unterminated.string=\u6587\u5B57\u5217\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
 
-compiler.err.dc.ref.annotations.not.allowed=\u6CE8\u91C8\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
-
 ###
 # errors related to modules
 
@@ -2567,6 +2450,8 @@ compiler.err.illegal.argument.for.option={0}\u306E\u5F15\u6570\u304C\u4E0D\u6B63
 
 compiler.err.match.binding.exists=\u65E2\u5B58\u306E\u4E00\u81F4\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u518D\u5B9A\u7FA9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
+compiler.err.switch.null.not.allowed=case\u306Enull\u30E9\u30D9\u30EB\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+
 compiler.err.switch.case.unexpected.statement=case\u306E\u4E88\u671F\u3057\u306A\u3044\u6587\u3067\u3059\u3002\u4E88\u671F\u3055\u308C\u308B\u306E\u306F\u3001\u5F0F\u3001\u30D6\u30ED\u30C3\u30AF\u307E\u305F\u306Fthrow\u6587\u3067\u3059
 
 compiler.err.switch.mixing.case.types=switch\u3067case\u306E\u7570\u306A\u308B\u7A2E\u985E\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
@@ -2779,7 +2664,5 @@ compiler.err.preview.not.latest=--enable-preview\u304C\u6307\u5B9A\u3055\u308C\u
 
 compiler.err.preview.without.source.or.release=--enable-preview\u306F-source\u307E\u305F\u306F--release\u3068\u3068\u3082\u306B\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-# 0: kind name, 1: symbol
-compiler.warn.declared.using.preview={0} {1}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u304A\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-
 compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5024\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u540C\u671F\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
+
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
index 01c92e9e0b3..3c6e2ca34d3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
@@ -119,7 +119,7 @@ compiler.err.annotation.missing.default.value.1=\u5BF9\u4E8E\u5143\u7D20{1}, \u6
 # 0: type
 compiler.err.annotation.not.valid.for.type=\u6CE8\u91CA\u5BF9\u4E8E\u7C7B\u578B{0}\u7684\u5143\u7D20\u65E0\u6548
 
-compiler.err.annotation.type.not.applicable=\u6CE8\u91CA\u63A5\u53E3\u4E0D\u9002\u7528\u4E8E\u6B64\u7C7B\u578B\u7684\u58F0\u660E
+compiler.err.annotation.type.not.applicable=\u6CE8\u91CA\u7C7B\u578B\u4E0D\u9002\u7528\u4E8E\u8BE5\u7C7B\u578B\u7684\u58F0\u660E
 
 # 0: type
 compiler.err.annotation.type.not.applicable.to.type=\u6CE8\u91CA @{0} \u5728\u6B64\u7C7B\u578B\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u9002\u7528
@@ -263,14 +263,12 @@ compiler.misc.lambda=lambda \u8868\u8FBE\u5F0F
 
 compiler.misc.inner.cls=\u5185\u90E8\u7C7B
 
-compiler.misc.guard=\u536B\u58EB
-
 # 0: type
 compiler.err.cant.deref=\u65E0\u6CD5\u53D6\u6D88\u5F15\u7528{0}
 
 compiler.err.cant.extend.intf.annotation=\u5BF9\u4E8E @interfaces, \u4E0D\u5141\u8BB8 ''extends''
 
-compiler.err.annotation.decl.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E
+compiler.err.annotation.decl.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
 
 # 0: symbol
 compiler.err.cant.inherit.from.final=\u65E0\u6CD5\u4ECE\u6700\u7EC8{0}\u8FDB\u884C\u7EE7\u627F
@@ -309,7 +307,7 @@ compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B\u3002
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
 compiler.err.concrete.inheritance.conflict={1}\u4E2D\u7684\u65B9\u6CD5{0}\u548C{3}\u4E2D\u7684\u65B9\u6CD5{2}\u662F\u4F7F\u7528\u76F8\u540C\u7684\u7B7E\u540D\u7EE7\u627F\u7684
 
-compiler.err.default.allowed.in.intf.annotation.member=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
+compiler.err.default.allowed.in.intf.annotation.member=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
 
 # 0: symbol
 compiler.err.doesnt.exist=\u7A0B\u5E8F\u5305{0}\u4E0D\u5B58\u5728
@@ -321,7 +319,7 @@ compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91CA{0}\u4E0D\u662F\u
 compiler.err.duplicate.annotation.member.value=\u6CE8\u91CA@{1}\u4E2D\u7684\u5143\u7D20 ''{0}'' \u91CD\u590D\u3002
 
 # 0: type
-compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6CE8\u91CA\u63A5\u53E3
+compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation=\u6CE8\u91CA\u91CD\u590D: \u4F7F\u7528\u65E0\u6548\u7684 @Repeatable \u6CE8\u91CA\u5BF9{0}\u8FDB\u884C\u4E86\u6CE8\u91CA
@@ -336,22 +334,22 @@ compiler.err.invalid.repeatable.annotation.multiple.values={0}\u4E0D\u662F\u6709
 compiler.err.invalid.repeatable.annotation.invalid.value={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable: \u503C\u5143\u7D20\u65E0\u6548
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5FC5\u987B\u58F0\u660E\u7C7B\u578B {2} \u7684\u540D\u4E3A ''value'' \u7684\u5143\u7D20
+compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5FC5\u987B\u58F0\u660E\u7C7B\u578B{2}\u7684\u540D\u4E3A ''value'' \u7684\u5143\u7D20
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u6CA1\u6709\u5143\u7D20 {1} \u7684\u9ED8\u8BA4\u503C
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5BF9\u4E8E\u5143\u7D20 {1}, \u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u6CA1\u6709\u9ED8\u8BA4\u503C
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u7684\u4FDD\u7559\u671F\u77ED\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({2}) \u7684\u4FDD\u7559\u671F
+compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u7684\u4FDD\u7559\u671F\u77ED\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({2}) \u7684\u4FDD\u7559\u671F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1}) \u662F @Documented\uFF0C\u800C\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5219\u4E0D\u662F
+compiler.err.invalid.repeatable.annotation.not.documented=\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1}) \u662F @Documented, \u800C\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5219\u4E0D\u662F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1}) \u662F @Inherited\uFF0C\u800C\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5219\u4E0D\u662F
+compiler.err.invalid.repeatable.annotation.not.inherited=\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1}) \u662F @Inherited, \u800C\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5219\u4E0D\u662F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u9002\u7528\u7684\u76EE\u6807\u591A\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1})
+compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u9002\u7528\u7684\u76EE\u6807\u591A\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1})
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u5BB9\u5668 {0} \u4E0D\u5F97\u4E0E\u5176\u5305\u542B\u7684\u5143\u7D20\u540C\u65F6\u5B58\u5728
@@ -370,21 +368,8 @@ compiler.err.same.binary.name=\u7C7B\uFF1A{0} \u548C {1} \u5177\u6709\u76F8\u540
 
 compiler.err.duplicate.case.label=case \u6807\u7B7E\u91CD\u590D
 
-compiler.err.pattern.dominated=\u6B64 case \u6807\u7B7E\u7531\u524D\u4E00\u4E2A case \u6807\u7B7E\u652F\u914D
-
 compiler.err.duplicate.default.label=default \u6807\u7B7E\u91CD\u590D
 
-compiler.err.duplicate.total.pattern=\u603B\u8BA1\u6A21\u5F0F\u91CD\u590D
-
-compiler.err.total.pattern.and.default=switch \u6709\u4E00\u4E2A\u603B\u8BA1\u6A21\u5F0F\u548C\u4E00\u4E2A\u9ED8\u8BA4\u6807\u7B7E
-
-# 0: type, 1: type
-compiler.err.constant.label.not.compatible={0} \u7C7B\u578B\u7684\u5E38\u91CF\u6807\u7B7E\u4E0E switch \u9009\u62E9\u5668\u7C7B\u578B {1} \u4E0D\u517C\u5BB9
-
-compiler.err.flows.through.to.pattern=\u8D2F\u7A7F (fall-through) \u5230\u6A21\u5F0F\u975E\u6CD5
-
-compiler.err.flows.through.from.pattern=\u4ECE\u6A21\u5F0F\u8D2F\u7A7F (fall-through) \u975E\u6CD5
-
 compiler.err.else.without.if=\u6709 ''if'', \u4F46\u662F\u6CA1\u6709 ''else''
 
 compiler.err.empty.char.lit=\u7A7A\u5B57\u7B26\u6587\u5B57
@@ -394,13 +379,13 @@ compiler.err.encl.class.required=\u9700\u8981\u5305\u542B{0}\u7684\u5C01\u95ED\u
 
 compiler.err.enum.annotation.must.be.enum.constant=\u679A\u4E3E\u6CE8\u91CA\u503C\u5FC5\u987B\u662F\u679A\u4E3E\u5E38\u91CF
 
-compiler.err.enum.cant.be.instantiated=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u679A\u4E3E\u7C7B
+compiler.err.enum.cant.be.instantiated=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u679A\u4E3E\u7C7B\u578B
 
 compiler.err.enum.label.must.be.unqualified.enum=\u679A\u4E3E switch case \u6807\u7B7E\u5FC5\u987B\u4E3A\u679A\u4E3E\u5E38\u91CF\u7684\u975E\u9650\u5B9A\u540D\u79F0
 
 compiler.err.enum.no.subclassing=\u7C7B\u65E0\u6CD5\u76F4\u63A5\u6269\u5C55 java.lang.Enum
 
-compiler.err.enum.types.not.extensible=\u679A\u4E3E\u7C7B\u4E0D\u53EF\u6269\u5C55
+compiler.err.enum.types.not.extensible=\u679A\u4E3E\u7C7B\u578B\u4E0D\u53EF\u7EE7\u627F
 
 compiler.err.enum.no.finalize=\u679A\u4E3E\u4E0D\u80FD\u6709 finalize \u65B9\u6CD5
 
@@ -430,9 +415,9 @@ compiler.err.finally.without.try=\u6709 ''finally'', \u4F46\u662F\u6CA1\u6709 ''
 # 0: type, 1: message segment
 compiler.err.foreach.not.applicable.to.type=for-each \u4E0D\u9002\u7528\u4E8E\u8868\u8FBE\u5F0F\u7C7B\u578B\n\u8981\u6C42: {1}\n\u627E\u5230:    {0}
 
-compiler.err.fp.number.too.large=\u6D6E\u70B9\u6570\u592A\u5927
+compiler.err.fp.number.too.large=\u6D6E\u70B9\u6570\u8FC7\u5927
 
-compiler.err.fp.number.too.small=\u6D6E\u70B9\u6570\u592A\u5C0F
+compiler.err.fp.number.too.small=\u6D6E\u70B9\u6570\u8FC7\u5C0F
 
 compiler.err.generic.array.creation=\u521B\u5EFA\u6CDB\u578B\u6570\u7EC4
 
@@ -510,21 +495,21 @@ compiler.err.incomparable.types=\u4E0D\u53EF\u6BD4\u8F83\u7684\u7C7B\u578B: {0}\
 # 0: string
 compiler.err.int.number.too.large=\u6574\u6570\u592A\u5927
 
-compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u65E0\u6CD5\u58F0\u660E\u5F62\u53C2
+compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u65E0\u6CD5\u58F0\u660E\u5F62\u53C2
 
 # 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91CA\u63A5\u53E3 {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
+compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
 
-compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
+compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
 
 # 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=\u6CE8\u91CA\u63A5\u53E3 {1} \u58F0\u660E\u7684\u5143\u7D20\u4E0E\u65B9\u6CD5 {0} \u540C\u540D
+compiler.err.intf.annotation.member.clash=\u6CE8\u91CA\u7C7B\u578B{1}\u58F0\u660E\u4E0E\u65B9\u6CD5 {0} \u540C\u540D\u7684\u5143\u7D20
 
 compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3
 
 compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53
 
-compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20\u7684\u7C7B\u578B\u65E0\u6548
+compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20\u7684\u7C7B\u578B\u65E0\u6548
 
 compiler.err.invalid.binary.number=\u4E8C\u8FDB\u5236\u6570\u5B57\u4E2D\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u4E8C\u8FDB\u5236\u6570
 
@@ -550,7 +535,7 @@ compiler.err.label.already.in.use=\u6807\u7B7E{0}\u5DF2\u4F7F\u7528
 # 0: symbol
 compiler.err.local.var.accessed.from.icls.needs.final=\u4ECE\u5185\u90E8\u7C7B\u4E2D\u8BBF\u95EE\u672C\u5730\u53D8\u91CF{0}; \u9700\u8981\u88AB\u58F0\u660E\u4E3A\u6700\u7EC8\u7C7B\u578B
 
-compiler.err.local.enum=\u679A\u4E3E\u7C7B\u4E0D\u80FD\u4E3A\u672C\u5730\u7C7B
+compiler.err.local.enum=\u679A\u4E3E\u7C7B\u578B\u4E0D\u80FD\u4E3A\u672C\u5730\u7C7B\u578B
 
 compiler.err.cannot.create.array.with.type.arguments=\u65E0\u6CD5\u521B\u5EFA\u5177\u6709\u7C7B\u578B\u53D8\u91CF\u7684\u6570\u7EC4
 
@@ -664,7 +649,7 @@ compiler.err.no.intf.expected.here=\u6B64\u5904\u4E0D\u9700\u8981\u63A5\u53E3
 compiler.err.no.match.entry={0}\u5728{1}\u7684\u6761\u76EE\u4E2D\u6CA1\u6709\u5339\u914D\u9879; \u9700\u8981{2}
 
 # 0: type
-compiler.err.not.annotation.type={0} \u4E0D\u662F\u6CE8\u91CA\u63A5\u53E3
+compiler.err.not.annotation.type={0}\u4E0D\u662F\u6CE8\u91CA\u7C7B\u578B
 
 # 0: symbol, 1: symbol, 2: message segment
 compiler.err.not.def.access.package.cant.access={0} \u4E0D\u53EF\u89C1\n({2})
@@ -851,8 +836,6 @@ compiler.err.static.imp.only.classes.and.interfaces=\u4EC5\u4ECE\u7C7B\u548C\u63
 
 compiler.err.string.const.req=\u9700\u8981\u5E38\u91CF\u5B57\u7B26\u4E32\u8868\u8FBE\u5F0F
 
-compiler.err.pattern.expected=\u9700\u8981\u7C7B\u578B\u6A21\u5F0F
-
 # 0: symbol, 1: fragment
 compiler.err.cannot.generate.class=\u751F\u6210\u7C7B {0} \u65F6\u51FA\u9519\n({1})
 
@@ -983,8 +966,6 @@ compiler.err.unreachable.stmt=\u65E0\u6CD5\u8BBF\u95EE\u7684\u8BED\u53E5
 
 compiler.err.not.exhaustive=switch \u8868\u8FBE\u5F0F\u4E0D\u5305\u542B\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C
 
-compiler.err.not.exhaustive.statement=\u5E76\u975E\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C\u90FD\u5305\u542B\u5728 switch \u8BED\u53E5\u4E2D
-
 compiler.err.initializer.must.be.able.to.complete.normally=\u521D\u59CB\u5316\u7A0B\u5E8F\u5FC5\u987B\u80FD\u591F\u6B63\u5E38\u5B8C\u6210
 
 compiler.err.initializer.not.allowed=\u63A5\u53E3\u4E2D\u4E0D\u5141\u8BB8\u6709\u521D\u59CB\u5316\u7A0B\u5E8F
@@ -1025,7 +1006,7 @@ compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs \u5143\u7D20\u7C7B\u5
 compiler.err.instanceof.reifiable.not.safe={0} \u65E0\u6CD5\u5B89\u5168\u5730\u8F6C\u6362\u4E3A {1}
 
 # 0: type, 1: type
-compiler.err.instanceof.pattern.no.subtype=\u8868\u8FBE\u5F0F\u7C7B\u578B {0} \u662F\u6A21\u5F0F\u7C7B\u578B {1} \u7684\u5B50\u7C7B\u578B
+compiler.err.instanceof.pattern.no.subtype=\u6A21\u5F0F\u7C7B\u578B {0} \u662F\u8868\u8FBE\u5F0F\u7C7B\u578B {1} \u7684\u5B50\u7C7B\u578B
 
 # 0: symbol
 compiler.misc.varargs.trustme.on.non.varargs.meth=\u65B9\u6CD5 {0} \u4E0D\u662F varargs \u65B9\u6CD5\u3002
@@ -1092,12 +1073,12 @@ compiler.err.locn.invalid.arg.for.xpatch=--patch-module \u9009\u9879\u7684\u53C2
 
 compiler.err.file.sb.on.source.or.patch.path.for.module=\u6587\u4EF6\u5E94\u5728\u6E90\u8DEF\u5F84\u6216\u6A21\u5757\u7684\u8865\u4E01\u7A0B\u5E8F\u8DEF\u5F84\u4E2D
 
-compiler.err.no.java.lang=\u5728\u5E73\u53F0\u7C7B\u4E2D\u627E\u4E0D\u5230\u7A0B\u5E8F\u5305 java.lang
-
 #####
 
 # Fatal Errors
 
+compiler.misc.fatal.err.no.java.lang=\u81F4\u547D\u9519\u8BEF: \u5728\u7C7B\u8DEF\u5F84\u6216\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u7A0B\u5E8F\u5305 java.lang
+
 # 0: name
 compiler.misc.fatal.err.cant.locate.meth=\u81F4\u547D\u9519\u8BEF: \u627E\u4E0D\u5230\u65B9\u6CD5{0}
 
@@ -1187,21 +1168,19 @@ compiler.note.unchecked.filename.additional={0}\u8FD8\u6709\u672A\u7ECF\u68C0\u6
 
 compiler.note.unchecked.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528\u4E86\u672A\u7ECF\u68C0\u67E5\u6216\u4E0D\u5B89\u5168\u7684\u64CD\u4F5C\u3002
 
-# 0: file name, 1: source
-compiler.note.preview.filename={0} \u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
+# 0: file name
+compiler.note.preview.filename={0} \u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
 
-# 0: source
-compiler.note.preview.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528 Java SE {0} \u7684\u9884\u89C8\u529F\u80FD\u3002
+compiler.note.preview.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
 
 # The following string may appear after one of the above deprecation
 # messages.
 compiler.note.preview.recompile=\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u4F7F\u7528 -Xlint:preview \u91CD\u65B0\u7F16\u8BD1\u3002
 
-# 0: file name, 1: source
-compiler.note.preview.filename.additional={0} \u8FD8\u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
+# 0: file name
+compiler.note.preview.filename.additional={0} \u8FD8\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
 
-# 0: source
-compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528 Java SE {0} \u7684\u9884\u89C8\u529F\u80FD\u3002
+compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
 
 # Notes related to annotation processing
 
@@ -1290,8 +1269,6 @@ compiler.warn.dir.path.element.not.directory=\u9519\u8BEF\u7684\u8DEF\u5F84\u514
 # 0: symbol, 1: symbol, 2: symbol
 compiler.warn.missing-explicit-ctor=\u5BFC\u51FA\u7684\u7A0B\u5E8F\u5305 {1} \u4E2D\u7684\u7C7B {0} \u672A\u58F0\u660E\u663E\u5F0F\u6784\u9020\u5668\uFF0C\u56E0\u6B64\u5C06\u5411\u6A21\u5757 {2} \u7684\u5BA2\u6237\u673A\u516C\u5F00\u9ED8\u8BA4\u6784\u9020\u5668
 
-compiler.warn.strictfp=\u4ECE\u53D1\u884C\u7248 17 \u5F00\u59CB\uFF0C\u6240\u6709\u6D6E\u70B9\u8868\u8FBE\u5F0F\u90FD\u7ECF\u8FC7\u4E25\u683C\u8BA1\u7B97\uFF0C\u4E0D\u9700\u8981 ''strictfp''
-
 compiler.warn.finally.cannot.complete=finally \u5B50\u53E5\u65E0\u6CD5\u6B63\u5E38\u5B8C\u6210
 
 # 0: name
@@ -1307,13 +1284,10 @@ compiler.warn.has.been.deprecated={1}\u4E2D\u7684{0}\u5DF2\u8FC7\u65F6
 compiler.warn.has.been.deprecated.for.removal={1} \u4E2D\u7684 {0} \u5DF2\u8FC7\u65F6, \u4E14\u6807\u8BB0\u4E3A\u5F85\u5220\u9664
 
 # 0: symbol
-compiler.warn.is.preview={0} \u662F\u9884\u89C8 API\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
+compiler.warn.is.preview={0} \u662F\u67D0\u9884\u89C8\u529F\u80FD\u4E2D\u7684\u4E00\u4E2A API
 
 # 0: symbol
-compiler.err.is.preview={0} \u662F\u9884\u89C8 API\uFF0C\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5904\u4E8E\u7981\u7528\u72B6\u6001\u3002\n\uFF08\u8BF7\u4F7F\u7528 --enable-preview \u4EE5\u542F\u7528\u9884\u89C8 API\uFF09
-
-# 0: symbol
-compiler.warn.is.preview.reflective={0} \u662F\u53CD\u5C04\u9884\u89C8 API\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
+compiler.err.is.preview={0} \u662F\u67D0\u9884\u89C8\u529F\u80FD\u4E2D\u7684\u4E00\u4E2A API
 
 # 0: symbol
 compiler.warn.has.been.deprecated.module=\u6A21\u5757 {0} \u5DF2\u8FC7\u65F6
@@ -1329,11 +1303,6 @@ compiler.warn.illegal.char.for.encoding=\u7F16\u7801{0}\u7684\u4E0D\u53EF\u6620\
 # 0: symbol
 compiler.warn.improper.SVUID=\u5FC5\u987B\u5728\u7C7B{0}\u4E2D\u5C06 serialVersionUID \u58F0\u660E\u4E3A static final
 
-compiler.warn.improper.SPF=serialPersistentFields \u5FC5\u987B\u58F0\u660E\u4E3A private static final \u624D\u80FD\u751F\u6548
-
-compiler.warn.SPF.null.init=serialPersistentFields \u5982\u679C\u521D\u59CB\u5316\u4E3A\u7A7A\u503C\uFF0C\u5219\u65E0\u6548\u3002\n\u8BF7\u521D\u59CB\u5316\u4E3A\u7A7A\u6570\u7EC4\u4EE5\u6307\u793A\u6CA1\u6709\u5B57\u6BB5
-
-
 # 0: type, 1: type
 compiler.warn.inexact.non-varargs.call=\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u4F7F\u7528\u4E86\u4E0D\u51C6\u786E\u7684\u53D8\u91CF\u7C7B\u578B\u7684 varargs \u65B9\u6CD5\u7684\u975E varargs \u8C03\u7528; \n\u5BF9\u4E8E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {0}\n\u5BF9\u4E8E\u975E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {1}, \u8FD9\u6837\u4E5F\u53EF\u4EE5\u6291\u5236\u6B64\u8B66\u544A
 
@@ -1346,67 +1315,9 @@ compiler.warn.unreachable.catch.1=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u
 # 0: symbol
 compiler.warn.long.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F long \u7C7B\u578B
 
-compiler.warn.OSF.array.SPF=serialPersistentFields \u7684\u7C7B\u578B\u5FC5\u987B\u4E3A java.io.ObjectStreamField[] \u624D\u80FD\u751F\u6548
-
 # 0: symbol
 compiler.warn.missing.SVUID=\u53EF\u5E8F\u5217\u5316\u7C7B{0}\u6CA1\u6709 serialVersionUID \u7684\u5B9A\u4E49
 
-# 0: name
-compiler.warn.serializable.missing.access.no.arg.ctor=\u65E0\u6CD5\u8BBF\u95EE\u7B2C\u4E00\u4E2A\u4E0D\u53EF\u5E8F\u5217\u5316\u8D85\u7C7B {0} \u4E2D\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
-
-# 0: name
-compiler.warn.serial.method.not.private=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u672A\u58F0\u660E\u4E3A private
-
-# 0: name
-compiler.warn.serial.concrete.instance.method=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u662F\u5177\u4F53\u7684\u5B9E\u4F8B\u65B9\u6CD5\u624D\u80FD\u751F\u6548\uFF0C\u65E2\u4E0D\u80FD\u662F\u62BD\u8C61\u65B9\u6CD5\u4E5F\u4E0D\u80FD\u662F\u9759\u6001\u65B9\u6CD5
-
-# 0: name
-compiler.warn.serial.method.static=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u58F0\u660E\u4E3A static\uFF1B\u5FC5\u987B\u6539\u4E3A\u5B9E\u4F8B\u65B9\u6CD5\u624D\u80FD\u6709\u6548
-
-# 0: name
-compiler.warn.serial.method.no.args=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u6CA1\u6709\u53C2\u6570\u624D\u80FD\u751F\u6548
-
-# 0: name, 1: number
-compiler.warn.serial.method.one.arg=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u53EA\u6709\u4E00\u4E2A\u53C2\u6570\uFF08\u800C\u975E {1} \u4E2A\u53C2\u6570\uFF09\u624D\u80FD\u751F\u6548
-
-# 0: name, 1: type, 2: type
-compiler.warn.serial.method.parameter.type=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u7684\u552F\u4E00\u53C2\u6570\u7684\u7C7B\u578B\u5FC5\u987B\u4E3A {1}\uFF08\u800C\u975E {2}\uFF09\u624D\u80FD\u751F\u6548
-
-# 0: name, 1: type, 2: type
-compiler.warn.serial.method.unexpected.return.type=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u662F\u7528\u8FD4\u56DE\u7C7B\u578B {1}\uFF08\u800C\u4E0D\u662F\u9884\u671F\u7C7B\u578B {2}\uFF09\u58F0\u660E\u7684\u3002\n\u5982\u58F0\u660E\u7684\u90A3\u6837\uFF0C\u8BE5\u65B9\u6CD5\u5BF9\u5E8F\u5217\u5316\u65E0\u6548
-
-# 0: name, 1: type
-compiler.warn.serial.method.unexpected.exception=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u58F0\u660E\u4E3A\u629B\u51FA\u610F\u5916\u7C7B\u578B {1}
-
-compiler.warn.ineffectual.serial.field.interface=serialPersistentFields \u5728\u63A5\u53E3\u4E2D\u65E0\u6548
-
-# 0: string
-compiler.warn.ineffectual.serial.field.enum=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u5B57\u6BB5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
-
-# 0: string
-compiler.warn.ineffectual.serial.method.enum=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
-
-compiler.warn.ineffectual.serial.field.record=serialPersistentFields \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
-
-# 0: string
-compiler.warn.ineffectual.serial.method.record=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
-
-# 0: name
-compiler.warn.ineffectual.serial.method.externalizable=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u4E2D\u65E0\u6548
-
-compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields \u5728\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u4E2D\u65E0\u6548
-
-compiler.warn.externalizable.missing.public.no.arg.ctor=\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u9700\u8981\u4E00\u4E2A\u516C\u5171\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
-
-compiler.warn.non.serializable.instance.field=\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u975E\u77AC\u65F6\u5B9E\u4F8B\u5B57\u6BB5\u662F\u7528\u4E0D\u53EF\u5E8F\u5217\u5316\u7684\u7C7B\u578B\u58F0\u660E\u7684
-
-# 0: type
-compiler.warn.non.serializable.instance.field.array=\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u975E\u77AC\u65F6\u5B9E\u4F8B\u5B57\u6BB5\u662F\u7528\u5177\u6709\u4E0D\u53EF\u5E8F\u5217\u5316\u57FA\u672C\u7EC4\u4EF6\u7C7B\u578B {0} \u7684\u6570\u7EC4\u58F0\u660E\u7684
-
-compiler.warn.non.private.method.weaker.access=\u5728\u63A5\u53E3\u4E2D\u58F0\u660E\u4E3A non-private \u7684\u5E8F\u5217\u5316\u76F8\u5173\u65B9\u6CD5\u5C06\u963B\u6B62\n\u5B9E\u73B0\u63A5\u53E3\u7684\u7C7B\u5C06\u65B9\u6CD5\u58F0\u660E\u4E3A private
-
-compiler.warn.default.ineffective=\u5B9E\u73B0\u7C7B\u7684\u5E8F\u5217\u5316\u4E0D\u4F1A\u8FD0\u884C\u63A5\u53E3\u4E2D\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u9ED8\u8BA4\u65B9\u6CD5
-
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.warn.potentially.ambiguous.overload={1} \u4E2D\u7684 {0} \u53EF\u80FD\u4E0E {3} \u4E2D\u7684 {2} \u6DF7\u6DC6
 
@@ -1493,7 +1404,7 @@ compiler.warn.proc.suspicious.class.name=\u6B63\u5728\u4E3A\u540D\u79F0\u4EE5{1}
 compiler.warn.proc.file.create.last.round=\u5C06\u4E0D\u5BF9\u5728\u6700\u540E\u4E00\u4E2A\u5FAA\u73AF\u4E2D\u521B\u5EFA\u7684\u7C7B\u578B\u4E3A ''{0}'' \u7684\u6587\u4EF6\u8FDB\u884C\u6CE8\u91CA\u5904\u7406\u3002
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u4E3A\u652F\u6301\u7684\u6CE8\u91CA\u63A5\u53E3\u8FD4\u56DE\u683C\u5F0F\u9519\u8BEF\u7684\u5B57\u7B26\u4E32 ''{0}''
+compiler.warn.proc.malformed.supported.string=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u4E3A\u652F\u6301\u7684\u6CE8\u91CA\u7C7B\u578B\u8FD4\u56DE\u683C\u5F0F\u9519\u8BEF\u7684\u5B57\u7B26\u4E32 ''{0}''
 
 # 0: set of string
 compiler.warn.proc.annotations.without.processors=\u6CA1\u6709\u5904\u7406\u7A0B\u5E8F\u8981\u4F7F\u7528\u4EE5\u4E0B\u4EFB\u4F55\u6CE8\u91CA: {0}
@@ -1505,10 +1416,10 @@ compiler.warn.proc.processor.incompatible.source.version=\u6765\u81EA\u6CE8\u91C
 compiler.warn.proc.duplicate.option.name=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u652F\u6301\u7684\u9009\u9879 ''{0}''
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u53D7\u652F\u6301\u6CE8\u91CA\u63A5\u53E3 ''{0}''
+compiler.warn.proc.duplicate.supported.annotation=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u652F\u6301\u7684\u6CE8\u91CA\u7C7B\u578B ''{0}''
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' \u91CD\u590D\u652F\u6301 ''*'' \u548C\u5176\u4ED6\u6CE8\u91CA\u63A5\u53E3
+compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' \u91CD\u590D\u652F\u6301 ''*'' \u548C\u5176\u4ED6\u6CE8\u91CA\u7C7B\u578B
 
 compiler.warn.proc.proc-only.requested.no.procs=\u5728\u672A\u8BF7\u6C42\u7F16\u8BD1\u7684\u60C5\u51B5\u4E0B\u8FDB\u884C\u6CE8\u91CA\u5904\u7406, \u4F46\u627E\u4E0D\u5230\u5904\u7406\u7A0B\u5E8F\u3002
 
@@ -1564,8 +1475,6 @@ compiler.warn.deprecated.annotation.has.no.effect=@Deprecated \u6CE8\u91CA\u5BF9
 # 0: string
 compiler.warn.invalid.path=\u65E0\u6548\u6587\u4EF6\u540D: {0}
 
-compiler.warn.doclint.not.available=\u6CA1\u6709 doclint \u670D\u52A1\u63D0\u4F9B\u65B9\u53EF\u7528
-
 # 0: string
 compiler.err.invalid.path=\u65E0\u6548\u6587\u4EF6\u540D: {0}
 
@@ -1668,6 +1577,8 @@ compiler.err.enum.constant.expected=\u6B64\u5904\u9700\u8981\u679A\u4E3E\u5E38\u
 compiler.err.enum.constant.not.expected=\u6B64\u5904\u4E0D\u9700\u8981\u679A\u4E3E\u5E38\u91CF
 
 ## The following are related in form, but do not easily fit the above paradigm.
+compiler.err.expected.module=\u9700\u8981 ''module''
+
 compiler.err.expected.module.or.open=\u9700\u8981 ''module'' \u6216 ''open''
 
 compiler.err.dot.class.expected=\u9700\u8981 ''.class''
@@ -2192,10 +2103,6 @@ compiler.misc.feature.records=\u8BB0\u5F55
 
 compiler.misc.feature.sealed.classes=\u5BC6\u5C01\u7C7B
 
-compiler.misc.feature.case.null=switch case \u4E2D\u7684\u7A7A\u503C
-
-compiler.misc.feature.pattern.switch=switch \u8BED\u53E5\u4E2D\u7684\u6A21\u5F0F
-
 compiler.warn.underscore.as.identifier=\u4ECE\u53D1\u884C\u7248 9 \u5F00\u59CB, ''_'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
 
 compiler.err.underscore.as.identifier=\u4ECE\u53D1\u884C\u7248 9 \u5F00\u59CB, ''_'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
@@ -2267,28 +2174,6 @@ compiler.note.deferred.method.inst=\u65B9\u6CD5 {0} \u7684\u5EF6\u8FDF\u5B9E\u4F
 # 0: symbol
 compiler.note.verbose.l2m.deduplicate=\u6B63\u5728\u5BF9 lambda \u51FD\u6570\u5B9E\u73B0\u65B9\u6CD5 {0} \u8FDB\u884C\u91CD\u590D\u6570\u636E\u5220\u9664
 
-########################################
-# Diagnostics for method reference search
-# results used by Resolve (debug only)
-########################################
-
-# 0: fragment, 1: string, 2: number
-compiler.note.method.ref.search.results.multi={1} \u7684 {0} \u641C\u7D22\u7ED3\u679C\uFF0C\u6709 {2} \u4E2A\n\u6700\u660E\u786E\u7684\u9002\u7528\u5019\u9009\u9879\uFF1A
-
-# 0: number, 1: fragment, 2: symbol
-compiler.misc.applicable.method.found.2=\u627E\u5230\u7684\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5\uFF1A{1} {2}
-
-# 0: number, 1: fragment, 2: symbol, 3: message segment
-compiler.misc.applicable.method.found.3=\u627E\u5230\u7684\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5\uFF1A{1} {2}\n({3})
-
-compiler.misc.static=\u9759\u6001
-
-compiler.misc.non.static=\u975E\u9759\u6001
-
-compiler.misc.bound=\u7ED1\u5B9A
-
-compiler.misc.unbound=\u672A\u7ED1\u5B9A
-
 ########################################
 # Diagnostics for where clause implementation
 # used by the RichDiagnosticFormatter.
@@ -2375,7 +2260,7 @@ compiler.err.dc.no.tag.name='@' \u540E\u6CA1\u6709\u6807\u8BB0\u540D
 
 compiler.err.dc.gt.expected=\u9700\u8981 ''>''
 
-compiler.err.dc.ref.bad.parens=\u62EC\u53F7\u4E4B\u540E\u51FA\u73B0\u610F\u5916\u7684\u6587\u672C
+compiler.err.dc.ref.bad.parens=\u5F15\u7528\u4E2D\u7F3A\u5C11 '')''
 
 compiler.err.dc.ref.syntax.error=\u5F15\u7528\u4E2D\u51FA\u73B0\u8BED\u6CD5\u9519\u8BEF
 
@@ -2389,8 +2274,6 @@ compiler.err.dc.unterminated.signature=\u672A\u7EC8\u6B62\u7684\u7B7E\u540D
 
 compiler.err.dc.unterminated.string=\u672A\u7EC8\u6B62\u7684\u5B57\u7B26\u4E32
 
-compiler.err.dc.ref.annotations.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u6CE8\u91CA
-
 ###
 # errors related to modules
 
@@ -2567,6 +2450,8 @@ compiler.err.illegal.argument.for.option={0} \u7684\u53C2\u6570\u975E\u6CD5: {1}
 
 compiler.err.match.binding.exists=\u5C1D\u8BD5\u91CD\u65B0\u5B9A\u4E49\u73B0\u6709\u7684\u5339\u914D\u7ED1\u5B9A\uFF0C\u8FD9\u662F\u975E\u6CD5\u7684
 
+compiler.err.switch.null.not.allowed=case \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u7A7A\u6807\u7B7E
+
 compiler.err.switch.case.unexpected.statement=case \u4E2D\u5B58\u5728\u610F\u5916\u8BED\u53E5\uFF0C\u5E94\u4E3A\u8868\u8FBE\u5F0F\u3001\u5757\u6216\u629B\u51FA\u8BED\u53E5
 
 compiler.err.switch.mixing.case.types=\u5728 switch \u4E2D\u4F7F\u7528\u4E86\u4E0D\u540C case \u7C7B\u578B
@@ -2779,7 +2664,5 @@ compiler.err.preview.not.latest=\u6E90\u53D1\u884C\u7248 {0} \u4E0E --enable-pre
 
 compiler.err.preview.without.source.or.release=--enable-preview \u5FC5\u987B\u4E0E -source \u6216 --release \u4E00\u8D77\u4F7F\u7528
 
-# 0: kind name, 1: symbol
-compiler.warn.declared.using.preview={0} {1} \u662F\u4F7F\u7528\u9884\u89C8\u529F\u80FD\u58F0\u660E\u7684\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
-
 compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5C1D\u8BD5\u5728\u57FA\u4E8E\u503C\u7684\u7C7B\u7684\u5B9E\u4F8B\u4E0A\u540C\u6B65
+
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
deleted file mode 100644
index 85b76234891..00000000000
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
+++ /dev/null
@@ -1,228 +0,0 @@
-#
-# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-## standard options
-
-javac.opt.g=Generiert alle Debugginginformationen
-javac.opt.g.none=Generiert keine Debugginginformationen
-javac.opt.g.lines.vars.source=Generiert nur einige Debugginginformationen
-javac.opt.nowarn=Generiert keine Warnungen
-javac.opt.verbose=Gibt Nachrichten zu den Compilervorg\u00E4ngen aus
-javac.opt.deprecation=Gibt Quellspeicherorte aus, wo veraltete APIs verwendet werden
-javac.opt.classpath=Gibt an, wo sich die Benutzerklassendateien und Annotationsprozessoren befinden
-javac.opt.modulepath=Gibt an, wo sich die Anwendungsmodule befinden
-javac.opt.sourcepath=Gibt an, wo sich die Eingabequelldateien befinden
-javac.opt.m=Kompiliert nur die angegebenen Module und pr\u00FCft die Zeitstempel
-javac.opt.modulesourcepath=Gib an, wo sich die Eingabequelldateien f\u00FCr mehrere Module befinden
-javac.opt.bootclasspath=Setzt den Speicherort der Bootstrap-Klassendateien au\u00DFer Kraft
-javac.opt.system=Setzt den Speicherort der Systemmodule au\u00DFer Kraft
-javac.opt.upgrademodulepath=Setzt den Speicherort der upgradef\u00E4higen Module au\u00DFer Kraft
-javac.opt.endorseddirs=Setzt den Speicherort der unterst\u00FCtzten Standardpfade au\u00DFer Kraft
-javac.opt.extdirs=Setzt den Speicherort der installierten Erweiterungen au\u00DFer Kraft
-javac.opt.processorpath=Gibt an, wo sich die Annotationsprozessoren befinden
-javac.opt.processormodulepath=Gibt einen Modulpfad an, wo sich die Annotationsprozessoren befinden
-javac.opt.processor=Namen der auszuf\u00FChrenden Annotationsprozessoren; Standard-Discovery-Prozess wird umgangen
-javac.opt.parameters=Generiert Metadaten zur Reflexion auf Methodenparameter
-javac.opt.proc.none.only=Steuert, wo die Verarbeitung von Annotationen und/oder die Kompilierung ausgef\u00FChrt wird
-javac.opt.d=Gibt an, wo generierte Klassendateien abgelegt werden
-javac.opt.sourceDest=Gibt an, wo generierte Quelldateien abgelegt werden
-javac.opt.headerDest=Gibt an, wo generierte native Headerdateien abgelegt werden
-javac.opt.J=\u00DCbergibt <Flag> direkt an das Laufzeitsystem
-javac.opt.encoding=Gibt die von den Quelldateien verwendete Zeichencodierung an
-javac.opt.profile=Vergewissern Sie sich, dass die verwendete API im angegebenen Profil verf\u00FCgbar ist
-javac.opt.target=Generiert Klassendateien, die sich f\u00FCr das angegebene Java SE-Release eignen. Unterst\u00FCtzte Releases: {0}
-javac.opt.release=Kompiliert f\u00FCr das angegebene Java SE-Release. Unterst\u00FCtzte Releases: {0}
-javac.opt.source=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release von Java SE. Unterst\u00FCtzte Releases: {0}
-javac.opt.Werror=Kompilierung beenden, wenn Warnungen auftreten
-javac.opt.A=Optionen zur \u00DCbergabe an die Annotationsprozessoren
-javac.opt.implicit=Gibt an, ob Klassendateien f\u00FCr implizit referenzierte Dateien generiert werden oder nicht
-javac.opt.pkginfo=Gibt an, wie package-info-Dateien behandelt werden sollen
-javac.opt.multi-release=Gibt an, welches Release in Multi-Release-JAR-Dateien verwendet werden soll
-javac.opt.arg.class=<Klasse>
-javac.opt.arg.class.list=<Klasse1>[,<Klasse2>,<Klasse3>...]
-javac.opt.arg.flag=<Flag>
-javac.opt.arg.key.equals.value=key[=value]
-javac.opt.arg.path=<Pfad>
-javac.opt.arg.mspath=<Modulquellpfad>
-javac.opt.arg.m=<Modul>(,<Modul>)*
-javac.opt.arg.jdk=<JDK>|none
-javac.opt.arg.dirs=<Verzeichnisse>
-javac.opt.arg.directory=<Verzeichnis>
-javac.opt.arg.encoding=<Codierung>
-javac.opt.arg.profile=<Profil>
-javac.opt.arg.release=<Release>
-javac.opt.arg.release=<Release>
-javac.opt.arg.number=<Nummer>
-javac.opt.plugin=Der Name und optional die Argumente f\u00FCr die Ausf\u00FChrung eines Plug-ins
-javac.opt.arg.plugin="name args"
-javac.opt.arg.multi-release=<Release>
-javac.opt.arg.default.module.for.created.files=<Modulname>
-
-## extended options
-
-javac.opt.maxerrs=Legt die maximale Anzahl der zu auszugebenden Fehler fest
-javac.opt.maxwarns=Legt die maximale Anzahl der auszugebenden Warnungen fest
-javac.opt.nogj=Akzeptiert keine Generics in der Sprache
-javac.opt.moreinfo=Gibt erweiterte Informationen f\u00FCr Typvariablen aus
-javac.opt.printsearch=Gibt Informationen dazu aus, wo Klassendateien gesucht werden
-javac.opt.prompt=Stoppt nach jedem Fehler
-javac.opt.s=Gibt Java-Quellen statt Klassendateien aus
-javac.opt.version=Versionsinformationen
-javac.opt.arg.pathname=<Pfadname>
-javac.opt.arg.file=<Dateiname>
-javac.opt.Xbootclasspath.p=Dem Bootstrap Classpath voranstellen
-javac.opt.Xbootclasspath.a=An Bootstrap Classpath anh\u00E4ngen
-javac.opt.Xlint=Aktiviert die empfohlenen Warnungen
-javac.opt.Xlint.all=Alle Warnungen aktivieren
-javac.opt.Xlint.none=Alle Warnungen deaktivieren
-#L10N: do not localize: -Xlint
-javac.opt.arg.Xlint=<Schl\u00FCssel>(,<Schl\u00FCssel>)*
-javac.opt.Xlint.custom=Warnungen, die aktiviert oder deaktiviert werden sollen, durch Komma getrennt.\nStellen Sie einem Schl\u00FCssel "-" voran, um die angegebene Warnung zu deaktivieren.\nVerwenden Sie --help-lint, um die unterst\u00FCtzten Schl\u00FCssel zu sehen.
-javac.opt.Xlint.desc.auxiliaryclass=Warnt vor Auxiliary-Klassen, die in einer Quelldatei verborgen sind und aus anderen Dateien heraus verwendet werden.
-
-javac.opt.Xlint.desc.cast=Warnt vor unn\u00F6tigen Umwandlungen mit Cast.
-
-javac.opt.Xlint.desc.classfile=Warnt vor Problemen im Zusammenhang mit Klassendateiinhalten.
-
-javac.opt.Xlint.desc.missing-explicit-ctor=Warnt vor fehlenden expliziten Konstruktoren in \u00F6ffentlichen und gesch\u00FCtzten Klassen in exportierten Packages.
-
-javac.opt.Xlint.desc.deprecation=Warnt vor der Verwendung veralteter Elemente.
-
-javac.opt.Xlint.desc.dep-ann=Warnt vor Elementen, die in JavaDoc als veraltet markiert sind, jedoch nicht mit der Annotation @Deprecated versehen sind.
-
-javac.opt.Xlint.desc.divzero=Warnt vor Division durch Ganzzahlkonstante 0.
-
-javac.opt.Xlint.desc.empty=Warnt vor leerer Anweisung nach "if".
-
-javac.opt.Xlint.desc.exports=Warnt vor Problemen in Bezug auf Modulexporte.
-
-javac.opt.Xlint.desc.fallthrough=Warnt vor Weitergabe von einem Case einer Switch-Anweisung zum n\u00E4chsten.
-
-javac.opt.Xlint.desc.finally=Warnt vor Finally-Klauseln, die nicht normal beendet werden.
-
-javac.opt.Xlint.desc.module=Warnt vor Problemen im Zusammenhang mit dem Modulsystem.
-
-javac.opt.Xlint.desc.opens=Warnt vor Problemen in Bezug auf Modul\u00F6ffnungen.
-
-javac.opt.Xlint.desc.options=Warnt vor Problemen im Zusammenhang mit der Verwendung von Befehlszeilenoptionen.
-
-javac.opt.Xlint.desc.overloads=Warnt vor Problemen in Bezug auf Methoden\u00FCberladung.
-
-javac.opt.Xlint.desc.overrides=Warnt vor Problemen in Bezug auf Methodenau\u00DFerkraftsetzung.
-
-javac.opt.Xlint.desc.path=Warnt vor ung\u00FCltigen Pfadelementen in der Befehlszeile.
-
-javac.opt.Xlint.desc.processing=Warnt vor Problemen in Bezug auf die Annotationsverarbeitung.
-
-javac.opt.Xlint.desc.rawtypes=Warnt vor der Verwendung von Raw-Typen.
-
-javac.opt.Xlint.desc.removal=Warnt vor der Verwendung einer API, die zum Entfernen markiert wurde.
-
-javac.opt.Xlint.desc.requires-automatic=Warnt vor der Verwendung automatischer Module in den "Requires"-Klauseln.
-
-javac.opt.Xlint.desc.requires-transitive-automatic=Warnt vor automatischen Modulen in "requires transitive".
-
-javac.opt.Xlint.desc.serial=Warnt vor serialisierbaren Klassen, die kein serialVersionUID-Feld haben. \n                         Warnt auch vor anderen verd\u00E4chtigen Deklarationen in serialisierbaren und externalisierbaren Klassen und Schnittstellen.
-
-javac.opt.Xlint.desc.static=Warnt vor Zugriff auf ein statisches Mitglied mit einer Instanz.
-
-javac.opt.Xlint.desc.strictfp=Warnt vor unn\u00F6tiger Verwendung des strictfp-Modifizierers.
-
-javac.opt.Xlint.desc.text-blocks=Warnt vor inkonsistenten Leerzeichen in Textblockeinr\u00FCckung.
-
-javac.opt.Xlint.desc.try=Warnt vor Problemen im Zusammenhang mit try-Bl\u00F6cken (d.h. try-with-resources).
-
-javac.opt.Xlint.desc.unchecked=Warnt vor deaktivierten Vorg\u00E4ngen.
-
-javac.opt.Xlint.desc.varargs=Warnt vor m\u00F6glicherweise nicht sicheren vararg-Methoden.
-
-javac.opt.Xlint.desc.preview=Warnt vor Verwendung von Vorschausprachfeatures.
-
-javac.opt.Xlint.desc.synchronization=Warnt vor Synchronisierungsversuchen mit Instanzen wertbasierter Klassen.
-
-javac.opt.Xdoclint=Empfohlene Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren
-# L10N: do not localize: all none
-javac.opt.Xdoclint.subopts = (all|none|[-]<Gruppe>)[/<Zugriff>]
-
-# L10N: do not localize: accessibility html missing reference syntax
-# L10N: do not localize: public protected package private
-javac.opt.Xdoclint.custom=Aktiviert oder deaktiviert bestimmte Pr\u00FCfungen auf Probleme in javadoc-Kommentaren,\nwobei <Gruppe> f\u00FCr accessibility, html, missing, reference oder syntax\nund <Zugriff> f\u00FCr public, protected, package oder private steht.
-
-javac.opt.Xdoclint.package.args = [-]<Packages>(,[-]<Package>)*
-
-javac.opt.Xdoclint.package.desc=Aktiviert oder deaktiviert Pr\u00FCfungen in bestimmten Packages. Jedes <Package> ist entweder der\nqualifizierte Name eines Packages oder ein Namenspr\u00E4fix, gefolgt von ".*", und bezieht sich auf\nalle Subpackages des angegebenen Packages. Jedem Package kann <Package>\nvorangestellt werden, um Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.
-
-javac.opt.Xstdout=Leitet die Standardausgabe um
-javac.opt.X=Gibt Hilfe zu zus\u00E4tzlichen Optionen aus
-javac.opt.help=Gibt diese Hilfemeldung aus
-javac.opt.help.lint=Gibt die unterst\u00FCtzten Schl\u00FCssel f\u00FCr -Xlint aus
-javac.opt.help.lint.header=Die unterst\u00FCtzten Schl\u00FCssel f\u00FCr -Xlint sind:
-javac.opt.print=Gibt eine Textdarstellung der angegebenen Typen aus
-javac.opt.printRounds=Gibt Informationen zu Durchl\u00E4ufen der Annotationsverarbeitung aus
-javac.opt.printProcessorInfo=Gibt Informationen dazu aus, welche Annotationen ein Prozessor verarbeiten soll
-javac.opt.userpathsfirst=Durchsucht classpath und sourcepath vor anstatt nach bootclasspath nach Klassen
-javac.opt.prefer=Gibt an, welche Datei gelesen werden soll, wenn sowohl eine Quell- als auch eine Klassendatei f\u00FCr eine implizit kompilierte Klasse gefunden werden
-javac.opt.preview=Aktiviert Vorschausprachfeatures. Wird in Verbindung mit -source oder --release verwendet.
-javac.opt.AT=Liest Optionen und Dateinamen aus Datei
-javac.opt.diags=W\u00E4hlt einen Diagnosemodus aus
-javac.opt.addExports=Gibt an, dass ein Package als aus seinem definierenden Modul in weitere Module oder, wenn\n<Anderes Modul> ALL-UNNAMED lautet, in alle unbenannten Module exportiert betrachtet werden soll.
-javac.opt.arg.addExports=<Modul>/<Package>=<Anderes Modul>(,<Anderes Modul>)*
-javac.opt.addReads=Gibt weitere Module an, die als von einem gegebenen Modul angefordert betrachtet werden sollen.\n<Anderes Modul> kann ALL-UNNAMED lauten, um das unbenannte Modul anzufordern.
-javac.opt.arg.addReads=<Modul>=<Anderes Modul>(,<Anderes Modul>)*
-javac.opt.patch=Setzt ein Modul au\u00DFer Kraft oder erweitert es mit Klassen und Ressourcen\nin JAR-Dateien oder Verzeichnissen
-javac.opt.arg.patch=<Modul>=<Datei>(:<Datei>)*
-javac.opt.addmods=Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen Modulen aufgel\u00F6st werden sollen, oder alle Module\nim Modulpfad, wenn <Modul> ALL-MODULE-PATH lautet.
-javac.opt.arg.addmods=<Modul>(,<Modul>)*
-javac.opt.limitmods=Begrenzt die Gesamtzahl der beobachtbaren Module
-javac.opt.arg.limitmods=<Modul>(,<Modul>)*
-javac.opt.module.version=Gibt die Version der Module an, die kompiliert werden
-javac.opt.arg.module.version=<Version>
-javac.opt.inherit_runtime_environment=Vererbt Modulsystemkonfigurationsoptionen aus der Laufzeitumgebung.
-javac.opt.default.module.for.created.files=Fallback-Zielmodul f\u00FCr Dateien, die von Annotationsprozessoren erstellt werden, falls keines angegeben ist oder abgeleitet werden kann.
-
-## messages
-
-javac.msg.usage.header=Verwendung: {0} <Optionen> <Quelldateien>,\nwobei folgende Optionen m\u00F6glich sind:
-
-javac.msg.usage=Verwendung: {0} <Optionen> <Quelldateien>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
-
-javac.msg.usage.nonstandard.footer=Diese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.
-
-javac.msg.bug=Im Compiler ({0}) ist eine Ausnahme aufgetreten. Erstellen Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bugbericht, nachdem Sie die Bugdatenbank (http://bugs.java.com) auf Duplikate gepr\u00FCft haben. Geben Sie in Ihrem Bericht Ihr Programm, die folgende Diagnose und die Parameter an, die Sie dem Java-Compiler \u00FCbergeben haben. Vielen Dank.
-
-javac.msg.io=\n\nEin Eingabe-/Ausgabefehler ist aufgetreten.\nDetails finden Sie im folgenden Stacktrace.\n
-
-javac.msg.proc.annotation.uncaught.exception=\n\nEin Annotationsprozessor hat eine nicht abgefangene Ausnahme ausgel\u00F6st.\nDetails finden Sie im folgenden Stacktrace.\n
-
-javac.msg.plugin.uncaught.exception=\n\nEin Plug-in hat eine nicht abgefangene Ausnahme ausgel\u00F6st.\nDetails finden Sie im folgenden Stacktrace.\n
-
-javac.msg.resource=\n\nDas System hat keine Ressourcen mehr.\nDetails finden Sie im folgenden Stacktrace.\n
-
-javac.version={0} {1}
-javac.fullVersion={0} Vollversion "{1}"
-
-javac.msg.parameters.output=Ausgabe von javac-Parametern an: {0}
-
-javac.msg.parameters.output.error=Fehler beim Versuch, javac-Parameter auszugeben an: {0}. Die Parameter folgen:
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
index 0628340ea2b..231bbc69df8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
@@ -99,7 +99,7 @@ javac.opt.Xlint.all=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u6709\u52B9\u306B
 javac.opt.Xlint.none=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<key>(,<key>)*
-javac.opt.Xlint.custom=\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3059\u308B\u8B66\u544A(\u30AB\u30F3\u30DE\u533A\u5207\u308A)\u3002\n\u6307\u5B9A\u3057\u305F\u8B66\u544A\u3092\u7121\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u3092\u8868\u793A\u3059\u308B\u306B\u306F--help-lint\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+javac.opt.Xlint.custom=\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3059\u308B\u8B66\u544A(\u30AB\u30F3\u30DE\u533A\u5207\u308A)\u3002\n        \u6307\u5B9A\u3057\u305F\u8B66\u544A\u3092\u7121\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n        \u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
 javac.opt.Xlint.desc.auxiliaryclass=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u975E\u8868\u793A\u306B\u306A\u3063\u3066\u3044\u308B\u304C\u4ED6\u306E\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u88DC\u52A9\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.cast=\u4E0D\u8981\u306A\u30AD\u30E3\u30B9\u30C8\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
@@ -144,12 +144,10 @@ javac.opt.Xlint.desc.requires-automatic=requires\u53E5\u5185\u306E\u81EA\u52D5\u
 
 javac.opt.Xlint.desc.requires-transitive-automatic=requires transitive\u5185\u306E\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
-javac.opt.Xlint.desc.serial=serialVersionUID\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u306A\u3044\u76F4\u5217\u5316\u53EF\u80FD\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002 \n                         \u76F4\u5217\u5316\u53EF\u80FD\u304A\u3088\u3073\u5916\u90E8\u5316\u53EF\u80FD\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306E\u4ED6\u306E\u8981\u6CE8\u610F\u5BA3\u8A00\u306B\u3064\u3044\u3066\u3082\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.serial=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3ID\u3092\u6307\u5B9A\u3057\u306A\u3044\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002 \n                             \u307E\u305F\u3001\u76F4\u5217\u5316\u53EF\u80FD\u8981\u7D20\u304B\u3089public\u4EE5\u5916\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.static=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F7F\u7528\u3057\u305Fstatic\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
-javac.opt.Xlint.desc.strictfp=strictfp\u4FEE\u98FE\u5B50\u306E\u4E0D\u8981\u306A\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
-
 javac.opt.Xlint.desc.text-blocks=\u30C6\u30AD\u30B9\u30C8\u30FB\u30D6\u30ED\u30C3\u30AF\u30FB\u30A4\u30F3\u30C7\u30F3\u30C8\u5185\u306E\u4E00\u8CAB\u6027\u306E\u306A\u3044\u7A7A\u767D\u6587\u5B57\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.try=try\u30D6\u30ED\u30C3\u30AF(try-with-resources\u306A\u3069)\u306E\u4F7F\u7528\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
@@ -174,11 +172,11 @@ javac.opt.Xdoclint.package.args = [-]<packages>(,[-]<package>)*
 
 javac.opt.Xdoclint.package.desc=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\u5404<package>\u306F\u3001\n\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B''.*''\u3092\u6307\u5B9A\n(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u5404<package>\u306E\u524D\u306B\n'-'\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u6307\u5B9A\u3057\u305F1\u3064\u4EE5\u4E0A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002
 
+javac.opt.doclint.format=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306E\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u307E\u3059
+
 javac.opt.Xstdout=\u6A19\u6E96\u51FA\u529B\u3092\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3059\u308B
 javac.opt.X=\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u307E\u3059
 javac.opt.help=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
-javac.opt.help.lint=-Xlint\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u3092\u51FA\u529B\u3057\u307E\u3059
-javac.opt.help.lint.header=-Xlint\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
 javac.opt.print=\u6307\u5B9A\u3057\u305F\u578B\u306E\u30C6\u30AD\u30B9\u30C8\u8868\u793A\u3092\u51FA\u529B\u3059\u308B
 javac.opt.printRounds=\u6CE8\u91C8\u51E6\u7406\u306E\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
 javac.opt.printProcessorInfo=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
index 0fa374e3f65..3160e948639 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
@@ -99,7 +99,7 @@ javac.opt.Xlint.all=\u542F\u7528\u6240\u6709\u8B66\u544A
 javac.opt.Xlint.none=\u7981\u7528\u6240\u6709\u8B66\u544A
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<\u5BC6\u94A5>(,<\u5BC6\u94A5>)*
-javac.opt.Xlint.custom=\u8981\u542F\u7528\u6216\u7981\u7528\u7684\u8B66\u544A\uFF0C\u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n\u5728\u5173\u952E\u5B57\u524D\u9762\u52A0\u4E0A '-' \u53EF\u7981\u7528\u6307\u5B9A\u7684\u8B66\u544A\u3002\n\u4F7F\u7528 --help-lint \u53EF\u67E5\u770B\u53D7\u652F\u6301\u7684\u5173\u952E\u5B57\u3002
+javac.opt.Xlint.custom=\u8981\u542F\u7528\u6216\u7981\u7528\u7684\u8B66\u544A, \u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n        \u5728\u5173\u952E\u5B57\u524D\u9762\u52A0\u4E0A '-' \u53EF\u7981\u7528\u6307\u5B9A\u7684\u8B66\u544A\u3002\n        \u652F\u6301\u7684\u5173\u952E\u5B57\u5305\u62EC:
 javac.opt.Xlint.desc.auxiliaryclass=\u6709\u5173\u8F85\u52A9\u7C7B\u5728\u6E90\u6587\u4EF6\u4E2D\u9690\u85CF, \u4F46\u5728\u5176\u4ED6\u6587\u4EF6\u4E2D\u4F7F\u7528\u7684\u8B66\u544A\u3002
 
 javac.opt.Xlint.desc.cast=\u6709\u5173\u4F7F\u7528\u4E86\u4E0D\u5FC5\u8981\u8F6C\u6362\u7684\u8B66\u544A\u3002
@@ -144,12 +144,10 @@ javac.opt.Xlint.desc.requires-automatic=\u6709\u5173\u5728 requires \u5B50\u53E5
 
 javac.opt.Xlint.desc.requires-transitive-automatic=\u6709\u5173 requires \u8FC7\u6E21\u4E2D\u7684\u81EA\u52A8\u6A21\u5757\u7684\u8B66\u544A\u3002
 
-javac.opt.Xlint.desc.serial=\u6709\u5173\u6CA1\u6709 serialVersionUID \u5B57\u6BB5\u7684\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u8B66\u544A\u3002\n                         \u4EE5\u53CA\u6709\u5173\u53EF\u5E8F\u5217\u5316\u548C\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u548C\u63A5\u53E3\u4E2D\u5176\u4ED6\u53EF\u7591\u58F0\u660E\u7684\u8B66\u544A\u3002
+javac.opt.Xlint.desc.serial=\u6709\u5173\u672A\u63D0\u4F9B\u5E8F\u5217\u7248\u672C ID \u7684\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u8B66\u544A\u3002\n                             \u6B64\u5916\u8FD8\u8B66\u544A\u6709\u5173\u53EF\u4E32\u884C\u5316\u5143\u7D20\u5BF9\u975E\u516C\u5171\u6210\u5458\u7684\u8BBF\u95EE\u3002
 
 javac.opt.Xlint.desc.static=\u6709\u5173\u4F7F\u7528\u5B9E\u4F8B\u6765\u8BBF\u95EE\u9759\u6001\u6210\u5458\u7684\u8B66\u544A\u3002
 
-javac.opt.Xlint.desc.strictfp=\u6709\u5173\u4E0D\u5FC5\u8981\u5730\u4F7F\u7528\u4E86 strictfp \u4FEE\u9970\u7B26\u7684\u8B66\u544A\u3002
-
 javac.opt.Xlint.desc.text-blocks=\u6709\u5173\u6587\u672C\u5757\u7F29\u8FDB\u4E2D\u7684\u7A7A\u683C\u5B57\u7B26\u4E0D\u4E00\u81F4\u7684\u8B66\u544A\u3002
 
 javac.opt.Xlint.desc.try=\u6709\u5173\u4E0E\u4F7F\u7528 try \u5757 (\u4F8B\u5982 try-with-resources) \u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
@@ -174,11 +172,11 @@ javac.opt.Xdoclint.package.args = [-]<\u7A0B\u5E8F\u5305>(,[-]<\u7A0B\u5E8F\u530
 
 javac.opt.Xdoclint.package.desc=\u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002\u6BCF\u4E2A <\u7A0B\u5E8F\u5305> \u662F\n\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0, \u6216\u7A0B\u5E8F\u5305\u540D\u79F0\u524D\u7F00\u540E\u8DDF '.*', \n\u5B83\u6269\u5C55\u5230\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\u6240\u6709\u5B50\u7A0B\u5E8F\u5305\u3002\u5728\u6BCF\u4E2A <\u7A0B\u5E8F\u5305>\n\u524D\u9762\u52A0\u4E0A '-' \u53EF\u4EE5\u4E3A\u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002
 
+javac.opt.doclint.format=\u6307\u5B9A\u6587\u6863\u6CE8\u91CA\u7684\u683C\u5F0F
+
 javac.opt.Xstdout=\u91CD\u5B9A\u5411\u6807\u51C6\u8F93\u51FA
 javac.opt.X=\u8F93\u51FA\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
 javac.opt.help=\u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F
-javac.opt.help.lint=\u8F93\u51FA -Xlint \u652F\u6301\u7684\u5173\u952E\u5B57
-javac.opt.help.lint.header=-Xlint \u652F\u6301\u7684\u5173\u952E\u5B57\u5305\u62EC\uFF1A
 javac.opt.print=\u8F93\u51FA\u6307\u5B9A\u7C7B\u578B\u7684\u6587\u672C\u8868\u793A
 javac.opt.printRounds=\u8F93\u51FA\u6709\u5173\u6CE8\u91CA\u5904\u7406\u5FAA\u73AF\u7684\u4FE1\u606F
 javac.opt.printProcessorInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5904\u7406\u7A0B\u5E8F\u5904\u7406\u54EA\u4E9B\u6CE8\u91CA\u7684\u4FE1\u606F
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
deleted file mode 100644
index a5796a168df..00000000000
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
-# are preceded by a stylized comment describing the type of the corresponding
-# values.
-# The simple types currently in use are:
-#
-# annotation        annotation compound
-# boolean           true or false
-# diagnostic        a sub-message; see compiler.misc.*
-# fragment          similar to 'message segment', but with more specific type
-# modifier          a Java modifier; e.g. public, private, protected
-# file              a file URL
-# file object       a file URL - similar to 'file' but typically used for source/class files, hence more specific
-# flag              a Flags.Flag instance
-# name              a name, typically a Java identifier
-# number            an integer
-# option name       the name of a command line option
-# source version    a source version number, such as 1.5, 1.6, 1.7
-# string            a general string
-# symbol            the name of a declared type
-# symbol kind       the kind of a symbol (i.e. method, variable)
-# kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
-# token             the name of a non-terminal in source code; see compiler.misc.token.*
-# type              a Java type; e.g. int, X, X<T>
-# object            a Java object (unspecified)
-# unused            the value is not used in this message
-#
-# The following compound types are also used:
-#
-# collection of X   a comma-separated collection of items; e.g. collection of type
-# list of X         a comma-separated list of items; e.g. list of type
-# set of X          a comma-separated set of items; e.g. set of modifier
-#
-# These may be composed:
-#
-# list of type or message segment
-#
-# The following type aliases are supported:
-#
-# message segment --> diagnostic or fragment
-# file name --> file, path or file object
-#
-# Custom comments are supported in parenthesis i.e.
-#
-# number (classfile major version)
-#
-# These comments are used internally in order to generate an enum-like class declaration containing
-# a method/field for each of the diagnostic keys listed here. Those methods/fields can then be used
-# by javac code to build diagnostics in a type-safe fashion.
-#
-# In addition, these comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
-# using info derived from the collected set of examples in test/tools/javac/diags/examples.
-# MessageInfo can also be run as a standalone utility providing more facilities
-# for manipulating this file. For more details, see MessageInfo.java.
-
-## All errors are preceded by this string.
-launcher.error=Fehler: 
-
-launcher.err.no.args=kein Pfad f\u00FCr Quelldatei
-
-# 0: string
-launcher.err.invalid.filename=ung\u00FCltiger Pfad f\u00FCr Quelldatei: {0}
-
-# 0: path
-launcher.err.file.not.found=Quelldatei nicht gefunden: {0}
-
-launcher.err.compilation.failed=Kompilierung nicht erfolgreich
-
-launcher.err.no.class=keine Klasse deklariert in Quelldatei
-
-launcher.err.main.not.public.static=Methode "main" ist nicht als "public static" deklariert
-
-launcher.err.main.not.void=Methode "main" ist nicht mit R\u00FCckgabetyp "void" deklariert
-
-# 0: string
-launcher.err.cant.find.class=Klasse nicht gefunden: {0}
-
-# 0: string
-launcher.err.cant.find.main.method=Methode "main(String[])" nicht gefunden in Klasse: {0}
-
-# 0: string
-launcher.err.cant.access.main.method=kein Zugriff auf Methode "main" in Klasse: {0}
-
-# 0: path, 1: object
-launcher.err.cant.read.file=Fehler beim Lesen von Quelldatei {0}: {1}
-
-# 0: string
-launcher.err.no.value.for.option=kein Wert angegeben f\u00FCr Option: {0}
-
-# 0: string
-launcher.err.invalid.value.for.source=ung\u00FCltiger Wert f\u00FCr Option --source: {0}
-
-launcher.err.enable.preview.requires.source=--enable-preview muss mit --source verwendet werden
diff --git a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
deleted file mode 100644
index fac9b7e1e2e..00000000000
--- a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2010, 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.
-#
-
-NotSerializable=Klasse {0} ist nicht serialisierbar.
-ClassNotFound=Klasse {0} nicht gefunden.
-error.parsing.classpath=Fehler beim Parsen von Classpath {0}.
-error.missing.classpath=Fehlendes Argument bei Option -classpath
-invalid.flag=Ung\u00FCltiges Flag {0}.
-usage=Verwendung: serialver [-classpath classpath] [classname...]
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
deleted file mode 100644
index e72f5370369..00000000000
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-usage.java=Verwendung: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]\n                              [-o none|info|verbose] [-h zum Anzeigen von Optionen]\n                              [-version zum Anzeigen der Versionsinformationen]
-
-usage.jwebserver=Verwendung: jwebserver [-b bind address] [-p port] [-d directory]\n                  [-o none|info|verbose] [-h zum Anzeigen von Optionen]\n                  [-version zum Anzeigen von Versionsinformationen]
-
-version={0} {1}
-
-options=Optionen:\n-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".\n-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.\n-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.\n-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.\n-h, -?, --help        - Gibt diese Hilfemeldung aus und beendet.\n-version, --version   - Gibt Versionsinformationen aus und beendet.\nDr\u00FCcken Sie zum Stoppen des Servers Strg+C.
-
-opt.bindaddress=-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
-opt.directory=-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.
-opt.output=-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.
-opt.port=-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.
-
-loopback.info=Binding an Loopback als Standard. Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
-
-msg.start.anylocal=Bedient {0} und Unterverzeichnisse auf 0.0.0.0 (alle Schnittstellen) Port {2}\nURL http://{1}:{2}/
-
-msg.start.other=Bedient {0} und Unterverzeichnisse auf {1} Port {2}\nURL http://{1}:{2}/
-
-error.prefix=Fehler:
-
-err.unknown.option=unbekannte Option: {0}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
-err.invalid.arg=ung\u00FCltiger Wert angegeben f\u00FCr {0}: {1}
-err.server.config.failed=Serverkonfiguration nicht erfolgreich: {0}
-err.server.handle.failed=Handling des Serveraustauschs nicht erfolgreich: {0}
-
-html.dir.list=Verzeichnisliste f\u00FCr
-html.not.found=Datei wurde nicht gefunden
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
deleted file mode 100644
index 974707493a5..00000000000
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-usage.java=\u4F7F\u7528\u65B9\u6CD5: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]\n                              [-o none|info|verbose] [-h to show options]\n                              [-version to show version information]
-
-usage.jwebserver=\u4F7F\u7528\u65B9\u6CD5: jwebserver [-b bind address] [-p port] [-d directory]\n                  [-o none|info|verbose] [-h to show options]\n                  [-version to show version information]
-
-version={0} {1}
-
-options=\u30AA\u30D7\u30B7\u30E7\u30F3:\n-b, --bind-address    - \u30D0\u30A4\u30F3\u30C9\u5148\u30A2\u30C9\u30EC\u30B9\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: {0} (\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF)\u3002\n                        \u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n-d, --directory       - \u4F7F\u7528\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: \u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\n-o, --output          - \u51FA\u529B\u5F62\u5F0F\u3002none|info|verbose\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: info\u3002\n-p, --port            - \u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: 8000\u3002\n-h, -?, --help        - \u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n-version, --version   - \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n\u30B5\u30FC\u30D0\u30FC\u3092\u505C\u6B62\u3059\u308B\u306B\u306F\u3001[Ctrl]+[C]\u3092\u62BC\u3057\u307E\u3059\u3002
-
-opt.bindaddress=-b, --bind-address    - \u30D0\u30A4\u30F3\u30C9\u5148\u30A2\u30C9\u30EC\u30B9\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: {0} (\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF).\n                        \u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
-opt.directory=-d, --directory       - \u4F7F\u7528\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: \u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002
-opt.output=-o, --output          - \u51FA\u529B\u5F62\u5F0F\u3002none|info|verbose. \u30C7\u30D5\u30A9\u30EB\u30C8: info\u3002
-opt.port=-p, --port            - \u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: 8000\u3002
-
-loopback.info=\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF\u306B\u30D0\u30A4\u30F3\u30C9\u3057\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
-
-msg.start.anylocal={0}\u304A\u3088\u3073\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30920.0.0.0 (\u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9)\u30DD\u30FC\u30C8{2}\u3067\u4F7F\u7528\u3057\u307E\u3059\nURL http://{1}:{2}/
-
-msg.start.other={0}\u304A\u3088\u3073\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092{1}\u30DD\u30FC\u30C8{2}\u3067\u4F7F\u7528\u3057\u307E\u3059\nURL http://{1}:{2}/
-
-error.prefix=\u30A8\u30E9\u30FC:
-
-err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-err.invalid.arg={0}\u306B\u7121\u52B9\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F: {1}
-err.server.config.failed=\u30B5\u30FC\u30D0\u30FC\u306E\u69CB\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
-err.server.handle.failed=\u30B5\u30FC\u30D0\u30FC\u4EA4\u63DB\u51E6\u7406\u304C\u5931\u6557\u3057\u307E\u3057\u305F: {0}
-
-html.dir.list=\u6B21\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30EA\u30B9\u30C8
-html.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
deleted file mode 100644
index 1d35a7ecd1b..00000000000
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-usage.java=\u7528\u6CD5\uFF1Ajava -m jdk.httpserver [-b \u7ED1\u5B9A\u5730\u5740] [-p \u7AEF\u53E3] [-d \u76EE\u5F55]\n                              [-o none|info|verbose] [-h \u663E\u793A\u9009\u9879]\n                              [-version \u663E\u793A\u7248\u672C\u4FE1\u606F]
-
-usage.jwebserver=\u7528\u6CD5\uFF1Ajwebserver [-b \u7ED1\u5B9A\u5730\u5740] [-p \u7AEF\u53E3] [-d \u76EE\u5F55]\n                              [-o none|info|verbose] [-h \u663E\u793A\u9009\u9879]\n                              [-version \u663E\u793A\u7248\u672C\u4FE1\u606F]
-
-version={0} {1}
-
-options=\u9009\u9879\uFF1A\n-b, --bind-address    - \u8981\u7ED1\u5B9A\u5230\u7684\u5730\u5740\u3002\u9ED8\u8BA4\u503C\uFF1A{0}\uFF08\u73AF\u56DE\uFF09\u3002\n                        \u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002\n-d, --directory       - \u8981\u4E3A\u5176\u63D0\u4F9B\u670D\u52A1\u7684\u76EE\u5F55\u3002\u9ED8\u8BA4\u503C\uFF1A\u5F53\u524D\u76EE\u5F55\u3002\n-o, --output          - \u8F93\u51FA\u683C\u5F0F\u3002none|info|verbose\u3002\u9ED8\u8BA4\u503C\uFF1Ainfo\u3002\n-p, --port            - \u8981\u76D1\u542C\u7684\u7AEF\u53E3\u3002\u9ED8\u8BA4\u503C\uFF1A8000\u3002\n-h, -?, --help        - \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F\u5E76\u9000\u51FA\u3002\n-version, --version   - \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\u3002\n\u8981\u505C\u6B62\u670D\u52A1\u5668\uFF0C\u8BF7\u6309 Ctrl + C\u3002
-
-opt.bindaddress=-b, --bind-address    - \u8981\u7ED1\u5B9A\u5230\u7684\u5730\u5740\u3002\u9ED8\u8BA4\u503C\uFF1A{0}\uFF08\u73AF\u56DE\uFF09\u3002\n                        \u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002
-opt.directory=-d, --directory       - \u8981\u4E3A\u5176\u63D0\u4F9B\u670D\u52A1\u7684\u76EE\u5F55\u3002\u9ED8\u8BA4\u503C\uFF1A\u5F53\u524D\u76EE\u5F55\u3002
-opt.output=-o, --output          - \u8F93\u51FA\u683C\u5F0F\u3002none|info|verbose\u3002\u9ED8\u8BA4\u503C\uFF1Ainfo\u3002
-opt.port=-p, --port            - \u8981\u76D1\u542C\u7684\u7AEF\u53E3\u3002\u9ED8\u8BA4\u503C\uFF1A8000\u3002
-
-loopback.info=\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u7ED1\u5B9A\u5230\u73AF\u56DE\u3002\u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002
-
-msg.start.anylocal=\u4E3A 0.0.0.0\uFF08\u6240\u6709\u63A5\u53E3\uFF09\u7AEF\u53E3 {2} \u4E0A\u7684 {0} \u53CA\u5B50\u76EE\u5F55\u63D0\u4F9B\u670D\u52A1\nURL http://{1}:{2}/
-
-msg.start.other=\u4E3A {1} \u7AEF\u53E3 {2} \u4E0A\u7684 {0} \u53CA\u5B50\u76EE\u5F55\u63D0\u4F9B\u670D\u52A1\nURL http://{1}:{2}/
-
-error.prefix=\u9519\u8BEF:
-
-err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
-err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
-err.invalid.arg=\u4E3A {0} \u63D0\u4F9B\u7684\u503C\u65E0\u6548\uFF1A{1}
-err.server.config.failed=\u670D\u52A1\u5668\u914D\u7F6E\u5931\u8D25\uFF1A{0}
-err.server.handle.failed=\u670D\u52A1\u5668\u4EA4\u6362\u5904\u7406\u5931\u8D25\uFF1A{0}
-
-html.dir.list=\u4EE5\u4E0B\u9879\u7684\u76EE\u5F55\u5217\u8868
-html.not.found=\u627E\u4E0D\u5230\u6587\u4EF6
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
deleted file mode 100644
index b66ce1a4dee..00000000000
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.tools.jarsigner;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for JarSigner.
- *
- */
-public class Resources_de extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // shared (from jarsigner)
-        {"SPACE", " "},
-        {"6SPACE", "      "},
-        {"COMMA", ", "},
-
-        {"provclass.not.a.provider", "%s kein Provider"},
-        {"provider.name.not.found", "Provider namens \"%s\" nicht gefunden"},
-        {"provider.class.not.found", "Provider \"%s\" nicht gefunden"},
-        {"jarsigner.error.", "jarsigner-Fehler: "},
-        {"Illegal.option.", "Unzul\u00E4ssige Option: "},
-        {"This.option.is.forremoval", "Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt: "},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore muss NONE sein, wenn -storetype {0} ist"},
-        {".keypass.can.not.be.specified.if.storetype.is.{0}",
-                "-keypass kann nicht angegeben werden, wenn -storetype \"{0}\" ist"},
-        {"If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified",
-                "Wenn -protected angegeben ist, d\u00FCrfen -storepass und -keypass nicht angegeben werden"},
-        {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
-                 "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass und -keypass nicht angegeben werden"},
-        {"Usage.jarsigner.options.jar.file.alias",
-                "Verwendung: jarsigner [options] jar-file alias"},
-        {".jarsigner.verify.options.jar.file.alias.",
-                "       jarsigner -verify [options] jar-file [alias...]"},
-        {".jarsigner.version",
-                "       jarsigner -version"},
-        {".keystore.url.keystore.location",
-                "[-keystore <URL>]           Keystore-Speicherort"},
-        {".storepass.password.password.for.keystore.integrity",
-            "[-storepass <Kennwort>]     Kennwort f\u00FCr Keystore-Integrit\u00E4t"},
-        {".storetype.type.keystore.type",
-                "[-storetype <Typ>]         Keystore-Typ"},
-        {".keypass.password.password.for.private.key.if.different.",
-                "[-keypass <Kennwort>]       Kennwort f\u00FCr Private Key (falls unterschiedlich)"},
-        {".certchain.file.name.of.alternative.certchain.file",
-                "[-certchain <Datei>]         Name der alternativen certchain-Datei"},
-        {".sigfile.file.name.of.SF.DSA.file",
-                "[-sigfile <Datei>]           Name der SF/DSA-Datei"},
-        {".signedjar.file.name.of.signed.JAR.file",
-                "[-signedjar <Datei>]         Name der signierten JAR-Datei"},
-        {".digestalg.algorithm.name.of.digest.algorithm",
-                "[-digestalg <Algorithmus>]    Name des Digestalgorithmus"},
-        {".sigalg.algorithm.name.of.signature.algorithm",
-                "[-sigalg <Algorithmus>]       Name des Signaturalgorithmus"},
-        {".verify.verify.a.signed.JAR.file",
-                "[-verify]                   Verifiziert eine signierte JAR-Datei"},
-        {".version.print.the.program.version",
-                "[-version]                  Gibt die Programmversion aus"},
-        {".verbose.suboptions.verbose.output.when.signing.verifying.",
-                "[-verbose[:suboptions]]     Verbose-Ausgabe beim Signieren/Verifizieren."},
-        {".suboptions.can.be.all.grouped.or.summary",
-                "                            Als Unteroptionen sind \"all\", \"grouped\" und \"summary\" m\u00F6glich"},
-        {".certs.display.certificates.when.verbose.and.verifying",
-                "[-certs]                    Zeigt Zertifikate bei Verbose und Verifizierung an"},
-        {".certs.revocation.check",
-                "[-revCheck]                 Aktiviert die Zertifikatswiderrufpr\u00FCfung"},
-        {".tsa.url.location.of.the.Timestamping.Authority",
-                "[-tsa <URL>]                Ort der Zeitstempelautorit\u00E4t"},
-        {".tsacert.alias.public.key.certificate.for.Timestamping.Authority",
-                "[-tsacert <Alias>]          Public-Key-Zertifikat f\u00FCr Zeitstempelautorit\u00E4t"},
-        {".tsapolicyid.tsapolicyid.for.Timestamping.Authority",
-                "[-tsapolicyid <OID>]        TSAPolicyID f\u00FCr Zeitstempelautorit\u00E4t"},
-        {".tsadigestalg.algorithm.of.digest.data.in.timestamping.request",
-                "[-tsadigestalg <Algorithmus>] Algorithmus der Digestdaten in Zeitstempelanforderung"},
-        {".altsigner.class.class.name.of.an.alternative.signing.mechanism",
-                "[-altsigner <Klasse>]        Klassenname eines alternativen Signiermechanismus\n                            (Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt.)"},
-        {".altsignerpath.pathlist.location.of.an.alternative.signing.mechanism",
-                "[-altsignerpath <Pfadliste>] Speicherort eines alternativen Signiermechanismus\n                            (Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt.)"},
-        {".internalsf.include.the.SF.file.inside.the.signature.block",
-                "[-internalsf]               SF-Datei in Signaturblock aufnehmen"},
-        {".sectionsonly.don.t.compute.hash.of.entire.manifest",
-                "[-sectionsonly]             Berechnet nicht den Hash des gesamten Manifests"},
-        {".protected.keystore.has.protected.authentication.path",
-                "[-protected]                Keystore hat gesch\u00FCtzten Authentifizierungspfad"},
-        {".providerName.name.provider.name",
-                "[-providerName <Name>]      Providername"},
-        {".add.provider.option",
-                "[-addprovider <Name>        F\u00FCgt einen Sicherheitsprovider nach Name hinzu (z.B. SunPKCS11)"},
-        {".providerArg.option.1",
-                "  [-providerArg <Argument>]] ... Konfiguriert Argument f\u00FCr -addprovider"},
-        {".providerClass.option",
-                "[-providerClass <Klasse>     F\u00FCgt einen Sicherheitsprovider nach vollqualifiziertem Klassennamen hinzu"},
-        {".providerArg.option.2",
-                "  [-providerArg <Argument>]] ... Konfiguriert Argument f\u00FCr -providerClass"},
-        {".strict.treat.warnings.as.errors",
-                "[-strict]                   Behandelt Warnungen als Fehler"},
-        {".conf.url.specify.a.pre.configured.options.file",
-                "[-conf <URL>]               Vorkonfigurierte Optionsdatei angeben"},
-        {".print.this.help.message",
-                "[-? -h --help]              Gibt diese Hilfemeldung aus"},
-        {"Option.lacks.argument", "Argument fehlt in Option"},
-        {"Please.type.jarsigner.help.for.usage", "Geben Sie jarsigner --help ein, um Verwendungsinformationen anzuzeigen"},
-        {"Please.specify.jarfile.name", "Geben Sie den Namen der JAR-Datei an"},
-        {"Please.specify.alias.name", "Geben Sie einen Aliasnamen an"},
-        {"Only.one.alias.can.be.specified", "Nur ein Alias kann angegeben werden"},
-        {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
-                 "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge, die nicht von den angegebenen Aliasnamen signiert wurden."},
-        {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
-                  "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge, die nicht vom Alias in diesem Keystore signiert wurden."},
-        {"s", "s"},
-        {"m", "m"},
-        {"k", "k"},
-        {"X", "X"},
-        {"q", "?"},
-        {".and.d.more.", "(und %d mehr)"},
-        {".s.signature.was.verified.",
-                "  s = Signatur wurde verifiziert "},
-        {".m.entry.is.listed.in.manifest",
-                "  m = Eintrag ist in Manifest aufgef\u00FChrt"},
-        {".k.at.least.one.certificate.was.found.in.keystore",
-                "  k = Mindestens ein Zertifikat im Keystore gefunden"},
-        {".X.not.signed.by.specified.alias.es.",
-                "  X = Nicht von den angegebenen Aliasnamen signiert"},
-        {".q.unsigned.entry",
-                "  ? = Nicht signierter Eintrag"},
-        {"no.manifest.", "Kein Manifest."},
-        {".Signature.related.entries.","(Signaturbezogene Eintr\u00E4ge)"},
-        {".Unsigned.entries.", "(Nicht signierte Eintr\u00E4ge)"},
-        {".Directory.entries.", "(Verzeichniseintr\u00E4ge)"},
-        {"jar.is.unsigned",
-                "JAR-Datei ist nicht signiert."},
-        {"jar.treated.unsigned",
-                "Warnung: Signatur kann entweder nicht geparst oder nicht verifiziert werden. Die JAR-Datei wird als nicht signiert behandelt. Weitere Informationen erhalten Sie, indem Sie \"jarsigner\" mit aktiviertem Debugging erneut ausf\u00FChren (-J-Djava.security.debug=jar)."},
-        {"jar.treated.unsigned.see.weak",
-                "Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der jetzt deaktiviert ist.\n\nF\u00FChren Sie \"jarsigner\" mit der Option \"-verbose\" erneut aus, um weitere Einzelheiten zu erhalten."},
-        {"jar.treated.unsigned.see.weak.verbose",
-                "Warnung: Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der mittlerweile von der folgenden Sicherheitseigenschaft deaktiviert wurde:"},
-        {"jar.signed.", "JAR-Datei signiert."},
-        {"jar.signed.with.signer.errors.", "JAR-Datei signiert, mit Signaturgeberfehlern."},
-        {"jar.verified.", "JAR-Datei verifiziert."},
-        {"jar.verified.with.signer.errors.", "JAR-Datei verifiziert, mit Signaturgeberfehlern."},
-
-        {"history.with.ts", "- Von \"%1$s\" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s\n  Zeitstempel von \"%6$s\" am %5$tc\n    Digestalgorithmus f\u00FCr Zeitstempel: %7$s\n    Signaturalgorithmus f\u00FCr Zeitstempel: %8$s, %9$s"},
-        {"history.without.ts", "- Von \"%1$s\" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s"},
-        {"history.unparsable", "- Signaturbezogene Datei %s kann nicht geparst werden"},
-        {"history.nosf", "- Signaturbezogene Datei META-INF/%s.SF fehlt"},
-        {"history.nobk", "- Blockdatei f\u00FCr signaturbezogene Datei META-INF/%s.SF fehlt"},
-
-        {"with.weak", "%s (schwach)"},
-        {"with.disabled", "%s (deaktiviert)"},
-        {"key.bit", "%d-Bit-Schl\u00FCssel"},
-        {"key.bit.weak", "%d-Bit-Schl\u00FCssel (schwach)"},
-        {"key.bit.disabled", "%d-Bit-Schl\u00FCssel (deaktiviert)"},
-        {"unknown.size", "unbekannte Gr\u00F6\u00DFe"},
-        {"extra.attributes.detected", "POSIX-Dateiberechtigung und/oder Symlink-Attribute erkannt. Diese Attribute werden bei der Signatur ignoriert und sind nicht durch die Signatur gesch\u00FCtzt."},
-
-        {"jarsigner.", "jarsigner: "},
-        {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
-                "Signaturdateiname muss aus den folgenden Zeichen bestehen: A-Z, 0-9, _ oder -"},
-        {"unable.to.open.jar.file.", "JAR-Datei kann nicht ge\u00F6ffnet werden: "},
-        {"unable.to.create.", "Erstellen nicht m\u00F6glich: "},
-        {".adding.", "   Wird hinzugef\u00FCgt: "},
-        {".updating.", " Wird aktualisiert: "},
-        {".signing.", "  Wird signiert: "},
-        {"attempt.to.rename.signedJarFile.to.jarFile.failed",
-                "Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich"},
-        {"attempt.to.rename.jarFile.to.origJar.failed",
-                "Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich"},
-        {"unable.to.sign.jar.", "JAR-Datei kann nicht signiert werden: "},
-        {"Enter.Passphrase.for.keystore.", "Passphrase f\u00FCr Keystore eingeben: "},
-        {"keystore.load.", "Keystore-Ladevorgang: "},
-        {"certificate.exception.", "Zertifikatsausnahme: "},
-        {"unable.to.instantiate.keystore.class.",
-                "Keystore-Klasse kann nicht instanziiert werden: "},
-        {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
-                "Zertifikatskette nicht gefunden f\u00FCr: {0}. {1} muss einen g\u00FCltigen Keystore-Schl\u00FCssel referenzieren, der einen Private Key und eine zugeh\u00F6rige Public-Key-Zertifikatskette enth\u00E4lt."},
-        {"File.specified.by.certchain.does.not.exist",
-                "Von -certchain angegebene Datei ist nicht vorhanden"},
-        {"Cannot.restore.certchain.from.file.specified",
-                "Zertifikatskette kann nicht aus angegebener Datei wiederhergestellt werden"},
-        {"Certificate.chain.not.found.in.the.file.specified.",
-                "Zertifikatskette nicht in der angegebenen Datei gefunden."},
-        {"found.non.X.509.certificate.in.signer.s.chain",
-                "Nicht-X.509-Zertifikat in Kette des Signaturgebers gefunden"},
-        {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr {0} eingeben: "},
-        {"unable.to.recover.key.from.keystore",
-                "Schl\u00FCssel kann nicht aus Keystore wiederhergestellt werden"},
-        {"key.associated.with.alias.not.a.private.key",
-                "Mit {0} verkn\u00FCpfter Schl\u00FCssel ist kein Private Key"},
-        {"you.must.enter.key.password", "Sie m\u00FCssen ein Schl\u00FCsselkennwort eingeben"},
-        {"unable.to.read.password.", "Kennwort kann nicht gelesen werden: "},
-        {"certificate.is.valid.from", "Zertifikat ist von {0} bis {1} g\u00FCltig"},
-        {"certificate.expired.on", "Zertifikat ist am {0} abgelaufen"},
-        {"certificate.is.not.valid.until",
-                "Zertifikat ist erst ab {0} g\u00FCltig"},
-        {"certificate.will.expire.on", "Zertifikat l\u00E4uft am {0} ab"},
-        {".Invalid.certificate.chain.", "[Ung\u00FCltige Zertifikatskette: "},
-        {".Invalid.TSA.certificate.chain.", "[Ung\u00FCltige TSA-Zertifikatskette: "},
-        {"requesting.a.signature.timestamp",
-                "Signaturzeitstempel wird angefordert"},
-        {"TSA.location.", "TSA-Ort: "},
-        {"TSA.certificate.", "TSA-Zertifikat: "},
-        {"no.response.from.the.Timestamping.Authority.",
-                "Keine Antwort von der Zeitstempelautorit\u00E4t. Bei Verbindungen hinter einer Firewall muss m\u00F6glicherweise ein HTTP- oder HTTPS-Proxy angegeben werden. Geben Sie die folgenden Optionen f\u00FCr \"jarsigner\" an:"},
-        {"or", "oder"},
-        {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
-                "Zertifikat nicht gefunden f\u00FCr: {0}. {1} muss einen g\u00FCltigen Keystore-Eintrag referenzieren, der ein X.509-Public-Key-Zertifikat f\u00FCr die Zeitstempelautorit\u00E4t enth\u00E4lt."},
-        {"using.an.alternative.signing.mechanism",
-                "Verwendung eines alternativen Signaturmechanismus"},
-        {"entry.was.signed.on", "Eintrag wurde signiert am {0}"},
-        {"Warning.", "Warnung: "},
-        {"Error.", "Fehler: "},
-        {"...Signer", ">>> Signaturgeber"},
-        {"...TSA", ">>> TSA"},
-        {"trusted.certificate", "vertrauensw\u00FCrdiges Zertifikat"},
-        {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
-                "Diese JAR-Datei enth\u00E4lt nicht signierte Eintr\u00E4ge, deren Integrit\u00E4t nicht gepr\u00FCft wurde. "},
-        {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat abgelaufen ist."},
-        {"This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat innerhalb der n\u00E4chsten sechs Monate abl\u00E4uft. "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat noch nicht g\u00FCltig ist. "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.self.signed.",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat selbstsigniert ist."},
-        {"Re.run.with.the.verbose.and.certs.options.for.more.details.",
-                "F\u00FChren Sie den Befehl erneut mit den Optionen -verbose und -certs aus, um weitere Details zu erhalten."},
-        {"The.signer.certificate.has.expired.",
-                "Das Signaturgeberzertifikat ist abgelaufen."},
-        {"The.timestamp.expired.1.but.usable.2",
-                "Der Zeitstempel ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber g\u00FCltig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abl\u00E4uft."},
-        {"The.timestamp.has.expired.",
-                "Der Zeitstempel ist abgelaufen."},
-        {"The.signer.certificate.will.expire.within.six.months.",
-                "Das Signaturgeberzertifikat l\u00E4uft innerhalb der n\u00E4chsten sechs Monate ab."},
-        {"The.timestamp.will.expire.within.one.year.on.1",
-                "Der Zeitstempel l\u00E4uft innerhalb des n\u00E4chsten Jahres am %1$tY-%1$tm-%1$td ab."},
-        {"The.timestamp.will.expire.within.one.year.on.1.but.2",
-                "Der Zeitstempel l\u00E4uft innerhalb des n\u00E4chsten Jahres am %1$tY-%1$tm-%1$td ab. Die JAR-Datei bleibt aber g\u00FCltig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abl\u00E4uft."},
-        {"The.signer.certificate.is.not.yet.valid.",
-                "Das Signaturgeberzertifikat ist noch nicht g\u00FCltig."},
-        {"The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "Die KeyUsage-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
-        {"The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "Die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
-        {"The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "Die NetscapeCertType-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die KeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die NetscapeCertType-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
-        {".{0}.extension.does.not.support.code.signing.",
-                 "[{0}-Erweiterung unterst\u00FCtzt keine Codesignatur]"},
-        {"The.signer.s.certificate.chain.is.invalid.reason.1",
-                "Die Zertifikatskette des Signaturgebers ist ung\u00FCltig. Grund: %s"},
-        {"The.tsa.certificate.chain.is.invalid.reason.1",
-                "Die TSA-Zertifikatskette ist ung\u00FCltig. Grund: %s"},
-        {"The.signer.s.certificate.is.self.signed.",
-                "Das Zertifikat des Signaturgebers ist selbstsigniert."},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "Der f\u00FCr die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.",
-                "Der f\u00FCr die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko und ist deaktiviert."},
-        {"The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "Der %1$s-Digestalgorithmus des Zeitstempels gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "Der %1$s-Digestalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "Der %1$s-Signaturalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update.",
-                "Der %1$s-Signaturschl\u00FCssel hat eine Schl\u00FCsselgr\u00F6\u00DFe von %2$d. Das gilt als Sicherheitsrisiko. Diese Schl\u00FCsselgr\u00F6\u00DFe wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.and.is.disabled.",
-                "Der %1$s-Signaturschl\u00FCssel hat eine Schl\u00FCsselgr\u00F6\u00DFe von %2$d. Das gilt als Sicherheitsrisiko und ist deaktiviert."},
-        {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
-                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Zertifikatskette ung\u00FCltig ist. Grund: %s"},
-        {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren TSA-Zertifikatskette ung\u00FCltig ist. Grund: %s"},
-        {"no.timestamp.signing",
-                "Weder -tsa noch -tsacert wurde angegeben, und diese JAR-Datei hat keinen Zeitstempel. Ohne Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
-        {"invalid.timestamp.signing",
-                "Der Zeitstempel ist ung\u00FCltig. Ohne einen g\u00FCltigen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
-        {"no.timestamp.verifying",
-                "Diese JAR-Datei enth\u00E4lt Signaturen ohne Zeitstempel. Ohne einen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (fr\u00FChestens %1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
-        {"bad.timestamp.verifying",
-                "Diese JAR-Datei enth\u00E4lt Signaturen mit einem ung\u00FCltigen Zeitstempel. Ohne einen g\u00FCltigen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (fr\u00FChestens %1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren.\nF\u00FChren Sie \"jarsigner\" mit -J-Djava.security.debug=jar erneut aus, um weitere Informationen zu erhalten."},
-        {"The.signer.certificate.will.expire.on.1.",
-                "Das Signaturgeberzertifikat l\u00E4uft am %1$tY-%1$tm-%1$td ab."},
-        {"The.timestamp.will.expire.on.1.",
-                "Der Zeitstempel l\u00E4uft am %1$tY-%1$tm-%1$td ab."},
-        {"signer.cert.expired.1.but.timestamp.good.2.",
-                "Das Signaturgeberzertifikat ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber g\u00FCltig, bis der Zeitstempel am %2$tY-%2$tm-%2$td abl\u00E4uft."},
-        {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
-        {"Cannot.find.environment.variable.",
-                "Umgebungsvariable kann nicht gefunden werden: "},
-        {"Cannot.find.file.", "Datei kann nicht gefunden werden: "},
-        {"event.ocsp.check", "Verbindung zu OCSP-Server bei %s wird hergestellt..."},
-        {"event.crl.check", "CRL wird von %s heruntergeladen..."},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
index aca0727297c..65422c0e686 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
@@ -57,8 +57,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u4F7F\u7528\u65B9\u6CD5: jarsigner [options] jar-file alias"},
         {".jarsigner.verify.options.jar.file.alias.",
                 "       jarsigner -verify [options] jar-file [alias...]"},
-        {".jarsigner.version",
-                "       jarsigner -version"},
         {".keystore.url.keystore.location",
                 "[-keystore <url>]           \u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4F4D\u7F6E"},
         {".storepass.password.password.for.keystore.integrity",
@@ -79,8 +77,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "[-sigalg <algorithm>]       \u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]                   \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u8A3C"},
-        {".version.print.the.program.version",
-                "[-version]                  \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
                 "[-verbose[:suboptions]]     \u7F72\u540D/\u691C\u8A3C\u6642\u306E\u8A73\u7D30\u51FA\u529B\u3002"},
         {".suboptions.can.be.all.grouped.or.summary",
@@ -135,8 +131,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"s", "s"},
         {"m", "m"},
         {"k", "k"},
-        {"X", "X"},
-        {"q", "?"},
         {".and.d.more.", "(\u4ED6\u306B\u3082%d\u500B)"},
         {".s.signature.was.verified.",
                 "  s=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F "},
@@ -146,12 +140,9 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "  k=1\u3064\u4EE5\u4E0A\u306E\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u3067\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
         {".X.not.signed.by.specified.alias.es.",
                 "  X =\u6307\u5B9A\u3057\u305F\u5225\u540D\u3067\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
-        {".q.unsigned.entry",
-                "  ? = \u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA"},
         {"no.manifest.", "\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002"},
         {".Signature.related.entries.","(\u30B7\u30B0\u30CD\u30C1\u30E3\u95A2\u9023\u30A8\u30F3\u30C8\u30EA)"},
         {".Unsigned.entries.", "(\u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA)"},
-        {".Directory.entries.", "(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30A8\u30F3\u30C8\u30EA)"},
         {"jar.is.unsigned",
                 "jar\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"jar.treated.unsigned",
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
index 47dacd6a8a5..0cdd2b96cee 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
@@ -57,8 +57,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u7528\u6CD5: jarsigner [\u9009\u9879] jar-file \u522B\u540D"},
         {".jarsigner.verify.options.jar.file.alias.",
                 "       jarsigner -verify [\u9009\u9879] jar-file [\u522B\u540D...]"},
-        {".jarsigner.version",
-                "       jarsigner -version"},
         {".keystore.url.keystore.location",
                 "[-keystore <url>]           \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
         {".storepass.password.password.for.keystore.integrity",
@@ -79,8 +77,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "[-sigalg <\u7B97\u6CD5>]           \u7B7E\u540D\u7B97\u6CD5\u7684\u540D\u79F0"},
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]                   \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"},
-        {".version.print.the.program.version",
-                "[-version]                  \u8F93\u51FA\u7A0B\u5E8F\u7248\u672C"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
                 "[-verbose[:suboptions]]     \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
         {".suboptions.can.be.all.grouped.or.summary",
@@ -135,8 +131,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"s", "s"},
         {"m", "m"},
         {"k", "k"},
-        {"X", "X"},
-        {"q", "?"},
         {".and.d.more.", "(%d \u53CA\u4EE5\u4E0A)"},
         {".s.signature.was.verified.",
                 "  s = \u5DF2\u9A8C\u8BC1\u7B7E\u540D "},
@@ -146,12 +140,9 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "  k = \u5728\u5BC6\u94A5\u5E93\u4E2D\u81F3\u5C11\u627E\u5230\u4E86\u4E00\u4E2A\u8BC1\u4E66"},
         {".X.not.signed.by.specified.alias.es.",
                 "  X = \u672A\u7531\u6307\u5B9A\u522B\u540D\u7B7E\u540D"},
-        {".q.unsigned.entry",
-                "  ? = \u672A\u7B7E\u540D\u6761\u76EE"},
         {"no.manifest.", "\u6CA1\u6709\u6E05\u5355\u3002"},
         {".Signature.related.entries.","(\u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6761\u76EE)"},
         {".Unsigned.entries.", "(\u672A\u7B7E\u540D\u6761\u76EE)"},
-        {".Directory.entries.", "\uFF08\u76EE\u5F55\u6761\u76EE\uFF09"},
         {"jar.is.unsigned",
                 "jar \u672A\u7B7E\u540D\u3002"},
         {"jar.treated.unsigned",
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
index 95744421c89..10f634baa08 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
@@ -25,11 +25,11 @@
 
 error.multiple.main.operations=Es ist nicht m\u00F6glich, mehrere "-cuxtid"-Optionen anzugeben
 error.cant.open=\u00D6ffnen nicht m\u00F6glich: {0}
-error.illegal.option=Unzul\u00E4ssige Option: {0}
+error.illegal.option=Ung\u00FCltige Option: {0}
 error.unrecognized.option=Unbekannte Option: {0}
 error.missing.arg=F\u00FCr die Option {0} ist ein Argument erforderlich
 error.bad.file.arg=Fehler beim Parsen der Dateiargumente
-error.bad.option=Eine der Optionen -{ctxuid} oder --validate muss angegeben werden.
+error.bad.option=Eine der Optionen -{ctxuid} muss angegeben werden.
 error.bad.cflag=Kennzeichen "c" erfordert Angabe von Manifest oder Eingabedateien.
 error.bad.uflag=Kennzeichen "u" erfordert Angabe von Manifest, Kennzeichen "e" oder Eingabedateien.
 error.bad.eflag=Kennzeichen "e" und Manifest mit dem Attribut "Main-Class" k\u00F6nnen nicht zusammen angegeben\nwerden.
@@ -43,7 +43,7 @@ error.create.tempfile=Es konnte keine tempor\u00E4re Datei erstellt werden
 error.hash.dep=Abh\u00E4ngigkeiten bei Hashing-Modul {0}. Modul {1} kann nicht im Modulpfad gefunden werden
 error.module.options.without.info=--module-version oder --hash-modules ohne module-info.class
 error.no.operative.descriptor=Kein operativer Deskriptor f\u00FCr Release: {0}
-error.no.root.descriptor=Kein Root-Moduldeskriptor. Geben Sie --release an
+error.no.root.descriptor=Kein Root-Moduldeskriptor. Geben Sie "--release" an
 error.unable.derive.automodule=Moduldeskriptor kann nicht abgeleitet werden f\u00FCr: {0}
 error.unexpected.module-info=Unerwarteter Moduldeskriptor {0}
 error.module.descriptor.not.found=Moduldeskriptor nicht gefunden
@@ -52,8 +52,6 @@ error.missing.provider=Serviceprovider nicht gefunden: {0}
 error.release.value.notnumber=Release {0} nicht g\u00FCltig
 error.release.value.toosmall=Release {0} nicht g\u00FCltig, muss >= 9 sein
 error.release.unexpected.versioned.entry=Unerwarteter versionierte Eintrag {0} f\u00FCr Release {1}
-error.date.notvalid=Datum {0} ist keine g\u00FCltige erweiterte Datums-/Uhrzeitangabe mit Zeitunterschied und optionaler Zeitzone nach ISO-8601
-error.date.out.of.range=Datum {0} liegt nicht im g\u00FCltigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
 error.validator.jarfile.exception={0} kann nicht validiert werden: {1}
 error.validator.jarfile.invalid=ung\u00FCltige Multi-Release-JAR-Datei {0} gel\u00F6scht
 error.validator.bad.entry.name=Eintragsname hat das falsche Format, {0}
@@ -77,7 +75,6 @@ warn.validator.identical.entry=Warnung: Eintrag {0} enth\u00E4lt eine Klasse, di
 warn.validator.resources.with.same.name=Warnung: Eintrag {0}, mehrere Ressourcen mit demselben Namen
 warn.validator.concealed.public.class=Warnung: Eintrag {0} ist eine \u00F6ffentliche Klasse\nin einem verdeckten Package. Wenn Sie diese JAR-Datei in den Classpath einf\u00FCgen, kommt es\nzu nicht kompatiblen \u00F6ffentlichen Schnittstellen
 warn.release.unexpected.versioned.entry=Unerwarteter versionierter Eintrag {0}
-warn.flag.is.deprecated=Warnung: Die Option {0} ist veraltet, und ihre Entfernung in einem k\u00FCnftigen JDK-Release ist geplant\n
 out.added.manifest=Manifest wurde hinzugef\u00FCgt
 out.added.module-info=module-info hinzugef\u00FCgt: {0}
 out.automodule=Kein Moduldeskriptor gefunden. Automatisches Modul wurde abgeleitet.
@@ -92,7 +89,7 @@ out.extracted=extrahiert: {0}
 out.inflated=\ vergr\u00F6\u00DFert: {0}
 out.size=(ein = {0}) (aus = {1})
 
-usage.compat=Kompatibilit\u00E4tsschnittstelle\nVerwendung: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\nOptionen:\n    -c  erstellt ein neues Archiv\n    -t  listet das Inhaltsverzeichnis f\u00FCr das Archiv auf\n    -x  extrahiert die benannten (oder alle) Dateien aus dem Archiv\n    -u  aktualisiert ein vorhandenes Archiv\n    -v  generiert Verbose-Ausgabe zur Standardausgabe\n    -f  gibt den Archivdateinamen an\n    -m  schlie\u00DFt Manifestinformationen aus der angegebenen Manifestdatei ein\n    -e  gibt den Anwendungseinstiegspunkt f\u00FCr Standalone-Anwendungen an,\n        die in einer ausf\u00FChrbaren JAR-Datei geb\u00FCndelt sind\n    -0  speichert nur, keine ZIP-Komprimierung\n    -P  beh\u00E4lt die vorangestellten Komponenten "/" (absoluter Pfad) und ".." (\u00FCbergeordnetes Verzeichnis) aus dem Dateinamen bei\n    -M  generiert keine Manifestdatei f\u00FCr die Eintr\u00E4ge\n    -i  generiert Indexinformationen f\u00FCr die angegebenen JAR-Dateien\n    -C  wechselt zum angegebenen Verzeichnis und schlie\u00DFt die folgende Datei ein\nDateien, die Verzeichnisse sind, werden rekursiv verarbeitet.\nDie Namen der Manifestdatei, der Archivdatei und des Einstiegspunkts werden\nin der gleichen Reihenfolge wie die Flags "m", "f" und "e" verarbeitet.\n\nBeispiel 1: Zwei Klassendateien in einem Archiv classes.jar archivieren: \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Eine vorhandene Manifestdatei "mymanifest" verwenden und alle\n           Dateien im Verzeichnis foo/ directory in "classes.jar" archivieren: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Kompatibilit\u00E4tsschnittstelle:\nVerwendung:  jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] Dateien] ...\nOptionen:\n    -c  Neues Archiv erstellen\n    -t  Inhaltsverzeichnis f\u00FCr Archiv anzeigen\n    -x  Benannte (oder alle) Dateien aus Archiv extrahieren\n    -u  Vorhandenes Archiv aktualisieren\n    -v  Ausgabe im Verbose-Modus aus Standardausgabe generieren\n    -f  Dateinamen f\u00FCr Archiv angeben\n    -m  Manifestinformationen aus angegebener Manifestdatei aufnehmen\n    -n  Pack200-Normalisierung nach Erstellung eines neuen Archivs ausf\u00FChren\n    -e  Anwendungseinstiegspunkt f\u00FCr in ausf\u00FChrbare JAR-Datei \n        geb\u00FCndelte Standalone-Anwendung angeben\n    -0  Nur speichern; keine ZIP-Komprimierung verwenden\n    -P  Komponenten mit vorangestelltem "/" (absoluter Pfad) und ".." (\u00FCbergeordnetes Verzeichnis) aus Dateinamen beibehalten\n        -M  Keine Manifestdatei f\u00FCr die Eintr\u00E4ge erstellen\n    -i  Indexinformationen f\u00FCr die angegebenen JAR-Dateien erstellen\n    -C  Zum angegebenen Verzeichnis wechseln und folgende Datei ber\u00FCcksichtigen\nDateien, die Verzeichnisse sind, werden rekursiv verarbeitet.\nDer Name der Manifestdatei, der Name der Archivdatei und der Name des Einstiegspunktes werden\nin derselben Reihenfolge wie die Kennzeichen "m", "f" und "e" angegeben.\n\nBeispiel 1: Zwei Klassendateien in ein Archiv "classes.jar" archivieren: \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Mit der vorhandenen Manifestdatei "mymanifest" alle\n           Dateien im Verzeichnis foo/ in "classes.jar" archivieren: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Verwendung: jar [OPTION...] [ [--release VERSION] [-C dir] Dateien] ...
 main.usage.summary.try=Verwenden Sie "jar --help", um weitere Informationen anzuzeigen.
@@ -105,12 +102,11 @@ main.help.opt.main.list=\  -t, --list                 Das Inhaltsverzeichnis f\u
 main.help.opt.main.update=\  -u, --update               Ein vorhandenes JAR-Archiv aktualisieren
 main.help.opt.main.extract=\  -x, --extract              Benannte (oder alle) Dateien aus dem Archiv extrahieren
 main.help.opt.main.describe-module=\  -d, --describe-module      Gibt den Moduldeskriptor oder automatischen Modulnamen aus
-main.help.opt.main.validate=\      --validate             Validiert den Inhalt des JAR-Archivs. Diese Option\n                             validiert, dass die von einem Multi-Release-JAR-Archiv\n                             exportierte API \u00FCber die verschiedenen Releaseversionen\n                             hinweg konsistent ist.
 main.help.opt.any=\ In jedem Modus g\u00FCltige Vorgangsmodifikatoren:\n\n  -C DIR                     Zum angegebenen Verzeichnis wechseln und die folgende\n                             Datei aufnehmen
 main.help.opt.any.file=\  -f, --file=FILE            Der Name der Archivdatei. Wenn Sie dies lauslassen, wird entweder stdin oder\n                             stdout verwendet, je nach Vorgang\n      --release VERSION      Speichert alle der folgenden Dateien in einem versionierten Verzeichnis\n                             der JAR-Datei (d.h. META-INF/versions/VERSION/)
 main.help.opt.any.verbose=\  -v, --verbose              Verbose-Ausgabe bei Standardausgabe generieren
 main.help.opt.create=\ Vorgangsmodifikatoren, die nur im Erstellungsmodus g\u00FCltig sind:\n
-main.help.opt.create.normalize=\  -n, --normalize            Normalisiert Informationen im neuen JAR-Archiv\n                             nach der Erstellung. Diese Option ist veraltet, und ihre\n                             Entfernung in einem k\u00FCnftigen JDK-Release ist geplant
+main.help.opt.create.normalize=\  -n, --normalize            Normalisiert Informationen im neuen JAR-Archiv\n                             nach der Erstellung
 main.help.opt.create.update=\ Vorgangsmodifikatoren, die nur im Erstellungs- und Aktualisierungsmodus g\u00FCltig sind:\n
 main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Der Anwendungseinstiegspunkt f\u00FCr Standalone-\n                             Anwendungen, die in einem modularen oder ausf\u00FChrbaren\n                             JAR-Archiv geb\u00FCndelt sind
 main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Die Manifestinformationen aus der angegebenen\n                             Manifestdatei aufnehmen
@@ -122,9 +118,8 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Hinweis f\u00FCr ein Tool, eine Warnung auszugeben,\n                             wenn das Modul aufgel\u00F6st wird, entweder "deprecated", "deprecated-for-removal"\n                             oder "incubating"
 main.help.opt.create.update.index=\ Vorgangsmodifikatoren, die nur im Erstellungs-, Aktualisierungs- und Indexgenerierungsmodus g\u00FCltig sind:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Nur speichern, keine ZIP-Komprimierung verwenden
-main.help.opt.create.update.index.date=\      --date=TIMESTAMP        Zeitstempel im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied\n                             und optionaler Zeitzone nach ISO-8601, zur Verwendung f\u00FCr die Zeitstempel von\n                             Eintr\u00E4gen, z.B. "2022-02-12T12:30:00-05:00"
 main.help.opt.other=\ Weitere Optionen:\n
-main.help.opt.other.help=\  -?, -h, --help[:compat]    Gibt diese Meldung oder optional die Kompatibilit\u00E4t, Hilfe an
+main.help.opt.other.help=\  -h, --help[:compat]        Gibt diese Meldung oder optional die Kompatibilit\u00E4t, Hilfe an
 main.help.opt.other.help-extra=\      --help-extra           Hilfe zu zus\u00E4tzlichen Optionen
 main.help.opt.other.version=\      --version              Programmversion ausgeben
 main.help.postopt=\ Ein Archiv ist ein modulares JAR-Archiv, wenn der Moduldeskriptor "module-info.class"\n in der Root der angegebenen Verzeichnisse oder in der Root des JAR-Archivs selbst\n vorhanden ist. Die folgenden Vorg\u00E4nge sind nur g\u00FCltig, wenn Sie ein modulares JAR-Archiv\n erstellen oder ein vorhandenes nicht modulares JAR-Archiv aktualisieren: "--module-version",\n "--hash-modules" und "--modulepath".\n\n Obligatorische oder optionale Argumente zu langen Optionen sind auch f\u00FCr die jeweils\n zugeh\u00F6rigen kurzen Optionen obligatorisch oder optional.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
index a4cdec838f8..b17d8c1e08d 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ error.illegal.option=\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 error.unrecognized.option=\u8A8D\u8B58\u3055\u308C\u306A\u3044\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 error.missing.arg=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.file.arg=\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306E\u89E3\u6790\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-error.bad.option=\u30AA\u30D7\u30B7\u30E7\u30F3-{ctxuid}\u307E\u305F\u306F--validate\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+error.bad.option=\u30AA\u30D7\u30B7\u30E7\u30F3-{ctxuid}\u306E\u3046\u3061\u306E1\u3064\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 error.bad.cflag=\u30D5\u30E9\u30B0'c'\u3067\u306F\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u307E\u305F\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.uflag=\u30D5\u30E9\u30B0'u'\u3067\u306F\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304B'e'\u30D5\u30E9\u30B0\u3001\u307E\u305F\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.eflag='e'\u30D5\u30E9\u30B0\u3068'Main-Class'\u5C5E\u6027\u3092\u6301\u3064\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u540C\u6642\u306B\n\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
@@ -52,8 +52,6 @@ error.missing.provider=\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u3
 error.release.value.notnumber=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 error.release.value.toosmall=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u30029\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.release.unexpected.versioned.entry=\u30EA\u30EA\u30FC\u30B9{1}\u3067\u4E88\u671F\u3057\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u6E08\u30A8\u30F3\u30C8\u30EA{0}
-error.date.notvalid=\u65E5\u4ED8{0}\u304C\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u3092\u6307\u5B9A\u3057\u305F\u3001\u6709\u52B9\u306AISO-8601\u306E\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-error.date.out.of.range=\u65E5\u4ED8{0}\u304C\u6709\u52B9\u306A\u7BC4\u56F21980-01-01T00:00:02Z to 2099-12-31T23:59:59Z\u306B\u3042\u308A\u307E\u305B\u3093
 error.validator.jarfile.exception={0}\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093: {1}
 error.validator.jarfile.invalid=\u7121\u52B9\u306A\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u30D5\u30A1\u30A4\u30EB{0}\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F
 error.validator.bad.entry.name=\u30A8\u30F3\u30C8\u30EA\u540D\u304C\u4E0D\u6B63\u3067\u3059: {0}
@@ -105,7 +103,6 @@ main.help.opt.main.list=\  -t\u3001--list                 \u30A2\u30FC\u30AB\u30
 main.help.opt.main.update=\  -u\u3001--update               \u65E2\u5B58\u306Ejar\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3057\u307E\u3059
 main.help.opt.main.extract=\  -x\u3001--extract              \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3057\u307E\u3059
 main.help.opt.main.describe-module=\  -d, --describe-module      \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u307E\u305F\u306F\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u3092\u51FA\u529B\u3057\u307E\u3059
-main.help.opt.main.validate=\      --validate            jar\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u691C\u8A3C\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n                             \u8907\u6570\u30EA\u30EA\u30FC\u30B9\u306Ejar\u30A2\u30FC\u30AB\u30A4\u30D6\u3067\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305FAPI\u304C\n                             \u3059\u3079\u3066\u306E\u7570\u306A\u308B\u30EA\u30EA\u30FC\u30B9\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u4E00\u8CAB\u3057\u3066\u3044\u308B\u3053\u3068\u3092\n                             \u691C\u8A3C\u3057\u307E\u3059\u3002
 main.help.opt.any=\ \u3069\u306E\u30E2\u30FC\u30C9\u3067\u3082\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n\n  -C DIR                     \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u6B21\u306E\u30D5\u30A1\u30A4\u30EB\u3092\n                             \u53D6\u308A\u8FBC\u307F\u307E\u3059
 main.help.opt.any.file=\  -f\u3001--file=FILE            \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u7701\u7565\u3057\u305F\u5834\u5408\u3001stdin\u307E\u305F\u306F\n                             stdout\u306E\u3044\u305A\u308C\u304B\u304C\u64CD\u4F5C\u306B\u57FA\u3065\u3044\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n      --release VERSION      \u6B21\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092jar\u306E\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                             (\u3064\u307E\u308A\u3001META-INF/versions/VERSION/)\u306B\u914D\u7F6E\u3057\u307E\u3059
 main.help.opt.any.verbose=\  -v\u3001--verbose              \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3057\u307E\u3059
@@ -122,7 +119,6 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u8B66\u544A\u3092\u767A\u884C\u3059\u308B\n                             \u30C4\u30FC\u30EB\u306E\u30D2\u30F3\u30C8\u3002\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\n                             \u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B
 main.help.opt.create.update.index=\ \u4F5C\u6210\u3001\u66F4\u65B0\u304A\u3088\u3073\u7D22\u5F15\u751F\u6210\u30E2\u30FC\u30C9\u3067\u306E\u307F\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u307E\u305B\u3093
-main.help.opt.create.update.index.date=\      --date=TIMESTAMP       \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u305FISO-8601\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\n                            \u306E\u65E5\u6642\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3002\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u4F7F\u7528\u4F8B\u306F\u3001\n                             "2022-02-12T12:30:00-05:00"\u3067\u3059
 main.help.opt.other=\ \u305D\u306E\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n
 main.help.opt.other.help=\  -?\u3001-h\u3001--help[:compat]        \u3053\u308C(\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u4E92\u63DB\u6027)\u3092help\u306B\u6307\u5B9A\u3057\u307E\u3059
 main.help.opt.other.help-extra=\      --help-extra           \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u63D0\u4F9B\u3057\u307E\u3059
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
index 5a4832d0bd4..36889f522cb 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ error.illegal.option=\u975E\u6CD5\u9009\u9879: {0}
 error.unrecognized.option=\u65E0\u6CD5\u8BC6\u522B\u7684\u9009\u9879: {0}
 error.missing.arg=\u9009\u9879{0}\u9700\u8981\u53C2\u6570
 error.bad.file.arg=\u89E3\u6790\u6587\u4EF6\u53C2\u6570\u65F6\u51FA\u9519
-error.bad.option=\u5FC5\u987B\u6307\u5B9A -{ctxuid} \u6216 --validate \u9009\u9879\u4E4B\u4E00\u3002
+error.bad.option=\u5FC5\u987B\u6307\u5B9A {ctxuid} \u4E2D\u7684\u4EFB\u4E00\u9009\u9879\u3002
 error.bad.cflag='c' \u6807\u8BB0\u8981\u6C42\u6307\u5B9A\u6E05\u5355\u6216\u8F93\u5165\u6587\u4EF6!
 error.bad.uflag='u' \u6807\u8BB0\u8981\u6C42\u6307\u5B9A\u6E05\u5355, 'e' \u6807\u8BB0\u6216\u8F93\u5165\u6587\u4EF6!
 error.bad.eflag=\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A 'e' \u6807\u8BB0\u548C\u5177\u6709 'Main-Class' \u5C5E\u6027\u7684\n\u6E05\u5355!
@@ -52,8 +52,6 @@ error.missing.provider=\u672A\u627E\u5230\u670D\u52A1\u63D0\u4F9B\u65B9: {0}
 error.release.value.notnumber=\u53D1\u884C\u7248 {0} \u65E0\u6548
 error.release.value.toosmall=\u53D1\u884C\u7248 {0} \u65E0\u6548, \u5FC5\u987B >= 9
 error.release.unexpected.versioned.entry=\u53D1\u884C\u7248 {1} \u5B58\u5728\u610F\u5916\u7684\u7248\u672C\u5316\u6761\u76EE {0}
-error.date.notvalid=\u65E5\u671F {0} \u4E0D\u662F\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684\u6709\u6548 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4
-error.date.out.of.range=\u65E5\u671F {0} \u4E0D\u5728 1980-01-01T00:00:02Z \u5230 2099-12-31T23:59:59Z \u8FD9\u4E00\u6709\u6548\u8303\u56F4\u5185
 error.validator.jarfile.exception=\u65E0\u6CD5\u9A8C\u8BC1 {0}: {1}
 error.validator.jarfile.invalid=\u5220\u9664\u7684\u591A\u53D1\u884C\u7248 jar \u6587\u4EF6 {0} \u65E0\u6548
 error.validator.bad.entry.name=\u6761\u76EE\u540D\u79F0\u683C\u5F0F\u9519\u8BEF, {0}
@@ -105,7 +103,6 @@ main.help.opt.main.list=\  -t, --list                 \u5217\u51FA\u6863\u6848\u
 main.help.opt.main.update=\  -u, --update               \u66F4\u65B0\u73B0\u6709 jar \u6863\u6848
 main.help.opt.main.extract=\  -x, --extract              \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u5168\u90E8) \u6587\u4EF6
 main.help.opt.main.describe-module=\  -d, --describe-module      \u8F93\u51FA\u6A21\u5757\u63CF\u8FF0\u7B26\u6216\u81EA\u52A8\u6A21\u5757\u540D\u79F0
-main.help.opt.main.validate=\      --validate             \u9A8C\u8BC1 jar \u6863\u6848\u7684\u5185\u5BB9\u3002\u6B64\u9009\u9879\n                             \u5C06\u9A8C\u8BC1\u7531\u591A\u53D1\u884C\u7248 jar \u6863\u6848\u5BFC\u51FA\n                             \u7684 API \u5728\u6240\u6709\u4E0D\u540C\u7684\u53D1\u884C\u7248\u672C\u4E2D\n                             \u662F\u5426\u4E00\u81F4\u3002
 main.help.opt.any=\ \u5728\u4EFB\u610F\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n\n  -C DIR                     \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\n                             \u4EE5\u4E0B\u6587\u4EF6
 main.help.opt.any.file=\  -f, --file=FILE            \u6863\u6848\u6587\u4EF6\u540D\u3002\u7701\u7565\u65F6, \u57FA\u4E8E\u64CD\u4F5C\n                             \u4F7F\u7528 stdin \u6216 stdout\n      --release VERSION      \u5C06\u4E0B\u9762\u7684\u6240\u6709\u6587\u4EF6\u90FD\u653E\u5728\n                             jar \u7684\u7248\u672C\u5316\u76EE\u5F55\u4E2D (\u5373 META-INF/versions/VERSION/)
 main.help.opt.any.verbose=\  -v, --verbose              \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA
@@ -122,7 +119,6 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u63D0\u793A\u5DE5\u5177\u5728\u89E3\u6790\u6A21\u5757\u540E\u53D1\u51FA\u8B66\u544A\u3002\n                             \u53EF\u4EE5\u4E3A deprecated, deprecated-for-removal\n                             \u6216 incubating \u4E4B\u4E00
 main.help.opt.create.update.index=\ \u53EA\u5728\u521B\u5EFA, \u66F4\u65B0\u548C\u751F\u6210\u7D22\u5F15\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528 ZIP \u538B\u7F29
-main.help.opt.create.update.index.date=\      --date=TIMESTAMP       \u5177\u6709\u53EF\u9009\u65F6\u533A\u7684 ISO-8601 \u6269\u5C55\u504F\u79FB\n                             \u65E5\u671F\u65F6\u95F4\u683C\u5F0F\u7684\u65F6\u95F4\u6233\uFF08\u7528\u4E8E\u6761\u76EE\u7684\u65F6\u95F4\u6233\uFF09\uFF0C\n                             \u4F8B\u5982\uFF0C"2022-02-12T12:30:00-05:00"
 main.help.opt.other=\ \u5176\u4ED6\u9009\u9879:\n
 main.help.opt.other.help=\  -?, -h, --help[:compat]    \u63D0\u4F9B\u6B64\u5E2E\u52A9\uFF0C\u4E5F\u53EF\u4EE5\u9009\u62E9\u6027\u5730\u63D0\u4F9B\u517C\u5BB9\u6027\u5E2E\u52A9
 main.help.opt.other.help-extra=\      --help-extra           \u63D0\u4F9B\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
deleted file mode 100644
index 4cf302da7b9..00000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
+++ /dev/null
@@ -1,445 +0,0 @@
-#
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-doclet.build_version=Standard-Doclet-Version {0}
-doclet.Contents=Inhalt
-doclet.Overview=\u00DCberblick
-doclet.Window_Overview_Summary=\u00DCberblick
-doclet.Element=Element
-doclet.Package=Package
-doclet.Unnamed_Package=Unbenanntes Package
-doclet.Module=Modul
-doclet.Open_Module=Modul \u00F6ffnen
-doclet.All_Packages=Alle Packages
-doclet.All_Modules=Alle Module
-doclet.None=Kein Wert
-doclet.Tree=Baum
-doclet.Class_Hierarchy=Klassenhierarchie
-doclet.Window_Class_Hierarchy=Klassenhierarchie
-doclet.Interface_Hierarchy=Schnittstellenhierarchie
-doclet.Enum_Hierarchy=Enum-Hierarchie
-doclet.Enum_Class_Hierarchy=Enum-Klassenhierarchie
-doclet.Annotation_Type_Hierarchy=Annotationstyphierarchie
-doclet.Annotation_Interface_Hierarchy=Annotationsschnittstellenhierarchie
-doclet.Href_Class_Title=Klasse in {0}
-doclet.Href_Interface_Title=Schnittstelle in {0}
-doclet.Href_Annotation_Title=Annotation in {0}
-doclet.Href_Annotation_Interface_Title=Annotationsschnittstelle in {0}
-doclet.Href_Enum_Title=Enum in {0}
-doclet.Href_Enum_Class_Title=Enum-Klasse in {0}
-doclet.Href_Type_Param_Title=Typparameter in {0}
-doclet.Href_Class_Or_Interface_Title=Klasse oder Schnittstelle in {0}
-doclet.Summary=\u00DCbersicht:
-doclet.Detail=Details:
-doclet.Module_Sub_Nav=Modul:
-doclet.Help_Sub_Nav=Hilfe:
-doclet.Package_Sub_Nav=Package:
-doclet.navClassesAndInterfaces=Klassen und Schnittstellen
-doclet.navDescription=Beschreibung
-doclet.navModules=Module
-doclet.navPackages=Packages
-doclet.navServices=Services
-doclet.navNested=Verschachtelt
-doclet.navAnnotationTypeOptionalMember=Optional
-doclet.navAnnotationTypeRequiredMember=Erforderlich
-doclet.navAnnotationTypeMember=Element
-doclet.navField=Feld
-doclet.navProperty=Eigenschaft
-doclet.navEnum=Enum-Konstanten
-doclet.navConstructor=Konstruktor
-doclet.navMethod=Methode
-doclet.navNavigation=Navigation
-doclet.navPages=Seiten
-doclet.not.exhaustive=(nicht umfassend)
-doclet.Index=Index
-doclet.Window_Single_Index=Index
-doclet.Window_Split_Index={0}-Index
-doclet.Help=Hilfe
-doclet.Skip_navigation_links=Navigations-Links \u00FCberspringen
-doclet.Toggle_navigation_links=Navigationslinks umschalten
-doclet.Navigation=Navigation
-doclet.navDeprecated=Veraltet
-doclet.Window_Deprecated_List=Veraltete Liste
-doclet.Window_New_List=Neue API-Liste
-doclet.Window_Preview_List=Vorschauliste
-doclet.Overrides=Setzt au\u00DFer Kraft:
-doclet.in_class=in Klasse
-doclet.Element_in=Element in {0}
-doclet.Enum_constant_in=Enum-Konstante in {0}
-doclet.Static_variable_in=Statische Variable in {0}
-doclet.Variable_in=Variable in {0}
-doclet.Constructor_for=Konstruktor f\u00FCr {0}
-doclet.Record_component_in=Komponente von {0} erfassen
-doclet.Static_method_in=Statische Methode in {0}
-doclet.Search_tag_in=Tag suchen in {0}
-doclet.Method_in=Methode in {0}
-doclet.module=Modul
-doclet.package=Package
-doclet.MalformedURL=Nicht wohlgeformte URL: {0}
-doclet.File_error=Fehler beim Lesen der Datei: {0}
-doclet.URL_error=Fehler beim Abrufen der URL: {0}
-doclet.Resource_error=Fehler beim Lesen der Ressource: {0}
-doclet.see.class_or_package_not_found=Tag {0}: Referenz nicht gefunden: {1}
-doclet.see.class_or_package_not_accessible=Tag {0}: Referenz nicht zug\u00E4nglich: {1}
-doclet.see.nested_link=Tag {0}: Verschachtelter Link
-doclet.tag.invalid_usage=Ung\u00FCltige Verwendung des Tags {0}
-doclet.tag.invalid_input=Ung\u00FCltige Eingabe: "{0}"
-doclet.tag.invalid=ung\u00FCltiges @{0}
-doclet.Deprecated_API=Veraltete API
-doclet.Deprecated_Elements=Veraltete {0}
-doclet.Deprecated_In_Release=Veraltet in {0}
-doclet.Deprecated_Tabs_Intro=(Die Registerkarte "Veraltet ..." ganz links zeigt alle veralteten Elemente, unabh\u00E4ngig von dem Release, seit dem sie veraltet sind. Jede der anderen Registerkarten "Veraltet in ..." zeigt die Elemente, die seit einem bestimmten Release veraltet sind.)
-doclet.New_API=Neue API
-doclet.New_Elements=Neue {0}
-doclet.New_Elements_Added_In_Release=Hinzugef\u00FCgt in {0}
-doclet.New_Label=Neu
-doclet.New_Tabs_Intro=(Die Registerkarte "Neu ..." ganz links zeigt alle neuen Elemente, unabh\u00E4ngig von dem Release, in dem sie hinzugef\u00FCgt wurden. Jede der anderen Registerkarten "Hinzugef\u00FCgt in ..." zeigt die Elemente, die in einem bestimmten Release hinzugef\u00FCgt wurden. Elemente, die auf der Registerkarte ganz links angezeigt werden, werden auch auf einer der Registerkarten weiter rechts angezeigt.)
-doclet.Preview_API=Vorschau-API
-doclet.Preview_Label=Vorschau
-doclet.Preview_Mark=PREVIEW
-doclet.Terminally_Deprecated=Endg\u00FCltig veraltet
-doclet.Terminally_Deprecated_Elements=Endg\u00FCltig veraltete Elemente
-doclet.Terminally_Deprecated_In_Release=Endg\u00FCltig veraltet in {0}
-doclet.Annotation_Types=Annotationstypen
-doclet.Annotation_Interfaces=Annotationsschnittstellen
-doclet.Annotation_Type_Members=Annotationstypelemente
-doclet.Annotation_Interface_Members=Annotationsschnittstellenelemente
-doclet.annotation_types=Annotationstypen
-doclet.annotation_interfaces=Annotationsschnittstellen
-doclet.annotation_type_members=Annotationstypelemente
-doclet.annotation_interface_members=Annotationsschnittstellenelemente
-doclet.Generated_Docs_Untitled=Generierte Dokumentation (unbenannt)
-doclet.Other_Packages=Andere Packages
-doclet.Description=Beschreibung
-doclet.Specified_By=Angegeben von:
-doclet.in_interface=in Schnittstelle
-doclet.Subclasses=Bekannte direkte Unterklassen:
-doclet.Subinterfaces=Alle bekannten Unterschnittstellen:
-doclet.Implementing_Classes=Alle bekannten Implementierungsklassen:
-doclet.Functional_Interface=Funktionsschnittstelle:
-doclet.Functional_Interface_Message=Dies ist eine funktionale Schnittstelle, die somit als Zuweisungsziel f\u00FCr einen Lambdaausdruck oder eine Methodenreferenz verwendet werden kann.
-doclet.also=auch
-doclet.Package_Hierarchies=Packagehierarchien:
-doclet.Hierarchy_For_Package=Hierarchie f\u00FCr Package {0}
-doclet.Hierarchy_For_All_Packages=Hierarchie f\u00FCr alle Packages
-doclet.Hierarchy_For_Unnamed_Package=Hierarchie f\u00FCr unbenanntes Package
-doclet.No_Script_Message=JavaScript ist im Browser deaktiviert.
-doclet.Description_From_Interface=Beschreibung aus Schnittstelle kopiert:
-doclet.Description_From_Class=Beschreibung aus Klasse kopiert:
-doclet.No_Non_Deprecated_Classes_To_Document=Keine zu dokumentierenden nicht veralteten Klassen gefunden.
-doclet.Interfaces=Schnittstellen
-doclet.Enclosing_Class=Umschlie\u00DFende Klasse:
-doclet.Enclosing_Interface=Umschlie\u00DFende Schnittstelle:
-doclet.Inheritance_Tree=Vererbungsbaum
-doclet.ReferencedIn=Referenziert in
-doclet.System_Property=Systemeigenschaft
-doclet.systemProperties=Systemeigenschaften
-doclet.systemPropertiesSummary=Systemeigenschaften - \u00DCbersicht
-doclet.Window_Source_title=Quellcode
-doclet.Window_Help_title=API-Hilfe
-
-doclet.help.main_heading=Hilfe zu JavaDoc
-doclet.help.navigation.head=Navigation
-# 0: link to the Overview page
-doclet.help.navigation.intro=Ausgehend von der Seite {0} k\u00F6nnen Sie die Dokumentation mithilfe der Links durchsuchen, die sich auf jeder Seite und in der Navigationsleiste oben auf jeder Seite befinden.
-# 0: link to the Index;  1: short list of links
-doclet.help.navigation.index=Mit {0} und dem Suchfeld k\u00F6nnen Sie zu spezifischen Deklarationen und \u00DCbersichtsseiten navigieren, wie {1}
-doclet.help.page_kinds.head=Seitenarten
-doclet.help.page_kinds.intro=Die folgenden Abschnitte beschreiben die verschiedenen Seitenarten in dieser Collection.
-# 0: link to the Overview page
-doclet.help.overview.modules.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enth\u00E4lt eine Liste aller Module mit einer \u00DCbersicht f\u00FCr jedes Modul. Diese Seite kann auch eine Gesamtbeschreibung des Modulsets enthalten.
-# 0: link to the Overview page
-doclet.help.overview.packages.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enth\u00E4lt eine Liste aller Packages mit einer \u00DCbersicht f\u00FCr jedes Packages. Diese Seite kann auch eine Gesamtbeschreibung des Packagesets enthalten.
-doclet.help.package.intro=F\u00FCr jedes Package ist eine Seite vorhanden, die eine Liste der Klassen und Schnittstellen mit jeweils einer \u00DCbersicht daf\u00FCr enth\u00E4lt. Diese Seiten k\u00F6nnen die folgenden Kategorien enthalten:
-doclet.help.module.intro=F\u00FCr jedes Modul ist eine Seite vorhanden, die eine Liste der Packages, Abh\u00E4ngigkeiten von anderen Modulen und Services mit jeweils einer \u00DCbersicht daf\u00FCr enth\u00E4lt. Diese Seiten k\u00F6nnen die folgenden Kategorien enthalten:
-doclet.help.class_interface.head=Klasse oder Schnittstelle
-doclet.help.class_interface.intro=F\u00FCr jede Klasse, Schnittstelle, verschachtelte Klasse und verschachtelte Schnittstelle ist eine separate Seite vorhanden. Jede dieser Seiten enth\u00E4lt drei Abschnitte, die aus einer Deklaration und Beschreibung, Mitglieder\u00FCbersichtstabellen und detaillierten Mitgliederbeschreibungen bestehen. Die Eintr\u00E4ge in diesen Abschnitten werden weggelassen, wenn sie leer oder nicht anwendbar sind.
-doclet.help.class_interface.inheritance_diagram=Klassenvererbungsdiagramm
-doclet.help.class_interface.subclasses=Direkte Unterklassen
-doclet.help.class_interface.subinterfaces=Alle bekannten Unterschnittstellen
-doclet.help.class_interface.implementations=Alle bekannten Implementierungsklassen
-doclet.help.class_interface.declaration=Klassen- oder Schnittstellendeklaration
-doclet.help.class_interface.description=Klassen- oder Schnittstellenbeschreibung
-doclet.help.class_interface.member_order=Die \u00DCbersichtseintr\u00E4ge sind alphabetisch geordnet, w\u00E4hrend die detaillierten Beschreibungen in der Reihenfolge aufgef\u00FChrt werden, in der sie im Quellcode auftreten. So werden die vom Programmierer festgelegten logischen Gruppierungen beibehalten.
-doclet.help.class_interface.note=Hinweis:
-doclet.help.class_interface.anno=Annotationsschnittstellen haben erforderliche und optionale Elemente, aber nicht Methoden.
-doclet.help.class_interface.enum=Nur Enum-Klassen haben Enum-Konstanten.
-doclet.help.class_interface.record=Die Komponenten einer Datensatzklasse werden als Teil der Deklaration der Datensatzklasse angezeigt.
-doclet.help.class_interface.property=Eigenschaften sind ein Feature von JavaFX.
-doclet.help.other_files.head=Weitere Dateien
-doclet.help.other_files.body=Packages und Module k\u00F6nnen Seiten mit weiteren Informationen zu den Deklarationen in der N\u00E4he enthalten.
-doclet.help.use.head=Verwendung
-doclet.help.use.body=F\u00FCr jedes dokumentierte Package sowie jede Klasse und jede Schnittstelle ist eine eigene Verwendungsseite vorhanden. Auf dieser Seite wird beschrieben, welche Packages, Klassen, Methoden, Konstruktoren und Felder einen Teil der angegebenen Klasse oder des angegebenen Packages verwenden. Bei der Klasse oder Schnittstelle A enth\u00E4lt die Verwendungsseite die Unterklassen von A, als A deklarierte Felder, Methoden, die A zur\u00FCckgeben, sowie Methoden und Konstruktoren mit Parametern des Typs A. Sie k\u00F6nnen diese Seite aufrufen, indem Sie zun\u00E4chst das Package, die Klasse oder die Schnittstelle aufrufen und anschlie\u00DFend in der Navigationsleiste auf den Link "Verwendung" klicken.
-doclet.help.tree.head=Baum (Klassenhierarchie)
-# 0: link to main Class Hierarchy page;  1: java.lang.Object
-doclet.help.tree.intro=Es gibt eine Seite {0} f\u00FCr alle Packages, und f\u00FCr jedes Package gibt es eine Hierarchie. Jede Hierarchieseite enth\u00E4lt eine Klassen- und eine Schnittstellenliste. Die Klassen sind nach Vererbungsstruktur organisiert, beginnend mit {1}. Die Schnittstellen erben nicht von {1}.
-doclet.help.tree.overview=Wenn Sie auf der \u00DCbersichtsseite auf "Baum" klicken, wird die Hierarchie f\u00FCr alle Packages angezeigt.
-doclet.help.tree.package=Wenn Sie eine bestimmte Package-, Klassen- oder Schnittstellenseite anzeigen und auf "Baum" klicken, wird die Hierarchie nur f\u00FCr dieses Package angezeigt.
-# 0: link to the Deprecated summary page
-doclet.help.deprecated.body=Auf der Seite {0} werden alle APIs aufgef\u00FChrt, die veraltet sind. Die Verwendung einer veralteten API ist nicht empfehlenswert, im Allgemeinen aufgrund von M\u00E4ngeln. In der Regel wird eine Ersatz-API angegeben. Veraltete APIs werden in k\u00FCnftigen Implementierungen m\u00F6glicherweise entfernt.
-# 0: link to the Preview summary page
-doclet.help.preview.body=Die Seite {0} listet alle Vorschau-APIs auf. Vorschau-APIs k\u00F6nnen in k\u00FCnftigen Implementierungen entfernt werden.
-doclet.help.new.body=Die Seite {0} listet APIs auf, die in neueren Releases hinzugef\u00FCgt wurden.
-doclet.help.index.head=Index
-# 0: link to Index page;  1: list of links to pages
-doclet.help.index.body=Die {0} enth\u00E4lt einen alphabetischen Index aller Klassen, Schnittstellen, Konstruktoren, Methoden und Felder in der Dokumentation sowie \u00DCbersichtsseiten wie {1}.
-doclet.help.all_classes.head=Alle Klassen und Schnittstellen
-# 0: link to All Classes page
-doclet.help.all_classes.body=Die Seite {0} enth\u00E4lt einen alphabetischen Index aller Klassen und Schnittstellen in der Dokumentation, einschlie\u00DFlich Annotationsschnittstellen, Enum-Klassen und Datensatzklassen.
-doclet.help.all_packages.head=Alle Packages
-# 0: link to All Packages page
-doclet.help.all_packages.body=Die Seite {0} enth\u00E4lt einen alphabetischen Index aller Packages, die in der Dokumentation enthalten sind.
-doclet.help.serial_form.body=Jede serialisierbare oder externalisierbare Klasse verf\u00FCgt \u00FCber eine Beschreibung der zugeh\u00F6rigen Serialisierungsfelder und -methoden. Diese Informationen sind eher f\u00FCr Implementierer als f\u00FCr Benutzer der API von Interesse. Die Navigationsleiste enth\u00E4lt zwar keinen Link, Sie k\u00F6nnen diese Informationen jedoch abrufen, indem Sie zu einer beliebigen serialisierten Klasse navigieren und im Abschnitt "Siehe auch" der Klassenbeschreibung auf "Serialisierte Form" klicken.
-# 0: link to Constant Values page
-doclet.help.constants.body=Auf der Seite {0} sind die statischen endg\u00FCltigen Felder und deren Werte aufgef\u00FChrt.
-# 0: link to System Properties page
-doclet.help.systemProperties.body=Die Seite {0} listet Referenzen auf Systemeigenschaften auf.
-doclet.help.footnote=Diese Hilfedatei gilt f\u00FCr die vom Standard-Doclet generierte API-Dokumentation.
-doclet.help.enum.intro=F\u00FCr jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
-doclet.help.enum.class.intro=F\u00FCr jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
-doclet.help.annotation_type.intro=F\u00FCr jeden Annotationstyp ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
-doclet.help.annotation_interface.intro=F\u00FCr jede Annotationsschnittstelle ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
-doclet.help.annotation_type.declaration=Deklaration des Annotationstyps
-doclet.help.annotation_interface.declaration=Deklaration der Annotationsschnittstelle
-doclet.help.annotation_type.description=Beschreibung des Annotationstyps
-doclet.help.annotation_interface.description=Beschreibung der Annotationsschnittstelle
-doclet.help.search.head=Suchen
-# Introduction to Javadoc search features, followed by a list of examples
-doclet.help.search.intro=Sie k\u00F6nnen nach Definitionen von Modulen, Packages, Typen, Feldern, Methoden, Systemeigenschaften und anderen Ausdr\u00FCcken suchen, die in der API definiert sind. Dazu k\u00F6nnen Sie denn Namen ganz oder teilweise oder optional auch Abk\u00FCrzungen mit Binnenmajuskeln ("camelCase") eingeben. Beispiel:
-# Used to list search examples, {0} is a search term and {1} the matching result
-doclet.help.search.example={0} findet {1}
-# {0} contains a link to the current Javadoc Search Specification
-doclet.help.search.refer=Eine vollst\u00E4ndige Beschreibung der Suchfeatures finden Sie in der {0}.
-# The URL for the Javadoc Search Specification. {0} will be replaced by the JDK version number
-doclet.help.search.spec.url=https://docs.oracle.com/en/java/javase/{0}/docs/specs/javadoc/javadoc-search-spec.html
-# The title for the Javadoc Search Specification
-doclet.help.search.spec.title=Javadoc-Suchspezifikation
-
-doclet.ClassUse_Packages.that.use.0=Packages, die {0} verwenden
-doclet.ClassUse_Uses.of.0.in.1=Verwendungen von {0} in {1}
-doclet.ClassUse_Classes.in.0.used.by.1=Von {1} verwendete Klassen in {0}
-doclet.ClassUse_PackageAnnotation=Packages mit Annotationen vom Typ {0}
-doclet.ClassUse_Annotation=Klassen in {1} mit Annotationen vom Typ {0}
-doclet.ClassUse_TypeParameter=Klassen in {1} mit Typparametern vom Typ {0}
-doclet.ClassUse_MethodTypeParameter=Methoden in {1} mit Typparametern vom Typ {0}
-doclet.ClassUse_FieldTypeParameter=Felder in {1} mit Typparametern vom Typ {0}
-doclet.ClassUse_FieldAnnotations=Felder in {1} mit Annotationen vom Typ {0}
-doclet.ClassUse_MethodAnnotations=Methoden in {1} mit Annotationen vom Typ {0}
-doclet.ClassUse_MethodParameterAnnotations=Methodenparameter in {1} mit Annotationen vom Typ {0}
-doclet.ClassUse_MethodReturnTypeParameter=Methoden in {1}, die Typen mit Argumenten vom Typ {0} zur\u00FCckgeben
-doclet.ClassUse_Subclass=Unterklassen von {0} in {1}
-doclet.ClassUse_Subinterface=Unterschnittstellen von {0} in {1}
-doclet.ClassUse_ImplementingClass=Klassen in {1}, die {0} implementieren
-doclet.ClassUse_Field=Felder in {1}, die deklariert sind als {0}
-doclet.ClassUse_MethodReturn=Methoden in {1}, die {0} zur\u00FCckgeben
-doclet.ClassUse_MethodArgs=Methoden in {1} mit Parametern vom Typ {0}
-doclet.ClassUse_MethodArgsTypeParameters=Methodenparameter in {1} mit Typargumenten vom Typ {0}
-doclet.ClassUse_MethodThrows=Methoden in {1}, die {0} ausl\u00F6sen
-doclet.ClassUse_ConstructorAnnotations=Konstruktoren in {1} mit Annotationen vom Typ {0}
-doclet.ClassUse_ConstructorParameterAnnotations=Konstruktorparameter in {1} mit Annotationen vom Typ {0}
-doclet.ClassUse_ConstructorArgs=Konstruktoren in {1} mit Parametern vom Typ {0}
-doclet.ClassUse_ConstructorArgsTypeParameters=Konstruktorparameter in {1} mit Typargumenten vom Typ {0}
-doclet.ClassUse_ConstructorThrows=Konstruktoren in {1}, die {0} ausl\u00F6sen
-doclet.ClassUse_No.usage.of.0=Keine Verwendung von {0}
-doclet.Window_ClassUse_Header=Verwendungsweise von {0} {1}
-doclet.ClassUse_Title=Verwendungen von {0}
-doclet.navClassUse=Verwendung
-doclet.Error_in_grouplist=Ung\u00FCltige Option -group: {0} {1}
-doclet.Groupname_already_used=In der Option -group wird der Gruppenname bereits verwendet: {0}
-doclet.Same_element_name_used=Elementname oder Muster zweimal verwendet: {0}
-doclet.PreviewLeadingNote={0} basiert auf Vorschaufeatures der Java-Plattform:
-doclet.Declared_Using_Preview={0} wird mit {1} deklariert, einem Vorschaufeature der Programmiersprache Java ({2}).
-doclet.PreviewAPI={0} bezieht sich auf mindestens eine Vorschau-API: {1}.
-doclet.ReflectivePreviewAPI={0} bezieht sich auf mindestens eine reflektive Vorschau-API: {1}.
-doclet.UsesDeclaredUsingPreview={0} bezieht sich auf mindestens einen Typ, der mit einem Vorschaufeature der Programmiersprache Java deklariert wird: {1}.
-doclet.PreviewTrailingNote1=Programme k\u00F6nnen {0} nur verwenden, wenn Vorschaufeatures aktiviert sind.
-doclet.PreviewTrailingNote2=Vorschaufeatures k\u00F6nnen in k\u00FCnftigen Releases entfernt oder zu permanenten Features der Java-Plattform hochgestuft werden.
-doclet.Declared_Using_Preview.SEALED=Verschl\u00FCsselte Klassen
-doclet.Declared_Using_Preview.SEALED_PERMITS=Verschl\u00FCsselte Klassen
-doclet.PreviewPlatformLeadingNote={0} ist eine Vorschau-API der Java-Plattform.
-doclet.ReflectivePreviewPlatformLeadingNote={0} ist eine reflektive Vorschau-API der Java-Plattform.
-
-# 0: an exception
-doclet.Error_copying_legal_notices=Fehler beim Kopieren der rechtlichen Hinweise: {0}
-# 0: the path; 1: the detail message for the exception
-doclet.Error_invalid_path_for_legal_notices=Ung\u00FCltiger Pfad "{0}" f\u00FCr rechtliche Hinweise: {1}
-
-# option specifiers
-doclet.usage.add-script.parameters=<Datei>
-doclet.usage.add-script.description=F\u00FCgt der generierten Dokumentation eine Skriptdatei hinzu
-doclet.usage.add-stylesheet.parameters=<Datei>
-doclet.usage.add-stylesheet.description=F\u00FCgt der generierten Dokumentation eine Stylesheet-Datei hinzu
-doclet.usage.d.parameters=<Verzeichnis>
-doclet.usage.d.description=Zielverzeichnis f\u00FCr Ausgabedateien
-
-doclet.usage.use.description=Verwendungsseiten f\u00FCr Klassen und Packages erstellen
-
-doclet.usage.version.description=@version-Abs\u00E4tze aufnehmen
-
-doclet.usage.author.description=@author-Abs\u00E4tze aufnehmen
-
-doclet.usage.docfilessubdirs.description=doc-file-Unterverzeichnisse rekursiv kopieren
-
-doclet.usage.splitindex.description=Index in eine Datei pro Buchstabe aufteilen
-
-doclet.usage.overview.parameters=<Datei>
-doclet.usage.overview.description=\u00DCberblickdokumentation aus HTML-Datei lesen
-
-doclet.usage.windowtitle.parameters=<Text>
-doclet.usage.windowtitle.description=Browserfenstertitel f\u00FCr die Dokumentation
-
-doclet.usage.doctitle.parameters=<HTML-Code>
-doclet.usage.doctitle.description=Titel f\u00FCr die \u00DCberblickseite aufnehmen
-
-doclet.usage.header.parameters=<HTML-Code>
-doclet.usage.header.description=Headertext f\u00FCr jede Seite aufnehmen
-
-doclet.usage.html5.description=Generiert eine HTML 5-Ausgabe. Diese Option wird nicht mehr ben\u00F6tigt.
-
-doclet.usage.footer.parameters=<HTML-Code>
-doclet.usage.footer.description=Footertext f\u00FCr jede Seite aufnehmen
-
-doclet.usage.top.parameters=<HTML-Code>
-doclet.usage.top.description=Oberen Text f\u00FCr jede Seite aufnehmen
-
-doclet.usage.bottom.parameters=<HTML-Code>
-doclet.usage.bottom.description=Unteren Text f\u00FCr jede Seite aufnehmen
-
-doclet.usage.link.parameters=< URL>
-doclet.usage.link.description=Links zur javadoc-Ausgabe unter <url> erstellen
-
-doclet.usage.linkoffline.parameters=<URL1> <URL2>
-doclet.usage.linkoffline.description=Link zu Dokumenten unter <url> mit Packageliste unter <url2> erstellen
-
-# L10N: do not localize the option parameters: warn info
-doclet.usage.link-modularity-mismatch.parameters=(warn|info)
-doclet.usage.link-modularity-mismatch.description=Meldet externe Dokumentation mit der falschen Modularit\u00E4t mit einer\nWarn- oder Informationsmeldung. Das Standardverhalten ist\nWarnen.
-
-doclet.usage.link-platform-properties.parameters=< URL>
-doclet.usage.link-platform-properties.description=Link zu Plattformdokumentations-URLs, die in der Eigenschaftendatei auf <URL> deklariert sind
-
-doclet.usage.excludedocfilessubdir.parameters=<Name>:...
-doclet.usage.excludedocfilessubdir.description=doc-files-Unterverzeichnisse mit angegebenem Namen ausschlie\u00DFen
-
-doclet.usage.group.parameters=<Name> <g1>:<g2>...
-doclet.usage.group.description=Angegebene Elemente auf \u00DCberblickseite gruppieren
-
-doclet.usage.legal-notices.parameters='default' | 'none' | <Verzeichnis>
-doclet.usage.legal-notices.description=Steuert die rechtlichen Hinweise in der generierten Ausgabe
-
-doclet.usage.nocomment.description=Beschreibung und Tags unterdr\u00FCcken und nur Deklarationen generieren
-
-doclet.usage.nodeprecated.description=@deprecated-Informationen nicht aufnehmen
-
-doclet.usage.noqualifier.parameters=<Name1>:<Name2>:...
-doclet.usage.noqualifier.description=Liste der Qualifier aus der Ausgabe ausschlie\u00DFen
-
-doclet.usage.nosince.description=@since-Informationen nicht aufnehmen
-
-doclet.usage.notimestamp.description=Ausgeblendeten Zeitstempel nicht aufnehmen
-
-doclet.usage.nodeprecatedlist.description=Veraltet-Liste nicht generieren
-
-doclet.usage.no-module-directories.description=Gruppiert Dateien f\u00FCr die Moduldokumentation nicht in \nmodulspezifischen Verzeichnisse
-
-doclet.usage.no-platform-links.description=Generiert keine Links zur Plattformdokumentation
-
-doclet.usage.notree.description=Klassenhierarchie nicht generieren
-
-doclet.usage.noindex.description=Index nicht generieren
-
-doclet.usage.nohelp.description=Hilfelink nicht generieren
-
-doclet.usage.nonavbar.description=Navigationsleiste nicht generieren
-
-doclet.usage.nooverview.description=\u00DCberblickseiten nicht generieren
-
-doclet.usage.serialwarn.description=Warnung wegen @serial-Tag generieren
-
-doclet.usage.since.parameters=<Release>(,<Release>)*
-doclet.usage.since.description=Dokumentiert die neue und die veraltete API in den angegebenen Releases
-
-doclet.usage.since-label.parameters=<Text>
-doclet.usage.since-label.description=Liefert Text f\u00FCr die \u00DCberschrift der Seite "Neue API"
-
-doclet.usage.tag.parameters=<Name>:<Positionen>:<Header>
-doclet.usage.tag.description=Benutzerdefinierte Tags mit einem Argument angeben
-
-doclet.usage.taglet.description=Vollqualifizierter Name des zu registrierenden Taglets
-
-doclet.usage.tagletpath.description=Pfad zu Taglets
-
-doclet.usage.snippet-path.parameters=<Pfad>
-
-doclet.usage.snippet-path.description=Der Pfad f\u00FCr externe Snippets
-
-doclet.usage.charset.parameters=<Zeichensatz>
-doclet.usage.charset.description=Zeichensatz f\u00FCr plattform\u00FCbergreifende Anzeige der generierten Dokumentation
-
-doclet.usage.javafx.description=Aktiviert die JavaFX-Funktionalit\u00E4t
-
-doclet.usage.helpfile.parameters=<Datei>
-doclet.usage.helpfile.description=Datei aufnehmen, zu der der Hilfelink verlinkt
-
-doclet.usage.linksource.description=Quelle in HTML generieren
-
-doclet.usage.sourcetab.parameters=<Tabulatorl\u00E4nge>
-doclet.usage.sourcetab.description=Anzahl der Leerzeichen angeben, die jedes Register in der Quelle beansprucht
-
-doclet.usage.keywords.description=HTML-Metatags mit Informationen zu Package, Klasse und Member aufnehmen
-
-doclet.usage.main-stylesheet.parameters=<Datei>
-doclet.usage.main-stylesheet.description=Datei zum \u00C4ndern des Stils der generierten Dokumentation
-
-doclet.usage.docencoding.parameters=<Name>
-doclet.usage.docencoding.description=Zeichensatzcodierung f\u00FCr die Ausgabe angeben
-
-doclet.usage.frames.description=Aktiviert die Verwendung von Frames in der generierten Ausgabe
-
-doclet.usage.no-frames.description=Deaktiviert die Verwendung von Frames in der generierten Ausgabe (Standard)
-
-doclet.usage.override-methods.parameters=(detail|summary)
-
-doclet.usage.override-methods.description=Au\u00DFer Kraft gesetzte Methoden im Abschnitt "detail" oder "summary" dokumentieren
-
-doclet.usage.allow-script-in-comments.description=JavaScript in Optionen und Kommentaren zulassen
-
-doclet.usage.xdocrootparent.parameters=< URL>
-doclet.usage.xdocrootparent.description=Ersetzt alle Vorkommen von @docRoot gefolgt von /.. in doc-Kommentaren durch\n<url>
-
-doclet.usage.xdoclint.description=Empfohlene Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren
-
-doclet.usage.xdoclint-extended.parameters=(all|none|[-]<Gruppe>)
-# L10N: do not localize these words: all none accessibility html missing reference syntax
-doclet.usage.xdoclint-extended.description=Bestimmte Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren\noder deaktivieren, wobei <group> einen der folgenden Werte hat:\naccessibility, html, missing, reference oder syntax.
-
-doclet.usage.xdoclint-package.parameters=([-]<Packages>)
-doclet.usage.xdoclint-package.description=Pr\u00FCfungen in bestimmten Packages aktivieren oder deaktivieren.\n<packages> ist eine durch Komma getrennte Liste von Packagebezeichnern.\nEin Packagebezeichner ist entweder ein vollst\u00E4ndiger Name oder ein Namenspr\u00E4fix\neines Packages, gefolgt von .*, und bezieht sich auf alle Unterpackages\ndes angegebenen Packages. Stellen Sie dem Packagebezeichner - voran,\num Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.
-
-# L10N: do not localize the option name --no-frames
-doclet.NoFrames_specified=Die Option --no-frames wird nicht mehr ben\u00F6tigt und wird m\u00F6glicherweise\nin einem zuk\u00FCnftigen Release entfernt.
-
-# L10N: do not localize the option name -footer
-doclet.footer_specified=Die Option -footer wird nicht mehr unterst\u00FCtzt und wird ignoriert.\nSie wird m\u00F6glicherweise in einem zuk\u00FCnftigen Release entfernt.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
index 648985e4234..ec702dad3e4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
@@ -29,7 +29,6 @@ doclet.Overview=\u6982\u8981
 doclet.Window_Overview_Summary=\u6982\u8981
 doclet.Element=\u8981\u7D20
 doclet.Package=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Unnamed_Package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.Module=\u30E2\u30B8\u30E5\u30FC\u30EB
 doclet.Open_Module=\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u958B\u304F
 doclet.All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
@@ -40,24 +39,17 @@ doclet.Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Window_Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
 doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64
-doclet.Enum_Class_Hierarchy=\u5217\u6319\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64
-doclet.Annotation_Interface_Hierarchy=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
 doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9
 doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8
-doclet.Href_Annotation_Interface_Title={0}\u5185\u306E\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
-doclet.Href_Enum_Class_Title={0}\u306E\u5217\u6319\u30AF\u30E9\u30B9
 doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
 doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Summary=\u6982\u8981:
 doclet.Detail=\u8A73\u7D30:
 doclet.Module_Sub_Nav=\u30E2\u30B8\u30E5\u30FC\u30EB:
-doclet.Help_Sub_Nav=\u30D8\u30EB\u30D7:
-doclet.Package_Sub_Nav=\u30D1\u30C3\u30B1\u30FC\u30B8:
-doclet.navClassesAndInterfaces=\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.navDescription=\u8AAC\u660E
+doclet.navModuleDescription=\u8AAC\u660E
 doclet.navModules=\u30E2\u30B8\u30E5\u30FC\u30EB
 doclet.navPackages=\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.navServices=\u30B5\u30FC\u30D3\u30B9
@@ -70,20 +62,16 @@ doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.navEnum=\u5217\u6319\u5B9A\u6570
 doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
-doclet.navNavigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-doclet.navPages=\u30DA\u30FC\u30B8
 doclet.not.exhaustive=(\u7DB2\u7F85\u7684\u3067\u306A\u3044)
 doclet.Index=\u7D22\u5F15
 doclet.Window_Single_Index=\u7D22\u5F15
 doclet.Window_Split_Index={0}\u306E\u7D22\u5F15
 doclet.Help=\u30D8\u30EB\u30D7
 doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
-doclet.Toggle_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u306E\u5207\u66FF\u3048
 doclet.Navigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+doclet.New_Page=NewPage
 doclet.navDeprecated=\u975E\u63A8\u5968
 doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
-doclet.Window_New_List=\u65B0\u898FAPI\u30EA\u30B9\u30C8
-doclet.Window_Preview_List=\u30EA\u30B9\u30C8\u306E\u30D7\u30EC\u30D3\u30E5\u30FC
 doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9:
 doclet.in_class=\u30AF\u30E9\u30B9\u5185
 doclet.Element_in={0}\u306E\u8981\u7D20
@@ -103,33 +91,14 @@ doclet.URL_error=URL\u53D6\u51FA\u3057\u30A8\u30E9\u30FC: {0}
 doclet.Resource_error=\u30EA\u30BD\u30FC\u30B9\u8AAD\u53D6\u308A\u30A8\u30E9\u30FC: {0}
 doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1}
 doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
-doclet.see.nested_link=\u30BF\u30B0{0}: \u30EA\u30F3\u30AF\u304C\u30CD\u30B9\u30C8\u3055\u308C\u3066\u3044\u307E\u3059
 doclet.tag.invalid_usage=\u30BF\u30B0{0}\u306E\u4F7F\u7528\u65B9\u6CD5\u304C\u7121\u52B9\u3067\u3059
-doclet.tag.invalid_input=\u5165\u529B\u304C\u7121\u52B9\u3067\u3059: ''{0}''
-doclet.tag.invalid=@{0}\u304C\u7121\u52B9\u3067\u3059
 doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API
-doclet.Deprecated_Elements=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044{0}
-doclet.Deprecated_In_Release={0}\u3067\u975E\u63A8\u5968
-doclet.Deprecated_Tabs_Intro=(\u5DE6\u7AEF\u306E\u30BF\u30D6\u300C\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044...\u300D\u306F\u3001\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u30EA\u30EA\u30FC\u30B9\u306B\u95A2\u4FC2\u306A\u304F\u3001\u3059\u3079\u3066\u306E\u975E\u63A8\u5968\u306E\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30BF\u30D6\u300C...\u3067\u975E\u63A8\u5968\u300D\u306E\u305D\u308C\u305E\u308C\u306F\u3001\u7279\u5B9A\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002)
-doclet.New_API=\u65B0\u898FAPI
-doclet.New_Elements=\u65B0\u898F{0}
-doclet.New_Elements_Added_In_Release={0}\u3067\u8FFD\u52A0
-doclet.New_Label=\u65B0\u898F
-doclet.New_Tabs_Intro=(\u5DE6\u7AEF\u306E\u30BF\u30D6\u300C\u65B0\u898F...\u300D\u306F\u3001\u8FFD\u52A0\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u306B\u95A2\u4FC2\u306A\u304F\u3001\u3059\u3079\u3066\u306E\u65B0\u898F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30BF\u30D6\u300C...\u3067\u8FFD\u52A0\u300D\u306E\u305D\u308C\u305E\u308C\u306F\u3001\u7279\u5B9A\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u8FFD\u52A0\u3055\u308C\u305F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u5DE6\u7AEF\u306E\u30BF\u30D6\u3067\u8868\u793A\u3055\u308C\u305F\u8981\u7D20\u306F\u53F3\u7AEF\u306E\u30BF\u30D6\u306E\u3044\u305A\u308C\u304B\u306E\u4E0B\u306B\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002)
-doclet.Preview_API=\u30D7\u30EC\u30D3\u30E5\u30FCAPI
-doclet.Preview_Label=\u30D7\u30EC\u30D3\u30E5\u30FC
-doclet.Preview_Mark=PREVIEW
-doclet.Terminally_Deprecated=\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968
-doclet.Terminally_Deprecated_Elements=\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u8981\u7D20
-doclet.Terminally_Deprecated_In_Release={0}\u3067\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968
+doclet.For_Removal=\u524A\u9664\u7528
 doclet.Annotation_Types=\u6CE8\u91C8\u578B
-doclet.Annotation_Interfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Annotation_Type_Members=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.Annotation_Interface_Members=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
+doclet.for_removal=\u524A\u9664\u7528
 doclet.annotation_types=\u6CE8\u91C8\u578B
-doclet.annotation_interfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotation_type_members=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.annotation_interface_members=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
 doclet.Generated_Docs_Untitled=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8(\u30BF\u30A4\u30C8\u30EB\u306A\u3057)
 doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.Description=\u8AAC\u660E
@@ -144,7 +113,6 @@ doclet.also=\u540C\u69D8\u306B
 doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64:
 doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64
 doclet.Hierarchy_For_All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
-doclet.Hierarchy_For_Unnamed_Package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
 doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
 doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
 doclet.Description_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
@@ -160,74 +128,43 @@ doclet.systemPropertiesSummary=\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\
 doclet.Window_Source_title=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9
 doclet.Window_Help_title=API\u30D8\u30EB\u30D7
 
-doclet.help.main_heading=JavaDoc\u30D8\u30EB\u30D7
-doclet.help.navigation.head=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-# 0: link to the Overview page
-doclet.help.navigation.intro={0}\u30DA\u30FC\u30B8\u304B\u3089\u3001\u5404\u30DA\u30FC\u30B8\u304A\u3088\u3073\u5404\u30DA\u30FC\u30B8\u306E\u4E0A\u90E8\u306B\u3042\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3067\u30EA\u30F3\u30AF\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3067\u304D\u307E\u3059\u3002
-# 0: link to the Index;  1: short list of links
-doclet.help.navigation.index={0}\u304A\u3088\u3073\u691C\u7D22\u30DC\u30C3\u30AF\u30B9\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u6B21\u3092\u542B\u3081\u3001\u7279\u5B9A\u306E\u5BA3\u8A00\u304A\u3088\u3073\u6982\u8981\u30DA\u30FC\u30B8\u306B\u30CA\u30D3\u30B2\u30FC\u30C8\u3067\u304D\u307E\u3059: {1}
-doclet.help.page_kinds.head=\u30DA\u30FC\u30B8\u306E\u7A2E\u985E
-doclet.help.page_kinds.intro=\u6B21\u306E\u5404\u30BB\u30AF\u30B7\u30E7\u30F3\u3067\u306F\u3001\u3053\u306E\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u69D8\u3005\u306A\u7A2E\u985E\u306E\u30DA\u30FC\u30B8\u306B\u3064\u3044\u3066\u8AAC\u660E\u3057\u307E\u3059\u3002
-# 0: link to the Overview page
+doclet.help.main_heading=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
+doclet.help.intro=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
 doclet.help.overview.modules.body={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30E2\u30B8\u30E5\uFF0D\u30EB\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-# 0: link to the Overview page
 doclet.help.overview.packages.body={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.help.package.intro=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F\u6B21\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
-doclet.help.module.intro=\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u305D\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u4F9D\u5B58\u6027\u3001\u304A\u3088\u3073\u30B5\u30FC\u30D3\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F\u6B21\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
+doclet.help.package.intro=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
+doclet.help.module.intro=\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u305D\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u4F9D\u5B58\u6027\u3001\u304A\u3088\u3073\u30B5\u30FC\u30D3\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F3\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
 doclet.help.class_interface.head=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.help.class_interface.intro=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u5BA3\u8A00\u304A\u3088\u3073\u8AAC\u660E\u3068\u3001\u30E1\u30F3\u30D0\u30FC\u306E\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304B\u3089\u69CB\u6210\u3055\u308C\u308B3\u3064\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u5404\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u7A7A\u304B\u9069\u7528\u3067\u304D\u306A\u3044\u5834\u5408\u306F\u7701\u7565\u3055\u308C\u307E\u3059\u3002
+doclet.help.class_interface.intro=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
 doclet.help.class_interface.inheritance_diagram=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
 doclet.help.class_interface.subclasses=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
 doclet.help.class_interface.subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8
 doclet.help.class_interface.implementations=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8
 doclet.help.class_interface.declaration=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
 doclet.help.class_interface.description=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
-doclet.help.class_interface.member_order=\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
-doclet.help.class_interface.note=\u30CE\u30FC\u30C8:
-doclet.help.class_interface.anno=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u3001\u5FC5\u9808\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8981\u7D20\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u30E1\u30BD\u30C3\u30C9\u306F\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-doclet.help.class_interface.enum=\u5217\u6319\u30AF\u30E9\u30B9\u306E\u307F\u306B\u5217\u6319\u5B9A\u6570\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.help.class_interface.record=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u5BA3\u8A00\u306E\u4E00\u90E8\u3068\u3057\u3066\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.help.class_interface.property=\u30D7\u30ED\u30D1\u30C6\u30A3\u306FJavaFX\u306E\u6A5F\u80FD\u3067\u3059\u3002
-doclet.help.other_files.head=\u305D\u306E\u4ED6\u306E\u30D5\u30A1\u30A4\u30EB
-doclet.help.other_files.body=\u30D1\u30C3\u30B1\u30FC\u30B8\u304A\u3088\u3073\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u5468\u8FBA\u306E\u5BA3\u8A00\u306B\u95A2\u9023\u3059\u308B\u8FFD\u52A0\u60C5\u5831\u304C\u8A18\u8F09\u3055\u308C\u3066\u3044\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.help.class_interface.summary=\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
 doclet.help.use.head=\u4F7F\u7528
-doclet.help.use.body=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+doclet.help.use.body=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 doclet.help.tree.head=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64)
-# 0: link to main Class Hierarchy page;  1: java.lang.Object
 doclet.help.tree.intro=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F{0}\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u3055\u3089\u306B\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u968E\u5C64\u30DA\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3092\u542B\u307F\u307E\u3059\u3002\u30AF\u30E9\u30B9\u306F{1}\u3092\u958B\u59CB\u70B9\u3068\u3059\u308B\u7D99\u627F\u69CB\u9020\u3067\u7DE8\u6210\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3001{1}\u304B\u3089\u306F\u7D99\u627F\u3057\u307E\u305B\u3093\u3002
 doclet.help.tree.overview=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
 doclet.help.tree.package=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u8A72\u5F53\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u307F\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-# 0: link to the Deprecated summary page
 doclet.help.deprecated.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u3059\u3079\u3066\u306EAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u975E\u63A8\u5968API\u3068\u306F\u3001\u6A5F\u80FD\u304C\u4E0D\u5341\u5206\u3067\u3042\u308B\u3068\u3044\u3063\u305F\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968API\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-# 0: link to the Preview summary page
-doclet.help.preview.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u3059\u3079\u3066\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.help.new.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u6700\u8FD1\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u8FFD\u52A0\u3055\u308C\u305FAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002
 doclet.help.index.head=\u7D22\u5F15
-# 0: link to Index page;  1: list of links to pages
-doclet.help.index.body={0}\u306B\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u3068\u3001{1}\u306A\u3069\u306E\u6982\u8981\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.help.all_classes.head=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-# 0: link to All Classes page
-doclet.help.all_classes.body={0}\u306B\u306F\u3001\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u5217\u6319\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306A\u3069\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u542B\u307E\u308C\u308B\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.help.all_packages.head=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-# 0: link to All Packages page
-doclet.help.all_packages.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u542B\u307E\u308C\u308B\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.index.body={0}\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3068\u3001\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u304A\u3088\u3073\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
 doclet.help.serial_form.body=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u306E\u3067\u306F\u306A\u304F\u3001\u5B9F\u88C5\u3059\u308B\u30E6\u30FC\u30B6\u30FC\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
-# 0: link to Constant Values page
 doclet.help.constants.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
-# 0: link to System Properties page
 doclet.help.systemProperties.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3078\u306E\u53C2\u7167\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
 doclet.help.footnote=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u306B\u3088\u3063\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
-doclet.help.enum.intro=\u5404\u5217\u6319\u30AF\u30E9\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
-doclet.help.enum.class.intro=\u5404\u5217\u6319\u30AF\u30E9\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
+doclet.help.enum.intro=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
+doclet.help.enum.declaration=\u5217\u6319\u5BA3\u8A00
+doclet.help.enum.definition=\u5217\u6319\u578B\u306E\u8AAC\u660E
 doclet.help.annotation_type.intro=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
-doclet.help.annotation_interface.intro=\u5404\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
 doclet.help.annotation_type.declaration=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00
-doclet.help.annotation_interface.declaration=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
 doclet.help.annotation_type.description=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E
-doclet.help.annotation_interface.description=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
 doclet.help.search.head=\u691C\u7D22
 # Introduction to Javadoc search features, followed by a list of examples
-doclet.help.search.intro=\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30BF\u30A4\u30D7\u3001\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5B9A\u7FA9\u304A\u3088\u3073API\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u305D\u306E\u4ED6\u306E\u8A9E\u3092\u3001\u540D\u524D\u306E\u4E00\u90E8\u307E\u305F\u306F\u5168\u4F53\u3092\u4F7F\u7528\u3057\u3066(\u5FC5\u8981\u306B\u5FDC\u3058\u3066camelCase\u306E\u7701\u7565\u5F62\u3092\u4F7F\u7528\u3057\u3066)\u691C\u7D22\u3067\u304D\u307E\u3059\u3002\u4F8B:
+doclet.help.search.intro=\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30BF\u30A4\u30D7\u3001\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u304A\u3088\u3073API\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u305D\u306E\u4ED6\u306E\u8A9E\u3092\u3001\u540D\u524D\u306E\u4E00\u90E8\u307E\u305F\u306F\u5168\u4F53\u3092\u4F7F\u7528\u3057\u3066(\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u30AD\u30E3\u30E1\u30EB\u30B1\u30FC\u30B9\u306E\u7701\u7565\u5F62\u3092\u4F7F\u7528\u3057\u3066)\u691C\u7D22\u3067\u304D\u307E\u3059\u3002\u4F8B:
 # Used to list search examples, {0} is a search term and {1} the matching result
 doclet.help.search.example={0}\u306F{1}\u3068\u4E00\u81F4\u3057\u307E\u3059
 # {0} contains a link to the current Javadoc Search Specification
@@ -269,28 +206,10 @@ doclet.navClassUse=\u4F7F\u7528
 doclet.Error_in_grouplist=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059: {0} {1}
 doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3001\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
 doclet.Same_element_name_used=\u8981\u7D20\u540D\u307E\u305F\u306F\u30D1\u30BF\u30FC\u30F3\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.PreviewLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3057\u307E\u3059\u3002
-doclet.Declared_Using_Preview={0}\u306F{1}\u3001Java\u8A00\u8A9E\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD({2})\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u307E\u3059\u3002
-doclet.PreviewAPI={0}\u306F1\u3064\u4EE5\u4E0A\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059:  {1}\u3002
-doclet.ReflectivePreviewAPI={0}\u306F1\u3064\u4EE5\u4E0A\u306E\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059:  {1}\u3002
-doclet.UsesDeclaredUsingPreview={0}\u306F\u3001Java\u8A00\u8A9E\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30011\u3064\u4EE5\u4E0A\u306E\u30BF\u30A4\u30D7\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: {1}\u3002
-doclet.PreviewTrailingNote1=\u30D7\u30ED\u30B0\u30E9\u30E0\u306F\u3001\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u306B\u306E\u307F{0}\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-doclet.PreviewTrailingNote2=\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306F\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u304B\u3001Java\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u6C38\u7D9A\u7684\u306A\u6A5F\u80FD\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.Declared_Using_Preview.SEALED=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
-doclet.Declared_Using_Preview.SEALED_PERMITS=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
-doclet.PreviewPlatformLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3059\u3002
-doclet.ReflectivePreviewPlatformLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3059\u3002
-
-# 0: an exception
-doclet.Error_copying_legal_notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u30B3\u30D4\u30FC\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
-# 0: the path; 1: the detail message for the exception
-doclet.Error_invalid_path_for_legal_notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u30D1\u30B9''{0}''\u304C\u7121\u52B9\u3067\u3059: {1}
 
 # option specifiers
-doclet.usage.add-script.parameters=<file>
-doclet.usage.add-script.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30B9\u30AF\u30EA\u30D7\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059
 doclet.usage.add-stylesheet.parameters=<file>
-doclet.usage.add-stylesheet.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059
+doclet.usage.add-stylesheet.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u8FFD\u52A0\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
 doclet.usage.d.parameters=<directory>
 doclet.usage.d.description=\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
 
@@ -333,10 +252,6 @@ doclet.usage.link.description=<url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u
 doclet.usage.linkoffline.parameters=<url1> <url2>
 doclet.usage.linkoffline.description=<url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url1>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059
 
-# L10N: do not localize the option parameters: warn info
-doclet.usage.link-modularity-mismatch.parameters=(warn|info)
-doclet.usage.link-modularity-mismatch.description=\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u305F\u306F\u60C5\u5831\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u542B\u3080\u4E0D\u6B63\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u6027\u306E\n\u5916\u90E8\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u5831\u544A\u3067\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u52D5\u4F5C\u306F\n\u8B66\u544A\u306E\u5831\u544A\u3067\u3059\u3002
-
 doclet.usage.link-platform-properties.parameters=<url>
 doclet.usage.link-platform-properties.description=<url>\u306B\u3042\u308B\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306EURL\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059
 
@@ -346,9 +261,6 @@ doclet.usage.excludedocfilessubdir.description=\u6307\u5B9A\u3055\u308C\u305F\u5
 doclet.usage.group.parameters=<name> <g1>:<g2>...
 doclet.usage.group.description=\u6307\u5B9A\u3059\u308B\u8981\u7D20\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3057\u307E\u3059
 
-doclet.usage.legal-notices.parameters='default' | 'none' | <directory>
-doclet.usage.legal-notices.description=\u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u3092\u5236\u5FA1\u3057\u307E\u3059
-
 doclet.usage.nocomment.description=\u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3057\u307E\u3059
 
 doclet.usage.nodeprecated.description=@deprecated\u60C5\u5831\u3092\u9664\u5916\u3057\u307E\u3059
@@ -378,12 +290,6 @@ doclet.usage.nooverview.description=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u751F\u
 
 doclet.usage.serialwarn.description=@serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3057\u307E\u305B\u3093
 
-doclet.usage.since.parameters=<release>(,<release>)*
-doclet.usage.since.description=\u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u306E\u65B0\u898F\u304A\u3088\u3073\u975E\u63A8\u5968\u306EAPI\u3092\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u307E\u3059
-
-doclet.usage.since-label.parameters=<text>
-doclet.usage.since-label.description=\u300C\u65B0\u898FAPI\u300D\u30DA\u30FC\u30B8\u306E\u898B\u51FA\u3057\u3067\u4F7F\u7528\u3059\u308B\u30C6\u30AD\u30B9\u30C8\u3092\u6307\u5B9A\u3057\u307E\u3059
-
 doclet.usage.tag.parameters=<name>:<locations>:<header>
 doclet.usage.tag.description=\u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059
 
@@ -391,10 +297,6 @@ doclet.usage.taglet.description=\u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168
 
 doclet.usage.tagletpath.description=\u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9
 
-doclet.usage.snippet-path.parameters=<path>
-
-doclet.usage.snippet-path.description=\u5916\u90E8\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9
-
 doclet.usage.charset.parameters=<charset>
 doclet.usage.charset.description=\u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30BB\u30C3\u30C8
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
index e2a26b0dfcd..0615fb283e5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
@@ -29,7 +29,6 @@ doclet.Overview=\u6982\u89C8
 doclet.Window_Overview_Summary=\u6982\u89C8
 doclet.Element=\u5143\u7D20
 doclet.Package=\u7A0B\u5E8F\u5305
-doclet.Unnamed_Package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305
 doclet.Module=\u6A21\u5757
 doclet.Open_Module=\u6253\u5F00\u6A21\u5757
 doclet.All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305
@@ -40,24 +39,17 @@ doclet.Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Window_Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
 doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784
-doclet.Enum_Class_Hierarchy=\u679A\u4E3E\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Annotation_Type_Hierarchy=\u6CE8\u91CA\u7C7B\u578B\u5206\u5C42\u7ED3\u6784
-doclet.Annotation_Interface_Hierarchy=\u6CE8\u91CA\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
 doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B
 doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3
 doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6CE8\u91CA
-doclet.Href_Annotation_Interface_Title={0} \u4E2D\u7684\u6CE8\u91CA\u63A5\u53E3
 doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E
-doclet.Href_Enum_Class_Title={0} \u4E2D\u7684\u679A\u4E3E\u7C7B
 doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570
 doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3
 doclet.Summary=\u6982\u8981:
 doclet.Detail=\u8BE6\u7EC6\u8D44\u6599:
 doclet.Module_Sub_Nav=\u6A21\u5757:
-doclet.Help_Sub_Nav=\u5E2E\u52A9\uFF1A
-doclet.Package_Sub_Nav=\u7A0B\u5E8F\u5305\uFF1A
-doclet.navClassesAndInterfaces=\u7C7B\u548C\u63A5\u53E3
-doclet.navDescription=\u8BF4\u660E
+doclet.navModuleDescription=\u8BF4\u660E
 doclet.navModules=\u6A21\u5757
 doclet.navPackages=\u7A0B\u5E8F\u5305
 doclet.navServices=\u670D\u52A1
@@ -70,20 +62,16 @@ doclet.navProperty=\u5C5E\u6027
 doclet.navEnum=\u679A\u4E3E\u5E38\u91CF
 doclet.navConstructor=\u6784\u9020\u5668
 doclet.navMethod=\u65B9\u6CD5
-doclet.navNavigation=\u5BFC\u822A
-doclet.navPages=\u9875
 doclet.not.exhaustive=\uFF08\u975E\u8BE6\u5C3D\uFF09
 doclet.Index=\u7D22\u5F15
 doclet.Window_Single_Index=\u7D22\u5F15
 doclet.Window_Split_Index={0} - \u7D22\u5F15
 doclet.Help=\u5E2E\u52A9
 doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
-doclet.Toggle_navigation_links=\u5207\u6362\u5BFC\u822A\u94FE\u63A5
 doclet.Navigation=\u5BFC\u822A
+doclet.New_Page=NewPage
 doclet.navDeprecated=\u5DF2\u8FC7\u65F6
 doclet.Window_Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
-doclet.Window_New_List=\u65B0 API \u5217\u8868
-doclet.Window_Preview_List=\u9884\u89C8\u5217\u8868
 doclet.Overrides=\u8986\u76D6:
 doclet.in_class=\u5728\u7C7B\u4E2D
 doclet.Element_in={0} \u4E2D\u7684\u5143\u7D20
@@ -103,33 +91,14 @@ doclet.URL_error=\u83B7\u53D6 URL \u65F6\u51FA\u9519: {0}
 doclet.Resource_error=\u8BFB\u53D6\u8D44\u6E90\u65F6\u51FA\u9519\uFF1A{0}
 doclet.see.class_or_package_not_found=\u6807\u8BB0{0}: \u627E\u4E0D\u5230\u5F15\u7528: {1}
 doclet.see.class_or_package_not_accessible=\u6807\u8BB0{0}: \u65E0\u6CD5\u8BBF\u95EE\u5F15\u7528: {1}
-doclet.see.nested_link=\u6807\u8BB0 {0}\uFF1A\u5D4C\u5957\u94FE\u63A5
 doclet.tag.invalid_usage=\u6807\u8BB0 {0} \u7684\u7528\u6CD5\u65E0\u6548
-doclet.tag.invalid_input=\u65E0\u6548\u8F93\u5165\uFF1A''{0}''
-doclet.tag.invalid=@{0} \u65E0\u6548
 doclet.Deprecated_API=\u5DF2\u8FC7\u65F6\u7684 API
-doclet.Deprecated_Elements=\u5DF2\u8FC7\u65F6\u7684 {0}
-doclet.Deprecated_In_Release=\u5728 {0} \u4E2D\u5DF2\u8FC7\u65F6
-doclet.Deprecated_Tabs_Intro=\uFF08\u6700\u5DE6\u4FA7\u7684\u9009\u9879\u5361\u201C\u5DF2\u8FC7\u65F6...\u201D\u6307\u793A\u6240\u6709\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20\uFF0C\u65E0\u8BBA\u5B83\u4EEC\u5728\u54EA\u4E2A\u53D1\u884C\u7248\u4E2D\u5DF2\u8FC7\u65F6\u3002\u5176\u4ED6\u6BCF\u4E2A\u201C\u5728...\u4E2D\u5DF2\u8FC7\u65F6\u201D\u9009\u9879\u5361\u6307\u793A\u5728\u7279\u5B9A\u53D1\u884C\u7248\u4E2D\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20\u3002\uFF09
-doclet.New_API=\u65B0\u5EFA API
-doclet.New_Elements=\u65B0\u5EFA {0}
-doclet.New_Elements_Added_In_Release=\u5728 {0} \u4E2D\u5DF2\u6DFB\u52A0
-doclet.New_Label=\u65B0\u5EFA
-doclet.New_Tabs_Intro=\uFF08\u6700\u5DE6\u4FA7\u7684\u9009\u9879\u5361\u201C\u65B0\u5EFA...\u201D\u6307\u793A\u6240\u6709\u65B0\u5143\u7D20\uFF0C\u65E0\u8BBA\u5B83\u4EEC\u662F\u54EA\u4E2A\u53D1\u884C\u7248\u4E2D\u6DFB\u52A0\u7684\u3002\u5176\u4ED6\u6BCF\u4E2A\u201C\u5728...\u4E2D\u5DF2\u6DFB\u52A0\u201D\u9009\u9879\u5361\u6307\u793A\u5728\u7279\u5B9A\u53D1\u884C\u7248\u4E2D\u6DFB\u52A0\u7684\u65B0\u5143\u7D20\u3002\u6700\u5DE6\u4FA7\u9009\u9879\u5361\u4E0B\u663E\u793A\u7684\u4EFB\u4F55\u5143\u7D20\u4E5F\u4F1A\u663E\u793A\u5728\u53F3\u4FA7\u9009\u9879\u5361\u4E4B\u4E00\u4E0B\u3002\uFF09
-doclet.Preview_API=\u9884\u89C8 API
-doclet.Preview_Label=\u9884\u89C8
-doclet.Preview_Mark=PREVIEW
-doclet.Terminally_Deprecated=\u6700\u7EC8\u5DF2\u8FC7\u65F6
-doclet.Terminally_Deprecated_Elements=\u6700\u7EC8\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20
-doclet.Terminally_Deprecated_In_Release=\u6700\u7EC8\u5728 {0} \u4E2D\u5DF2\u8FC7\u65F6
+doclet.For_Removal=\u5F85\u5220\u9664
 doclet.Annotation_Types=\u6CE8\u91CA\u7C7B\u578B
-doclet.Annotation_Interfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.Annotation_Type_Members=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
-doclet.Annotation_Interface_Members=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
+doclet.for_removal=\u5F85\u5220\u9664
 doclet.annotation_types=\u6CE8\u91CA\u7C7B\u578B
-doclet.annotation_interfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotation_type_members=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
-doclet.annotation_interface_members=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
 doclet.Generated_Docs_Untitled=\u751F\u6210\u7684\u6587\u6863 (\u65E0\u6807\u9898)
 doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
 doclet.Description=\u8BF4\u660E
@@ -144,7 +113,6 @@ doclet.also=\u5E76
 doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784:
 doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784
 doclet.Hierarchy_For_All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
-doclet.Hierarchy_For_Unnamed_Package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
 doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002
 doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E:
 doclet.Description_From_Class=\u4ECE\u7C7B\u590D\u5236\u7684\u8BF4\u660E:
@@ -160,71 +128,40 @@ doclet.systemPropertiesSummary=\u7CFB\u7EDF\u5C5E\u6027\u6982\u8981
 doclet.Window_Source_title=\u6E90\u4EE3\u7801
 doclet.Window_Help_title=API \u5E2E\u52A9
 
-doclet.help.main_heading=JavaDoc \u5E2E\u52A9
-doclet.help.navigation.head=\u5BFC\u822A
-# 0: link to the Overview page
-doclet.help.navigation.intro=\u4ECE {0} \u9875\u5F00\u59CB\uFF0C\u60A8\u53EF\u4EE5\u4F7F\u7528\u6BCF\u9875\u4E2D\u7684\u94FE\u63A5\u4EE5\u53CA\u6BCF\u9875\u9876\u90E8\u5BFC\u822A\u680F\u4E2D\u7684\u94FE\u63A5\u6765\u6D4F\u89C8\u6587\u6863\u3002
-# 0: link to the Index;  1: short list of links
-doclet.help.navigation.index=\u4F7F\u7528 {0} \u548C\u641C\u7D22\u6846\u53EF\u4EE5\u5BFC\u822A\u5230\u7279\u5B9A\u58F0\u660E\u548C\u6982\u8981\u9875\uFF0C\u5305\u62EC\uFF1A{1}
-doclet.help.page_kinds.head=\u9875\u9762\u7C7B\u578B
-doclet.help.page_kinds.intro=\u4EE5\u4E0B\u5404\u90E8\u5206\u4ECB\u7ECD\u4E86\u6B64\u96C6\u5408\u4E2D\u4E0D\u540C\u7C7B\u578B\u7684\u9875\u9762\u3002
-# 0: link to the Overview page
+doclet.help.main_heading=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F
+doclet.help.intro=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002
 doclet.help.overview.modules.body={0} \u9875\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875\uFF0C\u63D0\u4F9B\u4E86\u6240\u6709\u6A21\u5757\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u6A21\u5757\u7684\u603B\u4F53\u8BF4\u660E\u3002
-# 0: link to the Overview page
 doclet.help.overview.packages.body={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002
-doclet.help.package.intro=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4EE5\u4E0B\u7C7B\u522B\uFF1A
-doclet.help.module.intro=\u6BCF\u4E2A\u6A21\u5757\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7A0B\u5E8F\u5305\u3001\u4E0E\u5176\u4ED6\u6A21\u5757\u7684\u4F9D\u8D56\u5173\u7CFB\u548C\u670D\u52A1\u7684\u5217\u8868\u4EE5\u53CA\u5404\u4E2A\u6A21\u5757\u7684\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4EE5\u4E0B\u7C7B\u522B\uFF1A
+doclet.help.package.intro=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u516D\u4E2A\u7C7B\u522B\uFF1A
+doclet.help.module.intro=\u6BCF\u4E2A\u6A21\u5757\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7A0B\u5E8F\u5305\u3001\u4E0E\u5176\u4ED6\u6A21\u5757\u7684\u4F9D\u8D56\u5173\u7CFB\u548C\u670D\u52A1\u7684\u5217\u8868\u4EE5\u53CA\u6A21\u5757\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4E09\u4E2A\u7C7B\u522B\uFF1A
 doclet.help.class_interface.head=\u7C7B\u6216\u63A5\u53E3
-doclet.help.class_interface.intro=\u6BCF\u4E2A\u7C7B\u3001\u63A5\u53E3\u3001\u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u81EA\u5DF1\u72EC\u7ACB\u7684\u9875\u9762\u3002\u5982\u679C\u8FD9\u4E9B\u90E8\u5206\u4E2D\u6BCF\u4E2A\u90E8\u5206\u7684\u6761\u76EE\u4E3A\u7A7A\u6216\u4E0D\u9002\u7528\uFF0C\u5219\u7701\u7565\u8FD9\u4E9B\u6761\u76EE\u3002
+doclet.help.class_interface.intro=\u6BCF\u4E2A\u7C7B, \u63A5\u53E3, \u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\u3002\u5176\u4E2D\u6BCF\u4E2A\u9875\u9762\u90FD\u7531\u4E09\u90E8\u5206 (\u7C7B/\u63A5\u53E3\u8BF4\u660E, \u6982\u8981\u8868, \u4EE5\u53CA\u8BE6\u7EC6\u7684\u6210\u5458\u8BF4\u660E) \u7EC4\u6210:
 doclet.help.class_interface.inheritance_diagram=\u7C7B\u7EE7\u627F\u56FE
 doclet.help.class_interface.subclasses=\u76F4\u63A5\u5B50\u7C7B
 doclet.help.class_interface.subinterfaces=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3
 doclet.help.class_interface.implementations=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B
 doclet.help.class_interface.declaration=\u7C7B\u6216\u63A5\u53E3\u58F0\u660E
 doclet.help.class_interface.description=\u7C7B\u6216\u63A5\u53E3\u8BF4\u660E
-doclet.help.class_interface.member_order=\u6982\u8981\u6761\u76EE\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\uFF0C\u800C\u8BE6\u7EC6\u8BF4\u660E\u5219\u6309\u5176\u5728\u6E90\u4EE3\u7801\u4E2D\u51FA\u73B0\u7684\u987A\u5E8F\u6392\u5217\u3002\u8FD9\u6709\u52A9\u4E8E\u4FDD\u6301\u7A0B\u5E8F\u5458\u6240\u5EFA\u7ACB\u7684\u903B\u8F91\u5206\u7EC4\u3002
-doclet.help.class_interface.note=\u6CE8:
-doclet.help.class_interface.anno=\u6CE8\u91CA\u63A5\u53E3\u6709\u5FC5\u9700\u7684\u5143\u7D20\u548C\u53EF\u9009\u7684\u5143\u7D20\uFF0C\u4F46\u6CA1\u6709\u65B9\u6CD5\u3002
-doclet.help.class_interface.enum=\u53EA\u6709\u679A\u4E3E\u7C7B\u6709\u679A\u4E3E\u5E38\u91CF\u3002
-doclet.help.class_interface.record=\u8BB0\u5F55\u7C7B\u7684\u7EC4\u4EF6\u663E\u793A\u4E3A\u8BB0\u5F55\u7C7B\u58F0\u660E\u7684\u4E00\u90E8\u5206\u3002
-doclet.help.class_interface.property=\u5C5E\u6027\u662F JavaFX \u7684\u4E00\u4E2A\u7279\u6027\u3002
-doclet.help.other_files.head=\u5176\u4ED6\u6587\u4EF6
-doclet.help.other_files.body=\u7A0B\u5E8F\u5305\u548C\u6A21\u5757\u6240\u5305\u542B\u7684\u9875\u9762\u4E2D\u53EF\u80FD\u5E26\u6709\u4E0E\u9644\u8FD1\u58F0\u660E\u76F8\u5173\u7684\u9644\u52A0\u4FE1\u606F\u3002
+doclet.help.class_interface.summary=\u6982\u8981\u6761\u76EE\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\uFF0C\u800C\u8BE6\u7EC6\u8BF4\u660E\u5219\u6309\u5176\u5728\u6E90\u4EE3\u7801\u4E2D\u51FA\u73B0\u7684\u987A\u5E8F\u6392\u5217\u3002\u8FD9\u6709\u52A9\u4E8E\u4FDD\u6301\u7A0B\u5E8F\u5458\u6240\u5EFA\u7ACB\u7684\u903B\u8F91\u5206\u7EC4\u3002
 doclet.help.use.head=\u4F7F\u7528
-doclet.help.use.body=\u6BCF\u4E2A\u5DF2\u6587\u6863\u5316\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u548C\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u201C\u4F7F\u7528\u201D\u9875\u9762\u3002\u6B64\u9875\u9762\u4ECB\u7ECD\u4E86\u4F7F\u7528\u7ED9\u5B9A\u7C7B\u6216\u7A0B\u5E8F\u5305\u7684\u4EFB\u4F55\u90E8\u5206\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u3001\u65B9\u6CD5\u3001\u6784\u9020\u5668\u548C\u5B57\u6BB5\u3002\u5BF9\u4E8E\u7ED9\u5B9A\u7684\u7C7B\u6216\u63A5\u53E3 A\uFF0C\u5176\u201C\u4F7F\u7528\u201D\u9875\u9762\u5305\u542B A \u7684\u5B50\u7C7B\u3001\u58F0\u660E\u4E3A A \u7684\u5B57\u6BB5\u3001\u8FD4\u56DE A \u7684\u65B9\u6CD5\uFF0C\u4EE5\u53CA\u5E26\u6709\u7C7B\u578B\u4E3A A \u7684\u53C2\u6570\u7684\u65B9\u6CD5\u548C\u6784\u9020\u5668\u3002\u8BBF\u95EE\u6B64\u9875\u9762\u7684\u65B9\u6CD5\u662F\uFF1A\u9996\u5148\u8F6C\u81F3\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\uFF0C\u7136\u540E\u5355\u51FB\u5BFC\u822A\u680F\u4E2D\u7684\u201C\u4F7F\u7528\u201D\u94FE\u63A5\u3002
+doclet.help.use.body=\u6BCF\u4E2A\u5DF2\u6587\u6863\u5316\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u548C\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u201C\u4F7F\u7528\u201D\u9875\u3002\u6B64\u9875\u4ECB\u7ECD\u4E86\u4F7F\u7528\u7ED9\u5B9A\u7C7B\u6216\u7A0B\u5E8F\u5305\u7684\u4EFB\u4F55\u90E8\u5206\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u3001\u65B9\u6CD5\u3001\u6784\u9020\u5668\u548C\u5B57\u6BB5\u3002\u5BF9\u4E8E\u7ED9\u5B9A\u7684\u7C7B\u6216\u63A5\u53E3 A\uFF0C\u5176\u201C\u4F7F\u7528\u201D\u9875\u5305\u542B A \u7684\u5B50\u7C7B\u3001\u58F0\u660E\u4E3A A \u7684\u5B57\u6BB5\u3001\u8FD4\u56DE A \u7684\u65B9\u6CD5\u4EE5\u53CA\u5E26\u6709\u7C7B\u578B\u4E3A A \u7684\u53C2\u6570\u7684\u65B9\u6CD5\u548C\u6784\u9020\u5668\u3002\u8BBF\u95EE\u6B64\u9875\u7684\u65B9\u6CD5\u662F\uFF1A\u9996\u5148\u8F6C\u81F3\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\uFF0C\u7136\u540E\u5355\u51FB\u5BFC\u822A\u680F\u4E2D\u7684\u201C\u4F7F\u7528\u201D\u94FE\u63A5\u3002
 doclet.help.tree.head=\u6811 (\u7C7B\u5206\u5C42\u7ED3\u6784)
-# 0: link to main Class Hierarchy page;  1: java.lang.Object
 doclet.help.tree.intro=\u5BF9\u4E8E\u6240\u6709\u7A0B\u5E8F\u5305\uFF0C\u90FD\u6709\u4E00\u4E2A {0} \u9875\uFF0C\u4EE5\u53CA\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002\u6BCF\u4E2A\u5206\u5C42\u7ED3\u6784\u9875\u90FD\u5305\u542B\u7C7B\u7684\u5217\u8868\u548C\u63A5\u53E3\u7684\u5217\u8868\u3002\u4ECE {1} \u5F00\u59CB\uFF0C\u6309\u7EE7\u627F\u7ED3\u6784\u5BF9\u7C7B\u8FDB\u884C\u6392\u5217\u3002\u63A5\u53E3\u4E0D\u4ECE {1} \u7EE7\u627F\u3002
-doclet.help.tree.overview=\u67E5\u770B\u201C\u6982\u89C8\u201D\u9875\u9762\u65F6\uFF0C\u5355\u51FB\u201C\u6811\u201D\u5C06\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
+doclet.help.tree.overview=\u67E5\u770B\u201C\u6982\u89C8\u201D\u9875\u9762\u65F6, \u5355\u51FB "\u6811" \u5C06\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
 doclet.help.tree.package=\u67E5\u770B\u7279\u5B9A\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\u9875\u65F6\uFF0C\u5355\u51FB\u201C\u6811\u201D\u5C06\u4EC5\u663E\u793A\u8BE5\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
-# 0: link to the Deprecated summary page
 doclet.help.deprecated.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u5DF2\u8FC7\u65F6\u7684 API\u3002\u901A\u5E38\uFF0C\u7531\u4E8E\u5DF2\u8FC7\u65F6\u7684 API \u5B58\u5728\u7F3A\u70B9\u5E76\u4E14\u5DF2\u63D0\u4F9B\u66FF\u4EE3 API\uFF0C\u4E0D\u5EFA\u8BAE\u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u65BD\u4E2D\uFF0C\u53EF\u80FD\u4F1A\u5220\u9664\u5DF2\u8FC7\u65F6\u7684 API\u3002
-# 0: link to the Preview summary page
-doclet.help.preview.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u9884\u89C8 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u65BD\u4E2D\uFF0C\u53EF\u80FD\u4F1A\u5220\u9664\u9884\u89C8 API\u3002
-doclet.help.new.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6700\u8FD1\u7684\u53D1\u884C\u7248\u4E2D\u5DF2\u6DFB\u52A0\u7684 API\u3002
 doclet.help.index.head=\u7D22\u5F15
-# 0: link to Index page;  1: list of links to pages
-doclet.help.index.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7C7B\u3001\u63A5\u53E3\u3001\u6784\u9020\u5668\u3001\u65B9\u6CD5\u548C\u5B57\u6BB5\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\uFF0C\u4EE5\u53CA\u6982\u8981\u9875\uFF08\u4F8B\u5982 {1}\uFF09\u3002
-doclet.help.all_classes.head=\u6240\u6709\u7C7B\u548C\u63A5\u53E3
-# 0: link to All Classes page
-doclet.help.all_classes.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7C7B\u548C\u63A5\u53E3\uFF08\u5305\u62EC\u6CE8\u91CA\u63A5\u53E3\u3001\u679A\u4E3E\u7C7B\u548C\u8BB0\u5F55\u7C7B\uFF09\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\u3002
-doclet.help.all_packages.head=\u6240\u6709\u7A0B\u5E8F\u5305
-# 0: link to All Packages page
-doclet.help.all_packages.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\u3002
+doclet.help.index.body={0} \u5305\u542B\u6240\u6709\u7C7B\u3001\u63A5\u53E3\u3001\u6784\u9020\u5668\u3001\u65B9\u6CD5\u548C\u5B57\u6BB5\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\uFF0C\u4EE5\u53CA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u6240\u6709\u7C7B\u7684\u5217\u8868\u3002
 doclet.help.serial_form.body=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u5B9E\u65BD\uFF08\u800C\u975E\u4F7F\u7528\uFF09API \u7684\u4EBA\u5458\u6709\u7528\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5\uFF0C\u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F\uFF1A\u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B\uFF0C\u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684\u201C\u53E6\u8BF7\u53C2\u9605\u201D\u90E8\u5206\u4E2D\u7684\u201C\u5E8F\u5217\u5316\u5F62\u5F0F\u201D\u3002
-# 0: link to Constant Values page
 doclet.help.constants.body={0}\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
-# 0: link to System Properties page
 doclet.help.systemProperties.body={0} \u9875\u9762\u5217\u51FA\u4E86\u5BF9\u7CFB\u7EDF\u5C5E\u6027\u7684\u5F15\u7528\u3002
 doclet.help.footnote=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u7531\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
-doclet.help.enum.intro=\u6BCF\u4E2A\u679A\u4E3E\u7C7B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
-doclet.help.enum.class.intro=\u6BCF\u4E2A\u679A\u4E3E\u7C7B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
+doclet.help.enum.intro=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
+doclet.help.enum.declaration=\u679A\u4E3E\u58F0\u660E
+doclet.help.enum.definition=\u679A\u4E3E\u8BF4\u660E
 doclet.help.annotation_type.intro=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
-doclet.help.annotation_interface.intro=\u6BCF\u4E2A\u6CE8\u91CA\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
 doclet.help.annotation_type.declaration=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
-doclet.help.annotation_interface.declaration=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E
 doclet.help.annotation_type.description=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E
-doclet.help.annotation_interface.description=\u6CE8\u91CA\u63A5\u53E3\u8BF4\u660E
 doclet.help.search.head=\u641C\u7D22
 # Introduction to Javadoc search features, followed by a list of examples
 doclet.help.search.intro=\u53EF\u4EE5\u4F7F\u7528\u90E8\u5206\u6216\u5B8C\u6574\u540D\u79F0\u641C\u7D22\u6A21\u5757\u3001\u7A0B\u5E8F\u5305\u3001\u7C7B\u578B\u3001\u5B57\u6BB5\u3001\u65B9\u6CD5\u3001\u7CFB\u7EDF\u5C5E\u6027\u4EE5\u53CA API \u4E2D\u5B9A\u4E49\u7684\u5176\u4ED6\u672F\u8BED\u7684\u5B9A\u4E49\uFF0C\uFF08\u53EF\u9009\uFF09\u4E5F\u53EF\u4EE5\u4F7F\u7528\u201C\u9A7C\u5CF0\u5927\u5C0F\u5199\u5F0F\u201D\u7F29\u5199\u8FDB\u884C\u641C\u7D22\u3002\u4F8B\u5982\uFF1A
@@ -269,28 +206,10 @@ doclet.navClassUse=\u4F7F\u7528
 doclet.Error_in_grouplist=\u9519\u8BEF\u7684 -group \u9009\u9879: {0} {1}
 doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, \u7EC4\u540D\u5DF2\u4F7F\u7528: {0}
 doclet.Same_element_name_used=\u5143\u7D20\u540D\u79F0\u6216\u6A21\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0}
-doclet.PreviewLeadingNote={0} \u4F9D\u8D56\u4E8E Java \u5E73\u53F0\u7684\u9884\u89C8\u529F\u80FD\uFF1A
-doclet.Declared_Using_Preview={0} \u662F\u4F7F\u7528 {1}\uFF08Java \u8BED\u8A00 ({2}) \u7684\u9884\u89C8\u529F\u80FD\uFF09\u58F0\u660E\u7684\u3002
-doclet.PreviewAPI={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u9884\u89C8 API\uFF1A{1}\u3002
-doclet.ReflectivePreviewAPI={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u53CD\u5C04\u9884\u89C8 API\uFF1A{1}\u3002
-doclet.UsesDeclaredUsingPreview={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u7C7B\u578B\uFF0C\u8FD9\u4E9B\u7C7B\u578B\u662F\u4F7F\u7528 Java \u8BED\u8A00 {1} \u7684\u9884\u89C8\u529F\u80FD\u58F0\u660E\u7684\u3002
-doclet.PreviewTrailingNote1=\u53EA\u6709\u5728\u542F\u7528\u4E86\u9884\u89C8\u529F\u80FD\u65F6\uFF0C\u7A0B\u5E8F\u624D\u80FD\u4F7F\u7528 {0}\u3002
-doclet.PreviewTrailingNote2=\u9884\u89C8\u529F\u80FD\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\uFF0C\u4E5F\u53EF\u80FD\u4F1A\u5347\u7EA7\u4E3A Java \u5E73\u53F0\u7684\u6C38\u4E45\u529F\u80FD\u3002
-doclet.Declared_Using_Preview.SEALED=\u5BC6\u5C01\u7C7B
-doclet.Declared_Using_Preview.SEALED_PERMITS=\u5BC6\u5C01\u7C7B
-doclet.PreviewPlatformLeadingNote={0} \u662F Java \u5E73\u53F0\u7684\u9884\u89C8 API\u3002
-doclet.ReflectivePreviewPlatformLeadingNote={0} \u662F Java \u5E73\u53F0\u7684\u53CD\u5C04\u9884\u89C8 API\u3002
-
-# 0: an exception
-doclet.Error_copying_legal_notices=\u590D\u5236\u6CD5\u5F8B\u58F0\u660E\u65F6\u51FA\u9519\uFF1A{0}
-# 0: the path; 1: the detail message for the exception
-doclet.Error_invalid_path_for_legal_notices=\u6CD5\u5F8B\u58F0\u660E\u7684\u8DEF\u5F84 ''{0}'' \u65E0\u6548\uFF1A{1}
 
 # option specifiers
-doclet.usage.add-script.parameters=<file>
-doclet.usage.add-script.description=\u5411\u751F\u6210\u7684\u6587\u6863\u6DFB\u52A0\u811A\u672C\u6587\u4EF6
 doclet.usage.add-stylesheet.parameters=<file>
-doclet.usage.add-stylesheet.description=\u5411\u751F\u6210\u7684\u6587\u6863\u6DFB\u52A0\u6837\u5F0F\u8868\u6587\u4EF6
+doclet.usage.add-stylesheet.description=\u7528\u4E8E\u6240\u751F\u6210\u6587\u6863\u7684\u5176\u4ED6\u6837\u5F0F\u8868\u6587\u4EF6
 doclet.usage.d.parameters=<directory>
 doclet.usage.d.description=\u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55
 
@@ -333,10 +252,6 @@ doclet.usage.link.description=\u521B\u5EFA\u6307\u5411 <url> \u4E2D\u7684 javado
 doclet.usage.linkoffline.parameters=<url1> <url2>
 doclet.usage.linkoffline.description=\u4F7F\u7528 <url2> \u4E2D\u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u5230 <url1> \u4E2D\u7684\u6587\u6863
 
-# L10N: do not localize the option parameters: warn info
-doclet.usage.link-modularity-mismatch.parameters=(warn|info)
-doclet.usage.link-modularity-mismatch.description=\u7528\u8B66\u544A\u6216\u4FE1\u606F\u6027\u6D88\u606F\u62A5\u544A\u5177\u6709\n\u6A21\u5757\u5316\u9519\u8BEF\u7684\u5916\u90E8\u6587\u6863\u3002\u9ED8\u8BA4\n\u884C\u4E3A\u662F\u62A5\u544A\u8B66\u544A\u3002
-
 doclet.usage.link-platform-properties.parameters=<url>
 doclet.usage.link-platform-properties.description=\u94FE\u63A5\u5230\u4F4D\u4E8E <url> \u7684\u5C5E\u6027\u6587\u4EF6\u4E2D\u58F0\u660E\u7684\u5E73\u53F0\u6587\u6863 URL
 
@@ -346,9 +261,6 @@ doclet.usage.excludedocfilessubdir.description=\u6392\u9664\u5177\u6709\u7ED9\u5
 doclet.usage.group.parameters=<name> <g1>:<g2>...
 doclet.usage.group.description=\u5C06\u6307\u5B9A\u7684\u5143\u7D20\u5728\u6982\u89C8\u9875\u9762\u4E0A\u5206\u7EC4\u5728\u4E00\u8D77
 
-doclet.usage.legal-notices.parameters='default' | 'none' | <directory>
-doclet.usage.legal-notices.description=\u63A7\u5236\u6240\u751F\u6210\u8F93\u51FA\u4E2D\u7684\u6CD5\u5F8B\u58F0\u660E
-
 doclet.usage.nocomment.description=\u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E
 
 doclet.usage.nodeprecated.description=\u4E0D\u5305\u542B @deprecated \u4FE1\u606F
@@ -378,12 +290,6 @@ doclet.usage.nooverview.description=\u4E0D\u751F\u6210\u6982\u89C8\u9875\u9762
 
 doclet.usage.serialwarn.description=\u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A
 
-doclet.usage.since.parameters=<release>(,<release>)*
-doclet.usage.since.description=\u8BB0\u5F55\u6240\u6307\u5B9A\u53D1\u884C\u7248\u4E2D\u65B0\u589E\u548C\u5DF2\u8FC7\u65F6\u7684 API
-
-doclet.usage.since-label.parameters=<text>
-doclet.usage.since-label.description=\u63D0\u4F9B\u8981\u5728\u201C\u65B0\u589E API\u201D\u9875\u7684\u6807\u9898\u4E2D\u4F7F\u7528\u7684\u6587\u672C
-
 doclet.usage.tag.parameters=<name>:<locations>:<header>
 doclet.usage.tag.description=\u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0
 
@@ -391,10 +297,6 @@ doclet.usage.taglet.description=\u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u96
 
 doclet.usage.tagletpath.description=Taglet \u7684\u8DEF\u5F84
 
-doclet.usage.snippet-path.parameters=<path>
-
-doclet.usage.snippet-path.description=\u5916\u90E8\u7247\u6BB5\u7684\u8DEF\u5F84
-
 doclet.usage.charset.parameters=<charset>
 doclet.usage.charset.description=\u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
deleted file mode 100644
index 8fbb1af8a88..00000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
+++ /dev/null
@@ -1,330 +0,0 @@
-#
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-doclet.Generating_0={0} wird generiert...
-doclet.Toolkit_Usage_Violation=Das Doclet-Toolkit kann nur von {0} verwendet werden
-doclet.MissingSerialTag=in Klasse {0} fehlt das Tag @serial f\u00FCr standardm\u00E4\u00DFig serialisierbares Feld: {1}.
-doclet.MissingSerialDataTag=in Klasse {0} fehlt das Tag @serialData in Methode {1}.
-doclet.Serializable_no_customization=Keine readObject- oder writeObject-Methode deklariert.
-doclet.Serialized_Form=Serialisierte Form
-doclet.Serialized_Form_methods=Serialisierungsmethoden
-doclet.Serialized_Form_fields=Serialisierte Felder
-doclet.Serialized_Form_class=Serialisierungs\u00FCberblick
-doclet.Option_conflict=Option {0} steht in Konflikt mit {1}
-doclet.Option_reuse=Option wiederverwendet: {0}
-doclet.Option_invalid=Ung\u00FCltiges Argument {0} f\u00FCr Option {1}
-doclet.Option_doclint_no_qualifiers=Zugriffs-Qualifier f\u00FCr Argumente f\u00FCr -Xdoclint nicht zul\u00E4ssig
-doclet.Option_doclint_invalid_arg=Ung\u00FCltiges Argument f\u00FCr Option -Xdoclint
-doclet.Option_doclint_package_invalid_arg=Ung\u00FCltiges Argument f\u00FCr Option -Xdoclint/package
-doclet.error.initializing.dest.dir=Fehler beim Initialisieren des Zielverzeichnisses: {0}
-doclet.exception.read.file=Fehler beim Lesen der Datei: {0}\n\t({1})
-doclet.exception.write.file=Fehler beim Schreiben der Datei: {0}\n\t({1})
-doclet.exception.read.resource=Fehler beim Lesen der Systemressource: {0}\n\t({1})
-doclet.internal.exception=Eine interne Ausnahme ist aufgetreten.\n\t({0})
-doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bug\nf\u00FCr das javadoc-Tool, nachdem Sie in der Bugdatenbank (http://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
-doclet.File_not_found=Datei nicht gefunden: {0}
-doclet.Copy_Overwrite_warning=Datei {0} wurde nicht in {1} kopiert, da bereits eine Datei mit demselben Namen vorhanden ist...
-doclet.Copy_Ignored_warning=Die Datei {0} wurde nicht kopiert: ung\u00FCltiger Name
-doclet.Copy_snippet_to_clipboard=Kopieren
-doclet.Copied_snippet_to_clipboard=Kopiert.
-doclet.Copying_File_0_To_Dir_1=Datei {0} wird in Verzeichnis {1} kopiert...
-doclet.Copying_File_0_To_File_1=Datei {0} wird in Datei {1} kopiert...
-doclet.No_Public_Classes_To_Document=Keine \u00F6ffentlichen oder gesch\u00FCtzten Klassen zur Dokumentation gefunden.
-doclet.destination_directory_not_directory_0=Ziel ist kein Verzeichnis: {0}
-doclet.destination_directory_not_writable_0=Zielverzeichnis ist schreibgesch\u00FCtzt: {0}
-doclet.Encoding_not_supported=Codierung nicht unterst\u00FCtzt: {0}
-doclet.Building_Tree=Baum f\u00FCr alle Packages und Klassen wird erstellt...
-doclet.Building_Index=Index f\u00FCr alle Packages und Klassen wird erstellt...
-doclet.Building_Index_For_All_Classes=Index f\u00FCr alle Klassen wird erstellt...
-doclet.sourcetab_warning=Das Argument f\u00FCr -sourcetab muss eine Ganzzahl sein, die gr\u00F6\u00DFer als 0 ist.
-doclet.JavaScript_in_comment=JavaScript in Dokumentationskommentar gefunden.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
-doclet.JavaScript_in_option=Option {0} enth\u00E4lt JavaScript.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
-doclet.Packages=Packages
-doclet.All_Packages=Alle Packages
-doclet.Modules=Module
-doclet.All_Modules=Alle Module
-doclet.Other_Packages=Andere Packages
-doclet.Other_Modules=Andere Module
-doclet.Notice_taglet_registered=Taglet {0} wurde registriert...
-doclet.Notice_taglet_unseen=Hinweis: Nicht gefundene benutzerdefinierte Tags: {0}
-doclet.Notice_taglet_overridden=Hinweis: Benutzerdefinierte Tags, die Standardtags au\u00DFer Kraft setzen: {0}
-doclet.Notice_taglet_conflict_warn=Hinweis: Benutzerdefinierte Tags, die zuk\u00FCnftige Standardtags au\u00DFer Kraft setzen k\u00F6nnten: {0}. Um potenzielle Overrides zu vermeiden, verwenden Sie in den Namen benutzerdefinierter Tags mindestens einen Punkt (.).
-doclet.Error_taglet_not_registered=Fehler - Ausnahme {0} wurde beim Versuch ausgel\u00F6st, Taglet {1} zu registrieren...
-doclet.Error_invalid_custom_tag_argument=Fehler - {0} ist ein ung\u00FCltiges Argument f\u00FCr die Option -tag...
-doclet.taglet_could_not_set_location = Taglet-Pfad konnte nicht festgelegt werden: {0}
-doclet.not_standard_file_manager = Taglet-Pfad kann nicht festgelegt werden, der Dateimanager ist kein StandardJavaFileManager
-doclet.Author=Autor:
-doclet.DefaultValue=Standardwert:
-doclet.PropertyDescription=Eigenschaftsbeschreibung:
-doclet.PropertyGetterWithName=Ruft den Wert der {0}-Eigenschaft ab.
-doclet.PropertyGetterReturn=Wert der Eigenschaft {0}
-doclet.PropertySetterWithName=Legt den Wert der {0}-Eigenschaft fest.
-doclet.PropertySetterParam=Wert f\u00FCr die Eigenschaft {0}
-doclet.PropertyMethodReturn=die Eigenschaft {0}
-doclet.Default=Standard:
-doclet.Parameters=Parameter:
-doclet.TypeParameters=Typparameter:
-doclet.RecordComponents=Datensatzkomponenten:
-doclet.Parameters_warn=@param-Argument "{0}" ist kein Parametername.
-doclet.Parameters_dup_warn=Parameter "{0}" ist mehrmals dokumentiert.
-doclet.TypeParameters_warn=@param-Argument "{0}" ist nicht der Name eines Typparameters.
-doclet.TypeParameters_dup_warn=Typparameter "{0}" ist mehrmals dokumentiert.
-doclet.RecordComponents_warn=@param-Argument "{0}" ist nicht der Name einer Datensatzkomponente.
-doclet.RecordComponents_dup_warn=Datensatzkomponente "{0}" ist mehrmals dokumentiert.
-doclet.Returns=Gibt zur\u00FCck:
-doclet.Returns_0=Gibt {0} zur\u00FCck.
-doclet.Return_tag_on_void_method=@return-Tag kann nicht in Methode mit ung\u00FCltigem R\u00FCckgabetyp verwendet werden.
-doclet.See_Also=Siehe auch:
-doclet.SerialData=Serielle Daten:
-doclet.Services=Services
-doclet.Since=Seit:
-doclet.Throws=L\u00F6st aus:
-doclet.Version=Version:
-doclet.Factory=Factory:
-doclet.UnknownTag={0} ist ein unbekanntes Tag.
-doclet.UnknownTagLowercase={0} ist ein unbekanntes Tag - bis auf die Gro\u00DF-/Kleinschreibung identisch mit einem bekannten Tag.
-doclet.noInheritedDoc=@inheritDoc wurde verwendet, aber mit {0} wird keine Methode au\u00DFer Kraft gesetzt oder implementiert.
-doclet.tag_misuse=Tag {0} kann nicht in {1}-Dokumentation verwendet werden. Es kann nur in folgenden Dokumentationstypen verwendet werden: {2}.
-doclet.Package_Summary=Package\u00FCbersicht
-doclet.Requires_Summary=Erfordernisse
-doclet.Indirect_Requires_Summary=Indirekte Erfordernisse
-doclet.Indirect_Exports_Summary=Indirekte Exportvorg\u00E4nge
-doclet.Indirect_Opens_Summary=Indirekte \u00D6ffnungsvorg\u00E4nge
-doclet.Exported_Packages_Summary=Exporte
-doclet.Opened_Packages_Summary=\u00D6ffnungsvorg\u00E4nge
-doclet.Concealed_Packages_Summary=Ausgeblendet
-doclet.From=Von
-doclet.Uses_Summary=Verwendungen
-doclet.Provides_Summary=Bereitstellungen
-doclet.Nested_Class_Summary=Verschachtelte Klassen - \u00DCbersicht
-doclet.Annotation_Type_Optional_Member_Summary=Optionale Elemente - \u00DCbersicht
-doclet.Annotation_Type_Required_Member_Summary=Erforderliche Elemente - \u00DCbersicht
-doclet.Field_Summary=Feld\u00FCbersicht
-doclet.Property_Summary=Eigenschafts\u00FCbersicht
-doclet.Enum_Constant_Summary=Enum-Konstanten - \u00DCbersicht
-doclet.Constructor_Summary=Konstruktor\u00FCbersicht
-doclet.Method_Summary=Methoden\u00FCbersicht
-doclet.Interfaces=Schnittstellen
-doclet.Enums=Enums
-doclet.EnumClasses=Enum-Klassen
-doclet.RecordClasses=Datensatzklassen
-doclet.Related_Packages=Zugeh\u00F6rige Packages
-doclet.AnnotationTypes=Annotationstypen
-doclet.AnnotationInterfaces=Annotationsschnittstellen
-doclet.ExceptionClasses=Ausnahmeklassen
-doclet.Classes=Klassen
-doclet.All_Classes_And_Interfaces=Alle Klassen und Schnittstellen
-doclet.All_Superinterfaces=Alle Superschnittstellen:
-doclet.All_Implemented_Interfaces=Alle implementierten Schnittstellen:
-doclet.Interface=Schnittstelle
-doclet.Class=Klasse
-doclet.AnnotationType=Annotationstyp
-doclet.AnnotationInterface=Annotationsschnittstelle
-doclet.annotationtype=Annotationstyp
-doclet.annotationinterface=Annotationsschnittstellen
-doclet.annotationtypes=Annotationstypen
-doclet.annotationinterfaces=Annotationsschnittstellen
-doclet.Enum=Enum
-doclet.EnumClass=Enum-Klasse
-doclet.enum=Enumeration
-doclet.enumclass=Enum-Klasse
-doclet.enums=Enums
-doclet.enumclasses=Enum-Klassen
-doclet.interface=Schnittstelle
-doclet.class=Klasse
-doclet.RecordClass=Datensatzklasse
-doclet.recordclass=Datensatzklasse
-doclet.ExceptionClass=Ausnahmeklasse
-doclet.exceptionclass=Ausnahmeklasse
-doclet.ExportedTo=In Module exportiert
-doclet.OpenedTo=In Modulen ge\u00F6ffnet
-doclet.Package_private=(Package privat)
-doclet.Nested_Classes_Interfaces_Inherited_From_Class=Von Klasse geerbte verschachtelte Klassen/Schnittstellen
-doclet.Nested_Classes_Interfaces_Inherited_From_Interface=Von Schnittstelle geerbte verschachtelte Klassen/Schnittstellen
-doclet.Nested_Classes_Interfaces_Declared_In_Class=In Klasse deklarierte verschachtelte Klassen/Schnittstellen
-doclet.Nested_Classes_Interfaces_Declared_In_Interface=In Schnittstelle deklarierte verschachtelte Klassen/Schnittstellen
-doclet.Methods_Inherited_From_Class=Von Klasse geerbte Methoden
-doclet.Methods_Inherited_From_Interface=Von Schnittstelle geerbte Methoden
-doclet.Methods_Declared_In_Class=In Klasse deklarierte Methoden
-doclet.Methods_Declared_In_Interface=In Schnittstelle deklarierte Methoden
-doclet.Fields_Inherited_From_Class=Von Klasse geerbte Felder
-doclet.Fields_Inherited_From_Interface=Von Schnittstelle geerbte Felder
-doclet.Fields_Declared_In_Class=In Klasse deklarierte Felder
-doclet.Fields_Declared_In_Interface=In Schnittstelle deklarierte Felder
-doclet.Properties_Inherited_From_Class=Von Klasse geerbte Eigenschaften
-doclet.Properties_Inherited_From_Interface=Von Schnittstelle geerbte Eigenschaften
-doclet.Properties_Declared_In_Class=In Klasse deklarierte Eigenschaften
-doclet.Properties_Declared_In_Interface=In Schnittstelle deklarierte Eigenschaften
-doclet.Annotation_Type_Member_Detail=Elementdetails
-doclet.Enum_Constant_Detail=Enum-Konstanten - Details
-doclet.Constants_Summary=Konstantenfeldwerte
-doclet.Field_Detail=Felddetails
-doclet.Property_Detail=Eigenschaftsdetails
-doclet.Method_Detail=Methodendetails
-doclet.Constructor_Detail=Konstruktordetails
-doclet.Deprecated=Veraltet.
-doclet.DeprecatedForRemoval=Veraltet, zur Entfernung: Dieses API-Element wird in einer zuk\u00FCnftigen Version entfernt.
-doclet.Groupname_already_used=In der Option -group wird der Gruppenname bereits verwendet: {0}
-doclet.value_tag_invalid_reference={0} (referenziert von @value-Tag) ist eine unbekannte Referenz.
-doclet.value_tag_invalid_constant=@value-Tag (das {0} referenziert) kann nur in Konstanten verwendet werden.
-doclet.value_tag_invalid_use=@value-Tag kann hier nicht verwendet werden.
-doclet.dest_dir_create=Zielverzeichnis wird erstellt: "{0}"
-doclet.in={0} in {1}
-doclet.Fields=Felder
-doclet.Preview=Vorschau.
-doclet.Properties=Eigenschaften
-doclet.Constructors=Konstruktoren
-doclet.Methods=Methoden
-doclet.All_Methods=Alle Methoden
-doclet.Static_Methods=Statische Methoden
-doclet.Instance_Methods=Instanzmethoden
-doclet.Abstract_Methods=Abstrakte Methoden
-doclet.Concrete_Methods=Konkrete Methoden
-doclet.Default_Methods=Standardmethoden
-doclet.Deprecated_Methods=Veraltete Methoden
-doclet.Annotation_Type_Optional_Members=Optionale Elemente
-doclet.Annotation_Type_Required_Members=Erforderliche Elemente
-doclet.Enum_Constants=Enum-Konstanten
-doclet.Nested_Classes=Verschachtelte Klassen
-doclet.Modifier=Modifizierer
-doclet.Type=Typ
-doclet.Modifier_and_Type=Modifizierer und Typ
-doclet.Implementation=Implementierung(en):
-doclet.search=SEARCH:
-doclet.search_placeholder=Suchen
-doclet.Field=Feld
-doclet.Property=Eigenschaft
-doclet.Constructor=Konstruktor
-doclet.Method=Methode
-doclet.Annotation_Type_Optional_Member=Optionales Element
-doclet.Annotation_Type_Required_Member=Erforderliches Element
-doclet.Annotation_Type_Member=Annotationstypelement
-doclet.Annotation_Interface_Member=Annotationsschnittstellenelement
-doclet.Enum_Constant=Enum-Konstante
-doclet.Description=Beschreibung
-doclet.ConstantField=Konstantenfeld
-doclet.Value=Wert
-doclet.linkMismatch_PackagedLinkedtoModule=Der Code, der dokumentiert wird, verwendet Packages im unbenannten Modul, aber die in {0} definierten Packages befinden sich in benannten Modulen.
-doclet.linkMismatch_ModuleLinkedtoPackage=Der Code, der dokumentiert wird, verwendet Module, aber die in {0} definierten Packages befinden sich im unbenannten Modul.
-doclet.urlRedirected=URL {0} wurde umgeleitet an {1} - Aktualisieren Sie die Befehlszeilenoptionen, um diese Warnung zu unterdr\u00FCcken.
-doclet.duplicate.comment.for.property=Doppelter Kommentar f\u00FCr Eigenschaft.\nEntfernen Sie den Kommentar auf dem Eigenschaftsfeld oder in dieser Methode, um diese Warnung zu unterdr\u00FCcken.
-
-#Documentation for Enums
-doclet.enum_values_doc.fullbody=Gibt ein Array mit den Konstanten dieses Enum-Typs in\nder Reihenfolge ihrer Deklaration zur\u00FCck.
-doclet.enum_class_values_doc.fullbody=Gibt ein Array mit den Konstanten dieser Enum-Klasse in\nder Reihenfolge ihrer Deklaration zur\u00FCck.
-
-doclet.enum_values_doc.return=ein Array mit den Konstanten dieses Enumerationstyps in der Reihenfolge ihrer Deklaration
-doclet.enum_class_values_doc.return=ein Array mit den Konstanten dieser Enum-Klasse in der Reihenfolge ihrer Deklaration
-
-doclet.enum_valueof_doc.fullbody=Gibt die Enumerationskonstante dieses Typs mit dem angegebenen Namen zur\u00FCck.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID \u00FCbereinstimmen,\nmit der eine Enumerationskonstante in diesem Typ deklariert wird.\n(Zus\u00E4tzliche Leerzeichen sind nicht zul\u00E4ssig.)
-doclet.enum_class_valueof_doc.fullbody=Gibt die Enum-Konstante dieser Klasse mit dem angegebenen Namen zur\u00FCck.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID \u00FCbereinstimmen,\nmit der eine Enum-Konstante in dieser Klasse deklariert wird.\n(Zus\u00E4tzliche Leerzeichen sind nicht zul\u00E4ssig.)
-
-doclet.enum_valueof_doc.param_name=Name der zur\u00FCckzugebenden Enumerationskonstante.
-
-doclet.enum_valueof_doc.return=Enumerationskonstante mit dem angegebenen Namen
-
-doclet.enum_valueof_doc.throws_ila=wenn dieser Enumerationstyp keine Konstante mit dem angegebenen Namen enth\u00E4lt
-doclet.enum_class_valueof_doc.throws_ila=wenn diese Enum-Klasse keine Konstante mit dem angegebenen Namen enth\u00E4lt
-
-doclet.enum_valueof_doc.throws_npe=wenn das Argument nicht angegeben wird
-
-
-#Documentation for records
-doclet.record_constructor_doc.fullbody=Erstellt eine Instanz einer Datensatzklasse {0}.
-
-doclet.record_constructor_doc.param_name=Wert f\u00FCr die Datensatzkomponente {0}
-
-doclet.record_equals_doc.fullbody.head=Gibt an, ob ein anderes Objekt diesem gleich ("equal to") ist. Die Objekte sind gleich, wenn das andere Objekt der gleichen Klasse angeh\u00F6rt und alle Datensatzkomponenten gleich sind.
-
-doclet.record_equals_doc.fullbody.tail.both=Referenzkomponenten werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}; primitive Komponenten werden verglichen mit "==".
-
-doclet.record_equals_doc.fullbody.tail.primitive=Alle Komponenten in dieser Datensatzklasse werden verglichen mit "==".
-
-doclet.record_equals_doc.fullbody.tail.reference=Alle Komponenten in dieser Datensatzklasse werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}.
-
-doclet.record_equals_doc.param_name=das Objekt, mit dem verglichen wird
-
-doclet.record_equals_doc.return=<code>true</code>, wenn dieses Objekt gleich dem Argument {0} ist, andernfalls <code>false</code>.
-
-doclet.record_hashCode_doc.fullbody=Gibt einen Hashcodewert f\u00FCr diese Objekt zur\u00FCck. Der Wert wird vom Hashcode jeder der Datensatzkomponenten abgeleitet.
-
-doclet.record_hashCode_doc.return=ein Hashcodewert f\u00FCr dieses Objekt
-
-doclet.record_toString_doc.fullbody=Gibt eine Zeichenfolgendarstellung dieser Datensatzklasse zur\u00FCck. Die Darstellung enth\u00E4lt den Namen der Klasse, gefolgt vom Namen und Wert jeder der Datensatzkomponenten.
-
-doclet.record_toString_doc.return=eine Zeichenfolgendarstellung dieses Objekts
-
-doclet.record_accessor_doc.fullbody=Gibt den Wert f\u00FCr die Datensatzkomponente {0} zur\u00FCck.
-
-doclet.record_accessor_doc.return=Wert der Datensatzkomponente {0}
-
-doclet.record_field_doc.fullbody=Das Feld f\u00FCr die Datensatzkomponente {0}.
-
-doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
-doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
-doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
-
-doclet.search.no_results=Keine Ergebnisse gefunden
-doclet.search.loading=Suchindex wird geladen...
-doclet.search.modules=Module
-doclet.search.packages=Packages
-doclet.search.classes_and_interfaces=Klassen und Schnittstellen
-doclet.search.types=Typen
-doclet.search.members=Mitglieder
-doclet.search.search_tags=Tags suchen
-
-doclet.snippet.contents.none=@snippet gibt keinen Inhalt an
-
-doclet.snippet.contents.ambiguity.external=@snippet gibt mehrere externe Inhalte an, was nicht eindeutig ist
-
-doclet.snippet.region.not_found=Region nicht gefunden: "{0}"
-
-doclet.tag.attribute.value.illegal=ung\u00FCltiger Wert f\u00FCr Attribut "{0}": "{1}"
-
-doclet.tag.attribute.value.missing=fehlender Wert f\u00FCr Attribut "{0}"
-
-doclet.tag.attribute.repeated=wiederholtes Attribut: "{0}"
-
-doclet.snippet.contents.mismatch=Inhalt stimmt nicht \u00FCberein:\n{0}
-
-doclet.snippet.markup=snippet-Markup: {0}
-
-doclet.snippet.markup.spurious=falsches Markup
-doclet.snippet.markup.attribute.absent=Attribut "{0}" fehlt
-doclet.snippet.markup.attribute.simultaneous.use=Attribute "{0}" und "{1}" gleichzeitig verwendet
-doclet.snippet.markup.attribute.unexpected=unerwartetes Attribut
-doclet.snippet.markup.attribute.value.invalid=Ung\u00FCltiger Attributwert
-doclet.snippet.markup.attribute.value.unterminated=nicht beendeter Attributwert
-doclet.snippet.markup.regex.invalid=ung\u00FCltiger regul\u00E4rer Ausdruck
-doclet.snippet.markup.region.duplicated=doppelte Region
-doclet.snippet.markup.region.none=keine Region zum Beenden
-doclet.snippet.markup.region.unpaired=nicht gepaarte Region
-doclet.snippet.markup.tag.non.existent.lines=Tag bezieht sich auf nicht vorhandene Zeilen
-
-# 0: path
-doclet.cannot_use_snippet_path=Option --snippet-path kann mit dem gegebenen Dateimanager nicht verwendet werden: {0}
-
-# 0: path; 1: exception
-doclet.error_setting_snippet_path=Fehler beim Festlegen von Snippet-Pfad {0}: {1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
index e062f714f15..05c406d4421 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
@@ -32,6 +32,8 @@ doclet.Serialized_Form=\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F
 doclet.Serialized_Form_methods=\u76F4\u5217\u5316\u30E1\u30BD\u30C3\u30C9
 doclet.Serialized_Form_fields=\u76F4\u5217\u5316\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Serialized_Form_class=\u76F4\u5217\u5316\u306E\u6982\u8981
+doclet.Class_0_implements_serializable=Class {0} implements Serializable
+doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable
 doclet.Option_conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u304C{1}\u3068\u77DB\u76FE\u3057\u307E\u3059
 doclet.Option_reuse=\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u518D\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
 doclet.Option_invalid={1}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570{0}\u304C\u7121\u52B9\u3067\u3059
@@ -42,13 +44,11 @@ doclet.error.initializing.dest.dir=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u3
 doclet.exception.read.file=\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
 doclet.exception.write.file=\u30D5\u30A1\u30A4\u30EB\u306E\u66F8\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
 doclet.exception.read.resource=\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
-doclet.internal.exception=\u5185\u90E8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\t({0})
+doclet.internal.exception=\u5185\u90E8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002 \n\t({0})
 doclet.internal.report.bug=Bug Database (http://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java bug\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8\n(http://bugreport.java.com)\u3067javadoc\u30C4\u30FC\u30EB\u306B\u5BFE\u3059\u308Bbug\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\n\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
 doclet.File_not_found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
 doclet.Copy_Overwrite_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u540C\u3058\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308B\u306E\u3067{1}\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F...
 doclet.Copy_Ignored_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F: \u540D\u524D\u304C\u7121\u52B9\u3067\u3059
-doclet.Copy_snippet_to_clipboard=\u30B3\u30D4\u30FC
-doclet.Copied_snippet_to_clipboard=\u30B3\u30D4\u30FC\u6E08
 doclet.Copying_File_0_To_Dir_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
 doclet.Copying_File_0_To_File_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30D5\u30A1\u30A4\u30EB{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
 doclet.No_Public_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308Bpublic\u307E\u305F\u306Fprotected\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
@@ -78,11 +78,8 @@ doclet.not_standard_file_manager = \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D1\u3
 doclet.Author=\u4F5C\u6210\u8005:
 doclet.DefaultValue=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024:
 doclet.PropertyDescription=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8AAC\u660E:
-doclet.PropertyGetterWithName={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
-doclet.PropertyGetterReturn={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024
-doclet.PropertySetterWithName={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-doclet.PropertySetterParam={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024
-doclet.PropertyMethodReturn={0}\u30D7\u30ED\u30D1\u30C6\u30A3
+doclet.PropertyGetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
+doclet.PropertySetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
 doclet.Default=\u30C7\u30D5\u30A9\u30EB\u30C8:
 doclet.Parameters=\u30D1\u30E9\u30E1\u30FC\u30BF:
 doclet.TypeParameters=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF:
@@ -106,6 +103,7 @@ doclet.Factory=\u30D5\u30A1\u30AF\u30C8\u30EA:
 doclet.UnknownTag={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002
 doclet.UnknownTagLowercase={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002\u5927\u6587\u5B57\u3068\u5C0F\u6587\u5B57\u306E\u533A\u5225\u3092\u9664\u3044\u3066\u306F\u65E2\u77E5\u306E\u30BF\u30B0\u3068\u540C\u3058\u3067\u3059\u3002
 doclet.noInheritedDoc=@inheritDoc\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u306F\u3069\u306E\u30E1\u30BD\u30C3\u30C9\u3082\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+# doclet.malformed_html_link_tag=<a> tag is malformed:\n"{0}"
 doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002
 doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981
 doclet.Requires_Summary=\u5FC5\u8981
@@ -118,6 +116,12 @@ doclet.Concealed_Packages_Summary=\u975E\u8868\u793A
 doclet.From=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5143
 doclet.Uses_Summary=\u4F7F\u7528
 doclet.Provides_Summary=\u63D0\u4F9B
+doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6982\u8981
+doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u6982\u8981
+doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u6982\u8981
+doclet.Exception_Summary=\u4F8B\u5916\u306E\u6982\u8981
+doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u6982\u8981
+doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u6982\u8981
 doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u6982\u8981
 doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981
 doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981
@@ -126,38 +130,32 @@ doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981
 doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
 doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
 doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
+doclet.Record_Summary=\u30EC\u30B3\u30FC\u30C9\u30FB\u30B5\u30DE\u30EA\u30FC
 doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Enums=\u5217\u6319
-doclet.EnumClasses=\u5217\u6319\u30AF\u30E9\u30B9
-doclet.RecordClasses=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
-doclet.Related_Packages=\u95A2\u9023\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.AnnotationTypes=\u6CE8\u91C8\u578B
-doclet.AnnotationInterfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.ExceptionClasses=\u4F8B\u5916\u30AF\u30E9\u30B9
+doclet.Exceptions=\u4F8B\u5916
+doclet.Errors=\u30A8\u30E9\u30FC
 doclet.Classes=\u30AF\u30E9\u30B9
-doclet.All_Classes_And_Interfaces=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.packages=\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.modules=\u30E2\u30B8\u30E5\u30FC\u30EB
+doclet.All_Classes=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9
 doclet.All_Superinterfaces=\u3059\u3079\u3066\u306E\u30B9\u30FC\u30D1\u30FC\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
 doclet.All_Implemented_Interfaces=\u3059\u3079\u3066\u306E\u5B9F\u88C5\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
 doclet.Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Class=\u30AF\u30E9\u30B9
 doclet.AnnotationType=\u6CE8\u91C8\u578B
-doclet.AnnotationInterface=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotationtype=\u6CE8\u91C8\u578B
-doclet.annotationinterface=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotationtypes=\u6CE8\u91C8\u578B
-doclet.annotationinterfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Enum=\u5217\u6319
-doclet.EnumClass=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.enum=\u5217\u6319
-doclet.enumclass=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.enums=\u5217\u6319
-doclet.enumclasses=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.class=\u30AF\u30E9\u30B9
-doclet.RecordClass=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
-doclet.recordclass=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
-doclet.ExceptionClass=\u4F8B\u5916\u30AF\u30E9\u30B9
-doclet.exceptionclass=\u4F8B\u5916\u30AF\u30E9\u30B9
+doclet.classes=\u30AF\u30E9\u30B9
+doclet.Record=\u30EC\u30B3\u30FC\u30C9
+doclet.record=\u30EC\u30B3\u30FC\u30C9
 doclet.ExportedTo=\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 doclet.OpenedTo=\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30AA\u30FC\u30D7\u30F3
 doclet.Package_private=(package private)
@@ -192,10 +190,14 @@ doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057
 doclet.value_tag_invalid_use=@value\u30BF\u30B0\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
 doclet.dest_dir_create=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4F5C\u6210\u4E2D: "{0}"
 doclet.in={1}\u306E{0}
+doclet.Use_Table_Summary=\u8868\u3001{0}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E\u306E\u4F7F\u7528
+doclet.Member_Table_Summary={0}\u8868\u3001{1}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E
+doclet.fields=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Fields=\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Preview=\u30D7\u30EC\u30D3\u30E5\u30FC\u3002
 doclet.Properties=\u30D7\u30ED\u30D1\u30C6\u30A3
+doclet.constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.Constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
+doclet.methods=\u30E1\u30BD\u30C3\u30C9
 doclet.Methods=\u30E1\u30BD\u30C3\u30C9
 doclet.All_Methods=\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9
 doclet.Static_Methods=static\u30E1\u30BD\u30C3\u30C9
@@ -206,6 +208,7 @@ doclet.Default_Methods=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u3
 doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
 doclet.Annotation_Type_Optional_Members=\u4EFB\u610F\u8981\u7D20
 doclet.Annotation_Type_Required_Members=\u5FC5\u9808\u8981\u7D20
+doclet.enum_constants=\u5217\u6319\u578B\u5B9A\u6570
 doclet.Enum_Constants=\u5217\u6319\u5B9A\u6570
 doclet.Nested_Classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9
 doclet.Modifier=\u4FEE\u98FE\u5B50
@@ -213,7 +216,6 @@ doclet.Type=\u30BF\u30A4\u30D7
 doclet.Modifier_and_Type=\u4FEE\u98FE\u5B50\u3068\u30BF\u30A4\u30D7
 doclet.Implementation=\u5B9F\u88C5:
 doclet.search=SEARCH:
-doclet.search_placeholder=\u691C\u7D22
 doclet.Field=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Property=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.Constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
@@ -221,7 +223,6 @@ doclet.Method=\u30E1\u30BD\u30C3\u30C9
 doclet.Annotation_Type_Optional_Member=\u4EFB\u610F\u8981\u7D20
 doclet.Annotation_Type_Required_Member=\u5FC5\u9808\u8981\u7D20
 doclet.Annotation_Type_Member=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.Annotation_Interface_Member=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
 doclet.Enum_Constant=\u5217\u6319\u578B\u5B9A\u6570
 doclet.Description=\u8AAC\u660E
 doclet.ConstantField=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9
@@ -229,30 +230,25 @@ doclet.Value=\u5024
 doclet.linkMismatch_PackagedLinkedtoModule=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u30B3\u30FC\u30C9\u3067\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3082\u306E\u3067\u3059\u3002
 doclet.linkMismatch_ModuleLinkedtoPackage=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u30B3\u30FC\u30C9\u3067\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3082\u306E\u3067\u3059\u3002
 doclet.urlRedirected=URL {0}\u306F{1}\u306B\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3055\u308C\u307E\u3057\u305F -- \u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u66F4\u65B0\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u8868\u793A\u3057\u306A\u3044\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.duplicate.comment.for.property=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30B3\u30E1\u30F3\u30C8\u304C\u91CD\u8907\u3057\u3066\n\u3044\u307E\u3059\u3002\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u307E\u305F\u306F\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8\u3092\u524A\u9664\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 #Documentation for Enums
 doclet.enum_values_doc.fullbody=\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u8FD4\u3057\u307E\u3059\u3002
-doclet.enum_class_values_doc.fullbody=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u8FD4\u3057\u307E\u3059\u3002
 
 doclet.enum_values_doc.return=\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u306E\u914D\u5217
-doclet.enum_class_values_doc.return=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u542B\u3080\u914D\u5217
 
 doclet.enum_valueof_doc.fullbody=\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\n\u3067\u304D\u307E\u305B\u3093\u3002)
-doclet.enum_class_valueof_doc.fullbody=\u3053\u306E\u30AF\u30E9\u30B9\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u6307\u5B9A\u3057\u305F\u540D\u524D\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u30AF\u30E9\u30B9\u306E\u5217\u6319\u578B\u5B9A\u6570\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3055\u308C\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u306F\u4F7F\u7528\n\u3067\u304D\u307E\u305B\u3093\u3002)
 
 doclet.enum_valueof_doc.param_name=\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\u3002
 
 doclet.enum_valueof_doc.return=\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5217\u6319\u578B\u5B9A\u6570
 
 doclet.enum_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u578B\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
-doclet.enum_class_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
 
 doclet.enum_valueof_doc.throws_npe=\u5F15\u6570\u304Cnull\u306E\u5834\u5408
 
 
 #Documentation for records
-doclet.record_constructor_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
+doclet.record_constructor_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
 
 doclet.record_constructor_doc.param_name={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5024
 
@@ -260,9 +256,9 @@ doclet.record_equals_doc.fullbody.head=\u4ED6\u306E\u30AA\u30D6\u30B8\u30A7\u30A
 
 doclet.record_equals_doc.fullbody.tail.both=\u53C2\u7167\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u3001\u30D7\u30EA\u30DF\u30C6\u30A3\u30D6\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
-doclet.record_equals_doc.fullbody.tail.primitive=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.primitive=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u5185\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
-doclet.record_equals_doc.fullbody.tail.reference=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.reference=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u5185\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
 doclet.record_equals_doc.param_name=\u6BD4\u8F03\u3059\u308B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
 
@@ -272,7 +268,7 @@ doclet.record_hashCode_doc.fullbody=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u
 
 doclet.record_hashCode_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30CF\u30C3\u30B7\u30E5\u30FB\u30B3\u30FC\u30C9\u5024
 
-doclet.record_toString_doc.fullbody=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u6587\u5B57\u5217\u8868\u73FE\u3092\u8FD4\u3057\u307E\u3059\u3002\u3053\u306E\u8868\u73FE\u3067\u306F\u3001\u30AF\u30E9\u30B9\u540D\u306E\u5F8C\u306B\u3001\u5404\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u540D\u524D\u3068\u5024\u304C\u7D9A\u3044\u3066\u3044\u307E\u3059\u3002
+doclet.record_toString_doc.fullbody=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u306E\u6587\u5B57\u5217\u8868\u73FE\u3092\u8FD4\u3057\u307E\u3059\u3002\u8868\u73FE\u306B\u306F\u3001\u578B\u306E\u540D\u524D\u306B\u7D9A\u3051\u3066\u5404\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u540D\u524D\u3068\u5024\u304C\u542B\u307E\u308C\u307E\u3059\u3002
 
 doclet.record_toString_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u6587\u5B57\u5217\u8868\u73FE
 
@@ -285,46 +281,3 @@ doclet.record_field_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
 doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
-
-doclet.search.no_results=\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
-doclet.search.loading=\u691C\u7D22\u7D22\u5F15\u3092\u30ED\u30FC\u30C9\u4E2D...
-doclet.search.modules=\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.search.packages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.search.classes_and_interfaces=\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.search.types=\u30BF\u30A4\u30D7
-doclet.search.members=\u30E1\u30F3\u30D0\u30FC
-doclet.search.search_tags=\u30BF\u30B0\u306E\u691C\u7D22
-
-doclet.snippet.contents.none=@snippet\u306B\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-
-doclet.snippet.contents.ambiguity.external=@snippet\u306B\u3001\u4E0D\u660E\u306A\u8907\u6570\u306E\u5916\u90E8\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
-
-doclet.snippet.region.not_found=\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "{0}"
-
-doclet.tag.attribute.value.illegal=\u5C5E\u6027"{0}"\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: "{1}"
-
-doclet.tag.attribute.value.missing=\u5C5E\u6027"{0}"\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u3093
-
-doclet.tag.attribute.repeated=\u5C5E\u6027\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059: "{0}"
-
-doclet.snippet.contents.mismatch=\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093:\n{0}
-
-doclet.snippet.markup=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7: {0}
-
-doclet.snippet.markup.spurious=\u7591\u4F3C\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7
-doclet.snippet.markup.attribute.absent=\u5C5E\u6027"{0}"\u304C\u3042\u308A\u307E\u305B\u3093
-doclet.snippet.markup.attribute.simultaneous.use=\u5C5E\u6027"{0}"\u3068"{1}"\u304C\u540C\u6642\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
-doclet.snippet.markup.attribute.unexpected=\u4E88\u671F\u3057\u306A\u3044\u5C5E\u6027
-doclet.snippet.markup.attribute.value.invalid=\u7121\u52B9\u306A\u5C5E\u6027\u5024
-doclet.snippet.markup.attribute.value.unterminated=\u5C5E\u6027\u5024\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
-doclet.snippet.markup.regex.invalid=\u6B63\u898F\u8868\u73FE\u304C\u7121\u52B9\u3067\u3059
-doclet.snippet.markup.region.duplicated=\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
-doclet.snippet.markup.region.none=\u7D42\u4E86\u3059\u308B\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
-doclet.snippet.markup.region.unpaired=\u30DA\u30A2\u306B\u306A\u3063\u3066\u3044\u306A\u3044\u30EA\u30FC\u30B8\u30E7\u30F3
-doclet.snippet.markup.tag.non.existent.lines=\u5B58\u5728\u3057\u306A\u3044\u884C\u3092\u30BF\u30B0\u304C\u53C2\u7167\u3057\u3066\u3044\u307E\u3059
-
-# 0: path
-doclet.cannot_use_snippet_path=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067''--snippet-path''\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
-
-# 0: path; 1: exception
-doclet.error_setting_snippet_path=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9{0}\u306E\u8A2D\u5B9A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
index 963a8763071..2a0f2b1c714 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
@@ -32,6 +32,8 @@ doclet.Serialized_Form=\u5E8F\u5217\u5316\u8868\u683C
 doclet.Serialized_Form_methods=\u5E8F\u5217\u5316\u65B9\u6CD5
 doclet.Serialized_Form_fields=\u5E8F\u5217\u5316\u5B57\u6BB5
 doclet.Serialized_Form_class=\u5E8F\u5217\u5316\u6982\u89C8
+doclet.Class_0_implements_serializable=\u7C7B{0}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
+doclet.Class_0_extends_implements_serializable=\u7C7B{0}\u6269\u5C55{1}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
 doclet.Option_conflict=\u9009\u9879{0}\u4E0E{1}\u51B2\u7A81
 doclet.Option_reuse=\u91CD\u590D\u4F7F\u7528\u7684\u9009\u9879: {0}
 doclet.Option_invalid={1} \u9009\u9879\u7684 {0} \u53C2\u6570\u65E0\u6548
@@ -47,8 +49,6 @@ doclet.internal.report.bug=\u5982\u679C\u5728 Bug Database (http://bugs.java.com
 doclet.File_not_found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
 doclet.Copy_Overwrite_warning=\u672A\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230 {1}, \u56E0\u4E3A\u73B0\u6709\u6587\u4EF6\u5177\u6709\u76F8\u540C\u540D\u79F0...
 doclet.Copy_Ignored_warning=\u672A\u590D\u5236\u6587\u4EF6 {0}\uFF1A\u540D\u79F0\u65E0\u6548
-doclet.Copy_snippet_to_clipboard=\u590D\u5236
-doclet.Copied_snippet_to_clipboard=\u5DF2\u590D\u5236\uFF01
 doclet.Copying_File_0_To_Dir_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u76EE\u5F55 {1}...
 doclet.Copying_File_0_To_File_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u6587\u4EF6{1}...
 doclet.No_Public_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u516C\u5171\u6216\u53D7\u4FDD\u62A4\u7684\u7C7B\u3002
@@ -78,11 +78,8 @@ doclet.not_standard_file_manager = \u65E0\u6CD5\u8BBE\u7F6E taglet \u8DEF\u5F84\
 doclet.Author=\u4F5C\u8005:
 doclet.DefaultValue=\u9ED8\u8BA4\u503C:
 doclet.PropertyDescription=\u5C5E\u6027\u8BF4\u660E:
-doclet.PropertyGetterWithName=\u83B7\u53D6{0}\u5C5E\u6027\u7684\u503C\u3002
-doclet.PropertyGetterReturn={0} \u5C5E\u6027\u7684\u503C
-doclet.PropertySetterWithName=\u8BBE\u7F6E{0}\u5C5E\u6027\u7684\u503C\u3002
-doclet.PropertySetterParam={0} \u5C5E\u6027\u7684\u503C
-doclet.PropertyMethodReturn={0} \u5C5E\u6027
+doclet.PropertyGetterWithName=\u83B7\u53D6\u5C5E\u6027{0}\u7684\u503C\u3002
+doclet.PropertySetterWithName=\u8BBE\u7F6E\u5C5E\u6027{0}\u7684\u503C\u3002
 doclet.Default=\u9ED8\u8BA4\u503C:
 doclet.Parameters=\u53C2\u6570:
 doclet.TypeParameters=\u7C7B\u578B\u53C2\u6570:
@@ -106,6 +103,7 @@ doclet.Factory=\u5DE5\u5382:
 doclet.UnknownTag={0}\u662F\u672A\u77E5\u6807\u8BB0\u3002
 doclet.UnknownTagLowercase={0}\u662F\u672A\u77E5\u6807\u8BB0 - \u9664\u4E86\u5927\u5C0F\u5199\u4E4B\u5916\u5176\u4ED6\u65B9\u9762\u4E0E\u5DF2\u77E5\u6807\u8BB0\u76F8\u540C\u3002
 doclet.noInheritedDoc=\u4F7F\u7528\u4E86 @inheritDoc, \u4F46{0}\u672A\u8986\u76D6\u6216\u5B9E\u73B0\u4EFB\u4F55\u65B9\u6CD5\u3002
+# doclet.malformed_html_link_tag=<a> tag is malformed:\n"{0}"
 doclet.tag_misuse=\u4E0D\u80FD\u5728{1}\u6587\u6863\u4E2D\u4F7F\u7528\u6807\u8BB0{0}\u3002\u53EA\u80FD\u5728\u4EE5\u4E0B\u7C7B\u578B\u7684\u6587\u6863\u4E2D\u4F7F\u7528\u8BE5\u6807\u8BB0: {2}\u3002
 doclet.Package_Summary=\u7A0B\u5E8F\u5305\u6982\u8981
 doclet.Requires_Summary=\u5FC5\u9700\u9879
@@ -118,6 +116,12 @@ doclet.Concealed_Packages_Summary=\u5DF2\u9690\u85CF
 doclet.From=\u4ECE
 doclet.Uses_Summary=\u4F7F\u7528
 doclet.Provides_Summary=\u63D0\u4F9B
+doclet.Interface_Summary=\u63A5\u53E3\u6982\u8981
+doclet.Annotation_Types_Summary=\u6CE8\u91CA\u7C7B\u578B\u6982\u8981
+doclet.Enum_Summary=\u679A\u4E3E\u6982\u8981
+doclet.Exception_Summary=\u5F02\u5E38\u9519\u8BEF\u6982\u8981
+doclet.Error_Summary=\u9519\u8BEF\u6982\u8981
+doclet.Class_Summary=\u7C7B\u6982\u8981
 doclet.Nested_Class_Summary=\u5D4C\u5957\u7C7B\u6982\u8981
 doclet.Annotation_Type_Optional_Member_Summary=\u53EF\u9009\u5143\u7D20\u6982\u8981
 doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9700\u5143\u7D20\u6982\u8981
@@ -126,38 +130,32 @@ doclet.Property_Summary=\u5C5E\u6027\u6982\u8981
 doclet.Enum_Constant_Summary=\u679A\u4E3E\u5E38\u91CF\u6982\u8981
 doclet.Constructor_Summary=\u6784\u9020\u5668\u6982\u8981
 doclet.Method_Summary=\u65B9\u6CD5\u6982\u8981
+doclet.Record_Summary=\u8BB0\u5F55\u6982\u8981
 doclet.Interfaces=\u63A5\u53E3
 doclet.Enums=\u679A\u4E3E
-doclet.EnumClasses=\u679A\u4E3E\u7C7B
-doclet.RecordClasses=\u8BB0\u5F55\u7C7B
-doclet.Related_Packages=\u76F8\u5173\u7A0B\u5E8F\u5305
 doclet.AnnotationTypes=\u6CE8\u91CA\u7C7B\u578B
-doclet.AnnotationInterfaces=\u6CE8\u91CA\u63A5\u53E3
-doclet.ExceptionClasses=\u5F02\u5E38\u9519\u8BEF\u7C7B
+doclet.Exceptions=\u5F02\u5E38\u9519\u8BEF
+doclet.Errors=\u9519\u8BEF
 doclet.Classes=\u7C7B
-doclet.All_Classes_And_Interfaces=\u6240\u6709\u7C7B\u548C\u63A5\u53E3
+doclet.packages=\u7A0B\u5E8F\u5305
+doclet.modules=\u6A21\u5757
+doclet.All_Classes=\u6240\u6709\u7C7B
 doclet.All_Superinterfaces=\u6240\u6709\u8D85\u7EA7\u63A5\u53E3:
 doclet.All_Implemented_Interfaces=\u6240\u6709\u5DF2\u5B9E\u73B0\u7684\u63A5\u53E3:
 doclet.Interface=\u63A5\u53E3
 doclet.Class=\u7C7B
 doclet.AnnotationType=\u6CE8\u91CA\u7C7B\u578B
-doclet.AnnotationInterface=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotationtype=\u6CE8\u91CA\u7C7B\u578B
-doclet.annotationinterface=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotationtypes=\u6CE8\u91CA\u7C7B\u578B
-doclet.annotationinterfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.Enum=\u679A\u4E3E
-doclet.EnumClass=\u679A\u4E3E\u7C7B
 doclet.enum=\u679A\u4E3E
-doclet.enumclass=\u679A\u4E3E\u7C7B
 doclet.enums=\u679A\u4E3E
-doclet.enumclasses=\u679A\u4E3E\u7C7B
 doclet.interface=\u63A5\u53E3
+doclet.interfaces=\u63A5\u53E3
 doclet.class=\u7C7B
-doclet.RecordClass=\u8BB0\u5F55\u7C7B
-doclet.recordclass=\u8BB0\u5F55\u7C7B
-doclet.ExceptionClass=\u5F02\u5E38\u9519\u8BEF\u7C7B
-doclet.exceptionclass=\u5F02\u5E38\u9519\u8BEF\u7C7B
+doclet.classes=\u7C7B
+doclet.Record=\u8BB0\u5F55
+doclet.record=\u8BB0\u5F55
 doclet.ExportedTo=\u5DF2\u5BFC\u51FA\u5230\u6A21\u5757
 doclet.OpenedTo=\u5DF2\u6253\u5F00\u5230\u6A21\u5757
 doclet.Package_private=(\u4E13\u7528\u7A0B\u5E8F\u5305)
@@ -192,10 +190,14 @@ doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u
 doclet.value_tag_invalid_use=\u6B64\u5904\u4E0D\u80FD\u4F7F\u7528 @value \u6807\u8BB0\u3002
 doclet.dest_dir_create=\u6B63\u5728\u521B\u5EFA\u76EE\u6807\u76EE\u5F55: "{0}"
 doclet.in={1}\u4E2D\u7684{0}
+doclet.Use_Table_Summary=\u4F7F\u7528\u8868, \u5217\u8868{0}\u548C\u89E3\u91CA
+doclet.Member_Table_Summary={0}\u8868, \u5217\u8868{1}\u548C\u89E3\u91CA
+doclet.fields=\u5B57\u6BB5
 doclet.Fields=\u5B57\u6BB5
-doclet.Preview=\u9884\u89C8\u3002
 doclet.Properties=\u5C5E\u6027
+doclet.constructors=\u6784\u9020\u5668
 doclet.Constructors=\u6784\u9020\u5668
+doclet.methods=\u65B9\u6CD5
 doclet.Methods=\u65B9\u6CD5
 doclet.All_Methods=\u6240\u6709\u65B9\u6CD5
 doclet.Static_Methods=\u9759\u6001\u65B9\u6CD5
@@ -206,6 +208,7 @@ doclet.Default_Methods=\u9ED8\u8BA4\u65B9\u6CD5
 doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
 doclet.Annotation_Type_Optional_Members=\u53EF\u9009\u5143\u7D20
 doclet.Annotation_Type_Required_Members=\u6240\u9700\u5143\u7D20
+doclet.enum_constants=\u679A\u4E3E\u5E38\u91CF
 doclet.Enum_Constants=\u679A\u4E3E\u5E38\u91CF
 doclet.Nested_Classes=\u5D4C\u5957\u7C7B
 doclet.Modifier=\u9650\u5B9A\u7B26
@@ -213,7 +216,6 @@ doclet.Type=\u7C7B\u578B
 doclet.Modifier_and_Type=\u4FEE\u9970\u7B26\u548C\u7C7B\u578B
 doclet.Implementation=\u5B9E\u73B0:
 doclet.search=SEARCH:
-doclet.search_placeholder=\u641C\u7D22
 doclet.Field=\u5B57\u6BB5
 doclet.Property=\u5C5E\u6027
 doclet.Constructor=\u6784\u9020\u5668
@@ -221,7 +223,6 @@ doclet.Method=\u65B9\u6CD5
 doclet.Annotation_Type_Optional_Member=\u53EF\u9009\u5143\u7D20
 doclet.Annotation_Type_Required_Member=\u5FC5\u9700\u7684\u5143\u7D20
 doclet.Annotation_Type_Member=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
-doclet.Annotation_Interface_Member=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
 doclet.Enum_Constant=\u679A\u4E3E\u5E38\u91CF
 doclet.Description=\u8BF4\u660E
 doclet.ConstantField=\u5E38\u91CF\u5B57\u6BB5
@@ -229,30 +230,25 @@ doclet.Value=\u503C
 doclet.linkMismatch_PackagedLinkedtoModule=\u8FDB\u884C\u6587\u6863\u5316\u7684\u4EE3\u7801\u4F7F\u7528\u4E86\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u7A0B\u5E8F\u5305\uFF0C\u4F46\u5728 {0} \u4E2D\u5B9A\u4E49\u7684\u7A0B\u5E8F\u5305\u5728\u547D\u540D\u6A21\u5757\u4E2D\u3002
 doclet.linkMismatch_ModuleLinkedtoPackage=\u8FDB\u884C\u6587\u6863\u5316\u7684\u4EE3\u7801\u4F7F\u7528\u4E86\u6A21\u5757\uFF0C\u4F46\u5728 {0} \u4E2D\u5B9A\u4E49\u7684\u7A0B\u5E8F\u5305\u5728\u672A\u547D\u540D\u6A21\u5757\u4E2D\u3002
 doclet.urlRedirected=URL {0} \u5DF2\u91CD\u5B9A\u5411\u5230 {1} \u2014 \u66F4\u65B0\u547D\u4EE4\u884C\u9009\u9879\u4EE5\u9690\u85CF\u6B64\u8B66\u544A\u3002
-doclet.duplicate.comment.for.property=\u5C5E\u6027\u6CE8\u91CA\u91CD\u590D\u3002\n\u5220\u9664\u5C5E\u6027\u5B57\u6BB5\u6216\u6B64\u65B9\u6CD5\u7684\u6CE8\u91CA\u4EE5\u9690\u85CF\u6B64\u8B66\u544A\u3002
 
 #Documentation for Enums
-doclet.enum_values_doc.fullbody=\u8FD4\u56DE\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\n\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
-doclet.enum_class_values_doc.fullbody=\u8FD4\u56DE\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\n\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
+doclet.enum_values_doc.fullbody=\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \n\u8FD4\u56DE\u4E00\u4E2A\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002
 
-doclet.enum_values_doc.return=\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
-doclet.enum_class_values_doc.return=\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
+doclet.enum_values_doc.return=\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F\u8FD4\u56DE\u7684\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
 
 doclet.enum_valueof_doc.fullbody=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)
-doclet.enum_class_valueof_doc.fullbody=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002\uFF08\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002\uFF09
 
 doclet.enum_valueof_doc.param_name=\u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002
 
 doclet.enum_valueof_doc.return=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF
 
 doclet.enum_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
-doclet.enum_class_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
 
 doclet.enum_valueof_doc.throws_npe=\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C
 
 
 #Documentation for records
-doclet.record_constructor_doc.fullbody=\u521B\u5EFA {0} \u8BB0\u5F55\u7C7B\u7684\u5B9E\u4F8B\u3002
+doclet.record_constructor_doc.fullbody=\u521B\u5EFA {0} \u8BB0\u5F55\u7684\u5B9E\u4F8B\u3002
 
 doclet.record_constructor_doc.param_name={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u503C
 
@@ -260,9 +256,9 @@ doclet.record_equals_doc.fullbody.head=\u6307\u793A\u67D0\u4E2A\u5176\u4ED6\u5BF
 
 doclet.record_equals_doc.fullbody.tail.both=\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u5BF9\u53C2\u8003\u7EC4\u4EF6\u8FDB\u884C\u6BD4\u8F83\uFF1B\u4F7F\u7528 '==' \u5BF9\u57FA\u5143\u7EC4\u4EF6\u8FDB\u884C\u6BD4\u8F83
 
-doclet.record_equals_doc.fullbody.tail.primitive=\u6B64\u8BB0\u5F55\u7C7B\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 '==' \u8FDB\u884C\u6BD4\u8F83\u3002
+doclet.record_equals_doc.fullbody.tail.primitive=\u6B64\u8BB0\u5F55\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 '==' \u8FDB\u884C\u6BD4\u8F83\u3002
 
-doclet.record_equals_doc.fullbody.tail.reference=\u6B64\u8BB0\u5F55\u7C7B\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u8FDB\u884C\u6BD4\u8F83\u3002
+doclet.record_equals_doc.fullbody.tail.reference=\u6B64\u8BB0\u5F55\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u8FDB\u884C\u6BD4\u8F83\u3002
 
 doclet.record_equals_doc.param_name=\u8981\u4E0E\u4E4B\u8FDB\u884C\u6BD4\u8F83\u7684\u5BF9\u8C61
 
@@ -272,7 +268,7 @@ doclet.record_hashCode_doc.fullbody=\u8FD4\u56DE\u6B64\u5BF9\u8C61\u7684\u54C8\u
 
 doclet.record_hashCode_doc.return=\u6B64\u5BF9\u8C61\u7684\u54C8\u5E0C\u4EE3\u7801\u503C
 
-doclet.record_toString_doc.fullbody=\u8FD4\u56DE\u6B64\u8BB0\u5F55\u7C7B\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F\u3002\u6B64\u8868\u793A\u5F62\u5F0F\u5305\u542B\u7C7B\u7684\u540D\u79F0\uFF0C\u540E\u8DDF\u6BCF\u4E2A\u8BB0\u5F55\u7EC4\u4EF6\u7684\u540D\u79F0\u548C\u503C\u3002
+doclet.record_toString_doc.fullbody=\u8FD4\u56DE\u6B64\u8BB0\u5F55\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F\u3002\u6B64\u8868\u793A\u5F62\u5F0F\u5305\u542B\u7C7B\u578B\u7684\u540D\u79F0\uFF0C\u540E\u8DDF\u6BCF\u4E2A\u8BB0\u5F55\u7EC4\u4EF6\u7684\u540D\u79F0\u548C\u503C\u3002
 
 doclet.record_toString_doc.return=\u6B64\u5BF9\u8C61\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F
 
@@ -285,46 +281,3 @@ doclet.record_field_doc.fullbody={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u5B57\u6BB5\
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
 doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
-
-doclet.search.no_results=\u672A\u627E\u5230\u7ED3\u679C
-doclet.search.loading=\u6B63\u5728\u52A0\u8F7D\u641C\u7D22\u7D22\u5F15...
-doclet.search.modules=\u6A21\u5757
-doclet.search.packages=\u7A0B\u5E8F\u5305
-doclet.search.classes_and_interfaces=\u7C7B\u548C\u63A5\u53E3
-doclet.search.types=\u7C7B\u578B
-doclet.search.members=\u6210\u5458
-doclet.search.search_tags=\u641C\u7D22\u6807\u8BB0
-
-doclet.snippet.contents.none=@snippet \u672A\u6307\u5B9A\u5185\u5BB9
-
-doclet.snippet.contents.ambiguity.external=@snippet \u6307\u5B9A\u4E86\u591A\u4E2A\u5916\u90E8\u5185\u5BB9\uFF0C\u8FD9\u4F1A\u5F15\u8D77\u6DF7\u6DC6
-
-doclet.snippet.region.not_found=\u627E\u4E0D\u5230\u533A\u57DF\uFF1A"{0}"
-
-doclet.tag.attribute.value.illegal=\u5C5E\u6027 "{0}" \u7684\u503C\u975E\u6CD5\uFF1A"{1}"
-
-doclet.tag.attribute.value.missing=\u5C5E\u6027 "{0}" \u7F3A\u5C11\u503C
-
-doclet.tag.attribute.repeated=\u91CD\u590D\u5C5E\u6027\uFF1A"{0}"
-
-doclet.snippet.contents.mismatch=\u5185\u5BB9\u4E0D\u5339\u914D\uFF1A\n{0}
-
-doclet.snippet.markup=\u7247\u6BB5\u6807\u8BB0\uFF1A{0}
-
-doclet.snippet.markup.spurious=\u865A\u5047\u6807\u8BB0
-doclet.snippet.markup.attribute.absent=\u7F3A\u5C11\u5C5E\u6027 "{0}"
-doclet.snippet.markup.attribute.simultaneous.use=\u540C\u65F6\u4F7F\u7528\u4E86\u5C5E\u6027 "{0}" \u548C "{1}"
-doclet.snippet.markup.attribute.unexpected=\u610F\u5916\u7684\u5C5E\u6027
-doclet.snippet.markup.attribute.value.invalid=\u5C5E\u6027\u503C\u65E0\u6548
-doclet.snippet.markup.attribute.value.unterminated=\u672A\u7EC8\u6B62\u7684\u5C5E\u6027\u503C
-doclet.snippet.markup.regex.invalid=\u6B63\u5219\u8868\u8FBE\u5F0F\u65E0\u6548
-doclet.snippet.markup.region.duplicated=\u91CD\u590D\u7684\u533A\u57DF
-doclet.snippet.markup.region.none=\u6CA1\u6709\u7ED3\u675F\u533A\u57DF
-doclet.snippet.markup.region.unpaired=\u533A\u57DF\u4E0D\u914D\u5BF9
-doclet.snippet.markup.tag.non.existent.lines=\u6807\u8BB0\u5F15\u7528\u4E0D\u5B58\u5728\u7684\u884C
-
-# 0: path
-doclet.cannot_use_snippet_path=\u4E0D\u80FD\u5C06 ''--snippet-path'' \u9009\u9879\u4E0E\u7ED9\u5B9A\u7684\u6587\u4EF6\u7BA1\u7406\u5668 {0} \u4E00\u8D77\u4F7F\u7528
-
-# 0: path; 1: exception
-doclet.error_setting_snippet_path=\u8BBE\u7F6E\u7247\u6BB5\u8DEF\u5F84 {0} \u65F6\u51FA\u9519\uFF1A{1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
deleted file mode 100644
index ddd24f74484..00000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-dc.anchor.already.defined = Anker bereits definiert: "{0}"
-dc.anchor.value.missing = kein Wert f\u00FCr Anker angegeben
-dc.attr.lacks.value = Attribut hat keinen Wert
-dc.attr.not.number = Attributwert ist keine Zahl
-dc.attr.not.supported.html5 = Attribut wird in HTML5 nicht unterst\u00FCtzt: {0}
-dc.attr.obsolete = Attribut veraltet: {0}
-dc.attr.repeated = wiederholtes Attribut: {0}
-dc.attr.img.border.not.valid = Attribut "border" f\u00FCr img akzeptiert nur "0": {0}
-dc.attr.img.border.not.number = ung\u00FCltiger Wert f\u00FCr Attribut "border": {0}
-dc.attr.table.border.not.valid = Attribut "border" f\u00FCr Tabelle akzeptiert nur "" oder "1": {0}
-dc.attr.table.border.not.number = ung\u00FCltiger Wert f\u00FCr Attribut "border": {0}
-dc.attr.unknown = unbekanntes Attribut: {0}
-dc.bad.option = ung\u00FCltige Option: {0}
-dc.bad.value.for.option = ung\u00FCltiger Wert f\u00FCr Option: {0} {1}
-dc.default.constructor = Verwendung von Standardkonstruktor, der keinen Kommentar bereitstellt
-dc.empty = keine Beschreibung f\u00FCr @{0}
-dc.empty.comment = leerer Kommentar
-dc.empty.description = keine anf\u00E4ngliche Beschreibung
-dc.entity.invalid = ung\u00FCltige Entity &{0};
-dc.exception.not.thrown = Ausnahme nicht ausgel\u00F6st: {0}
-dc.exists.param = @param "{0}" wurde bereits angegeben
-dc.exists.return = @return wurde bereits angegeben
-dc.invalid.anchor = ung\u00FCltiger Name f\u00FCr Anker: "{0}"
-dc.invalid.param = ung\u00FCltige Verwendung von @param
-dc.invalid.provides = ung\u00FCltige Verwendung von @provides
-dc.invalid.return = ung\u00FCltige Verwendung von @return
-dc.invalid.summary = ung\u00FCltige Verwendung von @summary
-dc.invalid.throws = ung\u00FCltige Verwendung von @throws
-dc.invalid.uses = ung\u00FCltige Verwendung von @uses
-dc.invalid.uri = ung\u00FCltige URI: "{0}"
-dc.missing.comment = kein Kommentar
-dc.missing.param = kein @param f\u00FCr {0}
-dc.missing.return = kein @return
-dc.missing.throws = kein @throws f\u00FCr {0}
-dc.no.alt.attr.for.image = kein Attribut "alt" f\u00FCr Bild
-dc.no.summary.or.caption.for.table=keine Beschriftung f\u00FCr Tabelle
-dc.param.name.not.found = @param-Name nicht gefunden
-dc.ref.not.found = Referenz nicht gefunden
-dc.return.not.first = '{@return} nicht am Anfang der Beschreibung
-dc.service.not.found = service-type nicht gefunden
-dc.tag.code.within.code = '{@code} in <code>
-dc.tag.empty = leeres <{0}>-Tag
-dc.tag.a.within.a = {0}-Tag, das zu <a> erweitert wird, in <a>
-dc.tag.end.not.permitted = ung\u00FCltiges Endtag: </{0}>
-dc.tag.end.unexpected = unerwartetes Endtag: </{0}>
-dc.tag.heading.sequence.1 = \u00DCberschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden \u00DCberschrift: <H{1}>
-dc.tag.heading.sequence.2 = \u00DCberschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur vorhergehenden \u00DCberschrift: <{1}>
-dc.tag.heading.sequence.3 = unerwartete \u00DCberschrift verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden \u00DCberschrift: <H{1}>
-dc.tag.nested.not.allowed=verschachteltes Tag nicht zul\u00E4ssig: <{0}>
-dc.tag.nested.tag=verschachteltes Tag: {0}
-dc.tag.not.allowed.here = Tag hier nicht zul\u00E4ssig: <{0}>
-dc.tag.not.allowed = Element nicht zul\u00E4ssig in Dokumentationskommentaren: <{0}>
-dc.tag.not.allowed.inline.element = Blockelement nicht zul\u00E4ssig in Inlineelement <{1}>: {0}
-dc.tag.not.allowed.inline.tag = Blockelement nicht zul\u00E4ssig in @{1}: {0}
-dc.tag.not.allowed.inline.other = Blockelement hier nicht zul\u00E4ssig: {0}
-dc.tag.not.closed= Element nicht geschlossen: {0}
-dc.tag.p.in.pre= unerwartete Verwendung von <p> in <pre>-Element
-dc.tag.requires.heading = \u00DCberschrift nicht gefunden f\u00FCr </{0}>
-dc.tag.self.closing = selbstschlie\u00DFendes Element nicht zul\u00E4ssig
-dc.tag.start.unmatched = Endtag fehlt: </{0}>
-dc.tag.unknown = unbekanntes Tag: {0}
-dc.tag.not.supported.html5 = Tag nicht unterst\u00FCtzt in HTML5: {0}
-dc.text.not.allowed = Text nicht zul\u00E4ssig in <{0}>-Element
-dc.unexpected.comment=Dokumentationskommentar hier nicht erwartet
-dc.value.not.allowed.here='{@value} hier nicht zul\u00E4ssig
-dc.value.not.a.constant=Wert bezieht sich nicht auf eine Konstante
-
-dc.main.ioerror=I/O-Fehler: {0}
-dc.main.no.files.given=Keine Dateien angegeben
-dc.main.usage=Verwendung:\n    doclint [Optionen] source-files...\n\nOptionen:\n  -Xmsgs  \n    Gleich wie -Xmsgs:all\n  -Xmsgs:values\n    Gibt Kategorien von zu pr\u00FCfenden Problemen an, wobei "values"\n    eine kommagetrennte Liste ist, die Folgendes enthalten kann:\n      reference      zeigt Stellen, wo Kommentare falsche Referenzen\n                     auf Java-Quellcodeelemente enthalten\n      syntax         zeigt grundlegende Syntaxfehler in Kommentaren\n      html           zeigt Probleme bei HTML-Tags und Attributen\n      accessibility  zeigt Probleme bei der Barrierefreiheit\n      missing        zeigt Probleme aufgrund fehlender Dokumentation\n      all            alles Obengenannte\n    Stellen Sie Werten zur Negierung "-" voran\n    Kategorien k\u00F6nnen durch eine der folgenden Angaben qualifiziert werden:\n      /public /protected /package /private\n    Bei positiven Kategorien (die nicht mit "-" beginnen)\n    gilt der Qualifier f\u00FCr diese und h\u00F6here Zugriffsebenen.\n    Bei negativen Kategorien (die mit "-" beginnen)\n    gilt der Qualifier f\u00FCr diese und niedrigere Zugriffsebenen.\n    Wenn ein Qualifier fehlt, gilt die Kategorie f\u00FCr\n    alle Zugriffsebenen.\n    Beispiel: -Xmsgs:all,-syntax/private\n    So werden alle Meldungen au\u00DFer Syntaxfehlermeldungen\n    in den Dokumentkommentaren privater Methoden aktiviert.\n    Werden keine -Xmsgs-Optionen angegeben, ist der Standard\n    \u00E4quivalent zu -Xmsgs:all/protected, d.h.\n    alle Meldungen werden nur f\u00FCr gesch\u00FCtzte und \u00F6ffentliche\n    Deklarationen ausgegeben.\n  -XcheckPackage:<Packages>\n    Aktiviert oder deaktiviert Pr\u00FCfungen in bestimmten Packages.\n    <Packages> ist eine kommagetrennte Liste von Packagebezeichnern.\n    Der Packagebezeichner ist entweder ein qualifizierter Name eines Packages\n    oder ein Packagenamenspr\u00E4fix, gefolgt von ".*", das auf alle\n    Subpackages des angegebenen Packages erweitert wird. Stellen Sie dem Packagebezeichner\n     "-" voran, um Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.\n  -stats\n    Meldet Statistiken zu den gemeldeten Problemen.\n  -h -help --help -usage -?\n    Zeigt diese Meldung an.\n\nDie folgenden Javac-Optionen werden ebenfalls unterst\u00FCtzt:\n  -bootclasspath, -classpath, -cp, -sourcepath, -Xmaxerrs, -Xmaxwarns\n\nUm doclint f\u00FCr einen Teil eines Projekts auszuf\u00FChren, stellen Sie die kompilierten Klassen f\u00FCr das\nProjekt in den Classpath (oder Boot Classpath), und geben Sie dann in der Befehlszeile\ndie zu pr\u00FCfenden Quelldateien an.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
index 273105b73e3..3821b0eb9f8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
@@ -29,18 +29,14 @@ dc.attr.lacks.value = \u5C5E\u6027\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u30
 dc.attr.not.number = \u5C5E\u6027\u5024\u304C\u6570\u5B57\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 dc.attr.not.supported.html5 = \u5C5E\u6027\u306FHTML5\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.attr.obsolete = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059: {0}
+dc.attr.obsolete.use.css = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
 dc.attr.repeated = \u7E70\u308A\u8FD4\u3055\u308C\u305F\u5C5E\u6027: {0}
-dc.attr.img.border.not.valid = img\u306E\u5C5E\u6027"border"\u306F"0"\u306E\u307F\u3092\u53D7\u3051\u5165\u308C\u307E\u3059: {0}
-dc.attr.img.border.not.number = \u5C5E\u6027"border"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
-dc.attr.table.border.not.valid = \u8868\u306E\u5C5E\u6027"border"\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u3092\u53D7\u3051\u5165\u308C\u307E\u3059: {0}
-dc.attr.table.border.not.number = \u5C5E\u6027"border"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
+dc.attr.img.border = \u753b\u50cf\u306e\u5c5e\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
+dc.attr.table.border = \u8868\u306E\u5C5E\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
 dc.attr.unknown = \u4E0D\u660E\u306A\u5C5E\u6027: {0}
 dc.bad.option = \u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 dc.bad.value.for.option = \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: {0} {1}
-dc.default.constructor = \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u4F7F\u7528\u3067\u3001\u30B3\u30E1\u30F3\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 dc.empty = @{0}\u306E\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
-dc.empty.comment = \u30B3\u30E1\u30F3\u30C8\u304C\u7A7A\u3067\u3059
-dc.empty.description = \u521D\u671F\u306E\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
 dc.entity.invalid = \u7121\u52B9\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3&{0};
 dc.exception.not.thrown = \u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.exists.param = @param "{0}"\u306F\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
@@ -58,7 +54,7 @@ dc.missing.param = {0}\u306E@param\u304C\u3042\u308A\u307E\u305B\u3093
 dc.missing.return = @return\u304C\u3042\u308A\u307E\u305B\u3093
 dc.missing.throws = {0}\u306E@throws\u304C\u3042\u308A\u307E\u305B\u3093
 dc.no.alt.attr.for.image = \u30A4\u30E1\u30FC\u30B8\u306E"alt"\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
-dc.no.summary.or.caption.for.table=\u8868\u306E\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
+dc.no.summary.or.caption.for.table=\u8868\u306E\u8981\u7D04\u307E\u305F\u306F\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
 dc.param.name.not.found = @param name\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 dc.ref.not.found = \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 dc.return.not.first = '{@return}\u304C\u8AAC\u660E\u306E\u5148\u982D\u306B\u3042\u308A\u307E\u305B\u3093
@@ -72,7 +68,6 @@ dc.tag.heading.sequence.1 = \u6697\u9ED9\u7684\u306A\u5148\u884C\u898B\u51FA\u30
 dc.tag.heading.sequence.2 = \u524D\u306E\u898B\u51FA\u3057: <{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u898B\u51FA\u3057: <{0}>\u306E\u9806\u5E8F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
 dc.tag.heading.sequence.3 = \u6697\u9ED9\u7684\u306A\u5148\u884C\u898B\u51FA\u3057: <H{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4E88\u671F\u3057\u306A\u3044\u898B\u51FA\u3057: <{0}>\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
 dc.tag.nested.not.allowed=\u30CD\u30B9\u30C8\u3057\u305F\u30BF\u30B0\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: <{0}>
-dc.tag.nested.tag=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30BF\u30B0: {0}
 dc.tag.not.allowed.here = \u3053\u3053\u3067\u306F\u30BF\u30B0\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: <{0}>
 dc.tag.not.allowed = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u3067\u4F7F\u7528\u3067\u304D\u306A\u3044\u8981\u7D20\u3067\u3059: <{0}>
 dc.tag.not.allowed.inline.element = \u30A4\u30F3\u30E9\u30A4\u30F3\u8981\u7D20<{1}>\u5185\u3067\u4F7F\u7528\u3067\u304D\u306A\u3044\u30D6\u30ED\u30C3\u30AF\u8981\u7D20\u3067\u3059: {0}
@@ -84,7 +79,7 @@ dc.tag.requires.heading = </{0}>\u306E\u898B\u51FA\u3057\u304C\u898B\u3064\u304B
 dc.tag.self.closing = \u81EA\u5DF1\u7D42\u4E86\u8981\u7D20\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.tag.start.unmatched = \u7D42\u4E86\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093: </{0}>
 dc.tag.unknown = \u4E0D\u660E\u306A\u30BF\u30B0: {0}
-dc.tag.not.supported.html5 = \u30BF\u30B0\u306FHTML5\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
+dc.tag.not.supported.html5 = \u30bf\u30b0\u306fHTML5\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093: {0}
 dc.text.not.allowed = <{0}>\u8981\u7D20\u3067\u306F\u30C6\u30AD\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.unexpected.comment=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306F\u3053\u3053\u3067\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
 dc.value.not.allowed.here='{@value}\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
index 58c307c9aa6..55c2bbfa8ee 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
@@ -29,18 +29,14 @@ dc.attr.lacks.value = \u5C5E\u6027\u7F3A\u5C11\u503C
 dc.attr.not.number = \u5C5E\u6027\u503C\u4E0D\u662F\u6570\u5B57
 dc.attr.not.supported.html5 = \u5C5E\u6027\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301: {0}
 dc.attr.obsolete = \u5C5E\u6027\u5DF2\u8FC7\u65F6: {0}
+dc.attr.obsolete.use.css = \u5C5E\u6027\u5DF2\u8FC7\u65F6, \u8BF7\u6539\u7528 CSS: {0}
 dc.attr.repeated = \u5C5E\u6027\u91CD\u590D: {0}
-dc.attr.img.border.not.valid = \u56FE\u50CF\u7684\u5C5E\u6027 "border" \u53EA\u63A5\u53D7 "0"\uFF1A{0}
-dc.attr.img.border.not.number = \u5C5E\u6027 "border" \u7684\u503C\u65E0\u6548\uFF1A"{0}"
-dc.attr.table.border.not.valid = \u8868\u7684\u5C5E\u6027 "border" \u53EA\u63A5\u53D7 "" \u6216 "1"\uFF1A{0}
-dc.attr.table.border.not.number = \u5C5E\u6027 "border" \u7684\u503C\u65E0\u6548\uFF1A"{0}"
+dc.attr.img.border = \u56FE\u50CF\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
+dc.attr.table.border = \u8868\u7684\u5C5E\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
 dc.attr.unknown = \u672A\u77E5\u5C5E\u6027: {0}
 dc.bad.option = \u9009\u9879\u9519\u8BEF: {0}
 dc.bad.value.for.option = \u9009\u9879\u7684\u503C\u9519\u8BEF: {0} {1}
-dc.default.constructor = \u4F7F\u7528\u4E0D\u63D0\u4F9B\u6CE8\u91CA\u7684\u9ED8\u8BA4\u6784\u9020\u5668
 dc.empty = @{0} \u6CA1\u6709\u8BF4\u660E
-dc.empty.comment = \u7A7A\u6CE8\u91CA
-dc.empty.description = \u6CA1\u6709\u521D\u59CB\u8BF4\u660E
 dc.entity.invalid = \u5B9E\u4F53 &{0}; \u65E0\u6548
 dc.exception.not.thrown = \u672A\u629B\u51FA\u5F02\u5E38\u9519\u8BEF: {0}
 dc.exists.param = \u5DF2\u6307\u5B9A @param "{0}"
@@ -58,7 +54,7 @@ dc.missing.param = {0}\u6CA1\u6709 @param
 dc.missing.return = \u6CA1\u6709 @return
 dc.missing.throws = {0}\u6CA1\u6709 @throws
 dc.no.alt.attr.for.image = \u56FE\u50CF\u6CA1\u6709 "alt" \u5C5E\u6027
-dc.no.summary.or.caption.for.table=\u8868\u6CA1\u6709\u6807\u9898
+dc.no.summary.or.caption.for.table=\u8868\u6CA1\u6709\u6982\u8981\u6216\u6807\u9898
 dc.param.name.not.found = @param name \u672A\u627E\u5230
 dc.ref.not.found = \u627E\u4E0D\u5230\u5F15\u7528
 dc.return.not.first = '{@return} \u4E0D\u5728\u8BF4\u660E\u7684\u5F00\u5934
@@ -72,7 +68,6 @@ dc.tag.heading.sequence.1 = \u4F7F\u7528\u7684\u6807\u9898\u8D85\u51FA\u5E8F\u52
 dc.tag.heading.sequence.2 = \u4F7F\u7528\u7684\u6807\u9898\u8D85\u51FA\u5E8F\u5217\uFF1A<{0}>\uFF08\u4E0E\u524D\u4E00\u4E2A\u6807\u9898\u76F8\u6BD4\uFF1A<{1}>\uFF09
 dc.tag.heading.sequence.3 = \u4F7F\u7528\u4E86\u610F\u5916\u7684\u6807\u9898\uFF1A<{0}>\uFF08\u4E0E\u9690\u5F0F\u524D\u5BFC\u6807\u9898\u76F8\u6BD4\uFF1A<H{1}>\uFF09
 dc.tag.nested.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u5D4C\u5957\u6807\u8BB0: <{0}>
-dc.tag.nested.tag=\u5D4C\u5957\u6807\u8BB0\uFF1A{0}
 dc.tag.not.allowed.here = \u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u6807\u8BB0: <{0}>
 dc.tag.not.allowed = \u6587\u6863\u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5143\u7D20: <{0}>
 dc.tag.not.allowed.inline.element = \u5185\u5D4C\u5143\u7D20 <{1}> \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5757\u5143\u7D20: {0}
@@ -84,7 +79,7 @@ dc.tag.requires.heading = \u672A\u627E\u5230 </{0}> \u7684\u6807\u9898
 dc.tag.self.closing = \u4E0D\u5141\u8BB8\u4F7F\u7528\u81EA\u5173\u95ED\u5143\u7D20
 dc.tag.start.unmatched = \u7F3A\u5C11\u7ED3\u675F\u6807\u8BB0: </{0}>
 dc.tag.unknown = \u672A\u77E5\u6807\u8BB0: {0}
-dc.tag.not.supported.html5 = \u6807\u8BB0\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301\uFF1A{0}
+dc.tag.not.supported.html5 = \u6807\u8BB0\u5728\u751F\u6210\u7684 HTML \u7248\u672C\u4E2D\u4E0D\u53D7\u652F\u6301: {0}
 dc.text.not.allowed = <{0}> \u5143\u7D20\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u6587\u672C
 dc.unexpected.comment=\u6B64\u5904\u672A\u9884\u671F\u6587\u6863\u6CE8\u91CA
 dc.value.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 '{@value}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
deleted file mode 100644
index 9e410603c81..00000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
+++ /dev/null
@@ -1,210 +0,0 @@
-#
-# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-main.errors={0} Fehler
-main.error={0} Fehler
-main.warnings={0} Warnungen
-main.warning={0} Warnung
-
-main.usage=Verwendung:\n    javadoc [options] [packagenames] [sourcefiles] [@files]\nmit folgenden Optionen:
-
-main.opt.at.arg=<Datei>
-main.opt.at.desc=Liest Optionen und Dateinamen aus Datei
-
-main.opt.public.desc=Zeigt nur \u00F6ffentliche Typen und Mitglieder. Zeigt bei benannten Modulen\nnur exportierte Packages und die API des Moduls.
-
-main.opt.protected.desc=Zeigt gesch\u00FCtzte/\u00F6ffentliche Typen und Mitglieder (Standard). Zeigt\nbei benannten Modulen exportierte Packages und die API des Moduls.
-
-main.opt.package.desc=Zeigt Package-/gesch\u00FCtzte/\u00F6ffentliche Typen und Mitglieder. Zeigt\nbei benannten Modulen alle Packages und alle Moduldetails.
-
-main.opt.private.desc=Zeigt alle Typen und Mitglieder. Zeigt bei benannten Modulen\nalle Packages und alle Moduldetails.
-
-main.opt.show.members.arg=<Wert>
-main.opt.show.members.desc=Gibt an, welche Mitglieder (Felder, Methoden usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt \u00F6ffentliche und gesch\u00FCtzte Mitglieder, "public" zeigt nur\n\u00F6ffentliche Mitglieder, "package" zeigt \u00F6ffentliche, gesch\u00FCtzte und\nPackagemitglieder, und "private" zeigt alle Mitglieder.
-
-main.opt.show.types.arg=<Wert>
-main.opt.show.types.desc=Gibt an, welche Typen (Klassen, Schnittstellen usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt \u00F6ffentliche und gesch\u00FCtzte Typen, "public" zeigt nur\n\u00F6ffentliche Typen, "package" zeigt \u00F6ffentliche, gesch\u00FCtzte und\nPackagetypen, und "private" zeigt alle Typen.
-
-main.opt.show.packages.arg=<Wert>
-main.opt.show.packages.desc=Gibt das Modul an, dessen Packages dokumentiert werden. M\u00F6gliche\nWerte sind "exported" oder "all" (exportierte oder alle Packages).
-
-main.opt.show.module.contents.arg=<Wert>
-main.opt.show.module.contents.desc=Gibt die Dokumentationsgranularit\u00E4t von Moduldeklarationen\nan. M\u00F6gliche Werte sind "api" oder "all".
-
-main.opt.expand.requires.arg=<Wert>
-main.opt.expand.requires.desc=Anweisungen im Tool zum Erweitern des zu dokumentierenden\nModulsets. Standardm\u00E4\u00DFig werden nur die Module dokumentiert,\ndie in der Befehlszeile ausdr\u00FCcklich angegeben werden. Der Wert\n"transitive" schlie\u00DFt zus\u00E4tzlich alle "requires transitive"-Abh\u00E4ngigkeiten\nder Module ein. Der Wert "all" schlie\u00DFt\nalle Abh\u00E4ngigkeiten der Module ein.
-
-main.opt.help.desc=Zeigt die Befehlszeilenoptionen an und beendet
-
-main.opt.module.arg=<Modul>(,<Modul>)*
-main.opt.module.desc=Dokumentiert die angegebenen Module
-
-main.opt.doclet.arg=<Klasse>
-main.opt.doclet.desc=Generiert die Ausgabe \u00FCber ein alternatives Doclet
-
-main.opt.docletpath.arg=<Pfad>
-main.opt.docletpath.desc=Gibt an, wo sich Doclet-Klassendateien befinden
-
-main.opt.module.source.path.arg=<Pfad>
-main.opt.module.source.path.desc=Gib an, wo sich die Eingabequelldateien f\u00FCr mehrere Module befinden
-
-main.opt.upgrade.module.path.arg=<Pfad>
-main.opt.upgrade.module.path.desc=Setzt den Speicherort der upgradef\u00E4higen Module au\u00DFer Kraft
-
-main.opt.module.path.arg=<Pfad>
-main.opt.module.path.desc=Gibt an, wo sich die Anwendungsmodule befinden
-
-main.opt.add.modules.arg=<Modul>(,<Modul>)*
-main.opt.add.modules.desc=Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen Modulen\naufgel\u00F6st werden sollen, oder alle Module im Modulpfad,\nwenn <Modul> ALL-MODULE-PATH lautet.
-
-main.opt.limit.modules.arg=<Modul>(,<Modul>)*
-main.opt.limit.modules.desc=Begrenzt die Gesamtzahl der beobachtbaren Module
-
-main.opt.source.path.arg=<Pfad>
-main.opt.source.path.desc=Gibt an, wo sich die Quelldateien befinden
-
-main.opt.class.path.arg=<Pfad>
-main.opt.class.path.desc=Gibt an, wo sich die Benutzerklassendateien befinden
-
-main.opt.exclude.arg=<Packageliste>
-main.opt.exclude.desc=Liste der auszuschlie\u00DFenden Packages
-
-main.opt.subpackages.arg=<Subpackageliste>
-main.opt.subpackages.desc=Gibt die Subpackages an, die rekursiv geladen werden sollen
-
-main.opt.breakiterator.desc=Berechnet den ersten Satz mit BreakIterator
-
-main.opt.bootclasspath.arg=<Pfad>
-main.opt.bootclasspath.desc=Setzt den Speicherort der f\u00FCr nicht modulare Releases\nverwendeten Plattformklassendateien au\u00DFer Kraft
-
-main.opt.system.arg=<JDK>
-main.opt.system.desc=Setzt den Speicherort der f\u00FCr modulare Releases verwendeten Systemmodule au\u00DFer Kraft
-
-main.opt.release.arg=<Release>
-main.opt.release.desc=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release
-
-main.opt.source.arg=<Release>
-main.opt.source.desc=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release
-
-main.opt.enable.preview.desc=Aktiviert Vorschausprachfeatures. Wird in Verbindung\nmit -source oder --release verwendet.
-
-main.opt.extdirs.arg=<Verzeichnisliste>
-main.opt.extdirs.desc=Setzt den Speicherort der installierten Erweiterungen au\u00DFer Kraft
-
-main.opt.verbose.desc=Gibt Meldungen \u00FCber die Javadoc-Vorg\u00E4nge aus
-
-main.opt.locale.arg=<Name>
-main.opt.locale.desc=Zu verwendendes Gebietsschema, z.B. en_US oder en_US_WIN
-
-main.opt.encoding.arg=<Name>
-main.opt.encoding.desc=Quelldateicodierungsname
-
-main.opt.quiet.desc=Zeigt keine Statusmeldungen an
-
-main.opt.version.desc=Gibt Versionsinformationen aus
-
-main.opt.J.arg=<Flag>
-main.opt.J.desc=\u00DCbergibt <Flag> direkt an das Laufzeitsystem
-
-main.opt.help.extra.desc=Gibt eine Zusammenfassung nicht standardm\u00E4\u00DFiger Optionen aus und beendet
-
-main.opt.Werror.desc=Meldet einen Fehler beim Auftreten von Warnungen
-
-main.usage.foot=\nIn Optionen im GNU-Stil kann "=" statt Leerzeichen verwendet werden, um den Namen einer Option\nvon ihrem Wert zu trennen.\n
-
-main.Xusage=
-
-main.opt.Xmaxerrs.arg=<Nummer>
-main.opt.Xmaxerrs.desc=Legt die maximale Anzahl der zu auszugebenden Fehler fest
-
-main.opt.Xmaxwarns.arg=<Nummer>
-main.opt.Xmaxwarns.desc=Legt die maximale Anzahl der auszugebenden Warnungen fest
-
-main.opt.add.exports.arg=<Modul>/<Package>=<Anderes Modul>(,<Anderes Modul>)*
-main.opt.add.exports.desc=Gibt an, dass ein Package als aus seinem definierenden Modul\nin weitere Module oder, wenn <Anderes Modul> ALL-UNNAMED\nlautet, in alle unbenannten Module exportiert betrachtet werden soll
-
-main.opt.add.reads.arg=<Modul>=<Anderes Modul>(,<Anderes Modul>)*
-main.opt.add.reads.desc=Gibt weitere Module an, die als von einem angegebenen Modul angefordert\nbetrachtet werden sollen. <Anderes Modul> kann ALL-UNNAMED lauten,\num das unbenannte Modul anzufordern.
-
-main.opt.patch.module.arg=<Modul>=<Datei>(:<Datei>)*
-main.opt.patch.module.desc=Setzt ein Modul au\u00DFer Kraft oder erweitert es mit Klassen\nund Ressourcen in JAR-Dateien oder Verzeichnissen
-
-main.Xusage.foot=\nDies sind keine Standardoptionen, und sie k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.
-
-main.doclet.usage.header=\nBereitgestellt vom Doclet {0}:
-
-main.requires_argument=F\u00FCr die Option {0} ist ein Argument erforderlich.
-main.unnecessary_arg_provided=Option {0} erfordert kein Argument
-main.only_one_argument_with_equals=Syntax mit "=" kann nicht f\u00FCr Optionen verwendet werden, die mehrere Argumente erfordern
-main.invalid_flag=Ung\u00FCltiges Kennzeichen: {0}
-main.No_modules_packages_or_classes_specified=Keine Module, Packages oder Klassen angegeben.
-main.module_not_found=Modul {0} nicht gefunden
-main.module_source_not_found=Quelldateien f\u00FCr Modul {0} nicht gefunden
-main.cannot_use_sourcepath_for_modules=Quellpfad kann nicht f\u00FCr mehrere Module {0} verwendet werden
-main.module_not_found_on_sourcepath=Modul {0} in Quellpfad nicht gefunden
-main.sourcepath_does_not_contain_module=Quellpfad enth\u00E4lt nicht Modul {0}
-main.cant.read={0} kann nicht gelesen werden
-main.Loading_source_files_for_package=Quelldateien werden geladen f\u00FCr Package {0}...
-main.Loading_source_file=Quelldatei {0} wird geladen...
-main.Building_tree=Javadoc-Informationen werden erstellt...
-main.no_source_files_for_package=Keine Quelldateien f\u00FCr Package {0}
-main.package_not_found=Package {0} nicht gefunden
-main.fatal.error=schwerwiegender Fehler aufgetreten: {0}
-main.out.of.memory=java.lang.OutOfMemoryError: Erweitern Sie den Speicher.\nBeispiel: F\u00FCgen Sie bei JDK Classic- oder HotSpot-VMs die Option -J-Xmx\nhinzu, zum Beispiel -J-Xmx32m.
-main.done_in=[fertig in {0} ms]
-main.more_than_one_doclet_specified_0_and_1=Mehr als ein Doclet angegeben: ({0} und {1}).
-main.doclet_could_not_get_location=Speicherort f\u00FCr {0} konnte nicht abgerufen werden
-main.doclet_could_not_set_location=Speicherort f\u00FCr {0} konnte nicht festgelegt werden
-main.doclet_no_classloader_found=Class Loader zum Laden von {0} konnte nicht abgerufen werden
-main.could_not_instantiate_class=Klasse {0} konnte nicht instanziiert werden
-main.doclet_class_not_found=Doclet-Klasse {0} nicht gefunden
-main.malformed_locale_name=Nicht wohlgeformter Gebietsschemaname: {0}
-main.file_not_found=Datei nicht gefunden: "{0}"
-main.illegal_class_name=Ung\u00FCltiger Klassenname: "{0}"
-main.illegal_package_name=Ung\u00FCltiger Packagename: "{0}"
-main.illegal_option_value=Ung\u00FCltiger Optionswert: "{0}"
-main.file.manager.list=FileManager-Fehler beim Auflisten von Dateien: "{0}"
-main.assertion.error=Assertion-Fehler: "{0}"
-main.warnings.Werror=Warnungen gefunden und -Werror angegeben
-main.unknown.error=ein unbekannter Fehler ist aufgetreten
-main.internal.error=ein interner Fehler ist aufgetreten
-main.unexpected.exception=eine unerwartete Ausnahme wurde abgefangen: {0}
-main.unknown.option.for.filemanager=Option wird von Dateimanager nicht unterst\u00FCtzt: {0}
-main.bad.arg.for.filemanager.option=ung\u00FCltiger Wert f\u00FCr Dateimanageroption {0}: "{1}"
-doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bug\nf\u00FCr das javadoc-Tool, nachdem Sie in der Bugdatenbank (http://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
-main.not_a_doclet=Klasse {0} ist kein g\u00FCltiges Doclet.\nHinweis: Ab JDK 13 wird die API com.sun.javadoc nicht mehr unterst\u00FCtzt.
-
-javadoc.class_not_found=Klasse {0} nicht gefunden.
-
-javadoc.error.msg={0}: Fehler - {1}
-javadoc.warning.msg={0}: Warnung - {1}
-javadoc.note.msg = {1}
-javadoc.note.pos.msg= {0}: {1}
-javadoc.version={0} {1}
-javadoc.fullversion={0} Vollversion "{1}"
-
-javadoc.err.message={0}
-javadoc.warn.message={0}
-javadoc.note.message={0}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
index 6afc97aa512..c55cdd66bfd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -191,20 +191,14 @@ main.warnings.Werror=\u8B66\u544A\u304C\u898B\u3064\u304B\u308A-Werror\u304C\u63
 main.unknown.error=\u4E0D\u660E\u306A\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 main.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 main.unexpected.exception=\u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916\u304C\u6355\u6349\u3055\u308C\u307E\u3057\u305F: {0}
-main.unknown.option.for.filemanager=\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
-main.bad.arg.for.filemanager.option=\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u306E\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: "{1}"
 doclet.internal.report.bug=Bug Database (http://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java bug\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8\n(http://bugreport.java.com)\u3067javadoc\u30C4\u30FC\u30EB\u306B\u5BFE\u3059\u308Bbug\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\n\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
 main.not_a_doclet=\u30AF\u30E9\u30B9{0}\u306F\u6709\u52B9\u306A\u30C9\u30C3\u30AF\u30EC\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n\u30CE\u30FC\u30C8: JDK 13\u304B\u3089\u3001com.sun.javadoc API\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u304F\u306A\u308A\u307E\u3057\u305F\u3002
-
 javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-
+javadoc.error=\u30A8\u30E9\u30FC
+javadoc.warning=\u8B66\u544A
 javadoc.error.msg={0}: \u30A8\u30E9\u30FC - {1}
 javadoc.warning.msg={0}: \u8B66\u544A - {1}
 javadoc.note.msg = {1}
 javadoc.note.pos.msg= {0}: {1}
 javadoc.version={0} {1}
 javadoc.fullversion={0}\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"{1}"
-
-javadoc.err.message={0}
-javadoc.warn.message={0}
-javadoc.note.message={0}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
index d17a11541d5..e5927af84e4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -191,20 +191,14 @@ main.warnings.Werror=\u53D1\u73B0\u8B66\u544A, \u4F46\u6307\u5B9A\u4E86 -Werror
 main.unknown.error=\u51FA\u73B0\u672A\u77E5\u9519\u8BEF
 main.internal.error=\u51FA\u73B0\u5185\u90E8\u9519\u8BEF
 main.unexpected.exception=\u6355\u83B7\u5230\u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF: {0}
-main.unknown.option.for.filemanager=\u9009\u9879\u4E0D\u53D7\u6587\u4EF6\u7BA1\u7406\u5668\u652F\u6301\uFF1A{0}
-main.bad.arg.for.filemanager.option=\u6587\u4EF6\u7BA1\u7406\u5668\u9009\u9879 {0} \u7684\u503C\u9519\u8BEF\uFF1A"{1}"
 doclet.internal.report.bug=\u5982\u679C\u5728 Bug Database (http://bugs.java.com) \u4E2D\u6CA1\u6709\u627E\u5230\u91CD\u590D\u9879, \n\u8BF7\u901A\u8FC7 Java Bug \u62A5\u544A\u9875 (http://bugreport.java.com) \u9488\u5BF9\u8BE5 \njavadoc \u5DE5\u5177\u5EFA\u7ACB Bug\u3002\u8BF7\u5728\u62A5\u544A\u4E2D\u9644\u4E0A\u9519\u8BEF\u6D88\u606F\u548C\u4EE5\u4E0B\u8BCA\u65AD\u4FE1\u606F\u3002\u8C22\u8C22\u3002
 main.not_a_doclet=\u7C7B {0} \u4E0D\u662F\u6709\u6548 doclet\u3002\n\u6CE8\u610F\uFF1A\u4ECE JDK 13 \u5F00\u59CB\uFF0C\u4E0D\u518D\u652F\u6301 com.sun.javadoc API\u3002
-
 javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002
-
+javadoc.error=\u9519\u8BEF
+javadoc.warning=\u8B66\u544A
 javadoc.error.msg={0}: \u9519\u8BEF - {1}
 javadoc.warning.msg={0}: \u8B66\u544A - {1}
 javadoc.note.msg = {1}
 javadoc.note.pos.msg= {0}: {1}
 javadoc.version={0} {1}
 javadoc.fullversion={0}\u5B8C\u6574\u7248\u672C "{1}"
-
-javadoc.err.message={0}
-javadoc.warn.message={0}
-javadoc.note.message={0}
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
deleted file mode 100644
index 4097efbad90..00000000000
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
+++ /dev/null
@@ -1,307 +0,0 @@
-#
-# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-ONE_DAY=\ 1 Tag
-ONE_HOUR=\ 1 Stunde 
-ONE_MIN=\ 1 Min.
-ONE_MONTH=\ 1 Monat
-ONE_YEAR=\ 1 Jahr
-TWO_HOURS=\ 2 Stunden
-THREE_HOURS=\ 3 Stunden
-THREE_MONTHS=\ 3 Monate
-FIVE_MIN=\ 5 Min.
-SIX_HOURS=\ 6 Stunden
-SIX_MONTHS=\ 6 Monate
-SEVEN_DAYS=\ 7 Tage
-TEN_MIN=10 Min.
-TWELVE_HOURS=12 Stunden
-THIRTY_MIN=30 Min.
-LESS_THAN=<
-A_LOT_LESS_THAN=<<
-GREATER_THAN=>
-ACTION_CAPITALIZED=ACTION
-ACTION_INFO_CAPITALIZED=ACTION_INFO
-ALL=Alle
-ARCHITECTURE=Architektur
-ATTRIBUTE=Attribut
-ATTRIBUTE_VALUE=Attributwert
-ATTRIBUTE_VALUES=Attributwerte
-ATTRIBUTES=Attribute
-BLANK=Leer
-BLOCKED_COUNT_WAITED_COUNT=Blockiert gesamt: {0}  Gewartet gesamt: {1}\n
-BOOT_CLASS_PATH=Boot Classpath
-BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=Umschalten, um mehr oder weniger Informationen anzuzeigen
-CPU_USAGE=CPU-Auslastung
-CPU_USAGE_FORMAT=CPU-Auslastung: {0} %
-CANCEL=Abbrechen
-CASCADE=&\u00DCberlappend
-CHART_COLON=&Diagramm:
-CLASS_PATH=Classpath
-CLASS_NAME=ClassName
-CLASS_TAB_INFO_LABEL_FORMAT=<html>Geladen: {0}    Entfernt: {1}    Gesamt: {2}</html>
-CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr geladene Klassen.
-CLASSES=Klassen
-CLOSE=Schlie\u00DFen
-COLUMN_NAME=Name
-COLUMN_PID=PID
-COMMITTED_MEMORY=Festgeschriebener Speicher
-COMMITTED_VIRTUAL_MEMORY=Festgeschriebener virtueller Speicher
-COMMITTED=Festgeschrieben
-CONNECT=&Verbinden
-CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=Mit Java Virtual Machine verbinden
-CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld zum Herstellen einer neuen Verbindung zu einer lokalen oder Remote-Java Virtual Machine
-CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Produktleistengrafik
-CONNECT_DIALOG_MASTHEAD_TITLE=Neue Verbindung
-CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=Statusleiste
-CONNECT_DIALOG_TITLE=JConsole: Neue Verbindung
-CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=Verbunden. Klicken, um die Verbindung zu trennen.
-CONNECTION_FAILED=Verbindung nicht erfolgreich
-CONNECTION=&Verbindung
-CONNECTION_NAME=Verbindungsname
-CONNECTION_NAME__DISCONNECTED_={0} (getrennt)
-CONSTRUCTOR=Konstruktor
-CURRENT_CLASSES_LOADED=Aktuell geladene Klassen
-CURRENT_HEAP_SIZE=Aktuelle Heap-Gr\u00F6\u00DFe
-CURRENT_VALUE=Aktueller Wert: {0}
-CREATE=Erstellen
-DAEMON_THREADS=Daemon-Threads
-DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=Getrennt. Zum Verbinden klicken.
-DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=Zum Ein-/Ausblenden doppelklicken
-DOUBLE_CLICK_TO_VISUALIZE=Zum Visualisieren doppelklicken
-DESCRIPTION=Beschreibung
-DESCRIPTOR=Deskriptor
-DETAILS=Details
-DETECT_DEADLOCK=&Deadlock ermitteln
-DETECT_DEADLOCK_TOOLTIP=Sich gegenseitig blockierende Threads erkennen
-DIMENSION_IS_NOT_SUPPORTED_COLON=Dimension wird nicht unterst\u00FCtzt:
-DISCARD_CHART=Diagramm verwerfen
-DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} Tag |1.0<{0,number,integer} Tage }{1,choice,0<{1,number,integer} Stunden |1#{1,number,integer} Stunde |1<{1,number,integer} Stunden }{2,choice,0<{2,number,integer} Minuten|1#{2,number,integer} Minute|1.0<{2,number,integer} Minuten}
-DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} Stunde |1<{0,number,integer} Stunden }{1,choice,0<{1,number,integer} Minuten|1#{1,number,integer} Minute|1.0<{1,number,integer} Minuten}
-DURATION_MINUTES={0,choice,1#{0,number,integer} Minute|1.0<{0,number,integer} Minuten}
-DURATION_SECONDS={0} Sekunden
-EMPTY_ARRAY=Leeres Array
-ERROR=Fehler
-ERROR_COLON_MBEANS_ALREADY_EXIST=Fehler: MBeans sind bereits vorhanden
-ERROR_COLON_MBEANS_DO_NOT_EXIST=Fehler: MBeans sind nicht vorhanden
-EVENT=Ereignis
-EXIT=B&eenden
-FAIL_TO_LOAD_PLUGIN=Warnung: Fehler beim Laden von Plug-in: {0}
-FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=Abbrechen
-FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>Datei ist bereits vorhanden:<br>{0}<br>M\u00F6chten Sie sie ersetzen?
-FILE_CHOOSER_FILE_EXISTS_OK_OPTION=Ersetzen
-FILE_CHOOSER_FILE_EXISTS_TITLE=Datei vorhanden
-FILE_CHOOSER_SAVED_FILE=<html>Gespeichert in Datei:<br>{0}<br>({1} Byte)
-FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>Speichern in Datei nicht erfolgreich:<br>{0}<br>{1}
-FILE_CHOOSER_SAVE_FAILED_TITLE=Speichern nicht erfolgreich
-FREE_PHYSICAL_MEMORY=Freier physischer Speicher
-FREE_SWAP_SPACE=Freier Swap-Bereich
-GARBAGE_COLLECTOR=Garbage Collector
-GC_INFO=Name = "{0}", Collections = {1,choice,-1#Unavailable|0#{1,number,integer}}, Insgesamt aufgewendete Zeit = {2}
-GC_TIME=GC-Zeit
-GC_TIME_DETAILS={0} f\u00FCr {1} ({2} Collections)
-HEAP_MEMORY_USAGE=Heap-Nutzung
-HEAP=Heap
-HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld mit Informationen zu den Versionen von JConsole und JDK
-HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole-Version:<br>{0}
-HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM-Version:<br>{0}
-HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Produktleistengrafik
-HELP_ABOUT_DIALOG_MASTHEAD_TITLE=Info zu JConsole
-HELP_ABOUT_DIALOG_TITLE=JConsole: Info
-HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://www.oracle.com/pls/topic/lookup?ctx=javase{0}&&id=using_jconsole
-HELP_MENU_ABOUT_TITLE=&Info zu JConsole
-HELP_MENU_USER_GUIDE_TITLE=Online-&Benutzerdokumentation
-HELP_MENU_TITLE=&Hilfe
-HOTSPOT_MBEANS_ELLIPSIS=&Hotspot-MBeans...
-HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld zum Verwalten von Hotspot-MBeans
-IMPACT=Auswirkung
-INFO=Information
-INFO_CAPITALIZED=INFO
-INSECURE=Unsichere Verbindung
-INVALID_PLUGIN_PATH=Warnung: Ung\u00FCltiger Plug-in-Pfad: {0}
-INVALID_URL=Ung\u00FCltige URL: {0}
-IS=Ist
-JAVA_MONITORING___MANAGEMENT_CONSOLE=Java-Monitoring- und Managementkonsole
-JCONSOLE_COLON_=JConsole: {0}
-JCONSOLE_VERSION=JConsole-Version "{0}"
-JCONSOLE_ACCESSIBLE_DESCRIPTION=Java-Monitoring- und Managementkonsole
-JIT_COMPILER=JIT-Compiler
-LIBRARY_PATH=Library-Pfad
-LIVE_THREADS=Livethreads
-LOADED=Geladen
-LOCAL_PROCESS_COLON=&Lokaler Prozess:
-MASTHEAD_FONT=Dialog-PLAIN-25
-MANAGEMENT_NOT_ENABLED=<b>Hinweis</b>: Der Management Agent ist f\u00FCr diesen Prozess nicht aktiviert.
-MANAGEMENT_WILL_BE_ENABLED=<b>Hinweis</b>: Der Management Agent wird f\u00FCr diesen Prozess aktiviert.
-MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
-MBEAN_INFO=MBeanInfo
-MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
-MBEAN_OPERATION_INFO=MBeanOperationInfo
-MBEANS=MBeans
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=L\u00F6s&chen
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=Benachrichtigungen l\u00F6schen
-MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=Composite-Datennavigation {0}/{1}
-MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=Composite-Datennavigation
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=Ak&tualisieren
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=Attribute aktualisieren
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=&Abonnieren
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=Listening auf Benachrichtigungen starten
-MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=Tabellendatennavigation {0}/{1}
-MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=Tabellendatennavigation
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=Abonnement &k\u00FCndigen
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=Listening auf Benachrichtigungen stoppen
-MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot-MBeans verwalten in:
-MAX=Max.
-MAXIMUM_HEAP_SIZE=Maximale Heap-Gr\u00F6\u00DFe
-MEMORY=Arbeitsspeicher
-MEMORY_POOL_LABEL=Memory-Pool "{0}"
-MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr Heap.
-MEMORY_TAB_INFO_LABEL_FORMAT=<html>Belegt: {0}    Festgeschrieben: {1}    Max: {2}</html>
-MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr Nicht-Heap.
-MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=was \u00FCber dem Schwellenwert {0} liegt.\n
-MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=Memory-Poolbelegungsdiagramm.
-MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=was unter dem Schwellenwert {0} liegt.\n
-MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr {0}.
-MESSAGE=Meldung
-METHOD_SUCCESSFULLY_INVOKED=Methode erfolgreich aufgerufen
-MINIMIZE_ALL=Alle &minimieren
-MONITOR_LOCKED=\   - {0} gesperrt\n
-NAME=Name
-NAME_AND_BUILD={0} (Build {1})
-NAME_STATE=Name: {0}\nStatus: {1}\n
-NAME_STATE_LOCK_NAME=Name: {0}\nStatus: {1} auf {2}\n
-NAME_STATE_LOCK_NAME_LOCK_OWNER=Name: {0}\nStatus: {1} auf {2}, Eigent\u00FCmer: {3}\n
-NEW_CONNECTION_ELLIPSIS=&Neue Verbindung...
-NO_DEADLOCK_DETECTED=Kein Deadlock ermittelt
-NON_HEAP_MEMORY_USAGE=Nicht-Heap-Speicherauslastung
-NON_HEAP=Nicht-Heap
-NOTIFICATION=Benachrichtigung
-NOTIFICATION_BUFFER=Benachrichtigungspuffer
-NOTIFICATIONS=Benachrichtigungen
-NOTIF_TYPES=NotifTypes
-NUMBER_OF_THREADS=Anzahl Threads
-NUMBER_OF_LOADED_CLASSES=Anzahl geladene Klassen
-NUMBER_OF_PROCESSORS=Anzahl Prozessoren
-OBJECT_NAME=ObjectName
-OPERATING_SYSTEM=Betriebssystem
-OPERATION=Vorgang
-OPERATION_INVOCATION=Vorgangsaufruf
-OPERATION_RETURN_VALUE=R\u00FCckgabewert von Vorgang
-OPERATIONS=Vorg\u00E4nge
-OVERVIEW=\u00DCberblick
-OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr {0}.
-PARAMETER=Parameter
-PASSWORD_ACCESSIBLE_NAME=Kennwort
-PASSWORD_COLON_=&Kennwort:
-PEAK=Spitze
-PERFORM_GC=&GC ausf\u00FChren
-PERFORM_GC_TOOLTIP=Garbage Collection anfordern
-PLOTTER_ACCESSIBLE_NAME=Diagramm
-PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
-PLOTTER_ACCESSIBLE_NAME_NO_DATA=Keine Daten dargestellt.
-PLOTTER_SAVE_AS_MENU_ITEM=Daten speichern &unter...
-PLOTTER_TIME_RANGE_MENU=&Zeitraum
-PLUGIN_EXCEPTION_DIALOG_BUTTON_EXIT=Beenden
-PLUGIN_EXCEPTION_DIALOG_BUTTON_IGNORE=Ignorieren
-PLUGIN_EXCEPTION_DIALOG_BUTTON_OK=OK
-PLUGIN_EXCEPTION_DIALOG_MESSAGE=Eine unerwartete Ausnahme ist aufgetreten in %s:\n\n%s\n\nBeginnen Sie mit -debug, um Details aufzurufen. Durch Ignorieren werden zuk\u00FCnftige Ausnahmen unterdr\u00FCckt.
-PLUGIN_EXCEPTION_DIALOG_TITLE=Plug-in-Ausnahme
-PROBLEM_ADDING_LISTENER=Problem beim Hinzuf\u00FCgen von Listener
-PROBLEM_DISPLAYING_MBEAN=Problem beim Anzeigen von MBean
-PROBLEM_INVOKING=Problem beim Aufrufen
-PROBLEM_REMOVING_LISTENER=Problem beim Entfernen von Listener
-PROBLEM_SETTING_ATTRIBUTE=Problem beim Festlegen von Attribut
-PROCESS_CPU_TIME=Prozess-CPU-Zeit
-READABLE=Lesbar
-RECONNECT=Erneut verbinden
-REMOTE_PROCESS_COLON=&Remoteprozess:
-REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=Remoteprozess
-RESTORE_ALL=&Alle wiederherstellen
-RETURN_TYPE=ReturnType
-SEQ_NUM=SeqNum
-SIZE_BYTES={0,number,integer} Byte
-SIZE_GB={0} GB
-SIZE_KB={0} KB
-SIZE_MB={0} MB
-SOURCE=Quelle
-STACK_TRACE=\nStacktrace: \n
-SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
-SUMMARY_TAB_PENDING_FINALIZATION_LABEL=Beenden ausstehend
-SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0} Objekte
-SUMMARY_TAB_TAB_NAME=VM-\u00DCbersicht
-SUMMARY_TAB_VM_VERSION={0} Version {1}
-THREADS=Threads
-THREAD_TAB_INFO_LABEL_FORMAT=<html>Live: {0}    Spitze: {1}    Gesamt: {2}</html>
-THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=Threadinformationen
-THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr Threadanzahl.
-THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[Kein Thread ausgew\u00E4hlt]
-THRESHOLD=Schwellenwert
-TILE=&Nebeneinander
-TIME_RANGE_COLON=&Zeitraum:
-TIME=Zeit
-TIME_STAMP=TimeStamp
-TOTAL_LOADED=Insgesamt geladen
-TOTAL_CLASSES_LOADED=Insgesamt geladene Klassen
-TOTAL_CLASSES_UNLOADED=Insgesamt entfernte Klassen
-TOTAL_COMPILE_TIME=Gesamte Kompilierungszeit
-TOTAL_PHYSICAL_MEMORY=Physischer Gesamtspeicher
-TOTAL_THREADS_STARTED=Insgesamt gestartete Threads
-TOTAL_SWAP_SPACE=Gesamter Swap-Bereich
-TYPE=Typ
-UNAVAILABLE=Nicht verf\u00FCgbar
-UNKNOWN_CAPITALIZED=UNKNOWN
-UNKNOWN_HOST=Unbekannter Host: {0}
-UNREGISTER=Registrierung aufheben
-UPTIME=Betriebszeit
-USAGE_THRESHOLD=Auslastungsschwellenwert
-REMOTE_TF_USAGE=<b>Verwendung</b>: &&lt;hostname&&gt;:&&lt;port&&gt; ODER service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
-USED=Verwendet
-USERNAME_COLON_=&Benutzername:
-USERNAME_ACCESSIBLE_NAME=Benutzername
-USER_DATA=UserData
-VIRTUAL_MACHINE=Virtuelle Maschine
-VM_ARGUMENTS=VM-Argumente
-VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Innerer Frame f\u00FCr die \u00DCberwachung einer Java Virtual Machine
-VALUE=Wert
-VENDOR=Hersteller
-VERBOSE_OUTPUT=Verbose-Ausgabe
-VERBOSE_OUTPUT_TOOLTIP=Verbose-Ausgabe f\u00FCr Klassenladesystem aktivieren
-VIEW=Ansicht
-WINDOW=&Fenster
-WINDOWS=Windows
-WRITABLE=Nicht schreibgesch\u00FCtzt
-CONNECTION_FAILED1=Die Verbindung konnte nicht hergestellt werden: Wiederholen?
-CONNECTION_FAILED2=Die Verbindung {0} war nicht erfolgreich.<br>M\u00F6chten Sie den Vorgang wiederholen?
-CONNECTION_FAILED_SSL1=Sichere Verbindung war nicht erfolgreich. Unsichere Verbindung versuchen?
-CONNECTION_FAILED_SSL2=Die Verbindung {0} konnte \u00FCber SSL nicht hergestellt werden.<br>M\u00F6chten Sie die Verbindung ohne SSL versuchen?<br>(Benutzername und Kennwort werden im Klartext \u00FCbermittelt.)
-CONNECTION_LOST1=Verbindung unterbrochen: Erneut verbinden?
-CONNECTING_TO1=Verbindung mit {0}
-CONNECTING_TO2=Sie werden gegenw\u00E4rtig mit {0} verbunden.<br>Dies wird einige Sekunden dauern.
-DEADLOCK_TAB=Deadlock
-DEADLOCK_TAB_N=Deadlock {0}
-EXPAND=einblenden
-KBYTES={0} KB
-PLOT=Darstellung
-VISUALIZE=Visualisieren
-ZZ_USAGE_TEXT=Verwendung: {0} [ -interval=n ] [ -notile ] [ -pluginpath <Pfad> ] [ -version ] [ connection ... ]\n\n  -interval   Legt ein Aktualisierungsintervall von n Sekunden fest (der Standardwert ist 4 Sekunden)\n  -notile     Ordnet die Fenster anfangs nicht nebeneinander an (bei zwei oder mehr Verbindungen)\n  -pluginpath Gibt den Pfad an, in dem jconsole die Plug-ins sucht\n  -version    Gibt die Programmversion aus\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         Prozess-ID eines Zielprozesses\n  host        Name oder IP-Adresse eines Remotehosts\n  port        Portnummer f\u00FCr die Remoteverbindung\n\n  -J          Gibt die Eingabeargumente f\u00FCr die Java Virtual Machine an,\n              auf der jconsole ausgef\u00FChrt wird
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
index 00aee7806de..529a5787c23 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
@@ -171,7 +171,7 @@ MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u8868\u683C\u5F0F\u6570\u636E\u5BFC\u822
 MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u8868\u683C\u5F0F\u6570\u636E\u5BFC\u822A
 MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u53D6\u6D88\u8BA2\u9605(&U)
 MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u505C\u6B62\u76D1\u542C\u901A\u77E5
-MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean: 
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean:
 MAX=\u6700\u5927\u503C
 MAXIMUM_HEAP_SIZE=\u6700\u5927\u5806\u5927\u5C0F
 MEMORY=\u5185\u5B58
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
deleted file mode 100644
index 4114d8e90a1..00000000000
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-err.prefix=Fehler:
-
-err.bad.constant.pool=Fehler beim Lesen von Konstantenpool f\u00FCr {0}: {1}
-err.class.not.found=Klasse nicht gefunden: {0}
-err.crash=Ein schwerwiegender interner Fehler ist aufgetreten: {0}\nMelden Sie einen Bug mit den folgenden Informationen:\n{1}
-err.end.of.file=unerwartetes Dateiende beim Lesen von {0}
-err.file.not.found=Datei nicht gefunden: {0}
-err.incompatible.options=ung\u00FCltige Optionenkombination: {0}
-err.internal.error=interner Fehler: {0} {1} {2}
-err.invalid.arg.for.option=ung\u00FCltiges Argument f\u00FCr Option: {0}
-err.ioerror=I/O-Fehler beim Lesen von {0}: {1}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
-err.no.classes.specified=keine Klassen angegeben
-err.not.standard.file.manager=Klassendateien k\u00F6nnen nur angegeben werden, wenn ein Standarddateimanager verwendet wird
-err.invalid.use.of.option=ung\u00FCltige Verwendung von Option: {0}
-err.unknown.option=unbekannte Option: {0}
-err.no.SourceFile.attribute=kein SourceFile-Attribut
-err.source.file.not.found=Quelldatei nicht gefunden
-err.bad.innerclasses.attribute=ung\u00FCltiges InnerClasses-Attribut f\u00FCr {0}
-err.nomem=Nicht gen\u00FCgend Speicher. Verwenden Sie die Option -J-Xmx zum Erweitern des Speichers.
-err.cant.find.module=Modul {0} nicht gefunden
-err.cant.find.module.ex=Problem beim Auffinden von Modul {0}: {1}
-err.only.for.launcher=Diese Option kann nur verwendet werden, wenn javap \u00FCber den Befehlszeilen-Launcher aufgerufen wird.
-err.fatal.err=Schwerwiegender Fehler: {0}
-
-main.usage.summary=Verwendung: {0} <Optionen> <Klassen>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
-
-warn.prefix=Warnung:
-warn.unexpected.class=Datei {0} enth\u00E4lt nicht die Klasse {1}
-
-note.prefix=Hinweis:
-
-main.usage=Verwendung: {0} <Optionen> <Klassen>\nwobei folgende Optionen m\u00F6glich sind:
-
-
-main.opt.help=\  --help -help -h -?               Gibt diese Hilfemeldung aus
-
-main.opt.version=\  -version                         Versionsinformationen
-
-main.opt.v=\  -v  -verbose                     Gibt zus\u00E4tzliche Informationen aus
-
-main.opt.l=\  -l                               Gibt die Zeilennummer und lokale Variablentabellen aus
-
-main.opt.public=\  -public                          Zeigt nur \u00F6ffentliche Klassen und Mitglieder
-
-main.opt.protected=\  -protected                       Zeigt gesch\u00FCtzte/\u00F6ffentliche Klassen und Mitglieder
-
-main.opt.package=\  -package                         Zeigt Package/gesch\u00FCtzte/\u00F6ffentliche Klassen\n                                   und Mitglieder (Standard)
-
-main.opt.p=\  -p  -private                     Zeigt alle Klassen und Mitglieder
-
-main.opt.c=\  -c                               Disassembliert den Code
-
-main.opt.s=\  -s                               Gibt Signaturen vom Typ "intern" aus
-
-main.opt.class_path=\  --class-path <Pfad>              Gibt an, wo sich Benutzerklassendateien befinden
-
-main.opt.classpath=\  -classpath <Pfad>                Gibt an, wo sich Benutzerklassendateien befinden
-
-main.opt.cp=\  -cp <Pfad>                       Gibt an, wo sich Benutzerklassendateien befinden
-
-main.opt.bootclasspath=\  -bootclasspath <Pfad>            Setzt den Speicherort von Bootstrap-Klassendateien au\u00DFer Kraft
-
-main.opt.upgrade_module_path=\  --upgrade-module-path <Pfad>     Gibt an, wo sich die upgradef\u00E4higen Module befinden
-
-main.opt.system=\  --system <JDK>                   Gibt an, wo sich die Systemmodule befinden
-
-main.opt.module_path=\  --module-path <Pfad>             Gibt an, wo sich die Anwendungsmodule befinden
-
-main.opt.multi_release=\  --multi-release <version>        Gibt die Version an, die in Multi-Release-JAR-Dateien verwendet werden soll
-
-main.opt.constants=\  -constants                       Zeigt die endg\u00FCltigen Konstanten
-
-main.opt.sysinfo=\  -sysinfo                         Zeigt die Systeminformationen (Pfad, Gr\u00F6\u00DFe, Datum, SHA-256-Hash)\n                                   der Klasse, die verarbeitet wird
-
-main.opt.module=\  --module <Modul>, -m <Modul>   Zeigt das Modul, das die zu disassemblierenden Klassen enth\u00E4lt
-
-main.opt.J=\  -J<vm-option>                    Gibt eine VM-Option an
-
-main.usage.foot=\nF\u00FCr Optionen im GNU-Stil kann "=" statt Leerzeichen verwendet werden, um den Namen einer Option\nvon ihrem Wert zu trennen.\n\nJede zu zeigende Klasse kann durch einen Dateinamen, eine URL oder durch ihren vollst\u00E4ndig\nqualifizierten Klassennamen angegeben werden. Beispiele:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
index c45dfdbe7a8..4f1c2b82f42 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u75
 warn.prefix=\u8B66\u544A:
 warn.unexpected.class=\u30D5\u30A1\u30A4\u30EB{0}\u306B\u30AF\u30E9\u30B9{1}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
 
-note.prefix=\u30CE\u30FC\u30C8:
+note.prefix=\u6CE8:
 
 main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:
 
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
index b803c6b6210..59713c46486 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
deleted file mode 100644
index 350f3b5ca4e..00000000000
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-main.usage=Verwendung: jdeprscan [Optionen] ''{dir|jar|class}'' ...\n\nOptionen:\n        --class-path PATH\n        --for-removal\n        --full-version\n  -? -h --help\n  -l    --list\n        --release {0}\n  -v    --verbose\n        --version
-
-main.help=Scannt jedes Argument auf die Verwendung veralteter APIs. Ein Argument\nkann ein Verzeichnis, das die Root einer Packagehierarchie angibt,\neine JAR-Datei, eine Klassendatei oder ein Klassenname sein. Der Klassenname\nmuss durch einen vollst\u00E4ndig qualifizierten Klassennamen mit $ als Trennzeichen\nf\u00FCr verschachtelte Klassen angegeben werden. Beispiel:\n\n    java.lang.Thread$State\n\nDie Option --class-path liefert einen Suchpfad f\u00FCr die Aufl\u00F6sung\nvon abh\u00E4ngigen Klassen.\n\nDie Option --for-removal begrenzt das Scannen oder Auflisten auf APIs, die veraltet sind\nund entfernt werden sollen. Kann nicht mit den Releasewerten 6, 7, oder 8 verwendet werden.\n\nDie Option --full-version gibt die vollst\u00E4ndige Versionszeichenfolge des Tools aus.\n\nDie Option --help (-? -h) gibt eine vollst\u00E4ndige Hilfemeldung aus.\n\nDie Option --list (-l) gibt die Gruppe der veralteten APIs aus. Es wird nicht gescannt,\ndaher d\u00FCrfen keine Verzeichnis-, JAR- oder Klassenargumente angegeben werden.\n\nDie Option --release gibt das Java SE-Release an, das die Gruppe\nder veralteten APIS zum Scannen liefert.\n\nDie Option --verbose (-v) aktiviert die Ausgabe zus\u00E4tzlicher Meldungen w\u00E4hrend der Verarbeitung.\n\nDie Option --version gibt die verk\u00FCrzte Versionszeichenfolge des Tools aus.
-
-main.xhelp=Nicht unterst\u00FCtzte Optionen:\n\n  --Xload-class CLASS\n      L\u00E4dt Veraltungsinformationen aus der benannten Klasse.\n  --Xload-csv CSVFILE\n      L\u00E4dt Veraltungsinformationen aus der benannten CSV-Datei.\n  --Xload-dir DIR\n      L\u00E4dt Veraltungsinformationen aus der Klassenhierarchie\n      im benannten Verzeichnis.\n  --Xload-jar JARFILE\n      L\u00E4dt Veraltungsinformationen aus der benannten JAR-Datei.\n  --Xload-jdk9 JAVA_HOME\n      L\u00E4dt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das ein modulares JDK sein muss.\n  --Xload-old-jdk JAVA_HOME\n      L\u00E4dt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das kein modulares JDK sein darf. Stattdessen\n      muss das benannte JDK ein "klassisches" JDK mit einer rt.jar-Datei sein.\n  --Xload-self\n      L\u00E4dt Veraltungsinformationen durch Traversieren des jrt:-\n      Dateisystems des ausgef\u00FChrten JDK-Images.\n  --Xcompiler-arg ARG\n      F\u00FCgt ARG der Liste der Compilerargumente hinzu.\n  --Xcsv-comment COMMENT\n      F\u00FCgt COMMENT als Kommentarzeile der CSV-Ausgabedatei hinzu.\n      Nur effektiv, wenn auch -Xprint-csv angegeben wird.\n  --Xhelp\n      Gibt diese Meldung aus.\n  --Xprint-csv\n      Gibt eine CSV-Datei aus, welche die geladenen Veraltungsinformationen enth\u00E4lt,\n      statt Klassen oder JAR-Dateien zu scannen.
-
-scan.process.class=Klasse {0} wird verarbeitet...
-
-# The "removal tag": empty for normal deprecations,
-# nonempty for removal deprecations; do not translate.
-scan.dep.normal=
-scan.dep.removal=(forRemoval=true)
-
-scan.err.exception=Fehler: unerwartete Ausnahme {0}
-scan.err.noclass=Fehler: Klasse {0} nicht gefunden
-scan.err.nofile=Fehler: Datei {0} nicht gefunden
-
-# 0: class name, 1: method name, 2: parameter and return types
-scan.err.nomethod=Fehler: Methodref {0}.{1}:{2} kann nicht aufgel\u00F6st werden
-
-scan.head.jar=JAR-Datei {0}:
-scan.head.dir=Verzeichnis {0}:
-
-# In all of the messages below, 0 and 1 are as follows:
-#   0: type kind (class, interface, enum, or annotation type)
-#   1: type name
-# The last element is generally a "removal tag"; see above.
-
-# 2: class name, 3: removal tag
-scan.out.extends={0} {1} erweitert die veraltete Klasse {2} {3}
-
-# 2: interface name, 3: removal tag
-scan.out.implements={0} {1} implementiert die veraltete Schnittstelle {2} {3}
-
-# 2: class name, 3: removal tag
-scan.out.usesclass={0} {1} verwendet die veraltete Klasse {2} {3}
-
-# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.usesmethod={0} {1} verwendet die veraltete Methode {2}::{3}{4} {5}
-
-# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.usesintfmethod={0} {1} verwendet die veraltete Methode {2}::{3}{4} {5}
-
-# 2: class name, 3: field name, 4: removal tag
-scan.out.usesfield={0} {1} verwendet das veraltete Feld {2}::{3} {4}
-
-# 2: field name, 3: type name, 4: removal tag
-scan.out.hasfield={0} {1} hat den Feldnamen {2} des veralteten Typs {3} {4}
-
-# 2: method name, 3: parameter type, 4: removal tag
-scan.out.methodparmtype={0} {1} hat eine Methode namens {2} mit dem veralteten Parametertyp {3} {4}
-
-# 2: method name, 3: return type, 4: removal tag
-scan.out.methodrettype={0} {1} hat eine Methode namens {2} mit dem veralteten R\u00FCckgabetyp {3} {4}
-
-# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
-scan.out.methodoverride={0} {1} setzt die veraltete Methode {2}::{3}{4} {5} au\u00DFer Kraft
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
deleted file mode 100644
index 2a44e4c660c..00000000000
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-main.usage.summary=Verwendung: {0} <Optionen> <Pfad ...>]\nmit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
-
-main.usage=Verwendung: {0} <Optionen> <Pfad ...>]\n<Pfad> kann ein Pfad zu einer Klassendatei, einem Verzeichnis oder einer JAR-Datei sein.\n\nM\u00F6gliche Optionen:
-
-error.prefix=Fehler:
-warn.prefix=Warnung:
-
-main.opt.h=\  -h -? --help                  Gibt diese Hilfemeldung aus
-
-main.opt.version=\  -version --version            Versionsinformationen
-
-main.opt.v=\  -v       -verbose             Gibt alle Abh\u00E4ngigkeiten auf Klassenebene aus\n                                \u00C4quivalent zu -verbose:class -filter:none.\n  -verbose:package              Gibt standardm\u00E4\u00DFig Abh\u00E4ngigkeiten auf Packageebene, ausgenommen\n                                Abh\u00E4ngigkeiten innerhalb eines Packages, aus\n  -verbose:class                Gib standardm\u00E4\u00DFig Abh\u00E4ngigkeiten auf Klassenebene, ausgenommen\n                                Abh\u00E4ngigkeiten innerhalb einer Klasse, aus
-
-main.opt.s=\  -s       -summary             Gibt nur die Abh\u00E4ngigkeits\u00FCbersicht aus.
-
-main.opt.f=\  -f <Regex> -filter <Regex>    Filtert Abh\u00E4ngigkeiten nach dem angegebenen\n                                Muster. Bei Angabe mehrerer Muster wird das\n                                letzte Muster verwendet.\n  -filter:package               Filtert Abh\u00E4ngigkeiten innerhalb eines Packages.\n                                Dies ist die Standardoption.\n  -filter:archive               Filtert Abh\u00E4ngigkeiten innerhalb eines Archivs.\n  -filter:module                Filtert Abh\u00E4ngigkeiten innerhalb eines Moduls.\n  -filter:none                  Kein Filtern nach -filter:package oder -filter:archive\n                                Die mit der Option -filter angegebene Filterung\n                                wird jedoch angewendet.\n
-main.opt.p=\nOptionen zum Filtern von Abh\u00E4ngigkeiten:\n  -p <Pkg>\n  -package <Pkg>\n  --package <Pkg>               Findet Abh\u00E4ngigkeiten, die mit dem angegebenen\n                                Packagenamen \u00FCbereinstimmen (kann mehrfach angegeben werden).
-
-main.opt.e=\  -e <Regex>\n  -regex <Regex>\n  --regex <Regex>               Findet Abh\u00E4ngigkeiten, die dem angegebenen Muster entsprechen.
-
-main.opt.require=\  --require <Modulname>       Findet Abh\u00E4ngigkeiten, die dem angegebenen Modulnamen\n                                entsprechen (kann mehrfach angegeben werden). --package,\n                                --regex, --require schlie\u00DFen sich gegenseitig aus.
-
-main.opt.missing-deps=\  --missing-deps                Findet fehlende Abh\u00E4ngigkeiten. Diese Option\n                                kann nicht mit den Optionen -p, -e und -s verwendet werden.
-
-main.opt.ignore-missing-deps=\  --ignore-missing-deps         Ignoriert fehlende Abh\u00E4ngigkeiten.
-
-main.opt.include=\nOptionen zum Filtern der zu analysierenden Klassen:\n  -include <Regex>              Beschr\u00E4nkt die Analyse auf Klassen, die dem Muster entsprechen\n                                Diese Option filtert die Liste der zu analysierenden\n                                Klassen. Sie kann zusammen mit -p und -e verwendet\n                                werden, die das Muster auf die Abh\u00E4ngigkeiten anwenden
-
-main.opt.P=\  -P       -profile             Zeigt das Profil, das ein Package enth\u00E4lt
-
-main.opt.cp=\  -cp <Pfad>\n  -classpath <Pfad>\n  --class-path <Pfad>           Gibt an, wo sich die Klassendateien befinden
-
-main.opt.module-path=\  --module-path <Modulpfad>   Gibt den Modulpfad an
-
-main.opt.upgrade-module-path=\  --upgrade-module-path <Modulpfad>  Gibt den Upgrademodulpfad an
-
-main.opt.system=\  --system <Java-Home>          Gibt einen alternativen Systemmodulpfad an
-
-main.opt.add-modules=\  --add-modules <Modulname>[,<Modulname>...]\n                                F\u00FCgt dem Root-Set Module zur Analyse hinzu
-
-main.opt.R=\  -R\n  --recursive                   Traversiert rekursiv alle Laufzeitabh\u00E4ngigkeiten.\n                                Die Option -R impliziert -filter:none. Falls eine Option -p,\n                                -e, -f angegeben ist, werden nur die \u00FCbereinstimmenden\n                                Abh\u00E4ngigkeiten analysiert.
-
-main.opt.no-recursive=\  --no-recursive                Kein rekursives Traversieren von Abh\u00E4ngigkeiten.
-
-main.opt.I=\  -I\n  --inverse                     Analysiert die Abh\u00E4ngigkeiten gem\u00E4\u00DF den anderen angegebenen\n                                Optionen und findet alle Artefakte, die direkt und\n                                indirekt von den \u00FCbereinstimmenden Knoten abh\u00E4ngen.\n                                Dies entspricht der Umkehrung der\n                                Analyse der Kompilierungszeitansicht und gibt die\n                                Abh\u00E4ngigkeits\u00FCbersicht aus. Diese Option muss mit der Option\n                                --require, --package oder --regex verwendet werden.
-
-main.opt.compile-time=\  --compile-time                Kompilierungszeitansicht transitiver Abh\u00E4ngigkeiten,\n                                d.h. Kompilierungszeitansicht der Option -R.\n                                Analysiert die Abh\u00E4ngigkeiten gem\u00E4\u00DF den anderen angegebenen Optionen\n                                Wird eine Abh\u00E4ngigkeit von einem Verzeichnis,\n                                einer JAR-Datei oder einem Modul gefunden, werden alle Klassen im \n                                entsprechenden beinhaltenden Archiv analysiert.
-
-main.opt.apionly=\  -apionly\n  --api-only                    Beschr\u00E4nkt die Analyse auf APIs, d.h. Abh\u00E4ngigkeiten\n                                von der Signatur \u00F6ffentlicher und gesch\u00FCtzter\n                                Mitglieder von \u00F6ffentlichen Klassen, einschlie\u00DFlich von\n                                Feldtyp, Methodenparametertypen, R\u00FCckgabetyp,\n                                aktivierten Ausnahmetypen usw.
-
-main.opt.m=\nOptionen f\u00FCr die Modulabh\u00E4ngigkeitsanalyse:\n  -m <Modulname>\n  --module <Modulname>        Gibt das Root-Modul f\u00FCr die Analyse an
-
-main.opt.generate-module-info=\  --generate-module-info <Verzeichnis>  Generiert module-info.java im angegebenen\n                                Verzeichnis. Die angegebenen JAR-Dateien werden\n                                analysiert. Diese Option kann nicht zusammen mit\n                                --dot-output oder --class-path verwendet werden. Verwenden Sie\n                                f\u00FCr offene Module die Option --generate-open-module.
-
-main.opt.generate-open-module=\  --generate-open-module <Verzeichnis>  Generiert module-info.java f\u00FCr die angegebenen\n                                JAR-Dateien im angegebenen Verzeichnis als\n                                offene Module. Diese Option kann nicht mit\n                                --dot-output oder --class-path verwendet werden.
-
-main.opt.check=\  --check <Modulname>[,<Modulname>...\n                                Analysiert die Abh\u00E4ngigkeit der angegebenen Module\n                                Gibt den Moduldeskriptor, die aus der Analyse resultierenden\n                                Modulabh\u00E4ngigkeiten und das Diagramm nach\n                                der \u00DCbergangsreduktion aus. Identifiziert auch\n                                nicht verwendete qualifizierte Exporte.
-
-main.opt.dotoutput=\  -dotoutput <Verzeichnis>\n  --dot-output <Verzeichnis>            Zielverzeichnis f\u00FCr DOT-Dateiausgabe
-
-main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               Findet Abh\u00E4ngigkeiten auf Klassenebene auf JDK-internen\n                                APIs. Analysiert standardm\u00E4\u00DFig alle Klassen\n                                in --class-path und Eingabedateien, es sei denn, die Option\n                                -include ist angegeben. Diese Option kann nicht mit\n                                den Optionen -p, -e und -s verwendet werden.\n                                WARNUNG: Auf JDK-interne APIs besteht kein Zugriff.
-
-main.opt.list-deps=\  --list-deps                   Listet die Modulabh\u00E4ngigkeiten auf. Gibt auch\n                                interne API-Packages aus, falls referenziert.\n                                Diese Option analysiert transitiv die Librarys im\n                                Classpath und im Modulpfad, falls referenziert.\n                                Verwenden Sie die Option --no-recursive f\u00FCr eine\n                                nicht transitive Abh\u00E4ngigkeitsanalyse.
-
-main.opt.list-reduced-deps=\  --list-reduced-deps           Gleich wie --list-deps, listet jedoch die Kanten f\u00FCr die\n                                implizierten Lesevorg\u00E4nge aus dem Moduldiagramm nicht auf.\n                                Wenn Modul M1 M2 liest und M2 \u00FCber M3\n                                transitiv sein muss, dann wird impliziert, dass M1 M3 liest,\n                                und dies wird im Diagramm nicht angezeigt.
-
-main.opt.print-module-deps=\  --print-module-deps           Gleich wie --list-reduced-deps, und es wird\n                                eine kommagetrennte Liste von Modulabh\u00E4ngigkeiten ausgegeben.\n                                Dies Ausgabe kann von der jlink-Option --add-modules\n                                verwendet werden, um ein benutzerdefiniertes Image zu erstellen,\n                                das diese Module und ihre transitiven Abh\u00E4ngigkeiten enth\u00E4lt.
-
-main.opt.depth=\  -depth=<Tiefe>                Gibt die Tiefe der transitiven\n                                Abh\u00E4ngigkeitsanalyse an
-
-main.opt.q=\  -q       -quiet               Unterdr\u00FCckt Warnmeldungen
-
-main.opt.multi-release=\  --multi-release <Version>     Gibt bei Verarbeitung von Multi-Release-JAR-Dateien\n                                die Version an. <Version> muss eine\n                                Ganzzahl >= 9 oder ein Basiswert sein.
-
-err.command.set=Die Optionen {0} und {1} werden angegeben.
-err.unknown.option=unbekannte Option: {0}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
-err.invalid.arg.for.option=ung\u00FCltiges Argument f\u00FCr Option: {0}
-err.option.after.class=Option muss angegeben werden vor den Klassen: {0}
-err.genmoduleinfo.not.jarfile={0} ist eine modulare JAR-Datei, die nicht mit der Option --generate-module-info angegeben werden kann
-err.genmoduleinfo.unnamed.package={0} enth\u00E4lt ein unbenanntes Package, das in einem Modul nicht zul\u00E4ssig ist
-err.profiles.msg=Keine Profilinformationen
-err.exception.message={0}
-err.invalid.path=ung\u00FCltiger Pfad: {0}
-err.invalid.options={0} kann nicht mit der Option {1} verwendet werden
-err.module.not.found=Modul nicht gefunden: {0}
-err.root.module.not.set=Root-Modulset leer
-err.option.already.specified=Option {0} wurde mehrmals angegeben.
-err.filter.not.specified=Die Optionen --package (-p), --regex (-e), --require m\u00FCssen angegeben werden
-err.multirelease.option.exists={0} ist keine Multi-Release-JAR-Datei, aber die Option --multi-release ist festgelegt
-err.multirelease.option.notfound={0} ist eine Multi-Release-JAR-Datei, aber die Option --multi-release ist nicht festgelegt
-err.multirelease.version.associated=Klasse {0} ist bereits mit Version {1} verkn\u00FCpft, und es wird versucht, Version {2} hinzuzuf\u00FCgen
-err.multirelease.jar.malformed=nicht wohlgeformte Multi-Release-JAR, {0}, ung\u00FCltiger Eintrag: {1}
-err.missing.dependences=Fehlende Abh\u00E4ngigkeiten: Klassen wurden im Modulpfad und Klassenpfad nicht gefunden.\nUm diesen Fehler zu unterdr\u00FCcken und fortzufahren, verwenden Sie --ignore-missing-deps.
-
-warn.invalid.arg=Pfad ist nicht vorhanden: {0}
-warn.skipped.entry={0}
-warn.split.package=geteiltes Package: {0} {1}
-warn.replace.useJDKInternals=JDK-interne APIs werden nicht unterst\u00FCtzt und sind privat f\u00FCr JDK-Implementierungen.\nSie k\u00F6nnten ohne Ber\u00FCcksichtigung der Kompatibilit\u00E4t ge\u00E4ndert oder entfernt werden und die Anwendung besch\u00E4digen.\n\u00C4ndern Sie den Code, um Abh\u00E4ngigkeiten von JDK-internen APIs zu beseitigen.\nDie neuesten Informationen zu JDK-internen API-Ersetzungen finden Sie hier:\n{0}
-
-inverse.transitive.dependencies.on=Inverse transitive Abh\u00E4ngigkeiten von {0}
-inverse.transitive.dependencies.matching=Inverse transitive Abh\u00E4ngigkeiten, die \u00FCbereinstimmen mit {0}
-internal.api.column.header=JDK-interne API
-public.api.replacement.column.header=Vorgeschlagene Ersetzung
-artifact.not.found=nicht gefunden
-jdeps.wiki.url=https://wiki.openjdk.java.net/display/JDK8/Java+Dependency+Analysis+Tool
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
deleted file mode 100644
index 87d433ba4a7..00000000000
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 source code is provided to illustrate the usage of a given feature
- * or technique and has been deliberately simplified. Additional steps
- * required for a production-quality application, such as security checks,
- * input validation and proper error handling, might not be present in
- * this sample code.
- */
-
-
-package com.sun.tools.example.debug.tty;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following package(s):
- *
- * <ol>
- * <li> com.sun.tools.example.debug.tty
- * </ol>
- *
- */
-public class TTYResources_de extends java.util.ListResourceBundle {
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        Object[][] temp = new Object[][] {
-        // NOTE: The value strings in this file containing "{0}" are
-        //       processed by the java.text.MessageFormat class.  Any
-        //       single quotes appearing in these strings need to be
-        //       doubled up.
-        //
-        // LOCALIZE THIS
-        {"** classes list **", "** Klassenliste **\n{0}"},
-        {"** fields list **", "** Feldliste **\n{0}"},
-        {"** methods list **", "** Methodenliste **\n{0}"},
-        {"*** Reading commands from", "*** Befehle aus {0} werden gelesen"},
-        {"All threads resumed.", "Alle Threads fortgesetzt."},
-        {"All threads suspended.", "Alle Threads unterbrochen."},
-        {"Argument is not defined for connector:", "Argument {0} ist f\u00FCr Connector {1} nicht definiert"},
-        {"Arguments match no method", "Argumente entsprechen keiner Methode"},
-        {"Array:", "Array: {0}"},
-        {"Array element is not a method", "Arrayelement ist keine Methode"},
-        {"Array index must be a integer type", "Arrayindex muss eine Ganzzahl sein"},
-        {"base directory:", "Basisverzeichnis: {0}"},
-        {"Breakpoint hit:", "Breakpoint erreicht: "},
-        {"breakpoint", "Breakpoint {0}"},
-        {"Breakpoints set:", "Breakpoints festgelegt:"},
-        {"Breakpoints can be located only in classes.", "Breakpoints k\u00F6nnen sich nur in Klassen befinden. {0} ist eine Schnittstelle oder ein Array."},
-        {"Can only trace", "Kann nur \"methods\" oder \"method exit\" oder \"method exits\" tracen"},
-        {"cannot redefine existing connection", "{0} kann keine vorhandene Verbindung neu definieren"},
-        {"Cannot assign to a method invocation", "Zuweisung zu einem Methodenaufruf nicht m\u00F6glich"},
-        {"Cannot specify command line with connector:", "Befehlszeile kann nicht mit Connector: {0} angegeben werden"},
-        {"Cannot specify target vm arguments with connector:", "Ziel-VM-Argumente k\u00F6nnen nicht mit Connector {0} angegeben werden"},
-        {"Class containing field must be specified.", "Klasse, die das Feld enth\u00E4lt, muss angegeben werden."},
-        {"Class:", "Klasse: {0}"},
-        {"Classic VM no longer supported.", "Klassische VM wird nicht mehr unterst\u00FCtzt."},
-        {"classpath:", "Classpath: {0}"},
-        {"colon mark", ":"},
-        {"colon space", ": "},
-        {"Command is not supported on the target VM", "Befehl \"{0}\" wird in der Ziel-VM nicht unterst\u00FCtzt"},
-        {"Command is not supported on a read-only VM connection", "Befehl \"{0}\" wird bei einer schreibgesch\u00FCtzten VM-Verbindung nicht unterst\u00FCtzt"},
-        {"Command not valid until the VM is started with the run command", "Befehl \"{0}\" ist erst g\u00FCltig, wenn die VM mit dem Befehl \"run\" gestartet wurde"},
-        {"Condition must be boolean", "Bedingung muss ein boolescher Wert sein"},
-        {"Connector and Transport name", "  Connector: {0}  Transport: {1}"},
-        {"Connector argument nodefault", "    Argument: {0} (kein Standard)"},
-        {"Connector argument default", "    Argument: {0} Standardwert: {1}"},
-        {"Connector description", "    Beschreibung: {0}"},
-        {"Connector required argument nodefault", "    Erforderliches Argument: {0} (kein Standard)"},
-        {"Connector required argument default", "    Erforderliches Argument: {0} Standardwert: {1}"},
-        {"Connectors available", "Verf\u00FCgbare Connectors:"},
-        {"Constant is not a method", "Konstante ist keine Methode"},
-        {"Could not open:", "\u00D6ffnen nicht m\u00F6glich: {0}"},
-        {"Current method is native", "Aktuelle Methode ist nativ"},
-        {"Current thread died. Execution continuing...", "Aktueller Thread {0} abgebrochen. Ausf\u00FChrung wird fortgesetzt..."},
-        {"Current thread isnt suspended.", "Aktueller Thread ist nicht unterbrochen."},
-        {"Current thread not set.", "Aktueller Thread nicht festgelegt."},
-        {"dbgtrace flag value must be an integer:", "dbgtrace-Kennzeichenwert muss eine Ganzzahl sein: {0}"},
-        {"dbgtrace command value must be an integer:", "dbgtrace-Befehlswert muss eine Ganzzahl sein: {0}"},
-        {"Deferring.", "{0} wird verz\u00F6gert.\nWird nach Laden der Klasse festgelegt."},
-        {"End of stack.", "Stackende."},
-        {"EOF", "EOF"},
-        {"Error popping frame", "Fehler bei Anzeige von Frame - {0}"},
-        {"Error reading file", "Fehler beim Lesen von \"{0}\" - {1}"},
-        {"Error redefining class to file", "Fehler beim Neudefinieren von {0} als {1} - {2}"},
-        {"exceptionSpec all", "alle {0}"},
-        {"exceptionSpec caught", "abgefangene {0}"},
-        {"exceptionSpec uncaught", "nicht abgefangene {0}"},
-        {"Exception in expression:", "Ausnahme in Ausdruck: {0}"},
-        {"Exception occurred caught", "Ausnahme aufgetreten: {0} (abzufangen bei: {1})"},
-        {"Exception occurred uncaught", "Ausnahme aufgetreten: {0} (nicht abgefangen)"},
-        {"Exceptions caught:", "Break bei diesen Ausnahmen:"},
-        {"Expected at, in, or an integer <thread_id>:", "\"at\", \"in\" oder ganzzahlige <thread_id> erwartet: {0}"},
-        {"expr is null", "{0} = Null"},
-        {"expr is value", "{0} = {1}"},
-        {"expr is value <collected>", "  {0} = {1} <erfasst>"},
-        {"Expression cannot be void", "Ausdruck darf nicht \"void\" sein"},
-        {"Expression must evaluate to an object", "Auswertung des Ausdrucks muss ein Objekt ergeben"},
-        {"extends:", "erweitert: {0}"},
-        {"Extra tokens after breakpoint location", "Zus\u00E4tzliche Token nach Breakpoint-Ort"},
-        {"Failed reading output", "Ausgabe des untergeordneten Java-Interpreters konnte nicht gelesen werden."},
-        {"Fatal error", "Schwerwiegender Fehler:"},
-        {"Field access encountered before after", "Feld ({0}) ist {1}, wird {2} sein: "},
-        {"Field access encountered", "Feldzugriff ({0}) aufgetreten: "},
-        {"Field to unwatch not specified", "Feld f\u00FCr Ende der \u00DCberwachung nicht angegeben."},
-        {"Field to watch not specified", "Feld f\u00FCr \u00DCberwachung nicht angegeben."},
-        {"GC Disabled for", "GC deaktiviert f\u00FCr {0}:"},
-        {"GC Enabled for", "GC aktiviert f\u00FCr {0}:"},
-        {"grouping begin character", "{"},
-        {"grouping end character", "}"},
-        {"Illegal Argument Exception", "Ausnahme wegen ung\u00FCltigen Arguments"},
-        {"Illegal connector argument", "Ung\u00FCltiges Connector-Argument: {0}"},
-        {"implementor:", "Implementierer: {0}"},
-        {"implements:", "implementiert: {0}"},
-        {"Initializing progname", "{0} wird initialisiert..."},
-        {"Input stream closed.", "Inputstream geschlossen."},
-        {"Interface:", "Schnittstelle: {0}"},
-        {"Internal debugger error.", "Interner Debuggerfehler."},
-        {"Internal error: null ThreadInfo created", "Interner Fehler: Null-ThreadInfo erstellt"},
-        {"Internal error; unable to set", "Interner Fehler: {0} konnte nicht festgelegt werden"},
-        {"Internal exception during operation:", "Interne Ausnahme bei Vorgang:\n    {0}"},
-        {"Internal exception:", "Interne Ausnahme:"},
-        {"Invalid argument type name", "Ung\u00FCltiger Argumenttypname"},
-        {"Invalid assignment syntax", "Ung\u00FCltige Zuweisungssyntax"},
-        {"Invalid command syntax", "Ung\u00FCltige Befehlssyntax"},
-        {"Invalid connect type", "Ung\u00FCltiger Verbindungstyp"},
-        {"Invalid consecutive invocations", "Ung\u00FCltige aufeinander folgende Aufrufe"},
-        {"Invalid exception object", "Ung\u00FCltiges Ausnahmeobjekt"},
-        {"Invalid line number specified", "Ung\u00FCltige Zeilennummer angegeben"},
-        {"Invalid <method_name> specification:", "Ung\u00FCltige <method_name>-Spezifikation: {0}"},
-        {"Invalid option on class command", "Ung\u00FCltige Option in Klassenbefehl"},
-        {"invalid option", "Ung\u00FCltige Option: {0}"},
-        {"Invalid thread status.", "Ung\u00FCltiger Threadstatus."},
-        {"Invalid <thread_id>:", "<thread_id> ung\u00FCltig: {0}"},
-        {"Invalid transport name:", "Ung\u00FCltiger Transportname: {0}"},
-        {"Invalid <class>.<method_name> specification", "Ung\u00FCltige <class>.<method_name>-Spezifikation"},
-        {"I/O exception occurred:", "I/O-Ausnahme aufgetreten: {0}"},
-        {"is an ambiguous method name in", "\"{0}\" ist ein mehrdeutiger Methodenname in \"{1}\""},
-        {"is an invalid line number for",  "{0,number,integer} ist eine ung\u00FCltige Zeilennummer f\u00FCr {1}"},
-        {"is not a valid class name", "\"{0}\" ist kein g\u00FCltiger Klassenname."},
-        {"is not a valid field name", "\"{0}\" ist kein g\u00FCltiger Feldname."},
-        {"is not a valid id or class name", "\"{0}\" ist keine g\u00FCltige ID oder kein g\u00FCltiger Klassenname."},
-        {"is not a valid line number or method name for", "\"{0}\" ist keine g\u00FCltige Zeilennummer oder kein g\u00FCltiger Methodenname f\u00FCr Klasse \"{1}\""},
-        {"is not a valid method name", "\"{0}\" ist kein g\u00FCltiger Methodenname."},
-        {"is not a valid thread id", "\"{0}\" ist keine g\u00FCltige Thread-ID."},
-        {"is not a valid threadgroup name", "\"{0}\" ist kein g\u00FCltiger Threadgruppenname."},
-        {"jdb prompt with no current thread", "> "},
-        {"jdb prompt thread name and current stack frame", "{0}[{1,number,integer}] "},
-        {"killed", "{0} abgebrochen"},
-        {"killing thread:", "Thread wird abgebrochen: {0}"},
-        {"Line number information not available for", "F\u00FCr diese Position sind keine Quellenzeilennummern verf\u00FCgbar."},
-        {"line number", ":{0,number,integer}"},
-        {"list field typename and name", "{0} {1}\n"},
-        {"list field typename and name inherited", "{0} {1} (geerbt von {2})\n"},
-        {"list field typename and name hidden", "{0} {1} (ausgeblendet)\n"},
-        {"Listening at address:", "Listening-Adresse: {0}"},
-        {"Local variable information not available.", "Keine lokalen Variableninformationen verf\u00FCgbar. Kompilieren Sie mit -g, um Variableninformationen zu generieren"},
-        {"Local variables:", "Lokale Variablen:"},
-        {"<location unavailable>", "<Ort nicht verf\u00FCgbar>"},
-        {"location", "\"Thread={0}\", {1}"},
-        {"locationString", "{0}.{1}(), Zeile={2,number,integer} BCI={3,number,integer}"},
-        {"Main class and arguments must be specified", "Hauptklasse und Argumente m\u00FCssen angegeben werden"},
-        {"Method arguments:", "Methodenargumente:"},
-        {"Method entered:", "Methode gestartet: "},
-        {"Method exited:",  "Methode beendet"},
-        {"Method exitedValue:", "Methode beendet: R\u00FCckgabewert = {0}, "},
-        {"Method is overloaded; specify arguments", "Methode {0} ist \u00FCberladen. Geben Sie Argumente an"},
-        {"minus version", "Diese Version ist {0} {1,number,integer}.{2,number,integer} (Java SE Version {3})"},
-        {"Missing at or in", "\"at\" oder \"in\" fehlt"},
-        {"Monitor information for thread", "\u00DCberwachungsinformationen f\u00FCr Thread {0}:"},
-        {"Monitor information for expr", "\u00DCberwachungsinformationen f\u00FCr {0} ({1}):"},
-        {"More than one class named", "Mehrere Klassen mit dem Namen: \"{0}\""},
-        {"native method", "native Methode"},
-        {"nested:", "verschachtelt: {0}"},
-        {"No attach address specified.", "Keine Anhangsadresse angegeben."},
-        {"No breakpoints set.", "Keine Breakpoints festgelegt."},
-        {"No class named", "Keine Klasse namens \"{0}\""},
-        {"No class specified.", "Keine Klasse angegeben."},
-        {"No classpath specified.", "Kein Classpath angegeben."},
-        {"No code at line", "Kein Code bei Zeile {0,number,integer} in {1}"},
-        {"No connect specification.", "Keine Verbindungsspezifikation."},
-        {"No connector named:", "Kein Connector namens: {0}"},
-        {"No current thread", "Kein aktueller Thread"},
-        {"No default thread specified:", "Kein Standardthread angegeben: Verwenden Sie zun\u00E4chst den Befehl \"thread\"."},
-        {"No exception object specified.", "Kein Ausnahmeobjekt angegeben."},
-        {"No exceptions caught.", "Keine Ausnahmen abgefangen."},
-        {"No expression specified.", "Kein Ausdruck angegeben."},
-        {"No field in", "Kein Feld {0} in {1}"},
-        {"No frames on the current call stack", "Keine Frames im aktuellen Aufrufstack"},
-        {"No linenumber information for", "Keine Zeilennummerninformationen f\u00FCr {0}. F\u00FChren Sie die Kompilierung mit aktiviertem Debugging aus."},
-        {"No local variables", "Keine lokalen Variablen"},
-        {"No method in", "Keine Methode {0} in {1}"},
-        {"No method specified.", "Keine Methode angegeben."},
-        {"No monitor numbered:", "Kein Monitor mit Nummer: {0}"},
-        {"No monitors owned", "  Keine Monitore im Eigentum"},
-        {"No object specified.", "Kein Objekt angegeben."},
-        {"No objects specified.", "Keine Objekte angegeben."},
-        {"No save index specified.", "Kein Speicherindex angegeben."},
-        {"No saved values", "Keine gespeicherten Werte"},
-        {"No source information available for:", "Keine Quellinformationen f\u00FCr {0} verf\u00FCgbar"},
-        {"No sourcedebugextension specified", "Keine SourceDebugExtension angegeben"},
-        {"No sourcepath specified.", "Kein Quellpfad angegeben."},
-        {"No thread specified.", "Kein Thread angegeben."},
-        {"No VM connected", "Keine VM verbunden"},
-        {"No waiters", "  Keine Waiter"},
-        {"not a class", "{0} ist keine Klasse"},
-        {"Not a monitor number:", "Keine Monitornummer: \"{0}\""},
-        {"not found (try the full name)", "{0} nicht gefunden (verwenden Sie den vollst\u00E4ndigen Namen)"},
-        {"Not found:", "Nicht gefunden: {0}"},
-        {"not found", "{0} nicht gefunden"},
-        {"Not owned", "  Nicht im Eigentum"},
-        {"Not waiting for a monitor", "  Nicht auf einen Monitor wartend"},
-        {"Nothing suspended.", "Nichts unterbrochen."},
-        {"object description and id", "({0}){1}"},
-        {"Operation is not supported on the target VM", "Vorgang wird in der Ziel-VM nicht unterst\u00FCtzt"},
-        {"operation not yet supported", "Vorgang noch nicht unterst\u00FCtzt"},
-        {"Owned by:", "  Eigent\u00FCmer: {0}, Anzahl Eintr\u00E4ge: {1,number,integer}"},
-        {"Owned monitor:", "  Monitor im Eigentum: {0}"},
-        {"Parse exception:", "Parseausnahme: {0}"},
-        {"printclearcommandusage", "Verwendung: clear <class>:<line_number> oder\n      clear <class>.<method_name>[(argument_type,...)]"},
-        {"printstopcommandusage",
-         "Verwendung: stop [go|thread] [<thread_id>] <at|in> <Position>\n  Wenn \"go\" angegeben ist, wird der Thread nach dem Stoppen sofort fortgesetzt\n  Wenn \"thread\" angegeben ist, wird nur der Thread unterbrochen, in dem der Stopp ausgef\u00FChrt wird\n  Wenn weder \"go\" noch \"thread\" angegeben ist, werden alle Threads unterbrochen\n  Wenn eine ganzzahlige <thread_id> angegeben ist, wird nur der angegebene Thread gestoppt\n  \"at\" und \"in\" haben dieselbe Bedeutung\n  <Position> kann eine Zeilennummer oder eine Methode sein:\n    <class_id>:<line_number>\n    <class_id>.<Methode>[(argument_type,...)]"
-        },
-        {"Removed:", "Entfernt: {0}"},
-        {"repeat is on", "Wiederholung ist aktiviert"},
-        {"repeat is off", "Wiederholung ist deaktiviert"},
-        {"repeat usage", "Verwendung: repeat <on|off>"},
-        {"Requested stack frame is no longer active:", "Angeforderter Stackframe ist nicht mehr aktiv: {0,number,integer}"},
-        {"run <args> command is valid only with launched VMs", "Der Befehl \"run <args>\" ist nur mit gestarteten VMs g\u00FCltig"},
-        {"run", "{0} ausf\u00FChren"},
-        {"saved", "{0} gespeichert"},
-        {"Set deferred", "{0} mit Verz\u00F6gerung festlegen"},
-        {"Set", "{0} festlegen"},
-        {"Source file not found:", "Quelldatei nicht gefunden: {0}"},
-        {"source line number and line", "{0,number,integer}    {1}"},
-        {"source line number current line and line", "{0,number,integer} => {1}"},
-        {"sourcedebugextension", "SourceDebugExtension -- {0}"},
-        {"Specify class and method", "Klasse und Methode angeben"},
-        {"Specify classes to redefine", "Klassen f\u00FCr Neudefinition angeben"},
-        {"Specify file name for class", "Dateinamen f\u00FCr Klasse {0} angeben"},
-        {"stack frame dump with pc", "  [{0,number,integer}] {1}.{2} ({3}), PC = {4}"},
-        {"stack frame dump", "  [{0,number,integer}] {1}.{2} ({3})"},
-        {"Step completed:", "Schritt abgeschlossen: "},
-        {"Stopping due to deferred breakpoint errors.", "Stoppen aufgrund von verz\u00F6gerten Breakpoint-Fehlern.\n"},
-        {"subclass:", "Unterklasse: {0}"},
-        {"subinterface:", "Unterschnittstelle: {0}"},
-        {"tab", "\t{0}"},
-        {"Target VM failed to initialize.", "Ziel-VM konnte nicht initialisiert werden."},
-        {"The application exited", "Anwendung beendet"},
-        {"The application has been disconnected", "Die Anwendung wurde getrennt"},
-        {"The gc command is no longer necessary.", "Der Befehl \"gc\" ist nicht mehr erforderlich.\nDie Garbage Collection wird wie gew\u00F6hnlich f\u00FCr alle Objekte durchgef\u00FChrt. Verwenden Sie die Befehle \"enablegc\" und \"disablegc\",\num die Garbage Collection einzelner Objekte zu steuern."},
-        {"The load command is no longer supported.", "Der Befehl \"load\" wird nicht mehr unterst\u00FCtzt."},
-        {"The memory command is no longer supported.", "Der Befehl \"memory\" wird nicht mehr unterst\u00FCtzt."},
-        {"The VM does not use paths", "Die VM verwendet keine Pfade"},
-        {"Thread is not running (no stack).", "Thread wird nicht ausgef\u00FChrt (kein Stack)."},
-        {"Thread number not specified.", "Threadnummer nicht angegeben."},
-        {"Thread:", "{0}:"},
-        {"Thread Group:", "Gruppe {0}:"},
-        {"Thread description name unknownStatus BP",  "  {0} {1} unbekannt (bei Breakpoint)"},
-        {"Thread description name unknownStatus",     "  {0} {1} unbekannt"},
-        {"Thread description name zombieStatus BP",   "  {0} {1} Zombie (bei Breakpoint)"},
-        {"Thread description name zombieStatus",      "  {0} {1} Zombie"},
-        {"Thread description name runningStatus BP",  "  {0} {1} wird ausgef\u00FChrt (bei Breakpoint)"},
-        {"Thread description name runningStatus",     "  {0} {1} wird ausgef\u00FChrt"},
-        {"Thread description name sleepingStatus BP", "  {0} {1} inaktiv (bei Breakpoint)"},
-        {"Thread description name sleepingStatus",    "  {0} {1} inaktiv"},
-        {"Thread description name waitingStatus BP",  "  {0} {1} wartet in einem Monitor (bei Breakpoint)"},
-        {"Thread description name waitingStatus",     "  {0} {1} wartet in einem Monitor"},
-        {"Thread description name condWaitstatus BP", "  {0} {1} wartet bedingt (bei Breakpoint)"},
-        {"Thread description name condWaitstatus",    "  {0} {1} wartet bedingt"},
-        {"Thread has been resumed", "Thread wurde wiederaufgenommen"},
-        {"Thread not suspended", "Thread nicht unterbrochen"},
-        {"thread group number description name", "{0,number,integer}. {1} {2}"},
-        {"Threadgroup name not specified.", "Name der Threadgruppe nicht angegeben."},
-        {"<thread_id> option not valid until the VM is started with the run command",
-         "<thread_id>-Option ist erst g\u00FCltig, wenn die VM mit dem Befehl \"run\" gestartet wurde"},
-        {"Threads must be suspended", "Threads m\u00FCssen unterbrochen sein"},
-        {"trace method exit in effect for", "\"trace method exit\" in Kraft f\u00FCr {0}"},
-        {"trace method exits in effect", "\"trace method exits\" in Kraft"},
-        {"trace methods in effect", "\"trace methods\" in Kraft"},
-        {"trace go method exit in effect for", "\"trace go method exit\" in Kraft f\u00FCr {0}"},
-        {"trace go method exits in effect", "\"trace go method exits\" in Kraft"},
-        {"trace go methods in effect", "\"trace go methods\" in Kraft"},
-        {"trace not in effect", "\"trace\" nicht in Kraft"},
-        {"Unable to attach to target VM.", "Anh\u00E4ngen an Ziel-VM nicht m\u00F6glich."},
-        {"Unable to display process output:", "Prozessausgabe kann nicht angezeigt werden: {0}"},
-        {"Unable to launch target VM.", "Ziel-VM kann nicht gestartet werden."},
-        {"Unable to set deferred", "{0} mit Verz\u00F6gerung kann nicht festgelegt werden: {1}"},
-        {"Unable to set main class and arguments", "Hauptklasse und Argument k\u00F6nnen nicht festgelegt werden"},
-        {"Unable to set", "{0} kann nicht festgelegt werden: {1}"},
-        {"Unexpected event type", "Unerwarteter Ereignistyp: {0}"},
-        {"unknown", "unbekannt"},
-        {"Unmonitoring", "\u00DCberwachung von {0} aufheben"},
-        {"Unrecognized command.  Try help...", "Nicht erkannter Befehl: \"{0}\". Rufen Sie \"help\" auf..."},
-        {"Usage: catch exception", "Verwendung: catch [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>"},
-        {"Usage: ignore exception", "Verwendung: ignore [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>"},
-        {"Usage: down [n frames]", "Verwendung: down [n frames]"},
-        {"Usage: kill <thread id> <throwable>", "Verwendung: kill <Thread-ID> <Throwable>"},
-        {"Usage: read <command-filename>", "Verwendung: read <Befehlsdateiname>"},
-        {"Usage: unmonitor <monitor#>", "Verwendung: unmonitor <Monitornummer>"},
-        {"Usage: up [n frames]", "Verwendung: up [n frames]"},
-        {"Use java minus X to see", "Verwenden Sie \"java -X\", um die verf\u00FCgbaren nicht standardm\u00E4\u00DFigen Optionen anzuzeigen"},
-        {"VM already running. use cont to continue after events.", "VM wird bereits ausgef\u00FChrt. Verwenden Sie \"cont\", um nach Ereignissen fortzufahren."},
-        {"VM Started:", "VM gestartet: "},
-        {"vmstartexception", "VM-Startausnahme: {0}"},
-        {"Waiting for monitor:", "   Warten auf Monitor: {0}"},
-        {"Waiting thread:", " Wartender Thread: {0}"},
-        {"watch accesses of", "Zugriffe von {0}.{1} \u00FCberwachen"},
-        {"watch modification of", "\u00C4nderung von {0}.{1} \u00FCberwachen"},
-        {"zz help text",
-             "** Befehlsliste **\nconnectors                -- Listet verf\u00FCgbare Connectors und Transporte in dieser VM auf\n\nrun [class [args]]        -- Startet die Ausf\u00FChrung der Hauptklasse der Anwendung\n\nthreads [threadgroup]     -- Listet Threads auf\nthread <Thread-ID>        -- Legt den Standardthread fest\nsuspend [thread id(s)]    -- Unterbricht Threads (Standard: all)\nresume [thread id(s)]    -- Nimmt Threads wieder auf (Standard: all)\nwhere [<Thread-ID> | all] -- Gibt den Stack eines Threads aus\nwherei [<Thread-ID> | all] -- Gibt den Stack eines Threads mit PC-Informationen aus\nup [n frames]             -- Verschiebt den Stack eines Threads nach oben\ndown [n frames]             -- Verschiebt den Stack eines Threads nach unten\nkill <Thread-ID> <Ausdruck>   -- Bricht einen Thread mit dem angegebenen Ausnahmeobjekt ab\ninterrupt <Thread-ID>     -- Unterbricht einen Thread\n\nprint <Ausdruck>              -- Gibt den Wert eines Ausdrucks aus\ndump <Ausdruck>               -- Gibt alle Objektinformationen aus\neval <Ausdruck>               -- Bewertet einen Ausdruck (wie \"print\")\nset <lvalue> = <Ausdruck>     -- Weist einem Feld/einer Variablen/einem Arrayelement einen neuen Wert zu\nlocals                    -- Gibt alle lokalen Variablen im aktuellen Stackframe aus\n\nclasses                   -- Listet derzeit bekannte Klassen auf\nclass <Klassen-ID>          -- Zeigt Details einer benannten Klasse an\nmethods <Klassen-ID>        -- Listet die Methoden einer Klasse auf\nfields <Klassen-ID>        -- Listet die Felder einer Klasse auf\n\nthreadgroups              -- Listet Threadgruppen auf\nthreadgroup <Name>        -- Legt die aktuelle Threadgruppe fest\n\nstop [go|thread] [<thread_id>] <at|in> <Position>\n                          -- Legt einen Breakpoint fest\n                          -- Wenn Sie keine Optionen angeben, wird die aktuelle Breakpoint-Liste ausgegeben\n                          -- Wenn Sie \"go\" angeben, wird der Vorgang nach dem Stoppen sofort wiederaufgenommen\n                          -- Wenn Sie \"thread\" angeben, wird nur der Thread unterbrochen, in dem gestoppt wurde\n                          -- Wenn Sie weder \"go\" noch \"thread\" angeben, werden alle Threads unterbrochen\n                          -- Wenn Sie eine ganzzahlige <thread_id> angeben, wird der Vorgang nur im angegebenen Thread gestoppt\n                          -- \"at\" und \"in\" haben die gleiche Bedeutung\n                          -- <Position> kann eine Zeilennummer oder eine Methode sein:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<Methode>[(argument_type,...)]\nclear <class id>.<Methode>[(argument_type,...)]\n                          -- L\u00F6scht einen Breakpoint in einer Methode\nclear <Klassen-ID>:<Zeile>   -- L\u00F6scht einen Breakpoint bei einer Zeile\nclear                     -- Listet Breakpoints auf\ncatch [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>\n                          -- Break bei der angegebenen Ausnahme\nignore [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>\n                          -- Bricht \"catch\" f\u00FCr die angegebene Ausnahme ab\nwatch [access|all] <Klassen-ID>.<Feldname>\n                          -- \u00DCberwacht Zugriffe/\u00C4nderungen eines Feldes\nunwatch [access|all] <Klassen-ID>.<Feldname>\n                          -- Hebt die \u00DCberwachung der Zugriffe/\u00C4nderungen eines Feldes auf\ntrace [go] methods [thread]\n                          -- Verfolgt Methodenstarts und -beendigungen.\n                          -- Alle Threads werden unterbrochen, es sei denn, \"go\" ist angegeben\ntrace [go] method exit | exits [thread]\n                          -- Verfolgt die Beendigung der aktuellen Methode oder die Beendigungen aller Methoden\n                          -- Alle Threads werden unterbrochen, es sei denn, \"go\" ist angegeben\nuntrace [methods]         -- Stoppt das Tracing von Methodenstarts und/oder -beendigungen\nstep                      -- F\u00FChrt die aktuelle Zeile aus\nstep up                   -- Ausf\u00FChren, bis die aktuelle Methode an den Aufrufer zur\u00FCckgegeben wird\nstepi                     -- F\u00FChrt die aktuelle Anweisung aus\nnext                      -- Eine Zeile weiter (Aufrufe auslassen)\ncont                      -- Setzt die Ausf\u00FChrung ab dem Breakpoint fort\n\nlist [line number|method] -- Gibt den Quellcode aus\nuse (or sourcepath) [source file path]\n                          -- Zeigt den Quellpfad an oder \u00E4ndert diesen\nexclude [<Klassenmuster>, ... | \"none\"]\n                          -- Meldet keine Schritt- oder Methodenereignisse f\u00FCr angegebene Klassen\nclasspath                 -- Gibt Classpath-Informationen aus der Ziel-VM aus\n\nmonitor <Befehl>         -- F\u00FChrt bei jedem Programmstopp einen Befehl aus\nmonitor                   -- Listet Monitore auf\nunmonitor <Monitornummer>      -- L\u00F6scht einen Monitor\nread <Dateiname>           -- Liest eine Befehlsdatei und f\u00FChrt diese aus\n\nlock <Ausdruck>               -- Gibt Sperrinformationen f\u00FCr ein Objekt aus\nthreadlocks [thread id]   -- Gibt Sperrinformationen f\u00FCr einen Thread aus\n\npop                       -- Holt den Stack bis zum aktuellen Frame (einschlie\u00DFlich)\nreenter                   -- Wie \"pop\", aber der aktuelle Frame wird wieder eingegeben\nredefine <Klassen-ID> <Klassendateiname>\n                          -- Definiert den Code f\u00FCr eine Klasse neu\n\ndisablegc <Ausdruck>          -- Verhindert die Garbage Collection eines Objekts\nenablegc <Ausdruck>          -- L\u00E4sst die Garbage Collection eines Objekts zu\n\n!!                        -- Wiederholt den letzten Befehl\n<n> <Befehl>             -- Wiederholt einen Befehl n-mal\nrepeat                    -- Zeigt an, ob die Wiederholung durch leeren Befehl im GDB-Stil aktiviert ist\nrepeat <on|off>           -- Aktiviert/deaktiviert die Wiederholung im GDB-Stil\n# <Befehl>               -- Verwerfen (kein Vorgang)\nhelp (oder ?)               -- Listet Befehle auf\ndbgtrace [flag]           -- Identisch mit der Befehlszeilenoption \"dbgtrace\"\nversion                   -- Gibt Versionsinformationen aus\nexit (oder quit)            -- Beendet den Debugger\n\n<Klassen-ID>: Ein vollst\u00E4ndiger Klassenname mit Package-Qualifiers\n<Klassenmuster>: Ein Klassenname mit einem Platzhalter am Anfang oder Ende (\"*\")\n<Thread-ID>: Threadnummer aus dem Befehl \"threads\"\n<Ausdruck>: Ein Ausdruck der Java(TM)-Programmiersprache.\nDer Gro\u00DFteil der g\u00E4ngigen Syntax wird unterst\u00FCtzt.\n\nStartbefehle k\u00F6nnen in \"jdb.ini\" oder \".jdbrc\" abgelegt werden\nin user.home oder user.dir"},
-        {"zz usage text",
-             "Verwendung: {0} <Optionen> <Klasse> <Argumente>\n\nVerf\u00FCgbare Optionen:\n    -? -h --help -help Gibt diese Hilfemeldung aus und beendet den Vorgang\n    -sourcepath <durch \"{1}\" getrennte Verzeichnisse>\n                      Verzeichnisse, in denen nach Quelldateien gesucht werden soll\n    -attach <Adresse>\n                      Anh\u00E4ngen an aktive VM unter der angegebenen Adresse mit Standard-Connector\n    -listen <Adresse>\n                      Wartet auf Verbindung der aktiven VM unter der angegebenen Adresse mit Standard-Connector\n    -listenany\n                      Wartet auf Verbindung einer aktiven VM unter einer beliebigen verf\u00FCgbaren Adresse mit Standard-Connector\n    -launch\n                      Startet die VM sofort, anstatt auf den Befehl \"run\" zu warten\n    -listconnectors   Listet die in dieser VM verf\u00FCgbaren Connectors auf\n    -connect <connector-name>:<name1>=<value1>,...\n                      Stellt die Verbindung zur Ziel-VM mit dem benannten Connector und den aufgelisteten Argumentwerten her\n    -dbgtrace [flags] Gibt Informationen zum Debugging von {0} aus\n    -tclient          F\u00FChrt die Anwendung im HotSpot(TM) Client Compiler aus\n    -tserver          F\u00FChrt die Anwendung im HotSpot(TM) Server Compiler aus\n\nAn Debuggerprozess weitergeleitete Optionen:\n    -v -verbose[:class|gc|jni]\n                      Aktiviert den Verbose-Modus\n    -D<Name>=<Wert>  Legt eine Systemeigenschaft fest\n    -classpath <durch \"{1}\" getrennte Verzeichnisse>\n                      Listet Verzeichnisse auf, in denen nach Klassen gesucht werden soll\n    -X<Option>        Nicht standardm\u00E4\u00DFige Ziel-VM-Option\n\n<Klasse> ist der Name der Klasse zum Start des Debuggings\n<Argumente> sind die Argumente, die an die main()-Methode der <Klasse> \u00FCbergeben werden\n\nGeben Sie \"help\" beim {0}-Prompt ein, um Befehlshilfe anzuzeigen"},
-        // END OF MATERIAL TO LOCALIZE
-        };
-
-        return temp;
-    }
-}
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
index a9364b853a5..330fc33a820 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -253,9 +253,9 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
          "\u4F7F\u7528\u65B9\u6CD5: stop [go|thread] [<thread_id>] <at|in> <location>\n  \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n  \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n  \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n  \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n  \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n  <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n    <class_id>:<line_number>\n    <class_id>.<method>[(argument_type,...)]"
         },
         {"Removed:", "{0}\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F"},
-        {"repeat is on", "\u7E70\u8FD4\u3057\u306F\u30AA\u30F3\u3067\u3059"},
-        {"repeat is off", "\u7E70\u8FD4\u3057\u306F\u30AA\u30D5\u3067\u3059"},
-        {"repeat usage", "\u4F7F\u7528\u65B9\u6CD5: repeat <on|off>"},
+        {"repeat is on", "Repeat is on"},
+        {"repeat is off", "Repeat is off"},
+        {"repeat usage", "Usage: repeat <on|off>"},
         {"Requested stack frame is no longer active:", "\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u305F\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u306F\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0,number,integer}"},
         {"run <args> command is valid only with launched VMs", "'run <args>'\u30B3\u30DE\u30F3\u30C9\u306F\u8D77\u52D5\u6E08\u306EVM\u3067\u306E\u307F\u6709\u52B9\u3067\u3059"},
         {"run", "{0}\u306E\u5B9F\u884C"},
@@ -302,7 +302,6 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
         {"Thread has been resumed", "\u30B9\u30EC\u30C3\u30C9\u304C\u518D\u958B\u3057\u307E\u3057\u305F"},
         {"Thread not suspended", "\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u3066\u3044\u307E\u305B\u3093"},
         {"thread group number description name", "{0,number,integer}. {1} {2}"},
-        {"Threadgroup name not specified.", "\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"<thread_id> option not valid until the VM is started with the run command",
          "<thread_id>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001VM\u304Crun\u30B3\u30DE\u30F3\u30C9\u3067\u958B\u59CB\u3055\u308C\u308B\u307E\u3067\u7121\u52B9\u3067\u3059"},
         {"Threads must be suspended", "\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
@@ -339,7 +338,7 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
         {"watch accesses of", "{0}.{1}\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u30A6\u30A9\u30C3\u30C1"},
         {"watch modification of", "{0}.{1}\u306E\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1"},
         {"zz help text",
-             "** \u30B3\u30DE\u30F3\u30C9\u30FB\u30EA\u30B9\u30C8 **\nconnectors                -- \u3053\u306EVM\u5185\u306E\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3068\u30C8\u30E9\u30F3\u30B9\u30DD\u30FC\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nrun [class [args]]        -- \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u5B9F\u884C\u3092\u958B\u59CB\u3057\u307E\u3059\n\nthreads [threadgroup]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthread <thread id>        -- \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\nsuspend [thread id(s)]    -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nresume [thread id(s)]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u518D\u958B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nwhere [<thread id> | all] -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30C0\u30F3\u30D7\u3057\u307E\u3059\nwherei [<thread id> | all]-- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092pc\u60C5\u5831\u3068\u3068\u3082\u306B\u30C0\u30F3\u30D7\u3057\u307E\u3059\nup [n frames]             -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0A\u306B\u79FB\u52D5\u3057\u307E\u3059\ndown [n frames]           -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0B\u306B\u79FB\u52D5\u3057\u307E\u3059\nkill <thread id> <expr>   -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u30B9\u30EC\u30C3\u30C9\u3092\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\ninterrupt <thread id>     -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n\nprint <expr>              -- \u5F0F\u306E\u5024\u3092\u51FA\u529B\u3057\u307E\u3059\ndump <expr>               -- \u3059\u3079\u3066\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\neval <expr>               -- \u5F0F\u3092\u8A55\u4FA1\u3057\u307E\u3059(print\u3068\u540C\u3058)\nset <lvalue> = <expr>     -- \u65B0\u3057\u3044\u5024\u3092\u30D5\u30A3\u30FC\u30EB\u30C9/\u5909\u6570/\u914D\u5217\u8981\u7D20\u306B\u4EE3\u5165\u3057\u307E\u3059\nlocals                    -- \u73FE\u5728\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u5185\u306E\u3059\u3079\u3066\u306E\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u3092\u51FA\u529B\u3057\u307E\u3059\n\nclasses                   -- \u73FE\u5728\u65E2\u77E5\u306E\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nclass <class id>          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\nmethods <class id>        -- \u30AF\u30E9\u30B9\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nfields <class id>         -- \u30AF\u30E9\u30B9\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nthreadgroups              -- \u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthreadgroup <name>        -- \u73FE\u5728\u306E\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                          -- \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u306E\u73FE\u5728\u306E\u30EA\u30B9\u30C8\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\n                          -- \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n                          -- \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n                          -- \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n                          -- <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u30E1\u30BD\u30C3\u30C9\u5185\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear <class id>:<line>   -- \u884C\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear                     -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u3068\u304D\u306B\u30D6\u30EC\u30FC\u30AF\u3057\u307E\u3059\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u306E'catch'\u3092\u53D6\u308A\u6D88\u3057\u307E\u3059\nwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u3092\u30A6\u30A9\u30C3\u30C1\u3057\u307E\u3059\nunwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1\u3092\u4E2D\u6B62\u3057\u307E\u3059\ntrace [go] methods [thread]\n                          -- \u30E1\u30BD\u30C3\u30C9\u306E\u5165\u308A\u53E3\u3068\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\u3002\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\ntrace [go] method exit | exits [thread]\n                          -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\nuntrace [methods]         -- \u30E1\u30BD\u30C3\u30C9\u306E\u958B\u59CB\u307E\u305F\u306F\u7D42\u4E86\u306E\u30C8\u30EC\u30FC\u30B9\u3092\u505C\u6B62\u3057\u307E\u3059\nstep                      -- \u73FE\u5728\u306E\u884C\u3092\u5B9F\u884C\u3057\u307E\u3059\nstep up                   -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u5143\u306B\u623B\u308B\u307E\u3067\u5B9F\u884C\u3057\u307E\u3059\nstepi                     -- \u73FE\u5728\u306E\u547D\u4EE4\u3092\u5B9F\u884C\u3057\u307E\u3059\nnext                      -- 1\u884C\u3092\u30B9\u30C6\u30C3\u30D7\u5B9F\u884C\u3057\u307E\u3059(\u547C\u51FA\u3057\u3092\u30B9\u30C6\u30C3\u30D7\u30AA\u30FC\u30D0\u30FC)\ncont                      -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u304B\u3089\u5B9F\u884C\u3092\u7D9A\u884C\u3057\u307E\u3059\n\nlist [line number|method] -- \u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u3092\u51FA\u529B\u3057\u307E\u3059\nuse (or sourcepath) [source file path]\n                          -- \u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u30B9\u30C6\u30C3\u30D7\u3084\u30E1\u30BD\u30C3\u30C9\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u5831\u544A\u3057\u307E\u305B\u3093\nclasspath                 -- \u30BF\u30FC\u30B2\u30C3\u30C8VM\u304B\u3089\u30AF\u30E9\u30B9\u30D1\u30B9\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\nmonitor <command>         -- \u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u505C\u6B62\u3059\u308B\u305F\u3073\u306B\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059\nmonitor                   -- \u30E2\u30CB\u30BF\u30FC\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nunmonitor <monitor#>      -- \u30E2\u30CB\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\nread <filename>           -- \u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u3063\u3066\u5B9F\u884C\u3057\u307E\u3059\n\nlock <expr>               -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nthreadlocks [thread id]   -- \u30B9\u30EC\u30C3\u30C9\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\npop                       -- \u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u307E\u3067\u306E\u3059\u3079\u3066\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30DD\u30C3\u30D7\u3057\u307E\u3059\nreenter                   -- pop\u3068\u540C\u3058\u3067\u3059\u304C\u3001\u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u304C\u518D\u5165\u529B\u3055\u308C\u307E\u3059\nredefine <class id> <class file name>\n                          -- \u30AF\u30E9\u30B9\u306E\u30B3\u30FC\u30C9\u3092\u518D\u5B9A\u7FA9\u3057\u307E\u3059\n\ndisablegc <expr>          -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6291\u5236\u3057\u307E\u3059\nenablegc <expr>           -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u8A31\u53EF\u3057\u307E\u3059\n\n!!                        -- \u6700\u5F8C\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u7E70\u308A\u8FD4\u3057\u307E\u3059\n<n> <command>             -- \u30B3\u30DE\u30F3\u30C9\u3092n\u56DE\u7E70\u308A\u8FD4\u3057\u307E\u3059\nrepeat                    -- GDB\u5F62\u5F0F\u306E\u7A7A\u306E\u30B3\u30DE\u30F3\u30C9\u306E\u7E70\u8FD4\u3057\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u304B\u3069\u3046\u304B\u3092\u793A\u3057\u307E\u3059\nrepeat <on|off>           -- GDB\u5F62\u5F0F\u306E\u7E70\u8FD4\u3057\u3092\u6709\u52B9/\u7121\u52B9\u306B\u3057\u307E\u3059\n# <command>               -- \u7834\u68C4\u3057\u307E\u3059(\u64CD\u4F5C\u306A\u3057)\nhelp (\u307E\u305F\u306F?)               -- \u30B3\u30DE\u30F3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ndbgtrace [flag]           -- dbgtrace\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u540C\u3058\u3067\u3059\nversion                   -- \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nexit (\u307E\u305F\u306Fquit)            -- \u30C7\u30D0\u30C3\u30AC\u3092\u7D42\u4E86\u3057\u307E\u3059\n\n<class id>: \u30D1\u30C3\u30B1\u30FC\u30B8\u4FEE\u98FE\u5B50\u3092\u542B\u3080\u5B8C\u5168\u30AF\u30E9\u30B9\u540D\n<class pattern>: \u5148\u982D\u307E\u305F\u306F\u672B\u5C3E\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9('*')\u3092\u542B\u3080\u30AF\u30E9\u30B9\u540D\n<thread id>: 'threads'\u30B3\u30DE\u30F3\u30C9\u3067\u5831\u544A\u3055\u308C\u308B\u30B9\u30EC\u30C3\u30C9\u756A\u53F7\n<expr>: Java(TM)\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u306E\u5F0F\u3002\n\u307B\u3068\u3093\u3069\u306E\u4E00\u822C\u7684\u306A\u69CB\u6587\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\n\u8D77\u52D5\u30B3\u30DE\u30F3\u30C9\u306F\u3001\"jdb.ini\"\u307E\u305F\u306F\".jdbrc\"\u306B\u914D\u7F6E\u3067\u304D\u307E\u3059\n(user.home\u307E\u305F\u306Fuser.dir\u5185)"},
+             "** \u30B3\u30DE\u30F3\u30C9\u30FB\u30EA\u30B9\u30C8 **\nconnectors                -- \u3053\u306EVM\u5185\u306E\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3068\u30C8\u30E9\u30F3\u30B9\u30DD\u30FC\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nrun [class [args]]        -- \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u5B9F\u884C\u3092\u958B\u59CB\u3057\u307E\u3059\n\nthreads [threadgroup]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthread <thread id>        -- \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\nsuspend [thread id(s)]    -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nresume [thread id(s)]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u518D\u958B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nwhere [<thread id> | all] -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30C0\u30F3\u30D7\u3057\u307E\u3059\nwherei [<thread id> | all]-- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092pc\u60C5\u5831\u3068\u3068\u3082\u306B\u30C0\u30F3\u30D7\u3057\u307E\u3059\nup [n frames]             -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0A\u306B\u79FB\u52D5\u3057\u307E\u3059\ndown [n frames]           -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0B\u306B\u79FB\u52D5\u3057\u307E\u3059\nkill <thread id> <expr>   -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u30B9\u30EC\u30C3\u30C9\u3092\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\ninterrupt <thread id>     -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n\nprint <expr>              -- \u5F0F\u306E\u5024\u3092\u51FA\u529B\u3057\u307E\u3059\ndump <expr>               -- \u3059\u3079\u3066\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\neval <expr>               -- \u5F0F\u3092\u8A55\u4FA1\u3057\u307E\u3059(print\u3068\u540C\u3058)\nset <lvalue> = <expr>     -- \u65B0\u3057\u3044\u5024\u3092\u30D5\u30A3\u30FC\u30EB\u30C9/\u5909\u6570/\u914D\u5217\u8981\u7D20\u306B\u4EE3\u5165\u3057\u307E\u3059\nlocals                    -- \u73FE\u5728\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u5185\u306E\u3059\u3079\u3066\u306E\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u3092\u51FA\u529B\u3057\u307E\u3059\n\nclasses                   -- \u73FE\u5728\u65E2\u77E5\u306E\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nclass <class id>          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\nmethods <class id>        -- \u30AF\u30E9\u30B9\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nfields <class id>         -- \u30AF\u30E9\u30B9\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nthreadgroups              -- \u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthreadgroup <name>        -- \u73FE\u5728\u306E\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                          -- \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u306E\u73FE\u5728\u306E\u30EA\u30B9\u30C8\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\n                          -- \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n                          -- \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n                          -- \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n                          -- <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u30E1\u30BD\u30C3\u30C9\u5185\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear <class id>:<line>   -- \u884C\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear                     -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u3068\u304D\u306B\u30D6\u30EC\u30FC\u30AF\u3057\u307E\u3059\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u306E'catch'\u3092\u53D6\u308A\u6D88\u3057\u307E\u3059\nwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u3092\u30A6\u30A9\u30C3\u30C1\u3057\u307E\u3059\nunwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1\u3092\u4E2D\u6B62\u3057\u307E\u3059\ntrace [go] methods [thread]\n                          -- \u30E1\u30BD\u30C3\u30C9\u306E\u5165\u308A\u53E3\u3068\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\u3002\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\ntrace [go] method exit | exits [thread]\n                          -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\nuntrace [methods]         -- \u30E1\u30BD\u30C3\u30C9\u306E\u958B\u59CB\u307E\u305F\u306F\u7D42\u4E86\u306E\u30C8\u30EC\u30FC\u30B9\u3092\u505C\u6B62\u3057\u307E\u3059\nstep                      -- \u73FE\u5728\u306E\u884C\u3092\u5B9F\u884C\u3057\u307E\u3059\nstep up                   -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u5143\u306B\u623B\u308B\u307E\u3067\u5B9F\u884C\u3057\u307E\u3059\nstepi                     -- \u73FE\u5728\u306E\u547D\u4EE4\u3092\u5B9F\u884C\u3057\u307E\u3059\nnext                      -- 1\u884C\u3092\u30B9\u30C6\u30C3\u30D7\u5B9F\u884C\u3057\u307E\u3059(\u547C\u51FA\u3057\u3092\u30B9\u30C6\u30C3\u30D7\u30AA\u30FC\u30D0\u30FC)\ncont                      -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u304B\u3089\u5B9F\u884C\u3092\u7D9A\u884C\u3057\u307E\u3059\n\nlist [line number|method] -- \u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u3092\u51FA\u529B\u3057\u307E\u3059\nuse (or sourcepath) [source file path]\n                          -- \u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u30B9\u30C6\u30C3\u30D7\u3084\u30E1\u30BD\u30C3\u30C9\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u5831\u544A\u3057\u307E\u305B\u3093\nclasspath                 -- \u30BF\u30FC\u30B2\u30C3\u30C8VM\u304B\u3089\u30AF\u30E9\u30B9\u30D1\u30B9\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\nmonitor <command>         -- \u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u505C\u6B62\u3059\u308B\u305F\u3073\u306B\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059\nmonitor                   -- \u30E2\u30CB\u30BF\u30FC\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nunmonitor <monitor#>      -- \u30E2\u30CB\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\nread <filename>           -- \u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u3063\u3066\u5B9F\u884C\u3057\u307E\u3059\n\nlock <expr>               -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nthreadlocks [thread id]   -- \u30B9\u30EC\u30C3\u30C9\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\npop                       -- \u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u307E\u3067\u306E\u3059\u3079\u3066\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30DD\u30C3\u30D7\u3057\u307E\u3059\nreenter                   -- pop\u3068\u540C\u3058\u3067\u3059\u304C\u3001\u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u304C\u518D\u5165\u529B\u3055\u308C\u307E\u3059\nredefine <class id> <class file name>\n                          -- \u30AF\u30E9\u30B9\u306E\u30B3\u30FC\u30C9\u3092\u518D\u5B9A\u7FA9\u3057\u307E\u3059\n\ndisablegc <expr>          -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6291\u5236\u3057\u307E\u3059\nenablegc <expr>           -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u8A31\u53EF\u3057\u307E\u3059\n\n!!                        -- \u6700\u5F8C\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u7E70\u308A\u8FD4\u3057\u307E\u3059\n<n> <command>             -- \u30B3\u30DE\u30F3\u30C9\u3092n\u56DE\u7E70\u308A\u8FD4\u3057\u307E\u3059\n# <command>               -- \u7834\u68C4\u3057\u307E\u3059(\u64CD\u4F5C\u306A\u3057)\nhelp (\u307E\u305F\u306F?)               -- \u30B3\u30DE\u30F3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ndbgtrace [flag]           -- dbgtrace\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u540C\u3058\u3067\u3059\nversion                   -- \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nexit (\u307E\u305F\u306Fquit)            -- \u30C7\u30D0\u30C3\u30AC\u3092\u7D42\u4E86\u3057\u307E\u3059\n\n<class id>: \u30D1\u30C3\u30B1\u30FC\u30B8\u4FEE\u98FE\u5B50\u3092\u542B\u3080\u5B8C\u5168\u30AF\u30E9\u30B9\u540D\n<class pattern>: \u5148\u982D\u307E\u305F\u306F\u672B\u5C3E\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9('*')\u3092\u542B\u3080\u30AF\u30E9\u30B9\u540D\n<thread id>: 'threads'\u30B3\u30DE\u30F3\u30C9\u3067\u5831\u544A\u3055\u308C\u308B\u30B9\u30EC\u30C3\u30C9\u756A\u53F7\n<expr>: Java(TM)\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u306E\u5F0F\u3002\n\u307B\u3068\u3093\u3069\u306E\u4E00\u822C\u7684\u306A\u69CB\u6587\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\n\u8D77\u52D5\u30B3\u30DE\u30F3\u30C9\u306F\u3001\"jdb.ini\"\u307E\u305F\u306F\".jdbrc\"\u306B\u914D\u7F6E\u3067\u304D\u307E\u3059\n(user.home\u307E\u305F\u306Fuser.dir\u5185)"},
         {"zz usage text",
              "\u4F7F\u7528\u65B9\u6CD5: {0} <options> <class> <arguments>\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n    -? -h --help -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n    -sourcepath <directories separated by \"{1}\">\n                      \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n    -attach <address>\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306B\u63A5\u7D9A\u3059\u308B\n    -listen <address>\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306E\u63A5\u7D9A\u3092\u5F85\u6A5F\u3059\u308B\n    -listenany\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u4F7F\u7528\u53EF\u80FD\u306A\u4EFB\u610F\u306E\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306E\u63A5\u7D9A\u3092\u5F85\u6A5F\u3059\u308B\n    -launch\n                      ''run''\u30B3\u30DE\u30F3\u30C9\u3092\u5F85\u6A5F\u305B\u305A\u306BVM\u3092\u5373\u6642\u306B\u8D77\u52D5\u3059\u308B\n    -listconnectors   \u3053\u306EVM\u3067\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3092\u30EA\u30B9\u30C8\u3059\u308B\n    -connect <connector-name>:<name1>=<value1>,...\n                      \u6307\u5B9A\u3055\u308C\u305F\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u30EA\u30B9\u30C8\u3055\u308C\u305F\u5F15\u6570\u5024\u3067\u30BF\u30FC\u30B2\u30C3\u30C8VM\u306B\u63A5\u7D9A\u3059\u308B\n    -dbgtrace [flags] {0}\u306E\u30C7\u30D0\u30C3\u30B0\u306E\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B\n    -tclient          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092HotSpot(TM) Client Compiler\u3067\u5B9F\u884C\u3059\u308B\n    -tserver          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092HotSpot(TM) Server Compiler\u3067\u5B9F\u884C\u3059\u308B\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u8EE2\u9001\u3055\u308C\u307E\u3059:\n    -v -verbose[:class|gc|jni]\n                      \u8A73\u7D30\u30E2\u30FC\u30C9\u3092\u30AA\u30F3\u306B\u3059\u308B\n    -D<name>=<value>  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n    -classpath <directories separated by \"{1}\">\n                      \u30AF\u30E9\u30B9\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u30EA\u30B9\u30C8\u3059\u308B\n    -X<option>        \u975E\u6A19\u6E96\u306E\u30BF\u30FC\u30B2\u30C3\u30C8VM\u30AA\u30D7\u30B7\u30E7\u30F3\n\n<class>\u306F\u30C7\u30D0\u30C3\u30B0\u3092\u958B\u59CB\u3059\u308B\u30AF\u30E9\u30B9\u306E\u540D\u524D\u3067\u3059\n<arguments>\u306F<class>\u306Emain()\u30E1\u30BD\u30C3\u30C9\u306B\u6E21\u3055\u308C\u308B\u5F15\u6570\u3067\u3059\n\n\u30B3\u30DE\u30F3\u30C9\u306E\u30D8\u30EB\u30D7\u306B\u3064\u3044\u3066\u306F{0}\u30D7\u30ED\u30F3\u30D7\u30C8\u3067''help''\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
         // END OF MATERIAL TO LOCALIZE
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
index 5de5fdd990e..6c4be977705 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"breakpoint", "\u65AD\u70B9{0}"},
         {"Breakpoints set:", "\u65AD\u70B9\u96C6:"},
         {"Breakpoints can be located only in classes.", "\u65AD\u70B9\u53EA\u80FD\u4F4D\u4E8E\u7C7B\u4E2D\u3002{0}\u662F\u63A5\u53E3\u6216\u6570\u7EC4\u3002"},
-        {"Can only trace", "\u53EA\u80FD\u8DDF\u8E2A 'methods'\u3001'method exit' \u6216 'method exits'"},
+        {"Can only trace", "\u53EA\u80FD\u8DDF\u8E2A 'methods', 'method exit' \u6216 'method exits'"},
         {"cannot redefine existing connection", "{0}\u65E0\u6CD5\u91CD\u65B0\u5B9A\u4E49\u73B0\u6709\u8FDE\u63A5"},
         {"Cannot assign to a method invocation", "\u65E0\u6CD5\u5206\u914D\u5230\u65B9\u6CD5\u8C03\u7528"},
         {"Cannot specify command line with connector:", "\u65E0\u6CD5\u6307\u5B9A\u5E26\u6709\u8FDE\u63A5\u5668\u7684\u547D\u4EE4\u884C: {0}"},
@@ -115,8 +115,8 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"Error reading file", "\u8BFB\u53D6 ''{0}'' \u65F6\u51FA\u9519 - {1}"},
         {"Error redefining class to file", "\u5C06{0}\u91CD\u65B0\u5B9A\u4E49\u4E3A{1}\u65F6\u51FA\u9519 - {2}"},
         {"exceptionSpec all", "\u6240\u6709{0}"},
-        {"exceptionSpec caught", "\u6355\u83B7\u7684 {0}"},
-        {"exceptionSpec uncaught", "\u672A\u6355\u83B7\u7684 {0}"},
+        {"exceptionSpec caught", "\u6355\u83B7\u7684{0}"},
+        {"exceptionSpec uncaught", "\u672A\u6355\u83B7\u7684{0}"},
         {"Exception in expression:", "\u8868\u8FBE\u5F0F\u4E2D\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0}"},
         {"Exception occurred caught", "\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0} (\u5C06\u5728\u4EE5\u4E0B\u4F4D\u7F6E\u6355\u83B7: {1})"},
         {"Exception occurred uncaught", "\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0} (\u672A\u6355\u83B7)"},
@@ -192,7 +192,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"locationString", "{0}.{1}(), \u884C={2,number,integer} bci={3,number,integer}"},
         {"Main class and arguments must be specified", "\u5FC5\u987B\u6307\u5B9A\u4E3B\u7C7B\u548C\u53C2\u6570"},
         {"Method arguments:", "\u65B9\u6CD5\u53C2\u6570:"},
-        {"Method entered:", "\u5DF2\u8FDB\u5165\u65B9\u6CD5\uFF1A"},
+        {"Method entered:", "\u5DF2\u8FDB\u5165\u65B9\u6CD5: "},
         {"Method exited:",  "\u5DF2\u9000\u51FA\u65B9\u6CD5"},
         {"Method exitedValue:", "\u5DF2\u9000\u51FA\u65B9\u6CD5: \u8FD4\u56DE\u503C = {0}, "},
         {"Method is overloaded; specify arguments", "\u5DF2\u91CD\u8F7D\u65B9\u6CD5{0}; \u8BF7\u6307\u5B9A\u53C2\u6570"},
@@ -253,9 +253,9 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
          "\u7528\u6CD5\uFF1Astop [go|thread] [<thread_id>] <at|in> <location>\n  \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n  \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n  \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n  \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n  \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n  <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n    <class_id>:<line_number>\n    <class_id>.<method>[(argument_type,...)]"
         },
         {"Removed:", "\u5DF2\u5220\u9664: {0}"},
-        {"repeat is on", "\u91CD\u590D\u5904\u4E8E\u542F\u7528\u72B6\u6001"},
-        {"repeat is off", "\u91CD\u590D\u5904\u4E8E\u7981\u7528\u72B6\u6001"},
-        {"repeat usage", "\u7528\u6CD5\uFF1Arepeat <on|off>"},
+        {"repeat is on", "Repeat is on"},
+        {"repeat is off", "Repeat is off"},
+        {"repeat usage", "Usage: repeat <on|off>"},
         {"Requested stack frame is no longer active:", "\u8BF7\u6C42\u7684\u5806\u6808\u5E27\u4E0D\u518D\u6709\u6548: {0,number,integer}"},
         {"run <args> command is valid only with launched VMs", "'run <args>' \u547D\u4EE4\u4EC5\u5BF9\u542F\u52A8\u7684 VM \u6709\u6548"},
         {"run", "\u8FD0\u884C{0}"},
@@ -302,7 +302,6 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"Thread has been resumed", "\u5DF2\u6062\u590D\u7EBF\u7A0B"},
         {"Thread not suspended", "\u672A\u6302\u8D77\u7EBF\u7A0B"},
         {"thread group number description name", "{0,number,integer}\u3002{1} {2}"},
-        {"Threadgroup name not specified.", "\u672A\u6307\u5B9A\u7EBF\u7A0B\u7EC4\u540D\u3002"},
         {"<thread_id> option not valid until the VM is started with the run command",
          "\u5728\u4F7F\u7528 run \u547D\u4EE4\u542F\u52A8 VM \u524D\uFF0C<thread_id> \u9009\u9879\u65E0\u6548"},
         {"Threads must be suspended", "\u5FC5\u987B\u6302\u8D77\u7EBF\u7A0B"},
@@ -339,7 +338,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"watch accesses of", "\u76D1\u89C6{0}.{1}\u7684\u8BBF\u95EE"},
         {"watch modification of", "\u76D1\u89C6{0}.{1}\u7684\u4FEE\u6539"},
         {"zz help text",
-             "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u8BBE\u7F6E\u65AD\u70B9\n                          -- \u5982\u679C\u672A\u63D0\u4F9B\u4EFB\u4F55\u9009\u9879\uFF0C\u5219\u5C06\u6253\u5370\u5F53\u524D\u65AD\u70B9\u5217\u8868\n                          -- \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n                          -- \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n                          -- \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n                          -- \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n                          -- \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n                          -- <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\n\u4E0B\u4E00\u6B65                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\nrepeat                    -- \u663E\u793A\u662F\u5426\u542F\u7528\u4E86 GDB \u6837\u5F0F\u7684\u7A7A\u547D\u4EE4\u91CD\u590D\nrepeat <on|off>           -- \u542F\u7528/\u7981\u7528 GDB \u6837\u5F0F\u7684\u91CD\u590D\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\ndbgtrace [flag]           -- \u4E0E dbgtrace \u547D\u4EE4\u884C\u9009\u9879\u76F8\u540C\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
+             "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u8BBE\u7F6E\u65AD\u70B9\n                          -- \u5982\u679C\u672A\u63D0\u4F9B\u4EFB\u4F55\u9009\u9879\uFF0C\u5219\u5C06\u6253\u5370\u5F53\u524D\u65AD\u70B9\u5217\u8868\n                          -- \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n                          -- \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n                          -- \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n                          -- \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n                          -- \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n                          -- <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\n\u4E0B\u4E00\u6B65                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\ndbgtrace [flag]           -- \u4E0E dbgtrace \u547D\u4EE4\u884C\u9009\u9879\u76F8\u540C\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
         {"zz usage text",
              "\u7528\u6CD5\uFF1A{0} <\u9009\u9879> <\u7C7B> <\u53C2\u6570>\n\n\u5176\u4E2D\uFF0C\u9009\u9879\u5305\u62EC\uFF1A\n    -? -h --help -help \u8F93\u51FA\u6B64\u6D88\u606F\u5E76\u9000\u51FA\n    -sourcepath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u8981\u5728\u5176\u4E2D\u67E5\u627E\u6E90\u6587\u4EF6\u7684\u76EE\u5F55\n    -attach <\u5730\u5740>\n                      \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u9644\u52A0\u5230\u6307\u5B9A\u5730\u5740\u5904\u6B63\u5728\u8FD0\u884C\u7684 VM\n    -listen <\u5730\u5740>\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u6307\u5B9A\u5730\u5740\u5904\u8FDE\u63A5\n    -listenany\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u4EFB\u4F55\u53EF\u7528\u5730\u5740\u5904\u8FDE\u63A5\n    -launch\n                      \u7ACB\u5373\u542F\u52A8 VM \u800C\u4E0D\u662F\u7B49\u5F85 ''run'' \u547D\u4EE4\n    -listconnectors   \u5217\u51FA\u6B64 VM \u4E2D\u7684\u53EF\u7528\u8FDE\u63A5\u5668\n    -connect <\u8FDE\u63A5\u5668\u540D\u79F0>:<\u540D\u79F0 1>=<\u503C 1>,...\n                      \u4F7F\u7528\u6240\u5217\u53C2\u6570\u503C\u901A\u8FC7\u6307\u5B9A\u7684\u8FDE\u63A5\u5668\u8FDE\u63A5\u5230\u76EE\u6807 VM\n    -dbgtrace [flags] \u8F93\u51FA\u8C03\u8BD5 {0} \u7684\u4FE1\u606F\n    -tclient          \u5728 HotSpot(TM) \u5BA2\u6237\u673A\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n    -tserver          \u5728 HotSpot(TM) \u670D\u52A1\u5668\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n\n\u8F6C\u53D1\u5230\u88AB\u8C03\u8BD5\u8FDB\u7A0B\u7684\u9009\u9879\uFF1A\n    -v -verbose[:class|gc|jni]\n                      \u542F\u7528\u8BE6\u7EC6\u6A21\u5F0F\n    -D<\u540D\u79F0>=<\u503C>  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -classpath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u5217\u51FA\u8981\u5728\u5176\u4E2D\u67E5\u627E\u7C7B\u7684\u76EE\u5F55\n    -X<\u9009\u9879>        \u975E\u6807\u51C6\u76EE\u6807 VM \u9009\u9879\n\n<\u7C7B> \u662F\u8981\u5F00\u59CB\u8C03\u8BD5\u7684\u7C7B\u7684\u540D\u79F0\n<\u53C2\u6570> \u662F\u4F20\u9012\u5230 <\u7C7B> \u7684 main() \u65B9\u6CD5\u7684\u53C2\u6570\n\n\u8981\u83B7\u5F97\u547D\u4EE4\u7684\u5E2E\u52A9\uFF0C\u8BF7\u5728 {0} \u63D0\u793A\u4E0B\u952E\u5165 ''help''"},
         // END OF MATERIAL TO LOCALIZE
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
deleted file mode 100644
index 28c0afa3894..00000000000
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (c) 2010, 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.
-#
-
-true = true
-false = false
-version_format = Java Debug Interface (Referenzimplementierung) Version {0}.{1} \n{2}
-raw.command = Raw-Befehl zum Starten der Anwendungs-VM nach dem Debuggen
-raw.command.label = Befehl
-raw.address = Adresse, von der aus nach einer Verbindung gehorcht wird, wenn der Raw-Befehl ausgef\u00FChrt wurde
-raw.address.label = Adresse
-raw.quote = Zeichen, das verwendet wird, um leerzeichengetrennten Text zu einem einzigen Befehlszeilenargument zu kombinieren
-raw.quote.label = Anf\u00FChrungszeichen
-raw.description = Startet das Ziel mit einer vom Benutzer angegebenen Befehlszeile und wird daran angeh\u00E4ngt
-sun.home = Home-Verzeichnis des SDK oder der Laufzeitumgebung, die zum Starten der Anwendung verwendet wird
-sun.home.label = Home 
-sun.options = Gestartete VM-Optionen
-sun.options.label = Optionen
-sun.main = Hauptklasse und Argumente, oder, wenn -jar eine Option ist, die Haupt-JAR-Datei und Argumente
-sun.main.label = Haupt
-sun.init_suspend = Alle Threads werden vor der Ausf\u00FChrung von "main" unterbrochen
-sun.init_suspend.label = Unterbrechen
-sun.quote = Zeichen, das verwendet wird, um leerzeichengetrennten Text zu einem einzigen Befehlszeilenargument zu kombinieren
-sun.quote.label = Anf\u00FChrungszeichen
-sun.vm_exec = Name des Java-VM-Launchers
-sun.vm_exec.label = Launcher
-sun.description = Startet das Ziel mit einer Sun Java VM-Befehlszeile und wird daran angeh\u00E4ngt
-generic_attaching.address = Adresse zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
-generic_attaching.address.label = Adresse
-generic_attaching.timeout = Timeout beim Warten auf das Anh\u00E4ngen 
-generic_attaching.timeout.label = Timeout
-generic_listening.address = Adresse f\u00FCr das Horchen nach VM-Verbindungen
-generic_listening.address.label = Adresse
-generic_listening.timeout = Timeout beim Warten auf Verbindung
-generic_listening.timeout.label = Timeout
-socket_transportservice.description = Verbindet Debugger und zu debuggendes Programm \u00FCber eine TCP-Verbindung
-memory_transportservice.description = Verbindet Debugger und zu debuggendes Programm \u00FCber eine gemeinsame Speicherverbindung
-socket_attaching.host = Rechnername zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
-socket_attaching.host.label = Host
-socket_attaching.port = Portnummer zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
-socket_attaching.port.label = Port
-socket_attaching.description = Wird \u00FCber das Socket an andere VMs angeh\u00E4ngt
-socket_listening.localaddr = Lokale Adresse, an die der Listener gebunden wird
-socket_listening.localaddr.label = Lokale Adresse
-socket_listening.port = Portnummer f\u00FCr das Horchen nach VM-Verbindungen
-socket_listening.port.label = Port
-socket_listening.description = Akzeptiert Socket-Verbindungen, die von anderen VMs initiiert werden
-memory_attaching.name = Name des gemeinsamen Speicherbereichs zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
-memory_attaching.name.label = Name
-memory_attaching.description = Wird \u00FCber gemeinsamen Speicher an andere VMs angeh\u00E4ngt
-memory_listening.name = Name des gemeinsamen Speicherbereichs f\u00FCr das Horchen nach VM-Verbindungen
-memory_listening.name.label = Name
-memory_listening.description = Akzeptiert gemeinsame Speicherverbindungen, die von anderen VMs initiiert werden
-process_attaching.description = Wird \u00FCber die Prozess-ID (pid) an das zu debuggende Programm angeh\u00E4ngt
-process_attaching.pid = pid
-process_attaching.pid.label = Prozess-ID (pid) des zu debuggenden Programms
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
deleted file mode 100644
index 4c5ae6c3814..00000000000
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-main.usage.summary=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
-
-main.usage=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nM\u00F6gliche Optionen:
-
-main.opt.help=\  -h, --help, -?                        Gibt diese Hilfemeldung aus
-
-main.opt.version=\      --version                         Versionsinformationen
-
-main.opt.module-path=\  -p, --module-path <Pfad>              Modulpfad.\n                                        Wird er nicht angegeben, wird das jmods-Verzeichnis des JDK\n                                        verwendet, falls vorhanden. Wird er angegeben,\n                                        aber enth\u00E4lt er nicht das Modul java.base,\n                                        wird das jmods-Verzeichnis des JDK hinzugef\u00FCgt,\n                                        falls vorhanden.
-
-main.opt.add-modules=\      --add-modules <Mod>[,<Mod>...]    Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen\n                                        Modulen aufgel\u00F6st werden. <Mod> kann auch ALL-MODULE-PATH sein.
-
-main.opt.limit-modules=\      --limit-modules <Mod>[,<Mod>...]  Begrenzt den Bereich der beobachtbaren\n                                        Module
-
-main.opt.output=\      --output <Pfad>                   Ort des Ausgabepfads
-
-main.opt.launcher=\      --launcher <Name>=<Modul>[/<Hauptklasse>]\n                                        F\u00FCgt einen Launcher-Befehl mit dem angegebenen\n                                        Namen f\u00FCr das Modul und die Hauptklasse hinzu,\n                                        falls angegeben  
-
-main.opt.bind-services=\      --bind-services                   Bindet Serviceprovidermodule und ihre\n                                        Abh\u00E4ngigkeiten ein
-
-main.opt.suggest-providers=\      --suggest-providers [<Name>,...]  Schl\u00E4gt Provider vor, welche die angegebenen\n                                        Servicetypen aus dem Modulpfad implementieren
-
-main.command.files=\      @<Dateiname>                       Liest Optionen aus der Datei
-
-main.opt.endian=\      --endian <little|big>             Bytereihenfolge des generierten jimage\n                                        (Standard: nativ)
-
-main.opt.save-opts=\      --save-opts <Dateiname>            Speichert jlink-Optionen in der angegebenen Datei
-
-main.opt.ignore-signing-information=\      --ignore-signing-information      Unterdr\u00FCckt einen schwerwiegenden Fehler, wenn signierte\n                                        modulare JAR-Dateien in das Image eingebunden werden.\n                                        Die signaturbezogenen Dateien der signierten\n                                        modularen JAR-Dateien werden nicht in das\n                                        Laufzeitimage kopiert.
-
-main.opt.verbose=\  -v, --verbose                         Aktiviert Verbose-Tracing
-
-main.msg.bug=Eine Ausnahme ist in jlink aufgetreten. Melden Sie in der Java-Bugdatenbank (http://bugreport.java.com/bugreport/) einen Bug, nachdem Sie die Bugdatenbank auf Duplikate gepr\u00FCft haben. Geben Sie in Ihrem Bericht Ihr Programm und die folgende Diagnose an. Vielen Dank.
-
-main.extended.help=Liste der verf\u00FCgbaren Plug-ins:
-
-main.extended.help.footer=Bei Optionen, die eine <Musterliste> erfordern, ist der Wert eine kommagetrennte\nListe von Elementen, die jeweils eines der folgenden Formate verwenden:\n  <Globales Muster>\n  glob:<Globales Muster>\n  regex:<Regex-Muster>\n  @<Dateiname>, wobei der Dateiname der Name einer Datei mit zu verwendenden Mustern ist,\n              ein Muster pro Zeile\n\n
-
-error.prefix=Fehler:
-warn.prefix=Warnung:
-
-err.empty.module.path=leerer Modulpfad
-err.jlink.version.mismatch=jlink-Version {0}.{1} stimmt nicht mit Ziel-java.base-Version {2}.{3} \u00FCberein
-err.automatic.module:automatisches Modul kann nicht mit jlink verwendet werden: {0} aus {1}
-err.unknown.byte.order:unbekannte Bytereihenfolge {0}
-err.launcher.main.class.empty:Launcher-Hauptklassenname darf nicht leer sein: {0}
-err.launcher.module.name.empty:Launcher-Modulname darf nicht leer sein: {0}
-err.launcher.value.format:Launcher-Wert muss folgendes Format haben: <Befehl>=<Modul>[/<Hauptklasse>]: {0}
-err.output.must.be.specified:--output muss angegeben werden
-err.modulepath.must.be.specified:--module-path ist nicht angegeben, und dieses Laufzeitimage enth\u00E4lt nicht das jmods-Verzeichnis.
-err.mods.must.be.specified:keine Module zum {0} angegeben
-err.path.not.found=Pfad nicht gefunden: {0}
-err.path.not.valid=ung\u00FCltiger Pfad: {0}
-err.image.must.exist=Image {0} ist nicht vorhanden oder ist kein Verzeichnis
-err.existing.image.invalid=vorhandenes Image ist ung\u00FCltig
-err.file.not.found=Datei nicht gefunden: {0}
-err.file.error=Zugriff nicht m\u00F6glich auf Datei: {0}
-err.dir.exists={0} ist bereits vorhanden
-err.badpattern=ung\u00FCltiges Muster {0}
-err.unknown.option=unbekannte Option: {0}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
-err.internal.error=interner Fehler: {0} {1} {2}
-err.invalid.arg.for.option={0} akzeptiert nicht das Argument "{1}"
-err.option.after.class=Option muss angegeben werden vor den Klassen: {0}
-err.option.unsupported={0} nicht unterst\u00FCtzt: {1}
-err.orphan.arguments=ung\u00FCltiges Argument: {0}
-err.config.defaults=Eigenschaft {0} fehlt in der Konfiguration
-err.config.defaults.value=falscher Wert in Standardeigenschaft: {0}
-err.bom.generation=Generierung der BOM-Datei nicht erfolgreich: {0}
-err.not.a.module.directory=Unter Verzeichnis {0} ist keine Datei module-info.class vorhanden
-err.cannot.read.module.info=Moduldeskriptor kann nicht gelesen werden aus {0}
-err.not.modular.format=ausgew\u00E4hltes Modul {0} ({1}) hat nicht das jmod- oder modulare JAR-Format
-err.signing=signierte modulare JAR-Datei {0} wird gegenw\u00E4rtig nicht unterst\u00FCtzt, verwenden Sie --ignore-signing-information, um den Fehler zu unterdr\u00FCcken
-warn.signing=WARNUNG: Signierte modulare JAR-Datei {0} wird gegenw\u00E4rtig nicht unterst\u00FCtzt
-warn.invalid.arg=ung\u00FCltiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
-warn.split.package=Package {0}, definiert in {1} {2}
-warn.provider.notfound=Kein Provider f\u00FCr Service angegeben f\u00FCr --suggest-providers: {0}
-no.suggested.providers=Option --bind-services ist angegeben. Keine weiteren Provider vorgeschlagen.
-suggested.providers.header=Vorgeschlagene Provider
-providers.header=Provider
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
deleted file mode 100644
index c2414078270..00000000000
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-add-options.argument=<Optionen>
-
-add-options.description=Stellt die angegebene <Optionen>-Zeichenfolge, die Leerzeichen enthalten\nkann, anderen Optionen voran, wenn die virtuelle Maschine im\nresultierenden Image aufgerufen wird.
-
-add-options.usage=\  --add-options <Optionen>   Stellt die angegebene <Optionen>-Zeichenfolge,\n                            die Leerzeichen enthalten kann, anderen Optionen voran, wenn\n                            die virtuelle Maschine im resultierenden Image aufgerufen wird.
-
-release-info.argument=<Datei>|add:<Schl\u00FCssel1>=<Wert1>:<Schl\u00FCssel2>=<Wert2>:...|del:<Schl\u00FCsselliste>
-
-release-info.description=<Datei>-Option l\u00E4dt Releaseeigenschaften aus der angegebenen Datei.\nadd: f\u00FCgt der Datei "release" Eigenschaften hinzu.\nEine beliebige Anzahl von <Schl\u00FCssel>=<Wert>-Paaren kann \u00FCbergeben werden.\ndel: l\u00F6scht die Liste der Schl\u00FCssel in der Releasedatei.
-
-release-info.usage=\  --release-info <Datei>|add:<Schl\u00FCssel1>=<Wert1>:<Schl\u00FCssel2>=<Wert2>:...|del:<Schl\u00FCsselliste>\n                            Option <Datei> l\u00F6scht Releaseeigenschaften aus\n                            der angegebenen Datei.\n                            add: f\u00FCgt Eigenschaften der Datei "release" hinzu.\n                            Eine beliebige Anzahl <Schl\u00FCssel>=<Wert>-Paare kann \u00FCbergeben werden.\n                            del: l\u00F6scht die Liste der Schl\u00FCssel in der Releasedatei.
-
-class-for-name.argument=
-
-class-for-name.description=Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorg\u00E4nge.
-
-class-for-name.usage=\  --class-for-name          Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorg\u00E4nge.
-
-compress.argument=<0|1|2>[:filter=<Musterliste>]
-
-compress.description=Komprimiert alle Ressourcen im Ausgabeimage.\nEbene 0: Keine Komprimierung\nEbene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\nEbene 2: ZIP.\nEin optionaler <Musterliste>-Filter kann angegeben werden, um das Muster der\neinzuschlie\u00DFenden Dateien aufzulisten.
-
-compress.usage=\  --compress <0|1|2>[:filter=<Musterliste>]\n                            Komprimiert alle Ressourcen im Ausgabeimage.\n                            Ebene 0: Keine Komprimierung\n                            Ebene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                            Ebene 2: ZIP.\n                            Ein optionaler <Musterliste>-Filter kann angegeben\n                            werden, um das Muster der einzuschlie\u00DFenden\n                            Dateien aufzulisten.
-
-compact-cp.argument=<Ressourcenpfade>
-
-compact-cp.description=Gemeinsame Verwendung von Zeichenfolgen im Konstantenpool.\nStandardm\u00E4\u00DFig werden alle Ressourcen komprimiert. Sie k\u00F6nnen ausdr\u00FCcken, dass\nein Ressourcenset komprimiert oder nicht komprimiert werden soll (mit ^ f\u00FCr Negierung).
-
-compact-cp.usage=\ --compact-cp <Ressourcenpfade>\n                            Gemeinsame Verwendung von Zeichenfolgen im Konstantenpool.\n                            Standardm\u00E4\u00DFig werden alle Ressourcen komprimiert.\n                            Sie k\u00F6nnen ausdr\u00FCcken, dass ein Ressourcenset komprimiert\n                            oder nicht komprimiert werden soll (mit ^ f\u00FCr Negierung).
-
-dedup-legal-notices.argument=[error-if-not-same-content]
-
-dedup-legal-notices.description=Dedupliziert alle rechtlichen Hinweise. Wenn error-if-not-same-content\nangegeben wird, tritt ein Fehler auf, wenn zwei Dateien mit dem gleichen\nDateinamen unterschiedlich sind.
-
-dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            Dedupliziert alle rechtlichen Hinweise.\n                            Wenn error-if-not-same-content angegeben wird,\n                            tritt ein Fehler auf, wenn zwei Dateien mit dem gleichen\n                            Dateinamen unterschiedlich sind.
-
-exclude-files.argument=<Musterliste> der auszuschlie\u00DFenden Dateien
-
-exclude-files.description=Gibt die auszuschlie\u00DFenden Dateien an. Beispiel: **.java,glob:/java.base/lib/client/**
-
-exclude-files.usage=\  --exclude-files <Musterliste>\n                            Gibt die auszuschlie\u00DFenden Dateien an.\n                            Beispiel: **.java,glob:/java.base/lib/client/**
-
-exclude-resources.argument=<Musterliste> f\u00FCr auszuschlie\u00DFende Ressourcen
-
-exclude-resources.description=Gibt die auszuschlie\u00DFenden Ressourcen an. Beispiel: **.jcov,glob:**/META-INF/**
-
-exclude-resources.usage=\  --exclude-resources <Musterliste>\n                            Gibt die auszuschlie\u00DFenden Ressourcen an.\n                            Beispiel: **.jcov,glob:**/META-INF/**
-
-exclude-jmod-section.argument=<Abschnittname>\nwobei <Abschnittname> "man" oder "headers" lautet.
-
-exclude-jmod-section.description=Gibt einen auszuschlie\u00DFenden JMOD-Abschnitt an
-
-exclude-jmod-section.usage=\  --exclude-jmod-section <Abschnittname>\n                            Gibt einen auszuschlie\u00DFenden JMOD-Abschnitt an.\n                            Dabei lautet <Abschnittname> "man" oder "headers".
-
-
-generate-cds-archive.description=CDS-Plug-in: Generiert CDS-Archive, wenn das Laufzeitimage das CDS-Feature unterst\u00FCtzt.\n
-generate-cds-archive.usage=\  --generate-cds-archive    Generiert ein CDS-Archiv, wenn das Laufzeitimage das\n                            CDS-Feature unterst\u00FCtzt.
-
-generate-jli-classes.argument=@filename
-
-generate-jli-classes.description=Gibt eine Datei an, die java.lang.invoke-Klassen f\u00FCr die Vorabgenerierung auflistet. \nStandardm\u00E4\u00DFig kann dieses Plug-in eine integrierte Liste vorab zu generierender Klassen sein. \nWenn dieses Plug-in in einer anderen Laufzeitversion als das erstellte Image ausgef\u00FChrt wird, \nwird die Codegenerierung standardm\u00E4\u00DFig deaktiviert, damit die Richtigkeit gew\u00E4hrleistet \nist - kann durch Hinzuf\u00FCgen von ignore-version=true au\u00DFer Kraft gesetzt werden.
-
-generate-jli-classes.usage=\  --generate-jli-classes @filename\n                           Gibt eine Datei an, welche die java.lang.invoke-Klassen f\u00FCr die\n                           Vorabgenerierung auflistet. Standardm\u00E4\u00DFig kann dieses\n                           Plug-in eine integrierte Liste vorab zu generierender Klassen sein.\n                           Wenn dieses Plug-in in einer anderen Laufzeitversion als das\n                           erstellte Image ausgef\u00FChrt wird, wird die Codegenerierung standardm\u00E4\u00DFig\n                          deaktiviert, damit die Richtigkeit gew\u00E4hrleistet ist - kann durch\n                           Hinzuf\u00FCgen von ignore-version=true au\u00DFer Kraft gesetzt werden.
-
-system-modules.argument=retainModuleTarget
-
-system-modules.description=Schnelles Laden der Moduldeskriptoren (immer aktiviert)
-
-system-modules.usage=\  --system-modules retainModuleTarget\n                            Schnelles Laden der Moduldeskriptoren (immer aktiviert)
-
-onoff.argument=<on|off>
-
-order-resources.argument=<Musterliste> der Pfade in der Reihenfolge ihrer Priorit\u00E4t. Wenn eine @file\nangegeben wird, muss jede Zeile genau \u00FCbereinstimmen, damit die Pfadsortierung m\u00F6glich ist
-
-order-resources.description=Sortiert Ressourcen. Beispiel: **/module-info.class,@classlist,/java.base/java/lang/**
-
-order-resources.usage=\  --order-resources <Musterliste>\n                            Sortiert Ressourcen. \n                            Beispiel: **/module-info.class,@classlist,\n                            /java.base/java/lang/**
-
-strip-debug.description=Entfernt Debuginformationen aus dem Ausgabeimage
-
-strip-debug.usage=\  --strip-debug             Entfernt Debuginformationen aus dem Ausgabeimage
-
-strip-java-debug-attributes.description=Entfernt Java-Debugattribute aus Klassen im Ausgabeimage
-
-strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            Entfernt Java-Debugattribute aus\n                            Klassen im Ausgabeimage
-
-strip-native-commands.description=Schlie\u00DFt native Befehle (wie java/java.exe) aus dem Image aus
-
-strip-native-commands.usage=\  --strip-native-commands   Schlie\u00DFt native Befehle (wie java/java.exe)\n                            aus dem Image aus.
-
-vendor-version.argument=<Herstellerversion>
-
-vendor-version.description=\u00DCberschreibt die Zeichenfolge f\u00FCr die Herstellerversion, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.version" lautet dann <Herstellerversion>.
-
-vendor-version.usage=\  --vendor-version <Herstellerversion>\n                            \u00DCberschreibt die Zeichenfolge f\u00FCr die Herstellerversion, die im\n                            Build enthalten ist, falls zutreffend. Der Wert der Systemeigenschaft\n                            "java.vendor.version" lautet dann <Herstellerversion>.
-
-vendor-bug-url.argument=<Bug-URL Hersteller>
-
-vendor-bug-url.description=\u00DCberschreibt die Bug-URL des Herstellers, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
-
-vendor-bug-url.usage=\  --vendor-bug-url <Bug-URL Hersteller>\n                            \u00DCberschreibt die Bug-URL des Herstellers, die im Build enthalten ist.\n                            Der Wert der Systemeigenschaft\n                            "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
-
-vendor-vm-bug-url.argument=<Hersteller-VM-Bug-URL>
-
-vendor-vm-bug-url.description=\u00DCberschreibt die VM-Bug-URL, die im Build enthalten ist. Die in\nVM-Fehlerlogs angezeigte URL lautet dann <Hersteller-VM-Bug-URL>.
-
-vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u00DCberschreibt die VM-Bug-URL, die im Build \n                            enthalten ist. Die in VM-Fehlerlogs angezeigte \n                            URL lautet dann <Hersteller-VM-Bug-URL>.
-
-vm.argument=<client|server|minimal|all>
-
-vm.description=W\u00E4hlt die HotSpot-VM im Ausgabeimage aus. Standardm\u00E4\u00DFig werden alle ausgew\u00E4hlt
-
-vm.usage=\  --vm <client|server|minimal|all>\n                            W\u00E4hlt die HotSpot-VM im Ausgabeimage aus.\n                            Standardm\u00E4\u00DFig werden alle ausgew\u00E4hlt
-
-zip.argument=[kommagetrennte Liste von Ressourcenpfaden]
-
-zip.description=ZIP-Komprimierung
-
-zip.usage=\  --zip [kommagetrennte Liste von Ressourcenpfaden]\n                            ZIP-Komprimierung
-
-include-locales.argument=<Sprachtag>[,<Sprachtag>]*
-
-include-locales.description=BCP 47-Sprachtags, durch Komma getrennt, die eine Gebietsschemazuordnung erlauben,\nwie in RFC 4647 definiert. Beispiel: en,ja,*-IN
-
-include-locales.usage=\  --include-locales <Sprachtag>[,<Sprachtag>]*\n                            BCP 47-Sprachtags durch Komma getrennt,\n                            die eine Gebietsschemazuordnung erlauben,\n                            wie in RFC 4647 definiert.\n                            Beispiel: en,ja,*-IN
-
-include-locales.missingpackages=fehlende Gebietsschema-Datenpackages in jdk.localedata:\n\t
-
-include-locales.nomatchinglocales=Keine \u00FCbereinstimmenden Gebietsschemas gefunden f\u00FCr "%s". Pr\u00FCfen Sie das angegebene Muster.
-
-include-locales.invalidtag=Ung\u00FCltiges Sprachtag: %s
-
-include-locales.localedatanotfound=Modul jdk.localedata wurde mit der Option --add-modules nicht angegeben
-
-main.status.ok=Funktional.
-
-main.status.not.ok= Nicht funktional.
-
-plugin.plugins.header=Liste der verf\u00FCgbaren Plug-in-Optionen:
-
-plugin.opt.list-plugins=\      --list-plugins                    Listet die verf\u00FCgbaren Plug-ins auf
-
-plugin.opt.post-process-path=\      --post-process-path <Imagedatei>   F\u00FChrt Nachverarbeitung eines vorhandenen Images aus
-
-plugin.opt.resources-last-sorter=\      --resources-last-sorter <Name>    Das letzte Plug-in, das Ressourcen\n                                        sortieren darf
-
-plugin.opt.disable-plugin=\      --disable-plugin <Plug-in-Name>     Deaktiviert das angegebene Plug-in
-
-plugin.opt.compress=\  -c, --compress=<0|1|2>                Aktiviert die Komprimierung von Ressourcen:\n                                          Ebene 0: Keine Komprimierung\n                                          Ebene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                                          Ebene 2: ZIP
-
-plugin.opt.strip-debug=\  -G, --strip-debug                     Entfernt Debuginformationen
-
-plugin.opt.no-man-pages=\      --no-man-pages                    Schlie\u00DFt Manpages aus
-
-plugin.opt.no-header-files=\      --no-header-files                 Schlie\u00DFt Headerdateien aus
-
-main.plugin.name=Plug-in-Name
-
-main.plugin.class=Plug-in-Klasse
-
-main.plugin.module=Plug-in-Modul
-
-main.plugin.category=Kategorie
-
-main.plugin.description=Beschreibung
-
-main.plugin.post.processors=Imagepostprozessoren:
-
-main.plugin.argument=Argument
-
-main.plugin.range.from=Bereich von
-
-main.plugin.range.to=bis
-
-main.plugin.option=Option
-
-main.plugin.no.value=<leer>
-
-main.plugin.state=Funktionsstatus
-
-err.no.such.plugin=Plug-in nicht vorhanden: {0}
-
-err.provider.not.functional=Der Provider {0} ist nicht funktionsf\u00E4hig.
-
-err.plugin.mutiple.options=Mehrere Plug-ins aktiviert von Option {0}
-err.plugin.conflicts={0} ({1}) steht im Konflikt mit {2}. Verwenden Sie nur eine der Optionen, nicht beide.
-err.provider.additional.arg.error=Fehler bei der Angabe eines zus\u00E4tzlichen Arguments in der {0}-Option: {1}
-
-err.no.plugins.path=Kein Argument f\u00FCr Plug-in-Pfad.
-
-err.dir.already.exits=Verzeichnis ist bereits vorhanden: {0}
-
-err.invalid.index=ung\u00FCltiger Index f\u00FCr Option {0}
-
-err.plugin.option.not.set=Option {0} muss festgelegt werden
-
-warn.thirdparty.plugins=Das Aktivieren von Plug-ins anderer Hersteller kann dazu f\u00FChren, dass ein nicht verwendbares Image generiert wird.
-
-warn.thirdparty.plugins.enabled=Sie haben Plug-ins anderer Hersteller aktiviert.
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
deleted file mode 100644
index 4b290ad2eb2..00000000000
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-add-options.argument=<options>
-
-add-options.description=\u6307\u5B9A\u3057\u305F<options>\u6587\u5B57\u5217\u3092\u5148\u982D\u306B\u4ED8\u52A0\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\n\u751F\u6210\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8D77\u52D5\u3059\u308B\u969B\u306B\u3001\n\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u524D\u306B\u7A7A\u767D\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
-
-add-options.usage=\  --add-options <options>   \u6307\u5B9A\u3057\u305F<options>\u6587\u5B57\u5217\u3092\u5148\u982D\u306B\u4ED8\u52A0\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\n                            \u751F\u6210\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8D77\u52D5\u3059\u308B\u969B\u306B\u3001\n                            \u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u524D\u306B\u7A7A\u767D\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
-
-release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
-
-release-info.description=<file>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EA\u30EA\u30FC\u30B9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\nadd:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n\u4EFB\u610F\u306E\u6570\u306E<key>=<value>\u306E\u30DA\u30A2\u3092\u6E21\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\ndel:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AD\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002
-
-release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EA\u30EA\u30FC\u30B9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\n                            \u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n                            add:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n                            \u4EFB\u610F\u306E\u6570\u306E<key>=<value>\u30DA\u30A2\u3092\u6E21\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n                            del:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AD\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002
-
-class-for-name.argument=
-
-class-for-name.description=\u30AF\u30E9\u30B9\u306E\u6700\u9069\u5316: Class.forName\u547C\u51FA\u3057\u3092\u5B9A\u6570\u306E\u30ED\u30FC\u30C9\u306B\u5909\u63DB\u3057\u307E\u3059\u3002
-
-class-for-name.usage=\  --class-for-name          \u30AF\u30E9\u30B9\u306E\u6700\u9069\u5316: Class.forName\u547C\u51FA\u3057\u3092\u5B9A\u6570\u306E\u30ED\u30FC\u30C9\u306B\u5909\u63DB\u3057\u307E\u3059\u3002
-
-compress.argument=<0|1|2>[:filter=<pattern-list>]
-
-compress.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n\u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n\u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n\u30EC\u30D9\u30EB2: ZIP\u3002\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306E<pattern-list>\u30D5\u30A3\u30EB\u30BF\u3092\u6307\u5B9A\u3057\u3066\u3001\u542B\u3081\u308B\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30BF\u30FC\u30F3\u3092\n\u30EA\u30B9\u30C8\u3067\u304D\u307E\u3059\u3002
-
-compress.usage=\  --compress <0|1|2>[:filter=<pattern-list>]\n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n                            \u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n                            \u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n                            \u30EC\u30D9\u30EB2: ZIP\u3002\n                            \u30AA\u30D7\u30B7\u30E7\u30F3\u306E<pattern-list>\u30D5\u30A3\u30EB\u30BF\u3092\n                            \u6307\u5B9A\u3057\u3066\u3001\u542B\u3081\u308B\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30BF\u30FC\u30F3\u3092\n                            \u30EA\u30B9\u30C8\u3067\u304D\u307E\u3059\u3002
-
-compact-cp.argument=<resource paths>
-
-compact-cp.description=\u5B9A\u6570\u30D7\u30FC\u30EB\u6587\u5B57\u5217\u3092\u5171\u6709\u3057\u307E\u3059\u3002\n\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\u30EA\u30BD\u30FC\u30B9\u306E\u30BB\u30C3\u30C8\u3092\n\u5727\u7E2E\u3059\u308B\u304B\u3057\u306A\u3044\u304B\u3092\u8868\u3057\u307E\u3059(\u5426\u5B9A\u306E\u5834\u5408\u306F^\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002
-
-compact-cp.usage=\ --compact-cp <resource paths>\n                             \u5B9A\u6570\u30D7\u30FC\u30EB\u6587\u5B57\u5217\u3092\u5171\u6709\u3057\u307E\u3059\u3002\n                             \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n                             \u30EA\u30BD\u30FC\u30B9\u306E\u30BB\u30C3\u30C8\u3092\u5727\u7E2E\u3059\u308B\u304B\u3057\u306A\u3044\u304B\n                             \u3092\u8868\u3057\u307E\u3059(\u5426\u5B9A\u306E\u5834\u5408\u306F^\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002
-
-dedup-legal-notices.argument=[error-if-not-same-content]
-
-dedup-legal-notices.description=\u3059\u3079\u3066\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u91CD\u8907\u3092\u9664\u5916\u3057\u307E\u3059\u3002\nerror-if-not-same-content\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u540D\u306E2\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304C\n\u7570\u306A\u3063\u3066\u3044\u308B\u3068\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
-
-dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            \u3059\u3079\u3066\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u91CD\u8907\u3092\u9664\u5916\u3057\u307E\u3059\u3002\n                            error-if-not-same-content\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\n                            \u540C\u3058\u30D5\u30A1\u30A4\u30EB\u540D\u306E2\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u7570\u306A\u3063\u3066\u3044\u308B\u3068\n                            \u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
-
-exclude-files.argument=\u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u306E<pattern-list> 
-
-exclude-files.description=\u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B: **.java,glob:/java.base/lib/client/**
-
-exclude-files.usage=\  --exclude-files <pattern-list>\n                            \u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u4F8B: **.java,glob:/java.base/lib/client/**
-
-exclude-resources.argument=\u9664\u5916\u3059\u308B<pattern-list>\u306E\u30EA\u30BD\u30FC\u30B9
-
-exclude-resources.description=\u9664\u5916\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B: **.jcov,glob:**/META-INF/**
-
-exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            \u9664\u5916\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u4F8B: **.jcov,glob:**/META-INF/**
-
-exclude-jmod-section.argument=<section-name>\n\u3053\u3053\u3067\u3001<section-name>\u306F"man"\u307E\u305F\u306F"headers"\u3067\u3059\u3002
-
-exclude-jmod-section.description=\u9664\u5916\u3059\u308BJMOD\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
-
-exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            \u9664\u5916\u3059\u308BJMOD\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u3053\u3053\u3067\u3001<section-name> \u306F"man"\u307E\u305F\u306F"headers"\u3067\u3059\u3002
-
-
-generate-cds-archive.description=CDS\u30D7\u30E9\u30B0\u30A4\u30F3: \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3067CDS\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001cds\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n
-generate-cds-archive.usage=\  --generate-cds-archive    \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3067CDS\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001\n                            cds\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u751F\u6210\u3057\u307E\u3059\u3002
-
-generate-jli-classes.argument=@filename
-
-generate-jli-classes.description=\u4E8B\u524D\u751F\u6210\u3059\u308Bjava.lang.invoke\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002 \n\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u4E8B\u524D\u751F\u6210\u3059\u308B\u30AF\u30E9\u30B9\u306E\u7D44\u8FBC\u307F\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 \n\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u3001\u4F5C\u6210\u3055\u308C\u308B\u30A4\u30E1\u30FC\u30B8\u3068\u7570\u306A\u308B\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u3001\n\u30B3\u30FC\u30C9\u306E\u751F\u6210\u306F\u6B63\u78BA\u6027\u3092\u4FDD\u8A3C\u3059\u308B\u305F\u3081\u306B\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n\u3053\u308C\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306Fignore-version=true\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002
-
-generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            \u4E8B\u524D\u751F\u6210\u3059\u308Bjava.lang.invoke\u30AF\u30E9\u30B9\u3092\n                            \u30EA\u30B9\u30C8\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\n                            \u4E8B\u524D\u751F\u6210\u3059\u308B\u30AF\u30E9\u30B9\u306E\u7D44\u8FBC\u307F\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n                            \u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u3001\u4F5C\u6210\u3055\u308C\u308B\u30A4\u30E1\u30FC\u30B8\u3068\u7570\u306A\u308B\n                            \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u3001\u30B3\u30FC\u30C9\u306E\u751F\u6210\u306F\u6B63\u78BA\u6027\u3092\u4FDD\u8A3C\u3059\u308B\u305F\u3081\u306B\u3001\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n                            \u3053\u308C\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306Fignore-version=true\n                            \u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002
-
-system-modules.argument=retainModuleTarget
-
-system-modules.description=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306E\u9AD8\u901F\u30ED\u30FC\u30C9(\u5E38\u306B\u6709\u52B9)
-
-system-modules.usage=\  --system-modules retainModuleTarget\n                            \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306E\u9AD8\u901F\u30ED\u30FC\u30C9(\u5E38\u306B\u6709\u52B9)
-
-onoff.argument=<on|off>
-
-order-resources.argument=\u512A\u5148\u5EA6\u9806\u306E\u30D1\u30B9\u306E<pattern-list>\u3002@file\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\n\u5404\u884C\u306F\u3001\u30D1\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u308B\u305F\u3081\u306B\u5B8C\u5168\u306B\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-
-order-resources.description=\u30EA\u30BD\u30FC\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u307E\u3059\u3002\u4F8B: **/module-info.class,@classlist,/java.base/java/lang/**
-
-order-resources.usage=\  --order-resources <pattern-list>\n                            \u30EA\u30BD\u30FC\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u307E\u3059\u3002 \n                            \u4F8B: **/module-info.class,@classlist,\n                            /java.base/java/lang/**
-
-strip-debug.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
-
-strip-debug.usage=\  --strip-debug             \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
-
-strip-java-debug-attributes.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304B\u3089Java\u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059
-
-strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304B\u3089Java\n                            \u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059
-
-strip-native-commands.description=\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9(java/java.exe\u306A\u3069)\u3092\u9664\u5916\u3057\u307E\u3059
-
-strip-native-commands.usage=\  --strip-native-commands   \u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9(java/java.exe\u306A\u3069)\n                            \u3092\u9664\u5916\u3057\u307E\u3059\u3002
-
-vendor-version.argument=<vendor-version>
-
-vendor-version.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217(\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408)\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3"java.vendor.version"\u306E\u5024\u306F<vendor-version>\u306B\u306A\u308A\u307E\u3059\u3002
-
-vendor-version.usage=\  --vendor-version <vendor-version>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217(\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408)\u3092\n                            \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\n                            "java.vendor.version"\u306E\u5024\u306F<vendor-version>\u306B\u306A\u308A\u307E\u3059\u3002
-
-vendor-bug-url.argument=<vendor-bug-url>
-
-vendor-bug-url.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3"java.vendor.url.bug"\u306E\u5024\u306F<vendor-url-bug>\u306B\u306A\u308A\u307E\u3059\u3002
-
-vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n                            \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\n                            "java.vendor.url.bug"\u306E\u5024\u306F<vendor-url-bug>\u306B\u306A\u308A\u307E\u3059\u3002
-
-vendor-vm-bug-url.argument=<vendor-vm-bug-url>
-
-vendor-vm-bug-url.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FCVM\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\nVM\u30A8\u30E9\u30FC\u30FB\u30ED\u30B0\u306B\u8868\u793A\u3055\u308C\u308BURL\u306F<vendor-vm-bug-url>\u306B\u306A\u308A\u307E\u3059\u3002
-
-vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FCVM\u30D0\u30B0URL\u3092\n                            \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002VM\u30A8\u30E9\u30FC\u30FB\u30ED\u30B0\u306B\n                           \u8868\u793A\u3055\u308C\u305FURL\u306F<vendor-vm-bug-url>\u306B\u306A\u308A\u307E\u3059\u3002
-
-vm.argument=<client|server|minimal|all>
-
-vm.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067HotSpot VM\u3092\u9078\u629E\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306Fall\u3067\u3059
-
-vm.usage=\  --vm <client|server|minimal|all>\n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067HotSpot VM\u3092\u9078\u629E\u3057\u307E\u3059\u3002\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u306Fall\u3067\u3059
-
-zip.argument=[\u30EA\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8]
-
-zip.description=ZIP\u5727\u7E2E
-
-zip.usage=\  --zip [\u30EA\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8]\n                            ZIP\u5727\u7E2E
-
-include-locales.argument=<langtag>[,<langtag>]*
-
-include-locales.description=BCP 47\u8A00\u8A9E\u30BF\u30B0\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001RFC 4647\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\n\u30ED\u30B1\u30FC\u30EB\u306E\u4E00\u81F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4F8B: en,ja,*-IN
-
-include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            BCP 47\u8A00\u8A9E\u30BF\u30B0\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001RFC 4647\u3067\n                            \u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\n                            \u30ED\u30B1\u30FC\u30EB\u306E\u4E00\u81F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n                            \u4F8B: en,ja,*-IN
-
-include-locales.missingpackages=jdk.localedata\u306B\u30ED\u30B1\u30FC\u30EB\u30FB\u30C7\u30FC\u30BF\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u3042\u308A\u307E\u305B\u3093:\n\t
-
-include-locales.nomatchinglocales="%s"\u306B\u4E00\u81F4\u3059\u308B\u30ED\u30B1\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6307\u5B9A\u3057\u305F\u30D1\u30BF\u30FC\u30F3\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-include-locales.invalidtag=\u8A00\u8A9E\u30BF\u30B0\u304C\u7121\u52B9\u3067\u3059: %s
-
-include-locales.localedatanotfound=jdk.localedata\u30E2\u30B8\u30E5\u30FC\u30EB\u306F--add-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-
-main.status.ok=\u52D5\u4F5C\u3057\u3066\u3044\u307E\u3059\u3002
-
-main.status.not.ok= \u52D5\u4F5C\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-
-plugin.plugins.header=\u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8:
-
-plugin.opt.list-plugins=\      --list-plugins                    \u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
-
-plugin.opt.post-process-path=\      --post-process-path <imagefile>   \u65E2\u5B58\u306E\u30A4\u30E1\u30FC\u30B8\u306E\u5F8C\u51E6\u7406\u3092\u884C\u3044\u307E\u3059
-
-plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    \u6700\u5F8C\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u30EA\u30BD\u30FC\u30B9\u306E\u30BD\u30FC\u30C8\u3092\n                                        \u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059
-
-plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     \u6307\u5B9A\u3057\u305F\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
-
-plugin.opt.compress=\  -c, --compress=<0|1|2>                \u30EA\u30BD\u30FC\u30B9\u306E\u5727\u7E2E\u3092\u6709\u52B9\u306B\u3057\u307E\u3059:\n                                          \u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n                                          \u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n                                          \u30EC\u30D9\u30EB2: ZIP
-
-plugin.opt.strip-debug=\  -G, --strip-debug                     \u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
-
-plugin.opt.no-man-pages=\      --no-man-pages                    man\u30DA\u30FC\u30B8\u3092\u9664\u5916\u3057\u307E\u3059
-
-plugin.opt.no-header-files=\      --no-header-files                 \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u30FB\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u9664\u5916\u3057\u307E\u3059
-
-main.plugin.name=\u30D7\u30E9\u30B0\u30A4\u30F3\u540D
-
-main.plugin.class=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9
-
-main.plugin.module=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB
-
-main.plugin.category=\u30AB\u30C6\u30B4\u30EA
-
-main.plugin.description=\u8AAC\u660E
-
-main.plugin.post.processors=\u30A4\u30E1\u30FC\u30B8\u30FB\u30DD\u30B9\u30C8\u30FB\u30D7\u30ED\u30BB\u30C3\u30B5:
-
-main.plugin.argument=\u5F15\u6570
-
-main.plugin.range.from=\u7BC4\u56F2: \u81EA
-
-main.plugin.range.to=\u81F3
-
-main.plugin.option=\u30AA\u30D7\u30B7\u30E7\u30F3
-
-main.plugin.no.value=<empty>
-
-main.plugin.state=\u6A5F\u80FD\u72B6\u614B
-
-err.no.such.plugin=\u3053\u306E\u3088\u3046\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u3042\u308A\u307E\u305B\u3093: {0}
-
-err.provider.not.functional=\u30D7\u30ED\u30D0\u30A4\u30C0{0}\u306F\u6A5F\u80FD\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-
-err.plugin.mutiple.options=\u8907\u6570\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C{0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3088\u3063\u3066\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059
-err.plugin.conflicts={0} ({1})\u304C{2}\u3068\u77DB\u76FE\u3057\u3066\u3044\u307E\u3059\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3057\u3001\u4E21\u65B9\u3092\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-err.provider.additional.arg.error={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8FFD\u52A0\u306E\u5F15\u6570\u6307\u5B9A\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059: {1}
-
-err.no.plugins.path=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30D1\u30B9\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-
-err.dir.already.exits=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059: {0}
-
-err.invalid.index=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306E\u7D22\u5F15\u304C\u7121\u52B9\u3067\u3059
-
-err.plugin.option.not.set=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-
-warn.thirdparty.plugins=\u30B5\u30FC\u30C9\u30FB\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\u3068\u3001\u4F7F\u7528\u3067\u304D\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u304C\u751F\u6210\u3055\u308C\u307E\u3059\u3002
-
-warn.thirdparty.plugins.enabled=\u30B5\u30FC\u30C9\u30FB\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3057\u305F\u3002
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
deleted file mode 100644
index 9d92ffae362..00000000000
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-add-options.argument=<options>
-
-add-options.description=\u5728\u751F\u6210\u7684\u6620\u50CF\u4E2D\u8C03\u7528\u865A\u62DF\u673A\u65F6\uFF0C\u5728\u4EFB\u4F55\n\u5176\u4ED6\u9009\u9879\u4E4B\u524D\u6DFB\u52A0\u6307\u5B9A\u7684 <options> \u5B57\u7B26\u4E32\n\uFF08\u53EF\u80FD\u5305\u542B\u7A7A\u683C\uFF09\u3002
-
-add-options.usage=\  --add-options <options>   \u5728\u751F\u6210\u7684\u6620\u50CF\u4E2D\u8C03\u7528\u865A\u62DF\u673A\u65F6\uFF0C\u5728\u4EFB\u4F55\u5176\u4ED6\n                            \u9009\u9879\u4E4B\u524D\u6DFB\u52A0\u6307\u5B9A\u7684 <options> \u5B57\u7B26\u4E32\n                            \uFF08\u53EF\u80FD\u5305\u542B\u7A7A\u683C\uFF09\u3002
-
-release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
-
-release-info.description=<file> \u9009\u9879\uFF1A\u4ECE\u63D0\u4F9B\u7684\u6587\u4EF6\u52A0\u8F7D release \u5C5E\u6027\u3002\nadd\uFF1A\u5411 'release' \u6587\u4EF6\u4E2D\u6DFB\u52A0\u5C5E\u6027\u3002\n\u53EF\u4EE5\u4F20\u9012\u4EFB\u610F\u6570\u91CF\u7684 <key>=<value> \u5BF9\u3002\ndel\uFF1A\u5220\u9664 release \u6587\u4EF6\u4E2D\u7684\u5173\u952E\u5B57\u5217\u8868\u3002
-
-release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file> \u9009\u9879\uFF1A\u4ECE\u63D0\u4F9B\u7684\u6587\u4EF6\n                            \u52A0\u8F7D release \u5C5E\u6027\u3002\n                            add\uFF1A\u5411 'release' \u6587\u4EF6\u4E2D\u6DFB\u52A0\u5C5E\u6027\u3002\n                            \u53EF\u4EE5\u4F20\u9012\u4EFB\u610F\u6570\u91CF\u7684 <key>=<value> \u5BF9\u3002\n                            del\uFF1A\u5220\u9664 release \u6587\u4EF6\u4E2D\u7684\u5173\u952E\u5B57\u5217\u8868\u3002
-
-class-for-name.argument=
-
-class-for-name.description=\u7C7B\u4F18\u5316\uFF1A\u5C06 Class.forName \u8C03\u7528\u8F6C\u6362\u4E3A\u5E38\u91CF\u8D1F\u8F7D\u3002
-
-class-for-name.usage=\  --class-for-name          \u7C7B\u4F18\u5316\uFF1A\u5C06 Class.forName \u8C03\u7528\u8F6C\u6362\u4E3A\u5E38\u91CF\u8D1F\u8F7D\u3002
-
-compress.argument=<0|1|2>[:filter=<pattern-list>]
-
-compress.description=\u538B\u7F29\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u6240\u6709\u8D44\u6E90\u3002\n\u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n\u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n\u7EA7\u522B 2\uFF1AZIP\u3002\n\u53EF\u4EE5\u5C06\u53EF\u9009 <pattern-list> \u7B5B\u9009\u5668\u6307\u5B9A\u4E3A\u8981\u5305\u62EC\u7684\n\u6587\u4EF6\u7684\u6A21\u5F0F\u3002
-
-compress.usage=\  --compress <0|1|2>[:filter=<pattern-list>]\n                            \u538B\u7F29\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u6240\u6709\u8D44\u6E90\u3002\n                            \u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n                            \u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n                            \u7EA7\u522B 2\uFF1AZIP\u3002\n                            \u53EF\u4EE5\u5C06\u53EF\u9009 <pattern-list> \n                            \u7B5B\u9009\u5668\u6307\u5B9A\u4E3A\u8981\u5305\u62EC\u7684\n                            \u6587\u4EF6\u7684\u6A21\u5F0F\u3002
-
-compact-cp.argument=<resource paths>
-
-compact-cp.description=\u5E38\u91CF\u6C60\u5B57\u7B26\u4E32\u5171\u4EAB\u3002\n\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u4F1A\u538B\u7F29\u6240\u6709\u8D44\u6E90\u3002\u60A8\u53EF\u4EE5\u8868\u793A\u8981\u538B\u7F29\u6216\n\u4E0D\u538B\u7F29\u7684\u8D44\u6E90\u96C6\uFF08\u4F7F\u7528 ^ \u8868\u793A\u5426\u5B9A\uFF09\u3002
-
-compact-cp.usage=\ --compact-cp <resource paths>\n                             \u5E38\u91CF\u6C60\u5B57\u7B26\u4E32\u5171\u4EAB\u3002\n                             \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u4F1A\u538B\u7F29\u6240\u6709\u8D44\u6E90\u3002\n                             \u60A8\u53EF\u4EE5\u8868\u793A\u8981\u538B\u7F29\u6216\u4E0D\u538B\u7F29\u7684\n                             \u8D44\u6E90\u96C6\uFF08\u4F7F\u7528 ^ \u8868\u793A\u5426\u5B9A\uFF09\u3002
-
-dedup-legal-notices.argument=[error-if-not-same-content]
-
-dedup-legal-notices.description=\u5220\u9664\u6240\u6709\u6CD5\u5F8B\u58F0\u660E\u4E2D\u7684\u91CD\u590D\u6570\u636E\u3002\u5982\u679C\u6307\u5B9A\n\u4E86 error-if-not-same-content\uFF0C\u5219\u5728\u4E24\u4E2A\u540C\u540D\u7684\u6587\u4EF6\n\u4E0D\u540C\u65F6\u5C06\u51FA\u73B0\u9519\u8BEF\u3002
-
-dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            \u5220\u9664\u6240\u6709\u6CD5\u5F8B\u58F0\u660E\u4E2D\u7684\u91CD\u590D\u6570\u636E\u3002\n                            \u5982\u679C\u6307\u5B9A\u4E86 error-if-not-same-content\uFF0C\n                            \u5219\u5728\u4E24\u4E2A\u540C\u540D\u7684\u6587\u4EF6\u4E0D\u540C\u65F6\n                            \u5C06\u51FA\u73B0\u9519\u8BEF\u3002
-
-exclude-files.argument=\u8981\u6392\u9664\u7684\u6587\u4EF6\u7684 <pattern-list>
-
-exclude-files.description=\u6307\u5B9A\u8981\u6392\u9664\u7684\u6587\u4EF6\u3002\u4F8B\u5982\uFF1A**.java,glob:/java.base/lib/client/**
-
-exclude-files.usage=\  --exclude-files <pattern-list>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684\u6587\u4EF6\u3002\n                            \u4F8B\u5982\uFF1A**.java,glob:/java.base/lib/client/**
-
-exclude-resources.argument=\u8981\u6392\u9664\u7684 <pattern-list> \u8D44\u6E90
-
-exclude-resources.description=\u6307\u5B9A\u8981\u6392\u9664\u7684\u8D44\u6E90\u3002\u4F8B\u5982\uFF1A**.jcov,glob:**/META-INF/**
-
-exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684\u8D44\u6E90\u3002\n                            \u4F8B\u5982\uFF1A**.jcov,glob:**/META-INF/**
-
-exclude-jmod-section.argument=<section-name>\n\u5176\u4E2D\uFF0C<section-name> \u662F "man" \u6216 "headers"\u3002
-
-exclude-jmod-section.description=\u6307\u5B9A\u8981\u6392\u9664\u7684 JMOD \u8282
-
-exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684 JMOD \u8282\u3002\n                            \u5176\u4E2D\uFF0C<section-name> \u662F "man" \u6216 "headers"\u3002
-
-
-generate-cds-archive.description=CDS \u63D2\u4EF6\uFF1A\u5982\u679C\u8FD0\u884C\u65F6\u6620\u50CF\u652F\u6301 CDS \u529F\u80FD\uFF0C\u5219\u751F\u6210 CDS \u6863\u6848\u3002\n
-generate-cds-archive.usage=\  --generate-cds-archive    \u5982\u679C\u8FD0\u884C\u65F6\u6620\u50CF\u652F\u6301 CDS \u529F\u80FD\uFF0C\n                            \u5219\u751F\u6210 CDS \u6863\u6848\u3002
-
-generate-jli-classes.argument=@filename
-
-generate-jli-classes.description=\u6307\u5B9A\u4E00\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D\u5217\u51FA\u4E86\u8981\u9884\u5148\u751F\u6210\u7684 java.lang.invoke \u7C7B\u3002\n\u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6B64\u63D2\u4EF6\u53EF\u4EE5\u4F7F\u7528\u8981\u9884\u5148\u751F\u6210\u7684\u5185\u7F6E\u7C7B\u5217\u8868\u3002\n\u5982\u679C\u6B64\u63D2\u4EF6\u4E0E\u6B63\u5728\u521B\u5EFA\u7684\u6620\u50CF\u5728\u4E0D\u540C\u7684\u8FD0\u884C\u65F6\u7248\u672C\u4E0A\u8FD0\u884C\uFF0C\n\u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5C06\u7981\u7528\u4EE3\u7801\u751F\u6210\u4EE5\u786E\u4FDD\n\u6B63\u786E\u6027 - \u6DFB\u52A0 iignore-version=true \u53EF\u8986\u76D6\u6B64\u9879\u3002
-
-generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            \u6307\u5B9A\u4E00\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D\u5217\u51FA\u4E86\u8981\n                            \u9884\u5148\u751F\u6210\u7684 java.lang.invoke \u7C7B\u3002\n                            \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6B64\u63D2\u4EF6\u53EF\u4EE5\u4F7F\u7528\n                            \u8981\u9884\u5148\u751F\u6210\u7684\u5185\u7F6E\u7C7B\u5217\u8868\u3002\u5982\u679C\u6B64\u63D2\u4EF6\u4E0E\n                            \u6B63\u5728\u521B\u5EFA\u7684\u6620\u50CF\u5728\u4E0D\u540C\u7684\u8FD0\u884C\u65F6\u7248\u672C\u4E0A\u8FD0\u884C\uFF0C\n                            \u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5C06\u7981\u7528\u4EE3\u7801\u751F\u6210\u4EE5\u786E\u4FDD\n                            \u6B63\u786E\u6027 - \u6DFB\u52A0 iignore-version=true\n                            \u53EF\u8986\u76D6\u6B64\u9009\u9879\u3002
-
-system-modules.argument=retainModuleTarget
-
-system-modules.description=\u5FEB\u901F\u52A0\u8F7D\u6A21\u5757\u63CF\u8FF0\u7B26\uFF08\u59CB\u7EC8\u542F\u7528\uFF09
-
-system-modules.usage=\  --system-modules retainModuleTarget\n                            \u5FEB\u901F\u52A0\u8F7D\u6A21\u5757\u63CF\u8FF0\u7B26\uFF08\u59CB\u7EC8\u542F\u7528\uFF09
-
-onoff.argument=<on|off>
-
-order-resources.argument=\u4F18\u5148\u7EA7\u987A\u5E8F\u4E2D\u8DEF\u5F84\u7684 <pattern-list>\u3002\u5982\u679C\n\u6307\u5B9A\u4E86 @file\uFF0C\u5219\u6BCF\u884C\u90FD\u5E94\u662F\u8981\u6392\u5E8F\u7684\u8DEF\u5F84\u7684\u5B8C\u5168\u5339\u914D\u9879
-
-order-resources.description=\u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u3002\u4F8B\u5982\uFF1A**/module-info.class,@classlist,/java.base/java/lang/**
-
-order-resources.usage=\  --order-resources <pattern-list>\n                            \u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u3002\n                            \u4F8B\u5982\uFF1A**/module-info.class,@classlist,\n                            /java.base/java/lang/**
-
-strip-debug.description=\u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
-
-strip-debug.usage=\  --strip-debug             \u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
-
-strip-java-debug-attributes.description=\u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u7C7B\u4E2D\u53BB\u9664 Java \u8C03\u8BD5\u4FE1\u606F
-
-strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            \u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u7C7B\u4E2D\n                            \u53BB\u9664 Java \u8C03\u8BD5\u5C5E\u6027
-
-strip-native-commands.description=\u4ECE\u6620\u50CF\u4E2D\u6392\u9664\u672C\u673A\u547D\u4EE4\uFF08\u5982 java/java.exe\uFF09
-
-strip-native-commands.usage=\  --strip-native-commands   \u4ECE\u6620\u50CF\u4E2D\u6392\u9664\u672C\u673A\u547D\u4EE4\n                            \uFF08\u5982 java/java.exe\uFF09\u3002
-
-vendor-version.argument=<vendor-version>
-
-vendor-version.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546\u7248\u672C\u5B57\u7B26\u4E32\uFF08\u5982\u679C\u6709\uFF09\u3002\n\u7CFB\u7EDF\u5C5E\u6027 "java.vendor.version" \u7684\u503C\u5C06\u4E3A <vendor-version>\u3002
-
-vendor-version.usage=\  --vendor-version <vendor-version>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546\u7248\u672C\u5B57\u7B26\u4E32\n                            \uFF08\u5982\u679C\u6709\uFF09\u3002\u7CFB\u7EDF\u5C5E\u6027 "java.vendor.version" \u7684\n                            \u503C\u5C06\u4E3A <vendor-version>\u3002
-
-vendor-bug-url.argument=<vendor-bug-url>
-
-vendor-bug-url.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 Bug URL\u3002\u7CFB\u7EDF\n\u5C5E\u6027 "java.vendor.url.bug" \u7684\u503C\u5C06\u4E3A <vendor-url-bug>\u3002
-
-vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 Bug URL\u3002\n                            \u7CFB\u7EDF\u5C5E\u6027 "java.vendor.url.bug" \u7684\n                            \u503C\u5C06\u4E3A <vendor-url-bug>\u3002
-
-vendor-vm-bug-url.argument=<vendor-vm-bug-url>
-
-vendor-vm-bug-url.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 VM Bug URL\u3002VM \u9519\u8BEF\n\u65E5\u5FD7\u4E2D\u663E\u793A\u7684 URL \u5C06\u4E3A <vendor-vm-bug-url>\u3002
-
-vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 VM Bug URL\u3002\n                            VM \u9519\u8BEF\u65E5\u5FD7\u4E2D\u663E\u793A\u7684 URL \u5C06\n                            \u4E3A <vendor-vm-bug-url>\u3002
-
-vm.argument=<client|server|minimal|all>
-
-vm.description=\u5728\u8F93\u51FA\u6620\u50CF\u4E2D\u9009\u62E9 HotSpot VM\u3002\u9ED8\u8BA4\u503C\u4E3A all
-
-vm.usage=\  --vm <client|server|minimal|all>\n                            \u5728\u8F93\u51FA\u6620\u50CF\u4E2D\u9009\u62E9 HotSpot VM\u3002\n                            \u9ED8\u8BA4\u503C\u4E3A all
-
-zip.argument=[\u9017\u53F7\u5206\u9694\u7684\u8D44\u6E90\u8DEF\u5F84\u5217\u8868]
-
-zip.description=ZIP \u538B\u7F29
-
-zip.usage=\  --zip [\u9017\u53F7\u5206\u9694\u7684\u8D44\u6E90\u8DEF\u5F84\u5217\u8868]\n                            ZIP \u538B\u7F29
-
-include-locales.argument=<langtag>[,<langtag>]*
-
-include-locales.description=\u9017\u53F7\u5206\u9694\u7684 BCP 47 \u8BED\u8A00\u6807\u8BB0\uFF0C\u5141\u8BB8\u4F7F\u7528\u5728 RFC 4647 \u4E2D\u5B9A\u4E49\u7684\n\u533A\u57DF\u8BBE\u7F6E\u5339\u914D\u3002\u4F8B\u5982\uFF1Aen,ja,*-IN
-
-include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            \u9017\u53F7\u5206\u9694\u7684 BCP 47 \u8BED\u8A00\u6807\u8BB0\uFF0C\n                            \u5141\u8BB8\u4F7F\u7528\n                            \u5728 RFC 4647 \u4E2D\u5B9A\u4E49\u7684\u533A\u57DF\u8BBE\u7F6E\u5339\u914D\u3002\n                            \u4F8B\u5982\uFF1Aen,ja,*-IN
-
-include-locales.missingpackages=jdk.localedata \u4E2D\u7F3A\u5C11\u533A\u57DF\u8BBE\u7F6E\u6570\u636E\u7A0B\u5E8F\u5305\uFF1A\n\t
-
-include-locales.nomatchinglocales=\u5BF9\u4E8E "%s"\uFF0C\u627E\u4E0D\u5230\u5339\u914D\u7684\u533A\u57DF\u8BBE\u7F6E\u3002\u8BF7\u68C0\u67E5\u6307\u5B9A\u7684\u6A21\u5F0F\u3002
-
-include-locales.invalidtag=\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BB0\uFF1A%s
-
-include-locales.localedatanotfound=\u672A\u4F7F\u7528 --add-modules \u9009\u9879\u6307\u5B9A jdk.localedata \u6A21\u5757
-
-main.status.ok=\u8D77\u4F5C\u7528\u3002
-
-main.status.not.ok= \u4E0D\u8D77\u4F5C\u7528\u3002
-
-plugin.plugins.header=\u53EF\u7528\u63D2\u4EF6\u9009\u9879\u7684\u5217\u8868\uFF1A
-
-plugin.opt.list-plugins=\      --list-plugins                    \u5217\u51FA\u53EF\u7528\u63D2\u4EF6
-
-plugin.opt.post-process-path=\      --post-process-path <imagefile>   \u5BF9\u73B0\u6709\u6620\u50CF\u8FDB\u884C\u540E\u5904\u7406
-
-plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    \u5141\u8BB8\u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u7684\n                                        \u6700\u540E\u4E00\u4E2A\u63D2\u4EF6
-
-plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     \u7981\u7528\u6240\u63D0\u53CA\u7684\u63D2\u4EF6
-
-plugin.opt.compress=\  -c, --compress=<0|1|2>                \u5BF9\u8D44\u6E90\u542F\u7528\u538B\u7F29\uFF1A\n                                          \u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n                                          \u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n                                          \u7EA7\u522B 2\uFF1AZIP
-
-plugin.opt.strip-debug=\  -G, --strip-debug                     \u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
-
-plugin.opt.no-man-pages=\      --no-man-pages                    \u6392\u9664\u624B\u518C\u9875
-
-plugin.opt.no-header-files=\      --no-header-files                 \u6392\u9664\u5305\u542B\u6807\u5934\u6587\u4EF6
-
-main.plugin.name=\u63D2\u4EF6\u540D\u79F0
-
-main.plugin.class=\u63D2\u4EF6\u7C7B
-
-main.plugin.module=\u63D2\u4EF6\u6A21\u5757
-
-main.plugin.category=\u7C7B\u522B 
-
-main.plugin.description=\u8BF4\u660E
-
-main.plugin.post.processors=\u6620\u50CF\u540E\u5904\u7406\u7A0B\u5E8F\uFF1A
-
-main.plugin.argument=\u53C2\u6570
-
-main.plugin.range.from=\u8303\u56F4\u8D77\u70B9
-
-main.plugin.range.to=\u5230
-
-main.plugin.option=\u9009\u9879
-
-main.plugin.no.value=<\u7A7A>
-
-main.plugin.state=\u529F\u80FD\u72B6\u6001
-
-err.no.such.plugin=\u6CA1\u6709\u8FD9\u6837\u7684\u63D2\u4EF6\uFF1A{0}
-
-err.provider.not.functional=\u63D0\u4F9B\u65B9 {0} \u4E0D\u8D77\u4F5C\u7528\u3002
-
-err.plugin.mutiple.options={0} \u9009\u9879\u542F\u7528\u4E86\u591A\u4E2A\u63D2\u4EF6
-err.plugin.conflicts={0} ({1}) \u4E0E {2} \u51B2\u7A81\u3002\u8BF7\u4F7F\u7528\u5176\u4E2D\u7684\u4EFB\u610F\u4E00\u4E2A\uFF0C\u4F46\u4E0D\u80FD\u540C\u65F6\u4F7F\u7528\u4E8C\u8005\u3002
-err.provider.additional.arg.error={0} \u9009\u9879\u4E2D\u7684\u5176\u4ED6\u53C2\u6570\u89C4\u8303\u6709\u8BEF\uFF1A{1}
-
-err.no.plugins.path=\u6CA1\u6709\u63D2\u4EF6\u8DEF\u5F84\u53C2\u6570\u3002
-
-err.dir.already.exits=\u76EE\u5F55\u5DF2\u5B58\u5728\uFF1A{0}
-
-err.invalid.index=\u9009\u9879 {0} \u7684\u7D22\u5F15\u65E0\u6548
-
-err.plugin.option.not.set=\u5FC5\u987B\u8BBE\u7F6E\u9009\u9879 {0}\u3002
-
-warn.thirdparty.plugins=\u542F\u7528\u7B2C\u4E09\u65B9\u63D2\u4EF6\u53EF\u80FD\u4F1A\u5BFC\u81F4\u751F\u6210\u7684\u6620\u50CF\u65E0\u6CD5\u4F7F\u7528\u3002
-
-warn.thirdparty.plugins.enabled=\u60A8\u5DF2\u542F\u7528\u7B2C\u4E09\u65B9\u63D2\u4EF6\u3002
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
deleted file mode 100644
index 993184fa2eb..00000000000
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-main.usage.summary=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-file>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
-
-main.usage=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-Datei>\n
-error.prefix=Fehler:
-warn.prefix=Warnung:
-
-main.opt.mode=Hauptvorgangsmodi:
-main.opt.mode.create=create    - Erstellt ein neues jmod-Archiv
-main.opt.mode.extract=extract   - Extrahiert alle Dateien aus dem Archiv
-main.opt.mode.list=list      - Gibt die Namen aller Eintr\u00E4ge aus
-main.opt.mode.describe=describe  - Gibt die Moduldetails aus
-main.opt.mode.hash=hash      - Erfasst die Hashes gebundener Module.
-
-main.opt.help=Gibt diese Hilfemeldung aus
-main.opt.help-extra=Gibt Hilfe zu zus\u00E4tzlichen Optionen aus
-main.opt.version=Versionsinformationen
-main.opt.class-path=Anwendungs-JAR-Dateien|Verzeichnis mit den Klassen
-main.opt.libs=Speicherort der nativen Librarys
-main.opt.cmds=Speicherort der nativen Befehle
-main.opt.config=Speicherort der vom Benutzer editierbaren Konfigurationsdateien
-main.opt.extractDir=Zielverzeichnis f\u00FCr Extraktion
-main.opt.dry-run=Testlauf des Hashmodus
-main.opt.exclude=Schlie\u00DFt Dateien aus, die der angegebenen kommagetrennten Musterliste entsprechen. Jedes Element verwendet eines der folgenden Formate: <Globales Muster>, glob:<Globales Muster> oder regex:<Regex-Muster>
-main.opt.header-files=Speicherort der Headerdateien
-main.opt.legal-notices=Speicherort der rechtlichen Hinweise
-main.opt.module-version= Modulversion
-main.opt.main-class=Hauptklasse
-main.opt.main-class.arg=class-name
-main.opt.man-pages=Speicherort der Manpages
-main.opt.target-platform=Zielplattform
-main.opt.target-platform.arg=target-platform
-main.opt.module-path=Modulpfad
-main.opt.hash-modules=Berechnet und erfasst Hashes zur Bindung eines in ein Package integrierten Moduls an Module, die dem angegebenen <Regex-Muster> entsprechen und direkt oder indirekt davon abh\u00E4ngen. Die Hashes werden in der erstellten JMOD-Datei oder in einer JMOD- oder modularen JAR-Datei in dem Modulpfad erfasst, der im jmod-Hashbefehl angegeben ist.
-main.opt.do-not-resolve-by-default=Aus dem Standard-Root-Set von Modulen ausschlie\u00DFen
-main.opt.warn-if-resolved=Hinweis f\u00FCr ein Tool, eine Warnung auszugeben, wenn das Modul aufgel\u00F6st wird, entweder "deprecated", "deprecated-for-removal" oder "incubating"
-main.opt.date=Datum und Uhrzeit f\u00FCr die Zeitstempel von Eintr\u00E4gen, angegeben im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-8601. Beispiel: "2022-02-12T12:30:00-05:00"
-
-main.opt.cmdfile=Liest Optionen aus der angegebenen Datei
-
-module.hashes.recorded=Hashes werden im Modul {0} erfasst
-
-err.missing.mode=Eine der Modusangaben create, extract, list, describe oder hash muss angegeben werden
-err.invalid.mode=Als Modus muss create, extract, list, describe oder hash angegeben werden: {0}
-err.cannot.create.dir=Verzeichnis {0} kann nicht erstellt werden
-err.classpath.must.be.specified=--class-path muss angegeben werden
-err.jmod.must.be.specified=jmod-file muss angegeben werden
-err.invalid.version=ung\u00FCltige Modulversion {0}
-err.output.must.be.specified=--output muss angegeben werden
-err.mods.must.be.specified=--mods muss angegeben werden
-err.modulepath.must.be.specified=--module-path muss beim Hashing von Modulen angegeben werden
-err.invalid.main-class=ung\u00FCltiger main-class-Name: {0}
-err.path.not.found=Pfad nicht gefunden: {0}
-err.path.not.valid=ung\u00FCltiger Pfad: {0}
-err.path.not.a.dir=Pfad muss ein Verzeichnis sein: {0}
-err.invalid.class.path.entry=ung\u00FCltiger Classpath-Eintrag: {0}
-err.file.already.exists=Datei ist bereits vorhanden: {0}
-err.jmod.not.found=keine jmod-Datei gefunden: {0}
-err.bad.pattern=ung\u00FCltiges Muster {0}
-err.bad.WarnIfResolvedReason=Schlechter Grund: {0}, Grund muss entweder "deprecated", "deprecated-for-removal" oder "incubating" sein
-err.unknown.option=unbekannte Option(en): {0}
-err.missing.arg=kein Wert angegeben f\u00FCr {0}
-err.internal.error=interner Fehler: {0} {1} {2}
-err.invalid.dryrun.option=--dry-run kann nur mit dem Hashmodus verwendet werden
-err.module.descriptor.not.found=Moduldeskriptor nicht gefunden
-err.missing.export.or.open.packages=Packages, die exportiert werden oder in {0} ge\u00F6ffnet sind, sind nicht vorhanden: {1}
-err.module.resolution.fail=Aufl\u00F6sung nicht erfolgreich: {0}
-err.no.moduleToHash=Keine Hashes erfasst: Kein mit {0} \u00FCbereinstimmendes Modul zum Erfassen von Hashes gefunden
-err.invalid.date=--date {0} ist kein erweitertes Datums- und Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-860: {1}
-err.date.out.of.range=--date {0} liegt nicht im g\u00FCltigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
-warn.invalid.arg=Ung\u00FCltiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
-warn.no.module.hashes=Keine Hashes erfasst: Kein Modul f\u00FCr Hashing angegeben, abh\u00E4ngig von {0}
-warn.ignore.entry=Eintrag {0} in Abschnitt {1} wird ignoriert
-warn.ignore.duplicate.entry=doppelter Eintrag {0} in Abschnitt {1} wird ignoriert
-
-
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
index e173a3e3a82..673526df269 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
@@ -58,7 +58,6 @@ main.opt.module-path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9
 main.opt.hash-modules=\u6307\u5B9A\u306E<regex-pattern>\u306B\u4E00\u81F4\u3057\u3001\u76F4\u63A5\u307E\u305F\u306F\u9593\u63A5\u7684\u306B\u4F9D\u5B58\u3057\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7D50\u5408\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u3092\u8A08\u7B97\u304A\u3088\u3073\u8A18\u9332\u3057\u307E\u3059\u3002\u30CF\u30C3\u30B7\u30E5\u306F\u3001\u4F5C\u6210\u3055\u308C\u3066\u3044\u308BJMOD\u30D5\u30A1\u30A4\u30EB\u3001jmod hash\u30B3\u30DE\u30F3\u30C9\u3067\u6307\u5B9A\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306EJMOD\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30E9JAR\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
 main.opt.do-not-resolve-by-default=\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30EB\u30FC\u30C8\u8A2D\u5B9A\u304B\u3089\u9664\u5916\u3057\u307E\u3059
 main.opt.warn-if-resolved=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u8B66\u544A\u3092\u767A\u884C\u3059\u308B\u30C4\u30FC\u30EB\u306E\u30D2\u30F3\u30C8\u3002\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B
-main.opt.date=\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u65E5\u6642\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u66F8\u5F0F("2022-02-12T12:30:00-05:00"\u306A\u3069)\u3067ISO-8601\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
 
 main.opt.cmdfile=\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059
 
@@ -90,8 +89,6 @@ err.module.descriptor.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3
 err.missing.export.or.open.packages={0}\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u304B\u305D\u3053\u3067\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {1}
 err.module.resolution.fail=\u89E3\u6C7A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
 err.no.moduleToHash=\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}\u306B\u4E00\u81F4\u3057\u3001\u30CF\u30C3\u30B7\u30E5\u3092\u8A18\u9332\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-err.invalid.date=--date {0}\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u66F8\u5F0F: {1}\u3092\u6307\u5B9A\u3057\u305F\u3001\u6709\u52B9\u306AISO-8601\u306E\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-err.date.out.of.range=--date {0}\u306F\u6709\u52B9\u306A\u7BC4\u56F21980-01-01T00:00:02Z\u304B\u30892099-12-31T23:59:59Z\u306B\u3042\u308A\u307E\u305B\u3093
 warn.invalid.arg=\u7121\u52B9\u306A\u30AF\u30E9\u30B9\u540D\u307E\u305F\u306F\u30D1\u30B9\u540D\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
 warn.no.module.hashes=\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}\u306B\u4F9D\u5B58\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u306B\u5BFE\u3057\u3066\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 warn.ignore.entry=\u30BB\u30AF\u30B7\u30E7\u30F3{1}\u306E\u30A8\u30F3\u30C8\u30EA{0}\u3092\u7121\u8996\u3057\u307E\u3059
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
index df4e0b27493..04a1b36b3b6 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
@@ -58,7 +58,6 @@ main.opt.module-path=\u6A21\u5757\u8DEF\u5F84
 main.opt.hash-modules=\u8BA1\u7B97\u548C\u8BB0\u5F55\u6563\u5217, \u4EE5\u5C06\u6253\u5305\u6A21\u5757\u7ED1\u5B9A\u5230\u4E0E\u6307\u5B9A <\u6B63\u5219\u8868\u8FBE\u5F0F\u6A21\u5F0F> \u5339\u914D\u5E76\u76F4\u63A5\u6216\u95F4\u63A5\u4F9D\u8D56\u4E8E\u7684\u6A21\u5757\u3002\u6563\u5217\u8BB0\u5F55\u5728\u6240\u521B\u5EFA\u7684 JMOD \u6587\u4EF6\u4E2D, \u6216\u8005\u8BB0\u5F55\u5728 jmod hash \u547D\u4EE4\u6307\u5B9A\u7684\u6A21\u5757\u8DEF\u5F84\u7684 JMOD \u6587\u4EF6\u6216\u6A21\u5757\u5316 JAR \u4E2D\u3002
 main.opt.do-not-resolve-by-default=\u4ECE\u9ED8\u8BA4\u6839\u6A21\u5757\u96C6\u4E2D\u6392\u9664
 main.opt.warn-if-resolved=\u63D0\u793A\u5DE5\u5177\u5728\u89E3\u6790\u6A21\u5757\u540E\u53D1\u51FA\u8B66\u544A\u3002\u53EF\u4EE5\u4E3A deprecated, deprecated-for-removal \u6216 incubating \u4E4B\u4E00
-main.opt.date=\u6761\u76EE\u65F6\u95F4\u6233\u7684\u65E5\u671F\u548C\u65F6\u95F4\uFF0C\u4EE5\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\u6307\u5B9A\uFF0C\u4F8B\u5982 "2022-02-12T12:30:00-05:00"
 
 main.opt.cmdfile=\u4ECE\u6307\u5B9A\u6587\u4EF6\u8BFB\u53D6\u9009\u9879
 
@@ -90,8 +89,6 @@ err.module.descriptor.not.found=\u627E\u4E0D\u5230\u6A21\u5757\u63CF\u8FF0\u7B26
 err.missing.export.or.open.packages=\u5728 {0} \u4E2D\u5BFC\u51FA\u6216\u6253\u5F00\u7684\u7A0B\u5E8F\u5305\u4E0D\u5B58\u5728: {1}
 err.module.resolution.fail=\u89E3\u6790\u5931\u8D25: {0}
 err.no.moduleToHash=\u672A\u8BB0\u5F55\u6563\u5217\uFF1A\u627E\u4E0D\u5230\u4E0E {0} \u5339\u914D\u7684\u6A21\u5757\u6765\u8BB0\u5F55\u6563\u5217
-err.invalid.date=--date {0} \u4E0D\u662F\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684\u6709\u6548 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\uFF1A{1}
-err.date.out.of.range=--date {0} \u4E0D\u5728 1980-01-01T00:00:02Z \u5230 2099-12-31T23:59:59Z \u8FD9\u4E00\u6709\u6548\u8303\u56F4\u5185
 warn.invalid.arg=\u7C7B\u540D\u65E0\u6548\u6216\u8DEF\u5F84\u540D\u4E0D\u5B58\u5728: {0}
 warn.no.module.hashes=\u672A\u8BB0\u5F55\u4EFB\u4F55\u6563\u5217: \u6CA1\u6709\u4E3A\u4F9D\u8D56\u4E8E {0} \u7684\u6563\u5217\u5904\u7406\u6307\u5B9A\u6A21\u5757
 warn.ignore.entry=\u6B63\u5728\u5FFD\u7565\u8282 {1} \u4E2D\u7684\u6761\u76EE {0}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
deleted file mode 100644
index 5038d505e3b..00000000000
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-app.bundler.name=Linux-Anwendungsimage
-deb.bundler.name=DEB-Bundle
-rpm.bundler.name=RPM-Bundle
-
-param.license-type.default=Unbekannt
-param.menu-group.default=Unbekannt
-
-resource.deb-control-file=DEB-Kontrolldatei
-resource.deb-preinstall-script=DEB-Preinstall-Skript
-resource.deb-prerm-script=DEB-Prerm-Skript
-resource.deb-postinstall-script=DEB-Postinstall-Skript
-resource.deb-postrm-script=DEB-Postrm-Skript
-resource.copyright-file=Copyright-Datei
-resource.menu-shortcut-descriptor=Men\u00FCverkn\u00FCpfungsdeskriptor
-resource.menu-icon=Men\u00FCsymbol
-resource.rpm-spec-file=RPM-Spezifikationsdatei
-
-error.tool-not-found.advice=Installieren Sie die erforderlichen Packages
-error.tool-old-version.advice=Installieren Sie die erforderlichen Packages
-
-error.invalid-install-dir=Ung\u00FCltiges Installationsverzeichnis "{0}"
-
-error.invalid-value-for-package-name=Ung\u00FCltiger Wert "{0}" f\u00FCr den Bundle-Namen.
-error.invalid-value-for-package-name.advice=Setzen Sie die Option "linux-bundle-name" auf einen g\u00FCltigen Debian-Packagenamen. Die Packagenamen d\u00FCrfen nur Kleinbuchstaben (a-z), Ziffern (0-9), Pluszeichen (+), Minuszeichen (-) und Punkte (.) umfassen. Sie m\u00FCssen mindestens zwei Zeichen lang sein und mit einem alphanumerischen Zeichen beginnen.
-
-message.icon-not-png=Das angegebene Symbol "{0}" ist keine PNG-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
-message.test-for-tool=Test f\u00FCr [{0}]. Ergebnis: {1}
-message.outputting-to-location=DEB f\u00FCr Installationsprogramm wird generiert in: {0}.
-message.output-to-location=Package (.deb) gespeichert in: {0}.
-message.debs-like-licenses=Debian-Packages m\u00FCssen eine Lizenz angeben. Bei fehlender Lizenz geben einige Linux-Distributionen eine Meldung \u00FCber eine Beeintr\u00E4chtigung der Anwendungsqualit\u00E4t aus.
-message.outputting-bundle-location=RPM f\u00FCr Installationsprogramm wird generiert in: {0}.
-message.output-bundle-location=Package (.rpm) gespeichert in: {0}.
-message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
-
-message.ldd-not-available=ldd-Befehl nicht gefunden. Packageabh\u00E4ngigkeiten werden nicht generiert.
-message.deb-ldd-not-available.advice=Installieren Sie das DEB-Package "libc-bin", um ldd abzurufen.
-message.rpm-ldd-not-available.advice=Installieren Sie das RPM-Package "glibc-common", um ldd abzurufen.
-
-warning.foreign-app-image=Warnung: app-image-Verzeichnis wurde von jpackage nicht generiert.
-message.not-default-bundler-no-dependencies-lookup={0} ist nicht der Standardpackagetyp. Packageabh\u00E4ngigkeiten werden nicht generiert.
-
-error.unexpected-package-property=Erwarteter Wert der Eigenschaft "{0}": [{1}]. Tats\u00E4chlicher Wert in Ausgabepackage: [{2}]. Anscheinend enthielt die benutzerdefinierte Datei "{3}" aus dem Ressourcenverzeichnis einen hartcodierten Wert der Eigenschaft "{0}"
-error.unexpected-package-property.advice=Verwenden Sie die Musterzeichenfolge [{0}] anstelle des hartcodierten Wertes [{1}] der {2}-Eigenschaft in der benutzerdefinierten Datei "{3}"
-error.unexpected-default-package-property.advice=Legen Sie den Wert der {0}-Eigenschaft in der benutzerdefinierten Datei "{1}" nicht explizit fest
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
index 0ced3733f41..739ca7b365e 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
index 63ba81270b2..3ce20c774f5 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
deleted file mode 100644
index 48f01addb4a..00000000000
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-app.bundler.name=Mac-Anwendungsimage
-store.bundler.name=Mac App Store-f\u00E4higer Bundler
-dmg.bundler.name=Mac-DMG-Package
-pkg.bundler.name=Mac-PKG-Package
-
-error.invalid-cfbundle-version.advice=Legen Sie einen kompatiblen Wert f\u00FCr "app-version" fest. G\u00FCltige Versionsnummern sind ein bis drei durch Punkte getrennte Ganzzahlen.
-error.explicit-sign-no-cert=Signatur wurde explizit angefordert, doch es wurde kein Signaturzertifikat gefunden
-error.explicit-sign-no-cert.advice=Geben Sie g\u00FCltige Werte f\u00FCr mac-signing-key-user-name und mac-signing-keychain an
-error.must-sign-app-store=Mac App Store-Apps m\u00FCssen signiert werden. Die Signierung wurde von der Bundler-Konfiguration deaktiviert
-error.must-sign-app-store.advice=Verwenden Sie die Option --mac-sign mit entsprechenden Werten f\u00FCr user-name und keychain
-error.no-app-signing-key=Kein Signaturschl\u00FCssel f\u00FCr Mac App Store-App
-error.no-app-signing-key.advice=Installieren Sie Ihre App-Signaturschl\u00FCssel mit XCode in Ihrem Mac-Schl\u00FCsselbund.
-error.no-pkg-signing-key=Kein Signaturschl\u00FCssel f\u00FCr Mac App Store-Installationsprogramm
-error.no-pkg-signing-key.advice=Installieren Sie Ihre App-Signaturschl\u00FCssel mit XCode in Ihrem Mac-Schl\u00FCsselbund.
-error.certificate.expired=Fehler: Zertifikat abgelaufen {0}
-error.no.xcode.signing=F\u00FCr die Signatur ist Xcode mit Befehlszeilen-Entwicklertools erforderlich
-error.no.xcode.signing.advice=Installieren Sie Xcode mit Befehlszeilen-Entwicklertools.
-error.cert.not.found=Kein Zertifikat gefunden, das [{0}] mit Schl\u00FCsselbund [{1}] entspricht
-error.multiple.certs.found=WARNUNG: Mehrere Zertifikate gefunden, die [{0}] mit Schl\u00FCsselbund [{1}] entsprechen. Es wird das erste Zertifikat verwendet
-resource.bundle-config-file=Bundle-Konfigurationsdatei
-resource.app-info-plist=Info.plist der Anwendung
-resource.runtime-info-plist=Info.plist der Java-Laufzeit
-resource.entitlements=Mac-Berechtigungen
-resource.dmg-setup-script=DMG-Setupskript
-resource.license-setup=Lizenzsetup
-resource.dmg-background=DMG-Hintergrund
-resource.volume-icon=Symbol "Datentr\u00E4ger"
-resource.post-install-script=Auszuf\u00FChrendes Skript nach dem Auff\u00FCllen des Anwendungsimages
-resource.pkg-preinstall-script=PKG-Preinstall-Skript
-resource.pkg-postinstall-script=PKG-Postinstall-Skript
-resource.pkg-background-image=PKG-Hintergrundbild
-resource.pkg-pdf=Projektdefinitionsdatei
-
-
-message.bundle-name-too-long-warning={0} ist auf "{1}" gesetzt. Dies ist l\u00E4nger als 16 Zeichen. K\u00FCrzen Sie den Wert, um die Mac-Nutzungserfahrung zu verbessern.
-message.preparing-info-plist=Info.plist wird vorbereitet: {0}.
-message.icon-not-icns= Das angegebene Symbol "{0}" ist keine ICNS-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
-message.version-string-too-many-components="app-version" darf ein bis drei Zahlen aufweisen: 1, 1.2, 1.2.3.
-message.version-string-first-number-not-zero=Die erste Zahl in app-version darf nicht null oder negativ sein.
-message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
-message.ignoring.symlink=Warnung: codesign \u00FCberspringt den Symlink {0}.
-message.already.signed=Datei ist bereits signiert: {0}.
-message.keychain.error=Fehler: Schl\u00FCsselbundliste kann nicht abgerufen werden.
-message.building-bundle=Mac App Store-Package f\u00FCr {0} wird erstellt.
-message.app-image-dir-does-not-exist=Angegebenes Anwendungsimageverzeichnis {0}: {1} ist nicht vorhanden.
-message.app-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist.
-message.app-image-requires-app-name=Beim Verwenden eines internen Anwendungsimages m\u00FCssen Sie den Anwendungsnamen angeben.
-message.app-image-requires-app-name.advice=Legen Sie den Anwendungsnamen mit dem CLI-Kennzeichen -name, dem fx:application/@name ANT-Attribut oder dem Bundler-Argument "appName" fest.
-message.app-image-requires-identifier=ID kann nicht aus Anwendungsimage extrahiert werden.
-message.app-image-requires-identifier.advice=Verwenden Sie "--verbose" f\u00FCr eine erweiterte Fehlermeldung, oder geben Sie sie mit "--mac-package-identifier" an.
-message.invalid-identifier=Ung\u00FCltige Mac-Bundle-ID [{0}].
-message.invalid-identifier.advice=Geben Sie die ID mit "--mac-package-identifier" an.
-message.building-dmg=DMG-Package f\u00FCr {0} wird erstellt.
-message.running-script=Shellskript wird auf Anwendungsimage [{0}] ausgef\u00FChrt.
-message.preparing-dmg-setup=DMG-Setup wird vorbereitet: {0}.
-message.creating-dmg-file=DMG-Datei wird erstellt: {0}.
-message.dmg-cannot-be-overwritten=DMG-Datei ({0}) ist vorhanden und kann nicht entfernt werden.
-message.output-to-location=Ergebnis von DMG-Installationsprogramm f\u00FCr {0}: {1}.
-message.building-pkg=PKG-Package f\u00FCr {0} wird erstellt.
-message.preparing-scripts=Packageskripte werden vorbereitet.
-message.preparing-distribution-dist=distribution.dist wird vorbereitet: {0}.
-message.signing.pkg=Warnung: Zum Signieren von PKG m\u00FCssen Sie m\u00F6glicherweise mit dem Schl\u00FCsselbundverwaltungstool die Option "Immer vertrauen" f\u00FCr Ihr Zertifikat festlegen.
-message.setfile.dmg=Das Festlegen des benutzerdefinierten Symbols f\u00FCr die DMG-Datei wurde \u00FCbersprungen, weil das Utility "SetFile" nicht gefunden wurde. Durch Installieren von Xcode mit Befehlszeilentools sollte dieses Problem behoben werden.
-message.install-dir-ignored=Warnung: "--install-dir" wird von DMG nicht unterst\u00FCtzt. Stattdessen wird standardm\u00E4\u00DFig /Applications verwendet.
-warning.unsigned.app.image=Warnung: Nicht signiertes app-image wird zum Erstellen von signiertem {0} verwendet.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
index 3ae48d25700..291130fb237 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
@@ -29,7 +29,7 @@ store.bundler.name=Mac App Store\u306E\u6E96\u5099\u5B8C\u4E86\u30D0\u30F3\u30C9
 dmg.bundler.name=Mac DMG\u30D1\u30C3\u30B1\u30FC\u30B8
 pkg.bundler.name=Mac PKG\u30D1\u30C3\u30B1\u30FC\u30B8
 
-error.invalid-cfbundle-version.advice=\u4E92\u63DB\u6027\u306E\u3042\u308B'app-version'\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\u6709\u52B9\u306A\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001\u30C9\u30C3\u30C8\u3067\u533A\u5207\u3089\u308C\u305F1\u304B\u30893\u3064\u306E\u6574\u6570\u3067\u3059\u3002
+error.invalid-cfbundle-version.advice=Set a compatible 'app-version'. Valid versions are one to three integers separated by dots.
 error.explicit-sign-no-cert=\u7F72\u540D\u304C\u660E\u793A\u7684\u306B\u8981\u6C42\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u7F72\u540D\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 error.explicit-sign-no-cert.advice=\u6709\u52B9\u306Amac-signing-key-user-name\u304A\u3088\u3073mac-signing-keychain\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 error.must-sign-app-store=Mac App Store\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u304C\u3001\u7F72\u540D\u306F\u30D0\u30F3\u30C9\u30E9\u69CB\u6210\u306B\u3088\u3063\u3066\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059
@@ -55,14 +55,13 @@ resource.post-install-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3
 resource.pkg-preinstall-script=PKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u524D\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.pkg-postinstall-script=PKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5F8C\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.pkg-background-image=pkg\u80CC\u666F\u30A4\u30E1\u30FC\u30B8
-resource.pkg-pdf=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5B9A\u7FA9\u30D5\u30A1\u30A4\u30EB
 
 
 message.bundle-name-too-long-warning={0}\u304C16\u6587\u5B57\u3092\u8D85\u3048\u308B''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002Mac\u3067\u306E\u64CD\u4F5C\u6027\u3092\u3088\u308A\u826F\u304F\u3059\u308B\u305F\u3081\u306B\u77ED\u304F\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 message.preparing-info-plist=Info.plist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}\u3002
 message.icon-not-icns= \u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICNS\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-message.version-string-too-many-components='app-version'\u306B\u306F\u30011\u30011.2\u30011.2.3\u306A\u30691\u304B\u30893\u306E\u6570\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-message.version-string-first-number-not-zero=pp-version\u306E\u6700\u521D\u306E\u6570\u5B57\u306F\u3001\u30BC\u30ED\u307E\u305F\u306F\u8CA0\u306E\u5024\u306B\u3067\u304D\u307E\u305B\u3093\u3002
+message.version-string-too-many-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217\u306B\u306F\u30011\u30011.2\u30011.2.3\u306A\u30691\u304B\u30893\u306E\u6570\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+message.version-string-first-number-not-zero='app-version' \u306E\u6700\u521D\u306E\u6570\u5B57\u306F\u3001\u30BC\u30ED\u307E\u305F\u306F\u8CA0\u306E\u5024\u306B\u3067\u304D\u307E\u305B\u3093\u3002
 message.creating-association-with-null-extension=null\u62E1\u5F35\u5B50\u3068\u306E\u95A2\u9023\u4ED8\u3051\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
 message.ignoring.symlink=\u8B66\u544A: codesign\u304Csymlink {0}\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059
 message.already.signed=\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u3059: {0}\u3002
@@ -87,5 +86,5 @@ message.preparing-scripts=\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B9\u30AF\u30EA
 message.preparing-distribution-dist=distribution.dist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
 message.signing.pkg=\u8B66\u544A: PKG\u3078\u306E\u7F72\u540D\u306E\u5834\u5408\u3001\u300C\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u30FB\u30A2\u30AF\u30BB\u30B9\u300D\u30C4\u30FC\u30EB\u3092\u4F7F\u7528\u3057\u3066\u8A3C\u660E\u66F8\u306B\u300C\u5E38\u306B\u4FE1\u983C\u3059\u308B\u300D\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 message.setfile.dmg='SetFile'\u30E6\u30FC\u30C6\u30A3\u30EA\u30C6\u30A3\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u305F\u3081\u3001DMG\u30D5\u30A1\u30A4\u30EB\u3067\u306E\u30AB\u30B9\u30BF\u30E0\u30FB\u30A2\u30A4\u30B3\u30F3\u306E\u8A2D\u5B9A\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F\u3002Xcode\u3068\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30C4\u30FC\u30EB\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u3068\u3001\u3053\u306E\u554F\u984C\u306F\u89E3\u6C7A\u3055\u308C\u307E\u3059\u3002
-message.install-dir-ignored=\u8B66\u544A: "--install-dir"\u306FDMG\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002/Applications\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002
-warning.unsigned.app.image=\u8B66\u544A: \u7F72\u540D\u3055\u308C\u3066\u3044\u306A\u3044app-image\u3092\u4F7F\u7528\u3057\u3066\u7F72\u540D\u3055\u308C\u305F{0}\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
+message.install-dir-ignored=Warning: "--install-dir" is not supported by DMG and will be default to /Applications.
+warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {0}.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
index 0d832583c0e..ecf9e8796d5 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
@@ -29,7 +29,7 @@ store.bundler.name=\u652F\u6301 Mac App Store \u7684\u6253\u5305\u7A0B\u5E8F
 dmg.bundler.name=Mac DMG \u7A0B\u5E8F\u5305
 pkg.bundler.name=Mac PKG \u7A0B\u5E8F\u5305
 
-error.invalid-cfbundle-version.advice=\u8BBE\u7F6E\u517C\u5BB9\u7684 'app-version' \u503C\u3002\u6709\u6548\u7248\u672C\u5305\u542B\u4E00\u5230\u4E09\u4E2A\u7528\u70B9\u5206\u9694\u7684\u6574\u6570\u3002
+error.invalid-cfbundle-version.advice=Set a compatible 'app-version'. Valid versions are one to three integers separated by dots.
 error.explicit-sign-no-cert=\u5DF2\u660E\u786E\u8BF7\u6C42\u7B7E\u540D\uFF0C\u4F46\u627E\u4E0D\u5230\u7B7E\u540D\u8BC1\u4E66
 error.explicit-sign-no-cert.advice=\u6307\u5B9A\u6709\u6548\u7684 mac-signing-key-user-name \u548C mac-signing-keychain
 error.must-sign-app-store=Mac App Store \u5E94\u7528\u7A0B\u5E8F\u5FC5\u987B\u7B7E\u540D, \u800C\u6253\u5305\u7A0B\u5E8F\u914D\u7F6E\u5DF2\u7981\u7528\u7B7E\u540D
@@ -55,14 +55,13 @@ resource.post-install-script=\u8981\u5728\u586B\u5145\u5E94\u7528\u7A0B\u5E8F\u6
 resource.pkg-preinstall-script=PKG \u5B89\u88C5\u524D\u811A\u672C
 resource.pkg-postinstall-script=PKG \u5B89\u88C5\u540E\u811A\u672C
 resource.pkg-background-image=pkg \u80CC\u666F\u56FE\u50CF
-resource.pkg-pdf=\u9879\u76EE\u5B9A\u4E49\u6587\u4EF6
 
 
 message.bundle-name-too-long-warning={0}\u5DF2\u8BBE\u7F6E\u4E3A ''{1}'', \u5176\u957F\u5EA6\u8D85\u8FC7\u4E86 16 \u4E2A\u5B57\u7B26\u3002\u4E3A\u4E86\u83B7\u5F97\u66F4\u597D\u7684 Mac \u4F53\u9A8C, \u8BF7\u8003\u8651\u5C06\u5176\u7F29\u77ED\u3002
 message.preparing-info-plist=\u6B63\u5728\u51C6\u5907 Info.plist: {0}\u3002
 message.icon-not-icns= \u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICNS \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
-message.version-string-too-many-components='app-version' \u53EF\u4EE5\u5305\u542B 1 \u5230 3 \u4E2A\u6570\u5B57\uFF1A1\u30011.2\u30011.2.3\u3002
-message.version-string-first-number-not-zero=app-version \u4E2D\u7684\u7B2C\u4E00\u4E2A\u6570\u5B57\u4E0D\u80FD\u4E3A\u96F6\u6216\u8D1F\u6570\u3002
+message.version-string-too-many-components=\u7248\u672C\u5B57\u7B26\u4E32\u53EF\u4EE5\u5305\u542B 1 \u5230 3 \u4E2A\u6570\u5B57: 1, 1.2, 1.2.3\u3002
+message.version-string-first-number-not-zero='app-version' \u4E2D\u7684\u7B2C\u4E00\u4E2A\u6570\u5B57\u4E0D\u80FD\u4E3A\u96F6\u6216\u8D1F\u6570\u3002
 message.creating-association-with-null-extension=\u6B63\u5728\u4F7F\u7528\u7A7A\u6269\u5C55\u540D\u521B\u5EFA\u5173\u8054\u3002
 message.ignoring.symlink=\u8B66\u544A: codesign \u6B63\u5728\u8DF3\u8FC7\u7B26\u53F7\u94FE\u63A5 {0}\u3002
 message.already.signed=\u6587\u4EF6\u5DF2\u7B7E\u540D\uFF1A{0}\u3002
@@ -87,5 +86,5 @@ message.preparing-scripts=\u6B63\u5728\u51C6\u5907\u7A0B\u5E8F\u5305\u811A\u672C
 message.preparing-distribution-dist=\u6B63\u5728\u51C6\u5907 distribution.dist: {0}\u3002
 message.signing.pkg=\u8B66\u544A\uFF1A\u8981\u5BF9 PKG \u8FDB\u884C\u7B7E\u540D\uFF0C\u53EF\u80FD\u9700\u8981\u4F7F\u7528\u201C\u5BC6\u94A5\u94FE\u8BBF\u95EE\u201D\u5DE5\u5177\u4E3A\u8BC1\u4E66\u8BBE\u7F6E\u201C\u59CB\u7EC8\u4FE1\u4EFB\u201D\u3002
 message.setfile.dmg=\u7531\u4E8E\u672A\u627E\u5230 'SetFile' \u5B9E\u7528\u7A0B\u5E8F\uFF0C\u8DF3\u8FC7\u4E86\u9488\u5BF9 DMG \u6587\u4EF6\u8BBE\u7F6E\u5B9A\u5236\u56FE\u6807\u7684\u64CD\u4F5C\u3002\u5B89\u88C5\u5E26\u547D\u4EE4\u884C\u5DE5\u5177\u7684 Xcode \u5E94\u80FD\u89E3\u51B3\u6B64\u95EE\u9898\u3002
-message.install-dir-ignored=\u8B66\u544A\uFF1A"--install-dir" \u4E0D\u53D7 DMG \u652F\u6301\uFF0C\u5C06\u9ED8\u8BA4\u4E3A /Applications\u3002
-warning.unsigned.app.image=\u8B66\u544A\uFF1A\u4F7F\u7528\u672A\u7B7E\u540D\u7684 app-image \u751F\u6210\u5DF2\u7B7E\u540D\u7684 {0}\u3002
+message.install-dir-ignored=Warning: "--install-dir" is not supported by DMG and will be default to /Applications.
+warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {0}.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
deleted file mode 100644
index 16540e2f002..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-MSG_Help=Verwendung: jpackage <Optionen>\n\nBeispielverwendungen:\n--------------\n    Generiert ein f\u00FCr das Hostsystem geeignetes Anwendungspackage:\n        F\u00FCr eine modulare Anwendung:\n            jpackage -n name -p modulePath -m moduleName/className\n        F\u00FCr eine nicht modulare Anwendung:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Aus einem vorab erstellten Anwendungsimage:\n            jpackage -n name --app-image appImageDir\n    Generiert ein Anwendungsimage:\n        F\u00FCr eine modulare Anwendung:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        F\u00FCr eine nicht modulare Anwendung:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Um eigene Optionen f\u00FCr jlink anzugeben, f\u00FChren Sie jlink separat aus:\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<zus\u00E4tzliche jlink-Optionen>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Generiert ein Java-Laufzeitpackage:\n        jpackage -n name --runtime-image <Laufzeitimage>\n\nAllgemeine Optionen:\n  @<Dateiname > \n          Liest Optionen und/oder Modus aus einer Datei \n          Diese Option kann mehrmals verwendet werden.\n  --type -t <Typ> \n          Der zu erstellende Packagetyp\n          G\u00FCltige Werte: {1} \n          Bei fehlender Angabe dieser Option wird ein plattformabh\u00E4ngiger\n          Standardtyp erstellt.\n  --app-version <Version>\n          Version der Anwendung und/oder des Packages\n  --copyright <Copyright-Zeichenfolge>\n          Copyright f\u00FCr die Anwendung\n  --description <Zeichenfolge f\u00FCr Beschreibung>\n          Beschreibung der Anwendung\n  --help -h \n          Gibt den Verwendungstext mit einer Liste und Beschreibung jeder g\u00FCltigen\n          Option f\u00FCr die aktuelle Plattform an den Ausgabestream aus und beendet den Vorgang\n  --icon <Dateipfad>\n          Pfad des Symbols f\u00FCr das Anwendungspackage\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --name -n <Name>\n          Name der Anwendung und/oder des Packages\n  --dest -d <Zielpfad>\n          Pfad, in den die generierte Ausgabedatei abgelegt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Standardm\u00E4\u00DFig wird das aktuelle Arbeitsverzeichnis verwendet.\n  --temp <Verzeichnispfad>\n          Pfad eines neuen oder leeren Verzeichnisses zum Erstellen tempor\u00E4rer Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Falls angegeben, wird das tempor\u00E4re Verzeichnis beim Abschlie\u00DFen der Aufgabe\n          nicht entfernt und muss manuell entfernt werden.\n          Bei fehlender Angabe wird ein tempor\u00E4res Verzeichnis erstellt und\n          beim Abschlie\u00DFen der Aufgabe entfernt.\n  --vendor <Zeichenfolge f\u00FCr Anbieter>\n          Anbieter der Anwendung\n  --verbose\n          Aktiviert Ausgabe im Verbose-Modus\n  --version\n          Gibt die Produktversion an den Outputstream aus und beendet den Vorgang.\n\nOptionen f\u00FCr das Erstellen des Laufzeitimages:\n  --add-modules <Modulname>[,<Modulname>...]\n          Eine per Komma (",") getrennte Liste hinzuzuf\u00FCgender Module\n          Diese Modulliste wird zusammen mit dem Hauptmodul (sofern angegeben)\n          als Argument --add-module an jlink \u00FCbergeben.\n          Bei fehlender Angabe wird entweder nur das Hauptmodul (sofern --module\n          angegeben ist) oder das Standardset an Modulen (sofern --main-jar \n          angegeben ist) verwendet.\n          Diese Option kann mehrmals verwendet werden.\n  --module-path -p <Modulpfad>...\n          \
-Eine per {0} getrennte Pfadliste\n          Jeder Pfad ist entweder ein Verzeichnis mit Modulen oder der Pfad zu einer\n          JAR-Datei eines Moduls.\n          (Jeder Pfad ist absolut oder relativ zum aktuellen Verzeichnis.)\n          Diese Option kann mehrmals verwendet werden.\n  --jlink-options <jlink-Optionen> \n          Eine per Leerzeichen getrennte Liste mit an jlink zu \u00FCbergebenden Optionen \n          Bei fehlender Angabe wird standardm\u00E4\u00DFig "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files" verwendet. \n          Diese Option kann mehrmals verwendet werden.\n  --runtime-image <Verzeichnispfad>\n          Pfad des vordefinierten Laufzeitimages, das in\n          das Anwendungsimage kopiert wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Wenn --runtime-image nicht angegeben wird, f\u00FChrt jpackage jlink aus, um\n          das Laufzeitimage mit folgenden Optionen zu erstellen:\n          --strip-debug, --no-header-files, --no-man-pages und\n          --strip-native-commands.\n\nOptionen f\u00FCr das Erstellen des Anwendungsimages:\n  --input -i <Verzeichnispfad>\n          Pfad des Eingabeverzeichnisses mit den in das Package zu integrierenden Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Alle Dateien im Eingabeverzeichnis werden in das Package f\u00FCr das\n          Anwendungsimage integriert.\n  --app-content <zus\u00E4tzlicher Inhalt>[,<zus\u00E4tzlicher Inhalt>...]\n          Eine per Komma getrennte Liste mit Pfaden zu Dateien und/oder Verzeichnissen,\n          die zur Anwendungs-Payload hinzugef\u00FCgt werden sollen.\n          Diese Option kann mehrmals verwendet werden.\n\nOptionen f\u00FCr das Erstellen des Anwendungs-Launchers:\n  --add-launcher <Launcher-Name>=<Dateipfad>\n          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n          einer Liste von Schl\u00FCssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Die Schl\u00FCssel "module", "main-jar", "main-class",\n          "arguments", "java-options", "app-version", "icon",\n          "win-console", "win-shortcut", "win-menu",\n          "linux-app-category" und "linux-shortcut" k\u00F6nnen verwendet werden.\n          Diese Optionen werden den urspr\u00FCnglichen Befehlszeilenoptionen hinzugef\u00FCgt\n          (oder \u00FCberschreiben diese), um einen zus\u00E4tzlichen, alternativen Launcher zu erstellen.\n          Der Hauptanwendungs-Launcher wird aus den Befehlszeilenoptionen\n          erstellt. Mit dieser Option k\u00F6nnen zus\u00E4tzliche alternative Launcher\n          erstellt werden. Au\u00DFerdem kann diese Option mehrmals verwendet werden,\n          um mehrere zus\u00E4tzliche Launcher zu erstellen. \n  --arguments <Hauptklassenargumente>\n          Befehlszeilenargumente, die an die Hauptklasse \u00FCbergeben werden, falls\n          keine Befehlszeilenargumente an den Launcher \u00FCbergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --java-options <Java-Optionen>\n          Optionen, die an die Java-Laufzeit \u00FCbergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --main-class <Klassenname>\n          Qualifizierter Name der auszuf\u00FChrenden Anwendungshauptklasse\n          Diese Option kann nur bei Angabe von --main-jar verwendet werden.\n  --main-jar <Haupt-JAR-Datei>\n          Die Haupt-JAR-Datei der Anwendung, die die Hauptklasse enth\u00E4lt\n          (angegeben als Pfad relativ zum Eingabepfad)\n          Es kann entweder die Option --module oder die Option --main-jar angegeben werden, nicht jedoch\n          beides.\n  --module -m <Modulname>[/<Hauptklasse>]\n          Das Hauptmodul (und optional die Hauptklasse) der Anwendung\n          Dieses Modul muss unter dem Modulpfad gespeichert sein.\n          Bei Angabe dieser Option wird das Hauptmodul\n          im \
-Java-Laufzeitimage verkn\u00FCpft. Es kann entweder die Option --module oder die Option --main-jar\n          angegeben werden, nicht jedoch beides.\n{2}\nOptionen f\u00FCr das Erstellen des Anwendungspackages:\n  --about-url <URL>\n          URL der Homepage der Anwendung\n  --app-image <Verzeichnispfad>\n          Speicherort des vordefinierten Anwendungsimages, mit dem\n          ein installierbares Package erstellt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --file-associations <Dateipfad>\n          Pfad zu einer Eigenschaftendatei mit einer Liste von Schl\u00FCssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Mit den Schl\u00FCsseln "extension", "mime-type", "icon" und "description"\n          kann die Verkn\u00FCpfung beschrieben werden.\n          Diese Option kann mehrmals verwendet werden.\n  --install-dir <Verzeichnispfad>\n          {4}  --license-file <Dateipfad>\n          Pfad zur Lizenzdatei\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --resource-dir <Verzeichnispfad>\n          Pfad zum \u00DCberschreiben von jpackage-Ressourcen\n          Symbole, Vorlagendateien und weitere Ressourcen von jpackage k\u00F6nnen\n          durch Hinzuf\u00FCgen von Ersetzungsressourcen zu diesem Verzeichnis \u00FCberschrieben werden.\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --runtime-image <Verzeichnispfad>\n          Pfad des zu installierenden vordefinierten Laufzeitimages\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Option muss beim Erstellen eines Laufzeitpackages angegeben werden.\n\nPlattformabh\u00E4ngige Optionen f\u00FCr das Erstellen des Anwendungspackages:\n{3}
-
-MSG_Help_win_launcher=\nPlattformabh\u00E4ngige Option f\u00FCr das Erstellen des Anwendungs-Launchers:\n  --win-console\n          Erstellt einen Konsolen-Launcher f\u00FCr die Anwendung. Sollte f\u00FCr\n          Anwendungen angegeben werden, die Konsoleninteraktionen erfordern\n
-MSG_Help_win_install=\  --win-dir-chooser\n          F\u00FCgt ein Dialogfeld hinzu, in dem der Benutzer das Verzeichnis ausw\u00E4hlen kann, in dem\n          das Produkt installiert wird.\n  --win-help-url <URL>\n          URL, unter der der Benutzer weitere Informationen oder technische Unterst\u00FCtzung erh\u00E4lt\n  --win-menu\n          Anforderung zum Hinzuf\u00FCgen einer Startmen\u00FCverkn\u00FCpfung f\u00FCr diese Anwendung\n  --win-menu-group <Men\u00FCgruppenname>\n          Startmen\u00FCgruppe, in der diese Anwendung abgelegt wird\n  --win-per-user-install\n          Anforderung zum Ausf\u00FChren einer Installation pro Benutzer\n  --win-shortcut\n          Anforderung zum Hinzuf\u00FCgen einer Desktopverkn\u00FCpfung f\u00FCr diese Anwendung\n  --win-shortcut-prompt\n          F\u00FCgt ein Dialogfeld hinzu, in dem der Benutzer ausw\u00E4hlen kann, ob Verkn\u00FCpfungen\n          vom Installationsprogramm erstellt werden sollen.\n  --win-update-url <URL>\n          URL verf\u00FCgbarer Anwendungsupdateinformationen\n  --win-upgrade-uuid <ID-Zeichenfolge>\n          UUID, die mit Upgrades f\u00FCr dieses Package verkn\u00FCpft ist\n
-MSG_Help_win_install_dir=Relativer Unterpfad unter dem Standardinstallationsverzeichnis\n
-MSG_Help_mac_install=\  --mac-dmg-content <Pfad zu zus\u00E4tzlichem Inhalt>[,<Pfad zu zus\u00E4tzlichem Inhalt>...]\n          Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n          Diese Option kann mehrmals verwendet werden. \n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID-Zeichenfolge>\n          Eine ID, die die Anwendung f\u00FCr macOS eindeutig identifiziert\n          Standardwert ist der Hauptklassenname.\n          Es d\u00FCrfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n          und Punkte (.) verwendet werden.\n  --mac-package-name <Namenszeichenfolge>\n          Name der Anwendung, wie in der Men\u00FCleiste angezeigt\n          Dieser kann vom Anwendungsnamen abweichen.\n          Er darf maximal 15 Zeichen enthalten und muss f\u00FCr die Anzeige\n          in der Men\u00FCleiste und im Infofenster der Anwendung geeignet sein.\n          Standardwert: Anwendungsname.\n  --mac-package-signing-prefix <Pr\u00E4fixzeichenfolge>\n          Beim Signieren des Anwendungspackages wird dieser Wert\n          allen zu signierenden Komponenten ohne vorhandene\n          Package-ID als Pr\u00E4fix vorangestellt.\n  --mac-sign\n          Anforderung zum Signieren des Packages\n  --mac-signing-keychain <Schl\u00FCsselbundname>\n          Name des Schl\u00FCsselbundes f\u00FCr die Suche nach der Signaturidentit\u00E4t\n          Bei fehlender Angabe werden die Standardschl\u00FCsselbunde verwendet.\n  --mac-signing-key-user-name <Teamname>\n          Team- oder Benutzernamensteil der Apple-Signaturidentit\u00E4ten.\n  --mac-app-store\n          Gibt an, dass die jpackage-Ausgabe f\u00FCr den\n          Mac App Store bestimmt ist.\n  --mac-entitlements <Dateipfad>\n          Pfad zu einer Datei mit Berechtigungen, die beim Signieren\n          von ausf\u00FChrbaren Dateien und Librarys im Bundle verwendet werden sollen.\n  --mac-app-category <Kategoriezeichenfolge>\n          Zeichenfolge f\u00FCr das Erstellen von LSApplicationCategoryType in\n          Anwendungs-plist. Standardwert: "utilities".\n
-MSG_Help_linux_install=\  --linux-package-name <Packagename>\n          Name f\u00FCr das Linux-Package, Standardwert: Anwendungsname\n  --linux-deb-maintainer <E-Mail-Adresse>\n          Maintainer f\u00FCr .deb-Package\n  --linux-menu-group <Men\u00FCgruppenname>\n          Men\u00FCgruppe, in der diese Anwendung abgelegt wird\n  --linux-package-deps\n          Erforderliche Packages oder Funktionen f\u00FCr die Anwendung\n  --linux-rpm-license-type <Typzeichenfolge>\n          Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n  --linux-app-release <Releasewert>\n          Releasewert der RPM-SPEC-Datei <Name> oder \n          Debian-Revisionswert der DEB-Kontrolldatei\n  --linux-app-category <Kategoriewert>\n          Gruppenwert der RPM-SPEC-Datei <Name> oder \n          Abschnittswert der DEB-Kontrolldatei\n  --linux-shortcut\n          Erstellt eine Verkn\u00FCpfung f\u00FCr die Anwendung.\n
-MSG_Help_mac_linux_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung\n
-MSG_Help_default_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung auf OS X\n          oder Linux. Relativer Unterpfad des Installationsverzeichnisses der\n          Anwendung wie "Programme" oder "AppData" unter Windows.\n
-MSG_Help_no_args=Verwendung: jpackage <Optionen>\nVerwenden Sie jpackage --help (oder -h), um eine Liste m\u00F6glicher Optionen aufzurufen
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
index 8a7239cab95..6ed6c2c90a9 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,239 @@
 #
 #
 
-MSG_Help=\u4F7F\u7528\u65B9\u6CD5: jpackage <options>\n\n\u4F7F\u7528\u4F8B:\n--------------\n    \u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u306B\u9069\u3057\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n        \u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage -n name -p modulePath -m moduleName/className\n        \u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u4E8B\u524D\u4F5C\u6210\u3055\u308C\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u304B\u3089:\n            jpackage -n name --app-image appImageDir\n    \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u751F\u6210:\n        \u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        \u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        jlink\u306B\u72EC\u81EA\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u306B\u306F\u3001jlink\u3092\u5225\u500B\u306B\u5B9F\u884C\u3057\u307E\u3059\u3002\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Java\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n        jpackage -n name --runtime-image <runtime-image>\n\n\u4E00\u822C\u7684\u306A\u30AA\u30D7\u30B7\u30E7\u30F3:\n  @<filename> \n          \u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30E2\u30FC\u30C9 \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --type -t <type> \n          \u4F5C\u6210\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30BF\u30A4\u30D7\n          \u6709\u52B9\u306A\u5024: {1} \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u306E\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30BF\u30A4\u30D7\u304C\u4F5C\u6210\u3055\u308C\u307E\u3059\n  --app-version <version>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\n  --copyright <copyright string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B3\u30D4\u30FC\u30E9\u30A4\u30C8\n  --description <description string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8AAC\u660E\n  --help -h \n          \u4F7F\u7528\u65B9\u6CD5\u30C6\u30AD\u30B9\u30C8\u3068\u73FE\u5728\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u3068\u8AAC\u660E\u3092\n          \u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u3001\u7D42\u4E86\u3057\u307E\u3059\n  --icon <file path>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30A4\u30B3\u30F3\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --name \
--n <name>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\n  --dest -d <destination path>\n          \u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u914D\u7F6E\u3055\u308C\u308B\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u73FE\u5728\u306E\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n  --temp <directory path>\n          \u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3055\u308C\u308B\u65B0\u898F\u307E\u305F\u306F\u7A7A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u6307\u5B9A\u3057\u305F\u5834\u5408\u3001\u30BF\u30B9\u30AF\u5B8C\u4E86\u6642\u306B\u4E00\u6642\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u524A\u9664\u3055\u308C\u306A\u3044\u305F\u3081\n          \u624B\u52D5\u3067\u524A\u9664\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u4E00\u6642\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4F5C\u6210\u3055\u308C\n          \u30BF\u30B9\u30AF\u5B8C\u4E86\u6642\u306B\u524A\u9664\u3055\u308C\u307E\u3059\u3002\n  --vendor <vendor string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30D9\u30F3\u30C0\u30FC\n  --verbose\n          \u8A73\u7D30\u306A\u51FA\u529B\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n  --version\n          \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n\n\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --add-modules <module name>[,<module name>...]\n          \u8FFD\u52A0\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30AB\u30F3\u30DE(",")\u533A\u5207\u308A\u30EA\u30B9\u30C8\n          \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30EA\u30B9\u30C8\u3068\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB(\u6307\u5B9A\u3057\u305F\u5834\u5408)\n          \u304C--add-module\u5F15\u6570\u3068\u3057\u3066jlink\u306B\u6E21\u3055\u308C\u307E\u3059\u3002\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u307F(--module\u304C\n          \u6307\u5B9A\u3055\u308C\u305F\u5834\u5408)\u3001\u307E\u305F\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BB\u30C3\u30C8(--main-jar\u304C \n          \u6307\u5B9A\u3055\u308C\u305F\u5834\u5408)\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --module-path -p <module path>...\n          \u30D1\u30B9\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\n          \u5404\u30D1\u30B9\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u307E\u305F\u306F\n          \u30E2\u30B8\u30E5\u30E9jar\u3078\u306E\u30D1\u30B9\u3067\u3059\u3002\n          (\u5404\u30D1\u30B9\u306F\u3001\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9\u3067\u3059\u3002)\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --jlink-options <jlink options> \n          jlink\u306B\u6E21\u3059\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30B9\u30DA\u30FC\u30B9\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8 \n          \u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001"--strip-native-commands \n          --strip-debug --no-man-pages \
---no-header-files"\u3002 \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --runtime-image <directory path>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\u30B3\u30D4\u30FC\u3055\u308C\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\n          \u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          --runtime-image\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001jpackage\u306Fjlink\u3092\u5B9F\u884C\u3057\u3001\n          \u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u307E\u3059:\n          --strip-debug\u3001--no-header-files\u3001--no-man-pages\u304A\u3088\u3073\n          --strip-native-commands\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --input -i <directory path>\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3080\u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3055\u308C\u307E\u3059\u3002\n  --app-content <additional content>[,<additional content>...]\n          \u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA(\u3042\u308B\u3044\u306F\u4E21\u65B9)\u306E\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30DA\u30A4\u30ED\u30FC\u30C9\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --add-launcher <launcher name>=<file path>\n          \u30E9\u30F3\u30C1\u30E3\u306E\u540D\u524D\u3001\u304A\u3088\u3073\u30AD\u30FC\u3001\u5024\u306E\u30DA\u30A2\u306E\u30EA\u30B9\u30C8\n          \u3092\u542B\u3080\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30AD\u30FC"module"\u3001"main-jar"\u3001"main-class"\u3001\n          "arguments"\u3001"java-options"\u3001"app-version"\u3001"icon"\u3001\n          "win-console"\u3001"win-shortcut"\u3001"win-menu"\u3001\n          "linux-app-category"\u304A\u3088\u3073"linux-shortcut"\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n          \u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u5143\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u8FFD\u52A0\u3059\u308B\u304B\u3001\u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\n          \u4F7F\u7528\u3057\u3066\u5143\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4E0A\u66F8\u304D\u3057\u3066\u3001\u8FFD\u52A0\u306E\u4EE3\u66FF\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\n          \
-\u30E1\u30A4\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u306F\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u304B\u3089\u4F5C\u6210\u3055\u308C\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u8FFD\u52A0\u306E\u4EE3\u66FF\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3067\u304D\u3001\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8907\u6570\u56DE\u4F7F\u7528\u3057\u3066\n          \u8907\u6570\u306E\u8FFD\u52A0\u306E\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3067\u304D\u307E\u3059\u3002 \n  --arguments <main class arguments>\n          \u30E9\u30F3\u30C1\u30E3\u306B\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u5F15\u6570\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306B\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306B\u6E21\u3059\n          \u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u5F15\u6570\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --java-options <java options>\n          Java\u30E9\u30F3\u30BF\u30A4\u30E0\u306B\u6E21\u3059\u30AA\u30D7\u30B7\u30E7\u30F3\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --main-class <class name>\n          \u5B9F\u884C\u3059\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u4FEE\u98FE\u540D\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u3001--main-jar\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3060\u3051\u3067\u3059\u3002\n  --main-jar <main jar file>\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u542B\u3080\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3JAR\n          (\u5165\u529B\u30D1\u30B9\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9\u3068\u3057\u3066\u6307\u5B9A)\n          --module\u307E\u305F\u306F--main-jar\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u4E21\u65B9\u306F\n          \u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n  --module -m <module name>[/<main class>]\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB(\u304A\u3088\u3073\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9)\n          \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306B\u7F6E\u304B\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\n          Java\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u3067\u30EA\u30F3\u30AF\u3055\u308C\u307E\u3059\u3002--module\u307E\u305F\u306F--main-jar\n          \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u4E21\u65B9\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n{2}\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --about-url <url>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30DB\u30FC\u30E0\u30DA\u30FC\u30B8\u306EURL\n  --app-image <directory path>\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u53EF\u80FD\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3059\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u5834\u6240\n          \
-(\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --file-associations <file path>\n          \u30AD\u30FC\u3001\u5024\u306E\u30DA\u30A2\u306E\u30EA\u30B9\u30C8\u3092\u542B\u3080\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30AD\u30FC"extension"\u3001"mime-type"\u3001"icon"\u3001"description"\n          \u3092\u4F7F\u7528\u3057\u3066\u95A2\u9023\u4ED8\u3051\u3092\u8A18\u8FF0\u3067\u304D\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --resource-dir <directory path>\n          \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9jpackage\u30EA\u30BD\u30FC\u30B9\u3078\u306E\u30D1\u30B9\n          \u30A2\u30A4\u30B3\u30F3\u3001\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073jpackage\u306E\u305D\u306E\u4ED6\u306E\u30EA\u30BD\u30FC\u30B9\u306F\u3001\n          \u3053\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u7F6E\u63DB\u30EA\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u3067\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3067\u304D\u307E\u3059\u3002\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --runtime-image <directory path>\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u6642\u306B\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u30AA\u30D7\u30B7\u30E7\u30F3:\n{3}
+MSG_Help=Usage: jpackage <options>\n\
+\n\
+Sample usages:\n\
+--------------\n\
+\    Generate an application package suitable for the host system:\n\
+\        For a modular application:\n\
+\            jpackage -n name -p modulePath -m moduleName/className\n\
+\        For a non-modular application:\n\
+\            jpackage -i inputDir -n name \\\n\
+\                --main-class className --main-jar myJar.jar\n\
+\        From a pre-built application image:\n\
+\            jpackage -n name --app-image appImageDir\n\
+\    Generate an application image:\n\
+\        For a modular application:\n\
+\            jpackage --type app-image -n name -p modulePath \\\n\
+\                -m moduleName/className\n\
+\        For a non-modular application:\n\
+\            jpackage --type app-image -i inputDir -n name \\\n\
+\                --main-class className --main-jar myJar.jar\n\
+\        To provide your own options to jlink, run jlink separately:\n\
+\            jlink --output appRuntimeImage -p modulePath \\\n\
+\                --add-modules moduleName \\\n\
+\                --no-header-files [<additional jlink options>...]\n\
+\            jpackage --type app-image -n name \\\n\
+\                -m moduleName/className --runtime-image appRuntimeImage\n\
+\    Generate a Java runtime package:\n\
+\        jpackage -n name --runtime-image <runtime-image>\n\
+\n\
+Generic Options:\n\
+\  @<filename> \n\
+\          Read options and/or mode from a file \n\
+\          This option can be used multiple times.\n\
+\  --type -t <type> \n\
+\          The type of package to create\n\
+\          Valid values are: {1} \n\
+\          If this option is not specified a platform dependent\n\
+\          default type will be created.\n\
+\  --app-version <version>\n\
+\          Version of the application and/or package\n\
+\  --copyright <copyright string>\n\
+\          Copyright for the application\n\
+\  --description <description string>\n\
+\          Description of the application\n\
+\  --help -h \n\
+\          Print the usage text with a list and description of each valid\n\
+\          option for the current platform to the output stream, and exit\n\
+\  --icon <file path>\n\
+\          Path of the icon of the application package\n\
+\          (absolute path or relative to the current directory)\n\
+\  --name -n <name>\n\
+\          Name of the application and/or package\n\
+\  --dest -d <destination path>\n\
+\          Path where generated output file is placed\n\
+\          (absolute path or relative to the current directory)\n\
+\          Defaults to the current working directory.\n\
+\  --temp <directory path>\n\
+\          Path of a new or empty directory used to create temporary files\n\
+\          (absolute path or relative to the current directory)\n\
+\          If specified, the temp dir will not be removed upon the task\n\
+\          completion and must be removed manually.\n\
+\          If not specified, a temporary directory will be created and\n\
+\          removed upon the task completion.\n\
+\  --vendor <vendor string>\n\
+\          Vendor of the application\n\
+\  --verbose\n\
+\          Enables verbose output\n\
+\  --version\n\
+\          Print the product version to the output stream and exit.\n\
+\n\
+\Options for creating the runtime image:\n\
+\  --add-modules <module name>[,<module name>...]\n\
+\          A comma (",") separated list of modules to add\n\
+\          This module list, along with the main module (if specified)\n\
+\          will be passed to jlink as the --add-module argument.\n\
+\          If not specified, either just the main module (if --module is\n\
+\          specified), or the default set of modules (if --main-jar is \n\
+\          specified) are used.\n\
+\          This option can be used multiple times.\n\
+\  --module-path -p <module path>...\n\
+\          A {0} separated list of paths\n\
+\          Each path is either a directory of modules or the path to a\n\
+\          modular jar.\n\
+\          (Each path is absolute or relative to the current directory.)\n\
+\          This option can be used multiple times.\n\
+\  --jlink-options <jlink options> \n\
+\          A space separated list of options to pass to jlink \n\
+\          If not specified, defaults to "--strip-native-commands \n\
+\          --strip-debug --no-man-pages --no-header-files". \n\
+\          This option can be used multiple times.\n\
+\  --runtime-image <directory path>\n\
+\          Path of the predefined runtime image that will be copied into\n\
+\          the application image\n\
+\          (absolute path or relative to the current directory)\n\
+\          If --runtime-image is not specified, jpackage will run jlink to\n\
+\          create the runtime image using options:\n\
+\          --strip-debug, --no-header-files, --no-man-pages, and\n\
+\          --strip-native-commands.\n\
+\n\
+\Options for creating the application image:\n\
+\  --input -i <directory path>\n\
+\          Path of the input directory that contains the files to be packaged\n\
+\          (absolute path or relative to the current directory)\n\
+\          All files in the input directory will be packaged into the\n\
+\          application image.\n\
+\  --app-content <additional content>[,<additional content>...]\n\
+\          A comma separated list of paths to files and/or directories\n\
+\          to add to the application payload.\n\
+\          This option can be used more than once.\n\
+\n\
+\Options for creating the application launcher(s):\n\
+\  --add-launcher <launcher name>=<file path>\n\
+\          Name of launcher, and a path to a Properties file that contains\n\
+\          a list of key, value pairs\n\
+\          (absolute path or relative to the current directory)\n\
+\          The keys "module", "main-jar", "main-class", "description",\n\
+\          "arguments", "java-options", "app-version", "icon",\n\
+\          "win-console", "win-shortcut", "win-menu",\n\
+\          "linux-app-category", and "linux-shortcut" can be used.\n\
+\          These options are added to, or used to overwrite, the original\n\
+\          command line options to build an additional alternative launcher.\n\
+\          The main application launcher will be built from the command line\n\
+\          options. Additional alternative launchers can be built using\n\
+\          this option, and this option can be used multiple times to\n\
+\          build multiple additional launchers. \n\
+\  --arguments <main class arguments>\n\
+\          Command line arguments to pass to the main class if no command\n\
+\          line arguments are given to the launcher\n\
+\          This option can be used multiple times.\n\
+\  --java-options <java options>\n\
+\          Options to pass to the Java runtime\n\
+\          This option can be used multiple times.\n\
+\  --main-class <class name>\n\
+\          Qualified name of the application main class to execute\n\
+\          This option can only be used if --main-jar is specified.\n\
+\  --main-jar <main jar file>\n\
+\          The main JAR of the application; containing the main class\n\
+\          (specified as a path relative to the input path)\n\
+\          Either --module or --main-jar option can be specified but not\n\
+\          both.\n\
+\  --module -m <module name>[/<main class>]\n\
+\          The main module (and optionally main class) of the application\n\
+\          This module must be located on the module path.\n\
+\          When this option is specified, the main module will be linked\n\
+\          in the Java runtime image.  Either --module or --main-jar\n\
+\          option can be specified but not both.\n\
+{2}\n\
+\Options for creating the application package:\n\
+\  --about-url <url>\n\
+\          URL of the application''s home page\n\
+\  --app-image <directory path>\n\
+\          Location of the predefined application image that is used\n\
+\          to build an installable package\n\
+\          (absolute path or relative to the current directory)\n\
+\  --file-associations <file path>\n\
+\          Path to a Properties file that contains list of key, value pairs\n\
+\          (absolute path or relative to the current directory)\n\
+\          The keys "extension", "mime-type", "icon", and "description"\n\
+\          can be used to describe the association.\n\
+\          This option can be used multiple times.\n\
+\  --install-dir <directory path>\n\
+\          {4}\
+\  --license-file <file path>\n\
+\          Path to the license file\n\
+\          (absolute path or relative to the current directory)\n\
+\  --resource-dir <directory path>\n\
+\          Path to override jpackage resources\n\
+\          Icons, template files, and other resources of jpackage can be\n\
+\          over-ridden by adding replacement resources to this directory.\n\
+\          (absolute path or relative to the current directory)\n\
+\  --runtime-image <directory path>\n\
+\          Path of the predefined runtime image to install\n\
+\          (absolute path or relative to the current directory)\n\
+\          Option is required when creating a runtime package.\n\
+\n\
+\Platform dependent options for creating the application package:\n\
+{3}
 
 MSG_Help_win_launcher=\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --win-console\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B3\u30F3\u30BD\u30FC\u30EB\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u30B3\u30F3\u30BD\u30FC\u30EB\u30FB\n          \u30A4\u30F3\u30BF\u30E9\u30AF\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n
-MSG_Help_win_install=\  --win-dir-chooser\n          \u30E6\u30FC\u30B6\u30FC\u304C\u88FD\u54C1\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E\u3059\u308B\u305F\u3081\u306E\n          \u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --win-help-url <url>\n          \u30E6\u30FC\u30B6\u30FC\u304C\u8A73\u7D30\u60C5\u5831\u307E\u305F\u306F\u6280\u8853\u7684\u306A\u30B5\u30DD\u30FC\u30C8\u3092\u53D6\u5F97\u3067\u304D\u308BURL\n  --win-menu\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B9\u30BF\u30FC\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-menu-group <menu group name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u914D\u7F6E\u3059\u308B\u30B9\u30BF\u30FC\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --win-per-user-install\n          \u30E6\u30FC\u30B6\u30FC\u3054\u3068\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u5B9F\u884C\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-shortcut\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-shortcut-prompt\n          \u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u3067\u4F5C\u6210\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u30E6\u30FC\u30B6\u30FC\u304C\u9078\u629E\u3067\u304D\u308B\u3088\u3046\u306B\u3059\u308B\n          \u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --win-update-url <url>\n          \u4F7F\u7528\u53EF\u80FD\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u66F4\u65B0\u60C5\u5831\u306EURL\n  --win-upgrade-uuid <id string>\n          \u3053\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u305FUUID\n
+MSG_Help_win_install=\
+\  --win-dir-chooser\n\
+\          Adds a dialog to enable the user to choose a directory in which\n\
+\          the product is installed.\n\
+\  --win-help-url <url>\n\
+\          URL where user can obtain further information or technical support\n\
+\  --win-menu\n\
+\          Request to add a Start menu shortcut for this application\n\
+\  --win-menu-group <menu group name>\n\
+\          Start Menu group this application is placed in\n\
+\  --win-per-user-install\n\
+\          Request to perform an install on a per-user basis\n\
+\  --win-shortcut\n\
+\          Request to add desktop shortcut for this application\n\
+\  --win-shortcut-prompt\n\
+\          Adds a dialog to enable the user to choose if shortcuts\n\
+\          will be created by installer.\n\
+\  --win-update-url <url>\n\
+\          URL of available application update information\n\
+\  --win-upgrade-uuid <id string>\n\
+\          UUID associated with upgrades for this package\n\
+
 MSG_Help_win_install_dir=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240\u306E\u4E0B\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\n
-MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          dmg\u306B\u53C2\u7167\u3055\u308C\u305F\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u3059\u3079\u3066\u542B\u3081\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 \n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          macOS\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E00\u610F\u306B\u8B58\u5225\u3059\u308BID\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n          \u82F1\u6570\u5B57(A-Z\u3001a-z\u30010-9)\u3001\u30CF\u30A4\u30D5\u30F3(-)\u304A\u3088\u3073\u30D4\u30EA\u30AA\u30C9(.)\u6587\u5B57\u306E\u307F\n          \u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --mac-package-name <name string>\n          \u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u306B\u8868\u793A\u3055\u308C\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\n          \u3053\u306E\u540D\u524D\u306F16\u6587\u5B57\u672A\u6E80\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u304A\u3088\u3073\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\n          \u8868\u793A\u3059\u308B\u306E\u306B\u9069\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u969B\u3001\n          \u65E2\u5B58\u306E\u30D1\u30C3\u30B1\u30FC\u30B8ID\u306E\u306A\u3044\u7F72\u540D\u304C\u5FC5\u8981\u306A\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3001\n          \u3053\u306E\u5024\u304C\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4ED8\u3051\u3089\u308C\u307E\u3059\u3002\n  --mac-sign\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u3088\u3046\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --mac-signing-keychain <keychain name>\n          \u7F72\u540D\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u3092\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u306E\u540D\u524D\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u6A19\u6E96\u306E\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n  --mac-signing-key-user-name <team name>\n          Apple\u7F72\u540D\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u30C1\u30FC\u30E0\u307E\u305F\u306F\u30E6\u30FC\u30B6\u30FC\u540D\u90E8\u5206\u3002\n  --mac-app-store\n          jpackage\u51FA\u529B\u304CMac App Store\u7528\u3067\u3042\u308B\u3053\u3068\n          \u3092\u793A\u3057\u307E\u3059\u3002\n  --mac-entitlements <file path>\n          \u30D0\u30F3\u30C9\u30EB\u306E\u5B9F\u884C\u53EF\u80FD\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30E9\u30A4\u30D6\u30E9\u30EA\u306E\u7F72\u540D\u6642\u306B\n          \u4F7F\u7528\u3059\u308B\u6A29\u9650\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3002\n  --mac-app-category <category string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306Eplist\u306ELSApplicationCategoryType\u3092\u751F\u6210\u3059\u308B\u969B\u306B\u4F7F\u7528\u3059\u308B\u6587\u5B57\u5217\u3002\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F"utilities"\u3067\u3059\u3002\n
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\n  --linux-deb-maintainer <email address>\n          .deb\u30D1\u30C3\u30B1\u30FC\u30B8\u306EMaintainer\n  --linux-menu-group <menu-group-name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u914D\u7F6E\u3055\u308C\u3066\u3044\u308B\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --linux-package-deps\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u6A5F\u80FD\n  --linux-rpm-license-type <type string>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u30BF\u30A4\u30D7(RPM .spec\u306E"License: <value>")\n  --linux-app-release <release value>\n          RPM <name>.spec\u30D5\u30A1\u30A4\u30EB\u306E\u30EA\u30EA\u30FC\u30B9\u5024\u307E\u305F\u306F\n          DEB\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u30FB\u30D5\u30A1\u30A4\u30EB\u306EDebian\u30EA\u30D3\u30B8\u30E7\u30F3\u5024\u3002\n  --linux-app-category <category value>\n          RPM <name>.spec\u30D5\u30A1\u30A4\u30EB\u306E\u30B0\u30EB\u30FC\u30D7\u5024\u307E\u305F\u306F \n           DEB\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u5024\n  --linux-shortcut\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\n
+
+MSG_Help_mac_install=\
+\  --mac-dmg-content <additional content path>[,<additional content path>...]\n\
+\          Include all the referenced content in the dmg.\n\
+\          This option can be used multiple times. \n\
+
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          MacOS\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E00\u610F\u306B\u8B58\u5225\u3059\u308BID\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n          \u82F1\u6570\u5B57(A-Z\u3001a-z\u30010-9)\u3001\u30CF\u30A4\u30D5\u30F3(-)\n          \u304A\u3088\u3073\u30D4\u30EA\u30AA\u30C9(.)\u6587\u5B57\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --mac-package-name <name string>\n          \u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u306B\u8868\u793A\u3055\u308C\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\n          \u3053\u306E\u540D\u524D\u306F16\u6587\u5B57\u672A\u6E80\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\n          \u304A\u3088\u3073\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A\u3059\u308B\u306E\u306B\u9069\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u969B\u3001\u65E2\u5B58\u306E\u30D1\u30C3\u30B1\u30FC\u30B8ID\u306E\u306A\u3044\n          \u7F72\u540D\u304C\u5FC5\u8981\u306A\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3001\n          \u3053\u306E\u5024\u304C\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4ED8\u3051\u3089\u308C\u307E\u3059\u3002\n  --mac-sign\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u3088\u3046\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  \n\
+\  --mac-signing-keychain <keychain name>\n\
+\          Name of the keychain to search for the signing identity\n\
+\          If not specified, the standard keychains are used.\n\
+\  --mac-signing-key-user-name <team name>\n\
+\          Team or user name portion of Apple signing identities.\n\
+\  --mac-app-store\n\
+\          Indicates that the jpackage output is intended for the\n\
+\          Mac App Store.\n\
+\  --mac-entitlements <file path>\n\
+\          Path to file containing entitlements to use when signing\n\
+\          executables and libraries in the bundle.\n\
+\  --mac-app-category <category string>\n\
+\          String used to construct LSApplicationCategoryType in\n\
+\          application plist.  The default value is "utilities".\n\
+
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\n  --linux-deb-maintainer <email address>\n          .deb\u30D1\u30C3\u30B1\u30FC\u30B8\u306EMaintainer\n  --linux-menu-group <menu-group-name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u914D\u7F6E\u3055\u308C\u3066\u3044\u308B\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --linux-package-deps\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u6A5F\u80FD\n  --linux-rpm-license-type <type string>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u30BF\u30A4\u30D7(RPM .spec\u306E"License: <value>")\n\
+\  --linux-app-release <release value>\n\
+\          Release value of the RPM <name>.spec file or \n\
+\          Debian revision value of the DEB control file\n\
+\  --linux-app-category <category value>\n\
+\          Group value of the RPM <name>.spec file or \n\
+\          Section value of DEB control file\n\
+\  --linux-shortcut\n\
+\          Creates a shortcut for the application.\n\
+
 MSG_Help_mac_linux_install_dir=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u7D76\u5BFE\u30D1\u30B9\n
 MSG_Help_default_install_dir=OS X\u307E\u305F\u306FLinux\u4E0A\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u7D76\u5BFE\u30D1\u30B9\u3002\n          "\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D5\u30A1\u30A4\u30EB"\u3084"AppData"\u306A\u3069\u3001Windows\u4E0A\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\u3002\n
 MSG_Help_no_args=\u4F7F\u7528\u65B9\u6CD5: jpackage <options>\n\u5229\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001jpackage --help (or -h)\u3092\u4F7F\u7528\u3057\u307E\u3059
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
index c863bd5e6f4..73a3db560ed 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,17 +24,238 @@
 #
 #
 
-MSG_Help=\u7528\u6CD5\uFF1Ajpackage <options>\n\n\u793A\u4F8B\u7528\u6CD5:\n--------------\n    \u751F\u6210\u9002\u5408\u4E3B\u673A\u7CFB\u7EDF\u7684\u5E94\u7528\u7A0B\u5E8F\u5305\uFF1A\n        \u5BF9\u4E8E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage -n name -p modulePath -m moduleName/className\n        \u5BF9\u4E8E\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u4ECE\u9884\u6784\u5EFA\u7684\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\uFF1A\n            jpackage -n name --app-image appImageDir\n    \u751F\u6210\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\uFF1A\n        \u5BF9\u4E8E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        \u5BF9\u4E8E\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u8981\u4E3A jlink \u63D0\u4F9B\u60A8\u81EA\u5DF1\u7684\u9009\u9879\uFF0C\u8BF7\u5355\u72EC\u8FD0\u884C jlink\uFF1A\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    \u751F\u6210 Java \u8FD0\u884C\u65F6\u7A0B\u5E8F\u5305\uFF1A\n        jpackage -n name --runtime-image <runtime-image>\n\n\u4E00\u822C\u9009\u9879\uFF1A\n  @<filename> \n          \u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C/\u6216\u6A21\u5F0F \n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --type -t <type> \n          \u8981\u521B\u5EFA\u7684\u7A0B\u5E8F\u5305\u7684\u7C7B\u578B\n          \u6709\u6548\u503C\u4E3A\uFF1A{1} \n          \u5982\u679C\u672A\u6307\u5B9A\u6B64\u9009\u9879\uFF0C\u5219\u5C06\u521B\u5EFA\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\n          \u9ED8\u8BA4\u7C7B\u578B\u3002\n  --app-version <version>\n          \u5E94\u7528\u7A0B\u5E8F\u548C/\u6216\u7A0B\u5E8F\u5305\u7684\u7248\u672C\n  --copyright <copyright string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u7248\u6743\n  --description <description string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u8BF4\u660E\n  --help -h \n          \u5C06\u7528\u6CD5\u6587\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\uFF0C\u7528\u6CD5\u6587\u672C\u4E2D\u5305\u542B\n          \u9002\u7528\u4E8E\u5F53\u524D\u5E73\u53F0\u7684\u6BCF\u4E2A\u6709\u6548\u9009\u9879\u7684\u5217\u8868\u548C\u8BF4\u660E\n  --icon <file path>\n          \u5E94\u7528\u7A0B\u5E8F\u5305\u56FE\u6807\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --name -n <name>\n          \u5E94\u7528\u7A0B\u5E8F\u548C/\u6216\u7A0B\u5E8F\u5305\u7684\u540D\u79F0\n  --dest -d <destination path>\n          \u7528\u6765\u653E\u7F6E\u6240\u751F\u6210\u7684\u8F93\u51FA\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u9ED8\u8BA4\u4E3A\u5F53\u524D\u7684\u5DE5\u4F5C\u76EE\u5F55\u3002\n  --temp <directory path>\n          \u7528\u6765\u521B\u5EFA\u4E34\u65F6\u6587\u4EF6\u7684\u65B0\u76EE\u5F55\u6216\u7A7A\u767D\u76EE\u5F55\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5982\u679C\u6307\u5B9A\uFF0C\u5219\u5728\u4EFB\u52A1\u5B8C\u6210\u65F6\u5C06\u4E0D\u5220\u9664\u4E34\u65F6\u76EE\u5F55\uFF0C\n          \u5FC5\u987B\u624B\u52A8\u5220\u9664\u4E34\u65F6\u76EE\u5F55\u3002\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u5C06\u521B\u5EFA\u4E00\u4E2A\u4E34\u65F6\u76EE\u5F55\uFF0C\n          \
-\u5E76\u5728\u4EFB\u52A1\u5B8C\u6210\u65F6\u5220\u9664\u8BE5\u4E34\u65F6\u76EE\u5F55\u3002\n  --vendor <vendor string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4F9B\u5E94\u5546\n  --verbose\n          \u542F\u7528\u8BE6\u7EC6\u7684\u8F93\u51FA\n  --version\n          \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\u3002\n\n\u7528\u6765\u521B\u5EFA\u8FD0\u884C\u65F6\u6620\u50CF\u7684\u9009\u9879\uFF1A\n  --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n          \u8981\u6DFB\u52A0\u7684\u6A21\u5757\u7684\u9017\u53F7 (",") \u5206\u9694\u5217\u8868\n          \u6B64\u6A21\u5757\u5217\u8868\u8FDE\u540C\u4E3B\u6A21\u5757\uFF08\u5982\u679C\u6307\u5B9A\uFF09\n          \u5C06\u4F5C\u4E3A --add-module \u53C2\u6570\u4F20\u9012\u5230 jlink\u3002\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u4EC5\u4F7F\u7528\u4E3B\u6A21\u5757\uFF08\u5982\u679C\u6307\u5B9A\u4E86 --module\uFF09\uFF0C\n          \u6216\u8005\u4F7F\u7528\u9ED8\u8BA4\u7684\u6A21\u5757\u96C6\uFF08\u5982\u679C\u6307\u5B9A\u4E86  \n          --main-jar\uFF09\u3002\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --module-path -p <module path>...\n          \u8DEF\u5F84\u7684 {0} \u5206\u9694\u5217\u8868\n          \u6BCF\u4E2A\u8DEF\u5F84\u8981\u4E48\u662F\u6A21\u5757\u7684\u76EE\u5F55\uFF0C\u8981\u4E48\u662F\n          \u6A21\u5757 jar \u7684\u8DEF\u5F84\u3002\n          \uFF08\u6BCF\u4E2A\u8DEF\u5F84\u53EF\u4EE5\u662F\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u4E5F\u53EF\u4EE5\u662F\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\u3002\uFF09\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --jlink-options <jlink \u9009\u9879> \n          \u8981\u4F20\u9012\u7ED9 jlink \u7684\u9009\u9879\u5217\u8868\uFF08\u7528\u7A7A\u683C\u5206\u9694\uFF09 \n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u9ED8\u8BA4\u4E3A "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files"\u3002 \n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --runtime-image <directory path>\n          \u5C06\u590D\u5236\u5230\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u9884\u5B9A\u4E49\n          \u8FD0\u884C\u65F6\u6620\u50CF\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5982\u679C\u672A\u6307\u5B9A --runtime-image\uFF0Cjpackage \u5C06\u8FD0\u884C jlink \u4EE5\n          \u4F7F\u7528\u5982\u4E0B\u9009\u9879\u521B\u5EFA\u8FD0\u884C\u65F6\u6620\u50CF\uFF1A\n          --strip-debug\u3001--no-header-files\u3001--no-man-pages \u548C \n          --strip-native-commands\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u9009\u9879\uFF1A\n  --input -i <directory path>\n          \u5305\u542B\u8981\u6253\u5305\u7684\u6587\u4EF6\u7684\u8F93\u5165\u76EE\u5F55\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u8F93\u5165\u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5C06\u6253\u5305\u5230\n          \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E2D\u3002\n  --app-content <additional content>[,<additional content>...]\n          \u8981\u6DFB\u52A0\u5230\u5E94\u7528\u7A0B\u5E8F\u6709\u6548\u8D1F\u8F7D\u4E2D\u7684\u6587\u4EF6\u548C/\u6216\n          \u76EE\u5F55\u7684\u9017\u53F7\u5206\u9694\u8DEF\u5F84\u5217\u8868\u3002\n          \u6B64\u9009\u9879\u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u9009\u9879\uFF1A\n  --add-launcher <launcher name>=<file path>\n          \u542F\u52A8\u7A0B\u5E8F\u7684\u540D\u79F0\u548C\u5305\u542B\u5173\u952E\u5B57-\u503C\u5BF9\u5217\u8868\u7684\n          \u5C5E\u6027\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \
-\u53EF\u4EE5\u4F7F\u7528\u5173\u952E\u5B57 "module"\u3001"main-jar"\u3001"main-class"\u3001\n          "arguments"\u3001"java-options"\u3001"app-version"\u3001"icon"\u3001\n          "win-console"\u3001"win-shortcut"\u3001"win-menu"\u3001\n          "linux-app-category" \u548C "linux-shortcut"\u3002\n          \u8FD9\u4E9B\u9009\u9879\u5C06\u6DFB\u52A0\u5230\u539F\u59CB\u547D\u4EE4\u884C\u9009\u9879\u4E2D\u6216\u8005\u7528\u6765\u8986\u76D6\n          \u539F\u59CB\u547D\u4EE4\u884C\u9009\u9879\uFF0C\u4EE5\u6784\u5EFA\u989D\u5916\u7684\u66FF\u4EE3\u542F\u52A8\u7A0B\u5E8F\u3002\n          \u5C06\u4ECE\u547D\u4EE4\u884C\u9009\u9879\u6784\u5EFA\u4E3B\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u3002\n          \u53EF\u4EE5\u4F7F\u7528\u6B64\u9009\u9879\u6784\u5EFA\u989D\u5916\u7684\u66FF\u4EE3\u542F\u52A8\u7A0B\u5E8F\uFF0C\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u6765\u6784\u5EFA\n          \u591A\u4E2A\u989D\u5916\u7684\u542F\u52A8\u7A0B\u5E8F\u3002 \n  --arguments <main class arguments>\n          \u5728\u6CA1\u6709\u4E3A\u542F\u52A8\u7A0B\u5E8F\u63D0\u4F9B\u547D\u4EE4\u884C\u53C2\u6570\u65F6\uFF0C\n          \u8981\u4F20\u9012\u5230\u4E3B\u7C7B\u7684\u547D\u4EE4\u884C\u53C2\u6570\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --java-options <java options>\n          \u8981\u4F20\u9012\u5230 Java \u8FD0\u884C\u65F6\u7684\u9009\u9879\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --main-class <class name>\n          \u8981\u6267\u884C\u7684\u5E94\u7528\u7A0B\u5E8F\u4E3B\u7C7B\u7684\u9650\u5B9A\u540D\u79F0\n          \u53EA\u6709\u5728\u6307\u5B9A\u4E86 --main-jar \u65F6\u624D\u80FD\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --main-jar <main jar file>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B JAR\uFF1B\u5305\u542B\u4E3B\u7C7B\n          \uFF08\u6307\u5B9A\u4E3A\u76F8\u5BF9\u4E8E\u8F93\u5165\u8DEF\u5F84\u7684\u8DEF\u5F84\uFF09\n          \u53EF\u4EE5\u6307\u5B9A --module \u6216 --main-jar \u9009\u9879\uFF0C\u4F46\u662F\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A\n          \u4E24\u8005\u3002\n  --module -m <module name>[/<main class>]\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u6A21\u5757\uFF08\u4EE5\u53CA\u53EF\u9009\u7684\u4E3B\u7C7B\uFF09\n          \u6B64\u6A21\u5757\u5FC5\u987B\u4F4D\u4E8E\u6A21\u5757\u8DEF\u5F84\u4E2D\u3002\n          \u5982\u679C\u6307\u5B9A\u4E86\u6B64\u9009\u9879\uFF0C\u5219\u5C06\u5728 Java \u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\n          \u94FE\u63A5\u4E3B\u6A21\u5757\u3002\u53EF\u4EE5\u6307\u5B9A --module \u6216 --main-jar \u9009\u9879\uFF0C\n          \u4F46\u662F\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A\u8FD9\u4E24\u4E2A\u9009\u9879\u3002\n{2}\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305\u7684\u9009\u9879\uFF1A\n  --about-url <url>\n          \u5E94\u7528\u7A0B\u5E8F\u4E3B\u9875\u7684 URL\n  --app-image <directory path>\n          \u7528\u6765\u6784\u5EFA\u53EF\u5B89\u88C5\u7A0B\u5E8F\u5305\u7684\n          \u9884\u5B9A\u4E49\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u4F4D\u7F6E\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --file-associations <file path>\n          \u5305\u542B\u5173\u952E\u5B57-\u503C\u5BF9\u5217\u8868\u7684\u5C5E\u6027\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u53EF\u4EE5\u4F7F\u7528\u5173\u952E\u5B57 "extension"\u3001"mime-type"\u3001"icon" \u548C "description" \n          \u6765\u63CF\u8FF0\u6B64\u5173\u8054\u3002\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          \u8BB8\u53EF\u8BC1\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --resource-dir <directory path>\n          \u8986\u76D6 jpackage \
-\u8D44\u6E90\u7684\u8DEF\u5F84\n          \u53EF\u4EE5\u901A\u8FC7\u5411\u8BE5\u76EE\u5F55\u4E2D\u6DFB\u52A0\u66FF\u4EE3\u8D44\u6E90\u6765\u8986\u76D6 jpackage \u7684\n          \u56FE\u6807\u3001\u6A21\u677F\u6587\u4EF6\u548C\u5176\u4ED6\u8D44\u6E90\u3002\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --runtime-image <directory path>\n          \u8981\u5B89\u88C5\u7684\u9884\u5B9A\u4E49\u8FD0\u884C\u65F6\u6620\u50CF\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5728\u521B\u5EFA\u8FD0\u884C\u65F6\u7A0B\u5E8F\u5305\u65F6\u9700\u8981\u4F7F\u7528\u9009\u9879\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n{3}
-
+MSG_Help=Usage: jpackage <options>\n\
+\n\
+Sample usages:\n\
+--------------\n\
+\    Generate an application package suitable for the host system:\n\
+\        For a modular application:\n\
+\            jpackage -n name -p modulePath -m moduleName/className\n\
+\        For a non-modular application:\n\
+\            jpackage -i inputDir -n name \\\n\
+\                --main-class className --main-jar myJar.jar\n\
+\        From a pre-built application image:\n\
+\            jpackage -n name --app-image appImageDir\n\
+\    Generate an application image:\n\
+\        For a modular application:\n\
+\            jpackage --type app-image -n name -p modulePath \\\n\
+\                -m moduleName/className\n\
+\        For a non-modular application:\n\
+\            jpackage --type app-image -i inputDir -n name \\\n\
+\                --main-class className --main-jar myJar.jar\n\
+\        To provide your own options to jlink, run jlink separately:\n\
+\            jlink --output appRuntimeImage -p modulePath \\\n\
+\                --add-modules moduleName \\\n\
+\                --no-header-files [<additional jlink options>...]\n\
+\            jpackage --type app-image -n name \\\n\
+\                -m moduleName/className --runtime-image appRuntimeImage\n\
+\    Generate a Java runtime package:\n\
+\        jpackage -n name --runtime-image <runtime-image>\n\
+\n\
+Generic Options:\n\
+\  @<filename> \n\
+\          Read options and/or mode from a file \n\
+\          This option can be used multiple times.\n\
+\  --type -t <type> \n\
+\          The type of package to create\n\
+\          Valid values are: {1} \n\
+\          If this option is not specified a platform dependent\n\
+\          default type will be created.\n\
+\  --app-version <version>\n\
+\          Version of the application and/or package\n\
+\  --copyright <copyright string>\n\
+\          Copyright for the application\n\
+\  --description <description string>\n\
+\          Description of the application\n\
+\  --help -h \n\
+\          Print the usage text with a list and description of each valid\n\
+\          option for the current platform to the output stream, and exit\n\
+\  --icon <file path>\n\
+\          Path of the icon of the application package\n\
+\          (absolute path or relative to the current directory)\n\
+\  --name -n <name>\n\
+\          Name of the application and/or package\n\
+\  --dest -d <destination path>\n\
+\          Path where generated output file is placed\n\
+\          (absolute path or relative to the current directory)\n\
+\          Defaults to the current working directory.\n\
+\  --temp <directory path>\n\
+\          Path of a new or empty directory used to create temporary files\n\
+\          (absolute path or relative to the current directory)\n\
+\          If specified, the temp dir will not be removed upon the task\n\
+\          completion and must be removed manually.\n\
+\          If not specified, a temporary directory will be created and\n\
+\          removed upon the task completion.\n\
+\  --vendor <vendor string>\n\
+\          Vendor of the application\n\
+\  --verbose\n\
+\          Enables verbose output\n\
+\  --version\n\
+\          Print the product version to the output stream and exit.\n\
+\n\
+\Options for creating the runtime image:\n\
+\  --add-modules <module name>[,<module name>...]\n\
+\          A comma (",") separated list of modules to add\n\
+\          This module list, along with the main module (if specified)\n\
+\          will be passed to jlink as the --add-module argument.\n\
+\          If not specified, either just the main module (if --module is\n\
+\          specified), or the default set of modules (if --main-jar is \n\
+\          specified) are used.\n\
+\          This option can be used multiple times.\n\
+\  --module-path -p <module path>...\n\
+\          A {0} separated list of paths\n\
+\          Each path is either a directory of modules or the path to a\n\
+\          modular jar.\n\
+\          (Each path is absolute or relative to the current directory.)\n\
+\          This option can be used multiple times.\n\
+\  --jlink-options <jlink options> \n\
+\          A space separated list of options to pass to jlink \n\
+\          If not specified, defaults to "--strip-native-commands \n\
+\          --strip-debug --no-man-pages --no-header-files". \n\
+\          This option can be used multiple times.\n\
+\  --runtime-image <directory path>\n\
+\          Path of the predefined runtime image that will be copied into\n\
+\          the application image\n\
+\          (absolute path or relative to the current directory)\n\
+\          If --runtime-image is not specified, jpackage will run jlink to\n\
+\          create the runtime image using options:\n\
+\          --strip-debug, --no-header-files, --no-man-pages, and\n\
+\          --strip-native-commands.\n\
+\n\
+\Options for creating the application image:\n\
+\  --input -i <directory path>\n\
+\          Path of the input directory that contains the files to be packaged\n\
+\          (absolute path or relative to the current directory)\n\
+\          All files in the input directory will be packaged into the\n\
+\          application image.\n\
+\  --app-content <additional content>[,<additional content>...]\n\
+\          A comma separated list of paths to files and/or directories\n\
+\          to add to the application payload.\n\
+\          This option can be used more than once.\n\
+\n\
+\Options for creating the application launcher(s):\n\
+\  --add-launcher <launcher name>=<file path>\n\
+\          Name of launcher, and a path to a Properties file that contains\n\
+\          a list of key, value pairs\n\
+\          (absolute path or relative to the current directory)\n\
+\          The keys "module", "main-jar", "main-class", "description",\n\
+\          "arguments", "java-options", "app-version", "icon",\n\
+\          "win-console", "win-shortcut", "win-menu",\n\
+\          "linux-app-category", and "linux-shortcut" can be used.\n\
+\          These options are added to, or used to overwrite, the original\n\
+\          command line options to build an additional alternative launcher.\n\
+\          The main application launcher will be built from the command line\n\
+\          options. Additional alternative launchers can be built using\n\
+\          this option, and this option can be used multiple times to\n\
+\          build multiple additional launchers. \n\
+\  --arguments <main class arguments>\n\
+\          Command line arguments to pass to the main class if no command\n\
+\          line arguments are given to the launcher\n\
+\          This option can be used multiple times.\n\
+\  --java-options <java options>\n\
+\          Options to pass to the Java runtime\n\
+\          This option can be used multiple times.\n\
+\  --main-class <class name>\n\
+\          Qualified name of the application main class to execute\n\
+\          This option can only be used if --main-jar is specified.\n\
+\  --main-jar <main jar file>\n\
+\          The main JAR of the application; containing the main class\n\
+\          (specified as a path relative to the input path)\n\
+\          Either --module or --main-jar option can be specified but not\n\
+\          both.\n\
+\  --module -m <module name>[/<main class>]\n\
+\          The main module (and optionally main class) of the application\n\
+\          This module must be located on the module path.\n\
+\          When this option is specified, the main module will be linked\n\
+\          in the Java runtime image.  Either --module or --main-jar\n\
+\          option can be specified but not both.\n\
+{2}\n\
+\Options for creating the application package:\n\
+\  --about-url <url>\n\
+\          URL of the application''s home page\n\
+\  --app-image <directory path>\n\
+\          Location of the predefined application image that is used\n\
+\          to build an installable package\n\
+\          (absolute path or relative to the current directory)\n\
+\  --file-associations <file path>\n\
+\          Path to a Properties file that contains list of key, value pairs\n\
+\          (absolute path or relative to the current directory)\n\
+\          The keys "extension", "mime-type", "icon", and "description"\n\
+\          can be used to describe the association.\n\
+\          This option can be used multiple times.\n\
+\  --install-dir <directory path>\n\
+\          {4}\
+\  --license-file <file path>\n\
+\          Path to the license file\n\
+\          (absolute path or relative to the current directory)\n\
+\  --resource-dir <directory path>\n\
+\          Path to override jpackage resources\n\
+\          Icons, template files, and other resources of jpackage can be\n\
+\          over-ridden by adding replacement resources to this directory.\n\
+\          (absolute path or relative to the current directory)\n\
+\  --runtime-image <directory path>\n\
+\          Path of the predefined runtime image to install\n\
+\          (absolute path or relative to the current directory)\n\
+\          Option is required when creating a runtime package.\n\
+\n\
+\Platform dependent options for creating the application package:\n\
+{3}
 MSG_Help_win_launcher=\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n  --win-console\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u63A7\u5236\u53F0\u542F\u52A8\u7A0B\u5E8F\uFF0C\u5E94\u5F53\u4E3A\n          \u9700\u8981\u63A7\u5236\u53F0\u4EA4\u4E92\u7684\u5E94\u7528\u7A0B\u5E8F\u6307\u5B9A\n
-MSG_Help_win_install=\  --win-dir-chooser\n          \u6DFB\u52A0\u4E00\u4E2A\u5BF9\u8BDD\u6846\u4EE5\u5141\u8BB8\u7528\u6237\u9009\u62E9\n          \u4EA7\u54C1\u7684\u5B89\u88C5\u76EE\u5F55\u3002\n  --win-help-url <url>\n          \u7528\u6237\u53EF\u4EE5\u4ECE\u4E2D\u83B7\u53D6\u66F4\u591A\u4FE1\u606F\u6216\u6280\u672F\u652F\u6301\u7684 URL\n  --win-menu\n          \u8BF7\u6C42\u4E3A\u6B64\u5E94\u7528\u7A0B\u5E8F\u6DFB\u52A0\u5F00\u59CB\u83DC\u5355\u5FEB\u6377\u65B9\u5F0F\n  --win-menu-group <menu group name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u5F00\u59CB\u83DC\u5355\u7EC4\n  --win-per-user-install\n          \u8BF7\u6C42\u57FA\u4E8E\u6BCF\u4E2A\u7528\u6237\u6267\u884C\u5B89\u88C5\n  --win-shortcut\n          \u8BF7\u6C42\u4E3A\u6B64\u5E94\u7528\u7A0B\u5E8F\u6DFB\u52A0\u684C\u9762\u5FEB\u6377\u65B9\u5F0F\n  --win-shortcut-prompt\n          \u6DFB\u52A0\u4E00\u4E2A\u5BF9\u8BDD\u6846\u4EE5\u5141\u8BB8\u7528\u6237\u9009\u62E9\u662F\u5426\u5C06\u7531\u5B89\u88C5\u7A0B\u5E8F\n          \u521B\u5EFA\u5FEB\u6377\u65B9\u5F0F\u3002\n  --win-update-url <url>\n          \u53EF\u7528\u5E94\u7528\u7A0B\u5E8F\u66F4\u65B0\u4FE1\u606F\u7684 URL\n  --win-upgrade-uuid <id string>\n          \u4E0E\u6B64\u7A0B\u5E8F\u5305\u7684\u5347\u7EA7\u76F8\u5173\u8054\u7684 UUID\n
+MSG_Help_win_install=\
+\  --win-dir-chooser\n\
+\          Adds a dialog to enable the user to choose a directory in which\n\
+\          the product is installed.\n\
+\  --win-help-url <url>\n\
+\          URL where user can obtain further information or technical support\n\
+\  --win-menu\n\
+\          Request to add a Start menu shortcut for this application\n\
+\  --win-menu-group <menu group name>\n\
+\          Start Menu group this application is placed in\n\
+\  --win-per-user-install\n\
+\          Request to perform an install on a per-user basis\n\
+\  --win-shortcut\n\
+\          Request to add desktop shortcut for this application\n\
+\  --win-shortcut-prompt\n\
+\          Adds a dialog to enable the user to choose if shortcuts\n\
+\          will be created by installer.\n\
+\  --win-update-url <url>\n\
+\          URL of available application update information\n\
+\  --win-upgrade-uuid <id string>\n\
+\          UUID associated with upgrades for this package\n\
+
 MSG_Help_win_install_dir=\u9ED8\u8BA4\u5B89\u88C5\u4F4D\u7F6E\u4E0B\u9762\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\n
-MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          \u5305\u62EC DMG \u4E2D\u5F15\u7528\u7684\u6240\u6709\u5185\u5BB9\u3002\n          \u6B64\u9009\u9879\u53EF\u4EE5\u4F7F\u7528\u591A\u6B21\u3002\n
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          \u7528\u6765\u552F\u4E00\u5730\u6807\u8BC6 macOS \u5E94\u7528\u7A0B\u5E8F\u7684\u6807\u8BC6\u7B26\n          \u9ED8\u8BA4\u4E3A\u4E3B\u7C7B\u540D\u79F0\u3002\n          \u53EA\u80FD\u4F7F\u7528\u5B57\u6BCD\u6570\u5B57 (A-Z,a-z,0-9)\u3001\u8FDE\u5B57\u7B26 (-) \u548C\n          \u53E5\u70B9 (.) \u5B57\u7B26\u3002\n  --mac-package-name <name string>\n          \u51FA\u73B0\u5728\u83DC\u5355\u680F\u4E2D\u7684\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n          \u8FD9\u53EF\u4EE5\u4E0E\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u4E0D\u540C\u3002\n          \u6B64\u540D\u79F0\u7684\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E 16 \u4E2A\u5B57\u7B26\uFF0C\u9002\u5408\n          \u663E\u793A\u5728\u83DC\u5355\u680F\u4E2D\u548C\u5E94\u7528\u7A0B\u5E8F\u201C\u4FE1\u606F\u201D\u7A97\u53E3\u4E2D\u3002\n          \u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u5728\u5BF9\u5E94\u7528\u7A0B\u5E8F\u5305\u7B7E\u540D\u65F6\uFF0C\u4F1A\u5728\u6240\u6709\u9700\u8981\u7B7E\u540D\n          \u4F46\u5F53\u524D\u6CA1\u6709\u7A0B\u5E8F\u5305\u6807\u8BC6\u7B26\u7684\u7EC4\u4EF6\u7684\n          \u524D\u9762\u52A0\u4E0A\u6B64\u503C\u3002\n  --mac-sign\n          \u8BF7\u6C42\u5BF9\u7A0B\u5E8F\u5305\u8FDB\u884C\u7B7E\u540D\n  --mac-signing-keychain <keychain name>\n          \u8981\u7528\u6765\u641C\u7D22\u7B7E\u540D\u8EAB\u4EFD\u7684\u5BC6\u94A5\u94FE\u7684\u540D\u79F0\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u4F7F\u7528\u6807\u51C6\u7684\u5BC6\u94A5\u94FE\u3002\n  --mac-signing-key-user-name <team name>\n          Apple \u7B7E\u540D\u8EAB\u4EFD\u7684\u56E2\u961F\u6216\u7528\u6237\u540D\u79F0\u90E8\u5206\u3002\n  --mac-app-store\n          \u6307\u793A jpackage \u8F93\u51FA\u9762\u5411 \n          Mac App Store\u3002\n  --mac-entitlements <file path>\n          \u5305\u542B\u4E00\u4E9B\u6743\u5229\u7684\u6587\u4EF6\u7684\u8DEF\u5F84\uFF0C\u5728\u5BF9\u6346\u7ED1\u5305\u4E2D\u7684\u53EF\u6267\u884C\u6587\u4EF6\n          \u548C\u5E93\u8FDB\u884C\u7B7E\u540D\u65F6\u4F1A\u4F7F\u7528\u8FD9\u4E9B\u6743\u5229\u3002\n  --mac-app-category <category string>\n          \u7528\u4E8E\u6784\u9020\u5E94\u7528\u7A0B\u5E8F plist \u4E2D LSApplicationCategoryType \u7684\n          \u5B57\u7B26\u4E32\u3002\u9ED8\u8BA4\u503C\u4E3A "utilities"\u3002\n
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux \u7A0B\u5E8F\u5305\u7684\u540D\u79F0\uFF0C\u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n  --linux-deb-maintainer <email address>\n          .deb \u7A0B\u5E8F\u5305\u7684\u7EF4\u62A4\u7A0B\u5E8F\n  --linux-menu-group <menu-group-name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u83DC\u5355\u7EC4\n  --linux-package-deps\n          \u5E94\u7528\u7A0B\u5E8F\u6240\u9700\u7684\u7A0B\u5E8F\u5305\u6216\u529F\u80FD\n  --linux-rpm-license-type <type string>\n          \u8BB8\u53EF\u8BC1\u7684\u7C7B\u578B\uFF08RPM .spec \u7684 "License: <value>"\uFF09\n  --linux-app-release <release value>\n          RPM <name>.spec \u6587\u4EF6\u7684\u53D1\u884C\u7248\u503C\u6216 \n          DEB \u63A7\u5236\u6587\u4EF6\u7684 Debian \u4FEE\u8BA2\u7248\u503C\n  --linux-app-category <category value>\n          RPM <name>.spec \u6587\u4EF6\u7684\u7EC4\u503C\u6216 \n          DEB \u63A7\u5236\u6587\u4EF6\u7684\u8282\u503C\n  --linux-shortcut\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u5FEB\u6377\u65B9\u5F0F\u3002\n
+
+MSG_Help_mac_install=\
+\  --mac-dmg-content <additional content path>[,<additional content path>...]\n\
+\          Include all the referenced content in the dmg.\n\
+\          This option can be used multiple times. \n\
+
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          \u7528\u6765\u552F\u4E00\u5730\u6807\u8BC6 macOS \u5E94\u7528\u7A0B\u5E8F\u7684\u6807\u8BC6\u7B26\n          \u9ED8\u8BA4\u4E3A\u4E3B\u7C7B\u540D\u79F0\u3002\n          \u53EA\u80FD\u4F7F\u7528\u5B57\u6BCD\u6570\u5B57\uFF08A-Z\u3001a-z\u30010-9\uFF09\u3001\u8FDE\u5B57\u7B26 (-) \u548C\n          \u53E5\u70B9 (.) \u5B57\u7B26\u3002\n  --mac-package-name <name string>\n          \u51FA\u73B0\u5728\u83DC\u5355\u680F\u4E2D\u7684\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n          \u8FD9\u53EF\u4EE5\u4E0E\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u4E0D\u540C\u3002\n          \u6B64\u540D\u79F0\u7684\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E 16 \u4E2A\u5B57\u7B26\uFF0C\u9002\u5408\n          \u663E\u793A\u5728\u83DC\u5355\u680F\u4E2D\u548C\u5E94\u7528\u7A0B\u5E8F\u201C\u4FE1\u606F\u201D\u7A97\u53E3\u4E2D\u3002\n          \u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u5728\u5BF9\u5E94\u7528\u7A0B\u5E8F\u5305\u7B7E\u540D\u65F6\uFF0C\u4F1A\u5728\u6240\u6709\u9700\u8981\u7B7E\u540D\n          \u4F46\u5F53\u524D\u6CA1\u6709\u7A0B\u5E8F\u5305\u6807\u8BC6\u7B26\u7684\u7EC4\u4EF6\u7684\n          \u524D\u9762\u52A0\u4E0A\u6B64\u503C\u3002\n  --mac-sign\n          \u8BF7\u6C42\u5BF9\u7A0B\u5E8F\u5305\u8FDB\u884C\u7B7E\u540D\n\
+\  --mac-signing-keychain <keychain name>\n\
+\          Name of the keychain to search for the signing identity\n\
+\          If not specified, the standard keychains are used.\n\
+\  --mac-signing-key-user-name <team name>\n\
+\          Team or user name portion of Apple signing identities.\n\
+\  --mac-app-store\n\
+\          Indicates that the jpackage output is intended for the\n\
+\          Mac App Store.\n\
+\  --mac-entitlements <file path>\n\
+\          Path to file containing entitlements to use when signing\n\
+\          executables and libraries in the bundle.\n\
+\  --mac-app-category <category string>\n\
+\          String used to construct LSApplicationCategoryType in\n\
+\          application plist.  The default value is "utilities".\n\
+
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux \u7A0B\u5E8F\u5305\u7684\u540D\u79F0\uFF0C\u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n  --linux-deb-maintainer <email address>\n          .deb \u7A0B\u5E8F\u5305\u7684\u7EF4\u62A4\u7A0B\u5E8F\n  --linux-menu-group <menu-group-name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u83DC\u5355\u7EC4\n  --linux-package-deps\n          \u5E94\u7528\u7A0B\u5E8F\u6240\u9700\u7684\u7A0B\u5E8F\u5305\u6216\u529F\u80FD\n  --linux-rpm-license-type <type string>\n          \u8BB8\u53EF\u8BC1\u7684\u7C7B\u578B\uFF08RPM .spec \u7684 "License: <value>"\uFF09\n\
+\  --linux-app-release <release value>\n\
+\          Release value of the RPM <name>.spec file or \n\
+\          Debian revision value of the DEB control file\n\
+\  --linux-app-category <category value>\n\
+\          Group value of the RPM <name>.spec file or \n\
+\          Section value of DEB control file\n\
+\  --linux-shortcut\n\
+\          Creates a shortcut for the application.\n\
+
 MSG_Help_mac_linux_install_dir=\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u76EE\u5F55\u7684\u7EDD\u5BF9\u8DEF\u5F84\n
 MSG_Help_default_install_dir=OS X \u6216 Linux \u4E0A\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u76EE\u5F55\u7684\u7EDD\u5BF9\u8DEF\u5F84\u3002\n          Windows \u4E0A\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u4F4D\u7F6E\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\n          \uFF08\u5982 "Program Files" \u6216 "AppData"\uFF09\u3002\n
 MSG_Help_no_args=\u7528\u6CD5\uFF1Ajpackage <options>\n\u4F7F\u7528 jpackage --help\uFF08\u6216 -h\uFF09\u53EF\u83B7\u53D6\u53EF\u80FD\u9009\u9879\u7684\u5217\u8868
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
deleted file mode 100644
index 72245cc578a..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-param.copyright.default=Copyright (C) {0,date,YYYY}
-param.description.default=Kein Wert
-param.vendor.default=Unbekannt
-
-message.using-default-resource=Standardpackageressource {0} {1} wird verwendet (durch Hinzuf\u00FCgen von {2} zu resource-dir ist eine Anpassung m\u00F6glich).
-message.no-default-resource=Keine Standardpackageressource {0} {1} (durch Hinzuf\u00FCgen von {2} zu resource-dir ist eine Anpassung m\u00F6glich).
-message.using-custom-resource-from-file=Benutzerdefinierte Packageressource {0} wird verwendet (aus Datei {1} geladen).
-message.using-custom-resource=Benutzerdefinierte Packageressource {0} wird verwendet (aus {1} geladen).
-message.creating-app-bundle=Anwendungspackage {0} wird in {1} erstellt
-message.app-image-dir-does-not-exist=Angegebenes Anwendungsimageverzeichnis {0}: {1} ist nicht vorhanden
-message.app-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist
-message.runtime-image-dir-does-not-exist=Angegebenes Laufzeitimageverzeichnis {0}: {1} ist nicht vorhanden
-message.runtime-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist
-message.resource-dir-does-not-exist=Angegebenes Ressourcenverzeichnis {0}: {1} ist nicht vorhanden
-message.debug-working-directory=Arbeitsverzeichnis f\u00FCr Debug beibehalten: {0}
-message.bundle-created={0}-Package wurde erfolgreich erstellt
-message.module-version=Version "{0}" aus Modul "{1}" wird als Anwendungsversion verwendet
-message.module-class=Klasse "{0}" aus Modul "{1}" wird als Anwendungshauptklasse verwendet
-
-error.version-string-empty="Version darf keine leere Zeichenfolge sein"
-error.version-string-zero-length-component="Version [{0}] enth\u00E4lt eine Komponente mit einer Nulll\u00E4nge"
-error.version-string-invalid-component="Version [{0}] enth\u00E4lt ung\u00FCltige Komponente [{1}]"
-
-error.cannot-create-output-dir=Zielverzeichnis {0} kann nicht erstellt werden
-error.cannot-write-to-output-dir=Zielverzeichnis {0} ist schreibgesch\u00FCtzt
-error.root-exists=Fehler: Anwendungszielverzeichnis {0} ist bereits vorhanden
-error.no-main-class-with-main-jar=Es wurde keine Hauptklasse angegeben oder in der JAR-Datei {0} gefunden
-error.no-main-class-with-main-jar.advice=Geben Sie eine Hauptklasse an, oder stellen Sie sicher, dass die JAR-Datei {0} eine Hauptklasse im Manifest angibt
-error.no-main-class=Es wurde keine Hauptklasse angegeben oder in den angegebenen Anwendungsressourcen gefunden
-error.no-main-class.advice=Geben Sie eine Anwendungsklasse an, oder stellen Sie sicher, dass die appResources eine JAR-Datei mit einer Anwendungsklasse im Manifest enthalten
-error.main-jar-does-not-exist=Die konfigurierte Haupt-JAR-Datei ist im Eingabeverzeichnis nicht vorhanden {0}
-error.main-jar-does-not-exist.advice=Die Haupt-JAR-Datei muss relativ zum Eingabeverzeichnis (nicht als absoluter Pfad) angegeben werden und muss in diesem Verzeichnis vorhanden sein
-error.no-module-in-path="{0}-Modul im Modulpfad nicht gefunden"
-error.not-path-parameter="Ung\u00FCltiger Wert f\u00FCr Parameter {0}: {1}"
-error.no-input-parameter="--input-Parameter f\u00FCr nicht modulare Anwendung fehlt"
-error.no-main-jar-parameter="--main-jar-Parameter f\u00FCr nicht modulare Anwendung fehlt"
-
-error.no-content-types-for-file-association=F\u00FCr Dateiverkn\u00FCpfungsnummer {0} wurden keine MIME-Typen angegeben
-error.no-content-types-for-file-association.advice=Geben Sie einen MIME-Typ f\u00FCr Dateiverkn\u00FCpfungsnummer {0} an
-error.too-many-content-types-for-file-association=F\u00FCr Dateiverkn\u00FCpfungsnummer {0} wurde mehr als ein MIME-Typ angegeben
-error.too-many-content-types-for-file-association.advice=Geben Sie nur einen MIME-Typ f\u00FCr Dateiverkn\u00FCpfungsnummer {0} an
-
-error.tool-not-found={0} kann nicht gefunden werden. Grund: {1}
-error.tool-not-found.advice=Installieren Sie {0}
-error.tool-old-version={0} {1} oder eine neuere Version kann nicht gefunden werden
-error.tool-old-version.advice=Installieren Sie {0} {1} oder eine neuere Version
-error.jlink.failed=jlink nicht erfolgreich mit: {0}
-error.blocked.option=jlink-Option [{0}] ist in --jlink-options nicht zul\u00E4ssig
-error.no.name=Name nicht mit --name angegeben. Es kann auch kein Name aus app-image abgeleitet werden
-
-warning.no.jdk.modules.found=Warnung: Keine JDK-Module gefunden
-warning.foreign-app-image=Warnung: app-image-Verzeichnis ({0}) wurde von jpackage nicht generiert.
-warning.invalid-app-image=Warnung: .jpackage.xml kann in app-image-Verzeichnis ({0}) nicht geparst werden
-
-MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
-MSG_BundlerConfigException=Bundler {0} aufgrund eines Konfigurationsproblems \u00FCbersprungen: {1} \nEmpfehlung zur Behebung: {2}
-MSG_BundlerConfigExceptionNoAdvice=Bundler {0} aufgrund eines Konfigurationsproblems \u00FCbersprungen: {1}
-MSG_BundlerRuntimeException=Bundler {0} nicht erfolgreich. Grund: {1}
-MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
-
-ERR_NoMainClass=Fehler: Hauptanwendungsklasse fehlt
-ERR_UnsupportedOption=Fehler: Option [{0}] ist auf dieser Plattform ung\u00FCltig
-ERR_InvalidTypeOption=Fehler: Option [{0}] ist nicht g\u00FCltig mit Typ [{1}]
-ERR_NoInstallerEntryPoint=Fehler: Option [{0}] ist nicht g\u00FCltig ohne Einstiegspunktoption --module oder --main-jar
-ERR_MutuallyExclusiveOptions="Fehler: Optionen [{0}] und [{1}] schlie\u00DFen sich gegenseitig aus
-
-ERR_MissingArgument=Fehler: Fehlendes Argument: {0}
-ERR_MissingAppResources=Fehler: Keine Anwendungs-JAR-Dateien gefunden
-ERR_AppImageNotExist=Fehler: Anwendungsimageverzeichnis "{0}" ist nicht vorhanden
-ERR_NoAddLauncherName=Fehler: F\u00FCr Option --add-launcher m\u00FCssen ein Name und ein Dateipfad angegeben werden (--add-launcher <Name>=<Dateipfad>)
-ERR_NoUniqueName=Fehler: F\u00FCr --add-launcher <Name>=<Dateipfad> ist ein eindeutiger Name erforderlich
-ERR_NoJreInstallerName=Fehler: F\u00FCr JRE-Installationsprogramme ist ein Namensparameter erforderlich
-ERR_InvalidAppName=Fehler: Ung\u00FCltiger Anwendungsname: {0}
-ERR_InvalidSLName=Fehler: Ung\u00FCltiger Name f\u00FCr hinzuzuf\u00FCgenden Launcher: {0}
-ERR_IconFileNotExit=Fehler: Die angegebene Symboldatei [{0}] ist nicht vorhanden
-ERR_LicenseFileNotExit=Fehler: Die angegebene Lizenzdatei ist nicht vorhanden
-ERR_BuildRootInvalid=Fehler: Das tempor\u00E4re Verzeichnis ({0}) darf nicht vorhanden oder muss leer sein
-ERR_InvalidOption=Fehler: Ung\u00FCltige Option: [{0}]
-ERR_InvalidInstallerType=Fehler: Ung\u00FCltiger oder nicht unterst\u00FCtzter Typ: [{0}]
-ERR_BothMainJarAndModule=Fehler: Die Optionen --main-jar und --module d\u00FCrfen nicht beide vorhanden sein
-ERR_NoEntryPoint=Fehler: F\u00FCr das Erstellen des Anwendungsimages muss entweder die Option --main-jar oder die Option --module angegeben werden
-ERR_InputNotDirectory=Fehler: Das angegebene Eingabeverzeichnis ist kein Verzeichnis: {0}
-ERR_CannotReadInputDir=Fehler: Keine Berechtigung zum Lesen aus Eingabeverzeichnis vorhanden: {0}
-ERR_CannotParseOptions=Fehler: Option @filename wird verarbeitet: {0}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
index 3224699b000..dfd3721613b 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
index e4cfb62da04..16768d37ef5 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
deleted file mode 100644
index cfc86152834..00000000000
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version = '1.0' encoding = 'utf-8'?>
-<WixLocalization Culture="de" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="1252">
-  <String Id="message.install.dir.exist">Der Ordner [INSTALLDIR] ist bereits vorhanden. Möchten Sie diesen Ordner trotzdem installieren?</String>
-  <String Id="MainFeatureTitle">Hauptfeature</String>
-  <String Id="DowngradeErrorMessage">Eine höhere Version von [ProductName] ist bereits installiert. Downgrades sind deaktiviert. Setup wird jetzt beendet.</String>
-  <String Id="DisallowUpgradeErrorMessage">Eine niedrigere Version von [ProductName] ist bereits installiert. Upgrades sind deaktiviert. Setup wird jetzt beendet.</String>
-
-  <String Id="ShortcutPromptDlg_Title">[ProductName]-Setup</String>
-  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}-Verknüpfungen</String>
-  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
-  <String Id="ShortcutPromptDlgDescription">Wählen Sie die zu erstellenden Verknüpfungen aus.</String>
-  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Desktopverknüpfung(en) erstellen</String>
-  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Startmenüverknüpfung(en) erstellen</String>
-  <String Id="InstallDirNotEmptyDlg_Title">[ProductName]-Setup</String>
-</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
index 9e7e5cfd03e..a8403e5ba48 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
@@ -1,15 +1,15 @@
-<?xml version = '1.0' encoding = 'utf-8'?>
-<WixLocalization Culture="ja" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="932">
-  <String Id="message.install.dir.exist">フォルダ[INSTALLDIR]はすでに存在します。そのフォルダにインストールしますか?</String>
-  <String Id="MainFeatureTitle">主な機能</String>
-  <String Id="DowngradeErrorMessage">[ProductName]のより上位のバージョンがすでにインストールされています。ダウングレードは無効です。セットアップを終了します。</String>
-  <String Id="DisallowUpgradeErrorMessage">[ProductName]のより下位のバージョンがすでにインストールされています。アップグレードは無効です。セットアップを終了します。</String>
-
-  <String Id="ShortcutPromptDlg_Title">[ProductName]セットアップ</String>
-  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}ショートカット</String>
-  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
-  <String Id="ShortcutPromptDlgDescription">作成するショートカットを選択します。</String>
-  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">デスクトップ・ショートカットの作成</String>
-  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">スタート・メニューのショートカットの作成</String>
-  <String Id="InstallDirNotEmptyDlg_Title">[ProductName]セットアップ</String>
-</WixLocalization>
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="ja-JP" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="932">
+  <String Id="message.install.dir.exist">フォルダ[INSTALLDIR]はすでに存在します。そのフォルダにインストールしますか?</String>
+  <String Id="MainFeatureTitle">主な機能</String>
+  <String Id="DowngradeErrorMessage">[ProductName]のより上位のバージョンがすでにインストールされています。ダウングレードは無効です。セットアップを終了します。</String>
+  <String Id="DisallowUpgradeErrorMessage">[ProductName]のより下位のバージョンがすでにインストールされています。アップグレードは無効です。セットアップを終了します。</String>
+
+  <String Id="ShortcutPromptDlg_Title">[ProductName] Setup</String>
+  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}Shortcuts</String>
+  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutPromptDlgDescription">Select shortcuts to create.</String>
+  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Create desktop shortcut(s)</String>
+  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Create start menu shortcut(s)</String>
+  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] Setup</String>  
+</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
index 8b9910e0cf1..ca52140fff4 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
@@ -1,15 +1,15 @@
-<?xml version = '1.0' encoding = 'utf-8'?>
-<WixLocalization Culture="zh-CN" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="936">
-  <String Id="message.install.dir.exist">文件夹 [INSTALLDIR] 已存在。是否仍要安装到该文件夹？</String>
-  <String Id="MainFeatureTitle">主要功能</String>
-  <String Id="DowngradeErrorMessage">已安装更高版本的 [ProductName]。降级已禁用。现在将退出安装。</String>
-  <String Id="DisallowUpgradeErrorMessage">已安装更低版本的 [ProductName]。升级已禁用。现在将退出安装。</String>
-
-  <String Id="ShortcutPromptDlg_Title">[ProductName] 安装程序</String>
-  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}快捷方式</String>
-  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
-  <String Id="ShortcutPromptDlgDescription">选择要创建的快捷方式。</String>
-  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">创建桌面快捷方式</String>
-  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">创建开始菜单快捷方式</String>
-  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] 安装程序</String>
-</WixLocalization>
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="zh-CN" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="936">
+  <String Id="message.install.dir.exist">文件夹 [INSTALLDIR] 已存在。是否仍要安装到该文件夹？</String>
+  <String Id="MainFeatureTitle">主要功能</String>
+  <String Id="DowngradeErrorMessage">已安装更高版本的 [ProductName]。降级已禁用。现在将退出安装。</String>
+  <String Id="DisallowUpgradeErrorMessage">已安装更低版本的 [ProductName]。升级已禁用。现在将退出安装。</String>
+
+  <String Id="ShortcutPromptDlg_Title">[ProductName] Setup</String>
+  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}Shortcuts</String>
+  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutPromptDlgDescription">Select shortcuts to create.</String>
+  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Create desktop shortcut(s)</String>
+  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Create start menu shortcut(s)</String>
+  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] Setup</String>
+</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
deleted file mode 100644
index a84d2b2cb4f..00000000000
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-#
-
-app.bundler.name=Windows-Anwendungsimage
-exe.bundler.name=EXE-Installationsprogrammpackage
-msi.bundler.name=MSI-Installationsprogrammpackage
-
-param.menu-group.default=Unbekannt
-
-resource.executable-properties-template=Vorlage f\u00FCr das Erstellen der ausf\u00FChrbaren Eigenschaftendatei
-resource.setup-icon=Symbol f\u00FCr Dialogfeld "Setup"
-resource.post-app-image-script=Auszuf\u00FChrendes Skript nach dem Auff\u00FCllen des Anwendungsimages
-resource.post-msi-script=Auszuf\u00FChrendes Skript nach dem Erstellen der MSI-Datei f\u00FCr das EXE-Installationsprogramm
-resource.wxl-file-name=MsiInstallerStrings_en.wxl
-resource.main-wix-file=Haupt-WiX-Projektdatei
-resource.overrides-wix-file=\u00DCberschreibt WiX-Projektdatei
-resource.shortcutpromptdlg-wix-file=Dialogfeld f\u00FCr Verkn\u00FCpfungs-Prompt der WiX-Projektdatei
-resource.installdirnotemptydlg-wix-file=Nicht leeres Installationsverzeichnis in Dialogfeld f\u00FCr WiX-Projektdatei
-
-error.no-wix-tools=WiX-Tools (light.exe, candle.exe) nicht gefunden
-error.no-wix-tools.advice=Laden Sie WiX 3.0 oder h\u00F6her von https://wixtoolset.org herunter, und f\u00FCgen Sie es zu PATH hinzu.
-error.version-string-wrong-format.advice=Setzen Sie den Wert des --app-version-Parameters auf eine g\u00FCltige ProductVersion des Windows-Installationsprogramms.
-error.msi-product-version-components=Versionszeichenfolge [{0}] muss zwischen 2 und 4 Komponenten aufweisen.
-error.msi-product-version-major-out-of-range=Hauptversion muss im Bereich [0, 255] liegen
-error.msi-product-version-build-out-of-range=Build-Teil der Version muss im Bereich [0, 65535] liegen
-error.msi-product-version-minor-out-of-range=Nebenversion muss im Bereich [0, 255] liegen
-error.version-swap=Versionsinformationen f\u00FCr {0} konnten nicht aktualisiert werden
-error.invalid-envvar=Ung\u00FCltiger Wert der {0}-Umgebungsvariable
-error.lock-resource=Sperren nicht erfolgreich: {0}
-error.read-wix-l10n-file=Datei {0} konnte nicht geparst werden
-error.extract-culture-from-wix-l10n-file=Kulturwert konnte nicht aus Datei {0} gelesen werden
-
-message.icon-not-ico=Das angegebene Symbol "{0}" ist keine ICO-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
-message.potential.windows.defender.issue=Warnung: Windows Defender verhindert eventuell die korrekte Ausf\u00FChrung von jpackage. Wenn ein Problem auftritt, deaktivieren Sie die Echtzeit\u00FCberwachung, oder f\u00FCgen Sie einen Ausschluss f\u00FCr das Verzeichnis "{0}" hinzu.
-message.outputting-to-location=EXE f\u00FCr Installationsprogramm wird generiert in: {0}.
-message.output-location=Installationsprogramm (.exe) gespeichert in: {0}
-message.tool-version=[{0}]-Version [{1}] erkannt.
-message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
-message.wrong-tool-version=[{0}]-Version {1} wurde erkannt. Erforderlich ist jedoch Version {2}.
-message.version-string-too-many-components=Versionszeichenfolge kann bis zu 3 Komponenten aufweisen: major.minor.build.
-message.use-wix36-features=WiX {0} erkannt. Erweiterte Bereinigungsaktion wird aktiviert.
-message.product-code=MSI-ProductCode: {0}.
-message.upgrade-code=MSI-UpgradeCode: {0}.
-message.preparing-msi-config=MSI-Konfiguration wird vorbereitet: {0}.
-message.generating-msi=MSI wird generiert: {0}.
-message.invalid.install.dir=Warnung: Ung\u00FCltiges Installationsverzeichnis {0}. Installationsverzeichnis muss ein relativer Unterpfad unter dem Standardinstallationsverzeichnis wie "Programme" sein. Der Anwendungsname "{1}" wird als Standardwert verwendet.
-
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
index bce8ca2cb17..f0e5e3e370b 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
@@ -34,16 +34,16 @@ resource.executable-properties-template=\u5B9F\u884C\u53EF\u80FD\u306A\u30D7\u30
 resource.setup-icon=\u8A2D\u5B9A\u30C0\u30A4\u30A2\u30ED\u30B0\u30FB\u30A2\u30A4\u30B3\u30F3
 resource.post-app-image-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u79FB\u5165\u3057\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.post-msi-script=exe\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306Emsi\u30D5\u30A1\u30A4\u30EB\u304C\u4F5C\u6210\u3055\u308C\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.wxl-file-name=MsiInstallerStrings_en.wxl
+resource.wxl-file-name=MsiInstallerStrings_ja.wxl
 resource.main-wix-file=\u30E1\u30A4\u30F3WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
 resource.overrides-wix-file=WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9
-resource.shortcutpromptdlg-wix-file=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30FB\u30D7\u30ED\u30F3\u30D7\u30C8\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
-resource.installdirnotemptydlg-wix-file=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u306EWiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u7A7A\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+resource.shortcutpromptdlg-wix-file=Shortcut prompt dialog WiX project file
+resource.installdirnotemptydlg-wix-file=Not empty install directory dialog WiX project file
 
 error.no-wix-tools=WiX\u30C4\u30FC\u30EB(light.exe\u3001candle.exe)\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 error.no-wix-tools.advice=WiX 3.0\u4EE5\u964D\u3092https://wixtoolset.org\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3001PATH\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002
-error.version-string-wrong-format.advice=--app-version\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u5024\u3092\u6709\u52B9\u306AWindows Installer ProductVersion\u306B\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-error.msi-product-version-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217[{0}]\u306B\u306F\u30012\u304B\u30894\u3064\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+error.version-string-wrong-format.advice=Set value of --app-version parameter to a valid Windows Installer ProductVersion.
+error.msi-product-version-components=Version string [{0}] must have between 2 and 4 components.
 error.msi-product-version-major-out-of-range=\u30E1\u30B8\u30E3\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.msi-product-version-build-out-of-range=\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u30D3\u30EB\u30C9\u90E8\u5206\u306F\u7BC4\u56F2[0, 65535]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.msi-product-version-minor-out-of-range=\u30DE\u30A4\u30CA\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
index 788026ecb97..d0461b9996c 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
@@ -34,16 +34,16 @@ resource.executable-properties-template=\u7528\u4E8E\u521B\u5EFA\u53EF\u6267\u88
 resource.setup-icon=\u8BBE\u7F6E\u5BF9\u8BDD\u6846\u56FE\u6807
 resource.post-app-image-script=\u8981\u5728\u586B\u5145\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E4B\u540E\u8FD0\u884C\u7684\u811A\u672C
 resource.post-msi-script=\u5728\u4E3A exe \u5B89\u88C5\u7A0B\u5E8F\u521B\u5EFA msi \u6587\u4EF6\u4E4B\u540E\u8981\u8FD0\u884C\u7684\u811A\u672C
-resource.wxl-file-name=MsiInstallerStrings_en.wxl
+resource.wxl-file-name=MsiInstallerStrings_zh_CN.wxl
 resource.main-wix-file=\u4E3B WiX \u9879\u76EE\u6587\u4EF6
 resource.overrides-wix-file=\u8986\u76D6 WiX \u9879\u76EE\u6587\u4EF6
-resource.shortcutpromptdlg-wix-file=\u5FEB\u6377\u65B9\u5F0F\u63D0\u793A\u5BF9\u8BDD\u6846 WiX \u9879\u76EE\u6587\u4EF6
-resource.installdirnotemptydlg-wix-file=\u5B89\u88C5\u76EE\u5F55\u5BF9\u8BDD\u6846 WiX \u9879\u76EE\u6587\u4EF6\u975E\u7A7A
+resource.shortcutpromptdlg-wix-file=Shortcut prompt dialog WiX project file
+resource.installdirnotemptydlg-wix-file=Not empty install directory dialog WiX project file
 
 error.no-wix-tools=\u627E\u4E0D\u5230 WiX \u5DE5\u5177 (light.exe, candle.exe)
 error.no-wix-tools.advice=\u4ECE https://wixtoolset.org \u4E0B\u8F7D WiX 3.0 \u6216\u66F4\u9AD8\u7248\u672C\uFF0C\u7136\u540E\u5C06\u5176\u6DFB\u52A0\u5230 PATH\u3002
-error.version-string-wrong-format.advice=\u5C06 --app-version \u53C2\u6570\u7684\u503C\u8BBE\u7F6E\u4E3A\u6709\u6548\u7684 Windows Installer ProductVersion\u3002
-error.msi-product-version-components=\u7248\u672C\u5B57\u7B26\u4E32 [{0}] \u5FC5\u987B\u5305\u542B 2 \u5230 4 \u4E2A\u7EC4\u6210\u90E8\u5206\u3002
+error.version-string-wrong-format.advice=Set value of --app-version parameter to a valid Windows Installer ProductVersion.
+error.msi-product-version-components=Version string [{0}] must have between 2 and 4 components.
 error.msi-product-version-major-out-of-range=\u4E3B\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
 error.msi-product-version-build-out-of-range=\u7248\u672C\u7684\u5DE5\u4F5C\u7248\u672C\u90E8\u5206\u5FC5\u987B\u4F4D\u4E8E [0, 65535] \u8303\u56F4\u4E2D
 error.msi-product-version-minor-out-of-range=\u6B21\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
deleted file mode 100644
index 3deef2ab65e..00000000000
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
+++ /dev/null
@@ -1,322 +0,0 @@
-#
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-jshell.msg.welcome =Willkommen bei JShell - Version {0}\nGeben Sie f\u00FCr eine Einf\u00FChrung Folgendes ein: /help intro
-jshell.err.opt.arg = Argument f\u00FCr {0} fehlt.
-jshell.err.opt.invalid = Ung\u00FCltige Optionen: {0}.
-jshell.err.opt.one = Es darf nur eine {0}-Option verwendet werden.
-jshell.err.opt.startup.conflict = Nicht miteinander vereinbare Optionen: Es wurde sowohl --startup als auch --no-startup verwendet.
-jshell.err.opt.feedback.one = Es darf nur eine Feedbackoption (--feedback, -q, -s oder -v) verwendet werden.
-jshell.err.opt.unknown = Unbekannte Option: {0}
-
-jshell.msg.terminated = Status-Engine beendet.
-jshell.msg.terminated.restore = Stellen Sie Definitionen wieder her mit: /reload -restore
-
-jshell.msg.use.one.of = Verwenden Sie eine der folgenden Optionen: {0}
-jshell.msg.see.classes.etc = Siehe /types, /methods, /vars oder /list
-jshell.err.arg = Ung\u00FCltiges "{0}"-Argument: {1}
-jshell.msg.see = Hilfe finden Sie unter {0}.
-
-jshell.err.file.not.accessible = Auf Datei "{1}" f\u00FCr "{0}" kann nicht zugegriffen werden: {2}
-jshell.err.file.not.found = Datei "{1}" f\u00FCr "{0}" nicht gefunden.
-jshell.err.file.exception = Datei "{1}" f\u00FCr "{0}" hat eine Ausnahme ausgel\u00F6st: {2}
-jshell.err.file.filename = F\u00FCr "{0}" muss ein Dateinamenargument angegeben werden.
-
-jshell.err.startup.unexpected.exception = Unerwartete Ausnahme beim Lesen von Startinformationen: {0}
-jshell.err.unexpected.exception = Unerwartete Ausnahme: {0}
-
-jshell.err.invalid.command = Ung\u00FCltiger Befehl: {0}
-jshell.err.command.ambiguous = Befehl "{0}" ist mehrdeutig: {1}
-jshell.msg.set.restore = Es werden neue Optionen festgelegt, und der Status wird wiederhergestellt.
-jshell.msg.set.editor.set = Editor gesetzt auf: {0}
-jshell.msg.set.editor.retain = Editoreinstellung beibehalten: {0}
-jshell.msg.set.indent.set = Einzugsebene gesetzt auf: {0}
-jshell.err.invalid.indent = Ung\u00FCltige Einzugsebene: {0}
-jshell.err.no.builtin.editor = Integrierter Editor nicht verf\u00FCgbar.
-jshell.err.cant.launch.editor = Integrierter Editor kann nicht gestartet werden - unerwartete Ausnahme: {0}
-jshell.msg.try.set.editor = Informationen zum Verwenden des externen Editors finden Sie unter "/help /set editor".
-jshell.msg.press.return.to.leave.edit.mode = Dr\u00FCcken Sie die Eingabetaste, um den Bearbeitungsmodus zu verlassen.
-jshell.err.wait.applies.to.external.editor = -wait gilt f\u00FCr externe Editoren
-jshell.label.editpad = JShell-Bearbeitungs-Pad
-
-jshell.err.setting.to.retain.must.be.specified = Die beizubehaltende Einstellung muss angegeben werden - {0}
-jshell.msg.set.show.mode.settings = \nVerwenden Sie zum Anzeigen der Moduseinstellungen "/set prompt", "/set truncation", ...,\noder verwenden Sie "/set mode" gefolgt von dem Feedbackmodusnamen.
-jshell.err.continuation.prompt.required = Fortsetzungs-Prompt erforderlich - {0}
-
-jshell.msg.try.command.without.args = Verwenden Sie "{0}" ohne Argumente.
-jshell.msg.no.active = Keine aktiven Definitionen vorhanden.
-
-jshell.msg.resetting = Wird zur\u00FCckgesetzt...
-jshell.msg.resetting.state = Status wird zur\u00FCckgesetzt.
-
-jshell.err.reload.no.previous = Keine vorherige Historie zum Wiederherstellen vorhanden
-jshell.err.reload.restarting.previous.state = Es wird ein Neustart ausgef\u00FChrt und der vorherige Status wiederhergestellt.
-jshell.err.reload.restarting.state = Neustart wird ausgef\u00FChrt und Status wiederhergestellt.
-
-jshell.err.restart.failed = Neustart nicht erfolgreich: {0}\n\nVorherige Einstellungen werden wiederhergestellt, und ein Neustart wird ausgef\u00FChrt...
-
-jshell.msg.vars.not.active = (nicht aktiv)
-
-jshell.err.out.of.range = Au\u00DFerhalb des zul\u00E4ssigen Bereichs
-
-jshell.msg.error = Fehler:
-jshell.msg.warning = Warnung:
-
-jshell.err.sub.arg = F\u00FCr den Befehl "{0}" ist ein Unterbefehl erforderlich. Siehe: "/help {0}"
-jshell.err.sub.ambiguous = Mehrdeutiges Unterbefehlsargument f\u00FCr "{0}": {1}
-
-jshell.err.classpath.arg = F\u00FCr den /classpath-Befehl ist ein Pfadargument erforderlich.
-jshell.msg.classpath = Pfad "{0}" zu Classpath hinzugef\u00FCgt
-
-jshell.err.help.arg = Es beginnen keine Befehle oder Themen mit dem angegebenen Argument: {0}
-jshell.msg.help.begin =Geben Sie einen Java-Sprachausdruck, eine Anweisung oder eine Deklaration ein.\nSie k\u00F6nnen auch einen der folgenden Befehle eingeben:\n
-jshell.msg.help.subject =\nUm weitere Informationen zu erhalten, geben Sie "/help" gefolgt von dem Namen\neines Befehls oder Themas ein.\nBeispiel: "/help /list" oder "/help intro".\n\nThemen:\n\n
-
-jshell.err.no.snippet.with.id = Kein Snippet mit ID: {0}
-jshell.err.end.snippet.range.less.than.start = Snippet-Bereichsende niedriger als Bereichsanfang: {0} - {1}
-jshell.err.range.requires.id = F\u00FCr Snippet-Bereiche sind Snippet-IDs erforderlich: {0}
-
-jshell.err.exit.not.expression = Das Argument f\u00FCr /exit muss ein g\u00FCltiger ganzzahliger Ausdruck sein. Es ist jedoch kein Ausdruck: {0}
-jshell.err.exit.bad.type = Das Argument f\u00FCr /exit muss ein g\u00FCltiger ganzzahliger Ausdruck sein. Der Typ ist {1} : {0}
-jshell.err.exit.bad.value = Das Argument f\u00FCr /exit besitzt den ung\u00FCltigen Wert {1} : {0}
-
-jshell.err.drop.arg =Geben Sie im /drop-Argument einen zu l\u00F6schenden Import oder eine zu l\u00F6schende Variable, Methode oder Klasse an.\nGeben Sie die Elemente nach ID oder Name an. Verwenden Sie /list, um IDs anzuzeigen. Verwenden Sie /reset, um den gesamten Status zur\u00FCckzusetzen.
-jshell.err.failed = Nicht erfolgreich.
-jshell.msg.native.method = Native Methode
-jshell.msg.unknown.source = Unbekannte Quelle 
-jshell.msg.goodbye = Auf Wiedersehen
-jshell.msg.goodbye.value = Auf Wiedersehen ({0})
-
-jshell.msg.help.for.help = Geben Sie /help f\u00FCr einen Hilfetext ein.
-
-jshell.err.mode.name = Feedbackmodusname erwartet: {0}
-jshell.err.missing.mode = Feedbackmodus fehlt - {0}
-jshell.err.field.name = Feldname erwartet: {0} - {1}
-jshell.err.mode.unknown = Kein Feedbackmodus benannt: {0} - {1}
-
-jshell.err.feedback.does.not.match.mode = Entspricht keinem aktuellen Feedbackmodus: {0} - {1}
-jshell.err.feedback.ambiguous.mode = Entspricht mehr als einem aktuellen Feedbackmodus: {0} - {1}
-jshell.err.feedback.must.be.quoted = Format "{0}" muss in Anf\u00FChrungszeichen gesetzt werden - {1}
-jshell.err.feedback.not.a.valid.selector = Kein g\u00FCltiger Selektor "{0}" in "{1}" - {2}
-jshell.err.feedback.multiple.sections = Art des Selektors in mehreren Abschnitten der Selektorliste "{0}" in "{1}" - {2}
-jshell.err.feedback.different.selector.kinds = Unterschiedliche Arten von Selektoren in denselben Abschnitten der Selektorliste "{0}" in "{1}" - {2}
-
-jshell.msg.feedback.new.mode = Neuen Feedbackmodus erstellt: {0}
-jshell.msg.feedback.mode = Feedbackmodus: {0}
-jshell.msg.feedback.mode.following = Verf\u00FCgbare Feedbackmodi:
-jshell.msg.feedback.retained.mode.following = Beibehaltene Feedbackmodi:
-jshell.err.mode.creation = Zum Erstellen eines neuen Modus muss entweder die Option -command oder die Option -quiet verwendet werden - {0}
-jshell.err.mode.exists = Zu erstellender Modus ist bereits vorhanden: {0} - {1}
-
-jshell.err.truncation.expected.length = Erwartete Abschneidel\u00E4nge - {0}
-jshell.err.truncation.length.not.integer = Abschneidel\u00E4nge muss eine Ganzzahl sein: {0} - {1}
-
-jshell.err.not.valid.with.predefined.mode = Nicht g\u00FCltig mit einem vordefinierten Modus: {0} - {1}
-jshell.err.retained.feedback.mode.must.be.retained.or.predefined = F\u00FCr "/set feedback -retain <Modus>" muss <Modus> vordefiniert werden oder mit "/set mode -retain" beibehalten worden sein - {0}
-
-jshell.err.unknown.option = Unbekannte Option: {0} - {1}
-jshell.err.default.option.or.program = Geben Sie Option -default, Option -delete oder das Programm an - {0}
-jshell.err.option.or.filename = Geben Sie maximal eine der Optionen -default, -none oder einen Startdateinamen an - {0}
-jshell.err.unexpected.at.end = Unerwartete Argumente am Ende des Befehls: {0} - {1}
-jshell.err.conflicting.options = Nicht miteinander vereinbare Optionen - {0}
-jshell.err.cannot.delete.current.mode = Der aktuelle Feedbackmodus "{0}" kann nicht gel\u00F6scht werden. Verwenden Sie zun\u00E4chst "/set feedback" - {1}
-jshell.err.cannot.delete.retained.mode = Der beibehaltene Feedbackmodus "{0}" kann nicht gel\u00F6scht werden. Verwenden Sie zun\u00E4chst "/set feedback -retain" - {1}
-jshell.err.may.not.specify.options.and.snippets = Optionen und Snippets d\u00FCrfen nicht gemeinsam verwendet werden: {0}
-jshell.err.no.such.snippets = Snippet nicht vorhanden: {0}
-jshell.err.the.snippet.cannot.be.used.with.this.command = Dieser Befehl akzeptiert das Snippet "{0}" nicht: {1}
-jshell.err.retained.mode.failure = Fehler in beibehaltenen Modi (Modi gel\u00F6scht) - {0} {1}
-
-jshell.err.corrupted.stored.startup = Gespeicherter Start besch\u00E4digt. Standardwert wird verwendet - {0}
-
-jshell.err.exception.thrown = Ausnahme {0}
-jshell.err.exception.thrown.message = Ausnahme {0}: {1}
-jshell.err.exception.cause = Verursacht von: {0}
-jshell.err.exception.cause.message = Verursacht von: {0}: {1}
-
-jshell.console.see.synopsis = <Erneut Tabulatortaste dr\u00FCcken, um Zusammenfassung anzuzeigen>
-jshell.console.see.full.documentation = <Erneut Tabulatortaste dr\u00FCcken, um vollst\u00E4ndige Dokumentation anzuzeigen>
-jshell.console.see.documentation = <Erneut Tabulatortaste dr\u00FCcken, um Dokumentation anzuzeigen>
-jshell.console.see.next.page = <Erneut Tabulatortaste dr\u00FCcken, um n\u00E4chste Seite anzuzeigen>
-jshell.console.see.next.javadoc = <Tabulatortaste dr\u00FCcken, um n\u00E4chste Dokumentation anzuzeigen>
-jshell.console.see.next.command.doc = <Tabulatortaste dr\u00FCcken, um n\u00E4chsten Befehl anzuzeigen>
-jshell.console.no.such.command = Befehl nicht vorhanden
-jshell.console.completion.current.signatures = Signaturen:
-jshell.console.completion.all.completions.number = <Erneut Tabulatortaste dr\u00FCcken, um alle m\u00F6glichen Abschl\u00FCsse anzuzeigen. Insgesamt m\u00F6gliche Abschl\u00FCsse: {0}>
-jshell.console.completion.all.completions = <Erneut Tabulatortaste dr\u00FCcken, um alle m\u00F6glichen Abschl\u00FCsse anzuzeigen>
-jshell.console.no.javadoc = <Keine Dokumentation gefunden>
-jshell.console.do.nothing = Nichts machen
-jshell.console.choice = Auswahl: 
-jshell.console.create.variable = Variable erstellen
-jshell.console.create.method = Methode erstellen
-jshell.console.resolvable = \nDie ID kann in diesem Kontext aufgel\u00F6st werden.
-jshell.console.no.candidate = \nKeine vollqualifizierten Kandidatennamen f\u00FCr Import gefunden.
-jshell.console.incomplete = \nErgebnisse sind m\u00F6glicherweise unvollst\u00E4ndig. Wiederholen Sie den Vorgang sp\u00E4ter, um vollst\u00E4ndige Ergebnisse zu erhalten.
-jshell.console.erroneous = \nUnvollst\u00E4ndig oder fehlerhaft. Ein einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
-jshell.console.exprstmt = \nEin einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
-jshell.console.empty = \nLeerer Eintrag. Ein einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
-
-jshell.fix.wrong.shortcut =Unerwartetes Zeichen nach Umschalt+Tab.\nVerwenden Sie "I" f\u00FCr automatischen Import, "V" zur Variablenerstellung oder "M" zur Methodenerstellung.\nWeitere Informationen finden Sie unter:\n/help shortcuts
-
-help.usage = Verwendung:   jshell <Option>... <Ladedatei>...\nM\u00F6gliche Optionen:\n    --class-path <Pfad>   Gibt an, wo die Benutzerklassendateien gespeichert sind\n    --module-path <Pfad>  Gibt an, wo die Anwendungsmodule gespeichert sind\n    --add-modules <Modul>(,<Modul>)*\n                          Gibt aufzul\u00F6sende Module oder alle Module im\n                            Modulpfad an, wenn <Modul> ALL-MODULE-PATHs ist\n    --enable-native-access\n                          Erm\u00F6glicht Ausf\u00FChrung eingeschr\u00E4nkter nativer Methoden durch Code\n    --enable-preview      Code kann Vorschaufeatures in diesem Release nutzen\n    --startup <Datei>      Ersetzung der Startdefinitionen mit einer Ausf\u00FChrung\n    --no-startup          Startdefinitionen werden nicht ausgef\u00FChrt\n    --feedback <Modus>     Gibt den anf\u00E4nglichen Feedbackmodus an. Der Modus kann\n                            vordefiniert (Silent, Concise, Normal oder Verbose) oder\n                            vorab benutzerdefiniert sein\n    -q                    Stilles Feedback. Identisch mit: --feedback concise\n    -s                    \u00C4u\u00DFerst stilles Feedback. Identisch mit: --feedback silent\n    -v                    Verbose-Feedback. Identisch mit: --feedback verbose\n    -J<Kennzeichen>              \u00DCbergibt <Kennzeichen> direkt an das Laufzeitsystem.\n                            Verwenden Sie ein -J pro Laufzeitkennzeichen oder Kennzeichenargument\n    -R<Kennzeichen>              \u00DCbergibt <Kennzeichen> an das Remotelaufzeitsystem.\n                            Verwenden Sie ein -R pro Remotekennzeichen oder Kennzeichenargument\n    -C<Kennzeichen>              \u00DCbergibt <Kennzeichen> an den Compiler.\n                            Verwenden Sie ein -C pro Compiler-Kennzeichen oder Kennzeichenargument\n    --version             Gibt Versionsinformationen aus und beendet den Vorgang\n    --show-version        Gibt Versionsinformationen aus und setzt den Vorgang fort\n    --help, -?, -h        Gibt diese Zusammenfassung der Standardoptionen aus und beendet den Vorgang\n    --help-extra, -X      Gibt Hilfetext zu Nicht-Standardoptionen aus und beendet den Vorgang\n\nEin Dateiargument kann ein Dateiname oder einer der vordefinierten Dateinamen sein: DEFAULT,\nPRINTING oder JAVASE.\nEine Ladedatei kann auch "-" zur Angabe einer Standardeingabe ohne interaktiven I/O sein.\n\nWeitere Informationen zu den Auswertungskontextoptionen (--class-path,\n--module-path und --add-modules) finden Sie unter:\n\t/help context\n\nEin Pfad listet die zu durchsuchenden Verzeichnisse und Archive auf. Verwenden Sie unter Windows ein\nSemikolon (;), um Elemente im Pfad zu trennen. Verwenden Sie auf anderen Plattformen einen\nDoppelpunkt (:), um Elemente zu trennen.\n
-help.usage.x = \    --add-exports <Modul>/<Package>   Gibt ein Package an, das als\n                                         Export aus seinem definierenden Modul gelten soll \n    --execution <Spezifikation>                 Gibt eine alternative Ausf\u00FChrungs-Engine an.\n                                         Dabei gilt: <Spezifikation> ist eine ExecutionControl-Spezifikation.\n                                         In der Dokumentation zu dem Package\n                                         jdk.jshell.spi finden Sie Informationen zur Syntax der Spezifikation\n    \nDies sind keine Standardoptionen und k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
-
-help.list.summary = Listet die eingegebene Quelle auf
-help.list.args = [<Name oder ID>|-all|-start]
-help.list =Zeigt die Snippets mit vorangestellten Snippet-IDs an.\n\n/list\n\tListet die derzeit aktiven Code-Snippets auf, die Sie eingegeben oder mit /open eingelesen haben\n\n/list -start\n\tListet die ausgewerteten Start-Snippets auf\n\n/list -all\n\tListet alle Snippets auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets\n\n/list <Name>\n\tListet Snippets mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/list <ID>\n\tF\u00FChrt das Snippet mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
-
-help.edit.summary = Bearbeitet einen Quelleintrag
-help.edit.args = <Name oder ID>
-help.edit =Bearbeitet ein oder mehrere Code-Snippets in einem externen Editor.\nDer zu verwendende Editor wird mit /set editor festgelegt. Wenn kein Editor festgelegt wird, werden\ndie folgenden Umgebungsvariablen in der folgenden Reihenfolge gepr\u00FCft: JSHELLEDITOR, VISUAL\nund EDITOR. Wenn kein Editor und auch keine der Editorumgebungsvariablen festgelegt wurde,\nwird ein einfacher Editor gestartet.\n\n/edit <Name>\n\tBearbeitet die Snippets mit den angegebenen Namen (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/edit <ID>\n\tBearbeitet das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/edit -start\n\tBearbeitet die Start-Snippets. Vorgenommene \u00C4nderungen gelten nur f\u00FCr diese Session und\n\twirken sich nicht auf die Starteinstellung aus\n\n/edit -all\n\tBearbeitet alle Snippets, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets\n\n/edit\n\tBearbeitet das derzeit aktive Code-Snippet, das Sie eingegeben oder mit /open eingelesen haben
-
-help.drop.summary = L\u00F6scht einen Quelleintrag
-help.drop.args = <Name oder ID>
-help.drop =L\u00F6scht ein Snippet (deaktiviert es).\n\n/drop <Name>\n\tL\u00F6scht das Snippet mit dem angegebenen Namen\n\n/drop <ID>\n\tL\u00F6scht das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
-
-help.save.summary = Speichert die Snippet-Quelle in einer Datei
-help.save.args = [-all|-history|-start] <Datei>
-help.save =Speichert die angegebenen Snippets und/oder Befehle in der angegebenen Datei.\n\n/save <Datei>\n\tSpeichert die Quelle derzeit aktiver Snippets in der Datei.\n\n/save -all <Datei>\n\tSpeichert die Quelle aller Snippets in der Datei.\n\tUmfasst die Quelle von \u00FCberschriebenem, nicht erfolgreichem und Startcode\n\n/save -history <Datei>\n\tSpeichert die sequenzielle Historie aller Befehle und Snippets, die seit dem\n\tStart des JShell-Tools eingegeben wurden.\n\n/save -start <Datei>\n\tSpeichert die aktuellen Startdefinitionen in der Datei\n\n/save <ID> <Datei>\n\tSpeichert das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
-
-help.open.summary = \u00D6ffnet eine Datei als Quelleingabe
-help.open.args = <Datei>
-help.open =\u00D6ffnet eine Datei und liest deren Inhalt als Snippets und Befehle.\n\n/open <Datei>\n\tLiest die angegebene Datei als JShell-Tooleingabe.\n\nDie <Datei> kann der Name einer Betriebssystemdatei oder einer der folgenden vordefinierten\nDateinamen sein: DEFAULT, PRINTING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf() bzw.\nImporte aller Java SE-Packages.\n
-
-help.vars.summary = Listet die deklarierten Variablen und ihre zugeh\u00F6rigen Werte auf
-help.vars.args = [<Name oder ID>|-all|-start]
-help.vars =Listet den Typ, Namen und Wert der eingegebenen Variablen auf.\n\n/vars\n\tListet den Typ, Namen und Wert der derzeit aktiven Variablen auf\n\n/vars <Name>\n\tListet Variablen mit dem angegebenen Namen auf (aktive Variablen werden bevorzugt aufgef\u00FChrt)\n\n/vars <ID>\n\tListet die Variable mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/vars -start\n\tListet die Variablen in den ausgewerteten Start-Snippets auf\n\n/vars -all\n\tListet alle Variablen auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Startvariablen
-
-help.methods.summary = Listet die deklarierten Methoden und ihre zugeh\u00F6rigen Signaturen auf
-help.methods.args = [<Name oder ID>|-all|-start]
-help.methods =Listet den Namen, die Parametertypen und den R\u00FCckgabetyp der eingegebenen Methoden auf.\n\n/methods\n\tListet den Namen, die Parametertypen und den R\u00FCckgabetyp der derzeit aktiven Methoden auf\n\n/methods <Name>\n\tListet die Methoden mit dem angegebenen Namen auf (aktive Methoden werden bevorzugt aufgef\u00FChrt)\n\n/methods <ID>\n\tListet die Methode mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/methods -start\n\tListet die Methoden in den ausgewerteten Start-Snippets auf\n\n/methods -all\n\tListet alle Snippets auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets
-
-help.types.summary = Listet die Typdeklarationen auf
-help.types.args =[<Name oder ID>|-all|-start]
-help.types =Listet eingegebene Klassen und Schnittstellen auf.\n\n/types\n\tListet die derzeit aktiven Typdeklarationen auf\n\n/types <Name>\n\tListet die Typdeklarationen mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/types <ID>\n\tListet die Typdeklaration mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/types -start\n\tListet die Typdeklarationen in den ausgewerteten Start-Snippets auf\n\n/types -all\n\tListet alle Typdeklarationen auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Starttypdeklarationen
-
-help.imports.summary = Listet die importierten Elemente auf
-help.imports.args =
-help.imports =Listet die derzeit aktiven Importe auf. Dies umfasst Importe aus\nStart-Snippets.
-
-help.exit.summary = Beendet das JShell-Tool
-help.exit.args =[<Snippet mit ganzzahligem Ausdruck>]
-help.exit =Beendet das JShell-Tool. \u00C4nderungen werden nicht gespeichert.\nSpeichern Sie Ihre \u00C4nderungen, bevor Sie diesen Befehl ausf\u00FChren\n\n/exit\n\tBeendet das JShell-Tool. Der Beendigungsstatus ist null\n\n/exit <Snippet mit ganzzahligem Ausdruck>\n\tWertet das Snippet aus. Wenn das Snippet nicht erfolgreich oder kein ganzzahliger Ausdruck ist,\n\twird der Fehler angezeigt. Andernfalls wird das JShell-Tool mit dem\n\tAusdruckswert als Beendigungsstatus beendet
-
-help.reset.summary = Setzt das JShell-Tool zur\u00FCck
-help.reset.args = [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>]...
-help.reset =Setzt den Code und den Ausf\u00FChrungsstatus des JShell-Tools zur\u00FCck:\n\t* Der gesamte eingegebene Code geht verloren\n\t* Der Ausf\u00FChrungsstatus wird neu gestartet\n\t* Der Startcode wird erneut ausgef\u00FChrt\nSpeichern Sie Ihre \u00C4nderungen, bevor Sie diesen Befehl verwenden.\nDer /reset-Befehl akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n
-
-help.reload.summary = Setzt die relevante Historie (derzeitige oder vorherige) zur\u00FCck und gibt sie erneut wieder (-restore)
-help.reload.args = [-restore] [-quiet] [-class-path <Pfad>] [-module-path <Pfad>]...
-help.reload =Setzt den Code und den Ausf\u00FChrungsstatus des JShell-Tools zur\u00FCck und gibt anschlie\u00DFend jedes g\u00FCltige Snippet\nsowie alle /drop-Befehle in der Reihenfolge wieder, in der sie eingegeben wurden.\n\n/reload\n\tDient zum Zur\u00FCcksetzen und Wiedergeben der g\u00FCltigen Historie seit Starten des JShell-Tools bzw.\n\tseit Ausf\u00FChrung eines /reset- oder /reload-Befehls - je nachdem, was\n\tals Letztes erfolgt ist\n\n/reload -restore\n\tDient zum Zur\u00FCcksetzen und Wiedergeben der g\u00FCltigen Historie zwischen dem vorherigen und aktuellen\n\tStarten des JShell-Tools bzw. der Ausf\u00FChrung eines /reset-, /reload- oder /env-\n\tBefehls. Diese Wiedergabe kann somit zum Wiederherstellen einer vorherigen\n\tJShell-Toolsession verwendet werden\n\n/reload [-restore] -quiet\n\tMit dem Argument "-quiet" wird die Wiedergabe nicht angezeigt, etwaige Fehler\n\thingegen schon\n\nJeder der obigen Befehle akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n\nBeispiel:\n\n\t/reload -add-modules com.greetings -restore
-
-help.env.summary = Zeigt den Auswertungskonzept an oder \u00E4ndert ihn
-help.env.args = [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...
-help.env =Zeigt den Auswertungskontext an oder \u00E4ndert ihn. Der Auswertungskontext ist der Classpath,\nModulpfad usw.\n\n/env\n\tZeigt den Auswertungskontext als Kontextoptionen an\n\n/env [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...\n\tDurch Festlegen mindestens einer Option wird der Auswertungskontext festgelegt. Wenn Snippets\n\tdefiniert wurden, wird der Ausf\u00FChrungsstatus auf den neuen Auswertungskontext\n\tzur\u00FCckgesetzt, und die Snippets werden erneut wiedergegeben. Die Wiedergabe wird nicht \n\tangezeigt, etwaige Fehler hingegen schon. Dies entspricht:\n\n\t\t/reload -quiet ...\n\nWeitere Einzelheiten zu Auswertungskontextoptionen finden Sie unter:\n\n\t/help context\n\nBeispiel:\n\n\t/env -add-modules com.greetings
-
-help.history.summary = Historie Ihrer Eingaben
-help.history.args = [-all]
-help.history =Zeigt die Historie der Snippet- und Befehlseingaben an.\n\n/history\n\tListet die Historie der Snippet- und Befehlseingaben seit Start des JShell-Tools auf\n\n/history -all\n\tListet die gesamte Historie der Snippet- und Befehlseingaben aus dieser und vorherigen Sessions auf
-
-help.debug.summary = Schaltet Debugging des JShell-Tools um
-help.debug.args = [0][r][g][f][c][d][e]
-help.debug =Zeigt Debugginginformationen f\u00FCr die JShell-Toolimplementierung an.\n0: Debugging deaktiviert\nr: Debugging auf Toolebene aktiviert\ng: Allgemeines Debugging aktiviert\nf: Dateimanagerdebugging aktiviert\nc: Abschlussanalysedebugging aktiviert\nd: Abh\u00E4ngigkeitsdebugging aktiviert\ne: Ereignisdebugging aktiviert
-
-help.help.summary = Ruft Informationen zur Verwendung des JShell-Tools ab
-help.help.args = [<Befehl>|<Thema>]
-help.help =Zeigt Informationen zur Verwendung des JShell-Tools an.\n/help\n\tListet die Befehle und Hilfethemen des JShell-Tools auf\n\n/help <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden ben\u00F6tigt - bei mehr als einer\n\t\u00DCbereinstimmung wird jede einzelne angezeigt. Beispiel: /help /li\n\n/help <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /help intro
-
-help.set.summary = Legt Konfigurationsinformationen fest
-help.set.args = editor|start|feedback|mode|prompt|truncation|format ...
-help.set =Legt die Konfigurationsinformationen f\u00FCr das JShell-Tool fest, darunter:\nden zu verwendenden externen Editor, die zu verwendenden Startdefinitionen, einen neuen Feedbackmodus,\nden Befehls-Prompt, den zu verwendenden Feedbackmodus oder das Ausgabeformat.\n\n/set editor [-wait] <Befehl> <optionales Argument>...\n\tGibt den Befehl an, der f\u00FCr den /edit-Befehl gestartet werden soll.\n\tDer <Befehl> ist eine betriebssystemabh\u00E4ngige Zeichenfolge\n\n/set start <Datei>\n\tDer Inhalt der angegebenen <Datei> wird zu den Standardstart-Snippets und -befehlen\n\n/set feedback <Modus>\n\tLegt den Feedbackmodus fest, der das angezeigte Feedback f\u00FCr eingegebene Snippets und Befehle beschreibt\n\n/set mode <Modus> [<alter Modus>] -command|-quiet|-delete\n\tErstellt oder aktualisiert einen benutzerdefinierten Feedbackmodus. Optional kann er auch von einem vorhandenen Modus kopiert werden\n\n/set prompt <Modus> "<Prompt>" "<Fortsetzungs-Prompt>"\n\tLegt die angezeigten Prompts f\u00FCr einen angegebenen Feedbackmodus fest\n\n/set truncation <Modus> <L\u00E4nge> <Selektor>...\n\tLegt die maximale L\u00E4nge eines angezeigten Wertes fest\n\n/set format <Modus> <Feld> "<Format>" <Selektor>...\n\tKonfiguriert einen Feedbackmodus durch Festlegen des Formats eines Feldes, wenn der Selektor \u00FCbereinstimmt\n\n/set indent <Anzahl>\n\tLegt die Anzahl der Leerzeichen fest, mit denen Snippets automatisch einger\u00FCckt werden sollen\n\n/set\n\tZeigt Editor-, Start- und Feedbackeinstellungen als /set-Befehle an.\n\tLassen Sie den festgelegten Wert weg, um die Einstellungen eines der oben genannten Befehle anzuzeigen\n\nUm weitere Informationen zu einem dieser Formate zu erhalten, verwenden Sie /help mit dem angegebenen Format.\nBeispiel:   /help /set format
-
-help.quest.summary = Ruft Informationen zur Verwendung des JShell-Tools ab
-help.quest.args = [<Befehl>|<Thema>]
-help.quest =Zeigt Informationen zur Verwendung des JShell-Tools an (Abk\u00FCrzung f\u00FCr /help).\n/?\n\tZeigt eine Liste der Befehle und Hilfethemen an\n/? <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden ben\u00F6tigt - bei mehr als einer\n\t\u00DCbereinstimmung wird jeder einzelne angezeigt. Beispiel: /? /li\n\n/? <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /? intro
-
-help.bang.summary = F\u00FChrt das letzte Snippet erneut aus, siehe: /help rerun
-help.bang.args =
-help.bang =Wertet das zuletzt eingegebene Snippet erneut aus.
-
-help.slashID.summary = F\u00FChrt Snippets nach ID oder ID-Bereich erneut aus, siehe: /help rerun
-help.slashID.args =
-help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\nWertet die durch die ID oder den ID-Bereich angegebenen Snippets erneut aus.\nEin ID-Bereich wird als zwei per Bindestrich getrennte IDs dargestellt. Beispiel:  3-17\nStart- und Fehler-Snippets k\u00F6nnen verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs k\u00F6nnen beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe "/help id".
-
-help.previous.summary = F\u00FChrt das n-te vorherige Snippet erneut aus, siehe: /help rerun
-help.previous.args =
-help.previous =Wertet das n-te zuletzt eingegebene Snippet erneut aus.
-
-help.intro.summary = Einf\u00FChrung in das JShell-Tool
-help.intro =Mit dem JShell-Toll k\u00F6nnen Sie Java-Code ausf\u00FChren und umgehend Ergebnisse erhalten.\nSie k\u00F6nnen eine Java-Definition (Variable, Methode, Klasse usw.) wie int x = 8,\neinen Java-Ausdruck wie x + x,\neine Java-Anweisung oder einen Java-Import eingeben.\nDiese kleinen Java-Code-Chunks werden als "Snippets" bezeichnet.\n\nAu\u00DFerdem stehen Ihnen die JShell-Toolbefehle zur Verf\u00FCgung, mit denen Sie Ihr Vorgehen\nbesser verstehen und steuern k\u00F6nnen. Beispiel: /list\n\nEine Liste der Befehle k\u00F6nnen Sie aufrufen mit: /help
-
-help.keys.summary = Beschreibung der Readline-\u00E4hnlichen Eingabebearbeitung
-help.keys =Das JShell-Tool bietet Unterst\u00FCtzung f\u00FCr Zeilenbearbeitung, damit Sie in Snippets\nund Befehlen navigieren und diese bearbeiten k\u00F6nnen. Sie k\u00F6nnen den aktuellen Befehl/das aktuelle Snippet bearbeiten\noder vorherige Befehle/Snippets aus der Historie abrufen, bearbeiten und ausf\u00FChren.\nDiese Unterst\u00FCtzung \u00E4hnelt Readline/Editline mit einfachen Emacs-\u00E4hnlichen Bindings.\nEs gibt auch f\u00FCr das JShell-Tool spezifische Schl\u00FCsselsequenzen.\n\nZeilen- und Historiennavigation:\n\n\tEingabetaste\n\t\tGibt das aktuelle Snippet ein\n\tNach-links-Taste oder Strg+B\n\t\tNavigiert ein Zeichen zur\u00FCck\n\tNach-rechts-Taste oder Strg+F\n\t\tNavigiert ein Zeichen vorw\u00E4rts\n\tNach-oben-Taste oder Strg+P\n\t\tNavigiert eine Zeile nach oben, r\u00FCckw\u00E4rts in der Historie\n\tNach-unten-Taste oder Strg+N\n\t\tNavigiert eine Zeile nach unten, vorw\u00E4rts in der Historie\n\tStrg+A\n\t\tNavigiert an den Anfang der Zeile\n\tStrg+E\n\t\tNavigiert an das Ende der Zeile\n\tMeta+B\n\t\tNavigiert ein Wort zur\u00FCck\n\tMeta+F\n\t\tNavigiert ein Wort vorw\u00E4rts\n\tStrg+R\n\t\tDurchsucht die Historie r\u00FCckw\u00E4rts\n\n\nEinfache Zeilen- und Historienbearbeitung:\n\n\tMeta+Eingabetaste oder Strg+Eingabetaste (je nach Plattform)\n\t\tF\u00FCgt eine neue Zeile in das Snippet ein\n\tStrg+_ (f\u00FCr Unterstrich kann Umschalttaste erforderlich sein) oder Strg+X gefolgt von Strg+U\n\t\tMacht \u00C4nderung r\u00FCckg\u00E4ngig. Wiederholen Sie die Eingabe, um weitere \u00C4nderungen r\u00FCckg\u00E4ngig zu machen\n\tEntf\n\t\tL\u00F6scht das Zeichen bei dem oder hinter dem Cursor, je nach Betriebssystem\n\tR\u00FCcktaste\n\t\tL\u00F6scht das Zeichen vor dem Cursor\n\tStrg+K\n\t\tL\u00F6scht den Text vom Cursor bis zum Ende der Zeile\n\tMeta+D\n\t\tL\u00F6scht den Text vom Cursor bis zum Ende des Wortes\n\tStrg+W\n\t\tL\u00F6scht den Text vom Cursor bis zum vorangegangenen Leerzeichen\n\tStrg+Y\n\t\tF\u00FCgt den zuletzt gel\u00F6schten Text in die Zeile ein\n\tMeta+Y\n\t\tNach Strg+Y durchl\u00E4uft Meta+Y den zuletzt gel\u00F6schten Text\n\tStrg+X gefolgt von Strg+K\n\t\tL\u00F6scht das gesamte Snippet\n\n\nTastenkombinationen f\u00FCr JShell-Tool:\n\n\tWeitere Einzelheiten k\u00F6nnen Sie aufrufen \u00FCber: /help shortcuts\n\n\tTab\n\t\tSchlie\u00DFt Java-ID oder JShell-Befehl ab\n\tUmschalt+Tab gefolgt von V\n\t\tKonvertiert den Ausdruck in eine Variablendeklaration\n\tUmschalt+Tab gefolgt von M\n\t\tKonvertiert die Anweisung in eine Methodendeklaration\n\tUmschalt+Tab gefolgt von I\n\t\tF\u00FCgt Importe f\u00FCr diese ID hinzu\n\t\n\nWeitere Zeilen- und Historienbearbeitung:\n\n\tStrg+L\n\t\tBereinigt den Bildschirm und gibt das Snippet erneut aus\n\tStrg+U\n\t\tL\u00F6scht die gesamte Zeile\n\tStrg+T\n\t\tTransponiert Zeichen\n\tStrg+X gefolgt von Strg+B\n\t\tNavigiert zur entsprechenden Klammer, eckigen Klammer, ...\n\tStrg+X gefolgt von =\n\t\tAktiviert den Modus zum Anzeigen der aktuellen Zeichenposition\n\tStrg+X gefolgt von Strg+O\n\t\tSchaltet um zwischen \u00DCberschreiben und Einf\u00FCgen von Zeichen\n\tMeta+C\n\t\tSetzt Anfangsbuchstaben eines Wortes in Gro\u00DFbuchstaben\n\tMeta+U\n\t\tKonvertiert ein Wort in Gro\u00DFbuchstaben\n\tMeta+L\n\t\tKonvertiert ein Wort in Kleinbuchstaben\n\tMeta+0 bis Meta+9 gefolgt von Taste\n\t\tWiederholt den Vorgang die angegebene Anzahl von Malen\n\nDabei gilt z.B.: "Strg+A" bedeutet, dass Sie die Steuerungstaste gedr\u00FCckt halten und A dr\u00FCcken.\nAuf vielen Tastaturen ist die Taste "Meta" gleichbedeutend mit der Taste "Alt".\nUnterst\u00FCtzung f\u00FCr Zeilenbearbeitung wird von JLine 3 abgeleitet.
-
-help.shortcuts.summary = Beschreibung der Tastenanschl\u00E4ge f\u00FCr Snippet- und Befehlsabschluss,\nZugriff auf Informationen und automatische Codegenerierung
-help.shortcuts =Unterst\u00FCtzte Tastenkombinationen:\n\n\tTab\n\t\tDr\u00FCcken Sie nach Eingabe der ersten paar Buchstaben einer Java-ID,\n\t\teines JShell-Toolbefehls oder, in einigen F\u00E4llen, eines JShell-\n\t\tToolbefehlsarguments die Tabulatortaste, um die Eingabe abzuschlie\u00DFen.\n\t\tWenn mehrere Abschl\u00FCsse vorhanden sind, werden m\u00F6gliche Abschl\u00FCsse\n\t\tangezeigt.\n\t\tDurch erneutes Dr\u00FCcken der Tabulatortaste wird Dokumentation angezeigt, sofern vorhanden und relevant.\n\n\tUmschalt+Tab gefolgt von V\n\t\tHalten Sie nach einem abgeschlossenen Ausdruck die Umschalttaste gedr\u00FCckt,\n\t\tund dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken Sie die Taste V.\n\t\tDer Ausdruck wird in eine Variablendeklaration konvertiert, \n\t\tderen Typ auf dem Typ des Ausdrucks basiert.\n\n\tUmschalt+Tab gefolgt von M\n\t\tHalten Sie nach Abschluss eines Ausdrucks oder einer Anweisung die\n\t\tUmschalttaste gedr\u00FCckt, und dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken\n\t\tSie die Taste M. Der Ausdruck bzw. die Anweisung wird in eine\n\t\tMethodendeklaration konvertiert. Bei einem Ausdruck basiert der\n\t\tR\u00FCckgabetyp der Methode auf dem Typ des Ausdrucks.\n\n\tUmschalt+Tab gefolgt von I\n\t\tHalten Sie nach einer nicht aufl\u00F6sbaren ID die Umschalttaste gedr\u00FCckt,\n\t\tund dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken Sie die Taste I.\n\t\tDas JShell-Tool schl\u00E4gt daraufhin m\u00F6gliche Importe vor, die die\n\t\tID basierend auf dem Inhalt des angegebenen Classpath aufl\u00F6sen werden.\n\t\tGeben Sie die Ziffer ein, die dem gew\u00FCnschten Import entspricht,\n\t\toder dr\u00FCcken Sie die Taste 0, um keine Importe hinzuzuf\u00FCgen.\n\nInformationen zu weiteren Sondertasten k\u00F6nnen Sie aufrufen durch: /help keys
-
-help.context.summary = Beschreibung der Auswertungskontextoptionen f\u00FCr /env /reload und /reset
-help.context =Mit diesen Optionen wird der Auswertungskontext konfiguriert. Sie k\u00F6nnen beim Starten des \nJShell-Tools in der Befehlszeile oder beim Neustarten des JShell-Tools mit den Befehlen\n/env, /reload oder /reset als Befehlsoptionen angegeben werden.\n\nSie lauten:\n\t--class-path <Pfad>\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Klassendateien durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--module-path <Pfad>...\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Modulen durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--add-modules <Modulname>[,<Modulname>...]\n\t\tRoot-Module, die zus\u00E4tzlich zum Ausgangsmodul aufgel\u00F6st werden sollen.\n\t\t<Modulname> kann auch ALL-DEFAULT, ALL-SYSTEM,\n\t\tALL-MODULE-PATH sein.\n\t--add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n\t\taktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n\t\tunabh\u00E4ngig von der Moduldeklaration.\n\t\t<Zielmodul> kann ALL-UNNAMED sein, um in alle unbenannten\n\t\tModule zu exportieren. Wenn in JShell das <Zielmodul> nicht angegeben\n\t\twird (no =), wird ALL-UNNAMED verwendet.\n\nAuswertungskontextoptionen, die in der Befehlszeile eingegeben oder mit einem vorherigen\n/reset-, /env- oder /reload-Befehl angegeben werden, werden beibehalten, es sei denn,\nes wird eine Option eingegeben, die die Einstellung au\u00DFer Kraft setzt.\n\nIn der Befehlszeile ben\u00F6tigen diese Optionen zwei Bindestriche. Beispiel: --module-path\nIn den JShell-Toolbefehlen k\u00F6nnen sie ein oder zwei Bindestriche aufweisen. Beispiel: -module-path
-
-help.id.summary = Beschreibung der Snippet-IDs und deren Verwendung
-help.id =Jedes eingegebene Code-Snippet hat eine eindeutige Snippet-ID. Auch wenn Sie\ndasselbe Snippet erneut eingeben, erh\u00E4lt es eine neue ID. Bei normalen Snippets ist die ID\neine aufsteigende Zahl. Snippets, die mit einem Fehler nicht erfolgreich verlaufen, haben eine\nmit "e" beginnende Snippet-ID. Start-Snippets haben eine mit "s" beginnende ID.\n\nEine Snippet-ID stellt eine der M\u00F6glichkeiten dar, in einem Befehl auf ein Snippet zu verweisen. Beispiel:\nMit dem folgenden Befehl wird das Snippet mit der ID "14" gel\u00F6scht:\n\n\t/drop 14\n\nMit dem Befehl "/list" zeigen Sie die ID eines oder mehrerer Snippets an. Um die ID\naller Snippets anzuzeigen, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen und Start-Snippets,\nverwenden Sie den Befehl "/list -all".\n\nSie k\u00F6nnen auch auf einen ID-Bereich verweisen, indem Sie die Anfangs-ID und die End-ID mit einem\nBindestrich trennen. Beispiel: "1-4" entspricht "1 2 3 4". F\u00FCr alle Befehle,\ndie auf Snippets verweisen, kann eine Liste mit IDs, ID-Bereichen und Snippet-Namen\nals Argumenten angegeben werden. Diese Befehle sind: /list, /edit, /drop, /save, /vars, /methods,\n/types und /<id>. Einige Beispiele:\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\nSiehe "/help /edit", "/help /save" bzw. "/help rerun".
-
-help.rerun.summary = Beschreibung von M\u00F6glichkeiten zur erneuten Auswertung zuvor eingegebener Snippets
-help.rerun =Es gibt vier M\u00F6glichkeiten zur erneuten Auswertung zuvor eingegebener Snippets.\nDas letzte Snippet kann erneut ausgewertet werden mit: /!\nDas n-te vorherige Snippet kann mit Schr\u00E4gstrich-Minus und der jeweiligen Ziffer f\u00FCr n erneut ausgewertet werden. Beispiel: /-4\nBeispiel:\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\nDie erneut auszuwertenden Snippets k\u00F6nnen per Snippet-ID oder ID-Bereich angegeben werden.\nEin ID-Bereich wird als zwei durch Bindestrich getrennte IDs dargestellt. Beispiel: 3-17\nEs k\u00F6nnen auch Start- und Fehler-Snippets verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs k\u00F6nnen beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe auch "/help id".\n\nAu\u00DFerdem k\u00F6nnen Sie die Historie auch r\u00FCckw\u00E4rts durchsuchen, indem Sie Strg+R gefolgt von der zu suchenden Zeichenfolge eingeben.
-
-help.set._retain = Mit der Option "-retain" wird eine Einstellung zur Verwendung in zuk\u00FCnftigen Sessions gespeichert.\nDie -retain-Option kann f\u00FCr die folgenden Formen von /set verwendet werden:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\nWeitere Einzelheiten zu diesen Befehlen - Beispiel: /help /set editor
-
-help.set.format.summary = Legt das Format zum Melden eines Snippet-Ereignisses fest
-
-help.set.format = Legt das Format zum Melden eines Snippet-Ereignisses fest:\n\n\t/set format <Modus> <Feld> "<Format>" <Selektor>...\n\nZeigt Formateinstellungen an:\n\n\t/set format [<Modus> [<Feld>]]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<Feld> ist der Name des zu definierenden kontextspezifischen Formats.\n<Format> ist eine in Anf\u00FChrungszeichen gesetzte Zeichenfolge, die zum Wert des Feldes wird, wenn einer der\nSelektoren \u00FCbereinstimmt (oder keine Selektoren vorhanden sind). Bei Verwendung dieses Formats\nwerden in geschweiften Klammern eingeschlossene Feldnamen durch den Wert des Feldes zu diesem\nZeitpunkt ersetzt. Diese Felder k\u00F6nnen zuvor mit diesem Befehl definiert worden sein oder k\u00F6nnen\neines der folgenden vordefinierten, kontextspezifischen Felder sein:\n\t{name}       == Der Name. Beispiel: Variablenname, ...\n\t{type}       == Der Typname. Der Typ einer Variablen oder eines Ausdrucks, die\n\t\t\tParametertypen einer Methode\n\t{value}      == Der Ergebniswert eines Ausdrucks oder einer Variableninitialisierung\n\t{unresolved} == Die Liste nicht aufgel\u00F6ster Referenzen\n\t{errors}     == Die Liste behebbarer Fehler (nur w\u00E4hrend der Verarbeitung\n\t\t\tdes Feldes "display")\n\t{err}        == Eine nicht formatierte Fehlerzeile (nur w\u00E4hrend der Verarbeitung\n\t\t\tdes Feldes "errorline")\nZur Bestimmung des angezeigten Feedbacks greift das Tool auf folgende Felder zu:\n\t{display}    == Die angezeigte Meldung f\u00FCr ein Snippet-Ereignis\n\t{errorline}  == Das Format einer Fehlerzeile im Feld "errors"\n\t{pre}        == Das Feedbackpr\u00E4fix (am Beginn des Befehlsfeedbacks)\n\t{post}       == Das Feedback-Postfix (am Ende des Befehlsfeedbacks)\n\t{errorpre}   == Das Fehlerpr\u00E4fix (am Beginn des Fehlerfeedbacks)\n\t{errorpost}  == Das Fehler-Postfix (am Ende des Fehlerfeedbacks)\nDiese Fehler haben Standardeinstellungen (die \u00FCberschrieben werden k\u00F6nnen).\nDabei gilt: <Selektor> ist der Kontext, in dem das Format angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt \u00FCberein, wenn jede Selektortypliste \u00FCbereinstimmt. Eine Selektortypliste\nstimmt \u00FCberein, wenn einer der Werte \u00FCbereinstimmt.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\timport     -- Importdeklaration\n\tclass      -- Klassendeklaration\n\tinterface  -- Schnittstellendeklaration\n\tenum       -- Enum-Deklaration\n\tannotation -- Annotationsschnittstellendeklaration\n\trecord     -- Datensatzdeklaration\n\tmethod     -- Methodendeklaration -- Hinweis: {type}==parameter-types\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\n\tstatement  -- Anweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugef\u00FCgt\n\tmodified  -- Ein vorhandenes Snippet wurde ge\u00E4ndert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\n\toverwrote -- Ein vorhandenes Snippet wurde \u00FCberschrieben\n\tdropped   -- Snippet wurde gel\u00F6scht\n\tused      -- Snippet wurde verwendet, wo es nicht zul\u00E4ssig war\nDer when-did-it-occur-Selektortyp beschreibt, ob es sich um eine direkte oder indirekte Aktion handelt. Die Werte lauten:\n\tprimary -- Das eingegebene Snippet\n\tupdate  -- Ein Update eines abh\u00E4ngigen Snippets\nDer resolution-state-Selektortyp beschreibt den Aufl\u00F6sungs-/Definitionsstatus des Snippets. Die Werte lauten:\n\tok         -- Korrekt aufgel\u00F6st\n\tdefined    -- Trotz \
-behebbarer nicht aufgel\u00F6ster Referenzen definiert\n\tnotdefined -- Aufgrund behebbarer nicht aufgel\u00F6ster Referenzen nicht definiert\nDer unresolved-count-Selektortyp beschreibt die Anzahl nicht aufgel\u00F6ster Referenzen. Die Werte lauten:\n\tunresolved0 -- Es sind keine nicht aufgel\u00F6sten Namen vorhanden\n\tunresolved1 -- Es ist ein nicht aufgel\u00F6ster Name vorhanden\n\tunresolved2 -- Es sind mindestens zwei nicht aufgel\u00F6ste Namen vorhanden\nDer errors-count-Selektortyp beschreibt die Anzahl der Fehler. Die Werte lauten:\n\terror0 -- Keine Fehler\n\terror1 -- Ein Fehler\n\terror2 -- Mindestens zwei Fehler\n\nBeispiele:\n\t/set format mymode action 'Erstellt' added-primary\n\t/set format mymode action 'Update ersetzt' replaced-update\n\t/set format mymode display '{pre}{action} Klasse {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}' replaced-vardecl,varinit-ok-update\n\nNachfolgende Selektoren f\u00FCr ein Feld k\u00F6nnen einige oder alle zuvor verwendeten Selektoren \u00FCberschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <Format> werden die aktuellen Formateinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Formateinstellungen f\u00FCr diesen Modus angezeigt.\nBei Angabe von sowohl <Modus> als auch <Feld> werden nur die Formateinstellungen f\u00FCr\ndiesen Modus und dieses Feld angezeigt. Beispiel:\n\t/set format mymode\nzeigt die Formateinstellungen f\u00FCr den Modus "mymode" an\n
-
-help.set.truncation.summary = Legt die maximale L\u00E4nge eines angezeigten Wertes fest
-
-help.set.truncation = Legt die maximale L\u00E4nge eines angezeigten Wertes fest:\n\n\t/set truncation <Modus> <L\u00E4nge> <Selektor>...\n\nAktuelle Abschneideeinstellungen anzeigen:\n\n\t/set truncation [<Modus>]\n\nHier gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<L\u00E4nge> ist eine Ganzzahl ohne Vorzeichen, die eine Maximall\u00E4nge angibt.\n<Selektor> ist nur erforderlich, wenn Sie die Abschneidel\u00E4nge des Wertes nach Kontext\noptimieren m\u00F6chten. In diesem Fall ist <Selektor> der Kontext, in dem das Abschneiden angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt \u00FCberein, wenn jede Selektortypliste \u00FCbereinstimmt. Eine Selektortypliste\nstimmt \u00FCberein, wenn einer der Werte \u00FCbereinstimmt.\n\nNachfolgend sind die entsprechenden Selektortypen f\u00FCr das Abschneiden aufgelistet.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugef\u00FCgt\n\tmodified  -- Ein vorhandenes Snippet wurde ge\u00E4ndert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\nBeispiele:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\nNachfolgende Selektoren f\u00FCr ein Feld k\u00F6nnen einige oder alle zuvor verwendeten Selektoren \u00FCberschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <L\u00E4nge> werden die Abschneideeinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Abschneideeinstellungen f\u00FCr diesen Modus angezeigt.\nBeispiel:\n\t/set truncation mymode\nZeigt die Abschneideeinstellungen f\u00FCr den Modus "mymode" an\n
-
-help.set.feedback.summary = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks f\u00FCr eingegebene Snippets und Befehle fest
-
-help.set.feedback = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks f\u00FCr eingegebene Snippets und Befehle fest:\n\n\t/set feedback [-retain] <Modus>\n\nBeh\u00E4lt den aktuellen Feedbackmodus f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set feedback -retain\n\nZeigt den Feedbackmodus an und listet verf\u00FCgbare Modi auf:\n\n\t/set feedback\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\nSie d\u00FCrfen nur gerade gen\u00FCgend Buchstaben verwenden, um den Namen eindeutig zu machen.\nBenutzerdefinierte Modi k\u00F6nnen hinzugef\u00FCgt werden, siehe "/help /set mode"\n\nBei Verwendung der -retain-Option wird diese Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Modus> oder -retain werden der aktuelle Feedbackmodus und verf\u00FCgbare Modi angezeigt.\n
-
-help.set.mode.summary = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus)
-
-help.set.mode = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus):\n\n\t/set mode <neuer Modus> [<alter Modus>] (-command|-quiet)\n\nBeh\u00E4lt einen benutzerdefinierten Feedbackmodus f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set mode -retain <Modus>\n\nL\u00F6scht einen benutzerdefinierten Feedbackmodus:\n\n\t/set mode -delete [-retain] <Modus>\n\nZeigt Feedbackmoduseinstellungen an:\n\n\t/set mode [<Modus>]\n\nDabei gilt: <neuer Modus> ist der Name des zu erstellenden Modus.\n<alter Modus> ist der Name eines vorhandenen Feedbackmodus.\n<Modus> ist der Name eines vorhandenen Feedbackmodus.\n\nBei Angabe von <alter Modus> werden die zugeh\u00F6rigen Einstellungen in den neuen Modus kopiert.\n\nDas Feedback, das ein Modus f\u00FCr eingegebene Snippets bereitstellt, wird von den "/set format"-Einstellungen\nbestimmt. F\u00FCr eingegebene Befehle ist das Feedback dagegen entweder aktiviert oder deaktiviert.\nDies wird durch die beim Erstellen des Modus verwendete Option bestimmt. Es muss entweder die Option "-command"\noder die Option "-quiet" angegeben werden. Bei Verwendung von "-command" wird im neuen Modus informatives\nund best\u00E4tigendes Befehlsfeedback angezeigt. Bei Verwendung von "-quiet" wird bei Befehlen\nnur erforderliches Feedback angegeben (z.B. Fehler).\n\nNach dem Erstellen des neuen Modus k\u00F6nnen Sie diesen mit "/set format", "/set prompt und "/set truncation"\nkonfigurieren. Verwenden Sie "/set feedback", um den neuen Modus zu verwenden.\n\nBei Verwendung der Option "-retain" (ohne Option "-delete") wird der Modus (einschlie\u00DFlich\ndes aktuellen Prompts, Formats und der Abschneideeinstellungen) zur Verwendung in\nzuk\u00FCnftigen Ausf\u00FChrungen des JShell-Tools gespeichert. Wenn "-retain" nicht verwendet wird, wird der Modus nur in\nder aktuellen Session definiert. Verwenden Sie "-retain" nach dem Aktualisieren der Moduseinstellungen erneut,\num die Updates session\u00FCbergreifend beizubehalten.\n\nWenn nur die Option "-delete" verwendet wird, wird der Modus aus der aktuellen Session gel\u00F6scht.\nWenn sowohl "-retain" als auch "-delete" verwendet werden, wird der Modus aus der aktuellen und aus\nzuk\u00FCnftigen Sessions gel\u00F6scht.\n\nBei fehlender Angabe von Optionen werden die Moduseinstellungen angezeigt.\nBei Angabe des <Modus> werden nur die Moduseinstellungen f\u00FCr diesen Modus angezeigt.\nHinweis: Die Einstellungen f\u00FCr den Modus umfassen die Einstellungen f\u00FCr Prompt, Format und\nAbschneiden.\nBeispiel:\n\t/set mode mymode\n\nZeigt Modus, Prompt, Format und Abschneideeinstellungen f\u00FCr den Modus "mymode" an
-
-help.set.prompt.summary = Legt die Prompts fest
-
-help.set.prompt = Legt die Prompts fest. Es m\u00FCssen sowohl der normale als auch der Fortsetzungs-Prompt festgelegt werden:\n\n\t/set prompt <mode> "<Prompt>" "<Fortsetzungs-Prompt>"\n\nZeigt den normalen und den Fortsetzungs-Prompt an:\n\n\t/set prompt [<Modus>]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\n<Prompt> und <Fortsetzungs-Prompt> sind in Anf\u00FChrungszeichen gesetzte Zeichenfolgen, die als Eingabe-Prompts ausgegeben werden.\nOptional k\u00F6nnen beide "%%s" enthalten. Dies wird durch die n\u00E4chste Snippet-ID ersetzt.\nDer Eingabe wird unter Umst\u00E4nden keine ID zugewiesen, wenn es sich z.B. um einen Fehler oder Befehl handelt.\nDer Fortsetzungs-Prompt wird in einem mehrzeiligen Snippet in der zweiten und allen nachfolgenden Zeilen verwendet.\n\nBei fehlender Angabe von <Prompt> werden die aktuell festgelegten Prompts angezeigt.\nBei Angabe des <Modus> werden nur die Prompts f\u00FCr diesen Modus angezeigt.\nBeispiel:\n\t/set prompt mymode\nZeigt die f\u00FCr den Modus "mymode" festgelegten Prompts an\n
-
-help.set.editor.summary =Legt den mit dem /edit-Befehl zu startenden Befehl fest
-
-help.set.editor =Legt den mit dem /edit-Befehl zu startenden Befehl fest:\n\n\t/set editor [-retain] [-wait] <Befehl>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\nBeh\u00E4lt die aktuelle Editoreinstellung f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set editor -retain\n\nZeigt den mit dem /edit-Befehl zu startenden Befehl an:\n\n\t/set editor\n\nDer <Befehl> ist eine betriebssystemabh\u00E4ngige Zeichenfolge.\nDer <Befehl> kann durch Leerzeichen getrennte Argumente (z.B. Kennzeichen) enthalten\n\nBei Angabe der Option -default wird der integrierte Standardeditor verwendet.\n\nBei Angabe der Option -delete werden vorherige Einstellungen ignoriert - die Editoreinstellungen\nwerden wie beim Starten des JShell-Tools initialisiert. Insbesondere wird eine eventuell vorhandene\nbeibehaltene Einstellung verwendet (es sei denn, es werden sowohl -retain als auch -delete angegeben - \nin diesem Fall wird die beibehaltene Einstellung gel\u00F6scht). Ist eine der folgenden Umgebungsvariablen festgelegt,\nwird sie verwendet: JSHELLEDITOR, VISUAL oder EDITOR (in dieser Reihenfolge). Andernfalls\nwird der integrierte Standardeditor verwendet.\n\nBei Angabe von <Befehl> wird dieser als externer Editor verwendet. Der <Befehl>\nbesteht aus dem Programm und null oder mehr Programmargumenten. Bei Verwendung von <Befehl>\nwird die zu bearbeitende tempor\u00E4re Datei als letztes Argument angeh\u00E4ngt.\nNormalerweise wird der Bearbeitungsmodus fortgesetzt, bis der externe Editor beendet wird. Einige externe Editoren\nwerden umgehend beendet (z.B. wenn das Bearbeitungsfenster vorhanden ist). Es m\u00FCssen entweder Kennzeichen\nf\u00FCr externe Editoren verwendet werden, um ein umgehendes Beenden zu verhindern, oder die Option -wait muss\nverwendet werden, um den Benutzer zur Angabe aufzufordern, wann der Bearbeitungsmodus beendet werden soll.\n\nHinweis: Bei aktivem Bearbeitungsmodus werden keine Befehlseingaben angezeigt. Nach Beenden des Bearbeitungsmodus\nwerden keine \u00C4nderungen an den bearbeiteten Snippets angezeigt.\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Befehl> oder Optionen wird die Editoreinstellung angezeigt.\n
-
-help.set.start.summary =Legt die Startkonfiguration fest
-
-help.set.start =Legt die Startkonfiguration fest - eine Abfolge aus Snippets und Befehlen, die beim Hochfahren gelesen werden:\n\n\t/set start [-retain] <Datei>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\nBeh\u00E4lt die Startkonfiguration f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set start -retain\n\nZeigt die Starteinstellung an:\n\n\t/set start\n\nDer Inhalt der angegebenen <Datei> wird zu den verwendeten Start-Snippets und -befehlen,\nwenn die Befehle /reset, /reload oder /env in dieser Session verwendet werden.\nWird stattdessen die Option -default angegeben, werden die vordefinierten Startimport-\nSnippets verwendet.\nBei Verwendung der Option -none sind die Starteinstellungen leer - es werden keine\nStart-Snippets oder -befehle verwendet.\nDieser Befehl eignet sich gut zum Testen der Starteinstellungen. Um sie f\u00FCr zuk\u00FCnftige\nAusf\u00FChrungen des JShell-Tools beizubehalten, verwenden Sie den Befehl:\n\t/set start -retain\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Datei> oder Optionen werden die Starteinstellungen angezeigt.\nHinweis: Wenn der Start zuletzt von einer Datei festgelegt wurde, wird dies mit dem\nBefehl "set start" gefolgt vom Inhalt der Datei angezeigt.\n\nDie <Datei> kann der Name einer Betriebssystemdatei oder einer der vordefinierten\nStartdateinamen sein: DEFAULT, PRINTING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf() bzw.\nImporte aller Java SE-Packages.\nEs kann mehr als eine <Datei> angegeben werden. Beispiel:\n\n\t/set start -retain DEFAULT PRINTING
-
-help.set.indent.summary =Gibt die Anzahl der Leerzeichen zum Einr\u00FCcken der Snippets an
-
-help.set.indent =Gibt die Anzahl der Leerzeichen zum Einr\u00FCcken der Snippets an:\n\n\t/set indent <Anzahl>\n\nZeigt die Einzugseinstellung an:\n\n\t/set indent\n
-startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action 'Erstellt' added-primary    \n/set format verbose action 'Ge\u00E4ndert' modified-primary    \n/set format verbose action 'Ersetzt' replaced-primary    \n/set format verbose action '\u00DCberschrieben' overwrote-primary    \n/set format verbose action 'Gel\u00F6scht' dropped-primary    \n/set format verbose action '  Update erstellt' added-update    \n/set format verbose action '  Update ge\u00E4ndert' modified-update    \n/set format verbose action '  Update ersetzt' replaced-update    \n/set format verbose action '  Update \u00FCberschrieben' overwrote-update    \n/set format verbose action '  Update gel\u00F6scht' dropped-update    \n\n/set format verbose until ', Instanziierung oder Aufruf der zugeh\u00F6rigen Methoden ist jedoch nicht m\u00F6glich bis'   defined-class,record-primary    \n/set format verbose until ', Aufruf der zugeh\u00F6rigen Methoden ist jedoch nicht m\u00F6glich bis'                      defined-interface-primary    \n/set format verbose until ', Verwendung ist jedoch nicht m\u00F6glich bis'                                  defined-enum,annotation-primary    \n/set format verbose until ', Aufruf ist jedoch nicht m\u00F6glich bis'                               defined-method-primary    \n/set format verbose until ', Referenzierung ist jedoch nicht m\u00F6glich bis'                            notdefined-primary    \n/set format verbose until ' Instanziierung oder Aufruf der zugeh\u00F6rigen Methoden ist nicht m\u00F6glich bis'          defined-class,record-update    \n/set format verbose until ' Aufruf der zugeh\u00F6rigen Methoden ist nicht m\u00F6glich bis'                              defined-interface-update    \n/set format verbose until ' Aufruf ist nicht m\u00F6glich bis'                                      defined-method-update    \n/set format verbose until ' Referenzierung ist nicht m\u00F6glich bis'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved} ist deklariert'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved} sind deklariert'                                          unresolved2-error0    \n/set format verbose unrerr ' dieser Fehler ist behoben: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved} ist deklariert, und dieser Fehler ist behoben: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved} sind deklariert, und dieser Fehler ist behoben: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' diese Fehler sind behoben: {errors}'                              unresolved0-error2    \n/set format verbose unrerr '{unresolved} ist deklariert, und diese Fehler sind behoben: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved} sind deklariert, und diese Fehler sind behoben: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind 'Klasse'                  class    \n/set format verbose typeKind 'Schnittstelle'              interface    \n/set format verbose typeKind 'Enum'                   enum    \n/set format verbose typeKind 'Annotationsschnittstelle'   annotation    \n/set format verbose typeKind 'Datensatz'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}Scratch-Variable {name} erstellt: {type}{post}'    \
-expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Wert von {name}: {type}{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Zugewiesen zu {name}: {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} Variable {name}: {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} Variable {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} Variable {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} Methode {name}({type}){resolve}{post}'             method    \n\n/set format verbose display '{pre}Verwendung von {typeKind} {name} wurde versucht{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}Aufruf der Methode {name} ({type}) wurde versucht{resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} Variable {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,record,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set truncation silent 80\n/set truncation silent 1000                                                                  varvalue,expression\n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
index 9ae0333fdea..6e942910536 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
@@ -179,8 +179,8 @@ jshell.console.empty = \n\u7A7A\u306E\u30A8\u30F3\u30C8\u30EA\u3002\u5358\u4E00\
 
 jshell.fix.wrong.shortcut =[Shift]+[Tab]\u306E\u5F8C\u306E\u6587\u5B57\u304C\u4E88\u671F\u3057\u306A\u3044\u6587\u5B57\u3067\u3059\u3002\n\u81EA\u52D5\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u306F"i"\u3001\u5909\u6570\u306E\u4F5C\u6210\u306B\u306F"v"\u3001\u30E1\u30BD\u30C3\u30C9\u306E\u4F5C\u6210\u306B\u306F"m"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u8A73\u7D30\u306F\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n/help shortcuts
 
-help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell <option>... <load-file>...\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n    --class-path <path>   \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --module-path <path>  \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --add-modules <module>(,<module>)*\n                          \u89E3\u6C7A\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<module>\u304CALL-MODULE-PATH\n                            \u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --enable-native-access\n                          \u30B3\u30FC\u30C9\u3067\u5236\u9650\u4ED8\u304D\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30E1\u30BD\u30C3\u30C9\u5B9F\u884C\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --enable-preview      \u30B3\u30FC\u30C9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --startup <file>      \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u307E\u3059\n    --no-startup          \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u307E\u305B\u3093\n    --feedback <mode>     \u521D\u671F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306F\n                            \u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B(silent\u3001concise\u3001normal\u307E\u305F\u306Fverbose)\u304B\u3001\n                            \u4E8B\u524D\u306B\u30E6\u30FC\u30B6\u30FC\u304C\u5B9A\u7FA9\u3067\u304D\u307E\u3059\n    -q                    \u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback concise\u3068\u540C\u3058\n    -s                   \u975E\u5E38\u306B\u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback silent\u3068\u540C\u3058\n    -v                     \u8A73\u7D30\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback verbose\u3068\u540C\u3058\n    -J<flag>               <flag>\u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3057\u307E\u3059\u3002\n                            \u5B9F\u884C\u6642\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-J\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -R<flag>               <flag>\u3092\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30EA\u30E2\u30FC\u30C8\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-R\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -C<flag>              <flag>\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-C\u3092\u4F7F\u7528\u3057\u307E\u3059\n    --version             \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --show-version        \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D9A\u884C\u3057\u307E\u3059\n    --help, -?, -h        \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3053\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --help-extra, -X      \
-\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n\n\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306B\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u540D(DEFAULT\u3001\nPRINTING\u307E\u305F\u306FJAVASE)\u306E1\u3064\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\nload-file\u3067\u3082\u3001\u5BFE\u8A71\u578BI/O\u3092\u4F7F\u7528\u305B\u305A\u306B\u3001"-"\u3092\u6307\u5B9A\u3057\u3066\u6A19\u6E96\u5165\u529B\u3092\u793A\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n\n\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(--class-path\u3001--module-path\u3001\n--add-modules)\u306E\u8A73\u7D30\u306F\u3001\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\t/help context\n\n\u30D1\u30B9\u306B\u306F\u3001\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3068\u30A2\u30FC\u30AB\u30A4\u30D6\u304C\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002Windows\u306E\u5834\u5408\u306F\u3001\n\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\n\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n
+help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell <option>... <load-file>...\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n    --class-path <path>   \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --module-path <path>  \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --add-modules <module>(,<module>)*\n                           \u89E3\u6C7A\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<module>\u304CALL-MODULE-PATH\n                            \u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --enable-preview      \u30B3\u30FC\u30C9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --startup <file>      \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u307E\u3059\n    --no-startup          \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u307E\u305B\u3093\n    --feedback <mode>     \u521D\u671F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306F\n                            \u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B(silent\u3001concise\u3001normal\u307E\u305F\u306Fverbose)\u304B\u3001\n                            \u4E8B\u524D\u306B\u30E6\u30FC\u30B6\u30FC\u304C\u5B9A\u7FA9\u3067\u304D\u307E\u3059\n    -q                    \u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback concise\u3068\u540C\u3058\n    -s                    \u975E\u5E38\u306B\u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback silent\u3068\u540C\u3058\n    -v                    \u8A73\u7D30\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback verbose\u3068\u540C\u3058\n    -J<flag>              <flag>\u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3057\u307E\u3059\u3002\n                            \u5B9F\u884C\u6642\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-J\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -R<flag>              <flag>\u3092\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30EA\u30E2\u30FC\u30C8\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-R\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -C<flag>              <flag>\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-C\u3092\u4F7F\u7528\u3057\u307E\u3059\n    --version              \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --show-version        \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D9A\u884C\u3057\u307E\u3059\n    --help, -?, -h        \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3053\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --help-extra, -X      \
+\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n\n\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306B\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u540D(DEFAULT\u3001\nPRINTING\u307E\u305F\u306FJAVASE)\u306E1\u3064\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\nload-file\u3067\u3082\u3001\u5BFE\u8A71\u578BI/O\u3092\u4F7F\u7528\u305B\u305A\u306B\u3001"-"\u3092\u6307\u5B9A\u3057\u3066\u6A19\u6E96\u5165\u529B\u3092\u793A\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n\n\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(--class-path\u3001--module-path\u3001--add-modules)\u306E\n\u8A73\u7D30\u306F\u3001\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\t/help context\n\n\u30D1\u30B9\u306B\u306F\u3001\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3068\u30A2\u30FC\u30AB\u30A4\u30D6\u304C\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002Windows\u306E\u5834\u5408\u306F\u3001\n\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\n\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n
 help.usage.x = \    --add-exports <module>/<package>   \u5B9A\u7FA9\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u308B\u3068\n                                         \u307F\u306A\u3055\u308C\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --execution <spec>                 \u4EE3\u66FF\u5B9F\u884C\u30A8\u30F3\u30B8\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                                         \u3053\u3053\u3067\u3001<spec>\u306FExecutionControl spec\u3067\u3059\u3002\n                                         spec\u306E\u69CB\u6587\u306B\u3064\u3044\u3066\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8jdk.jshell.spi\u306E\n                                         \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    \n\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 help.list.summary = \u5165\u529B\u3057\u305F\u30BD\u30FC\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
index 92eaaaf4cf5..168311a8100 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
@@ -179,7 +179,7 @@ jshell.console.empty = \n\u7A7A\u6761\u76EE\u3002Shift+Tab m \u524D\u5FC5\u987B\
 
 jshell.fix.wrong.shortcut =Shift+Tab \u540E\u51FA\u73B0\u610F\u5916\u7684\u5B57\u7B26\u3002\n\u4F7F\u7528 "i" \u8868\u793A\u81EA\u52A8\u5BFC\u5165\uFF0C\u4F7F\u7528 "v" \u8868\u793A\u53D8\u91CF\u521B\u5EFA\uFF0C\u4F7F\u7528 "i" \u8868\u793A\u65B9\u6CD5\u521B\u5EFA\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u9605\uFF1A\n/help \u5FEB\u6377\u65B9\u5F0F
 
-help.usage = \u7528\u6CD5\uFF1A   jshell <option>... <load-file>...\n\u5176\u4E2D\uFF0C\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC\uFF1A\n    --class-path <path>   \u6307\u5B9A\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u67E5\u627E\u4F4D\u7F6E\n    --module-path <path>  \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u67E5\u627E\u4F4D\u7F6E\n    --add-modules <module>(,<module>)*\n                          \u6307\u5B9A\u8981\u89E3\u6790\u7684\u6A21\u5757\uFF1B\u5982\u679C \n                            <module> \u4E3A ALL-MODULE-PATHs\uFF0C\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\n    --enable-native-access\n                          \u5141\u8BB8\u4EE3\u7801\u8FD0\u884C\u53D7\u9650\u7684\u672C\u673A\u65B9\u6CD5\n    --enable-preview      \u5141\u8BB8\u4EE3\u7801\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n    --startup <file>      \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n    --no-startup          \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n    --feedback <mode>     \u6307\u5B9A\u521D\u59CB\u53CD\u9988\u6A21\u5F0F\u3002\u8BE5\u6A21\u5F0F\u53EF\u4EE5\u662F\n                            \u9884\u5B9A\u4E49\u7684\uFF08silent\u3001concise\u3001normal \u6216 verbose\uFF09\uFF0C\n                            \u4E5F\u53EF\u4EE5\u662F\u7528\u6237\u5728\u4EE5\u524D\u5B9A\u4E49\u7684\n    -q                    \u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback concise\n    -s                    \u771F\u6B63\u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback silent\n    -v                    \u8BE6\u7EC6\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback verbose\n    -J<flag>              \u76F4\u63A5\u5C06 <flag> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FD0\u884C\u65F6\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -J\n    -R<flag>              \u5C06 <flag> \u4F20\u9012\u5230\u8FDC\u7A0B\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FDC\u7A0B\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -R\n    -C<flag>              \u5C06 <flag> \u4F20\u9012\u5230\u7F16\u8BD1\u5668\u3002\n                            \u4E3A\u6BCF\u4E2A\u7F16\u8BD1\u5668\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -C\n    --version             \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\n    --show-version        \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u7EE7\u7EED\n    --help, -?, -h        \u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u6B64\u63D0\u8981\u5E76\u9000\u51FA\n    --help-extra, -X      \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\u5E76\u9000\u51FA\n\n\u6587\u4EF6\u53C2\u6570\u53EF\u4EE5\u662F\u6587\u4EF6\u540D\uFF0C\u6216\u8005\u662F\u9884\u5B9A\u4E49\u7684\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001\nPRINTING \u6216 JAVASE\u3002\n\u52A0\u8F7D\u6587\u4EF6\u4E5F\u53EF\u4EE5\u662F "-"\uFF0C\u7528\u4E8E\u6307\u660E\u6807\u51C6\u8F93\u5165\uFF0C\u6CA1\u6709\u4EA4\u4E92\u5F0F I/O\u3002\n\n\u6709\u5173\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF08--class-path\u3001\n--module-path \u548C --add-modules\uFF09\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\t/help context\n\n\u8DEF\u5F84\u5217\u51FA\u8981\u641C\u7D22\u7684\u76EE\u5F55\u548C\u6863\u6848\u3002\u5BF9\u4E8E Windows\uFF0C\u8BF7\u4F7F\u7528\n\u5206\u53F7 (;) \u6765\u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u8BF7\u4F7F\u7528\n\u5192\u53F7 (:) \u6765\u5206\u9694\u5404\u9879\u3002\n
+help.usage = \u7528\u6CD5\uFF1A   jshell <\u9009\u9879>... <\u52A0\u8F7D\u6587\u4EF6>...\n\u5176\u4E2D\uFF0C\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC\uFF1A\n    --class-path <\u8DEF\u5F84>   \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n    --module-path <\u8DEF\u5F84>  \u6307\u5B9A\u67E5\u627E\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u4F4D\u7F6E\n    --add-modules <\u6A21\u5757>(,<\u6A21\u5757>)*\n                          \u6307\u5B9A\u8981\u89E3\u6790\u7684\u6A21\u5757\uFF1B\u5982\u679C <\u6A21\u5757> \n                          \u4E3A ALL-MODULE-PATH\uFF0C\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\n    --enable-preview      \u5141\u8BB8\u4EE3\u7801\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n    --startup <\u6587\u4EF6>      \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n    --no-startup          \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n    --feedback <\u6A21\u5F0F>     \u6307\u5B9A\u521D\u59CB\u53CD\u9988\u6A21\u5F0F\u3002\u8BE5\u6A21\u5F0F\u53EF\u4EE5\u662F\n                            \u9884\u5B9A\u4E49\u7684\uFF08silent\u3001concise\u3001normal \u6216 verbose\uFF09\uFF0C\n                            \u4E5F\u53EF\u662F\u4EE5\u524D\u7528\u6237\u5B9A\u4E49\u7684\n    -q                    \u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback concise\n    -s                    \u771F\u6B63\u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback silent\n    -v                    \u8BE6\u7EC6\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback verbose\n    -J<\u6807\u8BB0>              \u76F4\u63A5\u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FD0\u884C\u65F6\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -J\n    -R<\u6807\u8BB0>              \u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FDC\u7A0B\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FDC\u7A0B\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -R\n    -C<\u6807\u8BB0>              \u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u7F16\u8BD1\u5668\u3002\n                            \u4E3A\u6BCF\u4E2A\u7F16\u8BD1\u5668\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -C\n    --version             \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\n    --show-version        \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u7EE7\u7EED\n    --help, -?, -h        \u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u6B64\u63D0\u8981\u5E76\u9000\u51FA\n    --help-extra, -X      \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\u5E76\u9000\u51FA\n\n\u6587\u4EF6\u53C2\u6570\u53EF\u4EE5\u662F\u6587\u4EF6\u540D\uFF0C\u6216\u8005\u662F\u9884\u5B9A\u4E49\u7684\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001\nPRINTING \u6216 JAVASE\u3002\n\u52A0\u8F7D\u6587\u4EF6\u4E5F\u53EF\u4EE5\u662F "-"\uFF0C\u7528\u4E8E\u6307\u660E\u6807\u51C6\u8F93\u5165\uFF0C\u6CA1\u6709\u4EA4\u4E92\u5F0F I/O\u3002\n\n\u6709\u5173\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF08--class-path\u3001\n--module-path \u548C --add-modules\uFF09\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\t/help context\n\n\u8DEF\u5F84\u5217\u51FA\u8981\u641C\u7D22\u7684\u76EE\u5F55\u548C\u6863\u6848\u3002\u5BF9\u4E8E Windows\uFF0C\u8BF7\u4F7F\u7528\n\u5206\u53F7 (;) \u6765\u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u8BF7\u4F7F\u7528\n\u5192\u53F7 (:) \u6765\u5206\u9694\u5404\u9879\u3002\n
 help.usage.x = \    --add-exports <\u6A21\u5757>/<\u7A0B\u5E8F\u5305>      \u6307\u5B9A\u8981\u8003\u8651\u4ECE\u5176\u5B9A\u4E49\u6A21\u5757\u5BFC\u51FA\n                                         \u7684\u7A0B\u5E8F\u5305\n    --execution <\u89C4\u8303>                 \u6307\u5B9A\u66FF\u4EE3\u6267\u884C\u5F15\u64CE\u3002\n                                         \u5176\u4E2D <\u89C4\u8303> \u662F ExecutionControl \u89C4\u8303\u3002\n                                         \u6709\u5173\u89C4\u8303\u7684\u8BED\u6CD5\uFF0C\u8BF7\u53C2\u9605\u7A0B\u5E8F\u5305\n                                         jdk.jshell.spi \u7684\u6587\u6863\n    \n\u8FD9\u4E9B\u9009\u9879\u662F\u975E\u6807\u51C6\u9009\u9879\uFF0C\u5982\u6709\u66F4\u6539\uFF0C\u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 help.list.summary = \u5217\u51FA\u60A8\u952E\u5165\u7684\u6E90
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
deleted file mode 100644
index 9a20c08fefb..00000000000
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-jshell.diag.modifier.plural.fatal = Modifikatoren {0} nicht zul\u00E4ssig
-jshell.diag.modifier.plural.ignore = Modifikatoren {0} nicht zul\u00E4ssig, ignoriert
-jshell.diag.modifier.single.fatal = Modifikator {0} nicht zul\u00E4ssig
-jshell.diag.modifier.single.ignore = Modifikator {0} nicht zul\u00E4ssig, ignoriert
-jshell.diag.object.method.fatal = JShell-Methodennamen d\u00FCrfen nicht mit Objektmethoden \u00FCbereinstimmen: {0}
-
-jshell.exc.null = Snippet darf nicht Null sein
-jshell.exc.alien = Snippet stammt nicht aus dieser JShell-Instanz: {0}
-jshell.exc.closed = JShell ({0}) wurde geschlossen.
-jshell.exc.var.not.valid = Snippet-Parameter von varValue() {0} muss g\u00FCltig (VALID) sein. Er lautet: {1}
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
index c2378cc5b9f..1c2ad607267 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
index fdf1b7f6128..7ee702c4fef 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
index b44ac5d7148..d2d583d9252 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,225 +60,218 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
+#
+# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
+#
 adp=Andorranische Pesete
-aed=VAE-Dirham
+aed=UAE Dirham
 afa=Afghani (1927-2002)
 afn=Afghani
-all=Albanischer Lek
-amd=Armenischer Dram
-ang=Gulden (Niederl\u00E4ndische Antillen)
-aoa=Kwanza (Angola)
+all=Lek
+amd=Dram
+ang=Niederl. Antillen Gulden
+aoa=Kwanza
 ars=Argentinischer Peso
-ats=\u00D6sterreichischer Schilling
-aud=Australische Dollar
+ats=\u00d6sterreichischer Schilling
+aud=Australischer Dollar
 awg=Aruba Florin
-azm=Aserbaidschainischer Manat (1993-2006)
-azn=Aserbaidschainischer Manat
-bam=Konvertible Mark (Bosnien und Herzegowina)
-bbd=Dollar (Barbados)
-bdt=Bangladeschischer Taka
+azm=Aserbaidschan-Manat (1993-2006)
+azn=Aserbaidschan-Manat
+bam=Konvertierbare Mark
+bbd=Barbados-Dollar
+bdt=Taka
 bef=Belgischer Franc
-bgl=Bulgarischer Lew
-bgn=Bulgarischer Lew
+bgl=Lew (1962-1999)
+bgn=Lew
 bhd=Bahrain-Dinar
 bif=Burundi-Franc
 bmd=Bermuda-Dollar
 bnd=Brunei-Dollar
-bob=Bolivianischer Boliviano
-bov=Bolivianischer Mvdol
-brl=Brasilianischer Real
+bob=Boliviano
+bov=Mvdol
+brl=Real
 bsd=Bahama-Dollar
-btn=Ngultrum (Bhutan)
-bwp=Botswanischer Pula
-byb=Wei\u00DFrussischer Rubel (1994-1999)
-byn=Wei\u00DFrussischer Rubel
-byr=Wei\u00DFrussischer Rubel (2000-2016)
+btn=Ngultrum
+bwp=Pula
+byb=Belarus Rubel (alt)
+byr=Belarus Rubel (neu)
 bzd=Belize-Dollar
 cad=Kanadischer Dollar
-cdf=Kongo-Franc
+cdf=Franc congolais
 chf=Schweizer Franken
-clf=Chilenische Unidad de Fomento (UF)
+clf=Unidades de Fomento
 clp=Chilenischer Peso
-cny=Chinesischer Yuan
+cny=Renminbi Yuan
 cop=Kolumbianischer Peso
-crc=Costa-Rica-Col\u00F3n
-csd=Serbischer Dinar (2002-2006)
-cuc=Kubanischer konvertibler Peso
+crc=Costa Rica Colon
+csd=Alter Serbischer Dinar
+cuc=Kubanischer Peso (konvertibel)
 cup=Kubanischer Peso
-cve=Kap-Verde-Escudo
+cve=Kap Verde Escudo
 cyp=Zypern-Pfund
-czk=Tschechische Krone 
+czk=Tschechische Krone
 dem=Deutsche Mark
 djf=Dschibuti-Franc
-dkk=D\u00E4nische Krone
+dkk=D\u00e4nische Krone
 dop=Dominikanischer Peso
 dzd=Algerischer Dinar
 eek=Estnische Krone
-egp=\u00C4gyptisches Pfund
-ern=Eritreischer Nakfa
-esp=Spanische Pesete
-etb=\u00C4thiopischer Birr
-eur=Euro
+egp=\u00c4gyptisches Pfund
+ern=Nakfa
+esp=Spanische Peseta
+etb=Birr
 fim=Finnische Mark
 fjd=Fidschi-Dollar
-fkp=Falklandinseln-Pfund
-frf=Franz\u00F6sischer Franc
-gbp=Britisches Pfund
-gel=Georgische Lari
-ghc=Ghanaischer Cedi (1979-2007)
-ghs=Ghanaischer Cedi
+fkp=Falkland-Pfund
+frf=Franz\u00f6sischer Franc
+gbp=Pfund Sterling
+gel=Georgischer Lari
+ghc=Cedi
+ghs=Ghanaische Cedi
 gip=Gibraltar-Pfund
-gmd=Gambischer Dalasi
+gmd=Dalasi
 gnf=Guinea-Franc
 grd=Griechische Drachme
-gtq=Guatemaltekischer Quetzal
-gwp=Guinea-Bissau-Peso
+gtq=Quetzal
+gwp=Guinea Bissau Peso
 gyd=Guyana-Dollar
 hkd=Hongkong-Dollar
-hnl=Honduranische Lempira
+hnl=Lempira
 hrk=Kuna
-htg=Haitianische Gourde
-huf=Ungarischer Forint
-idr=Indonesische Rupiah
+htg=Gourde
+huf=Forint
+idr=Rupiah
 iep=Irisches Pfund
-ils=Neuer israelischer Schekel
+ils=Schekel
 inr=Indische Rupie
-iqd=Irakischer Dinar
-irr=Iranischer Rial
-isk=Isl\u00E4ndische Krone
-itl=Italienische Lire
-jmd=Jamaikanischer Dollar
+iqd=Irak Dinar
+irr=Rial
+isk=Isl\u00e4ndische Krone
+itl=Italienische Lira
+jmd=Jamaika-Dollar
 jod=Jordanischer Dinar
-jpy=Japanischer Yen
-kes=Kenianischer Schilling
-kgs=Kirgisischer Som
-khr=Kambodschanischer Riel
-kmf=Komoren-Franc
+jpy=Yen
+kes=Kenia-Schilling
+kgs=Som
+khr=Riel
+kmf=Komoren Franc
 kpw=Nordkoreanischer Won
-krw=S\u00FCdkoreanischer Won
-kwd=Kuwaitischer Dinar
+krw=S\u00fcdkoreanischer Won
+kwd=Kuwait Dinar
 kyd=Kaiman-Dollar
-kzt=Kasachischer Tenge
-lak=Laotischer Kip
+kzt=Tenge
+lak=Kip
 lbp=Libanesisches Pfund
-lkr=Sri-Lanka-Rupie
+lkr=Sri Lanka Rupie
 lrd=Liberianischer Dollar
-lsl=Lesothischer Loti
-ltl=Litauische Litas
+lsl=Loti
+ltl=Litauischer Litas
 luf=Luxemburgischer Franc
-lvl=Lettische Lats
+lvl=Lettischer Lats
 lyd=Libyscher Dinar
 mad=Marokkanischer Dirham
-mdl=Moldova-Leu
-mga=Madagaskar-Ariary
+mdl=Moldau Leu
+mga=Madagaskar Ariary
 mgf=Madagaskar-Franc
-mkd=Mazedonischer Denar
-mmk=Myanmar-Kyat
-mnt=Mongolischer Tugrik
-mop=Macau-Pataca
-mro=Mauretanische Ouguiya
-mru=Mauretanische Ouguiya
-mtl=Maltesische Lire
+mkd=Denar
+mmk=Kyat
+mnt=Tugrik
+mop=Pataca
+mro=Ouguiya
+mtl=Maltesische Lira
 mur=Mauritius-Rupie
-mvr=Rufiyaa (Malediven)
-mwk=Malawi-Kwacha
+mvr=Rufiyaa
+mwk=Malawi Kwacha
 mxn=Mexikanischer Peso
-mxv=Unidad De Inversion (Mexiko)
+mxv=Mexican Unidad de Inversion (UDI)
 myr=Malaysischer Ringgit
-mzm=Mosambikanischer Metical (1980-2006)
-mzn=Mosambikanischer Metical
-nad=Namibischer Dollar
-ngn=Nigerianische Naira
-nio=C\u00F3rdoba Oro
-nlg=Niederl\u00E4ndischer Gulden
+mzm=Alter Metical
+mzn=Metical
+nad=Namibia-Dollar
+ngn=Naira
+nio=Gold-Cordoba
+nlg=Holl\u00e4ndischer Gulden
 nok=Norwegische Krone
 npr=Nepalesische Rupie
-nzd=Neuseel\u00E4ndischer Dollar
-omr=Omani-Rial
-pab=Panamaischer Balboa
-pen=Peruanischer Sol
-pgk=Kina (Papua-Neuguinea)
+nzd=Neuseeland-Dollar
+omr=Rial Omani
+pab=Balboa
+pen=Neuer Sol
+pgk=Kina
 php=Philippinischer Peso
 pkr=Pakistanische Rupie
-pln=Polnischer Zloty
-pte=Portuguiesischer Escudo
-pyg=Paraguayischer Guarani
-qar=Katar-Riyal
-rol=Rum\u00E4nischer Leu (1952-2006)
-ron=Rum\u00E4nischer Leu
+pln=Zloty
+pte=Portugiesischer Escudo
+pyg=Guarani
+qar=Katar Riyal
+rol=Leu
+ron=Rum\u00e4nischer Leu
 rsd=Serbischer Dinar
-rub=Russischer Rubel
-rur=Russischer Rubel (1991-1998)
+rub=Russischer Rubel (neu)
+rur=Russischer Rubel (alt)
 rwf=Ruanda-Franc
-sar=Saudischer Rial
+sar=Saudi-Rial
 sbd=Salomonen-Dollar
 scr=Seychellen-Rupie
-sdd=Sudanesischer Dinar (1992-2007)
+sdd=Sudanesischer Dinar
 sdg=Sudanesisches Pfund
 sek=Schwedische Krone
 sgd=Singapur-Dollar
-shp=St. Helena-Pfund
-sit=Slowenischer Tolar
+shp=St. Helena Pfund
+sit=Tolar
 skk=Slowakische Krone
-sll=Sierra-leonischer Leone
-sos=Somalischer Schilling
-srd=Suriname-Dollar
-srg=Suriname-Gulden
-ssp=S\u00FCdsudanesisches Pfund
-std=Dobra (S\u00E3o Tom\u00E9 und Pr\u00EDncipe)
-stn=Dobra (S\u00E3o Tom\u00E9 und Pr\u00EDncipe)
-svc=El-Salvador-Col\u00F3n
+sll=Leone
+sos=Somalia-Schilling
+srd=Surinamischer Dollar
+srg=Suriname Gulden
+std=Dobra
+svc=El Salvador Colon
 syp=Syrisches Pfund
-szl=Lilangeni (Swasiland)
-thb=Thail\u00E4ndischer Baht
-tjs=Somoni (Tadschikistan)
-tmm=Turkmenistan-Manat (1993-2009)
-tmt=Turkmenistan-Manat
+szl=Lilangeni
+thb=Baht
+tjs=Tadschikistan Somoni
+tmm=Turkmenistan-Manat
+tmt=Neuer Turkmenistan-Manat
 tnd=Tunesischer Dinar
-top=Pa'anga (Tonga)
-tpe=Escudo (Portugiesisch-Timor)
-trl=T\u00FCrkische Lira (1922-2005)
-try=T\u00FCrkische Lira
-ttd=Trinidad/Tobago-Dollar
-twd=Neu-Taiwan Dollar
+top=Pa\u02bbanga
+tpe=Timor-Escudo
+trl=Alte T\u00fcrkische Lira
+try=T\u00fcrkische Lira
+ttd=Trinidad- und Tobago-Dollar
+twd=Neuer Taiwan-Dollar
 tzs=Tansania-Schilling
-uah=Ukrainische Hrywnja
+uah=Hryvnia
 ugx=Uganda-Schilling
 usd=US-Dollar
-usn=US-Dollar (n\u00E4chster Tag)
-uss=US-Dollar (gleicher Tag)
-uyu=Peso
-uzs=Usbekistan-Sum
-veb=Venezolanischer Bol\u00EDvar (1871-2008)
-ved=Venezolanischer Bol\u00EDvar
-vef=Venezolanischer Bol\u00EDvar Fuerte
-ves=Venezolanischer Bol\u00EDvar
-vnd=Vietnamesischer Dong
-vuv=Vanuatu-Vatu
-wst=Samoanischer Tala
-xaf=CFA-Franc BEAC
-xag=Silber
-xau=Gold
-xba=European Composite Unit
-xbb=European Monetary Unit
-xbc=Europ\u00E4ische Rechnungseinheit (XBC)
-xbd=Europ\u00E4ische Rechnungseinheit (XBD)
-xcd=Dollar, Ostkaribik
+usn=US Dollar (N\u00e4chster Tag)
+uss=US Dollar (Gleicher Tag)
+uyu=Uruguayischer Peso
+uzs=Usbekistan Sum
+veb=Bolivar
+vef=Bol\u00edvar Fuerte
+vnd=Dong
+vuv=Vatu
+wst=Tala
+xaf=CFA Franc (\u00c4quatorial)
+xag=Unze Silber
+xau=Unze Gold
+xba=Europ\u00e4ische Rechnungseinheit
+xbb=Europ\u00e4ische W\u00e4hrungseinheit (XBB)
+xbc=Europ\u00e4ische Rechnungseinheit (XBC)
+xbd=Europ\u00e4ische Rechnungseinheit (XBD)
+xcd=Ostkaribischer Dollar
 xdr=Sonderziehungsrechte
-xfo=Franz\u00F6sischer Goldfranken
-xfu=Franz\u00F6sischer UIC-Franc
-xof=CFA-Franc BCEAO
-xpd=Palladium
+xfo=Franz\u00f6sischer Gold-Franc
+xfu=Franz\u00f6sischer UIC-Franc
+xof=CFA Franc (West)
+xpd=Unze Palladium
 xpf=CFP-Franc
-xpt=Platin
-xsu=Sucre
-xts=Testw\u00E4hrungscode
-xua=ADB Unit of Account
-xxx=Unbekannte W\u00E4hrung
+xpt=Unze Platin
+xts=Testw\u00e4hrung
+xxx=Unbekannte W\u00e4hrung
 yer=Jemen-Rial
-yum=Neuer jugoslawischer Dinar (1994-2002)
-zar=S\u00FCdafrikanischer Rand
-zmk=Sambischer Kwacha
-zwd=Simbabwe-Dollar (1980-2008)
+yum=Neuer Dinar
+zar=S\u00fcdafrikanischer Rand
+zmk=Kwacha
+zwd=Simbabwe-Dollar
 zwl=Simbabwe-Dollar (2009)
-zwr=Simbabwe-Dollar (2008)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
index ee71a9eb17d..96f527d3e49 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,225 +60,219 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-adp=\u30A2\u30F3\u30C9\u30E9\u30FB\u30DA\u30BB\u30BF
-aed=\u30A2\u30E9\u30D6\u9996\u9577\u56FD\u9023\u90A6\u30C7\u30A3\u30EB\u30CF\u30E0
-afa=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u30FB\u30A2\u30D5\u30AC\u30CB\u30FC(1927-2002)
-afn=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u30FB\u30A2\u30D5\u30AC\u30CB\u30FC
-all=\u30A2\u30EB\u30D0\u30CB\u30A2\u30FB\u30EC\u30AF
-amd=\u30A2\u30EB\u30E1\u30CB\u30A2\u30FB\u30C9\u30E9\u30E0
-ang=\u30AA\u30E9\u30F3\u30C0\u9818\u30A2\u30F3\u30C6\u30A3\u30EB\u30FB\u30AE\u30EB\u30C0\u30FC
-aoa=\u30A2\u30F3\u30B4\u30E9\u30FB\u30AF\u30EF\u30F3\u30B6
-ars=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u30FB\u30DA\u30BD
-ats=\u30AA\u30FC\u30B9\u30C8\u30EA\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
-aud=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u30FB\u30C9\u30EB
-awg=\u30A2\u30EB\u30D0\u30FB\u30D5\u30ED\u30FC\u30EA\u30F3
-azm=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u30FB\u30DE\u30CA\u30C8(1993-2006)
-azn=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u30FB\u30DE\u30CA\u30C8
-bam=\u30DC\u30B9\u30CB\u30A2\u30FB\u30D8\u30EB\u30C4\u30A7\u30B4\u30D3\u30CA\u514C\u63DB\u30DE\u30EB\u30AF
-bbd=\u30D0\u30EB\u30D0\u30C9\u30B9\u30FB\u30C9\u30EB
-bdt=\u30D0\u30F3\u30B0\u30E9\u30C7\u30B7\u30E5\u30FB\u30BF\u30AB
-bef=\u30D9\u30EB\u30AE\u30FC\u30FB\u30D5\u30E9\u30F3
-bgl=\u30D6\u30EB\u30AC\u30EA\u30A2\u30FB\u30CF\u30FC\u30C9\u30FB\u30EC\u30D5
-bgn=\u30D6\u30EB\u30AC\u30EA\u30A2\u65B0\u30EC\u30D5
-bhd=\u30D0\u30FC\u30EC\u30FC\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-bif=\u30D6\u30EB\u30F3\u30B8\u30FB\u30D5\u30E9\u30F3
-bmd=\u30D0\u30EB\u30DF\u30E5\u30FC\u30C0\u30FB\u30C9\u30EB
-bnd=\u30D6\u30EB\u30CD\u30A4\u30FB\u30C9\u30EB
-bob=\u30DC\u30EA\u30D3\u30A2\u30FB\u30DC\u30EA\u30D3\u30A2\u30FC\u30CE
-bov=\u30DC\u30EA\u30D3\u30A2Mvdol
-brl=\u30D6\u30E9\u30B8\u30EB\u30FB\u30EC\u30A2\u30EB
-bsd=\u30D0\u30CF\u30DE\u30FB\u30C9\u30EB
-btn=\u30D6\u30FC\u30BF\u30F3\u30FB\u30CB\u30E5\u30EB\u30BF\u30E0
-bwp=\u30DC\u30C4\u30EF\u30CA\u30FB\u30D7\u30E9
-byb=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB(1994-1999)
-byn=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB
-byr=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB(2000-2016)
-bzd=\u30D9\u30EA\u30FC\u30BA\u30FB\u30C9\u30EB
-cad=\u30AB\u30CA\u30C0\u30FB\u30C9\u30EB
-cdf=\u30B3\u30F3\u30B4\u30FB\u30D5\u30E9\u30F3
-chf=\u30B9\u30A4\u30B9\u30FB\u30D5\u30E9\u30F3
-clf=\u30C1\u30EA\u8A08\u7B97\u5358\u4F4D(UF)
-clp=\u30C1\u30EA\u30FB\u30DA\u30BD
-cny=\u4E2D\u56FD\u4EBA\u6C11\u5143
-cop=\u30B3\u30ED\u30F3\u30D3\u30A2\u30FB\u30DA\u30BD
-crc=\u30B3\u30B9\u30BF\u30EA\u30AB\u30FB\u30B3\u30ED\u30F3
-csd=\u30BB\u30EB\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB(2002-2006)
-cuc=\u30AD\u30E5\u30FC\u30D0\u514C\u63DB\u30DA\u30BD
-cup=\u30AD\u30E5\u30FC\u30D0\u30FB\u30DA\u30BD
-cve=\u30AB\u30FC\u30DC\u30D9\u30EB\u30C7\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
-cyp=\u30AD\u30D7\u30ED\u30B9\u30FB\u30DD\u30F3\u30C9
-czk=\u30C1\u30A7\u30B3\u5171\u548C\u56FD\u30B3\u30EB\u30CA
-dem=\u30C9\u30A4\u30C4\u30FB\u30DE\u30EB\u30AF
-djf=\u30B8\u30D6\u30C1\u30FB\u30D5\u30E9\u30F3
-dkk=\u30C7\u30F3\u30DE\u30FC\u30AF\u30FB\u30AF\u30ED\u30FC\u30CD
-dop=\u30C9\u30DF\u30CB\u30AB\u30FB\u30DA\u30BD
-dzd=\u30A2\u30EB\u30B8\u30A7\u30EA\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-eek=\u30A8\u30B9\u30C8\u30CB\u30A2\u30FB\u30AF\u30EB\u30FC\u30F3
-egp=\u30A8\u30B8\u30D7\u30C8\u30FB\u30DD\u30F3\u30C9
-ern=\u30A8\u30EA\u30C8\u30EA\u30A2\u30FB\u30CA\u30AF\u30D5\u30A1
-esp=\u30B9\u30DA\u30A4\u30F3\u30FB\u30DA\u30BB\u30BF
-etb=\u30A8\u30C1\u30AA\u30D4\u30A2\u30FB\u30D6\u30EB
-eur=\u30E6\u30FC\u30ED
-fim=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9\u30FB\u30DE\u30EB\u30AB
-fjd=\u30D5\u30A3\u30B8\u30FC\u30FB\u30C9\u30EB
-fkp=\u30D5\u30A9\u30FC\u30AF\u30E9\u30F3\u30C9\u8AF8\u5CF6\u30DD\u30F3\u30C9
-frf=\u30D5\u30E9\u30F3\u30B9\u30FB\u30D5\u30E9\u30F3
-gbp=\u82F1\u30DD\u30F3\u30C9
-gel=\u30B8\u30E7\u30FC\u30B8\u30A2\u30FB\u30E9\u30EA
-ghc=\u30AC\u30FC\u30CA\u30FB\u30BB\u30C7\u30A3(1979-2007)
-ghs=\u30AC\u30FC\u30CA\u30FB\u30BB\u30C7\u30A3
-gip=\u30B8\u30D6\u30E9\u30EB\u30BF\u30EB\u30FB\u30DD\u30F3\u30C9
-gmd=\u30AC\u30F3\u30D3\u30A2\u30FB\u30C0\u30E9\u30B7
-gnf=\u30AE\u30CB\u30A2\u30FB\u30D5\u30E9\u30F3
-grd=\u30AE\u30EA\u30B7\u30E3\u30FB\u30C9\u30E9\u30AF\u30DE
-gtq=\u30B0\u30A2\u30C6\u30DE\u30E9\u30FB\u30B1\u30C4\u30A1\u30EB
-gwp=\u30AE\u30CB\u30A2\u30D3\u30B5\u30A6\u30FB\u30DA\u30BD
-gyd=\u30AC\u30A4\u30A2\u30CA\u30FB\u30C9\u30EB
-hkd=\u9999\u6E2F\u30C9\u30EB
-hnl=\u30DB\u30F3\u30B8\u30E5\u30E9\u30B9\u30FB\u30EC\u30F3\u30D4\u30E9
-hrk=\u30AF\u30FC\u30CA
-htg=\u30CF\u30A4\u30C1\u30FB\u30B0\u30FC\u30EB\u30C9
-huf=\u30CF\u30F3\u30AC\u30EA\u30FC\u30FB\u30D5\u30A9\u30EA\u30F3\u30C8
-idr=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u30FB\u30EB\u30D4\u30A2
-iep=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u30FB\u30DD\u30F3\u30C9
-ils=\u30A4\u30B9\u30E9\u30A8\u30EB\u65B0\u30B7\u30A7\u30B1\u30EB
-inr=\u30A4\u30F3\u30C9\u30FB\u30EB\u30D4\u30FC
-iqd=\u30A4\u30E9\u30AF\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-irr=\u30A4\u30E9\u30F3\u30FB\u30EA\u30A2\u30EB
-isk=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9\u30FB\u30AF\u30ED\u30FC\u30CA
-itl=\u30A4\u30BF\u30EA\u30A2\u30FB\u30EA\u30E9
-jmd=\u30B8\u30E3\u30DE\u30A4\u30AB\u30FB\u30C9\u30EB
-jod=\u30E8\u30EB\u30C0\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-jpy=\u65E5\u672C\u5186
-kes=\u30B1\u30CB\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
-kgs=\u30AD\u30EB\u30AE\u30B9\u30FB\u30BD\u30E0
-khr=\u30AB\u30F3\u30DC\u30B8\u30A2\u30FB\u30EA\u30A8\u30EB
-kmf=\u30B3\u30E2\u30ED\u30FB\u30D5\u30E9\u30F3
-kpw=\u5317\u671D\u9BAE\u30A6\u30A9\u30F3
-krw=\u97D3\u56FD\u30A6\u30A9\u30F3
-kwd=\u30AF\u30A6\u30A7\u30FC\u30C8\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-kyd=\u30B1\u30A4\u30DE\u30F3\u8AF8\u5CF6\u30C9\u30EB
-kzt=\u30AB\u30B6\u30D5\u30B9\u30BF\u30F3\u30FB\u30C6\u30F3\u30B2
-lak=\u30E9\u30AA\u30B9\u30FB\u30AD\u30FC\u30D7
-lbp=\u30EC\u30D0\u30CE\u30F3\u30FB\u30DD\u30F3\u30C9
-lkr=\u30B9\u30EA\u30E9\u30F3\u30AB\u30FB\u30EB\u30D4\u30FC
-lrd=\u30EA\u30D9\u30EA\u30A2\u30FB\u30C9\u30EB
-lsl=\u30EC\u30BD\u30C8\u30FB\u30ED\u30C6\u30A3
-ltl=\u30EA\u30C8\u30A2\u30CB\u30A2\u30FB\u30EA\u30BF\u30B9
-luf=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30AF\u30FB\u30D5\u30E9\u30F3
-lvl=\u30E9\u30C8\u30D3\u30A2\u30FB\u30E9\u30C3\u30C4
-lyd=\u30EA\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-mad=\u30E2\u30ED\u30C3\u30B3\u30FB\u30C7\u30A3\u30EB\u30CF\u30E0
-mdl=\u30E2\u30EB\u30C9\u30D0\u30FB\u30EC\u30A4
-mga=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u30FB\u30A2\u30EA\u30A2\u30EA
-mgf=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u30FB\u30D5\u30E9\u30F3
-mkd=\u30DE\u30B1\u30C9\u30CB\u30A2\u30FB\u30C7\u30CA\u30EB
-mmk=\u30DF\u30E3\u30F3\u30DE\u30FC\u30FB\u30C1\u30E3\u30C3\u30C8
-mnt=\u30E2\u30F3\u30B4\u30EB\u30FB\u30C8\u30B0\u30ED\u30B0
-mop=\u30DE\u30AB\u30AA\u30FB\u30D1\u30BF\u30AB
-mro=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2\u30FB\u30A6\u30AE\u30A2
-mru=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2\u30FB\u30A6\u30AE\u30A2
-mtl=\u30DE\u30EB\u30BF\u30FB\u30EA\u30E9
-mur=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u30FB\u30EB\u30D4\u30FC
-mvr=\u30E2\u30EB\u30B8\u30D6\u30FB\u30EB\u30D5\u30A3\u30A2
-mwk=\u30DE\u30E9\u30A6\u30A3\u30A2\u30F3\u30FB\u30DE\u30E9\u30A6\u30A4\u30FB\u30AF\u30EF\u30C1\u30E3
-mxn=\u30E1\u30AD\u30B7\u30B3\u30FB\u30DA\u30BD
-mxv=\u30E1\u30AD\u30B7\u30B3\u6295\u8CC7\u5358\u4F4D
-myr=\u30DE\u30EC\u30FC\u30B7\u30A2\u30FB\u30EA\u30F3\u30AE\u30C3\u30C8
-mzm=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u30FB\u30E1\u30C6\u30A3\u30AB\u30EB(1980-2006)
-mzn=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u30FB\u30E1\u30C6\u30A3\u30AB\u30EB
-nad=\u30CA\u30DF\u30D3\u30A2\u30FB\u30C9\u30EB
-ngn=\u30CA\u30A4\u30B8\u30A7\u30EA\u30A2\u30FB\u30CA\u30A4\u30E9
-nio=\u30CB\u30AB\u30E9\u30B0\u30A2\u30FB\u30B3\u30EB\u30C9\u30D0
-nlg=\u30AA\u30E9\u30F3\u30C0\u30FB\u30AE\u30EB\u30C0\u30FC
-nok=\u30CE\u30EB\u30A6\u30A7\u30FC\u30FB\u30AF\u30ED\u30FC\u30CD
-npr=\u30CD\u30D1\u30FC\u30EB\u30FB\u30EB\u30D4\u30FC
-nzd=\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9\u30FB\u30C9\u30EB
-omr=\u30AA\u30DE\u30FC\u30F3\u30FB\u30EA\u30A2\u30EB
-pab=\u30D1\u30CA\u30DE\u30FB\u30D0\u30EB\u30DC\u30A2
-pen=\u30DA\u30EB\u30FC\u30FB\u30BD\u30EB
-pgk=\u30D1\u30D7\u30A2\u30CB\u30E5\u30FC\u30AE\u30CB\u30A2\u30FB\u30AD\u30CA
-php=\u30D5\u30A3\u30EA\u30D4\u30F3\u30FB\u30DA\u30BD
-pkr=\u30D1\u30AD\u30B9\u30BF\u30F3\u30FB\u30EB\u30D4\u30FC
-pln=\u30DD\u30FC\u30E9\u30F3\u30C9\u30FB\u30BA\u30ED\u30C1
-pte=\u30DD\u30EB\u30C8\u30AC\u30EB\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
-pyg=\u30D1\u30E9\u30B0\u30A2\u30A4\u30FB\u30B0\u30A2\u30E9\u30CB\u30FC
-qar=\u30AB\u30BF\u30FC\u30EB\u30FB\u30EA\u30A2\u30EB
-rol=\u30EB\u30FC\u30DE\u30CB\u30A2\u30FB\u30EC\u30A4(1952-2006)
-ron=\u30EB\u30FC\u30DE\u30CB\u30A2\u30FB\u30EC\u30A4
-rsd=\u30BB\u30EB\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-rub=\u30ED\u30B7\u30A2\u30FB\u30EB\u30FC\u30D6\u30EB
-rur=\u30ED\u30B7\u30A2\u30FB\u30EB\u30FC\u30D6\u30EB(1991-1998)
-rwf=\u30EB\u30EF\u30F3\u30C0\u30FB\u30D5\u30E9\u30F3
-sar=\u30B5\u30A6\u30B8\u30FB\u30EA\u30E4\u30EB
-sbd=\u30BD\u30ED\u30E2\u30F3\u8AF8\u5CF6\u30C9\u30EB
-scr=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u30FB\u30EB\u30D4\u30FC
-sdd=\u30B9\u30FC\u30C0\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB(1992-2007)
-sdg=\u30B9\u30FC\u30C0\u30F3\u30FB\u30DD\u30F3\u30C9
-sek=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3\u30FB\u30AF\u30ED\u30FC\u30CA
-sgd=\u30B7\u30F3\u30AC\u30DD\u30FC\u30EB\u30FB\u30C9\u30EB
-shp=\u30BB\u30F3\u30C8\u30D8\u30EC\u30CA\u30FB\u30DD\u30F3\u30C9
-sit=\u30B9\u30ED\u30D9\u30CB\u30A2\u30FB\u30C8\u30E9\u30FC\u30EB
-skk=\u30B9\u30ED\u30D0\u30AD\u30A2\u30FB\u30B3\u30EB\u30CA
-sll=\u30B7\u30A8\u30E9\u30EC\u30AA\u30CD\u30FB\u30EC\u30AA\u30F3
-sos=\u30BD\u30DE\u30EA\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
-srd=\u30B9\u30EA\u30CA\u30E0\u30FB\u30C9\u30EB
-srg=\u30B9\u30EA\u30CA\u30E0\u30FB\u30AE\u30EB\u30C0\u30FC
-ssp=\u5357\u30B9\u30FC\u30C0\u30F3\u30FB\u30DD\u30F3\u30C9
-std=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA\u30FB\u30C9\u30D6\u30E9
-stn=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA\u30FB\u30C9\u30D6\u30E9
-svc=\u30A8\u30EB\u30B5\u30EB\u30D0\u30C9\u30EB\u30FB\u30B3\u30ED\u30F3
-syp=\u30B7\u30EA\u30A2\u30FB\u30DD\u30F3\u30C9
-szl=\u30B9\u30EF\u30B8\u30E9\u30F3\u30C9\u30FB\u30EA\u30E9\u30F3\u30B8\u30A7\u30CB
-thb=\u30BF\u30A4\u30FB\u30D0\u30FC\u30C4
-tjs=\u30BF\u30B8\u30AD\u30B9\u30BF\u30F3\u30FB\u30BD\u30E2\u30CB
-tmm=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u30FB\u30DE\u30CA\u30C8(1993-2009)
-tmt=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u30FB\u30DE\u30CA\u30C8
-tnd=\u30C1\u30E5\u30CB\u30B8\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
-top=\u30C8\u30F3\u30AC\u30FB\u30D1\u30FB\u30A2\u30F3\u30AC
-tpe=\u30C6\u30A3\u30E2\u30FC\u30EB\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
-trl=\u30C8\u30EB\u30B3\u30EA\u30E9(1922-2005)
-try=\u30C8\u30EB\u30B3\u30FB\u30EA\u30E9
-ttd=\u30C8\u30EA\u30CB\u30C0\u30FC\u30C9\u30FB\u30C8\u30D0\u30B4\u30FB\u30C9\u30EB
-twd=\u65B0\u53F0\u6E7E\u30C9\u30EB
-tzs=\u30BF\u30F3\u30B6\u30CB\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
-uah=\u30A6\u30AF\u30E9\u30A4\u30CA\u30FB\u30B0\u30EA\u30D6\u30CA
-ugx=\u30A6\u30AC\u30F3\u30C0\u30FB\u30B7\u30EA\u30F3\u30B0
-usd=US\u30C9\u30EB
-usn=US\u30C9\u30EB(\u7FCC\u65E5)
-uss=US\u30C9\u30EB(\u540C\u65E5)
-uyu=\u30A6\u30EB\u30B0\u30A2\u30A4\u30FB\u30DA\u30BD
-uzs=\u30A6\u30BA\u30D9\u30AD\u30B9\u30BF\u30F3\u30FB\u30BD\u30E0
-veb=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB(1871-2008)
-ved=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB\u30FB\u30BD\u30D9\u30E9\u30CE
-vef=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB
-ves=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB\u30FB\u30BD\u30D9\u30E9\u30CE
-vnd=\u30D9\u30C8\u30CA\u30E0\u30FB\u30C9\u30F3
-vuv=\u30D0\u30CC\u30A2\u30C4\u30FB\u30D0\u30C4
-wst=\u30B5\u30E2\u30A2\u30FB\u30BF\u30E9
-xaf=CFA\u30D5\u30E9\u30F3BEAC
+#
+# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
+#
+adp=\u30a2\u30f3\u30c9\u30e9 \u30da\u30bb\u30bf
+aed=UAE \u30c7\u30a3\u30eb\u30cf\u30e0
+afa=\u30a2\u30d5\u30ac\u30cb\u30fc (1927-2002)
+afn=\u30a2\u30d5\u30ac\u30cb\u30fc
+all=\u30a2\u30eb\u30d0\u30cb\u30a2 \u30ec\u30af
+amd=\u30a2\u30eb\u30e1\u30cb\u30a2 \u30c9\u30e9\u30e0
+ang=\u30aa\u30e9\u30f3\u30c0\u9818\u30a2\u30f3\u30c6\u30a3\u30eb \u30ae\u30eb\u30c0\u30fc
+aoa=\u30af\u30ef\u30f3\u30b6
+ars=\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3 \u30da\u30bd
+ats=\u30aa\u30fc\u30b9\u30c8\u30ea\u30a2 \u30b7\u30ea\u30f3\u30b0
+aud=\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2 \u30c9\u30eb
+awg=\u30a2\u30eb\u30d0 \u30ae\u30eb\u30c0\u30fc
+azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8 (1993-2006)
+azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8
+bam=\u30dc\u30b9\u30cb\u30a2 \u30de\u30eb\u30af (BAM)
+bbd=\u30d0\u30eb\u30d0\u30c9\u30b9 \u30c9\u30eb
+bdt=\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5 \u30bf\u30ab
+bef=\u30d9\u30eb\u30ae\u30fc \u30d5\u30e9\u30f3
+bgl=\u30d6\u30eb\u30ac\u30ea\u30a2 \u30ec\u30d5
+bgn=\u30d6\u30eb\u30ac\u30ea\u30a2 \u65b0\u30ec\u30d5
+bhd=\u30d0\u30fc\u30ec\u30fc\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
+bif=\u30d6\u30eb\u30f3\u30b8 \u30d5\u30e9\u30f3
+bmd=\u30d0\u30df\u30e5\u30fc\u30c0 \u30c9\u30eb
+bnd=\u30d6\u30eb\u30cd\u30a4 \u30c9\u30eb
+bob=\u30dc\u30ea\u30d3\u30a2\u30fc\u30ce
+bov=\u30dc\u30ea\u30d3\u30a2 Mvdol
+brl=\u30d6\u30e9\u30b8\u30eb \u30ec\u30a2\u30eb
+bsd=\u30d0\u30cf\u30de \u30c9\u30eb
+btn=\u30d6\u30fc\u30bf\u30f3 \u30cb\u30e5\u30eb\u30bf\u30e0
+bwp=\u30dc\u30c4\u30ef\u30ca \u30d7\u30e9
+byb=\u30d9\u30e9\u30eb\u30fc\u30b7 \u30eb\u30fc\u30d6\u30eb (1994-1999)
+byr=\u30d9\u30e9\u30eb\u30fc\u30b7 \u30eb\u30fc\u30d6\u30eb
+bzd=\u30d9\u30ea\u30fc\u30ba \u30c9\u30eb
+cad=\u30ab\u30ca\u30c0 \u30c9\u30eb
+cdf=\u30b3\u30f3\u30b4 \u30d5\u30e9\u30f3
+chf=\u30b9\u30a4\u30b9 \u30d5\u30e9\u30f3
+clf=\u30c1\u30ea \u30a6\u30cb\u30c0 \u30c7 \u30d5\u30a9\u30e1\u30f3\u30c8
+clp=\u30c1\u30ea \u30da\u30bd
+cny=\u4e2d\u56fd\u4eba\u6c11\u5143
+cop=\u30b3\u30ed\u30f3\u30d3\u30a2 \u30da\u30bd
+crc=\u30b3\u30b9\u30bf\u30ea\u30ab \u30b3\u30ed\u30f3
+csd=\u30bb\u30eb\u30d3\u30a2\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
+cuc=\u30ad\u30e5\u30fc\u30d0 \u514c\u63db\u30da\u30bd
+cup=\u30ad\u30e5\u30fc\u30d0 \u30da\u30bd
+cve=\u30ab\u30fc\u30dc\u30d9\u30eb\u30c7 \u30a8\u30b9\u30af\u30fc\u30c9
+cyp=\u30ad\u30d7\u30ed\u30b9 \u30dd\u30f3\u30c9
+czk=\u30c1\u30a7\u30b3 \u30b3\u30eb\u30ca
+dem=\u30c9\u30a4\u30c4 \u30de\u30eb\u30af
+djf=\u30b8\u30d6\u30c1 \u30d5\u30e9\u30f3
+dkk=\u30c7\u30f3\u30de\u30fc\u30af \u30af\u30ed\u30fc\u30cd
+dop=\u30c9\u30df\u30cb\u30ab \u30da\u30bd
+dzd=\u30a2\u30eb\u30b8\u30a7\u30ea\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
+eek=\u30a8\u30b9\u30c8\u30cb\u30a2 \u30af\u30eb\u30fc\u30f3
+egp=\u30a8\u30b8\u30d7\u30c8 \u30dd\u30f3\u30c9
+ern=\u30a8\u30ea\u30c8\u30ea\u30a2 \u30ca\u30af\u30d5\u30a1
+esp=\u30b9\u30da\u30a4\u30f3 \u30da\u30bb\u30bf
+etb=\u30a8\u30c1\u30aa\u30d4\u30a2 \u30d6\u30eb
+eur=\u30e6\u30fc\u30ed
+fim=\u30d5\u30a3\u30f3\u30e9\u30f3\u30c9 \u30de\u30eb\u30ab
+fjd=\u30d5\u30a3\u30b8\u30fc\u8af8\u5cf6 \u30c9\u30eb
+fkp=\u30d5\u30a9\u30fc\u30af\u30e9\u30f3\u30c9\uff08\u30de\u30eb\u30d3\u30ca\u30b9\uff09\u8af8\u5cf6 \u30dd\u30f3\u30c9
+frf=\u30d5\u30e9\u30f3\u30b9 \u30d5\u30e9\u30f3
+gbp=\u82f1\u56fd\u30dd\u30f3\u30c9
+gel=\u30b0\u30eb\u30b8\u30a2 \u30e9\u30ea
+ghc=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3 (1979-2007)
+ghs=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3
+gip=\u30b8\u30d6\u30e9\u30eb\u30bf\u30eb \u30dd\u30f3\u30c9
+gmd=\u30ac\u30f3\u30d3\u30a2 \u30c0\u30e9\u30b7
+gnf=\u30ae\u30cb\u30a2 \u30d5\u30e9\u30f3
+grd=\u30ae\u30ea\u30b7\u30e3 \u30c9\u30e9\u30af\u30de
+gtq=\u30b0\u30a2\u30c6\u30de\u30e9 \u30b1\u30c4\u30a1\u30eb
+gwp=\u30ae\u30cb\u30a2\u30d3\u30b5\u30a6 \u30da\u30bd
+gyd=\u30ac\u30a4\u30a2\u30ca \u30c9\u30eb
+hkd=\u9999\u6e2f\u30c9\u30eb
+hnl=\u30db\u30f3\u30b8\u30e5\u30e9\u30b9 \u30ec\u30f3\u30d4\u30e9
+hrk=\u30af\u30ed\u30a2\u30c1\u30a2 \u30af\u30fc\u30ca
+htg=\u30cf\u30a4\u30c1 \u30b0\u30fc\u30eb\u30c9
+huf=\u30cf\u30f3\u30ac\u30ea\u30fc \u30d5\u30a9\u30ea\u30f3\u30c8
+idr=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2 \u30eb\u30d4\u30a2
+iep=\u30a2\u30a4\u30ea\u30c3\u30b7\u30e5 \u30dd\u30f3\u30c9
+ils=\u30a4\u30b9\u30e9\u30a8\u30eb\u65b0\u30b7\u30a7\u30b1\u30eb
+inr=\u30a4\u30f3\u30c9 \u30eb\u30d4\u30fc
+iqd=\u30a4\u30e9\u30af \u30c7\u30a3\u30ca\u30fc\u30eb
+irr=\u30a4\u30e9\u30f3 \u30ea\u30a2\u30eb
+isk=\u30a2\u30a4\u30b9\u30e9\u30f3\u30c9 \u30af\u30ed\u30fc\u30ca
+itl=\u30a4\u30bf\u30ea\u30a2 \u30ea\u30e9
+jmd=\u30b8\u30e3\u30de\u30a4\u30ab \u30c9\u30eb
+jod=\u30e8\u30eb\u30c0\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
+jpy=\u65e5\u672c\u5186
+kes=\u30b1\u30cb\u30a2 \u30b7\u30ea\u30f3\u30b0
+kgs=\u30ad\u30eb\u30ae\u30b9\u30bf\u30f3 \u30bd\u30e0
+khr=\u30ab\u30f3\u30dc\u30b8\u30a2 \u30ea\u30a8\u30eb
+kmf=\u30b3\u30e2\u30ed \u30d5\u30e9\u30f3
+kpw=\u5317\u671d\u9bae \u30a6\u30a9\u30f3
+krw=\u97d3\u56fd \u30a6\u30a9\u30f3
+kwd=\u30af\u30a6\u30a7\u30fc\u30c8 \u30c7\u30a3\u30ca\u30fc\u30eb
+kyd=\u30b1\u30a4\u30de\u30f3\u8af8\u5cf6 \u30c9\u30eb
+kzt=\u30ab\u30b6\u30d5\u30b9\u30bf\u30f3 \u30c6\u30f3\u30b2
+lak=\u30e9\u30aa\u30b9 \u30ad\u30fc\u30d7
+lbp=\u30ec\u30d0\u30ce\u30f3 \u30dd\u30f3\u30c9
+lkr=\u30b9\u30ea\u30e9\u30f3\u30ab \u30eb\u30d4\u30fc
+lrd=\u30ea\u30d9\u30ea\u30a2 \u30c9\u30eb
+lsl=\u30ec\u30bd\u30c8 \u30ed\u30c6\u30a3
+ltl=\u30ea\u30c8\u30a2\u30cb\u30a2 \u30ea\u30bf\u30b9
+luf=\u30eb\u30af\u30bb\u30f3\u30d6\u30eb\u30b0 \u30d5\u30e9\u30f3
+lvl=\u30e9\u30c8\u30d3\u30a2 \u30e9\u30c3\u30c4
+lyd=\u30ea\u30d3\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
+mad=\u30e2\u30ed\u30c3\u30b3 \u30c7\u30a3\u30eb\u30cf\u30e0
+mdl=\u30e2\u30eb\u30c9\u30d0 \u30ec\u30a4
+mga=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb \u30a2\u30ea\u30a2\u30ea
+mgf=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb \u30d5\u30e9\u30f3
+mkd=\u30de\u30b1\u30c9\u30cb\u30a2 \u30c7\u30ca\u30eb
+mmk=\u30df\u30e3\u30f3\u30de\u30fc \u30c1\u30e3\u30c3\u30c8
+mnt=\u30e2\u30f3\u30b4\u30eb \u30c8\u30b0\u30ed\u30b0
+mop=\u30de\u30ab\u30aa \u30d1\u30bf\u30ab
+mro=\u30e2\u30fc\u30ea\u30bf\u30cb\u30a2 \u30a6\u30ae\u30a2
+mtl=\u30de\u30eb\u30bf \u30ea\u30e9
+mur=\u30e2\u30fc\u30ea\u30b7\u30e3\u30b9 \u30eb\u30d4\u30fc
+mvr=\u30e2\u30eb\u30c7\u30a3\u30d6\u8af8\u5cf6 \u30eb\u30d5\u30a3\u30a2
+mwk=\u30de\u30e9\u30a6\u30a3 \u30af\u30ef\u30c1\u30e3
+mxn=\u30e1\u30ad\u30b7\u30b3 \u30da\u30bd
+mxv=\u30e1\u30ad\u30b7\u30b3 UDI
+myr=\u30de\u30ec\u30fc\u30b7\u30a2 \u30ea\u30f3\u30ae\u30c3\u30c8
+mzm=\u30e2\u30b6\u30f3\u30d4\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
+mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
+nad=\u30ca\u30df\u30d3\u30a2 \u30c9\u30eb
+ngn=\u30ca\u30a4\u30b8\u30a7\u30ea\u30a2 \u30ca\u30a4\u30e9
+nio=\u30cb\u30ab\u30e9\u30b0\u30a2 \u30b3\u30eb\u30c9\u30d0 \u30aa\u30ed
+nlg=\u30aa\u30e9\u30f3\u30c0 \u30ae\u30eb\u30c0\u30fc
+nok=\u30ce\u30eb\u30a6\u30a7\u30fc \u30af\u30ed\u30fc\u30cd
+npr=\u30cd\u30d1\u30fc\u30eb \u30eb\u30d4\u30fc
+nzd=\u30cb\u30e5\u30fc\u30b8\u30fc\u30e9\u30f3\u30c9 \u30c9\u30eb
+omr=\u30aa\u30de\u30fc\u30f3 \u30ea\u30a2\u30eb
+pab=\u30d1\u30ca\u30de \u30d0\u30eb\u30dc\u30a2
+pen=\u30da\u30eb\u30fc \u65b0\u30bd\u30eb
+pgk=\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2 \u30ad\u30ca
+php=\u30d5\u30a3\u30ea\u30d4\u30f3 \u30da\u30bd
+pkr=\u30d1\u30ad\u30b9\u30bf\u30f3 \u30eb\u30d4\u30fc
+pln=\u30dd\u30fc\u30e9\u30f3\u30c9 \u30ba\u30a6\u30a9\u30c6\u30a3
+pte=\u30dd\u30eb\u30c8\u30ac\u30eb \u30a8\u30b9\u30af\u30fc\u30c9
+pyg=\u30d1\u30e9\u30b0\u30a2\u30a4 \u30b0\u30a2\u30e9\u30cb
+qar=\u30ab\u30bf\u30fc\u30eb \u30ea\u30a2\u30eb
+rol=\u30eb\u30fc\u30de\u30cb\u30a2 \u65e7\u30ec\u30a4
+ron=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4
+rsd=\u30c7\u30a3\u30ca\u30fc\u30eb (\u30bb\u30eb\u30d3\u30a2)
+rub=\u30ed\u30b7\u30a2 \u30eb\u30fc\u30d6\u30eb
+rur=\u30ed\u30b7\u30a2 \u30eb\u30fc\u30d6\u30eb (1991-1998)
+rwf=\u30eb\u30ef\u30f3\u30c0 \u30d5\u30e9\u30f3
+sar=\u30b5\u30a6\u30b8 \u30ea\u30e4\u30eb
+sbd=\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6 \u30c9\u30eb
+scr=\u30bb\u30a4\u30b7\u30a7\u30eb \u30eb\u30d4\u30fc
+sdd=\u30b9\u30fc\u30c0\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
+sdg=\u30b9\u30fc\u30c0\u30f3 \u30dd\u30f3\u30c9
+sek=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3 \u30af\u30ed\u30fc\u30ca
+sgd=\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb \u30c9\u30eb
+shp=\u30bb\u30f3\u30c8\u30d8\u30ec\u30ca\u5cf6 \u30dd\u30f3\u30c9
+sit=\u30b9\u30ed\u30d9\u30cb\u30a2 \u30c8\u30e9\u30fc\u30eb
+skk=\u30b9\u30ed\u30d0\u30ad\u30a2 \u30b3\u30eb\u30ca
+sll=\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd \u30ec\u30aa\u30f3
+sos=\u30bd\u30de\u30ea\u30a2 \u30b7\u30ea\u30f3\u30b0
+srd=\u30b9\u30ea\u30ca\u30e0 \u30c9\u30eb
+srg=\u30b9\u30ea\u30ca\u30e0 \u30ae\u30eb\u30c0\u30fc
+std=\u30b5\u30f3\u30c8\u30e1\u30fb\u30d7\u30ea\u30f3\u30b7\u30da \u30c9\u30d6\u30e9
+svc=\u30a8\u30eb\u30b5\u30eb\u30d0\u30c9\u30eb \u30b3\u30ed\u30f3
+syp=\u30b7\u30ea\u30a2 \u30dd\u30f3\u30c9
+szl=\u30b9\u30ef\u30b8\u30e9\u30f3\u30c9 \u30ea\u30e9\u30f3\u30b2\u30cb
+thb=\u30bf\u30a4 \u30d0\u30fc\u30c4
+tjs=\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3 \u30bd\u30e2\u30cb
+tmm=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3 \u30de\u30ca\u30c8
+tmt=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3 \u65b0\u30de\u30ca\u30c8
+tnd=\u30c1\u30e5\u30cb\u30b8\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
+top=\u30c8\u30f3\u30ac \u30d1\u30fb\u30a2\u30f3\u30ac
+tpe=\u30c6\u30a3\u30e2\u30fc\u30eb \u30a8\u30b9\u30af\u30fc\u30c9
+trl=\u30c8\u30eb\u30b3 \u30ea\u30e9
+try=\u65b0\u30c8\u30eb\u30b3\u30ea\u30e9
+ttd=\u30c8\u30ea\u30cb\u30c0\u30fc\u30c9\u30c8\u30d0\u30b4 \u30c9\u30eb
+twd=\u65b0\u53f0\u6e7e\u30c9\u30eb
+tzs=\u30bf\u30f3\u30b6\u30cb\u30a2 \u30b7\u30ea\u30f3\u30b0
+uah=\u30a6\u30af\u30e9\u30a4\u30ca \u30b0\u30ea\u30d6\u30ca
+ugx=\u30a6\u30ac\u30f3\u30c0 \u30b7\u30ea\u30f3\u30b0
+usd=\u7c73\u30c9\u30eb
+usn=\u7c73\u30c9\u30eb (\u7fcc\u65e5)
+uss=\u7c73\u30c9\u30eb (\u5f53\u65e5)
+uyu=\u30a6\u30eb\u30b0\u30a2\u30a4 \u30da\u30bd
+uzs=\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3 \u30b9\u30e0
+veb=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb
+vef=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb\u30d5\u30a8\u30eb\u30c6
+vnd=\u30d9\u30c8\u30ca\u30e0 \u30c9\u30f3
+vuv=\u30d0\u30cc\u30a2\u30c4 \u30d0\u30c4
+wst=\u897f\u30b5\u30e2\u30a2 \u30bf\u30e9
+xaf=CFA \u30d5\u30e9\u30f3 BEAC
 xag=\u9280
-xau=\u91D1
-xba=\u6B27\u5DDE\u901A\u8CA8\u6DF7\u5408\u5358\u4F4D
-xbb=\u6B27\u5DDE\u901A\u8CA8\u8A08\u7B97\u5358\u4F4D
-xbc=\u6B27\u5DDE\u8A08\u7B97\u5358\u4F4D(XBC)
-xbd=\u6B27\u5DDE\u8A08\u7B97\u5358\u4F4D(XBD)
-xcd=\u6771\u30AB\u30EA\u30D6EC\u30C9\u30EB
-xdr=\u7279\u5225\u5F15\u51FA\u6A29
-xfo=\u30D5\u30E9\u30F3\u30B9\u91D1\u30D5\u30E9\u30F3
-xfu=\u30D5\u30E9\u30F3\u30B9UIC\u30D5\u30E9\u30F3
-xof=CFA\u30D5\u30E9\u30F3BCEAO
-xpd=\u30D1\u30E9\u30B8\u30A6\u30E0
-xpf=CFP\u30D5\u30E9\u30F3
-xpt=\u30D7\u30E9\u30C1\u30CA
-xsu=\u30B9\u30AF\u30EC
-xts=\u30C6\u30B9\u30C8\u901A\u8CA8\u30B3\u30FC\u30C9
-xua=ADB\u8A08\u7B97\u5358\u4F4D
-xxx=\u4E0D\u660E\u306A\u901A\u8CA8
-yer=\u30A4\u30A8\u30E1\u30F3\u30FB\u30EA\u30A2\u30EB
-yum=\u30E6\u30FC\u30B4\u30B9\u30E9\u30D3\u30A2\u65B0\u30C7\u30A3\u30CA\u30FC\u30EB(1994-2002)
-zar=\u5357\u30A2\u30D5\u30EA\u30AB\u30FB\u30E9\u30F3\u30C9
-zmk=\u30B6\u30F3\u30D3\u30A2\u30FB\u30AF\u30EF\u30C1\u30E3
-zwd=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(1980-2008)
-zwl=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(2009)
-zwr=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(2008)
+xau=\u91d1
+xba=\u30e8\u30fc\u30ed\u30c3\u30d1\u6df7\u5408\u5358\u4f4d (EURCO)
+xbb=\u30e8\u30fc\u30ed\u30c3\u30d1\u901a\u8ca8\u5358\u4f4d (EMU-6)
+xbc=\u30e8\u30fc\u30ed\u30c3\u30d1\u52d8\u5b9a\u5358\u4f4d (EUA-9)
+xbd=\u30e8\u30fc\u30ed\u30c3\u30d1\u52d8\u5b9a\u5358\u4f4d (EUA-17)
+xcd=\u6771\u30ab\u30ea\u30d6 \u30c9\u30eb
+xdr=\u7279\u5225\u5f15\u304d\u51fa\u3057\u6a29
+xfo=\u30d5\u30e9\u30f3\u30b9\u91d1\u30d5\u30e9\u30f3
+xfu=\u30d5\u30e9\u30f3\u30b9 UIC \u30d5\u30e9\u30f3
+xof=CFA \u30d5\u30e9\u30f3 BCEAO
+xpd=\u30d1\u30e9\u30b8\u30a6\u30e0
+xpf=CFP \u30d5\u30e9\u30f3
+xpt=\u30d7\u30e9\u30c1\u30ca
+xts=\u30c6\u30b9\u30c8\u7528\u901a\u8ca8\u30b3\u30fc\u30c9
+xxx=\u4e0d\u660e\u307e\u305f\u306f\u7121\u52b9\u306a\u901a\u8ca8
+yer=\u30a4\u30a8\u30e1\u30f3 \u30ea\u30a2\u30eb
+yum=\u30e6\u30fc\u30b4\u30b9\u30e9\u30d3\u30a2 \u30b9\u30fc\u30d1\u30fc \u30c7\u30a3\u30ca\u30fc\u30eb
+zar=\u5357\u30a2\u30d5\u30ea\u30ab \u30e9\u30f3\u30c9
+zmk=\u30b6\u30f3\u30d3\u30a2 \u30af\u30ef\u30c1\u30e3
+zwd=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb
+zwl=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb (2009)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
index 0f64629df09..b197882202b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,225 +60,220 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-adp=\u5B89\u9053\u5C14\u6BD4\u585E\u5854
-aed=\u963F\u62C9\u4F2F\u8054\u5408\u914B\u957F\u56FD\u8FEA\u62C9\u59C6
-afa=\u963F\u5BCC\u6C57\u963F\u5BCC\u6C57\u5C3C (1927-2002)
-afn=\u963F\u5BCC\u6C57\u963F\u5BCC\u6C57\u5C3C
-all=\u963F\u5C14\u5DF4\u5C3C\u4E9A\u5217\u514B
-amd=\u4E9A\u7F8E\u5C3C\u4E9A\u5FB7\u62C9\u59C6
-ang=\u8377\u5C5E\u5B89\u7684\u5217\u65AF\u76FE
-aoa=\u5B89\u54E5\u62C9\u5BBD\u624E
-ars=\u963F\u6839\u5EF7\u6BD4\u7D22
-ats=\u5965\u5730\u5229\u5148\u4EE4
-aud=\u6FB3\u5927\u5229\u4E9A\u5143
-awg=\u963F\u9C81\u5DF4\u5C9B\u5F17\u7F57\u6797
-azm=\u963F\u585E\u62DC\u7586\u9A6C\u7EB3\u7279 (1993-2006)
-azn=\u963F\u585E\u62DC\u7586\u9A6C\u7EB3\u7279
-bam=\u6CE2\u65AF\u5C3C\u4E9A\u548C\u9ED1\u585E\u54E5\u7EF4\u90A3\u53EF\u5151\u6362\u9A6C\u514B
-bbd=\u5DF4\u5DF4\u591A\u65AF\u5143
-bdt=\u5B5F\u52A0\u62C9\u5854\u5361
-bef=\u6BD4\u5229\u65F6\u6CD5\u90CE
-bgl=\u4FDD\u52A0\u5229\u4E9A\u5217\u5F17\uFF08\u786C\u5E01\uFF09
-bgn=\u4FDD\u52A0\u5229\u4E9A\u5217\u5F17
-bhd=\u5DF4\u6797\u7B2C\u7EB3\u5C14
-bif=\u5E03\u9686\u8FEA\u6CD5\u90CE
-bmd=\u767E\u6155\u5927\u5143
-bnd=\u6587\u83B1\u5143
-bob=\u6CE2\u5229\u7EF4\u4E9A\u73BB\u5229\u7EF4\u4E9A\u8BFA
-bov=\u73BB\u5229\u7EF4\u4E9A Mvdol
-brl=\u5DF4\u897F\u96F7\u4E9A\u5C14
-bsd=\u5DF4\u54C8\u9A6C\u5143
-btn=\u4E0D\u4E39\u52AA\u624E\u59C6
-bwp=\u535A\u8328\u74E6\u7EB3\u666E\u62C9
-byb=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03 (1994-1999)
-byn=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03
-byr=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03 (2000-2016)
-bzd=\u4F2F\u5229\u5179\u5143
-cad=\u52A0\u62FF\u5927\u5143
-cdf=\u521A\u679C\u6CD5\u90CE
-chf=\u745E\u58EB\u6CD5\u90CE
-clf=\u667A\u5229\u8BB0\u8D26\u5355\u4F4D (UF)
-clp=\u667A\u5229\u6BD4\u7D22
-cny=\u4EBA\u6C11\u5E01
-cop=\u54E5\u4F26\u6BD4\u4E9A\u6BD4\u7D22
-crc=\u54E5\u65AF\u8FBE\u9ECE\u52A0\u79D1\u6717
-csd=\u585E\u5C14\u7EF4\u4E9A\u7B2C\u7EB3\u5C14 (2002-2006)
-cuc=\u53E4\u5DF4\u53EF\u5151\u6362\u6BD4\u7D22
-cup=\u53E4\u5DF4\u6BD4\u7D22
-cve=\u4F5B\u5F97\u89D2\u57C3\u65AF\u5E93\u591A
-cyp=\u585E\u6D66\u8DEF\u65AF\u9551
-czk=\u6377\u514B\u5171\u548C\u56FD\u514B\u90CE
-dem=\u5FB7\u56FD\u9A6C\u514B
-djf=\u5409\u5E03\u63D0\u6CD5\u90CE
-dkk=\u4E39\u9EA6\u514B\u6717
-dop=\u591A\u7C73\u5C3C\u52A0\u6BD4\u7D22
-dzd=\u963F\u5C14\u53CA\u5229\u4E9A\u7B2C\u7EB3\u5C14
-eek=\u7231\u6C99\u5C3C\u4E9A\u514B\u6717
-egp=\u57C3\u53CA\u9551
-ern=\u5384\u7ACB\u7279\u91CC\u4E9A\u7EB3\u514B\u6CD5
-esp=\u897F\u73ED\u7259\u6BD4\u585E\u5854
-etb=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u6BD4\u5C14
-eur=\u6B27\u5143
-fim=\u82AC\u5170\u9A6C\u514B
-fjd=\u6590\u6D4E\u5143
-fkp=\u798F\u514B\u5170\u7FA4\u5C9B\u9551
-frf=\u6CD5\u56FD\u6CD5\u90CE
-gbp=\u82F1\u9551
-gel=\u683C\u9C81\u5409\u4E9A\u62C9\u91CC
-ghc=\u52A0\u7EB3\u585E\u5730 (1979-2007)
-ghs=\u52A0\u7EB3\u585E\u5730
-gip=\u76F4\u5E03\u7F57\u9640\u9551
-gmd=\u5188\u6BD4\u4E9A\u8FBE\u62C9\u897F
-gnf=\u51E0\u5185\u4E9A\u6CD5\u90CE
-grd=\u5E0C\u814A\u5FB7\u62C9\u9A6C\u514B
-gtq=\u5371\u5730\u9A6C\u62C9\u683C\u67E5\u5C14
-gwp=\u51E0\u5185\u4E9A\u6BD4\u7ECD\u6BD4\u7D22
-gyd=\u572D\u4E9A\u90A3\u5143
-hkd=\u6E2F\u5143
-hnl=\u6D2A\u90FD\u62C9\u65AF\u4F26\u76AE\u62C9
-hrk=\u5E93\u7EB3
-htg=\u6D77\u5730\u53E4\u5FB7
-huf=\u5308\u7259\u5229\u798F\u6797
-idr=\u5370\u5EA6\u5C3C\u897F\u4E9A\u5362\u6BD4
-iep=\u7231\u5C14\u5170\u9551
-ils=\u4EE5\u8272\u5217\u65B0\u8C22\u514B\u5C14
-inr=\u5370\u5EA6\u5362\u6BD4
-iqd=\u4F0A\u62C9\u514B\u7B2C\u7EB3\u5C14
-irr=\u4F0A\u6717\u91CC\u4E9A\u5C14
-isk=\u51B0\u5C9B\u514B\u6717
-itl=\u610F\u5927\u5229\u91CC\u62C9
-jmd=\u7259\u4E70\u52A0\u5143
-jod=\u7EA6\u65E6\u7B2C\u7EB3\u5C14
-jpy=\u65E5\u5143
-kes=\u80AF\u5C3C\u4E9A\u5148\u4EE4
-kgs=\u5409\u5C14\u5409\u65AF\u65AF\u5766\u7D22\u59C6
-khr=\u67EC\u57D4\u5BE8\u745E\u5C14
-kmf=\u79D1\u6469\u7F57\u6CD5\u90CE
-kpw=\u5317\u671D\u9C9C\u5143
-krw=\u97E9\u5143
-kwd=\u79D1\u5A01\u7279\u7B2C\u7EB3\u5C14
-kyd=\u5F00\u66FC\u7FA4\u5C9B\u5143
-kzt=\u54C8\u8428\u514B\u65AF\u5766\u817E\u683C
-lak=\u8001\u631D\u57FA\u666E
-lbp=\u9ECE\u5DF4\u5AE9\u9551
-lkr=\u65AF\u91CC\u5170\u5361\u5362\u6BD4
-lrd=\u5229\u6BD4\u91CC\u4E9A\u5143
-lsl=\u83B1\u7D22\u6258\u6D1B\u63D0
-ltl=\u7ACB\u9676\u5B9B\u7ACB\u7279
-luf=\u5362\u68EE\u5821\u6CD5\u90CE
-lvl=\u62C9\u8131\u7EF4\u4E9A\u62C9\u7279
-lyd=\u5229\u6BD4\u4E9A\u7B2C\u7EB3\u5C14
-mad=\u6469\u6D1B\u54E5\u8FEA\u62C9\u59C6
-mdl=\u6469\u5C14\u591A\u74E6\u5217\u4F0A
-mga=\u9A6C\u8FBE\u52A0\u65AF\u52A0\u963F\u91CC\u4E9A\u91CC
-mgf=\u9A6C\u8FBE\u52A0\u65AF\u52A0\u6CD5\u90CE
-mkd=\u9A6C\u5176\u987F\u7B2C\u7EB3\u5C14
-mmk=\u7F05\u7538\u5143
-mnt=\u8499\u53E4\u56FE\u683C\u91CC\u514B
-mop=\u6FB3\u95E8\u5143
-mro=\u6BDB\u91CC\u5854\u5C3C\u4E9A\u4E4C\u5409\u4E9A
-mru=\u6BDB\u91CC\u5854\u5C3C\u4E9A\u4E4C\u5409\u4E9A
-mtl=\u9A6C\u8033\u4ED6\u91CC\u62C9
-mur=\u6BDB\u91CC\u6C42\u65AF\u5362\u6BD4
-mvr=\u9A6C\u5C14\u4EE3\u592B\u7F57\u975E\u4E9A
-mwk=\u9A6C\u62C9\u7EF4\u9A6C\u62C9\u7EF4\u514B\u74E6\u67E5
-mxn=\u58A8\u897F\u54E5\u6BD4\u7D22
-mxv=\u58A8\u897F\u54E5\u6295\u8D44\u5355\u4F4D
-myr=\u9A6C\u6765\u897F\u4E9A\u6797\u5409\u7279
-mzm=\u83AB\u6851\u6BD4\u514B\u7F8E\u63D0\u5361 (1980-2006)
-mzn=\u83AB\u6851\u6BD4\u514B\u7F8E\u63D0\u5361
-nad=\u7EB3\u7C73\u6BD4\u4E9A\u5143
-ngn=\u5C3C\u65E5\u5229\u4E9A\u5948\u62C9
-nio=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4
-nlg=\u8377\u5170\u76FE
-nok=\u632A\u5A01\u514B\u6717
-npr=\u5C3C\u6CCA\u5C14\u5362\u6BD4
-nzd=\u65B0\u897F\u5170\u5143
-omr=\u963F\u66FC\u91CC\u4E9A\u5C14
-pab=\u5DF4\u62FF\u9A6C\u5DF4\u6CE2\u4E9A
-pen=\u79D8\u9C81\u7D22\u5C14
-pgk=\u5DF4\u5E03\u4E9A\u65B0\u51E0\u5185\u4E9A\u57FA\u90A3
-php=\u83F2\u5F8B\u5BBE\u6BD4\u7D22
-pkr=\u5DF4\u57FA\u65AF\u5766\u5362\u6BD4
-pln=\u6CE2\u5170\u5179\u7F57\u63D0
-pte=\u8461\u8404\u7259\u57C3\u65AF\u5E93\u591A
-pyg=\u5DF4\u62C9\u572D\u74DC\u62C9\u5C3C
-qar=\u5361\u5854\u5C14\u91CC\u4E9A\u5C14
-rol=\u7F57\u9A6C\u5C3C\u4E9A\u5217\u4F0A (1952-2006)
-ron=\u7F57\u9A6C\u5C3C\u4E9A\u5217\u4F0A
-rsd=\u585E\u5C14\u7EF4\u4E9A\u7B2C\u7EB3\u5C14
-rub=\u4FC4\u7F57\u65AF\u5362\u5E03
-rur=\u4FC4\u7F57\u65AF\u5362\u5E03 (1991-1998)
-rwf=\u5362\u65FA\u8FBE\u6CD5\u90CE
-sar=\u6C99\u7279\u91CC\u4E9A\u5C14
-sbd=\u6240\u7F57\u95E8\u7FA4\u5C9B\u5143
-scr=\u585E\u820C\u5C14\u5362\u6BD4
-sdd=\u82CF\u4E39\u7B2C\u7EB3\u5C14 (1992-2007)
-sdg=\u82CF\u4E39\u9551
-sek=\u745E\u5178\u514B\u6717
-sgd=\u65B0\u52A0\u5761\u5143
-shp=\u5723\u8D6B\u52D2\u62FF\u9551
-sit=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u6258\u62C9\u5C14
-skk=\u65AF\u6D1B\u4F10\u514B\u514B\u6717
-sll=\u585E\u62C9\u5229\u6602\u5229\u6602
-sos=\u7D22\u9A6C\u91CC\u5148\u4EE4
-srd=\u82CF\u91CC\u5357\u5143
-srg=\u82CF\u91CC\u5357\u76FE
-ssp=\u5357\u82CF\u4E39\u9551
-std=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4\u591A\u5E03\u62C9
-stn=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4\u591A\u5E03\u62C9
-svc=\u8428\u5C14\u74E6\u591A\u79D1\u6717
-syp=\u53D9\u5229\u4E9A\u9551
-szl=\u65AF\u5A01\u58EB\u5170\u91CC\u5170\u5409\u5C3C
-thb=\u6CF0\u94E2
-tjs=\u5854\u5409\u514B\u65AF\u5766\u7D22\u6469\u5C3C
-tmm=\u571F\u5E93\u66FC\u65AF\u5766\u9A6C\u7EB3\u7279 (1993-2009)
-tmt=\u571F\u5E93\u66FC\u65AF\u5766\u9A6C\u7EB3\u7279
-tnd=\u7A81\u5C3C\u65AF\u7B2C\u7EB3\u5C14
-top=\u4E1C\u52A0\u5E01
-tpe=\u4E1C\u5E1D\u6C76\u57C3\u65AF\u5E93\u591A
-trl=\u571F\u8033\u5176\u91CC\u62C9 (1922-2005)
-try=\u571F\u8033\u5176\u91CC\u62C9
-ttd=\u7279\u7ACB\u5C3C\u8FBE\u591A\u5DF4\u54E5\u5143
-twd=\u65B0\u53F0\u5E01
-tzs=\u5766\u6851\u5C3C\u4E9A\u5148\u4EE4
-uah=\u4E4C\u514B\u5170\u683C\u91CC\u592B\u5C3C\u4E9A
-ugx=\u4E4C\u5E72\u8FBE\u5148\u4EE4
-usd=\u7F8E\u5143
-usn=\u7F8E\u5143\uFF08\u6B21\u65E5\uFF09
-uss=\u7F8E\u5143\uFF08\u540C\u65E5\uFF09
-uyu=\u4E4C\u62C9\u572D \u6BD4\u7D22
-uzs=\u4E4C\u5179\u522B\u514B\u671F\u5766\u7D22\u59C6
-veb=\u59D4\u5185\u745E\u62C9\u73BB\u5229\u74E6\u5C14 (1871-2008)
-ved=\u59D4\u5185\u745E\u62C9\u4E3B\u6743\u73BB\u5229\u74E6\u5C14
-vef=\u59D4\u5185\u745E\u62C9\u73BB\u5229\u74E6\u5C14
-ves=\u59D4\u5185\u745E\u62C9\u4E3B\u6743\u73BB\u5229\u74E6\u5C14
-vnd=\u8D8A\u5357\u76FE
-vuv=\u74E6\u52AA\u963F\u56FE\u74E6\u56FE
-wst=\u8428\u6469\u4E9A\u5854\u62C9
-xaf=CFA \u6CD5\u90CE BEAC
-xag=\u94F6\u8272
-xau=\u91D1\u8272
-xba=\u6B27\u6D32\u8D27\u5E01\u5408\u6210\u5355\u4F4D
-xbb=\u6B27\u6D32\u8D27\u5E01\u5355\u4F4D
-xbc=\u6B27\u6D32\u8BB0\u8D26\u5355\u4F4D (XBC)
-xbd=\u6B27\u6D32\u8BB0\u8D26\u5355\u4F4D (XBD)
-xcd=\u4E1C\u52A0\u52D2\u6BD4\u5143
-xdr=\u7279\u522B\u63D0\u6B3E\u6743
-xfo=\u6CD5\u56FD\u91D1\u6CD5\u90CE
-xfu=\u6CD5\u56FD UIC \u6CD5\u90CE
-xof=CFA \u6CD5\u90CE BCEAO
-xpd=\u94AF
-xpf=\u592A\u5E73\u6D0B\u6CD5\u90CE
-xpt=\u767D\u91D1
-xsu=\u82CF\u514B\u96F7
-xts=\u6D4B\u8BD5\u8D27\u5E01\u4EE3\u7801
-xua=ADB \u8BB0\u8D26\u5355\u4F4D
-xxx=\u672A\u77E5\u8D27\u5E01
-yer=\u4E5F\u95E8\u91CC\u4E9A\u5C14
-yum=\u5357\u65AF\u62C9\u592B\u65B0\u7B2C\u7EB3\u5C14 (1994-2002)
-zar=\u5357\u975E\u5170\u7279
-zmk=\u8D5E\u6BD4\u4E9A\u514B\u74E6\u67E5
-zwd=\u6D25\u5DF4\u5E03\u97E6\u5143 (1980-2008)
-zwl=\u6D25\u5DF4\u5E03\u97E6\u5143 (2009)
-zwr=\u6D25\u5DF4\u5E03\u97E6\u5143 (2008)
+#
+# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
+#
+CNY=\uffe5
+cny=\u4eba\u6c11\u5e01
+adp=\u5b89\u9053\u5c14\u6bd4\u585e\u5854
+aed=\u963f\u8054\u914b\u8fea\u62c9\u59c6
+afa=\u963f\u5bcc\u6c57\u5c3c (1927-2002)
+afn=\u963f\u5bcc\u6c57\u5c3c
+all=\u963f\u5c14\u5df4\u5c3c\u4e9a\u5217\u514b
+amd=\u4e9a\u7f8e\u5c3c\u4e9a\u5fb7\u62c9\u59c6
+ang=\u8377\u5170\u5b89\u66ff\u5170\u76fe
+aoa=\u5b89\u54e5\u62c9\u5bbd\u624e
+ars=\u963f\u6839\u5ef7\u6bd4\u7d22
+ats=\u5965\u5730\u5229\u5148\u4ee4
+aud=\u6fb3\u5927\u5229\u4e9a\u5143
+awg=\u963f\u9c81\u5df4\u57fa\u5c14\u5fb7\u5143
+azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279 (1993-2006)
+azn=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
+bam=\u6ce2\u58eb\u5c3c\u4e9a-\u8d6b\u585e\u54e5\u7ef4\u7eb3\u5151\u6362\u5238
+bbd=\u5df4\u5df4\u591a\u65af\u5143
+bdt=\u5b5f\u52a0\u62c9\u5854\u5361
+bef=\u6bd4\u5229\u65f6\u6cd5\u90ce
+bgl=\u4fdd\u52a0\u5229\u4e9a\u786c\u5217\u5f17
+bgn=\u4fdd\u52a0\u5229\u4e9a\u65b0\u5217\u5f17
+bhd=\u5df4\u6797\u7b2c\u7eb3\u5c14
+bif=\u5e03\u9686\u8fea\u6cd5\u90ce
+bmd=\u767e\u6155\u5927\u5143
+bnd=\u6587\u83b1\u5143
+bob=\u73bb\u5229\u7ef4\u4e9a\u8bfa
+bov=\u73bb\u5229\u7ef4\u4e9a Mvdol\uff08\u8d44\u91d1\uff09
+brl=\u5df4\u897f\u96f7\u4e9a\u5c14
+bsd=\u5df4\u54c8\u9a6c\u5143
+btn=\u4e0d\u4e39\u52aa\u624e\u59c6
+bwp=\u535a\u8328\u74e6\u7eb3\u666e\u62c9
+byb=\u767d\u4fc4\u7f57\u65af\u65b0\u5362\u5e03 (1994-1999)
+byr=\u767d\u4fc4\u7f57\u65af\u5362\u5e03
+bzd=\u4f2f\u5229\u5179\u5143
+cad=\u52a0\u62ff\u5927\u5143
+cdf=\u521a\u679c\u6cd5\u90ce
+chf=\u745e\u58eb\u6cd5\u90ce
+clf=\u667a\u5229 Unidades de Fomento\uff08\u8d44\u91d1\uff09
+clp=\u667a\u5229\u6bd4\u7d22
+cop=\u54e5\u4f26\u6bd4\u4e9a\u6bd4\u7d22
+crc=\u54e5\u65af\u8fbe\u9ece\u52a0\u79d1\u6717
+csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
+cuc=\u53e4\u5df4\u53ef\u5151\u6362\u6bd4\u7d22
+cup=\u53e4\u5df4\u6bd4\u7d22
+cve=\u4f5b\u5f97\u89d2\u57c3\u65af\u5e93\u591a
+cyp=\u585e\u6d66\u8def\u65af\u9551
+czk=\u6377\u514b\u514b\u90ce
+dem=\u5fb7\u56fd\u9a6c\u514b
+djf=\u5409\u5e03\u63d0\u6cd5\u90ce
+dkk=\u4e39\u9ea6\u514b\u6717
+dop=\u591a\u7c73\u5c3c\u52a0\u6bd4\u7d22
+dzd=\u963f\u5c14\u53ca\u5229\u4e9a\u7b2c\u7eb3\u5c14
+eek=\u7231\u6c99\u5c3c\u4e9a\u514b\u6717
+egp=\u57c3\u53ca\u9551
+ern=\u5384\u7acb\u7279\u91cc\u4e9a\u7eb3\u514b\u6cd5
+esp=\u897f\u73ed\u7259\u6bd4\u585e\u5854
+etb=\u57c3\u585e\u4fc4\u6bd4\u4e9a\u6bd4\u5c14
+eur=\u6b27\u5143
+fim=\u82ac\u5170\u9a6c\u514b
+fjd=\u6590\u6d4e\u5143
+fkp=\u798f\u514b\u5170\u9551
+frf=\u6cd5\u56fd\u6cd5\u90ce
+gbp=\u82f1\u9551
+gel=\u4e54\u6cbb\u4e9a\u62c9\u745e
+ghc=\u52a0\u7eb3\u585e\u7b2c
+ghs=\u52a0\u7eb3\u585e\u5730
+gip=\u76f4\u5e03\u7f57\u9640\u9551
+gmd=\u5188\u6bd4\u4e9a\u8fbe\u62c9\u897f
+gnf=\u51e0\u5185\u4e9a\u6cd5\u90ce
+grd=\u5e0c\u814a\u5fb7\u62c9\u514b\u9a6c
+gtq=\u5371\u5730\u9a6c\u62c9\u683c\u67e5\u5c14
+gwp=\u51e0\u5185\u4e9a\u6bd4\u7ecd\u6bd4\u7d22
+gyd=\u572d\u4e9a\u90a3\u5143
+hkd=\u6e2f\u5143
+hnl=\u6d2a\u90fd\u62c9\u65af\u62c9\u4f26\u76ae\u62c9
+hrk=\u514b\u7f57\u5730\u4e9a\u5e93\u7eb3
+htg=\u6d77\u5730\u53e4\u5fb7
+huf=\u5308\u7259\u5229\u798f\u6797
+idr=\u5370\u5ea6\u5c3c\u897f\u4e9a\u76fe
+iep=\u7231\u5c14\u5170\u9551
+ils=\u4ee5\u8272\u5217\u65b0\u8c22\u514b\u5c14
+inr=\u5370\u5ea6\u5362\u6bd4
+iqd=\u4f0a\u62c9\u514b\u7b2c\u7eb3\u5c14
+irr=\u4f0a\u6717\u91cc\u4e9a\u5c14
+isk=\u51b0\u5c9b\u514b\u6717
+itl=\u610f\u5927\u5229\u91cc\u62c9
+jmd=\u7259\u4e70\u52a0\u5143
+jod=\u7ea6\u65e6\u7b2c\u7eb3\u5c14
+jpy=\u65e5\u5143
+kes=\u80af\u5c3c\u4e9a\u5148\u4ee4
+kgs=\u5409\u5c14\u5409\u65af\u65af\u5766\u7d22\u59c6
+khr=\u67ec\u57d4\u5be8\u745e\u5c14
+kmf=\u79d1\u6469\u7f57\u6cd5\u90ce
+kpw=\u671d\u9c9c\u5706
+krw=\u97e9\u5706
+kwd=\u79d1\u5a01\u7279\u7b2c\u7eb3\u5c14
+kyd=\u5f00\u66fc\u5143
+kzt=\u54c8\u8428\u514b\u65af\u5766\u575a\u6208
+lak=\u8001\u631d\u57fa\u666e
+lbp=\u9ece\u5df4\u5ae9\u9551
+lkr=\u65af\u91cc\u5170\u5361\u5362\u6bd4
+lrd=\u5229\u6bd4\u4e9a\u5143
+lsl=\u83b1\u7d22\u6258\u6d1b\u8482
+ltl=\u7acb\u9676\u5b9b\u7acb\u7279
+luf=\u5362\u68ee\u5821\u6cd5\u90ce
+lvl=\u62c9\u8131\u7ef4\u4e9a\u62c9\u7279
+lyd=\u5229\u6bd4\u4e9a\u7b2c\u7eb3\u5c14
+mad=\u6469\u6d1b\u54e5\u8fea\u62c9\u59c6
+mdl=\u6469\u5c14\u591a\u74e6\u5217\u4f0a
+mga=\u9a6c\u8fbe\u52a0\u65af\u52a0\u963f\u91cc\u4e9a\u91cc
+mgf=\u9a6c\u8fbe\u52a0\u65af\u52a0\u6cd5\u90ce
+mkd=\u9a6c\u5176\u987f\u6234\u4ee3\u7eb3\u5c14
+mmk=\u7f05\u7538\u5f00\u4e9a\u7279
+mnt=\u8499\u53e4\u56fe\u683c\u91cc\u514b
+mop=\u6fb3\u95e8\u5143
+mro=\u6bdb\u91cc\u5854\u5c3c\u4e9a\u4e4c\u5409\u4e9a
+mtl=\u9a6c\u8033\u4ed6\u91cc\u62c9
+mur=\u6bdb\u91cc\u6c42\u65af\u5362\u6bd4
+mvr=\u9a6c\u5c14\u4ee3\u592b\u62c9\u83f2\u4e9a
+mwk=\u9a6c\u62c9\u7ef4\u514b\u74e6\u67e5
+mxn=\u58a8\u897f\u54e5\u6bd4\u7d22
+mxv=\u58a8\u897f\u54e5 Unidad de Inversion (UDI)\uff08\u8d44\u91d1\uff09
+myr=\u9a6c\u6765\u897f\u4e9a\u6797\u5409\u7279
+mzm=\u65e7\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
+mzn=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
+nad=\u7eb3\u7c73\u6bd4\u4e9a\u5143
+ngn=\u5c3c\u65e5\u5229\u4e9a\u5948\u62c9
+nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
+nlg=\u8377\u5170\u76fe
+nok=\u632a\u5a01\u514b\u6717
+npr=\u5c3c\u6cca\u5c14\u5362\u6bd4
+nzd=\u65b0\u897f\u5170\u5143
+omr=\u963f\u66fc\u91cc\u4e9a\u5c14
+pab=\u5df4\u62ff\u9a6c\u5df4\u6ce2\u4e9a
+pen=\u79d8\u9c81\u65b0\u7d22\u5c14
+pgk=\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u57fa\u90a3
+php=\u83f2\u5f8b\u5bbe\u6bd4\u7d22
+pkr=\u5df4\u57fa\u65af\u5766\u5362\u6bd4
+pln=\u6ce2\u5170\u5179\u7f57\u63d0
+pte=\u8461\u8404\u7259\u57c3\u65af\u5e93\u591a
+pyg=\u5df4\u62c9\u572d\u74dc\u62c9\u5c3c
+qar=\u5361\u5854\u5c14\u91cc\u4e9a\u5c14
+rol=\u65e7\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
+ron=\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
+rsd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
+rub=\u4fc4\u56fd\u5362\u5e03
+rur=\u4fc4\u56fd\u5362\u5e03 (1991-1998)
+rwf=\u5362\u65fa\u8fbe\u6cd5\u90ce
+sar=\u6c99\u7279\u91cc\u4e9a\u5c14
+sbd=\u6240\u7f57\u95e8\u7fa4\u5c9b\u5143
+scr=\u585e\u820c\u5c14\u5362\u6bd4
+sdd=\u82cf\u4e39\u7b2c\u7eb3\u5c14
+sdg=\u82cf\u4e39\u9551
+sek=\u745e\u5178\u514b\u6717
+sgd=\u65b0\u52a0\u5761\u5143
+shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
+sit=\u65af\u6d1b\u6587\u5c3c\u4e9a\u6258\u62c9\u5c14
+skk=\u65af\u6d1b\u4f10\u514b\u514b\u6717
+sll=\u585e\u62c9\u5229\u6602\u5229\u6602
+sos=\u7d22\u9a6c\u91cc\u5148\u4ee4
+srd=\u82cf\u91cc\u5357\u5143
+srg=\u82cf\u91cc\u5357\u76fe
+std=\u5723\u591a\u7f8e\u548c\u666e\u6797\u897f\u6bd4\u591a\u5e03\u62c9
+svc=\u8428\u5c14\u74e6\u591a\u79d1\u6717
+syp=\u53d9\u5229\u4e9a\u9551
+szl=\u65af\u5a01\u58eb\u5170\u91cc\u5170\u5409\u5c3c
+thb=\u6cf0\u94e2
+tjs=\u5854\u5409\u514b\u65af\u5766\u7d22\u83ab\u5c3c
+tmm=\u571f\u5e93\u66fc\u65af\u5766\u9a6c\u7eb3\u7279
+tmt=\u571f\u5e93\u66fc\u65af\u5766\u65b0\u9a6c\u7eb3\u7279
+tnd=\u7a81\u5c3c\u65af\u7b2c\u7eb3\u5c14
+top=\u6c64\u52a0\u6f58\u52a0
+tpe=\u5e1d\u6c76\u57c3\u65af\u5e93\u591a
+trl=\u571f\u8033\u5176\u91cc\u62c9
+try=\u65b0\u571f\u8033\u5176\u91cc\u62c9
+ttd=\u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5\u5143
+twd=\u65b0\u53f0\u5e01
+tzs=\u5766\u6851\u5c3c\u4e9a\u5148\u4ee4
+uah=\u4e4c\u514b\u5170\u683c\u91cc\u592b\u5c3c\u4e9a
+ugx=\u4e4c\u5e72\u8fbe\u5148\u4ee4
+usd=\u7f8e\u5143
+usn=\u7f8e\u5143\uff08\u6b21\u65e5\uff09
+uss=\u7f8e\u5143\uff08\u5f53\u65e5\uff09
+uyu=\u4e4c\u62c9\u572d\u6bd4\u7d22
+uzs=\u4e4c\u5179\u522b\u514b\u65af\u82cf\u59c6
+veb=\u59d4\u5185\u745e\u62c9\u535a\u5229\u74e6
+vef=\u59d4\u5185\u745e\u62c9\u5f3a\u52bf\u73bb\u5229\u74e6
+vnd=\u8d8a\u5357\u76fe
+vuv=\u74e6\u52aa\u963f\u56fe\u74e6\u56fe
+wst=\u897f\u8428\u6469\u4e9a\u5854\u62c9
+xaf=\u4e2d\u975e\u91d1\u878d\u5408\u4f5c\u6cd5\u90ce
+xag=\u94f6
+xau=\u9ec4\u91d1
+xba=\u6b27\u6d32\u590d\u5408\u5355\u4f4d
+xbb=\u6b27\u6d32\u8d27\u5e01\u8054\u76df
+xbc=\u6b27\u6d32\u8ba1\u7b97\u5355\u4f4d (XBC)
+xbd=\u6b27\u6d32\u8ba1\u7b97\u5355\u4f4d (XBD)
+xcd=\u4e1c\u52a0\u52d2\u6bd4\u5143
+xdr=\u7279\u522b\u63d0\u6b3e\u6743
+xfo=\u6cd5\u56fd\u91d1\u6cd5\u90ce
+xfu=\u6cd5\u56fd UIC \u6cd5\u90ce
+xof=\u975e\u6d32\u91d1\u878d\u5171\u540c\u4f53\u6cd5\u90ce
+xpd=\u94af
+xpf=\u592a\u5e73\u6d0b\u6cd5\u90ce
+xpt=\u94c2
+xts=\u4e3a\u6d4b\u8bd5\u4fdd\u7559\u7684\u4ee3\u7801
+xxx=\u8d27\u5e01\u672a\u77e5\u6216\u65e0\u6548
+yer=\u4e5f\u95e8\u91cc\u4e9a\u5c14
+yum=\u5357\u65af\u62c9\u592b\u504c\u5a01\u7b2c\u7eb3\u5c14
+zar=\u5357\u975e\u5170\u7279
+zmk=\u8d5e\u6bd4\u4e9a\u514b\u74e6\u67e5
+zwd=\u6d25\u5df4\u5e03\u97e6\u5143
+zwl=\u6d25\u5df4\u5e03\u97e6\u5143 (2009)
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
index 4def676fd9d..94195cbedfa 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
index 6499da87c9c..eb8dd2cfc0a 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
index f2e3599d13c..0123ebc1439 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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
-- 
GitLab


From f01cce235b62e378e91a3bae32942e2f3dfc5c7e Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Tue, 29 Mar 2022 00:01:57 +0000
Subject: [PATCH 241/345] 8264160: Regex \b is not consistent with \w without
 UNICODE_CHARACTER_CLASS

Reviewed-by: lancea, bpb, naoto
---
 .../classes/java/util/regex/Pattern.java      | 19 ++--
 test/jdk/java/util/regex/RegExTest.java       | 90 ++++++++++++++++---
 2 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 5bb6ec76a7c..a06afacc6d2 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -158,7 +158,8 @@ import jdk.internal.util.ArraysSupport;
  * <tr><th style="vertical-align:top; font-weight:normal" id="any">{@code .}</th>
  *     <td headers="matches predef any">Any character (may or may not match <a href="#lt">line terminators</a>)</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="digit">{@code \d}</th>
- *     <td headers="matches predef digit">A digit: {@code [0-9]}</td></tr>
+ *     <td headers="matches predef digit">A digit: {@code [0-9]} if <a href="#UNICODE_CHARACTER_CLASS">
+ *  *         UNICODE_CHARACTER_CLASS</a> is not set. See <a href="#unicodesupport">Unicode Support</a>.</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="non_digit">{@code \D}</th>
  *     <td headers="matches predef non_digit">A non-digit: {@code [^0-9]}</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="horiz_white">{@code \h}</th>
@@ -167,7 +168,9 @@ import jdk.internal.util.ArraysSupport;
  * <tr><th style="vertical-align:top; font-weight:normal" id="non_horiz_white">{@code \H}</th>
  *     <td headers="matches predef non_horiz_white">A non-horizontal whitespace character: {@code [^\h]}</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="white">{@code \s}</th>
- *     <td headers="matches predef white">A whitespace character: {@code [ \t\n\x0B\f\r]}</td></tr>
+ *     <td headers="matches predef white">A whitespace character: {@code [ \t\n\x0B\f\r]} if
+ *     <a href="#UNICODE_CHARACTER_CLASS"> UNICODE_CHARACTER_CLASS</a> is not set. See
+ *     <a href="#unicodesupport">Unicode Support</a>.</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="non_white">{@code \S}</th>
  *     <td headers="matches predef non_white">A non-whitespace character: {@code [^\s]}</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="vert_white">{@code \v}</th>
@@ -176,7 +179,8 @@ import jdk.internal.util.ArraysSupport;
  * <tr><th style="vertical-align:top; font-weight:normal" id="non_vert_white">{@code \V}</th>
  *     <td headers="matches predef non_vert_white">A non-vertical whitespace character: {@code [^\v]}</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="word">{@code \w}</th>
- *     <td headers="matches predef word">A word character: {@code [a-zA-Z_0-9]}</td></tr>
+ *     <td headers="matches predef word">A word character: {@code [a-zA-Z_0-9]} if <a href="#UNICODE_CHARACTER_CLASS">
+ *         UNICODE_CHARACTER_CLASS</a> is not set. See <a href="#unicodesupport">Unicode Support</a>. </td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="non_word">{@code \W}</th>
  *     <td headers="matches predef non_word">A non-word character: {@code [^\w]}</td></tr>
  *
@@ -246,11 +250,12 @@ import jdk.internal.util.ArraysSupport;
  * <tr><th style="vertical-align:top; font-weight:normal" id="end_line">{@code $}</th>
  *     <td headers="matches bounds end_line">The end of a line</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="word_boundary">{@code \b}</th>
- *     <td headers="matches bounds word_boundary">A word boundary</td></tr>
+ *     <td headers="matches bounds word_boundary">A word boundary: {@code (?:(?<=\w)(?=\W)|(?<=\W)(?=\w))} (the location
+ *     where a non-word character abuts a word character)</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="grapheme_cluster_boundary">{@code \b{g}}</th>
  *     <td headers="matches bounds grapheme_cluster_boundary">A Unicode extended grapheme cluster boundary</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="non_word_boundary">{@code \B}</th>
- *     <td headers="matches bounds non_word_boundary">A non-word boundary</td></tr>
+ *     <td headers="matches bounds non_word_boundary">A non-word boundary: {@code [^\b]}</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="begin_input">{@code \A}</th>
  *     <td headers="matches bounds begin_input">The beginning of the input</td></tr>
  * <tr><th style="vertical-align:top; font-weight:normal" id="end_prev_match">{@code \G}</th>
@@ -535,7 +540,7 @@ import jdk.internal.util.ArraysSupport;
  * that do not capture text and do not count towards the group total, or
  * <i>named-capturing</i> group.
  *
- * <h2> Unicode support </h2>
+ * <h2 id="unicodesupport"> Unicode support </h2>
  *
  * <p> This class is in conformance with Level 1 of <a
  * href="http://www.unicode.org/reports/tr18/"><i>Unicode Technical
@@ -5377,7 +5382,7 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
 
         boolean isWord(int ch) {
             return useUWORD ? CharPredicates.WORD().is(ch)
-                            : (ch == '_' || Character.isLetterOrDigit(ch));
+                            : CharPredicates.ASCII_WORD().is(ch);
         }
 
         int check(Matcher matcher, int i, CharSequence seq) {
diff --git a/test/jdk/java/util/regex/RegExTest.java b/test/jdk/java/util/regex/RegExTest.java
index 39c454ce4f4..41db0915d17 100644
--- a/test/jdk/java/util/regex/RegExTest.java
+++ b/test/jdk/java/util/regex/RegExTest.java
@@ -36,7 +36,7 @@
  * 6345469 6988218 6693451 7006761 8140212 8143282 8158482 8176029 8184706
  * 8194667 8197462 8184692 8221431 8224789 8228352 8230829 8236034 8235812
  * 8216332 8214245 8237599 8241055 8247546 8258259 8037397 8269753 8276694
- *
+ * 8280403 8264160 8281315
  * @library /test/lib
  * @library /lib/testlibrary/java/lang
  * @build jdk.test.lib.RandomFactory
@@ -51,14 +51,9 @@ import java.nio.CharBuffer;
 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.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Scanner;
+import java.util.*;
 import java.util.function.Function;
+import java.util.function.IntFunction;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.MatchResult;
@@ -3854,11 +3849,11 @@ public class RegExTest {
         }
 
         // bounds/word align
-        twoFindIndexes(" \u0180sherman\u0400 ", bound, 1, 10);
+        twoFindIndexes(" \u0180sherman\u0400 ", boundU, 1, 10);
         assertTrue(bwbU.reset("\u0180sherman\u0400").matches());
-        twoFindIndexes(" \u0180sh\u0345erman\u0400 ", bound, 1, 11);
+        twoFindIndexes(" \u0180sh\u0345erman\u0400 ", boundU, 1, 11);
         assertTrue(bwbU.reset("\u0180sh\u0345erman\u0400").matches());
-        twoFindIndexes(" \u0724\u0739\u0724 ", bound, 1, 4);
+        twoFindIndexes(" \u0724\u0739\u0724 ", boundU, 1, 4);
         assertTrue(bwbU.reset("\u0724\u0739\u0724").matches());
         assertTrue(bwbEU.reset("\u0724\u0739\u0724").matches());
     }
@@ -4503,6 +4498,8 @@ public class RegExTest {
     }
 
     //This test is for 8037397
+    //Ensure we don't drop nested interior character classes to the right of an
+    //intersection operator.
     @Test
     public static void droppedClassesWithIntersection() {
         String rx = "[A-Z&&[A-Z]0-9]";
@@ -4530,6 +4527,9 @@ public class RegExTest {
     }
 
     //This test is for 8269753
+    //This is for ensuring that the caret doesn't point at the wrong character
+    //in a syntax exception message because we previously didn't compensate for
+    //tabs when rendering the offending string that contained tab characters.
     @Test
     public static void errorMessageCaretIndentation() {
         String pattern = "\t**";
@@ -4540,6 +4540,8 @@ public class RegExTest {
     }
 
     //This test is for 8276694
+    //Ensure our error message indicates we have an unescaped backslash when we
+    //encounter one.
     @Test
     public static void unescapedBackslash() {
         String pattern = "\\";
@@ -4549,6 +4551,7 @@ public class RegExTest {
     }
 
     //This test is for 8280403
+    //Given bad intersection syntax, we should throw a PatternSyntaxException.
     @Test
     public static void badIntersectionSyntax() {
         String pattern = "[˜\\H +F&&]";
@@ -4557,7 +4560,70 @@ public class RegExTest {
         assertTrue(e.getMessage().contains("Bad intersection syntax"));
     }
 
+    //This test is for 8264160
+    //Here we check for inconsistencies between the behavior of \w and the
+    //behavior of \b. Prior to this fix, the two flags did not behave in a
+    //consistent way ie \b would recognize non-\w characters as part of a word
+    //in some cases. This test verifies that the two behave consistently
+    //for all codepoints we support.
+    @Test
+    public static void wordBoundaryInconsistencies() {
+        Pattern basicWordCharPattern = Pattern.compile("\\w");
+        Pattern basicWordCharBoundaryPattern =
+                Pattern.compile(";\\b.", Pattern.DOTALL);
+
+        Pattern unicodeWordCharPattern =
+                Pattern.compile("\\w", Pattern.UNICODE_CHARACTER_CLASS);
+
+        Pattern unicodeWordCharBoundaryPattern =
+                Pattern.compile(";\\b.",
+                        Pattern.DOTALL | Pattern.UNICODE_CHARACTER_CLASS);
+
+        IntFunction<Boolean> basicWordCharCheck =
+                (cp) -> cpMatches(basicWordCharPattern, cp, false);
+
+        IntFunction<Boolean> basicBoundaryCharCheck =
+                (cp) -> cpMatches(basicWordCharBoundaryPattern,
+                                  cp, true);
+
+        IntFunction<Boolean> unicodeWordCharCheck =
+                (cp) -> cpMatches(unicodeWordCharPattern, cp, false);
+
+        IntFunction<Boolean> unicodeBoundaryCharCheck =
+                (cp) -> cpMatches(unicodeWordCharBoundaryPattern,
+                                  cp,true);
+
+        //basic pattern comparison
+        for(int cp = 0; cp <= Character.MAX_CODE_POINT; cp++){
+            assertEquals(basicWordCharCheck.apply(cp),
+                    basicBoundaryCharCheck.apply(cp),
+                    "Codepoint: " + cp);
+            assertEquals(unicodeWordCharCheck.apply(cp),
+                    unicodeBoundaryCharCheck.apply(cp),
+                    "Codepoint: " + cp);
+        }
+    }
+
+    private static boolean cpMatches(Pattern p, int cp, boolean boundary) {
+        String cpString;
+        if (Character.isBmpCodePoint(cp)) {
+            cpString = "" + ((char) cp);
+        } else {
+            cpString = "" + Character.highSurrogate(cp) +
+                    Character.lowSurrogate(cp);
+        }
+
+        if (boundary) {
+            return p.matcher(";" + cpString).matches();
+        } else {
+            return p.matcher(cpString).matches();
+        }
+    }
+
     //This test is for 8281560
+    //Checks that when the Canonical Equivalence flag is set, the behavior for
+    //Matcher::hitEnd is equivalent for these similar, patterns that saw
+    //inconsistencies.
     @Test
     public static void prematureHitEndInNFCCharProperty() {
         var testInput = "a1a1";
@@ -4582,6 +4648,8 @@ public class RegExTest {
     }
 
     //This test is for 8281315
+    //Checks that we are able to correctly match this case with a backref
+    //without encountering an IndexOutOfBoundsException.
     @Test
     public static void iOOBForCIBackrefs(){
         String line = "\ud83d\udc95\ud83d\udc95\ud83d\udc95";
-- 
GitLab


From 2e9fd56524f739dc4023b81061cb2587d6325fac Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Tue, 29 Mar 2022 07:09:27 +0000
Subject: [PATCH 242/345] 8283670: gtest os.release_multi_mappings_vm is still
 racy

Reviewed-by: mdoerr, dholmes
---
 test/hotspot/gtest/runtime/test_os.cpp | 58 +++++++++++++++-----------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 270710e94c0..bf642c04595 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -373,6 +373,15 @@ static inline bool can_reserve_executable_memory(void) {
 #define PRINT_MAPPINGS(s) { tty->print_cr("%s", s); os::print_memory_mappings((char*)p, total_range_len, tty); }
 //#define PRINT_MAPPINGS
 
+// Release a range allocated with reserve_multiple carefully, to not trip mapping
+// asserts on Windows in os::release_memory()
+static void carefully_release_multiple(address start, int num_stripes, size_t stripe_len) {
+  for (int stripe = 0; stripe < num_stripes; stripe++) {
+    address q = start + (stripe * stripe_len);
+    EXPECT_TRUE(os::release_memory((char*)q, stripe_len));
+  }
+}
+
 #ifndef _AIX // JDK-8257041
 // Reserve an area consisting of multiple mappings
 //  (from multiple calls to os::reserve_memory)
@@ -385,25 +394,34 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
   const bool exec_supported = can_reserve_executable_memory();
 #endif
 
-  size_t total_range_len = num_stripes * stripe_len;
-  // Reserve a large contiguous area to get the address space...
-  address p = (address)os::reserve_memory(total_range_len);
-  EXPECT_NE(p, (address)NULL);
-  // .. release it...
-  EXPECT_TRUE(os::release_memory((char*)p, total_range_len));
-  // ... re-reserve in the same spot multiple areas...
-  for (int stripe = 0; stripe < num_stripes; stripe++) {
-    address q = p + (stripe * stripe_len);
-    // Commit, alternatingly with or without exec permission,
-    //  to prevent kernel from folding these mappings.
+  address p = NULL;
+  for (int tries = 0; tries < 256 && p == NULL; tries ++) {
+    size_t total_range_len = num_stripes * stripe_len;
+    // Reserve a large contiguous area to get the address space...
+    p = (address)os::reserve_memory(total_range_len);
+    EXPECT_NE(p, (address)NULL);
+    // .. release it...
+    EXPECT_TRUE(os::release_memory((char*)p, total_range_len));
+    // ... re-reserve in the same spot multiple areas...
+    for (int stripe = 0; stripe < num_stripes; stripe++) {
+      address q = p + (stripe * stripe_len);
+      // Commit, alternatingly with or without exec permission,
+      //  to prevent kernel from folding these mappings.
 #ifdef __APPLE__
-    const bool executable = exec_supported ? (stripe % 2 == 0) : false;
+      const bool executable = exec_supported ? (stripe % 2 == 0) : false;
 #else
-    const bool executable = stripe % 2 == 0;
+      const bool executable = stripe % 2 == 0;
 #endif
-    q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, executable);
-    EXPECT_NE(q, (address)NULL);
-    EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, executable));
+      q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, executable);
+      if (q == NULL) {
+        // Someone grabbed that area concurrently. Cleanup, then retry.
+        tty->print_cr("reserve_multiple: retry (%d)...", stripe);
+        carefully_release_multiple(p, stripe, stripe_len);
+        p = NULL;
+      } else {
+        EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, executable));
+      }
+    }
   }
   return p;
 }
@@ -426,14 +444,6 @@ static address reserve_one_commit_multiple(int num_stripes, size_t stripe_len) {
 }
 
 #ifdef _WIN32
-// Release a range allocated with reserve_multiple carefully, to not trip mapping
-// asserts on Windows in os::release_memory()
-static void carefully_release_multiple(address start, int num_stripes, size_t stripe_len) {
-  for (int stripe = 0; stripe < num_stripes; stripe++) {
-    address q = start + (stripe * stripe_len);
-    EXPECT_TRUE(os::release_memory((char*)q, stripe_len));
-  }
-}
 struct NUMASwitcher {
   const bool _b;
   NUMASwitcher(bool v): _b(UseNUMAInterleaving) { UseNUMAInterleaving = v; }
-- 
GitLab


From 236722883511ee6111ab1de80ebc3fbec350c61d Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Tue, 29 Mar 2022 07:21:23 +0000
Subject: [PATCH 243/345] 8283834: Unmappable character for US-ASCII encoding
 in TestPredicateInputBelowLoopPredicate

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

diff --git a/test/hotspot/jtreg/compiler/loopopts/TestPredicateInputBelowLoopPredicate.java b/test/hotspot/jtreg/compiler/loopopts/TestPredicateInputBelowLoopPredicate.java
index 8ffa476ff26..3b0cc314074 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestPredicateInputBelowLoopPredicate.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestPredicateInputBelowLoopPredicate.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * bug 8280799
- * @summary С2: assert(false) failed: cyclic dependency prevents range check elimination
+ * @summary C2: assert(false) failed: cyclic dependency prevents range check elimination
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseCountedLoopSafepoints TestPredicateInputBelowLoopPredicate
  */
 
-- 
GitLab


From 043b0a7ffe0ae965a9b9a798f4030a494b79a961 Mon Sep 17 00:00:00 2001
From: Alexey Ushakov <avu@openjdk.org>
Date: Tue, 29 Mar 2022 07:57:35 +0000
Subject: [PATCH 244/345] 8273355: Flickering on tooltip appearance IntelliJ
 IDEA 2021.2.1

Reviewed-by: serb, aghaisas
---
 .../macosx/classes/sun/lwawt/LWWindowPeer.java      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
index 1796f5f3005..7f1528e84fd 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,7 @@ import java.awt.peer.KeyboardFocusManagerPeer;
 import java.awt.peer.WindowPeer;
 import java.util.List;
 
+import java.util.Objects;
 import javax.swing.JComponent;
 
 import sun.awt.AWTAccessor;
@@ -281,6 +282,16 @@ public class LWWindowPeer
         super.disposeImpl();
     }
 
+    @Override
+    public void setBackground(final Color c) {
+        Color oldBg = getBackground();
+        if (Objects.equals(oldBg, c)) {
+            return;
+        }
+        super.setBackground(c);
+        updateOpaque();
+    }
+
     @Override
     protected void setVisibleImpl(final boolean visible) {
         if (!visible && warningWindow != null) {
-- 
GitLab


From 0e788e0ecbf44f1feee817fe22123a8523da5ee3 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Tue, 29 Mar 2022 09:33:07 +0000
Subject: [PATCH 245/345] 8283781: Avoid allocating unused lastRulesCaches

Reviewed-by: rriggs, naoto
---
 .../classes/java/time/zone/ZoneRules.java     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/java/time/zone/ZoneRules.java b/src/java.base/share/classes/java/time/zone/ZoneRules.java
index 1e1e95abba8..8f0792c4659 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneRules.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneRules.java
@@ -146,8 +146,7 @@ public final class ZoneRules implements Serializable {
     /**
      * The map of recent transitions.
      */
-    private final transient ConcurrentMap<Integer, ZoneOffsetTransition[]> lastRulesCache =
-                new ConcurrentHashMap<Integer, ZoneOffsetTransition[]>();
+    private final transient ConcurrentMap<Integer, ZoneOffsetTransition[]> lastRulesCache;
     /**
      * The zero-length long array.
      */
@@ -259,12 +258,18 @@ public final class ZoneRules implements Serializable {
         }
 
         // last rules
-        Object[] temp = lastRules.toArray();
-        ZoneOffsetTransitionRule[] rulesArray = Arrays.copyOf(temp, temp.length, ZoneOffsetTransitionRule[].class);
-        if (rulesArray.length > 16) {
-            throw new IllegalArgumentException("Too many transition rules");
+        if (lastRules.size() > 0) {
+            Object[] temp = lastRules.toArray();
+            ZoneOffsetTransitionRule[] rulesArray = Arrays.copyOf(temp, temp.length, ZoneOffsetTransitionRule[].class);
+            if (rulesArray.length > 16) {
+                throw new IllegalArgumentException("Too many transition rules");
+            }
+            this.lastRules = rulesArray;
+            this.lastRulesCache = new ConcurrentHashMap<>();
+        } else {
+            this.lastRules = EMPTY_LASTRULES;
+            this.lastRulesCache = null;
         }
-        this.lastRules = rulesArray;
     }
 
     /**
@@ -288,6 +293,7 @@ public final class ZoneRules implements Serializable {
         this.savingsInstantTransitions = savingsInstantTransitions;
         this.wallOffsets = wallOffsets;
         this.lastRules = lastRules;
+        this.lastRulesCache = (lastRules.length > 0) ? new ConcurrentHashMap<>() : null;
 
         if (savingsInstantTransitions.length == 0) {
             this.savingsLocalTransitions = EMPTY_LDT_ARRAY;
@@ -324,6 +330,7 @@ public final class ZoneRules implements Serializable {
         this.savingsLocalTransitions = EMPTY_LDT_ARRAY;
         this.wallOffsets = standardOffsets;
         this.lastRules = EMPTY_LASTRULES;
+        this.lastRulesCache = null;
     }
 
     /**
-- 
GitLab


From cc598e03de39dd6e8d7e208a69d85b6a9cd0062f Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Tue, 29 Mar 2022 09:38:58 +0000
Subject: [PATCH 246/345] 8283774: TestZoneOffset::test_immutable should ignore
 ZoneOffset::rules

Reviewed-by: rriggs, naoto
---
 test/jdk/ProblemList.txt                              | 5 +----
 test/jdk/java/time/test/java/time/AbstractTest.java   | 9 +++++++--
 test/jdk/java/time/test/java/time/TestZoneOffset.java | 5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 0626a952784..8fb2ed067a1 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -742,7 +742,7 @@ java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java  8277816 macosx-aarch64
 java/awt/Robot/CheckCommonColors/CheckCommonColors.java 8277816 macosx-aarch64
 java/awt/ColorClass/AlphaColorTest.java 8277816 macosx-aarch64
 java/awt/AlphaComposite/WindowAlphaCompositeTest.java 8277816 macosx-aarch64
-	
+
 # macos12 failure
 javax/swing/JMenu/4515762/bug4515762.java 8276074 macosx-all
 
@@ -759,9 +759,6 @@ javax/swing/JTree/4908142/bug4908142.java 8278348 macosx-all
 
 # jdk_time
 
-java/time/test/java/time/TestZoneOffset.java                    8283716 generic-all
-
-
 ############################################################################
 
 # core_tools
diff --git a/test/jdk/java/time/test/java/time/AbstractTest.java b/test/jdk/java/time/test/java/time/AbstractTest.java
index 97f1cf4b486..6e4734b8e4c 100644
--- a/test/jdk/java/time/test/java/time/AbstractTest.java
+++ b/test/jdk/java/time/test/java/time/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,7 @@ import static org.testng.Assert.assertTrue;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.Set;
 
 /**
  * Base test class.
@@ -83,11 +84,15 @@ public abstract class AbstractTest {
     }
 
     protected static void assertImmutable(Class<?> cls) {
+        assertImmutable(cls, Set.of());
+    }
+
+    protected static void assertImmutable(Class<?> cls, Set<String> ignoreFields) {
         assertTrue(Modifier.isPublic(cls.getModifiers()));
         assertTrue(Modifier.isFinal(cls.getModifiers()));
         Field[] fields = cls.getDeclaredFields();
         for (Field field : fields) {
-            if (field.getName().contains("$") == false) {
+            if (!field.getName().contains("$") && !ignoreFields.contains(field.getName())) {
                 if (Modifier.isStatic(field.getModifiers())) {
                     assertTrue(Modifier.isFinal(field.getModifiers()), "Field:" + field.getName());
                 } else {
diff --git a/test/jdk/java/time/test/java/time/TestZoneOffset.java b/test/jdk/java/time/test/java/time/TestZoneOffset.java
index b6df12f1abf..a69eedfcd6c 100644
--- a/test/jdk/java/time/test/java/time/TestZoneOffset.java
+++ b/test/jdk/java/time/test/java/time/TestZoneOffset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@ package test.java.time;
 
 import static org.testng.Assert.assertSame;
 
+import java.util.Set;
 import java.time.ZoneOffset;
 
 import org.testng.annotations.Test;
@@ -73,7 +74,7 @@ public class TestZoneOffset extends AbstractTest {
 
     @Test
     public void test_immutable() {
-        assertImmutable(ZoneOffset.class);
+        assertImmutable(ZoneOffset.class, /* ignore field */ Set.of("rules"));
     }
 
     @Test
-- 
GitLab


From c3d903a55a9f606db8604d5a8c091b0fc3c6a988 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Tue, 29 Mar 2022 11:13:26 +0000
Subject: [PATCH 247/345] 8282936: Write a regression test for JDK-4615365

Reviewed-by: serb
---
 .../JSplitPaneDividerLocationTest.java        | 200 ++++++++++++++++++
 1 file changed, 200 insertions(+)
 create mode 100644 test/jdk/javax/swing/JSplitPane/4615365/JSplitPaneDividerLocationTest.java

diff --git a/test/jdk/javax/swing/JSplitPane/4615365/JSplitPaneDividerLocationTest.java b/test/jdk/javax/swing/JSplitPane/4615365/JSplitPaneDividerLocationTest.java
new file mode 100644
index 00000000000..108dae995bd
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/4615365/JSplitPaneDividerLocationTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import javax.swing.AbstractButton;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.JToggleButton;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+/*
+ * @test
+ * @key headful
+ * @bug 4615365
+ * @summary This test confirms that the JSplitPane's current and last
+ *          divider positions are correct when realized.
+ * @run main JSplitPaneDividerLocationTest
+ */
+public class JSplitPaneDividerLocationTest {
+
+    private static JFrame frame;
+    private static JPanel panel;
+    private static JButton leftButton;
+    private static JToggleButton triggerButton;
+    private static volatile int currentLoc;
+    private static volatile int lastLoc;
+    private static volatile int lastLocExpected;
+    private static Robot robot;
+
+    public static void main(String[] s) throws Exception {
+        robot = new Robot();
+        robot.setAutoWaitForIdle(true);
+        robot.setAutoDelay(200);
+        List<String> lafs = Arrays.stream(getInstalledLookAndFeels())
+                                  .map(LookAndFeelInfo::getClassName)
+                                  .collect(Collectors.toList());
+        for (final String laf : lafs) {
+            try {
+                AtomicBoolean lafSetSuccess = new AtomicBoolean(false);
+                SwingUtilities.invokeAndWait(() -> {
+                    lafSetSuccess.set(setLookAndFeel(laf));
+                    if (lafSetSuccess.get()) {
+                        createUI();
+                    }
+                });
+                if (!lafSetSuccess.get()) {
+                    continue;
+                }
+                robot.waitForIdle();
+
+                pressButton(triggerButton);
+
+                // Verifies that JSplitPane current and last divider
+                // positions are correct and not as per JDK-4615365.
+                if ((currentLoc == -1) || (lastLoc == 0)) {
+                    throw new RuntimeException(
+                            "Test failed for " + laf + " :- last divider loc:" +
+                            "actual = " + lastLoc + ",expected = -1, current " +
+                            "divider loc:actual=" + currentLoc + ",expected>0");
+                }
+                lastLocExpected = currentLoc;
+
+                // Slide the split pane divider slightly to the right side.
+                final Point leftButtonLoc = getButtonLoc(leftButton);
+                robot.mouseMove(leftButtonLoc.x + leftButton.getWidth() + 5,
+                                leftButtonLoc.y + 35);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseMove(leftButtonLoc.x + leftButton.getWidth() + 8,
+                                leftButtonLoc.y + 35);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+                pressButton(triggerButton);
+
+                // Verifies that JSplitPane current and last divider positions
+                // reflects the correct positions after a right slide.
+                if ((lastLoc == lastLocExpected) && (currentLoc > lastLoc)) {
+                    System.out.println("Test Passed.");
+                } else {
+                    throw new RuntimeException(
+                            "Test failed for " + laf + ", because after a " +
+                            "right " + "slide" + ", last divider " +
+                            "location: " + "actual = " + lastLoc +
+                            ", expected = " + lastLocExpected +
+                            ", current divider " + "location: actual = " +
+                            currentLoc + ", expected > " + lastLoc);
+                }
+            } finally {
+                SwingUtilities.invokeAndWait(
+                        JSplitPaneDividerLocationTest::disposeFrame);
+            }
+        }
+    }
+
+    private static void pressButton(JToggleButton button) throws Exception {
+        final Point buttonLoc = getButtonLoc(button);
+        robot.mouseMove(buttonLoc.x + 8, buttonLoc.y + 8);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+    }
+
+    private static Point getButtonLoc(AbstractButton button)
+            throws InterruptedException, InvocationTargetException {
+        final AtomicReference<Point> loc = new AtomicReference<>();
+        SwingUtilities.invokeAndWait(() -> {
+            loc.set(button.getLocationOnScreen());
+        });
+        final Point buttonLoc = loc.get();
+        return buttonLoc;
+    }
+
+    private static void createUI() {
+        frame = new JFrame();
+        panel = new JPanel();
+        panel.setLayout(new BorderLayout());
+        leftButton = new JButton("Left Button");
+        JButton rightButton = new JButton("Right Button");
+
+        final JSplitPane splitPane =
+                new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, leftButton,
+                               rightButton);
+        panel.add(splitPane, BorderLayout.CENTER);
+
+        splitPane.setDividerSize(10);
+
+        triggerButton = new JToggleButton("Trigger");
+        triggerButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent event) {
+                currentLoc = splitPane.getDividerLocation();
+                lastLoc = splitPane.getLastDividerLocation();
+                System.out.println(
+                        "currentLoc = " + currentLoc + ", lastLoc = " +
+                        lastLoc);
+            }
+        });
+        panel.add(triggerButton, BorderLayout.SOUTH);
+
+        frame.setContentPane(panel);
+        frame.setSize(300, 300);
+        frame.setLocationRelativeTo(null);
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        frame.setVisible(true);
+    }
+
+    private static boolean setLookAndFeel(String lafName) {
+        try {
+            UIManager.setLookAndFeel(lafName);
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Ignoring Unsupported L&F: " + lafName);
+            return false;
+        } catch (ClassNotFoundException | InstantiationException
+                | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+    private static void disposeFrame() {
+        if (frame != null) {
+            frame.dispose();
+            frame = null;
+        }
+    }
+
+}
-- 
GitLab


From ab17f88f6ccd793b718394987f868322a2cc0d1f Mon Sep 17 00:00:00 2001
From: Evgeny Astigeevich <eastig@amazon.com>
Date: Tue, 29 Mar 2022 13:48:18 +0000
Subject: [PATCH 248/345] 8283626: AArch64: Set relocInfo::offset_unit to 4

Reviewed-by: simonis, aph
---
 src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
index 7708b4423e0..904fe081427 100644
--- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
@@ -29,8 +29,9 @@
   // machine-dependent parts of class relocInfo
  private:
   enum {
-    // Relocations are byte-aligned.
-    offset_unit        =  1,
+    // AArch64 instructions are always 4 bytes long and 4-aligned, so
+    // the two lowest offset bits can always be discarded.
+    offset_unit        =  4,
     // Must be at least 1 for RelocInfo::narrow_oop_in_const.
     format_width       =  1
   };
-- 
GitLab


From fe670ff403b259f94bb50e1aa1e0155b71fc6642 Mon Sep 17 00:00:00 2001
From: Nils Eliasson <neliasso@openjdk.org>
Date: Tue, 29 Mar 2022 15:32:52 +0000
Subject: [PATCH 249/345] 8283692: Add PrintIdealPhase that includes block
 scheduling

Reviewed-by: kvn, chagedorn
---
 src/hotspot/share/opto/compile.cpp   | 12 ++++++++++--
 src/hotspot/share/opto/output.cpp    | 29 ++++++++++++++++++----------
 src/hotspot/share/opto/output.hpp    |  1 +
 src/hotspot/share/opto/phasetype.hpp |  1 +
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index c80eabca43b..c9567a6be77 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -548,7 +548,13 @@ void Compile::print_ideal_ir(const char* phase_name) {
                is_osr_compilation() ? " compile_kind='osr'" : "",
                phase_name);
   }
-  root()->dump(9999);
+  if (_output == nullptr) {
+    root()->dump(9999);
+  } else {
+    // Dump the node blockwise if we have a scheduling
+    _output->print_scheduling();
+  }
+
   if (xtty != NULL) {
     xtty->tail("ideal");
   }
@@ -624,7 +630,8 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci,
                   _replay_inline_data(NULL),
                   _java_calls(0),
                   _inner_loops(0),
-                  _interpreter_frame_size(0)
+                  _interpreter_frame_size(0),
+                  _output(NULL)
 #ifndef PRODUCT
                   , _in_dump_cnt(0)
 #endif
@@ -898,6 +905,7 @@ Compile::Compile( ciEnv* ci_env,
     _java_calls(0),
     _inner_loops(0),
     _interpreter_frame_size(0),
+    _output(NULL),
 #ifndef PRODUCT
     _in_dump_cnt(0),
 #endif
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 78d1c23a2ce..dbe95a7c6e6 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -324,6 +324,8 @@ void PhaseOutput::perform_mach_node_analysis() {
   bs->late_barrier_analysis();
 
   pd_perform_mach_node_analysis();
+
+  C->print_method(CompilerPhaseType::PHASE_MACHANALYSIS, 4);
 }
 
 // Convert Nodes to instruction bits and pass off to the VM
@@ -2117,20 +2119,27 @@ void PhaseOutput::ScheduleAndBundle() {
 #ifndef PRODUCT
   if (C->trace_opto_output()) {
     tty->print("\n---- After ScheduleAndBundle ----\n");
-    for (uint i = 0; i < C->cfg()->number_of_blocks(); i++) {
-      tty->print("\nBB#%03d:\n", i);
-      Block* block = C->cfg()->get_block(i);
-      for (uint j = 0; j < block->number_of_nodes(); j++) {
-        Node* n = block->get_node(j);
-        OptoReg::Name reg = C->regalloc()->get_reg_first(n);
-        tty->print(" %-6s ", reg >= 0 && reg < REG_COUNT ? Matcher::regName[reg] : "");
-        n->dump();
-      }
-    }
+    print_scheduling();
   }
 #endif
 }
 
+#ifndef PRODUCT
+// Separated out so that it can be called directly from debugger
+void PhaseOutput::print_scheduling() {
+  for (uint i = 0; i < C->cfg()->number_of_blocks(); i++) {
+    tty->print("\nBB#%03d:\n", i);
+    Block* block = C->cfg()->get_block(i);
+    for (uint j = 0; j < block->number_of_nodes(); j++) {
+      Node* n = block->get_node(j);
+      OptoReg::Name reg = C->regalloc()->get_reg_first(n);
+      tty->print(" %-6s ", reg >= 0 && reg < REG_COUNT ? Matcher::regName[reg] : "");
+      n->dump();
+    }
+  }
+}
+#endif
+
 // See if this node fits into the present instruction bundle
 bool Scheduling::NodeFitsInBundle(Node *n) {
   uint n_idx = n->_idx;
diff --git a/src/hotspot/share/opto/output.hpp b/src/hotspot/share/opto/output.hpp
index 4f296c64b8e..5dca8f772a0 100644
--- a/src/hotspot/share/opto/output.hpp
+++ b/src/hotspot/share/opto/output.hpp
@@ -263,6 +263,7 @@ public:
   void BuildOopMaps();
 
 #ifndef PRODUCT
+  void print_scheduling();
   static void print_statistics();
 #endif
 };
diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index d56a7b13197..ccc09bd4fbc 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -57,6 +57,7 @@
   flags(AFTER_BEAUTIFY_LOOPS,         "After beautify loops") \
   flags(BEFORE_MATCHING,              "Before matching") \
   flags(MATCHING,                     "After matching") \
+  flags(MACHANALYSIS,                 "After mach analysis") \
   flags(INCREMENTAL_INLINE,           "Incremental Inline") \
   flags(INCREMENTAL_INLINE_STEP,      "Incremental Inline Step") \
   flags(INCREMENTAL_INLINE_CLEANUP,   "Incremental Inline Cleanup") \
-- 
GitLab


From f074775f6cb423c76bc90082873f31cdbd82d9ca Mon Sep 17 00:00:00 2001
From: "lawrence.andrews" <lawrence.andrews@oracle.com>
Date: Tue, 29 Mar 2022 16:48:45 +0000
Subject: [PATCH 250/345] 8281284: Write JSlider accessibility test

Reviewed-by: prr, kizune
---
 .../accessibility/manual/SliderDemo.html      |  79 ++++++++++++++++++
 .../accessibility/manual/SliderDemo.java      |  28 +++++++
 .../accessibility/manual/resource/Slider.png  | Bin 0 -> 58384 bytes
 .../manual/resource/jsliderIcon.gif           | Bin 0 -> 426 bytes
 4 files changed, 107 insertions(+)
 create mode 100644 test/jdk/javax/accessibility/manual/SliderDemo.html
 create mode 100644 test/jdk/javax/accessibility/manual/SliderDemo.java
 create mode 100644 test/jdk/javax/accessibility/manual/resource/Slider.png
 create mode 100644 test/jdk/javax/accessibility/manual/resource/jsliderIcon.gif

diff --git a/test/jdk/javax/accessibility/manual/SliderDemo.html b/test/jdk/javax/accessibility/manual/SliderDemo.html
new file mode 100644
index 00000000000..7f7ff85995e
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/SliderDemo.html
@@ -0,0 +1,79 @@
+<!--
+Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+This code is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 only, as
+published by the Free Software Foundation.
+
+This code is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+version 2 for more details (a copy is included in the LICENSE file that
+accompanied this code).
+
+You should have received a copy of the GNU General Public License version
+2 along with this work; if not, write to the Free Software Foundation,
+Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
+-->
+<!DOCTYPE html>
+<html>
+<head>
+    <style>
+  table, th, td {
+  border: 1px solid black;
+}
+
+    </style>
+</head>
+<body>
+
+
+<table>
+    <tr>
+        <th style="background-color:rgb(204,255,255); font-weight:bold; width:5%;">S.No</th>
+        <th style="background-color:rgb(204,255,255); font-weight:bold; width:25%;">Test</th>
+        <th style="background-color:rgb(204,255,255); font-weight:bold; width:75%;">Scenario</th>
+    </tr>
+    <tr>
+        <td>1</td>
+        <td>Test Slider Demo (test different Sliders and its values should changing when
+            different keys are pressed and mouse drag and click action are performed).</td>
+        <td>
+            <ol>
+                <li>Tab or use array keys until the Slider icon <img src="./resource/jsliderIcon.gif"> has focus on it.</li> 
+		<li>Press 'space' to choose Slider Demo. Press tab key to move the focus on the slider.</li>
+                <li>Pressing Left / Down arrow keys will decrease the Slider value.</li>
+                <li>Pressing Right / Up arrow keys will increase the Slider value.</li>
+                <li>Pressing Home key Slider value is set to initial value</li>
+                <li>Pressing End key Slider value is set to final or maximum value</li>
+                <li>Pressing PageUp / PageDown key Slider value is jump to the value range
+                    value set.</li>
+		<li>Use mouse to drag the slider head or thumb to increase or decrease the slider value.</li>
+                <li>Disabled Slider value will not change.</li>
+            </ol>
+            <img src="./resource/Slider.png">
+        </td>
+    </tr>
+    <tr>
+        <td style="Width:100%;" colspan="3">
+            <b>Expected Result</b>
+        </td>
+    </tr>
+    <tr>
+        <td style="Width:100%;" colspan="3">
+            Verify that Slider value should change according to the Key press key release and mouse
+            action.
+        </td>
+    </tr>
+    <tr>
+        <td style="Width:100%;" colspan="3"><b>Note: actual component appearence may vary depending on look and
+            feel.</b></td>
+    </tr>
+</table>
+</body>
+</html>
diff --git a/test/jdk/javax/accessibility/manual/SliderDemo.java b/test/jdk/javax/accessibility/manual/SliderDemo.java
new file mode 100644
index 00000000000..a721473f2bc
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/SliderDemo.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+@test
+@key headful
+@summary manual test for accessibility Slider demo
+@run main/manual SwingSetTest SliderDemo
+*/
diff --git a/test/jdk/javax/accessibility/manual/resource/Slider.png b/test/jdk/javax/accessibility/manual/resource/Slider.png
new file mode 100644
index 0000000000000000000000000000000000000000..08a03b2bce51dd591d0351292470142eb9ba98ac
GIT binary patch
literal 58384
zcmZU*1z4Or(?5(AcXueXxD<CQ?pj<6i@UqKEX5rP6nA%bcXuf6?(psDInVQ)_xta4
z-B+@AGLxA}GMQhJ-7p0?aU^(rcrY+9BuNPoB``3E5ztc!3k`Z>eagH91_mx@CM>KV
zDJ)E?U~gk=W(fcTqlz)q*WZ?;qZ%|Y(AOUvqoszocToxrja1V2>F*pR?d<H*AJb1x
z*4Ey{Mcsr{=?2SH>}s$;j3j-kW*97m9Q9m)U#HiuZ(DEb73uaM&UeS`Oo-J?NBs2;
zX6I=yqzDHIX^8lvOj}n8>^le85}Bx=IQWvX;E5xw$A{1iD1&qG5;!<}=xRo=C5R!s
zFlxa&NK!3II7wcjFr+#hDD|k(F?zVhI3tBvO+|>DjB5m%2<90UDNI7Y?6~61l%&#v
zTzw;bqux$1c#F`Z364&KL8^W~)RI|4{mQn9&Q8owRD`UN&Pr<z$N(eGuQE|-enOlH
zeg+;ELf;k1R>31T)Wc^Yqev~!P6ch`p5NacI3XchC?I<_j^E$k*WcdXHvou;qYb#Y
z$exg3rIFel?CmXTAd{*B)Fq8&Wx;4bc~~&;5Hm0+P!1gQ;Da78Fv!?oFc?sZ4thj>
zLj0!`V&o^}fAf`pRTNSdmXrjg%7*p;fVG3EjpLc|;VOvLyqSu+qq?jNx1o&{gMpFF
zcL0N{mF-_7V7#u}psW?Z(SX#|%F^0_+m(;(PYrHR{;$`JWTbzpI9l+Lsmm&m3ftHN
zNZA>_Fnl57hbJW^<+V35=2j9B`-dF#jgQRK(b1Nhk<rD)g~5e|!N%T%k%^0oi}4FH
zBQrBSs0O`*o3*2XE4{S?`QJ?b!$$<*U}$e<>u6?UP5KvKgYPy@j(lWfe>L>q&);$a
zT+RO1lC{G>YJn7F{HuhKiQx<5e|dvQdH;ILtzhN~u+$JSvjUk1)CNC0CnxWp`u|VK
z|62SPrTYIUIhfe~P5G~q|3Bq72Y|h>jTNX#NB;ly%s<5cF8qg(m+>#n|7D54&HU#r
z$j<!myo~?tGk*BvV9Po%FhMX$5g`><@Dm*vPs~0X?<8G`?0el`IC%l#N-82%Ib@5p
zN|+uvA4c?qy4DdE5y(WL6cv6H->eJ!3Zj2SpB{PL;7Dq+WLU6o(q8s>)Nyv+lU=g8
z-)r}J-YY9wyHMO)J)z@n5hif|eWz7uHL_>Ko<=PokVR9TOmjAAWaRHlN(u`L@lPU$
z`h|y@c7seHF6`yy)%4!4=VtmjYjTedW^mU1LgJcUO;>7XKv&+)&25+GYl8<)^$EL5
z4%Pn{_zMPo{ka_rAeRAudt*J0s2I9=Njpy)h;9O2Ev0I^i45BBa;Y&Z2??U2LP3H5
zNg`oYh{w&oOV=E#Oq)6Ek`04t4OU;q#?}5?vIH2vVc|r-BE4Pm;e>sqA2IO%k@=74
zD%MahH2W8{3q+E;z3O80|B}eJ0j<!Jusk*vV3WmZCjY11bFv>98L}StC%c1R6V5}r
zS|lVa{=)}C8%cnXErA((JlFU3c<{UzE-zEBgMat#NH#kO_~|_qR!tU@dSZfKHsx6$
zw=)o6G|XE*Jo*udx?o%%-pmW(@q;MNluKP)dYp`2zo%qLoZ4j3Nv>3zs)FGWjuZdd
z;)z%|e5CzcU_8QKI_QgTnp)CXEmbFM@5n2}<&PDLM-!{m7|U8TwS;kOq>GlQzRB+N
zuZar>BRe#tDz~Ml6F!}H_#AfnL1GeOide1G<}$1`bC>PN8GQXpX0==!10;&d%l91J
zzd4bNiHSK=!6N!&=we=o{6J+%<S}BmfoR44T51&@+PIh3h^wR4R&6On<m^extk3Vk
zQL7L%jHjr8ing?)zyi(X8NO?GzS^W8*g`^H>y+;o*w(csImwZ@?ye(H!$8iS(+}t{
zq4l#n2@!5?T$u5i0lKG86l@4qdtx3rWT1|iBl7#)L7yMZ|MbJ&!J$k+q*7=zMx3NT
zE`wX+dR3AxSs)9WAz40-*wuHr;e1mLtAM*eJ}V!mKsL|o`3`%E;EO&f-<QXaSJw`0
z7mpDW0*2MEBvH+G+(!bozUC&+cc(X3(u_))%Xk(oPUZ{QCYc%C90;<dZn1xcSSJsx
z>D7M5yysN-J9#w!U3wcZUi5K^vWQrV`9<c#IzDOchd@lXt(WcC-`{-V-kSmj895hq
zS>}1w<7?D5WNyi4xDtZ|>`J+<BO(y^DdGg?V285fAv<Dxc18w&lYB3;V2nwR`-;J_
zCfYQWvPv8+U#C1tq4wqS;Y!%SY-uZxwe-yv-fk+hjsMeM!><?xqUZ(lw8<n(QN-<J
zG0kk&X~99?-DkPZfl^C5ditjjj)Jx}VO~Ljauhxr=9htJ63SV~?BH}>x7gUYIO<QI
z0`b``C0=0=e?Hw3DCz5yW^6W7Q&VGNW6RkM0H?A8La6-98mMOM_eSxSTNb_s2Q1oq
z`e*F{jExmtU2(m*OxVkGT7os}EhX>eQ)T!(?sIfnoToGST8f09?`D0U1AGt8*Xts_
zNB1hJn-=0DT*+r}i*~%XtIU~A*HX{zPzG*oZQZ=Yn>5kIl(+41H=o||9N_jlKcE`W
zy*}NFe?$9wys<%uj`cxPZMuU;Fu!Z6!&TQU>URanksZ%BdPmkR>XOCjFdkKlE~QWC
z*n6!7&a*MCu<fVC&v9is^>D9NM4VV}fk>;f+U^?d*cn(pa!?Z;04?~&t$AXp|C-@o
zs1gRT2swDDsDc3uje<?O=}xL16gfn*E9ru<lyZ&H5RedN<7yj~Z)VLlt9<aS4eQ=X
z_-y7PC<3e+F{ASQuj%~82)D)GXqS)-d0Pw+^9D#f;^iDNbWghLGuM_$ZO>gF6BY`s
z*SKp92ar>rUNDD$bInam$RBD9+R>)+?>KQMI7-c#Eu7IEEw`mfEtqr@IB*7=&li{7
z?d)J298!`L#9dO(@dI}=JqD(NaFFvgST^+UW5;OTTh80Js$OMn+HaAa4klx`osVP|
z)@%c+<?fFKeCw@Nr0`Pkq}1Nv{_+tDYiPC-iCej)+KiSOWk}yA{TP}^M=liaP>@I+
zbnS8?DW;HMS(XDBVjQXwNdWH`f)tB#%ZA;E_lO6;9f7~QgYe^IrJ`Z+x0*z<yqy#%
zm!s97HOl1~U%&lor^fc;`BpasZr2O2zFxv@`N+B=E3JkL?VW<s(Xmvvf<meRi_hEJ
zz?s1qwdt!}9|a{Pbo$3rwPw3f^;D+UZ=&%+x>M)VdD5k)<Woh4CYrAk0yhLL;lAoF
zMs36<S+e_?E}3KxlWulL*WpwsMDA#HRx63d6L0D3Ui((NE4-c$c{0D16FOMv`rAD2
zg|M1!UZCpwI&N+dH5+Z)m(Shg7%kdA{aG;z$6+}mgR^n2u~@(frf5i~RdozgWHssc
z0!jjD!Oa-dANFOw(eDYrj}LkZHR(R=m-10#KtcH(MS*#GXBi8u0Z-D>`(o(WE!E{6
z7H<t!+gxU%1>Syk9<Js^ET1jagg94L*ocUHnuDznx_Dk|^Jt(sR{FUEJ7#wuRgh-W
z6a<YzT&#kQjt+Z9Xd4HM1ea%$<pu0tcdQ|s>}L<wbEl5NcjCjiH08Gc6zr{4oviEq
zD4NP@$NRZb^wIQ0k(<yVd9xin2hnUMpT1&aP#Jr7-Rns~xZYcs+vQAZ9|ix{^b<)a
zvo`al{dDfYlCD;K;Yw23pXD$C3p^xoci3H!+4|2M;}!ksc5Te+bQBTT=UBPU@P3UV
zn%eQYXMxYO&3v@p1~c{!AZDyyDR}YcaXgWDlo8unC@mXWQy)l~E&nEtwNP%jl=_(e
zc60bC0cK<Wr~fU9)A2n0{OIiojooSCvFZEUYpvC>aVp2TiD)ejy`~_ahbCPYtj7J&
z07+4ElUoxeI_78$-*!YDU=&O-lX({p*{LC<+3`>c<ZBzX5TK*1BsBk8bp49MeTAzd
zFKk<R@o9GnwQLd$zqCN(@a8x|qj&ejP%ou~=OL~MEd-JBYC|sv*i@4rGxraW9EAUg
zPBsz29}eGmT^QJ`R|BovPT7w(Is}}KmlLe<dBh%>0|d#*py?V`>Ma$|kb8o4dhOz`
zv9g0d<44?TYb2gVWdlZ3hvo59_o4_mirL@Pp<Qafx`nJ!%YCMpKA7TAYH_xjql~%t
zd3B1ZmIB%2QVR$K=A#HasWb)s%FC;<kboD(q?4E}1MC|eev-dFWZi8tQHe)-P!_nk
zAQ#0Z(!~1w@h_Jo$R^tPQA3Pyw-q2gM1t^=4*RuTXd!_VXs<i$La0G5_(-vGrPbH+
zNU|JYz4c`KOivEHnl2@wKV90oF6Ju_N41~CLi;N;>coSn{QVuAa2t1^l1Eq>h+AcK
ztV+kH%0B|?Amw>gx=P5ZV8_$>jPto`75o_HO&daOeLU3^>o?(>$S%+tAh3&*=_5x^
zh6qc?&1Y!cyQn`09WyaJoRdH}fCph=`}%~m*p?H4zcP!Hk6OAulE{$v5a^2aRBp4;
zj!BGNeuKmC5X8*PeDHK^vuW$dsNOTxMHBVK9+i%tP{1HZYDC~~FV6yj?3H-gjn=EE
z3b9wTM9GZ!Of%1X+>G983uPBC>uoE=u8~&B9>mKKfb6IPr_1TjIUI^#ux#ifyp{-e
zDOS}3nDi?T{WHABQNflxkBUrSnSwcN)<qCF#h5*PSL!Upl{2%<oum(j=Z#_M8bKcE
zGu_h+1FjDIa6E*(&|O0!gutzOsbC0)%bFMCnr%<iY>A5v{^%6TS({61p1Tl_%bF94
zj%`;E4e`}>U&nOT2^o54_NjIIqbfeHQRuYSO%>(h)0#%qds;<@62g;ps~w^rl`uoQ
z5odG**Jp~%93Ry(CAR^t%yw+T`~Il+qKP|y0tg)nt-ozR3vs0sd*r^i+xP+0a~~np
zEt3Xq>MT}&!3~HaI~DGiLA0VjC#dP>$kg8fTeoSPKbVOKc)k<SYu)kO8st1vbzq7j
ztZ(BG5R}j@BH^>v#=7bN>9@H|jE$A7DBeP+4QQXRR?k`od+W<j{)CMR+)#_AnnS(R
z8vRu&s|z|>qx4tJ$5PIHL$-g3zyRUk^AywmVh_CXn};Xui59rTYzZ7pyJ4lM#sW>o
zVW1$^rxC3C_yd!4ESErL=0AE!`FF-FlGj=c$N{jd=Ub@<wC+Y>nm>7km;dRVc2U8>
zYLrXt>J#D0Jla1L|HSaEzJj~tBYhc5tzZGHe<s4eaD~bTs6aZkpc<-ye?g7ERy7J(
zSPcdY^*qIYvjRB^U*8|Q#kSbHxc_kfCmDtU|2P7GC}E}fcX&^#fQ5=$t&KIFLm2RH
z#NaQOLW=q$-LY5(KT!;1l7AtNzts1orll>p`p{Z(QaJMPe~W28Kx_vqQp?35D*X?o
zfMoc|`&UE6h0<Anu)=>)Qvw7?u7qvYA=3ZLXBg5COf92ayD3&KgQgwUwl@^*_x`@P
z#e8Y@>Z&$Ar|nPkqgZK%?9ow~r|Ss;9k$as`$!f>#^`Z@ch8D?3(L_N!{?o70n?>w
zfJ%e4PV@CR4>d3E>Y`;;E$wK;H!6eRf`P5lG*FbR=<VGuoUpm6Z@%8j<#pMI6CW2R
z+_2%@BD_|tTM3F?G#~G!xLprO>ns+4&`9_q^jh^d!v-tfByH1$(fCsfUi;%2Mc+zP
zMcrkkrIk0bLqlPkH~kU9<GEJs_BAU;leu`D|5`==vf~9Z1jEpkFbbbY8oL$Qiv-^8
z#a0g}`V<4LqK#w&C2AF_eWb$=51L=bZ*Clys{zs}PNzdvZLfDLH=6+{(@UUu00x=x
zXO{O<*xS=FV}YS#P}9t?HKw~gVR`E7+w(aVTrjb<<^>!qtOAG1U{6$c+x>cpqhMl5
zE?698mS^m`=e2CHMhyj<)p9)l>y7fZX#LHsvV76;uV0Nn8LUNW7rjZGya9{b%^Qt&
z<Xd7d10+6l%)cl2pCc*cGi5*+Df@J#0f*Y5-tb(rLhAofj=9<Ib_5MBgUcbmn$E+7
z^IJtiMaNs}a=n%G`^z<oYzlLbuIHtwl&mbh^R<D;@9{4Ub7ip4q-L6LulIVXJT44t
z_9OJOIid&|I;RZ}<*gt!j}E&_HEL#~M8w3PqlkDCGhMgg0B#+7sTQmKhest9`FtLC
zlk;U-WlqK2_jZq0yYcDiGKz|d^E=)5g9J+7n69DOr-T0);a*UyWFvPan)W`=ryKzK
zz}?xHPMRCgAc|YE%s;N^$h2<Uf)+0ZB%(wxlzzLsyqs<K@^F9H3P}J=EN1g?i+Q1T
z2O;20=SK4v!&X(v6cBJ&%h)Q0Mn!$r4;nbFS9LGbiY=p+(Md@9RZ%@DD<h-AzzYWl
z=QyunqPWrS72#L|3OfKoy=*gOS{&WEZuE_pzQ-s>AY7rk=6Q3nG}GMSac_M)YdHAh
zBPJ11SxHO{yB#EC#QRVjB{daQC@4Vq3IZK<^Ym5_zg(Yg4v)C~082*9MHIrq!iOM5
z)C_&@mP{n$cGdK}zIjzJv|fCDy68cnW?%pYBNIv8Z}@Z+!$hzGVb0)OR_#LUwZOLO
z@4XzIbdKB0Td$<L<9>kRNc2@4N4<lKhszySt7X>ZIt$9VLNp=L4ARH-M6oFRsVc*P
zgB6?hyq2?eX}0L|iC`oGSb!L~E@+nIhhb0_pTx&w0=)WPm|ZXQbBm=~B2r2WGX#A2
zUqO;M-k8z}Fcpb&th?q`2U`%rAmR$1cf5lm;ZA0qwVd<MHI$s^*4VF=*IX-~=zkXe
z+m&=$z{b1#ZRChXzzPrpe>d%CDho7Us6|Ca{?f8(`_@FpIn5a1`7*czgBkeY*AYm~
z0)DTj$+y?%vbCmM!*6@N;aIfs8}!;p`drSR0vHKpBqb%oPck^|{M(<7XvK@I_glJW
zzcsB8CB%?PAi<J`QqzSZVACmZU^erpW80BK<RIV#*t9<eJD;r<MSR1z7Rd6v3hTyh
z?7n(9ZP-9RdU}4QwK!(%c==woQ#=M5_F{Z|X4AjI>|=bTqd7i!4>vO5a@qe%pgO+W
z>OodQR4QD6+4Q*Wf+3;0LQJAu{k@fca#)ZxKX+nn)e(KBy-*l%Z8s%~!-Th<7s~Y1
z9rZKOqM|L)cb{wjMg`k8vVabXL-zJ~p}?l&d48E!f?+TEY^_D>`bRQ{O=dIKWQxgn
zdiGL{Nl6-P#{T#`HjBvsx6_e|lbrt8`CLhZrjPB(qTO5+ze%!%TzaT7hb5Kmt(W7s
zv++l}eNIvFf6UGTwOUO#(A$gonC&kLql&ENPvWgURhf*S$_87idfs+Vtm8EIt-RPH
zkI*og$q-t{c?mF#A1FpCn<_%Y<NV7c(=E9D<w{yqLHiIF26CI-{l@fYp@O6h<dgez
z$PNdHJtEiLkLiomDl*A}NgXRYd-8TczFYNe9kiTNDT$wRcCTXPmk&EV?>2qV=zoO4
zu8eHInU;3^J&3j&9ZrD18hUfO63x*5K*lEXLq`1vkK=(p5&IyW1QOkNW4?Yy5OHZ_
z<$Sji3^TG_!Pvt?+-#`^3!tsedAkp)bnVC9Sn7%umY1-g>ht}1#q>o(Ulas3SocPg
z%lZ0Iv)fh>PANx52r^L)Xdg!6aOKTme|f=4U$(Cfo|bLeHVb?&N!Ptd$*+TNd|`yK
zLp$>1n7y^CFACW+(T+cwm`}=;Ie_wOWg~%2GVh`EMj=lR;wd+`DlbwOFE|eMYAK#q
z->s`HhF{e&B~*EPG)T{u^6}{TxW7@0zwbSoZ3JD93#tIC=4SsUP~U*Gl#f)PvQS9>
z1FzRpEzewA4&?W6rp>BqZ1r-%#7kU)Z6L55ftJY{Q_#NS`Hbfnf?cP)Ap++;|3!H#
z*Yj~ViIxMBH?}YOq}l2Cf$8)aYI;Y4(BKSSS#1~ibPeDqF0g1IqC*ezMf_^(r4POd
znnDj^6hgaQPnH&kR*RL{b8NXFA0TzU>M-$51dqp5O?=<BK=#KOXe`cvz`68(h6}ON
z(X3?MVVTbpCkr#n2|L_(L?$sQzY*k6W~fi-F}j-+emh-kCsI=OIz78kB6$93JfU_U
zDI{3PQaZ1mJ0Vf1TxjxCpx^r=@p7%<CrPX&gshp~d9Mb^0h3yn6huU{7rkRdp_P0&
zk%_iMW;u~wY8&EeyQYxaM=$ENzdQc+_JSIuo9r6FZ1unVNw8swv%B#j!6oN@ivi*<
z1yJcjDQKHpe*8eC1$Ph^U+9r?m$ls7H~++;39};b{vwQaXt&c(4FU6VAwlS!M;aU&
z2-bip4pD81;-Hq?Oye?}#dwWoKN(|WVp5W$S!Z4Zi@ylY6i8B4uq~I?nC<sYYi)c1
z1@_x$woozCS)-J=+#|I9%L<KtHnFWANj*6nBBF}u^2Sn3<~ZY!6B2WIpYC&Glkg|_
z#^6=Y>#^a_Jp>G*&GI|giB5q);XtfShz07KQ(8O6(#FGJ&a@883adXlKPBsAkd#sW
z9Zy4npObH5Yuwdp(Z%|AqF_cZj|ku7dhC#Es}rIS^A-}f7|NU-98~q>L>hKMP^$k#
z6<%sI*E{x$%q6)&pr!d5AcT`BM0dd=7Cq^-y43uaN96H}F96mjLnzZtUI#bMP{5LX
z59*19t45?H%M^1pWTF6q8=)-VVK;9-G3l~2Vs9xUMX;9>h(qK=rNLS~24%LRRjL(y
zTBvJ#>gW9-_`tLSjeN#v8`b%hcSY2tpF2;oM|Qt%L06dp&6RscB68kF{{XZ*ig-&z
zRPtv1k(jkxsF}POn9DW!mn@;cfBJTbY;&=9KgfIQ9yWr=^MQYJZtLP>P+nmvozjKu
zhmUOD`fYsotA4{FSd3C#<dzTUJ>seY&cSml2|zStUi^>=Cg6v&&z0;e!&qwC*>uAV
zYt95#EA_IEZrv^fiiG-?1pJ<jR#**pItE9@t7US-ig2IMqpP=y{ZSolJACyDn0PfM
zL-ys;q>~uFEkM(GRlfAZ7SK0+KAp(qhh3z7f6n5*4>kA0G1%mOuo^-a9iAc?%vRj&
zK>Uv6^R4m47m+MA61%s&f4f7^=XLHWUL?stYx;OueIZ#)1iewP(+bXei?q;IxYA40
zuvB@OwREA;51b*C-9Y|mwkVe@e-j!Cjr@c!tg37u9^~7@&#|q4;4tcz&hzL`QS9OG
zd{tU`)Al0KNm!|;eEui!ZWr(TtkI8>*fvn@URV#Pe^&PlBuR!LaaU*}?u^~GR7|&S
z_@#9dA!=6%jW5tK`W!U$gcHt5N`g>S`G64dyh%{hM?|z!<%igD*-v1O79Z1jaOZw=
zkd4jke~{rY&NUnhn+5n`Au`!13x$oigmGhdGNL;0m;cTHZCoW$J~w-{vDF(eqU`p2
zJ_Pod;7%dyf9uUDo-0{UPh&d5KgPd~GCSb3z<`2l&sC3n5}>GUjOl)~Gv2L3&W8$%
z2u4!wh39|15C{%>u-A2kS0nzxU<H_!?WTvqUd5J~79>Vvf}Fyw^(D+f(vEll3Ry<C
z{9359COE}i`TD>`_r-Fpxvu-DZXq8BZlvHi!Pw#iLxd!P;BrdUb;orQg>J3!vGuI^
zc-9380rR66pCLZrOn>i0-7d}(1P)3*j648yZ36287Vq+yAG1J#N{PM4DcOW>`<Zh6
zKQ>+$?(9`nthrBhSVb?bfSn5#-zEj${aE?Ci+Mg4M{el}`{=SUH`i%x$=GDSaIv=X
z$9IEYOlK85w;6|xe@(cWdfKmebgcz)pR1xx8=bav%?5T$WgmX_n8Vu}-=NW3W!)W-
zpRr??cO~JKW7YesarbZ#^UqFx$nMvAxBRe=I}Z?vvi&U(&Ar}OZm<O{rXH|q>X&x<
zFzimUK^uwiX<f$-hDB`vo)GmBf`b{jhrV*z_{85#(_kfk_YV^D4Dg*8thPZGcSnON
zhK3NU)@B1r0KfhR))l71#vej-48w&*YNAs4K)K%@?K)oSK1M5u{THgLpg{FjYx9lQ
z5a#_Kc<BoR+o-*{FO;Sv`X6@x9BCDz!zL4ZKNw`uU6i1k4hj7iDE_gm3N4gOYmU~S
zeI56%edRyK{wFyjBeljoBm3<Be_zibg8=5-S^Nn2AL##I(HbLs*&GSii#e=UIloOL
zJ2!ls`Uj$cP8lE|@R}%=lMdv?<6fz`W<;9!omCNySX7N{`PqQO1?+X#RIHr?kcIG+
zia;UM3o;1R>XSb9JnH`d<)2Dqwq#>js>FytYfn7kFGupAx41CTO)27{fzY*_<O3p<
zGmr-&#R8{5lpH^LS3<TcPgaOSF_1AV(NL=`BSQb)s33(^k%p2>zbx2=d7)-x3~^^4
z&B0dW+70i?{w=snh$BOb3^n;!CIRcvl!<iM%1utnKQi}tGE()Au2fK)?w9x3V8at5
zd0q6=BN<eN3Z%yYTKOeRWxuNoBFR9u+VlYJFgz1G94h|Z6+ityf|2ajmU<q|lSYs&
z>NVy_M3Igpe_@YQ6am%njP`9bc=$inZCRJ1ai(`wVI!*PSu4NT@T3eNAVU^Pd#y}&
zzb1IFAh-;FWUI82;JTsFfrkJ@3#P>GKA(4V%!*(16WGKzBbohof5A4m(+uc7RVY@@
zl3-77(P_w&h^<m?_+$Ko-%+?=N({gT6_AcuOCH$Ntee@+cV=cYPVsv2?U`~byFhn4
z_qtY&G)ZH=V8`cjAa`);c)^LsbY}?8@X_b6S8IdOMO<<DoV4;bFCKemm|a)z`*Bpe
zuIDqY4eO3Gf&41Ra-MbOl1SGZ7KaEyf8zdkS0DPvp<O$CtZ@S81iJ?H=3l2smdE(}
z-!oLY5mQKp?|yv~@f?Yyv!L1^O_6<nsnI;WJKv}fG3)ifMuYP7>qL;*d%>)`E%=IV
z`LTtxF_n~jpu!h7K;)R4YQcSQ#DqvTOEG_hOY-2@j1hH@%VF<l6LV5vAXKq(0kVM>
zJ~h2x-6;Xa(Xldd<ybyUrdOMKCMDiFaYZiE!&6At6sKp#`*VdI=DIc2E_8^J5xw+z
z*T-x}*D-i0E;R9_CCS<1eX4JjHeD`8<GiwC{sfaI^zuq8)<Z`8c0Z^%Ltosr1;bkE
zr*CQ)a`7hQ=$vum3Px!X_o;Hp7_%HqEGq;!hNiNyMtnA#Qs#Mod>8L+`efDYp#1%G
zR&qO7+{Z;pQ~l<aR=AWWuAuQ9)4jhY&*#X>=Bx@i7$Z5PHP6tpq4}4N!9G3V>T4Sn
z=y)ZkRL@>%y0)S7hcgto8mupA5BJMc{IgltGP${pNLIeCJfqf4F4<ghfYcR=s-+&9
zgFGpC*!fHW3J4s}#~oSEg+)*Ny!F&MSt63AlvlULKbor$J{>pz+V;R*q{T5?<}6Z#
z>Zd#;k}@D4<Kt+^?XVo1C5;!KvYss0U!Gt21C_hhjc@MQop?7GpkzPY5g&slL>s-Q
zu)=ROH2V`e#bv;@&#3$xRajWqY{kY>t^2J{P)e+QI9TWv)@$nIM2TU<;asUkoIiZ4
zKy}R!pjjRAGidK#_v!MM!2+r6m7oMU^r}RD-D=Gx(baYNc|2TNh24j~Tws5jo@l>K
z!c2o)Vb2H;=H~|Dfn;+jcp=?si-ngz+h{_01)Xui2dzlu7HMCqfJtOx?>e$!X)eB5
z(dC$SCcOd!tMQt<J)OY*^#|^;x9Y~cxeQ$?<%Nv95hWNAJSEjYw}o*L&1NHlIoRm@
zV{w$ciwpeXj@nw5o8#{HgS3kIsY!#3BCn8T8lS7QGp&1L8LHZ|qT#s%J<~PSaH?Zr
z<n20xO(PSfJ7sTUibv7fU!m@0aF3`gc^8xs#N0!d!8m2P5j>*kq8c*O1*1Xjt)#=K
zA4lP#8{W-wEG+<Xph$j6j4B9i4$--2UrGpL*T*^CHqV@XL1d{k6Hc?{vtkq~?(+ru
z@zl7tQ!?A>m`F+-z%K7%{V?@1{a9Q)E~|z&9N+Vh4Vecz1-si4K|XWN4njl&A+#D>
z+)Vtb-_vk8)2HSvm)p`ux2ZrS#I3K>S@bBWP83h1NvDNjw%Lg%Je<sZ`x0-q*onM(
z2Y7tAdJR4E_Ue%=W0SY+<gP_O+7@!BVrYrGluRa^Jc}h^Y)#RZN0?i>N~hW27%*O*
zxMJ)%d+G6(!#<{|T$7qefTZjQ3rL?!Wj<cW+2v7HRJrrc;d?eS8UT0XWDZO`PcNx-
zr`bcCgCEc1hn#{}Ec^%?z(_ZoqQMoPkRhCsq7k2xAiboq6z|8o&K;}oj0cB={EKuw
z7z#!~LgI@@43z!ymG+1tpWbf*xM~*K8auj-<#gF4&ues%uA5bI#>pwefylnkatMkH
zOh$7#5OmiYuayyEIy0FJ$A*vX$B-m$r=|&!mUa>2G&NQrgFeuC&=~f|dw+~C@KT$1
zC!Hl7mBxPA{*CG%f2#pogGT04_X7o6pZ<a+*p$TR<(I}wJc3tp-9)vL3bx@Qklqn@
z-n>@vU_@ITg?k-cJ*dtUp=x|4(KzE=0_CxuTeBg@8iSd8a#0)`hd`Hz(OsnT76Kc9
z3ZQ3fXVsvb!v+ihi50E!d&Du1<`7Fnk;n<AXtO#bD0g-Wb=RO-jUQxZ^Auf{QI(w;
z$VH*m{9MSY<rSf_N*sij81Q1P@j&;Lf>;sr4D)3)6NtnMT+;LBqj)Ai?7QUq$P}3N
zjY|Lw_(kdtcj5`9mc5c0_EN118Tw3W^Q)ri>70Al?|y(Q%1wYNj_1`zdP<p8r~6q!
z3$P3~c)mv<`Lnz<@zTv^eHC_~rVBAa_I{Mq?INeQLEB5I7|qecVa(}R{7lWaRwt?+
zJ(EakL0iMnur^<zm!<3N%nkUIuiV0KRp=a-&uZ|(*&I_|`OV2<10yFgc+34GHlTsD
zyjF^IxDva^-SX2I>F{;?d-0&1#^Cjrg#BThreFM10J+2n!myKgct20NAmhCR`PNzT
z4H<85^(%vX&%PtN5rG%i_qu}ff)L$G_2dkvgF&5K?pV`T44ACl>Ufw;Cof&8WdYc#
zn1f|$0;kB`{+HOh<D&L5z~YRv!uhQ@9rmgb1?^?gWBh2K(Iq2~^o&tV^M&HsYTtAS
z!xzm&C*2uidb5>zB%@Cwx8}129=eTDK%%9R*}G~XueoA9vo7%x$2#-2HMEwPCl^AQ
zq3nW1w-h)BS>y2&Pfr@^fIXXs3~qL7c^=?d4#7By1P`)R?vnKS-V*&cgL!(o5KRSG
zwqZoFYi`|xg+%)1+pu-l#tNE=O=lp}yPV9Zeu;oqK^qlzggryX&|uyytLIfR>y9DC
zyWl`MtQ(gGW@g3!3C3>l{#BLwo~2KwXRBx;B|o#@g~s(hzB^!E=IL}_4|m$101XG%
z)Zem}nWq>X9Zxd<N2=piGC!-!S<+1h&-za&fQI*+VggOld3fZOZ(E)+{spm{IrPeV
z8)GX&QuTueyMwvnj$ea^Kge$^Wda`eeF&c;lj0Fu@EazEt{^9x&vVrp>UPD=m(v`=
z2?ydZ`Z1R(7<igwek2sd7HCND-)UTI7%|7CV7P?~q#f>3QWi1C+lzeK{?5jg_R}gQ
zH^Ey-X*ZkyjwFq}WVy)<6W0~~3vEkOJ*!6z4Edudeon)3b?Gz9kvX3hQJI!TJ<3bP
zWQM`0lTItQCEZ?$K%?IX`|*N>pbsY9%givi_lx^>Eo-qx3EJ4(#y#sc5WHEUK2mU}
zdCJjWM@jA%Dw4&5q(OJrm&F3Icm@(qUvn{zocIoAvpxSMOe{QE;TFBVa)gwdwbUj@
zQoaOsj&j+3ovC1Cw(xwcj24Wsx=#1^5(_%GHvxAe4vS?ixJKPyCVR9w>D@+dPYCz%
zjfXH<^>obFJ7G&30@0vbb^8klSC4xl`157#w{1Te$95-BNEmWp3fASBm=X!t#dUDu
zs>>3VbTdW+F^Bc__S&@WCTBU;^G5wcx$YcG%rj}3@AlNB%^)i5Y$?tT8igA(ZozY2
zI?UvGlrI}k4k`668p~U-w%iSly|a(KpPmf4HTJZ!VnJRejw^a7tz&un;0Ht4PyWFg
z4%q7m8!w?Z3XEOfPgm>$Nj?6LRfpKvTE=YN=~)w!EHx4g#yTu~>~9nyJzi#syD`3a
z1A}9(D__$rm_G8HbdX`mq&-r9NWH=ngYFIj^U#k(84n5bn*ao7iD%2KZ#`_PKS+_a
ziftAttqX3^IEo~DL}lhdSH6{m0b#a{!z@@=EeFF=`L0SNt0|`Bijy>AVrJcIFw~Qx
z5&<^#I;r*OGZ+T}MOn&UmHZQ^HrSgjv$W%lTieUitjZ-}3{j>@@5GS}6VtuZ<B?eD
zQVTy~?Cumq7kxbCuMBCfJCb^ZM$FD&dbihQ&-ewaIVdFQd>)!pLvWX8b?vO+QjKc;
zrzLqHEp1v7`d%tE3r|+{BMccWWtLYw*O;4~9rZ~;ByY}=O;o{$5%{5|7OyDW)ueu)
zPsC<9A-ZJ_^bmH0qXO7~JMz_zrvN-Wt0L?)4T>@1!qpsQ$8?uLo0-Ih^K95!C(H&{
zdSd2AaC!3)&2qa}OAoXqTy;HY5~6BQ#xCETebriEEckf>#SFt!U&v!FeB~7)Sm<)r
z7mmakK|cTR)wW09!{Pg}Kj={A0(9`&<xAMX4?rK&!sxM_jTXDJ{@PKxHX%a&L+sAV
zSTfE3Tl@4DcmK;S0)m&6Gy*UMZizf@fTe2ev$8iBql$hO3q`Nn9vHlSY?8_NRyD*(
zDRq2)+xM#FrMnWzD;AVB(JjwQC@8xxx$!dYZ*?f~M>`nwatHOdQq5U$Y4YNo+cl7b
z=~xnbto?CWQuCW6(UlNNL-J%Pk2{J0{9Py$ML7lb4?)*7*RXdDyLP)5zene0Dbvg^
zpSGIgN8TJBjH>gRv5q{11mj6EU2&8(#4&44DI2>k5H@$dt6{WTWos*w%KGd;x<6eG
zdFFPHe>Pq;vQt)0?&mKr*w;((Gb-wv7B*lB;=gW#XOT{^7aQiYT0W4<o-vh<GnS2a
z%B=B{A5h4=jr_E_k_ZS4;jv=|YS!Amjrk%wMxiI!r=PdHnvLf$s@$=ut%|AXxY84G
zJ9QSSTFn@?IOPNs<Q4%OshrGvJNBaJ6fAjM<AHYSO>7?Z%9YeWv71xbu9T0nu|7#A
zXOq3GY33Z^KW8zRZU(x0;?wNoo9~-t*fx<ys>z0BLRl7D$Z1#PtymUCl7^m#c>Rn4
zDV(S4t9u7f1DT`0ItA|<cax%wlHL4`;ZQDfZSO3Aun3z3u$gd=4Y1JZ`k7d3F{eI^
zzv4m~X1c5(i@f&hXKQRQ@R!Spyk2(YSzmIp9m6l}Kc$iql#K!%@6Y(8#Otl|h@Kmi
zrKGS$tF^?;`f%aL*XsLu55uIDO<d9{nBB82U8^bE+_An_dB3ukz+c_+E0Y{8HQ8<y
z2SSOL6)|jsz=r;Q1()E6PlkK|LtE-h$l-(@4(2Zu^%>GhTI{jhYw<`WsHX{0gaiLA
z@>Wk>8D8o~maT0`M#djuhNOUJ6Rpxg%W_u3@b6bA1H=Nx-YR<&P?M^H@j|g5kMDZ5
zB3_fN$=`n;YP*}wQ~pNkM&yW07?KH$>!E&kB;6gjs(hRYZJWkVebAtgwvs8%Cx79R
zDvF_Y3>KJ@4TVUn;?a*!8ULaY+(rQuFe!v2F>uMe37{fp3ze(6{iT7)V$KLlH++T)
zI3@f3UCBVTL}$}!tm0MwDt!lM)F2mPu$Kd__cxbsig7uYv_{G6C3$R;@S}I>zL8>7
zONf6KpFjX}=+!NTZtb4u^&ZANEBfb4J_ZW`(@1d)!<Aaf=R)N~d++z@*UIvT0sFFJ
zro=n|o?U!&FQKDkVm73X790Y6?%Ud89w}L>yUU4mRe>SZmdqBfL5W_*T?KA8LXUaf
zR#H^u4mrZL!FNW4)DE-Hr`&F-Ib6(Q&wE4%*=gd_<tZeSPh4>a+U<}0=*DCn{Pa}U
zr4sPwSfY6OaVjNf@9|buKlhPFnCXTOWq_AmWbLf=tR@%7l~q|kM&*&0YNs2`Jmw5U
zsN{=@CA@SSU4LI#XWlaxiN$Anz07H1`mj$!J=LHE6zs(ED)81HlMqW%oc><AfAHIJ
zd{MVBXWfH1nkge%d+tR{Wj~}~U_9%w{4`jvYU~j*U!*L3#8F5~|LhV*GY-1fLm?Z!
zPPbgLPdAaVI6QvTqO}J{?b2`>UObQ~D++~)1Le9>|J8pr<(}h$-v=q-fP0YR2n$n-
zoxhq6=ddQ-c{qq}|M>&;_J}UBjHgVnqc0nh^z~0^@$R0)A<HjF&A+AU88j9AX@fa>
zdw(zV2987z^xPRTKeF`gxMon)TkqA-it$e<y?QtmI9W8<nz2V?ISV~Q<h*Rs_e5Z}
zzoh`ksADz4iFlE<v*M*5?ZD%G$kOfWnKjnsW|tWQe7?l0jPPA<oTK_UD`>8{N)^UQ
z_{qGGn_pn!8RgHgjap`~&*;9T8_(IAOBS^@?#W2ue!e(5Bk1N$dzdPt?7k<1o)W<2
zj<8XaImzjY{^XVmWe{#VM<vaYcCkgXlQ|~ZaQHT#NJ?PgF6FzW^4%l8-<eO+W2CNI
zqLB|z+-;UgGr{S7Ju=u22S^HJ?(R7Z#jT(EqToz%${KYrBZtz}e7m34ndS2yb9c5h
z_*S3IYP6|fk-~vd(S94ok>;>8-?L-mP_!epl}sJb%^V+Bt<;zMy-^<V)Cbw>&G;jm
z>AElbDOcezK1b+wfdSrZ%>A1Mp`dtk$Yi3b2;~Fdvk8!5CdleYkv9&I`%UBiT#^-W
zw65|K<@I(OiqGP&G@9yH8yqbfb>82@Hv`3U^LKYd8vxnk-rgxbsz{t{Ogh=ACAo&Z
zNL=pxRQRpqsGf_AV#(*n&-7(!v-vQTy0RlanZhM+FHPzM^-vmGDG}7zMw_Cd7xePs
zJaQMErlU3wGIGY9A~c^M9(3_UwSZBNm7fUc2dP+&y1Fgv%?fg~65H^6nzRS2Da$cc
z{Sgs9`Luo{JsNsZrw7xm_`sqB^kMi=`4OXhBmg>7wyEjOk%A|VZAlVxbd<D`M&NOC
zt=3?o=(`A>Im#+?WWG;*Xt16)y;f2OO`Q{02z^DB8D4xErce{*qPMLtec5}}T(S<m
z`G<5xa%I}m0J-V_CqzI2aRJLAC3Oig#yBg>Zsjg#R2YRvaut9pE4Gj=ZWmE%=&~UG
zMo?;dZtb9F0iqibp$0pnKQSvXmV^hmzu!}RK5>TUX*zj7V#0yv!|x(G5oVoRyD}Zf
z>p0)g5XSseZ24(np7{ik(FEZ1)#Yl$u$(@>+Hz|AyIZF5=9s7J7VI_^IWJ+3u09h9
zR5?y1RRERnz?9aDuFr3Ji~CBtqy)kVumrlc$mZe4oW>5H*XElHTZFpN?BQa|?KD{R
zq?u^+AU5PY_5urym3Kz=VDyx@`IE)4X6JM9y~W(wPgG$*lPAU8N=(hwP&k()&TtEl
zc>KV#{cGEVx^g*JbR<ar;i5ygc+Y<3j+eJ7sx|ExtA%pq6gqcfeO!B8m6&=<7km5H
z_~=@$4x<`q*y}^#E=OPb(I1n`o*4GJByUJ1qI_a<zhu)?6;d;BqW(aU6(HQRYpx#X
zP7f!1aNp-@$+&sXH|EFN-!FzVN*~em9a0Un8-<Ye2n}@&s>VMkzFE9JedW{nsm)!=
z6NKfJe&zJC%S<^E<eeqL-Tc8bkuM=uWX5(5W>uesQ#U`wD^6V7u{<2NYV-c~cUG2Y
zPe|rKBweWY^R<l>V1O--ODl$bh26qd-|eoFJ~rxuxp67tO?Bt8;(RPp5)4TM#Xz%`
zl~q4B?L-xrtv(5WWgjkUK+U$M*8Viuzb~aZ-?D@p!b|HICL}ReZx4WaVayM@fXI}D
zMl2`ZHd)aUEV`6Pb&LZn%|+5Bj=J81zAZb{?uwfBF1x(xuX;IcEEM_7Y4M^E@fChl
zi-P#+>hrM*!EJ6MD|uY1h=`K$BL9`ebjoyekizyA5hgmmc*>NdN=bgocrliE+MV&#
zlRU;@^;6=RM*}1tReT;X?`F^U_SqXxDVh4wQxC&!dX5`j$}YAEvP3TaG#ysnn6waQ
zC(YBOgdsxeo@n#HoUB;9(COGa`(7aCoVR0usrf8-Ot52_EZzxsm6t9F=!#gM=o34-
zkru53n&^5L!Rz$Q%wg-b`!)Hq0{6?|iX$tQs`LIrlod~c7fB4Ac36X>_U%qFZ*J&5
zQm8dH))=kjNAk6=fj(MQnd8TE5tZ~byTb8Nib9o(6}6X1Ryc^*eEr)V0I|dk*BvCK
zX!G!U4Fmg^r8%+y9h6Gb(JY(?rk*^ROwjqhBd%8B_2KiQkD`()MbPgMTa`#&;Ix9{
zfw^L;A4b3@f*^}RogZcgiK_OC&8g1%B)k2emDa;BEV+zFm>mXwuX1u57+WwScmOJU
zFIU}D<!l#=UA<WohgynY9;`GDjiq=q<Oi1U(+0CJ>zPdU&vR!3zeq*w&mFYte=d+@
zob#`E^P|%8@v!9nkiKLo#9Y<!u-!2~*|&dhLg<zi{dnJ@c5SGn`$NNB-O8Q5xy0sf
zcz9a7wxPJKz>v)2n5v+yX+}%7$r8p0mnlBVE}rOH@pwh0b6{AB=Yx1R^3!Yhdm*4D
zxHWNC&;6m<!gNThp|JP?TwpEK>52U(5=_A1=G{}R@uSc(2D)q*<?F$yGezA5^&InK
zgB=P_#ihsxHNn#UO%jAR^}YL<LrWROw(gYZ55eefWtG2+AYN(<sRR~j)k`d?se0b`
zA~8;4yP}Cxrh{ioMUlRm&(MRmX~QBIsl*bk{=z3K1nYwl6+g?Zo|NL8>k6IKi8Pz8
z^rW^nQf5z%b|cQ^)Ek}B(%%Jd&(7rOHM0OH#un>-Yb&K@pdmRLxl&DwY-D2zJ*Ly@
z&%oW0w0y)~(F*z*$n6ZgcN6e4jMK?s_AJ`eyp@}WMfBnm_nSTFjKcRrw<TtvXHBy*
zF2XSFSo@I1OX$c%d{6YvlAj;kRpAH>El%Xb{=2NkMba4jPnPua^MP_)a|%bB%5YAP
zrRMaW#NC-R_KWRy*kOTh0rv7$6U@)GpDTs?x?X0?^-C@U-oH$YUOIAf1;svolp6K+
z{yns@^xG8qaAH0=mp5<Vk}@Od=|kFk?r6OJt>lOSN2E93Do-c#{Iq(({skGo_or|N
z7N0{sM{2DX9Qx<9aa&l*Ro@HyWM*PGv`}V=nwT$YwI93z$o`I?Us#=It^abUNY!6!
zNLqaBBV4XEk7^@3;{VC$)NB^HR(%wYH_SisB>5$Bq!LEJZUx{t!Smw9<MU<g(eOjY
zN;byr;aCLNBNF*ziK~v7a1MXK7Qb`&+mjO|(TZK5KY5NTc+Kb3-s#T*RU<NoiXsp7
zp<kSJc7is3yjB6j^zl2kmw%B&GYLaytBPpU?D}sY<@qyboPSSt%7Ji0B;*G!Sh~{e
zMXGSuU+Za(i)AhD6g=E-iY;4MTQzXW{)kdF*6IV@UzyQj5y;QQgTs6-=+owMyx5&B
z28eT4I)s!ppQxci#lq8#aLXJw^Bvy6VHlzssi%Bg96+K)3`W%%$Z=_>QTq_=<H{uI
z7FMytm_)5n5A)sZHA<*ndPQuj(Utl4;;{N4PN%A|jD4lH_tOqz{FtgV2ICRA0Py#S
z7{Z;A>hID@2Kke?{^?w0lPOwxS(WyoI2)qz-WGjhqdpFPt-@KH(Pv<0rejT2vG}1S
zvBmIRnUUQ7hp<D-Q{(E<eq*W8eG>GzT?oB_T=r)>@D6--a<(|;hcZP2%Q;xXq&>vU
zmzwTSoVygaX_4A#PIy+ET|<E0W~AWo@D69rxJ@7*enX8EbmK{Jp8XePjI{4B4<As}
z+1_6Lu^fYSSSs;#H14*vb&<D0XS(*d=0V3-`w1RWY!o)_;FZ51HChgYDY`lw;uBGi
zSYG5>=7i#BP>6FBUrz<{mU;n`MQ4FaDi#7ka|{nyjDppY7&&{V@=7Cxro|&1j|0{9
zGm4qx=4|7i9In8n7Tr^)V}+?g_B;I82oz@er*2#%2>S~0#?B5es4(n+!os7Nv14%p
zBh1cWm6W&c0-|b&M1p#6S2z=rq(ed19iknaEbW(9*RZ$!{HLqgyD?hscDP)?5|v`T
z!%ugVdj;V<Z{!_6p;<e+u%-CNJ75f6g!NI$h3e~=E$Z0EmZxjYW~gE|R2sMUooXEx
zIxw;3ejpRA51oID+`;40EE%r%|EREe_)9Dg?i$|PZ)`;mdtC$HY5mPUNYk<erN>!s
zKk0rx=`u<BmW>YOXRCO8iYfEd@X(0ybl()?gIjxw&7;7>7EXH${O1mB=Lz2|+zN^j
zK<v?k-`49zJ{nJs8tue`BiinDi}YnGB8DoH!*cWr(q^T}I%==R+gTlo8}}ZZ`dAlD
zpDd2dRIr<7#}vwIF=NQ|w$BG{^Bx(ju}umgwn3gh5n3q{OS8>M&zG#29u7JR;9FM&
z-Rmo-HnCO*TFZQI2iRk0g78pL)p0nWa;_W~Fj>p05r#SlIuL%W@yTDIVE-v^{3_GN
z(426d7a^CON_B5K6Yj57Tj}A*2LWNW(+;UiIf^9gGI=)U+(M_g_s(8H6VqNWjMfuf
zt%y)h7XW24>5-Kw@6fI-471;_l%bnuI(*+TMR~3(g4V-Daee88*<no5XJy)5WBKKC
z&}^QmE=O!VixM02&Qe%#Ki$xfvN6_(LxO?ZM_6&R?ZyEP-DN+e=_~3W;lVsxM??pP
zJ+e&7%a$$&HR}})IH-qLo21K|VhUx8Yu+G@y<`6uk8*;qJvMI9Ujt+?aXUpge+U~^
z`{=o<Hx>sh4jY8ljjoVpu3wPRdCSJt@lBvx#_T6GvRV?4Nxw|bS&3GTNsIj1$vS=m
zT}qTE@qPpE>ql>Ue^bHIwUkF>s2^)B|CF*LXGqMSGY8O$LER*Hc0AQm{K6oc?4v^@
zt@qlxa6JW$ln0}`TdD2*`!=Lyaj2|SL)7GH*n==LDt-SaVZHXAy=ilb9{pZeSXs%-
zpuh&A1w@>7CeR_}#{b0lGPj;r<_Ej~!w`ymM!7v>+mWUy@cI!3lPTEe`A{np_Ennb
zgRo0Vu6h&T=^G->#Pt^rtsMcwES7lqcV%O(6WoC^c!X4uRM9zV?jbFB-uLqXudC+=
zOyqGbAxDfi@NK4K&hlz%fi#QVY6O{Nc!Z>`ii9AfRkFkZ(V)}I9BF>B8x_^>j%^oW
zB%Juq4chCbZT7W_nTcD|q&Ewz4TXj-^~RtJ+!^DS<R>W2!NR6^pxAvmC*AXf%FE-t
zXZG|eTgvd7QTnjiMemzPu17@v4bidtNb^aQf^~4ug<`Cvc4eQ}=;Br;U&z615nZ#b
zE76m!Gh$RzJ@Ii@OswA3^q0gV9otlf9r^b~g}aW(oQ`+k&%QJ+QacA}+S6sMPp&Sv
zNAHocEgAi3*Y?-0*4ssW8v;MVXglOtKSi5gGz+s-7$`FRehgD%Xt^@jy4`K)5O&ey
zNY3}UEGafTm5{BHacRniv1t!1Z@kv2(`SrdL4n^+(z}G<e-VR%*4#Tlr5HBodR$Es
z=xB;2C+gDO34-gvOzpe>oHASKgb`kjCruD*xvxa_XHoGYykF-|S!O*F&gyuF0;I3^
zt+RZ@917%-w#uby_J*Vw>zl|cXI!}wCQY7rPM_GwmVRneH$o*H%{}){f5{1+KA>I3
z2Hm2Ew6~gVSQB4ULbEl=NHR>3AF6iIp^}PDP0_QA8S}HbezB(_jV>E~OCh}UH=&^D
zqW}iRnEB6fC0|`F>80rL!Fze+=+NmVKQ_?>lh9KLHk!FA+b_v4eD!rIX|?&`Ch(@e
zNSjIMc02bQD0i9qd1A<b_NAnTU!Uywdp^wk3rvIze_CvnD>V3H3V+Qmr|+KkeZtK6
zW5%c9p#CByIQWQXG6xu$jYp1%0VB)@>F1Kx900Z#0`)xGPXja@Q&YAj)h|%?4$KD&
zHrO*5Ga)lI4Gj4M>rLtTd>1T8gl-&KFsD3cqHLBjZRI4A#~mpJKxnhy03vRcE?{|j
za9m$w5g2@`k!VdGS3Iyk^QUH=e^>zLWHbW$K}kg|&xir>fg-b=_mdfh78h5{R5-pZ
z`Tjh@UJ{)K6jYO5E9tkS|NIv~M-3mvu<3`2WD4&%U0(q$_kgjZ-EU7$3&l8hJ|nvY
z(HbZJA8T(Nl;!${0Rn=2bc50%AT3HaQUW3%(%s$Np@eiRAt2q|jY@}fr$~1<?DKK-
zoc-<W%+BuYKhF5_zR&mcecg54*-=q(1(e1bo@czri!z@EkI4Fr@k)RD(K;u)trqt}
zR)*LYQTmxl`#!uEj$hJmEA~?JgX5~^Q~&b*z(}x~5pnS&O(K2PXYTZo1J4GNnNyWu
zh@l{A5<$$p*Q4%ngEnz6Zx{T!G|i7jwdA6%A$iduG&Q*#QW36MyQeq%BNjY%<qo@w
zS$v{-yD+|YGG8oe;2-9LsE-1}Nz#of^)hmWEuxPVFFdv5!y26&qIMe(%q*_9OI~p*
zI@3mW?_0NAr)lBt{QS*a()!Ze)~pq^{kAWeto1?#CaCjnKs3h4m?w*_S4<SG+JWKL
zlvOkrZ=C+MCM?R;g2LJ4&abGvJ=@=?($vll+Z=EG`e<qA)Zli4GcISB<2!4;0w#>w
zG$r<CvQN4k>*hJF!W>gv4QU9tTf##fsWn+K&zF-X^7KDF3(nV+MtfRr^kG`!wzNzZ
zmnf5)GtdqjC%5xtVrW%N`W^Rhmq-GH3bW5h&Cs~S)c3vSbAd}6geogyv67#YvIJ=6
zFOR$%rLfko6+(60h!f1zn|U`Z6pQiVWj^NUO(}5rrOQw#m4|llRXtUI_)X-2?uzUa
z9CeB4ZdvLPE^KirH)d+;wbCn5jxfTraLSH|7WRp^VLOjmWNP28Oq4tpa=bvxV|QKB
zdeSn$!^ar(k}q^<+vIil5%;XR6FxPK;c%YjOi11owt=N#fZk3JWV+%ClVrNWKYcQh
zm=NzZ$@JOspl4XF%+_?J*Oh?Rj2>HzVe(H9cK5+wq!LBh&g9NYnO=(yk@cZ)Kx=-X
zCTnQejM@j`4`Hs=KPFYOXUfKgE}G}(FI#)_du6q~LxobLr9XR0#aFeI<&;G$K0zb+
zQ1yiNci91FoM_XmW7%g}&F$Lxi}XN(hx5Z<uYV(l_O)2^tlA`Bl)kRu8e0<c8dH2$
zWVnx^ZQGrrY}DL675@?AE{sDzlk5vyxK`ptczpzGy!v#x%2zTylAtU+>5tbX=MaNz
z>Y->d<-y-{{Vt`6d<iD&cvYqy6%6Z*1-n_1`*7csZMbMorO^vD13A2om<)4N^jIm-
zz9px+i9=p2A1~roqY^z4$Y9??OKZ{l$P-5X3r*%`I9-mj(pPwdrknK9XlL}=NAGeO
zbE`dkih91P)uUw8jGlEQ>k;YYl1#*f^Qi0v@2csD@co?WDBpK6g3Yu&@gm5EIUm*f
zj4`&adUsjPpzd6eGOs41*l5S$U#Oi1b*?w0J$tSrn`C*mYe>gyzx*rp@4T<=@J~Ls
zTFof3j(i!kE&le+_i4lMf%rOCm>|TS#A_y<YUsC$bydnvbCZVzh*c=8?l|vV|Nh8m
zH~98*g*FYQ5tG_NZccBqC0K{l<Yxhx0s{&|21GmWB)Uf!kWhkHD-7cOzWDV=BeZaR
zc!<OOBk#@0N>4CMj%_ZF1l&vF$W*mLm+7Pmq!XbG;w_JC2cbCjA?9&8_U?Tnwot>6
z<{U%A(3xoNk&R?8EZp{Z;jR#E^;NQMDzcSN3;b1+PZujt2~c+`LLCZ@5b4#;SXazG
z>oz>H-quIi2n)Qz7lA7&t@eCD_VUNnIHG)Yzlgq}WE#6}M_;}GU+2Svx&1E~%~?Uu
ztCuXq!jUmD)hralA!k)$b(jNe)w7*DT9OBd&Ui-nnW6Ag<2`**ms6vp-AXo2O+i+|
z4P2M)(P!S-S7a@zgq&6)6fVA@ud;+&O?1WUpG!+3v4oGs@Z_$smv3()Jn3-h9gACs
z+b)mSr4p~-{zgLbDeRrD|1qk>yYW<xZGK_)Z|AnwZbnf|yDW?+hso>b3?w0AQ}Ser
zk0zh<u({);Ruj8q^d85$T-x9Axc!R5A74$W)eVn(hVfWFM9ag01g(xD<s0Qz{-YiU
zTA<0Jec9%%wU?<^0yU}{F^d(A8-rL`=9ZO-G}t&eAr}PiiQltr6$Nyh8wrp|KMuLD
z&}1IWW)Z_NIyPMu^R`(K3K}rhcGE_q;^GPtX+@BGg0n&>;Mnvu_$60EQ}S%xyC%;P
z6Qn36;c+FS^>*6SOgEW^w@(^A?}bgt5ZztGY;u^3KR`s!y6T)0;XSiX@9N@d)WM?h
zit6$4p^7e?qd!(63;DaN_^Ji(aF(mAnqI~W$99HQ@aa`^K940rs^BN-whwD9_g`pG
z!bZcu(z!c^L;Uz-l<{-~g=QK5iStxCnc|H2GOv4mh1it#hF)8$SWYR^&0xyJ=2Mc8
zIl>}E?E@#aP>{%`-loyuRK&g$_T!tZR<^H5I$bDPhWSvuA#^7VHk{sW(AOh;>!e`Q
za7JwIChyT@a<z?Z{49!P7{*Y|GhVPWo~xh4yrU;DbILcxiEZ@5geIKFA{J9?P&q~P
zv3@r{j%@cep@l>`Qu$C1>Re$gBTu<L-uQ{UnHikKHy<*461;+h2a@szq8WaO$y4Ep
z@z+v5Ftbm$KUy}=PpFT=%5&__n0HRNicg?eAMfCmTM&2g?ltPqI!dL7JnacrfKN$&
zHf~yn8;=j$+W;dRNl`t6H8Hzh{=nHmD3OHMt#<n*?lw7$-)xR7*&&C#xUx6PRJxX2
zr9-oqhN(B}8#x<nO}15t*tn?~bsq%HST@vp|HX{$R+(~6{^~{--sSnZn5PtoFPxnp
zA1}9%?VM|bv*vIf3t2b)hWge*)}gNHx$~ja3y$WZjN`%#^aj>@<DZffeS7DR$dB3v
zdI!z4Jl|a@Rue~y)V1r+ua(%WyOoK*7_@vp%}UdwT0|=-<(%Hfm&(%YGqxtyqU{}E
z>^pr(?&>Eb_EKjaLwnzbQAyNNxLPG}iAUZ<^T%iTVx~_2EBu1zj02d`F5H^RpYkX#
z*2Lg@{GRH&RNyn6n8cP6Ht2J6T!^`hdMV}`JZbp&@i7|+x_EB&g`}XY_yxan&puov
zqbL!*KTx!Jw+Qu@UpbLV@wA+b*($306&Cg70_KD0Q0H6!{esA-4*l!b3fNT^Q^9U$
zyJAF~OgQCzweQ69%vdn!3hWp0%25eWoIT@vH-$1ah11v|t#*Pt{XdbrnAFN^m2s<8
zW1mtjyoyCRW5PF+Dby9?h_;Mer=^{RJ9&%ZRhsO%CpG8$iKzAEE9(%>n;6SZCH&>8
zoeZA68Ro`<UV$>{Pq;O2Ha&K73Rx?PB0St()fUD$5-0N7vkog#0~*tc;G|{~V1m)d
zYW7bN&s*&wG8+j1B9-~O6IWjJ1~W<R3|cef>YjNyuzO2UiCEudvyFLbO?;{A{PGHa
zcm4c&kzOcpcX6v%H}Ti<^4JJTt*l8wDeF#e+beBo*s=iJz)P6Ah2X2iaD4yT1wRvH
zI6MO1B3d|;WqHBPsb^toqKb^hc_Q7ul}j#MCnm|Vnwv8y)~0QaEAxlcmk(wRNdkk&
z<q)v;gAMDDe^CZLfxL5p|Iny(uJGhRp(vy>?~6pk@{Osz#<Q_iWp#;t^Be}h<nB`i
zedOh*M2|9{N%!ZZAh^7_Q^O7SpX}aT9mt2ng6yA`QPRB_@Pp+dx}#0PN_Fa=b>$zr
zo*iMN`SNju4kZK`PCVv$O9OEU_lY$8Sr(J{CuCg_;(N({Xd-8x9*6kA^oG@Y+KDoi
zQ1rK4sbCB1m_#QMPiVWxe(FHq8LdjJa4gaOq$o7C+5?(eEl?|6@~0U*OyA2TSGGn^
zfgS1NoQ!T*2Sz3zZT%gFd<$6kDDHIbYtg`5z7@Bno^%aZ-B=1FI7MVI4#iD}p0+>n
z_ObY|kqV5N_SK(@D?ML%g1GivKFFkaOFkdfr~eCm6a>yN6ok@iJU*l9|KAXM2wWUG
zY#F0+y#mbx{C_6sPn7>Y9^A`#Pyfnes{hSK-++!}<4ppp%KxMVv?_yS_fx##;fVjq
zA`r?F5$dwb;x&A(^EdGRpFnbL3Ub>&&A)pNe|U66$It)8&d#pO!s#|~PRhw-ML;8_
zThz<T>qF6P>{VL+1&ocrOA(Q=i`-SYt|jOw&_D+*VWPmfsi%U`^8jo>Qm<cUf+X>L
z`HTQcr&h67_8Z0MnEJ1@v`7sN4CJh=m=O>VR6p8psC}AFq4e1z<P6Nq%iDCrz`!`G
zq|2iP169O?&hma{518>3N|<4r%VSe9LTF+%NL5bZpgx%uBB!SI*VEI(RXsgBBPhrw
z`WzP*Ow(s-Y8uQXAu1ZHs5}g1699t(qyXhOG~e;yd$4^A3mL`Y8$ePp1qFrSR9t00
z1msD-1->W~kZp{MiAioyM_huO!HYT@;pgXf(Jdv%9sa5wtcY*0pAX2hcxwEzg8~x!
z0&Y5gHcj{eMUMa<K`mXLYDN5cz!j#wgr@Ja@82SbJ{=#kNti{mfRT)$f{~1Ef9PF8
zh6~4pQ4J`u`@-W$oLBqBd$AQZI3&bgovfIQ*J;~Ey(OP+JYO;9`HL6rw6iF*9CUPf
zqZ8QpSBA#M?z(KlAE3iQfd7G(L7yzf{ZP178luzom=dm*s=;|L+j-tKFdQUMq7iXq
zlJdI^TGq^E=g)gx?Tj`!Tf42qDUS*qCvsZ9f#zS%WqV&ANF;Jt67DRtEHD&9tQ!vk
z>}Z9JOYy&*U2a$W%(nl@Kf$mw!yok40M4HA^5~rnGqf$rHMq63=dbMSo_ih-Nqo=`
ziil7yrYlmbN(U*<*wxf=b@pq+qj?Ja&GE;SebJ{3m*AYqIbvb<+Kuto*ctc<eZ+!M
zb&`0K!Y2u`BGcm-l=Fig2V#(ATesYdtKr4#spM7lr3$8w7pi7Bhgg>7B73EmTDglD
z{Y;S&yg9}xQm=Uvb^!9W0YOf)YS=|zLhywP$<QOdC>+{1gJGQWxm`<X!tZgXG^#BU
zXk{)M2gZwL)}ibNd(Btj0Lv8)%OtXWZMnMzYd-z^=wKb)QAMzc1)2|-I}ZsmtaD5C
z=5`ZqrGmdbU&esb^*a1Wo2Px}Mep{I)SDMuC0W;#1G$R=zuK303P)3`M2kN-JiI!;
zRTI|WA;pBwN2}?|JSlZNF5gm%QmJ|GyPF;YE(!`?d`6YDprg>oBO3|EDP{Q$BeE72
zj1gaH0`V$7;EK2h8R(i{z)uO<{SGSE($}EIlI=b`T<P5aQ@LrB1&COj8h+GbIzE6y
zX_5EA^Kf|Z;DI8?EQZd?xa^})mt_xj^YOmmGq47@=v^o%C>0zb`cn<gEK9Q>{(dCU
z`nAq$S;3pwU_MxL8!+vm?P6BR$zf!1HZg(bZBtdh&G^K4KK(=9h6=6^4j&3hFdsG;
zu#A3izEj>hf^(if=akY{a!)}nifohHNxJU?MEW?8zCH|c-jN~}4<;MLLh!}%(>=a@
zKnniw9x~^=;2C`W(iCt}z`upq!7r?5Nq@?}p+wt%19poE$krd<2E=T1aA#x6+N#~<
z1zyuN*0SUuO6@3DkIhS(#7n2Yy+wcNx>GfwrYQquJ8)a{y_!<K`ml+^iD-l9>mJMt
z$HyOad9qbt29}n&3FJ7p543~K`gM>Z{zN5>LZy{kzXNq8-tPv5xz?w+_7}3-c3Ees
zbV>6iJ(F5xkW!Ia)+tNNwVl~ic^2N@g7=+f)R6?4XDm9%{0w>lIX&H(!E1Y%T`LKT
z)H#BXY`i_w<8&&&P;MAPUqRh7IJS#f+!1k0^Cmg>74I{?t-^|6hm~EI;CIn~XEKN=
z02Wme${^?tIo=ov6nf%)zJz$PehsqS?bNVXxO}Pc{W#(L_}Ze8usud(I8}S)(4}d*
zFuIr_N3LsMBr1&h%hkk(#sP;yTsyW`k$Az2O<wGC#<T4y1uO@Z_PGt?`9@cZ_ETkM
z;#%QW7Y?i0R~Zr!O89EE7_Gs<)i#V%Q``<e`Ok7OzU@<B%#`ESYH5JXyq+C{^Zg}w
z=?eT%6qWDoOW-&tkVU%ujx*4xrKnp^4}pk2MiG)H<7AbNXOs`wzz2Dfl(}hwnD)sp
z7LR|0uwcL9n{}`-6jaZnn5%cJU@G5jAQUXl3MBLTT+&`)a<tn2ftIu*GLZUlM3sW%
zy`a>24+J=okbyD~R~l44ox7!?S}sfeJ@qcVOf|V;ipA#GZEz@u@CA%rYnhT~>P!Q<
zEnYWnD?KpgG=<qa(^U$$efxsre&vCrZb5)uqwrPLfOA#5zMBe}?ukQ9YIh8oPRPN7
z9z7&yf5{k{JWrLPA#}*&!c-gkT0nj=%DPlr+<a-q<FFn{nOoeUIBmz6=5c$mHWmhh
zf7-PF4JBVv2d$S2!Z-V5zwT<c0m+J*`T&WP&!v<y%ZAsN{gLH7SQ2`1HVr+Sa2=$F
z=uaPf?MRo2RP_)VwG><6TSAKp|1owx#2mhII<qH-Z>5qeyjc}%z*iq`ai1kvDke1h
z%mOP4iV$p2U{zi$eL@Lg(jXEzUwj~z0<!7%Dg`_wbi)8+NXa3809ol!3qi!GJo@uM
z2oiZsX{cYU87%jE$A(P5E|Pu6V)Yv4B9*dlMPA1Tt!MZp!U5`V5IrzWif1;RKD>|)
zKAl#W0wPf`hbDmbA|G|5Jf2m*BiDq=#{K+wM0TtW#@7GQO}nGor@9x+Di>Ajksw*E
z3{Uf+#nLTI+leoM$7HZm6Rgu(vVFK^+4O||sJ?jin~c{Im}P4nuyfI&h?mfmIC99O
z2uP9*P=txtI?gmG!Rm%`p!Gz+G%o}3Ma_eG4*T7EazW6Csh8!cUqN?PMu3nKMUc<e
z_D3U1F>)$JVYkiXnrfjD(~c<xOhGuaki`*XlmgzHR#{aP#vGe=82M_v8#SAA9rGbm
z=Q+{03JQ2b;$$hv9S<1}H^&O%h~PC0$=y#?@MkE(h%g}?{;X!w4R7|QDkQMH`Mop<
z&PfKZ2svl_9Cl|_tFrDk9?hu?BAHjpJ9vHx%)u$8_XdfoY!2&k1rg=Uok}d|4s2eQ
zUmh-Xpka!xQBX=tc4W{KTz?P4@Hz`!TTo#(g$fEDh|WN}vnGpOwX?yS?&qYedg-Df
zF4s??G?a=2u$b`9+IuK1Dxx21&woizP7{htO6K4`3up8YALVh{&ZWsZn|Ie%MOs2X
zSPCRlQ>=I1`x=DtZMcp0@o#+jM^aLhSi$H@7LkKrc%6p<T}M{XlBV-q*5#p+ph=<o
z*)Dzji|_|Z20BR6yb#lgV$Gt?RYu=#LQdGzuG$K>(q908>>}182~Dy?teAz2bgS;R
zD`cm%uZY=Gzi*<ZBbzf@X$Yw-sri2T){01ia)sIc5=YE4Chbgj$a<!liGq)8fZFQw
zBDya^a!^s&k^kqPHd8`wf;dy;r?L{M;=UnhFXwd+Xs?sWbUr1<HxA<LGVbGbo)3Pi
zIM9cs=(s!RBr8ZF3tf(p6_B5U>5UHU<l;yc3=%NXPsjvEA<c{e<~^)ccp18g1Z+9~
zw_h~TaA+#n&~VX{e1n;uawu$4M1ghwI9;sS5Q|}cwmXNb3WX&mm@I7X&HWi*hrYe6
z1pEm@hMzREDaC!>nVOE~Qp~yUH39N9x2Fw<Jq&Rr72~$XA+-bKkrUe9O`BBDpTE5z
z+9Jqs8IG`JX3G{{w`w|35*rXc6e7kT;mJH)eEBQ<(Tu%>_Eu}vJzvTXOq54u>zD%L
z_-BFSco%TGH#!HM(yD-b!sOBPw}|r*@*bOIpSwLpWlcqcftt|X%mxJmQh5O#-2iX4
z0q#qQhFUM9f#f_Z;>C)vc6ZJrxHqCbrL-ztNG<k}v%ME;>%&<gcGPWtFC%qAvGg6;
zylMl<=@F*`F|L!j?M;4nMU5YPa^O4dc<KrTQB_#2#E8WOsp(U^YB(*d-Byj1D*7Lu
z&b)tp2&k++!W5diz(;hh6$cS@bp!d5&zM+x{tJtXlH8;QDH5MC`+;x3<nDV5s%SXU
z1d$S%B#vNI{R3k7i>IB-j<dDPwmkTwZ7bianH1Yr$+{Z6wlN5za&up;oS}X*aaejP
zDF}ItsEn>6LP7qS+;Jc4;X{`z;`Eo~1J7R(LXJyyzZdSpa)>Ziqe%12qR%$zvU0$n
zFnBbvqMyTk|7OA9g6&fscH60jsInCJO)Fu%tj1rAXd<}DtrcIE*3pF5{lt-!k+&6X
zXKCX@6VE^g1}Ew0*ll0E=5qCu<u+&7cp8;SF{u9LM(*PZ8D9ws3erQ|j%3t7jFpgU
z-;YKWPV1qB@k=96pGso1z#xW4@cK$FZNq7^x@V|PaJA0D&;On&D4xJ`as*blySv*l
zU%y04@~CkN148+XHQG*jncJQwtlDZWow2;w>YYXv^-7iqjNs>54qHzYRc4a-x9XU=
z7Ldgnp%P)%a82T<FcZKwnA-vI$)uQmP?)nDX~;*(f|lSDH}Y7%Bd-;$fyHXNX)1y$
zmDBjsIN&1kuuC53AUE`f_&hV`jQge`3HUaJ9K~9{{<L#M5Df>d7ejm)m%|C0t4ke%
z&mY3-ggrAU1>{>(oS%6&5uQ9ItG!+9xX&tvhb1SEH>^Vk)6p6XQ<%Pwq1ALrR>f7o
z7O!uf5p5F$bDfNp_aJ0S#}rW>hmH(BRP^z}`{;VSxSzRM%HaCiM}TUSzU9XhkayVd
zI#Z&t4=_0!Z%`xBmm&&35<~n|1o?Rr2zeI~Q&kwbzUyH#Zhrs9Co|4xu4xtrdKQ5Y
z&c#w|TUH}f&bA}13B3?!0ctFsU6U1Ofw+*sV(N=>3gxn6@-RAlOGkvf@()^rtP`P$
z62eIaoM4NpuDQ>bk1{gBsYHH^NDdjMq&q?I%@2f<u{pn434-^1O9k@{hB9YiTxs)R
z*1wEuY0;GADA)8GA7ga?S9gx(2jl4_)!z{QA59qgzCm4d3fJT6|5b&jsKE1W)_77d
zga2kzW5UzZfo2%~-!#9dv|ihv#HsK-0F7aTqNns;%>Pl_p-hzN5Mn_uje{9<5*|6A
zsSdsTo}z955-<S;#-^o0Kz;NdQ^>!c&{M;?Y{c{a!dDd+abYr7Q%mHv4F1F5@h{Px
z+*d4<k!-Z~A3th|GtL<sKD@&H-+|;afPpmGtb%J(dfy%Ep5+lhj!>VzxbU(lZ0LH`
zLR{h)TfjAW+|Rjy&pi#O;oN{iXS&i8Cw3@Z{{jGKz%FJbS#TkGx0+;~{Yl$viq=z-
z_Fmwdz(aY_+yI%;u~pO#3QMDq_w9vo6rZefBl}&C#>U3uNGP#@Tnh9@ywB#Gk2}eF
zgNbF8l<++dyJ;%{Q4Hk;^_*&z86IE|Dast<8`iG2c+8~TJeyJfR`PxkwJ9PaBZXL+
zj<Kn!sqr?jk9Gj5+0*CG%U?C~@}8~=Y7eyRhRQqK4}6~*&WdIK=rpa*sA4Ry-t}lz
zEb(VoSDKFx3^FQeCg3}h>y2kJ9Z2S;mt~k%w|In!`Kql=SgL*Q6fh3u9|KOZ!fI93
zDJXZB*>ok{$>vzd3`+H>`{pPekKJzwyUCyr2zMw6r2L09rU$_nXj;R7yQf$7xcMuP
zIukqrP~Nsuo0Vky0eRPpi;GIYO2+OC)xPqLc_%o`M!R;ejd|}jA3pP@p{2!H-QVB0
z`6BaNS?z1&y;=_o-)N@lL=XW~J^7z0{CVDYx0?^%*6V(MXnxZ69&rR{^WuQ=I0N><
z!>4b<8UY4=wb3eA3zV*Q0YJr4K<}L6c@07;rVK|jBrr~(deb|oJPZVPnp6lr)7zaE
zz#v8MeY`&Ofy)CdXB~3J8DN9U_qc$XTl|DvDbkP*01cQm$xAJ*l*AUOz7&U8U{hl?
zX9AQsD6gAeLo)tM-Dv=kRVnY?<2CKkcH$XeTLA2@yuj%2x<8J59y5Uf5B2b#eHs%E
z*nxqPosNV<qaql=clZjc_Sx5Y&$GE6yO4I$QsVE4wiBApSl3Baj9QH<GP_VdKb*3G
zPJG)`Adn4iGys=o&t=HR`MJ}z{v-)N#;LH2|NbFbI-u8k?RWsV&*+{5K3|)$+gjV@
zcem^l8X~;TyP1Hc5bIdi^q*~?)`<0p-7J=}c3Q@=JDM7oj7;`325Zhd&`uoyRaJhS
zIl#tj_N%YiYc_0&*3?vTu@n}ZZb#}TvvYC^E(pgr!Pb^|{GybG`pFZ~ylxFsQR!jm
z-p0e+=TSX9I#SrhvH9AHxQi>U+Tz9E-qA6fDH-#Wk?}QueG->#x}EhonA4*CQYF5N
z-!Yr==`AfS?Ao;ZT^OlA^Neo3IaPQ2^^q30&Z*`Gm|Q+Vsl7HQ%cxFvW<G)anvobl
z6e#epvZT{{Oi@|h#3c8!&6g;EpA(axW9punevtvbxam|aI5;>R%3a1><^;b>@a$os
zW<&fUy*wauyo@K%Ui<w!7h_eDsiO|xKBehGc1tg$-UR1KBRG9hcZC%Llri0zqXxxn
z>D2e=78!zTSgysD4!{?-(i?MMK_VJ!CXm3c5>vH)40gT){#c$uXQETA4}xJ&EZt@q
zS>Y6>^Gu*@dCKg;@}g9V_pR$CP!dNY!g()?r(^8yZ`np)AwV;}?uWvhhJb=Us2{<f
zof6M~b3Bs2vE0c>!Bl2~p`-(uo%i!&H0Led8_+=EXR7Z9{++EtO7#SWkX8y_=)@yn
z+Vo>Lc|?{v39;pgT>?hPNjV&v(%qhL5?+(*^MfAifmZ`fV*=N=m5Z#@FWEdVH*(->
zA{j~=-x72yLGKn{JBdZWrI8s!E1S=a6_TWD8Bl34_SUj&{=wF>V`G53=of|rm#>Wr
zGG=}dTQEFVo~ERPG6F#tom+JmN(RS$bGcPgpg0Ps4|)R8u~^*j3um1W7{5`6J$@0O
zBj2Wnx1Gvm`_f<bQ2Z(?3aiqv7ysKNxvj0OS%|;?zWOa-Y<tSit{A3`*Yyv(Z4Z_&
zFluSnX)c-)Y4lN2QjVIGMiLeqDdfCS{K_euiG{a}S#n|Xr1~heh?H?eWgC^V8jnFq
zPD%<H&|O;hu*<AUsaG0kg8>3Y76Gc>=@nRkHZsrSC}bvhZ_d~C<SArc=U)$P$J5L_
zn<9z^)GLg_4sFFBaf<e?&(>93w$}eLy{fl7w(lfy&Oi978Hy7B+i7Q-j*MUQdus&N
zbrIlnLw2O@xa5)jhq>n*4z^G5@*@F0pLv@b2BVgEEf?eA`(C1S7+s2La8L9)-Bygf
zCnD5an<!9@DE*AF`v^neJWcJ4!ahq}8rp_j9OkoweA9}i2Yw~2dZ;4%E*P2PGa=K1
z%rx`Smwi)2B~6XPl@a>>?e##R|3F4ucpb0>@v<mg$ABkuRZ*dWs$0OtBmsl3(`Oz;
z^IOVdO;F<UGl*U^pD4CejH(+(_J0CIL>e|ZCJs&p7jq-hJ|(|<<G>cmwUi$UBaR_m
zmZ`SH%;55ayouYvu8|0C$GU%%_1rGVqNUev^UzPHTYCqMQ&f`Y$~-Tn525NyIi;Ll
zIjS_Az(4vg1TISg=EDf-23s}bQ85;p<UKk8yt%Up&SCs6qVWgS{IwK8f4l`Q;V|Qt
zwafUh<>2KtE@_$j!@&l(JJ6s;HiI2w_zq59Jb3`0N$ondi5E5|o##yO7VbOD_tI|k
z=ig}{>20}@wX_|-Z9mGtZ(DC-HqoFIFMil~tMBpS(Z_~bKEnQt@`T)<GNT`Y<k_^a
zlyRFVk>L|yg`K7nbaifzc(bQ>Q|9w?avJKd+*1(i3pU@4ai@-q+?;MG<W#<T2?Gm{
zxlfm7PKM62PVP)1N<Z;_zj+Ji^EQOsM<~{3;Y`!|tkTbLr%>qP1J0ZM@b6S`;4eNH
zuwf|Un!?UI({YDdjeFUz#l+z;h0>ygc=j52UX5pmo4?ajBKLuTz6|{b)5f>bJ^q0f
zOK{-7&wPYl35m?VeSC^Py|f^^t{RT7`xx{_2-+nf7+-G`cp4S0dWXCXr{O2}PqrcZ
z%}FF{8mazH1CA&*x9<?5o0MWKWgSw0b~6RF<UN(1wNxbuu-z)Esh@dOz(#1``2$O0
z62oi%fipo1IB*M0pyU9%m2MLn5H_FC9z7#>a96hGkGSt<6kOw;xZ4L7SB_7bP6=19
zkrtf5;ZXTbVzmSA4+jFh0P7I1+Z@5$ZVroCo#oDmi22y@!;=YZYxmRbj}3b)UI!@d
z0PrZ>5+5I35T0dnPcP<#m6H$|)PJ!PP2R6eX?ea8AX48jmn)yK&AV_B-r$~7W1qbp
z10BX$56;#BAh_hHO4!{k<c+wLRNYba+RV$@2K>&puoa{~dH47lfYtLRc4Ecz=44{z
z)@kv|U>iEWzsq3u8V-nLIRFV`E<Z42V<iY&ZNF&Psh*jwerLpRvG^Th8yL%jxWpCk
z*<{kJWQ)ClJSxBWd3P;qqPpcEeV}(id^{pP#X%R~6y2irUcK6)YOFwc1_&u*{m$?z
z1zG;FYU>43w*=!E0f%3V{M}|h%Quhvtx1hA_>a>H<|DkX_1!nJJ{2}M3m7?$88+Lk
zNNtT3d^*{ldJ${9+Lw@Bci5Q8`GN@mjA?<pYx|mdzz05WM2ZF0Ivsz}lhgL-?xe)q
zk-tmJdIW$!Jul|=tJn1h9o=XbXJW~sspey2V^*4mhK4_?_kR{rOUKue>Uny((p?jb
zhp;qHLd|OK`)wrxoK1W~sqg3AJRe$3mA5;*x$z@n*qLvd8Ix5YaFgV0mVcJ{a|U=!
zTnZi>eU>5;OZvdu2?#J|-w3w}9uJC$*d{gZHeXpKJvR)#I-6Oz9mjhyt;K-Tl>O_5
z$$!GNJs5BNs|ey2V0}H`6#sd$axfw*=vXqxtXVH=vC!aLV!AF4jBu3WSDNQMzm6M>
zL$3i7s$@nLBB_f`hT}Z)oRu8jM?A(<KnKU+ysKdjAaPQl!>=D7v%RGf7gR;K8aZ*9
zFvtXE$BQ-1t(#8bdtaCiKe<|A@!m+;YEdynvHXn$j?`c%T)lMa{2umAWy<b`ep3xz
z&y|(J+}pCp{BD(3v!4aMn@Jo;<%=Juc%G_Wjn_0A0(MrTTvcpO8co~wpE6|Io7eJg
zS35O3hrKK{EY0WNn9epvIuROxQMXoo+;|+gRV)BQ^ls`vhM^$crM=wR=rhcd;2P7B
z4l^?|jZ#ul%&l`20_I9!X8i0ma0?c1=MA^(;qL&QbqWHFg0)M30<C8Vue5?!)-6L$
z)^q0cNO&(#lFY!AKe?aqG7X#}6z9H5?{n7^|3iRIs|mC{hDNux5qgJCKWZs_yp4A#
z2K#h4oc~lsz0swNh}pIcfuL5~?OX2>zj8!%fc(yE-N=bUfyIQDd(jM^_bt(BMXKhu
zRc4M4&!uD5YdZ!8h9h)>GuDi@^5*{hsJD_o1@9VfmdWl)0Y&k2*!z$365f3Pvb9_(
z+3wb@B{o;NwAndmF>Uql&<b9BH1+5Q$7bD22?Zlwp)JT!W1Iq<HyNx!|6aE{`PNb5
zHoLFQdq&@w@RERtpGPPpd{C&PO4dv`;?hn1Nff>}&x<AxD2ym$6<5>dC3OSj2#7o>
zaCVL`bo~i0I%!^iUi2Cs?>9<}#(lbee(A5cCbw8L&$g#AUv?s06d*_nIEcRr)fE>H
zK#AX!jXa(5IZGQGXJ^{^FE6f-XRHz|GJ;;-xl?FaVE%RrR*W#%YUD6Ozf)NouU!G4
zcf#>)z};a<W4D$<_ia3GkhXn4yVax7J?}erci<e^mJqxId^Uy3q&F|^+VPYpom;Ln
z8`e_XU$;Q=GTwa`Jq2Ep0G0^l+VIhY7sl+3#S;xIrSr}68EdOdo$h@mr9dtK>TM^v
zd8CZBili57u4jRTWdd$7^}yoUREQM;_-(Vd<i|O!Zy1l~-S@;SBDA<xKkIAQ6j}3c
zVhwV3?6X-+mhOwCP=R?>#mX%zvK&9c-Mq4*nSEPE$He5=qO|!yP1^{{YCZ9B1h^Z6
zoTN`)Y<zK^F9WpV3Cu2s0zr<#^ML!?63`JtJQuz1t`=&vZ#I>&)?PUagFX8otU_SX
z=fSKl;CCjp<qBg_e2goaOE4vkT)L83mV0?EupIh=&{5~&&xBHyyjhAk(0iX&t>7|s
z!*@2F%YCgMM|ByZ;*w%el4sy8os;TSj}q_LM`TsomMxQH1l%7eH#;tC!>{0)c7bo!
zO7?a`^6adjMR#vcSQ~w>@n|4GTTMzv#9o$rC02X_ze|RHviq(0d&4iU7oMg+_`Uyf
zJ%{Av95|x5^oZ?TNcmefvXd-;s)8=8tV1JB81XBNGbBz>J|UVUX$LBq>*3sF-wBN;
z=V2~5zgUUy6W>WEe=A5Qc+~e|cg@hVHGhJhFY7WPQ%F^^<%vtTdogR9)^KU^>n!$y
ziCPhA!kz<g+Um>tHu=%X$cjje`#$R`Yq@4!abNi&lG^aQEj7(~2?&mu*1WEgXZ-0>
zCM-8Yr$q8rb*)O?{zBrDE}#+5W{DkY>d|Tzy`Pe$64@}-@lS6YOT}sT97`w~F2%$o
zMI27N)D;z1;$t*hR_p5ekZz?({b?q-zsLX`-EIN>7wp#OOV`cjt6h7|z4~t|3l5U^
zf_MW72>MBx@3469Op~(&a%FioGJ{C2J!ll)y{q+X(s_+Ck9c+~)7bSiT}~I}!9#Q#
zX)^C?+sWy!9KhmUe#O|d60dG?x;=$OG}e%PFiyCe8-g82YeJ_=birgTH`8s+Zx^L4
z!hh^0U*g$_yT`t=W-Zw{UP_KoS;jngq;<CGb91$DM|zn<K{W60MPKlVEnILe_C$v}
z&d-fNEH`?SbfS{_Qt4}%%s<Ga4+Zz=s@N-TRJOAIm4<J*mpHntmqj?2UMx{b;o}F#
z301bs;?At~yJ$A&x`F;=9Qr@UlCl>?CoXakry5?dG)}yB91SIuAa%`bz?2g-XE1H7
z@LC-=-tLN`n&UFoM8&I&EeyMk=M36$0E%H9>x!0UG?V*9;+1>}Z9m7?B{V|8!WOLl
z%3qqZ1fI8GN#5PYk4j&Qe-|queEU_ElPy3?<VAW6^XIYO=$s246-jSYV#IQj>nD};
z^Fb)WdVq*2$K$ZxGaCOOfj9KMzR2-Sy11K?q|Xh4h-y8jO>^q3SvCU%4}Rc?I36Cl
zF+hLZMHGtE&edAo_ZUylG&SV`XM9Z(T<rdnR0EEs7d)mOzsYX*5uF8L!^o5{3xtlN
zBuGC#x?QXbOzqvX-+M&pmV1%TzLLb8GHipYNscFgQG8f!Hr9h?J?gR=!d&0g51-~E
zD*PcpoYbz1g1L3y2xnhCWpyAmH>}a#ou)hf{p1@!jNaT}GQi+oZpfl-FKG7pz1!)D
zbJ|3iTkJ{J>*fCMF~+Iu>~Y&*c}KQfX8j534^9ZBK{CWr23F(I`pNbAazulcf#&a=
zr8k1tOBi#ZEQwZcT5##)Zs*UM*Zfv026!0QG&mb)^Z2ZXYy#6i#}IE3m1U>O5687#
zzMrUhCsXm2DER5;v3C?pl7b5^7vCmwjx-i5PF}>*msnr8RSfaW@dtc>Vzdw+PImcY
z_Y5~9wxUnPJs5kip^7DX9t&Y>_`S6A^%kBqrhOG1T;_fDF2lw-a8s|tWzhuzYsKZ1
zTAOHjooU9|T%&8nmf^T@F+r&4nxx^Bb%SAf*jqa7LcWX9H)TC!&CIWE4}jSG#oL}j
zXkU1)z?#-U%<%M0{ODED+0Z(SmT$u}=g_3#9(%5~FWWmRrR2vK>I&t<2DT0JI*qJi
zJVg&(W9|WXqO8x^+<Em7$0f`}rQ&AP7_M4kJrmE$uT|2Ghk!hHBkU-&SmG<ongZ{N
zg8C148L>Mi|4!#6Uo#if&xP}Zc3-`RBqzw9Ajf7Lb*iI}J_~j6H{kzA8xY2p+nWf&
zqMAjpO_Y4eDMC)+BczKAUu|6XtS%1^`i>9<#Ka}d%17uWjPEysG~>Gcna_lj_lgAc
zpG-QT(qtOq2B;{$zb_!T%`k0tOEs+Q_gnH_gLtLjqr)x3<s|ZtIsta-Qx90bm2cMi
zW<h^HBah4m-zC~?2mJd)?i>!j*MFg76!TwIgj@!E$F?+y_V1IleFR86N=sNC#h>2?
zT}}kwnSLuH`uk+Rok08Ztym5SV3}@oJ+hdowj4@g9I6&iP>r$&4JLEKBK%c#Ja9h0
zFb)qR<)239{*5_uv=0coG-@n?tz}nUxZ)GG<<a5(BS!F%PL)KAl!CUl_0V0SgOHQ>
zA64ly9Ke=oz+l#k&b8<hv;#`lRR9fo%5g%|xWf2nHL%D{{`iP9w`QMiiG`?3AqV>E
z3s8c;yiK8CbA3I}45&r5Gg<ci=68k!lX+7$0~ykv!9J%NZ1MIc;&ZXdc+aF#+6saw
z4D~xgZD%^dNz8$jwE|cqRnslQ(0>HCLSo^wpWyze@qt?eH4@ZhWWqrF<uGu7ngGL7
z)$s7!f}$eFw(<@!Iu)yt?64|u*3~Lamah2jbr|wUci+uTvx5BmVAaT;9;t%d+@QL!
zxLf$d&B7aC=(7OGfA<Fnr7Ax>v>UkuMIPGcIP`u%yb+iVXJssD1wD=#uZEE2v=DkW
z*~iJWCW_|@wOhQh1z#bwBL|)28Wv4Bttfc8eSR<+go^-%cV5%F+Ml!okOV7#bfPRd
z(ZFV7@NJ=DPTV-{^teaWKnvB@rvrc&XB{sQz8)VlB7Vj5h;IXECL|B2F2%ImLlix|
zGn~ISwzOP;BR(UL8w-C1Q;59S2M+BfxiB>a#GPStk`Y~_cpPrzD7BQ#$1|$_Vupk`
z!k-Y2xD!j$oH$O|jPHknqA9f$Q6xMLrNA6KHSmSkvegH6mvz2+)Lj0Yd!j^pk3LVr
z@v>cN>e@Zcm|F=2-s6j(Awmxb#gHa^>aI96h`KW2HMHQ;#K#9cCLiH(O+duR8eF~T
z#pJ5CkZ<|$eACtSULPqPiothRVDaLxSrl?UNJZxGymWvPd83i=jAC0#*I^s<)q^83
z-ks$2a&L{;Q~x9;R$CC()EgV@>qTX9BHw_8=TT(78c2Mnlls|@S>su>ty(Vnt+$C5
z&I1^N173n4pRwJRJ1^eN+zgFU4-kv;WG=qI&1U{L9P0O1R=Byun|R|0o`ey}Z-&Ku
zE|G#lZia{S$^Oy%o3U#_V1~?{UY2}@_!NkO(In?L86-bT*jkaU?C<@qUkVTRn9*D#
zxx@0n{@pTxwC9ZgC;zNz&Q0z?2kv-mY-KfY{?38Wq6HfYazVySA@O)he3P;KEVReZ
zKOEGFT@$8lLNXaZnYmx{f_gitChCRPg}p^W<Qdd(D?eC}(K4Pgn1A9@NG_U=(0ycU
zqY?&;AkC#)ejLyV@DVydhJUW2BpdGL@Tv@fjZ})0M3UB2a8>P%M7U?LywILVnH7&*
zDE=taknvQ>R|x(4V615U0#9C<kDEW<zS(T~0?M@m+m7?^D2aOANA;5tP|@(mMxyOw
zLf0%qUh}lo60mTCVls3^ho*u%vT4cqWW0YaJE15fOvW|c_Y9L`mc=cgaD;Z2ve!<|
z%|F2DzNKz(ImHkmFbBH%JEmUb=hHhAZM{RzozY}yIn7Y!#$!GF*DzxQ-|Ko#KZxK4
zeyj}ayP03@A(qP>VMyj*cY1QJrz23VvF*yR{$6|#B=|$P7P$=<Y-ORQ@8D27)|3_(
z7gvL*J~iOPnCq7UO7WUovg1({2o<ZJQQuOUK#tu|443YC_}8$L76tYfRrIy$*M@z%
zXTZ4n396f)JTuSr@1QnM3eZ@8<Bgop4$H&eb1_mKi~Hxd{V0S=i9?-UHQ*xqIJTwu
z=^_k(8vu<&dZxC>G3Y(*pE>mLv4-_CTrg;x74|KIGrC{2`w13Wg|BU8v5zPId$9p)
zRVzHW#S4Y=(EqN04|od_|H8OC>aP_F79RPvk8m-<c-lL}KRp>H7<4F1RPB+Di;Gi|
zmtSH!e1z$1QH{gj3v22S?EBwx^1-^rzn`Fqh5Y%@?n#=Kfm^iwhrQ*>DGOS+cuzJ|
zRbc)2^XFh`ADz0|>7?oZ1l>6%xyq@pn9|?5gYo@^O|HURe41VTcf2rg0`Sj4;g>{q
z^TO)t@y*Rm4_x0u@K>QFWT062hWI1bxaK{EgW&oKiN9Z&Z*u1?A08g2Ov?y{zGMfh
zS+>)}N%K<%{ocfuhGf8|LJBGv4sJ@gLalH@kacCwfA;<@^l$TJ`VzNDa(e%E2^Rhr
z#Ku>f_>mG+gZtAhq0&C{zvF_o!UY75t&U3Azc2W}v^_8RGw}Pl{sqBg?DW-T|Jwp+
z3%<AU;eYFZ8AJtk0Aj${e<KH<91;FIf8gQ`2V3j^sUwe@<{XplO9}t}co)hase>F>
zRbD<!Pf!1{mk%jGh-2ns%8E`Uch-MD07-)Zi)?`#{P)b(Vac&P=kKm7JF_3Z-vM4~
zH0_PR+gk<VGc!LYS^U>mVZ1K0pNB;?^Jc(BR^H3p(DxAa5vHykFfdMnm`139u@acy
z#VkU!&PT}Z42U?aN)MJhC9I{)FM#Wz1}IEF=FSLO&i(m;W2v~$IN4Tw)?+>ZYSRqo
z`UOeiam=p?miTvBeED#@%u268@v4M}1~ry5;~;{L_!l&$X1jXEs^ap}t>JXqJmz69
zna8;=@0)DD6>ywYEiH=}egZ$Ic@n2}HI6JF>pM{I`E&{tezF2uLg_odmBDa6;ro>(
z7l9ihVDl%74;lQ%?h-C!giub%=q`4*rG2;Q7O4*8x)KzSAoR>T?a4O{GAI{UYBjm3
zf@`8_4DITTRaXm3Wg#tc<%xKDCTG}wrTGLi107u%@c+z2Q%h@Ll%=@SH6oq^w^B85
zBearw><e30xPw5MY+msnJpukuxm;~A^=n`XbaB1k$`yFOi#?Y3SBW?*N`d9Fq5foj
zh-%fV@IOe{RRlc(vH};G@|Ng)`>jEaAa=64X5OuL^=GQJ1c_tp%qf_l>6+#fCikO$
zP7&9i+-t;1yw1g2{z|31w!cKrWFG@R=~}g3J2KSPsc{QRq0KOZkkTvA&sn=v0Z)xm
zcTf$hVFl+6R~x8@W&j|P{hb3T)0HHT`1v667X|*AO+0IWe#S;eYjybf$j1)|m^DlQ
zq+&(uKfgDj<!PM&cW)Q2hV@+i7zmj};DuTx+dr;6n(o4Z$L!+u1*cdYm{GCO&w3i9
z<QEH3437M=3zfrhC^2<>Lm&2T>W&4zOn10G=xp#&)c3(-G<W$9s@ZIVu;`DFcsw0w
zm@?Fc$$K_yFT>w}{5c~AZbO=-Y4l{f8SIK;L}lOV@Ejiv5rJ4>xYfs@d0h(JfNG#*
z=UlzR-AtW*4sWwtfg?J?e0}au-cQaNC&8&89NlTww$mSO1>i~O9B3whAaijA40~7C
zx|$GoMh1ou6(d+!_(NqOf~!qyHSJ$GnnY18?3urz7m+RsxLlOdJoeiVli*&mm?m4h
z&@(ZypA0vHEwKB3`6F%0y~Pd`G9^ywAK*KBtw3HluY>m81%xF~R=cABBTG1lH0}Y#
zDVWcEGf(Qt_rO|K1J~mRx005-o4uJ5uM-CA8XEr1WJ0g6w&RGzHa@)LgI`6c!s|S*
zoRkA@&K4F<DBX$hbb2>H{VaPW!UuEZhQBkPfN+na@*|)%xH2zlVnnTtrJX~&JcJCo
z9G?!ivJS(ortDkDeCocMV5~9d0Sf#icANy{Bw5vWXUnEq%>k!5?(2Xxg|xy<Eg}}z
zpX@Y~(w9hV3a0&=CE5PcY_ZEADB4j!Va%OaKtRn9)QJkvbX|$FQi=q)zLgY&-UrR^
z8h9n-BX$bI_^uKRx~KCXy}G|#F6c0)vJ$d*a%t-T*tHTzMTn;T;_&uI0=vO4U{|RC
z^`rXcU6#W>ypVIj33L~(K>t0LZFd)7&n7|mY`?&CPXKreY6AtqrJ`A9UAKat#P9AT
zDsVz<-dGh7zn(6-Lh+xP1usiZ+g5JW#<dcwU;z*>v)uULhyCB0xjAKCAp|Vd(5Ml%
zrlby0i5#l%M=Ko+3&8ttb=46@G<V&R*m<%49X(_qCCX59J;z5`KY#4~wq_>5JXIl&
znRpmg1mCbGgv)xK&)F)>IfcVAvEb)F)(;sOiF-HI{Y4B(5qjfi$hzL~1X_hq6V%qi
zqDOwt9_|bx%+V^eG<0*mI3<$U_pw^>m2;kzWq&*Z$sSp!fr8g<bK9cJfp|aYOT7U2
zq6`pp85woG$~syn5z!B2cX+ALyzx>LtrHqM{CYXIDYFsmCOZ*Hwv>zX5a#Foc3)9E
z*c9g$+urX)ilCPP?{j@!R@2QtMv#BH7A|D)$?C-?X@Xf-sDj`GOw}$SPN1?~o%cL)
zzs1+Dc!b`CDaJA*t0%4bh@2h|kxmB9l#u)LzY1}<d6ZXYCE~htN)2_&l@^d%_Zxj}
ztp#q)uXEpy%;>q%7?5P^RpdDZ<XI{<*ASMLT!CZpudoD~Q{ls2ul$0v38IL?n^Eb4
z6eEPZ`ref6fRHzJwRI8>I;5Hpot%9Casgz!^lH{Su-;JppVn5H-1z&m>*#f}Lo6!s
zT9jXGF+aer+&RPiE%BcyZ~Y{s;~t-3{`Kpl7(ffD)&Kl&AArE_r-|g`@9n2)_5Bak
z{C^YMk(>nQL+}1dPa%7hcgo7Zkf^xM20#~<!c+jq{u5v!fr2Re>Ct53zrtLIybBKK
zX?2cI|LWleib9;CC@pkqO0ompZ}Gc~c!w&I?J6Sw#k4|clK}ID6t(BE{5uq(9soY*
z6r%p$zw{X`V^WPTzxm|k#47CUQ5Cmd8Bma|rrbj(yWsw|FXscAN0`jbdneg;0HoI+
z;5KW|)F};ALAD#HAO!02S#lb83jWrg$xM@j!qqHl&v6movRmL*8$oEv+bv#n19+X;
zy#SPvoeT5$cgnPopBZtpBo&$ZE0r9Ax_3ojD>cIzeo<`dnU=lEdG3&5N^NNU7cP+3
zfF9MI{Oq2>`<)-C;%m(#d1dPDx8iU-`4{#cO8V$Nx)@b^%vjJt$4SlZc$b}=<oTy>
z<aY?88>^0ut`Yfh0UzBa#7vvc_>|dcR0iTa!ha^M>ova%9v{6?;6{XkO6Y2(Jww2S
z-<xZgaJY%_TiVwFMGBmXhuPWLt+3%(WQ+ZbfT_j<?JdK<J&c4y4jtPVueMY-AIX-<
zcupU58V$F$GvmzG*D*$K{K6K2Sq0=qR4}QQXD-c%Uz_&v36YNAOx9SJ0BvdvxVO`e
z(FaQ>{18wIfkP9GMZ@UFE21cpqnBxl1@RmPU6@;-%(zzUr<YLteL-Go{F9VG;t4}R
zaSRC1$+85lM70{LFEKvcHU#HbPift!*gPA&I)ZMyzyFkPIuNP5<o+S6+8rXKfN<RI
z3H)X<{HRw{K0>g_x$pN<@2+z^flLfD%XyOr;?<@=9d<%X{dVQ$Xa&bXeo|0)&;Yq~
zY>QaHfND&ijaqxr&+ue1mo{*;5$@8d+U+E<@=f|pr67{89_HZH5V(XwzUGgD?dbt&
z1OnS>R9<2VM2s0hJ+;!zbx$hKX6x)NLF^ZYVGr(EZdw8^-6H3rVk>w`z!|_j18ct+
zpu3*)rm6K+KZBft!py#<v-x+)%X5LKQ(oYnA?kRX#d(svhg1IGpG^yk;{q<tZ2%`7
z+YX^{Q1E6$RuhRG-x<U|In6mvOo3bpV+_ITQki6~ApoaRk5ozgMAtc0l%~d9%ND$@
zrdIp4>+@X*ZrPoi*1uU=E%}fx5Irr?W$}tW^md#v@1Vc3rMf?YLb^z(#9V`DZMpgR
z<v^rxj}GOSyZtph;VG3=1lWOmp4?IxyLUuruyfWeCB+m&1ThYNRxM%}8b8YykRt{8
zVLgdP5Zs_((EDafo5N%<Efevrz#J%tSz~3D|0$C<5?~RiZo-F?TU^Y6&|3D^&@c<?
zV34`HS-7+O2_VLImZDA-5C?Pbf#0g~2DNO93Jd#~%nL06s4=|(Moc}Dct=yn(^pCw
z<p92m^Pev5#CCio+IjgCD7n8>zxsgS&zsqH#Dn=qd}x*vV#qxuH~&a(2yR8|@9r2)
zi4io;*~M((29Sm`>!NmZNjNu?M=DoDYp5hNFf^XP|6N%k!?=$7-O=yQmvkAGl~r4G
zS|HHtJ8?i!k@Z4{{%26tx5{$1b_f(2TRMD!BA&wbto<JK?lYyO=$D*v%?|*lRCP{@
zThHy`r<O^IK;mC+pCW)ymGepr3hLO5H+9}dR0wE0@6MV&c!(P0%r$<6E9X<FT@R{{
znur9VTaH$2AK6G&9I?~V$?F=+EfyfPK^<M7=CG6Z=n}BE)s34s9AZ5U+}gjtjnf_>
z;1<&9oMy*aEHpPIQA@oL3nS(pW=nAenSS9$z_rBzLiq?r@iG*%w+c7-CJI%Te?^TK
zNta`Pg3mWrU3QI)_RQ#I^Ef{UE<*)6Kf#w2e)oD-MdV=i4k;X;5{<gyqKQ+Bhdu3+
z=u0Icd#=SKcAj3`zw1%!1X|A27Qx~0qe^S&F|9`Fce4c`aT*jj-3E}*NufJ07KB*=
zmrTc0=;If&m>s4g*$6rNt{Tw*x<ZlsOXu6(@xgc@gx>kuDUFA{?P>x0KCU1>?{vr7
zduDD$R)nRT<muL4t;!6=B|qZ?dYynbrWT6uvmh_c(oh(<I)X=nUX5QsDB<o=zHF+1
zmDG!pcOVb19F)eL25EkCwMNA!2L{bv$1|`wMA7Sd0(<yVQ^>K3dI7o~b5>$^eJGz#
z;6~v$!KK(QnWk}!2752-g|r|hugi^U2WMM`Bsqsb_<^|wE}128&$ktK&@#v=MKpWe
zoK{#D+FxlB<fa(5_|tl?BH%vT!qB*@mDXPM<fi;1gFc76a9GOVY}ew80aZxZW<MC%
ziwK0Fuynhn7207jcAArn|EJCyXb6$m6DFn$slZmeJ;$}FNBnTOPAR1+n?>qzLSx(@
zF;&3TR!-Y?9~uM$2a7-0o<0BQa$V2pk_L6C)A+IPYm}$^W9Q4jDqQcq)Mf`P!zl45
z3^hiC@>&Q#>!g6}iC$~`S9W2cxCoc}{o2p8?bbs6)*cm=btDy^A>sLAz%d=w=#j?>
z{SV&>KP@C-7n0wXo>51LBII#NhVU7gv2ebl2zn=vI@La1V!cRxA=hTdoD+IvLMLLi
zR+mk}=UYN*f8*A7a*-9e_5AncbyNu?{$3uHGqsM|PT{ZpD?b6&2j+%kP8l)b|FBFs
z6L@54JMdo!QzR#lo3118aQ~XAfDvK_Jo^8wDc^cJ$!dn57k}*_zBYfY6-C3Ee0ALN
zK~&FV%ctG|(33qy2l<OIe1rz!*HzKgLgYyQ2+*zsAGfFt$$`h-J+uS=w;<^GbVZ|4
zKOwNuSJl_o>)B^Eg9Q<K?F&ME2c_{80^*?m^@0GM2f&G%0!NT|?KPV67Ah_K8Pigc
zo6b6n1n>gy!J^4Ss2U3NCi4JFyH}tK03aL}5Z&9}$nW5v6Eg0Bpw~P2r>y_>7zWN3
zYN10%E%<N3f%$8d9kl=N&L9Rp5Uyv1fBYWM``bq+VdB3Rpp8J{ms|fc?*O#nXQ=hy
zZwuhnA6Von;Sau>{h1gj9D&5UqWx<V1;J_(z;*Qhe@A?=A&C+?8^c*jT3S}%C|IT7
z*o?-)`%R-mO+wIMD<Dta=1b%!B)(n9-cI^Ix_b+tEZZ(zR9-<zL8VI+krV_8krV|*
zDFF$kq$QOONd*)E5l|G64(V=?QbM}BrMnx?dO*}~&)#!p&dk}f&-ur3zW?=&=eeId
z*1FbpUCUsr8kuS6s^J9%JqZa3BHxpelCpsL+r%O5dfvC*>W4wvb6~m!xxPHYlOi1c
z2Rx}8bYx@8A<rtwPHzPn4j&;&0=s{>YOJkW699ftK6@z%%(!{>*8Vh`CCx$*L>hxQ
zpaU#O_;wd75RQ=a##7teu&_=s^PHP<L!sa~)@o=1C5R4aIxXhWGI&=<$BA!eHr+di
z?qPGlHn+~;Egj9@arhRCZ@b1;d|W7p!&!YGJV}P~^ZtZB++hb{3q;FSKwvM>*a9+L
zE^J6jIe+meq-XA5JgO4#DCL}5!t1tO{(v#}0AX(4E=gKoO}>+Fs~m?7{en^`05(W%
z$wz2^Gwlq|+><1&6A@HF3W-1MXH3V^Do(9XvCs=~@E)wGGgx0pK860gB~sS);b25(
zmk=To!a{r711vO^@LA)|(YjAplcRsmj6lu{;?>^-w!myi@`elZv=~SgTN*D7Gd}-y
zNJ^usy*DgS3RI?a2Y@ryfgfWR+^=QvsmPnD@x$dueZ0N7rVGhFHhoZaV-B;cFU|tm
zKgsO+bbBpwgeOaFBCuD%z*foLoT*hQ+DXnI6l#q&Qq%p4saXxZP|<5*FW*p2*L1U-
zY$_|Tnj`NCofMapOx|11Ey;G=+s>z61F`$d9%*&gk?ecdtLk+4qBThx9To<PV<S#+
z7#Mge`YeuC8s2nR+5u^(>W=kP3*GZTvBp+gZ|>`u%!j*8wU$e2R5Pyp2*~=LSOgr$
z=f9%aKiM2L2PkI7*2+Zh{o7PyIRZPgnd`}>4z-{Wsh1f5-0Qq1>5C5_@i&=PZr{HP
zX<`QWlLpRj^_rH<*(rjdGEQ#NFc!8I*R31kJNV?B)i5UG`%@|p*Zm`Fqs@KJ2@SMe
zO&LmyjjhCR8%9g_DS0|9LUC2sYf5ik{nvKqe89A_(`1B)MA;gkg_6Y;fR^dEjM!*}
zFXT^9^L(S-#c{Ke8n<ZRo%m>H*j|`AWCP^7`LNtn)YJCc!1~Y`2U7ae;{6(ID`@xJ
zjf8voPJ25W)@yA|@3rUrCi9kjJ|$Y+(G8qj<NZx3Gup<uS!S?0D0;zT()jg{h$3~z
ztr#lcP_g&Q6fcvX$Tpvl>V?iPst#-I^PM4+=K8$dhMXOP_DQ2@4Sj4kkW$^XHXM3n
z*KyIn*0$irT}%1!{=Mk#o0J^KNJZ0_%3n-V6^}-_rTONvCX>8B5XmR@?jec8PCO#8
zw6-N&RkfRnNvV<&u%6~sNP7+hvyXNb#hiK#l&wu}&@R4$u!)O~v8!o`Xp>=4v2hB@
z&ME}tjw)+Iq5l(fj;IJcA*#3$_ErCgpknxD#ku{a)vLv*3m9LU8AJV-8TA!ul2#Hf
zx80)%Z8P7CI=5F%#+c^>v@sP5w~5zlyP&(zc!4k2B_+6}E%$c3(P`hD#4E0aHQgu9
zGTn#lGf(iGZyjrBVUPXpCUak4F*pL`v)OO+iSy7g-!9^A8!U&`!jA{{=B-tC1|ff#
z#|i9Vz8<qo?!Es=k9WDaaiwV|a{v8@4`Np{A*#Zp@jZzmn^RUujYC~>XtEO@^{Ma|
zyh6A*bzGICO#rwlRv>A51VMU5=J)50b?jAL0O>8*@wcB%R=XDiLr?`t#272~sw=^o
z0k9&wb2Q3aW$@QGN`5))w5K`}t#mmmPKRvgt7;_|4--Jx>wV43ZeIQmGT2VRk_hCu
z2HPhpR<$4EolI@v2PJ=5-2W-<v@J)HH3&;!VEA&VKSzk|_$Ss^57LqzlS1gJrY|JW
zY%^(?l3$rzIP6Yg)RXmO{$451*CjlX@Y~uZN~G7GhT|0UW-(e?HZ>8OGI)Nyb<rTu
z!iUUZ-zeuMN1@I9Hr*}tAi|Iz;uRiJykmqLZWjv#<5}nr$1z4N6EMbH`d_QjJ3Fm|
z;kZ#H{ISdAl503>OqNVP`3JHI+*EE)BP<8P48Xv3ZcH8Ly)Nu?LjG8MXfsgsDlzJ@
zFO=ImN3Gb`lFv+eo1emGCGusA=YbYx=8}zLbbGi#@macS<knwq-Q-nsSbNYJ6-_2s
zUUl2BitMUx7ci8k9M3onxtvs4q@YT>$TR~I9Tg3GkXm;mT*Fopv^7rV@8&HzzcJBy
zRP586#&Xzfag{7HwI1%L7#4p4)pq+qY}&7qwPe#m4PK)MlTR|N-hCd_azC}dK;LcT
zp>4I)SIqb-va0KLCtdrP_SmaV_t5u_-c2NAboE_lQmd}QlItF{O;}@GeQqc1rKd7!
z8Rv+EE$1<#2R?r)>q($jc5$n`HT_~Q+F#0`rMWm!p?FB*<O(Wa@9I<b2TA34q}NK5
zI|w{&#BZKyGkgx4eb;PvCT&K%;(Sb?npp)6=gXV6yRjg_NR5cwwae{ASmzejcsKLG
zlcKK)8&6c6yY&_8ysU6^jx5_MEZ;z}Uz{fV{8JaW+2{=6kxo(d+Se)YZDz0hh`YUT
zp@7Tq>$Yo*CHY{e)bb;rMefxk&W2yem`#Sc_kX+l$;P|#I_u2u9hu%G1if~es-v-~
zKuOxgY*p025$!Fo%z|HwnByB74IxOYl0^O3bDN6QNA>U8XyY_QDn!~2an{~gyXgxR
zhdApO_WHZzdWpk$)9F;aX3-QAN$HJh1=9(Meb@9%d3Tr2{o3@PD2NPIn~Ms+T~p}G
z&TqPEzA$nd!<amG7h-`zj_SI5)6bqq4UgR3;}-&y!CH%GFDdLUU?ndQq@zK7>uNJ=
zbCnnCZ3q`O^JUX<8qe)Nhi2~`P(kF8xRaTrUu3sA%RFpb5jMjWqs(07ME)q`F7HTo
zgc@xD=KY&it7CUF117uDD_Q96z1;)-Ck}%+n8APmL(AJ;I8gctN!{s9Ke~0e2}x%q
zJqve&U92y_0N8Le3NDjyuV>hkXtr&JCnVSMt#R=lH|0H++=|6X;fxm6av=I<CvMBN
zkmfF+&%Yu{qN*KqL)hhuYYgb`dXXF%#aPca7X#$rLGSGK4;AOyagtZ`lhVH8GE8>V
zUncamtzp($&9L+Hz$F`DU2eg6Pp*~tn0R<a+|U+bnmy|vmrFj+G2B{fTjjN8v-Dla
z+&H|jrADyb>a`_{sp=|w@tPV{a3)oe`4l@5U#i4_<3I+hetRkdc0kES@j|}F7HG8$
zR=3yJSE#vEL`uqSemO4thegYuD!!xz!}O+rK|!Fupj!IodyDihx`s=BisRa;_t}IF
z<qVjF1;TIK3&-255~A%WxTu2sbQ5KcC8)_^*rygPd*T#WM5x)w(oBrusE5^0FeReC
z0OL$b!EvuGnTEEV_jU2;R3-g%nOxHd24m0q?n+~Dtb414S-Rg>O#Kdg454kaA=Nfg
zX4BQ{Yhs3Zo(=KT4pjGM0LuDlSK2O@NNqRPO#0|^g>;MIE$V_V?9T^dv+fmXi3KvZ
z&Jj55-m+@8)w;}l?EOu-Dpq<X51tv<eXFzC5q8OA(~_d3iA4`d7P!dSgk~skCI#f2
zqM8@H3kVciB@DRFWs61<25hKGx=hB<zTM5)$Wo>r&EMixCJ^+Oy==;DEO%M%`qpmF
zqnzF^G9jbcl1+P~@A>SCSv@!W++Df#mepR6zYjm}=jjnCSIM^cM({>Xpj>hO?Mt=q
zO*B%d1x@)4ZEP+4KitYq?QpXm+#TnsuomCS|9Zzp>vguj57Fnym0PAT+m4k6<I(b~
z%k|I=uvffIo%m$pF*$m>@LR^40s804qbtGW3^O*bf1KXGO+C;sJl156htpi5%{Tyi
zl%vrhrVf}cHmefrOZR3L^kISe?u1q-JoQdCcywRqnK-PoLVDuL0G01jg&NUtmJ|JH
zt_Rg;0tvJ|mD&1LLe=sgKYqMY$BW8E&d4d8pR=fv)i-sa|71Mcx1B@BX0MqOAErD(
z7sF==&Zxd=ihhxK74jh>pcJv<Q5<eDNIK-H3QUA9b+oo~e{uB`D6OlIbN|hf2n*qr
z^b*t;p}*;w3L5L;n|l>UTn`3rmr2I$k001RraB*#$IG7M$uRxNyIhW8Hf2&ei-lwU
zzE%QUwAe`;F}{n;q6gJ??c_46zweGD0_sCgY~0A-JF9`r%^xeB>d$3{>tm2+s$@w@
zf1jC|p>o~$cqbZx-!nHpGOz(N>kxT<is0yRm*d4fQP@5kbG>@m+1Uz;iW8xRylRLw
z(3HBk_-lwd3MSC&m$H=JB9R9aD1moFqF^r@Oo&cMI-?GCY}Li!a#q$it~1^gJOvX_
zExK#TvwTF;p~eCH{Vm1Y$Q=@y{{ZmfM*w_<(^S{--&gK>37&8kaRh%oQ#g&Hz&GsY
zt>OUFpJj=QsuDcB-=ASH-uu~PbS9C`{}TYd5J4T*#*NSj?pUy^GkrIl-j5G?!T)z;
zfjpRX{6Ay{;UV3Mu0zE9+xon>(0j#WRE)Brn6tgPouDE%I7ww8(?h40rr}~a+m-$p
zn->Ah+22|j9nz`36<AF9-HwU<f=QU`oWk6k>THKwQmMT#aD63qzs+vJ_L<@R9c`4$
zjPfNJsSa%;Q%~ms(lxf-`qsv!A|Ay7jlC~p)@lyVKnkwxsOZ{4D{~8F7nTwq|BS1H
zGi*C9e|fD7sE3J=^8(=yiq3jBtNI4Agz!CIWlbiM=Y;}7PH=@}Zze+-4Ul<bkQ1jv
zF=bQm?Rx8e^vG$M#$^O2k1KB@bm1qK30HYkSOsQ48o(elkoO1u&&v+u!LJpNLKs3?
zXU_9E^6bT175)q^r5Lr_@#X-Y-~X<C+NBPwt*s4w=pIp=niNv%aIB&<Ps)DcKhS3W
zDG}qaF!_pjGeOZdcWtVb&rU9CY<YPd@AEka<MxCHP_8I+XB2&Ol_l!k8Rm-wd5=js
zaZvS_Wn`DzrOmc6Dx_uiQ%&sam2`wmeu~2M%wUANLukN@0m$E!Kt)7u!kt}<*T2Zu
z`!4oOJDeINdpSVVq>T(J5Y&Zo2j1tay%#z%eVveTZV(c=8)Awg&yB@dg}7b=a-|ZZ
zrtll$iQ&%+$iyLU?aRwO0={YJQRE)8^i#TW<h3fm(YI>NxGv@w0|K(@1`wLHHu?DZ
zo#8pLJr<~LRapO-ue0*)Ia9EK%>p%c9U?~I+n$W_r}CRaBf7J1fT>@`NDR6dnbN+P
zTE}^cl8qB&3pPC|p=dx%Jmkm^Ve2!v4@PfTscy!pJ+btPZmHmZT#nAS)+T3+K&!bW
zd-ZD1mqe`}&hdfXsSpbJ2!%iPIT*eD6cH)$J`=u+UW;ac>**(erdl1b^kkZGAn#d}
z!~WLvNBT}XV@1Kr%<mU9>0r6a5TLL>wpS!+*f)k2yev!BtwvNTvyfGDuU!G?n4|4e
z<YO}OlLESRq!S!gvr0Ts4S-@`m&cPbmtFDFG_stYMJK#sSo9EBCC2qZ?RX@10eNAq
z{GmY5%wGdCj>T4<Y>)piQXyoJKr3!E#9e{%(Of-`kP#>4&EiHPA|iw(a`Gu;X`CvQ
zT^&$o*V>tqb}|4Nat`oZXF!At#ms#EAUFZr4{8b6XIW2X`{@;_yBAyikWWXoXC`?<
z=|c8=Xd=N(bf<`U$30UoyC^x~q!kcmeJ|c!{St}-5PTdnAUIR4+39BYb;X>9*1ps?
zPfLtC7<Y^KZy$5%!?NMwe68pT2|}SHxxrH1)y6K6J{f>&Pv+*yT5=MN+xQsGOR{7q
zsTQ6mH6{y(+kGfD#oX@b=!++4eDKP$WhOj-hKTx#;cPcNB4g`7A=RvA6&Ew^X`+3e
zwm$cP{0z%bqivl`sZd%7JbWq8FtS1L_S$|y2q>bXC-T5Tu7r6g!h?F68gT{SF}hg>
z1cV66>8H)vtU(LPC9=~e7@+D<Eg6Hon&e58d790WO-7&=qbF3J86UmKS$S}mt6ds=
zkAk^m8jhdwMEKi;@10ra?SJiU^ml3DMcipS`@H(RM;;DJuOVd0OU-_c%ld3U#7&PL
zghIeV3chM)y$BVf!ULbjn071<xyu!QUs)1QXOynwuPCR!m{ggE@4;>67^((?^SC=}
zSL>#x<mH4$ms{d4tH2R{g7_#3z+_F?*!=LwBpuA+3j1TFJ{v&!H4}26JnC^MBhX!^
z>_xHqZnhIFmh;5eknes@4oEiFnc+999na5bm+DSY<i^XiOfmW#C!>D0JBegMBwPmL
z%o=7@!V1XmXDjf9vLLx=#0$Pd%wS)2Z9Z?bPlB|7RA#|p0K=h2(4dXsQQp%C#5x07
z3ui@zK6Df$Hckske#UC2tUaUBeO;P+CSXn|QG}~bp%{5EUs<u!rMg!~RWP+53A@Cz
zrrjGWpM|n%SET5<eC2m-%(FaS9%u*v4Dj(mTh95L?%(<<f9#&os55iSCW%4zBm}Xz
zhQjvcqWdylCH=vIr1Se5A*)R4n6nJ@e1g3=w`t&Exow^`87`7HQ#`9ilAnpc{K-}o
z{h$n=e|nL%Lm>^Y2;I&KN<q9nV7sZl&7`(uo(4V`SKrfwHtV-$CI(f?=5z#KG(Ls#
znXhqRuG_-r3mwcJT!*hiY6Iwxgtb0cMyNsQpuOF}l3vjCj{CS|r<LlrWZP9P`SM=k
z*@yQFRIt&Rlp5&JCyto$yCgD;i8R+bHnr;QXX$hWmM_{!z*!q2@d}YqAt$@9H7ecC
z>rvK_Y;uud^)bS0GO0np*)O0FnM~oih<-6mtLjv%DCvMuKgMhMB9!{`B{ygeHBwCb
z@TJbd&`4l`P8q=*5&nLx#HSHzOA@X#C<OOHz>)sb;?|-;{I(nnq731^zB79_tm|7=
z76WQFPW6wk!>Y&tpN>X_B&E}i<Qx3m>tcLqC}hlO7BEn!S!V7&zz_x3jL-F<0==LX
z)PT*<LNR^3_zIDJMyb<Yr&D*rgT%fPFb&JDsTw`DMgJ6%@E{W^dw>mZ5eoV*PyuaX
z{l&T6Qfm8Ic6;!@GX{0Q>502J0vE309E<@5Ex{`d+cH-SRswQB*<Jwtngle2q{oqq
zq8P^|MS<|zUKc$=JULiWf=A7tcUt7qAm}(}^uips<NK|8jlCP9h-z}G`d%X?0;rs@
z!S^Z4<%0nmuSMb=$t_vHyB|t3nYaLHrUzt_^Ygx|zxD@zU0u8AN3e*_u{97e6%9x1
z3{^q1R>qvSl?KK^$aMn~(A*9WUlU2PP(s2d0`YkmobC=_>oHHisTbzZ0gfPFM@~en
zpGFl~-+G#M@Hm@rQ7#{^O9`bT+Fwo__i<qrsM<g2cmYN#oHyU|Y71gNUkM(}0y~Nh
z#MPz{a^B^1?0|eSbejeJ6Y{6Xl+gD4BGXsW{pR&+yzMk=(oVU=;-E*)C}dJj=J*#l
z-+uDDcu8^HLci6p`t<U{(w*-Sv9TTAkAcu&t=8#LuBYI<;ZtX4#(6M9Dp4+z${pW^
z|0z1E;IBZVCGx-zT%z=gphoT5YYA7UvM_A<wZHI-_4;upBNKP*`j?UF;f`>%UEr>1
zeD3+8OQGcD1*#$uPf=lks#R)|dxmn2G*~c5#MPiEHySQ?%Xz+KM!~5sQ`akh0?Q{u
z`?fI2##CGtXp@z|?>5t1w&Bb*7jW=tT4huC(Pr<F;tx?qF|faDK8x{`D}%54j$bVD
zFqtR-bAVD!q(|YEZ*(7xKh|4eOQa>mHWl|lx_hQhAwr(_bdwP&t(aGJO+N3FeN63<
zVlAi`SV8jd!Q_Cjo+b)-#bL5t?p{A)jWRH}Kv5Ng?w$^Oc`ACFeRSxU4P*DZ%}zQs
zFaz&753_DHt92X239AeRo~svO{96n1lthw}haua4>Cw?Fu#!25$o~KOCK*4o211S$
z<;+S0L&M~h6jrxBZ6qngR@Z>i8gS3=ZxY40!<rLzL8ypGSxyT`lb2;!6Wm~H+dL~1
zK3mMQ-Rs|Xur6;9RO_el!$wcj_L>7(s4i!lQcVtnv)!}sZ$&^K**zQn?cm*qe|<X*
zuTxG?{w=vJiyW1sbbt%-v*3lV*waw$%+DX8zrdW7_}?rNbxF9<td#ua$l*TgEIf~H
zai8^S*Utu__N#iCpC^^2vL75&xDMYSV*x3QXy;FP(%(rDOpymr?~{-DKkQ8|uBSc(
zvZ@*Y_u;kSJ0tr(Dqxww3KE2X_?B|lUoDyM1d6Vk<rkDord=gIXX?~`fY!?N6yQ(f
zFu^yN4wfG;J<VWq?{-EzKI?V00W<mDM9sg|xbb;pTb&wYhMo3F;r{jvFqte*>quwe
zA0@Le8<y|UBns3*1uUQ#khvV4T7^f&cG&_z?d68R_8`25MR-0RgfXAhdVNnw|9wPe
zbiVDOIuDkcZsKP{5v8d;_v_bz|9T%JhXLdIeZVbZW0-QRrHEbwc-0kSEBmd!uR!+^
zl!GwQ9#JjjL9{#56!F4xu7^w0VYM7mv020zp=ui9;&0<n?+kJ`S)J)*(-b&7b`B<(
z8zTYPJMMI!1BV1!N}C}U?+#mL&ef6sm;um-JQex2_!?~Wc+k7>mEm@bXF8JCq1=}j
z{-}x<97~Pn`|=TPSZ}srAi_Y}TWMH=%%vy2irNsEsa6$qta(Ey#1EsW{`A}F=C89E
zwMI}WNQrx-gAn0WL$_82)57*<H9@Br%oy(TAXRDY?KL#GRG9!2Ts$Pi1>L|v@yytl
zN3;XgdPs#ETr$`l7&avV6otd62h=YVYq*{5?cET^866mJ1NAnRdVG0#xrwpTi%bh~
z8kpe{M0nT5E!ZE6qlI^a3{%npMQ(Eh-Fhz^OS(ea&2MMFMENXd<W<3W(tA`SnG3a_
zPgl;=?FPrGzANt#x-vBODR;*|H}G^<8Ba&a6v$Gx-}WCeFf$uw`4GXS_n``^l@{<E
zwpY(9vCapgvLPYhCxRt?DBI`8$W!Y{*YeoloR6||8>PdmYI?@?Rk^A|)T!WF)4fCO
zz8V;7Q(RvH@xE<v-zZXVb=A4t_p|~JQdCaR38+PBY#|jvgpd!$ria@1h*-67q~Ma=
zdF3tizGww4Q#Q<q9>%y3O@tQyEgy`ViPP&4PNdAEM>q%ENMUM(1peU#YD^yW^J(T-
zZ6H$2p;%+Gx7GbEP^Y-CRC*jgPi+LcRu<Ot^jr8#h6(m#<PYD-$~A>KQ5=`Dp)9~p
ze)sg}j--79PhPw!#0aA|=@aMOd-swP5`J7}z9SW|+rihIj;vI-^Wht}ir@Mktchhg
zn$fZh^%Hxywp#A7<xh={%q3Dk8f#Y4!F!(vit@fDFJANUF5oolIqk26&3)AJN#~o-
ztME4Vv8KcumJz0yK^3DNKbhC>xK*oOpf<Xw#s6z}#pJ#Y73iq#)#T*PhPwSmv1w$E
zp}@~1LW<)-+@b6QJ6zZ8ftyi|T*nI?)$q9PORHak?etG+tL9CBsJlO)pi9b}+%WGu
zlF_(5FDR9o0@stLZ?QEk(ZXV5<Wkcsr3_E$(XE{+SsD+v0-1R}84u@xGRVGL!E|=M
z@*+~5n#Ugve{m`U>eQULh5Do8uJc{#QBU^u)|?Hi#ftKSqu$p3W%LT~V`~d2bzC{Q
zCr6NAYA}7e!_B@~uE3Uuu{rNCMl4*=6F?Ut$e1`Cw?NzdthgRqv&x%d!gU;^Bh6qR
zZyc!JTIXH3C}Mq;5Tl6Pno_Vh#5xp;aNQ6EQUh>Z8)P7LRgWRB!;7*2t7hZth5(5~
zm}Q5u$+cH}Sig?2v>TWV+!6G=o06XnD)dEAwF_7+X0P~>M6Icsl?#~#PfTzM!v;#l
z*dAyEfKNS`ziY0Fd(Cmzh9^6Cy?qhOn@C<Gg&#E0G+p<GCqR?UwFotq!kM*>r{0U7
z1olUT_ABbWBKX#AwE~?s3I}aHMh?lpF1kdo_Pcp^wQ-3sJBN5tpFqcx))x>tbK-n6
z4_5P%#eMZn9^thU_B9lq5o3$|1M4<#r(HTqCZpeA6btj(QPloDP2K2yc|fMzEJurk
zg=pxqB-P`M4e^1VA((_;OFPdJlQ^pWBPl+H`U*&;!?SmPU6H~+!Ygm$v*VeO0Qmrz
zbY=sBi@J*TUrr3eB{(%T4UDHf58i<MH3ZtSZW5AD|3pgS5Keu37+ml-oZ19!+4^@;
z-NTE6D|FFB)Ml|Au_;GC_W$sbE?|IBxjq;fdn@Hz&M3g95ejOf%Wx8G(L)I5WGwdj
z_m$DmprrYiUQ)q9u)e>u;BgmGLQ{aDjpQee?*dHvm&Q^N7&M29?lz4f3V0*q8|od{
zRj-k&rNr6=@lgi!3Fw9*1R+xyY&b?o^i-(g8G}_lHzMMpCjarxzX<NFA#pr14O3fD
z7%gL9b8SV_c#b+TK0X~b-KxE~0|BJ;4x)#55h3i#)O))(t0$CM%U03{$mf}a5nvJ{
zQ;i!iq+Am~NI{Ln0lKIA4EWN^_rfohc;0(*T9_snrIz+cZJ-R`;l08&km16yL&d6O
z(i|zu{iZG-`Swd#zv=CDTJj1C4@E`YdaWw(c$5Hpn)|_=nl;rL=do<~3-p<fl$Ad{
zic_07P(TAs|K;*h^b=Hkj$CWQa{EBM)3(lt5hZ}i%VMDUwR=_jqh|+Lg*Pxd08F+=
zvmTHSaYdfDIJ%nM6x|Nw9r}<*<?OA5{jw-2C<e=x99T?-Kwgg85ZG&pU5nl&gyMiu
zueU6%FOdtdBL`hF6t7^^^^`=v%q44l33@Zkug-Qp#RH=@F{=4yF?e8GL~Z-?bf6A|
z3*6wd$Tyo-kp$+J5SI}1;D`a4)(B!4yppWBEXc^d@lnpS65NUT+;YvRPIZ&;O-=b-
zbOK*zyPH9NK?P274fO{kG;=H!aE_04Qfo0HMSQz}JZRWc>T=u|xTN5K8JK^b96JfV
zdRk|Ky%AQ(N>UjEE2^7Nf11EEc0R1Wz>F2is8!KagNIeaBC6u$;(DM!Z3HKBiia%}
z<EN;D_E0o{!T(c@@GU_><lw`w`#+>s6;E>%PWLKTvmron&<6u>>D-FB^W-#xFxndS
z0uY2ClMS|-LoBX<bFccPif-=sn9Xg~r2#?@N|LZv;Dnz-w<xakJ%7{esjk$gCoZL`
zLE_;dQ<uhVFr(Rq_L4r%pN5++n5bWMEO>wUfHW6=4Fg5Ol6cYsia%upP0}79$Gekw
zr6*O!(QX#Pj)x~^56VKmzfj;884-4UXKg0%S4P`07ZgDge@y|i`ew3<T(SZP{DMW|
zWl-btGm?S_$!Yl+OqE8n$4jyl=*y3UD;QR#&0lSc|5%ut(Gyxe+#CovVM7Ve#vHpr
zBaA8-l?S?7-{(y@{zGJI0;C06dfxIW#M~0Qbnt!0a0pmV<~?H|N8KQh!B5xC`V!x5
z3}hLd@(WK2mx;=8NwJuJh#kB&5}0_bL9wxsn9=m%8p;CS5QYB-0AEbJZE2D_FRQ+n
z-pc;%MBwtA1lH>Yar7>xHdJX-S=$VOSIo#T06wMPl(Uo8dQzUF|2WOha<DD_OcxH<
ztpHxPRR937U&YPSO<5ZlKdOZAkW56U#Q!3T?iF-gUqOw7Q}0WZZoOKR6LvthV7qX4
zqiqyXOFvKVj%XlIN|DvMONc3-h9KmGtymupzbO3o7tJ@GkNMSNe6D227A@1x7hFsA
z5U>;cWNWS8W(=;l(?%DX=4{}wU2Qzr-<A~-4Mne20HsR^CbagZR!mWuVjaJieVdma
zV?6qBm*u>H;AxUyP8MEp7AD3ZWSF@ixF;7baj1a;v=IA}Qc6;iM4>laXa8Oc>tu<w
z(GS~J<o|pzoJL8qOIZ(EY}_kWNH^ymE1H@Qo_9<)EPZ%zGn%IvK5FoOe%7Ey8&_yr
zuwy$RxslE|A$jnLT%Q3)NnUt0wlGX_+~QoY*?`4{q;-kK%;a2Wz)I}F2Xw{{4n~-e
za2>1-<53+4m%VjS25c!HGQTP?9TvDgpNu1!|7DGQ`W9GtXkY>=#~K?Z9&dPM{}_iV
zb`Mu;WWJCZd-jw0Y@9-LY*#}AgCs!KO_EATt}tJj2cRi&7vVD0J8;s`@@&-9&)jI0
zu*;nIf^LUD6d2!^B^sHjoB0_<#6r^g=3T+1?X%T`##x5@IjTi|Byz!(S2Y}3F$hUJ
zJLaFQytAHei*H7=U!6StFxO${6ilz=;3u)s(J$4;eQ~7;s=bB7UB~(ep8l3u2PqCE
zs*Uvn^Kl`Xo{7zLuxY2S6JnP3r>$XD3J-gNoO$CPj&n@naH#uTo#<A%{X>_Jz0u4(
z`$E+rT1q3K0o6gqlL)Mm4s5(`NX+}1@Vw10op%;Cf$hnBwBb<q?J1!Fl)SG7Di0q{
zS8{ZAba3Mif3YMvv3>m*9Mv?mkPwqS{z-E<FD?={$>5fV^XxTa=uW@Cq_LiO+Yy}u
zVJVZ{_HjKp>V-2g88kYK$gp!ZX5-&{G)qyIss{ctjfgYO?uBbghxJby8&r^*l-5Ti
zg#|~rh+qZQq5ug~;*>ITbPi_7*>weY$q&Pe`b$IoP0`&_h@cB}`vSGzca&TXe<=-}
z@S+oV9pcH=WM@Oxl5@Y&EbZ>SCj<;EAbZD26o|(|zC+jrYjWf(LZRqiOHE4h63#E}
z37ke(2ZHUU@hz-_RpBWwd{u)*CGU#GgiwDoVu;X9G?dC(I1qB+xDtK`<6+Kfrx36`
zS$7sI@Qq9M*3HW}T+H5mefq_!0n84}2ha%*aO!YUbWV(rSf|!H;+mHAIX<K2$hS!U
zgbvswc+hFP1)=QjGLAqR2-BJ8iJhvd>Po<eC}f+ny#%KAC%|;1I#X7z4+!hR9hZ}M
zAZ$UHdp0)3x`?6TOm}7+T!)V^Zv-*LX?;f|2ZZF%imv1G^+N}Sag@$N@#(iCL^5ef
zpI8W4Ob3d(*RFU-AJ2u}CY_^6RnSQ1VX9iOL|DwU_rZj~05&u}1vg7>_V9t}rZ9#@
z1Tg}2>gEGrs30e&wT;33{EnEVWp?mbB&?E@+sdQ<a%3s@`y$(@U1kwRHloV6x?8Ud
z`xTO#UPZ$w!FJVJBetGwIxkOwQ3oIorVk>19+H3KcNjPlNVq5oR9=3#8O%ugkt<3b
zlQ8y}(`UEtls4?Y_{(u*1`7WqIGlmV2i+J;uXvRkDH<RM6Y|0n%t_5!U?(?)LN!a`
z7ikM-ga2W%|B3b8!)b}Uli&(Wi{l+MghzTZGy3pg%xAO_eOqyM<M4qpvxH<3<VXsC
zg~3Vx)M4+duka>iS;YGTy*aiFgsaCW-ZLRN!6$-ECgBvG{wF4|&gON=)qIP9P2Kvu
zw4m8NR^$yA)x%3aO4*UUTLliIi2{sk2uFcH7!Bh)Oa@D|4AcmMMAy)VY3k_AK|H34
z*E?+l*(0kj;!9K5d;-n<7=_;jSg!ssy@DmG(U31IKO+;K)XSc@k!Qa_t)Mm_80k8Y
zVbWiO>?tLVpR++^-~ZXinb*}51B!yj&~z&poW-KCkyQ|jUPKLkEx=tiCS<rBcH1R$
znX$w!GFu2a+!-#y@hV~<IgN}K=Y8R_6x1M~4az{Uzk6Fw5DKUuMtt`U-nx7T*3Db;
zH<8GMt-l=pW{XoSA83kSrDAp=!aEFAk(fQYBbpWY-LvRz%qntnqj1JdTq(em*=a2d
z@uA*<f02P3d(p!YfP>7J3};sr)vmZVYc2n>4hZCtV?PIX3^{qsXu{vDauTT=2m=v6
z2$?%DH{9BS+7K(9YG-G6*=YZkezwo%>G<%kzL(*%M&jm({D1}@-9qszbh(LpAp6^?
zMEE?yrjRw1B|#oI7AmM-q--9X^jfZauCJK5eC|N&LPiD*7s||zQMkdA08z~u(8WHh
zLU^~S7Z||GM6a8K0@)_<k%%w+9Rs3mf!|$Y4GatfvFLlK>NCf*GKDQ0f`<xn57^?)
z*4cjtIvk;faC`l0d-C=R67>h+-8>pg2FB<gGRQ?9gCf8eYbEnbGsGQ`x91@4rmz_x
z6<od@NM`D-Ksp8So~1bxa~Mj;?tQRH<7v2e8yKZB!?Smh=<KHoNDURh)sqh~Mm@AW
z5dtX4L?t5!vFb$7K@$1EfPki`kQL&nW8m?r0w1rZt9=F=r3*hvlP|VvTAYTGi#hn%
zt4L>bB=RWVxLU!wT=b67krr()D3X0sE#W{UfNlD&${7=IS<DZ|TP6t+q6ub#GfESq
zF8QIu-n$5$gJ+0~D(WS=$t-u|8*xWmxVU=tV%)9wtrDQF)vc(0B4=)f+&+9BE`bIK
z?*38N!bFlnHsBwPHNO)$c%v)8@{~V2BK~o|;05kZ1EUcAUnMbS20U8dM;;l-qdnYS
ze#*n_j@$jOniswHh6&Y=e=t=!m{=jp|GlWECrfB@Pw5<5eGLsFz>30y2Slw=85w?s
z4c`ME)1f308?h;O%0tl~ayQ|^7?aAZP3|!d4}RW_PUimo8w<}Kb1`PuoQ2J5B|3uP
z((g-y`&@_n%rtEv`+J|ux8QoE$vrg>qhx2{r|4k6Vg!Y>^^#vZB{{HFi(#}P?FoL%
zJw+X{fD}~H10669Z(8^mI^x|iGf-RzRFr-sNp6jk&TWpmUFi3}qFfx8G4S;DfwOq(
z%fU)RzKJlq6e#v2J5@sak5?udc`zCvl}lX#?Q0k`zpF_poWBmT{v64VSIVG!nLeb=
zqI2&X-_t8KOmsvchYs=xe9yW7sOHho8!3tduBqm=<U#2M?Mw*q{t@+INw5weYr-Fm
z{!kt!75le5tV_6PzY?gZ?$C~u-tB=`t{R_($R%%<na4?eP6Ef$EJx@nP_MK+ay@I%
z%E0p!gt*OG>c6KJ!$UNT8lhiXjdS2_o{KoC@@4_Wq1hJ)ufEAn))BiYGbC(IEdKZ4
zhm)bp7H`!eO?3lR%wG2cciakM5s$l(!(;%-KFidw0AU0$d-T9J49PQJE-yw;9puT4
z+LfIl5)5XzN54$&5)|~XaKw{&7AV1HnJW50*D$`_rM>NAk*QG!1}2vcKX?sSc=Uo%
zL_f!`u`n3<txny5qauYFLz?DyJ(IiFByo74iH4$|mJe^`{_ccOFzY(v$pYN42IE%#
zTF@-lK7PV$DTf>=Ox63p2VF)UHBF~h;^@$K{Vh4y4`Q$asSRYyz479NGAO!7#&vEY
zR&y@~#R87}=$0kIqocpM<C6L5#l+^NqmyP*-gC43{dLHL<V0+7IDW5KWTO91Y;iVH
zV@8f0qoEbQbwmFDV6UG4d()tRZ_14ZzaOP=_#}ElVj_UNO!5nd26C8}S1yts`UJda
z9uGJutRHM;G|q@mK-zr<WE(_A?Wfqm&Nopx(5Re==;?Nzko``74_4TF*skt#@x1>{
zh=6fjgwT8T_M1Pl#bYQ@I^i@G`Fcs6zk9?kJdB;@3;$RP+(%Bn2j+6hM^}9eO$au5
z$E@l%$SOQoiZCmn6xQA+PkgZLB7c>>Jyw=+?(+Y>OQLh+@F)5G^JcU%s;b67Bw&|T
zQ&xTgDK&d;`WZCzAf&|Cy4ywZ=Q6{ckxg}|GRENGR@`VofNb{`Cr%(<d>`1JAwtHY
z;(tdc11aF@JeB%KP$>j1an)ftk-w8+nx;Ci8Im<y(!Tm4&UW)4uzbRO=D*gDz&`oM
zuu+z9NaP1$gjvYt;JI6kW<C_b0J$6uExID?*?Gn{YmSaIh-{FH7(Fqx`gaYL!EtrU
zq*sRH&ogqNL?X#Nv}?aTEaAPvPmz_`%N>CG=k95$;JNXd9Fscaj3PfupaSRBP!1m5
zUmwcqbeKy%6wd!2y(}5O(G_#MqmiMxa&+1<NgwLxUw*JXgL`O*R;F)$_b^{P7z$w|
z1?XZRJV3Ny8Jf`^8lq_}Oe7t6dF*B3+Wws#o_8VU{}L4Z<M(L^-?0gZ(R!4q+R?9r
zb3796CXB~s{C#?k5D)I@zdM?|aMFK)SKcJ#$Fm$QFlXm;fSL<EJm6d&P6Y-gcu<iB
zCQN^q;SlIRyWbN3Z@DDxyBd&yaD)8~6d)hPo~n6<I$(W^Mf`RPpdm1F0r%@35a9hb
z2E7`81!f>lrs|<-Dhv;&f9d}M^G-}nHI2P$)}?|C(^xjl99a>z7n>q=a1?tKk~b%-
zqjaOb)YGJCl%XDF8@z|ECY4kU|6tlzL%eT}KMcRvi7~W$Fw$G+pAI!e<XB9}@`1PZ
za#X3U{9T9B@q>z{ufM)Jg0mk!IDoT7>x`3jAJWJ*7`*w7Ve{Gi8x^RB`RajpOnu48
zf|EhXWV~14G07;Qz@a7`Y#={Ti+>_&B6;WMrvNS;zID_eqeL;af8;|s-P>J7U*EmM
zKZv!d*xp(%zKZ4|Snf4p2OLCs;a@O{*e<*#Xfu~scy=M;XD`QC9}tRrp`U9oMiit?
zP}9ARm{}ohAZ*W9zmpG#K)wUKBVTT1Y;BY(hQE|7J3uOt1x_QY@!K~un9J}(@0BCt
zOyf;AXL%bqO-R&&Wq%iT2=v8VAXMstZoc5l@QfP*gU$+mfP-}TX+0WZVEMDI@$&qh
zj6Y+XD;L;Q@|qAUO=x#ykasQffm+845qdy8rA%%e81o@l0Npjj#j!|qxMdlOh`f|p
zi@0ON{?2+bq@F==(c_P5fPjG?W^}osoWTJye6R)jo`;ukZ<vw(T|nh$VFCTW_*Fxv
z9LZdNUO_fYR&>DYwGP?#fp1!QdU<((r3|Nu<aNi09!{*7PuA<bCRz7&DbSsMg#s8X
zZhb*X>h7%*$nfVORd_2m=F6AyOwPA5d_w7@nmn1Ew^~|f;|#VC$Vd+xw2JcP=w;f}
z>uBX8Kk_5+^*})-qP9XdPEC6)C@vVg|B`B;(QKeWVY66$EBR*Je1Xl<Nc1PH5B_J~
zA=3skr4+yc*GGAjfw;kxJi^#<ao)1R29+$EaqhJkj`6(jkd*l_yb8xePP=lkxF1K)
zK{y>N%XDx65P7{qt2qv#;^`+RYoViAtiRvEXLdo%(q=m1(3wiQ1v{NfDn^U#VEe%S
zU^0c(by!HVP@Oev-s%(`0?S4iGIMZ3?^Vg5L^iWKEJJ)s^Bu{-!3}X>Dv?6Lw=~>+
zP~-ExL-Rhd!*)>eVl_8hTWOdu(?a3!Z3$+j4zyjbHB6!Nhxqd@7K4%k{CF5eKJw!d
zm{%yoE)nvc__Hkv-+=vrL_1TK@#q$jcM-7YiM-P~3{8+}L<qL3FUCO4*#oYVvhGkn
z@khFYGftQ`csbS%gy;-+9gW8^s8%devCL5SAc6X4ixzRKW>J!EAV!iV98g_KcKR1Y
zYLTMO9yGYXx_n#678*FsA<a?RJ3DWiE*C!s6S3}__yUCHC5RSh9V%kq`o@#JSPOGQ
zkMdTynGvEzB9>Iu!VW2+J&Q*f+OI!9EyqGKYJ2GWH8Ncc>>1@5-hs5oFOX6qY_yd3
zLlInZ9^{!bUFlli?1=xy1O#_34H-`7A>AlAEk;b8c7hAp#WP+shVZsVE_}$aUQlcG
z^#Ex1d!GZ)>ehi2fna(`;QScDU%(aN(_Ua{NRot4dZkoggJXBXX+LgeY`-;ZUmIz}
zmfN$xStZniIEjH6-F!xVA9yqcqZ_kZzk2yd^n()?-Zs7|iadG$75_2|85Z5}DO-8%
zpP#+tH-DWWV`L&C66ccP6vLmUm)&N++j2)%Jk>r*?A?ISGG<K_zez#pPRUm}!@c!>
z>jj5~{LUGx5<@TZ^&b0VuFk%&;)Oi(#;cuudIgSUKY-36FF1a)yTqx)@opgNT!GjW
z5I6)!FAH4+f`EmC@_Do~G)I3JY|v$wSrilG#T%bOQPpgy)a9if&cX^b<Wep1@{-6O
za>YS<vB`op%?(oblG3x#<%Sj-n)|mUDoP{d(@tDvsFnGH=kh&hP^S(5oq|VXNU)<*
zenlNbCUzCg69qFV{=h7~2bp8c;|g~UDBx3`x(q&&{$SRU&;8O&!{pJ3#a?I0zBJTe
zH4Dw|p)Lv^{gDyIiq>YS&?w%XPSgQKK}*5|W?Nv0`wJSAcIFOTS0d-s*Wj;B)CLQN
zk&PBzJ-u3Z1~Je(C<F4`Ptd(hB9vbl;F+0mCE!?-w|x5aNw(O|(z;K<Zhe*!94sv&
z&cT)YL51or;P%<~pg@bk-su|_8p^u(d?MyzizWCrb3pD{^lF^+@6ge>oP8yHw~}Ku
z6kP4>o?Fj$MTkuTjl=&s6=@Zw6Dg;@Zvex6l?3_t3&6d#&}#k)-2&oeB3$eC8;wZT
z7l9I1D7biM5c+vci?V|A5uXXOfZb}-wQ1<dF@2tN4YTBnLUPbNbYpsO_dQcgB}X~`
z@-}zUtpX@X%OaYW_K^?hcbt#@ggc+P!>HRGN?U$Dt;w|1d7lIHn|O)Nal9!>k8-7g
zA7Au%ug*gy#e34!QcTR<>It;CCuCFWv&>C>Zg~>*9^S5Rh4)SVEh)PQI9gu-XB)F(
zsHM_E6PZZzpQ4`8yCFkAFGeNK)L~=!9y|IY>_X>DuSKT!C`E;Lbc~8oQRSJNyTC<`
z4|AFVKOd*a#rdG1y<qBb#VB38WZKH^g=bb&eo4?r{WeS)JrO~Z_5h1T?kJj<$EU`|
z8$L5H?n-^Ua-O3-<TEzTrjas`-jaX3YiY;Qc00OJxZ|Oh7k&NgiP%d)0^paF#Nu-P
z^>=dyKt;rD%#^NptQuDr7Xfqa6Qt^u7kgcNU2Mj|>M~);yRWv|bNH=tj>BjUJnxP)
zoJs7cJisJ+9H84rfm^yy-q`myB(+f6(Sg|-F>(b6$2zW8psMR$4Sg6Vw&_}k2A04k
zp>RLx?-(4zB9uTelGRoVvm13?iC4~yrLpV<6C!l>+AA-O#qZtAe9+&s2NprK5a+ea
zn1EFVdF|qMkJUFC*z#3dzdwGb4kTMk_F;I>Xa3$!D$MxsxAnK06BXGyk5>&fS6&d&
zu5do@jp2@nnjChQPoARuQgGqwNs&9g;uRlm6<pBm`ISM;=kw^_`ROW3Q?LC7)4_q7
zKZWjYKvO2%%bQr03fF5kTJPw|PG})trk!<XyzN~o>2joI;CU@5Z5M1d#3tMmGvRO;
z!W)E*m3*YS+snL+y-0;F$r&xfrnKoT)9rhmU$$&Q{(U0V1kSXiPuw8RV#UNim5C+i
zqbz140y2t~r1NUar}Y?aUMc7DsifFQ`_iaeS<26S>-bvQnG-Bs3;I*!As#z_SG+K)
zDpXjul4ImK$oS$Idwq&ML*D)KQ_ko<_%3&}$kdcrGHz0);(1_x<yzSMQl~8bXDz^g
z0LwYa8z-2DDfwx1x=Mz&xOcy>5t}Bj(%%(>Or$WeW6ftz;!|@jtY0fqV6$<2SIMFI
zCOr=?45G&TB%&K=ee_40C9-R}xZXKNtwZ_)`hoCBc)W+p_`GDGubo=m(9n@|`Z3DJ
z>pxeDeF5#I8ch&NYUIlqLl!N96IEER&eV<md$Sj1ny{i*W&K<oGup!b^I_TZ!dkpU
z4`=_g9e%-VQeu@445t70RbOm0^4j<&P4#~tzlf-FrCCHlAHVXyugb&crQC>j{Qj(9
zn7vFW&JQ^4W8*ddz8Wn8pJ&SI3jF7y!evf}r>lHn<&pk(>!Bfn&&x%8|N8HJxp^M*
z9uu+5x6SzX)p&yN^bqXJ>vaDNDuX<_J_|`gZN2}$uikMJX17@9mllf0)&BRs(9Ueq
zpS^SM-dU~>0IIQxdN$SUN`LL*=lS<8+b}7wTinq<A6MyB{O`2DJ`DrqHmSKH|L?1^
zwBe6Q<MDXY?S4TiQZ`nCj2HY*{1uEwD<%CteL9bH22uf+4q4dDqpLD#kM=$oLgC@_
zzO_nUf9>z+K#F%a9QKlyB3tvRzWkME-cQtkJmW>hr+|Q#ULy%&ard;l(jF&hL6ug%
z3WP;&Y6wI3jzMS2Wu(<rPO4J6NK0#LjKx%o+2YU*TQD*i16@8o6@_(EW6k=D5U3zc
z%|ojfTI9q6Ro@*zei^_PC!^ouO%AYr6f!b0qM=~H@pPz^a*lpk%6IB@60;@kpV4;N
zC8#EHXGeOaE^Ayty2+xnvaA;dwm#9SYdP($DZ*8GBmGm%pd*cVzFAx?Ft0vk)qx41
z45Tvi+oQX8Kd>-@NBtY4fg)wRF)(a>)Yxr#Hxk7=lnKS$jT%@9?}UEsW~w}2`fh+*
zvQ$Zt0R=kBGmjb6p-+`rC7IqAJuo6#=<sl%{QR8Hwz-jqU%fpo|AoZL^&1~&i++q;
z`}-)bk)xa0eqa}ejb0n_jO*$UfNO&!BIx0%N}3E^IAKM=5SMT5L*yy^If(q&-ZMQo
zqusF>2wInFV53Hxjr}kK*}_)v#guw0#8|1Vbq|bJ?iJgu%?>wR#?^=}157r^(BrZ3
zRR<8sN&^GtBADtW?7{(UM?L8Ty$<d`%hR@-csI8ZFnM&82@aZfzyoGf44iIHOl&}O
zagZMfD(*l8%m6<e08}IciWWb9a4#|IHO|E<+S-Tka^TKhI3KRLS1KG3PD=Vz_`-_~
zqYsB3f--e&X6&udzKn7ct$~S9Yf_R>jLnjNU0mK-k7rGIEceUDz5TrRpKYA&G2Q~7
z#=gBgyEOx7Iwcn^;)b20ocqk{jQ1dL*$9~x>OND<hk>GVGW85WsQ&X)qNqJ^;fr!&
zZX!dTmE3xnJ-?@$(|p>F;Jf+jj3s}z!!u{Q3M>=#_RmuUk33~}57pzZvFb!hT6!YH
z{8|@n#?R&JiEtDF3C~6>LvO^b7%}j^>K>?vE7M3CGXQ+5zAk{&?JK*QxV4&W!6N%!
zLcJx&dkh@nNfn@}7wh4&IQe%($U%Hn{NXa&%9WFX;M8rk*W}nL$uqSNba{DViz>av
zp|Vh{;Ob|y2>DcNlxe69tda6qLzie0XH&m!|5&@~9z`9@`NWTJ9ekx`(vkWERpxt!
zy}F7QC#mWxJoRuNG?MNNz@jzq80#TVEm8{uuOnqLfyL6}DR0@Qi=q3WqNOu`8aw{k
zcSgGsNC(Eo-R&Xm2s02;*=u;8;WBNr{oXIl)U<&i;N>x3*p(JB?Pcf$z9D(g>xhor
zlzP4h;Xl_Df~v2W=|Mu?-mOv9suJeO!Q@BKDzG&+fo(rU&324v&%R>tRNf%)s!fzA
zajK`G2=vn-?2a`L7W1E7@g2Gb?Y)rnU9j=8*If#+9(%8tK(PCwQfL*pfL|htz=J5&
zpgqCBD~R7>0Iq$4EHx<?Vp}ew$KO76X;K;T>xC{^J)sgam4Eaxrz0)lQEm!(<G!E*
zJ!$KuzVfS~D){cMm-TZiGnTyUFIjcJpgb!Wah)9hb0>uITm?_-Z1Crrx-R3k12@MW
zW?`Nq=-vDhoj#`TLbn@+n<bBpit_D@fM=Pn{c`H0&(HwmL8cq?ECPW*ps@v>zK_TL
z<L@@50xE`SCuuWjWDCm}+*wF_$2(CD3>-@x)G2yheWXA23`PRisLOc6OEszlTvu+r
z4&sr>5nxkE9oma7N2xa*-#AU}vpA$X^3~FW^pk=DWmMkMN2YgWpY)##tB#%EhNgKQ
z``(=TO~U6c@mWj`IY48o?L{{aBL0sL_o9?EOsYK#7S2vlw|V~!Ci1aLl^TdLjrP$D
zC9a4Nr7hxiUqH;)DLYyqiDVy8WIqwdqFNxY<%BqceiC#jm>n!p7a}7g+iuNXDu2z6
z%_WaEOvXL)lKtt$g!+cjL6J&mni(S`2l4)WXgxP=+VOE5grcw5?Z%)1K&z-Z@Aci{
z7rv+Kywh-Bl7;)opzXH#;QO3MKmM#*8j{!)d`<5?jPq3H6AkUs8PD3d9lPBbgsE3W
z*iZPG?5RKACVL^DAM8QwkM&c#ox<{^(sM9W+aFFD0M9nObDNNqa^fDx!MUHrGJ4}Z
zl2rla^t;U)t}I$36Z*x4yWsqZF^o0z)>ZTkiJDD>ibb<%!8tC|k47((X`*Rn9c3S%
zSFbE&Q!;wJv($Y1+=F5gHnrIX=F?GMmd?w$QQx)X*KD72m3}HhOwz|!`Lx3=4pX{}
zo{ad_nDqEp{0AW?{~Vlt7YN8Ry_8f|t`^r^xL-w@{oWjNx$5NwVloVzY{(!Y*TA&)
z8<~?*pRS_<@#x-}QLguJ%GK+*y)u-$;gSmFFf81&E3KJGf~JuL?F<y`$=)WAi+80j
z)wm2Z&Xp^<yHK-K+6U8~AlrdW;FQ&yevcFe@L99oBWQi&XSB`tjW}vkD|1e%H<s$T
zI)XP;-l-sPyJ7UE*u9$6FVMA1@2RlDJILwdhxPc2rR3X+QeLELTD~p_d#<Y5eoo!z
zB)>Lq*;*#$8Fo+dg-ds2#4Y(-h<Y^3#lF4#o=0js+v|t>hSp)QH$VSRY_fUIMW&Gh
zH+*$<RmFYzmpfI8@^PHd;<`GC4VU|GG&RM?fK42*RcU@Abpm1E+Gx0PcQVS{SbqiS
z?$muJ_cy}1{Bt9g?m4B4FReK?%gT#(iAhbbC`o>FJ&Uoxic5F4cG?Gn*>O(-^A-1t
z_{$(kYELlEtV;j>qGoexbnP*QvZw@QfgyMLkB2<ZTIZG0M#A{I-1h(_p5F4J<dqGU
zoOCuB9dAE1UdzVUyr*4t%Q#(w5QpdSt%s*-I9w%u+3=kt?&?ORK3Bn_IM*qZa=C<s
zhL5O!)Z#J4@7RV=7Zp)ymLcr>g6ssl<Fwem=GmzTWe(p@$CS@3`WL-6{7^~4-9dnx
z74<C}V?vA@_os||E`fVHD1x(a_`7Z=(9oiJ*_~~*zjaGQx@hy;j~A!i90+YJho6K&
zQ!F6CDV6#fH%GdCbbA)Da&qmay7ofpi{lxJ8llfdsTEQkNJ*jxZ@T23;Z1zkkN%jH
z^vxBDm#V@ZkSr@&&32t%nJAfR>BpEjB}Xu@4@Z0r?C|l_PQlHzCTi7KKYR+q%E!O6
zN2lM6C4A{xs^lT@vrX#5{WhCwcNYHYA@fmho@q9QYx8W+M)&q)lPBEVoP4w`Ha7G=
zAH}*fA;PR$WYki>8q3Na?{kwnVkQgobBwT^KJFEuzZe8$Mrp0!$G3p_@c{2Fv`YPw
zmzOj2+|W^t7HPy6V%776JlK%9r3NHJN$E8?sp|Aj0!jVUE2f~cyioFMzp(N??Kj#_
zuD0dl<y}BN3-a}3a<x$<%yhoDVO+$amZnL3(jdeb+R}1je3ERBJC0Jnu}3h9t3@Hk
z(N!Vm?Sb|3<q$bK4u8$7+wNt0#6?d`p1fo(^*2sEuT4`=RgQk*R8e;|UkJtZYq{^|
zgsi`vqh&eqT{|jGwe1BJ7u$6VokyzW^YrwbGB-$H)VN3DYhiu{cQZZC%W4^3k(FBH
z{(B-4m(Jo{z2PZnQ@1zaE%<D-nVMyPY2PkQor7g}bkDN-uGq#<$lvs+T9T%oRD~M1
zXSZ^@oEA%~Nn4?s9Y@oAsr8!A$zKsw*;{U<eBPZ8wN9(`7pz&_4=&le(-y(!CB6F+
z|K^wy;Y-YqNd#Ccw{HeA>@8{%sT6{>Z)F0mDbM)LS6CxPWrS6`>{-=oZwv_oh`6k0
zUpnzz3gWqI)wcID?5z7W{xqZqY$%0@N_mPZVU%`d#g30#;*Cp9w4at79abJnyNiCD
zz1Cl`y+V2vz6(pC(zJX&riaLJZrmA~JeyW&(3aS6_Q}(tD*BeUbAJx#s=#AjW13Zp
z7!6V=TYBeN3dDyp(|J@tu+h_;=IGl>*=c><d43GXZSJ~1ro8ISd-~{K4l*su<EUxn
z(8XO`vW}9}*!t@y%+0X>hPjYhG7zAr>Be^@ZQ(?}vLz{>+uNQVVGSNg77jssfALTJ
zj-;Sbw}zIS8hx{-lT#K?QC*{%Xiqs$dt#lZ*PKgz`F@bU=ASJZ3GRko(mB^@4DMUM
k=ii<!87usi^6uBk(_C%7#q%|q$KZeBqEfd~L^NFgFL?*@XaE2J

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/accessibility/manual/resource/jsliderIcon.gif b/test/jdk/javax/accessibility/manual/resource/jsliderIcon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..61924f50ea5456828dab4227537c68b9276b7145
GIT binary patch
literal 426
zcmZ?wbhEHbRA5kGxXQ!;1pk46;s4KH|9<@Z{rbaC_kvBYKm2(8@#n)=Uq5{PeeLnb
z2d}=~d;0d($Dgl1{y1>u#pye5uRi{G?eT|)ufINd`|U1B>c`p>54WCsy6xPP{a0V^
zzw+Y1)fcDkygha2&FMRD9=!g#{OJ9)CxHrpvM)9qzWm_zmwV6N_N_Y5zxu%X!<RN3
zzI6B5+k4O6tUq$;-~azFU%oUpHU_zj2%z|rg^_`Qi9rXX7UU-ew&M<s1s*z5{U??b
zoy@VCe_=(5*V?G{p)<=)-}OqJx}id6n(M(QB}aLtYTo-`F{jt$#(Or&#Pjbzr&d%r
zu`#x`85wkTb$1zQ^-t(;=G7I`)6+0wo;_#o93#VpixxJk>1(U$s2TBb@Qbsq<=|lD
z=VxEAcu}+F-hD>uoSY&&heZx4@`&u*W!T(UX2dNdd{vnH#*KyxW!^@D@(<+|<Q|p;
v8_CMNR+Scb9%7^-sUoHFAyQdc;zyW~(%*F~N1Qe+IM~b~td%0f!e9*m{b$dL

literal 0
HcmV?d00001

-- 
GitLab


From 535938722028b86e9d77d3728190f62f42117792 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <damon.nguyen@oracle.com>
Date: Tue, 29 Mar 2022 16:52:37 +0000
Subject: [PATCH 251/345] 8024624: [TEST_BUG] [macosx] CTRL+RIGHT(LEFT) doesn't
 move selection on next cell in JTable on Aqua L&F

Reviewed-by: kizune, prr, serb
---
 .../JTableOrientationNavTest.java             | 295 ++++++++++++++++++
 1 file changed, 295 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTable/JTableOrientationNavTest/JTableOrientationNavTest.java

diff --git a/test/jdk/javax/swing/JTable/JTableOrientationNavTest/JTableOrientationNavTest.java b/test/jdk/javax/swing/JTable/JTableOrientationNavTest/JTableOrientationNavTest.java
new file mode 100644
index 00000000000..653ae205993
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/JTableOrientationNavTest/JTableOrientationNavTest.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/* @test
+ * @bug 8024624
+ * @key headful
+ * @requires (os.family != "mac")
+ * @summary Tests some of JTable's key navigation
+ * @run main JTableOrientationNavTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.ComponentOrientation;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableModel;
+
+import static java.awt.event.KeyEvent.VK_CONTROL;
+import static java.awt.event.KeyEvent.VK_LEFT;
+import static java.awt.event.KeyEvent.VK_PAGE_DOWN;
+import static java.awt.event.KeyEvent.VK_PAGE_UP;
+import static java.awt.event.KeyEvent.VK_RIGHT;
+import static java.awt.event.KeyEvent.VK_SHIFT;
+
+public class JTableOrientationNavTest {
+    private static JFrame frame;
+    private static JTable table;
+    private static JScrollPane sp;
+    private static Robot robot;
+    private static boolean ltr = true;
+
+    public static void main(String[] args) throws InterruptedException, InvocationTargetException {
+        try {
+            robot = new Robot();
+            robot.setAutoDelay(100);
+            robot.setAutoWaitForIdle(true);
+
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame();
+                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+                frame.add(createContentPane());
+                frame.pack();
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            });
+
+            executeTest();
+            setupRTL();
+            executeTest();
+
+            System.out.println("Passed");
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            SwingUtilities.invokeAndWait(() -> frame.dispose());
+        }
+    }
+
+    private static TableModel getTableModel1() {
+        String[] columnNames = {"Column 0", "Column 1", "Column 2",
+                "Column 3", "Column 4"};
+        String[][] data = {{"Table 00, 00", "Table 00, 01", "Table 00, 02",
+                                    "Table 00, 03", "Table 00, 04"},
+                           {"Table 01, 00", "Table 01, 01", "Table 01, 02",
+                                   "Table 01, 03", "Table 01, 04"},
+                           {"Table 02, 00", "Table 02, 01", "Table 02, 02",
+                                   "Table 02, 03", "Table 02, 04"},
+                           {"Table 03, 00", "Table 03, 01", "Table 03, 02",
+                                   "Table 03, 03", "Table 03, 04"},
+                           {"Table 04, 00", "Table 04, 01", "Table 04, 02",
+                                   "Table 04, 03", "Table 04, 04"},
+                           {"Table 05, 00", "Table 05, 01", "Table 05, 02",
+                                   "Table 05, 03", "Table 05, 04"}};
+
+        return new DefaultTableModel(data, columnNames);
+    }
+
+    private static TableModel getTableModel2() {
+        String[] columnNames = new String[30];
+        String[][] data = new String[1][30];
+
+        for (int i = 0; i < columnNames.length; i++) {
+            columnNames[i] = "Column " + i;
+            data[0][i] = "Data " + 1;
+        }
+
+        return new DefaultTableModel(data, columnNames);
+    }
+
+    private static Component createContentPane() {
+        table = new JTable(getTableModel1());
+        table.setCellSelectionEnabled(true);
+        table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        JPanel panel = new JPanel(new BorderLayout());
+        sp = new JScrollPane(table);
+        panel.add(sp);
+        return panel;
+    }
+
+    private static void executeTest() throws InterruptedException, InvocationTargetException {
+        SwingUtilities.invokeAndWait(() -> {
+            table.setRowSelectionInterval(0, 0);
+            table.setColumnSelectionInterval(0, 0);
+            checkSelection(0, 0);
+        });
+
+        robot.keyPress(ltr ? VK_RIGHT : VK_LEFT);
+        robot.keyRelease(ltr ? VK_RIGHT : VK_LEFT);
+
+        SwingUtilities.invokeAndWait(() -> checkSelection(1, 1));
+
+        robot.keyPress(VK_CONTROL);
+        robot.keyPress(ltr ? VK_RIGHT : VK_LEFT);
+        robot.keyRelease(ltr ? VK_RIGHT : VK_LEFT);
+        robot.keyRelease(VK_CONTROL);
+
+        SwingUtilities.invokeAndWait(() -> {
+            checkSelection(2, 1);
+            table.setRowSelectionInterval(0, 0);
+            table.setColumnSelectionInterval(4, 4);
+            checkSelection(4, 4);
+        });
+
+        robot.keyPress(ltr ? VK_LEFT : VK_RIGHT);
+        robot.keyRelease(ltr ? VK_LEFT : VK_RIGHT);
+
+        SwingUtilities.invokeAndWait(() -> checkSelection(3, 3));
+
+        robot.keyPress(VK_CONTROL);
+        robot.keyPress(ltr ? VK_LEFT : VK_RIGHT);
+        robot.keyRelease(ltr ? VK_LEFT : VK_RIGHT);
+        robot.keyRelease(VK_CONTROL);
+
+        SwingUtilities.invokeAndWait(() -> {
+            checkSelection(2, 3);
+            table.setColumnSelectionInterval(2, 2);
+            checkSelection(2, 2);
+        });
+
+        robot.keyPress(VK_CONTROL);
+        robot.keyPress(VK_PAGE_UP);
+        robot.keyRelease(VK_PAGE_UP);
+        robot.keyRelease(VK_CONTROL);
+
+        SwingUtilities.invokeAndWait(() -> {
+            checkSelection(0, 0);
+            table.setColumnSelectionInterval(2, 2);
+            checkSelection(2, 2);
+        });
+
+        robot.keyPress(VK_CONTROL);
+        robot.keyPress(VK_PAGE_DOWN);
+        robot.keyRelease(VK_PAGE_DOWN);
+        robot.keyRelease(VK_CONTROL);
+
+        SwingUtilities.invokeAndWait(() -> {
+            checkSelection(4, 4);
+            table.setColumnSelectionInterval(2, 2);
+            checkSelection(2, 2);
+        });
+
+        robot.keyPress(VK_CONTROL);
+        robot.keyPress(VK_SHIFT);
+        robot.keyPress(VK_PAGE_UP);
+        robot.keyRelease(VK_PAGE_UP);
+        robot.keyRelease(VK_SHIFT);
+        robot.keyRelease(VK_CONTROL);
+
+        SwingUtilities.invokeAndWait(() -> {
+            checkSelection(0, 0, 1, 2);
+            table.setColumnSelectionInterval(2, 2);
+            checkSelection(2, 2);
+        });
+
+        robot.keyPress(VK_CONTROL);
+        robot.keyPress(VK_SHIFT);
+        robot.keyPress(VK_PAGE_DOWN);
+        robot.keyRelease(VK_PAGE_DOWN);
+        robot.keyRelease(VK_SHIFT);
+        robot.keyRelease(VK_CONTROL);
+
+        SwingUtilities.invokeAndWait(() -> {
+            checkSelection(4, 2, 3, 4);
+            table.setModel(getTableModel2());
+            table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+            table.setRowSelectionInterval(0, 0);
+            table.setColumnSelectionInterval(0, 0);
+            table.scrollRectToVisible(new Rectangle(ltr ? 0 : table.getWidth(), 0, 1, 1));
+            checkSelection(0, 0);
+        });
+
+        robot.keyPress(VK_CONTROL);
+        robot.keyPress(VK_PAGE_DOWN);
+        robot.keyRelease(VK_PAGE_DOWN);
+        robot.keyRelease(VK_CONTROL);
+
+        SwingUtilities.invokeAndWait(() -> {
+            checkSelection(6, 6);
+            table.setColumnSelectionInterval(29, 29);
+            table.scrollRectToVisible(new Rectangle(ltr ? table.getWidth() : 0, 0, 1, 1));
+            checkSelection(29, 29);
+        });
+
+        robot.keyPress(VK_CONTROL);
+        robot.keyPress(VK_PAGE_UP);
+        robot.keyRelease(VK_PAGE_UP);
+        robot.keyRelease(VK_CONTROL);
+
+        SwingUtilities.invokeAndWait(() -> checkSelection(23, 23));
+
+        System.out.println("Done with ltr: " + ltr);
+    }
+
+    private static void setupRTL() throws InterruptedException, InvocationTargetException {
+        ltr = false;
+        SwingUtilities.invokeAndWait(() -> {
+            table.setModel(getTableModel1());
+            table.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
+            sp.applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+        });
+    }
+
+    private static void checkSelection(int col, int... allCols) {
+        int trow = table.getSelectionModel().getLeadSelectionIndex();
+        int[] trows = table.getSelectedRows();
+        int tcol = table.getColumnModel().getSelectionModel().getLeadSelectionIndex();
+        int[] tcols = table.getSelectedColumns();
+
+        if (trow != 0) {
+            throw new RuntimeException("Wrong lead row");
+        }
+
+        if (trows.length != 1 || trows[0] != 0) {
+            throw new RuntimeException("Bad row selection");
+        }
+
+        if (col != tcol) {
+            throw new RuntimeException("Wrong lead col");
+        }
+
+        if (allCols == null || allCols.length == 0) {
+            if (tcols.length != 0) {
+                throw new RuntimeException("Should be no cols selected");
+            }
+        } else {
+            Arrays.sort(tcols);
+            Arrays.sort(allCols);
+
+            for (int c : allCols) {
+                if (Arrays.binarySearch(tcols, c) < 0) {
+                    throw new RuntimeException("Wrong column selection");
+                }
+            }
+
+            for (int c : tcols) {
+                if (Arrays.binarySearch(allCols, c) < 0) {
+                    throw new RuntimeException("Wrong column selection");
+                }
+            }
+        }
+    }
+
+}
-- 
GitLab


From 9591306760ffa0725977db8d3bb66758baeafbf6 Mon Sep 17 00:00:00 2001
From: Aleksei Efimov <aefimov@openjdk.org>
Date: Tue, 29 Mar 2022 17:06:20 +0000
Subject: [PATCH 252/345] 8283772: Make sun.net.dns.ResolverConfiguration
 sealed

Reviewed-by: jpai, dfuchs
---
 .../share/classes/sun/net/dns/ResolverConfiguration.java      | 4 ++--
 .../unix/classes/sun/net/dns/ResolverConfigurationImpl.java   | 4 ++--
 .../classes/sun/net/dns/ResolverConfigurationImpl.java        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java b/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
index e0048d80d3e..ecd2dddf357 100644
--- a/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
+++ b/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ import java.util.List;
  * @since 1.4
  */
 
-public abstract class ResolverConfiguration {
+public sealed abstract class ResolverConfiguration permits ResolverConfigurationImpl {
 
     private static final Object lock = new Object();
 
diff --git a/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java
index 5584aba125b..6074d323fa5 100644
--- a/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java
+++ b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ import java.io.IOException;
  * and Linux.
  */
 
-public class ResolverConfigurationImpl
+public final class ResolverConfigurationImpl
     extends ResolverConfiguration
 {
     // Lock helds whilst loading configuration or checking
diff --git a/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java b/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
index ac7780b072d..c3cf072007f 100644
--- a/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
+++ b/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
  * An implementation of sun.net.ResolverConfiguration for Windows.
  */
 
-public class ResolverConfigurationImpl
+public final class ResolverConfigurationImpl
     extends ResolverConfiguration
 {
     // Lock held whilst loading configuration or checking
-- 
GitLab


From f9f439a19d11501cfa77db065051086ab794e9f4 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Tue, 29 Mar 2022 18:37:27 +0000
Subject: [PATCH 253/345] 8283717:
 vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001 failed due to
 SocketTimeoutException

Reviewed-by: lmesnik, amenkov, sspitsyn
---
 .../vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java
index 9de6f2c301f..213a7fb3c46 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,6 +151,8 @@ public class thread001 {
             if (checkedRequest != null) {
                 log.display("Disabling event request");
                 checkedRequest.disable();
+                // need to resume all threads in case a stray ThreadStartEvent arrived
+                vm.resume();
             }
 
             // force debuggee to quit
-- 
GitLab


From 2fef5d4a334fd67b5e2a8f342cd7a5143830ddf1 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Tue, 29 Mar 2022 18:38:42 +0000
Subject: [PATCH 254/345] 8281853: serviceability/sa/ClhsdbThreadContext.java
 failed with NullPointerException: Cannot invoke
 "sun.jvm.hotspot.gc.shared.GenCollectedHeap.getGen(int)" because "this.heap"
 is null

Reviewed-by: kevinw, sspitsyn
---
 .../classes/sun/jvm/hotspot/utilities/PointerFinder.java   | 1 +
 .../classes/sun/jvm/hotspot/utilities/PointerLocation.java | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java
index cd9e8264f28..f0e7b0997e9 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java
@@ -87,6 +87,7 @@ public class PointerFinder {
     if (heap instanceof GenCollectedHeap) {
       GenCollectedHeap genheap = (GenCollectedHeap) heap;
       if (genheap.isIn(a)) {
+        loc.heap = heap;
         for (int i = 0; i < genheap.nGens(); i++) {
           Generation g = genheap.getGen(i);
           if (g.isIn(a)) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
index a7cfa5de983..d474469c562 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
@@ -107,22 +107,21 @@ public class PointerLocation {
   }
 
   public boolean isInHeap() {
-    return (heap != null || (gen != null));
+    return (heap != null);
   }
 
   public boolean isInNewGen() {
-    return ((gen != null) && (gen == ((GenCollectedHeap)heap).getGen(0)));
+    return ((gen != null) && (gen.equals(((GenCollectedHeap)heap).getGen(0))));
   }
 
   public boolean isInOldGen() {
-    return ((gen != null) && (gen == ((GenCollectedHeap)heap).getGen(1)));
+    return ((gen != null) && (gen.equals(((GenCollectedHeap)heap).getGen(1))));
   }
 
   public boolean inOtherGen() {
     return (!isInNewGen() && !isInOldGen());
   }
 
-  /** Only valid if isInHeap() */
   public Generation getGeneration() {
       return gen;
   }
-- 
GitLab


From 072f2c461e8b0f10bdecadda31b3facfbe6da681 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Tue, 29 Mar 2022 19:48:43 +0000
Subject: [PATCH 255/345] 8283782: Redundant verification of year in
 LocalDate::ofEpochDay

Reviewed-by: rriggs, naoto
---
 .../share/classes/java/time/LocalDate.java    |  6 ++--
 .../time/test/java/time/TestLocalDate.java    | 36 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index 4564355e8bb..94e170c8b13 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -367,9 +367,7 @@ public final class LocalDate
         int dom = marchDoy0 - (marchMonth0 * 306 + 5) / 10 + 1;
         yearEst += marchMonth0 / 10;
 
-        // check year now we are certain it is correct
-        int year = YEAR.checkValidIntValue(yearEst);
-        return new LocalDate(year, month, dom);
+        return new LocalDate((int)yearEst, month, dom);
     }
 
     //-----------------------------------------------------------------------
diff --git a/test/jdk/java/time/test/java/time/TestLocalDate.java b/test/jdk/java/time/test/java/time/TestLocalDate.java
index 91eb2a45d89..4b732b0619b 100644
--- a/test/jdk/java/time/test/java/time/TestLocalDate.java
+++ b/test/jdk/java/time/test/java/time/TestLocalDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,9 +63,12 @@ import static java.time.temporal.ChronoField.YEAR;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
+import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.Month;
+import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.IsoFields;
 
@@ -420,6 +423,37 @@ public class TestLocalDate extends AbstractTest {
         }
     }
 
+    @Test
+    public void test_ofEpochDay_edges() {
+        long minDay = ChronoField.EPOCH_DAY.range().getMinimum();
+        long maxDay = ChronoField.EPOCH_DAY.range().getMaximum();
+        long minYear = ChronoField.YEAR.range().getMinimum();
+        long maxYear = ChronoField.YEAR.range().getMinimum();
+        int[] offsets = new int[] { 0, 1, 2, 3, 28, 29, 30, 31, 32, 363, 364, 365, 366, 367 };
+        for (int offset : offsets) {
+            LocalDate minDate = LocalDate.ofEpochDay(minDay + offset);
+            assertEquals(minDate, LocalDate.MIN.plusDays(offset));
+            assertTrue(ChronoField.YEAR.range().isValidValue(minDate.getYear()));
+
+            LocalDate maxDate = LocalDate.ofEpochDay(maxDay - offset);
+            assertEquals(maxDate, LocalDate.MAX.minusDays(offset));
+            assertTrue(ChronoField.YEAR.range().isValidValue(maxDate.getYear()));
+
+            try {
+                LocalDate.ofEpochDay(minDay - 1 - offset);
+                fail("Expected DateTimeException");
+            } catch (DateTimeException e) {
+                // expected
+            }
+            try {
+                LocalDate.ofEpochDay(maxDay + 1 + offset);
+                fail("Expected DateTimeException");
+            } catch (DateTimeException e) {
+                // expected
+            }
+        }
+    }
+
     void doTest_comparisons_LocalDate(LocalDate... localDates) {
         for (int i = 0; i < localDates.length; i++) {
             LocalDate a = localDates[i];
-- 
GitLab


From 489b27d2c0284f9248bfb0448950698a3f9dee36 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Tue, 29 Mar 2022 19:57:53 +0000
Subject: [PATCH 256/345] 8282776: Bad NullPointerException message when
 invoking an interface MethodHandle on a null receiver

Reviewed-by: psandoz
---
 .../java/lang/invoke/DirectMethodHandle.java  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
index e2106883e5a..b8e1b48587b 100644
--- a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -416,9 +416,14 @@ sealed class DirectMethodHandle extends MethodHandle {
         }
         Object checkReceiver(Object recv) {
             if (!caller.isInstance(recv)) {
-                String msg = String.format("Receiver class %s is not a subclass of caller class %s",
-                                           recv.getClass().getName(), caller.getName());
-                throw new IncompatibleClassChangeError(msg);
+                if (recv != null) {
+                    String msg = String.format("Receiver class %s is not a subclass of caller class %s",
+                                               recv.getClass().getName(), caller.getName());
+                    throw new IncompatibleClassChangeError(msg);
+                } else {
+                    String msg = String.format("Cannot invoke %s with null receiver", member);
+                    throw new NullPointerException(msg);
+                }
             }
             return recv;
         }
@@ -444,9 +449,14 @@ sealed class DirectMethodHandle extends MethodHandle {
         @Override
         Object checkReceiver(Object recv) {
             if (!refc.isInstance(recv)) {
-                String msg = String.format("Receiver class %s does not implement the requested interface %s",
-                                           recv.getClass().getName(), refc.getName());
-                throw new IncompatibleClassChangeError(msg);
+                if (recv != null) {
+                    String msg = String.format("Receiver class %s does not implement the requested interface %s",
+                                               recv.getClass().getName(), refc.getName());
+                    throw new IncompatibleClassChangeError(msg);
+                } else {
+                    String msg = String.format("Cannot invoke %s with null receiver", member);
+                    throw new NullPointerException(msg);
+                }
             }
             return recv;
         }
-- 
GitLab


From a9a9b901b4b340dc573ace72d64edcb0a1b8ef94 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Tue, 29 Mar 2022 19:58:53 +0000
Subject: [PATCH 257/345] 8283723: Update Visual Studio 2022 to version 17.1.0
 for Oracle builds on Windows

Reviewed-by: erikj, ihse
---
 doc/building.html                             |   2 +-
 doc/building.md                               |   2 +-
 make/conf/jib-profiles.js                     |   2 +-
 ...wsDevkit2019.sh => createWindowsDevkit.sh} |  47 +++-
 make/devkit/createWindowsDevkit2017.sh        | 221 ------------------
 5 files changed, 39 insertions(+), 235 deletions(-)
 rename make/devkit/{createWindowsDevkit2019.sh => createWindowsDevkit.sh} (91%)
 delete mode 100644 make/devkit/createWindowsDevkit2017.sh

diff --git a/doc/building.html b/doc/building.html
index 66e07f07b9d..4745af2a1d7 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -281,7 +281,7 @@
 </tr>
 <tr class="odd">
 <td style="text-align: left;">Windows</td>
-<td style="text-align: left;">Microsoft Visual Studio 2019 update 16.7.2</td>
+<td style="text-align: left;">Microsoft Visual Studio 2022 update 17.1.0</td>
 </tr>
 </tbody>
 </table>
diff --git a/doc/building.md b/doc/building.md
index 6bc5857811e..f3b0ee10522 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -331,7 +331,7 @@ issues.
  ------------------ -------------------------------------------------------
  Linux              gcc 11.2.0
  macOS              Apple Xcode 10.1 (using clang 10.0.0)
- Windows            Microsoft Visual Studio 2019 update 16.7.2
+ Windows            Microsoft Visual Studio 2022 update 17.1.0
 
 All compilers are expected to be able to compile to the C99 language standard,
 as some C99 features are used in the source code. Microsoft Visual Studio
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index f16d7fd12e7..1d9e1d1e3d0 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1054,7 +1054,7 @@ var getJibProfilesDependencies = function (input, common) {
     var devkit_platform_revisions = {
         linux_x64: "gcc11.2.0-OL6.4+1.0",
         macosx: "Xcode12.4+1.0",
-        windows_x64: "VS2019-16.9.3+1.0",
+        windows_x64: "VS2022-17.1.0+1.0",
         linux_aarch64: "gcc11.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
diff --git a/make/devkit/createWindowsDevkit2019.sh b/make/devkit/createWindowsDevkit.sh
similarity index 91%
rename from make/devkit/createWindowsDevkit2019.sh
rename to make/devkit/createWindowsDevkit.sh
index a5c89f09faa..f738c3a89fb 100644
--- a/make/devkit/createWindowsDevkit2019.sh
+++ b/make/devkit/createWindowsDevkit.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,19 @@
 # suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin or WSL.
 # erik.joelsson@oracle.com
 
-VS_VERSION="2019"
-VS_VERSION_NUM_NODOT="160"
+usage_and_exit() {
+    echo "Usage: createWindowsDevkit.sh <2019 | 2022>"
+    exit 1
+}
+
+if [ ! $# = 1 ]; then
+    usage_and_exit
+fi
+
+VS_VERSION="$1"
+
 VS_DLL_VERSION="140"
 SDK_VERSION="10"
-SDK_FULL_VERSION="10.0.17763.0"
-MSVC_DIR="Microsoft.VC142.CRT"
-MSVC_FULL_VERSION="14.12.27508"
-REDIST_FULL_VERSION="14.20.27508"
 
 SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
 BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
@@ -66,13 +71,33 @@ fi
 
 # Work around the insanely named ProgramFiles(x86) env variable
 PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
+PROGRAMFILES="$($WINDOWS_PATH_TO_UNIX_PATH "$PROGRAMFILES")"
+
+case $VS_VERSION in
+    2019)
+        MSVC_PROGRAMFILES_DIR="${PROGRAMFILES_X86}"
+        MSVC_CRT_DIR="Microsoft.VC142.CRT"
+        VS_VERSION_NUM_NODOT="160"
+        ;;
+
+    2022)
+        MSVC_PROGRAMFILES_DIR="${PROGRAMFILES}"
+        MSVC_CRT_DIR="Microsoft.VC143.CRT"
+        VS_VERSION_NUM_NODOT="170"
+        ;;
+    *)
+        echo "Unexpected VS version: $VS_VERSION"
+        usage_and_exit
+        ;;
+esac
+
 
 # Find Visual Studio installation dir
 VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
 if [ -d "$VSNNNCOMNTOOLS" ]; then
     VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
 else
-    VS_INSTALL_DIR="${PROGRAMFILES_X86}/Microsoft Visual Studio/2019"
+    VS_INSTALL_DIR="${MSVC_PROGRAMFILES_DIR}/Microsoft Visual Studio/$VS_VERSION"
     VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
 fi
 echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
@@ -101,9 +126,9 @@ DEVKIT_BUNDLE="${DEVKIT_ROOT}.tar.gz"
 
 echo "Creating devkit in $DEVKIT_ROOT"
 
-MSVCR_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}.dll
-VCRUNTIME_1_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}_1.dll
-MSVCP_DLL=${MSVC_DIR}/msvcp${VS_DLL_VERSION}.dll
+MSVCR_DLL=${MSVC_CRT_DIR}/vcruntime${VS_DLL_VERSION}.dll
+VCRUNTIME_1_DLL=${MSVC_CRT_DIR}/vcruntime${VS_DLL_VERSION}_1.dll
+MSVCP_DLL=${MSVC_CRT_DIR}/msvcp${VS_DLL_VERSION}.dll
 
 ################################################################################
 # Copy Visual Studio files
diff --git a/make/devkit/createWindowsDevkit2017.sh b/make/devkit/createWindowsDevkit2017.sh
deleted file mode 100644
index 42c13251293..00000000000
--- a/make/devkit/createWindowsDevkit2017.sh
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 script copies parts of a Visual Studio installation into a devkit
-# suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin or WSL.
-# erik.joelsson@oracle.com
-
-VS_VERSION="2017"
-VS_VERSION_NUM_NODOT="150"
-VS_DLL_VERSION="140"
-SDK_VERSION="10"
-MSVC_DIR="Microsoft.VC141.CRT"
-
-SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
-BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
-
-################################################################################
-# Prepare settings
-
-UNAME_SYSTEM=`uname -s`
-UNAME_RELEASE=`uname -r`
-
-# Detect cygwin or WSL
-IS_CYGWIN=`echo $UNAME_SYSTEM | grep -i CYGWIN`
-IS_WSL=`echo $UNAME_RELEASE | grep Microsoft`
-if test "x$IS_CYGWIN" != "x"; then
-    BUILD_ENV="cygwin"
-elif test "x$IS_WSL" != "x"; then
-    BUILD_ENV="wsl"
-else
-    echo "Unknown environment; only Cygwin and WSL are supported."
-    exit 1
-fi
-
-if test "x$BUILD_ENV" = "xcygwin"; then
-    WINDOWS_PATH_TO_UNIX_PATH="cygpath -u"
-elif test "x$BUILD_ENV" = "xwsl"; then
-    WINDOWS_PATH_TO_UNIX_PATH="wslpath -u"
-fi
-
-# Work around the insanely named ProgramFiles(x86) env variable
-PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
-
-# Find Visual Studio installation dir
-VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
-if [ -d "$VSNNNCOMNTOOLS" ]; then
-    VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
-else
-    VS_INSTALL_DIR="${PROGRAMFILES_X86}/Microsoft Visual Studio/2017"
-    VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
-fi
-echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
-
-# Extract semantic version
-POTENTIAL_INI_FILES="Common7/IDE/wdexpress.isolation.ini Common7/IDE/devenv.isolation.ini"
-for f in $POTENTIAL_INI_FILES; do
-    if [ -f "$VS_INSTALL_DIR/$f" ]; then
-        VS_VERSION_SP="$(grep ^SemanticVersion= "$VS_INSTALL_DIR/$f")"
-        # Remove SemnaticVersion=
-        VS_VERSION_SP="${VS_VERSION_SP#*=}"
-        # Remove suffix of too detailed numbering starting with +
-        VS_VERSION_SP="${VS_VERSION_SP%+*}"
-        break
-    fi
-done
-if [ -z "$VS_VERSION_SP" ]; then
-    echo "Failed to find SP version"
-    exit 1
-fi
-echo "Found Version SP: $VS_VERSION_SP"
-
-# Setup output dirs
-DEVKIT_ROOT="${BUILD_DIR}/VS${VS_VERSION}-${VS_VERSION_SP}-devkit"
-DEVKIT_BUNDLE="${DEVKIT_ROOT}.tar.gz"
-
-echo "Creating devkit in $DEVKIT_ROOT"
-
-MSVCR_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}.dll
-MSVCP_DLL=${MSVC_DIR}/msvcp${VS_DLL_VERSION}.dll
-
-################################################################################
-# Copy Visual Studio files
-
-TOOLS_VERSION="$(ls "$VS_INSTALL_DIR/VC/Tools/MSVC" | sort -r -n | head -n1)"
-echo "Found Tools version: $TOOLS_VERSION"
-VC_SUBDIR="VC/Tools/MSVC/$TOOLS_VERSION"
-REDIST_VERSION="$(ls "$VS_INSTALL_DIR/VC/Redist/MSVC" | sort -r -n | head -n1)"
-echo "Found Redist version: $REDIST_VERSION"
-REDIST_SUBDIR="VC/Redist/MSVC/$REDIST_VERSION"
-echo "Copying VC..."
-rm -rf $DEVKIT_ROOT/VC
-mkdir -p $DEVKIT_ROOT/VC/bin
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/arm64" $DEVKIT_ROOT/VC/bin/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/x64" $DEVKIT_ROOT/VC/bin/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx86/x86" $DEVKIT_ROOT/VC/bin/
-mkdir -p $DEVKIT_ROOT/VC/lib
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/arm64" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x64" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x86" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/include" $DEVKIT_ROOT/VC/
-mkdir -p $DEVKIT_ROOT/VC/atlmfc/lib
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/arm64" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x64" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x86" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/include" $DEVKIT_ROOT/VC/atlmfc/
-mkdir -p $DEVKIT_ROOT/VC/Auxiliary
-cp -r "$VS_INSTALL_DIR/VC/Auxiliary/Build" $DEVKIT_ROOT/VC/Auxiliary/
-mkdir -p $DEVKIT_ROOT/VC/redist
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/arm64" $DEVKIT_ROOT/VC/redist/
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x64" $DEVKIT_ROOT/VC/redist/
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x86" $DEVKIT_ROOT/VC/redist/
-
-# The redist runtime libs are needed to run the compiler but may not be
-# installed on the machine where the devkit will be used.
-cp $DEVKIT_ROOT/VC/redist/x86/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x86
-cp $DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x86
-cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x64
-cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x64
-cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/arm64
-cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
-
-################################################################################
-# Copy SDK files
-
-SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
-echo "SDK_INSTALL_DIR: $SDK_INSTALL_DIR"
-
-SDK_FULL_VERSION="$(ls "$SDK_INSTALL_DIR/bin" | sort -r -n | head -n1)"
-echo "Found SDK version: $SDK_FULL_VERSION"
-UCRT_VERSION="$(ls "$SDK_INSTALL_DIR/Redist" | grep $SDK_VERSION | sort -r -n | head -n1)"
-echo "Found UCRT version: $UCRT_VERSION"
-echo "Copying SDK..."
-rm -rf $DEVKIT_ROOT/$SDK_VERSION
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/bin
-cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x64" $DEVKIT_ROOT/$SDK_VERSION/bin/
-cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x86" $DEVKIT_ROOT/$SDK_VERSION/bin/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/lib
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/Redist
-cp -r "$SDK_INSTALL_DIR/Redist/$UCRT_VERSION/ucrt" $DEVKIT_ROOT/$SDK_VERSION/Redist/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/include
-cp -r "$SDK_INSTALL_DIR/include/$SDK_FULL_VERSION/"* $DEVKIT_ROOT/$SDK_VERSION/include/
-
-################################################################################
-# Generate devkit.info
-
-echo-info() {
-    echo "$1" >> $DEVKIT_ROOT/devkit.info
-}
-
-echo "Generating devkit.info..."
-rm -f $DEVKIT_ROOT/devkit.info
-echo-info "# This file describes to configure how to interpret the contents of this devkit"
-echo-info "DEVKIT_NAME=\"Microsoft Visual Studio $VS_VERSION $VS_VERSION_SP (devkit)\""
-echo-info "DEVKIT_VS_VERSION=\"$VS_VERSION\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_x86=\"\$DEVKIT_ROOT/VC/bin/x86:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_x86=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_x86=\"\$DEVKIT_ROOT/VC/lib/x86;\$DEVKIT_ROOT/VC/atlmfc/lib/x86;\$DEVKIT_ROOT/$SDK_VERSION/lib/x86\""
-echo-info "DEVKIT_MSVCR_DLL_x86=\"\$DEVKIT_ROOT/VC/redist/x86/$MSVCR_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_x86=\"\$DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_x86=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/x86\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_x86_64=\"\$DEVKIT_ROOT/VC/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_x86_64=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_x86_64=\"\$DEVKIT_ROOT/VC/lib/x64;\$DEVKIT_ROOT/VC/atlmfc/lib/x64;\$DEVKIT_ROOT/$SDK_VERSION/lib/x64\""
-echo-info "DEVKIT_MSVCR_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_x86_64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/x64\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_aarch64=\"\$DEVKIT_ROOT/VC/bin/arm64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_aarch64=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_aarch64=\"\$DEVKIT_ROOT/VC/lib/arm64;\$DEVKIT_ROOT/VC/atlmfc/lib/arm64;\$DEVKIT_ROOT/$SDK_VERSION/lib/arm64\""
-echo-info "DEVKIT_MSVCR_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_aarch64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/arm64\""
-echo-info ""
-echo-info "DEVKIT_TOOLS_VERSION=\"$TOOLS_VERSION\""
-echo-info "DEVKIT_REDIST_VERSION=\"$REDIST_VERSION\""
-echo-info "DEVKIT_SDK_VERSION=\"$SDK_FULL_VERSION\""
-echo-info "DEVKIT_UCRT_VERSION=\"$UCRT_VERSION\""
-
-################################################################################
-# Copy this script
-
-echo "Copying this script..."
-cp $0 $DEVKIT_ROOT/
-
-################################################################################
-# Create bundle
-
-echo "Creating bundle: $DEVKIT_BUNDLE"
-(cd "$DEVKIT_ROOT" && tar zcf "$DEVKIT_BUNDLE" .)
-- 
GitLab


From 272d6531ef94534d2044377f126744b5139f7ae9 Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Tue, 29 Mar 2022 20:39:24 +0000
Subject: [PATCH 258/345] 8283889: Fix Typo in
 open/src/java.sql/share/classes/java/sql/package-info.java

Reviewed-by: joehw, iris
---
 src/java.sql/share/classes/java/sql/package-info.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.sql/share/classes/java/sql/package-info.java b/src/java.sql/share/classes/java/sql/package-info.java
index be494454a06..9e94e0b9393 100644
--- a/src/java.sql/share/classes/java/sql/package-info.java
+++ b/src/java.sql/share/classes/java/sql/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -334,7 +334,7 @@
  *
  * <ul>
  *   <li><a href="http://docs.oracle.com/javase/tutorial/jdbc/basics/index.html">
- *           Lesson:JDBC Basics(The Javaxx Tutorials &gt; JDBC Database Access)</a>
+ *           Lesson:JDBC Basics(The Java Tutorials &gt; JDBC Database Access)</a>
  *
  *  <li>&ldquo;<i>JDBC API Tutorial and Reference, Third Edition</i>&rdquo;
  * </ul>
-- 
GitLab


From 8cdabea0abdc702242a3fb4b0538980ab8f6a9d6 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 29 Mar 2022 21:18:31 +0000
Subject: [PATCH 259/345] 8207025: JvmtiEnv::SetSystemProperty() does not
 handle OOM

Reviewed-by: dholmes, sspitsyn
---
 src/hotspot/share/prims/jvmtiEnv.cpp    | 22 +++++++++++++++-------
 src/hotspot/share/runtime/arguments.cpp | 19 +++++++++----------
 src/hotspot/share/runtime/arguments.hpp | 13 +++++++------
 src/hotspot/share/utilities/ostream.cpp |  2 +-
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 84cd940a563..a43355181c9 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "logging/log.hpp"
 #include "logging/logConfiguration.hpp"
+#include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
@@ -3380,7 +3381,7 @@ JvmtiEnv::GetSystemProperties(jint* count_ptr, char*** property_ptr) {
   int readable_count = 0;
   // Loop through the system properties until all the readable properties are found.
   for (SystemProperty* p = Arguments::system_properties(); p != NULL && readable_count < *count_ptr; p = p->next()) {
-    if (p->is_readable()) {
+    if (p->readable()) {
       const char *key = p->key();
       char **tmp_value = *property_ptr+readable_count;
       readable_count++;
@@ -3427,14 +3428,21 @@ JvmtiEnv::GetSystemProperty(const char* property, char** value_ptr) {
 // value - NULL is a valid value, must be checked
 jvmtiError
 JvmtiEnv::SetSystemProperty(const char* property, const char* value_ptr) {
-  jvmtiError err =JVMTI_ERROR_NOT_AVAILABLE;
-
   for (SystemProperty* p = Arguments::system_properties(); p != NULL; p = p->next()) {
     if (strcmp(property, p->key()) == 0) {
-      if (p->set_writeable_value(value_ptr)) {
-        err =  JVMTI_ERROR_NONE;
+      if (p->writeable()) {
+        if (p->set_value(value_ptr, AllocFailStrategy::RETURN_NULL)) {
+          return JVMTI_ERROR_NONE;
+        } else {
+          return JVMTI_ERROR_OUT_OF_MEMORY;
+        }
+      } else {
+        // We found a property, but it's not writeable
+        return JVMTI_ERROR_NOT_AVAILABLE;
       }
     }
   }
-  return err;
+
+  // We cannot find a property of the given name
+  return JVMTI_ERROR_NOT_AVAILABLE;
 } /* end SetSystemProperty */
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 3a75c0d0804..db1480c4fb6 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -125,18 +125,17 @@ char* Arguments::_ext_dirs = NULL;
 // True if -Xshare:auto option was specified.
 static bool xshare_auto_cmd_line = false;
 
-bool PathString::set_value(const char *value) {
-  if (_value != NULL) {
-    FreeHeap(_value);
+bool PathString::set_value(const char *value, AllocFailType alloc_failmode) {
+  char* new_value = AllocateHeap(strlen(value)+1, mtArguments, alloc_failmode);
+  if (new_value == NULL) {
+    assert(alloc_failmode == AllocFailStrategy::RETURN_NULL, "must be");
+    return false;
   }
-  _value = AllocateHeap(strlen(value)+1, mtArguments);
-  assert(_value != NULL, "Unable to allocate space for new path value");
   if (_value != NULL) {
-    strcpy(_value, value);
-  } else {
-    // not able to allocate
-    return false;
+    FreeHeap(_value);
   }
+  _value = new_value;
+  strcpy(_value, value);
   return true;
 }
 
@@ -4254,7 +4253,7 @@ int Arguments::PropertyList_count(SystemProperty* pl) {
 int Arguments::PropertyList_readable_count(SystemProperty* pl) {
   int count = 0;
   while(pl != NULL) {
-    if (pl->is_readable()) {
+    if (pl->readable()) {
       count++;
     }
     pl = pl->next();
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
index 7910b366b38..99de15f1009 100644
--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
@@ -28,6 +28,7 @@
 #include "logging/logLevel.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/allocation.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
@@ -66,7 +67,8 @@ class PathString : public CHeapObj<mtArguments> {
  public:
   char* value() const { return _value; }
 
-  bool set_value(const char *value);
+  // return false iff OOM && alloc_failmode == AllocFailStrategy::RETURN_NULL
+  bool set_value(const char *value, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
   void append_value(const char *value);
 
   PathString(const char* value);
@@ -98,7 +100,6 @@ class SystemProperty : public PathString {
   SystemProperty* _next;
   bool            _internal;
   bool            _writeable;
-  bool writeable() { return _writeable; }
 
  public:
   // Accessors
@@ -107,8 +108,9 @@ class SystemProperty : public PathString {
   bool internal() const               { return _internal; }
   SystemProperty* next() const        { return _next; }
   void set_next(SystemProperty* next) { _next = next; }
+  bool writeable() const              { return _writeable; }
 
-  bool is_readable() const {
+  bool readable() const {
     return !_internal || (strcmp(_key, "jdk.boot.class.path.append") == 0 &&
                           value() != NULL);
   }
@@ -120,11 +122,10 @@ class SystemProperty : public PathString {
   // via -Xbootclasspath/a or JVMTI OnLoad phase call to AddToBootstrapClassLoaderSearch.
   // In those cases for jdk.boot.class.path.append, the base class
   // set_value and append_value methods are called directly.
-  bool set_writeable_value(const char *value) {
+  void set_writeable_value(const char *value) {
     if (writeable()) {
-      return set_value(value);
+      set_value(value);
     }
-    return false;
   }
   void append_writeable_value(const char *value) {
     if (writeable()) {
diff --git a/src/hotspot/share/utilities/ostream.cpp b/src/hotspot/share/utilities/ostream.cpp
index efb6a4ac7e6..52a1c5f0a14 100644
--- a/src/hotspot/share/utilities/ostream.cpp
+++ b/src/hotspot/share/utilities/ostream.cpp
@@ -746,7 +746,7 @@ void defaultStream::start_log() {
       outputStream *text = xs->text();
       for (SystemProperty* p = Arguments::system_properties(); p != NULL; p = p->next()) {
         assert(p->key() != NULL, "p->key() is NULL");
-        if (p->is_readable()) {
+        if (p->readable()) {
           // Print in two stages to avoid problems with long
           // keys/values.
           text->print_raw(p->key());
-- 
GitLab


From bfd9c2b30f17d3341cbe7f48d13d36708e5fafbf Mon Sep 17 00:00:00 2001
From: Srinivas Mandalika <smandalika@openjdk.org>
Date: Tue, 29 Mar 2022 22:26:01 +0000
Subject: [PATCH 260/345] 8283015: Create a test for JDK-4715496

Reviewed-by: serb
---
 .../8283015/AccessibleJTableCellNameTest.java | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 test/jdk/javax/accessibility/8283015/AccessibleJTableCellNameTest.java

diff --git a/test/jdk/javax/accessibility/8283015/AccessibleJTableCellNameTest.java b/test/jdk/javax/accessibility/8283015/AccessibleJTableCellNameTest.java
new file mode 100644
index 00000000000..3c2cc14b8f7
--- /dev/null
+++ b/test/jdk/javax/accessibility/8283015/AccessibleJTableCellNameTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @key headful
+ * @bug 4715496
+ * @summary AccessibleJTableCell.getAccessible name incorrectly returns
+ * cell instance string instead of cell text.
+ * @run main AccessibleJTableCellNameTest
+ */
+
+import java.awt.Robot;
+
+import javax.accessibility.Accessible;
+import javax.swing.JFrame;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+
+public class AccessibleJTableCellNameTest {
+    private static JTable jTable;
+    private static JFrame jFrame;
+    private static volatile Accessible accessible;
+
+    private static Object[][] rowData = {
+        { "01", "02", "03", "04", "05" },
+        { "11", "12", "13", "14", "15" },
+        { "21", "22", "23", "24", "25" },
+        { "31", "32", "33", "34", "35" },
+        { "41", "42", "43", "44", "45" } };
+
+    private static Object[] colNames = { "1", "2", "3", "4", "5" };
+
+    private static void doTest() throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> createGUI());
+            Robot robot = new Robot();
+            robot.setAutoDelay(500);
+            robot.waitForIdle();
+
+            SwingUtilities.invokeAndWait(() -> {
+                for (int i = 0; i <= colNames.length - 1; i++) {
+                    Accessible accessible = jTable.getAccessibleContext().getAccessibleTable()
+                        .getAccessibleColumnHeader().getAccessibleAt(0, i);
+
+                    if (!(accessible.getAccessibleContext().getAccessibleName().equals(colNames[i]))) {
+                        throw new RuntimeException(
+                            "AccessibleJTableCell.getAccessibleName returns correct name for header cells");
+                    }
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> jFrame.dispose());
+        }
+    }
+
+    private static void createGUI() {
+        jTable = new JTable(rowData, colNames);
+        jFrame = new JFrame();
+        jFrame.setBounds(100, 100, 300, 300);
+        jFrame.getContentPane().add(jTable);
+        jFrame.setVisible(true);
+    }
+
+    public static void main(String args[]) throws Exception {
+        doTest();
+        System.out.println("Test Passed");
+    }
+}
+
-- 
GitLab


From d06685680c17583d56dc3d788d9a2ecea8812bc8 Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Wed, 30 Mar 2022 01:36:51 +0000
Subject: [PATCH 261/345] 8282162: [vector] Optimize integral vector negation
 API

Reviewed-by: jiefu, psandoz, njian
---
 src/hotspot/cpu/aarch64/aarch64_neon.ad       |  41 +++++++
 src/hotspot/cpu/aarch64/aarch64_neon_ad.m4    |  23 +++-
 src/hotspot/cpu/aarch64/aarch64_sve.ad        |  58 ++++++++-
 src/hotspot/cpu/aarch64/aarch64_sve_ad.m4     |  20 +++-
 src/hotspot/share/adlc/formssel.cpp           |   2 +-
 src/hotspot/share/opto/classes.hpp            |   1 +
 src/hotspot/share/opto/vectorIntrinsics.cpp   |  24 +++-
 src/hotspot/share/opto/vectornode.cpp         | 112 +++++++++++++++++-
 src/hotspot/share/opto/vectornode.hpp         |  36 ++++--
 src/hotspot/share/runtime/vmStructs.cpp       |   8 +-
 .../jdk/incubator/vector/ByteVector.java      |   5 -
 .../jdk/incubator/vector/IntVector.java       |   5 -
 .../jdk/incubator/vector/LongVector.java      |   5 -
 .../jdk/incubator/vector/ShortVector.java     |   5 -
 .../incubator/vector/X-Vector.java.template   |   5 -
 15 files changed, 300 insertions(+), 50 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64_neon.ad b/src/hotspot/cpu/aarch64/aarch64_neon.ad
index feecd8ab90a..ab4d260856b 100644
--- a/src/hotspot/cpu/aarch64/aarch64_neon.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_neon.ad
@@ -4266,6 +4266,47 @@ instruct vsqrt2D(vecX dst, vecX src)
 
 // --------------------------------- NEG --------------------------------------
 
+instruct vnegID(vecD dst, vecD src)
+%{
+  predicate(n->as_Vector()->length_in_bytes() < 16);
+  match(Set dst (NegVI src));
+  ins_cost(INSN_COST);
+  format %{ "negr  $dst, $src\t# vector (8B/4H/2S)" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    Assembler::SIMD_Arrangement size = __ esize2arrangement((unsigned)type2aelembytes(bt), false);
+    __ negr(as_FloatRegister($dst$$reg), size, as_FloatRegister($src$$reg));
+  %}
+  ins_pipe(vunop_fp64);
+%}
+
+instruct vnegIX(vecX dst, vecX src)
+%{
+  predicate(n->as_Vector()->length_in_bytes() == 16);
+  match(Set dst (NegVI src));
+  ins_cost(INSN_COST);
+  format %{ "negr  $dst, $src\t# vector (16B/8H/4S)" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    Assembler::SIMD_Arrangement size = __ esize2arrangement((unsigned)type2aelembytes(bt), true);
+    __ negr(as_FloatRegister($dst$$reg), size, as_FloatRegister($src$$reg));
+  %}
+  ins_pipe(vunop_fp128);
+%}
+
+instruct vneg2L(vecX dst, vecX src)
+%{
+  predicate(n->as_Vector()->length() == 2);
+  match(Set dst (NegVL src));
+  ins_cost(INSN_COST);
+  format %{ "negr  $dst,$src\t# vector (2D)" %}
+  ins_encode %{
+    __ negr(as_FloatRegister($dst$$reg), __ T2D,
+            as_FloatRegister($src$$reg));
+  %}
+  ins_pipe(vunop_fp128);
+%}
+
 instruct vneg2F(vecD dst, vecD src)
 %{
   predicate(n->as_Vector()->length() == 2);
diff --git a/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
index f98ddf4ee36..fe8dc79e4f0 100644
--- a/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
@@ -1923,20 +1923,39 @@ VSQRT(fsqrt, 4,  F, X, S)
 VSQRT(fsqrt, 2,  D, X, D)
 
 // --------------------------------- NEG --------------------------------------
+define(`VNEGI', `
+instruct vnegI$1(vec$1 dst, vec$1 src)
+%{
+  predicate(n->as_Vector()->length_in_bytes() ifelse($1, D, <, ==) 16);
+  match(Set dst (NegVI src));
+  ins_cost(INSN_COST);
+  format %{ "negr  $dst, $src\t# vector ($2)" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    Assembler::SIMD_Arrangement size = __ esize2arrangement((unsigned)type2aelembytes(bt), ifelse($1, D, false, true));
+    __ negr(as_FloatRegister($dst$$reg), size, as_FloatRegister($src$$reg));
+  %}
+  ins_pipe(vunop_fp`'ifelse($1, D, 64, 128));
+%}')dnl
+dnl  $1  $2
+VNEGI(D, 8B/4H/2S)
+VNEGI(X, 16B/8H/4S)
+dnl
 define(`VNEG', `
 instruct vneg$2$3`'(vec$4 dst, vec$4 src)
 %{
   predicate(n->as_Vector()->length() == $2);
   match(Set dst (NegV$3 src));
-  ins_cost(INSN_COST * 3);
+  ins_cost(INSN_COST`'ifelse($3, L, `',` * 3'));
   format %{ "$1  $dst,$src\t# vector ($2$5)" %}
   ins_encode %{
-    __ $1(as_FloatRegister($dst$$reg), __ T$2`'ifelse($5, L, D, $5),
+    __ $1(as_FloatRegister($dst$$reg), __ T$2$5,
             as_FloatRegister($src$$reg));
   %}
   ins_pipe(vunop_fp`'ifelse($4, D, 64, 128));
 %}')dnl
 dnl  $1    $2  $3 $4 $5
+VNEG(negr, 2,  L, X, D)
 VNEG(fneg, 2,  F, D, S)
 VNEG(fneg, 4,  F, X, S)
 VNEG(fneg, 2,  D, X, D)
diff --git a/src/hotspot/cpu/aarch64/aarch64_sve.ad b/src/hotspot/cpu/aarch64/aarch64_sve.ad
index c048a463c1a..6b8e8f7daa9 100644
--- a/src/hotspot/cpu/aarch64/aarch64_sve.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_sve.ad
@@ -1936,7 +1936,34 @@ instruct vmulD_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
   ins_pipe(pipe_slow);
 %}
 
-// vector fneg
+// vector neg
+
+instruct vnegI(vReg dst, vReg src) %{
+  predicate(UseSVE > 0 &&
+            !n->as_Vector()->is_predicated_vector());
+  match(Set dst (NegVI src));
+  ins_cost(SVE_COST);
+  format %{ "sve_neg $dst, $src\t# vector (sve) (B/H/S)" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ sve_neg(as_FloatRegister($dst$$reg), __ elemType_to_regVariant(bt),
+         ptrue, as_FloatRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vnegL(vReg dst, vReg src) %{
+  predicate(UseSVE > 0 &&
+            !n->as_Vector()->is_predicated_vector());
+  match(Set dst (NegVL src));
+  ins_cost(SVE_COST);
+  format %{ "sve_neg $dst, $src\t# vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_neg(as_FloatRegister($dst$$reg), __ D,
+         ptrue, as_FloatRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
 
 instruct vnegF(vReg dst, vReg src) %{
   predicate(UseSVE > 0 &&
@@ -1964,7 +1991,34 @@ instruct vnegD(vReg dst, vReg src) %{
   ins_pipe(pipe_slow);
 %}
 
-// vector fneg - predicated
+// vector neg - predicated
+
+instruct vnegI_masked(vReg dst_src, pRegGov pg) %{
+  predicate(UseSVE > 0);
+  match(Set dst_src (NegVI dst_src pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_neg $dst_src, $pg, $dst_src\t# vector (sve) (B/H/S)" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ sve_neg(as_FloatRegister($dst_src$$reg), __ elemType_to_regVariant(bt),
+            as_PRegister($pg$$reg),
+            as_FloatRegister($dst_src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vnegL_masked(vReg dst_src, pRegGov pg) %{
+  predicate(UseSVE > 0);
+  match(Set dst_src (NegVL dst_src pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_neg $dst_src, $pg, $dst_src\t# vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_neg(as_FloatRegister($dst_src$$reg), __ D,
+            as_PRegister($pg$$reg),
+            as_FloatRegister($dst_src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
 
 instruct vnegF_masked(vReg dst_src, pRegGov pg) %{
   predicate(UseSVE > 0);
diff --git a/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
index 874cdf6e4e0..f4723183ac2 100644
--- a/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
@@ -524,8 +524,10 @@ instruct $1(vReg dst, vReg src) %{
   match(Set dst ($2 src));
   ins_cost(SVE_COST);
   format %{ "$4 $dst, $src\t# vector (sve) ($3)" %}
-  ins_encode %{
-    __ $4(as_FloatRegister($dst$$reg), __ $3,
+  ins_encode %{dnl
+ifelse($1, `vnegI', `
+    BasicType bt = Matcher::vector_element_basic_type(this);', `')
+    __ $4(as_FloatRegister($dst$$reg), ifelse($1, `vnegI', `__ elemType_to_regVariant(bt)', `__ $3'),
          ptrue, as_FloatRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -548,8 +550,10 @@ instruct $1_masked(vReg dst_src, pRegGov pg) %{
   match(Set dst_src ($2 dst_src pg));
   ins_cost(SVE_COST);
   format %{ "$4 $dst_src, $pg, $dst_src\t# vector (sve) ($3)" %}
-  ins_encode %{
-    __ $4(as_FloatRegister($dst_src$$reg), __ $3,
+  ins_encode %{dnl
+ifelse($1, `vnegI', `
+    BasicType bt = Matcher::vector_element_basic_type(this);', `')
+    __ $4(as_FloatRegister($dst_src$$reg), ifelse($1, `vnegI', `__ elemType_to_regVariant(bt)', `__ $3'),
             as_PRegister($pg$$reg),
             as_FloatRegister($dst_src$$reg));
   %}
@@ -1091,11 +1095,15 @@ BINARY_OP_PREDICATE(vmulL, MulVL, D, sve_mul)
 BINARY_OP_PREDICATE(vmulF, MulVF, S, sve_fmul)
 BINARY_OP_PREDICATE(vmulD, MulVD, D, sve_fmul)
 
-// vector fneg
+// vector neg
+UNARY_OP_TRUE_PREDICATE(vnegI, NegVI, B/H/S, sve_neg)
+UNARY_OP_TRUE_PREDICATE(vnegL, NegVL, D, sve_neg)
 UNARY_OP_TRUE_PREDICATE(vnegF, NegVF, S, sve_fneg)
 UNARY_OP_TRUE_PREDICATE(vnegD, NegVD, D, sve_fneg)
 
-// vector fneg - predicated
+// vector neg - predicated
+UNARY_OP_PREDICATE(vnegI, NegVI, B/H/S, sve_neg)
+UNARY_OP_PREDICATE(vnegL, NegVL, D, sve_neg)
 UNARY_OP_PREDICATE(vnegF, NegVF, S, sve_fneg)
 UNARY_OP_PREDICATE(vnegD, NegVD, D, sve_fneg)
 
diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp
index 0ae7b075074..7ae8d123642 100644
--- a/src/hotspot/share/adlc/formssel.cpp
+++ b/src/hotspot/share/adlc/formssel.cpp
@@ -4212,7 +4212,7 @@ bool MatchRule::is_vector() const {
     "CMoveVD", "CMoveVF",
     "DivVF","DivVD",
     "AbsVB","AbsVS","AbsVI","AbsVL","AbsVF","AbsVD",
-    "NegVF","NegVD","NegVI",
+    "NegVF","NegVD","NegVI","NegVL",
     "SqrtVD","SqrtVF",
     "AndV" ,"XorV" ,"OrV",
     "MaxV", "MinV",
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 35dd640b4ee..5cedd71ec56 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -386,6 +386,7 @@ macro(AbsVL)
 macro(AbsVF)
 macro(AbsVD)
 macro(NegVI)
+macro(NegVL)
 macro(NegVF)
 macro(NegVD)
 macro(SqrtVD)
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index 39075bd9180..7454be7b948 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -199,6 +199,16 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
         tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support variable vector shifts",
                       NodeClassNames[sopc], type2name(type), num_elem);
       }
+#endif
+      return false;
+    }
+  } else if (VectorNode::is_vector_integral_negate(sopc)) {
+    if (!VectorNode::is_vector_integral_negate_supported(sopc, num_elem, type, false)) {
+#ifndef PRODUCT
+      if (C->print_intrinsics()) {
+        tty->print_cr("  ** Rejected vector op (%s,%s,%d) because architecture does not support integral vector negate",
+                      NodeClassNames[sopc], type2name(type), num_elem);
+      }
 #endif
       return false;
     }
@@ -277,8 +287,16 @@ bool LibraryCallKit::arch_supports_vector(int sopc, int num_elem, BasicType type
   }
 
   if ((mask_use_type & VecMaskUsePred) != 0) {
-    if (!Matcher::has_predicated_vectors() ||
-        !Matcher::match_rule_supported_vector_masked(sopc, num_elem, type)) {
+    bool is_supported = false;
+    if (Matcher::has_predicated_vectors()) {
+      if (VectorNode::is_vector_integral_negate(sopc)) {
+        is_supported = VectorNode::is_vector_integral_negate_supported(sopc, num_elem, type, true);
+      } else {
+        is_supported = Matcher::match_rule_supported_vector_masked(sopc, num_elem, type);
+      }
+    }
+
+    if (!is_supported) {
     #ifndef PRODUCT
       if (C->print_intrinsics()) {
         tty->print_cr("Rejected vector mask predicate using (%s,%s,%d) because architecture does not support it",
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index a5ec2173966..ae9bb537959 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -135,7 +135,14 @@ int VectorNode::opcode(int sopc, BasicType bt) {
   case Op_AbsD:
     return (bt == T_DOUBLE ? Op_AbsVD : 0);
   case Op_NegI:
-    return (bt == T_INT ? Op_NegVI : 0);
+    switch (bt) {
+      case T_BYTE:
+      case T_SHORT:
+      case T_INT: return Op_NegVI;
+      default: return 0;
+    }
+  case Op_NegL:
+    return (bt == T_LONG ? Op_NegVL : 0);
   case Op_NegF:
     return (bt == T_FLOAT ? Op_NegVF : 0);
   case Op_NegD:
@@ -275,6 +282,9 @@ bool VectorNode::implemented(int opc, uint vlen, BasicType bt) {
     if (VectorNode::is_vector_rotate(vopc)) {
       return is_vector_rotate_supported(vopc, vlen, bt);
     }
+    if (VectorNode::is_vector_integral_negate(vopc)) {
+      return is_vector_integral_negate_supported(vopc, vlen, bt, false);
+    }
     return vopc > 0 && Matcher::match_rule_supported_vector(vopc, vlen, bt);
   }
   return false;
@@ -349,6 +359,38 @@ bool VectorNode::is_vector_rotate_supported(int vopc, uint vlen, BasicType bt) {
   }
 }
 
+// Check whether the architecture supports the vector negate instructions. If not, then check
+// whether the alternative vector nodes used to implement vector negation are supported.
+// Return false if neither of them is supported.
+bool VectorNode::is_vector_integral_negate_supported(int opc, uint vlen, BasicType bt, bool use_predicate) {
+  if (!use_predicate) {
+    // Check whether the NegVI/L is supported by the architecture.
+    if (Matcher::match_rule_supported_vector(opc, vlen, bt)) {
+      return true;
+    }
+    // Negate is implemented with "(SubVI/L (ReplicateI/L 0) src)", if NegVI/L is not supported.
+    int sub_opc = (bt == T_LONG) ? Op_SubL : Op_SubI;
+    if (Matcher::match_rule_supported_vector(VectorNode::opcode(sub_opc, bt), vlen, bt) &&
+        Matcher::match_rule_supported_vector(VectorNode::replicate_opcode(bt), vlen, bt)) {
+      return true;
+    }
+  } else {
+    // Check whether the predicated NegVI/L is supported by the architecture.
+    if (Matcher::match_rule_supported_vector_masked(opc, vlen, bt)) {
+      return true;
+    }
+    // Predicated negate is implemented with "(AddVI/L (XorV src (ReplicateI/L -1)) (ReplicateI/L 1))",
+    // if predicated NegVI/L is not supported.
+    int add_opc = (bt == T_LONG) ? Op_AddL : Op_AddI;
+    if (Matcher::match_rule_supported_vector_masked(Op_XorV, vlen, bt) &&
+        Matcher::match_rule_supported_vector_masked(VectorNode::opcode(add_opc, bt), vlen, bt) &&
+        Matcher::match_rule_supported_vector(VectorNode::replicate_opcode(bt), vlen, bt)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 bool VectorNode::is_shift_opcode(int opc) {
   switch (opc) {
   case Op_LShiftI:
@@ -536,6 +578,7 @@ VectorNode* VectorNode::make(int vopc, Node* n1, Node* n2, const TypeVect* vt, b
   case Op_AbsVL: return new AbsVLNode(n1, vt);
 
   case Op_NegVI: return new NegVINode(n1, vt);
+  case Op_NegVL: return new NegVLNode(n1, vt);
   case Op_NegVF: return new NegVFNode(n1, vt);
   case Op_NegVD: return new NegVDNode(n1, vt);
 
@@ -667,6 +710,10 @@ bool VectorNode::is_vector_rotate(int opc) {
   }
 }
 
+bool VectorNode::is_vector_integral_negate(int opc) {
+  return opc == Op_NegVI || opc == Op_NegVL;
+}
+
 bool VectorNode::is_vector_shift(int opc) {
   assert(opc > _last_machine_leaf && opc < _last_opcode, "invalid opcode");
   switch (opc) {
@@ -1541,6 +1588,69 @@ Node* VectorLongToMaskNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   return NULL;
 }
 
+// Generate other vector nodes to implement the masked/non-masked vector negation.
+Node* NegVNode::degenerate_integral_negate(PhaseGVN* phase, bool is_predicated) {
+  const TypeVect* vt = vect_type();
+  BasicType bt = vt->element_basic_type();
+  uint vlen = length();
+
+  // Transformation for predicated NegVI/L
+  if (is_predicated) {
+      // (NegVI/L src m) ==> (AddVI/L (XorV src (ReplicateI/L -1) m) (ReplicateI/L 1) m)
+      Node* const_minus_one = NULL;
+      Node* const_one = NULL;
+      int add_opc;
+      if (bt == T_LONG) {
+        const_minus_one = phase->longcon(-1L);
+        const_one = phase->longcon(1L);
+        add_opc = Op_AddL;
+      } else {
+        const_minus_one = phase->intcon(-1);
+        const_one = phase->intcon(1);
+        add_opc = Op_AddI;
+      }
+      const_minus_one = phase->transform(VectorNode::scalar2vector(const_minus_one, vlen, Type::get_const_basic_type(bt)));
+      Node* xorv = VectorNode::make(Op_XorV, in(1), const_minus_one, vt);
+      xorv->add_req(in(2));
+      xorv->add_flag(Node::Flag_is_predicated_vector);
+      phase->transform(xorv);
+      const_one = phase->transform(VectorNode::scalar2vector(const_one, vlen, Type::get_const_basic_type(bt)));
+      Node* addv = VectorNode::make(VectorNode::opcode(add_opc, bt), xorv, const_one, vt);
+      addv->add_req(in(2));
+      addv->add_flag(Node::Flag_is_predicated_vector);
+      return addv;
+  }
+
+  // NegVI/L ==> (SubVI/L (ReplicateI/L 0) src)
+  Node* const_zero = NULL;
+  int sub_opc;
+  if (bt == T_LONG) {
+    const_zero = phase->longcon(0L);
+    sub_opc = Op_SubL;
+  } else {
+    const_zero = phase->intcon(0);
+    sub_opc = Op_SubI;
+  }
+  const_zero = phase->transform(VectorNode::scalar2vector(const_zero, vlen, Type::get_const_basic_type(bt)));
+  return VectorNode::make(VectorNode::opcode(sub_opc, bt), const_zero, in(1), vt);
+}
+
+Node* NegVNode::Ideal(PhaseGVN* phase, bool can_reshape) {
+  BasicType bt = vect_type()->element_basic_type();
+  uint vlen = length();
+  int opc = Opcode();
+  if (is_vector_integral_negate(opc)) {
+    if (is_predicated_vector()) {
+      if (!Matcher::match_rule_supported_vector_masked(opc, vlen, bt)) {
+        return degenerate_integral_negate(phase, true);
+      }
+    } else if (!Matcher::match_rule_supported_vector(opc, vlen, bt)) {
+      return degenerate_integral_negate(phase, false);
+    }
+  }
+  return NULL;
+}
+
 #ifndef PRODUCT
 void VectorBoxAllocateNode::dump_spec(outputStream *st) const {
   CallStaticJavaNode::dump_spec(st);
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index 4853d719ce0..d853a71f8cc 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -97,6 +97,7 @@ class VectorNode : public TypeNode {
   static bool is_roundopD(Node* n);
   static bool is_scalar_rotate(Node* n);
   static bool is_vector_rotate_supported(int opc, uint vlen, BasicType bt);
+  static bool is_vector_integral_negate_supported(int opc, uint vlen, BasicType bt, bool use_predicate);
   static bool is_invariant_vector(Node* n);
   static bool is_all_ones_vector(Node* n);
   static bool is_vector_bitwise_not_pattern(Node* n);
@@ -109,6 +110,7 @@ class VectorNode : public TypeNode {
   static bool is_vector_shift(int opc);
   static bool is_vector_shift_count(int opc);
   static bool is_vector_rotate(int opc);
+  static bool is_vector_integral_negate(int opc);
 
   static bool is_vector_shift(Node* n) {
     return is_vector_shift(n->Opcode());
@@ -474,27 +476,47 @@ class AbsVDNode : public VectorNode {
   virtual int Opcode() const;
 };
 
+//------------------------------NegVNode---------------------------------------
+// Vector Neg parent class (not for code generation).
+class NegVNode : public VectorNode {
+ public:
+  NegVNode(Node* in, const TypeVect* vt) : VectorNode(in, vt) {}
+  virtual int Opcode() const = 0;
+  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
+
+ private:
+  Node* degenerate_integral_negate(PhaseGVN* phase, bool is_predicated);
+};
+
 //------------------------------NegVINode--------------------------------------
-// Vector Neg int
-class NegVINode : public VectorNode {
+// Vector Neg byte/short/int
+class NegVINode : public NegVNode {
+ public:
+  NegVINode(Node* in, const TypeVect* vt) : NegVNode(in, vt) {}
+  virtual int Opcode() const;
+};
+
+//------------------------------NegVLNode--------------------------------------
+// Vector Neg long
+class NegVLNode : public NegVNode {
  public:
-  NegVINode(Node* in, const TypeVect* vt) : VectorNode(in, vt) {}
+  NegVLNode(Node* in, const TypeVect* vt) : NegVNode(in, vt) {}
   virtual int Opcode() const;
 };
 
 //------------------------------NegVFNode--------------------------------------
 // Vector Neg float
-class NegVFNode : public VectorNode {
+class NegVFNode : public NegVNode {
  public:
-  NegVFNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {}
+  NegVFNode(Node* in, const TypeVect* vt) : NegVNode(in, vt) {}
   virtual int Opcode() const;
 };
 
 //------------------------------NegVDNode--------------------------------------
 // Vector Neg double
-class NegVDNode : public VectorNode {
+class NegVDNode : public NegVNode {
  public:
-  NegVDNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {}
+  NegVDNode(Node* in, const TypeVect* vt) : NegVNode(in, vt) {}
   virtual int Opcode() const;
 };
 
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index bebae07e5fb..0f80248eb54 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -1757,9 +1757,11 @@
   declare_c2_type(MulVFNode, VectorNode)                                  \
   declare_c2_type(MulReductionVFNode, ReductionNode)                      \
   declare_c2_type(MulVDNode, VectorNode)                                  \
-  declare_c2_type(NegVINode, VectorNode)                                  \
-  declare_c2_type(NegVFNode, VectorNode)                                  \
-  declare_c2_type(NegVDNode, VectorNode)                                  \
+  declare_c2_type(NegVNode, VectorNode)                                   \
+  declare_c2_type(NegVINode, NegVNode)                                    \
+  declare_c2_type(NegVLNode, NegVNode)                                    \
+  declare_c2_type(NegVFNode, NegVNode)                                    \
+  declare_c2_type(NegVDNode, NegVNode)                                    \
   declare_c2_type(FmaVDNode, VectorNode)                                  \
   declare_c2_type(FmaVFNode, VectorNode)                                  \
   declare_c2_type(CMoveVFNode, VectorNode)                                \
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
index c21fde386b9..e878f938c39 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
@@ -573,9 +573,6 @@ public abstract class ByteVector extends AbstractVector<Byte> {
             }
             if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
-            } else if (op == NEG) {
-                // FIXME: Support this in the JIT.
-                return broadcast(0).lanewise(SUB, this);
             }
         }
         int opc = opCode(op);
@@ -604,8 +601,6 @@ public abstract class ByteVector extends AbstractVector<Byte> {
             }
             if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
-            } else if (op == NEG) {
-                return lanewise(NOT, m).lanewise(ADD, broadcast(1), m);
             }
         }
         int opc = opCode(op);
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
index e5033ac5366..c1d2f418574 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
@@ -573,9 +573,6 @@ public abstract class IntVector extends AbstractVector<Integer> {
             }
             if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
-            } else if (op == NEG) {
-                // FIXME: Support this in the JIT.
-                return broadcast(0).lanewise(SUB, this);
             }
         }
         int opc = opCode(op);
@@ -604,8 +601,6 @@ public abstract class IntVector extends AbstractVector<Integer> {
             }
             if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
-            } else if (op == NEG) {
-                return lanewise(NOT, m).lanewise(ADD, broadcast(1), m);
             }
         }
         int opc = opCode(op);
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
index 37ba7189679..60821caa6bd 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
@@ -531,9 +531,6 @@ public abstract class LongVector extends AbstractVector<Long> {
             }
             if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
-            } else if (op == NEG) {
-                // FIXME: Support this in the JIT.
-                return broadcast(0).lanewise(SUB, this);
             }
         }
         int opc = opCode(op);
@@ -562,8 +559,6 @@ public abstract class LongVector extends AbstractVector<Long> {
             }
             if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
-            } else if (op == NEG) {
-                return lanewise(NOT, m).lanewise(ADD, broadcast(1), m);
             }
         }
         int opc = opCode(op);
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
index 8c6dd4718f7..7558fc6c56a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
@@ -573,9 +573,6 @@ public abstract class ShortVector extends AbstractVector<Short> {
             }
             if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
-            } else if (op == NEG) {
-                // FIXME: Support this in the JIT.
-                return broadcast(0).lanewise(SUB, this);
             }
         }
         int opc = opCode(op);
@@ -604,8 +601,6 @@ public abstract class ShortVector extends AbstractVector<Short> {
             }
             if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
-            } else if (op == NEG) {
-                return lanewise(NOT, m).lanewise(ADD, broadcast(1), m);
             }
         }
         int opc = opCode(op);
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
index 6c5ed6b9c13..464cb2853df 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
@@ -596,9 +596,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 #if[BITWISE]
             if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
-            } else if (op == NEG) {
-                // FIXME: Support this in the JIT.
-                return broadcast(0).lanewise(SUB, this);
             }
 #end[BITWISE]
         }
@@ -629,8 +626,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 #if[BITWISE]
             if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
-            } else if (op == NEG) {
-                return lanewise(NOT, m).lanewise(ADD, broadcast(1), m);
             }
 #end[BITWISE]
         }
-- 
GitLab


From eb5b7128a0ff5a17fcc66cb5f81d23ebec08b415 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 30 Mar 2022 03:00:19 +0000
Subject: [PATCH 262/345] 8283701: Add final or sealed modifier to appropriate
 java.awt.color ICC_Profile API classes

Reviewed-by: bpb, aivanov, serb
---
 .../share/classes/java/awt/color/ICC_Profile.java             | 4 +++-
 .../share/classes/java/awt/color/ICC_ProfileGray.java         | 2 +-
 .../share/classes/java/awt/color/ICC_ProfileRGB.java          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
index ff8e0745e19..278e53ae10a 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
@@ -83,7 +83,9 @@ import sun.java2d.cmm.ProfileDeferralInfo;
  *
  * @see ICC_ColorSpace
  */
-public class ICC_Profile implements Serializable {
+public sealed class ICC_Profile implements Serializable
+    permits ICC_ProfileGray,
+            ICC_ProfileRGB {
 
     /**
      * Use serialVersionUID from JDK 1.2 for interoperability.
diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
index 5df533ee47c..b248e996c81 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
@@ -65,7 +65,7 @@ import sun.java2d.cmm.ProfileDeferralInfo;
  * The inverse transform is done by converting the PCS Y components to device
  * Gray via the inverse of the grayTRC.
  */
-public class ICC_ProfileGray extends ICC_Profile {
+public final class ICC_ProfileGray extends ICC_Profile {
 
     /**
      * Use serialVersionUID from JDK 1.2 for interoperability.
diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
index 56c3e8a848c..b3683a941ee 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
@@ -80,7 +80,7 @@ import sun.java2d.cmm.ProfileDeferralInfo;
  * RGB components through the inverse of the above 3x3 matrix, and then
  * converting linear RGB to device RGB through inverses of the TRCs.
  */
-public class ICC_ProfileRGB extends ICC_Profile {
+public final class ICC_ProfileRGB extends ICC_Profile {
 
     /**
      * Use serialVersionUID from JDK 1.2 for interoperability.
-- 
GitLab


From b323f54feef13a47bb02af608eb1f6474692d905 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Wed, 30 Mar 2022 06:56:08 +0000
Subject: [PATCH 263/345] 8283846: Remove unused
 jdk.internal.reflect.SignatureIterator

Reviewed-by: bpb, mchung, iris
---
 .../internal/reflect/SignatureIterator.java   | 81 -------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 src/java.base/share/classes/jdk/internal/reflect/SignatureIterator.java

diff --git a/src/java.base/share/classes/jdk/internal/reflect/SignatureIterator.java b/src/java.base/share/classes/jdk/internal/reflect/SignatureIterator.java
deleted file mode 100644
index ca5c8b78a72..00000000000
--- a/src/java.base/share/classes/jdk/internal/reflect/SignatureIterator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 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.reflect;
-
-/** Assists in iterating down a method's signature */
-
-class SignatureIterator {
-    private final String sig;
-    private int idx;
-
-    public SignatureIterator(String sig) {
-        this.sig = sig;
-        reset();
-    }
-
-    public void reset() {
-        idx = 1;
-    }
-
-    public boolean atEnd() {
-        return sig.charAt(idx) == ')';
-    }
-
-    public String next() {
-        if (atEnd()) return null;
-        char c = sig.charAt(idx);
-        if (c != '[' && c != 'L') {
-            ++idx;
-            return String.valueOf(c);
-        }
-        // Walk forward to end of entry
-        int endIdx = idx;
-        if (c == '[') {
-            while ((c = sig.charAt(endIdx)) == '[') {
-                endIdx++;
-            }
-        }
-
-        if (c == 'L') {
-            while (sig.charAt(endIdx) != ';') {
-                endIdx++;
-            }
-        }
-
-        int beginIdx = idx;
-        idx = endIdx + 1;
-        return sig.substring(beginIdx, idx);
-    }
-
-    /** Should only be called when atEnd() is true. Does not change
-        state of iterator. */
-    public String returnType() {
-        if (!atEnd()) {
-            throw new InternalError("Illegal use of SignatureIterator");
-        }
-        return sig.substring(idx + 1, sig.length());
-    }
-}
-- 
GitLab


From 9bb916db0a6af2c6476c0bfbc55c1bb8721b4354 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Wed, 30 Mar 2022 07:07:56 +0000
Subject: [PATCH 264/345] 8283800: Simplify String.indexOf/lastIndexOf calls

Reviewed-by: xuelei, bpb, lmesnik
---
 src/java.base/share/classes/java/util/UUID.java             | 4 ++--
 .../share/classes/sun/security/util/PropertyExpander.java   | 4 ++--
 .../share/classes/sun/security/x509/AlgorithmId.java        | 6 +++---
 src/java.base/share/classes/sun/security/x509/DNSName.java  | 4 ++--
 .../classes/sun/security/jgss/krb5/Krb5NameElement.java     | 6 +++---
 .../share/classes/sun/tools/jconsole/AboutDialog.java       | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/java.base/share/classes/java/util/UUID.java b/src/java.base/share/classes/java/util/UUID.java
index 0378df95a79..e88d77ae63e 100644
--- a/src/java.base/share/classes/java/util/UUID.java
+++ b/src/java.base/share/classes/java/util/UUID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -264,7 +264,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> {
             throw new IllegalArgumentException("UUID string too large");
         }
 
-        int dash1 = name.indexOf('-', 0);
+        int dash1 = name.indexOf('-');
         int dash2 = name.indexOf('-', dash1 + 1);
         int dash3 = name.indexOf('-', dash2 + 1);
         int dash4 = name.indexOf('-', dash3 + 1);
diff --git a/src/java.base/share/classes/sun/security/util/PropertyExpander.java b/src/java.base/share/classes/sun/security/util/PropertyExpander.java
index b458439cb96..92daa46ce4d 100644
--- a/src/java.base/share/classes/sun/security/util/PropertyExpander.java
+++ b/src/java.base/share/classes/sun/security/util/PropertyExpander.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ public class PropertyExpander {
         if (value == null)
             return null;
 
-        int p = value.indexOf("${", 0);
+        int p = value.indexOf("${");
 
         // no special characters
         if (p == -1) return value;
diff --git a/src/java.base/share/classes/sun/security/x509/AlgorithmId.java b/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
index 5f2403f3b40..2475539a45a 100644
--- a/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
+++ b/src/java.base/share/classes/sun/security/x509/AlgorithmId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ public class AlgorithmId implements Serializable, DerEncoder {
     private static final long serialVersionUID = 7205873507486557157L;
 
     /**
-     * The object identitifer being used for this algorithm.
+     * The object identifier being used for this algorithm.
      */
     private ObjectIdentifier algid;
 
@@ -584,7 +584,7 @@ public class AlgorithmId implements Serializable, DerEncoder {
                 String upperCaseAlias = alias.toUpperCase(Locale.ENGLISH);
                 int index;
                 if (upperCaseAlias.startsWith("ALG.ALIAS") &&
-                    (index = upperCaseAlias.indexOf("OID.", 0)) != -1) {
+                    (index = upperCaseAlias.indexOf("OID.")) != -1) {
                     index += "OID.".length();
                     if (index == alias.length()) {
                         // invalid alias entry
diff --git a/src/java.base/share/classes/sun/security/x509/DNSName.java b/src/java.base/share/classes/sun/security/x509/DNSName.java
index ee9e8a9c0a0..e2ad7df98e2 100644
--- a/src/java.base/share/classes/sun/security/x509/DNSName.java
+++ b/src/java.base/share/classes/sun/security/x509/DNSName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,7 +100,7 @@ public class DNSName implements GeneralNameInterface {
                 if (alphaDigits.indexOf(name.charAt(startIndex)) < 0) {
                     // Checking to make sure the wildcard only appears in the first component,
                     // and it has to be at least 3-char long with the form of *.[alphaDigit]
-                    if ((name.length() < 3) || (name.indexOf('*', 0) != 0) ||
+                    if ((name.length() < 3) || (name.indexOf('*') != 0) ||
                         (name.charAt(startIndex+1) != '.') ||
                         (alphaDigits.indexOf(name.charAt(startIndex+2)) < 0))
                         throw new IOException("DNSName components must begin with a letter, digit, "
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
index ea2e24f6a8a..b286f2c5844 100644
--- a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
+++ b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ public class Krb5NameElement
     /**
      * Instantiates a new Krb5NameElement object. Internally it stores the
      * information provided by the input parameters so that they may later
-     * be used for output when a printable representaion of this name is
+     * be used for output when a printable representation of this name is
      * needed in GSS-API format rather than in Kerberos format.
      *
      */
@@ -158,7 +158,7 @@ public class Krb5NameElement
 
         // Look for @ as in service@host
         // Assumes host name will not have an escaped '@'
-        int separatorPos = gssNameStr.lastIndexOf('@', gssNameStr.length());
+        int separatorPos = gssNameStr.lastIndexOf('@');
 
         // Not really a separator if it is escaped. Then this is just part
         // of the principal name or service name
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java
index a7607bd7c5a..17427a13197 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/AboutDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -194,7 +194,7 @@ public class AboutDialog extends InternalDialog {
             Highlighter hilite = helpLink.getHighlighter();
             Document doc = helpLink.getDocument();
             String text = doc.getText(0, doc.getLength());
-            int pos = text.indexOf(urlStr, 0);
+            int pos = text.indexOf(urlStr);
             hilite.addHighlight(pos, pos + urlStr.length(), new HighlightPainter());
         } catch (BadLocationException e) {
             // ignore
-- 
GitLab


From 8b656117dd1521ff23d6039eff7d13ef63a291c8 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 30 Mar 2022 07:11:59 +0000
Subject: [PATCH 265/345] 8283789: CompilerPhaseTypeHelper::to_bitmask should
 operate on uint64_t

Reviewed-by: chagedorn, thartmann
---
 src/hotspot/share/opto/phasetype.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index ccc09bd4fbc..d0415317c00 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -97,8 +97,8 @@ class CompilerPhaseTypeHelper {
   static const char* to_description(CompilerPhaseType cpt) {
     return phase_descriptions[cpt];
   }
-  static int to_bitmask(CompilerPhaseType cpt) {
-    return (1 << cpt);
+  static uint64_t to_bitmask(CompilerPhaseType cpt) {
+    return (UINT64_C(1) << cpt);
   }
 };
 
-- 
GitLab


From aa3352588bd9357c04550026e1af9fe503b237cf Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 30 Mar 2022 07:12:54 +0000
Subject: [PATCH 266/345] 8283787: C1: Remove unused
 ArrayStoreExceptionStub::_info

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/c1/c1_CodeStubs.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hotspot/share/c1/c1_CodeStubs.hpp b/src/hotspot/share/c1/c1_CodeStubs.hpp
index 63d44d7a7b6..97bb9d60377 100644
--- a/src/hotspot/share/c1/c1_CodeStubs.hpp
+++ b/src/hotspot/share/c1/c1_CodeStubs.hpp
@@ -513,9 +513,6 @@ class SimpleExceptionStub: public CodeStub {
 
 
 class ArrayStoreExceptionStub: public SimpleExceptionStub {
- private:
-  CodeEmitInfo* _info;
-
  public:
   ArrayStoreExceptionStub(LIR_Opr obj, CodeEmitInfo* info): SimpleExceptionStub(Runtime1::throw_array_store_exception_id, obj, info) {}
 #ifndef PRODUCT
-- 
GitLab


From 7418373674121f4e7d80fa63becc6d7b99a9080a Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 30 Mar 2022 07:13:40 +0000
Subject: [PATCH 267/345] 8283788: Remove unused VM_DeoptimizeAll::_dependee

Reviewed-by: dholmes
---
 src/hotspot/share/runtime/vmOperations.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hotspot/share/runtime/vmOperations.hpp b/src/hotspot/share/runtime/vmOperations.hpp
index 262ac740c1c..557f4bc3171 100644
--- a/src/hotspot/share/runtime/vmOperations.hpp
+++ b/src/hotspot/share/runtime/vmOperations.hpp
@@ -115,8 +115,6 @@ class VM_DeoptimizeFrame: public VM_Operation {
 
 #ifndef PRODUCT
 class VM_DeoptimizeAll: public VM_Operation {
- private:
-  Klass* _dependee;
  public:
   VM_DeoptimizeAll() {}
   VMOp_Type type() const                         { return VMOp_DeoptimizeAll; }
-- 
GitLab


From edb42d7b0aabd07ef9f46cb1f0e862f7bb912378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Wed, 30 Mar 2022 07:14:39 +0000
Subject: [PATCH 268/345] 8282547: IGV: add control-flow graph view

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: chagedorn, xliu, thartmann
---
 .../controlflow/BlockConnectionWidget.java    |  11 +-
 .../controlflow/HierarchicalGraphLayout.java  |  10 +-
 .../com/sun/hotspot/igv/data/InputBlock.java  |  16 +-
 .../sun/hotspot/igv/data/InputBlockEdge.java  |  10 +-
 .../com/sun/hotspot/igv/data/InputGraph.java  |  17 +-
 .../igv/data/serialization/Parser.java        |   4 +-
 .../sun/hotspot/igv/filter/ColorFilter.java   |   4 +-
 .../sun/hotspot/igv/filter/CombineFilter.java |  14 +-
 .../hotspot/igv/filter/ConnectionFilter.java  |   4 +-
 .../igv/filter/EdgeColorIndexFilter.java      |   4 +-
 .../hotspot/igv/filter/RemoveBlockFilter.java |  74 +++++++
 .../igv/filter/RemoveInputsFilter.java        |   6 +-
 .../igv/filter/RemoveSelfLoopsFilter.java     |   8 +-
 .../sun/hotspot/igv/filter/SplitFilter.java   |   6 +-
 .../igv/graal/filters/GraalCFGFilter.java     |  10 +-
 .../graal/filters/GraalEdgeColorFilter.java   |  31 +--
 .../sun/hotspot/igv/graph/AnySelector.java    |  46 +++++
 .../java/com/sun/hotspot/igv/graph/Block.java |  11 +-
 .../hotspot/igv/graph/BlockConnection.java    | 112 +++++++++++
 .../sun/hotspot/igv/graph/BlockSelector.java  |  30 +++
 .../com/sun/hotspot/igv/graph/Connection.java | 131 +-----------
 .../com/sun/hotspot/igv/graph/Diagram.java    |  97 ++++++---
 .../com/sun/hotspot/igv/graph/Figure.java     | 153 ++++++++++----
 .../hotspot/igv/graph/FigureConnection.java   | 162 +++++++++++++++
 .../java/com/sun/hotspot/igv/graph/Slot.java  |  16 +-
 .../igv/hierarchicallayout/ClusterEdge.java   |  16 +-
 .../ClusterIngoingConnection.java             |  11 +-
 .../ClusterInputSlotNode.java                 |   5 +-
 .../igv/hierarchicallayout/ClusterNode.java   |  60 ++++--
 .../ClusterOutgoingConnection.java            |  11 +-
 .../ClusterOutputSlotNode.java                |   5 +-
 .../HierarchicalCFGLayoutManager.java         | 155 +++++++++++++++
 .../HierarchicalClusterLayoutManager.java     |   3 -
 .../HierarchicalLayoutManager.java            | 148 +++++++++-----
 .../InterClusterConnection.java               |  11 +-
 .../LinearLayoutManager.java                  |  67 +++++++
 .../com/sun/hotspot/igv/layout/Cluster.java   |   5 +-
 .../sun/hotspot/igv/layout/LayoutGraph.java   |  10 +-
 .../sun/hotspot/igv/layout/LayoutManager.java |   2 -
 .../java/com/sun/hotspot/igv/layout/Link.java |   6 +-
 .../ServerCompilerScheduler.java              | 187 ++++++++++++++++--
 .../filters/hideExceptionBlocks.filter        |  18 ++
 .../filters/hideRootBlock.filter              |  13 ++
 .../filters/hideUncommonTrapBlocks.filter     |  13 ++
 .../sun/hotspot/igv/servercompiler/layer.xml  |  12 ++
 .../sun/hotspot/igv/settings/Settings.java    |  14 +-
 .../sun/hotspot/igv/settings/ViewPanel.form   |  62 ++++--
 .../sun/hotspot/igv/settings/ViewPanel.java   |  54 +++--
 .../com/sun/hotspot/igv/util/StringUtils.java |  23 ++-
 .../hotspot/igv/view/BlockQuickSearch.java    | 146 ++++++++++++++
 .../sun/hotspot/igv/view/DiagramScene.java    | 183 +++++++++++++----
 .../hotspot/igv/view/DiagramViewModel.java    |  45 ++++-
 .../hotspot/igv/view/EditorTopComponent.java  |  47 ++++-
 .../igv/view/GraphViewerImplementation.java   |   6 +-
 .../sun/hotspot/igv/view/NodeQuickSearch.java |  21 +-
 .../view/actions/EnableBlockLayoutAction.java |  22 +--
 .../view/actions/EnableCFGLayoutAction.java   |  51 +++++
 .../view/actions/EnableSeaLayoutAction.java   |  51 +++++
 .../hotspot/igv/view/widgets/BlockWidget.java |  10 +-
 .../igv/view/widgets/FigureWidget.java        |  20 +-
 .../igv/view/widgets/InputSlotWidget.java     |  15 +-
 .../hotspot/igv/view/widgets/LineWidget.java  |  39 ++--
 .../igv/view/widgets/OutputSlotWidget.java    |  14 +-
 .../hotspot/igv/view/widgets/SlotWidget.java  |  21 +-
 .../igv/view/actions/Bundle.properties        |   2 +
 .../sun/hotspot/igv/view/images/blocks.gif    | Bin 143 -> 0 bytes
 .../sun/hotspot/igv/view/images/blocks.png    | Bin 0 -> 1734 bytes
 .../com/sun/hotspot/igv/view/images/cfg.png   | Bin 0 -> 1655 bytes
 .../com/sun/hotspot/igv/view/images/sea.png   | Bin 0 -> 1680 bytes
 .../com/sun/hotspot/igv/view/layer.xml        |   7 +
 70 files changed, 2091 insertions(+), 507 deletions(-)
 create mode 100644 src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveBlockFilter.java
 create mode 100644 src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/AnySelector.java
 create mode 100644 src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/BlockConnection.java
 create mode 100644 src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/BlockSelector.java
 create mode 100644 src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/FigureConnection.java
 create mode 100644 src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalCFGLayoutManager.java
 create mode 100644 src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LinearLayoutManager.java
 create mode 100644 src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideExceptionBlocks.filter
 create mode 100644 src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideRootBlock.filter
 create mode 100644 src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideUncommonTrapBlocks.filter
 create mode 100644 src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/BlockQuickSearch.java
 create mode 100644 src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableCFGLayoutAction.java
 create mode 100644 src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableSeaLayoutAction.java
 delete mode 100644 src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/blocks.gif
 create mode 100644 src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/blocks.png
 create mode 100644 src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/cfg.png
 create mode 100644 src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/sea.png

diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java
index 8b2b90e7079..77ea2808eb4 100644
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java
+++ b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@ package com.sun.hotspot.igv.controlflow;
 import com.sun.hotspot.igv.data.InputBlockEdge;
 import com.sun.hotspot.igv.layout.Link;
 import com.sun.hotspot.igv.layout.Port;
+import com.sun.hotspot.igv.layout.Cluster;
 import java.awt.BasicStroke;
 import java.awt.Point;
 import java.awt.Stroke;
@@ -76,6 +77,14 @@ public class BlockConnectionWidget extends ConnectionWidget implements Link {
         return outputSlot;
     }
 
+    public Cluster getFromCluster() {
+        return null;
+    }
+
+    public Cluster getToCluster() {
+        return null;
+    }
+
     public void setBold(boolean bold) {
         this.isBold = bold;
         updateStroke();
diff --git a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java
index 087f3398e95..bf16e7f427e 100644
--- a/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java
+++ b/src/utils/IdealGraphVisualizer/ControlFlow/src/main/java/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,6 +69,14 @@ public class HierarchicalGraphLayout<N, E> extends GraphLayout<N, E> {
             return to.getSlot();
         }
 
+        public Cluster getFromCluster() {
+            return null;
+        }
+
+        public Cluster getToCluster() {
+            return null;
+        }
+
         public List<Point> getControlPoints() {
             return new ArrayList<Point>();
         }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlock.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlock.java
index 242623d7ada..28cfc11d7cd 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlock.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ public class InputBlock {
     private String name;
     private InputGraph graph;
     private Set<InputBlock> successors;
+    private boolean artificial;
 
     @Override
     public int hashCode() {
@@ -77,6 +78,7 @@ public class InputBlock {
         this.name = name;
         nodes = new ArrayList<>();
         successors = new LinkedHashSet<>(2);
+        artificial = false;
     }
 
     public String getName() {
@@ -101,6 +103,10 @@ public class InputBlock {
         return Collections.unmodifiableSet(successors);
     }
 
+    public void setNodes(List<InputNode> nodes) {
+        this.nodes = nodes;
+    }
+
     @Override
     public String toString() {
         return "Block " + this.getName();
@@ -111,4 +117,12 @@ public class InputBlock {
             successors.add(b);
         }
     }
+
+    void setArtificial(boolean artificial) {
+        this.artificial = artificial;
+    }
+
+    public boolean isArtificial() {
+        return artificial;
+    }
 }
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlockEdge.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlockEdge.java
index c93a1549ed2..2a1586dc9da 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlockEdge.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputBlockEdge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,12 +38,14 @@ public class InputBlockEdge {
     private InputBlock from;
     private InputBlock to;
     private State state = State.SAME;
+    private String label;
 
-    public InputBlockEdge(InputBlock from, InputBlock to) {
+    public InputBlockEdge(InputBlock from, InputBlock to, String label) {
         assert from != null;
         assert to != null;
         this.from = from;
         this.to = to;
+        this.label = label;
     }
 
     public InputBlock getFrom() {
@@ -62,6 +64,10 @@ public class InputBlockEdge {
         this.state = state;
     }
 
+    public String getLabel() {
+        return label;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj != null && obj instanceof InputBlockEdge) {
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputGraph.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputGraph.java
index b00ed789d39..c218b10002d 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputGraph.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/InputGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,11 @@ public class InputGraph extends Properties.Entity implements FolderElement {
     }
 
     public InputBlockEdge addBlockEdge(InputBlock left, InputBlock right) {
-        InputBlockEdge edge = new InputBlockEdge(left, right);
+        return addBlockEdge(left, right, null);
+    }
+
+    public InputBlockEdge addBlockEdge(InputBlock left, InputBlock right, String label) {
+        InputBlockEdge edge = new InputBlockEdge(left, right, label);
         blockEdges.add(edge);
         left.addSuccessor(right);
         return edge;
@@ -140,6 +144,7 @@ public class InputGraph extends Properties.Entity implements FolderElement {
 
     public void clearBlocks() {
         blocks.clear();
+        blockEdges.clear();
         nodeToBlock.clear();
     }
 
@@ -168,7 +173,7 @@ public class InputGraph extends Properties.Entity implements FolderElement {
             assert nodes.get(n.getId()) == n;
             if (!scheduledNodes.contains(n)) {
                 if (noBlock == null) {
-                    noBlock = this.addBlock("(no block)");
+                    noBlock = addArtificialBlock();
                 }
                 noBlock.addNode(n.getId());
             }
@@ -270,6 +275,12 @@ public class InputGraph extends Properties.Entity implements FolderElement {
         return sb.toString();
     }
 
+    public InputBlock addArtificialBlock() {
+        InputBlock b = addBlock("(no block)");
+        b.setArtificial(true);
+        return b;
+    }
+
     public InputBlock addBlock(String name) {
         final InputBlock b = new InputBlock(this, name);
         blocks.put(b.getName(), b);
diff --git a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java
index 2c8d669d08a..31a373991c1 100644
--- a/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java
+++ b/src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/serialization/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -261,7 +261,7 @@ public class Parser implements GraphParser {
                     for (InputNode n : graph.getNodes()) {
                         if (graph.getBlock(n) == null) {
                             if (noBlock == null) {
-                                noBlock = graph.addBlock("(no block)");
+                                noBlock = graph.addArtificialBlock();
                             }
 
                             noBlock.addNode(n.getId());
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ColorFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ColorFilter.java
index 8a6bf7b5134..9e51f1ba865 100644
--- a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ColorFilter.java
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ColorFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@ public class ColorFilter extends AbstractFilter {
         ConnectionStyle style = rule.getLineStyle();
 
         for (OutputSlot s : f.getOutputSlots()) {
-            for (Connection c : s.getConnections()) {
+            for (FigureConnection c : s.getConnections()) {
                 if (color != null) {
                     c.setColor(color);
                 }
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CombineFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CombineFilter.java
index 4f86f1d6028..5ee30b4d4d8 100644
--- a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CombineFilter.java
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CombineFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ public class CombineFilter extends AbstractFilter {
                         InputSlot slot = null;
 
                         for (InputSlot s : succ.getInputSlots()) {
-                            for (Connection c : s.getConnections()) {
+                            for (FigureConnection c : s.getConnections()) {
                                 if (c.getOutputSlot().getFigure() == f) {
                                     slot = s;
                                 }
@@ -97,8 +97,8 @@ public class CombineFilter extends AbstractFilter {
                         }
 
                         for (InputSlot s : f.getInputSlots()) {
-                            for (Connection c : s.getConnections()) {
-                                Connection newConn = diagram.createConnection(slot, c.getOutputSlot(), c.getLabel(), c.getType());
+                            for (FigureConnection c : s.getConnections()) {
+                                FigureConnection newConn = diagram.createConnection(slot, c.getOutputSlot(), c.getLabel());
                                 newConn.setColor(c.getColor());
                                 newConn.setStyle(c.getStyle());
                             }
@@ -115,7 +115,7 @@ public class CombineFilter extends AbstractFilter {
 
                                 OutputSlot oldSlot = null;
                                 for (OutputSlot s : f.getOutputSlots()) {
-                                    for (Connection c : s.getConnections()) {
+                                    for (FigureConnection c : s.getConnections()) {
                                         if (c.getInputSlot().getFigure() == succ) {
                                             oldSlot = s;
                                         }
@@ -155,8 +155,8 @@ public class CombineFilter extends AbstractFilter {
                                         }
                                     }
                                 }
-                                for (Connection c : nextSlot.getConnections()) {
-                                    Connection newConn = diagram.createConnection(c.getInputSlot(), slot, c.getLabel(), c.getType());
+                                for (FigureConnection c : nextSlot.getConnections()) {
+                                    FigureConnection newConn = diagram.createConnection(c.getInputSlot(), slot, c.getLabel());
                                     newConn.setColor(c.getColor());
                                     newConn.setStyle(c.getStyle());
                                 }
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ConnectionFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ConnectionFilter.java
index d1c9bd69258..2234fc5f67e 100644
--- a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ConnectionFilter.java
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/ConnectionFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ public class ConnectionFilter extends AbstractFilter {
 
             for (Figure f : figures) {
                 for (OutputSlot os : f.getOutputSlots()) {
-                    for (Connection c : os.getConnections()) {
+                    for (FigureConnection c : os.getConnections()) {
                         c.setStyle(rule.getLineStyle());
                         c.setColor(rule.getLineColor());
                     }
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java
index 4a1919101be..9901427c9bf 100644
--- a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@ public class EdgeColorIndexFilter extends AbstractFilter {
             for (Slot slot : slots) {
                 if (index < colors.length && colors[index] != null) {
                     slot.setColor(colors[index]);
-                    for (Connection c : slot.getConnections()) {
+                    for (FigureConnection c : slot.getConnections()) {
 
                         c.setColor(colors[index]);
                     }
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveBlockFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveBlockFilter.java
new file mode 100644
index 00000000000..787542eda2b
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveBlockFilter.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.filter;
+
+import com.sun.hotspot.igv.graph.Diagram;
+import com.sun.hotspot.igv.graph.Block;
+import com.sun.hotspot.igv.graph.BlockSelector;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class RemoveBlockFilter extends AbstractFilter {
+
+    private final List<RemoveBlockRule> rules;
+    private final String name;
+
+    public RemoveBlockFilter(String name) {
+        this.name = name;
+        rules = new ArrayList<>();
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void apply(Diagram diagram) {
+        for (RemoveBlockRule r : rules) {
+            List<Block> selected = r.getBlockSelector().selected(diagram);
+            Set<Block> toRemove = new HashSet<>(selected);
+            diagram.removeAllBlocks(toRemove);
+        }
+    }
+
+    public void addRule(RemoveBlockRule rule) {
+        rules.add(rule);
+    }
+
+    public static class RemoveBlockRule {
+
+        private final BlockSelector selector;
+
+        public RemoveBlockRule(BlockSelector selector) {
+            this.selector = selector;
+        }
+
+        public BlockSelector getBlockSelector() {
+            return selector;
+        }
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveInputsFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveInputsFilter.java
index 073abf23d5b..eacc4c9aae7 100644
--- a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveInputsFilter.java
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveInputsFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,9 +58,9 @@ public class RemoveInputsFilter extends AbstractFilter {
                 for (InputSlot is : f.getInputSlots()) {
                     if (z >= r.getStartingIndex() && z <= r.getEndIndex() && is.getConnections().size() > 0) {
                         StringBuilder sb = new StringBuilder();
-                        List<Connection> conns = is.getConnections();
+                        List<FigureConnection> conns = is.getConnections();
                         for (int i = 0; i < conns.size(); i++) {
-                            Connection c = conns.get(i);
+                            FigureConnection c = conns.get(i);
                             OutputSlot os = c.getOutputSlot();
                             Figure pred = os.getFigure();
                             if (i != 0) {
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java
index edbb88f9de4..8fb479d62b7 100644
--- a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,15 +52,15 @@ public class RemoveSelfLoopsFilter extends AbstractFilter {
 
             for (InputSlot is : f.getInputSlots()) {
 
-                List<Connection> toRemove = new ArrayList<>();
-                for (Connection c : is.getConnections()) {
+                List<FigureConnection> toRemove = new ArrayList<>();
+                for (FigureConnection c : is.getConnections()) {
 
                     if (c.getOutputSlot().getFigure() == f) {
                         toRemove.add(c);
                     }
                 }
 
-                for (Connection c : toRemove) {
+                for (FigureConnection c : toRemove) {
 
                     c.remove();
 
diff --git a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/SplitFilter.java b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/SplitFilter.java
index d2bace49193..825e4d6560b 100644
--- a/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/SplitFilter.java
+++ b/src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/SplitFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public class SplitFilter extends AbstractFilter {
         for (Figure f : list) {
 
             for (InputSlot is : f.getInputSlots()) {
-                for (Connection c : is.getConnections()) {
+                for (FigureConnection c : is.getConnections()) {
                     OutputSlot os = c.getOutputSlot();
                     if (f.getSource().getSourceNodes().size() > 0) {
                         os.getSource().addSourceNodes(f.getSource());
@@ -71,7 +71,7 @@ public class SplitFilter extends AbstractFilter {
                 }
             }
             for (OutputSlot os : f.getOutputSlots()) {
-                for (Connection c : os.getConnections()) {
+                for (FigureConnection c : os.getConnections()) {
                     InputSlot is = c.getInputSlot();
                     if (f.getSource().getSourceNodes().size() > 0) {
                         is.getSource().addSourceNodes(f.getSource());
diff --git a/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java b/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java
index b691e31c3df..29ab4f636de 100644
--- a/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java
+++ b/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@ package com.sun.hotspot.igv.graal.filters;
 
 import com.sun.hotspot.igv.data.Properties;
 import com.sun.hotspot.igv.filter.AbstractFilter;
-import com.sun.hotspot.igv.graph.Connection;
+import com.sun.hotspot.igv.graph.FigureConnection;
 import com.sun.hotspot.igv.graph.Diagram;
 import com.sun.hotspot.igv.graph.Figure;
 import com.sun.hotspot.igv.graph.InputSlot;
@@ -42,7 +42,7 @@ public class GraalCFGFilter extends AbstractFilter {
 
     @Override
     public void apply(Diagram d) {
-        Set<Connection> connectionsToRemove = new HashSet<>();
+        Set<FigureConnection> connectionsToRemove = new HashSet<>();
 
         for (Figure f : d.getFigures()) {
             Properties p = f.getProperties();
@@ -57,7 +57,7 @@ public class GraalCFGFilter extends AbstractFilter {
             }
             for (InputSlot is : f.getInputSlots()) {
                 if (is.getPosition() >= predCount && !"EndNode".equals(is.getProperties().get("class"))) {
-                    for (Connection c : is.getConnections()) {
+                    for (FigureConnection c : is.getConnections()) {
                         if (!"EndNode".equals(c.getOutputSlot().getFigure().getProperties().get("class"))) {
                             connectionsToRemove.add(c);
                         }
@@ -66,7 +66,7 @@ public class GraalCFGFilter extends AbstractFilter {
             }
         }
 
-        for (Connection c : connectionsToRemove) {
+        for (FigureConnection c : connectionsToRemove) {
             c.remove();
         }
 
diff --git a/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java b/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java
index 1693a3ec57e..b280d15072b 100644
--- a/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java
+++ b/src/utils/IdealGraphVisualizer/Graal/src/main/java/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,10 @@
  */
 package com.sun.hotspot.igv.graal.filters;
 
-import com.sun.hotspot.igv.data.Properties;
 import com.sun.hotspot.igv.filter.AbstractFilter;
-import com.sun.hotspot.igv.graph.Connection;
-import com.sun.hotspot.igv.graph.Connection.ConnectionStyle;
 import com.sun.hotspot.igv.graph.Diagram;
-import com.sun.hotspot.igv.graph.Figure;
-import com.sun.hotspot.igv.graph.InputSlot;
 import java.awt.Color;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * Filter that colors usage and successor edges differently.
@@ -54,29 +48,6 @@ public class GraalEdgeColorFilter extends AbstractFilter {
 
     @Override
     public void apply(Diagram d) {
-        List<Figure> figures = d.getFigures();
-        for (Figure f : figures) {
-            for (InputSlot is : f.getInputSlots()) {
-                for (Connection c : is.getConnections()) {
-                    String type = c.getType();
-                    if (type == "Association" && "EndNode".equals(c.getOutputSlot().getFigure().getProperties().get("class"))) {
-                        type = "Successor";
-                    }
-
-                    if (type != null) {
-                        Color typeColor = usageColor.get(type);
-                        if (typeColor == null) {
-                            c.setColor(otherUsageColor);
-                        } else {
-                            c.setColor(typeColor);
-                        }
-                        if (c.getStyle() != ConnectionStyle.DASHED && type == "Successor") {
-                            c.setStyle(ConnectionStyle.BOLD);
-                        }
-                    }
-                }
-            }
-        }
     }
 
     public Color getUsageColor(String type) {
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/AnySelector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/AnySelector.java
new file mode 100644
index 00000000000..3def4463aa0
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/AnySelector.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.graph;
+
+import java.util.List;
+import java.util.ArrayList;
+
+// Selects blocks where any node is selected.
+public class AnySelector implements BlockSelector {
+
+    private final Selector selector;
+
+    public AnySelector(Selector s) {
+        this.selector = s;
+    }
+
+    @Override
+    public List<Block> selected(Diagram d) {
+        List<Block> l = new ArrayList<>();
+        for (Figure f : selector.selected(d)) {
+            l.add(d.getBlock(f.getBlock()));
+        }
+        return l;
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Block.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Block.java
index a853f5854fd..18a08b8992a 100644
--- a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Block.java
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Block.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 package com.sun.hotspot.igv.graph;
 
+import java.awt.Dimension;
 import com.sun.hotspot.igv.data.InputBlock;
 import com.sun.hotspot.igv.layout.Cluster;
 import java.awt.Rectangle;
@@ -55,11 +56,17 @@ public class Block implements Cluster {
     public Set<? extends Cluster> getSuccessors() {
         Set<Block> succs = new HashSet<Block>();
         for (InputBlock b : inputBlock.getSuccessors()) {
-            succs.add(diagram.getBlock(b));
+            if (diagram.hasBlock(b)) {
+                succs.add(diagram.getBlock(b));
+            }
         }
         return succs;
     }
 
+    public Dimension getNodeOffset() {
+        return new Dimension(0, -Figure.getVerticalOffset());
+    }
+
     public void setBounds(Rectangle r) {
         this.bounds = r;
     }
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/BlockConnection.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/BlockConnection.java
new file mode 100644
index 00000000000..f846446ffb1
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/BlockConnection.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.graph;
+
+import com.sun.hotspot.igv.layout.Port;
+import java.awt.Color;
+import java.awt.Point;
+import java.util.List;
+
+public class BlockConnection implements Connection {
+
+    private final Block sourceBlock;
+    private final Block destinationBlock;
+    private final String label;
+    private List<Point> controlPoints;
+
+    public BlockConnection(Block src, Block dst, String label) {
+        this.sourceBlock = src;
+        this.destinationBlock = dst;
+        this.label = label;
+    }
+
+    public Color getColor() {
+        return Color.BLUE;
+    }
+
+    public ConnectionStyle getStyle() {
+        return ConnectionStyle.BOLD;
+    }
+
+    @Override
+    public String getToolTipText() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("B").append(sourceBlock.getInputBlock().getName())
+               .append(" → B").append(destinationBlock.getInputBlock().getName());
+        if (label != null) {
+            builder.append(": ").append(label);
+        }
+        return builder.toString();
+    }
+
+    @Override
+    public String toString() {
+        return "BlockConnection('" + label + "', " + getFromCluster() + " to " + getToCluster() + ")";
+    }
+
+    @Override
+    public Port getFrom() {
+        return null;
+    }
+
+    @Override
+    public Block getFromCluster() {
+        return sourceBlock;
+    }
+
+    @Override
+    public Port getTo() {
+        return null;
+    }
+
+    @Override
+    public Block getToCluster() {
+        return destinationBlock;
+    }
+
+    @Override
+    public boolean isVIP() {
+        return true;
+    }
+
+    @Override
+    public List<Point> getControlPoints() {
+        return controlPoints;
+    }
+
+    @Override
+    public void setControlPoints(List<Point> list) {
+        controlPoints = list;
+    }
+
+    @Override
+    public boolean isAlwaysVisible() {
+        return true;
+    }
+
+    @Override
+    public boolean hasSlots() {
+        return false;
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/BlockSelector.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/BlockSelector.java
new file mode 100644
index 00000000000..f27afac616a
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/BlockSelector.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.graph;
+
+import java.util.List;
+
+public interface BlockSelector {
+    List<Block> selected(Diagram d);
+}
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Connection.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Connection.java
index 4355a5e0cc5..faa8f736988 100644
--- a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Connection.java
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Connection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,143 +23,26 @@
  */
 package com.sun.hotspot.igv.graph;
 
-import com.sun.hotspot.igv.data.Source;
 import com.sun.hotspot.igv.layout.Link;
-import com.sun.hotspot.igv.layout.Port;
 import java.awt.Color;
-import java.awt.Point;
-import java.util.ArrayList;
-import java.util.List;
 
-/**
- *
- * @author Thomas Wuerthinger
- */
-public class Connection implements Source.Provider, Link {
-
-    @Override
-    public boolean isVIP() {
-        return style == ConnectionStyle.BOLD;
-    }
+public interface Connection extends Link {
 
     public enum ConnectionStyle {
-
         NORMAL,
         DASHED,
         BOLD,
         INVISIBLE
     }
-    private InputSlot inputSlot;
-    private OutputSlot outputSlot;
-    private Source source;
-    private Color color;
-    private ConnectionStyle style;
-    private List<Point> controlPoints;
-    private String label;
-    private String type;
-
-    protected Connection(InputSlot inputSlot, OutputSlot outputSlot, String label, String type) {
-        this.inputSlot = inputSlot;
-        this.outputSlot = outputSlot;
-        this.label = label;
-        this.type = type;
-        this.inputSlot.connections.add(this);
-        this.outputSlot.connections.add(this);
-        controlPoints = new ArrayList<>();
-        Figure sourceFigure = this.outputSlot.getFigure();
-        Figure destFigure = this.inputSlot.getFigure();
-        sourceFigure.addSuccessor(destFigure);
-        destFigure.addPredecessor(sourceFigure);
-        source = new Source();
-
-        this.color = Color.BLACK;
-        this.style = ConnectionStyle.NORMAL;
-    }
-
-    public InputSlot getInputSlot() {
-        return inputSlot;
-    }
 
-    public OutputSlot getOutputSlot() {
-        return outputSlot;
-    }
+    public ConnectionStyle getStyle();
 
-    public Color getColor() {
-        return color;
-    }
+    public Color getColor();
 
-    public ConnectionStyle getStyle() {
-        return style;
-    }
+    public String getToolTipText();
 
-    public void setColor(Color c) {
-        color = c;
-    }
+    public boolean isAlwaysVisible();
 
-    public void setStyle(ConnectionStyle s) {
-        style = s;
-    }
-
-    @Override
-    public Source getSource() {
-        return source;
-    }
+    public boolean hasSlots();
 
-    public String getLabel() {
-        return label;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void remove() {
-        inputSlot.getFigure().removePredecessor(outputSlot.getFigure());
-        inputSlot.connections.remove(this);
-        outputSlot.getFigure().removeSuccessor(inputSlot.getFigure());
-        outputSlot.connections.remove(this);
-    }
-
-    public String getToolTipText() {
-        StringBuilder builder = new StringBuilder();
-        if (label != null) {
-            builder.append(label).append(": ");
-        }
-        if (type != null) {
-            builder.append(type).append(" ");
-        }
-        // Resolve strings lazily every time the tooltip is shown, instead of
-        // eagerly as for node labels, for efficiency.
-        String shortNodeText = getInputSlot().getFigure().getDiagram().getShortNodeText();
-        builder.append(getOutputSlot().getFigure().getProperties().resolveString(shortNodeText));
-        builder.append(" → ");
-        builder.append(getInputSlot().getFigure().getProperties().resolveString(shortNodeText));
-        return builder.toString();
-    }
-
-    @Override
-    public String toString() {
-        return "Connection('" + label + "', " + getFrom().getVertex() + " to " + getTo().getVertex() + ")";
-    }
-
-    @Override
-    public Port getFrom() {
-        return outputSlot;
-    }
-
-    @Override
-    public Port getTo() {
-        return inputSlot;
-    }
-
-    @Override
-    public List<Point> getControlPoints() {
-        return controlPoints;
-    }
-
-    @Override
-    public void setControlPoints(List<Point> list) {
-        controlPoints = list;
-    }
 }
-
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Diagram.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Diagram.java
index a770aba07e0..445eeae8a9f 100644
--- a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Diagram.java
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Diagram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,14 @@
 package com.sun.hotspot.igv.graph;
 
 import com.sun.hotspot.igv.data.InputBlock;
+import com.sun.hotspot.igv.data.InputBlockEdge;
 import com.sun.hotspot.igv.data.InputEdge;
 import com.sun.hotspot.igv.data.InputGraph;
 import com.sun.hotspot.igv.data.InputNode;
 import com.sun.hotspot.igv.data.Properties;
 import com.sun.hotspot.igv.data.Properties.StringPropertyMatcher;
 import java.awt.Font;
+import java.awt.Color;
 import java.util.*;
 
 /**
@@ -44,9 +46,14 @@ public class Diagram {
     private int curId;
     private String nodeText;
     private String shortNodeText;
+    private String tinyNodeText;
     private final Font font;
     private final Font slotFont;
     private final Font boldFont;
+    // Whether widgets derived from this diagram should be adapted for the
+    // control-flow graph view.
+    private boolean cfg;
+    private final Set<BlockConnection> blockConnections;
 
     public Font getFont() {
         return font;
@@ -60,7 +67,16 @@ public class Diagram {
         return boldFont;
     }
 
-    private Diagram() {
+    public boolean isCFG() {
+        return cfg;
+    }
+
+    public void setCFG(boolean cfg) {
+        this.cfg = cfg;
+    }
+
+    private Diagram(InputGraph graph, String nodeText, String shortNodeText,
+                    String tinyNodeText) {
         figures = new ArrayList<>();
         blocks = new LinkedHashMap<>(8);
         this.nodeText = "";
@@ -68,6 +84,12 @@ public class Diagram {
         this.font = new Font("Arial", Font.PLAIN, 12);
         this.slotFont = new Font("Arial", Font.PLAIN, 10);
         this.boldFont = this.font.deriveFont(Font.BOLD);
+        this.cfg = false;
+        this.blockConnections = new HashSet<>();
+        this.graph = graph;
+        this.nodeText = nodeText;
+        this.shortNodeText = shortNodeText;
+        this.tinyNodeText = tinyNodeText;
     }
 
     public Block getBlock(InputBlock b) {
@@ -75,6 +97,10 @@ public class Diagram {
         return blocks.get(b);
     }
 
+    public boolean hasBlock(InputBlock b) {
+        return blocks.containsKey(b);
+    }
+
     public String getNodeText() {
         return nodeText;
     }
@@ -83,6 +109,10 @@ public class Diagram {
         return shortNodeText;
     }
 
+    public String getTinyNodeText() {
+        return tinyNodeText;
+    }
+
     public void updateBlocks() {
         blocks.clear();
         for (InputBlock b : graph.getBlocks()) {
@@ -91,18 +121,10 @@ public class Diagram {
         }
     }
 
-    public Diagram getNext() {
-        return Diagram.createDiagram(graph.getNext(), nodeText, shortNodeText);
-    }
-
     public Collection<Block> getBlocks() {
         return Collections.unmodifiableCollection(blocks.values());
     }
 
-    public Diagram getPrev() {
-        return Diagram.createDiagram(graph.getPrev(), nodeText, shortNodeText);
-    }
-
     public List<Figure> getFigures() {
         return Collections.unmodifiableList(figures);
     }
@@ -114,10 +136,10 @@ public class Diagram {
         return f;
     }
 
-    public Connection createConnection(InputSlot inputSlot, OutputSlot outputSlot, String label, String type) {
+    public FigureConnection createConnection(InputSlot inputSlot, OutputSlot outputSlot, String label) {
         assert inputSlot.getFigure().getDiagram() == this;
         assert outputSlot.getFigure().getDiagram() == this;
-        return new Connection(inputSlot, outputSlot, label, type);
+        return new FigureConnection(inputSlot, outputSlot, label);
     }
 
     public Map<InputNode, Set<Figure>> calcSourceToFigureRelation() {
@@ -137,16 +159,13 @@ public class Diagram {
     }
 
     public static Diagram createDiagram(InputGraph graph, String nodeText,
-                                        String shortNodeText) {
+                                        String shortNodeText,
+                                        String tinyNodeText) {
         if (graph == null) {
             return null;
         }
 
-        Diagram d = new Diagram();
-        d.graph = graph;
-        d.nodeText = nodeText;
-        d.shortNodeText = shortNodeText;
-
+        Diagram d = new Diagram(graph, nodeText, shortNodeText, tinyNodeText);
         d.updateBlocks();
 
         Collection<InputNode> nodes = graph.getNodes();
@@ -156,6 +175,7 @@ public class Diagram {
             f.getSource().addSourceNode(n);
             f.getProperties().add(n.getProperties());
             f.setSubgraphs(n.getSubgraphs());
+            f.setBlock(graph.getBlock(n));
             figureHash.put(n.getId(), f);
         }
 
@@ -181,7 +201,7 @@ public class Diagram {
             }
             InputSlot inputSlot = toFigure.getInputSlots().get(toIndex);
 
-            Connection c = d.createConnection(inputSlot, outputSlot, e.getLabel(), e.getType());
+            FigureConnection c = d.createConnection(inputSlot, outputSlot, e.getLabel());
 
             if (e.getState() == InputEdge.State.NEW) {
                 c.setStyle(Connection.ConnectionStyle.BOLD);
@@ -190,10 +210,30 @@ public class Diagram {
             }
         }
 
+        for (InputBlockEdge e : graph.getBlockEdges()) {
+            Block p = d.getBlock(e.getFrom());
+            Block s = d.getBlock(e.getTo());
+            d.blockConnections.add(new BlockConnection(p, s, e.getLabel()));
+        }
 
         return d;
     }
 
+    public void removeAllBlocks(Set<Block> blocksToRemove) {
+        Set<Figure> figuresToRemove = new HashSet<>();
+        for (Block b : blocksToRemove) {
+            for (Figure f : getFigures()) {
+                if (f.getBlock() == b.getInputBlock()) {
+                    figuresToRemove.add(f);
+                }
+            }
+        }
+        removeAllFigures(figuresToRemove);
+        for (Block b : blocksToRemove) {
+            blocks.remove(b.getInputBlock());
+        }
+    }
+
     public void removeAllFigures(Set<Figure> figuresToRemove) {
         for (Figure f : figuresToRemove) {
             freeFigure(f);
@@ -228,7 +268,6 @@ public class Diagram {
     }
 
     public void removeFigure(Figure succ) {
-
         assert this.figures.contains(succ);
         freeFigure(succ);
         this.figures.remove(succ);
@@ -242,16 +281,24 @@ public class Diagram {
         return graph;
     }
 
-    public Set<Connection> getConnections() {
-
-        Set<Connection> connections = new HashSet<>();
+    public Set<FigureConnection> getConnections() {
+        Set<FigureConnection> connections = new HashSet<>();
         for (Figure f : figures) {
-
             for (InputSlot s : f.getInputSlots()) {
                 connections.addAll(s.getConnections());
             }
         }
+        return connections;
+    }
 
+    public Set<BlockConnection> getBlockConnections() {
+        Set<BlockConnection> connections = new HashSet<>();
+        for (BlockConnection bc : blockConnections) {
+            if (blocks.containsKey(bc.getFromCluster().getInputBlock()) &&
+                blocks.containsKey(bc.getToCluster().getInputBlock())) {
+                connections.add(bc);
+            }
+        }
         return connections;
     }
 
@@ -278,7 +325,7 @@ public class Diagram {
         System.out.println("Diagram statistics");
 
         List<Figure> tmpFigures = getFigures();
-        Set<Connection> connections = getConnections();
+        Set<FigureConnection> connections = getConnections();
 
         System.out.println("Number of figures: " + tmpFigures.size());
         System.out.println("Number of connections: " + connections.size());
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Figure.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Figure.java
index 11ae90c2b15..cd7f2f48e7a 100644
--- a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Figure.java
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Figure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,18 @@ import com.sun.hotspot.igv.data.Source;
 import com.sun.hotspot.igv.layout.Cluster;
 import com.sun.hotspot.igv.layout.Vertex;
 import java.awt.*;
-import java.awt.image.BufferedImage;
 import java.util.List;
 import java.util.*;
 
 public class Figure extends Properties.Entity implements Source.Provider, Vertex {
 
     public static final int INSET = 8;
-    public static int SLOT_WIDTH = 10;
+    public static final int SLOT_WIDTH = 10;
     public static final int OVERLAPPING = 6;
     public static final int SLOT_START = 4;
     public static final int SLOT_OFFSET = 8;
-    public static final boolean VERTICAL_LAYOUT = true;
+    public static final int TOP_CFG_HEIGHT = 7;
+    public static final int BOTTOM_CFG_HEIGHT = 6;
     protected List<InputSlot> inputSlots;
     protected List<OutputSlot> outputSlots;
     private Source source;
@@ -57,19 +57,33 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
     private String[] lines;
     private int heightCash = -1;
     private int widthCash = -1;
+    private InputBlock block;
+    private final FontMetrics metrics;
 
     public int getHeight() {
         if (heightCash == -1) {
-            BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
-            Graphics g = image.getGraphics();
-            g.setFont(diagram.getFont().deriveFont(Font.BOLD));
-            FontMetrics metrics = g.getFontMetrics();
-            String nodeText = diagram.getNodeText();
-            heightCash = nodeText.split("\n").length * metrics.getHeight() + INSET;
+            updateHeight();
         }
         return heightCash;
     }
 
+    private void updateHeight() {
+        String nodeText = diagram.getNodeText();
+        int lines = nodeText.split("\n").length;
+        if (hasInputList() && lines > 1) {
+            lines++;
+        }
+        heightCash = lines * metrics.getHeight() + INSET;
+        if (diagram.isCFG()) {
+            if (hasNamedInputSlot()) {
+                heightCash += TOP_CFG_HEIGHT;
+            }
+            if (hasNamedOutputSlot()) {
+                heightCash += BOTTOM_CFG_HEIGHT;
+            }
+        }
+    }
+
     public static <T> List<T> getAllBefore(List<T> inputList, T tIn) {
         List<T> result = new ArrayList<>();
         for(T t : inputList) {
@@ -91,11 +105,17 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
 
     public int getWidth() {
         if (widthCash == -1) {
+            updateWidth();
+        }
+        return widthCash;
+    }
+
+    public void setWidth(int width) {
+        widthCash = width;
+    }
+
+    private void updateWidth() {
             int max = 0;
-            BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
-            Graphics g = image.getGraphics();
-            g.setFont(diagram.getFont().deriveFont(Font.BOLD));
-            FontMetrics metrics = g.getFontMetrics();
             for (String s : getLines()) {
                 int cur = metrics.stringWidth(s);
                 if (cur > max) {
@@ -105,8 +125,6 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
             widthCash = max + INSET;
             widthCash = Math.max(widthCash, Figure.getSlotsWidth(inputSlots));
             widthCash = Math.max(widthCash, Figure.getSlotsWidth(outputSlots));
-        }
-        return widthCash;
     }
 
     protected Figure(Diagram diagram, int id) {
@@ -121,6 +139,8 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
 
         this.position = new Point(0, 0);
         this.color = Color.WHITE;
+        Canvas canvas = new Canvas();
+        metrics = canvas.getFontMetrics(diagram.getFont().deriveFont(Font.BOLD));
     }
 
     public int getId() {
@@ -135,6 +155,18 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
         return color;
     }
 
+    public boolean hasInputList() {
+        return diagram.isCFG() && !getPredecessors().isEmpty();
+    }
+
+    public void setBlock(InputBlock block) {
+        this.block = block;
+    }
+
+    public InputBlock getBlock() {
+        return block;
+    }
+
     public List<Figure> getPredecessors() {
         return Collections.unmodifiableList(predecessors);
     }
@@ -221,8 +253,8 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
 
         assert inputSlots.contains(s) || outputSlots.contains(s);
 
-        List<Connection> connections = new ArrayList<>(s.getConnections());
-        for (Connection c : connections) {
+        List<FigureConnection> connections = new ArrayList<>(s.getConnections());
+        for (FigureConnection c : connections) {
             c.remove();
         }
 
@@ -261,6 +293,24 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
         return Collections.unmodifiableList(outputSlots);
     }
 
+    public boolean hasNamedInputSlot() {
+        for (InputSlot is : getInputSlots()) {
+            if (is.hasSourceNodes() && is.shouldShowName()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean hasNamedOutputSlot() {
+        for (OutputSlot os : getOutputSlots()) {
+            if (os.hasSourceNodes() && os.shouldShowName()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     void removeInputSlot(InputSlot s) {
         s.removeAllConnections();
         inputSlots.remove(s);
@@ -274,41 +324,52 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
     public String[] getLines() {
         if (lines == null) {
             updateLines();
-            // Set the "label" property of each input node, so that by default
-            // search is done on the node label (without line breaks). See also
-            // class NodeQuickSearch in the View module.
-            for (InputNode n : getSource().getSourceNodes()) {
-                String label = n.getProperties().resolveString(diagram.getNodeText());
-                n.getProperties().setProperty("label", label.replaceAll("\\R", " "));
-            }
         }
         return lines;
     }
 
     public void updateLines() {
         String[] strings = diagram.getNodeText().split("\n");
-        String[] result = new String[strings.length];
+        List<String> result = new ArrayList<>(strings.length + 1);
 
         for (int i = 0; i < strings.length; i++) {
-            result[i] = getProperties().resolveString(strings[i]);
+            result.add(getProperties().resolveString(strings[i]));
         }
 
-        lines = result;
+        if (hasInputList()) {
+            String inputList = " ← ";
+            List<String> inputs = new ArrayList<String>(getPredecessors().size());
+            for (Figure p : getPredecessors()) {
+                inputs.add(p.getProperties().resolveString(diagram.getTinyNodeText()));
+            }
+            inputList += String.join("  ", inputs);
+            if (result.size() == 1) {
+                // Single-line node, append input list to line.
+                result.set(0, result.get(0) + inputList);
+            } else {
+                // Multi-line node, add yet another line for input list.
+                result.add(inputList);
+            }
+        }
+
+        lines = result.toArray(new String[0]);
+        // Set the "label" property of each input node, so that by default
+        // search is done on the node label (without line breaks). See also
+        // class NodeQuickSearch in the View module.
+        for (InputNode n : getSource().getSourceNodes()) {
+            String label = n.getProperties().resolveString(diagram.getNodeText());
+            n.getProperties().setProperty("label", label.replaceAll("\\R", " "));
+        }
+        // Update figure dimensions, as these are affected by the node text.
+        updateWidth();
+        updateHeight();
     }
 
     @Override
     public Dimension getSize() {
-        if (VERTICAL_LAYOUT) {
-            int width = Math.max(getWidth(), Figure.SLOT_WIDTH * (Math.max(inputSlots.size(), outputSlots.size()) + 1));
-            int height = getHeight() + 2 * Figure.SLOT_WIDTH - 2 * Figure.OVERLAPPING;
-
-
-            return new Dimension(width, height);
-        } else {
-            int width = getWidth() + 2 * Figure.SLOT_WIDTH - 2*Figure.OVERLAPPING;
-            int height = Figure.SLOT_WIDTH * (Math.max(inputSlots.size(), outputSlots.size()) + 1);
-            return new Dimension(width, height);
-        }
+        int width = Math.max(getWidth(), Figure.SLOT_WIDTH * (Math.max(inputSlots.size(), outputSlots.size()) + 1));
+        int height = getHeight() + (diagram.isCFG() ? 0 : 2 * Figure.SLOT_WIDTH - 2 * Figure.OVERLAPPING);
+        return new Dimension(width, height);
     }
 
     @Override
@@ -316,12 +377,20 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
         return idString;
     }
 
+    public InputNode getFirstSourceNode() {
+        return getSource().getSourceNodes().get(0);
+    }
+
+    public static int getVerticalOffset() {
+        return Figure.SLOT_WIDTH - Figure.OVERLAPPING;
+    }
+
     public Cluster getCluster() {
         if (getSource().getSourceNodes().size() == 0) {
             assert false : "Should never reach here, every figure must have at least one source node!";
             return null;
         } else {
-            final InputBlock inputBlock = diagram.getGraph().getBlock(getSource().getSourceNodes().get(0));
+            final InputBlock inputBlock = diagram.getGraph().getBlock(getFirstSourceNode());
             assert inputBlock != null;
             Cluster result = diagram.getBlock(inputBlock);
             assert result != null;
@@ -333,8 +402,8 @@ public class Figure extends Properties.Entity implements Source.Provider, Vertex
     public boolean isRoot() {
 
         List<InputNode> sourceNodes = source.getSourceNodes();
-        if (sourceNodes.size() > 0 && sourceNodes.get(0).getProperties().get("name") != null) {
-            return source.getSourceNodes().get(0).getProperties().get("name").equals("Root");
+        if (sourceNodes.size() > 0 && getFirstSourceNode().getProperties().get("name") != null) {
+            return getFirstSourceNode().getProperties().get("name").equals("Root");
         } else {
             return false;
         }
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/FigureConnection.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/FigureConnection.java
new file mode 100644
index 00000000000..0b64668816c
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/FigureConnection.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.graph;
+
+import com.sun.hotspot.igv.layout.Port;
+import com.sun.hotspot.igv.layout.Cluster;
+import java.awt.Color;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author Thomas Wuerthinger
+ */
+public class FigureConnection implements Connection {
+
+    private final InputSlot inputSlot;
+    private final OutputSlot outputSlot;
+    private Color color;
+    private ConnectionStyle style;
+    private List<Point> controlPoints;
+    private String label;
+
+    protected FigureConnection(InputSlot inputSlot, OutputSlot outputSlot, String label) {
+        this.inputSlot = inputSlot;
+        this.outputSlot = outputSlot;
+        this.label = label;
+        this.inputSlot.connections.add(this);
+        this.outputSlot.connections.add(this);
+        controlPoints = new ArrayList<>();
+        Figure sourceFigure = this.outputSlot.getFigure();
+        Figure destFigure = this.inputSlot.getFigure();
+        sourceFigure.addSuccessor(destFigure);
+        destFigure.addPredecessor(sourceFigure);
+
+        this.color = Color.BLACK;
+        this.style = ConnectionStyle.NORMAL;
+    }
+
+    public InputSlot getInputSlot() {
+        return inputSlot;
+    }
+
+    public OutputSlot getOutputSlot() {
+        return outputSlot;
+    }
+
+    public Color getColor() {
+        return color;
+    }
+
+    public ConnectionStyle getStyle() {
+        return style;
+    }
+
+    public void setColor(Color c) {
+        color = c;
+    }
+
+    public void setStyle(ConnectionStyle s) {
+        style = s;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void remove() {
+        inputSlot.getFigure().removePredecessor(outputSlot.getFigure());
+        inputSlot.connections.remove(this);
+        outputSlot.getFigure().removeSuccessor(inputSlot.getFigure());
+        outputSlot.connections.remove(this);
+    }
+
+    public String getToolTipText() {
+        StringBuilder builder = new StringBuilder();
+        if (label != null) {
+            builder.append(label).append(": ");
+        }
+        // Resolve strings lazily every time the tooltip is shown, instead of
+        // eagerly as for node labels, for efficiency.
+        String shortNodeText = getInputSlot().getFigure().getDiagram().getShortNodeText();
+        builder.append(getOutputSlot().getFigure().getProperties().resolveString(shortNodeText));
+        builder.append(" → ");
+        builder.append(getInputSlot().getFigure().getProperties().resolveString(shortNodeText));
+        return builder.toString();
+    }
+
+    @Override
+    public String toString() {
+        return "FigureConnection('" + label + "', " + getFrom().getVertex() + " to " + getTo().getVertex() + ")";
+    }
+
+    @Override
+    public Port getFrom() {
+        return outputSlot;
+    }
+
+    @Override
+    public Cluster getFromCluster() {
+        return getFrom().getVertex().getCluster();
+    }
+
+    @Override
+    public Port getTo() {
+        return inputSlot;
+    }
+
+    @Override
+    public Cluster getToCluster() {
+        return getTo().getVertex().getCluster();
+    }
+
+    @Override
+    public boolean isVIP() {
+        return style == ConnectionStyle.BOLD;
+    }
+
+    @Override
+    public List<Point> getControlPoints() {
+        return controlPoints;
+    }
+
+    @Override
+    public void setControlPoints(List<Point> list) {
+        controlPoints = list;
+    }
+
+    @Override
+    public boolean isAlwaysVisible() {
+        return false;
+    }
+
+    @Override
+    public boolean hasSlots() {
+        return true;
+    }
+
+}
+
diff --git a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Slot.java b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Slot.java
index 396db338592..bce5266e83d 100644
--- a/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Slot.java
+++ b/src/utils/IdealGraphVisualizer/Graph/src/main/java/com/sun/hotspot/igv/graph/Slot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ public abstract class Slot implements Port, Source.Provider, Properties.Provider
 
     private int wantedIndex;
     private Source source;
-    protected List<Connection> connections;
+    protected List<FigureConnection> connections;
     private InputNode associatedNode;
     private Color color;
     private String text;
@@ -67,7 +67,7 @@ public abstract class Slot implements Port, Source.Provider, Properties.Provider
     @Override
     public Properties getProperties() {
         Properties p = new Properties();
-        if (source.getSourceNodes().size() > 0) {
+        if (hasSourceNodes()) {
             for (InputNode n : source.getSourceNodes()) {
                 p.add(n.getProperties());
             }
@@ -158,6 +158,10 @@ public abstract class Slot implements Port, Source.Provider, Properties.Provider
         return getShortName() != null && getShortName().length() > 0;
     }
 
+    public boolean hasSourceNodes() {
+        return !getSource().getSourceNodes().isEmpty();
+    }
+
     public void setText(String s) {
         if (s == null) {
             s = "";
@@ -178,13 +182,13 @@ public abstract class Slot implements Port, Source.Provider, Properties.Provider
         color = c;
     }
 
-    public List<Connection> getConnections() {
+    public List<FigureConnection> getConnections() {
         return Collections.unmodifiableList(connections);
     }
 
     public void removeAllConnections() {
-        List<Connection> connectionsCopy = new ArrayList<>(this.connections);
-        for (Connection c : connectionsCopy) {
+        List<FigureConnection> connectionsCopy = new ArrayList<>(this.connections);
+        for (FigureConnection c : connectionsCopy) {
             c.remove();
         }
     }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java
index 474cef1ddca..b243b88d194 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package com.sun.hotspot.igv.hierarchicallayout;
 
 import com.sun.hotspot.igv.layout.Link;
 import com.sun.hotspot.igv.layout.Port;
+import com.sun.hotspot.igv.layout.Cluster;
 import java.awt.Point;
 import java.util.List;
 
@@ -53,6 +54,14 @@ public class ClusterEdge implements Link {
         return from.getInputSlot();
     }
 
+    public Cluster getFromCluster() {
+        return from.getCluster();
+    }
+
+    public Cluster getToCluster() {
+        return to.getCluster();
+    }
+
     public void setControlPoints(List<Point> p) {
         this.points = p;
     }
@@ -64,4 +73,9 @@ public class ClusterEdge implements Link {
     public boolean isVIP() {
         return false;
     }
+
+    @Override
+    public String toString() {
+        return from + "->" + to;
+    }
 }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java
index e181c669118..db8b4c7257c 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package com.sun.hotspot.igv.hierarchicallayout;
 
 import com.sun.hotspot.igv.layout.Link;
 import com.sun.hotspot.igv.layout.Port;
+import com.sun.hotspot.igv.layout.Cluster;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.List;
@@ -66,6 +67,14 @@ public class ClusterIngoingConnection implements Link {
         return outputSlot;
     }
 
+    public Cluster getFromCluster() {
+        return null;
+    }
+
+    public Cluster getToCluster() {
+        return null;
+    }
+
     public void setControlPoints(List<Point> p) {
         this.controlPoints = p;
     }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java
index aae46cb629e..c398a6e3d74 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@ public class ClusterInputSlotNode implements Vertex {
 
             public Point getRelativePosition() {
                 Point p = new Point(thisNode.getPosition());
-                p.x += ClusterNode.BORDER;
+                p.x += blockNode.getBorder();
                 p.y = 0;
                 return p;
             }
@@ -142,4 +142,5 @@ public class ClusterInputSlotNode implements Vertex {
     public int compareTo(Vertex o) {
         return toString().compareTo(o.toString());
     }
+
 }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java
index 36937e0622b..0a6631c72f3 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,14 +51,34 @@ public class ClusterNode implements Vertex {
     private boolean dirty;
     private boolean root;
     private String name;
-    public static final int BORDER = 20;
-
-    public ClusterNode(Cluster cluster, String name) {
+    private final int border;
+    private final Dimension nodeOffset;
+    private final int headerVerticalSpace;
+    private final Dimension emptySize;
+
+    public ClusterNode(Cluster cluster, String name, int border,
+                       Dimension nodeOffset, int headerVerticalSpace,
+                       Dimension emptySize) {
         this.subNodes = new HashSet<Vertex>();
         this.subEdges = new HashSet<Link>();
         this.cluster = cluster;
         position = new Point(0, 0);
         this.name = name;
+        this.border = border;
+        this.nodeOffset = nodeOffset;
+        this.headerVerticalSpace = headerVerticalSpace;
+        this.emptySize = emptySize;
+        if (emptySize.width > 0 || emptySize.height > 0) {
+            updateSize();
+        }
+    }
+
+    public ClusterNode(Cluster cluster, String name) {
+        this(cluster, name, 20, new Dimension(0, 0), 0, new Dimension(0, 0));
+    }
+
+    public String getName() {
+        return name;
     }
 
     public void addSubNode(Vertex v) {
@@ -88,6 +108,11 @@ public class ClusterNode implements Vertex {
             public Vertex getVertex() {
                 return widget;
             }
+
+            @Override
+            public String toString() {
+                return "ClusterInput(" + name + ")";
+            }
         };
 
         outputSlot = new Port() {
@@ -99,13 +124,19 @@ public class ClusterNode implements Vertex {
             public Vertex getVertex() {
                 return widget;
             }
+
+            @Override
+            public String toString() {
+                return "ClusterOutput(" + name + ")";
+            }
         };
     }
 
     private void calculateSize() {
 
-        if (subNodes.size() == 0) {
-            size = new Dimension(0, 0);
+        if (subNodes.isEmpty()) {
+            size = emptySize;
+            return;
         }
 
         int minX = Integer.MAX_VALUE;
@@ -134,11 +165,12 @@ public class ClusterNode implements Vertex {
             }
         }
 
-        size = new Dimension(maxX - minX, maxY - minY);
+        size = new Dimension(maxX - minX, maxY - minY + headerVerticalSpace);
 
         // Normalize coordinates
         for (Vertex n : subNodes) {
-            n.setPosition(new Point(n.getPosition().x - minX, n.getPosition().y - minY));
+            n.setPosition(new Point(n.getPosition().x - minX + nodeOffset.width,
+                                    n.getPosition().y - minY + nodeOffset.height + headerVerticalSpace));
         }
 
         for (Link l : subEdges) {
@@ -151,8 +183,8 @@ public class ClusterNode implements Vertex {
 
         }
 
-        size.width += 2 * BORDER;
-        size.height += 2 * BORDER;
+        size.width += 2 * border;
+        size.height += 2 * border;
     }
 
     public Port getInputSlot() {
@@ -177,7 +209,7 @@ public class ClusterNode implements Vertex {
         this.position = pos;
         for (Vertex n : subNodes) {
             Point cur = new Point(n.getPosition());
-            cur.translate(pos.x + BORDER, pos.y + BORDER);
+            cur.translate(pos.x + border, pos.y + border);
             n.setPosition(cur);
         }
 
@@ -187,7 +219,7 @@ public class ClusterNode implements Vertex {
             for (Point p : arr) {
                 if (p != null) {
                     Point p2 = new Point(p);
-                    p2.translate(pos.x + BORDER, pos.y + BORDER);
+                    p2.translate(pos.x + border, pos.y + border);
                     newArr.add(p2);
                 } else {
                     newArr.add(null);
@@ -218,6 +250,10 @@ public class ClusterNode implements Vertex {
         return root;
     }
 
+    public int getBorder() {
+        return border;
+    }
+
     public int compareTo(Vertex o) {
         return toString().compareTo(o.toString());
     }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java
index 2f5bce16883..9848bb58618 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package com.sun.hotspot.igv.hierarchicallayout;
 
 import com.sun.hotspot.igv.layout.Link;
 import com.sun.hotspot.igv.layout.Port;
+import com.sun.hotspot.igv.layout.Cluster;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.List;
@@ -58,6 +59,14 @@ public class ClusterOutgoingConnection implements Link {
         return outputSlot;
     }
 
+    public Cluster getFromCluster() {
+        return null;
+    }
+
+    public Cluster getToCluster() {
+        return null;
+    }
+
     public void setControlPoints(List<Point> p) {
         this.intermediatePoints = p;
     }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java
index d0240ce5cd5..52a334ec4f3 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@ public class ClusterOutputSlotNode implements Vertex {
 
             public Point getRelativePosition() {
                 Point p = new Point(thisNode.getPosition());
-                p.x += ClusterNode.BORDER;
+                p.x += blockNode.getBorder();
                 p.y = 0;//thisBlockNode.getSize().height;
                 return p;
             }
@@ -142,4 +142,5 @@ public class ClusterOutputSlotNode implements Vertex {
     public int compareTo(Vertex o) {
         return toString().compareTo(o.toString());
     }
+
 }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalCFGLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalCFGLayoutManager.java
new file mode 100644
index 00000000000..58322aa171f
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalCFGLayoutManager.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.hierarchicallayout;
+
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.Canvas;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.util.*;
+import com.sun.hotspot.igv.layout.Cluster;
+import com.sun.hotspot.igv.layout.LayoutGraph;
+import com.sun.hotspot.igv.layout.LayoutManager;
+import com.sun.hotspot.igv.layout.Link;
+import com.sun.hotspot.igv.layout.Vertex;
+
+public class HierarchicalCFGLayoutManager implements LayoutManager {
+
+    private static final int BLOCK_BORDER = 5;
+    private FontMetrics fontMetrics;
+    // Lays out nodes within a single cluster (basic block).
+    private LayoutManager subManager;
+    // Lays out clusters in the CFG.
+    private LayoutManager manager;
+    private Set<Cluster> clusters;
+
+    public HierarchicalCFGLayoutManager() {
+        // Anticipate block label sizes to dimension blocks appropriately.
+        Canvas canvas = new Canvas();
+        Font font = new Font("Arial", Font.BOLD, 14);
+        fontMetrics = canvas.getFontMetrics(font);
+    }
+
+    public void setSubManager(LayoutManager manager) {
+        this.subManager = manager;
+    }
+
+    public void setManager(LayoutManager manager) {
+        this.manager = manager;
+    }
+
+    public void setClusters(Set<Cluster> clusters) {
+        this.clusters = clusters;
+    }
+
+    public void doLayout(LayoutGraph graph, Set<? extends Link> importantLinks) {
+        doLayout(graph);
+    }
+
+    public void doLayout(LayoutGraph graph) {
+
+        // Create cluster-level nodes and edges.
+        Map<Cluster, ClusterNode> clusterNode = createClusterNodes(graph);
+        Set<ClusterEdge> clusterEdges = createClusterEdges(clusterNode);
+        markRootClusters(clusterEdges);
+
+        // Compute layout for each cluster.
+        for (Cluster c : clusters) {
+            ClusterNode n = clusterNode.get(c);
+            subManager.doLayout(new LayoutGraph(n.getSubEdges(), n.getSubNodes()), new HashSet<Link>());
+            n.updateSize();
+        }
+
+        // Compute inter-cluster layout.
+        manager.doLayout(new LayoutGraph(clusterEdges, new HashSet<>(clusterNode.values())),
+                         new HashSet<Link>());
+
+        // Write back results.
+        writeBackClusterBounds(clusterNode);
+        writeBackClusterEdgePoints(graph, clusterEdges);
+    }
+
+    private Map<Cluster, ClusterNode> createClusterNodes(LayoutGraph graph) {
+        Map<Cluster, ClusterNode> clusterNode = new HashMap<>();
+        for (Cluster c : clusters) {
+            String blockLabel = "B" + c;
+            Dimension emptySize = new Dimension(fontMetrics.stringWidth(blockLabel) + BLOCK_BORDER * 2,
+                                                fontMetrics.getHeight() + BLOCK_BORDER);
+            ClusterNode cn = new ClusterNode(c, c.toString(), BLOCK_BORDER, c.getNodeOffset(),
+                                             fontMetrics.getHeight(), emptySize);
+            clusterNode.put(c, cn);
+        }
+
+        for (Vertex v : graph.getVertices()) {
+            Cluster c = v.getCluster();
+            assert c != null : "Cluster of vertex " + v + " is null!";
+            clusterNode.get(c).addSubNode(v);
+        }
+        return clusterNode;
+    }
+
+    private Set<ClusterEdge> createClusterEdges(Map<Cluster, ClusterNode> clusterNode) {
+        Set<ClusterEdge> clusterEdges = new HashSet<>();
+        for (Cluster c : clusters) {
+            ClusterNode start = clusterNode.get(c);
+            for (Cluster succ : c.getSuccessors()) {
+                ClusterNode end = clusterNode.get(succ);
+                if (end != null) {
+                    ClusterEdge e = new ClusterEdge(start, end);
+                    clusterEdges.add(e);
+                }
+            }
+        }
+        return clusterEdges;
+    }
+
+    private void markRootClusters(Set<ClusterEdge> clusterEdges) {
+        Set<Vertex> roots = new LayoutGraph(clusterEdges).findRootVertices();
+        for (Vertex v : roots) {
+            assert v instanceof ClusterNode;
+            ((ClusterNode) v).setRoot(true);
+        }
+    }
+
+    private void writeBackClusterBounds(Map<Cluster, ClusterNode> clusterNode) {
+        for (Cluster c : clusters) {
+            ClusterNode n = clusterNode.get(c);
+            c.setBounds(new Rectangle(n.getPosition(), n.getSize()));
+        }
+    }
+
+    private void writeBackClusterEdgePoints(LayoutGraph graph, Set<ClusterEdge> clusterEdges) {
+        // Map from "primitive" cluster edges to their input links.
+        Map<AbstractMap.SimpleEntry<Cluster, Cluster>, Link> inputLink = new HashMap<>();
+        for (Link l : graph.getLinks()) {
+            inputLink.put(new AbstractMap.SimpleEntry<Cluster, Cluster>(l.getFromCluster(), l.getToCluster()), l);
+        }
+        for (ClusterEdge ce : clusterEdges) {
+            assert (ce.getControlPoints() != null);
+            Link l = inputLink.get(new AbstractMap.SimpleEntry<Cluster, Cluster>(ce.getFromCluster(), ce.getToCluster()));
+            l.setControlPoints(ce.getControlPoints());
+        }
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java
index fac6b94e010..5adb982659d 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java
@@ -245,7 +245,4 @@ public class HierarchicalClusterLayoutManager implements LayoutManager {
             }
         }
     }
-
-    public void doRouting(LayoutGraph graph) {
-    }
 }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java
index 3cd7fc9d7e1..d76b681eed5 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,10 @@ public class HierarchicalLayoutManager implements LayoutManager {
     private int layerOffset;
     private int maxLayerLength;
     private int minLayerDifference;
+    private boolean layoutSelfEdges;
     // Algorithm global datastructures
     private Set<Link> reversedLinks;
+    private Set<LayoutEdge> selfEdges;
     private List<LayoutNode> nodes;
     private HashMap<Vertex, LayoutNode> vertexToLayoutNode;
     private HashMap<Link, List<Point>> reversedLinkStartPoints;
@@ -108,10 +110,17 @@ public class HierarchicalLayoutManager implements LayoutManager {
 
         public LayoutNode from;
         public LayoutNode to;
+        // Horizontal distance relative to start of 'from'.
         public int relativeFrom;
+        // Horizontal distance relative to start of 'to'.
         public int relativeTo;
         public Link link;
         public boolean vip;
+
+        @Override
+        public String toString() {
+            return "Edge " + from + ", " + to;
+        }
     }
 
     private abstract class AlgorithmPart {
@@ -162,9 +171,18 @@ public class HierarchicalLayoutManager implements LayoutManager {
         this.layerOffset = LAYER_OFFSET;
         this.maxLayerLength = MAX_LAYER_LENGTH;
         this.minLayerDifference = MIN_LAYER_DIFFERENCE;
+        this.layoutSelfEdges = false;
         this.linksToFollow = new HashSet<>();
     }
 
+    public void setXOffset(int xOffset) {
+        this.xOffset = xOffset;
+    }
+
+    public void setLayerOffset(int layerOffset) {
+        this.layerOffset = layerOffset;
+    }
+
     public int getMaxLayerLength() {
         return maxLayerLength;
     }
@@ -177,6 +195,25 @@ public class HierarchicalLayoutManager implements LayoutManager {
         minLayerDifference = v;
     }
 
+    public void setLayoutSelfEdges(boolean layoutSelfEdges) {
+        this.layoutSelfEdges = layoutSelfEdges;
+    }
+
+    // Remove self-edges, possibly saving them into the selfEdges set.
+    private void removeSelfEdges(boolean save) {
+        for (LayoutNode node : nodes) {
+            for (LayoutEdge e : new ArrayList<>(node.succs)) {
+                if (e.to == node) {
+                    if (save) {
+                        selfEdges.add(e);
+                    }
+                    node.succs.remove(e);
+                    node.preds.remove(e);
+                }
+            }
+        }
+    }
+
     @Override
     public void doLayout(LayoutGraph graph) {
         doLayout(graph, new HashSet<Link>());
@@ -191,6 +228,7 @@ public class HierarchicalLayoutManager implements LayoutManager {
 
         vertexToLayoutNode = new HashMap<>();
         reversedLinks = new HashSet<>();
+        selfEdges = new HashSet<>();
         reversedLinkStartPoints = new HashMap<>();
         reversedLinkEndPoints = new HashMap<>();
         bottomEdgeHash = new HashMap<>();
@@ -202,6 +240,11 @@ public class HierarchicalLayoutManager implements LayoutManager {
         // Step 1: Build up data structure
         new BuildDatastructure().start();
 
+        if (!layoutSelfEdges) {
+            // Remove self-edges from the beginning.
+            removeSelfEdges(false);
+        }
+
         // #############################################################
         // STEP 2: Reverse edges, handle backedges
         new ReverseEdges().start();
@@ -220,6 +263,9 @@ public class HierarchicalLayoutManager implements LayoutManager {
             }
         }
 
+        // Hide self-edges from the layout algorithm and save them for later.
+        removeSelfEdges(true);
+
         // #############################################################
         // STEP 3: Assign layers
         new AssignLayers().start();
@@ -240,6 +286,12 @@ public class HierarchicalLayoutManager implements LayoutManager {
         // STEP 6: Assign Y coordinates
         new AssignYCoordinates().start();
 
+        // Put saved self-edges back so that they are assigned points.
+        for (LayoutEdge e : selfEdges) {
+            e.from.succs.add(e);
+            e.to.preds.add(e);
+        }
+
         // #############################################################
         // STEP 8: Write back to interface
         new WriteResult().start();
@@ -322,6 +374,11 @@ public class HierarchicalLayoutManager implements LayoutManager {
                         } else {
                             if (reversedLinks.contains(e.link)) {
                                 Collections.reverse(points);
+                                if (selfEdges.contains(e)) {
+                                    // For self edges, it is enough with the
+                                    // start and end points computed by ReverseEdges.
+                                    points.clear();
+                                }
                             }
                             if (reversedLinkStartPoints.containsKey(e.link)) {
                                 for (Point p1 : reversedLinkStartPoints.get(e.link)) {
@@ -351,7 +408,11 @@ public class HierarchicalLayoutManager implements LayoutManager {
                         Point p = new Point(e.from.x + e.relativeFrom, e.from.y + e.from.height - e.from.bottomYOffset + e.link.getFrom().getRelativePosition().y);
                         points.add(p);
                         if (e.from.outOffsets.containsKey(e.relativeFrom)) {
-                            points.add(new Point(p.x, p.y + e.from.outOffsets.get(e.relativeFrom) + e.link.getFrom().getRelativePosition().y));
+                            Point pOffset = new Point(p.x, p.y + e.from.outOffsets.get(e.relativeFrom) +
+                                                      e.link.getFrom().getRelativePosition().y + e.from.yOffset);
+                            if (!pOffset.equals(p)) {
+                                points.add(pOffset);
+                            }
                         }
 
                         LayoutNode cur = e.to;
@@ -404,12 +465,12 @@ public class HierarchicalLayoutManager implements LayoutManager {
 
                             if (reversedLinkStartPoints.containsKey(e.link)) {
                                 for (Point p1 : reversedLinkStartPoints.get(e.link)) {
-                                    points.add(0, new Point(p1.x + other.x, p1.y + other.y));
+                                    points.add(0, new Point(p1.x + other.x + other.xOffset, p1.y + other.y));
                                 }
                             }
                             if (reversedLinkEndPoints.containsKey(e.link)) {
                                 for (Point p1 : reversedLinkEndPoints.get(e.link)) {
-                                    points.add(new Point(p1.x + cur.x, p1.y + cur.y));
+                                    points.add(new Point(p1.x + cur.x + cur.xOffset, p1.y + cur.y));
                                 }
                             }
                             if (reversedLinks.contains(e.link)) {
@@ -879,7 +940,7 @@ public class HierarchicalLayoutManager implements LayoutManager {
 
             for (LayoutNode n : layers[index]) {
                 n.x = x;
-                x += n.width + X_OFFSET;
+                x += n.width + xOffset;
             }
         }
 
@@ -1446,18 +1507,6 @@ public class HierarchicalLayoutManager implements LayoutManager {
         @Override
         protected void run() {
 
-            // Remove self-edges
-            for (LayoutNode node : nodes) {
-                ArrayList<LayoutEdge> succs = new ArrayList<>(node.succs);
-                for (LayoutEdge e : succs) {
-                    assert e.from == node;
-                    if (e.to == node) {
-                        node.succs.remove(e);
-                        node.preds.remove(e);
-                    }
-                }
-            }
-
             // Reverse inputs of roots
             for (LayoutNode node : nodes) {
                 if (node.vertex.isRoot()) {
@@ -1485,17 +1534,27 @@ public class HierarchicalLayoutManager implements LayoutManager {
 
                 SortedSet<Integer> reversedDown = new TreeSet<>();
 
+                boolean hasSelfEdge = false;
                 for (LayoutEdge e : node.succs) {
                     if (reversedLinks.contains(e.link)) {
                         reversedDown.add(e.relativeFrom);
+                        if (e.from == e.to) {
+                            hasSelfEdge = true;
+                        }
                     }
                 }
 
+                // Whether the node has non-self reversed edges going downwards.
+                // If so, reversed edges going upwards are drawn to the left.
+                boolean hasReversedDown =
+                    reversedDown.size() > 0 &&
+                    !(reversedDown.size() == 1 && hasSelfEdge);
+
                 SortedSet<Integer> reversedUp = null;
-                if (reversedDown.size() == 0) {
-                    reversedUp = new TreeSet<>(Collections.reverseOrder());
-                } else {
+                if (hasReversedDown) {
                     reversedUp = new TreeSet<>();
+                } else {
+                    reversedUp = new TreeSet<>(Collections.reverseOrder());
                 }
 
                 for (LayoutEdge e : node.preds) {
@@ -1504,7 +1563,7 @@ public class HierarchicalLayoutManager implements LayoutManager {
                     }
                 }
 
-                final int offset = X_OFFSET + DUMMY_WIDTH;
+                final int offset = xOffset + DUMMY_WIDTH;
 
                 int curX = 0;
                 int curWidth = node.width + reversedDown.size() * offset;
@@ -1531,17 +1590,22 @@ public class HierarchicalLayoutManager implements LayoutManager {
                     node.yOffset += offset;
                     curWidth -= offset;
                 }
-                node.width += reversedDown.size() * offset;
 
-                if (reversedDown.size() == 0) {
-                    curX = offset;
-                } else {
+                int widthFactor = reversedDown.size();
+                if (hasSelfEdge) {
+                    widthFactor--;
+                }
+                node.width += widthFactor * offset;
+
+                if (hasReversedDown) {
                     curX = -offset;
+                } else {
+                    curX = offset;
                 }
 
                 curX = 0;
                 int minX = 0;
-                if (reversedDown.size() != 0) {
+                if (hasReversedDown) {
                     minX = -offset * reversedUp.size();
                 }
 
@@ -1550,10 +1614,10 @@ public class HierarchicalLayoutManager implements LayoutManager {
                     ArrayList<LayoutEdge> reversedPreds = new ArrayList<>();
                     for (LayoutEdge e : node.preds) {
                         if (e.relativeTo == pos && reversedLinks.contains(e.link)) {
-                            if (reversedDown.size() == 0) {
-                                e.relativeTo = node.width + offset;
-                            } else {
+                            if (hasReversedDown) {
                                 e.relativeTo = curX - offset;
+                            } else {
+                                e.relativeTo = node.width + offset;
                             }
 
                             reversedPreds.add(e);
@@ -1562,16 +1626,13 @@ public class HierarchicalLayoutManager implements LayoutManager {
                     node.height += offset;
                     ArrayList<Point> endPoints = new ArrayList<>();
 
-                    if (reversedDown.size() == 0) {
-
-                        curX += offset;
-                        node.width += offset;
-                        endPoints.add(new Point(node.width, node.height));
-
-                    } else {
+                    node.width += offset;
+                    if (hasReversedDown) {
                         curX -= offset;
-                        node.width += offset;
                         endPoints.add(new Point(curX, node.height));
+                    } else {
+                        curX += offset;
+                        endPoints.add(new Point(node.width, node.height));
                     }
 
                     node.outOffsets.put(pos - minX, curX);
@@ -1735,7 +1796,12 @@ public class HierarchicalLayoutManager implements LayoutManager {
         protected void run() {
             // Set up nodes
             List<Vertex> vertices = new ArrayList<>(graph.getVertices());
-            Collections.sort(vertices);
+            // Order roots first to create more natural layer assignments.
+            Collections.sort(vertices,
+                             (Vertex a, Vertex b) ->
+                             a.isRoot() == b.isRoot() ?
+                             a.compareTo(b) :
+                             Boolean.compare(b.isRoot(), a.isRoot()));
 
             for (Vertex v : vertices) {
                 LayoutNode node = new LayoutNode();
@@ -1762,7 +1828,6 @@ public class HierarchicalLayoutManager implements LayoutManager {
                 edge.vip = l.isVIP();
                 edge.from.succs.add(edge);
                 edge.to.preds.add(edge);
-                //assert edge.from != edge.to; // No self-loops allowed
             }
 
             for (Link l : importantLinks) {
@@ -1802,9 +1867,4 @@ public class HierarchicalLayoutManager implements LayoutManager {
             }
         }
     }
-
-    @Override
-    public void doRouting(LayoutGraph graph) {
-        // Do nothing for now
-    }
 }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java
index 3599434217a..2019263b6ec 100644
--- a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package com.sun.hotspot.igv.hierarchicallayout;
 
 import com.sun.hotspot.igv.layout.Link;
 import com.sun.hotspot.igv.layout.Port;
+import com.sun.hotspot.igv.layout.Cluster;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,6 +62,14 @@ public class InterClusterConnection implements Link {
         return outputSlot;
     }
 
+    public Cluster getFromCluster() {
+        return null;
+    }
+
+    public Cluster getToCluster() {
+        return null;
+    }
+
     public void setControlPoints(List<Point> p) {
         this.intermediatePoints = p;
     }
diff --git a/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LinearLayoutManager.java b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LinearLayoutManager.java
new file mode 100644
index 00000000000..b52631f2861
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/HierarchicalLayout/src/main/java/com/sun/hotspot/igv/hierarchicallayout/LinearLayoutManager.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.hierarchicallayout;
+
+import com.sun.hotspot.igv.layout.LayoutGraph;
+import com.sun.hotspot.igv.layout.LayoutManager;
+import com.sun.hotspot.igv.layout.Link;
+import com.sun.hotspot.igv.layout.Vertex;
+import java.awt.Point;
+import java.util.*;
+
+public class LinearLayoutManager implements LayoutManager {
+
+    // Ranking determining the vertical node ordering.
+    private final Map<? extends Vertex, Integer> vertexRank;
+
+    public LinearLayoutManager(Map<? extends Vertex, Integer> vertexRank) {
+        this.vertexRank = vertexRank;
+    }
+
+    @Override
+    public void doLayout(LayoutGraph graph) {
+        doLayout(graph, new HashSet<Link>());
+    }
+
+    @Override
+    public void doLayout(LayoutGraph graph, Set<? extends Link> importantLinks) {
+
+        assert (graph.getLinks().isEmpty());
+
+        // Sort vertices according to given rank.
+        List<Vertex> vertices = new ArrayList<>(graph.getVertices());
+        vertices.sort(Comparator.comparingInt((Vertex v) -> vertexRank.getOrDefault(v, Integer.MAX_VALUE)));
+
+        // Assign vertical coordinates in rank order.
+        assignVerticalCoordinates(vertices);
+    }
+
+    private void assignVerticalCoordinates(List<Vertex> vertices) {
+        int curY = 0;
+        for (Vertex v : vertices) {
+            v.setPosition(new Point(0, curY));
+            curY += v.getSize().getHeight();
+        }
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Cluster.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Cluster.java
index 31ac1a6a1c2..2cf31b60d8e 100644
--- a/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Cluster.java
+++ b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Cluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 package com.sun.hotspot.igv.layout;
 
+import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.util.Set;
 
@@ -37,4 +38,6 @@ public interface Cluster extends Comparable<Cluster> {
     public void setBounds(Rectangle r);
 
     public Set<? extends Cluster> getSuccessors();
+
+    public Dimension getNodeOffset();
 }
diff --git a/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutGraph.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutGraph.java
index 3a8da0d649c..0409aa82d10 100644
--- a/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutGraph.java
+++ b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,9 @@ public class LayoutGraph {
         outputPorts = new HashMap<>(links.size());
 
         for (Link l : links) {
+            if (l.getFrom() == null || l.getTo() == null) {
+                continue;
+            }
             Port p = l.getFrom();
             Port p2 = l.getTo();
             Vertex v1 = p.getVertex();
@@ -195,4 +198,9 @@ public class LayoutGraph {
 
         return clusters;
     }
+
+    @Override
+    public String toString() {
+        return "LayoutGraph(" + vertices + ", " + links + ", " + getClusters() + ")";
+    }
 }
diff --git a/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutManager.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutManager.java
index cca19fa28b6..8ae848b4d04 100644
--- a/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutManager.java
+++ b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/LayoutManager.java
@@ -34,6 +34,4 @@ public interface LayoutManager {
     public void doLayout(LayoutGraph graph);
 
     public void doLayout(LayoutGraph graph, Set<? extends Link> importantLinks);
-
-    public void doRouting(LayoutGraph graph);
 }
diff --git a/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Link.java b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Link.java
index 7f58b607f43..f6fa2a868c2 100644
--- a/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Link.java
+++ b/src/utils/IdealGraphVisualizer/Layout/src/main/java/com/sun/hotspot/igv/layout/Link.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,12 @@ public interface Link {
 
     public Port getFrom();
 
+    public Cluster getFromCluster();
+
     public Port getTo();
 
+    public Cluster getToCluster();
+
     public boolean isVIP();
 
     public List<Point> getControlPoints();
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
index 5e4f6d0fc48..09ef77818e9 100644
--- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/java/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java
@@ -30,6 +30,7 @@ import com.sun.hotspot.igv.data.InputGraph;
 import com.sun.hotspot.igv.data.InputNode;
 import com.sun.hotspot.igv.data.services.Scheduler;
 import java.util.*;
+import java.util.function.Predicate;
 import org.openide.ErrorManager;
 import org.openide.util.lookup.ServiceProvider;
 import com.ibm.wala.util.graph.Graph;
@@ -52,6 +53,38 @@ public class ServerCompilerScheduler implements Scheduler {
         public boolean isBlockProjection;
         public boolean isBlockStart;
         public boolean isCFG;
+        public int rank; // Rank for local scheduling priority.
+
+        public Node(InputNode n) {
+            inputNode = n;
+            String p = n.getProperties().get("is_block_proj");
+            isBlockProjection = (p != null && p.equals("true"));
+            p = n.getProperties().get("is_block_start");
+            isBlockStart = (p != null && p.equals("true"));
+            computeRank();
+        }
+
+        // Rank by local scheduling priority.
+        private void computeRank() {
+            if (isBlockStart || isOtherBlockStart(this)) {
+                rank = 1;
+            } else if (isPhi(this)) {
+                rank = 2;
+            } else if (isParm(this)) {
+                rank = 3;
+            } else if (isProj(this)) {
+                rank = 4;
+            } else if (!isControl(this)) { // Every other node except terminators.
+                rank = 5;
+            } else {
+                rank = 6;
+            }
+        }
+
+        @Override
+        public String toString() {
+            return inputNode.getProperties().get("idx") + " " + inputNode.getProperties().get("name");
+        }
     }
     private InputGraph graph;
     private Collection<Node> nodes;
@@ -80,15 +113,17 @@ public class ServerCompilerScheduler implements Scheduler {
         Set<Node> visited = new HashSet<>();
         Map<InputBlock, Set<Node>> terminators = new HashMap<>();
         // Pre-compute control successors of each node, excluding self edges.
-        Map<Node, Set<Node>> controlSuccs = new HashMap<>();
+        Map<Node, List<Node>> controlSuccs = new HashMap<>();
         for (Node n : nodes) {
             if (n.isCFG) {
-                Set<Node> nControlSuccs = new HashSet<>();
+                List<Node> nControlSuccs = new ArrayList<>();
                 for (Node s : n.succs) {
                     if (s.isCFG && s != n) {
                         nControlSuccs.add(s);
                     }
                 }
+                // Ensure that the block ordering is deterministic.
+                nControlSuccs.sort(Comparator.comparingInt((Node a) -> a.inputNode.getId()));
                 controlSuccs.put(n, nControlSuccs);
             }
         }
@@ -173,7 +208,18 @@ public class ServerCompilerScheduler implements Scheduler {
                 }
             }
             for (Node s : uniqueSuccs) {
-                graph.addBlockEdge(terms.getKey(), s.block);
+                // Label the block edge with the short name of the corresponding
+                // control projection, if any.
+                String label = null;
+                if (terms.getValue().size() > 1) {
+                    for (Node t : terms.getValue()) {
+                        if (s.preds.contains(t)) {
+                            label = t.inputNode.getProperties().get("short_name");
+                            break;
+                        }
+                    }
+                }
+                graph.addBlockEdge(terms.getKey(), s.block, label);
             }
         }
 
@@ -237,7 +283,7 @@ public class ServerCompilerScheduler implements Scheduler {
             for (InputNode n : graph.getNodes()) {
                 if (graph.getBlock(n) == null) {
                     if (noBlock == null) {
-                        noBlock = graph.addBlock("(no block)");
+                        noBlock = graph.addArtificialBlock();
                         blocks.add(noBlock);
                     }
 
@@ -246,10 +292,104 @@ public class ServerCompilerScheduler implements Scheduler {
                 assert graph.getBlock(n) != null;
             }
 
+            scheduleLocal();
+
             return blocks;
         }
     }
 
+    private void scheduleLocal() {
+        // Leave only local predecessors and successors.
+        for (InputBlock b : blocks) {
+            for (InputNode in : b.getNodes()) {
+                Node n = inputNodeToNode.get(in);
+                Predicate<Node> excludePredecessors =
+                    node -> isPhi(node) || node.isBlockStart;
+                List<Node> localPreds = new ArrayList<>(n.preds.size());
+                for (Node p : n.preds) {
+                    if (p.block == b && p != n && !excludePredecessors.test(n)) {
+                        localPreds.add(p);
+                    }
+                }
+                n.preds = localPreds;
+                Set<Node> localSuccs = new HashSet<>(n.succs.size());
+                for (Node s : n.succs) {
+                    if (s.block == b && s != n && !excludePredecessors.test(s)) {
+                        localSuccs.add(s);
+                    }
+                }
+                n.succs = localSuccs;
+            }
+        }
+        // Schedule each block independently.
+        for (InputBlock b : blocks) {
+            List<Node> nodes = new ArrayList<>(b.getNodes().size());
+            for (InputNode n : b.getNodes()) {
+                nodes.add(inputNodeToNode.get(n));
+            }
+            List<InputNode> schedule = scheduleBlock(nodes);
+            b.setNodes(schedule);
+        }
+    }
+
+    private static final Comparator<Node> schedulePriority = new Comparator<Node>(){
+            @Override
+            public int compare(Node n1, Node n2) {
+                // Order by rank, then idx.
+                int r1 = n1.rank, r2 = n2.rank;
+                int o1, o2;
+                if (r1 != r2) { // Different rank.
+                    o1 = r1;
+                    o2 = r2;
+                } else { // Same rank, order by idx.
+                    o1 = Integer.parseInt(n1.inputNode.getProperties().get("idx"));
+                    o2 = Integer.parseInt(n2.inputNode.getProperties().get("idx"));
+                }
+                return Integer.compare(o1, o2);
+            };
+        };
+
+    private List<InputNode> scheduleBlock(Collection<Node> nodes) {
+        List<InputNode> schedule = new ArrayList<InputNode>();
+
+        // Initialize ready priority queue with nodes without predecessors.
+        Queue<Node> ready = new PriorityQueue<Node>(schedulePriority);
+        // Set of nodes that have been enqueued.
+        Set<Node> visited = new HashSet<Node>(nodes.size());
+        for (Node n : nodes) {
+            if (n.preds.isEmpty()) {
+                ready.add(n);
+                visited.add(n);
+            }
+        }
+
+        // Classic list scheduling algorithm.
+        while (!ready.isEmpty()) {
+            Node n = ready.remove();
+            schedule.add(n.inputNode);
+
+            // Add nodes that are now ready after scheduling n.
+            for (Node s : n.succs) {
+                if (visited.contains(s)) {
+                    continue;
+                }
+                boolean allPredsScheduled = true;
+                for (Node p : s.preds) {
+                    if (!visited.contains(p)) {
+                        allPredsScheduled = false;
+                        break;
+                    }
+                }
+                if (allPredsScheduled) {
+                    ready.add(s);
+                    visited.add(s);
+                }
+            }
+        }
+        assert(schedule.size() == nodes.size());
+        return schedule;
+    }
+
     private void scheduleLatest() {
         Node root = findRoot();
         if(root == null) {
@@ -426,12 +566,32 @@ public class ServerCompilerScheduler implements Scheduler {
         }
     }
 
-    private boolean isRegion(Node n) {
-        return n.inputNode.getProperties().get("name").equals("Region");
+    private static boolean isOtherBlockStart(Node n) {
+        return hasName(n, "CountedLoopEnd");
+    }
+
+    private static boolean isPhi(Node n) {
+        return hasName(n, "Phi");
     }
 
-    private boolean isPhi(Node n) {
-        return n.inputNode.getProperties().get("name").equals("Phi");
+    private static boolean isProj(Node n) {
+        return hasName(n, "Proj") || hasName(n, "MachProj");
+    }
+
+    private static boolean isParm(Node n) {
+        return hasName(n, "Parm");
+    }
+
+    private static boolean hasName(Node n, String name) {
+        String nodeName = n.inputNode.getProperties().get("name");
+        if (nodeName == null) {
+            return false;
+        }
+        return nodeName.equals(name);
+    }
+
+    private static boolean isControl(Node n) {
+        return n.inputNode.getProperties().get("category").equals("control");
     }
 
     private Node findRoot() {
@@ -439,9 +599,7 @@ public class ServerCompilerScheduler implements Scheduler {
         Node alternativeRoot = null;
 
         for (Node node : nodes) {
-            InputNode inputNode = node.inputNode;
-            String s = inputNode.getProperties().get("name");
-            if (s != null && s.equals("Root")) {
+            if (hasName(node, "Root")) {
                 return node;
             }
 
@@ -473,13 +631,8 @@ public class ServerCompilerScheduler implements Scheduler {
     public void buildUpGraph() {
 
         for (InputNode n : graph.getNodes()) {
-            Node node = new Node();
-            node.inputNode = n;
+            Node node = new Node(n);
             nodes.add(node);
-            String p = n.getProperties().get("is_block_proj");
-            node.isBlockProjection = (p != null && p.equals("true"));
-            p = n.getProperties().get("is_block_start");
-            node.isBlockStart = (p != null && p.equals("true"));
             inputNodeToNode.put(n, node);
         }
 
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideExceptionBlocks.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideExceptionBlocks.filter
new file mode 100644
index 00000000000..f9e0ae0ee21
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideExceptionBlocks.filter
@@ -0,0 +1,18 @@
+// Hide exception blocks.
+
+var f = new RemoveBlockFilter("Hide exception blocks");
+f.addRule(
+  new RemoveBlockFilter.RemoveBlockRule(
+    new AnySelector(
+      new OrSelector(
+        new MatcherSelector(
+          new Properties.StringPropertyMatcher("name", "Rethrow")
+        ),
+        new MatcherSelector(
+          new Properties.StringPropertyMatcher("name", "RethrowException")
+        )
+      )
+    )
+  )
+);
+f.apply(graph);
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideRootBlock.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideRootBlock.filter
new file mode 100644
index 00000000000..5c78ed09403
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideRootBlock.filter
@@ -0,0 +1,13 @@
+// Remove root block and all nodes in it (hopefully just the Root node).
+
+var f = new RemoveBlockFilter("Hide root block");
+f.addRule(
+  new RemoveBlockFilter.RemoveBlockRule(
+    new AnySelector(
+      new MatcherSelector(
+        new Properties.RegexpPropertyMatcher("name", "Root")
+      )
+    )
+  )
+);
+f.apply(graph);
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideUncommonTrapBlocks.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideUncommonTrapBlocks.filter
new file mode 100644
index 00000000000..10f91038ed7
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/hideUncommonTrapBlocks.filter
@@ -0,0 +1,13 @@
+// Hide uncommon trap blocks.
+
+var f = new RemoveBlockFilter("Hide uncommon trap blocks");
+f.addRule(
+  new RemoveBlockFilter.RemoveBlockRule(
+    new AnySelector(
+      new MatcherSelector(
+        new Properties.RegexpPropertyMatcher("dump_spec", ".*uncommon_trap.*")
+      )
+    )
+  )
+);
+f.apply(graph);
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml
index 6ad622863e3..a4c54d91520 100644
--- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/layer.xml
@@ -57,5 +57,17 @@
             <attr name="enabled" boolvalue="false"/>
             <attr name="after" stringvalue="Hide mixed edges"/>
         </file>
+        <file name="Hide root block" url="filters/hideRootBlock.filter">
+            <attr name="enabled" boolvalue="false"/>
+            <attr name="after" stringvalue="Hide other edges"/>
+        </file>
+        <file name="Hide uncommon trap blocks" url="filters/hideUncommonTrapBlocks.filter">
+            <attr name="enabled" boolvalue="false"/>
+            <attr name="after" stringvalue="Hide root block"/>
+        </file>
+        <file name="Hide exception blocks" url="filters/hideExceptionBlocks.filter">
+            <attr name="enabled" boolvalue="false"/>
+            <attr name="after" stringvalue="Hide uncommon trap blocks"/>
+        </file>
     </folder>
 </filesystem>
diff --git a/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/Settings.java b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/Settings.java
index 4dc7f247f5f..6373d513120 100644
--- a/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/Settings.java
+++ b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/Settings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,20 @@ import java.util.prefs.Preferences;
  */
 public class Settings {
 
+    public static class DefaultView {
+        public static final int SEA_OF_NODES = 0;
+        public static final int CLUSTERED_SEA_OF_NODES = 1;
+        public static final int CONTROL_FLOW_GRAPH = 2;
+    }
+
     public static final String NODE_TEXT = "nodeText";
     public static final String NODE_TEXT_DEFAULT = "[idx] [name]";
     public static final String NODE_SHORT_TEXT = "nodeShortText";
     public static final String NODE_SHORT_TEXT_DEFAULT = "[idx] [name]";
-    public static final String NODE_WIDTH = "nodeWidth";
-    public static final String NODE_WIDTH_DEFAULT = "100";
+    public static final String NODE_TINY_TEXT = "nodeTinyText";
+    public static final String NODE_TINY_TEXT_DEFAULT = "[idx]";
+    public static final String DEFAULT_VIEW = "defaultView";
+    public static final int    DEFAULT_VIEW_DEFAULT = DefaultView.SEA_OF_NODES;
     public static final String PORT = "port";
     public static final String PORT_BINARY = "portBinary";
     public static final String PORT_DEFAULT = "4444";
diff --git a/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.form b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.form
index 4af5c664d29..75240c9a150 100644
--- a/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.form
+++ b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.form
@@ -28,7 +28,7 @@
           <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="153" max="32767" attributes="0"/>
+              <EmptySpace pref="29" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -46,19 +46,17 @@
                       <Component id="jLabel3" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel5" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace min="-2" pref="39" max="-2" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
-                          <Component id="nodeShortTextField" max="32767" attributes="0"/>
-                          <Component id="jScrollPane1" pref="365" max="32767" attributes="0"/>
-                      </Group>
-                      <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
-                          <Component id="nodeWidthSpinner" alignment="0" pref="100" max="32767" attributes="0"/>
-                          <Component id="portSpinner" alignment="0" max="32767" attributes="0"/>
-                      </Group>
+                  <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                      <Component id="nodeShortTextField" max="32767" attributes="0"/>
+                      <Component id="jScrollPane1" pref="470" max="32767" attributes="0"/>
+                      <Component id="portSpinner" alignment="0" max="32767" attributes="0"/>
+                      <Component id="nodeTinyTextField" alignment="0" max="32767" attributes="0"/>
+                      <Component id="defaultViewComboBox" alignment="0" max="32767" attributes="0"/>
                   </Group>
-                  <EmptySpace pref="439" max="32767" attributes="0"/>
+                  <EmptySpace max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -77,8 +75,13 @@
                   </Group>
                   <EmptySpace pref="27" max="32767" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="nodeWidthSpinner" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="nodeTinyTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace min="-2" pref="27" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="defaultViewComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace pref="27" max="32767" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
@@ -97,7 +100,7 @@
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel2">
           <Properties>
-            <Property name="text" type="java.lang.String" value="Node Width"/>
+            <Property name="text" type="java.lang.String" value="Default View"/>
           </Properties>
         </Component>
         <Component class="javax.swing.JSpinner" name="portSpinner">
@@ -118,8 +121,6 @@
             </Component>
           </SubComponents>
         </Container>
-        <Component class="javax.swing.JSpinner" name="nodeWidthSpinner">
-        </Component>
         <Component class="javax.swing.JLabel" name="jLabel3">
           <Properties>
             <Property name="text" type="java.lang.String" value="Network Port"/>
@@ -141,6 +142,37 @@
             <AuxValue name="JavaCodeGenerator_SerializeTo" type="java.lang.String" value="ViewPanel_nodeShortTextField"/>
           </AuxValues>
         </Component>
+        <Component class="javax.swing.JLabel" name="jLabel5">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Tiny Node Text"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="nodeTinyTextField">
+          <Properties>
+            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="ff" green="ff" red="ff" type="rgb"/>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value="Single-line format string for node input lists. Properties are specified with brackets  (example: &quot;[idx]&quot;)."/>
+          </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_SerializeTo" type="java.lang.String" value="ViewPanel_nodeTinyTextField"/>
+          </AuxValues>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="defaultViewComboBox">
+          <Properties>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+              <StringArray count="3">
+                <StringItem index="0" value="Sea of nodes"/>
+                <StringItem index="1" value="Clustered sea of nodes"/>
+                <StringItem index="2" value="Control-flow graph"/>
+              </StringArray>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value="View shown by default when a graph is opened."/>
+          </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+          </AuxValues>
+        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.java b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.java
index 2aff72d0440..c2293820c31 100644
--- a/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.java
+++ b/src/utils/IdealGraphVisualizer/Settings/src/main/java/com/sun/hotspot/igv/settings/ViewPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,14 +50,16 @@ final class ViewPanel extends javax.swing.JPanel {
         portSpinner = new javax.swing.JSpinner();
         jScrollPane1 = new javax.swing.JScrollPane();
         nodeTextArea = new javax.swing.JTextArea();
-        nodeWidthSpinner = new javax.swing.JSpinner();
         jLabel3 = new javax.swing.JLabel();
         jLabel4 = new javax.swing.JLabel();
         nodeShortTextField = new javax.swing.JTextField();
+        jLabel5 = new javax.swing.JLabel();
+        nodeTinyTextField = new javax.swing.JTextField();
+        defaultViewComboBox = new javax.swing.JComboBox<>();
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, "Node Text");
 
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, "Node Width");
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, "Default View");
 
         nodeTextArea.setColumns(20);
         nodeTextArea.setRows(5);
@@ -71,6 +73,14 @@ final class ViewPanel extends javax.swing.JPanel {
         nodeShortTextField.setBackground(new java.awt.Color(255, 255, 255));
         nodeShortTextField.setToolTipText("Single-line format string for nodes in edge tooltips, slot tooltips, and node search bar. Properties are specified with brackets  (example: \"[idx]\").");
 
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel5, "Tiny Node Text");
+
+        nodeTinyTextField.setBackground(new java.awt.Color(255, 255, 255));
+        nodeTinyTextField.setToolTipText("Single-line format string for node input lists. Properties are specified with brackets  (example: \"[idx]\").");
+
+        defaultViewComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Sea of nodes", "Clustered sea of nodes", "Control-flow graph" }));
+        defaultViewComboBox.setToolTipText("View shown by default when a graph is opened.");
+
         org.jdesktop.layout.GroupLayout jPanel1Layout = new org.jdesktop.layout.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
@@ -81,16 +91,16 @@ final class ViewPanel extends javax.swing.JPanel {
                     .add(jLabel1)
                     .add(jLabel3)
                     .add(jLabel2)
-                    .add(jLabel4))
+                    .add(jLabel4)
+                    .add(jLabel5))
                 .add(39, 39, 39)
-                .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
-                        .add(nodeShortTextField)
-                        .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 365, Short.MAX_VALUE))
-                    .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
-                        .add(org.jdesktop.layout.GroupLayout.LEADING, nodeWidthSpinner, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE)
-                        .add(org.jdesktop.layout.GroupLayout.LEADING, portSpinner)))
-                .addContainerGap(439, Short.MAX_VALUE))
+                .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                    .add(nodeShortTextField)
+                    .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 470, Short.MAX_VALUE)
+                    .add(portSpinner)
+                    .add(nodeTinyTextField)
+                    .add(defaultViewComboBox, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -105,8 +115,12 @@ final class ViewPanel extends javax.swing.JPanel {
                     .add(nodeShortTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 27, Short.MAX_VALUE)
                 .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(nodeWidthSpinner, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(jLabel2))
+                    .add(jLabel5)
+                    .add(nodeTinyTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .add(27, 27, 27)
+                .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(jLabel2)
+                    .add(defaultViewComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 27, Short.MAX_VALUE)
                 .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(portSpinner, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@@ -127,20 +141,22 @@ final class ViewPanel extends javax.swing.JPanel {
             .add(layout.createSequentialGroup()
                 .addContainerGap()
                 .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(153, Short.MAX_VALUE))
+                .addContainerGap(29, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
     void load() {
         nodeTextArea.setText(Settings.get().get(Settings.NODE_TEXT, Settings.NODE_TEXT_DEFAULT));
         nodeShortTextField.setText(Settings.get().get(Settings.NODE_SHORT_TEXT, Settings.NODE_SHORT_TEXT_DEFAULT));
-        nodeWidthSpinner.setValue(Integer.parseInt(Settings.get().get(Settings.NODE_WIDTH, Settings.NODE_WIDTH_DEFAULT)));
+        nodeTinyTextField.setText(Settings.get().get(Settings.NODE_TINY_TEXT, Settings.NODE_TINY_TEXT_DEFAULT));
+        defaultViewComboBox.setSelectedIndex(Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DefaultView.SEA_OF_NODES));
         portSpinner.setValue(Integer.parseInt(Settings.get().get(Settings.PORT, Settings.PORT_DEFAULT)));
     }
 
     void store() {
         Settings.get().put(Settings.NODE_TEXT, nodeTextArea.getText());
         Settings.get().put(Settings.NODE_SHORT_TEXT, nodeShortTextField.getText());
-        Settings.get().put(Settings.NODE_WIDTH, nodeWidthSpinner.getValue().toString());
+        Settings.get().put(Settings.NODE_TINY_TEXT, nodeTinyTextField.getText());
+        Settings.get().putInt(Settings.DEFAULT_VIEW, defaultViewComboBox.getSelectedIndex());
         Settings.get().put(Settings.PORT, portSpinner.getValue().toString());
     }
 
@@ -148,15 +164,17 @@ final class ViewPanel extends javax.swing.JPanel {
         return true;
     }
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JComboBox<String> defaultViewComboBox;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
+    private javax.swing.JLabel jLabel5;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JTextField nodeShortTextField;
     private javax.swing.JTextArea nodeTextArea;
-    private javax.swing.JSpinner nodeWidthSpinner;
+    private javax.swing.JTextField nodeTinyTextField;
     private javax.swing.JSpinner portSpinner;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/StringUtils.java b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/StringUtils.java
index 2fcc12af03a..d831e0a3590 100644
--- a/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/StringUtils.java
+++ b/src/utils/IdealGraphVisualizer/Util/src/main/java/com/sun/hotspot/igv/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,4 +113,25 @@ public class StringUtils {
         }
     }
 
+    /**
+     * Rank a match of a query in a word. Full matches of a word rank highest,
+     * followed by partial matches at the word start, followed by the rest of
+     * matches in increasing size of the partially matched word, for example:
+     *
+     *   rank("5", "5")   = 1 (full match)
+     *   rank("5", "554") = 2 (start match)
+     *   rank("5", "25")  = 3 (middle match with excess 1)
+     *   rank("5", "253") = 4 (middle match with excess 2)
+     */
+    public static int rankMatch(String query, String word) {
+        if (word.equals(query)) {
+            return 1;
+        } else if (word.startsWith(query)) {
+            return 2;
+        } else if (word.contains(query)) {
+            return word.length() - query.length() + 2;
+        }
+        return Integer.MAX_VALUE;
+    }
+
 }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/BlockQuickSearch.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/BlockQuickSearch.java
new file mode 100644
index 00000000000..9d8b6c52305
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/BlockQuickSearch.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.view;
+
+import com.sun.hotspot.igv.data.InputGraph;
+import com.sun.hotspot.igv.data.InputBlock;
+import com.sun.hotspot.igv.data.Properties.RegexpPropertyMatcher;
+import com.sun.hotspot.igv.data.services.InputGraphProvider;
+import com.sun.hotspot.igv.util.LookupHistory;
+import com.sun.hotspot.igv.util.StringUtils;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+import org.netbeans.spi.quicksearch.SearchProvider;
+import org.netbeans.spi.quicksearch.SearchRequest;
+import org.netbeans.spi.quicksearch.SearchResponse;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.NotifyDescriptor.Message;
+
+public class BlockQuickSearch implements SearchProvider {
+
+    @Override
+    public void evaluate(SearchRequest request, SearchResponse response) {
+        String rawValue = request.getText();
+        if (rawValue.trim().isEmpty()) {
+            return;
+        }
+        String value = ".*" + Pattern.quote(rawValue) + ".*";
+
+        final InputGraphProvider p = LookupHistory.getLast(InputGraphProvider.class);
+        if (p == null || p.getGraph() == null) {
+            return;
+        }
+
+        InputGraph matchGraph = p.getGraph();
+        // Search the current graph
+        List<InputBlock> matches = findMatches(value, p.getGraph(), response);
+        if (matches == null) {
+            // See if the it hits in a later graph
+            for (InputGraph graph : p.searchForward()) {
+                matches = findMatches(value, graph, response);
+                if (matches != null) {
+                    matchGraph = graph;
+                    break;
+                }
+            }
+        }
+        if (matches == null) {
+            // See if it hits in a earlier graph
+            for (InputGraph graph : p.searchBackward()) {
+                matches = findMatches(value, graph, response);
+                if (matches != null) {
+                    matchGraph = graph;
+                    break;
+                }
+            }
+        }
+        if (matches != null) {
+            // Rank the matches.
+            matches.sort((InputBlock a, InputBlock b) ->
+                         compareByRankThenNumVal(rawValue,
+                                                 "B" + a.getName(),
+                                                 "B" + b.getName()));
+
+            final InputGraph theGraph = p.getGraph() != matchGraph ? matchGraph : null;
+            for (final InputBlock b : matches) {
+                if (!response.addResult(() -> {
+                            final EditorTopComponent comp = EditorTopComponent.getActive();
+                            assert(comp != null);
+                            if (theGraph != null) {
+                                comp.getDiagramModel().selectGraph(theGraph);
+                            }
+                            comp.setSelectedNodes(b);
+                            comp.requestActive();
+                        },
+                        "B" + b.getName() + (theGraph != null ? " in " + theGraph.getName() : ""))) {
+                    return;
+                }
+            }
+        }
+    }
+
+    private List<InputBlock> findMatches(String blockName, InputGraph inputGraph, SearchResponse response) {
+        try {
+            RegexpPropertyMatcher matcher = new RegexpPropertyMatcher("", blockName, Pattern.CASE_INSENSITIVE);
+            List<InputBlock> matches = new ArrayList<>();
+            for (InputBlock b : inputGraph.getBlocks()) {
+                if (matcher.match("B" + b.getName())) {
+                    matches.add(b);
+                }
+            }
+            return matches.size() == 0 ? null : matches;
+        } catch (Exception e) {
+            final String msg = e.getMessage();
+            response.addResult(() -> {
+                    Message desc = new NotifyDescriptor.Message("An exception occurred during the search, "
+                            + "perhaps due to a malformed query string:\n" + msg,
+                            NotifyDescriptor.WARNING_MESSAGE);
+                    DialogDisplayer.getDefault().notify(desc);
+                },
+                "(Error during search)"
+            );
+        }
+        return null;
+    }
+
+    private int compareByRankThenNumVal(String qry, String b1, String b2) {
+        int key1 = StringUtils.rankMatch(qry, b1);
+        int key2 = StringUtils.rankMatch(qry, b2);
+        if (key1 == key2) {
+            // If the matches have the same rank, compare the numeric values of
+            // their first words, if applicable.
+            try {
+                key1 = Integer.parseInt(b1.replace("B", ""));
+                key2 = Integer.parseInt(b2.replace("B", ""));
+            } catch (Exception e) {
+                // Not applicable, return equality value.
+                return 0;
+            }
+        }
+        return Integer.compare(key1, key2);
+    }
+
+}
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
index 1aa622e8ffb..703cbe6e618 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,11 @@ import com.sun.hotspot.igv.data.Properties;
 import com.sun.hotspot.igv.data.services.Scheduler;
 import com.sun.hotspot.igv.graph.*;
 import com.sun.hotspot.igv.hierarchicallayout.HierarchicalClusterLayoutManager;
+import com.sun.hotspot.igv.hierarchicallayout.HierarchicalCFGLayoutManager;
+import com.sun.hotspot.igv.hierarchicallayout.LinearLayoutManager;
 import com.sun.hotspot.igv.hierarchicallayout.HierarchicalLayoutManager;
 import com.sun.hotspot.igv.layout.LayoutGraph;
+import com.sun.hotspot.igv.layout.Link;
 import com.sun.hotspot.igv.selectioncoordinator.SelectionCoordinator;
 import com.sun.hotspot.igv.util.ColorIcon;
 import com.sun.hotspot.igv.util.DoubleClickAction;
@@ -493,6 +496,19 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
         return a;
     }
 
+    public Action createGotoAction(final Block b) {
+        final DiagramScene diagramScene = this;
+        String name = "B" + b.getInputBlock().getName();
+        Action a = new AbstractAction(name) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                diagramScene.gotoBlock(b);
+            }
+        };
+        a.setEnabled(true);
+        return a;
+    }
+
     public void setNewModel(DiagramViewModel model) {
         assert this.model == null : "can set model only once!";
         this.model = model;
@@ -518,15 +534,26 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
 
         Diagram d = getModel().getDiagramToView();
 
-        if (d.getGraph().getBlocks().isEmpty()) {
-            Scheduler s = Lookup.getDefault().lookup(Scheduler.class);
-            d.getGraph().clearBlocks();
-            s.schedule(d.getGraph());
-            d.getGraph().ensureNodesInBlocks();
-            d.updateBlocks();
+        Map<InputBlock, Integer> maxWidth = new HashMap<>();
+        for (InputBlock b : d.getGraph().getBlocks()) {
+            maxWidth.put(b, 10);
+        }
+        for (Figure f : d.getFigures()) {
+            // Update node text, since it might differ across views.
+            f.updateLines();
+            // Compute max node width in each block.
+            if (f.getWidth() > maxWidth.get(f.getBlock())) {
+                maxWidth.put(f.getBlock(), f.getWidth());
+            }
         }
 
         for (Figure f : d.getFigures()) {
+
+            // Set all nodes' width to the maximum width in the blocks?
+            if (getModel().getShowCFG()) {
+                f.setWidth(maxWidth.get(f.getBlock()));
+            }
+
             FigureWidget w = new FigureWidget(f, hoverAction, selectAction, this, mainLayer);
             w.getActions().addAction(ActionFactory.createPopupMenuAction(w));
             w.getActions().addAction(selectAction);
@@ -552,7 +579,7 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
             }
         }
 
-        if (getModel().getShowBlocks()) {
+        if (getModel().getShowBlocks() || getModel().getShowCFG()) {
             for (InputBlock bn : d.getGraph().getBlocks()) {
                 BlockWidget w = new BlockWidget(this, d, bn);
                 w.setVisible(false);
@@ -578,8 +605,11 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
     }
 
     private boolean isVisible(Connection c) {
-        FigureWidget w1 = getWidget(c.getInputSlot().getFigure());
-        FigureWidget w2 = getWidget(c.getOutputSlot().getFigure());
+        if (getModel().getShowCFG()) {
+            return c.isAlwaysVisible();
+        }
+        FigureWidget w1 = getWidget(c.getFrom().getVertex());
+        FigureWidget w2 = getWidget(c.getTo().getVertex());
 
         if (w1.isVisible() && w2.isVisible()) {
             return true;
@@ -608,22 +638,72 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
             }
         }
 
-        if (getModel().getShowBlocks()) {
-            HierarchicalClusterLayoutManager m = new HierarchicalClusterLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS);
-            HierarchicalLayoutManager manager = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS);
-            manager.setMaxLayerLength(9);
-            manager.setMinLayerDifference(3);
-            m.setManager(manager);
-            m.setSubManager(new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS));
-            m.doLayout(new LayoutGraph(edges, figures));
-        } else {
-            HierarchicalLayoutManager manager = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS);
-            manager.setMaxLayerLength(10);
-            manager.doLayout(new LayoutGraph(edges, figures));
+        if (getModel().getShowSea()) {
+            doSeaLayout(figures, edges);
+        } else if (getModel().getShowBlocks()) {
+            doClusteredLayout(figures, edges);
+        } else if (getModel().getShowCFG()) {
+            doCFGLayout(figures, edges);
         }
 
         relayoutWithoutLayout(oldVisibleWidgets);
     }
+
+    private void doSeaLayout(HashSet<Figure> figures, HashSet<Connection> edges) {
+        HierarchicalLayoutManager manager = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS);
+        manager.setMaxLayerLength(10);
+        manager.doLayout(new LayoutGraph(edges, figures));
+    }
+
+    private void doClusteredLayout(HashSet<Figure> figures, HashSet<Connection> edges) {
+        HierarchicalClusterLayoutManager m = new HierarchicalClusterLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS);
+        HierarchicalLayoutManager manager = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS);
+        manager.setMaxLayerLength(9);
+        manager.setMinLayerDifference(3);
+        m.setManager(manager);
+        m.setSubManager(new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS));
+        m.doLayout(new LayoutGraph(edges, figures));
+    }
+
+    private void doCFGLayout(HashSet<Figure> figures, HashSet<Connection> edges) {
+        Diagram diagram = getModel().getDiagramToView();
+        HierarchicalCFGLayoutManager m = new HierarchicalCFGLayoutManager();
+        HierarchicalLayoutManager manager = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS);
+        manager.setMaxLayerLength(9);
+        manager.setMinLayerDifference(1);
+        manager.setLayoutSelfEdges(true);
+        manager.setXOffset(25);
+        manager.setLayerOffset(25);
+        m.setManager(manager);
+        Map<InputNode, Figure> nodeFig = new HashMap<InputNode, Figure>();
+        for (Figure f : figures) {
+            InputNode n = f.getFirstSourceNode();
+            if (n != null) {
+                nodeFig.put(n, f);
+            }
+        }
+        // Compute global ranking among figures given by in-block order. If
+        // needed, this could be cached as long as it is computed for all the
+        // figures in the model, not just the visible ones.
+        Map<Figure, Integer> figureRank =
+            new HashMap<Figure, Integer>(figures.size());
+        int r = 0;
+        for (InputBlock b : getModel().getGraphToView().getBlocks()) {
+            for (InputNode n : b.getNodes()) {
+                Figure f = nodeFig.get(n);
+                if (f != null) {
+                    figureRank.put(f, r);
+                    r++;
+                }
+            }
+        }
+        // Add connections for CFG edges.
+        edges.addAll(diagram.getBlockConnections());
+        m.setSubManager(new LinearLayoutManager(figureRank));
+        m.setClusters(new HashSet<>(diagram.getBlocks()));
+        m.doLayout(new LayoutGraph(edges, figures));
+    }
+
     private Set<Pair<Point, Point>> lineCache = new HashSet<>();
 
     private void relayoutWithoutLayout(Set<Widget> oldVisibleWidgets) {
@@ -642,7 +722,7 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
             }
         }
 
-        for (Connection c : diagram.getConnections()) {
+        for (FigureConnection c : diagram.getConnections()) {
             List<Point> points = c.getControlPoints();
             FigureWidget w1 = getWidget((Figure) c.getTo().getVertex());
             FigureWidget w2 = getWidget((Figure) c.getFrom().getVertex());
@@ -656,7 +736,7 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
             }
         }
 
-        if (getModel().getShowBlocks()) {
+        if (getModel().getShowBlocks() || getModel().getShowCFG()) {
             for (Block b : diagram.getBlocks()) {
                 BlockWidget w = getWidget(b.getInputBlock());
                 if (w != null && w.isVisible()) {
@@ -705,7 +785,18 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
                 if (visibleFigureCount > ANIMATION_LIMIT || oldVisibleWidgets == null) {
                     anim = null;
                 }
-                processOutputSlot(lastLineCache, s, s.getConnections(), 0, null, null, offx2, offy2, anim);
+                List<Connection> cl = new ArrayList<>(s.getConnections().size());
+                for (FigureConnection c : s.getConnections()) {
+                    cl.add((Connection) c);
+                }
+                processOutputSlot(lastLineCache, s, cl, 0, null, null, offx2, offy2, anim);
+            }
+        }
+
+        if (getModel().getShowCFG()) {
+            for (BlockConnection c : diagram.getBlockConnections()) {
+                SceneAnimator anim = animator;
+                processOutputSlot(lastLineCache, null, Collections.singletonList(c), 0, null, null, offx2, offy2, anim);
             }
         }
 
@@ -723,7 +814,7 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
             }
         }
 
-        if (getModel().getShowBlocks()) {
+        if (getModel().getShowBlocks() || getModel().getShowCFG()) {
             for (Block b : diagram.getBlocks()) {
                 BlockWidget w = getWidget(b.getInputBlock());
                 if (w != null && w.isVisible()) {
@@ -759,12 +850,15 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
             }
 
             Point cur = controlPoints.get(controlPointIndex);
-            if (cur == null) {
+            if (cur == null) { // Long connection, has been cut vertically.
                 cur = specialNullPoint;
-            } else if (controlPointIndex == 0 && !s.shouldShowName()) {
-                cur = new Point(cur.x, cur.y - SLOT_OFFSET);
-            } else if (controlPointIndex == controlPoints.size() - 1 && !c.getInputSlot().shouldShowName()) {
-                cur = new Point(cur.x, cur.y + SLOT_OFFSET);
+            } else if (c.hasSlots()) {
+                if (controlPointIndex == 0 && !s.shouldShowName()) {
+                    cur = new Point(cur.x, cur.y - SLOT_OFFSET);
+                } else if (controlPointIndex == controlPoints.size() - 1 &&
+                           !((Slot)c.getTo()).shouldShowName()) {
+                    cur = new Point(cur.x, cur.y + SLOT_OFFSET);
+                }
             }
 
             if (pointMap.containsKey(cur)) {
@@ -883,6 +977,13 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
         }
     }
 
+    public void gotoBlock(final Block block) {
+        BlockWidget bw = getWidget(block.getInputBlock());
+        if (bw != null) {
+            centerRectangle(bw.getBounds());
+        }
+    }
+
     private Set<Object> idSetToObjectSet(Set<Object> ids) {
 
         Set<Object> result = new HashSet<>();
@@ -1042,7 +1143,7 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
             }
         }
 
-        if (getModel().getShowBlocks()) {
+        if (getModel().getShowBlocks() || getModel().getShowCFG()) {
             for (InputBlock b : diagram.getGraph().getBlocks()) {
                 BlockWidget w = getWidget(b);
                 if (w.isVisible()) {
@@ -1102,7 +1203,23 @@ public class DiagramScene extends ObjectScene implements DiagramViewer {
             }
         }
 
-        if (getModel().getShowBlocks()) {
+        if (getModel().getShowCFG()) {
+            // Blockless figures and artificial blocks are hidden in this view.
+            for (Figure f : diagram.getFigures()) {
+                if (f.getBlock().isArtificial()) {
+                    FigureWidget w = getWidget(f);
+                    w.setVisible(false);
+                }
+            }
+            visibleBlocks.clear();
+            for (InputBlock b : diagram.getGraph().getBlocks()) {
+                if (!b.isArtificial()) {
+                    visibleBlocks.add(b);
+                }
+            }
+        }
+
+        if (getModel().getShowBlocks() || getModel().getShowCFG()) {
             for (InputBlock b : diagram.getGraph().getBlocks()) {
 
                 boolean visibleAfter = visibleBlocks.contains(b);
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
index a91765c9545..b532a3ebe4b 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 package com.sun.hotspot.igv.view;
 
 import com.sun.hotspot.igv.data.*;
+import com.sun.hotspot.igv.data.services.Scheduler;
 import com.sun.hotspot.igv.difference.Difference;
 import com.sun.hotspot.igv.filter.CustomFilter;
 import com.sun.hotspot.igv.filter.FilterChain;
@@ -34,6 +35,7 @@ import com.sun.hotspot.igv.settings.Settings;
 import com.sun.hotspot.igv.util.RangeSliderModel;
 import java.awt.Color;
 import java.util.*;
+import org.openide.util.Lookup;
 
 /**
  *
@@ -56,7 +58,9 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
     private ChangedEvent<DiagramViewModel> viewChangedEvent;
     private ChangedEvent<DiagramViewModel> hiddenNodesChangedEvent;
     private ChangedEvent<DiagramViewModel> viewPropertiesChangedEvent;
+    private boolean showSea;
     private boolean showBlocks;
+    private boolean showCFG;
     private boolean showNodeHull;
     private boolean hideDuplicates;
     private ChangedListener<FilterChain> filterChainChangedListener = new ChangedListener<FilterChain>() {
@@ -102,8 +106,12 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
         this.onScreenNodes = newModel.onScreenNodes;
         viewChanged |= (selectedNodes != newModel.selectedNodes);
         this.selectedNodes = newModel.selectedNodes;
+        viewPropertiesChanged |= (showSea != newModel.showSea);
+        this.showSea = newModel.showSea;
         viewPropertiesChanged |= (showBlocks != newModel.showBlocks);
         this.showBlocks = newModel.showBlocks;
+        viewPropertiesChanged |= (showCFG != newModel.showCFG);
+        this.showCFG = newModel.showCFG;
         viewPropertiesChanged |= (showNodeHull != newModel.showNodeHull);
         this.showNodeHull = newModel.showNodeHull;
 
@@ -122,6 +130,15 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
         }
     }
 
+    public boolean getShowSea() {
+        return showSea;
+    }
+
+    public void setShowSea(boolean b) {
+        showSea = b;
+        viewPropertiesChangedEvent.fire();
+    }
+
     public boolean getShowBlocks() {
         return showBlocks;
     }
@@ -131,6 +148,15 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
         viewPropertiesChangedEvent.fire();
     }
 
+    public boolean getShowCFG() {
+        return showCFG;
+    }
+
+    public void setShowCFG(boolean b) {
+        showCFG = b;
+        viewPropertiesChangedEvent.fire();
+    }
+
     public boolean getShowNodeHull() {
         return showNodeHull;
     }
@@ -164,7 +190,9 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
     public DiagramViewModel(Group g, FilterChain filterChain, FilterChain sequenceFilterChain) {
         super(Arrays.asList("default"));
 
-        this.showBlocks = false;
+        this.showSea = Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.SEA_OF_NODES;
+        this.showBlocks = Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.CLUSTERED_SEA_OF_NODES;
+        this.showCFG = Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.CONTROL_FLOW_GRAPH;
         this.showNodeHull = true;
         this.group = g;
         filterGraphs();
@@ -406,9 +434,17 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
     public Diagram getDiagramToView() {
 
         if (diagram == null) {
-            diagram = Diagram.createDiagram(getGraphToView(),
+            InputGraph graph = getGraphToView();
+            if (graph.getBlocks().isEmpty()) {
+                Scheduler s = Lookup.getDefault().lookup(Scheduler.class);
+                graph.clearBlocks();
+                s.schedule(graph);
+                graph.ensureNodesInBlocks();
+            }
+            diagram = Diagram.createDiagram(graph,
                                             Settings.get().get(Settings.NODE_TEXT, Settings.NODE_TEXT_DEFAULT),
-                                            Settings.get().get(Settings.NODE_SHORT_TEXT, Settings.NODE_SHORT_TEXT_DEFAULT));
+                                            Settings.get().get(Settings.NODE_SHORT_TEXT, Settings.NODE_SHORT_TEXT_DEFAULT),
+                                            Settings.get().get(Settings.NODE_TINY_TEXT, Settings.NODE_TINY_TEXT_DEFAULT));
             getFilterChain().apply(diagram, getSequenceFilterChain());
             if (getFirstPosition() != getSecondPosition()) {
                 CustomFilter f = new CustomFilter(
@@ -420,6 +456,7 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
            }
         }
 
+        diagram.setCFG(getShowCFG());
         return diagram;
     }
 
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
index cf5e965de69..5ae8c8e8dbb 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ import com.sun.hotspot.igv.data.ChangedListener;
 import com.sun.hotspot.igv.data.GraphDocument;
 import com.sun.hotspot.igv.data.Group;
 import com.sun.hotspot.igv.data.InputNode;
+import com.sun.hotspot.igv.data.InputBlock;
 import com.sun.hotspot.igv.data.Properties;
 import com.sun.hotspot.igv.data.Properties.PropertyMatcher;
 import com.sun.hotspot.igv.data.services.InputGraphProvider;
@@ -38,6 +39,7 @@ import com.sun.hotspot.igv.graph.Figure;
 import com.sun.hotspot.igv.graph.services.DiagramProvider;
 import com.sun.hotspot.igv.util.LookupHistory;
 import com.sun.hotspot.igv.util.RangeSlider;
+import com.sun.hotspot.igv.settings.Settings;
 import com.sun.hotspot.igv.view.actions.*;
 import java.awt.*;
 import java.awt.event.HierarchyBoundsListener;
@@ -91,7 +93,9 @@ public final class EditorTopComponent extends TopComponent implements PropertyCh
     private DiagramViewer scene;
     private InstanceContent content;
     private InstanceContent graphContent;
+    private EnableSeaLayoutAction seaLayoutAction;
     private EnableBlockLayoutAction blockLayoutAction;
+    private EnableCFGLayoutAction cfgLayoutAction;
     private OverviewAction overviewAction;
     private HideDuplicatesAction hideDuplicatesAction;
     private PredSuccAction predSuccAction;
@@ -238,12 +242,31 @@ public final class EditorTopComponent extends TopComponent implements PropertyCh
         toolBar.add(ShowAllAction.get(ZoomInAction.class));
         toolBar.add(ShowAllAction.get(ZoomOutAction.class));
 
+        toolBar.addSeparator();
+        ButtonGroup layoutButtons = new ButtonGroup();
+
+        seaLayoutAction = new EnableSeaLayoutAction();
+        JToggleButton button = new JToggleButton(seaLayoutAction);
+        button.setSelected(Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.SEA_OF_NODES);
+        layoutButtons.add(button);
+        toolBar.add(button);
+        seaLayoutAction.addPropertyChangeListener(this);
+
         blockLayoutAction = new EnableBlockLayoutAction();
-        JToggleButton button = new JToggleButton(blockLayoutAction);
-        button.setSelected(false);
+        button = new JToggleButton(blockLayoutAction);
+        button.setSelected(Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.CLUSTERED_SEA_OF_NODES);
+        layoutButtons.add(button);
         toolBar.add(button);
         blockLayoutAction.addPropertyChangeListener(this);
 
+        cfgLayoutAction = new EnableCFGLayoutAction();
+        button = new JToggleButton(cfgLayoutAction);
+        button.setSelected(Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.CONTROL_FLOW_GRAPH);
+        layoutButtons.add(button);
+        toolBar.add(button);
+        cfgLayoutAction.addPropertyChangeListener(this);
+
+        toolBar.addSeparator();
         overviewAction = new OverviewAction();
         overviewButton = new JToggleButton(overviewAction);
         overviewButton.setSelected(false);
@@ -508,6 +531,16 @@ public final class EditorTopComponent extends TopComponent implements PropertyCh
         setSelectedFigures(list);
     }
 
+    public void setSelectedNodes(InputBlock b) {
+        List<Figure> list = new ArrayList<>();
+        for (Figure f : getModel().getDiagramToView().getFigures()) {
+            if (f.getBlock() == b) {
+                list.add(f);
+            }
+        }
+        setSelectedFigures(list);
+    }
+
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getSource() == this.predSuccAction) {
@@ -520,9 +553,15 @@ public final class EditorTopComponent extends TopComponent implements PropertyCh
             } else {
                 showScene();
             }
+        } else if (evt.getSource() == this.seaLayoutAction) {
+            boolean b = seaLayoutAction.isSelected();
+            this.getModel().setShowSea(b);
         } else if (evt.getSource() == this.blockLayoutAction) {
-            boolean b = (Boolean) blockLayoutAction.getValue(EnableBlockLayoutAction.STATE);
+            boolean b = blockLayoutAction.isSelected();
             this.getModel().setShowBlocks(b);
+        } else if (evt.getSource() == this.cfgLayoutAction) {
+            boolean b = cfgLayoutAction.isSelected();
+            this.getModel().setShowCFG(b);
         } else if (evt.getSource() == this.hideDuplicatesAction) {
             boolean b = (Boolean) hideDuplicatesAction.getValue(HideDuplicatesAction.STATE);
             this.getModel().setHideDuplicates(b);
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java
index 4fb5781df75..f9832484fb1 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/GraphViewerImplementation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,8 +66,10 @@ public class GraphViewerImplementation implements GraphViewer {
 
         Diagram diagram = Diagram.createDiagram(graph,
                                                 Settings.get().get(Settings.NODE_TEXT, Settings.NODE_TEXT_DEFAULT),
-                                                Settings.get().get(Settings.NODE_SHORT_TEXT, Settings.NODE_SHORT_TEXT_DEFAULT));
+                                                Settings.get().get(Settings.NODE_SHORT_TEXT, Settings.NODE_SHORT_TEXT_DEFAULT),
+                                                Settings.get().get(Settings.NODE_TINY_TEXT, Settings.NODE_TINY_TEXT_DEFAULT));
         EditorTopComponent tc = new EditorTopComponent(diagram);
+        diagram.setCFG(tc.getModel().getShowCFG());
         tc.open();
         tc.requestActive();
     }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/NodeQuickSearch.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/NodeQuickSearch.java
index 4d0e51d6469..6b36fa2d920 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/NodeQuickSearch.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/NodeQuickSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import com.sun.hotspot.igv.data.Properties.RegexpPropertyMatcher;
 import com.sun.hotspot.igv.data.services.InputGraphProvider;
 import com.sun.hotspot.igv.settings.Settings;
 import com.sun.hotspot.igv.util.LookupHistory;
+import com.sun.hotspot.igv.util.StringUtils;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -214,24 +215,16 @@ public class NodeQuickSearch implements SearchProvider {
     /**
      * Rank a match by splitting the property into words. Full matches of a word
      * rank highest, followed by partial matches at the word start, followed by
-     * the rest of matches in increasing size of the partially matched word, for
-     * example:
-     *
-     *   rank("5", "5 AddI")   = 1 (full match of first word)
-     *   rank("5", "554 MulI") = 2 (start match of first word)
-     *   rank("5", "25 AddL")  = 3 (middle match of first word with excess 1)
-     *   rank("5", "253 AddL") = 4 (middle match of first word with excess 2)
+     * the rest of matches in increasing size of the partially matched word. See
+     * examples in class StringUtils.
      */
     private int rankMatch(String qry, String prop) {
         String query = qry.toLowerCase();
         String property = prop.toLowerCase();
         for (String component : property.split("\\W+")) {
-            if (component.equals(query)) {
-                return 1;
-            } else if (component.startsWith(query)) {
-                return 2;
-            } else if (component.contains(query)) {
-                return component.length() - query.length() + 2;
+            int rank = StringUtils.rankMatch(query, component);
+            if (rank != Integer.MAX_VALUE) {
+                return rank;
             }
         }
         return Integer.MAX_VALUE;
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java
index 7831d0c6ef5..95c224520f9 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,22 +35,22 @@ import org.openide.util.ImageUtilities;
  */
 public class EnableBlockLayoutAction extends AbstractAction {
 
-    private boolean state;
-    public static final String STATE = "state";
-
     public EnableBlockLayoutAction() {
-        state = false;
         putValue(AbstractAction.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage(iconResource())));
-        putValue(STATE, state);
-        putValue(Action.SHORT_DESCRIPTION, "Cluster nodes into blocks");
+        putValue(SELECTED_KEY, false);
+        putValue(Action.SHORT_DESCRIPTION, "Show clustered sea of nodes");
     }
 
-    public void actionPerformed(ActionEvent ev) {
-        this.state = !state;
-        this.putValue(STATE, state);
+    public boolean isSelected() {
+        return (Boolean)getValue(SELECTED_KEY);
     }
 
     protected String iconResource() {
-        return "com/sun/hotspot/igv/view/images/blocks.gif";
+        return "com/sun/hotspot/igv/view/images/blocks.png";
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
     }
+
 }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableCFGLayoutAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableCFGLayoutAction.java
new file mode 100644
index 00000000000..dfae60c45b7
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableCFGLayoutAction.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.view.actions;
+
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+import org.openide.util.ImageUtilities;
+
+public class EnableCFGLayoutAction extends AbstractAction {
+
+    public EnableCFGLayoutAction() {
+        putValue(AbstractAction.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage(iconResource())));
+        putValue(SELECTED_KEY, false);
+        putValue(Action.SHORT_DESCRIPTION, "Show control-flow graph");
+    }
+
+    public boolean isSelected() {
+        return (Boolean)getValue(SELECTED_KEY);
+    }
+
+    protected String iconResource() {
+        return "com/sun/hotspot/igv/view/images/cfg.png";
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableSeaLayoutAction.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableSeaLayoutAction.java
new file mode 100644
index 00000000000..0d96310e8ef
--- /dev/null
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/EnableSeaLayoutAction.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.igv.view.actions;
+
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+import org.openide.util.ImageUtilities;
+
+public class EnableSeaLayoutAction extends AbstractAction {
+
+    public EnableSeaLayoutAction() {
+        putValue(AbstractAction.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage(iconResource())));
+        putValue(SELECTED_KEY, false);
+        putValue(Action.SHORT_DESCRIPTION, "Show sea of nodes");
+    }
+
+    public boolean isSelected() {
+        return (Boolean)getValue(SELECTED_KEY);
+    }
+
+    protected String iconResource() {
+        return "com/sun/hotspot/igv/view/images/sea.png";
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+    }
+}
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/BlockWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/BlockWidget.java
index ce96f295e6e..4e8e919e8c5 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/BlockWidget.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/BlockWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,8 @@ public class BlockWidget extends Widget {
 
     public static final int BORDER = 20;
     public static final Color BACKGROUND_COLOR = new Color(235, 235, 255);
-    private static final Font titleFont = new Font("Serif", Font.PLAIN, 14).deriveFont(Font.BOLD);
+    private static final Font TITLE_FONT = new Font("Arial", Font.BOLD, 14);
+    public static final Color TITLE_COLOR = new Color(42, 42, 171);
     private InputBlock blockNode;
     private Diagram diagram;
 
@@ -70,9 +71,8 @@ public class BlockWidget extends Widget {
             g.drawRect(r.x, r.y, r.width, r.height);
         }
 
-        Color titleColor = Color.BLACK;
-        g.setColor(titleColor);
-        g.setFont(titleFont);
+        g.setColor(TITLE_COLOR);
+        g.setFont(TITLE_FONT);
 
         String s = "B" + blockNode.getName();
         Rectangle2D r1 = g.getFontMetrics().getStringBounds(s, g);
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java
index dfe67811161..cc9f91d11a0 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/FigureWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@ import javax.swing.event.MenuListener;
 import org.netbeans.api.visual.action.PopupMenuProvider;
 import org.netbeans.api.visual.action.WidgetAction;
 import org.netbeans.api.visual.layout.LayoutFactory;
+import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
 import org.netbeans.api.visual.model.ObjectState;
 import org.netbeans.api.visual.widget.LabelWidget;
 import org.netbeans.api.visual.widget.Widget;
@@ -106,14 +107,20 @@ public class FigureWidget extends Widget implements Properties.Provider, PopupMe
         outer.setLayout(LayoutFactory.createOverlayLayout());
 
         middleWidget = new Widget(scene);
-        middleWidget.setLayout(LayoutFactory.createVerticalFlowLayout(LayoutFactory.SerialAlignment.CENTER, 0));
+        SerialAlignment textAlign = scene.getModel().getShowCFG() ?
+            LayoutFactory.SerialAlignment.LEFT_TOP :
+            LayoutFactory.SerialAlignment.CENTER;
+        middleWidget.setLayout(LayoutFactory.createVerticalFlowLayout(textAlign, 0));
         middleWidget.setBackground(f.getColor());
         middleWidget.setOpaque(true);
         middleWidget.getActions().addAction(new DoubleClickAction(this));
         middleWidget.setCheckClipping(true);
 
         dummyTop = new Widget(scene);
-        dummyTop.setMinimumSize(new Dimension(Figure.INSET / 2, 1));
+        int extraTopHeight =
+            getFigure().getDiagram().isCFG() && getFigure().hasNamedInputSlot() ?
+            Figure.TOP_CFG_HEIGHT : 0;
+        dummyTop.setMinimumSize(new Dimension(Figure.INSET / 2, 1 + extraTopHeight));
         middleWidget.addChild(dummyTop);
 
         String[] strings = figure.getLines();
@@ -132,10 +139,13 @@ public class FigureWidget extends Widget implements Properties.Provider, PopupMe
         }
 
         Widget dummyBottom = new Widget(scene);
-        dummyBottom.setMinimumSize(new Dimension(Figure.INSET / 2, 1));
+        int extraBottomHeight =
+            getFigure().getDiagram().isCFG() && getFigure().hasNamedOutputSlot() ?
+            Figure.BOTTOM_CFG_HEIGHT : 0;
+        dummyBottom.setMinimumSize(new Dimension(Figure.INSET / 2, 1  + extraBottomHeight));
         middleWidget.addChild(dummyBottom);
 
-        middleWidget.setPreferredBounds(new Rectangle(0, Figure.SLOT_WIDTH - Figure.OVERLAPPING, f.getWidth(), f.getHeight()));
+        middleWidget.setPreferredBounds(new Rectangle(0, Figure.getVerticalOffset(), f.getWidth(), f.getHeight()));
         this.addChild(middleWidget);
 
         // Initialize node for property sheet
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java
index fdb0a8db765..4bba96c7e01 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@ package com.sun.hotspot.igv.view.widgets;
 import com.sun.hotspot.igv.graph.Figure;
 import com.sun.hotspot.igv.graph.InputSlot;
 import com.sun.hotspot.igv.view.DiagramScene;
-import java.awt.Point;
 import java.util.List;
 import org.netbeans.api.visual.widget.Widget;
 
@@ -41,12 +40,6 @@ public class InputSlotWidget extends SlotWidget {
     public InputSlotWidget(InputSlot slot, DiagramScene scene, Widget parent, FigureWidget fw) {
         super(slot, scene, parent, fw);
         inputSlot = slot;
-        //init();
-        //getFigureWidget().getLeftWidget().addChild(this);
-        Point p = inputSlot.getRelativePosition();
-        p.x -= this.calculateClientArea().width / 2;
-        p.y += Figure.SLOT_START;
-        this.setPreferredLocation(p);
     }
 
     public InputSlot getInputSlot() {
@@ -59,6 +52,12 @@ public class InputSlotWidget extends SlotWidget {
         assert slots.contains(getSlot());
         return calculateWidth(slots.size());
     }
+
+    @Override
+    protected int yOffset() {
+        return getFigureWidget().getFigure().getDiagram().isCFG() ?
+            calculateClientArea().height - 1 : Figure.SLOT_START;
+    }
 /*
     protected Point calculateRelativeLocation() {
         if (getFigureWidget().getBounds() == null) {
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java
index 3cf39ca34ef..5eeb0f84e5e 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/LineWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@ package com.sun.hotspot.igv.view.widgets;
 
 import com.sun.hotspot.igv.graph.Connection;
 import com.sun.hotspot.igv.graph.Figure;
-import com.sun.hotspot.igv.graph.InputSlot;
 import com.sun.hotspot.igv.graph.OutputSlot;
+import com.sun.hotspot.igv.graph.Block;
 import com.sun.hotspot.igv.util.StringUtils;
 import com.sun.hotspot.igv.view.DiagramScene;
 import java.awt.*;
@@ -138,8 +138,10 @@ public class LineWidget extends Widget implements PopupMenuProvider {
             public void select(Widget arg0, Point arg1, boolean arg2) {
                 Set<Figure> set = new HashSet<>();
                 for (Connection c : LineWidget.this.connections) {
-                    set.add(c.getInputSlot().getFigure());
-                    set.add(c.getOutputSlot().getFigure());
+                    if (c.hasSlots()) {
+                        set.add(scene.getWidget(c.getTo()));
+                        set.add(scene.getWidget(c.getFrom()));
+                    }
                 }
                 LineWidget.this.scene.setSelectedObjects(set);
             }
@@ -242,10 +244,12 @@ public class LineWidget extends Widget implements PopupMenuProvider {
         Set<Object> highlightedObjects = new HashSet<>(scene.getHighlightedObjects());
         Set<Object> highlightedObjectsChange = new HashSet<>();
         for (Connection c : connections) {
-            highlightedObjectsChange.add(c.getInputSlot().getFigure());
-            highlightedObjectsChange.add(c.getInputSlot());
-            highlightedObjectsChange.add(c.getOutputSlot().getFigure());
-            highlightedObjectsChange.add(c.getOutputSlot());
+            if (c.hasSlots()) {
+                highlightedObjectsChange.add(c.getTo());
+                highlightedObjectsChange.add(c.getTo().getVertex());
+                highlightedObjectsChange.add(c.getFrom());
+                highlightedObjectsChange.add(c.getFrom().getVertex());
+            }
         }
         if(b) {
             highlightedObjects.addAll(highlightedObjectsChange);
@@ -312,14 +316,19 @@ public class LineWidget extends Widget implements PopupMenuProvider {
     @Override
     public JPopupMenu getPopupMenu(Widget widget, Point localLocation) {
         JPopupMenu menu = new JPopupMenu();
-        menu.add(scene.createGotoAction(outputSlot.getFigure()));
-        menu.addSeparator();
-
-        for (Connection c : connections) {
-            InputSlot s = c.getInputSlot();
-            menu.add(scene.createGotoAction(s.getFigure()));
+        if (outputSlot == null) { // One-to-one block line.
+            assert (connections.size() == 1);
+            Connection c = connections.get(0);
+            menu.add(scene.createGotoAction((Block)c.getFromCluster()));
+            menu.addSeparator();
+            menu.add(scene.createGotoAction((Block)c.getToCluster()));
+        } else { // One-to-many figure line.
+            menu.add(scene.createGotoAction(outputSlot.getFigure()));
+            menu.addSeparator();
+            for (Connection c : connections) {
+                menu.add(scene.createGotoAction((Figure)c.getTo().getVertex()));
+            }
         }
-
         final LineWidget w = this;
         menu.addPopupMenuListener(new PopupMenuListener() {
 
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java
index 9a5ea2d1afb..f1a03715d22 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@ package com.sun.hotspot.igv.view.widgets;
 import com.sun.hotspot.igv.graph.Figure;
 import com.sun.hotspot.igv.graph.OutputSlot;
 import com.sun.hotspot.igv.view.DiagramScene;
-import java.awt.Point;
 import java.util.List;
 import org.netbeans.api.visual.widget.Widget;
 
@@ -41,10 +40,6 @@ public class OutputSlotWidget extends SlotWidget {
     public OutputSlotWidget(OutputSlot slot, DiagramScene scene, Widget parent, FigureWidget fw) {
         super(slot, scene, parent, fw);
         outputSlot = slot;
-        Point p = outputSlot.getRelativePosition();
-        p.y += getSlot().getFigure().getHeight() - Figure.SLOT_START;
-        p.x -= this.calculateClientArea().width / 2;
-        this.setPreferredLocation(p);
     }
 
     public OutputSlot getOutputSlot() {
@@ -58,4 +53,11 @@ public class OutputSlotWidget extends SlotWidget {
         return calculateWidth(slots.size());
 
     }
+
+    @Override
+    protected int yOffset() {
+        int overlap = getFigureWidget().getFigure().getDiagram().isCFG() ?
+            calculateClientArea().height : Figure.SLOT_START;
+        return getSlot().getFigure().getHeight() - overlap;
+    }
 }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/SlotWidget.java b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/SlotWidget.java
index 9e02d9b5c0f..74b67895788 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/SlotWidget.java
+++ b/src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/widgets/SlotWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
+import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.geom.Rectangle2D;
 import java.util.HashSet;
@@ -57,13 +58,16 @@ public abstract class SlotWidget extends Widget implements DoubleClickHandler {
         this.diagramScene = scene;
         this.slot = slot;
         figureWidget = fw;
-        if (!slot.getSource().getSourceNodes().isEmpty()) {
+        if (slot.hasSourceNodes()) {
             this.setToolTipText("<HTML>" + slot.getToolTipText() + "</HTML>");
         }
         this.setCheckClipping(true);
         parent.addChild(this);
 
-        //this.setPreferredBounds(this.calculateClientArea());
+        Point p = slot.getRelativePosition();
+        p.x -= this.calculateClientArea().width / 2;
+        p.y += yOffset();
+        this.setPreferredLocation(p);
     }
 
     @Override
@@ -92,7 +96,7 @@ public abstract class SlotWidget extends Widget implements DoubleClickHandler {
         int w = this.getBounds().width;
         int h = this.getBounds().height;
 
-        if (getSlot().getSource().getSourceNodes().size() > 0) {
+        if (getSlot().hasSourceNodes()) {
             final int SMALLER = 0;
             g.setColor(getSlot().getColor());
 
@@ -109,7 +113,7 @@ public abstract class SlotWidget extends Widget implements DoubleClickHandler {
                 g.setStroke(new BasicStroke(1f));
             }
 
-            if (getSlot().getShortName() != null && getSlot().getShortName().length() > 0) {
+            if (getSlot().shouldShowName()) {
                 g.setFont(font);
                 Rectangle2D r1 = g.getFontMetrics().getStringBounds(getSlot().getShortName(), g);
                 rectW = (int) r1.getWidth() + FONT_OFFSET * 2;
@@ -123,14 +127,15 @@ public abstract class SlotWidget extends Widget implements DoubleClickHandler {
             }
             g.drawRect(w / 2 - rectW / 2, 0, rectW - 1, s - 1);
 
-            if (getSlot().getShortName() != null && getSlot().getShortName().length() > 0 && getScene().getZoomFactor() >= TEXT_ZOOM_FACTOR) {
+            if (getSlot().shouldShowName() && getScene().getZoomFactor() >= TEXT_ZOOM_FACTOR) {
                 Rectangle2D r1 = g.getFontMetrics().getStringBounds(getSlot().getShortName(), g);
                 g.drawString(getSlot().getShortName(), (int) (w - r1.getWidth()) / 2, g.getFontMetrics().getAscent() - 1);//(int) (r1.getHeight()));
             }
 
         } else {
 
-            if (this.getSlot().getConnections().isEmpty()) {
+            if (this.getSlot().getConnections().isEmpty() &&
+                !getFigureWidget().getFigure().getDiagram().isCFG()) {
                 if (this.getState().isHighlighted()) {
                     g.setColor(Color.BLUE);
                 } else {
@@ -155,6 +160,8 @@ public abstract class SlotWidget extends Widget implements DoubleClickHandler {
 
     protected abstract int calculateSlotWidth();
 
+    protected abstract int yOffset();
+
     protected int calculateWidth(int count) {
         return getFigureWidget().getFigure().getWidth() / count;
     }
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/actions/Bundle.properties b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/actions/Bundle.properties
index 10da1aa75d8..a983c4b7dad 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/actions/Bundle.properties
+++ b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/actions/Bundle.properties
@@ -1,6 +1,8 @@
 CTL_EditorAction=Open Editor Window
 CTL_NextDiagramAction=Show next graph
+CTL_EnableSeaLayoutAction=Enable sea-of-nodes layout
 CTL_EnableBlockLayoutAction=Enable block layout
+CTL_EnableCFGLayoutAction=Enable control-flow graph layout
 CTL_NodeFindAction=Find
 CTL_PrevDiagramAction=Show previous graph
 CTL_ExportAction=Export current graph...
diff --git a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/blocks.gif b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/blocks.gif
deleted file mode 100644
index 71aa946d53918697f7043a6c255611b50d5d11cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 143
zcmZ?wbhEHb6krfwIK;{T2LBrv8vX-W{~7+nfZ{(<=c3falGGH1^30M9g^-L?1$R&1
z00zaMER0+X><l^}oghOPn5`?s@2o4B>Y3i5HN`M%=L|Q_C+(i|O09G%<QPQupVGPf
iAyZ%X#{$v$UWXQP_&Ovno48Pb<3#8w(N`CR7_0#VKQr6_

diff --git a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/blocks.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/blocks.png
new file mode 100644
index 0000000000000000000000000000000000000000..8354de8641cc3ed2724284a5a4106066090da039
GIT binary patch
literal 1734
zcmV;%208hOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000CGdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1Ywmg6c6{MRaG2}r!ea(JF|cW{?Kg-zU@q~mtF
zC&YkdkV+~EoBIF%4f=zhNEC8DYDgg%{9JNLGA3&FU*38)ZtK^LxlQimbUYA<EJnNE
zYFP3PxnR94d0l!k<o=VQ)YpS@{~#|#qRYU|;xc4;H(=UQl$Rna%d*?=%d#Aj#?LOa
zn+Liix?eOqXQKokI6CxBOpGC6u3}t7+}Z>>s-(HkmtD`}J>8ZHFiE#;&DQIV($0%*
z#<lm`x@~T4L_b}e@ihd>00GF;ifuPXH1A?_u=4efuDG?*;g0TOw$gx}9z3K$=u2)N
z*bB$F$?5R{`>*NVIQ@huy2G&CAwq7)JE!&I8l&kLefKWA0GGpZ>gEa4M&)Q_Cc(BX
zn5i-#IThn<2~ANh6*<;SH3hA5VgZSR9XHNAi2F9FT!GO^NBtQQso;3Z6kH^!lV<B?
z;~~)|+pHoDDpJKlDr3;X!kgW+*{iIu+!#xRp^UNR+eTLwowYG$Eiu!o8Quw&S%!cy
znVUV9fe{`nsD2CZt=%W&BG!UJzlB-hU^Zn}Q9OU-mfeW9Sm!bB#m%wp`==rY+a6$0
zPmWDs>p8HAIQN(lNCiQejf!<rzyNzM4Isr?8^8^U0Hz6hB5!NO%Pz+$2`0P^C`$!H
z8Du%<kw4KXawvQ2o%cTY=+!5mgAI;QVIjmYkJ}t=bkWBUW7L>pR;y0E292tkG$%<G
zr?F2c$D}ExoMAIVa}JcTK0{KZ*y4&Wp~Rvkm0XcN)m2|Zja6%^xk<APb=*RWO<QWY
zb4Mz5*FE*nW7nQ~9>}#}hZ}x`5r>X6^1<3-^{KtV8ZXvlV`{F82WybVxR12u3zSUG
zz?e7&<8d;8gqF#fQFcxybCWZZ1XbY$ApPW~vB@07k#(KL4?ej2VD2s6D7aJJ<SKJC
zsrw~!8*kM8C*Hnbt<BeV-5A@eaK_YFR9|<Z8UN9I?I_y3-J0KyKUQQr{G8J=aOM?5
zJG}Xh|K0elqLH+(P+0Bu6(FJ8dUbi5_JAz<0V?_uMJZv|n#5g%MhCX9ppAUnY}_cP
z1kgD%eg&c-=WIPgO5aBDB2xNU4m~5KcZ2#0DZLxi(_p_7)SuD+Mn=+keO!k|FQfRR
z^p5{03v`C(eCvH>(-o?(#EpJ^5G|;*W4)M#56*^lXs2ikxo<6MS~liK1-A39Yq&b_
z5qVopPuuz)(}6EmchCPRY`TQ|0&Kd3`vPpbg!=+)x`g`zY`TQ|0&KdNCf~xQ2i$Mw
z^9NA+N2T`qm3><6FAugi5B$ro>>t1TUjTY*q<`?Sb||v=QcUz0FNtANNWB8-0004m
zX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iTSciA2Q#QRWT;LSL`5963Pq?8YK2xE
zOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4RLxj8AiNQwVT3N2zhIPS;0dyl(!K(JnB
zn$<B5Xu55t5^*t;T@|}t(StAq3__5ZWz0!Z629Z>9s$1I#dwzgxj#p*nzI-X5Q%4*
zVcNtS#M7I$!FiupU`1IaJ|`YC>4L<MTvt4P<6Lk#$TI~qoth^Wh{Zx1D{ah*rbawP
z991=)@`D+VRnA+SwQ`j;@5x^n$>}T0T&FpV1QxLb2_h6!Q9>CuVzla{SV+-++{ZuU
z`XzEH<SK!YV*wRtkX=9cAN=mt%1=&sNs&0v`QkVqBS6<K(5N}i_p#$NPJqxeaHY5W
zl{zr<NqViNMUQ~KZQ$a%r73&B<qk0LWXPuMN+FuTd>(i|qi@Or{kK4P&FihXkJASr
zO<g5#fP+I|v_RSGKJV^s@9p0+&HjD>L%MR5*FseB00006VoOIv0RI600RN!9r;`8x
z010qNS#tmYE+YT{E+YYWr9XB6000McNliru<qHZFB>@)e8aV&}02y>eSad^gZEa<4
zbO1wgWnpw>WFU8GbZ8()Nlj2!fese{004$bL_t(I%VV^*{{NqW0>Hw+z`(F!19_SQ
z0-y%KfT$=VQ5s*r{*UScWbm#d4X<XQidiUpCI$)t#Rjktaw16vzye29lo2JMkOLWA
zoCQ}5;EEBLILsgv7reXMff?$`6%1=nzd{iUHWeGpv49OAI~lJ5Ldq2clP*pJ@F~Iv
c7%9!p02(nTU(LfZqyPW_07*qoM6N<$f`}I(2LJ#7

literal 0
HcmV?d00001

diff --git a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/cfg.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/cfg.png
new file mode 100644
index 0000000000000000000000000000000000000000..06791471b01b1da914f76560542934bc2f43ccb5
GIT binary patch
literal 1655
zcmV--28j8IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000BkdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3vplEWwrh5zdma|9%@9tX2j%?;-G^T5POx|7Zt
zDhA6$dgv24)c*Uo(?9qKM^Dy;=#%#bADe8Fj6pQ}C(kPzJFn};oCa5RIvxm2ieC5I
z=$F00E|@RNUY4H>ySs3d+Ip~EKgi3G#1-HaaRpM|1DLuT<>g3aMYj9>wj%o!!{rj{
zX$5gv;{K&^u^PlX&%xqq#f0D!#!-w7$XgvkdyzDL=eFI?&wDye6=;&CtY%*0u2RRB
zH4i(kMiB;M!B{j+dz$$*1Z0o^<!R-%nIoH5xjCrZ{?IeaTIFzs`xvb<pkEJul!0%{
zu0QDcqn~#A`GDPR+>_~rqF|4}a-|4exLR~Pe|xX7_qMMtTaP9CwW!ldm?p|zw^0Q1
zXC5u!>o5+pCA5g`Qcz>n6tkffPAov#*>dH~ow&_G;R20TngsMB1=NQvf<=;|1G*iJ
zy99u*8c_fRrJ}G(@3ge=jGJb>!V!@xW2!Kmjk<Z*=$T1>wcf{GVy3lccn2(F8$!k)
zH?EilBHUL}-AwSQT^Hm6t3c>xnj;pN&9=MP9G`1TCuqeyhkoDO9P0l2;m9JkgBVsI
zFrL-1XA?vMGZGmAD6@%zjkbXRJ0}$)#j1L+!6rax!fyi4x#DEE<CFvmr(OftU~2-F
zwGQ<YY(x!Zr_MU(ybCV6<g!<92|LXD;Ky;Bg9aO1@F9d4Qpi!GjV}5aVvH%~BuQ}^
zyM*nSVoE7z#LV!VJ!Q<#uxzsFW;eI_Eo^a1TP`S{Vv8%jgc3_Cxk}ZFeO!GFHP%#f
z<AzddwmE9Pg%(?Cxue#)cH3R|J@nX9&j+<d^;dg=8ZT-xNsW2opayFQdrz}o;AAiZ
zF|iEdVGuw;%V1_ATPuUyU}lnFS2%%4H`r7*nY~z2+gM!ZgWZ|jOWerYKe@@X<Y=J#
zklf@(&0TQ2L9LG0cA3QXT{v=T6uYlGmnCM|DoPwL$T7w#_-X&HBW;p*J!Ml1D}6`L
zBS+fmWgc#-(FSM|Y2325V&<f5-tFn`gr34a>>&c-BXM-0?jv#Z%*1EJ(e2c|E{<MY
z#a(f9pX+PIMDJJOb*kuIl@-4xsh0k6W#1R0X+<qsr#5=L1D@0N=`nI>qqDfrw9z+?
zkW*#<O57uDw|vo;&b4bt&t<B{{jRyv>es0Ka)hv91<Iz$>)NP(joOVD%{$uYR^s02
z>F<}|^V;ZdsNZ@)zMzdhJ7CW}eRjZ}pVF5K`&CEU@z*QS{{@C8wFTZ6y#N3KglR)V
zP)S2WAaHVTW@&6?004NLeUUv#!%!53Pt!`JR2=M3#34g<vLIH(QL9jd3ZYhL)xqSY
zf6$~QNpW!$Tni5VELI&{oON|@6$HT_5H~j`MHeaYzNFA1#s`=8ao#(J`|bmTR+VXH
zU;@x|%gCgXVlKZb244|EfGUcF%*^_nB&FfGzV6}U`(2!8dEfhU4X6c^0X~s<memc5
zc!PL))2egcCyubPtP-CSj~mn=@gvt2m)|&-92R(H#K>mmi6g{fsfU#wW@SSoo+6H^
znojvb&SjPJ7H6&6V4Xhs3&RC{Wtr<#BS>KpOOPN!K?4<3VIfYtPKt>PohLo~!;W7f
zmqM-z7&#VDg9h30ga5(r*_y?~q?;5@0(~#G{V@szcY$`(w!e>UyL|%qpMfjA>#wzd
znNQN2T`hJ53~mD#*IiB711@)f=u=%bWJmH-3B@Aten#Jv2ZnBe(3(59&N)sWfGo`_
zeFGdE0%Il0UiWx+fA8G>z0;ZB4`aP@p;iSN0000024YJ`L;(K){{a7>y{D4^000Sa
zNLh0L04^f{04^f|c%?sf00007bV*G`2jvO`3LO(U$_H}*000?uMObu0Z*6U5Zgc=c
za%Ew3Wn>_CX>@2HM@dakSAh-}0001PNkl<ZILl+aaN+-d1_}TR0|NttfdL~~nlD`V
z4>5p&fq~&&M;b|*g(_w-FfcGMFfmXFC^mor8i-`!3m5+Xhlj!1)2~RfIM`Hdkc0sX
zx|7H@;N9I0($ax)#UKd->IEXqPh=Tz;R5+N8UQ^6DB^zSZ!iD=002ovPDHLkV1n`n
B0P6q%

literal 0
HcmV?d00001

diff --git a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/sea.png b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/images/sea.png
new file mode 100644
index 0000000000000000000000000000000000000000..35edbb5a5a98cf16dbb1e7b0e2cf4e4682c2ecb5
GIT binary patch
literal 1680
zcmV;B25<R^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000BedQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+Pzj;a^pG-{KqNg2n4|OI24zvxxqXBG$~q<9VhXU
zdSXPv5C}BUfD~%~{q6Jzmv9uaE<~TaH@IxFNiu|J_AAesjh*xQVJ^azo{k3sm15QX
zXY@<opcmN7(wF5YL+?(GQd<wU>j!x`lDGm~BCbHndjM0Hqr4octjKo%y{*VT#c)1C
zy__H}P26u9lhq*Jc@7q{6%&F_kfRtIkheO3_9AKQbKCCc_BUNj1(>8MtC@4$QR=u^
zGwyw!c2ib7%j%S8ehq;#KmhWza@)+2&8yrTtlYookz=iLxT5=zRvFNz2RCKl+tTX|
zd;VCbo^BtoyHEGz^n@tbBd}Z}DkD>;D}LO)*Vud8PnWI7k^MT<<s?j#%3ilo1aq6m
z2)G^OFh|0OXqSQ-s|dJZ6izH4v9smMnLBZtLg508R+<E?A_W`|T?7|N3aDnaV{n(C
zNvlSbK|!e~w9-2*EIi|;8Lx0e<jOD=hBL;N9|t{R^xf!v^b#|zp5dKf8Eps{gSj!o
z42*DJNp&;9mvLQ?i&zDPZl*cnfZ1%ji_P&zZRsRhVdt>!&CQ|i`-dZo*bZROPnL~m
zb?n&$k-&^ZMi7+QL{Tdn7+~k50;E_~4{p!|2u;`%c-o4SU5~dUm~iSffSaTlWLfJ_
zKfy-SP<HC9bI!ZqqDwA&^_I|K-UmNkw>fCA!37^eh#`d>HQMN+k0HjGVos72Z)2Cx
zjwz;;az@My&)HLkeTHU}O*gx_&2M3gTiS9#`4n4R@g<a4Qpr`SR`hZ8HPl#B&5avM
zsoCbJ`4(DispXDZ>)LI1-S^OAPdy*3Eml8`Cs^afnoOpKT{u{SHiUhpSub!hI0Iv1
z8H|U)018?LXC|_>GMF2jnIz~6CjjXNH<e9hFP79c7T5XU?t{6fcq4DW<xL)Cjs|sa
zGB<gn=1#obVXfx*($mS%=)#dxqv$@^WQq90*Hj{1gm>3paind0vfl?YS2~>b{sN9e
z%%oG^3TrE7s<U}|?J3YM_YgtTfb~*>F3AS6w}H_@b_?ujSaeR<JFw`Suy^uBw@kje
z(&y8@z}$i8ZjC+Q@MKS~BKTcIr+xHpZoXvg+1z}|+Cwb9;^?l!s}mGIM3Swlmj3mA
zO{;N=)^G69MXqtTZ?3fZGdu~)JewxNJ$(oF8MIV?Oy^^0={va3pru!ndyAG{P43-y
z_Di*N|K<NK`M>w2Rcdd1@y`eS^>6?G=1B1`SE7HTdL9Zs(B$j@00D$)LqkwWLqi~N
za&Km7Y-Iodc$|HaJxIeq9K~N-MX41BGpIOZs7@9{MI5yXMW_&Jg;pI*F8zWg4M~cN
zqu^R_@ME#+;Nq;SgR3A2et@{SIVrkGiT_IqEn+-4?#H`(kGpq3uwG`G)iDlex^1Qs
zaWRu!6}w*1gD?aPLXeqd%t=xbzT@j20lwbFc$WXUKS!^cvltK%iD#K%+Qb{g)0?)z
zd7oHdMOh_2Cmu8Dg2azpS3G{>TyQzaGX*o9nkN>B#X=h^ZOn?MMm$9vRW+URgBg!i
z&Rd+da+Njj$zK@B=_|`zr#XxS7O?~gA{10nLK!w<wCbc-NYQ@W$3NuyC2}d`DuIz>
z0TpPFT|f9A{O;DuPfmDAkvP!#;y528K-VtNs5#E}vEwvOfY38=rMLW*IxzD|dab2J
zkAS{y;NrTaDSN=>4lwX!$foQ{A)3K_9(X^aZ^{Dww?KH!>#ezu(+40;T_taTgF|4n
zK-ud)@9u8z?cX!a{(b;Mx^k4)LR9ep000JJOGiWi{{a60|De66lK=n!32;bRa{vG?
zBLDy{BLR4&KXw2B00(qQO+^Rg3knn-Gvbb<fdBvi8FWQhbVF}#ZDnqB07G(RVRU6=
zAa`kWXdp*PO;A^X4i^9b0F6mRK~y-)WBmXB|9=Jw01GmQk&%%oO~`h#pi92%NW-gH
zsA3ihpNWA&K(PUg$bm?47{DYL85tSSBL|xpNnZH>|36k2V#ES2+p)3#|Njp$0NrGC
zMGOoK3~NunLQxZJDu(KUcXvB5<6OCd_R+{ftU{QR$ua<6eq;Rq|Nnn{35ZZ;Wg$ip
aJ^%nZH#xu6ut81$0000<MNUMnLSTZCY!m|k

literal 0
HcmV?d00001

diff --git a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/layer.xml b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/layer.xml
index e37ac818667..ee65bf0799c 100644
--- a/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/layer.xml
+++ b/src/utils/IdealGraphVisualizer/View/src/main/resources/com/sun/hotspot/igv/view/layer.xml
@@ -17,7 +17,9 @@
             <file name="com-sun-hotspot-igv-view-actions-ZoomOutAction.instance"><attr name="position" intvalue="2001"/></file>
             <file name="com-sun-hotspot-igv-view-actions-OverviewAction.instance"><attr name="position" intvalue="2001"/></file>
             <file name="com-sun-hotspot-igv-view-actions-PredSuccAction.instance"><attr name="position" intvalue="2001"/></file>
+            <file name="com-sun-hotspot-igv-view-actions-EnableSeaLayoutAction.instance"><attr name="position" intvalue="2001"/></file>
             <file name="com-sun-hotspot-igv-view-actions-EnableBlockLayoutAction.instance"><attr name="position" intvalue="2001"/></file>
+            <file name="com-sun-hotspot-igv-view-actions-EnableCFGLayoutAction.instance"><attr name="position" intvalue="2001"/></file>
         </folder>
     </folder>
     <folder name="Menu">
@@ -80,6 +82,11 @@
             <attr name="position" intvalue="0"/>
             <file name="com-sun-hotspot-igv-view-NodeQuickSearch.instance"/>
         </folder>
+        <folder name="Blocks">
+            <attr name="command" stringvalue="n"/>
+            <attr name="position" intvalue="1"/>
+            <file name="com-sun-hotspot-igv-view-BlockQuickSearch.instance"/>
+        </folder>
         <file name="Projects_hidden"/>
     </folder>
     
-- 
GitLab


From b82b0090474d1873ec8a42a3bfc71de972782e78 Mon Sep 17 00:00:00 2001
From: Xiaolin Zheng <xlinzheng@openjdk.org>
Date: Wed, 30 Mar 2022 09:04:55 +0000
Subject: [PATCH 269/345] 8283737: riscv: MacroAssembler::stop() should emit
 fixed-length instruction sequence

Reviewed-by: fyang, shade
---
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 86710295444..46ab4364655 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -531,8 +531,11 @@ void MacroAssembler::resolve_jobject(Register value, Register thread, Register t
 void MacroAssembler::stop(const char* msg) {
   address ip = pc();
   pusha();
-  li(c_rarg0, (uintptr_t)(address)msg);
-  li(c_rarg1, (uintptr_t)(address)ip);
+  // The length of the instruction sequence emitted should be independent
+  // of the values of msg and ip so that the size of mach nodes for scratch
+  // emit and normal emit matches.
+  mv(c_rarg0, (address)msg);
+  mv(c_rarg1, (address)ip);
   mv(c_rarg2, sp);
   mv(c_rarg3, CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
   jalr(c_rarg3);
-- 
GitLab


From 51c05e8219db5f47d7f56eeb9cdaaee0785b5e7e Mon Sep 17 00:00:00 2001
From: Ningsheng Jian <njian@openjdk.org>
Date: Wed, 30 Mar 2022 09:47:20 +0000
Subject: [PATCH 270/345] 8282764: AArch64:
 compiler/vectorapi/reshape/TestVectorCastNeon.java failed with incorrect
 result

Reviewed-by: psandoz, ngasson, eliu
---
 src/hotspot/cpu/aarch64/aarch64_neon.ad         | 17 ++++++++++++-----
 src/hotspot/cpu/aarch64/aarch64_neon_ad.m4      | 17 ++++++++++++-----
 .../vectorapi/VectorCastShape128Test.java       |  5 ++++-
 .../vectorapi/reshape/TestVectorCastAVX1.java   |  3 ++-
 .../vectorapi/reshape/TestVectorCastAVX2.java   |  3 ++-
 .../vectorapi/reshape/TestVectorCastAVX512.java |  3 ++-
 .../reshape/TestVectorCastAVX512BW.java         |  3 ++-
 .../reshape/TestVectorCastAVX512DQ.java         |  3 ++-
 .../vectorapi/reshape/TestVectorCastNeon.java   |  5 +++--
 .../vectorapi/reshape/TestVectorCastSVE.java    |  3 ++-
 .../reshape/TestVectorReinterpret.java          |  3 ++-
 .../reshape/utils/VectorReshapeHelper.java      | 11 ++++++-----
 12 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64_neon.ad b/src/hotspot/cpu/aarch64/aarch64_neon.ad
index ab4d260856b..0be4d5414ee 100644
--- a/src/hotspot/cpu/aarch64/aarch64_neon.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_neon.ad
@@ -350,16 +350,23 @@ instruct vcvt4Bto4I(vecX dst, vecD src)
   ins_pipe(pipe_class_default);
 %}
 
-instruct vcvt2Lto2F(vecD dst, vecX src)
+instruct vcvt2Lto2F(vecD dst, vecX src, vRegF tmp)
 %{
   predicate(n->as_Vector()->length() == 2 && n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorCastL2X src));
-  format %{ "scvtfv  T2D, $dst, $src\n\t"
-            "fcvtn   $dst, T2S, $dst, T2D\t# convert 2L to 2F vector"
+  effect(TEMP_DEF dst, TEMP tmp);
+  format %{ "umov   rscratch1, $src, D, 0\n\t"
+            "scvtfs $dst, rscratch1\n\t"
+            "umov   rscratch1, $src, D, 1\n\t"
+            "scvtfs $tmp, rscratch1\n\t"
+            "ins    $dst, S, $tmp, 1, 0\t# convert 2L to 2F vector"
   %}
   ins_encode %{
-    __ scvtfv(__ T2D, as_FloatRegister($dst$$reg), as_FloatRegister($src$$reg));
-    __ fcvtn(as_FloatRegister($dst$$reg), __ T2S, as_FloatRegister($dst$$reg), __ T2D);
+    __ umov(rscratch1, as_FloatRegister($src$$reg), __ D, 0);
+    __ scvtfs(as_FloatRegister($dst$$reg), rscratch1);
+    __ umov(rscratch1, as_FloatRegister($src$$reg), __ D, 1);
+    __ scvtfs(as_FloatRegister($tmp$$reg), rscratch1);
+    __ ins(as_FloatRegister($dst$$reg), __ S, as_FloatRegister($tmp$$reg), 1, 0);
   %}
   ins_pipe(pipe_slow);
 %}
diff --git a/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
index fe8dc79e4f0..2f352032908 100644
--- a/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_neon_ad.m4
@@ -178,16 +178,23 @@ VECTOR_CAST_I2I_L(4, I, B, D, X, xtn,  4S, 4H, 8H, 8B)
 VECTOR_CAST_I2I_L(4, B, I, X, D, sxtl, 8B, 8H, 4H, 4S)
 dnl
 
-instruct vcvt2Lto2F(vecD dst, vecX src)
+instruct vcvt2Lto2F(vecD dst, vecX src, vRegF tmp)
 %{
   predicate(n->as_Vector()->length() == 2 && n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
   match(Set dst (VectorCastL2X src));
-  format %{ "scvtfv  T2D, $dst, $src\n\t"
-            "fcvtn   $dst, T2S, $dst, T2D\t# convert 2L to 2F vector"
+  effect(TEMP_DEF dst, TEMP tmp);
+  format %{ "umov   rscratch1, $src, D, 0\n\t"
+            "scvtfs $dst, rscratch1\n\t"
+            "umov   rscratch1, $src, D, 1\n\t"
+            "scvtfs $tmp, rscratch1\n\t"
+            "ins    $dst, S, $tmp, 1, 0\t# convert 2L to 2F vector"
   %}
   ins_encode %{
-    __ scvtfv(__ T2D, as_FloatRegister($dst$$reg), as_FloatRegister($src$$reg));
-    __ fcvtn(as_FloatRegister($dst$$reg), __ T2S, as_FloatRegister($dst$$reg), __ T2D);
+    __ umov(rscratch1, as_FloatRegister($src$$reg), __ D, 0);
+    __ scvtfs(as_FloatRegister($dst$$reg), rscratch1);
+    __ umov(rscratch1, as_FloatRegister($src$$reg), __ D, 1);
+    __ scvtfs(as_FloatRegister($tmp$$reg), rscratch1);
+    __ ins(as_FloatRegister($dst$$reg), __ S, as_FloatRegister($tmp$$reg), 1, 0);
   %}
   ins_pipe(pipe_slow);
 %}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorCastShape128Test.java b/test/hotspot/jtreg/compiler/vectorapi/VectorCastShape128Test.java
index 5feef36e531..d086e8fed53 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorCastShape128Test.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorCastShape128Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021, 2022, Arm Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,6 +114,9 @@ public class VectorCastShape128Test {
         0,
         Long.MAX_VALUE,
         Long.MIN_VALUE,
+        // A special value to make sure correct rounding of
+        // conversion from long to float. See: JDK-8282764.
+        0x561a524000000001L,
     };
 
 
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX1.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX1.java
index a83364fa51c..de70b3ca6a7 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX1.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import compiler.vectorapi.reshape.utils.VectorReshapeHelper;
 /*
  * @test
  * @bug 8259610
+ * @key randomness
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector cast intrinsics work as intended on avx1.
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX2.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX2.java
index 1b50613598b..f05f8903355 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX2.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import compiler.vectorapi.reshape.utils.VectorReshapeHelper;
 /*
  * @test
  * @bug 8259610
+ * @key randomness
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector cast intrinsics work as intended on avx2.
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512.java
index 749c6a21e06..a231889b9ed 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import compiler.vectorapi.reshape.utils.VectorReshapeHelper;
 /*
  * @test
  * @bug 8259610
+ * @key randomness
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector cast intrinsics work as intended on avx512.
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512BW.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512BW.java
index d9fbaf92d84..c8d907db43b 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512BW.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512BW.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import compiler.vectorapi.reshape.utils.VectorReshapeHelper;
 /*
  * @test
  * @bug 8278623
+ * @key randomness
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector cast intrinsics work as intended on avx512bw.
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512DQ.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512DQ.java
index 8799cccd918..9d8b7db7a85 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512DQ.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastAVX512DQ.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import compiler.vectorapi.reshape.utils.VectorReshapeHelper;
 /*
  * @test
  * @bug 8259610
+ * @key randomness
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector cast intrinsics work as intended on avx512dq.
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastNeon.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastNeon.java
index 11777a3ccfc..1beefec1124 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastNeon.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastNeon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import compiler.vectorapi.reshape.utils.VectorReshapeHelper;
 /*
  * @test
  * @bug 8259610
+ * @key randomness
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector cast intrinsics work as intended on neon.
@@ -42,7 +43,7 @@ public class TestVectorCastNeon {
         VectorReshapeHelper.runMainHelper(
                 TestVectorCast.class,
                 TestCastMethods.NEON_CAST_TESTS.stream(),
-                "-XX:+UseNeon");
+                "-XX:UseSVE=0");
     }
 }
 
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastSVE.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastSVE.java
index 614e8e870de..1ab1c3ca188 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastSVE.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorCastSVE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import compiler.vectorapi.reshape.utils.VectorReshapeHelper;
 /*
  * @test
  * @bug 8259610
+ * @key randomness
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector cast intrinsics work as intended on sve.
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java
index 538736193ef..11821a6b8eb 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import jdk.incubator.vector.VectorSpecies;
 /*
  * @test
  * @bug 8259610
+ * @key randomness
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector reinterpret intrinsics work as intended.
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/utils/VectorReshapeHelper.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/utils/VectorReshapeHelper.java
index c769c14bde0..6cfd934bb27 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/utils/VectorReshapeHelper.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/utils/VectorReshapeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.incubator.vector.*;
 import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
 
 public class VectorReshapeHelper {
     public static final int INVOCATIONS = 10_000;
@@ -105,7 +106,7 @@ public class VectorReshapeHelper {
 
     public static <T, U> void runCastHelper(VectorOperators.Conversion<T, U> castOp,
                                             VectorSpecies<T> isp, VectorSpecies<U> osp) throws Throwable {
-        var random = RandomGenerator.getDefault();
+        var random = Utils.getRandomInstance();
         boolean isUnsignedCast = castOp.name().startsWith("ZERO");
         String testMethodName = VectorSpeciesPair.makePair(isp, osp, isUnsignedCast).format();
         var caller = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).getCallerClass();
@@ -219,7 +220,7 @@ public class VectorReshapeHelper {
     }
 
     public static void runExpandShrinkHelper(VectorSpecies<Byte> isp, VectorSpecies<Byte> osp) throws Throwable {
-        var random = RandomGenerator.getDefault();
+        var random = Utils.getRandomInstance();
         String testMethodName = VectorSpeciesPair.makePair(isp, osp).format();
         var caller = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).getCallerClass();
         var testMethod = MethodHandles.lookup().findStatic(caller,
@@ -249,7 +250,7 @@ public class VectorReshapeHelper {
     }
 
     public static void runDoubleExpandShrinkHelper(VectorSpecies<Byte> isp, VectorSpecies<Byte> osp) throws Throwable {
-        var random = RandomGenerator.getDefault();
+        var random = Utils.getRandomInstance();
         String testMethodName = VectorSpeciesPair.makePair(isp, osp).format();
         var caller = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).getCallerClass();
         var testMethod = MethodHandles.lookup().findStatic(caller,
@@ -278,7 +279,7 @@ public class VectorReshapeHelper {
     }
 
     public static <T, U> void runRebracketHelper(VectorSpecies<T> isp, VectorSpecies<U> osp) throws Throwable {
-        var random = RandomGenerator.getDefault();
+        var random = Utils.getRandomInstance();
         String testMethodName = VectorSpeciesPair.makePair(isp, osp).format();
         var caller = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).getCallerClass();
         var testMethod = MethodHandles.lookup().findStatic(caller,
-- 
GitLab


From 720e751f35150251cab05bc9fca3add39daf70af Mon Sep 17 00:00:00 2001
From: Xiaolin Zheng <xlinzheng@openjdk.org>
Date: Wed, 30 Mar 2022 10:01:39 +0000
Subject: [PATCH 271/345] 8283937: riscv: RVC: Fix c_beqz to c_bnez

Reviewed-by: shade
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 4923962a496..e8b43aee9db 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -2795,7 +2795,7 @@ public:
   }
 
   INSN(beq, c_beqz, _beq);
-  INSN(bne, c_beqz, _bne);
+  INSN(bne, c_bnez, _bne);
 
 #undef INSN
 
-- 
GitLab


From e8e9b8dc89059b606d16ba950f0d7e57185151e7 Mon Sep 17 00:00:00 2001
From: Eric Liu <eliu@openjdk.org>
Date: Wed, 30 Mar 2022 14:57:50 +0000
Subject: [PATCH 272/345] 8282926: AArch64: Optimize out WHILELO with PTRUE

Reviewed-by: njian, ngasson
---
 src/hotspot/cpu/aarch64/aarch64_sve.ad        | 172 +++++++-----------
 src/hotspot/cpu/aarch64/aarch64_sve_ad.m4     |  95 ++++------
 .../cpu/aarch64/c2_MacroAssembler_aarch64.hpp |  10 +-
 3 files changed, 103 insertions(+), 174 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64_sve.ad b/src/hotspot/cpu/aarch64/aarch64_sve.ad
index 6b8e8f7daa9..c5ef0b57870 100644
--- a/src/hotspot/cpu/aarch64/aarch64_sve.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_sve.ad
@@ -305,12 +305,12 @@ instruct loadV_partial(vReg dst, vmemA mem, pRegGov pgtmp, rFlagsReg cr) %{
   match(Set dst (LoadVector mem));
   effect(TEMP pgtmp, KILL cr);
   ins_cost(6 * SVE_COST);
-  format %{ "sve_whilelo_zr_imm $pgtmp, vector_length\n\t"
+  format %{ "sve_ptrue $pgtmp, vector_length\n\t"
             "sve_ldr $dst, $pgtmp, $mem\t# load vector partial" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
-                          Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
+                         Matcher::vector_length(this));
     FloatRegister dst_reg = as_FloatRegister($dst$$reg);
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, dst_reg,
                           as_PRegister($pgtmp$$reg), bt, bt, $mem->opcode(),
@@ -325,12 +325,12 @@ instruct storeV_partial(vReg src, vmemA mem, pRegGov pgtmp, rFlagsReg cr) %{
   match(Set mem (StoreVector mem src));
   effect(TEMP pgtmp, KILL cr);
   ins_cost(5 * SVE_COST);
-  format %{ "sve_whilelo_zr_imm $pgtmp, vector_length\n\t"
+  format %{ "sve_ptrue $pgtmp, vector_length\n\t"
             "sve_str $src, $pgtmp, $mem\t# store vector partial" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
+                         Matcher::vector_length(this, $src));
     FloatRegister src_reg = as_FloatRegister($src$$reg);
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, src_reg,
                           as_PRegister($pgtmp$$reg), bt, bt, $mem->opcode(),
@@ -365,8 +365,8 @@ instruct loadV_masked_partial(vReg dst, vmemA mem, pRegGov pg, pRegGov pgtmp, rF
   format %{ "sve_ldr $dst, $pg, $mem\t# load vector predicated partial (sve)" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
-                          Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
+                         Matcher::vector_length(this));
     __ sve_and(as_PRegister($pgtmp$$reg), as_PRegister($pgtmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, as_FloatRegister($dst$$reg),
@@ -400,8 +400,8 @@ instruct storeV_masked_partial(vReg src, vmemA mem, pRegGov pg, pRegGov pgtmp, r
   format %{ "sve_str $mem, $pg, $src\t# store vector predicated partial (sve)" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
+                         Matcher::vector_length(this, $src));
     __ sve_and(as_PRegister($pgtmp$$reg), as_PRegister($pgtmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, as_FloatRegister($src$$reg),
@@ -438,7 +438,7 @@ instruct vmaskAllI(pRegGov dst, iRegIorL2I src, vReg tmp, rFlagsReg cr) %{
   effect(TEMP tmp, KILL cr);
   ins_cost(3 * SVE_COST);
   format %{ "sve_dup $tmp, $src\n\t"
-            "sve_ptrue_lanecnt $dst\n\t"
+            "sve_ptrue $dst, vector_length\n\t"
             "sve_cmpne $dst, $dst, $tmp, 0\t# mask all (sve) (B/H/S)" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -481,7 +481,7 @@ instruct vmaskAllL(pRegGov dst, iRegL src, vReg tmp, rFlagsReg cr) %{
   effect(TEMP tmp, KILL cr);
   ins_cost(3 * SVE_COST);
   format %{ "sve_dup $tmp, $src\n\t"
-            "sve_ptrue_lanecnt $dst\n\t"
+            "sve_ptrue $dst, vector_length\n\t"
             "sve_cmpne $dst, $dst, $tmp, 0\t# mask all (sve) (D)" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -591,7 +591,7 @@ instruct reinterpretResize(vReg dst, vReg src, pRegGov pgtmp, rFlagsReg cr) %{
                                   length_in_bytes_src : length_in_bytes_dst;
     assert(length_in_bytes_src <= MaxVectorSize && length_in_bytes_dst <= MaxVectorSize,
            "invalid vector length");
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ B, length_in_bytes_resize);
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ B, length_in_bytes_resize);
     __ sve_dup(as_FloatRegister($dst$$reg), __ B, 0);
     __ sve_sel(as_FloatRegister($dst$$reg), __ B, as_PRegister($pgtmp$$reg),
                as_FloatRegister($src$$reg), as_FloatRegister($dst$$reg));
@@ -2201,7 +2201,7 @@ instruct vloadmask_loadV_partial(pRegGov dst, indirect mem, vReg vtmp, pRegGov p
     // expected vector element type. Convert the vector to predicate.
     BasicType to_vect_bt = Matcher::vector_element_basic_type(this);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(to_vect_bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this));
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, as_FloatRegister($vtmp$$reg),
                           as_PRegister($ptmp$$reg), T_BOOLEAN, to_vect_bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
@@ -2248,7 +2248,7 @@ instruct storeV_vstoremask_partial(indirect mem, pRegGov src, vReg vtmp,
     BasicType from_vect_bt = Matcher::vector_element_basic_type(this, $src);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(from_vect_bt);
     __ sve_cpy(as_FloatRegister($vtmp$$reg), size, as_PRegister($src$$reg), 1, false);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, as_FloatRegister($vtmp$$reg),
                           as_PRegister($ptmp$$reg), T_BOOLEAN, from_vect_bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
@@ -2326,8 +2326,7 @@ instruct reduce_addI_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegD vt
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -2344,8 +2343,7 @@ instruct reduce_addL_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD vtmp,
   ins_cost(2 * SVE_COST);
   format %{ "sve_reduce_addL $dst, $src1, $src2\t# addL reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -2361,8 +2359,7 @@ instruct reduce_addF_partial(vRegF src1_dst, vReg src2, pRegGov ptmp, rFlagsReg
   effect(TEMP ptmp, KILL cr);
   format %{ "sve_reduce_addF $src1_dst, $src1_dst, $src2\t# addF reduction partial (sve) (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src2));
     __ sve_fadda(as_FloatRegister($src1_dst$$reg), __ S,
                  as_PRegister($ptmp$$reg), as_FloatRegister($src2$$reg));
   %}
@@ -2377,8 +2374,7 @@ instruct reduce_addD_partial(vRegD src1_dst, vReg src2, pRegGov ptmp, rFlagsReg
   effect(TEMP ptmp, KILL cr);
   format %{ "sve_reduce_addD $src1_dst, $src1_dst, $src2\t# addD reduction partial (sve) (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_fadda(as_FloatRegister($src1_dst$$reg), __ D,
                  as_PRegister($ptmp$$reg), as_FloatRegister($src2$$reg));
   %}
@@ -2455,8 +2451,7 @@ instruct reduce_addI_masked_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, v
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
@@ -2475,8 +2470,7 @@ instruct reduce_addL_masked_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_addL $dst, $src1, $pg, $src2\t# addL reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
@@ -2494,8 +2488,7 @@ instruct reduce_addF_masked_partial(vRegF src1_dst, vReg src2, pRegGov pg, pRegG
   ins_cost(SVE_COST);
   format %{ "sve_reduce_addF $src1_dst, $pg, $src2\t# addF reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_fadda(as_FloatRegister($src1_dst$$reg), __ S,
@@ -2512,8 +2505,7 @@ instruct reduce_addD_masked_partial(vRegD src1_dst, vReg src2, pRegGov pg, pRegG
   ins_cost(SVE_COST);
   format %{ "sve_reduce_addD $src1_dst, $pg, $src2\t# addD reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_fadda(as_FloatRegister($src1_dst$$reg), __ D,
@@ -2569,8 +2561,7 @@ instruct reduce_andI_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegD vt
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -2588,8 +2579,7 @@ instruct reduce_andL_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD vtmp,
   ins_cost(2 * SVE_COST);
   format %{ "sve_reduce_andL $dst, $src1, $src2\t# andL reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -2644,8 +2634,7 @@ instruct reduce_andI_masked_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, v
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
@@ -2665,8 +2654,7 @@ instruct reduce_andL_masked_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_andL $dst, $src1, $pg, $src2\t# andL reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
@@ -2723,8 +2711,7 @@ instruct reduce_orI_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegD vtm
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -2742,8 +2729,7 @@ instruct reduce_orL_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD vtmp,
   ins_cost(2 * SVE_COST);
   format %{ "sve_reduce_orL $dst, $src1, $src2\t# orL reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -2798,8 +2784,7 @@ instruct reduce_orI_masked_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vR
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
@@ -2819,8 +2804,7 @@ instruct reduce_orL_masked_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD v
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_orL $dst, $src1, $pg, $src2\t# orL reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
@@ -2877,8 +2861,7 @@ instruct reduce_eorI_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegD vt
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -2896,8 +2879,7 @@ instruct reduce_eorL_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD vtmp,
   ins_cost(2 * SVE_COST);
   format %{ "sve_reduce_eorL $dst, $src1, $src2\t# eorL reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -2952,8 +2934,7 @@ instruct reduce_eorI_masked_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, v
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
@@ -2973,8 +2954,7 @@ instruct reduce_eorL_masked_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_eorL $dst, $src1, $pg, $src2\t# eorL reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
@@ -3033,8 +3013,7 @@ instruct reduce_maxI_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegD vt
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -3052,8 +3031,7 @@ instruct reduce_maxL_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD vtmp,
   ins_cost(2 * SVE_COST);
   format %{ "sve_reduce_maxL $dst, $src1, $src2\t# maxL reduction  partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -3086,8 +3064,7 @@ instruct reduce_maxF_partial(vRegF dst, vRegF src1, vReg src2,
   effect(TEMP_DEF dst, TEMP ptmp, KILL cr);
   format %{ "sve_reduce_maxF $dst, $src1, $src2\t# maxF reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src2));
     __ sve_fmaxv(as_FloatRegister($dst$$reg), __ S, as_PRegister($ptmp$$reg), as_FloatRegister($src2$$reg));
     __ fmaxs(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg));
   %}
@@ -3119,8 +3096,7 @@ instruct reduce_maxD_partial(vRegD dst, vRegD src1, vReg src2,
   effect(TEMP_DEF dst, TEMP ptmp, KILL cr);
   format %{ "sve_reduce_maxD $dst, $src1, $src2\t# maxD reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_fmaxv(as_FloatRegister($dst$$reg), __ D, as_PRegister($ptmp$$reg), as_FloatRegister($src2$$reg));
     __ fmaxd(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg));
   %}
@@ -3178,8 +3154,7 @@ instruct reduce_maxI_masked_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, v
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
@@ -3199,8 +3174,7 @@ instruct reduce_maxL_masked_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_maxL $dst, $src1, $pg, $src2\t# maxL reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
@@ -3250,8 +3224,7 @@ instruct reduce_maxF_masked_partial(vRegF dst, vRegF src1, vReg src2, pRegGov pg
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_maxF $dst, $src1, $pg, $src2\t# maxF reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_fmaxv(as_FloatRegister($dst$$reg), __ S,
@@ -3271,8 +3244,7 @@ instruct reduce_maxD_masked_partial(vRegD dst, vRegD src1, vReg src2, pRegGov pg
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_maxD $dst, $src1, $pg, $src2\t# maxD reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_fmaxv(as_FloatRegister($dst$$reg), __ D,
@@ -3331,8 +3303,7 @@ instruct reduce_minI_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegD vt
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -3350,8 +3321,7 @@ instruct reduce_minL_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD vtmp,
   ins_cost(2 * SVE_COST);
   format %{ "sve_reduce_minL $dst, $src1, $src2\t# minL reduction  partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -3384,8 +3354,7 @@ instruct reduce_minF_partial(vRegF dst, vRegF src1, vReg src2,
   effect(TEMP_DEF dst, TEMP ptmp, KILL cr);
   format %{ "sve_reduce_minF $dst, $src1, $src2\t# minF reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src2));
     __ sve_fminv(as_FloatRegister($dst$$reg), __ S, as_PRegister($ptmp$$reg), as_FloatRegister($src2$$reg));
     __ fmins(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg));
   %}
@@ -3417,8 +3386,7 @@ instruct reduce_minD_partial(vRegD dst, vRegD src1, vReg src2,
   effect(TEMP_DEF dst, TEMP ptmp, KILL cr);
   format %{ "sve_reduce_minD $dst, $src1, $src2\t# minD reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_fminv(as_FloatRegister($dst$$reg), __ D, as_PRegister($ptmp$$reg), as_FloatRegister($src2$$reg));
     __ fmind(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg));
   %}
@@ -3476,8 +3444,7 @@ instruct reduce_minI_masked_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, v
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
@@ -3497,8 +3464,7 @@ instruct reduce_minL_masked_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_minL $dst, $src1, $pg, $src2\t# minL reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
@@ -3548,8 +3514,7 @@ instruct reduce_minF_masked_partial(vRegF dst, vRegF src1, vReg src2, pRegGov pg
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_minF $dst, $src1, $pg, $src2\t# minF reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_fminv(as_FloatRegister($dst$$reg), __ S,
@@ -3569,8 +3534,7 @@ instruct reduce_minD_masked_partial(vRegD dst, vRegD src1, vReg src2, pRegGov pg
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_minD $dst, $src1, $pg, $src2\t# minD reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_fminv(as_FloatRegister($dst$$reg), __ D,
@@ -5128,8 +5092,7 @@ instruct vtest_alltrue_partial(iRegINoSp dst, pRegGov src1, pRegGov src2, pRegGo
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src1);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size,
-                          Matcher::vector_length(this, $src1));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src1));
     __ sve_eors(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
           as_PRegister($src1$$reg), as_PRegister($src2$$reg));
     __ csetw(as_Register($dst$$reg), Assembler::EQ);
@@ -5149,8 +5112,7 @@ instruct vtest_anytrue_partial(iRegINoSp dst, pRegGov src1, pRegGov src2, pRegGo
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src1);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size,
-                          Matcher::vector_length(this, $src1));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src1));
     __ sve_ands(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
           as_PRegister($src1$$reg), as_PRegister($src2$$reg));
     __ csetw(as_Register($dst$$reg), Assembler::NE);
@@ -5385,7 +5347,7 @@ instruct gatherI_partial(vReg dst, indirect mem, vReg idx, pRegGov ptmp, rFlagsR
   ins_cost(2 * SVE_COST + INSN_COST);
   format %{ "load_vector_gather $dst, $ptmp, $mem, $idx\t# vector load gather partial (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this));
     __ sve_ld1w_gather(as_FloatRegister($dst$$reg), as_PRegister($ptmp$$reg),
                        as_Register($mem$$base), as_FloatRegister($idx$$reg));
   %}
@@ -5402,8 +5364,7 @@ instruct gatherL_partial(vReg dst, indirect mem, vReg idx, pRegGov ptmp, rFlagsR
   ins_cost(3 * SVE_COST + INSN_COST);
   format %{ "load_vector_gather $dst, $ptmp, $mem, $idx\t# vector load gather partial (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this));
     __ sve_uunpklo(as_FloatRegister($idx$$reg), __ D, as_FloatRegister($idx$$reg));
     __ sve_ld1d_gather(as_FloatRegister($dst$$reg), as_PRegister($ptmp$$reg),
                        as_Register($mem$$base), as_FloatRegister($idx$$reg));
@@ -5456,8 +5417,7 @@ instruct gatherI_masked_partial(vReg dst, indirect mem, vReg idx, pRegGov pg, pR
   ins_cost(3 * SVE_COST);
   format %{ "load_vector_gather $dst, $pg, $mem, $idx\t# vector load gather predicated partial (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_ld1w_gather(as_FloatRegister($dst$$reg), as_PRegister($ptmp$$reg),
@@ -5476,7 +5436,7 @@ instruct gatherL_masked_partial(vReg dst, indirect mem, vReg idx, pRegGov pg, pR
   ins_cost(4 * SVE_COST);
   format %{ "load_vector_gather $dst, $pg, $mem, $idx\t# vector load gather predicated partial (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_uunpklo(as_FloatRegister($idx$$reg), __ D, as_FloatRegister($idx$$reg));
@@ -5531,8 +5491,7 @@ instruct scatterI_partial(indirect mem, vReg src, vReg idx, pRegGov ptmp, rFlags
   ins_cost(2 * SVE_COST + INSN_COST);
   format %{ "store_vector_scatter $mem, $ptmp, $idx, $src\t# vector store scatter partial (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src));
     __ sve_st1w_scatter(as_FloatRegister($src$$reg), as_PRegister($ptmp$$reg),
                         as_Register($mem$$base), as_FloatRegister($idx$$reg));
   %}
@@ -5549,8 +5508,7 @@ instruct scatterL_partial(indirect mem, vReg src, vReg idx, pRegGov ptmp, rFlags
   ins_cost(3 * SVE_COST + INSN_COST);
   format %{ "store_vector_scatter $mem, $ptmp, $idx, $src\t# vector store scatter partial (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src));
     __ sve_uunpklo(as_FloatRegister($idx$$reg), __ D, as_FloatRegister($idx$$reg));
     __ sve_st1d_scatter(as_FloatRegister($src$$reg), as_PRegister($ptmp$$reg),
                         as_Register($mem$$base), as_FloatRegister($idx$$reg));
@@ -5603,8 +5561,7 @@ instruct scatterI_masked_partial(indirect mem, vReg src, vReg idx, pRegGov pg, p
   ins_cost(3 * SVE_COST);
   format %{ "store_vector_scatter $mem, $pg, $idx, $src\t# vector store scatter predicated partial (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_st1w_scatter(as_FloatRegister($src$$reg), as_PRegister($ptmp$$reg),
@@ -5623,8 +5580,7 @@ instruct scatterL_masked_partial(indirect mem, vReg src, vReg idx, pRegGov pg, p
   ins_cost(4 * SVE_COST);
   format %{ "store_vector_scatter $mem, $pg, $idx, $src\t# vector store scatter predicated partial (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_uunpklo(as_FloatRegister($idx$$reg), __ D, as_FloatRegister($idx$$reg));
@@ -5742,7 +5698,7 @@ instruct vmask_truecount_partial(iRegINoSp dst, pReg src, pReg ptmp, rFlagsReg c
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
     __ sve_cntp($dst$$Register, size, as_PRegister($ptmp$$reg), as_PRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -5758,7 +5714,7 @@ instruct vmask_firsttrue_partial(iRegINoSp dst, pReg src, pReg ptmp1, pReg ptmp2
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp1$$reg), size,
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp1$$reg), size,
                           Matcher::vector_length(this, $src));
     __ sve_brkb(as_PRegister($ptmp2$$reg), as_PRegister($ptmp1$$reg), as_PRegister($src$$reg), false);
     __ sve_cntp($dst$$Register, size, as_PRegister($ptmp1$$reg), as_PRegister($ptmp2$$reg));
@@ -5776,7 +5732,7 @@ instruct vmask_lasttrue_partial(iRegINoSp dst, pReg src, pReg ptmp, rFlagsReg cr
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
     __ sve_and(as_PRegister($ptmp$$reg), ptrue, as_PRegister($ptmp$$reg), as_PRegister($src$$reg));
     __ sve_vmask_lasttrue($dst$$Register, bt, as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg));
   %}
diff --git a/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
index f4723183ac2..8b0a56d0f30 100644
--- a/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
@@ -242,12 +242,12 @@ instruct loadV_partial(vReg dst, vmemA mem, pRegGov pgtmp, rFlagsReg cr) %{
   match(Set dst (LoadVector mem));
   effect(TEMP pgtmp, KILL cr);
   ins_cost(6 * SVE_COST);
-  format %{ "sve_whilelo_zr_imm $pgtmp, vector_length\n\t"
+  format %{ "sve_ptrue $pgtmp, vector_length\n\t"
             "sve_ldr $dst, $pgtmp, $mem\t# load vector partial" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
-                          Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
+                         Matcher::vector_length(this));
     FloatRegister dst_reg = as_FloatRegister($dst$$reg);
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, dst_reg,
                           as_PRegister($pgtmp$$reg), bt, bt, $mem->opcode(),
@@ -262,12 +262,12 @@ instruct storeV_partial(vReg src, vmemA mem, pRegGov pgtmp, rFlagsReg cr) %{
   match(Set mem (StoreVector mem src));
   effect(TEMP pgtmp, KILL cr);
   ins_cost(5 * SVE_COST);
-  format %{ "sve_whilelo_zr_imm $pgtmp, vector_length\n\t"
+  format %{ "sve_ptrue $pgtmp, vector_length\n\t"
             "sve_str $src, $pgtmp, $mem\t# store vector partial" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
+                         Matcher::vector_length(this, $src));
     FloatRegister src_reg = as_FloatRegister($src$$reg);
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, src_reg,
                           as_PRegister($pgtmp$$reg), bt, bt, $mem->opcode(),
@@ -302,8 +302,8 @@ instruct loadV_masked_partial(vReg dst, vmemA mem, pRegGov pg, pRegGov pgtmp, rF
   format %{ "sve_ldr $dst, $pg, $mem\t# load vector predicated partial (sve)" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
-                          Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
+                         Matcher::vector_length(this));
     __ sve_and(as_PRegister($pgtmp$$reg), as_PRegister($pgtmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, as_FloatRegister($dst$$reg),
@@ -337,8 +337,8 @@ instruct storeV_masked_partial(vReg src, vmemA mem, pRegGov pg, pRegGov pgtmp, r
   format %{ "sve_str $mem, $pg, $src\t# store vector predicated partial (sve)" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ elemType_to_regVariant(bt),
+                         Matcher::vector_length(this, $src));
     __ sve_and(as_PRegister($pgtmp$$reg), as_PRegister($pgtmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, as_FloatRegister($src$$reg),
@@ -380,7 +380,7 @@ instruct vmaskAll$1(pRegGov dst, ifelse($1, `I', iRegIorL2I, iRegL) src, vReg tm
   effect(TEMP tmp, KILL cr);
   ins_cost(3 * SVE_COST);
   format %{ "sve_dup $tmp, $src\n\t"
-            "sve_ptrue_lanecnt $dst\n\t"
+            "sve_ptrue $dst, vector_length\n\t"
             "sve_cmpne $dst, $dst, $tmp, 0\t# mask all (sve) ($2)" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -473,7 +473,7 @@ instruct reinterpretResize(vReg dst, vReg src, pRegGov pgtmp, rFlagsReg cr) %{
                                   length_in_bytes_src : length_in_bytes_dst;
     assert(length_in_bytes_src <= MaxVectorSize && length_in_bytes_dst <= MaxVectorSize,
            "invalid vector length");
-    __ sve_whilelo_zr_imm(as_PRegister($pgtmp$$reg), __ B, length_in_bytes_resize);
+    __ sve_ptrue_lanecnt(as_PRegister($pgtmp$$reg), __ B, length_in_bytes_resize);
     __ sve_dup(as_FloatRegister($dst$$reg), __ B, 0);
     __ sve_sel(as_FloatRegister($dst$$reg), __ B, as_PRegister($pgtmp$$reg),
                as_FloatRegister($src$$reg), as_FloatRegister($dst$$reg));
@@ -1262,7 +1262,7 @@ instruct vloadmask_loadV_partial(pRegGov dst, indirect mem, vReg vtmp, pRegGov p
     // expected vector element type. Convert the vector to predicate.
     BasicType to_vect_bt = Matcher::vector_element_basic_type(this);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(to_vect_bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this));
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), false, as_FloatRegister($vtmp$$reg),
                           as_PRegister($ptmp$$reg), T_BOOLEAN, to_vect_bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
@@ -1309,7 +1309,7 @@ instruct storeV_vstoremask_partial(indirect mem, pRegGov src, vReg vtmp,
     BasicType from_vect_bt = Matcher::vector_element_basic_type(this, $src);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(from_vect_bt);
     __ sve_cpy(as_FloatRegister($vtmp$$reg), size, as_PRegister($src$$reg), 1, false);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
     loadStoreA_predicated(C2_MacroAssembler(&cbuf), true, as_FloatRegister($vtmp$$reg),
                           as_PRegister($ptmp$$reg), T_BOOLEAN, from_vect_bt, $mem->opcode(),
                           as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
@@ -1381,8 +1381,7 @@ instruct reduce_$1I_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegD vtm
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -1406,8 +1405,7 @@ instruct reduce_$1L_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD vtmp,
   ins_cost(2 * SVE_COST);
   format %{ "sve_reduce_$1L $dst, $src1, $src2\t# $1L reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -1443,8 +1441,7 @@ instruct reduce_$1_partial($3 src1_dst, vReg src2, pRegGov ptmp, rFlagsReg cr) %
   effect(TEMP ptmp, KILL cr);
   format %{ "sve_reduce_$1 $src1_dst, $src1_dst, $src2\t# $1 reduction partial (sve) ($4)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ $4,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ $4, Matcher::vector_length(this, $src2));
     __ sve_fadda(as_FloatRegister($src1_dst$$reg), __ $4,
                  as_PRegister($ptmp$$reg), as_FloatRegister($src2$$reg));
   %}
@@ -1515,8 +1512,7 @@ instruct reduce_$1I_masked_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vR
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
@@ -1542,8 +1538,7 @@ instruct reduce_$1L_masked_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD v
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_$1L $dst, $src1, $pg, $src2\t# $1L reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
@@ -1580,8 +1575,7 @@ instruct reduce_$1_masked_partial($3 src1_dst, vReg src2, pRegGov pg, pRegGov pt
   ins_cost(SVE_COST);
   format %{ "sve_reduce_$1 $src1_dst, $pg, $src2\t# $1 reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ $4,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ $4, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_fadda(as_FloatRegister($src1_dst$$reg), __ $4,
@@ -1704,8 +1698,7 @@ instruct reduce_$1I_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegD vtm
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -1726,8 +1719,7 @@ instruct reduce_$1L_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD vtmp,
   ins_cost(2 * SVE_COST);
   format %{ "sve_reduce_$1L $dst, $src1, $src2\t# $1L reduction  partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
                            $src1$$Register, as_FloatRegister($src2$$reg),
                            as_PRegister($ptmp$$reg), as_FloatRegister($vtmp$$reg));
@@ -1793,8 +1785,7 @@ instruct reduce_$1I_masked_partial(iRegINoSp dst, iRegIorL2I src1, vReg src2, vR
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     Assembler::SIMD_RegVariant variant = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), variant,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), variant, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
@@ -1817,8 +1808,7 @@ instruct reduce_$1L_masked_partial(iRegLNoSp dst, iRegL src1, vReg src2, vRegD v
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_$1L $dst, $src1, $pg, $src2\t# $1L reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
@@ -1859,8 +1849,7 @@ instruct reduce_$1$2_partial($5 dst, $5 src1, vReg src2,
   effect(TEMP_DEF dst, TEMP ptmp, KILL cr);
   format %{ "sve_reduce_$1$2 $dst, $src1, $src2\t# $1$2 reduction partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ $4,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ $4, Matcher::vector_length(this, $src2));
     __ sve_f$1v(as_FloatRegister($dst$$reg), __ $4, as_PRegister($ptmp$$reg), as_FloatRegister($src2$$reg));
     __ f`$1'translit($4, `SD', `sd')(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg));
   %}
@@ -1898,8 +1887,7 @@ instruct reduce_$1$2_masked_partial($5 dst, $5 src1, vReg src2, pRegGov pg,
   ins_cost(3 * SVE_COST);
   format %{ "sve_reduce_$1$2 $dst, $src1, $pg, $src2\t# $1$2 reduction predicated partial (sve)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ $4,
-                          Matcher::vector_length(this, $src2));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ $4, Matcher::vector_length(this, $src2));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_f$1v(as_FloatRegister($dst$$reg), __ $4,
@@ -2603,8 +2591,7 @@ instruct vtest_$1_partial`'(iRegINoSp dst, pRegGov src1, pRegGov src2, pRegGov p
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src1);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size,
-                          Matcher::vector_length(this, $src1));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src1));
     __ $3(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
           as_PRegister($src1$$reg), as_PRegister($src2$$reg));
     __ csetw(as_Register($dst$$reg), Assembler::$4);
@@ -2826,7 +2813,7 @@ instruct gatherI_partial(vReg dst, indirect mem, vReg idx, pRegGov ptmp, rFlagsR
   ins_cost(2 * SVE_COST + INSN_COST);
   format %{ "load_vector_gather $dst, $ptmp, $mem, $idx\t# vector load gather partial (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this));
     __ sve_ld1w_gather(as_FloatRegister($dst$$reg), as_PRegister($ptmp$$reg),
                        as_Register($mem$$base), as_FloatRegister($idx$$reg));
   %}
@@ -2843,8 +2830,7 @@ instruct gatherL_partial(vReg dst, indirect mem, vReg idx, pRegGov ptmp, rFlagsR
   ins_cost(3 * SVE_COST + INSN_COST);
   format %{ "load_vector_gather $dst, $ptmp, $mem, $idx\t# vector load gather partial (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this));
     __ sve_uunpklo(as_FloatRegister($idx$$reg), __ D, as_FloatRegister($idx$$reg));
     __ sve_ld1d_gather(as_FloatRegister($dst$$reg), as_PRegister($ptmp$$reg),
                        as_Register($mem$$base), as_FloatRegister($idx$$reg));
@@ -2897,8 +2883,7 @@ instruct gatherI_masked_partial(vReg dst, indirect mem, vReg idx, pRegGov pg, pR
   ins_cost(3 * SVE_COST);
   format %{ "load_vector_gather $dst, $pg, $mem, $idx\t# vector load gather predicated partial (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_ld1w_gather(as_FloatRegister($dst$$reg), as_PRegister($ptmp$$reg),
@@ -2917,7 +2902,7 @@ instruct gatherL_masked_partial(vReg dst, indirect mem, vReg idx, pRegGov pg, pR
   ins_cost(4 * SVE_COST);
   format %{ "load_vector_gather $dst, $pg, $mem, $idx\t# vector load gather predicated partial (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_uunpklo(as_FloatRegister($idx$$reg), __ D, as_FloatRegister($idx$$reg));
@@ -2972,8 +2957,7 @@ instruct scatterI_partial(indirect mem, vReg src, vReg idx, pRegGov ptmp, rFlags
   ins_cost(2 * SVE_COST + INSN_COST);
   format %{ "store_vector_scatter $mem, $ptmp, $idx, $src\t# vector store scatter partial (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src));
     __ sve_st1w_scatter(as_FloatRegister($src$$reg), as_PRegister($ptmp$$reg),
                         as_Register($mem$$base), as_FloatRegister($idx$$reg));
   %}
@@ -2990,8 +2974,7 @@ instruct scatterL_partial(indirect mem, vReg src, vReg idx, pRegGov ptmp, rFlags
   ins_cost(3 * SVE_COST + INSN_COST);
   format %{ "store_vector_scatter $mem, $ptmp, $idx, $src\t# vector store scatter partial (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src));
     __ sve_uunpklo(as_FloatRegister($idx$$reg), __ D, as_FloatRegister($idx$$reg));
     __ sve_st1d_scatter(as_FloatRegister($src$$reg), as_PRegister($ptmp$$reg),
                         as_Register($mem$$base), as_FloatRegister($idx$$reg));
@@ -3044,8 +3027,7 @@ instruct scatterI_masked_partial(indirect mem, vReg src, vReg idx, pRegGov pg, p
   ins_cost(3 * SVE_COST);
   format %{ "store_vector_scatter $mem, $pg, $idx, $src\t# vector store scatter predicated partial (S)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ S,
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ S, Matcher::vector_length(this, $src));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_st1w_scatter(as_FloatRegister($src$$reg), as_PRegister($ptmp$$reg),
@@ -3064,8 +3046,7 @@ instruct scatterL_masked_partial(indirect mem, vReg src, vReg idx, pRegGov pg, p
   ins_cost(4 * SVE_COST);
   format %{ "store_vector_scatter $mem, $pg, $idx, $src\t# vector store scatter predicated partial (D)" %}
   ins_encode %{
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), __ D,
-                          Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), __ D, Matcher::vector_length(this, $src));
     __ sve_and(as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg),
                as_PRegister($pg$$reg), as_PRegister($pg$$reg));
     __ sve_uunpklo(as_FloatRegister($idx$$reg), __ D, as_FloatRegister($idx$$reg));
@@ -3169,7 +3150,7 @@ instruct vmask_truecount_partial(iRegINoSp dst, pReg src, pReg ptmp, rFlagsReg c
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
     __ sve_cntp($dst$$Register, size, as_PRegister($ptmp$$reg), as_PRegister($src$$reg));
   %}
   ins_pipe(pipe_slow);
@@ -3185,7 +3166,7 @@ instruct vmask_firsttrue_partial(iRegINoSp dst, pReg src, pReg ptmp1, pReg ptmp2
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp1$$reg), size,
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp1$$reg), size,
                           Matcher::vector_length(this, $src));
     __ sve_brkb(as_PRegister($ptmp2$$reg), as_PRegister($ptmp1$$reg), as_PRegister($src$$reg), false);
     __ sve_cntp($dst$$Register, size, as_PRegister($ptmp1$$reg), as_PRegister($ptmp2$$reg));
@@ -3203,7 +3184,7 @@ instruct vmask_lasttrue_partial(iRegINoSp dst, pReg src, pReg ptmp, rFlagsReg cr
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src);
     Assembler::SIMD_RegVariant size = __ elemType_to_regVariant(bt);
-    __ sve_whilelo_zr_imm(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
+    __ sve_ptrue_lanecnt(as_PRegister($ptmp$$reg), size, Matcher::vector_length(this, $src));
     __ sve_and(as_PRegister($ptmp$$reg), ptrue, as_PRegister($ptmp$$reg), as_PRegister($src$$reg));
     __ sve_vmask_lasttrue($dst$$Register, bt, as_PRegister($ptmp$$reg), as_PRegister($ptmp$$reg));
   %}
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index e31fa7df080..44eebc538b6 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,14 +91,6 @@
   // in the range of [0, lane_cnt), or to false otherwise.
   void sve_ptrue_lanecnt(PRegister dst, SIMD_RegVariant size, int lane_cnt);
 
-  // Generate predicate through whilelo, by comparing ZR with an unsigned
-  // immediate. rscratch1 will be clobbered.
-  inline void sve_whilelo_zr_imm(PRegister pd, SIMD_RegVariant size, uint imm) {
-    assert(UseSVE > 0, "not supported");
-    mov(rscratch1, imm);
-    sve_whilelo(pd, size, zr, rscratch1);
-  }
-
   // Extract a scalar element from an sve vector at position 'idx'.
   // rscratch1 will be clobbered.
   // T could be FloatRegister or Register.
-- 
GitLab


From a3223cb6839dbed2476c928572d89dad84dc4636 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 30 Mar 2022 15:15:13 +0000
Subject: [PATCH 273/345] 8283999: Update JMH devkit to 1.35

Reviewed-by: erikj, redestad
---
 make/devkit/createJMHBundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/devkit/createJMHBundle.sh b/make/devkit/createJMHBundle.sh
index 059fb7acb6f..5744863958c 100644
--- a/make/devkit/createJMHBundle.sh
+++ b/make/devkit/createJMHBundle.sh
@@ -26,7 +26,7 @@
 # Create a bundle in the build directory, containing what's needed to
 # build and run JMH microbenchmarks from the OpenJDK build.
 
-JMH_VERSION=1.34
+JMH_VERSION=1.35
 COMMONS_MATH3_VERSION=3.2
 JOPT_SIMPLE_VERSION=4.6
 
-- 
GitLab


From d9d19e96b1c453f2e52c83de61f593810a5ed1e3 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Wed, 30 Mar 2022 15:17:33 +0000
Subject: [PATCH 274/345] 8284015: ProblemList containers/docker/TestJcmd.java
 on linux-x64

Reviewed-by: bpb, hseigel
---
 test/hotspot/jtreg/ProblemList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 870f1d3c596..9eed27fa967 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -105,7 +105,7 @@ runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
 
 applications/jcstress/copy.java 8229852 linux-all
 
-containers/docker/TestJcmd.java 8278102 linux-aarch64
+containers/docker/TestJcmd.java 8278102 linux-all
 
 #############################################################################
 
-- 
GitLab


From ae57258b46b8b6953148cd8cf71faf75eef118da Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Wed, 30 Mar 2022 15:50:31 +0000
Subject: [PATCH 275/345] 8283715: Update ObjectStreamClass to be final

Reviewed-by: darcy, jpai, mchung, dfuchs
---
 .../share/classes/java/io/ObjectStreamClass.java  |  2 +-
 .../reflect/CallerSensitive/CheckCSMs.java        | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/io/ObjectStreamClass.java b/src/java.base/share/classes/java/io/ObjectStreamClass.java
index c41e8b1744a..9a3f96d0785 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java
@@ -80,7 +80,7 @@ import static java.io.ObjectStreamField.*;
  *      <cite>Java Object Serialization Specification,</cite> Section 4, "Class Descriptors"</a>
  * @since   1.1
  */
-public class ObjectStreamClass implements Serializable {
+public final class ObjectStreamClass implements Serializable {
 
     /** serialPersistentFields value indicating no serializable fields */
     public static final ObjectStreamField[] NO_FIELDS =
diff --git a/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java b/test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java
index 35dfb8d19c3..0a9d75e27a8 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,6 @@ public class CheckCSMs {
     // over time.  Do not add any new one to this list.
     private static Set<String> KNOWN_NON_FINAL_CSMS =
         Set.of("java/io/ObjectStreamField#getType ()Ljava/lang/Class;",
-               "java/io/ObjectStreamClass#forClass ()Ljava/lang/Class;",
                "java/lang/Runtime#load (Ljava/lang/String;)V",
                "java/lang/Runtime#loadLibrary (Ljava/lang/String;)V",
                "java/lang/Thread#getContextClassLoader ()Ljava/lang/ClassLoader;",
@@ -91,11 +90,13 @@ public class CheckCSMs {
         CheckCSMs checkCSMs = new CheckCSMs();
         Set<String> result = checkCSMs.run(getPlatformClasses());
         if (!KNOWN_NON_FINAL_CSMS.equals(result)) {
-            Set<String> diff = new HashSet<>(result);
-            diff.removeAll(KNOWN_NON_FINAL_CSMS);
-            throw new RuntimeException("Unexpected non-final instance method: " +
-                result.stream().sorted()
-                      .collect(Collectors.joining("\n", "\n", "")));
+            Set<String> extras = new HashSet<>(result);
+            extras.removeAll(KNOWN_NON_FINAL_CSMS);
+            Set<String> missing = new HashSet<>(KNOWN_NON_FINAL_CSMS);
+            missing.removeAll(result);
+            throw new RuntimeException("Mismatch in non-final instance methods.\n" +
+                "Extra methods:\n" + String.join("\n", extras) + "\n" +
+                "Missing methods:\n" + String.join("\n", missing) + "\n");
         }
 
         // check if all csm methods with a trailing Class parameter are supported
-- 
GitLab


From 97c7298a39cdd683508617d904c83cc3261da15b Mon Sep 17 00:00:00 2001
From: Srinivas Mandalika <smandalika@openjdk.org>
Date: Wed, 30 Mar 2022 16:05:31 +0000
Subject: [PATCH 276/345] 8282046: Create a regression test for JDK-8000326

Reviewed-by: aivanov
---
 .../SetFocusTraversalKeysEnabledTest.java     | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 test/jdk/java/awt/Focus/8000326/SetFocusTraversalKeysEnabledTest.java

diff --git a/test/jdk/java/awt/Focus/8000326/SetFocusTraversalKeysEnabledTest.java b/test/jdk/java/awt/Focus/8000326/SetFocusTraversalKeysEnabledTest.java
new file mode 100644
index 00000000000..ee033f1c44d
--- /dev/null
+++ b/test/jdk/java/awt/Focus/8000326/SetFocusTraversalKeysEnabledTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8000326
+ * @key headful
+ * @summary Focus unable to traverse within the menubar
+ * @run main SetFocusTraversalKeysEnabledTest
+ */
+import java.awt.AWTException;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.ContainerOrderFocusTraversalPolicy;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+public class SetFocusTraversalKeysEnabledTest {
+
+    private static volatile JFrame jFrame;
+    private static volatile Component currentFocusOwner;
+
+    private static void doTest()
+        throws InvocationTargetException, InterruptedException, AWTException {
+        try {
+            SwingUtilities.invokeAndWait(() -> createGUI());
+            Robot robot = new Robot();
+            robot.setAutoDelay(500);
+            Component lastFocusOwner = null;
+            do {
+                robot.waitForIdle();
+                SwingUtilities.invokeAndWait(() -> currentFocusOwner = jFrame.getFocusOwner());
+
+                System.out.println("Focus owner is : " + currentFocusOwner.getClass().getName());
+                if (currentFocusOwner == lastFocusOwner) {
+                    throw new RuntimeException(
+                        "Problem moving focus from " + currentFocusOwner.getClass().getName());
+                }
+                lastFocusOwner = currentFocusOwner;
+                robot.keyPress(KeyEvent.VK_TAB);
+                robot.keyRelease(KeyEvent.VK_TAB);
+            } while (currentFocusOwner != jFrame);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> jFrame.dispose());
+        }
+    }
+
+    private static void createGUI() {
+        jFrame = new JFrame("Focus Traversal Test");
+        jFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+        JMenuBar jMenuBar = new JMenuBar();
+        jMenuBar.setFocusTraversalKeysEnabled(true);
+        jMenuBar.add(new JMenu("First Menu").add(new JMenuItem("First MenuItem")));
+
+        JButton northButton = new JButton("North Button");
+        JButton southButton = new JButton("South Button");
+
+        JPanel jPanel = new JPanel(new BorderLayout());
+        jPanel.add(northButton);
+        jPanel.add(jMenuBar, BorderLayout.NORTH);
+        jPanel.add(southButton, BorderLayout.SOUTH);
+
+        jFrame.getContentPane().add(jPanel);
+        jFrame.setFocusTraversalPolicy(new ContainerOrderFocusTraversalPolicy());
+        jFrame.pack();
+        northButton.requestFocusInWindow();
+        jFrame.setLocationRelativeTo(null);
+        jFrame.setVisible(true);
+    }
+
+    public static void main(String[] args) throws Exception {
+        doTest();
+    }
+}
+
-- 
GitLab


From a625bfdba45d49bc717bcc9be4112db93b50f50a Mon Sep 17 00:00:00 2001
From: bobpengxie <bobpengxie@tencent.com>
Date: Wed, 30 Mar 2022 17:06:38 +0000
Subject: [PATCH 277/345] 8283903: GetContainerCpuLoad does not return the
 correct result in share mode

Reviewed-by: jiefu, sgehwolf, kevinw, dholmes
---
 .../com/sun/management/internal/OperatingSystemImpl.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java b/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java
index 44679e9009e..85e9aa9f119 100644
--- a/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java
+++ b/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,7 +93,8 @@ class OperatingSystemImpl extends BaseOperatingSystemImpl
                 int totalCPUs = getHostOnlineCpuCount0();
                 int containerCPUs = getAvailableProcessors();
                 // scale the total host load to the actual container cpus
-                hostTicks = hostTicks * containerCPUs / totalCPUs;
+                double scaleFactor = ((double) containerCPUs) / totalCPUs;
+                hostTicks = (long) (hostTicks * scaleFactor);
                 return getUsageDividesTotal(cpuUsageSupplier().getAsLong(), hostTicks);
             } else {
                 // If CPU quotas and shares are not active then find the average load for
-- 
GitLab


From ec9ab558a393992d9188fd22d1e831649bd434aa Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Wed, 30 Mar 2022 17:09:17 +0000
Subject: [PATCH 278/345] 8282374: Java_sun_awt_X11_XlibWrapper_XSynchronize is
 wrong and unused

Reviewed-by: serb, prr
---
 .../unix/classes/sun/awt/X11/XlibWrapper.java            | 9 +--------
 .../unix/native/libawt_xawt/xawt/XlibWrapper.c           | 5 -----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
index a7ab4f3e830..7a23c806374 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -524,13 +524,6 @@ static native String XSetLocaleModifiers(String modifier_list);
     static native void XChangeActivePointerGrab(long display, int mask,
                                                 long cursor, long time);
 
-    /*
-      int (*XSynchronize(Display *display, Bool onoff))();
-          display   Specifies the connection to the X server.
-          onoff     Specifies a Boolean value that indicates whether to enable or disable synchronization.
-     */
-    static native int XSynchronize(long display, boolean onoff);
-
     /**
      * Extracts an X event that can be processed in a secondary loop.
      * Should only be called on the toolkit thread.
diff --git a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
index 851071db3e0..20f5f2b4fc7 100644
--- a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
+++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
@@ -2184,11 +2184,6 @@ Java_sun_awt_X11_XlibWrapper_copyLongArray(JNIEnv *env,
     }
 }
 
-JNIEXPORT jint JNICALL
-Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff)
-{
-    return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False));
-}
 
 JNIEXPORT jboolean JNICALL
 Java_sun_awt_X11_XlibWrapper_XShapeQueryExtension
-- 
GitLab


From e85fa2f04b17531862c2469597674d60ad25a19f Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 30 Mar 2022 17:26:03 +0000
Subject: [PATCH 279/345] 8283700: Add final or sealed modifier to appropriate
 java.awt API classes

Reviewed-by: darcy, aivanov, serb, psadhukhan
---
 .../share/classes/java/awt/GridBagLayoutInfo.java   |  2 +-
 .../share/classes/java/awt/PointerInfo.java         |  2 +-
 .../classes/java/awt/ScrollPaneAdjustable.java      |  2 +-
 .../share/classes/java/awt/TextArea.java            |  2 +-
 .../share/classes/java/awt/TextComponent.java       |  4 +++-
 .../share/classes/java/awt/TextField.java           |  2 +-
 .../share/classes/java/awt/desktop/AppEvent.java    | 13 ++++++++++++-
 .../share/classes/java/awt/desktop/FilesEvent.java  |  4 +++-
 .../classes/java/awt/dnd/DropTargetContext.java     |  2 +-
 .../share/classes/java/awt/event/InputEvent.java    |  4 +++-
 .../share/classes/java/awt/event/KeyEvent.java      |  2 +-
 .../share/classes/java/awt/event/MouseEvent.java    |  2 +-
 12 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java b/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java
index 64a283546c5..1a4ed2942c5 100644
--- a/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java
@@ -36,7 +36,7 @@ import java.io.Serial;
  * @see       java.awt.GridBagConstraints
  * @since 1.6
  */
-public class GridBagLayoutInfo implements java.io.Serializable {
+public final class GridBagLayoutInfo implements java.io.Serializable {
 
     /**
      * Use serialVersionUID from JDK 1.6 for interoperability.
diff --git a/src/java.desktop/share/classes/java/awt/PointerInfo.java b/src/java.desktop/share/classes/java/awt/PointerInfo.java
index 9b51d6ead36..7d74d884cf0 100644
--- a/src/java.desktop/share/classes/java/awt/PointerInfo.java
+++ b/src/java.desktop/share/classes/java/awt/PointerInfo.java
@@ -41,7 +41,7 @@ package java.awt;
  * @author Roman Poborchiy
  * @since 1.5
  */
-public class PointerInfo {
+public final class PointerInfo {
 
     private final GraphicsDevice device;
     private final Point location;
diff --git a/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java b/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java
index d2b3eebdebb..d8d70fd2476 100644
--- a/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java
+++ b/src/java.desktop/share/classes/java/awt/ScrollPaneAdjustable.java
@@ -40,7 +40,7 @@ import sun.awt.AWTAccessor;
  *
  * @since       1.4
  */
-public class ScrollPaneAdjustable implements Adjustable, Serializable {
+public final class ScrollPaneAdjustable implements Adjustable, Serializable {
 
     /**
      * The {@code ScrollPane} this object is a scrollbar of.
diff --git a/src/java.desktop/share/classes/java/awt/TextArea.java b/src/java.desktop/share/classes/java/awt/TextArea.java
index 4c7baa52e4e..fcf37543e5b 100644
--- a/src/java.desktop/share/classes/java/awt/TextArea.java
+++ b/src/java.desktop/share/classes/java/awt/TextArea.java
@@ -55,7 +55,7 @@ import javax.accessibility.AccessibleStateSet;
  * @author      Sami Shaio
  * @since       1.0
  */
-public class TextArea extends TextComponent {
+public non-sealed class TextArea extends TextComponent {
 
     /**
      * The number of rows in the {@code TextArea}.
diff --git a/src/java.desktop/share/classes/java/awt/TextComponent.java b/src/java.desktop/share/classes/java/awt/TextComponent.java
index b471b4e5ec6..b1ccc9bd87a 100644
--- a/src/java.desktop/share/classes/java/awt/TextComponent.java
+++ b/src/java.desktop/share/classes/java/awt/TextComponent.java
@@ -67,7 +67,9 @@ import sun.awt.InputMethodSupport;
  * @author      Arthur van Hoff
  * @since       1.0
  */
-public class TextComponent extends Component implements Accessible {
+public sealed class TextComponent extends Component implements Accessible
+     permits TextArea,
+             TextField {
 
     /**
      * The value of the text.
diff --git a/src/java.desktop/share/classes/java/awt/TextField.java b/src/java.desktop/share/classes/java/awt/TextField.java
index d2bfa0360b9..0d74f238a87 100644
--- a/src/java.desktop/share/classes/java/awt/TextField.java
+++ b/src/java.desktop/share/classes/java/awt/TextField.java
@@ -99,7 +99,7 @@ import javax.accessibility.AccessibleStateSet;
  * @see         java.awt.TextField#addActionListener
  * @since       1.0
  */
-public class TextField extends TextComponent {
+public non-sealed class TextField extends TextComponent {
 
     /**
      * The number of columns in the text field.
diff --git a/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java b/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java
index f2291b4c37b..aeb1a83ea76 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/AppEvent.java
@@ -37,7 +37,18 @@ import java.util.EventObject;
  *
  * @since 9
  */
-public class AppEvent extends EventObject {
+public sealed class AppEvent extends EventObject
+    permits AboutEvent,
+            AppForegroundEvent,
+            AppHiddenEvent,
+            AppReopenedEvent,
+            FilesEvent,
+            OpenURIEvent,
+            PreferencesEvent,
+            QuitEvent,
+            ScreenSleepEvent,
+            SystemSleepEvent,
+            UserSessionEvent {
 
     /**
      * Use serialVersionUID from JDK 9 for interoperability.
diff --git a/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java b/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java
index b53beb36230..9f07814f5ac 100644
--- a/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java
+++ b/src/java.desktop/share/classes/java/awt/desktop/FilesEvent.java
@@ -38,7 +38,9 @@ import java.util.List;
  *
  * @since 9
  */
-public class FilesEvent extends AppEvent {
+public sealed class FilesEvent extends AppEvent
+    permits OpenFilesEvent,
+            PrintFilesEvent {
 
     /**
      * Use serialVersionUID from JDK 9 for interoperability.
diff --git a/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java b/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java
index 8eac26a5fd2..ea31203b988 100644
--- a/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java
+++ b/src/java.desktop/share/classes/java/awt/dnd/DropTargetContext.java
@@ -53,7 +53,7 @@ import sun.awt.AWTAccessor.DropTargetContextAccessor;
  * @since 1.2
  */
 
-public class DropTargetContext implements Serializable {
+public final class DropTargetContext implements Serializable {
 
     /**
      * Use serialVersionUID from JDK 1.4 for interoperability.
diff --git a/src/java.desktop/share/classes/java/awt/event/InputEvent.java b/src/java.desktop/share/classes/java/awt/event/InputEvent.java
index a4f310dd08c..60d3b4d812d 100644
--- a/src/java.desktop/share/classes/java/awt/event/InputEvent.java
+++ b/src/java.desktop/share/classes/java/awt/event/InputEvent.java
@@ -57,7 +57,9 @@ import sun.util.logging.PlatformLogger;
  *
  * @since 1.1
  */
-public abstract class InputEvent extends ComponentEvent {
+public abstract sealed class InputEvent extends ComponentEvent
+    permits KeyEvent,
+            MouseEvent {
 
     private static final PlatformLogger logger = PlatformLogger.getLogger("java.awt.event.InputEvent");
 
diff --git a/src/java.desktop/share/classes/java/awt/event/KeyEvent.java b/src/java.desktop/share/classes/java/awt/event/KeyEvent.java
index 21bf7ec1716..37f386c8793 100644
--- a/src/java.desktop/share/classes/java/awt/event/KeyEvent.java
+++ b/src/java.desktop/share/classes/java/awt/event/KeyEvent.java
@@ -151,7 +151,7 @@ import sun.awt.AWTAccessor;
  *
  * @since 1.1
  */
-public class KeyEvent extends InputEvent {
+public non-sealed class KeyEvent extends InputEvent {
 
     /**
      * Stores the state of native event dispatching system
diff --git a/src/java.desktop/share/classes/java/awt/event/MouseEvent.java b/src/java.desktop/share/classes/java/awt/event/MouseEvent.java
index f681c906fa0..42b1fb9c39c 100644
--- a/src/java.desktop/share/classes/java/awt/event/MouseEvent.java
+++ b/src/java.desktop/share/classes/java/awt/event/MouseEvent.java
@@ -189,7 +189,7 @@ import sun.awt.SunToolkit;
  *
  * @since 1.1
  */
-public class MouseEvent extends InputEvent {
+public non-sealed class MouseEvent extends InputEvent {
 
     /**
      * The first number in the range of ids used for mouse events.
-- 
GitLab


From e61ccfba7fa747c24e34a7539871a34630693af5 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Wed, 30 Mar 2022 17:37:42 +0000
Subject: [PATCH 280/345] 8283470: Update java.lang.invoke.VarHandle to use
 sealed classes

Reviewed-by: darcy, psandoz
---
 .../java/lang/invoke/IndirectVarHandle.java   |  4 +-
 .../invoke/MemoryAccessVarHandleBase.java     | 12 +++++-
 .../classes/java/lang/invoke/VarHandle.java   | 43 ++++++++++++++++---
 .../lang/invoke/X-VarHandle.java.template     |  6 +--
 .../X-VarHandleByteArrayView.java.template    |  4 +-
 5 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/IndirectVarHandle.java b/src/java.base/share/classes/java/lang/invoke/IndirectVarHandle.java
index 23b7284b311..cad49e2c7db 100644
--- a/src/java.base/share/classes/java/lang/invoke/IndirectVarHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/IndirectVarHandle.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ import java.util.function.BiFunction;
  * (using the method handle combinator API) and then repackaging the adapted method handles into a new, indirect
  * var handle.
  */
-/* package */ class IndirectVarHandle extends VarHandle {
+/* package */ final class IndirectVarHandle extends VarHandle {
 
     @Stable
     private final MethodHandle[] handleMap = new MethodHandle[AccessMode.COUNT];
diff --git a/src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleBase.java b/src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleBase.java
index 7703c997fc3..6fbb7108eb7 100644
--- a/src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleBase.java
+++ b/src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,15 @@ package java.lang.invoke;
 /**
  * Base class for memory access var handle implementations.
  */
-abstract class MemoryAccessVarHandleBase extends VarHandle {
+abstract sealed class MemoryAccessVarHandleBase extends VarHandle permits
+        MemoryAccessVarHandleByteHelper,
+        MemoryAccessVarHandleCharHelper,
+        MemoryAccessVarHandleDoubleHelper,
+        MemoryAccessVarHandleFloatHelper,
+        MemoryAccessVarHandleIntHelper,
+        MemoryAccessVarHandleLongHelper,
+        MemoryAccessVarHandleShortHelper
+{
 
     /** endianness **/
     final boolean be;
diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/src/java.base/share/classes/java/lang/invoke/VarHandle.java
index 15dcf63b5c9..57094d32bb0 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,15 +31,10 @@ import java.lang.constant.ConstantDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.DirectMethodHandleDesc;
 import java.lang.constant.DynamicConstantDesc;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 
-import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.DontInline;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
@@ -476,7 +471,41 @@ import static java.lang.invoke.MethodHandleStatics.UNSAFE;
  * @see MethodType
  * @since 9
  */
-public abstract class VarHandle implements Constable {
+public abstract sealed class VarHandle implements Constable
+     permits IndirectVarHandle, MemoryAccessVarHandleBase,
+             VarHandleByteArrayAsChars.ByteArrayViewVarHandle,
+             VarHandleByteArrayAsDoubles.ByteArrayViewVarHandle,
+             VarHandleByteArrayAsFloats.ByteArrayViewVarHandle,
+             VarHandleByteArrayAsInts.ByteArrayViewVarHandle,
+             VarHandleByteArrayAsLongs.ByteArrayViewVarHandle,
+             VarHandleByteArrayAsShorts.ByteArrayViewVarHandle,
+             VarHandleBooleans.Array,
+             VarHandleBooleans.FieldInstanceReadOnly,
+             VarHandleBooleans.FieldStaticReadOnly,
+             VarHandleBytes.Array,
+             VarHandleBytes.FieldInstanceReadOnly,
+             VarHandleBytes.FieldStaticReadOnly,
+             VarHandleChars.Array,
+             VarHandleChars.FieldInstanceReadOnly,
+             VarHandleChars.FieldStaticReadOnly,
+             VarHandleDoubles.Array,
+             VarHandleDoubles.FieldInstanceReadOnly,
+             VarHandleDoubles.FieldStaticReadOnly,
+             VarHandleFloats.Array,
+             VarHandleFloats.FieldInstanceReadOnly,
+             VarHandleFloats.FieldStaticReadOnly,
+             VarHandleInts.Array,
+             VarHandleInts.FieldInstanceReadOnly,
+             VarHandleInts.FieldStaticReadOnly,
+             VarHandleLongs.Array,
+             VarHandleLongs.FieldInstanceReadOnly,
+             VarHandleLongs.FieldStaticReadOnly,
+             VarHandleReferences.Array,
+             VarHandleReferences.FieldInstanceReadOnly,
+             VarHandleReferences.FieldStaticReadOnly,
+             VarHandleShorts.Array,
+             VarHandleShorts.FieldInstanceReadOnly,
+             VarHandleShorts.FieldStaticReadOnly {
     final VarForm vform;
     final boolean exact;
 
diff --git a/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
index f6196771d1d..d182056f4eb 100644
--- a/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
+++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ import static java.lang.invoke.MethodHandleStatics.UNSAFE;
 
 final class VarHandle$Type$s {
 
-    static class FieldInstanceReadOnly extends VarHandle {
+    static sealed class FieldInstanceReadOnly extends VarHandle {
         final long fieldOffset;
         final Class<?> receiverType;
 #if[Object]
@@ -381,7 +381,7 @@ final class VarHandle$Type$s {
     }
 
 
-    static class FieldStaticReadOnly extends VarHandle {
+    static sealed class FieldStaticReadOnly extends VarHandle {
         final Object base;
         final long fieldOffset;
 #if[Object]
diff --git a/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
index 3334b1faef9..f4c8ee3de80 100644
--- a/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
+++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandleByteArrayView.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ final class VarHandleByteArrayAs$Type$s extends VarHandleByteArrayBase {
 #end[floatingPoint]
 
 
-    private static abstract class ByteArrayViewVarHandle extends VarHandle {
+    static abstract sealed class ByteArrayViewVarHandle extends VarHandle {
         final boolean be;
 
         ByteArrayViewVarHandle(VarForm form, boolean be, boolean exact) {
-- 
GitLab


From ce27d9dd5e1899c74ca2120e3e70420973eb241c Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 30 Mar 2022 18:13:54 +0000
Subject: [PATCH 281/345] 8283494: Factor out calculation of actual number of
 XMM registers

Reviewed-by: dlong, kvn
---
 src/hotspot/cpu/x86/c1_FrameMap_x86.hpp      | 10 ++--------
 src/hotspot/cpu/x86/c1_LinearScan_x86.hpp    |  7 +------
 src/hotspot/cpu/x86/c1_Runtime1_x86.cpp      | 20 ++++----------------
 src/hotspot/cpu/x86/macroAssembler_x86.cpp   |  8 ++++----
 src/hotspot/cpu/x86/register_x86.cpp         |  1 +
 src/hotspot/cpu/x86/register_x86.hpp         | 13 +++++++++++++
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp | 10 ++--------
 src/hotspot/cpu/x86/vmreg_x86.hpp            | 12 +++---------
 8 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
index a49e2f39a83..a9739b1a22b 100644
--- a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
@@ -152,14 +152,8 @@
     return range;
   }
 
-  static int get_num_caller_save_xmms(void) {
-    int num_caller_save_xmm_regs = nof_caller_save_xmm_regs;
-#ifdef _LP64
-    if (UseAVX < 3) {
-      num_caller_save_xmm_regs = num_caller_save_xmm_regs / 2;
-    }
-#endif
-    return num_caller_save_xmm_regs;
+  static int get_num_caller_save_xmms() {
+    return XMMRegisterImpl::available_xmm_registers();
   }
 
   static int nof_caller_save_cpu_regs() { return adjust_reg_range(pd_nof_caller_save_cpu_regs_frame_map); }
diff --git a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
index 80514066175..05c8bbdde5f 100644
--- a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
@@ -101,12 +101,7 @@ inline void LinearScan::pd_add_temps(LIR_Op* op) {
 // Implementation of LinearScanWalker
 
 inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
-  int last_xmm_reg = pd_last_xmm_reg;
-#ifdef _LP64
-  if (UseAVX < 3) {
-    last_xmm_reg = pd_first_xmm_reg + (pd_nof_xmm_regs_frame_map / 2) - 1;
-  }
-#endif
+  int last_xmm_reg = pd_first_xmm_reg + XMMRegisterImpl::available_xmm_registers() - 1;
   if (allocator()->gen()->is_vreg_flag_set(cur->reg_num(), LIRGenerator::byte_reg)) {
     assert(cur->type() != T_FLOAT && cur->type() != T_DOUBLE, "cpu regs only");
     _first_reg = pd_first_byte_reg;
diff --git a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
index 595e78dc257..1bb767994b8 100644
--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "asm/assembler.hpp"
 #include "c1/c1_Defs.hpp"
+#include "c1/c1_FrameMap.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "c1/c1_Runtime1.hpp"
 #include "ci/ciUtilities.hpp"
@@ -369,12 +370,7 @@ static OopMap* generate_oop_map(StubAssembler* sasm, int num_rt_args,
   map->set_callee_saved(VMRegImpl::stack2reg(r15H_off + num_rt_args), r15->as_VMReg()->next());
 #endif // _LP64
 
-  int xmm_bypass_limit = FrameMap::nof_xmm_regs;
-#ifdef _LP64
-  if (UseAVX < 3) {
-    xmm_bypass_limit = xmm_bypass_limit / 2;
-  }
-#endif
+  int xmm_bypass_limit = FrameMap::get_num_caller_save_xmms();
 
   if (save_fpu_registers) {
 #ifndef _LP64
@@ -487,13 +483,8 @@ void C1_MacroAssembler::save_live_registers_no_oop_map(bool save_fpu_registers)
       // so always save them as doubles.
       // note that float values are _not_ converted automatically, so for float values
       // the second word contains only garbage data.
-      int xmm_bypass_limit = FrameMap::nof_xmm_regs;
+      int xmm_bypass_limit = FrameMap::get_num_caller_save_xmms();
       int offset = 0;
-#ifdef _LP64
-      if (UseAVX < 3) {
-        xmm_bypass_limit = xmm_bypass_limit / 2;
-      }
-#endif
       for (int n = 0; n < xmm_bypass_limit; n++) {
         XMMRegister xmm_name = as_XMMRegister(n);
         __ movdbl(Address(rsp, xmm_regs_as_doubles_off * VMRegImpl::stack_slot_size + offset), xmm_name);
@@ -513,10 +504,7 @@ static void restore_fpu(C1_MacroAssembler* sasm, bool restore_fpu_registers) {
 #ifdef _LP64
   if (restore_fpu_registers) {
     // restore XMM registers
-    int xmm_bypass_limit = FrameMap::nof_xmm_regs;
-    if (UseAVX < 3) {
-      xmm_bypass_limit = xmm_bypass_limit / 2;
-    }
+    int xmm_bypass_limit = FrameMap::get_num_caller_save_xmms();
     int offset = 0;
     for (int n = 0; n < xmm_bypass_limit; n++) {
       XMMRegister xmm_name = as_XMMRegister(n);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index e9285b11e42..67faa195457 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -26,7 +26,6 @@
 #include "jvm.h"
 #include "asm/assembler.hpp"
 #include "asm/assembler.inline.hpp"
-#include "c1/c1_FrameMap.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "compiler/disassembler.hpp"
 #include "gc/shared/barrierSet.hpp"
@@ -3594,14 +3593,15 @@ RegSet MacroAssembler::call_clobbered_gp_registers() {
 }
 
 XMMRegSet MacroAssembler::call_clobbered_xmm_registers() {
+  int num_xmm_registers = XMMRegisterImpl::available_xmm_registers();
 #if defined(WINDOWS) && defined(_LP64)
   XMMRegSet result = XMMRegSet::range(xmm0, xmm5);
-  if (FrameMap::get_num_caller_save_xmms() > 16) {
-     result += XMMRegSet::range(xmm16, as_XMMRegister(FrameMap::get_num_caller_save_xmms() - 1));
+  if (num_xmm_registers > 16) {
+     result += XMMRegSet::range(xmm16, as_XMMRegister(num_xmm_registers - 1));
   }
   return result;
 #else
-  return XMMRegSet::range(xmm0, as_XMMRegister(FrameMap::get_num_caller_save_xmms() - 1));
+  return XMMRegSet::range(xmm0, as_XMMRegister(num_xmm_registers - 1));
 #endif
 }
 
diff --git a/src/hotspot/cpu/x86/register_x86.cpp b/src/hotspot/cpu/x86/register_x86.cpp
index 2a07a9eb19c..d86cb1f0820 100644
--- a/src/hotspot/cpu/x86/register_x86.cpp
+++ b/src/hotspot/cpu/x86/register_x86.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+
 #include "register_x86.hpp"
 
 #ifndef AMD64
diff --git a/src/hotspot/cpu/x86/register_x86.hpp b/src/hotspot/cpu/x86/register_x86.hpp
index f57b1db48c8..7bb0be20943 100644
--- a/src/hotspot/cpu/x86/register_x86.hpp
+++ b/src/hotspot/cpu/x86/register_x86.hpp
@@ -26,6 +26,7 @@
 #define CPU_X86_REGISTER_X86_HPP
 
 #include "asm/register.hpp"
+#include "runtime/globals.hpp"
 #include "utilities/count_leading_zeros.hpp"
 #include "utilities/powerOfTwo.hpp"
 
@@ -163,6 +164,18 @@ class XMMRegisterImpl: public AbstractRegisterImpl {
   bool  is_valid() const                          { return 0 <= (intptr_t)this && (intptr_t)this < number_of_registers; }
   const char* name() const;
   const char* sub_word_name(int offset) const;
+
+  // Actually available XMM registers for use, depending on actual CPU capabilities
+  // and flags.
+  static int available_xmm_registers() {
+    int num_xmm_regs = XMMRegisterImpl::number_of_registers;
+#ifdef _LP64
+    if (UseAVX < 3) {
+      num_xmm_regs /= 2;
+    }
+#endif
+    return num_xmm_regs;
+  }
 };
 
 
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 8bfbe3303da..75ddae63199 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -174,10 +174,7 @@ PRAGMA_DIAG_PUSH
 PRAGMA_NONNULL_IGNORED
 OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_frame_words, int* total_frame_words, bool save_vectors) {
   int off = 0;
-  int num_xmm_regs = XMMRegisterImpl::number_of_registers;
-  if (UseAVX < 3) {
-    num_xmm_regs = num_xmm_regs/2;
-  }
+  int num_xmm_regs = XMMRegisterImpl::available_xmm_registers();
 #if COMPILER2_OR_JVMCI
   if (save_vectors && UseAVX == 0) {
     save_vectors = false; // vectors larger than 16 byte long are supported only with AVX
@@ -367,10 +364,7 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
 PRAGMA_DIAG_POP
 
 void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_vectors) {
-  int num_xmm_regs = XMMRegisterImpl::number_of_registers;
-  if (UseAVX < 3) {
-    num_xmm_regs = num_xmm_regs/2;
-  }
+  int num_xmm_regs = XMMRegisterImpl::available_xmm_registers();
   if (frame::arg_reg_save_area_bytes != 0) {
     // Pop arg register save area
     __ addptr(rsp, frame::arg_reg_save_area_bytes);
diff --git a/src/hotspot/cpu/x86/vmreg_x86.hpp b/src/hotspot/cpu/x86/vmreg_x86.hpp
index 58df28f8491..a2d44a2cebe 100644
--- a/src/hotspot/cpu/x86/vmreg_x86.hpp
+++ b/src/hotspot/cpu/x86/vmreg_x86.hpp
@@ -25,7 +25,7 @@
 #ifndef CPU_X86_VMREG_X86_HPP
 #define CPU_X86_VMREG_X86_HPP
 
-
+#include "register_x86.hpp"
 
 inline bool is_Register() {
   return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
@@ -36,14 +36,8 @@ inline bool is_FloatRegister() {
 }
 
 inline bool is_XMMRegister() {
-  int uarch_max_xmm = ConcreteRegisterImpl::max_xmm;
-
-#ifdef _LP64
-  if (UseAVX < 3) {
-    int half_xmm = (XMMRegisterImpl::max_slots_per_register * XMMRegisterImpl::number_of_registers) / 2;
-    uarch_max_xmm -= half_xmm;
-  }
-#endif
+  int uarch_max_xmm = ConcreteRegisterImpl::max_fpr +
+    (XMMRegisterImpl::max_slots_per_register * XMMRegisterImpl::available_xmm_registers());
 
   return (value() >= ConcreteRegisterImpl::max_fpr && value() < uarch_max_xmm);
 }
-- 
GitLab


From b8dd21b790f36450de9aa0acc56251715b1a33e9 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Wed, 30 Mar 2022 21:09:55 +0000
Subject: [PATCH 282/345] 8283801: Cleanup confusing String.toString calls

Reviewed-by: bpb
---
 .../com/sun/tools/javac/processing/JavacFiler.java   | 12 ++++--------
 .../com/sun/tools/classfile/TypeAnnotation.java      |  4 ++--
 .../tools/javap/LocalVariableTypeTableWriter.java    |  4 ++--
 .../classes/jdk/jpackage/internal/Platform.java      |  4 ++--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java
index bef291869ab..1c3f8ba96f8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,6 @@ import static javax.tools.StandardLocation.CLASS_OUTPUT;
 import com.sun.tools.javac.code.Lint;
 import com.sun.tools.javac.code.Symbol.ClassSymbol;
 import com.sun.tools.javac.code.Symbol.ModuleSymbol;
-import com.sun.tools.javac.code.Symbol.TypeSymbol;
 import com.sun.tools.javac.code.Symtab;
 import com.sun.tools.javac.comp.Modules;
 import com.sun.tools.javac.model.JavacElements;
@@ -63,10 +62,8 @@ import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.DefinedBy.Api;
 
 import static com.sun.tools.javac.code.Lint.LintCategory.PROCESSING;
-import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.PackageSymbol;
 import com.sun.tools.javac.main.Option;
-import java.util.stream.Collectors;
 
 /**
  * The FilerImplementation class must maintain a number of
@@ -547,12 +544,11 @@ public class JavacFiler implements Filer, Closeable {
 
         locationCheck(location);
 
-        String strPkg = pkg.toString();
-        if (strPkg.length() > 0)
-            checkName(strPkg);
+        if (pkg.length() > 0)
+            checkName(pkg);
 
         FileObject fileObject =
-            fileManager.getFileForOutputForOriginatingFiles(location, strPkg,
+            fileManager.getFileForOutputForOriginatingFiles(location, pkg,
                                                             relativeName.toString(), originatingFiles(originatingElements));
         checkFileReopening(fileObject, true);
 
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java
index 707cb831540..b5891819de2 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ public class TypeAnnotation {
     @Override
     public String toString() {
         try {
-            return "@" + constant_pool.getUTF8Value(annotation.type_index).toString().substring(1) +
+            return "@" + constant_pool.getUTF8Value(annotation.type_index).substring(1) +
                     " pos: " + position.toString();
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
index fbdc874615a..d1a8c68de72 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,7 +125,7 @@ public class LocalVariableTypeTableWriter extends  InstructionDetailWriter {
                     print(" // ");
                     Descriptor d = new Signature(entry.signature_index);
                     try {
-                        print(d.getFieldType(constant_pool).toString().replace("/", "."));
+                        print(d.getFieldType(constant_pool).replace("/", "."));
                     } catch (InvalidDescriptor e) {
                         print(report(e));
                     } catch (ConstantPoolException e) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java
index f69e106a424..8be5fec2e72 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ enum Platform {UNKNOWN, WINDOWS, LINUX, MAC;
             platform = Platform.UNKNOWN;
         }
 
-        String version = System.getProperty("os.version").toString();
+        String version = System.getProperty("os.version");
         String[] parts = version.split(Pattern.quote("."));
 
         if (parts.length > 0) {
-- 
GitLab


From 835c7e8d6d1931e69fffb43a5b4acf62fd4916fd Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Thu, 31 Mar 2022 00:46:44 +0000
Subject: [PATCH 283/345] 8283907: Fix Huawei copyright in various files

Reviewed-by: mli
---
 src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp                | 2 +-
 src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp                | 2 +-
 src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp         | 2 +-
 src/hotspot/share/gc/g1/g1SegmentedArray.hpp                    | 2 +-
 src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp             | 2 +-
 .../jtreg/compiler/intrinsics/math/MaxMinOptimizeTest.java      | 2 +-
 test/hotspot/jtreg/compiler/vectorapi/TestLoopStoreVector.java  | 2 +-
 test/hotspot/jtreg/compiler/vectorapi/TestVectorInsertByte.java | 2 +-
 .../hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIota.java | 2 +-
 .../jtreg/compiler/vectorapi/TestVectorShuffleIotaByte.java     | 2 +-
 test/hotspot/jtreg/gc/g1/TestG1SkipCompaction.java              | 2 +-
 .../micro/org/openjdk/bench/vm/compiler/MaxMinOptimizeTest.java | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp b/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp
index a67fb06a333..d521c98b390 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp b/src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp
index b524ffaa58f..9561a3b89b5 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp b/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
index cf5abb0176f..aad6c3170b0 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArray.hpp b/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
index 6d1bcea9c90..1849a9689fc 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArray.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2022, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp b/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
index 1acb5060d4b..3aa8a98b75f 100644
--- a/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2022, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/math/MaxMinOptimizeTest.java b/test/hotspot/jtreg/compiler/intrinsics/math/MaxMinOptimizeTest.java
index 31033b65597..d2c8cfe8cad 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/math/MaxMinOptimizeTest.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/MaxMinOptimizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestLoopStoreVector.java b/test/hotspot/jtreg/compiler/vectorapi/TestLoopStoreVector.java
index 02ae5684869..09407d21a56 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestLoopStoreVector.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestLoopStoreVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorInsertByte.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorInsertByte.java
index 8d14b1834d8..7969b7bea40 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestVectorInsertByte.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorInsertByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIota.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIota.java
index 4762b84db8b..79829775db4 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIota.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIota.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIotaByte.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIotaByte.java
index ae738f57d89..eaf39c94be1 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIotaByte.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorShuffleIotaByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/gc/g1/TestG1SkipCompaction.java b/test/hotspot/jtreg/gc/g1/TestG1SkipCompaction.java
index 9824186c43c..4f47e219039 100644
--- a/test/hotspot/jtreg/gc/g1/TestG1SkipCompaction.java
+++ b/test/hotspot/jtreg/gc/g1/TestG1SkipCompaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/micro/org/openjdk/bench/vm/compiler/MaxMinOptimizeTest.java b/test/micro/org/openjdk/bench/vm/compiler/MaxMinOptimizeTest.java
index db75b94db33..ec83488464a 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/MaxMinOptimizeTest.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/MaxMinOptimizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Huawei Technologies Co. Ltd. All rights reserved.
+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
-- 
GitLab


From 1ddab6fe4e3c0c2068618135895dfde3a03b2ca3 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 31 Mar 2022 00:51:11 +0000
Subject: [PATCH 284/345] 8283060: RawNativeLibraries should allow multiple
 clients to load/unload the same library

Reviewed-by: sundar, jvernee, jpai
---
 .../internal/loader/RawNativeLibraries.java   | 39 +++++++++++++------
 .../internal/loader/NativeLibraries/Main.java | 10 ++---
 .../internal/loader/NativeLibrariesTest.java  | 30 +++++++++++---
 3 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/loader/RawNativeLibraries.java b/src/java.base/share/classes/jdk/internal/loader/RawNativeLibraries.java
index 972e34e1fd2..35ed4701c99 100644
--- a/src/java.base/share/classes/jdk/internal/loader/RawNativeLibraries.java
+++ b/src/java.base/share/classes/jdk/internal/loader/RawNativeLibraries.java
@@ -31,8 +31,8 @@ import java.lang.invoke.MethodHandles;
 import java.nio.file.Path;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -45,7 +45,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * 3. No relationship with class loaders.
  */
 public final class RawNativeLibraries {
-    final Map<String, RawNativeLibraryImpl> libraries = new ConcurrentHashMap<>();
+    final Set<RawNativeLibraryImpl> libraries = ConcurrentHashMap.newKeySet();
     final Class<?> caller;
 
     private RawNativeLibraries(MethodHandles.Lookup trustedCaller) {
@@ -70,6 +70,12 @@ public final class RawNativeLibraries {
      * Load a native library from the given path.  Returns null if the given
      * library is determined to be non-loadable, which is system-dependent.
      *
+     * The library is opened with the platform-specific library loading
+     * mechanism. If this method is called with the same path multiple times,
+     * the library is opened the same number of times. To close the library
+     * of the given path, {@code #unload} must be called on all the
+     * {@code NativeLibrary} instances that load it.
+     *
      * @param path the path of the native library
      */
     @SuppressWarnings("removal")
@@ -106,28 +112,39 @@ public final class RawNativeLibraries {
      *     NativeLibrary lib = libs.load(System.mapLibraryName("blas"));
      * }
      *
+     * The library is opened with the platform-specific library loading
+     * mechanism. If this method is called with the same pathname multiple times,
+     * the library is opened the same number of times. To close the library
+     * of the given path, {@code #unload} must be called on all the
+     * {@code NativeLibrary} instances that load it.
+     *
      * @param pathname the pathname of the native library
      * @see System#mapLibraryName(String)
      */
     public NativeLibrary load(String pathname) {
-         return libraries.computeIfAbsent(pathname, this::get);
-    }
-
-    private RawNativeLibraryImpl get(String pathname) {
-        RawNativeLibraryImpl lib = new RawNativeLibraryImpl(caller, pathname);
+        RawNativeLibraryImpl lib = new RawNativeLibraryImpl(pathname);
         if (!lib.open()) {
             return null;
         }
+        libraries.add(lib);
         return lib;
     }
 
     /*
-     * Unloads the given native library.
+     * Unloads the given native library.  Each {@code NativeLibrary}
+     * instance can be unloaded only once.
+     *
+     * The native library may remain opened after this method is called.
+     * Refer to the platform-specific library loading mechanism, for example,
+     * dlopen/dlclose on Unix or LoadLibrary/FreeLibrary on Windows.
+     *
+     * @throws IllegalArgumentException if the given library is not
+     * loaded by this RawNativeLibraries or has already been unloaded
      */
     public void unload(NativeLibrary lib) {
         Objects.requireNonNull(lib);
-        if (!libraries.remove(lib.name(), lib)) {
-            throw new IllegalArgumentException(lib.name() + " not loaded by this RawNativeLibraries instance");
+        if (!libraries.remove(lib)) {
+            throw new IllegalArgumentException("can't unload " + lib.name() + " loaded from " + lib);
         }
         RawNativeLibraryImpl nl = (RawNativeLibraryImpl)lib;
         nl.close();
@@ -139,7 +156,7 @@ public final class RawNativeLibraries {
         // opaque handle to raw native library, used in native code.
         long handle;
 
-        RawNativeLibraryImpl(Class<?> fromClass, String name) {
+        RawNativeLibraryImpl(String name) {
             this.name = name;
         }
 
diff --git a/test/jdk/jdk/internal/loader/NativeLibraries/Main.java b/test/jdk/jdk/internal/loader/NativeLibraries/Main.java
index 638047c33e0..4709810b0cd 100644
--- a/test/jdk/jdk/internal/loader/NativeLibraries/Main.java
+++ b/test/jdk/jdk/internal/loader/NativeLibraries/Main.java
@@ -45,17 +45,15 @@ public class Main {
         NativeLibrariesTest test = new NativeLibrariesTest();
         test.runTest();
 
-        try {
-            System.loadLibrary(NativeLibrariesTest.LIB_NAME);
-        } catch (UnsatisfiedLinkError e) { e.printStackTrace(); }
-
-        // unload the native library and then System::loadLibrary should succeed
-        test.unload();
+        // System::loadLibrary succeeds even the library is loaded as raw library
         System.loadLibrary(NativeLibrariesTest.LIB_NAME);
 
         // expect NativeLibraries to succeed even the library has been loaded by System::loadLibrary
         test.loadTestLibrary();
 
+        // unload all NativeLibrary instances
+        test.unload();
+
         // load zip library from JDK
         test.load(System.mapLibraryName("zip"), true /* succeed */);
 
diff --git a/test/jdk/jdk/internal/loader/NativeLibraries/java.base/jdk/internal/loader/NativeLibrariesTest.java b/test/jdk/jdk/internal/loader/NativeLibraries/java.base/jdk/internal/loader/NativeLibrariesTest.java
index a0560624929..9b20b5920c2 100644
--- a/test/jdk/jdk/internal/loader/NativeLibraries/java.base/jdk/internal/loader/NativeLibrariesTest.java
+++ b/test/jdk/jdk/internal/loader/NativeLibraries/java.base/jdk/internal/loader/NativeLibrariesTest.java
@@ -30,6 +30,8 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashSet;
+import java.util.Set;
 
 public class NativeLibrariesTest implements Runnable {
     public static final String LIB_NAME = "nativeLibrariesTest";
@@ -52,6 +54,7 @@ public class NativeLibrariesTest implements Runnable {
     }
 
     private final RawNativeLibraries nativeLibraries;
+    private final Set<NativeLibrary> loadedLibraries = new HashSet<>();
 
     public NativeLibrariesTest() {
         this.nativeLibraries = RawNativeLibraries.newInstance(MethodHandles.lookup());
@@ -74,7 +77,7 @@ public class NativeLibrariesTest implements Runnable {
         NativeLibrary nl1 = nativeLibraries.load(lib);
         NativeLibrary nl2 = nativeLibraries.load(lib);
         assertTrue(nl1 != null && nl2 != null, "fail to load library");
-        assertTrue(nl1 == nl2, nl1 + " != " + nl2);
+        assertTrue(nl1 != nl2, "Expected different NativeLibrary instances");
         assertTrue(loadedCount == 0, "Native library loaded.  Expected: JNI_OnUnload not invoked");
         assertTrue(unloadedCount == 0, "native library never unloaded");
 
@@ -85,25 +88,40 @@ public class NativeLibrariesTest implements Runnable {
         nativeLibraries.unload(nl1);
         assertTrue(unloadedCount == 0, "Native library unloaded.  Expected: JNI_OnUnload not invoked");
 
-        // reload the native library and expect new NativeLibrary instance
+        try {
+            nativeLibraries.unload(nl1);
+            throw new RuntimeException("Expect to fail as the library has already been unloaded");
+        } catch (IllegalArgumentException e) { }
+
+        // load the native library and expect new NativeLibrary instance
         NativeLibrary nl3 = nativeLibraries.load(lib);
         assertTrue(nl1 != nl3, nl1 + " == " + nl3);
         assertTrue(loadedCount == 0, "Native library loaded.  Expected: JNI_OnUnload not invoked");
 
         // load successfully even from another loader
         loadWithCustomLoader();
+
+        // keep the loaded NativeLibrary instances
+        loadedLibraries.add(nl2);
+        loadedLibraries.add(nl3);
     }
 
+    /*
+     * Unloads all loaded NativeLibrary instance
+     */
     public void unload() {
-        NativeLibrary nl = nativeLibraries.load(libraryPath());
-        // unload the native library
-        nativeLibraries.unload(nl);
-        assertTrue(unloadedCount == 0, "Native library unloaded.  Expected: JNI_OnUnload not invoked");
+        System.out.println("Unloading " + loadedLibraries.size() + " NativeLibrary instances");
+        for (NativeLibrary nl : loadedLibraries) {
+            nativeLibraries.unload(nl);
+            assertTrue(unloadedCount == 0, "Native library unloaded.  Expected: JNI_OnUnload not invoked");
+        }
+        loadedLibraries.clear();
     }
 
     public void loadTestLibrary() {
         NativeLibrary nl = nativeLibraries.load(libraryPath());
         assertTrue(nl != null, "fail to load " + libraryPath());
+        loadedLibraries.add(nl);
     }
 
     public void load(String pathname, boolean succeed) {
-- 
GitLab


From ec0897ab8064ce168f57b1b65c64b760044674dd Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 31 Mar 2022 01:09:39 +0000
Subject: [PATCH 285/345] 8281705: SourceLauncherTest.testSystemProperty isn't
 being run

Reviewed-by: jjg
---
 test/langtools/tools/javac/launcher/SourceLauncherTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
index a052f087af6..08b0ce5002b 100644
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ import toolbox.JavaTask;
 import toolbox.JavacTask;
 import toolbox.Task;
 import toolbox.TestRunner;
-import toolbox.TestRunner;
+import toolbox.TestRunner.Test;
 import toolbox.ToolBox;
 
 public class SourceLauncherTest extends TestRunner {
@@ -231,6 +231,7 @@ public class SourceLauncherTest extends TestRunner {
                 "error: cannot use source-code launcher with a security manager enabled");
     }
 
+    @Test
     public void testSystemProperty(Path base) throws IOException {
         tb.writeJavaFiles(base,
             "class ShowProperty {\n" +
-- 
GitLab


From eeca3a31559c2e334958c6d929cff8eb350c32a3 Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Thu, 31 Mar 2022 01:50:41 +0000
Subject: [PATCH 286/345] 8253569: javax.xml.catalog.Catalog.matchURI()
 implementation should reset state variables

Reviewed-by: lancea, naoto
---
 .../javax/xml/catalog/CatalogImpl.java        |   4 +-
 .../classes/javax/xml/catalog/GroupEntry.java |  64 ++++++++-
 .../share/classes/javax/xml/catalog/Util.java |  20 +--
 .../unittest/catalog/CatalogReuseTest.java    | 126 ++++++++++++++++++
 .../jaxp/unittest/catalog/catalogReuse.xml    |   5 +
 5 files changed, 197 insertions(+), 22 deletions(-)
 create mode 100644 test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogReuseTest.java
 create mode 100644 test/jaxp/javax/xml/jaxp/unittest/catalog/catalogReuse.xml

diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java
index 92c407e103f..6bbbdc77b7d 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,8 @@ import com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
diff --git a/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java b/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java
index 103078b1555..1082f00450e 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java
+++ b/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,9 @@ class GroupEntry extends BaseEntry {
     static final int ATTRIBUTE_DEFFER = 1;
     static final int ATTRIBUTE_RESOLUTION = 2;
 
+    //Indicates a continuous session, should not reset state
+    boolean shouldKeepState = false;
+
     //Unmodifiable features when the Catalog is created
     CatalogFeatures features;
 
@@ -164,6 +167,16 @@ class GroupEntry extends BaseEntry {
         longestSuffixMatch = 0;
         systemEntrySearched = false;
     }
+
+    /**
+     * Resets the state of the Catalog instance, allowing it to be reused.
+     */
+    private void resetOnStart() {
+        if (this instanceof Catalog  && !shouldKeepState) {
+            reset();
+        }
+    }
+
     /**
      * Constructs a group entry.
      * @param catalog the catalog this GroupEntry belongs to
@@ -228,6 +241,7 @@ class GroupEntry extends BaseEntry {
      * @return a URI string if a mapping is found, or null otherwise.
      */
     public String matchSystem(String systemId) {
+        resetOnStart();
         systemEntrySearched = true;
         String match = null;
         for (BaseEntry entry : entries) {
@@ -296,6 +310,7 @@ class GroupEntry extends BaseEntry {
      * @return a URI string if a mapping is found, or null otherwise.
      */
     public String matchPublic(String publicId) {
+        resetOnStart();
         /*
            When both public and system identifiers are specified, and prefer is
         not public (that is, system), only system entry will be used.
@@ -326,6 +341,51 @@ class GroupEntry extends BaseEntry {
         return matchDelegate(CatalogEntryType.DELEGATEPUBLIC, publicId);
     }
 
+    /**
+     * Attempt to find a matching entry in the catalog by publicId or systemId.
+     *
+     * <p>
+     * The resolution follows the following rules determined by the prefer
+     * setting:
+     *
+     * prefer "system": attempts to resolve with a system entry; attempts to
+     * resolve with a public entry when only publicId is specified.
+     *
+     * prefer "public": attempts to resolve with a system entry; attempts to
+     * resolve with a public entry if no matching system entry is found.
+     *
+     * If no match is found, continue searching uri entries.
+     *
+     * @param publicId The public identifier of the external entity being
+     * referenced.
+     *
+     * @param systemId The system identifier of the external entity being
+     * referenced.
+     *
+     * @return the resolved systemId if a match is found, null otherwise
+     */
+    String resolve(String publicId, String systemId) {
+        String resolvedSystemId = null;
+        shouldKeepState = true;
+        if (systemId != null) {
+            /*
+             If a system identifier is specified, it is used no matter how
+             prefer is set.
+             */
+            resolvedSystemId = matchSystem(systemId);
+        }
+
+        if (resolvedSystemId == null && publicId != null) {
+            resolvedSystemId = matchPublic(publicId);
+        }
+
+        if (resolvedSystemId == null && systemId != null) {
+            resolvedSystemId = matchURI(systemId);
+        }
+        shouldKeepState = false;
+        return resolvedSystemId;
+    }
+
     /**
      * Attempt to find a matching entry in the catalog by the uri element.
      *
@@ -340,6 +400,7 @@ class GroupEntry extends BaseEntry {
      * @return a URI string if a mapping is found, or null otherwise.
      */
     public String matchURI(String uri) {
+        resetOnStart();
         String match = null;
         for (BaseEntry entry : entries) {
             switch (entry.type) {
@@ -399,6 +460,7 @@ class GroupEntry extends BaseEntry {
      * @return the URI string if a mapping is found, or null otherwise.
      */
     private String matchDelegate(CatalogEntryType type, String id) {
+        resetOnStart();
         String match = null;
         int longestMatch = 0;
         URI catalogId = null;
diff --git a/src/java.xml/share/classes/javax/xml/catalog/Util.java b/src/java.xml/share/classes/javax/xml/catalog/Util.java
index af84c3f825d..50a72aed620 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/Util.java
+++ b/src/java.xml/share/classes/javax/xml/catalog/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,25 +74,9 @@ class Util {
      * @return the resolved systemId if a match is found, null otherwise
      */
     static String resolve(CatalogImpl catalog, String publicId, String systemId) {
-        String resolvedSystemId = null;
-
         //search the current catalog
         catalog.reset();
-        if (systemId != null) {
-            /*
-             If a system identifier is specified, it is used no matter how
-             prefer is set.
-             */
-            resolvedSystemId = catalog.matchSystem(systemId);
-        }
-
-        if (resolvedSystemId == null && publicId != null) {
-            resolvedSystemId = catalog.matchPublic(publicId);
-        }
-
-        if (resolvedSystemId == null && systemId != null) {
-            resolvedSystemId = catalog.matchURI(systemId);
-        }
+        String resolvedSystemId = catalog.resolve(publicId, systemId);
 
         //mark the catalog as having been searched before trying alternatives
         catalog.markAsSearched();
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogReuseTest.java b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogReuseTest.java
new file mode 100644
index 00000000000..6bc563f3df3
--- /dev/null
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/CatalogReuseTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package catalog;
+
+import java.net.URI;
+import javax.xml.catalog.Catalog;
+import javax.xml.catalog.CatalogFeatures;
+import javax.xml.catalog.CatalogManager;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/*
+ * @test
+ * @bug 8253569
+ * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
+ * @run testng catalog.CatalogReuseTest
+ * @summary Verifies that a catalog can be reused.
+ */
+public class CatalogReuseTest extends CatalogSupportBase {
+    static final CatalogFeatures FEATURES_STRICT = CatalogFeatures.builder().
+            with(CatalogFeatures.Feature.RESOLVE, "strict").build();
+
+    /*
+        DataProvider: reuses a catalog. The length of the URIs is in descending order.
+        Data columns: catalog, uri, expected
+     */
+    @DataProvider(name = "dataWithCatalogD")
+    public Object[][] dataWithCatalogD() {
+        Catalog c = getCatalog();
+        return new Object[][]{
+            {c, "http://entailments/example.org/A/B/derived.ttl", "derived/A/B/derived.ttl"},
+            {c, "http://example.org/A/B.owl", "sources/A/B.owl"},
+         };
+    }
+
+    /*
+        DataProvider: reuses a catalog. The length of the URIs is in ascending order.
+        Data columns: catalog, uri, expected
+     */
+    @DataProvider(name = "dataWithCatalogA")
+    public Object[][] dataWithCatalogA() {
+        Catalog c = getCatalog();
+        return new Object[][]{
+            {c, "http://example.org/A/B.owl", "sources/A/B.owl"},
+            {c, "http://entailments/example.org/A/B/derived.ttl", "derived/A/B/derived.ttl"},
+         };
+    }
+
+    /*
+        DataProvider: provides no catalog. A new catalog will be created for each test.
+        Data columns: uri, expected
+     */
+    @DataProvider(name = "dataWithoutCatalog")
+    public Object[][] dataWithoutCatalog() {
+        return new Object[][]{
+            {"http://entailments/example.org/A/B/derived.ttl", "derived/A/B/derived.ttl"},
+            {"http://example.org/A/B.owl", "sources/A/B.owl"},
+         };
+    }
+
+    /*
+     * Initializing fields
+     */
+    @BeforeClass
+    public void setUpClass() throws Exception {
+        super.setUp();
+    }
+
+    /*
+     * Verifies that a Catalog object can be reused, that no state data are
+     * in the way of a subsequent matching attempt.
+    */
+    @Test(dataProvider = "dataWithCatalogD")
+    public void testD(Catalog c, String uri, String expected) throws Exception {
+        String m = c.matchURI(uri);
+        Assert.assertTrue(m.endsWith(expected), "Expected: " + expected);
+    }
+
+    /*
+     * Verifies that a Catalog object can be reused.
+    */
+    @Test(dataProvider = "dataWithCatalogA")
+    public void testA(Catalog c, String uri, String expected) throws Exception {
+        String m = c.matchURI(uri);
+        Assert.assertTrue(m.endsWith(expected), "Expected: " + expected);
+    }
+
+    /*
+     * Verifies that a match is found in a newly created Catalog.
+    */
+    @Test(dataProvider = "dataWithoutCatalog")
+    public void testNew(String uri, String expected) throws Exception {
+        Catalog c = getCatalog();
+        String m = c.matchURI(uri);
+        Assert.assertTrue(m.endsWith(expected), "Expected: " + expected);
+
+    }
+
+    private Catalog getCatalog() {
+        String uri = "file://" + slash + filepath + "/catalogReuse.xml";
+        Catalog c = CatalogManager.catalog(FEATURES_STRICT, uri != null? URI.create(uri) : null);
+        return c;
+    }
+}
diff --git a/test/jaxp/javax/xml/jaxp/unittest/catalog/catalogReuse.xml b/test/jaxp/javax/xml/jaxp/unittest/catalog/catalogReuse.xml
new file mode 100644
index 00000000000..adbee60ba87
--- /dev/null
+++ b/test/jaxp/javax/xml/jaxp/unittest/catalog/catalogReuse.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0'?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
+    <rewriteURI uriStartString="http://entailments/example.org/" rewritePrefix="derived/"/>
+    <rewriteURI uriStartString="http://example.org/" rewritePrefix="sources/"/>
+</catalog>
-- 
GitLab


From e0a86699b3727e76b8cedefc6e635ebdb22fb731 Mon Sep 17 00:00:00 2001
From: Conor Cleary <ccleary@openjdk.org>
Date: Thu, 31 Mar 2022 04:28:22 +0000
Subject: [PATCH 287/345] 8281223: Improve the API documentation of
 HttpRequest.Builder::build to state that the default implementation provided
 by the JDK returns immutable objects.

Reviewed-by: dfuchs, jpai, chegar
---
 .../share/classes/java/net/http/HttpRequest.java              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/java.net.http/share/classes/java/net/http/HttpRequest.java b/src/java.net.http/share/classes/java/net/http/HttpRequest.java
index fc9c10b14bc..974ea54717e 100644
--- a/src/java.net.http/share/classes/java/net/http/HttpRequest.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpRequest.java
@@ -292,6 +292,10 @@ public abstract class HttpRequest {
         /**
          * Builds and returns an {@link HttpRequest}.
          *
+         * @implSpec This method returns a new {@code HttpRequest} each time it is
+         * invoked. Once built, the {@code HttpRequest} is immutable and can be
+         * sent multiple times.
+         *
          * @return a new {@code HttpRequest}
          * @throws IllegalStateException if a URI has not been set
          */
-- 
GitLab


From fbb8ca55a80683a730179303b31c5c150bcca8a9 Mon Sep 17 00:00:00 2001
From: Sibabrata Sahoo <ssahoo@openjdk.org>
Date: Thu, 31 Mar 2022 06:17:00 +0000
Subject: [PATCH 288/345] 8281717: Cover logout method for several LoginModule

Reviewed-by: rhalade
---
 .../security/auth/module/AllPlatforms.java    | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/test/jdk/com/sun/security/auth/module/AllPlatforms.java b/test/jdk/com/sun/security/auth/module/AllPlatforms.java
index 1dab9e3e868..31a16784eaa 100644
--- a/test/jdk/com/sun/security/auth/module/AllPlatforms.java
+++ b/test/jdk/com/sun/security/auth/module/AllPlatforms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,28 +27,23 @@
  * @summary com.sun.security.auth.module missing classes on some platforms
  * @run main/othervm AllPlatforms
  */
-
 import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import javax.security.auth.login.LoginException;
 
 public class AllPlatforms {
+
+    private static final String UNIX_MODULE = "UnixLoginModule";
+    private static final String NT_MODULE = "NTLoginModule";
+
     public static void main(String[] args) throws Exception {
         login("cross-platform",
-                "UnixLoginModule", "optional",
-                "NTLoginModule", "optional",
-                "SolarisLoginModule", "optional");
-        try {
-            login("windows", "NTLoginModule", "required");
-            login("unix", "UnixLoginModule", "required");
-            login("solaris", "SolarisLoginModule", "required");
-        } catch (Exception e) {
-            e.printStackTrace(System.out);
-            if (e.toString().contains("UnsatisfiedLinkError")) {
-                throw new Exception("This is ugly");
-            }
-        }
+                UNIX_MODULE, "optional",
+                NT_MODULE, "optional");
+        login("windows", NT_MODULE, "required");
+        login("unix", UNIX_MODULE, "required");
     }
 
     static void login(String test, String... conf) throws Exception {
@@ -56,9 +51,10 @@ public class AllPlatforms {
 
         StringBuilder sb = new StringBuilder();
         sb.append("hello {\n");
-        for (int i=0; i<conf.length; i+=2) {
-            sb.append("    com.sun.security.auth.module." + conf[i]
-                    + " " + conf[i+1] + ";\n");
+        for (int i = 0; i < conf.length; i += 2) {
+            sb.append("    com.sun.security.auth.module.")
+                    .append(conf[i]).append(" ")
+                    .append(conf[i + 1]).append(";\n");
         }
         sb.append("};\n");
         Files.write(Paths.get(test), sb.toString().getBytes());
@@ -67,8 +63,17 @@ public class AllPlatforms {
         Configuration.setConfiguration(null);
         System.setProperty("java.security.auth.login.config", test);
 
-        LoginContext lc = new LoginContext("hello");
-        lc.login();
-        System.out.println(lc.getSubject());
+        try {
+            LoginContext lc = new LoginContext("hello");
+            lc.login();
+            System.out.println(lc.getSubject());
+            lc.logout();
+        } catch (FailedLoginException e) {
+            // This exception can occur in other platform module than the running one.
+            if(e.getMessage().startsWith("Failed in attempt to import")) {
+                System.out.println("Expected Exception found.");
+                e.printStackTrace(System.out);
+            }
+        }
     }
 }
-- 
GitLab


From c9a469a4591002e7f51317a8494a2df902db5bfa Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Thu, 31 Mar 2022 06:53:26 +0000
Subject: [PATCH 289/345] 8283784: java_lang_String::as_platform_dependent_str
 stores to oop in native state

Reviewed-by: kbarrett, shade, stefank
---
 src/hotspot/share/classfile/javaClasses.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index ae76dea73aa..51596a02a12 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -454,16 +454,18 @@ char* java_lang_String::as_platform_dependent_str(Handle java_string, TRAPS) {
   }
 
   char *native_platform_string;
-  { JavaThread* thread = THREAD;
-    jstring js = (jstring) JNIHandles::make_local(thread, java_string());
-    bool is_copy;
+  JavaThread* thread = THREAD;
+  jstring js = (jstring) JNIHandles::make_local(thread, java_string());
+  {
     HandleMark hm(thread);
     ThreadToNativeFromVM ttn(thread);
     JNIEnv *env = thread->jni_environment();
+    bool is_copy;
     native_platform_string = (_to_platform_string_fn)(env, js, &is_copy);
     assert(is_copy == JNI_TRUE, "is_copy value changed");
-    JNIHandles::destroy_local(js);
   }
+  JNIHandles::destroy_local(js);
+
   return native_platform_string;
 }
 
-- 
GitLab


From 1ca0ede60d961a1355397f27fd78a177432c7bc3 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Thu, 31 Mar 2022 06:55:45 +0000
Subject: [PATCH 290/345] 8283725: Launching java with
 "-Xlog:gc*=trace,safepoint*=trace,class*=trace" crashes the JVM

Reviewed-by: iklam, rehn
---
 src/hotspot/share/logging/logOutput.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/logging/logOutput.cpp b/src/hotspot/share/logging/logOutput.cpp
index 96b9893fa58..662444eca26 100644
--- a/src/hotspot/share/logging/logOutput.cpp
+++ b/src/hotspot/share/logging/logOutput.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -334,6 +334,11 @@ void LogOutput::update_config_string(const size_t on_level[LogLevel::Count]) {
 
     assert(n_deviates < deviating_tagsets, "deviating tag set array overflow");
     assert(prev_deviates > n_deviates, "number of deviating tag sets must never grow");
+
+    if (n_deviates == 1 && n_selections == 0) {
+      // we're done as we couldn't reduce things any further
+      break;
+    }
   }
   FREE_C_HEAP_ARRAY(LogTagSet*, deviates);
   FREE_C_HEAP_ARRAY(Selection, selections);
-- 
GitLab


From 3e643f459937a48b8df71666d137b90f349c7b41 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Thu, 31 Mar 2022 07:56:44 +0000
Subject: [PATCH 291/345] 8283799: Collapse identical catch branches in
 jdk.hotspot.agent

Reviewed-by: lmesnik, amenkov
---
 .../share/classes/sun/jvm/hotspot/HotSpotAgent.java   |  8 ++------
 .../hotspot/debugger/win32/coff/COFFFileParser.java   |  4 +---
 .../share/classes/sun/jvm/hotspot/ui/MemoryPanel.java |  5 +----
 .../sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java |  8 ++------
 .../jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java  | 10 +++-------
 .../sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java   | 10 +++-------
 .../jvm/hotspot/utilities/ReversePtrsAnalysis.java    |  6 +-----
 .../jvm/hotspot/utilities/RobustOopDeterminator.java  | 11 ++---------
 8 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
index 0890dcf8893..12983fc93cd 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
@@ -477,12 +477,8 @@ public class HotSpotAgent {
             throw new DebuggerException("Cannot find alternate SA Debugger: '" + alternateName + "'");
         } catch (NoSuchMethodException nsme) {
             throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' has missing constructor.");
-        } catch (InstantiationException ie) {
-            throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' fails to initialise: ", ie);
-        } catch (IllegalAccessException iae) {
-            throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' fails to initialise: ", iae);
-        } catch (InvocationTargetException iae) {
-            throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' fails to initialise: ", iae);
+        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+            throw new DebuggerException("Alternate SA Debugger: '" + alternateName + "' fails to initialise: ", e);
         }
 
         System.err.println("Loaded alternate HotSpot SA Debugger: " + alternateName);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java
index 10ac9255636..198f5ca6d07 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,8 +76,6 @@ public class COFFFileParser {
       // a bug if there is one. (FIXME)
       //   buf.order(ByteOrder.nativeOrder());
       return parse(new MappedByteBufferDataSource(buf));
-    } catch (FileNotFoundException e) {
-      throw new COFFException(e);
     } catch (IOException e) {
       throw new COFFException(e);
     }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java
index 76522a6676c..d1058978eee 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java
@@ -31,12 +31,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.math.*;
-import java.util.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.table.*;
 import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.ui.*;
 import sun.jvm.hotspot.utilities.PointerFinder;
 import sun.jvm.hotspot.utilities.PointerLocation;
 
@@ -219,8 +217,7 @@ public class MemoryPanel extends JPanel {
               String str = (String)t.getTransferData(DataFlavor.stringFlavor);
               handleImport(c, str);
               return true;
-            } catch (UnsupportedFlavorException ufe) {
-            } catch (IOException ioe) {
+            } catch (UnsupportedFlavorException | IOException e) {
             }
           }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java
index 42157bcae7c..114912593ee 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,11 +132,7 @@ public class CTypeTreeNodeAdapter extends FieldTreeNodeAdapter {
         try {
           Oop oop = VM.getVM().getObjectHeap().newOop(handle);
           return new OopTreeNodeAdapter(oop, cf, getTreeTableMode());
-        } catch (AddressException e) {
-          return new BadAddressTreeNodeAdapter(handle,
-                                           new CTypeFieldIdentifier(type, f),
-                                           getTreeTableMode());
-        } catch (UnknownOopException e) {
+        } catch (AddressException | UnknownOopException e) {
           return new BadAddressTreeNodeAdapter(handle,
                                            new CTypeFieldIdentifier(type, f),
                                            getTreeTableMode());
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java
index ba60d08429b..4a5ae3afe9f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/MetadataTreeNodeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -153,9 +153,7 @@ public class MetadataTreeNodeAdapter extends FieldTreeNodeAdapter {
       if (curField == index) {
         try {
           child = new MetadataTreeNodeAdapter(field.getValue(getObj()), field.getID(), getTreeTableMode());
-        } catch (AddressException e) {
-          child = new BadAddressTreeNodeAdapter(getObj().getAddress().getAddressAt(field.getOffset()), field, getTreeTableMode());
-        } catch (UnknownOopException e) {
+        } catch (AddressException | UnknownOopException e) {
           child = new BadAddressTreeNodeAdapter(getObj().getAddress().getAddressAt(field.getOffset()), field, getTreeTableMode());
         }
       }
@@ -166,9 +164,7 @@ public class MetadataTreeNodeAdapter extends FieldTreeNodeAdapter {
       if (curField == index) {
         try {
           child = new OopTreeNodeAdapter(field.getValue(getObj()), field.getID(), getTreeTableMode());
-        } catch (AddressException e) {
-          child = new BadAddressTreeNodeAdapter(field.getValueAsOopHandle(getObj()), field, getTreeTableMode());
-        } catch (UnknownOopException e) {
+        } catch (AddressException | UnknownOopException e) {
           child = new BadAddressTreeNodeAdapter(field.getValueAsOopHandle(getObj()), field, getTreeTableMode());
         }
       }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java
index c1c7fa18bee..3146ffa6636 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,9 +160,7 @@ public class OopTreeNodeAdapter extends FieldTreeNodeAdapter {
       if (curField == index) {
         try {
           child = new MetadataTreeNodeAdapter(field.getValue(getObj()), field.getID(), getTreeTableMode());
-        } catch (AddressException e) {
-          child = new BadAddressTreeNodeAdapter(getObj().getHandle().getAddressAt(field.getOffset()), field, getTreeTableMode());
-        } catch (UnknownOopException e) {
+        } catch (AddressException | UnknownOopException e) {
           child = new BadAddressTreeNodeAdapter(getObj().getHandle().getAddressAt(field.getOffset()), field, getTreeTableMode());
         }
       }
@@ -173,9 +171,7 @@ public class OopTreeNodeAdapter extends FieldTreeNodeAdapter {
       if (curField == index) {
         try {
           child = new OopTreeNodeAdapter(field.getValue(getObj()), field.getID(), getTreeTableMode());
-        } catch (AddressException e) {
-          child = new BadAddressTreeNodeAdapter(field.getValueAsOopHandle(getObj()), field, getTreeTableMode());
-        } catch (UnknownOopException e) {
+        } catch (AddressException | UnknownOopException e) {
           child = new BadAddressTreeNodeAdapter(field.getValueAsOopHandle(getObj()), field, getTreeTableMode());
         }
       }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java
index 34e67140b58..ec9a9554b14 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@ import sun.jvm.hotspot.gc.shared.*;
 import sun.jvm.hotspot.memory.*;
 import sun.jvm.hotspot.oops.*;
 import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.utilities.*;
 
 /** For a set of known roots, descends recursively into the object
     graph, for each object recording those objects (and their fields)
@@ -259,9 +258,6 @@ public class ReversePtrsAnalysis {
       }
     } catch (EmptyStackException e) {
       // Done
-    } catch (NullPointerException e) {
-      System.err.println("ReversePtrs: WARNING: " + e +
-        " during traversal");
     } catch (Exception e) {
       System.err.println("ReversePtrs: WARNING: " + e +
         " during traversal");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
index 1b7d4c74c27..3f701b8d24e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,10 @@
 
 package sun.jvm.hotspot.utilities;
 
-import java.util.*;
 import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.memory.*;
 import sun.jvm.hotspot.oops.Metadata;
-import sun.jvm.hotspot.oops.Klass;
 import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
 
 /** This class determines to the best of its ability, and in a
     reasonably robust fashion, whether a given pointer is an intact
@@ -77,9 +72,7 @@ public class RobustOopDeterminator {
         Metadata.instantiateWrapperFor(klassField.getValue(oop));
       }
       return true;
-    } catch (AddressException e) {
-      return false;
-    } catch (WrongTypeException e) {
+    } catch (AddressException | WrongTypeException e) {
       return false;
     }
   }
-- 
GitLab


From ef51dfd1536845d049da42973b92abb93e1317a0 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 31 Mar 2022 08:24:41 +0000
Subject: [PATCH 292/345] 8283791: Parallel: Remove unnecessary condition in
 PSKeepAliveClosure

Reviewed-by: tschatzl, iwalulya
---
 src/hotspot/share/gc/parallel/psScavenge.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index 4309b3af6c4..049bacaf1a5 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -162,13 +162,15 @@ public:
   }
 
   template <class T> void do_oop_work(T* p) {
-    assert (oopDesc::is_oop(RawAccess<IS_NOT_NULL>::oop_load(p)),
-            "expected an oop while scanning weak refs");
+#ifdef ASSERT
+    // Referent must be non-null and in from-space
+    oop obj = RawAccess<IS_NOT_NULL>::oop_load(p);
+    assert(oopDesc::is_oop(obj), "referent must be an oop");
+    assert(PSScavenge::is_obj_in_young(obj), "must be in young-gen");
+    assert(!PSScavenge::is_obj_in_to_space(obj), "must be in from-space");
+#endif
 
-    // Weak refs may be visited more than once.
-    if (PSScavenge::should_scavenge(p, _to_space)) {
-      _promotion_manager->copy_and_push_safe_barrier</*promote_immediately=*/false>(p);
-    }
+    _promotion_manager->copy_and_push_safe_barrier</*promote_immediately=*/false>(p);
   }
   virtual void do_oop(oop* p)       { PSKeepAliveClosure::do_oop_work(p); }
   virtual void do_oop(narrowOop* p) { PSKeepAliveClosure::do_oop_work(p); }
-- 
GitLab


From 3d4be14eba60e21d5c10f2ad07a20c018329c563 Mon Sep 17 00:00:00 2001
From: Alexander Scherbatiy <alexsch@openjdk.org>
Date: Thu, 31 Mar 2022 08:32:22 +0000
Subject: [PATCH 293/345] 8181571: printing to CUPS fails on mac sandbox app

Reviewed-by: prr
---
 .../unix/classes/sun/print/CUPSPrinter.java   | 53 ++++++++++++++++-
 .../unix/native/common/awt/CUPSfuncs.c        | 58 +++++++++++++++++--
 2 files changed, 102 insertions(+), 9 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
index e41a096f55f..0e398edef85 100644
--- a/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
+++ b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
@@ -53,6 +53,7 @@ public class CUPSPrinter  {
     private static native String getCupsServer();
     private static native int getCupsPort();
     private static native String getCupsDefaultPrinter();
+    private static native String[] getCupsDefaultPrinters();
     private static native boolean canConnect(String server, int port);
     private static native boolean initIDs();
     // These functions need to be synchronized as
@@ -77,6 +78,7 @@ public class CUPSPrinter  {
 
     private static boolean libFound;
     private static String cupsServer = null;
+    private static String domainSocketPathname = null;
     private static int cupsPort = 0;
 
     static {
@@ -96,6 +98,13 @@ public class CUPSPrinter  {
         libFound = initIDs();
         if (libFound) {
            cupsServer = getCupsServer();
+           // Is this a local domain socket pathname?
+           if (cupsServer != null && cupsServer.startsWith("/")) {
+               if (isSandboxedApp()) {
+                   domainSocketPathname = cupsServer;
+               }
+               cupsServer = "localhost";
+           }
            cupsPort = getCupsPort();
         }
     }
@@ -381,6 +390,20 @@ public class CUPSPrinter  {
      * Get list of all CUPS printers using IPP.
      */
     static String[] getAllPrinters() {
+
+        if (getDomainSocketPathname() != null) {
+            String[] printerNames = getCupsDefaultPrinters();
+            if (printerNames != null && printerNames.length > 0) {
+                String[] printerURIs = new String[printerNames.length];
+                for (int i=0; i< printerNames.length; i++) {
+                    printerURIs[i] = String.format("ipp://%s:%d/printers/%s",
+                            getServer(), getPort(), printerNames[i]);
+                }
+                return printerURIs;
+            }
+            return null;
+        }
+
         try {
             URL url = new URL("http", getServer(), getPort(), "");
 
@@ -464,15 +487,39 @@ public class CUPSPrinter  {
         return cupsPort;
     }
 
+    /**
+     * Returns CUPS domain socket pathname.
+     */
+    private static String getDomainSocketPathname() {
+        return domainSocketPathname;
+    }
+
+    @SuppressWarnings("removal")
+    private static boolean isSandboxedApp() {
+        if (PrintServiceLookupProvider.isMac()) {
+            return java.security.AccessController
+                    .doPrivileged((java.security.PrivilegedAction<Boolean>) () ->
+                            System.getenv("APP_SANDBOX_CONTAINER_ID") != null);
+        }
+        return false;
+    }
+
+
     /**
      * Detects if CUPS is running.
      */
     public static boolean isCupsRunning() {
         IPPPrintService.debug_println(debugPrefix+"libFound "+libFound);
         if (libFound) {
-            IPPPrintService.debug_println(debugPrefix+"CUPS server "+getServer()+
-                                          " port "+getPort());
-            return canConnect(getServer(), getPort());
+            String server = getDomainSocketPathname() != null
+                    ? getDomainSocketPathname()
+                    : getServer();
+            IPPPrintService.debug_println(debugPrefix+"CUPS server "+server+
+                                          " port "+getPort()+
+                                          (getDomainSocketPathname() != null
+                                                  ? " use domain socket pathname"
+                                                  : ""));
+            return canConnect(server, getPort());
         } else {
             return false;
         }
diff --git a/src/java.desktop/unix/native/common/awt/CUPSfuncs.c b/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
index 62f57ffde5e..52677659ed3 100644
--- a/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
+++ b/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
@@ -172,12 +172,7 @@ Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env,
     jstring cServer = NULL;
     const char* server = j2d_cupsServer();
     if (server != NULL) {
-        // Is this a local domain socket?
-        if (strncmp(server, "/", 1) == 0) {
-            cServer = JNU_NewStringPlatform(env, "localhost");
-        } else {
-            cServer = JNU_NewStringPlatform(env, server);
-        }
+        cServer = JNU_NewStringPlatform(env, server);
     }
     return cServer;
 }
@@ -219,6 +214,57 @@ Java_sun_print_CUPSPrinter_getCupsDefaultPrinter(JNIEnv *env,
     return cDefPrinter;
 }
 
+/*
+ * Returns list of default local printers
+ */
+JNIEXPORT jobjectArray JNICALL
+Java_sun_print_CUPSPrinter_getCupsDefaultPrinters(JNIEnv *env,
+                                                        jobject printObj)
+{
+    cups_dest_t *dests;
+    int i, j, num_dests;
+    jstring utf_str;
+    jclass cls;
+    jobjectArray nameArray = NULL;
+
+    cls = (*env)->FindClass(env, "java/lang/String");
+    CHECK_NULL_RETURN(cls, NULL);
+
+    num_dests = j2d_cupsGetDests(&dests);
+
+    if (dests == NULL) {
+        return NULL;
+    }
+
+    nameArray = (*env)->NewObjectArray(env, num_dests, cls, NULL);
+    if (nameArray == NULL) {
+        j2d_cupsFreeDests(num_dests, dests);
+        DPRINTF("CUPSfuncs::bad alloc new array\n", "")
+        return NULL;
+    }
+
+    for (i = 0; i < num_dests; i++) {
+            utf_str = JNU_NewStringPlatform(env, dests[i].name);
+            if (utf_str == NULL) {
+                for (j = i - 1; j >= 0; j--) {
+                    utf_str = (*env)->GetObjectArrayElement(env, nameArray, j);
+                    (*env)->SetObjectArrayElement(env, nameArray, j, NULL);
+                    (*env)->DeleteLocalRef(env, utf_str);
+                    utf_str = NULL;
+                }
+                j2d_cupsFreeDests(num_dests, dests);
+                (*env)->DeleteLocalRef(env, nameArray);
+                DPRINTF("CUPSfuncs::bad alloc new string ->name\n", "")
+                return NULL;
+            }
+            (*env)->SetObjectArrayElement(env, nameArray, i, utf_str);
+            (*env)->DeleteLocalRef(env, utf_str);
+    }
+
+    j2d_cupsFreeDests(num_dests, dests);
+    return nameArray;
+}
+
 /*
  * Checks if connection can be made to the server.
  *
-- 
GitLab


From 45d4d7da23f1d56c9bc7d4327892b902ce677764 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 31 Mar 2022 08:37:50 +0000
Subject: [PATCH 294/345] 8283337: Posix signal handler modification warning
 triggering incorrectly

Reviewed-by: stuefe, dholmes
---
 src/hotspot/os/posix/signals_posix.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 6e94b47712f..6ec5bbd6c2c 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -1244,8 +1244,10 @@ void set_signal_handler(int sig, bool do_check = true) {
   }
 #endif
 
-  // Save handler setup for later checking
-  vm_handlers.set(sig, &sigAct);
+  // Save handler setup for possible later checking
+  if (do_check) {
+    vm_handlers.set(sig, &sigAct);
+  }
   do_check_signal_periodically[sig] = do_check;
 
   int ret = sigaction(sig, &sigAct, &oldAct);
-- 
GitLab


From 1a5f5da0502d056388b8390b008a4ff0d22faf92 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Thu, 31 Mar 2022 08:45:06 +0000
Subject: [PATCH 295/345] 8283996: Reduce cost of year and month calculations

Reviewed-by: bpb, scolebourne, naoto, rriggs
---
 src/java.base/share/classes/java/time/LocalDate.java     | 9 +++++++--
 .../share/classes/java/time/zone/ZoneRules.java          | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index 94e170c8b13..e383f226493 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -363,9 +363,14 @@ public final class LocalDate
 
         // convert march-based values back to january-based
         int marchMonth0 = (marchDoy0 * 5 + 2) / 153;
-        int month = (marchMonth0 + 2) % 12 + 1;
+        int month = marchMonth0 + 3;
+        if (month > 12) {
+            month -= 12;
+        }
         int dom = marchDoy0 - (marchMonth0 * 306 + 5) / 10 + 1;
-        yearEst += marchMonth0 / 10;
+        if (marchDoy0 >= 306) {
+            yearEst++;
+        }
 
         return new LocalDate((int)yearEst, month, dom);
     }
diff --git a/src/java.base/share/classes/java/time/zone/ZoneRules.java b/src/java.base/share/classes/java/time/zone/ZoneRules.java
index 8f0792c4659..480ff2bb27c 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneRules.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneRules.java
@@ -974,11 +974,11 @@ public final class ZoneRules implements Serializable {
             doyEst = zeroDay - (365 * yearEst + yearEst / 4 - yearEst / 100 + yearEst / 400);
         }
         yearEst += adjust;  // reset any negative year
-        int marchDoy0 = (int) doyEst;
 
-        // convert march-based values back to january-based
-        int marchMonth0 = (marchDoy0 * 5 + 2) / 153;
-        yearEst += marchMonth0 / 10;
+        // convert march-based values back to january-based, adjust year
+        if (doyEst >= 306) {
+            yearEst++;
+        }
 
         // Cap to the max value
         return (int)Math.min(yearEst, Year.MAX_VALUE);
-- 
GitLab


From 0a9a7b6abc8d2c97b91c89eb842f483629132e43 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 31 Mar 2022 09:01:52 +0000
Subject: [PATCH 296/345] 8283642: JavaDoc of JFileChooser() need to be updated
 for default directory in Windows

Reviewed-by: aivanov
---
 .../share/classes/javax/swing/JFileChooser.java           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
index 2e0a80f788b..a44edec3565 100644
--- a/src/java.desktop/share/classes/javax/swing/JFileChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
@@ -303,7 +303,7 @@ public class JFileChooser extends JComponent implements Accessible {
     /**
      * Constructs a <code>JFileChooser</code> pointing to the user's
      * default directory. This default depends on the operating system.
-     * It is typically the "My Documents" folder on Windows, and the
+     * It is typically the "Documents" folder on Windows, and the
      * user's home directory on Unix.
      */
     public JFileChooser() {
@@ -315,7 +315,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * Passing in a <code>null</code>
      * string causes the file chooser to point to the user's default directory.
      * This default depends on the operating system. It is
-     * typically the "My Documents" folder on Windows, and the user's
+     * typically the "Documents" folder on Windows, and the user's
      * home directory on Unix.
      *
      * @param currentDirectoryPath  a <code>String</code> giving the path
@@ -330,7 +330,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * as the path. Passing in a <code>null</code> file
      * causes the file chooser to point to the user's default directory.
      * This default depends on the operating system. It is
-     * typically the "My Documents" folder on Windows, and the user's
+     * typically the "Documents" folder on Windows, and the user's
      * home directory on Unix.
      *
      * @param currentDirectory  a <code>File</code> object specifying
@@ -570,7 +570,7 @@ public class JFileChooser extends JComponent implements Accessible {
      * Sets the current directory. Passing in <code>null</code> sets the
      * file chooser to point to the user's default directory.
      * This default depends on the operating system. It is
-     * typically the "My Documents" folder on Windows, and the user's
+     * typically the "Documents" folder on Windows, and the user's
      * home directory on Unix.
      *
      * If the file passed in as <code>currentDirectory</code> is not a
-- 
GitLab


From 067b2581d9613c9020b2eb1f3196285fe0e7421d Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 31 Mar 2022 09:06:13 +0000
Subject: [PATCH 297/345] 8224977: [macos] On AquaLookAndFeel, Iconified
 JInternalFrame does not restore when Control + F5 is used.

Reviewed-by: serb
---
 test/jdk/ProblemList.txt                             | 1 -
 test/jdk/javax/swing/JInternalFrame/Test6325652.java | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 8fb2ed067a1..edea5a92ecd 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -720,7 +720,6 @@ javax/swing/text/DefaultCaret/HidingSelection/MultiSelectionTest.java 8213562 li
 javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
 javax/swing/JComboBox/8182031/ComboPopupTest.java 8196465 linux-all,macosx-all
 javax/swing/JFileChooser/6738668/bug6738668.java 8194946 generic-all
-javax/swing/JInternalFrame/Test6325652.java 8224977 macosx-all
 javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all
 javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java 8065099,8208565 macosx-all,linux-all
 javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765  macosx-all,linux-all
diff --git a/test/jdk/javax/swing/JInternalFrame/Test6325652.java b/test/jdk/javax/swing/JInternalFrame/Test6325652.java
index 0e867461f6c..300d57791d1 100644
--- a/test/jdk/javax/swing/JInternalFrame/Test6325652.java
+++ b/test/jdk/javax/swing/JInternalFrame/Test6325652.java
@@ -25,6 +25,7 @@
  * @test
  * @key headful
  * @bug 6325652 8159152
+ * @requires (os.family != "mac")
  * @summary Tests keyboard shortcuts
  * @library ..
  */
-- 
GitLab


From a11cc97439907439fa2cd65d44c9ffdd0fef241e Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Thu, 31 Mar 2022 10:52:50 +0000
Subject: [PATCH 298/345] 8283997: Unused argument in GraphKit::builtin_throw

Reviewed-by: roland, redestad, chagedorn
---
 src/hotspot/share/opto/graphKit.cpp | 6 +++---
 src/hotspot/share/opto/graphKit.hpp | 8 ++------
 src/hotspot/share/opto/parse2.cpp   | 2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index ecee3147787..2d790399cdb 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -526,7 +526,7 @@ void GraphKit::uncommon_trap_if_should_post_on_exceptions(Deoptimization::DeoptR
 }
 
 //------------------------------builtin_throw----------------------------------
-void GraphKit::builtin_throw(Deoptimization::DeoptReason reason, Node* arg) {
+void GraphKit::builtin_throw(Deoptimization::DeoptReason reason) {
   bool must_throw = true;
 
   // If this particular condition has not yet happened at this
@@ -3334,7 +3334,7 @@ Node* GraphKit::gen_checkcast(Node *obj, Node* superklass,
           bool is_aastore = (java_bc() == Bytecodes::_aastore);
           Deoptimization::DeoptReason reason = is_aastore ?
             Deoptimization::Reason_array_check : Deoptimization::Reason_class_check;
-          builtin_throw(reason, makecon(TypeKlassPtr::make(objtp->klass())));
+          builtin_throw(reason);
           return top();
         } else if (!too_many_traps_or_recompiles(Deoptimization::Reason_null_assert)) {
           return null_assert(obj);
@@ -3419,7 +3419,7 @@ Node* GraphKit::gen_checkcast(Node *obj, Node* superklass,
         bool is_aastore = (java_bc() == Bytecodes::_aastore);
         Deoptimization::DeoptReason reason = is_aastore ?
           Deoptimization::Reason_array_check : Deoptimization::Reason_class_check;
-        builtin_throw(reason, load_object_klass(not_null_obj));
+        builtin_throw(reason);
       }
     } else {
       (*failure_control) = not_subtype_ctrl;
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index b2a85b84f03..9ad350d559d 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -266,12 +266,8 @@ class GraphKit : public Phase {
   JVMState* transfer_exceptions_into_jvms();
 
   // Helper to throw a built-in exception.
-  // Range checks take the offending index.
-  // Cast and array store checks take the offending class.
-  // Others do not take the optional argument.
-  // The JVMS must allow the bytecode to be re-executed
-  // via an uncommon trap.
-  void builtin_throw(Deoptimization::DeoptReason reason, Node* arg = NULL);
+  // The JVMS must allow the bytecode to be re-executed via an uncommon trap.
+  void builtin_throw(Deoptimization::DeoptReason reason);
 
   // Helper to check the JavaThread::_should_post_on_exceptions flag
   // and branch to an uncommon_trap if it is true (with the specified reason and must_throw)
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index 4746fd7fafe..3731dfaa8d2 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -194,7 +194,7 @@ Node* Parse::array_addressing(BasicType type, int vals, const Type*& elemtype) {
         // If we have already recompiled with the range-check-widening
         // heroic optimization turned off, then we must really be throwing
         // range check exceptions.
-        builtin_throw(Deoptimization::Reason_range_check, idx);
+        builtin_throw(Deoptimization::Reason_range_check);
       }
     }
   }
-- 
GitLab


From 5740a3b6e635456b34b4f31d0f1e84d3e746b796 Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Thu, 31 Mar 2022 11:45:56 +0000
Subject: [PATCH 299/345] 8280193: summary javadoc for
 java.awt.GraphicsEnvironment#preferProportionalFonts broken

Reviewed-by: prr, aivanov
---
 .../share/classes/java/awt/GraphicsEnvironment.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
index 79102059b0e..0265142aee3 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
@@ -357,9 +357,9 @@ public abstract class GraphicsEnvironment {
     }
 
     /**
-     * Indicates a preference for proportional over non-proportional (e.g.
-     * dual-spaced CJK fonts) fonts in the mapping of logical fonts to
-     * physical fonts. If the default mapping contains fonts for which
+     * Indicates a preference for proportional over non-proportional (for
+     * example dual-spaced CJK fonts) fonts in the mapping of logical fonts
+     * to physical fonts. If the default mapping contains fonts for which
      * proportional and non-proportional variants exist, then calling
      * this method indicates the mapping should use a proportional variant.
      * <p>
-- 
GitLab


From 64025b0e47f4945145c86b9f2a7f46fa52c659b5 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 31 Mar 2022 13:30:16 +0000
Subject: [PATCH 300/345] 8283901: Introduce "make doctor" to diagnose build
 environment problems

Reviewed-by: erikj
---
 make/Doctor.gmk       | 148 ++++++++++++++++++++++++++++++++++++++++++
 make/Init.gmk         |   4 +-
 make/InitSupport.gmk  |  13 +---
 make/Main.gmk         |   9 ++-
 make/common/Utils.gmk |  15 +++++
 5 files changed, 176 insertions(+), 13 deletions(-)
 create mode 100644 make/Doctor.gmk

diff --git a/make/Doctor.gmk b/make/Doctor.gmk
new file mode 100644
index 00000000000..3acbb4aa38d
--- /dev/null
+++ b/make/Doctor.gmk
@@ -0,0 +1,148 @@
+#
+# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Doctor.gmk))
+
+################################################################################
+#
+# Help user diagnose possible errors and problems with the build environment.
+#
+
+prologue:
+	$(ECHO)
+	$(ECHO) '"make doctor" will help you analyze your build environment. It can highlight'
+	$(ECHO) 'certain well-known problems, but it can never find all possible errors.'
+
+TARGETS += prologue
+
+check-git: prologue
+	$(ECHO)
+	$(ECHO) '* Verifying that configure has picked up git...'
+        ifeq ($(GIT), )
+	  $(ECHO) 'WARNING: "git" is not present. This will disable several checks.'
+	  $(ECHO) '! Correct by installing git and verifying that it is in the PATH'
+        endif
+
+TARGETS += check-git
+
+ifneq ($(GIT), )
+  AUTOCRLF := $(shell $(GIT) config core.autocrlf)
+endif
+
+check-autocrlf: check-git
+        ifneq ($(GIT), )
+          ifeq ($(call isBuildOs, windows), true)
+	    $(ECHO)
+	    $(ECHO) '* Verifying git core.autocrlf value...'
+            ifneq ($(AUTOCRLF), false)
+	      $(ECHO) 'WARNING: core.autocrlf is not "false".  HIGH RISK of build failure!'
+	      $(ECHO) '! Correct by running 'git config --global core.autocrlf false' and re-cloning the repo'
+            endif
+          endif
+        endif
+
+TARGETS += check-autocrlf
+
+check-configure-warnings: check-autocrlf
+	$(ECHO)
+	$(ECHO) '* Checking for warnings from configure...'
+	warning_output=`$(GREP) -e "^\* Memory limit:" -A 300 $(OUTPUTDIR)/configure.log | $(TAIL) -n +3 | $(SED) -e '$(DOLLAR){/^$(DOLLAR)/d;}'` && \
+	if test -n "$$warning_output" ; then \
+	  $(ECHO) ' ---' ; \
+	  $(GREP) -e "^\* Memory limit:" -A 300 $(OUTPUTDIR)/configure.log | $(TAIL) -n +3 | $(SED) -e '$(DOLLAR){/^$(DOLLAR)/d;}' ; \
+	  $(ECHO) ' ---' ; \
+	  $(ECHO) '! Inspect the warnings, fix any problems, and re-run configure' ; \
+	fi
+
+TARGETS += check-configure-warnings
+
+ifneq ($(GIT), )
+  # This might have been set by custom component
+  UNTRACKED_FILES ?= $(shell $(GIT) status --porcelain --ignored | $(CUT) -c 4-)
+endif
+
+check-core-files: check-configure-warnings
+        ifneq ($(GIT), )
+	  $(ECHO)
+	  $(ECHO) '* Checking for left-over core files...'
+	  core_files_found=`echo "$(UNTRACKED_FILES)" | $(TR) ' ' '\n' | $(GREP) core` && \
+	  if test -n "$$core_files_found" ; then \
+	    $(ECHO) 'Found these potential core files. They might interfere with the build process:' ; \
+	    $(ECHO) ' ---' ; \
+	    $(ECHO) $$core_files_found | $(TR) ' ' '\n'; \
+	    $(ECHO) ' ---' ; \
+	    $(ECHO) '! Remove left-over core files' ; \
+	  fi || : # do nothing if grep returns non-0 value
+        endif
+
+TARGETS += check-core-files
+
+check-bad-file-names: check-core-files
+        ifneq ($(GIT), )
+	  $(ECHO)
+	  $(ECHO) '* Checking for untracked files with illegal names...'
+	  core_files_found=`echo "$(UNTRACKED_FILES)" | $(TR) ' ' '\n' | $(GREP) '#'` && \
+	  if test -n "$$core_files_found" ; then \
+	    $(ECHO) 'Found these files with illegal names. They *will* cause build failures:' ; \
+	    $(ECHO) ' ---' ; \
+	    $(ECHO) $$core_files_found | $(TR) ' ' '\n'; \
+	    $(ECHO) ' ---' ; \
+	    $(ECHO) '! Remove all files with '#' in their name from the JDK source tree' ; \
+	  fi || : # do nothing if grep returns non-0 value
+        endif
+
+TARGETS += check-bad-file-names
+
+epilogue: check-bad-file-names
+	$(ECHO)
+	$(ECHO) '* If all else fails, try removing the entire build directory and re-creating'
+	$(ECHO) 'the same configuration using:'
+	$(ECHO) ' ---' ; \
+	$(ECHO) configure_command_line=\$$\(make print-configuration\)
+	$(ECHO) make dist-clean
+	$(ECHO) bash configure \$$configure_command_line
+	$(ECHO) ' ---' ; \
+	$(ECHO)
+	$(ECHO) '* The build README (doc/building.md) is a great source of information,'
+	$(ECHO) 'especially the chapter "Fixing Unexpected Build Failures". Check it out!'
+	$(ECHO)
+	$(ECHO) '* If you still need assistance please contact build-dev@openjdk.java.net.'
+	$(ECHO)
+
+TARGETS += epilogue
+
+################################################################################
+
+doctor: $(TARGETS)
+
+all: doctor
+
+.PHONY: default all doctor $(TARGETS)
diff --git a/make/Init.gmk b/make/Init.gmk
index 4d297ee85e9..d20ea3b6f05 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -352,7 +352,7 @@ else # HAS_SPEC=true
 	$(call PrintFailureReports)
 	$(call PrintBuildLogFailures)
 	$(call ReportProfileTimes)
-	$(PRINTF) "Hint: See doc/building.html#troubleshooting for assistance.\n\n"
+	$(PRINTF) "HELP: Run 'make doctor' to diagnose build problems.\n\n"
         ifneq ($(COMPARE_BUILD), )
 	  $(call CleanupCompareBuild)
         endif
diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index 62fdc438c8a..ceb44f55194 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -312,14 +312,7 @@ else # $(HAS_SPEC)=true
     ifeq ($$(SOURCE_DATE), updated)
       # For static values of SOURCE_DATE (not "updated"), these are set in spec.gmk
       export SOURCE_DATE_EPOCH := $$(shell $$(DATE) +"%s")
-      ifeq ($$(IS_GNU_DATE), yes)
-        export SOURCE_DATE_ISO_8601 := $$(shell $$(DATE) --utc \
-            --date="@$$(SOURCE_DATE_EPOCH)" +"$$(ISO_8601_FORMAT_STRING)" \
-            2> /dev/null)
-      else
-        export SOURCE_DATE_ISO_8601 := $$(shell $$(DATE) -u -j -f "%s" \
-            "$$(SOURCE_DATE_EPOCH)" +"$$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
-      endif
+      export SOURCE_DATE_ISO_8601 := $$(call EpochToISO8601, $$(SOURCE_DATE_EPOCH))
     endif
   endef
 
@@ -468,10 +461,10 @@ else # $(HAS_SPEC)=true
 	    $(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \
 	    $(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \
 	    $(PRINTF) "=== End of repeated output ===\n" ; \
-	    $(PRINTF) "\nHint: Try searching the build log for the name of the first failed target.\n" ; \
+	    $(PRINTF) "\nHELP: Try searching the build log for the name of the first failed target.\n" ; \
 	  else \
 	    $(PRINTF) "\nNo indication of failed target found.\n" ; \
-	    $(PRINTF) "Hint: Try searching the build log for '] Error'.\n" ; \
+	    $(PRINTF) "HELP: Try searching the build log for '] Error'.\n" ; \
 	  fi \
 	)
   endef
diff --git a/make/Main.gmk b/make/Main.gmk
index 26e470f9c40..45bed0d0457 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -260,6 +260,13 @@ $(eval $(call SetupTarget, hotspot-ide-project, \
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
     $(HOTSPOT_VARIANT_LIBS_TARGETS)
 
+################################################################################
+# Help and user support
+
+$(eval $(call SetupTarget, doctor, \
+    MAKEFILE := Doctor, \
+))
+
 ################################################################################
 # Generate libs and launcher targets for creating compile_commands.json fragments
 define DeclareCompileCommandsRecipe
diff --git a/make/common/Utils.gmk b/make/common/Utils.gmk
index aba9a7cb417..bc2cd3d857b 100644
--- a/make/common/Utils.gmk
+++ b/make/common/Utils.gmk
@@ -216,6 +216,21 @@ Or = \
   $(strip $(if $(filter-out true false, $1), $(error Non-boolean values: $1)) \
   $(if $(strip $(filter-out false, $1)), true, false))
 
+
+################################################################################
+# Convert an UNIX epoch based timestamp (as an integer) to an ISO 8601 date
+# string.
+# Param 1 - timestamp
+ifeq ($(IS_GNU_DATE), yes)
+  EpochToISO8601 = \
+    $(shell $(DATE) --utc --date="@$(strip $1)" \
+         +"$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
+else
+  EpochToISO8601 = \
+    $(shell $(DATE) -u -j -f "%s" "$(strip $1)" \
+         +"$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
+endif
+
 ################################################################################
 # Parse a multiple-keyword variable, like FOO="KEYWORD1=val1;KEYWORD2=val2;..."
 # These will be converted into a series of variables like FOO_KEYWORD1=val1,
-- 
GitLab


From 77a205aa4cfe4892843f22dce63eb85789b4b321 Mon Sep 17 00:00:00 2001
From: Jie Fu <jiefu@openjdk.org>
Date: Thu, 31 Mar 2022 13:51:12 +0000
Subject: [PATCH 301/345] 8284090:
 com/sun/security/auth/module/AllPlatforms.java fails to compile

Reviewed-by: mullan
---
 test/jdk/com/sun/security/auth/module/AllPlatforms.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/com/sun/security/auth/module/AllPlatforms.java b/test/jdk/com/sun/security/auth/module/AllPlatforms.java
index 31a16784eaa..79eea7b4d23 100644
--- a/test/jdk/com/sun/security/auth/module/AllPlatforms.java
+++ b/test/jdk/com/sun/security/auth/module/AllPlatforms.java
@@ -31,7 +31,7 @@ import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import javax.security.auth.login.LoginException;
+import javax.security.auth.login.FailedLoginException;
 
 public class AllPlatforms {
 
-- 
GitLab


From 73cb922bfc13a00bd1e07a41c6971ae7e1ac7005 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Thu, 31 Mar 2022 15:23:40 +0000
Subject: [PATCH 302/345] 8284026: Use unmodifiable collections where practical

Reviewed-by: jjg
---
 .../javadoc/internal/api/JavadocTaskImpl.java   |  8 ++++----
 .../doclets/formats/html/ClassWriterImpl.java   |  5 -----
 .../formats/html/DocFilesHandlerImpl.java       |  5 ++---
 .../doclets/formats/html/HtmlDocletWriter.java  |  3 +--
 .../formats/html/IndexRedirectWriter.java       |  4 ++--
 .../doclets/formats/html/ModuleWriterImpl.java  |  7 +++----
 .../doclets/formats/html/Signatures.java        |  5 ++---
 .../formats/html/markup/ContentBuilder.java     |  5 ++---
 .../doclets/formats/html/markup/Head.java       |  7 +++----
 .../doclets/toolkit/BaseConfiguration.java      |  2 +-
 .../internal/doclets/toolkit/BaseOptions.java   |  3 +--
 .../doclets/toolkit/taglets/TagletManager.java  |  5 ++---
 .../doclets/toolkit/taglets/ThrowsTaglet.java   |  4 +---
 .../doclets/toolkit/util/CommentHelper.java     |  5 ++---
 .../doclets/toolkit/util/DocFinder.java         |  4 ++--
 .../doclets/toolkit/util/MetaKeywords.java      |  6 +++---
 .../internal/doclets/toolkit/util/Utils.java    | 17 ++++++++---------
 .../toolkit/util/VisibleMemberTable.java        | 14 +++++++-------
 .../jdk/javadoc/internal/doclint/Env.java       |  4 ++--
 .../jdk/javadoc/internal/doclint/HtmlTag.java   |  7 +++----
 .../javadoc/internal/tool/ElementsTable.java    | 10 +++++-----
 .../jdk/javadoc/internal/tool/Start.java        |  5 ++---
 22 files changed, 58 insertions(+), 77 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java
index 94470974247..cb41ebb6189 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTaskImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
 package jdk.javadoc.internal.api;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.tools.DocumentationTool.DocumentationTask;
@@ -67,9 +67,9 @@ public class JavadocTaskImpl implements DocumentationTask {
         this.context = context;
         this.docletClass = docletClass;
 
-        this.options = (options == null) ? Collections.emptySet()
+        this.options = (options == null) ? Set.of()
                 : nullCheck(options);
-        this.fileObjects = (fileObjects == null) ? Collections.emptySet()
+        this.fileObjects = (fileObjects == null) ? Set.of()
                 : nullCheck(fileObjects);
         setLocale(Locale.getDefault());
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
index 45b10dc89e1..7f1e15292d4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
@@ -27,7 +27,6 @@ package jdk.javadoc.internal.doclets.formats.html;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
@@ -68,10 +67,6 @@ import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
  *  deletion without notice.</b>
  *
  * @see javax.lang.model.element.TypeElement
- * @see java.util.Collections
- * @see java.util.List
- * @see java.util.ArrayList
- * @see java.util.HashMap
  */
 public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWriter {
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
index 652e53a3075..ba1e5eb0013 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@ import javax.tools.JavaFileManager.Location;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
@@ -213,7 +212,7 @@ public class DocFilesHandlerImpl implements DocFilesHandler {
                 .setHeader(docletWriter.getHeader(PageMode.DOC_FILE, element))
                 .addMainContent(pageContent)
                 .setFooter(docletWriter.getFooter()));
-        docletWriter.printHtmlDocument(Collections.emptyList(), null, localTagsContent, Collections.emptyList(), htmlContent);
+        docletWriter.printHtmlDocument(List.of(), null, localTagsContent, List.of(), htmlContent);
     }
 
 
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 ac6d395cb25..3c4733c2eb9 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
@@ -26,7 +26,6 @@
 package jdk.javadoc.internal.doclets.formats.html;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -411,7 +410,7 @@ public class HtmlDocletWriter {
                                   String description,
                                   Content body)
             throws DocFileIOException {
-        printHtmlDocument(metakeywords, description, new ContentBuilder(), Collections.emptyList(), body);
+        printHtmlDocument(metakeywords, description, new ContentBuilder(), List.of(), body);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
index 299e565a657..bf53e06fcce 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
@@ -25,7 +25,7 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import java.util.Collections;
+import java.util.List;
 
 import jdk.javadoc.internal.doclets.formats.html.markup.Head;
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
@@ -78,7 +78,7 @@ public class IndexRedirectWriter extends HtmlDocletWriter {
                 .setTimestamp(!options.noTimestamp())
                 .setDescription("index redirect")
                 .setGenerator(getGenerator(getClass()))
-                .setStylesheets(configuration.getMainStylesheet(), Collections.emptyList()) // avoid reference to default stylesheet
+                .setStylesheets(configuration.getMainStylesheet(), List.of()) // avoid reference to default stylesheet
                 .addDefaultScript(false);
 
         String title = (options.windowTitle().length() > 0)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
index 30803551b2f..8f668fa0ffa 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
@@ -26,7 +26,6 @@
 package jdk.javadoc.internal.doclets.formats.html;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -264,11 +263,11 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
         });
 
         // Get all packages if module is open or if displaying concealed modules
-        for (PackageElement pkg : utils.getModulePackageMap().getOrDefault(mdle, Collections.emptySet())) {
+        for (PackageElement pkg : utils.getModulePackageMap().getOrDefault(mdle, Set.of())) {
             if (shouldDocument(pkg) && (mdle.isOpen() || moduleMode == ModuleMode.ALL)) {
                 PackageEntry e = new PackageEntry();
                 if (mdle.isOpen()) {
-                    e.openedTo = Collections.emptySet();
+                    e.openedTo = Set.of();
                 }
                 packages.put(pkg, e);
             }
@@ -329,7 +328,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
             }
             SortedSet<PackageElement> openPackages = new TreeSet<>(utils.comparators.makePackageComparator());
             if (module.isOpen()) {
-                openPackages.addAll(utils.getModulePackageMap().getOrDefault(module, Collections.emptySet()));
+                openPackages.addAll(utils.getModulePackageMap().getOrDefault(module, Set.of()));
             } else {
                 ElementFilter.opensIn(module.getDirectives()).forEach(directive -> {
                     PackageElement pkg = directive.getPackage();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
index 6b54c48b975..3ed0320588a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@ import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementKindVisitor14;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
@@ -106,7 +105,7 @@ public class Signatures {
         private final HtmlConfiguration configuration;
         private Content modifiers;
 
-        private static final Set<String> previewModifiers = Collections.emptySet();
+        private static final Set<String> previewModifiers = Set.of();
 
          TypeSignature(TypeElement typeElement, HtmlDocletWriter writer) {
              this.typeElement = typeElement;
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 79d398f9c9e..06112b09e90 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package jdk.javadoc.internal.doclets.formats.html.markup;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -38,7 +37,7 @@ import jdk.javadoc.internal.doclets.toolkit.Content;
  * A sequence of Content nodes.
  */
 public class ContentBuilder extends Content {
-    protected List<Content> contents = Collections.emptyList();
+    protected List<Content> contents = List.of();
 
     public ContentBuilder() { }
 
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 adbd5ef09fd..4c8e8a2e0b6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -61,12 +60,12 @@ public class Head extends Content {
     private String generator;
     private boolean showTimestamp;
     private DocPath mainStylesheet;
-    private List<DocPath> additionalStylesheets = Collections.emptyList();
+    private List<DocPath> additionalStylesheets = List.of();
     private boolean index;
     private Script mainBodyScript;
     private final List<Script> scripts;
     // Scripts added via --add-script option
-    private List<DocPath> additionalScripts = Collections.emptyList();
+    private List<DocPath> additionalScripts = List.of();
     private final List<Content> extraContent;
     private boolean addDefaultScript = true;
     private DocPath canonicalLink;
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 be6deabf6cd..d76ab525ac1 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
@@ -347,7 +347,7 @@ public abstract class BaseConfiguration {
         }
 
         // add entries for modules which may not have exported packages
-        modules.forEach(mdle -> modulePackages.computeIfAbsent(mdle, m -> Collections.emptySet()));
+        modules.forEach(mdle -> modulePackages.computeIfAbsent(mdle, m -> Set.of()));
 
         modules.addAll(modulePackages.keySet());
         showModules = !modules.isEmpty();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java
index 30a6b4bb8c1..47383b35cf1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java
@@ -40,7 +40,6 @@ import java.time.temporal.TemporalUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -1028,7 +1027,7 @@ public abstract class BaseOptions {
      * Arguments for command line option {@code --since}.
      */
     public List<String> since() {
-        return Collections.unmodifiableList(since);
+        return List.copyOf(since);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
index 134d5427634..a17e4bed1ec 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -234,7 +233,7 @@ public class TagletManager {
                 }
                 sfm.setLocation(TAGLET_PATH, paths);
             } else if (!sfm.hasLocation(TAGLET_PATH)) {
-                sfm.setLocation(TAGLET_PATH, Collections.emptyList());
+                sfm.setLocation(TAGLET_PATH, List.of());
             }
         } else if (tagletPath != null) {
             messages.error("doclet.not_standard_file_manager");
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java
index 9e3213e68a7..5851980a4b9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java
@@ -25,7 +25,6 @@
 
 package jdk.javadoc.internal.doclets.toolkit.taglets;
 
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,7 +34,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
@@ -251,6 +249,6 @@ public class ThrowsTaglet extends BaseTaglet
             }
             return map;
         }
-        return Collections.emptyMap();
+        return Map.of();
     }
 }
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 02c081b0cfc..9b9b32d0721 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package jdk.javadoc.internal.doclets.toolkit.util;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -677,7 +676,7 @@ public class CommentHelper {
 
             @Override
             protected List<? extends DocTree> defaultAction(DocTree node, Void p) {
-               return Collections.emptyList();
+               return List.of();
             }
         }.visit(dtree, null);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java
index 172d7f2e88e..ae5f911e093 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -197,7 +197,7 @@ public class DocFinder {
         /**
          * The inherited documentation.
          */
-        public List<? extends DocTree> inlineTags = Collections.emptyList();
+        public List<? extends DocTree> inlineTags = List.of();
 
         /**
          * False if documentation could not be inherited.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
index 788e2151791..69eedccf5e0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,9 +117,9 @@ public class MetaKeywords {
      */
     public List<String> getMetaKeywordsForModule(ModuleElement mdle) {
         if (options.keywords()) {
-            return Arrays.asList(mdle.getQualifiedName() + " " + "module");
+            return List.of(mdle.getQualifiedName() + " " + "module");
         } else {
-            return Collections.emptyList();
+            return List.of();
         }
     }
 
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 21f16a01c5c..cbf35e571c7 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
@@ -35,7 +35,6 @@ import java.text.RuleBasedCollator;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -643,7 +642,7 @@ public class Utils {
         if (!bounds.isEmpty()) {
             TypeMirror upperBound = bounds.get(bounds.size() - 1);
             if (ignoreBounds(upperBound)) {
-                return Collections.emptyList();
+                return List.of();
             }
         }
         return bounds;
@@ -764,7 +763,7 @@ public class Utils {
     }
 
     public TypeMirror getDeclaredType(TypeElement enclosing, TypeMirror target) {
-        return getDeclaredType(Collections.emptyList(), enclosing, target);
+        return getDeclaredType(List.of(), enclosing, target);
     }
 
     /**
@@ -2261,7 +2260,7 @@ public class Utils {
     }
 
     public List<? extends DocTree> getBlockTags(DocCommentTree dcTree) {
-        return dcTree == null ? Collections.emptyList() : dcTree.getBlockTags();
+        return dcTree == null ? List.of() : dcTree.getBlockTags();
     }
 
     public List<? extends DocTree> getBlockTags(Element element, Predicate<DocTree> filter) {
@@ -2480,21 +2479,21 @@ public class Utils {
     public List<? extends DocTree> getPreamble(Element element) {
         DocCommentTree docCommentTree = getDocCommentTree(element);
         return docCommentTree == null
-                ? Collections.emptyList()
+                ? List.of()
                 : docCommentTree.getPreamble();
     }
 
     public List<? extends DocTree> getFullBody(Element element) {
         DocCommentTree docCommentTree = getDocCommentTree(element);
             return (docCommentTree == null)
-                    ? Collections.emptyList()
+                    ? List.of()
                     : docCommentTree.getFullBody();
     }
 
     public List<? extends DocTree> getBody(Element element) {
         DocCommentTree docCommentTree = getDocCommentTree(element);
         return (docCommentTree == null)
-                ? Collections.emptyList()
+                ? List.of()
                 : docCommentTree.getFullBody();
     }
 
@@ -2549,7 +2548,7 @@ public class Utils {
     public List<? extends DocTree> getFirstSentenceTrees(Element element) {
         DocCommentTree dcTree = getDocCommentTree(element);
         if (dcTree == null) {
-            return Collections.emptyList();
+            return List.of();
         }
         return new ArrayList<>(dcTree.getFirstSentence());
     }
@@ -2649,7 +2648,7 @@ public class Utils {
     public PreviewSummary declaredUsingPreviewAPIs(Element el) {
         if (el.asType().getKind() == ERROR) {
             // Can happen with undocumented --ignore-source-errors option
-            return new PreviewSummary(Collections.emptySet(), Collections.emptySet(), Collections.emptySet());
+            return new PreviewSummary(Set.of(), Set.of(), Set.of());
         }
         List<TypeElement> usedInDeclaration = new ArrayList<>(annotations2Classes(el));
         switch (el.getKind()) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
index 5ef16d61fcf..f673ead07ce 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
@@ -221,7 +221,7 @@ public class VisibleMemberTable {
      */
     public List<Element> getAllVisibleMembers(Kind kind) {
         ensureInitialized();
-        return visibleMembers.getOrDefault(kind, Collections.emptyList());
+        return visibleMembers.getOrDefault(kind, List.of());
     }
 
     /**
@@ -234,7 +234,7 @@ public class VisibleMemberTable {
     public List<Element> getVisibleMembers(Kind kind, Predicate<Element> p) {
         ensureInitialized();
 
-        return visibleMembers.getOrDefault(kind, Collections.emptyList()).stream()
+        return visibleMembers.getOrDefault(kind, List.of()).stream()
                 .filter(p)
                 .toList();
     }
@@ -799,10 +799,10 @@ public class VisibleMemberTable {
             // Freeze the data structures
             for (Kind kind : Kind.values()) {
                 orderedMembers.computeIfPresent(kind, (k, v) -> Collections.unmodifiableList(v));
-                orderedMembers.computeIfAbsent(kind, t -> Collections.emptyList());
+                orderedMembers.computeIfAbsent(kind, t -> List.of());
 
                 memberMap.computeIfPresent(kind, (k, v) -> Collections.unmodifiableMap(v));
-                memberMap.computeIfAbsent(kind, t -> Collections.emptyMap());
+                memberMap.computeIfAbsent(kind, t -> Map.of());
             }
         }
 
@@ -840,12 +840,12 @@ public class VisibleMemberTable {
 
         List<Element> getMembers(String key, Kind kind) {
             Map<String, List<Element>> map = memberMap.get(kind);
-            return map.getOrDefault(key, Collections.emptyList());
+            return map.getOrDefault(key, List.of());
         }
 
         <T extends Element> List<T> getMembers(String key, Kind kind, Class<T> clazz) {
             Map<String, List<Element>> map = memberMap.get(kind);
-            return map.getOrDefault(key, Collections.emptyList())
+            return map.getOrDefault(key, List.of())
                     .stream()
                     .map(clazz::cast)
                     .toList();
@@ -901,7 +901,7 @@ public class VisibleMemberTable {
             return;
 
         PropertyUtils pUtils = config.propertyUtils;
-        List<Element> list = visibleMembers.getOrDefault(Kind.METHODS, Collections.emptyList())
+        List<Element> list = visibleMembers.getOrDefault(Kind.METHODS, List.of())
                 .stream()
                 .filter(e -> pUtils.isPropertyMethod((ExecutableElement) e))
                 .toList();
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 be13ca43fd1..db8799585aa 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -362,7 +362,7 @@ public class Env {
 
             }
         }
-        return Collections.emptyList();
+        return List.of();
     }
 
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java
index 6e7f84e4267..68495019c16 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package jdk.javadoc.internal.doclint;
 
-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -554,11 +553,11 @@ public enum HtmlTag {
     private final Map<Attr,AttrKind> attrs;
 
     HtmlTag(BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
-        this(ElemKind.OK, blockType, endKind, Collections.emptySet(), attrMaps);
+        this(ElemKind.OK, blockType, endKind, Set.of(), attrMaps);
     }
 
     HtmlTag(ElemKind elemKind, BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
-        this(elemKind, blockType, endKind, Collections.emptySet(), attrMaps);
+        this(elemKind, blockType, endKind, Set.of(), attrMaps);
     }
 
     HtmlTag(BlockType blockType, EndKind endKind, Set<Flag> flags, AttrMap... attrMaps) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
index e92176cbd85..6e1b674c3c4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
@@ -185,8 +185,8 @@ public class ElementsTable {
     private Set<ModulePackage> excludePackages = new LinkedHashSet<>();
     private Set<ModulePackage> subPackages = new LinkedHashSet<>();
 
-    private List<JCClassDecl> classDecList = Collections.emptyList();
-    private List<String> classArgList = Collections.emptyList();
+    private List<JCClassDecl> classDecList = List.of();
+    private List<String> classArgList = List.of();
     private com.sun.tools.javac.util.List<JCCompilationUnit> classTreeList = null;
 
     private final Set<JavaFileObject.Kind> sourceKinds = EnumSet.of(JavaFileObject.Kind.SOURCE);
@@ -837,7 +837,7 @@ public class ElementsTable {
         ListBuffer<JavaFileObject> lb = new ListBuffer<>();
         List<Location> locs = getLocation(modpkg);
         if (locs.isEmpty()) {
-            return Collections.emptyList();
+            return List.of();
         }
         String pname = modpkg.packageName;
         for (Location packageLocn : locs) {
@@ -865,7 +865,7 @@ public class ElementsTable {
 
     private List<Location> getLocation(ModulePackage modpkg) throws ToolException {
         if (locations.size() == 1 && !locations.contains(StandardLocation.MODULE_SOURCE_PATH)) {
-            return Collections.singletonList(locations.get(0));
+            return List.of(locations.get(0));
         }
 
         if (modpkg.hasModule()) {
@@ -874,7 +874,7 @@ public class ElementsTable {
         // TODO: handle invalid results better.
         ModuleSymbol msym = findModuleOfPackageName(modpkg.packageName);
         if (msym == null) {
-            return Collections.emptyList();
+            return List.of();
         }
         return getModuleLocation(locations, msym.name.toString());
     }
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 4d25ac5f22a..3a103e3ab19 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
@@ -31,7 +31,6 @@ import java.io.PrintWriter;
 import java.text.BreakIterator;
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.IllformedLocaleException;
 import java.util.List;
@@ -349,7 +348,7 @@ public class Start {
             error("main.cant.read", e.getMessage());
             return ERROR;
         }
-        return begin(allArgs, Collections.emptySet());
+        return begin(allArgs, Set.of());
     }
 
     // Called by the JSR 199 API
@@ -638,7 +637,7 @@ public class Start {
                             text = log.getText("main.unnecessary_arg_provided", argBase);
                             throw new OptionException(ERROR, this::showUsage, text);
                         case 1:
-                            if (!opt.process(arg, Collections.singletonList(argVal))) {
+                            if (!opt.process(arg, List.of(argVal))) {
                                 m = -1;
                             }
                             break;
-- 
GitLab


From 49fcc7a5c3619b0580b263bbbb9431ad46c0f154 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 31 Mar 2022 15:46:34 +0000
Subject: [PATCH 303/345] 8283013: Simplify Arguments::parse_argument()

Reviewed-by: dholmes, ccheung
---
 src/hotspot/share/runtime/arguments.cpp       | 193 ++++++++----------
 src/hotspot/share/runtime/arguments.hpp       |   5 +-
 test/hotspot/gtest/runtime/test_arguments.cpp |  55 ++++-
 .../optionsvalidation/DoubleJVMOption.java    |   7 +-
 4 files changed, 144 insertions(+), 116 deletions(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index db1480c4fb6..06cc989278a 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -891,13 +891,21 @@ static bool set_bool_flag(JVMFlag* flag, bool value, JVMFlagOrigin origin) {
   }
 }
 
-static bool set_fp_numeric_flag(JVMFlag* flag, char* value, JVMFlagOrigin origin) {
+static bool set_fp_numeric_flag(JVMFlag* flag, const char* value, JVMFlagOrigin origin) {
+  // strtod allows leading whitespace, but our flag format does not.
+  if (*value == '\0' || isspace(*value)) {
+    return false;
+  }
   char* end;
   errno = 0;
   double v = strtod(value, &end);
   if ((errno != 0) || (*end != 0)) {
     return false;
   }
+  if (g_isnan(v) || !g_isfinite(v)) {
+    // Currently we cannot handle these special values.
+    return false;
+  }
 
   if (JVMFlagAccess::set_double(flag, &v, origin) == JVMFlag::SUCCESS) {
     return true;
@@ -905,60 +913,48 @@ static bool set_fp_numeric_flag(JVMFlag* flag, char* value, JVMFlagOrigin origin
   return false;
 }
 
-static JVMFlag::Error set_numeric_flag(JVMFlag* flag, char* value, JVMFlagOrigin origin) {
-  if (flag == NULL) {
-    return JVMFlag::INVALID_FLAG;
-  }
+static bool set_numeric_flag(JVMFlag* flag, const char* value, JVMFlagOrigin origin) {
+  JVMFlag::Error result = JVMFlag::WRONG_FORMAT;
 
   if (flag->is_int()) {
     int v;
     if (parse_integer(value, &v)) {
-      return JVMFlagAccess::set_int(flag, &v, origin);
+      result = JVMFlagAccess::set_int(flag, &v, origin);
     }
   } else if (flag->is_uint()) {
     uint v;
     if (parse_integer(value, &v)) {
-      return JVMFlagAccess::set_uint(flag, &v, origin);
+      result = JVMFlagAccess::set_uint(flag, &v, origin);
     }
   } else if (flag->is_intx()) {
     intx v;
     if (parse_integer(value, &v)) {
-      return JVMFlagAccess::set_intx(flag, &v, origin);
+      result = JVMFlagAccess::set_intx(flag, &v, origin);
     }
   } else if (flag->is_uintx()) {
     uintx v;
     if (parse_integer(value, &v)) {
-      return JVMFlagAccess::set_uintx(flag, &v, origin);
+      result = JVMFlagAccess::set_uintx(flag, &v, origin);
     }
   } else if (flag->is_uint64_t()) {
     uint64_t v;
     if (parse_integer(value, &v)) {
-      return JVMFlagAccess::set_uint64_t(flag, &v, origin);
+      result = JVMFlagAccess::set_uint64_t(flag, &v, origin);
     }
   } else if (flag->is_size_t()) {
     size_t v;
     if (parse_integer(value, &v)) {
-      return JVMFlagAccess::set_size_t(flag, &v, origin);
-    }
-  } else if (flag->is_double()) {
-    // This function parses only input strings without a decimal
-    // point character (.)
-    // If a string looks like a FP number, it would be parsed by
-    // set_fp_numeric_flag(). See Arguments::parse_argument().
-    jlong v;
-    if (parse_integer(value, &v)) {
-      double double_v = (double) v;
-      if (value[0] == '-' && v == 0) { // special case: 0.0 is different than -0.0.
-        double_v = -0.0;
-      }
-      return JVMFlagAccess::set_double(flag, &double_v, origin);
+      result = JVMFlagAccess::set_size_t(flag, &v, origin);
     }
   }
 
-  return JVMFlag::WRONG_FORMAT;
+  return result == JVMFlag::SUCCESS;
 }
 
 static bool set_string_flag(JVMFlag* flag, const char* value, JVMFlagOrigin origin) {
+  if (value[0] == '\0') {
+    value = NULL;
+  }
   if (JVMFlagAccess::set_ccstr(flag, &value, origin) != JVMFlag::SUCCESS) return false;
   // Contract:  JVMFlag always returns a pointer that needs freeing.
   FREE_C_HEAP_ARRAY(char, value);
@@ -992,7 +988,7 @@ static bool append_to_string_flag(JVMFlag* flag, const char* new_value, JVMFlagO
   return true;
 }
 
-const char* Arguments::handle_aliases_and_deprecation(const char* arg, bool warn) {
+const char* Arguments::handle_aliases_and_deprecation(const char* arg) {
   const char* real_name = real_flag_name(arg);
   JDK_Version since = JDK_Version();
   switch (is_deprecated_flag(arg, &since)) {
@@ -1010,16 +1006,14 @@ const char* Arguments::handle_aliases_and_deprecation(const char* arg, bool warn
     case 0:
       return real_name;
     case 1: {
-      if (warn) {
-        char version[256];
-        since.to_string(version, sizeof(version));
-        if (real_name != arg) {
-          warning("Option %s was deprecated in version %s and will likely be removed in a future release. Use option %s instead.",
-                  arg, version, real_name);
-        } else {
-          warning("Option %s was deprecated in version %s and will likely be removed in a future release.",
-                  arg, version);
-        }
+      char version[256];
+      since.to_string(version, sizeof(version));
+      if (real_name != arg) {
+        warning("Option %s was deprecated in version %s and will likely be removed in a future release. Use option %s instead.",
+                arg, version, real_name);
+      } else {
+        warning("Option %s was deprecated in version %s and will likely be removed in a future release.",
+                arg, version);
       }
       return real_name;
     }
@@ -1028,98 +1022,87 @@ const char* Arguments::handle_aliases_and_deprecation(const char* arg, bool warn
   return NULL;
 }
 
-bool Arguments::parse_argument(const char* arg, JVMFlagOrigin origin) {
-
-  // range of acceptable characters spelled out for portability reasons
-#define NAME_RANGE  "[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]"
 #define BUFLEN 255
-  char name[BUFLEN+1];
-  char dummy;
-  const char* real_name;
-  bool warn_if_deprecated = true;
 
-  if (sscanf(arg, "-%" XSTR(BUFLEN) NAME_RANGE "%c", name, &dummy) == 1) {
-    real_name = handle_aliases_and_deprecation(name, warn_if_deprecated);
-    if (real_name == NULL) {
-      return false;
+JVMFlag* Arguments::find_jvm_flag(const char* name, size_t name_length) {
+  char name_copied[BUFLEN+1];
+  if (name[name_length] != 0) {
+    if (name_length > BUFLEN) {
+      return NULL;
+    } else {
+      strncpy(name_copied, name, name_length);
+      name_copied[name_length] = '\0';
+      name = name_copied;
     }
-    JVMFlag* flag = JVMFlag::find_flag(real_name);
-    return set_bool_flag(flag, false, origin);
   }
-  if (sscanf(arg, "+%" XSTR(BUFLEN) NAME_RANGE "%c", name, &dummy) == 1) {
-    real_name = handle_aliases_and_deprecation(name, warn_if_deprecated);
-    if (real_name == NULL) {
-      return false;
+
+  const char* real_name = Arguments::handle_aliases_and_deprecation(name);
+  if (real_name == NULL) {
+    return NULL;
+  }
+  JVMFlag* flag = JVMFlag::find_flag(real_name);
+  return flag;
+}
+
+bool Arguments::parse_argument(const char* arg, JVMFlagOrigin origin) {
+  bool is_bool = false;
+  bool bool_val = false;
+  char c = *arg;
+  if (c == '+' || c == '-') {
+    is_bool = true;
+    bool_val = (c == '+');
+    arg++;
+  }
+
+  const char* name = arg;
+  while (true) {
+    c = *arg;
+    if (isalnum(c) || (c == '_')) {
+      ++arg;
+    } else {
+      break;
     }
-    JVMFlag* flag = JVMFlag::find_flag(real_name);
-    return set_bool_flag(flag, true, origin);
   }
 
-  char punct;
-  if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "%c", name, &punct) == 2 && punct == '=') {
-    const char* value = strchr(arg, '=') + 1;
+  size_t name_len = size_t(arg - name);
+  if (name_len == 0) {
+    return false;
+  }
 
-    // this scanf pattern matches both strings (handled here) and numbers (handled later))
-    real_name = handle_aliases_and_deprecation(name, warn_if_deprecated);
-    if (real_name == NULL) {
+  JVMFlag* flag = find_jvm_flag(name, name_len);
+  if (flag == NULL) {
+    return false;
+  }
+
+  if (is_bool) {
+    if (*arg != 0) {
+      // Error -- extra characters such as -XX:+BoolFlag=123
       return false;
     }
-    JVMFlag* flag = JVMFlag::find_flag(real_name);
-    if (flag != NULL && flag->is_ccstr()) {
+    return set_bool_flag(flag, bool_val, origin);
+  }
+
+  if (arg[0] == '=') {
+    const char* value = arg + 1;
+    if (flag->is_ccstr()) {
       if (flag->ccstr_accumulates()) {
         return append_to_string_flag(flag, value, origin);
       } else {
-        if (value[0] == '\0') {
-          value = NULL;
-        }
         return set_string_flag(flag, value, origin);
       }
+    } else if (flag->is_double()) {
+      return set_fp_numeric_flag(flag, value, origin);
     } else {
-      warn_if_deprecated = false; // if arg is deprecated, we've already done warning...
+      return set_numeric_flag(flag, value, origin);
     }
   }
 
-  if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE ":%c", name, &punct) == 2 && punct == '=') {
-    const char* value = strchr(arg, '=') + 1;
+  if (arg[0] == ':' && arg[1] == '=') {
     // -XX:Foo:=xxx will reset the string flag to the given value.
-    if (value[0] == '\0') {
-      value = NULL;
-    }
-    real_name = handle_aliases_and_deprecation(name, warn_if_deprecated);
-    if (real_name == NULL) {
-      return false;
-    }
-    JVMFlag* flag = JVMFlag::find_flag(real_name);
+    const char* value = arg + 2;
     return set_string_flag(flag, value, origin);
   }
 
-#define SIGNED_FP_NUMBER_RANGE "[-0123456789.eE+]"
-#define SIGNED_NUMBER_RANGE    "[-0123456789]"
-#define        NUMBER_RANGE    "[0123456789eE+-]"
-  char value[BUFLEN + 1];
-  char value2[BUFLEN + 1];
-  if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "=" "%" XSTR(BUFLEN) SIGNED_NUMBER_RANGE "." "%" XSTR(BUFLEN) NUMBER_RANGE "%c", name, value, value2, &dummy) == 3) {
-    // Looks like a floating-point number -- try again with more lenient format string
-    if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "=" "%" XSTR(BUFLEN) SIGNED_FP_NUMBER_RANGE "%c", name, value, &dummy) == 2) {
-      real_name = handle_aliases_and_deprecation(name, warn_if_deprecated);
-      if (real_name == NULL) {
-        return false;
-      }
-      JVMFlag* flag = JVMFlag::find_flag(real_name);
-      return set_fp_numeric_flag(flag, value, origin);
-    }
-  }
-
-#define VALUE_RANGE "[-kmgtxKMGTX0123456789abcdefABCDEF]"
-  if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "=" "%" XSTR(BUFLEN) VALUE_RANGE "%c", name, value, &dummy) == 2) {
-    real_name = handle_aliases_and_deprecation(name, warn_if_deprecated);
-    if (real_name == NULL) {
-      return false;
-    }
-    JVMFlag* flag = JVMFlag::find_flag(real_name);
-    return set_numeric_flag(flag, value, origin) == JVMFlag::SUCCESS;
-  }
-
   return false;
 }
 
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
index 99de15f1009..abbbaee6fd0 100644
--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
@@ -37,6 +37,8 @@
 
 // Arguments parses the command line and recognizes options
 
+class JVMFlag;
+
 // Invocation API hook typedefs (these should really be defined in jni.h)
 extern "C" {
   typedef void (JNICALL *abort_hook_t)(void);
@@ -464,10 +466,11 @@ class Arguments : AllStatic {
 
   // Return the real name for the flag passed on the command line (either an alias name or "flag_name").
   static const char* real_flag_name(const char *flag_name);
+  static JVMFlag* find_jvm_flag(const char* name, size_t name_length);
 
   // Return the "real" name for option arg if arg is an alias, and print a warning if arg is deprecated.
   // Return NULL if the arg has expired.
-  static const char* handle_aliases_and_deprecation(const char* arg, bool warn);
+  static const char* handle_aliases_and_deprecation(const char* arg);
 
   static char*  SharedArchivePath;
   static char*  SharedDynamicArchivePath;
diff --git a/test/hotspot/gtest/runtime/test_arguments.cpp b/test/hotspot/gtest/runtime/test_arguments.cpp
index 0919df6e8dd..737263d73c2 100644
--- a/test/hotspot/gtest/runtime/test_arguments.cpp
+++ b/test/hotspot/gtest/runtime/test_arguments.cpp
@@ -28,6 +28,7 @@
 #include "runtime/flags/jvmFlag.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include <errno.h>
 
 class ArgumentsTest : public ::testing::Test {
 public:
@@ -261,16 +262,12 @@ void check_numeric_flag(JVMFlag* flag, T getvalue(JVMFlag* flag),
   }
 
   {
-    // Invalid strings for *any* type of integer VM arguments
+    // Invalid strings for *any* numeric type of VM arguments
     const char* invalid_strings[] = {
       "", " 1", "2 ", "3 2",
       "0x", "0x0x1" "e"
       "K", "M", "G", "1MB", "1KM", "AA", "0B",
       "18446744073709551615K", "17179869184G",
-      "999999999999999999999999999999",
-      "0x10000000000000000", "18446744073709551616",
-      "-0x10000000000000000", "-18446744073709551616",
-      "-0x8000000000000001", "-9223372036854775809",
       "0x8000000t", "0x800000000g",
       "0x800000000000m", "0x800000000000000k",
       "-0x8000000t", "-0x800000000g",
@@ -280,9 +277,21 @@ void check_numeric_flag(JVMFlag* flag, T getvalue(JVMFlag* flag),
     check_invalid_numeric_string(flag, invalid_strings);
   }
 
-  if (!is_double) {
+  if (is_double) {
+    const char* invalid_strings_for_double[] = {
+      "INF", "Inf", "Infinity", "INFINITY",
+      "-INF", "-Inf", "-Infinity", "-INFINITY",
+      "nan", "NAN", "NaN",
+      NULL,
+    };
+    check_invalid_numeric_string(flag, invalid_strings_for_double);
+  } else {
     const char* invalid_strings_for_integers[] = {
       "1.0", "0x4.5", "0.001", "4e10",
+      "999999999999999999999999999999",
+      "0x10000000000000000", "18446744073709551616",
+      "-0x10000000000000000", "-18446744073709551616",
+      "-0x8000000000000001", "-9223372036854775809",
       NULL,
     };
     check_invalid_numeric_string(flag, invalid_strings_for_integers);
@@ -549,8 +558,6 @@ TEST_VM_F(ArgumentsTest, set_numeric_flag_double) {
     return;
   }
 
-  // TODO -- JDK-8282774
-  // Need to add more test input that have a fractional part like "4.2".
   NumericArgument<double> valid_strings[] = {
     NumericArgument<double>("0",   0.0),
     NumericArgument<double>("1",   1.0),
@@ -564,4 +571,36 @@ TEST_VM_F(ArgumentsTest, set_numeric_flag_double) {
 
   check_numeric_flag<double>(flag, getvalue, valid_strings,
                              ARRAY_SIZE(valid_strings), /*is_double=*/true);
+
+  const char* more_valid_strings[] = {
+    // These examples are from https://en.cppreference.com/w/cpp/language/floating_literal
+    // (but with the L and F suffix removed).
+    "1e10", "1e-5",
+    "1.e-2", "3.14",
+    ".1", "0.1e-1",
+    "0x1ffp10", "0X0p-1",
+    "0x1.p0", "0xf.p-1",
+    "0x0.123p-1", "0xa.bp10",
+    "0x1.4p3",
+    // More test cases
+    "1.5", "6.02e23", "-6.02e+23",
+    "1.7976931348623157E+308", // max double
+    "-0", "0",
+    "0x1.91eb85p+1",
+    "999999999999999999999999999999",
+  };
+  for (uint i = 0; i < ARRAY_SIZE(more_valid_strings); i++) {
+    const char* str = more_valid_strings[i];
+
+    char* dummy;
+    double expected = strtod(str, &dummy);
+    ASSERT_TRUE(errno == 0);
+
+    ASSERT_TRUE(ArgumentsTest::parse_argument(flag->name(), str))
+        << "Valid string '" <<
+        str << "' did not parse for type " << flag->type_string() << ".";
+    double d = flag->get_double();
+    ASSERT_TRUE(d == expected)
+        << "Parsed number " << d << " is not the same as expected " << expected;
+  }
 }
diff --git a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java
index e824c0e52f7..e0f6d2cc028 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/DoubleJVMOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,7 +127,10 @@ public class DoubleJVMOption extends JVMOption {
             validValues.add(formatValue(min));
         }
         if (testMaxRange) {
-            validValues.add(formatValue(max));
+            if (!name.equals("CompileThresholdScaling")) {
+                // See JDK-8283807: Max range for -XX:CompileThresholdScaling is too large
+                validValues.add(formatValue(max));
+            }
         }
 
         if (testMinRange) {
-- 
GitLab


From 207b0998580a8e01395deb9c46c84b20f6e59883 Mon Sep 17 00:00:00 2001
From: Frederic Parain <fparain@openjdk.org>
Date: Thu, 31 Mar 2022 15:54:51 +0000
Subject: [PATCH 304/345] 8283890: Changes in CFG file format break
 C1Visualizer

Reviewed-by: chagedorn, thartmann
---
 src/hotspot/share/c1/c1_CFGPrinter.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/hotspot/share/c1/c1_CFGPrinter.cpp b/src/hotspot/share/c1/c1_CFGPrinter.cpp
index 73a1d2d649e..f3b24e9ecb6 100644
--- a/src/hotspot/share/c1/c1_CFGPrinter.cpp
+++ b/src/hotspot/share/c1/c1_CFGPrinter.cpp
@@ -244,13 +244,11 @@ void CFGPrinterOutput::print_block(BlockBegin* block) {
   output()->cr();
 
   output()->indent();
+  output()->print("successors ");
   if (block->end() != NULL) {
-    output()->print("successors ");
     for (i = 0; i < block->number_of_sux(); i++) {
       output()->print("\"B%d\" ", block->sux_at(i)->block_id());
     }
-  } else {
-    output()->print("(block has no end, cannot print successors)");
   }
   output()->cr();
 
-- 
GitLab


From a41550b9e3c6729e90a96cf33e1765887aa2a3fb Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 31 Mar 2022 16:05:16 +0000
Subject: [PATCH 305/345] 8283842:
 TestZoneTextPrinterParser.test_roundTripAtOverlap fails:
 DateTimeParseException

Reviewed-by: iris, rriggs, scolebourne
---
 .../time/test/java/time/format/TestZoneTextPrinterParser.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
index 2686ea02b25..dbc912d1f23 100644
--- a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
@@ -262,7 +262,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
 
     @Test(dataProvider="roundTripAtOverlap")
     public void test_roundTripAtOverlap(String pattern, String input) {
-        var dtf = DateTimeFormatter.ofPattern(pattern);
+        var dtf = DateTimeFormatter.ofPattern(pattern, Locale.US);
         assertEquals(dtf.format(ZonedDateTime.parse(input, dtf)), input);
         var lc = input.toLowerCase(Locale.ROOT);
         try {
@@ -270,7 +270,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
             fail("Should throw DateTimeParseException");
         } catch (DateTimeParseException ignore) {}
 
-        dtf = new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern(pattern).toFormatter();
+        dtf = new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern(pattern).toFormatter(Locale.US);
         assertEquals(dtf.format(ZonedDateTime.parse(input, dtf)), input);
         assertEquals(dtf.format(ZonedDateTime.parse(lc, dtf)), input);
     }
-- 
GitLab


From d276da5a380d52e19f869fb2b8c2f56d893310ab Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 31 Mar 2022 17:48:17 +0000
Subject: [PATCH 306/345] 8281469: aarch64: Improve interpreter stack banging

Reviewed-by: aph, xliu
---
 .../templateInterpreterGenerator_aarch64.cpp  | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index bf0a4e44729..2df88c2d069 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -1064,18 +1064,47 @@ address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(Abstract
 }
 
 void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
-  // Bang each page in the shadow zone. We can't assume it's been done for
-  // an interpreter frame with greater than a page of locals, so each page
-  // needs to be checked.  Only true for non-native.
-  const int n_shadow_pages = (int)(StackOverflow::stack_shadow_zone_size() / os::vm_page_size());
-  const int start_page = native_call ? n_shadow_pages : 1;
+  // See more discussion in stackOverflow.hpp.
+
+  const int shadow_zone_size = checked_cast<int>(StackOverflow::stack_shadow_zone_size());
   const int page_size = os::vm_page_size();
-  for (int pages = start_page; pages <= n_shadow_pages ; pages++) {
-    __ sub(rscratch2, sp, pages*page_size);
+  const int n_shadow_pages = shadow_zone_size / page_size;
+
+#ifdef ASSERT
+  Label L_good_limit;
+  __ ldr(rscratch1, Address(rthread, JavaThread::shadow_zone_safe_limit()));
+  __ cbnz(rscratch1, L_good_limit);
+  __ stop("shadow zone safe limit is not initialized");
+  __ bind(L_good_limit);
+
+  Label L_good_watermark;
+  __ ldr(rscratch1, Address(rthread, JavaThread::shadow_zone_growth_watermark()));
+  __ cbnz(rscratch1, L_good_watermark);
+  __ stop("shadow zone growth watermark is not initialized");
+  __ bind(L_good_watermark);
+#endif
+
+  Label L_done;
+
+  __ ldr(rscratch1, Address(rthread, JavaThread::shadow_zone_growth_watermark()));
+  __ cmp(sp, rscratch1);
+  __ br(Assembler::HI, L_done);
+
+  for (int p = 1; p <= n_shadow_pages; p++) {
+    __ sub(rscratch2, sp, p*page_size);
     __ str(zr, Address(rscratch2));
   }
-}
 
+  // Record the new watermark, but only if the update is above the safe limit.
+  // Otherwise, the next time around the check above would pass the safe limit.
+  __ ldr(rscratch1, Address(rthread, JavaThread::shadow_zone_safe_limit()));
+  __ cmp(sp, rscratch1);
+  __ br(Assembler::LS, L_done);
+  __ mov(rscratch1, sp);
+  __ str(rscratch1, Address(rthread, JavaThread::shadow_zone_growth_watermark()));
+
+  __ bind(L_done);
+}
 
 // Interpreter stub for calling a native method. (asm interpreter)
 // This sets up a somewhat different looking stack for calling the
-- 
GitLab


From 6ebf845ff7d758c99367488818427fcb7a5dbda9 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 31 Mar 2022 17:49:14 +0000
Subject: [PATCH 307/345] 8283566: G1: Improve G1BarrierSet::enqueue
 performance

Reviewed-by: tschatzl, ayang
---
 src/hotspot/share/gc/g1/g1BarrierSet.cpp      |  7 ----
 src/hotspot/share/gc/g1/g1BarrierSet.hpp      |  8 ++--
 .../share/gc/g1/g1BarrierSet.inline.hpp       | 39 ++++++++++++++-----
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  2 +-
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
index 994bf16c2e3..a04c7370518 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
@@ -61,13 +61,6 @@ G1BarrierSet::G1BarrierSet(G1CardTable* card_table) :
   _dirty_card_queue_set(&_dirty_card_queue_buffer_allocator)
 {}
 
-void G1BarrierSet::enqueue(oop pre_val) {
-  // Nulls should have been already filtered.
-  assert(oopDesc::is_oop(pre_val, true), "Error");
-  SATBMarkQueue& queue = G1ThreadLocalData::satb_mark_queue(Thread::current());
-  G1BarrierSet::satb_mark_queue_set().enqueue(queue, pre_val);
-}
-
 template <class T> void
 G1BarrierSet::write_ref_array_pre_work(T* dst, size_t count) {
   G1SATBMarkQueueSet& queue_set = G1BarrierSet::satb_mark_queue_set();
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index e8eb6e9c9d1..d90d83298c9 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -56,10 +56,12 @@ class G1BarrierSet: public CardTableBarrierSet {
   }
 
   // Add "pre_val" to a set of objects that may have been disconnected from the
-  // pre-marking object graph.
-  static void enqueue(oop pre_val);
+  // pre-marking object graph. Prefer the version that takes location, as it
+  // can avoid touching the heap unnecessarily.
+  template <class T> static void enqueue(T* dst);
+  static void enqueue_preloaded(oop pre_val);
 
-  static void enqueue_if_weak(DecoratorSet decorators, oop value);
+  static void enqueue_preloaded_if_weak(DecoratorSet decorators, oop value);
 
   template <class T> void write_ref_array_pre_work(T* dst, size_t count);
   virtual void write_ref_array_pre(oop* dst, size_t count, bool dest_uninitialized);
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index 8fa29544ca4..f7a6fd3ee5a 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -28,11 +28,35 @@
 #include "gc/g1/g1BarrierSet.hpp"
 
 #include "gc/g1/g1CardTable.hpp"
+#include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/shared/accessBarrierSupport.inline.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.hpp"
 
+inline void G1BarrierSet::enqueue_preloaded(oop pre_val) {
+  // Nulls should have been already filtered.
+  assert(oopDesc::is_oop(pre_val, true), "Error");
+
+  G1SATBMarkQueueSet& queue_set = G1BarrierSet::satb_mark_queue_set();
+  if (!queue_set.is_active()) return;
+
+  SATBMarkQueue& queue = G1ThreadLocalData::satb_mark_queue(Thread::current());
+  queue_set.enqueue_known_active(queue, pre_val);
+}
+
+template <class T>
+inline void G1BarrierSet::enqueue(T* dst) {
+  G1SATBMarkQueueSet& queue_set = G1BarrierSet::satb_mark_queue_set();
+  if (!queue_set.is_active()) return;
+
+  T heap_oop = RawAccess<MO_RELAXED>::oop_load(dst);
+  if (!CompressedOops::is_null(heap_oop)) {
+    SATBMarkQueue& queue = G1ThreadLocalData::satb_mark_queue(Thread::current());
+    queue_set.enqueue_known_active(queue, CompressedOops::decode_not_null(heap_oop));
+  }
+}
+
 template <DecoratorSet decorators, typename T>
 inline void G1BarrierSet::write_ref_field_pre(T* field) {
   if (HasDecorator<decorators, IS_DEST_UNINITIALIZED>::value ||
@@ -40,10 +64,7 @@ inline void G1BarrierSet::write_ref_field_pre(T* field) {
     return;
   }
 
-  T heap_oop = RawAccess<MO_RELAXED>::oop_load(field);
-  if (!CompressedOops::is_null(heap_oop)) {
-    enqueue(CompressedOops::decode_not_null(heap_oop));
-  }
+  enqueue(field);
 }
 
 template <DecoratorSet decorators, typename T>
@@ -55,7 +76,7 @@ inline void G1BarrierSet::write_ref_field_post(T* field, oop new_val) {
   }
 }
 
-inline void G1BarrierSet::enqueue_if_weak(DecoratorSet decorators, oop value) {
+inline void G1BarrierSet::enqueue_preloaded_if_weak(DecoratorSet decorators, oop value) {
   assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Reference strength must be known");
   // Loading from a weak or phantom reference needs enqueueing, as
   // the object may not have been reachable (part of the snapshot)
@@ -65,7 +86,7 @@ inline void G1BarrierSet::enqueue_if_weak(DecoratorSet decorators, oop value) {
   const bool needs_enqueue     = (!peek && !on_strong_oop_ref);
 
   if (needs_enqueue && value != NULL) {
-    enqueue(value);
+    enqueue_preloaded(value);
   }
 }
 
@@ -74,7 +95,7 @@ template <typename T>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_not_in_heap(T* addr) {
   oop value = ModRef::oop_load_not_in_heap(addr);
-  enqueue_if_weak(decorators, value);
+  enqueue_preloaded_if_weak(decorators, value);
   return value;
 }
 
@@ -83,7 +104,7 @@ template <typename T>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_in_heap(T* addr) {
   oop value = ModRef::oop_load_in_heap(addr);
-  enqueue_if_weak(decorators, value);
+  enqueue_preloaded_if_weak(decorators, value);
   return value;
 }
 
@@ -91,7 +112,7 @@ template <DecoratorSet decorators, typename BarrierSetT>
 inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
 oop_load_in_heap_at(oop base, ptrdiff_t offset) {
   oop value = ModRef::oop_load_in_heap_at(base, offset);
-  enqueue_if_weak(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), value);
+  enqueue_preloaded_if_weak(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), value);
   return value;
 }
 
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 3b6458b9f82..a2c6c226b02 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2279,7 +2279,7 @@ void G1CollectedHeap::object_iterate_parallel(ObjectClosure* cl, uint worker_id,
 }
 
 void G1CollectedHeap::keep_alive(oop obj) {
-  G1BarrierSet::enqueue(obj);
+  G1BarrierSet::enqueue_preloaded(obj);
 }
 
 void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
-- 
GitLab


From ad83ec7e281cb3ab7c42e71fab47ea21b93079ea Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 31 Mar 2022 18:17:38 +0000
Subject: [PATCH 308/345] 8283422: Create a new test for JDK-8254790

Reviewed-by: kvn, thartmann
---
 test/hotspot/jtreg/TEST.groups                |  3 +-
 .../string/TestStringIntrinsics2.java         | 16 ++++-
 .../TestStringIntrinsics2LargeArray.java      | 61 +++++++++++++++++++
 3 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/resourcehogs/compiler/intrinsics/string/TestStringIntrinsics2LargeArray.java

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index b1403a935d1..01256258c34 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -130,6 +130,7 @@ hotspot_slow_compiler = \
   compiler/codegen/aes \
   compiler/codecache/stress \
   compiler/gcbarriers/PreserveFPRegistersTest.java \
+  resourcehogs/compiler \
   :hotspot_compiler_arraycopy
 
 tier1_compiler_1 = \
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics2.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics2.java
index e966acbaf3f..06e2c0402e8 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics2.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -706,4 +706,18 @@ public class TestStringIntrinsics2 {
         }
     }
 
+    static String longLatin1 = "0123456789A".repeat(100);
+    static String longUTF = "0123456789\ubeef".repeat(100);
+
+    @Test(role = Role.TEST_HELPER, compileAt = 4, warmup = 1, warmupArgs = { "0123456789", "1" })
+    public static boolean indexOf_use_result_immediately(String a, String b) {
+        char ch = b.charAt(0);
+        return ch == a.charAt(a.indexOf(ch));
+    }
+
+    @Test(role = Role.TEST_ENTRY)
+    public static void test_indexOf_use_result_immediately() {
+        assertTrue(indexOf_use_result_immediately(longLatin1, "A"));
+        assertTrue(indexOf_use_result_immediately(longUTF, "\ubeef"));
+    }
 }
diff --git a/test/hotspot/jtreg/resourcehogs/compiler/intrinsics/string/TestStringIntrinsics2LargeArray.java b/test/hotspot/jtreg/resourcehogs/compiler/intrinsics/string/TestStringIntrinsics2LargeArray.java
new file mode 100644
index 00000000000..7a224abab14
--- /dev/null
+++ b/test/hotspot/jtreg/resourcehogs/compiler/intrinsics/string/TestStringIntrinsics2LargeArray.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 SAP SE. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8254790
+ * @requires vm.bits == "64" & os.maxMemory > 8G
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /test/hotspot/jtreg
+ *
+ * @build compiler.intrinsics.string.TestStringIntrinsics2
+ * @build sun.hotspot.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
+ *
+ * @run main/othervm
+ *        -mx8G
+ *        -Xbootclasspath/a:.
+ *        -Xmixed
+ *        -XX:+UnlockDiagnosticVMOptions
+ *        -XX:+WhiteBoxAPI
+ *        -XX:+IgnoreUnrecognizedVMOptions
+ *        -XX:MaxInlineSize=70
+ *        -XX:MinInlineFrequencyRatio=0
+ *        resourcehogs.compiler.intrinsics.string.TestStringIntrinsics2LargeArray
+ */
+
+package resourcehogs.compiler.intrinsics.string;
+
+import java.lang.ref.Reference;
+
+import compiler.intrinsics.string.TestStringIntrinsics2;
+
+public final class TestStringIntrinsics2LargeArray {
+    public static void main(String[] args) throws Exception {
+        int[] hugeArray = new int[Integer.MAX_VALUE / 2];
+        TestStringIntrinsics2.main(args);
+        Reference.reachabilityFence(hugeArray);
+    }
+}
-- 
GitLab


From 38df5701ff82a0c10aa96fb4439e8ef79809055d Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Thu, 31 Mar 2022 22:59:21 +0000
Subject: [PATCH 309/345] 8283805: [REDO] JDK 19 L10n resource files update -
 msgdrop 10

Reviewed-by: naoto
---
 .../resources/codepoint_de.properties         |   36 +
 .../Notepad/resources/Notepad_de.properties   |   93 +
 .../Stylepad/resources/Stylepad_de.properties |   88 +
 .../resources/swingset_de.properties          |  674 ++++
 .../resources/swingset_ja.properties          |    4 +-
 .../launcher/resources/launcher_de.properties |   18 +-
 .../launcher/resources/launcher_ja.properties |   12 +-
 .../resources/launcher_zh_CN.properties       |    8 +-
 .../security/tools/keytool/Resources_de.java  |   93 +-
 .../security/tools/keytool/Resources_ja.java  |   15 +-
 .../tools/keytool/Resources_zh_CN.java        |   15 +-
 .../sun/security/util/AuthResources_de.java   |    2 +-
 .../sun/security/util/Resources_de.java       |   19 +-
 .../sun/security/util/Resources_ja.java       |   17 -
 .../sun/security/util/Resources_zh_CN.java    |   17 -
 .../apple/laf/resources/aqua_de.properties    |    4 +-
 .../resources/accessibility_de.properties     |    2 +-
 .../sun/awt/resources/awt_de.properties       |    4 +-
 .../resources/rmiregistry_de.properties       |    2 +-
 .../resources/rmiregistry_ja.properties       |    2 +-
 .../resources/rmiregistry_zh_CN.properties    |    2 +-
 .../rowset/RowSetResourceBundle_de.properties |    9 +-
 .../rowset/RowSetResourceBundle_ja.properties |    3 +-
 .../RowSetResourceBundle_zh_CN.properties     |    3 +-
 .../internal/res/XSLTErrorResources_de.java   |   22 +-
 .../xsltc/compiler/util/ErrorMessages_de.java |   12 +-
 .../xsltc/runtime/ErrorMessages_de.java       |    2 +-
 .../impl/msg/DOMMessages_de.properties        |   29 +-
 .../impl/msg/DOMMessages_ja.properties        |   25 -
 .../impl/msg/DOMMessages_zh_CN.properties     |   25 -
 .../impl/msg/DatatypeMessages_de.properties   |   25 -
 .../impl/msg/DatatypeMessages_ja.properties   |   25 -
 .../msg/DatatypeMessages_zh_CN.properties     |   25 -
 .../msg/JAXPValidationMessages_de.properties  |   25 -
 .../msg/JAXPValidationMessages_ja.properties  |   25 -
 .../JAXPValidationMessages_zh_CN.properties   |   25 -
 .../impl/msg/SAXMessages_de.properties        |   25 -
 .../impl/msg/SAXMessages_ja.properties        |   25 -
 .../impl/msg/SAXMessages_zh_CN.properties     |   25 -
 .../impl/msg/XIncludeMessages_de.properties   |   27 +-
 .../impl/msg/XIncludeMessages_ja.properties   |   25 -
 .../msg/XIncludeMessages_zh_CN.properties     |   25 -
 .../impl/msg/XMLMessages_de.properties        |    4 +-
 .../impl/msg/XMLMessages_ja.properties        |    2 +-
 .../impl/msg/XMLMessages_zh_CN.properties     |    2 +-
 .../impl/msg/XMLSchemaMessages_de.properties  |   36 +-
 .../impl/msg/XMLSchemaMessages_ja.properties  |   25 -
 .../msg/XMLSchemaMessages_zh_CN.properties    |   25 -
 .../msg/XMLSerializerMessages_de.properties   |   25 -
 .../msg/XMLSerializerMessages_ja.properties   |   25 -
 .../XMLSerializerMessages_zh_CN.properties    |   25 -
 .../impl/msg/XPointerMessages_de.properties   |   25 -
 .../impl/msg/XPointerMessages_ja.properties   |   25 -
 .../msg/XPointerMessages_zh_CN.properties     |   25 -
 .../impl/xpath/regex/message_de.properties    |   25 -
 .../impl/xpath/regex/message_ja.properties    |   25 -
 .../impl/xpath/regex/message_zh_CN.properties |   25 -
 .../internal/res/XMLErrorResources_de.java    |    2 +-
 .../utils/SerializerMessages_de.java          |    2 +-
 .../internal/res/XPATHErrorResources_de.java  |   44 +-
 .../internal/res/XPATHErrorResources_ja.java  |   28 +-
 .../res/XPATHErrorResources_zh_CN.java        |   28 +-
 .../javac/resources/compiler_de.properties    | 2785 +++++++++++++++++
 .../javac/resources/compiler_ja.properties    |  195 +-
 .../javac/resources/compiler_zh_CN.properties |  199 +-
 .../tools/javac/resources/javac_de.properties |  228 ++
 .../tools/javac/resources/javac_ja.properties |   10 +-
 .../javac/resources/javac_zh_CN.properties    |   10 +-
 .../javac/resources/launcher_de.properties    |  117 +
 .../resources/serialver_de.properties         |   31 +
 .../resources/simpleserver_de.properties      |   54 +
 .../resources/simpleserver_ja.properties      |   54 +
 .../resources/simpleserver_zh_CN.properties   |   54 +
 .../tools/jarsigner/Resources_de.java         |  338 ++
 .../tools/jarsigner/Resources_ja.java         |    9 +
 .../tools/jarsigner/Resources_zh_CN.java      |    9 +
 .../sun/tools/jar/resources/jar_de.properties |   19 +-
 .../sun/tools/jar/resources/jar_ja.properties |    8 +-
 .../tools/jar/resources/jar_zh_CN.properties  |    8 +-
 .../html/resources/standard_de.properties     |  445 +++
 .../html/resources/standard_ja.properties     |  132 +-
 .../html/resources/standard_zh_CN.properties  |  132 +-
 .../toolkit/resources/doclets_de.properties   |  330 ++
 .../toolkit/resources/doclets_ja.properties   |  111 +-
 .../resources/doclets_zh_CN.properties        |  113 +-
 .../doclint/resources/doclint_de.properties   |   95 +
 .../doclint/resources/doclint_ja.properties   |   15 +-
 .../resources/doclint_zh_CN.properties        |   15 +-
 .../tool/resources/javadoc_de.properties      |  210 ++
 .../tool/resources/javadoc_ja.properties      |   12 +-
 .../tool/resources/javadoc_zh_CN.properties   |   12 +-
 .../jconsole/resources/messages_de.properties |  307 ++
 .../resources/messages_zh_CN.properties       |    2 +-
 .../tools/javap/resources/javap_de.properties |  105 +
 .../tools/javap/resources/javap_ja.properties |    4 +-
 .../javap/resources/javap_zh_CN.properties    |    2 +-
 .../resources/jdeprscan_de.properties         |   82 +
 .../tools/jdeps/resources/jdeps_de.properties |  131 +
 .../example/debug/tty/TTYResources_de.java    |  350 +++
 .../example/debug/tty/TTYResources_ja.java    |   11 +-
 .../example/debug/tty/TTYResources_zh_CN.java |   19 +-
 .../sun/tools/jdi/resources/jdi_de.properties |   77 +
 .../tools/jlink/resources/jlink_de.properties |  105 +
 .../jlink/resources/plugins_de.properties     |  224 ++
 .../jlink/resources/plugins_ja.properties     |  224 ++
 .../jlink/resources/plugins_zh_CN.properties  |  224 ++
 .../tools/jmod/resources/jmod_de.properties   |  100 +
 .../tools/jmod/resources/jmod_ja.properties   |    3 +
 .../jmod/resources/jmod_zh_CN.properties      |    3 +
 .../resources/LinuxResources_de.properties    |   69 +
 .../resources/LinuxResources_ja.properties    |    2 +-
 .../resources/LinuxResources_zh_CN.properties |    2 +-
 .../resources/MacResources_de.properties      |   91 +
 .../resources/MacResources_ja.properties      |   11 +-
 .../resources/MacResources_zh_CN.properties   |   11 +-
 .../resources/HelpResources_de.properties     |   39 +
 .../resources/HelpResources_ja.properties     |  241 +-
 .../resources/HelpResources_zh_CN.properties  |  241 +-
 .../resources/MainResources_de.properties     |  110 +
 .../resources/MainResources_ja.properties     |    2 +-
 .../resources/MainResources_zh_CN.properties  |    2 +-
 .../resources/MsiInstallerStrings_de.wxl      |   15 +
 .../resources/MsiInstallerStrings_ja.wxl      |   30 +-
 .../resources/MsiInstallerStrings_zh_CN.wxl   |   30 +-
 .../resources/WinResources_de.properties      |   70 +
 .../resources/WinResources_ja.properties      |   10 +-
 .../resources/WinResources_zh_CN.properties   |   10 +-
 .../jshell/tool/resources/l10n_de.properties  |  322 ++
 .../jshell/tool/resources/l10n_ja.properties  |    4 +-
 .../tool/resources/l10n_zh_CN.properties      |    2 +-
 .../jdk/jshell/resources/l10n_de.properties   |   35 +
 .../jdk/jshell/resources/l10n_ja.properties   |    2 +-
 .../jshell/resources/l10n_zh_CN.properties    |    2 +-
 .../resources/ext/CurrencyNames_de.properties |  309 +-
 .../resources/ext/CurrencyNames_ja.properties |  440 +--
 .../ext/CurrencyNames_zh_CN.properties        |  442 +--
 .../agent/resources/agent_de.properties       |    2 +-
 .../agent/resources/agent_ja.properties       |    2 +-
 .../agent/resources/agent_zh_CN.properties    |    2 +-
 test/jdk/sun/text/resources/LocaleData        |  172 +-
 .../sun/text/resources/LocaleDataTest.java    |    2 +-
 141 files changed, 10151 insertions(+), 2278 deletions(-)
 create mode 100644 src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
 create mode 100644 src/demo/share/jfc/Notepad/resources/Notepad_de.properties
 create mode 100644 src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
 create mode 100644 src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
 create mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
 create mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
 create mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
 create mode 100644 src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
 create mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
 create mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
 create mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
 create mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
 create mode 100644 src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
 create mode 100644 src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
 create mode 100644 src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
 create mode 100644 src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
 create mode 100644 src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
 create mode 100644 src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties

diff --git a/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties b/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
new file mode 100644
index 00000000000..84597bb758c
--- /dev/null
+++ b/src/demo/share/jfc/CodePointIM/resources/codepoint_de.properties
@@ -0,0 +1,36 @@
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+#
+
+#
+# Resource strings for CodePointIM
+#
+
+warning=Diese Demoeingabemethode kann nicht direkt als Anwendung ausgef\u00FChrt werden.\nIn der Datei README.html in diesem Verzeichnis erfahren Sie, wie Sie diese \nEingabemethode verwenden.
+
diff --git a/src/demo/share/jfc/Notepad/resources/Notepad_de.properties b/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
new file mode 100644
index 00000000000..0c15bc05033
--- /dev/null
+++ b/src/demo/share/jfc/Notepad/resources/Notepad_de.properties
@@ -0,0 +1,93 @@
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+#
+
+#
+# Resource strings for Notepad example
+
+Title=Notepad
+ElementTreeFrameTitle=Elemente
+
+# file Menu definition
+#
+# Each of the strings that follow form a key to be
+# used as the basis of a menu item definition.
+#
+# open ->  Notepad.openAction
+# new  ->  Notepad.newAction
+# save ->  Notepad.saveAction
+# exit ->  Notepad.exitAction
+
+fileLabel=Datei
+openLabel=\u00D6ffnen
+openImage=resources/open.gif
+newLabel=Neu
+newImage=resources/new.gif
+saveLabel=Speichern
+saveImage=resources/save.gif
+exitLabel=Beenden
+
+#
+# edit Menu definition
+#
+# cut   -> JTextComponent.cutAction
+# copy  -> JTextComponent.copyAction
+# paste -> JTextComponent.pasteAction
+
+editLabel=Bearbeiten
+cutLabel=Ausschneiden
+cutImage=resources/cut.gif
+copyLabel=Kopieren
+copyImage=resources/copy.gif
+pasteLabel=Einf\u00FCgen
+pasteImage=resources/paste.gif
+undoLabel=R\u00FCckg\u00E4ngig
+redoLabel=Wiederherstellen
+
+#
+# debug Menu definition
+#
+
+debugLabel=Debuggen
+dumpLabel=Modell in System.err ausgeben
+showElementTreeLabel=Elemente anzeigen
+
+# toolbar definition
+#
+# Each of the strings that follow form a key to be
+# used as the basis of the tool definition.  Actions
+# are of course sharable, and in this case are shared
+# with the menu items.
+
+newTooltip=Neue Datei erstellen
+openTooltip=Datei \u00F6ffnen
+saveTooltip=In Datei speichern
+cutTooltip=Auswahl in Zwischenablage verschieben
+copyTooltip=Auswahl in Zwischenablage kopieren
+pasteTooltip=Zwischenablage in Auswahl einf\u00FCgen
diff --git a/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties b/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
new file mode 100644
index 00000000000..7ab06001f6d
--- /dev/null
+++ b/src/demo/share/jfc/Stylepad/resources/Stylepad_de.properties
@@ -0,0 +1,88 @@
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+#
+
+#
+# Resource strings for Stylepad example
+
+Title=Stylepad
+
+# Menu labels
+colorLabel=Farbe
+Red=Rot
+Green=Gr\u00FCn
+Blue=Blau
+
+boldLabel=Fett
+italicLabel=Kursiv
+
+# font menu
+
+fontLabel=Schriftart
+family1Label=SansSerif
+family2Label=Monospaced
+family3Label=Serif
+family4Label=Lucida Sans
+size1Label=10
+size2Label=12
+size3Label=18
+size4Label=24
+size5Label=48
+boldLabel=Fett
+italicLabel=Kursiv
+underlineLabel=Unterstrichen
+
+#
+# debug Menu definition
+#
+debugLabel=Debuggen
+dumpLabel=Modell in System.err ausgeben
+showElementTreeLabel=Elemente anzeigen
+
+
+# toolbar definition
+boldImage=resources/bold.gif
+boldTooltip=Fett
+italicImage=resources/italic.gif
+italicTooltip=Kursiv
+underlineImage=resources/underline.gif
+underlineTooltip=Unterstrichen
+foregroundImage=resources/fg.gif
+leftImage=resources/left.gif
+leftTooltip=Linksb\u00FCndig
+centerImage=resources/center.gif
+centerTooltip=Zentriert
+rightImage=resources/right.gif
+rightTooltip=Rechtsb\u00FCndig
+bulletsImage=resources/bullets.gif
+
+# wonderland example images
+aliceGif=resources/alice.gif
+caterpillarGif=resources/caterpillar.gif
+hatterGif=resources/hatter.gif
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
new file mode 100644
index 00000000000..509597076f7
--- /dev/null
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_de.properties
@@ -0,0 +1,674 @@
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in the SwingSet demo.
+#
+# @author Jeff Dinkins
+
+#################################
+###  SwingSet Infrastructure  ###
+#################################
+
+### About Box ###
+
+AboutBox.title=Info zu Swing!
+AboutBox.ok_button_text=OK
+AboutBox.accessible_description=SwingSet2-Demo: Copyright (c) 2011, Oracle und/oder verbundene Unternehmen. All rights reserved. Alle Rechte vorbehalten.
+
+### Source Code ###
+SourceCode.loading=<html><body bgcolor="#ffffff">Quellcode wird geladen und formatiert. Bitte warten...</body></html>
+
+### Status ###
+
+Status.loading=Wird geladen:
+Status.popupMenuAccessible=Dr\u00FCcken Sie Umschalt-F10, um das Popup-Men\u00FC zu aktivieren
+
+### Menu Bar ###
+
+MenuBar.accessible_description=Men\u00FCleiste der Swing-Demo
+
+
+### Frame ###
+
+Frame.title=SwingSet2
+
+
+### Tabbed Pane ###
+
+TabbedPane.src.labelAndMnemonic=Quellcode
+TabbedPane.src_tooltip=Quellcode f\u00FCr diese Demo anzeigen
+
+
+### Look & Feel Menu ###
+
+LafMenu.laf.labelAndMnemonic=&Look-and-Feel
+LafMenu.laf_accessible_description=Men\u00FC, \u00FCber das Sie das Look-and-Feel wechseln k\u00F6nnen
+
+LafMenu.java.labelAndMnemonic=&Java-Look-and-Feel
+LafMenu.java_accessible_description=Das Java-Look-and-Feel
+
+LafMenu.nimbus.labelAndMnemonic=&Nimbus-Look-and-Feel
+LafMenu.nimbus_accessible_description=Das Nimbus-Look-and-Feel
+
+LafMenu.mac.labelAndMnemonic=&Mac OS X-Look-and-Feel
+LafMenu.mac_accessible_description=Das Mac OS X-Look-and-Feel
+
+LafMenu.motif.labelAndMnemonic=M&otif-Look-and-Feel
+LafMenu.motif_accessible_description=Das Motif-Look-and-Feel
+
+LafMenu.windows.labelAndMnemonic=&Windows-Look-and-Feel
+LafMenu.windows_accessible_description=Windows-Look-and-Feel
+
+LafMenu.gtk.labelAndMnemonic=&GTK-Look-and-Feel
+LafMenu.gtk_accessible_description=GTK-Look-and-Feel
+
+
+### Themes Menu ###
+
+ThemesMenu.themes.labelAndMnemonic=&Themes
+ThemesMenu.themes_accessible_description=Men\u00FC zum Wechseln der Metal-Farb-Themes
+
+ThemesMenu.aqua.labelAndMnemonic=A&qua
+ThemesMenu.aqua_accessible_description=Ein Metal-Theme mit blau-gr\u00FCnen Farben
+
+ThemesMenu.charcoal.labelAndMnemonic=&Anthrazit
+ThemesMenu.charcoal_accessible_description=Ein Metal-Theme mit dunkelgrauen Farben
+
+ThemesMenu.contrast.labelAndMnemonic=&Hoher Kontrast
+ThemesMenu.contrast_accessible_description=Ein Theme mit hohem Kontrast
+
+ThemesMenu.ocean.labelAndMnemonic=&Ozean
+ThemesMenu.ocean_accessible_description=Das Metal-Theme "Ozean"
+
+ThemesMenu.steel.labelAndMnemonic=&Stahl
+ThemesMenu.steel_accessible_description=Das blaue/violette Metal-Theme
+
+ThemesMenu.emerald.labelAndMnemonic=&Smaragdgr\u00FCn
+ThemesMenu.emerald_accessible_description=Ein Metal-Theme mit gr\u00FCnen Farben
+
+ThemesMenu.ruby.labelAndMnemonic=&Rubinrot
+ThemesMenu.ruby_accessible_description=Ein Metal-Theme mit roten Farben
+
+
+### Font SubMenu (under Themes) 
+FontMenu.fonts.labelAndMnemonic=Schri&ftarten
+FontMenu.fonts_accessible_description=Men\u00FC, in dem Sie Schriftarten f\u00FCr das Java-Look-and-Feel ausw\u00E4hlen
+
+FontMenu.bold.labelAndMnemonic=&Fett
+FontMenu.bold_accessible_description=Deaktiviert fettgedruckte Schriftarten f\u00FCr das Java-Look-and-Feel
+
+FontMenu.plain.labelAndMnemonic=&Normal
+FontMenu.plain_accessible_description=Deaktiviert normale Schriftarten f\u00FCr das Java-Look-and-Feel
+
+
+### Audio SubMenu (under Themes) ###
+
+AudioMenu.audio.labelAndMnemonic=&Audio
+AudioMenu.audio_accessible_description=Men\u00FC, in dem Sie die verf\u00FCgbare Audio-Feedbackmenge im Java-Look-and-Feel \u00E4ndern
+
+AudioMenu.on.labelAndMnemonic=&Ein
+AudioMenu.on_accessible_description=Aktiviert das gesamte Audiofeedback f\u00FCr das Java-Look-and-Feel
+
+AudioMenu.default.labelAndMnemonic=Stan&dard
+AudioMenu.default_accessible_description=Aktiviert die standardm\u00E4\u00DFige Audio-Feedbackmenge f\u00FCr das Java-Look-and-Feel
+
+AudioMenu.off.labelAndMnemonic=A&us
+AudioMenu.off_accessible_description=Deaktiviert das gesamte Audiofeedback f\u00FCr das Java-Look-and-Feel
+
+### Options Menu ###
+
+OptionsMenu.options.labelAndMnemonic=O&ptionen
+OptionsMenu.options_accessible_description=Men\u00FC mit anderen Optionen
+
+OptionsMenu.tooltip.labelAndMnemonic=QuickInfo ak&tivieren
+OptionsMenu.tooltip_accessible_description=QuickInfo aktivieren oder deaktivieren
+
+OptionsMenu.dragEnabled.labelAndMnemonic=&Drag-und-Drop aktivieren
+OptionsMenu.dragEnabled_accessible_description=Drag-und-Drop aktivieren oder deaktivieren
+
+### File Menu ###
+
+FileMenu.file.labelAndMnemonic=Dat&ei
+FileMenu.accessible_description=Men\u00FC "Datei"
+FileMenu.about.labelAndMnemonic=&Info
+FileMenu.about_accessible_description=Weitere Informationen zur SwingSet2-Anwendung
+FileMenu.open.labelAndMnemonic=\u00D6&ffnen
+FileMenu.open_accessible_description=Platzhaltermen\u00FCoption zum \u00D6ffnen einer Datei
+FileMenu.save.labelAndMnemonic=&Speichern
+FileMenu.save_accessible_description=Platzhaltermen\u00FCoption zum Speichern einer Datei
+FileMenu.save_as.labelAndMnemonic=Speichern &unter...
+FileMenu.save_as_accessible_description=Platzhaltermen\u00FCoption zum Speichern einer Datei mit einem neuen Namen
+FileMenu.exit.labelAndMnemonic=B&eenden
+FileMenu.exit_accessible_description=SwingSet2-Anwendung beenden
+
+### Multi-Screen menu ###
+MultiMenu.multi.labelAndMnemonic=&Multiscreen
+MultiMenu.multi_accessible_description=Multiscreen-Men\u00FC
+MultiMenu.all.labelAndMnemonic=SwingSet2 &auf allen Bildschirmen erstellen
+MultiMenu.all_accessible_description=SwingSet2-Fenster auf jedem Bildschirm erstellen
+MultiMenu.single.labelAndMnemonic=SwingSet2 auf Bildschirm erstellen
+MultiMenu.single_accessible_description=SwingSet2-Fenster auf Bildschirm erstellen
+
+
+################################
+###          DEMOS           ###
+################################
+
+### Button Demo ###
+
+ButtonDemo.accessible_description=Die ButtonDemo zeigt Beispiele f\u00FCr die Verwendung von JButton, JRadioButton, JToggleButton und JCheckBox
+ButtonDemo.tooltip=Demos f\u00FCr JButton, JRadioButton, JToggleButton, JCheckbox
+ButtonDemo.name=Schaltfl\u00E4chendemo
+
+ButtonDemo.buttons=Schaltfl\u00E4chen
+ButtonDemo.checkboxes=Kontrollk\u00E4stchen
+ButtonDemo.radiobuttons=Optionsfelder
+ButtonDemo.togglebuttons=Umschalt-Schaltfl\u00E4chen
+
+ButtonDemo.textbuttons=Textschaltfl\u00E4chen
+ButtonDemo.imagebuttons=Bildschaltfl\u00E4chen
+ButtonDemo.textradiobuttons=Textoptionsfelder
+ButtonDemo.imageradiobuttons=Bildoptionsfelder
+ButtonDemo.texttogglebuttons=Text-Umschalt-Schaltfl\u00E4chen
+ButtonDemo.imagetogglebuttons=Bild-Umschalt-Schaltfl\u00E4chen
+ButtonDemo.textcheckboxes=Textkontrollk\u00E4stchen
+ButtonDemo.imagecheckboxes=Bildkontrollk\u00E4stchen
+
+ButtonDemo.button1=Eins
+ButtonDemo.button2=Zwei
+ButtonDemo.button3=<html><font size=2 color=red><bold>Drei.</font></html>
+
+ButtonDemo.radio1=Optionsfeld Eins
+ButtonDemo.radio2=Optionsfeld Zwei
+ButtonDemo.radio3=Optionsfeld Drei
+ButtonDemo.radioX=<html><font size=2 color=red>Drei<bold>(HTML!)</bold></font></html>
+
+ButtonDemo.check1=Eins
+ButtonDemo.check2=Zwei
+ButtonDemo.check3=Drei
+ButtonDemo.checkX=<html><font size=2 color=red>Drei<bold>(HTML!)</bold></font></html>
+
+ButtonDemo.customradio=Ein benutzerdefiniertes "Chrome"-Optionsfeld.
+ButtonDemo.customcheck=Ein benutzerdefinierbares Gl\u00FChbirnenkontrollk\u00E4stchen.
+
+ButtonDemo.phone=Telefon
+ButtonDemo.write=Schreiben
+ButtonDemo.peace=Peace
+
+ButtonDemo.controlpanel.labelAndMnemonic=Anzeigeoptionen:
+ButtonDemo.paintborder.labelAndMnemonic=Rahmen f\u00E4r&ben
+ButtonDemo.paintborder_tooltip=Klicken Sie hier, um die Rahmenf\u00E4rbung ein- oder auszuschalten.
+ButtonDemo.paintfocus.labelAndMnemonic=&Fokus f\u00E4rben
+ButtonDemo.paintfocus_tooltip=Klicken Sie hier, um die Fokusf\u00E4rbung ein- oder auszuschalten.
+ButtonDemo.enabled.labelAndMnemonic=Aktivi&ert
+ButtonDemo.enabled_tooltip=Klicken Sie hier, um die Schaltfl\u00E4chen zu aktivieren oder zu deaktivieren.
+ButtonDemo.contentfilled.labelAndMnemonic=&Inhalt gef\u00FCllt
+ButtonDemo.contentfilled_tooltip=Klicken Sie hier, um die F\u00FCllung des Inhaltsbereichs zu steuern.
+
+ButtonDemo.padamount.labelAndMnemonic=Abstand:
+ButtonDemo.default.labelAndMnemonic=Stan&dard
+ButtonDemo.default_tooltip=Verwendet den Standardabstand zwischen Rahmen und Label.
+ButtonDemo.zero.labelAndMnemonic=&0
+ButtonDemo.zero_tooltip=Verwendet keinen Abstand zwischen Rahmen und Label.
+ButtonDemo.ten.labelAndMnemonic=&10
+ButtonDemo.ten_tooltip=Verwendet einen Abstand von 10 Pixel zwischen Rahmen und Label.
+
+LayoutControlPanel.textposition.labelAndMnemonic=Textposition:
+LayoutControlPanel.contentalignment.labelAndMnemonic=Inhaltsausrichtung:
+
+### ColorChooser Demo ###
+
+ColorChooserDemo.accessible_description=Mit dem ColorChooser k\u00F6nnen Sie eine Farbe \u00FCber eine Palette oder unter RGB- oder HSB-Werten ausw\u00E4hlen
+ColorChooserDemo.tooltip=JColorChooser-Demo
+ColorChooserDemo.name=ColorChooser-Demo
+ColorChooserDemo.chooser_title=Farbe w\u00E4hlen
+ColorChooserDemo.background=Hintergrund
+ColorChooserDemo.grad_a=Farbverlauf 1
+ColorChooserDemo.grad_b=Farbverlauf 2
+ColorChooserDemo.outer_line=Umfang
+ColorChooserDemo.cup=Bild der Kaffeetasse der Java-Marke
+
+### ComboBox Demo ###
+
+ComboBoxDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JComboBox-Komponente.
+ComboBoxDemo.tooltip=JComboBox-Demo
+ComboBoxDemo.name=ComboBox-Demo
+
+ComboBoxDemo.hair=Haare
+ComboBoxDemo.eyes=Augen
+ComboBoxDemo.mouth=Mund
+ComboBoxDemo.presets=Voreinstellungen:
+
+ComboBoxDemo.preset1=Philip, Howard, Jeff
+ComboBoxDemo.preset2=Jeff, Larry, Philip
+ComboBoxDemo.preset3=Howard, Scott, Hans
+ComboBoxDemo.preset4=Philip, Jeff, Hans
+ComboBoxDemo.preset5=Brent, Jon, Scott
+ComboBoxDemo.preset6=Lara, Larry, Lisa
+ComboBoxDemo.preset7=James, Philip, Michael
+ComboBoxDemo.preset8=Philip, Lisa, Brent
+ComboBoxDemo.preset9=James, Philip, Jon
+ComboBoxDemo.preset10=Lara, Jon, Scott
+
+
+ComboBoxDemo.hair_description=Haare:
+ComboBoxDemo.eyes_description=Augen und Nase:
+ComboBoxDemo.mouth_description=Mund:
+
+ComboBoxDemo.amy=Amy
+ComboBoxDemo.brent=Brent
+ComboBoxDemo.georges=Georges
+ComboBoxDemo.hans=Hans
+ComboBoxDemo.howard=Howard
+ComboBoxDemo.james=James
+ComboBoxDemo.jeff=Jeff
+ComboBoxDemo.jon=Jon
+ComboBoxDemo.lara=Lara
+ComboBoxDemo.larry=Larry
+ComboBoxDemo.lisa=Lisa
+ComboBoxDemo.michael=Michael
+ComboBoxDemo.philip=Philip
+ComboBoxDemo.scott=Scott
+
+### FileChooser Demo ###
+
+FileChooserDemo.accessible_description=\u00DCber den FileChooser k\u00F6nnen Benutzer eine Datei zum \u00D6ffnen oder Erstellen/Speichern ausw\u00E4hlen.
+FileChooserDemo.tooltip=JFileChooser-Demo
+FileChooserDemo.name=FileChooser-Demo
+
+FileChooserDemo.plainbutton=Einfachen JFileChooser anzeigen
+FileChooserDemo.previewbutton=Vorschau-JFileChooser anzeigen
+FileChooserDemo.custombutton=Benutzerdefinierten JFileChooser anzeigen
+
+FileChooserDemo.description=<html>&&nbsp &&nbsp Beachten Sie, dass Sie ganz einfach Ihren eigenen FileChooser<br> &&nbsp &&nbsp mit beliebig vielen Komponenten erstellen k\u00F6nnen. </html>
+
+FileChooserDemo.filterdescription=JPEG- und GIF-Bilddateien
+
+FileChooserDemo.nofileselected=W\u00E4hlen Sie zun\u00E4chst eine Datei aus.
+FileChooserDemo.thefile=die Datei:
+FileChooserDemo.isprobably=ist wahrscheinlich ein Bild.
+
+FileChooserDemo.helptext=<html>Suchen: Datei suchen.<br>Info: Weitere Informationen zur Datei.<br>OK: Diese Datei ausw\u00E4hlen.<br>Abbrechen: Dieses Dialogfeld ohne Aktion verlassen.</html>
+
+FileChooserDemo.findquestion=Datei suchen:
+FileChooserDemo.findresponse=<html><center>Sie m\u00F6chten wirklich eine Datei suchen? <br>Das ist mit dieser Demo nicht m\u00F6glich.</center></html>
+
+FileChooserDemo.dialogtitle=FileChooser mit benutzerdefiniertem Layout
+FileChooserDemo.help=Hilfe
+FileChooserDemo.find=Suchen
+FileChooserDemo.ok=OK
+FileChooserDemo.about=Info
+FileChooserDemo.cancel=Abbrechen
+
+### Html Demo ###
+
+HtmlDemo.accessible_description=Diese Demo zeigt, wie HTML-Text mit der JEditorPane-Komponente angezeigt wird.
+HtmlDemo.tooltip=JEditorPane-HTML-Demo
+HtmlDemo.name=JEditorPane-HTML-Demo
+HtmlDemo.filename=swing.html
+
+
+### Internal Frame Demo ###
+
+InternalFrameDemo.accessible_description=JInternal-Framedemo
+InternalFrameDemo.create_frames.labelAndMnemonic=Angepasste interne Frames erstellen
+InternalFrameDemo.title_text_field.labelAndMnemonic=Frametitel:
+InternalFrameDemo.frame.labelAndMnemonic=Frame
+InternalFrameDemo.palette.labelAndMnemonic=Generator f\u00FCr interne Frames
+InternalFrameDemo.name=Demo f\u00FCr interne Frames
+InternalFrameDemo.tooltip=JInternalFrame-Demo
+InternalFrameDemo.closable.labelAndMnemonic=Kann geschlossen werden
+InternalFrameDemo.resizable.labelAndMnemonic=Skalierbar
+InternalFrameDemo.iconifiable.labelAndMnemonic=Als Symbol darstellbar
+InternalFrameDemo.maximizable.labelAndMnemonic=Maximierbar
+InternalFrameDemo.toast=Prost
+InternalFrameDemo.duke=Euer Gnaden!
+InternalFrameDemo.duchess=Herzogin
+InternalFrameDemo.cab=Braucht jemand ein Taxi?
+
+
+### List Demo ###
+
+ListDemo.accessible_description=JList-Demo
+ListDemo.name=Listendemo
+ListDemo.tooltip=JList-Demo
+ListDemo.prefixes=Pr\u00E4fixe
+ListDemo.suffixes=Suffixe
+ListDemo.count.labelAndMnemonic=Anzahl generierte Listeneintr\u00E4ge:
+ListDemo.all=Alle
+ListDemo.none=Kein Wert
+ListDemo.red=Rotes Firmenlogobild
+ListDemo.yellow=Rotes Firmenlogobild
+ListDemo.blue=Blaues Firmenlogobild
+ListDemo.gray=Graues Firmenlogobild
+ListDemo.green=Gr\u00FCnes Firmenlogobild
+ListDemo.magenta=Firmenlogobild in Magenta
+ListDemo.cyan=Firmenlogobild in Zyan
+ListDemo.description=<html><P STYLE="margin-left: .25in; margin-right: .25in">Diese Demo zeigt die Pr\u00E4sentation von Datenlisten auf zwei verschiedene Arten. Links steht eine <b>JList</b>-Komponente mit Listenelementen, die aus den Permutationen der aktivierten Pr\u00E4fixe und Suffixe bestehen. Die Kontrollk\u00E4stchenspalten f\u00FCr Pr\u00E4fix und Suffix rechts werden mit einer <b>JPanel</b>-Komponente mit einem Y-Achsen-<b>BoxLayout</b> in einer <b>JScrollPane</b>-Komponente erstellt.</P></html>
+
+
+### OptionPane Demo ###
+
+OptionPaneDemo.accessible_description=Die OptionPane-Demo zeigt Beispiele f\u00FCr die Verwendung von JOptionPane zum Generieren verschiedener g\u00E4ngiger Optionsdialogfelder
+OptionPaneDemo.tooltip=JOptionPane-Demo
+OptionPaneDemo.name=Optionsbereichsdemo
+
+OptionPaneDemo.warningbutton=Warnungsdialogfeld anzeigen
+OptionPaneDemo.componentbutton=Komponentendialogfeld anzeigen
+OptionPaneDemo.inputbutton=Eingabedialogfeld anzeigen
+OptionPaneDemo.confirmbutton=Best\u00E4tigungsdialogfeld anzeigen
+OptionPaneDemo.messagebutton=Meldungsdialog anzeigen
+
+OptionPaneDemo.warningtitle=Beispiel f\u00FCr Warnungsdialogfeld
+OptionPaneDemo.warningtext=<html><P><font color=black>Das ist ein Test des <font color=red><b>Notfallwarnsystems</b></font>. <i><b>Das ist<br> nur ein Test</b></i>. Der Webmaster Ihres lokalen Intranets hat dieses System in freiwilliger <br> Zusammenarbeit mit den <font color=blue><b>Bundes-</b></font> und <font color=blue><b>L\u00E4nderbeh\u00F6rden</b></font> <br> entwickelt, um Sie bei Bedarf \u00FCber <br> Notf\u00E4lle zu informieren. Bei einem tats\u00E4chlichen Notfall w\u00FCrden auf das Signal, das Sie <br> eben geh\u00F6rt haben, offizielle Informationen, Nachrichten <br> oder Anweisungen folgen. Damit ist dieser Test des <font color=red><b><br>Notfallwarnsystems</b></font> abgeschlossen.</font></P><P><br>Entwicklerhinweis: Der Text in dieser Dialogfelddemo wurde mit HTML formatiert.</P></html>
+
+OptionPaneDemo.messagetext=Flaschenpost
+
+OptionPaneDemo.confirmquestion=Scheint heute die Sonne?
+OptionPaneDemo.confirmyes=<html>Warum sitzen Sie noch am Computer?<br> Gehen Sie raus! Machen Sie einen Ausflug zum Strand! Legen Sie sich in die Sonne!</html>
+OptionPaneDemo.confirmno=Gut, dass Sie hier drinnen vor dem Wetter gesch\u00FCtzt sind.
+
+OptionPaneDemo.inputquestion=Was ist Ihr Lieblingsfilm?
+OptionPaneDemo.inputresponse=Das ist ein guter Film!
+
+OptionPaneDemo.componenttitle=Beispiel f\u00FCr Komponentendialogfeld
+OptionPaneDemo.componentmessage=<html>JOptionPane kann beliebig viele Komponenten <br> enthalten, wie ein Textfeld:</html>
+OptionPaneDemo.componenttextfield=oder ein Kombinationsfeld:
+OptionPaneDemo.component_cb1=Element 1
+OptionPaneDemo.component_cb2=Element 2
+OptionPaneDemo.component_cb3=Element 3
+OptionPaneDemo.componentmessage2=<html>JOptionPane kann au\u00DFerdem beliebig viele <br> Optionen anzeigen:</html>
+OptionPaneDemo.component_op1=Ja
+OptionPaneDemo.component_op2=Nein
+OptionPaneDemo.component_op3=Vielleicht
+OptionPaneDemo.component_op4=Wahrscheinlich
+OptionPaneDemo.component_op5=Abbrechen
+
+OptionPaneDemo.component_r1=Optimistisch und positiv! Das ist gut.
+OptionPaneDemo.component_r2=Definitiv nicht. Da haben Sie ganz recht.
+OptionPaneDemo.component_r3=<html><font color=black> Ja, momentan ist die Situation <br> noch ungekl\u00E4rt. Sagen Sie sp\u00E4ter Bescheid, wenn Sie es genau wissen.</font></html>
+OptionPaneDemo.component_r4=<html><font color=black>Sie wollen doch "Ja" sagen. Sie h\u00E4tten sich <br> einfach darauf einlassen und "Ja" klicken sollen.</font></html>
+
+### ProgressBar Demo ###
+
+ProgressBarDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JProgressBar-Komponente.
+ProgressBarDemo.tooltip=JProgressBar-Demo
+ProgressBarDemo.name=ProgressBar-Demo
+ProgressBarDemo.start_button=Laden von Text starten
+ProgressBarDemo.stop_button=Laden von Text stoppen
+ProgressBarDemo.accessible_text_loading_progress=Ladefortschritt f\u00FCr Text
+ProgressBarDemo.accessible_text_area_name=Text wird progressiv geladen
+
+ProgressBarDemo.accessible_text_area_description=Diese JTextArea-Komponente wird progressiv mit Text aus einem Puffer gef\u00FCllt (ein Buchstabe nach dem anderen). Dabei wird der Ladefortschritt im Fortschrittsbalken unten im Fenster angezeigt
+
+ProgressBarDemo.text=Man sagt ja, dass unendlich viele Affen, die unendlich lange auf unendlich vielen Schreibmaschinen herumtippen, \nirgendwann alle Meisterwerke der Menschheit schreiben w\u00FCrden. Mit den modernen Hochgeschwindigkeitsrechnern k\u00F6nnen wir \ndiese Theorie endlich testen... \n\n\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\tQ0hnlj 23&&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\tth;qxhz d7yty; Q0hnlj 23&&^ nknod mrs88 jsd79lfm#%$JLaoz6df  lso7dj f2 jfls\n\t67d9ol1@2fou99s  1lkj2 @l.k1  2; a89o7aljf  1l3i7ou8 d8l3 lqwerty0092 #1!\n\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78  3ol7asljf 3 ldif && l.js\n\tLl ls ewan la8uj 23lll7u 8l  3h hhxx8 8d  lsd fixx 891lkjno99sl d8l@@@!!8#8\n\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\train? When the hurlyburly's done, When the battle's lost and won. That will\n\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\tMacbeth. But hath forth not to want.....  a banana, or to be.... a banana.\n\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\n\n\n\nNun, das war scheinbar eine gute Idee...
+
+
+### ScrollPane Demo ###
+
+ScrollPaneDemo.accessible_description=JScrollPane-Demo
+ScrollPaneDemo.name=Demo f\u00FCr Bildlaufbereich
+ScrollPaneDemo.tooltip=JScrollPane-Demo
+ScrollPaneDemo.crayons=Viele Stifte
+ScrollPaneDemo.colheader=Spaltenheader
+ScrollPaneDemo.rowheader=Zeilenheader
+ScrollPaneDemo.upperleft=Oben links
+ScrollPaneDemo.upperright=Oben rechts im Spaltenheader
+ScrollPaneDemo.lowerleft=Unten links im Spaltenheader
+
+
+### Slider Demo ###
+
+SliderDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JSlider-Komponente.
+SliderDemo.tooltip=JSlider-Demo
+SliderDemo.name=Schiebereglerdemo
+
+SliderDemo.slidervalue=Schiebereglerwert:
+SliderDemo.horizontal=Horizontal
+SliderDemo.vertical=Vertikal
+SliderDemo.plain=Einfach
+SliderDemo.a_plain_slider=Ein einfacher Schieberegler
+SliderDemo.majorticks=Grobteilungen
+SliderDemo.majorticksdescription=Ein Schieberegler mit Grobteilungsmarkierungen
+SliderDemo.ticks=Feinteilungen, Teilungen zum Einrasten und Labels
+SliderDemo.minorticks=Feinteilungen
+SliderDemo.minorticksdescription=Ein Schieberegler mit Grob- und Feinteilungen, mit Teilungen, in die der Schieberegler einrastet, wobei einige Teilungen mit einem sichtbaren Label versehen sind
+SliderDemo.disabled=Deaktiviert
+SliderDemo.disableddescription=Ein Schieberegler mit Grob- und Feinteilungen, der nicht aktiviert ist (kann nicht bearbeitet werden)
+
+### SplitPane Demo ###
+
+SplitPaneDemo.accessible_description=JSplitPane-Demo
+SplitPaneDemo.name=Teilbereichdemo
+SplitPaneDemo.tooltip=JSplitPane-Demo
+SplitPaneDemo.earth=Mutter Erde
+SplitPaneDemo.moon=Ein Astronaut auf dem Mond
+SplitPaneDemo.vert_split.labelAndMnemonic=&Vertikal geteilt
+SplitPaneDemo.horz_split.labelAndMnemonic=Ho&rizontal geteilt
+SplitPaneDemo.cont_layout.labelAndMnemonic=Kontinuierli&ches Layout
+SplitPaneDemo.one_touch_expandable.labelAndMnemonic=&Mit einer Ber\u00FChrung einblendbar
+SplitPaneDemo.divider_size.labelAndMnemonic=Trennliniengr\u00F6\u00DFe
+SplitPaneDemo.invalid_divider_size=Ung\u00FCltige Trennliniengr\u00F6\u00DFe
+SplitPaneDemo.error=Fehler
+SplitPaneDemo.first_component_min_size.labelAndMnemonic=M&indestgr\u00F6\u00DFe der ersten Komponente
+SplitPaneDemo.second_component_min_size.labelAndMnemonic=Mi&ndestgr\u00F6\u00DFe der zweiten Komponente
+SplitPaneDemo.invalid_min_size=Ung\u00FCltige Mindestgr\u00F6\u00DFe
+SplitPaneDemo.must_be_greater_than=muss gr\u00F6\u00DFer sein als
+
+
+### TabbedPane Demo ###
+
+TabbedPaneDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung der JTabbedPane-Komponente.
+TabbedPaneDemo.tooltip=JTabbedPane-Demo
+TabbedPaneDemo.name=TabbedPane-Demo
+
+TabbedPaneDemo.bounce=<html><font color=blue><bold><center>Bouncing Babies!</center></bold></font></html>
+TabbedPaneDemo.stephen=Stephen
+TabbedPaneDemo.david=David
+TabbedPaneDemo.matthew=Matthew
+TabbedPaneDemo.ewan=Ewan
+TabbedPaneDemo.blake=Blake
+TabbedPaneDemo.brooke=Brooke
+TabbedPaneDemo.laine=Laine
+TabbedPaneDemo.hania=Hania
+
+TabbedPaneDemo.label=Platzierung der Registerkarten:
+TabbedPaneDemo.top=Oben
+TabbedPaneDemo.bottom=Unten
+TabbedPaneDemo.left=Links
+TabbedPaneDemo.right=Rechts
+
+
+### Table Demo ###
+
+TableDemo.accessible_description=JTable-Demo
+TableDemo.name=Tabellendemo
+TableDemo.tooltip=JTable-Demo
+TableDemo.all_columns=Alle Spalten
+TableDemo.autoresize_mode=Modus "Automatische Skalierung"
+TableDemo.cell_selection=Zellenauswahl
+TableDemo.column_boundaries=Spaltengrenzen
+TableDemo.column_selection=Spaltenauswahl
+TableDemo.horz_lines=Horizontale Linien
+TableDemo.intercell_spacing=Abstand zwischen Zellen
+TableDemo.intercell_spacing_colon=Abstand zwischen Zellen:
+TableDemo.last_column=Letzte Spalte
+TableDemo.multiple_ranges=Mehrere Bereiche
+TableDemo.one_range=Ein Bereich
+TableDemo.reordering_allowed=Neuanordnung zul\u00E4ssig
+TableDemo.row_height=Zeilenh\u00F6he
+TableDemo.row_height_colon=Zeilenh\u00F6he:
+TableDemo.row_selection=Zeilenauswahl
+TableDemo.selection_mode=Auswahlmodus
+TableDemo.subsequent_columns=Nachfolgende Spalten
+TableDemo.vert_lines=Vertikale Linien
+TableDemo.single=Einzeln
+TableDemo.none=Kein Wert
+TableDemo.off=Deaktiviert
+TableDemo.first_name=Vorname
+TableDemo.last_name=Nachname
+TableDemo.favorite_color=Lieblingsfarbe
+TableDemo.favorite_food=Lieblingsessen
+TableDemo.favorite_movie=Lieblingsfilm
+TableDemo.favorite_number=Lieblingszahl
+TableDemo.aqua=Aquamarin
+TableDemo.beige=Beige
+TableDemo.black=Schwarz
+TableDemo.blue=Blau
+TableDemo.cybergreen=Gr\u00FCn
+TableDemo.darkgreen=Dunkelgr\u00FCn
+TableDemo.eblue=Neonblau
+TableDemo.jfcblue=JFC prim\u00E4r
+TableDemo.jfcblue2=JFC sekund\u00E4r
+TableDemo.forestgreen=Waldgr\u00FCn
+TableDemo.gray=Grau
+TableDemo.green=Gr\u00FCn
+TableDemo.orange=Orange
+TableDemo.purple=Lila
+TableDemo.red=Rot
+TableDemo.rustred=Rostrot
+TableDemo.sunpurple=Purpur
+TableDemo.suspectpink=Pink
+TableDemo.turquoise=T\u00FCrkis
+TableDemo.violet=Violett
+TableDemo.yellow=Gelb
+TableDemo.2001=2001: Odyssee im Weltraum
+TableDemo.buckaroo=Buckaroo Banzai - Die 8. Dimension
+TableDemo.firstsight=Auf den ersten Blick
+TableDemo.airplane=Die unglaubliche Reise in einem verr\u00FCckten Flugzeug (und Fortsetzung)
+TableDemo.aliens=Aliens - Die R\u00FCckkehr
+TableDemo.bicycle=Fahrraddiebe
+TableDemo.bladerunner=Blade Runner (Director's Cut)
+TableDemo.bluesbros=Blues Brothers
+TableDemo.brazil=Brazil
+TableDemo.bugs=Das gro\u00DFe Krabbeln
+TableDemo.city=Die Stadt der verlorenen Kinder
+TableDemo.chusingura=Chusingura (1962)
+TableDemo.clock=Uhrwerk Orange
+TableDemo.curse=Der Fluch des D\u00E4monen
+TableDemo.dasboot=Das Boot
+TableDemo.dazed=Confusion - Sommer der Ausgeflippten
+TableDemo.defending=Rendezvous im Jenseits
+TableDemo.eraserhead=Eraserhead
+TableDemo.fifthelement=Das f\u00FCnfte Element
+TableDemo.goodfellas=GoodFellas - Drei Jahrzehnte in der Mafia
+TableDemo.harold=Harold und Maude
+TableDemo.joyluck=T\u00F6chter des Himmels
+TableDemo.jules=Jules und Jim
+TableDemo.ladyvanishes=Eine Dame verschwindet
+TableDemo.mohicans=Der letzte Mohikaner
+TableDemo.lonestar=Lone Star
+TableDemo.man=Der Mann, der zuviel wusste
+TableDemo.musicman=Music Man
+TableDemo.dog=Mein Leben als Hund
+TableDemo.oncewest=Spiel mir das Lied vom Tod
+TableDemo.pulpfiction=Pulp Fiction
+TableDemo.raiders=J\u00E4ger des verlorenen Schatzes
+TableDemo.reservoir=Reservoir Dogs - Wilde Hunde
+TableDemo.repoman=Repoman
+TableDemo.spinaltap=This is Spinal Tap
+TableDemo.schindlerslist=Schindlers Liste
+TableDemo.starwars=Star Wars
+TableDemo.stuntman=Der lange Tod des Stuntman Cameron
+TableDemo.thinman=Der d\u00FCnne Mann
+TableDemo.withnail=Withnail && I
+TableDemo.labyrinth=Die Reise ins Labyrinth
+TableDemo.shawshank=Die Verurteilten
+TableDemo.apple=Apfel
+TableDemo.asparagus=Spargel
+TableDemo.banana=Banane
+TableDemo.broccoli=Brokkoli
+TableDemo.carrot=Karotte
+TableDemo.cantaloupe=Cantaloupe-Melone
+TableDemo.corn=Mais
+TableDemo.grapes=Trauben
+TableDemo.grapefruit=Grapefruit
+TableDemo.kiwi=Kiwi
+TableDemo.onion=Zwiebel
+TableDemo.pear=Birne
+TableDemo.peach=Pfirsich
+TableDemo.pepper=Rote Paprika
+TableDemo.pickle=Essiggurke
+TableDemo.pineapple=Ananas
+TableDemo.raspberry=Himbeere
+TableDemo.sparegrass=Gr\u00FCnzeug
+TableDemo.strawberry=Erdbeere
+TableDemo.tomato=Tomate
+TableDemo.watermelon=Wassermelone
+
+TableDemo.printing=Drucken
+TableDemo.fitWidth=Breite anpassen
+TableDemo.print=Drucken
+TableDemo.header=Header
+
+# This string will be formatted by a MessageFormat and
+# printed at the top of each page of the printed result.
+# You can use {0} to insert a page number.
+TableDemo.headerText=JTable-Druck
+
+TableDemo.footer=Footer
+
+# This string will be formatted by a MessageFormat and
+# printed at the bottom of each page of the printed result.
+# You can use {0} to insert a page number.
+TableDemo.footerText=Seite {0}
+
+TableDemo.printingResult=Druckergebnis
+TableDemo.printingComplete=Druck abgeschlossen
+TableDemo.printingCancelled=Druck abgebrochen
+
+# This string will be formatted by a MessageFormat and
+# and displayed when an exception occurs.
+# {0} is used to place details of the exception.
+TableDemo.printingFailed=Druck nicht erfolgreich: {0}
+
+
+### ToolTip Demo ###
+
+ToolTipDemo.accessible_description=QuickInfos zeigen kurze Hilfebeschreibungen f\u00FCr eine Komponente an
+ToolTipDemo.accessible_cow=Das ist eine Kuh.
+ToolTipDemo.tooltip=QuickInfo-Demo
+ToolTipDemo.name=QuickInfo-Demo
+ToolTipDemo.bessie=Bessie, die Kuh
+ToolTipDemo.cow=Kuh.
+ToolTipDemo.got_milk=Milch gef\u00E4llig?
+ToolTipDemo.tail=Schweif.
+ToolTipDemo.moo=Muuuh
+ToolTipDemo.tooltip_features=<html>QuickInfos m\u00FCssen nicht immer<p>langweilige, einzeilige Beschreibungen sein. Das <font color=blue size=+2>Swing!</font>-Team<p> zeigt Ihnen gerne, dass es auch anders geht.<p>In Swing k\u00F6nnen QuickInfos HTML f\u00FCr Folgendes verwenden: <ul><li>Listen<li><b>fettgedruckten</b> Text<li><em>betonten</em> Text<li>Text mit <font color=red>Farben</font><li>Text in unterschiedlichen <font size=+3>Gr\u00F6\u00DFen</font><li>und <font face=AvantGarde>Schriftarten</font></ul>Au\u00DFerdem k\u00F6nnen sie auch mehrere Zeilen umfassen.</html>
+
+
+### Tree Demo ###
+
+TreeDemo.accessible_description=Diese Demo zeigt ein Beispiel f\u00FCr die Verwendung einer JTree-Komponente.
+TreeDemo.tooltip=JTree-Demo
+TreeDemo.name=Baumdemo
+TreeDemo.music=Musik
+
diff --git a/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties b/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
index bc6a24781e9..ebb0409561b 100644
--- a/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
+++ b/src/demo/share/jfc/SwingSet2/resources/swingset_ja.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -316,7 +316,7 @@ FileChooserDemo.nofileselected=\u6700\u521D\u306B\u30D5\u30A1\u30A4\u30EB\u3092\
 FileChooserDemo.thefile=\u30D5\u30A1\u30A4\u30EB\u540D:
 FileChooserDemo.isprobably=\u306F\u304A\u305D\u3089\u304F\u753B\u50CF\u30C7\u30FC\u30BF\u3067\u3059\u3002
 
-FileChooserDemo.helptext=<html>\u691C\u7D22: \u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u307E\u3059\u3002<br>\u8A73\u7D30: \u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002<br>OK: \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059\u3002<br>\u53D6\u6D88: \u4F55\u3082\u305B\u305A\u306B\u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u9589\u3058\u307E\u3059\u3002</html>
+FileChooserDemo.helptext=<html>\u691C\u7D22: \u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u307E\u3059\u3002<br>\u8A73\u7D30: \u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u3055\u3089\u306B\u5B66\u7FD2\u3057\u307E\u3059\u3002<br>OK: \u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u307E\u3059\u3002<br>\u53D6\u6D88: \u4F55\u3082\u305B\u305A\u306B\u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u9589\u3058\u307E\u3059\u3002</html>
 
 FileChooserDemo.findquestion=\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22:
 FileChooserDemo.findresponse=<html><center>\u3042\u306A\u305F\u3001\u672C\u5F53\u306B\u79C1\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u3066\u307B\u3057\u3044\u3068\u601D\u3063\u3066\u308B\u3093\u3067\u3059\u304B\u3002<br>\u305D\u3093\u306A\u3053\u3068\u3067\u304D\u306A\u3044\u3067\u3059\u3088\u3001\u3084\u308A\u65B9\u77E5\u3089\u306A\u3044\u3093\u3067\u3059\u304B\u3089\u3002\u79C1\u306F\u305F\u3060\u306E\u30C7\u30E2\u30FB\u30D7\u30ED\u30B0\u30E9\u30E0\u3067\u3059\u3088\u3002</center></html>
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
index 85c7ead75fb..7edc4b16851 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,21 +24,21 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Verwendung: {0} [Optionen] <mainclass> [args...]\n           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [Optionen] -jar <jarfile> [args...]\n           (zur Ausf\u00FChrung einer JAR-Datei)\n   oder  {0} [Optionen] -m <module>[/<mainclass>] [args...]\n       {0} [Optionen] --module <module>[/<mainclass>] [args...]\n            (zur Ausf\u00FChrung der Hauptklasse in einem Modul)\n\n Argumente, die auf die Hauptklasse folgen, -jar <jarfile>, -m oder --module\n <module>/<mainclass> werden als Argumente f\u00FCr die Hauptklasse \u00FCbergeben.\n\n wobei "Optionen" Folgendes umfasst:\n\n
+java.launcher.opt.header  =   Verwendung: {0} [Optionen] <Hauptklasse> [args...]\n           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [Optionen] -jar <JAR-Datei> [args...]\n           (zur Ausf\u00FChrung einer JAR-Datei)\n   oder  {0} [Optionen] -m <Modul>[/<Hauptklasse>] [args...]\n       {0} [Optionen] --module <Modul>[/<Hauptklasse>] [args...]\n            (zur Ausf\u00FChrung der Hauptklasse in einem Modul)\n   oder  {0} [Optionen] <Quelldatei> [args]\n           (zur Ausf\u00FChrung eines Programms mit einer einzelnen Quelldatei)\n\n Argumente, die auf die Hauptklasse, die Quelldatei, -jar <JAR-Datei>, -m oder --module\n <Modul>/<Hauptklasse> folgen, werden als Argumente f\u00FCr die\nHauptklasse \u00FCbergeben.\n\n Dabei umfasst "Optionen" Folgendes:\n\n
 
 java.launcher.opt.vmselect   =\    {0}\t  zur Auswahl der "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  ist ein Synonym f\u00FCr die "{1}" VM  [verworfen]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist, die upgradef\u00E4hige\n                  Module im Laufzeitimage ersetzen\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Ausgabe im Verbose-Modus aktivieren\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch \
-unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    -disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
+java.launcher.opt.footer = \    -cp <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n    --class-path <Klassensuchpfad mit Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven, in denen nach Klassendateien gesucht wird.\n    -p <Modulpfad>\n    --module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist.\n    --upgrade-module-path <Modulpfad>...\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, von denen jedes Verzeichnis\n                  ein Verzeichnis mit Modulen ist, die upgradef\u00E4hige\n                  Module im Laufzeitimage ersetzen\n    --add-modules <Modulname>[,<Modulname>...]\n                  Root-Module, die zus\u00E4tzlich zum anf\u00E4nglichen Modul aufgel\u00F6st werden sollen.\n                  <Modulname> kann auch wie folgt lauten: ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <Modulname>[,<Modulname>...]\n                  Module, die eingeschr\u00E4nkte native Vorg\u00E4nge ausf\u00FChren d\u00FCrfen.\n                  <Modulname> kann auch ALL-UNNAMED lauten.\n    --list-modules\n                  Listet beobachtbare Module auf und beendet den Vorgang\n    -d <Modulname>\n    --describe-module <Modulname>\n                  Beschreibt ein Modul und beendet den Vorgang\n    --dry-run     Erstellt eine VM und l\u00E4dt die Hauptklasse, f\u00FChrt aber nicht die Hauptmethode aus.\n                  Die Option "--dry-run" kann n\u00FCtzlich sein, um die\n                  Befehlszeilenoptionen, wie die Modulsystemkonfiguration, zu validieren.\n    --validate-modules\n                  Validiert alle Module und beendet den Vorgang\n                  Die Option "--validate-modules" kann n\u00FCtzlich sein, um\n                  Konflikte und andere Fehler mit Modulen auf dem Modulpfad zu ermitteln.\n    -D<Name>=<Wert>\n                  Legt eine Systemeigenschaft fest\n    -verbose:[class|module|gc|jni]\n                  Aktiviert die Verbose-Ausgabe f\u00FCr das angegebene Subsystem\n    -version      Gibt die Produktversion an den Fehlerstream aus und beendet den Vorgang\n    --version      Gibt die Produktversion an den Outputstream aus und beendet den Vorgang\n    -showversion  Gibt die Produktversion an den Fehlerstream aus und setzt den Vorgang fort\n    --show-version\n                  Gibt die Produktversion an den Outputstream aus und setzt den Vorgang fort\n    --show-module-resolution\n                  Zeigt die Modulaufl\u00F6sungsausgabe beim Start an\n    -? -h -help\n                  Gibt diese Hilfemeldung an den Fehlerstream aus\n    --help        Gibt diese Hilfemeldung an den Outputstream aus\n    -X            Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Fehlerstream aus\n    --help-extra  Gibt Hilfe zu zus\u00E4tzlichen Optionen an den Outputstream aus\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertions mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertions mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert System-Assertions\n    -dsa | -disablesystemassertions\n                  Deaktiviert System-Assertions\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt die native Agent Library <libname>. Beispiel: -agentlib:jdwp\n                  siehe auch -agentlib:jdwp=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt die native Agent Library mit dem vollst\u00E4ndigen Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  \
+L\u00E4dt den Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt den Startbildschirm mit einem angegebenen Bild an\n                  Skalierte HiDPI-Bilder werden automatisch unterst\u00FCtzt und verwendet,\n                  falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n                  muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n                  Das am besten geeignete angegebene skalierte Bild wird\n                  automatisch ausgew\u00E4hlt.\n                  Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n    @argument files\n                  Eine oder mehrere Argumentdateien mit Optionen\n    -disable-@files\n                  Verhindert die weitere Erweiterung von Argumentdateien\n    --enable-preview\n                  L\u00E4sst zu, das Klassen von Vorschaufeatures dieses Release abh\u00E4ngig sind\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\n    -Xbatch           Deaktiviert Hintergrundkompilierung\n    -Xbootclasspath/a:<Durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      an Ende von Bootstrap Classpath anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug           Wird zur Abw\u00E4rtskompatibilit\u00E4t bereitgestellt\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, wird als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet\n    -Xint              Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option "-version"\n    -Xloggc:<Datei>    Protokolliert GC-Status in einer Datei mit Zeitstempeln\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und die maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs              Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet, wenn m\u00F6glich, freigegebene Klassendaten (Standard)\n    -Xshare:off       Versucht nicht freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung von freigegebenen Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>         Legt Stackgr\u00F6\u00DFe des Java-Threads fest\n    -Xverify           Legt den Modus der Bytecodeverifizierung fest\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> ungeachtet der\n                      Moduldeklaration gelesen wird.\n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration in <Zielmodul>\n                      zu exportieren.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration in\n                      <Zielmodul> zu \u00F6ffnen.\n    --illegal-access=<Wert>\n                      L\u00E4sst Zugriff f\u00FCr Mitglieder mit den Typen in den benannten Modulen\n                       nach Code in unbenannten Modulen zu oder lehnt ihn ab.\n                      <Wert> ist entweder "deny", "permit", "warn" oder "debug"\n                      Diese Option wird in einem zuk\u00FCnftigen Release entfernt.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                       \u00DCberschreibt oder erweitert ein Modul in JAR-Dateien\n                      oder -Verzeichnissen mit \
-Klassen und Ressourcen.\n    --disable-@files  Deaktiviert die weitere Erweiterung von Argumentdateien\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
+java.launcher.X.usage=\n    -Xbatch           Deaktiviert die Hintergrundkompilierung\n    -Xbootclasspath/a:<durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n                      An das Ende des Bootstrap Classpaths anh\u00E4ngen\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n    -Xcomp            Erzwingt die Kompilierung von Methoden beim ersten Aufruf\n    -Xdebug            F\u00FChrt nichts aus. Wird aus Gr\u00FCnden der Abw\u00E4rtskompatibilit\u00E4t bereitgestellt.\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden.\n    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n    -Xinternalversion\n                      Zeigt detailliertere JVM-Versionsinformationen an als die\n                      Option -version\n    -Xlog:<Optionen>      Konfiguriert oder aktiviert Logging mit dem einheitlichen Java Virtual\n                      Machine-(JVM-)Logging-Framework. Verwenden Sie -Xlog:help\n                      f\u00FCr weitere Einzelheiten.\n    -Xloggc:<Datei>    Protokolliert den GC-Status in einer Datei mit Zeitstempeln.\n                      Diese Option ist veraltet und kann in einem\n                      zuk\u00FCnftigen Release entfernt werden. Wird durch -Xlog:gc:<Datei> ersetzt.\n    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xmn<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche und maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n                      f\u00FCr die Young Generation (Nursery) fest\n    -Xms<Gr\u00F6\u00DFe>        Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n    -Xmx<Gr\u00F6\u00DFe>        Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n    -Xnoclassgc       Deaktiviert die Klassen-Garbage Collection\n    -Xrs               Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xshare:auto      Verwendet freigegebene Klassendaten, wenn m\u00F6glich (Standard)\n    -Xshare:off       Versucht nicht, freigegebene Klassendaten zu verwenden\n    -Xshare:on        Erfordert die Verwendung freigegebener Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n                      Diese Testoption kann zeitweise zu\n                      Fehlern f\u00FChren. Sie darf nicht in Produktionsumgebungen verwendet werden.\n    -XshowSettings    Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n    -XshowSettings:vm\n                      Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n    -XshowSettings:system\n                      (Nur Linux) Zeigt die Konfiguration des Hostsystems oder Containers an\n                      und f\u00E4hrt fort\n    -Xss<Gr\u00F6\u00DFe>        Legt die Stackgr\u00F6\u00DFe des Java-Threads fest\n    -Xverify          Legt den Modus der Bytecodeverifizierung fest\n                      Beachten Sie, dass die Option -Xverify:none veraltet ist und\n                      in einem zuk\u00FCnftigen Release entfernt werden kann.\n    --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, damit <Zielmodul> gelesen wird, ungeachtet\n                      der Moduldeklaration. \n                      <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n                      Module zu lesen.\n    --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in \
+<Zielmodul> zu exportieren,\n                      ungeachtet der Moduldeklaration.\n                      <Zielmodul> kann ALL-UNNAMED sein, um in alle\n                      unbenannten Module zu exportieren.\n    --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n                      Aktualisiert <Modul>, um <Package> in\n                      <Zielmodul> zu \u00F6ffnen, ungeachtet der Moduldeklaration.\n    --limit-modules <Modulname>[,<Modulname>...]\n                      Grenzt die Gesamtmenge der beobachtbaren Module ein\n    --patch-module <Modul>=<Datei>({0}<Datei>)*\n                      \u00DCberschreibt oder erweitert ein Modul mit Klassen und Ressourcen\n                      in JAR-Dateien oder Verzeichnissen.\n    --source <Version>\n                      Legt die Version der Quelle im Quelldateimodus fest.\n    --finalization=<Wert>\n                      Steuert, ob die JVM Objekte finalisiert.\n                      Dabei ist <Wert> entweder "enabled" oder "disabled".\n                      Die Finalisierung ist standardm\u00E4\u00DFig aktiviert.\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n    -XstartOnFirstThread\n                      main()-Methode f\u00FCr den ersten (AppKit) Thread ausf\u00FChren\n    -Xdock:name=<application name>\n                      Den im Dock angezeigten Standardanwendungsnamen \u00FCberschreiben\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Das im Dock angezeigte Standardsymbol \u00FCberschreiben\n\n
+java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr macOS spezifisch:\n    -XstartOnFirstThread\n                      F\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit-)Thread aus\n    -Xdock:name=<Anwendungsname>\n                      Setzt den im Dock angezeigten Standardanwendungsnamen au\u00DFer Kraft\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      Setzt das im Dock angezeigte Standardsymbol au\u00DFer Kraft\n\n
 
 java.launcher.cls.error1=Fehler: Hauptklasse {0} konnte nicht gefunden oder geladen werden\nUrsache: {1}: {2}
 java.launcher.cls.error2=Fehler: Hauptmethode ist nicht {0} in Klasse {1}. Definieren Sie die Hauptmethode als:\n   public static void main(String[] args)
@@ -53,8 +53,8 @@ java.launcher.jar.error3=kein Hauptmanifestattribut, in {0}
 java.launcher.jar.error4=Fehler beim Laden des Java-Agents in {0}
 java.launcher.init.error=Initialisierungsfehler
 java.launcher.javafx.error1=Fehler: Die JavaFX-Methode launchApplication hat die falsche Signatur, sie\nmuss als statisch deklariert werden und einen Wert vom Typ VOID zur\u00FCckgeben
-java.launcher.module.error1=Modul {0} weist kein MainClass-Attribut auf. Verwenden Sie -m <module>/<main-class>
+java.launcher.module.error1=Modul {0} weist kein ModuleMainClass-Attribut auf. Verwenden Sie -m <module>/<main-class>
 java.launcher.module.error2=Fehler: Hauptklasse {0} konnte in Modul {1} nicht gefunden oder geladen werden
 java.launcher.module.error3=Fehler: Hauptklasse {0} kann nicht in Modul {1} geladen werden\n\t{2}
 java.launcher.module.error4={0} nicht gefunden
-java.launcher.module.error5=Fehler: Hauptklasse {0} kann nicht in Modul {1} initialisiert werden\nUrsache: {1}: {2}
+java.launcher.module.error5=Fehler: Hauptklasse {0} kann nicht in Modul {1} initialisiert werden\nUrsache: {2}: {3}
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
index 32d28144dff..542145ccbb0 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,14 @@ java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM\u3092\u9078\u629E\u3059\u308B
 java.launcher.opt.hotspot    =\    {0}\t  \u306F"{1}" VM\u306E\u30B7\u30CE\u30CB\u30E0\u3067\u3059  [\u975E\u63A8\u5968]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n    --upgrade-module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \
-\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  (\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \
-\u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    -disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
+java.launcher.opt.footer = \    -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n    --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n                  {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n                  ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n    -p <module path>\n    --module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n    --upgrade-module-path <module path>...\n                  \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                  \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n    --add-modules <module name>[,<module name>...]\n                  \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5236\u9650\u3055\u308C\u305F\u30CD\u30A4\u30C6\u30A3\u30D6\u64CD\u4F5C\u306E\u5B9F\u884C\u3092\u8A31\u53EF\u3055\u308C\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n                  <module name>\u306FALL-UNNAMED\u306B\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\n    --list-modules\n                  \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n    -d <module name>\n    --describe-module <module name>\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --dry-run     VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n                  --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n    --validate-modules\n                  \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n                  --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n                  \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -verbose:[class|module|gc|jni]\n                  \
+\u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    --version     \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-version\n                  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    --show-module-resolution\n                  \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n    -? -h -help\n                  \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help        \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -X            \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    --help-extra  \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n                  -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -agentpath:<pathname>[=<options>]\n                  \u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n                  HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n                  \
+(\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n                  \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n                  \u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n                  (\u81EA\u52D5\u7684)\u3002\n                  \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    @argument\u30D5\u30A1\u30A4\u30EB\n                  \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n    -disable-@files\n                  \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    --enable-preview\n                  \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3057\u307E\u3059\n    -Xcheck:jni       JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059\n    -Xcomp            \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3057\u307E\u3059\n    -Xdebug           \u4F55\u3082\u884C\u3044\u307E\u305B\u3093\u3002\u4E0B\u4F4D\u4E92\u63DB\u6027\u306E\u305F\u3081\u306B\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xdiag            \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059\n    -Xfuture          \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    -Xint             \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n    -Xinternalversion\n                      -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n                      \u8868\u793A\u3057\u307E\u3059\n    -Xlog:<opts>      Java Virtual Machine (JVM)\u7D71\u5408\u30ED\u30AE\u30F3\u30B0\u30FB\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3067\u306E\n                      \u30ED\u30AE\u30F3\u30B0\u3092\u69CB\u6210\u307E\u305F\u306F\u6709\u52B9\u5316\u3057\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-Xlog:help\u3092\n                      \u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n    -Xloggc:<file>    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3057\u307E\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002-Xlog:gc:<file>\u3067\u7F6E\u63DB\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n    -Xmixed           \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xmn<size>        \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u30B5\u30A4\u30BA\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA\n                      (\u30D0\u30A4\u30C8\u5358\u4F4D)\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xms<size>        Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xmx<size>        Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xnoclassgc       \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n    -Xrs              Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3057\u307E\u3059(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n    -Xshare:auto      \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xshare:off       \
-\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --illegal-access=<value>\n                      \
-\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30B3\u30FC\u30C9\u306B\u3088\u308B\u3001\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30BF\u30A4\u30D7\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u4E0D\u6B63\u30A2\u30AF\u30BB\u30B9\u3092\n                      \u8A31\u53EF\u307E\u305F\u306F\u62D2\u5426\u3057\u307E\u3059\u3002\n                      <value>\u306F"deny"\u3001"permit"\u3001"warn"\u307E\u305F\u306F"debug"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\n                      \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
+\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n                      \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n                      \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:vm\n                      \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -XshowSettings:system\n                      (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n                      \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n    -Xss<size>        java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n    -Xverify          \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                      \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n                      \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n                      \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                      \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n                      <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                      \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n                      <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \
+\u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n    --patch-module <module>=<file>({0}<file>)*\n                      JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n                      \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n    --source <version>\n                      \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n    --finalization=<value>\n                      JVM\u304C\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\n                      <value>\u306F"enabled"\u307E\u305F\u306F"disabled"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n                      \u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FmacOS\u56FA\u6709\u3067\u3059:\n    -XstartOnFirstThread\n                      main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n    -Xdock:name=<application name>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n    -Xdock:icon=<path to icon file>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
index cdf9e09633d..35ec035c8d7 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,12 @@ java.launcher.opt.vmselect   =\    {0}\t  \u9009\u62E9 "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  \u662F "{1}" VM \u7684\u540C\u4E49\u8BCD [\u5DF2\u8FC7\u65F6]\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n                  \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \
-\u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    -disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
+java.launcher.opt.footer = \    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n    --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n                  \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n                  \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n    -p <\u6A21\u5757\u8DEF\u5F84>\n    --module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n    --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n                  \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n                  \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n    --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                  \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n                  <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n                  ALL-MODULE-PATH.\n    --enable-native-access <module name>[,<module name>...]\n                  \u5141\u8BB8\u6267\u884C\u53D7\u9650\u672C\u673A\u64CD\u4F5C\u7684\u6A21\u5757\u3002\n                  <module name> \u8FD8\u53EF\u4EE5\u4E3A ALL-UNNAMED\u3002\n    --list-modules\n                  \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n    -d <module name>\n    --describe-module <\u6A21\u5757\u540D\u79F0>\n                  \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n    --dry-run     \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n                  \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n                  \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    --validate-modules\n                  \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n                  --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n                  \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n    -D<\u540D\u79F0>=<\u503C>\n                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -verbose:[class|module|gc|jni]\n                  \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n    -version      \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n    --version     \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n    -showversion  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n    --show-version\n                  \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n    --show-module-resolution\n                  \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n    -? -h -help\n                  \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help        \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -X            \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n    --help-extra  \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n    -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \
+\u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n    -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n    -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n    -esa | -enablesystemassertions\n                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -dsa | -disablesystemassertions\n                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n    -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n    -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n    -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n    -splash:<\u56FE\u50CF\u8DEF\u5F84>\n                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n                  \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n                  (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n                  \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n                  \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n                  \u56FE\u50CF\u3002\n                  \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n    @argument \u6587\u4EF6\n                  \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n    -disable-@files\n                  \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n    --enable-preview\n                  \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.usage=\n    -Xbatch           \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n    -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n    -Xcheck:jni       \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n    -Xcomp            \u5F3A\u5236\u5728\u9996\u6B21\u8C03\u7528\u65F6\u7F16\u8BD1\u65B9\u6CD5\n    -Xdebug           \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C\u3002\u4E3A\u5B9E\u73B0\u5411\u540E\u517C\u5BB9\u800C\u63D0\u4F9B\u3002\n    -Xdiag            \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n    -Xfuture          \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5\uFF0C\u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    -Xint             \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n    -Xinternalversion\n                      \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684\n                      JVM \u7248\u672C\u4FE1\u606F\n    -Xlog:<opts>      \u914D\u7F6E\u6216\u542F\u7528\u91C7\u7528 Java \u865A\u62DF\n                      \u673A (Java Virtual Machine, JVM) \u7EDF\u4E00\u8BB0\u5F55\u6846\u67B6\u8FDB\u884C\u4E8B\u4EF6\u8BB0\u5F55\u3002\u4F7F\u7528 -Xlog:help\n                      \u53EF\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002\n    -Xloggc:<file>    \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D\uFF08\u5E26\u65F6\u95F4\u6233\uFF09\u3002\n                      \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n                      \u5C06\u6765\u7684\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\u5B83\u5C06\u66FF\u6362\u4E3A -Xlog:gc:<file>\u3002\n    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u6267\u884C\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xmn<size>        \u4E3A\u5E74\u8F7B\u4EE3\uFF08\u65B0\u751F\u4EE3\uFF09\u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n                      \uFF08\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D\uFF09\n    -Xms<size>        \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n    -Xmx<size>        \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n    -Xnoclassgc       \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n    -Xrs              \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528\uFF08\u8BF7\u53C2\u89C1\u6587\u6863\uFF09\n    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF08\u9ED8\u8BA4\u503C\uFF09\n    -Xshare:off       \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n    -Xshare:on        \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF0C\u5426\u5219\u5C06\u5931\u8D25\u3002\n                      \u8FD9\u662F\u4E00\u4E2A\u6D4B\u8BD5\u9009\u9879\uFF0C\u53EF\u80FD\u5BFC\u81F4\u95F4\u6B47\u6027\n                      \u6545\u969C\u3002\u4E0D\u5E94\u5728\u751F\u4EA7\u73AF\u5883\u4E2D\u4F7F\u7528\u5B83\u3002\n    -XshowSettings    \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:all\n                      \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:locale\n                      \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:properties\n                      \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:vm\n                      \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:system\n                      \uFF08\u4EC5 Linux\uFF09\u663E\u793A\u4E3B\u673A\u7CFB\u7EDF\u6216\u5BB9\u5668\n                      \u914D\u7F6E\u5E76\u7EE7\u7EED\n    -Xss<size>        \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n    -Xverify          \
-\u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --illegal-access=<value>\n                      \u5141\u8BB8\u6216\u62D2\u7EDD\u901A\u8FC7\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u4EE3\u7801\u5BF9\u547D\u540D\u6A21\u5757\u4E2D\u7684\n                      \u7C7B\u578B\u6210\u5458\u8FDB\u884C\u8BBF\u95EE\u3002\n                      <value> \u4E3A "deny"\u3001"permit"\u3001"warn" \u6216 "debug" \u4E4B\u4E00\n                      \u6B64\u9009\u9879\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+\u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n                      \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n                      \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n    --add-reads <module>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n                      \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n                      \u6A21\u5757\u3002\n    --add-exports <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n                      \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n                      <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n                      \u672A\u547D\u540D\u6A21\u5757\u3002\n    --add-opens <module>/<package>=<target-module>(,<target-module>)*\n                      \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n                      <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n    --limit-modules <module name>[,<module name>...]\n                      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n    --patch-module <module>=<file>({0}<file>)*\n                      \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                      \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n    --source <version>\n                      \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n    --finalization=<value>\n                      \u63A7\u5236 JVM \u662F\u5426\u6267\u884C\u5BF9\u8C61\u6700\u7EC8\u5904\u7406\uFF0C\n                      \u5176\u4E2D <value> \u4E3A "enabled" \u6216 "disabled" \u4E4B\u4E00\u3002\n                      \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6700\u7EC8\u5904\u7406\u5904\u4E8E\u542F\u7528\u72B6\u6001\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 # Translators please note do not translate the options themselves
 java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u662F\u7279\u5B9A\u4E8E macOS \u7684\u9009\u9879\uFF1A\n    -XstartOnFirstThread\n                      \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n    -Xdock:name=<application name>\n                      \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n    -Xdock:icon=<path to icon file>\n                     \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
index 24cdbabc3a8..5479bc1df2d 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,15 +45,15 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"option.1.set.twice", "Die Option %s wurde mehrmals angegeben. Alle Angaben bis auf die letzte werden ignoriert."},
         {"multiple.commands.1.2", "Nur ein Befehl ist zul\u00E4ssig: Sowohl %1$s als auch %2$s wurden angegeben."},
         {"Use.keytool.help.for.all.available.commands",
-                 "\"keytool -help\" f\u00FCr alle verf\u00FCgbaren Befehle verwenden"},
+                 "Verwenden Sie \"keytool -?, -h, or --help\" f\u00FCr diese Hilfemeldung"},
         {"Key.and.Certificate.Management.Tool",
                  "Schl\u00FCssel- und Zertifikatsverwaltungstool"},
         {"Commands.", "Befehle:"},
         {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Verwenden Sie \"keytool -command_name -help\" f\u00FCr die Verwendung von command_name.\nVerwenden Sie die Option -conf <url>, um eine vorkonfigurierte Optionsdatei anzugeben."},
+                "Verwenden Sie \"keytool -command_name --help\" f\u00FCr die Verwendung von command_name.\nVerwenden Sie die Option -conf <url>, um eine vorkonfigurierte Optionsdatei anzugeben."},
         // keytool: help: commands
         {"Generates.a.certificate.request",
-                "Generiert eine Zertifikatanforderung"}, //-certreq
+                "Generiert eine Zertifikatsanforderung"}, //-certreq
         {"Changes.an.entry.s.alias",
                 "\u00C4ndert den Alias eines Eintrags"}, //-changealias
         {"Deletes.an.entry",
@@ -65,7 +65,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Generates.a.secret.key",
                 "Generiert einen Secret Key"}, //-genseckey
         {"Generates.certificate.from.a.certificate.request",
-                "Generiert ein Zertifikat aus einer Zertifikatanforderung"}, //-gencert
+                "Generiert ein Zertifikat aus einer Zertifikatsanforderung"}, //-gencert
         {"Generates.CRL", "Generiert eine CRL"}, //-gencrl
         {"Generated.keyAlgName.secret.key",
                 "{0} Secret Key generiert"}, //-genseckey
@@ -88,20 +88,25 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Prints.the.content.of.a.certificate",
                 "Druckt den Content eines Zertifikats"}, //-printcert
         {"Prints.the.content.of.a.certificate.request",
-                "Druckt den Content einer Zertifikatanforderung"}, //-printcertreq
+                "Druckt den Content einer Zertifikatsanforderung"}, //-printcertreq
         {"Prints.the.content.of.a.CRL.file",
                 "Druckt den Content einer CRL-Datei"}, //-printcrl
         {"Generates.a.self.signed.certificate",
                 "Generiert ein selbst signiertes Zertifikat"}, //-selfcert
         {"Changes.the.store.password.of.a.keystore",
                 "\u00C4ndert das Speicherkennwort eines Keystores"}, //-storepasswd
+        {"showinfo.command.help", "Zeigt sicherheitsbezogene Informationen an"},
+        {"Prints.the.program.version", "Gibt die Programmversion aus"},
+
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
                 "Aliasname des zu verarbeitenden Eintrags"}, //-alias
+        {"groupname.option.help",
+                "Gruppenname. Beispiel: der Name der elliptischen Kurve."}, //-groupname
         {"destination.alias",
                 "Zielalias"}, //-destalias
         {"destination.key.password",
-                "Zielschl\u00FCssel-Kennwort"}, //-destkeypass
+                "Zielschl\u00FCsselkennwort"}, //-destkeypass
         {"destination.keystore.name",
                 "Ziel-Keystore-Name"}, //-destkeystore
         {"destination.keystore.password.protected",
@@ -138,6 +143,7 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Kein Prompt"}, //-noprompt
         {"password.through.protected.mechanism",
                 "Kennwort \u00FCber gesch\u00FCtzten Mechanismus"}, //-protected
+        {"tls.option.help", "Zeigt TLS-Konfigurationsinformationen an"},
 
         // The following 2 values should span 2 lines, the first for the
         // option itself, the second for its -providerArg value.
@@ -154,10 +160,14 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Ausgabe in RFC-Stil"}, //-rfc
         {"signature.algorithm.name",
                 "Signaturalgorithmusname"}, //-sigalg
+        {"signer.alias",
+                "Signaturgeberalias"}, //-signer
+        {"signer.key.password",
+                "Signaturgeber-Schl\u00FCsselkennwort"}, //-signerkeypass
         {"source.alias",
                 "Quellalias"}, //-srcalias
         {"source.key.password",
-                "Quellschl\u00FCssel-Kennwort"}, //-srckeypass
+                "Quellschl\u00FCsselkennwort"}, //-srckeypass
         {"source.keystore.name",
                 "Quell-Keystore-Name"}, //-srckeystore
         {"source.keystore.password.protected",
@@ -173,7 +183,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"signed.jar.file",
                 "Signierte JAR-Datei"}, //=jarfile
         {"certificate.validity.start.date.time",
-                "Anfangsdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
+                "Startdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
         {"keystore.password",
                 "Keystore-Kennwort"}, //-storepass
         {"keystore.type",
@@ -188,8 +198,8 @@ public class Resources_de extends java.util.ListResourceBundle {
                  "Serielle ID des zu entziehenden Certs"}, //-id
         // keytool: Running part
         {"keytool.error.", "Keytool-Fehler: "},
-        {"Illegal.option.", "Ung\u00FCltige Option:  "},
-        {"Illegal.value.", "Ung\u00FCltiger Wert: "},
+        {"Illegal.option.", "Unzul\u00E4ssige Option:  "},
+        {"Illegal.value.", "Unzul\u00E4ssiger Wert: "},
         {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
         {"Cannot.find.environment.variable.",
                 "Umgebungsvariable kann nicht gefunden werden: "},
@@ -217,7 +227,7 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
         {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
                 "Wenn der Quell-Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
-        {"Illegal.startdate.value", "Ung\u00FCltiger Wert f\u00FCr Anfangsdatum"},
+        {"Illegal.startdate.value", "Unzul\u00E4ssiger Wert f\u00FCr Startdatum"},
         {"Validity.must.be.greater.than.zero",
                 "G\u00FCltigkeit muss gr\u00F6\u00DFer als null sein"},
         {"provclass.not.a.provider", "%s kein Provider"},
@@ -248,7 +258,6 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Keystore.password.is.too.short.must.be.at.least.6.characters",
          "Keystore-Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
         {"Unknown.Entry.Type", "Unbekannter Eintragstyp"},
-        {"Too.many.failures.Alias.not.changed", "Zu viele Fehler. Alias nicht ge\u00E4ndert"},
         {"Entry.for.alias.alias.successfully.imported.",
                  "Eintrag f\u00FCr Alias {0} erfolgreich importiert."},
         {"Entry.for.alias.alias.not.imported.", "Eintrag f\u00FCr Alias {0} nicht importiert."},
@@ -271,9 +280,9 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Certificate.stored.in.file.filename.",
                 "Zertifikat in Datei <{0}> gespeichert"},
         {"Certificate.reply.was.installed.in.keystore",
-                "Zertifikatantwort wurde in Keystore installiert"},
+                "Zertifikatsantwort wurde in Keystore installiert"},
         {"Certificate.reply.was.not.installed.in.keystore",
-                "Zertifikatantwort wurde nicht in Keystore installiert"},
+                "Zertifikatsantwort wurde nicht in Keystore installiert"},
         {"Certificate.was.added.to.keystore",
                 "Zertifikat wurde Keystore hinzugef\u00FCgt"},
         {"Certificate.was.not.added.to.keystore",
@@ -287,10 +296,16 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Alias <{0}> ist nicht vorhanden"},
         {"Alias.alias.has.no.certificate",
                 "Alias <{0}> hat kein Zertifikat"},
+        {"groupname.keysize.coexist",
+                "Es k\u00F6nnen nicht sowohl -groupname als auch -keysize angegeben werden"},
+        {"deprecate.keysize.for.ec",
+                "Das Angeben von -keysize zum Generieren von EC-Schl\u00FCsseln ist veraltet. Verwenden Sie stattdessen \"-groupname %s\"."},
         {"Key.pair.not.generated.alias.alias.already.exists",
                 "Schl\u00FCsselpaar wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und selbst signiertem Zertifikat ({2}) mit einer G\u00FCltigkeit von {3} Tagen\n\tf\u00FCr: {4}"},
+        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
+                "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und Zertifikat ({2}), ausgestellt von <{3}>, mit einer G\u00FCltigkeit von {4} Tagen\n\tf\u00FCr: {5}"},
         {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}> eingeben"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(RETURN, wenn identisch mit Keystore-Kennwort):  "},
@@ -303,12 +318,8 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Password.is.too.short.must.be.at.least.6.characters",
                 "Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
         {"Too.many.failures.Key.entry.not.cloned",
-                "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geclont"},
+                "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geklont"},
         {"key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}>"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "Keystore-Eintrag f\u00FCr <{0}> bereits vorhanden"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "Keystore-Eintrag f\u00FCr <{0}> wird erstellt..."},
         {"No.entries.from.identity.database.added",
                 "Keine Eintr\u00E4ge aus Identity-Datenbank hinzugef\u00FCgt"},
         {"Alias.name.alias", "Aliasname: {0}"},
@@ -346,7 +357,6 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
                 "M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]:  "},
         {"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]:  "},
-        {"YES", "JA"},
         {"New.prompt.", "Neues {0}: "},
         {"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"},
         {"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "},
@@ -379,15 +389,14 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Alias.alias.has.no.key",
                 "Alias <{0}> verf\u00FCgt \u00FCber keinen Schl\u00FCssel"},
         {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "Alias <{0}> verweist auf einen Eintragstyp, der kein Private Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Klonen von Private Key-Eintr\u00E4gen"},
+                 "Alias <{0}> verweist auf einen Eintragstyp, der kein Private-Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Klonen von Private-Key-Eintr\u00E4gen"},
 
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "Signaturgeber #%d:"},
+        {"Certificate.d.", "Zertifikat #%d:"},
         {"Timestamp.", "Zeitstempel:"},
-        {"Signature.", "Signatur:"},
-        {"CRLs.", "CRLs:"},
-        {"Certificate.owner.", "Zertifikateigent\u00FCmer: "},
+        {"Certificate.owner.", "Zertifikatseigent\u00FCmer: "},
         {"Not.a.signed.jar.file", "Keine signierte JAR-Datei"},
         {"No.certificate.from.the.SSL.server",
                 "Kein Zertifikat vom SSL-Server"},
@@ -398,20 +407,17 @@ public class Resources_de extends java.util.ListResourceBundle {
             "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben.                  *"},
 
         {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
+                "Zertifikatsantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
         {"Incomplete.certificate.chain.in.reply",
                 "Unvollst\u00E4ndige Zertifikatskette in Antwort"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "Zertifikatskette in Antwort verifiziert nicht: "},
         {"Top.level.certificate.in.reply.",
                 "Zertifikat der obersten Ebene in Antwort:\n"},
         {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
         {"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]:  "},
-        {"NO", "NEIN"},
         {"Public.keys.in.reply.and.keystore.don.t.match",
                 "Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"},
         {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "Zertifikatantwort und Zertifikat in Keystore sind identisch"},
+                "Zertifikatsantwort und Zertifikat in Keystore sind identisch"},
         {"Failed.to.establish.chain.from.reply",
                 "Kette konnte der Antwort nicht entnommen werden"},
         {"n", "N"},
@@ -419,10 +425,12 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Secret.key.not.generated.alias.alias.already.exists",
                 "Secret Key wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
         {"Please.provide.keysize.for.secret.key.generation",
-                "Geben Sie -keysize zum Erstellen eines Secret Keys an"},
+                "Geben Sie -keysize zum Erstellen eines Secret Key an"},
 
         {"warning.not.verified.make.sure.keystore.is.correct",
             "WARNUNG: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist."},
+        {"warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts",
+            "Warnung: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist, oder geben Sie -trustcacerts an."},
 
         {"Extensions.", "Erweiterungen: "},
         {".Empty.value.", "(Leerer Wert)"},
@@ -439,34 +447,43 @@ public class Resources_de extends java.util.ListResourceBundle {
 
         // 8171319: keytool should print out warnings when reading or
         // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "Die Zertifikatanforderung"},
+        {"the.certificate.request", "Die Zertifikatsanforderung"},
         {"the.issuer", "Der Aussteller"},
         {"the.generated.certificate", "Das generierte Zertifikat"},
         {"the.generated.crl", "Die generierte CRL"},
-        {"the.generated.certificate.request", "Die generierte Zertifikatanforderung"},
+        {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"},
         {"the.certificate", "Das Zertifikat"},
         {"the.crl", "Die CRL"},
         {"the.tsa.certificate", "Das TSA-Zertifikat"},
         {"the.input", "Die Eingabe"},
         {"reply", "Antwort"},
         {"one.in.many", "%1$s #%2$d von %3$d"},
+        {"one.in.many1", "%1$s #%2$d"},
+        {"one.in.many2", "%1$s von Signaturgeber #%2$d"},
+        {"one.in.many3", "%1$s #%2$d von Signaturgeber #%3$d"},
         {"alias.in.cacerts", "Aussteller <%s> in cacerts"},
         {"alias.in.keystore", "Aussteller <%s>"},
         {"with.weak", "%s (schwach)"},
+        {"with.disabled", "%s (deaktiviert)"},
         {"key.bit", "%1$d-Bit-%2$s-Schl\u00FCssel"},
         {"key.bit.weak", "%1$d-Bit-%2$s-Schl\u00FCssel (schwach)"},
-        {"unknown.size.1", "unbekannte Gr\u00F6\u00DFe: %s-Schl\u00FCssel"},
+        {"key.bit.disabled", "%1$d-Bit-%2$s-Schl\u00FCssel (deaktiviert)"},
+        {"unknown.size.1", "%s-Schl\u00FCssel mit unbekannter Gr\u00F6\u00DFe"},
         {".PATTERN.printX509Cert.with.weak",
-                "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic Key-Algorithmus von Subject: {8}\nVersion: {9}"},
+                "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic-Key-Algorithmus von Subject: {8}\nVersion: {9}"},
         {"PKCS.10.with.weak",
-                "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
+                "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
         {"verified.by.s.in.s.weak", "Von %1$s in %2$s mit %3$s verifiziert"},
-        {"whose.sigalg.risk", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."},
-        {"whose.key.risk", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko."},
+        {"whose.sigalg.disabled", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"whose.sigalg.weak", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"whose.key.disabled", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"whose.key.weak", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko. Diese Schl\u00FCsselgr\u00F6\u00DFe wird in einem zuk\u00FCnftigen Update deaktiviert."},
         {"jks.storetype.warning", "Der %1$s-Keystore verwendet ein propriet\u00E4res Format. Es wird empfohlen, auf PKCS12 zu migrieren, das ein Industriestandardformat mit \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" ist."},
         {"migrate.keystore.warning", "\"%1$s\" zu %4$s migriert. Der %2$s-Keystore wurde als \"%3$s\" gesichert."},
         {"backup.keystore.warning", "Der urspr\u00FCngliche Keystore \"%1$s\" wird als \"%3$s\" gesichert..."},
         {"importing.keystore.status", "Keystore %1$s wird in %2$s importiert..."},
+        {"keyalg.option.missing.error", "Die Option -keyalg muss angegeben werden."},
+        {"showinfo.no.option", "Fehlende Option f\u00FCr -showinfo. Verwenden Sie keytool -showinfo -tls."},
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
index 49980f3c480..43acdf4f2d3 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,6 +96,7 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"Changes.the.store.password.of.a.keystore",
                 "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-storepasswd
         {"showinfo.command.help", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u95A2\u9023\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059"},
+        {"Prints.the.program.version", "\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059"},
 
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
@@ -159,6 +160,10 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "RFC\u30B9\u30BF\u30A4\u30EB\u306E\u51FA\u529B"}, //-rfc
         {"signature.algorithm.name",
                 "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-sigalg
+        {"signer.alias",
+                "\u7F72\u540D\u8005\u306E\u5225\u540D"}, //-signer
+        {"signer.key.password",
+                "\u7F72\u540D\u8005\u306E\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-signerkeypass
         {"source.alias",
                 "\u30BD\u30FC\u30B9\u5225\u540D"}, //-srcalias
         {"source.key.password",
@@ -299,6 +304,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u30AD\u30FC\u30FB\u30DA\u30A2\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "{3}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u306E\u30AD\u30FC\u30FB\u30DA\u30A2\u3068\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {4}"},
+        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
+                "{4}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u30AD\u30FC\u30FB\u30DA\u30A2\u3068<{3}>\u306B\u3088\u3063\u3066\u767A\u884C\u3055\u308C\u308B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {5}"},
         {"Enter.key.password.for.alias.", "<{0}>\u306E\u30AD\u30FC\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044):  "},
@@ -387,8 +394,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"},
+        {"Certificate.d.", "\u8A3C\u660E\u66F8#%d:"},
         {"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"},
-        {"Signature.", "\u7F72\u540D:"},
         {"Certificate.owner.", "\u8A3C\u660E\u66F8\u306E\u6240\u6709\u8005: "},
         {"Not.a.signed.jar.file", "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
         {"No.certificate.from.the.SSL.server",
@@ -451,6 +458,9 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"the.input", "\u5165\u529B"},
         {"reply", "\u5FDC\u7B54"},
         {"one.in.many", "%1$s #%2$d / %3$d"},
+        {"one.in.many1", "%1$s #%2$d"},
+        {"one.in.many2", "\u7F72\u540D\u8005\u306E%1$s #%2$d"},
+        {"one.in.many3", "\u7F72\u540D\u8005\u306E%1$s #%2$d #%3$d"},
         {"alias.in.cacerts", "cacerts\u5185\u306E\u767A\u884C\u8005<%s>"},
         {"alias.in.keystore", "\u767A\u884C\u8005<%s>"},
         {"with.weak", "%s (\u5F31)"},
@@ -473,7 +483,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"backup.keystore.warning", "\u5143\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\"%1$s\"\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059..."},
         {"importing.keystore.status", "\u30AD\u30FC\u30B9\u30C8\u30A2%1$s\u3092%2$s\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059..."},
         {"keyalg.option.missing.error", "-keyalg\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
-
         {"showinfo.no.option", "-showinfo\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093\u3002\"keytool -showinfo -tls\"\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
     };
 
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
index dfe71431c28..520c55796ef 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,6 +96,7 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"Changes.the.store.password.of.a.keystore",
                 "\u66F4\u6539\u5BC6\u94A5\u5E93\u7684\u5B58\u50A8\u53E3\u4EE4"}, //-storepasswd
         {"showinfo.command.help", "\u663E\u793A\u5B89\u5168\u76F8\u5173\u4FE1\u606F"},
+        {"Prints.the.program.version", "\u8F93\u51FA\u7A0B\u5E8F\u7248\u672C"},
 
         // keytool: help: options
         {"alias.name.of.the.entry.to.process",
@@ -159,6 +160,10 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u4EE5 RFC \u6837\u5F0F\u8F93\u51FA"}, //-rfc
         {"signature.algorithm.name",
                 "\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0"}, //-sigalg
+        {"signer.alias",
+                "\u7B7E\u540D\u8005\u522B\u540D"}, //-signer
+        {"signer.key.password",
+                "\u7B7E\u540D\u8005\u5BC6\u94A5\u5BC6\u7801"}, //-signerkeypass
         {"source.alias",
                 "\u6E90\u522B\u540D"}, //-srcalias
         {"source.key.password",
@@ -299,6 +304,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u672A\u751F\u6210\u5BC6\u94A5\u5BF9, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
         {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
                 "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D{1}\u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({2}) (\u6709\u6548\u671F\u4E3A {3} \u5929):\n\t {4}"},
+        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
+                "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D {1} \u5BC6\u94A5\u5BF9\u548C\u7531 <{3}> \u9881\u53D1\u7684\u8BC1\u4E66 ({2})\uFF08\u6709\u6548\u671F\u4E3A {4} \u5929\uFF09\uFF1A\n\t {5}"},
         {"Enter.key.password.for.alias.", "\u8F93\u5165 <{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(\u5982\u679C\u548C\u5BC6\u94A5\u5E93\u53E3\u4EE4\u76F8\u540C, \u6309\u56DE\u8F66):  "},
@@ -387,8 +394,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {".WARNING.WARNING.WARNING.",
             "*****************  WARNING WARNING WARNING  *****************"},
         {"Signer.d.", "\u7B7E\u540D\u8005 #%d:"},
+        {"Certificate.d.", "\u8BC1\u4E66 #%d\uFF1A"},
         {"Timestamp.", "\u65F6\u95F4\u6233:"},
-        {"Signature.", "\u7B7E\u540D:"},
         {"Certificate.owner.", "\u8BC1\u4E66\u6240\u6709\u8005: "},
         {"Not.a.signed.jar.file", "\u4E0D\u662F\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"},
         {"No.certificate.from.the.SSL.server",
@@ -451,6 +458,9 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"the.input", "\u8F93\u5165"},
         {"reply", "\u56DE\u590D"},
         {"one.in.many", "%1$s #%2$d/%3$d"},
+        {"one.in.many1", "%1$s #%2$d"},
+        {"one.in.many2", "\u7B7E\u540D\u8005 #%2$d \u7684 %1$s"},
+        {"one.in.many3", "\u7B7E\u540D\u8005 #%3$d \u7684 %1$s #%2$d"},
         {"alias.in.cacerts", "cacerts \u4E2D\u7684\u53D1\u5E03\u8005 <%s>"},
         {"alias.in.keystore", "\u53D1\u5E03\u8005 <%s>"},
         {"with.weak", "%s (\u5F31)"},
@@ -473,7 +483,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"backup.keystore.warning", "\u5DF2\u5C06\u539F\u59CB\u5BC6\u94A5\u5E93 \"%1$s\" \u5907\u4EFD\u4E3A \"%3$s\"..."},
         {"importing.keystore.status", "\u6B63\u5728\u5C06\u5BC6\u94A5\u5E93 %1$s \u5BFC\u5165\u5230 %2$s..."},
         {"keyalg.option.missing.error", "\u5FC5\u987B\u6307\u5B9A -keyalg \u9009\u9879\u3002"},
-
         {"showinfo.no.option", "-showinfo \u7F3A\u5C11\u9009\u9879\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 \"keytool -showinfo -tls\"\u3002"},
     };
 
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_de.java b/src/java.base/share/classes/sun/security/util/AuthResources_de.java
index 9775c7e4456..03b919626de 100644
--- a/src/java.base/share/classes/sun/security/util/AuthResources_de.java
+++ b/src/java.base/share/classes/sun/security/util/AuthResources_de.java
@@ -88,7 +88,7 @@ public class AuthResources_de extends java.util.ListResourceBundle {
         {"Keystore.alias.","Keystore-Alias: "},
         {"Keystore.password.","Keystore-Kennwort: "},
         {"Private.key.password.optional.",
-            "Private Key-Kennwort (optional): "},
+            "Private-Key-Kennwort (optional): "},
 
         // com.sun.security.auth.module.Krb5LoginModule
         {"Kerberos.username.defUsername.",
diff --git a/src/java.base/share/classes/sun/security/util/Resources_de.java b/src/java.base/share/classes/sun/security/util/Resources_de.java
index c36e24ac584..57e2c8da863 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_de.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -66,8 +66,6 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Subject.", "Subjekt:\n"},
         {".Principal.", "\tPrincipal: "},
         {".Public.Credential.", "\t\u00D6ffentliche Zugangsdaten: "},
-        {".Private.Credentials.inaccessible.",
-                "\tKein Zugriff auf private Zugangsdaten\n"},
         {".Private.Credential.", "\tPrivate Zugangsdaten: "},
         {".Private.Credential.inaccessible.",
                 "\tKein Zugriff auf private Zugangsdaten\n"},
@@ -89,16 +87,6 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Ung\u00FCltiger Nullwert f\u00FCr CallbackHandler angegeben"},
         {"null.subject.logout.called.before.login",
                 "Nullsubjekt - Abmeldung vor Anmeldung aufgerufen"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "LoginModule {0} kann nicht instanziiert werden, da es keinen argumentlosen Constructor angibt"},
-        {"unable.to.instantiate.LoginModule",
-                "LoginModule kann nicht instanziiert werden"},
-        {"unable.to.instantiate.LoginModule.",
-                "LoginModule kann nicht instanziiert werden: "},
-        {"unable.to.find.LoginModule.class.",
-                "LoginModule-Klasse kann nicht gefunden werden: "},
-        {"unable.to.access.LoginModule.",
-                "Kein Zugriff auf LoginModule m\u00F6glich: "},
         {"Login.Failure.all.modules.ignored",
                 "Anmeldefehler: Alle Module werden ignoriert"},
 
@@ -150,11 +138,6 @@ public class Resources_de extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "Kennwort f\u00FCr PKCS11-Token [{0}]: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "Subjektbasierte Policy kann nicht instanziiert werden"}
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/util/Resources_ja.java b/src/java.base/share/classes/sun/security/util/Resources_ja.java
index 195d71010a6..1293a48aabc 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_ja.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_ja.java
@@ -66,8 +66,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"Subject.", "\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8:\n"},
         {".Principal.", "\t\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB: "},
         {".Public.Credential.", "\t\u516C\u958B\u8CC7\u683C: "},
-        {".Private.Credentials.inaccessible.",
-                "\t\u975E\u516C\u958B\u8CC7\u683C\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n"},
         {".Private.Credential.", "\t\u975E\u516C\u958B\u8CC7\u683C: "},
         {".Private.Credential.inaccessible.",
                 "\t\u975E\u516C\u958B\u8CC7\u683C\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n"},
@@ -89,16 +87,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u7121\u52B9\u306Anull CallbackHandler\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
         {"null.subject.logout.called.before.login",
                 "null\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8 - \u30ED\u30B0\u30A4\u30F3\u3059\u308B\u524D\u306B\u30ED\u30B0\u30A2\u30A6\u30C8\u304C\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "LoginModule {0}\u306F\u5F15\u6570\u3092\u53D6\u3089\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u6307\u5B9A\u3067\u304D\u306A\u3044\u305F\u3081\u3001\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"},
-        {"unable.to.instantiate.LoginModule",
-                "LoginModule\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"},
-        {"unable.to.instantiate.LoginModule.",
-                "LoginModule\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093: "},
-        {"unable.to.find.LoginModule.class.",
-                "LoginModule\u30AF\u30E9\u30B9\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093: "},
-        {"unable.to.access.LoginModule.",
-                "LoginModule\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: "},
         {"Login.Failure.all.modules.ignored",
                 "\u30ED\u30B0\u30A4\u30F3\u5931\u6557: \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u7121\u8996\u3055\u308C\u307E\u3059"},
 
@@ -150,11 +138,6 @@ public class Resources_ja extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "PKCS11\u30C8\u30FC\u30AF\u30F3[{0}]\u30D1\u30B9\u30EF\u30FC\u30C9: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u30FB\u30D9\u30FC\u30B9\u306E\u30DD\u30EA\u30B7\u30FC\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093"}
     };
 
 
diff --git a/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
index 35d648bd3a4..5376ff5efd3 100644
--- a/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
+++ b/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
@@ -66,8 +66,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"Subject.", "\u4E3B\u4F53: \n"},
         {".Principal.", "\t\u4E3B\u7528\u6237: "},
         {".Public.Credential.", "\t\u516C\u5171\u8EAB\u4EFD\u8BC1\u660E: "},
-        {".Private.Credentials.inaccessible.",
-                "\t\u65E0\u6CD5\u8BBF\u95EE\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E\n"},
         {".Private.Credential.", "\t\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E: "},
         {".Private.Credential.inaccessible.",
                 "\t\u65E0\u6CD5\u8BBF\u95EE\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E\n"},
@@ -89,16 +87,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A CallbackHandler"},
         {"null.subject.logout.called.before.login",
                 "\u7A7A\u4E3B\u4F53 - \u5728\u767B\u5F55\u4E4B\u524D\u8C03\u7528\u4E86\u6CE8\u9500"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule, {0}, \u56E0\u4E3A\u5B83\u672A\u63D0\u4F9B\u4E00\u4E2A\u65E0\u53C2\u6570\u6784\u9020\u5668"},
-        {"unable.to.instantiate.LoginModule",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule"},
-        {"unable.to.instantiate.LoginModule.",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316 LoginModule: "},
-        {"unable.to.find.LoginModule.class.",
-                "\u65E0\u6CD5\u627E\u5230 LoginModule \u7C7B: "},
-        {"unable.to.access.LoginModule.",
-                "\u65E0\u6CD5\u8BBF\u95EE LoginModule: "},
         {"Login.Failure.all.modules.ignored",
                 "\u767B\u5F55\u5931\u8D25: \u5FFD\u7565\u6240\u6709\u6A21\u5757"},
 
@@ -150,11 +138,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
                 "PKCS11 \u6807\u8BB0 [{0}] \u53E3\u4EE4: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316\u57FA\u4E8E\u4E3B\u9898\u7684\u7B56\u7565"}
     };
 
 
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
index 83105561c30..f4cb1f4d2b4 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
+++ b/src/java.desktop/macosx/classes/com/apple/laf/resources/aqua_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ FileChooser.fileSizeGigaBytes={0} GB
 FileChooser.saveTitle.textAndMnemonic=Speichern
 FileChooser.openTitle.textAndMnemonic=\u00D6ffnen
 FileChooser.newFolderExistsError.textAndMnemonic=Dieser Name ist bereits vergeben
-FileChooser.chooseButton.textAndMnemonic=W\u00E4hlen
+FileChooser.chooseButton.textAndMnemonic=Ausw\u00E4hlen
 
 FileChooser.newFolderButton.textAndMnemonic=Neuer Ordner
 FileChooser.newFolderTitle.textAndMnemonic=Neuer Ordner
diff --git a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
index 78c95becd1a..a58b033abe3 100644
--- a/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
+++ b/src/java.desktop/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
@@ -91,7 +91,7 @@ window=Fenster
 # accessible relations
 #
 labelFor=Label f\u00FCr
-labeledBy=beschriftet von
+labeledBy=gelabelt von
 memberOf=Mitglied von
 controlledBy=controlledBy
 controllerFor=controllerFor
diff --git a/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
index 471c4c2fc8b..80e22e5c8cf 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/awt_de.properties
@@ -201,8 +201,8 @@ AWT.HostInputMethodDisplayName=Systemeingabemethoden
 AWT.InputMethodLanguage.ja=Japanisch
 AWT.InputMethodLanguage.ko=Koreanisch
 AWT.InputMethodLanguage.zh=Chinesisch
-AWT.InputMethodLanguage.zh_CN=Vereinfachtes Chinesisch
-AWT.InputMethodLanguage.zh_TW=Traditionelles Chinesisch
+AWT.InputMethodLanguage.zh_CN=Chinesisch (vereinfacht)
+AWT.InputMethodLanguage.zh_TW=Chinesisch (traditionell)
 AWT.InputMethodCreationFailed={0} konnte nicht erstellt werden.  Grund: {1}
 
 # Property to select between on-the-spot and below-the-spot
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
index e8f4189062c..ae2c6bf5cd1 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
index ef6246e2e23..46261e666e4 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
index 445d5ba87cd..9a5a2bf4af4 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
+++ b/src/java.rmi/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
index e1e43a16010..84fb41ce788 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,11 @@
 # CacheRowSetImpl exceptions
 cachedrowsetimpl.populate = Ung\u00FCltiges ResultSet-Objekt zum Auff\u00FCllen der Methode angegeben
 cachedrowsetimpl.invalidp = Ung\u00FCltiger Persistence-Provider generiert
-cachedrowsetimpl.nullhash = CachedRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hash-Tabelle f\u00FCr Constructor angegeben
+cachedrowsetimpl.nullhash = CachedRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle f\u00FCr Constructor angegeben
 cachedrowsetimpl.invalidop = Ung\u00FCltiger Vorgang beim Zeileneinf\u00FCgen
 cachedrowsetimpl.accfailed = acceptChanges nicht erfolgreich
 cachedrowsetimpl.invalidcp = Ung\u00FCltige Cursorposition
-cachedrowsetimpl.illegalop = Ung\u00FCltiger Vorgang bei nicht eingef\u00FCgter Zeile
+cachedrowsetimpl.illegalop = Unzul\u00E4ssiger Vorgang bei nicht eingef\u00FCgter Zeile
 cachedrowsetimpl.clonefail = Klonen nicht erfolgreich: {0}
 cachedrowsetimpl.invalidcol = Ung\u00FCltiger Spaltenindex
 cachedrowsetimpl.invalcolnm = Ung\u00FCltiger Spaltenname
@@ -60,6 +60,7 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: keine Metadaten
 cachedrowsetimpl.movetoins2 = moveToInsertRow: ung\u00FCltige Spaltenanzahl
 cachedrowsetimpl.tablename = Tabellenname darf nicht null sein
 cachedrowsetimpl.keycols = Ung\u00FCltige Schl\u00FCsselspalten
+cachedrowsetimpl.invalidcol = Ung\u00FCltiger Spaltenindex
 cachedrowsetimpl.opnotsupp = Vorgang nicht von Datenbank unterst\u00FCtzt
 cachedrowsetimpl.matchcols = \u00DCbereinstimmungsspalten entsprechen nicht den festgelegten Spalten
 cachedrowsetimpl.setmatchcols = \u00DCbereinstimmungsspalten m\u00FCssen vor dem Abrufen festgelegt werden
@@ -79,7 +80,7 @@ cachedrowsetimpl.opnotysupp = Vorgang noch nicht unterst\u00FCtzt
 cachedrowsetimpl.featnotsupp = Feature nicht unterst\u00FCtzt
 
 # WebRowSetImpl exceptions
-webrowsetimpl.nullhash = WebRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hash-Tabelle f\u00FCr Constructor angegeben
+webrowsetimpl.nullhash = WebRowSetImpl-Instanz kann nicht instanziiert werden. Null-Hashtabelle f\u00FCr Constructor angegeben
 webrowsetimpl.invalidwr = Ung\u00FCltiger Writer
 webrowsetimpl.invalidrd = Ung\u00FCltiger Reader
 
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
index cd40ad2ef42..3181e64c1ff 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,7 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: \u30E1\u30BF\u30C7\u30FC\u30BF\u3
 cachedrowsetimpl.movetoins2 = moveToInsertRow: \u7121\u52B9\u306A\u5217\u6570
 cachedrowsetimpl.tablename = \u8868\u540D\u306Bnull\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 cachedrowsetimpl.keycols = \u7121\u52B9\u306A\u30AD\u30FC\u5217
+cachedrowsetimpl.invalidcol = \u7121\u52B9\u306A\u5217\u7D22\u5F15
 cachedrowsetimpl.opnotsupp = \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u3044\u64CD\u4F5C
 cachedrowsetimpl.matchcols = \u4E00\u81F4\u5217\u304C\u5217\u306E\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 cachedrowsetimpl.setmatchcols = \u4E00\u81F4\u5217\u3092\u53D6\u5F97\u3059\u308B\u524D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
index a9f1203518c..29d1823149d 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,7 @@ cachedrowsetimpl.movetoins1 = moveToInsertRow: \u65E0\u5143\u6570\u636E
 cachedrowsetimpl.movetoins2 = moveToInsertRow: \u5217\u6570\u65E0\u6548
 cachedrowsetimpl.tablename = \u8868\u540D\u4E0D\u80FD\u4E3A\u7A7A\u503C
 cachedrowsetimpl.keycols = \u5173\u952E\u5B57\u5217\u65E0\u6548
+cachedrowsetimpl.invalidcol = \u5217\u7D22\u5F15\u65E0\u6548
 cachedrowsetimpl.opnotsupp = \u64CD\u4F5C\u4E0D\u53D7\u6570\u636E\u5E93\u652F\u6301
 cachedrowsetimpl.matchcols = \u5339\u914D\u5217\u4E0E\u8BBE\u7F6E\u7684\u90A3\u4E9B\u5339\u914D\u5217\u4E0D\u540C
 cachedrowsetimpl.setmatchcols = \u5728\u83B7\u53D6\u5339\u914D\u5217\u4E4B\u524D\u5148\u8BBE\u7F6E\u5339\u914D\u5217
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
index f71357900f7..07ea3779a20 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
@@ -481,7 +481,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Fehler: \"{\" darf nicht im Ausdruck enthalten sein"},
 
     { ER_ILLEGAL_ATTRIBUTE ,
-     "{0} hat ein ung\u00FCltiges Attribut: {1}"},
+     "{0} hat ein unzul\u00E4ssiges Attribut: {1}"},
 
   {ER_NULL_SOURCENODE_APPLYIMPORTS ,
       "sourceNode ist null in xsl:apply-imports."},
@@ -526,7 +526,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Namespace-Pr\u00E4fix kann nicht aufgel\u00F6st werden: {0}"},
 
     { ER_ILLEGAL_VALUE,
-     "xml:space hat einen ung\u00FCltigen Wert: {0}"},
+     "xml:space hat einen unzul\u00E4ssigen Wert: {0}"},
 
     { ER_NO_OWNERDOC,
       "Der untergeordnete Knoten hat kein Eigent\u00FCmerdokument."},
@@ -646,7 +646,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Element in Ergebnisbaum kann nicht erstellt werden: {0}"},
 
     { ER_XMLSPACE_ILLEGAL_VALUE,
-      "xml:space in Quell-XML hat einen ung\u00FCltigen Wert: {0}"},
+      "xml:space in Quell-XML hat einen unzul\u00E4ssigen Wert: {0}"},
 
     { ER_NO_XSLKEY_DECLARATION,
       "Keine xsl:key-Deklaration f\u00FCr {0} vorhanden."},
@@ -673,7 +673,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "indent-result wird nicht mehr unterst\u00FCtzt. Verwenden Sie stattdessen xsl:output."},
 
     { ER_ILLEGAL_ATTRIB,
-      "(StylesheetHandler) {0} hat ein ung\u00FCltiges Attribut: {1}"},
+      "(StylesheetHandler) {0} hat ein unzul\u00E4ssiges Attribut: {1}"},
 
     { ER_UNKNOWN_XSL_ELEM,
      "Unbekanntes XSL-Element: {0}"},
@@ -706,7 +706,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "(StylesheetHandler) {0} importiert sich direkt oder indirekt selbst."},
 
     { ER_XMLSPACE_ILLEGAL_VAL,
-      "(StylesheetHandler) xml:space hat einen ung\u00FCltigen Wert: {0}"},
+      "(StylesheetHandler) xml:space hat einen unzul\u00E4ssigen Wert: {0}"},
 
     { ER_PROCESSSTYLESHEET_NOT_SUCCESSFUL,
       "processStylesheet nicht erfolgreich."},
@@ -740,7 +740,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "Pr\u00E4fix in exclude-result-prefixes ist nicht g\u00FCltig: {0}"},
 
     { ER_MISSING_NS_URI,
-      "Fehlender Namespace-URI f\u00FCr angegebenes Pr\u00E4fix"},
+      "Fehlende Namespace-URI f\u00FCr angegebenes Pr\u00E4fix"},
 
     { ER_MISSING_ARG_FOR_OPTION,
       "Fehlendes Argument f\u00FCr Option: {0}"},
@@ -872,7 +872,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
              "Stylesheet-Root wurde nicht gefunden."},
 
     { ER_ILLEGAL_XMLSPACE_VALUE,
-         "Ung\u00FCltiger Wert f\u00FCr xml:space"},
+         "Unzul\u00E4ssiger Wert f\u00FCr xml:space"},
 
     { ER_PROCESSFROMNODE_FAILED,
          "processFromNode nicht erfolgreich"},
@@ -990,7 +990,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
      "{0}-Attributwert nicht erkannt "},
 
     { ER_NULL_URI_NAMESPACE,
-     "Versuch, ein Namespace-Pr\u00E4fix mit einem Null-URI zu generieren"},
+     "Versuch, ein Namespace-Pr\u00E4fix mit einer Null-URI zu generieren"},
 
     { ER_NUMBER_TOO_BIG,
      "Versuch, eine Zahl zu formatieren, die gr\u00F6\u00DFer als die gr\u00F6\u00DFte Long-Ganzzahl ist"},
@@ -1272,7 +1272,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "xsl:decimal-format-Namen m\u00FCssen eindeutig sein. Name \"{0}\" wurde dupliziert."},
 
     { WG_ILLEGAL_ATTRIBUTE,
-      "{0} hat ein ung\u00FCltiges Attribut: {1}"},
+      "{0} hat ein unzul\u00E4ssiges Attribut: {1}"},
 
     { WG_COULD_NOT_RESOLVE_PREFIX,
       "Namespace-Pr\u00E4fix konnte nicht aufgel\u00F6st werden: {0}. Der Knoten wird ignoriert."},
@@ -1281,10 +1281,10 @@ public class XSLTErrorResources_de extends ListResourceBundle
       "xsl:stylesheet erfordert ein \"version\"-Attribut."},
 
     { WG_ILLEGAL_ATTRIBUTE_NAME,
-      "Ung\u00FCltiger Attributname: {0}"},
+      "Unzul\u00E4ssiger Attributname: {0}"},
 
     { WG_ILLEGAL_ATTRIBUTE_VALUE,
-      "Ung\u00FCltiger Wert f\u00FCr Attribut {0}: {1}"},
+      "Unzul\u00E4ssiger Wert f\u00FCr Attribut {0}: {1}"},
 
     { WG_EMPTY_SECOND_ARG,
       "Resultierendes NodeSet aus zweitem Argument von Dokumentfunktion ist leer. Geben Sie ein leeres NodeSet zur\u00FCck."},
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
index 425707e4792..ea6eecee48d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
@@ -167,7 +167,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * mentioned in the substitution text is not well-formed syntactically.
          */
         {ErrorMsg.INVALID_URI_ERR,
-        "Ung\u00FCltiger URI \"{0}\"."},
+        "Ung\u00FCltige URI \"{0}\"."},
 
         /*
          * Note to translators:  This message is displayed when the URI
@@ -234,7 +234,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text is the offending character.
          */
         {ErrorMsg.ILLEGAL_CHAR_ERR,
-        "Ung\u00FCltiges Zeichen \"{0}\" in XPath-Ausdruck."},
+        "Unzul\u00E4ssiges Zeichen \"{0}\" in XPath-Ausdruck."},
 
         /*
          * Note to translators:  A processing instruction is a mark-up item in
@@ -243,7 +243,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text is the name.
          */
         {ErrorMsg.ILLEGAL_PI_ERR,
-        "Ung\u00FCltiger Name \"{0}\" f\u00FCr Verarbeitungsanweisung."},
+        "Unzul\u00E4ssiger Name \"{0}\" f\u00FCr Verarbeitungsanweisung."},
 
         /*
          * Note to translators:  This message is reported if the stylesheet
@@ -261,7 +261,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * text.
          */
         {ErrorMsg.ILLEGAL_ATTRIBUTE_ERR,
-        "Ung\u00FCltiges Attribut \"{0}\"."},
+        "Unzul\u00E4ssiges Attribut \"{0}\"."},
 
         /*
          * Note to translators:  "import" and "include" are keywords that should
@@ -321,7 +321,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * function has too many or too few arguments.
          */
         {ErrorMsg.ILLEGAL_ARG_ERR,
-        "Ung\u00FCltige Argumente f\u00FCr Funktionsaufruf."},
+        "Unzul\u00E4ssige Argumente f\u00FCr Funktionsaufruf."},
 
         /*
          * Note to translators:  "document()" is the name of function and must
@@ -383,7 +383,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * element of a type that it was not permitted to contain.
          */
         {ErrorMsg.ILLEGAL_CHILD_ERR,
-        "Ung\u00FCltiges untergeordnetes Element."},
+        "Unzul\u00E4ssiges untergeordnetes Element."},
 
         /*
          * Note to translators:  The stylesheet tried to create an element with
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
index 6b44ace762d..dadea4ba3b0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
@@ -149,7 +149,7 @@ public class ErrorMessages_de extends ListResourceBundle {
          * iterator.  (See definition of iterator above.)
          */
         {BasisLibrary.ITERATOR_CLONE_ERR,
-        "Iterator \"{0}\" kann nicht geclont werden."},
+        "Iterator \"{0}\" kann nicht geklont werden."},
 
         /*
          * Note to translators:  The following represents an internal error
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
index 0b8ee27b51e..5b802e6ea58 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
@@ -39,7 +14,7 @@ HIERARCHY_REQUEST_ERR  = Es wurde versucht, einen Knoten an einer Stelle einzuf\
 INDEX_SIZE_ERR = Index oder Gr\u00F6\u00DFe ist negativ oder gr\u00F6\u00DFer als der zul\u00E4ssige Wert.
 INUSE_ATTRIBUTE_ERR = Es wurde versucht, ein Attribut hinzuzuf\u00FCgen, das bereits an einer anderen Stelle verwendet wird.
 INVALID_ACCESS_ERR  = Ein Parameter oder Vorgang wird nicht vom zugrunde liegenden Objekt unterst\u00FCtzt. 
-INVALID_CHARACTER_ERR = Ung\u00FCltiges XML-Zeichen angegeben. 
+INVALID_CHARACTER_ERR = Ung\u00FCltiges oder unzul\u00E4ssiges XML-Zeichen angegeben. 
 INVALID_MODIFICATION_ERR =  Es wurde versucht, den Typ des zugrunde liegenden Objekts zu \u00E4ndern. 
 INVALID_STATE_ERR = Es wurde versucht, ein Objekt zu \u00E4ndern, das nicht verwendet werden kann. 
 NAMESPACE_ERR = Es wurde versucht, ein Objekt auf eine Weise zu erstellen oder zu \u00E4ndern, die falsch in Bezug auf Namespaces ist.
@@ -47,7 +22,7 @@ NOT_FOUND_ERR = Es wurde versucht, einen Knoten in einem Kontext zu referenziere
 NOT_SUPPORTED_ERR = Der angeforderte Typ des Objekts oder Vorgangs wird nicht von der Implementierung unterst\u00FCtzt. 
 NO_DATA_ALLOWED_ERR = Daten wurden f\u00FCr einen Knoten angegeben, der keine Daten unterst\u00FCtzt.
 NO_MODIFICATION_ALLOWED_ERR = Es wurde versucht, ein Objekt zu \u00E4ndern, bei dem \u00C4nderungen nicht zul\u00E4ssig sind.
-SYNTAX_ERR = Ung\u00FCltige Zeichenfolge angegeben. 
+SYNTAX_ERR = Ung\u00FCltige oder unzul\u00E4ssige Zeichenfolge angegeben. 
 VALIDATION_ERR = Aufruf einer Methode wie insertBefore oder removeChild w\u00FCrde die Dokumentgrammatik des Knotens ung\u00FCltig machen.
 WRONG_DOCUMENT_ERR = Ein Knoten wird in einem anderen Dokument verwendet als dem, von dem er erstellt wurde.
 TYPE_MISMATCH_ERR = Der Werttyp f\u00FCr diesen Parameternamen ist nicht mit dem erwarteten Werttyp kompatibel. 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
index e2f923e6181..c6fe53e399b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
index c59decb1b3d..2f74f54fbab 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # DOM implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
index 1d9f1a082fa..4bbbaea3b1f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
index 84d90d0fd41..a8ef5dbddc0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
index 21a3e3c9919..e5b9aca2e70 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
index d9a740adbd8..820fc8fb2e3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
index 86120a72476..267c886ffed 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
index 9cc5ccb25f2..9ffbd1c608e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
index 2b99e3461e1..4f6a8717006 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
index 21978c587cb..0c6c98dc312 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
index cc07506f888..0d6e7a12242 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces
 # SAX implementation.
 #
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
index 45c47c62709..412d96f917e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 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.
-#
-
 # Messages for message reporting
 BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
 FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n  
@@ -51,7 +26,7 @@ MultipleRootElements = Ein ordnungsgem\u00E4\u00DF formatiertes Dokument darf ni
 ContentIllegalAtTopLevel = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine Zeichen enthalten.
 UnexpandedEntityReferenceIllegal = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine nicht erweiterten Entityreferenzen enthalten.
 HrefFragmentIdentifierIllegal = Fragment-IDs d\u00FCrfen nicht verwendet werden. Der "href"-Attributwert "{0}" ist nicht zul\u00E4ssig.
-HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ung\u00FCltige Syntax. Nach Anwenden der Escape-Regeln ist der Wert kein syntaktisch korrekter URI oder IRI.
+HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ung\u00FCltige Syntax. Nach Anwenden der Escape-Regeln ist der Wert keine syntaktisch korrekte URI oder IRI.
 XPointerStreamability = Es wurde ein xpointer angegeben, der auf eine Stelle im Quell-Infoset verweist. Auf diese Stelle kann aufgrund des Streamingcharakters des Prozessors nicht zugegriffen werden.
 
 XPointerResolutionUnsuccessful = XPointer-Aufl\u00F6sung nicht erfolgreich.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
index 2034e72751e..55abfda9b23 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 # Messages for message reporting
 BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n  
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
index 3231b731892..8e32a7337a1 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 # Messages for message reporting
 BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
 FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n  
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
index e535ffc74b2..3848d68aa2e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
@@ -123,7 +123,7 @@
         InvalidHighSurrogate = High-Surrogate-Bits in UTF-8-Sequenz d\u00FCrfen 0x10 nicht \u00FCberschreiten, gefunden wurde aber 0x{0}.
         OperationNotSupported = Vorgang "{0}" nicht unterst\u00FCtzt von {1}-Reader.
         InvalidASCII = Byte "{0}" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
-        CharConversionFailure = Eine Entity, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung ung\u00FCltig sind.
+        CharConversionFailure = Eine Entity, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung unzul\u00E4ssig sind.
         
 # DTD Messages
 # 2.2 Characters
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = Element oder Attribut stimmt nicht mit QName-Production \u00FCberein: QName::=(NCName':')?NCName. 
+        IllegalQName = Element oder Attribut "{0}" stimmt nicht mit QName-Produktion \u00FCberein: QName::=(NCName'':'')?NCName.
         ElementXMLNSPrefix = Element "{0}" darf nicht "xmlns" als Pr\u00E4fix enthalten.
         ElementPrefixUnbound = Pr\u00E4fix "{0}" f\u00FCr Element "{1}" ist nicht gebunden.
         AttributePrefixUnbound = Pr\u00E4fix "{2}" f\u00FCr Attribut "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, ist nicht gebunden.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
index 859b3530908..7001ef45266 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName':')?NCName\u3002 
+        IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027"{0}"\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName'':'')?NCName\u3002
         ElementXMLNSPrefix = \u8981\u7D20"{0}"\u306E\u63A5\u982D\u8F9E\u3068\u3057\u3066"xmlns"\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
         ElementPrefixUnbound = \u8981\u7D20"{1}"\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
         AttributePrefixUnbound = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u63A5\u982D\u8F9E"{2}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
index 781b2c640c8..ac05ad875c6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
@@ -278,7 +278,7 @@
         
 # Namespaces support
 # 4. Using Qualified Names
-        IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027\u4E0D\u5339\u914D QName \u751F\u4EA7: QName::=(NCName':')?NCName\u3002
+        IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027 "{0}" \u4E0D\u5339\u914D QName \u751F\u4EA7\uFF1AQName::=(NCName'':'')?NCName\u3002
         ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u4E3A\u524D\u7F00\u3002
         ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F00 "{0}" \u672A\u7ED1\u5B9A\u3002
         AttributePrefixUnbound = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u7684\u524D\u7F00 "{2}" \u672A\u7ED1\u5B9A\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
index 7c864068a94..9ca2596f92e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
@@ -64,7 +39,6 @@
         cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: Content des Elements ''{0}'' ist nicht vollst\u00E4ndig. ''{1}'' wird erwartet.
         cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: \u00DCbereinstimmungsplatzhalter ist streng, aber es kann keine Deklaration f\u00FCr Element ''{0}'' gefunden werden.
         cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Ung\u00FCltiger Content wurde beginnend mit Element ''{0}'' gefunden. An dieser Stelle wird kein untergeordnetes Element erwartet.
-        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Ung\u00FCltiger Content wurde beginnend mit Element ''{0}'' gefunden. An dieser Stelle wird kein untergeordnetes Element ''{1}'' erwartet.
         cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: "{0}" darf maximal "{2}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde \u00FCberschritten. An dieser Stelle wird eines von "{1}" erwartet.
         cvc-complex-type.2.4.f = cvc-complex-type.2.4.e: "{0}" darf maximal "{1}"-mal in der aktuellen Abfolge auftreten. Dieser Grenzwert wurde \u00FCberschritten. An dieser Stelle wird kein untergeordnetes Element erwartet.
         cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Ung\u00FCltigen Inhalt gefunden, der mit Element "{0}" beginnt. "{1}" soll erwartungsgem\u00E4\u00DF mindestens "{2}"-mal in der aktuellen Abfolge auftreten. Eine weitere Instanz ist erforderlich, um diesen Constraint zu erf\u00FCllen.
@@ -259,14 +233,14 @@
         rcase-MapAndSum.2 = rcase-MapAndSum.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Vorkommensbereichs der Basisgruppe ({2},{3}).
         rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Elemente haben Namen und Ziel-Namespaces, die nicht identisch sind: Element ''{0}'' in Namespace ''{1}'' und Element ''{2}'' in Namespace ''{3}''.
         rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. '{'nillable'}' ist bei der Elementdeklaration ''true'', aber das entsprechende Partikel im Basistyp hat eine Elementdeklaration, bei der '{'nillable'}' ''false'' ist.
-        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
+        rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
         rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: Element ''{0}'' ist nicht fest, aber das entsprechende Element im Basistyp ist fest mit Wert ''{1}''.
         rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: Element ''{0}'' ist fest mit dem Wert ''{1}'', aber das entsprechende Element im Basistyp ist fest mit Wert ''{2}''.
         rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Identity Constraints f\u00FCr Element ''{0}'' sind keine Teilmenge der Constraints in der Basis.
         rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: Die unzul\u00E4ssigen Substitutionen f\u00FCr Element ''{0}'' sind keine Obermenge der Substitutionen in der Basis.
         rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: Typ des Elements ''{0}'' ''{1}'' wurde nicht vom Typ des Basiselements ''{2}'' abgeleitet.
         rcase-NSCompat.1 = rcase-NSCompat.1: Element ''{0}'' hat den Namespace ''{1}''. Dies wird vom Platzhalter in der Basis nicht zugelassen.
-        rcase-NSCompat.2 = rcase-NSCompat.2: Fehler beim Partikel, dessen '{'term'}' die Elementdeklaration ''{0}'' ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
+        rcase-NSCompat.2 = rcase-NSCompat.2: Fehler beim Partikel, dessen "{''term''}" die Elementdeklaration "{0}" ist. Der Vorkommensbereich ({1},{2}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs ({3},{4}) des entsprechenden Partikels im Basistyp.
         rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Es ist keine vollst\u00E4ndige Funktionszuordnung zwischen den Partikeln vorhanden.
         rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: Vorkommensbereich der Gruppe ({0},{1}) ist keine g\u00FCltige Einschr\u00E4nkung des Bereichs des Basisplatzhalters ({2},{3}).
         rcase-NSSubset.1 = rcase-NSSubset.1: Platzhalter ist keine Teilmenge des entsprechenden Platzhalters in der Basis.
@@ -311,15 +285,15 @@
         EmptyTargetNamespace = EmptyTargetNamespace: In Schemadokument ''{0}'' kann der Wert des ''targetNamespace''-Attributs keine leere Zeichenfolge sein.
         FacetValueFromBase = FacetValueFromBase: In der Deklaration von Typ ''{0}'' muss der Wert ''{1}'' von Facet ''{2}'' aus dem Wertebereich des Basistyps ''{3}'' stammen.
         FixedFacetValue = FixedFacetValue: In der Definition von {3} ist der Wert ''{1}'' f\u00FCr Facet ''{0}'' ung\u00FCltig, da der Wert f\u00FCr ''{0}'' in einem der Vorg\u00E4ngertypen auf ''{2}'' gesetzt wurde und ''{''fixed'}''' = true ist.
-        InvalidRegex = InvalidRegex: Musterwert ''{0}'' ist kein g\u00FCltiger regul\u00E4rer Ausdruck. Der gemeldete Fehler war: ''{1}'' bei Spalte ''{2}''.
-        MaxOccurLimit = Aktuelle Konfiguration des Parsers l\u00E4sst nicht zu, dass ein maxOccurs-Attributwert auf einen h\u00F6heren Wert als {0} gesetzt wird.
+        InvalidRegex = InvalidRegex: Musterwert "{0}" ist kein g\u00FCltiger regul\u00E4rer Ausdruck. Der gemeldete Fehler war: "{1}".
+        MaxOccurLimit = Aktuelle Konfiguration des Parsers l\u00E4sst nicht zu, dass ein Inhaltsmodell so erweitert wird, dass ein komplexer Typ mehr als {0} Knoten enth\u00E4lt.
         PublicSystemOnNotation = PublicSystemOnNotation: Mindestens eines der Elemente 'public' und 'system' muss im Element 'notation' vorkommen.
         SchemaLocation = SchemaLocation: schemaLocation-Wert = ''{0}'' muss eine gerade Anzahl an URIs haben.
         TargetNamespace.1 = TargetNamespace.1: Namespace ''{0}'' wird erwartet, aber der Ziel-Namespace des Schemadokuments ist ''{1}''.
         TargetNamespace.2 = TargetNamespace.2: Kein Namespace wird erwartet, aber das Schemadokument hat den Ziel-Namespace ''{1}''.
         UndeclaredEntity = UndeclaredEntity: Entity ''{0}'' ist nicht deklariert.
         UndeclaredPrefix = UndeclaredPrefix: ''{0}'' kann nicht als QName aufgel\u00F6st werden: Pr\u00E4fix ''{1}'' ist nicht deklariert.
-
+        FacetsContradict = FacetsContradict: F\u00FCr simpleType-Definition "{2}" widerspricht der Enumerationswert "{0}" dem Wert von Facet "{1}".
 
 # JAXP 1.2 schema source property errors
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
index b4d9ffafe78..bcf6b336eb7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 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.
-#
-
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
index 602d1314ac6..4e9a16dcb4f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 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.
-#
-
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
index 3c1d9d8282c..c5b5cdbd949 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
index 341497c9a6f..b61a63b5b74 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
index d8b2eb0bba5..4db14a65c4d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores error messages for the Xerces XML
 # serializer.  Many DOM Load/Save error messages also 
 # live here, since the serializer largely implements that package.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
index dc787a6cd3d..3d33f7b8699 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
index e12a67655f8..a9348831605 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
index cbbaad08e7b..bbf46c70eb7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 stores localized messages for the Xerces XPointer implementation.
 #
 # The messages are arranged in key and value tuples in a ListResourceBundle.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
index 549f517840c..816e86b09a8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 parser.parse.1=Falsches Zeichen.
 parser.parse.2=Ung\u00FCltige Referenznummer.
 parser.next.1=Nach \\ ist ein Zeichen erforderlich.
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
index fcc5ed576fb..09ffd559f50 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 parser.parse.1=\u6587\u5B57\u304C\u9055\u3063\u3066\u3044\u307E\u3059\u3002
 parser.parse.2=\u7121\u52B9\u306A\u53C2\u7167\u756A\u53F7\u3067\u3059\u3002
 parser.next.1=\\\u306E\u5F8C\u306B\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
index ee68bbdbcea..ab2e56846a9 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties
@@ -1,28 +1,3 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
 parser.parse.1=\u5B57\u7B26\u9519\u8BEF\u3002
 parser.parse.2=\u5F15\u7528\u53F7\u65E0\u6548\u3002
 parser.next.1=\\ \u540E\u9762\u5FC5\u987B\u6709\u5B57\u7B26\u3002
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
index 5b859177598..3c53ea08956 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
@@ -286,7 +286,7 @@ public class XMLErrorResources_de extends ListResourceBundle
        "Ung\u00FCltige Portnummer"},
 
     { ER_FRAG_FOR_GENERIC_URI,
-       "Fragment kann nur f\u00FCr einen generischen URI festgelegt werden"},
+       "Fragment kann nur f\u00FCr eine generische URI festgelegt werden"},
 
     { ER_FRAG_WHEN_PATH_NULL,
        "Fragment kann nicht festgelegt werden, wenn der Pfad null ist"},
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
index bc444738f1a..1874693ccfe 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
@@ -162,7 +162,7 @@ public class SerializerMessages_de extends ListResourceBundle {
                 "Fragment kann nicht festgelegt werden, wenn der Pfad null ist" },
 
             {   MsgKey.ER_FRAG_FOR_GENERIC_URI,
-                "Fragment kann nur f\u00FCr einen generischen URI festgelegt werden" },
+                "Fragment kann nur f\u00FCr eine generische URI festgelegt werden" },
 
             {   MsgKey.ER_NO_SCHEME_IN_URI,
                 "Kein Schema gefunden in URI" },
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
index db9a3fdbc2e..7b3c5473e5e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
+ * @LastModified: Nov 2021
  */
 public class XPATHErrorResources_de extends ListResourceBundle
 {
@@ -150,6 +150,10 @@ public class XPATHErrorResources_de extends ListResourceBundle
          "ER_FOUND_COMMA_BUT_NO_FOLLOWING_ARG";
   public static final String ER_PREDICATE_ILLEGAL_SYNTAX =
          "ER_PREDICATE_ILLEGAL_SYNTAX";
+  public static final String ER_PREDICATE_TOO_MANY_OPEN =
+         "ER_PREDICATE_TOO_MANY_OPEN";
+  public static final String ER_COMPILATION_TOO_MANY_OPERATION =
+         "ER_COMPILATION_TOO_MANY_OPERATION";
   public static final String ER_ILLEGAL_AXIS_NAME = "ER_ILLEGAL_AXIS_NAME";
   public static final String ER_UNKNOWN_NODETYPE = "ER_UNKNOWN_NODETYPE";
   public static final String ER_PATTERN_LITERAL_NEEDS_BE_QUOTED =
@@ -318,6 +322,10 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
+  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
+  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
+  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
+  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -435,7 +443,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
      "ERROR. Unbekannter Vorgangscode: {0}"},
 
   { ER_EXTRA_ILLEGAL_TOKENS,
-     "Zus\u00E4tzliche ung\u00FCltige Tokens: {0}"},
+     "Zus\u00E4tzliche unzul\u00E4ssige Tokens: {0}"},
 
   { ER_EXPECTED_DOUBLE_QUOTE,
       "Literal in falschen Anf\u00FChrungszeichen... Doppelte Anf\u00FChrungszeichen erwartet."},
@@ -462,10 +470,16 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
       "\",\" gefunden, aber kein folgendes Argument vorhanden."},
 
   { ER_PREDICATE_ILLEGAL_SYNTAX,
-      "\"..[predicate]\" oder \".[predicate]\" ist ung\u00FCltige Syntax. Verwenden Sie stattdessen \"self::node()[predicate]\"."},
+      "\"..[predicate]\" oder \".[predicate]\" ist unzul\u00E4ssige Syntax. Verwenden Sie stattdessen \"self::node()[predicate]\"."},
+
+  { ER_PREDICATE_TOO_MANY_OPEN,
+      "Stack\u00FCberlauf beim Parsen von {0} bei {1}. Es sind zu viele offene Pr\u00E4dikate vorhanden ({2})."},
+
+  { ER_COMPILATION_TOO_MANY_OPERATION,
+      "Stack\u00FCberlauf beim Kompilieren des Ausdrucks. Es sind zu viele Vorg\u00E4nge vorhanden ({0})."},
 
   { ER_ILLEGAL_AXIS_NAME,
-     "Ung\u00FCltiger Achsenname: {0}"},
+     "Unzul\u00E4ssiger Achsenname: {0}"},
 
   { ER_UNKNOWN_NODETYPE,
      "Unbekannter Knotentyp: {0}"},
@@ -826,6 +840,26 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "Versuch, Null-XPathVariableResolver festzulegen:{0}#setXPathVariableResolver(null)"},
 
+  /** Field ER_PROPERTY_NAME_NULL                       */
+
+  { ER_PROPERTY_NAME_NULL,
+       "Es wird versucht, eine Eigenschaft mit einem Nullnamen festzulegen: {0}#setProperty(null, {1})"},
+
+  /** Field ER_PROPERTY_UNKNOWN                       */
+
+  { ER_PROPERTY_UNKNOWN,
+       "Es wird versucht, die unbekannte Eigenschaft \"{0}\" festzulegen: {1}#setProperty({0},{2})"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_NULL_PROPERTY,
+       "Es wird versucht, eine Eigenschaft mit einem Nullnamen abzurufen: {0}#getProperty(null)"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_UNKNOWN_PROPERTY,
+       "Es wird versucht, die unbekannte Eigenschaft \"{0}\" abzurufen: {1}#getProperty({0})"},
+
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
index a8c681aaa37..bdb2501b69a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
- * @LastModified: May 2019
+ * @LastModified: Nov 2021
  */
 public class XPATHErrorResources_ja extends ListResourceBundle
 {
@@ -322,6 +322,10 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
+  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
+  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
+  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
+  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -836,6 +840,26 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "null\u306EXPathVariableResolver\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#setXPathVariableResolver(null)"},
 
+  /** Field ER_PROPERTY_NAME_NULL                       */
+
+  { ER_PROPERTY_NAME_NULL,
+       "\u30D7\u30ED\u30D1\u30C6\u30A3\u306Bnull\u306E\u540D\u524D\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#setProperty( null, {1})"},
+
+  /** Field ER_PROPERTY_UNKNOWN                       */
+
+  { ER_PROPERTY_UNKNOWN,
+       "\u4E0D\u660E\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\"{0}\"\u3092\u8A2D\u5B9A\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F:{1}#setProperty({0},{2})"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_NULL_PROPERTY,
+       "null\u540D\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u53D6\u5F97\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F: {0}#getProperty(null)"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_UNKNOWN_PROPERTY,
+       "\u4E0D\u660E\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\"{0}\"\u3092\u53D6\u5F97\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F:{1}#getProperty({0})"},
+
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
index d1e370f0d82..5c76b4c9471 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
- * @LastModified: May 2019
+ * @LastModified: Nov 2021
  */
 public class XPATHErrorResources_zh_CN extends ListResourceBundle
 {
@@ -322,6 +322,10 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   public static final String ER_SECUREPROCESSING_FEATURE = "ER_SECUREPROCESSING_FEATURE";
   public static final String ER_NULL_XPATH_FUNCTION_RESOLVER = "ER_NULL_XPATH_FUNCTION_RESOLVER";
   public static final String ER_NULL_XPATH_VARIABLE_RESOLVER = "ER_NULL_XPATH_VARIABLE_RESOLVER";
+  public static final String ER_PROPERTY_NAME_NULL = "ER_PROPERTY_NAME_NULL";
+  public static final String ER_PROPERTY_UNKNOWN = "ER_PROPERTY_UNKNOWN";
+  public static final String ER_GETTING_NULL_PROPERTY = "ER_GETTING_NULL_PROPERTY";
+  public static final String ER_GETTING_UNKNOWN_PROPERTY = "ER_GETTING_UNKNOWN_PROPERTY";
   //END: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
 
   public static final String WG_LOCALE_NAME_NOT_HANDLED =
@@ -836,6 +840,26 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
   { ER_NULL_XPATH_VARIABLE_RESOLVER,
        "\u5C1D\u8BD5\u8BBE\u7F6E\u7A7A XPathVariableResolver:{0}#setXPathVariableResolver(null)"},
 
+  /** Field ER_PROPERTY_NAME_NULL                       */
+
+  { ER_PROPERTY_NAME_NULL,
+       "\u5C1D\u8BD5\u8BBE\u7F6E\u5177\u6709\u7A7A\u540D\u79F0\u7684\u5C5E\u6027\uFF1A{0}#setProperty( null, {1})"},
+
+  /** Field ER_PROPERTY_UNKNOWN                       */
+
+  { ER_PROPERTY_UNKNOWN,
+       "\u5C1D\u8BD5\u8BBE\u7F6E\u672A\u77E5\u5C5E\u6027 \"{0}\":{1}#setProperty({0},{2})"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_NULL_PROPERTY,
+       "\u5C1D\u8BD5\u83B7\u53D6\u5177\u6709\u7A7A\u540D\u79F0\u7684\u5C5E\u6027\uFF1A{0}#getProperty(null)"},
+
+  /** Field ER_GETTING_NULL_PROPERTY                       */
+
+  { ER_GETTING_UNKNOWN_PROPERTY,
+       "\u5C1D\u8BD5\u83B7\u53D6\u672A\u77E5\u5C5E\u6027 \"{0}\":{1}#getProperty({0})"},
+
   //END:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
   // Warnings...
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
new file mode 100644
index 00000000000..023f83aea32
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
@@ -0,0 +1,2785 @@
+#
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
+# are preceded by a stylized comment describing the type of the corresponding
+# values.
+# The simple types currently in use are:
+#
+# annotation        annotation compound
+# boolean           true or false
+# diagnostic        a sub-message; see compiler.misc.*
+# fragment          similar to 'message segment', but with more specific type
+# modifier          a Java modifier; e.g. public, private, protected
+# file              a file URL
+# file object       a file URL - similar to 'file' but typically used for source/class files, hence more specific
+# flag              a Flags.Flag instance
+# name              a name, typically a Java identifier
+# number            an integer
+# option name       the name of a command line option
+# path              a path
+# profile           a profile name
+# source            a source version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.code.Source
+# source version    a source version number, such as 1.5, 1.6, 1.7, taken from a javax.lang.model.SourceVersion
+# string            a general string
+# symbol            the name of a declared type
+# symbol kind       the kind of a symbol (i.e. method, variable)
+# kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
+# target            a target version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.jvm.Target
+# token             the name of a non-terminal in source code; see compiler.misc.token.*
+# tree tag          the name of a non-terminal in source code; see compiler.misc.token.*
+# type              a Java type; e.g. int, X, X<T>
+# url               a URL
+# object            a Java object (unspecified)
+# unused            the value is not used in this message
+#
+# The following compound types are also used:
+#
+# collection of X   a comma-separated collection of items; e.g. collection of type
+# list of X         a comma-separated list of items; e.g. list of type
+# set of X          a comma-separated set of items; e.g. set of modifier
+#
+# These may be composed:
+#
+# list of type or message segment
+#
+# The following type aliases are supported:
+#
+# message segment --> diagnostic or fragment
+# file name --> file, path or file object
+#
+# Custom comments are supported in parenthesis i.e.
+#
+# number (classfile major version)
+#
+# These comments are used internally in order to generate an enum-like class declaration containing
+# a method/field for each of the diagnostic keys listed here. Those methods/fields can then be used
+# by javac code to build diagnostics in a type-safe fashion.
+#
+# In addition, these comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
+# using info derived from the collected set of examples in test/tools/javac/diags/examples.
+# MessageInfo can also be run as a standalone utility providing more facilities
+# for manipulating this file. For more details, see MessageInfo.java.
+
+##
+## errors
+##
+
+# 0: symbol
+compiler.err.abstract.cant.be.instantiated={0} ist abstrakt, kann nicht instanziiert werden
+
+compiler.err.abstract.meth.cant.have.body=Abstrakte Methoden k\u00F6nnen keinen Body enthalten
+
+# 0: kind name, 1: symbol
+compiler.err.already.annotated={0} {1} wurde bereits mit Annotation versehen
+
+# 0: kind name, 1: symbol, 2: kind name, 3: symbol
+compiler.err.already.defined={0} {1} ist bereits in {2} {3} definiert
+
+# 0: kind name, 1: symbol, 2: kind name, 3: kind name, 4: symbol
+compiler.err.already.defined.in.clinit={0} {1} ist bereits in {2} von {3} {4} definiert
+
+# 0: symbol
+compiler.err.already.defined.single.import=Es wurde bereits ein Typ mit demselben einfachen Namen durch den Einzeltypimport von {0} definiert
+
+# 0: symbol
+compiler.err.already.defined.static.single.import=Es wurde bereits ein Typ mit demselben einfachen Namen durch den statischen Einzeltypimport von {0} definiert
+
+# 0: symbol
+compiler.err.already.defined.this.unit={0} ist in dieser Kompilierungseinheit bereits definiert
+
+# 0: type, 1: list of name
+compiler.err.annotation.missing.default.value=In Annotation @{0} fehlt ein Standardwert f\u00FCr das Element "{1}"
+
+# 0: type, 1: list of name
+compiler.err.annotation.missing.default.value.1=In Annotation @{0} fehlen Standardwerte f\u00FCr Elemente {1}
+
+# 0: type
+compiler.err.annotation.not.valid.for.type=Annotation ist f\u00FCr Element des Typs {0} nicht g\u00FCltig
+
+compiler.err.annotation.type.not.applicable=Annotationsschnittstelle ist f\u00FCr diese Art Deklaration nicht anwendbar
+
+# 0: type
+compiler.err.annotation.type.not.applicable.to.type=Annotation @{0} ist in diesem Typkontext nicht anwendbar
+
+compiler.err.annotation.value.must.be.annotation=Annotationswert muss eine Annotation sein
+
+compiler.err.annotation.value.must.be.class.literal=Annotationswert muss ein Klassenliteral sein
+
+compiler.err.annotation.value.must.be.name.value=Annotationswerte m\u00FCssen das Format "Name=Wert" aufweisen
+
+compiler.err.annotation.value.not.allowable.type=Annotationswert hat keinen zul\u00E4ssigen Typ
+
+compiler.err.expression.not.allowable.as.annotation.value=Ausdruck ist als Annotationswert nicht zul\u00E4ssig
+
+compiler.err.anon.class.impl.intf.no.args=Anonyme Klasse implementiert Schnittstelle. Argumente sind nicht m\u00F6glich
+
+compiler.err.anon.class.impl.intf.no.typeargs=Anonyme Klasse implementiert Schnittstelle. Typargumente sind nicht m\u00F6glich
+
+compiler.err.anon.class.impl.intf.no.qual.for.new=Anonyme Klasse implementiert Schnittstelle. Qualifier f\u00FCr "Neu" ist nicht m\u00F6glich
+
+compiler.err.cant.inherit.from.anon=Erben aus anonymer Klasse nicht m\u00F6glich
+
+# 0: symbol, 1: symbol, 2: symbol
+compiler.err.array.and.varargs={0} und {1} k\u00F6nnen nicht beide in {2} deklariert werden
+
+compiler.err.array.dimension.missing=Arraydimension fehlt
+
+compiler.err.illegal.array.creation.both.dimension.and.initialization=Arrayerstellung mit Dimensionsausdruck und Initialisierung ist unzul\u00E4ssig
+
+# 0: type
+compiler.err.array.req.but.found=Array erforderlich, aber {0} gefunden
+
+compiler.err.attribute.value.must.be.constant=Elementwert muss ein Konstantenausdruck sein
+
+# 0: string (statement type)
+compiler.err.bad.initializer=Ung\u00FCltiger Initializer f\u00FCr {0}
+
+compiler.err.break.outside.switch.loop=Unterbrechung au\u00DFerhalb Switch oder Schleife
+
+compiler.err.break.outside.switch.expression=Versuch, Vorgang aus einem Switch-Ausdruck zu unterbrechen
+
+compiler.err.continue.outside.switch.expression=Versuch, Vorgang aus einem Switch-Ausdruck fortzusetzen
+
+compiler.err.return.outside.switch.expression=Versuch, aus einem Switch-Ausdruck zur\u00FCckzukehren
+
+compiler.err.rule.completes.normally=Switch-Regel wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Regeln in Switch-Ausdr\u00FCcken m\u00FCssen einen Wert oder Throw angeben)
+
+compiler.err.switch.expression.completes.normally=Switch-Ausdruck wird ohne Angabe eines Wertes abgeschlossen\n(Switch-Ausdr\u00FCcke m\u00FCssen einen Wert angeben oder einen Throw f\u00FCr alle m\u00F6glichen Eingabewerte ausgeben)
+
+compiler.err.no.switch.expression ="yield" au\u00DFerhalb von Switch-Ausdruck
+
+compiler.err.no.switch.expression.qualify="yield" au\u00DFerhalb von Switch-Ausdruck\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+
+compiler.err.invalid.yield=Ung\u00FCltige Verwendung der eingeschr\u00E4nkten ID "yield"\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+
+compiler.warn.invalid.yield="yield" kann in einem zuk\u00FCnftigen Release zu einer eingeschr\u00E4nkten ID werden\n(um eine Methode namens "yield" aufzurufen, qualifizieren Sie den yield-Aufruf mit einem Empf\u00E4nger oder Typnamen)
+
+compiler.err.switch.expression.empty=Switch-Ausdruck enth\u00E4lt keine CASE-Klauseln
+
+compiler.err.switch.expression.no.result.expressions=Switch-Ausdruck enth\u00E4lt keine Ergebnisausdr\u00FCcke
+
+# 0: name
+compiler.err.call.must.be.first.stmt.in.ctor=Aufruf von {0} muss die erste Anweisung im Konstruktor sein
+
+# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
+compiler.err.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebenen Typen angewendet werden.\nErforderlich: {2}\nErmittelt:    {3}\nGrund: {6}
+
+# 0: symbol kind, 1: name, 2: list of type
+compiler.err.cant.apply.symbols={0} f\u00FCr {1}({2}) nicht geeignet
+
+# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
+compiler.misc.cant.apply.symbol={0} {1} in {4} {5} kann nicht auf die angegebenen Typen angewendet werden\nErforderlich: {2}\nErmittelt:    {3}\nGrund: {6}
+
+# 0: symbol kind, 1: name, 2: list of type
+compiler.misc.cant.apply.symbols={0} f\u00FCr {1}({2}) nicht geeignet
+
+# 0: kind name, 1: symbol
+compiler.misc.no.abstracts=Keine abstrakte Methode in {0} {1} gefunden
+
+# 0: kind name, 1: symbol
+compiler.misc.incompatible.abstracts=Mehrere nicht \u00FCberschreibende abstrakte Methoden in {0} {1} gefunden
+
+compiler.err.bad.functional.intf.anno=Unerwartete @FunctionalInterface-Annotation
+
+# 0: message segment
+compiler.err.bad.functional.intf.anno.1=Unerwartete @FunctionalInterface-Annotation\n{0}
+
+# 0: message segment
+compiler.err.anonymous.diamond.method.does.not.override.superclass=Methode \u00FCberschreibt oder implementiert keine Methode aus einem Supertyp\n{0}
+
+# 0: symbol
+compiler.misc.not.a.functional.intf={0} ist keine Funktionsschnittstelle
+
+# 0: symbol, 1: message segment
+compiler.misc.not.a.functional.intf.1={0} ist keine Funktionsschnittstelle\n{1}
+
+# 0: type, 1: kind name, 2: symbol
+compiler.misc.invalid.generic.lambda.target=Ung\u00FCltiger Funktionsdeskriptor f\u00FCr Lambda-Ausdruck\nMethode {0} in {1} {2} ist generisch
+
+# 0: kind name, 1: symbol
+compiler.misc.incompatible.descs.in.functional.intf=Inkompatible Funktionsdeskriptoren in {0} {1} gefunden
+
+# 0: name, 1: list of type, 2: type, 3: list of type
+compiler.misc.descriptor=Deskriptor: {2} {0}({1})
+
+# 0: name, 1: list of type, 2: type, 3: list of type
+compiler.misc.descriptor.throws=Deskriptor: {2} {0}({1}) l\u00F6st {3} aus
+
+# 0: type
+compiler.misc.no.suitable.functional.intf.inst=Funktionsschnittstellendeskriptor f\u00FCr {0} kann nicht abgeleitet werden
+
+# 0: message segment
+compiler.misc.bad.intersection.target.for.functional.expr=Ung\u00FCltiges Schnittmengentypziel f\u00FCr Lambda oder Methodenreferenz\n{0}
+
+# 0: symbol or type
+compiler.misc.not.an.intf.component=Komponententyp {0} ist keine Schnittstelle
+
+# 0: kind name, 1: message segment
+compiler.err.invalid.mref=Ung\u00FCltige {0}-Referenz\n{1}
+
+# 0: kind name, 1: message segment
+compiler.misc.invalid.mref=Ung\u00FCltige {0}-Referenz\n{1}
+
+compiler.misc.static.mref.with.targs=Parametrisierter Qualifier f\u00FCr statische Methodenreferenz
+
+# 0: symbol
+compiler.err.cant.assign.val.to.final.var=Der finalen Variable {0} kann kein Wert zugewiesen werden
+
+compiler.err.cant.assign.val.to.this=Zuweisen zu "this" nicht m\u00F6glich
+
+# 0: symbol, 1: message segment
+compiler.err.cant.ref.non.effectively.final.var=Von {1} referenzierte lokale Variablen m\u00FCssen final oder effektiv final sein
+
+compiler.err.try.with.resources.expr.needs.var=Die try-with-resources-Ressource muss eine Variablendeklaration oder ein Ausdruck mit einer Referenz zu einer finalen oder effektiv finalen Variable sein
+
+# 0: symbol
+compiler.err.try.with.resources.expr.effectively.final.var=Variable {0}, die als try-with-resources-Ressource verwendet wurde, ist weder final noch effektiv final
+
+
+compiler.misc.lambda=Lambda-Ausdruck
+
+compiler.misc.inner.cls=Innere Klasse
+
+compiler.misc.guard=Guard
+
+# 0: type
+compiler.err.cant.deref={0} kann nicht dereferenziert werden
+
+compiler.err.cant.extend.intf.annotation="extends" f\u00FCr @interfaces nicht zul\u00E4ssig
+
+compiler.err.annotation.decl.not.allowed.here=Annotationsschnittstellendeklaration hier nicht zul\u00E4ssig
+
+# 0: symbol
+compiler.err.cant.inherit.from.final=Erben aus finalem {0}-Element nicht m\u00F6glich
+
+# 0: symbol or string
+compiler.err.cant.ref.before.ctor.called={0} kann nicht referenziert werden, bevor der Supertypkonstruktor aufgerufen wurde
+
+compiler.err.cant.select.static.class.from.param.type=Statische Klasse kann nicht aus einem parametrisierten Typ ausgew\u00E4hlt werden
+
+# 0: symbol, 1: string, 2: string
+compiler.err.cant.inherit.diff.arg={0} kann nicht mit verschiedenen Argumenten geerbt werden: <{1}> und <{2}>
+
+compiler.err.catch.without.try="catch" ohne "try"
+
+# 0: kind name, 1: symbol
+compiler.err.clash.with.pkg.of.same.name={0} {1} steht in Konflikt mit Package desselben Namens
+
+compiler.err.class.not.allowed=Klassen-, Schnittstellen- oder Enum-Deklaration hier nicht zul\u00E4ssig
+
+compiler.err.const.expr.req=Konstantenausdruck erforderlich
+
+compiler.err.cont.outside.loop=Fortsetzung au\u00DFerhalb Schleife
+
+# 0: symbol or type
+compiler.err.cyclic.inheritance=Zyklische Vererbung mit {0}
+
+# 0: symbol
+compiler.err.cyclic.annotation.element=Typ von Element {0} ist zyklisch
+
+# 0: symbol
+compiler.err.call.to.super.not.allowed.in.enum.ctor=Aufruf von Super in Enum-Konstruktor nicht zul\u00E4ssig
+
+# 0: type
+compiler.err.no.superclass={0} weist keine Superklasse auf.
+
+# 0: symbol, 1: type, 2: symbol, 3: type, 4: type
+compiler.err.concrete.inheritance.conflict=Methoden {0} von {1} und {2} von {3} werden mit derselben Signatur geerbt
+
+compiler.err.default.allowed.in.intf.annotation.member=Standardwert nur in einer Annotationsschnittstellendeklaration zul\u00E4ssig
+
+# 0: symbol
+compiler.err.doesnt.exist=Package {0} ist nicht vorhanden
+
+# 0: type
+compiler.err.duplicate.annotation.invalid.repeated=Annotation {0} ist keine g\u00FCltige wiederholbare Annotation
+
+# 0: name, 1: type
+compiler.err.duplicate.annotation.member.value=Doppeltes Element "{0}" in Annotation @{1}.
+
+# 0: type
+compiler.err.duplicate.annotation.missing.container={0} ist keine wiederholbare Annotationsschnittstelle
+
+# 0: symbol
+compiler.err.invalid.repeatable.annotation=Doppelte Annotation: {0} ist mit einer ung\u00FCltigen @Repeatable-Annotation versehen
+
+# 0: symbol or type
+compiler.err.invalid.repeatable.annotation.no.value={0} ist keine g\u00FCltige @Repeatable-Annotation. Keine Wertelementmethode deklariert
+
+# 0: type, 1: number
+compiler.err.invalid.repeatable.annotation.multiple.values={0} ist keine g\u00FCltige @Repeatable-Annotation. {1} Elementmethoden namens "value" deklariert
+
+# 0: type
+compiler.err.invalid.repeatable.annotation.invalid.value={0} ist keine g\u00FCltige @Repeatable-Annotation. Ung\u00FCltiges Wertelement
+
+# 0: symbol or type, 1: type, 2: type
+compiler.err.invalid.repeatable.annotation.value.return=\u00DCbergeordnete Annotationsschnittstelle ({0}) muss ein Element namens "value" mit dem Typ {2} deklarieren
+
+# 0: symbol or type, 1: symbol
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\u00DCbergeordnete Annotationsschnittstelle ({0}) enth\u00E4lt keinen Standardwert f\u00FCr Element {1}
+
+# 0: symbol, 1: string, 2: symbol, 3: string
+compiler.err.invalid.repeatable.annotation.retention=Aufbewahrung der \u00FCbergeordneten Annotationsschnittstelle ({0}) ist k\u00FCrzer als die Aufbewahrung der wiederholbaren Annotationsschnittstelle ({2})
+
+# 0: symbol, 1: symbol
+compiler.err.invalid.repeatable.annotation.not.documented=Wiederholbare Annotationsschnittstelle ({1}) ist @Documented, die \u00FCbergeordnete Annotationsschnittstelle ({0}) aber nicht
+
+# 0: symbol, 1: symbol
+compiler.err.invalid.repeatable.annotation.not.inherited=Wiederholbare Annotationsschnittstelle ({1}) ist @Inherited, die \u00FCbergeordnete Annotationsschnittstelle ({0}) aber nicht
+
+# 0: symbol, 1: symbol
+compiler.err.invalid.repeatable.annotation.incompatible.target=\u00DCbergeordnete Annotationsschnittstelle ({0}) gilt f\u00FCr mehr Ziele als die wiederholbare Annotationsschnittstelle ({1})
+
+# 0: symbol
+compiler.err.invalid.repeatable.annotation.repeated.and.container.present=Container {0} darf nicht gleichzeitig mit dem darin enthaltenen Element vorhanden sein
+
+# 0: type, 1: symbol
+compiler.err.invalid.repeatable.annotation.not.applicable=Container {0} ist nicht anwendbar f\u00FCr Element {1}
+
+# 0: type
+compiler.err.invalid.repeatable.annotation.not.applicable.in.context=Container {0} ist in diesem Typkontext nicht anwendbar
+
+# 0: name
+compiler.err.duplicate.class=Doppelte Klasse: {0}
+
+# 0: name, 1: name
+compiler.err.same.binary.name=Klassen {0} und {1} haben denselben bin\u00E4ren Namen
+
+compiler.err.duplicate.case.label=Doppeltes CASE-Label
+
+compiler.err.pattern.dominated=Dieses CASE-Label wird von einem vorherigen CASE-Label dominiert
+
+compiler.err.duplicate.default.label=Doppeltes Standardlabel
+
+compiler.err.duplicate.total.pattern=Doppeltes Gesamtmuster
+
+compiler.err.total.pattern.and.default=Switch umfasst sowohl Gesamtmuster als auch Standardlabel
+
+# 0: type, 1: type
+compiler.err.constant.label.not.compatible=Konstantes Label des Typs {0} ist nicht mit Switch-Selektortyp {1} kompatibel
+
+compiler.err.flows.through.to.pattern=Ung\u00FCltiger Fallthrough zu einem Muster
+
+compiler.err.flows.through.from.pattern=Ung\u00FCltiger Fallthrough von einem Muster
+
+compiler.err.else.without.if="else" ohne "if"
+
+compiler.err.empty.char.lit=Leeres Zeichenliteral
+
+# 0: symbol
+compiler.err.encl.class.required=Eine einschlie\u00DFende Instanz mit {0} ist erforderlich
+
+compiler.err.enum.annotation.must.be.enum.constant=Ein Enum-Annotationswert muss eine Enum-Konstante sein
+
+compiler.err.enum.cant.be.instantiated=Enum-Klassen d\u00FCrfen nicht instanziiert werden
+
+compiler.err.enum.label.must.be.unqualified.enum=Das CASE-Label eines Enum-Switches muss der unqualifizierte Name einer Enumerationskonstante sein
+
+compiler.err.enum.no.subclassing=Klassen k\u00F6nnen java.lang.Enum nicht direkt erweitern
+
+compiler.err.enum.types.not.extensible=Enum-Klassen sind nicht erweiterbar
+
+compiler.err.enum.no.finalize=Enums k\u00F6nnen keine Finalisierungsmethoden aufweisen
+
+# 0: file name, 1: string
+compiler.err.error.reading.file=Fehler beim Lesen von {0}. {1}
+
+# 0: type
+compiler.err.except.already.caught=Ausnahme {0} wurde bereits abgefangen
+
+# 0: type
+compiler.err.except.never.thrown.in.try=Ausnahme {0} wird nie im Body der entsprechenden try-Anweisung ausgel\u00F6st
+
+# 0: symbol
+compiler.err.final.parameter.may.not.be.assigned=final-Parameter {0} darf nicht zugewiesen werden
+
+# 0: symbol
+compiler.err.try.resource.may.not.be.assigned=auto-closeable-Ressource {0} darf nicht zugewiesen werden
+
+# 0: symbol
+compiler.err.multicatch.parameter.may.not.be.assigned=multi-catch-Parameter {0} darf nicht zugewiesen werden
+
+# 0: type, 1: type
+compiler.err.multicatch.types.must.be.disjoint=Alternativen in einer multi-catch-Anweisung d\u00FCrfen nicht durch Unterklassen verkn\u00FCpft sein\nAlternative {0} ist eine Unterklasse der Alternative {1}
+
+compiler.err.finally.without.try="finally" ohne "try"
+
+# 0: type, 1: message segment
+compiler.err.foreach.not.applicable.to.type=for-each nicht auf Ausdruckstyp anwendbar\nErforderlich: {1}\nErmittelt:    {0}
+
+compiler.err.fp.number.too.large=Gleitkommazahl zu gro\u00DF
+
+compiler.err.fp.number.too.small=Gleitkommazahl zu klein
+
+compiler.err.generic.array.creation=Erstellung von generischem Array
+
+compiler.err.generic.throwable=Eine generische Klasse darf java.lang.Throwable nicht erweitern
+
+# 0: symbol
+compiler.err.icls.cant.have.static.decl=Unzul\u00E4ssige static-Deklaration in innerer Klasse {0}\nModifikator "static" ist nur in Konstantenvariablendeklarationen zul\u00E4ssig
+
+# 0: string
+compiler.err.illegal.char=Unzul\u00E4ssiges Zeichen: "{0}"
+
+# 0: string, 1: string
+compiler.err.illegal.char.for.encoding=Nicht zuordenbares Zeichen (0x{0}) f\u00FCr Codierung {1}
+
+# 0: set of flag, 1: set of flag
+compiler.err.illegal.combination.of.modifiers=Unzul\u00E4ssige Kombination aus Modifikatoren: {0} und {1}
+
+compiler.err.illegal.enum.static.ref=Unzul\u00E4ssige Referenz zu statischem Feld aus Initializer
+
+compiler.err.illegal.esc.char=Unzul\u00E4ssiges Escapezeichen
+
+compiler.err.illegal.forward.ref=Unzul\u00E4ssige Vorw\u00E4rtsreferenz
+
+# 0: symbol, 1: object
+compiler.err.not.in.profile={0} ist in Profil "{1}" nicht verf\u00FCgbar
+
+# 0: symbol
+compiler.warn.forward.ref=Referenz zu Variable "{0}", bevor sie initialisiert wurde
+
+compiler.err.illegal.self.ref=Selbstreferenz in Initializer
+
+# 0: symbol
+compiler.warn.self.ref=Selbstreferenz in Initializer von Variable "{0}"
+
+# 0: type
+compiler.err.illegal.initializer.for.type=Unzul\u00E4ssiger Initializer f\u00FCr {0}
+
+compiler.err.illegal.line.end.in.char.lit=Unzul\u00E4ssiges Zeilenende in Zeichenliteral
+
+compiler.err.illegal.text.block.open=Unzul\u00E4ssige Sequenz f\u00FCr \u00D6ffnungstrennzeichen von Textblock. Zeilenabschlusszeichen fehlt
+
+compiler.warn.inconsistent.white.space.indentation=Inkonsistenter Leerzeicheneinzug
+
+compiler.warn.trailing.white.space.will.be.removed=Nachgestelltes Leerzeichen wird entfernt
+
+compiler.err.illegal.nonascii.digit=Unzul\u00E4ssige Nicht-ASCII-Ziffer
+
+compiler.err.illegal.underscore=Unzul\u00E4ssiger Unterstrich
+
+compiler.err.illegal.dot="." unzul\u00E4ssig
+
+# 0: symbol
+compiler.err.illegal.qual.not.icls=Unzul\u00E4ssiger Qualifier. {0} ist keine innere Klasse
+
+compiler.err.illegal.start.of.expr=Unzul\u00E4ssiger Ausdrucksbeginn
+
+compiler.err.illegal.start.of.stmt=Unzul\u00E4ssiger Anweisungsbeginn
+
+compiler.err.illegal.start.of.type=Unzul\u00E4ssiger Typbeginn
+
+compiler.err.illegal.parenthesized.expression=Unzul\u00E4ssiger Ausdruck in Klammern
+
+compiler.err.illegal.unicode.esc=Unzul\u00E4ssiges Unicode-Escapezeichen
+
+# 0: symbol
+compiler.err.import.requires.canonical=Import erfordert kanonischen Namen f\u00FCr {0}
+
+compiler.err.improperly.formed.type.param.missing=Falsch formatierter Typ. Einige Parameter fehlen
+
+compiler.err.improperly.formed.type.inner.raw.param=Falsch formatierter Typ. Typargumente f\u00FCr Raw-Typ angegeben
+
+# 0: type, 1: type
+compiler.err.incomparable.types=Nicht vergleichbare Typen: {0} und {1}
+
+# 0: string
+compiler.err.int.number.too.large=Ganzzahl zu gro\u00DF
+
+compiler.err.intf.annotation.members.cant.have.params=Elemente in Annotationsschnittstellendeklarationen k\u00F6nnen keine formalen Parameter deklarieren
+
+# 0: symbol
+compiler.err.intf.annotation.cant.have.type.params=Annotationsschnittstelle {0} darf nicht generisch sein
+
+compiler.err.intf.annotation.members.cant.have.type.params=Elemente in Annotationsschnittstellendeklarationen k\u00F6nnen keine generischen Methoden sein
+
+# 0: symbol, 1: type
+compiler.err.intf.annotation.member.clash=Annotationsschnittstelle {1} deklariert ein Element mit demselben Namen wie Methode {0}
+
+compiler.err.intf.expected.here=Hier wird eine Schnittstelle erwartet
+
+compiler.err.intf.meth.cant.have.body=Abstrakte Schnittstellenmethoden k\u00F6nnen keinen Body enthalten
+
+compiler.err.invalid.annotation.member.type=Ung\u00FCltiger Typ f\u00FCr Annotationsschnittstellenelement
+
+compiler.err.invalid.binary.number=Bin\u00E4rzahlen m\u00FCssen mindestens eine Bin\u00E4rziffer enthalten
+
+compiler.err.invalid.hex.number=Hexadezimalzahlen m\u00FCssen mindestens eine Hexadezimalziffer enthalten
+
+compiler.err.invalid.meth.decl.ret.type.req=Ung\u00FCltige Methodendeklaration. R\u00FCckgabetyp erforderlich
+
+compiler.err.varargs.and.old.array.syntax=Legacy-Arraynotation f\u00FCr Parameter mit variabler Argumentanzahl nicht zul\u00E4ssig
+
+compiler.err.varargs.and.receiver =varargs-Notation f\u00FCr receiver-Parameter nicht zul\u00E4ssig
+
+compiler.err.varargs.must.be.last =varargs-Parameter muss der letzte Parameter sein
+
+compiler.err.array.and.receiver =Legacy-Arraynotation f\u00FCr receiver-Parameter nicht zul\u00E4ssig
+
+compiler.err.wrong.receiver =Falscher receiver-Parametername
+
+compiler.err.variable.not.allowed=Variablendeklaration hier nicht zul\u00E4ssig
+
+# 0: name
+compiler.err.label.already.in.use=Label {0} wird bereits verwendet
+
+# 0: symbol
+compiler.err.local.var.accessed.from.icls.needs.final=Auf lokale Variable {0} wird von innerer Klasse zugegriffen. Sie muss als final deklariert werden
+
+compiler.err.local.enum=Enum-Klassen d\u00FCrfen nicht lokal sein
+
+compiler.err.cannot.create.array.with.type.arguments=Array kann nicht mit Typargumenten erstellt werden
+
+compiler.err.cannot.create.array.with.diamond=Array kann nicht mit "<>" erstellt werden
+
+compiler.err.invalid.module.directive=Moduldirektiven-Schl\u00FCsselwort oder "}" erwartet
+
+#
+# limits.  We don't give the limits in the diagnostic because we expect
+# them to change, yet we want to use the same diagnostic.  These are all
+# detected during code generation.
+#
+compiler.err.limit.code=Code zu gro\u00DF
+
+compiler.err.limit.code.too.large.for.try.stmt=Code f\u00FCr try-Anweisung zu gro\u00DF
+
+compiler.err.limit.dimensions=Arraytyp hat zu viele Dimensionen
+
+compiler.err.limit.locals=Zu viele lokale Variablen
+
+compiler.err.limit.parameters=Zu viele Parameter
+
+compiler.err.limit.pool=Zu viele Konstanten
+
+compiler.err.limit.pool.in.class=Zu viele Konstanten in Klasse {0}
+
+compiler.err.limit.stack=Code erfordert zu viel Stack
+
+compiler.err.limit.string=Konstantenzeichenfolge zu lang
+
+# 0: string
+compiler.err.limit.string.overflow=UTF8-Darstellung f\u00FCr Zeichenfolge "{0}..." ist zu lang f\u00FCr den Konstantenpool
+
+compiler.err.malformed.fp.lit=Nicht wohlgeformtes Gleitkommaliteral
+
+compiler.err.method.does.not.override.superclass=Methode \u00FCberschreibt oder implementiert keine Methode aus einem Supertyp
+
+compiler.err.static.methods.cannot.be.annotated.with.override=Statische Methoden k\u00F6nnen nicht mit @Override-Annotation versehen werden
+
+compiler.err.missing.meth.body.or.decl.abstract=Methodenbody fehlt oder als abstrakt deklarieren
+
+compiler.err.missing.ret.stmt=R\u00FCckgabeanweisung fehlt
+
+# 0: type
+compiler.misc.missing.ret.val=R\u00FCckgabewert fehlt
+
+compiler.misc.unexpected.ret.val=Unerwarteter R\u00FCckgabewert
+
+# 0: set of flag
+compiler.err.mod.not.allowed.here=Modifikator {0} hier nicht zul\u00E4ssig
+
+# 0: name
+compiler.err.modifier.not.allowed.here=Modifikator {0} hier nicht zul\u00E4ssig
+
+compiler.err.intf.not.allowed.here=Schnittstelle hier nicht zul\u00E4ssig
+
+# 0: symbol, 1: symbol
+compiler.err.name.clash.same.erasure=Namenskonflikt: {0} und {1} haben dieselbe Erasure
+
+# 0: name, 1: list of type, 2: symbol, 3: name, 4: list of type, 5: symbol
+compiler.err.name.clash.same.erasure.no.override=Namenskonflikt: {0}({1}) in {2} und {3}({4}) in {5} haben dieselbe Erasure, aber keine setzt die andere au\u00DFer Kraft
+
+# 0: string, 1: name, 2: name, 3: list of type, 4: symbol, 5: name, 6: list of type, 7: symbol
+compiler.err.name.clash.same.erasure.no.override.1=Namenskonflikt: {0} {1} hat zwei Methoden mit derselben Erasure, aber keine setzt die andere au\u00DFer Kraft\nErste Methode: {2}({3}) in {4}\nZweite Methode: {5}({6}) in {7}
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.err.name.clash.same.erasure.no.hide=Namenskonflikt: {0} in {1} und {2} in {3} haben dieselbe Erasure, aber keine blendet die andere aus
+
+compiler.err.name.reserved.for.internal.use={0} ist f\u00FCr den internen Gebrauch reserviert
+
+compiler.err.native.meth.cant.have.body=Native Methoden k\u00F6nnen keinen Body enthalten
+
+
+# 0: message segment
+compiler.misc.incompatible.type.in.conditional=Ung\u00FCltiger Typ in Bedingungsausdruck\n{0}
+
+compiler.misc.conditional.target.cant.be.void=target-type f\u00FCr Bedingungsausdruck darf nicht "void" sein
+
+compiler.misc.switch.expression.target.cant.be.void=target-type f\u00FCr Switch-Ausdruck darf nicht "void" sein
+
+# 0: message segment
+compiler.misc.incompatible.type.in.switch.expression=Ung\u00FCltiger Typ in Switch-Ausdruck\n{0}
+
+# 0: message segment
+compiler.misc.incompatible.ret.type.in.lambda=Ung\u00FCltiger R\u00FCckgabetyp in Lambda-Ausdruck\n{0}
+
+compiler.misc.stat.expr.expected=Lambda-Body ist nicht mit einer void-Funktionsschnittstelle kompatibel\n(verwenden Sie stattdessen einen Block-Lambda-Body oder einen Anweisungsausdruck)
+
+# 0: message segment
+compiler.misc.incompatible.ret.type.in.mref=Ung\u00FCltiger R\u00FCckgabetyp in Methodenreferenz\n{0}
+
+compiler.err.lambda.body.neither.value.nor.void.compatible=Lambda-Body ist weder mit Wert noch mit "void "kompatibel
+
+# 0: list of type
+compiler.err.incompatible.thrown.types.in.mref=Inkompatible ausgel\u00F6ste Typen {0} in Funktionsausdruck
+
+compiler.misc.incompatible.arg.types.in.lambda=Inkompatible Parametertypen in Lambda-Ausdruck
+
+compiler.misc.incompatible.arg.types.in.mref=Inkompatible Parametertypen in Methodenreferenz
+
+compiler.err.new.not.allowed.in.annotation="new" in einer Annotation nicht zul\u00E4ssig
+
+# 0: name, 1: type
+compiler.err.no.annotation.member=Kein Annotationsmitglied {0} in {1}
+
+# 0: symbol
+compiler.err.no.encl.instance.of.type.in.scope=Keine einschlie\u00DFende Instanz vom Typ {0} im Geltungsbereich
+
+compiler.err.no.intf.expected.here=Hier wird keine Schnittstelle erwartet
+
+compiler.err.no.match.entry={0} hat keine \u00DCbereinstimmung im Eintrag in {1}. {2} erforderlich
+
+# 0: type
+compiler.err.not.annotation.type={0} ist keine Annotationsschnittstelle
+
+# 0: symbol, 1: symbol, 2: message segment
+compiler.err.not.def.access.package.cant.access={0} ist nicht sichtbar\n({2})
+
+# 0: symbol, 1: symbol, 2: message segment
+compiler.misc.not.def.access.package.cant.access={0} ist nicht sichtbar\n({2})
+
+# 0: symbol, 1: message segment
+compiler.err.package.not.visible=Package {0} ist nicht sichtbar\n({1})
+
+# 0: symbol, 1: message segment
+compiler.misc.package.not.visible=Package {0} ist nicht sichtbar\n({1})
+
+# {0} - current module
+# {1} - package in which the invisible class is declared
+# {2} - module in which {1} is declared
+# 0: symbol, 1: symbol, 2: symbol
+compiler.misc.not.def.access.does.not.read=Package {1} wird in Modul {2} deklariert, aber nicht von Modul {0} gelesen
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.does.not.read.from.unnamed=Package {0} wird in Modul {1} deklariert, das nicht im Moduldiagramm enthalten ist
+
+# {0} - package in which the invisible class is declared
+# {1} - current module
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.does.not.read.unnamed=Package {0} wird im unbenannten Modul deklariert, aber nicht von Modul {1} gelesen
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.not.exported=Package {0} wird in Modul {1} deklariert, aber nicht exportiert
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.not.exported.from.unnamed=Package {0} wird in Modul {1} deklariert, aber nicht exportiert
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# {2} - current module
+# 0: symbol, 1: symbol, 2: symbol
+compiler.misc.not.def.access.not.exported.to.module=Package {0} wird in Modul {1} deklariert, aber nicht in Modul {2} exportiert
+
+# {0} - package in which the invisible class is declared
+# {1} - module in which {0} is declared
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.not.exported.to.module.from.unnamed=Package {0} wird in Modul {1} deklariert, aber nicht in das unbenannte Modul exportiert
+
+# 0: symbol, 1: symbol
+compiler.err.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zug\u00E4nglichen Klasse oder Schnittstelle definiert
+
+# 0: symbol, 1: symbol
+compiler.misc.not.def.access.class.intf.cant.access={1}.{0} ist in einer nicht zug\u00E4nglichen Klasse oder Schnittstelle definiert
+
+# 0: symbol, 1: symbol, 2: symbol, 3: message segment
+compiler.err.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zug\u00E4nglich\n({3})
+
+# 0: symbol, 1: symbol, 2: symbol, 3: message segment
+compiler.misc.not.def.access.class.intf.cant.access.reason={1}.{0} in Package {2} ist nicht zug\u00E4nglich\n({3})
+
+# 0: symbol, 1: list of type, 2: type
+compiler.misc.cant.access.inner.cls.constr=Zugriff auf Konstruktor {0}({1}) nicht m\u00F6glich\nEinschlie\u00DFende Instanz vom Typ {2} ist nicht im Geltungsbereich
+
+# 0: symbol, 1: symbol
+compiler.err.not.def.public.cant.access={0} ist nicht \u00F6ffentlich in {1}. Zugriff von externem Package nicht m\u00F6glich
+
+# 0: symbol, 1: symbol
+compiler.err.not.def.public={0} ist nicht \u00F6ffentlich in {1}
+
+# 0: symbol, 1: symbol
+compiler.misc.not.def.public.cant.access={0} ist nicht \u00F6ffentlich in {1}. Zugriff von externem Package nicht m\u00F6glich
+
+# 0: name
+compiler.err.not.loop.label=Kein Schleifenlabel: {0}
+
+compiler.err.not.stmt=Keine Anweisung
+
+# 0: symbol
+compiler.err.not.encl.class=Keine einschlie\u00DFende Klasse: {0}
+
+# 0: name, 1: type
+compiler.err.operator.cant.be.applied=Ung\u00FCltiger Operandentyp {1} f\u00FCr un\u00E4ren Operator "{0}"
+
+# 0: name, 1: type, 2: type
+compiler.err.operator.cant.be.applied.1=Ung\u00FCltige Operandentypen f\u00FCr un\u00E4ren Operator "{0}"\nErster Typ: {1}\nZweiter Typ: {2}
+
+compiler.err.pkg.annotations.sb.in.package-info.java=Packageannotationen m\u00FCssen in der Datei package-info.java vorhanden sein
+
+compiler.err.no.pkg.in.module-info.java=Packagedeklarationen in Datei module-info.java nicht zul\u00E4ssig
+
+# 0: symbol
+compiler.err.pkg.clashes.with.class.of.same.name=Es besteht ein Konflikt zwischen dem Package {0} und einer gleichnamigen Klasse
+
+compiler.err.warnings.and.werror=Warnungen gefunden und -Werror angegeben
+
+# Errors related to annotation processing
+
+# 0: symbol, 1: message segment, 2: string (stack-trace)
+compiler.err.proc.cant.access=Kein Zugriff auf {0}\n{1}\nDetails finden Sie im folgenden Stacktrace.\n{2}
+
+# 0: symbol, 1: message segment
+compiler.err.proc.cant.access.1=Kein Zugriff auf {0}\n{1}
+
+# 0: string
+compiler.err.proc.cant.find.class=Klassendatei f\u00FCr "{0}" konnte nicht gefunden werden.
+
+# 0: string
+compiler.err.proc.cant.load.class=Prozessorklassendatei konnte nicht geladen werden. Grund: "{0}".
+
+# Print a client-generated error message; assumed to be localized, no translation required
+# 0: string
+compiler.err.proc.messager={0}
+
+# 0: string
+compiler.misc.exception.message={0}
+
+compiler.misc.user.selected.completion.failure=Von Benutzer ausgew\u00E4hlter Abschlussfehler nach Klassenname
+
+# 0: collection of string
+compiler.err.proc.no.explicit.annotation.processing.requested=Klassennamen "{0}" werden nur akzeptiert, wenn die Annotationsverarbeitung explizit angefordert wird
+
+compiler.err.proc.no.service=ServiceLoader konnte nicht verwendet werden und ist f\u00FCr Annotationsverarbeitung erforderlich.
+
+# 0: string, 1: string
+compiler.err.proc.processor.bad.option.name=Ung\u00FCltiger Optionsname "{0}" von Prozessor "{1}" angegeben
+
+# 0: string
+compiler.err.proc.processor.cant.instantiate=Instanz von Prozessor "{0}" konnte nicht instanziiert werden
+
+# 0: string
+compiler.err.proc.processor.not.found=Annotationsprozessor "{0}" nicht gefunden
+
+# 0: string
+compiler.err.proc.processor.wrong.type=Annotationsprozessor "{0}" implementiert nicht javax.annotation.processing.Processor
+
+compiler.err.proc.service.problem=Fehler beim Erstellen eines Service-Loaders zum Laden von Prozessoren.
+
+# 0: string
+compiler.err.proc.bad.config.file=Ung\u00FCltige Servicekonfigurationsdatei, oder Ausnahme beim Erstellen des Prozessorobjekts ausgel\u00F6st: {0}
+
+compiler.err.proc.cant.create.loader=Class Loader konnte nicht f\u00FCr Annotationsprozessoren erstellt werden: {0}
+
+# 0: symbol
+compiler.err.qualified.new.of.static.class="new" von statischer Klasse qualifiziert
+
+compiler.err.recursive.ctor.invocation=Rekursiver Konstruktoraufruf
+
+# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
+compiler.err.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen \u00FCberein
+
+# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
+compiler.misc.ref.ambiguous=Referenz zu {0} ist mehrdeutig\nSowohl {1} {2} in {3} als auch {4} {5} in {6} stimmen \u00FCberein
+
+compiler.err.repeated.annotation.target=Wiederholtes Annotationsziel
+
+compiler.err.repeated.interface=Wiederholte Schnittstelle
+
+compiler.err.repeated.modifier=Wiederholter Modifikator
+
+# 0: symbol, 1: set of modifier, 2: symbol
+compiler.err.report.access={0} hat {1}-Zugriff in {2}
+
+# 0: symbol, 1: set of modifier, 2: symbol
+compiler.misc.report.access={0} hat {1}-Zugriff in {2}
+
+compiler.err.ret.outside.meth=R\u00FCckgabe au\u00DFerhalb von Methode
+
+compiler.err.signature.doesnt.match.supertype=Signatur stimmt nicht mit {0} \u00FCberein. Inkompatibler Supertyp
+
+compiler.err.signature.doesnt.match.intf=Signatur stimmt nicht mit {0} \u00FCberein. Inkompatible Schnittstellen
+
+# 0: symbol, 1: symbol, 2: symbol
+compiler.err.does.not.override.abstract={0} ist nicht abstrakt und setzt die abstrakte Methode {1} in {2} nicht au\u00DFer Kraft
+
+# 0: file object
+compiler.err.source.cant.overwrite.input.file=Fehler beim Schreiben von Quelle. Eingabedatei {0} kann nicht \u00FCberschrieben werden
+
+# 0: symbol
+compiler.err.stack.sim.error=Interner Fehler: Stacksimulationsfehler in {0}
+
+compiler.err.static.imp.only.classes.and.interfaces=Statischer Import nur aus Klassen und Schnittstellen
+
+compiler.err.string.const.req=Konstanten-Zeichenfolgenausdruck erforderlich
+
+compiler.err.pattern.expected=Typmuster erwartet
+
+# 0: symbol, 1: fragment
+compiler.err.cannot.generate.class=Fehler beim Generieren der Klasse {0}\n({1})
+
+# 0: symbol, 1: symbol
+compiler.misc.synthetic.name.conflict=Das Symbol {0} steht mit einem vom Compiler synthetisierten Symbol in {1} in Konflikt
+
+# 0: symbol, 1: type
+compiler.misc.illegal.signature=Unzul\u00E4ssiges Signaturattribut f\u00FCr Typ {1}
+
+compiler.err.throws.not.allowed.in.intf.annotation=Throws-Klausel in @interface-Mitgliedern nicht zul\u00E4ssig
+
+compiler.err.try.without.catch.finally.or.resource.decls="try" ohne "catch", "finally" oder Ressourcendeklarationen
+
+# 0: symbol
+compiler.err.type.doesnt.take.params=Typ {0} akzeptiert keine Parameter
+
+compiler.err.type.var.cant.be.deref=Auswahl aus Typvariable nicht m\u00F6glich
+
+compiler.err.type.var.may.not.be.followed.by.other.bounds=Auf eine Typvariable d\u00FCrfen keine anderen Begrenzungen folgen
+
+compiler.err.type.var.more.than.once=Typvariable {0} tritt mehrmals im Ergebnistyp von {1} auf. Sie muss instanziiert werden
+
+compiler.err.type.var.more.than.once.in.result=Typvariable {0} tritt mehrmals im Typ von {1} auf. Sie muss instanziiert werden
+
+# 0: type, 1: type, 2: fragment
+compiler.err.types.incompatible=Die Typen {0} und {1} sind inkompatibel.\n{2}
+
+# 0: name, 1: list of type
+compiler.misc.incompatible.diff.ret=Beide definieren {0}({1}), aber mit nicht verwandten R\u00FCckgabetypen
+
+# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
+compiler.misc.incompatible.unrelated.defaults={0} {1} erbt nicht verwandte Standardwerte f\u00FCr {2}({3}) von Typen {4} und {5}
+
+# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
+compiler.misc.incompatible.abstract.default={0} {1} erbt abstrakte und Standardmethode f\u00FCr {2}({3}) von Typen {4} und {5}
+
+# 0: name, 1: kind name, 2: symbol
+compiler.err.default.overrides.object.member=Standardmethode {0} in {1} {2} setzt ein Mitglied von java.lang.Object au\u00DFer Kraft
+
+# 0: type
+compiler.err.illegal.static.intf.meth.call=Unzul\u00E4ssiger statischer Schnittstellenmethodenaufruf\nDer Empf\u00E4ngerausdruck muss durch den Typ-Qualifier "{0}" ersetzt werden
+
+# 0: symbol or type, 1: message segment
+compiler.err.illegal.default.super.call=Ung\u00FCltiger Typ-Qualifier {0} in Standardsuperaufruf\n{1}
+
+# 0: symbol, 1: type
+compiler.misc.overridden.default=Methode {0} wird in {1} au\u00DFer Kraft gesetzt
+
+# 0: symbol, 1: type or symbol
+compiler.misc.redundant.supertype=Redundante Schnittstelle {0} wird durch {1} erweitert
+
+compiler.err.unclosed.char.lit=Nicht geschlossenes Zeichenliteral
+
+compiler.err.unclosed.comment=Nicht geschlossener Kommentar
+
+compiler.err.unclosed.str.lit=Nicht geschlossenes Zeichenfolgenliteral
+
+compiler.err.unclosed.text.block=Nicht geschlossener Textblock
+
+# 0: string
+compiler.err.unsupported.encoding=Nicht unterst\u00FCtzte Codierung: {0}
+
+compiler.err.io.exception=Fehler beim Lesen der Quelldatei: {0}
+
+# 0: name
+compiler.err.undef.label=Nicht definiertes Label: {0}
+
+# 0: name
+compiler.err.illegal.ref.to.restricted.type=Unzul\u00E4ssige Referenz zu eingeschr\u00E4nktem Typ "{0}"
+
+# 0: name
+compiler.warn.illegal.ref.to.restricted.type=Unzul\u00E4ssige Referenz zu eingeschr\u00E4nktem Typ "{0}"
+
+# 0: name, 1: source
+compiler.err.restricted.type.not.allowed="{0}" ist hier nicht zul\u00E4ssig\nAb Release {1} ist "{0}" ein eingeschr\u00E4nkter Typname, der nicht f\u00FCr Typdeklarationen verwendet werden kann
+
+# 0: name, 1: source
+compiler.warn.restricted.type.not.allowed=Ab Release {1} ist "{0}" ein eingeschr\u00E4nkter Typname, der nicht f\u00FCr Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
+
+# 0: name, 1: source
+compiler.warn.restricted.type.not.allowed.preview="{0}" kann in einem zuk\u00FCnftigen Release ein eingeschr\u00E4nkter Typname werden, der nicht f\u00FCr Typdeklarationen oder als Elementtyp eines Arrays verwendet werden kann
+
+# 0: name (variable), 1: message segment
+compiler.err.cant.infer.local.var.type=Typ f\u00FCr lokale Variable {0} kann nicht abgeleitet werden\n({1})
+
+# 0: name
+compiler.err.restricted.type.not.allowed.here="{0}" ist hier nicht zul\u00E4ssig
+
+# 0: name
+compiler.err.restricted.type.not.allowed.array="{0}" ist nicht als Elementtyp eines Arrays zul\u00E4ssig
+
+# 0: name
+compiler.err.restricted.type.not.allowed.compound="{0}" ist nicht in einer zusammengesetzten Deklaration zul\u00E4ssig
+
+# 0: fragment
+compiler.err.invalid.lambda.parameter.declaration=Ung\u00FCltige Lambda-Parameterdeklaration\n({0})
+
+compiler.misc.implicit.and.explicit.not.allowed=Implizit typisierte Parameter k\u00F6nnen nicht mit explizit typisierten Parametern gemischt werden
+
+compiler.misc.var.and.explicit.not.allowed="var" kann nicht mit explizit typisierten Parametern gemischt werden
+
+compiler.misc.var.and.implicit.not.allowed="var" kann nicht mit implizit typisierten Parametern gemischt werden
+
+compiler.misc.local.cant.infer.null=Variablen-Initializer ist "null"
+
+compiler.misc.local.cant.infer.void=Variablen-Initializer ist "void"
+
+compiler.misc.local.missing.init="var" kann nicht f\u00FCr Variable ohne Initializer verwendet werden
+
+compiler.misc.local.lambda.missing.target=Lambda-Ausdruck erfordert einen expliziten Zieltyp
+
+compiler.misc.local.mref.missing.target=Methodenreferenz erfordert einen expliziten Zieltyp
+
+compiler.misc.local.array.missing.target=Array-Initializer erfordert einen expliziten Zieltyp
+
+compiler.misc.local.self.ref="var" kann nicht f\u00FCr selbstreferenzierende Variable verwendet werden
+
+# 0: message segment, 1: unused
+compiler.err.cant.apply.diamond=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden
+
+# 0: message segment or type, 1: message segment
+compiler.err.cant.apply.diamond.1=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden\nGrund: {1}
+
+# 0: message segment or type, 1: message segment
+compiler.misc.cant.apply.diamond.1=Typargumente f\u00FCr {0} k\u00F6nnen nicht abgeleitet werden\nGrund: {1}
+
+compiler.err.unreachable.stmt=Nicht erreichbare Anweisung
+
+compiler.err.not.exhaustive=Der Switch-Ausdruck deckt nicht alle m\u00F6glichen Eingabewerte ab
+
+compiler.err.not.exhaustive.statement=Die Switch-Anweisung deckt nicht alle m\u00F6glichen Eingabewerte ab
+
+compiler.err.initializer.must.be.able.to.complete.normally=Initializer muss normal abgeschlossen werden k\u00F6nnen
+
+compiler.err.initializer.not.allowed=Initializer in Schnittstellen nicht zul\u00E4ssig
+
+# 0: type
+compiler.err.unreported.exception.need.to.catch.or.throw=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgel\u00F6st zu werden
+
+# 0: type
+compiler.err.unreported.exception.default.constructor=Nicht gemeldete Ausnahme {0} in Standardkonstruktor
+
+# 0: type, 1: name
+compiler.err.unreported.exception.implicit.close=Nicht gemeldete Ausnahme {0}. Muss abgefangen oder deklariert werden, um ausgel\u00F6st zu werden\nAusnahme bei implizitem Aufruf von close() f\u00FCr Ressourcenvariable "{1}" ausgel\u00F6st
+
+compiler.err.void.not.allowed.here="void"-Typ hier nicht zul\u00E4ssig
+
+# 0: string
+compiler.err.wrong.number.type.args=Falsche Anzahl Typargumente. {0} erforderlich
+
+# 0: symbol
+compiler.err.var.might.already.be.assigned=Variable {0} wurde m\u00F6glicherweise bereits zugewiesen
+
+# 0: symbol
+compiler.err.var.might.not.have.been.initialized=Variable {0} wurde m\u00F6glicherweise nicht initialisiert
+
+# 0: symbol
+compiler.err.var.not.initialized.in.default.constructor=Variable {0} nicht im Standardkonstruktor initialisiert
+
+# 0: symbol
+compiler.err.var.might.be.assigned.in.loop=Variable {0} wurde m\u00F6glicherweise in Schleife zugewiesen
+
+# 0: symbol, 1: message segment
+compiler.err.varargs.invalid.trustme.anno=Ung\u00FCltige {0}-Annotation. {1}
+
+# 0: type
+compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs-Elementtyp {0} ist reifizierbar.
+
+# 0: type, 1: type
+compiler.err.instanceof.reifiable.not.safe={0} kann nicht sicher in {1} konvertiert werden
+
+# 0: type, 1: type
+compiler.err.instanceof.pattern.no.subtype=Ausdruckstyp {0} ist ein Subtyp des Mustertyps {1}
+
+# 0: symbol
+compiler.misc.varargs.trustme.on.non.varargs.meth=Methode {0} ist keine varargs-Methode.
+
+# 0: symbol
+compiler.misc.varargs.trustme.on.non.varargs.accessor=Accessor {0} ist keine varargs-Methode.
+
+# 0: symbol
+compiler.misc.varargs.trustme.on.virtual.varargs=Instanzmethode {0} ist weder final noch privat.
+
+# 0: symbol
+compiler.misc.varargs.trustme.on.virtual.varargs.final.only=Instanzmethode {0} ist nicht final.
+
+# 0: type, 1: symbol kind, 2: symbol
+compiler.misc.inaccessible.varargs.type=Auf den formalen varargs-Elementtyp {0} kann nicht von {1} {2} zugegriffen werden
+
+# In the following string, {1} will always be the detail message from
+# java.io.IOException.
+# 0: symbol, 1: string
+compiler.err.class.cant.write=Fehler beim Schreiben von {0}: {1}
+
+# In the following string, {0} is the name of the class in the Java source.
+# It really should be used two times..
+# 0: kind name, 1: name
+compiler.err.class.public.should.be.in.file={0} {1} ist \u00F6ffentlich und muss in einer Datei namens {1}.java deklariert werden
+
+## All errors which do not refer to a particular line in the source code are
+## preceded by this string.
+compiler.err.error=Fehler: 
+
+# The following error messages do not refer to a line in the source code.
+compiler.err.cant.read.file=Lesen nicht m\u00F6glich: {0}
+
+# 0: string
+compiler.err.plugin.not.found=Plug-in nicht gefunden: {0}
+
+# 0: path
+compiler.warn.locn.unknown.file.on.module.path=Unbekannte Datei in Modulpfad: {0}
+
+
+# 0: path
+compiler.err.locn.bad.module-info=Problem beim Lesen von module-info.class in {0}
+
+# 0: path
+compiler.err.locn.cant.read.directory=Verzeichnis {0} kann nicht gelesen werden
+
+# 0: path
+compiler.err.locn.cant.read.file=Datei {0} kann nicht gelesen werden
+
+# 0: path
+compiler.err.locn.cant.get.module.name.for.jar=Modulname f\u00FCr {0} kann nicht bestimmt werden
+
+# 0: path
+compiler.err.multi-module.outdir.cannot.be.exploded.module=Im Modus f\u00FCr mehrere Module kann das Ausgabeverzeichnis kein entpacktes Modul sein: {0}
+
+# 0: path
+compiler.warn.outdir.is.in.exploded.module=Das Ausgabeverzeichnis befindet sich in einem entpackten Modul: {0}
+
+# 0: file object
+compiler.err.locn.module-info.not.allowed.on.patch.path=module-info.class nicht in Patchpfad zul\u00E4ssig: {0}
+
+# 0: string
+compiler.err.locn.invalid.arg.for.xpatch=Ung\u00FCltiges Argument f\u00FCr --patch-module-Option: {0}
+
+compiler.err.file.sb.on.source.or.patch.path.for.module=Datei muss sich im Quellpfad oder im Patchpfad f\u00FCr das Modul befinden
+
+compiler.err.no.java.lang=Package java.lang kann in Plattformklassen nicht gefunden werden
+
+#####
+
+# Fatal Errors
+
+# 0: name
+compiler.misc.fatal.err.cant.locate.meth=Schwerwiegender Fehler: Methode {0} kann nicht gefunden werden
+
+# 0: name
+compiler.misc.fatal.err.cant.locate.field=Schwerwiegender Fehler: Feld {0} kann nicht gefunden werden
+
+# 0: type
+compiler.misc.fatal.err.cant.locate.ctor=Schwerwiegender Fehler: Konstruktor f\u00FCr {0} kann nicht gefunden werden
+
+compiler.misc.fatal.err.cant.close=Schwerwiegender Fehler: Compiler-Ressourcen k\u00F6nnen nicht geschlossen werden
+
+#####
+
+##
+## miscellaneous strings
+##
+
+compiler.misc.diamond.anonymous.methods.implicitly.override=(aufgrund von <> muss jede nicht private Methode, die in dieser anonymen Klasse deklariert ist, eine Methode aus einem Supertyp au\u00DFer Kraft setzen oder implementieren)
+
+compiler.misc.source.unavailable=(Quelle nicht verf\u00FCgbar)
+
+compiler.misc.base.membership=Alle Basisklassen geh\u00F6ren zu dieser Gruppe
+
+# 0: string, 1: string, 2: boolean
+compiler.misc.x.print.processor.info=Prozessor {0} entspricht {1} und gibt {2} zur\u00FCck.
+
+# 0: number, 1: string, 2: set of symbol, 3: boolean
+compiler.misc.x.print.rounds=Runde {0}:\n\tEingabedateien: {1}\n\tAnnotationen: {2}\n\tLetzte Runde: {3}
+
+# 0: file name
+compiler.warn.file.from.future=\u00C4nderungsdatum liegt in der Zukunft f\u00FCr Datei {0}
+
+#####
+
+## The following string will appear before all messages keyed as:
+## "compiler.note".
+
+compiler.note.compressed.diags=Einige Meldungen wurden vereinfacht. Wiederholen Sie die Kompilierung mit -Xdiags:verbose, um die vollst\u00E4ndige Ausgabe abzurufen
+
+# 0: boolean, 1: symbol
+compiler.note.lambda.stat=Lambda-Ausdruck wird \u00FCbersetzt\nAlternative Metafactory = {0}\nSynthetische Methode = {1}
+
+# 0: boolean, 1: unused
+compiler.note.mref.stat=Methodenreferenz wird \u00FCbersetzt\nAlternative Metafactory = {0}\n
+# 0: boolean, 1: symbol
+compiler.note.mref.stat.1=Methodenreferenz wird \u00FCbersetzt\nAlternative Metafactory = {0}\nBridgemethode = {1}
+
+compiler.note.note=Hinweis: 
+
+# 0: file name
+compiler.note.deprecated.filename={0} verwendet oder \u00FCberschreibt eine veraltete API.
+
+compiler.note.deprecated.plural=Einige Eingabedateien verwenden oder \u00FCberschreiben eine veraltete API.
+
+# The following string may appear after one of the above deprecation
+# messages.
+compiler.note.deprecated.recompile=Wiederholen Sie die Kompilierung mit -Xlint:deprecation, um Details zu erhalten.
+
+# 0: file name
+compiler.note.deprecated.filename.additional={0} hat weitere Verwendungen oder Overrides einer veralteten API.
+
+compiler.note.deprecated.plural.additional=Einige Eingabedateien verwenden oder \u00FCberschreiben zus\u00E4tzlich eine veraltete API.
+
+# 0: file name
+compiler.note.removal.filename={0} verwendet oder \u00FCberschreibt eine veraltete API, die zum Entfernen markiert ist.
+
+compiler.note.removal.plural=Einige Eingabedateien verwenden oder \u00FCberschreiben eine veraltete API, die zum Entfernen markiert ist.
+
+# The following string may appear after one of the above removal messages.
+compiler.note.removal.recompile=Wiederholen Sie die Kompilierung mit -Xlint:removal, um Details zu erhalten.
+
+# 0: file name
+compiler.note.removal.filename.additional={0} hat weitere Verwendungen oder Overrides einer veralteten API, die zum Entfernen markiert ist.
+
+compiler.note.removal.plural.additional=Einige Eingabedateien verwenden oder \u00FCberschreiben zus\u00E4tzlich eine veraltete API, die zum Entfernen markiert ist.
+
+# 0: file name
+compiler.note.unchecked.filename={0} verwendet nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+
+compiler.note.unchecked.plural=Einige Eingabedateien verwenden nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+
+# The following string may appear after one of the above unchecked messages.
+compiler.note.unchecked.recompile=Wiederholen Sie die Kompilierung mit -Xlint:unchecked, um Details zu erhalten.
+
+# 0: file name
+compiler.note.unchecked.filename.additional={0} weist weitere nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge auf.
+
+compiler.note.unchecked.plural.additional=Einige Eingabedateien verwenden zus\u00E4tzlich nicht gepr\u00FCfte oder unsichere Vorg\u00E4nge.
+
+# 0: file name, 1: source
+compiler.note.preview.filename={0} verwendet Vorschaufeatures von Java SE {1}.
+
+# 0: source
+compiler.note.preview.plural=Einige Eingabedateien verwenden Vorschaufeatures von Java SE {0}.
+
+# The following string may appear after one of the above deprecation
+# messages.
+compiler.note.preview.recompile=Wiederholen Sie die Kompilierung mit -Xlint:preview, um Details zu erhalten.
+
+# 0: file name, 1: source
+compiler.note.preview.filename.additional={0} hat weitere Verwendungen von Vorschaufeatures von Java SE {1}.
+
+# 0: source
+compiler.note.preview.plural.additional=Einige Eingabedateien verwenden zus\u00E4tzlich Vorschaufeatures von Java SE {0}.
+
+# Notes related to annotation processing
+
+# Print a client-generated note; assumed to be localized, no translation required
+# 0: string
+compiler.note.proc.messager={0}
+
+# 0: string, 1: string, 2: string
+compiler.note.multiple.elements=Mehrere Elemente namens "{1}" in Modulen "{2}" wurden von javax.lang.model.util.Elements.{0} gefunden.
+
+#####
+
+# 0: number
+compiler.misc.count.error={0} Fehler
+
+# 0: number
+compiler.misc.count.error.plural={0} Fehler
+
+# 0: number, 1: number
+compiler.misc.count.error.recompile=Nur die ersten {0} Fehler von insgesamt {1} werden angezeigt. Mit -Xmaxerrs k\u00F6nnen Sie mehr Fehler anzeigen
+
+# 0: number, 1: number
+compiler.misc.count.warn.recompile=Nur die ersten {0} Warnungen von insgesamt {1} werden angezeigt. Mit -Xmaxwarns k\u00F6nnen Sie mehr Warnungen anzeigen
+
+# 0: number
+compiler.misc.count.warn={0} Warnung
+
+# 0: number
+compiler.misc.count.warn.plural={0} Warnungen
+
+compiler.misc.version.not.available=(Versionsinformationen nicht verf\u00FCgbar)
+
+## extra output when using -verbose (JavaCompiler)
+
+# 0: symbol
+compiler.misc.verbose.checking.attribution=[{0} wird gepr\u00FCft]
+
+# 0: string
+compiler.misc.verbose.parsing.done=[Parsen abgeschlossen: {0} ms]
+
+# 0: file name
+compiler.misc.verbose.parsing.started=[Parsen gestartet: {0}]
+
+# 0: string
+compiler.misc.verbose.total=[{0} ms gesamt]
+
+# 0: file name
+compiler.misc.verbose.wrote.file=[{0} geschrieben]
+
+## extra output when using -verbose (code/ClassReader)
+# 0: string
+compiler.misc.verbose.loading=[{0} wird geladen]
+
+# 0: string
+compiler.misc.verbose.sourcepath=[Suchpfad f\u00FCr Quelldateien: {0}]
+
+# 0: string
+compiler.misc.verbose.classpath=[Suchpfad f\u00FCr Klassendateien: {0}]
+
+## extra output when using -prompt (util/Log)
+compiler.misc.resume.abort=F)ortsetzen, A)bbruch>
+
+#####
+
+##
+## warnings
+##
+
+## All warning messages are preceded by the following string.
+compiler.warn.warning=Warnung: 
+
+## Warning messages may also include the following prefix to identify a
+## lint option
+# 0: option name
+compiler.warn.lintOption=[{0}] 
+
+# 0: symbol
+compiler.warn.constant.SVUID=serialVersionUID muss Konstante in Klasse {0} sein
+
+# 0: path
+compiler.warn.dir.path.element.not.found=Ung\u00FCltiges Pfadelement "{0}": Verzeichnis nicht vorhanden
+
+# 0: file name
+compiler.warn.dir.path.element.not.directory=Ung\u00FCltiges Pfadelement "{0}": kein Verzeichnis
+
+# 0: symbol, 1: symbol, 2: symbol
+compiler.warn.missing-explicit-ctor=Klasse {0} in exportiertem Package {1} deklariert keine expliziten Konstruktoren und stellt daher einen Standardkonstruktor f\u00FCr Clients des Moduls {2} bereit
+
+compiler.warn.strictfp=Ab Release 17 werden alle Gleitkommaausdr\u00FCcke streng ausgewertet. Daher ist "strictfp" nicht erforderlich
+
+compiler.warn.finally.cannot.complete=Finally-Klausel kann nicht normal abgeschlossen werden
+
+# 0: name
+compiler.warn.poor.choice.for.module.name=Modulnamenskomponente {0} darf keine Ziffern am Ende enthalten
+
+# 0: string
+compiler.warn.incubating.modules=Inkubatormodul(e) verwendet: {0}
+
+# 0: symbol, 1: symbol
+compiler.warn.has.been.deprecated={0} in {1} ist veraltet
+
+# 0: symbol, 1: symbol
+compiler.warn.has.been.deprecated.for.removal={0} in {1} ist veraltet und wurde zum Entfernen markiert
+
+# 0: symbol
+compiler.warn.is.preview={0} ist eine Vorschau-API, die in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+# 0: symbol
+compiler.err.is.preview={0} ist eine Vorschau-API, die standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um Vorschau-APIs zu aktivieren)
+
+# 0: symbol
+compiler.warn.is.preview.reflective={0} ist eine reflektive Vorschau-API, die in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+# 0: symbol
+compiler.warn.has.been.deprecated.module=Modul {0} ist veraltet
+
+# 0: symbol
+compiler.warn.has.been.deprecated.for.removal.module=Modul {0} ist veraltet und wurde zum Entfernen markiert
+
+# 0: symbol
+compiler.warn.sun.proprietary={0} ist eine interne propriet\u00E4re API, die in einem zuk\u00FCnftigen Release entfernt werden kann
+
+compiler.warn.illegal.char.for.encoding=Nicht zuordenbares Zeichen f\u00FCr Codierung {0}
+
+# 0: symbol
+compiler.warn.improper.SVUID=serialVersionUID muss als "static final" in Klasse {0} deklariert sein
+
+compiler.warn.improper.SPF=serialPersistentFields muss als "private static final" deklariert sein, um in Kraft zu treten
+
+compiler.warn.SPF.null.init=serialPersistentFields tritt bei Initialisierung als Null nicht in Kraft.\nF\u00FChren Sie die Initialisierung zu einem leeren Array aus, um keine Felder anzugeben
+
+
+# 0: type, 1: type
+compiler.warn.inexact.non-varargs.call=Nicht-varargs-Aufruf von varargs-Methode mit ungenauem Argumenttyp f\u00FCr den letzten Parameter.\nF\u00FChren Sie f\u00FCr einen varargs-Aufruf eine Umwandlung mit Cast in {0} aus\nF\u00FChren Sie f\u00FCr einen Nicht-varargs-Aufruf eine Umwandlung mit Cast in {1} aus, um diese Warnung zu unterdr\u00FCcken
+
+# 0: list of type
+compiler.warn.unreachable.catch=Nicht erreichbare Catch-Klausel\nAusgel\u00F6ster Typ {0} wurde bereits abgefangen
+
+# 0: list of type
+compiler.warn.unreachable.catch.1=Nicht erreichbare Catch-Klausel\nAusgel\u00F6ste Typen {0} wurden bereits abgefangen
+
+# 0: symbol
+compiler.warn.long.SVUID=serialVersionUID muss den Typ "long" in Klasse {0} aufweisen
+
+compiler.warn.OSF.array.SPF=serialPersistentFields muss den Typ "java.io.ObjectStreamField[]" aufweisen, um in Kraft zu treten
+
+# 0: symbol
+compiler.warn.missing.SVUID=Serialisierbare Klasse {0} enth\u00E4lt keine Definition von serialVersionUID
+
+# 0: name
+compiler.warn.serializable.missing.access.no.arg.ctor=Zugriff auf einen no-arg-Konstruktor in der ersten nicht serialisierbaren Superklasse {0} nicht m\u00F6glich
+
+# 0: name
+compiler.warn.serial.method.not.private=Serialisierungsbezogene Methode {0} nicht als privat deklariert
+
+# 0: name
+compiler.warn.serial.concrete.instance.method=Serialisierungsbezogene Methode {0} muss eine konkrete Instanzmethode sein, um in Kraft zu treten. Sie darf nicht abstrakt oder statisch sein
+
+# 0: name
+compiler.warn.serial.method.static=Serialisierungsbezogene Methode {0} ist als statisch deklariert. Sie muss stattdessen eine Instanzmethode sein, um in Kraft zu treten.
+
+# 0: name
+compiler.warn.serial.method.no.args=Serialisierungsbezogene Methode {0} darf keine Parameter aufweisen, um in Kraft zu treten
+
+# 0: name, 1: number
+compiler.warn.serial.method.one.arg=Serialisierungsbezogene Methode {0} muss genau einen Parameter aufweisen, um in Kraft zu treten. Sie darf nicht {1} Parameter enthalten
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.parameter.type=Der einzige Parameter der serialisierungsbezogenen Methode {0} muss den Typ {1} haben, um in Kraft zu treten. Er darf nicht den Typ {2} aufweisen
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.unexpected.return.type=Serialisierungsbezogene Methode {0} wurde mit dem R\u00FCckgabetyp {1} und nicht dem erwarteten Typ {2} deklariert.\nMit dieser Deklaration ist die Methode ung\u00FCltig f\u00FCr die Serialisierung
+
+# 0: name, 1: type
+compiler.warn.serial.method.unexpected.exception=Serialisierungsbezogene Methode {0} wurde zum Ausl\u00F6sen eines unerwarteten Typs {1} deklariert
+
+compiler.warn.ineffectual.serial.field.interface=serialPersistentFields ist in einer Schnittstelle nicht effektiv
+
+# 0: string
+compiler.warn.ineffectual.serial.field.enum=Serialisierungsbezogenes Feld {0} ist in einer Enum-Klasse nicht effektiv
+
+# 0: string
+compiler.warn.ineffectual.serial.method.enum=Serialisierungsbezogene Methode {0} ist in einer Enum-Klasse nicht effektiv
+
+compiler.warn.ineffectual.serial.field.record=serialPersistentFields ist in einer Datensatzklasse nicht effektiv
+
+# 0: string
+compiler.warn.ineffectual.serial.method.record=Serialisierungsbezogene Methode {0} ist in einer Datensatzklasse nicht effektiv
+
+# 0: name
+compiler.warn.ineffectual.serial.method.externalizable=Serialisierungsbezogene Methode {0} ist in einer externalisierbaren Klasse nicht effektiv
+
+compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields ist in einer externalisierbaren Klasse nicht effektiv
+
+compiler.warn.externalizable.missing.public.no.arg.ctor=Eine externalisierbare Klasse erfordert einen \u00F6ffentlichen no-arg-Konstruktor
+
+compiler.warn.non.serializable.instance.field=Nicht transientes Instanzfeld einer serialisierbaren Klasse mit einem nicht serialisierbaren Typ deklariert
+
+# 0: type
+compiler.warn.non.serializable.instance.field.array=Nicht transientes Instanzfeld einer serialisierbaren Klasse wurde mit einem Array mit einem nicht serialisierbaren Basiskomponententyp {0} deklariert
+
+compiler.warn.non.private.method.weaker.access=Serialisierungsbezogene Methode, die in einer Schnittstelle als nicht privat deklariert ist, verhindert,\ndass Klassen, die die Schnittstelle implementieren, die Methode als privat deklarieren
+
+compiler.warn.default.ineffective=Serialisierungsbezogene Standardmethode aus einer Schnittstelle wird nicht von der Serialisierung f\u00FCr eine implementierende Klasse ausgef\u00FChrt
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.warn.potentially.ambiguous.overload={0} in {1} ist m\u00F6glicherweise mehrdeutig mit {2} in {3}
+
+# 0: message segment
+compiler.warn.override.varargs.missing={0}. Au\u00DFer Kraft gesetzte Methode umfasst kein "..."
+
+# 0: message segment
+compiler.warn.override.varargs.extra={0}. In au\u00DFer Kraft setzender Methode fehlt "..."
+
+# 0: message segment
+compiler.warn.override.bridge={0}. Au\u00DFer Kraft setzende Methode ist eine Bridgemethode
+
+# 0: symbol
+compiler.warn.pkg-info.already.seen=Die Datei package-info.java wurde bereits f\u00FCr Package {0} gefunden
+
+# 0: path
+compiler.warn.path.element.not.found=Ung\u00FCltiges Pfadelement "{0}": Datei oder Verzeichnis nicht vorhanden
+
+compiler.warn.possible.fall-through.into.case=M\u00F6glicher Fallthrough in Case
+
+# 0: type
+compiler.warn.redundant.cast=Redundantes Casting in {0}
+
+# 0: number
+compiler.warn.position.overflow=Positionscodierungs\u00FCberlauf bei Zeile {0}
+
+# 0: file name, 1: number, 2: number
+compiler.warn.big.major.version={0}: Hauptversion {1} ist neuer als {2}, die h\u00F6chste Hauptversion, die von diesem Compiler unterst\u00FCtzt wird.\nEs wird empfohlen, dass Sie den Compiler upgraden.
+
+# 0: kind name, 1: symbol
+compiler.warn.static.not.qualified.by.type=Statische {0} muss mit Typname {1} anstelle eines Ausdrucks qualifiziert werden
+
+# 0: string
+compiler.warn.source.no.bootclasspath=Bootstrap Classpath nicht zusammen mit -source {0} festgelegt
+
+# 0: string
+compiler.warn.source.no.system.modules.path=Systemmodulpfad nicht zusammen mit -source {0} festgelegt
+
+# 0: string
+compiler.warn.option.obsolete.source=Quellwert {0} ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt
+
+# 0: target
+compiler.warn.option.obsolete.target=Zielwert {0} ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt
+
+# 0: string, 1: string
+compiler.err.option.removed.source=Quelloption {0} wird nicht mehr unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
+
+# 0: target, 1: target
+compiler.err.option.removed.target=Zieloption {0} wird nicht mehr unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
+
+
+# 0: target, 1: target
+compiler.warn.option.parameters.unsupported=-parameters wird f\u00FCr Zielwert {0} nicht unterst\u00FCtzt. Verwenden Sie {1} oder h\u00F6her.
+
+compiler.warn.option.obsolete.suppression=Verwenden Sie -Xlint:-options, um Warnungen zu veralteten Optionen zu unterdr\u00FCcken.
+
+# 0: name, 1: number, 2: number, 3: number, 4: number
+compiler.warn.future.attr={0}-Attribut, das in Klassendateien der Version {1}.{2} eingef\u00FChrt wurde, wird in Klassendateien der Version {3}.{4} ignoriert
+
+compiler.warn.requires.automatic=Erfordert Direktive f\u00FCr ein automatisches Modul
+
+compiler.warn.requires.transitive.automatic=Erfordert transitive-Direktive f\u00FCr ein automatisches Modul
+
+# Warnings related to annotation processing
+# 0: string
+compiler.warn.proc.package.does.not.exist=Package {0} ist nicht vorhanden
+
+# 0: string
+compiler.warn.proc.file.reopening=Versuch, mehrmals eine Datei f\u00FCr "{0}" zu erstellen
+
+# 0: string
+compiler.warn.proc.type.already.exists=Es ist bereits eine Datei f\u00FCr Typ "{0}" im Quellpfad oder Classpath vorhanden
+
+# 0: string
+compiler.warn.proc.type.recreate=Versuch, mehrmals eine Datei f\u00FCr Typ "{0}" zu erstellen
+
+# 0: string
+compiler.warn.proc.illegal.file.name=Datei kann nicht f\u00FCr unzul\u00E4ssigen Namen "{0}" erstellt werden.
+
+# 0: string, 1: string
+compiler.warn.proc.suspicious.class.name=Datei f\u00FCr einen Typ, dessen Name mit {1} endet, wird erstellt: "{0}"
+
+# 0: string
+compiler.warn.proc.file.create.last.round=Datei f\u00FCr Typ "{0}", die in der letzten Runde erstellt wurde, wird keiner Annotationsverarbeitung unterzogen.
+
+# 0: string, 1: string
+compiler.warn.proc.malformed.supported.string=Nicht wohlgeformte Zeichenfolge "{0}" f\u00FCr eine unterst\u00FCtzte Annotationsschnittstelle von Prozessor "{1}" zur\u00FCckgegeben
+
+# 0: set of string
+compiler.warn.proc.annotations.without.processors=Diese Annotationen wurden von keinem Prozessor beansprucht: {0}
+
+# 0: source version, 1: string, 2: string
+compiler.warn.proc.processor.incompatible.source.version=Unterst\u00FCtzte Quellversion "{0}" von Annotationsprozessor "{1}" kleiner als -source "{2}"
+
+# 0: string, 1: string
+compiler.warn.proc.duplicate.option.name=Doppelte unterst\u00FCtzte Option "{0}" von Annotationsprozessor "{1}" zur\u00FCckgegeben
+
+# 0: string, 1: string
+compiler.warn.proc.duplicate.supported.annotation=Doppelte unterst\u00FCtzte Annotationsschnittstelle "{0}" von Annotationsprozessor "{1}" zur\u00FCckgegeben
+
+# 0: string
+compiler.warn.proc.redundant.types.with.wildcard=Annotationsprozessor "{0}" unterst\u00FCtzt redundant sowohl "*" als auch andere Annotationsschnittstellen
+
+compiler.warn.proc.proc-only.requested.no.procs=Annotationsverarbeitung ohne Kompilierung angefordert, aber keine Prozessoren gefunden.
+
+compiler.warn.proc.use.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -implicit, um eine Policy f\u00FCr die implizite Kompilierung anzugeben.
+
+compiler.warn.proc.use.proc.or.implicit=Implizit kompilierte Dateien wurden keiner Annotationsverarbeitung unterzogen.\nVerwenden Sie -proc:none, um die Annotationsverarbeitung zu deaktivieren, oder -implicit, um eine Policy f\u00FCr die implizite Kompilierung anzugeben.
+
+# Print a client-generated warning; assumed to be localized, no translation required
+# 0: string
+compiler.warn.proc.messager={0}
+
+# 0: set of string
+compiler.warn.proc.unclosed.type.files=Nicht geschlossene Dateien f\u00FCr die Typen "{0}". Diese Typen werden keiner Annotationsverarbeitung unterzogen
+
+# 0: string
+compiler.warn.proc.unmatched.processor.options=Die folgenden Optionen wurden von keinem Prozessor erkannt: "{0}"
+
+compiler.warn.try.explicit.close.call=Expliziter Aufruf von close() f\u00FCr eine automatisch schlie\u00DFbare Ressource
+
+# 0: symbol
+compiler.warn.try.resource.not.referenced=Automatisch schlie\u00DFbare Ressource {0} wird nie im Body der entsprechenden try-Anweisung referenziert
+
+# 0: type
+compiler.warn.try.resource.throws.interrupted.exc=Automatisch schlie\u00DFbare Ressource {0} umfasst die Mitgliedsmethode close(), die InterruptedException ausl\u00F6sen k\u00F6nnte
+
+compiler.warn.unchecked.assign=Nicht gepr\u00FCfte Zuweisung: {0} zu {1}
+
+# 0: symbol, 1: type
+compiler.warn.unchecked.assign.to.var=Nicht gepr\u00FCfte Zuweisung zu Variable {0} als Mitglied des Raw-Typs {1}
+
+# 0: symbol, 1: type
+compiler.warn.unchecked.call.mbr.of.raw.type=Nicht gepr\u00FCfter Aufruf von {0} als Mitglied des Raw-Typs {1}
+
+compiler.warn.unchecked.cast.to.type=Nicht gepr\u00FCftes Casting zu Typ {0}
+
+# 0: kind name, 1: name, 2: object, 3: object, 4: kind name, 5: symbol
+compiler.warn.unchecked.meth.invocation.applied=Nicht gepr\u00FCfter Methodenaufruf: {0} {1} in {4} {5} wird auf die angegebenen Typen angewendet\nErforderlich: {2}\nErmittelt:    {3}
+
+# 0: type
+compiler.warn.unchecked.generic.array.creation=Nicht gepr\u00FCfte Erstellung eines generischen Arrays f\u00FCr varargs-Parameter des Typs {0}
+
+# 0: type
+compiler.warn.unchecked.varargs.non.reifiable.type=M\u00F6glich Heap-Besch\u00E4digung aus parametrisiertem vararg-Typ {0}
+
+# 0: symbol
+compiler.warn.varargs.unsafe.use.varargs.param=Varargs-Methode k\u00F6nnte Heap-Besch\u00E4digung aus nicht reifizierbarem varargs-Parameter {0} verursachen
+
+compiler.warn.missing.deprecated.annotation=Veraltetes Element ist nicht mit @Deprecated-Annotation versehen
+
+# 0: kind name
+compiler.warn.deprecated.annotation.has.no.effect=@Deprecated-Annotation hat keine Auswirkung auf diese {0}-Deklaration
+
+# 0: string
+compiler.warn.invalid.path=Ung\u00FCltiger Dateiname: {0}
+
+compiler.warn.doclint.not.available=Kein Serviceprovider f\u00FCr doclint verf\u00FCgbar
+
+# 0: string
+compiler.err.invalid.path=Ung\u00FCltiger Dateiname: {0}
+
+
+# 0: path
+compiler.warn.invalid.archive.file=Unerwartete Datei in Pfad: {0}
+
+# 0: path
+compiler.warn.unexpected.archive.file=Unerwartete Erweiterung f\u00FCr Archivdatei: {0}
+
+# 0: path
+compiler.err.no.zipfs.for.archive=Kein Dateisystemprovider zur Verarbeitung dieser Datei verf\u00FCgbar: {0}
+
+compiler.warn.div.zero=Division durch Null
+
+compiler.warn.empty.if=Leere Anweisung nach "if"
+
+# 0: type, 1: name
+compiler.warn.annotation.method.not.found=Annotationsmethode "{1}()" kann nicht in Typ "{0}" gefunden werden
+
+# 0: type, 1: name, 2: message segment
+compiler.warn.annotation.method.not.found.reason=Annotationsmethode "{1}()" kann nicht in Typ "{0}" gefunden werden: {2}
+
+# 0: file object, 1: symbol, 2: name
+compiler.warn.unknown.enum.constant=Unbekannte Enum-Konstante {1}.{2}
+
+# 0: file object, 1: symbol, 2: name, 3: message segment
+compiler.warn.unknown.enum.constant.reason=Unbekannte Enum-Konstante {1}.{2}\nGrund: {3}
+
+# 0: type, 1: type
+compiler.warn.raw.class.use=Raw-Typ gefunden: {0}\nTypargumente f\u00FCr generische Klasse {1} fehlen
+
+compiler.warn.diamond.redundant.args=Redundante Typargumente in neuem Ausdruck (verwenden Sie stattdessen den Rautenoperator).
+
+compiler.warn.local.redundant.type=Redundanter Typ f\u00FCr lokale Variable (ersetzen Sie den expliziten Typ durch "var").
+
+compiler.warn.potential.lambda.found=Die Erstellung dieser anonymen inneren Klasse kann in einen Lambda-Ausdruck umgewandelt werden.
+
+compiler.warn.method.redundant.typeargs=Redundante Typargumente in Methodenaufruf.
+
+# 0: symbol, 1: message segment
+compiler.warn.varargs.redundant.trustme.anno=Redundante {0}-Annotation. {1}
+
+# 0: symbol
+compiler.warn.access.to.member.from.serializable.element=Zugriff auf Mitglied {0} aus serialisierbarem Element kann \u00F6ffentlich f\u00FCr nicht vertrauensw\u00FCrdigen Code zug\u00E4nglich sein
+
+# 0: symbol
+compiler.warn.access.to.member.from.serializable.lambda=Zugriff auf Mitglied {0} aus serialisierbarem Lambda kann \u00F6ffentlich f\u00FCr nicht vertrauensw\u00FCrdigen Code zug\u00E4nglich sein
+
+#####
+
+## The following are tokens which are non-terminals in the language. They should
+## be named as JLS3 calls them when translated to the appropriate language.
+compiler.misc.token.identifier=<ID>
+
+compiler.misc.token.character=<Zeichen>
+
+compiler.misc.token.string=<Zeichenfolge>
+
+compiler.misc.token.integer=<Ganzzahl>
+
+compiler.misc.token.long-integer=<Ganzzahl vom Typ "long">
+
+compiler.misc.token.float=<Float>
+
+compiler.misc.token.double=<Double>
+
+compiler.misc.token.bad-symbol=<ung\u00FCltiges Symbol>
+
+compiler.misc.token.end-of-input=<Ende der Eingabe>
+
+## The argument to the following string will always be one of the following:
+## 1. one of the above non-terminals
+## 2. a keyword (JLS1.8)
+## 3. a boolean literal (JLS3.10.3)
+## 4. the null literal (JLS3.10.7)
+## 5. a Java separator (JLS3.11)
+## 6. an operator (JLS3.12)
+##
+## This is the only place these tokens will be used.
+# 0: token
+compiler.err.expected={0} erwartet
+
+# 0: string
+compiler.err.expected.str={0} erwartet
+
+# 0: token, 1: token
+compiler.err.expected2={0} oder {1} erwartet
+
+# 0: token, 1: token, 2: token
+compiler.err.expected3={0}, {1} oder {2} erwartet
+
+# 0: token, 1: token, 2: token, 3: string
+compiler.err.expected4={0}, {1}, {2} oder {3} erwartet
+
+compiler.err.premature.eof=Dateiende beim Parsen erreicht
+
+compiler.err.enum.constant.expected=Hier wird eine Enum-Konstante erwartet
+
+compiler.err.enum.constant.not.expected=Hier wird keine Enum-Konstante erwartet
+
+## The following are related in form, but do not easily fit the above paradigm.
+compiler.err.expected.module.or.open="module" oder "open" erwartet
+
+compiler.err.dot.class.expected=".class" erwartet
+
+## The argument to this string will always be either 'case' or 'default'.
+# 0: token
+compiler.err.orphaned={0} verwaist
+
+# 0: name
+compiler.misc.anonymous.class=<anonyme {0}>
+
+# 0: name, 1: type
+compiler.misc.type.captureof=capture#{0} von {1}
+
+compiler.misc.type.captureof.1=capture#{0}
+
+compiler.misc.type.none=<kein Wert>
+
+compiler.misc.unnamed.package=Unbenanntes Package
+
+compiler.misc.unnamed.module=Unbenanntes Modul
+
+#####
+
+# 0: symbol, 1: message segment
+compiler.err.cant.access=Kein Zugriff auf {0}\n{1}
+
+# 0: name
+compiler.misc.bad.class.file=Klassendatei ist ung\u00FCltig f\u00FCr Klasse {0}
+
+# 0: file name, 1: string (expected constant pool entry type), 2: number (constant pool index)
+compiler.misc.bad.const.pool.entry=Ung\u00FCltiger Konstantenpooleintrag in {0}\n{1} bei Index {2} erwartet
+
+# 0: file name, 1: number (constant pool index), 2: number (constant pool size)
+compiler.misc.bad.const.pool.index=Ung\u00FCltiger Konstantenpoolindex in {0}\nIndex {1} liegt nicht innerhalb der Poolgr\u00F6\u00DFe {2}.
+
+# 0: file name, 1: message segment
+compiler.misc.bad.class.file.header=Ung\u00FCltige Klassendatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Classpath vorhanden ist.
+
+# 0: file name, 1: message segment
+compiler.misc.bad.source.file.header=Ung\u00FCltige Quelldatei: {0}\n{1}\nEntfernen Sie die Datei, oder stellen Sie sicher, dass sie im richtigen Unterverzeichnis des Quellpfades vorhanden ist.
+
+## The following are all possible strings for the second argument ({1}) of the
+## above strings.
+compiler.misc.bad.class.signature=Ung\u00FCltige Klassensignatur: {0}
+
+#0: symbol, 1: symbol
+compiler.misc.bad.enclosing.class=Ung\u00FCltige einschlie\u00DFende Klasse f\u00FCr {0}: {1}
+
+# 0: symbol
+compiler.misc.bad.enclosing.method=Ung\u00FCltiges einschlie\u00DFendes Methodenattribut f\u00FCr Klasse {0}
+
+compiler.misc.bad.runtime.invisible.param.annotations=Ung\u00FCltiges RuntimeInvisibleParameterAnnotations-Attribut: {0}
+
+compiler.misc.bad.const.pool.tag=Ung\u00FCltiges Konstantenpooltag: {0}
+
+compiler.misc.bad.const.pool.tag.at=Ung\u00FCltiges Konstantenpooltag {0} bei {1}
+
+compiler.misc.unexpected.const.pool.tag.at=Unerwartetes Konstantenpooltag {0} bei {1}
+
+compiler.misc.bad.signature=Ung\u00FCltige Signatur: {0}
+
+compiler.misc.bad.type.annotation.value=Ung\u00FCltiger Typ f\u00FCr Annotationszielwert: {0}
+
+compiler.misc.bad.module-info.name=Ung\u00FCltiger Klassenname
+
+compiler.misc.class.file.wrong.class=Klassendatei enth\u00E4lt falsche Klasse: {0}
+
+compiler.misc.module.info.invalid.super.class=module-info mit ung\u00FCltiger Superklasse
+
+# 0: name
+compiler.misc.class.file.not.found=Klassendatei f\u00FCr {0} nicht gefunden
+
+# 0: string (constant value), 1: symbol (constant field), 2: type (field type)
+compiler.misc.bad.constant.range=Konstantenwert "{0}" f\u00FCr {1} liegt au\u00DFerhalb des erwarteten Bereichs f\u00FCr {2}
+
+# 0: string (constant value), 1: symbol (constant field), 2: string (expected class)
+compiler.misc.bad.constant.value=Ung\u00FCltiger Konstantenwert "{0}" f\u00FCr {1}. {2} erwartet
+
+# 0: type (field type)
+compiler.misc.bad.constant.value.type=Variable des Typs "{0}" darf keinen Konstantenwert aufweisen, aber es wurde einer f\u00FCr sie angegeben
+
+# 0: string (classfile major version), 1: string (classfile minor version)
+compiler.misc.invalid.default.interface=Standardmethode in Klassendatei der Version {0}.{1} gefunden
+
+# 0: string (classfile major version), 1: string (classfile minor version)
+compiler.misc.invalid.static.interface=Statische Methode in Klassendatei der Version {0}.{1} gefunden
+
+# 0: string (classfile major version), 1: string (classfile minor version)
+compiler.misc.anachronistic.module.info=Moduldeklaration in Klassendatei der Version {0}.{1} gefunden
+
+compiler.misc.module.info.definition.expected=module-info-Definition erwartet
+
+# 0: name
+compiler.misc.file.doesnt.contain.class=Datei enth\u00E4lt nicht Klasse {0}
+
+# 0: symbol
+compiler.misc.file.does.not.contain.package=Datei enth\u00E4lt nicht Package {0}
+
+compiler.misc.file.does.not.contain.module=Datei enth\u00E4lt keine Moduldeklaration
+
+compiler.misc.illegal.start.of.class.file=Unzul\u00E4ssiger Klassendateibeginn
+
+# 0: name
+compiler.misc.method.descriptor.invalid=Methodendeskriptor ung\u00FCltig f\u00FCr {0}
+
+compiler.misc.unable.to.access.file=Zugriff auf Datei nicht m\u00F6glich: {0}
+
+compiler.misc.unicode.str.not.supported=Unicode-Zeichenfolge wird in Klassendatei nicht unterst\u00FCtzt
+
+compiler.misc.undecl.type.var=Nicht deklarierte Typvariable: {0}
+
+compiler.misc.malformed.vararg.method=Klassendatei enth\u00E4lt nicht wohlgeformte Methode mit variabler Argumentanzahl: {0}
+
+compiler.misc.wrong.version=Klassendatei hat die falsche Version {0}.{1}. Sie muss {2}.{3} lauten
+
+#####
+
+# 0: type, 1: type or symbol
+compiler.err.not.within.bounds=Typargument {0} liegt nicht innerhalb des g\u00FCltigen Bereichs von Typvariable {1}
+
+## The following are all possible strings for the second argument ({1}) of the
+## above string.
+
+## none yet...
+
+#####
+
+# 0: message segment
+compiler.err.prob.found.req=Inkompatible Typen: {0}
+
+# 0: message segment
+compiler.misc.prob.found.req=Inkompatible Typen: {0}
+
+# 0: message segment, 1: type, 2: type
+compiler.warn.prob.found.req={0}\nErforderlich: {2}\nErmittelt:    {1}
+
+# 0: type, 1: type
+compiler.misc.inconvertible.types={0} kann nicht in {1} konvertiert werden
+
+# 0: type, 1: type
+compiler.misc.possible.loss.of.precision=M\u00F6glicher Verlust bei Konvertierung von {0} in {1}
+
+compiler.misc.unchecked.assign=Nicht gepr\u00FCfte Konvertierung
+
+# compiler.misc.storecheck=\
+#     assignment might cause later store checks to fail
+# compiler.misc.unchecked=\
+#     assigned array cannot dynamically check its stores
+compiler.misc.unchecked.cast.to.type=Nicht gepr\u00FCftes Casting
+
+# compiler.err.star.expected=\
+#     ''*'' expected
+# compiler.err.no.elem.type=\
+#     \[\*\] cannot have a type
+
+# 0: message segment
+compiler.misc.try.not.applicable.to.type=try-with-resources nicht auf Variablentyp anwendbar\n({0})
+
+#####
+
+# 0: object, 1: message segment
+compiler.err.type.found.req=Unerwarteter Typ\nErforderlich: {1}\nErmittelt:    {0}
+
+## The following are all possible strings for the first argument ({0}) of the
+## above string.
+compiler.misc.type.req.class=Klasse
+
+compiler.misc.type.req.class.array=Klasse oder Array
+
+compiler.misc.type.req.array.or.iterable=Array oder java.lang.Iterable
+
+compiler.misc.type.req.ref=Referenz
+
+compiler.misc.type.req.exact=Klasse oder Schnittstelle ohne Grenzwerte
+
+# 0: type
+compiler.misc.type.parameter=Typparameter {0}
+
+#####
+
+## The following are all possible strings for the last argument of all those
+## diagnostics whose key ends in ".1"
+
+# 0: type, 1: list of type
+compiler.misc.no.unique.maximal.instance.exists=Keine eindeutige maximale Instanz f\u00FCr Typvariable {0} mit oberen Grenzwerten {1} vorhanden
+
+# 0: type, 1: list of type
+compiler.misc.no.unique.minimal.instance.exists=Keine eindeutige minimale Instanz f\u00FCr Typvariable {0} mit unteren Grenzwerten {1} vorhanden
+
+# 0: type, 1: list of type
+compiler.misc.incompatible.upper.bounds=Inferenzvariable {0} hat inkompatible obere Grenzwerte {1}
+
+# 0: type, 1: list of type
+compiler.misc.incompatible.eq.bounds=Inferenzvariable {0} hat inkompatible Gleichheits-Constraints {1}
+
+# 0: type, 1: fragment, 2: fragment
+compiler.misc.incompatible.bounds=Inferenzvariable {0} hat inkompatible Grenzwerte\n{1}\n{2}
+
+# 0: list of type
+compiler.misc.lower.bounds=Untere Grenzwerte: {0}
+
+# 0: list of type
+compiler.misc.eq.bounds=Gleichheits-Constraints: {0}
+
+# 0: list of type
+compiler.misc.upper.bounds=Untere Grenzwerte: {0}
+
+# 0: list of type, 1: type, 2: type
+compiler.misc.infer.no.conforming.instance.exists=Keine Instanzen von Typvariablen {0} vorhanden, sodass {1} {2} entspricht
+
+# 0: list of type, 1: message segment
+compiler.misc.infer.no.conforming.assignment.exists=Typvariable(n) {0} nicht ableitbar\n(nicht \u00FCbereinstimmende Argumente; {1})
+
+# 0: list of type
+compiler.misc.infer.arg.length.mismatch=Typvariable(n) {0} nicht ableitbar\n(Liste der tats\u00E4chlichen Argumente hat eine andere L\u00E4nge als die der formalen Argumente)
+
+# 0: list of type, 1: message segment
+compiler.misc.infer.varargs.argument.mismatch=Typvariable(n) {0} nicht ableitbar\n(nicht \u00FCbereinstimmende varargs, {1})
+
+# 0: type, 1: list of type
+compiler.misc.inferred.do.not.conform.to.upper.bounds=Abgeleiteter Typ entspricht nicht den oberen Grenzwerten\nAbgeleitet: {0}\nObere Grenzwerte: {1}
+
+# 0: type, 1: list of type
+compiler.misc.inferred.do.not.conform.to.lower.bounds=Abgeleiteter Typ entspricht nicht den unteren Grenzwerten\nAbgeleitet: {0}\nUntere Grenzwerte: {1}
+
+# 0: type, 1: list of type
+compiler.misc.inferred.do.not.conform.to.eq.bounds=Abgeleiteter Typ entspricht nicht den Gleichheits-Constraints\nAbgeleitet: {0}\nGleichheits-Constraint(s): {1}
+
+# 0: symbol
+compiler.misc.diamond={0}<>
+
+# 0: type
+compiler.misc.diamond.non.generic="<>" kann nicht mit der nicht generischen Klasse {0} verwendet werden
+
+# 0: list of type, 1: message segment
+compiler.misc.diamond.invalid.arg=Typargument {0}, das f\u00FCr {1} abgeleitet wurde, ist in diesem Kontext nicht zul\u00E4ssig\nDas abgeleitete Argument kann nicht im Signaturattribut ausgedr\u00FCckt werden
+
+# 0: list of type, 1: message segment
+compiler.misc.diamond.invalid.args=Typargumente {0}, die f\u00FCr {1} abgeleitet wurden, sind in diesem Kontext nicht zul\u00E4ssig\nAbgeleitete Argumente k\u00F6nnen nicht im Signaturattribut ausgedr\u00FCckt werden
+
+# 0: type
+compiler.misc.diamond.and.explicit.params="<>" kann nicht mit expliziten Typparametern f\u00FCr Konstruktor verwendet werden
+
+compiler.misc.mref.infer.and.explicit.params=Raw-Konstruktorreferenz kann nicht mit expliziten Typparametern f\u00FCr Konstruktor verwendet werden
+
+# 0: type, 1: list of type
+compiler.misc.explicit.param.do.not.conform.to.bounds=Explizites Typargument {0} entspricht nicht den deklarierten Grenzwerten {1}
+
+compiler.misc.arg.length.mismatch=Liste der tats\u00E4chlichen Argumente hat eine andere L\u00E4nge als die der formalen Argumente
+
+# 0: string
+compiler.misc.wrong.number.type.args=Falsche Anzahl Typargumente. {0} erforderlich
+
+# 0: message segment
+compiler.misc.no.conforming.assignment.exists=Keine \u00FCbereinstimmenden Argumente, {0}
+
+# 0: message segment
+compiler.misc.varargs.argument.mismatch=Keine \u00FCbereinstimmenden varargs; {0}
+
+#####
+
+# 0: symbol or type, 1: file name
+compiler.warn.auxiliary.class.accessed.from.outside.of.its.source.file=Auf Auxiliary-Klasse {0} in {1} darf nicht von au\u00DFerhalb der eigenen Quelldatei zugegriffen werden
+
+## The first argument ({0}) is a "kindname".
+# 0: kind name, 1: symbol, 2: symbol
+compiler.err.abstract.cant.be.accessed.directly={0} {1} in {2} ist abstrakt und kann nicht direkt aufgerufen werden
+
+## The first argument ({0}) is a "kindname".
+# 0: symbol kind, 1: symbol
+compiler.err.non-static.cant.be.ref={0} {1} ist nicht statisch und kann nicht aus einem statischen Kontext referenziert werden
+
+# 0: symbol kind, 1: symbol
+compiler.misc.bad.static.method.in.unbound.lookup=Unerwartete statische {0} {1} in ungebundenem Lookup gefunden
+
+# 0: symbol kind, 1: symbol
+compiler.misc.bad.instance.method.in.unbound.lookup=Unerwartete Instanz {0} {1} in ungebundenem Lookup gefunden
+
+# 0: symbol kind, 1: symbol
+compiler.misc.bad.static.method.in.bound.lookup=Unerwartete statische {0} {1} in gebundenem Lookup gefunden
+
+## Both arguments ({0}, {1}) are "kindname"s.  {0} is a comma-separated list
+## of kindnames (the list should be identical to that provided in source.
+# 0: set of kind name, 1: set of kind name
+compiler.err.unexpected.type=Unerwarteter Typ\nErforderlich: {0}\nErmittelt:    {1}
+
+compiler.err.unexpected.lambda=Hier wird kein Lambda-Ausdruck erwartet
+
+compiler.err.unexpected.mref=Hier wird keine Methodenreferenz erwartet
+
+## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
+## The second argument {1} is the non-resolved symbol
+## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
+## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
+# 0: kind name, 1: name, 2: unused, 3: unused
+compiler.err.cant.resolve=Symbol nicht gefunden\nSymbol: {0} {1}
+
+# 0: kind name, 1: name, 2: unused, 3: list of type
+compiler.err.cant.resolve.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})
+
+# 0: kind name, 1: name, 2: unused, 3: list of type
+compiler.misc.cant.resolve.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})
+
+# 0: kind name, 1: name, 2: list of type, 3: list of type
+compiler.err.cant.resolve.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})
+
+## arguments from {0} to {3} have the same meaning as above
+## The fifth argument {4} is a location subdiagnostic (see below)
+# 0: kind name, 1: name, 2: unused, 3: unused, 4: message segment
+compiler.err.cant.resolve.location=Symbol nicht gefunden\nSymbol: {0} {1}\nOrt: {4}
+
+# 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
+compiler.err.cant.resolve.location.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})\nOrt: {4}
+
+# 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
+compiler.err.cant.resolve.location.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})\nOrt: {4}
+
+### Following are replicated/used for method reference diagnostics
+
+# 0: kind name, 1: name, 2: unused, 3: list of type, 4: message segment
+compiler.misc.cant.resolve.location.args=Symbol nicht gefunden\nSymbol: {0} {1}({3})\nOrt: {4}
+
+# 0: kind name, 1: name, 2: list of type, 3: list, 4: message segment
+compiler.misc.cant.resolve.location.args.params=Symbol nicht gefunden\nSymbol: {0} <{2}>{1}({3})\nOrt: {4}
+
+##a location subdiagnostic is composed as follows:
+## The first argument {0} is the location "kindname" (e.g. 'constructor', 'field', etc.)
+## The second argument {1} is the location name
+## The third argument {2} is the location type (only when {1} is a variable name)
+
+# 0: kind name, 1: type or symbol, 2: unused
+compiler.misc.location={0} {1}
+
+# 0: kind name, 1: symbol, 2: type
+compiler.misc.location.1={0} {1} von Typ {2}
+
+## The following are all possible string for "kindname".
+## They should be called whatever the JLS calls them after it been translated
+## to the appropriate language.
+# compiler.misc.kindname.constructor=\
+#     static member
+compiler.misc.kindname.annotation=@interface
+
+compiler.misc.kindname.constructor=Konstruktor
+
+compiler.misc.kindname.enum=Enumeration
+
+compiler.misc.kindname.interface=Schnittstelle
+
+compiler.misc.kindname.static=statisch
+
+compiler.misc.kindname.type.variable=Typvariable
+
+compiler.misc.kindname.type.variable.bound=Grenzwert von Typvariable
+
+compiler.misc.kindname.variable=Variable
+
+compiler.misc.kindname.value=Wert
+
+compiler.misc.kindname.method=Methode
+
+compiler.misc.kindname.class=Klasse
+
+compiler.misc.kindname.package=Package
+
+compiler.misc.kindname.module=Modul
+
+compiler.misc.kindname.static.init=statischer Initializer
+
+compiler.misc.kindname.instance.init=Instanz-Initializer
+
+compiler.misc.kindname.record.component=Datensatzkomponente
+
+compiler.misc.kindname.record=Datensatz
+
+#####
+
+compiler.misc.no.args=keine Argumente
+
+# 0: message segment
+compiler.err.override.static={0}\nAu\u00DFer Kraft setzende Methode ist statisch
+
+# 0: message segment, 1: set of flag
+compiler.err.override.meth={0}\nAu\u00DFer Kraft gesetzte Methode ist {1}
+
+# 0: message segment, 1: type
+compiler.err.override.meth.doesnt.throw={0}\nAu\u00DFer Kraft gesetzte Methode l\u00F6st nicht {1} aus
+
+# In the following string {1} is a space separated list of Java Keywords, as
+# they would have been declared in the source code
+# 0: message segment, 1: set of flag or string
+compiler.err.override.weaker.access={0}\nVersuch, niedrigere Zugriffsberechtigungen zuzuweisen. War {1}
+
+# 0: message segment, 1: type, 2: type
+compiler.err.override.incompatible.ret={0}\nR\u00FCckgabetyp {1} ist nicht mit {2} kompatibel
+
+# 0: message segment, 1: type, 2: type
+compiler.warn.override.unchecked.ret={0}\nR\u00FCckgabetyp erfordert eine nicht gepr\u00FCfte Konvertierung von {1} in {2}
+
+# 0: message segment, 1: type
+compiler.warn.override.unchecked.thrown={0}\nAu\u00DFer Kraft gesetzte Methode l\u00F6st nicht {1} aus
+
+# 0: symbol
+compiler.warn.override.equals.but.not.hashcode=Klasse {0} setzt Gleichwertige au\u00DFer Kraft. hashCode-Methode wird aber weder von der Klasse noch einer Superklasse au\u00DFer Kraft gesetzt
+
+## The following are all possible strings for the first argument ({0}) of the
+## above strings.
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.cant.override={0} in {1} kann nicht {2} in {3} au\u00DFer Kraft setzen
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.cant.hide={0} in {1} kann nicht {2} in {3} ausblenden
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.cant.implement={0} in {1} kann nicht {2} in {3} implementieren
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.clashes.with={0} in {1} steht mit {2} in {3} in Konflikt
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.unchecked.override={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.unchecked.implement={0} in {1} implementiert {2} in {3}
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.unchecked.clash.with={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.varargs.override={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.varargs.implement={0} in {1} implementiert {2} in {3}
+
+# 0: symbol, 1: symbol, 2: symbol, 3: symbol
+compiler.misc.varargs.clash.with={0} in {1} setzt {2} in {3} au\u00DFer Kraft
+
+# 0: kind name, 1: symbol, 2: symbol, 3: message segment
+compiler.misc.inapplicable.method={0} {1}.{2} ist nicht anwendbar\n({3})
+
+########################################
+# Diagnostics for language feature changes.
+# Such diagnostics have a common template which can be customized by using a feature
+# diagnostic fragment (one of those given below).
+########################################
+
+# 0: message segment (feature), 1: string (found version), 2: string (expected version)
+compiler.err.feature.not.supported.in.source={0} wird in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+
+# 0: message segment (feature), 1: string (found version), 2: string (expected version)
+compiler.err.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+
+# 0: message segment (feature), 1: string (found version), 2: string (expected version)
+compiler.misc.feature.not.supported.in.source={0} wird in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+
+# 0: message segment (feature), 1: string (found version), 2: string (expected version)
+compiler.misc.feature.not.supported.in.source.plural={0} werden in -source {1} nicht unterst\u00FCtzt\n(Verwenden Sie -source {2} oder h\u00F6her, um {0} zu aktivieren)
+
+# 0: message segment (feature)
+compiler.err.preview.feature.disabled={0} ist ein Vorschaufeature, das standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
+
+# 0: message segment (feature)
+compiler.err.preview.feature.disabled.plural={0} sind ein Vorschaufeature, das standardm\u00E4\u00DFig deaktiviert ist.\n(Verwenden Sie --enable-preview, um {0} zu aktivieren)
+
+# 0: file object (classfile), 1: string (expected version)
+compiler.err.preview.feature.disabled.classfile=Klassendatei f\u00FCr {0} verwendet Vorschaufeatures von Java SE {1}.\n(Verwenden Sie --enable-preview, um das Laden von Klassendateien mit Vorschaufeatures zu erm\u00F6glichen)
+
+# 0: message segment (feature)
+compiler.warn.preview.feature.use={0} ist ein Vorschaufeature, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+# 0: message segment (feature)
+compiler.warn.preview.feature.use.plural={0} sind ein Vorschaufeature, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+# 0: file object (classfile), 1: string (expected version)
+compiler.warn.preview.feature.use.classfile=Klassendatei f\u00FCr {0} verwendet Vorschaufeatures von Java SE {1}.
+
+
+compiler.misc.feature.modules=Module
+
+compiler.misc.feature.diamond.and.anon.class="<>" mit anonymen inneren Klassen
+
+compiler.misc.feature.var.in.try.with.resources=Variablen in try-with-resources
+
+compiler.misc.feature.type.annotations=Typannotationen
+
+compiler.misc.feature.annotations.after.type.params=Annotationen nach Methodentypparametern
+
+compiler.misc.feature.repeatable.annotations=Wiederholte Annotationen
+
+compiler.misc.feature.diamond=Rautenoperator
+
+compiler.misc.feature.lambda=Lambda-Ausdr\u00FCcke
+
+compiler.misc.feature.method.references=Methodenreferenzen
+
+compiler.misc.feature.default.methods=Standardmethoden
+
+compiler.misc.feature.intersection.types.in.cast=Schnittmengentypen
+
+compiler.misc.feature.static.intf.methods=Statische Schnittstellenmethoden
+
+compiler.misc.feature.static.intf.method.invoke=Aufrufe statischer Schnittstellenmethoden
+
+compiler.misc.feature.private.intf.methods=Private Schnittstellenmethoden
+
+compiler.misc.feature.text.blocks=Textbl\u00F6cke
+
+compiler.misc.feature.multiple.case.labels=Mehrere CASE-Labels
+
+compiler.misc.feature.switch.rules=Switch-Regeln
+
+compiler.misc.feature.switch.expressions=Switch-Ausdr\u00FCcke
+
+compiler.misc.feature.var.syntax.in.implicit.lambda=var-Syntax in impliziten Lambdas
+
+compiler.misc.feature.pattern.matching.instanceof=Musterabgleich in instanceof
+
+compiler.misc.feature.reifiable.types.instanceof=Reifizierbare Typen in instanceof
+
+compiler.misc.feature.records=Datens\u00E4tze
+
+compiler.misc.feature.sealed.classes=Verschl\u00FCsselte Klassen
+
+compiler.misc.feature.case.null=Null in Switch Cases
+
+compiler.misc.feature.pattern.switch=Muster in Switch-Anweisungen
+
+compiler.warn.underscore.as.identifier=Ab Release 9 ist "_" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+
+compiler.err.underscore.as.identifier=Ab Release 9 ist "_" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+
+compiler.err.underscore.as.identifier.in.lambda="_" als ID verwendet\n("_" darf nicht als ID f\u00FCr Lambda-Parameter verwendet werden)
+
+compiler.err.enum.as.identifier=Ab Release 5 ist "enum" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+
+compiler.err.assert.as.identifier=Ab Release 1.4 ist "assert" ein Schl\u00FCsselwort und kann nicht als ID verwendet werden
+
+# TODO 308: make a better error message
+compiler.err.this.as.identifier=Ab Release 8 ist "this" nur als Parametername f\u00FCr den Empf\u00E4ngertyp zul\u00E4ssig.\nDas muss der erste Parameter sein und darf kein Lambda-Parameter sein
+
+compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=receiver-Parameter nicht f\u00FCr Konstruktor der obersten Klasse anwendbar
+
+# TODO 308: make a better error message
+# 0: annotation
+compiler.err.cant.type.annotate.scoping.1=Scoping-Konstrukt kann nicht mit type-use-Annotation versehen werden: {0}
+
+# TODO 308: make a better error message
+# 0: list of annotation
+compiler.err.cant.type.annotate.scoping=Scoping-Konstrukt kann nicht mit type-use-Annotationen versehen werden: {0}
+
+# 0: type, 1: type
+compiler.err.incorrect.receiver.name=Der Empf\u00E4ngername stimmt nicht mit dem einschlie\u00DFenden Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+
+# 0: type, 1: type
+compiler.err.incorrect.receiver.type=Der Empf\u00E4ngertyp stimmt nicht mit dem einschlie\u00DFenden Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+
+# 0: type, 1: type
+compiler.err.incorrect.constructor.receiver.type=Der Empf\u00E4ngertyp stimmt nicht mit dem einschlie\u00DFenden \u00E4u\u00DFeren Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+
+# 0: type, 1: type
+compiler.err.incorrect.constructor.receiver.name=Der Empf\u00E4ngername stimmt nicht mit dem einschlie\u00DFenden \u00E4u\u00DFeren Klassentyp \u00FCberein\nErforderlich: {0}\nErmittelt:    {1}
+
+compiler.err.no.annotations.on.dot.class=Keine Annotationen im Typ eines Klassenliterals zul\u00E4ssig
+
+########################################
+# Diagnostics for verbose resolution
+# used by Resolve (debug only)
+########################################
+
+# 0: number, 1: symbol, 2: unused
+compiler.misc.applicable.method.found=#{0} anwendbare Methode gefunden: {1}
+
+# 0: number, 1: symbol, 2: message segment
+compiler.misc.applicable.method.found.1=#{0} anwendbare Methode gefunden: {1}\n({2})
+
+# 0: number, 1: symbol, 2: message segment
+compiler.misc.not.applicable.method.found=#{0} nicht anwendbare Methode gefunden: {1}\n({2})
+
+# 0: type
+compiler.misc.partial.inst.sig=Teilweise instanziiert in: {0}
+
+# 0: name, 1: symbol, 2: number, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
+compiler.note.verbose.resolve.multi=Methode {0} wird in Typ {1} als Kandidat {2} aufgel\u00F6st\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
+
+# 0: name, 1: symbol, 2: unused, 3: string (method resolution phase), 4: list of type or message segment, 5: list of type or message segment
+compiler.note.verbose.resolve.multi.1=Fehlerhafte Aufl\u00F6sung f\u00FCr Methode {0} in Typ {1}\nPhase: {3}\nMit Istwerten: {4}\nMit type-args: {5}\nKandidaten:
+
+# 0: symbol, 1: type, 2: type
+compiler.note.deferred.method.inst=Instanziierung von Methode {0} verz\u00F6gert\nInstanziierte Signatur: {1}\ntarget-type: {2}
+
+########################################
+# Diagnostics for lambda deduplication
+# used by LambdaToMethod (debug only)
+########################################
+
+# 0: symbol
+compiler.note.verbose.l2m.deduplicate=Lambda-Implementierungsmethode {0} wird dedupliziert
+
+########################################
+# Diagnostics for method reference search
+# results used by Resolve (debug only)
+########################################
+
+# 0: fragment, 1: string, 2: number
+compiler.note.method.ref.search.results.multi={0} Suchergebnisse f\u00FCr {1}, mit spezifischsten {2}\nAnwendbare Kandidaten:
+
+# 0: number, 1: fragment, 2: symbol
+compiler.misc.applicable.method.found.2=#{0} anwendbare Methode gefunden: {1} {2}
+
+# 0: number, 1: fragment, 2: symbol, 3: message segment
+compiler.misc.applicable.method.found.3=#{0} anwendbare Methode gefunden: {1} {2}\n({3})
+
+compiler.misc.static=statisch
+
+compiler.misc.non.static=nicht statisch
+
+compiler.misc.bound=gebunden
+
+compiler.misc.unbound=ungebunden
+
+########################################
+# Diagnostics for where clause implementation
+# used by the RichDiagnosticFormatter.
+########################################
+
+compiler.misc.type.null=<Null>
+
+# X#n (where n is an int id) is disambiguated tvar name
+# 0: name, 1: number
+compiler.misc.type.var={0}#{1}
+
+# CAP#n (where n is an int id) is an abbreviation for 'captured type'
+# 0: number
+compiler.misc.captured.type=CAP#{0}
+
+# <INT#n> (where n is an int id) is an abbreviation for 'intersection type'
+# 0: number
+compiler.misc.intersection.type=INT#{0}
+
+# where clause for captured type: contains upper ('extends {1}') and lower
+# ('super {2}') bound along with the wildcard that generated this captured type ({3})
+# 0: type, 1: type, 2: type, 3: type
+compiler.misc.where.captured={0} erweitert {1} Super: {2} aus Erfassung von {3}
+
+# compact where clause for captured type: contains upper ('extends {1}') along
+# with the wildcard that generated this captured type ({3})
+# 0: type, 1: type, 2: unused, 3: type
+compiler.misc.where.captured.1={0} erweitert {1} aus Erfassung von {3}
+
+# where clause for type variable: contains upper bound(s) ('extends {1}') along with
+# the kindname ({2}) and location ({3}) in which the typevar has been declared
+# 0: type, 1: list of type, 2: symbol kind, 3: symbol
+compiler.misc.where.typevar={0} erweitert {1}, deklariert in {2} {3}
+
+# compact where clause for type variable: contains the kindname ({2}) and location ({3})
+# in which the typevar has been declared
+# 0: type, 1: list of type, 2: symbol kind, 3: symbol
+compiler.misc.where.typevar.1={0} deklariert in {2} {3}
+
+# where clause for fresh type variable: contains upper bound(s) ('extends {1}').
+# Since a fresh type-variable is synthetic - there's no location/kindname here.
+# 0: type, 1: list of type
+compiler.misc.where.fresh.typevar={0} erweitert {1}
+
+# where clause for type variable: contains all the upper bound(s) ('extends {1}')
+# of this intersection type
+# 0: type, 1: list of type
+compiler.misc.where.intersection={0} erweitert {1}
+
+### Where clause headers ###
+compiler.misc.where.description.captured=Dabei ist {0} eine neue Typvariable:
+
+# 0: set of type
+compiler.misc.where.description.typevar=Dabei ist {0} eine Typvariable:
+
+# 0: set of type
+compiler.misc.where.description.intersection=Dabei ist {0} ein Schnittmengentyp:
+
+# 0: set of type
+compiler.misc.where.description.captured.1=Dabei sind {0} neue Typvariablen:
+
+# 0: set of type
+compiler.misc.where.description.typevar.1=Dabei sind {0} Typvariablen:
+
+# 0: set of type
+compiler.misc.where.description.intersection.1=Dabei sind {0} Schnittmengentypen:
+
+###
+# errors related to doc comments
+
+compiler.err.dc.bad.entity=Ung\u00FCltige HTML-Entity
+
+compiler.err.dc.bad.inline.tag=Falsche Verwendung von Inlinetag
+
+compiler.err.dc.identifier.expected=ID erwartet
+
+compiler.err.dc.malformed.html=Nicht wohlgeformte HTML
+
+compiler.err.dc.missing.semicolon=Semikolon fehlt
+
+compiler.err.dc.no.content=kein Inhalt
+
+compiler.err.dc.no.tag.name=Kein Tagname nach "@"
+
+compiler.err.dc.gt.expected=">" erwartet
+
+compiler.err.dc.ref.bad.parens=Unerwarteter Text nach Klammer
+
+compiler.err.dc.ref.syntax.error=Syntaxfehler in Referenz
+
+compiler.err.dc.ref.unexpected.input=Unerwarteter Text
+
+compiler.err.dc.unexpected.content=Unerwarteter Inhalt
+
+compiler.err.dc.unterminated.inline.tag=Nicht abgeschlossenes Inlinetag
+
+compiler.err.dc.unterminated.signature=Nicht abgeschlossene Signatur
+
+compiler.err.dc.unterminated.string=Nicht abgeschlossene Zeichenfolge
+
+compiler.err.dc.ref.annotations.not.allowed=Annotationen nicht zul\u00E4ssig
+
+###
+# errors related to modules
+
+compiler.err.expected.module="module" erwartet
+
+# 0: symbol
+compiler.err.module.not.found=Modul nicht gefunden: {0}
+
+# 0: symbol
+compiler.warn.module.not.found=Modul nicht gefunden: {0}
+
+compiler.err.too.many.modules=Zu viele Moduldeklarationen gefunden
+
+compiler.err.module.not.found.on.module.source.path=Modul nicht in Modulquellpfad gefunden
+
+compiler.err.not.in.module.on.module.source.path=Nicht in einem Modul im Modulquellpfad
+
+# 0: symbol
+compiler.err.duplicate.module=Doppeltes Modul: {0}
+
+# 0: symbol
+compiler.err.duplicate.requires=Doppelte "requires": {0}
+
+# 0: symbol
+compiler.err.conflicting.exports=Doppelte oder unvereinbare Exporte: {0}
+
+# 0: symbol
+compiler.err.conflicting.opens=Doppelte oder unvereinbare "opens": {0}
+
+# 0: symbol
+compiler.err.conflicting.exports.to.module=Doppelte oder unvereinbare Exporte in Modul: {0}
+
+# 0: symbol
+compiler.err.conflicting.opens.to.module=Doppelte oder unvereinbare "opens" in Modul: {0}
+
+compiler.err.no.opens.unless.strong="opens" nur in starken Modulen zul\u00E4ssig
+
+# 0: symbol
+compiler.err.repeated.provides.for.service=Mehrere "provides" f\u00FCr Service {0}
+
+# 0: symbol, 1: symbol
+compiler.err.duplicate.provides=Doppelte "provides": Service {0}, Implementierung {1}
+
+# 0: symbol
+compiler.err.duplicate.uses=Doppelte Verwendungen: {0}
+
+# 0: symbol
+compiler.err.service.implementation.is.abstract=Die Serviceimplementierung ist eine abstrakte Klasse: {0}
+
+compiler.err.service.implementation.must.be.subtype.of.service.interface=Der Serviceimplementierungstyp muss ein Subtyp des Serviceschnittstellentyps sein oder eine \u00F6ffentliche statische no-args-Methode namens "provider" aufweisen, die die Serviceimplementierung zur\u00FCckgibt
+
+compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface=Der R\u00FCckgabetyp der "provider"-Methode muss ein Subtyp des Serviceschnittstellentyps sein
+
+# 0: symbol
+compiler.err.service.implementation.is.inner=Die Serviceimplementierung ist eine innere Klasse: {0}
+
+# 0: symbol
+compiler.err.service.definition.is.enum=Die Servicedefinition ist eine Enumeration: {0}
+
+# 0: symbol
+compiler.err.service.implementation.doesnt.have.a.no.args.constructor=Die Serviceimplementierung hat keinen Standardkonstruktor: {0}
+
+# 0: symbol
+compiler.err.service.implementation.no.args.constructor.not.public=Der "no arguments"-Konstruktor der Serviceimplementierung ist nicht \u00F6ffentlich: {0}
+
+# 0: symbol
+compiler.err.package.empty.or.not.found=Package ist leer oder nicht vorhanden: {0}
+
+# 0: symbol
+compiler.warn.package.empty.or.not.found=Package ist leer oder nicht vorhanden: {0}
+
+compiler.err.no.output.dir=Kein Klassenausgabeverzeichnis angegeben
+
+compiler.err.unnamed.pkg.not.allowed.named.modules=Unbenanntes Package ist in benannten Modulen nicht zul\u00E4ssig
+
+# 0: name, 1: name
+compiler.err.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} \u00FCberein
+
+# 0: name, 1: name
+compiler.misc.module.name.mismatch=Modulname {0} stimmt nicht mit dem erwarteten Namen {1} \u00FCberein
+
+# 0: name
+compiler.err.module.non.zero.opens=Bei ge\u00F6ffnetem Modul {0} ist opens_count ungleich Null
+
+# 0: name
+compiler.misc.module.non.zero.opens=Bei ge\u00F6ffnetem Modul {0} ist opens_count ungleich Null
+
+compiler.err.module.decl.sb.in.module-info.java=Moduldeklarationen m\u00FCssen in einer Datei namens module-info.java vorhanden sein
+
+# 0: set of string
+compiler.err.too.many.patched.modules=Zu viele gepatchte Module ({0}). Verwenden Sie --module-source-path
+
+# 0: name, 1: name
+compiler.err.file.patched.and.msp=Datei sowohl von --patch-module als auch von --module-source-path zug\u00E4nglich, geh\u00F6rt aber in jedem Pfad zu einem anderen Modul: {0}, {1}
+
+compiler.err.processorpath.no.processormodulepath=Unzul\u00E4ssige Kombination aus -processorpath und --processor-module-path
+
+# 0: symbol
+compiler.err.package.in.other.module=Package ist in einem anderen Modul vorhanden: {0}
+
+# 0: symbol, 1: name, 2: symbol, 3: symbol
+compiler.err.package.clash.from.requires=Modul {0} liest Package {1} sowohl aus {2} als auch aus {3}
+
+# 0: name, 1: symbol, 2: symbol
+compiler.err.package.clash.from.requires.in.unnamed=Das unbenannte Modul liest Package {0} sowohl aus {1} als auch aus {2}
+
+# 0: string
+compiler.err.module.not.found.in.module.source.path=Modul {0} nicht in Modulquellpfad gefunden
+
+compiler.err.output.dir.must.be.specified.with.dash.m.option=Klassenausgabeverzeichnis muss angegeben werden, wenn die Option -m verwendet wird
+
+compiler.err.modulesourcepath.must.be.specified.with.dash.m.option=Modulquellpfad muss angegeben werden, wenn die Option -m verwendet wird
+
+# 0: symbol
+compiler.err.service.implementation.not.in.right.module=Serviceimplementierung muss in demselben Modul wie die provides-Direktive definiert werden
+
+# 0: symbol
+compiler.err.cyclic.requires=Zyklische Abh\u00E4ngigkeit mit {0}
+
+# 0: fragment, 1: name
+compiler.err.duplicate.module.on.path=Doppeltes Modul in {0}\nModul in {1}
+
+# 0: option name, 1: string
+compiler.warn.bad.name.for.option=Ung\u00FCltiger Name im Wert f\u00FCr {0}-Option: "{1}"
+
+# 0: option name, 1: string
+compiler.err.bad.name.for.option=Ung\u00FCltiger Name im Wert f\u00FCr {0}-Option: "{1}"
+
+# 0: option name, 1: symbol
+compiler.warn.module.for.option.not.found=Modulname in {0}-Option nicht gefunden: {1}
+
+compiler.err.addmods.all.module.path.invalid=--add-modules ALL-MODULE-PATH kann nur beim Kompilieren des unbenannten Moduls oder beim Kompilieren im Kontext eines automatischen Moduls verwendet werden
+
+# 0: symbol
+compiler.err.add.exports.with.release=Export eines Packages aus Systemmodul {0} ist mit --release nicht zul\u00E4ssig
+
+# 0: symbol
+compiler.err.add.reads.with.release=Hinzuf\u00FCgen von Lese-Edges f\u00FCr Systemmodul {0} ist mit --release nicht zul\u00E4ssig
+
+compiler.warn.addopens.ignored=--add-opens hat zur Kompilierungszeit keine Auswirkungen
+
+compiler.misc.locn.module_source_path=Modulquellpfad
+
+compiler.misc.locn.upgrade_module_path=Upgrademodulpfad
+
+compiler.misc.locn.system_modules=Systemmodule
+
+compiler.misc.locn.module_path=Anwendungsmodulpfad
+
+compiler.misc.cant.resolve.modules=Module k\u00F6nnen nicht aufgel\u00F6st werden
+
+compiler.misc.bad.requires.flag=Ung\u00FCltiges requires-Kennzeichen: {0}
+
+# 0: string
+compiler.err.invalid.module.specifier=Modulbezeichner nicht zul\u00E4ssig: {0}
+
+# 0: symbol
+compiler.warn.service.provided.but.not.exported.or.used=Serviceschnittstelle angegeben, aber nicht exportiert oder verwendet
+
+# 0: kind name, 1: symbol, 2: symbol
+compiler.warn.leaks.not.accessible={0} {1} in Modul {2} ist nicht zug\u00E4nglich f\u00FCr Clients, die dieses Modul ben\u00F6tigen
+# 0: kind name, 1: symbol, 2: symbol
+compiler.warn.leaks.not.accessible.unexported={0} {1} in Modul {2} wird nicht exportiert
+# 0: kind name, 1: symbol, 2: symbol
+compiler.warn.leaks.not.accessible.not.required.transitive={0} {1} in Modul {2} wird nicht indirekt mit "requires transitive" exportiert
+# 0: kind name, 1: symbol, 2: symbol
+compiler.warn.leaks.not.accessible.unexported.qualified={0} {1} in Modul {2} ist m\u00F6glichweise nicht f\u00FCr alle Clients, die dieses Modul ben\u00F6tigen, sichtbar
+
+###
+# errors related to options
+
+# 0: string, 1: string
+compiler.err.illegal.argument.for.option=Unzul\u00E4ssiges Argument f\u00FCr {0}: {1}
+
+compiler.err.match.binding.exists=Unzul\u00E4ssiger Versuch, ein vorhandenes \u00DCbereinstimmungs-Binding neu zu definieren
+
+compiler.err.switch.case.unexpected.statement=Unerwartete Anweisung in Case. Ausdruck, Block oder throw-Anweisung erwartet
+
+compiler.err.switch.mixing.case.types=Unterschiedliche Case-Typen im Switch verwendet
+
+###
+# errors related to sealed classes
+
+# permits clause
+# 0: fragment
+compiler.err.invalid.permits.clause=Ung\u00FCltige PERMITS-Klausel\n({0})
+
+# 0: string
+compiler.misc.class.is.not.sealed={0} muss verschl\u00FCsselt sein
+
+# 0: type
+compiler.misc.is.a.type.variable=Darf keine Typvariablen enthalten: {0}
+
+# 0: type
+compiler.misc.is.duplicated=Darf keine Duplikate enthalten: {0}
+
+# 0: type
+compiler.misc.doesnt.extend.sealed=Unterklasse {0} muss verschl\u00FCsselte Klasse erweitern
+
+compiler.misc.must.not.be.same.class=Unzul\u00E4ssige Selbstreferenz in PERMITS-Klausel
+
+# 0: type
+compiler.misc.must.not.be.supertype=Unzul\u00E4ssige Referenz zu Supertyp {0}
+
+# other sealed types related errors
+
+compiler.err.sealed.class.must.have.subclasses=Verschl\u00FCsselte Klasse muss Unterklassen aufweisen
+
+# errors in subclasses of sealed classes
+# 0: symbol
+compiler.err.cant.inherit.from.sealed=Klasse darf nicht verschl\u00FCsselte Klasse erweitern: {0} (da diese nicht in der "permits"-Klausel enthalten ist)
+
+# 0: symbol
+compiler.err.class.in.unnamed.module.cant.extend.sealed.in.diff.package=Klasse {0} in unbenanntem Modul darf keine verschl\u00FCsselte Klasse in einem anderen Package erweitern
+
+# 0: symbol, 1: symbol
+compiler.err.class.in.module.cant.extend.sealed.in.diff.module=Klasse {0} in Modul {1} darf keine verschl\u00FCsselte Klasse in einem anderen Modul erweitern
+
+# 0: symbol
+compiler.err.non.sealed.with.no.sealed.supertype=Modifikator "non-sealed" ist hier nicht zul\u00E4ssig\n(Klasse {0} hat keine verschl\u00FCsselten Supertypen)
+
+compiler.err.non.sealed.sealed.or.final.expected=Modifikator "sealed", "non-sealed" oder "final" erwartet
+
+compiler.err.non.sealed.or.sealed.expected=Modifikator "sealed" oder "non-sealed" erwartet
+
+compiler.err.sealed.or.non.sealed.local.classes.not.allowed=Lokale Klassen mit "sealed" oder "non-sealed" nicht zul\u00E4ssig
+
+# 0: fragment
+compiler.err.local.classes.cant.extend.sealed=Klassen vom Typ "{0}" d\u00FCrfen keine verschl\u00FCsselten Klassen erweitern
+compiler.misc.anonymous=Anonym
+
+compiler.misc.local=Lokal
+
+###
+# errors related to records
+
+# record components
+compiler.err.record.cant.declare.field.modifiers=Datensatzkomponenten k\u00F6nnen keine Modifikatoren aufweisen
+
+# 0: symbol
+compiler.err.illegal.record.component.name=Unzul\u00E4ssiger Datensatzkomponentenname {0}
+
+compiler.err.record.component.and.old.array.syntax=Legacy-Arraynotation f\u00FCr Datensatzkomponenten nicht zul\u00E4ssig
+
+# accessor methods
+# 0: symbol, 1: fragment
+compiler.err.invalid.accessor.method.in.record=Ung\u00FCltige Accessor-Methode in Datensatz {0}\n({1})
+
+compiler.misc.method.must.be.public=Accessor-Methode muss \u00F6ffentlich sein
+
+# 0: symbol, 1: symbol
+compiler.misc.accessor.return.type.doesnt.match=R\u00FCckgabetyp von Accessor-Methode {0} muss mit dem Typ der Datensatzkomponente {1} \u00FCbereinstimmen
+
+compiler.misc.accessor.method.cant.throw.exception=Throws-Klausel f\u00FCr Accessor-Methode nicht zul\u00E4ssig
+
+compiler.misc.accessor.method.must.not.be.generic=Accessor-Methode darf nicht generisch sein
+
+compiler.misc.accessor.method.must.not.be.static=Accessor-Methode darf nicht statisch sein
+
+# canonical constructors
+# 0: fragment, 1: name, 2: fragment
+compiler.err.invalid.canonical.constructor.in.record=Ung\u00FCltiger Konstruktor vom Typ {0} in Datensatz {1}\n({2})
+
+compiler.misc.canonical=Kanonisch
+
+compiler.misc.compact=Kompakt
+
+# 0: fragment
+compiler.misc.throws.clause.not.allowed.for.canonical.constructor=Throws-Klausel f\u00FCr Konstruktor des Typs {0} nicht zul\u00E4ssig
+
+compiler.misc.canonical.with.name.mismatch=Ung\u00FCltige Parameternamen in kanonischem Konstruktor
+
+compiler.misc.canonical.cant.have.return.statement=Kompakter Konstruktor darf keine return-Anweisungen verwenden
+
+compiler.misc.canonical.must.not.declare.type.variables=Kanonischer Konstruktor darf keine Typvariablen deklarieren
+
+compiler.misc.type.must.be.identical.to.corresponding.record.component.type=Typ und Argumentanzahl m\u00FCssen mit den Werten der entsprechenden Datensatzkomponente \u00FCbereinstimmen
+compiler.misc.canonical.must.not.contain.explicit.constructor.invocation=Kanonischer Konstruktor darf keinen expliziten Konstruktoraufruf enthalten
+
+# 0: set of flag or string
+compiler.misc.canonical.must.not.have.stronger.access=Versuch, h\u00F6here Zugriffsberechtigungen zuzuweisen. War {0}
+
+# other
+compiler.err.record.cannot.declare.instance.fields=Felddeklaration muss statisch sein\n(ersetzen Sie unter Umst\u00E4nden das Feld durch eine Datensatzkomponente)
+
+# 0: symbol
+compiler.err.invalid.supertype.record=Klassen k\u00F6nnen {0} nicht direkt erweitern
+
+# 0: symbol
+compiler.err.first.statement.must.be.call.to.another.constructor=Konstruktor ist nicht kanonisch. Daher muss die erste Anweisung einen anderen Konstruktor der Klasse {0} aufrufen
+
+compiler.err.instance.initializer.not.allowed.in.records=Instanz-Initializer in Datens\u00E4tzen nicht zul\u00E4ssig
+
+compiler.err.static.declaration.not.allowed.in.inner.classes=Statische Deklarationen in inneren Klassen nicht zul\u00E4ssig
+
+compiler.err.record.header.expected=Datensatzheader erwartet
+
+############################################
+# messages previously at javac.properties
+
+compiler.err.empty.A.argument=-A erfordert ein Argument. Verwenden Sie "-Akey" oder "-Akey=value"
+
+# 0: string
+compiler.err.invalid.A.key=Schl\u00FCssel in Annotationsprozessoroption "{0}" ist keine durch Punkt getrennte ID-Sequenz
+
+# 0: string
+compiler.err.invalid.flag=Ung\u00FCltiges Kennzeichen: {0}
+
+compiler.err.profile.bootclasspath.conflict=Optionen "profile" und "bootclasspath" k\u00F6nnen nicht zusammen verwendet werden
+
+# 0: string
+compiler.err.invalid.profile=Ung\u00FCltiges Profil: {0}
+
+# 0: string
+compiler.err.invalid.target=Ung\u00FCltiges Zielrelease: {0}
+
+# 0: option name, 1: target
+compiler.err.option.not.allowed.with.target=Option {0} mit Ziel {1} nicht zul\u00E4ssig
+
+# 0: string
+compiler.err.option.too.many=Option {0} kann nur einmal angegeben werden
+
+compiler.err.no.source.files=Keine Quelldateien
+
+compiler.err.no.source.files.classes=Keine Quelldateien oder Klassennamen
+
+# 0: string
+compiler.err.req.arg={0} erfordert ein Argument
+
+# 0: string
+compiler.err.invalid.source=Ung\u00FCltiges Quellrelease: {0}
+
+# 0: string, 1: string
+compiler.err.error.writing.file=Fehler beim Schreiben von {0}. {1}
+
+compiler.err.sourcepath.modulesourcepath.conflict=--source-path und --module-source-path k\u00F6nnen nicht beide angegeben werden
+
+# 0: string, 1: target
+compiler.warn.source.target.conflict=Quellrelease {0} erfordert Zielrelease {1}
+
+# 0: string, 1: target
+compiler.warn.target.default.source.conflict=Zielrelease {0} steht mit Standardquellrelease {1} in Konflikt
+
+# 0: profile, 1: target
+compiler.warn.profile.target.conflict=Profil {0} ist f\u00FCr Zielrelease {1} nicht g\u00FCltig
+
+# 0: string
+compiler.err.file.not.directory=Kein Verzeichnis: {0}
+
+# 0: object
+compiler.err.file.not.file=Keine Datei: {0}
+
+compiler.err.two.class.loaders.1=javac ist auf mehrere Class Loader aufgeteilt: Pr\u00FCfen Sie die Konfiguration
+
+# 0: url, 1: url
+compiler.err.two.class.loaders.2=javac ist auf mehrere Class Loader aufgeteilt:\nEine Klasse stammt aus Datei {0},\nw\u00E4hrend javac aus {1} stammt
+
+# 0: string, 1: string
+compiler.err.bad.value.for.option=Ung\u00FCltiger Wert f\u00FCr {0}-Option: "{1}"
+
+# 0: string
+compiler.err.no.value.for.option=Kein Wert f\u00FCr {0}-Option
+
+# 0: string
+compiler.err.repeated.value.for.patch.module=--patch-module mehrmals f\u00FCr Modul {0} angegeben
+
+# 0: string
+compiler.err.repeated.value.for.module.source.path=--module-source-path mehrmals f\u00FCr Modul {0} angegeben
+
+compiler.err.multiple.values.for.module.source.path=--module-source-path mehrmals mit Musterargument angegeben
+
+# 0: string
+compiler.err.unmatched.quote=Alleinstehendes Anf\u00FChrungszeichen in Umgebungsvariable {0}
+
+# 0: option name
+compiler.err.release.bootclasspath.conflict=Option {0} kann nicht zusammen mit --release verwendet werden
+
+# 0: string
+compiler.err.unsupported.release.version=Releaseversion {0} nicht unterst\u00FCtzt
+
+# 0: string
+compiler.err.file.not.found=Datei nicht gefunden: {0}
+
+# 0: string, 1: source
+compiler.err.preview.not.latest=Ung\u00FCltiges Quellrelease {0} mit --enable-preview\n(Vorschausprachfeatures werden nur f\u00FCr Release {1} unterst\u00FCtzt)
+
+compiler.err.preview.without.source.or.release=--enable-preview muss mit -source oder --release verwendet werden
+
+# 0: kind name, 1: symbol
+compiler.warn.declared.using.preview={0} {1} ist mit einem Vorschaufeature deklariert, das in einem zuk\u00FCnftigen Release entfernt werden kann.
+
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=Versuch der Synchronisierung f\u00FCr eine Instanz einer wertbasierten Klasse
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
index 2e071a4059a..86c65650c59 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
@@ -119,7 +119,7 @@ compiler.err.annotation.missing.default.value.1=\u6CE8\u91C8@{0}\u306B\u306F\u89
 # 0: type
 compiler.err.annotation.not.valid.for.type=\u6CE8\u91C8\u306F\u578B{0}\u306E\u8981\u7D20\u306B\u5BFE\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
-compiler.err.annotation.type.not.applicable=\u6CE8\u91C8\u578B\u306F\u3053\u306E\u7A2E\u985E\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+compiler.err.annotation.type.not.applicable=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3053\u306E\u7A2E\u985E\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 
 # 0: type
 compiler.err.annotation.type.not.applicable.to.type=\u6CE8\u91C8@{0}\u306F\u3053\u306E\u578B\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
@@ -263,12 +263,14 @@ compiler.misc.lambda=\u30E9\u30E0\u30C0\u5F0F
 
 compiler.misc.inner.cls=\u5185\u90E8\u30AF\u30E9\u30B9
 
+compiler.misc.guard=\u30AC\u30FC\u30C9
+
 # 0: type
 compiler.err.cant.deref={0}\u306F\u9593\u63A5\u53C2\u7167\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.cant.extend.intf.annotation=@interfaces\u3067\u306F''extends''\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
 
-compiler.err.annotation.decl.not.allowed.here=\u3053\u3053\u3067\u306F\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+compiler.err.annotation.decl.not.allowed.here=\u3053\u3053\u3067\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
 
 # 0: symbol
 compiler.err.cant.inherit.from.final=final {0}\u304B\u3089\u306F\u7D99\u627F\u3067\u304D\u307E\u305B\u3093
@@ -307,7 +309,7 @@ compiler.err.no.superclass={0}\u306B\u306F\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
 compiler.err.concrete.inheritance.conflict={1}\u306E\u30E1\u30BD\u30C3\u30C9{0}\u3068{3}\u306E{2}\u306F\u540C\u3058\u30B7\u30B0\u30CB\u30C1\u30E3\u304B\u3089\u7D99\u627F\u3055\u308C\u3066\u3044\u307E\u3059
 
-compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
+compiler.err.default.allowed.in.intf.annotation.member=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059
 
 # 0: symbol
 compiler.err.doesnt.exist=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
@@ -319,7 +321,7 @@ compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91C8{0}\u306F\u6709\u
 compiler.err.duplicate.annotation.member.value=\u6CE8\u91C8@{1}\u306B\u91CD\u8907\u3057\u305F\u8981\u7D20''{0}''\u304C\u3042\u308A\u307E\u3059\u3002
 
 # 0: type
-compiler.err.duplicate.annotation.missing.container={0}\u306F\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.duplicate.annotation.missing.container={0}\u306F\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation=\u6CE8\u91C8\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: {0}\u306F\u7121\u52B9\u306A@Repeatable\u6CE8\u91C8\u3067\u6CE8\u91C8\u4ED8\u3051\u3055\u308C\u3066\u3044\u307E\u3059
@@ -334,22 +336,22 @@ compiler.err.invalid.repeatable.annotation.multiple.values={0}\u306F\u6709\u52B9
 compiler.err.invalid.repeatable.annotation.invalid.value={0}\u306F\u6709\u52B9\u306A@Repeatable\u3067\u306F\u3042\u308A\u307E\u305B\u3093: \u5024\u8981\u7D20\u304C\u7121\u52B9\u3067\u3059
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u578B{2}\u306E\u8981\u7D20''value''\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u578B{2}\u306E\u8981\u7D20''value''\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306B\u306F\u8981\u7D20{1}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306E\u4FDD\u6709\u304C\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({2})\u306E\u4FDD\u6709\u3088\u308A\u77ED\u304F\u306A\u3063\u3066\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306E\u4FDD\u6709\u304C\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({2})\u306E\u4FDD\u6709\u3088\u308A\u77ED\u304F\u306A\u3063\u3066\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u9055\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.not.documented=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u306F@Documented\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u9055\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u9055\u3044\u307E\u3059
+compiler.err.invalid.repeatable.annotation.not.inherited=\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u306F@Inherited\u3067\u3059\u304C\u3001\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u9055\u3044\u307E\u3059
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u578B({0})\u306F\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u578B({1})\u3088\u308A\u591A\u304F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059
+compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u3059\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({0})\u306F\u3001\u7E70\u8FD4\u3057\u53EF\u80FD\u306A\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9({1})\u3088\u308A\u591A\u304F\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u30B3\u30F3\u30C6\u30CA{0}\u306F\u542B\u307E\u308C\u3066\u3044\u308B\u8981\u7D20\u3068\u540C\u6642\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093
@@ -368,8 +370,21 @@ compiler.err.same.binary.name=\u30AF\u30E9\u30B9: {0}\u3068{1}\u306E\u30D0\u30A4
 
 compiler.err.duplicate.case.label=case\u30E9\u30D9\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
 
+compiler.err.pattern.dominated=\u5148\u884C\u3059\u308Bcase\u30E9\u30D9\u30EB\u304C\u3001\u3053\u306Ecase\u30E9\u30D9\u30EB\u3088\u308A\u3082\u512A\u4F4D\u3067\u3059
+
 compiler.err.duplicate.default.label=default\u30E9\u30D9\u30EB\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
 
+compiler.err.duplicate.total.pattern=\u5408\u8A08\u30D1\u30BF\u30FC\u30F3\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
+
+compiler.err.total.pattern.and.default=switch\u306B\u5408\u8A08\u30D1\u30BF\u30FC\u30F3\u3068default\u30E9\u30D9\u30EB\u306E\u4E21\u65B9\u304C\u3042\u308A\u307E\u3059
+
+# 0: type, 1: type
+compiler.err.constant.label.not.compatible=\u30BF\u30A4\u30D7{0}\u306E\u5B9A\u6570\u30E9\u30D9\u30EB\u304Cswitch\u30BB\u30EC\u30AF\u30BF\u30FB\u30BF\u30A4\u30D7{1}\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093
+
+compiler.err.flows.through.to.pattern=\u30D1\u30BF\u30FC\u30F3\u306B\u5BFE\u3057\u3066\u4E0D\u6B63\u306Afall-through
+
+compiler.err.flows.through.from.pattern=\u30D1\u30BF\u30FC\u30F3\u304B\u3089\u306E\u4E0D\u6B63\u306Afall-through
+
 compiler.err.else.without.if=''else''\u3078\u306E''if''\u304C\u3042\u308A\u307E\u305B\u3093
 
 compiler.err.empty.char.lit=\u7A7A\u306E\u6587\u5B57\u30EA\u30C6\u30E9\u30EB\u3067\u3059
@@ -379,13 +394,13 @@ compiler.err.encl.class.required={0}\u3092\u542B\u3080\u56F2\u3046\u30A4\u30F3\u
 
 compiler.err.enum.annotation.must.be.enum.constant=\u5217\u6319\u578B\u6CE8\u91C8\u5024\u306F\u3001\u5217\u6319\u578B\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.err.enum.cant.be.instantiated=\u5217\u6319\u578B\u306F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093
+compiler.err.enum.cant.be.instantiated=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.enum.label.must.be.unqualified.enum=\u5217\u6319\u578B\u306Eswitch case\u30E9\u30D9\u30EB\u306F\u5217\u6319\u578B\u5B9A\u6570\u306E\u975E\u4FEE\u98FE\u540D\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 compiler.err.enum.no.subclassing=\u30AF\u30E9\u30B9\u306F\u76F4\u63A5java.lang.Enum\u3092\u62E1\u5F35\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.enum.types.not.extensible=\u5217\u6319\u578B\u306F\u62E1\u5F35\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.enum.types.not.extensible=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u62E1\u5F35\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 compiler.err.enum.no.finalize=\u5217\u6319\u578B\u306Ffinalize\u30E1\u30BD\u30C3\u30C9\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
@@ -495,21 +510,21 @@ compiler.err.incomparable.types=\u578B{0}\u3068{1}\u306F\u6BD4\u8F03\u3067\u304D
 # 0: string
 compiler.err.int.number.too.large=\u6574\u6570\u304C\u5927\u304D\u3059\u304E\u307E\u3059\u3002
 
-compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91C8\u578B\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u304C\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u304C\u4EEE\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093
 
 # 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u578B{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{0}\u306F\u6C4E\u7528\u306B\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91C8\u578B\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u306F\u6C4E\u7528\u30E1\u30BD\u30C3\u30C9\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\u5185\u306E\u8981\u7D20\u306F\u6C4E\u7528\u30E1\u30BD\u30C3\u30C9\u306B\u3067\u304D\u307E\u305B\u3093
 
 # 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=\u6CE8\u91C8\u578B{1}\u3067\u30E1\u30BD\u30C3\u30C9{0}\u3068\u540C\u3058\u540D\u524D\u306E\u8981\u7D20\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+compiler.err.intf.annotation.member.clash=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9{1}\u3067\u30E1\u30BD\u30C3\u30C9{0}\u3068\u540C\u3058\u540D\u524D\u306E\u8981\u7D20\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
 
 compiler.err.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304C\u5FC5\u8981\u3067\u3059
 
 compiler.err.intf.meth.cant.have.body=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u62BD\u8C61\u30E1\u30BD\u30C3\u30C9\u304C\u672C\u4F53\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u578B\u8981\u7D20\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
+compiler.err.invalid.annotation.member.type=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20\u306E\u578B\u304C\u7121\u52B9\u3067\u3059
 
 compiler.err.invalid.binary.number=2\u9032\u6570\u5B57\u306F\u5C11\u306A\u304F\u3068\u30821\u6841\u306E2\u9032\u6570\u3092\u542B\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
@@ -535,7 +550,7 @@ compiler.err.label.already.in.use=\u30E9\u30D9\u30EB{0}\u306F\u3059\u3067\u306B\
 # 0: symbol
 compiler.err.local.var.accessed.from.icls.needs.final=\u30ED\u30FC\u30AB\u30EB\u5909\u6570{0}\u306F\u5185\u90E8\u30AF\u30E9\u30B9\u304B\u3089\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u307E\u3059\u3002final\u3067\u5BA3\u8A00\u3055\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.err.local.enum=\u5217\u6319\u578B\u306F\u30ED\u30FC\u30AB\u30EB\u306B\u3067\u304D\u307E\u305B\u3093
+compiler.err.local.enum=\u5217\u6319\u30AF\u30E9\u30B9\u306F\u30ED\u30FC\u30AB\u30EB\u306B\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.cannot.create.array.with.type.arguments=\u578B\u5F15\u6570\u3092\u6301\u3064\u914D\u5217\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
 
@@ -649,7 +664,7 @@ compiler.err.no.intf.expected.here=\u3053\u3053\u306B\u30A4\u30F3\u30BF\u30D5\u3
 compiler.err.no.match.entry={0}\u306F{1}\u306E\u30A8\u30F3\u30C8\u30EA\u306B\u9069\u5408\u3057\u307E\u305B\u3093\u3002{2}\u304C\u5FC5\u8981\u3067\u3059
 
 # 0: type
-compiler.err.not.annotation.type={0}\u306F\u6CE8\u91C8\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+compiler.err.not.annotation.type={0}\u306F\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 # 0: symbol, 1: symbol, 2: message segment
 compiler.err.not.def.access.package.cant.access={0} \u306F\u8868\u793A\u4E0D\u53EF\u3067\u3059\n({2})
@@ -836,6 +851,8 @@ compiler.err.static.imp.only.classes.and.interfaces=static import\u306F\u30AF\u3
 
 compiler.err.string.const.req=\u5B9A\u6570\u306E\u6587\u5B57\u5217\u5F0F\u304C\u5FC5\u8981\u3067\u3059
 
+compiler.err.pattern.expected=\u30BF\u30A4\u30D7\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u5FC5\u8981\u3067\u3059
+
 # 0: symbol, 1: fragment
 compiler.err.cannot.generate.class=\u30AF\u30E9\u30B9{0}\u306E\u751F\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\n({1})
 
@@ -966,6 +983,8 @@ compiler.err.unreachable.stmt=\u3053\u306E\u6587\u306B\u5236\u5FA1\u304C\u79FB\u
 
 compiler.err.not.exhaustive=switch\u5F0F\u304C\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u3092\u30AB\u30D0\u30FC\u3057\u3066\u3044\u307E\u305B\u3093
 
+compiler.err.not.exhaustive.statement=switch\u6587\u304C\u3059\u3079\u3066\u306E\u53EF\u80FD\u306A\u5165\u529B\u5024\u3092\u30AB\u30D0\u30FC\u3057\u3066\u3044\u307E\u305B\u3093
+
 compiler.err.initializer.must.be.able.to.complete.normally=\u521D\u671F\u5316\u5B50\u306F\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
 compiler.err.initializer.not.allowed=\u30A4\u30CB\u30B7\u30E3\u30E9\u30A4\u30B6\u306Finterfaces\u3067\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
@@ -1006,7 +1025,7 @@ compiler.misc.varargs.trustme.on.reifiable.varargs=\u53EF\u5909\u5F15\u6570\u898
 compiler.err.instanceof.reifiable.not.safe={0}\u3092{1}\u306B\u5B89\u5168\u306B\u30AD\u30E3\u30B9\u30C8\u3067\u304D\u307E\u305B\u3093
 
 # 0: type, 1: type
-compiler.err.instanceof.pattern.no.subtype=\u30D1\u30BF\u30FC\u30F3\u30FB\u30BF\u30A4\u30D7{0}\u306F\u5F0F\u30BF\u30A4\u30D7{1}\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3059
+compiler.err.instanceof.pattern.no.subtype=\u5F0F\u30BF\u30A4\u30D7{0}\u306F\u30D1\u30BF\u30FC\u30F3\u30FB\u30BF\u30A4\u30D7{1}\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3059
 
 # 0: symbol
 compiler.misc.varargs.trustme.on.non.varargs.meth=\u30E1\u30BD\u30C3\u30C9{0}\u306F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
@@ -1073,12 +1092,12 @@ compiler.err.locn.invalid.arg.for.xpatch=--patch-module\u30AA\u30D7\u30B7\u30E7\
 
 compiler.err.file.sb.on.source.or.patch.path.for.module=\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3001\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30C1\u30FB\u30D1\u30B9\u306B\u5B58\u5728\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
+compiler.err.no.java.lang=\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30AF\u30E9\u30B9\u3067\u30D1\u30C3\u30B1\u30FC\u30B8java.lang\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
+
 #####
 
 # Fatal Errors
 
-compiler.misc.fatal.err.no.java.lang=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30AF\u30E9\u30B9\u30D1\u30B9\u307E\u305F\u306F\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u3067\u30D1\u30C3\u30B1\u30FC\u30B8java.lang\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
-
 # 0: name
 compiler.misc.fatal.err.cant.locate.meth=\u81F4\u547D\u7684\u30A8\u30E9\u30FC: \u30E1\u30BD\u30C3\u30C9{0}\u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093
 
@@ -1168,19 +1187,21 @@ compiler.note.unchecked.filename.additional={0}\u306B\u672A\u30C1\u30A7\u30C3\u3
 
 compiler.note.unchecked.plural.additional=\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u64CD\u4F5C\u306E\u3046\u3061\u3001\u672A\u30C1\u30A7\u30C3\u30AF\u307E\u305F\u306F\u5B89\u5168\u3067\u306F\u306A\u3044\u3082\u306E\u304C\u3055\u3089\u306B\u3042\u308A\u307E\u3059\u3002
 
-# 0: file name
-compiler.note.preview.filename={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: file name, 1: source
+compiler.note.preview.filename={0}\u306FJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
-compiler.note.preview.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: source
+compiler.note.preview.plural=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306FJava SE {0}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 # The following string may appear after one of the above deprecation
 # messages.
 compiler.note.preview.recompile=\u8A73\u7D30\u306F\u3001-Xlint:preview\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-# 0: file name
-compiler.note.preview.filename.additional={0}\u306F\u8FFD\u52A0\u3067\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: file name, 1: source
+compiler.note.preview.filename.additional={0}\u306BJava SE {1}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u8FFD\u52A0\u4F7F\u7528\u304C\u3042\u308A\u307E\u3059\u3002
 
-compiler.note.preview.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306F\u8FFD\u52A0\u3067\u30D7\u30EC\u30D3\u30E5\u30FC\u8A00\u8A9E\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+# 0: source
+compiler.note.preview.plural.additional=\u4E00\u90E8\u306E\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306FJava SE {0}\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u8FFD\u52A0\u4F7F\u7528\u3057\u307E\u3059\u3002
 
 # Notes related to annotation processing
 
@@ -1269,6 +1290,8 @@ compiler.warn.dir.path.element.not.directory=\u4E0D\u6B63\u306A\u30D1\u30B9\u898
 # 0: symbol, 1: symbol, 2: symbol
 compiler.warn.missing-explicit-ctor=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8{1}\u306E\u30AF\u30E9\u30B9{0}\u306F\u660E\u793A\u7684\u306A\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u5BA3\u8A00\u3057\u306A\u3044\u305F\u3081\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3092\u30E2\u30B8\u30E5\u30FC\u30EB{2}\u306E\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306B\u516C\u958B\u3057\u307E\u3059
 
+compiler.warn.strictfp=\u30EA\u30EA\u30FC\u30B917\u4EE5\u964D\u3001\u3059\u3079\u3066\u306E\u6D6E\u52D5\u5C0F\u6570\u70B9\u5F0F\u306F\u53B3\u5BC6\u306B\u8A55\u4FA1\u3055\u308C\u3001''strictfp''\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
+
 compiler.warn.finally.cannot.complete=finally\u7BC0\u304C\u6B63\u5E38\u306B\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093
 
 # 0: name
@@ -1284,10 +1307,13 @@ compiler.warn.has.been.deprecated={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u30
 compiler.warn.has.been.deprecated.for.removal={1}\u306E{0}\u306F\u63A8\u5968\u3055\u308C\u3066\u304A\u3089\u305A\u3001\u524A\u9664\u7528\u306B\u30DE\u30FC\u30AF\u3055\u308C\u3066\u3044\u307E\u3059
 
 # 0: symbol
-compiler.warn.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u4E00\u90E8\u3067\u3042\u308BAPI\u3067\u3059
+compiler.warn.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 
 # 0: symbol
-compiler.err.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306E\u4E00\u90E8\u3067\u3042\u308BAPI\u3067\u3059
+compiler.err.is.preview={0}\u306F\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\n(\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F--enable-preview\u3092\u4F7F\u7528\u3057\u307E\u3059)
+
+# 0: symbol
+compiler.warn.is.preview.reflective={0}\u306F\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3042\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 
 # 0: symbol
 compiler.warn.has.been.deprecated.module=\u30E2\u30B8\u30E5\u30FC\u30EB{0}\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093
@@ -1303,6 +1329,11 @@ compiler.warn.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57\u306F\u3001\u30
 # 0: symbol
 compiler.warn.improper.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Bstatic final\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
+compiler.warn.improper.SPF=serialPersistentFields\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001private static final\u3068\u3057\u3066\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+compiler.warn.SPF.null.init=null\u306B\u521D\u671F\u5316\u3059\u308B\u3068serialPersistentFields\u306F\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u306A\u3044\u3053\u3068\u3092\u793A\u3059\u306B\u306F\u3001\u7A7A\u306E\u914D\u5217\u306B\u521D\u671F\u5316\u3057\u307E\u3059
+
+
 # 0: type, 1: type
 compiler.warn.inexact.non-varargs.call=\u6700\u7D42\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u4E0D\u6B63\u78BA\u306A\u5F15\u6570\u578B\u3092\u6301\u3063\u305F\u53EF\u5909\u5F15\u6570\u30E1\u30BD\u30C3\u30C9\u306E\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u3002\n\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{0}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u307E\u3059\u3002\n\u975E\u53EF\u5909\u5F15\u6570\u547C\u51FA\u3057\u306B\u95A2\u3057\u3066\u306F{1}\u306B\u30AD\u30E3\u30B9\u30C8\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059
 
@@ -1315,9 +1346,67 @@ compiler.warn.unreachable.catch.1=catch\u53E5\u306B\u79FB\u3059\u3053\u3068\u304
 # 0: symbol
 compiler.warn.long.SVUID=serialVersionUID\u306F\u3001\u30AF\u30E9\u30B9{0}\u306Elong\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
+compiler.warn.OSF.array.SPF=serialPersistentFields\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30BF\u30A4\u30D7\u3092java.io.ObjectStreamField[]\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
 # 0: symbol
 compiler.warn.missing.SVUID=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9{0}\u306B\u306F\u3001serialVersionUID\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 
+# 0: name
+compiler.warn.serializable.missing.access.no.arg.ctor=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u4E0D\u53EF\u306E\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9{0}\u3067\u5F15\u6570\u306A\u3057\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
+
+# 0: name
+compiler.warn.serial.method.not.private=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306Fprivate\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+
+# 0: name
+compiler.warn.serial.concrete.instance.method=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001concrete\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002abstract\u3067\u3082static\u3067\u3082\u3042\u308A\u307E\u305B\u3093
+
+# 0: name
+compiler.warn.serial.method.static=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u304Cstatic\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u304B\u308F\u308A\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+# 0: name
+compiler.warn.serial.method.no.args=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044
+
+# 0: name, 1: number
+compiler.warn.serial.method.one.arg=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306B\u3001{1}\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u306A\u304F\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30921\u3064\u306E\u307F\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.parameter.type=\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306E1\u3064\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3001\u578B{2}\u3067\u306F\u306A\u304F\u3001\u578B{1}\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.unexpected.return.type=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u3001\u5FC5\u8981\u306A\u578B{2}\u3067\u306F\u306A\u304F\u3001{1}\u306E\u623B\u308A\u578B\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u3088\u3046\u306B\u3001\u30E1\u30BD\u30C3\u30C9\u306F\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u304C\u7121\u52B9\u306B\u306A\u308A\u307E\u3059
+
+# 0: name, 1: type
+compiler.warn.serial.method.unexpected.exception=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u4E88\u671F\u3057\u306A\u3044\u578B{1}\u3092\u30B9\u30ED\u30FC\u3059\u308B\u3088\u3046\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+
+compiler.warn.ineffectual.serial.field.interface=serialPersistentFields\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+# 0: string
+compiler.warn.ineffectual.serial.field.enum=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30D5\u30A3\u30FC\u30EB\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+# 0: string
+compiler.warn.ineffectual.serial.method.enum=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5217\u6319\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+compiler.warn.ineffectual.serial.field.record=serialPersistentFields\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+# 0: string
+compiler.warn.ineffectual.serial.method.record=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u30EC\u30B3\u30FC\u30C9\u30FB\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+# 0: name
+compiler.warn.ineffectual.serial.method.externalizable=\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9{0}\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+
+compiler.warn.externalizable.missing.public.no.arg.ctor=\u5916\u90E8\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306B\u306F\u5F15\u6570\u306A\u3057\u3067\u30D1\u30D6\u30EA\u30C3\u30AF\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u5FC5\u8981\u3067\u3059
+
+compiler.warn.non.serializable.instance.field=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306E\u5E38\u99D0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u76F4\u5217\u4E0D\u53EF\u30BF\u30A4\u30D7\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+
+# 0: type
+compiler.warn.non.serializable.instance.field.array=\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306E\u5E38\u99D0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u76F4\u5217\u4E0D\u53EF\u306E\u30D9\u30FC\u30B9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7{0}\u3092\u6301\u3064\u914D\u5217\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059
+
+compiler.warn.non.private.method.weaker.access=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067private\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u305F\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u30E1\u30BD\u30C3\u30C9\u306B\u3088\u3063\u3066\u3001\n\u305D\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u30AF\u30E9\u30B9\u304C\u30E1\u30BD\u30C3\u30C9\u3092private\u3068\u3057\u3066\u5BA3\u8A00\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059
+
+compiler.warn.default.ineffective=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u95A2\u9023\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u30AF\u30E9\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u305F\u3081\u306E\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u3067\u5B9F\u884C\u3055\u308C\u307E\u305B\u3093
+
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.warn.potentially.ambiguous.overload={1}\u5185\u306E{0}\u306F{3}\u5185\u306E{2}\u3068\u77DB\u76FE\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059
 
@@ -1404,7 +1493,7 @@ compiler.warn.proc.suspicious.class.name=\u540D\u524D\u304C{1}\u3067\u7D42\u308F
 compiler.warn.proc.file.create.last.round=\u6700\u5F8C\u306B\u4F5C\u6210\u3055\u308C\u305F\u30BF\u30A4\u30D7''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u6CE8\u91C8\u51E6\u7406\u306B\u6E21\u3055\u308C\u307E\u305B\u3093\u3002
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u304C\u8FD4\u3057\u305F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u6CE8\u91C8\u578B\u306E\u6587\u5B57\u5217''{0}''\u304C\u4E0D\u6B63\u3067\u3059
+compiler.warn.proc.malformed.supported.string=\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u304C\u8FD4\u3057\u305F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6587\u5B57\u5217''{0}''\u304C\u4E0D\u6B63\u3067\u3059
 
 # 0: set of string
 compiler.warn.proc.annotations.without.processors=\u3053\u308C\u3089\u306E\u6CE8\u91C8\u3092\u8981\u6C42\u3059\u308B\u30D7\u30ED\u30BB\u30C3\u30B5\u306F\u3042\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}
@@ -1416,10 +1505,10 @@ compiler.warn.proc.processor.incompatible.source.version=\u6CE8\u91C8\u30D7\u30E
 compiler.warn.proc.duplicate.option.name=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u6CE8\u91C8\u578B''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
+compiler.warn.proc.duplicate.supported.annotation=\u91CD\u8907\u3059\u308B\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9''{0}''\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{1}''\u306B\u3088\u3063\u3066\u8FD4\u3055\u308C\u307E\u3057\u305F
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306F''*''\u3068\u4ED6\u306E\u6CE8\u91C8\u578B\u3092\u91CD\u8907\u3057\u3066\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
+compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5''{0}''\u306F''*''\u3068\u4ED6\u306E\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u91CD\u8907\u3057\u3066\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
 
 compiler.warn.proc.proc-only.requested.no.procs=\u30B3\u30F3\u30D1\u30A4\u30EB\u306A\u3057\u306E\u6CE8\u91C8\u51E6\u7406\u304C\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 
@@ -1475,6 +1564,8 @@ compiler.warn.deprecated.annotation.has.no.effect=@Deprecated\u6CE8\u91C8\u306F\
 # 0: string
 compiler.warn.invalid.path=\u30D5\u30A1\u30A4\u30EB\u540D\u304C\u7121\u52B9\u3067\u3059: {0}
 
+compiler.warn.doclint.not.available=\u4F7F\u7528\u53EF\u80FD\u306Adoclint\u306E\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u306F\u3042\u308A\u307E\u305B\u3093
+
 # 0: string
 compiler.err.invalid.path=\u30D5\u30A1\u30A4\u30EB\u540D\u304C\u7121\u52B9\u3067\u3059: {0}
 
@@ -1577,8 +1668,6 @@ compiler.err.enum.constant.expected=\u3053\u3053\u306B\u5217\u6319\u578B\u5B9A\u
 compiler.err.enum.constant.not.expected=\u3053\u3053\u306B\u5217\u6319\u578B\u5B9A\u6570\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
 
 ## The following are related in form, but do not easily fit the above paradigm.
-compiler.err.expected.module=''\u30E2\u30B8\u30E5\u30FC\u30EB''\u304C\u5FC5\u8981\u3067\u3059
-
 compiler.err.expected.module.or.open=''\u30E2\u30B8\u30E5\u30FC\u30EB''\u307E\u305F\u306F''\u30AA\u30FC\u30D7\u30F3''\u304C\u5FC5\u8981\u3067\u3059
 
 compiler.err.dot.class.expected=''.class''\u304C\u3042\u308A\u307E\u305B\u3093
@@ -2103,6 +2192,10 @@ compiler.misc.feature.records=\u30EC\u30B3\u30FC\u30C9
 
 compiler.misc.feature.sealed.classes=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
 
+compiler.misc.feature.case.null=switch case\u306Enull
+
+compiler.misc.feature.pattern.switch=switch\u6587\u306E\u30D1\u30BF\u30FC\u30F3
+
 compiler.warn.underscore.as.identifier=\u30EA\u30EA\u30FC\u30B99\u304B\u3089''_''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
 compiler.err.underscore.as.identifier=\u30EA\u30EA\u30FC\u30B99\u304B\u3089''_''\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u306A\u306E\u3067\u8B58\u5225\u5B50\u3068\u3057\u3066\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
@@ -2174,6 +2267,28 @@ compiler.note.deferred.method.inst=\u30E1\u30BD\u30C3\u30C9{0}\u306E\u9045\u5EF6
 # 0: symbol
 compiler.note.verbose.l2m.deduplicate=\u91CD\u8907\u9664\u5916\u30E9\u30E0\u30C0\u5B9F\u88C5\u30E1\u30BD\u30C3\u30C9{0}
 
+########################################
+# Diagnostics for method reference search
+# results used by Resolve (debug only)
+########################################
+
+# 0: fragment, 1: string, 2: number
+compiler.note.method.ref.search.results.multi={1}\u306E{0}\u306E\u691C\u7D22\u7D50\u679C(\u6700\u3082\u53B3\u5BC6\u306A\u3082\u306E{2}\u500B)\n\u4F7F\u7528\u53EF\u80FD\u306A\u5019\u88DC:
+
+# 0: number, 1: fragment, 2: symbol
+compiler.misc.applicable.method.found.2=\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C#{0}\u500B\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} {2}
+
+# 0: number, 1: fragment, 2: symbol, 3: message segment
+compiler.misc.applicable.method.found.3=\u4F7F\u7528\u53EF\u80FD\u30E1\u30BD\u30C3\u30C9\u304C#{0}\u500B\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {1} {2}\n({3})
+
+compiler.misc.static=static
+
+compiler.misc.non.static=static\u3067\u306A\u3044
+
+compiler.misc.bound=\u30D0\u30A4\u30F3\u30C9
+
+compiler.misc.unbound=\u30D0\u30A4\u30F3\u30C9\u306A\u3057
+
 ########################################
 # Diagnostics for where clause implementation
 # used by the RichDiagnosticFormatter.
@@ -2260,7 +2375,7 @@ compiler.err.dc.no.tag.name='@'\u306E\u5F8C\u306B\u30BF\u30B0\u540D\u304C\u3042\
 
 compiler.err.dc.gt.expected=''>''\u304C\u5FC5\u8981\u3067\u3059
 
-compiler.err.dc.ref.bad.parens=\u53C2\u7167\u306B'')''\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.dc.ref.bad.parens=\u30AB\u30C3\u30B3\u306E\u5F8C\u306E\u4E88\u671F\u3057\u306A\u3044\u30C6\u30AD\u30B9\u30C8\u3067\u3059
 
 compiler.err.dc.ref.syntax.error=\u53C2\u7167\u306B\u69CB\u6587\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059
 
@@ -2274,6 +2389,8 @@ compiler.err.dc.unterminated.signature=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u7D4
 
 compiler.err.dc.unterminated.string=\u6587\u5B57\u5217\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
 
+compiler.err.dc.ref.annotations.not.allowed=\u6CE8\u91C8\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+
 ###
 # errors related to modules
 
@@ -2450,8 +2567,6 @@ compiler.err.illegal.argument.for.option={0}\u306E\u5F15\u6570\u304C\u4E0D\u6B63
 
 compiler.err.match.binding.exists=\u65E2\u5B58\u306E\u4E00\u81F4\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u518D\u5B9A\u7FA9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 
-compiler.err.switch.null.not.allowed=case\u306Enull\u30E9\u30D9\u30EB\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
-
 compiler.err.switch.case.unexpected.statement=case\u306E\u4E88\u671F\u3057\u306A\u3044\u6587\u3067\u3059\u3002\u4E88\u671F\u3055\u308C\u308B\u306E\u306F\u3001\u5F0F\u3001\u30D6\u30ED\u30C3\u30AF\u307E\u305F\u306Fthrow\u6587\u3067\u3059
 
 compiler.err.switch.mixing.case.types=switch\u3067case\u306E\u7570\u306A\u308B\u7A2E\u985E\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
@@ -2664,5 +2779,7 @@ compiler.err.preview.not.latest=--enable-preview\u304C\u6307\u5B9A\u3055\u308C\u
 
 compiler.err.preview.without.source.or.release=--enable-preview\u306F-source\u307E\u305F\u306F--release\u3068\u3068\u3082\u306B\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5024\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u540C\u671F\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
+# 0: kind name, 1: symbol
+compiler.warn.declared.using.preview={0} {1}\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u304A\u308A\u3001\u4ECA\u5F8C\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5024\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u540C\u671F\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
index 3c6e2ca34d3..01c92e9e0b3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
@@ -119,7 +119,7 @@ compiler.err.annotation.missing.default.value.1=\u5BF9\u4E8E\u5143\u7D20{1}, \u6
 # 0: type
 compiler.err.annotation.not.valid.for.type=\u6CE8\u91CA\u5BF9\u4E8E\u7C7B\u578B{0}\u7684\u5143\u7D20\u65E0\u6548
 
-compiler.err.annotation.type.not.applicable=\u6CE8\u91CA\u7C7B\u578B\u4E0D\u9002\u7528\u4E8E\u8BE5\u7C7B\u578B\u7684\u58F0\u660E
+compiler.err.annotation.type.not.applicable=\u6CE8\u91CA\u63A5\u53E3\u4E0D\u9002\u7528\u4E8E\u6B64\u7C7B\u578B\u7684\u58F0\u660E
 
 # 0: type
 compiler.err.annotation.type.not.applicable.to.type=\u6CE8\u91CA @{0} \u5728\u6B64\u7C7B\u578B\u4E0A\u4E0B\u6587\u4E2D\u4E0D\u9002\u7528
@@ -263,12 +263,14 @@ compiler.misc.lambda=lambda \u8868\u8FBE\u5F0F
 
 compiler.misc.inner.cls=\u5185\u90E8\u7C7B
 
+compiler.misc.guard=\u536B\u58EB
+
 # 0: type
 compiler.err.cant.deref=\u65E0\u6CD5\u53D6\u6D88\u5F15\u7528{0}
 
 compiler.err.cant.extend.intf.annotation=\u5BF9\u4E8E @interfaces, \u4E0D\u5141\u8BB8 ''extends''
 
-compiler.err.annotation.decl.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
+compiler.err.annotation.decl.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E
 
 # 0: symbol
 compiler.err.cant.inherit.from.final=\u65E0\u6CD5\u4ECE\u6700\u7EC8{0}\u8FDB\u884C\u7EE7\u627F
@@ -307,7 +309,7 @@ compiler.err.no.superclass={0}\u4E0D\u5177\u6709\u8D85\u7C7B\u3002
 # 0: symbol, 1: type, 2: symbol, 3: type, 4: type
 compiler.err.concrete.inheritance.conflict={1}\u4E2D\u7684\u65B9\u6CD5{0}\u548C{3}\u4E2D\u7684\u65B9\u6CD5{2}\u662F\u4F7F\u7528\u76F8\u540C\u7684\u7B7E\u540D\u7EE7\u627F\u7684
 
-compiler.err.default.allowed.in.intf.annotation.member=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
+compiler.err.default.allowed.in.intf.annotation.member=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u4EC5\u5141\u8BB8\u9ED8\u8BA4\u503C
 
 # 0: symbol
 compiler.err.doesnt.exist=\u7A0B\u5E8F\u5305{0}\u4E0D\u5B58\u5728
@@ -319,7 +321,7 @@ compiler.err.duplicate.annotation.invalid.repeated=\u6CE8\u91CA{0}\u4E0D\u662F\u
 compiler.err.duplicate.annotation.member.value=\u6CE8\u91CA@{1}\u4E2D\u7684\u5143\u7D20 ''{0}'' \u91CD\u590D\u3002
 
 # 0: type
-compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6CE8\u91CA\u7C7B\u578B
+compiler.err.duplicate.annotation.missing.container={0} \u4E0D\u662F\u53EF\u91CD\u590D\u7684\u6CE8\u91CA\u63A5\u53E3
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation=\u6CE8\u91CA\u91CD\u590D: \u4F7F\u7528\u65E0\u6548\u7684 @Repeatable \u6CE8\u91CA\u5BF9{0}\u8FDB\u884C\u4E86\u6CE8\u91CA
@@ -334,22 +336,22 @@ compiler.err.invalid.repeatable.annotation.multiple.values={0}\u4E0D\u662F\u6709
 compiler.err.invalid.repeatable.annotation.invalid.value={0}\u4E0D\u662F\u6709\u6548\u7684 @Repeatable: \u503C\u5143\u7D20\u65E0\u6548
 
 # 0: symbol or type, 1: type, 2: type
-compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5FC5\u987B\u58F0\u660E\u7C7B\u578B{2}\u7684\u540D\u4E3A ''value'' \u7684\u5143\u7D20
+compiler.err.invalid.repeatable.annotation.value.return=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5FC5\u987B\u58F0\u660E\u7C7B\u578B {2} \u7684\u540D\u4E3A ''value'' \u7684\u5143\u7D20
 
 # 0: symbol or type, 1: symbol
-compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5BF9\u4E8E\u5143\u7D20 {1}, \u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u6CA1\u6709\u9ED8\u8BA4\u503C
+compiler.err.invalid.repeatable.annotation.elem.nondefault=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u6CA1\u6709\u5143\u7D20 {1} \u7684\u9ED8\u8BA4\u503C
 
 # 0: symbol, 1: string, 2: symbol, 3: string
-compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u7684\u4FDD\u7559\u671F\u77ED\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({2}) \u7684\u4FDD\u7559\u671F
+compiler.err.invalid.repeatable.annotation.retention=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u7684\u4FDD\u7559\u671F\u77ED\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({2}) \u7684\u4FDD\u7559\u671F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.documented=\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1}) \u662F @Documented, \u800C\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5219\u4E0D\u662F
+compiler.err.invalid.repeatable.annotation.not.documented=\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1}) \u662F @Documented\uFF0C\u800C\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5219\u4E0D\u662F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.not.inherited=\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1}) \u662F @Inherited, \u800C\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u5219\u4E0D\u662F
+compiler.err.invalid.repeatable.annotation.not.inherited=\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1}) \u662F @Inherited\uFF0C\u800C\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u5219\u4E0D\u662F
 
 # 0: symbol, 1: symbol
-compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u6CE8\u91CA\u7C7B\u578B ({0}) \u9002\u7528\u7684\u76EE\u6807\u591A\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u7C7B\u578B ({1})
+compiler.err.invalid.repeatable.annotation.incompatible.target=\u5305\u542B\u6CE8\u91CA\u63A5\u53E3 ({0}) \u9002\u7528\u7684\u76EE\u6807\u591A\u4E8E\u53EF\u91CD\u590D\u6CE8\u91CA\u63A5\u53E3 ({1})
 
 # 0: symbol
 compiler.err.invalid.repeatable.annotation.repeated.and.container.present=\u5BB9\u5668 {0} \u4E0D\u5F97\u4E0E\u5176\u5305\u542B\u7684\u5143\u7D20\u540C\u65F6\u5B58\u5728
@@ -368,8 +370,21 @@ compiler.err.same.binary.name=\u7C7B\uFF1A{0} \u548C {1} \u5177\u6709\u76F8\u540
 
 compiler.err.duplicate.case.label=case \u6807\u7B7E\u91CD\u590D
 
+compiler.err.pattern.dominated=\u6B64 case \u6807\u7B7E\u7531\u524D\u4E00\u4E2A case \u6807\u7B7E\u652F\u914D
+
 compiler.err.duplicate.default.label=default \u6807\u7B7E\u91CD\u590D
 
+compiler.err.duplicate.total.pattern=\u603B\u8BA1\u6A21\u5F0F\u91CD\u590D
+
+compiler.err.total.pattern.and.default=switch \u6709\u4E00\u4E2A\u603B\u8BA1\u6A21\u5F0F\u548C\u4E00\u4E2A\u9ED8\u8BA4\u6807\u7B7E
+
+# 0: type, 1: type
+compiler.err.constant.label.not.compatible={0} \u7C7B\u578B\u7684\u5E38\u91CF\u6807\u7B7E\u4E0E switch \u9009\u62E9\u5668\u7C7B\u578B {1} \u4E0D\u517C\u5BB9
+
+compiler.err.flows.through.to.pattern=\u8D2F\u7A7F (fall-through) \u5230\u6A21\u5F0F\u975E\u6CD5
+
+compiler.err.flows.through.from.pattern=\u4ECE\u6A21\u5F0F\u8D2F\u7A7F (fall-through) \u975E\u6CD5
+
 compiler.err.else.without.if=\u6709 ''if'', \u4F46\u662F\u6CA1\u6709 ''else''
 
 compiler.err.empty.char.lit=\u7A7A\u5B57\u7B26\u6587\u5B57
@@ -379,13 +394,13 @@ compiler.err.encl.class.required=\u9700\u8981\u5305\u542B{0}\u7684\u5C01\u95ED\u
 
 compiler.err.enum.annotation.must.be.enum.constant=\u679A\u4E3E\u6CE8\u91CA\u503C\u5FC5\u987B\u662F\u679A\u4E3E\u5E38\u91CF
 
-compiler.err.enum.cant.be.instantiated=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u679A\u4E3E\u7C7B\u578B
+compiler.err.enum.cant.be.instantiated=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u679A\u4E3E\u7C7B
 
 compiler.err.enum.label.must.be.unqualified.enum=\u679A\u4E3E switch case \u6807\u7B7E\u5FC5\u987B\u4E3A\u679A\u4E3E\u5E38\u91CF\u7684\u975E\u9650\u5B9A\u540D\u79F0
 
 compiler.err.enum.no.subclassing=\u7C7B\u65E0\u6CD5\u76F4\u63A5\u6269\u5C55 java.lang.Enum
 
-compiler.err.enum.types.not.extensible=\u679A\u4E3E\u7C7B\u578B\u4E0D\u53EF\u7EE7\u627F
+compiler.err.enum.types.not.extensible=\u679A\u4E3E\u7C7B\u4E0D\u53EF\u6269\u5C55
 
 compiler.err.enum.no.finalize=\u679A\u4E3E\u4E0D\u80FD\u6709 finalize \u65B9\u6CD5
 
@@ -415,9 +430,9 @@ compiler.err.finally.without.try=\u6709 ''finally'', \u4F46\u662F\u6CA1\u6709 ''
 # 0: type, 1: message segment
 compiler.err.foreach.not.applicable.to.type=for-each \u4E0D\u9002\u7528\u4E8E\u8868\u8FBE\u5F0F\u7C7B\u578B\n\u8981\u6C42: {1}\n\u627E\u5230:    {0}
 
-compiler.err.fp.number.too.large=\u6D6E\u70B9\u6570\u8FC7\u5927
+compiler.err.fp.number.too.large=\u6D6E\u70B9\u6570\u592A\u5927
 
-compiler.err.fp.number.too.small=\u6D6E\u70B9\u6570\u8FC7\u5C0F
+compiler.err.fp.number.too.small=\u6D6E\u70B9\u6570\u592A\u5C0F
 
 compiler.err.generic.array.creation=\u521B\u5EFA\u6CDB\u578B\u6570\u7EC4
 
@@ -495,21 +510,21 @@ compiler.err.incomparable.types=\u4E0D\u53EF\u6BD4\u8F83\u7684\u7C7B\u578B: {0}\
 # 0: string
 compiler.err.int.number.too.large=\u6574\u6570\u592A\u5927
 
-compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u65E0\u6CD5\u58F0\u660E\u5F62\u53C2
+compiler.err.intf.annotation.members.cant.have.params=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u65E0\u6CD5\u58F0\u660E\u5F62\u53C2
 
 # 0: symbol
-compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
+compiler.err.intf.annotation.cant.have.type.params=\u6CE8\u91CA\u63A5\u53E3 {0} \u4E0D\u80FD\u4E3A\u6CDB\u578B
 
-compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
+compiler.err.intf.annotation.members.cant.have.type.params=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u4E0D\u80FD\u4E3A\u6CDB\u578B\u65B9\u6CD5
 
 # 0: symbol, 1: type
-compiler.err.intf.annotation.member.clash=\u6CE8\u91CA\u7C7B\u578B{1}\u58F0\u660E\u4E0E\u65B9\u6CD5 {0} \u540C\u540D\u7684\u5143\u7D20
+compiler.err.intf.annotation.member.clash=\u6CE8\u91CA\u63A5\u53E3 {1} \u58F0\u660E\u7684\u5143\u7D20\u4E0E\u65B9\u6CD5 {0} \u540C\u540D
 
 compiler.err.intf.expected.here=\u6B64\u5904\u9700\u8981\u63A5\u53E3
 
 compiler.err.intf.meth.cant.have.body=\u63A5\u53E3\u62BD\u8C61\u65B9\u6CD5\u4E0D\u80FD\u5E26\u6709\u4E3B\u4F53
 
-compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20\u7684\u7C7B\u578B\u65E0\u6548
+compiler.err.invalid.annotation.member.type=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20\u7684\u7C7B\u578B\u65E0\u6548
 
 compiler.err.invalid.binary.number=\u4E8C\u8FDB\u5236\u6570\u5B57\u4E2D\u5FC5\u987B\u5305\u542B\u81F3\u5C11\u4E00\u4E2A\u4E8C\u8FDB\u5236\u6570
 
@@ -535,7 +550,7 @@ compiler.err.label.already.in.use=\u6807\u7B7E{0}\u5DF2\u4F7F\u7528
 # 0: symbol
 compiler.err.local.var.accessed.from.icls.needs.final=\u4ECE\u5185\u90E8\u7C7B\u4E2D\u8BBF\u95EE\u672C\u5730\u53D8\u91CF{0}; \u9700\u8981\u88AB\u58F0\u660E\u4E3A\u6700\u7EC8\u7C7B\u578B
 
-compiler.err.local.enum=\u679A\u4E3E\u7C7B\u578B\u4E0D\u80FD\u4E3A\u672C\u5730\u7C7B\u578B
+compiler.err.local.enum=\u679A\u4E3E\u7C7B\u4E0D\u80FD\u4E3A\u672C\u5730\u7C7B
 
 compiler.err.cannot.create.array.with.type.arguments=\u65E0\u6CD5\u521B\u5EFA\u5177\u6709\u7C7B\u578B\u53D8\u91CF\u7684\u6570\u7EC4
 
@@ -649,7 +664,7 @@ compiler.err.no.intf.expected.here=\u6B64\u5904\u4E0D\u9700\u8981\u63A5\u53E3
 compiler.err.no.match.entry={0}\u5728{1}\u7684\u6761\u76EE\u4E2D\u6CA1\u6709\u5339\u914D\u9879; \u9700\u8981{2}
 
 # 0: type
-compiler.err.not.annotation.type={0}\u4E0D\u662F\u6CE8\u91CA\u7C7B\u578B
+compiler.err.not.annotation.type={0} \u4E0D\u662F\u6CE8\u91CA\u63A5\u53E3
 
 # 0: symbol, 1: symbol, 2: message segment
 compiler.err.not.def.access.package.cant.access={0} \u4E0D\u53EF\u89C1\n({2})
@@ -836,6 +851,8 @@ compiler.err.static.imp.only.classes.and.interfaces=\u4EC5\u4ECE\u7C7B\u548C\u63
 
 compiler.err.string.const.req=\u9700\u8981\u5E38\u91CF\u5B57\u7B26\u4E32\u8868\u8FBE\u5F0F
 
+compiler.err.pattern.expected=\u9700\u8981\u7C7B\u578B\u6A21\u5F0F
+
 # 0: symbol, 1: fragment
 compiler.err.cannot.generate.class=\u751F\u6210\u7C7B {0} \u65F6\u51FA\u9519\n({1})
 
@@ -966,6 +983,8 @@ compiler.err.unreachable.stmt=\u65E0\u6CD5\u8BBF\u95EE\u7684\u8BED\u53E5
 
 compiler.err.not.exhaustive=switch \u8868\u8FBE\u5F0F\u4E0D\u5305\u542B\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C
 
+compiler.err.not.exhaustive.statement=\u5E76\u975E\u6240\u6709\u53EF\u80FD\u7684\u8F93\u5165\u503C\u90FD\u5305\u542B\u5728 switch \u8BED\u53E5\u4E2D
+
 compiler.err.initializer.must.be.able.to.complete.normally=\u521D\u59CB\u5316\u7A0B\u5E8F\u5FC5\u987B\u80FD\u591F\u6B63\u5E38\u5B8C\u6210
 
 compiler.err.initializer.not.allowed=\u63A5\u53E3\u4E2D\u4E0D\u5141\u8BB8\u6709\u521D\u59CB\u5316\u7A0B\u5E8F
@@ -1006,7 +1025,7 @@ compiler.misc.varargs.trustme.on.reifiable.varargs=Varargs \u5143\u7D20\u7C7B\u5
 compiler.err.instanceof.reifiable.not.safe={0} \u65E0\u6CD5\u5B89\u5168\u5730\u8F6C\u6362\u4E3A {1}
 
 # 0: type, 1: type
-compiler.err.instanceof.pattern.no.subtype=\u6A21\u5F0F\u7C7B\u578B {0} \u662F\u8868\u8FBE\u5F0F\u7C7B\u578B {1} \u7684\u5B50\u7C7B\u578B
+compiler.err.instanceof.pattern.no.subtype=\u8868\u8FBE\u5F0F\u7C7B\u578B {0} \u662F\u6A21\u5F0F\u7C7B\u578B {1} \u7684\u5B50\u7C7B\u578B
 
 # 0: symbol
 compiler.misc.varargs.trustme.on.non.varargs.meth=\u65B9\u6CD5 {0} \u4E0D\u662F varargs \u65B9\u6CD5\u3002
@@ -1073,12 +1092,12 @@ compiler.err.locn.invalid.arg.for.xpatch=--patch-module \u9009\u9879\u7684\u53C2
 
 compiler.err.file.sb.on.source.or.patch.path.for.module=\u6587\u4EF6\u5E94\u5728\u6E90\u8DEF\u5F84\u6216\u6A21\u5757\u7684\u8865\u4E01\u7A0B\u5E8F\u8DEF\u5F84\u4E2D
 
+compiler.err.no.java.lang=\u5728\u5E73\u53F0\u7C7B\u4E2D\u627E\u4E0D\u5230\u7A0B\u5E8F\u5305 java.lang
+
 #####
 
 # Fatal Errors
 
-compiler.misc.fatal.err.no.java.lang=\u81F4\u547D\u9519\u8BEF: \u5728\u7C7B\u8DEF\u5F84\u6216\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u7A0B\u5E8F\u5305 java.lang
-
 # 0: name
 compiler.misc.fatal.err.cant.locate.meth=\u81F4\u547D\u9519\u8BEF: \u627E\u4E0D\u5230\u65B9\u6CD5{0}
 
@@ -1168,19 +1187,21 @@ compiler.note.unchecked.filename.additional={0}\u8FD8\u6709\u672A\u7ECF\u68C0\u6
 
 compiler.note.unchecked.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528\u4E86\u672A\u7ECF\u68C0\u67E5\u6216\u4E0D\u5B89\u5168\u7684\u64CD\u4F5C\u3002
 
-# 0: file name
-compiler.note.preview.filename={0} \u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
+# 0: file name, 1: source
+compiler.note.preview.filename={0} \u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
 
-compiler.note.preview.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
+# 0: source
+compiler.note.preview.plural=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u4F7F\u7528 Java SE {0} \u7684\u9884\u89C8\u529F\u80FD\u3002
 
 # The following string may appear after one of the above deprecation
 # messages.
 compiler.note.preview.recompile=\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u4F7F\u7528 -Xlint:preview \u91CD\u65B0\u7F16\u8BD1\u3002
 
-# 0: file name
-compiler.note.preview.filename.additional={0} \u8FD8\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
+# 0: file name, 1: source
+compiler.note.preview.filename.additional={0} \u8FD8\u4F7F\u7528 Java SE {1} \u7684\u9884\u89C8\u529F\u80FD\u3002
 
-compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528\u9884\u89C8\u8BED\u8A00\u529F\u80FD\u3002
+# 0: source
+compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8FD8\u4F7F\u7528 Java SE {0} \u7684\u9884\u89C8\u529F\u80FD\u3002
 
 # Notes related to annotation processing
 
@@ -1269,6 +1290,8 @@ compiler.warn.dir.path.element.not.directory=\u9519\u8BEF\u7684\u8DEF\u5F84\u514
 # 0: symbol, 1: symbol, 2: symbol
 compiler.warn.missing-explicit-ctor=\u5BFC\u51FA\u7684\u7A0B\u5E8F\u5305 {1} \u4E2D\u7684\u7C7B {0} \u672A\u58F0\u660E\u663E\u5F0F\u6784\u9020\u5668\uFF0C\u56E0\u6B64\u5C06\u5411\u6A21\u5757 {2} \u7684\u5BA2\u6237\u673A\u516C\u5F00\u9ED8\u8BA4\u6784\u9020\u5668
 
+compiler.warn.strictfp=\u4ECE\u53D1\u884C\u7248 17 \u5F00\u59CB\uFF0C\u6240\u6709\u6D6E\u70B9\u8868\u8FBE\u5F0F\u90FD\u7ECF\u8FC7\u4E25\u683C\u8BA1\u7B97\uFF0C\u4E0D\u9700\u8981 ''strictfp''
+
 compiler.warn.finally.cannot.complete=finally \u5B50\u53E5\u65E0\u6CD5\u6B63\u5E38\u5B8C\u6210
 
 # 0: name
@@ -1284,10 +1307,13 @@ compiler.warn.has.been.deprecated={1}\u4E2D\u7684{0}\u5DF2\u8FC7\u65F6
 compiler.warn.has.been.deprecated.for.removal={1} \u4E2D\u7684 {0} \u5DF2\u8FC7\u65F6, \u4E14\u6807\u8BB0\u4E3A\u5F85\u5220\u9664
 
 # 0: symbol
-compiler.warn.is.preview={0} \u662F\u67D0\u9884\u89C8\u529F\u80FD\u4E2D\u7684\u4E00\u4E2A API
+compiler.warn.is.preview={0} \u662F\u9884\u89C8 API\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
 
 # 0: symbol
-compiler.err.is.preview={0} \u662F\u67D0\u9884\u89C8\u529F\u80FD\u4E2D\u7684\u4E00\u4E2A API
+compiler.err.is.preview={0} \u662F\u9884\u89C8 API\uFF0C\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5904\u4E8E\u7981\u7528\u72B6\u6001\u3002\n\uFF08\u8BF7\u4F7F\u7528 --enable-preview \u4EE5\u542F\u7528\u9884\u89C8 API\uFF09
+
+# 0: symbol
+compiler.warn.is.preview.reflective={0} \u662F\u53CD\u5C04\u9884\u89C8 API\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
 
 # 0: symbol
 compiler.warn.has.been.deprecated.module=\u6A21\u5757 {0} \u5DF2\u8FC7\u65F6
@@ -1303,6 +1329,11 @@ compiler.warn.illegal.char.for.encoding=\u7F16\u7801{0}\u7684\u4E0D\u53EF\u6620\
 # 0: symbol
 compiler.warn.improper.SVUID=\u5FC5\u987B\u5728\u7C7B{0}\u4E2D\u5C06 serialVersionUID \u58F0\u660E\u4E3A static final
 
+compiler.warn.improper.SPF=serialPersistentFields \u5FC5\u987B\u58F0\u660E\u4E3A private static final \u624D\u80FD\u751F\u6548
+
+compiler.warn.SPF.null.init=serialPersistentFields \u5982\u679C\u521D\u59CB\u5316\u4E3A\u7A7A\u503C\uFF0C\u5219\u65E0\u6548\u3002\n\u8BF7\u521D\u59CB\u5316\u4E3A\u7A7A\u6570\u7EC4\u4EE5\u6307\u793A\u6CA1\u6709\u5B57\u6BB5
+
+
 # 0: type, 1: type
 compiler.warn.inexact.non-varargs.call=\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u4F7F\u7528\u4E86\u4E0D\u51C6\u786E\u7684\u53D8\u91CF\u7C7B\u578B\u7684 varargs \u65B9\u6CD5\u7684\u975E varargs \u8C03\u7528; \n\u5BF9\u4E8E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {0}\n\u5BF9\u4E8E\u975E varargs \u8C03\u7528, \u5E94\u4F7F\u7528 {1}, \u8FD9\u6837\u4E5F\u53EF\u4EE5\u6291\u5236\u6B64\u8B66\u544A
 
@@ -1315,9 +1346,67 @@ compiler.warn.unreachable.catch.1=catch \u5B50\u53E5\u65E0\u6CD5\u8BBF\u95EE\n\u
 # 0: symbol
 compiler.warn.long.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F long \u7C7B\u578B
 
+compiler.warn.OSF.array.SPF=serialPersistentFields \u7684\u7C7B\u578B\u5FC5\u987B\u4E3A java.io.ObjectStreamField[] \u624D\u80FD\u751F\u6548
+
 # 0: symbol
 compiler.warn.missing.SVUID=\u53EF\u5E8F\u5217\u5316\u7C7B{0}\u6CA1\u6709 serialVersionUID \u7684\u5B9A\u4E49
 
+# 0: name
+compiler.warn.serializable.missing.access.no.arg.ctor=\u65E0\u6CD5\u8BBF\u95EE\u7B2C\u4E00\u4E2A\u4E0D\u53EF\u5E8F\u5217\u5316\u8D85\u7C7B {0} \u4E2D\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
+
+# 0: name
+compiler.warn.serial.method.not.private=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u672A\u58F0\u660E\u4E3A private
+
+# 0: name
+compiler.warn.serial.concrete.instance.method=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u662F\u5177\u4F53\u7684\u5B9E\u4F8B\u65B9\u6CD5\u624D\u80FD\u751F\u6548\uFF0C\u65E2\u4E0D\u80FD\u662F\u62BD\u8C61\u65B9\u6CD5\u4E5F\u4E0D\u80FD\u662F\u9759\u6001\u65B9\u6CD5
+
+# 0: name
+compiler.warn.serial.method.static=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u58F0\u660E\u4E3A static\uFF1B\u5FC5\u987B\u6539\u4E3A\u5B9E\u4F8B\u65B9\u6CD5\u624D\u80FD\u6709\u6548
+
+# 0: name
+compiler.warn.serial.method.no.args=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u6CA1\u6709\u53C2\u6570\u624D\u80FD\u751F\u6548
+
+# 0: name, 1: number
+compiler.warn.serial.method.one.arg=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5FC5\u987B\u53EA\u6709\u4E00\u4E2A\u53C2\u6570\uFF08\u800C\u975E {1} \u4E2A\u53C2\u6570\uFF09\u624D\u80FD\u751F\u6548
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.parameter.type=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u7684\u552F\u4E00\u53C2\u6570\u7684\u7C7B\u578B\u5FC5\u987B\u4E3A {1}\uFF08\u800C\u975E {2}\uFF09\u624D\u80FD\u751F\u6548
+
+# 0: name, 1: type, 2: type
+compiler.warn.serial.method.unexpected.return.type=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u662F\u7528\u8FD4\u56DE\u7C7B\u578B {1}\uFF08\u800C\u4E0D\u662F\u9884\u671F\u7C7B\u578B {2}\uFF09\u58F0\u660E\u7684\u3002\n\u5982\u58F0\u660E\u7684\u90A3\u6837\uFF0C\u8BE5\u65B9\u6CD5\u5BF9\u5E8F\u5217\u5316\u65E0\u6548
+
+# 0: name, 1: type
+compiler.warn.serial.method.unexpected.exception=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u58F0\u660E\u4E3A\u629B\u51FA\u610F\u5916\u7C7B\u578B {1}
+
+compiler.warn.ineffectual.serial.field.interface=serialPersistentFields \u5728\u63A5\u53E3\u4E2D\u65E0\u6548
+
+# 0: string
+compiler.warn.ineffectual.serial.field.enum=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u5B57\u6BB5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
+
+# 0: string
+compiler.warn.ineffectual.serial.method.enum=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u679A\u4E3E\u7C7B\u4E2D\u65E0\u6548
+
+compiler.warn.ineffectual.serial.field.record=serialPersistentFields \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
+
+# 0: string
+compiler.warn.ineffectual.serial.method.record=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u8BB0\u5F55\u7C7B\u4E2D\u65E0\u6548
+
+# 0: name
+compiler.warn.ineffectual.serial.method.externalizable=\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u65B9\u6CD5 {0} \u5728\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u4E2D\u65E0\u6548
+
+compiler.warn.ineffectual.serial.field.externalizable=serialPersistentFields \u5728\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u4E2D\u65E0\u6548
+
+compiler.warn.externalizable.missing.public.no.arg.ctor=\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u9700\u8981\u4E00\u4E2A\u516C\u5171\u7684\u65E0\u53C2\u6570\u6784\u9020\u5668
+
+compiler.warn.non.serializable.instance.field=\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u975E\u77AC\u65F6\u5B9E\u4F8B\u5B57\u6BB5\u662F\u7528\u4E0D\u53EF\u5E8F\u5217\u5316\u7684\u7C7B\u578B\u58F0\u660E\u7684
+
+# 0: type
+compiler.warn.non.serializable.instance.field.array=\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u975E\u77AC\u65F6\u5B9E\u4F8B\u5B57\u6BB5\u662F\u7528\u5177\u6709\u4E0D\u53EF\u5E8F\u5217\u5316\u57FA\u672C\u7EC4\u4EF6\u7C7B\u578B {0} \u7684\u6570\u7EC4\u58F0\u660E\u7684
+
+compiler.warn.non.private.method.weaker.access=\u5728\u63A5\u53E3\u4E2D\u58F0\u660E\u4E3A non-private \u7684\u5E8F\u5217\u5316\u76F8\u5173\u65B9\u6CD5\u5C06\u963B\u6B62\n\u5B9E\u73B0\u63A5\u53E3\u7684\u7C7B\u5C06\u65B9\u6CD5\u58F0\u660E\u4E3A private
+
+compiler.warn.default.ineffective=\u5B9E\u73B0\u7C7B\u7684\u5E8F\u5217\u5316\u4E0D\u4F1A\u8FD0\u884C\u63A5\u53E3\u4E2D\u4E0E\u5E8F\u5217\u5316\u76F8\u5173\u7684\u9ED8\u8BA4\u65B9\u6CD5
+
 # 0: symbol, 1: symbol, 2: symbol, 3: symbol
 compiler.warn.potentially.ambiguous.overload={1} \u4E2D\u7684 {0} \u53EF\u80FD\u4E0E {3} \u4E2D\u7684 {2} \u6DF7\u6DC6
 
@@ -1404,7 +1493,7 @@ compiler.warn.proc.suspicious.class.name=\u6B63\u5728\u4E3A\u540D\u79F0\u4EE5{1}
 compiler.warn.proc.file.create.last.round=\u5C06\u4E0D\u5BF9\u5728\u6700\u540E\u4E00\u4E2A\u5FAA\u73AF\u4E2D\u521B\u5EFA\u7684\u7C7B\u578B\u4E3A ''{0}'' \u7684\u6587\u4EF6\u8FDB\u884C\u6CE8\u91CA\u5904\u7406\u3002
 
 # 0: string, 1: string
-compiler.warn.proc.malformed.supported.string=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u4E3A\u652F\u6301\u7684\u6CE8\u91CA\u7C7B\u578B\u8FD4\u56DE\u683C\u5F0F\u9519\u8BEF\u7684\u5B57\u7B26\u4E32 ''{0}''
+compiler.warn.proc.malformed.supported.string=\u5904\u7406\u7A0B\u5E8F ''{1}'' \u4E3A\u652F\u6301\u7684\u6CE8\u91CA\u63A5\u53E3\u8FD4\u56DE\u683C\u5F0F\u9519\u8BEF\u7684\u5B57\u7B26\u4E32 ''{0}''
 
 # 0: set of string
 compiler.warn.proc.annotations.without.processors=\u6CA1\u6709\u5904\u7406\u7A0B\u5E8F\u8981\u4F7F\u7528\u4EE5\u4E0B\u4EFB\u4F55\u6CE8\u91CA: {0}
@@ -1416,10 +1505,10 @@ compiler.warn.proc.processor.incompatible.source.version=\u6765\u81EA\u6CE8\u91C
 compiler.warn.proc.duplicate.option.name=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u652F\u6301\u7684\u9009\u9879 ''{0}''
 
 # 0: string, 1: string
-compiler.warn.proc.duplicate.supported.annotation=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u652F\u6301\u7684\u6CE8\u91CA\u7C7B\u578B ''{0}''
+compiler.warn.proc.duplicate.supported.annotation=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{1}'' \u8FD4\u56DE\u91CD\u590D\u7684\u53D7\u652F\u6301\u6CE8\u91CA\u63A5\u53E3 ''{0}''
 
 # 0: string
-compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' \u91CD\u590D\u652F\u6301 ''*'' \u548C\u5176\u4ED6\u6CE8\u91CA\u7C7B\u578B
+compiler.warn.proc.redundant.types.with.wildcard=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' \u91CD\u590D\u652F\u6301 ''*'' \u548C\u5176\u4ED6\u6CE8\u91CA\u63A5\u53E3
 
 compiler.warn.proc.proc-only.requested.no.procs=\u5728\u672A\u8BF7\u6C42\u7F16\u8BD1\u7684\u60C5\u51B5\u4E0B\u8FDB\u884C\u6CE8\u91CA\u5904\u7406, \u4F46\u627E\u4E0D\u5230\u5904\u7406\u7A0B\u5E8F\u3002
 
@@ -1475,6 +1564,8 @@ compiler.warn.deprecated.annotation.has.no.effect=@Deprecated \u6CE8\u91CA\u5BF9
 # 0: string
 compiler.warn.invalid.path=\u65E0\u6548\u6587\u4EF6\u540D: {0}
 
+compiler.warn.doclint.not.available=\u6CA1\u6709 doclint \u670D\u52A1\u63D0\u4F9B\u65B9\u53EF\u7528
+
 # 0: string
 compiler.err.invalid.path=\u65E0\u6548\u6587\u4EF6\u540D: {0}
 
@@ -1577,8 +1668,6 @@ compiler.err.enum.constant.expected=\u6B64\u5904\u9700\u8981\u679A\u4E3E\u5E38\u
 compiler.err.enum.constant.not.expected=\u6B64\u5904\u4E0D\u9700\u8981\u679A\u4E3E\u5E38\u91CF
 
 ## The following are related in form, but do not easily fit the above paradigm.
-compiler.err.expected.module=\u9700\u8981 ''module''
-
 compiler.err.expected.module.or.open=\u9700\u8981 ''module'' \u6216 ''open''
 
 compiler.err.dot.class.expected=\u9700\u8981 ''.class''
@@ -2103,6 +2192,10 @@ compiler.misc.feature.records=\u8BB0\u5F55
 
 compiler.misc.feature.sealed.classes=\u5BC6\u5C01\u7C7B
 
+compiler.misc.feature.case.null=switch case \u4E2D\u7684\u7A7A\u503C
+
+compiler.misc.feature.pattern.switch=switch \u8BED\u53E5\u4E2D\u7684\u6A21\u5F0F
+
 compiler.warn.underscore.as.identifier=\u4ECE\u53D1\u884C\u7248 9 \u5F00\u59CB, ''_'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
 
 compiler.err.underscore.as.identifier=\u4ECE\u53D1\u884C\u7248 9 \u5F00\u59CB, ''_'' \u4E3A\u5173\u952E\u5B57, \u4E0D\u80FD\u7528\u4F5C\u6807\u8BC6\u7B26
@@ -2174,6 +2267,28 @@ compiler.note.deferred.method.inst=\u65B9\u6CD5 {0} \u7684\u5EF6\u8FDF\u5B9E\u4F
 # 0: symbol
 compiler.note.verbose.l2m.deduplicate=\u6B63\u5728\u5BF9 lambda \u51FD\u6570\u5B9E\u73B0\u65B9\u6CD5 {0} \u8FDB\u884C\u91CD\u590D\u6570\u636E\u5220\u9664
 
+########################################
+# Diagnostics for method reference search
+# results used by Resolve (debug only)
+########################################
+
+# 0: fragment, 1: string, 2: number
+compiler.note.method.ref.search.results.multi={1} \u7684 {0} \u641C\u7D22\u7ED3\u679C\uFF0C\u6709 {2} \u4E2A\n\u6700\u660E\u786E\u7684\u9002\u7528\u5019\u9009\u9879\uFF1A
+
+# 0: number, 1: fragment, 2: symbol
+compiler.misc.applicable.method.found.2=\u627E\u5230\u7684\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5\uFF1A{1} {2}
+
+# 0: number, 1: fragment, 2: symbol, 3: message segment
+compiler.misc.applicable.method.found.3=\u627E\u5230\u7684\u7B2C {0} \u4E2A\u9002\u7528\u65B9\u6CD5\uFF1A{1} {2}\n({3})
+
+compiler.misc.static=\u9759\u6001
+
+compiler.misc.non.static=\u975E\u9759\u6001
+
+compiler.misc.bound=\u7ED1\u5B9A
+
+compiler.misc.unbound=\u672A\u7ED1\u5B9A
+
 ########################################
 # Diagnostics for where clause implementation
 # used by the RichDiagnosticFormatter.
@@ -2260,7 +2375,7 @@ compiler.err.dc.no.tag.name='@' \u540E\u6CA1\u6709\u6807\u8BB0\u540D
 
 compiler.err.dc.gt.expected=\u9700\u8981 ''>''
 
-compiler.err.dc.ref.bad.parens=\u5F15\u7528\u4E2D\u7F3A\u5C11 '')''
+compiler.err.dc.ref.bad.parens=\u62EC\u53F7\u4E4B\u540E\u51FA\u73B0\u610F\u5916\u7684\u6587\u672C
 
 compiler.err.dc.ref.syntax.error=\u5F15\u7528\u4E2D\u51FA\u73B0\u8BED\u6CD5\u9519\u8BEF
 
@@ -2274,6 +2389,8 @@ compiler.err.dc.unterminated.signature=\u672A\u7EC8\u6B62\u7684\u7B7E\u540D
 
 compiler.err.dc.unterminated.string=\u672A\u7EC8\u6B62\u7684\u5B57\u7B26\u4E32
 
+compiler.err.dc.ref.annotations.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u6CE8\u91CA
+
 ###
 # errors related to modules
 
@@ -2450,8 +2567,6 @@ compiler.err.illegal.argument.for.option={0} \u7684\u53C2\u6570\u975E\u6CD5: {1}
 
 compiler.err.match.binding.exists=\u5C1D\u8BD5\u91CD\u65B0\u5B9A\u4E49\u73B0\u6709\u7684\u5339\u914D\u7ED1\u5B9A\uFF0C\u8FD9\u662F\u975E\u6CD5\u7684
 
-compiler.err.switch.null.not.allowed=case \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u7A7A\u6807\u7B7E
-
 compiler.err.switch.case.unexpected.statement=case \u4E2D\u5B58\u5728\u610F\u5916\u8BED\u53E5\uFF0C\u5E94\u4E3A\u8868\u8FBE\u5F0F\u3001\u5757\u6216\u629B\u51FA\u8BED\u53E5
 
 compiler.err.switch.mixing.case.types=\u5728 switch \u4E2D\u4F7F\u7528\u4E86\u4E0D\u540C case \u7C7B\u578B
@@ -2664,5 +2779,7 @@ compiler.err.preview.not.latest=\u6E90\u53D1\u884C\u7248 {0} \u4E0E --enable-pre
 
 compiler.err.preview.without.source.or.release=--enable-preview \u5FC5\u987B\u4E0E -source \u6216 --release \u4E00\u8D77\u4F7F\u7528
 
-compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5C1D\u8BD5\u5728\u57FA\u4E8E\u503C\u7684\u7C7B\u7684\u5B9E\u4F8B\u4E0A\u540C\u6B65
+# 0: kind name, 1: symbol
+compiler.warn.declared.using.preview={0} {1} \u662F\u4F7F\u7528\u9884\u89C8\u529F\u80FD\u58F0\u660E\u7684\uFF0C\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002
 
+compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\u5C1D\u8BD5\u5728\u57FA\u4E8E\u503C\u7684\u7C7B\u7684\u5B9E\u4F8B\u4E0A\u540C\u6B65
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
new file mode 100644
index 00000000000..85b76234891
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_de.properties
@@ -0,0 +1,228 @@
+#
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+## standard options
+
+javac.opt.g=Generiert alle Debugginginformationen
+javac.opt.g.none=Generiert keine Debugginginformationen
+javac.opt.g.lines.vars.source=Generiert nur einige Debugginginformationen
+javac.opt.nowarn=Generiert keine Warnungen
+javac.opt.verbose=Gibt Nachrichten zu den Compilervorg\u00E4ngen aus
+javac.opt.deprecation=Gibt Quellspeicherorte aus, wo veraltete APIs verwendet werden
+javac.opt.classpath=Gibt an, wo sich die Benutzerklassendateien und Annotationsprozessoren befinden
+javac.opt.modulepath=Gibt an, wo sich die Anwendungsmodule befinden
+javac.opt.sourcepath=Gibt an, wo sich die Eingabequelldateien befinden
+javac.opt.m=Kompiliert nur die angegebenen Module und pr\u00FCft die Zeitstempel
+javac.opt.modulesourcepath=Gib an, wo sich die Eingabequelldateien f\u00FCr mehrere Module befinden
+javac.opt.bootclasspath=Setzt den Speicherort der Bootstrap-Klassendateien au\u00DFer Kraft
+javac.opt.system=Setzt den Speicherort der Systemmodule au\u00DFer Kraft
+javac.opt.upgrademodulepath=Setzt den Speicherort der upgradef\u00E4higen Module au\u00DFer Kraft
+javac.opt.endorseddirs=Setzt den Speicherort der unterst\u00FCtzten Standardpfade au\u00DFer Kraft
+javac.opt.extdirs=Setzt den Speicherort der installierten Erweiterungen au\u00DFer Kraft
+javac.opt.processorpath=Gibt an, wo sich die Annotationsprozessoren befinden
+javac.opt.processormodulepath=Gibt einen Modulpfad an, wo sich die Annotationsprozessoren befinden
+javac.opt.processor=Namen der auszuf\u00FChrenden Annotationsprozessoren; Standard-Discovery-Prozess wird umgangen
+javac.opt.parameters=Generiert Metadaten zur Reflexion auf Methodenparameter
+javac.opt.proc.none.only=Steuert, wo die Verarbeitung von Annotationen und/oder die Kompilierung ausgef\u00FChrt wird
+javac.opt.d=Gibt an, wo generierte Klassendateien abgelegt werden
+javac.opt.sourceDest=Gibt an, wo generierte Quelldateien abgelegt werden
+javac.opt.headerDest=Gibt an, wo generierte native Headerdateien abgelegt werden
+javac.opt.J=\u00DCbergibt <Flag> direkt an das Laufzeitsystem
+javac.opt.encoding=Gibt die von den Quelldateien verwendete Zeichencodierung an
+javac.opt.profile=Vergewissern Sie sich, dass die verwendete API im angegebenen Profil verf\u00FCgbar ist
+javac.opt.target=Generiert Klassendateien, die sich f\u00FCr das angegebene Java SE-Release eignen. Unterst\u00FCtzte Releases: {0}
+javac.opt.release=Kompiliert f\u00FCr das angegebene Java SE-Release. Unterst\u00FCtzte Releases: {0}
+javac.opt.source=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release von Java SE. Unterst\u00FCtzte Releases: {0}
+javac.opt.Werror=Kompilierung beenden, wenn Warnungen auftreten
+javac.opt.A=Optionen zur \u00DCbergabe an die Annotationsprozessoren
+javac.opt.implicit=Gibt an, ob Klassendateien f\u00FCr implizit referenzierte Dateien generiert werden oder nicht
+javac.opt.pkginfo=Gibt an, wie package-info-Dateien behandelt werden sollen
+javac.opt.multi-release=Gibt an, welches Release in Multi-Release-JAR-Dateien verwendet werden soll
+javac.opt.arg.class=<Klasse>
+javac.opt.arg.class.list=<Klasse1>[,<Klasse2>,<Klasse3>...]
+javac.opt.arg.flag=<Flag>
+javac.opt.arg.key.equals.value=key[=value]
+javac.opt.arg.path=<Pfad>
+javac.opt.arg.mspath=<Modulquellpfad>
+javac.opt.arg.m=<Modul>(,<Modul>)*
+javac.opt.arg.jdk=<JDK>|none
+javac.opt.arg.dirs=<Verzeichnisse>
+javac.opt.arg.directory=<Verzeichnis>
+javac.opt.arg.encoding=<Codierung>
+javac.opt.arg.profile=<Profil>
+javac.opt.arg.release=<Release>
+javac.opt.arg.release=<Release>
+javac.opt.arg.number=<Nummer>
+javac.opt.plugin=Der Name und optional die Argumente f\u00FCr die Ausf\u00FChrung eines Plug-ins
+javac.opt.arg.plugin="name args"
+javac.opt.arg.multi-release=<Release>
+javac.opt.arg.default.module.for.created.files=<Modulname>
+
+## extended options
+
+javac.opt.maxerrs=Legt die maximale Anzahl der zu auszugebenden Fehler fest
+javac.opt.maxwarns=Legt die maximale Anzahl der auszugebenden Warnungen fest
+javac.opt.nogj=Akzeptiert keine Generics in der Sprache
+javac.opt.moreinfo=Gibt erweiterte Informationen f\u00FCr Typvariablen aus
+javac.opt.printsearch=Gibt Informationen dazu aus, wo Klassendateien gesucht werden
+javac.opt.prompt=Stoppt nach jedem Fehler
+javac.opt.s=Gibt Java-Quellen statt Klassendateien aus
+javac.opt.version=Versionsinformationen
+javac.opt.arg.pathname=<Pfadname>
+javac.opt.arg.file=<Dateiname>
+javac.opt.Xbootclasspath.p=Dem Bootstrap Classpath voranstellen
+javac.opt.Xbootclasspath.a=An Bootstrap Classpath anh\u00E4ngen
+javac.opt.Xlint=Aktiviert die empfohlenen Warnungen
+javac.opt.Xlint.all=Alle Warnungen aktivieren
+javac.opt.Xlint.none=Alle Warnungen deaktivieren
+#L10N: do not localize: -Xlint
+javac.opt.arg.Xlint=<Schl\u00FCssel>(,<Schl\u00FCssel>)*
+javac.opt.Xlint.custom=Warnungen, die aktiviert oder deaktiviert werden sollen, durch Komma getrennt.\nStellen Sie einem Schl\u00FCssel "-" voran, um die angegebene Warnung zu deaktivieren.\nVerwenden Sie --help-lint, um die unterst\u00FCtzten Schl\u00FCssel zu sehen.
+javac.opt.Xlint.desc.auxiliaryclass=Warnt vor Auxiliary-Klassen, die in einer Quelldatei verborgen sind und aus anderen Dateien heraus verwendet werden.
+
+javac.opt.Xlint.desc.cast=Warnt vor unn\u00F6tigen Umwandlungen mit Cast.
+
+javac.opt.Xlint.desc.classfile=Warnt vor Problemen im Zusammenhang mit Klassendateiinhalten.
+
+javac.opt.Xlint.desc.missing-explicit-ctor=Warnt vor fehlenden expliziten Konstruktoren in \u00F6ffentlichen und gesch\u00FCtzten Klassen in exportierten Packages.
+
+javac.opt.Xlint.desc.deprecation=Warnt vor der Verwendung veralteter Elemente.
+
+javac.opt.Xlint.desc.dep-ann=Warnt vor Elementen, die in JavaDoc als veraltet markiert sind, jedoch nicht mit der Annotation @Deprecated versehen sind.
+
+javac.opt.Xlint.desc.divzero=Warnt vor Division durch Ganzzahlkonstante 0.
+
+javac.opt.Xlint.desc.empty=Warnt vor leerer Anweisung nach "if".
+
+javac.opt.Xlint.desc.exports=Warnt vor Problemen in Bezug auf Modulexporte.
+
+javac.opt.Xlint.desc.fallthrough=Warnt vor Weitergabe von einem Case einer Switch-Anweisung zum n\u00E4chsten.
+
+javac.opt.Xlint.desc.finally=Warnt vor Finally-Klauseln, die nicht normal beendet werden.
+
+javac.opt.Xlint.desc.module=Warnt vor Problemen im Zusammenhang mit dem Modulsystem.
+
+javac.opt.Xlint.desc.opens=Warnt vor Problemen in Bezug auf Modul\u00F6ffnungen.
+
+javac.opt.Xlint.desc.options=Warnt vor Problemen im Zusammenhang mit der Verwendung von Befehlszeilenoptionen.
+
+javac.opt.Xlint.desc.overloads=Warnt vor Problemen in Bezug auf Methoden\u00FCberladung.
+
+javac.opt.Xlint.desc.overrides=Warnt vor Problemen in Bezug auf Methodenau\u00DFerkraftsetzung.
+
+javac.opt.Xlint.desc.path=Warnt vor ung\u00FCltigen Pfadelementen in der Befehlszeile.
+
+javac.opt.Xlint.desc.processing=Warnt vor Problemen in Bezug auf die Annotationsverarbeitung.
+
+javac.opt.Xlint.desc.rawtypes=Warnt vor der Verwendung von Raw-Typen.
+
+javac.opt.Xlint.desc.removal=Warnt vor der Verwendung einer API, die zum Entfernen markiert wurde.
+
+javac.opt.Xlint.desc.requires-automatic=Warnt vor der Verwendung automatischer Module in den "Requires"-Klauseln.
+
+javac.opt.Xlint.desc.requires-transitive-automatic=Warnt vor automatischen Modulen in "requires transitive".
+
+javac.opt.Xlint.desc.serial=Warnt vor serialisierbaren Klassen, die kein serialVersionUID-Feld haben. \n                         Warnt auch vor anderen verd\u00E4chtigen Deklarationen in serialisierbaren und externalisierbaren Klassen und Schnittstellen.
+
+javac.opt.Xlint.desc.static=Warnt vor Zugriff auf ein statisches Mitglied mit einer Instanz.
+
+javac.opt.Xlint.desc.strictfp=Warnt vor unn\u00F6tiger Verwendung des strictfp-Modifizierers.
+
+javac.opt.Xlint.desc.text-blocks=Warnt vor inkonsistenten Leerzeichen in Textblockeinr\u00FCckung.
+
+javac.opt.Xlint.desc.try=Warnt vor Problemen im Zusammenhang mit try-Bl\u00F6cken (d.h. try-with-resources).
+
+javac.opt.Xlint.desc.unchecked=Warnt vor deaktivierten Vorg\u00E4ngen.
+
+javac.opt.Xlint.desc.varargs=Warnt vor m\u00F6glicherweise nicht sicheren vararg-Methoden.
+
+javac.opt.Xlint.desc.preview=Warnt vor Verwendung von Vorschausprachfeatures.
+
+javac.opt.Xlint.desc.synchronization=Warnt vor Synchronisierungsversuchen mit Instanzen wertbasierter Klassen.
+
+javac.opt.Xdoclint=Empfohlene Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren
+# L10N: do not localize: all none
+javac.opt.Xdoclint.subopts = (all|none|[-]<Gruppe>)[/<Zugriff>]
+
+# L10N: do not localize: accessibility html missing reference syntax
+# L10N: do not localize: public protected package private
+javac.opt.Xdoclint.custom=Aktiviert oder deaktiviert bestimmte Pr\u00FCfungen auf Probleme in javadoc-Kommentaren,\nwobei <Gruppe> f\u00FCr accessibility, html, missing, reference oder syntax\nund <Zugriff> f\u00FCr public, protected, package oder private steht.
+
+javac.opt.Xdoclint.package.args = [-]<Packages>(,[-]<Package>)*
+
+javac.opt.Xdoclint.package.desc=Aktiviert oder deaktiviert Pr\u00FCfungen in bestimmten Packages. Jedes <Package> ist entweder der\nqualifizierte Name eines Packages oder ein Namenspr\u00E4fix, gefolgt von ".*", und bezieht sich auf\nalle Subpackages des angegebenen Packages. Jedem Package kann <Package>\nvorangestellt werden, um Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.
+
+javac.opt.Xstdout=Leitet die Standardausgabe um
+javac.opt.X=Gibt Hilfe zu zus\u00E4tzlichen Optionen aus
+javac.opt.help=Gibt diese Hilfemeldung aus
+javac.opt.help.lint=Gibt die unterst\u00FCtzten Schl\u00FCssel f\u00FCr -Xlint aus
+javac.opt.help.lint.header=Die unterst\u00FCtzten Schl\u00FCssel f\u00FCr -Xlint sind:
+javac.opt.print=Gibt eine Textdarstellung der angegebenen Typen aus
+javac.opt.printRounds=Gibt Informationen zu Durchl\u00E4ufen der Annotationsverarbeitung aus
+javac.opt.printProcessorInfo=Gibt Informationen dazu aus, welche Annotationen ein Prozessor verarbeiten soll
+javac.opt.userpathsfirst=Durchsucht classpath und sourcepath vor anstatt nach bootclasspath nach Klassen
+javac.opt.prefer=Gibt an, welche Datei gelesen werden soll, wenn sowohl eine Quell- als auch eine Klassendatei f\u00FCr eine implizit kompilierte Klasse gefunden werden
+javac.opt.preview=Aktiviert Vorschausprachfeatures. Wird in Verbindung mit -source oder --release verwendet.
+javac.opt.AT=Liest Optionen und Dateinamen aus Datei
+javac.opt.diags=W\u00E4hlt einen Diagnosemodus aus
+javac.opt.addExports=Gibt an, dass ein Package als aus seinem definierenden Modul in weitere Module oder, wenn\n<Anderes Modul> ALL-UNNAMED lautet, in alle unbenannten Module exportiert betrachtet werden soll.
+javac.opt.arg.addExports=<Modul>/<Package>=<Anderes Modul>(,<Anderes Modul>)*
+javac.opt.addReads=Gibt weitere Module an, die als von einem gegebenen Modul angefordert betrachtet werden sollen.\n<Anderes Modul> kann ALL-UNNAMED lauten, um das unbenannte Modul anzufordern.
+javac.opt.arg.addReads=<Modul>=<Anderes Modul>(,<Anderes Modul>)*
+javac.opt.patch=Setzt ein Modul au\u00DFer Kraft oder erweitert es mit Klassen und Ressourcen\nin JAR-Dateien oder Verzeichnissen
+javac.opt.arg.patch=<Modul>=<Datei>(:<Datei>)*
+javac.opt.addmods=Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen Modulen aufgel\u00F6st werden sollen, oder alle Module\nim Modulpfad, wenn <Modul> ALL-MODULE-PATH lautet.
+javac.opt.arg.addmods=<Modul>(,<Modul>)*
+javac.opt.limitmods=Begrenzt die Gesamtzahl der beobachtbaren Module
+javac.opt.arg.limitmods=<Modul>(,<Modul>)*
+javac.opt.module.version=Gibt die Version der Module an, die kompiliert werden
+javac.opt.arg.module.version=<Version>
+javac.opt.inherit_runtime_environment=Vererbt Modulsystemkonfigurationsoptionen aus der Laufzeitumgebung.
+javac.opt.default.module.for.created.files=Fallback-Zielmodul f\u00FCr Dateien, die von Annotationsprozessoren erstellt werden, falls keines angegeben ist oder abgeleitet werden kann.
+
+## messages
+
+javac.msg.usage.header=Verwendung: {0} <Optionen> <Quelldateien>,\nwobei folgende Optionen m\u00F6glich sind:
+
+javac.msg.usage=Verwendung: {0} <Optionen> <Quelldateien>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+javac.msg.usage.nonstandard.footer=Diese zus\u00E4tzlichen Optionen k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.
+
+javac.msg.bug=Im Compiler ({0}) ist eine Ausnahme aufgetreten. Erstellen Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bugbericht, nachdem Sie die Bugdatenbank (http://bugs.java.com) auf Duplikate gepr\u00FCft haben. Geben Sie in Ihrem Bericht Ihr Programm, die folgende Diagnose und die Parameter an, die Sie dem Java-Compiler \u00FCbergeben haben. Vielen Dank.
+
+javac.msg.io=\n\nEin Eingabe-/Ausgabefehler ist aufgetreten.\nDetails finden Sie im folgenden Stacktrace.\n
+
+javac.msg.proc.annotation.uncaught.exception=\n\nEin Annotationsprozessor hat eine nicht abgefangene Ausnahme ausgel\u00F6st.\nDetails finden Sie im folgenden Stacktrace.\n
+
+javac.msg.plugin.uncaught.exception=\n\nEin Plug-in hat eine nicht abgefangene Ausnahme ausgel\u00F6st.\nDetails finden Sie im folgenden Stacktrace.\n
+
+javac.msg.resource=\n\nDas System hat keine Ressourcen mehr.\nDetails finden Sie im folgenden Stacktrace.\n
+
+javac.version={0} {1}
+javac.fullVersion={0} Vollversion "{1}"
+
+javac.msg.parameters.output=Ausgabe von javac-Parametern an: {0}
+
+javac.msg.parameters.output.error=Fehler beim Versuch, javac-Parameter auszugeben an: {0}. Die Parameter folgen:
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
index 231bbc69df8..0628340ea2b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
@@ -99,7 +99,7 @@ javac.opt.Xlint.all=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u6709\u52B9\u306B
 javac.opt.Xlint.none=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<key>(,<key>)*
-javac.opt.Xlint.custom=\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3059\u308B\u8B66\u544A(\u30AB\u30F3\u30DE\u533A\u5207\u308A)\u3002\n        \u6307\u5B9A\u3057\u305F\u8B66\u544A\u3092\u7121\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n        \u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
+javac.opt.Xlint.custom=\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3059\u308B\u8B66\u544A(\u30AB\u30F3\u30DE\u533A\u5207\u308A)\u3002\n\u6307\u5B9A\u3057\u305F\u8B66\u544A\u3092\u7121\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u3092\u8868\u793A\u3059\u308B\u306B\u306F--help-lint\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 javac.opt.Xlint.desc.auxiliaryclass=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u975E\u8868\u793A\u306B\u306A\u3063\u3066\u3044\u308B\u304C\u4ED6\u306E\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u88DC\u52A9\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.cast=\u4E0D\u8981\u306A\u30AD\u30E3\u30B9\u30C8\u306E\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
@@ -144,10 +144,12 @@ javac.opt.Xlint.desc.requires-automatic=requires\u53E5\u5185\u306E\u81EA\u52D5\u
 
 javac.opt.Xlint.desc.requires-transitive-automatic=requires transitive\u5185\u306E\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
-javac.opt.Xlint.desc.serial=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3ID\u3092\u6307\u5B9A\u3057\u306A\u3044\u76F4\u5217\u5316\u53EF\u80FD\u306A\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002 \n                             \u307E\u305F\u3001\u76F4\u5217\u5316\u53EF\u80FD\u8981\u7D20\u304B\u3089public\u4EE5\u5916\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+javac.opt.Xlint.desc.serial=serialVersionUID\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u306A\u3044\u76F4\u5217\u5316\u53EF\u80FD\u30AF\u30E9\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002 \n                         \u76F4\u5217\u5316\u53EF\u80FD\u304A\u3088\u3073\u5916\u90E8\u5316\u53EF\u80FD\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067\u306E\u4ED6\u306E\u8981\u6CE8\u610F\u5BA3\u8A00\u306B\u3064\u3044\u3066\u3082\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.static=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F7F\u7528\u3057\u305Fstatic\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
+javac.opt.Xlint.desc.strictfp=strictfp\u4FEE\u98FE\u5B50\u306E\u4E0D\u8981\u306A\u4F7F\u7528\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
+
 javac.opt.Xlint.desc.text-blocks=\u30C6\u30AD\u30B9\u30C8\u30FB\u30D6\u30ED\u30C3\u30AF\u30FB\u30A4\u30F3\u30C7\u30F3\u30C8\u5185\u306E\u4E00\u8CAB\u6027\u306E\u306A\u3044\u7A7A\u767D\u6587\u5B57\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
 
 javac.opt.Xlint.desc.try=try\u30D6\u30ED\u30C3\u30AF(try-with-resources\u306A\u3069)\u306E\u4F7F\u7528\u306B\u95A2\u3059\u308B\u554F\u984C\u306B\u3064\u3044\u3066\u8B66\u544A\u3057\u307E\u3059\u3002
@@ -172,11 +174,11 @@ javac.opt.Xdoclint.package.args = [-]<packages>(,[-]<package>)*
 
 javac.opt.Xdoclint.package.desc=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\u5404<package>\u306F\u3001\n\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B''.*''\u3092\u6307\u5B9A\n(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u5404<package>\u306E\u524D\u306B\n'-'\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u6307\u5B9A\u3057\u305F1\u3064\u4EE5\u4E0A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002
 
-javac.opt.doclint.format=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306E\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u307E\u3059
-
 javac.opt.Xstdout=\u6A19\u6E96\u51FA\u529B\u3092\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3059\u308B
 javac.opt.X=\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u307E\u3059
 javac.opt.help=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
+javac.opt.help.lint=-Xlint\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u3092\u51FA\u529B\u3057\u307E\u3059
+javac.opt.help.lint.header=-Xlint\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30AD\u30FC\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
 javac.opt.print=\u6307\u5B9A\u3057\u305F\u578B\u306E\u30C6\u30AD\u30B9\u30C8\u8868\u793A\u3092\u51FA\u529B\u3059\u308B
 javac.opt.printRounds=\u6CE8\u91C8\u51E6\u7406\u306E\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
 javac.opt.printProcessorInfo=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
index 3160e948639..0fa374e3f65 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
@@ -99,7 +99,7 @@ javac.opt.Xlint.all=\u542F\u7528\u6240\u6709\u8B66\u544A
 javac.opt.Xlint.none=\u7981\u7528\u6240\u6709\u8B66\u544A
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=<\u5BC6\u94A5>(,<\u5BC6\u94A5>)*
-javac.opt.Xlint.custom=\u8981\u542F\u7528\u6216\u7981\u7528\u7684\u8B66\u544A, \u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n        \u5728\u5173\u952E\u5B57\u524D\u9762\u52A0\u4E0A '-' \u53EF\u7981\u7528\u6307\u5B9A\u7684\u8B66\u544A\u3002\n        \u652F\u6301\u7684\u5173\u952E\u5B57\u5305\u62EC:
+javac.opt.Xlint.custom=\u8981\u542F\u7528\u6216\u7981\u7528\u7684\u8B66\u544A\uFF0C\u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n\u5728\u5173\u952E\u5B57\u524D\u9762\u52A0\u4E0A '-' \u53EF\u7981\u7528\u6307\u5B9A\u7684\u8B66\u544A\u3002\n\u4F7F\u7528 --help-lint \u53EF\u67E5\u770B\u53D7\u652F\u6301\u7684\u5173\u952E\u5B57\u3002
 javac.opt.Xlint.desc.auxiliaryclass=\u6709\u5173\u8F85\u52A9\u7C7B\u5728\u6E90\u6587\u4EF6\u4E2D\u9690\u85CF, \u4F46\u5728\u5176\u4ED6\u6587\u4EF6\u4E2D\u4F7F\u7528\u7684\u8B66\u544A\u3002
 
 javac.opt.Xlint.desc.cast=\u6709\u5173\u4F7F\u7528\u4E86\u4E0D\u5FC5\u8981\u8F6C\u6362\u7684\u8B66\u544A\u3002
@@ -144,10 +144,12 @@ javac.opt.Xlint.desc.requires-automatic=\u6709\u5173\u5728 requires \u5B50\u53E5
 
 javac.opt.Xlint.desc.requires-transitive-automatic=\u6709\u5173 requires \u8FC7\u6E21\u4E2D\u7684\u81EA\u52A8\u6A21\u5757\u7684\u8B66\u544A\u3002
 
-javac.opt.Xlint.desc.serial=\u6709\u5173\u672A\u63D0\u4F9B\u5E8F\u5217\u7248\u672C ID \u7684\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u8B66\u544A\u3002\n                             \u6B64\u5916\u8FD8\u8B66\u544A\u6709\u5173\u53EF\u4E32\u884C\u5316\u5143\u7D20\u5BF9\u975E\u516C\u5171\u6210\u5458\u7684\u8BBF\u95EE\u3002
+javac.opt.Xlint.desc.serial=\u6709\u5173\u6CA1\u6709 serialVersionUID \u5B57\u6BB5\u7684\u53EF\u5E8F\u5217\u5316\u7C7B\u7684\u8B66\u544A\u3002\n                         \u4EE5\u53CA\u6709\u5173\u53EF\u5E8F\u5217\u5316\u548C\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u548C\u63A5\u53E3\u4E2D\u5176\u4ED6\u53EF\u7591\u58F0\u660E\u7684\u8B66\u544A\u3002
 
 javac.opt.Xlint.desc.static=\u6709\u5173\u4F7F\u7528\u5B9E\u4F8B\u6765\u8BBF\u95EE\u9759\u6001\u6210\u5458\u7684\u8B66\u544A\u3002
 
+javac.opt.Xlint.desc.strictfp=\u6709\u5173\u4E0D\u5FC5\u8981\u5730\u4F7F\u7528\u4E86 strictfp \u4FEE\u9970\u7B26\u7684\u8B66\u544A\u3002
+
 javac.opt.Xlint.desc.text-blocks=\u6709\u5173\u6587\u672C\u5757\u7F29\u8FDB\u4E2D\u7684\u7A7A\u683C\u5B57\u7B26\u4E0D\u4E00\u81F4\u7684\u8B66\u544A\u3002
 
 javac.opt.Xlint.desc.try=\u6709\u5173\u4E0E\u4F7F\u7528 try \u5757 (\u4F8B\u5982 try-with-resources) \u76F8\u5173\u7684\u95EE\u9898\u7684\u8B66\u544A\u3002
@@ -172,11 +174,11 @@ javac.opt.Xdoclint.package.args = [-]<\u7A0B\u5E8F\u5305>(,[-]<\u7A0B\u5E8F\u530
 
 javac.opt.Xdoclint.package.desc=\u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002\u6BCF\u4E2A <\u7A0B\u5E8F\u5305> \u662F\n\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0, \u6216\u7A0B\u5E8F\u5305\u540D\u79F0\u524D\u7F00\u540E\u8DDF '.*', \n\u5B83\u6269\u5C55\u5230\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\u6240\u6709\u5B50\u7A0B\u5E8F\u5305\u3002\u5728\u6BCF\u4E2A <\u7A0B\u5E8F\u5305>\n\u524D\u9762\u52A0\u4E0A '-' \u53EF\u4EE5\u4E3A\u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002
 
-javac.opt.doclint.format=\u6307\u5B9A\u6587\u6863\u6CE8\u91CA\u7684\u683C\u5F0F
-
 javac.opt.Xstdout=\u91CD\u5B9A\u5411\u6807\u51C6\u8F93\u51FA
 javac.opt.X=\u8F93\u51FA\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
 javac.opt.help=\u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F
+javac.opt.help.lint=\u8F93\u51FA -Xlint \u652F\u6301\u7684\u5173\u952E\u5B57
+javac.opt.help.lint.header=-Xlint \u652F\u6301\u7684\u5173\u952E\u5B57\u5305\u62EC\uFF1A
 javac.opt.print=\u8F93\u51FA\u6307\u5B9A\u7C7B\u578B\u7684\u6587\u672C\u8868\u793A
 javac.opt.printRounds=\u8F93\u51FA\u6709\u5173\u6CE8\u91CA\u5904\u7406\u5FAA\u73AF\u7684\u4FE1\u606F
 javac.opt.printProcessorInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5904\u7406\u7A0B\u5E8F\u5904\u7406\u54EA\u4E9B\u6CE8\u91CA\u7684\u4FE1\u606F
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
new file mode 100644
index 00000000000..a5796a168df
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_de.properties
@@ -0,0 +1,117 @@
+#
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
+# are preceded by a stylized comment describing the type of the corresponding
+# values.
+# The simple types currently in use are:
+#
+# annotation        annotation compound
+# boolean           true or false
+# diagnostic        a sub-message; see compiler.misc.*
+# fragment          similar to 'message segment', but with more specific type
+# modifier          a Java modifier; e.g. public, private, protected
+# file              a file URL
+# file object       a file URL - similar to 'file' but typically used for source/class files, hence more specific
+# flag              a Flags.Flag instance
+# name              a name, typically a Java identifier
+# number            an integer
+# option name       the name of a command line option
+# source version    a source version number, such as 1.5, 1.6, 1.7
+# string            a general string
+# symbol            the name of a declared type
+# symbol kind       the kind of a symbol (i.e. method, variable)
+# kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
+# token             the name of a non-terminal in source code; see compiler.misc.token.*
+# type              a Java type; e.g. int, X, X<T>
+# object            a Java object (unspecified)
+# unused            the value is not used in this message
+#
+# The following compound types are also used:
+#
+# collection of X   a comma-separated collection of items; e.g. collection of type
+# list of X         a comma-separated list of items; e.g. list of type
+# set of X          a comma-separated set of items; e.g. set of modifier
+#
+# These may be composed:
+#
+# list of type or message segment
+#
+# The following type aliases are supported:
+#
+# message segment --> diagnostic or fragment
+# file name --> file, path or file object
+#
+# Custom comments are supported in parenthesis i.e.
+#
+# number (classfile major version)
+#
+# These comments are used internally in order to generate an enum-like class declaration containing
+# a method/field for each of the diagnostic keys listed here. Those methods/fields can then be used
+# by javac code to build diagnostics in a type-safe fashion.
+#
+# In addition, these comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
+# using info derived from the collected set of examples in test/tools/javac/diags/examples.
+# MessageInfo can also be run as a standalone utility providing more facilities
+# for manipulating this file. For more details, see MessageInfo.java.
+
+## All errors are preceded by this string.
+launcher.error=Fehler: 
+
+launcher.err.no.args=kein Pfad f\u00FCr Quelldatei
+
+# 0: string
+launcher.err.invalid.filename=ung\u00FCltiger Pfad f\u00FCr Quelldatei: {0}
+
+# 0: path
+launcher.err.file.not.found=Quelldatei nicht gefunden: {0}
+
+launcher.err.compilation.failed=Kompilierung nicht erfolgreich
+
+launcher.err.no.class=keine Klasse deklariert in Quelldatei
+
+launcher.err.main.not.public.static=Methode "main" ist nicht als "public static" deklariert
+
+launcher.err.main.not.void=Methode "main" ist nicht mit R\u00FCckgabetyp "void" deklariert
+
+# 0: string
+launcher.err.cant.find.class=Klasse nicht gefunden: {0}
+
+# 0: string
+launcher.err.cant.find.main.method=Methode "main(String[])" nicht gefunden in Klasse: {0}
+
+# 0: string
+launcher.err.cant.access.main.method=kein Zugriff auf Methode "main" in Klasse: {0}
+
+# 0: path, 1: object
+launcher.err.cant.read.file=Fehler beim Lesen von Quelldatei {0}: {1}
+
+# 0: string
+launcher.err.no.value.for.option=kein Wert angegeben f\u00FCr Option: {0}
+
+# 0: string
+launcher.err.invalid.value.for.source=ung\u00FCltiger Wert f\u00FCr Option --source: {0}
+
+launcher.err.enable.preview.requires.source=--enable-preview muss mit --source verwendet werden
diff --git a/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
new file mode 100644
index 00000000000..fac9b7e1e2e
--- /dev/null
+++ b/src/jdk.compiler/share/classes/sun/tools/serialver/resources/serialver_de.properties
@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2010, 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.
+#
+
+NotSerializable=Klasse {0} ist nicht serialisierbar.
+ClassNotFound=Klasse {0} nicht gefunden.
+error.parsing.classpath=Fehler beim Parsen von Classpath {0}.
+error.missing.classpath=Fehlendes Argument bei Option -classpath
+invalid.flag=Ung\u00FCltiges Flag {0}.
+usage=Verwendung: serialver [-classpath classpath] [classname...]
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
new file mode 100644
index 00000000000..e72f5370369
--- /dev/null
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_de.properties
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+usage.java=Verwendung: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]\n                              [-o none|info|verbose] [-h zum Anzeigen von Optionen]\n                              [-version zum Anzeigen der Versionsinformationen]
+
+usage.jwebserver=Verwendung: jwebserver [-b bind address] [-p port] [-d directory]\n                  [-o none|info|verbose] [-h zum Anzeigen von Optionen]\n                  [-version zum Anzeigen von Versionsinformationen]
+
+version={0} {1}
+
+options=Optionen:\n-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".\n-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.\n-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.\n-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.\n-h, -?, --help        - Gibt diese Hilfemeldung aus und beendet.\n-version, --version   - Gibt Versionsinformationen aus und beendet.\nDr\u00FCcken Sie zum Stoppen des Servers Strg+C.
+
+opt.bindaddress=-b, --bind-address    - Adresse, an die das Binding erfolgt. Standard: {0} (Loopback).\n                        Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
+opt.directory=-d, --directory       - Zu bedienendes Verzeichnis. Standard: Aktuelles Verzeichnis.
+opt.output=-o, --output          - Ausgabeformat. none|info|verbose. Standard: info.
+opt.port=-p, --port            - Port, auf dem gehorcht wird. Standard: 8000.
+
+loopback.info=Binding an Loopback als Standard. Verwenden Sie f\u00FCr alle Schnittstellen "-b 0.0.0.0" oder "-b ::".
+
+msg.start.anylocal=Bedient {0} und Unterverzeichnisse auf 0.0.0.0 (alle Schnittstellen) Port {2}\nURL http://{1}:{2}/
+
+msg.start.other=Bedient {0} und Unterverzeichnisse auf {1} Port {2}\nURL http://{1}:{2}/
+
+error.prefix=Fehler:
+
+err.unknown.option=unbekannte Option: {0}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.invalid.arg=ung\u00FCltiger Wert angegeben f\u00FCr {0}: {1}
+err.server.config.failed=Serverkonfiguration nicht erfolgreich: {0}
+err.server.handle.failed=Handling des Serveraustauschs nicht erfolgreich: {0}
+
+html.dir.list=Verzeichnisliste f\u00FCr
+html.not.found=Datei wurde nicht gefunden
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
new file mode 100644
index 00000000000..974707493a5
--- /dev/null
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_ja.properties
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+usage.java=\u4F7F\u7528\u65B9\u6CD5: java -m jdk.httpserver [-b bind address] [-p port] [-d directory]\n                              [-o none|info|verbose] [-h to show options]\n                              [-version to show version information]
+
+usage.jwebserver=\u4F7F\u7528\u65B9\u6CD5: jwebserver [-b bind address] [-p port] [-d directory]\n                  [-o none|info|verbose] [-h to show options]\n                  [-version to show version information]
+
+version={0} {1}
+
+options=\u30AA\u30D7\u30B7\u30E7\u30F3:\n-b, --bind-address    - \u30D0\u30A4\u30F3\u30C9\u5148\u30A2\u30C9\u30EC\u30B9\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: {0} (\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF)\u3002\n                        \u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n-d, --directory       - \u4F7F\u7528\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: \u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\n-o, --output          - \u51FA\u529B\u5F62\u5F0F\u3002none|info|verbose\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: info\u3002\n-p, --port            - \u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: 8000\u3002\n-h, -?, --help        - \u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n-version, --version   - \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n\u30B5\u30FC\u30D0\u30FC\u3092\u505C\u6B62\u3059\u308B\u306B\u306F\u3001[Ctrl]+[C]\u3092\u62BC\u3057\u307E\u3059\u3002
+
+opt.bindaddress=-b, --bind-address    - \u30D0\u30A4\u30F3\u30C9\u5148\u30A2\u30C9\u30EC\u30B9\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: {0} (\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF).\n                        \u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+opt.directory=-d, --directory       - \u4F7F\u7528\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: \u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002
+opt.output=-o, --output          - \u51FA\u529B\u5F62\u5F0F\u3002none|info|verbose. \u30C7\u30D5\u30A9\u30EB\u30C8: info\u3002
+opt.port=-p, --port            - \u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30DD\u30FC\u30C8\u3002\u30C7\u30D5\u30A9\u30EB\u30C8: 8000\u3002
+
+loopback.info=\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u30EB\u30FC\u30D7\u30D0\u30C3\u30AF\u306B\u30D0\u30A4\u30F3\u30C9\u3057\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3067"-b 0.0.0.0"\u307E\u305F\u306F"-b ::"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+
+msg.start.anylocal={0}\u304A\u3088\u3073\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30920.0.0.0 (\u3059\u3079\u3066\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9)\u30DD\u30FC\u30C8{2}\u3067\u4F7F\u7528\u3057\u307E\u3059\nURL http://{1}:{2}/
+
+msg.start.other={0}\u304A\u3088\u3073\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092{1}\u30DD\u30FC\u30C8{2}\u3067\u4F7F\u7528\u3057\u307E\u3059\nURL http://{1}:{2}/
+
+error.prefix=\u30A8\u30E9\u30FC:
+
+err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
+err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+err.invalid.arg={0}\u306B\u7121\u52B9\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F: {1}
+err.server.config.failed=\u30B5\u30FC\u30D0\u30FC\u306E\u69CB\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
+err.server.handle.failed=\u30B5\u30FC\u30D0\u30FC\u4EA4\u63DB\u51E6\u7406\u304C\u5931\u6557\u3057\u307E\u3057\u305F: {0}
+
+html.dir.list=\u6B21\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30EA\u30B9\u30C8
+html.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
new file mode 100644
index 00000000000..1d35a7ecd1b
--- /dev/null
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/resources/simpleserver_zh_CN.properties
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+usage.java=\u7528\u6CD5\uFF1Ajava -m jdk.httpserver [-b \u7ED1\u5B9A\u5730\u5740] [-p \u7AEF\u53E3] [-d \u76EE\u5F55]\n                              [-o none|info|verbose] [-h \u663E\u793A\u9009\u9879]\n                              [-version \u663E\u793A\u7248\u672C\u4FE1\u606F]
+
+usage.jwebserver=\u7528\u6CD5\uFF1Ajwebserver [-b \u7ED1\u5B9A\u5730\u5740] [-p \u7AEF\u53E3] [-d \u76EE\u5F55]\n                              [-o none|info|verbose] [-h \u663E\u793A\u9009\u9879]\n                              [-version \u663E\u793A\u7248\u672C\u4FE1\u606F]
+
+version={0} {1}
+
+options=\u9009\u9879\uFF1A\n-b, --bind-address    - \u8981\u7ED1\u5B9A\u5230\u7684\u5730\u5740\u3002\u9ED8\u8BA4\u503C\uFF1A{0}\uFF08\u73AF\u56DE\uFF09\u3002\n                        \u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002\n-d, --directory       - \u8981\u4E3A\u5176\u63D0\u4F9B\u670D\u52A1\u7684\u76EE\u5F55\u3002\u9ED8\u8BA4\u503C\uFF1A\u5F53\u524D\u76EE\u5F55\u3002\n-o, --output          - \u8F93\u51FA\u683C\u5F0F\u3002none|info|verbose\u3002\u9ED8\u8BA4\u503C\uFF1Ainfo\u3002\n-p, --port            - \u8981\u76D1\u542C\u7684\u7AEF\u53E3\u3002\u9ED8\u8BA4\u503C\uFF1A8000\u3002\n-h, -?, --help        - \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F\u5E76\u9000\u51FA\u3002\n-version, --version   - \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\u3002\n\u8981\u505C\u6B62\u670D\u52A1\u5668\uFF0C\u8BF7\u6309 Ctrl + C\u3002
+
+opt.bindaddress=-b, --bind-address    - \u8981\u7ED1\u5B9A\u5230\u7684\u5730\u5740\u3002\u9ED8\u8BA4\u503C\uFF1A{0}\uFF08\u73AF\u56DE\uFF09\u3002\n                        \u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002
+opt.directory=-d, --directory       - \u8981\u4E3A\u5176\u63D0\u4F9B\u670D\u52A1\u7684\u76EE\u5F55\u3002\u9ED8\u8BA4\u503C\uFF1A\u5F53\u524D\u76EE\u5F55\u3002
+opt.output=-o, --output          - \u8F93\u51FA\u683C\u5F0F\u3002none|info|verbose\u3002\u9ED8\u8BA4\u503C\uFF1Ainfo\u3002
+opt.port=-p, --port            - \u8981\u76D1\u542C\u7684\u7AEF\u53E3\u3002\u9ED8\u8BA4\u503C\uFF1A8000\u3002
+
+loopback.info=\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u7ED1\u5B9A\u5230\u73AF\u56DE\u3002\u5982\u679C\u8981\u8868\u793A\u6240\u6709\u63A5\u53E3\uFF0C\u8BF7\u4F7F\u7528 "-b 0.0.0.0" \u6216 "-b ::"\u3002
+
+msg.start.anylocal=\u4E3A 0.0.0.0\uFF08\u6240\u6709\u63A5\u53E3\uFF09\u7AEF\u53E3 {2} \u4E0A\u7684 {0} \u53CA\u5B50\u76EE\u5F55\u63D0\u4F9B\u670D\u52A1\nURL http://{1}:{2}/
+
+msg.start.other=\u4E3A {1} \u7AEF\u53E3 {2} \u4E0A\u7684 {0} \u53CA\u5B50\u76EE\u5F55\u63D0\u4F9B\u670D\u52A1\nURL http://{1}:{2}/
+
+error.prefix=\u9519\u8BEF:
+
+err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
+err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
+err.invalid.arg=\u4E3A {0} \u63D0\u4F9B\u7684\u503C\u65E0\u6548\uFF1A{1}
+err.server.config.failed=\u670D\u52A1\u5668\u914D\u7F6E\u5931\u8D25\uFF1A{0}
+err.server.handle.failed=\u670D\u52A1\u5668\u4EA4\u6362\u5904\u7406\u5931\u8D25\uFF1A{0}
+
+html.dir.list=\u4EE5\u4E0B\u9879\u7684\u76EE\u5F55\u5217\u8868
+html.not.found=\u627E\u4E0D\u5230\u6587\u4EF6
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
new file mode 100644
index 00000000000..b66ce1a4dee
--- /dev/null
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.tools.jarsigner;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for JarSigner.
+ *
+ */
+public class Resources_de extends java.util.ListResourceBundle {
+
+    private static final Object[][] contents = {
+
+        // shared (from jarsigner)
+        {"SPACE", " "},
+        {"6SPACE", "      "},
+        {"COMMA", ", "},
+
+        {"provclass.not.a.provider", "%s kein Provider"},
+        {"provider.name.not.found", "Provider namens \"%s\" nicht gefunden"},
+        {"provider.class.not.found", "Provider \"%s\" nicht gefunden"},
+        {"jarsigner.error.", "jarsigner-Fehler: "},
+        {"Illegal.option.", "Unzul\u00E4ssige Option: "},
+        {"This.option.is.forremoval", "Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt: "},
+        {".keystore.must.be.NONE.if.storetype.is.{0}",
+                "-keystore muss NONE sein, wenn -storetype {0} ist"},
+        {".keypass.can.not.be.specified.if.storetype.is.{0}",
+                "-keypass kann nicht angegeben werden, wenn -storetype \"{0}\" ist"},
+        {"If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified",
+                "Wenn -protected angegeben ist, d\u00FCrfen -storepass und -keypass nicht angegeben werden"},
+        {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
+                 "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass und -keypass nicht angegeben werden"},
+        {"Usage.jarsigner.options.jar.file.alias",
+                "Verwendung: jarsigner [options] jar-file alias"},
+        {".jarsigner.verify.options.jar.file.alias.",
+                "       jarsigner -verify [options] jar-file [alias...]"},
+        {".jarsigner.version",
+                "       jarsigner -version"},
+        {".keystore.url.keystore.location",
+                "[-keystore <URL>]           Keystore-Speicherort"},
+        {".storepass.password.password.for.keystore.integrity",
+            "[-storepass <Kennwort>]     Kennwort f\u00FCr Keystore-Integrit\u00E4t"},
+        {".storetype.type.keystore.type",
+                "[-storetype <Typ>]         Keystore-Typ"},
+        {".keypass.password.password.for.private.key.if.different.",
+                "[-keypass <Kennwort>]       Kennwort f\u00FCr Private Key (falls unterschiedlich)"},
+        {".certchain.file.name.of.alternative.certchain.file",
+                "[-certchain <Datei>]         Name der alternativen certchain-Datei"},
+        {".sigfile.file.name.of.SF.DSA.file",
+                "[-sigfile <Datei>]           Name der SF/DSA-Datei"},
+        {".signedjar.file.name.of.signed.JAR.file",
+                "[-signedjar <Datei>]         Name der signierten JAR-Datei"},
+        {".digestalg.algorithm.name.of.digest.algorithm",
+                "[-digestalg <Algorithmus>]    Name des Digestalgorithmus"},
+        {".sigalg.algorithm.name.of.signature.algorithm",
+                "[-sigalg <Algorithmus>]       Name des Signaturalgorithmus"},
+        {".verify.verify.a.signed.JAR.file",
+                "[-verify]                   Verifiziert eine signierte JAR-Datei"},
+        {".version.print.the.program.version",
+                "[-version]                  Gibt die Programmversion aus"},
+        {".verbose.suboptions.verbose.output.when.signing.verifying.",
+                "[-verbose[:suboptions]]     Verbose-Ausgabe beim Signieren/Verifizieren."},
+        {".suboptions.can.be.all.grouped.or.summary",
+                "                            Als Unteroptionen sind \"all\", \"grouped\" und \"summary\" m\u00F6glich"},
+        {".certs.display.certificates.when.verbose.and.verifying",
+                "[-certs]                    Zeigt Zertifikate bei Verbose und Verifizierung an"},
+        {".certs.revocation.check",
+                "[-revCheck]                 Aktiviert die Zertifikatswiderrufpr\u00FCfung"},
+        {".tsa.url.location.of.the.Timestamping.Authority",
+                "[-tsa <URL>]                Ort der Zeitstempelautorit\u00E4t"},
+        {".tsacert.alias.public.key.certificate.for.Timestamping.Authority",
+                "[-tsacert <Alias>]          Public-Key-Zertifikat f\u00FCr Zeitstempelautorit\u00E4t"},
+        {".tsapolicyid.tsapolicyid.for.Timestamping.Authority",
+                "[-tsapolicyid <OID>]        TSAPolicyID f\u00FCr Zeitstempelautorit\u00E4t"},
+        {".tsadigestalg.algorithm.of.digest.data.in.timestamping.request",
+                "[-tsadigestalg <Algorithmus>] Algorithmus der Digestdaten in Zeitstempelanforderung"},
+        {".altsigner.class.class.name.of.an.alternative.signing.mechanism",
+                "[-altsigner <Klasse>]        Klassenname eines alternativen Signiermechanismus\n                            (Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt.)"},
+        {".altsignerpath.pathlist.location.of.an.alternative.signing.mechanism",
+                "[-altsignerpath <Pfadliste>] Speicherort eines alternativen Signiermechanismus\n                            (Diese Option ist veraltet und wird in einem zuk\u00FCnftigen Release entfernt.)"},
+        {".internalsf.include.the.SF.file.inside.the.signature.block",
+                "[-internalsf]               SF-Datei in Signaturblock aufnehmen"},
+        {".sectionsonly.don.t.compute.hash.of.entire.manifest",
+                "[-sectionsonly]             Berechnet nicht den Hash des gesamten Manifests"},
+        {".protected.keystore.has.protected.authentication.path",
+                "[-protected]                Keystore hat gesch\u00FCtzten Authentifizierungspfad"},
+        {".providerName.name.provider.name",
+                "[-providerName <Name>]      Providername"},
+        {".add.provider.option",
+                "[-addprovider <Name>        F\u00FCgt einen Sicherheitsprovider nach Name hinzu (z.B. SunPKCS11)"},
+        {".providerArg.option.1",
+                "  [-providerArg <Argument>]] ... Konfiguriert Argument f\u00FCr -addprovider"},
+        {".providerClass.option",
+                "[-providerClass <Klasse>     F\u00FCgt einen Sicherheitsprovider nach vollqualifiziertem Klassennamen hinzu"},
+        {".providerArg.option.2",
+                "  [-providerArg <Argument>]] ... Konfiguriert Argument f\u00FCr -providerClass"},
+        {".strict.treat.warnings.as.errors",
+                "[-strict]                   Behandelt Warnungen als Fehler"},
+        {".conf.url.specify.a.pre.configured.options.file",
+                "[-conf <URL>]               Vorkonfigurierte Optionsdatei angeben"},
+        {".print.this.help.message",
+                "[-? -h --help]              Gibt diese Hilfemeldung aus"},
+        {"Option.lacks.argument", "Argument fehlt in Option"},
+        {"Please.type.jarsigner.help.for.usage", "Geben Sie jarsigner --help ein, um Verwendungsinformationen anzuzeigen"},
+        {"Please.specify.jarfile.name", "Geben Sie den Namen der JAR-Datei an"},
+        {"Please.specify.alias.name", "Geben Sie einen Aliasnamen an"},
+        {"Only.one.alias.can.be.specified", "Nur ein Alias kann angegeben werden"},
+        {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
+                 "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge, die nicht von den angegebenen Aliasnamen signiert wurden."},
+        {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
+                  "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge, die nicht vom Alias in diesem Keystore signiert wurden."},
+        {"s", "s"},
+        {"m", "m"},
+        {"k", "k"},
+        {"X", "X"},
+        {"q", "?"},
+        {".and.d.more.", "(und %d mehr)"},
+        {".s.signature.was.verified.",
+                "  s = Signatur wurde verifiziert "},
+        {".m.entry.is.listed.in.manifest",
+                "  m = Eintrag ist in Manifest aufgef\u00FChrt"},
+        {".k.at.least.one.certificate.was.found.in.keystore",
+                "  k = Mindestens ein Zertifikat im Keystore gefunden"},
+        {".X.not.signed.by.specified.alias.es.",
+                "  X = Nicht von den angegebenen Aliasnamen signiert"},
+        {".q.unsigned.entry",
+                "  ? = Nicht signierter Eintrag"},
+        {"no.manifest.", "Kein Manifest."},
+        {".Signature.related.entries.","(Signaturbezogene Eintr\u00E4ge)"},
+        {".Unsigned.entries.", "(Nicht signierte Eintr\u00E4ge)"},
+        {".Directory.entries.", "(Verzeichniseintr\u00E4ge)"},
+        {"jar.is.unsigned",
+                "JAR-Datei ist nicht signiert."},
+        {"jar.treated.unsigned",
+                "Warnung: Signatur kann entweder nicht geparst oder nicht verifiziert werden. Die JAR-Datei wird als nicht signiert behandelt. Weitere Informationen erhalten Sie, indem Sie \"jarsigner\" mit aktiviertem Debugging erneut ausf\u00FChren (-J-Djava.security.debug=jar)."},
+        {"jar.treated.unsigned.see.weak",
+                "Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der jetzt deaktiviert ist.\n\nF\u00FChren Sie \"jarsigner\" mit der Option \"-verbose\" erneut aus, um weitere Einzelheiten zu erhalten."},
+        {"jar.treated.unsigned.see.weak.verbose",
+                "Warnung: Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der mittlerweile von der folgenden Sicherheitseigenschaft deaktiviert wurde:"},
+        {"jar.signed.", "JAR-Datei signiert."},
+        {"jar.signed.with.signer.errors.", "JAR-Datei signiert, mit Signaturgeberfehlern."},
+        {"jar.verified.", "JAR-Datei verifiziert."},
+        {"jar.verified.with.signer.errors.", "JAR-Datei verifiziert, mit Signaturgeberfehlern."},
+
+        {"history.with.ts", "- Von \"%1$s\" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s\n  Zeitstempel von \"%6$s\" am %5$tc\n    Digestalgorithmus f\u00FCr Zeitstempel: %7$s\n    Signaturalgorithmus f\u00FCr Zeitstempel: %8$s, %9$s"},
+        {"history.without.ts", "- Von \"%1$s\" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s"},
+        {"history.unparsable", "- Signaturbezogene Datei %s kann nicht geparst werden"},
+        {"history.nosf", "- Signaturbezogene Datei META-INF/%s.SF fehlt"},
+        {"history.nobk", "- Blockdatei f\u00FCr signaturbezogene Datei META-INF/%s.SF fehlt"},
+
+        {"with.weak", "%s (schwach)"},
+        {"with.disabled", "%s (deaktiviert)"},
+        {"key.bit", "%d-Bit-Schl\u00FCssel"},
+        {"key.bit.weak", "%d-Bit-Schl\u00FCssel (schwach)"},
+        {"key.bit.disabled", "%d-Bit-Schl\u00FCssel (deaktiviert)"},
+        {"unknown.size", "unbekannte Gr\u00F6\u00DFe"},
+        {"extra.attributes.detected", "POSIX-Dateiberechtigung und/oder Symlink-Attribute erkannt. Diese Attribute werden bei der Signatur ignoriert und sind nicht durch die Signatur gesch\u00FCtzt."},
+
+        {"jarsigner.", "jarsigner: "},
+        {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
+                "Signaturdateiname muss aus den folgenden Zeichen bestehen: A-Z, 0-9, _ oder -"},
+        {"unable.to.open.jar.file.", "JAR-Datei kann nicht ge\u00F6ffnet werden: "},
+        {"unable.to.create.", "Erstellen nicht m\u00F6glich: "},
+        {".adding.", "   Wird hinzugef\u00FCgt: "},
+        {".updating.", " Wird aktualisiert: "},
+        {".signing.", "  Wird signiert: "},
+        {"attempt.to.rename.signedJarFile.to.jarFile.failed",
+                "Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich"},
+        {"attempt.to.rename.jarFile.to.origJar.failed",
+                "Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich"},
+        {"unable.to.sign.jar.", "JAR-Datei kann nicht signiert werden: "},
+        {"Enter.Passphrase.for.keystore.", "Passphrase f\u00FCr Keystore eingeben: "},
+        {"keystore.load.", "Keystore-Ladevorgang: "},
+        {"certificate.exception.", "Zertifikatsausnahme: "},
+        {"unable.to.instantiate.keystore.class.",
+                "Keystore-Klasse kann nicht instanziiert werden: "},
+        {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
+                "Zertifikatskette nicht gefunden f\u00FCr: {0}. {1} muss einen g\u00FCltigen Keystore-Schl\u00FCssel referenzieren, der einen Private Key und eine zugeh\u00F6rige Public-Key-Zertifikatskette enth\u00E4lt."},
+        {"File.specified.by.certchain.does.not.exist",
+                "Von -certchain angegebene Datei ist nicht vorhanden"},
+        {"Cannot.restore.certchain.from.file.specified",
+                "Zertifikatskette kann nicht aus angegebener Datei wiederhergestellt werden"},
+        {"Certificate.chain.not.found.in.the.file.specified.",
+                "Zertifikatskette nicht in der angegebenen Datei gefunden."},
+        {"found.non.X.509.certificate.in.signer.s.chain",
+                "Nicht-X.509-Zertifikat in Kette des Signaturgebers gefunden"},
+        {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr {0} eingeben: "},
+        {"unable.to.recover.key.from.keystore",
+                "Schl\u00FCssel kann nicht aus Keystore wiederhergestellt werden"},
+        {"key.associated.with.alias.not.a.private.key",
+                "Mit {0} verkn\u00FCpfter Schl\u00FCssel ist kein Private Key"},
+        {"you.must.enter.key.password", "Sie m\u00FCssen ein Schl\u00FCsselkennwort eingeben"},
+        {"unable.to.read.password.", "Kennwort kann nicht gelesen werden: "},
+        {"certificate.is.valid.from", "Zertifikat ist von {0} bis {1} g\u00FCltig"},
+        {"certificate.expired.on", "Zertifikat ist am {0} abgelaufen"},
+        {"certificate.is.not.valid.until",
+                "Zertifikat ist erst ab {0} g\u00FCltig"},
+        {"certificate.will.expire.on", "Zertifikat l\u00E4uft am {0} ab"},
+        {".Invalid.certificate.chain.", "[Ung\u00FCltige Zertifikatskette: "},
+        {".Invalid.TSA.certificate.chain.", "[Ung\u00FCltige TSA-Zertifikatskette: "},
+        {"requesting.a.signature.timestamp",
+                "Signaturzeitstempel wird angefordert"},
+        {"TSA.location.", "TSA-Ort: "},
+        {"TSA.certificate.", "TSA-Zertifikat: "},
+        {"no.response.from.the.Timestamping.Authority.",
+                "Keine Antwort von der Zeitstempelautorit\u00E4t. Bei Verbindungen hinter einer Firewall muss m\u00F6glicherweise ein HTTP- oder HTTPS-Proxy angegeben werden. Geben Sie die folgenden Optionen f\u00FCr \"jarsigner\" an:"},
+        {"or", "oder"},
+        {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
+                "Zertifikat nicht gefunden f\u00FCr: {0}. {1} muss einen g\u00FCltigen Keystore-Eintrag referenzieren, der ein X.509-Public-Key-Zertifikat f\u00FCr die Zeitstempelautorit\u00E4t enth\u00E4lt."},
+        {"using.an.alternative.signing.mechanism",
+                "Verwendung eines alternativen Signaturmechanismus"},
+        {"entry.was.signed.on", "Eintrag wurde signiert am {0}"},
+        {"Warning.", "Warnung: "},
+        {"Error.", "Fehler: "},
+        {"...Signer", ">>> Signaturgeber"},
+        {"...TSA", ">>> TSA"},
+        {"trusted.certificate", "vertrauensw\u00FCrdiges Zertifikat"},
+        {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
+                "Diese JAR-Datei enth\u00E4lt nicht signierte Eintr\u00E4ge, deren Integrit\u00E4t nicht gepr\u00FCft wurde. "},
+        {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat abgelaufen ist."},
+        {"This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat innerhalb der n\u00E4chsten sechs Monate abl\u00E4uft. "},
+        {"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat noch nicht g\u00FCltig ist. "},
+        {"This.jar.contains.entries.whose.signer.certificate.is.self.signed.",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat selbstsigniert ist."},
+        {"Re.run.with.the.verbose.and.certs.options.for.more.details.",
+                "F\u00FChren Sie den Befehl erneut mit den Optionen -verbose und -certs aus, um weitere Details zu erhalten."},
+        {"The.signer.certificate.has.expired.",
+                "Das Signaturgeberzertifikat ist abgelaufen."},
+        {"The.timestamp.expired.1.but.usable.2",
+                "Der Zeitstempel ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber g\u00FCltig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abl\u00E4uft."},
+        {"The.timestamp.has.expired.",
+                "Der Zeitstempel ist abgelaufen."},
+        {"The.signer.certificate.will.expire.within.six.months.",
+                "Das Signaturgeberzertifikat l\u00E4uft innerhalb der n\u00E4chsten sechs Monate ab."},
+        {"The.timestamp.will.expire.within.one.year.on.1",
+                "Der Zeitstempel l\u00E4uft innerhalb des n\u00E4chsten Jahres am %1$tY-%1$tm-%1$td ab."},
+        {"The.timestamp.will.expire.within.one.year.on.1.but.2",
+                "Der Zeitstempel l\u00E4uft innerhalb des n\u00E4chsten Jahres am %1$tY-%1$tm-%1$td ab. Die JAR-Datei bleibt aber g\u00FCltig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abl\u00E4uft."},
+        {"The.signer.certificate.is.not.yet.valid.",
+                "Das Signaturgeberzertifikat ist noch nicht g\u00FCltig."},
+        {"The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
+                 "Die KeyUsage-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
+        {"The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
+                 "Die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
+        {"The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
+                 "Die NetscapeCertType-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
+        {"This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
+                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die KeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
+        {"This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
+                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
+        {"This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
+                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die NetscapeCertType-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
+        {".{0}.extension.does.not.support.code.signing.",
+                 "[{0}-Erweiterung unterst\u00FCtzt keine Codesignatur]"},
+        {"The.signer.s.certificate.chain.is.invalid.reason.1",
+                "Die Zertifikatskette des Signaturgebers ist ung\u00FCltig. Grund: %s"},
+        {"The.tsa.certificate.chain.is.invalid.reason.1",
+                "Die TSA-Zertifikatskette ist ung\u00FCltig. Grund: %s"},
+        {"The.signer.s.certificate.is.self.signed.",
+                "Das Zertifikat des Signaturgebers ist selbstsigniert."},
+        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
+                "Der f\u00FCr die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.",
+                "Der f\u00FCr die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
+                "Der %1$s-Digestalgorithmus des Zeitstempels gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
+                "Der %1$s-Digestalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
+                "Der %1$s-Signaturalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update.",
+                "Der %1$s-Signaturschl\u00FCssel hat eine Schl\u00FCsselgr\u00F6\u00DFe von %2$d. Das gilt als Sicherheitsrisiko. Diese Schl\u00FCsselgr\u00F6\u00DFe wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.and.is.disabled.",
+                "Der %1$s-Signaturschl\u00FCssel hat eine Schl\u00FCsselgr\u00F6\u00DFe von %2$d. Das gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
+                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Zertifikatskette ung\u00FCltig ist. Grund: %s"},
+        {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
+                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren TSA-Zertifikatskette ung\u00FCltig ist. Grund: %s"},
+        {"no.timestamp.signing",
+                "Weder -tsa noch -tsacert wurde angegeben, und diese JAR-Datei hat keinen Zeitstempel. Ohne Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
+        {"invalid.timestamp.signing",
+                "Der Zeitstempel ist ung\u00FCltig. Ohne einen g\u00FCltigen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
+        {"no.timestamp.verifying",
+                "Diese JAR-Datei enth\u00E4lt Signaturen ohne Zeitstempel. Ohne einen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (fr\u00FChestens %1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
+        {"bad.timestamp.verifying",
+                "Diese JAR-Datei enth\u00E4lt Signaturen mit einem ung\u00FCltigen Zeitstempel. Ohne einen g\u00FCltigen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (fr\u00FChestens %1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren.\nF\u00FChren Sie \"jarsigner\" mit -J-Djava.security.debug=jar erneut aus, um weitere Informationen zu erhalten."},
+        {"The.signer.certificate.will.expire.on.1.",
+                "Das Signaturgeberzertifikat l\u00E4uft am %1$tY-%1$tm-%1$td ab."},
+        {"The.timestamp.will.expire.on.1.",
+                "Der Zeitstempel l\u00E4uft am %1$tY-%1$tm-%1$td ab."},
+        {"signer.cert.expired.1.but.timestamp.good.2.",
+                "Das Signaturgeberzertifikat ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber g\u00FCltig, bis der Zeitstempel am %2$tY-%2$tm-%2$td abl\u00E4uft."},
+        {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
+        {"Cannot.find.environment.variable.",
+                "Umgebungsvariable kann nicht gefunden werden: "},
+        {"Cannot.find.file.", "Datei kann nicht gefunden werden: "},
+        {"event.ocsp.check", "Verbindung zu OCSP-Server bei %s wird hergestellt..."},
+        {"event.crl.check", "CRL wird von %s heruntergeladen..."},
+    };
+
+    /**
+     * Returns the contents of this <code>ResourceBundle</code>.
+     *
+     * <p>
+     *
+     * @return the contents of this <code>ResourceBundle</code>.
+     */
+    @Override
+    public Object[][] getContents() {
+        return contents;
+    }
+}
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
index 65422c0e686..aca0727297c 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
@@ -57,6 +57,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "\u4F7F\u7528\u65B9\u6CD5: jarsigner [options] jar-file alias"},
         {".jarsigner.verify.options.jar.file.alias.",
                 "       jarsigner -verify [options] jar-file [alias...]"},
+        {".jarsigner.version",
+                "       jarsigner -version"},
         {".keystore.url.keystore.location",
                 "[-keystore <url>]           \u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4F4D\u7F6E"},
         {".storepass.password.password.for.keystore.integrity",
@@ -77,6 +79,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "[-sigalg <algorithm>]       \u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]                   \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u8A3C"},
+        {".version.print.the.program.version",
+                "[-version]                  \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
                 "[-verbose[:suboptions]]     \u7F72\u540D/\u691C\u8A3C\u6642\u306E\u8A73\u7D30\u51FA\u529B\u3002"},
         {".suboptions.can.be.all.grouped.or.summary",
@@ -131,6 +135,8 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"s", "s"},
         {"m", "m"},
         {"k", "k"},
+        {"X", "X"},
+        {"q", "?"},
         {".and.d.more.", "(\u4ED6\u306B\u3082%d\u500B)"},
         {".s.signature.was.verified.",
                 "  s=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F "},
@@ -140,9 +146,12 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "  k=1\u3064\u4EE5\u4E0A\u306E\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u3067\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
         {".X.not.signed.by.specified.alias.es.",
                 "  X =\u6307\u5B9A\u3057\u305F\u5225\u540D\u3067\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
+        {".q.unsigned.entry",
+                "  ? = \u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA"},
         {"no.manifest.", "\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002"},
         {".Signature.related.entries.","(\u30B7\u30B0\u30CD\u30C1\u30E3\u95A2\u9023\u30A8\u30F3\u30C8\u30EA)"},
         {".Unsigned.entries.", "(\u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA)"},
+        {".Directory.entries.", "(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30A8\u30F3\u30C8\u30EA)"},
         {"jar.is.unsigned",
                 "jar\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"jar.treated.unsigned",
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
index 0cdd2b96cee..47dacd6a8a5 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
@@ -57,6 +57,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u7528\u6CD5: jarsigner [\u9009\u9879] jar-file \u522B\u540D"},
         {".jarsigner.verify.options.jar.file.alias.",
                 "       jarsigner -verify [\u9009\u9879] jar-file [\u522B\u540D...]"},
+        {".jarsigner.version",
+                "       jarsigner -version"},
         {".keystore.url.keystore.location",
                 "[-keystore <url>]           \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
         {".storepass.password.password.for.keystore.integrity",
@@ -77,6 +79,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "[-sigalg <\u7B97\u6CD5>]           \u7B7E\u540D\u7B97\u6CD5\u7684\u540D\u79F0"},
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]                   \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"},
+        {".version.print.the.program.version",
+                "[-version]                  \u8F93\u51FA\u7A0B\u5E8F\u7248\u672C"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
                 "[-verbose[:suboptions]]     \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
         {".suboptions.can.be.all.grouped.or.summary",
@@ -131,6 +135,8 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"s", "s"},
         {"m", "m"},
         {"k", "k"},
+        {"X", "X"},
+        {"q", "?"},
         {".and.d.more.", "(%d \u53CA\u4EE5\u4E0A)"},
         {".s.signature.was.verified.",
                 "  s = \u5DF2\u9A8C\u8BC1\u7B7E\u540D "},
@@ -140,9 +146,12 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "  k = \u5728\u5BC6\u94A5\u5E93\u4E2D\u81F3\u5C11\u627E\u5230\u4E86\u4E00\u4E2A\u8BC1\u4E66"},
         {".X.not.signed.by.specified.alias.es.",
                 "  X = \u672A\u7531\u6307\u5B9A\u522B\u540D\u7B7E\u540D"},
+        {".q.unsigned.entry",
+                "  ? = \u672A\u7B7E\u540D\u6761\u76EE"},
         {"no.manifest.", "\u6CA1\u6709\u6E05\u5355\u3002"},
         {".Signature.related.entries.","(\u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6761\u76EE)"},
         {".Unsigned.entries.", "(\u672A\u7B7E\u540D\u6761\u76EE)"},
+        {".Directory.entries.", "\uFF08\u76EE\u5F55\u6761\u76EE\uFF09"},
         {"jar.is.unsigned",
                 "jar \u672A\u7B7E\u540D\u3002"},
         {"jar.treated.unsigned",
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
index 10f634baa08..95744421c89 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
 
 error.multiple.main.operations=Es ist nicht m\u00F6glich, mehrere "-cuxtid"-Optionen anzugeben
 error.cant.open=\u00D6ffnen nicht m\u00F6glich: {0}
-error.illegal.option=Ung\u00FCltige Option: {0}
+error.illegal.option=Unzul\u00E4ssige Option: {0}
 error.unrecognized.option=Unbekannte Option: {0}
 error.missing.arg=F\u00FCr die Option {0} ist ein Argument erforderlich
 error.bad.file.arg=Fehler beim Parsen der Dateiargumente
-error.bad.option=Eine der Optionen -{ctxuid} muss angegeben werden.
+error.bad.option=Eine der Optionen -{ctxuid} oder --validate muss angegeben werden.
 error.bad.cflag=Kennzeichen "c" erfordert Angabe von Manifest oder Eingabedateien.
 error.bad.uflag=Kennzeichen "u" erfordert Angabe von Manifest, Kennzeichen "e" oder Eingabedateien.
 error.bad.eflag=Kennzeichen "e" und Manifest mit dem Attribut "Main-Class" k\u00F6nnen nicht zusammen angegeben\nwerden.
@@ -43,7 +43,7 @@ error.create.tempfile=Es konnte keine tempor\u00E4re Datei erstellt werden
 error.hash.dep=Abh\u00E4ngigkeiten bei Hashing-Modul {0}. Modul {1} kann nicht im Modulpfad gefunden werden
 error.module.options.without.info=--module-version oder --hash-modules ohne module-info.class
 error.no.operative.descriptor=Kein operativer Deskriptor f\u00FCr Release: {0}
-error.no.root.descriptor=Kein Root-Moduldeskriptor. Geben Sie "--release" an
+error.no.root.descriptor=Kein Root-Moduldeskriptor. Geben Sie --release an
 error.unable.derive.automodule=Moduldeskriptor kann nicht abgeleitet werden f\u00FCr: {0}
 error.unexpected.module-info=Unerwarteter Moduldeskriptor {0}
 error.module.descriptor.not.found=Moduldeskriptor nicht gefunden
@@ -52,6 +52,8 @@ error.missing.provider=Serviceprovider nicht gefunden: {0}
 error.release.value.notnumber=Release {0} nicht g\u00FCltig
 error.release.value.toosmall=Release {0} nicht g\u00FCltig, muss >= 9 sein
 error.release.unexpected.versioned.entry=Unerwarteter versionierte Eintrag {0} f\u00FCr Release {1}
+error.date.notvalid=Datum {0} ist keine g\u00FCltige erweiterte Datums-/Uhrzeitangabe mit Zeitunterschied und optionaler Zeitzone nach ISO-8601
+error.date.out.of.range=Datum {0} liegt nicht im g\u00FCltigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
 error.validator.jarfile.exception={0} kann nicht validiert werden: {1}
 error.validator.jarfile.invalid=ung\u00FCltige Multi-Release-JAR-Datei {0} gel\u00F6scht
 error.validator.bad.entry.name=Eintragsname hat das falsche Format, {0}
@@ -75,6 +77,7 @@ warn.validator.identical.entry=Warnung: Eintrag {0} enth\u00E4lt eine Klasse, di
 warn.validator.resources.with.same.name=Warnung: Eintrag {0}, mehrere Ressourcen mit demselben Namen
 warn.validator.concealed.public.class=Warnung: Eintrag {0} ist eine \u00F6ffentliche Klasse\nin einem verdeckten Package. Wenn Sie diese JAR-Datei in den Classpath einf\u00FCgen, kommt es\nzu nicht kompatiblen \u00F6ffentlichen Schnittstellen
 warn.release.unexpected.versioned.entry=Unerwarteter versionierter Eintrag {0}
+warn.flag.is.deprecated=Warnung: Die Option {0} ist veraltet, und ihre Entfernung in einem k\u00FCnftigen JDK-Release ist geplant\n
 out.added.manifest=Manifest wurde hinzugef\u00FCgt
 out.added.module-info=module-info hinzugef\u00FCgt: {0}
 out.automodule=Kein Moduldeskriptor gefunden. Automatisches Modul wurde abgeleitet.
@@ -89,7 +92,7 @@ out.extracted=extrahiert: {0}
 out.inflated=\ vergr\u00F6\u00DFert: {0}
 out.size=(ein = {0}) (aus = {1})
 
-usage.compat=Kompatibilit\u00E4tsschnittstelle:\nVerwendung:  jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] Dateien] ...\nOptionen:\n    -c  Neues Archiv erstellen\n    -t  Inhaltsverzeichnis f\u00FCr Archiv anzeigen\n    -x  Benannte (oder alle) Dateien aus Archiv extrahieren\n    -u  Vorhandenes Archiv aktualisieren\n    -v  Ausgabe im Verbose-Modus aus Standardausgabe generieren\n    -f  Dateinamen f\u00FCr Archiv angeben\n    -m  Manifestinformationen aus angegebener Manifestdatei aufnehmen\n    -n  Pack200-Normalisierung nach Erstellung eines neuen Archivs ausf\u00FChren\n    -e  Anwendungseinstiegspunkt f\u00FCr in ausf\u00FChrbare JAR-Datei \n        geb\u00FCndelte Standalone-Anwendung angeben\n    -0  Nur speichern; keine ZIP-Komprimierung verwenden\n    -P  Komponenten mit vorangestelltem "/" (absoluter Pfad) und ".." (\u00FCbergeordnetes Verzeichnis) aus Dateinamen beibehalten\n        -M  Keine Manifestdatei f\u00FCr die Eintr\u00E4ge erstellen\n    -i  Indexinformationen f\u00FCr die angegebenen JAR-Dateien erstellen\n    -C  Zum angegebenen Verzeichnis wechseln und folgende Datei ber\u00FCcksichtigen\nDateien, die Verzeichnisse sind, werden rekursiv verarbeitet.\nDer Name der Manifestdatei, der Name der Archivdatei und der Name des Einstiegspunktes werden\nin derselben Reihenfolge wie die Kennzeichen "m", "f" und "e" angegeben.\n\nBeispiel 1: Zwei Klassendateien in ein Archiv "classes.jar" archivieren: \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Mit der vorhandenen Manifestdatei "mymanifest" alle\n           Dateien im Verzeichnis foo/ in "classes.jar" archivieren: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
+usage.compat=Kompatibilit\u00E4tsschnittstelle\nVerwendung: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files] ...\nOptionen:\n    -c  erstellt ein neues Archiv\n    -t  listet das Inhaltsverzeichnis f\u00FCr das Archiv auf\n    -x  extrahiert die benannten (oder alle) Dateien aus dem Archiv\n    -u  aktualisiert ein vorhandenes Archiv\n    -v  generiert Verbose-Ausgabe zur Standardausgabe\n    -f  gibt den Archivdateinamen an\n    -m  schlie\u00DFt Manifestinformationen aus der angegebenen Manifestdatei ein\n    -e  gibt den Anwendungseinstiegspunkt f\u00FCr Standalone-Anwendungen an,\n        die in einer ausf\u00FChrbaren JAR-Datei geb\u00FCndelt sind\n    -0  speichert nur, keine ZIP-Komprimierung\n    -P  beh\u00E4lt die vorangestellten Komponenten "/" (absoluter Pfad) und ".." (\u00FCbergeordnetes Verzeichnis) aus dem Dateinamen bei\n    -M  generiert keine Manifestdatei f\u00FCr die Eintr\u00E4ge\n    -i  generiert Indexinformationen f\u00FCr die angegebenen JAR-Dateien\n    -C  wechselt zum angegebenen Verzeichnis und schlie\u00DFt die folgende Datei ein\nDateien, die Verzeichnisse sind, werden rekursiv verarbeitet.\nDie Namen der Manifestdatei, der Archivdatei und des Einstiegspunkts werden\nin der gleichen Reihenfolge wie die Flags "m", "f" und "e" verarbeitet.\n\nBeispiel 1: Zwei Klassendateien in einem Archiv classes.jar archivieren: \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Eine vorhandene Manifestdatei "mymanifest" verwenden und alle\n           Dateien im Verzeichnis foo/ directory in "classes.jar" archivieren: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
 
 main.usage.summary=Verwendung: jar [OPTION...] [ [--release VERSION] [-C dir] Dateien] ...
 main.usage.summary.try=Verwenden Sie "jar --help", um weitere Informationen anzuzeigen.
@@ -102,11 +105,12 @@ main.help.opt.main.list=\  -t, --list                 Das Inhaltsverzeichnis f\u
 main.help.opt.main.update=\  -u, --update               Ein vorhandenes JAR-Archiv aktualisieren
 main.help.opt.main.extract=\  -x, --extract              Benannte (oder alle) Dateien aus dem Archiv extrahieren
 main.help.opt.main.describe-module=\  -d, --describe-module      Gibt den Moduldeskriptor oder automatischen Modulnamen aus
+main.help.opt.main.validate=\      --validate             Validiert den Inhalt des JAR-Archivs. Diese Option\n                             validiert, dass die von einem Multi-Release-JAR-Archiv\n                             exportierte API \u00FCber die verschiedenen Releaseversionen\n                             hinweg konsistent ist.
 main.help.opt.any=\ In jedem Modus g\u00FCltige Vorgangsmodifikatoren:\n\n  -C DIR                     Zum angegebenen Verzeichnis wechseln und die folgende\n                             Datei aufnehmen
 main.help.opt.any.file=\  -f, --file=FILE            Der Name der Archivdatei. Wenn Sie dies lauslassen, wird entweder stdin oder\n                             stdout verwendet, je nach Vorgang\n      --release VERSION      Speichert alle der folgenden Dateien in einem versionierten Verzeichnis\n                             der JAR-Datei (d.h. META-INF/versions/VERSION/)
 main.help.opt.any.verbose=\  -v, --verbose              Verbose-Ausgabe bei Standardausgabe generieren
 main.help.opt.create=\ Vorgangsmodifikatoren, die nur im Erstellungsmodus g\u00FCltig sind:\n
-main.help.opt.create.normalize=\  -n, --normalize            Normalisiert Informationen im neuen JAR-Archiv\n                             nach der Erstellung
+main.help.opt.create.normalize=\  -n, --normalize            Normalisiert Informationen im neuen JAR-Archiv\n                             nach der Erstellung. Diese Option ist veraltet, und ihre\n                             Entfernung in einem k\u00FCnftigen JDK-Release ist geplant
 main.help.opt.create.update=\ Vorgangsmodifikatoren, die nur im Erstellungs- und Aktualisierungsmodus g\u00FCltig sind:\n
 main.help.opt.create.update.main-class=\  -e, --main-class=CLASSNAME Der Anwendungseinstiegspunkt f\u00FCr Standalone-\n                             Anwendungen, die in einem modularen oder ausf\u00FChrbaren\n                             JAR-Archiv geb\u00FCndelt sind
 main.help.opt.create.update.manifest=\  -m, --manifest=FILE        Die Manifestinformationen aus der angegebenen\n                             Manifestdatei aufnehmen
@@ -118,8 +122,9 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     Hinweis f\u00FCr ein Tool, eine Warnung auszugeben,\n                             wenn das Modul aufgel\u00F6st wird, entweder "deprecated", "deprecated-for-removal"\n                             oder "incubating"
 main.help.opt.create.update.index=\ Vorgangsmodifikatoren, die nur im Erstellungs-, Aktualisierungs- und Indexgenerierungsmodus g\u00FCltig sind:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          Nur speichern, keine ZIP-Komprimierung verwenden
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP        Zeitstempel im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied\n                             und optionaler Zeitzone nach ISO-8601, zur Verwendung f\u00FCr die Zeitstempel von\n                             Eintr\u00E4gen, z.B. "2022-02-12T12:30:00-05:00"
 main.help.opt.other=\ Weitere Optionen:\n
-main.help.opt.other.help=\  -h, --help[:compat]        Gibt diese Meldung oder optional die Kompatibilit\u00E4t, Hilfe an
+main.help.opt.other.help=\  -?, -h, --help[:compat]    Gibt diese Meldung oder optional die Kompatibilit\u00E4t, Hilfe an
 main.help.opt.other.help-extra=\      --help-extra           Hilfe zu zus\u00E4tzlichen Optionen
 main.help.opt.other.version=\      --version              Programmversion ausgeben
 main.help.postopt=\ Ein Archiv ist ein modulares JAR-Archiv, wenn der Moduldeskriptor "module-info.class"\n in der Root der angegebenen Verzeichnisse oder in der Root des JAR-Archivs selbst\n vorhanden ist. Die folgenden Vorg\u00E4nge sind nur g\u00FCltig, wenn Sie ein modulares JAR-Archiv\n erstellen oder ein vorhandenes nicht modulares JAR-Archiv aktualisieren: "--module-version",\n "--hash-modules" und "--modulepath".\n\n Obligatorische oder optionale Argumente zu langen Optionen sind auch f\u00FCr die jeweils\n zugeh\u00F6rigen kurzen Optionen obligatorisch oder optional.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
index b17d8c1e08d..a4cdec838f8 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ error.illegal.option=\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 error.unrecognized.option=\u8A8D\u8B58\u3055\u308C\u306A\u3044\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 error.missing.arg=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.file.arg=\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306E\u89E3\u6790\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-error.bad.option=\u30AA\u30D7\u30B7\u30E7\u30F3-{ctxuid}\u306E\u3046\u3061\u306E1\u3064\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+error.bad.option=\u30AA\u30D7\u30B7\u30E7\u30F3-{ctxuid}\u307E\u305F\u306F--validate\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 error.bad.cflag=\u30D5\u30E9\u30B0'c'\u3067\u306F\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u307E\u305F\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.uflag=\u30D5\u30E9\u30B0'u'\u3067\u306F\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304B'e'\u30D5\u30E9\u30B0\u3001\u307E\u305F\u306F\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u6307\u5B9A\u304C\u5FC5\u8981\u3067\u3059\u3002
 error.bad.eflag='e'\u30D5\u30E9\u30B0\u3068'Main-Class'\u5C5E\u6027\u3092\u6301\u3064\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u540C\u6642\u306B\n\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
@@ -52,6 +52,8 @@ error.missing.provider=\u30B5\u30FC\u30D3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u3
 error.release.value.notnumber=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 error.release.value.toosmall=\u30EA\u30EA\u30FC\u30B9{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u30029\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.release.unexpected.versioned.entry=\u30EA\u30EA\u30FC\u30B9{1}\u3067\u4E88\u671F\u3057\u306A\u3044\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u6E08\u30A8\u30F3\u30C8\u30EA{0}
+error.date.notvalid=\u65E5\u4ED8{0}\u304C\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u3092\u6307\u5B9A\u3057\u305F\u3001\u6709\u52B9\u306AISO-8601\u306E\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+error.date.out.of.range=\u65E5\u4ED8{0}\u304C\u6709\u52B9\u306A\u7BC4\u56F21980-01-01T00:00:02Z to 2099-12-31T23:59:59Z\u306B\u3042\u308A\u307E\u305B\u3093
 error.validator.jarfile.exception={0}\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093: {1}
 error.validator.jarfile.invalid=\u7121\u52B9\u306A\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u30D5\u30A1\u30A4\u30EB{0}\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F
 error.validator.bad.entry.name=\u30A8\u30F3\u30C8\u30EA\u540D\u304C\u4E0D\u6B63\u3067\u3059: {0}
@@ -103,6 +105,7 @@ main.help.opt.main.list=\  -t\u3001--list                 \u30A2\u30FC\u30AB\u30
 main.help.opt.main.update=\  -u\u3001--update               \u65E2\u5B58\u306Ejar\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3057\u307E\u3059
 main.help.opt.main.extract=\  -x\u3001--extract              \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3057\u307E\u3059
 main.help.opt.main.describe-module=\  -d, --describe-module      \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u307E\u305F\u306F\u81EA\u52D5\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u3092\u51FA\u529B\u3057\u307E\u3059
+main.help.opt.main.validate=\      --validate            jar\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u691C\u8A3C\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n                             \u8907\u6570\u30EA\u30EA\u30FC\u30B9\u306Ejar\u30A2\u30FC\u30AB\u30A4\u30D6\u3067\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305FAPI\u304C\n                             \u3059\u3079\u3066\u306E\u7570\u306A\u308B\u30EA\u30EA\u30FC\u30B9\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u4E00\u8CAB\u3057\u3066\u3044\u308B\u3053\u3068\u3092\n                             \u691C\u8A3C\u3057\u307E\u3059\u3002
 main.help.opt.any=\ \u3069\u306E\u30E2\u30FC\u30C9\u3067\u3082\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n\n  -C DIR                     \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u6B21\u306E\u30D5\u30A1\u30A4\u30EB\u3092\n                             \u53D6\u308A\u8FBC\u307F\u307E\u3059
 main.help.opt.any.file=\  -f\u3001--file=FILE            \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u7701\u7565\u3057\u305F\u5834\u5408\u3001stdin\u307E\u305F\u306F\n                             stdout\u306E\u3044\u305A\u308C\u304B\u304C\u64CD\u4F5C\u306B\u57FA\u3065\u3044\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n      --release VERSION      \u6B21\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092jar\u306E\u30D0\u30FC\u30B8\u30E7\u30CB\u30F3\u30B0\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n                             (\u3064\u307E\u308A\u3001META-INF/versions/VERSION/)\u306B\u914D\u7F6E\u3057\u307E\u3059
 main.help.opt.any.verbose=\  -v\u3001--verbose              \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3057\u307E\u3059
@@ -119,6 +122,7 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u8B66\u544A\u3092\u767A\u884C\u3059\u308B\n                             \u30C4\u30FC\u30EB\u306E\u30D2\u30F3\u30C8\u3002\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\n                             \u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B
 main.help.opt.create.update.index=\ \u4F5C\u6210\u3001\u66F4\u65B0\u304A\u3088\u3073\u7D22\u5F15\u751F\u6210\u30E2\u30FC\u30C9\u3067\u306E\u307F\u6709\u52B9\u306A\u64CD\u4F5C\u4FEE\u98FE\u5B50:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u307E\u305B\u3093
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP       \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u305FISO-8601\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\n                            \u306E\u65E5\u6642\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3002\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u4F7F\u7528\u4F8B\u306F\u3001\n                             "2022-02-12T12:30:00-05:00"\u3067\u3059
 main.help.opt.other=\ \u305D\u306E\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n
 main.help.opt.other.help=\  -?\u3001-h\u3001--help[:compat]        \u3053\u308C(\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u4E92\u63DB\u6027)\u3092help\u306B\u6307\u5B9A\u3057\u307E\u3059
 main.help.opt.other.help-extra=\      --help-extra           \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u63D0\u4F9B\u3057\u307E\u3059
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
index 36889f522cb..5a4832d0bd4 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ error.illegal.option=\u975E\u6CD5\u9009\u9879: {0}
 error.unrecognized.option=\u65E0\u6CD5\u8BC6\u522B\u7684\u9009\u9879: {0}
 error.missing.arg=\u9009\u9879{0}\u9700\u8981\u53C2\u6570
 error.bad.file.arg=\u89E3\u6790\u6587\u4EF6\u53C2\u6570\u65F6\u51FA\u9519
-error.bad.option=\u5FC5\u987B\u6307\u5B9A {ctxuid} \u4E2D\u7684\u4EFB\u4E00\u9009\u9879\u3002
+error.bad.option=\u5FC5\u987B\u6307\u5B9A -{ctxuid} \u6216 --validate \u9009\u9879\u4E4B\u4E00\u3002
 error.bad.cflag='c' \u6807\u8BB0\u8981\u6C42\u6307\u5B9A\u6E05\u5355\u6216\u8F93\u5165\u6587\u4EF6!
 error.bad.uflag='u' \u6807\u8BB0\u8981\u6C42\u6307\u5B9A\u6E05\u5355, 'e' \u6807\u8BB0\u6216\u8F93\u5165\u6587\u4EF6!
 error.bad.eflag=\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A 'e' \u6807\u8BB0\u548C\u5177\u6709 'Main-Class' \u5C5E\u6027\u7684\n\u6E05\u5355!
@@ -52,6 +52,8 @@ error.missing.provider=\u672A\u627E\u5230\u670D\u52A1\u63D0\u4F9B\u65B9: {0}
 error.release.value.notnumber=\u53D1\u884C\u7248 {0} \u65E0\u6548
 error.release.value.toosmall=\u53D1\u884C\u7248 {0} \u65E0\u6548, \u5FC5\u987B >= 9
 error.release.unexpected.versioned.entry=\u53D1\u884C\u7248 {1} \u5B58\u5728\u610F\u5916\u7684\u7248\u672C\u5316\u6761\u76EE {0}
+error.date.notvalid=\u65E5\u671F {0} \u4E0D\u662F\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684\u6709\u6548 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4
+error.date.out.of.range=\u65E5\u671F {0} \u4E0D\u5728 1980-01-01T00:00:02Z \u5230 2099-12-31T23:59:59Z \u8FD9\u4E00\u6709\u6548\u8303\u56F4\u5185
 error.validator.jarfile.exception=\u65E0\u6CD5\u9A8C\u8BC1 {0}: {1}
 error.validator.jarfile.invalid=\u5220\u9664\u7684\u591A\u53D1\u884C\u7248 jar \u6587\u4EF6 {0} \u65E0\u6548
 error.validator.bad.entry.name=\u6761\u76EE\u540D\u79F0\u683C\u5F0F\u9519\u8BEF, {0}
@@ -103,6 +105,7 @@ main.help.opt.main.list=\  -t, --list                 \u5217\u51FA\u6863\u6848\u
 main.help.opt.main.update=\  -u, --update               \u66F4\u65B0\u73B0\u6709 jar \u6863\u6848
 main.help.opt.main.extract=\  -x, --extract              \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u5168\u90E8) \u6587\u4EF6
 main.help.opt.main.describe-module=\  -d, --describe-module      \u8F93\u51FA\u6A21\u5757\u63CF\u8FF0\u7B26\u6216\u81EA\u52A8\u6A21\u5757\u540D\u79F0
+main.help.opt.main.validate=\      --validate             \u9A8C\u8BC1 jar \u6863\u6848\u7684\u5185\u5BB9\u3002\u6B64\u9009\u9879\n                             \u5C06\u9A8C\u8BC1\u7531\u591A\u53D1\u884C\u7248 jar \u6863\u6848\u5BFC\u51FA\n                             \u7684 API \u5728\u6240\u6709\u4E0D\u540C\u7684\u53D1\u884C\u7248\u672C\u4E2D\n                             \u662F\u5426\u4E00\u81F4\u3002
 main.help.opt.any=\ \u5728\u4EFB\u610F\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n\n  -C DIR                     \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\n                             \u4EE5\u4E0B\u6587\u4EF6
 main.help.opt.any.file=\  -f, --file=FILE            \u6863\u6848\u6587\u4EF6\u540D\u3002\u7701\u7565\u65F6, \u57FA\u4E8E\u64CD\u4F5C\n                             \u4F7F\u7528 stdin \u6216 stdout\n      --release VERSION      \u5C06\u4E0B\u9762\u7684\u6240\u6709\u6587\u4EF6\u90FD\u653E\u5728\n                             jar \u7684\u7248\u672C\u5316\u76EE\u5F55\u4E2D (\u5373 META-INF/versions/VERSION/)
 main.help.opt.any.verbose=\  -v, --verbose              \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA
@@ -119,6 +122,7 @@ main.help.opt.create.update.do-not-resolve-by-default=\      --do-not-resolve-by
 main.help.opt.create.update.warn-if-resolved=\      --warn-if-resolved     \u63D0\u793A\u5DE5\u5177\u5728\u89E3\u6790\u6A21\u5757\u540E\u53D1\u51FA\u8B66\u544A\u3002\n                             \u53EF\u4EE5\u4E3A deprecated, deprecated-for-removal\n                             \u6216 incubating \u4E4B\u4E00
 main.help.opt.create.update.index=\ \u53EA\u5728\u521B\u5EFA, \u66F4\u65B0\u548C\u751F\u6210\u7D22\u5F15\u6A21\u5F0F\u4E0B\u6709\u6548\u7684\u64CD\u4F5C\u4FEE\u9970\u7B26:\n
 main.help.opt.create.update.index.no-compress=\  -0, --no-compress          \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528 ZIP \u538B\u7F29
+main.help.opt.create.update.index.date=\      --date=TIMESTAMP       \u5177\u6709\u53EF\u9009\u65F6\u533A\u7684 ISO-8601 \u6269\u5C55\u504F\u79FB\n                             \u65E5\u671F\u65F6\u95F4\u683C\u5F0F\u7684\u65F6\u95F4\u6233\uFF08\u7528\u4E8E\u6761\u76EE\u7684\u65F6\u95F4\u6233\uFF09\uFF0C\n                             \u4F8B\u5982\uFF0C"2022-02-12T12:30:00-05:00"
 main.help.opt.other=\ \u5176\u4ED6\u9009\u9879:\n
 main.help.opt.other.help=\  -?, -h, --help[:compat]    \u63D0\u4F9B\u6B64\u5E2E\u52A9\uFF0C\u4E5F\u53EF\u4EE5\u9009\u62E9\u6027\u5730\u63D0\u4F9B\u517C\u5BB9\u6027\u5E2E\u52A9
 main.help.opt.other.help-extra=\      --help-extra           \u63D0\u4F9B\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
new file mode 100644
index 00000000000..4cf302da7b9
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_de.properties
@@ -0,0 +1,445 @@
+#
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+doclet.build_version=Standard-Doclet-Version {0}
+doclet.Contents=Inhalt
+doclet.Overview=\u00DCberblick
+doclet.Window_Overview_Summary=\u00DCberblick
+doclet.Element=Element
+doclet.Package=Package
+doclet.Unnamed_Package=Unbenanntes Package
+doclet.Module=Modul
+doclet.Open_Module=Modul \u00F6ffnen
+doclet.All_Packages=Alle Packages
+doclet.All_Modules=Alle Module
+doclet.None=Kein Wert
+doclet.Tree=Baum
+doclet.Class_Hierarchy=Klassenhierarchie
+doclet.Window_Class_Hierarchy=Klassenhierarchie
+doclet.Interface_Hierarchy=Schnittstellenhierarchie
+doclet.Enum_Hierarchy=Enum-Hierarchie
+doclet.Enum_Class_Hierarchy=Enum-Klassenhierarchie
+doclet.Annotation_Type_Hierarchy=Annotationstyphierarchie
+doclet.Annotation_Interface_Hierarchy=Annotationsschnittstellenhierarchie
+doclet.Href_Class_Title=Klasse in {0}
+doclet.Href_Interface_Title=Schnittstelle in {0}
+doclet.Href_Annotation_Title=Annotation in {0}
+doclet.Href_Annotation_Interface_Title=Annotationsschnittstelle in {0}
+doclet.Href_Enum_Title=Enum in {0}
+doclet.Href_Enum_Class_Title=Enum-Klasse in {0}
+doclet.Href_Type_Param_Title=Typparameter in {0}
+doclet.Href_Class_Or_Interface_Title=Klasse oder Schnittstelle in {0}
+doclet.Summary=\u00DCbersicht:
+doclet.Detail=Details:
+doclet.Module_Sub_Nav=Modul:
+doclet.Help_Sub_Nav=Hilfe:
+doclet.Package_Sub_Nav=Package:
+doclet.navClassesAndInterfaces=Klassen und Schnittstellen
+doclet.navDescription=Beschreibung
+doclet.navModules=Module
+doclet.navPackages=Packages
+doclet.navServices=Services
+doclet.navNested=Verschachtelt
+doclet.navAnnotationTypeOptionalMember=Optional
+doclet.navAnnotationTypeRequiredMember=Erforderlich
+doclet.navAnnotationTypeMember=Element
+doclet.navField=Feld
+doclet.navProperty=Eigenschaft
+doclet.navEnum=Enum-Konstanten
+doclet.navConstructor=Konstruktor
+doclet.navMethod=Methode
+doclet.navNavigation=Navigation
+doclet.navPages=Seiten
+doclet.not.exhaustive=(nicht umfassend)
+doclet.Index=Index
+doclet.Window_Single_Index=Index
+doclet.Window_Split_Index={0}-Index
+doclet.Help=Hilfe
+doclet.Skip_navigation_links=Navigations-Links \u00FCberspringen
+doclet.Toggle_navigation_links=Navigationslinks umschalten
+doclet.Navigation=Navigation
+doclet.navDeprecated=Veraltet
+doclet.Window_Deprecated_List=Veraltete Liste
+doclet.Window_New_List=Neue API-Liste
+doclet.Window_Preview_List=Vorschauliste
+doclet.Overrides=Setzt au\u00DFer Kraft:
+doclet.in_class=in Klasse
+doclet.Element_in=Element in {0}
+doclet.Enum_constant_in=Enum-Konstante in {0}
+doclet.Static_variable_in=Statische Variable in {0}
+doclet.Variable_in=Variable in {0}
+doclet.Constructor_for=Konstruktor f\u00FCr {0}
+doclet.Record_component_in=Komponente von {0} erfassen
+doclet.Static_method_in=Statische Methode in {0}
+doclet.Search_tag_in=Tag suchen in {0}
+doclet.Method_in=Methode in {0}
+doclet.module=Modul
+doclet.package=Package
+doclet.MalformedURL=Nicht wohlgeformte URL: {0}
+doclet.File_error=Fehler beim Lesen der Datei: {0}
+doclet.URL_error=Fehler beim Abrufen der URL: {0}
+doclet.Resource_error=Fehler beim Lesen der Ressource: {0}
+doclet.see.class_or_package_not_found=Tag {0}: Referenz nicht gefunden: {1}
+doclet.see.class_or_package_not_accessible=Tag {0}: Referenz nicht zug\u00E4nglich: {1}
+doclet.see.nested_link=Tag {0}: Verschachtelter Link
+doclet.tag.invalid_usage=Ung\u00FCltige Verwendung des Tags {0}
+doclet.tag.invalid_input=Ung\u00FCltige Eingabe: "{0}"
+doclet.tag.invalid=ung\u00FCltiges @{0}
+doclet.Deprecated_API=Veraltete API
+doclet.Deprecated_Elements=Veraltete {0}
+doclet.Deprecated_In_Release=Veraltet in {0}
+doclet.Deprecated_Tabs_Intro=(Die Registerkarte "Veraltet ..." ganz links zeigt alle veralteten Elemente, unabh\u00E4ngig von dem Release, seit dem sie veraltet sind. Jede der anderen Registerkarten "Veraltet in ..." zeigt die Elemente, die seit einem bestimmten Release veraltet sind.)
+doclet.New_API=Neue API
+doclet.New_Elements=Neue {0}
+doclet.New_Elements_Added_In_Release=Hinzugef\u00FCgt in {0}
+doclet.New_Label=Neu
+doclet.New_Tabs_Intro=(Die Registerkarte "Neu ..." ganz links zeigt alle neuen Elemente, unabh\u00E4ngig von dem Release, in dem sie hinzugef\u00FCgt wurden. Jede der anderen Registerkarten "Hinzugef\u00FCgt in ..." zeigt die Elemente, die in einem bestimmten Release hinzugef\u00FCgt wurden. Elemente, die auf der Registerkarte ganz links angezeigt werden, werden auch auf einer der Registerkarten weiter rechts angezeigt.)
+doclet.Preview_API=Vorschau-API
+doclet.Preview_Label=Vorschau
+doclet.Preview_Mark=PREVIEW
+doclet.Terminally_Deprecated=Endg\u00FCltig veraltet
+doclet.Terminally_Deprecated_Elements=Endg\u00FCltig veraltete Elemente
+doclet.Terminally_Deprecated_In_Release=Endg\u00FCltig veraltet in {0}
+doclet.Annotation_Types=Annotationstypen
+doclet.Annotation_Interfaces=Annotationsschnittstellen
+doclet.Annotation_Type_Members=Annotationstypelemente
+doclet.Annotation_Interface_Members=Annotationsschnittstellenelemente
+doclet.annotation_types=Annotationstypen
+doclet.annotation_interfaces=Annotationsschnittstellen
+doclet.annotation_type_members=Annotationstypelemente
+doclet.annotation_interface_members=Annotationsschnittstellenelemente
+doclet.Generated_Docs_Untitled=Generierte Dokumentation (unbenannt)
+doclet.Other_Packages=Andere Packages
+doclet.Description=Beschreibung
+doclet.Specified_By=Angegeben von:
+doclet.in_interface=in Schnittstelle
+doclet.Subclasses=Bekannte direkte Unterklassen:
+doclet.Subinterfaces=Alle bekannten Unterschnittstellen:
+doclet.Implementing_Classes=Alle bekannten Implementierungsklassen:
+doclet.Functional_Interface=Funktionsschnittstelle:
+doclet.Functional_Interface_Message=Dies ist eine funktionale Schnittstelle, die somit als Zuweisungsziel f\u00FCr einen Lambdaausdruck oder eine Methodenreferenz verwendet werden kann.
+doclet.also=auch
+doclet.Package_Hierarchies=Packagehierarchien:
+doclet.Hierarchy_For_Package=Hierarchie f\u00FCr Package {0}
+doclet.Hierarchy_For_All_Packages=Hierarchie f\u00FCr alle Packages
+doclet.Hierarchy_For_Unnamed_Package=Hierarchie f\u00FCr unbenanntes Package
+doclet.No_Script_Message=JavaScript ist im Browser deaktiviert.
+doclet.Description_From_Interface=Beschreibung aus Schnittstelle kopiert:
+doclet.Description_From_Class=Beschreibung aus Klasse kopiert:
+doclet.No_Non_Deprecated_Classes_To_Document=Keine zu dokumentierenden nicht veralteten Klassen gefunden.
+doclet.Interfaces=Schnittstellen
+doclet.Enclosing_Class=Umschlie\u00DFende Klasse:
+doclet.Enclosing_Interface=Umschlie\u00DFende Schnittstelle:
+doclet.Inheritance_Tree=Vererbungsbaum
+doclet.ReferencedIn=Referenziert in
+doclet.System_Property=Systemeigenschaft
+doclet.systemProperties=Systemeigenschaften
+doclet.systemPropertiesSummary=Systemeigenschaften - \u00DCbersicht
+doclet.Window_Source_title=Quellcode
+doclet.Window_Help_title=API-Hilfe
+
+doclet.help.main_heading=Hilfe zu JavaDoc
+doclet.help.navigation.head=Navigation
+# 0: link to the Overview page
+doclet.help.navigation.intro=Ausgehend von der Seite {0} k\u00F6nnen Sie die Dokumentation mithilfe der Links durchsuchen, die sich auf jeder Seite und in der Navigationsleiste oben auf jeder Seite befinden.
+# 0: link to the Index;  1: short list of links
+doclet.help.navigation.index=Mit {0} und dem Suchfeld k\u00F6nnen Sie zu spezifischen Deklarationen und \u00DCbersichtsseiten navigieren, wie {1}
+doclet.help.page_kinds.head=Seitenarten
+doclet.help.page_kinds.intro=Die folgenden Abschnitte beschreiben die verschiedenen Seitenarten in dieser Collection.
+# 0: link to the Overview page
+doclet.help.overview.modules.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enth\u00E4lt eine Liste aller Module mit einer \u00DCbersicht f\u00FCr jedes Modul. Diese Seite kann auch eine Gesamtbeschreibung des Modulsets enthalten.
+# 0: link to the Overview page
+doclet.help.overview.packages.body=Die Seite {0} ist die Titelseite dieses API-Dokuments und enth\u00E4lt eine Liste aller Packages mit einer \u00DCbersicht f\u00FCr jedes Packages. Diese Seite kann auch eine Gesamtbeschreibung des Packagesets enthalten.
+doclet.help.package.intro=F\u00FCr jedes Package ist eine Seite vorhanden, die eine Liste der Klassen und Schnittstellen mit jeweils einer \u00DCbersicht daf\u00FCr enth\u00E4lt. Diese Seiten k\u00F6nnen die folgenden Kategorien enthalten:
+doclet.help.module.intro=F\u00FCr jedes Modul ist eine Seite vorhanden, die eine Liste der Packages, Abh\u00E4ngigkeiten von anderen Modulen und Services mit jeweils einer \u00DCbersicht daf\u00FCr enth\u00E4lt. Diese Seiten k\u00F6nnen die folgenden Kategorien enthalten:
+doclet.help.class_interface.head=Klasse oder Schnittstelle
+doclet.help.class_interface.intro=F\u00FCr jede Klasse, Schnittstelle, verschachtelte Klasse und verschachtelte Schnittstelle ist eine separate Seite vorhanden. Jede dieser Seiten enth\u00E4lt drei Abschnitte, die aus einer Deklaration und Beschreibung, Mitglieder\u00FCbersichtstabellen und detaillierten Mitgliederbeschreibungen bestehen. Die Eintr\u00E4ge in diesen Abschnitten werden weggelassen, wenn sie leer oder nicht anwendbar sind.
+doclet.help.class_interface.inheritance_diagram=Klassenvererbungsdiagramm
+doclet.help.class_interface.subclasses=Direkte Unterklassen
+doclet.help.class_interface.subinterfaces=Alle bekannten Unterschnittstellen
+doclet.help.class_interface.implementations=Alle bekannten Implementierungsklassen
+doclet.help.class_interface.declaration=Klassen- oder Schnittstellendeklaration
+doclet.help.class_interface.description=Klassen- oder Schnittstellenbeschreibung
+doclet.help.class_interface.member_order=Die \u00DCbersichtseintr\u00E4ge sind alphabetisch geordnet, w\u00E4hrend die detaillierten Beschreibungen in der Reihenfolge aufgef\u00FChrt werden, in der sie im Quellcode auftreten. So werden die vom Programmierer festgelegten logischen Gruppierungen beibehalten.
+doclet.help.class_interface.note=Hinweis:
+doclet.help.class_interface.anno=Annotationsschnittstellen haben erforderliche und optionale Elemente, aber nicht Methoden.
+doclet.help.class_interface.enum=Nur Enum-Klassen haben Enum-Konstanten.
+doclet.help.class_interface.record=Die Komponenten einer Datensatzklasse werden als Teil der Deklaration der Datensatzklasse angezeigt.
+doclet.help.class_interface.property=Eigenschaften sind ein Feature von JavaFX.
+doclet.help.other_files.head=Weitere Dateien
+doclet.help.other_files.body=Packages und Module k\u00F6nnen Seiten mit weiteren Informationen zu den Deklarationen in der N\u00E4he enthalten.
+doclet.help.use.head=Verwendung
+doclet.help.use.body=F\u00FCr jedes dokumentierte Package sowie jede Klasse und jede Schnittstelle ist eine eigene Verwendungsseite vorhanden. Auf dieser Seite wird beschrieben, welche Packages, Klassen, Methoden, Konstruktoren und Felder einen Teil der angegebenen Klasse oder des angegebenen Packages verwenden. Bei der Klasse oder Schnittstelle A enth\u00E4lt die Verwendungsseite die Unterklassen von A, als A deklarierte Felder, Methoden, die A zur\u00FCckgeben, sowie Methoden und Konstruktoren mit Parametern des Typs A. Sie k\u00F6nnen diese Seite aufrufen, indem Sie zun\u00E4chst das Package, die Klasse oder die Schnittstelle aufrufen und anschlie\u00DFend in der Navigationsleiste auf den Link "Verwendung" klicken.
+doclet.help.tree.head=Baum (Klassenhierarchie)
+# 0: link to main Class Hierarchy page;  1: java.lang.Object
+doclet.help.tree.intro=Es gibt eine Seite {0} f\u00FCr alle Packages, und f\u00FCr jedes Package gibt es eine Hierarchie. Jede Hierarchieseite enth\u00E4lt eine Klassen- und eine Schnittstellenliste. Die Klassen sind nach Vererbungsstruktur organisiert, beginnend mit {1}. Die Schnittstellen erben nicht von {1}.
+doclet.help.tree.overview=Wenn Sie auf der \u00DCbersichtsseite auf "Baum" klicken, wird die Hierarchie f\u00FCr alle Packages angezeigt.
+doclet.help.tree.package=Wenn Sie eine bestimmte Package-, Klassen- oder Schnittstellenseite anzeigen und auf "Baum" klicken, wird die Hierarchie nur f\u00FCr dieses Package angezeigt.
+# 0: link to the Deprecated summary page
+doclet.help.deprecated.body=Auf der Seite {0} werden alle APIs aufgef\u00FChrt, die veraltet sind. Die Verwendung einer veralteten API ist nicht empfehlenswert, im Allgemeinen aufgrund von M\u00E4ngeln. In der Regel wird eine Ersatz-API angegeben. Veraltete APIs werden in k\u00FCnftigen Implementierungen m\u00F6glicherweise entfernt.
+# 0: link to the Preview summary page
+doclet.help.preview.body=Die Seite {0} listet alle Vorschau-APIs auf. Vorschau-APIs k\u00F6nnen in k\u00FCnftigen Implementierungen entfernt werden.
+doclet.help.new.body=Die Seite {0} listet APIs auf, die in neueren Releases hinzugef\u00FCgt wurden.
+doclet.help.index.head=Index
+# 0: link to Index page;  1: list of links to pages
+doclet.help.index.body=Die {0} enth\u00E4lt einen alphabetischen Index aller Klassen, Schnittstellen, Konstruktoren, Methoden und Felder in der Dokumentation sowie \u00DCbersichtsseiten wie {1}.
+doclet.help.all_classes.head=Alle Klassen und Schnittstellen
+# 0: link to All Classes page
+doclet.help.all_classes.body=Die Seite {0} enth\u00E4lt einen alphabetischen Index aller Klassen und Schnittstellen in der Dokumentation, einschlie\u00DFlich Annotationsschnittstellen, Enum-Klassen und Datensatzklassen.
+doclet.help.all_packages.head=Alle Packages
+# 0: link to All Packages page
+doclet.help.all_packages.body=Die Seite {0} enth\u00E4lt einen alphabetischen Index aller Packages, die in der Dokumentation enthalten sind.
+doclet.help.serial_form.body=Jede serialisierbare oder externalisierbare Klasse verf\u00FCgt \u00FCber eine Beschreibung der zugeh\u00F6rigen Serialisierungsfelder und -methoden. Diese Informationen sind eher f\u00FCr Implementierer als f\u00FCr Benutzer der API von Interesse. Die Navigationsleiste enth\u00E4lt zwar keinen Link, Sie k\u00F6nnen diese Informationen jedoch abrufen, indem Sie zu einer beliebigen serialisierten Klasse navigieren und im Abschnitt "Siehe auch" der Klassenbeschreibung auf "Serialisierte Form" klicken.
+# 0: link to Constant Values page
+doclet.help.constants.body=Auf der Seite {0} sind die statischen endg\u00FCltigen Felder und deren Werte aufgef\u00FChrt.
+# 0: link to System Properties page
+doclet.help.systemProperties.body=Die Seite {0} listet Referenzen auf Systemeigenschaften auf.
+doclet.help.footnote=Diese Hilfedatei gilt f\u00FCr die vom Standard-Doclet generierte API-Dokumentation.
+doclet.help.enum.intro=F\u00FCr jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.enum.class.intro=F\u00FCr jede Enum-Klasse ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.annotation_type.intro=F\u00FCr jeden Annotationstyp ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.annotation_interface.intro=F\u00FCr jede Annotationsschnittstelle ist eine separate Seite mit den folgenden Abschnitten verf\u00FCgbar:
+doclet.help.annotation_type.declaration=Deklaration des Annotationstyps
+doclet.help.annotation_interface.declaration=Deklaration der Annotationsschnittstelle
+doclet.help.annotation_type.description=Beschreibung des Annotationstyps
+doclet.help.annotation_interface.description=Beschreibung der Annotationsschnittstelle
+doclet.help.search.head=Suchen
+# Introduction to Javadoc search features, followed by a list of examples
+doclet.help.search.intro=Sie k\u00F6nnen nach Definitionen von Modulen, Packages, Typen, Feldern, Methoden, Systemeigenschaften und anderen Ausdr\u00FCcken suchen, die in der API definiert sind. Dazu k\u00F6nnen Sie denn Namen ganz oder teilweise oder optional auch Abk\u00FCrzungen mit Binnenmajuskeln ("camelCase") eingeben. Beispiel:
+# Used to list search examples, {0} is a search term and {1} the matching result
+doclet.help.search.example={0} findet {1}
+# {0} contains a link to the current Javadoc Search Specification
+doclet.help.search.refer=Eine vollst\u00E4ndige Beschreibung der Suchfeatures finden Sie in der {0}.
+# The URL for the Javadoc Search Specification. {0} will be replaced by the JDK version number
+doclet.help.search.spec.url=https://docs.oracle.com/en/java/javase/{0}/docs/specs/javadoc/javadoc-search-spec.html
+# The title for the Javadoc Search Specification
+doclet.help.search.spec.title=Javadoc-Suchspezifikation
+
+doclet.ClassUse_Packages.that.use.0=Packages, die {0} verwenden
+doclet.ClassUse_Uses.of.0.in.1=Verwendungen von {0} in {1}
+doclet.ClassUse_Classes.in.0.used.by.1=Von {1} verwendete Klassen in {0}
+doclet.ClassUse_PackageAnnotation=Packages mit Annotationen vom Typ {0}
+doclet.ClassUse_Annotation=Klassen in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_TypeParameter=Klassen in {1} mit Typparametern vom Typ {0}
+doclet.ClassUse_MethodTypeParameter=Methoden in {1} mit Typparametern vom Typ {0}
+doclet.ClassUse_FieldTypeParameter=Felder in {1} mit Typparametern vom Typ {0}
+doclet.ClassUse_FieldAnnotations=Felder in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_MethodAnnotations=Methoden in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_MethodParameterAnnotations=Methodenparameter in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_MethodReturnTypeParameter=Methoden in {1}, die Typen mit Argumenten vom Typ {0} zur\u00FCckgeben
+doclet.ClassUse_Subclass=Unterklassen von {0} in {1}
+doclet.ClassUse_Subinterface=Unterschnittstellen von {0} in {1}
+doclet.ClassUse_ImplementingClass=Klassen in {1}, die {0} implementieren
+doclet.ClassUse_Field=Felder in {1}, die deklariert sind als {0}
+doclet.ClassUse_MethodReturn=Methoden in {1}, die {0} zur\u00FCckgeben
+doclet.ClassUse_MethodArgs=Methoden in {1} mit Parametern vom Typ {0}
+doclet.ClassUse_MethodArgsTypeParameters=Methodenparameter in {1} mit Typargumenten vom Typ {0}
+doclet.ClassUse_MethodThrows=Methoden in {1}, die {0} ausl\u00F6sen
+doclet.ClassUse_ConstructorAnnotations=Konstruktoren in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_ConstructorParameterAnnotations=Konstruktorparameter in {1} mit Annotationen vom Typ {0}
+doclet.ClassUse_ConstructorArgs=Konstruktoren in {1} mit Parametern vom Typ {0}
+doclet.ClassUse_ConstructorArgsTypeParameters=Konstruktorparameter in {1} mit Typargumenten vom Typ {0}
+doclet.ClassUse_ConstructorThrows=Konstruktoren in {1}, die {0} ausl\u00F6sen
+doclet.ClassUse_No.usage.of.0=Keine Verwendung von {0}
+doclet.Window_ClassUse_Header=Verwendungsweise von {0} {1}
+doclet.ClassUse_Title=Verwendungen von {0}
+doclet.navClassUse=Verwendung
+doclet.Error_in_grouplist=Ung\u00FCltige Option -group: {0} {1}
+doclet.Groupname_already_used=In der Option -group wird der Gruppenname bereits verwendet: {0}
+doclet.Same_element_name_used=Elementname oder Muster zweimal verwendet: {0}
+doclet.PreviewLeadingNote={0} basiert auf Vorschaufeatures der Java-Plattform:
+doclet.Declared_Using_Preview={0} wird mit {1} deklariert, einem Vorschaufeature der Programmiersprache Java ({2}).
+doclet.PreviewAPI={0} bezieht sich auf mindestens eine Vorschau-API: {1}.
+doclet.ReflectivePreviewAPI={0} bezieht sich auf mindestens eine reflektive Vorschau-API: {1}.
+doclet.UsesDeclaredUsingPreview={0} bezieht sich auf mindestens einen Typ, der mit einem Vorschaufeature der Programmiersprache Java deklariert wird: {1}.
+doclet.PreviewTrailingNote1=Programme k\u00F6nnen {0} nur verwenden, wenn Vorschaufeatures aktiviert sind.
+doclet.PreviewTrailingNote2=Vorschaufeatures k\u00F6nnen in k\u00FCnftigen Releases entfernt oder zu permanenten Features der Java-Plattform hochgestuft werden.
+doclet.Declared_Using_Preview.SEALED=Verschl\u00FCsselte Klassen
+doclet.Declared_Using_Preview.SEALED_PERMITS=Verschl\u00FCsselte Klassen
+doclet.PreviewPlatformLeadingNote={0} ist eine Vorschau-API der Java-Plattform.
+doclet.ReflectivePreviewPlatformLeadingNote={0} ist eine reflektive Vorschau-API der Java-Plattform.
+
+# 0: an exception
+doclet.Error_copying_legal_notices=Fehler beim Kopieren der rechtlichen Hinweise: {0}
+# 0: the path; 1: the detail message for the exception
+doclet.Error_invalid_path_for_legal_notices=Ung\u00FCltiger Pfad "{0}" f\u00FCr rechtliche Hinweise: {1}
+
+# option specifiers
+doclet.usage.add-script.parameters=<Datei>
+doclet.usage.add-script.description=F\u00FCgt der generierten Dokumentation eine Skriptdatei hinzu
+doclet.usage.add-stylesheet.parameters=<Datei>
+doclet.usage.add-stylesheet.description=F\u00FCgt der generierten Dokumentation eine Stylesheet-Datei hinzu
+doclet.usage.d.parameters=<Verzeichnis>
+doclet.usage.d.description=Zielverzeichnis f\u00FCr Ausgabedateien
+
+doclet.usage.use.description=Verwendungsseiten f\u00FCr Klassen und Packages erstellen
+
+doclet.usage.version.description=@version-Abs\u00E4tze aufnehmen
+
+doclet.usage.author.description=@author-Abs\u00E4tze aufnehmen
+
+doclet.usage.docfilessubdirs.description=doc-file-Unterverzeichnisse rekursiv kopieren
+
+doclet.usage.splitindex.description=Index in eine Datei pro Buchstabe aufteilen
+
+doclet.usage.overview.parameters=<Datei>
+doclet.usage.overview.description=\u00DCberblickdokumentation aus HTML-Datei lesen
+
+doclet.usage.windowtitle.parameters=<Text>
+doclet.usage.windowtitle.description=Browserfenstertitel f\u00FCr die Dokumentation
+
+doclet.usage.doctitle.parameters=<HTML-Code>
+doclet.usage.doctitle.description=Titel f\u00FCr die \u00DCberblickseite aufnehmen
+
+doclet.usage.header.parameters=<HTML-Code>
+doclet.usage.header.description=Headertext f\u00FCr jede Seite aufnehmen
+
+doclet.usage.html5.description=Generiert eine HTML 5-Ausgabe. Diese Option wird nicht mehr ben\u00F6tigt.
+
+doclet.usage.footer.parameters=<HTML-Code>
+doclet.usage.footer.description=Footertext f\u00FCr jede Seite aufnehmen
+
+doclet.usage.top.parameters=<HTML-Code>
+doclet.usage.top.description=Oberen Text f\u00FCr jede Seite aufnehmen
+
+doclet.usage.bottom.parameters=<HTML-Code>
+doclet.usage.bottom.description=Unteren Text f\u00FCr jede Seite aufnehmen
+
+doclet.usage.link.parameters=< URL>
+doclet.usage.link.description=Links zur javadoc-Ausgabe unter <url> erstellen
+
+doclet.usage.linkoffline.parameters=<URL1> <URL2>
+doclet.usage.linkoffline.description=Link zu Dokumenten unter <url> mit Packageliste unter <url2> erstellen
+
+# L10N: do not localize the option parameters: warn info
+doclet.usage.link-modularity-mismatch.parameters=(warn|info)
+doclet.usage.link-modularity-mismatch.description=Meldet externe Dokumentation mit der falschen Modularit\u00E4t mit einer\nWarn- oder Informationsmeldung. Das Standardverhalten ist\nWarnen.
+
+doclet.usage.link-platform-properties.parameters=< URL>
+doclet.usage.link-platform-properties.description=Link zu Plattformdokumentations-URLs, die in der Eigenschaftendatei auf <URL> deklariert sind
+
+doclet.usage.excludedocfilessubdir.parameters=<Name>:...
+doclet.usage.excludedocfilessubdir.description=doc-files-Unterverzeichnisse mit angegebenem Namen ausschlie\u00DFen
+
+doclet.usage.group.parameters=<Name> <g1>:<g2>...
+doclet.usage.group.description=Angegebene Elemente auf \u00DCberblickseite gruppieren
+
+doclet.usage.legal-notices.parameters='default' | 'none' | <Verzeichnis>
+doclet.usage.legal-notices.description=Steuert die rechtlichen Hinweise in der generierten Ausgabe
+
+doclet.usage.nocomment.description=Beschreibung und Tags unterdr\u00FCcken und nur Deklarationen generieren
+
+doclet.usage.nodeprecated.description=@deprecated-Informationen nicht aufnehmen
+
+doclet.usage.noqualifier.parameters=<Name1>:<Name2>:...
+doclet.usage.noqualifier.description=Liste der Qualifier aus der Ausgabe ausschlie\u00DFen
+
+doclet.usage.nosince.description=@since-Informationen nicht aufnehmen
+
+doclet.usage.notimestamp.description=Ausgeblendeten Zeitstempel nicht aufnehmen
+
+doclet.usage.nodeprecatedlist.description=Veraltet-Liste nicht generieren
+
+doclet.usage.no-module-directories.description=Gruppiert Dateien f\u00FCr die Moduldokumentation nicht in \nmodulspezifischen Verzeichnisse
+
+doclet.usage.no-platform-links.description=Generiert keine Links zur Plattformdokumentation
+
+doclet.usage.notree.description=Klassenhierarchie nicht generieren
+
+doclet.usage.noindex.description=Index nicht generieren
+
+doclet.usage.nohelp.description=Hilfelink nicht generieren
+
+doclet.usage.nonavbar.description=Navigationsleiste nicht generieren
+
+doclet.usage.nooverview.description=\u00DCberblickseiten nicht generieren
+
+doclet.usage.serialwarn.description=Warnung wegen @serial-Tag generieren
+
+doclet.usage.since.parameters=<Release>(,<Release>)*
+doclet.usage.since.description=Dokumentiert die neue und die veraltete API in den angegebenen Releases
+
+doclet.usage.since-label.parameters=<Text>
+doclet.usage.since-label.description=Liefert Text f\u00FCr die \u00DCberschrift der Seite "Neue API"
+
+doclet.usage.tag.parameters=<Name>:<Positionen>:<Header>
+doclet.usage.tag.description=Benutzerdefinierte Tags mit einem Argument angeben
+
+doclet.usage.taglet.description=Vollqualifizierter Name des zu registrierenden Taglets
+
+doclet.usage.tagletpath.description=Pfad zu Taglets
+
+doclet.usage.snippet-path.parameters=<Pfad>
+
+doclet.usage.snippet-path.description=Der Pfad f\u00FCr externe Snippets
+
+doclet.usage.charset.parameters=<Zeichensatz>
+doclet.usage.charset.description=Zeichensatz f\u00FCr plattform\u00FCbergreifende Anzeige der generierten Dokumentation
+
+doclet.usage.javafx.description=Aktiviert die JavaFX-Funktionalit\u00E4t
+
+doclet.usage.helpfile.parameters=<Datei>
+doclet.usage.helpfile.description=Datei aufnehmen, zu der der Hilfelink verlinkt
+
+doclet.usage.linksource.description=Quelle in HTML generieren
+
+doclet.usage.sourcetab.parameters=<Tabulatorl\u00E4nge>
+doclet.usage.sourcetab.description=Anzahl der Leerzeichen angeben, die jedes Register in der Quelle beansprucht
+
+doclet.usage.keywords.description=HTML-Metatags mit Informationen zu Package, Klasse und Member aufnehmen
+
+doclet.usage.main-stylesheet.parameters=<Datei>
+doclet.usage.main-stylesheet.description=Datei zum \u00C4ndern des Stils der generierten Dokumentation
+
+doclet.usage.docencoding.parameters=<Name>
+doclet.usage.docencoding.description=Zeichensatzcodierung f\u00FCr die Ausgabe angeben
+
+doclet.usage.frames.description=Aktiviert die Verwendung von Frames in der generierten Ausgabe
+
+doclet.usage.no-frames.description=Deaktiviert die Verwendung von Frames in der generierten Ausgabe (Standard)
+
+doclet.usage.override-methods.parameters=(detail|summary)
+
+doclet.usage.override-methods.description=Au\u00DFer Kraft gesetzte Methoden im Abschnitt "detail" oder "summary" dokumentieren
+
+doclet.usage.allow-script-in-comments.description=JavaScript in Optionen und Kommentaren zulassen
+
+doclet.usage.xdocrootparent.parameters=< URL>
+doclet.usage.xdocrootparent.description=Ersetzt alle Vorkommen von @docRoot gefolgt von /.. in doc-Kommentaren durch\n<url>
+
+doclet.usage.xdoclint.description=Empfohlene Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren
+
+doclet.usage.xdoclint-extended.parameters=(all|none|[-]<Gruppe>)
+# L10N: do not localize these words: all none accessibility html missing reference syntax
+doclet.usage.xdoclint-extended.description=Bestimmte Pr\u00FCfungen f\u00FCr Probleme in javadoc-Kommentaren aktivieren\noder deaktivieren, wobei <group> einen der folgenden Werte hat:\naccessibility, html, missing, reference oder syntax.
+
+doclet.usage.xdoclint-package.parameters=([-]<Packages>)
+doclet.usage.xdoclint-package.description=Pr\u00FCfungen in bestimmten Packages aktivieren oder deaktivieren.\n<packages> ist eine durch Komma getrennte Liste von Packagebezeichnern.\nEin Packagebezeichner ist entweder ein vollst\u00E4ndiger Name oder ein Namenspr\u00E4fix\neines Packages, gefolgt von .*, und bezieht sich auf alle Unterpackages\ndes angegebenen Packages. Stellen Sie dem Packagebezeichner - voran,\num Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.
+
+# L10N: do not localize the option name --no-frames
+doclet.NoFrames_specified=Die Option --no-frames wird nicht mehr ben\u00F6tigt und wird m\u00F6glicherweise\nin einem zuk\u00FCnftigen Release entfernt.
+
+# L10N: do not localize the option name -footer
+doclet.footer_specified=Die Option -footer wird nicht mehr unterst\u00FCtzt und wird ignoriert.\nSie wird m\u00F6glicherweise in einem zuk\u00FCnftigen Release entfernt.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
index ec702dad3e4..648985e4234 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
@@ -29,6 +29,7 @@ doclet.Overview=\u6982\u8981
 doclet.Window_Overview_Summary=\u6982\u8981
 doclet.Element=\u8981\u7D20
 doclet.Package=\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.Unnamed_Package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.Module=\u30E2\u30B8\u30E5\u30FC\u30EB
 doclet.Open_Module=\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u958B\u304F
 doclet.All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
@@ -39,17 +40,24 @@ doclet.Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Window_Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
 doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64
+doclet.Enum_Class_Hierarchy=\u5217\u6319\u30AF\u30E9\u30B9\u968E\u5C64
 doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64
+doclet.Annotation_Interface_Hierarchy=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
 doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9
 doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8
+doclet.Href_Annotation_Interface_Title={0}\u5185\u306E\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
+doclet.Href_Enum_Class_Title={0}\u306E\u5217\u6319\u30AF\u30E9\u30B9
 doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
 doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Summary=\u6982\u8981:
 doclet.Detail=\u8A73\u7D30:
 doclet.Module_Sub_Nav=\u30E2\u30B8\u30E5\u30FC\u30EB:
-doclet.navModuleDescription=\u8AAC\u660E
+doclet.Help_Sub_Nav=\u30D8\u30EB\u30D7:
+doclet.Package_Sub_Nav=\u30D1\u30C3\u30B1\u30FC\u30B8:
+doclet.navClassesAndInterfaces=\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.navDescription=\u8AAC\u660E
 doclet.navModules=\u30E2\u30B8\u30E5\u30FC\u30EB
 doclet.navPackages=\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.navServices=\u30B5\u30FC\u30D3\u30B9
@@ -62,16 +70,20 @@ doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.navEnum=\u5217\u6319\u5B9A\u6570
 doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
+doclet.navNavigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+doclet.navPages=\u30DA\u30FC\u30B8
 doclet.not.exhaustive=(\u7DB2\u7F85\u7684\u3067\u306A\u3044)
 doclet.Index=\u7D22\u5F15
 doclet.Window_Single_Index=\u7D22\u5F15
 doclet.Window_Split_Index={0}\u306E\u7D22\u5F15
 doclet.Help=\u30D8\u30EB\u30D7
 doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
+doclet.Toggle_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u306E\u5207\u66FF\u3048
 doclet.Navigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-doclet.New_Page=NewPage
 doclet.navDeprecated=\u975E\u63A8\u5968
 doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
+doclet.Window_New_List=\u65B0\u898FAPI\u30EA\u30B9\u30C8
+doclet.Window_Preview_List=\u30EA\u30B9\u30C8\u306E\u30D7\u30EC\u30D3\u30E5\u30FC
 doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9:
 doclet.in_class=\u30AF\u30E9\u30B9\u5185
 doclet.Element_in={0}\u306E\u8981\u7D20
@@ -91,14 +103,33 @@ doclet.URL_error=URL\u53D6\u51FA\u3057\u30A8\u30E9\u30FC: {0}
 doclet.Resource_error=\u30EA\u30BD\u30FC\u30B9\u8AAD\u53D6\u308A\u30A8\u30E9\u30FC: {0}
 doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1}
 doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
+doclet.see.nested_link=\u30BF\u30B0{0}: \u30EA\u30F3\u30AF\u304C\u30CD\u30B9\u30C8\u3055\u308C\u3066\u3044\u307E\u3059
 doclet.tag.invalid_usage=\u30BF\u30B0{0}\u306E\u4F7F\u7528\u65B9\u6CD5\u304C\u7121\u52B9\u3067\u3059
+doclet.tag.invalid_input=\u5165\u529B\u304C\u7121\u52B9\u3067\u3059: ''{0}''
+doclet.tag.invalid=@{0}\u304C\u7121\u52B9\u3067\u3059
 doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API
-doclet.For_Removal=\u524A\u9664\u7528
+doclet.Deprecated_Elements=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044{0}
+doclet.Deprecated_In_Release={0}\u3067\u975E\u63A8\u5968
+doclet.Deprecated_Tabs_Intro=(\u5DE6\u7AEF\u306E\u30BF\u30D6\u300C\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044...\u300D\u306F\u3001\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u30EA\u30EA\u30FC\u30B9\u306B\u95A2\u4FC2\u306A\u304F\u3001\u3059\u3079\u3066\u306E\u975E\u63A8\u5968\u306E\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30BF\u30D6\u300C...\u3067\u975E\u63A8\u5968\u300D\u306E\u305D\u308C\u305E\u308C\u306F\u3001\u7279\u5B9A\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002)
+doclet.New_API=\u65B0\u898FAPI
+doclet.New_Elements=\u65B0\u898F{0}
+doclet.New_Elements_Added_In_Release={0}\u3067\u8FFD\u52A0
+doclet.New_Label=\u65B0\u898F
+doclet.New_Tabs_Intro=(\u5DE6\u7AEF\u306E\u30BF\u30D6\u300C\u65B0\u898F...\u300D\u306F\u3001\u8FFD\u52A0\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u306B\u95A2\u4FC2\u306A\u304F\u3001\u3059\u3079\u3066\u306E\u65B0\u898F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30BF\u30D6\u300C...\u3067\u8FFD\u52A0\u300D\u306E\u305D\u308C\u305E\u308C\u306F\u3001\u7279\u5B9A\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u8FFD\u52A0\u3055\u308C\u305F\u8981\u7D20\u3092\u793A\u3057\u307E\u3059\u3002\u5DE6\u7AEF\u306E\u30BF\u30D6\u3067\u8868\u793A\u3055\u308C\u305F\u8981\u7D20\u306F\u53F3\u7AEF\u306E\u30BF\u30D6\u306E\u3044\u305A\u308C\u304B\u306E\u4E0B\u306B\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002)
+doclet.Preview_API=\u30D7\u30EC\u30D3\u30E5\u30FCAPI
+doclet.Preview_Label=\u30D7\u30EC\u30D3\u30E5\u30FC
+doclet.Preview_Mark=PREVIEW
+doclet.Terminally_Deprecated=\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968
+doclet.Terminally_Deprecated_Elements=\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968\u306B\u306A\u3063\u305F\u8981\u7D20
+doclet.Terminally_Deprecated_In_Release={0}\u3067\u6700\u7D42\u7684\u306B\u975E\u63A8\u5968
 doclet.Annotation_Types=\u6CE8\u91C8\u578B
+doclet.Annotation_Interfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Annotation_Type_Members=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.for_removal=\u524A\u9664\u7528
+doclet.Annotation_Interface_Members=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
 doclet.annotation_types=\u6CE8\u91C8\u578B
+doclet.annotation_interfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotation_type_members=\u6CE8\u91C8\u578B\u8981\u7D20
+doclet.annotation_interface_members=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
 doclet.Generated_Docs_Untitled=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8(\u30BF\u30A4\u30C8\u30EB\u306A\u3057)
 doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.Description=\u8AAC\u660E
@@ -113,6 +144,7 @@ doclet.also=\u540C\u69D8\u306B
 doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64:
 doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64
 doclet.Hierarchy_For_All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
+doclet.Hierarchy_For_Unnamed_Package=\u540D\u524D\u306E\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
 doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
 doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
 doclet.Description_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
@@ -128,43 +160,74 @@ doclet.systemPropertiesSummary=\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\
 doclet.Window_Source_title=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9
 doclet.Window_Help_title=API\u30D8\u30EB\u30D7
 
-doclet.help.main_heading=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
-doclet.help.intro=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.main_heading=JavaDoc\u30D8\u30EB\u30D7
+doclet.help.navigation.head=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+# 0: link to the Overview page
+doclet.help.navigation.intro={0}\u30DA\u30FC\u30B8\u304B\u3089\u3001\u5404\u30DA\u30FC\u30B8\u304A\u3088\u3073\u5404\u30DA\u30FC\u30B8\u306E\u4E0A\u90E8\u306B\u3042\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3067\u30EA\u30F3\u30AF\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3067\u304D\u307E\u3059\u3002
+# 0: link to the Index;  1: short list of links
+doclet.help.navigation.index={0}\u304A\u3088\u3073\u691C\u7D22\u30DC\u30C3\u30AF\u30B9\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u6B21\u3092\u542B\u3081\u3001\u7279\u5B9A\u306E\u5BA3\u8A00\u304A\u3088\u3073\u6982\u8981\u30DA\u30FC\u30B8\u306B\u30CA\u30D3\u30B2\u30FC\u30C8\u3067\u304D\u307E\u3059: {1}
+doclet.help.page_kinds.head=\u30DA\u30FC\u30B8\u306E\u7A2E\u985E
+doclet.help.page_kinds.intro=\u6B21\u306E\u5404\u30BB\u30AF\u30B7\u30E7\u30F3\u3067\u306F\u3001\u3053\u306E\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u69D8\u3005\u306A\u7A2E\u985E\u306E\u30DA\u30FC\u30B8\u306B\u3064\u3044\u3066\u8AAC\u660E\u3057\u307E\u3059\u3002
+# 0: link to the Overview page
 doclet.help.overview.modules.body={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30E2\u30B8\u30E5\uFF0D\u30EB\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+# 0: link to the Overview page
 doclet.help.overview.packages.body={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.help.package.intro=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
-doclet.help.module.intro=\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u305D\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u4F9D\u5B58\u6027\u3001\u304A\u3088\u3073\u30B5\u30FC\u30D3\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F3\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
+doclet.help.package.intro=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F\u6B21\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
+doclet.help.module.intro=\u5404\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u305D\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u4ED6\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u5BFE\u3059\u308B\u4F9D\u5B58\u6027\u3001\u304A\u3088\u3073\u30B5\u30FC\u30D3\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u30DA\u30FC\u30B8\u306F\u6B21\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059:
 doclet.help.class_interface.head=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.help.class_interface.intro=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.class_interface.intro=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u5BA3\u8A00\u304A\u3088\u3073\u8AAC\u660E\u3068\u3001\u30E1\u30F3\u30D0\u30FC\u306E\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304B\u3089\u69CB\u6210\u3055\u308C\u308B3\u3064\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u308C\u3089\u306E\u5404\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u7A7A\u304B\u9069\u7528\u3067\u304D\u306A\u3044\u5834\u5408\u306F\u7701\u7565\u3055\u308C\u307E\u3059\u3002
 doclet.help.class_interface.inheritance_diagram=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
 doclet.help.class_interface.subclasses=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
 doclet.help.class_interface.subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8
 doclet.help.class_interface.implementations=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8
 doclet.help.class_interface.declaration=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
 doclet.help.class_interface.description=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
-doclet.help.class_interface.summary=\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
+doclet.help.class_interface.member_order=\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
+doclet.help.class_interface.note=\u30CE\u30FC\u30C8:
+doclet.help.class_interface.anno=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u3001\u5FC5\u9808\u307E\u305F\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8981\u7D20\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u30E1\u30BD\u30C3\u30C9\u306F\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+doclet.help.class_interface.enum=\u5217\u6319\u30AF\u30E9\u30B9\u306E\u307F\u306B\u5217\u6319\u5B9A\u6570\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.help.class_interface.record=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u5BA3\u8A00\u306E\u4E00\u90E8\u3068\u3057\u3066\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.help.class_interface.property=\u30D7\u30ED\u30D1\u30C6\u30A3\u306FJavaFX\u306E\u6A5F\u80FD\u3067\u3059\u3002
+doclet.help.other_files.head=\u305D\u306E\u4ED6\u306E\u30D5\u30A1\u30A4\u30EB
+doclet.help.other_files.body=\u30D1\u30C3\u30B1\u30FC\u30B8\u304A\u3088\u3073\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u3001\u5468\u8FBA\u306E\u5BA3\u8A00\u306B\u95A2\u9023\u3059\u308B\u8FFD\u52A0\u60C5\u5831\u304C\u8A18\u8F09\u3055\u308C\u3066\u3044\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
 doclet.help.use.head=\u4F7F\u7528
-doclet.help.use.body=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+doclet.help.use.body=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 doclet.help.tree.head=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64)
+# 0: link to main Class Hierarchy page;  1: java.lang.Object
 doclet.help.tree.intro=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F{0}\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u3055\u3089\u306B\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u968E\u5C64\u30DA\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3092\u542B\u307F\u307E\u3059\u3002\u30AF\u30E9\u30B9\u306F{1}\u3092\u958B\u59CB\u70B9\u3068\u3059\u308B\u7D99\u627F\u69CB\u9020\u3067\u7DE8\u6210\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3001{1}\u304B\u3089\u306F\u7D99\u627F\u3057\u307E\u305B\u3093\u3002
 doclet.help.tree.overview=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
 doclet.help.tree.package=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u8A72\u5F53\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u307F\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+# 0: link to the Deprecated summary page
 doclet.help.deprecated.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u3059\u3079\u3066\u306EAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u975E\u63A8\u5968API\u3068\u306F\u3001\u6A5F\u80FD\u304C\u4E0D\u5341\u5206\u3067\u3042\u308B\u3068\u3044\u3063\u305F\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968API\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+# 0: link to the Preview summary page
+doclet.help.preview.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u3059\u3079\u3066\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.help.new.body={0}\u30DA\u30FC\u30B8\u306F\u3001\u6700\u8FD1\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u8FFD\u52A0\u3055\u308C\u305FAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002
 doclet.help.index.head=\u7D22\u5F15
-doclet.help.index.body={0}\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3068\u3001\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u304A\u3088\u3073\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+# 0: link to Index page;  1: list of links to pages
+doclet.help.index.body={0}\u306B\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u3068\u3001{1}\u306A\u3069\u306E\u6982\u8981\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.all_classes.head=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+# 0: link to All Classes page
+doclet.help.all_classes.body={0}\u306B\u306F\u3001\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u5217\u6319\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306A\u3069\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u542B\u307E\u308C\u308B\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.help.all_packages.head=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
+# 0: link to All Packages page
+doclet.help.all_packages.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u542B\u307E\u308C\u308B\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u7D22\u5F15\u304C\u542B\u307E\u308C\u307E\u3059\u3002
 doclet.help.serial_form.body=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u306E\u3067\u306F\u306A\u304F\u3001\u5B9F\u88C5\u3059\u308B\u30E6\u30FC\u30B6\u30FC\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
+# 0: link to Constant Values page
 doclet.help.constants.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
+# 0: link to System Properties page
 doclet.help.systemProperties.body={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3078\u306E\u53C2\u7167\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
 doclet.help.footnote=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u306B\u3088\u3063\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
-doclet.help.enum.intro=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
-doclet.help.enum.declaration=\u5217\u6319\u5BA3\u8A00
-doclet.help.enum.definition=\u5217\u6319\u578B\u306E\u8AAC\u660E
+doclet.help.enum.intro=\u5404\u5217\u6319\u30AF\u30E9\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
+doclet.help.enum.class.intro=\u5404\u5217\u6319\u30AF\u30E9\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
 doclet.help.annotation_type.intro=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
+doclet.help.annotation_interface.intro=\u5404\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u3001\u305D\u308C\u305E\u308C\u306B\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u542B\u307E\u308C\u307E\u3059:
 doclet.help.annotation_type.declaration=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00
+doclet.help.annotation_interface.declaration=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
 doclet.help.annotation_type.description=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E
+doclet.help.annotation_interface.description=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
 doclet.help.search.head=\u691C\u7D22
 # Introduction to Javadoc search features, followed by a list of examples
-doclet.help.search.intro=\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30BF\u30A4\u30D7\u3001\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u304A\u3088\u3073API\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u305D\u306E\u4ED6\u306E\u8A9E\u3092\u3001\u540D\u524D\u306E\u4E00\u90E8\u307E\u305F\u306F\u5168\u4F53\u3092\u4F7F\u7528\u3057\u3066(\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u30AD\u30E3\u30E1\u30EB\u30B1\u30FC\u30B9\u306E\u7701\u7565\u5F62\u3092\u4F7F\u7528\u3057\u3066)\u691C\u7D22\u3067\u304D\u307E\u3059\u3002\u4F8B:
+doclet.help.search.intro=\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30BF\u30A4\u30D7\u3001\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5B9A\u7FA9\u304A\u3088\u3073API\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u305D\u306E\u4ED6\u306E\u8A9E\u3092\u3001\u540D\u524D\u306E\u4E00\u90E8\u307E\u305F\u306F\u5168\u4F53\u3092\u4F7F\u7528\u3057\u3066(\u5FC5\u8981\u306B\u5FDC\u3058\u3066camelCase\u306E\u7701\u7565\u5F62\u3092\u4F7F\u7528\u3057\u3066)\u691C\u7D22\u3067\u304D\u307E\u3059\u3002\u4F8B:
 # Used to list search examples, {0} is a search term and {1} the matching result
 doclet.help.search.example={0}\u306F{1}\u3068\u4E00\u81F4\u3057\u307E\u3059
 # {0} contains a link to the current Javadoc Search Specification
@@ -206,10 +269,28 @@ doclet.navClassUse=\u4F7F\u7528
 doclet.Error_in_grouplist=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059: {0} {1}
 doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3001\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
 doclet.Same_element_name_used=\u8981\u7D20\u540D\u307E\u305F\u306F\u30D1\u30BF\u30FC\u30F3\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
+doclet.PreviewLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3057\u307E\u3059\u3002
+doclet.Declared_Using_Preview={0}\u306F{1}\u3001Java\u8A00\u8A9E\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD({2})\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u307E\u3059\u3002
+doclet.PreviewAPI={0}\u306F1\u3064\u4EE5\u4E0A\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059:  {1}\u3002
+doclet.ReflectivePreviewAPI={0}\u306F1\u3064\u4EE5\u4E0A\u306E\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059:  {1}\u3002
+doclet.UsesDeclaredUsingPreview={0}\u306F\u3001Java\u8A00\u8A9E\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u3092\u4F7F\u7528\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30011\u3064\u4EE5\u4E0A\u306E\u30BF\u30A4\u30D7\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: {1}\u3002
+doclet.PreviewTrailingNote1=\u30D7\u30ED\u30B0\u30E9\u30E0\u306F\u3001\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u306B\u306E\u307F{0}\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+doclet.PreviewTrailingNote2=\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306F\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u304B\u3001Java\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u6C38\u7D9A\u7684\u306A\u6A5F\u80FD\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+doclet.Declared_Using_Preview.SEALED=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
+doclet.Declared_Using_Preview.SEALED_PERMITS=\u30B7\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9
+doclet.PreviewPlatformLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3059\u3002
+doclet.ReflectivePreviewPlatformLeadingNote={0}\u306FJava\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u30EA\u30D5\u30EC\u30AF\u30C6\u30A3\u30D6\u30FB\u30D7\u30EC\u30D3\u30E5\u30FCAPI\u3067\u3059\u3002
+
+# 0: an exception
+doclet.Error_copying_legal_notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u30B3\u30D4\u30FC\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
+# 0: the path; 1: the detail message for the exception
+doclet.Error_invalid_path_for_legal_notices=\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u30D1\u30B9''{0}''\u304C\u7121\u52B9\u3067\u3059: {1}
 
 # option specifiers
+doclet.usage.add-script.parameters=<file>
+doclet.usage.add-script.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30B9\u30AF\u30EA\u30D7\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059
 doclet.usage.add-stylesheet.parameters=<file>
-doclet.usage.add-stylesheet.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u8FFD\u52A0\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
+doclet.usage.add-stylesheet.description=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059
 doclet.usage.d.parameters=<directory>
 doclet.usage.d.description=\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
 
@@ -252,6 +333,10 @@ doclet.usage.link.description=<url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u
 doclet.usage.linkoffline.parameters=<url1> <url2>
 doclet.usage.linkoffline.description=<url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url1>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059
 
+# L10N: do not localize the option parameters: warn info
+doclet.usage.link-modularity-mismatch.parameters=(warn|info)
+doclet.usage.link-modularity-mismatch.description=\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u305F\u306F\u60C5\u5831\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u542B\u3080\u4E0D\u6B63\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u6027\u306E\n\u5916\u90E8\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u5831\u544A\u3067\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u52D5\u4F5C\u306F\n\u8B66\u544A\u306E\u5831\u544A\u3067\u3059\u3002
+
 doclet.usage.link-platform-properties.parameters=<url>
 doclet.usage.link-platform-properties.description=<url>\u306B\u3042\u308B\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306EURL\u306B\u30EA\u30F3\u30AF\u3057\u307E\u3059
 
@@ -261,6 +346,9 @@ doclet.usage.excludedocfilessubdir.description=\u6307\u5B9A\u3055\u308C\u305F\u5
 doclet.usage.group.parameters=<name> <g1>:<g2>...
 doclet.usage.group.description=\u6307\u5B9A\u3059\u308B\u8981\u7D20\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3057\u307E\u3059
 
+doclet.usage.legal-notices.parameters='default' | 'none' | <directory>
+doclet.usage.legal-notices.description=\u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u3092\u5236\u5FA1\u3057\u307E\u3059
+
 doclet.usage.nocomment.description=\u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3057\u307E\u3059
 
 doclet.usage.nodeprecated.description=@deprecated\u60C5\u5831\u3092\u9664\u5916\u3057\u307E\u3059
@@ -290,6 +378,12 @@ doclet.usage.nooverview.description=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u751F\u
 
 doclet.usage.serialwarn.description=@serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3057\u307E\u305B\u3093
 
+doclet.usage.since.parameters=<release>(,<release>)*
+doclet.usage.since.description=\u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u306E\u65B0\u898F\u304A\u3088\u3073\u975E\u63A8\u5968\u306EAPI\u3092\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u307E\u3059
+
+doclet.usage.since-label.parameters=<text>
+doclet.usage.since-label.description=\u300C\u65B0\u898FAPI\u300D\u30DA\u30FC\u30B8\u306E\u898B\u51FA\u3057\u3067\u4F7F\u7528\u3059\u308B\u30C6\u30AD\u30B9\u30C8\u3092\u6307\u5B9A\u3057\u307E\u3059
+
 doclet.usage.tag.parameters=<name>:<locations>:<header>
 doclet.usage.tag.description=\u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059
 
@@ -297,6 +391,10 @@ doclet.usage.taglet.description=\u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168
 
 doclet.usage.tagletpath.description=\u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9
 
+doclet.usage.snippet-path.parameters=<path>
+
+doclet.usage.snippet-path.description=\u5916\u90E8\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9
+
 doclet.usage.charset.parameters=<charset>
 doclet.usage.charset.description=\u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30BB\u30C3\u30C8
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
index 0615fb283e5..e2a26b0dfcd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
@@ -29,6 +29,7 @@ doclet.Overview=\u6982\u89C8
 doclet.Window_Overview_Summary=\u6982\u89C8
 doclet.Element=\u5143\u7D20
 doclet.Package=\u7A0B\u5E8F\u5305
+doclet.Unnamed_Package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305
 doclet.Module=\u6A21\u5757
 doclet.Open_Module=\u6253\u5F00\u6A21\u5757
 doclet.All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305
@@ -39,17 +40,24 @@ doclet.Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Window_Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
 doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784
+doclet.Enum_Class_Hierarchy=\u679A\u4E3E\u7C7B\u5206\u5C42\u7ED3\u6784
 doclet.Annotation_Type_Hierarchy=\u6CE8\u91CA\u7C7B\u578B\u5206\u5C42\u7ED3\u6784
+doclet.Annotation_Interface_Hierarchy=\u6CE8\u91CA\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
 doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B
 doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3
 doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6CE8\u91CA
+doclet.Href_Annotation_Interface_Title={0} \u4E2D\u7684\u6CE8\u91CA\u63A5\u53E3
 doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E
+doclet.Href_Enum_Class_Title={0} \u4E2D\u7684\u679A\u4E3E\u7C7B
 doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570
 doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3
 doclet.Summary=\u6982\u8981:
 doclet.Detail=\u8BE6\u7EC6\u8D44\u6599:
 doclet.Module_Sub_Nav=\u6A21\u5757:
-doclet.navModuleDescription=\u8BF4\u660E
+doclet.Help_Sub_Nav=\u5E2E\u52A9\uFF1A
+doclet.Package_Sub_Nav=\u7A0B\u5E8F\u5305\uFF1A
+doclet.navClassesAndInterfaces=\u7C7B\u548C\u63A5\u53E3
+doclet.navDescription=\u8BF4\u660E
 doclet.navModules=\u6A21\u5757
 doclet.navPackages=\u7A0B\u5E8F\u5305
 doclet.navServices=\u670D\u52A1
@@ -62,16 +70,20 @@ doclet.navProperty=\u5C5E\u6027
 doclet.navEnum=\u679A\u4E3E\u5E38\u91CF
 doclet.navConstructor=\u6784\u9020\u5668
 doclet.navMethod=\u65B9\u6CD5
+doclet.navNavigation=\u5BFC\u822A
+doclet.navPages=\u9875
 doclet.not.exhaustive=\uFF08\u975E\u8BE6\u5C3D\uFF09
 doclet.Index=\u7D22\u5F15
 doclet.Window_Single_Index=\u7D22\u5F15
 doclet.Window_Split_Index={0} - \u7D22\u5F15
 doclet.Help=\u5E2E\u52A9
 doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
+doclet.Toggle_navigation_links=\u5207\u6362\u5BFC\u822A\u94FE\u63A5
 doclet.Navigation=\u5BFC\u822A
-doclet.New_Page=NewPage
 doclet.navDeprecated=\u5DF2\u8FC7\u65F6
 doclet.Window_Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
+doclet.Window_New_List=\u65B0 API \u5217\u8868
+doclet.Window_Preview_List=\u9884\u89C8\u5217\u8868
 doclet.Overrides=\u8986\u76D6:
 doclet.in_class=\u5728\u7C7B\u4E2D
 doclet.Element_in={0} \u4E2D\u7684\u5143\u7D20
@@ -91,14 +103,33 @@ doclet.URL_error=\u83B7\u53D6 URL \u65F6\u51FA\u9519: {0}
 doclet.Resource_error=\u8BFB\u53D6\u8D44\u6E90\u65F6\u51FA\u9519\uFF1A{0}
 doclet.see.class_or_package_not_found=\u6807\u8BB0{0}: \u627E\u4E0D\u5230\u5F15\u7528: {1}
 doclet.see.class_or_package_not_accessible=\u6807\u8BB0{0}: \u65E0\u6CD5\u8BBF\u95EE\u5F15\u7528: {1}
+doclet.see.nested_link=\u6807\u8BB0 {0}\uFF1A\u5D4C\u5957\u94FE\u63A5
 doclet.tag.invalid_usage=\u6807\u8BB0 {0} \u7684\u7528\u6CD5\u65E0\u6548
+doclet.tag.invalid_input=\u65E0\u6548\u8F93\u5165\uFF1A''{0}''
+doclet.tag.invalid=@{0} \u65E0\u6548
 doclet.Deprecated_API=\u5DF2\u8FC7\u65F6\u7684 API
-doclet.For_Removal=\u5F85\u5220\u9664
+doclet.Deprecated_Elements=\u5DF2\u8FC7\u65F6\u7684 {0}
+doclet.Deprecated_In_Release=\u5728 {0} \u4E2D\u5DF2\u8FC7\u65F6
+doclet.Deprecated_Tabs_Intro=\uFF08\u6700\u5DE6\u4FA7\u7684\u9009\u9879\u5361\u201C\u5DF2\u8FC7\u65F6...\u201D\u6307\u793A\u6240\u6709\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20\uFF0C\u65E0\u8BBA\u5B83\u4EEC\u5728\u54EA\u4E2A\u53D1\u884C\u7248\u4E2D\u5DF2\u8FC7\u65F6\u3002\u5176\u4ED6\u6BCF\u4E2A\u201C\u5728...\u4E2D\u5DF2\u8FC7\u65F6\u201D\u9009\u9879\u5361\u6307\u793A\u5728\u7279\u5B9A\u53D1\u884C\u7248\u4E2D\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20\u3002\uFF09
+doclet.New_API=\u65B0\u5EFA API
+doclet.New_Elements=\u65B0\u5EFA {0}
+doclet.New_Elements_Added_In_Release=\u5728 {0} \u4E2D\u5DF2\u6DFB\u52A0
+doclet.New_Label=\u65B0\u5EFA
+doclet.New_Tabs_Intro=\uFF08\u6700\u5DE6\u4FA7\u7684\u9009\u9879\u5361\u201C\u65B0\u5EFA...\u201D\u6307\u793A\u6240\u6709\u65B0\u5143\u7D20\uFF0C\u65E0\u8BBA\u5B83\u4EEC\u662F\u54EA\u4E2A\u53D1\u884C\u7248\u4E2D\u6DFB\u52A0\u7684\u3002\u5176\u4ED6\u6BCF\u4E2A\u201C\u5728...\u4E2D\u5DF2\u6DFB\u52A0\u201D\u9009\u9879\u5361\u6307\u793A\u5728\u7279\u5B9A\u53D1\u884C\u7248\u4E2D\u6DFB\u52A0\u7684\u65B0\u5143\u7D20\u3002\u6700\u5DE6\u4FA7\u9009\u9879\u5361\u4E0B\u663E\u793A\u7684\u4EFB\u4F55\u5143\u7D20\u4E5F\u4F1A\u663E\u793A\u5728\u53F3\u4FA7\u9009\u9879\u5361\u4E4B\u4E00\u4E0B\u3002\uFF09
+doclet.Preview_API=\u9884\u89C8 API
+doclet.Preview_Label=\u9884\u89C8
+doclet.Preview_Mark=PREVIEW
+doclet.Terminally_Deprecated=\u6700\u7EC8\u5DF2\u8FC7\u65F6
+doclet.Terminally_Deprecated_Elements=\u6700\u7EC8\u5DF2\u8FC7\u65F6\u7684\u5143\u7D20
+doclet.Terminally_Deprecated_In_Release=\u6700\u7EC8\u5728 {0} \u4E2D\u5DF2\u8FC7\u65F6
 doclet.Annotation_Types=\u6CE8\u91CA\u7C7B\u578B
+doclet.Annotation_Interfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.Annotation_Type_Members=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
-doclet.for_removal=\u5F85\u5220\u9664
+doclet.Annotation_Interface_Members=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
 doclet.annotation_types=\u6CE8\u91CA\u7C7B\u578B
+doclet.annotation_interfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotation_type_members=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
+doclet.annotation_interface_members=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
 doclet.Generated_Docs_Untitled=\u751F\u6210\u7684\u6587\u6863 (\u65E0\u6807\u9898)
 doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
 doclet.Description=\u8BF4\u660E
@@ -113,6 +144,7 @@ doclet.also=\u5E76
 doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784:
 doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784
 doclet.Hierarchy_For_All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
+doclet.Hierarchy_For_Unnamed_Package=\u672A\u547D\u540D\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
 doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002
 doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E:
 doclet.Description_From_Class=\u4ECE\u7C7B\u590D\u5236\u7684\u8BF4\u660E:
@@ -128,40 +160,71 @@ doclet.systemPropertiesSummary=\u7CFB\u7EDF\u5C5E\u6027\u6982\u8981
 doclet.Window_Source_title=\u6E90\u4EE3\u7801
 doclet.Window_Help_title=API \u5E2E\u52A9
 
-doclet.help.main_heading=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F
-doclet.help.intro=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002
+doclet.help.main_heading=JavaDoc \u5E2E\u52A9
+doclet.help.navigation.head=\u5BFC\u822A
+# 0: link to the Overview page
+doclet.help.navigation.intro=\u4ECE {0} \u9875\u5F00\u59CB\uFF0C\u60A8\u53EF\u4EE5\u4F7F\u7528\u6BCF\u9875\u4E2D\u7684\u94FE\u63A5\u4EE5\u53CA\u6BCF\u9875\u9876\u90E8\u5BFC\u822A\u680F\u4E2D\u7684\u94FE\u63A5\u6765\u6D4F\u89C8\u6587\u6863\u3002
+# 0: link to the Index;  1: short list of links
+doclet.help.navigation.index=\u4F7F\u7528 {0} \u548C\u641C\u7D22\u6846\u53EF\u4EE5\u5BFC\u822A\u5230\u7279\u5B9A\u58F0\u660E\u548C\u6982\u8981\u9875\uFF0C\u5305\u62EC\uFF1A{1}
+doclet.help.page_kinds.head=\u9875\u9762\u7C7B\u578B
+doclet.help.page_kinds.intro=\u4EE5\u4E0B\u5404\u90E8\u5206\u4ECB\u7ECD\u4E86\u6B64\u96C6\u5408\u4E2D\u4E0D\u540C\u7C7B\u578B\u7684\u9875\u9762\u3002
+# 0: link to the Overview page
 doclet.help.overview.modules.body={0} \u9875\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875\uFF0C\u63D0\u4F9B\u4E86\u6240\u6709\u6A21\u5757\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u6A21\u5757\u7684\u603B\u4F53\u8BF4\u660E\u3002
+# 0: link to the Overview page
 doclet.help.overview.packages.body={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002
-doclet.help.package.intro=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u516D\u4E2A\u7C7B\u522B\uFF1A
-doclet.help.module.intro=\u6BCF\u4E2A\u6A21\u5757\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7A0B\u5E8F\u5305\u3001\u4E0E\u5176\u4ED6\u6A21\u5757\u7684\u4F9D\u8D56\u5173\u7CFB\u548C\u670D\u52A1\u7684\u5217\u8868\u4EE5\u53CA\u6A21\u5757\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4E09\u4E2A\u7C7B\u522B\uFF1A
+doclet.help.package.intro=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4EE5\u4E0B\u7C7B\u522B\uFF1A
+doclet.help.module.intro=\u6BCF\u4E2A\u6A21\u5757\u90FD\u6709\u4E00\u9875\uFF0C\u5176\u4E2D\u5305\u542B\u5B83\u7684\u7A0B\u5E8F\u5305\u3001\u4E0E\u5176\u4ED6\u6A21\u5757\u7684\u4F9D\u8D56\u5173\u7CFB\u548C\u670D\u52A1\u7684\u5217\u8868\u4EE5\u53CA\u5404\u4E2A\u6A21\u5757\u7684\u6982\u8981\u3002\u8FD9\u4E9B\u9875\u53EF\u4EE5\u5305\u542B\u4EE5\u4E0B\u7C7B\u522B\uFF1A
 doclet.help.class_interface.head=\u7C7B\u6216\u63A5\u53E3
-doclet.help.class_interface.intro=\u6BCF\u4E2A\u7C7B, \u63A5\u53E3, \u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\u3002\u5176\u4E2D\u6BCF\u4E2A\u9875\u9762\u90FD\u7531\u4E09\u90E8\u5206 (\u7C7B/\u63A5\u53E3\u8BF4\u660E, \u6982\u8981\u8868, \u4EE5\u53CA\u8BE6\u7EC6\u7684\u6210\u5458\u8BF4\u660E) \u7EC4\u6210:
+doclet.help.class_interface.intro=\u6BCF\u4E2A\u7C7B\u3001\u63A5\u53E3\u3001\u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u81EA\u5DF1\u72EC\u7ACB\u7684\u9875\u9762\u3002\u5982\u679C\u8FD9\u4E9B\u90E8\u5206\u4E2D\u6BCF\u4E2A\u90E8\u5206\u7684\u6761\u76EE\u4E3A\u7A7A\u6216\u4E0D\u9002\u7528\uFF0C\u5219\u7701\u7565\u8FD9\u4E9B\u6761\u76EE\u3002
 doclet.help.class_interface.inheritance_diagram=\u7C7B\u7EE7\u627F\u56FE
 doclet.help.class_interface.subclasses=\u76F4\u63A5\u5B50\u7C7B
 doclet.help.class_interface.subinterfaces=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3
 doclet.help.class_interface.implementations=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B
 doclet.help.class_interface.declaration=\u7C7B\u6216\u63A5\u53E3\u58F0\u660E
 doclet.help.class_interface.description=\u7C7B\u6216\u63A5\u53E3\u8BF4\u660E
-doclet.help.class_interface.summary=\u6982\u8981\u6761\u76EE\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\uFF0C\u800C\u8BE6\u7EC6\u8BF4\u660E\u5219\u6309\u5176\u5728\u6E90\u4EE3\u7801\u4E2D\u51FA\u73B0\u7684\u987A\u5E8F\u6392\u5217\u3002\u8FD9\u6709\u52A9\u4E8E\u4FDD\u6301\u7A0B\u5E8F\u5458\u6240\u5EFA\u7ACB\u7684\u903B\u8F91\u5206\u7EC4\u3002
+doclet.help.class_interface.member_order=\u6982\u8981\u6761\u76EE\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\uFF0C\u800C\u8BE6\u7EC6\u8BF4\u660E\u5219\u6309\u5176\u5728\u6E90\u4EE3\u7801\u4E2D\u51FA\u73B0\u7684\u987A\u5E8F\u6392\u5217\u3002\u8FD9\u6709\u52A9\u4E8E\u4FDD\u6301\u7A0B\u5E8F\u5458\u6240\u5EFA\u7ACB\u7684\u903B\u8F91\u5206\u7EC4\u3002
+doclet.help.class_interface.note=\u6CE8:
+doclet.help.class_interface.anno=\u6CE8\u91CA\u63A5\u53E3\u6709\u5FC5\u9700\u7684\u5143\u7D20\u548C\u53EF\u9009\u7684\u5143\u7D20\uFF0C\u4F46\u6CA1\u6709\u65B9\u6CD5\u3002
+doclet.help.class_interface.enum=\u53EA\u6709\u679A\u4E3E\u7C7B\u6709\u679A\u4E3E\u5E38\u91CF\u3002
+doclet.help.class_interface.record=\u8BB0\u5F55\u7C7B\u7684\u7EC4\u4EF6\u663E\u793A\u4E3A\u8BB0\u5F55\u7C7B\u58F0\u660E\u7684\u4E00\u90E8\u5206\u3002
+doclet.help.class_interface.property=\u5C5E\u6027\u662F JavaFX \u7684\u4E00\u4E2A\u7279\u6027\u3002
+doclet.help.other_files.head=\u5176\u4ED6\u6587\u4EF6
+doclet.help.other_files.body=\u7A0B\u5E8F\u5305\u548C\u6A21\u5757\u6240\u5305\u542B\u7684\u9875\u9762\u4E2D\u53EF\u80FD\u5E26\u6709\u4E0E\u9644\u8FD1\u58F0\u660E\u76F8\u5173\u7684\u9644\u52A0\u4FE1\u606F\u3002
 doclet.help.use.head=\u4F7F\u7528
-doclet.help.use.body=\u6BCF\u4E2A\u5DF2\u6587\u6863\u5316\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u548C\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u201C\u4F7F\u7528\u201D\u9875\u3002\u6B64\u9875\u4ECB\u7ECD\u4E86\u4F7F\u7528\u7ED9\u5B9A\u7C7B\u6216\u7A0B\u5E8F\u5305\u7684\u4EFB\u4F55\u90E8\u5206\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u3001\u65B9\u6CD5\u3001\u6784\u9020\u5668\u548C\u5B57\u6BB5\u3002\u5BF9\u4E8E\u7ED9\u5B9A\u7684\u7C7B\u6216\u63A5\u53E3 A\uFF0C\u5176\u201C\u4F7F\u7528\u201D\u9875\u5305\u542B A \u7684\u5B50\u7C7B\u3001\u58F0\u660E\u4E3A A \u7684\u5B57\u6BB5\u3001\u8FD4\u56DE A \u7684\u65B9\u6CD5\u4EE5\u53CA\u5E26\u6709\u7C7B\u578B\u4E3A A \u7684\u53C2\u6570\u7684\u65B9\u6CD5\u548C\u6784\u9020\u5668\u3002\u8BBF\u95EE\u6B64\u9875\u7684\u65B9\u6CD5\u662F\uFF1A\u9996\u5148\u8F6C\u81F3\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\uFF0C\u7136\u540E\u5355\u51FB\u5BFC\u822A\u680F\u4E2D\u7684\u201C\u4F7F\u7528\u201D\u94FE\u63A5\u3002
+doclet.help.use.body=\u6BCF\u4E2A\u5DF2\u6587\u6863\u5316\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u548C\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u201C\u4F7F\u7528\u201D\u9875\u9762\u3002\u6B64\u9875\u9762\u4ECB\u7ECD\u4E86\u4F7F\u7528\u7ED9\u5B9A\u7C7B\u6216\u7A0B\u5E8F\u5305\u7684\u4EFB\u4F55\u90E8\u5206\u7684\u7A0B\u5E8F\u5305\u3001\u7C7B\u3001\u65B9\u6CD5\u3001\u6784\u9020\u5668\u548C\u5B57\u6BB5\u3002\u5BF9\u4E8E\u7ED9\u5B9A\u7684\u7C7B\u6216\u63A5\u53E3 A\uFF0C\u5176\u201C\u4F7F\u7528\u201D\u9875\u9762\u5305\u542B A \u7684\u5B50\u7C7B\u3001\u58F0\u660E\u4E3A A \u7684\u5B57\u6BB5\u3001\u8FD4\u56DE A \u7684\u65B9\u6CD5\uFF0C\u4EE5\u53CA\u5E26\u6709\u7C7B\u578B\u4E3A A \u7684\u53C2\u6570\u7684\u65B9\u6CD5\u548C\u6784\u9020\u5668\u3002\u8BBF\u95EE\u6B64\u9875\u9762\u7684\u65B9\u6CD5\u662F\uFF1A\u9996\u5148\u8F6C\u81F3\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\uFF0C\u7136\u540E\u5355\u51FB\u5BFC\u822A\u680F\u4E2D\u7684\u201C\u4F7F\u7528\u201D\u94FE\u63A5\u3002
 doclet.help.tree.head=\u6811 (\u7C7B\u5206\u5C42\u7ED3\u6784)
+# 0: link to main Class Hierarchy page;  1: java.lang.Object
 doclet.help.tree.intro=\u5BF9\u4E8E\u6240\u6709\u7A0B\u5E8F\u5305\uFF0C\u90FD\u6709\u4E00\u4E2A {0} \u9875\uFF0C\u4EE5\u53CA\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002\u6BCF\u4E2A\u5206\u5C42\u7ED3\u6784\u9875\u90FD\u5305\u542B\u7C7B\u7684\u5217\u8868\u548C\u63A5\u53E3\u7684\u5217\u8868\u3002\u4ECE {1} \u5F00\u59CB\uFF0C\u6309\u7EE7\u627F\u7ED3\u6784\u5BF9\u7C7B\u8FDB\u884C\u6392\u5217\u3002\u63A5\u53E3\u4E0D\u4ECE {1} \u7EE7\u627F\u3002
-doclet.help.tree.overview=\u67E5\u770B\u201C\u6982\u89C8\u201D\u9875\u9762\u65F6, \u5355\u51FB "\u6811" \u5C06\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
+doclet.help.tree.overview=\u67E5\u770B\u201C\u6982\u89C8\u201D\u9875\u9762\u65F6\uFF0C\u5355\u51FB\u201C\u6811\u201D\u5C06\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
 doclet.help.tree.package=\u67E5\u770B\u7279\u5B9A\u7A0B\u5E8F\u5305\u3001\u7C7B\u6216\u63A5\u53E3\u9875\u65F6\uFF0C\u5355\u51FB\u201C\u6811\u201D\u5C06\u4EC5\u663E\u793A\u8BE5\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
+# 0: link to the Deprecated summary page
 doclet.help.deprecated.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u5DF2\u8FC7\u65F6\u7684 API\u3002\u901A\u5E38\uFF0C\u7531\u4E8E\u5DF2\u8FC7\u65F6\u7684 API \u5B58\u5728\u7F3A\u70B9\u5E76\u4E14\u5DF2\u63D0\u4F9B\u66FF\u4EE3 API\uFF0C\u4E0D\u5EFA\u8BAE\u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u65BD\u4E2D\uFF0C\u53EF\u80FD\u4F1A\u5220\u9664\u5DF2\u8FC7\u65F6\u7684 API\u3002
+# 0: link to the Preview summary page
+doclet.help.preview.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u9884\u89C8 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u65BD\u4E2D\uFF0C\u53EF\u80FD\u4F1A\u5220\u9664\u9884\u89C8 API\u3002
+doclet.help.new.body={0} \u9875\u9762\u5217\u51FA\u4E86\u6700\u8FD1\u7684\u53D1\u884C\u7248\u4E2D\u5DF2\u6DFB\u52A0\u7684 API\u3002
 doclet.help.index.head=\u7D22\u5F15
-doclet.help.index.body={0} \u5305\u542B\u6240\u6709\u7C7B\u3001\u63A5\u53E3\u3001\u6784\u9020\u5668\u3001\u65B9\u6CD5\u548C\u5B57\u6BB5\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\uFF0C\u4EE5\u53CA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u6240\u6709\u7C7B\u7684\u5217\u8868\u3002
+# 0: link to Index page;  1: list of links to pages
+doclet.help.index.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7C7B\u3001\u63A5\u53E3\u3001\u6784\u9020\u5668\u3001\u65B9\u6CD5\u548C\u5B57\u6BB5\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\uFF0C\u4EE5\u53CA\u6982\u8981\u9875\uFF08\u4F8B\u5982 {1}\uFF09\u3002
+doclet.help.all_classes.head=\u6240\u6709\u7C7B\u548C\u63A5\u53E3
+# 0: link to All Classes page
+doclet.help.all_classes.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7C7B\u548C\u63A5\u53E3\uFF08\u5305\u62EC\u6CE8\u91CA\u63A5\u53E3\u3001\u679A\u4E3E\u7C7B\u548C\u8BB0\u5F55\u7C7B\uFF09\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\u3002
+doclet.help.all_packages.head=\u6240\u6709\u7A0B\u5E8F\u5305
+# 0: link to All Packages page
+doclet.help.all_packages.body={0} \u5305\u542B\u6587\u6863\u4E2D\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u7D22\u5F15\u3002
 doclet.help.serial_form.body=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u5B9E\u65BD\uFF08\u800C\u975E\u4F7F\u7528\uFF09API \u7684\u4EBA\u5458\u6709\u7528\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5\uFF0C\u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F\uFF1A\u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B\uFF0C\u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684\u201C\u53E6\u8BF7\u53C2\u9605\u201D\u90E8\u5206\u4E2D\u7684\u201C\u5E8F\u5217\u5316\u5F62\u5F0F\u201D\u3002
+# 0: link to Constant Values page
 doclet.help.constants.body={0}\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
+# 0: link to System Properties page
 doclet.help.systemProperties.body={0} \u9875\u9762\u5217\u51FA\u4E86\u5BF9\u7CFB\u7EDF\u5C5E\u6027\u7684\u5F15\u7528\u3002
 doclet.help.footnote=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u7531\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
-doclet.help.enum.intro=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
-doclet.help.enum.declaration=\u679A\u4E3E\u58F0\u660E
-doclet.help.enum.definition=\u679A\u4E3E\u8BF4\u660E
+doclet.help.enum.intro=\u6BCF\u4E2A\u679A\u4E3E\u7C7B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
+doclet.help.enum.class.intro=\u6BCF\u4E2A\u679A\u4E3E\u7C7B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
 doclet.help.annotation_type.intro=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
+doclet.help.annotation_interface.intro=\u6BCF\u4E2A\u6CE8\u91CA\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\uFF0C\u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206\uFF1A
 doclet.help.annotation_type.declaration=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
+doclet.help.annotation_interface.declaration=\u6CE8\u91CA\u63A5\u53E3\u58F0\u660E
 doclet.help.annotation_type.description=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E
+doclet.help.annotation_interface.description=\u6CE8\u91CA\u63A5\u53E3\u8BF4\u660E
 doclet.help.search.head=\u641C\u7D22
 # Introduction to Javadoc search features, followed by a list of examples
 doclet.help.search.intro=\u53EF\u4EE5\u4F7F\u7528\u90E8\u5206\u6216\u5B8C\u6574\u540D\u79F0\u641C\u7D22\u6A21\u5757\u3001\u7A0B\u5E8F\u5305\u3001\u7C7B\u578B\u3001\u5B57\u6BB5\u3001\u65B9\u6CD5\u3001\u7CFB\u7EDF\u5C5E\u6027\u4EE5\u53CA API \u4E2D\u5B9A\u4E49\u7684\u5176\u4ED6\u672F\u8BED\u7684\u5B9A\u4E49\uFF0C\uFF08\u53EF\u9009\uFF09\u4E5F\u53EF\u4EE5\u4F7F\u7528\u201C\u9A7C\u5CF0\u5927\u5C0F\u5199\u5F0F\u201D\u7F29\u5199\u8FDB\u884C\u641C\u7D22\u3002\u4F8B\u5982\uFF1A
@@ -206,10 +269,28 @@ doclet.navClassUse=\u4F7F\u7528
 doclet.Error_in_grouplist=\u9519\u8BEF\u7684 -group \u9009\u9879: {0} {1}
 doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, \u7EC4\u540D\u5DF2\u4F7F\u7528: {0}
 doclet.Same_element_name_used=\u5143\u7D20\u540D\u79F0\u6216\u6A21\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0}
+doclet.PreviewLeadingNote={0} \u4F9D\u8D56\u4E8E Java \u5E73\u53F0\u7684\u9884\u89C8\u529F\u80FD\uFF1A
+doclet.Declared_Using_Preview={0} \u662F\u4F7F\u7528 {1}\uFF08Java \u8BED\u8A00 ({2}) \u7684\u9884\u89C8\u529F\u80FD\uFF09\u58F0\u660E\u7684\u3002
+doclet.PreviewAPI={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u9884\u89C8 API\uFF1A{1}\u3002
+doclet.ReflectivePreviewAPI={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u53CD\u5C04\u9884\u89C8 API\uFF1A{1}\u3002
+doclet.UsesDeclaredUsingPreview={0} \u5F15\u7528\u4E00\u4E2A\u6216\u591A\u4E2A\u7C7B\u578B\uFF0C\u8FD9\u4E9B\u7C7B\u578B\u662F\u4F7F\u7528 Java \u8BED\u8A00 {1} \u7684\u9884\u89C8\u529F\u80FD\u58F0\u660E\u7684\u3002
+doclet.PreviewTrailingNote1=\u53EA\u6709\u5728\u542F\u7528\u4E86\u9884\u89C8\u529F\u80FD\u65F6\uFF0C\u7A0B\u5E8F\u624D\u80FD\u4F7F\u7528 {0}\u3002
+doclet.PreviewTrailingNote2=\u9884\u89C8\u529F\u80FD\u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\uFF0C\u4E5F\u53EF\u80FD\u4F1A\u5347\u7EA7\u4E3A Java \u5E73\u53F0\u7684\u6C38\u4E45\u529F\u80FD\u3002
+doclet.Declared_Using_Preview.SEALED=\u5BC6\u5C01\u7C7B
+doclet.Declared_Using_Preview.SEALED_PERMITS=\u5BC6\u5C01\u7C7B
+doclet.PreviewPlatformLeadingNote={0} \u662F Java \u5E73\u53F0\u7684\u9884\u89C8 API\u3002
+doclet.ReflectivePreviewPlatformLeadingNote={0} \u662F Java \u5E73\u53F0\u7684\u53CD\u5C04\u9884\u89C8 API\u3002
+
+# 0: an exception
+doclet.Error_copying_legal_notices=\u590D\u5236\u6CD5\u5F8B\u58F0\u660E\u65F6\u51FA\u9519\uFF1A{0}
+# 0: the path; 1: the detail message for the exception
+doclet.Error_invalid_path_for_legal_notices=\u6CD5\u5F8B\u58F0\u660E\u7684\u8DEF\u5F84 ''{0}'' \u65E0\u6548\uFF1A{1}
 
 # option specifiers
+doclet.usage.add-script.parameters=<file>
+doclet.usage.add-script.description=\u5411\u751F\u6210\u7684\u6587\u6863\u6DFB\u52A0\u811A\u672C\u6587\u4EF6
 doclet.usage.add-stylesheet.parameters=<file>
-doclet.usage.add-stylesheet.description=\u7528\u4E8E\u6240\u751F\u6210\u6587\u6863\u7684\u5176\u4ED6\u6837\u5F0F\u8868\u6587\u4EF6
+doclet.usage.add-stylesheet.description=\u5411\u751F\u6210\u7684\u6587\u6863\u6DFB\u52A0\u6837\u5F0F\u8868\u6587\u4EF6
 doclet.usage.d.parameters=<directory>
 doclet.usage.d.description=\u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55
 
@@ -252,6 +333,10 @@ doclet.usage.link.description=\u521B\u5EFA\u6307\u5411 <url> \u4E2D\u7684 javado
 doclet.usage.linkoffline.parameters=<url1> <url2>
 doclet.usage.linkoffline.description=\u4F7F\u7528 <url2> \u4E2D\u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u5230 <url1> \u4E2D\u7684\u6587\u6863
 
+# L10N: do not localize the option parameters: warn info
+doclet.usage.link-modularity-mismatch.parameters=(warn|info)
+doclet.usage.link-modularity-mismatch.description=\u7528\u8B66\u544A\u6216\u4FE1\u606F\u6027\u6D88\u606F\u62A5\u544A\u5177\u6709\n\u6A21\u5757\u5316\u9519\u8BEF\u7684\u5916\u90E8\u6587\u6863\u3002\u9ED8\u8BA4\n\u884C\u4E3A\u662F\u62A5\u544A\u8B66\u544A\u3002
+
 doclet.usage.link-platform-properties.parameters=<url>
 doclet.usage.link-platform-properties.description=\u94FE\u63A5\u5230\u4F4D\u4E8E <url> \u7684\u5C5E\u6027\u6587\u4EF6\u4E2D\u58F0\u660E\u7684\u5E73\u53F0\u6587\u6863 URL
 
@@ -261,6 +346,9 @@ doclet.usage.excludedocfilessubdir.description=\u6392\u9664\u5177\u6709\u7ED9\u5
 doclet.usage.group.parameters=<name> <g1>:<g2>...
 doclet.usage.group.description=\u5C06\u6307\u5B9A\u7684\u5143\u7D20\u5728\u6982\u89C8\u9875\u9762\u4E0A\u5206\u7EC4\u5728\u4E00\u8D77
 
+doclet.usage.legal-notices.parameters='default' | 'none' | <directory>
+doclet.usage.legal-notices.description=\u63A7\u5236\u6240\u751F\u6210\u8F93\u51FA\u4E2D\u7684\u6CD5\u5F8B\u58F0\u660E
+
 doclet.usage.nocomment.description=\u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E
 
 doclet.usage.nodeprecated.description=\u4E0D\u5305\u542B @deprecated \u4FE1\u606F
@@ -290,6 +378,12 @@ doclet.usage.nooverview.description=\u4E0D\u751F\u6210\u6982\u89C8\u9875\u9762
 
 doclet.usage.serialwarn.description=\u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A
 
+doclet.usage.since.parameters=<release>(,<release>)*
+doclet.usage.since.description=\u8BB0\u5F55\u6240\u6307\u5B9A\u53D1\u884C\u7248\u4E2D\u65B0\u589E\u548C\u5DF2\u8FC7\u65F6\u7684 API
+
+doclet.usage.since-label.parameters=<text>
+doclet.usage.since-label.description=\u63D0\u4F9B\u8981\u5728\u201C\u65B0\u589E API\u201D\u9875\u7684\u6807\u9898\u4E2D\u4F7F\u7528\u7684\u6587\u672C
+
 doclet.usage.tag.parameters=<name>:<locations>:<header>
 doclet.usage.tag.description=\u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0
 
@@ -297,6 +391,10 @@ doclet.usage.taglet.description=\u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u96
 
 doclet.usage.tagletpath.description=Taglet \u7684\u8DEF\u5F84
 
+doclet.usage.snippet-path.parameters=<path>
+
+doclet.usage.snippet-path.description=\u5916\u90E8\u7247\u6BB5\u7684\u8DEF\u5F84
+
 doclet.usage.charset.parameters=<charset>
 doclet.usage.charset.description=\u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
new file mode 100644
index 00000000000..8fbb1af8a88
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
@@ -0,0 +1,330 @@
+#
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+doclet.Generating_0={0} wird generiert...
+doclet.Toolkit_Usage_Violation=Das Doclet-Toolkit kann nur von {0} verwendet werden
+doclet.MissingSerialTag=in Klasse {0} fehlt das Tag @serial f\u00FCr standardm\u00E4\u00DFig serialisierbares Feld: {1}.
+doclet.MissingSerialDataTag=in Klasse {0} fehlt das Tag @serialData in Methode {1}.
+doclet.Serializable_no_customization=Keine readObject- oder writeObject-Methode deklariert.
+doclet.Serialized_Form=Serialisierte Form
+doclet.Serialized_Form_methods=Serialisierungsmethoden
+doclet.Serialized_Form_fields=Serialisierte Felder
+doclet.Serialized_Form_class=Serialisierungs\u00FCberblick
+doclet.Option_conflict=Option {0} steht in Konflikt mit {1}
+doclet.Option_reuse=Option wiederverwendet: {0}
+doclet.Option_invalid=Ung\u00FCltiges Argument {0} f\u00FCr Option {1}
+doclet.Option_doclint_no_qualifiers=Zugriffs-Qualifier f\u00FCr Argumente f\u00FCr -Xdoclint nicht zul\u00E4ssig
+doclet.Option_doclint_invalid_arg=Ung\u00FCltiges Argument f\u00FCr Option -Xdoclint
+doclet.Option_doclint_package_invalid_arg=Ung\u00FCltiges Argument f\u00FCr Option -Xdoclint/package
+doclet.error.initializing.dest.dir=Fehler beim Initialisieren des Zielverzeichnisses: {0}
+doclet.exception.read.file=Fehler beim Lesen der Datei: {0}\n\t({1})
+doclet.exception.write.file=Fehler beim Schreiben der Datei: {0}\n\t({1})
+doclet.exception.read.resource=Fehler beim Lesen der Systemressource: {0}\n\t({1})
+doclet.internal.exception=Eine interne Ausnahme ist aufgetreten.\n\t({0})
+doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bug\nf\u00FCr das javadoc-Tool, nachdem Sie in der Bugdatenbank (http://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
+doclet.File_not_found=Datei nicht gefunden: {0}
+doclet.Copy_Overwrite_warning=Datei {0} wurde nicht in {1} kopiert, da bereits eine Datei mit demselben Namen vorhanden ist...
+doclet.Copy_Ignored_warning=Die Datei {0} wurde nicht kopiert: ung\u00FCltiger Name
+doclet.Copy_snippet_to_clipboard=Kopieren
+doclet.Copied_snippet_to_clipboard=Kopiert.
+doclet.Copying_File_0_To_Dir_1=Datei {0} wird in Verzeichnis {1} kopiert...
+doclet.Copying_File_0_To_File_1=Datei {0} wird in Datei {1} kopiert...
+doclet.No_Public_Classes_To_Document=Keine \u00F6ffentlichen oder gesch\u00FCtzten Klassen zur Dokumentation gefunden.
+doclet.destination_directory_not_directory_0=Ziel ist kein Verzeichnis: {0}
+doclet.destination_directory_not_writable_0=Zielverzeichnis ist schreibgesch\u00FCtzt: {0}
+doclet.Encoding_not_supported=Codierung nicht unterst\u00FCtzt: {0}
+doclet.Building_Tree=Baum f\u00FCr alle Packages und Klassen wird erstellt...
+doclet.Building_Index=Index f\u00FCr alle Packages und Klassen wird erstellt...
+doclet.Building_Index_For_All_Classes=Index f\u00FCr alle Klassen wird erstellt...
+doclet.sourcetab_warning=Das Argument f\u00FCr -sourcetab muss eine Ganzzahl sein, die gr\u00F6\u00DFer als 0 ist.
+doclet.JavaScript_in_comment=JavaScript in Dokumentationskommentar gefunden.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
+doclet.JavaScript_in_option=Option {0} enth\u00E4lt JavaScript.\nVerwenden Sie --allow-script-in-comments, um die Verwendung von JavaScript zuzulassen.
+doclet.Packages=Packages
+doclet.All_Packages=Alle Packages
+doclet.Modules=Module
+doclet.All_Modules=Alle Module
+doclet.Other_Packages=Andere Packages
+doclet.Other_Modules=Andere Module
+doclet.Notice_taglet_registered=Taglet {0} wurde registriert...
+doclet.Notice_taglet_unseen=Hinweis: Nicht gefundene benutzerdefinierte Tags: {0}
+doclet.Notice_taglet_overridden=Hinweis: Benutzerdefinierte Tags, die Standardtags au\u00DFer Kraft setzen: {0}
+doclet.Notice_taglet_conflict_warn=Hinweis: Benutzerdefinierte Tags, die zuk\u00FCnftige Standardtags au\u00DFer Kraft setzen k\u00F6nnten: {0}. Um potenzielle Overrides zu vermeiden, verwenden Sie in den Namen benutzerdefinierter Tags mindestens einen Punkt (.).
+doclet.Error_taglet_not_registered=Fehler - Ausnahme {0} wurde beim Versuch ausgel\u00F6st, Taglet {1} zu registrieren...
+doclet.Error_invalid_custom_tag_argument=Fehler - {0} ist ein ung\u00FCltiges Argument f\u00FCr die Option -tag...
+doclet.taglet_could_not_set_location = Taglet-Pfad konnte nicht festgelegt werden: {0}
+doclet.not_standard_file_manager = Taglet-Pfad kann nicht festgelegt werden, der Dateimanager ist kein StandardJavaFileManager
+doclet.Author=Autor:
+doclet.DefaultValue=Standardwert:
+doclet.PropertyDescription=Eigenschaftsbeschreibung:
+doclet.PropertyGetterWithName=Ruft den Wert der {0}-Eigenschaft ab.
+doclet.PropertyGetterReturn=Wert der Eigenschaft {0}
+doclet.PropertySetterWithName=Legt den Wert der {0}-Eigenschaft fest.
+doclet.PropertySetterParam=Wert f\u00FCr die Eigenschaft {0}
+doclet.PropertyMethodReturn=die Eigenschaft {0}
+doclet.Default=Standard:
+doclet.Parameters=Parameter:
+doclet.TypeParameters=Typparameter:
+doclet.RecordComponents=Datensatzkomponenten:
+doclet.Parameters_warn=@param-Argument "{0}" ist kein Parametername.
+doclet.Parameters_dup_warn=Parameter "{0}" ist mehrmals dokumentiert.
+doclet.TypeParameters_warn=@param-Argument "{0}" ist nicht der Name eines Typparameters.
+doclet.TypeParameters_dup_warn=Typparameter "{0}" ist mehrmals dokumentiert.
+doclet.RecordComponents_warn=@param-Argument "{0}" ist nicht der Name einer Datensatzkomponente.
+doclet.RecordComponents_dup_warn=Datensatzkomponente "{0}" ist mehrmals dokumentiert.
+doclet.Returns=Gibt zur\u00FCck:
+doclet.Returns_0=Gibt {0} zur\u00FCck.
+doclet.Return_tag_on_void_method=@return-Tag kann nicht in Methode mit ung\u00FCltigem R\u00FCckgabetyp verwendet werden.
+doclet.See_Also=Siehe auch:
+doclet.SerialData=Serielle Daten:
+doclet.Services=Services
+doclet.Since=Seit:
+doclet.Throws=L\u00F6st aus:
+doclet.Version=Version:
+doclet.Factory=Factory:
+doclet.UnknownTag={0} ist ein unbekanntes Tag.
+doclet.UnknownTagLowercase={0} ist ein unbekanntes Tag - bis auf die Gro\u00DF-/Kleinschreibung identisch mit einem bekannten Tag.
+doclet.noInheritedDoc=@inheritDoc wurde verwendet, aber mit {0} wird keine Methode au\u00DFer Kraft gesetzt oder implementiert.
+doclet.tag_misuse=Tag {0} kann nicht in {1}-Dokumentation verwendet werden. Es kann nur in folgenden Dokumentationstypen verwendet werden: {2}.
+doclet.Package_Summary=Package\u00FCbersicht
+doclet.Requires_Summary=Erfordernisse
+doclet.Indirect_Requires_Summary=Indirekte Erfordernisse
+doclet.Indirect_Exports_Summary=Indirekte Exportvorg\u00E4nge
+doclet.Indirect_Opens_Summary=Indirekte \u00D6ffnungsvorg\u00E4nge
+doclet.Exported_Packages_Summary=Exporte
+doclet.Opened_Packages_Summary=\u00D6ffnungsvorg\u00E4nge
+doclet.Concealed_Packages_Summary=Ausgeblendet
+doclet.From=Von
+doclet.Uses_Summary=Verwendungen
+doclet.Provides_Summary=Bereitstellungen
+doclet.Nested_Class_Summary=Verschachtelte Klassen - \u00DCbersicht
+doclet.Annotation_Type_Optional_Member_Summary=Optionale Elemente - \u00DCbersicht
+doclet.Annotation_Type_Required_Member_Summary=Erforderliche Elemente - \u00DCbersicht
+doclet.Field_Summary=Feld\u00FCbersicht
+doclet.Property_Summary=Eigenschafts\u00FCbersicht
+doclet.Enum_Constant_Summary=Enum-Konstanten - \u00DCbersicht
+doclet.Constructor_Summary=Konstruktor\u00FCbersicht
+doclet.Method_Summary=Methoden\u00FCbersicht
+doclet.Interfaces=Schnittstellen
+doclet.Enums=Enums
+doclet.EnumClasses=Enum-Klassen
+doclet.RecordClasses=Datensatzklassen
+doclet.Related_Packages=Zugeh\u00F6rige Packages
+doclet.AnnotationTypes=Annotationstypen
+doclet.AnnotationInterfaces=Annotationsschnittstellen
+doclet.ExceptionClasses=Ausnahmeklassen
+doclet.Classes=Klassen
+doclet.All_Classes_And_Interfaces=Alle Klassen und Schnittstellen
+doclet.All_Superinterfaces=Alle Superschnittstellen:
+doclet.All_Implemented_Interfaces=Alle implementierten Schnittstellen:
+doclet.Interface=Schnittstelle
+doclet.Class=Klasse
+doclet.AnnotationType=Annotationstyp
+doclet.AnnotationInterface=Annotationsschnittstelle
+doclet.annotationtype=Annotationstyp
+doclet.annotationinterface=Annotationsschnittstellen
+doclet.annotationtypes=Annotationstypen
+doclet.annotationinterfaces=Annotationsschnittstellen
+doclet.Enum=Enum
+doclet.EnumClass=Enum-Klasse
+doclet.enum=Enumeration
+doclet.enumclass=Enum-Klasse
+doclet.enums=Enums
+doclet.enumclasses=Enum-Klassen
+doclet.interface=Schnittstelle
+doclet.class=Klasse
+doclet.RecordClass=Datensatzklasse
+doclet.recordclass=Datensatzklasse
+doclet.ExceptionClass=Ausnahmeklasse
+doclet.exceptionclass=Ausnahmeklasse
+doclet.ExportedTo=In Module exportiert
+doclet.OpenedTo=In Modulen ge\u00F6ffnet
+doclet.Package_private=(Package privat)
+doclet.Nested_Classes_Interfaces_Inherited_From_Class=Von Klasse geerbte verschachtelte Klassen/Schnittstellen
+doclet.Nested_Classes_Interfaces_Inherited_From_Interface=Von Schnittstelle geerbte verschachtelte Klassen/Schnittstellen
+doclet.Nested_Classes_Interfaces_Declared_In_Class=In Klasse deklarierte verschachtelte Klassen/Schnittstellen
+doclet.Nested_Classes_Interfaces_Declared_In_Interface=In Schnittstelle deklarierte verschachtelte Klassen/Schnittstellen
+doclet.Methods_Inherited_From_Class=Von Klasse geerbte Methoden
+doclet.Methods_Inherited_From_Interface=Von Schnittstelle geerbte Methoden
+doclet.Methods_Declared_In_Class=In Klasse deklarierte Methoden
+doclet.Methods_Declared_In_Interface=In Schnittstelle deklarierte Methoden
+doclet.Fields_Inherited_From_Class=Von Klasse geerbte Felder
+doclet.Fields_Inherited_From_Interface=Von Schnittstelle geerbte Felder
+doclet.Fields_Declared_In_Class=In Klasse deklarierte Felder
+doclet.Fields_Declared_In_Interface=In Schnittstelle deklarierte Felder
+doclet.Properties_Inherited_From_Class=Von Klasse geerbte Eigenschaften
+doclet.Properties_Inherited_From_Interface=Von Schnittstelle geerbte Eigenschaften
+doclet.Properties_Declared_In_Class=In Klasse deklarierte Eigenschaften
+doclet.Properties_Declared_In_Interface=In Schnittstelle deklarierte Eigenschaften
+doclet.Annotation_Type_Member_Detail=Elementdetails
+doclet.Enum_Constant_Detail=Enum-Konstanten - Details
+doclet.Constants_Summary=Konstantenfeldwerte
+doclet.Field_Detail=Felddetails
+doclet.Property_Detail=Eigenschaftsdetails
+doclet.Method_Detail=Methodendetails
+doclet.Constructor_Detail=Konstruktordetails
+doclet.Deprecated=Veraltet.
+doclet.DeprecatedForRemoval=Veraltet, zur Entfernung: Dieses API-Element wird in einer zuk\u00FCnftigen Version entfernt.
+doclet.Groupname_already_used=In der Option -group wird der Gruppenname bereits verwendet: {0}
+doclet.value_tag_invalid_reference={0} (referenziert von @value-Tag) ist eine unbekannte Referenz.
+doclet.value_tag_invalid_constant=@value-Tag (das {0} referenziert) kann nur in Konstanten verwendet werden.
+doclet.value_tag_invalid_use=@value-Tag kann hier nicht verwendet werden.
+doclet.dest_dir_create=Zielverzeichnis wird erstellt: "{0}"
+doclet.in={0} in {1}
+doclet.Fields=Felder
+doclet.Preview=Vorschau.
+doclet.Properties=Eigenschaften
+doclet.Constructors=Konstruktoren
+doclet.Methods=Methoden
+doclet.All_Methods=Alle Methoden
+doclet.Static_Methods=Statische Methoden
+doclet.Instance_Methods=Instanzmethoden
+doclet.Abstract_Methods=Abstrakte Methoden
+doclet.Concrete_Methods=Konkrete Methoden
+doclet.Default_Methods=Standardmethoden
+doclet.Deprecated_Methods=Veraltete Methoden
+doclet.Annotation_Type_Optional_Members=Optionale Elemente
+doclet.Annotation_Type_Required_Members=Erforderliche Elemente
+doclet.Enum_Constants=Enum-Konstanten
+doclet.Nested_Classes=Verschachtelte Klassen
+doclet.Modifier=Modifizierer
+doclet.Type=Typ
+doclet.Modifier_and_Type=Modifizierer und Typ
+doclet.Implementation=Implementierung(en):
+doclet.search=SEARCH:
+doclet.search_placeholder=Suchen
+doclet.Field=Feld
+doclet.Property=Eigenschaft
+doclet.Constructor=Konstruktor
+doclet.Method=Methode
+doclet.Annotation_Type_Optional_Member=Optionales Element
+doclet.Annotation_Type_Required_Member=Erforderliches Element
+doclet.Annotation_Type_Member=Annotationstypelement
+doclet.Annotation_Interface_Member=Annotationsschnittstellenelement
+doclet.Enum_Constant=Enum-Konstante
+doclet.Description=Beschreibung
+doclet.ConstantField=Konstantenfeld
+doclet.Value=Wert
+doclet.linkMismatch_PackagedLinkedtoModule=Der Code, der dokumentiert wird, verwendet Packages im unbenannten Modul, aber die in {0} definierten Packages befinden sich in benannten Modulen.
+doclet.linkMismatch_ModuleLinkedtoPackage=Der Code, der dokumentiert wird, verwendet Module, aber die in {0} definierten Packages befinden sich im unbenannten Modul.
+doclet.urlRedirected=URL {0} wurde umgeleitet an {1} - Aktualisieren Sie die Befehlszeilenoptionen, um diese Warnung zu unterdr\u00FCcken.
+doclet.duplicate.comment.for.property=Doppelter Kommentar f\u00FCr Eigenschaft.\nEntfernen Sie den Kommentar auf dem Eigenschaftsfeld oder in dieser Methode, um diese Warnung zu unterdr\u00FCcken.
+
+#Documentation for Enums
+doclet.enum_values_doc.fullbody=Gibt ein Array mit den Konstanten dieses Enum-Typs in\nder Reihenfolge ihrer Deklaration zur\u00FCck.
+doclet.enum_class_values_doc.fullbody=Gibt ein Array mit den Konstanten dieser Enum-Klasse in\nder Reihenfolge ihrer Deklaration zur\u00FCck.
+
+doclet.enum_values_doc.return=ein Array mit den Konstanten dieses Enumerationstyps in der Reihenfolge ihrer Deklaration
+doclet.enum_class_values_doc.return=ein Array mit den Konstanten dieser Enum-Klasse in der Reihenfolge ihrer Deklaration
+
+doclet.enum_valueof_doc.fullbody=Gibt die Enumerationskonstante dieses Typs mit dem angegebenen Namen zur\u00FCck.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID \u00FCbereinstimmen,\nmit der eine Enumerationskonstante in diesem Typ deklariert wird.\n(Zus\u00E4tzliche Leerzeichen sind nicht zul\u00E4ssig.)
+doclet.enum_class_valueof_doc.fullbody=Gibt die Enum-Konstante dieser Klasse mit dem angegebenen Namen zur\u00FCck.\nDie Zeichenfolge muss <i>exakt</i> mit einer ID \u00FCbereinstimmen,\nmit der eine Enum-Konstante in dieser Klasse deklariert wird.\n(Zus\u00E4tzliche Leerzeichen sind nicht zul\u00E4ssig.)
+
+doclet.enum_valueof_doc.param_name=Name der zur\u00FCckzugebenden Enumerationskonstante.
+
+doclet.enum_valueof_doc.return=Enumerationskonstante mit dem angegebenen Namen
+
+doclet.enum_valueof_doc.throws_ila=wenn dieser Enumerationstyp keine Konstante mit dem angegebenen Namen enth\u00E4lt
+doclet.enum_class_valueof_doc.throws_ila=wenn diese Enum-Klasse keine Konstante mit dem angegebenen Namen enth\u00E4lt
+
+doclet.enum_valueof_doc.throws_npe=wenn das Argument nicht angegeben wird
+
+
+#Documentation for records
+doclet.record_constructor_doc.fullbody=Erstellt eine Instanz einer Datensatzklasse {0}.
+
+doclet.record_constructor_doc.param_name=Wert f\u00FCr die Datensatzkomponente {0}
+
+doclet.record_equals_doc.fullbody.head=Gibt an, ob ein anderes Objekt diesem gleich ("equal to") ist. Die Objekte sind gleich, wenn das andere Objekt der gleichen Klasse angeh\u00F6rt und alle Datensatzkomponenten gleich sind.
+
+doclet.record_equals_doc.fullbody.tail.both=Referenzkomponenten werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}; primitive Komponenten werden verglichen mit "==".
+
+doclet.record_equals_doc.fullbody.tail.primitive=Alle Komponenten in dieser Datensatzklasse werden verglichen mit "==".
+
+doclet.record_equals_doc.fullbody.tail.reference=Alle Komponenten in dieser Datensatzklasse werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}.
+
+doclet.record_equals_doc.param_name=das Objekt, mit dem verglichen wird
+
+doclet.record_equals_doc.return=<code>true</code>, wenn dieses Objekt gleich dem Argument {0} ist, andernfalls <code>false</code>.
+
+doclet.record_hashCode_doc.fullbody=Gibt einen Hashcodewert f\u00FCr diese Objekt zur\u00FCck. Der Wert wird vom Hashcode jeder der Datensatzkomponenten abgeleitet.
+
+doclet.record_hashCode_doc.return=ein Hashcodewert f\u00FCr dieses Objekt
+
+doclet.record_toString_doc.fullbody=Gibt eine Zeichenfolgendarstellung dieser Datensatzklasse zur\u00FCck. Die Darstellung enth\u00E4lt den Namen der Klasse, gefolgt vom Namen und Wert jeder der Datensatzkomponenten.
+
+doclet.record_toString_doc.return=eine Zeichenfolgendarstellung dieses Objekts
+
+doclet.record_accessor_doc.fullbody=Gibt den Wert f\u00FCr die Datensatzkomponente {0} zur\u00FCck.
+
+doclet.record_accessor_doc.return=Wert der Datensatzkomponente {0}
+
+doclet.record_field_doc.fullbody=Das Feld f\u00FCr die Datensatzkomponente {0}.
+
+doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
+doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
+doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
+
+doclet.search.no_results=Keine Ergebnisse gefunden
+doclet.search.loading=Suchindex wird geladen...
+doclet.search.modules=Module
+doclet.search.packages=Packages
+doclet.search.classes_and_interfaces=Klassen und Schnittstellen
+doclet.search.types=Typen
+doclet.search.members=Mitglieder
+doclet.search.search_tags=Tags suchen
+
+doclet.snippet.contents.none=@snippet gibt keinen Inhalt an
+
+doclet.snippet.contents.ambiguity.external=@snippet gibt mehrere externe Inhalte an, was nicht eindeutig ist
+
+doclet.snippet.region.not_found=Region nicht gefunden: "{0}"
+
+doclet.tag.attribute.value.illegal=ung\u00FCltiger Wert f\u00FCr Attribut "{0}": "{1}"
+
+doclet.tag.attribute.value.missing=fehlender Wert f\u00FCr Attribut "{0}"
+
+doclet.tag.attribute.repeated=wiederholtes Attribut: "{0}"
+
+doclet.snippet.contents.mismatch=Inhalt stimmt nicht \u00FCberein:\n{0}
+
+doclet.snippet.markup=snippet-Markup: {0}
+
+doclet.snippet.markup.spurious=falsches Markup
+doclet.snippet.markup.attribute.absent=Attribut "{0}" fehlt
+doclet.snippet.markup.attribute.simultaneous.use=Attribute "{0}" und "{1}" gleichzeitig verwendet
+doclet.snippet.markup.attribute.unexpected=unerwartetes Attribut
+doclet.snippet.markup.attribute.value.invalid=Ung\u00FCltiger Attributwert
+doclet.snippet.markup.attribute.value.unterminated=nicht beendeter Attributwert
+doclet.snippet.markup.regex.invalid=ung\u00FCltiger regul\u00E4rer Ausdruck
+doclet.snippet.markup.region.duplicated=doppelte Region
+doclet.snippet.markup.region.none=keine Region zum Beenden
+doclet.snippet.markup.region.unpaired=nicht gepaarte Region
+doclet.snippet.markup.tag.non.existent.lines=Tag bezieht sich auf nicht vorhandene Zeilen
+
+# 0: path
+doclet.cannot_use_snippet_path=Option --snippet-path kann mit dem gegebenen Dateimanager nicht verwendet werden: {0}
+
+# 0: path; 1: exception
+doclet.error_setting_snippet_path=Fehler beim Festlegen von Snippet-Pfad {0}: {1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
index 05c406d4421..e062f714f15 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
@@ -32,8 +32,6 @@ doclet.Serialized_Form=\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F
 doclet.Serialized_Form_methods=\u76F4\u5217\u5316\u30E1\u30BD\u30C3\u30C9
 doclet.Serialized_Form_fields=\u76F4\u5217\u5316\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Serialized_Form_class=\u76F4\u5217\u5316\u306E\u6982\u8981
-doclet.Class_0_implements_serializable=Class {0} implements Serializable
-doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable
 doclet.Option_conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u304C{1}\u3068\u77DB\u76FE\u3057\u307E\u3059
 doclet.Option_reuse=\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u518D\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
 doclet.Option_invalid={1}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570{0}\u304C\u7121\u52B9\u3067\u3059
@@ -44,11 +42,13 @@ doclet.error.initializing.dest.dir=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u3
 doclet.exception.read.file=\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
 doclet.exception.write.file=\u30D5\u30A1\u30A4\u30EB\u306E\u66F8\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
 doclet.exception.read.resource=\u30B7\u30B9\u30C6\u30E0\u30FB\u30EA\u30BD\u30FC\u30B9\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\t({1})
-doclet.internal.exception=\u5185\u90E8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002 \n\t({0})
+doclet.internal.exception=\u5185\u90E8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\t({0})
 doclet.internal.report.bug=Bug Database (http://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java bug\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8\n(http://bugreport.java.com)\u3067javadoc\u30C4\u30FC\u30EB\u306B\u5BFE\u3059\u308Bbug\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\n\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
 doclet.File_not_found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
 doclet.Copy_Overwrite_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u540C\u3058\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308B\u306E\u3067{1}\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F...
 doclet.Copy_Ignored_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F: \u540D\u524D\u304C\u7121\u52B9\u3067\u3059
+doclet.Copy_snippet_to_clipboard=\u30B3\u30D4\u30FC
+doclet.Copied_snippet_to_clipboard=\u30B3\u30D4\u30FC\u6E08
 doclet.Copying_File_0_To_Dir_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
 doclet.Copying_File_0_To_File_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30D5\u30A1\u30A4\u30EB{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
 doclet.No_Public_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308Bpublic\u307E\u305F\u306Fprotected\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
@@ -78,8 +78,11 @@ doclet.not_standard_file_manager = \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D1\u3
 doclet.Author=\u4F5C\u6210\u8005:
 doclet.DefaultValue=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024:
 doclet.PropertyDescription=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8AAC\u660E:
-doclet.PropertyGetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
-doclet.PropertySetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
+doclet.PropertyGetterWithName={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
+doclet.PropertyGetterReturn={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024
+doclet.PropertySetterWithName={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
+doclet.PropertySetterParam={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024
+doclet.PropertyMethodReturn={0}\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.Default=\u30C7\u30D5\u30A9\u30EB\u30C8:
 doclet.Parameters=\u30D1\u30E9\u30E1\u30FC\u30BF:
 doclet.TypeParameters=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF:
@@ -103,7 +106,6 @@ doclet.Factory=\u30D5\u30A1\u30AF\u30C8\u30EA:
 doclet.UnknownTag={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002
 doclet.UnknownTagLowercase={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002\u5927\u6587\u5B57\u3068\u5C0F\u6587\u5B57\u306E\u533A\u5225\u3092\u9664\u3044\u3066\u306F\u65E2\u77E5\u306E\u30BF\u30B0\u3068\u540C\u3058\u3067\u3059\u3002
 doclet.noInheritedDoc=@inheritDoc\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u306F\u3069\u306E\u30E1\u30BD\u30C3\u30C9\u3082\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-# doclet.malformed_html_link_tag=<a> tag is malformed:\n"{0}"
 doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002
 doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981
 doclet.Requires_Summary=\u5FC5\u8981
@@ -116,12 +118,6 @@ doclet.Concealed_Packages_Summary=\u975E\u8868\u793A
 doclet.From=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5143
 doclet.Uses_Summary=\u4F7F\u7528
 doclet.Provides_Summary=\u63D0\u4F9B
-doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6982\u8981
-doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u6982\u8981
-doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u6982\u8981
-doclet.Exception_Summary=\u4F8B\u5916\u306E\u6982\u8981
-doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u6982\u8981
-doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u6982\u8981
 doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u6982\u8981
 doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981
 doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981
@@ -130,32 +126,38 @@ doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981
 doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
 doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
 doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
-doclet.Record_Summary=\u30EC\u30B3\u30FC\u30C9\u30FB\u30B5\u30DE\u30EA\u30FC
 doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Enums=\u5217\u6319
+doclet.EnumClasses=\u5217\u6319\u30AF\u30E9\u30B9
+doclet.RecordClasses=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
+doclet.Related_Packages=\u95A2\u9023\u30D1\u30C3\u30B1\u30FC\u30B8
 doclet.AnnotationTypes=\u6CE8\u91C8\u578B
-doclet.Exceptions=\u4F8B\u5916
-doclet.Errors=\u30A8\u30E9\u30FC
+doclet.AnnotationInterfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.ExceptionClasses=\u4F8B\u5916\u30AF\u30E9\u30B9
 doclet.Classes=\u30AF\u30E9\u30B9
-doclet.packages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.modules=\u30E2\u30B8\u30E5\u30FC\u30EB
-doclet.All_Classes=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9
+doclet.All_Classes_And_Interfaces=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.All_Superinterfaces=\u3059\u3079\u3066\u306E\u30B9\u30FC\u30D1\u30FC\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
 doclet.All_Implemented_Interfaces=\u3059\u3079\u3066\u306E\u5B9F\u88C5\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
 doclet.Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Class=\u30AF\u30E9\u30B9
 doclet.AnnotationType=\u6CE8\u91C8\u578B
+doclet.AnnotationInterface=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotationtype=\u6CE8\u91C8\u578B
+doclet.annotationinterface=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.annotationtypes=\u6CE8\u91C8\u578B
+doclet.annotationinterfaces=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.Enum=\u5217\u6319
+doclet.EnumClass=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.enum=\u5217\u6319
+doclet.enumclass=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.enums=\u5217\u6319
+doclet.enumclasses=\u5217\u6319\u30AF\u30E9\u30B9
 doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.class=\u30AF\u30E9\u30B9
-doclet.classes=\u30AF\u30E9\u30B9
-doclet.Record=\u30EC\u30B3\u30FC\u30C9
-doclet.record=\u30EC\u30B3\u30FC\u30C9
+doclet.RecordClass=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
+doclet.recordclass=\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9
+doclet.ExceptionClass=\u4F8B\u5916\u30AF\u30E9\u30B9
+doclet.exceptionclass=\u4F8B\u5916\u30AF\u30E9\u30B9
 doclet.ExportedTo=\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 doclet.OpenedTo=\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u30AA\u30FC\u30D7\u30F3
 doclet.Package_private=(package private)
@@ -190,14 +192,10 @@ doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057
 doclet.value_tag_invalid_use=@value\u30BF\u30B0\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
 doclet.dest_dir_create=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4F5C\u6210\u4E2D: "{0}"
 doclet.in={1}\u306E{0}
-doclet.Use_Table_Summary=\u8868\u3001{0}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E\u306E\u4F7F\u7528
-doclet.Member_Table_Summary={0}\u8868\u3001{1}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E
-doclet.fields=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Fields=\u30D5\u30A3\u30FC\u30EB\u30C9
+doclet.Preview=\u30D7\u30EC\u30D3\u30E5\u30FC\u3002
 doclet.Properties=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 doclet.Constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.methods=\u30E1\u30BD\u30C3\u30C9
 doclet.Methods=\u30E1\u30BD\u30C3\u30C9
 doclet.All_Methods=\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9
 doclet.Static_Methods=static\u30E1\u30BD\u30C3\u30C9
@@ -208,7 +206,6 @@ doclet.Default_Methods=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u3
 doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
 doclet.Annotation_Type_Optional_Members=\u4EFB\u610F\u8981\u7D20
 doclet.Annotation_Type_Required_Members=\u5FC5\u9808\u8981\u7D20
-doclet.enum_constants=\u5217\u6319\u578B\u5B9A\u6570
 doclet.Enum_Constants=\u5217\u6319\u5B9A\u6570
 doclet.Nested_Classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9
 doclet.Modifier=\u4FEE\u98FE\u5B50
@@ -216,6 +213,7 @@ doclet.Type=\u30BF\u30A4\u30D7
 doclet.Modifier_and_Type=\u4FEE\u98FE\u5B50\u3068\u30BF\u30A4\u30D7
 doclet.Implementation=\u5B9F\u88C5:
 doclet.search=SEARCH:
+doclet.search_placeholder=\u691C\u7D22
 doclet.Field=\u30D5\u30A3\u30FC\u30EB\u30C9
 doclet.Property=\u30D7\u30ED\u30D1\u30C6\u30A3
 doclet.Constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
@@ -223,6 +221,7 @@ doclet.Method=\u30E1\u30BD\u30C3\u30C9
 doclet.Annotation_Type_Optional_Member=\u4EFB\u610F\u8981\u7D20
 doclet.Annotation_Type_Required_Member=\u5FC5\u9808\u8981\u7D20
 doclet.Annotation_Type_Member=\u6CE8\u91C8\u578B\u8981\u7D20
+doclet.Annotation_Interface_Member=\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u8981\u7D20
 doclet.Enum_Constant=\u5217\u6319\u578B\u5B9A\u6570
 doclet.Description=\u8AAC\u660E
 doclet.ConstantField=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9
@@ -230,25 +229,30 @@ doclet.Value=\u5024
 doclet.linkMismatch_PackagedLinkedtoModule=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u30B3\u30FC\u30C9\u3067\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3082\u306E\u3067\u3059\u3002
 doclet.linkMismatch_ModuleLinkedtoPackage=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u30B3\u30FC\u30C9\u3067\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3082\u306E\u3067\u3059\u3002
 doclet.urlRedirected=URL {0}\u306F{1}\u306B\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3055\u308C\u307E\u3057\u305F -- \u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u66F4\u65B0\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u8868\u793A\u3057\u306A\u3044\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+doclet.duplicate.comment.for.property=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30B3\u30E1\u30F3\u30C8\u304C\u91CD\u8907\u3057\u3066\n\u3044\u307E\u3059\u3002\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A3\u30FC\u30EB\u30C9\u307E\u305F\u306F\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8\u3092\u524A\u9664\u3057\u3066\u3053\u306E\u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 #Documentation for Enums
 doclet.enum_values_doc.fullbody=\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u8FD4\u3057\u307E\u3059\u3002
+doclet.enum_class_values_doc.fullbody=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u8FD4\u3057\u307E\u3059\u3002
 
 doclet.enum_values_doc.return=\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u306E\u914D\u5217
+doclet.enum_class_values_doc.return=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u542B\u3080\u914D\u5217
 
 doclet.enum_valueof_doc.fullbody=\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\n\u3067\u304D\u307E\u305B\u3093\u3002)
+doclet.enum_class_valueof_doc.fullbody=\u3053\u306E\u30AF\u30E9\u30B9\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u6307\u5B9A\u3057\u305F\u540D\u524D\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u30AF\u30E9\u30B9\u306E\u5217\u6319\u578B\u5B9A\u6570\u306E\u5BA3\u8A00\u306B\u4F7F\u7528\u3055\u308C\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u306F\u4F7F\u7528\n\u3067\u304D\u307E\u305B\u3093\u3002)
 
 doclet.enum_valueof_doc.param_name=\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\u3002
 
 doclet.enum_valueof_doc.return=\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5217\u6319\u578B\u5B9A\u6570
 
 doclet.enum_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u578B\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
+doclet.enum_class_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u30AF\u30E9\u30B9\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
 
 doclet.enum_valueof_doc.throws_npe=\u5F15\u6570\u304Cnull\u306E\u5834\u5408
 
 
 #Documentation for records
-doclet.record_constructor_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
+doclet.record_constructor_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
 
 doclet.record_constructor_doc.param_name={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5024
 
@@ -256,9 +260,9 @@ doclet.record_equals_doc.fullbody.head=\u4ED6\u306E\u30AA\u30D6\u30B8\u30A7\u30A
 
 doclet.record_equals_doc.fullbody.tail.both=\u53C2\u7167\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u3001\u30D7\u30EA\u30DF\u30C6\u30A3\u30D6\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
-doclet.record_equals_doc.fullbody.tail.primitive=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u5185\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.primitive=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F'=='\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
-doclet.record_equals_doc.fullbody.tail.reference=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u5185\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
+doclet.record_equals_doc.fullbody.tail.reference=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}\u3068\u6BD4\u8F03\u3055\u308C\u307E\u3059\u3002
 
 doclet.record_equals_doc.param_name=\u6BD4\u8F03\u3059\u308B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
 
@@ -268,7 +272,7 @@ doclet.record_hashCode_doc.fullbody=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u
 
 doclet.record_hashCode_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30CF\u30C3\u30B7\u30E5\u30FB\u30B3\u30FC\u30C9\u5024
 
-doclet.record_toString_doc.fullbody=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u306E\u6587\u5B57\u5217\u8868\u73FE\u3092\u8FD4\u3057\u307E\u3059\u3002\u8868\u73FE\u306B\u306F\u3001\u578B\u306E\u540D\u524D\u306B\u7D9A\u3051\u3066\u5404\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u540D\u524D\u3068\u5024\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.record_toString_doc.fullbody=\u3053\u306E\u30EC\u30B3\u30FC\u30C9\u30FB\u30AF\u30E9\u30B9\u306E\u6587\u5B57\u5217\u8868\u73FE\u3092\u8FD4\u3057\u307E\u3059\u3002\u3053\u306E\u8868\u73FE\u3067\u306F\u3001\u30AF\u30E9\u30B9\u540D\u306E\u5F8C\u306B\u3001\u5404\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u540D\u524D\u3068\u5024\u304C\u7D9A\u3044\u3066\u3044\u307E\u3059\u3002
 
 doclet.record_toString_doc.return=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u6587\u5B57\u5217\u8868\u73FE
 
@@ -281,3 +285,46 @@ doclet.record_field_doc.fullbody={0}\u30EC\u30B3\u30FC\u30C9\u30FB\u30B3\u30F3\u
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
 doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
+
+doclet.search.no_results=\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
+doclet.search.loading=\u691C\u7D22\u7D22\u5F15\u3092\u30ED\u30FC\u30C9\u4E2D...
+doclet.search.modules=\u30E2\u30B8\u30E5\u30FC\u30EB
+doclet.search.packages=\u30D1\u30C3\u30B1\u30FC\u30B8
+doclet.search.classes_and_interfaces=\u30AF\u30E9\u30B9\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+doclet.search.types=\u30BF\u30A4\u30D7
+doclet.search.members=\u30E1\u30F3\u30D0\u30FC
+doclet.search.search_tags=\u30BF\u30B0\u306E\u691C\u7D22
+
+doclet.snippet.contents.none=@snippet\u306B\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+
+doclet.snippet.contents.ambiguity.external=@snippet\u306B\u3001\u4E0D\u660E\u306A\u8907\u6570\u306E\u5916\u90E8\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
+
+doclet.snippet.region.not_found=\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "{0}"
+
+doclet.tag.attribute.value.illegal=\u5C5E\u6027"{0}"\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: "{1}"
+
+doclet.tag.attribute.value.missing=\u5C5E\u6027"{0}"\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+
+doclet.tag.attribute.repeated=\u5C5E\u6027\u304C\u7E70\u308A\u8FD4\u3055\u308C\u3066\u3044\u307E\u3059: "{0}"
+
+doclet.snippet.contents.mismatch=\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093:\n{0}
+
+doclet.snippet.markup=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7: {0}
+
+doclet.snippet.markup.spurious=\u7591\u4F3C\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7
+doclet.snippet.markup.attribute.absent=\u5C5E\u6027"{0}"\u304C\u3042\u308A\u307E\u305B\u3093
+doclet.snippet.markup.attribute.simultaneous.use=\u5C5E\u6027"{0}"\u3068"{1}"\u304C\u540C\u6642\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+doclet.snippet.markup.attribute.unexpected=\u4E88\u671F\u3057\u306A\u3044\u5C5E\u6027
+doclet.snippet.markup.attribute.value.invalid=\u7121\u52B9\u306A\u5C5E\u6027\u5024
+doclet.snippet.markup.attribute.value.unterminated=\u5C5E\u6027\u5024\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093
+doclet.snippet.markup.regex.invalid=\u6B63\u898F\u8868\u73FE\u304C\u7121\u52B9\u3067\u3059
+doclet.snippet.markup.region.duplicated=\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059
+doclet.snippet.markup.region.none=\u7D42\u4E86\u3059\u308B\u30EA\u30FC\u30B8\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
+doclet.snippet.markup.region.unpaired=\u30DA\u30A2\u306B\u306A\u3063\u3066\u3044\u306A\u3044\u30EA\u30FC\u30B8\u30E7\u30F3
+doclet.snippet.markup.tag.non.existent.lines=\u5B58\u5728\u3057\u306A\u3044\u884C\u3092\u30BF\u30B0\u304C\u53C2\u7167\u3057\u3066\u3044\u307E\u3059
+
+# 0: path
+doclet.cannot_use_snippet_path=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067''--snippet-path''\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093: {0}
+
+# 0: path; 1: exception
+doclet.error_setting_snippet_path=\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D1\u30B9{0}\u306E\u8A2D\u5B9A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
index 2a0f2b1c714..963a8763071 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
@@ -32,8 +32,6 @@ doclet.Serialized_Form=\u5E8F\u5217\u5316\u8868\u683C
 doclet.Serialized_Form_methods=\u5E8F\u5217\u5316\u65B9\u6CD5
 doclet.Serialized_Form_fields=\u5E8F\u5217\u5316\u5B57\u6BB5
 doclet.Serialized_Form_class=\u5E8F\u5217\u5316\u6982\u89C8
-doclet.Class_0_implements_serializable=\u7C7B{0}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
-doclet.Class_0_extends_implements_serializable=\u7C7B{0}\u6269\u5C55{1}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
 doclet.Option_conflict=\u9009\u9879{0}\u4E0E{1}\u51B2\u7A81
 doclet.Option_reuse=\u91CD\u590D\u4F7F\u7528\u7684\u9009\u9879: {0}
 doclet.Option_invalid={1} \u9009\u9879\u7684 {0} \u53C2\u6570\u65E0\u6548
@@ -49,6 +47,8 @@ doclet.internal.report.bug=\u5982\u679C\u5728 Bug Database (http://bugs.java.com
 doclet.File_not_found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
 doclet.Copy_Overwrite_warning=\u672A\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230 {1}, \u56E0\u4E3A\u73B0\u6709\u6587\u4EF6\u5177\u6709\u76F8\u540C\u540D\u79F0...
 doclet.Copy_Ignored_warning=\u672A\u590D\u5236\u6587\u4EF6 {0}\uFF1A\u540D\u79F0\u65E0\u6548
+doclet.Copy_snippet_to_clipboard=\u590D\u5236
+doclet.Copied_snippet_to_clipboard=\u5DF2\u590D\u5236\uFF01
 doclet.Copying_File_0_To_Dir_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u76EE\u5F55 {1}...
 doclet.Copying_File_0_To_File_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u6587\u4EF6{1}...
 doclet.No_Public_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u516C\u5171\u6216\u53D7\u4FDD\u62A4\u7684\u7C7B\u3002
@@ -78,8 +78,11 @@ doclet.not_standard_file_manager = \u65E0\u6CD5\u8BBE\u7F6E taglet \u8DEF\u5F84\
 doclet.Author=\u4F5C\u8005:
 doclet.DefaultValue=\u9ED8\u8BA4\u503C:
 doclet.PropertyDescription=\u5C5E\u6027\u8BF4\u660E:
-doclet.PropertyGetterWithName=\u83B7\u53D6\u5C5E\u6027{0}\u7684\u503C\u3002
-doclet.PropertySetterWithName=\u8BBE\u7F6E\u5C5E\u6027{0}\u7684\u503C\u3002
+doclet.PropertyGetterWithName=\u83B7\u53D6{0}\u5C5E\u6027\u7684\u503C\u3002
+doclet.PropertyGetterReturn={0} \u5C5E\u6027\u7684\u503C
+doclet.PropertySetterWithName=\u8BBE\u7F6E{0}\u5C5E\u6027\u7684\u503C\u3002
+doclet.PropertySetterParam={0} \u5C5E\u6027\u7684\u503C
+doclet.PropertyMethodReturn={0} \u5C5E\u6027
 doclet.Default=\u9ED8\u8BA4\u503C:
 doclet.Parameters=\u53C2\u6570:
 doclet.TypeParameters=\u7C7B\u578B\u53C2\u6570:
@@ -103,7 +106,6 @@ doclet.Factory=\u5DE5\u5382:
 doclet.UnknownTag={0}\u662F\u672A\u77E5\u6807\u8BB0\u3002
 doclet.UnknownTagLowercase={0}\u662F\u672A\u77E5\u6807\u8BB0 - \u9664\u4E86\u5927\u5C0F\u5199\u4E4B\u5916\u5176\u4ED6\u65B9\u9762\u4E0E\u5DF2\u77E5\u6807\u8BB0\u76F8\u540C\u3002
 doclet.noInheritedDoc=\u4F7F\u7528\u4E86 @inheritDoc, \u4F46{0}\u672A\u8986\u76D6\u6216\u5B9E\u73B0\u4EFB\u4F55\u65B9\u6CD5\u3002
-# doclet.malformed_html_link_tag=<a> tag is malformed:\n"{0}"
 doclet.tag_misuse=\u4E0D\u80FD\u5728{1}\u6587\u6863\u4E2D\u4F7F\u7528\u6807\u8BB0{0}\u3002\u53EA\u80FD\u5728\u4EE5\u4E0B\u7C7B\u578B\u7684\u6587\u6863\u4E2D\u4F7F\u7528\u8BE5\u6807\u8BB0: {2}\u3002
 doclet.Package_Summary=\u7A0B\u5E8F\u5305\u6982\u8981
 doclet.Requires_Summary=\u5FC5\u9700\u9879
@@ -116,12 +118,6 @@ doclet.Concealed_Packages_Summary=\u5DF2\u9690\u85CF
 doclet.From=\u4ECE
 doclet.Uses_Summary=\u4F7F\u7528
 doclet.Provides_Summary=\u63D0\u4F9B
-doclet.Interface_Summary=\u63A5\u53E3\u6982\u8981
-doclet.Annotation_Types_Summary=\u6CE8\u91CA\u7C7B\u578B\u6982\u8981
-doclet.Enum_Summary=\u679A\u4E3E\u6982\u8981
-doclet.Exception_Summary=\u5F02\u5E38\u9519\u8BEF\u6982\u8981
-doclet.Error_Summary=\u9519\u8BEF\u6982\u8981
-doclet.Class_Summary=\u7C7B\u6982\u8981
 doclet.Nested_Class_Summary=\u5D4C\u5957\u7C7B\u6982\u8981
 doclet.Annotation_Type_Optional_Member_Summary=\u53EF\u9009\u5143\u7D20\u6982\u8981
 doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9700\u5143\u7D20\u6982\u8981
@@ -130,32 +126,38 @@ doclet.Property_Summary=\u5C5E\u6027\u6982\u8981
 doclet.Enum_Constant_Summary=\u679A\u4E3E\u5E38\u91CF\u6982\u8981
 doclet.Constructor_Summary=\u6784\u9020\u5668\u6982\u8981
 doclet.Method_Summary=\u65B9\u6CD5\u6982\u8981
-doclet.Record_Summary=\u8BB0\u5F55\u6982\u8981
 doclet.Interfaces=\u63A5\u53E3
 doclet.Enums=\u679A\u4E3E
+doclet.EnumClasses=\u679A\u4E3E\u7C7B
+doclet.RecordClasses=\u8BB0\u5F55\u7C7B
+doclet.Related_Packages=\u76F8\u5173\u7A0B\u5E8F\u5305
 doclet.AnnotationTypes=\u6CE8\u91CA\u7C7B\u578B
-doclet.Exceptions=\u5F02\u5E38\u9519\u8BEF
-doclet.Errors=\u9519\u8BEF
+doclet.AnnotationInterfaces=\u6CE8\u91CA\u63A5\u53E3
+doclet.ExceptionClasses=\u5F02\u5E38\u9519\u8BEF\u7C7B
 doclet.Classes=\u7C7B
-doclet.packages=\u7A0B\u5E8F\u5305
-doclet.modules=\u6A21\u5757
-doclet.All_Classes=\u6240\u6709\u7C7B
+doclet.All_Classes_And_Interfaces=\u6240\u6709\u7C7B\u548C\u63A5\u53E3
 doclet.All_Superinterfaces=\u6240\u6709\u8D85\u7EA7\u63A5\u53E3:
 doclet.All_Implemented_Interfaces=\u6240\u6709\u5DF2\u5B9E\u73B0\u7684\u63A5\u53E3:
 doclet.Interface=\u63A5\u53E3
 doclet.Class=\u7C7B
 doclet.AnnotationType=\u6CE8\u91CA\u7C7B\u578B
+doclet.AnnotationInterface=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotationtype=\u6CE8\u91CA\u7C7B\u578B
+doclet.annotationinterface=\u6CE8\u91CA\u63A5\u53E3
 doclet.annotationtypes=\u6CE8\u91CA\u7C7B\u578B
+doclet.annotationinterfaces=\u6CE8\u91CA\u63A5\u53E3
 doclet.Enum=\u679A\u4E3E
+doclet.EnumClass=\u679A\u4E3E\u7C7B
 doclet.enum=\u679A\u4E3E
+doclet.enumclass=\u679A\u4E3E\u7C7B
 doclet.enums=\u679A\u4E3E
+doclet.enumclasses=\u679A\u4E3E\u7C7B
 doclet.interface=\u63A5\u53E3
-doclet.interfaces=\u63A5\u53E3
 doclet.class=\u7C7B
-doclet.classes=\u7C7B
-doclet.Record=\u8BB0\u5F55
-doclet.record=\u8BB0\u5F55
+doclet.RecordClass=\u8BB0\u5F55\u7C7B
+doclet.recordclass=\u8BB0\u5F55\u7C7B
+doclet.ExceptionClass=\u5F02\u5E38\u9519\u8BEF\u7C7B
+doclet.exceptionclass=\u5F02\u5E38\u9519\u8BEF\u7C7B
 doclet.ExportedTo=\u5DF2\u5BFC\u51FA\u5230\u6A21\u5757
 doclet.OpenedTo=\u5DF2\u6253\u5F00\u5230\u6A21\u5757
 doclet.Package_private=(\u4E13\u7528\u7A0B\u5E8F\u5305)
@@ -190,14 +192,10 @@ doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u
 doclet.value_tag_invalid_use=\u6B64\u5904\u4E0D\u80FD\u4F7F\u7528 @value \u6807\u8BB0\u3002
 doclet.dest_dir_create=\u6B63\u5728\u521B\u5EFA\u76EE\u6807\u76EE\u5F55: "{0}"
 doclet.in={1}\u4E2D\u7684{0}
-doclet.Use_Table_Summary=\u4F7F\u7528\u8868, \u5217\u8868{0}\u548C\u89E3\u91CA
-doclet.Member_Table_Summary={0}\u8868, \u5217\u8868{1}\u548C\u89E3\u91CA
-doclet.fields=\u5B57\u6BB5
 doclet.Fields=\u5B57\u6BB5
+doclet.Preview=\u9884\u89C8\u3002
 doclet.Properties=\u5C5E\u6027
-doclet.constructors=\u6784\u9020\u5668
 doclet.Constructors=\u6784\u9020\u5668
-doclet.methods=\u65B9\u6CD5
 doclet.Methods=\u65B9\u6CD5
 doclet.All_Methods=\u6240\u6709\u65B9\u6CD5
 doclet.Static_Methods=\u9759\u6001\u65B9\u6CD5
@@ -208,7 +206,6 @@ doclet.Default_Methods=\u9ED8\u8BA4\u65B9\u6CD5
 doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
 doclet.Annotation_Type_Optional_Members=\u53EF\u9009\u5143\u7D20
 doclet.Annotation_Type_Required_Members=\u6240\u9700\u5143\u7D20
-doclet.enum_constants=\u679A\u4E3E\u5E38\u91CF
 doclet.Enum_Constants=\u679A\u4E3E\u5E38\u91CF
 doclet.Nested_Classes=\u5D4C\u5957\u7C7B
 doclet.Modifier=\u9650\u5B9A\u7B26
@@ -216,6 +213,7 @@ doclet.Type=\u7C7B\u578B
 doclet.Modifier_and_Type=\u4FEE\u9970\u7B26\u548C\u7C7B\u578B
 doclet.Implementation=\u5B9E\u73B0:
 doclet.search=SEARCH:
+doclet.search_placeholder=\u641C\u7D22
 doclet.Field=\u5B57\u6BB5
 doclet.Property=\u5C5E\u6027
 doclet.Constructor=\u6784\u9020\u5668
@@ -223,6 +221,7 @@ doclet.Method=\u65B9\u6CD5
 doclet.Annotation_Type_Optional_Member=\u53EF\u9009\u5143\u7D20
 doclet.Annotation_Type_Required_Member=\u5FC5\u9700\u7684\u5143\u7D20
 doclet.Annotation_Type_Member=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
+doclet.Annotation_Interface_Member=\u6CE8\u91CA\u63A5\u53E3\u5143\u7D20
 doclet.Enum_Constant=\u679A\u4E3E\u5E38\u91CF
 doclet.Description=\u8BF4\u660E
 doclet.ConstantField=\u5E38\u91CF\u5B57\u6BB5
@@ -230,25 +229,30 @@ doclet.Value=\u503C
 doclet.linkMismatch_PackagedLinkedtoModule=\u8FDB\u884C\u6587\u6863\u5316\u7684\u4EE3\u7801\u4F7F\u7528\u4E86\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u7A0B\u5E8F\u5305\uFF0C\u4F46\u5728 {0} \u4E2D\u5B9A\u4E49\u7684\u7A0B\u5E8F\u5305\u5728\u547D\u540D\u6A21\u5757\u4E2D\u3002
 doclet.linkMismatch_ModuleLinkedtoPackage=\u8FDB\u884C\u6587\u6863\u5316\u7684\u4EE3\u7801\u4F7F\u7528\u4E86\u6A21\u5757\uFF0C\u4F46\u5728 {0} \u4E2D\u5B9A\u4E49\u7684\u7A0B\u5E8F\u5305\u5728\u672A\u547D\u540D\u6A21\u5757\u4E2D\u3002
 doclet.urlRedirected=URL {0} \u5DF2\u91CD\u5B9A\u5411\u5230 {1} \u2014 \u66F4\u65B0\u547D\u4EE4\u884C\u9009\u9879\u4EE5\u9690\u85CF\u6B64\u8B66\u544A\u3002
+doclet.duplicate.comment.for.property=\u5C5E\u6027\u6CE8\u91CA\u91CD\u590D\u3002\n\u5220\u9664\u5C5E\u6027\u5B57\u6BB5\u6216\u6B64\u65B9\u6CD5\u7684\u6CE8\u91CA\u4EE5\u9690\u85CF\u6B64\u8B66\u544A\u3002
 
 #Documentation for Enums
-doclet.enum_values_doc.fullbody=\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \n\u8FD4\u56DE\u4E00\u4E2A\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002
+doclet.enum_values_doc.fullbody=\u8FD4\u56DE\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\n\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
+doclet.enum_class_values_doc.fullbody=\u8FD4\u56DE\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\n\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
 
-doclet.enum_values_doc.return=\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F\u8FD4\u56DE\u7684\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
+doclet.enum_values_doc.return=\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
+doclet.enum_class_values_doc.return=\u5305\u542B\u8BE5\u679A\u4E3E\u7C7B\u7684\u5E38\u91CF\u7684\u6570\u7EC4\uFF0C\u987A\u5E8F\u4E0E\u58F0\u660E\u8FD9\u4E9B\u5E38\u91CF\u7684\u987A\u5E8F\u76F8\u540C
 
 doclet.enum_valueof_doc.fullbody=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)
+doclet.enum_class_valueof_doc.fullbody=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002\uFF08\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002\uFF09
 
 doclet.enum_valueof_doc.param_name=\u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002
 
 doclet.enum_valueof_doc.return=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF
 
 doclet.enum_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
+doclet.enum_class_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
 
 doclet.enum_valueof_doc.throws_npe=\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C
 
 
 #Documentation for records
-doclet.record_constructor_doc.fullbody=\u521B\u5EFA {0} \u8BB0\u5F55\u7684\u5B9E\u4F8B\u3002
+doclet.record_constructor_doc.fullbody=\u521B\u5EFA {0} \u8BB0\u5F55\u7C7B\u7684\u5B9E\u4F8B\u3002
 
 doclet.record_constructor_doc.param_name={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u503C
 
@@ -256,9 +260,9 @@ doclet.record_equals_doc.fullbody.head=\u6307\u793A\u67D0\u4E2A\u5176\u4ED6\u5BF
 
 doclet.record_equals_doc.fullbody.tail.both=\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u5BF9\u53C2\u8003\u7EC4\u4EF6\u8FDB\u884C\u6BD4\u8F83\uFF1B\u4F7F\u7528 '==' \u5BF9\u57FA\u5143\u7EC4\u4EF6\u8FDB\u884C\u6BD4\u8F83
 
-doclet.record_equals_doc.fullbody.tail.primitive=\u6B64\u8BB0\u5F55\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 '==' \u8FDB\u884C\u6BD4\u8F83\u3002
+doclet.record_equals_doc.fullbody.tail.primitive=\u6B64\u8BB0\u5F55\u7C7B\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 '==' \u8FDB\u884C\u6BD4\u8F83\u3002
 
-doclet.record_equals_doc.fullbody.tail.reference=\u6B64\u8BB0\u5F55\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u8FDB\u884C\u6BD4\u8F83\u3002
+doclet.record_equals_doc.fullbody.tail.reference=\u6B64\u8BB0\u5F55\u7C7B\u4E2D\u7684\u6240\u6709\u7EC4\u4EF6\u90FD\u4F7F\u7528 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} \u8FDB\u884C\u6BD4\u8F83\u3002
 
 doclet.record_equals_doc.param_name=\u8981\u4E0E\u4E4B\u8FDB\u884C\u6BD4\u8F83\u7684\u5BF9\u8C61
 
@@ -268,7 +272,7 @@ doclet.record_hashCode_doc.fullbody=\u8FD4\u56DE\u6B64\u5BF9\u8C61\u7684\u54C8\u
 
 doclet.record_hashCode_doc.return=\u6B64\u5BF9\u8C61\u7684\u54C8\u5E0C\u4EE3\u7801\u503C
 
-doclet.record_toString_doc.fullbody=\u8FD4\u56DE\u6B64\u8BB0\u5F55\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F\u3002\u6B64\u8868\u793A\u5F62\u5F0F\u5305\u542B\u7C7B\u578B\u7684\u540D\u79F0\uFF0C\u540E\u8DDF\u6BCF\u4E2A\u8BB0\u5F55\u7EC4\u4EF6\u7684\u540D\u79F0\u548C\u503C\u3002
+doclet.record_toString_doc.fullbody=\u8FD4\u56DE\u6B64\u8BB0\u5F55\u7C7B\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F\u3002\u6B64\u8868\u793A\u5F62\u5F0F\u5305\u542B\u7C7B\u7684\u540D\u79F0\uFF0C\u540E\u8DDF\u6BCF\u4E2A\u8BB0\u5F55\u7EC4\u4EF6\u7684\u540D\u79F0\u548C\u503C\u3002
 
 doclet.record_toString_doc.return=\u6B64\u5BF9\u8C61\u7684\u5B57\u7B26\u4E32\u8868\u793A\u5F62\u5F0F
 
@@ -281,3 +285,46 @@ doclet.record_field_doc.fullbody={0} \u8BB0\u5F55\u7EC4\u4EF6\u7684\u5B57\u6BB5\
 doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/
 doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/
 doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/
+
+doclet.search.no_results=\u672A\u627E\u5230\u7ED3\u679C
+doclet.search.loading=\u6B63\u5728\u52A0\u8F7D\u641C\u7D22\u7D22\u5F15...
+doclet.search.modules=\u6A21\u5757
+doclet.search.packages=\u7A0B\u5E8F\u5305
+doclet.search.classes_and_interfaces=\u7C7B\u548C\u63A5\u53E3
+doclet.search.types=\u7C7B\u578B
+doclet.search.members=\u6210\u5458
+doclet.search.search_tags=\u641C\u7D22\u6807\u8BB0
+
+doclet.snippet.contents.none=@snippet \u672A\u6307\u5B9A\u5185\u5BB9
+
+doclet.snippet.contents.ambiguity.external=@snippet \u6307\u5B9A\u4E86\u591A\u4E2A\u5916\u90E8\u5185\u5BB9\uFF0C\u8FD9\u4F1A\u5F15\u8D77\u6DF7\u6DC6
+
+doclet.snippet.region.not_found=\u627E\u4E0D\u5230\u533A\u57DF\uFF1A"{0}"
+
+doclet.tag.attribute.value.illegal=\u5C5E\u6027 "{0}" \u7684\u503C\u975E\u6CD5\uFF1A"{1}"
+
+doclet.tag.attribute.value.missing=\u5C5E\u6027 "{0}" \u7F3A\u5C11\u503C
+
+doclet.tag.attribute.repeated=\u91CD\u590D\u5C5E\u6027\uFF1A"{0}"
+
+doclet.snippet.contents.mismatch=\u5185\u5BB9\u4E0D\u5339\u914D\uFF1A\n{0}
+
+doclet.snippet.markup=\u7247\u6BB5\u6807\u8BB0\uFF1A{0}
+
+doclet.snippet.markup.spurious=\u865A\u5047\u6807\u8BB0
+doclet.snippet.markup.attribute.absent=\u7F3A\u5C11\u5C5E\u6027 "{0}"
+doclet.snippet.markup.attribute.simultaneous.use=\u540C\u65F6\u4F7F\u7528\u4E86\u5C5E\u6027 "{0}" \u548C "{1}"
+doclet.snippet.markup.attribute.unexpected=\u610F\u5916\u7684\u5C5E\u6027
+doclet.snippet.markup.attribute.value.invalid=\u5C5E\u6027\u503C\u65E0\u6548
+doclet.snippet.markup.attribute.value.unterminated=\u672A\u7EC8\u6B62\u7684\u5C5E\u6027\u503C
+doclet.snippet.markup.regex.invalid=\u6B63\u5219\u8868\u8FBE\u5F0F\u65E0\u6548
+doclet.snippet.markup.region.duplicated=\u91CD\u590D\u7684\u533A\u57DF
+doclet.snippet.markup.region.none=\u6CA1\u6709\u7ED3\u675F\u533A\u57DF
+doclet.snippet.markup.region.unpaired=\u533A\u57DF\u4E0D\u914D\u5BF9
+doclet.snippet.markup.tag.non.existent.lines=\u6807\u8BB0\u5F15\u7528\u4E0D\u5B58\u5728\u7684\u884C
+
+# 0: path
+doclet.cannot_use_snippet_path=\u4E0D\u80FD\u5C06 ''--snippet-path'' \u9009\u9879\u4E0E\u7ED9\u5B9A\u7684\u6587\u4EF6\u7BA1\u7406\u5668 {0} \u4E00\u8D77\u4F7F\u7528
+
+# 0: path; 1: exception
+doclet.error_setting_snippet_path=\u8BBE\u7F6E\u7247\u6BB5\u8DEF\u5F84 {0} \u65F6\u51FA\u9519\uFF1A{1}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
new file mode 100644
index 00000000000..ddd24f74484
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_de.properties
@@ -0,0 +1,95 @@
+#
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+dc.anchor.already.defined = Anker bereits definiert: "{0}"
+dc.anchor.value.missing = kein Wert f\u00FCr Anker angegeben
+dc.attr.lacks.value = Attribut hat keinen Wert
+dc.attr.not.number = Attributwert ist keine Zahl
+dc.attr.not.supported.html5 = Attribut wird in HTML5 nicht unterst\u00FCtzt: {0}
+dc.attr.obsolete = Attribut veraltet: {0}
+dc.attr.repeated = wiederholtes Attribut: {0}
+dc.attr.img.border.not.valid = Attribut "border" f\u00FCr img akzeptiert nur "0": {0}
+dc.attr.img.border.not.number = ung\u00FCltiger Wert f\u00FCr Attribut "border": {0}
+dc.attr.table.border.not.valid = Attribut "border" f\u00FCr Tabelle akzeptiert nur "" oder "1": {0}
+dc.attr.table.border.not.number = ung\u00FCltiger Wert f\u00FCr Attribut "border": {0}
+dc.attr.unknown = unbekanntes Attribut: {0}
+dc.bad.option = ung\u00FCltige Option: {0}
+dc.bad.value.for.option = ung\u00FCltiger Wert f\u00FCr Option: {0} {1}
+dc.default.constructor = Verwendung von Standardkonstruktor, der keinen Kommentar bereitstellt
+dc.empty = keine Beschreibung f\u00FCr @{0}
+dc.empty.comment = leerer Kommentar
+dc.empty.description = keine anf\u00E4ngliche Beschreibung
+dc.entity.invalid = ung\u00FCltige Entity &{0};
+dc.exception.not.thrown = Ausnahme nicht ausgel\u00F6st: {0}
+dc.exists.param = @param "{0}" wurde bereits angegeben
+dc.exists.return = @return wurde bereits angegeben
+dc.invalid.anchor = ung\u00FCltiger Name f\u00FCr Anker: "{0}"
+dc.invalid.param = ung\u00FCltige Verwendung von @param
+dc.invalid.provides = ung\u00FCltige Verwendung von @provides
+dc.invalid.return = ung\u00FCltige Verwendung von @return
+dc.invalid.summary = ung\u00FCltige Verwendung von @summary
+dc.invalid.throws = ung\u00FCltige Verwendung von @throws
+dc.invalid.uses = ung\u00FCltige Verwendung von @uses
+dc.invalid.uri = ung\u00FCltige URI: "{0}"
+dc.missing.comment = kein Kommentar
+dc.missing.param = kein @param f\u00FCr {0}
+dc.missing.return = kein @return
+dc.missing.throws = kein @throws f\u00FCr {0}
+dc.no.alt.attr.for.image = kein Attribut "alt" f\u00FCr Bild
+dc.no.summary.or.caption.for.table=keine Beschriftung f\u00FCr Tabelle
+dc.param.name.not.found = @param-Name nicht gefunden
+dc.ref.not.found = Referenz nicht gefunden
+dc.return.not.first = '{@return} nicht am Anfang der Beschreibung
+dc.service.not.found = service-type nicht gefunden
+dc.tag.code.within.code = '{@code} in <code>
+dc.tag.empty = leeres <{0}>-Tag
+dc.tag.a.within.a = {0}-Tag, das zu <a> erweitert wird, in <a>
+dc.tag.end.not.permitted = ung\u00FCltiges Endtag: </{0}>
+dc.tag.end.unexpected = unerwartetes Endtag: </{0}>
+dc.tag.heading.sequence.1 = \u00DCberschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden \u00DCberschrift: <H{1}>
+dc.tag.heading.sequence.2 = \u00DCberschrift in der falschen Reihenfolge verwendet: <{0}>, im Vergleich zur vorhergehenden \u00DCberschrift: <{1}>
+dc.tag.heading.sequence.3 = unerwartete \u00DCberschrift verwendet: <{0}>, im Vergleich zur impliziten vorhergehenden \u00DCberschrift: <H{1}>
+dc.tag.nested.not.allowed=verschachteltes Tag nicht zul\u00E4ssig: <{0}>
+dc.tag.nested.tag=verschachteltes Tag: {0}
+dc.tag.not.allowed.here = Tag hier nicht zul\u00E4ssig: <{0}>
+dc.tag.not.allowed = Element nicht zul\u00E4ssig in Dokumentationskommentaren: <{0}>
+dc.tag.not.allowed.inline.element = Blockelement nicht zul\u00E4ssig in Inlineelement <{1}>: {0}
+dc.tag.not.allowed.inline.tag = Blockelement nicht zul\u00E4ssig in @{1}: {0}
+dc.tag.not.allowed.inline.other = Blockelement hier nicht zul\u00E4ssig: {0}
+dc.tag.not.closed= Element nicht geschlossen: {0}
+dc.tag.p.in.pre= unerwartete Verwendung von <p> in <pre>-Element
+dc.tag.requires.heading = \u00DCberschrift nicht gefunden f\u00FCr </{0}>
+dc.tag.self.closing = selbstschlie\u00DFendes Element nicht zul\u00E4ssig
+dc.tag.start.unmatched = Endtag fehlt: </{0}>
+dc.tag.unknown = unbekanntes Tag: {0}
+dc.tag.not.supported.html5 = Tag nicht unterst\u00FCtzt in HTML5: {0}
+dc.text.not.allowed = Text nicht zul\u00E4ssig in <{0}>-Element
+dc.unexpected.comment=Dokumentationskommentar hier nicht erwartet
+dc.value.not.allowed.here='{@value} hier nicht zul\u00E4ssig
+dc.value.not.a.constant=Wert bezieht sich nicht auf eine Konstante
+
+dc.main.ioerror=I/O-Fehler: {0}
+dc.main.no.files.given=Keine Dateien angegeben
+dc.main.usage=Verwendung:\n    doclint [Optionen] source-files...\n\nOptionen:\n  -Xmsgs  \n    Gleich wie -Xmsgs:all\n  -Xmsgs:values\n    Gibt Kategorien von zu pr\u00FCfenden Problemen an, wobei "values"\n    eine kommagetrennte Liste ist, die Folgendes enthalten kann:\n      reference      zeigt Stellen, wo Kommentare falsche Referenzen\n                     auf Java-Quellcodeelemente enthalten\n      syntax         zeigt grundlegende Syntaxfehler in Kommentaren\n      html           zeigt Probleme bei HTML-Tags und Attributen\n      accessibility  zeigt Probleme bei der Barrierefreiheit\n      missing        zeigt Probleme aufgrund fehlender Dokumentation\n      all            alles Obengenannte\n    Stellen Sie Werten zur Negierung "-" voran\n    Kategorien k\u00F6nnen durch eine der folgenden Angaben qualifiziert werden:\n      /public /protected /package /private\n    Bei positiven Kategorien (die nicht mit "-" beginnen)\n    gilt der Qualifier f\u00FCr diese und h\u00F6here Zugriffsebenen.\n    Bei negativen Kategorien (die mit "-" beginnen)\n    gilt der Qualifier f\u00FCr diese und niedrigere Zugriffsebenen.\n    Wenn ein Qualifier fehlt, gilt die Kategorie f\u00FCr\n    alle Zugriffsebenen.\n    Beispiel: -Xmsgs:all,-syntax/private\n    So werden alle Meldungen au\u00DFer Syntaxfehlermeldungen\n    in den Dokumentkommentaren privater Methoden aktiviert.\n    Werden keine -Xmsgs-Optionen angegeben, ist der Standard\n    \u00E4quivalent zu -Xmsgs:all/protected, d.h.\n    alle Meldungen werden nur f\u00FCr gesch\u00FCtzte und \u00F6ffentliche\n    Deklarationen ausgegeben.\n  -XcheckPackage:<Packages>\n    Aktiviert oder deaktiviert Pr\u00FCfungen in bestimmten Packages.\n    <Packages> ist eine kommagetrennte Liste von Packagebezeichnern.\n    Der Packagebezeichner ist entweder ein qualifizierter Name eines Packages\n    oder ein Packagenamenspr\u00E4fix, gefolgt von ".*", das auf alle\n    Subpackages des angegebenen Packages erweitert wird. Stellen Sie dem Packagebezeichner\n     "-" voran, um Pr\u00FCfungen f\u00FCr die angegebenen Packages zu deaktivieren.\n  -stats\n    Meldet Statistiken zu den gemeldeten Problemen.\n  -h -help --help -usage -?\n    Zeigt diese Meldung an.\n\nDie folgenden Javac-Optionen werden ebenfalls unterst\u00FCtzt:\n  -bootclasspath, -classpath, -cp, -sourcepath, -Xmaxerrs, -Xmaxwarns\n\nUm doclint f\u00FCr einen Teil eines Projekts auszuf\u00FChren, stellen Sie die kompilierten Klassen f\u00FCr das\nProjekt in den Classpath (oder Boot Classpath), und geben Sie dann in der Befehlszeile\ndie zu pr\u00FCfenden Quelldateien an.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
index 3821b0eb9f8..273105b73e3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_ja.properties
@@ -29,14 +29,18 @@ dc.attr.lacks.value = \u5C5E\u6027\u306B\u5024\u304C\u3042\u308A\u307E\u305B\u30
 dc.attr.not.number = \u5C5E\u6027\u5024\u304C\u6570\u5B57\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 dc.attr.not.supported.html5 = \u5C5E\u6027\u306FHTML5\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.attr.obsolete = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-dc.attr.obsolete.use.css = \u5C5E\u6027\u306F\u5EC3\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
 dc.attr.repeated = \u7E70\u308A\u8FD4\u3055\u308C\u305F\u5C5E\u6027: {0}
-dc.attr.img.border = \u753b\u50cf\u306e\u5c5e\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
-dc.attr.table.border = \u8868\u306E\u5C5E\u6027\u30DC\u30FC\u30C0\u30FC\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u53D7\u3051\u5165\u308C\u307E\u3059\u3002\u304B\u308F\u308A\u306BCSS\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044: {0}
+dc.attr.img.border.not.valid = img\u306E\u5C5E\u6027"border"\u306F"0"\u306E\u307F\u3092\u53D7\u3051\u5165\u308C\u307E\u3059: {0}
+dc.attr.img.border.not.number = \u5C5E\u6027"border"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
+dc.attr.table.border.not.valid = \u8868\u306E\u5C5E\u6027"border"\u306F""\u307E\u305F\u306F"1"\u306E\u307F\u3092\u53D7\u3051\u5165\u308C\u307E\u3059: {0}
+dc.attr.table.border.not.number = \u5C5E\u6027"border"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059: {0}
 dc.attr.unknown = \u4E0D\u660E\u306A\u5C5E\u6027: {0}
 dc.bad.option = \u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 dc.bad.value.for.option = \u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: {0} {1}
+dc.default.constructor = \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u4F7F\u7528\u3067\u3001\u30B3\u30E1\u30F3\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 dc.empty = @{0}\u306E\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+dc.empty.comment = \u30B3\u30E1\u30F3\u30C8\u304C\u7A7A\u3067\u3059
+dc.empty.description = \u521D\u671F\u306E\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
 dc.entity.invalid = \u7121\u52B9\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3&{0};
 dc.exception.not.thrown = \u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.exists.param = @param "{0}"\u306F\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
@@ -54,7 +58,7 @@ dc.missing.param = {0}\u306E@param\u304C\u3042\u308A\u307E\u305B\u3093
 dc.missing.return = @return\u304C\u3042\u308A\u307E\u305B\u3093
 dc.missing.throws = {0}\u306E@throws\u304C\u3042\u308A\u307E\u305B\u3093
 dc.no.alt.attr.for.image = \u30A4\u30E1\u30FC\u30B8\u306E"alt"\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
-dc.no.summary.or.caption.for.table=\u8868\u306E\u8981\u7D04\u307E\u305F\u306F\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
+dc.no.summary.or.caption.for.table=\u8868\u306E\u30AD\u30E3\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093
 dc.param.name.not.found = @param name\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 dc.ref.not.found = \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 dc.return.not.first = '{@return}\u304C\u8AAC\u660E\u306E\u5148\u982D\u306B\u3042\u308A\u307E\u305B\u3093
@@ -68,6 +72,7 @@ dc.tag.heading.sequence.1 = \u6697\u9ED9\u7684\u306A\u5148\u884C\u898B\u51FA\u30
 dc.tag.heading.sequence.2 = \u524D\u306E\u898B\u51FA\u3057: <{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u898B\u51FA\u3057: <{0}>\u306E\u9806\u5E8F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
 dc.tag.heading.sequence.3 = \u6697\u9ED9\u7684\u306A\u5148\u884C\u898B\u51FA\u3057: <H{1}>\u3068\u306E\u6BD4\u8F03\u3067\u3001\u4E88\u671F\u3057\u306A\u3044\u898B\u51FA\u3057: <{0}>\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
 dc.tag.nested.not.allowed=\u30CD\u30B9\u30C8\u3057\u305F\u30BF\u30B0\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: <{0}>
+dc.tag.nested.tag=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30BF\u30B0: {0}
 dc.tag.not.allowed.here = \u3053\u3053\u3067\u306F\u30BF\u30B0\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093: <{0}>
 dc.tag.not.allowed = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u3067\u4F7F\u7528\u3067\u304D\u306A\u3044\u8981\u7D20\u3067\u3059: <{0}>
 dc.tag.not.allowed.inline.element = \u30A4\u30F3\u30E9\u30A4\u30F3\u8981\u7D20<{1}>\u5185\u3067\u4F7F\u7528\u3067\u304D\u306A\u3044\u30D6\u30ED\u30C3\u30AF\u8981\u7D20\u3067\u3059: {0}
@@ -79,7 +84,7 @@ dc.tag.requires.heading = </{0}>\u306E\u898B\u51FA\u3057\u304C\u898B\u3064\u304B
 dc.tag.self.closing = \u81EA\u5DF1\u7D42\u4E86\u8981\u7D20\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.tag.start.unmatched = \u7D42\u4E86\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093: </{0}>
 dc.tag.unknown = \u4E0D\u660E\u306A\u30BF\u30B0: {0}
-dc.tag.not.supported.html5 = \u30bf\u30b0\u306fHTML5\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093: {0}
+dc.tag.not.supported.html5 = \u30BF\u30B0\u306FHTML5\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
 dc.text.not.allowed = <{0}>\u8981\u7D20\u3067\u306F\u30C6\u30AD\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 dc.unexpected.comment=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30B3\u30E1\u30F3\u30C8\u306F\u3053\u3053\u3067\u306F\u5FC5\u8981\u3042\u308A\u307E\u305B\u3093
 dc.value.not.allowed.here='{@value}\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
index 55c2bbfa8ee..58c307c9aa6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint_zh_CN.properties
@@ -29,14 +29,18 @@ dc.attr.lacks.value = \u5C5E\u6027\u7F3A\u5C11\u503C
 dc.attr.not.number = \u5C5E\u6027\u503C\u4E0D\u662F\u6570\u5B57
 dc.attr.not.supported.html5 = \u5C5E\u6027\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301: {0}
 dc.attr.obsolete = \u5C5E\u6027\u5DF2\u8FC7\u65F6: {0}
-dc.attr.obsolete.use.css = \u5C5E\u6027\u5DF2\u8FC7\u65F6, \u8BF7\u6539\u7528 CSS: {0}
 dc.attr.repeated = \u5C5E\u6027\u91CD\u590D: {0}
-dc.attr.img.border = \u56FE\u50CF\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
-dc.attr.table.border = \u8868\u7684\u5C5E\u6027\u8FB9\u6846\u53EA\u63A5\u53D7 "" \u6216 "1", \u6539\u4E3A\u4F7F\u7528 CSS: {0}
+dc.attr.img.border.not.valid = \u56FE\u50CF\u7684\u5C5E\u6027 "border" \u53EA\u63A5\u53D7 "0"\uFF1A{0}
+dc.attr.img.border.not.number = \u5C5E\u6027 "border" \u7684\u503C\u65E0\u6548\uFF1A"{0}"
+dc.attr.table.border.not.valid = \u8868\u7684\u5C5E\u6027 "border" \u53EA\u63A5\u53D7 "" \u6216 "1"\uFF1A{0}
+dc.attr.table.border.not.number = \u5C5E\u6027 "border" \u7684\u503C\u65E0\u6548\uFF1A"{0}"
 dc.attr.unknown = \u672A\u77E5\u5C5E\u6027: {0}
 dc.bad.option = \u9009\u9879\u9519\u8BEF: {0}
 dc.bad.value.for.option = \u9009\u9879\u7684\u503C\u9519\u8BEF: {0} {1}
+dc.default.constructor = \u4F7F\u7528\u4E0D\u63D0\u4F9B\u6CE8\u91CA\u7684\u9ED8\u8BA4\u6784\u9020\u5668
 dc.empty = @{0} \u6CA1\u6709\u8BF4\u660E
+dc.empty.comment = \u7A7A\u6CE8\u91CA
+dc.empty.description = \u6CA1\u6709\u521D\u59CB\u8BF4\u660E
 dc.entity.invalid = \u5B9E\u4F53 &{0}; \u65E0\u6548
 dc.exception.not.thrown = \u672A\u629B\u51FA\u5F02\u5E38\u9519\u8BEF: {0}
 dc.exists.param = \u5DF2\u6307\u5B9A @param "{0}"
@@ -54,7 +58,7 @@ dc.missing.param = {0}\u6CA1\u6709 @param
 dc.missing.return = \u6CA1\u6709 @return
 dc.missing.throws = {0}\u6CA1\u6709 @throws
 dc.no.alt.attr.for.image = \u56FE\u50CF\u6CA1\u6709 "alt" \u5C5E\u6027
-dc.no.summary.or.caption.for.table=\u8868\u6CA1\u6709\u6982\u8981\u6216\u6807\u9898
+dc.no.summary.or.caption.for.table=\u8868\u6CA1\u6709\u6807\u9898
 dc.param.name.not.found = @param name \u672A\u627E\u5230
 dc.ref.not.found = \u627E\u4E0D\u5230\u5F15\u7528
 dc.return.not.first = '{@return} \u4E0D\u5728\u8BF4\u660E\u7684\u5F00\u5934
@@ -68,6 +72,7 @@ dc.tag.heading.sequence.1 = \u4F7F\u7528\u7684\u6807\u9898\u8D85\u51FA\u5E8F\u52
 dc.tag.heading.sequence.2 = \u4F7F\u7528\u7684\u6807\u9898\u8D85\u51FA\u5E8F\u5217\uFF1A<{0}>\uFF08\u4E0E\u524D\u4E00\u4E2A\u6807\u9898\u76F8\u6BD4\uFF1A<{1}>\uFF09
 dc.tag.heading.sequence.3 = \u4F7F\u7528\u4E86\u610F\u5916\u7684\u6807\u9898\uFF1A<{0}>\uFF08\u4E0E\u9690\u5F0F\u524D\u5BFC\u6807\u9898\u76F8\u6BD4\uFF1A<H{1}>\uFF09
 dc.tag.nested.not.allowed=\u4E0D\u5141\u8BB8\u4F7F\u7528\u5D4C\u5957\u6807\u8BB0: <{0}>
+dc.tag.nested.tag=\u5D4C\u5957\u6807\u8BB0\uFF1A{0}
 dc.tag.not.allowed.here = \u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528\u6807\u8BB0: <{0}>
 dc.tag.not.allowed = \u6587\u6863\u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5143\u7D20: <{0}>
 dc.tag.not.allowed.inline.element = \u5185\u5D4C\u5143\u7D20 <{1}> \u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u5757\u5143\u7D20: {0}
@@ -79,7 +84,7 @@ dc.tag.requires.heading = \u672A\u627E\u5230 </{0}> \u7684\u6807\u9898
 dc.tag.self.closing = \u4E0D\u5141\u8BB8\u4F7F\u7528\u81EA\u5173\u95ED\u5143\u7D20
 dc.tag.start.unmatched = \u7F3A\u5C11\u7ED3\u675F\u6807\u8BB0: </{0}>
 dc.tag.unknown = \u672A\u77E5\u6807\u8BB0: {0}
-dc.tag.not.supported.html5 = \u6807\u8BB0\u5728\u751F\u6210\u7684 HTML \u7248\u672C\u4E2D\u4E0D\u53D7\u652F\u6301: {0}
+dc.tag.not.supported.html5 = \u6807\u8BB0\u5728 HTML5 \u4E2D\u4E0D\u53D7\u652F\u6301\uFF1A{0}
 dc.text.not.allowed = <{0}> \u5143\u7D20\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u6587\u672C
 dc.unexpected.comment=\u6B64\u5904\u672A\u9884\u671F\u6587\u6863\u6CE8\u91CA
 dc.value.not.allowed.here=\u6B64\u5904\u4E0D\u5141\u8BB8\u4F7F\u7528 '{@value}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
new file mode 100644
index 00000000000..9e410603c81
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_de.properties
@@ -0,0 +1,210 @@
+#
+# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.errors={0} Fehler
+main.error={0} Fehler
+main.warnings={0} Warnungen
+main.warning={0} Warnung
+
+main.usage=Verwendung:\n    javadoc [options] [packagenames] [sourcefiles] [@files]\nmit folgenden Optionen:
+
+main.opt.at.arg=<Datei>
+main.opt.at.desc=Liest Optionen und Dateinamen aus Datei
+
+main.opt.public.desc=Zeigt nur \u00F6ffentliche Typen und Mitglieder. Zeigt bei benannten Modulen\nnur exportierte Packages und die API des Moduls.
+
+main.opt.protected.desc=Zeigt gesch\u00FCtzte/\u00F6ffentliche Typen und Mitglieder (Standard). Zeigt\nbei benannten Modulen exportierte Packages und die API des Moduls.
+
+main.opt.package.desc=Zeigt Package-/gesch\u00FCtzte/\u00F6ffentliche Typen und Mitglieder. Zeigt\nbei benannten Modulen alle Packages und alle Moduldetails.
+
+main.opt.private.desc=Zeigt alle Typen und Mitglieder. Zeigt bei benannten Modulen\nalle Packages und alle Moduldetails.
+
+main.opt.show.members.arg=<Wert>
+main.opt.show.members.desc=Gibt an, welche Mitglieder (Felder, Methoden usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt \u00F6ffentliche und gesch\u00FCtzte Mitglieder, "public" zeigt nur\n\u00F6ffentliche Mitglieder, "package" zeigt \u00F6ffentliche, gesch\u00FCtzte und\nPackagemitglieder, und "private" zeigt alle Mitglieder.
+
+main.opt.show.types.arg=<Wert>
+main.opt.show.types.desc=Gibt an, welche Typen (Klassen, Schnittstellen usw.) dokumentiert\nwerden, wobei der Wert "public", "protected",\n"package" oder "private" lauten kann. Der Standardwert ist "protected"\nund zeigt \u00F6ffentliche und gesch\u00FCtzte Typen, "public" zeigt nur\n\u00F6ffentliche Typen, "package" zeigt \u00F6ffentliche, gesch\u00FCtzte und\nPackagetypen, und "private" zeigt alle Typen.
+
+main.opt.show.packages.arg=<Wert>
+main.opt.show.packages.desc=Gibt das Modul an, dessen Packages dokumentiert werden. M\u00F6gliche\nWerte sind "exported" oder "all" (exportierte oder alle Packages).
+
+main.opt.show.module.contents.arg=<Wert>
+main.opt.show.module.contents.desc=Gibt die Dokumentationsgranularit\u00E4t von Moduldeklarationen\nan. M\u00F6gliche Werte sind "api" oder "all".
+
+main.opt.expand.requires.arg=<Wert>
+main.opt.expand.requires.desc=Anweisungen im Tool zum Erweitern des zu dokumentierenden\nModulsets. Standardm\u00E4\u00DFig werden nur die Module dokumentiert,\ndie in der Befehlszeile ausdr\u00FCcklich angegeben werden. Der Wert\n"transitive" schlie\u00DFt zus\u00E4tzlich alle "requires transitive"-Abh\u00E4ngigkeiten\nder Module ein. Der Wert "all" schlie\u00DFt\nalle Abh\u00E4ngigkeiten der Module ein.
+
+main.opt.help.desc=Zeigt die Befehlszeilenoptionen an und beendet
+
+main.opt.module.arg=<Modul>(,<Modul>)*
+main.opt.module.desc=Dokumentiert die angegebenen Module
+
+main.opt.doclet.arg=<Klasse>
+main.opt.doclet.desc=Generiert die Ausgabe \u00FCber ein alternatives Doclet
+
+main.opt.docletpath.arg=<Pfad>
+main.opt.docletpath.desc=Gibt an, wo sich Doclet-Klassendateien befinden
+
+main.opt.module.source.path.arg=<Pfad>
+main.opt.module.source.path.desc=Gib an, wo sich die Eingabequelldateien f\u00FCr mehrere Module befinden
+
+main.opt.upgrade.module.path.arg=<Pfad>
+main.opt.upgrade.module.path.desc=Setzt den Speicherort der upgradef\u00E4higen Module au\u00DFer Kraft
+
+main.opt.module.path.arg=<Pfad>
+main.opt.module.path.desc=Gibt an, wo sich die Anwendungsmodule befinden
+
+main.opt.add.modules.arg=<Modul>(,<Modul>)*
+main.opt.add.modules.desc=Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen Modulen\naufgel\u00F6st werden sollen, oder alle Module im Modulpfad,\nwenn <Modul> ALL-MODULE-PATH lautet.
+
+main.opt.limit.modules.arg=<Modul>(,<Modul>)*
+main.opt.limit.modules.desc=Begrenzt die Gesamtzahl der beobachtbaren Module
+
+main.opt.source.path.arg=<Pfad>
+main.opt.source.path.desc=Gibt an, wo sich die Quelldateien befinden
+
+main.opt.class.path.arg=<Pfad>
+main.opt.class.path.desc=Gibt an, wo sich die Benutzerklassendateien befinden
+
+main.opt.exclude.arg=<Packageliste>
+main.opt.exclude.desc=Liste der auszuschlie\u00DFenden Packages
+
+main.opt.subpackages.arg=<Subpackageliste>
+main.opt.subpackages.desc=Gibt die Subpackages an, die rekursiv geladen werden sollen
+
+main.opt.breakiterator.desc=Berechnet den ersten Satz mit BreakIterator
+
+main.opt.bootclasspath.arg=<Pfad>
+main.opt.bootclasspath.desc=Setzt den Speicherort der f\u00FCr nicht modulare Releases\nverwendeten Plattformklassendateien au\u00DFer Kraft
+
+main.opt.system.arg=<JDK>
+main.opt.system.desc=Setzt den Speicherort der f\u00FCr modulare Releases verwendeten Systemmodule au\u00DFer Kraft
+
+main.opt.release.arg=<Release>
+main.opt.release.desc=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release
+
+main.opt.source.arg=<Release>
+main.opt.source.desc=Liefert Quellkompatibilit\u00E4t mit dem angegebenen Release
+
+main.opt.enable.preview.desc=Aktiviert Vorschausprachfeatures. Wird in Verbindung\nmit -source oder --release verwendet.
+
+main.opt.extdirs.arg=<Verzeichnisliste>
+main.opt.extdirs.desc=Setzt den Speicherort der installierten Erweiterungen au\u00DFer Kraft
+
+main.opt.verbose.desc=Gibt Meldungen \u00FCber die Javadoc-Vorg\u00E4nge aus
+
+main.opt.locale.arg=<Name>
+main.opt.locale.desc=Zu verwendendes Gebietsschema, z.B. en_US oder en_US_WIN
+
+main.opt.encoding.arg=<Name>
+main.opt.encoding.desc=Quelldateicodierungsname
+
+main.opt.quiet.desc=Zeigt keine Statusmeldungen an
+
+main.opt.version.desc=Gibt Versionsinformationen aus
+
+main.opt.J.arg=<Flag>
+main.opt.J.desc=\u00DCbergibt <Flag> direkt an das Laufzeitsystem
+
+main.opt.help.extra.desc=Gibt eine Zusammenfassung nicht standardm\u00E4\u00DFiger Optionen aus und beendet
+
+main.opt.Werror.desc=Meldet einen Fehler beim Auftreten von Warnungen
+
+main.usage.foot=\nIn Optionen im GNU-Stil kann "=" statt Leerzeichen verwendet werden, um den Namen einer Option\nvon ihrem Wert zu trennen.\n
+
+main.Xusage=
+
+main.opt.Xmaxerrs.arg=<Nummer>
+main.opt.Xmaxerrs.desc=Legt die maximale Anzahl der zu auszugebenden Fehler fest
+
+main.opt.Xmaxwarns.arg=<Nummer>
+main.opt.Xmaxwarns.desc=Legt die maximale Anzahl der auszugebenden Warnungen fest
+
+main.opt.add.exports.arg=<Modul>/<Package>=<Anderes Modul>(,<Anderes Modul>)*
+main.opt.add.exports.desc=Gibt an, dass ein Package als aus seinem definierenden Modul\nin weitere Module oder, wenn <Anderes Modul> ALL-UNNAMED\nlautet, in alle unbenannten Module exportiert betrachtet werden soll
+
+main.opt.add.reads.arg=<Modul>=<Anderes Modul>(,<Anderes Modul>)*
+main.opt.add.reads.desc=Gibt weitere Module an, die als von einem angegebenen Modul angefordert\nbetrachtet werden sollen. <Anderes Modul> kann ALL-UNNAMED lauten,\num das unbenannte Modul anzufordern.
+
+main.opt.patch.module.arg=<Modul>=<Datei>(:<Datei>)*
+main.opt.patch.module.desc=Setzt ein Modul au\u00DFer Kraft oder erweitert es mit Klassen\nund Ressourcen in JAR-Dateien oder Verzeichnissen
+
+main.Xusage.foot=\nDies sind keine Standardoptionen, und sie k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.
+
+main.doclet.usage.header=\nBereitgestellt vom Doclet {0}:
+
+main.requires_argument=F\u00FCr die Option {0} ist ein Argument erforderlich.
+main.unnecessary_arg_provided=Option {0} erfordert kein Argument
+main.only_one_argument_with_equals=Syntax mit "=" kann nicht f\u00FCr Optionen verwendet werden, die mehrere Argumente erfordern
+main.invalid_flag=Ung\u00FCltiges Kennzeichen: {0}
+main.No_modules_packages_or_classes_specified=Keine Module, Packages oder Klassen angegeben.
+main.module_not_found=Modul {0} nicht gefunden
+main.module_source_not_found=Quelldateien f\u00FCr Modul {0} nicht gefunden
+main.cannot_use_sourcepath_for_modules=Quellpfad kann nicht f\u00FCr mehrere Module {0} verwendet werden
+main.module_not_found_on_sourcepath=Modul {0} in Quellpfad nicht gefunden
+main.sourcepath_does_not_contain_module=Quellpfad enth\u00E4lt nicht Modul {0}
+main.cant.read={0} kann nicht gelesen werden
+main.Loading_source_files_for_package=Quelldateien werden geladen f\u00FCr Package {0}...
+main.Loading_source_file=Quelldatei {0} wird geladen...
+main.Building_tree=Javadoc-Informationen werden erstellt...
+main.no_source_files_for_package=Keine Quelldateien f\u00FCr Package {0}
+main.package_not_found=Package {0} nicht gefunden
+main.fatal.error=schwerwiegender Fehler aufgetreten: {0}
+main.out.of.memory=java.lang.OutOfMemoryError: Erweitern Sie den Speicher.\nBeispiel: F\u00FCgen Sie bei JDK Classic- oder HotSpot-VMs die Option -J-Xmx\nhinzu, zum Beispiel -J-Xmx32m.
+main.done_in=[fertig in {0} ms]
+main.more_than_one_doclet_specified_0_and_1=Mehr als ein Doclet angegeben: ({0} und {1}).
+main.doclet_could_not_get_location=Speicherort f\u00FCr {0} konnte nicht abgerufen werden
+main.doclet_could_not_set_location=Speicherort f\u00FCr {0} konnte nicht festgelegt werden
+main.doclet_no_classloader_found=Class Loader zum Laden von {0} konnte nicht abgerufen werden
+main.could_not_instantiate_class=Klasse {0} konnte nicht instanziiert werden
+main.doclet_class_not_found=Doclet-Klasse {0} nicht gefunden
+main.malformed_locale_name=Nicht wohlgeformter Gebietsschemaname: {0}
+main.file_not_found=Datei nicht gefunden: "{0}"
+main.illegal_class_name=Ung\u00FCltiger Klassenname: "{0}"
+main.illegal_package_name=Ung\u00FCltiger Packagename: "{0}"
+main.illegal_option_value=Ung\u00FCltiger Optionswert: "{0}"
+main.file.manager.list=FileManager-Fehler beim Auflisten von Dateien: "{0}"
+main.assertion.error=Assertion-Fehler: "{0}"
+main.warnings.Werror=Warnungen gefunden und -Werror angegeben
+main.unknown.error=ein unbekannter Fehler ist aufgetreten
+main.internal.error=ein interner Fehler ist aufgetreten
+main.unexpected.exception=eine unerwartete Ausnahme wurde abgefangen: {0}
+main.unknown.option.for.filemanager=Option wird von Dateimanager nicht unterst\u00FCtzt: {0}
+main.bad.arg.for.filemanager.option=ung\u00FCltiger Wert f\u00FCr Dateimanageroption {0}: "{1}"
+doclet.internal.report.bug=Melden Sie auf der Java-Seite zum Melden von Bugs (http://bugreport.java.com) einen Bug\nf\u00FCr das javadoc-Tool, nachdem Sie in der Bugdatenbank (http://bugs.java.com) nach Duplikaten\ngesucht haben. Nehmen Sie Fehlermeldungen und die folgende Diagnose in den Bericht auf. Vielen Dank.
+main.not_a_doclet=Klasse {0} ist kein g\u00FCltiges Doclet.\nHinweis: Ab JDK 13 wird die API com.sun.javadoc nicht mehr unterst\u00FCtzt.
+
+javadoc.class_not_found=Klasse {0} nicht gefunden.
+
+javadoc.error.msg={0}: Fehler - {1}
+javadoc.warning.msg={0}: Warnung - {1}
+javadoc.note.msg = {1}
+javadoc.note.pos.msg= {0}: {1}
+javadoc.version={0} {1}
+javadoc.fullversion={0} Vollversion "{1}"
+
+javadoc.err.message={0}
+javadoc.warn.message={0}
+javadoc.note.message={0}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
index c55cdd66bfd..6afc97aa512 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -191,14 +191,20 @@ main.warnings.Werror=\u8B66\u544A\u304C\u898B\u3064\u304B\u308A-Werror\u304C\u63
 main.unknown.error=\u4E0D\u660E\u306A\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 main.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 main.unexpected.exception=\u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916\u304C\u6355\u6349\u3055\u308C\u307E\u3057\u305F: {0}
+main.unknown.option.for.filemanager=\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}
+main.bad.arg.for.filemanager.option=\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u306E\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306E\u5024\u304C\u4E0D\u6B63\u3067\u3059: "{1}"
 doclet.internal.report.bug=Bug Database (http://bugs.java.com)\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java bug\u30EC\u30DD\u30FC\u30C8\u30FB\u30DA\u30FC\u30B8\n(http://bugreport.java.com)\u3067javadoc\u30C4\u30FC\u30EB\u306B\u5BFE\u3059\u308Bbug\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\n\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u6B21\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
 main.not_a_doclet=\u30AF\u30E9\u30B9{0}\u306F\u6709\u52B9\u306A\u30C9\u30C3\u30AF\u30EC\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n\u30CE\u30FC\u30C8: JDK 13\u304B\u3089\u3001com.sun.javadoc API\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u304F\u306A\u308A\u307E\u3057\u305F\u3002
+
 javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-javadoc.error=\u30A8\u30E9\u30FC
-javadoc.warning=\u8B66\u544A
+
 javadoc.error.msg={0}: \u30A8\u30E9\u30FC - {1}
 javadoc.warning.msg={0}: \u8B66\u544A - {1}
 javadoc.note.msg = {1}
 javadoc.note.pos.msg= {0}: {1}
 javadoc.version={0} {1}
 javadoc.fullversion={0}\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"{1}"
+
+javadoc.err.message={0}
+javadoc.warn.message={0}
+javadoc.note.message={0}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
index e5927af84e4..d17a11541d5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -191,14 +191,20 @@ main.warnings.Werror=\u53D1\u73B0\u8B66\u544A, \u4F46\u6307\u5B9A\u4E86 -Werror
 main.unknown.error=\u51FA\u73B0\u672A\u77E5\u9519\u8BEF
 main.internal.error=\u51FA\u73B0\u5185\u90E8\u9519\u8BEF
 main.unexpected.exception=\u6355\u83B7\u5230\u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF: {0}
+main.unknown.option.for.filemanager=\u9009\u9879\u4E0D\u53D7\u6587\u4EF6\u7BA1\u7406\u5668\u652F\u6301\uFF1A{0}
+main.bad.arg.for.filemanager.option=\u6587\u4EF6\u7BA1\u7406\u5668\u9009\u9879 {0} \u7684\u503C\u9519\u8BEF\uFF1A"{1}"
 doclet.internal.report.bug=\u5982\u679C\u5728 Bug Database (http://bugs.java.com) \u4E2D\u6CA1\u6709\u627E\u5230\u91CD\u590D\u9879, \n\u8BF7\u901A\u8FC7 Java Bug \u62A5\u544A\u9875 (http://bugreport.java.com) \u9488\u5BF9\u8BE5 \njavadoc \u5DE5\u5177\u5EFA\u7ACB Bug\u3002\u8BF7\u5728\u62A5\u544A\u4E2D\u9644\u4E0A\u9519\u8BEF\u6D88\u606F\u548C\u4EE5\u4E0B\u8BCA\u65AD\u4FE1\u606F\u3002\u8C22\u8C22\u3002
 main.not_a_doclet=\u7C7B {0} \u4E0D\u662F\u6709\u6548 doclet\u3002\n\u6CE8\u610F\uFF1A\u4ECE JDK 13 \u5F00\u59CB\uFF0C\u4E0D\u518D\u652F\u6301 com.sun.javadoc API\u3002
+
 javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002
-javadoc.error=\u9519\u8BEF
-javadoc.warning=\u8B66\u544A
+
 javadoc.error.msg={0}: \u9519\u8BEF - {1}
 javadoc.warning.msg={0}: \u8B66\u544A - {1}
 javadoc.note.msg = {1}
 javadoc.note.pos.msg= {0}: {1}
 javadoc.version={0} {1}
 javadoc.fullversion={0}\u5B8C\u6574\u7248\u672C "{1}"
+
+javadoc.err.message={0}
+javadoc.warn.message={0}
+javadoc.note.message={0}
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
new file mode 100644
index 00000000000..4097efbad90
--- /dev/null
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_de.properties
@@ -0,0 +1,307 @@
+#
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+ONE_DAY=\ 1 Tag
+ONE_HOUR=\ 1 Stunde 
+ONE_MIN=\ 1 Min.
+ONE_MONTH=\ 1 Monat
+ONE_YEAR=\ 1 Jahr
+TWO_HOURS=\ 2 Stunden
+THREE_HOURS=\ 3 Stunden
+THREE_MONTHS=\ 3 Monate
+FIVE_MIN=\ 5 Min.
+SIX_HOURS=\ 6 Stunden
+SIX_MONTHS=\ 6 Monate
+SEVEN_DAYS=\ 7 Tage
+TEN_MIN=10 Min.
+TWELVE_HOURS=12 Stunden
+THIRTY_MIN=30 Min.
+LESS_THAN=<
+A_LOT_LESS_THAN=<<
+GREATER_THAN=>
+ACTION_CAPITALIZED=ACTION
+ACTION_INFO_CAPITALIZED=ACTION_INFO
+ALL=Alle
+ARCHITECTURE=Architektur
+ATTRIBUTE=Attribut
+ATTRIBUTE_VALUE=Attributwert
+ATTRIBUTE_VALUES=Attributwerte
+ATTRIBUTES=Attribute
+BLANK=Leer
+BLOCKED_COUNT_WAITED_COUNT=Blockiert gesamt: {0}  Gewartet gesamt: {1}\n
+BOOT_CLASS_PATH=Boot Classpath
+BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=Umschalten, um mehr oder weniger Informationen anzuzeigen
+CPU_USAGE=CPU-Auslastung
+CPU_USAGE_FORMAT=CPU-Auslastung: {0} %
+CANCEL=Abbrechen
+CASCADE=&\u00DCberlappend
+CHART_COLON=&Diagramm:
+CLASS_PATH=Classpath
+CLASS_NAME=ClassName
+CLASS_TAB_INFO_LABEL_FORMAT=<html>Geladen: {0}    Entfernt: {1}    Gesamt: {2}</html>
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr geladene Klassen.
+CLASSES=Klassen
+CLOSE=Schlie\u00DFen
+COLUMN_NAME=Name
+COLUMN_PID=PID
+COMMITTED_MEMORY=Festgeschriebener Speicher
+COMMITTED_VIRTUAL_MEMORY=Festgeschriebener virtueller Speicher
+COMMITTED=Festgeschrieben
+CONNECT=&Verbinden
+CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=Mit Java Virtual Machine verbinden
+CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld zum Herstellen einer neuen Verbindung zu einer lokalen oder Remote-Java Virtual Machine
+CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Produktleistengrafik
+CONNECT_DIALOG_MASTHEAD_TITLE=Neue Verbindung
+CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=Statusleiste
+CONNECT_DIALOG_TITLE=JConsole: Neue Verbindung
+CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=Verbunden. Klicken, um die Verbindung zu trennen.
+CONNECTION_FAILED=Verbindung nicht erfolgreich
+CONNECTION=&Verbindung
+CONNECTION_NAME=Verbindungsname
+CONNECTION_NAME__DISCONNECTED_={0} (getrennt)
+CONSTRUCTOR=Konstruktor
+CURRENT_CLASSES_LOADED=Aktuell geladene Klassen
+CURRENT_HEAP_SIZE=Aktuelle Heap-Gr\u00F6\u00DFe
+CURRENT_VALUE=Aktueller Wert: {0}
+CREATE=Erstellen
+DAEMON_THREADS=Daemon-Threads
+DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=Getrennt. Zum Verbinden klicken.
+DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=Zum Ein-/Ausblenden doppelklicken
+DOUBLE_CLICK_TO_VISUALIZE=Zum Visualisieren doppelklicken
+DESCRIPTION=Beschreibung
+DESCRIPTOR=Deskriptor
+DETAILS=Details
+DETECT_DEADLOCK=&Deadlock ermitteln
+DETECT_DEADLOCK_TOOLTIP=Sich gegenseitig blockierende Threads erkennen
+DIMENSION_IS_NOT_SUPPORTED_COLON=Dimension wird nicht unterst\u00FCtzt:
+DISCARD_CHART=Diagramm verwerfen
+DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} Tag |1.0<{0,number,integer} Tage }{1,choice,0<{1,number,integer} Stunden |1#{1,number,integer} Stunde |1<{1,number,integer} Stunden }{2,choice,0<{2,number,integer} Minuten|1#{2,number,integer} Minute|1.0<{2,number,integer} Minuten}
+DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} Stunde |1<{0,number,integer} Stunden }{1,choice,0<{1,number,integer} Minuten|1#{1,number,integer} Minute|1.0<{1,number,integer} Minuten}
+DURATION_MINUTES={0,choice,1#{0,number,integer} Minute|1.0<{0,number,integer} Minuten}
+DURATION_SECONDS={0} Sekunden
+EMPTY_ARRAY=Leeres Array
+ERROR=Fehler
+ERROR_COLON_MBEANS_ALREADY_EXIST=Fehler: MBeans sind bereits vorhanden
+ERROR_COLON_MBEANS_DO_NOT_EXIST=Fehler: MBeans sind nicht vorhanden
+EVENT=Ereignis
+EXIT=B&eenden
+FAIL_TO_LOAD_PLUGIN=Warnung: Fehler beim Laden von Plug-in: {0}
+FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=Abbrechen
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>Datei ist bereits vorhanden:<br>{0}<br>M\u00F6chten Sie sie ersetzen?
+FILE_CHOOSER_FILE_EXISTS_OK_OPTION=Ersetzen
+FILE_CHOOSER_FILE_EXISTS_TITLE=Datei vorhanden
+FILE_CHOOSER_SAVED_FILE=<html>Gespeichert in Datei:<br>{0}<br>({1} Byte)
+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>Speichern in Datei nicht erfolgreich:<br>{0}<br>{1}
+FILE_CHOOSER_SAVE_FAILED_TITLE=Speichern nicht erfolgreich
+FREE_PHYSICAL_MEMORY=Freier physischer Speicher
+FREE_SWAP_SPACE=Freier Swap-Bereich
+GARBAGE_COLLECTOR=Garbage Collector
+GC_INFO=Name = "{0}", Collections = {1,choice,-1#Unavailable|0#{1,number,integer}}, Insgesamt aufgewendete Zeit = {2}
+GC_TIME=GC-Zeit
+GC_TIME_DETAILS={0} f\u00FCr {1} ({2} Collections)
+HEAP_MEMORY_USAGE=Heap-Nutzung
+HEAP=Heap
+HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld mit Informationen zu den Versionen von JConsole und JDK
+HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole-Version:<br>{0}
+HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM-Version:<br>{0}
+HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Produktleistengrafik
+HELP_ABOUT_DIALOG_MASTHEAD_TITLE=Info zu JConsole
+HELP_ABOUT_DIALOG_TITLE=JConsole: Info
+HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://www.oracle.com/pls/topic/lookup?ctx=javase{0}&&id=using_jconsole
+HELP_MENU_ABOUT_TITLE=&Info zu JConsole
+HELP_MENU_USER_GUIDE_TITLE=Online-&Benutzerdokumentation
+HELP_MENU_TITLE=&Hilfe
+HOTSPOT_MBEANS_ELLIPSIS=&Hotspot-MBeans...
+HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=Dialogfeld zum Verwalten von Hotspot-MBeans
+IMPACT=Auswirkung
+INFO=Information
+INFO_CAPITALIZED=INFO
+INSECURE=Unsichere Verbindung
+INVALID_PLUGIN_PATH=Warnung: Ung\u00FCltiger Plug-in-Pfad: {0}
+INVALID_URL=Ung\u00FCltige URL: {0}
+IS=Ist
+JAVA_MONITORING___MANAGEMENT_CONSOLE=Java-Monitoring- und Managementkonsole
+JCONSOLE_COLON_=JConsole: {0}
+JCONSOLE_VERSION=JConsole-Version "{0}"
+JCONSOLE_ACCESSIBLE_DESCRIPTION=Java-Monitoring- und Managementkonsole
+JIT_COMPILER=JIT-Compiler
+LIBRARY_PATH=Library-Pfad
+LIVE_THREADS=Livethreads
+LOADED=Geladen
+LOCAL_PROCESS_COLON=&Lokaler Prozess:
+MASTHEAD_FONT=Dialog-PLAIN-25
+MANAGEMENT_NOT_ENABLED=<b>Hinweis</b>: Der Management Agent ist f\u00FCr diesen Prozess nicht aktiviert.
+MANAGEMENT_WILL_BE_ENABLED=<b>Hinweis</b>: Der Management Agent wird f\u00FCr diesen Prozess aktiviert.
+MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
+MBEAN_INFO=MBeanInfo
+MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
+MBEAN_OPERATION_INFO=MBeanOperationInfo
+MBEANS=MBeans
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=L\u00F6s&chen
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=Benachrichtigungen l\u00F6schen
+MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=Composite-Datennavigation {0}/{1}
+MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=Composite-Datennavigation
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=Ak&tualisieren
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=Attribute aktualisieren
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=&Abonnieren
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=Listening auf Benachrichtigungen starten
+MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=Tabellendatennavigation {0}/{1}
+MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=Tabellendatennavigation
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=Abonnement &k\u00FCndigen
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=Listening auf Benachrichtigungen stoppen
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot-MBeans verwalten in:
+MAX=Max.
+MAXIMUM_HEAP_SIZE=Maximale Heap-Gr\u00F6\u00DFe
+MEMORY=Arbeitsspeicher
+MEMORY_POOL_LABEL=Memory-Pool "{0}"
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr Heap.
+MEMORY_TAB_INFO_LABEL_FORMAT=<html>Belegt: {0}    Festgeschrieben: {1}    Max: {2}</html>
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr Nicht-Heap.
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=was \u00FCber dem Schwellenwert {0} liegt.\n
+MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=Memory-Poolbelegungsdiagramm.
+MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=was unter dem Schwellenwert {0} liegt.\n
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME=Speicherbelegungsdiagramm f\u00FCr {0}.
+MESSAGE=Meldung
+METHOD_SUCCESSFULLY_INVOKED=Methode erfolgreich aufgerufen
+MINIMIZE_ALL=Alle &minimieren
+MONITOR_LOCKED=\   - {0} gesperrt\n
+NAME=Name
+NAME_AND_BUILD={0} (Build {1})
+NAME_STATE=Name: {0}\nStatus: {1}\n
+NAME_STATE_LOCK_NAME=Name: {0}\nStatus: {1} auf {2}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=Name: {0}\nStatus: {1} auf {2}, Eigent\u00FCmer: {3}\n
+NEW_CONNECTION_ELLIPSIS=&Neue Verbindung...
+NO_DEADLOCK_DETECTED=Kein Deadlock ermittelt
+NON_HEAP_MEMORY_USAGE=Nicht-Heap-Speicherauslastung
+NON_HEAP=Nicht-Heap
+NOTIFICATION=Benachrichtigung
+NOTIFICATION_BUFFER=Benachrichtigungspuffer
+NOTIFICATIONS=Benachrichtigungen
+NOTIF_TYPES=NotifTypes
+NUMBER_OF_THREADS=Anzahl Threads
+NUMBER_OF_LOADED_CLASSES=Anzahl geladene Klassen
+NUMBER_OF_PROCESSORS=Anzahl Prozessoren
+OBJECT_NAME=ObjectName
+OPERATING_SYSTEM=Betriebssystem
+OPERATION=Vorgang
+OPERATION_INVOCATION=Vorgangsaufruf
+OPERATION_RETURN_VALUE=R\u00FCckgabewert von Vorgang
+OPERATIONS=Vorg\u00E4nge
+OVERVIEW=\u00DCberblick
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr {0}.
+PARAMETER=Parameter
+PASSWORD_ACCESSIBLE_NAME=Kennwort
+PASSWORD_COLON_=&Kennwort:
+PEAK=Spitze
+PERFORM_GC=&GC ausf\u00FChren
+PERFORM_GC_TOOLTIP=Garbage Collection anfordern
+PLOTTER_ACCESSIBLE_NAME=Diagramm
+PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
+PLOTTER_ACCESSIBLE_NAME_NO_DATA=Keine Daten dargestellt.
+PLOTTER_SAVE_AS_MENU_ITEM=Daten speichern &unter...
+PLOTTER_TIME_RANGE_MENU=&Zeitraum
+PLUGIN_EXCEPTION_DIALOG_BUTTON_EXIT=Beenden
+PLUGIN_EXCEPTION_DIALOG_BUTTON_IGNORE=Ignorieren
+PLUGIN_EXCEPTION_DIALOG_BUTTON_OK=OK
+PLUGIN_EXCEPTION_DIALOG_MESSAGE=Eine unerwartete Ausnahme ist aufgetreten in %s:\n\n%s\n\nBeginnen Sie mit -debug, um Details aufzurufen. Durch Ignorieren werden zuk\u00FCnftige Ausnahmen unterdr\u00FCckt.
+PLUGIN_EXCEPTION_DIALOG_TITLE=Plug-in-Ausnahme
+PROBLEM_ADDING_LISTENER=Problem beim Hinzuf\u00FCgen von Listener
+PROBLEM_DISPLAYING_MBEAN=Problem beim Anzeigen von MBean
+PROBLEM_INVOKING=Problem beim Aufrufen
+PROBLEM_REMOVING_LISTENER=Problem beim Entfernen von Listener
+PROBLEM_SETTING_ATTRIBUTE=Problem beim Festlegen von Attribut
+PROCESS_CPU_TIME=Prozess-CPU-Zeit
+READABLE=Lesbar
+RECONNECT=Erneut verbinden
+REMOTE_PROCESS_COLON=&Remoteprozess:
+REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=Remoteprozess
+RESTORE_ALL=&Alle wiederherstellen
+RETURN_TYPE=ReturnType
+SEQ_NUM=SeqNum
+SIZE_BYTES={0,number,integer} Byte
+SIZE_GB={0} GB
+SIZE_KB={0} KB
+SIZE_MB={0} MB
+SOURCE=Quelle
+STACK_TRACE=\nStacktrace: \n
+SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
+SUMMARY_TAB_PENDING_FINALIZATION_LABEL=Beenden ausstehend
+SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0} Objekte
+SUMMARY_TAB_TAB_NAME=VM-\u00DCbersicht
+SUMMARY_TAB_VM_VERSION={0} Version {1}
+THREADS=Threads
+THREAD_TAB_INFO_LABEL_FORMAT=<html>Live: {0}    Spitze: {1}    Gesamt: {2}</html>
+THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=Threadinformationen
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Diagramm f\u00FCr Threadanzahl.
+THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[Kein Thread ausgew\u00E4hlt]
+THRESHOLD=Schwellenwert
+TILE=&Nebeneinander
+TIME_RANGE_COLON=&Zeitraum:
+TIME=Zeit
+TIME_STAMP=TimeStamp
+TOTAL_LOADED=Insgesamt geladen
+TOTAL_CLASSES_LOADED=Insgesamt geladene Klassen
+TOTAL_CLASSES_UNLOADED=Insgesamt entfernte Klassen
+TOTAL_COMPILE_TIME=Gesamte Kompilierungszeit
+TOTAL_PHYSICAL_MEMORY=Physischer Gesamtspeicher
+TOTAL_THREADS_STARTED=Insgesamt gestartete Threads
+TOTAL_SWAP_SPACE=Gesamter Swap-Bereich
+TYPE=Typ
+UNAVAILABLE=Nicht verf\u00FCgbar
+UNKNOWN_CAPITALIZED=UNKNOWN
+UNKNOWN_HOST=Unbekannter Host: {0}
+UNREGISTER=Registrierung aufheben
+UPTIME=Betriebszeit
+USAGE_THRESHOLD=Auslastungsschwellenwert
+REMOTE_TF_USAGE=<b>Verwendung</b>: &&lt;hostname&&gt;:&&lt;port&&gt; ODER service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
+USED=Verwendet
+USERNAME_COLON_=&Benutzername:
+USERNAME_ACCESSIBLE_NAME=Benutzername
+USER_DATA=UserData
+VIRTUAL_MACHINE=Virtuelle Maschine
+VM_ARGUMENTS=VM-Argumente
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Innerer Frame f\u00FCr die \u00DCberwachung einer Java Virtual Machine
+VALUE=Wert
+VENDOR=Hersteller
+VERBOSE_OUTPUT=Verbose-Ausgabe
+VERBOSE_OUTPUT_TOOLTIP=Verbose-Ausgabe f\u00FCr Klassenladesystem aktivieren
+VIEW=Ansicht
+WINDOW=&Fenster
+WINDOWS=Windows
+WRITABLE=Nicht schreibgesch\u00FCtzt
+CONNECTION_FAILED1=Die Verbindung konnte nicht hergestellt werden: Wiederholen?
+CONNECTION_FAILED2=Die Verbindung {0} war nicht erfolgreich.<br>M\u00F6chten Sie den Vorgang wiederholen?
+CONNECTION_FAILED_SSL1=Sichere Verbindung war nicht erfolgreich. Unsichere Verbindung versuchen?
+CONNECTION_FAILED_SSL2=Die Verbindung {0} konnte \u00FCber SSL nicht hergestellt werden.<br>M\u00F6chten Sie die Verbindung ohne SSL versuchen?<br>(Benutzername und Kennwort werden im Klartext \u00FCbermittelt.)
+CONNECTION_LOST1=Verbindung unterbrochen: Erneut verbinden?
+CONNECTING_TO1=Verbindung mit {0}
+CONNECTING_TO2=Sie werden gegenw\u00E4rtig mit {0} verbunden.<br>Dies wird einige Sekunden dauern.
+DEADLOCK_TAB=Deadlock
+DEADLOCK_TAB_N=Deadlock {0}
+EXPAND=einblenden
+KBYTES={0} KB
+PLOT=Darstellung
+VISUALIZE=Visualisieren
+ZZ_USAGE_TEXT=Verwendung: {0} [ -interval=n ] [ -notile ] [ -pluginpath <Pfad> ] [ -version ] [ connection ... ]\n\n  -interval   Legt ein Aktualisierungsintervall von n Sekunden fest (der Standardwert ist 4 Sekunden)\n  -notile     Ordnet die Fenster anfangs nicht nebeneinander an (bei zwei oder mehr Verbindungen)\n  -pluginpath Gibt den Pfad an, in dem jconsole die Plug-ins sucht\n  -version    Gibt die Programmversion aus\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         Prozess-ID eines Zielprozesses\n  host        Name oder IP-Adresse eines Remotehosts\n  port        Portnummer f\u00FCr die Remoteverbindung\n\n  -J          Gibt die Eingabeargumente f\u00FCr die Java Virtual Machine an,\n              auf der jconsole ausgef\u00FChrt wird
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
index 529a5787c23..00aee7806de 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
@@ -171,7 +171,7 @@ MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u8868\u683C\u5F0F\u6570\u636E\u5BFC\u822
 MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u8868\u683C\u5F0F\u6570\u636E\u5BFC\u822A
 MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u53D6\u6D88\u8BA2\u9605(&U)
 MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u505C\u6B62\u76D1\u542C\u901A\u77E5
-MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean:
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean: 
 MAX=\u6700\u5927\u503C
 MAXIMUM_HEAP_SIZE=\u6700\u5927\u5806\u5927\u5C0F
 MEMORY=\u5185\u5B58
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
new file mode 100644
index 00000000000..4114d8e90a1
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_de.properties
@@ -0,0 +1,105 @@
+#
+# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+err.prefix=Fehler:
+
+err.bad.constant.pool=Fehler beim Lesen von Konstantenpool f\u00FCr {0}: {1}
+err.class.not.found=Klasse nicht gefunden: {0}
+err.crash=Ein schwerwiegender interner Fehler ist aufgetreten: {0}\nMelden Sie einen Bug mit den folgenden Informationen:\n{1}
+err.end.of.file=unerwartetes Dateiende beim Lesen von {0}
+err.file.not.found=Datei nicht gefunden: {0}
+err.incompatible.options=ung\u00FCltige Optionenkombination: {0}
+err.internal.error=interner Fehler: {0} {1} {2}
+err.invalid.arg.for.option=ung\u00FCltiges Argument f\u00FCr Option: {0}
+err.ioerror=I/O-Fehler beim Lesen von {0}: {1}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.no.classes.specified=keine Klassen angegeben
+err.not.standard.file.manager=Klassendateien k\u00F6nnen nur angegeben werden, wenn ein Standarddateimanager verwendet wird
+err.invalid.use.of.option=ung\u00FCltige Verwendung von Option: {0}
+err.unknown.option=unbekannte Option: {0}
+err.no.SourceFile.attribute=kein SourceFile-Attribut
+err.source.file.not.found=Quelldatei nicht gefunden
+err.bad.innerclasses.attribute=ung\u00FCltiges InnerClasses-Attribut f\u00FCr {0}
+err.nomem=Nicht gen\u00FCgend Speicher. Verwenden Sie die Option -J-Xmx zum Erweitern des Speichers.
+err.cant.find.module=Modul {0} nicht gefunden
+err.cant.find.module.ex=Problem beim Auffinden von Modul {0}: {1}
+err.only.for.launcher=Diese Option kann nur verwendet werden, wenn javap \u00FCber den Befehlszeilen-Launcher aufgerufen wird.
+err.fatal.err=Schwerwiegender Fehler: {0}
+
+main.usage.summary=Verwendung: {0} <Optionen> <Klassen>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+warn.prefix=Warnung:
+warn.unexpected.class=Datei {0} enth\u00E4lt nicht die Klasse {1}
+
+note.prefix=Hinweis:
+
+main.usage=Verwendung: {0} <Optionen> <Klassen>\nwobei folgende Optionen m\u00F6glich sind:
+
+
+main.opt.help=\  --help -help -h -?               Gibt diese Hilfemeldung aus
+
+main.opt.version=\  -version                         Versionsinformationen
+
+main.opt.v=\  -v  -verbose                     Gibt zus\u00E4tzliche Informationen aus
+
+main.opt.l=\  -l                               Gibt die Zeilennummer und lokale Variablentabellen aus
+
+main.opt.public=\  -public                          Zeigt nur \u00F6ffentliche Klassen und Mitglieder
+
+main.opt.protected=\  -protected                       Zeigt gesch\u00FCtzte/\u00F6ffentliche Klassen und Mitglieder
+
+main.opt.package=\  -package                         Zeigt Package/gesch\u00FCtzte/\u00F6ffentliche Klassen\n                                   und Mitglieder (Standard)
+
+main.opt.p=\  -p  -private                     Zeigt alle Klassen und Mitglieder
+
+main.opt.c=\  -c                               Disassembliert den Code
+
+main.opt.s=\  -s                               Gibt Signaturen vom Typ "intern" aus
+
+main.opt.class_path=\  --class-path <Pfad>              Gibt an, wo sich Benutzerklassendateien befinden
+
+main.opt.classpath=\  -classpath <Pfad>                Gibt an, wo sich Benutzerklassendateien befinden
+
+main.opt.cp=\  -cp <Pfad>                       Gibt an, wo sich Benutzerklassendateien befinden
+
+main.opt.bootclasspath=\  -bootclasspath <Pfad>            Setzt den Speicherort von Bootstrap-Klassendateien au\u00DFer Kraft
+
+main.opt.upgrade_module_path=\  --upgrade-module-path <Pfad>     Gibt an, wo sich die upgradef\u00E4higen Module befinden
+
+main.opt.system=\  --system <JDK>                   Gibt an, wo sich die Systemmodule befinden
+
+main.opt.module_path=\  --module-path <Pfad>             Gibt an, wo sich die Anwendungsmodule befinden
+
+main.opt.multi_release=\  --multi-release <version>        Gibt die Version an, die in Multi-Release-JAR-Dateien verwendet werden soll
+
+main.opt.constants=\  -constants                       Zeigt die endg\u00FCltigen Konstanten
+
+main.opt.sysinfo=\  -sysinfo                         Zeigt die Systeminformationen (Pfad, Gr\u00F6\u00DFe, Datum, SHA-256-Hash)\n                                   der Klasse, die verarbeitet wird
+
+main.opt.module=\  --module <Modul>, -m <Modul>   Zeigt das Modul, das die zu disassemblierenden Klassen enth\u00E4lt
+
+main.opt.J=\  -J<vm-option>                    Gibt eine VM-Option an
+
+main.usage.foot=\nF\u00FCr Optionen im GNU-Stil kann "=" statt Leerzeichen verwendet werden, um den Namen einer Option\nvon ihrem Wert zu trennen.\n\nJede zu zeigende Klasse kann durch einen Dateinamen, eine URL oder durch ihren vollst\u00E4ndig\nqualifizierten Klassennamen angegeben werden. Beispiele:\n   path/to/MyClass.class\n   jar:file:///path/to/MyJar.jar!/mypkg/MyClass.class\n   java.lang.Object\n
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
index 4f1c2b82f42..c45dfdbe7a8 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u75
 warn.prefix=\u8B66\u544A:
 warn.unexpected.class=\u30D5\u30A1\u30A4\u30EB{0}\u306B\u30AF\u30E9\u30B9{1}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
 
-note.prefix=\u6CE8:
+note.prefix=\u30CE\u30FC\u30C8:
 
 main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:
 
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
index 59713c46486..b803c6b6210 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
new file mode 100644
index 00000000000..350f3b5ca4e
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/resources/jdeprscan_de.properties
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.usage=Verwendung: jdeprscan [Optionen] ''{dir|jar|class}'' ...\n\nOptionen:\n        --class-path PATH\n        --for-removal\n        --full-version\n  -? -h --help\n  -l    --list\n        --release {0}\n  -v    --verbose\n        --version
+
+main.help=Scannt jedes Argument auf die Verwendung veralteter APIs. Ein Argument\nkann ein Verzeichnis, das die Root einer Packagehierarchie angibt,\neine JAR-Datei, eine Klassendatei oder ein Klassenname sein. Der Klassenname\nmuss durch einen vollst\u00E4ndig qualifizierten Klassennamen mit $ als Trennzeichen\nf\u00FCr verschachtelte Klassen angegeben werden. Beispiel:\n\n    java.lang.Thread$State\n\nDie Option --class-path liefert einen Suchpfad f\u00FCr die Aufl\u00F6sung\nvon abh\u00E4ngigen Klassen.\n\nDie Option --for-removal begrenzt das Scannen oder Auflisten auf APIs, die veraltet sind\nund entfernt werden sollen. Kann nicht mit den Releasewerten 6, 7, oder 8 verwendet werden.\n\nDie Option --full-version gibt die vollst\u00E4ndige Versionszeichenfolge des Tools aus.\n\nDie Option --help (-? -h) gibt eine vollst\u00E4ndige Hilfemeldung aus.\n\nDie Option --list (-l) gibt die Gruppe der veralteten APIs aus. Es wird nicht gescannt,\ndaher d\u00FCrfen keine Verzeichnis-, JAR- oder Klassenargumente angegeben werden.\n\nDie Option --release gibt das Java SE-Release an, das die Gruppe\nder veralteten APIS zum Scannen liefert.\n\nDie Option --verbose (-v) aktiviert die Ausgabe zus\u00E4tzlicher Meldungen w\u00E4hrend der Verarbeitung.\n\nDie Option --version gibt die verk\u00FCrzte Versionszeichenfolge des Tools aus.
+
+main.xhelp=Nicht unterst\u00FCtzte Optionen:\n\n  --Xload-class CLASS\n      L\u00E4dt Veraltungsinformationen aus der benannten Klasse.\n  --Xload-csv CSVFILE\n      L\u00E4dt Veraltungsinformationen aus der benannten CSV-Datei.\n  --Xload-dir DIR\n      L\u00E4dt Veraltungsinformationen aus der Klassenhierarchie\n      im benannten Verzeichnis.\n  --Xload-jar JARFILE\n      L\u00E4dt Veraltungsinformationen aus der benannten JAR-Datei.\n  --Xload-jdk9 JAVA_HOME\n      L\u00E4dt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das ein modulares JDK sein muss.\n  --Xload-old-jdk JAVA_HOME\n      L\u00E4dt Veraltungsinformationen aus dem JDK in\n      JAVA_HOME, das kein modulares JDK sein darf. Stattdessen\n      muss das benannte JDK ein "klassisches" JDK mit einer rt.jar-Datei sein.\n  --Xload-self\n      L\u00E4dt Veraltungsinformationen durch Traversieren des jrt:-\n      Dateisystems des ausgef\u00FChrten JDK-Images.\n  --Xcompiler-arg ARG\n      F\u00FCgt ARG der Liste der Compilerargumente hinzu.\n  --Xcsv-comment COMMENT\n      F\u00FCgt COMMENT als Kommentarzeile der CSV-Ausgabedatei hinzu.\n      Nur effektiv, wenn auch -Xprint-csv angegeben wird.\n  --Xhelp\n      Gibt diese Meldung aus.\n  --Xprint-csv\n      Gibt eine CSV-Datei aus, welche die geladenen Veraltungsinformationen enth\u00E4lt,\n      statt Klassen oder JAR-Dateien zu scannen.
+
+scan.process.class=Klasse {0} wird verarbeitet...
+
+# The "removal tag": empty for normal deprecations,
+# nonempty for removal deprecations; do not translate.
+scan.dep.normal=
+scan.dep.removal=(forRemoval=true)
+
+scan.err.exception=Fehler: unerwartete Ausnahme {0}
+scan.err.noclass=Fehler: Klasse {0} nicht gefunden
+scan.err.nofile=Fehler: Datei {0} nicht gefunden
+
+# 0: class name, 1: method name, 2: parameter and return types
+scan.err.nomethod=Fehler: Methodref {0}.{1}:{2} kann nicht aufgel\u00F6st werden
+
+scan.head.jar=JAR-Datei {0}:
+scan.head.dir=Verzeichnis {0}:
+
+# In all of the messages below, 0 and 1 are as follows:
+#   0: type kind (class, interface, enum, or annotation type)
+#   1: type name
+# The last element is generally a "removal tag"; see above.
+
+# 2: class name, 3: removal tag
+scan.out.extends={0} {1} erweitert die veraltete Klasse {2} {3}
+
+# 2: interface name, 3: removal tag
+scan.out.implements={0} {1} implementiert die veraltete Schnittstelle {2} {3}
+
+# 2: class name, 3: removal tag
+scan.out.usesclass={0} {1} verwendet die veraltete Klasse {2} {3}
+
+# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
+scan.out.usesmethod={0} {1} verwendet die veraltete Methode {2}::{3}{4} {5}
+
+# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
+scan.out.usesintfmethod={0} {1} verwendet die veraltete Methode {2}::{3}{4} {5}
+
+# 2: class name, 3: field name, 4: removal tag
+scan.out.usesfield={0} {1} verwendet das veraltete Feld {2}::{3} {4}
+
+# 2: field name, 3: type name, 4: removal tag
+scan.out.hasfield={0} {1} hat den Feldnamen {2} des veralteten Typs {3} {4}
+
+# 2: method name, 3: parameter type, 4: removal tag
+scan.out.methodparmtype={0} {1} hat eine Methode namens {2} mit dem veralteten Parametertyp {3} {4}
+
+# 2: method name, 3: return type, 4: removal tag
+scan.out.methodrettype={0} {1} hat eine Methode namens {2} mit dem veralteten R\u00FCckgabetyp {3} {4}
+
+# 2: class name, 3: method name, 4: method parameter and return types, 5: removal tag
+scan.out.methodoverride={0} {1} setzt die veraltete Methode {2}::{3}{4} {5} au\u00DFer Kraft
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
new file mode 100644
index 00000000000..2a44e4c660c
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_de.properties
@@ -0,0 +1,131 @@
+#
+# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.usage.summary=Verwendung: {0} <Optionen> <Pfad ...>]\nmit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+main.usage=Verwendung: {0} <Optionen> <Pfad ...>]\n<Pfad> kann ein Pfad zu einer Klassendatei, einem Verzeichnis oder einer JAR-Datei sein.\n\nM\u00F6gliche Optionen:
+
+error.prefix=Fehler:
+warn.prefix=Warnung:
+
+main.opt.h=\  -h -? --help                  Gibt diese Hilfemeldung aus
+
+main.opt.version=\  -version --version            Versionsinformationen
+
+main.opt.v=\  -v       -verbose             Gibt alle Abh\u00E4ngigkeiten auf Klassenebene aus\n                                \u00C4quivalent zu -verbose:class -filter:none.\n  -verbose:package              Gibt standardm\u00E4\u00DFig Abh\u00E4ngigkeiten auf Packageebene, ausgenommen\n                                Abh\u00E4ngigkeiten innerhalb eines Packages, aus\n  -verbose:class                Gib standardm\u00E4\u00DFig Abh\u00E4ngigkeiten auf Klassenebene, ausgenommen\n                                Abh\u00E4ngigkeiten innerhalb einer Klasse, aus
+
+main.opt.s=\  -s       -summary             Gibt nur die Abh\u00E4ngigkeits\u00FCbersicht aus.
+
+main.opt.f=\  -f <Regex> -filter <Regex>    Filtert Abh\u00E4ngigkeiten nach dem angegebenen\n                                Muster. Bei Angabe mehrerer Muster wird das\n                                letzte Muster verwendet.\n  -filter:package               Filtert Abh\u00E4ngigkeiten innerhalb eines Packages.\n                                Dies ist die Standardoption.\n  -filter:archive               Filtert Abh\u00E4ngigkeiten innerhalb eines Archivs.\n  -filter:module                Filtert Abh\u00E4ngigkeiten innerhalb eines Moduls.\n  -filter:none                  Kein Filtern nach -filter:package oder -filter:archive\n                                Die mit der Option -filter angegebene Filterung\n                                wird jedoch angewendet.\n
+main.opt.p=\nOptionen zum Filtern von Abh\u00E4ngigkeiten:\n  -p <Pkg>\n  -package <Pkg>\n  --package <Pkg>               Findet Abh\u00E4ngigkeiten, die mit dem angegebenen\n                                Packagenamen \u00FCbereinstimmen (kann mehrfach angegeben werden).
+
+main.opt.e=\  -e <Regex>\n  -regex <Regex>\n  --regex <Regex>               Findet Abh\u00E4ngigkeiten, die dem angegebenen Muster entsprechen.
+
+main.opt.require=\  --require <Modulname>       Findet Abh\u00E4ngigkeiten, die dem angegebenen Modulnamen\n                                entsprechen (kann mehrfach angegeben werden). --package,\n                                --regex, --require schlie\u00DFen sich gegenseitig aus.
+
+main.opt.missing-deps=\  --missing-deps                Findet fehlende Abh\u00E4ngigkeiten. Diese Option\n                                kann nicht mit den Optionen -p, -e und -s verwendet werden.
+
+main.opt.ignore-missing-deps=\  --ignore-missing-deps         Ignoriert fehlende Abh\u00E4ngigkeiten.
+
+main.opt.include=\nOptionen zum Filtern der zu analysierenden Klassen:\n  -include <Regex>              Beschr\u00E4nkt die Analyse auf Klassen, die dem Muster entsprechen\n                                Diese Option filtert die Liste der zu analysierenden\n                                Klassen. Sie kann zusammen mit -p und -e verwendet\n                                werden, die das Muster auf die Abh\u00E4ngigkeiten anwenden
+
+main.opt.P=\  -P       -profile             Zeigt das Profil, das ein Package enth\u00E4lt
+
+main.opt.cp=\  -cp <Pfad>\n  -classpath <Pfad>\n  --class-path <Pfad>           Gibt an, wo sich die Klassendateien befinden
+
+main.opt.module-path=\  --module-path <Modulpfad>   Gibt den Modulpfad an
+
+main.opt.upgrade-module-path=\  --upgrade-module-path <Modulpfad>  Gibt den Upgrademodulpfad an
+
+main.opt.system=\  --system <Java-Home>          Gibt einen alternativen Systemmodulpfad an
+
+main.opt.add-modules=\  --add-modules <Modulname>[,<Modulname>...]\n                                F\u00FCgt dem Root-Set Module zur Analyse hinzu
+
+main.opt.R=\  -R\n  --recursive                   Traversiert rekursiv alle Laufzeitabh\u00E4ngigkeiten.\n                                Die Option -R impliziert -filter:none. Falls eine Option -p,\n                                -e, -f angegeben ist, werden nur die \u00FCbereinstimmenden\n                                Abh\u00E4ngigkeiten analysiert.
+
+main.opt.no-recursive=\  --no-recursive                Kein rekursives Traversieren von Abh\u00E4ngigkeiten.
+
+main.opt.I=\  -I\n  --inverse                     Analysiert die Abh\u00E4ngigkeiten gem\u00E4\u00DF den anderen angegebenen\n                                Optionen und findet alle Artefakte, die direkt und\n                                indirekt von den \u00FCbereinstimmenden Knoten abh\u00E4ngen.\n                                Dies entspricht der Umkehrung der\n                                Analyse der Kompilierungszeitansicht und gibt die\n                                Abh\u00E4ngigkeits\u00FCbersicht aus. Diese Option muss mit der Option\n                                --require, --package oder --regex verwendet werden.
+
+main.opt.compile-time=\  --compile-time                Kompilierungszeitansicht transitiver Abh\u00E4ngigkeiten,\n                                d.h. Kompilierungszeitansicht der Option -R.\n                                Analysiert die Abh\u00E4ngigkeiten gem\u00E4\u00DF den anderen angegebenen Optionen\n                                Wird eine Abh\u00E4ngigkeit von einem Verzeichnis,\n                                einer JAR-Datei oder einem Modul gefunden, werden alle Klassen im \n                                entsprechenden beinhaltenden Archiv analysiert.
+
+main.opt.apionly=\  -apionly\n  --api-only                    Beschr\u00E4nkt die Analyse auf APIs, d.h. Abh\u00E4ngigkeiten\n                                von der Signatur \u00F6ffentlicher und gesch\u00FCtzter\n                                Mitglieder von \u00F6ffentlichen Klassen, einschlie\u00DFlich von\n                                Feldtyp, Methodenparametertypen, R\u00FCckgabetyp,\n                                aktivierten Ausnahmetypen usw.
+
+main.opt.m=\nOptionen f\u00FCr die Modulabh\u00E4ngigkeitsanalyse:\n  -m <Modulname>\n  --module <Modulname>        Gibt das Root-Modul f\u00FCr die Analyse an
+
+main.opt.generate-module-info=\  --generate-module-info <Verzeichnis>  Generiert module-info.java im angegebenen\n                                Verzeichnis. Die angegebenen JAR-Dateien werden\n                                analysiert. Diese Option kann nicht zusammen mit\n                                --dot-output oder --class-path verwendet werden. Verwenden Sie\n                                f\u00FCr offene Module die Option --generate-open-module.
+
+main.opt.generate-open-module=\  --generate-open-module <Verzeichnis>  Generiert module-info.java f\u00FCr die angegebenen\n                                JAR-Dateien im angegebenen Verzeichnis als\n                                offene Module. Diese Option kann nicht mit\n                                --dot-output oder --class-path verwendet werden.
+
+main.opt.check=\  --check <Modulname>[,<Modulname>...\n                                Analysiert die Abh\u00E4ngigkeit der angegebenen Module\n                                Gibt den Moduldeskriptor, die aus der Analyse resultierenden\n                                Modulabh\u00E4ngigkeiten und das Diagramm nach\n                                der \u00DCbergangsreduktion aus. Identifiziert auch\n                                nicht verwendete qualifizierte Exporte.
+
+main.opt.dotoutput=\  -dotoutput <Verzeichnis>\n  --dot-output <Verzeichnis>            Zielverzeichnis f\u00FCr DOT-Dateiausgabe
+
+main.opt.jdkinternals=\  -jdkinternals\n  --jdk-internals               Findet Abh\u00E4ngigkeiten auf Klassenebene auf JDK-internen\n                                APIs. Analysiert standardm\u00E4\u00DFig alle Klassen\n                                in --class-path und Eingabedateien, es sei denn, die Option\n                                -include ist angegeben. Diese Option kann nicht mit\n                                den Optionen -p, -e und -s verwendet werden.\n                                WARNUNG: Auf JDK-interne APIs besteht kein Zugriff.
+
+main.opt.list-deps=\  --list-deps                   Listet die Modulabh\u00E4ngigkeiten auf. Gibt auch\n                                interne API-Packages aus, falls referenziert.\n                                Diese Option analysiert transitiv die Librarys im\n                                Classpath und im Modulpfad, falls referenziert.\n                                Verwenden Sie die Option --no-recursive f\u00FCr eine\n                                nicht transitive Abh\u00E4ngigkeitsanalyse.
+
+main.opt.list-reduced-deps=\  --list-reduced-deps           Gleich wie --list-deps, listet jedoch die Kanten f\u00FCr die\n                                implizierten Lesevorg\u00E4nge aus dem Moduldiagramm nicht auf.\n                                Wenn Modul M1 M2 liest und M2 \u00FCber M3\n                                transitiv sein muss, dann wird impliziert, dass M1 M3 liest,\n                                und dies wird im Diagramm nicht angezeigt.
+
+main.opt.print-module-deps=\  --print-module-deps           Gleich wie --list-reduced-deps, und es wird\n                                eine kommagetrennte Liste von Modulabh\u00E4ngigkeiten ausgegeben.\n                                Dies Ausgabe kann von der jlink-Option --add-modules\n                                verwendet werden, um ein benutzerdefiniertes Image zu erstellen,\n                                das diese Module und ihre transitiven Abh\u00E4ngigkeiten enth\u00E4lt.
+
+main.opt.depth=\  -depth=<Tiefe>                Gibt die Tiefe der transitiven\n                                Abh\u00E4ngigkeitsanalyse an
+
+main.opt.q=\  -q       -quiet               Unterdr\u00FCckt Warnmeldungen
+
+main.opt.multi-release=\  --multi-release <Version>     Gibt bei Verarbeitung von Multi-Release-JAR-Dateien\n                                die Version an. <Version> muss eine\n                                Ganzzahl >= 9 oder ein Basiswert sein.
+
+err.command.set=Die Optionen {0} und {1} werden angegeben.
+err.unknown.option=unbekannte Option: {0}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.invalid.arg.for.option=ung\u00FCltiges Argument f\u00FCr Option: {0}
+err.option.after.class=Option muss angegeben werden vor den Klassen: {0}
+err.genmoduleinfo.not.jarfile={0} ist eine modulare JAR-Datei, die nicht mit der Option --generate-module-info angegeben werden kann
+err.genmoduleinfo.unnamed.package={0} enth\u00E4lt ein unbenanntes Package, das in einem Modul nicht zul\u00E4ssig ist
+err.profiles.msg=Keine Profilinformationen
+err.exception.message={0}
+err.invalid.path=ung\u00FCltiger Pfad: {0}
+err.invalid.options={0} kann nicht mit der Option {1} verwendet werden
+err.module.not.found=Modul nicht gefunden: {0}
+err.root.module.not.set=Root-Modulset leer
+err.option.already.specified=Option {0} wurde mehrmals angegeben.
+err.filter.not.specified=Die Optionen --package (-p), --regex (-e), --require m\u00FCssen angegeben werden
+err.multirelease.option.exists={0} ist keine Multi-Release-JAR-Datei, aber die Option --multi-release ist festgelegt
+err.multirelease.option.notfound={0} ist eine Multi-Release-JAR-Datei, aber die Option --multi-release ist nicht festgelegt
+err.multirelease.version.associated=Klasse {0} ist bereits mit Version {1} verkn\u00FCpft, und es wird versucht, Version {2} hinzuzuf\u00FCgen
+err.multirelease.jar.malformed=nicht wohlgeformte Multi-Release-JAR, {0}, ung\u00FCltiger Eintrag: {1}
+err.missing.dependences=Fehlende Abh\u00E4ngigkeiten: Klassen wurden im Modulpfad und Klassenpfad nicht gefunden.\nUm diesen Fehler zu unterdr\u00FCcken und fortzufahren, verwenden Sie --ignore-missing-deps.
+
+warn.invalid.arg=Pfad ist nicht vorhanden: {0}
+warn.skipped.entry={0}
+warn.split.package=geteiltes Package: {0} {1}
+warn.replace.useJDKInternals=JDK-interne APIs werden nicht unterst\u00FCtzt und sind privat f\u00FCr JDK-Implementierungen.\nSie k\u00F6nnten ohne Ber\u00FCcksichtigung der Kompatibilit\u00E4t ge\u00E4ndert oder entfernt werden und die Anwendung besch\u00E4digen.\n\u00C4ndern Sie den Code, um Abh\u00E4ngigkeiten von JDK-internen APIs zu beseitigen.\nDie neuesten Informationen zu JDK-internen API-Ersetzungen finden Sie hier:\n{0}
+
+inverse.transitive.dependencies.on=Inverse transitive Abh\u00E4ngigkeiten von {0}
+inverse.transitive.dependencies.matching=Inverse transitive Abh\u00E4ngigkeiten, die \u00FCbereinstimmen mit {0}
+internal.api.column.header=JDK-interne API
+public.api.replacement.column.header=Vorgeschlagene Ersetzung
+artifact.not.found=nicht gefunden
+jdeps.wiki.url=https://wiki.openjdk.java.net/display/JDK8/Java+Dependency+Analysis+Tool
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
new file mode 100644
index 00000000000..87d433ba4a7
--- /dev/null
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_de.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 source code is provided to illustrate the usage of a given feature
+ * or technique and has been deliberately simplified. Additional steps
+ * required for a production-quality application, such as security checks,
+ * input validation and proper error handling, might not be present in
+ * this sample code.
+ */
+
+
+package com.sun.tools.example.debug.tty;
+
+/**
+ * <p> This class represents the <code>ResourceBundle</code>
+ * for the following package(s):
+ *
+ * <ol>
+ * <li> com.sun.tools.example.debug.tty
+ * </ol>
+ *
+ */
+public class TTYResources_de extends java.util.ListResourceBundle {
+
+
+    /**
+     * Returns the contents of this <code>ResourceBundle</code>.
+     *
+     * <p>
+     *
+     * @return the contents of this <code>ResourceBundle</code>.
+     */
+    @Override
+    public Object[][] getContents() {
+        Object[][] temp = new Object[][] {
+        // NOTE: The value strings in this file containing "{0}" are
+        //       processed by the java.text.MessageFormat class.  Any
+        //       single quotes appearing in these strings need to be
+        //       doubled up.
+        //
+        // LOCALIZE THIS
+        {"** classes list **", "** Klassenliste **\n{0}"},
+        {"** fields list **", "** Feldliste **\n{0}"},
+        {"** methods list **", "** Methodenliste **\n{0}"},
+        {"*** Reading commands from", "*** Befehle aus {0} werden gelesen"},
+        {"All threads resumed.", "Alle Threads fortgesetzt."},
+        {"All threads suspended.", "Alle Threads unterbrochen."},
+        {"Argument is not defined for connector:", "Argument {0} ist f\u00FCr Connector {1} nicht definiert"},
+        {"Arguments match no method", "Argumente entsprechen keiner Methode"},
+        {"Array:", "Array: {0}"},
+        {"Array element is not a method", "Arrayelement ist keine Methode"},
+        {"Array index must be a integer type", "Arrayindex muss eine Ganzzahl sein"},
+        {"base directory:", "Basisverzeichnis: {0}"},
+        {"Breakpoint hit:", "Breakpoint erreicht: "},
+        {"breakpoint", "Breakpoint {0}"},
+        {"Breakpoints set:", "Breakpoints festgelegt:"},
+        {"Breakpoints can be located only in classes.", "Breakpoints k\u00F6nnen sich nur in Klassen befinden. {0} ist eine Schnittstelle oder ein Array."},
+        {"Can only trace", "Kann nur \"methods\" oder \"method exit\" oder \"method exits\" tracen"},
+        {"cannot redefine existing connection", "{0} kann keine vorhandene Verbindung neu definieren"},
+        {"Cannot assign to a method invocation", "Zuweisung zu einem Methodenaufruf nicht m\u00F6glich"},
+        {"Cannot specify command line with connector:", "Befehlszeile kann nicht mit Connector: {0} angegeben werden"},
+        {"Cannot specify target vm arguments with connector:", "Ziel-VM-Argumente k\u00F6nnen nicht mit Connector {0} angegeben werden"},
+        {"Class containing field must be specified.", "Klasse, die das Feld enth\u00E4lt, muss angegeben werden."},
+        {"Class:", "Klasse: {0}"},
+        {"Classic VM no longer supported.", "Klassische VM wird nicht mehr unterst\u00FCtzt."},
+        {"classpath:", "Classpath: {0}"},
+        {"colon mark", ":"},
+        {"colon space", ": "},
+        {"Command is not supported on the target VM", "Befehl \"{0}\" wird in der Ziel-VM nicht unterst\u00FCtzt"},
+        {"Command is not supported on a read-only VM connection", "Befehl \"{0}\" wird bei einer schreibgesch\u00FCtzten VM-Verbindung nicht unterst\u00FCtzt"},
+        {"Command not valid until the VM is started with the run command", "Befehl \"{0}\" ist erst g\u00FCltig, wenn die VM mit dem Befehl \"run\" gestartet wurde"},
+        {"Condition must be boolean", "Bedingung muss ein boolescher Wert sein"},
+        {"Connector and Transport name", "  Connector: {0}  Transport: {1}"},
+        {"Connector argument nodefault", "    Argument: {0} (kein Standard)"},
+        {"Connector argument default", "    Argument: {0} Standardwert: {1}"},
+        {"Connector description", "    Beschreibung: {0}"},
+        {"Connector required argument nodefault", "    Erforderliches Argument: {0} (kein Standard)"},
+        {"Connector required argument default", "    Erforderliches Argument: {0} Standardwert: {1}"},
+        {"Connectors available", "Verf\u00FCgbare Connectors:"},
+        {"Constant is not a method", "Konstante ist keine Methode"},
+        {"Could not open:", "\u00D6ffnen nicht m\u00F6glich: {0}"},
+        {"Current method is native", "Aktuelle Methode ist nativ"},
+        {"Current thread died. Execution continuing...", "Aktueller Thread {0} abgebrochen. Ausf\u00FChrung wird fortgesetzt..."},
+        {"Current thread isnt suspended.", "Aktueller Thread ist nicht unterbrochen."},
+        {"Current thread not set.", "Aktueller Thread nicht festgelegt."},
+        {"dbgtrace flag value must be an integer:", "dbgtrace-Kennzeichenwert muss eine Ganzzahl sein: {0}"},
+        {"dbgtrace command value must be an integer:", "dbgtrace-Befehlswert muss eine Ganzzahl sein: {0}"},
+        {"Deferring.", "{0} wird verz\u00F6gert.\nWird nach Laden der Klasse festgelegt."},
+        {"End of stack.", "Stackende."},
+        {"EOF", "EOF"},
+        {"Error popping frame", "Fehler bei Anzeige von Frame - {0}"},
+        {"Error reading file", "Fehler beim Lesen von \"{0}\" - {1}"},
+        {"Error redefining class to file", "Fehler beim Neudefinieren von {0} als {1} - {2}"},
+        {"exceptionSpec all", "alle {0}"},
+        {"exceptionSpec caught", "abgefangene {0}"},
+        {"exceptionSpec uncaught", "nicht abgefangene {0}"},
+        {"Exception in expression:", "Ausnahme in Ausdruck: {0}"},
+        {"Exception occurred caught", "Ausnahme aufgetreten: {0} (abzufangen bei: {1})"},
+        {"Exception occurred uncaught", "Ausnahme aufgetreten: {0} (nicht abgefangen)"},
+        {"Exceptions caught:", "Break bei diesen Ausnahmen:"},
+        {"Expected at, in, or an integer <thread_id>:", "\"at\", \"in\" oder ganzzahlige <thread_id> erwartet: {0}"},
+        {"expr is null", "{0} = Null"},
+        {"expr is value", "{0} = {1}"},
+        {"expr is value <collected>", "  {0} = {1} <erfasst>"},
+        {"Expression cannot be void", "Ausdruck darf nicht \"void\" sein"},
+        {"Expression must evaluate to an object", "Auswertung des Ausdrucks muss ein Objekt ergeben"},
+        {"extends:", "erweitert: {0}"},
+        {"Extra tokens after breakpoint location", "Zus\u00E4tzliche Token nach Breakpoint-Ort"},
+        {"Failed reading output", "Ausgabe des untergeordneten Java-Interpreters konnte nicht gelesen werden."},
+        {"Fatal error", "Schwerwiegender Fehler:"},
+        {"Field access encountered before after", "Feld ({0}) ist {1}, wird {2} sein: "},
+        {"Field access encountered", "Feldzugriff ({0}) aufgetreten: "},
+        {"Field to unwatch not specified", "Feld f\u00FCr Ende der \u00DCberwachung nicht angegeben."},
+        {"Field to watch not specified", "Feld f\u00FCr \u00DCberwachung nicht angegeben."},
+        {"GC Disabled for", "GC deaktiviert f\u00FCr {0}:"},
+        {"GC Enabled for", "GC aktiviert f\u00FCr {0}:"},
+        {"grouping begin character", "{"},
+        {"grouping end character", "}"},
+        {"Illegal Argument Exception", "Ausnahme wegen ung\u00FCltigen Arguments"},
+        {"Illegal connector argument", "Ung\u00FCltiges Connector-Argument: {0}"},
+        {"implementor:", "Implementierer: {0}"},
+        {"implements:", "implementiert: {0}"},
+        {"Initializing progname", "{0} wird initialisiert..."},
+        {"Input stream closed.", "Inputstream geschlossen."},
+        {"Interface:", "Schnittstelle: {0}"},
+        {"Internal debugger error.", "Interner Debuggerfehler."},
+        {"Internal error: null ThreadInfo created", "Interner Fehler: Null-ThreadInfo erstellt"},
+        {"Internal error; unable to set", "Interner Fehler: {0} konnte nicht festgelegt werden"},
+        {"Internal exception during operation:", "Interne Ausnahme bei Vorgang:\n    {0}"},
+        {"Internal exception:", "Interne Ausnahme:"},
+        {"Invalid argument type name", "Ung\u00FCltiger Argumenttypname"},
+        {"Invalid assignment syntax", "Ung\u00FCltige Zuweisungssyntax"},
+        {"Invalid command syntax", "Ung\u00FCltige Befehlssyntax"},
+        {"Invalid connect type", "Ung\u00FCltiger Verbindungstyp"},
+        {"Invalid consecutive invocations", "Ung\u00FCltige aufeinander folgende Aufrufe"},
+        {"Invalid exception object", "Ung\u00FCltiges Ausnahmeobjekt"},
+        {"Invalid line number specified", "Ung\u00FCltige Zeilennummer angegeben"},
+        {"Invalid <method_name> specification:", "Ung\u00FCltige <method_name>-Spezifikation: {0}"},
+        {"Invalid option on class command", "Ung\u00FCltige Option in Klassenbefehl"},
+        {"invalid option", "Ung\u00FCltige Option: {0}"},
+        {"Invalid thread status.", "Ung\u00FCltiger Threadstatus."},
+        {"Invalid <thread_id>:", "<thread_id> ung\u00FCltig: {0}"},
+        {"Invalid transport name:", "Ung\u00FCltiger Transportname: {0}"},
+        {"Invalid <class>.<method_name> specification", "Ung\u00FCltige <class>.<method_name>-Spezifikation"},
+        {"I/O exception occurred:", "I/O-Ausnahme aufgetreten: {0}"},
+        {"is an ambiguous method name in", "\"{0}\" ist ein mehrdeutiger Methodenname in \"{1}\""},
+        {"is an invalid line number for",  "{0,number,integer} ist eine ung\u00FCltige Zeilennummer f\u00FCr {1}"},
+        {"is not a valid class name", "\"{0}\" ist kein g\u00FCltiger Klassenname."},
+        {"is not a valid field name", "\"{0}\" ist kein g\u00FCltiger Feldname."},
+        {"is not a valid id or class name", "\"{0}\" ist keine g\u00FCltige ID oder kein g\u00FCltiger Klassenname."},
+        {"is not a valid line number or method name for", "\"{0}\" ist keine g\u00FCltige Zeilennummer oder kein g\u00FCltiger Methodenname f\u00FCr Klasse \"{1}\""},
+        {"is not a valid method name", "\"{0}\" ist kein g\u00FCltiger Methodenname."},
+        {"is not a valid thread id", "\"{0}\" ist keine g\u00FCltige Thread-ID."},
+        {"is not a valid threadgroup name", "\"{0}\" ist kein g\u00FCltiger Threadgruppenname."},
+        {"jdb prompt with no current thread", "> "},
+        {"jdb prompt thread name and current stack frame", "{0}[{1,number,integer}] "},
+        {"killed", "{0} abgebrochen"},
+        {"killing thread:", "Thread wird abgebrochen: {0}"},
+        {"Line number information not available for", "F\u00FCr diese Position sind keine Quellenzeilennummern verf\u00FCgbar."},
+        {"line number", ":{0,number,integer}"},
+        {"list field typename and name", "{0} {1}\n"},
+        {"list field typename and name inherited", "{0} {1} (geerbt von {2})\n"},
+        {"list field typename and name hidden", "{0} {1} (ausgeblendet)\n"},
+        {"Listening at address:", "Listening-Adresse: {0}"},
+        {"Local variable information not available.", "Keine lokalen Variableninformationen verf\u00FCgbar. Kompilieren Sie mit -g, um Variableninformationen zu generieren"},
+        {"Local variables:", "Lokale Variablen:"},
+        {"<location unavailable>", "<Ort nicht verf\u00FCgbar>"},
+        {"location", "\"Thread={0}\", {1}"},
+        {"locationString", "{0}.{1}(), Zeile={2,number,integer} BCI={3,number,integer}"},
+        {"Main class and arguments must be specified", "Hauptklasse und Argumente m\u00FCssen angegeben werden"},
+        {"Method arguments:", "Methodenargumente:"},
+        {"Method entered:", "Methode gestartet: "},
+        {"Method exited:",  "Methode beendet"},
+        {"Method exitedValue:", "Methode beendet: R\u00FCckgabewert = {0}, "},
+        {"Method is overloaded; specify arguments", "Methode {0} ist \u00FCberladen. Geben Sie Argumente an"},
+        {"minus version", "Diese Version ist {0} {1,number,integer}.{2,number,integer} (Java SE Version {3})"},
+        {"Missing at or in", "\"at\" oder \"in\" fehlt"},
+        {"Monitor information for thread", "\u00DCberwachungsinformationen f\u00FCr Thread {0}:"},
+        {"Monitor information for expr", "\u00DCberwachungsinformationen f\u00FCr {0} ({1}):"},
+        {"More than one class named", "Mehrere Klassen mit dem Namen: \"{0}\""},
+        {"native method", "native Methode"},
+        {"nested:", "verschachtelt: {0}"},
+        {"No attach address specified.", "Keine Anhangsadresse angegeben."},
+        {"No breakpoints set.", "Keine Breakpoints festgelegt."},
+        {"No class named", "Keine Klasse namens \"{0}\""},
+        {"No class specified.", "Keine Klasse angegeben."},
+        {"No classpath specified.", "Kein Classpath angegeben."},
+        {"No code at line", "Kein Code bei Zeile {0,number,integer} in {1}"},
+        {"No connect specification.", "Keine Verbindungsspezifikation."},
+        {"No connector named:", "Kein Connector namens: {0}"},
+        {"No current thread", "Kein aktueller Thread"},
+        {"No default thread specified:", "Kein Standardthread angegeben: Verwenden Sie zun\u00E4chst den Befehl \"thread\"."},
+        {"No exception object specified.", "Kein Ausnahmeobjekt angegeben."},
+        {"No exceptions caught.", "Keine Ausnahmen abgefangen."},
+        {"No expression specified.", "Kein Ausdruck angegeben."},
+        {"No field in", "Kein Feld {0} in {1}"},
+        {"No frames on the current call stack", "Keine Frames im aktuellen Aufrufstack"},
+        {"No linenumber information for", "Keine Zeilennummerninformationen f\u00FCr {0}. F\u00FChren Sie die Kompilierung mit aktiviertem Debugging aus."},
+        {"No local variables", "Keine lokalen Variablen"},
+        {"No method in", "Keine Methode {0} in {1}"},
+        {"No method specified.", "Keine Methode angegeben."},
+        {"No monitor numbered:", "Kein Monitor mit Nummer: {0}"},
+        {"No monitors owned", "  Keine Monitore im Eigentum"},
+        {"No object specified.", "Kein Objekt angegeben."},
+        {"No objects specified.", "Keine Objekte angegeben."},
+        {"No save index specified.", "Kein Speicherindex angegeben."},
+        {"No saved values", "Keine gespeicherten Werte"},
+        {"No source information available for:", "Keine Quellinformationen f\u00FCr {0} verf\u00FCgbar"},
+        {"No sourcedebugextension specified", "Keine SourceDebugExtension angegeben"},
+        {"No sourcepath specified.", "Kein Quellpfad angegeben."},
+        {"No thread specified.", "Kein Thread angegeben."},
+        {"No VM connected", "Keine VM verbunden"},
+        {"No waiters", "  Keine Waiter"},
+        {"not a class", "{0} ist keine Klasse"},
+        {"Not a monitor number:", "Keine Monitornummer: \"{0}\""},
+        {"not found (try the full name)", "{0} nicht gefunden (verwenden Sie den vollst\u00E4ndigen Namen)"},
+        {"Not found:", "Nicht gefunden: {0}"},
+        {"not found", "{0} nicht gefunden"},
+        {"Not owned", "  Nicht im Eigentum"},
+        {"Not waiting for a monitor", "  Nicht auf einen Monitor wartend"},
+        {"Nothing suspended.", "Nichts unterbrochen."},
+        {"object description and id", "({0}){1}"},
+        {"Operation is not supported on the target VM", "Vorgang wird in der Ziel-VM nicht unterst\u00FCtzt"},
+        {"operation not yet supported", "Vorgang noch nicht unterst\u00FCtzt"},
+        {"Owned by:", "  Eigent\u00FCmer: {0}, Anzahl Eintr\u00E4ge: {1,number,integer}"},
+        {"Owned monitor:", "  Monitor im Eigentum: {0}"},
+        {"Parse exception:", "Parseausnahme: {0}"},
+        {"printclearcommandusage", "Verwendung: clear <class>:<line_number> oder\n      clear <class>.<method_name>[(argument_type,...)]"},
+        {"printstopcommandusage",
+         "Verwendung: stop [go|thread] [<thread_id>] <at|in> <Position>\n  Wenn \"go\" angegeben ist, wird der Thread nach dem Stoppen sofort fortgesetzt\n  Wenn \"thread\" angegeben ist, wird nur der Thread unterbrochen, in dem der Stopp ausgef\u00FChrt wird\n  Wenn weder \"go\" noch \"thread\" angegeben ist, werden alle Threads unterbrochen\n  Wenn eine ganzzahlige <thread_id> angegeben ist, wird nur der angegebene Thread gestoppt\n  \"at\" und \"in\" haben dieselbe Bedeutung\n  <Position> kann eine Zeilennummer oder eine Methode sein:\n    <class_id>:<line_number>\n    <class_id>.<Methode>[(argument_type,...)]"
+        },
+        {"Removed:", "Entfernt: {0}"},
+        {"repeat is on", "Wiederholung ist aktiviert"},
+        {"repeat is off", "Wiederholung ist deaktiviert"},
+        {"repeat usage", "Verwendung: repeat <on|off>"},
+        {"Requested stack frame is no longer active:", "Angeforderter Stackframe ist nicht mehr aktiv: {0,number,integer}"},
+        {"run <args> command is valid only with launched VMs", "Der Befehl \"run <args>\" ist nur mit gestarteten VMs g\u00FCltig"},
+        {"run", "{0} ausf\u00FChren"},
+        {"saved", "{0} gespeichert"},
+        {"Set deferred", "{0} mit Verz\u00F6gerung festlegen"},
+        {"Set", "{0} festlegen"},
+        {"Source file not found:", "Quelldatei nicht gefunden: {0}"},
+        {"source line number and line", "{0,number,integer}    {1}"},
+        {"source line number current line and line", "{0,number,integer} => {1}"},
+        {"sourcedebugextension", "SourceDebugExtension -- {0}"},
+        {"Specify class and method", "Klasse und Methode angeben"},
+        {"Specify classes to redefine", "Klassen f\u00FCr Neudefinition angeben"},
+        {"Specify file name for class", "Dateinamen f\u00FCr Klasse {0} angeben"},
+        {"stack frame dump with pc", "  [{0,number,integer}] {1}.{2} ({3}), PC = {4}"},
+        {"stack frame dump", "  [{0,number,integer}] {1}.{2} ({3})"},
+        {"Step completed:", "Schritt abgeschlossen: "},
+        {"Stopping due to deferred breakpoint errors.", "Stoppen aufgrund von verz\u00F6gerten Breakpoint-Fehlern.\n"},
+        {"subclass:", "Unterklasse: {0}"},
+        {"subinterface:", "Unterschnittstelle: {0}"},
+        {"tab", "\t{0}"},
+        {"Target VM failed to initialize.", "Ziel-VM konnte nicht initialisiert werden."},
+        {"The application exited", "Anwendung beendet"},
+        {"The application has been disconnected", "Die Anwendung wurde getrennt"},
+        {"The gc command is no longer necessary.", "Der Befehl \"gc\" ist nicht mehr erforderlich.\nDie Garbage Collection wird wie gew\u00F6hnlich f\u00FCr alle Objekte durchgef\u00FChrt. Verwenden Sie die Befehle \"enablegc\" und \"disablegc\",\num die Garbage Collection einzelner Objekte zu steuern."},
+        {"The load command is no longer supported.", "Der Befehl \"load\" wird nicht mehr unterst\u00FCtzt."},
+        {"The memory command is no longer supported.", "Der Befehl \"memory\" wird nicht mehr unterst\u00FCtzt."},
+        {"The VM does not use paths", "Die VM verwendet keine Pfade"},
+        {"Thread is not running (no stack).", "Thread wird nicht ausgef\u00FChrt (kein Stack)."},
+        {"Thread number not specified.", "Threadnummer nicht angegeben."},
+        {"Thread:", "{0}:"},
+        {"Thread Group:", "Gruppe {0}:"},
+        {"Thread description name unknownStatus BP",  "  {0} {1} unbekannt (bei Breakpoint)"},
+        {"Thread description name unknownStatus",     "  {0} {1} unbekannt"},
+        {"Thread description name zombieStatus BP",   "  {0} {1} Zombie (bei Breakpoint)"},
+        {"Thread description name zombieStatus",      "  {0} {1} Zombie"},
+        {"Thread description name runningStatus BP",  "  {0} {1} wird ausgef\u00FChrt (bei Breakpoint)"},
+        {"Thread description name runningStatus",     "  {0} {1} wird ausgef\u00FChrt"},
+        {"Thread description name sleepingStatus BP", "  {0} {1} inaktiv (bei Breakpoint)"},
+        {"Thread description name sleepingStatus",    "  {0} {1} inaktiv"},
+        {"Thread description name waitingStatus BP",  "  {0} {1} wartet in einem Monitor (bei Breakpoint)"},
+        {"Thread description name waitingStatus",     "  {0} {1} wartet in einem Monitor"},
+        {"Thread description name condWaitstatus BP", "  {0} {1} wartet bedingt (bei Breakpoint)"},
+        {"Thread description name condWaitstatus",    "  {0} {1} wartet bedingt"},
+        {"Thread has been resumed", "Thread wurde wiederaufgenommen"},
+        {"Thread not suspended", "Thread nicht unterbrochen"},
+        {"thread group number description name", "{0,number,integer}. {1} {2}"},
+        {"Threadgroup name not specified.", "Name der Threadgruppe nicht angegeben."},
+        {"<thread_id> option not valid until the VM is started with the run command",
+         "<thread_id>-Option ist erst g\u00FCltig, wenn die VM mit dem Befehl \"run\" gestartet wurde"},
+        {"Threads must be suspended", "Threads m\u00FCssen unterbrochen sein"},
+        {"trace method exit in effect for", "\"trace method exit\" in Kraft f\u00FCr {0}"},
+        {"trace method exits in effect", "\"trace method exits\" in Kraft"},
+        {"trace methods in effect", "\"trace methods\" in Kraft"},
+        {"trace go method exit in effect for", "\"trace go method exit\" in Kraft f\u00FCr {0}"},
+        {"trace go method exits in effect", "\"trace go method exits\" in Kraft"},
+        {"trace go methods in effect", "\"trace go methods\" in Kraft"},
+        {"trace not in effect", "\"trace\" nicht in Kraft"},
+        {"Unable to attach to target VM.", "Anh\u00E4ngen an Ziel-VM nicht m\u00F6glich."},
+        {"Unable to display process output:", "Prozessausgabe kann nicht angezeigt werden: {0}"},
+        {"Unable to launch target VM.", "Ziel-VM kann nicht gestartet werden."},
+        {"Unable to set deferred", "{0} mit Verz\u00F6gerung kann nicht festgelegt werden: {1}"},
+        {"Unable to set main class and arguments", "Hauptklasse und Argument k\u00F6nnen nicht festgelegt werden"},
+        {"Unable to set", "{0} kann nicht festgelegt werden: {1}"},
+        {"Unexpected event type", "Unerwarteter Ereignistyp: {0}"},
+        {"unknown", "unbekannt"},
+        {"Unmonitoring", "\u00DCberwachung von {0} aufheben"},
+        {"Unrecognized command.  Try help...", "Nicht erkannter Befehl: \"{0}\". Rufen Sie \"help\" auf..."},
+        {"Usage: catch exception", "Verwendung: catch [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>"},
+        {"Usage: ignore exception", "Verwendung: ignore [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>"},
+        {"Usage: down [n frames]", "Verwendung: down [n frames]"},
+        {"Usage: kill <thread id> <throwable>", "Verwendung: kill <Thread-ID> <Throwable>"},
+        {"Usage: read <command-filename>", "Verwendung: read <Befehlsdateiname>"},
+        {"Usage: unmonitor <monitor#>", "Verwendung: unmonitor <Monitornummer>"},
+        {"Usage: up [n frames]", "Verwendung: up [n frames]"},
+        {"Use java minus X to see", "Verwenden Sie \"java -X\", um die verf\u00FCgbaren nicht standardm\u00E4\u00DFigen Optionen anzuzeigen"},
+        {"VM already running. use cont to continue after events.", "VM wird bereits ausgef\u00FChrt. Verwenden Sie \"cont\", um nach Ereignissen fortzufahren."},
+        {"VM Started:", "VM gestartet: "},
+        {"vmstartexception", "VM-Startausnahme: {0}"},
+        {"Waiting for monitor:", "   Warten auf Monitor: {0}"},
+        {"Waiting thread:", " Wartender Thread: {0}"},
+        {"watch accesses of", "Zugriffe von {0}.{1} \u00FCberwachen"},
+        {"watch modification of", "\u00C4nderung von {0}.{1} \u00FCberwachen"},
+        {"zz help text",
+             "** Befehlsliste **\nconnectors                -- Listet verf\u00FCgbare Connectors und Transporte in dieser VM auf\n\nrun [class [args]]        -- Startet die Ausf\u00FChrung der Hauptklasse der Anwendung\n\nthreads [threadgroup]     -- Listet Threads auf\nthread <Thread-ID>        -- Legt den Standardthread fest\nsuspend [thread id(s)]    -- Unterbricht Threads (Standard: all)\nresume [thread id(s)]    -- Nimmt Threads wieder auf (Standard: all)\nwhere [<Thread-ID> | all] -- Gibt den Stack eines Threads aus\nwherei [<Thread-ID> | all] -- Gibt den Stack eines Threads mit PC-Informationen aus\nup [n frames]             -- Verschiebt den Stack eines Threads nach oben\ndown [n frames]             -- Verschiebt den Stack eines Threads nach unten\nkill <Thread-ID> <Ausdruck>   -- Bricht einen Thread mit dem angegebenen Ausnahmeobjekt ab\ninterrupt <Thread-ID>     -- Unterbricht einen Thread\n\nprint <Ausdruck>              -- Gibt den Wert eines Ausdrucks aus\ndump <Ausdruck>               -- Gibt alle Objektinformationen aus\neval <Ausdruck>               -- Bewertet einen Ausdruck (wie \"print\")\nset <lvalue> = <Ausdruck>     -- Weist einem Feld/einer Variablen/einem Arrayelement einen neuen Wert zu\nlocals                    -- Gibt alle lokalen Variablen im aktuellen Stackframe aus\n\nclasses                   -- Listet derzeit bekannte Klassen auf\nclass <Klassen-ID>          -- Zeigt Details einer benannten Klasse an\nmethods <Klassen-ID>        -- Listet die Methoden einer Klasse auf\nfields <Klassen-ID>        -- Listet die Felder einer Klasse auf\n\nthreadgroups              -- Listet Threadgruppen auf\nthreadgroup <Name>        -- Legt die aktuelle Threadgruppe fest\n\nstop [go|thread] [<thread_id>] <at|in> <Position>\n                          -- Legt einen Breakpoint fest\n                          -- Wenn Sie keine Optionen angeben, wird die aktuelle Breakpoint-Liste ausgegeben\n                          -- Wenn Sie \"go\" angeben, wird der Vorgang nach dem Stoppen sofort wiederaufgenommen\n                          -- Wenn Sie \"thread\" angeben, wird nur der Thread unterbrochen, in dem gestoppt wurde\n                          -- Wenn Sie weder \"go\" noch \"thread\" angeben, werden alle Threads unterbrochen\n                          -- Wenn Sie eine ganzzahlige <thread_id> angeben, wird der Vorgang nur im angegebenen Thread gestoppt\n                          -- \"at\" und \"in\" haben die gleiche Bedeutung\n                          -- <Position> kann eine Zeilennummer oder eine Methode sein:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<Methode>[(argument_type,...)]\nclear <class id>.<Methode>[(argument_type,...)]\n                          -- L\u00F6scht einen Breakpoint in einer Methode\nclear <Klassen-ID>:<Zeile>   -- L\u00F6scht einen Breakpoint bei einer Zeile\nclear                     -- Listet Breakpoints auf\ncatch [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>\n                          -- Break bei der angegebenen Ausnahme\nignore [uncaught|caught|all] <Klassen-ID>|<Klassenmuster>\n                          -- Bricht \"catch\" f\u00FCr die angegebene Ausnahme ab\nwatch [access|all] <Klassen-ID>.<Feldname>\n                          -- \u00DCberwacht Zugriffe/\u00C4nderungen eines Feldes\nunwatch [access|all] <Klassen-ID>.<Feldname>\n                          -- Hebt die \u00DCberwachung der Zugriffe/\u00C4nderungen eines Feldes auf\ntrace [go] methods [thread]\n                          -- Verfolgt Methodenstarts und -beendigungen.\n                          -- Alle Threads werden unterbrochen, es sei denn, \"go\" ist angegeben\ntrace [go] method exit | exits [thread]\n                          -- Verfolgt die Beendigung der aktuellen Methode oder die Beendigungen aller Methoden\n                          -- Alle Threads werden unterbrochen, es sei denn, \"go\" ist angegeben\nuntrace [methods]         -- Stoppt das Tracing von Methodenstarts und/oder -beendigungen\nstep                      -- F\u00FChrt die aktuelle Zeile aus\nstep up                   -- Ausf\u00FChren, bis die aktuelle Methode an den Aufrufer zur\u00FCckgegeben wird\nstepi                     -- F\u00FChrt die aktuelle Anweisung aus\nnext                      -- Eine Zeile weiter (Aufrufe auslassen)\ncont                      -- Setzt die Ausf\u00FChrung ab dem Breakpoint fort\n\nlist [line number|method] -- Gibt den Quellcode aus\nuse (or sourcepath) [source file path]\n                          -- Zeigt den Quellpfad an oder \u00E4ndert diesen\nexclude [<Klassenmuster>, ... | \"none\"]\n                          -- Meldet keine Schritt- oder Methodenereignisse f\u00FCr angegebene Klassen\nclasspath                 -- Gibt Classpath-Informationen aus der Ziel-VM aus\n\nmonitor <Befehl>         -- F\u00FChrt bei jedem Programmstopp einen Befehl aus\nmonitor                   -- Listet Monitore auf\nunmonitor <Monitornummer>      -- L\u00F6scht einen Monitor\nread <Dateiname>           -- Liest eine Befehlsdatei und f\u00FChrt diese aus\n\nlock <Ausdruck>               -- Gibt Sperrinformationen f\u00FCr ein Objekt aus\nthreadlocks [thread id]   -- Gibt Sperrinformationen f\u00FCr einen Thread aus\n\npop                       -- Holt den Stack bis zum aktuellen Frame (einschlie\u00DFlich)\nreenter                   -- Wie \"pop\", aber der aktuelle Frame wird wieder eingegeben\nredefine <Klassen-ID> <Klassendateiname>\n                          -- Definiert den Code f\u00FCr eine Klasse neu\n\ndisablegc <Ausdruck>          -- Verhindert die Garbage Collection eines Objekts\nenablegc <Ausdruck>          -- L\u00E4sst die Garbage Collection eines Objekts zu\n\n!!                        -- Wiederholt den letzten Befehl\n<n> <Befehl>             -- Wiederholt einen Befehl n-mal\nrepeat                    -- Zeigt an, ob die Wiederholung durch leeren Befehl im GDB-Stil aktiviert ist\nrepeat <on|off>           -- Aktiviert/deaktiviert die Wiederholung im GDB-Stil\n# <Befehl>               -- Verwerfen (kein Vorgang)\nhelp (oder ?)               -- Listet Befehle auf\ndbgtrace [flag]           -- Identisch mit der Befehlszeilenoption \"dbgtrace\"\nversion                   -- Gibt Versionsinformationen aus\nexit (oder quit)            -- Beendet den Debugger\n\n<Klassen-ID>: Ein vollst\u00E4ndiger Klassenname mit Package-Qualifiers\n<Klassenmuster>: Ein Klassenname mit einem Platzhalter am Anfang oder Ende (\"*\")\n<Thread-ID>: Threadnummer aus dem Befehl \"threads\"\n<Ausdruck>: Ein Ausdruck der Java(TM)-Programmiersprache.\nDer Gro\u00DFteil der g\u00E4ngigen Syntax wird unterst\u00FCtzt.\n\nStartbefehle k\u00F6nnen in \"jdb.ini\" oder \".jdbrc\" abgelegt werden\nin user.home oder user.dir"},
+        {"zz usage text",
+             "Verwendung: {0} <Optionen> <Klasse> <Argumente>\n\nVerf\u00FCgbare Optionen:\n    -? -h --help -help Gibt diese Hilfemeldung aus und beendet den Vorgang\n    -sourcepath <durch \"{1}\" getrennte Verzeichnisse>\n                      Verzeichnisse, in denen nach Quelldateien gesucht werden soll\n    -attach <Adresse>\n                      Anh\u00E4ngen an aktive VM unter der angegebenen Adresse mit Standard-Connector\n    -listen <Adresse>\n                      Wartet auf Verbindung der aktiven VM unter der angegebenen Adresse mit Standard-Connector\n    -listenany\n                      Wartet auf Verbindung einer aktiven VM unter einer beliebigen verf\u00FCgbaren Adresse mit Standard-Connector\n    -launch\n                      Startet die VM sofort, anstatt auf den Befehl \"run\" zu warten\n    -listconnectors   Listet die in dieser VM verf\u00FCgbaren Connectors auf\n    -connect <connector-name>:<name1>=<value1>,...\n                      Stellt die Verbindung zur Ziel-VM mit dem benannten Connector und den aufgelisteten Argumentwerten her\n    -dbgtrace [flags] Gibt Informationen zum Debugging von {0} aus\n    -tclient          F\u00FChrt die Anwendung im HotSpot(TM) Client Compiler aus\n    -tserver          F\u00FChrt die Anwendung im HotSpot(TM) Server Compiler aus\n\nAn Debuggerprozess weitergeleitete Optionen:\n    -v -verbose[:class|gc|jni]\n                      Aktiviert den Verbose-Modus\n    -D<Name>=<Wert>  Legt eine Systemeigenschaft fest\n    -classpath <durch \"{1}\" getrennte Verzeichnisse>\n                      Listet Verzeichnisse auf, in denen nach Klassen gesucht werden soll\n    -X<Option>        Nicht standardm\u00E4\u00DFige Ziel-VM-Option\n\n<Klasse> ist der Name der Klasse zum Start des Debuggings\n<Argumente> sind die Argumente, die an die main()-Methode der <Klasse> \u00FCbergeben werden\n\nGeben Sie \"help\" beim {0}-Prompt ein, um Befehlshilfe anzuzeigen"},
+        // END OF MATERIAL TO LOCALIZE
+        };
+
+        return temp;
+    }
+}
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
index 330fc33a820..a9364b853a5 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -253,9 +253,9 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
          "\u4F7F\u7528\u65B9\u6CD5: stop [go|thread] [<thread_id>] <at|in> <location>\n  \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n  \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n  \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n  \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n  \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n  <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n    <class_id>:<line_number>\n    <class_id>.<method>[(argument_type,...)]"
         },
         {"Removed:", "{0}\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F"},
-        {"repeat is on", "Repeat is on"},
-        {"repeat is off", "Repeat is off"},
-        {"repeat usage", "Usage: repeat <on|off>"},
+        {"repeat is on", "\u7E70\u8FD4\u3057\u306F\u30AA\u30F3\u3067\u3059"},
+        {"repeat is off", "\u7E70\u8FD4\u3057\u306F\u30AA\u30D5\u3067\u3059"},
+        {"repeat usage", "\u4F7F\u7528\u65B9\u6CD5: repeat <on|off>"},
         {"Requested stack frame is no longer active:", "\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u305F\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u306F\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0,number,integer}"},
         {"run <args> command is valid only with launched VMs", "'run <args>'\u30B3\u30DE\u30F3\u30C9\u306F\u8D77\u52D5\u6E08\u306EVM\u3067\u306E\u307F\u6709\u52B9\u3067\u3059"},
         {"run", "{0}\u306E\u5B9F\u884C"},
@@ -302,6 +302,7 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
         {"Thread has been resumed", "\u30B9\u30EC\u30C3\u30C9\u304C\u518D\u958B\u3057\u307E\u3057\u305F"},
         {"Thread not suspended", "\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u3066\u3044\u307E\u305B\u3093"},
         {"thread group number description name", "{0,number,integer}. {1} {2}"},
+        {"Threadgroup name not specified.", "\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"<thread_id> option not valid until the VM is started with the run command",
          "<thread_id>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001VM\u304Crun\u30B3\u30DE\u30F3\u30C9\u3067\u958B\u59CB\u3055\u308C\u308B\u307E\u3067\u7121\u52B9\u3067\u3059"},
         {"Threads must be suspended", "\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
@@ -338,7 +339,7 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
         {"watch accesses of", "{0}.{1}\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u30A6\u30A9\u30C3\u30C1"},
         {"watch modification of", "{0}.{1}\u306E\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1"},
         {"zz help text",
-             "** \u30B3\u30DE\u30F3\u30C9\u30FB\u30EA\u30B9\u30C8 **\nconnectors                -- \u3053\u306EVM\u5185\u306E\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3068\u30C8\u30E9\u30F3\u30B9\u30DD\u30FC\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nrun [class [args]]        -- \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u5B9F\u884C\u3092\u958B\u59CB\u3057\u307E\u3059\n\nthreads [threadgroup]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthread <thread id>        -- \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\nsuspend [thread id(s)]    -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nresume [thread id(s)]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u518D\u958B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nwhere [<thread id> | all] -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30C0\u30F3\u30D7\u3057\u307E\u3059\nwherei [<thread id> | all]-- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092pc\u60C5\u5831\u3068\u3068\u3082\u306B\u30C0\u30F3\u30D7\u3057\u307E\u3059\nup [n frames]             -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0A\u306B\u79FB\u52D5\u3057\u307E\u3059\ndown [n frames]           -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0B\u306B\u79FB\u52D5\u3057\u307E\u3059\nkill <thread id> <expr>   -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u30B9\u30EC\u30C3\u30C9\u3092\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\ninterrupt <thread id>     -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n\nprint <expr>              -- \u5F0F\u306E\u5024\u3092\u51FA\u529B\u3057\u307E\u3059\ndump <expr>               -- \u3059\u3079\u3066\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\neval <expr>               -- \u5F0F\u3092\u8A55\u4FA1\u3057\u307E\u3059(print\u3068\u540C\u3058)\nset <lvalue> = <expr>     -- \u65B0\u3057\u3044\u5024\u3092\u30D5\u30A3\u30FC\u30EB\u30C9/\u5909\u6570/\u914D\u5217\u8981\u7D20\u306B\u4EE3\u5165\u3057\u307E\u3059\nlocals                    -- \u73FE\u5728\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u5185\u306E\u3059\u3079\u3066\u306E\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u3092\u51FA\u529B\u3057\u307E\u3059\n\nclasses                   -- \u73FE\u5728\u65E2\u77E5\u306E\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nclass <class id>          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\nmethods <class id>        -- \u30AF\u30E9\u30B9\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nfields <class id>         -- \u30AF\u30E9\u30B9\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nthreadgroups              -- \u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthreadgroup <name>        -- \u73FE\u5728\u306E\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                          -- \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u306E\u73FE\u5728\u306E\u30EA\u30B9\u30C8\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\n                          -- \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n                          -- \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n                          -- \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n                          -- <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u30E1\u30BD\u30C3\u30C9\u5185\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear <class id>:<line>   -- \u884C\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear                     -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u3068\u304D\u306B\u30D6\u30EC\u30FC\u30AF\u3057\u307E\u3059\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u306E'catch'\u3092\u53D6\u308A\u6D88\u3057\u307E\u3059\nwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u3092\u30A6\u30A9\u30C3\u30C1\u3057\u307E\u3059\nunwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1\u3092\u4E2D\u6B62\u3057\u307E\u3059\ntrace [go] methods [thread]\n                          -- \u30E1\u30BD\u30C3\u30C9\u306E\u5165\u308A\u53E3\u3068\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\u3002\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\ntrace [go] method exit | exits [thread]\n                          -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\nuntrace [methods]         -- \u30E1\u30BD\u30C3\u30C9\u306E\u958B\u59CB\u307E\u305F\u306F\u7D42\u4E86\u306E\u30C8\u30EC\u30FC\u30B9\u3092\u505C\u6B62\u3057\u307E\u3059\nstep                      -- \u73FE\u5728\u306E\u884C\u3092\u5B9F\u884C\u3057\u307E\u3059\nstep up                   -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u5143\u306B\u623B\u308B\u307E\u3067\u5B9F\u884C\u3057\u307E\u3059\nstepi                     -- \u73FE\u5728\u306E\u547D\u4EE4\u3092\u5B9F\u884C\u3057\u307E\u3059\nnext                      -- 1\u884C\u3092\u30B9\u30C6\u30C3\u30D7\u5B9F\u884C\u3057\u307E\u3059(\u547C\u51FA\u3057\u3092\u30B9\u30C6\u30C3\u30D7\u30AA\u30FC\u30D0\u30FC)\ncont                      -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u304B\u3089\u5B9F\u884C\u3092\u7D9A\u884C\u3057\u307E\u3059\n\nlist [line number|method] -- \u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u3092\u51FA\u529B\u3057\u307E\u3059\nuse (or sourcepath) [source file path]\n                          -- \u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u30B9\u30C6\u30C3\u30D7\u3084\u30E1\u30BD\u30C3\u30C9\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u5831\u544A\u3057\u307E\u305B\u3093\nclasspath                 -- \u30BF\u30FC\u30B2\u30C3\u30C8VM\u304B\u3089\u30AF\u30E9\u30B9\u30D1\u30B9\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\nmonitor <command>         -- \u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u505C\u6B62\u3059\u308B\u305F\u3073\u306B\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059\nmonitor                   -- \u30E2\u30CB\u30BF\u30FC\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nunmonitor <monitor#>      -- \u30E2\u30CB\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\nread <filename>           -- \u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u3063\u3066\u5B9F\u884C\u3057\u307E\u3059\n\nlock <expr>               -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nthreadlocks [thread id]   -- \u30B9\u30EC\u30C3\u30C9\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\npop                       -- \u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u307E\u3067\u306E\u3059\u3079\u3066\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30DD\u30C3\u30D7\u3057\u307E\u3059\nreenter                   -- pop\u3068\u540C\u3058\u3067\u3059\u304C\u3001\u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u304C\u518D\u5165\u529B\u3055\u308C\u307E\u3059\nredefine <class id> <class file name>\n                          -- \u30AF\u30E9\u30B9\u306E\u30B3\u30FC\u30C9\u3092\u518D\u5B9A\u7FA9\u3057\u307E\u3059\n\ndisablegc <expr>          -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6291\u5236\u3057\u307E\u3059\nenablegc <expr>           -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u8A31\u53EF\u3057\u307E\u3059\n\n!!                        -- \u6700\u5F8C\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u7E70\u308A\u8FD4\u3057\u307E\u3059\n<n> <command>             -- \u30B3\u30DE\u30F3\u30C9\u3092n\u56DE\u7E70\u308A\u8FD4\u3057\u307E\u3059\n# <command>               -- \u7834\u68C4\u3057\u307E\u3059(\u64CD\u4F5C\u306A\u3057)\nhelp (\u307E\u305F\u306F?)               -- \u30B3\u30DE\u30F3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ndbgtrace [flag]           -- dbgtrace\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u540C\u3058\u3067\u3059\nversion                   -- \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nexit (\u307E\u305F\u306Fquit)            -- \u30C7\u30D0\u30C3\u30AC\u3092\u7D42\u4E86\u3057\u307E\u3059\n\n<class id>: \u30D1\u30C3\u30B1\u30FC\u30B8\u4FEE\u98FE\u5B50\u3092\u542B\u3080\u5B8C\u5168\u30AF\u30E9\u30B9\u540D\n<class pattern>: \u5148\u982D\u307E\u305F\u306F\u672B\u5C3E\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9('*')\u3092\u542B\u3080\u30AF\u30E9\u30B9\u540D\n<thread id>: 'threads'\u30B3\u30DE\u30F3\u30C9\u3067\u5831\u544A\u3055\u308C\u308B\u30B9\u30EC\u30C3\u30C9\u756A\u53F7\n<expr>: Java(TM)\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u306E\u5F0F\u3002\n\u307B\u3068\u3093\u3069\u306E\u4E00\u822C\u7684\u306A\u69CB\u6587\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\n\u8D77\u52D5\u30B3\u30DE\u30F3\u30C9\u306F\u3001\"jdb.ini\"\u307E\u305F\u306F\".jdbrc\"\u306B\u914D\u7F6E\u3067\u304D\u307E\u3059\n(user.home\u307E\u305F\u306Fuser.dir\u5185)"},
+             "** \u30B3\u30DE\u30F3\u30C9\u30FB\u30EA\u30B9\u30C8 **\nconnectors                -- \u3053\u306EVM\u5185\u306E\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3068\u30C8\u30E9\u30F3\u30B9\u30DD\u30FC\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nrun [class [args]]        -- \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u5B9F\u884C\u3092\u958B\u59CB\u3057\u307E\u3059\n\nthreads [threadgroup]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthread <thread id>        -- \u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\nsuspend [thread id(s)]    -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nresume [thread id(s)]     -- \u30B9\u30EC\u30C3\u30C9\u3092\u518D\u958B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8: \u3059\u3079\u3066)\nwhere [<thread id> | all] -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30C0\u30F3\u30D7\u3057\u307E\u3059\nwherei [<thread id> | all]-- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092pc\u60C5\u5831\u3068\u3068\u3082\u306B\u30C0\u30F3\u30D7\u3057\u307E\u3059\nup [n frames]             -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0A\u306B\u79FB\u52D5\u3057\u307E\u3059\ndown [n frames]           -- \u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u4E0B\u306B\u79FB\u52D5\u3057\u307E\u3059\nkill <thread id> <expr>   -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u30B9\u30EC\u30C3\u30C9\u3092\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\ninterrupt <thread id>     -- \u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n\nprint <expr>              -- \u5F0F\u306E\u5024\u3092\u51FA\u529B\u3057\u307E\u3059\ndump <expr>               -- \u3059\u3079\u3066\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\neval <expr>               -- \u5F0F\u3092\u8A55\u4FA1\u3057\u307E\u3059(print\u3068\u540C\u3058)\nset <lvalue> = <expr>     -- \u65B0\u3057\u3044\u5024\u3092\u30D5\u30A3\u30FC\u30EB\u30C9/\u5909\u6570/\u914D\u5217\u8981\u7D20\u306B\u4EE3\u5165\u3057\u307E\u3059\nlocals                    -- \u73FE\u5728\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30D5\u30EC\u30FC\u30E0\u5185\u306E\u3059\u3079\u3066\u306E\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u3092\u51FA\u529B\u3057\u307E\u3059\n\nclasses                   -- \u73FE\u5728\u65E2\u77E5\u306E\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nclass <class id>          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u8A73\u7D30\u3092\u8868\u793A\u3057\u307E\u3059\nmethods <class id>        -- \u30AF\u30E9\u30B9\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nfields <class id>         -- \u30AF\u30E9\u30B9\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\nthreadgroups              -- \u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nthreadgroup <name>        -- \u73FE\u5728\u306E\u30B9\u30EC\u30C3\u30C9\u30B0\u30EB\u30FC\u30D7\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n                          -- \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u306E\u73FE\u5728\u306E\u30EA\u30B9\u30C8\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\n                          -- \"go\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u5F8C\u3059\u3050\u306B\u518D\u958B\u3057\u307E\u3059\n                          -- \"thread\"\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u505C\u6B62\u3057\u305F\u30B9\u30EC\u30C3\u30C9\u306E\u307F\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \"go\"\u3082\"thread\"\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u3001\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u3092\u4E2D\u65AD\u3057\u307E\u3059\n                          -- \u6574\u6570\u306E<thread_id>\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u30B9\u30EC\u30C3\u30C9\u3067\u306E\u307F\u505C\u6B62\u3057\u307E\u3059\n                          -- \"at\"\u3068\"in\"\u306F\u540C\u3058\u610F\u5473\u3092\u6301\u3061\u307E\u3059\n                          -- <location>\u306F\u884C\u756A\u53F7\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059:\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u30E1\u30BD\u30C3\u30C9\u5185\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear <class id>:<line>   -- \u884C\u306E\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30AF\u30EA\u30A2\u3057\u307E\u3059\nclear                     -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u304C\u767A\u751F\u3057\u305F\u3068\u304D\u306B\u30D6\u30EC\u30FC\u30AF\u3057\u307E\u3059\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u6307\u5B9A\u3055\u308C\u305F\u4F8B\u5916\u306E'catch'\u3092\u53D6\u308A\u6D88\u3057\u307E\u3059\nwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u3092\u30A6\u30A9\u30C3\u30C1\u3057\u307E\u3059\nunwatch [access|all] <class id>.<field name>\n                          -- \u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u307E\u305F\u306F\u5909\u66F4\u306E\u30A6\u30A9\u30C3\u30C1\u3092\u4E2D\u6B62\u3057\u307E\u3059\ntrace [go] methods [thread]\n                          -- \u30E1\u30BD\u30C3\u30C9\u306E\u5165\u308A\u53E3\u3068\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\u3002\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\ntrace [go] method exit | exits [thread]\n                          -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u51FA\u53E3\u3092\u30C8\u30EC\u30FC\u30B9\u3057\u307E\u3059\n                          -- 'go'\u304C\u6307\u5B9A\u3055\u308C\u308B\u307E\u3067\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u306F\u4E2D\u65AD\u3057\u307E\u3059\nuntrace [methods]         -- \u30E1\u30BD\u30C3\u30C9\u306E\u958B\u59CB\u307E\u305F\u306F\u7D42\u4E86\u306E\u30C8\u30EC\u30FC\u30B9\u3092\u505C\u6B62\u3057\u307E\u3059\nstep                      -- \u73FE\u5728\u306E\u884C\u3092\u5B9F\u884C\u3057\u307E\u3059\nstep up                   -- \u73FE\u5728\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u5143\u306B\u623B\u308B\u307E\u3067\u5B9F\u884C\u3057\u307E\u3059\nstepi                     -- \u73FE\u5728\u306E\u547D\u4EE4\u3092\u5B9F\u884C\u3057\u307E\u3059\nnext                      -- 1\u884C\u3092\u30B9\u30C6\u30C3\u30D7\u5B9F\u884C\u3057\u307E\u3059(\u547C\u51FA\u3057\u3092\u30B9\u30C6\u30C3\u30D7\u30AA\u30FC\u30D0\u30FC)\ncont                      -- \u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8\u304B\u3089\u5B9F\u884C\u3092\u7D9A\u884C\u3057\u307E\u3059\n\nlist [line number|method] -- \u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u3092\u51FA\u529B\u3057\u307E\u3059\nuse (or sourcepath) [source file path]\n                          -- \u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u3092\u8868\u793A\u307E\u305F\u306F\u5909\u66F4\u3057\u307E\u3059\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u6307\u5B9A\u3057\u305F\u30AF\u30E9\u30B9\u306E\u30B9\u30C6\u30C3\u30D7\u3084\u30E1\u30BD\u30C3\u30C9\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u5831\u544A\u3057\u307E\u305B\u3093\nclasspath                 -- \u30BF\u30FC\u30B2\u30C3\u30C8VM\u304B\u3089\u30AF\u30E9\u30B9\u30D1\u30B9\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\nmonitor <command>         -- \u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u505C\u6B62\u3059\u308B\u305F\u3073\u306B\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059\nmonitor                   -- \u30E2\u30CB\u30BF\u30FC\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\nunmonitor <monitor#>      -- \u30E2\u30CB\u30BF\u30FC\u3092\u524A\u9664\u3057\u307E\u3059\nread <filename>           -- \u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u3063\u3066\u5B9F\u884C\u3057\u307E\u3059\n\nlock <expr>               -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nthreadlocks [thread id]   -- \u30B9\u30EC\u30C3\u30C9\u306E\u30ED\u30C3\u30AF\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\n\npop                       -- \u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u307E\u3067\u306E\u3059\u3079\u3066\u306E\u30B9\u30BF\u30C3\u30AF\u3092\u30DD\u30C3\u30D7\u3057\u307E\u3059\nreenter                   -- pop\u3068\u540C\u3058\u3067\u3059\u304C\u3001\u73FE\u5728\u306E\u30D5\u30EC\u30FC\u30E0\u304C\u518D\u5165\u529B\u3055\u308C\u307E\u3059\nredefine <class id> <class file name>\n                          -- \u30AF\u30E9\u30B9\u306E\u30B3\u30FC\u30C9\u3092\u518D\u5B9A\u7FA9\u3057\u307E\u3059\n\ndisablegc <expr>          -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6291\u5236\u3057\u307E\u3059\nenablegc <expr>           -- \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u8A31\u53EF\u3057\u307E\u3059\n\n!!                        -- \u6700\u5F8C\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u7E70\u308A\u8FD4\u3057\u307E\u3059\n<n> <command>             -- \u30B3\u30DE\u30F3\u30C9\u3092n\u56DE\u7E70\u308A\u8FD4\u3057\u307E\u3059\nrepeat                    -- GDB\u5F62\u5F0F\u306E\u7A7A\u306E\u30B3\u30DE\u30F3\u30C9\u306E\u7E70\u8FD4\u3057\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u304B\u3069\u3046\u304B\u3092\u793A\u3057\u307E\u3059\nrepeat <on|off>           -- GDB\u5F62\u5F0F\u306E\u7E70\u8FD4\u3057\u3092\u6709\u52B9/\u7121\u52B9\u306B\u3057\u307E\u3059\n# <command>               -- \u7834\u68C4\u3057\u307E\u3059(\u64CD\u4F5C\u306A\u3057)\nhelp (\u307E\u305F\u306F?)               -- \u30B3\u30DE\u30F3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\ndbgtrace [flag]           -- dbgtrace\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u540C\u3058\u3067\u3059\nversion                   -- \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u307E\u3059\nexit (\u307E\u305F\u306Fquit)            -- \u30C7\u30D0\u30C3\u30AC\u3092\u7D42\u4E86\u3057\u307E\u3059\n\n<class id>: \u30D1\u30C3\u30B1\u30FC\u30B8\u4FEE\u98FE\u5B50\u3092\u542B\u3080\u5B8C\u5168\u30AF\u30E9\u30B9\u540D\n<class pattern>: \u5148\u982D\u307E\u305F\u306F\u672B\u5C3E\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9('*')\u3092\u542B\u3080\u30AF\u30E9\u30B9\u540D\n<thread id>: 'threads'\u30B3\u30DE\u30F3\u30C9\u3067\u5831\u544A\u3055\u308C\u308B\u30B9\u30EC\u30C3\u30C9\u756A\u53F7\n<expr>: Java(TM)\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u306E\u5F0F\u3002\n\u307B\u3068\u3093\u3069\u306E\u4E00\u822C\u7684\u306A\u69CB\u6587\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n\n\u8D77\u52D5\u30B3\u30DE\u30F3\u30C9\u306F\u3001\"jdb.ini\"\u307E\u305F\u306F\".jdbrc\"\u306B\u914D\u7F6E\u3067\u304D\u307E\u3059\n(user.home\u307E\u305F\u306Fuser.dir\u5185)"},
         {"zz usage text",
              "\u4F7F\u7528\u65B9\u6CD5: {0} <options> <class> <arguments>\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n    -? -h --help -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n    -sourcepath <directories separated by \"{1}\">\n                      \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n    -attach <address>\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306B\u63A5\u7D9A\u3059\u308B\n    -listen <address>\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u6307\u5B9A\u3055\u308C\u305F\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306E\u63A5\u7D9A\u3092\u5F85\u6A5F\u3059\u308B\n    -listenany\n                      \u6A19\u6E96\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u4F7F\u7528\u53EF\u80FD\u306A\u4EFB\u610F\u306E\u30A2\u30C9\u30EC\u30B9\u3067\u5B9F\u884C\u4E2D\u306EVM\u306E\u63A5\u7D9A\u3092\u5F85\u6A5F\u3059\u308B\n    -launch\n                      ''run''\u30B3\u30DE\u30F3\u30C9\u3092\u5F85\u6A5F\u305B\u305A\u306BVM\u3092\u5373\u6642\u306B\u8D77\u52D5\u3059\u308B\n    -listconnectors   \u3053\u306EVM\u3067\u4F7F\u7528\u53EF\u80FD\u306A\u30B3\u30CD\u30AF\u30BF\u3092\u30EA\u30B9\u30C8\u3059\u308B\n    -connect <connector-name>:<name1>=<value1>,...\n                      \u6307\u5B9A\u3055\u308C\u305F\u30B3\u30CD\u30AF\u30BF\u3092\u4F7F\u7528\u3057\u3066\u3001\u30EA\u30B9\u30C8\u3055\u308C\u305F\u5F15\u6570\u5024\u3067\u30BF\u30FC\u30B2\u30C3\u30C8VM\u306B\u63A5\u7D9A\u3059\u308B\n    -dbgtrace [flags] {0}\u306E\u30C7\u30D0\u30C3\u30B0\u306E\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B\n    -tclient          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092HotSpot(TM) Client Compiler\u3067\u5B9F\u884C\u3059\u308B\n    -tserver          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092HotSpot(TM) Server Compiler\u3067\u5B9F\u884C\u3059\u308B\n\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u8EE2\u9001\u3055\u308C\u307E\u3059:\n    -v -verbose[:class|gc|jni]\n                      \u8A73\u7D30\u30E2\u30FC\u30C9\u3092\u30AA\u30F3\u306B\u3059\u308B\n    -D<name>=<value>  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n    -classpath <directories separated by \"{1}\">\n                      \u30AF\u30E9\u30B9\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u30EA\u30B9\u30C8\u3059\u308B\n    -X<option>        \u975E\u6A19\u6E96\u306E\u30BF\u30FC\u30B2\u30C3\u30C8VM\u30AA\u30D7\u30B7\u30E7\u30F3\n\n<class>\u306F\u30C7\u30D0\u30C3\u30B0\u3092\u958B\u59CB\u3059\u308B\u30AF\u30E9\u30B9\u306E\u540D\u524D\u3067\u3059\n<arguments>\u306F<class>\u306Emain()\u30E1\u30BD\u30C3\u30C9\u306B\u6E21\u3055\u308C\u308B\u5F15\u6570\u3067\u3059\n\n\u30B3\u30DE\u30F3\u30C9\u306E\u30D8\u30EB\u30D7\u306B\u3064\u3044\u3066\u306F{0}\u30D7\u30ED\u30F3\u30D7\u30C8\u3067''help''\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
         // END OF MATERIAL TO LOCALIZE
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
index 6c4be977705..5de5fdd990e 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"breakpoint", "\u65AD\u70B9{0}"},
         {"Breakpoints set:", "\u65AD\u70B9\u96C6:"},
         {"Breakpoints can be located only in classes.", "\u65AD\u70B9\u53EA\u80FD\u4F4D\u4E8E\u7C7B\u4E2D\u3002{0}\u662F\u63A5\u53E3\u6216\u6570\u7EC4\u3002"},
-        {"Can only trace", "\u53EA\u80FD\u8DDF\u8E2A 'methods', 'method exit' \u6216 'method exits'"},
+        {"Can only trace", "\u53EA\u80FD\u8DDF\u8E2A 'methods'\u3001'method exit' \u6216 'method exits'"},
         {"cannot redefine existing connection", "{0}\u65E0\u6CD5\u91CD\u65B0\u5B9A\u4E49\u73B0\u6709\u8FDE\u63A5"},
         {"Cannot assign to a method invocation", "\u65E0\u6CD5\u5206\u914D\u5230\u65B9\u6CD5\u8C03\u7528"},
         {"Cannot specify command line with connector:", "\u65E0\u6CD5\u6307\u5B9A\u5E26\u6709\u8FDE\u63A5\u5668\u7684\u547D\u4EE4\u884C: {0}"},
@@ -115,8 +115,8 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"Error reading file", "\u8BFB\u53D6 ''{0}'' \u65F6\u51FA\u9519 - {1}"},
         {"Error redefining class to file", "\u5C06{0}\u91CD\u65B0\u5B9A\u4E49\u4E3A{1}\u65F6\u51FA\u9519 - {2}"},
         {"exceptionSpec all", "\u6240\u6709{0}"},
-        {"exceptionSpec caught", "\u6355\u83B7\u7684{0}"},
-        {"exceptionSpec uncaught", "\u672A\u6355\u83B7\u7684{0}"},
+        {"exceptionSpec caught", "\u6355\u83B7\u7684 {0}"},
+        {"exceptionSpec uncaught", "\u672A\u6355\u83B7\u7684 {0}"},
         {"Exception in expression:", "\u8868\u8FBE\u5F0F\u4E2D\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0}"},
         {"Exception occurred caught", "\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0} (\u5C06\u5728\u4EE5\u4E0B\u4F4D\u7F6E\u6355\u83B7: {1})"},
         {"Exception occurred uncaught", "\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF: {0} (\u672A\u6355\u83B7)"},
@@ -192,7 +192,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"locationString", "{0}.{1}(), \u884C={2,number,integer} bci={3,number,integer}"},
         {"Main class and arguments must be specified", "\u5FC5\u987B\u6307\u5B9A\u4E3B\u7C7B\u548C\u53C2\u6570"},
         {"Method arguments:", "\u65B9\u6CD5\u53C2\u6570:"},
-        {"Method entered:", "\u5DF2\u8FDB\u5165\u65B9\u6CD5: "},
+        {"Method entered:", "\u5DF2\u8FDB\u5165\u65B9\u6CD5\uFF1A"},
         {"Method exited:",  "\u5DF2\u9000\u51FA\u65B9\u6CD5"},
         {"Method exitedValue:", "\u5DF2\u9000\u51FA\u65B9\u6CD5: \u8FD4\u56DE\u503C = {0}, "},
         {"Method is overloaded; specify arguments", "\u5DF2\u91CD\u8F7D\u65B9\u6CD5{0}; \u8BF7\u6307\u5B9A\u53C2\u6570"},
@@ -253,9 +253,9 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
          "\u7528\u6CD5\uFF1Astop [go|thread] [<thread_id>] <at|in> <location>\n  \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n  \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n  \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n  \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n  \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n  <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n    <class_id>:<line_number>\n    <class_id>.<method>[(argument_type,...)]"
         },
         {"Removed:", "\u5DF2\u5220\u9664: {0}"},
-        {"repeat is on", "Repeat is on"},
-        {"repeat is off", "Repeat is off"},
-        {"repeat usage", "Usage: repeat <on|off>"},
+        {"repeat is on", "\u91CD\u590D\u5904\u4E8E\u542F\u7528\u72B6\u6001"},
+        {"repeat is off", "\u91CD\u590D\u5904\u4E8E\u7981\u7528\u72B6\u6001"},
+        {"repeat usage", "\u7528\u6CD5\uFF1Arepeat <on|off>"},
         {"Requested stack frame is no longer active:", "\u8BF7\u6C42\u7684\u5806\u6808\u5E27\u4E0D\u518D\u6709\u6548: {0,number,integer}"},
         {"run <args> command is valid only with launched VMs", "'run <args>' \u547D\u4EE4\u4EC5\u5BF9\u542F\u52A8\u7684 VM \u6709\u6548"},
         {"run", "\u8FD0\u884C{0}"},
@@ -302,6 +302,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"Thread has been resumed", "\u5DF2\u6062\u590D\u7EBF\u7A0B"},
         {"Thread not suspended", "\u672A\u6302\u8D77\u7EBF\u7A0B"},
         {"thread group number description name", "{0,number,integer}\u3002{1} {2}"},
+        {"Threadgroup name not specified.", "\u672A\u6307\u5B9A\u7EBF\u7A0B\u7EC4\u540D\u3002"},
         {"<thread_id> option not valid until the VM is started with the run command",
          "\u5728\u4F7F\u7528 run \u547D\u4EE4\u542F\u52A8 VM \u524D\uFF0C<thread_id> \u9009\u9879\u65E0\u6548"},
         {"Threads must be suspended", "\u5FC5\u987B\u6302\u8D77\u7EBF\u7A0B"},
@@ -338,7 +339,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
         {"watch accesses of", "\u76D1\u89C6{0}.{1}\u7684\u8BBF\u95EE"},
         {"watch modification of", "\u76D1\u89C6{0}.{1}\u7684\u4FEE\u6539"},
         {"zz help text",
-             "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u8BBE\u7F6E\u65AD\u70B9\n                          -- \u5982\u679C\u672A\u63D0\u4F9B\u4EFB\u4F55\u9009\u9879\uFF0C\u5219\u5C06\u6253\u5370\u5F53\u524D\u65AD\u70B9\u5217\u8868\n                          -- \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n                          -- \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n                          -- \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n                          -- \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n                          -- \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n                          -- <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\n\u4E0B\u4E00\u6B65                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\ndbgtrace [flag]           -- \u4E0E dbgtrace \u547D\u4EE4\u884C\u9009\u9879\u76F8\u540C\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
+             "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop [go|thread] [<thread_id>] <at|in> <location>\n                          -- \u8BBE\u7F6E\u65AD\u70B9\n                          -- \u5982\u679C\u672A\u63D0\u4F9B\u4EFB\u4F55\u9009\u9879\uFF0C\u5219\u5C06\u6253\u5370\u5F53\u524D\u65AD\u70B9\u5217\u8868\n                          -- \u5982\u679C\u6307\u5B9A \"go\"\uFF0C\u5219\u5728\u505C\u6B62\u540E\u7ACB\u5373\u6062\u590D\n                          -- \u5982\u679C\u6307\u5B9A \"thread\"\uFF0C\u5219\u4EC5\u6302\u8D77\u5728\u5176\u4E2D\u505C\u6B62\u7684\u7EBF\u7A0B\n                          -- \u5982\u679C\u65E2\u672A\u6307\u5B9A \"go\" \u4E5F\u672A\u6307\u5B9A \"thread\"\uFF0C\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\n                          -- \u5982\u679C\u6307\u5B9A\u4EE5\u6574\u6570\u8868\u793A\u7684 <thread_id>\uFF0C\u5219\u4EC5\u5728\u6307\u5B9A\u7684\u7EBF\u7A0B\u4E2D\u505C\u6B62\n                          -- \"at\" \u548C \"in\" \u7684\u542B\u4E49\u76F8\u540C\n                          -- <location> \u53EF\u4EE5\u662F\u884C\u53F7\u6216\u65B9\u6CD5\uFF1A\n                          --   <class_id>:<line_number>\n                          --   <class_id>.<method>[(argument_type,...)]\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\n\u4E0B\u4E00\u6B65                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\nrepeat                    -- \u663E\u793A\u662F\u5426\u542F\u7528\u4E86 GDB \u6837\u5F0F\u7684\u7A7A\u547D\u4EE4\u91CD\u590D\nrepeat <on|off>           -- \u542F\u7528/\u7981\u7528 GDB \u6837\u5F0F\u7684\u91CD\u590D\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\ndbgtrace [flag]           -- \u4E0E dbgtrace \u547D\u4EE4\u884C\u9009\u9879\u76F8\u540C\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
         {"zz usage text",
              "\u7528\u6CD5\uFF1A{0} <\u9009\u9879> <\u7C7B> <\u53C2\u6570>\n\n\u5176\u4E2D\uFF0C\u9009\u9879\u5305\u62EC\uFF1A\n    -? -h --help -help \u8F93\u51FA\u6B64\u6D88\u606F\u5E76\u9000\u51FA\n    -sourcepath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u8981\u5728\u5176\u4E2D\u67E5\u627E\u6E90\u6587\u4EF6\u7684\u76EE\u5F55\n    -attach <\u5730\u5740>\n                      \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u9644\u52A0\u5230\u6307\u5B9A\u5730\u5740\u5904\u6B63\u5728\u8FD0\u884C\u7684 VM\n    -listen <\u5730\u5740>\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u6307\u5B9A\u5730\u5740\u5904\u8FDE\u63A5\n    -listenany\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u4EFB\u4F55\u53EF\u7528\u5730\u5740\u5904\u8FDE\u63A5\n    -launch\n                      \u7ACB\u5373\u542F\u52A8 VM \u800C\u4E0D\u662F\u7B49\u5F85 ''run'' \u547D\u4EE4\n    -listconnectors   \u5217\u51FA\u6B64 VM \u4E2D\u7684\u53EF\u7528\u8FDE\u63A5\u5668\n    -connect <\u8FDE\u63A5\u5668\u540D\u79F0>:<\u540D\u79F0 1>=<\u503C 1>,...\n                      \u4F7F\u7528\u6240\u5217\u53C2\u6570\u503C\u901A\u8FC7\u6307\u5B9A\u7684\u8FDE\u63A5\u5668\u8FDE\u63A5\u5230\u76EE\u6807 VM\n    -dbgtrace [flags] \u8F93\u51FA\u8C03\u8BD5 {0} \u7684\u4FE1\u606F\n    -tclient          \u5728 HotSpot(TM) \u5BA2\u6237\u673A\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n    -tserver          \u5728 HotSpot(TM) \u670D\u52A1\u5668\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n\n\u8F6C\u53D1\u5230\u88AB\u8C03\u8BD5\u8FDB\u7A0B\u7684\u9009\u9879\uFF1A\n    -v -verbose[:class|gc|jni]\n                      \u542F\u7528\u8BE6\u7EC6\u6A21\u5F0F\n    -D<\u540D\u79F0>=<\u503C>  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -classpath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u5217\u51FA\u8981\u5728\u5176\u4E2D\u67E5\u627E\u7C7B\u7684\u76EE\u5F55\n    -X<\u9009\u9879>        \u975E\u6807\u51C6\u76EE\u6807 VM \u9009\u9879\n\n<\u7C7B> \u662F\u8981\u5F00\u59CB\u8C03\u8BD5\u7684\u7C7B\u7684\u540D\u79F0\n<\u53C2\u6570> \u662F\u4F20\u9012\u5230 <\u7C7B> \u7684 main() \u65B9\u6CD5\u7684\u53C2\u6570\n\n\u8981\u83B7\u5F97\u547D\u4EE4\u7684\u5E2E\u52A9\uFF0C\u8BF7\u5728 {0} \u63D0\u793A\u4E0B\u952E\u5165 ''help''"},
         // END OF MATERIAL TO LOCALIZE
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
new file mode 100644
index 00000000000..28c0afa3894
--- /dev/null
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi_de.properties
@@ -0,0 +1,77 @@
+#
+# Copyright (c) 2010, 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.
+#
+
+true = true
+false = false
+version_format = Java Debug Interface (Referenzimplementierung) Version {0}.{1} \n{2}
+raw.command = Raw-Befehl zum Starten der Anwendungs-VM nach dem Debuggen
+raw.command.label = Befehl
+raw.address = Adresse, von der aus nach einer Verbindung gehorcht wird, wenn der Raw-Befehl ausgef\u00FChrt wurde
+raw.address.label = Adresse
+raw.quote = Zeichen, das verwendet wird, um leerzeichengetrennten Text zu einem einzigen Befehlszeilenargument zu kombinieren
+raw.quote.label = Anf\u00FChrungszeichen
+raw.description = Startet das Ziel mit einer vom Benutzer angegebenen Befehlszeile und wird daran angeh\u00E4ngt
+sun.home = Home-Verzeichnis des SDK oder der Laufzeitumgebung, die zum Starten der Anwendung verwendet wird
+sun.home.label = Home 
+sun.options = Gestartete VM-Optionen
+sun.options.label = Optionen
+sun.main = Hauptklasse und Argumente, oder, wenn -jar eine Option ist, die Haupt-JAR-Datei und Argumente
+sun.main.label = Haupt
+sun.init_suspend = Alle Threads werden vor der Ausf\u00FChrung von "main" unterbrochen
+sun.init_suspend.label = Unterbrechen
+sun.quote = Zeichen, das verwendet wird, um leerzeichengetrennten Text zu einem einzigen Befehlszeilenargument zu kombinieren
+sun.quote.label = Anf\u00FChrungszeichen
+sun.vm_exec = Name des Java-VM-Launchers
+sun.vm_exec.label = Launcher
+sun.description = Startet das Ziel mit einer Sun Java VM-Befehlszeile und wird daran angeh\u00E4ngt
+generic_attaching.address = Adresse zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+generic_attaching.address.label = Adresse
+generic_attaching.timeout = Timeout beim Warten auf das Anh\u00E4ngen 
+generic_attaching.timeout.label = Timeout
+generic_listening.address = Adresse f\u00FCr das Horchen nach VM-Verbindungen
+generic_listening.address.label = Adresse
+generic_listening.timeout = Timeout beim Warten auf Verbindung
+generic_listening.timeout.label = Timeout
+socket_transportservice.description = Verbindet Debugger und zu debuggendes Programm \u00FCber eine TCP-Verbindung
+memory_transportservice.description = Verbindet Debugger und zu debuggendes Programm \u00FCber eine gemeinsame Speicherverbindung
+socket_attaching.host = Rechnername zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+socket_attaching.host.label = Host
+socket_attaching.port = Portnummer zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+socket_attaching.port.label = Port
+socket_attaching.description = Wird \u00FCber das Socket an andere VMs angeh\u00E4ngt
+socket_listening.localaddr = Lokale Adresse, an die der Listener gebunden wird
+socket_listening.localaddr.label = Lokale Adresse
+socket_listening.port = Portnummer f\u00FCr das Horchen nach VM-Verbindungen
+socket_listening.port.label = Port
+socket_listening.description = Akzeptiert Socket-Verbindungen, die von anderen VMs initiiert werden
+memory_attaching.name = Name des gemeinsamen Speicherbereichs zum Anh\u00E4ngen f\u00FCr VM-Verbindungen
+memory_attaching.name.label = Name
+memory_attaching.description = Wird \u00FCber gemeinsamen Speicher an andere VMs angeh\u00E4ngt
+memory_listening.name = Name des gemeinsamen Speicherbereichs f\u00FCr das Horchen nach VM-Verbindungen
+memory_listening.name.label = Name
+memory_listening.description = Akzeptiert gemeinsame Speicherverbindungen, die von anderen VMs initiiert werden
+process_attaching.description = Wird \u00FCber die Prozess-ID (pid) an das zu debuggende Programm angeh\u00E4ngt
+process_attaching.pid = pid
+process_attaching.pid.label = Prozess-ID (pid) des zu debuggenden Programms
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
new file mode 100644
index 00000000000..4c5ae6c3814
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink_de.properties
@@ -0,0 +1,105 @@
+#
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.usage.summary=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+main.usage=Verwendung: {0} <Optionen> --module-path <Modulpfad> --add-modules <Modul>[,<Modul>...]\nM\u00F6gliche Optionen:
+
+main.opt.help=\  -h, --help, -?                        Gibt diese Hilfemeldung aus
+
+main.opt.version=\      --version                         Versionsinformationen
+
+main.opt.module-path=\  -p, --module-path <Pfad>              Modulpfad.\n                                        Wird er nicht angegeben, wird das jmods-Verzeichnis des JDK\n                                        verwendet, falls vorhanden. Wird er angegeben,\n                                        aber enth\u00E4lt er nicht das Modul java.base,\n                                        wird das jmods-Verzeichnis des JDK hinzugef\u00FCgt,\n                                        falls vorhanden.
+
+main.opt.add-modules=\      --add-modules <Mod>[,<Mod>...]    Root-Module, die zus\u00E4tzlich zu den anf\u00E4nglichen\n                                        Modulen aufgel\u00F6st werden. <Mod> kann auch ALL-MODULE-PATH sein.
+
+main.opt.limit-modules=\      --limit-modules <Mod>[,<Mod>...]  Begrenzt den Bereich der beobachtbaren\n                                        Module
+
+main.opt.output=\      --output <Pfad>                   Ort des Ausgabepfads
+
+main.opt.launcher=\      --launcher <Name>=<Modul>[/<Hauptklasse>]\n                                        F\u00FCgt einen Launcher-Befehl mit dem angegebenen\n                                        Namen f\u00FCr das Modul und die Hauptklasse hinzu,\n                                        falls angegeben  
+
+main.opt.bind-services=\      --bind-services                   Bindet Serviceprovidermodule und ihre\n                                        Abh\u00E4ngigkeiten ein
+
+main.opt.suggest-providers=\      --suggest-providers [<Name>,...]  Schl\u00E4gt Provider vor, welche die angegebenen\n                                        Servicetypen aus dem Modulpfad implementieren
+
+main.command.files=\      @<Dateiname>                       Liest Optionen aus der Datei
+
+main.opt.endian=\      --endian <little|big>             Bytereihenfolge des generierten jimage\n                                        (Standard: nativ)
+
+main.opt.save-opts=\      --save-opts <Dateiname>            Speichert jlink-Optionen in der angegebenen Datei
+
+main.opt.ignore-signing-information=\      --ignore-signing-information      Unterdr\u00FCckt einen schwerwiegenden Fehler, wenn signierte\n                                        modulare JAR-Dateien in das Image eingebunden werden.\n                                        Die signaturbezogenen Dateien der signierten\n                                        modularen JAR-Dateien werden nicht in das\n                                        Laufzeitimage kopiert.
+
+main.opt.verbose=\  -v, --verbose                         Aktiviert Verbose-Tracing
+
+main.msg.bug=Eine Ausnahme ist in jlink aufgetreten. Melden Sie in der Java-Bugdatenbank (http://bugreport.java.com/bugreport/) einen Bug, nachdem Sie die Bugdatenbank auf Duplikate gepr\u00FCft haben. Geben Sie in Ihrem Bericht Ihr Programm und die folgende Diagnose an. Vielen Dank.
+
+main.extended.help=Liste der verf\u00FCgbaren Plug-ins:
+
+main.extended.help.footer=Bei Optionen, die eine <Musterliste> erfordern, ist der Wert eine kommagetrennte\nListe von Elementen, die jeweils eines der folgenden Formate verwenden:\n  <Globales Muster>\n  glob:<Globales Muster>\n  regex:<Regex-Muster>\n  @<Dateiname>, wobei der Dateiname der Name einer Datei mit zu verwendenden Mustern ist,\n              ein Muster pro Zeile\n\n
+
+error.prefix=Fehler:
+warn.prefix=Warnung:
+
+err.empty.module.path=leerer Modulpfad
+err.jlink.version.mismatch=jlink-Version {0}.{1} stimmt nicht mit Ziel-java.base-Version {2}.{3} \u00FCberein
+err.automatic.module:automatisches Modul kann nicht mit jlink verwendet werden: {0} aus {1}
+err.unknown.byte.order:unbekannte Bytereihenfolge {0}
+err.launcher.main.class.empty:Launcher-Hauptklassenname darf nicht leer sein: {0}
+err.launcher.module.name.empty:Launcher-Modulname darf nicht leer sein: {0}
+err.launcher.value.format:Launcher-Wert muss folgendes Format haben: <Befehl>=<Modul>[/<Hauptklasse>]: {0}
+err.output.must.be.specified:--output muss angegeben werden
+err.modulepath.must.be.specified:--module-path ist nicht angegeben, und dieses Laufzeitimage enth\u00E4lt nicht das jmods-Verzeichnis.
+err.mods.must.be.specified:keine Module zum {0} angegeben
+err.path.not.found=Pfad nicht gefunden: {0}
+err.path.not.valid=ung\u00FCltiger Pfad: {0}
+err.image.must.exist=Image {0} ist nicht vorhanden oder ist kein Verzeichnis
+err.existing.image.invalid=vorhandenes Image ist ung\u00FCltig
+err.file.not.found=Datei nicht gefunden: {0}
+err.file.error=Zugriff nicht m\u00F6glich auf Datei: {0}
+err.dir.exists={0} ist bereits vorhanden
+err.badpattern=ung\u00FCltiges Muster {0}
+err.unknown.option=unbekannte Option: {0}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.internal.error=interner Fehler: {0} {1} {2}
+err.invalid.arg.for.option={0} akzeptiert nicht das Argument "{1}"
+err.option.after.class=Option muss angegeben werden vor den Klassen: {0}
+err.option.unsupported={0} nicht unterst\u00FCtzt: {1}
+err.orphan.arguments=ung\u00FCltiges Argument: {0}
+err.config.defaults=Eigenschaft {0} fehlt in der Konfiguration
+err.config.defaults.value=falscher Wert in Standardeigenschaft: {0}
+err.bom.generation=Generierung der BOM-Datei nicht erfolgreich: {0}
+err.not.a.module.directory=Unter Verzeichnis {0} ist keine Datei module-info.class vorhanden
+err.cannot.read.module.info=Moduldeskriptor kann nicht gelesen werden aus {0}
+err.not.modular.format=ausgew\u00E4hltes Modul {0} ({1}) hat nicht das jmod- oder modulare JAR-Format
+err.signing=signierte modulare JAR-Datei {0} wird gegenw\u00E4rtig nicht unterst\u00FCtzt, verwenden Sie --ignore-signing-information, um den Fehler zu unterdr\u00FCcken
+warn.signing=WARNUNG: Signierte modulare JAR-Datei {0} wird gegenw\u00E4rtig nicht unterst\u00FCtzt
+warn.invalid.arg=ung\u00FCltiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
+warn.split.package=Package {0}, definiert in {1} {2}
+warn.provider.notfound=Kein Provider f\u00FCr Service angegeben f\u00FCr --suggest-providers: {0}
+no.suggested.providers=Option --bind-services ist angegeben. Keine weiteren Provider vorgeschlagen.
+suggested.providers.header=Vorgeschlagene Provider
+providers.header=Provider
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
new file mode 100644
index 00000000000..c2414078270
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
@@ -0,0 +1,224 @@
+#
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+add-options.argument=<Optionen>
+
+add-options.description=Stellt die angegebene <Optionen>-Zeichenfolge, die Leerzeichen enthalten\nkann, anderen Optionen voran, wenn die virtuelle Maschine im\nresultierenden Image aufgerufen wird.
+
+add-options.usage=\  --add-options <Optionen>   Stellt die angegebene <Optionen>-Zeichenfolge,\n                            die Leerzeichen enthalten kann, anderen Optionen voran, wenn\n                            die virtuelle Maschine im resultierenden Image aufgerufen wird.
+
+release-info.argument=<Datei>|add:<Schl\u00FCssel1>=<Wert1>:<Schl\u00FCssel2>=<Wert2>:...|del:<Schl\u00FCsselliste>
+
+release-info.description=<Datei>-Option l\u00E4dt Releaseeigenschaften aus der angegebenen Datei.\nadd: f\u00FCgt der Datei "release" Eigenschaften hinzu.\nEine beliebige Anzahl von <Schl\u00FCssel>=<Wert>-Paaren kann \u00FCbergeben werden.\ndel: l\u00F6scht die Liste der Schl\u00FCssel in der Releasedatei.
+
+release-info.usage=\  --release-info <Datei>|add:<Schl\u00FCssel1>=<Wert1>:<Schl\u00FCssel2>=<Wert2>:...|del:<Schl\u00FCsselliste>\n                            Option <Datei> l\u00F6scht Releaseeigenschaften aus\n                            der angegebenen Datei.\n                            add: f\u00FCgt Eigenschaften der Datei "release" hinzu.\n                            Eine beliebige Anzahl <Schl\u00FCssel>=<Wert>-Paare kann \u00FCbergeben werden.\n                            del: l\u00F6scht die Liste der Schl\u00FCssel in der Releasedatei.
+
+class-for-name.argument=
+
+class-for-name.description=Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorg\u00E4nge.
+
+class-for-name.usage=\  --class-for-name          Klassenoptimierung: Konvertiert Class.forName-Aufrufe in Konstantenladevorg\u00E4nge.
+
+compress.argument=<0|1|2>[:filter=<Musterliste>]
+
+compress.description=Komprimiert alle Ressourcen im Ausgabeimage.\nEbene 0: Keine Komprimierung\nEbene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\nEbene 2: ZIP.\nEin optionaler <Musterliste>-Filter kann angegeben werden, um das Muster der\neinzuschlie\u00DFenden Dateien aufzulisten.
+
+compress.usage=\  --compress <0|1|2>[:filter=<Musterliste>]\n                            Komprimiert alle Ressourcen im Ausgabeimage.\n                            Ebene 0: Keine Komprimierung\n                            Ebene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                            Ebene 2: ZIP.\n                            Ein optionaler <Musterliste>-Filter kann angegeben\n                            werden, um das Muster der einzuschlie\u00DFenden\n                            Dateien aufzulisten.
+
+compact-cp.argument=<Ressourcenpfade>
+
+compact-cp.description=Gemeinsame Verwendung von Zeichenfolgen im Konstantenpool.\nStandardm\u00E4\u00DFig werden alle Ressourcen komprimiert. Sie k\u00F6nnen ausdr\u00FCcken, dass\nein Ressourcenset komprimiert oder nicht komprimiert werden soll (mit ^ f\u00FCr Negierung).
+
+compact-cp.usage=\ --compact-cp <Ressourcenpfade>\n                            Gemeinsame Verwendung von Zeichenfolgen im Konstantenpool.\n                            Standardm\u00E4\u00DFig werden alle Ressourcen komprimiert.\n                            Sie k\u00F6nnen ausdr\u00FCcken, dass ein Ressourcenset komprimiert\n                            oder nicht komprimiert werden soll (mit ^ f\u00FCr Negierung).
+
+dedup-legal-notices.argument=[error-if-not-same-content]
+
+dedup-legal-notices.description=Dedupliziert alle rechtlichen Hinweise. Wenn error-if-not-same-content\nangegeben wird, tritt ein Fehler auf, wenn zwei Dateien mit dem gleichen\nDateinamen unterschiedlich sind.
+
+dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            Dedupliziert alle rechtlichen Hinweise.\n                            Wenn error-if-not-same-content angegeben wird,\n                            tritt ein Fehler auf, wenn zwei Dateien mit dem gleichen\n                            Dateinamen unterschiedlich sind.
+
+exclude-files.argument=<Musterliste> der auszuschlie\u00DFenden Dateien
+
+exclude-files.description=Gibt die auszuschlie\u00DFenden Dateien an. Beispiel: **.java,glob:/java.base/lib/client/**
+
+exclude-files.usage=\  --exclude-files <Musterliste>\n                            Gibt die auszuschlie\u00DFenden Dateien an.\n                            Beispiel: **.java,glob:/java.base/lib/client/**
+
+exclude-resources.argument=<Musterliste> f\u00FCr auszuschlie\u00DFende Ressourcen
+
+exclude-resources.description=Gibt die auszuschlie\u00DFenden Ressourcen an. Beispiel: **.jcov,glob:**/META-INF/**
+
+exclude-resources.usage=\  --exclude-resources <Musterliste>\n                            Gibt die auszuschlie\u00DFenden Ressourcen an.\n                            Beispiel: **.jcov,glob:**/META-INF/**
+
+exclude-jmod-section.argument=<Abschnittname>\nwobei <Abschnittname> "man" oder "headers" lautet.
+
+exclude-jmod-section.description=Gibt einen auszuschlie\u00DFenden JMOD-Abschnitt an
+
+exclude-jmod-section.usage=\  --exclude-jmod-section <Abschnittname>\n                            Gibt einen auszuschlie\u00DFenden JMOD-Abschnitt an.\n                            Dabei lautet <Abschnittname> "man" oder "headers".
+
+
+generate-cds-archive.description=CDS-Plug-in: Generiert CDS-Archive, wenn das Laufzeitimage das CDS-Feature unterst\u00FCtzt.\n
+generate-cds-archive.usage=\  --generate-cds-archive    Generiert ein CDS-Archiv, wenn das Laufzeitimage das\n                            CDS-Feature unterst\u00FCtzt.
+
+generate-jli-classes.argument=@filename
+
+generate-jli-classes.description=Gibt eine Datei an, die java.lang.invoke-Klassen f\u00FCr die Vorabgenerierung auflistet. \nStandardm\u00E4\u00DFig kann dieses Plug-in eine integrierte Liste vorab zu generierender Klassen sein. \nWenn dieses Plug-in in einer anderen Laufzeitversion als das erstellte Image ausgef\u00FChrt wird, \nwird die Codegenerierung standardm\u00E4\u00DFig deaktiviert, damit die Richtigkeit gew\u00E4hrleistet \nist - kann durch Hinzuf\u00FCgen von ignore-version=true au\u00DFer Kraft gesetzt werden.
+
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                           Gibt eine Datei an, welche die java.lang.invoke-Klassen f\u00FCr die\n                           Vorabgenerierung auflistet. Standardm\u00E4\u00DFig kann dieses\n                           Plug-in eine integrierte Liste vorab zu generierender Klassen sein.\n                           Wenn dieses Plug-in in einer anderen Laufzeitversion als das\n                           erstellte Image ausgef\u00FChrt wird, wird die Codegenerierung standardm\u00E4\u00DFig\n                          deaktiviert, damit die Richtigkeit gew\u00E4hrleistet ist - kann durch\n                           Hinzuf\u00FCgen von ignore-version=true au\u00DFer Kraft gesetzt werden.
+
+system-modules.argument=retainModuleTarget
+
+system-modules.description=Schnelles Laden der Moduldeskriptoren (immer aktiviert)
+
+system-modules.usage=\  --system-modules retainModuleTarget\n                            Schnelles Laden der Moduldeskriptoren (immer aktiviert)
+
+onoff.argument=<on|off>
+
+order-resources.argument=<Musterliste> der Pfade in der Reihenfolge ihrer Priorit\u00E4t. Wenn eine @file\nangegeben wird, muss jede Zeile genau \u00FCbereinstimmen, damit die Pfadsortierung m\u00F6glich ist
+
+order-resources.description=Sortiert Ressourcen. Beispiel: **/module-info.class,@classlist,/java.base/java/lang/**
+
+order-resources.usage=\  --order-resources <Musterliste>\n                            Sortiert Ressourcen. \n                            Beispiel: **/module-info.class,@classlist,\n                            /java.base/java/lang/**
+
+strip-debug.description=Entfernt Debuginformationen aus dem Ausgabeimage
+
+strip-debug.usage=\  --strip-debug             Entfernt Debuginformationen aus dem Ausgabeimage
+
+strip-java-debug-attributes.description=Entfernt Java-Debugattribute aus Klassen im Ausgabeimage
+
+strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            Entfernt Java-Debugattribute aus\n                            Klassen im Ausgabeimage
+
+strip-native-commands.description=Schlie\u00DFt native Befehle (wie java/java.exe) aus dem Image aus
+
+strip-native-commands.usage=\  --strip-native-commands   Schlie\u00DFt native Befehle (wie java/java.exe)\n                            aus dem Image aus.
+
+vendor-version.argument=<Herstellerversion>
+
+vendor-version.description=\u00DCberschreibt die Zeichenfolge f\u00FCr die Herstellerversion, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.version" lautet dann <Herstellerversion>.
+
+vendor-version.usage=\  --vendor-version <Herstellerversion>\n                            \u00DCberschreibt die Zeichenfolge f\u00FCr die Herstellerversion, die im\n                            Build enthalten ist, falls zutreffend. Der Wert der Systemeigenschaft\n                            "java.vendor.version" lautet dann <Herstellerversion>.
+
+vendor-bug-url.argument=<Bug-URL Hersteller>
+
+vendor-bug-url.description=\u00DCberschreibt die Bug-URL des Herstellers, die im Build enthalten ist, falls zutreffend.\nDer Wert der Systemeigenschaft "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
+
+vendor-bug-url.usage=\  --vendor-bug-url <Bug-URL Hersteller>\n                            \u00DCberschreibt die Bug-URL des Herstellers, die im Build enthalten ist.\n                            Der Wert der Systemeigenschaft\n                            "java.vendor.url.bug" lautet dann <Hersteller-URL Bug>.
+
+vendor-vm-bug-url.argument=<Hersteller-VM-Bug-URL>
+
+vendor-vm-bug-url.description=\u00DCberschreibt die VM-Bug-URL, die im Build enthalten ist. Die in\nVM-Fehlerlogs angezeigte URL lautet dann <Hersteller-VM-Bug-URL>.
+
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u00DCberschreibt die VM-Bug-URL, die im Build \n                            enthalten ist. Die in VM-Fehlerlogs angezeigte \n                            URL lautet dann <Hersteller-VM-Bug-URL>.
+
+vm.argument=<client|server|minimal|all>
+
+vm.description=W\u00E4hlt die HotSpot-VM im Ausgabeimage aus. Standardm\u00E4\u00DFig werden alle ausgew\u00E4hlt
+
+vm.usage=\  --vm <client|server|minimal|all>\n                            W\u00E4hlt die HotSpot-VM im Ausgabeimage aus.\n                            Standardm\u00E4\u00DFig werden alle ausgew\u00E4hlt
+
+zip.argument=[kommagetrennte Liste von Ressourcenpfaden]
+
+zip.description=ZIP-Komprimierung
+
+zip.usage=\  --zip [kommagetrennte Liste von Ressourcenpfaden]\n                            ZIP-Komprimierung
+
+include-locales.argument=<Sprachtag>[,<Sprachtag>]*
+
+include-locales.description=BCP 47-Sprachtags, durch Komma getrennt, die eine Gebietsschemazuordnung erlauben,\nwie in RFC 4647 definiert. Beispiel: en,ja,*-IN
+
+include-locales.usage=\  --include-locales <Sprachtag>[,<Sprachtag>]*\n                            BCP 47-Sprachtags durch Komma getrennt,\n                            die eine Gebietsschemazuordnung erlauben,\n                            wie in RFC 4647 definiert.\n                            Beispiel: en,ja,*-IN
+
+include-locales.missingpackages=fehlende Gebietsschema-Datenpackages in jdk.localedata:\n\t
+
+include-locales.nomatchinglocales=Keine \u00FCbereinstimmenden Gebietsschemas gefunden f\u00FCr "%s". Pr\u00FCfen Sie das angegebene Muster.
+
+include-locales.invalidtag=Ung\u00FCltiges Sprachtag: %s
+
+include-locales.localedatanotfound=Modul jdk.localedata wurde mit der Option --add-modules nicht angegeben
+
+main.status.ok=Funktional.
+
+main.status.not.ok= Nicht funktional.
+
+plugin.plugins.header=Liste der verf\u00FCgbaren Plug-in-Optionen:
+
+plugin.opt.list-plugins=\      --list-plugins                    Listet die verf\u00FCgbaren Plug-ins auf
+
+plugin.opt.post-process-path=\      --post-process-path <Imagedatei>   F\u00FChrt Nachverarbeitung eines vorhandenen Images aus
+
+plugin.opt.resources-last-sorter=\      --resources-last-sorter <Name>    Das letzte Plug-in, das Ressourcen\n                                        sortieren darf
+
+plugin.opt.disable-plugin=\      --disable-plugin <Plug-in-Name>     Deaktiviert das angegebene Plug-in
+
+plugin.opt.compress=\  -c, --compress=<0|1|2>                Aktiviert die Komprimierung von Ressourcen:\n                                          Ebene 0: Keine Komprimierung\n                                          Ebene 1: Gemeinsame Verwendung konstanter Zeichenfolgen\n                                          Ebene 2: ZIP
+
+plugin.opt.strip-debug=\  -G, --strip-debug                     Entfernt Debuginformationen
+
+plugin.opt.no-man-pages=\      --no-man-pages                    Schlie\u00DFt Manpages aus
+
+plugin.opt.no-header-files=\      --no-header-files                 Schlie\u00DFt Headerdateien aus
+
+main.plugin.name=Plug-in-Name
+
+main.plugin.class=Plug-in-Klasse
+
+main.plugin.module=Plug-in-Modul
+
+main.plugin.category=Kategorie
+
+main.plugin.description=Beschreibung
+
+main.plugin.post.processors=Imagepostprozessoren:
+
+main.plugin.argument=Argument
+
+main.plugin.range.from=Bereich von
+
+main.plugin.range.to=bis
+
+main.plugin.option=Option
+
+main.plugin.no.value=<leer>
+
+main.plugin.state=Funktionsstatus
+
+err.no.such.plugin=Plug-in nicht vorhanden: {0}
+
+err.provider.not.functional=Der Provider {0} ist nicht funktionsf\u00E4hig.
+
+err.plugin.mutiple.options=Mehrere Plug-ins aktiviert von Option {0}
+err.plugin.conflicts={0} ({1}) steht im Konflikt mit {2}. Verwenden Sie nur eine der Optionen, nicht beide.
+err.provider.additional.arg.error=Fehler bei der Angabe eines zus\u00E4tzlichen Arguments in der {0}-Option: {1}
+
+err.no.plugins.path=Kein Argument f\u00FCr Plug-in-Pfad.
+
+err.dir.already.exits=Verzeichnis ist bereits vorhanden: {0}
+
+err.invalid.index=ung\u00FCltiger Index f\u00FCr Option {0}
+
+err.plugin.option.not.set=Option {0} muss festgelegt werden
+
+warn.thirdparty.plugins=Das Aktivieren von Plug-ins anderer Hersteller kann dazu f\u00FChren, dass ein nicht verwendbares Image generiert wird.
+
+warn.thirdparty.plugins.enabled=Sie haben Plug-ins anderer Hersteller aktiviert.
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
new file mode 100644
index 00000000000..4b290ad2eb2
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
@@ -0,0 +1,224 @@
+#
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+add-options.argument=<options>
+
+add-options.description=\u6307\u5B9A\u3057\u305F<options>\u6587\u5B57\u5217\u3092\u5148\u982D\u306B\u4ED8\u52A0\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\n\u751F\u6210\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8D77\u52D5\u3059\u308B\u969B\u306B\u3001\n\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u524D\u306B\u7A7A\u767D\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
+
+add-options.usage=\  --add-options <options>   \u6307\u5B9A\u3057\u305F<options>\u6587\u5B57\u5217\u3092\u5148\u982D\u306B\u4ED8\u52A0\u3057\u307E\u3059\u3002\u3053\u308C\u306B\u306F\u3001\n                            \u751F\u6210\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u8D77\u52D5\u3059\u308B\u969B\u306B\u3001\n                            \u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u524D\u306B\u7A7A\u767D\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
+
+release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
+
+release-info.description=<file>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EA\u30EA\u30FC\u30B9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\nadd:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n\u4EFB\u610F\u306E\u6570\u306E<key>=<value>\u306E\u30DA\u30A2\u3092\u6E21\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\ndel:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AD\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002
+
+release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file>\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30EA\u30EA\u30FC\u30B9\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\n                            \u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\n                            add:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n                            \u4EFB\u610F\u306E\u6570\u306E<key>=<value>\u30DA\u30A2\u3092\u6E21\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n                            del:\u306F\u30EA\u30EA\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AD\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002
+
+class-for-name.argument=
+
+class-for-name.description=\u30AF\u30E9\u30B9\u306E\u6700\u9069\u5316: Class.forName\u547C\u51FA\u3057\u3092\u5B9A\u6570\u306E\u30ED\u30FC\u30C9\u306B\u5909\u63DB\u3057\u307E\u3059\u3002
+
+class-for-name.usage=\  --class-for-name          \u30AF\u30E9\u30B9\u306E\u6700\u9069\u5316: Class.forName\u547C\u51FA\u3057\u3092\u5B9A\u6570\u306E\u30ED\u30FC\u30C9\u306B\u5909\u63DB\u3057\u307E\u3059\u3002
+
+compress.argument=<0|1|2>[:filter=<pattern-list>]
+
+compress.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n\u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n\u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n\u30EC\u30D9\u30EB2: ZIP\u3002\n\u30AA\u30D7\u30B7\u30E7\u30F3\u306E<pattern-list>\u30D5\u30A3\u30EB\u30BF\u3092\u6307\u5B9A\u3057\u3066\u3001\u542B\u3081\u308B\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30BF\u30FC\u30F3\u3092\n\u30EA\u30B9\u30C8\u3067\u304D\u307E\u3059\u3002
+
+compress.usage=\  --compress <0|1|2>[:filter=<pattern-list>]\n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n                            \u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n                            \u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n                            \u30EC\u30D9\u30EB2: ZIP\u3002\n                            \u30AA\u30D7\u30B7\u30E7\u30F3\u306E<pattern-list>\u30D5\u30A3\u30EB\u30BF\u3092\n                            \u6307\u5B9A\u3057\u3066\u3001\u542B\u3081\u308B\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30BF\u30FC\u30F3\u3092\n                            \u30EA\u30B9\u30C8\u3067\u304D\u307E\u3059\u3002
+
+compact-cp.argument=<resource paths>
+
+compact-cp.description=\u5B9A\u6570\u30D7\u30FC\u30EB\u6587\u5B57\u5217\u3092\u5171\u6709\u3057\u307E\u3059\u3002\n\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\u30EA\u30BD\u30FC\u30B9\u306E\u30BB\u30C3\u30C8\u3092\n\u5727\u7E2E\u3059\u308B\u304B\u3057\u306A\u3044\u304B\u3092\u8868\u3057\u307E\u3059(\u5426\u5B9A\u306E\u5834\u5408\u306F^\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002
+
+compact-cp.usage=\ --compact-cp <resource paths>\n                             \u5B9A\u6570\u30D7\u30FC\u30EB\u6587\u5B57\u5217\u3092\u5171\u6709\u3057\u307E\u3059\u3002\n                             \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3059\u3079\u3066\u306E\u30EA\u30BD\u30FC\u30B9\u3092\u5727\u7E2E\u3057\u307E\u3059\u3002\n                             \u30EA\u30BD\u30FC\u30B9\u306E\u30BB\u30C3\u30C8\u3092\u5727\u7E2E\u3059\u308B\u304B\u3057\u306A\u3044\u304B\n                             \u3092\u8868\u3057\u307E\u3059(\u5426\u5B9A\u306E\u5834\u5408\u306F^\u3092\u4F7F\u7528\u3057\u307E\u3059)\u3002
+
+dedup-legal-notices.argument=[error-if-not-same-content]
+
+dedup-legal-notices.description=\u3059\u3079\u3066\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u91CD\u8907\u3092\u9664\u5916\u3057\u307E\u3059\u3002\nerror-if-not-same-content\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u540D\u306E2\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304C\n\u7570\u306A\u3063\u3066\u3044\u308B\u3068\u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
+
+dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            \u3059\u3079\u3066\u306E\u6CD5\u5F8B\u4E0A\u306E\u6CE8\u610F\u70B9\u306E\u91CD\u8907\u3092\u9664\u5916\u3057\u307E\u3059\u3002\n                            error-if-not-same-content\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\n                            \u540C\u3058\u30D5\u30A1\u30A4\u30EB\u540D\u306E2\u3064\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u7570\u306A\u3063\u3066\u3044\u308B\u3068\n                            \u30A8\u30E9\u30FC\u306B\u306A\u308A\u307E\u3059\u3002
+
+exclude-files.argument=\u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u306E<pattern-list> 
+
+exclude-files.description=\u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B: **.java,glob:/java.base/lib/client/**
+
+exclude-files.usage=\  --exclude-files <pattern-list>\n                            \u9664\u5916\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u4F8B: **.java,glob:/java.base/lib/client/**
+
+exclude-resources.argument=\u9664\u5916\u3059\u308B<pattern-list>\u306E\u30EA\u30BD\u30FC\u30B9
+
+exclude-resources.description=\u9664\u5916\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u4F8B: **.jcov,glob:**/META-INF/**
+
+exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            \u9664\u5916\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u4F8B: **.jcov,glob:**/META-INF/**
+
+exclude-jmod-section.argument=<section-name>\n\u3053\u3053\u3067\u3001<section-name>\u306F"man"\u307E\u305F\u306F"headers"\u3067\u3059\u3002
+
+exclude-jmod-section.description=\u9664\u5916\u3059\u308BJMOD\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059
+
+exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            \u9664\u5916\u3059\u308BJMOD\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                            \u3053\u3053\u3067\u3001<section-name> \u306F"man"\u307E\u305F\u306F"headers"\u3067\u3059\u3002
+
+
+generate-cds-archive.description=CDS\u30D7\u30E9\u30B0\u30A4\u30F3: \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3067CDS\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001cds\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n
+generate-cds-archive.usage=\  --generate-cds-archive    \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3067CDS\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5834\u5408\u3001\n                            cds\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u751F\u6210\u3057\u307E\u3059\u3002
+
+generate-jli-classes.argument=@filename
+
+generate-jli-classes.description=\u4E8B\u524D\u751F\u6210\u3059\u308Bjava.lang.invoke\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002 \n\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u4E8B\u524D\u751F\u6210\u3059\u308B\u30AF\u30E9\u30B9\u306E\u7D44\u8FBC\u307F\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 \n\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u3001\u4F5C\u6210\u3055\u308C\u308B\u30A4\u30E1\u30FC\u30B8\u3068\u7570\u306A\u308B\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u3001\n\u30B3\u30FC\u30C9\u306E\u751F\u6210\u306F\u6B63\u78BA\u6027\u3092\u4FDD\u8A3C\u3059\u308B\u305F\u3081\u306B\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n\u3053\u308C\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306Fignore-version=true\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002
+
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            \u4E8B\u524D\u751F\u6210\u3059\u308Bjava.lang.invoke\u30AF\u30E9\u30B9\u3092\n                            \u30EA\u30B9\u30C8\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\n                            \u4E8B\u524D\u751F\u6210\u3059\u308B\u30AF\u30E9\u30B9\u306E\u7D44\u8FBC\u307F\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n                            \u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u3001\u4F5C\u6210\u3055\u308C\u308B\u30A4\u30E1\u30FC\u30B8\u3068\u7570\u306A\u308B\n                            \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u5B9F\u884C\u3055\u308C\u308B\u5834\u5408\u3001\u30B3\u30FC\u30C9\u306E\u751F\u6210\u306F\u6B63\u78BA\u6027\u3092\u4FDD\u8A3C\u3059\u308B\u305F\u3081\u306B\u3001\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002\n                            \u3053\u308C\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u306B\u306Fignore-version=true\n                            \u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002
+
+system-modules.argument=retainModuleTarget
+
+system-modules.description=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306E\u9AD8\u901F\u30ED\u30FC\u30C9(\u5E38\u306B\u6709\u52B9)
+
+system-modules.usage=\  --system-modules retainModuleTarget\n                            \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u306E\u9AD8\u901F\u30ED\u30FC\u30C9(\u5E38\u306B\u6709\u52B9)
+
+onoff.argument=<on|off>
+
+order-resources.argument=\u512A\u5148\u5EA6\u9806\u306E\u30D1\u30B9\u306E<pattern-list>\u3002@file\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\n\u5404\u884C\u306F\u3001\u30D1\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u308B\u305F\u3081\u306B\u5B8C\u5168\u306B\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
+order-resources.description=\u30EA\u30BD\u30FC\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u307E\u3059\u3002\u4F8B: **/module-info.class,@classlist,/java.base/java/lang/**
+
+order-resources.usage=\  --order-resources <pattern-list>\n                            \u30EA\u30BD\u30FC\u30B9\u3092\u9806\u5E8F\u4ED8\u3051\u307E\u3059\u3002 \n                            \u4F8B: **/module-info.class,@classlist,\n                            /java.base/java/lang/**
+
+strip-debug.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+
+strip-debug.usage=\  --strip-debug             \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+
+strip-java-debug-attributes.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304B\u3089Java\u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059
+
+strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304B\u3089Java\n                            \u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059
+
+strip-native-commands.description=\u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9(java/java.exe\u306A\u3069)\u3092\u9664\u5916\u3057\u307E\u3059
+
+strip-native-commands.usage=\  --strip-native-commands   \u30A4\u30E1\u30FC\u30B8\u304B\u3089\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30B3\u30DE\u30F3\u30C9(java/java.exe\u306A\u3069)\n                            \u3092\u9664\u5916\u3057\u307E\u3059\u3002
+
+vendor-version.argument=<vendor-version>
+
+vendor-version.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217(\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408)\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3"java.vendor.version"\u306E\u5024\u306F<vendor-version>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-version.usage=\  --vendor-version <vendor-version>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217(\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408)\u3092\n                            \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\n                            "java.vendor.version"\u306E\u5024\u306F<vendor-version>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-bug-url.argument=<vendor-bug-url>
+
+vendor-bug-url.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3"java.vendor.url.bug"\u306E\u5024\u306F<vendor-url-bug>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FC\u30FB\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\n                            \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\n                            "java.vendor.url.bug"\u306E\u5024\u306F<vendor-url-bug>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-vm-bug-url.argument=<vendor-vm-bug-url>
+
+vendor-vm-bug-url.description=\u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FCVM\u30D0\u30B0URL\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002\nVM\u30A8\u30E9\u30FC\u30FB\u30ED\u30B0\u306B\u8868\u793A\u3055\u308C\u308BURL\u306F<vendor-vm-bug-url>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u30D3\u30EB\u30C9\u306B\u8A2D\u5B9A\u3055\u308C\u305F\u30D9\u30F3\u30C0\u30FCVM\u30D0\u30B0URL\u3092\n                            \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u3002VM\u30A8\u30E9\u30FC\u30FB\u30ED\u30B0\u306B\n                           \u8868\u793A\u3055\u308C\u305FURL\u306F<vendor-vm-bug-url>\u306B\u306A\u308A\u307E\u3059\u3002
+
+vm.argument=<client|server|minimal|all>
+
+vm.description=\u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067HotSpot VM\u3092\u9078\u629E\u3057\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306Fall\u3067\u3059
+
+vm.usage=\  --vm <client|server|minimal|all>\n                            \u51FA\u529B\u30A4\u30E1\u30FC\u30B8\u3067HotSpot VM\u3092\u9078\u629E\u3057\u307E\u3059\u3002\n                            \u30C7\u30D5\u30A9\u30EB\u30C8\u306Fall\u3067\u3059
+
+zip.argument=[\u30EA\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8]
+
+zip.description=ZIP\u5727\u7E2E
+
+zip.usage=\  --zip [\u30EA\u30BD\u30FC\u30B9\u30FB\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8]\n                            ZIP\u5727\u7E2E
+
+include-locales.argument=<langtag>[,<langtag>]*
+
+include-locales.description=BCP 47\u8A00\u8A9E\u30BF\u30B0\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001RFC 4647\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\n\u30ED\u30B1\u30FC\u30EB\u306E\u4E00\u81F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4F8B: en,ja,*-IN
+
+include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            BCP 47\u8A00\u8A9E\u30BF\u30B0\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001RFC 4647\u3067\n                            \u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\n                            \u30ED\u30B1\u30FC\u30EB\u306E\u4E00\u81F4\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n                            \u4F8B: en,ja,*-IN
+
+include-locales.missingpackages=jdk.localedata\u306B\u30ED\u30B1\u30FC\u30EB\u30FB\u30C7\u30FC\u30BF\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u3042\u308A\u307E\u305B\u3093:\n\t
+
+include-locales.nomatchinglocales="%s"\u306B\u4E00\u81F4\u3059\u308B\u30ED\u30B1\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6307\u5B9A\u3057\u305F\u30D1\u30BF\u30FC\u30F3\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+
+include-locales.invalidtag=\u8A00\u8A9E\u30BF\u30B0\u304C\u7121\u52B9\u3067\u3059: %s
+
+include-locales.localedatanotfound=jdk.localedata\u30E2\u30B8\u30E5\u30FC\u30EB\u306F--add-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+
+main.status.ok=\u52D5\u4F5C\u3057\u3066\u3044\u307E\u3059\u3002
+
+main.status.not.ok= \u52D5\u4F5C\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+
+plugin.plugins.header=\u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8:
+
+plugin.opt.list-plugins=\      --list-plugins                    \u4F7F\u7528\u53EF\u80FD\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+
+plugin.opt.post-process-path=\      --post-process-path <imagefile>   \u65E2\u5B58\u306E\u30A4\u30E1\u30FC\u30B8\u306E\u5F8C\u51E6\u7406\u3092\u884C\u3044\u307E\u3059
+
+plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    \u6700\u5F8C\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u30EA\u30BD\u30FC\u30B9\u306E\u30BD\u30FC\u30C8\u3092\n                                        \u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059
+
+plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     \u6307\u5B9A\u3057\u305F\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
+
+plugin.opt.compress=\  -c, --compress=<0|1|2>                \u30EA\u30BD\u30FC\u30B9\u306E\u5727\u7E2E\u3092\u6709\u52B9\u306B\u3057\u307E\u3059:\n                                          \u30EC\u30D9\u30EB0: \u5727\u7E2E\u306A\u3057\n                                          \u30EC\u30D9\u30EB1: \u5B9A\u6570\u6587\u5B57\u5217\u306E\u5171\u6709\n                                          \u30EC\u30D9\u30EB2: ZIP
+
+plugin.opt.strip-debug=\  -G, --strip-debug                     \u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059
+
+plugin.opt.no-man-pages=\      --no-man-pages                    man\u30DA\u30FC\u30B8\u3092\u9664\u5916\u3057\u307E\u3059
+
+plugin.opt.no-header-files=\      --no-header-files                 \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u30FB\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u9664\u5916\u3057\u307E\u3059
+
+main.plugin.name=\u30D7\u30E9\u30B0\u30A4\u30F3\u540D
+
+main.plugin.class=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9
+
+main.plugin.module=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB
+
+main.plugin.category=\u30AB\u30C6\u30B4\u30EA
+
+main.plugin.description=\u8AAC\u660E
+
+main.plugin.post.processors=\u30A4\u30E1\u30FC\u30B8\u30FB\u30DD\u30B9\u30C8\u30FB\u30D7\u30ED\u30BB\u30C3\u30B5:
+
+main.plugin.argument=\u5F15\u6570
+
+main.plugin.range.from=\u7BC4\u56F2: \u81EA
+
+main.plugin.range.to=\u81F3
+
+main.plugin.option=\u30AA\u30D7\u30B7\u30E7\u30F3
+
+main.plugin.no.value=<empty>
+
+main.plugin.state=\u6A5F\u80FD\u72B6\u614B
+
+err.no.such.plugin=\u3053\u306E\u3088\u3046\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u3042\u308A\u307E\u305B\u3093: {0}
+
+err.provider.not.functional=\u30D7\u30ED\u30D0\u30A4\u30C0{0}\u306F\u6A5F\u80FD\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+
+err.plugin.mutiple.options=\u8907\u6570\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u304C{0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3088\u3063\u3066\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059
+err.plugin.conflicts={0} ({1})\u304C{2}\u3068\u77DB\u76FE\u3057\u3066\u3044\u307E\u3059\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3057\u3001\u4E21\u65B9\u3092\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+err.provider.additional.arg.error={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u8FFD\u52A0\u306E\u5F15\u6570\u6307\u5B9A\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059: {1}
+
+err.no.plugins.path=\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30D1\u30B9\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+
+err.dir.already.exits=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059: {0}
+
+err.invalid.index=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306E\u7D22\u5F15\u304C\u7121\u52B9\u3067\u3059
+
+err.plugin.option.not.set=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+
+warn.thirdparty.plugins=\u30B5\u30FC\u30C9\u30FB\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\u3068\u3001\u4F7F\u7528\u3067\u304D\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u304C\u751F\u6210\u3055\u308C\u307E\u3059\u3002
+
+warn.thirdparty.plugins.enabled=\u30B5\u30FC\u30C9\u30FB\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3057\u305F\u3002
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
new file mode 100644
index 00000000000..9d92ffae362
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
@@ -0,0 +1,224 @@
+#
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+add-options.argument=<options>
+
+add-options.description=\u5728\u751F\u6210\u7684\u6620\u50CF\u4E2D\u8C03\u7528\u865A\u62DF\u673A\u65F6\uFF0C\u5728\u4EFB\u4F55\n\u5176\u4ED6\u9009\u9879\u4E4B\u524D\u6DFB\u52A0\u6307\u5B9A\u7684 <options> \u5B57\u7B26\u4E32\n\uFF08\u53EF\u80FD\u5305\u542B\u7A7A\u683C\uFF09\u3002
+
+add-options.usage=\  --add-options <options>   \u5728\u751F\u6210\u7684\u6620\u50CF\u4E2D\u8C03\u7528\u865A\u62DF\u673A\u65F6\uFF0C\u5728\u4EFB\u4F55\u5176\u4ED6\n                            \u9009\u9879\u4E4B\u524D\u6DFB\u52A0\u6307\u5B9A\u7684 <options> \u5B57\u7B26\u4E32\n                            \uFF08\u53EF\u80FD\u5305\u542B\u7A7A\u683C\uFF09\u3002
+
+release-info.argument=<file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>
+
+release-info.description=<file> \u9009\u9879\uFF1A\u4ECE\u63D0\u4F9B\u7684\u6587\u4EF6\u52A0\u8F7D release \u5C5E\u6027\u3002\nadd\uFF1A\u5411 'release' \u6587\u4EF6\u4E2D\u6DFB\u52A0\u5C5E\u6027\u3002\n\u53EF\u4EE5\u4F20\u9012\u4EFB\u610F\u6570\u91CF\u7684 <key>=<value> \u5BF9\u3002\ndel\uFF1A\u5220\u9664 release \u6587\u4EF6\u4E2D\u7684\u5173\u952E\u5B57\u5217\u8868\u3002
+
+release-info.usage=\  --release-info <file>|add:<key1>=<value1>:<key2>=<value2>:...|del:<key list>\n                            <file> \u9009\u9879\uFF1A\u4ECE\u63D0\u4F9B\u7684\u6587\u4EF6\n                            \u52A0\u8F7D release \u5C5E\u6027\u3002\n                            add\uFF1A\u5411 'release' \u6587\u4EF6\u4E2D\u6DFB\u52A0\u5C5E\u6027\u3002\n                            \u53EF\u4EE5\u4F20\u9012\u4EFB\u610F\u6570\u91CF\u7684 <key>=<value> \u5BF9\u3002\n                            del\uFF1A\u5220\u9664 release \u6587\u4EF6\u4E2D\u7684\u5173\u952E\u5B57\u5217\u8868\u3002
+
+class-for-name.argument=
+
+class-for-name.description=\u7C7B\u4F18\u5316\uFF1A\u5C06 Class.forName \u8C03\u7528\u8F6C\u6362\u4E3A\u5E38\u91CF\u8D1F\u8F7D\u3002
+
+class-for-name.usage=\  --class-for-name          \u7C7B\u4F18\u5316\uFF1A\u5C06 Class.forName \u8C03\u7528\u8F6C\u6362\u4E3A\u5E38\u91CF\u8D1F\u8F7D\u3002
+
+compress.argument=<0|1|2>[:filter=<pattern-list>]
+
+compress.description=\u538B\u7F29\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u6240\u6709\u8D44\u6E90\u3002\n\u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n\u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n\u7EA7\u522B 2\uFF1AZIP\u3002\n\u53EF\u4EE5\u5C06\u53EF\u9009 <pattern-list> \u7B5B\u9009\u5668\u6307\u5B9A\u4E3A\u8981\u5305\u62EC\u7684\n\u6587\u4EF6\u7684\u6A21\u5F0F\u3002
+
+compress.usage=\  --compress <0|1|2>[:filter=<pattern-list>]\n                            \u538B\u7F29\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u6240\u6709\u8D44\u6E90\u3002\n                            \u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n                            \u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n                            \u7EA7\u522B 2\uFF1AZIP\u3002\n                            \u53EF\u4EE5\u5C06\u53EF\u9009 <pattern-list> \n                            \u7B5B\u9009\u5668\u6307\u5B9A\u4E3A\u8981\u5305\u62EC\u7684\n                            \u6587\u4EF6\u7684\u6A21\u5F0F\u3002
+
+compact-cp.argument=<resource paths>
+
+compact-cp.description=\u5E38\u91CF\u6C60\u5B57\u7B26\u4E32\u5171\u4EAB\u3002\n\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u4F1A\u538B\u7F29\u6240\u6709\u8D44\u6E90\u3002\u60A8\u53EF\u4EE5\u8868\u793A\u8981\u538B\u7F29\u6216\n\u4E0D\u538B\u7F29\u7684\u8D44\u6E90\u96C6\uFF08\u4F7F\u7528 ^ \u8868\u793A\u5426\u5B9A\uFF09\u3002
+
+compact-cp.usage=\ --compact-cp <resource paths>\n                             \u5E38\u91CF\u6C60\u5B57\u7B26\u4E32\u5171\u4EAB\u3002\n                             \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u4F1A\u538B\u7F29\u6240\u6709\u8D44\u6E90\u3002\n                             \u60A8\u53EF\u4EE5\u8868\u793A\u8981\u538B\u7F29\u6216\u4E0D\u538B\u7F29\u7684\n                             \u8D44\u6E90\u96C6\uFF08\u4F7F\u7528 ^ \u8868\u793A\u5426\u5B9A\uFF09\u3002
+
+dedup-legal-notices.argument=[error-if-not-same-content]
+
+dedup-legal-notices.description=\u5220\u9664\u6240\u6709\u6CD5\u5F8B\u58F0\u660E\u4E2D\u7684\u91CD\u590D\u6570\u636E\u3002\u5982\u679C\u6307\u5B9A\n\u4E86 error-if-not-same-content\uFF0C\u5219\u5728\u4E24\u4E2A\u540C\u540D\u7684\u6587\u4EF6\n\u4E0D\u540C\u65F6\u5C06\u51FA\u73B0\u9519\u8BEF\u3002
+
+dedup-legal-notices.usage=\  --dedup-legal-notices [error-if-not-same-content]\n                            \u5220\u9664\u6240\u6709\u6CD5\u5F8B\u58F0\u660E\u4E2D\u7684\u91CD\u590D\u6570\u636E\u3002\n                            \u5982\u679C\u6307\u5B9A\u4E86 error-if-not-same-content\uFF0C\n                            \u5219\u5728\u4E24\u4E2A\u540C\u540D\u7684\u6587\u4EF6\u4E0D\u540C\u65F6\n                            \u5C06\u51FA\u73B0\u9519\u8BEF\u3002
+
+exclude-files.argument=\u8981\u6392\u9664\u7684\u6587\u4EF6\u7684 <pattern-list>
+
+exclude-files.description=\u6307\u5B9A\u8981\u6392\u9664\u7684\u6587\u4EF6\u3002\u4F8B\u5982\uFF1A**.java,glob:/java.base/lib/client/**
+
+exclude-files.usage=\  --exclude-files <pattern-list>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684\u6587\u4EF6\u3002\n                            \u4F8B\u5982\uFF1A**.java,glob:/java.base/lib/client/**
+
+exclude-resources.argument=\u8981\u6392\u9664\u7684 <pattern-list> \u8D44\u6E90
+
+exclude-resources.description=\u6307\u5B9A\u8981\u6392\u9664\u7684\u8D44\u6E90\u3002\u4F8B\u5982\uFF1A**.jcov,glob:**/META-INF/**
+
+exclude-resources.usage=\  --exclude-resources <pattern-list>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684\u8D44\u6E90\u3002\n                            \u4F8B\u5982\uFF1A**.jcov,glob:**/META-INF/**
+
+exclude-jmod-section.argument=<section-name>\n\u5176\u4E2D\uFF0C<section-name> \u662F "man" \u6216 "headers"\u3002
+
+exclude-jmod-section.description=\u6307\u5B9A\u8981\u6392\u9664\u7684 JMOD \u8282
+
+exclude-jmod-section.usage=\  --exclude-jmod-section <section-name>\n                            \u6307\u5B9A\u8981\u6392\u9664\u7684 JMOD \u8282\u3002\n                            \u5176\u4E2D\uFF0C<section-name> \u662F "man" \u6216 "headers"\u3002
+
+
+generate-cds-archive.description=CDS \u63D2\u4EF6\uFF1A\u5982\u679C\u8FD0\u884C\u65F6\u6620\u50CF\u652F\u6301 CDS \u529F\u80FD\uFF0C\u5219\u751F\u6210 CDS \u6863\u6848\u3002\n
+generate-cds-archive.usage=\  --generate-cds-archive    \u5982\u679C\u8FD0\u884C\u65F6\u6620\u50CF\u652F\u6301 CDS \u529F\u80FD\uFF0C\n                            \u5219\u751F\u6210 CDS \u6863\u6848\u3002
+
+generate-jli-classes.argument=@filename
+
+generate-jli-classes.description=\u6307\u5B9A\u4E00\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D\u5217\u51FA\u4E86\u8981\u9884\u5148\u751F\u6210\u7684 java.lang.invoke \u7C7B\u3002\n\u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6B64\u63D2\u4EF6\u53EF\u4EE5\u4F7F\u7528\u8981\u9884\u5148\u751F\u6210\u7684\u5185\u7F6E\u7C7B\u5217\u8868\u3002\n\u5982\u679C\u6B64\u63D2\u4EF6\u4E0E\u6B63\u5728\u521B\u5EFA\u7684\u6620\u50CF\u5728\u4E0D\u540C\u7684\u8FD0\u884C\u65F6\u7248\u672C\u4E0A\u8FD0\u884C\uFF0C\n\u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5C06\u7981\u7528\u4EE3\u7801\u751F\u6210\u4EE5\u786E\u4FDD\n\u6B63\u786E\u6027 - \u6DFB\u52A0 iignore-version=true \u53EF\u8986\u76D6\u6B64\u9879\u3002
+
+generate-jli-classes.usage=\  --generate-jli-classes @filename\n                            \u6307\u5B9A\u4E00\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D\u5217\u51FA\u4E86\u8981\n                            \u9884\u5148\u751F\u6210\u7684 java.lang.invoke \u7C7B\u3002\n                            \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u6B64\u63D2\u4EF6\u53EF\u4EE5\u4F7F\u7528\n                            \u8981\u9884\u5148\u751F\u6210\u7684\u5185\u7F6E\u7C7B\u5217\u8868\u3002\u5982\u679C\u6B64\u63D2\u4EF6\u4E0E\n                            \u6B63\u5728\u521B\u5EFA\u7684\u6620\u50CF\u5728\u4E0D\u540C\u7684\u8FD0\u884C\u65F6\u7248\u672C\u4E0A\u8FD0\u884C\uFF0C\n                            \u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B\u5C06\u7981\u7528\u4EE3\u7801\u751F\u6210\u4EE5\u786E\u4FDD\n                            \u6B63\u786E\u6027 - \u6DFB\u52A0 iignore-version=true\n                            \u53EF\u8986\u76D6\u6B64\u9009\u9879\u3002
+
+system-modules.argument=retainModuleTarget
+
+system-modules.description=\u5FEB\u901F\u52A0\u8F7D\u6A21\u5757\u63CF\u8FF0\u7B26\uFF08\u59CB\u7EC8\u542F\u7528\uFF09
+
+system-modules.usage=\  --system-modules retainModuleTarget\n                            \u5FEB\u901F\u52A0\u8F7D\u6A21\u5757\u63CF\u8FF0\u7B26\uFF08\u59CB\u7EC8\u542F\u7528\uFF09
+
+onoff.argument=<on|off>
+
+order-resources.argument=\u4F18\u5148\u7EA7\u987A\u5E8F\u4E2D\u8DEF\u5F84\u7684 <pattern-list>\u3002\u5982\u679C\n\u6307\u5B9A\u4E86 @file\uFF0C\u5219\u6BCF\u884C\u90FD\u5E94\u662F\u8981\u6392\u5E8F\u7684\u8DEF\u5F84\u7684\u5B8C\u5168\u5339\u914D\u9879
+
+order-resources.description=\u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u3002\u4F8B\u5982\uFF1A**/module-info.class,@classlist,/java.base/java/lang/**
+
+order-resources.usage=\  --order-resources <pattern-list>\n                            \u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u3002\n                            \u4F8B\u5982\uFF1A**/module-info.class,@classlist,\n                            /java.base/java/lang/**
+
+strip-debug.description=\u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+
+strip-debug.usage=\  --strip-debug             \u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+
+strip-java-debug-attributes.description=\u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u7C7B\u4E2D\u53BB\u9664 Java \u8C03\u8BD5\u4FE1\u606F
+
+strip-java-debug-attributes.usage=\  --strip-java-debug-attributes \n                            \u4ECE\u8F93\u51FA\u6620\u50CF\u4E2D\u7684\u7C7B\u4E2D\n                            \u53BB\u9664 Java \u8C03\u8BD5\u5C5E\u6027
+
+strip-native-commands.description=\u4ECE\u6620\u50CF\u4E2D\u6392\u9664\u672C\u673A\u547D\u4EE4\uFF08\u5982 java/java.exe\uFF09
+
+strip-native-commands.usage=\  --strip-native-commands   \u4ECE\u6620\u50CF\u4E2D\u6392\u9664\u672C\u673A\u547D\u4EE4\n                            \uFF08\u5982 java/java.exe\uFF09\u3002
+
+vendor-version.argument=<vendor-version>
+
+vendor-version.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546\u7248\u672C\u5B57\u7B26\u4E32\uFF08\u5982\u679C\u6709\uFF09\u3002\n\u7CFB\u7EDF\u5C5E\u6027 "java.vendor.version" \u7684\u503C\u5C06\u4E3A <vendor-version>\u3002
+
+vendor-version.usage=\  --vendor-version <vendor-version>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546\u7248\u672C\u5B57\u7B26\u4E32\n                            \uFF08\u5982\u679C\u6709\uFF09\u3002\u7CFB\u7EDF\u5C5E\u6027 "java.vendor.version" \u7684\n                            \u503C\u5C06\u4E3A <vendor-version>\u3002
+
+vendor-bug-url.argument=<vendor-bug-url>
+
+vendor-bug-url.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 Bug URL\u3002\u7CFB\u7EDF\n\u5C5E\u6027 "java.vendor.url.bug" \u7684\u503C\u5C06\u4E3A <vendor-url-bug>\u3002
+
+vendor-bug-url.usage=\  --vendor-bug-url <vendor-bug-url>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 Bug URL\u3002\n                            \u7CFB\u7EDF\u5C5E\u6027 "java.vendor.url.bug" \u7684\n                            \u503C\u5C06\u4E3A <vendor-url-bug>\u3002
+
+vendor-vm-bug-url.argument=<vendor-vm-bug-url>
+
+vendor-vm-bug-url.description=\u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 VM Bug URL\u3002VM \u9519\u8BEF\n\u65E5\u5FD7\u4E2D\u663E\u793A\u7684 URL \u5C06\u4E3A <vendor-vm-bug-url>\u3002
+
+vendor-vm-bug-url.usage=\  --vendor-vm-bug-url <vendor-vm-bug-url>\n                            \u8986\u76D6\u690D\u5165\u5230\u5DE5\u4F5C\u7248\u672C\u4E2D\u7684\u4F9B\u5E94\u5546 VM Bug URL\u3002\n                            VM \u9519\u8BEF\u65E5\u5FD7\u4E2D\u663E\u793A\u7684 URL \u5C06\n                            \u4E3A <vendor-vm-bug-url>\u3002
+
+vm.argument=<client|server|minimal|all>
+
+vm.description=\u5728\u8F93\u51FA\u6620\u50CF\u4E2D\u9009\u62E9 HotSpot VM\u3002\u9ED8\u8BA4\u503C\u4E3A all
+
+vm.usage=\  --vm <client|server|minimal|all>\n                            \u5728\u8F93\u51FA\u6620\u50CF\u4E2D\u9009\u62E9 HotSpot VM\u3002\n                            \u9ED8\u8BA4\u503C\u4E3A all
+
+zip.argument=[\u9017\u53F7\u5206\u9694\u7684\u8D44\u6E90\u8DEF\u5F84\u5217\u8868]
+
+zip.description=ZIP \u538B\u7F29
+
+zip.usage=\  --zip [\u9017\u53F7\u5206\u9694\u7684\u8D44\u6E90\u8DEF\u5F84\u5217\u8868]\n                            ZIP \u538B\u7F29
+
+include-locales.argument=<langtag>[,<langtag>]*
+
+include-locales.description=\u9017\u53F7\u5206\u9694\u7684 BCP 47 \u8BED\u8A00\u6807\u8BB0\uFF0C\u5141\u8BB8\u4F7F\u7528\u5728 RFC 4647 \u4E2D\u5B9A\u4E49\u7684\n\u533A\u57DF\u8BBE\u7F6E\u5339\u914D\u3002\u4F8B\u5982\uFF1Aen,ja,*-IN
+
+include-locales.usage=\  --include-locales <langtag>[,<langtag>]*\n                            \u9017\u53F7\u5206\u9694\u7684 BCP 47 \u8BED\u8A00\u6807\u8BB0\uFF0C\n                            \u5141\u8BB8\u4F7F\u7528\n                            \u5728 RFC 4647 \u4E2D\u5B9A\u4E49\u7684\u533A\u57DF\u8BBE\u7F6E\u5339\u914D\u3002\n                            \u4F8B\u5982\uFF1Aen,ja,*-IN
+
+include-locales.missingpackages=jdk.localedata \u4E2D\u7F3A\u5C11\u533A\u57DF\u8BBE\u7F6E\u6570\u636E\u7A0B\u5E8F\u5305\uFF1A\n\t
+
+include-locales.nomatchinglocales=\u5BF9\u4E8E "%s"\uFF0C\u627E\u4E0D\u5230\u5339\u914D\u7684\u533A\u57DF\u8BBE\u7F6E\u3002\u8BF7\u68C0\u67E5\u6307\u5B9A\u7684\u6A21\u5F0F\u3002
+
+include-locales.invalidtag=\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BB0\uFF1A%s
+
+include-locales.localedatanotfound=\u672A\u4F7F\u7528 --add-modules \u9009\u9879\u6307\u5B9A jdk.localedata \u6A21\u5757
+
+main.status.ok=\u8D77\u4F5C\u7528\u3002
+
+main.status.not.ok= \u4E0D\u8D77\u4F5C\u7528\u3002
+
+plugin.plugins.header=\u53EF\u7528\u63D2\u4EF6\u9009\u9879\u7684\u5217\u8868\uFF1A
+
+plugin.opt.list-plugins=\      --list-plugins                    \u5217\u51FA\u53EF\u7528\u63D2\u4EF6
+
+plugin.opt.post-process-path=\      --post-process-path <imagefile>   \u5BF9\u73B0\u6709\u6620\u50CF\u8FDB\u884C\u540E\u5904\u7406
+
+plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    \u5141\u8BB8\u5BF9\u8D44\u6E90\u8FDB\u884C\u6392\u5E8F\u7684\n                                        \u6700\u540E\u4E00\u4E2A\u63D2\u4EF6
+
+plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     \u7981\u7528\u6240\u63D0\u53CA\u7684\u63D2\u4EF6
+
+plugin.opt.compress=\  -c, --compress=<0|1|2>                \u5BF9\u8D44\u6E90\u542F\u7528\u538B\u7F29\uFF1A\n                                          \u7EA7\u522B 0\uFF1A\u4E0D\u538B\u7F29\n                                          \u7EA7\u522B 1\uFF1A\u5E38\u91CF\u5B57\u7B26\u4E32\u5171\u4EAB\n                                          \u7EA7\u522B 2\uFF1AZIP
+
+plugin.opt.strip-debug=\  -G, --strip-debug                     \u53BB\u9664\u8C03\u8BD5\u4FE1\u606F
+
+plugin.opt.no-man-pages=\      --no-man-pages                    \u6392\u9664\u624B\u518C\u9875
+
+plugin.opt.no-header-files=\      --no-header-files                 \u6392\u9664\u5305\u542B\u6807\u5934\u6587\u4EF6
+
+main.plugin.name=\u63D2\u4EF6\u540D\u79F0
+
+main.plugin.class=\u63D2\u4EF6\u7C7B
+
+main.plugin.module=\u63D2\u4EF6\u6A21\u5757
+
+main.plugin.category=\u7C7B\u522B 
+
+main.plugin.description=\u8BF4\u660E
+
+main.plugin.post.processors=\u6620\u50CF\u540E\u5904\u7406\u7A0B\u5E8F\uFF1A
+
+main.plugin.argument=\u53C2\u6570
+
+main.plugin.range.from=\u8303\u56F4\u8D77\u70B9
+
+main.plugin.range.to=\u5230
+
+main.plugin.option=\u9009\u9879
+
+main.plugin.no.value=<\u7A7A>
+
+main.plugin.state=\u529F\u80FD\u72B6\u6001
+
+err.no.such.plugin=\u6CA1\u6709\u8FD9\u6837\u7684\u63D2\u4EF6\uFF1A{0}
+
+err.provider.not.functional=\u63D0\u4F9B\u65B9 {0} \u4E0D\u8D77\u4F5C\u7528\u3002
+
+err.plugin.mutiple.options={0} \u9009\u9879\u542F\u7528\u4E86\u591A\u4E2A\u63D2\u4EF6
+err.plugin.conflicts={0} ({1}) \u4E0E {2} \u51B2\u7A81\u3002\u8BF7\u4F7F\u7528\u5176\u4E2D\u7684\u4EFB\u610F\u4E00\u4E2A\uFF0C\u4F46\u4E0D\u80FD\u540C\u65F6\u4F7F\u7528\u4E8C\u8005\u3002
+err.provider.additional.arg.error={0} \u9009\u9879\u4E2D\u7684\u5176\u4ED6\u53C2\u6570\u89C4\u8303\u6709\u8BEF\uFF1A{1}
+
+err.no.plugins.path=\u6CA1\u6709\u63D2\u4EF6\u8DEF\u5F84\u53C2\u6570\u3002
+
+err.dir.already.exits=\u76EE\u5F55\u5DF2\u5B58\u5728\uFF1A{0}
+
+err.invalid.index=\u9009\u9879 {0} \u7684\u7D22\u5F15\u65E0\u6548
+
+err.plugin.option.not.set=\u5FC5\u987B\u8BBE\u7F6E\u9009\u9879 {0}\u3002
+
+warn.thirdparty.plugins=\u542F\u7528\u7B2C\u4E09\u65B9\u63D2\u4EF6\u53EF\u80FD\u4F1A\u5BFC\u81F4\u751F\u6210\u7684\u6620\u50CF\u65E0\u6CD5\u4F7F\u7528\u3002
+
+warn.thirdparty.plugins.enabled=\u60A8\u5DF2\u542F\u7528\u7B2C\u4E09\u65B9\u63D2\u4EF6\u3002
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
new file mode 100644
index 00000000000..993184fa2eb
--- /dev/null
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_de.properties
@@ -0,0 +1,100 @@
+#
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+main.usage.summary=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-file>\nMit --help k\u00F6nnen Sie eine Liste der m\u00F6glichen Optionen aufrufen
+
+main.usage=Verwendung: {0} (create|extract|list|describe|hash) <OPTIONEN> <jmod-Datei>\n
+error.prefix=Fehler:
+warn.prefix=Warnung:
+
+main.opt.mode=Hauptvorgangsmodi:
+main.opt.mode.create=create    - Erstellt ein neues jmod-Archiv
+main.opt.mode.extract=extract   - Extrahiert alle Dateien aus dem Archiv
+main.opt.mode.list=list      - Gibt die Namen aller Eintr\u00E4ge aus
+main.opt.mode.describe=describe  - Gibt die Moduldetails aus
+main.opt.mode.hash=hash      - Erfasst die Hashes gebundener Module.
+
+main.opt.help=Gibt diese Hilfemeldung aus
+main.opt.help-extra=Gibt Hilfe zu zus\u00E4tzlichen Optionen aus
+main.opt.version=Versionsinformationen
+main.opt.class-path=Anwendungs-JAR-Dateien|Verzeichnis mit den Klassen
+main.opt.libs=Speicherort der nativen Librarys
+main.opt.cmds=Speicherort der nativen Befehle
+main.opt.config=Speicherort der vom Benutzer editierbaren Konfigurationsdateien
+main.opt.extractDir=Zielverzeichnis f\u00FCr Extraktion
+main.opt.dry-run=Testlauf des Hashmodus
+main.opt.exclude=Schlie\u00DFt Dateien aus, die der angegebenen kommagetrennten Musterliste entsprechen. Jedes Element verwendet eines der folgenden Formate: <Globales Muster>, glob:<Globales Muster> oder regex:<Regex-Muster>
+main.opt.header-files=Speicherort der Headerdateien
+main.opt.legal-notices=Speicherort der rechtlichen Hinweise
+main.opt.module-version= Modulversion
+main.opt.main-class=Hauptklasse
+main.opt.main-class.arg=class-name
+main.opt.man-pages=Speicherort der Manpages
+main.opt.target-platform=Zielplattform
+main.opt.target-platform.arg=target-platform
+main.opt.module-path=Modulpfad
+main.opt.hash-modules=Berechnet und erfasst Hashes zur Bindung eines in ein Package integrierten Moduls an Module, die dem angegebenen <Regex-Muster> entsprechen und direkt oder indirekt davon abh\u00E4ngen. Die Hashes werden in der erstellten JMOD-Datei oder in einer JMOD- oder modularen JAR-Datei in dem Modulpfad erfasst, der im jmod-Hashbefehl angegeben ist.
+main.opt.do-not-resolve-by-default=Aus dem Standard-Root-Set von Modulen ausschlie\u00DFen
+main.opt.warn-if-resolved=Hinweis f\u00FCr ein Tool, eine Warnung auszugeben, wenn das Modul aufgel\u00F6st wird, entweder "deprecated", "deprecated-for-removal" oder "incubating"
+main.opt.date=Datum und Uhrzeit f\u00FCr die Zeitstempel von Eintr\u00E4gen, angegeben im erweiterten Datums-/Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-8601. Beispiel: "2022-02-12T12:30:00-05:00"
+
+main.opt.cmdfile=Liest Optionen aus der angegebenen Datei
+
+module.hashes.recorded=Hashes werden im Modul {0} erfasst
+
+err.missing.mode=Eine der Modusangaben create, extract, list, describe oder hash muss angegeben werden
+err.invalid.mode=Als Modus muss create, extract, list, describe oder hash angegeben werden: {0}
+err.cannot.create.dir=Verzeichnis {0} kann nicht erstellt werden
+err.classpath.must.be.specified=--class-path muss angegeben werden
+err.jmod.must.be.specified=jmod-file muss angegeben werden
+err.invalid.version=ung\u00FCltige Modulversion {0}
+err.output.must.be.specified=--output muss angegeben werden
+err.mods.must.be.specified=--mods muss angegeben werden
+err.modulepath.must.be.specified=--module-path muss beim Hashing von Modulen angegeben werden
+err.invalid.main-class=ung\u00FCltiger main-class-Name: {0}
+err.path.not.found=Pfad nicht gefunden: {0}
+err.path.not.valid=ung\u00FCltiger Pfad: {0}
+err.path.not.a.dir=Pfad muss ein Verzeichnis sein: {0}
+err.invalid.class.path.entry=ung\u00FCltiger Classpath-Eintrag: {0}
+err.file.already.exists=Datei ist bereits vorhanden: {0}
+err.jmod.not.found=keine jmod-Datei gefunden: {0}
+err.bad.pattern=ung\u00FCltiges Muster {0}
+err.bad.WarnIfResolvedReason=Schlechter Grund: {0}, Grund muss entweder "deprecated", "deprecated-for-removal" oder "incubating" sein
+err.unknown.option=unbekannte Option(en): {0}
+err.missing.arg=kein Wert angegeben f\u00FCr {0}
+err.internal.error=interner Fehler: {0} {1} {2}
+err.invalid.dryrun.option=--dry-run kann nur mit dem Hashmodus verwendet werden
+err.module.descriptor.not.found=Moduldeskriptor nicht gefunden
+err.missing.export.or.open.packages=Packages, die exportiert werden oder in {0} ge\u00F6ffnet sind, sind nicht vorhanden: {1}
+err.module.resolution.fail=Aufl\u00F6sung nicht erfolgreich: {0}
+err.no.moduleToHash=Keine Hashes erfasst: Kein mit {0} \u00FCbereinstimmendes Modul zum Erfassen von Hashes gefunden
+err.invalid.date=--date {0} ist kein erweitertes Datums- und Uhrzeitformat mit Zeitunterschied und optionaler Zeitzone nach ISO-860: {1}
+err.date.out.of.range=--date {0} liegt nicht im g\u00FCltigen Bereich 1980-01-01T00:00:02Z bis 2099-12-31T23:59:59Z
+warn.invalid.arg=Ung\u00FCltiger Klassenname, oder Pfadname ist nicht vorhanden: {0}
+warn.no.module.hashes=Keine Hashes erfasst: Kein Modul f\u00FCr Hashing angegeben, abh\u00E4ngig von {0}
+warn.ignore.entry=Eintrag {0} in Abschnitt {1} wird ignoriert
+warn.ignore.duplicate.entry=doppelter Eintrag {0} in Abschnitt {1} wird ignoriert
+
+
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
index 673526df269..e173a3e3a82 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_ja.properties
@@ -58,6 +58,7 @@ main.opt.module-path=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9
 main.opt.hash-modules=\u6307\u5B9A\u306E<regex-pattern>\u306B\u4E00\u81F4\u3057\u3001\u76F4\u63A5\u307E\u305F\u306F\u9593\u63A5\u7684\u306B\u4F9D\u5B58\u3057\u3066\u3044\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7D50\u5408\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u3092\u8A08\u7B97\u304A\u3088\u3073\u8A18\u9332\u3057\u307E\u3059\u3002\u30CF\u30C3\u30B7\u30E5\u306F\u3001\u4F5C\u6210\u3055\u308C\u3066\u3044\u308BJMOD\u30D5\u30A1\u30A4\u30EB\u3001jmod hash\u30B3\u30DE\u30F3\u30C9\u3067\u6307\u5B9A\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306EJMOD\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30E9JAR\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
 main.opt.do-not-resolve-by-default=\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30EB\u30FC\u30C8\u8A2D\u5B9A\u304B\u3089\u9664\u5916\u3057\u307E\u3059
 main.opt.warn-if-resolved=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u8B66\u544A\u3092\u767A\u884C\u3059\u308B\u30C4\u30FC\u30EB\u306E\u30D2\u30F3\u30C8\u3002\u975E\u63A8\u5968\u3001\u524A\u9664\u4E88\u5B9A\u306E\u975E\u63A8\u5968\u307E\u305F\u306F\u5B9F\u9A13\u7684\u306E\u3044\u305A\u308C\u304B
+main.opt.date=\u30A8\u30F3\u30C8\u30EA\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u65E5\u6642\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u66F8\u5F0F("2022-02-12T12:30:00-05:00"\u306A\u3069)\u3067ISO-8601\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
 
 main.opt.cmdfile=\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059
 
@@ -89,6 +90,8 @@ err.module.descriptor.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3
 err.missing.export.or.open.packages={0}\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u304B\u305D\u3053\u3067\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {1}
 err.module.resolution.fail=\u89E3\u6C7A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
 err.no.moduleToHash=\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}\u306B\u4E00\u81F4\u3057\u3001\u30CF\u30C3\u30B7\u30E5\u3092\u8A18\u9332\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+err.invalid.date=--date {0}\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u66F8\u5F0F: {1}\u3092\u6307\u5B9A\u3057\u305F\u3001\u6709\u52B9\u306AISO-8601\u306E\u62E1\u5F35\u30AA\u30D5\u30BB\u30C3\u30C8\u306E\u65E5\u6642\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+err.date.out.of.range=--date {0}\u306F\u6709\u52B9\u306A\u7BC4\u56F21980-01-01T00:00:02Z\u304B\u30892099-12-31T23:59:59Z\u306B\u3042\u308A\u307E\u305B\u3093
 warn.invalid.arg=\u7121\u52B9\u306A\u30AF\u30E9\u30B9\u540D\u307E\u305F\u306F\u30D1\u30B9\u540D\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
 warn.no.module.hashes=\u30CF\u30C3\u30B7\u30E5\u304C\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}\u306B\u4F9D\u5B58\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u306B\u5BFE\u3057\u3066\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 warn.ignore.entry=\u30BB\u30AF\u30B7\u30E7\u30F3{1}\u306E\u30A8\u30F3\u30C8\u30EA{0}\u3092\u7121\u8996\u3057\u307E\u3059
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
index 04a1b36b3b6..df4e0b27493 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod_zh_CN.properties
@@ -58,6 +58,7 @@ main.opt.module-path=\u6A21\u5757\u8DEF\u5F84
 main.opt.hash-modules=\u8BA1\u7B97\u548C\u8BB0\u5F55\u6563\u5217, \u4EE5\u5C06\u6253\u5305\u6A21\u5757\u7ED1\u5B9A\u5230\u4E0E\u6307\u5B9A <\u6B63\u5219\u8868\u8FBE\u5F0F\u6A21\u5F0F> \u5339\u914D\u5E76\u76F4\u63A5\u6216\u95F4\u63A5\u4F9D\u8D56\u4E8E\u7684\u6A21\u5757\u3002\u6563\u5217\u8BB0\u5F55\u5728\u6240\u521B\u5EFA\u7684 JMOD \u6587\u4EF6\u4E2D, \u6216\u8005\u8BB0\u5F55\u5728 jmod hash \u547D\u4EE4\u6307\u5B9A\u7684\u6A21\u5757\u8DEF\u5F84\u7684 JMOD \u6587\u4EF6\u6216\u6A21\u5757\u5316 JAR \u4E2D\u3002
 main.opt.do-not-resolve-by-default=\u4ECE\u9ED8\u8BA4\u6839\u6A21\u5757\u96C6\u4E2D\u6392\u9664
 main.opt.warn-if-resolved=\u63D0\u793A\u5DE5\u5177\u5728\u89E3\u6790\u6A21\u5757\u540E\u53D1\u51FA\u8B66\u544A\u3002\u53EF\u4EE5\u4E3A deprecated, deprecated-for-removal \u6216 incubating \u4E4B\u4E00
+main.opt.date=\u6761\u76EE\u65F6\u95F4\u6233\u7684\u65E5\u671F\u548C\u65F6\u95F4\uFF0C\u4EE5\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\u6307\u5B9A\uFF0C\u4F8B\u5982 "2022-02-12T12:30:00-05:00"
 
 main.opt.cmdfile=\u4ECE\u6307\u5B9A\u6587\u4EF6\u8BFB\u53D6\u9009\u9879
 
@@ -89,6 +90,8 @@ err.module.descriptor.not.found=\u627E\u4E0D\u5230\u6A21\u5757\u63CF\u8FF0\u7B26
 err.missing.export.or.open.packages=\u5728 {0} \u4E2D\u5BFC\u51FA\u6216\u6253\u5F00\u7684\u7A0B\u5E8F\u5305\u4E0D\u5B58\u5728: {1}
 err.module.resolution.fail=\u89E3\u6790\u5931\u8D25: {0}
 err.no.moduleToHash=\u672A\u8BB0\u5F55\u6563\u5217\uFF1A\u627E\u4E0D\u5230\u4E0E {0} \u5339\u914D\u7684\u6A21\u5757\u6765\u8BB0\u5F55\u6563\u5217
+err.invalid.date=--date {0} \u4E0D\u662F\u5177\u6709\u53EF\u9009\u65F6\u533A\u7684\u6709\u6548 ISO-8601 \u6269\u5C55\u504F\u79FB\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\uFF1A{1}
+err.date.out.of.range=--date {0} \u4E0D\u5728 1980-01-01T00:00:02Z \u5230 2099-12-31T23:59:59Z \u8FD9\u4E00\u6709\u6548\u8303\u56F4\u5185
 warn.invalid.arg=\u7C7B\u540D\u65E0\u6548\u6216\u8DEF\u5F84\u540D\u4E0D\u5B58\u5728: {0}
 warn.no.module.hashes=\u672A\u8BB0\u5F55\u4EFB\u4F55\u6563\u5217: \u6CA1\u6709\u4E3A\u4F9D\u8D56\u4E8E {0} \u7684\u6563\u5217\u5904\u7406\u6307\u5B9A\u6A21\u5757
 warn.ignore.entry=\u6B63\u5728\u5FFD\u7565\u8282 {1} \u4E2D\u7684\u6761\u76EE {0}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
new file mode 100644
index 00000000000..5038d505e3b
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_de.properties
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+app.bundler.name=Linux-Anwendungsimage
+deb.bundler.name=DEB-Bundle
+rpm.bundler.name=RPM-Bundle
+
+param.license-type.default=Unbekannt
+param.menu-group.default=Unbekannt
+
+resource.deb-control-file=DEB-Kontrolldatei
+resource.deb-preinstall-script=DEB-Preinstall-Skript
+resource.deb-prerm-script=DEB-Prerm-Skript
+resource.deb-postinstall-script=DEB-Postinstall-Skript
+resource.deb-postrm-script=DEB-Postrm-Skript
+resource.copyright-file=Copyright-Datei
+resource.menu-shortcut-descriptor=Men\u00FCverkn\u00FCpfungsdeskriptor
+resource.menu-icon=Men\u00FCsymbol
+resource.rpm-spec-file=RPM-Spezifikationsdatei
+
+error.tool-not-found.advice=Installieren Sie die erforderlichen Packages
+error.tool-old-version.advice=Installieren Sie die erforderlichen Packages
+
+error.invalid-install-dir=Ung\u00FCltiges Installationsverzeichnis "{0}"
+
+error.invalid-value-for-package-name=Ung\u00FCltiger Wert "{0}" f\u00FCr den Bundle-Namen.
+error.invalid-value-for-package-name.advice=Setzen Sie die Option "linux-bundle-name" auf einen g\u00FCltigen Debian-Packagenamen. Die Packagenamen d\u00FCrfen nur Kleinbuchstaben (a-z), Ziffern (0-9), Pluszeichen (+), Minuszeichen (-) und Punkte (.) umfassen. Sie m\u00FCssen mindestens zwei Zeichen lang sein und mit einem alphanumerischen Zeichen beginnen.
+
+message.icon-not-png=Das angegebene Symbol "{0}" ist keine PNG-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
+message.test-for-tool=Test f\u00FCr [{0}]. Ergebnis: {1}
+message.outputting-to-location=DEB f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.output-to-location=Package (.deb) gespeichert in: {0}.
+message.debs-like-licenses=Debian-Packages m\u00FCssen eine Lizenz angeben. Bei fehlender Lizenz geben einige Linux-Distributionen eine Meldung \u00FCber eine Beeintr\u00E4chtigung der Anwendungsqualit\u00E4t aus.
+message.outputting-bundle-location=RPM f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.output-bundle-location=Package (.rpm) gespeichert in: {0}.
+message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
+
+message.ldd-not-available=ldd-Befehl nicht gefunden. Packageabh\u00E4ngigkeiten werden nicht generiert.
+message.deb-ldd-not-available.advice=Installieren Sie das DEB-Package "libc-bin", um ldd abzurufen.
+message.rpm-ldd-not-available.advice=Installieren Sie das RPM-Package "glibc-common", um ldd abzurufen.
+
+warning.foreign-app-image=Warnung: app-image-Verzeichnis wurde von jpackage nicht generiert.
+message.not-default-bundler-no-dependencies-lookup={0} ist nicht der Standardpackagetyp. Packageabh\u00E4ngigkeiten werden nicht generiert.
+
+error.unexpected-package-property=Erwarteter Wert der Eigenschaft "{0}": [{1}]. Tats\u00E4chlicher Wert in Ausgabepackage: [{2}]. Anscheinend enthielt die benutzerdefinierte Datei "{3}" aus dem Ressourcenverzeichnis einen hartcodierten Wert der Eigenschaft "{0}"
+error.unexpected-package-property.advice=Verwenden Sie die Musterzeichenfolge [{0}] anstelle des hartcodierten Wertes [{1}] der {2}-Eigenschaft in der benutzerdefinierten Datei "{3}"
+error.unexpected-default-package-property.advice=Legen Sie den Wert der {0}-Eigenschaft in der benutzerdefinierten Datei "{1}" nicht explizit fest
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
index 739ca7b365e..0ced3733f41 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
index 3ce20c774f5..63ba81270b2 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
new file mode 100644
index 00000000000..48f01addb4a
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
@@ -0,0 +1,91 @@
+#
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+app.bundler.name=Mac-Anwendungsimage
+store.bundler.name=Mac App Store-f\u00E4higer Bundler
+dmg.bundler.name=Mac-DMG-Package
+pkg.bundler.name=Mac-PKG-Package
+
+error.invalid-cfbundle-version.advice=Legen Sie einen kompatiblen Wert f\u00FCr "app-version" fest. G\u00FCltige Versionsnummern sind ein bis drei durch Punkte getrennte Ganzzahlen.
+error.explicit-sign-no-cert=Signatur wurde explizit angefordert, doch es wurde kein Signaturzertifikat gefunden
+error.explicit-sign-no-cert.advice=Geben Sie g\u00FCltige Werte f\u00FCr mac-signing-key-user-name und mac-signing-keychain an
+error.must-sign-app-store=Mac App Store-Apps m\u00FCssen signiert werden. Die Signierung wurde von der Bundler-Konfiguration deaktiviert
+error.must-sign-app-store.advice=Verwenden Sie die Option --mac-sign mit entsprechenden Werten f\u00FCr user-name und keychain
+error.no-app-signing-key=Kein Signaturschl\u00FCssel f\u00FCr Mac App Store-App
+error.no-app-signing-key.advice=Installieren Sie Ihre App-Signaturschl\u00FCssel mit XCode in Ihrem Mac-Schl\u00FCsselbund.
+error.no-pkg-signing-key=Kein Signaturschl\u00FCssel f\u00FCr Mac App Store-Installationsprogramm
+error.no-pkg-signing-key.advice=Installieren Sie Ihre App-Signaturschl\u00FCssel mit XCode in Ihrem Mac-Schl\u00FCsselbund.
+error.certificate.expired=Fehler: Zertifikat abgelaufen {0}
+error.no.xcode.signing=F\u00FCr die Signatur ist Xcode mit Befehlszeilen-Entwicklertools erforderlich
+error.no.xcode.signing.advice=Installieren Sie Xcode mit Befehlszeilen-Entwicklertools.
+error.cert.not.found=Kein Zertifikat gefunden, das [{0}] mit Schl\u00FCsselbund [{1}] entspricht
+error.multiple.certs.found=WARNUNG: Mehrere Zertifikate gefunden, die [{0}] mit Schl\u00FCsselbund [{1}] entsprechen. Es wird das erste Zertifikat verwendet
+resource.bundle-config-file=Bundle-Konfigurationsdatei
+resource.app-info-plist=Info.plist der Anwendung
+resource.runtime-info-plist=Info.plist der Java-Laufzeit
+resource.entitlements=Mac-Berechtigungen
+resource.dmg-setup-script=DMG-Setupskript
+resource.license-setup=Lizenzsetup
+resource.dmg-background=DMG-Hintergrund
+resource.volume-icon=Symbol "Datentr\u00E4ger"
+resource.post-install-script=Auszuf\u00FChrendes Skript nach dem Auff\u00FCllen des Anwendungsimages
+resource.pkg-preinstall-script=PKG-Preinstall-Skript
+resource.pkg-postinstall-script=PKG-Postinstall-Skript
+resource.pkg-background-image=PKG-Hintergrundbild
+resource.pkg-pdf=Projektdefinitionsdatei
+
+
+message.bundle-name-too-long-warning={0} ist auf "{1}" gesetzt. Dies ist l\u00E4nger als 16 Zeichen. K\u00FCrzen Sie den Wert, um die Mac-Nutzungserfahrung zu verbessern.
+message.preparing-info-plist=Info.plist wird vorbereitet: {0}.
+message.icon-not-icns= Das angegebene Symbol "{0}" ist keine ICNS-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
+message.version-string-too-many-components="app-version" darf ein bis drei Zahlen aufweisen: 1, 1.2, 1.2.3.
+message.version-string-first-number-not-zero=Die erste Zahl in app-version darf nicht null oder negativ sein.
+message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
+message.ignoring.symlink=Warnung: codesign \u00FCberspringt den Symlink {0}.
+message.already.signed=Datei ist bereits signiert: {0}.
+message.keychain.error=Fehler: Schl\u00FCsselbundliste kann nicht abgerufen werden.
+message.building-bundle=Mac App Store-Package f\u00FCr {0} wird erstellt.
+message.app-image-dir-does-not-exist=Angegebenes Anwendungsimageverzeichnis {0}: {1} ist nicht vorhanden.
+message.app-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist.
+message.app-image-requires-app-name=Beim Verwenden eines internen Anwendungsimages m\u00FCssen Sie den Anwendungsnamen angeben.
+message.app-image-requires-app-name.advice=Legen Sie den Anwendungsnamen mit dem CLI-Kennzeichen -name, dem fx:application/@name ANT-Attribut oder dem Bundler-Argument "appName" fest.
+message.app-image-requires-identifier=ID kann nicht aus Anwendungsimage extrahiert werden.
+message.app-image-requires-identifier.advice=Verwenden Sie "--verbose" f\u00FCr eine erweiterte Fehlermeldung, oder geben Sie sie mit "--mac-package-identifier" an.
+message.invalid-identifier=Ung\u00FCltige Mac-Bundle-ID [{0}].
+message.invalid-identifier.advice=Geben Sie die ID mit "--mac-package-identifier" an.
+message.building-dmg=DMG-Package f\u00FCr {0} wird erstellt.
+message.running-script=Shellskript wird auf Anwendungsimage [{0}] ausgef\u00FChrt.
+message.preparing-dmg-setup=DMG-Setup wird vorbereitet: {0}.
+message.creating-dmg-file=DMG-Datei wird erstellt: {0}.
+message.dmg-cannot-be-overwritten=DMG-Datei ({0}) ist vorhanden und kann nicht entfernt werden.
+message.output-to-location=Ergebnis von DMG-Installationsprogramm f\u00FCr {0}: {1}.
+message.building-pkg=PKG-Package f\u00FCr {0} wird erstellt.
+message.preparing-scripts=Packageskripte werden vorbereitet.
+message.preparing-distribution-dist=distribution.dist wird vorbereitet: {0}.
+message.signing.pkg=Warnung: Zum Signieren von PKG m\u00FCssen Sie m\u00F6glicherweise mit dem Schl\u00FCsselbundverwaltungstool die Option "Immer vertrauen" f\u00FCr Ihr Zertifikat festlegen.
+message.setfile.dmg=Das Festlegen des benutzerdefinierten Symbols f\u00FCr die DMG-Datei wurde \u00FCbersprungen, weil das Utility "SetFile" nicht gefunden wurde. Durch Installieren von Xcode mit Befehlszeilentools sollte dieses Problem behoben werden.
+message.install-dir-ignored=Warnung: "--install-dir" wird von DMG nicht unterst\u00FCtzt. Stattdessen wird standardm\u00E4\u00DFig /Applications verwendet.
+warning.unsigned.app.image=Warnung: Nicht signiertes app-image wird zum Erstellen von signiertem {0} verwendet.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
index 291130fb237..3ae48d25700 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
@@ -29,7 +29,7 @@ store.bundler.name=Mac App Store\u306E\u6E96\u5099\u5B8C\u4E86\u30D0\u30F3\u30C9
 dmg.bundler.name=Mac DMG\u30D1\u30C3\u30B1\u30FC\u30B8
 pkg.bundler.name=Mac PKG\u30D1\u30C3\u30B1\u30FC\u30B8
 
-error.invalid-cfbundle-version.advice=Set a compatible 'app-version'. Valid versions are one to three integers separated by dots.
+error.invalid-cfbundle-version.advice=\u4E92\u63DB\u6027\u306E\u3042\u308B'app-version'\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\u6709\u52B9\u306A\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001\u30C9\u30C3\u30C8\u3067\u533A\u5207\u3089\u308C\u305F1\u304B\u30893\u3064\u306E\u6574\u6570\u3067\u3059\u3002
 error.explicit-sign-no-cert=\u7F72\u540D\u304C\u660E\u793A\u7684\u306B\u8981\u6C42\u3055\u308C\u307E\u3057\u305F\u304C\u3001\u7F72\u540D\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 error.explicit-sign-no-cert.advice=\u6709\u52B9\u306Amac-signing-key-user-name\u304A\u3088\u3073mac-signing-keychain\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 error.must-sign-app-store=Mac App Store\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u304C\u3001\u7F72\u540D\u306F\u30D0\u30F3\u30C9\u30E9\u69CB\u6210\u306B\u3088\u3063\u3066\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059
@@ -55,13 +55,14 @@ resource.post-install-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3
 resource.pkg-preinstall-script=PKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u524D\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.pkg-postinstall-script=PKG\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5F8C\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.pkg-background-image=pkg\u80CC\u666F\u30A4\u30E1\u30FC\u30B8
+resource.pkg-pdf=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5B9A\u7FA9\u30D5\u30A1\u30A4\u30EB
 
 
 message.bundle-name-too-long-warning={0}\u304C16\u6587\u5B57\u3092\u8D85\u3048\u308B''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002Mac\u3067\u306E\u64CD\u4F5C\u6027\u3092\u3088\u308A\u826F\u304F\u3059\u308B\u305F\u3081\u306B\u77ED\u304F\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 message.preparing-info-plist=Info.plist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}\u3002
 message.icon-not-icns= \u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICNS\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
-message.version-string-too-many-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217\u306B\u306F\u30011\u30011.2\u30011.2.3\u306A\u30691\u304B\u30893\u306E\u6570\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-message.version-string-first-number-not-zero='app-version' \u306E\u6700\u521D\u306E\u6570\u5B57\u306F\u3001\u30BC\u30ED\u307E\u305F\u306F\u8CA0\u306E\u5024\u306B\u3067\u304D\u307E\u305B\u3093\u3002
+message.version-string-too-many-components='app-version'\u306B\u306F\u30011\u30011.2\u30011.2.3\u306A\u30691\u304B\u30893\u306E\u6570\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+message.version-string-first-number-not-zero=pp-version\u306E\u6700\u521D\u306E\u6570\u5B57\u306F\u3001\u30BC\u30ED\u307E\u305F\u306F\u8CA0\u306E\u5024\u306B\u3067\u304D\u307E\u305B\u3093\u3002
 message.creating-association-with-null-extension=null\u62E1\u5F35\u5B50\u3068\u306E\u95A2\u9023\u4ED8\u3051\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
 message.ignoring.symlink=\u8B66\u544A: codesign\u304Csymlink {0}\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059
 message.already.signed=\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u3059: {0}\u3002
@@ -86,5 +87,5 @@ message.preparing-scripts=\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B9\u30AF\u30EA
 message.preparing-distribution-dist=distribution.dist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
 message.signing.pkg=\u8B66\u544A: PKG\u3078\u306E\u7F72\u540D\u306E\u5834\u5408\u3001\u300C\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u30FB\u30A2\u30AF\u30BB\u30B9\u300D\u30C4\u30FC\u30EB\u3092\u4F7F\u7528\u3057\u3066\u8A3C\u660E\u66F8\u306B\u300C\u5E38\u306B\u4FE1\u983C\u3059\u308B\u300D\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 message.setfile.dmg='SetFile'\u30E6\u30FC\u30C6\u30A3\u30EA\u30C6\u30A3\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u305F\u3081\u3001DMG\u30D5\u30A1\u30A4\u30EB\u3067\u306E\u30AB\u30B9\u30BF\u30E0\u30FB\u30A2\u30A4\u30B3\u30F3\u306E\u8A2D\u5B9A\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F\u3002Xcode\u3068\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u30FB\u30C4\u30FC\u30EB\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u3068\u3001\u3053\u306E\u554F\u984C\u306F\u89E3\u6C7A\u3055\u308C\u307E\u3059\u3002
-message.install-dir-ignored=Warning: "--install-dir" is not supported by DMG and will be default to /Applications.
-warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {0}.
+message.install-dir-ignored=\u8B66\u544A: "--install-dir"\u306FDMG\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002/Applications\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002
+warning.unsigned.app.image=\u8B66\u544A: \u7F72\u540D\u3055\u308C\u3066\u3044\u306A\u3044app-image\u3092\u4F7F\u7528\u3057\u3066\u7F72\u540D\u3055\u308C\u305F{0}\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
index ecf9e8796d5..0d832583c0e 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
@@ -29,7 +29,7 @@ store.bundler.name=\u652F\u6301 Mac App Store \u7684\u6253\u5305\u7A0B\u5E8F
 dmg.bundler.name=Mac DMG \u7A0B\u5E8F\u5305
 pkg.bundler.name=Mac PKG \u7A0B\u5E8F\u5305
 
-error.invalid-cfbundle-version.advice=Set a compatible 'app-version'. Valid versions are one to three integers separated by dots.
+error.invalid-cfbundle-version.advice=\u8BBE\u7F6E\u517C\u5BB9\u7684 'app-version' \u503C\u3002\u6709\u6548\u7248\u672C\u5305\u542B\u4E00\u5230\u4E09\u4E2A\u7528\u70B9\u5206\u9694\u7684\u6574\u6570\u3002
 error.explicit-sign-no-cert=\u5DF2\u660E\u786E\u8BF7\u6C42\u7B7E\u540D\uFF0C\u4F46\u627E\u4E0D\u5230\u7B7E\u540D\u8BC1\u4E66
 error.explicit-sign-no-cert.advice=\u6307\u5B9A\u6709\u6548\u7684 mac-signing-key-user-name \u548C mac-signing-keychain
 error.must-sign-app-store=Mac App Store \u5E94\u7528\u7A0B\u5E8F\u5FC5\u987B\u7B7E\u540D, \u800C\u6253\u5305\u7A0B\u5E8F\u914D\u7F6E\u5DF2\u7981\u7528\u7B7E\u540D
@@ -55,13 +55,14 @@ resource.post-install-script=\u8981\u5728\u586B\u5145\u5E94\u7528\u7A0B\u5E8F\u6
 resource.pkg-preinstall-script=PKG \u5B89\u88C5\u524D\u811A\u672C
 resource.pkg-postinstall-script=PKG \u5B89\u88C5\u540E\u811A\u672C
 resource.pkg-background-image=pkg \u80CC\u666F\u56FE\u50CF
+resource.pkg-pdf=\u9879\u76EE\u5B9A\u4E49\u6587\u4EF6
 
 
 message.bundle-name-too-long-warning={0}\u5DF2\u8BBE\u7F6E\u4E3A ''{1}'', \u5176\u957F\u5EA6\u8D85\u8FC7\u4E86 16 \u4E2A\u5B57\u7B26\u3002\u4E3A\u4E86\u83B7\u5F97\u66F4\u597D\u7684 Mac \u4F53\u9A8C, \u8BF7\u8003\u8651\u5C06\u5176\u7F29\u77ED\u3002
 message.preparing-info-plist=\u6B63\u5728\u51C6\u5907 Info.plist: {0}\u3002
 message.icon-not-icns= \u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICNS \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
-message.version-string-too-many-components=\u7248\u672C\u5B57\u7B26\u4E32\u53EF\u4EE5\u5305\u542B 1 \u5230 3 \u4E2A\u6570\u5B57: 1, 1.2, 1.2.3\u3002
-message.version-string-first-number-not-zero='app-version' \u4E2D\u7684\u7B2C\u4E00\u4E2A\u6570\u5B57\u4E0D\u80FD\u4E3A\u96F6\u6216\u8D1F\u6570\u3002
+message.version-string-too-many-components='app-version' \u53EF\u4EE5\u5305\u542B 1 \u5230 3 \u4E2A\u6570\u5B57\uFF1A1\u30011.2\u30011.2.3\u3002
+message.version-string-first-number-not-zero=app-version \u4E2D\u7684\u7B2C\u4E00\u4E2A\u6570\u5B57\u4E0D\u80FD\u4E3A\u96F6\u6216\u8D1F\u6570\u3002
 message.creating-association-with-null-extension=\u6B63\u5728\u4F7F\u7528\u7A7A\u6269\u5C55\u540D\u521B\u5EFA\u5173\u8054\u3002
 message.ignoring.symlink=\u8B66\u544A: codesign \u6B63\u5728\u8DF3\u8FC7\u7B26\u53F7\u94FE\u63A5 {0}\u3002
 message.already.signed=\u6587\u4EF6\u5DF2\u7B7E\u540D\uFF1A{0}\u3002
@@ -86,5 +87,5 @@ message.preparing-scripts=\u6B63\u5728\u51C6\u5907\u7A0B\u5E8F\u5305\u811A\u672C
 message.preparing-distribution-dist=\u6B63\u5728\u51C6\u5907 distribution.dist: {0}\u3002
 message.signing.pkg=\u8B66\u544A\uFF1A\u8981\u5BF9 PKG \u8FDB\u884C\u7B7E\u540D\uFF0C\u53EF\u80FD\u9700\u8981\u4F7F\u7528\u201C\u5BC6\u94A5\u94FE\u8BBF\u95EE\u201D\u5DE5\u5177\u4E3A\u8BC1\u4E66\u8BBE\u7F6E\u201C\u59CB\u7EC8\u4FE1\u4EFB\u201D\u3002
 message.setfile.dmg=\u7531\u4E8E\u672A\u627E\u5230 'SetFile' \u5B9E\u7528\u7A0B\u5E8F\uFF0C\u8DF3\u8FC7\u4E86\u9488\u5BF9 DMG \u6587\u4EF6\u8BBE\u7F6E\u5B9A\u5236\u56FE\u6807\u7684\u64CD\u4F5C\u3002\u5B89\u88C5\u5E26\u547D\u4EE4\u884C\u5DE5\u5177\u7684 Xcode \u5E94\u80FD\u89E3\u51B3\u6B64\u95EE\u9898\u3002
-message.install-dir-ignored=Warning: "--install-dir" is not supported by DMG and will be default to /Applications.
-warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {0}.
+message.install-dir-ignored=\u8B66\u544A\uFF1A"--install-dir" \u4E0D\u53D7 DMG \u652F\u6301\uFF0C\u5C06\u9ED8\u8BA4\u4E3A /Applications\u3002
+warning.unsigned.app.image=\u8B66\u544A\uFF1A\u4F7F\u7528\u672A\u7B7E\u540D\u7684 app-image \u751F\u6210\u5DF2\u7B7E\u540D\u7684 {0}\u3002
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
new file mode 100644
index 00000000000..16540e2f002
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+MSG_Help=Verwendung: jpackage <Optionen>\n\nBeispielverwendungen:\n--------------\n    Generiert ein f\u00FCr das Hostsystem geeignetes Anwendungspackage:\n        F\u00FCr eine modulare Anwendung:\n            jpackage -n name -p modulePath -m moduleName/className\n        F\u00FCr eine nicht modulare Anwendung:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Aus einem vorab erstellten Anwendungsimage:\n            jpackage -n name --app-image appImageDir\n    Generiert ein Anwendungsimage:\n        F\u00FCr eine modulare Anwendung:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        F\u00FCr eine nicht modulare Anwendung:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        Um eigene Optionen f\u00FCr jlink anzugeben, f\u00FChren Sie jlink separat aus:\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<zus\u00E4tzliche jlink-Optionen>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Generiert ein Java-Laufzeitpackage:\n        jpackage -n name --runtime-image <Laufzeitimage>\n\nAllgemeine Optionen:\n  @<Dateiname > \n          Liest Optionen und/oder Modus aus einer Datei \n          Diese Option kann mehrmals verwendet werden.\n  --type -t <Typ> \n          Der zu erstellende Packagetyp\n          G\u00FCltige Werte: {1} \n          Bei fehlender Angabe dieser Option wird ein plattformabh\u00E4ngiger\n          Standardtyp erstellt.\n  --app-version <Version>\n          Version der Anwendung und/oder des Packages\n  --copyright <Copyright-Zeichenfolge>\n          Copyright f\u00FCr die Anwendung\n  --description <Zeichenfolge f\u00FCr Beschreibung>\n          Beschreibung der Anwendung\n  --help -h \n          Gibt den Verwendungstext mit einer Liste und Beschreibung jeder g\u00FCltigen\n          Option f\u00FCr die aktuelle Plattform an den Ausgabestream aus und beendet den Vorgang\n  --icon <Dateipfad>\n          Pfad des Symbols f\u00FCr das Anwendungspackage\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --name -n <Name>\n          Name der Anwendung und/oder des Packages\n  --dest -d <Zielpfad>\n          Pfad, in den die generierte Ausgabedatei abgelegt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Standardm\u00E4\u00DFig wird das aktuelle Arbeitsverzeichnis verwendet.\n  --temp <Verzeichnispfad>\n          Pfad eines neuen oder leeren Verzeichnisses zum Erstellen tempor\u00E4rer Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Falls angegeben, wird das tempor\u00E4re Verzeichnis beim Abschlie\u00DFen der Aufgabe\n          nicht entfernt und muss manuell entfernt werden.\n          Bei fehlender Angabe wird ein tempor\u00E4res Verzeichnis erstellt und\n          beim Abschlie\u00DFen der Aufgabe entfernt.\n  --vendor <Zeichenfolge f\u00FCr Anbieter>\n          Anbieter der Anwendung\n  --verbose\n          Aktiviert Ausgabe im Verbose-Modus\n  --version\n          Gibt die Produktversion an den Outputstream aus und beendet den Vorgang.\n\nOptionen f\u00FCr das Erstellen des Laufzeitimages:\n  --add-modules <Modulname>[,<Modulname>...]\n          Eine per Komma (",") getrennte Liste hinzuzuf\u00FCgender Module\n          Diese Modulliste wird zusammen mit dem Hauptmodul (sofern angegeben)\n          als Argument --add-module an jlink \u00FCbergeben.\n          Bei fehlender Angabe wird entweder nur das Hauptmodul (sofern --module\n          angegeben ist) oder das Standardset an Modulen (sofern --main-jar \n          angegeben ist) verwendet.\n          Diese Option kann mehrmals verwendet werden.\n  --module-path -p <Modulpfad>...\n          \
+Eine per {0} getrennte Pfadliste\n          Jeder Pfad ist entweder ein Verzeichnis mit Modulen oder der Pfad zu einer\n          JAR-Datei eines Moduls.\n          (Jeder Pfad ist absolut oder relativ zum aktuellen Verzeichnis.)\n          Diese Option kann mehrmals verwendet werden.\n  --jlink-options <jlink-Optionen> \n          Eine per Leerzeichen getrennte Liste mit an jlink zu \u00FCbergebenden Optionen \n          Bei fehlender Angabe wird standardm\u00E4\u00DFig "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files" verwendet. \n          Diese Option kann mehrmals verwendet werden.\n  --runtime-image <Verzeichnispfad>\n          Pfad des vordefinierten Laufzeitimages, das in\n          das Anwendungsimage kopiert wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Wenn --runtime-image nicht angegeben wird, f\u00FChrt jpackage jlink aus, um\n          das Laufzeitimage mit folgenden Optionen zu erstellen:\n          --strip-debug, --no-header-files, --no-man-pages und\n          --strip-native-commands.\n\nOptionen f\u00FCr das Erstellen des Anwendungsimages:\n  --input -i <Verzeichnispfad>\n          Pfad des Eingabeverzeichnisses mit den in das Package zu integrierenden Dateien\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Alle Dateien im Eingabeverzeichnis werden in das Package f\u00FCr das\n          Anwendungsimage integriert.\n  --app-content <zus\u00E4tzlicher Inhalt>[,<zus\u00E4tzlicher Inhalt>...]\n          Eine per Komma getrennte Liste mit Pfaden zu Dateien und/oder Verzeichnissen,\n          die zur Anwendungs-Payload hinzugef\u00FCgt werden sollen.\n          Diese Option kann mehrmals verwendet werden.\n\nOptionen f\u00FCr das Erstellen des Anwendungs-Launchers:\n  --add-launcher <Launcher-Name>=<Dateipfad>\n          Name des Launchers sowie ein Pfad zu einer Eigenschaftendatei mit\n          einer Liste von Schl\u00FCssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Die Schl\u00FCssel "module", "main-jar", "main-class",\n          "arguments", "java-options", "app-version", "icon",\n          "win-console", "win-shortcut", "win-menu",\n          "linux-app-category" und "linux-shortcut" k\u00F6nnen verwendet werden.\n          Diese Optionen werden den urspr\u00FCnglichen Befehlszeilenoptionen hinzugef\u00FCgt\n          (oder \u00FCberschreiben diese), um einen zus\u00E4tzlichen, alternativen Launcher zu erstellen.\n          Der Hauptanwendungs-Launcher wird aus den Befehlszeilenoptionen\n          erstellt. Mit dieser Option k\u00F6nnen zus\u00E4tzliche alternative Launcher\n          erstellt werden. Au\u00DFerdem kann diese Option mehrmals verwendet werden,\n          um mehrere zus\u00E4tzliche Launcher zu erstellen. \n  --arguments <Hauptklassenargumente>\n          Befehlszeilenargumente, die an die Hauptklasse \u00FCbergeben werden, falls\n          keine Befehlszeilenargumente an den Launcher \u00FCbergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --java-options <Java-Optionen>\n          Optionen, die an die Java-Laufzeit \u00FCbergeben werden\n          Diese Option kann mehrmals verwendet werden.\n  --main-class <Klassenname>\n          Qualifizierter Name der auszuf\u00FChrenden Anwendungshauptklasse\n          Diese Option kann nur bei Angabe von --main-jar verwendet werden.\n  --main-jar <Haupt-JAR-Datei>\n          Die Haupt-JAR-Datei der Anwendung, die die Hauptklasse enth\u00E4lt\n          (angegeben als Pfad relativ zum Eingabepfad)\n          Es kann entweder die Option --module oder die Option --main-jar angegeben werden, nicht jedoch\n          beides.\n  --module -m <Modulname>[/<Hauptklasse>]\n          Das Hauptmodul (und optional die Hauptklasse) der Anwendung\n          Dieses Modul muss unter dem Modulpfad gespeichert sein.\n          Bei Angabe dieser Option wird das Hauptmodul\n          im \
+Java-Laufzeitimage verkn\u00FCpft. Es kann entweder die Option --module oder die Option --main-jar\n          angegeben werden, nicht jedoch beides.\n{2}\nOptionen f\u00FCr das Erstellen des Anwendungspackages:\n  --about-url <URL>\n          URL der Homepage der Anwendung\n  --app-image <Verzeichnispfad>\n          Speicherort des vordefinierten Anwendungsimages, mit dem\n          ein installierbares Package erstellt wird\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --file-associations <Dateipfad>\n          Pfad zu einer Eigenschaftendatei mit einer Liste von Schl\u00FCssel/Wert-Paaren\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Mit den Schl\u00FCsseln "extension", "mime-type", "icon" und "description"\n          kann die Verkn\u00FCpfung beschrieben werden.\n          Diese Option kann mehrmals verwendet werden.\n  --install-dir <Verzeichnispfad>\n          {4}  --license-file <Dateipfad>\n          Pfad zur Lizenzdatei\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --resource-dir <Verzeichnispfad>\n          Pfad zum \u00DCberschreiben von jpackage-Ressourcen\n          Symbole, Vorlagendateien und weitere Ressourcen von jpackage k\u00F6nnen\n          durch Hinzuf\u00FCgen von Ersetzungsressourcen zu diesem Verzeichnis \u00FCberschrieben werden.\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n  --runtime-image <Verzeichnispfad>\n          Pfad des zu installierenden vordefinierten Laufzeitimages\n          (absoluter Pfad oder relativ zum aktuellen Verzeichnis)\n          Option muss beim Erstellen eines Laufzeitpackages angegeben werden.\n\nPlattformabh\u00E4ngige Optionen f\u00FCr das Erstellen des Anwendungspackages:\n{3}
+
+MSG_Help_win_launcher=\nPlattformabh\u00E4ngige Option f\u00FCr das Erstellen des Anwendungs-Launchers:\n  --win-console\n          Erstellt einen Konsolen-Launcher f\u00FCr die Anwendung. Sollte f\u00FCr\n          Anwendungen angegeben werden, die Konsoleninteraktionen erfordern\n
+MSG_Help_win_install=\  --win-dir-chooser\n          F\u00FCgt ein Dialogfeld hinzu, in dem der Benutzer das Verzeichnis ausw\u00E4hlen kann, in dem\n          das Produkt installiert wird.\n  --win-help-url <URL>\n          URL, unter der der Benutzer weitere Informationen oder technische Unterst\u00FCtzung erh\u00E4lt\n  --win-menu\n          Anforderung zum Hinzuf\u00FCgen einer Startmen\u00FCverkn\u00FCpfung f\u00FCr diese Anwendung\n  --win-menu-group <Men\u00FCgruppenname>\n          Startmen\u00FCgruppe, in der diese Anwendung abgelegt wird\n  --win-per-user-install\n          Anforderung zum Ausf\u00FChren einer Installation pro Benutzer\n  --win-shortcut\n          Anforderung zum Hinzuf\u00FCgen einer Desktopverkn\u00FCpfung f\u00FCr diese Anwendung\n  --win-shortcut-prompt\n          F\u00FCgt ein Dialogfeld hinzu, in dem der Benutzer ausw\u00E4hlen kann, ob Verkn\u00FCpfungen\n          vom Installationsprogramm erstellt werden sollen.\n  --win-update-url <URL>\n          URL verf\u00FCgbarer Anwendungsupdateinformationen\n  --win-upgrade-uuid <ID-Zeichenfolge>\n          UUID, die mit Upgrades f\u00FCr dieses Package verkn\u00FCpft ist\n
+MSG_Help_win_install_dir=Relativer Unterpfad unter dem Standardinstallationsverzeichnis\n
+MSG_Help_mac_install=\  --mac-dmg-content <Pfad zu zus\u00E4tzlichem Inhalt>[,<Pfad zu zus\u00E4tzlichem Inhalt>...]\n          Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n          Diese Option kann mehrmals verwendet werden. \n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID-Zeichenfolge>\n          Eine ID, die die Anwendung f\u00FCr macOS eindeutig identifiziert\n          Standardwert ist der Hauptklassenname.\n          Es d\u00FCrfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n          und Punkte (.) verwendet werden.\n  --mac-package-name <Namenszeichenfolge>\n          Name der Anwendung, wie in der Men\u00FCleiste angezeigt\n          Dieser kann vom Anwendungsnamen abweichen.\n          Er darf maximal 15 Zeichen enthalten und muss f\u00FCr die Anzeige\n          in der Men\u00FCleiste und im Infofenster der Anwendung geeignet sein.\n          Standardwert: Anwendungsname.\n  --mac-package-signing-prefix <Pr\u00E4fixzeichenfolge>\n          Beim Signieren des Anwendungspackages wird dieser Wert\n          allen zu signierenden Komponenten ohne vorhandene\n          Package-ID als Pr\u00E4fix vorangestellt.\n  --mac-sign\n          Anforderung zum Signieren des Packages\n  --mac-signing-keychain <Schl\u00FCsselbundname>\n          Name des Schl\u00FCsselbundes f\u00FCr die Suche nach der Signaturidentit\u00E4t\n          Bei fehlender Angabe werden die Standardschl\u00FCsselbunde verwendet.\n  --mac-signing-key-user-name <Teamname>\n          Team- oder Benutzernamensteil der Apple-Signaturidentit\u00E4ten.\n  --mac-app-store\n          Gibt an, dass die jpackage-Ausgabe f\u00FCr den\n          Mac App Store bestimmt ist.\n  --mac-entitlements <Dateipfad>\n          Pfad zu einer Datei mit Berechtigungen, die beim Signieren\n          von ausf\u00FChrbaren Dateien und Librarys im Bundle verwendet werden sollen.\n  --mac-app-category <Kategoriezeichenfolge>\n          Zeichenfolge f\u00FCr das Erstellen von LSApplicationCategoryType in\n          Anwendungs-plist. Standardwert: "utilities".\n
+MSG_Help_linux_install=\  --linux-package-name <Packagename>\n          Name f\u00FCr das Linux-Package, Standardwert: Anwendungsname\n  --linux-deb-maintainer <E-Mail-Adresse>\n          Maintainer f\u00FCr .deb-Package\n  --linux-menu-group <Men\u00FCgruppenname>\n          Men\u00FCgruppe, in der diese Anwendung abgelegt wird\n  --linux-package-deps\n          Erforderliche Packages oder Funktionen f\u00FCr die Anwendung\n  --linux-rpm-license-type <Typzeichenfolge>\n          Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n  --linux-app-release <Releasewert>\n          Releasewert der RPM-SPEC-Datei <Name> oder \n          Debian-Revisionswert der DEB-Kontrolldatei\n  --linux-app-category <Kategoriewert>\n          Gruppenwert der RPM-SPEC-Datei <Name> oder \n          Abschnittswert der DEB-Kontrolldatei\n  --linux-shortcut\n          Erstellt eine Verkn\u00FCpfung f\u00FCr die Anwendung.\n
+MSG_Help_mac_linux_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung\n
+MSG_Help_default_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung auf OS X\n          oder Linux. Relativer Unterpfad des Installationsverzeichnisses der\n          Anwendung wie "Programme" oder "AppData" unter Windows.\n
+MSG_Help_no_args=Verwendung: jpackage <Optionen>\nVerwenden Sie jpackage --help (oder -h), um eine Liste m\u00F6glicher Optionen aufzurufen
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
index 6ed6c2c90a9..8a7239cab95 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,239 +24,18 @@
 #
 #
 
-MSG_Help=Usage: jpackage <options>\n\
-\n\
-Sample usages:\n\
---------------\n\
-\    Generate an application package suitable for the host system:\n\
-\        For a modular application:\n\
-\            jpackage -n name -p modulePath -m moduleName/className\n\
-\        For a non-modular application:\n\
-\            jpackage -i inputDir -n name \\\n\
-\                --main-class className --main-jar myJar.jar\n\
-\        From a pre-built application image:\n\
-\            jpackage -n name --app-image appImageDir\n\
-\    Generate an application image:\n\
-\        For a modular application:\n\
-\            jpackage --type app-image -n name -p modulePath \\\n\
-\                -m moduleName/className\n\
-\        For a non-modular application:\n\
-\            jpackage --type app-image -i inputDir -n name \\\n\
-\                --main-class className --main-jar myJar.jar\n\
-\        To provide your own options to jlink, run jlink separately:\n\
-\            jlink --output appRuntimeImage -p modulePath \\\n\
-\                --add-modules moduleName \\\n\
-\                --no-header-files [<additional jlink options>...]\n\
-\            jpackage --type app-image -n name \\\n\
-\                -m moduleName/className --runtime-image appRuntimeImage\n\
-\    Generate a Java runtime package:\n\
-\        jpackage -n name --runtime-image <runtime-image>\n\
-\n\
-Generic Options:\n\
-\  @<filename> \n\
-\          Read options and/or mode from a file \n\
-\          This option can be used multiple times.\n\
-\  --type -t <type> \n\
-\          The type of package to create\n\
-\          Valid values are: {1} \n\
-\          If this option is not specified a platform dependent\n\
-\          default type will be created.\n\
-\  --app-version <version>\n\
-\          Version of the application and/or package\n\
-\  --copyright <copyright string>\n\
-\          Copyright for the application\n\
-\  --description <description string>\n\
-\          Description of the application\n\
-\  --help -h \n\
-\          Print the usage text with a list and description of each valid\n\
-\          option for the current platform to the output stream, and exit\n\
-\  --icon <file path>\n\
-\          Path of the icon of the application package\n\
-\          (absolute path or relative to the current directory)\n\
-\  --name -n <name>\n\
-\          Name of the application and/or package\n\
-\  --dest -d <destination path>\n\
-\          Path where generated output file is placed\n\
-\          (absolute path or relative to the current directory)\n\
-\          Defaults to the current working directory.\n\
-\  --temp <directory path>\n\
-\          Path of a new or empty directory used to create temporary files\n\
-\          (absolute path or relative to the current directory)\n\
-\          If specified, the temp dir will not be removed upon the task\n\
-\          completion and must be removed manually.\n\
-\          If not specified, a temporary directory will be created and\n\
-\          removed upon the task completion.\n\
-\  --vendor <vendor string>\n\
-\          Vendor of the application\n\
-\  --verbose\n\
-\          Enables verbose output\n\
-\  --version\n\
-\          Print the product version to the output stream and exit.\n\
-\n\
-\Options for creating the runtime image:\n\
-\  --add-modules <module name>[,<module name>...]\n\
-\          A comma (",") separated list of modules to add\n\
-\          This module list, along with the main module (if specified)\n\
-\          will be passed to jlink as the --add-module argument.\n\
-\          If not specified, either just the main module (if --module is\n\
-\          specified), or the default set of modules (if --main-jar is \n\
-\          specified) are used.\n\
-\          This option can be used multiple times.\n\
-\  --module-path -p <module path>...\n\
-\          A {0} separated list of paths\n\
-\          Each path is either a directory of modules or the path to a\n\
-\          modular jar.\n\
-\          (Each path is absolute or relative to the current directory.)\n\
-\          This option can be used multiple times.\n\
-\  --jlink-options <jlink options> \n\
-\          A space separated list of options to pass to jlink \n\
-\          If not specified, defaults to "--strip-native-commands \n\
-\          --strip-debug --no-man-pages --no-header-files". \n\
-\          This option can be used multiple times.\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image that will be copied into\n\
-\          the application image\n\
-\          (absolute path or relative to the current directory)\n\
-\          If --runtime-image is not specified, jpackage will run jlink to\n\
-\          create the runtime image using options:\n\
-\          --strip-debug, --no-header-files, --no-man-pages, and\n\
-\          --strip-native-commands.\n\
-\n\
-\Options for creating the application image:\n\
-\  --input -i <directory path>\n\
-\          Path of the input directory that contains the files to be packaged\n\
-\          (absolute path or relative to the current directory)\n\
-\          All files in the input directory will be packaged into the\n\
-\          application image.\n\
-\  --app-content <additional content>[,<additional content>...]\n\
-\          A comma separated list of paths to files and/or directories\n\
-\          to add to the application payload.\n\
-\          This option can be used more than once.\n\
-\n\
-\Options for creating the application launcher(s):\n\
-\  --add-launcher <launcher name>=<file path>\n\
-\          Name of launcher, and a path to a Properties file that contains\n\
-\          a list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "module", "main-jar", "main-class", "description",\n\
-\          "arguments", "java-options", "app-version", "icon",\n\
-\          "win-console", "win-shortcut", "win-menu",\n\
-\          "linux-app-category", and "linux-shortcut" can be used.\n\
-\          These options are added to, or used to overwrite, the original\n\
-\          command line options to build an additional alternative launcher.\n\
-\          The main application launcher will be built from the command line\n\
-\          options. Additional alternative launchers can be built using\n\
-\          this option, and this option can be used multiple times to\n\
-\          build multiple additional launchers. \n\
-\  --arguments <main class arguments>\n\
-\          Command line arguments to pass to the main class if no command\n\
-\          line arguments are given to the launcher\n\
-\          This option can be used multiple times.\n\
-\  --java-options <java options>\n\
-\          Options to pass to the Java runtime\n\
-\          This option can be used multiple times.\n\
-\  --main-class <class name>\n\
-\          Qualified name of the application main class to execute\n\
-\          This option can only be used if --main-jar is specified.\n\
-\  --main-jar <main jar file>\n\
-\          The main JAR of the application; containing the main class\n\
-\          (specified as a path relative to the input path)\n\
-\          Either --module or --main-jar option can be specified but not\n\
-\          both.\n\
-\  --module -m <module name>[/<main class>]\n\
-\          The main module (and optionally main class) of the application\n\
-\          This module must be located on the module path.\n\
-\          When this option is specified, the main module will be linked\n\
-\          in the Java runtime image.  Either --module or --main-jar\n\
-\          option can be specified but not both.\n\
-{2}\n\
-\Options for creating the application package:\n\
-\  --about-url <url>\n\
-\          URL of the application''s home page\n\
-\  --app-image <directory path>\n\
-\          Location of the predefined application image that is used\n\
-\          to build an installable package\n\
-\          (absolute path or relative to the current directory)\n\
-\  --file-associations <file path>\n\
-\          Path to a Properties file that contains list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "extension", "mime-type", "icon", and "description"\n\
-\          can be used to describe the association.\n\
-\          This option can be used multiple times.\n\
-\  --install-dir <directory path>\n\
-\          {4}\
-\  --license-file <file path>\n\
-\          Path to the license file\n\
-\          (absolute path or relative to the current directory)\n\
-\  --resource-dir <directory path>\n\
-\          Path to override jpackage resources\n\
-\          Icons, template files, and other resources of jpackage can be\n\
-\          over-ridden by adding replacement resources to this directory.\n\
-\          (absolute path or relative to the current directory)\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image to install\n\
-\          (absolute path or relative to the current directory)\n\
-\          Option is required when creating a runtime package.\n\
-\n\
-\Platform dependent options for creating the application package:\n\
-{3}
+MSG_Help=\u4F7F\u7528\u65B9\u6CD5: jpackage <options>\n\n\u4F7F\u7528\u4F8B:\n--------------\n    \u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u306B\u9069\u3057\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n        \u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage -n name -p modulePath -m moduleName/className\n        \u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u4E8B\u524D\u4F5C\u6210\u3055\u308C\u305F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u304B\u3089:\n            jpackage -n name --app-image appImageDir\n    \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u751F\u6210:\n        \u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        \u975E\u30E2\u30B8\u30E5\u30E9\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5834\u5408:\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        jlink\u306B\u72EC\u81EA\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u306B\u306F\u3001jlink\u3092\u5225\u500B\u306B\u5B9F\u884C\u3057\u307E\u3059\u3002\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    Java\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n        jpackage -n name --runtime-image <runtime-image>\n\n\u4E00\u822C\u7684\u306A\u30AA\u30D7\u30B7\u30E7\u30F3:\n  @<filename> \n          \u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u8AAD\u53D6\u308A\u30AA\u30D7\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30E2\u30FC\u30C9 \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --type -t <type> \n          \u4F5C\u6210\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30BF\u30A4\u30D7\n          \u6709\u52B9\u306A\u5024: {1} \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u306E\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30BF\u30A4\u30D7\u304C\u4F5C\u6210\u3055\u308C\u307E\u3059\n  --app-version <version>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\n  --copyright <copyright string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B3\u30D4\u30FC\u30E9\u30A4\u30C8\n  --description <description string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8AAC\u660E\n  --help -h \n          \u4F7F\u7528\u65B9\u6CD5\u30C6\u30AD\u30B9\u30C8\u3068\u73FE\u5728\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306E\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u3068\u8AAC\u660E\u3092\n          \u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u3001\u7D42\u4E86\u3057\u307E\u3059\n  --icon <file path>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30A4\u30B3\u30F3\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --name \
+-n <name>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304A\u3088\u3073\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\n  --dest -d <destination path>\n          \u751F\u6210\u3055\u308C\u305F\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u914D\u7F6E\u3055\u308C\u308B\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u73FE\u5728\u306E\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n  --temp <directory path>\n          \u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3055\u308C\u308B\u65B0\u898F\u307E\u305F\u306F\u7A7A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u6307\u5B9A\u3057\u305F\u5834\u5408\u3001\u30BF\u30B9\u30AF\u5B8C\u4E86\u6642\u306B\u4E00\u6642\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u524A\u9664\u3055\u308C\u306A\u3044\u305F\u3081\n          \u624B\u52D5\u3067\u524A\u9664\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u4E00\u6642\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4F5C\u6210\u3055\u308C\n          \u30BF\u30B9\u30AF\u5B8C\u4E86\u6642\u306B\u524A\u9664\u3055\u308C\u307E\u3059\u3002\n  --vendor <vendor string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30D9\u30F3\u30C0\u30FC\n  --verbose\n          \u8A73\u7D30\u306A\u51FA\u529B\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n  --version\n          \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n\n\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --add-modules <module name>[,<module name>...]\n          \u8FFD\u52A0\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30AB\u30F3\u30DE(",")\u533A\u5207\u308A\u30EA\u30B9\u30C8\n          \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30EA\u30B9\u30C8\u3068\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB(\u6307\u5B9A\u3057\u305F\u5834\u5408)\n          \u304C--add-module\u5F15\u6570\u3068\u3057\u3066jlink\u306B\u6E21\u3055\u308C\u307E\u3059\u3002\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u307F(--module\u304C\n          \u6307\u5B9A\u3055\u308C\u305F\u5834\u5408)\u3001\u307E\u305F\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BB\u30C3\u30C8(--main-jar\u304C \n          \u6307\u5B9A\u3055\u308C\u305F\u5834\u5408)\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --module-path -p <module path>...\n          \u30D1\u30B9\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\n          \u5404\u30D1\u30B9\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u307E\u305F\u306F\n          \u30E2\u30B8\u30E5\u30E9jar\u3078\u306E\u30D1\u30B9\u3067\u3059\u3002\n          (\u5404\u30D1\u30B9\u306F\u3001\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9\u3067\u3059\u3002)\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --jlink-options <jlink options> \n          jlink\u306B\u6E21\u3059\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30B9\u30DA\u30FC\u30B9\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8 \n          \u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001"--strip-native-commands \n          --strip-debug --no-man-pages \
+--no-header-files"\u3002 \n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --runtime-image <directory path>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\u30B3\u30D4\u30FC\u3055\u308C\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\n          \u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          --runtime-image\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001jpackage\u306Fjlink\u3092\u5B9F\u884C\u3057\u3001\n          \u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u307E\u3059:\n          --strip-debug\u3001--no-header-files\u3001--no-man-pages\u304A\u3088\u3073\n          --strip-native-commands\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --input -i <directory path>\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3080\u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u5165\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306B\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3055\u308C\u307E\u3059\u3002\n  --app-content <additional content>[,<additional content>...]\n          \u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA(\u3042\u308B\u3044\u306F\u4E21\u65B9)\u306E\u30D1\u30B9\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30DA\u30A4\u30ED\u30FC\u30C9\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --add-launcher <launcher name>=<file path>\n          \u30E9\u30F3\u30C1\u30E3\u306E\u540D\u524D\u3001\u304A\u3088\u3073\u30AD\u30FC\u3001\u5024\u306E\u30DA\u30A2\u306E\u30EA\u30B9\u30C8\n          \u3092\u542B\u3080\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30AD\u30FC"module"\u3001"main-jar"\u3001"main-class"\u3001\n          "arguments"\u3001"java-options"\u3001"app-version"\u3001"icon"\u3001\n          "win-console"\u3001"win-shortcut"\u3001"win-menu"\u3001\n          "linux-app-category"\u304A\u3088\u3073"linux-shortcut"\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n          \u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u5143\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u8FFD\u52A0\u3059\u308B\u304B\u3001\u3053\u308C\u3089\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\n          \u4F7F\u7528\u3057\u3066\u5143\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4E0A\u66F8\u304D\u3057\u3066\u3001\u8FFD\u52A0\u306E\u4EE3\u66FF\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\n          \
+\u30E1\u30A4\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u306F\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u304B\u3089\u4F5C\u6210\u3055\u308C\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u8FFD\u52A0\u306E\u4EE3\u66FF\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3067\u304D\u3001\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8907\u6570\u56DE\u4F7F\u7528\u3057\u3066\n          \u8907\u6570\u306E\u8FFD\u52A0\u306E\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3067\u304D\u307E\u3059\u3002 \n  --arguments <main class arguments>\n          \u30E9\u30F3\u30C1\u30E3\u306B\u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u5F15\u6570\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306B\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306B\u6E21\u3059\n          \u30B3\u30DE\u30F3\u30C9\u30FB\u30E9\u30A4\u30F3\u5F15\u6570\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --java-options <java options>\n          Java\u30E9\u30F3\u30BF\u30A4\u30E0\u306B\u6E21\u3059\u30AA\u30D7\u30B7\u30E7\u30F3\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --main-class <class name>\n          \u5B9F\u884C\u3059\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u306E\u4FEE\u98FE\u540D\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u3001--main-jar\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3060\u3051\u3067\u3059\u3002\n  --main-jar <main jar file>\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u542B\u3080\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3JAR\n          (\u5165\u529B\u30D1\u30B9\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9\u3068\u3057\u3066\u6307\u5B9A)\n          --module\u307E\u305F\u306F--main-jar\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u4E21\u65B9\u306F\n          \u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n  --module -m <module name>[/<main class>]\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB(\u304A\u3088\u3073\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9)\n          \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u3001\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306B\u7F6E\u304B\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30E1\u30A4\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\n          Java\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u3067\u30EA\u30F3\u30AF\u3055\u308C\u307E\u3059\u3002--module\u307E\u305F\u306F--main-jar\n          \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u4E21\u65B9\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n{2}\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --about-url <url>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30DB\u30FC\u30E0\u30DA\u30FC\u30B8\u306EURL\n  --app-image <directory path>\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u53EF\u80FD\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3059\u308B\u3001\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u5834\u6240\n          \
+(\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --file-associations <file path>\n          \u30AD\u30FC\u3001\u5024\u306E\u30DA\u30A2\u306E\u30EA\u30B9\u30C8\u3092\u542B\u3080\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30AD\u30FC"extension"\u3001"mime-type"\u3001"icon"\u3001"description"\n          \u3092\u4F7F\u7528\u3057\u3066\u95A2\u9023\u4ED8\u3051\u3092\u8A18\u8FF0\u3067\u304D\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --resource-dir <directory path>\n          \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9jpackage\u30EA\u30BD\u30FC\u30B9\u3078\u306E\u30D1\u30B9\n          \u30A2\u30A4\u30B3\u30F3\u3001\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073jpackage\u306E\u305D\u306E\u4ED6\u306E\u30EA\u30BD\u30FC\u30B9\u306F\u3001\n          \u3053\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u7F6E\u63DB\u30EA\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u3067\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3067\u304D\u307E\u3059\u3002\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n  --runtime-image <directory path>\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u306E\u30D1\u30B9\n          (\u7D76\u5BFE\u30D1\u30B9\u307E\u305F\u306F\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304B\u3089\u306E\u76F8\u5BFE\u30D1\u30B9)\n          \u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F5C\u6210\u6642\u306B\u306F\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002\n\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u30AA\u30D7\u30B7\u30E7\u30F3:\n{3}
 
 MSG_Help_win_launcher=\n\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u4F9D\u5B58\u30AA\u30D7\u30B7\u30E7\u30F3:\n  --win-console\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B3\u30F3\u30BD\u30FC\u30EB\u30FB\u30E9\u30F3\u30C1\u30E3\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u30B3\u30F3\u30BD\u30FC\u30EB\u30FB\n          \u30A4\u30F3\u30BF\u30E9\u30AF\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\n
-MSG_Help_win_install=\
-\  --win-dir-chooser\n\
-\          Adds a dialog to enable the user to choose a directory in which\n\
-\          the product is installed.\n\
-\  --win-help-url <url>\n\
-\          URL where user can obtain further information or technical support\n\
-\  --win-menu\n\
-\          Request to add a Start menu shortcut for this application\n\
-\  --win-menu-group <menu group name>\n\
-\          Start Menu group this application is placed in\n\
-\  --win-per-user-install\n\
-\          Request to perform an install on a per-user basis\n\
-\  --win-shortcut\n\
-\          Request to add desktop shortcut for this application\n\
-\  --win-shortcut-prompt\n\
-\          Adds a dialog to enable the user to choose if shortcuts\n\
-\          will be created by installer.\n\
-\  --win-update-url <url>\n\
-\          URL of available application update information\n\
-\  --win-upgrade-uuid <id string>\n\
-\          UUID associated with upgrades for this package\n\
-
+MSG_Help_win_install=\  --win-dir-chooser\n          \u30E6\u30FC\u30B6\u30FC\u304C\u88FD\u54C1\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E\u3059\u308B\u305F\u3081\u306E\n          \u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --win-help-url <url>\n          \u30E6\u30FC\u30B6\u30FC\u304C\u8A73\u7D30\u60C5\u5831\u307E\u305F\u306F\u6280\u8853\u7684\u306A\u30B5\u30DD\u30FC\u30C8\u3092\u53D6\u5F97\u3067\u304D\u308BURL\n  --win-menu\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B9\u30BF\u30FC\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-menu-group <menu group name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u914D\u7F6E\u3059\u308B\u30B9\u30BF\u30FC\u30C8\u30FB\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --win-per-user-install\n          \u30E6\u30FC\u30B6\u30FC\u3054\u3068\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u5B9F\u884C\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-shortcut\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u3088\u3046\u306B\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --win-shortcut-prompt\n          \u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u3067\u4F5C\u6210\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u30E6\u30FC\u30B6\u30FC\u304C\u9078\u629E\u3067\u304D\u308B\u3088\u3046\u306B\u3059\u308B\n          \u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n  --win-update-url <url>\n          \u4F7F\u7528\u53EF\u80FD\u306A\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u66F4\u65B0\u60C5\u5831\u306EURL\n  --win-upgrade-uuid <id string>\n          \u3053\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u305FUUID\n
 MSG_Help_win_install_dir=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240\u306E\u4E0B\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\n
-
-MSG_Help_mac_install=\
-\  --mac-dmg-content <additional content path>[,<additional content path>...]\n\
-\          Include all the referenced content in the dmg.\n\
-\          This option can be used multiple times. \n\
-
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          MacOS\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E00\u610F\u306B\u8B58\u5225\u3059\u308BID\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n          \u82F1\u6570\u5B57(A-Z\u3001a-z\u30010-9)\u3001\u30CF\u30A4\u30D5\u30F3(-)\n          \u304A\u3088\u3073\u30D4\u30EA\u30AA\u30C9(.)\u6587\u5B57\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --mac-package-name <name string>\n          \u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u306B\u8868\u793A\u3055\u308C\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\n          \u3053\u306E\u540D\u524D\u306F16\u6587\u5B57\u672A\u6E80\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\n          \u304A\u3088\u3073\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A\u3059\u308B\u306E\u306B\u9069\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u969B\u3001\u65E2\u5B58\u306E\u30D1\u30C3\u30B1\u30FC\u30B8ID\u306E\u306A\u3044\n          \u7F72\u540D\u304C\u5FC5\u8981\u306A\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3001\n          \u3053\u306E\u5024\u304C\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4ED8\u3051\u3089\u308C\u307E\u3059\u3002\n  --mac-sign\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u3088\u3046\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  \n\
-\  --mac-signing-keychain <keychain name>\n\
-\          Name of the keychain to search for the signing identity\n\
-\          If not specified, the standard keychains are used.\n\
-\  --mac-signing-key-user-name <team name>\n\
-\          Team or user name portion of Apple signing identities.\n\
-\  --mac-app-store\n\
-\          Indicates that the jpackage output is intended for the\n\
-\          Mac App Store.\n\
-\  --mac-entitlements <file path>\n\
-\          Path to file containing entitlements to use when signing\n\
-\          executables and libraries in the bundle.\n\
-\  --mac-app-category <category string>\n\
-\          String used to construct LSApplicationCategoryType in\n\
-\          application plist.  The default value is "utilities".\n\
-
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\n  --linux-deb-maintainer <email address>\n          .deb\u30D1\u30C3\u30B1\u30FC\u30B8\u306EMaintainer\n  --linux-menu-group <menu-group-name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u914D\u7F6E\u3055\u308C\u3066\u3044\u308B\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --linux-package-deps\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u6A5F\u80FD\n  --linux-rpm-license-type <type string>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u30BF\u30A4\u30D7(RPM .spec\u306E"License: <value>")\n\
-\  --linux-app-release <release value>\n\
-\          Release value of the RPM <name>.spec file or \n\
-\          Debian revision value of the DEB control file\n\
-\  --linux-app-category <category value>\n\
-\          Group value of the RPM <name>.spec file or \n\
-\          Section value of DEB control file\n\
-\  --linux-shortcut\n\
-\          Creates a shortcut for the application.\n\
-
+MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          dmg\u306B\u53C2\u7167\u3055\u308C\u305F\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u3059\u3079\u3066\u542B\u3081\u307E\u3059\u3002\n          \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u8907\u6570\u56DE\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 \n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          macOS\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E00\u610F\u306B\u8B58\u5225\u3059\u308BID\n          \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n          \u82F1\u6570\u5B57(A-Z\u3001a-z\u30010-9)\u3001\u30CF\u30A4\u30D5\u30F3(-)\u304A\u3088\u3073\u30D4\u30EA\u30AA\u30C9(.)\u6587\u5B57\u306E\u307F\n          \u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n  --mac-package-name <name string>\n          \u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u306B\u8868\u793A\u3055\u308C\u308B\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u540D\u524D\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3068\u306F\u7570\u306A\u308A\u307E\u3059\u3002\n          \u3053\u306E\u540D\u524D\u306F16\u6587\u5B57\u672A\u6E80\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30E1\u30CB\u30E5\u30FC\u30FB\u30D0\u30FC\u304A\u3088\u3073\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u60C5\u5831\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\n          \u8868\u793A\u3059\u308B\u306E\u306B\u9069\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u969B\u3001\n          \u65E2\u5B58\u306E\u30D1\u30C3\u30B1\u30FC\u30B8ID\u306E\u306A\u3044\u7F72\u540D\u304C\u5FC5\u8981\u306A\u3059\u3079\u3066\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u3001\n          \u3053\u306E\u5024\u304C\u63A5\u982D\u8F9E\u3068\u3057\u3066\u4ED8\u3051\u3089\u308C\u307E\u3059\u3002\n  --mac-sign\n          \u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u7F72\u540D\u3059\u308B\u3088\u3046\u30EA\u30AF\u30A8\u30B9\u30C8\u3057\u307E\u3059\n  --mac-signing-keychain <keychain name>\n          \u7F72\u540D\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u3092\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u306E\u540D\u524D\n          \u6307\u5B9A\u3057\u306A\u304B\u3063\u305F\u5834\u5408\u3001\u6A19\u6E96\u306E\u30AD\u30FC\u30C1\u30A7\u30FC\u30F3\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n  --mac-signing-key-user-name <team name>\n          Apple\u7F72\u540D\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u30C1\u30FC\u30E0\u307E\u305F\u306F\u30E6\u30FC\u30B6\u30FC\u540D\u90E8\u5206\u3002\n  --mac-app-store\n          jpackage\u51FA\u529B\u304CMac App Store\u7528\u3067\u3042\u308B\u3053\u3068\n          \u3092\u793A\u3057\u307E\u3059\u3002\n  --mac-entitlements <file path>\n          \u30D0\u30F3\u30C9\u30EB\u306E\u5B9F\u884C\u53EF\u80FD\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30E9\u30A4\u30D6\u30E9\u30EA\u306E\u7F72\u540D\u6642\u306B\n          \u4F7F\u7528\u3059\u308B\u6A29\u9650\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u3002\n  --mac-app-category <category string>\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306Eplist\u306ELSApplicationCategoryType\u3092\u751F\u6210\u3059\u308B\u969B\u306B\u4F7F\u7528\u3059\u308B\u6587\u5B57\u5217\u3002\n          \u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u306F"utilities"\u3067\u3059\u3002\n
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u540D\u524D\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\n  --linux-deb-maintainer <email address>\n          .deb\u30D1\u30C3\u30B1\u30FC\u30B8\u306EMaintainer\n  --linux-menu-group <menu-group-name>\n          \u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u914D\u7F6E\u3055\u308C\u3066\u3044\u308B\u30E1\u30CB\u30E5\u30FC\u30FB\u30B0\u30EB\u30FC\u30D7\n  --linux-package-deps\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u5FC5\u8981\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u6A5F\u80FD\n  --linux-rpm-license-type <type string>\n          \u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u30BF\u30A4\u30D7(RPM .spec\u306E"License: <value>")\n  --linux-app-release <release value>\n          RPM <name>.spec\u30D5\u30A1\u30A4\u30EB\u306E\u30EA\u30EA\u30FC\u30B9\u5024\u307E\u305F\u306F\n          DEB\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u30FB\u30D5\u30A1\u30A4\u30EB\u306EDebian\u30EA\u30D3\u30B8\u30E7\u30F3\u5024\u3002\n  --linux-app-category <category value>\n          RPM <name>.spec\u30D5\u30A1\u30A4\u30EB\u306E\u30B0\u30EB\u30FC\u30D7\u5024\u307E\u305F\u306F \n           DEB\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u5024\n  --linux-shortcut\n          \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\n
 MSG_Help_mac_linux_install_dir=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u7D76\u5BFE\u30D1\u30B9\n
 MSG_Help_default_install_dir=OS X\u307E\u305F\u306FLinux\u4E0A\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u7D76\u5BFE\u30D1\u30B9\u3002\n          "\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D5\u30A1\u30A4\u30EB"\u3084"AppData"\u306A\u3069\u3001Windows\u4E0A\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n          \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u5834\u6240\u306E\u76F8\u5BFE\u30B5\u30D6\u30D1\u30B9\u3002\n
 MSG_Help_no_args=\u4F7F\u7528\u65B9\u6CD5: jpackage <options>\n\u5229\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001jpackage --help (or -h)\u3092\u4F7F\u7528\u3057\u307E\u3059
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
index 73a3db560ed..c863bd5e6f4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,238 +24,17 @@
 #
 #
 
-MSG_Help=Usage: jpackage <options>\n\
-\n\
-Sample usages:\n\
---------------\n\
-\    Generate an application package suitable for the host system:\n\
-\        For a modular application:\n\
-\            jpackage -n name -p modulePath -m moduleName/className\n\
-\        For a non-modular application:\n\
-\            jpackage -i inputDir -n name \\\n\
-\                --main-class className --main-jar myJar.jar\n\
-\        From a pre-built application image:\n\
-\            jpackage -n name --app-image appImageDir\n\
-\    Generate an application image:\n\
-\        For a modular application:\n\
-\            jpackage --type app-image -n name -p modulePath \\\n\
-\                -m moduleName/className\n\
-\        For a non-modular application:\n\
-\            jpackage --type app-image -i inputDir -n name \\\n\
-\                --main-class className --main-jar myJar.jar\n\
-\        To provide your own options to jlink, run jlink separately:\n\
-\            jlink --output appRuntimeImage -p modulePath \\\n\
-\                --add-modules moduleName \\\n\
-\                --no-header-files [<additional jlink options>...]\n\
-\            jpackage --type app-image -n name \\\n\
-\                -m moduleName/className --runtime-image appRuntimeImage\n\
-\    Generate a Java runtime package:\n\
-\        jpackage -n name --runtime-image <runtime-image>\n\
-\n\
-Generic Options:\n\
-\  @<filename> \n\
-\          Read options and/or mode from a file \n\
-\          This option can be used multiple times.\n\
-\  --type -t <type> \n\
-\          The type of package to create\n\
-\          Valid values are: {1} \n\
-\          If this option is not specified a platform dependent\n\
-\          default type will be created.\n\
-\  --app-version <version>\n\
-\          Version of the application and/or package\n\
-\  --copyright <copyright string>\n\
-\          Copyright for the application\n\
-\  --description <description string>\n\
-\          Description of the application\n\
-\  --help -h \n\
-\          Print the usage text with a list and description of each valid\n\
-\          option for the current platform to the output stream, and exit\n\
-\  --icon <file path>\n\
-\          Path of the icon of the application package\n\
-\          (absolute path or relative to the current directory)\n\
-\  --name -n <name>\n\
-\          Name of the application and/or package\n\
-\  --dest -d <destination path>\n\
-\          Path where generated output file is placed\n\
-\          (absolute path or relative to the current directory)\n\
-\          Defaults to the current working directory.\n\
-\  --temp <directory path>\n\
-\          Path of a new or empty directory used to create temporary files\n\
-\          (absolute path or relative to the current directory)\n\
-\          If specified, the temp dir will not be removed upon the task\n\
-\          completion and must be removed manually.\n\
-\          If not specified, a temporary directory will be created and\n\
-\          removed upon the task completion.\n\
-\  --vendor <vendor string>\n\
-\          Vendor of the application\n\
-\  --verbose\n\
-\          Enables verbose output\n\
-\  --version\n\
-\          Print the product version to the output stream and exit.\n\
-\n\
-\Options for creating the runtime image:\n\
-\  --add-modules <module name>[,<module name>...]\n\
-\          A comma (",") separated list of modules to add\n\
-\          This module list, along with the main module (if specified)\n\
-\          will be passed to jlink as the --add-module argument.\n\
-\          If not specified, either just the main module (if --module is\n\
-\          specified), or the default set of modules (if --main-jar is \n\
-\          specified) are used.\n\
-\          This option can be used multiple times.\n\
-\  --module-path -p <module path>...\n\
-\          A {0} separated list of paths\n\
-\          Each path is either a directory of modules or the path to a\n\
-\          modular jar.\n\
-\          (Each path is absolute or relative to the current directory.)\n\
-\          This option can be used multiple times.\n\
-\  --jlink-options <jlink options> \n\
-\          A space separated list of options to pass to jlink \n\
-\          If not specified, defaults to "--strip-native-commands \n\
-\          --strip-debug --no-man-pages --no-header-files". \n\
-\          This option can be used multiple times.\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image that will be copied into\n\
-\          the application image\n\
-\          (absolute path or relative to the current directory)\n\
-\          If --runtime-image is not specified, jpackage will run jlink to\n\
-\          create the runtime image using options:\n\
-\          --strip-debug, --no-header-files, --no-man-pages, and\n\
-\          --strip-native-commands.\n\
-\n\
-\Options for creating the application image:\n\
-\  --input -i <directory path>\n\
-\          Path of the input directory that contains the files to be packaged\n\
-\          (absolute path or relative to the current directory)\n\
-\          All files in the input directory will be packaged into the\n\
-\          application image.\n\
-\  --app-content <additional content>[,<additional content>...]\n\
-\          A comma separated list of paths to files and/or directories\n\
-\          to add to the application payload.\n\
-\          This option can be used more than once.\n\
-\n\
-\Options for creating the application launcher(s):\n\
-\  --add-launcher <launcher name>=<file path>\n\
-\          Name of launcher, and a path to a Properties file that contains\n\
-\          a list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "module", "main-jar", "main-class", "description",\n\
-\          "arguments", "java-options", "app-version", "icon",\n\
-\          "win-console", "win-shortcut", "win-menu",\n\
-\          "linux-app-category", and "linux-shortcut" can be used.\n\
-\          These options are added to, or used to overwrite, the original\n\
-\          command line options to build an additional alternative launcher.\n\
-\          The main application launcher will be built from the command line\n\
-\          options. Additional alternative launchers can be built using\n\
-\          this option, and this option can be used multiple times to\n\
-\          build multiple additional launchers. \n\
-\  --arguments <main class arguments>\n\
-\          Command line arguments to pass to the main class if no command\n\
-\          line arguments are given to the launcher\n\
-\          This option can be used multiple times.\n\
-\  --java-options <java options>\n\
-\          Options to pass to the Java runtime\n\
-\          This option can be used multiple times.\n\
-\  --main-class <class name>\n\
-\          Qualified name of the application main class to execute\n\
-\          This option can only be used if --main-jar is specified.\n\
-\  --main-jar <main jar file>\n\
-\          The main JAR of the application; containing the main class\n\
-\          (specified as a path relative to the input path)\n\
-\          Either --module or --main-jar option can be specified but not\n\
-\          both.\n\
-\  --module -m <module name>[/<main class>]\n\
-\          The main module (and optionally main class) of the application\n\
-\          This module must be located on the module path.\n\
-\          When this option is specified, the main module will be linked\n\
-\          in the Java runtime image.  Either --module or --main-jar\n\
-\          option can be specified but not both.\n\
-{2}\n\
-\Options for creating the application package:\n\
-\  --about-url <url>\n\
-\          URL of the application''s home page\n\
-\  --app-image <directory path>\n\
-\          Location of the predefined application image that is used\n\
-\          to build an installable package\n\
-\          (absolute path or relative to the current directory)\n\
-\  --file-associations <file path>\n\
-\          Path to a Properties file that contains list of key, value pairs\n\
-\          (absolute path or relative to the current directory)\n\
-\          The keys "extension", "mime-type", "icon", and "description"\n\
-\          can be used to describe the association.\n\
-\          This option can be used multiple times.\n\
-\  --install-dir <directory path>\n\
-\          {4}\
-\  --license-file <file path>\n\
-\          Path to the license file\n\
-\          (absolute path or relative to the current directory)\n\
-\  --resource-dir <directory path>\n\
-\          Path to override jpackage resources\n\
-\          Icons, template files, and other resources of jpackage can be\n\
-\          over-ridden by adding replacement resources to this directory.\n\
-\          (absolute path or relative to the current directory)\n\
-\  --runtime-image <directory path>\n\
-\          Path of the predefined runtime image to install\n\
-\          (absolute path or relative to the current directory)\n\
-\          Option is required when creating a runtime package.\n\
-\n\
-\Platform dependent options for creating the application package:\n\
-{3}
-MSG_Help_win_launcher=\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n  --win-console\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u63A7\u5236\u53F0\u542F\u52A8\u7A0B\u5E8F\uFF0C\u5E94\u5F53\u4E3A\n          \u9700\u8981\u63A7\u5236\u53F0\u4EA4\u4E92\u7684\u5E94\u7528\u7A0B\u5E8F\u6307\u5B9A\n
-MSG_Help_win_install=\
-\  --win-dir-chooser\n\
-\          Adds a dialog to enable the user to choose a directory in which\n\
-\          the product is installed.\n\
-\  --win-help-url <url>\n\
-\          URL where user can obtain further information or technical support\n\
-\  --win-menu\n\
-\          Request to add a Start menu shortcut for this application\n\
-\  --win-menu-group <menu group name>\n\
-\          Start Menu group this application is placed in\n\
-\  --win-per-user-install\n\
-\          Request to perform an install on a per-user basis\n\
-\  --win-shortcut\n\
-\          Request to add desktop shortcut for this application\n\
-\  --win-shortcut-prompt\n\
-\          Adds a dialog to enable the user to choose if shortcuts\n\
-\          will be created by installer.\n\
-\  --win-update-url <url>\n\
-\          URL of available application update information\n\
-\  --win-upgrade-uuid <id string>\n\
-\          UUID associated with upgrades for this package\n\
+MSG_Help=\u7528\u6CD5\uFF1Ajpackage <options>\n\n\u793A\u4F8B\u7528\u6CD5:\n--------------\n    \u751F\u6210\u9002\u5408\u4E3B\u673A\u7CFB\u7EDF\u7684\u5E94\u7528\u7A0B\u5E8F\u5305\uFF1A\n        \u5BF9\u4E8E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage -n name -p modulePath -m moduleName/className\n        \u5BF9\u4E8E\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u4ECE\u9884\u6784\u5EFA\u7684\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\uFF1A\n            jpackage -n name --app-image appImageDir\n    \u751F\u6210\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\uFF1A\n        \u5BF9\u4E8E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage --type app-image -n name -p modulePath \\\n                -m moduleName/className\n        \u5BF9\u4E8E\u975E\u6A21\u5757\u5316\u5E94\u7528\u7A0B\u5E8F\uFF1A\n            jpackage --type app-image -i inputDir -n name \\\n                --main-class className --main-jar myJar.jar\n        \u8981\u4E3A jlink \u63D0\u4F9B\u60A8\u81EA\u5DF1\u7684\u9009\u9879\uFF0C\u8BF7\u5355\u72EC\u8FD0\u884C jlink\uFF1A\n            jlink --output appRuntimeImage -p modulePath \\\n                --add-modules moduleName \\\n                --no-header-files [<additional jlink options>...]\n            jpackage --type app-image -n name \\\n                -m moduleName/className --runtime-image appRuntimeImage\n    \u751F\u6210 Java \u8FD0\u884C\u65F6\u7A0B\u5E8F\u5305\uFF1A\n        jpackage -n name --runtime-image <runtime-image>\n\n\u4E00\u822C\u9009\u9879\uFF1A\n  @<filename> \n          \u4ECE\u6587\u4EF6\u8BFB\u53D6\u9009\u9879\u548C/\u6216\u6A21\u5F0F \n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --type -t <type> \n          \u8981\u521B\u5EFA\u7684\u7A0B\u5E8F\u5305\u7684\u7C7B\u578B\n          \u6709\u6548\u503C\u4E3A\uFF1A{1} \n          \u5982\u679C\u672A\u6307\u5B9A\u6B64\u9009\u9879\uFF0C\u5219\u5C06\u521B\u5EFA\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\n          \u9ED8\u8BA4\u7C7B\u578B\u3002\n  --app-version <version>\n          \u5E94\u7528\u7A0B\u5E8F\u548C/\u6216\u7A0B\u5E8F\u5305\u7684\u7248\u672C\n  --copyright <copyright string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u7248\u6743\n  --description <description string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u8BF4\u660E\n  --help -h \n          \u5C06\u7528\u6CD5\u6587\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\uFF0C\u7528\u6CD5\u6587\u672C\u4E2D\u5305\u542B\n          \u9002\u7528\u4E8E\u5F53\u524D\u5E73\u53F0\u7684\u6BCF\u4E2A\u6709\u6548\u9009\u9879\u7684\u5217\u8868\u548C\u8BF4\u660E\n  --icon <file path>\n          \u5E94\u7528\u7A0B\u5E8F\u5305\u56FE\u6807\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --name -n <name>\n          \u5E94\u7528\u7A0B\u5E8F\u548C/\u6216\u7A0B\u5E8F\u5305\u7684\u540D\u79F0\n  --dest -d <destination path>\n          \u7528\u6765\u653E\u7F6E\u6240\u751F\u6210\u7684\u8F93\u51FA\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u9ED8\u8BA4\u4E3A\u5F53\u524D\u7684\u5DE5\u4F5C\u76EE\u5F55\u3002\n  --temp <directory path>\n          \u7528\u6765\u521B\u5EFA\u4E34\u65F6\u6587\u4EF6\u7684\u65B0\u76EE\u5F55\u6216\u7A7A\u767D\u76EE\u5F55\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5982\u679C\u6307\u5B9A\uFF0C\u5219\u5728\u4EFB\u52A1\u5B8C\u6210\u65F6\u5C06\u4E0D\u5220\u9664\u4E34\u65F6\u76EE\u5F55\uFF0C\n          \u5FC5\u987B\u624B\u52A8\u5220\u9664\u4E34\u65F6\u76EE\u5F55\u3002\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u5C06\u521B\u5EFA\u4E00\u4E2A\u4E34\u65F6\u76EE\u5F55\uFF0C\n          \
+\u5E76\u5728\u4EFB\u52A1\u5B8C\u6210\u65F6\u5220\u9664\u8BE5\u4E34\u65F6\u76EE\u5F55\u3002\n  --vendor <vendor string>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4F9B\u5E94\u5546\n  --verbose\n          \u542F\u7528\u8BE6\u7EC6\u7684\u8F93\u51FA\n  --version\n          \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\u3002\n\n\u7528\u6765\u521B\u5EFA\u8FD0\u884C\u65F6\u6620\u50CF\u7684\u9009\u9879\uFF1A\n  --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n          \u8981\u6DFB\u52A0\u7684\u6A21\u5757\u7684\u9017\u53F7 (",") \u5206\u9694\u5217\u8868\n          \u6B64\u6A21\u5757\u5217\u8868\u8FDE\u540C\u4E3B\u6A21\u5757\uFF08\u5982\u679C\u6307\u5B9A\uFF09\n          \u5C06\u4F5C\u4E3A --add-module \u53C2\u6570\u4F20\u9012\u5230 jlink\u3002\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u4EC5\u4F7F\u7528\u4E3B\u6A21\u5757\uFF08\u5982\u679C\u6307\u5B9A\u4E86 --module\uFF09\uFF0C\n          \u6216\u8005\u4F7F\u7528\u9ED8\u8BA4\u7684\u6A21\u5757\u96C6\uFF08\u5982\u679C\u6307\u5B9A\u4E86  \n          --main-jar\uFF09\u3002\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --module-path -p <module path>...\n          \u8DEF\u5F84\u7684 {0} \u5206\u9694\u5217\u8868\n          \u6BCF\u4E2A\u8DEF\u5F84\u8981\u4E48\u662F\u6A21\u5757\u7684\u76EE\u5F55\uFF0C\u8981\u4E48\u662F\n          \u6A21\u5757 jar \u7684\u8DEF\u5F84\u3002\n          \uFF08\u6BCF\u4E2A\u8DEF\u5F84\u53EF\u4EE5\u662F\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u4E5F\u53EF\u4EE5\u662F\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\u3002\uFF09\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --jlink-options <jlink \u9009\u9879> \n          \u8981\u4F20\u9012\u7ED9 jlink \u7684\u9009\u9879\u5217\u8868\uFF08\u7528\u7A7A\u683C\u5206\u9694\uFF09 \n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u9ED8\u8BA4\u4E3A "--strip-native-commands \n          --strip-debug --no-man-pages --no-header-files"\u3002 \n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --runtime-image <directory path>\n          \u5C06\u590D\u5236\u5230\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u9884\u5B9A\u4E49\n          \u8FD0\u884C\u65F6\u6620\u50CF\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5982\u679C\u672A\u6307\u5B9A --runtime-image\uFF0Cjpackage \u5C06\u8FD0\u884C jlink \u4EE5\n          \u4F7F\u7528\u5982\u4E0B\u9009\u9879\u521B\u5EFA\u8FD0\u884C\u65F6\u6620\u50CF\uFF1A\n          --strip-debug\u3001--no-header-files\u3001--no-man-pages \u548C \n          --strip-native-commands\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u9009\u9879\uFF1A\n  --input -i <directory path>\n          \u5305\u542B\u8981\u6253\u5305\u7684\u6587\u4EF6\u7684\u8F93\u5165\u76EE\u5F55\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u8F93\u5165\u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5C06\u6253\u5305\u5230\n          \u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E2D\u3002\n  --app-content <additional content>[,<additional content>...]\n          \u8981\u6DFB\u52A0\u5230\u5E94\u7528\u7A0B\u5E8F\u6709\u6548\u8D1F\u8F7D\u4E2D\u7684\u6587\u4EF6\u548C/\u6216\n          \u76EE\u5F55\u7684\u9017\u53F7\u5206\u9694\u8DEF\u5F84\u5217\u8868\u3002\n          \u6B64\u9009\u9879\u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u9009\u9879\uFF1A\n  --add-launcher <launcher name>=<file path>\n          \u542F\u52A8\u7A0B\u5E8F\u7684\u540D\u79F0\u548C\u5305\u542B\u5173\u952E\u5B57-\u503C\u5BF9\u5217\u8868\u7684\n          \u5C5E\u6027\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \
+\u53EF\u4EE5\u4F7F\u7528\u5173\u952E\u5B57 "module"\u3001"main-jar"\u3001"main-class"\u3001\n          "arguments"\u3001"java-options"\u3001"app-version"\u3001"icon"\u3001\n          "win-console"\u3001"win-shortcut"\u3001"win-menu"\u3001\n          "linux-app-category" \u548C "linux-shortcut"\u3002\n          \u8FD9\u4E9B\u9009\u9879\u5C06\u6DFB\u52A0\u5230\u539F\u59CB\u547D\u4EE4\u884C\u9009\u9879\u4E2D\u6216\u8005\u7528\u6765\u8986\u76D6\n          \u539F\u59CB\u547D\u4EE4\u884C\u9009\u9879\uFF0C\u4EE5\u6784\u5EFA\u989D\u5916\u7684\u66FF\u4EE3\u542F\u52A8\u7A0B\u5E8F\u3002\n          \u5C06\u4ECE\u547D\u4EE4\u884C\u9009\u9879\u6784\u5EFA\u4E3B\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u3002\n          \u53EF\u4EE5\u4F7F\u7528\u6B64\u9009\u9879\u6784\u5EFA\u989D\u5916\u7684\u66FF\u4EE3\u542F\u52A8\u7A0B\u5E8F\uFF0C\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u6765\u6784\u5EFA\n          \u591A\u4E2A\u989D\u5916\u7684\u542F\u52A8\u7A0B\u5E8F\u3002 \n  --arguments <main class arguments>\n          \u5728\u6CA1\u6709\u4E3A\u542F\u52A8\u7A0B\u5E8F\u63D0\u4F9B\u547D\u4EE4\u884C\u53C2\u6570\u65F6\uFF0C\n          \u8981\u4F20\u9012\u5230\u4E3B\u7C7B\u7684\u547D\u4EE4\u884C\u53C2\u6570\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --java-options <java options>\n          \u8981\u4F20\u9012\u5230 Java \u8FD0\u884C\u65F6\u7684\u9009\u9879\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --main-class <class name>\n          \u8981\u6267\u884C\u7684\u5E94\u7528\u7A0B\u5E8F\u4E3B\u7C7B\u7684\u9650\u5B9A\u540D\u79F0\n          \u53EA\u6709\u5728\u6307\u5B9A\u4E86 --main-jar \u65F6\u624D\u80FD\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --main-jar <main jar file>\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B JAR\uFF1B\u5305\u542B\u4E3B\u7C7B\n          \uFF08\u6307\u5B9A\u4E3A\u76F8\u5BF9\u4E8E\u8F93\u5165\u8DEF\u5F84\u7684\u8DEF\u5F84\uFF09\n          \u53EF\u4EE5\u6307\u5B9A --module \u6216 --main-jar \u9009\u9879\uFF0C\u4F46\u662F\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A\n          \u4E24\u8005\u3002\n  --module -m <module name>[/<main class>]\n          \u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u6A21\u5757\uFF08\u4EE5\u53CA\u53EF\u9009\u7684\u4E3B\u7C7B\uFF09\n          \u6B64\u6A21\u5757\u5FC5\u987B\u4F4D\u4E8E\u6A21\u5757\u8DEF\u5F84\u4E2D\u3002\n          \u5982\u679C\u6307\u5B9A\u4E86\u6B64\u9009\u9879\uFF0C\u5219\u5C06\u5728 Java \u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\n          \u94FE\u63A5\u4E3B\u6A21\u5757\u3002\u53EF\u4EE5\u6307\u5B9A --module \u6216 --main-jar \u9009\u9879\uFF0C\n          \u4F46\u662F\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A\u8FD9\u4E24\u4E2A\u9009\u9879\u3002\n{2}\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305\u7684\u9009\u9879\uFF1A\n  --about-url <url>\n          \u5E94\u7528\u7A0B\u5E8F\u4E3B\u9875\u7684 URL\n  --app-image <directory path>\n          \u7528\u6765\u6784\u5EFA\u53EF\u5B89\u88C5\u7A0B\u5E8F\u5305\u7684\n          \u9884\u5B9A\u4E49\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u7684\u4F4D\u7F6E\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --file-associations <file path>\n          \u5305\u542B\u5173\u952E\u5B57-\u503C\u5BF9\u5217\u8868\u7684\u5C5E\u6027\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u53EF\u4EE5\u4F7F\u7528\u5173\u952E\u5B57 "extension"\u3001"mime-type"\u3001"icon" \u548C "description" \n          \u6765\u63CF\u8FF0\u6B64\u5173\u8054\u3002\n          \u53EF\u4EE5\u591A\u6B21\u4F7F\u7528\u6B64\u9009\u9879\u3002\n  --install-dir <directory path>\n          {4}  --license-file <file path>\n          \u8BB8\u53EF\u8BC1\u6587\u4EF6\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --resource-dir <directory path>\n          \u8986\u76D6 jpackage \
+\u8D44\u6E90\u7684\u8DEF\u5F84\n          \u53EF\u4EE5\u901A\u8FC7\u5411\u8BE5\u76EE\u5F55\u4E2D\u6DFB\u52A0\u66FF\u4EE3\u8D44\u6E90\u6765\u8986\u76D6 jpackage \u7684\n          \u56FE\u6807\u3001\u6A21\u677F\u6587\u4EF6\u548C\u5176\u4ED6\u8D44\u6E90\u3002\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n  --runtime-image <directory path>\n          \u8981\u5B89\u88C5\u7684\u9884\u5B9A\u4E49\u8FD0\u884C\u65F6\u6620\u50CF\u7684\u8DEF\u5F84\n          \uFF08\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u4E8E\u5F53\u524D\u76EE\u5F55\u7684\u8DEF\u5F84\uFF09\n          \u5728\u521B\u5EFA\u8FD0\u884C\u65F6\u7A0B\u5E8F\u5305\u65F6\u9700\u8981\u4F7F\u7528\u9009\u9879\u3002\n\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n{3}
 
+MSG_Help_win_launcher=\n\u7528\u6765\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u542F\u52A8\u7A0B\u5E8F\u7684\u4E0E\u5E73\u53F0\u76F8\u5173\u7684\u9009\u9879\uFF1A\n  --win-console\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u63A7\u5236\u53F0\u542F\u52A8\u7A0B\u5E8F\uFF0C\u5E94\u5F53\u4E3A\n          \u9700\u8981\u63A7\u5236\u53F0\u4EA4\u4E92\u7684\u5E94\u7528\u7A0B\u5E8F\u6307\u5B9A\n
+MSG_Help_win_install=\  --win-dir-chooser\n          \u6DFB\u52A0\u4E00\u4E2A\u5BF9\u8BDD\u6846\u4EE5\u5141\u8BB8\u7528\u6237\u9009\u62E9\n          \u4EA7\u54C1\u7684\u5B89\u88C5\u76EE\u5F55\u3002\n  --win-help-url <url>\n          \u7528\u6237\u53EF\u4EE5\u4ECE\u4E2D\u83B7\u53D6\u66F4\u591A\u4FE1\u606F\u6216\u6280\u672F\u652F\u6301\u7684 URL\n  --win-menu\n          \u8BF7\u6C42\u4E3A\u6B64\u5E94\u7528\u7A0B\u5E8F\u6DFB\u52A0\u5F00\u59CB\u83DC\u5355\u5FEB\u6377\u65B9\u5F0F\n  --win-menu-group <menu group name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u5F00\u59CB\u83DC\u5355\u7EC4\n  --win-per-user-install\n          \u8BF7\u6C42\u57FA\u4E8E\u6BCF\u4E2A\u7528\u6237\u6267\u884C\u5B89\u88C5\n  --win-shortcut\n          \u8BF7\u6C42\u4E3A\u6B64\u5E94\u7528\u7A0B\u5E8F\u6DFB\u52A0\u684C\u9762\u5FEB\u6377\u65B9\u5F0F\n  --win-shortcut-prompt\n          \u6DFB\u52A0\u4E00\u4E2A\u5BF9\u8BDD\u6846\u4EE5\u5141\u8BB8\u7528\u6237\u9009\u62E9\u662F\u5426\u5C06\u7531\u5B89\u88C5\u7A0B\u5E8F\n          \u521B\u5EFA\u5FEB\u6377\u65B9\u5F0F\u3002\n  --win-update-url <url>\n          \u53EF\u7528\u5E94\u7528\u7A0B\u5E8F\u66F4\u65B0\u4FE1\u606F\u7684 URL\n  --win-upgrade-uuid <id string>\n          \u4E0E\u6B64\u7A0B\u5E8F\u5305\u7684\u5347\u7EA7\u76F8\u5173\u8054\u7684 UUID\n
 MSG_Help_win_install_dir=\u9ED8\u8BA4\u5B89\u88C5\u4F4D\u7F6E\u4E0B\u9762\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\n
-
-MSG_Help_mac_install=\
-\  --mac-dmg-content <additional content path>[,<additional content path>...]\n\
-\          Include all the referenced content in the dmg.\n\
-\          This option can be used multiple times. \n\
-
-MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          \u7528\u6765\u552F\u4E00\u5730\u6807\u8BC6 macOS \u5E94\u7528\u7A0B\u5E8F\u7684\u6807\u8BC6\u7B26\n          \u9ED8\u8BA4\u4E3A\u4E3B\u7C7B\u540D\u79F0\u3002\n          \u53EA\u80FD\u4F7F\u7528\u5B57\u6BCD\u6570\u5B57\uFF08A-Z\u3001a-z\u30010-9\uFF09\u3001\u8FDE\u5B57\u7B26 (-) \u548C\n          \u53E5\u70B9 (.) \u5B57\u7B26\u3002\n  --mac-package-name <name string>\n          \u51FA\u73B0\u5728\u83DC\u5355\u680F\u4E2D\u7684\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n          \u8FD9\u53EF\u4EE5\u4E0E\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u4E0D\u540C\u3002\n          \u6B64\u540D\u79F0\u7684\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E 16 \u4E2A\u5B57\u7B26\uFF0C\u9002\u5408\n          \u663E\u793A\u5728\u83DC\u5355\u680F\u4E2D\u548C\u5E94\u7528\u7A0B\u5E8F\u201C\u4FE1\u606F\u201D\u7A97\u53E3\u4E2D\u3002\n          \u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u5728\u5BF9\u5E94\u7528\u7A0B\u5E8F\u5305\u7B7E\u540D\u65F6\uFF0C\u4F1A\u5728\u6240\u6709\u9700\u8981\u7B7E\u540D\n          \u4F46\u5F53\u524D\u6CA1\u6709\u7A0B\u5E8F\u5305\u6807\u8BC6\u7B26\u7684\u7EC4\u4EF6\u7684\n          \u524D\u9762\u52A0\u4E0A\u6B64\u503C\u3002\n  --mac-sign\n          \u8BF7\u6C42\u5BF9\u7A0B\u5E8F\u5305\u8FDB\u884C\u7B7E\u540D\n\
-\  --mac-signing-keychain <keychain name>\n\
-\          Name of the keychain to search for the signing identity\n\
-\          If not specified, the standard keychains are used.\n\
-\  --mac-signing-key-user-name <team name>\n\
-\          Team or user name portion of Apple signing identities.\n\
-\  --mac-app-store\n\
-\          Indicates that the jpackage output is intended for the\n\
-\          Mac App Store.\n\
-\  --mac-entitlements <file path>\n\
-\          Path to file containing entitlements to use when signing\n\
-\          executables and libraries in the bundle.\n\
-\  --mac-app-category <category string>\n\
-\          String used to construct LSApplicationCategoryType in\n\
-\          application plist.  The default value is "utilities".\n\
-
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux \u7A0B\u5E8F\u5305\u7684\u540D\u79F0\uFF0C\u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n  --linux-deb-maintainer <email address>\n          .deb \u7A0B\u5E8F\u5305\u7684\u7EF4\u62A4\u7A0B\u5E8F\n  --linux-menu-group <menu-group-name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u83DC\u5355\u7EC4\n  --linux-package-deps\n          \u5E94\u7528\u7A0B\u5E8F\u6240\u9700\u7684\u7A0B\u5E8F\u5305\u6216\u529F\u80FD\n  --linux-rpm-license-type <type string>\n          \u8BB8\u53EF\u8BC1\u7684\u7C7B\u578B\uFF08RPM .spec \u7684 "License: <value>"\uFF09\n\
-\  --linux-app-release <release value>\n\
-\          Release value of the RPM <name>.spec file or \n\
-\          Debian revision value of the DEB control file\n\
-\  --linux-app-category <category value>\n\
-\          Group value of the RPM <name>.spec file or \n\
-\          Section value of DEB control file\n\
-\  --linux-shortcut\n\
-\          Creates a shortcut for the application.\n\
-
+MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          \u5305\u62EC DMG \u4E2D\u5F15\u7528\u7684\u6240\u6709\u5185\u5BB9\u3002\n          \u6B64\u9009\u9879\u53EF\u4EE5\u4F7F\u7528\u591A\u6B21\u3002\n
+MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          \u7528\u6765\u552F\u4E00\u5730\u6807\u8BC6 macOS \u5E94\u7528\u7A0B\u5E8F\u7684\u6807\u8BC6\u7B26\n          \u9ED8\u8BA4\u4E3A\u4E3B\u7C7B\u540D\u79F0\u3002\n          \u53EA\u80FD\u4F7F\u7528\u5B57\u6BCD\u6570\u5B57 (A-Z,a-z,0-9)\u3001\u8FDE\u5B57\u7B26 (-) \u548C\n          \u53E5\u70B9 (.) \u5B57\u7B26\u3002\n  --mac-package-name <name string>\n          \u51FA\u73B0\u5728\u83DC\u5355\u680F\u4E2D\u7684\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n          \u8FD9\u53EF\u4EE5\u4E0E\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u4E0D\u540C\u3002\n          \u6B64\u540D\u79F0\u7684\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E 16 \u4E2A\u5B57\u7B26\uFF0C\u9002\u5408\n          \u663E\u793A\u5728\u83DC\u5355\u680F\u4E2D\u548C\u5E94\u7528\u7A0B\u5E8F\u201C\u4FE1\u606F\u201D\u7A97\u53E3\u4E2D\u3002\n          \u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\u3002\n  --mac-package-signing-prefix <prefix string>\n          \u5728\u5BF9\u5E94\u7528\u7A0B\u5E8F\u5305\u7B7E\u540D\u65F6\uFF0C\u4F1A\u5728\u6240\u6709\u9700\u8981\u7B7E\u540D\n          \u4F46\u5F53\u524D\u6CA1\u6709\u7A0B\u5E8F\u5305\u6807\u8BC6\u7B26\u7684\u7EC4\u4EF6\u7684\n          \u524D\u9762\u52A0\u4E0A\u6B64\u503C\u3002\n  --mac-sign\n          \u8BF7\u6C42\u5BF9\u7A0B\u5E8F\u5305\u8FDB\u884C\u7B7E\u540D\n  --mac-signing-keychain <keychain name>\n          \u8981\u7528\u6765\u641C\u7D22\u7B7E\u540D\u8EAB\u4EFD\u7684\u5BC6\u94A5\u94FE\u7684\u540D\u79F0\n          \u5982\u679C\u672A\u6307\u5B9A\uFF0C\u5219\u4F7F\u7528\u6807\u51C6\u7684\u5BC6\u94A5\u94FE\u3002\n  --mac-signing-key-user-name <team name>\n          Apple \u7B7E\u540D\u8EAB\u4EFD\u7684\u56E2\u961F\u6216\u7528\u6237\u540D\u79F0\u90E8\u5206\u3002\n  --mac-app-store\n          \u6307\u793A jpackage \u8F93\u51FA\u9762\u5411 \n          Mac App Store\u3002\n  --mac-entitlements <file path>\n          \u5305\u542B\u4E00\u4E9B\u6743\u5229\u7684\u6587\u4EF6\u7684\u8DEF\u5F84\uFF0C\u5728\u5BF9\u6346\u7ED1\u5305\u4E2D\u7684\u53EF\u6267\u884C\u6587\u4EF6\n          \u548C\u5E93\u8FDB\u884C\u7B7E\u540D\u65F6\u4F1A\u4F7F\u7528\u8FD9\u4E9B\u6743\u5229\u3002\n  --mac-app-category <category string>\n          \u7528\u4E8E\u6784\u9020\u5E94\u7528\u7A0B\u5E8F plist \u4E2D LSApplicationCategoryType \u7684\n          \u5B57\u7B26\u4E32\u3002\u9ED8\u8BA4\u503C\u4E3A "utilities"\u3002\n
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux \u7A0B\u5E8F\u5305\u7684\u540D\u79F0\uFF0C\u9ED8\u8BA4\u4E3A\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n  --linux-deb-maintainer <email address>\n          .deb \u7A0B\u5E8F\u5305\u7684\u7EF4\u62A4\u7A0B\u5E8F\n  --linux-menu-group <menu-group-name>\n          \u6B64\u5E94\u7528\u7A0B\u5E8F\u6240\u5728\u7684\u83DC\u5355\u7EC4\n  --linux-package-deps\n          \u5E94\u7528\u7A0B\u5E8F\u6240\u9700\u7684\u7A0B\u5E8F\u5305\u6216\u529F\u80FD\n  --linux-rpm-license-type <type string>\n          \u8BB8\u53EF\u8BC1\u7684\u7C7B\u578B\uFF08RPM .spec \u7684 "License: <value>"\uFF09\n  --linux-app-release <release value>\n          RPM <name>.spec \u6587\u4EF6\u7684\u53D1\u884C\u7248\u503C\u6216 \n          DEB \u63A7\u5236\u6587\u4EF6\u7684 Debian \u4FEE\u8BA2\u7248\u503C\n  --linux-app-category <category value>\n          RPM <name>.spec \u6587\u4EF6\u7684\u7EC4\u503C\u6216 \n          DEB \u63A7\u5236\u6587\u4EF6\u7684\u8282\u503C\n  --linux-shortcut\n          \u4E3A\u5E94\u7528\u7A0B\u5E8F\u521B\u5EFA\u5FEB\u6377\u65B9\u5F0F\u3002\n
 MSG_Help_mac_linux_install_dir=\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u76EE\u5F55\u7684\u7EDD\u5BF9\u8DEF\u5F84\n
 MSG_Help_default_install_dir=OS X \u6216 Linux \u4E0A\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u76EE\u5F55\u7684\u7EDD\u5BF9\u8DEF\u5F84\u3002\n          Windows \u4E0A\u5E94\u7528\u7A0B\u5E8F\u5B89\u88C5\u4F4D\u7F6E\u7684\u76F8\u5BF9\u5B50\u8DEF\u5F84\n          \uFF08\u5982 "Program Files" \u6216 "AppData"\uFF09\u3002\n
 MSG_Help_no_args=\u7528\u6CD5\uFF1Ajpackage <options>\n\u4F7F\u7528 jpackage --help\uFF08\u6216 -h\uFF09\u53EF\u83B7\u53D6\u53EF\u80FD\u9009\u9879\u7684\u5217\u8868
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
new file mode 100644
index 00000000000..72245cc578a
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_de.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+param.copyright.default=Copyright (C) {0,date,YYYY}
+param.description.default=Kein Wert
+param.vendor.default=Unbekannt
+
+message.using-default-resource=Standardpackageressource {0} {1} wird verwendet (durch Hinzuf\u00FCgen von {2} zu resource-dir ist eine Anpassung m\u00F6glich).
+message.no-default-resource=Keine Standardpackageressource {0} {1} (durch Hinzuf\u00FCgen von {2} zu resource-dir ist eine Anpassung m\u00F6glich).
+message.using-custom-resource-from-file=Benutzerdefinierte Packageressource {0} wird verwendet (aus Datei {1} geladen).
+message.using-custom-resource=Benutzerdefinierte Packageressource {0} wird verwendet (aus {1} geladen).
+message.creating-app-bundle=Anwendungspackage {0} wird in {1} erstellt
+message.app-image-dir-does-not-exist=Angegebenes Anwendungsimageverzeichnis {0}: {1} ist nicht vorhanden
+message.app-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist
+message.runtime-image-dir-does-not-exist=Angegebenes Laufzeitimageverzeichnis {0}: {1} ist nicht vorhanden
+message.runtime-image-dir-does-not-exist.advice=Best\u00E4tigen Sie, dass der Wert f\u00FCr {0} vorhanden ist
+message.resource-dir-does-not-exist=Angegebenes Ressourcenverzeichnis {0}: {1} ist nicht vorhanden
+message.debug-working-directory=Arbeitsverzeichnis f\u00FCr Debug beibehalten: {0}
+message.bundle-created={0}-Package wurde erfolgreich erstellt
+message.module-version=Version "{0}" aus Modul "{1}" wird als Anwendungsversion verwendet
+message.module-class=Klasse "{0}" aus Modul "{1}" wird als Anwendungshauptklasse verwendet
+
+error.version-string-empty="Version darf keine leere Zeichenfolge sein"
+error.version-string-zero-length-component="Version [{0}] enth\u00E4lt eine Komponente mit einer Nulll\u00E4nge"
+error.version-string-invalid-component="Version [{0}] enth\u00E4lt ung\u00FCltige Komponente [{1}]"
+
+error.cannot-create-output-dir=Zielverzeichnis {0} kann nicht erstellt werden
+error.cannot-write-to-output-dir=Zielverzeichnis {0} ist schreibgesch\u00FCtzt
+error.root-exists=Fehler: Anwendungszielverzeichnis {0} ist bereits vorhanden
+error.no-main-class-with-main-jar=Es wurde keine Hauptklasse angegeben oder in der JAR-Datei {0} gefunden
+error.no-main-class-with-main-jar.advice=Geben Sie eine Hauptklasse an, oder stellen Sie sicher, dass die JAR-Datei {0} eine Hauptklasse im Manifest angibt
+error.no-main-class=Es wurde keine Hauptklasse angegeben oder in den angegebenen Anwendungsressourcen gefunden
+error.no-main-class.advice=Geben Sie eine Anwendungsklasse an, oder stellen Sie sicher, dass die appResources eine JAR-Datei mit einer Anwendungsklasse im Manifest enthalten
+error.main-jar-does-not-exist=Die konfigurierte Haupt-JAR-Datei ist im Eingabeverzeichnis nicht vorhanden {0}
+error.main-jar-does-not-exist.advice=Die Haupt-JAR-Datei muss relativ zum Eingabeverzeichnis (nicht als absoluter Pfad) angegeben werden und muss in diesem Verzeichnis vorhanden sein
+error.no-module-in-path="{0}-Modul im Modulpfad nicht gefunden"
+error.not-path-parameter="Ung\u00FCltiger Wert f\u00FCr Parameter {0}: {1}"
+error.no-input-parameter="--input-Parameter f\u00FCr nicht modulare Anwendung fehlt"
+error.no-main-jar-parameter="--main-jar-Parameter f\u00FCr nicht modulare Anwendung fehlt"
+
+error.no-content-types-for-file-association=F\u00FCr Dateiverkn\u00FCpfungsnummer {0} wurden keine MIME-Typen angegeben
+error.no-content-types-for-file-association.advice=Geben Sie einen MIME-Typ f\u00FCr Dateiverkn\u00FCpfungsnummer {0} an
+error.too-many-content-types-for-file-association=F\u00FCr Dateiverkn\u00FCpfungsnummer {0} wurde mehr als ein MIME-Typ angegeben
+error.too-many-content-types-for-file-association.advice=Geben Sie nur einen MIME-Typ f\u00FCr Dateiverkn\u00FCpfungsnummer {0} an
+
+error.tool-not-found={0} kann nicht gefunden werden. Grund: {1}
+error.tool-not-found.advice=Installieren Sie {0}
+error.tool-old-version={0} {1} oder eine neuere Version kann nicht gefunden werden
+error.tool-old-version.advice=Installieren Sie {0} {1} oder eine neuere Version
+error.jlink.failed=jlink nicht erfolgreich mit: {0}
+error.blocked.option=jlink-Option [{0}] ist in --jlink-options nicht zul\u00E4ssig
+error.no.name=Name nicht mit --name angegeben. Es kann auch kein Name aus app-image abgeleitet werden
+
+warning.no.jdk.modules.found=Warnung: Keine JDK-Module gefunden
+warning.foreign-app-image=Warnung: app-image-Verzeichnis ({0}) wurde von jpackage nicht generiert.
+warning.invalid-app-image=Warnung: .jpackage.xml kann in app-image-Verzeichnis ({0}) nicht geparst werden
+
+MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
+MSG_BundlerConfigException=Bundler {0} aufgrund eines Konfigurationsproblems \u00FCbersprungen: {1} \nEmpfehlung zur Behebung: {2}
+MSG_BundlerConfigExceptionNoAdvice=Bundler {0} aufgrund eines Konfigurationsproblems \u00FCbersprungen: {1}
+MSG_BundlerRuntimeException=Bundler {0} nicht erfolgreich. Grund: {1}
+MSG_BundlerFailed=Fehler: Bundler "{1}" ({0}) konnte kein Package generieren
+
+ERR_NoMainClass=Fehler: Hauptanwendungsklasse fehlt
+ERR_UnsupportedOption=Fehler: Option [{0}] ist auf dieser Plattform ung\u00FCltig
+ERR_InvalidTypeOption=Fehler: Option [{0}] ist nicht g\u00FCltig mit Typ [{1}]
+ERR_NoInstallerEntryPoint=Fehler: Option [{0}] ist nicht g\u00FCltig ohne Einstiegspunktoption --module oder --main-jar
+ERR_MutuallyExclusiveOptions="Fehler: Optionen [{0}] und [{1}] schlie\u00DFen sich gegenseitig aus
+
+ERR_MissingArgument=Fehler: Fehlendes Argument: {0}
+ERR_MissingAppResources=Fehler: Keine Anwendungs-JAR-Dateien gefunden
+ERR_AppImageNotExist=Fehler: Anwendungsimageverzeichnis "{0}" ist nicht vorhanden
+ERR_NoAddLauncherName=Fehler: F\u00FCr Option --add-launcher m\u00FCssen ein Name und ein Dateipfad angegeben werden (--add-launcher <Name>=<Dateipfad>)
+ERR_NoUniqueName=Fehler: F\u00FCr --add-launcher <Name>=<Dateipfad> ist ein eindeutiger Name erforderlich
+ERR_NoJreInstallerName=Fehler: F\u00FCr JRE-Installationsprogramme ist ein Namensparameter erforderlich
+ERR_InvalidAppName=Fehler: Ung\u00FCltiger Anwendungsname: {0}
+ERR_InvalidSLName=Fehler: Ung\u00FCltiger Name f\u00FCr hinzuzuf\u00FCgenden Launcher: {0}
+ERR_IconFileNotExit=Fehler: Die angegebene Symboldatei [{0}] ist nicht vorhanden
+ERR_LicenseFileNotExit=Fehler: Die angegebene Lizenzdatei ist nicht vorhanden
+ERR_BuildRootInvalid=Fehler: Das tempor\u00E4re Verzeichnis ({0}) darf nicht vorhanden oder muss leer sein
+ERR_InvalidOption=Fehler: Ung\u00FCltige Option: [{0}]
+ERR_InvalidInstallerType=Fehler: Ung\u00FCltiger oder nicht unterst\u00FCtzter Typ: [{0}]
+ERR_BothMainJarAndModule=Fehler: Die Optionen --main-jar und --module d\u00FCrfen nicht beide vorhanden sein
+ERR_NoEntryPoint=Fehler: F\u00FCr das Erstellen des Anwendungsimages muss entweder die Option --main-jar oder die Option --module angegeben werden
+ERR_InputNotDirectory=Fehler: Das angegebene Eingabeverzeichnis ist kein Verzeichnis: {0}
+ERR_CannotReadInputDir=Fehler: Keine Berechtigung zum Lesen aus Eingabeverzeichnis vorhanden: {0}
+ERR_CannotParseOptions=Fehler: Option @filename wird verarbeitet: {0}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
index dfd3721613b..3224699b000 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
index 16768d37ef5..e4cfb62da04 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
new file mode 100644
index 00000000000..cfc86152834
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_de.wxl
@@ -0,0 +1,15 @@
+<?xml version = '1.0' encoding = 'utf-8'?>
+<WixLocalization Culture="de" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="1252">
+  <String Id="message.install.dir.exist">Der Ordner [INSTALLDIR] ist bereits vorhanden. Möchten Sie diesen Ordner trotzdem installieren?</String>
+  <String Id="MainFeatureTitle">Hauptfeature</String>
+  <String Id="DowngradeErrorMessage">Eine höhere Version von [ProductName] ist bereits installiert. Downgrades sind deaktiviert. Setup wird jetzt beendet.</String>
+  <String Id="DisallowUpgradeErrorMessage">Eine niedrigere Version von [ProductName] ist bereits installiert. Upgrades sind deaktiviert. Setup wird jetzt beendet.</String>
+
+  <String Id="ShortcutPromptDlg_Title">[ProductName]-Setup</String>
+  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}-Verknüpfungen</String>
+  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutPromptDlgDescription">Wählen Sie die zu erstellenden Verknüpfungen aus.</String>
+  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Desktopverknüpfung(en) erstellen</String>
+  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Startmenüverknüpfung(en) erstellen</String>
+  <String Id="InstallDirNotEmptyDlg_Title">[ProductName]-Setup</String>
+</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
index a8403e5ba48..9e7e5cfd03e 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="ja-JP" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="932">
-  <String Id="message.install.dir.exist">フォルダ[INSTALLDIR]はすでに存在します。そのフォルダにインストールしますか?</String>
-  <String Id="MainFeatureTitle">主な機能</String>
-  <String Id="DowngradeErrorMessage">[ProductName]のより上位のバージョンがすでにインストールされています。ダウングレードは無効です。セットアップを終了します。</String>
-  <String Id="DisallowUpgradeErrorMessage">[ProductName]のより下位のバージョンがすでにインストールされています。アップグレードは無効です。セットアップを終了します。</String>
-
-  <String Id="ShortcutPromptDlg_Title">[ProductName] Setup</String>
-  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}Shortcuts</String>
-  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
-  <String Id="ShortcutPromptDlgDescription">Select shortcuts to create.</String>
-  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Create desktop shortcut(s)</String>
-  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Create start menu shortcut(s)</String>
-  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] Setup</String>  
-</WixLocalization>
+<?xml version = '1.0' encoding = 'utf-8'?>
+<WixLocalization Culture="ja" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="932">
+  <String Id="message.install.dir.exist">フォルダ[INSTALLDIR]はすでに存在します。そのフォルダにインストールしますか?</String>
+  <String Id="MainFeatureTitle">主な機能</String>
+  <String Id="DowngradeErrorMessage">[ProductName]のより上位のバージョンがすでにインストールされています。ダウングレードは無効です。セットアップを終了します。</String>
+  <String Id="DisallowUpgradeErrorMessage">[ProductName]のより下位のバージョンがすでにインストールされています。アップグレードは無効です。セットアップを終了します。</String>
+
+  <String Id="ShortcutPromptDlg_Title">[ProductName]セットアップ</String>
+  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}ショートカット</String>
+  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutPromptDlgDescription">作成するショートカットを選択します。</String>
+  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">デスクトップ・ショートカットの作成</String>
+  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">スタート・メニューのショートカットの作成</String>
+  <String Id="InstallDirNotEmptyDlg_Title">[ProductName]セットアップ</String>
+</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
index ca52140fff4..8b9910e0cf1 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="zh-CN" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="936">
-  <String Id="message.install.dir.exist">文件夹 [INSTALLDIR] 已存在。是否仍要安装到该文件夹？</String>
-  <String Id="MainFeatureTitle">主要功能</String>
-  <String Id="DowngradeErrorMessage">已安装更高版本的 [ProductName]。降级已禁用。现在将退出安装。</String>
-  <String Id="DisallowUpgradeErrorMessage">已安装更低版本的 [ProductName]。升级已禁用。现在将退出安装。</String>
-
-  <String Id="ShortcutPromptDlg_Title">[ProductName] Setup</String>
-  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}Shortcuts</String>
-  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
-  <String Id="ShortcutPromptDlgDescription">Select shortcuts to create.</String>
-  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Create desktop shortcut(s)</String>
-  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Create start menu shortcut(s)</String>
-  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] Setup</String>
-</WixLocalization>
+<?xml version = '1.0' encoding = 'utf-8'?>
+<WixLocalization Culture="zh-CN" xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="936">
+  <String Id="message.install.dir.exist">文件夹 [INSTALLDIR] 已存在。是否仍要安装到该文件夹？</String>
+  <String Id="MainFeatureTitle">主要功能</String>
+  <String Id="DowngradeErrorMessage">已安装更高版本的 [ProductName]。降级已禁用。现在将退出安装。</String>
+  <String Id="DisallowUpgradeErrorMessage">已安装更低版本的 [ProductName]。升级已禁用。现在将退出安装。</String>
+
+  <String Id="ShortcutPromptDlg_Title">[ProductName] 安装程序</String>
+  <String Id="ShortcutPromptDlgTitle">{\WixUI_Font_Title}快捷方式</String>
+  <String Id="ShortcutPromptDlgBannerBitmap">WixUI_Bmp_Banner</String>
+  <String Id="ShortcutPromptDlgDescription">选择要创建的快捷方式。</String>
+  <String Id="ShortcutPromptDlgDesktopShortcutControlLabel">创建桌面快捷方式</String>
+  <String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">创建开始菜单快捷方式</String>
+  <String Id="InstallDirNotEmptyDlg_Title">[ProductName] 安装程序</String>
+</WixLocalization>
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
new file mode 100644
index 00000000000..a84d2b2cb4f
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
@@ -0,0 +1,70 @@
+#
+# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+app.bundler.name=Windows-Anwendungsimage
+exe.bundler.name=EXE-Installationsprogrammpackage
+msi.bundler.name=MSI-Installationsprogrammpackage
+
+param.menu-group.default=Unbekannt
+
+resource.executable-properties-template=Vorlage f\u00FCr das Erstellen der ausf\u00FChrbaren Eigenschaftendatei
+resource.setup-icon=Symbol f\u00FCr Dialogfeld "Setup"
+resource.post-app-image-script=Auszuf\u00FChrendes Skript nach dem Auff\u00FCllen des Anwendungsimages
+resource.post-msi-script=Auszuf\u00FChrendes Skript nach dem Erstellen der MSI-Datei f\u00FCr das EXE-Installationsprogramm
+resource.wxl-file-name=MsiInstallerStrings_en.wxl
+resource.main-wix-file=Haupt-WiX-Projektdatei
+resource.overrides-wix-file=\u00DCberschreibt WiX-Projektdatei
+resource.shortcutpromptdlg-wix-file=Dialogfeld f\u00FCr Verkn\u00FCpfungs-Prompt der WiX-Projektdatei
+resource.installdirnotemptydlg-wix-file=Nicht leeres Installationsverzeichnis in Dialogfeld f\u00FCr WiX-Projektdatei
+
+error.no-wix-tools=WiX-Tools (light.exe, candle.exe) nicht gefunden
+error.no-wix-tools.advice=Laden Sie WiX 3.0 oder h\u00F6her von https://wixtoolset.org herunter, und f\u00FCgen Sie es zu PATH hinzu.
+error.version-string-wrong-format.advice=Setzen Sie den Wert des --app-version-Parameters auf eine g\u00FCltige ProductVersion des Windows-Installationsprogramms.
+error.msi-product-version-components=Versionszeichenfolge [{0}] muss zwischen 2 und 4 Komponenten aufweisen.
+error.msi-product-version-major-out-of-range=Hauptversion muss im Bereich [0, 255] liegen
+error.msi-product-version-build-out-of-range=Build-Teil der Version muss im Bereich [0, 65535] liegen
+error.msi-product-version-minor-out-of-range=Nebenversion muss im Bereich [0, 255] liegen
+error.version-swap=Versionsinformationen f\u00FCr {0} konnten nicht aktualisiert werden
+error.invalid-envvar=Ung\u00FCltiger Wert der {0}-Umgebungsvariable
+error.lock-resource=Sperren nicht erfolgreich: {0}
+error.read-wix-l10n-file=Datei {0} konnte nicht geparst werden
+error.extract-culture-from-wix-l10n-file=Kulturwert konnte nicht aus Datei {0} gelesen werden
+
+message.icon-not-ico=Das angegebene Symbol "{0}" ist keine ICO-Datei und wird nicht verwendet. Stattdessen wird das Standardsymbol verwendet.
+message.potential.windows.defender.issue=Warnung: Windows Defender verhindert eventuell die korrekte Ausf\u00FChrung von jpackage. Wenn ein Problem auftritt, deaktivieren Sie die Echtzeit\u00FCberwachung, oder f\u00FCgen Sie einen Ausschluss f\u00FCr das Verzeichnis "{0}" hinzu.
+message.outputting-to-location=EXE f\u00FCr Installationsprogramm wird generiert in: {0}.
+message.output-location=Installationsprogramm (.exe) gespeichert in: {0}
+message.tool-version=[{0}]-Version [{1}] erkannt.
+message.creating-association-with-null-extension=Verkn\u00FCpfung mit Nullerweiterung wird erstellt.
+message.wrong-tool-version=[{0}]-Version {1} wurde erkannt. Erforderlich ist jedoch Version {2}.
+message.version-string-too-many-components=Versionszeichenfolge kann bis zu 3 Komponenten aufweisen: major.minor.build.
+message.use-wix36-features=WiX {0} erkannt. Erweiterte Bereinigungsaktion wird aktiviert.
+message.product-code=MSI-ProductCode: {0}.
+message.upgrade-code=MSI-UpgradeCode: {0}.
+message.preparing-msi-config=MSI-Konfiguration wird vorbereitet: {0}.
+message.generating-msi=MSI wird generiert: {0}.
+message.invalid.install.dir=Warnung: Ung\u00FCltiges Installationsverzeichnis {0}. Installationsverzeichnis muss ein relativer Unterpfad unter dem Standardinstallationsverzeichnis wie "Programme" sein. Der Anwendungsname "{1}" wird als Standardwert verwendet.
+
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
index f0e5e3e370b..bce8ca2cb17 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
@@ -34,16 +34,16 @@ resource.executable-properties-template=\u5B9F\u884C\u53EF\u80FD\u306A\u30D7\u30
 resource.setup-icon=\u8A2D\u5B9A\u30C0\u30A4\u30A2\u30ED\u30B0\u30FB\u30A2\u30A4\u30B3\u30F3
 resource.post-app-image-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8\u3092\u79FB\u5165\u3057\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
 resource.post-msi-script=exe\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306Emsi\u30D5\u30A1\u30A4\u30EB\u304C\u4F5C\u6210\u3055\u308C\u305F\u5F8C\u306B\u5B9F\u884C\u3059\u308B\u30B9\u30AF\u30EA\u30D7\u30C8
-resource.wxl-file-name=MsiInstallerStrings_ja.wxl
+resource.wxl-file-name=MsiInstallerStrings_en.wxl
 resource.main-wix-file=\u30E1\u30A4\u30F3WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
 resource.overrides-wix-file=WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9
-resource.shortcutpromptdlg-wix-file=Shortcut prompt dialog WiX project file
-resource.installdirnotemptydlg-wix-file=Not empty install directory dialog WiX project file
+resource.shortcutpromptdlg-wix-file=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30FB\u30D7\u30ED\u30F3\u30D7\u30C8\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0WiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB
+resource.installdirnotemptydlg-wix-file=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u306EWiX\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u7A7A\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 
 error.no-wix-tools=WiX\u30C4\u30FC\u30EB(light.exe\u3001candle.exe)\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 error.no-wix-tools.advice=WiX 3.0\u4EE5\u964D\u3092https://wixtoolset.org\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3001PATH\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002
-error.version-string-wrong-format.advice=Set value of --app-version parameter to a valid Windows Installer ProductVersion.
-error.msi-product-version-components=Version string [{0}] must have between 2 and 4 components.
+error.version-string-wrong-format.advice=--app-version\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u5024\u3092\u6709\u52B9\u306AWindows Installer ProductVersion\u306B\u8A2D\u5B9A\u3057\u307E\u3059\u3002
+error.msi-product-version-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217[{0}]\u306B\u306F\u30012\u304B\u30894\u3064\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 error.msi-product-version-major-out-of-range=\u30E1\u30B8\u30E3\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.msi-product-version-build-out-of-range=\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u30D3\u30EB\u30C9\u90E8\u5206\u306F\u7BC4\u56F2[0, 65535]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 error.msi-product-version-minor-out-of-range=\u30DE\u30A4\u30CA\u30FC\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u7BC4\u56F2[0, 255]\u5185\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
index d0461b9996c..788026ecb97 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
@@ -34,16 +34,16 @@ resource.executable-properties-template=\u7528\u4E8E\u521B\u5EFA\u53EF\u6267\u88
 resource.setup-icon=\u8BBE\u7F6E\u5BF9\u8BDD\u6846\u56FE\u6807
 resource.post-app-image-script=\u8981\u5728\u586B\u5145\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF\u4E4B\u540E\u8FD0\u884C\u7684\u811A\u672C
 resource.post-msi-script=\u5728\u4E3A exe \u5B89\u88C5\u7A0B\u5E8F\u521B\u5EFA msi \u6587\u4EF6\u4E4B\u540E\u8981\u8FD0\u884C\u7684\u811A\u672C
-resource.wxl-file-name=MsiInstallerStrings_zh_CN.wxl
+resource.wxl-file-name=MsiInstallerStrings_en.wxl
 resource.main-wix-file=\u4E3B WiX \u9879\u76EE\u6587\u4EF6
 resource.overrides-wix-file=\u8986\u76D6 WiX \u9879\u76EE\u6587\u4EF6
-resource.shortcutpromptdlg-wix-file=Shortcut prompt dialog WiX project file
-resource.installdirnotemptydlg-wix-file=Not empty install directory dialog WiX project file
+resource.shortcutpromptdlg-wix-file=\u5FEB\u6377\u65B9\u5F0F\u63D0\u793A\u5BF9\u8BDD\u6846 WiX \u9879\u76EE\u6587\u4EF6
+resource.installdirnotemptydlg-wix-file=\u5B89\u88C5\u76EE\u5F55\u5BF9\u8BDD\u6846 WiX \u9879\u76EE\u6587\u4EF6\u975E\u7A7A
 
 error.no-wix-tools=\u627E\u4E0D\u5230 WiX \u5DE5\u5177 (light.exe, candle.exe)
 error.no-wix-tools.advice=\u4ECE https://wixtoolset.org \u4E0B\u8F7D WiX 3.0 \u6216\u66F4\u9AD8\u7248\u672C\uFF0C\u7136\u540E\u5C06\u5176\u6DFB\u52A0\u5230 PATH\u3002
-error.version-string-wrong-format.advice=Set value of --app-version parameter to a valid Windows Installer ProductVersion.
-error.msi-product-version-components=Version string [{0}] must have between 2 and 4 components.
+error.version-string-wrong-format.advice=\u5C06 --app-version \u53C2\u6570\u7684\u503C\u8BBE\u7F6E\u4E3A\u6709\u6548\u7684 Windows Installer ProductVersion\u3002
+error.msi-product-version-components=\u7248\u672C\u5B57\u7B26\u4E32 [{0}] \u5FC5\u987B\u5305\u542B 2 \u5230 4 \u4E2A\u7EC4\u6210\u90E8\u5206\u3002
 error.msi-product-version-major-out-of-range=\u4E3B\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
 error.msi-product-version-build-out-of-range=\u7248\u672C\u7684\u5DE5\u4F5C\u7248\u672C\u90E8\u5206\u5FC5\u987B\u4F4D\u4E8E [0, 65535] \u8303\u56F4\u4E2D
 error.msi-product-version-minor-out-of-range=\u6B21\u7248\u672C\u5FC5\u987B\u4F4D\u4E8E [0, 255] \u8303\u56F4\u4E2D
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
new file mode 100644
index 00000000000..3deef2ab65e
--- /dev/null
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_de.properties
@@ -0,0 +1,322 @@
+#
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+jshell.msg.welcome =Willkommen bei JShell - Version {0}\nGeben Sie f\u00FCr eine Einf\u00FChrung Folgendes ein: /help intro
+jshell.err.opt.arg = Argument f\u00FCr {0} fehlt.
+jshell.err.opt.invalid = Ung\u00FCltige Optionen: {0}.
+jshell.err.opt.one = Es darf nur eine {0}-Option verwendet werden.
+jshell.err.opt.startup.conflict = Nicht miteinander vereinbare Optionen: Es wurde sowohl --startup als auch --no-startup verwendet.
+jshell.err.opt.feedback.one = Es darf nur eine Feedbackoption (--feedback, -q, -s oder -v) verwendet werden.
+jshell.err.opt.unknown = Unbekannte Option: {0}
+
+jshell.msg.terminated = Status-Engine beendet.
+jshell.msg.terminated.restore = Stellen Sie Definitionen wieder her mit: /reload -restore
+
+jshell.msg.use.one.of = Verwenden Sie eine der folgenden Optionen: {0}
+jshell.msg.see.classes.etc = Siehe /types, /methods, /vars oder /list
+jshell.err.arg = Ung\u00FCltiges "{0}"-Argument: {1}
+jshell.msg.see = Hilfe finden Sie unter {0}.
+
+jshell.err.file.not.accessible = Auf Datei "{1}" f\u00FCr "{0}" kann nicht zugegriffen werden: {2}
+jshell.err.file.not.found = Datei "{1}" f\u00FCr "{0}" nicht gefunden.
+jshell.err.file.exception = Datei "{1}" f\u00FCr "{0}" hat eine Ausnahme ausgel\u00F6st: {2}
+jshell.err.file.filename = F\u00FCr "{0}" muss ein Dateinamenargument angegeben werden.
+
+jshell.err.startup.unexpected.exception = Unerwartete Ausnahme beim Lesen von Startinformationen: {0}
+jshell.err.unexpected.exception = Unerwartete Ausnahme: {0}
+
+jshell.err.invalid.command = Ung\u00FCltiger Befehl: {0}
+jshell.err.command.ambiguous = Befehl "{0}" ist mehrdeutig: {1}
+jshell.msg.set.restore = Es werden neue Optionen festgelegt, und der Status wird wiederhergestellt.
+jshell.msg.set.editor.set = Editor gesetzt auf: {0}
+jshell.msg.set.editor.retain = Editoreinstellung beibehalten: {0}
+jshell.msg.set.indent.set = Einzugsebene gesetzt auf: {0}
+jshell.err.invalid.indent = Ung\u00FCltige Einzugsebene: {0}
+jshell.err.no.builtin.editor = Integrierter Editor nicht verf\u00FCgbar.
+jshell.err.cant.launch.editor = Integrierter Editor kann nicht gestartet werden - unerwartete Ausnahme: {0}
+jshell.msg.try.set.editor = Informationen zum Verwenden des externen Editors finden Sie unter "/help /set editor".
+jshell.msg.press.return.to.leave.edit.mode = Dr\u00FCcken Sie die Eingabetaste, um den Bearbeitungsmodus zu verlassen.
+jshell.err.wait.applies.to.external.editor = -wait gilt f\u00FCr externe Editoren
+jshell.label.editpad = JShell-Bearbeitungs-Pad
+
+jshell.err.setting.to.retain.must.be.specified = Die beizubehaltende Einstellung muss angegeben werden - {0}
+jshell.msg.set.show.mode.settings = \nVerwenden Sie zum Anzeigen der Moduseinstellungen "/set prompt", "/set truncation", ...,\noder verwenden Sie "/set mode" gefolgt von dem Feedbackmodusnamen.
+jshell.err.continuation.prompt.required = Fortsetzungs-Prompt erforderlich - {0}
+
+jshell.msg.try.command.without.args = Verwenden Sie "{0}" ohne Argumente.
+jshell.msg.no.active = Keine aktiven Definitionen vorhanden.
+
+jshell.msg.resetting = Wird zur\u00FCckgesetzt...
+jshell.msg.resetting.state = Status wird zur\u00FCckgesetzt.
+
+jshell.err.reload.no.previous = Keine vorherige Historie zum Wiederherstellen vorhanden
+jshell.err.reload.restarting.previous.state = Es wird ein Neustart ausgef\u00FChrt und der vorherige Status wiederhergestellt.
+jshell.err.reload.restarting.state = Neustart wird ausgef\u00FChrt und Status wiederhergestellt.
+
+jshell.err.restart.failed = Neustart nicht erfolgreich: {0}\n\nVorherige Einstellungen werden wiederhergestellt, und ein Neustart wird ausgef\u00FChrt...
+
+jshell.msg.vars.not.active = (nicht aktiv)
+
+jshell.err.out.of.range = Au\u00DFerhalb des zul\u00E4ssigen Bereichs
+
+jshell.msg.error = Fehler:
+jshell.msg.warning = Warnung:
+
+jshell.err.sub.arg = F\u00FCr den Befehl "{0}" ist ein Unterbefehl erforderlich. Siehe: "/help {0}"
+jshell.err.sub.ambiguous = Mehrdeutiges Unterbefehlsargument f\u00FCr "{0}": {1}
+
+jshell.err.classpath.arg = F\u00FCr den /classpath-Befehl ist ein Pfadargument erforderlich.
+jshell.msg.classpath = Pfad "{0}" zu Classpath hinzugef\u00FCgt
+
+jshell.err.help.arg = Es beginnen keine Befehle oder Themen mit dem angegebenen Argument: {0}
+jshell.msg.help.begin =Geben Sie einen Java-Sprachausdruck, eine Anweisung oder eine Deklaration ein.\nSie k\u00F6nnen auch einen der folgenden Befehle eingeben:\n
+jshell.msg.help.subject =\nUm weitere Informationen zu erhalten, geben Sie "/help" gefolgt von dem Namen\neines Befehls oder Themas ein.\nBeispiel: "/help /list" oder "/help intro".\n\nThemen:\n\n
+
+jshell.err.no.snippet.with.id = Kein Snippet mit ID: {0}
+jshell.err.end.snippet.range.less.than.start = Snippet-Bereichsende niedriger als Bereichsanfang: {0} - {1}
+jshell.err.range.requires.id = F\u00FCr Snippet-Bereiche sind Snippet-IDs erforderlich: {0}
+
+jshell.err.exit.not.expression = Das Argument f\u00FCr /exit muss ein g\u00FCltiger ganzzahliger Ausdruck sein. Es ist jedoch kein Ausdruck: {0}
+jshell.err.exit.bad.type = Das Argument f\u00FCr /exit muss ein g\u00FCltiger ganzzahliger Ausdruck sein. Der Typ ist {1} : {0}
+jshell.err.exit.bad.value = Das Argument f\u00FCr /exit besitzt den ung\u00FCltigen Wert {1} : {0}
+
+jshell.err.drop.arg =Geben Sie im /drop-Argument einen zu l\u00F6schenden Import oder eine zu l\u00F6schende Variable, Methode oder Klasse an.\nGeben Sie die Elemente nach ID oder Name an. Verwenden Sie /list, um IDs anzuzeigen. Verwenden Sie /reset, um den gesamten Status zur\u00FCckzusetzen.
+jshell.err.failed = Nicht erfolgreich.
+jshell.msg.native.method = Native Methode
+jshell.msg.unknown.source = Unbekannte Quelle 
+jshell.msg.goodbye = Auf Wiedersehen
+jshell.msg.goodbye.value = Auf Wiedersehen ({0})
+
+jshell.msg.help.for.help = Geben Sie /help f\u00FCr einen Hilfetext ein.
+
+jshell.err.mode.name = Feedbackmodusname erwartet: {0}
+jshell.err.missing.mode = Feedbackmodus fehlt - {0}
+jshell.err.field.name = Feldname erwartet: {0} - {1}
+jshell.err.mode.unknown = Kein Feedbackmodus benannt: {0} - {1}
+
+jshell.err.feedback.does.not.match.mode = Entspricht keinem aktuellen Feedbackmodus: {0} - {1}
+jshell.err.feedback.ambiguous.mode = Entspricht mehr als einem aktuellen Feedbackmodus: {0} - {1}
+jshell.err.feedback.must.be.quoted = Format "{0}" muss in Anf\u00FChrungszeichen gesetzt werden - {1}
+jshell.err.feedback.not.a.valid.selector = Kein g\u00FCltiger Selektor "{0}" in "{1}" - {2}
+jshell.err.feedback.multiple.sections = Art des Selektors in mehreren Abschnitten der Selektorliste "{0}" in "{1}" - {2}
+jshell.err.feedback.different.selector.kinds = Unterschiedliche Arten von Selektoren in denselben Abschnitten der Selektorliste "{0}" in "{1}" - {2}
+
+jshell.msg.feedback.new.mode = Neuen Feedbackmodus erstellt: {0}
+jshell.msg.feedback.mode = Feedbackmodus: {0}
+jshell.msg.feedback.mode.following = Verf\u00FCgbare Feedbackmodi:
+jshell.msg.feedback.retained.mode.following = Beibehaltene Feedbackmodi:
+jshell.err.mode.creation = Zum Erstellen eines neuen Modus muss entweder die Option -command oder die Option -quiet verwendet werden - {0}
+jshell.err.mode.exists = Zu erstellender Modus ist bereits vorhanden: {0} - {1}
+
+jshell.err.truncation.expected.length = Erwartete Abschneidel\u00E4nge - {0}
+jshell.err.truncation.length.not.integer = Abschneidel\u00E4nge muss eine Ganzzahl sein: {0} - {1}
+
+jshell.err.not.valid.with.predefined.mode = Nicht g\u00FCltig mit einem vordefinierten Modus: {0} - {1}
+jshell.err.retained.feedback.mode.must.be.retained.or.predefined = F\u00FCr "/set feedback -retain <Modus>" muss <Modus> vordefiniert werden oder mit "/set mode -retain" beibehalten worden sein - {0}
+
+jshell.err.unknown.option = Unbekannte Option: {0} - {1}
+jshell.err.default.option.or.program = Geben Sie Option -default, Option -delete oder das Programm an - {0}
+jshell.err.option.or.filename = Geben Sie maximal eine der Optionen -default, -none oder einen Startdateinamen an - {0}
+jshell.err.unexpected.at.end = Unerwartete Argumente am Ende des Befehls: {0} - {1}
+jshell.err.conflicting.options = Nicht miteinander vereinbare Optionen - {0}
+jshell.err.cannot.delete.current.mode = Der aktuelle Feedbackmodus "{0}" kann nicht gel\u00F6scht werden. Verwenden Sie zun\u00E4chst "/set feedback" - {1}
+jshell.err.cannot.delete.retained.mode = Der beibehaltene Feedbackmodus "{0}" kann nicht gel\u00F6scht werden. Verwenden Sie zun\u00E4chst "/set feedback -retain" - {1}
+jshell.err.may.not.specify.options.and.snippets = Optionen und Snippets d\u00FCrfen nicht gemeinsam verwendet werden: {0}
+jshell.err.no.such.snippets = Snippet nicht vorhanden: {0}
+jshell.err.the.snippet.cannot.be.used.with.this.command = Dieser Befehl akzeptiert das Snippet "{0}" nicht: {1}
+jshell.err.retained.mode.failure = Fehler in beibehaltenen Modi (Modi gel\u00F6scht) - {0} {1}
+
+jshell.err.corrupted.stored.startup = Gespeicherter Start besch\u00E4digt. Standardwert wird verwendet - {0}
+
+jshell.err.exception.thrown = Ausnahme {0}
+jshell.err.exception.thrown.message = Ausnahme {0}: {1}
+jshell.err.exception.cause = Verursacht von: {0}
+jshell.err.exception.cause.message = Verursacht von: {0}: {1}
+
+jshell.console.see.synopsis = <Erneut Tabulatortaste dr\u00FCcken, um Zusammenfassung anzuzeigen>
+jshell.console.see.full.documentation = <Erneut Tabulatortaste dr\u00FCcken, um vollst\u00E4ndige Dokumentation anzuzeigen>
+jshell.console.see.documentation = <Erneut Tabulatortaste dr\u00FCcken, um Dokumentation anzuzeigen>
+jshell.console.see.next.page = <Erneut Tabulatortaste dr\u00FCcken, um n\u00E4chste Seite anzuzeigen>
+jshell.console.see.next.javadoc = <Tabulatortaste dr\u00FCcken, um n\u00E4chste Dokumentation anzuzeigen>
+jshell.console.see.next.command.doc = <Tabulatortaste dr\u00FCcken, um n\u00E4chsten Befehl anzuzeigen>
+jshell.console.no.such.command = Befehl nicht vorhanden
+jshell.console.completion.current.signatures = Signaturen:
+jshell.console.completion.all.completions.number = <Erneut Tabulatortaste dr\u00FCcken, um alle m\u00F6glichen Abschl\u00FCsse anzuzeigen. Insgesamt m\u00F6gliche Abschl\u00FCsse: {0}>
+jshell.console.completion.all.completions = <Erneut Tabulatortaste dr\u00FCcken, um alle m\u00F6glichen Abschl\u00FCsse anzuzeigen>
+jshell.console.no.javadoc = <Keine Dokumentation gefunden>
+jshell.console.do.nothing = Nichts machen
+jshell.console.choice = Auswahl: 
+jshell.console.create.variable = Variable erstellen
+jshell.console.create.method = Methode erstellen
+jshell.console.resolvable = \nDie ID kann in diesem Kontext aufgel\u00F6st werden.
+jshell.console.no.candidate = \nKeine vollqualifizierten Kandidatennamen f\u00FCr Import gefunden.
+jshell.console.incomplete = \nErgebnisse sind m\u00F6glicherweise unvollst\u00E4ndig. Wiederholen Sie den Vorgang sp\u00E4ter, um vollst\u00E4ndige Ergebnisse zu erhalten.
+jshell.console.erroneous = \nUnvollst\u00E4ndig oder fehlerhaft. Ein einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+jshell.console.exprstmt = \nEin einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+jshell.console.empty = \nLeerer Eintrag. Ein einzelner g\u00FCltiger Ausdruck oder eine einzelne g\u00FCltige Anweisung muss Umschalt+Tab gefolgt von M vorangehen.
+
+jshell.fix.wrong.shortcut =Unerwartetes Zeichen nach Umschalt+Tab.\nVerwenden Sie "I" f\u00FCr automatischen Import, "V" zur Variablenerstellung oder "M" zur Methodenerstellung.\nWeitere Informationen finden Sie unter:\n/help shortcuts
+
+help.usage = Verwendung:   jshell <Option>... <Ladedatei>...\nM\u00F6gliche Optionen:\n    --class-path <Pfad>   Gibt an, wo die Benutzerklassendateien gespeichert sind\n    --module-path <Pfad>  Gibt an, wo die Anwendungsmodule gespeichert sind\n    --add-modules <Modul>(,<Modul>)*\n                          Gibt aufzul\u00F6sende Module oder alle Module im\n                            Modulpfad an, wenn <Modul> ALL-MODULE-PATHs ist\n    --enable-native-access\n                          Erm\u00F6glicht Ausf\u00FChrung eingeschr\u00E4nkter nativer Methoden durch Code\n    --enable-preview      Code kann Vorschaufeatures in diesem Release nutzen\n    --startup <Datei>      Ersetzung der Startdefinitionen mit einer Ausf\u00FChrung\n    --no-startup          Startdefinitionen werden nicht ausgef\u00FChrt\n    --feedback <Modus>     Gibt den anf\u00E4nglichen Feedbackmodus an. Der Modus kann\n                            vordefiniert (Silent, Concise, Normal oder Verbose) oder\n                            vorab benutzerdefiniert sein\n    -q                    Stilles Feedback. Identisch mit: --feedback concise\n    -s                    \u00C4u\u00DFerst stilles Feedback. Identisch mit: --feedback silent\n    -v                    Verbose-Feedback. Identisch mit: --feedback verbose\n    -J<Kennzeichen>              \u00DCbergibt <Kennzeichen> direkt an das Laufzeitsystem.\n                            Verwenden Sie ein -J pro Laufzeitkennzeichen oder Kennzeichenargument\n    -R<Kennzeichen>              \u00DCbergibt <Kennzeichen> an das Remotelaufzeitsystem.\n                            Verwenden Sie ein -R pro Remotekennzeichen oder Kennzeichenargument\n    -C<Kennzeichen>              \u00DCbergibt <Kennzeichen> an den Compiler.\n                            Verwenden Sie ein -C pro Compiler-Kennzeichen oder Kennzeichenargument\n    --version             Gibt Versionsinformationen aus und beendet den Vorgang\n    --show-version        Gibt Versionsinformationen aus und setzt den Vorgang fort\n    --help, -?, -h        Gibt diese Zusammenfassung der Standardoptionen aus und beendet den Vorgang\n    --help-extra, -X      Gibt Hilfetext zu Nicht-Standardoptionen aus und beendet den Vorgang\n\nEin Dateiargument kann ein Dateiname oder einer der vordefinierten Dateinamen sein: DEFAULT,\nPRINTING oder JAVASE.\nEine Ladedatei kann auch "-" zur Angabe einer Standardeingabe ohne interaktiven I/O sein.\n\nWeitere Informationen zu den Auswertungskontextoptionen (--class-path,\n--module-path und --add-modules) finden Sie unter:\n\t/help context\n\nEin Pfad listet die zu durchsuchenden Verzeichnisse und Archive auf. Verwenden Sie unter Windows ein\nSemikolon (;), um Elemente im Pfad zu trennen. Verwenden Sie auf anderen Plattformen einen\nDoppelpunkt (:), um Elemente zu trennen.\n
+help.usage.x = \    --add-exports <Modul>/<Package>   Gibt ein Package an, das als\n                                         Export aus seinem definierenden Modul gelten soll \n    --execution <Spezifikation>                 Gibt eine alternative Ausf\u00FChrungs-Engine an.\n                                         Dabei gilt: <Spezifikation> ist eine ExecutionControl-Spezifikation.\n                                         In der Dokumentation zu dem Package\n                                         jdk.jshell.spi finden Sie Informationen zur Syntax der Spezifikation\n    \nDies sind keine Standardoptionen und k\u00F6nnen jederzeit ohne vorherige Ank\u00FCndigung ge\u00E4ndert werden.\n
+
+help.list.summary = Listet die eingegebene Quelle auf
+help.list.args = [<Name oder ID>|-all|-start]
+help.list =Zeigt die Snippets mit vorangestellten Snippet-IDs an.\n\n/list\n\tListet die derzeit aktiven Code-Snippets auf, die Sie eingegeben oder mit /open eingelesen haben\n\n/list -start\n\tListet die ausgewerteten Start-Snippets auf\n\n/list -all\n\tListet alle Snippets auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets\n\n/list <Name>\n\tListet Snippets mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/list <ID>\n\tF\u00FChrt das Snippet mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+
+help.edit.summary = Bearbeitet einen Quelleintrag
+help.edit.args = <Name oder ID>
+help.edit =Bearbeitet ein oder mehrere Code-Snippets in einem externen Editor.\nDer zu verwendende Editor wird mit /set editor festgelegt. Wenn kein Editor festgelegt wird, werden\ndie folgenden Umgebungsvariablen in der folgenden Reihenfolge gepr\u00FCft: JSHELLEDITOR, VISUAL\nund EDITOR. Wenn kein Editor und auch keine der Editorumgebungsvariablen festgelegt wurde,\nwird ein einfacher Editor gestartet.\n\n/edit <Name>\n\tBearbeitet die Snippets mit den angegebenen Namen (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/edit <ID>\n\tBearbeitet das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/edit -start\n\tBearbeitet die Start-Snippets. Vorgenommene \u00C4nderungen gelten nur f\u00FCr diese Session und\n\twirken sich nicht auf die Starteinstellung aus\n\n/edit -all\n\tBearbeitet alle Snippets, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets\n\n/edit\n\tBearbeitet das derzeit aktive Code-Snippet, das Sie eingegeben oder mit /open eingelesen haben
+
+help.drop.summary = L\u00F6scht einen Quelleintrag
+help.drop.args = <Name oder ID>
+help.drop =L\u00F6scht ein Snippet (deaktiviert es).\n\n/drop <Name>\n\tL\u00F6scht das Snippet mit dem angegebenen Namen\n\n/drop <ID>\n\tL\u00F6scht das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+
+help.save.summary = Speichert die Snippet-Quelle in einer Datei
+help.save.args = [-all|-history|-start] <Datei>
+help.save =Speichert die angegebenen Snippets und/oder Befehle in der angegebenen Datei.\n\n/save <Datei>\n\tSpeichert die Quelle derzeit aktiver Snippets in der Datei.\n\n/save -all <Datei>\n\tSpeichert die Quelle aller Snippets in der Datei.\n\tUmfasst die Quelle von \u00FCberschriebenem, nicht erfolgreichem und Startcode\n\n/save -history <Datei>\n\tSpeichert die sequenzielle Historie aller Befehle und Snippets, die seit dem\n\tStart des JShell-Tools eingegeben wurden.\n\n/save -start <Datei>\n\tSpeichert die aktuellen Startdefinitionen in der Datei\n\n/save <ID> <Datei>\n\tSpeichert das Snippet mit der angegebenen Snippet-ID.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"
+
+help.open.summary = \u00D6ffnet eine Datei als Quelleingabe
+help.open.args = <Datei>
+help.open =\u00D6ffnet eine Datei und liest deren Inhalt als Snippets und Befehle.\n\n/open <Datei>\n\tLiest die angegebene Datei als JShell-Tooleingabe.\n\nDie <Datei> kann der Name einer Betriebssystemdatei oder einer der folgenden vordefinierten\nDateinamen sein: DEFAULT, PRINTING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf() bzw.\nImporte aller Java SE-Packages.\n
+
+help.vars.summary = Listet die deklarierten Variablen und ihre zugeh\u00F6rigen Werte auf
+help.vars.args = [<Name oder ID>|-all|-start]
+help.vars =Listet den Typ, Namen und Wert der eingegebenen Variablen auf.\n\n/vars\n\tListet den Typ, Namen und Wert der derzeit aktiven Variablen auf\n\n/vars <Name>\n\tListet Variablen mit dem angegebenen Namen auf (aktive Variablen werden bevorzugt aufgef\u00FChrt)\n\n/vars <ID>\n\tListet die Variable mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/vars -start\n\tListet die Variablen in den ausgewerteten Start-Snippets auf\n\n/vars -all\n\tListet alle Variablen auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Startvariablen
+
+help.methods.summary = Listet die deklarierten Methoden und ihre zugeh\u00F6rigen Signaturen auf
+help.methods.args = [<Name oder ID>|-all|-start]
+help.methods =Listet den Namen, die Parametertypen und den R\u00FCckgabetyp der eingegebenen Methoden auf.\n\n/methods\n\tListet den Namen, die Parametertypen und den R\u00FCckgabetyp der derzeit aktiven Methoden auf\n\n/methods <Name>\n\tListet die Methoden mit dem angegebenen Namen auf (aktive Methoden werden bevorzugt aufgef\u00FChrt)\n\n/methods <ID>\n\tListet die Methode mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/methods -start\n\tListet die Methoden in den ausgewerteten Start-Snippets auf\n\n/methods -all\n\tListet alle Snippets auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Start-Snippets
+
+help.types.summary = Listet die Typdeklarationen auf
+help.types.args =[<Name oder ID>|-all|-start]
+help.types =Listet eingegebene Klassen und Schnittstellen auf.\n\n/types\n\tListet die derzeit aktiven Typdeklarationen auf\n\n/types <Name>\n\tListet die Typdeklarationen mit dem angegebenen Namen auf (aktive Snippets werden bevorzugt aufgef\u00FChrt)\n\n/types <ID>\n\tListet die Typdeklaration mit der angegebenen Snippet-ID auf.\n\tEs k\u00F6nnen mehrere IDs oder ID-Bereiche verwendet werden, siehe "/help id"\n\n/types -start\n\tListet die Typdeklarationen in den ausgewerteten Start-Snippets auf\n\n/types -all\n\tListet alle Typdeklarationen auf, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen, gel\u00F6schten und Starttypdeklarationen
+
+help.imports.summary = Listet die importierten Elemente auf
+help.imports.args =
+help.imports =Listet die derzeit aktiven Importe auf. Dies umfasst Importe aus\nStart-Snippets.
+
+help.exit.summary = Beendet das JShell-Tool
+help.exit.args =[<Snippet mit ganzzahligem Ausdruck>]
+help.exit =Beendet das JShell-Tool. \u00C4nderungen werden nicht gespeichert.\nSpeichern Sie Ihre \u00C4nderungen, bevor Sie diesen Befehl ausf\u00FChren\n\n/exit\n\tBeendet das JShell-Tool. Der Beendigungsstatus ist null\n\n/exit <Snippet mit ganzzahligem Ausdruck>\n\tWertet das Snippet aus. Wenn das Snippet nicht erfolgreich oder kein ganzzahliger Ausdruck ist,\n\twird der Fehler angezeigt. Andernfalls wird das JShell-Tool mit dem\n\tAusdruckswert als Beendigungsstatus beendet
+
+help.reset.summary = Setzt das JShell-Tool zur\u00FCck
+help.reset.args = [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>]...
+help.reset =Setzt den Code und den Ausf\u00FChrungsstatus des JShell-Tools zur\u00FCck:\n\t* Der gesamte eingegebene Code geht verloren\n\t* Der Ausf\u00FChrungsstatus wird neu gestartet\n\t* Der Startcode wird erneut ausgef\u00FChrt\nSpeichern Sie Ihre \u00C4nderungen, bevor Sie diesen Befehl verwenden.\nDer /reset-Befehl akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n
+
+help.reload.summary = Setzt die relevante Historie (derzeitige oder vorherige) zur\u00FCck und gibt sie erneut wieder (-restore)
+help.reload.args = [-restore] [-quiet] [-class-path <Pfad>] [-module-path <Pfad>]...
+help.reload =Setzt den Code und den Ausf\u00FChrungsstatus des JShell-Tools zur\u00FCck und gibt anschlie\u00DFend jedes g\u00FCltige Snippet\nsowie alle /drop-Befehle in der Reihenfolge wieder, in der sie eingegeben wurden.\n\n/reload\n\tDient zum Zur\u00FCcksetzen und Wiedergeben der g\u00FCltigen Historie seit Starten des JShell-Tools bzw.\n\tseit Ausf\u00FChrung eines /reset- oder /reload-Befehls - je nachdem, was\n\tals Letztes erfolgt ist\n\n/reload -restore\n\tDient zum Zur\u00FCcksetzen und Wiedergeben der g\u00FCltigen Historie zwischen dem vorherigen und aktuellen\n\tStarten des JShell-Tools bzw. der Ausf\u00FChrung eines /reset-, /reload- oder /env-\n\tBefehls. Diese Wiedergabe kann somit zum Wiederherstellen einer vorherigen\n\tJShell-Toolsession verwendet werden\n\n/reload [-restore] -quiet\n\tMit dem Argument "-quiet" wird die Wiedergabe nicht angezeigt, etwaige Fehler\n\thingegen schon\n\nJeder der obigen Befehle akzeptiert Auswertungskontextoptionen, siehe:\n\n\t/help context\n\nBeispiel:\n\n\t/reload -add-modules com.greetings -restore
+
+help.env.summary = Zeigt den Auswertungskonzept an oder \u00E4ndert ihn
+help.env.args = [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...
+help.env =Zeigt den Auswertungskontext an oder \u00E4ndert ihn. Der Auswertungskontext ist der Classpath,\nModulpfad usw.\n\n/env\n\tZeigt den Auswertungskontext als Kontextoptionen an\n\n/env [-class-path <Pfad>] [-module-path <Pfad>] [-add-modules <Module>] ...\n\tDurch Festlegen mindestens einer Option wird der Auswertungskontext festgelegt. Wenn Snippets\n\tdefiniert wurden, wird der Ausf\u00FChrungsstatus auf den neuen Auswertungskontext\n\tzur\u00FCckgesetzt, und die Snippets werden erneut wiedergegeben. Die Wiedergabe wird nicht \n\tangezeigt, etwaige Fehler hingegen schon. Dies entspricht:\n\n\t\t/reload -quiet ...\n\nWeitere Einzelheiten zu Auswertungskontextoptionen finden Sie unter:\n\n\t/help context\n\nBeispiel:\n\n\t/env -add-modules com.greetings
+
+help.history.summary = Historie Ihrer Eingaben
+help.history.args = [-all]
+help.history =Zeigt die Historie der Snippet- und Befehlseingaben an.\n\n/history\n\tListet die Historie der Snippet- und Befehlseingaben seit Start des JShell-Tools auf\n\n/history -all\n\tListet die gesamte Historie der Snippet- und Befehlseingaben aus dieser und vorherigen Sessions auf
+
+help.debug.summary = Schaltet Debugging des JShell-Tools um
+help.debug.args = [0][r][g][f][c][d][e]
+help.debug =Zeigt Debugginginformationen f\u00FCr die JShell-Toolimplementierung an.\n0: Debugging deaktiviert\nr: Debugging auf Toolebene aktiviert\ng: Allgemeines Debugging aktiviert\nf: Dateimanagerdebugging aktiviert\nc: Abschlussanalysedebugging aktiviert\nd: Abh\u00E4ngigkeitsdebugging aktiviert\ne: Ereignisdebugging aktiviert
+
+help.help.summary = Ruft Informationen zur Verwendung des JShell-Tools ab
+help.help.args = [<Befehl>|<Thema>]
+help.help =Zeigt Informationen zur Verwendung des JShell-Tools an.\n/help\n\tListet die Befehle und Hilfethemen des JShell-Tools auf\n\n/help <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden ben\u00F6tigt - bei mehr als einer\n\t\u00DCbereinstimmung wird jede einzelne angezeigt. Beispiel: /help /li\n\n/help <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /help intro
+
+help.set.summary = Legt Konfigurationsinformationen fest
+help.set.args = editor|start|feedback|mode|prompt|truncation|format ...
+help.set =Legt die Konfigurationsinformationen f\u00FCr das JShell-Tool fest, darunter:\nden zu verwendenden externen Editor, die zu verwendenden Startdefinitionen, einen neuen Feedbackmodus,\nden Befehls-Prompt, den zu verwendenden Feedbackmodus oder das Ausgabeformat.\n\n/set editor [-wait] <Befehl> <optionales Argument>...\n\tGibt den Befehl an, der f\u00FCr den /edit-Befehl gestartet werden soll.\n\tDer <Befehl> ist eine betriebssystemabh\u00E4ngige Zeichenfolge\n\n/set start <Datei>\n\tDer Inhalt der angegebenen <Datei> wird zu den Standardstart-Snippets und -befehlen\n\n/set feedback <Modus>\n\tLegt den Feedbackmodus fest, der das angezeigte Feedback f\u00FCr eingegebene Snippets und Befehle beschreibt\n\n/set mode <Modus> [<alter Modus>] -command|-quiet|-delete\n\tErstellt oder aktualisiert einen benutzerdefinierten Feedbackmodus. Optional kann er auch von einem vorhandenen Modus kopiert werden\n\n/set prompt <Modus> "<Prompt>" "<Fortsetzungs-Prompt>"\n\tLegt die angezeigten Prompts f\u00FCr einen angegebenen Feedbackmodus fest\n\n/set truncation <Modus> <L\u00E4nge> <Selektor>...\n\tLegt die maximale L\u00E4nge eines angezeigten Wertes fest\n\n/set format <Modus> <Feld> "<Format>" <Selektor>...\n\tKonfiguriert einen Feedbackmodus durch Festlegen des Formats eines Feldes, wenn der Selektor \u00FCbereinstimmt\n\n/set indent <Anzahl>\n\tLegt die Anzahl der Leerzeichen fest, mit denen Snippets automatisch einger\u00FCckt werden sollen\n\n/set\n\tZeigt Editor-, Start- und Feedbackeinstellungen als /set-Befehle an.\n\tLassen Sie den festgelegten Wert weg, um die Einstellungen eines der oben genannten Befehle anzuzeigen\n\nUm weitere Informationen zu einem dieser Formate zu erhalten, verwenden Sie /help mit dem angegebenen Format.\nBeispiel:   /help /set format
+
+help.quest.summary = Ruft Informationen zur Verwendung des JShell-Tools ab
+help.quest.args = [<Befehl>|<Thema>]
+help.quest =Zeigt Informationen zur Verwendung des JShell-Tools an (Abk\u00FCrzung f\u00FCr /help).\n/?\n\tZeigt eine Liste der Befehle und Hilfethemen an\n/? <Befehl>\n\tZeigt Informationen zum angegebenen Befehl an.\n\tNur die ersten paar Buchstaben des Befehls werden ben\u00F6tigt - bei mehr als einer\n\t\u00DCbereinstimmung wird jeder einzelne angezeigt. Beispiel: /? /li\n\n/? <Thema>\n\tZeigt Informationen zu dem angegebenen Hilfethema an. Beispiel: /? intro
+
+help.bang.summary = F\u00FChrt das letzte Snippet erneut aus, siehe: /help rerun
+help.bang.args =
+help.bang =Wertet das zuletzt eingegebene Snippet erneut aus.
+
+help.slashID.summary = F\u00FChrt Snippets nach ID oder ID-Bereich erneut aus, siehe: /help rerun
+help.slashID.args =
+help.slashID =/<id> <id> <id>\n\n/<id>-<id>\n\nWertet die durch die ID oder den ID-Bereich angegebenen Snippets erneut aus.\nEin ID-Bereich wird als zwei per Bindestrich getrennte IDs dargestellt. Beispiel:  3-17\nStart- und Fehler-Snippets k\u00F6nnen verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs k\u00F6nnen beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe "/help id".
+
+help.previous.summary = F\u00FChrt das n-te vorherige Snippet erneut aus, siehe: /help rerun
+help.previous.args =
+help.previous =Wertet das n-te zuletzt eingegebene Snippet erneut aus.
+
+help.intro.summary = Einf\u00FChrung in das JShell-Tool
+help.intro =Mit dem JShell-Toll k\u00F6nnen Sie Java-Code ausf\u00FChren und umgehend Ergebnisse erhalten.\nSie k\u00F6nnen eine Java-Definition (Variable, Methode, Klasse usw.) wie int x = 8,\neinen Java-Ausdruck wie x + x,\neine Java-Anweisung oder einen Java-Import eingeben.\nDiese kleinen Java-Code-Chunks werden als "Snippets" bezeichnet.\n\nAu\u00DFerdem stehen Ihnen die JShell-Toolbefehle zur Verf\u00FCgung, mit denen Sie Ihr Vorgehen\nbesser verstehen und steuern k\u00F6nnen. Beispiel: /list\n\nEine Liste der Befehle k\u00F6nnen Sie aufrufen mit: /help
+
+help.keys.summary = Beschreibung der Readline-\u00E4hnlichen Eingabebearbeitung
+help.keys =Das JShell-Tool bietet Unterst\u00FCtzung f\u00FCr Zeilenbearbeitung, damit Sie in Snippets\nund Befehlen navigieren und diese bearbeiten k\u00F6nnen. Sie k\u00F6nnen den aktuellen Befehl/das aktuelle Snippet bearbeiten\noder vorherige Befehle/Snippets aus der Historie abrufen, bearbeiten und ausf\u00FChren.\nDiese Unterst\u00FCtzung \u00E4hnelt Readline/Editline mit einfachen Emacs-\u00E4hnlichen Bindings.\nEs gibt auch f\u00FCr das JShell-Tool spezifische Schl\u00FCsselsequenzen.\n\nZeilen- und Historiennavigation:\n\n\tEingabetaste\n\t\tGibt das aktuelle Snippet ein\n\tNach-links-Taste oder Strg+B\n\t\tNavigiert ein Zeichen zur\u00FCck\n\tNach-rechts-Taste oder Strg+F\n\t\tNavigiert ein Zeichen vorw\u00E4rts\n\tNach-oben-Taste oder Strg+P\n\t\tNavigiert eine Zeile nach oben, r\u00FCckw\u00E4rts in der Historie\n\tNach-unten-Taste oder Strg+N\n\t\tNavigiert eine Zeile nach unten, vorw\u00E4rts in der Historie\n\tStrg+A\n\t\tNavigiert an den Anfang der Zeile\n\tStrg+E\n\t\tNavigiert an das Ende der Zeile\n\tMeta+B\n\t\tNavigiert ein Wort zur\u00FCck\n\tMeta+F\n\t\tNavigiert ein Wort vorw\u00E4rts\n\tStrg+R\n\t\tDurchsucht die Historie r\u00FCckw\u00E4rts\n\n\nEinfache Zeilen- und Historienbearbeitung:\n\n\tMeta+Eingabetaste oder Strg+Eingabetaste (je nach Plattform)\n\t\tF\u00FCgt eine neue Zeile in das Snippet ein\n\tStrg+_ (f\u00FCr Unterstrich kann Umschalttaste erforderlich sein) oder Strg+X gefolgt von Strg+U\n\t\tMacht \u00C4nderung r\u00FCckg\u00E4ngig. Wiederholen Sie die Eingabe, um weitere \u00C4nderungen r\u00FCckg\u00E4ngig zu machen\n\tEntf\n\t\tL\u00F6scht das Zeichen bei dem oder hinter dem Cursor, je nach Betriebssystem\n\tR\u00FCcktaste\n\t\tL\u00F6scht das Zeichen vor dem Cursor\n\tStrg+K\n\t\tL\u00F6scht den Text vom Cursor bis zum Ende der Zeile\n\tMeta+D\n\t\tL\u00F6scht den Text vom Cursor bis zum Ende des Wortes\n\tStrg+W\n\t\tL\u00F6scht den Text vom Cursor bis zum vorangegangenen Leerzeichen\n\tStrg+Y\n\t\tF\u00FCgt den zuletzt gel\u00F6schten Text in die Zeile ein\n\tMeta+Y\n\t\tNach Strg+Y durchl\u00E4uft Meta+Y den zuletzt gel\u00F6schten Text\n\tStrg+X gefolgt von Strg+K\n\t\tL\u00F6scht das gesamte Snippet\n\n\nTastenkombinationen f\u00FCr JShell-Tool:\n\n\tWeitere Einzelheiten k\u00F6nnen Sie aufrufen \u00FCber: /help shortcuts\n\n\tTab\n\t\tSchlie\u00DFt Java-ID oder JShell-Befehl ab\n\tUmschalt+Tab gefolgt von V\n\t\tKonvertiert den Ausdruck in eine Variablendeklaration\n\tUmschalt+Tab gefolgt von M\n\t\tKonvertiert die Anweisung in eine Methodendeklaration\n\tUmschalt+Tab gefolgt von I\n\t\tF\u00FCgt Importe f\u00FCr diese ID hinzu\n\t\n\nWeitere Zeilen- und Historienbearbeitung:\n\n\tStrg+L\n\t\tBereinigt den Bildschirm und gibt das Snippet erneut aus\n\tStrg+U\n\t\tL\u00F6scht die gesamte Zeile\n\tStrg+T\n\t\tTransponiert Zeichen\n\tStrg+X gefolgt von Strg+B\n\t\tNavigiert zur entsprechenden Klammer, eckigen Klammer, ...\n\tStrg+X gefolgt von =\n\t\tAktiviert den Modus zum Anzeigen der aktuellen Zeichenposition\n\tStrg+X gefolgt von Strg+O\n\t\tSchaltet um zwischen \u00DCberschreiben und Einf\u00FCgen von Zeichen\n\tMeta+C\n\t\tSetzt Anfangsbuchstaben eines Wortes in Gro\u00DFbuchstaben\n\tMeta+U\n\t\tKonvertiert ein Wort in Gro\u00DFbuchstaben\n\tMeta+L\n\t\tKonvertiert ein Wort in Kleinbuchstaben\n\tMeta+0 bis Meta+9 gefolgt von Taste\n\t\tWiederholt den Vorgang die angegebene Anzahl von Malen\n\nDabei gilt z.B.: "Strg+A" bedeutet, dass Sie die Steuerungstaste gedr\u00FCckt halten und A dr\u00FCcken.\nAuf vielen Tastaturen ist die Taste "Meta" gleichbedeutend mit der Taste "Alt".\nUnterst\u00FCtzung f\u00FCr Zeilenbearbeitung wird von JLine 3 abgeleitet.
+
+help.shortcuts.summary = Beschreibung der Tastenanschl\u00E4ge f\u00FCr Snippet- und Befehlsabschluss,\nZugriff auf Informationen und automatische Codegenerierung
+help.shortcuts =Unterst\u00FCtzte Tastenkombinationen:\n\n\tTab\n\t\tDr\u00FCcken Sie nach Eingabe der ersten paar Buchstaben einer Java-ID,\n\t\teines JShell-Toolbefehls oder, in einigen F\u00E4llen, eines JShell-\n\t\tToolbefehlsarguments die Tabulatortaste, um die Eingabe abzuschlie\u00DFen.\n\t\tWenn mehrere Abschl\u00FCsse vorhanden sind, werden m\u00F6gliche Abschl\u00FCsse\n\t\tangezeigt.\n\t\tDurch erneutes Dr\u00FCcken der Tabulatortaste wird Dokumentation angezeigt, sofern vorhanden und relevant.\n\n\tUmschalt+Tab gefolgt von V\n\t\tHalten Sie nach einem abgeschlossenen Ausdruck die Umschalttaste gedr\u00FCckt,\n\t\tund dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken Sie die Taste V.\n\t\tDer Ausdruck wird in eine Variablendeklaration konvertiert, \n\t\tderen Typ auf dem Typ des Ausdrucks basiert.\n\n\tUmschalt+Tab gefolgt von M\n\t\tHalten Sie nach Abschluss eines Ausdrucks oder einer Anweisung die\n\t\tUmschalttaste gedr\u00FCckt, und dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken\n\t\tSie die Taste M. Der Ausdruck bzw. die Anweisung wird in eine\n\t\tMethodendeklaration konvertiert. Bei einem Ausdruck basiert der\n\t\tR\u00FCckgabetyp der Methode auf dem Typ des Ausdrucks.\n\n\tUmschalt+Tab gefolgt von I\n\t\tHalten Sie nach einer nicht aufl\u00F6sbaren ID die Umschalttaste gedr\u00FCckt,\n\t\tund dr\u00FCcken Sie die Tabulatortaste. Lassen Sie dann los, und dr\u00FCcken Sie die Taste I.\n\t\tDas JShell-Tool schl\u00E4gt daraufhin m\u00F6gliche Importe vor, die die\n\t\tID basierend auf dem Inhalt des angegebenen Classpath aufl\u00F6sen werden.\n\t\tGeben Sie die Ziffer ein, die dem gew\u00FCnschten Import entspricht,\n\t\toder dr\u00FCcken Sie die Taste 0, um keine Importe hinzuzuf\u00FCgen.\n\nInformationen zu weiteren Sondertasten k\u00F6nnen Sie aufrufen durch: /help keys
+
+help.context.summary = Beschreibung der Auswertungskontextoptionen f\u00FCr /env /reload und /reset
+help.context =Mit diesen Optionen wird der Auswertungskontext konfiguriert. Sie k\u00F6nnen beim Starten des \nJShell-Tools in der Befehlszeile oder beim Neustarten des JShell-Tools mit den Befehlen\n/env, /reload oder /reset als Befehlsoptionen angegeben werden.\n\nSie lauten:\n\t--class-path <Pfad>\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Klassendateien durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--module-path <Pfad>...\n\t\tDer <Pfad> ist eine Liste von Verzeichnissen, JAR-Archiven\n\t\tund ZIP-Archiven, die nach Modulen durchsucht werden sollen.\n\t\tVerwenden Sie unter Windows ein Semikolon (;), um Elemente im Pfad\n\t\tzu trennen. Verwenden Sie auf anderen Plattformen einen Doppelpunkt (:), um Elemente zu trennen.\n\t--add-modules <Modulname>[,<Modulname>...]\n\t\tRoot-Module, die zus\u00E4tzlich zum Ausgangsmodul aufgel\u00F6st werden sollen.\n\t\t<Modulname> kann auch ALL-DEFAULT, ALL-SYSTEM,\n\t\tALL-MODULE-PATH sein.\n\t--add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n\t\taktualisiert <Modul>, um <Package> in <Zielmodul> zu exportieren,\n\t\tunabh\u00E4ngig von der Moduldeklaration.\n\t\t<Zielmodul> kann ALL-UNNAMED sein, um in alle unbenannten\n\t\tModule zu exportieren. Wenn in JShell das <Zielmodul> nicht angegeben\n\t\twird (no =), wird ALL-UNNAMED verwendet.\n\nAuswertungskontextoptionen, die in der Befehlszeile eingegeben oder mit einem vorherigen\n/reset-, /env- oder /reload-Befehl angegeben werden, werden beibehalten, es sei denn,\nes wird eine Option eingegeben, die die Einstellung au\u00DFer Kraft setzt.\n\nIn der Befehlszeile ben\u00F6tigen diese Optionen zwei Bindestriche. Beispiel: --module-path\nIn den JShell-Toolbefehlen k\u00F6nnen sie ein oder zwei Bindestriche aufweisen. Beispiel: -module-path
+
+help.id.summary = Beschreibung der Snippet-IDs und deren Verwendung
+help.id =Jedes eingegebene Code-Snippet hat eine eindeutige Snippet-ID. Auch wenn Sie\ndasselbe Snippet erneut eingeben, erh\u00E4lt es eine neue ID. Bei normalen Snippets ist die ID\neine aufsteigende Zahl. Snippets, die mit einem Fehler nicht erfolgreich verlaufen, haben eine\nmit "e" beginnende Snippet-ID. Start-Snippets haben eine mit "s" beginnende ID.\n\nEine Snippet-ID stellt eine der M\u00F6glichkeiten dar, in einem Befehl auf ein Snippet zu verweisen. Beispiel:\nMit dem folgenden Befehl wird das Snippet mit der ID "14" gel\u00F6scht:\n\n\t/drop 14\n\nMit dem Befehl "/list" zeigen Sie die ID eines oder mehrerer Snippets an. Um die ID\naller Snippets anzuzeigen, einschlie\u00DFlich aller nicht erfolgreichen, \u00FCberschriebenen und Start-Snippets,\nverwenden Sie den Befehl "/list -all".\n\nSie k\u00F6nnen auch auf einen ID-Bereich verweisen, indem Sie die Anfangs-ID und die End-ID mit einem\nBindestrich trennen. Beispiel: "1-4" entspricht "1 2 3 4". F\u00FCr alle Befehle,\ndie auf Snippets verweisen, kann eine Liste mit IDs, ID-Bereichen und Snippet-Namen\nals Argumenten angegeben werden. Diese Befehle sind: /list, /edit, /drop, /save, /vars, /methods,\n/types und /<id>. Einige Beispiele:\n\n\t/edit 7-23\n\n\t/save s1-s4 3-8 foo 12 myfile\n\n\t/9-12 33\n\nSiehe "/help /edit", "/help /save" bzw. "/help rerun".
+
+help.rerun.summary = Beschreibung von M\u00F6glichkeiten zur erneuten Auswertung zuvor eingegebener Snippets
+help.rerun =Es gibt vier M\u00F6glichkeiten zur erneuten Auswertung zuvor eingegebener Snippets.\nDas letzte Snippet kann erneut ausgewertet werden mit: /!\nDas n-te vorherige Snippet kann mit Schr\u00E4gstrich-Minus und der jeweiligen Ziffer f\u00FCr n erneut ausgewertet werden. Beispiel: /-4\nBeispiel:\n\n\tjshell> 2 + 2\n\t$1 ==> 4\n\n\tjshell> /!\n\t2 + 2\n\t$2 ==> 4\n\n\tjshell> int z\n\tz ==> 0\n\n\tjshell> /-1\n\tint z;\n\tz ==> 0\n\n\tjshell> /-4\n\t2 + 2\n\t$5 ==> 4\n\nDie erneut auszuwertenden Snippets k\u00F6nnen per Snippet-ID oder ID-Bereich angegeben werden.\nEin ID-Bereich wird als zwei durch Bindestrich getrennte IDs dargestellt. Beispiel: 3-17\nEs k\u00F6nnen auch Start- und Fehler-Snippets verwendet werden. Beispiel: s3-s9 oder e1-e4\nEs k\u00F6nnen beliebig viele IDs oder ID-Bereiche verwendet werden. Beispiel: /3-7 s4 14-16 e2\nSiehe auch "/help id".\n\nAu\u00DFerdem k\u00F6nnen Sie die Historie auch r\u00FCckw\u00E4rts durchsuchen, indem Sie Strg+R gefolgt von der zu suchenden Zeichenfolge eingeben.
+
+help.set._retain = Mit der Option "-retain" wird eine Einstellung zur Verwendung in zuk\u00FCnftigen Sessions gespeichert.\nDie -retain-Option kann f\u00FCr die folgenden Formen von /set verwendet werden:\n\n\t/set editor -retain\n\t/set start -retain\n\t/set feedback -retain\n\t/set mode -retain\n\nWeitere Einzelheiten zu diesen Befehlen - Beispiel: /help /set editor
+
+help.set.format.summary = Legt das Format zum Melden eines Snippet-Ereignisses fest
+
+help.set.format = Legt das Format zum Melden eines Snippet-Ereignisses fest:\n\n\t/set format <Modus> <Feld> "<Format>" <Selektor>...\n\nZeigt Formateinstellungen an:\n\n\t/set format [<Modus> [<Feld>]]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<Feld> ist der Name des zu definierenden kontextspezifischen Formats.\n<Format> ist eine in Anf\u00FChrungszeichen gesetzte Zeichenfolge, die zum Wert des Feldes wird, wenn einer der\nSelektoren \u00FCbereinstimmt (oder keine Selektoren vorhanden sind). Bei Verwendung dieses Formats\nwerden in geschweiften Klammern eingeschlossene Feldnamen durch den Wert des Feldes zu diesem\nZeitpunkt ersetzt. Diese Felder k\u00F6nnen zuvor mit diesem Befehl definiert worden sein oder k\u00F6nnen\neines der folgenden vordefinierten, kontextspezifischen Felder sein:\n\t{name}       == Der Name. Beispiel: Variablenname, ...\n\t{type}       == Der Typname. Der Typ einer Variablen oder eines Ausdrucks, die\n\t\t\tParametertypen einer Methode\n\t{value}      == Der Ergebniswert eines Ausdrucks oder einer Variableninitialisierung\n\t{unresolved} == Die Liste nicht aufgel\u00F6ster Referenzen\n\t{errors}     == Die Liste behebbarer Fehler (nur w\u00E4hrend der Verarbeitung\n\t\t\tdes Feldes "display")\n\t{err}        == Eine nicht formatierte Fehlerzeile (nur w\u00E4hrend der Verarbeitung\n\t\t\tdes Feldes "errorline")\nZur Bestimmung des angezeigten Feedbacks greift das Tool auf folgende Felder zu:\n\t{display}    == Die angezeigte Meldung f\u00FCr ein Snippet-Ereignis\n\t{errorline}  == Das Format einer Fehlerzeile im Feld "errors"\n\t{pre}        == Das Feedbackpr\u00E4fix (am Beginn des Befehlsfeedbacks)\n\t{post}       == Das Feedback-Postfix (am Ende des Befehlsfeedbacks)\n\t{errorpre}   == Das Fehlerpr\u00E4fix (am Beginn des Fehlerfeedbacks)\n\t{errorpost}  == Das Fehler-Postfix (am Ende des Fehlerfeedbacks)\nDiese Fehler haben Standardeinstellungen (die \u00FCberschrieben werden k\u00F6nnen).\nDabei gilt: <Selektor> ist der Kontext, in dem das Format angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt \u00FCberein, wenn jede Selektortypliste \u00FCbereinstimmt. Eine Selektortypliste\nstimmt \u00FCberein, wenn einer der Werte \u00FCbereinstimmt.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\timport     -- Importdeklaration\n\tclass      -- Klassendeklaration\n\tinterface  -- Schnittstellendeklaration\n\tenum       -- Enum-Deklaration\n\tannotation -- Annotationsschnittstellendeklaration\n\trecord     -- Datensatzdeklaration\n\tmethod     -- Methodendeklaration -- Hinweis: {type}==parameter-types\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\n\tstatement  -- Anweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugef\u00FCgt\n\tmodified  -- Ein vorhandenes Snippet wurde ge\u00E4ndert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\n\toverwrote -- Ein vorhandenes Snippet wurde \u00FCberschrieben\n\tdropped   -- Snippet wurde gel\u00F6scht\n\tused      -- Snippet wurde verwendet, wo es nicht zul\u00E4ssig war\nDer when-did-it-occur-Selektortyp beschreibt, ob es sich um eine direkte oder indirekte Aktion handelt. Die Werte lauten:\n\tprimary -- Das eingegebene Snippet\n\tupdate  -- Ein Update eines abh\u00E4ngigen Snippets\nDer resolution-state-Selektortyp beschreibt den Aufl\u00F6sungs-/Definitionsstatus des Snippets. Die Werte lauten:\n\tok         -- Korrekt aufgel\u00F6st\n\tdefined    -- Trotz \
+behebbarer nicht aufgel\u00F6ster Referenzen definiert\n\tnotdefined -- Aufgrund behebbarer nicht aufgel\u00F6ster Referenzen nicht definiert\nDer unresolved-count-Selektortyp beschreibt die Anzahl nicht aufgel\u00F6ster Referenzen. Die Werte lauten:\n\tunresolved0 -- Es sind keine nicht aufgel\u00F6sten Namen vorhanden\n\tunresolved1 -- Es ist ein nicht aufgel\u00F6ster Name vorhanden\n\tunresolved2 -- Es sind mindestens zwei nicht aufgel\u00F6ste Namen vorhanden\nDer errors-count-Selektortyp beschreibt die Anzahl der Fehler. Die Werte lauten:\n\terror0 -- Keine Fehler\n\terror1 -- Ein Fehler\n\terror2 -- Mindestens zwei Fehler\n\nBeispiele:\n\t/set format mymode action 'Erstellt' added-primary\n\t/set format mymode action 'Update ersetzt' replaced-update\n\t/set format mymode display '{pre}{action} Klasse {name}{post}' class-ok\n\t/set format mymode display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}' replaced-vardecl,varinit-ok-update\n\nNachfolgende Selektoren f\u00FCr ein Feld k\u00F6nnen einige oder alle zuvor verwendeten Selektoren \u00FCberschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <Format> werden die aktuellen Formateinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Formateinstellungen f\u00FCr diesen Modus angezeigt.\nBei Angabe von sowohl <Modus> als auch <Feld> werden nur die Formateinstellungen f\u00FCr\ndiesen Modus und dieses Feld angezeigt. Beispiel:\n\t/set format mymode\nzeigt die Formateinstellungen f\u00FCr den Modus "mymode" an\n
+
+help.set.truncation.summary = Legt die maximale L\u00E4nge eines angezeigten Wertes fest
+
+help.set.truncation = Legt die maximale L\u00E4nge eines angezeigten Wertes fest:\n\n\t/set truncation <Modus> <L\u00E4nge> <Selektor>...\n\nAktuelle Abschneideeinstellungen anzeigen:\n\n\t/set truncation [<Modus>]\n\nHier gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus - siehe "/help /set mode".\n<L\u00E4nge> ist eine Ganzzahl ohne Vorzeichen, die eine Maximall\u00E4nge angibt.\n<Selektor> ist nur erforderlich, wenn Sie die Abschneidel\u00E4nge des Wertes nach Kontext\noptimieren m\u00F6chten. In diesem Fall ist <Selektor> der Kontext, in dem das Abschneiden angewendet wird.\nDie Struktur des Selektors besteht aus einer durch Bindestriche getrennten Liste der Selektortyplisten.\nEine Selektortypliste ist eine durch Kommas getrennte Liste der Werte eines Selektortyps.\nEin Selektor stimmt \u00FCberein, wenn jede Selektortypliste \u00FCbereinstimmt. Eine Selektortypliste\nstimmt \u00FCberein, wenn einer der Werte \u00FCbereinstimmt.\n\nNachfolgend sind die entsprechenden Selektortypen f\u00FCr das Abschneiden aufgelistet.\n\nDer case-Selektortyp beschreibt die Art des Snippets. Die Werte lauten:\n\tvardecl    -- Variablendeklaration ohne Initialisierung\n\tvarinit    -- Variablendeklaration mit Initialisierung\n\texpression -- Ausdruck -- Hinweis: {name}==Scratch-Variablenname\n\tvarvalue   -- Variablenwertausdruck\n\tassignment -- Variablenzuweisung\nDer action-Selektortyp beschreibt, welcher Vorgang an dem Snippet vorgenommen wurde. Die Werte lauten:\n\tadded     -- Snippet wurde hinzugef\u00FCgt\n\tmodified  -- Ein vorhandenes Snippet wurde ge\u00E4ndert\n\treplaced  -- Ein vorhandenes Snippet wurde durch ein neues Snippet ersetzt\nBeispiele:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\nNachfolgende Selektoren f\u00FCr ein Feld k\u00F6nnen einige oder alle zuvor verwendeten Selektoren \u00FCberschreiben - "last one wins"-Prinzip\n\nBei fehlender Angabe von <L\u00E4nge> werden die Abschneideeinstellungen angezeigt.\nBei Angabe von <Modus> werden nur die Abschneideeinstellungen f\u00FCr diesen Modus angezeigt.\nBeispiel:\n\t/set truncation mymode\nZeigt die Abschneideeinstellungen f\u00FCr den Modus "mymode" an\n
+
+help.set.feedback.summary = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks f\u00FCr eingegebene Snippets und Befehle fest
+
+help.set.feedback = Legt den Feedbackmodus mit einer Beschreibung des angezeigten Feedbacks f\u00FCr eingegebene Snippets und Befehle fest:\n\n\t/set feedback [-retain] <Modus>\n\nBeh\u00E4lt den aktuellen Feedbackmodus f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set feedback -retain\n\nZeigt den Feedbackmodus an und listet verf\u00FCgbare Modi auf:\n\n\t/set feedback\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\nSie d\u00FCrfen nur gerade gen\u00FCgend Buchstaben verwenden, um den Namen eindeutig zu machen.\nBenutzerdefinierte Modi k\u00F6nnen hinzugef\u00FCgt werden, siehe "/help /set mode"\n\nBei Verwendung der -retain-Option wird diese Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Modus> oder -retain werden der aktuelle Feedbackmodus und verf\u00FCgbare Modi angezeigt.\n
+
+help.set.mode.summary = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus)
+
+help.set.mode = Erstellt einen benutzerdefinierten Feedbackmodus (optional durch Kopieren aus einem vorhandenen Modus):\n\n\t/set mode <neuer Modus> [<alter Modus>] (-command|-quiet)\n\nBeh\u00E4lt einen benutzerdefinierten Feedbackmodus f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set mode -retain <Modus>\n\nL\u00F6scht einen benutzerdefinierten Feedbackmodus:\n\n\t/set mode -delete [-retain] <Modus>\n\nZeigt Feedbackmoduseinstellungen an:\n\n\t/set mode [<Modus>]\n\nDabei gilt: <neuer Modus> ist der Name des zu erstellenden Modus.\n<alter Modus> ist der Name eines vorhandenen Feedbackmodus.\n<Modus> ist der Name eines vorhandenen Feedbackmodus.\n\nBei Angabe von <alter Modus> werden die zugeh\u00F6rigen Einstellungen in den neuen Modus kopiert.\n\nDas Feedback, das ein Modus f\u00FCr eingegebene Snippets bereitstellt, wird von den "/set format"-Einstellungen\nbestimmt. F\u00FCr eingegebene Befehle ist das Feedback dagegen entweder aktiviert oder deaktiviert.\nDies wird durch die beim Erstellen des Modus verwendete Option bestimmt. Es muss entweder die Option "-command"\noder die Option "-quiet" angegeben werden. Bei Verwendung von "-command" wird im neuen Modus informatives\nund best\u00E4tigendes Befehlsfeedback angezeigt. Bei Verwendung von "-quiet" wird bei Befehlen\nnur erforderliches Feedback angegeben (z.B. Fehler).\n\nNach dem Erstellen des neuen Modus k\u00F6nnen Sie diesen mit "/set format", "/set prompt und "/set truncation"\nkonfigurieren. Verwenden Sie "/set feedback", um den neuen Modus zu verwenden.\n\nBei Verwendung der Option "-retain" (ohne Option "-delete") wird der Modus (einschlie\u00DFlich\ndes aktuellen Prompts, Formats und der Abschneideeinstellungen) zur Verwendung in\nzuk\u00FCnftigen Ausf\u00FChrungen des JShell-Tools gespeichert. Wenn "-retain" nicht verwendet wird, wird der Modus nur in\nder aktuellen Session definiert. Verwenden Sie "-retain" nach dem Aktualisieren der Moduseinstellungen erneut,\num die Updates session\u00FCbergreifend beizubehalten.\n\nWenn nur die Option "-delete" verwendet wird, wird der Modus aus der aktuellen Session gel\u00F6scht.\nWenn sowohl "-retain" als auch "-delete" verwendet werden, wird der Modus aus der aktuellen und aus\nzuk\u00FCnftigen Sessions gel\u00F6scht.\n\nBei fehlender Angabe von Optionen werden die Moduseinstellungen angezeigt.\nBei Angabe des <Modus> werden nur die Moduseinstellungen f\u00FCr diesen Modus angezeigt.\nHinweis: Die Einstellungen f\u00FCr den Modus umfassen die Einstellungen f\u00FCr Prompt, Format und\nAbschneiden.\nBeispiel:\n\t/set mode mymode\n\nZeigt Modus, Prompt, Format und Abschneideeinstellungen f\u00FCr den Modus "mymode" an
+
+help.set.prompt.summary = Legt die Prompts fest
+
+help.set.prompt = Legt die Prompts fest. Es m\u00FCssen sowohl der normale als auch der Fortsetzungs-Prompt festgelegt werden:\n\n\t/set prompt <mode> "<Prompt>" "<Fortsetzungs-Prompt>"\n\nZeigt den normalen und den Fortsetzungs-Prompt an:\n\n\t/set prompt [<Modus>]\n\nDabei gilt: <Modus> ist der Name eines zuvor definierten Feedbackmodus.\n<Prompt> und <Fortsetzungs-Prompt> sind in Anf\u00FChrungszeichen gesetzte Zeichenfolgen, die als Eingabe-Prompts ausgegeben werden.\nOptional k\u00F6nnen beide "%%s" enthalten. Dies wird durch die n\u00E4chste Snippet-ID ersetzt.\nDer Eingabe wird unter Umst\u00E4nden keine ID zugewiesen, wenn es sich z.B. um einen Fehler oder Befehl handelt.\nDer Fortsetzungs-Prompt wird in einem mehrzeiligen Snippet in der zweiten und allen nachfolgenden Zeilen verwendet.\n\nBei fehlender Angabe von <Prompt> werden die aktuell festgelegten Prompts angezeigt.\nBei Angabe des <Modus> werden nur die Prompts f\u00FCr diesen Modus angezeigt.\nBeispiel:\n\t/set prompt mymode\nZeigt die f\u00FCr den Modus "mymode" festgelegten Prompts an\n
+
+help.set.editor.summary =Legt den mit dem /edit-Befehl zu startenden Befehl fest
+
+help.set.editor =Legt den mit dem /edit-Befehl zu startenden Befehl fest:\n\n\t/set editor [-retain] [-wait] <Befehl>\n\n\t/set editor [-retain] -default\n\n\t/set editor [-retain] -delete\n\nBeh\u00E4lt die aktuelle Editoreinstellung f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set editor -retain\n\nZeigt den mit dem /edit-Befehl zu startenden Befehl an:\n\n\t/set editor\n\nDer <Befehl> ist eine betriebssystemabh\u00E4ngige Zeichenfolge.\nDer <Befehl> kann durch Leerzeichen getrennte Argumente (z.B. Kennzeichen) enthalten\n\nBei Angabe der Option -default wird der integrierte Standardeditor verwendet.\n\nBei Angabe der Option -delete werden vorherige Einstellungen ignoriert - die Editoreinstellungen\nwerden wie beim Starten des JShell-Tools initialisiert. Insbesondere wird eine eventuell vorhandene\nbeibehaltene Einstellung verwendet (es sei denn, es werden sowohl -retain als auch -delete angegeben - \nin diesem Fall wird die beibehaltene Einstellung gel\u00F6scht). Ist eine der folgenden Umgebungsvariablen festgelegt,\nwird sie verwendet: JSHELLEDITOR, VISUAL oder EDITOR (in dieser Reihenfolge). Andernfalls\nwird der integrierte Standardeditor verwendet.\n\nBei Angabe von <Befehl> wird dieser als externer Editor verwendet. Der <Befehl>\nbesteht aus dem Programm und null oder mehr Programmargumenten. Bei Verwendung von <Befehl>\nwird die zu bearbeitende tempor\u00E4re Datei als letztes Argument angeh\u00E4ngt.\nNormalerweise wird der Bearbeitungsmodus fortgesetzt, bis der externe Editor beendet wird. Einige externe Editoren\nwerden umgehend beendet (z.B. wenn das Bearbeitungsfenster vorhanden ist). Es m\u00FCssen entweder Kennzeichen\nf\u00FCr externe Editoren verwendet werden, um ein umgehendes Beenden zu verhindern, oder die Option -wait muss\nverwendet werden, um den Benutzer zur Angabe aufzufordern, wann der Bearbeitungsmodus beendet werden soll.\n\nHinweis: Bei aktivem Bearbeitungsmodus werden keine Befehlseingaben angezeigt. Nach Beenden des Bearbeitungsmodus\nwerden keine \u00C4nderungen an den bearbeiteten Snippets angezeigt.\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Befehl> oder Optionen wird die Editoreinstellung angezeigt.\n
+
+help.set.start.summary =Legt die Startkonfiguration fest
+
+help.set.start =Legt die Startkonfiguration fest - eine Abfolge aus Snippets und Befehlen, die beim Hochfahren gelesen werden:\n\n\t/set start [-retain] <Datei>...\n\n\t/set start [-retain] -default\n\n\t/set start [-retain] -none\n\nBeh\u00E4lt die Startkonfiguration f\u00FCr zuk\u00FCnftige Sessions bei:\n\n\t/set start -retain\n\nZeigt die Starteinstellung an:\n\n\t/set start\n\nDer Inhalt der angegebenen <Datei> wird zu den verwendeten Start-Snippets und -befehlen,\nwenn die Befehle /reset, /reload oder /env in dieser Session verwendet werden.\nWird stattdessen die Option -default angegeben, werden die vordefinierten Startimport-\nSnippets verwendet.\nBei Verwendung der Option -none sind die Starteinstellungen leer - es werden keine\nStart-Snippets oder -befehle verwendet.\nDieser Befehl eignet sich gut zum Testen der Starteinstellungen. Um sie f\u00FCr zuk\u00FCnftige\nAusf\u00FChrungen des JShell-Tools beizubehalten, verwenden Sie den Befehl:\n\t/set start -retain\n\nBei Verwendung der Option -retain wird die Einstellung in dieser und zuk\u00FCnftigen\nAusf\u00FChrungen des JShell-Tools verwendet.\n\nBei fehlender Angabe von <Datei> oder Optionen werden die Starteinstellungen angezeigt.\nHinweis: Wenn der Start zuletzt von einer Datei festgelegt wurde, wird dies mit dem\nBefehl "set start" gefolgt vom Inhalt der Datei angezeigt.\n\nDie <Datei> kann der Name einer Betriebssystemdatei oder einer der vordefinierten\nStartdateinamen sein: DEFAULT, PRINTING oder JAVASE.\nHierbei handelt es sich jeweils um: die Standardimport-Snippets (wie von -default verwendet),\nDefinitionen der Methoden-Snippets print(), println() und printf() bzw.\nImporte aller Java SE-Packages.\nEs kann mehr als eine <Datei> angegeben werden. Beispiel:\n\n\t/set start -retain DEFAULT PRINTING
+
+help.set.indent.summary =Gibt die Anzahl der Leerzeichen zum Einr\u00FCcken der Snippets an
+
+help.set.indent =Gibt die Anzahl der Leerzeichen zum Einr\u00FCcken der Snippets an:\n\n\t/set indent <Anzahl>\n\nZeigt die Einzugseinstellung an:\n\n\t/set indent\n
+startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action 'Erstellt' added-primary    \n/set format verbose action 'Ge\u00E4ndert' modified-primary    \n/set format verbose action 'Ersetzt' replaced-primary    \n/set format verbose action '\u00DCberschrieben' overwrote-primary    \n/set format verbose action 'Gel\u00F6scht' dropped-primary    \n/set format verbose action '  Update erstellt' added-update    \n/set format verbose action '  Update ge\u00E4ndert' modified-update    \n/set format verbose action '  Update ersetzt' replaced-update    \n/set format verbose action '  Update \u00FCberschrieben' overwrote-update    \n/set format verbose action '  Update gel\u00F6scht' dropped-update    \n\n/set format verbose until ', Instanziierung oder Aufruf der zugeh\u00F6rigen Methoden ist jedoch nicht m\u00F6glich bis'   defined-class,record-primary    \n/set format verbose until ', Aufruf der zugeh\u00F6rigen Methoden ist jedoch nicht m\u00F6glich bis'                      defined-interface-primary    \n/set format verbose until ', Verwendung ist jedoch nicht m\u00F6glich bis'                                  defined-enum,annotation-primary    \n/set format verbose until ', Aufruf ist jedoch nicht m\u00F6glich bis'                               defined-method-primary    \n/set format verbose until ', Referenzierung ist jedoch nicht m\u00F6glich bis'                            notdefined-primary    \n/set format verbose until ' Instanziierung oder Aufruf der zugeh\u00F6rigen Methoden ist nicht m\u00F6glich bis'          defined-class,record-update    \n/set format verbose until ' Aufruf der zugeh\u00F6rigen Methoden ist nicht m\u00F6glich bis'                              defined-interface-update    \n/set format verbose until ' Aufruf ist nicht m\u00F6glich bis'                                      defined-method-update    \n/set format verbose until ' Referenzierung ist nicht m\u00F6glich bis'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved} ist deklariert'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved} sind deklariert'                                          unresolved2-error0    \n/set format verbose unrerr ' dieser Fehler ist behoben: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved} ist deklariert, und dieser Fehler ist behoben: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved} sind deklariert, und dieser Fehler ist behoben: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' diese Fehler sind behoben: {errors}'                              unresolved0-error2    \n/set format verbose unrerr '{unresolved} ist deklariert, und diese Fehler sind behoben: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved} sind deklariert, und diese Fehler sind behoben: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   defined,notdefined-added,modified,replaced,used    \n\n/set format verbose typeKind 'Klasse'                  class    \n/set format verbose typeKind 'Schnittstelle'              interface    \n/set format verbose typeKind 'Enum'                   enum    \n/set format verbose typeKind 'Annotationsschnittstelle'   annotation    \n/set format verbose typeKind 'Datensatz'                 record    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}Scratch-Variable {name} erstellt: {type}{post}'    \
+expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Wert von {name}: {type}{post}'                    varvalue-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}Zugewiesen zu {name}: {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} Variable {name}: {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} Variable {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} Variable {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation,record    \n/set format verbose display '{pre}{action} Methode {name}({type}){resolve}{post}'             method    \n\n/set format verbose display '{pre}Verwendung von {typeKind} {name} wurde versucht{resolve}{post}'         used-class,interface,enum,annotation,record    \n/set format verbose display '{pre}Aufruf der Methode {name} ({type}) wurde versucht{resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} Variable {name}, auf Null zur\u00FCckgesetzt{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{pre}{action} Variable {name}{resolve}{post}'                   replaced-vardecl,varinit-notdefined    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,record,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set truncation silent 80\n/set truncation silent 1000                                                                  varvalue,expression\n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
index 6e942910536..9ae0333fdea 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
@@ -179,8 +179,8 @@ jshell.console.empty = \n\u7A7A\u306E\u30A8\u30F3\u30C8\u30EA\u3002\u5358\u4E00\
 
 jshell.fix.wrong.shortcut =[Shift]+[Tab]\u306E\u5F8C\u306E\u6587\u5B57\u304C\u4E88\u671F\u3057\u306A\u3044\u6587\u5B57\u3067\u3059\u3002\n\u81EA\u52D5\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u306F"i"\u3001\u5909\u6570\u306E\u4F5C\u6210\u306B\u306F"v"\u3001\u30E1\u30BD\u30C3\u30C9\u306E\u4F5C\u6210\u306B\u306F"m"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u8A73\u7D30\u306F\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n/help shortcuts
 
-help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell <option>... <load-file>...\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n    --class-path <path>   \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --module-path <path>  \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --add-modules <module>(,<module>)*\n                           \u89E3\u6C7A\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<module>\u304CALL-MODULE-PATH\n                            \u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --enable-preview      \u30B3\u30FC\u30C9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --startup <file>      \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u307E\u3059\n    --no-startup          \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u307E\u305B\u3093\n    --feedback <mode>     \u521D\u671F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306F\n                            \u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B(silent\u3001concise\u3001normal\u307E\u305F\u306Fverbose)\u304B\u3001\n                            \u4E8B\u524D\u306B\u30E6\u30FC\u30B6\u30FC\u304C\u5B9A\u7FA9\u3067\u304D\u307E\u3059\n    -q                    \u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback concise\u3068\u540C\u3058\n    -s                    \u975E\u5E38\u306B\u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback silent\u3068\u540C\u3058\n    -v                    \u8A73\u7D30\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback verbose\u3068\u540C\u3058\n    -J<flag>              <flag>\u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3057\u307E\u3059\u3002\n                            \u5B9F\u884C\u6642\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-J\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -R<flag>              <flag>\u3092\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30EA\u30E2\u30FC\u30C8\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-R\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -C<flag>              <flag>\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-C\u3092\u4F7F\u7528\u3057\u307E\u3059\n    --version              \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --show-version        \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D9A\u884C\u3057\u307E\u3059\n    --help, -?, -h        \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3053\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --help-extra, -X      \
-\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n\n\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306B\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u540D(DEFAULT\u3001\nPRINTING\u307E\u305F\u306FJAVASE)\u306E1\u3064\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\nload-file\u3067\u3082\u3001\u5BFE\u8A71\u578BI/O\u3092\u4F7F\u7528\u305B\u305A\u306B\u3001"-"\u3092\u6307\u5B9A\u3057\u3066\u6A19\u6E96\u5165\u529B\u3092\u793A\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n\n\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(--class-path\u3001--module-path\u3001--add-modules)\u306E\n\u8A73\u7D30\u306F\u3001\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\t/help context\n\n\u30D1\u30B9\u306B\u306F\u3001\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3068\u30A2\u30FC\u30AB\u30A4\u30D6\u304C\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002Windows\u306E\u5834\u5408\u306F\u3001\n\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\n\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n
+help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell <option>... <load-file>...\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n    --class-path <path>   \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --module-path <path>  \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --add-modules <module>(,<module>)*\n                          \u89E3\u6C7A\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F<module>\u304CALL-MODULE-PATH\n                            \u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --enable-native-access\n                          \u30B3\u30FC\u30C9\u3067\u5236\u9650\u4ED8\u304D\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30E1\u30BD\u30C3\u30C9\u5B9F\u884C\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --enable-preview      \u30B3\u30FC\u30C9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n    --startup <file>      \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u307E\u3059\n    --no-startup          \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u307E\u305B\u3093\n    --feedback <mode>     \u521D\u671F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306F\n                            \u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B(silent\u3001concise\u3001normal\u307E\u305F\u306Fverbose)\u304B\u3001\n                            \u4E8B\u524D\u306B\u30E6\u30FC\u30B6\u30FC\u304C\u5B9A\u7FA9\u3067\u304D\u307E\u3059\n    -q                    \u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback concise\u3068\u540C\u3058\n    -s                   \u975E\u5E38\u306B\u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback silent\u3068\u540C\u3058\n    -v                     \u8A73\u7D30\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002--feedback verbose\u3068\u540C\u3058\n    -J<flag>               <flag>\u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3057\u307E\u3059\u3002\n                            \u5B9F\u884C\u6642\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-J\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -R<flag>               <flag>\u3092\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30EA\u30E2\u30FC\u30C8\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-R\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -C<flag>              <flag>\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u6E21\u3057\u307E\u3059\u3002\n                            \u30B3\u30F3\u30D1\u30A4\u30E9\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-C\u3092\u4F7F\u7528\u3057\u307E\u3059\n    --version             \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --show-version        \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3057\u7D9A\u884C\u3057\u307E\u3059\n    --help, -?, -h        \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3053\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n    --help-extra, -X      \
+\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3057\u307E\u3059\n\n\u30D5\u30A1\u30A4\u30EB\u5F15\u6570\u306B\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u304B\u3001\u307E\u305F\u306F\u4E8B\u524D\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u540D(DEFAULT\u3001\nPRINTING\u307E\u305F\u306FJAVASE)\u306E1\u3064\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\nload-file\u3067\u3082\u3001\u5BFE\u8A71\u578BI/O\u3092\u4F7F\u7528\u305B\u305A\u306B\u3001"-"\u3092\u6307\u5B9A\u3057\u3066\u6A19\u6E96\u5165\u529B\u3092\u793A\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n\n\u8A55\u4FA1\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3(--class-path\u3001--module-path\u3001\n--add-modules)\u306E\u8A73\u7D30\u306F\u3001\u6B21\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044:\n\t/help context\n\n\u30D1\u30B9\u306B\u306F\u3001\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3068\u30A2\u30FC\u30AB\u30A4\u30D6\u304C\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002Windows\u306E\u5834\u5408\u306F\u3001\n\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30B9\u306E\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306F\u3001\n\u30B3\u30ED\u30F3(:)\u3092\u4F7F\u7528\u3057\u3066\u9805\u76EE\u3092\u533A\u5207\u308A\u307E\u3059\u3002\n
 help.usage.x = \    --add-exports <module>/<package>   \u5B9A\u7FA9\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u308B\u3068\n                                         \u307F\u306A\u3055\u308C\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3057\u307E\u3059\n    --execution <spec>                 \u4EE3\u66FF\u5B9F\u884C\u30A8\u30F3\u30B8\u30F3\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                                         \u3053\u3053\u3067\u3001<spec>\u306FExecutionControl spec\u3067\u3059\u3002\n                                         spec\u306E\u69CB\u6587\u306B\u3064\u3044\u3066\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8jdk.jshell.spi\u306E\n                                         \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n    \n\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 help.list.summary = \u5165\u529B\u3057\u305F\u30BD\u30FC\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
index 168311a8100..92eaaaf4cf5 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
@@ -179,7 +179,7 @@ jshell.console.empty = \n\u7A7A\u6761\u76EE\u3002Shift+Tab m \u524D\u5FC5\u987B\
 
 jshell.fix.wrong.shortcut =Shift+Tab \u540E\u51FA\u73B0\u610F\u5916\u7684\u5B57\u7B26\u3002\n\u4F7F\u7528 "i" \u8868\u793A\u81EA\u52A8\u5BFC\u5165\uFF0C\u4F7F\u7528 "v" \u8868\u793A\u53D8\u91CF\u521B\u5EFA\uFF0C\u4F7F\u7528 "i" \u8868\u793A\u65B9\u6CD5\u521B\u5EFA\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u9605\uFF1A\n/help \u5FEB\u6377\u65B9\u5F0F
 
-help.usage = \u7528\u6CD5\uFF1A   jshell <\u9009\u9879>... <\u52A0\u8F7D\u6587\u4EF6>...\n\u5176\u4E2D\uFF0C\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC\uFF1A\n    --class-path <\u8DEF\u5F84>   \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n    --module-path <\u8DEF\u5F84>  \u6307\u5B9A\u67E5\u627E\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u4F4D\u7F6E\n    --add-modules <\u6A21\u5757>(,<\u6A21\u5757>)*\n                          \u6307\u5B9A\u8981\u89E3\u6790\u7684\u6A21\u5757\uFF1B\u5982\u679C <\u6A21\u5757> \n                          \u4E3A ALL-MODULE-PATH\uFF0C\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\n    --enable-preview      \u5141\u8BB8\u4EE3\u7801\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n    --startup <\u6587\u4EF6>      \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n    --no-startup          \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n    --feedback <\u6A21\u5F0F>     \u6307\u5B9A\u521D\u59CB\u53CD\u9988\u6A21\u5F0F\u3002\u8BE5\u6A21\u5F0F\u53EF\u4EE5\u662F\n                            \u9884\u5B9A\u4E49\u7684\uFF08silent\u3001concise\u3001normal \u6216 verbose\uFF09\uFF0C\n                            \u4E5F\u53EF\u662F\u4EE5\u524D\u7528\u6237\u5B9A\u4E49\u7684\n    -q                    \u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback concise\n    -s                    \u771F\u6B63\u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback silent\n    -v                    \u8BE6\u7EC6\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback verbose\n    -J<\u6807\u8BB0>              \u76F4\u63A5\u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FD0\u884C\u65F6\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -J\n    -R<\u6807\u8BB0>              \u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FDC\u7A0B\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FDC\u7A0B\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -R\n    -C<\u6807\u8BB0>              \u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u7F16\u8BD1\u5668\u3002\n                            \u4E3A\u6BCF\u4E2A\u7F16\u8BD1\u5668\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -C\n    --version             \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\n    --show-version        \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u7EE7\u7EED\n    --help, -?, -h        \u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u6B64\u63D0\u8981\u5E76\u9000\u51FA\n    --help-extra, -X      \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\u5E76\u9000\u51FA\n\n\u6587\u4EF6\u53C2\u6570\u53EF\u4EE5\u662F\u6587\u4EF6\u540D\uFF0C\u6216\u8005\u662F\u9884\u5B9A\u4E49\u7684\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001\nPRINTING \u6216 JAVASE\u3002\n\u52A0\u8F7D\u6587\u4EF6\u4E5F\u53EF\u4EE5\u662F "-"\uFF0C\u7528\u4E8E\u6307\u660E\u6807\u51C6\u8F93\u5165\uFF0C\u6CA1\u6709\u4EA4\u4E92\u5F0F I/O\u3002\n\n\u6709\u5173\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF08--class-path\u3001\n--module-path \u548C --add-modules\uFF09\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\t/help context\n\n\u8DEF\u5F84\u5217\u51FA\u8981\u641C\u7D22\u7684\u76EE\u5F55\u548C\u6863\u6848\u3002\u5BF9\u4E8E Windows\uFF0C\u8BF7\u4F7F\u7528\n\u5206\u53F7 (;) \u6765\u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u8BF7\u4F7F\u7528\n\u5192\u53F7 (:) \u6765\u5206\u9694\u5404\u9879\u3002\n
+help.usage = \u7528\u6CD5\uFF1A   jshell <option>... <load-file>...\n\u5176\u4E2D\uFF0C\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC\uFF1A\n    --class-path <path>   \u6307\u5B9A\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u67E5\u627E\u4F4D\u7F6E\n    --module-path <path>  \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u67E5\u627E\u4F4D\u7F6E\n    --add-modules <module>(,<module>)*\n                          \u6307\u5B9A\u8981\u89E3\u6790\u7684\u6A21\u5757\uFF1B\u5982\u679C \n                            <module> \u4E3A ALL-MODULE-PATHs\uFF0C\u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\n    --enable-native-access\n                          \u5141\u8BB8\u4EE3\u7801\u8FD0\u884C\u53D7\u9650\u7684\u672C\u673A\u65B9\u6CD5\n    --enable-preview      \u5141\u8BB8\u4EE3\u7801\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n    --startup <file>      \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n    --no-startup          \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n    --feedback <mode>     \u6307\u5B9A\u521D\u59CB\u53CD\u9988\u6A21\u5F0F\u3002\u8BE5\u6A21\u5F0F\u53EF\u4EE5\u662F\n                            \u9884\u5B9A\u4E49\u7684\uFF08silent\u3001concise\u3001normal \u6216 verbose\uFF09\uFF0C\n                            \u4E5F\u53EF\u4EE5\u662F\u7528\u6237\u5728\u4EE5\u524D\u5B9A\u4E49\u7684\n    -q                    \u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback concise\n    -s                    \u771F\u6B63\u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback silent\n    -v                    \u8BE6\u7EC6\u53CD\u9988\u3002\u7B49\u540C\u4E8E\uFF1A--feedback verbose\n    -J<flag>              \u76F4\u63A5\u5C06 <flag> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FD0\u884C\u65F6\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -J\n    -R<flag>              \u5C06 <flag> \u4F20\u9012\u5230\u8FDC\u7A0B\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                            \u4E3A\u6BCF\u4E2A\u8FDC\u7A0B\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -R\n    -C<flag>              \u5C06 <flag> \u4F20\u9012\u5230\u7F16\u8BD1\u5668\u3002\n                            \u4E3A\u6BCF\u4E2A\u7F16\u8BD1\u5668\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -C\n    --version             \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u9000\u51FA\n    --show-version        \u8F93\u51FA\u7248\u672C\u4FE1\u606F\u5E76\u7EE7\u7EED\n    --help, -?, -h        \u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u6B64\u63D0\u8981\u5E76\u9000\u51FA\n    --help-extra, -X      \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\u5E76\u9000\u51FA\n\n\u6587\u4EF6\u53C2\u6570\u53EF\u4EE5\u662F\u6587\u4EF6\u540D\uFF0C\u6216\u8005\u662F\u9884\u5B9A\u4E49\u7684\u6587\u4EF6\u540D\u4E4B\u4E00\uFF1ADEFAULT\u3001\nPRINTING \u6216 JAVASE\u3002\n\u52A0\u8F7D\u6587\u4EF6\u4E5F\u53EF\u4EE5\u662F "-"\uFF0C\u7528\u4E8E\u6307\u660E\u6807\u51C6\u8F93\u5165\uFF0C\u6CA1\u6709\u4EA4\u4E92\u5F0F I/O\u3002\n\n\u6709\u5173\u8BC4\u4F30\u4E0A\u4E0B\u6587\u9009\u9879\uFF08--class-path\u3001\n--module-path \u548C --add-modules\uFF09\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\uFF1A\n\t/help context\n\n\u8DEF\u5F84\u5217\u51FA\u8981\u641C\u7D22\u7684\u76EE\u5F55\u548C\u6863\u6848\u3002\u5BF9\u4E8E Windows\uFF0C\u8BF7\u4F7F\u7528\n\u5206\u53F7 (;) \u6765\u5206\u9694\u8DEF\u5F84\u4E2D\u7684\u9879\u3002\u5728\u5176\u4ED6\u5E73\u53F0\u4E0A\uFF0C\u8BF7\u4F7F\u7528\n\u5192\u53F7 (:) \u6765\u5206\u9694\u5404\u9879\u3002\n
 help.usage.x = \    --add-exports <\u6A21\u5757>/<\u7A0B\u5E8F\u5305>      \u6307\u5B9A\u8981\u8003\u8651\u4ECE\u5176\u5B9A\u4E49\u6A21\u5757\u5BFC\u51FA\n                                         \u7684\u7A0B\u5E8F\u5305\n    --execution <\u89C4\u8303>                 \u6307\u5B9A\u66FF\u4EE3\u6267\u884C\u5F15\u64CE\u3002\n                                         \u5176\u4E2D <\u89C4\u8303> \u662F ExecutionControl \u89C4\u8303\u3002\n                                         \u6709\u5173\u89C4\u8303\u7684\u8BED\u6CD5\uFF0C\u8BF7\u53C2\u9605\u7A0B\u5E8F\u5305\n                                         jdk.jshell.spi \u7684\u6587\u6863\n    \n\u8FD9\u4E9B\u9009\u9879\u662F\u975E\u6807\u51C6\u9009\u9879\uFF0C\u5982\u6709\u66F4\u6539\uFF0C\u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 help.list.summary = \u5217\u51FA\u60A8\u952E\u5165\u7684\u6E90
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
new file mode 100644
index 00000000000..9a20c08fefb
--- /dev/null
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_de.properties
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+jshell.diag.modifier.plural.fatal = Modifikatoren {0} nicht zul\u00E4ssig
+jshell.diag.modifier.plural.ignore = Modifikatoren {0} nicht zul\u00E4ssig, ignoriert
+jshell.diag.modifier.single.fatal = Modifikator {0} nicht zul\u00E4ssig
+jshell.diag.modifier.single.ignore = Modifikator {0} nicht zul\u00E4ssig, ignoriert
+jshell.diag.object.method.fatal = JShell-Methodennamen d\u00FCrfen nicht mit Objektmethoden \u00FCbereinstimmen: {0}
+
+jshell.exc.null = Snippet darf nicht Null sein
+jshell.exc.alien = Snippet stammt nicht aus dieser JShell-Instanz: {0}
+jshell.exc.closed = JShell ({0}) wurde geschlossen.
+jshell.exc.var.not.valid = Snippet-Parameter von varValue() {0} muss g\u00FCltig (VALID) sein. Er lautet: {1}
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
index 1c2ad607267..c2378cc5b9f 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
index 7ee702c4fef..fdf1b7f6128 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
+++ b/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
index d2d583d9252..b44ac5d7148 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,218 +60,225 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-#
-# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-#
 adp=Andorranische Pesete
-aed=UAE Dirham
+aed=VAE-Dirham
 afa=Afghani (1927-2002)
 afn=Afghani
-all=Lek
-amd=Dram
-ang=Niederl. Antillen Gulden
-aoa=Kwanza
+all=Albanischer Lek
+amd=Armenischer Dram
+ang=Gulden (Niederl\u00E4ndische Antillen)
+aoa=Kwanza (Angola)
 ars=Argentinischer Peso
-ats=\u00d6sterreichischer Schilling
-aud=Australischer Dollar
+ats=\u00D6sterreichischer Schilling
+aud=Australische Dollar
 awg=Aruba Florin
-azm=Aserbaidschan-Manat (1993-2006)
-azn=Aserbaidschan-Manat
-bam=Konvertierbare Mark
-bbd=Barbados-Dollar
-bdt=Taka
+azm=Aserbaidschainischer Manat (1993-2006)
+azn=Aserbaidschainischer Manat
+bam=Konvertible Mark (Bosnien und Herzegowina)
+bbd=Dollar (Barbados)
+bdt=Bangladeschischer Taka
 bef=Belgischer Franc
-bgl=Lew (1962-1999)
-bgn=Lew
+bgl=Bulgarischer Lew
+bgn=Bulgarischer Lew
 bhd=Bahrain-Dinar
 bif=Burundi-Franc
 bmd=Bermuda-Dollar
 bnd=Brunei-Dollar
-bob=Boliviano
-bov=Mvdol
-brl=Real
+bob=Bolivianischer Boliviano
+bov=Bolivianischer Mvdol
+brl=Brasilianischer Real
 bsd=Bahama-Dollar
-btn=Ngultrum
-bwp=Pula
-byb=Belarus Rubel (alt)
-byr=Belarus Rubel (neu)
+btn=Ngultrum (Bhutan)
+bwp=Botswanischer Pula
+byb=Wei\u00DFrussischer Rubel (1994-1999)
+byn=Wei\u00DFrussischer Rubel
+byr=Wei\u00DFrussischer Rubel (2000-2016)
 bzd=Belize-Dollar
 cad=Kanadischer Dollar
-cdf=Franc congolais
+cdf=Kongo-Franc
 chf=Schweizer Franken
-clf=Unidades de Fomento
+clf=Chilenische Unidad de Fomento (UF)
 clp=Chilenischer Peso
-cny=Renminbi Yuan
+cny=Chinesischer Yuan
 cop=Kolumbianischer Peso
-crc=Costa Rica Colon
-csd=Alter Serbischer Dinar
-cuc=Kubanischer Peso (konvertibel)
+crc=Costa-Rica-Col\u00F3n
+csd=Serbischer Dinar (2002-2006)
+cuc=Kubanischer konvertibler Peso
 cup=Kubanischer Peso
-cve=Kap Verde Escudo
+cve=Kap-Verde-Escudo
 cyp=Zypern-Pfund
-czk=Tschechische Krone
+czk=Tschechische Krone 
 dem=Deutsche Mark
 djf=Dschibuti-Franc
-dkk=D\u00e4nische Krone
+dkk=D\u00E4nische Krone
 dop=Dominikanischer Peso
 dzd=Algerischer Dinar
 eek=Estnische Krone
-egp=\u00c4gyptisches Pfund
-ern=Nakfa
-esp=Spanische Peseta
-etb=Birr
+egp=\u00C4gyptisches Pfund
+ern=Eritreischer Nakfa
+esp=Spanische Pesete
+etb=\u00C4thiopischer Birr
+eur=Euro
 fim=Finnische Mark
 fjd=Fidschi-Dollar
-fkp=Falkland-Pfund
-frf=Franz\u00f6sischer Franc
-gbp=Pfund Sterling
-gel=Georgischer Lari
-ghc=Cedi
-ghs=Ghanaische Cedi
+fkp=Falklandinseln-Pfund
+frf=Franz\u00F6sischer Franc
+gbp=Britisches Pfund
+gel=Georgische Lari
+ghc=Ghanaischer Cedi (1979-2007)
+ghs=Ghanaischer Cedi
 gip=Gibraltar-Pfund
-gmd=Dalasi
+gmd=Gambischer Dalasi
 gnf=Guinea-Franc
 grd=Griechische Drachme
-gtq=Quetzal
-gwp=Guinea Bissau Peso
+gtq=Guatemaltekischer Quetzal
+gwp=Guinea-Bissau-Peso
 gyd=Guyana-Dollar
 hkd=Hongkong-Dollar
-hnl=Lempira
+hnl=Honduranische Lempira
 hrk=Kuna
-htg=Gourde
-huf=Forint
-idr=Rupiah
+htg=Haitianische Gourde
+huf=Ungarischer Forint
+idr=Indonesische Rupiah
 iep=Irisches Pfund
-ils=Schekel
+ils=Neuer israelischer Schekel
 inr=Indische Rupie
-iqd=Irak Dinar
-irr=Rial
-isk=Isl\u00e4ndische Krone
-itl=Italienische Lira
-jmd=Jamaika-Dollar
+iqd=Irakischer Dinar
+irr=Iranischer Rial
+isk=Isl\u00E4ndische Krone
+itl=Italienische Lire
+jmd=Jamaikanischer Dollar
 jod=Jordanischer Dinar
-jpy=Yen
-kes=Kenia-Schilling
-kgs=Som
-khr=Riel
-kmf=Komoren Franc
+jpy=Japanischer Yen
+kes=Kenianischer Schilling
+kgs=Kirgisischer Som
+khr=Kambodschanischer Riel
+kmf=Komoren-Franc
 kpw=Nordkoreanischer Won
-krw=S\u00fcdkoreanischer Won
-kwd=Kuwait Dinar
+krw=S\u00FCdkoreanischer Won
+kwd=Kuwaitischer Dinar
 kyd=Kaiman-Dollar
-kzt=Tenge
-lak=Kip
+kzt=Kasachischer Tenge
+lak=Laotischer Kip
 lbp=Libanesisches Pfund
-lkr=Sri Lanka Rupie
+lkr=Sri-Lanka-Rupie
 lrd=Liberianischer Dollar
-lsl=Loti
-ltl=Litauischer Litas
+lsl=Lesothischer Loti
+ltl=Litauische Litas
 luf=Luxemburgischer Franc
-lvl=Lettischer Lats
+lvl=Lettische Lats
 lyd=Libyscher Dinar
 mad=Marokkanischer Dirham
-mdl=Moldau Leu
-mga=Madagaskar Ariary
+mdl=Moldova-Leu
+mga=Madagaskar-Ariary
 mgf=Madagaskar-Franc
-mkd=Denar
-mmk=Kyat
-mnt=Tugrik
-mop=Pataca
-mro=Ouguiya
-mtl=Maltesische Lira
+mkd=Mazedonischer Denar
+mmk=Myanmar-Kyat
+mnt=Mongolischer Tugrik
+mop=Macau-Pataca
+mro=Mauretanische Ouguiya
+mru=Mauretanische Ouguiya
+mtl=Maltesische Lire
 mur=Mauritius-Rupie
-mvr=Rufiyaa
-mwk=Malawi Kwacha
+mvr=Rufiyaa (Malediven)
+mwk=Malawi-Kwacha
 mxn=Mexikanischer Peso
-mxv=Mexican Unidad de Inversion (UDI)
+mxv=Unidad De Inversion (Mexiko)
 myr=Malaysischer Ringgit
-mzm=Alter Metical
-mzn=Metical
-nad=Namibia-Dollar
-ngn=Naira
-nio=Gold-Cordoba
-nlg=Holl\u00e4ndischer Gulden
+mzm=Mosambikanischer Metical (1980-2006)
+mzn=Mosambikanischer Metical
+nad=Namibischer Dollar
+ngn=Nigerianische Naira
+nio=C\u00F3rdoba Oro
+nlg=Niederl\u00E4ndischer Gulden
 nok=Norwegische Krone
 npr=Nepalesische Rupie
-nzd=Neuseeland-Dollar
-omr=Rial Omani
-pab=Balboa
-pen=Neuer Sol
-pgk=Kina
+nzd=Neuseel\u00E4ndischer Dollar
+omr=Omani-Rial
+pab=Panamaischer Balboa
+pen=Peruanischer Sol
+pgk=Kina (Papua-Neuguinea)
 php=Philippinischer Peso
 pkr=Pakistanische Rupie
-pln=Zloty
-pte=Portugiesischer Escudo
-pyg=Guarani
-qar=Katar Riyal
-rol=Leu
-ron=Rum\u00e4nischer Leu
+pln=Polnischer Zloty
+pte=Portuguiesischer Escudo
+pyg=Paraguayischer Guarani
+qar=Katar-Riyal
+rol=Rum\u00E4nischer Leu (1952-2006)
+ron=Rum\u00E4nischer Leu
 rsd=Serbischer Dinar
-rub=Russischer Rubel (neu)
-rur=Russischer Rubel (alt)
+rub=Russischer Rubel
+rur=Russischer Rubel (1991-1998)
 rwf=Ruanda-Franc
-sar=Saudi-Rial
+sar=Saudischer Rial
 sbd=Salomonen-Dollar
 scr=Seychellen-Rupie
-sdd=Sudanesischer Dinar
+sdd=Sudanesischer Dinar (1992-2007)
 sdg=Sudanesisches Pfund
 sek=Schwedische Krone
 sgd=Singapur-Dollar
-shp=St. Helena Pfund
-sit=Tolar
+shp=St. Helena-Pfund
+sit=Slowenischer Tolar
 skk=Slowakische Krone
-sll=Leone
-sos=Somalia-Schilling
-srd=Surinamischer Dollar
-srg=Suriname Gulden
-std=Dobra
-svc=El Salvador Colon
+sll=Sierra-leonischer Leone
+sos=Somalischer Schilling
+srd=Suriname-Dollar
+srg=Suriname-Gulden
+ssp=S\u00FCdsudanesisches Pfund
+std=Dobra (S\u00E3o Tom\u00E9 und Pr\u00EDncipe)
+stn=Dobra (S\u00E3o Tom\u00E9 und Pr\u00EDncipe)
+svc=El-Salvador-Col\u00F3n
 syp=Syrisches Pfund
-szl=Lilangeni
-thb=Baht
-tjs=Tadschikistan Somoni
-tmm=Turkmenistan-Manat
-tmt=Neuer Turkmenistan-Manat
+szl=Lilangeni (Swasiland)
+thb=Thail\u00E4ndischer Baht
+tjs=Somoni (Tadschikistan)
+tmm=Turkmenistan-Manat (1993-2009)
+tmt=Turkmenistan-Manat
 tnd=Tunesischer Dinar
-top=Pa\u02bbanga
-tpe=Timor-Escudo
-trl=Alte T\u00fcrkische Lira
-try=T\u00fcrkische Lira
-ttd=Trinidad- und Tobago-Dollar
-twd=Neuer Taiwan-Dollar
+top=Pa'anga (Tonga)
+tpe=Escudo (Portugiesisch-Timor)
+trl=T\u00FCrkische Lira (1922-2005)
+try=T\u00FCrkische Lira
+ttd=Trinidad/Tobago-Dollar
+twd=Neu-Taiwan Dollar
 tzs=Tansania-Schilling
-uah=Hryvnia
+uah=Ukrainische Hrywnja
 ugx=Uganda-Schilling
 usd=US-Dollar
-usn=US Dollar (N\u00e4chster Tag)
-uss=US Dollar (Gleicher Tag)
-uyu=Uruguayischer Peso
-uzs=Usbekistan Sum
-veb=Bolivar
-vef=Bol\u00edvar Fuerte
-vnd=Dong
-vuv=Vatu
-wst=Tala
-xaf=CFA Franc (\u00c4quatorial)
-xag=Unze Silber
-xau=Unze Gold
-xba=Europ\u00e4ische Rechnungseinheit
-xbb=Europ\u00e4ische W\u00e4hrungseinheit (XBB)
-xbc=Europ\u00e4ische Rechnungseinheit (XBC)
-xbd=Europ\u00e4ische Rechnungseinheit (XBD)
-xcd=Ostkaribischer Dollar
+usn=US-Dollar (n\u00E4chster Tag)
+uss=US-Dollar (gleicher Tag)
+uyu=Peso
+uzs=Usbekistan-Sum
+veb=Venezolanischer Bol\u00EDvar (1871-2008)
+ved=Venezolanischer Bol\u00EDvar
+vef=Venezolanischer Bol\u00EDvar Fuerte
+ves=Venezolanischer Bol\u00EDvar
+vnd=Vietnamesischer Dong
+vuv=Vanuatu-Vatu
+wst=Samoanischer Tala
+xaf=CFA-Franc BEAC
+xag=Silber
+xau=Gold
+xba=European Composite Unit
+xbb=European Monetary Unit
+xbc=Europ\u00E4ische Rechnungseinheit (XBC)
+xbd=Europ\u00E4ische Rechnungseinheit (XBD)
+xcd=Dollar, Ostkaribik
 xdr=Sonderziehungsrechte
-xfo=Franz\u00f6sischer Gold-Franc
-xfu=Franz\u00f6sischer UIC-Franc
-xof=CFA Franc (West)
-xpd=Unze Palladium
+xfo=Franz\u00F6sischer Goldfranken
+xfu=Franz\u00F6sischer UIC-Franc
+xof=CFA-Franc BCEAO
+xpd=Palladium
 xpf=CFP-Franc
-xpt=Unze Platin
-xts=Testw\u00e4hrung
-xxx=Unbekannte W\u00e4hrung
+xpt=Platin
+xsu=Sucre
+xts=Testw\u00E4hrungscode
+xua=ADB Unit of Account
+xxx=Unbekannte W\u00E4hrung
 yer=Jemen-Rial
-yum=Neuer Dinar
-zar=S\u00fcdafrikanischer Rand
-zmk=Kwacha
-zwd=Simbabwe-Dollar
+yum=Neuer jugoslawischer Dinar (1994-2002)
+zar=S\u00FCdafrikanischer Rand
+zmk=Sambischer Kwacha
+zwd=Simbabwe-Dollar (1980-2008)
 zwl=Simbabwe-Dollar (2009)
+zwr=Simbabwe-Dollar (2008)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
index 96f527d3e49..ee71a9eb17d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,219 +60,225 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-#
-# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-#
-adp=\u30a2\u30f3\u30c9\u30e9 \u30da\u30bb\u30bf
-aed=UAE \u30c7\u30a3\u30eb\u30cf\u30e0
-afa=\u30a2\u30d5\u30ac\u30cb\u30fc (1927-2002)
-afn=\u30a2\u30d5\u30ac\u30cb\u30fc
-all=\u30a2\u30eb\u30d0\u30cb\u30a2 \u30ec\u30af
-amd=\u30a2\u30eb\u30e1\u30cb\u30a2 \u30c9\u30e9\u30e0
-ang=\u30aa\u30e9\u30f3\u30c0\u9818\u30a2\u30f3\u30c6\u30a3\u30eb \u30ae\u30eb\u30c0\u30fc
-aoa=\u30af\u30ef\u30f3\u30b6
-ars=\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3 \u30da\u30bd
-ats=\u30aa\u30fc\u30b9\u30c8\u30ea\u30a2 \u30b7\u30ea\u30f3\u30b0
-aud=\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2 \u30c9\u30eb
-awg=\u30a2\u30eb\u30d0 \u30ae\u30eb\u30c0\u30fc
-azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8 (1993-2006)
-azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8
-bam=\u30dc\u30b9\u30cb\u30a2 \u30de\u30eb\u30af (BAM)
-bbd=\u30d0\u30eb\u30d0\u30c9\u30b9 \u30c9\u30eb
-bdt=\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5 \u30bf\u30ab
-bef=\u30d9\u30eb\u30ae\u30fc \u30d5\u30e9\u30f3
-bgl=\u30d6\u30eb\u30ac\u30ea\u30a2 \u30ec\u30d5
-bgn=\u30d6\u30eb\u30ac\u30ea\u30a2 \u65b0\u30ec\u30d5
-bhd=\u30d0\u30fc\u30ec\u30fc\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
-bif=\u30d6\u30eb\u30f3\u30b8 \u30d5\u30e9\u30f3
-bmd=\u30d0\u30df\u30e5\u30fc\u30c0 \u30c9\u30eb
-bnd=\u30d6\u30eb\u30cd\u30a4 \u30c9\u30eb
-bob=\u30dc\u30ea\u30d3\u30a2\u30fc\u30ce
-bov=\u30dc\u30ea\u30d3\u30a2 Mvdol
-brl=\u30d6\u30e9\u30b8\u30eb \u30ec\u30a2\u30eb
-bsd=\u30d0\u30cf\u30de \u30c9\u30eb
-btn=\u30d6\u30fc\u30bf\u30f3 \u30cb\u30e5\u30eb\u30bf\u30e0
-bwp=\u30dc\u30c4\u30ef\u30ca \u30d7\u30e9
-byb=\u30d9\u30e9\u30eb\u30fc\u30b7 \u30eb\u30fc\u30d6\u30eb (1994-1999)
-byr=\u30d9\u30e9\u30eb\u30fc\u30b7 \u30eb\u30fc\u30d6\u30eb
-bzd=\u30d9\u30ea\u30fc\u30ba \u30c9\u30eb
-cad=\u30ab\u30ca\u30c0 \u30c9\u30eb
-cdf=\u30b3\u30f3\u30b4 \u30d5\u30e9\u30f3
-chf=\u30b9\u30a4\u30b9 \u30d5\u30e9\u30f3
-clf=\u30c1\u30ea \u30a6\u30cb\u30c0 \u30c7 \u30d5\u30a9\u30e1\u30f3\u30c8
-clp=\u30c1\u30ea \u30da\u30bd
-cny=\u4e2d\u56fd\u4eba\u6c11\u5143
-cop=\u30b3\u30ed\u30f3\u30d3\u30a2 \u30da\u30bd
-crc=\u30b3\u30b9\u30bf\u30ea\u30ab \u30b3\u30ed\u30f3
-csd=\u30bb\u30eb\u30d3\u30a2\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
-cuc=\u30ad\u30e5\u30fc\u30d0 \u514c\u63db\u30da\u30bd
-cup=\u30ad\u30e5\u30fc\u30d0 \u30da\u30bd
-cve=\u30ab\u30fc\u30dc\u30d9\u30eb\u30c7 \u30a8\u30b9\u30af\u30fc\u30c9
-cyp=\u30ad\u30d7\u30ed\u30b9 \u30dd\u30f3\u30c9
-czk=\u30c1\u30a7\u30b3 \u30b3\u30eb\u30ca
-dem=\u30c9\u30a4\u30c4 \u30de\u30eb\u30af
-djf=\u30b8\u30d6\u30c1 \u30d5\u30e9\u30f3
-dkk=\u30c7\u30f3\u30de\u30fc\u30af \u30af\u30ed\u30fc\u30cd
-dop=\u30c9\u30df\u30cb\u30ab \u30da\u30bd
-dzd=\u30a2\u30eb\u30b8\u30a7\u30ea\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
-eek=\u30a8\u30b9\u30c8\u30cb\u30a2 \u30af\u30eb\u30fc\u30f3
-egp=\u30a8\u30b8\u30d7\u30c8 \u30dd\u30f3\u30c9
-ern=\u30a8\u30ea\u30c8\u30ea\u30a2 \u30ca\u30af\u30d5\u30a1
-esp=\u30b9\u30da\u30a4\u30f3 \u30da\u30bb\u30bf
-etb=\u30a8\u30c1\u30aa\u30d4\u30a2 \u30d6\u30eb
-eur=\u30e6\u30fc\u30ed
-fim=\u30d5\u30a3\u30f3\u30e9\u30f3\u30c9 \u30de\u30eb\u30ab
-fjd=\u30d5\u30a3\u30b8\u30fc\u8af8\u5cf6 \u30c9\u30eb
-fkp=\u30d5\u30a9\u30fc\u30af\u30e9\u30f3\u30c9\uff08\u30de\u30eb\u30d3\u30ca\u30b9\uff09\u8af8\u5cf6 \u30dd\u30f3\u30c9
-frf=\u30d5\u30e9\u30f3\u30b9 \u30d5\u30e9\u30f3
-gbp=\u82f1\u56fd\u30dd\u30f3\u30c9
-gel=\u30b0\u30eb\u30b8\u30a2 \u30e9\u30ea
-ghc=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3 (1979-2007)
-ghs=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3
-gip=\u30b8\u30d6\u30e9\u30eb\u30bf\u30eb \u30dd\u30f3\u30c9
-gmd=\u30ac\u30f3\u30d3\u30a2 \u30c0\u30e9\u30b7
-gnf=\u30ae\u30cb\u30a2 \u30d5\u30e9\u30f3
-grd=\u30ae\u30ea\u30b7\u30e3 \u30c9\u30e9\u30af\u30de
-gtq=\u30b0\u30a2\u30c6\u30de\u30e9 \u30b1\u30c4\u30a1\u30eb
-gwp=\u30ae\u30cb\u30a2\u30d3\u30b5\u30a6 \u30da\u30bd
-gyd=\u30ac\u30a4\u30a2\u30ca \u30c9\u30eb
-hkd=\u9999\u6e2f\u30c9\u30eb
-hnl=\u30db\u30f3\u30b8\u30e5\u30e9\u30b9 \u30ec\u30f3\u30d4\u30e9
-hrk=\u30af\u30ed\u30a2\u30c1\u30a2 \u30af\u30fc\u30ca
-htg=\u30cf\u30a4\u30c1 \u30b0\u30fc\u30eb\u30c9
-huf=\u30cf\u30f3\u30ac\u30ea\u30fc \u30d5\u30a9\u30ea\u30f3\u30c8
-idr=\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2 \u30eb\u30d4\u30a2
-iep=\u30a2\u30a4\u30ea\u30c3\u30b7\u30e5 \u30dd\u30f3\u30c9
-ils=\u30a4\u30b9\u30e9\u30a8\u30eb\u65b0\u30b7\u30a7\u30b1\u30eb
-inr=\u30a4\u30f3\u30c9 \u30eb\u30d4\u30fc
-iqd=\u30a4\u30e9\u30af \u30c7\u30a3\u30ca\u30fc\u30eb
-irr=\u30a4\u30e9\u30f3 \u30ea\u30a2\u30eb
-isk=\u30a2\u30a4\u30b9\u30e9\u30f3\u30c9 \u30af\u30ed\u30fc\u30ca
-itl=\u30a4\u30bf\u30ea\u30a2 \u30ea\u30e9
-jmd=\u30b8\u30e3\u30de\u30a4\u30ab \u30c9\u30eb
-jod=\u30e8\u30eb\u30c0\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
-jpy=\u65e5\u672c\u5186
-kes=\u30b1\u30cb\u30a2 \u30b7\u30ea\u30f3\u30b0
-kgs=\u30ad\u30eb\u30ae\u30b9\u30bf\u30f3 \u30bd\u30e0
-khr=\u30ab\u30f3\u30dc\u30b8\u30a2 \u30ea\u30a8\u30eb
-kmf=\u30b3\u30e2\u30ed \u30d5\u30e9\u30f3
-kpw=\u5317\u671d\u9bae \u30a6\u30a9\u30f3
-krw=\u97d3\u56fd \u30a6\u30a9\u30f3
-kwd=\u30af\u30a6\u30a7\u30fc\u30c8 \u30c7\u30a3\u30ca\u30fc\u30eb
-kyd=\u30b1\u30a4\u30de\u30f3\u8af8\u5cf6 \u30c9\u30eb
-kzt=\u30ab\u30b6\u30d5\u30b9\u30bf\u30f3 \u30c6\u30f3\u30b2
-lak=\u30e9\u30aa\u30b9 \u30ad\u30fc\u30d7
-lbp=\u30ec\u30d0\u30ce\u30f3 \u30dd\u30f3\u30c9
-lkr=\u30b9\u30ea\u30e9\u30f3\u30ab \u30eb\u30d4\u30fc
-lrd=\u30ea\u30d9\u30ea\u30a2 \u30c9\u30eb
-lsl=\u30ec\u30bd\u30c8 \u30ed\u30c6\u30a3
-ltl=\u30ea\u30c8\u30a2\u30cb\u30a2 \u30ea\u30bf\u30b9
-luf=\u30eb\u30af\u30bb\u30f3\u30d6\u30eb\u30b0 \u30d5\u30e9\u30f3
-lvl=\u30e9\u30c8\u30d3\u30a2 \u30e9\u30c3\u30c4
-lyd=\u30ea\u30d3\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
-mad=\u30e2\u30ed\u30c3\u30b3 \u30c7\u30a3\u30eb\u30cf\u30e0
-mdl=\u30e2\u30eb\u30c9\u30d0 \u30ec\u30a4
-mga=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb \u30a2\u30ea\u30a2\u30ea
-mgf=\u30de\u30c0\u30ac\u30b9\u30ab\u30eb \u30d5\u30e9\u30f3
-mkd=\u30de\u30b1\u30c9\u30cb\u30a2 \u30c7\u30ca\u30eb
-mmk=\u30df\u30e3\u30f3\u30de\u30fc \u30c1\u30e3\u30c3\u30c8
-mnt=\u30e2\u30f3\u30b4\u30eb \u30c8\u30b0\u30ed\u30b0
-mop=\u30de\u30ab\u30aa \u30d1\u30bf\u30ab
-mro=\u30e2\u30fc\u30ea\u30bf\u30cb\u30a2 \u30a6\u30ae\u30a2
-mtl=\u30de\u30eb\u30bf \u30ea\u30e9
-mur=\u30e2\u30fc\u30ea\u30b7\u30e3\u30b9 \u30eb\u30d4\u30fc
-mvr=\u30e2\u30eb\u30c7\u30a3\u30d6\u8af8\u5cf6 \u30eb\u30d5\u30a3\u30a2
-mwk=\u30de\u30e9\u30a6\u30a3 \u30af\u30ef\u30c1\u30e3
-mxn=\u30e1\u30ad\u30b7\u30b3 \u30da\u30bd
-mxv=\u30e1\u30ad\u30b7\u30b3 UDI
-myr=\u30de\u30ec\u30fc\u30b7\u30a2 \u30ea\u30f3\u30ae\u30c3\u30c8
-mzm=\u30e2\u30b6\u30f3\u30d4\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
-mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
-nad=\u30ca\u30df\u30d3\u30a2 \u30c9\u30eb
-ngn=\u30ca\u30a4\u30b8\u30a7\u30ea\u30a2 \u30ca\u30a4\u30e9
-nio=\u30cb\u30ab\u30e9\u30b0\u30a2 \u30b3\u30eb\u30c9\u30d0 \u30aa\u30ed
-nlg=\u30aa\u30e9\u30f3\u30c0 \u30ae\u30eb\u30c0\u30fc
-nok=\u30ce\u30eb\u30a6\u30a7\u30fc \u30af\u30ed\u30fc\u30cd
-npr=\u30cd\u30d1\u30fc\u30eb \u30eb\u30d4\u30fc
-nzd=\u30cb\u30e5\u30fc\u30b8\u30fc\u30e9\u30f3\u30c9 \u30c9\u30eb
-omr=\u30aa\u30de\u30fc\u30f3 \u30ea\u30a2\u30eb
-pab=\u30d1\u30ca\u30de \u30d0\u30eb\u30dc\u30a2
-pen=\u30da\u30eb\u30fc \u65b0\u30bd\u30eb
-pgk=\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2 \u30ad\u30ca
-php=\u30d5\u30a3\u30ea\u30d4\u30f3 \u30da\u30bd
-pkr=\u30d1\u30ad\u30b9\u30bf\u30f3 \u30eb\u30d4\u30fc
-pln=\u30dd\u30fc\u30e9\u30f3\u30c9 \u30ba\u30a6\u30a9\u30c6\u30a3
-pte=\u30dd\u30eb\u30c8\u30ac\u30eb \u30a8\u30b9\u30af\u30fc\u30c9
-pyg=\u30d1\u30e9\u30b0\u30a2\u30a4 \u30b0\u30a2\u30e9\u30cb
-qar=\u30ab\u30bf\u30fc\u30eb \u30ea\u30a2\u30eb
-rol=\u30eb\u30fc\u30de\u30cb\u30a2 \u65e7\u30ec\u30a4
-ron=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4
-rsd=\u30c7\u30a3\u30ca\u30fc\u30eb (\u30bb\u30eb\u30d3\u30a2)
-rub=\u30ed\u30b7\u30a2 \u30eb\u30fc\u30d6\u30eb
-rur=\u30ed\u30b7\u30a2 \u30eb\u30fc\u30d6\u30eb (1991-1998)
-rwf=\u30eb\u30ef\u30f3\u30c0 \u30d5\u30e9\u30f3
-sar=\u30b5\u30a6\u30b8 \u30ea\u30e4\u30eb
-sbd=\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6 \u30c9\u30eb
-scr=\u30bb\u30a4\u30b7\u30a7\u30eb \u30eb\u30d4\u30fc
-sdd=\u30b9\u30fc\u30c0\u30f3 \u30c7\u30a3\u30ca\u30fc\u30eb
-sdg=\u30b9\u30fc\u30c0\u30f3 \u30dd\u30f3\u30c9
-sek=\u30b9\u30a6\u30a7\u30fc\u30c7\u30f3 \u30af\u30ed\u30fc\u30ca
-sgd=\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb \u30c9\u30eb
-shp=\u30bb\u30f3\u30c8\u30d8\u30ec\u30ca\u5cf6 \u30dd\u30f3\u30c9
-sit=\u30b9\u30ed\u30d9\u30cb\u30a2 \u30c8\u30e9\u30fc\u30eb
-skk=\u30b9\u30ed\u30d0\u30ad\u30a2 \u30b3\u30eb\u30ca
-sll=\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd \u30ec\u30aa\u30f3
-sos=\u30bd\u30de\u30ea\u30a2 \u30b7\u30ea\u30f3\u30b0
-srd=\u30b9\u30ea\u30ca\u30e0 \u30c9\u30eb
-srg=\u30b9\u30ea\u30ca\u30e0 \u30ae\u30eb\u30c0\u30fc
-std=\u30b5\u30f3\u30c8\u30e1\u30fb\u30d7\u30ea\u30f3\u30b7\u30da \u30c9\u30d6\u30e9
-svc=\u30a8\u30eb\u30b5\u30eb\u30d0\u30c9\u30eb \u30b3\u30ed\u30f3
-syp=\u30b7\u30ea\u30a2 \u30dd\u30f3\u30c9
-szl=\u30b9\u30ef\u30b8\u30e9\u30f3\u30c9 \u30ea\u30e9\u30f3\u30b2\u30cb
-thb=\u30bf\u30a4 \u30d0\u30fc\u30c4
-tjs=\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3 \u30bd\u30e2\u30cb
-tmm=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3 \u30de\u30ca\u30c8
-tmt=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3 \u65b0\u30de\u30ca\u30c8
-tnd=\u30c1\u30e5\u30cb\u30b8\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
-top=\u30c8\u30f3\u30ac \u30d1\u30fb\u30a2\u30f3\u30ac
-tpe=\u30c6\u30a3\u30e2\u30fc\u30eb \u30a8\u30b9\u30af\u30fc\u30c9
-trl=\u30c8\u30eb\u30b3 \u30ea\u30e9
-try=\u65b0\u30c8\u30eb\u30b3\u30ea\u30e9
-ttd=\u30c8\u30ea\u30cb\u30c0\u30fc\u30c9\u30c8\u30d0\u30b4 \u30c9\u30eb
-twd=\u65b0\u53f0\u6e7e\u30c9\u30eb
-tzs=\u30bf\u30f3\u30b6\u30cb\u30a2 \u30b7\u30ea\u30f3\u30b0
-uah=\u30a6\u30af\u30e9\u30a4\u30ca \u30b0\u30ea\u30d6\u30ca
-ugx=\u30a6\u30ac\u30f3\u30c0 \u30b7\u30ea\u30f3\u30b0
-usd=\u7c73\u30c9\u30eb
-usn=\u7c73\u30c9\u30eb (\u7fcc\u65e5)
-uss=\u7c73\u30c9\u30eb (\u5f53\u65e5)
-uyu=\u30a6\u30eb\u30b0\u30a2\u30a4 \u30da\u30bd
-uzs=\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3 \u30b9\u30e0
-veb=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb
-vef=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb\u30d5\u30a8\u30eb\u30c6
-vnd=\u30d9\u30c8\u30ca\u30e0 \u30c9\u30f3
-vuv=\u30d0\u30cc\u30a2\u30c4 \u30d0\u30c4
-wst=\u897f\u30b5\u30e2\u30a2 \u30bf\u30e9
-xaf=CFA \u30d5\u30e9\u30f3 BEAC
+adp=\u30A2\u30F3\u30C9\u30E9\u30FB\u30DA\u30BB\u30BF
+aed=\u30A2\u30E9\u30D6\u9996\u9577\u56FD\u9023\u90A6\u30C7\u30A3\u30EB\u30CF\u30E0
+afa=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u30FB\u30A2\u30D5\u30AC\u30CB\u30FC(1927-2002)
+afn=\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u30FB\u30A2\u30D5\u30AC\u30CB\u30FC
+all=\u30A2\u30EB\u30D0\u30CB\u30A2\u30FB\u30EC\u30AF
+amd=\u30A2\u30EB\u30E1\u30CB\u30A2\u30FB\u30C9\u30E9\u30E0
+ang=\u30AA\u30E9\u30F3\u30C0\u9818\u30A2\u30F3\u30C6\u30A3\u30EB\u30FB\u30AE\u30EB\u30C0\u30FC
+aoa=\u30A2\u30F3\u30B4\u30E9\u30FB\u30AF\u30EF\u30F3\u30B6
+ars=\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u30FB\u30DA\u30BD
+ats=\u30AA\u30FC\u30B9\u30C8\u30EA\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
+aud=\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2\u30FB\u30C9\u30EB
+awg=\u30A2\u30EB\u30D0\u30FB\u30D5\u30ED\u30FC\u30EA\u30F3
+azm=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u30FB\u30DE\u30CA\u30C8(1993-2006)
+azn=\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u30FB\u30DE\u30CA\u30C8
+bam=\u30DC\u30B9\u30CB\u30A2\u30FB\u30D8\u30EB\u30C4\u30A7\u30B4\u30D3\u30CA\u514C\u63DB\u30DE\u30EB\u30AF
+bbd=\u30D0\u30EB\u30D0\u30C9\u30B9\u30FB\u30C9\u30EB
+bdt=\u30D0\u30F3\u30B0\u30E9\u30C7\u30B7\u30E5\u30FB\u30BF\u30AB
+bef=\u30D9\u30EB\u30AE\u30FC\u30FB\u30D5\u30E9\u30F3
+bgl=\u30D6\u30EB\u30AC\u30EA\u30A2\u30FB\u30CF\u30FC\u30C9\u30FB\u30EC\u30D5
+bgn=\u30D6\u30EB\u30AC\u30EA\u30A2\u65B0\u30EC\u30D5
+bhd=\u30D0\u30FC\u30EC\u30FC\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+bif=\u30D6\u30EB\u30F3\u30B8\u30FB\u30D5\u30E9\u30F3
+bmd=\u30D0\u30EB\u30DF\u30E5\u30FC\u30C0\u30FB\u30C9\u30EB
+bnd=\u30D6\u30EB\u30CD\u30A4\u30FB\u30C9\u30EB
+bob=\u30DC\u30EA\u30D3\u30A2\u30FB\u30DC\u30EA\u30D3\u30A2\u30FC\u30CE
+bov=\u30DC\u30EA\u30D3\u30A2Mvdol
+brl=\u30D6\u30E9\u30B8\u30EB\u30FB\u30EC\u30A2\u30EB
+bsd=\u30D0\u30CF\u30DE\u30FB\u30C9\u30EB
+btn=\u30D6\u30FC\u30BF\u30F3\u30FB\u30CB\u30E5\u30EB\u30BF\u30E0
+bwp=\u30DC\u30C4\u30EF\u30CA\u30FB\u30D7\u30E9
+byb=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB(1994-1999)
+byn=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB
+byr=\u30D9\u30E9\u30EB\u30FC\u30B7\u30FB\u30EB\u30FC\u30D6\u30EB(2000-2016)
+bzd=\u30D9\u30EA\u30FC\u30BA\u30FB\u30C9\u30EB
+cad=\u30AB\u30CA\u30C0\u30FB\u30C9\u30EB
+cdf=\u30B3\u30F3\u30B4\u30FB\u30D5\u30E9\u30F3
+chf=\u30B9\u30A4\u30B9\u30FB\u30D5\u30E9\u30F3
+clf=\u30C1\u30EA\u8A08\u7B97\u5358\u4F4D(UF)
+clp=\u30C1\u30EA\u30FB\u30DA\u30BD
+cny=\u4E2D\u56FD\u4EBA\u6C11\u5143
+cop=\u30B3\u30ED\u30F3\u30D3\u30A2\u30FB\u30DA\u30BD
+crc=\u30B3\u30B9\u30BF\u30EA\u30AB\u30FB\u30B3\u30ED\u30F3
+csd=\u30BB\u30EB\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB(2002-2006)
+cuc=\u30AD\u30E5\u30FC\u30D0\u514C\u63DB\u30DA\u30BD
+cup=\u30AD\u30E5\u30FC\u30D0\u30FB\u30DA\u30BD
+cve=\u30AB\u30FC\u30DC\u30D9\u30EB\u30C7\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
+cyp=\u30AD\u30D7\u30ED\u30B9\u30FB\u30DD\u30F3\u30C9
+czk=\u30C1\u30A7\u30B3\u5171\u548C\u56FD\u30B3\u30EB\u30CA
+dem=\u30C9\u30A4\u30C4\u30FB\u30DE\u30EB\u30AF
+djf=\u30B8\u30D6\u30C1\u30FB\u30D5\u30E9\u30F3
+dkk=\u30C7\u30F3\u30DE\u30FC\u30AF\u30FB\u30AF\u30ED\u30FC\u30CD
+dop=\u30C9\u30DF\u30CB\u30AB\u30FB\u30DA\u30BD
+dzd=\u30A2\u30EB\u30B8\u30A7\u30EA\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+eek=\u30A8\u30B9\u30C8\u30CB\u30A2\u30FB\u30AF\u30EB\u30FC\u30F3
+egp=\u30A8\u30B8\u30D7\u30C8\u30FB\u30DD\u30F3\u30C9
+ern=\u30A8\u30EA\u30C8\u30EA\u30A2\u30FB\u30CA\u30AF\u30D5\u30A1
+esp=\u30B9\u30DA\u30A4\u30F3\u30FB\u30DA\u30BB\u30BF
+etb=\u30A8\u30C1\u30AA\u30D4\u30A2\u30FB\u30D6\u30EB
+eur=\u30E6\u30FC\u30ED
+fim=\u30D5\u30A3\u30F3\u30E9\u30F3\u30C9\u30FB\u30DE\u30EB\u30AB
+fjd=\u30D5\u30A3\u30B8\u30FC\u30FB\u30C9\u30EB
+fkp=\u30D5\u30A9\u30FC\u30AF\u30E9\u30F3\u30C9\u8AF8\u5CF6\u30DD\u30F3\u30C9
+frf=\u30D5\u30E9\u30F3\u30B9\u30FB\u30D5\u30E9\u30F3
+gbp=\u82F1\u30DD\u30F3\u30C9
+gel=\u30B8\u30E7\u30FC\u30B8\u30A2\u30FB\u30E9\u30EA
+ghc=\u30AC\u30FC\u30CA\u30FB\u30BB\u30C7\u30A3(1979-2007)
+ghs=\u30AC\u30FC\u30CA\u30FB\u30BB\u30C7\u30A3
+gip=\u30B8\u30D6\u30E9\u30EB\u30BF\u30EB\u30FB\u30DD\u30F3\u30C9
+gmd=\u30AC\u30F3\u30D3\u30A2\u30FB\u30C0\u30E9\u30B7
+gnf=\u30AE\u30CB\u30A2\u30FB\u30D5\u30E9\u30F3
+grd=\u30AE\u30EA\u30B7\u30E3\u30FB\u30C9\u30E9\u30AF\u30DE
+gtq=\u30B0\u30A2\u30C6\u30DE\u30E9\u30FB\u30B1\u30C4\u30A1\u30EB
+gwp=\u30AE\u30CB\u30A2\u30D3\u30B5\u30A6\u30FB\u30DA\u30BD
+gyd=\u30AC\u30A4\u30A2\u30CA\u30FB\u30C9\u30EB
+hkd=\u9999\u6E2F\u30C9\u30EB
+hnl=\u30DB\u30F3\u30B8\u30E5\u30E9\u30B9\u30FB\u30EC\u30F3\u30D4\u30E9
+hrk=\u30AF\u30FC\u30CA
+htg=\u30CF\u30A4\u30C1\u30FB\u30B0\u30FC\u30EB\u30C9
+huf=\u30CF\u30F3\u30AC\u30EA\u30FC\u30FB\u30D5\u30A9\u30EA\u30F3\u30C8
+idr=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u30FB\u30EB\u30D4\u30A2
+iep=\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u30FB\u30DD\u30F3\u30C9
+ils=\u30A4\u30B9\u30E9\u30A8\u30EB\u65B0\u30B7\u30A7\u30B1\u30EB
+inr=\u30A4\u30F3\u30C9\u30FB\u30EB\u30D4\u30FC
+iqd=\u30A4\u30E9\u30AF\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+irr=\u30A4\u30E9\u30F3\u30FB\u30EA\u30A2\u30EB
+isk=\u30A2\u30A4\u30B9\u30E9\u30F3\u30C9\u30FB\u30AF\u30ED\u30FC\u30CA
+itl=\u30A4\u30BF\u30EA\u30A2\u30FB\u30EA\u30E9
+jmd=\u30B8\u30E3\u30DE\u30A4\u30AB\u30FB\u30C9\u30EB
+jod=\u30E8\u30EB\u30C0\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+jpy=\u65E5\u672C\u5186
+kes=\u30B1\u30CB\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
+kgs=\u30AD\u30EB\u30AE\u30B9\u30FB\u30BD\u30E0
+khr=\u30AB\u30F3\u30DC\u30B8\u30A2\u30FB\u30EA\u30A8\u30EB
+kmf=\u30B3\u30E2\u30ED\u30FB\u30D5\u30E9\u30F3
+kpw=\u5317\u671D\u9BAE\u30A6\u30A9\u30F3
+krw=\u97D3\u56FD\u30A6\u30A9\u30F3
+kwd=\u30AF\u30A6\u30A7\u30FC\u30C8\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+kyd=\u30B1\u30A4\u30DE\u30F3\u8AF8\u5CF6\u30C9\u30EB
+kzt=\u30AB\u30B6\u30D5\u30B9\u30BF\u30F3\u30FB\u30C6\u30F3\u30B2
+lak=\u30E9\u30AA\u30B9\u30FB\u30AD\u30FC\u30D7
+lbp=\u30EC\u30D0\u30CE\u30F3\u30FB\u30DD\u30F3\u30C9
+lkr=\u30B9\u30EA\u30E9\u30F3\u30AB\u30FB\u30EB\u30D4\u30FC
+lrd=\u30EA\u30D9\u30EA\u30A2\u30FB\u30C9\u30EB
+lsl=\u30EC\u30BD\u30C8\u30FB\u30ED\u30C6\u30A3
+ltl=\u30EA\u30C8\u30A2\u30CB\u30A2\u30FB\u30EA\u30BF\u30B9
+luf=\u30EB\u30AF\u30BB\u30F3\u30D6\u30EB\u30AF\u30FB\u30D5\u30E9\u30F3
+lvl=\u30E9\u30C8\u30D3\u30A2\u30FB\u30E9\u30C3\u30C4
+lyd=\u30EA\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+mad=\u30E2\u30ED\u30C3\u30B3\u30FB\u30C7\u30A3\u30EB\u30CF\u30E0
+mdl=\u30E2\u30EB\u30C9\u30D0\u30FB\u30EC\u30A4
+mga=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u30FB\u30A2\u30EA\u30A2\u30EA
+mgf=\u30DE\u30C0\u30AC\u30B9\u30AB\u30EB\u30FB\u30D5\u30E9\u30F3
+mkd=\u30DE\u30B1\u30C9\u30CB\u30A2\u30FB\u30C7\u30CA\u30EB
+mmk=\u30DF\u30E3\u30F3\u30DE\u30FC\u30FB\u30C1\u30E3\u30C3\u30C8
+mnt=\u30E2\u30F3\u30B4\u30EB\u30FB\u30C8\u30B0\u30ED\u30B0
+mop=\u30DE\u30AB\u30AA\u30FB\u30D1\u30BF\u30AB
+mro=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2\u30FB\u30A6\u30AE\u30A2
+mru=\u30E2\u30FC\u30EA\u30BF\u30CB\u30A2\u30FB\u30A6\u30AE\u30A2
+mtl=\u30DE\u30EB\u30BF\u30FB\u30EA\u30E9
+mur=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u30FB\u30EB\u30D4\u30FC
+mvr=\u30E2\u30EB\u30B8\u30D6\u30FB\u30EB\u30D5\u30A3\u30A2
+mwk=\u30DE\u30E9\u30A6\u30A3\u30A2\u30F3\u30FB\u30DE\u30E9\u30A6\u30A4\u30FB\u30AF\u30EF\u30C1\u30E3
+mxn=\u30E1\u30AD\u30B7\u30B3\u30FB\u30DA\u30BD
+mxv=\u30E1\u30AD\u30B7\u30B3\u6295\u8CC7\u5358\u4F4D
+myr=\u30DE\u30EC\u30FC\u30B7\u30A2\u30FB\u30EA\u30F3\u30AE\u30C3\u30C8
+mzm=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u30FB\u30E1\u30C6\u30A3\u30AB\u30EB(1980-2006)
+mzn=\u30E2\u30B6\u30F3\u30D3\u30FC\u30AF\u30FB\u30E1\u30C6\u30A3\u30AB\u30EB
+nad=\u30CA\u30DF\u30D3\u30A2\u30FB\u30C9\u30EB
+ngn=\u30CA\u30A4\u30B8\u30A7\u30EA\u30A2\u30FB\u30CA\u30A4\u30E9
+nio=\u30CB\u30AB\u30E9\u30B0\u30A2\u30FB\u30B3\u30EB\u30C9\u30D0
+nlg=\u30AA\u30E9\u30F3\u30C0\u30FB\u30AE\u30EB\u30C0\u30FC
+nok=\u30CE\u30EB\u30A6\u30A7\u30FC\u30FB\u30AF\u30ED\u30FC\u30CD
+npr=\u30CD\u30D1\u30FC\u30EB\u30FB\u30EB\u30D4\u30FC
+nzd=\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9\u30FB\u30C9\u30EB
+omr=\u30AA\u30DE\u30FC\u30F3\u30FB\u30EA\u30A2\u30EB
+pab=\u30D1\u30CA\u30DE\u30FB\u30D0\u30EB\u30DC\u30A2
+pen=\u30DA\u30EB\u30FC\u30FB\u30BD\u30EB
+pgk=\u30D1\u30D7\u30A2\u30CB\u30E5\u30FC\u30AE\u30CB\u30A2\u30FB\u30AD\u30CA
+php=\u30D5\u30A3\u30EA\u30D4\u30F3\u30FB\u30DA\u30BD
+pkr=\u30D1\u30AD\u30B9\u30BF\u30F3\u30FB\u30EB\u30D4\u30FC
+pln=\u30DD\u30FC\u30E9\u30F3\u30C9\u30FB\u30BA\u30ED\u30C1
+pte=\u30DD\u30EB\u30C8\u30AC\u30EB\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
+pyg=\u30D1\u30E9\u30B0\u30A2\u30A4\u30FB\u30B0\u30A2\u30E9\u30CB\u30FC
+qar=\u30AB\u30BF\u30FC\u30EB\u30FB\u30EA\u30A2\u30EB
+rol=\u30EB\u30FC\u30DE\u30CB\u30A2\u30FB\u30EC\u30A4(1952-2006)
+ron=\u30EB\u30FC\u30DE\u30CB\u30A2\u30FB\u30EC\u30A4
+rsd=\u30BB\u30EB\u30D3\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+rub=\u30ED\u30B7\u30A2\u30FB\u30EB\u30FC\u30D6\u30EB
+rur=\u30ED\u30B7\u30A2\u30FB\u30EB\u30FC\u30D6\u30EB(1991-1998)
+rwf=\u30EB\u30EF\u30F3\u30C0\u30FB\u30D5\u30E9\u30F3
+sar=\u30B5\u30A6\u30B8\u30FB\u30EA\u30E4\u30EB
+sbd=\u30BD\u30ED\u30E2\u30F3\u8AF8\u5CF6\u30C9\u30EB
+scr=\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u30FB\u30EB\u30D4\u30FC
+sdd=\u30B9\u30FC\u30C0\u30F3\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB(1992-2007)
+sdg=\u30B9\u30FC\u30C0\u30F3\u30FB\u30DD\u30F3\u30C9
+sek=\u30B9\u30A6\u30A7\u30FC\u30C7\u30F3\u30FB\u30AF\u30ED\u30FC\u30CA
+sgd=\u30B7\u30F3\u30AC\u30DD\u30FC\u30EB\u30FB\u30C9\u30EB
+shp=\u30BB\u30F3\u30C8\u30D8\u30EC\u30CA\u30FB\u30DD\u30F3\u30C9
+sit=\u30B9\u30ED\u30D9\u30CB\u30A2\u30FB\u30C8\u30E9\u30FC\u30EB
+skk=\u30B9\u30ED\u30D0\u30AD\u30A2\u30FB\u30B3\u30EB\u30CA
+sll=\u30B7\u30A8\u30E9\u30EC\u30AA\u30CD\u30FB\u30EC\u30AA\u30F3
+sos=\u30BD\u30DE\u30EA\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
+srd=\u30B9\u30EA\u30CA\u30E0\u30FB\u30C9\u30EB
+srg=\u30B9\u30EA\u30CA\u30E0\u30FB\u30AE\u30EB\u30C0\u30FC
+ssp=\u5357\u30B9\u30FC\u30C0\u30F3\u30FB\u30DD\u30F3\u30C9
+std=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA\u30FB\u30C9\u30D6\u30E9
+stn=\u30B5\u30F3\u30C8\u30E1\u30FB\u30D7\u30EA\u30F3\u30B7\u30DA\u30FB\u30C9\u30D6\u30E9
+svc=\u30A8\u30EB\u30B5\u30EB\u30D0\u30C9\u30EB\u30FB\u30B3\u30ED\u30F3
+syp=\u30B7\u30EA\u30A2\u30FB\u30DD\u30F3\u30C9
+szl=\u30B9\u30EF\u30B8\u30E9\u30F3\u30C9\u30FB\u30EA\u30E9\u30F3\u30B8\u30A7\u30CB
+thb=\u30BF\u30A4\u30FB\u30D0\u30FC\u30C4
+tjs=\u30BF\u30B8\u30AD\u30B9\u30BF\u30F3\u30FB\u30BD\u30E2\u30CB
+tmm=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u30FB\u30DE\u30CA\u30C8(1993-2009)
+tmt=\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u30FB\u30DE\u30CA\u30C8
+tnd=\u30C1\u30E5\u30CB\u30B8\u30A2\u30FB\u30C7\u30A3\u30CA\u30FC\u30EB
+top=\u30C8\u30F3\u30AC\u30FB\u30D1\u30FB\u30A2\u30F3\u30AC
+tpe=\u30C6\u30A3\u30E2\u30FC\u30EB\u30FB\u30A8\u30B9\u30AF\u30FC\u30C9
+trl=\u30C8\u30EB\u30B3\u30EA\u30E9(1922-2005)
+try=\u30C8\u30EB\u30B3\u30FB\u30EA\u30E9
+ttd=\u30C8\u30EA\u30CB\u30C0\u30FC\u30C9\u30FB\u30C8\u30D0\u30B4\u30FB\u30C9\u30EB
+twd=\u65B0\u53F0\u6E7E\u30C9\u30EB
+tzs=\u30BF\u30F3\u30B6\u30CB\u30A2\u30FB\u30B7\u30EA\u30F3\u30B0
+uah=\u30A6\u30AF\u30E9\u30A4\u30CA\u30FB\u30B0\u30EA\u30D6\u30CA
+ugx=\u30A6\u30AC\u30F3\u30C0\u30FB\u30B7\u30EA\u30F3\u30B0
+usd=US\u30C9\u30EB
+usn=US\u30C9\u30EB(\u7FCC\u65E5)
+uss=US\u30C9\u30EB(\u540C\u65E5)
+uyu=\u30A6\u30EB\u30B0\u30A2\u30A4\u30FB\u30DA\u30BD
+uzs=\u30A6\u30BA\u30D9\u30AD\u30B9\u30BF\u30F3\u30FB\u30BD\u30E0
+veb=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB(1871-2008)
+ved=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB\u30FB\u30BD\u30D9\u30E9\u30CE
+vef=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB
+ves=\u30D9\u30CD\u30BA\u30A8\u30E9\u30FB\u30DC\u30EA\u30D0\u30EB\u30FB\u30BD\u30D9\u30E9\u30CE
+vnd=\u30D9\u30C8\u30CA\u30E0\u30FB\u30C9\u30F3
+vuv=\u30D0\u30CC\u30A2\u30C4\u30FB\u30D0\u30C4
+wst=\u30B5\u30E2\u30A2\u30FB\u30BF\u30E9
+xaf=CFA\u30D5\u30E9\u30F3BEAC
 xag=\u9280
-xau=\u91d1
-xba=\u30e8\u30fc\u30ed\u30c3\u30d1\u6df7\u5408\u5358\u4f4d (EURCO)
-xbb=\u30e8\u30fc\u30ed\u30c3\u30d1\u901a\u8ca8\u5358\u4f4d (EMU-6)
-xbc=\u30e8\u30fc\u30ed\u30c3\u30d1\u52d8\u5b9a\u5358\u4f4d (EUA-9)
-xbd=\u30e8\u30fc\u30ed\u30c3\u30d1\u52d8\u5b9a\u5358\u4f4d (EUA-17)
-xcd=\u6771\u30ab\u30ea\u30d6 \u30c9\u30eb
-xdr=\u7279\u5225\u5f15\u304d\u51fa\u3057\u6a29
-xfo=\u30d5\u30e9\u30f3\u30b9\u91d1\u30d5\u30e9\u30f3
-xfu=\u30d5\u30e9\u30f3\u30b9 UIC \u30d5\u30e9\u30f3
-xof=CFA \u30d5\u30e9\u30f3 BCEAO
-xpd=\u30d1\u30e9\u30b8\u30a6\u30e0
-xpf=CFP \u30d5\u30e9\u30f3
-xpt=\u30d7\u30e9\u30c1\u30ca
-xts=\u30c6\u30b9\u30c8\u7528\u901a\u8ca8\u30b3\u30fc\u30c9
-xxx=\u4e0d\u660e\u307e\u305f\u306f\u7121\u52b9\u306a\u901a\u8ca8
-yer=\u30a4\u30a8\u30e1\u30f3 \u30ea\u30a2\u30eb
-yum=\u30e6\u30fc\u30b4\u30b9\u30e9\u30d3\u30a2 \u30b9\u30fc\u30d1\u30fc \u30c7\u30a3\u30ca\u30fc\u30eb
-zar=\u5357\u30a2\u30d5\u30ea\u30ab \u30e9\u30f3\u30c9
-zmk=\u30b6\u30f3\u30d3\u30a2 \u30af\u30ef\u30c1\u30e3
-zwd=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb
-zwl=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb (2009)
+xau=\u91D1
+xba=\u6B27\u5DDE\u901A\u8CA8\u6DF7\u5408\u5358\u4F4D
+xbb=\u6B27\u5DDE\u901A\u8CA8\u8A08\u7B97\u5358\u4F4D
+xbc=\u6B27\u5DDE\u8A08\u7B97\u5358\u4F4D(XBC)
+xbd=\u6B27\u5DDE\u8A08\u7B97\u5358\u4F4D(XBD)
+xcd=\u6771\u30AB\u30EA\u30D6EC\u30C9\u30EB
+xdr=\u7279\u5225\u5F15\u51FA\u6A29
+xfo=\u30D5\u30E9\u30F3\u30B9\u91D1\u30D5\u30E9\u30F3
+xfu=\u30D5\u30E9\u30F3\u30B9UIC\u30D5\u30E9\u30F3
+xof=CFA\u30D5\u30E9\u30F3BCEAO
+xpd=\u30D1\u30E9\u30B8\u30A6\u30E0
+xpf=CFP\u30D5\u30E9\u30F3
+xpt=\u30D7\u30E9\u30C1\u30CA
+xsu=\u30B9\u30AF\u30EC
+xts=\u30C6\u30B9\u30C8\u901A\u8CA8\u30B3\u30FC\u30C9
+xua=ADB\u8A08\u7B97\u5358\u4F4D
+xxx=\u4E0D\u660E\u306A\u901A\u8CA8
+yer=\u30A4\u30A8\u30E1\u30F3\u30FB\u30EA\u30A2\u30EB
+yum=\u30E6\u30FC\u30B4\u30B9\u30E9\u30D3\u30A2\u65B0\u30C7\u30A3\u30CA\u30FC\u30EB(1994-2002)
+zar=\u5357\u30A2\u30D5\u30EA\u30AB\u30FB\u30E9\u30F3\u30C9
+zmk=\u30B6\u30F3\u30D3\u30A2\u30FB\u30AF\u30EF\u30C1\u30E3
+zwd=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(1980-2008)
+zwl=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(2009)
+zwr=\u30B8\u30F3\u30D0\u30D6\u30A8\u30FB\u30C9\u30EB(2008)
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
index b197882202b..fd6524a38f8 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #
 # COPYRIGHT AND PERMISSION NOTICE
 #
-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -60,220 +60,226 @@
 # or other dealings in these Data Files or Software without prior
 # written authorization of the copyright holder.
 
-#
-# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-#
 CNY=\uffe5
-cny=\u4eba\u6c11\u5e01
-adp=\u5b89\u9053\u5c14\u6bd4\u585e\u5854
-aed=\u963f\u8054\u914b\u8fea\u62c9\u59c6
-afa=\u963f\u5bcc\u6c57\u5c3c (1927-2002)
-afn=\u963f\u5bcc\u6c57\u5c3c
-all=\u963f\u5c14\u5df4\u5c3c\u4e9a\u5217\u514b
-amd=\u4e9a\u7f8e\u5c3c\u4e9a\u5fb7\u62c9\u59c6
-ang=\u8377\u5170\u5b89\u66ff\u5170\u76fe
-aoa=\u5b89\u54e5\u62c9\u5bbd\u624e
-ars=\u963f\u6839\u5ef7\u6bd4\u7d22
-ats=\u5965\u5730\u5229\u5148\u4ee4
-aud=\u6fb3\u5927\u5229\u4e9a\u5143
-awg=\u963f\u9c81\u5df4\u57fa\u5c14\u5fb7\u5143
-azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279 (1993-2006)
-azn=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
-bam=\u6ce2\u58eb\u5c3c\u4e9a-\u8d6b\u585e\u54e5\u7ef4\u7eb3\u5151\u6362\u5238
-bbd=\u5df4\u5df4\u591a\u65af\u5143
-bdt=\u5b5f\u52a0\u62c9\u5854\u5361
-bef=\u6bd4\u5229\u65f6\u6cd5\u90ce
-bgl=\u4fdd\u52a0\u5229\u4e9a\u786c\u5217\u5f17
-bgn=\u4fdd\u52a0\u5229\u4e9a\u65b0\u5217\u5f17
-bhd=\u5df4\u6797\u7b2c\u7eb3\u5c14
-bif=\u5e03\u9686\u8fea\u6cd5\u90ce
-bmd=\u767e\u6155\u5927\u5143
-bnd=\u6587\u83b1\u5143
-bob=\u73bb\u5229\u7ef4\u4e9a\u8bfa
-bov=\u73bb\u5229\u7ef4\u4e9a Mvdol\uff08\u8d44\u91d1\uff09
-brl=\u5df4\u897f\u96f7\u4e9a\u5c14
-bsd=\u5df4\u54c8\u9a6c\u5143
-btn=\u4e0d\u4e39\u52aa\u624e\u59c6
-bwp=\u535a\u8328\u74e6\u7eb3\u666e\u62c9
-byb=\u767d\u4fc4\u7f57\u65af\u65b0\u5362\u5e03 (1994-1999)
-byr=\u767d\u4fc4\u7f57\u65af\u5362\u5e03
-bzd=\u4f2f\u5229\u5179\u5143
-cad=\u52a0\u62ff\u5927\u5143
-cdf=\u521a\u679c\u6cd5\u90ce
-chf=\u745e\u58eb\u6cd5\u90ce
-clf=\u667a\u5229 Unidades de Fomento\uff08\u8d44\u91d1\uff09
-clp=\u667a\u5229\u6bd4\u7d22
-cop=\u54e5\u4f26\u6bd4\u4e9a\u6bd4\u7d22
-crc=\u54e5\u65af\u8fbe\u9ece\u52a0\u79d1\u6717
-csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
-cuc=\u53e4\u5df4\u53ef\u5151\u6362\u6bd4\u7d22
-cup=\u53e4\u5df4\u6bd4\u7d22
-cve=\u4f5b\u5f97\u89d2\u57c3\u65af\u5e93\u591a
-cyp=\u585e\u6d66\u8def\u65af\u9551
-czk=\u6377\u514b\u514b\u90ce
-dem=\u5fb7\u56fd\u9a6c\u514b
-djf=\u5409\u5e03\u63d0\u6cd5\u90ce
-dkk=\u4e39\u9ea6\u514b\u6717
-dop=\u591a\u7c73\u5c3c\u52a0\u6bd4\u7d22
-dzd=\u963f\u5c14\u53ca\u5229\u4e9a\u7b2c\u7eb3\u5c14
-eek=\u7231\u6c99\u5c3c\u4e9a\u514b\u6717
-egp=\u57c3\u53ca\u9551
-ern=\u5384\u7acb\u7279\u91cc\u4e9a\u7eb3\u514b\u6cd5
-esp=\u897f\u73ed\u7259\u6bd4\u585e\u5854
-etb=\u57c3\u585e\u4fc4\u6bd4\u4e9a\u6bd4\u5c14
-eur=\u6b27\u5143
-fim=\u82ac\u5170\u9a6c\u514b
-fjd=\u6590\u6d4e\u5143
-fkp=\u798f\u514b\u5170\u9551
-frf=\u6cd5\u56fd\u6cd5\u90ce
-gbp=\u82f1\u9551
-gel=\u4e54\u6cbb\u4e9a\u62c9\u745e
-ghc=\u52a0\u7eb3\u585e\u7b2c
-ghs=\u52a0\u7eb3\u585e\u5730
-gip=\u76f4\u5e03\u7f57\u9640\u9551
-gmd=\u5188\u6bd4\u4e9a\u8fbe\u62c9\u897f
-gnf=\u51e0\u5185\u4e9a\u6cd5\u90ce
-grd=\u5e0c\u814a\u5fb7\u62c9\u514b\u9a6c
-gtq=\u5371\u5730\u9a6c\u62c9\u683c\u67e5\u5c14
-gwp=\u51e0\u5185\u4e9a\u6bd4\u7ecd\u6bd4\u7d22
-gyd=\u572d\u4e9a\u90a3\u5143
-hkd=\u6e2f\u5143
-hnl=\u6d2a\u90fd\u62c9\u65af\u62c9\u4f26\u76ae\u62c9
-hrk=\u514b\u7f57\u5730\u4e9a\u5e93\u7eb3
-htg=\u6d77\u5730\u53e4\u5fb7
-huf=\u5308\u7259\u5229\u798f\u6797
-idr=\u5370\u5ea6\u5c3c\u897f\u4e9a\u76fe
-iep=\u7231\u5c14\u5170\u9551
-ils=\u4ee5\u8272\u5217\u65b0\u8c22\u514b\u5c14
-inr=\u5370\u5ea6\u5362\u6bd4
-iqd=\u4f0a\u62c9\u514b\u7b2c\u7eb3\u5c14
-irr=\u4f0a\u6717\u91cc\u4e9a\u5c14
-isk=\u51b0\u5c9b\u514b\u6717
-itl=\u610f\u5927\u5229\u91cc\u62c9
-jmd=\u7259\u4e70\u52a0\u5143
-jod=\u7ea6\u65e6\u7b2c\u7eb3\u5c14
-jpy=\u65e5\u5143
-kes=\u80af\u5c3c\u4e9a\u5148\u4ee4
-kgs=\u5409\u5c14\u5409\u65af\u65af\u5766\u7d22\u59c6
-khr=\u67ec\u57d4\u5be8\u745e\u5c14
-kmf=\u79d1\u6469\u7f57\u6cd5\u90ce
-kpw=\u671d\u9c9c\u5706
-krw=\u97e9\u5706
-kwd=\u79d1\u5a01\u7279\u7b2c\u7eb3\u5c14
-kyd=\u5f00\u66fc\u5143
-kzt=\u54c8\u8428\u514b\u65af\u5766\u575a\u6208
-lak=\u8001\u631d\u57fa\u666e
-lbp=\u9ece\u5df4\u5ae9\u9551
-lkr=\u65af\u91cc\u5170\u5361\u5362\u6bd4
-lrd=\u5229\u6bd4\u4e9a\u5143
-lsl=\u83b1\u7d22\u6258\u6d1b\u8482
-ltl=\u7acb\u9676\u5b9b\u7acb\u7279
-luf=\u5362\u68ee\u5821\u6cd5\u90ce
-lvl=\u62c9\u8131\u7ef4\u4e9a\u62c9\u7279
-lyd=\u5229\u6bd4\u4e9a\u7b2c\u7eb3\u5c14
-mad=\u6469\u6d1b\u54e5\u8fea\u62c9\u59c6
-mdl=\u6469\u5c14\u591a\u74e6\u5217\u4f0a
-mga=\u9a6c\u8fbe\u52a0\u65af\u52a0\u963f\u91cc\u4e9a\u91cc
-mgf=\u9a6c\u8fbe\u52a0\u65af\u52a0\u6cd5\u90ce
-mkd=\u9a6c\u5176\u987f\u6234\u4ee3\u7eb3\u5c14
-mmk=\u7f05\u7538\u5f00\u4e9a\u7279
-mnt=\u8499\u53e4\u56fe\u683c\u91cc\u514b
-mop=\u6fb3\u95e8\u5143
-mro=\u6bdb\u91cc\u5854\u5c3c\u4e9a\u4e4c\u5409\u4e9a
-mtl=\u9a6c\u8033\u4ed6\u91cc\u62c9
-mur=\u6bdb\u91cc\u6c42\u65af\u5362\u6bd4
-mvr=\u9a6c\u5c14\u4ee3\u592b\u62c9\u83f2\u4e9a
-mwk=\u9a6c\u62c9\u7ef4\u514b\u74e6\u67e5
-mxn=\u58a8\u897f\u54e5\u6bd4\u7d22
-mxv=\u58a8\u897f\u54e5 Unidad de Inversion (UDI)\uff08\u8d44\u91d1\uff09
-myr=\u9a6c\u6765\u897f\u4e9a\u6797\u5409\u7279
-mzm=\u65e7\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
-mzn=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
-nad=\u7eb3\u7c73\u6bd4\u4e9a\u5143
-ngn=\u5c3c\u65e5\u5229\u4e9a\u5948\u62c9
-nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
-nlg=\u8377\u5170\u76fe
-nok=\u632a\u5a01\u514b\u6717
-npr=\u5c3c\u6cca\u5c14\u5362\u6bd4
-nzd=\u65b0\u897f\u5170\u5143
-omr=\u963f\u66fc\u91cc\u4e9a\u5c14
-pab=\u5df4\u62ff\u9a6c\u5df4\u6ce2\u4e9a
-pen=\u79d8\u9c81\u65b0\u7d22\u5c14
-pgk=\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u57fa\u90a3
-php=\u83f2\u5f8b\u5bbe\u6bd4\u7d22
-pkr=\u5df4\u57fa\u65af\u5766\u5362\u6bd4
-pln=\u6ce2\u5170\u5179\u7f57\u63d0
-pte=\u8461\u8404\u7259\u57c3\u65af\u5e93\u591a
-pyg=\u5df4\u62c9\u572d\u74dc\u62c9\u5c3c
-qar=\u5361\u5854\u5c14\u91cc\u4e9a\u5c14
-rol=\u65e7\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
-ron=\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
-rsd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
-rub=\u4fc4\u56fd\u5362\u5e03
-rur=\u4fc4\u56fd\u5362\u5e03 (1991-1998)
-rwf=\u5362\u65fa\u8fbe\u6cd5\u90ce
-sar=\u6c99\u7279\u91cc\u4e9a\u5c14
-sbd=\u6240\u7f57\u95e8\u7fa4\u5c9b\u5143
-scr=\u585e\u820c\u5c14\u5362\u6bd4
-sdd=\u82cf\u4e39\u7b2c\u7eb3\u5c14
-sdg=\u82cf\u4e39\u9551
-sek=\u745e\u5178\u514b\u6717
-sgd=\u65b0\u52a0\u5761\u5143
-shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
-sit=\u65af\u6d1b\u6587\u5c3c\u4e9a\u6258\u62c9\u5c14
-skk=\u65af\u6d1b\u4f10\u514b\u514b\u6717
-sll=\u585e\u62c9\u5229\u6602\u5229\u6602
-sos=\u7d22\u9a6c\u91cc\u5148\u4ee4
-srd=\u82cf\u91cc\u5357\u5143
-srg=\u82cf\u91cc\u5357\u76fe
-std=\u5723\u591a\u7f8e\u548c\u666e\u6797\u897f\u6bd4\u591a\u5e03\u62c9
-svc=\u8428\u5c14\u74e6\u591a\u79d1\u6717
-syp=\u53d9\u5229\u4e9a\u9551
-szl=\u65af\u5a01\u58eb\u5170\u91cc\u5170\u5409\u5c3c
-thb=\u6cf0\u94e2
-tjs=\u5854\u5409\u514b\u65af\u5766\u7d22\u83ab\u5c3c
-tmm=\u571f\u5e93\u66fc\u65af\u5766\u9a6c\u7eb3\u7279
-tmt=\u571f\u5e93\u66fc\u65af\u5766\u65b0\u9a6c\u7eb3\u7279
-tnd=\u7a81\u5c3c\u65af\u7b2c\u7eb3\u5c14
-top=\u6c64\u52a0\u6f58\u52a0
-tpe=\u5e1d\u6c76\u57c3\u65af\u5e93\u591a
-trl=\u571f\u8033\u5176\u91cc\u62c9
-try=\u65b0\u571f\u8033\u5176\u91cc\u62c9
-ttd=\u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5\u5143
-twd=\u65b0\u53f0\u5e01
-tzs=\u5766\u6851\u5c3c\u4e9a\u5148\u4ee4
-uah=\u4e4c\u514b\u5170\u683c\u91cc\u592b\u5c3c\u4e9a
-ugx=\u4e4c\u5e72\u8fbe\u5148\u4ee4
-usd=\u7f8e\u5143
-usn=\u7f8e\u5143\uff08\u6b21\u65e5\uff09
-uss=\u7f8e\u5143\uff08\u5f53\u65e5\uff09
-uyu=\u4e4c\u62c9\u572d\u6bd4\u7d22
-uzs=\u4e4c\u5179\u522b\u514b\u65af\u82cf\u59c6
-veb=\u59d4\u5185\u745e\u62c9\u535a\u5229\u74e6
-vef=\u59d4\u5185\u745e\u62c9\u5f3a\u52bf\u73bb\u5229\u74e6
-vnd=\u8d8a\u5357\u76fe
-vuv=\u74e6\u52aa\u963f\u56fe\u74e6\u56fe
-wst=\u897f\u8428\u6469\u4e9a\u5854\u62c9
-xaf=\u4e2d\u975e\u91d1\u878d\u5408\u4f5c\u6cd5\u90ce
-xag=\u94f6
-xau=\u9ec4\u91d1
-xba=\u6b27\u6d32\u590d\u5408\u5355\u4f4d
-xbb=\u6b27\u6d32\u8d27\u5e01\u8054\u76df
-xbc=\u6b27\u6d32\u8ba1\u7b97\u5355\u4f4d (XBC)
-xbd=\u6b27\u6d32\u8ba1\u7b97\u5355\u4f4d (XBD)
-xcd=\u4e1c\u52a0\u52d2\u6bd4\u5143
-xdr=\u7279\u522b\u63d0\u6b3e\u6743
-xfo=\u6cd5\u56fd\u91d1\u6cd5\u90ce
-xfu=\u6cd5\u56fd UIC \u6cd5\u90ce
-xof=\u975e\u6d32\u91d1\u878d\u5171\u540c\u4f53\u6cd5\u90ce
-xpd=\u94af
-xpf=\u592a\u5e73\u6d0b\u6cd5\u90ce
-xpt=\u94c2
-xts=\u4e3a\u6d4b\u8bd5\u4fdd\u7559\u7684\u4ee3\u7801
-xxx=\u8d27\u5e01\u672a\u77e5\u6216\u65e0\u6548
-yer=\u4e5f\u95e8\u91cc\u4e9a\u5c14
-yum=\u5357\u65af\u62c9\u592b\u504c\u5a01\u7b2c\u7eb3\u5c14
-zar=\u5357\u975e\u5170\u7279
-zmk=\u8d5e\u6bd4\u4e9a\u514b\u74e6\u67e5
-zwd=\u6d25\u5df4\u5e03\u97e6\u5143
-zwl=\u6d25\u5df4\u5e03\u97e6\u5143 (2009)
+adp=\u5B89\u9053\u5C14\u6BD4\u585E\u5854
+aed=\u963F\u62C9\u4F2F\u8054\u5408\u914B\u957F\u56FD\u8FEA\u62C9\u59C6
+afa=\u963F\u5BCC\u6C57\u963F\u5BCC\u6C57\u5C3C (1927-2002)
+afn=\u963F\u5BCC\u6C57\u963F\u5BCC\u6C57\u5C3C
+all=\u963F\u5C14\u5DF4\u5C3C\u4E9A\u5217\u514B
+amd=\u4E9A\u7F8E\u5C3C\u4E9A\u5FB7\u62C9\u59C6
+ang=\u8377\u5C5E\u5B89\u7684\u5217\u65AF\u76FE
+aoa=\u5B89\u54E5\u62C9\u5BBD\u624E
+ars=\u963F\u6839\u5EF7\u6BD4\u7D22
+ats=\u5965\u5730\u5229\u5148\u4EE4
+aud=\u6FB3\u5927\u5229\u4E9A\u5143
+awg=\u963F\u9C81\u5DF4\u5C9B\u5F17\u7F57\u6797
+azm=\u963F\u585E\u62DC\u7586\u9A6C\u7EB3\u7279 (1993-2006)
+azn=\u963F\u585E\u62DC\u7586\u9A6C\u7EB3\u7279
+bam=\u6CE2\u65AF\u5C3C\u4E9A\u548C\u9ED1\u585E\u54E5\u7EF4\u90A3\u53EF\u5151\u6362\u9A6C\u514B
+bbd=\u5DF4\u5DF4\u591A\u65AF\u5143
+bdt=\u5B5F\u52A0\u62C9\u5854\u5361
+bef=\u6BD4\u5229\u65F6\u6CD5\u90CE
+bgl=\u4FDD\u52A0\u5229\u4E9A\u5217\u5F17\uFF08\u786C\u5E01\uFF09
+bgn=\u4FDD\u52A0\u5229\u4E9A\u5217\u5F17
+bhd=\u5DF4\u6797\u7B2C\u7EB3\u5C14
+bif=\u5E03\u9686\u8FEA\u6CD5\u90CE
+bmd=\u767E\u6155\u5927\u5143
+bnd=\u6587\u83B1\u5143
+bob=\u6CE2\u5229\u7EF4\u4E9A\u73BB\u5229\u7EF4\u4E9A\u8BFA
+bov=\u73BB\u5229\u7EF4\u4E9A Mvdol
+brl=\u5DF4\u897F\u96F7\u4E9A\u5C14
+bsd=\u5DF4\u54C8\u9A6C\u5143
+btn=\u4E0D\u4E39\u52AA\u624E\u59C6
+bwp=\u535A\u8328\u74E6\u7EB3\u666E\u62C9
+byb=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03 (1994-1999)
+byn=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03
+byr=\u767D\u4FC4\u7F57\u65AF\u5362\u5E03 (2000-2016)
+bzd=\u4F2F\u5229\u5179\u5143
+cad=\u52A0\u62FF\u5927\u5143
+cdf=\u521A\u679C\u6CD5\u90CE
+chf=\u745E\u58EB\u6CD5\u90CE
+clf=\u667A\u5229\u8BB0\u8D26\u5355\u4F4D (UF)
+clp=\u667A\u5229\u6BD4\u7D22
+cny=\u4EBA\u6C11\u5E01
+cop=\u54E5\u4F26\u6BD4\u4E9A\u6BD4\u7D22
+crc=\u54E5\u65AF\u8FBE\u9ECE\u52A0\u79D1\u6717
+csd=\u585E\u5C14\u7EF4\u4E9A\u7B2C\u7EB3\u5C14 (2002-2006)
+cuc=\u53E4\u5DF4\u53EF\u5151\u6362\u6BD4\u7D22
+cup=\u53E4\u5DF4\u6BD4\u7D22
+cve=\u4F5B\u5F97\u89D2\u57C3\u65AF\u5E93\u591A
+cyp=\u585E\u6D66\u8DEF\u65AF\u9551
+czk=\u6377\u514B\u5171\u548C\u56FD\u514B\u90CE
+dem=\u5FB7\u56FD\u9A6C\u514B
+djf=\u5409\u5E03\u63D0\u6CD5\u90CE
+dkk=\u4E39\u9EA6\u514B\u6717
+dop=\u591A\u7C73\u5C3C\u52A0\u6BD4\u7D22
+dzd=\u963F\u5C14\u53CA\u5229\u4E9A\u7B2C\u7EB3\u5C14
+eek=\u7231\u6C99\u5C3C\u4E9A\u514B\u6717
+egp=\u57C3\u53CA\u9551
+ern=\u5384\u7ACB\u7279\u91CC\u4E9A\u7EB3\u514B\u6CD5
+esp=\u897F\u73ED\u7259\u6BD4\u585E\u5854
+etb=\u57C3\u585E\u4FC4\u6BD4\u4E9A\u6BD4\u5C14
+eur=\u6B27\u5143
+fim=\u82AC\u5170\u9A6C\u514B
+fjd=\u6590\u6D4E\u5143
+fkp=\u798F\u514B\u5170\u7FA4\u5C9B\u9551
+frf=\u6CD5\u56FD\u6CD5\u90CE
+gbp=\u82F1\u9551
+gel=\u683C\u9C81\u5409\u4E9A\u62C9\u91CC
+ghc=\u52A0\u7EB3\u585E\u5730 (1979-2007)
+ghs=\u52A0\u7EB3\u585E\u5730
+gip=\u76F4\u5E03\u7F57\u9640\u9551
+gmd=\u5188\u6BD4\u4E9A\u8FBE\u62C9\u897F
+gnf=\u51E0\u5185\u4E9A\u6CD5\u90CE
+grd=\u5E0C\u814A\u5FB7\u62C9\u9A6C\u514B
+gtq=\u5371\u5730\u9A6C\u62C9\u683C\u67E5\u5C14
+gwp=\u51E0\u5185\u4E9A\u6BD4\u7ECD\u6BD4\u7D22
+gyd=\u572D\u4E9A\u90A3\u5143
+hkd=\u6E2F\u5143
+hnl=\u6D2A\u90FD\u62C9\u65AF\u4F26\u76AE\u62C9
+hrk=\u5E93\u7EB3
+htg=\u6D77\u5730\u53E4\u5FB7
+huf=\u5308\u7259\u5229\u798F\u6797
+idr=\u5370\u5EA6\u5C3C\u897F\u4E9A\u5362\u6BD4
+iep=\u7231\u5C14\u5170\u9551
+ils=\u4EE5\u8272\u5217\u65B0\u8C22\u514B\u5C14
+inr=\u5370\u5EA6\u5362\u6BD4
+iqd=\u4F0A\u62C9\u514B\u7B2C\u7EB3\u5C14
+irr=\u4F0A\u6717\u91CC\u4E9A\u5C14
+isk=\u51B0\u5C9B\u514B\u6717
+itl=\u610F\u5927\u5229\u91CC\u62C9
+jmd=\u7259\u4E70\u52A0\u5143
+jod=\u7EA6\u65E6\u7B2C\u7EB3\u5C14
+jpy=\u65E5\u5143
+kes=\u80AF\u5C3C\u4E9A\u5148\u4EE4
+kgs=\u5409\u5C14\u5409\u65AF\u65AF\u5766\u7D22\u59C6
+khr=\u67EC\u57D4\u5BE8\u745E\u5C14
+kmf=\u79D1\u6469\u7F57\u6CD5\u90CE
+kpw=\u5317\u671D\u9C9C\u5143
+krw=\u97E9\u5143
+kwd=\u79D1\u5A01\u7279\u7B2C\u7EB3\u5C14
+kyd=\u5F00\u66FC\u7FA4\u5C9B\u5143
+kzt=\u54C8\u8428\u514B\u65AF\u5766\u817E\u683C
+lak=\u8001\u631D\u57FA\u666E
+lbp=\u9ECE\u5DF4\u5AE9\u9551
+lkr=\u65AF\u91CC\u5170\u5361\u5362\u6BD4
+lrd=\u5229\u6BD4\u91CC\u4E9A\u5143
+lsl=\u83B1\u7D22\u6258\u6D1B\u63D0
+ltl=\u7ACB\u9676\u5B9B\u7ACB\u7279
+luf=\u5362\u68EE\u5821\u6CD5\u90CE
+lvl=\u62C9\u8131\u7EF4\u4E9A\u62C9\u7279
+lyd=\u5229\u6BD4\u4E9A\u7B2C\u7EB3\u5C14
+mad=\u6469\u6D1B\u54E5\u8FEA\u62C9\u59C6
+mdl=\u6469\u5C14\u591A\u74E6\u5217\u4F0A
+mga=\u9A6C\u8FBE\u52A0\u65AF\u52A0\u963F\u91CC\u4E9A\u91CC
+mgf=\u9A6C\u8FBE\u52A0\u65AF\u52A0\u6CD5\u90CE
+mkd=\u9A6C\u5176\u987F\u7B2C\u7EB3\u5C14
+mmk=\u7F05\u7538\u5143
+mnt=\u8499\u53E4\u56FE\u683C\u91CC\u514B
+mop=\u6FB3\u95E8\u5143
+mro=\u6BDB\u91CC\u5854\u5C3C\u4E9A\u4E4C\u5409\u4E9A
+mru=\u6BDB\u91CC\u5854\u5C3C\u4E9A\u4E4C\u5409\u4E9A
+mtl=\u9A6C\u8033\u4ED6\u91CC\u62C9
+mur=\u6BDB\u91CC\u6C42\u65AF\u5362\u6BD4
+mvr=\u9A6C\u5C14\u4EE3\u592B\u7F57\u975E\u4E9A
+mwk=\u9A6C\u62C9\u7EF4\u9A6C\u62C9\u7EF4\u514B\u74E6\u67E5
+mxn=\u58A8\u897F\u54E5\u6BD4\u7D22
+mxv=\u58A8\u897F\u54E5\u6295\u8D44\u5355\u4F4D
+myr=\u9A6C\u6765\u897F\u4E9A\u6797\u5409\u7279
+mzm=\u83AB\u6851\u6BD4\u514B\u7F8E\u63D0\u5361 (1980-2006)
+mzn=\u83AB\u6851\u6BD4\u514B\u7F8E\u63D0\u5361
+nad=\u7EB3\u7C73\u6BD4\u4E9A\u5143
+ngn=\u5C3C\u65E5\u5229\u4E9A\u5948\u62C9
+nio=\u5C3C\u52A0\u62C9\u74DC\u79D1\u591A\u5DF4
+nlg=\u8377\u5170\u76FE
+nok=\u632A\u5A01\u514B\u6717
+npr=\u5C3C\u6CCA\u5C14\u5362\u6BD4
+nzd=\u65B0\u897F\u5170\u5143
+omr=\u963F\u66FC\u91CC\u4E9A\u5C14
+pab=\u5DF4\u62FF\u9A6C\u5DF4\u6CE2\u4E9A
+pen=\u79D8\u9C81\u7D22\u5C14
+pgk=\u5DF4\u5E03\u4E9A\u65B0\u51E0\u5185\u4E9A\u57FA\u90A3
+php=\u83F2\u5F8B\u5BBE\u6BD4\u7D22
+pkr=\u5DF4\u57FA\u65AF\u5766\u5362\u6BD4
+pln=\u6CE2\u5170\u5179\u7F57\u63D0
+pte=\u8461\u8404\u7259\u57C3\u65AF\u5E93\u591A
+pyg=\u5DF4\u62C9\u572D\u74DC\u62C9\u5C3C
+qar=\u5361\u5854\u5C14\u91CC\u4E9A\u5C14
+rol=\u7F57\u9A6C\u5C3C\u4E9A\u5217\u4F0A (1952-2006)
+ron=\u7F57\u9A6C\u5C3C\u4E9A\u5217\u4F0A
+rsd=\u585E\u5C14\u7EF4\u4E9A\u7B2C\u7EB3\u5C14
+rub=\u4FC4\u7F57\u65AF\u5362\u5E03
+rur=\u4FC4\u7F57\u65AF\u5362\u5E03 (1991-1998)
+rwf=\u5362\u65FA\u8FBE\u6CD5\u90CE
+sar=\u6C99\u7279\u91CC\u4E9A\u5C14
+sbd=\u6240\u7F57\u95E8\u7FA4\u5C9B\u5143
+scr=\u585E\u820C\u5C14\u5362\u6BD4
+sdd=\u82CF\u4E39\u7B2C\u7EB3\u5C14 (1992-2007)
+sdg=\u82CF\u4E39\u9551
+sek=\u745E\u5178\u514B\u6717
+sgd=\u65B0\u52A0\u5761\u5143
+shp=\u5723\u8D6B\u52D2\u62FF\u9551
+sit=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u6258\u62C9\u5C14
+skk=\u65AF\u6D1B\u4F10\u514B\u514B\u6717
+sll=\u585E\u62C9\u5229\u6602\u5229\u6602
+sos=\u7D22\u9A6C\u91CC\u5148\u4EE4
+srd=\u82CF\u91CC\u5357\u5143
+srg=\u82CF\u91CC\u5357\u76FE
+ssp=\u5357\u82CF\u4E39\u9551
+std=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4\u591A\u5E03\u62C9
+stn=\u5723\u591A\u7F8E\u548C\u666E\u6797\u897F\u6BD4\u591A\u5E03\u62C9
+svc=\u8428\u5C14\u74E6\u591A\u79D1\u6717
+syp=\u53D9\u5229\u4E9A\u9551
+szl=\u65AF\u5A01\u58EB\u5170\u91CC\u5170\u5409\u5C3C
+thb=\u6CF0\u94E2
+tjs=\u5854\u5409\u514B\u65AF\u5766\u7D22\u6469\u5C3C
+tmm=\u571F\u5E93\u66FC\u65AF\u5766\u9A6C\u7EB3\u7279 (1993-2009)
+tmt=\u571F\u5E93\u66FC\u65AF\u5766\u9A6C\u7EB3\u7279
+tnd=\u7A81\u5C3C\u65AF\u7B2C\u7EB3\u5C14
+top=\u4E1C\u52A0\u5E01
+tpe=\u4E1C\u5E1D\u6C76\u57C3\u65AF\u5E93\u591A
+trl=\u571F\u8033\u5176\u91CC\u62C9 (1922-2005)
+try=\u571F\u8033\u5176\u91CC\u62C9
+ttd=\u7279\u7ACB\u5C3C\u8FBE\u591A\u5DF4\u54E5\u5143
+twd=\u65B0\u53F0\u5E01
+tzs=\u5766\u6851\u5C3C\u4E9A\u5148\u4EE4
+uah=\u4E4C\u514B\u5170\u683C\u91CC\u592B\u5C3C\u4E9A
+ugx=\u4E4C\u5E72\u8FBE\u5148\u4EE4
+usd=\u7F8E\u5143
+usn=\u7F8E\u5143\uFF08\u6B21\u65E5\uFF09
+uss=\u7F8E\u5143\uFF08\u540C\u65E5\uFF09
+uyu=\u4E4C\u62C9\u572D \u6BD4\u7D22
+uzs=\u4E4C\u5179\u522B\u514B\u671F\u5766\u7D22\u59C6
+veb=\u59D4\u5185\u745E\u62C9\u73BB\u5229\u74E6\u5C14 (1871-2008)
+ved=\u59D4\u5185\u745E\u62C9\u4E3B\u6743\u73BB\u5229\u74E6\u5C14
+vef=\u59D4\u5185\u745E\u62C9\u73BB\u5229\u74E6\u5C14
+ves=\u59D4\u5185\u745E\u62C9\u4E3B\u6743\u73BB\u5229\u74E6\u5C14
+vnd=\u8D8A\u5357\u76FE
+vuv=\u74E6\u52AA\u963F\u56FE\u74E6\u56FE
+wst=\u8428\u6469\u4E9A\u5854\u62C9
+xaf=CFA \u6CD5\u90CE BEAC
+xag=\u94F6\u8272
+xau=\u91D1\u8272
+xba=\u6B27\u6D32\u8D27\u5E01\u5408\u6210\u5355\u4F4D
+xbb=\u6B27\u6D32\u8D27\u5E01\u5355\u4F4D
+xbc=\u6B27\u6D32\u8BB0\u8D26\u5355\u4F4D (XBC)
+xbd=\u6B27\u6D32\u8BB0\u8D26\u5355\u4F4D (XBD)
+xcd=\u4E1C\u52A0\u52D2\u6BD4\u5143
+xdr=\u7279\u522B\u63D0\u6B3E\u6743
+xfo=\u6CD5\u56FD\u91D1\u6CD5\u90CE
+xfu=\u6CD5\u56FD UIC \u6CD5\u90CE
+xof=CFA \u6CD5\u90CE BCEAO
+xpd=\u94AF
+xpf=\u592A\u5E73\u6D0B\u6CD5\u90CE
+xpt=\u767D\u91D1
+xsu=\u82CF\u514B\u96F7
+xts=\u6D4B\u8BD5\u8D27\u5E01\u4EE3\u7801
+xua=ADB \u8BB0\u8D26\u5355\u4F4D
+xxx=\u672A\u77E5\u8D27\u5E01
+yer=\u4E5F\u95E8\u91CC\u4E9A\u5C14
+yum=\u5357\u65AF\u62C9\u592B\u65B0\u7B2C\u7EB3\u5C14 (1994-2002)
+zar=\u5357\u975E\u5170\u7279
+zmk=\u8D5E\u6BD4\u4E9A\u514B\u74E6\u67E5
+zwd=\u6D25\u5DF4\u5E03\u97E6\u5143 (1980-2008)
+zwl=\u6D25\u5DF4\u5E03\u97E6\u5143 (2009)
+zwr=\u6D25\u5DF4\u5E03\u97E6\u5143 (2008)
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
index 94195cbedfa..4def676fd9d 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
index eb8dd2cfc0a..6499da87c9c 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
index 0123ebc1439..f2e3599d13c 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/sun/text/resources/LocaleData b/test/jdk/sun/text/resources/LocaleData
index 50fa417ae6d..4d397b71967 100644
--- a/test/jdk/sun/text/resources/LocaleData
+++ b/test/jdk/sun/text/resources/LocaleData
@@ -2240,7 +2240,7 @@ FormatData/fr/NumberPatterns/0=#,##0.###;-#,##0.###
 # FormatData/fr/NumberPatterns/1=\u00a4 #,##0.00;-\u00a4 #,##0.00 # Changed; see bug 4122840
 # FormatData/fr/NumberPatterns/2=#,##0% # changed, see bug 6547501
 CurrencyNames/fr_FR/FRF=F
-CurrencyNames/fr_FR/EUR=\u20AC
+CurrencyNames/fr_FR/EUR=\u20ac
 FormatData/fr_FR/NumberPatterns/0=#,##0.###;-#,##0.###
 # FormatData/fr_FR/NumberPatterns/1=#,##0.00 F;-#,##0.00 F # Changed; see bug 4122840
 # FormatData/fr_FR/NumberPatterns/2=#,##0% # changed; see bug 6547501
@@ -2389,7 +2389,7 @@ FormatData/es_SV/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
 FormatData/es_UY/NumberPatterns/1=\u00a4 #,##0.00;(\u00a4#,##0.00)
 FormatData/es_VE/NumberPatterns/1=\u00a4#,##0.00;\u00a4 -#,##0.00
 FormatData/fr_FR/NumberPatterns/1=#,##0.00 \u00a4;-#,##0.00 \u00a4
-FormatData/it_IT/NumberPatterns/1=\u00A4 #,##0.00;-\u00A4 #,##0.00
+FormatData/it_IT/NumberPatterns/1=\u00a4 #,##0.00;-\u00a4 #,##0.00
 #FormatData/ja_JP/NumberPatterns/1=\u00a4#,##0.00  #see bug 4175306
 FormatData/ko_KR/NumberPatterns/1=\u00a4#,##0;-\u00a4#,##0
 FormatData/pl_PL/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
@@ -2399,7 +2399,7 @@ FormatData/ru_RU/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
 FormatData/uk_UA/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
 
 # bug #4122468 # Use common country names
-LocaleNames//CI=C\u00F4te d\u2019Ivoire
+LocaleNames//CI=C\u00f4te d\u2019Ivoire
 LocaleNames//LY=Libya
 LocaleNames//RU=Russia
 LocaleNames//VN=Vietnam
@@ -2409,9 +2409,9 @@ FormatData/cs/DatePatterns/0=EEEE, d. MMMM yyyy
 FormatData/cs/DatePatterns/1=d. MMMM yyyy
 FormatData/cs/DatePatterns/2=d.M.yyyy
 FormatData/cs/DatePatterns/3=d.M.yy
-FormatData/cs/NumberElements/1=\u00A0
+FormatData/cs/NumberElements/1=\u00a0
 FormatData/cs_CZ/NumberPatterns/0=#,##0.##;-#,##0.##
-FormatData/cs_CZ/NumberPatterns/1=#,##0.## \u00A4;-#,##0.## \u00A4
+FormatData/cs_CZ/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
 FormatData/cs_CZ/NumberPatterns/2=#,##0%
 
 #bug #4135752
@@ -2436,7 +2436,7 @@ FormatData/zh_HK/DayNames/2=\u661f\u671f\u4e8c
 FormatData/zh_HK/DayAbbreviations/0=\u65e5
 FormatData/zh_HK/DayAbbreviations/1=\u4e00
 FormatData/zh_HK/DayAbbreviations/2=\u4e8c
-FormatData/zh_HK/NumberPatterns/1=\u00A4#,##0.00;(\u00A4#,##0.00)
+FormatData/zh_HK/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
 CurrencyNames/zh_HK/HKD=HK$
 FormatData/zh_HK/TimePatterns/0=ahh'\u6642'mm'\u5206'ss'\u79d2' z
 FormatData/zh_HK/TimePatterns/1=ahh'\u6642'mm'\u5206'ss'\u79d2'
@@ -2452,8 +2452,8 @@ FormatData/zh_HK/DateTimePatterns/0={1} {0}
 LocaleNames/tr/TR=T\u00fcrkiye
 
 #bug 4175306
-FormatData/es_ES/NumberPatterns/1=#,##0 \u00A4;-#,##0 \u00A4
-FormatData/ja_JP/NumberPatterns/1=\u00A4#,##0;-\u00A4#,##0
+FormatData/es_ES/NumberPatterns/1=#,##0 \u00a4;-#,##0 \u00a4
+FormatData/ja_JP/NumberPatterns/1=\u00a4#,##0;-\u00a4#,##0
 
 #bug #4215747 - commented out by mfang due to 4900884
 #FormatData/ko/TimePatterns/0=a h'\uc2dc' m'\ubd84' s'\ucd08' z
@@ -2483,7 +2483,7 @@ TimeZoneNames/en_CA/CTT/2=CST
 CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
 
 #bug 4826794
-LocaleNames/ru_RU/MM=\u041C\u044C\u044F\u043D\u043C\u0430
+LocaleNames/ru_RU/MM=\u041c\u044c\u044f\u043d\u043c\u0430
 
 #bug 4518811
 CalendarData/ca_ES/minimalDaysInFirstWeek=4
@@ -2502,7 +2502,7 @@ CalendarData/pt_PT/minimalDaysInFirstWeek=4
 
 #bug 4945388
 CurrencyNames/be_BY/BYR=\u0420\u0443\u0431
-CurrencyNames/bg_BG/BGN=\u043B\u0432.
+CurrencyNames/bg_BG/BGN=\u043b\u0432.
 
 #bug 4794068
 FormatData/ca_ES/NumberPatterns/0=#,##0.###;-#,##0.###
@@ -2512,7 +2512,7 @@ FormatData/sk/DayNames/0=Nede\u013ea
 FormatData/sk/DayAbbreviations/5=Pi
 
 #bug 5074431
-FormatData/bg/DayNames/4=\u0427\u0435\u0442\u0432\u044A\u0440\u0442\u044A\u043A
+FormatData/bg/DayNames/4=\u0427\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a
 
 #bug 2121133
 FormatData/sv/NumberElements/1=\u00a0
@@ -5538,7 +5538,7 @@ CurrencyNames/ar_SD/SDD=\u062f.\u0633.\u200f
 CurrencyNames/ar_SD/SDG=\u062c.\u0633.\u200f
 
 # bug 6531593
-FormatData/is_IS/NumberPatterns/1=#,##0. \u00A4;-#,##0. \u00A4
+FormatData/is_IS/NumberPatterns/1=#,##0. \u00a4;-#,##0. \u00a4
 
 # bug 6509039
 FormatData/sv/AmPmMarkers/0=fm
@@ -5595,7 +5595,7 @@ FormatData/be_BY/MonthNames/10=\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\
 FormatData/be_BY/MonthAbbreviations/10=\u043b\u0456\u0441
 
 # bug 6645405
-FormatData/hu_HU/NumberPatterns/1=#,##0.## \u00A4;-#,##0.## \u00A4
+FormatData/hu_HU/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
 
 # bug 6650730
 FormatData/lt/NumberElements/1=\u00a0
@@ -6472,27 +6472,27 @@ CurrencyNames//yum=Yugoslavian New Dinar (1994-2002)
 CurrencyNames//zwd=Zimbabwean Dollar (1980-2008)
 
 # bug 7020583
-CurrencyNames/de/azm=Aserbaidschan-Manat (1993-2006)
-CurrencyNames/de/azn=Aserbaidschan-Manat
-CurrencyNames/de/csd=Alter Serbischer Dinar
+CurrencyNames/de/azm=Aserbaidschainischer Manat (1993-2006)
+CurrencyNames/de/azn=Aserbaidschainischer Manat
+CurrencyNames/de/csd=Serbischer Dinar (2002-2006)
 CurrencyNames/de/cyp=Zypern-Pfund
-CurrencyNames/de/esp=Spanische Peseta
+CurrencyNames/de/esp=Spanische Pesete
 CurrencyNames/de/fjd=Fidschi-Dollar
-CurrencyNames/de/fkp=Falkland-Pfund
-CurrencyNames/de/ghs=Ghanaische Cedi
+CurrencyNames/de/fkp=Falklandinseln-Pfund
+CurrencyNames/de/ghs=Ghanaischer Cedi
 CurrencyNames/de/gip=Gibraltar-Pfund
 CurrencyNames/de/gnf=Guinea-Franc
 CurrencyNames/de/gyd=Guyana-Dollar
 CurrencyNames/de/hkd=Hongkong-Dollar
-CurrencyNames/de/itl=Italienische Lira
-CurrencyNames/de/jmd=Jamaika-Dollar
-CurrencyNames/de/kes=Kenia-Schilling
+CurrencyNames/de/itl=Italienische Lire
+CurrencyNames/de/jmd=Jamaikanischer Dollar
+CurrencyNames/de/kes=Kenianischer Schilling
 CurrencyNames/de/mgf=Madagaskar-Franc
 CurrencyNames/de/mur=Mauritius-Rupie
-CurrencyNames/de/mzm=Alter Metical
-CurrencyNames/de/mzn=Metical
-CurrencyNames/de/nad=Namibia-Dollar
-CurrencyNames/de/nzd=Neuseeland-Dollar
+CurrencyNames/de/mzm=Mosambikanischer Metical (1980-2006)
+CurrencyNames/de/mzn=Mosambikanischer Metical
+CurrencyNames/de/nad=Namibischer Dollar
+CurrencyNames/de/nzd=Neuseel\u00e4ndischer Dollar
 CurrencyNames/de/ron=Rum\u00e4nischer Leu
 CurrencyNames/de/rsd=Serbischer Dinar
 CurrencyNames/de/rwf=Ruanda-Franc
@@ -6500,27 +6500,27 @@ CurrencyNames/de/sbd=Salomonen-Dollar
 CurrencyNames/de/scr=Seychellen-Rupie
 CurrencyNames/de/sdg=Sudanesisches Pfund
 CurrencyNames/de/sgd=Singapur-Dollar
-CurrencyNames/de/sos=Somalia-Schilling
-CurrencyNames/de/srd=Surinamischer Dollar
-CurrencyNames/de/tpe=Timor-Escudo
-CurrencyNames/de/trl=Alte T\u00fcrkische Lira
+CurrencyNames/de/sos=Somalischer Schilling
+CurrencyNames/de/srd=Suriname-Dollar
+CurrencyNames/de/tpe=Escudo (Portugiesisch-Timor)
+CurrencyNames/de/trl=T\u00fcrkische Lira (1922-2005)
 CurrencyNames/de/try=T\u00fcrkische Lira
-CurrencyNames/de/ttd=Trinidad- und Tobago-Dollar
-CurrencyNames/de/twd=Neuer Taiwan-Dollar
+CurrencyNames/de/ttd=Trinidad/Tobago-Dollar
+CurrencyNames/de/twd=Neu-Taiwan Dollar
 CurrencyNames/de/tzs=Tansania-Schilling
 CurrencyNames/de/ugx=Uganda-Schilling
 CurrencyNames/de/usd=US-Dollar
-CurrencyNames/de/vef=Bol\u00edvar Fuerte
-CurrencyNames/de/xag=Unze Silber
-CurrencyNames/de/xau=Unze Gold
-CurrencyNames/de/xbb=Europ\u00e4ische W\u00e4hrungseinheit (XBB)
-CurrencyNames/de/xpd=Unze Palladium
-CurrencyNames/de/xpt=Unze Platin
-CurrencyNames/de/xts=Testw\u00e4hrung
+CurrencyNames/de/vef=Venezolanischer Bol\u00edvar Fuerte
+CurrencyNames/de/xag=Silber
+CurrencyNames/de/xau=Gold
+CurrencyNames/de/xbb=European Monetary Unit
+CurrencyNames/de/xpd=Palladium
+CurrencyNames/de/xpt=Platin
+CurrencyNames/de/xts=Testw\u00e4hrungscode
 CurrencyNames/de/xxx=Unbekannte W\u00e4hrung
 CurrencyNames/de/yer=Jemen-Rial
 CurrencyNames/de/zar=S\u00fcdafrikanischer Rand
-CurrencyNames/de/zwd=Simbabwe-Dollar
+CurrencyNames/de/zwd=Simbabwe-Dollar (1980-2008)
 
 CurrencyNames/es/aed=d\u00edrham de los Emiratos \u00c1rabes Unidos
 CurrencyNames/es/azm=manat azer\u00ed (1993-2006)
@@ -6654,23 +6654,23 @@ CurrencyNames/it/vef=Bol\u00edvar venezuelano forte
 CurrencyNames/it/xag=Argento
 CurrencyNames/it/xpd=Palladio
 
-CurrencyNames/ja/azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8 (1993-2006)
-CurrencyNames/ja/azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8
-CurrencyNames/ja/ghc=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3 (1979-2007)
-CurrencyNames/ja/ghs=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3
-CurrencyNames/ja/mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
-CurrencyNames/ja/rol=\u30eb\u30fc\u30de\u30cb\u30a2 \u65e7\u30ec\u30a4
-CurrencyNames/ja/ron=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4
-CurrencyNames/ja/rsd=\u30c7\u30a3\u30ca\u30fc\u30eb (\u30bb\u30eb\u30d3\u30a2)
-CurrencyNames/ja/sdg=\u30b9\u30fc\u30c0\u30f3 \u30dd\u30f3\u30c9
-CurrencyNames/ja/srd=\u30b9\u30ea\u30ca\u30e0 \u30c9\u30eb
-CurrencyNames/ja/vef=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb\u30d5\u30a8\u30eb\u30c6
+CurrencyNames/ja/azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u30fb\u30de\u30ca\u30c8(1993-2006)
+CurrencyNames/ja/azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u30fb\u30de\u30ca\u30c8
+CurrencyNames/ja/ghc=\u30ac\u30fc\u30ca\u30fb\u30bb\u30c7\u30a3(1979-2007)
+CurrencyNames/ja/ghs=\u30ac\u30fc\u30ca\u30fb\u30bb\u30c7\u30a3
+CurrencyNames/ja/mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af\u30fb\u30e1\u30c6\u30a3\u30ab\u30eb
+CurrencyNames/ja/rol=\u30eb\u30fc\u30de\u30cb\u30a2\u30fb\u30ec\u30a4(1952-2006)
+CurrencyNames/ja/ron=\u30eb\u30fc\u30de\u30cb\u30a2\u30fb\u30ec\u30a4
+CurrencyNames/ja/rsd=\u30bb\u30eb\u30d3\u30a2\u30fb\u30c7\u30a3\u30ca\u30fc\u30eb
+CurrencyNames/ja/sdg=\u30b9\u30fc\u30c0\u30f3\u30fb\u30dd\u30f3\u30c9
+CurrencyNames/ja/srd=\u30b9\u30ea\u30ca\u30e0\u30fb\u30c9\u30eb
+CurrencyNames/ja/vef=\u30d9\u30cd\u30ba\u30a8\u30e9\u30fb\u30dc\u30ea\u30d0\u30eb
 CurrencyNames/ja/xag=\u9280
 CurrencyNames/ja/xpd=\u30d1\u30e9\u30b8\u30a6\u30e0
 CurrencyNames/ja/xpt=\u30d7\u30e9\u30c1\u30ca
-CurrencyNames/ja/xts=\u30c6\u30b9\u30c8\u7528\u901a\u8ca8\u30b3\u30fc\u30c9
-CurrencyNames/ja/xxx=\u4e0d\u660e\u307e\u305f\u306f\u7121\u52b9\u306a\u901a\u8ca8
-CurrencyNames/ja/zmk=\u30b6\u30f3\u30d3\u30a2 \u30af\u30ef\u30c1\u30e3
+CurrencyNames/ja/xts=\u30c6\u30b9\u30c8\u901a\u8ca8\u30b3\u30fc\u30c9
+CurrencyNames/ja/xxx=\u4e0d\u660e\u306a\u901a\u8ca8
+CurrencyNames/ja/zmk=\u30b6\u30f3\u30d3\u30a2\u30fb\u30af\u30ef\u30c1\u30e3
 
 CurrencyNames/ko/aed=\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8 \ub514\ub974\ud568
 CurrencyNames/ko/ang=\ub124\ub35c\ub780\ub4dc\ub839 \uc548\ud2f8\ub808\uc2a4 \uae38\ub354
@@ -6905,19 +6905,19 @@ CurrencyNames/sv/zar=sydafrikansk rand
 CurrencyNames/sv/zmk=zambisk kwacha
 CurrencyNames/sv/zwd=Zimbabwe-dollar
 
-CurrencyNames/zh_CN/ang=\u8377\u5170\u5b89\u66ff\u5170\u76fe
+CurrencyNames/zh_CN/ang=\u8377\u5c5e\u5b89\u7684\u5217\u65af\u76fe
 CurrencyNames/zh_CN/azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279 (1993-2006)
 CurrencyNames/zh_CN/azn=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
-CurrencyNames/zh_CN/csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
+CurrencyNames/zh_CN/csd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14 (2002-2006)
 CurrencyNames/zh_CN/ghs=\u52a0\u7eb3\u585e\u5730
-CurrencyNames/zh_CN/mzm=\u65e7\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
+CurrencyNames/zh_CN/mzm=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361 (1980-2006)
 CurrencyNames/zh_CN/mzn=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
 CurrencyNames/zh_CN/ron=\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
 CurrencyNames/zh_CN/rsd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
-CurrencyNames/zh_CN/shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
+CurrencyNames/zh_CN/shp=\u5723\u8d6b\u52d2\u62ff\u9551
 CurrencyNames/zh_CN/twd=\u65b0\u53f0\u5e01
-CurrencyNames/zh_CN/vef=\u59d4\u5185\u745e\u62c9\u5f3a\u52bf\u73bb\u5229\u74e6
-CurrencyNames/zh_CN/xxx=\u8d27\u5e01\u672a\u77e5\u6216\u65e0\u6548
+CurrencyNames/zh_CN/vef=\u59d4\u5185\u745e\u62c9\u73bb\u5229\u74e6\u5c14
+CurrencyNames/zh_CN/xxx=\u672a\u77e5\u8d27\u5e01
 
 CurrencyNames/zh_TW/afa=\u963f\u5bcc\u6c57\u5c3c (1927-2002)
 CurrencyNames/zh_TW/ang=\u53e4\u82f1\u6587
@@ -6970,11 +6970,11 @@ CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u96c5
 # bug 7036905
 CurrencyNames/de/afa=Afghani (1927-2002)
 CurrencyNames/de/afn=Afghani
-CurrencyNames/de/bob=Boliviano
+CurrencyNames/de/bob=Bolivianischer Boliviano
 CurrencyNames/de/dem=Deutsche Mark
-CurrencyNames/de/mwk=Malawi Kwacha
-CurrencyNames/de/mxv=Mexican Unidad de Inversion (UDI)
-CurrencyNames/de/svc=El Salvador Colon
+CurrencyNames/de/mwk=Malawi-Kwacha
+CurrencyNames/de/mxv=Unidad De Inversion (Mexiko)
+CurrencyNames/de/svc=El-Salvador-Col\u00f3n
 
 CurrencyNames/it/bob=Boliviano
 
@@ -6990,8 +6990,8 @@ CurrencyNames//tmt=Turkmenistani Manat
 CurrencyNames//zwl=Zimbabwean Dollar (2009)
 CurrencyNames//zwr=Zimbabwean Dollar (2008)
 
-CurrencyNames/de/cuc=Kubanischer Peso (konvertibel)
-CurrencyNames/de/tmt=Neuer Turkmenistan-Manat
+CurrencyNames/de/cuc=Kubanischer konvertibler Peso
+CurrencyNames/de/tmt=Turkmenistan-Manat
 CurrencyNames/de/zwl=Simbabwe-Dollar (2009)
 
 CurrencyNames/es/cuc=peso cubano convertible
@@ -7008,9 +7008,9 @@ CurrencyNames/et_EE/eur=euro
 CurrencyNames/fr/cuc=peso cubain convertible
 CurrencyNames/fr/tmt=nouveau manat turkm\u00e8ne
 
-CurrencyNames/ja/cuc=\u30ad\u30e5\u30fc\u30d0 \u514c\u63db\u30da\u30bd
-CurrencyNames/ja/tmt=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3 \u65b0\u30de\u30ca\u30c8
-CurrencyNames/ja/zwl=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb (2009)
+CurrencyNames/ja/cuc=\u30ad\u30e5\u30fc\u30d0\u514c\u63db\u30da\u30bd
+CurrencyNames/ja/tmt=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u30fb\u30de\u30ca\u30c8
+CurrencyNames/ja/zwl=\u30b8\u30f3\u30d0\u30d6\u30a8\u30fb\u30c9\u30eb(2009)
 
 CurrencyNames/ko/cuc=\ucfe0\ubc14 \ud0dc\ud658 \ud398\uc18c
 
@@ -7024,7 +7024,7 @@ CurrencyNames/sk_SK/skk=Slovensk\u00e1 koruna
 CurrencyNames/sk_SK/EUR=\u20ac
 
 CurrencyNames/zh_CN/cuc=\u53e4\u5df4\u53ef\u5151\u6362\u6bd4\u7d22
-CurrencyNames/zh_CN/tmt=\u571f\u5e93\u66fc\u65af\u5766\u65b0\u9a6c\u7eb3\u7279
+CurrencyNames/zh_CN/tmt=\u571f\u5e93\u66fc\u65af\u5766\u9a6c\u7eb3\u7279
 CurrencyNames/zh_CN/zwl=\u6d25\u5df4\u5e03\u97e6\u5143 (2009)
 
 CurrencyNames/zh_TW/cuc=\u53e4\u5df4\u53ef\u8f49\u63db\u62ab\u7d22
@@ -7670,7 +7670,7 @@ FormatData/pt/MonthAbbreviations/10=nov
 FormatData/pt/MonthAbbreviations/11=dez
 
 # bug 8021121
-CurrencyNames/lv_LV/EUR=\u20AC
+CurrencyNames/lv_LV/EUR=\u20ac
 
 # bug # 6192407
 LocaleNames/ko/PT=\ud3ec\ub974\ud22c\uce7c
@@ -7696,7 +7696,7 @@ FormatData/es_DO/DatePatterns/2=dd/MM/yyyy
 FormatData/es_DO/DatePatterns/3=dd/MM/yy
 
 # bug 8055222
-CurrencyNames/lt_LT/EUR=\u20AC
+CurrencyNames/lt_LT/EUR=\u20ac
 
 # bug 8042126 + missing MonthNarrows data
 FormatData//MonthNarrows/0=1
@@ -8285,13 +8285,13 @@ FormatData/de/standalone.MonthAbbreviations/2=M\u00e4r
 CurrencyNames//hrk=Kuna
 
 # bug #7037368
-CurrencyNames/de/sar=Saudi-Rial
+CurrencyNames/de/sar=Saudischer Rial
 CurrencyNames/de/xpf=CFP-Franc
 CurrencyNames/it/azn=manat azero
 CurrencyNames/it/ron=leu rumeno
 CurrencyNames/it/trl=lira turca (1922-2005)
 CurrencyNames/it/try=lira turca
-CurrencyNames/sv/bgl=bulgarisk h\u00e5rd lev (1962–1999)
+CurrencyNames/sv/bgl=bulgarisk h\u00e5rd lev (1962\u00e2\u0080\u00931999)
 CurrencyNames/sv/xaf=centralafrikansk franc
 CurrencyNames/sv/xfu=internationella j\u00e4rnv\u00e4gsunionens franc
 CurrencyNames/sv/xof=v\u00e4stafrikansk franc
@@ -8359,7 +8359,7 @@ LocaleNames//ht=Haitian Creole
 LocaleNames//kj=Kuanyama
 LocaleNames//kl=Kalaallisut
 LocaleNames//ky=Kyrgyz
-LocaleNames//nb=Norwegian Bokm\u00E5l
+LocaleNames//nb=Norwegian Bokm\u00e5l
 LocaleNames//or=Odia
 LocaleNames//os=Ossetic
 LocaleNames//pa=Punjabi
@@ -8368,7 +8368,7 @@ LocaleNames//rm=Romansh
 LocaleNames//si=Sinhala
 LocaleNames//to=Tongan
 LocaleNames//ug=Uyghur
-LocaleNames//vo=Volap\u00FCk
+LocaleNames//vo=Volap\u00fck
 LocaleNames//ang=Old English
 LocaleNames//arc=Aramaic
 LocaleNames//arn=Mapuche
@@ -8385,26 +8385,26 @@ LocaleNames//fro=Old French
 LocaleNames//gmh=Middle High German
 LocaleNames//goh=Old High German
 LocaleNames//grc=Ancient Greek
-LocaleNames//gwi=Gwich\u02BCin
+LocaleNames//gwi=Gwich\u02bcin
 LocaleNames//luo=Luo
 LocaleNames//lus=Mizo
 LocaleNames//mga=Middle Irish
 LocaleNames//mul=Multiple languages
 LocaleNames//mus=Muscogee
 LocaleNames//new=Newari
-LocaleNames//nob=Bokm\u00E5l, Norwegian
+LocaleNames//nob=Bokm\u00e5l, Norwegian
 LocaleNames//non=Old Norse
 LocaleNames//nqo=N\u2019Ko
 LocaleNames//nso=Northern Sotho
 LocaleNames//ota=Ottoman Turkish
 LocaleNames//peo=Old Persian
-LocaleNames//pro=Old Proven\u00E7al
+LocaleNames//pro=Old Proven\u00e7al
 LocaleNames//sah=Sakha
 LocaleNames//sga=Old Irish
 LocaleNames//sog=Sogdien
 LocaleNames//tog=Nyasa Tonga
 LocaleNames//und=Unknown language
-LocaleNames//vol=Volap\u00FCk
+LocaleNames//vol=Volap\u00fck
 LocaleNames//wal=Wolaytta
 LocaleNames//Beng=Bangla
 LocaleNames//Geok=Georgian Khutsuri
@@ -8423,15 +8423,15 @@ LocaleNames//Zinh=Inherited
 LocaleNames//Zyyy=Common
 LocaleNames//Zzzz=Unknown Script
 LocaleNames//AG=Antigua & Barbuda
-LocaleNames//AX=\u00C5land Islands
+LocaleNames//AX=\u00c5land Islands
 LocaleNames//BA=Bosnia & Herzegovina
-LocaleNames//BL=St. Barth\u00E9lemy
+LocaleNames//BL=St. Barth\u00e9lemy
 LocaleNames//BQ=Caribbean Netherlands
 LocaleNames//CC=Cocos (Keeling) Islands
 LocaleNames//CD=Congo - Kinshasa
 LocaleNames//CG=Congo - Brazzaville
-LocaleNames//CI=C\u00F4te d\u2019Ivoire
-LocaleNames//CW=Cura\u00E7ao
+LocaleNames//CI=C\u00f4te d\u2019Ivoire
+LocaleNames//CW=Cura\u00e7ao
 LocaleNames//CZ=Czechia
 LocaleNames//GS=South Georgia & South Sandwich Islands
 LocaleNames//HK=Hong Kong SAR China
@@ -8446,10 +8446,10 @@ LocaleNames//MO=Macao SAR China
 LocaleNames//PM=St. Pierre & Miquelon
 LocaleNames//PN=Pitcairn Islands
 LocaleNames//PS=Palestinian Territories
-LocaleNames//RE=R\u00E9union
+LocaleNames//RE=R\u00e9union
 LocaleNames//SH=St. Helena
 LocaleNames//SJ=Svalbard & Jan Mayen
-LocaleNames//ST=S\u00E3o Tom\u00E9 & Pr\u00EDncipe
+LocaleNames//ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
 LocaleNames//SX=Sint Maarten
 LocaleNames//SZ=Eswatini
 LocaleNames//TC=Turks & Caicos Islands
diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java
index 51e88d72a2b..ef7f5d51cba 100644
--- a/test/jdk/sun/text/resources/LocaleDataTest.java
+++ b/test/jdk/sun/text/resources/LocaleDataTest.java
@@ -40,7 +40,7 @@
  *      8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
  *      8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
  *      8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
- *      8251317 8274658 8283277
+ *      8251317 8274658 8283277 8283805
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @modules jdk.localedata
-- 
GitLab


From 8eff80682ad32fa5b22bdfad6785a28f2ceb4a3b Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 1 Apr 2022 01:01:04 +0000
Subject: [PATCH 310/345] 8284116: Rename
 serializePropertiesToByteArray_signature

Co-authored-by: Alan Bateman <alanb@openjdk.org>
Reviewed-by: sspitsyn
---
 src/hotspot/share/classfile/vmSymbols.hpp        | 2 +-
 src/hotspot/share/jvmci/jvmciEnv.cpp             | 2 +-
 src/hotspot/share/services/attachListener.cpp    | 2 +-
 src/hotspot/share/services/diagnosticCommand.cpp | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index d962eda50a2..f08afd2ce76 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -559,6 +559,7 @@
   template(char_array_void_signature,                 "([C)V")                                                    \
   template(int_int_void_signature,                    "(II)V")                                                    \
   template(long_long_void_signature,                  "(JJ)V")                                                    \
+  template(void_byte_array_signature,                 "()[B")                                                    \
   template(void_classloader_signature,                "()Ljava/lang/ClassLoader;")                                \
   template(void_object_signature,                     "()Ljava/lang/Object;")                                     \
   template(void_class_signature,                      "()Ljava/lang/Class;")                                      \
@@ -681,7 +682,6 @@
   template(appendToClassPathForInstrumentation_name,   "appendToClassPathForInstrumentation")                     \
   do_alias(appendToClassPathForInstrumentation_signature, string_void_signature)                                  \
   template(serializePropertiesToByteArray_name,        "serializePropertiesToByteArray")                          \
-  template(serializePropertiesToByteArray_signature,   "()[B")                                                    \
   template(serializeAgentPropertiesToByteArray_name,   "serializeAgentPropertiesToByteArray")                     \
   template(classRedefinedCount_name,                   "classRedefinedCount")                                     \
   template(classLoader_name,                           "classLoader")                                             \
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index f789cd6ac0b..47650406b98 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -118,7 +118,7 @@ void JVMCIEnv::copy_saved_properties() {
   TempNewSymbol serializeSavedProperties = SymbolTable::new_symbol("serializeSavedProperties");
   JavaValue result(T_OBJECT);
   JavaCallArguments args;
-  JavaCalls::call_static(&result, ik, serializeSavedProperties, vmSymbols::serializePropertiesToByteArray_signature(), &args, THREAD);
+  JavaCalls::call_static(&result, ik, serializeSavedProperties, vmSymbols::void_byte_array_signature(), &args, THREAD);
   if (HAS_PENDING_EXCEPTION) {
     JVMCIRuntime::fatal_exception(NULL, "Error calling jdk.vm.ci.services.Services.serializeSavedProperties");
   }
diff --git a/src/hotspot/share/services/attachListener.cpp b/src/hotspot/share/services/attachListener.cpp
index f916f43849f..a376de6c246 100644
--- a/src/hotspot/share/services/attachListener.cpp
+++ b/src/hotspot/share/services/attachListener.cpp
@@ -81,7 +81,7 @@ static jint get_properties(AttachOperation* op, outputStream* out, Symbol* seria
   JavaCallArguments args;
 
 
-  Symbol* signature = vmSymbols::serializePropertiesToByteArray_signature();
+  Symbol* signature = vmSymbols::void_byte_array_signature();
   JavaCalls::call_static(&result,
                          k,
                          serializePropertiesMethod,
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 725d8016134..ab4eb41f8c1 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -358,7 +358,7 @@ void PrintSystemPropertiesDCmd::execute(DCmdSource source, TRAPS) {
   JavaValue result(T_OBJECT);
   JavaCallArguments args;
 
-  Symbol* signature = vmSymbols::serializePropertiesToByteArray_signature();
+  Symbol* signature = vmSymbols::void_byte_array_signature();
   JavaCalls::call_static(&result,
                          ik,
                          vmSymbols::serializePropertiesToByteArray_name(),
-- 
GitLab


From bab431cc120fe09be371dadef0c1caf79ec9eef4 Mon Sep 17 00:00:00 2001
From: Xin Liu <xliu@openjdk.org>
Date: Fri, 1 Apr 2022 04:42:03 +0000
Subject: [PATCH 311/345] 8282429: StringBuilder/StringBuffer.toString() skip
 compressing for UTF16 strings

Reviewed-by: djelinski, redestad
---
 .../java/lang/AbstractStringBuilder.java      | 24 ++++++--
 .../share/classes/java/lang/String.java       |  3 +-
 .../share/classes/java/lang/StringBuffer.java |  4 +-
 .../classes/java/lang/StringBuilder.java      |  3 +-
 .../StringBuilder/CompactStringBuilder.java   | 39 +++++++++++-
 .../java/lang/StringBuilderToString.java      | 60 +++++++++++++++++++
 6 files changed, 122 insertions(+), 11 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/StringBuilderToString.java

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index fed3a6f9178..b05ad6fa9ed 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -68,6 +68,14 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
      */
     byte coder;
 
+    /**
+     *  The attribute indicates {@code value} might be compressible to LATIN1 if it is UTF16-encoded.
+     *  An inflated byte array becomes compressible only when those non-latin1 chars are deleted.
+     *  We simply set this attribute in all methods which may delete chars. Therefore, there are
+     *  false positives. Subclasses and String need to handle it properly.
+     */
+    boolean maybeLatin1;
+
     /**
      * The count is the number of characters used.
      */
@@ -132,10 +140,11 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
 
         final byte initCoder;
         if (COMPACT_STRINGS) {
-            if (seq instanceof AbstractStringBuilder) {
-                initCoder = ((AbstractStringBuilder)seq).getCoder();
-            } else if (seq instanceof String) {
-                initCoder = ((String)seq).coder();
+            if (seq instanceof AbstractStringBuilder asb) {
+                initCoder = asb.getCoder();
+                maybeLatin1 |= asb.maybeLatin1;
+            } else if (seq instanceof String s) {
+                initCoder = s.coder();
             } else {
                 initCoder = LATIN1;
             }
@@ -319,6 +328,8 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
             } else {
                 StringUTF16.fillNull(value, count, newLength);
             }
+        } else if (count > newLength) {
+            maybeLatin1 = true;
         }
         count = newLength;
     }
@@ -528,6 +539,7 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
                 inflate();
             }
             StringUTF16.putCharSB(value, index, ch);
+            maybeLatin1 = true;
         }
     }
 
@@ -597,6 +609,7 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
         inflateIfNeededFor(asb);
         asb.getBytes(value, count, coder);
         count += len;
+        maybeLatin1 |= asb.maybeLatin1;
         return this;
     }
 
@@ -907,6 +920,7 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
         if (len > 0) {
             shift(end, -len);
             this.count = count - len;
+            maybeLatin1 = true;
         }
         return this;
     }
@@ -958,6 +972,7 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
         checkIndex(index, count);
         shift(index + 1, -1);
         count--;
+        maybeLatin1 = true;
         return this;
     }
 
@@ -992,6 +1007,7 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
         shift(end, newCount - count);
         this.count = newCount;
         putStringAt(start, str);
+        maybeLatin1 = true;
         return this;
     }
 
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 009a61a9ba3..d13cf25b066 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -4521,7 +4521,8 @@ public final class String
             this.coder = LATIN1;
             this.value = Arrays.copyOfRange(val, 0, length);
         } else {
-            if (COMPACT_STRINGS) {
+            // only try to compress val if some characters were deleted.
+            if (COMPACT_STRINGS && asb.maybeLatin1) {
                 byte[] buf = StringUTF16.compress(val, 0, length);
                 if (buf != null) {
                     this.coder = LATIN1;
diff --git a/src/java.base/share/classes/java/lang/StringBuffer.java b/src/java.base/share/classes/java/lang/StringBuffer.java
index 1ba12bd29bc..b0ee2a5c2e3 100644
--- a/src/java.base/share/classes/java/lang/StringBuffer.java
+++ b/src/java.base/share/classes/java/lang/StringBuffer.java
@@ -712,9 +712,7 @@ import jdk.internal.vm.annotation.IntrinsicCandidate;
     @IntrinsicCandidate
     public synchronized String toString() {
         if (toStringCache == null) {
-            return toStringCache =
-                    isLatin1() ? StringLatin1.newString(value, 0, count)
-                               : StringUTF16.newString(value, 0, count);
+            return toStringCache = new String(this, null);
         }
         return new String(toStringCache);
     }
diff --git a/src/java.base/share/classes/java/lang/StringBuilder.java b/src/java.base/share/classes/java/lang/StringBuilder.java
index 8e759c213a9..17fd105ad3f 100644
--- a/src/java.base/share/classes/java/lang/StringBuilder.java
+++ b/src/java.base/share/classes/java/lang/StringBuilder.java
@@ -450,8 +450,7 @@ public final class StringBuilder
     @IntrinsicCandidate
     public String toString() {
         // Create a copy, don't share the array
-        return isLatin1() ? StringLatin1.newString(value, 0, count)
-                          : StringUTF16.newString(value, 0, count);
+        return new String(this);
     }
 
     /**
diff --git a/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java b/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java
index b534b03586a..5564cce8662 100644
--- a/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java
+++ b/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -367,6 +367,43 @@ public class CompactStringBuilder {
         check(new StringBuilder(ORIGIN).reverse(), "\uD801\uFF21\uDC01A");
     }
 
+    /*
+     * Tests for maybeLatin1 attribute
+     */
+    @Test
+    public void testCompactStringForMaybeLatin1() {
+      StringBuilder sb = new StringBuilder("A\uDC01");
+
+      sb.setLength(0);      // maybeLatin1 become true
+      check(sb, "");
+      check(new StringBuilder(sb).append('A'), "A");
+      check(new StringBuilder().append(sb), "");
+
+      sb = new StringBuilder("A\uDC01");
+      sb.setCharAt(1, 'B');   // maybeLatin1 become true
+      check(sb, "AB");
+      check(new StringBuilder(sb).append('A'), "ABA");
+      check(new StringBuilder().append(sb), "AB");
+
+      sb = new StringBuilder("A\uDC01");
+      sb.deleteCharAt(1);   // maybeLatin1 become true
+      check(sb, "A");
+      check(new StringBuilder(sb).append('B'), "AB");
+      check(new StringBuilder().append(sb), "A");
+
+      sb = new StringBuilder("A\uDC01\uFF21\uD801");
+      sb.delete(1, 4);
+      check(sb, "A");      // maybeLatin1 become true
+      check(new StringBuilder(sb).append('B'), "AB");
+      check(new StringBuilder().append(sb), "A");
+
+      sb = new StringBuilder("A\uDC01\uFF21\uD801");
+      sb.replace(1, 4, "B");
+      check(sb, "AB");      // maybeLatin1 become true
+      check(new StringBuilder(sb).append('A'), "ABA");
+      check(new StringBuilder().append(sb), "AB");
+    }
+
     private void checkGetChars(StringBuilder sb, int srcBegin, int srcEnd,
             char expected[]) {
         char[] dst = new char[srcEnd - srcBegin];
diff --git a/test/micro/org/openjdk/bench/java/lang/StringBuilderToString.java b/test/micro/org/openjdk/bench/java/lang/StringBuilderToString.java
new file mode 100644
index 00000000000..b38410204f3
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/StringBuilderToString.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(3)
+public class StringBuilderToString {
+    @Param({"128", "256", "1024"})
+    public int MIXED_SIZE;
+
+    /**
+     * This microbench simulates how java.io.BufferedReader uses StringBuilder.
+     */
+    @Benchmark
+    public String toStringWithMixedChars() {
+        StringBuilder sb = new StringBuilder(MIXED_SIZE);
+        for (int i = 0; i < MIXED_SIZE - 4; ++i) {
+            sb.append('a');
+        }
+        sb.append('\u3042'); // can't be encoded in latin-1,
+        return sb.toString();
+    }
+}
-- 
GitLab


From 9156c0b213b743e65ed0fd9ab768e684cdcf1584 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Fri, 1 Apr 2022 06:37:46 +0000
Subject: [PATCH 312/345] 8274148: can jshell show deprecated classes, methods
 and fields as strikethrough text?

Reviewed-by: vromero
---
 .../jshell/tool/ConsoleIOContext.java         | 220 +++++++++++----
 .../jdk/jshell/SourceCodeAnalysis.java        |  44 ++-
 .../jdk/jshell/SourceCodeAnalysisImpl.java    | 265 +++++++++++++++++-
 .../share/classes/jdk/jshell/TaskFactory.java |   2 +-
 .../langtools/jdk/jshell/HighlightUITest.java |  59 ++++
 .../jdk/jshell/SnippetHighlightTest.java      | 117 ++++++++
 6 files changed, 654 insertions(+), 53 deletions(-)
 create mode 100644 test/langtools/jdk/jshell/HighlightUITest.java
 create mode 100644 test/langtools/jdk/jshell/SnippetHighlightTest.java

diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
index 9d22ab5fd6f..ad3db10ab8b 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,10 +44,15 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -63,6 +68,7 @@ import jdk.internal.org.jline.keymap.KeyMap;
 import jdk.internal.org.jline.reader.Binding;
 import jdk.internal.org.jline.reader.EOFError;
 import jdk.internal.org.jline.reader.EndOfFileException;
+import jdk.internal.org.jline.reader.Highlighter;
 import jdk.internal.org.jline.reader.History;
 import jdk.internal.org.jline.reader.LineReader;
 import jdk.internal.org.jline.reader.LineReader.Option;
@@ -79,14 +85,20 @@ import jdk.internal.org.jline.terminal.Attributes.LocalFlag;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.Terminal;
 import jdk.internal.org.jline.terminal.TerminalBuilder;
+import jdk.internal.org.jline.utils.AttributedString;
+import jdk.internal.org.jline.utils.AttributedStringBuilder;
+import jdk.internal.org.jline.utils.AttributedStyle;
 import jdk.internal.org.jline.utils.Display;
 import jdk.internal.org.jline.utils.NonBlocking;
 import jdk.internal.org.jline.utils.NonBlockingInputStreamImpl;
 import jdk.internal.org.jline.utils.NonBlockingReader;
+import jdk.internal.org.jline.utils.OSUtils;
 import jdk.jshell.ExpressionSnippet;
 import jdk.jshell.Snippet;
 import jdk.jshell.Snippet.SubKind;
+import jdk.jshell.SourceCodeAnalysis.Attribute;
 import jdk.jshell.SourceCodeAnalysis.CompletionInfo;
+import jdk.jshell.SourceCodeAnalysis.Highlight;
 import jdk.jshell.VarSnippet;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -95,6 +107,7 @@ class ConsoleIOContext extends IOContext {
 
     private static final String HISTORY_LINE_PREFIX = "HISTORY_LINE_";
 
+    private final ExecutorService backgroundWork = Executors.newFixedThreadPool(1);
     final boolean allowIncompleteInputs;
     final JShellTool repl;
     final StopDetectingInputStream input;
@@ -120,24 +133,31 @@ class ConsoleIOContext extends IOContext {
         Terminal terminal;
         boolean allowIncompleteInputs = Boolean.getBoolean("jshell.test.allow.incomplete.inputs");
         Consumer<LineReaderImpl> setupReader = r -> {};
+        boolean useComplexDeprecationHighlight = false;
         if (cmdin != System.in) {
+            boolean enableHighlighter;
+            setupReader = r -> {};
             if (System.getProperty("test.jdk") != null) {
                 terminal = new TestTerminal(nonBlockingInput, cmdout);
+                enableHighlighter = Boolean.getBoolean("test.enable.highlighter");
             } else {
                 Size size = null;
                 terminal = new ProgrammaticInTerminal(nonBlockingInput, cmdout, interactive,
                                                       size);
                 if (!interactive) {
-                    setupReader = r -> r.unsetOpt(Option.BRACKETED_PASTE);
+                    setupReader = setupReader.andThen(r -> r.unsetOpt(Option.BRACKETED_PASTE));
                     allowIncompleteInputs = true;
                 }
+                enableHighlighter = interactive;
             }
+            setupReader = setupReader.andThen(r -> r.option(Option.DISABLE_HIGHLIGHTER, !enableHighlighter));
             input.setInputStream(cmdin);
         } else {
             terminal = TerminalBuilder.builder().inputStreamWrapper(in -> {
                 input.setInputStream(in);
                 return nonBlockingInput;
             }).build();
+            useComplexDeprecationHighlight = !OSUtils.IS_WINDOWS;
         }
         this.allowIncompleteInputs = allowIncompleteInputs;
         originalAttributes = terminal.getAttributes();
@@ -145,54 +165,7 @@ class ConsoleIOContext extends IOContext {
         noIntr.setControlChar(ControlChar.VINTR, 0);
         terminal.setAttributes(noIntr);
         terminal.enterRawMode();
-        LineReaderImpl reader = new LineReaderImpl(terminal, "jshell", variables) {
-            {
-                //jline can handle the CONT signal on its own, but (currently) requires sun.misc for it
-                try {
-                    Signal.handle(new Signal("CONT"), new Handler() {
-                        @Override public void handle(Signal sig) {
-                            try {
-                                handleSignal(jdk.internal.org.jline.terminal.Terminal.Signal.CONT);
-                            } catch (Exception ex) {
-                                ex.printStackTrace();
-                            }
-                        }
-                    });
-                } catch (IllegalArgumentException ignored) {
-                    //the CONT signal does not exist on this platform
-                }
-            }
-            CompletionState completionState = new CompletionState();
-            @Override
-            protected boolean doComplete(CompletionType lst, boolean useMenu, boolean prefix) {
-                return ConsoleIOContext.this.complete(completionState);
-            }
-            @Override
-            public Binding readBinding(KeyMap<Binding> keys, KeyMap<Binding> local) {
-                completionState.actionCount++;
-                return super.readBinding(keys, local);
-            }
-            @Override
-            protected boolean insertCloseParen() {
-                Object oldIndent = getVariable(INDENTATION);
-                try {
-                    setVariable(INDENTATION, 0);
-                    return super.insertCloseParen();
-                } finally {
-                    setVariable(INDENTATION, oldIndent);
-                }
-            }
-            @Override
-            protected boolean insertCloseSquare() {
-                Object oldIndent = getVariable(INDENTATION);
-                try {
-                    setVariable(INDENTATION, 0);
-                    return super.insertCloseSquare();
-                } finally {
-                    setVariable(INDENTATION, oldIndent);
-                }
-            }
-        };
+        LineReaderImpl reader = new JShellLineReader(terminal, "jshell", variables);
 
         setupReader.accept(reader);
         reader.setOpt(Option.DISABLE_EVENT_EXPANSION);
@@ -205,6 +178,7 @@ class ConsoleIOContext extends IOContext {
             return new ArgumentLine(line, cursor);
         });
 
+        reader.setHighlighter(new HighlighterImpl(useComplexDeprecationHighlight));
         reader.getKeyMaps().get(LineReader.MAIN)
               .bind((Widget) () -> fixes(), FIXES_SHORTCUT);
         reader.getKeyMaps().get(LineReader.MAIN)
@@ -296,6 +270,7 @@ class ConsoleIOContext extends IOContext {
             throw new IOException(ex);
         }
         input.shutdown();
+        backgroundWork.shutdown();
     }
 
     private Stream<String> toSplitEntries(String entry) {
@@ -1366,4 +1341,149 @@ class ConsoleIOContext extends IOContext {
         public List<CompletionTask> todo = Collections.emptyList();
     }
 
+    private class HighlighterImpl implements Highlighter {
+
+        private final boolean useComplexDeprecationHighlight;
+        private List<UIHighlight> highlights;
+        private String prevBuffer;
+
+        public HighlighterImpl(boolean useComplexDeprecationHighlight) {
+            this.useComplexDeprecationHighlight = useComplexDeprecationHighlight;
+        }
+
+        @Override
+        public AttributedString highlight(LineReader reader, String buffer) {
+            AttributedStringBuilder builder = new AttributedStringBuilder();
+            List<UIHighlight> highlights;
+            synchronized (this) {
+                highlights = this.highlights;
+            }
+            int idx = 0;
+            if (highlights != null) {
+                for (UIHighlight h : highlights) {
+                    if (h.end <= buffer.length() && h.content.equals(buffer.substring(h.start, h.end))) {
+                        builder.append(buffer.substring(idx, h.start));
+                        builder.append(buffer.substring(h.start, h.end), h.style);
+                        idx = h.end;
+                    }
+                }
+            }
+            builder.append(buffer.substring(idx, buffer.length()));
+            synchronized (this) {
+                if (!buffer.equals(prevBuffer)) {
+                    prevBuffer = buffer;
+                    backgroundWork.submit(() -> {
+                        synchronized (HighlighterImpl.this) {
+                            if (!buffer.equals(prevBuffer)) {
+                                return ;
+                            }
+                        }
+                        List<UIHighlight> computedHighlights = new ArrayList<>();
+                        for (Highlight h : repl.analysis.highlights(buffer)) {
+                            computedHighlights.add(new UIHighlight(h.start(), h.end(), buffer.substring(h.start(), h.end()), toAttributedStyle(h.attributes())));
+                        }
+                        synchronized (HighlighterImpl.this) {
+                            if (buffer.equals(prevBuffer)) {
+                                HighlighterImpl.this.highlights = computedHighlights;
+                            }
+                        }
+                        ((JShellLineReader) reader).repaint();
+                    });
+                }
+            }
+            return builder.toAttributedString();
+        }
+
+        private AttributedStyle toAttributedStyle(Set<Attribute> attributes) {
+            AttributedStyle result = AttributedStyle.DEFAULT;
+            if (attributes.contains(Attribute.DECLARATION)) {
+                result = result.bold();
+            }
+            if (attributes.contains(Attribute.DEPRECATED)) {
+                result = useComplexDeprecationHighlight ? result.faint().italic()
+                                                        : result.inverse();
+            }
+            if (attributes.contains(Attribute.KEYWORD)) {
+                result = result.underline();
+            }
+            return result;
+        }
+
+        @Override
+        public void setErrorPattern(Pattern errorPattern) {
+        }
+
+        @Override
+        public void setErrorIndex(int errorIndex) {
+        }
+
+        record UIHighlight(int start, int end, String content, AttributedStyle style) {}
+    }
+
+    private class JShellLineReader extends LineReaderImpl {
+
+        public JShellLineReader(Terminal terminal, String appName, Map<String, Object> variables) {
+            super(terminal, appName, variables);
+            //jline can handle the CONT signal on its own, but (currently) requires sun.misc for it
+            try {
+                Signal.handle(new Signal("CONT"), new Handler() {
+                    @Override public void handle(Signal sig) {
+                        try {
+                            handleSignal(jdk.internal.org.jline.terminal.Terminal.Signal.CONT);
+                        } catch (Exception ex) {
+                            ex.printStackTrace();
+                        }
+                    }
+                });
+            } catch (IllegalArgumentException ignored) {
+                //the CONT signal does not exist on this platform
+            }
+        }
+
+        CompletionState completionState = new CompletionState();
+
+        @Override
+        protected boolean doComplete(CompletionType lst, boolean useMenu, boolean prefix) {
+            return ConsoleIOContext.this.complete(completionState);
+        }
+
+        @Override
+        public Binding readBinding(KeyMap<Binding> keys, KeyMap<Binding> local) {
+            completionState.actionCount++;
+            return super.readBinding(keys, local);
+        }
+
+        @Override
+        protected boolean insertCloseParen() {
+            Object oldIndent = getVariable(INDENTATION);
+            try {
+                setVariable(INDENTATION, 0);
+                return super.insertCloseParen();
+            } finally {
+                setVariable(INDENTATION, oldIndent);
+            }
+        }
+
+        @Override
+        protected boolean insertCloseSquare() {
+            Object oldIndent = getVariable(INDENTATION);
+            try {
+                setVariable(INDENTATION, 0);
+                return super.insertCloseSquare();
+            } finally {
+                setVariable(INDENTATION, oldIndent);
+            }
+        }
+
+        void repaint() {
+            try {
+                lock.lock();
+                if (isReading()) {
+                    redisplay();
+                }
+            } finally {
+                lock.unlock();
+            }
+        }
+    }
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
index e37517df1e6..7a78c04f5a8 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package jdk.jshell;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Provides analysis utilities for source code input.
@@ -170,6 +171,19 @@ public abstract class SourceCodeAnalysis {
      */
     public abstract Collection<Snippet> dependents(Snippet snippet);
 
+    /**
+     * Returns a collection of {@code Highlight}s which can be used to color
+     * the given snippet.
+     * <p>
+     * The returned {@code Highlight}s do not overlap, and are sorted by their
+     * start position.
+     *
+     * @param snippet the snippet for which the {@code Highlight}s should be computed
+     * @return the computed {@code Highlight}s.
+     * @since 19
+     */
+    public abstract List<Highlight> highlights(String snippet);
+
     /**
      * Internal only constructor
      */
@@ -460,4 +474,32 @@ public abstract class SourceCodeAnalysis {
          */
         int wrappedToSourcePosition(int pos);
     }
+
+    /**Assigns attributes usable for coloring to spans inside a snippet.
+     *
+     * @param start the starting position of the span
+     * @param end the ending position of the span
+     * @param attributes the attributes assigned to the span
+     * @since 19
+     */
+    public record Highlight(int start, int end, Set<Attribute> attributes) {}
+
+    /**
+     * A span attribute which can be used to derive a coloring.
+     * @since 19
+     */
+    public enum Attribute {
+        /**
+         * The span refers to a declaration of an element.
+         */
+        DECLARATION,
+        /**
+         * The span refers to a deprecated element.
+         */
+        DEPRECATED,
+        /**
+         * The span is a keyword.
+         */
+        KEYWORD;
+    }
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
index 3dad15b0831..79c1d00f102 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package jdk.jshell;
 
+import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.CompilationUnitTree;
@@ -36,15 +37,19 @@ import com.sun.source.tree.MemberReferenceTree;
 import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.ModifiersTree;
 import com.sun.source.tree.NewClassTree;
 import com.sun.source.tree.Scope;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.Tree.Kind;
+import static com.sun.source.tree.Tree.Kind.METHOD;
 import com.sun.source.tree.TypeParameterTree;
 import com.sun.source.tree.VariableTree;
+import com.sun.source.tree.YieldTree;
 import com.sun.source.util.SourcePositions;
 import com.sun.source.util.TreePath;
 import com.sun.source.util.TreePathScanner;
+import com.sun.source.util.Trees;
 import com.sun.tools.javac.api.JavacScope;
 import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.code.Symbol.CompletionFailure;
@@ -52,6 +57,12 @@ import com.sun.tools.javac.code.Symbol.VarSymbol;
 import com.sun.tools.javac.code.Symtab;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Type.ClassType;
+import com.sun.tools.javac.parser.Scanner;
+import com.sun.tools.javac.parser.ScannerFactory;
+import com.sun.tools.javac.parser.Tokens.Token;
+import com.sun.tools.javac.parser.Tokens.TokenKind;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.util.Context;
 import jdk.internal.shellsupport.doc.JavadocHelper;
 import com.sun.tools.javac.util.Name;
 import com.sun.tools.javac.util.Names;
@@ -98,6 +109,8 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -588,6 +601,256 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
         return proc.maps.getDependents(snippet);
     }
 
+    @Override
+    public List<Highlight> highlights(String snippet) {
+        if (snippet.isEmpty()) {
+            snippet += ";";
+        }
+        //TODO: OuterWrap duplicated
+        OuterWrap codeWrap = switch (guessKind(snippet)) {
+            case IMPORT -> proc.outerMap.wrapImport(Wrap.simpleWrap(snippet + "any.any"), null);
+            case CLASS, METHOD -> proc.outerMap.wrapInTrialClass(Wrap.classMemberWrap(snippet));
+            default -> proc.outerMap.wrapInTrialClass(Wrap.methodWrap(snippet));
+        };
+        String wrappedCode = codeWrap.wrapped();
+        return this.proc.taskFactory.analyze(codeWrap, task -> {
+            List<Highlight> result = new ArrayList<>();
+            CompilationUnitTree cut = task.cuTrees().iterator().next();
+            Trees trees = task.trees();
+            SourcePositions sp = trees.getSourcePositions();
+            List<Token> tokens = new ArrayList<>();
+            Scanner scanner = ScannerFactory.instance(new Context()).newScanner(wrappedCode, false);
+            scanner.nextToken();
+            BiConsumer<Integer, Integer> addKeywordForSpan = (spanStart, spanEnd) -> {
+                int start = codeWrap.wrapIndexToSnippetIndex(spanStart);
+                int end = codeWrap.wrapIndexToSnippetIndex(spanEnd);
+                result.add(new Highlight(start, end, EnumSet.of(Attribute.KEYWORD)));
+            };
+            Consumer<Token> addKeyword = token -> addKeywordForSpan.accept(token.pos, token.endPos);
+            while (scanner.token().kind != TokenKind.EOF) {
+                Token token = scanner.token();
+
+                tokens.add(token);
+                switch (token.kind) {
+                    case ABSTRACT, ASSERT, BOOLEAN, BREAK, BYTE, CASE, CATCH, CHAR, CLASS, CONST,
+                         CONTINUE, DEFAULT, DO, DOUBLE, ELSE, ENUM, EXTENDS, FINAL, FINALLY, FLOAT,
+                         FOR, GOTO, IF, IMPLEMENTS, IMPORT, INSTANCEOF, INT, INTERFACE, LONG,
+                         NATIVE, NEW, PACKAGE, PRIVATE, PROTECTED, PUBLIC, RETURN, SHORT, STATIC,
+                         STRICTFP, SUPER, SWITCH, SYNCHRONIZED, THIS, THROW, THROWS, TRANSIENT, TRY,
+                         VOID, VOLATILE, WHILE, UNDERSCORE -> {
+                        addKeyword.accept(token);
+                    }
+                }
+
+                scanner.nextToken();
+            }
+            new TreePathScanner<Void, Void>() {
+                @Override
+                public Void visitIdentifier(IdentifierTree node, Void p) {
+                    long start = sp.getStartPosition(cut, node);
+                    long end = sp.getEndPosition(cut, node);
+                    handleElement(false, start, end);
+                    return super.visitIdentifier(node, p);
+                }
+                @Override
+                public Void visitMemberSelect(MemberSelectTree node, Void p) {
+                    long exprEnd = sp.getEndPosition(cut, node.getExpression());
+                    Token ident = findTokensFrom(exprEnd, TokenKind.DOT, TokenKind.IDENTIFIER);
+                    if (ident != null) {
+                        handleElement(false, ident.pos, ident.endPos);
+                    }
+                    return super.visitMemberSelect(node, p);
+                }
+                @Override
+                public Void visitClass(ClassTree node, Void p) {
+                    ModifiersTree mods = node.getModifiers();
+                    if (mods.getFlags().contains(Modifier.SEALED) ||
+                        mods.getFlags().contains(Modifier.NON_SEALED)) {
+                        List<Token> modifierTokens = new ArrayList<>();
+                        long modsStart = sp.getStartPosition(cut, mods);
+                        long modsEnd = sp.getEndPosition(cut, mods);
+                        for (Token t : tokens) {
+                            if (t.pos >= modsStart && t.endPos <= modsEnd) {
+                                modifierTokens.add(t);
+                            }
+                        }
+                        for (AnnotationTree at : mods.getAnnotations()) {
+                            long annStart = sp.getStartPosition(cut, at);
+                            long annEnd = sp.getEndPosition(cut, at);
+                            modifierTokens.removeIf(t -> t.pos >= annStart && t.endPos <= annEnd);
+                        }
+                        OUTER: for (int i = 0; i < modifierTokens.size(); i++) {
+                            if (modifierTokens.get(i).kind == TokenKind.IDENTIFIER) {
+                                switch (modifierTokens.get(i).name().toString()) {
+                                    case "non" -> {
+                                        addKeywordForSpan.accept(modifierTokens.get(i).pos,
+                                                                 modifierTokens.get(i + 2).endPos);
+                                        break OUTER;
+                                    }
+                                    case "sealed" -> {
+                                        addKeyword.accept(modifierTokens.get(i));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    int pos = ((JCTree) node).pos;
+                    Token ident = switch (node.getKind()) {
+                        case ANNOTATION_TYPE, INTERFACE ->
+                            findTokensFrom(pos, TokenKind.INTERFACE, TokenKind.IDENTIFIER);
+                        case CLASS -> findTokensFrom(pos, TokenKind.CLASS, TokenKind.IDENTIFIER);
+                        case ENUM -> findTokensFrom(pos, TokenKind.ENUM, TokenKind.IDENTIFIER);
+                        case RECORD -> {
+                            Token recordCandidate = findTokensFrom(pos, TokenKind.IDENTIFIER);
+                            if (recordCandidate != null && recordCandidate.name().contentEquals("record")) {
+                                addKeyword.accept(recordCandidate);
+                            }
+                            yield findTokensFrom(pos, TokenKind.IDENTIFIER, TokenKind.IDENTIFIER);
+                        }
+                        default -> throw new IllegalStateException("Unsupported token kind: " + node.getKind());
+                    };
+                    if (ident != null) {
+                        handleElement(true, ident.pos, ident.endPos);
+                    }
+                    if (!node.getPermitsClause().isEmpty()) {
+                        long start = sp.getStartPosition(cut, node.getPermitsClause().get(0));
+                        Token permitsCandidate = findTokensBefore(start, TokenKind.IDENTIFIER);
+                        if (permitsCandidate != null && permitsCandidate.name().contentEquals("permits")) {
+                            addKeyword.accept(permitsCandidate);
+                        }
+                    }
+                    return super.visitClass(node, p);
+                }
+                @Override
+                public Void visitMethod(MethodTree node, Void p) {
+                    int pos = ((JCTree) node).pos;
+                    Token ident = findTokensFrom(pos, TokenKind.IDENTIFIER);
+                    if (ident != null) {
+                        handleElement(true, ident.pos, ident.endPos);
+                    }
+                    return super.visitMethod(node, p);
+                }
+                @Override
+                public Void visitVariable(VariableTree node, Void p) {
+                    int pos = ((JCTree) node).pos;
+                    if (sp.getEndPosition(cut, node.getType()) == (-1)) {
+                        Token varCandidate = findTokensBefore(pos, TokenKind.IDENTIFIER);
+                        if (varCandidate != null && "var".equals(varCandidate.name().toString())) {
+                            addKeyword.accept(varCandidate);
+                        }
+                    }
+                    Token ident = findTokensFrom(pos, TokenKind.IDENTIFIER);
+                    if (ident != null) {
+                        handleElement(true, ident.pos, ident.endPos);
+                    }
+                    return super.visitVariable(node, p);
+                }
+                @Override
+                public Void visitYield(YieldTree node, Void p) {
+                    long start = sp.getStartPosition(cut, node);
+                    Token yield = findTokensFrom(start, TokenKind.IDENTIFIER);
+                    addKeyword.accept(yield);
+                    return super.visitYield(node, p);
+                }
+                @Override
+                public Void visitErroneous(ErroneousTree node, Void p) {
+                    for (Tree err : node.getErrorTrees()) {
+                        scan(err, p);
+                    }
+                    return null;
+                }
+                @Override
+                public Void scan(Tree tree, Void p) {
+                    if (tree != null) {
+                        long end = sp.getEndPosition(cut, tree);
+                        if (end == (-1)) {
+                            //synthetic
+                            return null;
+                        }
+                    }
+                    return super.scan(tree, p);
+                }
+                private void handleElement(boolean declaration, long codeStart, long codeEnd) {
+                    Element el = trees.getElement(getCurrentPath());
+                    if (getCurrentPath().getParentPath().getLeaf().getKind() == Kind.NEW_CLASS) {
+                        NewClassTree nct = (NewClassTree) getCurrentPath().getParentPath().getLeaf();
+                        if (nct.getIdentifier() == getCurrentPath().getLeaf()) {
+                            el = trees.getElement(getCurrentPath().getParentPath());
+                        }
+                    }
+                    if (el != null) {
+                        boolean deprecated = task.getElements().isDeprecated(el);
+                        if (declaration || deprecated) {
+                            Set<Attribute> attributes = EnumSet.noneOf(Attribute.class);
+                            if (declaration) {
+                                attributes.add(Attribute.DECLARATION);
+                            }
+                            if (deprecated) {
+                                attributes.add(Attribute.DEPRECATED);
+                            }
+                            int start = codeWrap.wrapIndexToSnippetIndex(codeStart);
+                            int end = codeWrap.wrapIndexToSnippetIndex(codeEnd);
+                            result.add(new Highlight(start, end, attributes));
+                        }
+                    }
+                }
+                private Token findTokensFrom(long pos, TokenKind... expectedKinds) {
+                    int tokenIdx = 0;
+
+                    while (tokenIdx < tokens.size() && tokens.get(tokenIdx).pos < pos) {
+                        tokenIdx++;
+                    }
+
+                    if (tokenIdx + expectedKinds.length - 1 < tokens.size()) {
+                        Token t = null;
+                        for (TokenKind expectedKind : expectedKinds) {
+                            t = tokens.get(tokenIdx);
+
+                            if (t.kind != expectedKind) {
+                                return null;
+                            }
+
+                            tokenIdx++;
+                        }
+
+                        return t;
+                    }
+
+                    return null;
+                }
+                private Token findTokensBefore(long pos, TokenKind... expectedKinds) {
+                    int tokenIdx = 0;
+
+                    while (tokenIdx < tokens.size() && tokens.get(tokenIdx).pos < pos) {
+                        tokenIdx++;
+                    }
+
+                    tokenIdx--;
+
+                    if (tokenIdx >= expectedKinds.length) {
+                        Token t = null;
+                        for (TokenKind expectedKind : expectedKinds) {
+                            t = tokens.get(tokenIdx);
+
+                            if (t.kind != expectedKind) {
+                                return null;
+                            }
+
+                            tokenIdx--;
+                        }
+
+                        return t;
+                    }
+
+                    return null;
+                }
+            }.scan(cut, null);
+            result.removeIf(h -> h.start() == h.end());
+            Collections.sort(result, (h1, h2) -> h1.start() - h2.start());
+            return result;
+        });
+    }
+
     private boolean isStaticContext(AnalyzeTask at, TreePath path) {
         switch (path.getLeaf().getKind()) {
             case ARRAY_TYPE:
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java b/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
index 34018de5030..ac777435102 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
@@ -190,7 +190,7 @@ class TaskFactory {
                        worker);
     }
 
-    private <S, T extends BaseTask<S>, Z> Z runTask(Stream<S> inputs,
+    private synchronized <S, T extends BaseTask<S>, Z> Z runTask(Stream<S> inputs,
                                                  SourceHandler<S> sh,
                                                  List<String> options,
                                                  BiFunction<JavacTaskImpl, DiagnosticCollector<JavaFileObject>, T> creator,
diff --git a/test/langtools/jdk/jshell/HighlightUITest.java b/test/langtools/jdk/jshell/HighlightUITest.java
new file mode 100644
index 00000000000..ede22e8f010
--- /dev/null
+++ b/test/langtools/jdk/jshell/HighlightUITest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8274148
+ * @summary Check the UI behavior of snippet highligting
+ * @modules
+ *     jdk.compiler/com.sun.tools.javac.api
+ *     jdk.compiler/com.sun.tools.javac.main
+ *     jdk.jshell/jdk.internal.jshell.tool:open
+ *     jdk.jshell/jdk.internal.jshell.tool.resources:open
+ *     jdk.jshell/jdk.jshell:open
+ * @library /tools/lib
+ * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
+ * @build Compiler UITesting
+ * @compile HighlightUITest.java
+ * @run testng HighlightUITest
+ */
+
+import org.testng.annotations.Test;
+
+@Test
+public class HighlightUITest extends UITesting {
+
+    public HighlightUITest() {
+        super(true);
+    }
+
+    public void testHighlight() throws Exception {
+        System.setProperty("test.enable.highlighter", "true");
+        doRunTest((inputSink, out) -> {
+            inputSink.write("var s = new String(byte[0], 0);");
+            waitOutput(out, "var s = new String\\(byte\\[0]\u001B\\[3D\u001B\\[3C, 0\\)\u001B\\[12D\u001B\\[12C;\r" +
+                            "\u001B\\[4mvar\u001B\\[0m \u001B\\[1ms\u001B\\[0m = \u001B\\[4mnew\u001B\\[0m String\\(\u001B\\[4mbyte\u001B\\[0m\\u001B\\[8C");
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/jshell/SnippetHighlightTest.java b/test/langtools/jdk/jshell/SnippetHighlightTest.java
new file mode 100644
index 00000000000..4a34e8820d5
--- /dev/null
+++ b/test/langtools/jdk/jshell/SnippetHighlightTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8274148
+ * @summary Check snippet highlighting
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.javap
+ *          jdk.jshell/jdk.jshell:open
+ * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
+ * @build KullaTesting TestingInputStream Compiler
+ * @run testng SnippetHighlightTest
+ */
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.testng.annotations.Test;
+
+import jdk.jshell.SourceCodeAnalysis.Highlight;
+
+import static org.testng.Assert.*;
+
+@Test
+public class SnippetHighlightTest extends KullaTesting {
+
+    public void testMemberExpr() {
+        assertEval("@Deprecated class TestClass { }");
+        assertEval("class TestConstructor { @Deprecated TestConstructor() {} }");
+        assertEval("class TestMethod { @Deprecated void test() {} }");
+        assertHighlights("TestClass t", "Highlight[start=0, end=9, attributes=[DEPRECATED]]",
+                                        "Highlight[start=10, end=11, attributes=[DECLARATION]]");
+        assertHighlights("TestClass.class", "Highlight[start=0, end=9, attributes=[DEPRECATED]]",
+                                            "Highlight[start=10, end=15, attributes=[KEYWORD]]");
+        assertHighlights("new TestConstructor()", "Highlight[start=0, end=3, attributes=[KEYWORD]]",
+                                                  "Highlight[start=4, end=19, attributes=[DEPRECATED]]");
+        assertHighlights("new TestMethod().test()", "Highlight[start=0, end=3, attributes=[KEYWORD]]",
+                                                    "Highlight[start=17, end=21, attributes=[DEPRECATED]]");
+        assertHighlights("var v = 0;", "Highlight[start=0, end=3, attributes=[KEYWORD]]",
+                                       "Highlight[start=4, end=5, attributes=[DECLARATION]]");
+        assertHighlights("int i = switch (0) { case 0: yield 0;};",
+                         "Highlight[start=0, end=3, attributes=[KEYWORD]]",
+                         "Highlight[start=4, end=5, attributes=[DECLARATION]]",
+                         "Highlight[start=8, end=14, attributes=[KEYWORD]]",
+                         "Highlight[start=21, end=25, attributes=[KEYWORD]]",
+                         "Highlight[start=29, end=34, attributes=[KEYWORD]]");
+        assertHighlights("sealed class C permits A {}",
+                         "Highlight[start=0, end=6, attributes=[KEYWORD]]",
+                         "Highlight[start=7, end=12, attributes=[KEYWORD]]",
+                         "Highlight[start=13, end=14, attributes=[DECLARATION]]",
+                         "Highlight[start=15, end=22, attributes=[KEYWORD]]");
+        assertHighlights("non-sealed class C extends A {}",
+                         "Highlight[start=0, end=10, attributes=[KEYWORD]]",
+                         "Highlight[start=11, end=16, attributes=[KEYWORD]]",
+                         "Highlight[start=17, end=18, attributes=[DECLARATION]]",
+                         "Highlight[start=19, end=26, attributes=[KEYWORD]]");
+        assertHighlights("interface I {}",
+                         "Highlight[start=0, end=9, attributes=[KEYWORD]]",
+                         "Highlight[start=10, end=11, attributes=[DECLARATION]]");
+        assertHighlights("@interface I {}",
+                         "Highlight[start=1, end=10, attributes=[KEYWORD]]",
+                         "Highlight[start=11, end=12, attributes=[DECLARATION]]");
+        assertHighlights("enum E {A, B;}",
+                         "Highlight[start=0, end=4, attributes=[KEYWORD]]",
+                         "Highlight[start=5, end=6, attributes=[DECLARATION]]",
+                         "Highlight[start=8, end=9, attributes=[DECLARATION]]",
+                         "Highlight[start=11, end=12, attributes=[DECLARATION]]");
+        assertHighlights("record R(int i) {}",
+                         "Highlight[start=0, end=6, attributes=[KEYWORD]]",
+                         "Highlight[start=7, end=8, attributes=[DECLARATION]]",
+                         "Highlight[start=9, end=12, attributes=[KEYWORD]]",
+                         "Highlight[start=13, end=14, attributes=[DECLARATION]]");
+        assertHighlights("void method() {}",
+                         "Highlight[start=0, end=4, attributes=[KEYWORD]]",
+                         "Highlight[start=5, end=11, attributes=[DECLARATION]]");
+    }
+
+    private void assertHighlights(String code, String... expected) {
+        List<String> completions = computeHighlights(code);
+        assertEquals(completions, Arrays.asList(expected), "Input: " + code + ", " + completions.toString());
+    }
+
+    private List<String> computeHighlights(String code) {
+        waitIndexingFinished();
+
+        List<Highlight> highlights =
+                getAnalysis().highlights(code);
+        return highlights.stream()
+                          .map(h -> h.toString())
+                          .distinct()
+                          .collect(Collectors.toList());
+    }
+}
-- 
GitLab


From 05ea7a51e1167ff18720209f43ecb23f46eb3a17 Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Fri, 1 Apr 2022 09:33:46 +0000
Subject: [PATCH 313/345] 8282431: AArch64: Add optimized rules for masked
 vector multiply-add/sub for SVE

Reviewed-by: njian, ngasson
---
 src/hotspot/cpu/aarch64/aarch64_sve.ad        | 316 +++++++++++++-
 src/hotspot/cpu/aarch64/aarch64_sve_ad.m4     | 250 +++++++++--
 src/hotspot/cpu/aarch64/assembler_aarch64.hpp |   7 +-
 test/hotspot/gtest/aarch64/aarch64-asmtest.py |   3 +
 test/hotspot/gtest/aarch64/asmtest.out.h      |  93 ++--
 .../VectorFusedMultiplyAddSubTest.java        | 412 ++++++++++++++++++
 6 files changed, 973 insertions(+), 108 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java

diff --git a/src/hotspot/cpu/aarch64/aarch64_sve.ad b/src/hotspot/cpu/aarch64/aarch64_sve.ad
index c5ef0b57870..165a6444f83 100644
--- a/src/hotspot/cpu/aarch64/aarch64_sve.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_sve.ad
@@ -1544,10 +1544,10 @@ instruct vfmlaD(vReg dst_src1, vReg src2, vReg src3) %{
   ins_pipe(pipe_slow);
 %}
 
-// vector fmla - predicated
+// vector fmad - predicated
 
 // dst_src1 = dst_src1 * src2 + src3
-instruct vfmlaF_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+instruct vfmadF_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
   predicate(UseFMA && UseSVE > 0);
   match(Set dst_src1 (FmaVF (Binary dst_src1 src2) (Binary src3 pg)));
   ins_cost(SVE_COST);
@@ -1560,7 +1560,7 @@ instruct vfmlaF_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
 %}
 
 // dst_src1 = dst_src1 * src2 + src3
-instruct vfmlaD_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+instruct vfmadD_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
   predicate(UseFMA && UseSVE > 0);
   match(Set dst_src1 (FmaVD (Binary dst_src1 src2) (Binary src3 pg)));
   ins_cost(SVE_COST);
@@ -1575,10 +1575,25 @@ instruct vfmlaD_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
 // vector fmls
 
 // dst_src1 = dst_src1 + -src2 * src3
-// dst_src1 = dst_src1 + src2 * -src3
-instruct vfmlsF(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+// The NegVF must not be predicated.
+instruct vfmlsF1(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVF dst_src1 (Binary (NegVF src2) src3)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fmls $dst_src1, $src2, $src3\t # vector (sve) (S)" %}
+  ins_encode %{
+    __ sve_fmls(as_FloatRegister($dst_src1$$reg), __ S,
+         ptrue, as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * -src3
+// The NegVF must not be predicated.
+instruct vfmlsF2(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(2)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVF dst_src1 (Binary src2 (NegVF src3))));
   ins_cost(SVE_COST);
   format %{ "sve_fmls $dst_src1, $src2, $src3\t # vector (sve) (S)" %}
@@ -1590,10 +1605,25 @@ instruct vfmlsF(vReg dst_src1, vReg src2, vReg src3) %{
 %}
 
 // dst_src1 = dst_src1 + -src2 * src3
-// dst_src1 = dst_src1 + src2 * -src3
-instruct vfmlsD(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+// The NegVD must not be predicated.
+instruct vfmlsD1(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVD dst_src1 (Binary (NegVD src2) src3)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fmls $dst_src1, $src2, $src3\t # vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_fmls(as_FloatRegister($dst_src1$$reg), __ D,
+         ptrue, as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * -src3
+// The NegVD must not be predicated.
+instruct vfmlsD2(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(2)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVD dst_src1 (Binary src2 (NegVD src3))));
   ins_cost(SVE_COST);
   format %{ "sve_fmls $dst_src1, $src2, $src3\t # vector (sve) (D)" %}
@@ -1604,13 +1634,62 @@ instruct vfmlsD(vReg dst_src1, vReg src2, vReg src3) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector fmsb - predicated
+
+// dst_src1 = dst_src1 * -src2 + src3
+// The NegVF must not be predicated.
+instruct vfmsbF_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->in(2)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaVF (Binary dst_src1 (NegVF src2)) (Binary src3 pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fmsb $dst_src1, $pg, $src2, $src3\t # vector (sve) (S)" %}
+  ins_encode %{
+    __ sve_fmsb(as_FloatRegister($dst_src1$$reg), __ S, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 * -src2 + src3
+// The NegVD must not be predicated.
+instruct vfmsbD_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->in(2)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaVD (Binary dst_src1 (NegVD src2)) (Binary src3 pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fmsb $dst_src1, $pg, $src2, $src3\t # vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_fmsb(as_FloatRegister($dst_src1$$reg), __ D, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector fnmla
 
 // dst_src1 = -dst_src1 + -src2 * src3
-// dst_src1 = -dst_src1 + src2 * -src3
-instruct vfnmlaF(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+// The NegVF must not be predicated.
+instruct vfnmlaF1(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVF (NegVF dst_src1) (Binary (NegVF src2) src3)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmla $dst_src1, $src2, $src3\t # vector (sve) (S)" %}
+  ins_encode %{
+    __ sve_fnmla(as_FloatRegister($dst_src1$$reg), __ S,
+         ptrue, as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = -dst_src1 + src2 * -src3
+// The NegVF must not be predicated.
+instruct vfnmlaF2(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(2)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVF (NegVF dst_src1) (Binary src2 (NegVF src3))));
   ins_cost(SVE_COST);
   format %{ "sve_fnmla $dst_src1, $src2, $src3\t # vector (sve) (S)" %}
@@ -1622,10 +1701,27 @@ instruct vfnmlaF(vReg dst_src1, vReg src2, vReg src3) %{
 %}
 
 // dst_src1 = -dst_src1 + -src2 * src3
-// dst_src1 = -dst_src1 + src2 * -src3
-instruct vfnmlaD(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+// The NegVD must not be predicated.
+instruct vfnmlaD1(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVD (NegVD dst_src1) (Binary (NegVD src2) src3)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmla $dst_src1, $src2, $src3\t # vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_fnmla(as_FloatRegister($dst_src1$$reg), __ D,
+         ptrue, as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = -dst_src1 + src2 * -src3
+// The NegVD must not be predicated.
+instruct vfnmlaD2(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(2)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVD (NegVD dst_src1) (Binary src2 (NegVD src3))));
   ins_cost(SVE_COST);
   format %{ "sve_fnmla $dst_src1, $src2, $src3\t # vector (sve) (D)" %}
@@ -1636,11 +1732,47 @@ instruct vfnmlaD(vReg dst_src1, vReg src2, vReg src3) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector fnmad - predicated
+
+// dst_src1 = -src3 + dst_src1 * -src2
+// The NegVF must not be predicated.
+instruct vfnmadF_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->in(2)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaVF (Binary dst_src1 (NegVF src2)) (Binary (NegVF src3) pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmad $dst_src1, $pg, $src2, $src3\t # vector (sve) (S)" %}
+  ins_encode %{
+    __ sve_fnmad(as_FloatRegister($dst_src1$$reg), __ S, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = -src3 + dst_src1 * -src2
+// The NegVD must not be predicated.
+instruct vfnmadD_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->in(2)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaVD (Binary dst_src1 (NegVD src2)) (Binary (NegVD src3) pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmad $dst_src1, $pg, $src2, $src3\t # vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_fnmad(as_FloatRegister($dst_src1$$reg), __ D, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector fnmls
 
 // dst_src1 = -dst_src1 + src2 * src3
+// The NegVF must not be predicated.
 instruct vfnmlsF(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVF (NegVF dst_src1) (Binary src2 src3)));
   ins_cost(SVE_COST);
   format %{ "sve_fnmls $dst_src1, $src2, $src3\t # vector (sve) (S)" %}
@@ -1652,8 +1784,10 @@ instruct vfnmlsF(vReg dst_src1, vReg src2, vReg src3) %{
 %}
 
 // dst_src1 = -dst_src1 + src2 * src3
+// The NegVD must not be predicated.
 instruct vfnmlsD(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaVD (NegVD dst_src1) (Binary src2 src3)));
   ins_cost(SVE_COST);
   format %{ "sve_fnmls $dst_src1, $src2, $src3\t # vector (sve) (D)" %}
@@ -1664,6 +1798,38 @@ instruct vfnmlsD(vReg dst_src1, vReg src2, vReg src3) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector fnmsb - predicated
+
+// dst_src1 = -src3 + dst_src1 * src2
+// The NegVF must not be predicated.
+instruct vfnmsbF_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaVF (Binary dst_src1 src2) (Binary (NegVF src3) pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmsb $dst_src1, $pg, $src2, $src3\t # vector (sve) (S)" %}
+  ins_encode %{
+    __ sve_fnmsb(as_FloatRegister($dst_src1$$reg), __ S, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = -src3 + dst_src1 * src2
+// The NegVD must not be predicated.
+instruct vfnmsbD_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaVD (Binary dst_src1 src2) (Binary (NegVD src3) pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmsb $dst_src1, $pg, $src2, $src3\t # vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_fnmsb(as_FloatRegister($dst_src1$$reg), __ D, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector mla
 
 // dst_src1 = dst_src1 + src2 * src3
@@ -1722,6 +1888,64 @@ instruct vmlaL(vReg dst_src1, vReg src2, vReg src3)
   ins_pipe(pipe_slow);
 %}
 
+// vector mla - predicated
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmlaB_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (AddVB (Binary dst_src1 (MulVB src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mla $dst_src1, $pg, src2, src3\t # vector (sve) (B)" %}
+  ins_encode %{
+    __ sve_mla(as_FloatRegister($dst_src1$$reg), __ B, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmlaS_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (AddVS (Binary dst_src1 (MulVS src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mla $dst_src1, $pg, src2, src3\t # vector (sve) (H)" %}
+  ins_encode %{
+    __ sve_mla(as_FloatRegister($dst_src1$$reg), __ H, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmlaI_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (AddVI (Binary dst_src1 (MulVI src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mla $dst_src1, $pg, src2, src3\t # vector (sve) (S)" %}
+  ins_encode %{
+    __ sve_mla(as_FloatRegister($dst_src1$$reg), __ S, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmlaL_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (AddVL (Binary dst_src1 (MulVL src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mla $dst_src1, $pg, src2, src3\t # vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_mla(as_FloatRegister($dst_src1$$reg), __ D, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector mls
 
 // dst_src1 = dst_src1 - src2 * src3
@@ -1780,6 +2004,64 @@ instruct vmlsL(vReg dst_src1, vReg src2, vReg src3)
   ins_pipe(pipe_slow);
 %}
 
+// vector mls - predicated
+
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmlsB_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (SubVB (Binary dst_src1 (MulVB src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mls $dst_src1, $pg, src2, src3\t # vector (sve) (B)" %}
+  ins_encode %{
+    __ sve_mls(as_FloatRegister($dst_src1$$reg), __ B, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmlsS_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (SubVS (Binary dst_src1 (MulVS src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mls $dst_src1, $pg, src2, src3\t # vector (sve) (H)" %}
+  ins_encode %{
+    __ sve_mls(as_FloatRegister($dst_src1$$reg), __ H, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmlsI_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (SubVI (Binary dst_src1 (MulVI src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mls $dst_src1, $pg, src2, src3\t # vector (sve) (S)" %}
+  ins_encode %{
+    __ sve_mls(as_FloatRegister($dst_src1$$reg), __ S, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmlsL_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (SubVL (Binary dst_src1 (MulVL src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mls $dst_src1, $pg, src2, src3\t # vector (sve) (D)" %}
+  ins_encode %{
+    __ sve_mls(as_FloatRegister($dst_src1$$reg), __ D, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector mul
 
 instruct vmulB(vReg dst_src1, vReg src2) %{
diff --git a/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
index 8b0a56d0f30..bb757b7d152 100644
--- a/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_sve_ad.m4
@@ -907,8 +907,8 @@ VMINMAX_PREDICATE(min, MinV, sve_fmin, sve_smin)
 VMINMAX_PREDICATE(max, MaxV, sve_fmax, sve_smax)
 
 dnl
-dnl VFMLA($1           $2    $3         )
-dnl VFMLA(name_suffix, size, min_vec_len)
+dnl VFMLA($1           $2  )
+dnl VFMLA(name_suffix, size)
 define(`VFMLA', `
 // dst_src1 = dst_src1 + src2 * src3
 instruct vfmla$1(vReg dst_src1, vReg src2, vReg src3) %{
@@ -924,15 +924,15 @@ instruct vfmla$1(vReg dst_src1, vReg src2, vReg src3) %{
 %}')dnl
 dnl
 // vector fmla
-VFMLA(F, S, 4)
-VFMLA(D, D, 2)
+VFMLA(F, S)
+VFMLA(D, D)
 
 dnl
-dnl VFMLA_PREDICATE($1,   $2  )
-dnl VFMLA_PREDICATE(type, size)
-define(`VFMLA_PREDICATE', `
+dnl VFMAD_PREDICATE($1           $2  )
+dnl VFMAD_PREDICATE(name_suffix, size)
+define(`VFMAD_PREDICATE', `
 // dst_src1 = dst_src1 * src2 + src3
-instruct vfmla$1_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+instruct vfmad$1_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
   predicate(UseFMA && UseSVE > 0);
   match(Set dst_src1 (FmaV$1 (Binary dst_src1 src2) (Binary src3 pg)));
   ins_cost(SVE_COST);
@@ -944,19 +944,37 @@ instruct vfmla$1_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
   ins_pipe(pipe_slow);
 %}')dnl
 dnl
-// vector fmla - predicated
-VFMLA_PREDICATE(F, S)
-VFMLA_PREDICATE(D, D)
+// vector fmad - predicated
+VFMAD_PREDICATE(F, S)
+VFMAD_PREDICATE(D, D)
 
 dnl
-dnl VFMLS($1           $2    $3         )
-dnl VFMLS(name_suffix, size, min_vec_len)
-define(`VFMLS', `
+dnl VFMLS1($1           $2  )
+dnl VFMLS1(name_suffix, size)
+define(`VFMLS1', `
 // dst_src1 = dst_src1 + -src2 * src3
-// dst_src1 = dst_src1 + src2 * -src3
-instruct vfmls$1(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+// The NegV$1 must not be predicated.
+instruct vfmls`$1'1(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaV$1 dst_src1 (Binary (NegV$1 src2) src3)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fmls $dst_src1, $src2, $src3\t # vector (sve) ($2)" %}
+  ins_encode %{
+    __ sve_fmls(as_FloatRegister($dst_src1$$reg), __ $2,
+         ptrue, as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+dnl VFMLS2($1           $2  )
+dnl VFMLS2(name_suffix, size)
+define(`VFMLS2', `
+// dst_src1 = dst_src1 + src2 * -src3
+// The NegV$1 must not be predicated.
+instruct vfmls`$1'2(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(2)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaV$1 dst_src1 (Binary src2 (NegV$1 src3))));
   ins_cost(SVE_COST);
   format %{ "sve_fmls $dst_src1, $src2, $src3\t # vector (sve) ($2)" %}
@@ -968,18 +986,63 @@ instruct vfmls$1(vReg dst_src1, vReg src2, vReg src3) %{
 %}')dnl
 dnl
 // vector fmls
-VFMLS(F, S, 4)
-VFMLS(D, D, 2)
+VFMLS1(F, S)
+VFMLS2(F, S)
+VFMLS1(D, D)
+VFMLS2(D, D)
+
+dnl
+dnl VFMSB_PREDICATE($1           $2  )
+dnl VFMSB_PREDICATE(name_suffix, size)
+define(`VFMSB_PREDICATE', `
+// dst_src1 = dst_src1 * -src2 + src3
+// The NegV$1 must not be predicated.
+instruct vfmsb$1_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->in(2)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaV$1 (Binary dst_src1 (NegV$1 src2)) (Binary src3 pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fmsb $dst_src1, $pg, $src2, $src3\t # vector (sve) ($2)" %}
+  ins_encode %{
+    __ sve_fmsb(as_FloatRegister($dst_src1$$reg), __ $2, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+// vector fmsb - predicated
+VFMSB_PREDICATE(F, S)
+VFMSB_PREDICATE(D, D)
 
 dnl
-dnl VFNMLA($1           $2    $3         )
-dnl VFNMLA(name_suffix, size, min_vec_len)
-define(`VFNMLA', `
+dnl VFNMLA1($1           $2  )
+dnl VFNMLA1(name_suffix, size)
+define(`VFNMLA1', `
 // dst_src1 = -dst_src1 + -src2 * src3
-// dst_src1 = -dst_src1 + src2 * -src3
-instruct vfnmla$1(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+// The NegV$1 must not be predicated.
+instruct vfnmla`$1'1(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaV$1 (NegV$1 dst_src1) (Binary (NegV$1 src2) src3)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmla $dst_src1, $src2, $src3\t # vector (sve) ($2)" %}
+  ins_encode %{
+    __ sve_fnmla(as_FloatRegister($dst_src1$$reg), __ $2,
+         ptrue, as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+dnl VFNMLA2($1           $2  )
+dnl VFNMLA2(name_suffix, size)
+define(`VFNMLA2', `
+// dst_src1 = -dst_src1 + src2 * -src3
+// The NegV$1 must not be predicated.
+instruct vfnmla`$1'2(vReg dst_src1, vReg src2, vReg src3) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(2)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaV$1 (NegV$1 dst_src1) (Binary src2 (NegV$1 src3))));
   ins_cost(SVE_COST);
   format %{ "sve_fnmla $dst_src1, $src2, $src3\t # vector (sve) ($2)" %}
@@ -991,16 +1054,44 @@ instruct vfnmla$1(vReg dst_src1, vReg src2, vReg src3) %{
 %}')dnl
 dnl
 // vector fnmla
-VFNMLA(F, S, 4)
-VFNMLA(D, D, 2)
+VFNMLA1(F, S)
+VFNMLA2(F, S)
+VFNMLA1(D, D)
+VFNMLA2(D, D)
+
+dnl
+dnl VFNMAD_PREDICATE($1           $2  )
+dnl VFNMAD_PREDICATE(name_suffix, size)
+define(`VFNMAD_PREDICATE', `
+// dst_src1 = -src3 + dst_src1 * -src2
+// The NegV$1 must not be predicated.
+instruct vfnmad$1_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->in(2)->as_Vector()->is_predicated_vector() &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaV$1 (Binary dst_src1 (NegV$1 src2)) (Binary (NegV$1 src3) pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmad $dst_src1, $pg, $src2, $src3\t # vector (sve) ($2)" %}
+  ins_encode %{
+    __ sve_fnmad(as_FloatRegister($dst_src1$$reg), __ $2, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+// vector fnmad - predicated
+VFNMAD_PREDICATE(F, S)
+VFNMAD_PREDICATE(D, D)
 
 dnl
-dnl VFNMLS($1           $2    $3         )
-dnl VFNMLS(name_suffix, size, min_vec_len)
+dnl VFNMLS($1           $2  )
+dnl VFNMLS(name_suffix, size)
 define(`VFNMLS', `
 // dst_src1 = -dst_src1 + src2 * src3
+// The NegV$1 must not be predicated.
 instruct vfnmls$1(vReg dst_src1, vReg src2, vReg src3) %{
-  predicate(UseFMA && UseSVE > 0);
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(1)->as_Vector()->is_predicated_vector());
   match(Set dst_src1 (FmaV$1 (NegV$1 dst_src1) (Binary src2 src3)));
   ins_cost(SVE_COST);
   format %{ "sve_fnmls $dst_src1, $src2, $src3\t # vector (sve) ($2)" %}
@@ -1012,12 +1103,35 @@ instruct vfnmls$1(vReg dst_src1, vReg src2, vReg src3) %{
 %}')dnl
 dnl
 // vector fnmls
-VFNMLS(F, S, 4)
-VFNMLS(D, D, 2)
+VFNMLS(F, S)
+VFNMLS(D, D)
+
+dnl
+dnl VFNMSB_PREDICATE($1           $2  )
+dnl VFNMSB_PREDICATE(name_suffix, size)
+define(`VFNMSB_PREDICATE', `
+// dst_src1 = -src3 + dst_src1 * src2
+// The NegV$1 must not be predicated.
+instruct vfnmsb$1_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
+  predicate(UseFMA && UseSVE > 0 &&
+            !n->in(2)->in(1)->as_Vector()->is_predicated_vector());
+  match(Set dst_src1 (FmaV$1 (Binary dst_src1 src2) (Binary (NegV$1 src3) pg)));
+  ins_cost(SVE_COST);
+  format %{ "sve_fnmsb $dst_src1, $pg, $src2, $src3\t # vector (sve) ($2)" %}
+  ins_encode %{
+    __ sve_fnmsb(as_FloatRegister($dst_src1$$reg), __ $2, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+// vector fnmsb - predicated
+VFNMSB_PREDICATE(F, S)
+VFNMSB_PREDICATE(D, D)
 
 dnl
-dnl VMLA($1           $2    $3         )
-dnl VMLA(name_suffix, size, min_vec_len)
+dnl VMLA($1           $2  )
+dnl VMLA(name_suffix, size)
 define(`VMLA', `
 // dst_src1 = dst_src1 + src2 * src3
 instruct vmla$1(vReg dst_src1, vReg src2, vReg src3)
@@ -1034,14 +1148,38 @@ instruct vmla$1(vReg dst_src1, vReg src2, vReg src3)
 %}')dnl
 dnl
 // vector mla
-VMLA(B, B, 16)
-VMLA(S, H, 8)
-VMLA(I, S, 4)
-VMLA(L, D, 2)
+VMLA(B, B)
+VMLA(S, H)
+VMLA(I, S)
+VMLA(L, D)
+
+dnl
+dnl VMLA_PREDICATE($1           $2  )
+dnl VMLA_PREDICATE(name_suffix, size)
+define(`VMLA_PREDICATE', `
+// dst_src1 = dst_src1 + src2 * src3
+instruct vmla$1_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (AddV$1 (Binary dst_src1 (MulV$1 src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mla $dst_src1, $pg, src2, src3\t # vector (sve) ($2)" %}
+  ins_encode %{
+    __ sve_mla(as_FloatRegister($dst_src1$$reg), __ $2, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+// vector mla - predicated
+VMLA_PREDICATE(B, B)
+VMLA_PREDICATE(S, H)
+VMLA_PREDICATE(I, S)
+VMLA_PREDICATE(L, D)
 
 dnl
-dnl VMLS($1           $2    $3         )
-dnl VMLS(name_suffix, size, min_vec_len)
+dnl VMLS($1           $2  )
+dnl VMLS(name_suffix, size)
 define(`VMLS', `
 // dst_src1 = dst_src1 - src2 * src3
 instruct vmls$1(vReg dst_src1, vReg src2, vReg src3)
@@ -1058,10 +1196,34 @@ instruct vmls$1(vReg dst_src1, vReg src2, vReg src3)
 %}')dnl
 dnl
 // vector mls
-VMLS(B, B, 16)
-VMLS(S, H, 8)
-VMLS(I, S, 4)
-VMLS(L, D, 2)
+VMLS(B, B)
+VMLS(S, H)
+VMLS(I, S)
+VMLS(L, D)
+
+dnl
+dnl VMLS_PREDICATE($1           $2  )
+dnl VMLS_PREDICATE(name_suffix, size)
+define(`VMLS_PREDICATE', `
+// dst_src1 = dst_src1 - src2 * src3
+instruct vmls$1_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg)
+%{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (SubV$1 (Binary dst_src1 (MulV$1 src2 src3)) pg));
+  ins_cost(SVE_COST);
+  format %{ "sve_mls $dst_src1, $pg, src2, src3\t # vector (sve) ($2)" %}
+  ins_encode %{
+    __ sve_mls(as_FloatRegister($dst_src1$$reg), __ $2, as_PRegister($pg$$reg),
+         as_FloatRegister($src2$$reg), as_FloatRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+// vector mls - predicated
+VMLS_PREDICATE(B, B)
+VMLS_PREDICATE(S, H)
+VMLS_PREDICATE(I, S)
+VMLS_PREDICATE(L, D)
 
 dnl
 dnl BINARY_OP_TRUE_PREDICATE($1,        $2,      $3,   $4,          $5  )
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index 10fcdaa243c..448648d8d80 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -3173,8 +3173,11 @@ public:
   INSN(sve_fnmla, 0b01100101, 1, 0b010); // floating-point negated fused multiply-add: Zda = -Zda + -Zn * Zm
   INSN(sve_fnmls, 0b01100101, 1, 0b011); // floating-point negated fused multiply-subtract: Zda = -Zda + Zn * Zm
   INSN(sve_fmad,  0b01100101, 1, 0b100); // floating-point fused multiply-add, writing multiplicand: Zda = Zm + Zda * Zn
-  INSN(sve_mla,   0b00000100, 0, 0b010); // multiply-add: Zda = Zda + Zn*Zm
-  INSN(sve_mls,   0b00000100, 0, 0b011); // multiply-subtract: Zda = Zda + -Zn*Zm
+  INSN(sve_fmsb,  0b01100101, 1, 0b101); // floating-point fused multiply-subtract, writing multiplicand: Zda = Zm + -Zda * Zn
+  INSN(sve_fnmad, 0b01100101, 1, 0b110); // floating-point negated fused multiply-add, writing multiplicand: Zda = -Zm + -Zda * Zn
+  INSN(sve_fnmsb, 0b01100101, 1, 0b111); // floating-point negated fused multiply-subtract, writing multiplicand: Zda = -Zm + Zda * Zn
+  INSN(sve_mla,   0b00000100, 0, 0b010); // multiply-add, writing addend: Zda = Zda + Zn*Zm
+  INSN(sve_mls,   0b00000100, 0, 0b011); // multiply-subtract, writing addend: Zda = Zda + -Zn*Zm
 #undef INSN
 
 // SVE bitwise logical - unpredicated
diff --git a/test/hotspot/gtest/aarch64/aarch64-asmtest.py b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
index 40892ae0d94..34935714619 100644
--- a/test/hotspot/gtest/aarch64/aarch64-asmtest.py
+++ b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
@@ -1849,6 +1849,9 @@ generate(SVEVectorOp, [["add", "ZZZ"],
                        ["fmad", "ZPZZ", "m"],
                        ["fmla", "ZPZZ", "m"],
                        ["fmls", "ZPZZ", "m"],
+                       ["fmsb", "ZPZZ", "m"],
+                       ["fnmad", "ZPZZ", "m"],
+                       ["fnmsb", "ZPZZ", "m"],
                        ["fnmla", "ZPZZ", "m"],
                        ["fnmls", "ZPZZ", "m"],
                        ["mla", "ZPZZ", "m"],
diff --git a/test/hotspot/gtest/aarch64/asmtest.out.h b/test/hotspot/gtest/aarch64/asmtest.out.h
index 03147cba049..20fb391bcca 100644
--- a/test/hotspot/gtest/aarch64/asmtest.out.h
+++ b/test/hotspot/gtest/aarch64/asmtest.out.h
@@ -1153,27 +1153,30 @@
     __ sve_fmad(z17, __ D, p2, z16, z17);              //       fmad    z17.d, p2/m, z16.d, z17.d
     __ sve_fmla(z0, __ S, p1, z2, z23);                //       fmla    z0.s, p1/m, z2.s, z23.s
     __ sve_fmls(z6, __ D, p2, z20, z14);               //       fmls    z6.d, p2/m, z20.d, z14.d
-    __ sve_fnmla(z29, __ D, p3, z3, z3);               //       fnmla   z29.d, p3/m, z3.d, z3.d
-    __ sve_fnmls(z9, __ S, p0, z24, z27);              //       fnmls   z9.s, p0/m, z24.s, z27.s
-    __ sve_mla(z19, __ S, p5, z7, z25);                //       mla     z19.s, p5/m, z7.s, z25.s
-    __ sve_mls(z13, __ B, p1, z7, z25);                //       mls     z13.b, p1/m, z7.b, z25.b
-    __ sve_and(z21, z17, z17);                         //       and     z21.d, z17.d, z17.d
-    __ sve_eor(z3, z9, z19);                           //       eor     z3.d, z9.d, z19.d
-    __ sve_orr(z7, z11, z14);                          //       orr     z7.d, z11.d, z14.d
-    __ sve_bic(z17, z11, z13);                         //       bic     z17.d, z11.d, z13.d
-    __ sve_uzp1(z17, __ H, z30, z17);                  //       uzp1    z17.h, z30.h, z17.h
-    __ sve_uzp2(z15, __ S, z14, z26);                  //       uzp2    z15.s, z14.s, z26.s
+    __ sve_fmsb(z29, __ D, p3, z3, z3);                //       fmsb    z29.d, p3/m, z3.d, z3.d
+    __ sve_fnmad(z9, __ S, p0, z24, z27);              //       fnmad   z9.s, p0/m, z24.s, z27.s
+    __ sve_fnmsb(z19, __ D, p5, z7, z25);              //       fnmsb   z19.d, p5/m, z7.d, z25.d
+    __ sve_fnmla(z13, __ S, p1, z7, z25);              //       fnmla   z13.s, p1/m, z7.s, z25.s
+    __ sve_fnmls(z21, __ S, p4, z17, z0);              //       fnmls   z21.s, p4/m, z17.s, z0.s
+    __ sve_mla(z9, __ H, p5, z11, z7);                 //       mla     z9.h, p5/m, z11.h, z7.h
+    __ sve_mls(z14, __ H, p4, z17, z11);               //       mls     z14.h, p4/m, z17.h, z11.h
+    __ sve_and(z24, z17, z30);                         //       and     z24.d, z17.d, z30.d
+    __ sve_eor(z8, z15, z14);                          //       eor     z8.d, z15.d, z14.d
+    __ sve_orr(z22, z27, z22);                         //       orr     z22.d, z27.d, z22.d
+    __ sve_bic(z8, z5, z27);                           //       bic     z8.d, z5.d, z27.d
+    __ sve_uzp1(z10, __ D, z0, z14);                   //       uzp1    z10.d, z0.d, z14.d
+    __ sve_uzp2(z21, __ B, z20, z0);                   //       uzp2    z21.b, z20.b, z0.b
 
 // SVEReductionOp
-    __ sve_andv(v27, __ H, p5, z7);                    //       andv h27, p5, z7.h
-    __ sve_orv(v5, __ H, p7, z27);                     //       orv h5, p7, z27.h
-    __ sve_eorv(v0, __ S, p3, z24);                    //       eorv s0, p3, z24.s
-    __ sve_smaxv(v20, __ S, p0, z3);                   //       smaxv s20, p0, z3.s
-    __ sve_sminv(v25, __ D, p1, z25);                  //       sminv d25, p1, z25.d
-    __ sve_fminv(v17, __ S, p4, z1);                   //       fminv s17, p4, z1.s
-    __ sve_fmaxv(v14, __ S, p7, z13);                  //       fmaxv s14, p7, z13.s
-    __ sve_fadda(v17, __ D, p0, z30);                  //       fadda d17, p0, d17, z30.d
-    __ sve_uaddv(v22, __ H, p5, z29);                  //       uaddv d22, p5, z29.h
+    __ sve_andv(v22, __ D, p6, z5);                    //       andv d22, p6, z5.d
+    __ sve_orv(v29, __ B, p4, z17);                    //       orv b29, p4, z17.b
+    __ sve_eorv(v12, __ H, p3, z29);                   //       eorv h12, p3, z29.h
+    __ sve_smaxv(v0, __ D, p4, z2);                    //       smaxv d0, p4, z2.d
+    __ sve_sminv(v20, __ D, p5, z21);                  //       sminv d20, p5, z21.d
+    __ sve_fminv(v12, __ S, p2, z2);                   //       fminv s12, p2, z2.s
+    __ sve_fmaxv(v14, __ S, p5, z22);                  //       fmaxv s14, p5, z22.s
+    __ sve_fadda(v19, __ D, p6, z26);                  //       fadda d19, p6, d19, z26.d
+    __ sve_uaddv(v12, __ B, p5, z21);                  //       uaddv d12, p5, z21.b
 
     __ bind(forth);
 
@@ -1192,30 +1195,30 @@
     0x9101a1a0,     0xb10a5cc8,     0xd10810aa,     0xf10fd061,
     0x120cb166,     0x321764bc,     0x52174681,     0x720c0227,
     0x9241018e,     0xb25a2969,     0xd278b411,     0xf26aad01,
-    0x14000000,     0x17ffffd7,     0x140003d2,     0x94000000,
-    0x97ffffd4,     0x940003cf,     0x3400000a,     0x34fffa2a,
-    0x3400798a,     0x35000008,     0x35fff9c8,     0x35007928,
-    0xb400000b,     0xb4fff96b,     0xb40078cb,     0xb500001d,
-    0xb5fff91d,     0xb500787d,     0x10000013,     0x10fff8b3,
-    0x10007813,     0x90000013,     0x36300016,     0x3637f836,
-    0x36307796,     0x3758000c,     0x375ff7cc,     0x3758772c,
+    0x14000000,     0x17ffffd7,     0x140003d5,     0x94000000,
+    0x97ffffd4,     0x940003d2,     0x3400000a,     0x34fffa2a,
+    0x340079ea,     0x35000008,     0x35fff9c8,     0x35007988,
+    0xb400000b,     0xb4fff96b,     0xb400792b,     0xb500001d,
+    0xb5fff91d,     0xb50078dd,     0x10000013,     0x10fff8b3,
+    0x10007873,     0x90000013,     0x36300016,     0x3637f836,
+    0x363077f6,     0x3758000c,     0x375ff7cc,     0x3758778c,
     0x128313a0,     0x528a32c7,     0x7289173b,     0x92ab3acc,
     0xd2a0bf94,     0xf2c285e8,     0x9358722f,     0x330e652f,
     0x53067f3b,     0x93577c53,     0xb34a1aac,     0xd35a4016,
     0x13946c63,     0x93c3dbc8,     0x54000000,     0x54fff5a0,
-    0x54007500,     0x54000001,     0x54fff541,     0x540074a1,
-    0x54000002,     0x54fff4e2,     0x54007442,     0x54000002,
-    0x54fff482,     0x540073e2,     0x54000003,     0x54fff423,
-    0x54007383,     0x54000003,     0x54fff3c3,     0x54007323,
-    0x54000004,     0x54fff364,     0x540072c4,     0x54000005,
-    0x54fff305,     0x54007265,     0x54000006,     0x54fff2a6,
-    0x54007206,     0x54000007,     0x54fff247,     0x540071a7,
-    0x54000008,     0x54fff1e8,     0x54007148,     0x54000009,
-    0x54fff189,     0x540070e9,     0x5400000a,     0x54fff12a,
-    0x5400708a,     0x5400000b,     0x54fff0cb,     0x5400702b,
-    0x5400000c,     0x54fff06c,     0x54006fcc,     0x5400000d,
-    0x54fff00d,     0x54006f6d,     0x5400000e,     0x54ffefae,
-    0x54006f0e,     0x5400000f,     0x54ffef4f,     0x54006eaf,
+    0x54007560,     0x54000001,     0x54fff541,     0x54007501,
+    0x54000002,     0x54fff4e2,     0x540074a2,     0x54000002,
+    0x54fff482,     0x54007442,     0x54000003,     0x54fff423,
+    0x540073e3,     0x54000003,     0x54fff3c3,     0x54007383,
+    0x54000004,     0x54fff364,     0x54007324,     0x54000005,
+    0x54fff305,     0x540072c5,     0x54000006,     0x54fff2a6,
+    0x54007266,     0x54000007,     0x54fff247,     0x54007207,
+    0x54000008,     0x54fff1e8,     0x540071a8,     0x54000009,
+    0x54fff189,     0x54007149,     0x5400000a,     0x54fff12a,
+    0x540070ea,     0x5400000b,     0x54fff0cb,     0x5400708b,
+    0x5400000c,     0x54fff06c,     0x5400702c,     0x5400000d,
+    0x54fff00d,     0x54006fcd,     0x5400000e,     0x54ffefae,
+    0x54006f6e,     0x5400000f,     0x54ffef4f,     0x54006f0f,
     0xd40658e1,     0xd4014d22,     0xd4046543,     0xd4273f60,
     0xd44cad80,     0xd503201f,     0xd503203f,     0xd503205f,
     0xd503209f,     0xd50320bf,     0xd503219f,     0xd50323bf,
@@ -1432,11 +1435,11 @@
     0x65cd85ef,     0x65c68145,     0x6587801a,     0x65c29d53,
     0x04ddb4e3,     0x6582aebc,     0x65c0ae3a,     0x65c1ac51,
     0x658db690,     0x65c18033,     0x65f18a11,     0x65b70440,
-    0x65ee2a86,     0x65e34c7d,     0x65bb6309,     0x049954f3,
-    0x041964ed,     0x04313235,     0x04b33123,     0x046e3167,
-    0x04ed3171,     0x05716bd1,     0x05ba6dcf,     0x045a34fb,
-    0x04583f65,     0x04992f00,     0x04882074,     0x04ca2739,
-    0x65873031,     0x65863dae,     0x65d823d1,     0x044137b6,
-
+    0x65ee2a86,     0x65e3ac7d,     0x65bbc309,     0x65f9f4f3,
+    0x65b944ed,     0x65a07235,     0x04475569,     0x044b722e,
+    0x043e3238,     0x04ae31e8,     0x04763376,     0x04fb30a8,
+    0x05ee680a,     0x05206e95,     0x04da38b6,     0x0418323d,
+    0x04592fac,     0x04c83040,     0x04ca36b4,     0x6587284c,
+    0x658636ce,     0x65d83b53,     0x040136ac,
   };
 // END  Generated code -- do not edit
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java
new file mode 100644
index 00000000000..a5c5c7f422c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.ir_framework.*;
+
+import java.util.Random;
+
+import jdk.incubator.vector.ByteVector;
+import jdk.incubator.vector.DoubleVector;
+import jdk.incubator.vector.FloatVector;
+import jdk.incubator.vector.IntVector;
+import jdk.incubator.vector.LongVector;
+import jdk.incubator.vector.ShortVector;
+import jdk.incubator.vector.VectorMask;
+import jdk.incubator.vector.VectorOperators;
+import jdk.incubator.vector.VectorSpecies;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+
+/**
+ * @test
+ * @bug 8282431
+ * @key randomness
+ * @library /test/lib /
+ * @requires vm.cpu.features ~= ".*sve.*"
+ * @summary AArch64: Add optimized rules for masked vector multiply-add/sub for SVE
+ * @modules jdk.incubator.vector
+ *
+ * @run driver compiler.vectorapi.VectorFusedMultiplyAddSubTest
+ */
+
+public class VectorFusedMultiplyAddSubTest {
+    private static final VectorSpecies<Byte> B_SPECIES = ByteVector.SPECIES_MAX;
+    private static final VectorSpecies<Double> D_SPECIES = DoubleVector.SPECIES_MAX;
+    private static final VectorSpecies<Float> F_SPECIES = FloatVector.SPECIES_MAX;
+    private static final VectorSpecies<Integer> I_SPECIES = IntVector.SPECIES_MAX;
+    private static final VectorSpecies<Long> L_SPECIES = LongVector.SPECIES_MAX;
+    private static final VectorSpecies<Short> S_SPECIES = ShortVector.SPECIES_MAX;
+
+    private static int LENGTH = 1024;
+    private static final Random RD = Utils.getRandomInstance();
+
+    private static byte[] ba;
+    private static byte[] bb;
+    private static byte[] bc;
+    private static byte[] br;
+    private static short[] sa;
+    private static short[] sb;
+    private static short[] sc;
+    private static short[] sr;
+    private static int[] ia;
+    private static int[] ib;
+    private static int[] ic;
+    private static int[] ir;
+    private static long[] la;
+    private static long[] lb;
+    private static long[] lc;
+    private static long[] lr;
+    private static float[] fa;
+    private static float[] fb;
+    private static float[] fc;
+    private static float[] fr;
+    private static double[] da;
+    private static double[] db;
+    private static double[] dc;
+    private static double[] dr;
+    private static boolean[] m;
+
+    static {
+        ba = new byte[LENGTH];
+        bb = new byte[LENGTH];
+        bc = new byte[LENGTH];
+        br = new byte[LENGTH];
+        sa = new short[LENGTH];
+        sb = new short[LENGTH];
+        sc = new short[LENGTH];
+        sr = new short[LENGTH];
+        ia = new int[LENGTH];
+        ib = new int[LENGTH];
+        ic = new int[LENGTH];
+        ir = new int[LENGTH];
+        la = new long[LENGTH];
+        lb = new long[LENGTH];
+        lc = new long[LENGTH];
+        lr = new long[LENGTH];
+        fa = new float[LENGTH];
+        fb = new float[LENGTH];
+        fc = new float[LENGTH];
+        fr = new float[LENGTH];
+        da = new double[LENGTH];
+        db = new double[LENGTH];
+        dc = new double[LENGTH];
+        dr = new double[LENGTH];
+        m = new boolean[LENGTH];
+
+        for (int i = 0; i < LENGTH; i++) {
+            ba[i] = (byte) RD.nextInt(25);
+            bb[i] = (byte) RD.nextInt(25);
+            bc[i] = (byte) RD.nextInt(25);
+            sa[i] = (short) RD.nextInt(25);
+            sb[i] = (short) RD.nextInt(25);
+            sc[i] = (short) RD.nextInt(25);
+            ia[i] = RD.nextInt(25);
+            ib[i] = RD.nextInt(25);
+            ic[i] = RD.nextInt(25);
+            la[i] = RD.nextLong(25);
+            lb[i] = RD.nextLong(25);
+            lc[i] = RD.nextLong(25);
+            fa[i] = RD.nextFloat((float) 25.0);
+            fb[i] = RD.nextFloat((float) 25.0);
+            fc[i] = RD.nextFloat((float) 25.0);
+            da[i] = RD.nextDouble(25.0);
+            db[i] = RD.nextDouble(25.0);
+            dc[i] = RD.nextDouble(25.0);
+            m[i] = RD.nextBoolean();
+        }
+    }
+
+    interface BTenOp {
+        byte apply(byte a, byte b, byte c);
+    }
+
+    interface STenOp {
+        short apply(short a, short b, short c);
+    }
+
+    interface ITenOp {
+        int apply(int a, int b, int c);
+    }
+
+    interface LTenOp {
+        long apply(long a, long b, long c);
+    }
+
+    interface FTenOp {
+        float apply(float a, float b, float c);
+    }
+
+    interface DTenOp {
+        double apply(double a, double b, double c);
+    }
+
+    private static void assertArrayEquals(byte[] r, byte[] a, byte[] b, byte[] c, boolean[] m, BTenOp f) {
+       for (int i = 0; i < LENGTH; i++) {
+           if (m[i % B_SPECIES.length()]) {
+               Asserts.assertEquals(f.apply(a[i], b[i], c[i]), r[i]);
+           } else {
+               Asserts.assertEquals(a[i], r[i]);
+           }
+       }
+    }
+
+    private static void assertArrayEquals(short[] r, short[] a, short[] b, short[] c, boolean[] m, STenOp f) {
+       for (int i = 0; i < LENGTH; i++) {
+           if (m[i % S_SPECIES.length()]) {
+               Asserts.assertEquals(f.apply(a[i], b[i], c[i]), r[i]);
+           } else {
+               Asserts.assertEquals(a[i], r[i]);
+           }
+       }
+    }
+
+    private static void assertArrayEquals(int[] r, int[] a, int[] b, int[] c, boolean[] m, ITenOp f) {
+       for (int i = 0; i < LENGTH; i++) {
+           if (m[i % I_SPECIES.length()]) {
+               Asserts.assertEquals(f.apply(a[i], b[i], c[i]), r[i]);
+           } else {
+               Asserts.assertEquals(a[i], r[i]);
+           }
+       }
+    }
+
+    private static void assertArrayEquals(long[] r, long[] a, long[] b, long[] c, boolean[] m, LTenOp f) {
+       for (int i = 0; i < LENGTH; i++) {
+           if (m[i % L_SPECIES.length()]) {
+               Asserts.assertEquals(f.apply(a[i], b[i], c[i]), r[i]);
+           } else {
+               Asserts.assertEquals(a[i], r[i]);
+           }
+       }
+    }
+
+    private static void assertArrayEquals(float[] r, float[] a, float[] b, float[] c, boolean[] m, FTenOp f) {
+       for (int i = 0; i < LENGTH; i++) {
+           if (m[i % F_SPECIES.length()]) {
+               Asserts.assertEquals(f.apply(a[i], b[i], c[i]), r[i]);
+           } else {
+               Asserts.assertEquals(a[i], r[i]);
+           }
+       }
+    }
+
+    private static void assertArrayEquals(double[] r, double[] a, double[] b, double[] c, boolean[] m, DTenOp f) {
+       for (int i = 0; i < LENGTH; i++) {
+           if (m[i % D_SPECIES.length()]) {
+               Asserts.assertEquals(f.apply(a[i], b[i], c[i]), r[i]);
+           } else {
+               Asserts.assertEquals(a[i], r[i]);
+           }
+       }
+    }
+
+    @Test
+    @IR(counts = { "sve_mla", ">= 1" })
+    public static void testByteMultiplyAddMasked() {
+        VectorMask<Byte> mask = VectorMask.fromArray(B_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += B_SPECIES.length()) {
+            ByteVector av = ByteVector.fromArray(B_SPECIES, ba, i);
+            ByteVector bv = ByteVector.fromArray(B_SPECIES, bb, i);
+            ByteVector cv = ByteVector.fromArray(B_SPECIES, bc, i);
+            av.add(bv.mul(cv), mask).intoArray(br, i);
+        }
+        assertArrayEquals(br, ba, bb, bc, m, (a, b, c) -> (byte) (a + b * c));
+    }
+
+    @Test
+    @IR(counts = { "sve_mls", ">= 1" })
+    public static void testByteMultiplySubMasked() {
+        VectorMask<Byte> mask = VectorMask.fromArray(B_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += B_SPECIES.length()) {
+            ByteVector av = ByteVector.fromArray(B_SPECIES, ba, i);
+            ByteVector bv = ByteVector.fromArray(B_SPECIES, bb, i);
+            ByteVector cv = ByteVector.fromArray(B_SPECIES, bc, i);
+            av.sub(bv.mul(cv), mask).intoArray(br, i);
+        }
+        assertArrayEquals(br, ba, bb, bc, m, (a, b, c) -> (byte) (a - b * c));
+    }
+
+    @Test
+    @IR(counts = { "sve_mla", ">= 1" })
+    public static void testShortMultiplyAddMasked() {
+        VectorMask<Short> mask = VectorMask.fromArray(S_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector av = ShortVector.fromArray(S_SPECIES, sa, i);
+            ShortVector bv = ShortVector.fromArray(S_SPECIES, sb, i);
+            ShortVector cv = ShortVector.fromArray(S_SPECIES, sc, i);
+            av.add(bv.mul(cv), mask).intoArray(sr, i);
+        }
+        assertArrayEquals(sr, sa, sb, sc, m, (a, b, c) -> (short) (a + b * c));
+    }
+
+    @Test
+    @IR(counts = { "sve_mls", ">= 1" })
+    public static void testShortMultiplySubMasked() {
+        VectorMask<Short> mask = VectorMask.fromArray(S_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector av = ShortVector.fromArray(S_SPECIES, sa, i);
+            ShortVector bv = ShortVector.fromArray(S_SPECIES, sb, i);
+            ShortVector cv = ShortVector.fromArray(S_SPECIES, sc, i);
+            av.sub(bv.mul(cv), mask).intoArray(sr, i);
+        }
+        assertArrayEquals(sr, sa, sb, sc, m, (a, b, c) -> (short) (a - b * c));
+    }
+
+    @Test
+    @IR(counts = { "sve_mla", ">= 1" })
+    public static void testIntMultiplyAddMasked() {
+        VectorMask<Integer> mask = VectorMask.fromArray(I_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector av = IntVector.fromArray(I_SPECIES, ia, i);
+            IntVector bv = IntVector.fromArray(I_SPECIES, ib, i);
+            IntVector cv = IntVector.fromArray(I_SPECIES, ic, i);
+            av.add(bv.mul(cv), mask).intoArray(ir, i);
+        }
+        assertArrayEquals(ir, ia, ib, ic, m, (a, b, c) -> (int) (a + b * c));
+    }
+
+    @Test
+    @IR(counts = { "sve_mls", ">= 1" })
+    public static void testIntMultiplySubMasked() {
+        VectorMask<Integer> mask = VectorMask.fromArray(I_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector av = IntVector.fromArray(I_SPECIES, ia, i);
+            IntVector bv = IntVector.fromArray(I_SPECIES, ib, i);
+            IntVector cv = IntVector.fromArray(I_SPECIES, ic, i);
+            av.sub(bv.mul(cv), mask).intoArray(ir, i);
+        }
+        assertArrayEquals(ir, ia, ib, ic, m, (a, b, c) -> (int) (a - b * c));
+    }
+
+    @Test
+    @IR(counts = { "sve_mla", ">= 1" })
+    public static void testLongMultiplyAddMasked() {
+        VectorMask<Long> mask = VectorMask.fromArray(L_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += L_SPECIES.length()) {
+            LongVector av = LongVector.fromArray(L_SPECIES, la, i);
+            LongVector bv = LongVector.fromArray(L_SPECIES, lb, i);
+            LongVector cv = LongVector.fromArray(L_SPECIES, lc, i);
+            av.add(bv.mul(cv), mask).intoArray(lr, i);
+        }
+        assertArrayEquals(lr, la, lb, lc, m, (a, b, c) -> (long) (a + b * c));
+    }
+
+    @Test
+    @IR(counts = { "sve_mls", ">= 1" })
+    public static void testLongMultiplySubMasked() {
+        VectorMask<Long> mask = VectorMask.fromArray(L_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += L_SPECIES.length()) {
+            LongVector av = LongVector.fromArray(L_SPECIES, la, i);
+            LongVector bv = LongVector.fromArray(L_SPECIES, lb, i);
+            LongVector cv = LongVector.fromArray(L_SPECIES, lc, i);
+            av.sub(bv.mul(cv), mask).intoArray(lr, i);
+        }
+        assertArrayEquals(lr, la, lb, lc, m, (a, b, c) -> (long) (a - b * c));
+    }
+
+    @Test
+    @IR(counts = { "sve_fmsb", ">= 1" })
+    public static void testFloatMultiplySubMasked() {
+        VectorMask<Float> mask = VectorMask.fromArray(F_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += F_SPECIES.length()) {
+            FloatVector av = FloatVector.fromArray(F_SPECIES, fa, i);
+            FloatVector bv = FloatVector.fromArray(F_SPECIES, fb, i);
+            FloatVector cv = FloatVector.fromArray(F_SPECIES, fc, i);
+            av.lanewise(VectorOperators.FMA, bv.neg(), cv, mask).intoArray(fr, i);
+        }
+        assertArrayEquals(fr, fa, fb, fc, m, (a, b, c) -> (float) Math.fma(a, -b, c));
+    }
+
+    @Test
+    @IR(counts = { "sve_fnmad", ">= 1" })
+    public static void testFloatNegatedMultiplyAddMasked() {
+        VectorMask<Float> mask = VectorMask.fromArray(F_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += F_SPECIES.length()) {
+            FloatVector av = FloatVector.fromArray(F_SPECIES, fa, i);
+            FloatVector bv = FloatVector.fromArray(F_SPECIES, fb, i);
+            FloatVector cv = FloatVector.fromArray(F_SPECIES, fc, i);
+            av.lanewise(VectorOperators.FMA, bv.neg(), cv.neg(), mask).intoArray(fr, i);
+        }
+        assertArrayEquals(fr, fa, fb, fc, m, (a, b, c) -> (float) Math.fma(a, -b, -c));
+    }
+
+    @Test
+    @IR(counts = { "sve_fnmsb", ">= 1" })
+    public static void testFloatNegatedMultiplySubMasked() {
+        VectorMask<Float> mask = VectorMask.fromArray(F_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += F_SPECIES.length()) {
+            FloatVector av = FloatVector.fromArray(F_SPECIES, fa, i);
+            FloatVector bv = FloatVector.fromArray(F_SPECIES, fb, i);
+            FloatVector cv = FloatVector.fromArray(F_SPECIES, fc, i);
+            av.lanewise(VectorOperators.FMA, bv, cv.neg(), mask).intoArray(fr, i);
+        }
+        assertArrayEquals(fr, fa, fb, fc, m, (a, b, c) -> (float) Math.fma(a, b, -c));
+    }
+
+    @Test
+    @IR(counts = { "sve_fmsb", ">= 1" })
+    public static void testDoubleMultiplySubMasked() {
+        VectorMask<Double> mask = VectorMask.fromArray(D_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += D_SPECIES.length()) {
+            DoubleVector av = DoubleVector.fromArray(D_SPECIES, da, i);
+            DoubleVector bv = DoubleVector.fromArray(D_SPECIES, db, i);
+            DoubleVector cv = DoubleVector.fromArray(D_SPECIES, dc, i);
+            av.lanewise(VectorOperators.FMA, bv.neg(), cv, mask).intoArray(dr, i);
+        }
+        assertArrayEquals(dr, da, db, dc, m, (a, b, c) -> (double) Math.fma(a, -b, c));
+    }
+
+    @Test
+    @IR(counts = { "sve_fnmad", ">= 1" })
+    public static void testDoubleNegatedMultiplyAddMasked() {
+        VectorMask<Double> mask = VectorMask.fromArray(D_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += D_SPECIES.length()) {
+            DoubleVector av = DoubleVector.fromArray(D_SPECIES, da, i);
+            DoubleVector bv = DoubleVector.fromArray(D_SPECIES, db, i);
+            DoubleVector cv = DoubleVector.fromArray(D_SPECIES, dc, i);
+            av.lanewise(VectorOperators.FMA, bv.neg(), cv.neg(), mask).intoArray(dr, i);
+        }
+        assertArrayEquals(dr, da, db, dc, m, (a, b, c) -> (double) Math.fma(a, -b, -c));
+    }
+
+    @Test
+    @IR(counts = { "sve_fnmsb", ">= 1" })
+    public static void testDoubleNegatedMultiplySubMasked() {
+        VectorMask<Double> mask = VectorMask.fromArray(D_SPECIES, m, 0);
+        for (int i = 0; i < LENGTH; i += D_SPECIES.length()) {
+            DoubleVector av = DoubleVector.fromArray(D_SPECIES, da, i);
+            DoubleVector bv = DoubleVector.fromArray(D_SPECIES, db, i);
+            DoubleVector cv = DoubleVector.fromArray(D_SPECIES, dc, i);
+            av.lanewise(VectorOperators.FMA, bv, cv.neg(), mask).intoArray(dr, i);
+        }
+        assertArrayEquals(dr, da, db, dc, m, (a, b, c) -> (double) Math.fma(a, b, -c));
+    }
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector",
+                                   "-XX:UseSVE=1");
+    }
+}
-- 
GitLab


From fc7a17c79b825feab56bdb31e086425bf5103cf3 Mon Sep 17 00:00:00 2001
From: Dan Heidinga <heidinga@openjdk.org>
Date: Fri, 1 Apr 2022 12:50:21 +0000
Subject: [PATCH 314/345] 8284103: AsVarargsCollector::asCollectorCache
 incorrectly marked @stable

Reviewed-by: jvernee, shade
---
 .../share/classes/java/lang/invoke/MethodHandleImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index cdbc26200a1..27176314b25 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -451,7 +451,7 @@ abstract class MethodHandleImpl {
     static final class AsVarargsCollector extends DelegatingMethodHandle {
         private final MethodHandle target;
         private final Class<?> arrayType;
-        private @Stable MethodHandle asCollectorCache;
+        private MethodHandle asCollectorCache;
 
         AsVarargsCollector(MethodHandle target, Class<?> arrayType) {
             this(target.type(), target, arrayType);
-- 
GitLab


From dbfac3c99c749d3dab56559644e6c1bc17160ca8 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Fri, 1 Apr 2022 13:05:48 +0000
Subject: [PATCH 315/345] 8283269: Improve definition and use of
 jdk.javadoc.internal.doclets.toolkit.Content

Reviewed-by: jjg
---
 .../html/AbstractExecutableMemberWriter.java  | 111 +++---
 .../formats/html/AbstractMemberWriter.java    | 134 +++----
 .../html/AbstractOverviewIndexWriter.java     |  45 ++-
 .../formats/html/AbstractTreeWriter.java      |  46 +--
 .../formats/html/AllClassesIndexWriter.java   |  22 +-
 .../formats/html/AllPackagesIndexWriter.java  |  20 +-
 .../html/AnnotationTypeMemberWriterImpl.java  |  86 ++---
 .../doclets/formats/html/ClassUseWriter.java  | 104 ++---
 .../doclets/formats/html/ClassWriterImpl.java | 166 ++++----
 .../html/ConstantsSummaryWriterImpl.java      |  58 +--
 .../formats/html/ConstructorWriterImpl.java   |  74 ++--
 .../doclets/formats/html/Contents.java        |  20 +-
 .../formats/html/EnumConstantWriterImpl.java  |  84 ++--
 .../doclets/formats/html/FieldWriterImpl.java |  86 ++---
 .../doclets/formats/html/HelpWriter.java      |  30 +-
 .../formats/html/HtmlDocletWriter.java        | 170 ++++----
 .../formats/html/HtmlSerialFieldWriter.java   |  71 ++--
 .../formats/html/HtmlSerialMethodWriter.java  |  55 ++-
 .../formats/html/IndexRedirectWriter.java     |   6 +-
 .../doclets/formats/html/IndexWriter.java     |  94 ++---
 .../formats/html/MethodWriterImpl.java        | 104 +++--
 .../formats/html/ModuleIndexWriter.java       |   8 +-
 .../formats/html/ModuleWriterImpl.java        |  80 ++--
 .../doclets/formats/html/Navigation.java      | 362 +++++++++---------
 .../formats/html/NestedClassWriterImpl.java   |  38 +-
 .../formats/html/PackageIndexWriter.java      |   8 +-
 .../formats/html/PackageTreeWriter.java       |  31 +-
 .../formats/html/PackageUseWriter.java        |  46 ++-
 .../formats/html/PackageWriterImpl.java       |  78 ++--
 .../formats/html/PropertyWriterImpl.java      |  90 +++--
 .../html/SerializedFormWriterImpl.java        |  75 ++--
 .../doclets/formats/html/Signatures.java      |  74 ++--
 .../formats/html/SourceToHTMLConverter.java   |  34 +-
 .../formats/html/SubWriterHolderWriter.java   | 154 ++++----
 .../formats/html/SummaryListWriter.java       |  40 +-
 .../formats/html/SystemPropertiesWriter.java  |  10 +-
 .../internal/doclets/formats/html/Table.java  |  10 +-
 .../doclets/formats/html/TableHeader.java     |   4 +-
 .../formats/html/TagletWriterImpl.java        |  23 +-
 .../doclets/formats/html/TreeWriter.java      |  26 +-
 .../formats/html/markup/BodyContents.java     |   4 +-
 .../doclets/formats/html/markup/Head.java     |  60 +--
 .../formats/html/markup/HtmlDocument.java     |  10 +-
 .../doclets/formats/html/markup/HtmlTree.java |  12 +-
 .../doclets/formats/html/markup/Links.java    |  30 +-
 .../doclets/formats/html/markup/Script.java   |  12 +-
 .../toolkit/AnnotationTypeMemberWriter.java   |  55 ++-
 .../internal/doclets/toolkit/ClassWriter.java | 103 +++--
 .../doclets/toolkit/CommentUtils.java         |  22 +-
 .../toolkit/ConstantsSummaryWriter.java       |  45 ++-
 .../doclets/toolkit/ConstructorWriter.java    |  48 +--
 .../internal/doclets/toolkit/Content.java     |   8 +-
 .../doclets/toolkit/EnumConstantWriter.java   |  55 +--
 .../internal/doclets/toolkit/FieldWriter.java |  50 +--
 .../doclets/toolkit/MemberSummaryWriter.java  |  32 +-
 .../doclets/toolkit/MemberWriter.java         |  12 +-
 .../doclets/toolkit/MethodWriter.java         |  50 +--
 .../doclets/toolkit/ModuleSummaryWriter.java  |  40 +-
 .../doclets/toolkit/PackageSummaryWriter.java |  64 ++--
 .../doclets/toolkit/PropertyWriter.java       |  51 ++-
 .../doclets/toolkit/SerializedFormWriter.java | 128 +++----
 .../builders/AbstractMemberBuilder.java       |   9 +-
 .../builders/AnnotationTypeMemberBuilder.java |  74 ++--
 .../toolkit/builders/ClassBuilder.java        | 167 ++++----
 .../builders/ConstantsSummaryBuilder.java     |  52 ++-
 .../toolkit/builders/ConstructorBuilder.java  |  60 +--
 .../toolkit/builders/EnumConstantBuilder.java |  62 +--
 .../toolkit/builders/FieldBuilder.java        |  60 +--
 .../builders/MemberSummaryBuilder.java        |  53 ++-
 .../toolkit/builders/MethodBuilder.java       |  56 +--
 .../builders/ModuleSummaryBuilder.java        |  32 +-
 .../builders/PackageSummaryBuilder.java       |  40 +-
 .../toolkit/builders/PropertyBuilder.java     |  52 +--
 .../builders/SerializedFormBuilder.java       | 204 +++++-----
 .../toolkit/util/links/LinkFactory.java       |   6 +-
 .../doclets/toolkit/util/links/LinkInfo.java  |   6 +-
 76 files changed, 2201 insertions(+), 2400 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
index 39c15a82313..7cbf9544105 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,52 +100,37 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite
                 member, content, null, false);
     }
 
-    /**
-     * Add the summary link for the member.
-     *
-     * @param context the id of the context where the link will be printed
-     * @param te the type element being linked to
-     * @param member the member being linked to
-     * @param tdSummary the content tree to which the link will be added
-     */
     @Override
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement te, Element member,
-                                  Content tdSummary) {
+                                  Content target) {
         ExecutableElement ee = (ExecutableElement)member;
         Content memberLink = writer.getDocLink(context, te, ee, name(ee), HtmlStyle.memberNameLink);
-        Content code = HtmlTree.CODE(memberLink);
+        var code = HtmlTree.CODE(memberLink);
         addParameters(ee, code);
-        tdSummary.add(code);
+        target.add(code);
     }
 
-    /**
-     * Add the inherited summary link for the member.
-     *
-     * @param te the type element that we should link to
-     * @param member the member being linked to
-     * @param linksTree the content tree to which the link will be added
-     */
     @Override
-    protected void addInheritedSummaryLink(TypeElement te, Element member, Content linksTree) {
-        linksTree.add(writer.getDocLink(MEMBER, te, member, name(member)));
+    protected void addInheritedSummaryLink(TypeElement te, Element member, Content target) {
+        target.add(writer.getDocLink(MEMBER, te, member, name(member)));
     }
 
     /**
      * Add the parameter for the executable member.
      *
-     * @param param the parameter that needs to be written.
+     * @param param the parameter that needs to be added.
      * @param paramType the type of the parameter.
      * @param isVarArg true if this is a link to var arg.
-     * @param tree the content tree to which the parameter information will be added.
+     * @param target the content to which the parameter information will be added.
      */
     protected void addParam(VariableElement param, TypeMirror paramType, boolean isVarArg,
-                            Content tree) {
+                            Content target) {
         Content link = writer.getLink(new HtmlLinkInfo(configuration, EXECUTABLE_MEMBER_PARAM,
                 paramType).varargs(isVarArg));
-        tree.add(link);
+        target.add(link);
         if(name(param).length() > 0) {
-            tree.add(Entity.NO_BREAK_SPACE);
-            tree.add(name(param));
+            target.add(Entity.NO_BREAK_SPACE);
+            target.add(name(param));
         }
     }
 
@@ -156,18 +141,18 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite
      *
      * @param member the member to write receiver annotations for.
      * @param rcvrType the receiver type.
-     * @param tree the content tree to which the information will be added.
+     * @param target the content to which the information will be added.
      */
-    protected void addReceiver(ExecutableElement member, TypeMirror rcvrType, Content tree) {
+    protected void addReceiver(ExecutableElement member, TypeMirror rcvrType, Content target) {
         var info = new HtmlLinkInfo(configuration, RECEIVER_TYPE, rcvrType);
         info.linkToSelf = false;
-        tree.add(writer.getLink(info));
-        tree.add(Entity.NO_BREAK_SPACE);
+        target.add(writer.getLink(info));
+        target.add(Entity.NO_BREAK_SPACE);
         if (member.getKind() == ElementKind.CONSTRUCTOR) {
-            tree.add(utils.getTypeName(rcvrType, false));
-            tree.add(".");
+            target.add(utils.getTypeName(rcvrType, false));
+            target.add(".");
         }
-        tree.add("this");
+        target.add("this");
     }
 
     /**
@@ -205,15 +190,15 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite
      * Add all the parameters for the executable member.
      *
      * @param member the member to write parameters for.
-     * @param htmltree the content tree to which the parameters information will be added.
+     * @param target the content to which the parameters information will be added.
      */
-    protected void addParameters(ExecutableElement member, Content htmltree) {
-        Content paramTree = getParameters(member, false);
-        if (paramTree.charCount() > 2) {
+    protected void addParameters(ExecutableElement member, Content target) {
+        Content params = getParameters(member, false);
+        if (params.charCount() > 2) {
             // only add <wbr> for non-empty parameters
-            htmltree.add(new HtmlTree(TagName.WBR));
+            target.add(new HtmlTree(TagName.WBR));
         }
-        htmltree.add(paramTree);
+        target.add(params);
     }
 
     /**
@@ -221,22 +206,22 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite
      *
      * @param member the member to write parameters for.
      * @param includeAnnotations true if annotation information needs to be added.
-     * @return the content tree containing the parameter information
+     * @return the parameter information
      */
     protected Content getParameters(ExecutableElement member, boolean includeAnnotations) {
-        Content paramTree = new ContentBuilder();
-        paramTree.add("(");
+        Content result = new ContentBuilder();
+        result.add("(");
         String sep = "";
         List<? extends VariableElement> parameters = member.getParameters();
         TypeMirror rcvrType = member.getReceiverType();
         if (includeAnnotations && rcvrType != null && isAnnotatedReceiver(rcvrType)) {
-            addReceiver(member, rcvrType, paramTree);
+            addReceiver(member, rcvrType, result);
             sep = "," + DocletConstants.NL + " ";
         }
         int paramstart;
         ExecutableType instMeth = utils.asInstantiatedMethodType(typeElement, member);
         for (paramstart = 0; paramstart < parameters.size(); paramstart++) {
-            paramTree.add(sep);
+            result.add(sep);
             VariableElement param = parameters.get(paramstart);
             TypeMirror paramType = instMeth.getParameterTypes().get(paramstart);
 
@@ -244,56 +229,56 @@ public abstract class AbstractExecutableMemberWriter extends AbstractMemberWrite
                 if (includeAnnotations) {
                     Content annotationInfo = writer.getAnnotationInfo(param, false);
                     if (!annotationInfo.isEmpty()) {
-                        paramTree.add(annotationInfo)
+                        result.add(annotationInfo)
                                 .add(DocletConstants.NL)
                                 .add(" ");
                     }
                 }
                 addParam(param, paramType,
-                    (paramstart == parameters.size() - 1) && member.isVarArgs(), paramTree);
+                    (paramstart == parameters.size() - 1) && member.isVarArgs(), result);
                 break;
             }
         }
 
         for (int i = paramstart + 1; i < parameters.size(); i++) {
-            paramTree.add(",");
-            paramTree.add(DocletConstants.NL);
-            paramTree.add(" ");
+            result.add(",");
+            result.add(DocletConstants.NL);
+            result.add(" ");
 
             if (includeAnnotations) {
                 Content annotationInfo = writer.getAnnotationInfo(parameters.get(i), false);
                 if (!annotationInfo.isEmpty()) {
-                    paramTree.add(annotationInfo)
+                    result.add(annotationInfo)
                             .add(DocletConstants.NL)
                             .add(" ");
                 }
             }
             addParam(parameters.get(i), instMeth.getParameterTypes().get(i),
                     (i == parameters.size() - 1) && member.isVarArgs(),
-                    paramTree);
+                    result);
         }
-        paramTree.add(")");
-        return paramTree;
+        result.add(")");
+        return result;
     }
 
     /**
-     * Get a content tree containing the exception information for the executable member.
+     * Get the exception information for the executable member.
      *
-     * @param member the member to write exceptions for.
-     * @return the content tree containing the exceptions information.
+     * @param member the member to get the exception information for
+     * @return the exception information
      */
     protected Content getExceptions(ExecutableElement member) {
         List<? extends TypeMirror> exceptions = utils.asInstantiatedMethodType(typeElement, member).getThrownTypes();
-        Content htmlTree = new ContentBuilder();
+        Content result = new ContentBuilder();
         for (TypeMirror t : exceptions) {
-            if (!htmlTree.isEmpty()) {
-                htmlTree.add(",");
-                htmlTree.add(DocletConstants.NL);
+            if (!result.isEmpty()) {
+                result.add(",");
+                result.add(DocletConstants.NL);
             }
             Content link = writer.getLink(new HtmlLinkInfo(configuration, THROWS_TYPE, t));
-            htmlTree.add(link);
+            result.add(link);
         }
-        return htmlTree;
+        return result;
     }
 
     protected TypeElement implementsMethodInIntfac(ExecutableElement method,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
index f717cdf2cf4..c972ca31aff 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,9 +91,9 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
     /**
      * Adds the summary label for the member.
      *
-     * @param memberTree the content tree to which the label will be added
+     * @param content the content to which the label will be added
      */
-    public abstract void addSummaryLabel(Content memberTree);
+    public abstract void addSummaryLabel(Content content);
 
     /**
      * Returns the summary table header for the member.
@@ -126,28 +126,28 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
     /**
      * Adds inherited summary label for the member.
      *
-     * @param typeElement   the type element to which to link to
-     * @param inheritedTree the content tree to which the inherited summary label will be added
+     * @param typeElement the type element to which to link to
+     * @param content     the content to which the inherited summary label will be added
      */
-    public abstract void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree);
+    public abstract void addInheritedSummaryLabel(TypeElement typeElement, Content content);
 
     /**
      * Adds the summary type for the member.
      *
-     * @param member        the member to be documented
-     * @param tdSummaryType the content tree to which the type will be added
+     * @param member  the member to be documented
+     * @param content the content to which the type will be added
      */
-    protected abstract void addSummaryType(Element member, Content tdSummaryType);
+    protected abstract void addSummaryType(Element member, Content content);
 
     /**
      * Adds the summary link for the member.
      *
      * @param typeElement the type element to be documented
      * @param member      the member to be documented
-     * @param tdSummary   the content tree to which the link will be added
+     * @param content     the content to which the link will be added
      */
-    protected void addSummaryLink(TypeElement typeElement, Element member, Content tdSummary) {
-        addSummaryLink(HtmlLinkInfo.Kind.MEMBER, typeElement, member, tdSummary);
+    protected void addSummaryLink(TypeElement typeElement, Element member, Content content) {
+        addSummaryLink(HtmlLinkInfo.Kind.MEMBER, typeElement, member, content);
     }
 
     /**
@@ -156,41 +156,41 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
      * @param context     the id of the context where the link will be printed
      * @param typeElement the type element to be documented
      * @param member      the member to be documented
-     * @param tdSummary   the content tree to which the summary link will be added
+     * @param content     the content to which the summary link will be added
      */
     protected abstract void addSummaryLink(HtmlLinkInfo.Kind context,
-                                           TypeElement typeElement, Element member, Content tdSummary);
+                                           TypeElement typeElement, Element member, Content content);
 
     /**
      * Adds the inherited summary link for the member.
      *
      * @param typeElement the type element to be documented
      * @param member      the member to be documented
-     * @param linksTree   the content tree to which the inherited summary link will be added
+     * @param target      the content to which the inherited summary link will be added
      */
     protected abstract void addInheritedSummaryLink(TypeElement typeElement,
-            Element member, Content linksTree);
+            Element member, Content target);
 
     /**
      * Returns a link for summary (deprecated, preview) pages.
      *
      * @param member the member being linked to
      *
-     * @return a content tree representing the link
+     * @return the link
      */
     protected abstract Content getSummaryLink(Element member);
 
     /**
-     * Adds the modifier and type for the member in the member summary.
+     * Adds the modifiers and type for the member in the member summary.
      *
-     * @param member        the member to add the type for
-     * @param type          the type to add
-     * @param tdSummaryType the content tree to which the modified and type will be added
+     * @param member the member to add the modifiers and type for
+     * @param type   the type to add
+     * @param target the content to which the modifiers and type will be added
      */
-    protected void addModifierAndType(Element member, TypeMirror type,
-            Content tdSummaryType) {
-        HtmlTree code = new HtmlTree(TagName.CODE);
-        addModifier(member, code);
+    protected void addModifiersAndType(Element member, TypeMirror type,
+            Content target) {
+        var code = new HtmlTree(TagName.CODE);
+        addModifiers(member, code);
         if (type == null) {
             code.add(switch (member.getKind()) {
                 case ENUM -> "enum";
@@ -219,64 +219,64 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
                     writer.getLink(new HtmlLinkInfo(configuration,
                             HtmlLinkInfo.Kind.SUMMARY_RETURN_TYPE, type)));
         }
-        tdSummaryType.add(code);
+        target.add(code);
     }
 
     /**
-     * Adds the modifier for the member.
+     * Adds the modifiers for the member.
      *
-     * @param member the member to add the type for
-     * @param code   the content tree to which the modifier will be added
+     * @param member the member to add the modifiers for
+     * @param target the content to which the modifiers will be added
      */
-    private void addModifier(Element member, Content code) {
+    private void addModifiers(Element member, Content target) {
         if (utils.isProtected(member)) {
-            code.add("protected ");
+            target.add("protected ");
         } else if (utils.isPrivate(member)) {
-            code.add("private ");
+            target.add("private ");
         } else if (!utils.isPublic(member)) { // Package private
-            code.add(resources.getText("doclet.Package_private"));
-            code.add(" ");
+            target.add(resources.getText("doclet.Package_private"));
+            target.add(" ");
         }
         boolean isAnnotatedTypeElement = utils.isAnnotationType(member.getEnclosingElement());
         if (!isAnnotatedTypeElement && utils.isMethod(member)) {
             if (!utils.isInterface(member.getEnclosingElement()) && utils.isAbstract(member)) {
-                code.add("abstract ");
+                target.add("abstract ");
             }
             if (utils.isDefault(member)) {
-                code.add("default ");
+                target.add("default ");
             }
         }
         if (utils.isStatic(member)) {
-            code.add("static ");
+            target.add("static ");
         }
         if (!utils.isEnum(member) && utils.isFinal(member)) {
-            code.add("final ");
+            target.add("final ");
         }
     }
 
     /**
      * Adds the deprecated information for the given member.
      *
-     * @param member      the member being documented.
-     * @param contentTree the content tree to which the deprecated information will be added.
+     * @param member the member being documented.
+     * @param target the content to which the deprecated information will be added.
      */
-    protected void addDeprecatedInfo(Element member, Content contentTree) {
+    protected void addDeprecatedInfo(Element member, Content target) {
         Content output = (new DeprecatedTaglet()).getAllBlockTagOutput(member,
             writer.getTagletWriterInstance(false));
         if (!output.isEmpty()) {
-            contentTree.add(HtmlTree.DIV(HtmlStyle.deprecationBlock, output));
+            target.add(HtmlTree.DIV(HtmlStyle.deprecationBlock, output));
         }
     }
 
     /**
      * Adds the comment for the given member.
      *
-     * @param member   the member being documented.
-     * @param htmlTree the content tree to which the comment will be added.
+     * @param member  the member being documented.
+     * @param content the content to which the comment will be added.
      */
-    protected void addComment(Element member, Content htmlTree) {
+    protected void addComment(Element member, Content content) {
         if (!utils.getFullBody(member).isEmpty()) {
-            writer.addInlineComment(member, htmlTree);
+            writer.addInlineComment(member, content);
         }
     }
 
@@ -284,10 +284,10 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
      * Add the preview information for the given member.
      *
      * @param member the member being documented.
-     * @param contentTree the content tree to which the preview information will be added.
+     * @param content the content to which the preview information will be added.
      */
-    protected void addPreviewInfo(Element member, Content contentTree) {
-        writer.addPreviewInfo(member, contentTree);
+    protected void addPreviewInfo(Element member, Content content) {
+        writer.addPreviewInfo(member, content);
     }
 
     protected String name(Element member) {
@@ -295,13 +295,13 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
     }
 
     /**
-     * Adds use information to the documentation tree.
+     * Adds use information to the documentation.
      *
-     * @param members     list of program elements for which the use information will be added
-     * @param heading     the section heading
-     * @param contentTree the content tree to which the use information will be added
+     * @param members list of program elements for which the use information will be added
+     * @param heading the section heading
+     * @param content the content to which the use information will be added
      */
-    protected void addUseInfo(List<? extends Element> members, Content heading, Content contentTree) {
+    protected void addUseInfo(List<? extends Element> members, Content heading, Content content) {
         if (members == null || members.isEmpty()) {
             return;
         }
@@ -325,7 +325,7 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
                     && !utils.isClass(element)
                     && !utils.isInterface(element)
                     && !utils.isAnnotationType(element)) {
-                HtmlTree name = new HtmlTree(TagName.SPAN);
+                var name = new HtmlTree(TagName.SPAN);
                 name.setStyle(HtmlStyle.typeNameLabel);
                 name.add(name(te) + ".");
                 typeContent.add(name);
@@ -338,7 +338,7 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
             writer.addSummaryLinkComment(element, desc);
             useTable.addRow(summaryType, typeContent, desc);
         }
-        contentTree.add(useTable);
+        content.add(useTable);
     }
 
     protected void serialWarning(Element e, String key, String a1, String a2) {
@@ -371,24 +371,24 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
     @Override
     public void addInheritedMemberSummary(TypeElement tElement,
             Element nestedClass, boolean isFirst, boolean isLast,
-            Content linksTree) {
-        writer.addInheritedMemberSummary(this, tElement, nestedClass, isFirst, linksTree);
+            Content content) {
+        writer.addInheritedMemberSummary(this, tElement, nestedClass, isFirst, content);
     }
 
     @Override
     public Content getInheritedSummaryHeader(TypeElement tElement) {
-        Content inheritedTree = writer.getMemberInheritedTree();
-        writer.addInheritedSummaryHeader(this, tElement, inheritedTree);
-        return inheritedTree;
+        Content c = writer.getMemberInherited();
+        writer.addInheritedSummaryHeader(this, tElement, c);
+        return c;
     }
 
     @Override
-    public Content getInheritedSummaryLinksTree() {
+    public Content getInheritedSummaryLinks() {
         return new HtmlTree(TagName.CODE);
     }
 
     @Override
-    public Content getSummaryTableTree(TypeElement tElement) {
+    public Content getSummaryTable(TypeElement tElement) {
         if (tElement != typeElement) {
             throw new IllegalStateException();
         }
@@ -400,8 +400,8 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
     }
 
     @Override
-    public Content getMemberTree(Content memberTree) {
-        return writer.getMemberTree(memberTree);
+    public Content getMember(Content memberContent) {
+        return writer.getMember(memberContent);
     }
 
     @Override
@@ -410,8 +410,8 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
     }
 
     @Override
-    public Content getMemberListItem(Content memberTree) {
-        return writer.getMemberListItem(memberTree);
+    public Content getMemberListItem(Content memberContent) {
+        return writer.getMemberListItem(memberContent);
     }
 
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java
index 40100d6fd27..71d958521b0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,35 +62,34 @@ public abstract class AbstractOverviewIndexWriter extends HtmlDocletWriter {
      * summary at the top of the page and generate a link to the description,
      * which is added at the end of this page.
      *
-     * @param main the documentation tree to which the overview header will be added
+     * @param target the content to which the overview header will be added
      */
-    protected void addOverviewHeader(Content main) {
-        addConfigurationTitle(main);
-        addOverviewComment(main);
-        addOverviewTags(main);
+    protected void addOverviewHeader(Content target) {
+        addConfigurationTitle(target);
+        addOverviewComment(target);
+        addOverviewTags(target);
     }
 
     /**
      * Adds the overview comment as provided in the file specified by the
      * "-overview" option on the command line.
      *
-     * @param htmltree the documentation tree to which the overview comment will
-     *                 be added
+     * @param content the content to which the overview comment will be added
      */
-    protected void addOverviewComment(Content htmltree) {
+    protected void addOverviewComment(Content content) {
         if (!utils.getFullBody(configuration.overviewElement).isEmpty()) {
-            addInlineComment(configuration.overviewElement, htmltree);
+            addInlineComment(configuration.overviewElement, content);
         }
     }
 
     /**
      * Adds the block tags provided in the file specified by the "-overview" option.
      *
-     * @param htmlTree the content tree to which the tags will be added
+     * @param content the content to which the tags will be added
      */
-    protected void addOverviewTags(Content htmlTree) {
+    protected void addOverviewTags(Content content) {
         if (!utils.getFullBody(configuration.overviewElement).isEmpty()) {
-            addTagsInfo(configuration.overviewElement, htmlTree);
+            addTagsInfo(configuration.overviewElement, content);
         }
     }
 
@@ -118,25 +117,25 @@ public abstract class AbstractOverviewIndexWriter extends HtmlDocletWriter {
     }
 
     /**
-     * Adds the index to the documentation tree.
+     * Adds the index to the documentation.
      *
-     * @param main the document tree to which the packages/modules list will be added
+     * @param target the content to which the packages/modules list will be added
      */
-    protected abstract void addIndex(Content main);
+    protected abstract void addIndex(Content target);
 
     /**
-     * Adds the doctitle to the documentation tree, if it is specified on the command line.
+     * Adds the doctitle to the documentation, if it is specified on the command line.
      *
-     * @param body the document tree to which the title will be added
+     * @param target the content to which the title will be added
      */
-    protected void addConfigurationTitle(Content body) {
+    protected void addConfigurationTitle(Content target) {
         String doctitle = configuration.getOptions().docTitle();
         if (!doctitle.isEmpty()) {
-            Content title = new RawHtml(doctitle);
-            Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
+            var title = new RawHtml(doctitle);
+            var heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
                     HtmlStyle.title, title);
-            Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-            body.add(div);
+            var div = HtmlTree.DIV(HtmlStyle.header, heading);
+            target.add(div);
         }
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
index 96ee6251a4e..76bc29162f6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,14 +77,14 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
      * @param parent the superclass or superinterface of the sset
      * @param collection  a collection of the sub-classes at this level
      * @param isEnum true if we are generating a tree for enums
-     * @param contentTree the content tree to which the level information will be added
+     * @param content the content to which the level information will be added
      */
     protected void addLevelInfo(TypeElement parent, Collection<TypeElement> collection,
-            boolean isEnum, Content contentTree) {
+            boolean isEnum, Content content) {
         if (!collection.isEmpty()) {
-            Content ul = new HtmlTree(TagName.UL);
+            var ul = new HtmlTree(TagName.UL);
             for (TypeElement local : collection) {
-                HtmlTree li = new HtmlTree(TagName.LI);
+                var li = new HtmlTree(TagName.LI);
                 li.setStyle(HtmlStyle.circle);
                 addPartialInfo(local, li);
                 addExtendsImplements(parent, local, li);
@@ -92,7 +92,7 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
                              isEnum, li);   // Recurse
                 ul.add(li);
             }
-            contentTree.add(ul);
+            content.add(ul);
         }
     }
 
@@ -103,7 +103,7 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
      * @param sset classes which are at the most base level, all the
      * other classes in this run will derive from these classes
      * @param heading heading for the tree
-     * @param content the content tree to which the tree will be added
+     * @param content the content to which the tree will be added
      */
     protected void addTree(SortedSet<TypeElement> sset, String heading, Content content) {
         addTree(sset, heading, content, false);
@@ -114,12 +114,12 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
         if (!sset.isEmpty()) {
             TypeElement firstTypeElement = sset.first();
             Content headingContent = contents.getContent(heading);
-            Content sectionHeading = HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
+            var sectionHeading = HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
                     headingContent);
-            HtmlTree htmlTree = HtmlTree.SECTION(HtmlStyle.hierarchy, sectionHeading);
+            var section = HtmlTree.SECTION(HtmlStyle.hierarchy, sectionHeading);
             addLevelInfo(!utils.isInterface(firstTypeElement) ? firstTypeElement : null,
-                    sset, isEnums, htmlTree);
-            content.add(htmlTree);
+                    sset, isEnums, section);
+            content.add(section);
         }
     }
 
@@ -129,11 +129,11 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
      *
      * @param parent the parent class of the class being documented
      * @param typeElement the TypeElement under consideration
-     * @param contentTree the content tree to which the information will be added
+     * @param content the content to which the information will be added
      */
     protected void addExtendsImplements(TypeElement parent,
                                         TypeElement typeElement,
-                                        Content contentTree)
+                                        Content content)
     {
         SortedSet<TypeElement> interfaces = new TreeSet<>(comparators.makeGeneralPurposeComparator());
         typeElement.getInterfaces().forEach(t -> interfaces.add(utils.asTypeElement(t)));
@@ -145,21 +145,21 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
                         if (isFirst) {
                             isFirst = false;
                             if (utils.isInterface(typeElement)) {
-                                contentTree.add(" (");
-                                contentTree.add(contents.also);
-                                contentTree.add(" extends ");
+                                content.add(" (");
+                                content.add(contents.also);
+                                content.add(" extends ");
                             } else {
-                                contentTree.add(" (implements ");
+                                content.add(" (implements ");
                             }
                         } else {
-                            contentTree.add(", ");
+                            content.add(", ");
                         }
-                        addPreQualifiedClassLink(HtmlLinkInfo.Kind.TREE, intf, contentTree);
+                        addPreQualifiedClassLink(HtmlLinkInfo.Kind.TREE, intf, content);
                     }
                 }
             }
             if (!isFirst) {
-                contentTree.add(")");
+                content.add(")");
             }
         }
     }
@@ -168,9 +168,9 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
      * Add information about the class kind, if it's a "class" or "interface".
      *
      * @param typeElement the class being documented
-     * @param contentTree the content tree to which the information will be added
+     * @param content the content to which the information will be added
      */
-    protected void addPartialInfo(TypeElement typeElement, Content contentTree) {
-        addPreQualifiedStrongClassLink(HtmlLinkInfo.Kind.TREE, typeElement, contentTree);
+    protected void addPartialInfo(TypeElement typeElement, Content content) {
+        addPreQualifiedStrongClassLink(HtmlLinkInfo.Kind.TREE, typeElement, content);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
index a2d4f51e45e..688643b4796 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,20 +97,20 @@ public class AllClassesIndexWriter extends HtmlDocletWriter {
         addContents(allClassesContent);
         Content mainContent = new ContentBuilder();
         mainContent.add(allClassesContent);
-        HtmlTree bodyTree = getBody(getWindowTitle(label));
-        bodyTree.add(new BodyContents()
+        HtmlTree body = getBody(getWindowTitle(label));
+        body.add(new BodyContents()
                 .setHeader(getHeader(PageMode.ALL_CLASSES))
                 .addMainContent(mainContent)
                 .setFooter(getFooter()));
-        printHtmlDocument(null, "class index", bodyTree);
+        printHtmlDocument(null, "class index", body);
     }
 
     /**
-     * Add all types to the content tree.
+     * Add all types to the content.
      *
-     * @param content HtmlTree content to which the links will be added
+     * @param target the content to which the links will be added
      */
-    protected void addContents(Content content) {
+    protected void addContents(Content target) {
         Table table = new Table(HtmlStyle.summaryTable)
                 .setHeader(new TableHeader(contents.classLabel, contents.descriptionLabel))
                 .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
@@ -131,12 +131,12 @@ public class AllClassesIndexWriter extends HtmlDocletWriter {
             }
         }
         Content titleContent = contents.allClassesAndInterfacesLabel;
-        Content pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, titleContent);
-        Content headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
-        content.add(headerDiv);
+        var headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
+        target.add(headerDiv);
         if (!table.isEmpty()) {
-            content.add(table);
+            target.add(table);
             if (table.needsScript()) {
                 getMainBodyScript().append(table.getScript());
             }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java
index f4ad3387b96..9c0ebe887ac 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,24 +76,24 @@ public class AllPackagesIndexWriter extends HtmlDocletWriter {
         Content mainContent = new ContentBuilder();
         addPackages(mainContent);
         Content titleContent = contents.allPackagesLabel;
-        Content pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, titleContent);
-        Content headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
-        HtmlTree bodyTree = getBody(getWindowTitle(label));
-        bodyTree.add(new BodyContents()
+        var headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
+        HtmlTree body = getBody(getWindowTitle(label));
+        body.add(new BodyContents()
                 .setHeader(getHeader(PageMode.ALL_PACKAGES))
                 .addMainContent(headerDiv)
                 .addMainContent(mainContent)
                 .setFooter(getFooter()));
-        printHtmlDocument(null, "package index", bodyTree);
+        printHtmlDocument(null, "package index", body);
     }
 
     /**
-     * Add all the packages to the content tree.
+     * Add all the packages to the content.
      *
-     * @param content HtmlTree content to which the links will be added
+     * @param target the content to which the links will be added
      */
-    protected void addPackages(Content content) {
+    protected void addPackages(Content target) {
         Table table = new Table(HtmlStyle.summaryTable)
                 .setCaption(Text.of(contents.packageSummaryLabel.toString()))
                 .setHeader(new TableHeader(contents.packageLabel, contents.descriptionLabel))
@@ -106,6 +106,6 @@ public class AllPackagesIndexWriter extends HtmlDocletWriter {
                 table.addRow(pkg, packageLinkContent, summaryContent);
             }
         }
-        content.add(table);
+        target.add(table);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriterImpl.java
index 5ae2ffcf84a..1c13eff682b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,24 +92,24 @@ public class AnnotationTypeMemberWriterImpl extends AbstractMemberWriter
 
     @Override
     public Content getMemberSummaryHeader(TypeElement typeElement,
-            Content memberSummaryTree) {
+            Content content) {
         switch (kind) {
-            case OPTIONAL -> memberSummaryTree.add(selectComment(
+            case OPTIONAL -> content.add(selectComment(
                     MarkerComments.START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY,
                     MarkerComments.START_OF_ANNOTATION_INTERFACE_OPTIONAL_MEMBER_SUMMARY));
-            case REQUIRED -> memberSummaryTree.add(selectComment(
+            case REQUIRED -> content.add(selectComment(
                     MarkerComments.START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY,
                     MarkerComments.START_OF_ANNOTATION_INTERFACE_REQUIRED_MEMBER_SUMMARY));
             case ANY -> throw new UnsupportedOperationException("unsupported member kind");
         }
-        Content memberTree = new ContentBuilder();
-        writer.addSummaryHeader(this, memberTree);
-        return memberTree;
+        Content c = new ContentBuilder();
+        writer.addSummaryHeader(this, c);
+        return c;
     }
 
     @Override
-    public Content getMemberTreeHeader() {
-        return writer.getMemberTreeHeader();
+    public Content getMemberHeader() {
+        return writer.getMemberHeader();
     }
 
     @Override
@@ -131,21 +131,21 @@ public class AnnotationTypeMemberWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public Content getAnnotationDetailsTreeHeader() {
-        Content memberDetailsTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
+    public Content getAnnotationDetailsHeader() {
+        Content memberDetails = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
                 contents.annotationTypeDetailsLabel);
-        memberDetailsTree.add(heading);
-        return memberDetailsTree;
+        memberDetails.add(heading);
+        return memberDetails;
     }
 
     @Override
-    public Content getAnnotationDocTreeHeader(Element member) {
-        Content annotationDocTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
+    public Content getAnnotationHeaderContent(Element member) {
+        Content content = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(name(member)));
-        annotationDocTree.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree)
+        content.add(heading);
+        return HtmlTree.SECTION(HtmlStyle.detail, content)
                 .setId(htmlIds.forMember(typeElement, (ExecutableElement) member));
     }
 
@@ -158,40 +158,40 @@ public class AnnotationTypeMemberWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addDeprecated(Element member, Content annotationDocTree) {
-        addDeprecatedInfo(member, annotationDocTree);
+    public void addDeprecated(Element member, Content target) {
+        addDeprecatedInfo(member, target);
     }
 
     @Override
-    public void addPreview(Element member, Content contentTree) {
-        addPreviewInfo(member, contentTree);
+    public void addPreview(Element member, Content content) {
+        addPreviewInfo(member, content);
     }
 
     @Override
-    public void addComments(Element member, Content annotationDocTree) {
-        addComment(member, annotationDocTree);
+    public void addComments(Element member, Content annotationContent) {
+        addComment(member, annotationContent);
     }
 
     @Override
-    public void addTags(Element member, Content annotationDocTree) {
-        writer.addTagsInfo(member, annotationDocTree);
+    public void addTags(Element member, Content annotationContent) {
+        writer.addTagsInfo(member, annotationContent);
     }
 
     @Override
-    public Content getAnnotationDetails(Content annotationDetailsTreeHeader, Content annotationDetailsTree) {
-        Content annotationDetails = new ContentBuilder(annotationDetailsTreeHeader, annotationDetailsTree);
-        return getMemberTree(HtmlTree.SECTION(HtmlStyle.memberDetails, annotationDetails));
+    public Content getAnnotationDetails(Content annotationDetailsHeader, Content annotationDetails) {
+        Content c = new ContentBuilder(annotationDetailsHeader, annotationDetails);
+        return getMember(HtmlTree.SECTION(HtmlStyle.memberDetails, c));
     }
 
     @Override
-    public void addSummaryLabel(Content memberTree) {
-        HtmlTree label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
+    public void addSummaryLabel(Content content) {
+        var label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
                 switch (kind) {
                     case REQUIRED -> contents.annotateTypeRequiredMemberSummaryLabel;
                     case OPTIONAL -> contents.annotateTypeOptionalMemberSummaryLabel;
                     case ANY -> throw new UnsupportedOperationException("unsupported member kind");
                 });
-        memberTree.add(label);
+        content.add(label);
     }
 
     /**
@@ -227,27 +227,27 @@ public class AnnotationTypeMemberWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
+    public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
     }
 
     @Override
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
-                                  Content tdSummary) {
+                                  Content content) {
         Content memberLink = writer.getDocLink(context, utils.getEnclosingTypeElement(member), member,
                 name(member), HtmlStyle.memberNameLink);
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.add(code);
+        var code = HtmlTree.CODE(memberLink);
+        content.add(code);
     }
 
     @Override
     protected void addInheritedSummaryLink(TypeElement typeElement,
-            Element member, Content linksTree) {
+            Element member, Content target) {
         //Not applicable.
     }
 
     @Override
-    protected void addSummaryType(Element member, Content tdSummaryType) {
-        addModifierAndType(member, getType(member), tdSummaryType);
+    protected void addSummaryType(Element member, Content content) {
+        addModifiersAndType(member, getType(member), content);
     }
 
     @Override
@@ -268,15 +268,15 @@ public class AnnotationTypeMemberWriterImpl extends AbstractMemberWriter
                 : member.asType();
     }
 
-    public void addDefaultValueInfo(Element member, Content annotationDocTree) {
+    public void addDefaultValueInfo(Element member, Content annotationContent) {
         if (utils.isAnnotationType(member)) {
             ExecutableElement ee = (ExecutableElement) member;
             AnnotationValue value = ee.getDefaultValue();
             if (value != null) {
-                Content dl = HtmlTree.DL(HtmlStyle.notes);
+                var dl = HtmlTree.DL(HtmlStyle.notes);
                 dl.add(HtmlTree.DT(contents.default_));
                 dl.add(HtmlTree.DD(Text.of(value.toString())));
-                annotationDocTree.add(dl);
+                annotationContent.add(dl);
             }
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
index 840676e875c..e1bffe39923 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
@@ -230,24 +230,24 @@ public class ClassUseWriter extends SubWriterHolderWriter {
     /**
      * Add the class use documentation.
      *
-     * @param contentTree the content tree to which the class use information will be added
+     * @param content the content to which the class use information will be added
      */
-    protected void addClassUse(Content contentTree) {
-        Content content = new ContentBuilder();
+    protected void addClassUse(Content content) {
+        Content c = new ContentBuilder();
         if (configuration.packages.size() > 1) {
-            addPackageList(content);
-            addPackageAnnotationList(content);
+            addPackageList(c);
+            addPackageAnnotationList(c);
         }
-        addClassList(content);
-        contentTree.add(content);
+        addClassList(c);
+        content.add(c);
     }
 
     /**
      * Add the packages elements that use the given class.
      *
-     * @param contentTree the content tree to which the packages elements will be added
+     * @param content the content to which the packages elements will be added
      */
-    protected void addPackageList(Content contentTree) {
+    protected void addPackageList(Content content) {
         Content caption = contents.getContent(
                 "doclet.ClassUse_Packages.that.use.0",
                 getLink(new HtmlLinkInfo(configuration,
@@ -259,15 +259,15 @@ public class ClassUseWriter extends SubWriterHolderWriter {
         for (PackageElement pkg : pkgSet) {
             addPackageUse(pkg, table);
         }
-        contentTree.add(table);
+        content.add(table);
     }
 
     /**
      * Add the package annotation elements.
      *
-     * @param contentTree the content tree to which the package annotation elements will be added
+     * @param content the content to which the package annotation elements will be added
      */
-    protected void addPackageAnnotationList(Content contentTree) {
+    protected void addPackageAnnotationList(Content content) {
         if (!utils.isAnnotationType(typeElement) ||
                 pkgToPackageAnnotations == null ||
                 pkgToPackageAnnotations.isEmpty()) {
@@ -287,30 +287,30 @@ public class ClassUseWriter extends SubWriterHolderWriter {
             addSummaryComment(pkg, summary);
             table.addRow(getPackageLink(pkg, getLocalizedPackageName(pkg)), summary);
         }
-        contentTree.add(table);
+        content.add(table);
     }
 
     /**
      * Add the class elements that use the given class.
      *
-     * @param contentTree the content tree to which the class elements will be added
+     * @param content the content to which the class elements will be added
      */
-    protected void addClassList(Content contentTree) {
-        HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList);
+    protected void addClassList(Content content) {
+        var ul = HtmlTree.UL(HtmlStyle.blockList);
         for (PackageElement pkg : pkgSet) {
-            HtmlTree htmlTree = HtmlTree.SECTION(HtmlStyle.detail)
+            var section = HtmlTree.SECTION(HtmlStyle.detail)
                     .setId(htmlIds.forPackage(pkg));
             Content link = contents.getContent("doclet.ClassUse_Uses.of.0.in.1",
                     getLink(new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.CLASS_USE_HEADER,
                             typeElement)),
                     getPackageLink(pkg, getLocalizedPackageName(pkg)));
-            Content heading = HtmlTree.HEADING(Headings.TypeUse.SUMMARY_HEADING, link);
-            htmlTree.add(heading);
-            addClassUse(pkg, htmlTree);
-            ul.add(HtmlTree.LI(htmlTree));
+            var heading = HtmlTree.HEADING(Headings.TypeUse.SUMMARY_HEADING, link);
+            section.add(heading);
+            addClassUse(pkg, section);
+            ul.add(HtmlTree.LI(section));
         }
-        Content li = HtmlTree.SECTION(HtmlStyle.classUses, ul);
-        contentTree.add(li);
+        var li = HtmlTree.SECTION(HtmlStyle.classUses, ul);
+        content.add(li);
     }
 
     /**
@@ -331,81 +331,81 @@ public class ClassUseWriter extends SubWriterHolderWriter {
      * Add the class use information.
      *
      * @param pkg the package that uses the given class
-     * @param contentTree the content tree to which the class use information will be added
+     * @param content the content to which the class use information will be added
      */
-    protected void addClassUse(PackageElement pkg, Content contentTree) {
+    protected void addClassUse(PackageElement pkg, Content content) {
         Content classLink = getLink(new HtmlLinkInfo(configuration,
             HtmlLinkInfo.Kind.CLASS_USE_HEADER, typeElement));
         Content pkgLink = getPackageLink(pkg, getLocalizedPackageName(pkg));
         classSubWriter.addUseInfo(pkgToClassAnnotations.get(pkg),
                 contents.getContent("doclet.ClassUse_Annotation", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         classSubWriter.addUseInfo(pkgToClassTypeParameter.get(pkg),
                 contents.getContent("doclet.ClassUse_TypeParameter", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         classSubWriter.addUseInfo(pkgToSubclass.get(pkg),
                 contents.getContent("doclet.ClassUse_Subclass", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         classSubWriter.addUseInfo(pkgToSubinterface.get(pkg),
                 contents.getContent("doclet.ClassUse_Subinterface", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         classSubWriter.addUseInfo(pkgToImplementingClass.get(pkg),
                 contents.getContent("doclet.ClassUse_ImplementingClass", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         fieldSubWriter.addUseInfo(pkgToField.get(pkg),
                 contents.getContent("doclet.ClassUse_Field", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         fieldSubWriter.addUseInfo(pkgToFieldAnnotations.get(pkg),
                 contents.getContent("doclet.ClassUse_FieldAnnotations", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         fieldSubWriter.addUseInfo(pkgToFieldTypeParameter.get(pkg),
                 contents.getContent("doclet.ClassUse_FieldTypeParameter", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         methodSubWriter.addUseInfo(pkgToMethodAnnotations.get(pkg),
                 contents.getContent("doclet.ClassUse_MethodAnnotations", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         methodSubWriter.addUseInfo(pkgToMethodParameterAnnotations.get(pkg),
                 contents.getContent("doclet.ClassUse_MethodParameterAnnotations", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         methodSubWriter.addUseInfo(pkgToMethodTypeParameter.get(pkg),
                 contents.getContent("doclet.ClassUse_MethodTypeParameter", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         methodSubWriter.addUseInfo(pkgToMethodReturn.get(pkg),
                 contents.getContent("doclet.ClassUse_MethodReturn", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         methodSubWriter.addUseInfo(pkgToMethodReturnTypeParameter.get(pkg),
                 contents.getContent("doclet.ClassUse_MethodReturnTypeParameter", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         methodSubWriter.addUseInfo(pkgToMethodArgs.get(pkg),
                 contents.getContent("doclet.ClassUse_MethodArgs", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         methodSubWriter.addUseInfo(pkgToMethodArgTypeParameter.get(pkg),
                 contents.getContent("doclet.ClassUse_MethodArgsTypeParameters", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         methodSubWriter.addUseInfo(pkgToMethodThrows.get(pkg),
                 contents.getContent("doclet.ClassUse_MethodThrows", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         constrSubWriter.addUseInfo(pkgToConstructorAnnotations.get(pkg),
                 contents.getContent("doclet.ClassUse_ConstructorAnnotations", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         constrSubWriter.addUseInfo(pkgToConstructorParameterAnnotations.get(pkg),
                 contents.getContent("doclet.ClassUse_ConstructorParameterAnnotations", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         constrSubWriter.addUseInfo(pkgToConstructorArgs.get(pkg),
                 contents.getContent("doclet.ClassUse_ConstructorArgs", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         constrSubWriter.addUseInfo(pkgToConstructorArgTypeParameter.get(pkg),
                 contents.getContent("doclet.ClassUse_ConstructorArgsTypeParameters", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
         constrSubWriter.addUseInfo(pkgToConstructorThrows.get(pkg),
                 contents.getContent("doclet.ClassUse_ConstructorThrows", classLink,
-                pkgLink), contentTree);
+                pkgLink), content);
     }
 
     /**
-     * Get the header for the class use Listing.
+     * Get the header for the class use listing.
      *
-     * @return a content tree representing the class use header
+     * @return the class use header
      */
     protected HtmlTree getClassUseHeader() {
         String cltype = resources.getText(switch (typeElement.getKind()) {
@@ -418,16 +418,16 @@ public class ClassUseWriter extends SubWriterHolderWriter {
         String clname = utils.getFullyQualifiedName(typeElement);
         String title = resources.getText("doclet.Window_ClassUse_Header",
                 cltype, clname);
-        HtmlTree bodyTree = getBody(getWindowTitle(title));
+        HtmlTree body = getBody(getWindowTitle(title));
         ContentBuilder headingContent = new ContentBuilder();
         headingContent.add(contents.getContent("doclet.ClassUse_Title", cltype));
         headingContent.add(new HtmlTree(TagName.BR));
         headingContent.add(clname);
-        Content heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, headingContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
+        var div = HtmlTree.DIV(HtmlStyle.header, heading);
         bodyContents.setHeader(getHeader(PageMode.USE, typeElement)).addMainContent(div);
-        return bodyTree;
+        return body;
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
index 7f1e15292d4..aa037e7766f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
@@ -99,12 +99,12 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
 
     @Override
     public Content getHeader(String header) {
-        HtmlTree bodyTree = getBody(getWindowTitle(utils.getSimpleName(typeElement)));
-        HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
+        HtmlTree body = getBody(getWindowTitle(utils.getSimpleName(typeElement)));
+        var div = HtmlTree.DIV(HtmlStyle.header);
         if (configuration.showModules) {
             ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement);
-            Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInType, contents.moduleLabel);
-            Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
+            var classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInType, contents.moduleLabel);
+            var moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
             moduleNameDiv.add(Entity.NO_BREAK_SPACE);
             moduleNameDiv.add(getModuleLink(mdle,
                     Text.of(mdle.getQualifiedName())));
@@ -112,8 +112,8 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
         }
         PackageElement pkg = utils.containingPackage(typeElement);
         if (!pkg.isUnnamed()) {
-            Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInType, contents.packageLabel);
-            Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classPackageLabel);
+            var classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInType, contents.packageLabel);
+            var pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classPackageLabel);
             pkgNameDiv.add(Entity.NO_BREAK_SPACE);
             Content pkgNameContent = getPackageLink(pkg, getLocalizedPackageName(pkg));
             pkgNameDiv.add(pkgNameContent);
@@ -123,14 +123,14 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
                 HtmlLinkInfo.Kind.CLASS_HEADER, typeElement);
         //Let's not link to ourselves in the header.
         linkInfo.linkToSelf = false;
-        Content heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, Text.of(header));
         heading.add(getTypeParameterLinks(linkInfo));
         div.add(heading);
         bodyContents.setHeader(getHeader(PageMode.CLASS, typeElement))
                 .addMainContent(MarkerComments.START_OF_CLASS_DATA)
                 .addMainContent(div);
-        return bodyTree;
+        return body;
     }
 
     @Override
@@ -164,23 +164,18 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
     }
 
     @Override
-    public void printDocument(Content contentTree) throws DocFileIOException {
+    public void printDocument(Content content) throws DocFileIOException {
         String description = getDescription("declaration", typeElement);
         PackageElement pkg = utils.containingPackage(typeElement);
         List<DocPath> localStylesheets = getLocalStylesheets(pkg);
-        contentTree.add(bodyContents);
+        content.add(bodyContents);
         printHtmlDocument(configuration.metakeywords.getMetaKeywords(typeElement),
-                description, localStylesheets, contentTree);
+                description, localStylesheets, content);
     }
 
     @Override
-    public Content getClassInfoTreeHeader() {
-        return getMemberTreeHeader();
-    }
-
-    @Override
-    public Content getClassInfo(Content classInfoTree) {
-        return getMemberTree(HtmlIds.CLASS_DESCRIPTION, HtmlStyle.classDescription, classInfoTree);
+    public Content getClassInfo(Content classInfo) {
+        return getMember(HtmlIds.CLASS_DESCRIPTION, HtmlStyle.classDescription, classInfo);
     }
 
     @Override
@@ -189,51 +184,51 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
     }
 
     @Override
-    public void addClassSignature(Content classInfoTree) {
-        classInfoTree.add(new HtmlTree(TagName.HR));
-        classInfoTree.add(new Signatures.TypeSignature(typeElement, this)
+    public void addClassSignature(Content classInfo) {
+        classInfo.add(new HtmlTree(TagName.HR));
+        classInfo.add(new Signatures.TypeSignature(typeElement, this)
                 .toContent());
     }
 
 
     @Override
-    public void addClassDescription(Content classInfoTree) {
-        addPreviewInfo(classInfoTree);
+    public void addClassDescription(Content classInfo) {
+        addPreviewInfo(classInfo);
         if (!options.noComment()) {
             // generate documentation for the class.
             if (!utils.getFullBody(typeElement).isEmpty()) {
-                addInlineComment(typeElement, classInfoTree);
+                addInlineComment(typeElement, classInfo);
             }
         }
     }
 
-    private void addPreviewInfo(Content classInfoTree) {
-        addPreviewInfo(typeElement, classInfoTree);
+    private void addPreviewInfo(Content content) {
+        addPreviewInfo(typeElement, content);
     }
 
     @Override
-    public void addClassTagInfo(Content classInfoTree) {
+    public void addClassTagInfo(Content classInfo) {
         if (!options.noComment()) {
             // Print Information about all the tags here
-            addTagsInfo(typeElement, classInfoTree);
+            addTagsInfo(typeElement, classInfo);
         }
     }
 
     /**
-     * Get the class hierarchy tree for the given class.
+     * Get the class inheritance tree for the given class.
      *
-     * @param type the class to print the hierarchy for
-     * @return a content tree for class inheritance
+     * @param type the class to get the inheritance tree for
+     * @return the class inheritance tree
      */
-    private Content getClassInheritanceTree(TypeMirror type) {
+    private Content getClassInheritanceTreeContent(TypeMirror type) {
         TypeMirror sup;
         HtmlTree classTree = null;
         do {
             sup = utils.getFirstVisibleSuperClass(type);
-            HtmlTree htmlElement = HtmlTree.DIV(HtmlStyle.inheritance, getTreeForClassHelper(type));
+            var entry = HtmlTree.DIV(HtmlStyle.inheritance, getClassHelperContent(type));
             if (classTree != null)
-                htmlElement.add(classTree);
-            classTree = htmlElement;
+                entry.add(classTree);
+            classTree = entry;
             type = sup;
         } while (sup != null);
         classTree.put(HtmlAttr.TITLE, contents.getContent("doclet.Inheritance_Tree").toString());
@@ -241,54 +236,54 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
     }
 
     /**
-     * Get the class helper tree for the given class.
+     * Get the class helper for the given class.
      *
-     * @param type the class to print the helper for
-     * @return a content tree for class helper
+     * @param type the class to get the helper for
+     * @return the class helper
      */
-    private Content getTreeForClassHelper(TypeMirror type) {
-        Content content = new ContentBuilder();
+    private Content getClassHelperContent(TypeMirror type) {
+        Content result = new ContentBuilder();
         if (utils.typeUtils.isSameType(type, typeElement.asType())) {
             Content typeParameters = getTypeParameterLinks(
                     new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.TREE,
                     typeElement));
             if (configuration.shouldExcludeQualifier(utils.containingPackage(typeElement).toString())) {
-                content.add(utils.asTypeElement(type).getSimpleName());
-                content.add(typeParameters);
+                result.add(utils.asTypeElement(type).getSimpleName());
+                result.add(typeParameters);
             } else {
-                content.add(utils.asTypeElement(type).getQualifiedName());
-                content.add(typeParameters);
+                result.add(utils.asTypeElement(type).getQualifiedName());
+                result.add(typeParameters);
             }
         } else {
             Content link = getLink(new HtmlLinkInfo(configuration,
                     HtmlLinkInfo.Kind.CLASS_TREE_PARENT, type)
                     .label(configuration.getClassName(utils.asTypeElement(type))));
-            content.add(link);
+            result.add(link);
         }
-        return content;
+        return result;
     }
 
     @Override
-    public void addClassTree(Content classContentTree) {
+    public void addClassTree(Content target) {
         if (!utils.isClass(typeElement)) {
             return;
         }
-        classContentTree.add(getClassInheritanceTree(typeElement.asType()));
+        target.add(getClassInheritanceTreeContent(typeElement.asType()));
     }
 
     @Override
-    public void addParamInfo(Content classInfoTree) {
+    public void addParamInfo(Content target) {
         if (utils.hasBlockTag(typeElement, DocTree.Kind.PARAM)) {
             Content paramInfo = (new ParamTaglet()).getAllBlockTagOutput(typeElement,
                     getTagletWriterInstance(false));
             if (!paramInfo.isEmpty()) {
-                classInfoTree.add(HtmlTree.DL(HtmlStyle.notes, paramInfo));
+                target.add(HtmlTree.DL(HtmlStyle.notes, paramInfo));
             }
         }
     }
 
     @Override
-    public void addSubClassInfo(Content classInfoTree) {
+    public void addSubClassInfo(Content target) {
         if (utils.isClass(typeElement)) {
             for (String s : suppressSubtypesSet) {
                 if (typeElement.getQualifiedName().contentEquals(s)) {
@@ -297,29 +292,29 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
             }
             Set<TypeElement> subclasses = classtree.directSubClasses(typeElement, false);
             if (!subclasses.isEmpty()) {
-                HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+                var dl = HtmlTree.DL(HtmlStyle.notes);
                 dl.add(HtmlTree.DT(contents.subclassesLabel));
                 dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.SUBCLASSES, subclasses)));
-                classInfoTree.add(dl);
+                target.add(dl);
             }
         }
     }
 
     @Override
-    public void addSubInterfacesInfo(Content classInfoTree) {
+    public void addSubInterfacesInfo(Content target) {
         if (utils.isInterface(typeElement)) {
             Set<TypeElement> subInterfaces = classtree.allSubClasses(typeElement, false);
             if (!subInterfaces.isEmpty()) {
-                Content dl = HtmlTree.DL(HtmlStyle.notes);
+                var dl = HtmlTree.DL(HtmlStyle.notes);
                 dl.add(HtmlTree.DT(contents.subinterfacesLabel));
                 dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.SUBINTERFACES, subInterfaces)));
-                classInfoTree.add(dl);
+                target.add(dl);
             }
         }
     }
 
     @Override
-    public void addInterfaceUsageInfo (Content classInfoTree) {
+    public void addInterfaceUsageInfo(Content target) {
         if (!utils.isInterface(typeElement)) {
             return;
         }
@@ -330,67 +325,67 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
         }
         Set<TypeElement> implcl = classtree.implementingClasses(typeElement);
         if (!implcl.isEmpty()) {
-            HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyle.notes);
             dl.add(HtmlTree.DT(contents.implementingClassesLabel));
             dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.IMPLEMENTED_CLASSES, implcl)));
-            classInfoTree.add(dl);
+            target.add(dl);
         }
     }
 
     @Override
-    public void addImplementedInterfacesInfo(Content classInfoTree) {
+    public void addImplementedInterfacesInfo(Content target) {
         SortedSet<TypeMirror> interfaces = new TreeSet<>(comparators.makeTypeMirrorClassUseComparator());
         interfaces.addAll(utils.getAllInterfaces(typeElement));
         if (utils.isClass(typeElement) && !interfaces.isEmpty()) {
-            HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyle.notes);
             dl.add(HtmlTree.DT(contents.allImplementedInterfacesLabel));
             dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.IMPLEMENTED_INTERFACES, interfaces)));
-            classInfoTree.add(dl);
+            target.add(dl);
         }
     }
 
     @Override
-    public void addSuperInterfacesInfo(Content classInfoTree) {
+    public void addSuperInterfacesInfo(Content target) {
         SortedSet<TypeMirror> interfaces =
                 new TreeSet<>(comparators.makeTypeMirrorIndexUseComparator());
         interfaces.addAll(utils.getAllInterfaces(typeElement));
 
         if (utils.isInterface(typeElement) && !interfaces.isEmpty()) {
-            HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyle.notes);
             dl.add(HtmlTree.DT(contents.allSuperinterfacesLabel));
             dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.SUPER_INTERFACES, interfaces)));
-            classInfoTree.add(dl);
+            target.add(dl);
         }
     }
 
     @Override
-    public void addNestedClassInfo(final Content classInfoTree) {
+    public void addNestedClassInfo(final Content target) {
         Element outerClass = typeElement.getEnclosingElement();
         if (outerClass == null)
             return;
         new SimpleElementVisitor8<Void, Void>() {
             @Override
             public Void visitType(TypeElement e, Void p) {
-                HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+                var dl = HtmlTree.DL(HtmlStyle.notes);
                 dl.add(HtmlTree.DT(utils.isInterface(e)
                         ? contents.enclosingInterfaceLabel
                         : contents.enclosingClassLabel));
                 dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.CLASS, List.of(e))));
-                classInfoTree.add(dl);
+                target.add(dl);
                 return null;
             }
         }.visit(outerClass);
     }
 
     @Override
-    public void addFunctionalInterfaceInfo (Content classInfoTree) {
+    public void addFunctionalInterfaceInfo (Content target) {
         if (isFunctionalInterface()) {
-            HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyle.notes);
             dl.add(HtmlTree.DT(contents.functionalInterface));
-            Content dd = new HtmlTree(TagName.DD);
+            var dd = new HtmlTree(TagName.DD);
             dd.add(contents.functionalInterfaceMessage);
             dl.add(dd);
-            classInfoTree.add(dl);
+            target.add(dl);
         }
     }
 
@@ -406,11 +401,11 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
 
 
     @Override
-    public void addClassDeprecationInfo(Content classInfoTree) {
+    public void addClassDeprecationInfo(Content classInfo) {
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(typeElement);
         if (utils.isDeprecated(typeElement)) {
-            Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(typeElement));
-            Content div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprLabel);
+            var deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(typeElement));
+            var div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprLabel);
             if (!deprs.isEmpty()) {
                 CommentHelper ch = utils.getCommentHelper(typeElement);
                 DocTree dt = deprs.get(0);
@@ -419,16 +414,16 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
                     addInlineDeprecatedComment(typeElement, deprs.get(0), div);
                 }
             }
-            classInfoTree.add(div);
+            classInfo.add(div);
         }
     }
 
     /**
-     * Get links to the given classes.
+     * Get the links to the given classes.
      *
-     * @param context the id of the context where the link will be printed
-     * @param list the list of classes
-     * @return a content tree for the class list
+     * @param context the id of the context where the links will be added
+     * @param list the classes
+     * @return the links
      */
     private Content getClassLinks(HtmlLinkInfo.Kind context, Collection<?> list) {
         Content content = new ContentBuilder();
@@ -463,14 +458,9 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
         return typeElement;
     }
 
-    /**
-     * Get the member details tree
-     *
-     * @param contentTree the tree used to generate the member details tree
-     * @return a content tree for the member details
-     */
-    public Content getMemberDetailsTree(Content contentTree) {
-        HtmlTree section = HtmlTree.SECTION(HtmlStyle.details, contentTree);
+    @Override
+    public Content getMemberDetails(Content content) {
+        var section = HtmlTree.SECTION(HtmlStyle.details, content);
         // The following id is required by the Navigation bar
         if (utils.isAnnotationType(typeElement)) {
             section.setId(HtmlIds.ANNOTATION_TYPE_ELEMENT_DETAIL);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
index 1723bc6ecfd..b6c4cbc874d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
@@ -68,9 +68,9 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
     private final TableHeader constantsTableHeader;
 
     /**
-     * The HTML tree for constant values summary.
+     * The HTML tree for constant values summary currently being written.
      */
-    private HtmlTree summaryTree;
+    private HtmlTree summarySection;
 
     private final BodyContents bodyContents = new BodyContents();
 
@@ -91,9 +91,9 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
     @Override
     public Content getHeader() {
         String label = resources.getText("doclet.Constants_Summary");
-        HtmlTree bodyTree = getBody(getWindowTitle(label));
+        HtmlTree body = getBody(getWindowTitle(label));
         bodyContents.setHeader(getHeader(PageMode.CONSTANT_VALUES));
-        return bodyTree;
+        return body;
     }
 
     @Override
@@ -103,7 +103,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
 
     @Override
     public void addLinkToPackageContent(PackageElement pkg,
-            Set<PackageElement> printedPackageHeaders, Content contentListTree) {
+            Set<PackageElement> printedPackageHeaders, Content content) {
         //add link to summary
         Content link;
         if (pkg.isUnnamed()) {
@@ -117,20 +117,20 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
             PackageElement abbrevPkg = configuration.workArounds.getAbbreviatedPackageElement(pkg);
             printedPackageHeaders.add(abbrevPkg);
         }
-        contentListTree.add(HtmlTree.LI(link));
+        content.add(HtmlTree.LI(link));
     }
 
     @Override
-    public void addContentsList(Content contentListTree) {
+    public void addContentsList(Content content) {
         Content titleContent = contents.constantsSummaryTitle;
-        Content pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, titleContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, pHeading);
+        var div = HtmlTree.DIV(HtmlStyle.header, pHeading);
         Content headingContent = contents.contentsHeading;
-        Content heading = HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
+        var heading = HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
                 headingContent);
-        HtmlTree section = HtmlTree.SECTION(HtmlStyle.packages, heading);
-        section.add(contentListTree);
+        var section = HtmlTree.SECTION(HtmlStyle.packages, heading);
+        section.add(content);
         div.add(section);
         bodyContents.addMainContent(div);
     }
@@ -141,11 +141,11 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
     }
 
     @Override
-    public void addPackageName(PackageElement pkg, Content summariesTree, boolean first) {
+    public void addPackageName(PackageElement pkg, Content toContent, boolean first) {
         Content pkgNameContent;
         HtmlId anchorName;
         if (!first) {
-            summariesTree.add(summaryTree);
+            toContent.add(summarySection);
         }
         if (pkg.isUnnamed()) {
             anchorName = HtmlIds.UNNAMED_PACKAGE_ANCHOR;
@@ -155,11 +155,11 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
             anchorName = htmlIds.forPackage(pkg);
             pkgNameContent = getPackageLabel(parsedPackageName);
         }
-        Content headingContent = Text.of(".*");
-        Content heading = HtmlTree.HEADING_TITLE(Headings.ConstantsSummary.PACKAGE_HEADING,
+        var headingContent = Text.of(".*");
+        var heading = HtmlTree.HEADING_TITLE(Headings.ConstantsSummary.PACKAGE_HEADING,
                 pkgNameContent);
         heading.add(headingContent);
-        summaryTree = HtmlTree.SECTION(HtmlStyle.constantsSummary, heading)
+        summarySection = HtmlTree.SECTION(HtmlStyle.constantsSummary, heading)
                 .setId(anchorName);
     }
 
@@ -169,14 +169,14 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
     }
 
     @Override
-    public void addClassConstant(Content summariesTree, Content classConstantTree) {
-        summaryTree.add(classConstantTree);
+    public void addClassConstant(Content fromClassConstant) {
+        summarySection.add(fromClassConstant);
         hasConstants = true;
     }
 
     @Override
     public void addConstantMembers(TypeElement typeElement, Collection<VariableElement> fields,
-            Content classConstantTree) {
+            Content target) {
         currentTypeElement = typeElement;
 
         //generate links backward only to public classes.
@@ -201,7 +201,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
         for (VariableElement field : fields) {
             table.addRow(getTypeColumn(field), getNameColumn(field), getValue(field));
         }
-        classConstantTree.add(HtmlTree.LI(table));
+        target.add(HtmlTree.LI(table));
     }
 
     /**
@@ -212,7 +212,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
      */
     private Content getTypeColumn(VariableElement member) {
         Content typeContent = new ContentBuilder();
-        Content code = new HtmlTree(TagName.CODE)
+        var code = new HtmlTree(TagName.CODE)
                 .setId(htmlIds.forMember(currentTypeElement, member));
         for (Modifier mod : member.getModifiers()) {
             code.add(Text.of(mod.toString()))
@@ -249,11 +249,11 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
     }
 
     @Override
-    public void addConstantSummaries(Content summariesTree) {
-        if (summaryTree != null) {
-            summariesTree.add(summaryTree);
+    public void addConstantSummaries(Content content) {
+        if (summarySection != null) {
+            content.add(summarySection);
         }
-        bodyContents.addMainContent(summariesTree);
+        bodyContents.addMainContent(content);
     }
 
     @Override
@@ -262,9 +262,9 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
     }
 
     @Override
-    public void printDocument(Content contentTree) throws DocFileIOException {
-        contentTree.add(bodyContents);
-        printHtmlDocument(null, "summary of constants", contentTree);
+    public void printDocument(Content content) throws DocFileIOException {
+        content.add(bodyContents);
+        printHtmlDocument(null, "summary of constants", content);
 
         if (hasConstants && configuration.mainIndex != null) {
             configuration.mainIndex.add(IndexItem.of(IndexItem.Category.TAGS,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
index ed5c0220732..7be2f2da5a1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,11 +90,11 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
 
     @Override
     public Content getMemberSummaryHeader(TypeElement typeElement,
-            Content memberSummaryTree) {
-        memberSummaryTree.add(MarkerComments.START_OF_CONSTRUCTOR_SUMMARY);
-        Content memberTree = new ContentBuilder();
-        writer.addSummaryHeader(this, memberTree);
-        return memberTree;
+            Content content) {
+        content.add(MarkerComments.START_OF_CONSTRUCTOR_SUMMARY);
+        Content c = new ContentBuilder();
+        writer.addSummaryHeader(this, c);
+        return c;
     }
 
     @Override
@@ -104,26 +104,26 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public Content getConstructorDetailsTreeHeader(Content memberDetailsTree) {
-        memberDetailsTree.add(MarkerComments.START_OF_CONSTRUCTOR_DETAILS);
-        Content constructorDetailsTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
+    public Content getConstructorDetailsHeader(Content content) {
+        content.add(MarkerComments.START_OF_CONSTRUCTOR_DETAILS);
+        Content constructorDetails = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
                 contents.constructorDetailsLabel);
-        constructorDetailsTree.add(heading);
-        return constructorDetailsTree;
+        constructorDetails.add(heading);
+        return constructorDetails;
     }
 
     @Override
-    public Content getConstructorDocTreeHeader(ExecutableElement constructor) {
-        Content constructorDocTree = new ContentBuilder();
-        HtmlTree heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
+    public Content getConstructorHeaderContent(ExecutableElement constructor) {
+        Content content = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(name(constructor)));
         HtmlId erasureAnchor = htmlIds.forErasure(constructor);
         if (erasureAnchor != null) {
             heading.setId(erasureAnchor);
         }
-        constructorDocTree.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, constructorDocTree)
+        content.add(heading);
+        return HtmlTree.SECTION(HtmlStyle.detail, content)
                 .setId(htmlIds.forMember(constructor));
     }
 
@@ -137,32 +137,32 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public void addDeprecated(ExecutableElement constructor, Content constructorDocTree) {
-        addDeprecatedInfo(constructor, constructorDocTree);
+    public void addDeprecated(ExecutableElement constructor, Content constructorContent) {
+        addDeprecatedInfo(constructor, constructorContent);
     }
 
     @Override
-    public void addPreview(ExecutableElement constructor, Content constructorDocTree) {
-        addPreviewInfo(constructor, constructorDocTree);
+    public void addPreview(ExecutableElement constructor, Content content) {
+        addPreviewInfo(constructor, content);
     }
 
     @Override
-    public void addComments(ExecutableElement constructor, Content constructorDocTree) {
-        addComment(constructor, constructorDocTree);
+    public void addComments(ExecutableElement constructor, Content constructorContent) {
+        addComment(constructor, constructorContent);
     }
 
     @Override
-    public void addTags(ExecutableElement constructor, Content constructorDocTree) {
-        writer.addTagsInfo(constructor, constructorDocTree);
+    public void addTags(ExecutableElement constructor, Content constructorContent) {
+        writer.addTagsInfo(constructor, constructorContent);
     }
 
     @Override
-    public Content getConstructorDetails(Content constructorDetailsTreeHeader, Content constructorDetailsTree) {
+    public Content getConstructorDetails(Content memberDetailsHeader, Content memberDetails) {
         return writer.getDetailsListItem(
                 HtmlTree.SECTION(HtmlStyle.constructorDetails)
                         .setId(HtmlIds.CONSTRUCTOR_DETAIL)
-                        .add(constructorDetailsTreeHeader)
-                        .add(constructorDetailsTree));
+                        .add(memberDetailsHeader)
+                        .add(memberDetails));
     }
 
     @Override
@@ -171,10 +171,10 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
+    public void addSummaryLabel(Content content) {
+        var label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
                 contents.constructorSummaryLabel);
-        memberTree.add(label);
+        content.add(label);
     }
 
     @Override
@@ -206,13 +206,13 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
+    public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
     }
 
     @Override
-    protected void addSummaryType(Element member, Content tdSummaryType) {
+    protected void addSummaryType(Element member, Content content) {
         if (foundNonPubConstructor) {
-            Content code = new HtmlTree(TagName.CODE);
+            var code = new HtmlTree(TagName.CODE);
             if (utils.isProtected(member)) {
                 code.add("protected ");
             } else if (utils.isPrivate(member)) {
@@ -223,12 +223,12 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
                 code.add(
                         resources.getText("doclet.Package_private"));
             }
-            tdSummaryType.add(code);
+            content.add(code);
         }
     }
 
     @Override
-    public Content getMemberTreeHeader(){
-        return writer.getMemberTreeHeader();
+    public Content getMemberHeader(){
+        return writer.getMemberHeader();
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
index 1b18aa4293c..1c0be973c30 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -343,7 +343,7 @@ public class Contents {
      * a given key in the doclet's resources.
      *
      * @param key the key for the desired string
-     * @return a content tree for the string
+     * @return the string
      */
     public Content getContent(String key) {
         return Text.of(resources.getText(key));
@@ -356,7 +356,7 @@ public class Contents {
      *
      * @param key the key for the desired string
      * @param o0  string or content argument to be formatted into the result
-     * @return a content tree for the text
+     * @return the string
      */
     public Content getContent(String key, Object o0) {
         return getContent(key, o0, null, null);
@@ -370,7 +370,7 @@ public class Contents {
      * @param key the key for the desired string
      * @param o0  string or content argument to be formatted into the result
      * @param o1  string or content argument to be formatted into the result
-     * @return a content tree for the text
+     * @return the string
      */
     public Content getContent(String key, Object o0, Object o1) {
         return getContent(key, o0, o1, null);
@@ -385,7 +385,7 @@ public class Contents {
      * @param o0  string or content argument to be formatted into the result
      * @param o1  string or content argument to be formatted into the result
      * @param o2  string or content argument to be formatted into the result
-     * @return a content tree for the text
+     * @return the string
      */
     public Content getContent(String key, Object o0, Object o1, Object o2) {
         Content c = new ContentBuilder();
@@ -423,7 +423,7 @@ public class Contents {
      *
      * @param separator the separator
      * @param items     the items
-     * @return the content
+     * @return the composition
      */
     public Content join(Content separator, Collection<Content> items) {
         Content result = new ContentBuilder();
@@ -446,7 +446,7 @@ public class Contents {
      * the named resource string.
      *
      * @param key the key for the desired string
-     * @return a content tree for the string
+     * @return the string
      */
     private Content getNonBreakResource(String key) {
         return getNonBreakString(resources.getText(key));
@@ -458,7 +458,7 @@ public class Contents {
      * the named resource string.
      *
      * @param text the string
-     * @return a content tree for the string
+     * @return the string content
      */
     public Content getNonBreakString(String text) {
         Content c = new ContentBuilder();
@@ -474,9 +474,9 @@ public class Contents {
     }
 
     /**
-     * Returns a content for a visible member kind.
+     * {@return a label that describes the VisibleMemberTable kind}
+     *
      * @param kind the visible member table kind.
-     * @return the string content
      */
     public Content getNavLinkLabelContent(VisibleMemberTable.Kind kind) {
         return Objects.requireNonNull(navLinkLabels.get(kind));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
index 3fbd13d0189..2c659e127b3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,11 +59,11 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
 
     @Override
     public Content getMemberSummaryHeader(TypeElement typeElement,
-            Content memberSummaryTree) {
-        memberSummaryTree.add(MarkerComments.START_OF_ENUM_CONSTANT_SUMMARY);
-        Content memberTree = new ContentBuilder();
-        writer.addSummaryHeader(this, memberTree);
-        return memberTree;
+            Content content) {
+        content.add(MarkerComments.START_OF_ENUM_CONSTANT_SUMMARY);
+        Content memberContent = new ContentBuilder();
+        writer.addSummaryHeader(this, memberContent);
+        return memberContent;
     }
 
     @Override
@@ -73,24 +73,24 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public Content getEnumConstantsDetailsTreeHeader(TypeElement typeElement,
-            Content memberDetailsTree) {
-        memberDetailsTree.add(MarkerComments.START_OF_ENUM_CONSTANT_DETAILS);
-        Content enumConstantsDetailsTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
+    public Content getEnumConstantsDetailsHeader(TypeElement typeElement,
+                                                 Content memberDetails) {
+        memberDetails.add(MarkerComments.START_OF_ENUM_CONSTANT_DETAILS);
+        var enumConstantsDetailsContent = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
                 contents.enumConstantDetailLabel);
-        enumConstantsDetailsTree.add(heading);
-        return enumConstantsDetailsTree;
+        enumConstantsDetailsContent.add(heading);
+        return enumConstantsDetailsContent;
     }
 
     @Override
-    public Content getEnumConstantsTreeHeader(VariableElement enumConstant,
-            Content enumConstantsDetailsTree) {
-        Content enumConstantsTree = new ContentBuilder();
-        HtmlTree heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
+    public Content getEnumConstantsHeader(VariableElement enumConstant,
+                                          Content enumConstantsDetails) {
+        Content enumConstantsContent = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(name(enumConstant)));
-        enumConstantsTree.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, enumConstantsTree)
+        enumConstantsContent.add(heading);
+        return HtmlTree.SECTION(HtmlStyle.detail, enumConstantsContent)
                 .setId(htmlIds.forMember(enumConstant));
     }
 
@@ -103,40 +103,40 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addDeprecated(VariableElement enumConstant, Content enumConstantsTree) {
-        addDeprecatedInfo(enumConstant, enumConstantsTree);
+    public void addDeprecated(VariableElement enumConstant, Content content) {
+        addDeprecatedInfo(enumConstant, content);
     }
 
     @Override
-    public void addPreview(VariableElement enumConstant, Content enumConstantsTree) {
-        addPreviewInfo(enumConstant, enumConstantsTree);
+    public void addPreview(VariableElement enumConstant, Content content) {
+        addPreviewInfo(enumConstant, content);
     }
 
     @Override
-    public void addComments(VariableElement enumConstant, Content enumConstantsTree) {
-        addComment(enumConstant, enumConstantsTree);
+    public void addComments(VariableElement enumConstant, Content enumConstants) {
+        addComment(enumConstant, enumConstants);
     }
 
     @Override
-    public void addTags(VariableElement enumConstant, Content enumConstantsTree) {
-        writer.addTagsInfo(enumConstant, enumConstantsTree);
+    public void addTags(VariableElement enumConstant, Content content) {
+        writer.addTagsInfo(enumConstant, content);
     }
 
     @Override
-    public Content getEnumConstantsDetails(Content enumConstantsDetailsTreeHeader,
-            Content enumConstantsDetailsTree) {
+    public Content getEnumConstantsDetails(Content memberDetailsHeader,
+            Content content) {
         return writer.getDetailsListItem(
                 HtmlTree.SECTION(HtmlStyle.constantDetails)
                         .setId(HtmlIds.ENUM_CONSTANT_DETAIL)
-                        .add(enumConstantsDetailsTreeHeader)
-                        .add(enumConstantsDetailsTree));
+                        .add(memberDetailsHeader)
+                        .add(content));
     }
 
     @Override
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
+    public void addSummaryLabel(Content content) {
+        var label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
                 contents.enumConstantSummary);
-        memberTree.add(label);
+        content.add(label);
     }
 
     @Override
@@ -153,24 +153,24 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
+    public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
     }
 
     @Override
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
-                                  Content tdSummary) {
+                                  Content content) {
         Content memberLink = writer.getDocLink(context, utils.getEnclosingTypeElement(member), member,
                 name(member), HtmlStyle.memberNameLink);
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.add(code);
+        var code = HtmlTree.CODE(memberLink);
+        content.add(code);
     }
 
     @Override
-    protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content linksTree) {
+    protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content target) {
     }
 
     @Override
-    protected void addSummaryType(Element member, Content tdSummaryType) {
+    protected void addSummaryType(Element member, Content content) {
         //Not applicable.
     }
 
@@ -181,7 +181,7 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public Content getMemberTreeHeader(){
-        return writer.getMemberTreeHeader();
+    public Content getMemberHeader(){
+        return writer.getMemberHeader();
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
index 2402c18608d..acbc4aac321 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,11 +62,11 @@ public class FieldWriterImpl extends AbstractMemberWriter
 
     @Override
     public Content getMemberSummaryHeader(TypeElement typeElement,
-            Content memberSummaryTree) {
-        memberSummaryTree.add(MarkerComments.START_OF_FIELD_SUMMARY);
-        Content memberTree = new ContentBuilder();
-        writer.addSummaryHeader(this, memberTree);
-        return memberTree;
+            Content content) {
+        content.add(MarkerComments.START_OF_FIELD_SUMMARY);
+        Content memberContent = new ContentBuilder();
+        writer.addSummaryHeader(this, memberContent);
+        return memberContent;
     }
 
     @Override
@@ -76,22 +76,22 @@ public class FieldWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public Content getFieldDetailsTreeHeader(Content memberDetailsTree) {
-        memberDetailsTree.add(MarkerComments.START_OF_FIELD_DETAILS);
-        Content fieldDetailsTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
+    public Content getFieldDetailsHeader(Content content) {
+        content.add(MarkerComments.START_OF_FIELD_DETAILS);
+        Content fieldDetailsContent = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
                 contents.fieldDetailsLabel);
-        fieldDetailsTree.add(heading);
-        return fieldDetailsTree;
+        fieldDetailsContent.add(heading);
+        return fieldDetailsContent;
     }
 
     @Override
-    public Content getFieldDocTreeHeader(VariableElement field) {
-        Content fieldTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
+    public Content getFieldHeaderContent(VariableElement field) {
+        Content content = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(name(field)));
-        fieldTree.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, fieldTree)
+        content.add(heading);
+        return HtmlTree.SECTION(HtmlStyle.detail, content)
                 .setId(htmlIds.forMember(field));
     }
 
@@ -104,41 +104,41 @@ public class FieldWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addDeprecated(VariableElement field, Content fieldTree) {
-        addDeprecatedInfo(field, fieldTree);
+    public void addDeprecated(VariableElement field, Content fieldContent) {
+        addDeprecatedInfo(field, fieldContent);
     }
 
     @Override
-    public void addPreview(VariableElement field, Content fieldTree) {
-        addPreviewInfo(field, fieldTree);
+    public void addPreview(VariableElement field, Content content) {
+        addPreviewInfo(field, content);
     }
 
     @Override
-    public void addComments(VariableElement field, Content fieldTree) {
+    public void addComments(VariableElement field, Content fieldContent) {
         if (!utils.getFullBody(field).isEmpty()) {
-            writer.addInlineComment(field, fieldTree);
+            writer.addInlineComment(field, fieldContent);
         }
     }
 
     @Override
-    public void addTags(VariableElement field, Content fieldTree) {
-        writer.addTagsInfo(field, fieldTree);
+    public void addTags(VariableElement field, Content fieldContent) {
+        writer.addTagsInfo(field, fieldContent);
     }
 
     @Override
-    public Content getFieldDetails(Content fieldDetailsTreeHeader, Content fieldDetailsTree) {
+    public Content getFieldDetails(Content memberDetailsHeaderContent, Content memberContent) {
         return writer.getDetailsListItem(
                 HtmlTree.SECTION(HtmlStyle.fieldDetails)
                         .setId(HtmlIds.FIELD_DETAIL)
-                        .add(fieldDetailsTreeHeader)
-                        .add(fieldDetailsTree));
+                        .add(memberDetailsHeaderContent)
+                        .add(memberContent));
     }
 
     @Override
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
+    public void addSummaryLabel(Content content) {
+        var label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
                 contents.fieldSummaryLabel);
-        memberTree.add(label);
+        content.add(label);
     }
 
     @Override
@@ -159,7 +159,7 @@ public class FieldWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
+    public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
         Content classLink = writer.getPreQualifiedClassLink(
                 HtmlLinkInfo.Kind.MEMBER, typeElement);
         Content label;
@@ -172,32 +172,32 @@ public class FieldWriterImpl extends AbstractMemberWriter
                     ? resources.getText("doclet.Fields_Inherited_From_Class")
                     : resources.getText("doclet.Fields_Inherited_From_Interface"));
         }
-        HtmlTree labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
+        var labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
                 label);
         labelHeading.setId(htmlIds.forInheritedFields(typeElement));
         labelHeading.add(Entity.NO_BREAK_SPACE);
         labelHeading.add(classLink);
-        inheritedTree.add(labelHeading);
+        content.add(labelHeading);
     }
 
     @Override
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
-                                  Content tdSummary) {
+                                  Content content) {
         Content memberLink = writer.getDocLink(context, typeElement , member, name(member),
                 HtmlStyle.memberNameLink);
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.add(code);
+        var code = HtmlTree.CODE(memberLink);
+        content.add(code);
     }
 
     @Override
-    protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content linksTree) {
-        linksTree.add(
+    protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content target) {
+        target.add(
                 writer.getDocLink(HtmlLinkInfo.Kind.MEMBER, typeElement, member, name(member)));
     }
 
     @Override
-    protected void addSummaryType(Element member, Content tdSummaryType) {
-        addModifierAndType(member, utils.asInstantiatedFieldType(typeElement, (VariableElement)member), tdSummaryType);
+    protected void addSummaryType(Element member, Content content) {
+        addModifiersAndType(member, utils.asInstantiatedFieldType(typeElement, (VariableElement)member), content);
     }
 
     @Override
@@ -207,7 +207,7 @@ public class FieldWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public Content getMemberTreeHeader(){
-        return writer.getMemberTreeHeader();
+    public Content getMemberHeader(){
+        return writer.getMemberHeader();
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
index 11ed54c2d86..9522a71f6a8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
@@ -117,8 +117,8 @@ public class HelpWriter extends HtmlDocletWriter {
     }
 
     /**
-     * Adds the help file contents from the resource file to the content tree. While adding the
-     * help file contents it also keeps track of user options.
+     * Adds the help file contents from the resource file to the content.
+     * While adding the help file contents it also keeps track of user options.
      *
      * The general organization is:
      * <ul>
@@ -127,10 +127,10 @@ public class HelpWriter extends HtmlDocletWriter {
      * <li>Page-specific help
      * </ul>
      */
-    protected void addHelpFileContents(Content contentTree) {
-        HtmlTree mainTOC = HtmlTree.UL(HtmlStyle.helpTOC);
+    protected void addHelpFileContents(Content content) {
+        var mainTOC = HtmlTree.UL(HtmlStyle.helpTOC);
 
-        contentTree.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.title,
+        content.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.title,
                                         getContent("doclet.help.main_heading")))
                 .add(mainTOC)
                 .add(new HtmlTree(TagName.HR))
@@ -168,7 +168,7 @@ public class HelpWriter extends HtmlDocletWriter {
         Content content = new ContentBuilder();
 
         Content navHeading = contents.getContent("doclet.help.navigation.head");
-        HtmlTree navSection = HtmlTree.DIV(HtmlStyle.subTitle)
+        var navSection = HtmlTree.DIV(HtmlStyle.subTitle)
                 .add(HtmlTree.HEADING(Headings.CONTENT_HEADING, navHeading).setId(HtmlIds.HELP_NAVIGATION))
                 .add(contents.getContent("doclet.help.navigation.intro", overviewLink));
         if (options.createIndex()) {
@@ -183,24 +183,24 @@ public class HelpWriter extends HtmlDocletWriter {
         }
         content.add(navSection);
 
-        HtmlTree subTOC = HtmlTree.UL(HtmlStyle.helpSubTOC);
+        var subTOC = HtmlTree.UL(HtmlStyle.helpSubTOC);
 
         HtmlTree section;
 
         // Search
         if (options.createIndex()) {
             section = newHelpSection(getContent("doclet.help.search.head"), subTOC, HtmlIds.HELP_SEARCH);
-            Content searchIntro = HtmlTree.P(getContent("doclet.help.search.intro"));
-            Content searchExamples = HtmlTree.UL(HtmlStyle.helpSectionList);
+            var searchIntro = HtmlTree.P(getContent("doclet.help.search.intro"));
+            var searchExamples = HtmlTree.UL(HtmlStyle.helpSectionList);
             for (String[] example : SEARCH_EXAMPLES) {
                 searchExamples.add(HtmlTree.LI(
                         getContent("doclet.help.search.example",
                                 HtmlTree.CODE(Text.of(example[0])), example[1])));
             }
-            Content searchSpecLink = HtmlTree.A(
+            var searchSpecLink = HtmlTree.A(
                     resources.getText("doclet.help.search.spec.url", configuration.getDocletVersion().feature()),
                     getContent("doclet.help.search.spec.title"));
-            Content searchRefer = HtmlTree.P(getContent("doclet.help.search.refer", searchSpecLink));
+            var searchRefer = HtmlTree.P(getContent("doclet.help.search.refer", searchSpecLink));
             section.add(searchIntro)
                     .add(searchExamples)
                     .add(searchRefer);
@@ -234,11 +234,11 @@ public class HelpWriter extends HtmlDocletWriter {
      */
     private Content getPageKindSection(HtmlTree mainTOC) {
         Content pageKindsHeading = contents.getContent("doclet.help.page_kinds.head");
-        HtmlTree pageKindsSection = HtmlTree.DIV(HtmlStyle.subTitle)
+        var pageKindsSection = HtmlTree.DIV(HtmlStyle.subTitle)
                 .add(HtmlTree.HEADING(Headings.CONTENT_HEADING, pageKindsHeading).setId(HtmlIds.HELP_PAGES))
                 .add(contents.getContent("doclet.help.page_kinds.intro"));
 
-        HtmlTree subTOC = HtmlTree.UL(HtmlStyle.helpSubTOC);
+        var subTOC = HtmlTree.UL(HtmlStyle.helpSubTOC);
 
         HtmlTree section;
 
@@ -256,7 +256,7 @@ public class HelpWriter extends HtmlDocletWriter {
         if (configuration.showModules) {
             section = newHelpSection(contents.moduleLabel, PageMode.MODULE, subTOC);
             Content moduleIntro = getContent("doclet.help.module.intro");
-            Content modulePara = HtmlTree.P(moduleIntro);
+            var modulePara = HtmlTree.P(moduleIntro);
             section.add(modulePara)
                     .add(newHelpSectionList(
                             contents.packagesLabel,
@@ -451,7 +451,7 @@ public class HelpWriter extends HtmlDocletWriter {
     }
 
     private HtmlTree newHelpSectionList(Content first, Content... rest) {
-        HtmlTree list = HtmlTree.UL(HtmlStyle.helpSectionList, HtmlTree.LI(first));
+        var list = HtmlTree.UL(HtmlStyle.helpSectionList, HtmlTree.LI(first));
         List.of(rest).forEach(i -> list.add(HtmlTree.LI(i)));
         return list;
     }
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 3c4733c2eb9..d8408440c85 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
@@ -291,7 +291,7 @@ public class HtmlDocletWriter {
      * Add method information.
      *
      * @param method the method to be documented
-     * @param dl the content tree to which the method information will be added
+     * @param dl the content to which the method information will be added
      */
     private void addMethodInfo(ExecutableElement method, Content dl) {
         TypeElement enclosing = utils.getEnclosingTypeElement(method);
@@ -318,19 +318,19 @@ public class HtmlDocletWriter {
      * Adds the tags information.
      *
      * @param e the Element for which the tags will be generated
-     * @param htmlTree the documentation tree to which the tags will be added
+     * @param content the content to which the tags will be added
      */
-    protected void addTagsInfo(Element e, Content htmlTree) {
+    protected void addTagsInfo(Element e, Content content) {
         if (options.noComment()) {
             return;
         }
-        HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+        var dl = HtmlTree.DL(HtmlStyle.notes);
         if (utils.isExecutableElement(e) && !utils.isConstructor(e)) {
             addMethodInfo((ExecutableElement)e, dl);
         }
         Content output = getBlockTagOutput(e);
         dl.add(output);
-        htmlTree.add(dl);
+        content.add(dl);
     }
 
     /**
@@ -389,7 +389,7 @@ public class HtmlDocletWriter {
     /**
      * Returns a TagletWriter that knows how to write HTML.
      *
-     * @param context  the enclosing context for the trees
+     * @param context  the enclosing context
      * @return a TagletWriter
      */
     public TagletWriter getTagletWriterInstance(TagletWriterImpl.Context context) {
@@ -484,7 +484,7 @@ public class HtmlDocletWriter {
 
     /**
      * Returns a {@code <header>} element, containing the user "top" text, if any,
-     * amd the main navigation bar.
+     * and the main navigation bar.
      *
      * @param pageMode the pageMode used to configure the navigation bar
      *
@@ -496,7 +496,7 @@ public class HtmlDocletWriter {
 
     /**
      * Returns a {@code <header>} element, containing the user "top" text, if any,
-     * amd the main navigation bar.
+     * and the main navigation bar.
      *
      * @param pageMode the page mode used to configure the navigation bar
      * @param element  the element used to configure the navigation bar
@@ -541,24 +541,24 @@ public class HtmlDocletWriter {
     }
 
     /**
-     * Get the overview tree link for the main tree.
+     * {@return an "overview tree" link for a navigation bar}
      *
      * @param label the label for the link
-     * @return a content tree for the link
      */
-    protected Content getNavLinkMainTree(String label) {
-        Content mainTreeContent = links.createLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE),
+    protected Content getNavLinkToOverviewTree(String label) {
+        Content link = links.createLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE),
                 Text.of(label));
-        return HtmlTree.LI(mainTreeContent);
+        return HtmlTree.LI(link);
     }
 
     /**
-     * Returns a content object containing the package name. A localized content object is
-     * returned for an unnamed package. Use {@link Utils#getPackageName(PackageElement)} to
-     * get a static string for the unnamed package instead.
+     * {@return a package name}
      *
-     * @param packageElement the package to check
-     * @return package name content
+     * A localized name is returned for an unnamed package.
+     * Use {@link Utils#getPackageName(PackageElement)} to get a static string
+     * for the unnamed package instead.
+     *
+     * @param packageElement the package to get the name for
      */
     public Content getLocalizedPackageName(PackageElement packageElement) {
         return packageElement == null || packageElement.isUnnamed()
@@ -600,11 +600,10 @@ public class HtmlDocletWriter {
     }
 
     /**
-     * Return the link to the given package.
+     * {@return the link to the given package}
      *
      * @param packageElement the package to link to.
      * @param label the label for the link.
-     * @return a content tree for the package link.
      */
     public Content getPackageLink(PackageElement packageElement, Content label) {
         boolean included = packageElement != null && utils.isIncluded(packageElement);
@@ -649,11 +648,10 @@ public class HtmlDocletWriter {
     }
 
     /**
-     * Get Module link.
+     * {@return a link to module}
      *
      * @param mdle the module being documented
      * @param label tag for the link
-     * @return a content for the module link
      */
     public Content getModuleLink(ModuleElement mdle, Content label) {
         Set<ElementFlag> flags = mdle != null ? utils.elementFlags(mdle)
@@ -681,13 +679,13 @@ public class HtmlDocletWriter {
     }
 
     /**
-     * Add the link to the content tree.
+     * Add the link to the content.
      *
      * @param element program element for which the link will be added
      * @param label label for the link
-     * @param htmltree the content tree to which the link will be added
+     * @param target the content to which the link will be added
      */
-    public void addSrcLink(Element element, Content label, Content htmltree) {
+    public void addSrcLink(Element element, Content label, Content target) {
         if (element == null) {
             return;
         }
@@ -702,9 +700,9 @@ public class HtmlDocletWriter {
                     .resolve(docPaths.forClass(te));
             Content content = links.createLink(href
                     .fragment(SourceToHTMLConverter.getAnchorName(utils, element).name()), label, "");
-            htmltree.add(content);
+            target.add(content);
         } else {
-            htmltree.add(label);
+            target.add(label);
         }
     }
 
@@ -782,11 +780,10 @@ public class HtmlDocletWriter {
     }
 
     /**
-     * Get the class link.
+     * {@return a link to the given class}
      *
      * @param context the id of the context where the link will be added
-     * @param element to link to
-     * @return a content tree for the link
+     * @param element the class to link to
      */
     public Content getQualifiedClassLink(HtmlLinkInfo.Kind context, Element element) {
         HtmlLinkInfo htmlLinkInfo = new HtmlLinkInfo(configuration, context, (TypeElement)element);
@@ -794,14 +791,14 @@ public class HtmlDocletWriter {
     }
 
     /**
-     * Add the class link.
+     * Adds a link to the given class.
      *
      * @param context the id of the context where the link will be added
-     * @param typeElement to link to
-     * @param contentTree the content tree to which the link will be added
+     * @param typeElement the class to link to
+     * @param target the content to which the link will be added
      */
-    public void addPreQualifiedClassLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Content contentTree) {
-        addPreQualifiedClassLink(context, typeElement, null, contentTree);
+    public void addPreQualifiedClassLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Content target) {
+        addPreQualifiedClassLink(context, typeElement, null, target);
     }
 
     /**
@@ -831,19 +828,19 @@ public class HtmlDocletWriter {
      * @param context the id of the context where the link will be added
      * @param typeElement the class to link to
      * @param style optional style for the link
-     * @param contentTree the content tree to which the link with be added
+     * @param target the content to which the link with be added
      */
     public void addPreQualifiedClassLink(HtmlLinkInfo.Kind context,
-                                         TypeElement typeElement, HtmlStyle style, Content contentTree) {
+                                         TypeElement typeElement, HtmlStyle style, Content target) {
         PackageElement pkg = utils.containingPackage(typeElement);
         if(pkg != null && ! configuration.shouldExcludeQualifier(pkg.getSimpleName().toString())) {
-            contentTree.add(getEnclosingPackageName(typeElement));
+            target.add(getEnclosingPackageName(typeElement));
         }
         HtmlLinkInfo linkinfo = new HtmlLinkInfo(configuration, context, typeElement)
                 .label(utils.getSimpleName(typeElement))
                 .style(style);
         Content link = getLink(linkinfo);
-        contentTree.add(link);
+        target.add(link);
     }
 
     /**
@@ -873,19 +870,18 @@ public class HtmlDocletWriter {
      *
      * @param context the id of the context where the link will be added
      * @param typeElement the class to link to
-     * @param contentTree the content tree to which the link with be added
+     * @param content the content to which the link with be added
      */
-    public void addPreQualifiedStrongClassLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Content contentTree) {
-        addPreQualifiedClassLink(context, typeElement, HtmlStyle.typeNameLink, contentTree);
+    public void addPreQualifiedStrongClassLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Content content) {
+        addPreQualifiedClassLink(context, typeElement, HtmlStyle.typeNameLink, content);
     }
 
     /**
-     * Get the link for the given member.
+     * {@return a link to the given member}
      *
      * @param context the id of the context where the link will be added
      * @param element the member being linked to
      * @param label the label for the link
-     * @return a content tree for the element link
      */
     public Content getDocLink(HtmlLinkInfo.Kind context, Element element, CharSequence label) {
         return getDocLink(context, utils.getEnclosingTypeElement(element), element,
@@ -1283,21 +1279,21 @@ public class HtmlDocletWriter {
      *
      * @param element the Element for which the inline comment will be added
      * @param tag the inline tag to be added
-     * @param htmltree the content tree to which the comment will be added
+     * @param target the content to which the comment will be added
      */
-    public void addInlineComment(Element element, DocTree tag, Content htmltree) {
+    public void addInlineComment(Element element, DocTree tag, Content target) {
         CommentHelper ch = utils.getCommentHelper(element);
         List<? extends DocTree> description = ch.getDescription(tag);
-        addCommentTags(element, description, false, false, false, htmltree);
+        addCommentTags(element, description, false, false, false, target);
     }
 
     /**
-     * Get the deprecated phrase as content.
+     * {@return a phrase describing the type of deprecation}
      *
      * @param e the Element for which the inline deprecated comment will be added
-     * @return a content tree for the deprecated phrase.
      */
     public Content getDeprecatedPhrase(Element e) {
+        // TODO e should be checked to being deprecated
         return (utils.isDeprecatedForRemoval(e))
                 ? contents.deprecatedForRemovalPhrase
                 : contents.deprecatedPhrase;
@@ -1308,21 +1304,21 @@ public class HtmlDocletWriter {
      *
      * @param e the Element for which the inline deprecated comment will be added
      * @param tag the inline tag to be added
-     * @param htmltree the content tree to which the comment will be added
+     * @param target the content to which the comment will be added
      */
-    public void addInlineDeprecatedComment(Element e, DeprecatedTree tag, Content htmltree) {
+    public void addInlineDeprecatedComment(Element e, DeprecatedTree tag, Content target) {
         CommentHelper ch = utils.getCommentHelper(e);
-        addCommentTags(e, ch.getBody(tag), true, false, false, htmltree);
+        addCommentTags(e, ch.getBody(tag), true, false, false, target);
     }
 
     /**
      * Adds the summary content.
      *
      * @param element the Element for which the summary will be generated
-     * @param htmltree the documentation tree to which the summary will be added
+     * @param target the content to which the summary will be added
      */
-    public void addSummaryComment(Element element, Content htmltree) {
-        addSummaryComment(element, utils.getFirstSentenceTrees(element), htmltree);
+    public void addSummaryComment(Element element, Content target) {
+        addSummaryComment(element, utils.getFirstSentenceTrees(element), target);
     }
 
     /**
@@ -1330,10 +1326,10 @@ public class HtmlDocletWriter {
      *
      * @param element the Element for which the summary will be generated
      * @param firstSentenceTags the first sentence tags for the doc
-     * @param htmltree the documentation tree to which the summary will be added
+     * @param target the content to which the summary will be added
      */
-    public void addPreviewComment(Element element, List<? extends DocTree> firstSentenceTags, Content htmltree) {
-        addCommentTags(element, firstSentenceTags, false, true, true, htmltree);
+    public void addPreviewComment(Element element, List<? extends DocTree> firstSentenceTags, Content target) {
+        addCommentTags(element, firstSentenceTags, false, true, true, target);
     }
 
     /**
@@ -1341,26 +1337,26 @@ public class HtmlDocletWriter {
      *
      * @param element the Element for which the summary will be generated
      * @param firstSentenceTags the first sentence tags for the doc
-     * @param htmltree the documentation tree to which the summary will be added
+     * @param target the content to which the summary will be added
      */
-    public void addSummaryComment(Element element, List<? extends DocTree> firstSentenceTags, Content htmltree) {
-        addCommentTags(element, firstSentenceTags, false, true, true, htmltree);
+    public void addSummaryComment(Element element, List<? extends DocTree> firstSentenceTags, Content target) {
+        addCommentTags(element, firstSentenceTags, false, true, true, target);
     }
 
-    public void addSummaryDeprecatedComment(Element element, DeprecatedTree tag, Content htmltree) {
+    public void addSummaryDeprecatedComment(Element element, DeprecatedTree tag, Content target) {
         CommentHelper ch = utils.getCommentHelper(element);
         List<? extends DocTree> body = ch.getBody(tag);
-        addCommentTags(element, ch.getFirstSentenceTrees(body), true, true, true, htmltree);
+        addCommentTags(element, ch.getFirstSentenceTrees(body), true, true, true, target);
     }
 
     /**
      * Adds the full-body content of the given element.
      *
      * @param element the element for which the content will be added
-     * @param htmltree the documentation tree to which the content will be added
+     * @param target the content to which the content will be added
      */
-    public void addInlineComment(Element element, Content htmltree) {
-        addCommentTags(element, utils.getFullBody(element), false, false, false, htmltree);
+    public void addInlineComment(Element element, Content target) {
+        addCommentTags(element, utils.getFullBody(element), false, false, false, target);
     }
 
     /**
@@ -1371,10 +1367,10 @@ public class HtmlDocletWriter {
      * @param depr true if it is deprecated
      * @param first true if the first sentence tags should be added
      * @param inSummary true if the comment tags are added into the summary section
-     * @param htmltree the documentation tree to which the comment tags will be added
+     * @param target the content to which the comment tags will be added
      */
     private void addCommentTags(Element element, List<? extends DocTree> tags, boolean depr,
-            boolean first, boolean inSummary, Content htmltree) {
+            boolean first, boolean inSummary, Content target) {
         if (options.noComment()) {
             return;
         }
@@ -1382,13 +1378,13 @@ public class HtmlDocletWriter {
         Content result = commentTagsToContent(null, element, tags, first, inSummary);
         if (depr) {
             div = HtmlTree.DIV(HtmlStyle.deprecationComment, result);
-            htmltree.add(div);
+            target.add(div);
         } else {
             div = HtmlTree.DIV(HtmlStyle.block, result);
-            htmltree.add(div);
+            target.add(div);
         }
         if (tags.isEmpty()) {
-            htmltree.add(Entity.NO_BREAK_SPACE);
+            target.add(Entity.NO_BREAK_SPACE);
         }
     }
 
@@ -1906,35 +1902,33 @@ public class HtmlDocletWriter {
     }
 
     /**
-     * Return a content tree containing the  annotation types for the given element.
+     * {@return the annotation types info for the given element}
      *
      * @param element an Element
      * @param lineBreak if true add new line between each member value
-     * @return the documentation tree containing the annotation info
      */
     Content getAnnotationInfo(Element element, boolean lineBreak) {
         return getAnnotationInfo(element.getAnnotationMirrors(), lineBreak);
     }
 
     /**
-     * Return a content tree containing the annotation types for the given element.
+     * {@return the description for the given annotations}
      *
      * @param descList a list of annotation mirrors
      * @param lineBreak if true add new line between each member value
-     * @return the documentation tree containing the annotation info
      */
     Content getAnnotationInfo(List<? extends AnnotationMirror> descList, boolean lineBreak) {
         List<Content> annotations = getAnnotations(descList, lineBreak);
         String sep = "";
-        ContentBuilder builder = new ContentBuilder();
+        ContentBuilder result = new ContentBuilder();
         for (Content annotation: annotations) {
-            builder.add(sep);
-            builder.add(annotation);
+            result.add(sep);
+            result.add(annotation);
             if (!lineBreak) {
                 sep = " ";
             }
         }
-        return builder;
+        return result;
     }
 
     /**
@@ -2248,19 +2242,19 @@ public class HtmlDocletWriter {
     }
 
     /**
-     * Returns an HtmlTree for the BODY tag.
+     * Returns an HtmlTree for the BODY element.
      *
      * @param title title for the window
      * @return an HtmlTree for the BODY tag
      */
     public HtmlTree getBody(String title) {
-        HtmlTree body = new HtmlTree(TagName.BODY).setStyle(getBodyStyle());
+        var body = new HtmlTree(TagName.BODY).setStyle(getBodyStyle());
 
         this.winTitle = title;
         // Don't print windowtitle script for overview-frame, allclasses-frame
         // and package-frame
         body.add(mainBodyScript.asContent());
-        Content noScript = HtmlTree.NOSCRIPT(HtmlTree.DIV(contents.noScriptMessage));
+        var noScript = HtmlTree.NOSCRIPT(HtmlTree.DIV(contents.noScriptMessage));
         body.add(noScript);
         return body;
     }
@@ -2327,7 +2321,7 @@ public class HtmlDocletWriter {
 
     public void addPreviewSummary(Element forWhat, Content target) {
         if (utils.isPreviewAPI(forWhat)) {
-            Content div = HtmlTree.DIV(HtmlStyle.block);
+            var div = HtmlTree.DIV(HtmlStyle.block);
             div.add(HtmlTree.SPAN(HtmlStyle.previewLabel, contents.previewPhrase));
             target.add(div);
         }
@@ -2336,7 +2330,7 @@ public class HtmlDocletWriter {
     public void addPreviewInfo(Element forWhat, Content target) {
         if (utils.isPreviewAPI(forWhat)) {
             //in Java platform:
-            HtmlTree previewDiv = HtmlTree.DIV(HtmlStyle.previewBlock);
+            var previewDiv = HtmlTree.DIV(HtmlStyle.previewBlock);
             previewDiv.setId(htmlIds.forPreviewSection(forWhat));
             String name = (switch (forWhat.getKind()) {
                 case PACKAGE, MODULE ->
@@ -2345,7 +2339,7 @@ public class HtmlDocletWriter {
                         ((TypeElement) forWhat.getEnclosingElement()).getSimpleName();
                 default -> forWhat.getSimpleName();
             }).toString();
-            Content nameCode = HtmlTree.CODE(Text.of(name));
+            var nameCode = HtmlTree.CODE(Text.of(name));
             boolean isReflectivePreview = utils.isReflectivePreviewAPI(forWhat);
             String leadingNoteKey =
                     !isReflectivePreview ? "doclet.PreviewPlatformLeadingNote"
@@ -2366,13 +2360,13 @@ public class HtmlDocletWriter {
             List<Content> previewNotes = getPreviewNotes((TypeElement) forWhat);
             if (!previewNotes.isEmpty()) {
                 Name name = forWhat.getSimpleName();
-                Content nameCode = HtmlTree.CODE(Text.of(name));
-                HtmlTree previewDiv = HtmlTree.DIV(HtmlStyle.previewBlock);
+                var nameCode = HtmlTree.CODE(Text.of(name));
+                var previewDiv = HtmlTree.DIV(HtmlStyle.previewBlock);
                 previewDiv.setId(htmlIds.forPreviewSection(forWhat));
                 Content leadingNote = contents.getContent("doclet.PreviewLeadingNote", nameCode);
                 previewDiv.add(HtmlTree.SPAN(HtmlStyle.previewLabel,
                                              leadingNote));
-                HtmlTree ul = HtmlTree.UL(HtmlStyle.previewComment);
+                var ul = HtmlTree.UL(HtmlStyle.previewComment);
                 for (Content note : previewNotes) {
                     ul.add(HtmlTree.LI(note));
                 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java
index 7278ac8e315..15960efb815 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,86 +64,67 @@ public class HtmlSerialFieldWriter extends FieldWriterImpl
         return utils.serializableFields(te);
     }
 
-    /**
-     * Return the header for serializable fields section.
-     *
-     * @return a content tree for the header
-     */
     @Override
     public Content getSerializableFieldsHeader() {
         return HtmlTree.UL(HtmlStyle.blockList);
     }
 
-    /**
-     * Return the header for serializable fields content section.
-     *
-     * @param isLastContent true if the content being documented is the last content.
-     * @return a content tree for the header
-     */
     @Override
     public Content getFieldsContentHeader(boolean isLastContent) {
         return new HtmlTree(TagName.LI).setStyle(HtmlStyle.blockList);
     }
 
-    /**
-     * Add serializable fields.
-     *
-     * @param heading the heading for the section
-     * @param serializableFieldsTree the tree to be added to the serializable fields
-     *        content tree
-     * @return a content tree for the serializable fields content
-     */
     @Override
-    public Content getSerializableFields(String heading, Content serializableFieldsTree) {
-        HtmlTree section = HtmlTree.SECTION(HtmlStyle.detail);
-        if (serializableFieldsTree.isValid()) {
+    public Content getSerializableFields(String heading, Content source) {
+        var section = HtmlTree.SECTION(HtmlStyle.detail);
+        if (source.isValid()) {
             Content headingContent = Text.of(heading);
-            Content serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
+            var serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
             section.add(serialHeading);
-            section.add(serializableFieldsTree);
+            section.add(source);
         }
         return HtmlTree.LI(section);
     }
 
     @Override
-    public void addMemberHeader(TypeMirror fieldType, String fieldName, Content contentTree) {
+    public void addMemberHeader(TypeMirror fieldType, String fieldName, Content content) {
         Content nameContent = Text.of(fieldName);
-        Content heading = HtmlTree.HEADING(Headings.SerializedForm.MEMBER_HEADING, nameContent);
-        contentTree.add(heading);
-        Content pre = new HtmlTree(TagName.PRE);
+        var heading = HtmlTree.HEADING(Headings.SerializedForm.MEMBER_HEADING, nameContent);
+        content.add(heading);
+        var pre = new HtmlTree(TagName.PRE);
         Content fieldContent = writer.getLink(new HtmlLinkInfo(
                 configuration, HtmlLinkInfo.Kind.SERIAL_MEMBER, fieldType));
         pre.add(fieldContent);
         pre.add(" ");
         pre.add(fieldName);
-        contentTree.add(pre);
+        content.add(pre);
     }
 
     /**
      * Add the deprecated information for this member.
      *
      * @param field the field to document.
-     * @param contentTree the tree to which the deprecated info will be added
+     * @param content the content to which the deprecated info will be added
      */
     @Override
-    public void addMemberDeprecatedInfo(VariableElement field, Content contentTree) {
-        addDeprecatedInfo(field, contentTree);
+    public void addMemberDeprecatedInfo(VariableElement field, Content content) {
+        addDeprecatedInfo(field, content);
     }
 
     /**
      * Add the description text for this member.
      *
      * @param field the field to document.
-     * @param contentTree the tree to which the deprecated info will be added
+     * @param content the content to which the deprecated info will be added
      */
     @Override
-    public void addMemberDescription(VariableElement field, Content contentTree) {
+    public void addMemberDescription(VariableElement field, Content content) {
         if (!utils.getFullBody(field).isEmpty()) {
-            writer.addInlineComment(field, contentTree);
+            writer.addInlineComment(field, content);
         }
         List<? extends SerialTree> tags = utils.getSerialTrees(field);
         if (!tags.isEmpty() && !tags.get(0).getDescription().isEmpty()) {
-            writer.addInlineComment(field, tags.get(0), contentTree);
+            writer.addInlineComment(field, tags.get(0), content);
         }
     }
 
@@ -151,16 +132,16 @@ public class HtmlSerialFieldWriter extends FieldWriterImpl
      * Add the description text for this member represented by the tag.
      *
      * @param serialFieldTag the field to document (represented by tag)
-     * @param contentTree the tree to which the deprecated info will be added
+     * @param content the content to which the deprecated info will be added
      */
     @Override
-    public void addMemberDescription(VariableElement field, DocTree serialFieldTag, Content contentTree) {
+    public void addMemberDescription(VariableElement field, DocTree serialFieldTag, Content content) {
         CommentHelper ch = utils.getCommentHelper(field);
         List<? extends DocTree> description = ch.getDescription(serialFieldTag);
         if (!description.isEmpty()) {
             Content serialFieldContent = new RawHtml(ch.getText(description));
-            Content div = HtmlTree.DIV(HtmlStyle.block, serialFieldContent);
-            contentTree.add(div);
+            var div = HtmlTree.DIV(HtmlStyle.block, serialFieldContent);
+            content.add(div);
         }
     }
 
@@ -168,15 +149,15 @@ public class HtmlSerialFieldWriter extends FieldWriterImpl
      * Add the tag information for this member.
      *
      * @param field the field to document.
-     * @param contentTree the tree to which the member tags info will be added
+     * @param content the content to which the member tags info will be added
      */
     @Override
-    public void addMemberTags(VariableElement field, Content contentTree) {
+    public void addMemberTags(VariableElement field, Content content) {
         Content tagContent = writer.getBlockTagOutput(field);
         if (!tagContent.isEmpty()) {
-            HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyle.notes);
             dl.add(tagContent);
-            contentTree.add(dl);
+            content.add(dl);
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java
index 8b2bed47a00..daf11d7f005 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java
@@ -53,22 +53,11 @@ public class HtmlSerialMethodWriter extends MethodWriterImpl implements
         super(writer, typeElement);
     }
 
-    /**
-     * Return the header for serializable methods section.
-     *
-     * @return a content tree for the header
-     */
     @Override
     public Content getSerializableMethodsHeader() {
         return HtmlTree.UL(HtmlStyle.blockList);
     }
 
-    /**
-     * Return the header for serializable methods content section.
-     *
-     * @param isLastContent true if the content being documented is the last content.
-     * @return a content tree for the header
-     */
     @Override
     public Content getMethodsContentHeader(boolean isLastContent) {
         return new HtmlTree(TagName.LI);
@@ -78,16 +67,16 @@ public class HtmlSerialMethodWriter extends MethodWriterImpl implements
      * Add serializable methods.
      *
      * @param heading the heading for the section
-     * @param serializableMethodContent the tree to be added to the serializable methods
-     *        content tree
-     * @return a content tree for the serializable methods content
+     * @param source the content to be added to the serializable methods
+     *        content
+     * @return a content for the serializable methods content
      */
     @Override
-    public Content getSerializableMethods(String heading, Content serializableMethodContent) {
+    public Content getSerializableMethods(String heading, Content source) {
         Content headingContent = Text.of(heading);
-        Content serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
-        Content section = HtmlTree.SECTION(HtmlStyle.detail, serialHeading);
-        section.add(serializableMethodContent);
+        var serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
+        var section = HtmlTree.SECTION(HtmlStyle.detail, serialHeading);
+        section.add(source);
         return HtmlTree.LI(section);
     }
 
@@ -106,51 +95,51 @@ public class HtmlSerialMethodWriter extends MethodWriterImpl implements
      * Add the member header.
      *
      * @param member the method document to be listed
-     * @param methodsContentTree the content tree to which the member header will be added
+     * @param methodsContent the content to which the member header will be added
      */
     @Override
-    public void addMemberHeader(ExecutableElement member, Content methodsContentTree) {
+    public void addMemberHeader(ExecutableElement member, Content methodsContent) {
         Content memberContent = Text.of(name(member));
-        Content heading = HtmlTree.HEADING(Headings.SerializedForm.MEMBER_HEADING, memberContent);
-        methodsContentTree.add(heading);
-        methodsContentTree.add(getSignature(member));
+        var heading = HtmlTree.HEADING(Headings.SerializedForm.MEMBER_HEADING, memberContent);
+        methodsContent.add(heading);
+        methodsContent.add(getSignature(member));
     }
 
     /**
      * Add the deprecated information for this member.
      *
      * @param member the method to document.
-     * @param methodsContentTree the tree to which the deprecated info will be added
+     * @param methodsContent the content to which the deprecated info will be added
      */
     @Override
-    public void addDeprecatedMemberInfo(ExecutableElement member, Content methodsContentTree) {
-        addDeprecatedInfo(member, methodsContentTree);
+    public void addDeprecatedMemberInfo(ExecutableElement member, Content methodsContent) {
+        addDeprecatedInfo(member, methodsContent);
     }
 
     /**
      * Add the description text for this member.
      *
      * @param member the method to document.
-     * @param methodsContentTree the tree to which the deprecated info will be added
+     * @param methodsContent the content to which the deprecated info will be added
      */
     @Override
-    public void addMemberDescription(ExecutableElement member, Content methodsContentTree) {
-        addComment(member, methodsContentTree);
+    public void addMemberDescription(ExecutableElement member, Content methodsContent) {
+        addComment(member, methodsContent);
     }
 
     /**
      * Add the tag information for this member.
      *
      * @param member the method to document.
-     * @param methodsContentTree the tree to which the member tags info will be added
+     * @param methodsContent the content to which the member tags info will be added
      */
     @Override
-    public void addMemberTags(ExecutableElement member, Content methodsContentTree) {
+    public void addMemberTags(ExecutableElement member, Content methodsContent) {
         TagletManager tagletManager = configuration.tagletManager;
         Content tagContent = writer.getBlockTagOutput(member, tagletManager.getSerializedFormTaglets());
-        HtmlTree dl = HtmlTree.DL(HtmlStyle.notes);
+        var dl = HtmlTree.DL(HtmlStyle.notes);
         dl.add(tagContent);
-        methodsContentTree.add(dl);
+        methodsContent.add(dl);
         if (name(member).equals("writeExternal")
                 && utils.getSerialDataTrees(member).isEmpty()) {
             serialWarning(member, "doclet.MissingSerialDataTag",
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
index bf53e06fcce..976b78ad23b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
@@ -93,7 +93,7 @@ public class IndexRedirectWriter extends HtmlDocletWriter {
         Script script = new Script("window.location.replace(")
                 .appendStringLiteral(targetPath, '\'')
                 .append(")");
-        HtmlTree metaRefresh = new HtmlTree(TagName.META)
+        var metaRefresh = new HtmlTree(TagName.META)
                 .put(HtmlAttr.HTTP_EQUIV, "Refresh")
                 .put(HtmlAttr.CONTENT, "0;" + targetPath);
         head.addContent(script.asContent(), HtmlTree.NOSCRIPT(metaRefresh));
@@ -104,8 +104,8 @@ public class IndexRedirectWriter extends HtmlDocletWriter {
 
         bodyContent.add(HtmlTree.P(HtmlTree.A(targetPath, Text.of(targetPath))));
 
-        Content body = new HtmlTree(TagName.BODY).setStyle(HtmlStyle.indexRedirectPage);
-        HtmlTree main = HtmlTree.MAIN(bodyContent);
+        var body = new HtmlTree(TagName.BODY).setStyle(HtmlStyle.indexRedirectPage);
+        var main = HtmlTree.MAIN(bodyContent);
         body.add(main);
 
         HtmlDocument htmlDocument = new HtmlDocument(
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
index 9e486b74ab9..d2e3829e92e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
@@ -144,31 +144,31 @@ public class IndexWriter extends HtmlDocletWriter {
     /**
      * Adds a set of items to the page.
      *
-     * @param ch          the first character of the names of the items
-     * @param items       the items
-     * @param contentTree the tree to which to add the items
+     * @param ch      the first character of the names of the items
+     * @param items   the items
+     * @param content the content to which to add the items
      */
-    protected void addContents(char ch, SortedSet<IndexItem> items, Content contentTree) {
-        addHeading(ch, contentTree);
+    protected void addContents(char ch, SortedSet<IndexItem> items, Content content) {
+        addHeading(ch, content);
 
-        HtmlTree dl = HtmlTree.DL(HtmlStyle.index);
+        var dl = HtmlTree.DL(HtmlStyle.index);
         for (IndexItem item : items) {
             addDescription(item, dl);
         }
-        contentTree.add(dl);
+        content.add(dl);
     }
 
     /**
      * Adds a heading containing the first character for a set of items.
      *
-     * @param ch          the first character of the names of the items
-     * @param contentTree the tree to which to add the items
+     * @param ch      the first character of the names of the items
+     * @param content the content to which to add the items
      */
-    protected void addHeading(char ch, Content contentTree) {
+    protected void addHeading(char ch, Content content) {
         Content headContent = Text.of(String.valueOf(ch));
-        HtmlTree heading = HtmlTree.HEADING(Headings.CONTENT_HEADING, HtmlStyle.title, headContent)
+        var heading = HtmlTree.HEADING(Headings.CONTENT_HEADING, HtmlStyle.title, headContent)
                 .setId(HtmlIds.forIndexChar(ch));
-        contentTree.add(heading);
+        content.add(heading);
     }
 
     /**
@@ -189,9 +189,9 @@ public class IndexWriter extends HtmlDocletWriter {
      * Add one line summary comment for the item.
      *
      * @param item the item to be documented
-     * @param dlTree the content tree to which the description will be added
+     * @param target the content to which the description will be added
      */
-    protected void addElementDescription(IndexItem item, Content dlTree) {
+    protected void addElementDescription(IndexItem item, Content target) {
         Content dt;
         Element element = item.getElement();
         String label = item.getLabel();
@@ -234,24 +234,24 @@ public class IndexWriter extends HtmlDocletWriter {
             default:
                 throw new Error();
         }
-        dlTree.add(dt);
-        Content dd = new HtmlTree(TagName.DD);
+        target.add(dt);
+        var dd = new HtmlTree(TagName.DD);
         if (element.getKind() == ElementKind.MODULE || element.getKind() == ElementKind.PACKAGE) {
             addSummaryComment(element, dd);
         } else {
             addComment(element, dd);
         }
-        dlTree.add(dd);
+        target.add(dd);
     }
 
     /**
      * Adds information for the given type element.
      *
-     * @param te          the element
-     * @param contentTree the content tree to which the class info will be added
+     * @param te      the element
+     * @param content the content to which the class info will be added
      */
-    protected void addClassInfo(TypeElement te, Content contentTree) {
-        contentTree.add(contents.getContent("doclet.in",
+    protected void addClassInfo(TypeElement te, Content content) {
+        content.add(contents.getContent("doclet.in",
                 utils.getTypeElementKindName(te, false),
                 getPackageLink(utils.containingPackage(te),
                     getLocalizedPackageName(utils.containingPackage(te)))
@@ -262,23 +262,23 @@ public class IndexWriter extends HtmlDocletWriter {
      * Adds a description for an item found in a documentation comment.
      *
      * @param item   the item
-     * @param dlTree the list to which to add the description
+     * @param target the list to which to add the description
      */
-    protected void addTagDescription(IndexItem item, Content dlTree) {
+    protected void addTagDescription(IndexItem item, Content target) {
         String itemPath = pathToRoot.isEmpty() ? "" : pathToRoot.getPath() + "/";
         itemPath += item.getUrl();
-        HtmlTree labelLink = HtmlTree.A(itemPath, Text.of(item.getLabel()));
-        Content dt = HtmlTree.DT(labelLink.setStyle(HtmlStyle.searchTagLink));
+        var labelLink = HtmlTree.A(itemPath, Text.of(item.getLabel()));
+        var dt = HtmlTree.DT(labelLink.setStyle(HtmlStyle.searchTagLink));
         dt.add(" - ");
         dt.add(contents.getContent("doclet.Search_tag_in", item.getHolder()));
-        dlTree.add(dt);
-        Content dd = new HtmlTree(TagName.DD);
+        target.add(dt);
+        var dd = new HtmlTree(TagName.DD);
         if (item.getDescription().isEmpty()) {
             dd.add(Entity.NO_BREAK_SPACE);
         } else {
             dd.add(item.getDescription());
         }
-        dlTree.add(dd);
+        target.add(dd);
     }
 
     /**
@@ -288,39 +288,39 @@ public class IndexWriter extends HtmlDocletWriter {
      * the start and then print the normal comment.
      *
      * @param element     the element
-     * @param contentTree the content tree to which the comment will be added
+     * @param content the content to which the comment will be added
      */
-    protected void addComment(Element element, Content contentTree) {
-        Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(element));
-        HtmlTree div = HtmlTree.DIV(HtmlStyle.deprecationBlock);
+    protected void addComment(Element element, Content content) {
+        var span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(element));
+        var div = HtmlTree.DIV(HtmlStyle.deprecationBlock);
         if (utils.isDeprecated(element)) {
             div.add(span);
             List<? extends DeprecatedTree> tags = utils.getDeprecatedTrees(element);
             if (!tags.isEmpty())
                 addInlineDeprecatedComment(element, tags.get(0), div);
-            contentTree.add(div);
+            content.add(div);
         } else {
             TypeElement encl = utils.getEnclosingTypeElement(element);
             while (encl != null) {
                 if (utils.isDeprecated(encl)) {
                     div.add(span);
-                    contentTree.add(div);
+                    content.add(div);
                     break;
                 }
                 encl = utils.getEnclosingTypeElement(encl);
             }
-            addSummaryComment(element, contentTree);
+            addSummaryComment(element, content);
         }
     }
 
     /**
      * Adds a description for a member element.
      *
-     * @param member      the element
-     * @param enclosing   the enclosing type element
-     * @param contentTree the content tree to which the member description will be added
+     * @param member    the element
+     * @param enclosing the enclosing type element
+     * @param content   the content to which the member description will be added
      */
-    protected void addMemberDesc(Element member, TypeElement enclosing, Content contentTree) {
+    protected void addMemberDesc(Element member, TypeElement enclosing, Content content) {
         String kindName = utils.getTypeElementKindName(enclosing, true);
         String resource = switch (member.getKind()) {
             case ENUM_CONSTANT ->
@@ -336,18 +336,18 @@ public class IndexWriter extends HtmlDocletWriter {
                     "doclet.Record_component_in";
             default -> throw new IllegalArgumentException(member.getKind().toString());
         };
-        contentTree.add(contents.getContent(resource, kindName)).add(" ");
+        content.add(contents.getContent(resource, kindName)).add(" ");
         addPreQualifiedClassLink(HtmlLinkInfo.Kind.INDEX, enclosing,
-                null, contentTree);
+                null, content);
     }
 
     /**
      * Add links for all the index files, based on the first character of the names of the items.
      *
      * @param allFirstCharacters the list of all first characters to be linked
-     * @param contentTree        the content tree to which the links for indexes will be added
+     * @param content            the content to which the links for indexes will be added
      */
-    protected void addLinksForIndexes(List<Character> allFirstCharacters, Content contentTree) {
+    protected void addLinksForIndexes(List<Character> allFirstCharacters, Content content) {
         ListIterator<Character> iter = allFirstCharacters.listIterator();
         while (iter.hasNext()) {
             char ch = iter.next();
@@ -355,11 +355,11 @@ public class IndexWriter extends HtmlDocletWriter {
             Content link = splitIndex
                     ? links.createLink(DocPaths.indexN(iter.nextIndex()), label)
                     : links.createLink(HtmlIds.forIndexChar(ch), label);
-            contentTree.add(link);
-            contentTree.add(Entity.NO_BREAK_SPACE);
+            content.add(link);
+            content.add(Entity.NO_BREAK_SPACE);
         }
 
-        contentTree.add(new HtmlTree(TagName.BR));
+        content.add(new HtmlTree(TagName.BR));
         List<Content> pageLinks = Stream.of(IndexItem.Category.values())
                 .flatMap(c -> mainIndex.getItems(c).stream())
                 .filter(i -> !(i.isElementItem() || i.isTagItem()))
@@ -367,7 +367,7 @@ public class IndexWriter extends HtmlDocletWriter {
                 .map(i -> links.createLink(pathToRoot.resolve(i.getUrl()),
                         contents.getNonBreakString(i.getLabel())))
                 .toList();
-        contentTree.add(contents.join(getVerticalSeparator(), pageLinks));
+        content.add(contents.join(getVerticalSeparator(), pageLinks));
     }
 
     private Content getVerticalSeparator() {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
index 9ba0a2222ea..8e34b3826ce 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,11 +76,11 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public Content getMemberSummaryHeader(TypeElement typeElement, Content memberSummaryTree) {
-        memberSummaryTree.add(MarkerComments.START_OF_METHOD_SUMMARY);
-        Content memberTree = new ContentBuilder();
-        writer.addSummaryHeader(this, memberTree);
-        return memberTree;
+    public Content getMemberSummaryHeader(TypeElement typeElement, Content target) {
+        target.add(MarkerComments.START_OF_METHOD_SUMMARY);
+        Content memberContent = new ContentBuilder();
+        writer.addSummaryHeader(this, memberContent);
+        return memberContent;
     }
 
     @Override
@@ -90,35 +90,29 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public Content getMethodDetailsTreeHeader(Content memberDetailsTree) {
-        memberDetailsTree.add(MarkerComments.START_OF_METHOD_DETAILS);
-        Content methodDetailsTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
+    public Content getMethodDetailsHeader(Content content) {
+        content.add(MarkerComments.START_OF_METHOD_DETAILS);
+        Content methodDetailsContent = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
                 contents.methodDetailLabel);
-        methodDetailsTree.add(heading);
-        return methodDetailsTree;
+        methodDetailsContent.add(heading);
+        return methodDetailsContent;
     }
 
     @Override
-    public Content getMethodDocTreeHeader(ExecutableElement method) {
-        Content methodDocTree = new ContentBuilder();
-        HtmlTree heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
+    public Content getMethodHeader(ExecutableElement method) {
+        Content content = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(name(method)));
         HtmlId erasureAnchor;
         if ((erasureAnchor = htmlIds.forErasure(method)) != null) {
             heading.setId(erasureAnchor);
         }
-        methodDocTree.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, methodDocTree)
+        content.add(heading);
+        return HtmlTree.SECTION(HtmlStyle.detail, content)
                 .setId(htmlIds.forMember(method));
     }
 
-    /**
-     * Get the signature for the given method.
-     *
-     * @param method the method being documented.
-     * @return a content object for the signature
-     */
     @Override
     public Content getSignature(ExecutableElement method) {
         return new Signatures.MemberSignature(method, this)
@@ -131,23 +125,23 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public void addDeprecated(ExecutableElement method, Content methodDocTree) {
-        addDeprecatedInfo(method, methodDocTree);
+    public void addDeprecated(ExecutableElement method, Content methodContent) {
+        addDeprecatedInfo(method, methodContent);
     }
 
     @Override
-    public void addPreview(ExecutableElement method, Content methodDocTree) {
-        addPreviewInfo(method, methodDocTree);
+    public void addPreview(ExecutableElement method, Content content) {
+        addPreviewInfo(method, content);
     }
 
     @Override
-    public void addComments(TypeMirror holderType, ExecutableElement method, Content methodDocTree) {
+    public void addComments(TypeMirror holderType, ExecutableElement method, Content methodContent) {
         TypeElement holder = utils.asTypeElement(holderType);
         if (!utils.getFullBody(method).isEmpty()) {
             if (holder.equals(typeElement) ||
                     !(utils.isPublic(holder) ||
                     utils.isLinkable(holder))) {
-                writer.addInlineComment(method, methodDocTree);
+                writer.addInlineComment(method, methodContent);
             } else {
                 if (!utils.hasHiddenTag(holder) && !utils.hasHiddenTag(method)) {
                     Content link =
@@ -156,37 +150,37 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
                                     utils.isIncluded(holder)
                                             ? utils.getSimpleName(holder)
                                             : utils.getFullyQualifiedName(holder));
-                    Content codeLink = HtmlTree.CODE(link);
-                    Content descriptionFromTypeLabel = HtmlTree.SPAN(HtmlStyle.descriptionFromTypeLabel,
+                    var codeLink = HtmlTree.CODE(link);
+                    var descriptionFromTypeLabel = HtmlTree.SPAN(HtmlStyle.descriptionFromTypeLabel,
                             utils.isClass(holder)
                                     ? contents.descriptionFromClassLabel
                                     : contents.descriptionFromInterfaceLabel);
                     descriptionFromTypeLabel.add(Entity.NO_BREAK_SPACE);
                     descriptionFromTypeLabel.add(codeLink);
-                    methodDocTree.add(HtmlTree.DIV(HtmlStyle.block, descriptionFromTypeLabel));
+                    methodContent.add(HtmlTree.DIV(HtmlStyle.block, descriptionFromTypeLabel));
                 }
-                writer.addInlineComment(method, methodDocTree);
+                writer.addInlineComment(method, methodContent);
             }
         }
     }
 
     @Override
-    public void addTags(ExecutableElement method, Content methodDocTree) {
-        writer.addTagsInfo(method, methodDocTree);
+    public void addTags(ExecutableElement method, Content methodContent) {
+        writer.addTagsInfo(method, methodContent);
     }
 
     @Override
-    public Content getMethodDetails(Content methodDetailsTreeHeader, Content methodDetailsTree) {
-        Content methodDetails = new ContentBuilder(methodDetailsTreeHeader, methodDetailsTree);
-        return getMemberTree(HtmlTree.SECTION(HtmlStyle.methodDetails, methodDetails)
+    public Content getMethodDetails(Content methodDetailsHeader, Content methodDetails) {
+        Content c = new ContentBuilder(methodDetailsHeader, methodDetails);
+        return getMember(HtmlTree.SECTION(HtmlStyle.methodDetails, c)
                 .setId(HtmlIds.METHOD_DETAIL));
     }
 
     @Override
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
+    public void addSummaryLabel(Content content) {
+        var label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
                 contents.methodSummary);
-        memberTree.add(label);
+        content.add(label);
     }
 
     @Override
@@ -213,7 +207,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
+    public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
         Content classLink = writer.getPreQualifiedClassLink(
                 HtmlLinkInfo.Kind.MEMBER, typeElement);
         Content label;
@@ -226,18 +220,18 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
                     ? resources.getText("doclet.Methods_Inherited_From_Class")
                     : resources.getText("doclet.Methods_Inherited_From_Interface"));
         }
-        HtmlTree labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
+        var labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
                 label);
         labelHeading.setId(htmlIds.forInheritedMethods(typeElement));
         labelHeading.add(Entity.NO_BREAK_SPACE);
         labelHeading.add(classLink);
-        inheritedTree.add(labelHeading);
+        content.add(labelHeading);
     }
 
     @Override
-    protected void addSummaryType(Element member, Content tdSummaryType) {
+    protected void addSummaryType(Element member, Content content) {
         ExecutableElement meth = (ExecutableElement)member;
-        addModifierAndType(meth, utils.getReturnType(typeElement, meth), tdSummaryType);
+        addModifiersAndType(meth, utils.getReturnType(typeElement, meth), content);
     }
 
     /**
@@ -286,13 +280,13 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
         dl.add(HtmlTree.DT(label));
         Content overriddenTypeLink =
                 writer.getLink(new HtmlLinkInfo(writer.configuration, context, overriddenType));
-        Content codeOverriddenTypeLink = HtmlTree.CODE(overriddenTypeLink);
+        var codeOverriddenTypeLink = HtmlTree.CODE(overriddenTypeLink);
         Content methlink = writer.getLink(
                 new HtmlLinkInfo(writer.configuration, HtmlLinkInfo.Kind.MEMBER, holder)
                         .where(writer.htmlIds.forMember(method).name())
                         .label(method.getSimpleName()));
-        Content codeMethLink = HtmlTree.CODE(methlink);
-        Content dd = HtmlTree.DD(codeMethLink);
+        var codeMethLink = HtmlTree.CODE(methlink);
+        var dd = HtmlTree.DD(codeMethLink);
         dd.add(Entity.NO_BREAK_SPACE);
         dd.add(contents.inClass);
         dd.add(Entity.NO_BREAK_SPACE);
@@ -326,13 +320,13 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
             intfac = utils.getDeclaredType(utils.getEnclosingTypeElement(method), intfac);
             Content intfaclink = writer.getLink(new HtmlLinkInfo(
                     writer.configuration, HtmlLinkInfo.Kind.METHOD_SPECIFIED_BY, intfac));
-            Content codeIntfacLink = HtmlTree.CODE(intfaclink);
+            var codeIntfacLink = HtmlTree.CODE(intfaclink);
             dl.add(HtmlTree.DT(contents.specifiedByLabel));
             Content methlink = writer.getDocLink(
                     HtmlLinkInfo.Kind.MEMBER, implementedMeth,
                     implementedMeth.getSimpleName());
-            Content codeMethLink = HtmlTree.CODE(methlink);
-            Content dd = HtmlTree.DD(codeMethLink);
+            var codeMethLink = HtmlTree.CODE(methlink);
+            var dd = HtmlTree.DD(codeMethLink);
             dd.add(Entity.NO_BREAK_SPACE);
             dd.add(contents.inInterface);
             dd.add(Entity.NO_BREAK_SPACE);
@@ -345,7 +339,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
      * Get the return type for the given method.
      *
      * @param method the method being documented.
-     * @return content containing the return type
+     * @return the return type
      */
     protected Content getReturnType(ExecutableElement method) {
         TypeMirror type = utils.getReturnType(typeElement, method);
@@ -356,7 +350,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
     }
 
     @Override
-    public Content getMemberTreeHeader(){
-        return writer.getMemberTreeHeader();
+    public Content getMemberHeader(){
+        return writer.getMemberHeader();
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
index 934f9e67ff6..55bc0f23009 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,10 +80,10 @@ public class ModuleIndexWriter extends AbstractOverviewIndexWriter {
     /**
      * Adds the list of modules.
      *
-     * @param main the documentation tree to which the modules list will be added
+     * @param target the content to which the modules list will be added
      */
     @Override
-    protected void addIndex(Content main) {
+    protected void addIndex(Content target) {
         Map<String, SortedSet<ModuleElement>> groupModuleMap
                 = configuration.group.groupModules(modules);
 
@@ -115,7 +115,7 @@ public class ModuleIndexWriter extends AbstractOverviewIndexWriter {
                 }
             }
 
-            main.add(table);
+            target.add(table);
 
             if (table.needsScript()) {
                 mainBodyScript.append(table.getScript());
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
index 8f668fa0ffa..6de7880d8f1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
@@ -171,25 +171,20 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
         computeModulesData();
     }
 
-    /**
-     * Get the module header.
-     *
-     * @param heading the heading for the section
-     */
     @Override
     public Content getModuleHeader(String heading) {
-        HtmlTree bodyTree = getBody(getWindowTitle(mdle.getQualifiedName().toString()));
-        HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
+        HtmlTree body = getBody(getWindowTitle(mdle.getQualifiedName().toString()));
+        var div = HtmlTree.DIV(HtmlStyle.header);
         Content moduleHead = new ContentBuilder();
         moduleHead.add(mdle.isOpen() && (configuration.docEnv.getModuleMode() == ModuleMode.ALL)
                 ? contents.openModuleLabel : contents.moduleLabel);
         moduleHead.add(" ").add(heading);
-        Content tHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var tHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, moduleHead);
         div.add(tHeading);
         bodyContents.setHeader(getHeader(PageMode.MODULE, mdle))
                 .addMainContent(div);
-        return bodyTree;
+        return body;
     }
 
     @Override
@@ -207,30 +202,19 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
                 ));
     }
 
-    /**
-     * Get the content header.
-     */
     @Override
     public Content getContentHeader() {
         return new ContentBuilder();
     }
 
-    /**
-     * Get the summary section header.
-     */
     @Override
     public Content getSummariesList() {
         return HtmlTree.UL(HtmlStyle.summaryList);
     }
 
-    /**
-     * Get the summary tree.
-     *
-     * @param summaryContentTree the content tree to be added to the summary tree.
-     */
     @Override
-    public Content getSummaryTree(Content summaryContentTree) {
-        return HtmlTree.SECTION(HtmlStyle.summary, summaryContentTree);
+    public Content getSummary(Content source) {
+        return HtmlTree.SECTION(HtmlStyle.summary, source);
     }
 
     /**
@@ -433,12 +417,12 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
      *
      * @param startMarker the marker comment
      * @param heading the heading for the section
-     * @param htmltree the content tree to which the information is added
+     * @param target the content to which the information is added
      */
     public void addSummaryHeader(Content startMarker, Content heading,
-            Content htmltree) {
-        htmltree.add(startMarker);
-        htmltree.add(HtmlTree.HEADING(Headings.ModuleDeclaration.SUMMARY_HEADING, heading));
+            Content target) {
+        target.add(startMarker);
+        target.add(HtmlTree.HEADING(Headings.ModuleDeclaration.SUMMARY_HEADING, heading));
     }
 
     /**
@@ -475,7 +459,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
             TableHeader requiresTableHeader =
                     new TableHeader(contents.modifierLabel, contents.moduleLabel,
                             contents.descriptionLabel);
-            HtmlTree section = HtmlTree.SECTION(HtmlStyle.modulesSummary)
+            var section = HtmlTree.SECTION(HtmlStyle.modulesSummary)
                     .setId(HtmlIds.MODULES);
             addSummaryHeader(MarkerComments.START_OF_MODULES_SUMMARY, contents.navModules, section);
             if (display(requires)) {
@@ -517,7 +501,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
     public void addPackagesSummary(Content summariesList) {
         if (display(packages)
                 || display(indirectPackages) || display(indirectOpenPackages)) {
-            HtmlTree section = HtmlTree.SECTION(HtmlStyle.packagesSummary)
+            var section = HtmlTree.SECTION(HtmlStyle.packagesSummary)
                     .setId(HtmlIds.PACKAGES);
             addSummaryHeader(MarkerComments.START_OF_PACKAGES_SUMMARY, contents.navPackages, section);
             if (display(packages)) {
@@ -690,7 +674,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
         boolean haveProvides = displayServices(provides.keySet(), providesTrees);
 
         if (haveProvides || haveUses) {
-            HtmlTree section = HtmlTree.SECTION(HtmlStyle.servicesSummary)
+            var section = HtmlTree.SECTION(HtmlStyle.servicesSummary)
                     .setId(HtmlIds.SERVICES);
             addSummaryHeader(MarkerComments.START_OF_SERVICES_SUMMARY, contents.navServices, section);
             TableHeader usesProvidesTableHeader =
@@ -773,7 +757,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
             if (moduleMode == ModuleMode.ALL && !implSet.isEmpty()) {
                 desc.add(new HtmlTree(TagName.BR));
                 desc.add("(");
-                HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation);
+                var implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation);
                 desc.add(implSpan);
                 desc.add(Entity.NO_BREAK_SPACE);
                 String sep = "";
@@ -791,14 +775,14 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
     /**
      * Add the module deprecation information to the documentation tree.
      *
-     * @param div the content tree to which the deprecation information will be added
+     * @param div the content to which the deprecation information will be added
      */
     public void addDeprecationInfo(Content div) {
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(mdle);
         if (utils.isDeprecated(mdle)) {
             CommentHelper ch = utils.getCommentHelper(mdle);
-            HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
-            Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle));
+            var deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
+            var deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
                 List<? extends DocTree> commentTags = ch.getDescription(deprs.get(0));
@@ -811,28 +795,28 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
     }
 
     @Override
-    public void addModuleDescription(Content moduleContentTree) {
-        addPreviewInfo(mdle, moduleContentTree);
+    public void addModuleDescription(Content moduleContent) {
+        addPreviewInfo(mdle, moduleContent);
         if (!utils.getFullBody(mdle).isEmpty()) {
-            HtmlTree tree = HtmlTree.SECTION(HtmlStyle.moduleDescription)
+            var tree = HtmlTree.SECTION(HtmlStyle.moduleDescription)
                     .setId(HtmlIds.MODULE_DESCRIPTION);
             addDeprecationInfo(tree);
             tree.add(MarkerComments.START_OF_MODULE_DESCRIPTION);
             addInlineComment(mdle, tree);
             addTagsInfo(mdle, tree);
-            moduleContentTree.add(tree);
+            moduleContent.add(tree);
         }
     }
 
     @Override
-    public void addModuleSignature(Content moduleContentTree) {
-        moduleContentTree.add(new HtmlTree(TagName.HR));
-        moduleContentTree.add(Signatures.getModuleSignature(mdle, this));
+    public void addModuleSignature(Content moduleContent) {
+        moduleContent.add(new HtmlTree(TagName.HR));
+        moduleContent.add(Signatures.getModuleSignature(mdle, this));
     }
 
     @Override
-    public void addModuleContent(Content moduleContentTree) {
-        bodyContents.addMainContent(moduleContentTree);
+    public void addModuleContent(Content source) {
+        bodyContents.addMainContent(source);
     }
 
     @Override
@@ -841,23 +825,23 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
     }
 
     @Override
-    public void printDocument(Content contentTree) throws DocFileIOException {
-        contentTree.add(bodyContents);
+    public void printDocument(Content content) throws DocFileIOException {
+        content.add(bodyContents);
         printHtmlDocument(configuration.metakeywords.getMetaKeywordsForModule(mdle),
-                getDescription("declaration", mdle), getLocalStylesheets(mdle), contentTree);
+                getDescription("declaration", mdle), getLocalStylesheets(mdle), content);
     }
 
     /**
      * Add the module package deprecation information to the documentation tree.
      *
-     * @param li the content tree to which the deprecation information will be added
+     * @param li the content to which the deprecation information will be added
      * @param pkg the PackageDoc that is added
      */
     public void addPackageDeprecationInfo(Content li, PackageElement pkg) {
         if (utils.isDeprecated(pkg)) {
             List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(pkg);
-            HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
-            Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg));
+            var deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
+            var deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
                 CommentHelper ch = utils.getCommentHelper(pkg);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
index 3e8e556974a..b070e30112e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
@@ -162,154 +162,154 @@ public class Navigation {
     /**
      * Adds the links for the main navigation.
      *
-     * @param tree the content tree to which the main navigation will added
+     * @param target the content to which the main navigation will added
      */
-    private void addMainNavLinks(Content tree) {
+    private void addMainNavLinks(Content target) {
         switch (documentedPage) {
             case OVERVIEW:
-                addActivePageLink(tree, contents.overviewLabel, options.createOverview());
-                addModuleLink(tree);
-                addPackageLink(tree);
-                addPageLabel(tree, contents.classLabel, true);
-                addPageLabel(tree, contents.useLabel, options.classUse());
-                addTreeLink(tree);
-                addPreviewLink(tree);
-                addNewLink(tree);
-                addDeprecatedLink(tree);
-                addIndexLink(tree);
-                addHelpLink(tree);
+                addActivePageLink(target, contents.overviewLabel, options.createOverview());
+                addModuleLink(target);
+                addPackageLink(target);
+                addPageLabel(target, contents.classLabel, true);
+                addPageLabel(target, contents.useLabel, options.classUse());
+                addTreeLink(target);
+                addPreviewLink(target);
+                addNewLink(target);
+                addDeprecatedLink(target);
+                addIndexLink(target);
+                addHelpLink(target);
                 break;
             case MODULE:
-                addOverviewLink(tree);
-                addActivePageLink(tree, contents.moduleLabel, configuration.showModules);
-                addPackageLink(tree);
-                addPageLabel(tree, contents.classLabel, true);
-                addPageLabel(tree, contents.useLabel, options.classUse());
-                addTreeLink(tree);
-                addPreviewLink(tree);
-                addNewLink(tree);
-                addDeprecatedLink(tree);
-                addIndexLink(tree);
-                addHelpLink(tree);
+                addOverviewLink(target);
+                addActivePageLink(target, contents.moduleLabel, configuration.showModules);
+                addPackageLink(target);
+                addPageLabel(target, contents.classLabel, true);
+                addPageLabel(target, contents.useLabel, options.classUse());
+                addTreeLink(target);
+                addPreviewLink(target);
+                addNewLink(target);
+                addDeprecatedLink(target);
+                addIndexLink(target);
+                addHelpLink(target);
                 break;
             case PACKAGE:
-                addOverviewLink(tree);
-                addModuleOfElementLink(tree);
-                addActivePageLink(tree, contents.packageLabel, true);
-                addPageLabel(tree, contents.classLabel, true);
+                addOverviewLink(target);
+                addModuleOfElementLink(target);
+                addActivePageLink(target, contents.packageLabel, true);
+                addPageLabel(target, contents.classLabel, true);
                 if (options.classUse()) {
-                    addContentToTree(tree, links.createLink(DocPaths.PACKAGE_USE,
+                    addItemToList(target, links.createLink(DocPaths.PACKAGE_USE,
                             contents.useLabel, ""));
                 }
                 if (options.createTree()) {
-                    addContentToTree(tree, links.createLink(DocPaths.PACKAGE_TREE,
+                    addItemToList(target, links.createLink(DocPaths.PACKAGE_TREE,
                             contents.treeLabel, ""));
                 }
-                addPreviewLink(tree);
-                addNewLink(tree);
-                addDeprecatedLink(tree);
-                addIndexLink(tree);
-                addHelpLink(tree);
+                addPreviewLink(target);
+                addNewLink(target);
+                addDeprecatedLink(target);
+                addIndexLink(target);
+                addHelpLink(target);
                 break;
             case CLASS:
-                addOverviewLink(tree);
-                addModuleOfElementLink(tree);
-                addPackageSummaryLink(tree);
-                addActivePageLink(tree, contents.classLabel, true);
+                addOverviewLink(target);
+                addModuleOfElementLink(target);
+                addPackageSummaryLink(target);
+                addActivePageLink(target, contents.classLabel, true);
                 if (options.classUse()) {
-                    addContentToTree(tree, links.createLink(DocPaths.CLASS_USE.resolve(path.basename()),
+                    addItemToList(target, links.createLink(DocPaths.CLASS_USE.resolve(path.basename()),
                             contents.useLabel));
                 }
                 if (options.createTree()) {
-                    addContentToTree(tree, links.createLink(DocPaths.PACKAGE_TREE,
+                    addItemToList(target, links.createLink(DocPaths.PACKAGE_TREE,
                             contents.treeLabel, ""));
                 }
-                addPreviewLink(tree);
-                addNewLink(tree);
-                addDeprecatedLink(tree);
-                addIndexLink(tree);
-                addHelpLink(tree);
+                addPreviewLink(target);
+                addNewLink(target);
+                addDeprecatedLink(target);
+                addIndexLink(target);
+                addHelpLink(target);
                 break;
             case USE:
-                addOverviewLink(tree);
-                addModuleOfElementLink(tree);
+                addOverviewLink(target);
+                addModuleOfElementLink(target);
                 if (element instanceof PackageElement) {
-                    addPackageSummaryLink(tree);
-                    addPageLabel(tree, contents.classLabel, true);
+                    addPackageSummaryLink(target);
+                    addPageLabel(target, contents.classLabel, true);
                 } else {
-                    addPackageOfElementLink(tree);
-                    addContentToTree(tree, navLinkClass);
+                    addPackageOfElementLink(target);
+                    addItemToList(target, navLinkClass);
                 }
-                addActivePageLink(tree, contents.useLabel, options.classUse());
+                addActivePageLink(target, contents.useLabel, options.classUse());
                 if (element instanceof PackageElement) {
-                    addContentToTree(tree, links.createLink(DocPaths.PACKAGE_TREE, contents.treeLabel));
+                    addItemToList(target, links.createLink(DocPaths.PACKAGE_TREE, contents.treeLabel));
                 } else {
-                    addContentToTree(tree, configuration.utils.isEnclosingPackageIncluded((TypeElement) element)
+                    addItemToList(target, configuration.utils.isEnclosingPackageIncluded((TypeElement) element)
                             ? links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), contents.treeLabel)
                             : links.createLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), contents.treeLabel));
                 }
-                addPreviewLink(tree);
-                addNewLink(tree);
-                addDeprecatedLink(tree);
-                addIndexLink(tree);
-                addHelpLink(tree);
+                addPreviewLink(target);
+                addNewLink(target);
+                addDeprecatedLink(target);
+                addIndexLink(target);
+                addHelpLink(target);
                 break;
             case TREE:
-                addOverviewLink(tree);
+                addOverviewLink(target);
                 if (element == null) {
-                    addPageLabel(tree, contents.moduleLabel, configuration.showModules);
-                    addPageLabel(tree, contents.packageLabel, true);
+                    addPageLabel(target, contents.moduleLabel, configuration.showModules);
+                    addPageLabel(target, contents.packageLabel, true);
                 } else {
-                    addModuleOfElementLink(tree);
-                    addPackageSummaryLink(tree);
+                    addModuleOfElementLink(target);
+                    addPackageSummaryLink(target);
                 }
-                addPageLabel(tree, contents.classLabel, true);
-                addPageLabel(tree, contents.useLabel, options.classUse());
-                addActivePageLink(tree, contents.treeLabel, options.createTree());
-                addPreviewLink(tree);
-                addNewLink(tree);
-                addDeprecatedLink(tree);
-                addIndexLink(tree);
-                addHelpLink(tree);
+                addPageLabel(target, contents.classLabel, true);
+                addPageLabel(target, contents.useLabel, options.classUse());
+                addActivePageLink(target, contents.treeLabel, options.createTree());
+                addPreviewLink(target);
+                addNewLink(target);
+                addDeprecatedLink(target);
+                addIndexLink(target);
+                addHelpLink(target);
                 break;
             case DEPRECATED:
             case INDEX:
             case HELP:
             case PREVIEW:
             case NEW:
-                addOverviewLink(tree);
-                addModuleLink(tree);
-                addPackageLink(tree);
-                addPageLabel(tree, contents.classLabel, true);
-                addPageLabel(tree, contents.useLabel, options.classUse());
-                addTreeLink(tree);
+                addOverviewLink(target);
+                addModuleLink(target);
+                addPackageLink(target);
+                addPageLabel(target, contents.classLabel, true);
+                addPageLabel(target, contents.useLabel, options.classUse());
+                addTreeLink(target);
                 if (documentedPage == PageMode.PREVIEW) {
-                    addActivePageLink(tree, contents.previewLabel,
+                    addActivePageLink(target, contents.previewLabel,
                             configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.PREVIEW));
                 } else {
-                    addPreviewLink(tree);
+                    addPreviewLink(target);
                 }
                 if (documentedPage == PageMode.NEW) {
-                    addActivePageLink(tree, contents.newLabel,
+                    addActivePageLink(target, contents.newLabel,
                             configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.NEW));
                 } else {
-                    addNewLink(tree);
+                    addNewLink(target);
                 }
                 if (documentedPage == PageMode.DEPRECATED) {
-                    addActivePageLink(tree, contents.deprecatedLabel,
+                    addActivePageLink(target, contents.deprecatedLabel,
                             configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.DEPRECATED));
                 } else {
-                    addDeprecatedLink(tree);
+                    addDeprecatedLink(target);
                 }
                 if (documentedPage == PageMode.INDEX) {
-                    addActivePageLink(tree, contents.indexLabel, options.createIndex());
+                    addActivePageLink(target, contents.indexLabel, options.createIndex());
                 } else {
-                    addIndexLink(tree);
+                    addIndexLink(target);
                 }
                 if (documentedPage == PageMode.HELP) {
-                    addActivePageLink(tree, contents.helpLabel, !options.noHelp());
+                    addActivePageLink(target, contents.helpLabel, !options.noHelp());
                 } else {
-                    addHelpLink(tree);
+                    addHelpLink(target);
                 }
                 break;
             case ALL_CLASSES:
@@ -317,30 +317,30 @@ public class Navigation {
             case CONSTANT_VALUES:
             case SERIALIZED_FORM:
             case SYSTEM_PROPERTIES:
-                addOverviewLink(tree);
-                addModuleLink(tree);
-                addPackageLink(tree);
-                addPageLabel(tree, contents.classLabel, true);
-                addPageLabel(tree, contents.useLabel, options.classUse());
-                addTreeLink(tree);
-                addPreviewLink(tree);
-                addNewLink(tree);
-                addDeprecatedLink(tree);
-                addIndexLink(tree);
-                addHelpLink(tree);
+                addOverviewLink(target);
+                addModuleLink(target);
+                addPackageLink(target);
+                addPageLabel(target, contents.classLabel, true);
+                addPageLabel(target, contents.useLabel, options.classUse());
+                addTreeLink(target);
+                addPreviewLink(target);
+                addNewLink(target);
+                addDeprecatedLink(target);
+                addIndexLink(target);
+                addHelpLink(target);
                 break;
             case DOC_FILE:
-                addOverviewLink(tree);
-                addModuleOfElementLink(tree);
-                addContentToTree(tree, navLinkPackage);
-                addPageLabel(tree, contents.classLabel, true);
-                addPageLabel(tree, contents.useLabel, options.classUse());
-                addTreeLink(tree);
-                addPreviewLink(tree);
-                addNewLink(tree);
-                addDeprecatedLink(tree);
-                addIndexLink(tree);
-                addHelpLink(tree);
+                addOverviewLink(target);
+                addModuleOfElementLink(target);
+                addItemToList(target, navLinkPackage);
+                addPageLabel(target, contents.classLabel, true);
+                addPageLabel(target, contents.useLabel, options.classUse());
+                addTreeLink(target);
+                addPreviewLink(target);
+                addNewLink(target);
+                addDeprecatedLink(target);
+                addIndexLink(target);
+                addHelpLink(target);
                 break;
             default:
                 break;
@@ -350,10 +350,10 @@ public class Navigation {
     /**
      * Adds the summary links to the sub-navigation.
      *
-     * @param tree the content tree to which the sub-navigation will added
+     * @param target the content to which the sub-navigation will be added
      * @param nested whether to create a flat or nested list
      */
-    private void addSummaryLinks(Content tree, boolean nested) {
+    private void addSummaryLinks(Content target, boolean nested) {
         switch (documentedPage) {
             case MODULE, PACKAGE, CLASS, HELP -> {
                 List<? extends Content> listContents = subNavLinks.getSubNavLinks()
@@ -367,11 +367,11 @@ public class Navigation {
                         default -> Text.EMPTY;
                     };
                     if (nested) {
-                        tree.add(HtmlTree.LI(HtmlTree.P(label))
+                        target.add(HtmlTree.LI(HtmlTree.P(label))
                                 .add(new HtmlTree(TagName.UL).add(listContents)));
                     } else {
-                        tree.add(HtmlTree.LI(label).add(Entity.NO_BREAK_SPACE));
-                        addListToNav(listContents, tree);
+                        target.add(HtmlTree.LI(label).add(Entity.NO_BREAK_SPACE));
+                        addListToNav(listContents, target);
                     }
                 }
             }
@@ -381,10 +381,10 @@ public class Navigation {
     /**
      * Adds the detail links to sub-navigation.
      *
-     * @param tree the content tree to which the links will be added
+     * @param target the content to which the links will be added
      * @param nested whether to create a flat or nested list
      */
-    private void addDetailLinks(Content tree, boolean nested) {
+    private void addDetailLinks(Content target, boolean nested) {
         if (documentedPage == PageMode.CLASS) {
             List<Content> listContents = new ArrayList<>();
             VisibleMemberTable vmt = configuration.getVisibleMemberTable((TypeElement) element);
@@ -394,14 +394,14 @@ public class Navigation {
             }
             if (!listContents.isEmpty()) {
                 if (nested) {
-                    Content li = HtmlTree.LI(HtmlTree.P(contents.detailLabel));
+                    var li = HtmlTree.LI(HtmlTree.P(contents.detailLabel));
                     li.add(new HtmlTree(TagName.UL).add(listContents));
-                    tree.add(li);
+                    target.add(li);
                 } else {
-                    Content li = HtmlTree.LI(contents.detailLabel);
+                    var li = HtmlTree.LI(contents.detailLabel);
                     li.add(Entity.NO_BREAK_SPACE);
-                    tree.add(li);
-                    addListToNav(listContents, tree);
+                    target.add(li);
+                    addListToNav(listContents, target);
                 }
             }
         }
@@ -427,15 +427,15 @@ public class Navigation {
         });
     }
 
-    private void addContentToList(List<Content> listContents, Content tree) {
-        listContents.add(HtmlTree.LI(tree));
+    private void addContentToList(List<Content> listContents, Content source) {
+        listContents.add(HtmlTree.LI(source));
     }
 
-    private void addContentToTree(Content tree, Content content) {
-        tree.add(HtmlTree.LI(content));
+    private void addItemToList(Content list, Content item) {
+        list.add(HtmlTree.LI(item));
     }
 
-    private void addListToNav(List<? extends Content> listContents, Content tree) {
+    private void addListToNav(List<? extends Content> listContents, Content target) {
         int count = 0;
         for (Content liContent : listContents) {
             if (count < listContents.size() - 1) {
@@ -443,51 +443,51 @@ public class Navigation {
                 liContent.add("|");
                 liContent.add(Entity.NO_BREAK_SPACE);
             }
-            tree.add(liContent);
+            target.add(liContent);
             count++;
         }
     }
 
-    private void addActivePageLink(Content tree, Content label, boolean display) {
+    private void addActivePageLink(Content target, Content label, boolean display) {
         if (display) {
-            tree.add(HtmlTree.LI(HtmlStyle.navBarCell1Rev, label));
+            target.add(HtmlTree.LI(HtmlStyle.navBarCell1Rev, label));
         }
     }
 
-    private void addPageLabel(Content tree, Content label, boolean display) {
+    private void addPageLabel(Content target, Content label, boolean display) {
         if (display) {
-            tree.add(HtmlTree.LI(label));
+            target.add(HtmlTree.LI(label));
         }
     }
 
-    private void addOverviewLink(Content tree) {
+    private void addOverviewLink(Content target) {
         if (options.createOverview()) {
-            tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.INDEX),
+            target.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.INDEX),
                     contents.overviewLabel, "")));
         }
     }
 
-    private void addModuleLink(Content tree) {
+    private void addModuleLink(Content target) {
         if (configuration.showModules) {
             if (configuration.modules.size() == 1) {
                 ModuleElement mdle = configuration.modules.first();
                 boolean included = configuration.utils.isIncluded(mdle);
-                tree.add(HtmlTree.LI((included)
+                target.add(HtmlTree.LI((included)
                         ? links.createLink(pathToRoot.resolve(configuration.docPaths.moduleSummary(mdle)), contents.moduleLabel, "")
                         : contents.moduleLabel));
             } else if (!configuration.modules.isEmpty()) {
-                addPageLabel(tree, contents.moduleLabel, true);
+                addPageLabel(target, contents.moduleLabel, true);
             }
         }
     }
 
-    private void addModuleOfElementLink(Content tree) {
+    private void addModuleOfElementLink(Content target) {
         if (configuration.showModules) {
-            tree.add(HtmlTree.LI(navLinkModule));
+            target.add(HtmlTree.LI(navLinkModule));
         }
     }
 
-    private void addPackageLink(Content tree) {
+    private void addPackageLink(Content target) {
         if (configuration.packages.size() == 1) {
             PackageElement packageElement = configuration.packages.first();
             boolean included = packageElement != null && configuration.utils.isIncluded(packageElement);
@@ -500,66 +500,66 @@ public class Navigation {
                 }
             }
             if (included || packageElement == null) {
-                tree.add(HtmlTree.LI(links.createLink(
+                target.add(HtmlTree.LI(links.createLink(
                         pathToRoot.resolve(configuration.docPaths.forPackage(packageElement).resolve(DocPaths.PACKAGE_SUMMARY)),
                         contents.packageLabel)));
             } else {
                 DocLink crossPkgLink = configuration.extern.getExternalLink(
                         packageElement, pathToRoot, DocPaths.PACKAGE_SUMMARY.getPath());
                 if (crossPkgLink != null) {
-                    tree.add(HtmlTree.LI(links.createLink(crossPkgLink, contents.packageLabel)));
+                    target.add(HtmlTree.LI(links.createLink(crossPkgLink, contents.packageLabel)));
                 } else {
-                    tree.add(HtmlTree.LI(contents.packageLabel));
+                    target.add(HtmlTree.LI(contents.packageLabel));
                 }
             }
         } else if (!configuration.packages.isEmpty()) {
-            addPageLabel(tree, contents.packageLabel, true);
+            addPageLabel(target, contents.packageLabel, true);
         }
     }
 
-    private void addPackageOfElementLink(Content tree) {
-        tree.add(HtmlTree.LI(links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY),
+    private void addPackageOfElementLink(Content target) {
+        target.add(HtmlTree.LI(links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY),
                 contents.packageLabel)));
     }
 
-    private void addPackageSummaryLink(Content tree) {
-        tree.add(HtmlTree.LI(links.createLink(DocPaths.PACKAGE_SUMMARY, contents.packageLabel)));
+    private void addPackageSummaryLink(Content target) {
+        target.add(HtmlTree.LI(links.createLink(DocPaths.PACKAGE_SUMMARY, contents.packageLabel)));
     }
 
-    private void addTreeLink(Content tree) {
+    private void addTreeLink(Content target) {
         if (options.createTree()) {
             List<PackageElement> packages = new ArrayList<>(configuration.getSpecifiedPackageElements());
             DocPath docPath = packages.size() == 1 && configuration.getSpecifiedTypeElements().isEmpty()
                     ? pathToRoot.resolve(configuration.docPaths.forPackage(packages.get(0)).resolve(DocPaths.PACKAGE_TREE))
                     : pathToRoot.resolve(DocPaths.OVERVIEW_TREE);
-            tree.add(HtmlTree.LI(links.createLink(docPath, contents.treeLabel, "")));
+            target.add(HtmlTree.LI(links.createLink(docPath, contents.treeLabel, "")));
         }
     }
 
-    private void addDeprecatedLink(Content tree) {
+    private void addDeprecatedLink(Content target) {
         if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.DEPRECATED)) {
-            tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
+            target.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
                     contents.deprecatedLabel, "")));
         }
     }
 
-    private void addPreviewLink(Content tree) {
+    private void addPreviewLink(Content target) {
         if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.PREVIEW)) {
-            tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.PREVIEW_LIST),
+            target.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.PREVIEW_LIST),
                     contents.previewLabel, "")));
         }
     }
 
-    private void addNewLink(Content tree) {
+    private void addNewLink(Content target) {
         if (configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.NEW)) {
-            tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.NEW_LIST),
+            target.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.NEW_LIST),
                     contents.newLabel, "")));
         }
     }
 
-    private void addIndexLink(Content tree) {
+    private void addIndexLink(Content target) {
         if (options.createIndex()) {
-            tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(
+            target.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(
                     (options.splitIndex()
                             ? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
                             : DocPaths.INDEX_ALL)),
@@ -567,7 +567,7 @@ public class Navigation {
         }
     }
 
-    private void addHelpLink(Content tree) {
+    private void addHelpLink(Content target) {
         if (!options.noHelp()) {
             String helpfile = options.helpFile();
             DocPath helpfilenm;
@@ -577,23 +577,23 @@ public class Navigation {
                 DocFile file = DocFile.createFileForInput(configuration, helpfile);
                 helpfilenm = DocPath.create(file.getName());
             }
-            tree.add(HtmlTree.LI(links.createLink(
+            target.add(HtmlTree.LI(links.createLink(
                     new DocLink(pathToRoot.resolve(helpfilenm), htmlIds.forPage(documentedPage).name()),
                     contents.helpLabel, "")));
         }
     }
 
-    private void addSearch(Content tree) {
+    private void addSearch(Content target) {
         String reset = "reset";
-        HtmlTree inputText = HtmlTree.INPUT("text", HtmlIds.SEARCH_INPUT)
+        var inputText = HtmlTree.INPUT("text", HtmlIds.SEARCH_INPUT)
                 .put(HtmlAttr.PLACEHOLDER, searchPlaceholder);
-        HtmlTree inputReset = HtmlTree.INPUT(reset, HtmlIds.RESET_BUTTON)
+        var inputReset = HtmlTree.INPUT(reset, HtmlIds.RESET_BUTTON)
                 .put(HtmlAttr.VALUE, reset);
-        HtmlTree searchDiv = HtmlTree.DIV(HtmlStyle.navListSearch,
+        var searchDiv = HtmlTree.DIV(HtmlStyle.navListSearch,
                 HtmlTree.LABEL(HtmlIds.SEARCH_INPUT.name(), searchLabel));
         searchDiv.add(inputText);
         searchDiv.add(inputReset);
-        tree.add(searchDiv);
+        target.add(searchDiv);
     }
 
     /**
@@ -605,12 +605,12 @@ public class Navigation {
         if (options.noNavbar()) {
             return new ContentBuilder();
         }
-        Content tree = HtmlTree.NAV();
+        var navigationBar = HtmlTree.NAV();
 
-        HtmlTree navDiv = new HtmlTree(TagName.DIV);
+        var navDiv = new HtmlTree(TagName.DIV);
         Content skipNavLinks = contents.getContent("doclet.Skip_navigation_links");
         String toggleNavLinks = configuration.getDocResources().getText("doclet.Toggle_navigation_links");
-        tree.add(MarkerComments.START_OF_TOP_NAVBAR);
+        navigationBar.add(MarkerComments.START_OF_TOP_NAVBAR);
         navDiv.setStyle(HtmlStyle.topNav)
                 .setId(HtmlIds.NAVBAR_TOP)
                 .add(new HtmlTree(TagName.BUTTON).setId(HtmlIds.NAVBAR_TOGGLE_BUTTON)
@@ -626,29 +626,29 @@ public class Navigation {
         Content aboutContent = userHeader;
         boolean addSearch = options.createIndex();
 
-        Content aboutDiv = HtmlTree.DIV(HtmlStyle.aboutLanguage, aboutContent);
+        var aboutDiv = HtmlTree.DIV(HtmlStyle.aboutLanguage, aboutContent);
         navDiv.add(aboutDiv);
-        HtmlTree navList = new HtmlTree(TagName.UL)
+        var navList = new HtmlTree(TagName.UL)
                 .setId(HtmlIds.NAVBAR_TOP_FIRSTROW)
                 .setStyle(HtmlStyle.navList)
                 .put(HtmlAttr.TITLE, rowListTitle);
         addMainNavLinks(navList);
         navDiv.add(navList);
-        HtmlTree ulNavSummaryRight = HtmlTree.UL(HtmlStyle.subNavListSmall);
+        var ulNavSummaryRight = HtmlTree.UL(HtmlStyle.subNavListSmall);
         addSummaryLinks(ulNavSummaryRight, true);
         addDetailLinks(ulNavSummaryRight, true);
         navDiv.add(ulNavSummaryRight);
-        tree.add(navDiv);
+        navigationBar.add(navDiv);
 
-        HtmlTree subDiv = HtmlTree.DIV(HtmlStyle.subNav);
+        var subDiv = HtmlTree.DIV(HtmlStyle.subNav);
 
-        HtmlTree div = new HtmlTree(TagName.DIV).setId(HtmlIds.NAVBAR_SUB_LIST);
+        var div = new HtmlTree(TagName.DIV).setId(HtmlIds.NAVBAR_SUB_LIST);
         // Add the summary links if present.
-        HtmlTree ulNavSummary = HtmlTree.UL(HtmlStyle.subNavList);
+        var ulNavSummary = HtmlTree.UL(HtmlStyle.subNavList);
         addSummaryLinks(ulNavSummary, false);
         div.add(ulNavSummary);
         // Add the detail links if present.
-        HtmlTree ulNavDetail = HtmlTree.UL(HtmlStyle.subNavList);
+        var ulNavDetail = HtmlTree.UL(HtmlStyle.subNavList);
         addDetailLinks(ulNavDetail, false);
         div.add(ulNavDetail);
         subDiv.add(div);
@@ -656,12 +656,12 @@ public class Navigation {
         if (addSearch) {
             addSearch(subDiv);
         }
-        tree.add(subDiv);
+        navigationBar.add(subDiv);
 
-        tree.add(MarkerComments.END_OF_TOP_NAVBAR);
-        tree.add(HtmlTree.SPAN(HtmlStyle.skipNav, HtmlTree.EMPTY)
+        navigationBar.add(MarkerComments.END_OF_TOP_NAVBAR);
+        navigationBar.add(HtmlTree.SPAN(HtmlStyle.skipNav, HtmlTree.EMPTY)
                 .setId(HtmlIds.SKIP_NAVBAR_TOP));
 
-        return tree;
+        return navigationBar;
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
index c92e327691c..929523a6c42 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,11 +60,11 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
 
     @Override
     public Content getMemberSummaryHeader(TypeElement typeElement,
-            Content memberSummaryTree) {
-        memberSummaryTree.add(MarkerComments.START_OF_NESTED_CLASS_SUMMARY);
-        Content memberTree = new ContentBuilder();
-        writer.addSummaryHeader(this, memberTree);
-        return memberTree;
+            Content content) {
+        content.add(MarkerComments.START_OF_NESTED_CLASS_SUMMARY);
+        Content memberContent = new ContentBuilder();
+        writer.addSummaryHeader(this, memberContent);
+        return memberContent;
     }
 
     @Override
@@ -74,10 +74,10 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
+    public void addSummaryLabel(Content content) {
+        var label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
                 contents.nestedClassSummary);
-        memberTree.add(label);
+        content.add(label);
     }
 
     @Override
@@ -100,7 +100,7 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
+    public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
         Content classLink = writer.getPreQualifiedClassLink(HtmlLinkInfo.Kind.MEMBER, typeElement);
         Content label;
         if (options.summarizeOverriddenMethods()) {
@@ -112,32 +112,32 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
                     ? resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Interface")
                     : resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class"));
         }
-        HtmlTree labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, label);
+        var labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, label);
         labelHeading.setId(htmlIds.forInheritedClasses(typeElement));
         labelHeading.add(Entity.NO_BREAK_SPACE);
         labelHeading.add(classLink);
-        inheritedTree.add(labelHeading);
+        content.add(labelHeading);
     }
 
     @Override
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
-                                  Content tdSummary) {
+                                  Content content) {
         Content memberLink = writer.getLink(new HtmlLinkInfo(configuration, context, (TypeElement)member)
                 .style(HtmlStyle.typeNameLink));
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.add(code);
+        var code = HtmlTree.CODE(memberLink);
+        content.add(code);
     }
 
     @Override
-    protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content linksTree) {
-        linksTree.add(
+    protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content target) {
+        target.add(
                 writer.getLink(new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.MEMBER,
                         (TypeElement)member)));
     }
 
     @Override
-    protected void addSummaryType(Element member, Content tdSummaryType) {
-        addModifierAndType(member, null, tdSummaryType);
+    protected void addSummaryType(Element member, Content content) {
+        addModifiersAndType(member, null, content);
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
index 11bb4d6def5..ef0226e36f3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,10 +82,10 @@ public class PackageIndexWriter extends AbstractOverviewIndexWriter {
     /**
      * Adds the packages list to the documentation tree.
      *
-     * @param main the documentation tree to which the packages list will be added
+     * @param target the content to which the packages list will be added
      */
     @Override
-    protected void addIndex(Content main) {
+    protected void addIndex(Content target) {
         Map<String, SortedSet<PackageElement>> groupPackageMap
                 = configuration.group.groupPackages(packages);
 
@@ -113,7 +113,7 @@ public class PackageIndexWriter extends AbstractOverviewIndexWriter {
                 }
             }
 
-            main.add(table);
+            target.add(table);
 
             if (table.needsScript()) {
                 getMainBodyScript().append(table.getScript());
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
index 9618be166f9..a0d6730c652 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
@@ -90,7 +90,8 @@ public class PackageTreeWriter extends AbstractTreeWriter {
     }
 
     /**
-     * Generate a separate tree file for each package.
+     * Generate a separate tree file.
+     *
      * @throws DocFileIOException if there is a problem generating the package tree file
      */
     protected void generatePackageTreeFile() throws DocFileIOException {
@@ -100,11 +101,11 @@ public class PackageTreeWriter extends AbstractTreeWriter {
                 ? contents.getContent("doclet.Hierarchy_For_Unnamed_Package")
                 : contents.getContent("doclet.Hierarchy_For_Package",
                 getLocalizedPackageName(packageElement));
-        Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
+        var heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
+        var div = HtmlTree.DIV(HtmlStyle.header, heading);
         if (configuration.packages.size() > 1) {
-            addLinkToMainTree(div);
+            addLinkToAllPackages(div);
         }
         mainContent.add(div);
         addTree(classtree.baseClasses(), "doclet.Class_Hierarchy", mainContent);
@@ -120,14 +121,14 @@ public class PackageTreeWriter extends AbstractTreeWriter {
     /**
      * Get the package tree header.
      *
-     * @return a content tree for the header
+     * @return the package tree header
      */
     protected HtmlTree getPackageTreeHeader() {
         String packageName = packageElement.isUnnamed() ? "" : utils.getPackageName(packageElement);
         String title = packageName + " " + resources.getText("doclet.Window_Class_Hierarchy");
-        HtmlTree bodyTree = getBody(getWindowTitle(title));
+        HtmlTree body = getBody(getWindowTitle(title));
         bodyContents.setHeader(getHeader(PageMode.TREE, packageElement));
-        return bodyTree;
+        return body;
     }
 
     @Override
@@ -141,14 +142,16 @@ public class PackageTreeWriter extends AbstractTreeWriter {
     /**
      * Add a link to the tree for all the packages.
      *
-     * @param div the content tree to which the link will be added
+     * @param target the content to which the link will be added
      */
-    protected void addLinkToMainTree(Content div) {
-        Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
+    protected void addLinkToAllPackages(Content target) {
+        var span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
                 contents.packageHierarchies);
-        div.add(span);
-        HtmlTree ul = HtmlTree.UL(HtmlStyle.horizontal);
-        ul.add(getNavLinkMainTree(resources.getText("doclet.All_Packages")));
-        div.add(ul);
+        target.add(span);
+        var ul = HtmlTree.UL(HtmlStyle.horizontal);
+        // TODO the link should be more specific:
+        //  it should point to the "all packages" section of the overview tree
+        ul.add(getNavLinkToOverviewTree(resources.getText("doclet.All_Packages")));
+        target.add(ul);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
index 1c44a130868..22dbe6c8c7e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
@@ -116,7 +116,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
      * @throws DocFileIOException if there is a problem generating the package use page
      */
     protected void generatePackageUseFile() throws DocFileIOException {
-        HtmlTree body = getPackageUseHeader();
+        HtmlTree body = getBody();
         Content mainContent = new ContentBuilder();
         if (usingPackageToUsedClasses.isEmpty()) {
             mainContent.add(contents.getContent("doclet.ClassUse_No.usage.of.0", getLocalizedPackageName(packageElement)));
@@ -134,23 +134,23 @@ public class PackageUseWriter extends SubWriterHolderWriter {
     /**
      * Add the package use information.
      *
-     * @param contentTree the content tree to which the package use information will be added
+     * @param content the content to which the package use information will be added
      */
-    protected void addPackageUse(Content contentTree) {
-        Content content = new ContentBuilder();
+    protected void addPackageUse(Content content) {
+        Content c = new ContentBuilder();
         if (configuration.packages.size() > 1) {
-            addPackageList(content);
+            addPackageList(c);
         }
-        addClassList(content);
-        contentTree.add(content);
+        addClassList(c);
+        content.add(c);
     }
 
     /**
      * Add the list of packages that use the given package.
      *
-     * @param contentTree the content tree to which the package list will be added
+     * @param content the content to which the package list will be added
      */
-    protected void addPackageList(Content contentTree) {
+    protected void addPackageList(Content content) {
         Content caption = contents.getContent(
                 "doclet.ClassUse_Packages.that.use.0",
                 getPackageLink(packageElement, getLocalizedPackageName(packageElement)));
@@ -170,21 +170,21 @@ public class PackageUseWriter extends SubWriterHolderWriter {
             }
             table.addRow(packageLink, summary);
         }
-        contentTree.add(table);
+        content.add(table);
     }
 
     /**
      * Add the list of classes that use the given package.
      *
-     * @param contentTree the content tree to which the class list will be added
+     * @param content the content to which the class list will be added
      */
-    protected void addClassList(Content contentTree) {
+    protected void addClassList(Content content) {
         TableHeader classTableHeader = new TableHeader(
                 contents.classLabel, contents.descriptionLabel);
-        HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList);
+        var ul = HtmlTree.UL(HtmlStyle.blockList);
         for (String packageName : usingPackageToUsedClasses.keySet()) {
             PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
-            HtmlTree section = HtmlTree.SECTION(HtmlStyle.detail)
+            var section = HtmlTree.SECTION(HtmlStyle.detail)
                     .setId(htmlIds.forPackage(usingPackage));
             Content caption = contents.getContent(
                     "doclet.ClassUse_Classes.in.0.used.by.1",
@@ -208,30 +208,28 @@ public class PackageUseWriter extends SubWriterHolderWriter {
             section.add(table);
             ul.add(HtmlTree.LI(section));
         }
-        Content li = HtmlTree.SECTION(HtmlStyle.packageUses, ul);
-        contentTree.add(li);
+        var li = HtmlTree.SECTION(HtmlStyle.packageUses, ul);
+        content.add(li);
     }
 
     /**
-     * Get the header for the package use listing.
-     *
-     * @return a content tree representing the package use header
+     * {@return the package use HTML BODY element}
      */
-    private HtmlTree getPackageUseHeader() {
+    private HtmlTree getBody() {
         String packageText = resources.getText("doclet.Package");
         String name = packageElement.isUnnamed() ? "" : utils.getPackageName(packageElement);
         String title = resources.getText("doclet.Window_ClassUse_Header", packageText, name);
-        HtmlTree bodyTree = getBody(getWindowTitle(title));
+        HtmlTree body = getBody(getWindowTitle(title));
         ContentBuilder headingContent = new ContentBuilder();
         headingContent.add(contents.getContent("doclet.ClassUse_Title", packageText));
         headingContent.add(new HtmlTree(TagName.BR));
         headingContent.add(name);
-        Content heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, headingContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
+        var div = HtmlTree.DIV(HtmlStyle.header, heading);
         bodyContents.setHeader(getHeader(PageMode.USE, packageElement))
                 .addMainContent(div);
-        return bodyTree;
+        return body;
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
index 231ab6c50e2..fff6c32bfb1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
@@ -77,9 +77,9 @@ public class PackageWriterImpl extends HtmlDocletWriter
     private SortedSet<TypeElement> allClasses;
 
     /**
-     * The HTML tree for section tag.
+     * The HTML element for the section tag being written.
      */
-    protected HtmlTree sectionTree = HtmlTree.SECTION(HtmlStyle.packageDescription, new ContentBuilder());
+    private final HtmlTree section = HtmlTree.SECTION(HtmlStyle.packageDescription, new ContentBuilder());
 
     private final BodyContents bodyContents = new BodyContents();
 
@@ -110,12 +110,12 @@ public class PackageWriterImpl extends HtmlDocletWriter
     @Override
     public Content getPackageHeader() {
         String packageName = getLocalizedPackageName(packageElement).toString();
-        HtmlTree bodyTree = getBody(getWindowTitle(packageName));
-        HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
+        HtmlTree body = getBody(getWindowTitle(packageName));
+        var div = HtmlTree.DIV(HtmlStyle.header);
         if (configuration.showModules) {
             ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(packageElement);
-            Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInPackage, contents.moduleLabel);
-            Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
+            var classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInPackage, contents.moduleLabel);
+            var moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
             moduleNameDiv.add(Entity.NO_BREAK_SPACE);
             moduleNameDiv.add(getModuleLink(mdle,
                     Text.of(mdle.getQualifiedName().toString())));
@@ -126,12 +126,12 @@ public class PackageWriterImpl extends HtmlDocletWriter
             packageHead.add(contents.packageLabel).add(" ");
         }
         packageHead.add(packageName);
-        Content tHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var tHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, packageHead);
         div.add(tHeading);
         bodyContents.setHeader(getHeader(PageMode.PACKAGE, packageElement))
                 .addMainContent(div);
-        return bodyTree;
+        return body;
     }
 
     @Override
@@ -205,14 +205,14 @@ public class PackageWriterImpl extends HtmlDocletWriter
     /**
      * Add the package deprecation information to the documentation tree.
      *
-     * @param div the content tree to which the deprecation information will be added
+     * @param div the content to which the deprecation information will be added
      */
     public void addDeprecationInfo(Content div) {
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(packageElement);
         if (utils.isDeprecated(packageElement)) {
             CommentHelper ch = utils.getCommentHelper(packageElement);
-            HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
-            Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(packageElement));
+            var deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
+            var deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(packageElement));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
                 List<? extends DocTree> commentTags = ch.getDescription(deprs.get(0));
@@ -230,22 +230,22 @@ public class PackageWriterImpl extends HtmlDocletWriter
     }
 
     @Override
-    public void addRelatedPackagesSummary(Content summaryContentTree) {
+    public void addRelatedPackagesSummary(Content summaryContent) {
         boolean showModules = configuration.showModules && hasRelatedPackagesInOtherModules(relatedPackages);
         TableHeader tableHeader= showModules
                 ? new TableHeader(contents.moduleLabel, contents.packageLabel, contents.descriptionLabel)
                 : new TableHeader(contents.packageLabel, contents.descriptionLabel);
         addPackageSummary(relatedPackages, contents.relatedPackages, tableHeader,
-                summaryContentTree, showModules);
+                summaryContent, showModules);
     }
 
 
     /**
-     * Add all types to the content tree.
+     * Add all types to the content.
      *
-     * @param summaryContentTree HtmlTree content to which the links will be added
+     * @param target the content to which the links will be added
      */
-    public void addAllClassesAndInterfacesSummary(Content summaryContentTree) {
+    public void addAllClassesAndInterfacesSummary(Content target) {
         Table table = new Table(HtmlStyle.summaryTable)
                 .setHeader(new TableHeader(contents.classLabel, contents.descriptionLabel))
                 .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
@@ -276,7 +276,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
             }
         }
         if (!table.isEmpty()) {
-            summaryContentTree.add(HtmlTree.LI(table));
+            target.add(HtmlTree.LI(table));
             if (table.needsScript()) {
                 getMainBodyScript().append(table.getScript());
             }
@@ -284,7 +284,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
     }
 
     public void addPackageSummary(List<PackageElement> packages, Content label,
-                                  TableHeader tableHeader, Content summaryContentTree,
+                                  TableHeader tableHeader, Content summaryContent,
                                   boolean showModules) {
         if (!packages.isEmpty()) {
             Table table = new Table(HtmlStyle.summaryTable)
@@ -299,7 +299,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
 
             for (PackageElement pkg : packages) {
                 Content packageLink = getPackageLink(pkg, Text.of(pkg.getQualifiedName()));
-                Content moduleLink = HtmlTree.EMPTY;
+                var moduleLink = HtmlTree.EMPTY;
                 if (showModules) {
                     ModuleElement module = (ModuleElement) pkg.getEnclosingElement();
                     if (module != null && !module.isUnnamed()) {
@@ -323,37 +323,35 @@ public class PackageWriterImpl extends HtmlDocletWriter
                     table.addRow(packageLink, description);
                 }
             }
-            summaryContentTree.add(HtmlTree.LI(table));
+            summaryContent.add(HtmlTree.LI(table));
         }
     }
 
     @Override
-    public void addPackageDescription(Content packageContentTree) {
-        addPreviewInfo(packageElement, packageContentTree);
+    public void addPackageDescription(Content packageContent) {
+        addPreviewInfo(packageElement, packageContent);
         if (!utils.getBody(packageElement).isEmpty()) {
-            HtmlTree tree = sectionTree;
-            tree.setId(HtmlIds.PACKAGE_DESCRIPTION);
-            addDeprecationInfo(tree);
-            addInlineComment(packageElement, tree);
+            section.setId(HtmlIds.PACKAGE_DESCRIPTION);
+            addDeprecationInfo(section);
+            addInlineComment(packageElement, section);
         }
     }
 
     @Override
-    public void addPackageTags(Content packageContentTree) {
-        Content htmlTree = sectionTree;
-        addTagsInfo(packageElement, htmlTree);
-        packageContentTree.add(sectionTree);
+    public void addPackageTags(Content packageContent) {
+        addTagsInfo(packageElement, section);
+        packageContent.add(section);
     }
 
     @Override
-    public void addPackageSignature(Content packageContentTree) {
-        packageContentTree.add(new HtmlTree(TagName.HR));
-        packageContentTree.add(Signatures.getPackageSignature(packageElement, this));
+    public void addPackageSignature(Content packageContent) {
+        packageContent.add(new HtmlTree(TagName.HR));
+        packageContent.add(Signatures.getPackageSignature(packageElement, this));
     }
 
     @Override
-    public void addPackageContent(Content packageContentTree) {
-        bodyContents.addMainContent(packageContentTree);
+    public void addPackageContent(Content packageContent) {
+        bodyContents.addMainContent(packageContent);
     }
 
     @Override
@@ -362,17 +360,17 @@ public class PackageWriterImpl extends HtmlDocletWriter
     }
 
     @Override
-    public void printDocument(Content contentTree) throws DocFileIOException {
+    public void printDocument(Content content) throws DocFileIOException {
         String description = getDescription("declaration", packageElement);
         List<DocPath> localStylesheets = getLocalStylesheets(packageElement);
-        contentTree.add(bodyContents);
+        content.add(bodyContents);
         printHtmlDocument(configuration.metakeywords.getMetaKeywords(packageElement),
-                description, localStylesheets, contentTree);
+                description, localStylesheets, content);
     }
 
     @Override
-    public Content getPackageSummary(Content summaryContentTree) {
-        return HtmlTree.SECTION(HtmlStyle.summary, summaryContentTree);
+    public Content getPackageSummary(Content summaryContent) {
+        return HtmlTree.SECTION(HtmlStyle.summary, summaryContent);
     }
 
     private boolean hasRelatedPackagesInOtherModules(List<PackageElement> relatedPackages) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
index 9ff02bdd8f5..0ea90930d1f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,11 +54,11 @@ public class PropertyWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public Content getMemberSummaryHeader(TypeElement typeElement, Content memberSummaryTree) {
-        memberSummaryTree.add(MarkerComments.START_OF_PROPERTY_SUMMARY);
-        Content memberTree = new ContentBuilder();
-        writer.addSummaryHeader(this, memberTree);
-        return memberTree;
+    public Content getMemberSummaryHeader(TypeElement typeElement, Content content) {
+        content.add(MarkerComments.START_OF_PROPERTY_SUMMARY);
+        Content memberContent = new ContentBuilder();
+        writer.addSummaryHeader(this, memberContent);
+        return memberContent;
     }
 
     @Override
@@ -68,22 +68,22 @@ public class PropertyWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public Content getPropertyDetailsTreeHeader(Content memberDetailsTree) {
-        memberDetailsTree.add(MarkerComments.START_OF_PROPERTY_DETAILS);
-        Content propertyDetailsTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
+    public Content getPropertyDetailsHeader(Content memberDetails) {
+        memberDetails.add(MarkerComments.START_OF_PROPERTY_DETAILS);
+        Content propertyDetailsContent = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
                 contents.propertyDetailsLabel);
-        propertyDetailsTree.add(heading);
-        return propertyDetailsTree;
+        propertyDetailsContent.add(heading);
+        return propertyDetailsContent;
     }
 
     @Override
-    public Content getPropertyDocTreeHeader(ExecutableElement property) {
-        Content propertyDocTree = new ContentBuilder();
-        Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
+    public Content getPropertyHeaderContent(ExecutableElement property) {
+        Content content = new ContentBuilder();
+        var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(utils.getPropertyLabel(name(property))));
-        propertyDocTree.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, propertyDocTree)
+        content.add(heading);
+        return HtmlTree.SECTION(HtmlStyle.detail, content)
                 .setId(htmlIds.forProperty(property));
     }
 
@@ -96,20 +96,20 @@ public class PropertyWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addDeprecated(ExecutableElement property, Content propertyDocTree) {
+    public void addDeprecated(ExecutableElement property, Content propertyContent) {
     }
 
     @Override
-    public void addPreview(ExecutableElement property, Content propertyDocTree) {
+    public void addPreview(ExecutableElement property, Content content) {
     }
 
     @Override
-    public void addComments(ExecutableElement property, Content propertyDocTree) {
+    public void addComments(ExecutableElement property, Content propertyContent) {
         TypeElement holder = (TypeElement)property.getEnclosingElement();
         if (!utils.getFullBody(property).isEmpty()) {
             if (holder.equals(typeElement) ||
                     (!utils.isPublic(holder) || utils.isLinkable(holder))) {
-                writer.addInlineComment(property, propertyDocTree);
+                writer.addInlineComment(property, propertyContent);
             } else {
                 if (!utils.hasHiddenTag(holder) && !utils.hasHiddenTag(property)) {
                     Content link =
@@ -117,39 +117,39 @@ public class PropertyWriterImpl extends AbstractMemberWriter
                                     holder, property,
                                     utils.isIncluded(holder)
                                             ? holder.getSimpleName() : holder.getQualifiedName());
-                    Content codeLink = HtmlTree.CODE(link);
-                    Content descriptionFromLabel = HtmlTree.SPAN(HtmlStyle.descriptionFromTypeLabel,
+                    var codeLink = HtmlTree.CODE(link);
+                    var descriptionFromLabel = HtmlTree.SPAN(HtmlStyle.descriptionFromTypeLabel,
                             utils.isClass(holder)
                                     ? contents.descriptionFromClassLabel
                                     : contents.descriptionFromInterfaceLabel);
                     descriptionFromLabel.add(Entity.NO_BREAK_SPACE);
                     descriptionFromLabel.add(codeLink);
-                    propertyDocTree.add(HtmlTree.DIV(HtmlStyle.block, descriptionFromLabel));
+                    propertyContent.add(HtmlTree.DIV(HtmlStyle.block, descriptionFromLabel));
                 }
-                writer.addInlineComment(property, propertyDocTree);
+                writer.addInlineComment(property, propertyContent);
             }
         }
     }
 
     @Override
-    public void addTags(ExecutableElement property, Content propertyDocTree) {
-        writer.addTagsInfo(property, propertyDocTree);
+    public void addTags(ExecutableElement property, Content propertyContent) {
+        writer.addTagsInfo(property, propertyContent);
     }
 
     @Override
-    public Content getPropertyDetails(Content propertyDetailsTreeHeader, Content propertyDetailsTree) {
+    public Content getPropertyDetails(Content memberDetailsHeader, Content memberDetails) {
         return writer.getDetailsListItem(
                 HtmlTree.SECTION(HtmlStyle.propertyDetails)
                         .setId(HtmlIds.PROPERTY_DETAIL)
-                        .add(propertyDetailsTreeHeader)
-                        .add(propertyDetailsTree));
+                        .add(memberDetailsHeader)
+                        .add(memberDetails));
     }
 
     @Override
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
+    public void addSummaryLabel(Content content) {
+        var label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
                 contents.propertySummaryLabel);
-        memberTree.add(label);
+        content.add(label);
     }
 
     @Override
@@ -167,7 +167,7 @@ public class PropertyWriterImpl extends AbstractMemberWriter
     }
 
     @Override
-    public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
+    public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
         Content classLink = writer.getPreQualifiedClassLink(
                 HtmlLinkInfo.Kind.MEMBER, typeElement);
         Content label;
@@ -180,38 +180,38 @@ public class PropertyWriterImpl extends AbstractMemberWriter
                     ? resources.getText("doclet.Properties_Inherited_From_Class")
                     : resources.getText("doclet.Properties_Inherited_From_Interface"));
         }
-        HtmlTree labelHeading =
+        var labelHeading =
                 HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING, label)
                         .setId(htmlIds.forInheritedProperties(typeElement))
                         .add(Entity.NO_BREAK_SPACE)
                         .add(classLink);
-        inheritedTree.add(labelHeading);
+        content.add(labelHeading);
     }
 
     @Override
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
-                                  Content tdSummary) {
+                                  Content content) {
         Content memberLink = writer.getDocLink(context, typeElement,
                 member,
                 Text.of(utils.getPropertyLabel(name(member))),
                 HtmlStyle.memberNameLink,
                 true);
 
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.add(code);
+        var code = HtmlTree.CODE(memberLink);
+        content.add(code);
     }
 
     @Override
-    protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content linksTree) {
+    protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content target) {
         String mname = name(member);
         Content content = writer.getDocLink(HtmlLinkInfo.Kind.MEMBER, typeElement, member,
                 utils.isProperty(mname) ? utils.getPropertyName(mname) : mname, true);
-        linksTree.add(content);
+        target.add(content);
     }
 
     @Override
-    protected void addSummaryType(Element member, Content tdSummaryType) {
-        addModifierAndType(member, utils.getReturnType(typeElement, (ExecutableElement)member), tdSummaryType);
+    protected void addSummaryType(Element member, Content content) {
+        addModifiersAndType(member, utils.getReturnType(typeElement, (ExecutableElement)member), content);
     }
 
     @Override
@@ -220,8 +220,4 @@ public class PropertyWriterImpl extends AbstractMemberWriter
                 utils.getFullyQualifiedName(member));
     }
 
-    @Override
-    public Content getMemberTreeHeader(){
-        return writer.getMemberTreeHeader();
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
index 242ebf37199..e5a82e9a0f1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
@@ -68,24 +68,24 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
      * Get the given header.
      *
      * @param header the header to write
-     * @return the body content tree
+     * @return the body content
      */
     @Override
     public Content getHeader(String header) {
-        HtmlTree bodyTree = getBody(getWindowTitle(header));
+        HtmlTree body = getBody(getWindowTitle(header));
         Content h1Content = Text.of(header);
-        Content heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, h1Content);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
+        var div = HtmlTree.DIV(HtmlStyle.header, heading);
         bodyContents.setHeader(getHeader(PageMode.SERIALIZED_FORM))
                 .addMainContent(div);
-        return bodyTree;
+        return body;
     }
 
     /**
      * Get the serialized form summaries header.
      *
-     * @return the serialized form summary header tree
+     * @return the serialized form summaries header
      */
     @Override
     public Content getSerializedSummariesHeader() {
@@ -102,30 +102,18 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
         return HtmlTree.SECTION(HtmlStyle.serializedPackageContainer);
     }
 
-    /**
-     * Get the given package header.
-     *
-     * @param packageElement the package element to write
-     * @return a content tree for the package header
-     */
     @Override
     public Content getPackageHeader(PackageElement packageElement) {
-        Content heading = HtmlTree.HEADING_TITLE(Headings.SerializedForm.PACKAGE_HEADING,
+        var heading = HtmlTree.HEADING_TITLE(Headings.SerializedForm.PACKAGE_HEADING,
                 contents.packageLabel);
         heading.add(Entity.NO_BREAK_SPACE);
         heading.add(getPackageLink(packageElement, Text.of(utils.getPackageName(packageElement))));
         return heading;
     }
 
-    /**
-     * Get the serialized class header.
-     *
-     * @return a content tree for the serialized class header
-     */
     @Override
     public Content getClassSerializedHeader() {
         return HtmlTree.UL(HtmlStyle.blockList);
-
     }
 
     /**
@@ -139,19 +127,13 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
                 && !utils.hasHiddenTag(typeElement);
     }
 
-    /**
-     * Get the serializable class heading.
-     *
-     * @param typeElement the class being processed
-     * @return a content tree for the class header
-     */
     @Override
     public Content getClassHeader(TypeElement typeElement) {
         Content classLink = (isVisibleClass(typeElement))
                 ? getLink(new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.DEFAULT, typeElement)
                         .label(configuration.getClassName(typeElement)))
                 : Text.of(utils.getFullyQualifiedName(typeElement));
-        Content section = HtmlTree.SECTION(HtmlStyle.serializedClassDetails)
+        var section = HtmlTree.SECTION(HtmlStyle.serializedClassDetails)
                 .setId(htmlIds.forClass(typeElement));
         Content superClassLink = typeElement.getSuperclass() != null
                 ? getLink(new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.SERIALIZED_FORM,
@@ -180,11 +162,6 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
         return section;
     }
 
-    /**
-     * Get the serial UID info header.
-     *
-     * @return a content tree for the serial uid info header
-     */
     @Override
     public Content getSerialUIDInfoHeader() {
         return HtmlTree.DL(HtmlStyle.nameValue);
@@ -195,46 +172,40 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
      *
      * @param header the header that will show up before the UID.
      * @param serialUID the serial UID to print.
-     * @param serialUidTree the serial UID content tree to which the serial UID
-     *                      content will be added
+     * @param target the serial UID content to which the serial UID
+     *               content will be added
      */
     @Override
     public void addSerialUIDInfo(String header,
                                  String serialUID,
-                                 Content serialUidTree)
+                                 Content target)
     {
         Content headerContent = Text.of(header);
-        serialUidTree.add(HtmlTree.DT(headerContent));
+        target.add(HtmlTree.DT(headerContent));
         Content serialContent = Text.of(serialUID);
-        serialUidTree.add(HtmlTree.DD(serialContent));
+        target.add(HtmlTree.DD(serialContent));
     }
 
-    /**
-     * Get the class serialize content header.
-     *
-     * @return a content tree for the class serialize content header
-     */
     @Override
     public Content getClassContentHeader() {
         return HtmlTree.UL(HtmlStyle.blockList);
-
     }
 
     /**
-     * Add the serialized content tree section.
+     * Add the serialized content section.
      *
-     * @param serializedTreeContent the serialized content tree to be added
+     * @param source the serialized content to be added
      */
     @Override
-    public void addSerializedContent(Content serializedTreeContent) {
-        bodyContents.addMainContent(serializedTreeContent);
+    public void addSerializedContent(Content source) {
+        bodyContents.addMainContent(source);
     }
 
     @Override
-    public void addPackageSerializedTree(Content serializedSummariesTree,
-                                         Content packageSerializedTree)
+    public void addPackageSerialized(Content serializedSummaries,
+                                     Content packageSerialized)
     {
-        serializedSummariesTree.add(HtmlTree.LI(packageSerializedTree));
+        serializedSummaries.add(HtmlTree.LI(packageSerialized));
     }
 
     /**
@@ -246,9 +217,9 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
     }
 
     @Override
-    public void printDocument(Content serializedTree) throws DocFileIOException {
-        serializedTree.add(bodyContents);
-        printHtmlDocument(null, "serialized forms", serializedTree);
+    public void printDocument(Content source) throws DocFileIOException {
+        source.add(bodyContents);
+        printHtmlDocument(null, "serialized forms", source);
 
         if (configuration.mainIndex != null) {
             configuration.mainIndex.add(IndexItem.of(IndexItem.Category.TAGS,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
index 3ed0320588a..4437fca5b7b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
@@ -65,7 +65,7 @@ import static javax.lang.model.element.Modifier.SYNCHRONIZED;
 public class Signatures {
 
     public static Content getModuleSignature(ModuleElement mdle, ModuleWriterImpl moduleWriter) {
-        Content signature = HtmlTree.DIV(HtmlStyle.moduleSignature);
+        var signature = HtmlTree.DIV(HtmlStyle.moduleSignature);
         Content annotations = moduleWriter.getAnnotationInfo(mdle, true);
         if (!annotations.isEmpty()) {
             signature.add(HtmlTree.SPAN(HtmlStyle.annotations, annotations));
@@ -75,7 +75,7 @@ public class Signatures {
                 ? "open module" : "module";
         signature.add(label);
         signature.add(" ");
-        HtmlTree nameSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.elementName);
+        var nameSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.elementName);
         nameSpan.add(mdle.getQualifiedName().toString());
         signature.add(nameSpan);
         return signature;
@@ -85,13 +85,13 @@ public class Signatures {
         if (pkg.isUnnamed()) {
             return Text.EMPTY;
         }
-        Content signature = HtmlTree.DIV(HtmlStyle.packageSignature);
+        var signature = HtmlTree.DIV(HtmlStyle.packageSignature);
         Content annotations = pkgWriter.getAnnotationInfo(pkg, true);
         if (!annotations.isEmpty()) {
             signature.add(HtmlTree.SPAN(HtmlStyle.annotations, annotations));
         }
         signature.add("package ");
-        HtmlTree nameSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.elementName);
+        var nameSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.elementName);
         nameSpan.add(pkg.getQualifiedName().toString());
         signature.add(nameSpan);
         return signature;
@@ -128,7 +128,7 @@ public class Signatures {
             }
             content.add(HtmlTree.SPAN(HtmlStyle.modifiers, modifiers));
 
-            HtmlTree nameSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.elementName);
+            var nameSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.elementName);
             Content className = Text.of(utils.getSimpleName(typeElement));
             if (configuration.getOptions().linkSource()) {
                 writer.addSrcLink(typeElement, className, nameSpan);
@@ -146,7 +146,7 @@ public class Signatures {
                 content.add(getRecordComponents());
             }
             if (!utils.isAnnotationType(typeElement)) {
-                Content extendsImplements = new HtmlTree(TagName.SPAN)
+                var extendsImplements = new HtmlTree(TagName.SPAN)
                         .setStyle(HtmlStyle.extendsImplements);
                 if (!utils.isInterface(typeElement)) {
                     TypeMirror superclass = utils.getFirstVisibleSuperClass(typeElement);
@@ -189,7 +189,7 @@ public class Signatures {
                     .filter(t -> utils.isLinkable(utils.asTypeElement(t)))
                     .toList();
             if (!linkablePermits.isEmpty()) {
-                Content permitsSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.permits);
+                var permitsSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.permits);
                 boolean isFirst = true;
                 for (TypeMirror type : linkablePermits) {
                     if (isFirst) {
@@ -378,7 +378,7 @@ public class Signatures {
         /**
          * Set the type parameters for an executable member.
          *
-         * @param typeParameters the content tree containing the type parameters to add.
+         * @param typeParameters the type parameters to add.
          * @return this instance
          */
         MemberSignature setTypeParameters(Content typeParameters) {
@@ -389,7 +389,7 @@ public class Signatures {
         /**
          * Set the return type for an executable member.
          *
-         * @param returnType the content tree containing the return type to add.
+         * @param returnType the return type to add.
          * @return this instance
          */
         MemberSignature setReturnType(Content returnType) {
@@ -411,33 +411,33 @@ public class Signatures {
         /**
          * Set the parameter information of an executable member.
          *
-         * @param paramTree the content tree containing the parameter information.
+         * @param content the parameter information.
          * @return this instance
          */
-        MemberSignature setParameters(Content paramTree) {
-            this.parameters = paramTree;
+        MemberSignature setParameters(Content content) {
+            this.parameters = content;
             return this;
         }
 
         /**
          * Set the exception information of an executable member.
          *
-         * @param exceptionTree the content tree containing the exception information
+         * @param content the exception information
          * @return this instance
          */
-        MemberSignature setExceptions(Content exceptionTree) {
-            this.exceptions = exceptionTree;
+        MemberSignature setExceptions(Content content) {
+            this.exceptions = content;
             return this;
         }
 
         /**
          * Set the annotation information of a member.
          *
-         * @param annotationTree the content tree containing the exception information
+         * @param content the exception information
          * @return this instance
          */
-        MemberSignature setAnnotations(Content annotationTree) {
-            this.annotations = annotationTree;
+        MemberSignature setAnnotations(Content content) {
+            this.annotations = content;
             return this;
         }
 
@@ -472,7 +472,7 @@ public class Signatures {
             }
 
             // Name
-            HtmlTree nameSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.elementName);
+            var nameSpan = new HtmlTree(TagName.SPAN).setStyle(HtmlStyle.elementName);
             if (memberWriter.options.linkSource()) {
                 Content name = Text.of(memberWriter.name(element));
                 memberWriter.writer.addSrcLink(element, name, nameSpan);
@@ -490,12 +490,12 @@ public class Signatures {
         }
 
         /**
-         * Adds the modifier for the member. The modifiers are ordered as specified
+         * Adds the modifiers for the member. The modifiers are ordered as specified
          * by <em>The Java Language Specification</em>.
          *
-         * @param htmlTree the content tree to which the modifier information will be added
+         * @param target the content to which the modifier information will be added
          */
-        private void appendModifiers(Content htmlTree) {
+        private void appendModifiers(Content target) {
             Set<Modifier> set = new TreeSet<>(element.getModifiers());
 
             // remove the ones we really don't need
@@ -517,7 +517,7 @@ public class Signatures {
             }
             if (!set.isEmpty()) {
                 String mods = set.stream().map(Modifier::toString).collect(Collectors.joining(" "));
-                htmlTree.add(HtmlTree.SPAN(HtmlStyle.modifiers, Text.of(mods)))
+                target.add(HtmlTree.SPAN(HtmlStyle.modifiers, Text.of(mods)))
                         .add(Entity.NO_BREAK_SPACE);
             }
         }
@@ -525,30 +525,30 @@ public class Signatures {
         /**
          * Appends the type parameter information to the HTML tree.
          *
-         * @param htmlTree          the HTML tree
+         * @param target            the HTML tree
          * @param lastLineSeparator index of last line separator in the HTML tree
          * @return the new index of the last line separator
          */
-        private int appendTypeParameters(Content htmlTree, int lastLineSeparator) {
+        private int appendTypeParameters(Content target, int lastLineSeparator) {
             // Apply different wrapping strategies for type parameters
             // depending of combined length of type parameters and return type.
             int typeParamLength = typeParameters.charCount();
 
             if (typeParamLength >= TYPE_PARAMS_MAX_INLINE_LENGTH) {
-                htmlTree.add(HtmlTree.SPAN(HtmlStyle.typeParametersLong, typeParameters));
+                target.add(HtmlTree.SPAN(HtmlStyle.typeParametersLong, typeParameters));
             } else {
-                htmlTree.add(HtmlTree.SPAN(HtmlStyle.typeParameters, typeParameters));
+                target.add(HtmlTree.SPAN(HtmlStyle.typeParameters, typeParameters));
             }
 
-            int lineLength = htmlTree.charCount() - lastLineSeparator;
+            int lineLength = target.charCount() - lastLineSeparator;
             int newLastLineSeparator = lastLineSeparator;
 
             // sum below includes length of modifiers plus type params added above
             if (lineLength + returnType.charCount() > RETURN_TYPE_MAX_LINE_LENGTH) {
-                htmlTree.add(DocletConstants.NL);
-                newLastLineSeparator = htmlTree.charCount();
+                target.add(DocletConstants.NL);
+                newLastLineSeparator = target.charCount();
             } else {
-                htmlTree.add(Entity.NO_BREAK_SPACE);
+                target.add(Entity.NO_BREAK_SPACE);
             }
 
             return newLastLineSeparator;
@@ -557,25 +557,25 @@ public class Signatures {
         /**
          * Appends the parameters and exceptions information to the HTML tree.
          *
-         * @param htmlTree          the HTML tree
+         * @param target            the HTML tree
          * @param lastLineSeparator the index of the last line separator in the HTML tree
          */
-        private void appendParametersAndExceptions(Content htmlTree, int lastLineSeparator) {
+        private void appendParametersAndExceptions(Content target, int lastLineSeparator) {
             // Record current position for indentation of exceptions
-            int indentSize = htmlTree.charCount() - lastLineSeparator;
+            int indentSize = target.charCount() - lastLineSeparator;
 
             if (parameters.charCount() == 2) {
                 // empty parameters are added without packing
-                htmlTree.add(parameters);
+                target.add(parameters);
             } else {
-                htmlTree.add(new HtmlTree(TagName.WBR))
+                target.add(new HtmlTree(TagName.WBR))
                         .add(HtmlTree.SPAN(HtmlStyle.parameters, parameters));
             }
 
             // Exceptions
             if (exceptions != null && !exceptions.isEmpty()) {
                 CharSequence indent = " ".repeat(Math.max(0, indentSize + 1 - 7));
-                htmlTree.add(DocletConstants.NL)
+                target.add(DocletConstants.NL)
                         .add(indent)
                         .add("throws ")
                         .add(HtmlTree.SPAN(HtmlStyle.exceptions, exceptions));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
index 4efa6a70d22..cb0c657c171 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
@@ -207,8 +207,8 @@ public class SourceToHTMLConverter {
                     .resolve(configuration.docPaths.forPackage(te))
                     .invert();
             Content body = getHeader();
-            Content pre = new HtmlTree(TagName.PRE);
-            try (LineNumberReader reader = new LineNumberReader(r)) {
+            var pre = new HtmlTree(TagName.PRE);
+            try (var reader = new LineNumberReader(r)) {
                 while ((line = reader.readLine()) != null) {
                     addLineNo(pre, lineno);
                     addLine(pre, line, lineno);
@@ -216,7 +216,7 @@ public class SourceToHTMLConverter {
                 }
             }
             addBlankLines(pre);
-            Content div = HtmlTree.DIV(HtmlStyle.sourceContainer, pre);
+            var div = HtmlTree.DIV(HtmlStyle.sourceContainer, pre);
             body.add(HtmlTree.MAIN(div));
             writeToFile(body, outputdir.resolve(configuration.docPaths.forClass(te)), te);
         } catch (IOException e) {
@@ -240,16 +240,16 @@ public class SourceToHTMLConverter {
                 .setGenerator(HtmlDocletWriter.getGenerator(getClass()))
                 .addDefaultScript(false)
                 .setStylesheets(configuration.getMainStylesheet(), configuration.getAdditionalStylesheets());
-        Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body);
-        HtmlDocument htmlDocument = new HtmlDocument(htmlTree);
+        var html = HtmlTree.HTML(configuration.getLocale().getLanguage(), head, body);
+        HtmlDocument document = new HtmlDocument(html);
         messages.notice("doclet.Generating_0", path.getPath());
-        htmlDocument.write(DocFile.createFileForOutput(configuration, path));
+        document.write(DocFile.createFileForOutput(configuration, path));
     }
 
     /**
      * Returns a link to the stylesheet file.
      *
-     * @param head an HtmlTree to which the stylesheet links will be added
+     * @param head the content to which the stylesheet links will be added
      */
     public void addStyleSheetProperties(Content head) {
         String filename = options.stylesheetFile();
@@ -261,18 +261,18 @@ public class SourceToHTMLConverter {
             stylesheet = DocPaths.STYLESHEET;
         }
         DocPath p = relativePath.resolve(stylesheet);
-        HtmlTree link = HtmlTree.LINK("stylesheet", "text/css", p.getPath(), "Style");
+        var link = HtmlTree.LINK("stylesheet", "text/css", p.getPath(), "Style");
         head.add(link);
         addStylesheets(head);
     }
 
-    protected void addStylesheets(Content tree) {
+    protected void addStylesheets(Content head) {
         options.additionalStylesheets().forEach(css -> {
             DocFile file = DocFile.createFileForInput(configuration, css);
             DocPath cssPath = DocPath.create(file.getName());
-            HtmlTree slink = HtmlTree.LINK("stylesheet", "text/css", relativePath.resolve(cssPath).getPath(),
-                                           "Style");
-            tree.add(slink);
+            var slink = HtmlTree.LINK("stylesheet", "text/css", relativePath.resolve(cssPath).getPath(),
+                                      "Style");
+            head.add(slink);
         });
     }
 
@@ -288,11 +288,11 @@ public class SourceToHTMLConverter {
     /**
      * Add the line numbers for the source code.
      *
-     * @param pre the content tree to which the line number will be added
+     * @param pre the content to which the line number will be added
      * @param lineno The line number
      */
     private static void addLineNo(Content pre, int lineno) {
-        HtmlTree span = new HtmlTree(TagName.SPAN);
+        var span = new HtmlTree(TagName.SPAN);
         span.setStyle(HtmlStyle.sourceLineNo);
         if (lineno < 10) {
             span.add("00" + Integer.toString(lineno));
@@ -307,13 +307,13 @@ public class SourceToHTMLConverter {
     /**
      * Add a line from source to the HTML file that is generated.
      *
-     * @param pre the content tree to which the line will be added.
+     * @param pre the content to which the line will be added.
      * @param line the string to format.
      * @param currentLineNo the current number.
      */
     private void addLine(Content pre, String line, int currentLineNo) {
         if (line != null) {
-            Content anchor = HtmlTree.SPAN_ID(
+            var anchor = HtmlTree.SPAN_ID(
                     HtmlIds.forLine(currentLineNo),
                     Text.of(utils.replaceTabs(line)));
             pre.add(anchor);
@@ -324,7 +324,7 @@ public class SourceToHTMLConverter {
     /**
      * Add trailing blank lines at the end of the page.
      *
-     * @param pre the content tree to which the blank lines will be added.
+     * @param pre the content to which the blank lines will be added.
      */
     private static void addBlankLines(Content pre) {
         for (int i = 0; i < NUM_BLANK_LINES; i++) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
index 0a22ce4ae4a..f783327f5db 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
@@ -71,10 +71,10 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      * Add the summary header.
      *
      * @param mw the writer for the member being documented
-     * @param memberTree the content tree to which the summary header will be added
+     * @param memberContent the content to which the summary header will be added
      */
-    public void addSummaryHeader(AbstractMemberWriter mw, Content memberTree) {
-        mw.addSummaryLabel(memberTree);
+    public void addSummaryHeader(AbstractMemberWriter mw, Content memberContent) {
+        mw.addSummaryLabel(memberContent);
     }
 
     /**
@@ -82,22 +82,22 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      *
      * @param mw the writer for the member being documented
      * @param typeElement the te to be documented
-     * @param inheritedTree the content tree to which the inherited summary header will be added
+     * @param inheritedContent the content to which the inherited summary header will be added
      */
     public void addInheritedSummaryHeader(AbstractMemberWriter mw, TypeElement typeElement,
-            Content inheritedTree) {
-        mw.addInheritedSummaryLabel(typeElement, inheritedTree);
+            Content inheritedContent) {
+        mw.addInheritedSummaryLabel(typeElement, inheritedContent);
     }
 
     /**
      * Add the index comment.
      *
      * @param member the member being documented
-     * @param contentTree the content tree to which the comment will be added
+     * @param content the content to which the comment will be added
      */
-    protected void addIndexComment(Element member, Content contentTree) {
+    protected void addIndexComment(Element member, Content content) {
         List<? extends DocTree> tags = utils.getFirstSentenceTrees(member);
-        addIndexComment(member, tags, contentTree);
+        addIndexComment(member, tags, content);
     }
 
     /**
@@ -105,41 +105,41 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      *
      * @param member the member being documented
      * @param firstSentenceTags the first sentence tags for the member to be documented
-     * @param tdSummary the content tree to which the comment will be added
+     * @param tdSummaryContent the content to which the comment will be added
      */
     protected void addIndexComment(Element member, List<? extends DocTree> firstSentenceTags,
-            Content tdSummary) {
-        addPreviewSummary(member, tdSummary);
+            Content tdSummaryContent) {
+        addPreviewSummary(member, tdSummaryContent);
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(member);
         Content div;
         if (utils.isDeprecated(member)) {
-            Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(member));
+            var deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(member));
             div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
             if (!deprs.isEmpty()) {
                 addSummaryDeprecatedComment(member, deprs.get(0), div);
             }
-            tdSummary.add(div);
+            tdSummaryContent.add(div);
             return;
         } else {
             Element te = member.getEnclosingElement();
             if (te != null &&  utils.isTypeElement(te) && utils.isDeprecated(te)) {
-                Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(te));
+                var deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(te));
                 div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
-                tdSummary.add(div);
+                tdSummaryContent.add(div);
             }
         }
-        addSummaryComment(member, firstSentenceTags, tdSummary);
+        addSummaryComment(member, firstSentenceTags, tdSummaryContent);
     }
 
     /**
      * Add the summary link for the member.
      *
      * @param member the member to be documented
-     * @param contentTree the content tree to which the link will be added
+     * @param content the content to which the link will be added
      */
-    public void addSummaryLinkComment(Element member, Content contentTree) {
+    public void addSummaryLinkComment(Element member, Content content) {
         List<? extends DocTree> tags = utils.getFirstSentenceTrees(member);
-        addSummaryLinkComment(member, tags, contentTree);
+        addSummaryLinkComment(member, tags, content);
     }
 
     /**
@@ -147,10 +147,10 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      *
      * @param member the member being documented
      * @param firstSentenceTags the first sentence tags for the member to be documented
-     * @param tdSummary the content tree to which the comment will be added
+     * @param tdSummaryContent the content to which the comment will be added
      */
-    public void addSummaryLinkComment(Element member, List<? extends DocTree> firstSentenceTags, Content tdSummary) {
-        addIndexComment(member, firstSentenceTags, tdSummary);
+    public void addSummaryLinkComment(Element member, List<? extends DocTree> firstSentenceTags, Content tdSummaryContent) {
+        addIndexComment(member, firstSentenceTags, tdSummaryContent);
     }
 
     /**
@@ -159,53 +159,49 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      * @param mw the writer for the member being documented
      * @param typeElement the class being documented
      * @param member the member being documented
-     * @param isFirst true if its the first link being documented
-     * @param linksTree the content tree to which the summary will be added
+     * @param isFirst true if it is the first link being documented
+     * @param linksContent the content to which the summary will be added
      */
     public void addInheritedMemberSummary(AbstractMemberWriter mw,
                                           TypeElement typeElement,
                                           Element member,
                                           boolean isFirst,
-                                          Content linksTree) {
+                                          Content linksContent) {
         if (!isFirst) {
-            linksTree.add(", ");
+            linksContent.add(", ");
         }
-        mw.addInheritedSummaryLink(typeElement, member, linksTree);
+        mw.addInheritedSummaryLink(typeElement, member, linksContent);
     }
 
     /**
-     * Get the document content header tree
-     *
-     * @return a content tree the document content header
+     * {@return the document content header}
      */
     public Content getContentHeader() {
         return new ContentBuilder();
     }
 
     /**
-     * Add the class content tree.
+     * Add the class content.
      *
-     * @param classContentTree class content tree which will be added to the content tree
+     * @param source class content which will be added to the documentation
      */
-    public void addClassContentTree(Content classContentTree) {
-        bodyContents.addMainContent(classContentTree);
+    public void addClassContent(Content source) {
+        bodyContents.addMainContent(source);
     }
 
     /**
-     * Add the annotation content tree.
+     * Add the annotation content.
      *
-     * @param annotationContentTree annotation content tree which will be added to the content tree
+     * @param source annotation content which will be added to the documentation
      */
-    public void addAnnotationContentTree(Content annotationContentTree) {
-        addClassContentTree(annotationContentTree);
+    public void addAnnotationContent(Content source) {
+        addClassContent(source);
     }
 
     /**
-     * Get the member header tree
-     *
-     * @return a content tree for the member header
+     * {@return the member header}
      */
-    public Content getMemberTreeHeader() {
+    public Content getMemberHeader() {
         return HtmlTree.UL(HtmlStyle.blockList);
     }
 
@@ -249,81 +245,75 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
     }
 
     /**
-     * Returns a list to be used for the list of members of a given kind.
-     *
-     * @return a list to be used for the list of members of a given kind
+     * {@return a list to add member items to}
      */
     public Content getMemberList() {
         return HtmlTree.UL(HtmlStyle.memberList);
     }
 
     /**
-     * Returns an item for the list of elements of a given kind
+     * {@return a member item}
      *
-     * @param content content for the item
-     * @return an item for the list of elements of a given kind
+     * @param member the member to represent as an item
      */
-    public Content getMemberListItem(Content content) {
-        return HtmlTree.LI(content);
+    public Content getMemberListItem(Content member) {
+        return HtmlTree.LI(member);
     }
 
-    public Content getMemberInheritedTree() {
+    public Content getMemberInherited() {
         return HtmlTree.DIV(HtmlStyle.inheritedList);
     }
 
     /**
-     * Adds a section for a summary tree with the given CSS {@code class} and {@code id} attribute.
+     * Adds a section for a summary with the given CSS {@code class} and {@code id} attribute.
      *
-     * @param style         the CSS class for the section
-     * @param htmlId        the id for the section
-     * @param summariesList the list of summary sections to which the summary will be added
-     * @param content       the content tree representing the summary
+     * @param style  the CSS class for the section
+     * @param htmlId the id for the section
+     * @param target the list of summary sections to which the summary will be added
+     * @param source the content representing the summary
      */
-    public void addSummary(HtmlStyle style, HtmlId htmlId, Content summariesList, Content content) {
-        HtmlTree htmlTree = HtmlTree.SECTION(style, content)
+    public void addSummary(HtmlStyle style, HtmlId htmlId, Content target, Content source) {
+        var htmlTree = HtmlTree.SECTION(style, source)
                 .setId(htmlId);
-        summariesList.add(getSummariesListItem(htmlTree));
+        target.add(getSummariesListItem(htmlTree));
     }
 
     /**
-     * Get the member tree
+     * {@return the member content}
      *
-     * @param contentTree the tree used to generate the complete member tree
-     * @return a content tree for the member
+     * @param content the content used to generate the complete member
      */
-    public Content getMemberTree(Content contentTree) {
-        return HtmlTree.LI(contentTree);
+    public Content getMember(Content content) {
+        return HtmlTree.LI(content);
     }
 
     /**
-     * Get the member summary tree
+     * {@return the member summary content}
      *
-     * @param contentTree the tree used to generate the member summary tree
-     * @return a content tree for the member summary
+     * @param memberContent the content used to generate the member summary
      */
-    public Content getMemberSummaryTree(Content contentTree) {
-        return HtmlTree.SECTION(HtmlStyle.summary, contentTree);
+    public Content getMemberSummary(Content memberContent) {
+        return HtmlTree.SECTION(HtmlStyle.summary, memberContent);
     }
 
     /**
-     * Get the member details tree
+     * {@return the member details}
      *
-     * @param contentTree the tree used to generate the member details tree
-     * @return a content tree for the member details
+     * @param content the content used to generate the member details
      */
-    public Content getMemberDetailsTree(Content contentTree) {
-        return HtmlTree.SECTION(HtmlStyle.details, contentTree);
+    public Content getMemberDetailsContent(Content content) {
+        return HtmlTree.SECTION(HtmlStyle.details, content);
     }
 
     /**
-     * Get the member tree
+     * Get the member content
      *
-     * @param id the id to be used for the content tree
-     * @param style the style class to be added to the content tree
-     * @param contentTree the tree used to generate the complete member tree
-     * @return the member tree
+     * @param id the id to be used for the content
+     * @param style the style class to be added to the content
+     * @param source the content used to generate the complete member content
+     * @return the member content
      */
-    public Content getMemberTree(HtmlId id, HtmlStyle style, Content contentTree) {
-        return HtmlTree.SECTION(style, contentTree).setId(id);
+    public Content getMember(HtmlId id, HtmlStyle style, Content source) {
+        return HtmlTree.SECTION(style, source).setId(id);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
index 56bf9b59fe4..40210ae7d2c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -146,28 +146,28 @@ public class SummaryListWriter<L extends SummaryAPIListBuilder> extends SubWrite
      *
      * @param id the id for the link
      * @param headingKey
-     * @param contentTree the content tree to which the index link will be added
+     * @param content the content to which the index link will be added
      */
-    protected void addIndexLink(HtmlId id, String headingKey, Content contentTree) {
-        Content li = HtmlTree.LI(links.createLink(id,
+    protected void addIndexLink(HtmlId id, String headingKey, Content content) {
+        var li = HtmlTree.LI(links.createLink(id,
                 contents.getContent(headingKey)));
-        contentTree.add(li);
+        content.add(li);
     }
 
     /**
      * Get the contents list.
      *
      * @param apiSummary the summary list builder
-     * @return a content tree for the contents list
+     * @return the contents list
      */
     public Content getContentsList(L apiSummary) {
-        Content heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
+        var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
+        var div = HtmlTree.DIV(HtmlStyle.header, heading);
         Content headingContent = contents.contentsHeading;
         div.add(HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
                 headingContent));
-        Content ul = new HtmlTree(TagName.UL);
+        var ul = new HtmlTree(TagName.UL);
         addExtraIndexLink(apiSummary, ul);
         for (SummaryElementKind kind : SummaryElementKind.values()) {
             if (apiSummary.hasDocumentation(kind)) {
@@ -179,29 +179,27 @@ public class SummaryListWriter<L extends SummaryAPIListBuilder> extends SubWrite
     }
 
     /**
-     * Get the header for the API Summary Listing.
-     *
-     * @return a content tree for the header
+     * {@return the header for the API Summary listing}
      */
     public HtmlTree getHeader() {
         String title = resources.getText(titleKey);
-        HtmlTree bodyTree = getBody(getWindowTitle(title));
+        HtmlTree body = getBody(getWindowTitle(title));
         bodyContents.setHeader(getHeader(pageMode));
-        return bodyTree;
+        return body;
     }
 
     /**
-     * Add summary information to the documentation tree
+     * Add summary information to the documentation
      *
      * @param apiList list of API summary elements
      * @param id the id attribute of the table
      * @param headingKey the caption for the summary table
      * @param headerKey table header key for the summary table
-     * @param contentTree the content tree to which the summary table will be added
+     * @param content the content to which the summary table will be added
      */
     protected void addSummaryAPI(SortedSet<Element> apiList, HtmlId id,
                                  String headingKey, String headerKey,
-                                 Content contentTree) {
+                                 Content content) {
         if (apiList.size() > 0) {
             TableHeader tableHeader = new TableHeader(
                     contents.getContent(headerKey), contents.descriptionLabel);
@@ -231,7 +229,7 @@ public class SummaryListWriter<L extends SummaryAPIListBuilder> extends SubWrite
                 table.addRow(e, link, desc);
             }
             // note: singleton list
-            contentTree.add(HtmlTree.UL(HtmlStyle.blockList, HtmlTree.LI(table)));
+            content.add(HtmlTree.UL(HtmlStyle.blockList, HtmlTree.LI(table)));
         }
     }
 
@@ -239,7 +237,7 @@ public class SummaryListWriter<L extends SummaryAPIListBuilder> extends SubWrite
      * Add summary text for the given element.
      *
      * @param e the element for which the summary text should be added
-     * @param desc the target to which the text should be added
+     * @param desc the content to which the text should be added
      */
     protected void addComments(Element e, Content desc) {
     }
@@ -264,7 +262,7 @@ public class SummaryListWriter<L extends SummaryAPIListBuilder> extends SubWrite
      * Add an extra optional section to the content.
      *
      * @param list the element list
-     * @param target the target content to which the section should be added
+     * @param target the content to which the section should be added
      */
     protected void addExtraSection(L list, Content target) {
     }
@@ -273,7 +271,7 @@ public class SummaryListWriter<L extends SummaryAPIListBuilder> extends SubWrite
      * Add an extra optional index link.
      *
      * @param list the element list
-     * @param target the target content to which the link should be added
+     * @param target the content to which the link should be added
      */
     protected void addExtraIndexLink(L list, Content target) {
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
index 89121697c7e..349841349c1 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,11 +119,11 @@ public class SystemPropertiesWriter extends HtmlDocletWriter {
     }
 
     /**
-     * Adds all the system properties to the content tree.
+     * Adds all the system properties to the content.
      *
-     * @param content HtmlTree content to which the links will be added
+     * @param target the content to which the links will be added
      */
-    protected void addSystemProperties(Content content) {
+    protected void addSystemProperties(Content target) {
         Map<String, List<IndexItem>> searchIndexMap = groupSystemProperties();
         Content separator = Text.of(", ");
         Table table = new Table(HtmlStyle.summaryTable)
@@ -141,7 +141,7 @@ public class SystemPropertiesWriter extends HtmlDocletWriter {
             }
             table.addRow(propertyName, HtmlTree.DIV(HtmlStyle.block, separatedReferenceLinks));
         }
-        content.add(table);
+        target.add(table);
     }
 
     private Map<String, List<IndexItem>> groupSystemProperties() {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
index 8cf2e3710f0..8870465befb 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
@@ -339,7 +339,7 @@ public class Table extends Content {
         for (Content c : contents) {
             HtmlStyle cellStyle = columnStyles.get(colIndex);
             // Replace invalid content with HtmlTree.EMPTY to make sure the cell isn't dropped
-            HtmlTree cell = HtmlTree.DIV(cellStyle, c.isValid() ? c : HtmlTree.EMPTY);
+            var cell = HtmlTree.DIV(cellStyle, c.isValid() ? c : HtmlTree.EMPTY);
             if (rowStyle != null) {
                 cell.addStyle(rowStyle);
             }
@@ -386,7 +386,7 @@ public class Table extends Content {
             default -> throw new IllegalStateException();
         };
 
-        HtmlTree table = HtmlTree.DIV(tableStyle).addStyle(columnStyle);
+        var table = HtmlTree.DIV(tableStyle).addStyle(columnStyle);
         if ((tabMap == null || tabs.size() == 1) && !alwaysShowDefaultTab) {
             if (tabMap == null) {
                 main.add(caption);
@@ -396,7 +396,7 @@ public class Table extends Content {
             table.add(getTableBody());
             main.add(table);
         } else {
-            HtmlTree tablist = HtmlTree.DIV(tabListStyle)
+            var tablist = HtmlTree.DIV(tabListStyle)
                     .put(HtmlAttr.ROLE, "tablist")
                     .put(HtmlAttr.ARIA_ORIENTATION, "horizontal");
 
@@ -413,7 +413,7 @@ public class Table extends Content {
             if (id == null) {
                 throw new IllegalStateException("no id set for table");
             }
-            HtmlTree tabpanel = new HtmlTree(TagName.DIV)
+            var tabpanel = new HtmlTree(TagName.DIV)
                     .setId(HtmlIds.forTabPanel(id))
                     .put(HtmlAttr.ROLE, "tabpanel");
             table.add(getTableBody());
@@ -425,7 +425,7 @@ public class Table extends Content {
     }
 
     private HtmlTree createTab(HtmlId tabId, HtmlStyle style, boolean defaultTab, Content tabLabel) {
-        HtmlTree tab = new HtmlTree(TagName.BUTTON)
+        var tab = new HtmlTree(TagName.BUTTON)
                 .setId(tabId)
                 .put(HtmlAttr.ROLE, "tab")
                 .put(HtmlAttr.ARIA_SELECTED, defaultTab ? "true" : "false")
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
index 255f61a491b..dca52e179b8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -145,7 +145,7 @@ public class TableHeader extends Content {
                     : (i == 0) ? HtmlStyle.colFirst
                     : (i == (cellContents.size() - 1)) ? HtmlStyle.colLast
                     : (i == 1) ? HtmlStyle.colSecond : null;
-            HtmlTree cell = HtmlTree.DIV(HtmlStyle.tableHeader, cellContent);
+            var cell = HtmlTree.DIV(HtmlStyle.tableHeader, cellContent);
             if (style != null) {
                 cell.addStyle(style);
             }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
index adf98e0b8a0..70c451c1a3f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
@@ -202,8 +202,7 @@ public class TagletWriterImpl extends TagletWriter {
     @Override
     protected Content codeTagOutput(Element element, DocTree tag) {
         CommentHelper ch = utils.getCommentHelper(element);
-        Content result = HtmlTree.CODE(Text.of(utils.normalizeNewlines(ch.getText(tag))));
-        return result;
+        return HtmlTree.CODE(Text.of(utils.normalizeNewlines(ch.getText(tag))));
     }
 
     @Override
@@ -223,7 +222,7 @@ public class TagletWriterImpl extends TagletWriter {
     }
 
     // ugly but simple;
-    // alternatives would be to walk the Content tree, or to add new functionality to Content
+    // alternatives would be to walk the Content's tree structure, or to add new functionality to Content
     private String extractText(Content c) {
         return c.toString().replaceAll("<[^>]+>", "");
     }
@@ -301,8 +300,8 @@ public class TagletWriterImpl extends TagletWriter {
         // define id attributes for state components so that generated descriptions may refer to them
         boolean defineID = (element.getKind() == ElementKind.RECORD)
                 && !paramTag.isTypeParameter();
-        Content nameTree = Text.of(paramName);
-        body.add(HtmlTree.CODE(defineID ? HtmlTree.SPAN_ID(HtmlIds.forParam(paramName), nameTree) : nameTree));
+        Content nameContent = Text.of(paramName);
+        body.add(HtmlTree.CODE(defineID ? HtmlTree.SPAN_ID(HtmlIds.forParam(paramName), nameContent) : nameContent));
         body.add(" - ");
         List<? extends DocTree> description = ch.getDescription(paramTag);
         body.add(htmlWriter.commentTagsToContent(paramTag, element, description, context.within(paramTag)));
@@ -353,7 +352,7 @@ public class TagletWriterImpl extends TagletWriter {
         // Use a different style if any link label is longer than 30 chars or contains commas.
         boolean hasLongLabels = links.stream()
                 .anyMatch(c -> c.charCount() > SEE_TAG_MAX_INLINE_LENGTH || c.toString().contains(","));
-        HtmlTree seeList = HtmlTree.UL(hasLongLabels ? HtmlStyle.seeListLong : HtmlStyle.seeList);
+        var seeList = HtmlTree.UL(hasLongLabels ? HtmlStyle.seeListLong : HtmlStyle.seeList);
         links.stream().filter(Content::isValid).forEach(item -> {
             seeList.add(HtmlTree.LI(item));
         });
@@ -384,11 +383,11 @@ public class TagletWriterImpl extends TagletWriter {
     @Override
     protected Content snippetTagOutput(Element element, SnippetTree tag, StyledText content,
                                        String id, String lang) {
-        HtmlTree pre = new HtmlTree(TagName.PRE).setStyle(HtmlStyle.snippet);
+        var pre = new HtmlTree(TagName.PRE).setStyle(HtmlStyle.snippet);
         if (id != null && !id.isBlank()) {
             pre.put(HtmlAttr.ID, id);
         }
-        HtmlTree code = new HtmlTree(TagName.CODE)
+        var code = new HtmlTree(TagName.CODE)
                 .add(HtmlTree.EMPTY); // Make sure the element is always rendered
         if (lang != null && !lang.isBlank()) {
             code.addStyle("language-" + lang);
@@ -458,7 +457,7 @@ public class TagletWriterImpl extends TagletWriter {
         });
         String copyText = resources.getText("doclet.Copy_snippet_to_clipboard");
         String copiedText = resources.getText("doclet.Copied_snippet_to_clipboard");
-        HtmlTree snippetContainer = HtmlTree.DIV(HtmlStyle.snippetContainer,
+        var snippetContainer = HtmlTree.DIV(HtmlStyle.snippetContainer,
                 new HtmlTree(TagName.BUTTON)
                         .add(HtmlTree.SPAN(Text.of(copyText))
                                 .put(HtmlAttr.DATA_COPIED, copiedText))
@@ -525,15 +524,13 @@ public class TagletWriterImpl extends TagletWriter {
             body.add(" - ");
             body.add(desc);
         }
-        HtmlTree result = HtmlTree.DD(body);
-        return result;
+        return HtmlTree.DD(body);
     }
 
     @Override
     public Content throwsTagOutput(TypeMirror throwsType) {
-        HtmlTree result = HtmlTree.DD(HtmlTree.CODE(htmlWriter.getLink(
+        return HtmlTree.DD(HtmlTree.CODE(htmlWriter.getLink(
                 new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.MEMBER, throwsType))));
-        return result;
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
index 57b2b470dee..2b47dc8916f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
@@ -101,11 +101,11 @@ public class TreeWriter extends AbstractTreeWriter {
      * @throws DocFileIOException if there is a problem generating the overview tree page
      */
     public void generateTreeFile() throws DocFileIOException {
-        HtmlTree body = getTreeHeader();
+        HtmlTree body = getBody();
         Content headContent = contents.hierarchyForAllPackages;
-        Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
+        var heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
                 HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
+        var div = HtmlTree.DIV(HtmlStyle.header, heading);
         addPackageTreeLinks(div);
         Content mainContent = new ContentBuilder();
         mainContent.add(div);
@@ -122,18 +122,18 @@ public class TreeWriter extends AbstractTreeWriter {
     /**
      * Add the links to all the package tree files.
      *
-     * @param contentTree the content tree to which the links will be added
+     * @param content the content to which the links will be added
      */
-    protected void addPackageTreeLinks(Content contentTree) {
+    protected void addPackageTreeLinks(Content content) {
         //Do nothing if only unnamed package is used
         if (isUnnamedPackage()) {
             return;
         }
         if (!classesOnly) {
-            Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
+            var span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
                     contents.packageHierarchies);
-            contentTree.add(span);
-            HtmlTree ul = HtmlTree.UL(HtmlStyle.horizontal);
+            content.add(span);
+            var ul = HtmlTree.UL(HtmlStyle.horizontal);
             int i = 0;
             for (PackageElement pkg : packages) {
                 // If the package name length is 0 or if -nodeprecated option
@@ -145,7 +145,7 @@ public class TreeWriter extends AbstractTreeWriter {
                     continue;
                 }
                 DocPath link = pathString(pkg, DocPaths.PACKAGE_TREE);
-                Content li = HtmlTree.LI(links.createLink(link,
+                var li = HtmlTree.LI(links.createLink(link,
                         getLocalizedPackageName(pkg)));
                 if (i < packages.size() - 1) {
                     li.add(", ");
@@ -153,16 +153,14 @@ public class TreeWriter extends AbstractTreeWriter {
                 ul.add(li);
                 i++;
             }
-            contentTree.add(ul);
+            content.add(ul);
         }
     }
 
     /**
-     * Get the tree header.
-     *
-     * @return a content tree for the tree header
+     * {@return a new HTML BODY element}
      */
-    protected HtmlTree getTreeHeader() {
+    private HtmlTree getBody() {
         String title = resources.getText("doclet.Window_Class_Hierarchy");
         HtmlTree bodyTree = getBody(getWindowTitle(title));
         bodyContents.setHeader(getHeader(PageMode.TREE));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java
index 33ebbc43b2d..75242fc5b90 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@ public class BodyContents extends Content {
 
         HtmlTree flexHeader = header.addStyle(HtmlStyle.flexHeader);
 
-        HtmlTree flexContent = HtmlTree.DIV(HtmlStyle.flexContent)
+        var flexContent = HtmlTree.DIV(HtmlStyle.flexContent)
                 .add(HtmlTree.MAIN().add(mainContents))
                 .add(footer == null ? HtmlTree.EMPTY : footer);
 
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 4c8e8a2e0b6..015a4806aca 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
@@ -269,45 +269,45 @@ public class Head extends Content {
      * @return the HTML
      */
     private Content toContent() {
-        HtmlTree tree = new HtmlTree(TagName.HEAD);
-        tree.add(getGeneratedBy(showTimestamp, generatedDate));
-        tree.add(HtmlTree.TITLE(title));
+        var head = new HtmlTree(TagName.HEAD);
+        head.add(getGeneratedBy(showTimestamp, generatedDate));
+        head.add(HtmlTree.TITLE(title));
 
-        tree.add(HtmlTree.META("viewport", "width=device-width, initial-scale=1"));
+        head.add(HtmlTree.META("viewport", "width=device-width, initial-scale=1"));
 
         if (charset != null) { // compatibility; should this be allowed?
-            tree.add(HtmlTree.META("Content-Type", "text/html", charset));
+            head.add(HtmlTree.META("Content-Type", "text/html", charset));
         }
 
         if (showTimestamp) {
             DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            tree.add(HtmlTree.META("dc.created", generatedDate.format(dateFormat)));
+            head.add(HtmlTree.META("dc.created", generatedDate.format(dateFormat)));
         }
 
         if (description != null) {
-            tree.add(HtmlTree.META("description", description));
+            head.add(HtmlTree.META("description", description));
         }
 
         if (generator != null) {
-            tree.add(HtmlTree.META("generator", generator));
+            head.add(HtmlTree.META("generator", generator));
         }
 
         for (String k : keywords) {
-            tree.add(HtmlTree.META("keywords", k));
+            head.add(HtmlTree.META("keywords", k));
         }
 
         if (canonicalLink != null) {
-            HtmlTree link = new HtmlTree(TagName.LINK);
+            var link = new HtmlTree(TagName.LINK);
             link.put(HtmlAttr.REL, "canonical");
             link.put(HtmlAttr.HREF, canonicalLink.getPath());
-            tree.add(link);
+            head.add(link);
         }
 
-        addStylesheets(tree);
-        addScripts(tree);
-        extraContent.forEach(tree::add);
+        addStylesheets(head);
+        addScripts(head);
+        extraContent.forEach(head::add);
 
-        return tree;
+        return head;
     }
 
 
@@ -322,31 +322,31 @@ public class Head extends Content {
         return new Comment(text);
     }
 
-    private void addStylesheets(HtmlTree tree) {
+    private void addStylesheets(HtmlTree head) {
         if (mainStylesheet == null) {
             mainStylesheet = DocPaths.STYLESHEET;
         }
-        addStylesheet(tree, mainStylesheet);
+        addStylesheet(head, mainStylesheet);
 
         for (DocPath path : additionalStylesheets) {
-            addStylesheet(tree, path);
+            addStylesheet(head, path);
         }
 
         if (index) {
             // The order of the addStylesheet(...) calls is important
-            addStylesheet(tree, DocPaths.SCRIPT_DIR.resolve(DocPaths.JQUERY_UI_CSS));
-            addStylesheet(tree, DocPaths.JQUERY_OVERRIDES_CSS);
+            addStylesheet(head, DocPaths.SCRIPT_DIR.resolve(DocPaths.JQUERY_UI_CSS));
+            addStylesheet(head, DocPaths.JQUERY_OVERRIDES_CSS);
         }
     }
 
-    private void addStylesheet(HtmlTree tree, DocPath stylesheet) {
-        tree.add(HtmlTree.LINK("stylesheet", "text/css",
+    private void addStylesheet(HtmlTree head, DocPath stylesheet) {
+        head.add(HtmlTree.LINK("stylesheet", "text/css",
                 pathToRoot.resolve(stylesheet).getPath(), "Style"));
     }
 
-    private void addScripts(HtmlTree tree) {
+    private void addScripts(HtmlTree head) {
         if (addDefaultScript) {
-            tree.add(HtmlTree.SCRIPT(pathToRoot.resolve(DocPaths.JAVASCRIPT).getPath()));
+            head.add(HtmlTree.SCRIPT(pathToRoot.resolve(DocPaths.JAVASCRIPT).getPath()));
         }
         if (index) {
             if (pathToRoot != null && mainBodyScript != null) {
@@ -356,19 +356,19 @@ public class Head extends Content {
                         .append(";\n")
                         .append("loadScripts(document, 'script');");
             }
-            addScriptElement(tree, DocPaths.JQUERY_JS);
-            addScriptElement(tree, DocPaths.JQUERY_UI_JS);
+            addScriptElement(head, DocPaths.JQUERY_JS);
+            addScriptElement(head, DocPaths.JQUERY_UI_JS);
         }
         for (DocPath path : additionalScripts) {
-            addScriptElement(tree, path);
+            addScriptElement(head, path);
         }
         for (Script script : scripts) {
-            tree.add(script.asContent());
+            head.add(script.asContent());
         }
     }
 
-    private void addScriptElement(HtmlTree tree, DocPath filePath) {
+    private void addScriptElement(HtmlTree head, DocPath filePath) {
         DocPath scriptFile = pathToRoot.resolve(DocPaths.SCRIPT_DIR).resolve(filePath);
-        tree.add(HtmlTree.SCRIPT(scriptFile.getPath()));
+        head.add(HtmlTree.SCRIPT(scriptFile.getPath()));
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
index 40ae4699ea6..201b89927cf 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,12 +48,12 @@ public class HtmlDocument {
     private final Content docContent;
 
     /**
-     * Constructor to construct an HTML document.
+     * Constructs an HTML document.
      *
-     * @param htmlTree HTML tree of the document
+     * @param html the {@link TagName#HTML HTML} element of the document
      */
-    public HtmlDocument(Content htmlTree) {
-        docContent = htmlTree;
+    public HtmlDocument(Content html) {
+        docContent = html;
     }
 
     /**
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 4b954ef1a31..040caeee56f 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
@@ -905,7 +905,7 @@ public class HtmlTree extends Content {
      */
     public static HtmlTree TITLE(String body) {
         return new HtmlTree(TagName.TITLE)
-            .add(body);
+                .add(body);
     }
 
     /**
@@ -928,18 +928,18 @@ public class HtmlTree extends Content {
      * @return the element
      */
     public static HtmlTree UL(HtmlStyle style, Content first, Content... more) {
-        HtmlTree htmlTree = new HtmlTree(TagName.UL)
+        var ul = new HtmlTree(TagName.UL)
                 .setStyle(style);
-        htmlTree.add(first);
+        ul.add(first);
         for (Content c : more) {
-            htmlTree.add(c);
+            ul.add(c);
         }
-        return htmlTree;
+        return ul;
     }
 
     /**
      * Creates an HTML {@code UL} element with the given style and content generated
-     * from a collection of items..
+     * from a collection of items.
      *
      * @param style the style
      * @param items the items to be added to the list
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
index b5ccaa0bcbe..a146c532c00 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ public class Links {
      *
      * @param id    the position of the link in the file
      * @param label the content for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(HtmlId id, Content label) {
         DocLink l = DocLink.fragment(id.name());
@@ -70,7 +70,7 @@ public class Links {
      * @param id    the position of the link in the file
      * @param label the content for the link
      * @param link  whether to create a link or just return the label
-     * @return a content tree for the link or just the label
+     * @return the link or just the label
      */
     public Content createLink(HtmlId id, Content label, boolean link) {
         return link ? createLink(id, label) : label;
@@ -83,7 +83,7 @@ public class Links {
      * @param label  the content for the link
      * @param title  the title for the link
      *
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(HtmlId id, Content label, String title) {
         DocLink l = DocLink.fragment(id.name());
@@ -95,7 +95,7 @@ public class Links {
      *
      * @param path   the path for the link
      * @param label  the content for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(DocPath path, String label) {
         return createLink(path, Text.of(label), null, "");
@@ -106,7 +106,7 @@ public class Links {
      *
      * @param path   the path for the link
      * @param label  the content for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(DocPath path, Content label) {
         return createLink(path, label, "");
@@ -120,7 +120,7 @@ public class Links {
      * @param label     the content for the link
      * @param style     the style for the link, or null
      * @param title     the title for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(DocPath path, Content label, HtmlStyle style, String title) {
         return createLink(new DocLink(path), label, style, title);
@@ -132,7 +132,7 @@ public class Links {
      * @param path      the path for the link
      * @param label     the content for the link
      * @param title     the title for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(DocPath path, Content label, String title) {
         return createLink(new DocLink(path), label, title);
@@ -143,7 +143,7 @@ public class Links {
      *
      * @param link      the details for the link
      * @param label     the content for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(DocLink link, Content label) {
         return createLink(link, label, "");
@@ -155,10 +155,10 @@ public class Links {
      * @param link      the details for the link
      * @param label     the content for the link
      * @param title     the title for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(DocLink link, Content label, String title) {
-        HtmlTree anchor = HtmlTree.A(link.relativizeAgainst(file).toString(), label);
+        var anchor = HtmlTree.A(link.relativizeAgainst(file).toString(), label);
         if (title != null && title.length() != 0) {
             anchor.put(HtmlAttr.TITLE, title);
         }
@@ -173,7 +173,7 @@ public class Links {
      * @param label     the content for the link
      * @param style     the style for the link, or null
      * @param title     the title for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(DocLink link, Content label, HtmlStyle style,
                               String title) {
@@ -189,11 +189,11 @@ public class Links {
      * @param style      the style for the link, or null
      * @param title      the title for the link
      * @param isExternal is the link external to the generated documentation
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createLink(DocLink link, Content label, HtmlStyle style,
                               String title, boolean isExternal) {
-        HtmlTree l = HtmlTree.A(link.relativizeAgainst(file).toString(), label);
+        var l = HtmlTree.A(link.relativizeAgainst(file).toString(), label);
         if (style != null) {
             l.setStyle(style);
         }
@@ -212,7 +212,7 @@ public class Links {
      *
      * @param link       the details for the link
      * @param label      the content for the link
-     * @return a content tree for the link
+     * @return the link
      */
     public Content createExternalLink(DocLink link, Content label) {
         return HtmlTree.A(link.relativizeAgainst(file).toString(), label)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java
index affa10a8dc3..ab20fae6657 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,11 +102,11 @@ public class Script  {
      * Returns a "live" view of the script as a {@code Content} object.
      * Any later modifications to the script will be reflected in the
      * object that is returned.
-     * @return the script, as a {@code Content} object.
+     * @return the script
      */
     public Content asContent() {
         ScriptContent scriptContent = new ScriptContent(sb);
-        HtmlTree tree = new HtmlTree(TagName.SCRIPT) {
+        var script = new HtmlTree(TagName.SCRIPT) {
             @Override
             public HtmlTree add(Content c) {
                 if (c != scriptContent) {
@@ -115,9 +115,9 @@ public class Script  {
                 return super.add(scriptContent);
             }
         };
-        tree.put(HtmlAttr.TYPE, "text/javascript");
-        tree.add(scriptContent);
-        return tree;
+        script.put(HtmlAttr.TYPE, "text/javascript");
+        script.add(scriptContent);
+        return script;
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeMemberWriter.java
index 5392360eab2..a5de0a1d3f3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,48 +39,47 @@ import javax.lang.model.element.Element;
 public interface AnnotationTypeMemberWriter extends MemberWriter {
 
     /**
-     * Adds the annotation type member tree header.
+     * Adds the annotation type member header.
      *
-     * @return content tree for the member tree header
+     * @return the content for the member header
      */
-    Content getMemberTreeHeader();
+    Content getMemberHeader();
 
     /**
      * Adds the annotation type details marker.
      *
-     * @param memberDetails the content tree representing details marker
+     * @param memberDetails the content representing details marker
      */
     void addAnnotationDetailsMarker(Content memberDetails);
 
     /**
-     * Adds the annotation type details tree header.
+     * Adds the annotation type details header.
      *
-     * @return content tree for the annotation details header
+     * @return the content for the annotation details header
      */
-    Content getAnnotationDetailsTreeHeader();
+    Content getAnnotationDetailsHeader();
 
     /**
-     * Gets the annotation type documentation tree header.
+     * Gets the annotation type documentation header.
      *
      * @param member the annotation type being documented
-     * @return content tree for the annotation type documentation header
+     * @return the content for the annotation type documentation header
      */
-    Content getAnnotationDocTreeHeader(Element member);
+    Content getAnnotationHeaderContent(Element member);
 
     /**
-     * Gets the annotation type details tree.
+     * Gets the annotation type details.
      *
-     * @param annotationDetailsTreeHeader the content tree representing annotation type details header
-     * @param annotationDetailsTree the content tree representing annotation type details
-     * @return content tree for the annotation type details
+     * @param annotationDetailsHeader the content representing annotation type details header
+     * @param annotationDetails the content representing annotation type details
+     * @return the annotation type details
      */
-    Content getAnnotationDetails(Content annotationDetailsTreeHeader, Content annotationDetailsTree);
+    Content getAnnotationDetails(Content annotationDetailsHeader, Content annotationDetails);
 
     /**
-     * Gets the signature for the given member.
+     * {@return the signature for the specified member}
      *
      * @param member the member being documented
-     * @return content tree for the annotation type signature
      */
     Content getSignature(Element member);
 
@@ -88,39 +87,39 @@ public interface AnnotationTypeMemberWriter extends MemberWriter {
      * Adds the deprecated output for the given member.
      *
      * @param member the member being documented
-     * @param annotationDocTree content tree to which the deprecated information will be added
+     * @param target the content to which the deprecated information will be added
      */
-    void addDeprecated(Element member, Content annotationDocTree);
+    void addDeprecated(Element member, Content target);
 
     /**
      * Adds the preview output for the given member.
      *
      * @param member the member being documented
-     * @param contentTree content tree to which the preview information will be added
+     * @param content the content to which the preview information will be added
      */
-    void addPreview(Element member, Content contentTree);
+    void addPreview(Element member, Content content);
 
     /**
      * Adds the comments for the given member.
      *
      * @param member the member being documented
-     * @param annotationDocTree the content tree to which the comments will be added
+     * @param annotationContent the content to which the comments will be added
      */
-    void addComments(Element member, Content annotationDocTree);
+    void addComments(Element member, Content annotationContent);
 
     /**
      * Adds the tags for the given member.
      *
      * @param member the member being documented
-     * @param annotationDocTree the content tree to which the tags will be added
+     * @param annotationContent the content to which the tags will be added
      */
-    void addTags(Element member, Content annotationDocTree);
+    void addTags(Element member, Content annotationContent);
 
     /**
      * Adds the default value documentation if the member has one.
      *
      * @param member the member being documented
-     * @param annotationDocTree content tree to which the default value will be added
+     * @param annotationContent the content to which the default value will be added
      */
-    void addDefaultValueInfo(Element member, Content annotationDocTree);
+    void addDefaultValueInfo(Element member, Content annotationContent);
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java
index ee4fe4625b3..576e968bf50 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,119 +56,104 @@ public interface ClassWriter {
     Content getClassContentHeader();
 
     /**
-     * Add the class tree documentation.
+     * Add the class inheritance tree documentation.
      *
-     * @param classContentTree class content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addClassTree(Content classContentTree);
-
-    /**
-     * Get the class information tree header.
-     *
-     * @return class information tree header that needs to be added to the documentation
-     */
-    Content getClassInfoTreeHeader();
+    void addClassTree(Content target);
 
     /**
      * Add the type parameter and state component information.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addParamInfo(Content classInfoTree);
+    void addParamInfo(Content target);
 
     /**
      * Add all super interfaces if this is an interface.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addSuperInterfacesInfo(Content classInfoTree);
+    void addSuperInterfacesInfo(Content target);
 
     /**
      * Add all implemented interfaces if this is a class.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addImplementedInterfacesInfo(Content classInfoTree);
+    void addImplementedInterfacesInfo(Content target);
 
     /**
      * Add all the classes that extend this one.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addSubClassInfo(Content classInfoTree);
+    void addSubClassInfo(Content target);
 
     /**
      * Add all the interfaces that extend this one.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addSubInterfacesInfo(Content classInfoTree);
+    void addSubInterfacesInfo(Content target);
 
     /**
      * If this is an interface, add all classes that implement this
      * interface.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addInterfaceUsageInfo(Content classInfoTree);
+    void addInterfaceUsageInfo(Content target);
 
     /**
      * If this is an functional interface, display appropriate message.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addFunctionalInterfaceInfo(Content classInfoTree);
+    void addFunctionalInterfaceInfo(Content target);
 
     /**
      * If this is an inner class or interface, add the enclosing class or
      * interface.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    void addNestedClassInfo(Content classInfoTree);
+    void addNestedClassInfo(Content target);
 
     /**
-     * Get the class information.
+     * {@return the class information}
      *
-     * @param classInfoTree content tree containing the class information
-     * @return a content tree for the class
+     * @param classInfo the class information
      */
-    Content getClassInfo(Content classInfoTree);
+    Content getClassInfo(Content classInfo);
 
     /**
      * If this class is deprecated, add the appropriate information.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param classInfo the content to which the documentation will be added
      */
-    void addClassDeprecationInfo(Content classInfoTree);
+    void addClassDeprecationInfo(Content classInfo);
 
     /**
-     * Add the signature of the current class content tree.
+     * Add the signature of the current class content.
      *
-     * @param classInfoTree the class content tree to which the signature will be added
+     * @param classInfo the class content to which the signature will be added
      */
-    void addClassSignature(Content classInfoTree);
+    void addClassSignature(Content classInfo);
 
     /**
      * Build the class description.
      *
-     * @param classInfoTree content tree to which the documentation will be added
+     * @param classInfo the content to which the documentation will be added
      */
-    void addClassDescription(Content classInfoTree);
+    void addClassDescription(Content classInfo);
 
     /**
      * Add the tag information for the current class.
      *
-     * @param classInfoTree content tree to which the tag information will be added
-     */
-    void addClassTagInfo(Content classInfoTree);
-
-    /**
-     * Get the member tree header for the class.
-     *
-     * @return a content tree for the member tree header
+     * @param classInfo the content to which the tag information will be added
      */
-    Content getMemberTreeHeader();
+    void addClassTagInfo(Content classInfo);
 
     /**
      * Returns a list to be used for the list of summaries for members of a given kind.
@@ -201,11 +186,11 @@ public interface ClassWriter {
     Content getDetailsListItem(Content content);
 
     /**
-     * Add the class content tree.
+     * Add the class content.
      *
-     * @param classContentTree class content tree which will be added to the content tree
+     * @param classContent the class content which will be added to the content
      */
-    void addClassContentTree(Content classContentTree);
+    void addClassContent(Content classContent);
 
     /**
      * Add the footer of the page.
@@ -215,10 +200,10 @@ public interface ClassWriter {
     /**
      * Print the document.
      *
-     * @param contentTree content tree that will be printed as a document
+     * @param content the content that will be printed as a document
      * @throws DocFileIOException if there is a problem while writing the document
      */
-    void printDocument(Content contentTree) throws DocFileIOException;
+    void printDocument(Content content) throws DocFileIOException;
 
     /**
      * Return the TypeElement being documented.
@@ -228,18 +213,16 @@ public interface ClassWriter {
     TypeElement getTypeElement();
 
     /**
-     * Get the member summary tree.
+     * {@return the member summary}
      *
-     * @param memberTree the content tree used to build the summary tree
-     * @return a content tree for the member summary
+     * @param memberContent the content used to build the summary
      */
-    Content getMemberSummaryTree(Content memberTree);
+    Content getMemberSummary(Content memberContent);
 
     /**
-     * Get the member details tree.
+     * {@return the member details}
      *
-     * @param memberTree the content tree used to build the details tree
-     * @return a content tree for the member details
+     * @param memberContent the content used to generate the member details
      */
-    Content getMemberDetailsTree(Content memberTree);
+    Content getMemberDetails(Content memberContent);
 }
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 51beb6db14f..393cd016f29 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, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -504,26 +504,24 @@ public class CommentUtils {
     }
 
     /**
-     * Returns a list containing the string for a given key in the doclet's resources,
-     * formatted with given arguments.
+     * {@return a list containing the string for a given key in the doclet's
+     * resources, formatted with given arguments}
      *
      * @param key the key for the desired string
-     * @param o0  string or tree argument to be formatted into the result
-     * @return a content tree for the text
+     * @param o0  string or DocTree argument to be formatted into the result
      */
     public List<? extends DocTree> getComment(String key, Object o0) {
         return getComment(key, o0, null, null);
     }
 
     /**
-     * Returns a list containing the string for a given key in the doclet's resources,
-     * formatted with given arguments.
+     * {@return a list containing the string for a given key in the doclet's
+     * resources, formatted with given arguments}
      *
-     * @param key the key for the desired string
-     * @param o0  string or tree argument to be formatted into the result
-     * @param o1  string or tree argument to be formatted into the result
-     * @param o2  string or tree argument to be formatted into the result
-     * @return a content tree for the text
+     * @param key the key for the desired strings
+     * @param o0  string or a DocTree argument to be formatted into the result
+     * @param o1  string or a DocTree argument to be formatted into the result
+     * @param o2  string or a DocTree argument to be formatted into the result
      */
     public List<? extends DocTree> getComment(String key, Object o0, Object o1, Object o2) {
         List<DocTree> l = new ArrayList<>();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java
index 67d48ec6846..c5399a7f9fa 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstantsSummaryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,27 +59,27 @@ public interface ConstantsSummaryWriter {
     Content getContentsHeader();
 
     /**
-     * Adds the given package name link to the constant content list tree.
+     * Adds the given package name link to the constant content list.
      *
      * @param pkg                    the {@link PackageElement} to index.
      * @param writtenPackageHeaders  the set of package headers that have already
      *                               been indexed, we want to index utmost once.
-     * @param contentListTree        the content tree to which the link will be added
+     * @param content                the content to which the link will be added
      */
     void addLinkToPackageContent(PackageElement pkg, Set<PackageElement> writtenPackageHeaders,
-                                 Content contentListTree);
+                                 Content content);
 
     /**
-     * Add the content list to the documentation tree.
+     * Add the content list to the documentation.
      *
-     * @param contentListTree the content that will be added to the list
+     * @param content the content that will be added to the list
      */
-    void addContentsList(Content contentListTree);
+    void addContentsList(Content content);
 
     /**
      * Get the constant summaries for the document.
      *
-     * @return constant summaries header to be added to the documentation tree
+     * @return constant summaries header to be added to the documentation
      */
     Content getConstantSummaries();
 
@@ -90,11 +90,11 @@ public interface ConstantsSummaryWriter {
      *                          first 2 directory levels of the package
      *                          name. For example, java.lang.ref would be
      *                          indexed as java.lang.*.
-     * @param summariesTree the summaries documentation tree
+     * @param toContent the summaries documentation
      * @param first true if the first package is listed
      *                    be written
      */
-    void addPackageName(PackageElement pkg, Content summariesTree, boolean first);
+    void addPackageName(PackageElement pkg, Content toContent, boolean first);
 
     /**
      * Get the class summary header for the constants summary.
@@ -104,30 +104,29 @@ public interface ConstantsSummaryWriter {
     Content getClassConstantHeader();
 
     /**
-     * Add the content list to the documentation summaries tree.
+     * Add the content list to the documentation summaries.
      *
-     * @param summariesTree the tree to which the class constants list will be added
-     * @param classConstantTree the class constant tree that will be added to the list
+     * @param fromClassConstant the class constant content that will be added to the list
      */
-    void addClassConstant(Content summariesTree, Content classConstantTree);
+    void addClassConstant(Content fromClassConstant);
 
     /**
-     * Adds the constant member table to the documentation tree.
+     * Adds the constant member table to the documentation.
      *
      * @param typeElement the class whose constants are being documented.
      * @param fields the constants being documented.
-     * @param classConstantTree the documentation tree to which the constant member
-     *                    table content will be added
+     * @param target the content to which the constant member
+     *               table content will be added
      */
     void addConstantMembers(TypeElement typeElement, Collection<VariableElement> fields,
-                            Content classConstantTree);
+                            Content target);
 
     /**
-     * Add the summaries list to the content tree.
+     * Add the summaries list to the content.
      *
-     * @param summariesTree the summaries content tree that will be added to the list
+     * @param content the summaries content that will be added to the list
      */
-    void addConstantSummaries(Content summariesTree);
+    void addConstantSummaries(Content content);
 
     /**
      * Adds the footer for the summary documentation.
@@ -137,8 +136,8 @@ public interface ConstantsSummaryWriter {
     /**
      * Print the constants summary document.
      *
-     * @param contentTree content tree which should be printed
+     * @param content the content which should be printed
      * @throws DocFileIOException if there is a problem while writing the document
      */
-    void printDocument(Content contentTree) throws DocFileIOException;
+    void printDocument(Content content) throws DocFileIOException;
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java
index 380ac5ce530..48befea1d75 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,26 +39,23 @@ import javax.lang.model.element.ExecutableElement;
 public interface ConstructorWriter extends MemberWriter {
 
     /**
-     * Get the constructor details tree header.
+     * {@return the constructor details header}
      *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the constructor details header
+     * @param content the content representing member details
      */
-    Content getConstructorDetailsTreeHeader(Content memberDetailsTree);
+    Content getConstructorDetailsHeader(Content content);
 
     /**
-     * Get the constructor documentation tree header.
+     * {@return the constructor documentation header}
      *
      * @param constructor the constructor being documented
-     * @return content tree for the constructor documentation header
      */
-    Content getConstructorDocTreeHeader(ExecutableElement constructor);
+    Content getConstructorHeaderContent(ExecutableElement constructor);
 
     /**
-     * Get the signature for the given constructor.
+     * {@return the signature for the given constructor}
      *
      * @param constructor the constructor being documented
-     * @return content tree for the constructor signature
      */
     Content getSignature(ExecutableElement constructor);
 
@@ -66,42 +63,41 @@ public interface ConstructorWriter extends MemberWriter {
      * Add the deprecated output for the given constructor.
      *
      * @param constructor the constructor being documented
-     * @param constructorDocTree content tree to which the deprecated information will be added
+     * @param constructorContent the content to which the deprecated information will be added
      */
-    void addDeprecated(ExecutableElement constructor, Content constructorDocTree);
+    void addDeprecated(ExecutableElement constructor, Content constructorContent);
 
     /**
      * Add the preview output for the given member.
      *
      * @param member the member being documented
-     * @param contentTree content tree to which the preview information will be added
+     * @param content the content to which the preview information will be added
      */
-    void addPreview(ExecutableElement member, Content contentTree);
+    void addPreview(ExecutableElement member, Content content);
 
     /**
      * Add the comments for the given constructor.
      *
      * @param constructor the constructor being documented
-     * @param constructorDocTree the content tree to which the comments will be added
+     * @param constructorContent the content to which the comments will be added
      */
-    void addComments(ExecutableElement constructor, Content constructorDocTree);
+    void addComments(ExecutableElement constructor, Content constructorContent);
 
     /**
      * Add the tags for the given constructor.
      *
      * @param constructor the constructor being documented
-     * @param constructorDocTree the content tree to which the tags will be added
+     * @param constructorContent the content to which the tags will be added
      */
-    void addTags(ExecutableElement constructor, Content constructorDocTree);
+    void addTags(ExecutableElement constructor, Content constructorContent);
 
     /**
-     * Get the constructor details tree.
+     * {@return the constructor details}
      *
-     * memberDetailsTreeHeader the content tree representing member details header
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the constructor details
+     * @param memberDetailsHeader the content representing member details header
+     * @param memberDetails the content representing member details
      */
-    Content getConstructorDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
+    Content getConstructorDetails(Content memberDetailsHeader, Content memberDetails);
 
     /**
      * Let the writer know whether a non public constructor was found.
@@ -111,9 +107,7 @@ public interface ConstructorWriter extends MemberWriter {
     void setFoundNonPubConstructor(boolean foundNonPubConstructor);
 
     /**
-     * Gets the member header tree.
-     *
-     * @return a content tree for the member header
+     * @return the member header}
      */
-    Content getMemberTreeHeader();
+    Content getMemberHeader();
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java
index 80dd9c48587..3aad055b32b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.util.Collection;
 import java.util.function.Function;
 
 /**
- * A class to create content for javadoc output pages.
+ * A content tree for javadoc output pages.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
@@ -115,10 +115,10 @@ public abstract class Content {
      *
      * @param writer the writer
      * @param atNewline whether the writer has just written a newline
-     * @return  whether the writer has just written a newline
+     * @return whether the writer has just written a newline
      * @throws IOException if an error occurs while writing the output
      */
-    public abstract boolean write(Writer writer, boolean atNewline) throws IOException ;
+    public abstract boolean write(Writer writer, boolean atNewline) throws IOException;
 
     /**
      * Returns true if the content is empty.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java
index aa483714d1b..94b0f6baed4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,30 +40,30 @@ import javax.lang.model.element.VariableElement;
 public interface EnumConstantWriter extends MemberWriter {
 
     /**
-     * Get the enum constants details tree header.
+     * Get the enum constants details header.
      *
      * @param typeElement the class being documented
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the enum constants details header
+     * @param memberDetails the content representing member details
+     * @return a content for the enum constants details header
      */
-    Content getEnumConstantsDetailsTreeHeader(TypeElement typeElement,
-                                              Content memberDetailsTree);
+    Content getEnumConstantsDetailsHeader(TypeElement typeElement,
+                                          Content memberDetails);
 
     /**
-     * Get the enum constants documentation tree header.
+     * Get the enum constants documentation header.
      *
      * @param enumConstant the enum constant being documented
-     * @param enumConstantsDetailsTree the content tree representing enum constant details
-     * @return content tree for the enum constant documentation header
+     * @param enumConstantsDetails the content representing enum constant details
+     * @return the enum constant documentation header
      */
-    Content getEnumConstantsTreeHeader(VariableElement enumConstant,
-                                       Content enumConstantsDetailsTree);
+    Content getEnumConstantsHeader(VariableElement enumConstant,
+                                   Content enumConstantsDetails);
 
     /**
      * Get the signature for the given enum constant.
      *
      * @param enumConstant the enum constant being documented
-     * @return content tree for the enum constant signature
+     * @return the enum constant signature
      */
     Content getSignature(VariableElement enumConstant);
 
@@ -71,46 +71,47 @@ public interface EnumConstantWriter extends MemberWriter {
      * Add the deprecated output for the given enum constant.
      *
      * @param enumConstant the enum constant being documented
-     * @param enumConstantsTree content tree to which the deprecated information will be added
+     * @param content the content to which the deprecated information will be added
      */
-    void addDeprecated(VariableElement enumConstant, Content enumConstantsTree);
+    void addDeprecated(VariableElement enumConstant, Content content);
 
     /**
      * Add the preview output for the given member.
      *
      * @param member the member being documented
-     * @param contentTree content tree to which the preview information will be added
+     * @param content the content to which the preview information will be added
      */
-    void addPreview(VariableElement member, Content contentTree);
+    void addPreview(VariableElement member, Content content);
 
     /**
      * Add the comments for the given enum constant.
      *
      * @param enumConstant the enum constant being documented
-     * @param enumConstantsTree the content tree to which the comments will be added
+     * @param enumConstants the content to which the comments will be added
      */
-    void addComments(VariableElement enumConstant, Content enumConstantsTree);
+    void addComments(VariableElement enumConstant, Content enumConstants);
 
     /**
      * Add the tags for the given enum constant.
      *
      * @param enumConstant the enum constant being documented
-     * @param enumConstantsTree the content tree to which the tags will be added
+     * @param content the content to which the tags will be added
      */
-    void addTags(VariableElement enumConstant, Content enumConstantsTree);
+    void addTags(VariableElement enumConstant, Content content);
 
     /**
-     * Get the enum constants details tree.
+     * Get the enum constants details.
      *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the enum constant details
+     * @param memberDetailsHeader member details header
+     * @param content the content representing member details
+     * @return the enum constant details
      */
-    Content getEnumConstantsDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
+    Content getEnumConstantsDetails(Content memberDetailsHeader, Content content);
 
     /**
-     * Gets the member header tree.
+     * Gets the member header.
      *
-     * @return a content tree for the member header
+     * @return the member header
      */
-    Content getMemberTreeHeader();
+    Content getMemberHeader();
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java
index d171283e8f3..a8d9005b388 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,26 +40,26 @@ import javax.lang.model.element.VariableElement;
 public interface FieldWriter extends MemberWriter {
 
     /**
-     * Get the field details tree header.
+     * Get the field details header.
      *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the field details header
+     * @param content the content representing member details
+     * @return the field details header
      */
-    Content getFieldDetailsTreeHeader(Content memberDetailsTree);
+    Content getFieldDetailsHeader(Content content);
 
     /**
-     * Get the field documentation tree header.
+     * Get the field documentation header.
      *
      * @param field the constructor being documented
-     * @return content tree for the field documentation header
+     * @return the field documentation header
      */
-    Content getFieldDocTreeHeader(VariableElement field);
+    Content getFieldHeaderContent(VariableElement field);
 
     /**
      * Get the signature for the given field.
      *
      * @param field the field being documented
-     * @return content tree for the field signature
+     * @return the field signature
      */
     Content getSignature(VariableElement field);
 
@@ -67,47 +67,47 @@ public interface FieldWriter extends MemberWriter {
      * Add the deprecated output for the given field.
      *
      * @param field the field being documented
-     * @param fieldDocTree content tree to which the deprecated information will be added
+     * @param fieldContent the content to which the deprecated information will be added
      */
-    void addDeprecated(VariableElement field, Content fieldDocTree);
+    void addDeprecated(VariableElement field, Content fieldContent);
 
     /**
      * Adds the preview output for the given member.
      *
      * @param member the member being documented
-     * @param contentTree content tree to which the preview information will be added
+     * @param content the content to which the preview information will be added
      */
-    void addPreview(VariableElement member, Content contentTree);
+    void addPreview(VariableElement member, Content content);
 
     /**
      * Add the comments for the given field.
      *
      * @param field the field being documented
-     * @param fieldDocTree the content tree to which the comments will be added
+     * @param fieldContent the content to which the comments will be added
      */
-    void addComments(VariableElement field, Content fieldDocTree);
+    void addComments(VariableElement field, Content fieldContent);
 
     /**
      * Add the tags for the given field.
      *
      * @param field the field being documented
-     * @param fieldDocTree the content tree to which the tags will be added
+     * @param fieldContent the content to which the tags will be added
      */
-    void addTags(VariableElement field, Content fieldDocTree);
+    void addTags(VariableElement field, Content fieldContent);
 
     /**
-     * Get the field details tree.
+     * Get the field details.
      *
-     * @param memberDetailsTreeHeader the content tree representing member details tree header
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the field details
+     * @param memberDetailsHeaderContent the content representing member details header
+     * @param memberContent the content representing member details
+     * @return the field details
      */
-    Content getFieldDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
+    Content getFieldDetails(Content memberDetailsHeaderContent, Content memberContent);
 
     /**
-     * Gets the member header tree.
+     * Gets the member header.
      *
-     * @return a content tree for the member header
+     * @return the member header
      */
-    Content getMemberTreeHeader();
+    Content getMemberHeader();
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
index 81e68fa1d61..1ae29499258 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,21 +46,21 @@ public interface MemberSummaryWriter {
     /**
      * Returns the member summary header for the given class.
      *
-     * @param typeElement       the class the summary belongs to
-     * @param memberSummaryTree the content tree to which the member summary will be added
+     * @param typeElement the class the summary belongs to
+     * @param content     the content to which the member summary will be added
      *
-     * @return a content tree for the member summary header
+     * @return the member summary header
      */
-    Content getMemberSummaryHeader(TypeElement typeElement, Content memberSummaryTree);
+    Content getMemberSummaryHeader(TypeElement typeElement, Content content);
 
     /**
      * Returns the summary table for the given class.
      *
      * @param typeElement the class the summary table belongs to
      *
-     * @return a content tree for the member summary table
+     * @return the summary table
      */
-    Content getSummaryTableTree(TypeElement typeElement);
+    Content getSummaryTable(TypeElement typeElement);
 
     /**
      * Adds the member summary for the given class and member.
@@ -77,7 +77,7 @@ public interface MemberSummaryWriter {
      *
      * @param typeElement the class the summary belongs to
      *
-     * @return a content tree containing the inherited summary header
+     * @return the inherited member summary header
      */
     Content getInheritedSummaryHeader(TypeElement typeElement);
 
@@ -88,18 +88,18 @@ public interface MemberSummaryWriter {
      * @param member the inherited member that is being documented
      * @param isFirst true if this is the first member in the list
      * @param isLast true if this is the last member in the list
-     * @param linksTree the content tree to which the links will be added
+     * @param content the content to which the links will be added
      */
     void addInheritedMemberSummary(TypeElement typeElement,
                                    Element member, boolean isFirst, boolean isLast,
-                                   Content linksTree);
+                                   Content content);
 
     /**
      * Returns the inherited summary links.
      *
-     * @return a content tree containing the inherited summary links
+     * @return the inherited summary links
      */
-    Content getInheritedSummaryLinksTree();
+    Content getInheritedSummaryLinks();
 
     /**
      * Adds the given summary to the list of summaries.
@@ -110,11 +110,11 @@ public interface MemberSummaryWriter {
     void addSummary(Content summariesList, Content content);
 
     /**
-     * Returns the member tree.
+     * Returns the member content.
      *
-     * @param memberTree the content tree representing the member
+     * @param memberContent the content representing the member
      *
-     * @return a content tree for the member
+     * @return the member content
      */
-    Content getMemberTree(Content memberTree);
+    Content getMember(Content memberContent);
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberWriter.java
index 8919081b469..65a27b5ea2f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,19 +36,17 @@ package jdk.javadoc.internal.doclets.toolkit;
 public interface MemberWriter {
 
     /**
-     * Returns a list to be used for the members of a given kind.
+     * {@return a list to add member items to}
      *
-     * @return a list to be used for the members of a given kind
      * @see #getMemberListItem(Content)
      */
     Content getMemberList();
 
     /**
-     * Returns an item for the list of elements of a given kind.
+     * {@return a member item}
      *
-     * @param content the content tree of the member to be documented
-     * @return an item for the list of elements of a given kind
+     * @param member the member to represent as an item
      * @see #getMemberList()
      */
-    Content getMemberListItem(Content content);
+    Content getMemberListItem(Content member);
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java
index d13ba652ae4..9c7b17fb327 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,26 +40,26 @@ import javax.lang.model.type.TypeMirror;
 public interface MethodWriter extends MemberWriter {
 
     /**
-     * Get the method details tree header.
+     * Get the method details header.
      *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the method details header
+     * @param content the content representing member details
+     * @return the method details header
      */
-    Content getMethodDetailsTreeHeader(Content memberDetailsTree);
+    Content getMethodDetailsHeader(Content content);
 
     /**
-     * Get the method documentation tree header.
+     * Get the method documentation header.
      *
      * @param method the method being documented
-     * @return content tree for the method documentation header
+     * @return the method documentation header
      */
-    Content getMethodDocTreeHeader(ExecutableElement method);
+    Content getMethodHeader(ExecutableElement method);
 
     /**
      * Get the signature for the given method.
      *
      * @param method the method being documented
-     * @return content tree for the method signature
+     * @return the method signature
      */
     Content getSignature(ExecutableElement method);
 
@@ -67,48 +67,48 @@ public interface MethodWriter extends MemberWriter {
      * Add the deprecated output for the given method.
      *
      * @param method the method being documented
-     * @param methodDocTree content tree to which the deprecated information will be added
+     * @param methodContent the content to which the deprecated information will be added
      */
-    void addDeprecated(ExecutableElement method, Content methodDocTree);
+    void addDeprecated(ExecutableElement method, Content methodContent);
 
     /**
      * Adds the preview output for the given member.
      *
      * @param member the member being documented
-     * @param contentTree content tree to which the preview information will be added
+     * @param content the content to which the preview information will be added
      */
-    void addPreview(ExecutableElement member, Content contentTree);
+    void addPreview(ExecutableElement member, Content content);
 
     /**
      * Add the comments for the given method.
      *
      * @param holder the holder type (not erasure) of the method
      * @param method the method being documented
-     * @param methodDocTree the content tree to which the comments will be added
+     * @param methodContent the content to which the comments will be added
      */
-    void addComments(TypeMirror holder, ExecutableElement method, Content methodDocTree);
+    void addComments(TypeMirror holder, ExecutableElement method, Content methodContent);
 
     /**
      * Add the tags for the given method.
      *
      * @param method the method being documented
-     * @param methodDocTree the content tree to which the tags will be added
+     * @param methodContent the content to which the tags will be added
      */
-    void addTags(ExecutableElement method, Content methodDocTree);
+    void addTags(ExecutableElement method, Content methodContent);
 
     /**
-     * Get the method details tree.
+     * Get the method details.
      *
-     * @param methodDetailsTreeHeader the content tree representing method details header
-     * @param methodDetailsTree the content tree representing method details
-     * @return content tree for the method details
+     * @param methodDetailsHeader the content representing method details header
+     * @param methodDetails the content representing method details
+     * @return the method details
      */
-    Content getMethodDetails(Content methodDetailsTreeHeader, Content methodDetailsTree);
+    Content getMethodDetails(Content methodDetailsHeader, Content methodDetails);
 
     /**
-     * Gets the member header tree.
+     * Gets the member header.
      *
-     * @return a content tree for the member header
+     * @return the member header
      */
-    Content getMemberTreeHeader();
+    Content getMemberHeader();
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java
index af00cd19baa..92b9983c891 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ModuleSummaryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,47 +42,47 @@ public interface ModuleSummaryWriter {
      * Get the header for the summary.
      *
      * @param heading module name.
-     * @return the header to be added to the content tree
+     * @return the header to be added to the content
      */
     Content getModuleHeader(String heading);
 
     /**
      * Get the header for the module content.
      *
-     * @return a content tree for the module content header
+     * @return the module content header
      */
     Content getContentHeader();
 
     /**
      * Get the header for the summary header.
      *
-     * @return a content tree with the summary header
+     * @return the summary header
      */
     Content getSummariesList();
 
     /**
-     * Get the header for the summary tree.
+     * Wrap the content into summary section.
      *
-     * @param summaryContentTree the content tree.
-     * @return a content tree with the summary tree
+     * @param source the content to wrap into the summary section
+     * @return the summary
      */
-    Content getSummaryTree(Content summaryContentTree);
+    Content getSummary(Content source);
 
     /**
      * Adds the module description.
      *
-     * @param moduleContentTree the content tree to which the module description
-     *                           will be added
+     * @param moduleContent the content to which the module description
+     *                      will be added
      */
-    void addModuleDescription(Content moduleContentTree);
+    void addModuleDescription(Content moduleContent);
 
     /**
      * Adds the module signature.
      *
-     * @param moduleContentTree the content tree to which the module signature
-     *                           will be added
+     * @param moduleContent the content to which the module signature
+     *                      will be added
      */
-    void addModuleSignature(Content moduleContentTree);
+    void addModuleSignature(Content moduleContent);
 
     /**
      * Adds the summary of modules to the list of summaries.
@@ -106,22 +106,22 @@ public interface ModuleSummaryWriter {
     void addServicesSummary(Content summariesList);
 
     /**
-     * Adds the module content tree to the documentation tree.
+     * Adds the module content to the documentation.
      *
-     * @param moduleContentTree the content tree that will be added
+     * @param source the content that will be added
      */
-    void addModuleContent(Content moduleContentTree);
+    void addModuleContent(Content source);
 
     /**
-     * Adds the footer to the documentation tree.
+     * Adds the footer to the documentation.
      */
     void addModuleFooter();
 
     /**
      * Print the module summary document.
      *
-     * @param contentTree the content tree that will be printed
+     * @param content the content that will be printed
      * @throws DocFileIOException if there is a problem while writing the document
      */
-    void printDocument(Content contentTree) throws DocFileIOException;
+    void printDocument(Content content) throws DocFileIOException;
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java
index 96351ff66a9..9084cd9397a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PackageSummaryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,89 +47,87 @@ public interface PackageSummaryWriter {
     /**
      * Get the header for the summary.
      *
-     * @return the header to be added to the content tree
+     * @return the header to be added to the content
      */
     Content getPackageHeader();
 
     /**
      * Get the header for the package content.
      *
-     * @return a content tree for the package content header
+     * @return the package content header
      */
     Content getContentHeader();
 
     /**
      * Get the header for the package summary.
      *
-     * @return a content tree with the package summary header
+     * @return the package summary header
      */
     Content getSummariesList();
 
     /**
-     * Adds the table of related packages to the documentation tree.
+     * Adds the table of related packages to the documentation.
      *
-     * @param summaryContentTree the content tree to which the summaries will be added
+     * @param summaryContent the content to which the summaries will be added
      */
-    void addRelatedPackagesSummary(Content summaryContentTree);
+    void addRelatedPackagesSummary(Content summaryContent);
 
     /**
-     * Adds the table of all classes and interfaces to the documentation tree.
+     * Adds the table of all classes and interfaces to the documentation.
      *
-     * @param summaryContentTree the content tree to which the summaries will be added
+     * @param summaryContent the content to which the summaries will be added
      */
-    void addAllClassesAndInterfacesSummary(Content summaryContentTree);
+    void addAllClassesAndInterfacesSummary(Content summaryContent);
 
     /**
-     * Adds the package description from the "packages.html" file to the documentation
-     * tree.
+     * Adds the package description from the "packages.html" file to the documentation.
      *
-     * @param packageContentTree the content tree to which the package description
-     *                           will be added
+     * @param packageContent the content to which the package description
+     *                       will be added
      */
-    void addPackageDescription(Content packageContentTree);
+    void addPackageDescription(Content packageContent);
 
     /**
-     * Adds the tag information from the "packages.html" file to the documentation
-     * tree.
+     * Adds the tag information from the "packages.html" file to the documentation.
      *
-     * @param packageContentTree the content tree to which the package tags will
-     *                           be added
+     * @param packageContent the content to which the package tags will
+     *                       be added
      */
-    void addPackageTags(Content packageContentTree);
+    void addPackageTags(Content packageContent);
 
     /**
      * Adds the package signature.
      *
-     * @param packageContentTree the content tree to which the package signature
-     *                           will be added
+     * @param packageContent the content to which the package signature
+     *                       will be added
      */
-    void addPackageSignature(Content packageContentTree);
+    void addPackageSignature(Content packageContent);
 
     /**
      * Adds the tag information from the "packages.html" or "package-info.java" file to the
-     * documentation tree.
+     * documentation.
      *
-     * @param packageContentTree the package content tree to be added
+     * @param packageContent the package content to be added
      */
-    void addPackageContent(Content packageContentTree);
+    void addPackageContent(Content packageContent);
 
     /**
-     * Adds the footer to the documentation tree.
+     * Adds the footer to the documentation.
      */
     void addPackageFooter();
 
     /**
      * Print the package summary document.
      *
-     * @param contentTree the content tree that will be printed
+     * @param content the content that will be printed
      * @throws DocFileIOException if there is a problem while writing the document
      */
-    void printDocument(Content contentTree) throws DocFileIOException;
+    void printDocument(Content content) throws DocFileIOException;
 
     /**
-     * Gets the package summary tree.
-     * @param summaryContentTree the content tree representing the package summary
-     * @return a content tree for the package summary
+     * Gets the package summary.
+     * @param summaryContent the content representing the package summary
+     * @return the package summary
      */
-    Content getPackageSummary(Content summaryContentTree);
+    Content getPackageSummary(Content summaryContent);
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
index 46875b73e2c..db20c1c35d0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,26 +39,26 @@ import javax.lang.model.element.ExecutableElement;
 public interface PropertyWriter extends MemberWriter {
 
     /**
-     * Get the property details tree header.
+     * Get the property details header.
      *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the property details header
+     * @param memberDetails the content representing member details
+     * @return the property details header
      */
-    Content getPropertyDetailsTreeHeader(Content memberDetailsTree);
+    Content getPropertyDetailsHeader(Content memberDetails);
 
     /**
-     * Get the property documentation tree header.
+     * Get the property documentation header.
      *
      * @param property the property being documented
-     * @return content tree for the property documentation header
+     * @return the property documentation header
      */
-    Content getPropertyDocTreeHeader(ExecutableElement property);
+    Content getPropertyHeaderContent(ExecutableElement property);
 
     /**
      * Get the signature for the given property.
      *
      * @param property the property being documented
-     * @return content tree for the property signature
+     * @return the property signature
      */
     Content getSignature(ExecutableElement property);
 
@@ -66,47 +66,40 @@ public interface PropertyWriter extends MemberWriter {
      * Add the deprecated output for the given property.
      *
      * @param property the property being documented
-     * @param propertyDocTree content tree to which the deprecated information will be added
+     * @param propertyContent content to which the deprecated information will be added
      */
-    void addDeprecated(ExecutableElement property, Content propertyDocTree);
+    void addDeprecated(ExecutableElement property, Content propertyContent);
 
     /**
      * Add the preview output for the given member.
      *
      * @param member the member being documented
-     * @param contentTree content tree to which the preview information will be added
+     * @param content the content to which the preview information will be added
      */
-    void addPreview(ExecutableElement member, Content contentTree);
+    void addPreview(ExecutableElement member, Content content);
 
     /**
      * Add the comments for the given property.
      *
      * @param property the property being documented
-     * @param propertyDocTree the content tree to which the comments will be added
+     * @param propertyContent the content to which the comments will be added
      */
-    void addComments(ExecutableElement property, Content propertyDocTree);
+    void addComments(ExecutableElement property, Content propertyContent);
 
     /**
      * Add the tags for the given property.
      *
      * @param property the property being documented
-     * @param propertyDocTree the content tree to which the tags will be added
+     * @param propertyContent the content to which the tags will be added
      */
-    void addTags(ExecutableElement property, Content propertyDocTree);
+    void addTags(ExecutableElement property, Content propertyContent);
 
     /**
-     * Get the property details tree.
+     * Get the property details.
      *
-     * @param memberDetailsTreeHeader the content tree representing member details header
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the property details
+     * @param memberDetailsHeader the content representing member details header
+     * @param memberDetails the content representing member details
+     * @return the property details
      */
-    Content getPropertyDetails(Content memberDetailsTreeHeader, Content memberDetailsTree);
-
-    /**
-     * Gets the member header tree.
-     *
-     * @return a content tree for the member header
-     */
-    Content getMemberTreeHeader();
+    Content getPropertyDetails(Content memberDetailsHeader, Content memberDetails);
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java
index ee1329e7428..079bca5a04a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/SerializedFormWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,59 +49,53 @@ public interface SerializedFormWriter {
      * Get the header.
      *
      * @param header the header to write.
-     * @return the header content tree
+     * @return the header content
      */
     Content getHeader(String header);
 
     /**
      * Get the serialized form summaries header.
      *
-     * @return the serialized form summary header tree
+     * @return the serialized form summary header
      */
     Content getSerializedSummariesHeader();
 
     /**
      * Get the package serialized form header.
      *
-     * @return the package serialized form header tree
+     * @return the package serialized form header
      */
     Content getPackageSerializedHeader();
 
     /**
-     * Add the serialized tree per package to the serialized summaries tree.
+     * Add the serialized package to the serialized summaries.
      *
-     * @param serializedSummariesTree the serialized tree to which the package serialized tree will be added
-     * @param packageSerializedTree the serialized tree per package that needs to be added
+     * @param serializedSummaries the serialized content to which the package serialized content will be added
+     * @param packageSerialized the serialized content per package that needs to be added
      */
-    void addPackageSerializedTree(Content serializedSummariesTree, Content packageSerializedTree);
+    void addPackageSerialized(Content serializedSummaries, Content packageSerialized);
 
     /**
-     * Get the given package header.
+     * {@return a header for the given package}
      *
      * @param packageElement the package element to write
-     * @return a content tree for the package header
      */
     Content getPackageHeader(PackageElement packageElement);
 
     /**
-     * Get the serialized class header.
-     *
-     * @return a content tree for the serialized class header
+     * {@return the serialized class header}
      */
     Content getClassSerializedHeader();
 
     /**
-     * Get the heading for the serializable class.
+     * {@return the heading for the serializable class}
      *
      * @param typeElement the class being processed
-     * @return a content tree for the class heading
      */
     Content getClassHeader(TypeElement typeElement);
 
     /**
-     * Get the serial UID info header.
-     *
-     * @return a content tree for the serial uid info header
+     * {@return the serial UID info header}
      */
     Content getSerialUIDInfoHeader();
 
@@ -110,14 +104,12 @@ public interface SerializedFormWriter {
      *
      * @param header the header that will show up before the UID.
      * @param serialUID the serial UID to print.
-     * @param serialUidTree the serial UID tree to which the content will be added.
+     * @param target the serial UID to which the content will be added.
      */
-    void addSerialUIDInfo(String header, String serialUID, Content serialUidTree);
+    void addSerialUIDInfo(String header, String serialUID, Content target);
 
     /**
-     * Get the class serialize content header.
-     *
-     * @return a content tree for the class serialize content header
+     * {@return the serialized class header}
      */
     Content getClassContentHeader();
 
@@ -140,9 +132,9 @@ public interface SerializedFormWriter {
     /**
      * Add the serialized content to the body content.
      *
-     * @param serializedTreeContent content for serialized data
+     * @param source content for serialized data
      */
-    void addSerializedContent(Content serializedTreeContent);
+    void addSerializedContent(Content source);
 
     /**
      * Add the footer.
@@ -152,89 +144,86 @@ public interface SerializedFormWriter {
     /**
      * Print the serialized form document.
      *
-     * @param serializedTree the content tree that will be printed
+     * @param source the content that will be printed
      * @throws DocFileIOException if there is a problem while writing the document
      */
-    void printDocument(Content serializedTree) throws DocFileIOException;
+    void printDocument(Content source) throws DocFileIOException;
 
     /**
-     * Gets the member tree.
+     * Gets the member.
      *
-     * @param contentTree the tree used to generate the complete member tree
-     * @return a content tree for the member
+     * @param content the content used to generate the complete member
+     * @return the member
      */
-    Content getMemberTree(Content contentTree);
+    Content getMember(Content content);
 
     /**
-     * Write the serialized form for a given field.
+     * A writer for the serialized form for a given field.
      */
     interface SerialFieldWriter {
 
         /**
-         * Get the serializable field header.
-         *
-         * @return serialized fields header content tree
+         * {@return the serializable field header}
          */
         Content getSerializableFieldsHeader();
 
         /**
-         * Get the field content header.
+         * {@return the field content header}
          *
          * @param isLastContent true if this is the last content to be documented
-         * @return fields header content tree
          */
         Content getFieldsContentHeader(boolean isLastContent);
 
         /**
-         * Get the fields content.
+         * {@return the fields}
          *
          * @param heading the heading to write.
-         * @param contentTree content tree to which the heading will be added
-         * @return serializable fields content tree
+         * @param content the content to be added
+         * @return serializable fields content
          */
-        Content getSerializableFields(String heading, Content contentTree);
+        Content getSerializableFields(String heading, Content content);
 
         /**
          * Adds the deprecated information for this member.
          *
          * @param field the field to document.
-         * @param contentTree content tree to which the deprecated information will be added
+         * @param content the content to which the deprecated information will be added
          */
-        void addMemberDeprecatedInfo(VariableElement field, Content contentTree);
+        void addMemberDeprecatedInfo(VariableElement field, Content content);
 
         /**
          * Adds the description text for this member.
          *
          * @param field the field to document
-         * @param contentTree content tree to which the member description will be added
+         * @param content the content to which the member description will be added
          */
-        void addMemberDescription(VariableElement field, Content contentTree);
+        void addMemberDescription(VariableElement field, Content content);
 
         /**
          * Adds the description text for this member represented by the tag.
          *
          * @param field the field to document
          * @param serialFieldTag the field to document (represented by tag)
-         * @param contentTree content tree to which the member description will be added
+         * @param content the content to which the member description will be added
          */
-        void addMemberDescription(VariableElement field, DocTree serialFieldTag, Content contentTree);
+        void addMemberDescription(VariableElement field, DocTree serialFieldTag, Content content);
 
         /**
          * Adds the tag information for this member.
          *
          * @param field the field to document
-         * @param contentTree content tree to which the member tags will be added
+         * @param content the content to which the member tags will be added
          */
-        void addMemberTags(VariableElement field, Content contentTree);
+        void addMemberTags(VariableElement field, Content content);
 
         /**
          * Adds the member header.
          *
          * @param fieldType the type of the field
          * @param fieldName the name of the field
-         * @param contentTree content tree to which the member header will be added
+         * @param content the content to which the member header will be added
          */
-        void addMemberHeader(TypeMirror fieldType, String fieldName, Content contentTree);
+        void addMemberHeader(TypeMirror fieldType, String fieldName, Content content);
 
         /**
          * Check to see if overview details should be printed. If
@@ -254,34 +243,31 @@ public interface SerializedFormWriter {
     interface SerialMethodWriter {
 
         /**
-         * Get the serializable method header.
-         *
-         * @return serializable methods content tree
+         * {@return the header for serializable methods section}
          */
         Content getSerializableMethodsHeader();
 
         /**
-         * Get the method content header.
+         * {@return the header for serializable methods content section}
          *
-         * @param isLastContent true if this is the last content to be documented
-         * @return methods content tree
+         * @param isLastContent true if the content being documented is the last content
          */
         Content getMethodsContentHeader(boolean isLastContent);
 
         /**
-         * Write the given heading.
+         * Gets the given heading.
          *
          * @param heading the heading to write
-         * @param serializableMethodTree content tree which will be added
-         * @return serializable methods content tree
+         * @param source the content which will be added
+         * @return a serializable methods content
          */
-        Content getSerializableMethods(String heading, Content serializableMethodTree);
+        Content getSerializableMethods(String heading, Content source);
 
         /**
-         * Write a warning that no serializable methods exist.
+         * Gets a warning that no serializable methods exist.
          *
          * @param msg the warning to print
-         * @return no customization message tree
+         * @return a no customization message
          */
         Content getNoCustomizationMsg(String msg);
 
@@ -289,35 +275,35 @@ public interface SerializedFormWriter {
          * Adds the header.
          *
          * @param member the member to write the header for
-         * @param methodsContentTree content tree to which the header will be added
+         * @param methodsContent the content to which the header will be added
          */
-        void addMemberHeader(ExecutableElement member, Content methodsContentTree);
+        void addMemberHeader(ExecutableElement member, Content methodsContent);
 
         /**
          * Adds the deprecated information for this member.
          *
          * @param member the member to write the deprecated information for
-         * @param methodsContentTree content tree to which the deprecated
+         * @param methodsContent the content to which the deprecated
          * information will be added
          */
-        void addDeprecatedMemberInfo(ExecutableElement member, Content methodsContentTree);
+        void addDeprecatedMemberInfo(ExecutableElement member, Content methodsContent);
 
         /**
          * Adds the description for this member.
          *
          * @param member the member to write the information for
-         * @param methodsContentTree content tree to which the member
+         * @param methodsContent the content to which the member
          * information will be added
          */
-        void addMemberDescription(ExecutableElement member, Content methodsContentTree);
+        void addMemberDescription(ExecutableElement member, Content methodsContent);
 
         /**
          * Adds the tag information for this member.
          *
          * @param member the member to write the tags information for
-         * @param methodsContentTree content tree to which the tags
+         * @param methodsContent the content to which the tags
          * information will be added
          */
-        void addMemberTags(ExecutableElement member, Content methodsContentTree);
+        void addMemberTags(ExecutableElement member, Content methodsContent);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java
index 7a8d5102592..13ecb806a00 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AbstractMemberBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,13 +73,12 @@ public abstract class AbstractMemberBuilder extends AbstractBuilder {
     }
 
     /**
-     *
      * Build the documentation.
      *
-     * @param contentTree The content tree into which to add the documentation
-     * @throws DocletException  if there is a problem building the documentation
+     * @param target the content into which to add the documentation
+     * @throws DocletException if there is a problem building the documentation
      */
-    public abstract void build(Content contentTree) throws DocletException;
+    public abstract void build(Content target) throws DocletException;
 
     /**
      * Returns true if this subbuilder has anything to document.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeMemberBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeMemberBuilder.java
index ca2804c0d08..4a1c12c1636 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeMemberBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeMemberBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -106,100 +106,100 @@ public class AnnotationTypeMemberBuilder extends AbstractMemberBuilder {
     }
 
     @Override
-    public void build(Content contentTree) throws DocletException {
-        buildAnnotationTypeMember(contentTree);
+    public void build(Content target) throws DocletException {
+        buildAnnotationTypeMember(target);
     }
 
     /**
      * Build the member documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if an error occurs
      */
-    protected void buildAnnotationTypeMember(Content detailsList)
+    protected void buildAnnotationTypeMember(Content target)
             throws DocletException {
         if (hasMembersToDocument()) {
-            writer.addAnnotationDetailsMarker(detailsList);
-            Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader();
+            writer.addAnnotationDetailsMarker(target);
+            Content annotationDetailsHeader = writer.getAnnotationDetailsHeader();
             Content memberList = writer.getMemberList();
 
             for (Element member : members) {
                 currentMember = member;
-                Content annotationDocTree = writer.getAnnotationDocTreeHeader(currentMember);
+                Content annotationContent = writer.getAnnotationHeaderContent(currentMember);
 
-                buildAnnotationTypeMemberChildren(annotationDocTree);
+                buildAnnotationTypeMemberChildren(annotationContent);
 
-                memberList.add(writer.getMemberListItem(annotationDocTree));
+                memberList.add(writer.getMemberListItem(annotationContent));
             }
-            Content annotationDetails = writer.getAnnotationDetails(annotationDetailsTreeHeader, memberList);
-            detailsList.add(annotationDetails);
+            Content annotationDetails = writer.getAnnotationDetails(annotationDetailsHeader, memberList);
+            target.add(annotationDetails);
         }
     }
 
-    protected void buildAnnotationTypeMemberChildren(Content annotationDocTree) {
-        buildSignature(annotationDocTree);
-        buildDeprecationInfo(annotationDocTree);
-        buildPreviewInfo(annotationDocTree);
-        buildMemberComments(annotationDocTree);
-        buildTagInfo(annotationDocTree);
-        buildDefaultValueInfo(annotationDocTree);
+    protected void buildAnnotationTypeMemberChildren(Content annotationContent) {
+        buildSignature(annotationContent);
+        buildDeprecationInfo(annotationContent);
+        buildPreviewInfo(annotationContent);
+        buildMemberComments(annotationContent);
+        buildTagInfo(annotationContent);
+        buildDefaultValueInfo(annotationContent);
     }
 
     /**
      * Build the signature.
      *
-     * @param annotationDocTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildSignature(Content annotationDocTree) {
-        annotationDocTree.add(writer.getSignature(currentMember));
+    protected void buildSignature(Content target) {
+        target.add(writer.getSignature(currentMember));
     }
 
     /**
      * Build the deprecation information.
      *
-     * @param annotationDocTree the content tree to which the documentation will be added
+     * @param annotationContent the content to which the documentation will be added
      */
-    protected void buildDeprecationInfo(Content annotationDocTree) {
-        writer.addDeprecated(currentMember, annotationDocTree);
+    protected void buildDeprecationInfo(Content annotationContent) {
+        writer.addDeprecated(currentMember, annotationContent);
     }
 
     /**
      * Build the preview information.
      *
-     * @param annotationDocTree the content tree to which the documentation will be added
+     * @param annotationContent the content to which the documentation will be added
      */
-    protected void buildPreviewInfo(Content annotationDocTree) {
-        writer.addPreview(currentMember, annotationDocTree);
+    protected void buildPreviewInfo(Content annotationContent) {
+        writer.addPreview(currentMember, annotationContent);
     }
 
     /**
      * Build the comments for the member.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
      *
-     * @param annotationDocTree the content tree to which the documentation will be added
+     * @param annotationContent the content to which the documentation will be added
      */
-    protected void buildMemberComments(Content annotationDocTree) {
+    protected void buildMemberComments(Content annotationContent) {
         if (!options.noComment()) {
-            writer.addComments(currentMember, annotationDocTree);
+            writer.addComments(currentMember, annotationContent);
         }
     }
 
     /**
      * Build the tag information.
      *
-     * @param annotationDocTree the content tree to which the documentation will be added
+     * @param annotationContent the content to which the documentation will be added
      */
-    protected void buildTagInfo(Content annotationDocTree) {
-        writer.addTags(currentMember, annotationDocTree);
+    protected void buildTagInfo(Content annotationContent) {
+        writer.addTags(currentMember, annotationContent);
     }
 
     /**
      * Build the default value for this optional member.
      *
-     * @param annotationDocTree the content tree to which the documentation will be added
+     * @param annotationContent the content to which the documentation will be added
      */
-    protected void buildDefaultValueInfo(Content annotationDocTree) {
-        writer.addDefaultValueInfo(currentMember, annotationDocTree);
+    protected void buildDefaultValueInfo(Content annotationContent) {
+        writer.addDefaultValueInfo(currentMember, annotationContent);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java
index 0d3e881adac..2e7fd16e2d1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java
@@ -66,11 +66,6 @@ public class ClassBuilder extends AbstractBuilder {
      */
     private final ClassWriter writer;
 
-    /**
-     * The content tree for the class documentation.
-     */
-    private Content contentTree;
-
     private final Utils utils;
 
     /**
@@ -122,133 +117,133 @@ public class ClassBuilder extends AbstractBuilder {
             case CLASS           -> "doclet.Class";
             default -> throw new IllegalStateException(typeElement.getKind() + " " + typeElement);
         };
-        Content contentTree = writer.getHeader(resources.getText(key) + " "
+        Content content = writer.getHeader(resources.getText(key) + " "
                 + utils.getSimpleName(typeElement));
-        Content classContentTree = writer.getClassContentHeader();
+        Content classContent = writer.getClassContentHeader();
 
-        buildClassTree(classContentTree);
-        buildClassInfo(classContentTree);
-        buildMemberSummary(classContentTree);
-        buildMemberDetails(classContentTree);
+        buildClassTree(classContent);
+        buildClassInfo(classContent);
+        buildMemberSummary(classContent);
+        buildMemberDetails(classContent);
 
-        writer.addClassContentTree(classContentTree);
+        writer.addClassContent(classContent);
         writer.addFooter();
-        writer.printDocument(contentTree);
+        writer.printDocument(content);
         copyDocFiles();
     }
 
     /**
-     * Build the class tree documentation.
+     * Build the class inheritance tree documentation.
      *
-     * @param classContentTree the content tree to which the documentation will be added
+     * @param classContent the content to which the documentation will be added
      */
-    protected void buildClassTree(Content classContentTree) {
-        writer.addClassTree(classContentTree);
+    protected void buildClassTree(Content classContent) {
+        writer.addClassTree(classContent);
     }
 
     /**
-     * Build the class information tree documentation.
+     * Build the class information documentation.
      *
-     * @param classContentTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildClassInfo(Content classContentTree) throws DocletException {
-        Content classInfoTree = new ContentBuilder();
-        buildParamInfo(classInfoTree);
-        buildSuperInterfacesInfo(classInfoTree);
-        buildImplementedInterfacesInfo(classInfoTree);
-        buildSubClassInfo(classInfoTree);
-        buildSubInterfacesInfo(classInfoTree);
-        buildInterfaceUsageInfo(classInfoTree);
-        buildNestedClassInfo(classInfoTree);
-        buildFunctionalInterfaceInfo(classInfoTree);
-        buildClassSignature(classInfoTree);
-        buildDeprecationInfo(classInfoTree);
-        buildClassDescription(classInfoTree);
-        buildClassTagInfo(classInfoTree);
-
-        classContentTree.add(writer.getClassInfo(classInfoTree));
+    protected void buildClassInfo(Content target) throws DocletException {
+        Content c = new ContentBuilder();
+        buildParamInfo(c);
+        buildSuperInterfacesInfo(c);
+        buildImplementedInterfacesInfo(c);
+        buildSubClassInfo(c);
+        buildSubInterfacesInfo(c);
+        buildInterfaceUsageInfo(c);
+        buildNestedClassInfo(c);
+        buildFunctionalInterfaceInfo(c);
+        buildClassSignature(c);
+        buildDeprecationInfo(c);
+        buildClassDescription(c);
+        buildClassTagInfo(c);
+
+        target.add(writer.getClassInfo(c));
     }
 
     /**
      * Build the type parameters and state components of this class.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildParamInfo(Content classInfoTree) {
-        writer.addParamInfo(classInfoTree);
+    protected void buildParamInfo(Content target) {
+        writer.addParamInfo(target);
     }
 
     /**
      * If this is an interface, list all super interfaces.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildSuperInterfacesInfo(Content classInfoTree) {
-        writer.addSuperInterfacesInfo(classInfoTree);
+    protected void buildSuperInterfacesInfo(Content target) {
+        writer.addSuperInterfacesInfo(target);
     }
 
     /**
      * If this is a class, list all interfaces implemented by this class.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildImplementedInterfacesInfo(Content classInfoTree) {
-        writer.addImplementedInterfacesInfo(classInfoTree);
+    protected void buildImplementedInterfacesInfo(Content target) {
+        writer.addImplementedInterfacesInfo(target);
     }
 
     /**
-     * List all the classes extend this one.
+     * List all the classes that extend this one.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildSubClassInfo(Content classInfoTree) {
-        writer.addSubClassInfo(classInfoTree);
+    protected void buildSubClassInfo(Content target) {
+        writer.addSubClassInfo(target);
     }
 
     /**
      * List all the interfaces that extend this one.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildSubInterfacesInfo(Content classInfoTree) {
-        writer.addSubInterfacesInfo(classInfoTree);
+    protected void buildSubInterfacesInfo(Content target) {
+        writer.addSubInterfacesInfo(target);
     }
 
     /**
      * If this is an interface, list all classes that implement this interface.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildInterfaceUsageInfo(Content classInfoTree) {
-        writer.addInterfaceUsageInfo(classInfoTree);
+    protected void buildInterfaceUsageInfo(Content target) {
+        writer.addInterfaceUsageInfo(target);
     }
 
     /**
      * If this is an functional interface, display appropriate message.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildFunctionalInterfaceInfo(Content classInfoTree) {
-        writer.addFunctionalInterfaceInfo(classInfoTree);
+    protected void buildFunctionalInterfaceInfo(Content target) {
+        writer.addFunctionalInterfaceInfo(target);
     }
 
     /**
      * If this class is deprecated, build the appropriate information.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildDeprecationInfo(Content classInfoTree) {
-        writer.addClassDeprecationInfo(classInfoTree);
+    protected void buildDeprecationInfo(Content target) {
+        writer.addClassDeprecationInfo(target);
     }
 
     /**
      * If this is an inner class or interface, list the enclosing class or interface.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildNestedClassInfo(Content classInfoTree) {
-        writer.addNestedClassInfo(classInfoTree);
+    protected void buildNestedClassInfo(Content target) {
+        writer.addNestedClassInfo(target);
     }
 
     /**
@@ -275,49 +270,49 @@ public class ClassBuilder extends AbstractBuilder {
     /**
      * Build the signature of the current class.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildClassSignature(Content classInfoTree) {
-        writer.addClassSignature(classInfoTree);
+    protected void buildClassSignature(Content target) {
+        writer.addClassSignature(target);
     }
 
     /**
      * Build the class description.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildClassDescription(Content classInfoTree) {
-        writer.addClassDescription(classInfoTree);
+    protected void buildClassDescription(Content target) {
+        writer.addClassDescription(target);
     }
 
     /**
      * Build the tag information for the current class.
      *
-     * @param classInfoTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildClassTagInfo(Content classInfoTree) {
-        writer.addClassTagInfo(classInfoTree);
+    protected void buildClassTagInfo(Content target) {
+        writer.addClassTagInfo(target);
     }
 
     /**
      * Build the member summary contents of the page.
      *
-     * @param classContentTree the content tree to which the documentation will be added
+     * @param classContent the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildMemberSummary(Content classContentTree) throws DocletException {
+    protected void buildMemberSummary(Content classContent) throws DocletException {
         Content summariesList = writer.getSummariesList();
         builderFactory.getMemberSummaryBuilder(writer).build(summariesList);
-        classContentTree.add(writer.getMemberSummaryTree(summariesList));
+        classContent.add(writer.getMemberSummary(summariesList));
     }
 
     /**
      * Build the member details contents of the page.
      *
-     * @param classContentTree the content tree to which the documentation will be added
+     * @param classContent the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildMemberDetails(Content classContentTree) throws DocletException {
+    protected void buildMemberDetails(Content classContent) throws DocletException {
         Content detailsList = writer.getDetailsList();
 
         buildEnumConstantsDetails(detailsList);
@@ -327,13 +322,13 @@ public class ClassBuilder extends AbstractBuilder {
         buildAnnotationTypeMemberDetails(detailsList);
         buildMethodDetails(detailsList);
 
-        classContentTree.add(writer.getMemberDetailsTree(detailsList));
+        classContent.add(writer.getMemberDetails(detailsList));
     }
 
     /**
      * Build the enum constants documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param detailsList the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildEnumConstantsDetails(Content detailsList) throws DocletException {
@@ -343,7 +338,7 @@ public class ClassBuilder extends AbstractBuilder {
     /**
      * Build the field documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param detailsList the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildFieldDetails(Content detailsList) throws DocletException {
@@ -353,7 +348,7 @@ public class ClassBuilder extends AbstractBuilder {
     /**
      * Build the property documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param detailsList the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
     public void buildPropertyDetails( Content detailsList) throws DocletException {
@@ -363,7 +358,7 @@ public class ClassBuilder extends AbstractBuilder {
     /**
      * Build the constructor documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param detailsList the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildConstructorDetails(Content detailsList) throws DocletException {
@@ -373,7 +368,7 @@ public class ClassBuilder extends AbstractBuilder {
     /**
      * Build the method documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param detailsList the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildMethodDetails(Content detailsList) throws DocletException {
@@ -383,12 +378,12 @@ public class ClassBuilder extends AbstractBuilder {
     /**
      * Build the annotation type optional member documentation.
      *
-     * @param memberDetailsTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem building the documentation
      */
-    protected void buildAnnotationTypeMemberDetails(Content memberDetailsTree)
+    protected void buildAnnotationTypeMemberDetails(Content target)
             throws DocletException {
-        builderFactory.getAnnotationTypeMemberBuilder(writer).build(memberDetailsTree);
+        builderFactory.getAnnotationTypeMemberBuilder(writer).build(target);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java
index e4beda06aee..739b2960727 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstantsSummaryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,27 +127,27 @@ public class ConstantsSummaryBuilder extends AbstractBuilder {
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildConstantSummary() throws DocletException {
-        Content contentTree = writer.getHeader();
+        Content content = writer.getHeader();
 
         buildContents();
         buildConstantSummaries();
 
         writer.addFooter();
-        writer.printDocument(contentTree);
+        writer.printDocument(content);
     }
 
     /**
      * Build the list of packages.
      */
     protected void buildContents() {
-        Content contentListTree = writer.getContentsHeader();
+        Content contentList = writer.getContentsHeader();
         printedPackageHeaders.clear();
         for (PackageElement pkg : configuration.packages) {
             if (hasConstantField(pkg) && !hasPrintedPackageIndex(pkg)) {
-                writer.addLinkToPackageContent(pkg, printedPackageHeaders, contentListTree);
+                writer.addLinkToPackageContent(pkg, printedPackageHeaders, contentList);
             }
         }
-        writer.addContentsList(contentListTree);
+        writer.addContentsList(contentList);
     }
 
     /**
@@ -157,30 +157,30 @@ public class ConstantsSummaryBuilder extends AbstractBuilder {
      */
     protected void buildConstantSummaries() throws DocletException {
         printedPackageHeaders.clear();
-        Content summariesTree = writer.getConstantSummaries();
+        Content summaries = writer.getConstantSummaries();
         for (PackageElement aPackage : configuration.packages) {
             if (hasConstantField(aPackage)) {
                 currentPackage = aPackage;
                 //Build the documentation for the current package.
 
-                buildPackageHeader(summariesTree);
-                buildClassConstantSummary(summariesTree);
+                buildPackageHeader(summaries);
+                buildClassConstantSummary();
 
                 first = false;
             }
         }
-        writer.addConstantSummaries(summariesTree);
+        writer.addConstantSummaries(summaries);
     }
 
     /**
      * Build the header for the given package.
      *
-     * @param summariesTree the tree to which the package header will be added
+     * @param target the content to which the package header will be added
      */
-    protected void buildPackageHeader(Content summariesTree) {
+    protected void buildPackageHeader(Content target) {
         PackageElement abbrevPkg = configuration.workArounds.getAbbreviatedPackageElement(currentPackage);
         if (!printedPackageHeaders.contains(abbrevPkg)) {
-            writer.addPackageName(currentPackage, summariesTree, first);
+            writer.addPackageName(currentPackage, target, first);
             printedPackageHeaders.add(abbrevPkg);
         }
     }
@@ -188,16 +188,14 @@ public class ConstantsSummaryBuilder extends AbstractBuilder {
     /**
      * Build the summary for the current class.
      *
-     * @param summariesTree the tree to which the class constant summary will be added
      * @throws DocletException if there is a problem while building the documentation
-     *
      */
-    protected void buildClassConstantSummary(Content summariesTree)
+    protected void buildClassConstantSummary()
             throws DocletException {
         SortedSet<TypeElement> classes = !currentPackage.isUnnamed()
                 ? utils.getAllClasses(currentPackage)
                 : configuration.typeElementCatalog.allUnnamedClasses();
-        Content classConstantTree = writer.getClassConstantHeader();
+        Content classConstantHeader = writer.getClassConstantHeader();
         for (TypeElement te : classes) {
             if (!typeElementsWithConstFields.contains(te) ||
                 !utils.isIncluded(te)) {
@@ -206,20 +204,20 @@ public class ConstantsSummaryBuilder extends AbstractBuilder {
             currentClass = te;
             //Build the documentation for the current class.
 
-            buildConstantMembers(classConstantTree);
+            buildConstantMembers(classConstantHeader);
 
         }
-        writer.addClassConstant(summariesTree, classConstantTree);
+        writer.addClassConstant(classConstantHeader);
     }
 
     /**
      * Build the summary of constant members in the class.
      *
-     * @param classConstantTree the tree to which the constant members table
-     *                          will be added
+     * @param target the content to which the constant members table
+     *               will be added
      */
-    protected void buildConstantMembers(Content classConstantTree) {
-        new ConstantFieldBuilder(currentClass).buildMembersSummary(classConstantTree);
+    protected void buildConstantMembers(Content target) {
+        new ConstantFieldBuilder(currentClass).buildMembersSummary(target);
     }
 
     /**
@@ -296,13 +294,13 @@ public class ConstantsSummaryBuilder extends AbstractBuilder {
         /**
          * Builds the table of constants for a given class.
          *
-         * @param classConstantTree the tree to which the class constants table
-         *                          will be added
+         * @param target the content to which the class constants table
+         *               will be added
          */
-        protected void buildMembersSummary(Content classConstantTree) {
+        protected void buildMembersSummary(Content target) {
             SortedSet<VariableElement> members = members();
             if (!members.isEmpty()) {
-                writer.addConstantMembers(typeElement, members, classConstantTree);
+                writer.addConstantMembers(typeElement, members, target);
             }
         }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
index 002dd588912..a97cbedf27d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,83 +111,83 @@ public class ConstructorBuilder extends AbstractMemberBuilder {
     }
 
     @Override
-    public void build(Content contentTree) throws DocletException {
-        buildConstructorDoc(contentTree);
+    public void build(Content target) throws DocletException {
+        buildConstructorDoc(target);
     }
 
     /**
      * Build the constructor documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildConstructorDoc(Content detailsList) throws DocletException {
+    protected void buildConstructorDoc(Content target) throws DocletException {
         if (hasMembersToDocument()) {
-            Content constructorDetailsTreeHeader = writer.getConstructorDetailsTreeHeader(detailsList);
+            Content constructorDetailsHeader = writer.getConstructorDetailsHeader(target);
             Content memberList = writer.getMemberList();
 
             for (Element constructor : constructors) {
                 currentConstructor = (ExecutableElement)constructor;
-                Content constructorDocTree = writer.getConstructorDocTreeHeader(currentConstructor);
+                Content constructorContent = writer.getConstructorHeaderContent(currentConstructor);
 
-                buildSignature(constructorDocTree);
-                buildDeprecationInfo(constructorDocTree);
-                buildPreviewInfo(constructorDocTree);
-                buildConstructorComments(constructorDocTree);
-                buildTagInfo(constructorDocTree);
+                buildSignature(constructorContent);
+                buildDeprecationInfo(constructorContent);
+                buildPreviewInfo(constructorContent);
+                buildConstructorComments(constructorContent);
+                buildTagInfo(constructorContent);
 
-                memberList.add(writer.getMemberListItem(constructorDocTree));
+                memberList.add(writer.getMemberListItem(constructorContent));
             }
-            Content constructorDetails = writer.getConstructorDetails(constructorDetailsTreeHeader, memberList);
-            detailsList.add(constructorDetails);
+            Content constructorDetails = writer.getConstructorDetails(constructorDetailsHeader, memberList);
+            target.add(constructorDetails);
         }
     }
 
     /**
      * Build the signature.
      *
-     * @param constructorDocTree the content tree to which the documentation will be added
+     * @param constructorContent the content to which the documentation will be added
      */
-    protected void buildSignature(Content constructorDocTree) {
-        constructorDocTree.add(writer.getSignature(currentConstructor));
+    protected void buildSignature(Content constructorContent) {
+        constructorContent.add(writer.getSignature(currentConstructor));
     }
 
     /**
      * Build the deprecation information.
      *
-     * @param constructorDocTree the content tree to which the documentation will be added
+     * @param constructorContent the content to which the documentation will be added
      */
-    protected void buildDeprecationInfo(Content constructorDocTree) {
-        writer.addDeprecated(currentConstructor, constructorDocTree);
+    protected void buildDeprecationInfo(Content constructorContent) {
+        writer.addDeprecated(currentConstructor, constructorContent);
     }
 
     /**
      * Build the preview information.
      *
-     * @param constructorDocTree the content tree to which the documentation will be added
+     * @param constructorContent the content to which the documentation will be added
      */
-    protected void buildPreviewInfo(Content constructorDocTree) {
-        writer.addPreview(currentConstructor, constructorDocTree);
+    protected void buildPreviewInfo(Content constructorContent) {
+        writer.addPreview(currentConstructor, constructorContent);
     }
 
     /**
      * Build the comments for the constructor.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
      *
-     * @param constructorDocTree the content tree to which the documentation will be added
+     * @param constructorContent the content to which the documentation will be added
      */
-    protected void buildConstructorComments(Content constructorDocTree) {
+    protected void buildConstructorComments(Content constructorContent) {
         if (!options.noComment()) {
-            writer.addComments(currentConstructor, constructorDocTree);
+            writer.addComments(currentConstructor, constructorContent);
         }
     }
 
     /**
      * Build the tag information.
      *
-     * @param constructorDocTree the content tree to which the documentation will be added
+     * @param constructorContent the content to which the documentation will be added
      */
-    protected void buildTagInfo(Content constructorDocTree) {
-        writer.addTags(currentConstructor, constructorDocTree);
+    protected void buildTagInfo(Content constructorContent) {
+        writer.addTags(currentConstructor, constructorContent);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
index 20972c87644..a5ee3cd35e0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,87 +102,87 @@ public class EnumConstantBuilder extends AbstractMemberBuilder {
     }
 
     @Override
-    public void build(Content contentTree) throws DocletException {
-        buildEnumConstant(contentTree);
+    public void build(Content target) throws DocletException {
+        buildEnumConstant(target);
     }
 
     /**
      * Build the enum constant documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException is there is a problem while building the documentation
      */
-    protected void buildEnumConstant(Content detailsList) throws DocletException {
+    protected void buildEnumConstant(Content target) throws DocletException {
         if (hasMembersToDocument()) {
-            Content enumConstantsDetailsTreeHeader = writer.getEnumConstantsDetailsTreeHeader(typeElement,
-                    detailsList);
+            Content enumConstantsDetailsHeader = writer.getEnumConstantsDetailsHeader(typeElement,
+                    target);
             Content memberList = writer.getMemberList();
 
             for (Element enumConstant : enumConstants) {
                 currentElement = (VariableElement)enumConstant;
-                Content enumConstantsTree = writer.getEnumConstantsTreeHeader(currentElement,
+                Content enumConstants = writer.getEnumConstantsHeader(currentElement,
                         memberList);
 
-                buildSignature(enumConstantsTree);
-                buildDeprecationInfo(enumConstantsTree);
-                buildPreviewInfo(enumConstantsTree);
-                buildEnumConstantComments(enumConstantsTree);
-                buildTagInfo(enumConstantsTree);
+                buildSignature(enumConstants);
+                buildDeprecationInfo(enumConstants);
+                buildPreviewInfo(enumConstants);
+                buildEnumConstantComments(enumConstants);
+                buildTagInfo(enumConstants);
 
-                memberList.add(writer.getMemberListItem(enumConstantsTree));
+                memberList.add(writer.getMemberListItem(enumConstants));
             }
             Content enumConstantDetails = writer.getEnumConstantsDetails(
-                    enumConstantsDetailsTreeHeader, memberList);
-            detailsList.add(enumConstantDetails);
+                    enumConstantsDetailsHeader, memberList);
+            target.add(enumConstantDetails);
         }
     }
 
     /**
      * Build the signature.
      *
-     * @param enumConstantsTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildSignature(Content enumConstantsTree) {
-        enumConstantsTree.add(writer.getSignature(currentElement));
+    protected void buildSignature(Content target) {
+        target.add(writer.getSignature(currentElement));
     }
 
     /**
      * Build the deprecation information.
      *
-     * @param enumConstantsTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildDeprecationInfo(Content enumConstantsTree) {
-        writer.addDeprecated(currentElement, enumConstantsTree);
+    protected void buildDeprecationInfo(Content target) {
+        writer.addDeprecated(currentElement, target);
     }
 
     /**
      * Build the preview information.
      *
-     * @param enumConstantsTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildPreviewInfo(Content enumConstantsTree) {
-        writer.addPreview(currentElement, enumConstantsTree);
+    protected void buildPreviewInfo(Content target) {
+        writer.addPreview(currentElement, target);
     }
 
     /**
      * Build the comments for the enum constant.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
      *
-     * @param enumConstantsTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildEnumConstantComments(Content enumConstantsTree) {
+    protected void buildEnumConstantComments(Content target) {
         if (!options.noComment()) {
-            writer.addComments(currentElement, enumConstantsTree);
+            writer.addComments(currentElement, target);
         }
     }
 
     /**
      * Build the tag information.
      *
-     * @param enumConstantsTree the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildTagInfo(Content enumConstantsTree) {
-        writer.addTags(currentElement, enumConstantsTree);
+    protected void buildTagInfo(Content target) {
+        writer.addTags(currentElement, target);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
index f98cc7a7fc5..05c708ec3f3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,84 +104,84 @@ public class FieldBuilder extends AbstractMemberBuilder {
     }
 
     @Override
-    public void build(Content contentTree) throws DocletException {
-        buildFieldDoc(contentTree);
+    public void build(Content target) throws DocletException {
+        buildFieldDoc(target);
     }
 
     /**
      * Build the field documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildFieldDoc(Content detailsList) throws DocletException {
+    protected void buildFieldDoc(Content target) throws DocletException {
         if (!fields.isEmpty()) {
-            Content fieldDetailsTreeHeader = writer.getFieldDetailsTreeHeader(detailsList);
+            Content fieldDetailsHeader = writer.getFieldDetailsHeader(target);
             Content memberList = writer.getMemberList();
 
             for (Element element : fields) {
                 currentElement = (VariableElement)element;
-                Content fieldDocTree = writer.getFieldDocTreeHeader(currentElement);
+                Content fieldContent = writer.getFieldHeaderContent(currentElement);
 
-                buildSignature(fieldDocTree);
-                buildDeprecationInfo(fieldDocTree);
-                buildPreviewInfo(fieldDocTree);
-                buildFieldComments(fieldDocTree);
-                buildTagInfo(fieldDocTree);
+                buildSignature(fieldContent);
+                buildDeprecationInfo(fieldContent);
+                buildPreviewInfo(fieldContent);
+                buildFieldComments(fieldContent);
+                buildTagInfo(fieldContent);
 
-                memberList.add(writer.getMemberListItem(fieldDocTree));
+                memberList.add(writer.getMemberListItem(fieldContent));
             }
-            Content fieldDetails = writer.getFieldDetails(fieldDetailsTreeHeader, memberList);
-            detailsList.add(fieldDetails);
+            Content fieldDetails = writer.getFieldDetails(fieldDetailsHeader, memberList);
+            target.add(fieldDetails);
         }
     }
 
     /**
      * Build the signature.
      *
-     * @param fieldDocTree the content tree to which the documentation will be added
+     * @param fieldContent the content to which the documentation will be added
      */
-    protected void buildSignature(Content fieldDocTree) {
-        fieldDocTree.add(writer.getSignature(currentElement));
+    protected void buildSignature(Content fieldContent) {
+        fieldContent.add(writer.getSignature(currentElement));
     }
 
     /**
      * Build the deprecation information.
      *
-     * @param fieldDocTree the content tree to which the documentation will be added
+     * @param fieldContent the content to which the documentation will be added
      */
-    protected void buildDeprecationInfo(Content fieldDocTree) {
-        writer.addDeprecated(currentElement, fieldDocTree);
+    protected void buildDeprecationInfo(Content fieldContent) {
+        writer.addDeprecated(currentElement, fieldContent);
     }
 
     /**
      * Build the preview information.
      *
-     * @param fieldDocTree the content tree to which the documentation will be added
+     * @param fieldContent the content to which the documentation will be added
      */
-    protected void buildPreviewInfo(Content fieldDocTree) {
-        writer.addPreview(currentElement, fieldDocTree);
+    protected void buildPreviewInfo(Content fieldContent) {
+        writer.addPreview(currentElement, fieldContent);
     }
 
     /**
      * Build the comments for the field.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
      *
-     * @param fieldDocTree the content tree to which the documentation will be added
+     * @param fieldContent the content to which the documentation will be added
      */
-    protected void buildFieldComments(Content fieldDocTree) {
+    protected void buildFieldComments(Content fieldContent) {
         if (!options.noComment()) {
-            writer.addComments(currentElement, fieldDocTree);
+            writer.addComments(currentElement, fieldContent);
         }
     }
 
     /**
      * Build the tag information.
      *
-     * @param fieldDocTree the content tree to which the documentation will be added
+     * @param fieldContent the content to which the documentation will be added
      */
-    protected void buildTagInfo(Content fieldDocTree) {
-        writer.addTags(currentElement, fieldDocTree);
+    protected void buildTagInfo(Content fieldContent) {
+        writer.addTags(currentElement, fieldContent);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
index 219d9247fbc..4dee69dfe91 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,6 @@ import jdk.javadoc.internal.doclets.toolkit.ClassWriter;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
 import jdk.javadoc.internal.doclets.toolkit.WriterFactory;
-import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
@@ -106,15 +105,15 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
             ClassWriter classWriter, Context context) {
         MemberSummaryBuilder builder = new MemberSummaryBuilder(context, classWriter.getTypeElement()) {
             @Override
-            public void build(Content summariesList) {
-                buildPropertiesSummary(summariesList);
-                buildNestedClassesSummary(summariesList);
-                buildEnumConstantsSummary(summariesList);
-                buildAnnotationTypeRequiredMemberSummary(summariesList);
-                buildAnnotationTypeOptionalMemberSummary(summariesList);
-                buildFieldsSummary(summariesList);
-                buildConstructorsSummary(summariesList);
-                buildMethodsSummary(summariesList);
+            public void build(Content target) {
+                buildPropertiesSummary(target);
+                buildNestedClassesSummary(target);
+                buildEnumConstantsSummary(target);
+                buildAnnotationTypeRequiredMemberSummary(target);
+                buildAnnotationTypeOptionalMemberSummary(target);
+                buildFieldsSummary(target);
+                buildConstructorsSummary(target);
+                buildMethodsSummary(target);
             }
 
             @Override
@@ -233,7 +232,7 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
     /**
      * Builds the summary for any methods.
      *
-     * @param summariesList the content tree to which the documentation will be added
+     * @param summariesList the content to which the documentation will be added
      */
     protected void buildMethodsSummary(Content summariesList) {
         MemberSummaryWriter writer = memberSummaryWriters.get(METHODS);
@@ -243,7 +242,7 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
     /**
      * Builds the summary for any constructors.
      *
-     * @param summariesList the content tree to which the documentation will be added
+     * @param summariesList the content to which the documentation will be added
      */
     protected void buildConstructorsSummary(Content summariesList) {
         MemberSummaryWriter writer = memberSummaryWriters.get(CONSTRUCTORS);
@@ -255,7 +254,7 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
      *
      * @param writer the summary writer to write the output.
      * @param kind the kind of  members to summarize.
-     * @param summaryTreeList list of content trees to which the documentation will be added
+     * @param summaryTreeList the list of contents to which the documentation will be added
      */
     private void buildSummary(MemberSummaryWriter writer,
             VisibleMemberTable.Kind kind, LinkedList<Content> summaryTreeList) {
@@ -280,7 +279,7 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
                 }
                 writer.addMemberSummary(typeElement, member, firstSentenceTags);
             }
-            summaryTreeList.add(writer.getSummaryTableTree(typeElement));
+            summaryTreeList.add(writer.getSummaryTable(typeElement));
         }
     }
 
@@ -289,10 +288,10 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
      *
      * @param writer the writer for this member summary.
      * @param kind the kind of members to document.
-     * @param summaryTreeList list of content trees to which the documentation will be added
+     * @param targets the list of contents to which the documentation will be added
      */
     private void buildInheritedSummary(MemberSummaryWriter writer,
-            VisibleMemberTable.Kind kind, LinkedList<Content> summaryTreeList) {
+            VisibleMemberTable.Kind kind, LinkedList<Content> targets) {
         VisibleMemberTable visibleMemberTable = getVisibleMemberTable();
         SortedSet<? extends Element> inheritedMembersFromMap = asSortedSet(visibleMemberTable.getAllVisibleMembers(kind));
 
@@ -314,22 +313,22 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
             if (!members.isEmpty()) {
                 SortedSet<Element> inheritedMembers = new TreeSet<>(comparator);
                 inheritedMembers.addAll(members);
-                Content inheritedTree = writer.getInheritedSummaryHeader(inheritedClass);
-                Content linksTree = writer.getInheritedSummaryLinksTree();
-                addSummaryFootNote(inheritedClass, inheritedMembers, linksTree, writer);
-                inheritedTree.add(linksTree);
-                summaryTreeList.add(inheritedTree);
+                Content inheritedHeader = writer.getInheritedSummaryHeader(inheritedClass);
+                Content links = writer.getInheritedSummaryLinks();
+                addSummaryFootNote(inheritedClass, inheritedMembers, links, writer);
+                inheritedHeader.add(links);
+                targets.add(inheritedHeader);
             }
         }
     }
 
     private void addSummaryFootNote(TypeElement inheritedClass, SortedSet<Element> inheritedMembers,
-                                    Content linksTree, MemberSummaryWriter writer) {
+                                    Content links, MemberSummaryWriter writer) {
         for (Element member : inheritedMembers) {
             TypeElement t = utils.isUndocumentedEnclosure(inheritedClass)
                     ? typeElement : inheritedClass;
             writer.addInheritedMemberSummary(t, member, inheritedMembers.first() == member,
-                    inheritedMembers.last() == member, linksTree);
+                    inheritedMembers.last() == member, links);
         }
     }
 
@@ -351,9 +350,9 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
         if (showInheritedSummary)
             buildInheritedSummary(writer, kind, summaryTreeList);
         if (!summaryTreeList.isEmpty()) {
-            Content memberTree = writer.getMemberSummaryHeader(typeElement, summariesList);
-            summaryTreeList.forEach(memberTree::add);
-            writer.addSummary(summariesList, memberTree);
+            Content member = writer.getMemberSummaryHeader(typeElement, summariesList);
+            summaryTreeList.forEach(member::add);
+            writer.addSummary(summariesList, member);
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
index a751de2ae11..ec0bd8b0885 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,34 +102,34 @@ public class MethodBuilder extends AbstractMemberBuilder {
     }
 
     @Override
-    public void build(Content contentTree) throws DocletException {
-        buildMethodDoc(contentTree);
+    public void build(Content target) throws DocletException {
+        buildMethodDoc(target);
     }
 
     /**
      * Build the method documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param detailsList the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildMethodDoc(Content detailsList) throws DocletException {
         if (hasMembersToDocument()) {
-            Content methodDetailsTreeHeader = writer.getMethodDetailsTreeHeader(detailsList);
+            Content methodDetailsHeader = writer.getMethodDetailsHeader(detailsList);
             Content memberList = writer.getMemberList();
 
             for (Element method : methods) {
                 currentMethod = (ExecutableElement)method;
-                Content methodDocTree = writer.getMethodDocTreeHeader(currentMethod);
+                Content methodContent = writer.getMethodHeader(currentMethod);
 
-                buildSignature(methodDocTree);
-                buildDeprecationInfo(methodDocTree);
-                buildPreviewInfo(methodDocTree);
-                buildMethodComments(methodDocTree);
-                buildTagInfo(methodDocTree);
+                buildSignature(methodContent);
+                buildDeprecationInfo(methodContent);
+                buildPreviewInfo(methodContent);
+                buildMethodComments(methodContent);
+                buildTagInfo(methodContent);
 
-                memberList.add(writer.getMemberListItem(methodDocTree));
+                memberList.add(writer.getMemberListItem(methodContent));
             }
-            Content methodDetails = writer.getMethodDetails(methodDetailsTreeHeader, memberList);
+            Content methodDetails = writer.getMethodDetails(methodDetailsHeader, memberList);
             detailsList.add(methodDetails);
         }
     }
@@ -137,37 +137,37 @@ public class MethodBuilder extends AbstractMemberBuilder {
     /**
      * Build the signature.
      *
-     * @param methodDocTree the content tree to which the documentation will be added
+     * @param methodContent the content to which the documentation will be added
      */
-    protected void buildSignature(Content methodDocTree) {
-        methodDocTree.add(writer.getSignature(currentMethod));
+    protected void buildSignature(Content methodContent) {
+        methodContent.add(writer.getSignature(currentMethod));
     }
 
     /**
      * Build the deprecation information.
      *
-     * @param methodDocTree the content tree to which the documentation will be added
+     * @param methodContent the content to which the documentation will be added
      */
-    protected void buildDeprecationInfo(Content methodDocTree) {
-        writer.addDeprecated(currentMethod, methodDocTree);
+    protected void buildDeprecationInfo(Content methodContent) {
+        writer.addDeprecated(currentMethod, methodContent);
     }
 
     /**
      * Build the preview information.
      *
-     * @param methodDocTree the content tree to which the documentation will be added
+     * @param methodContent the content to which the documentation will be added
      */
-    protected void buildPreviewInfo(Content methodDocTree) {
-        writer.addPreview(currentMethod, methodDocTree);
+    protected void buildPreviewInfo(Content methodContent) {
+        writer.addPreview(currentMethod, methodContent);
     }
 
     /**
      * Build the comments for the method.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
      *
-     * @param methodDocTree the content tree to which the documentation will be added
+     * @param methodContent the content to which the documentation will be added
      */
-    protected void buildMethodComments(Content methodDocTree) {
+    protected void buildMethodComments(Content methodContent) {
         if (!options.noComment()) {
             ExecutableElement method = currentMethod;
             if (utils.getFullBody(currentMethod).isEmpty()) {
@@ -177,17 +177,17 @@ public class MethodBuilder extends AbstractMemberBuilder {
                         method = (ExecutableElement)docs.holder;
             }
             TypeMirror containingType = method.getEnclosingElement().asType();
-            writer.addComments(containingType, method, methodDocTree);
+            writer.addComments(containingType, method, methodContent);
         }
     }
 
     /**
      * Build the tag information.
      *
-     * @param methodDocTree the content tree to which the documentation will be added
+     * @param methodContent the content to which the documentation will be added
      */
-    protected void buildTagInfo(Content methodDocTree) {
-        writer.addTags(currentMethod, methodDocTree);
+    protected void buildTagInfo(Content methodContent) {
+        writer.addTags(currentMethod, methodContent);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java
index 8574c160bea..f9922476cc9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,12 +103,12 @@ public class ModuleSummaryBuilder extends AbstractBuilder {
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildModuleDoc() throws DocletException {
-        Content contentTree = moduleWriter.getModuleHeader(mdle.getQualifiedName().toString());
+        Content content = moduleWriter.getModuleHeader(mdle.getQualifiedName().toString());
 
         buildContent();
 
         moduleWriter.addModuleFooter();
-        moduleWriter.printDocument(contentTree);
+        moduleWriter.printDocument(content);
         DocFilesHandler docFilesHandler = configuration.getWriterFactory().getDocFilesHandler(mdle);
         docFilesHandler.copyDocFiles();
     }
@@ -119,30 +119,30 @@ public class ModuleSummaryBuilder extends AbstractBuilder {
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildContent() throws DocletException {
-        Content moduleContentTree = moduleWriter.getContentHeader();
+        Content moduleContent = moduleWriter.getContentHeader();
 
-        moduleWriter.addModuleSignature(moduleContentTree);
-        buildModuleDescription(moduleContentTree);
-        buildSummary(moduleContentTree);
+        moduleWriter.addModuleSignature(moduleContent);
+        buildModuleDescription(moduleContent);
+        buildSummary(moduleContent);
 
-        moduleWriter.addModuleContent(moduleContentTree);
+        moduleWriter.addModuleContent(moduleContent);
     }
 
     /**
      * Builds the list of summary sections for this module.
      *
-     * @param moduleContentTree the module content tree to which the summaries will
-     *                           be added
+     * @param target the module content to which the summaries will
+     *               be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildSummary(Content moduleContentTree) throws DocletException {
+    protected void buildSummary(Content target) throws DocletException {
         Content summariesList = moduleWriter.getSummariesList();
 
         buildPackagesSummary(summariesList);
         buildModulesSummary(summariesList);
         buildServicesSummary(summariesList);
 
-        moduleContentTree.add(moduleWriter.getSummaryTree(summariesList));
+        target.add(moduleWriter.getSummary(summariesList));
     }
 
     /**
@@ -175,12 +175,12 @@ public class ModuleSummaryBuilder extends AbstractBuilder {
     /**
      * Builds the description for this module.
      *
-     * @param moduleContentTree the tree to which the module description will
-     *                           be added
+     * @param moduleContent the content to which the module description will
+     *                      be added
      */
-    protected void buildModuleDescription(Content moduleContentTree) {
+    protected void buildModuleDescription(Content moduleContent) {
         if (!options.noComment()) {
-            moduleWriter.addModuleDescription(moduleContentTree);
+            moduleWriter.addModuleDescription(moduleContent);
         }
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
index 095accd3bb6..6ce8a34abd2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,12 +104,12 @@ public class PackageSummaryBuilder extends AbstractBuilder {
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildPackageDoc() throws DocletException {
-        Content contentTree = packageWriter.getPackageHeader();
+        Content content = packageWriter.getPackageHeader();
 
         buildContent();
 
         packageWriter.addPackageFooter();
-        packageWriter.printDocument(contentTree);
+        packageWriter.printDocument(content);
         DocFilesHandler docFilesHandler = configuration
                 .getWriterFactory()
                 .getDocFilesHandler(packageElement);
@@ -122,30 +122,30 @@ public class PackageSummaryBuilder extends AbstractBuilder {
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildContent() throws DocletException {
-        Content packageContentTree = packageWriter.getContentHeader();
+        Content packageContent = packageWriter.getContentHeader();
 
-        packageWriter.addPackageSignature(packageContentTree);
-        buildPackageDescription(packageContentTree);
-        buildPackageTags(packageContentTree);
-        buildSummary(packageContentTree);
+        packageWriter.addPackageSignature(packageContent);
+        buildPackageDescription(packageContent);
+        buildPackageTags(packageContent);
+        buildSummary(packageContent);
 
-        packageWriter.addPackageContent(packageContentTree);
+        packageWriter.addPackageContent(packageContent);
     }
 
     /**
      * Builds the list of summaries for the different kinds of types in this package.
      *
-     * @param packageContentTree the package content tree to which the summaries will
-     *                           be added
+     * @param packageContent the package content to which the summaries will
+     *                       be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildSummary(Content packageContentTree) throws DocletException {
+    protected void buildSummary(Content packageContent) throws DocletException {
         Content summariesList = packageWriter.getSummariesList();
 
         buildRelatedPackagesSummary(summariesList);
         buildAllClassesAndInterfacesSummary(summariesList);
 
-        packageContentTree.add(packageWriter.getPackageSummary(summariesList));
+        packageContent.add(packageWriter.getPackageSummary(summariesList));
     }
 
     /**
@@ -170,25 +170,25 @@ public class PackageSummaryBuilder extends AbstractBuilder {
     /**
      * Build the description of the summary.
      *
-     * @param packageContentTree the tree to which the package description will
-     *                           be added
+     * @param packageContent the content to which the package description will
+     *                       be added
      */
-    protected void buildPackageDescription(Content packageContentTree) {
+    protected void buildPackageDescription(Content packageContent) {
         if (options.noComment()) {
             return;
         }
-        packageWriter.addPackageDescription(packageContentTree);
+        packageWriter.addPackageDescription(packageContent);
     }
 
     /**
      * Build the tags of the summary.
      *
-     * @param packageContentTree the tree to which the package tags will be added
+     * @param packageContent the content to which the package tags will be added
      */
-    protected void buildPackageTags(Content packageContentTree) {
+    protected void buildPackageTags(Content packageContent) {
         if (options.noComment()) {
             return;
         }
-        packageWriter.addPackageTags(packageContentTree);
+        packageWriter.addPackageTags(packageContent);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
index ebd6d762a25..a3798aeb7eb 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,32 +109,32 @@ public class PropertyBuilder extends AbstractMemberBuilder {
     }
 
     @Override
-    public void build(Content contentTree) throws DocletException {
-        buildPropertyDoc(contentTree);
+    public void build(Content target) throws DocletException {
+        buildPropertyDoc(target);
     }
 
     /**
      * Build the property documentation.
      *
-     * @param detailsList the content tree to which the documentation will be added
+     * @param detailsList the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildPropertyDoc(Content detailsList) throws DocletException {
         if (hasMembersToDocument()) {
-            Content propertyDetailsTreeHeader = writer.getPropertyDetailsTreeHeader(detailsList);
+            Content propertyDetailsHeader = writer.getPropertyDetailsHeader(detailsList);
             Content memberList = writer.getMemberList();
 
             for (Element property : properties) {
                 currentProperty = (ExecutableElement)property;
-                Content propertyDocTree = writer.getPropertyDocTreeHeader(currentProperty);
+                Content propertyContent = writer.getPropertyHeaderContent(currentProperty);
 
-                buildSignature(propertyDocTree);
-                buildPropertyComments(propertyDocTree);
-                buildTagInfo(propertyDocTree);
+                buildSignature(propertyContent);
+                buildPropertyComments(propertyContent);
+                buildTagInfo(propertyContent);
 
-                memberList.add(writer.getMemberListItem(propertyDocTree));
+                memberList.add(writer.getMemberListItem(propertyContent));
             }
-            Content propertyDetails = writer.getPropertyDetails(propertyDetailsTreeHeader, memberList);
+            Content propertyDetails = writer.getPropertyDetails(propertyDetailsHeader, memberList);
             detailsList.add(propertyDetails);
         }
     }
@@ -142,48 +142,48 @@ public class PropertyBuilder extends AbstractMemberBuilder {
     /**
      * Build the signature.
      *
-     * @param propertyDocTree the content tree to which the documentation will be added
+     * @param propertyContent the content to which the documentation will be added
      */
-    protected void buildSignature(Content propertyDocTree) {
-        propertyDocTree.add(writer.getSignature(currentProperty));
+    protected void buildSignature(Content propertyContent) {
+        propertyContent.add(writer.getSignature(currentProperty));
     }
 
     /**
      * Build the deprecation information.
      *
-     * @param propertyDocTree the content tree to which the documentation will be added
+     * @param propertyContent the content to which the documentation will be added
      */
-    protected void buildDeprecationInfo(Content propertyDocTree) {
-        writer.addDeprecated(currentProperty, propertyDocTree);
+    protected void buildDeprecationInfo(Content propertyContent) {
+        writer.addDeprecated(currentProperty, propertyContent);
     }
 
     /**
      * Build the preview information.
      *
-     * @param propertyDocTree the content tree to which the documentation will be added
+     * @param propertyContent the content to which the documentation will be added
      */
-    protected void buildPreviewInfo(Content propertyDocTree) {
-        writer.addPreview(currentProperty, propertyDocTree);
+    protected void buildPreviewInfo(Content propertyContent) {
+        writer.addPreview(currentProperty, propertyContent);
     }
 
     /**
      * Build the comments for the property.  Do nothing if
      * {@link BaseOptions#noComment()} is set to true.
      *
-     * @param propertyDocTree the content tree to which the documentation will be added
+     * @param propertyContent the content to which the documentation will be added
      */
-    protected void buildPropertyComments(Content propertyDocTree) {
+    protected void buildPropertyComments(Content propertyContent) {
         if (!options.noComment()) {
-            writer.addComments(currentProperty, propertyDocTree);
+            writer.addComments(currentProperty, propertyContent);
         }
     }
 
     /**
      * Build the tag information.
      *
-     * @param propertyDocTree the content tree to which the documentation will be added
+     * @param propertyContent the content to which the documentation will be added
      */
-    protected void buildTagInfo(Content propertyDocTree) {
+    protected void buildTagInfo(Content propertyContent) {
         CommentUtils cmtUtils = configuration.cmtUtils;
         DocCommentTree dct = utils.getDocCommentTree(currentProperty);
         var fullBody = dct.getFullBody();
@@ -199,7 +199,7 @@ public class PropertyBuilder extends AbstractMemberBuilder {
         // the property.
         CommentUtils.DocCommentInfo prev = cmtUtils.setDocCommentTree(currentProperty, fullBody, blockTags);
         try {
-            writer.addTags(currentProperty, propertyDocTree);
+            writer.addTags(currentProperty, propertyContent);
         } finally {
             cmtUtils.setDocCommentInfo(currentProperty, prev);
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java
index e3de27c19f1..ae066f9c0fc 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -138,13 +138,13 @@ public class SerializedFormBuilder extends AbstractBuilder {
      * @throws DocletException if there is a problem while building the documentation
      */
     protected void buildSerializedForm() throws DocletException {
-        Content contentTree = writer.getHeader(resources.getText(
+        Content content = writer.getHeader(resources.getText(
                 "doclet.Serialized_Form"));
 
         buildSerializedFormSummaries();
 
         writer.addFooter();
-        writer.printDocument(contentTree);
+        writer.printDocument(content);
     }
 
     /**
@@ -154,23 +154,23 @@ public class SerializedFormBuilder extends AbstractBuilder {
      */
     protected void buildSerializedFormSummaries()
             throws DocletException {
-        Content serializedSummariesTree = writer.getSerializedSummariesHeader();
+        Content c = writer.getSerializedSummariesHeader();
         for (PackageElement pkg : configuration.packages) {
             currentPackage = pkg;
 
-            buildPackageSerializedForm(serializedSummariesTree);
+            buildPackageSerializedForm(c);
         }
-        writer.addSerializedContent(serializedSummariesTree);
+        writer.addSerializedContent(c);
     }
 
     /**
      * Build the package serialized form for the current package being processed.
      *
-     * @param serializedSummariesTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildPackageSerializedForm(Content serializedSummariesTree) throws DocletException {
-        Content packageSerializedTree = writer.getPackageSerializedHeader();
+    protected void buildPackageSerializedForm(Content target) throws DocletException {
+        Content packageSerializedHeader = writer.getPackageSerializedHeader();
         SortedSet<TypeElement> classes = utils.getAllClassesUnfiltered(currentPackage);
         if (classes.isEmpty()) {
             return;
@@ -182,30 +182,30 @@ public class SerializedFormBuilder extends AbstractBuilder {
             return;
         }
 
-        buildPackageHeader(packageSerializedTree);
-        buildClassSerializedForm(packageSerializedTree);
+        buildPackageHeader(packageSerializedHeader);
+        buildClassSerializedForm(packageSerializedHeader);
 
-        writer.addPackageSerializedTree(serializedSummariesTree, packageSerializedTree);
+        writer.addPackageSerialized(target, packageSerializedHeader);
     }
 
     /**
      * Build the package header.
      *
-     * @param packageSerializedTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildPackageHeader(Content packageSerializedTree) {
-        packageSerializedTree.add(writer.getPackageHeader(currentPackage));
+    protected void buildPackageHeader(Content target) {
+        target.add(writer.getPackageHeader(currentPackage));
     }
 
     /**
      * Build the class serialized form.
      *
-     * @param packageSerializedTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildClassSerializedForm(Content packageSerializedTree)
+    protected void buildClassSerializedForm(Content target)
             throws DocletException {
-        Content classSerializedTree = writer.getClassSerializedHeader();
+        Content classSerializedHeader = writer.getClassSerializedHeader();
         SortedSet<TypeElement> typeElements = utils.getAllClassesUnfiltered(currentPackage);
         for (TypeElement typeElement : typeElements) {
             currentTypeElement = typeElement;
@@ -215,82 +215,82 @@ public class SerializedFormBuilder extends AbstractBuilder {
                 if (!serialClassInclude(utils, currentTypeElement)) {
                     continue;
                 }
-                Content classTree = writer.getClassHeader(currentTypeElement);
+                Content classHeader = writer.getClassHeader(currentTypeElement);
 
-                buildSerialUIDInfo(classTree);
-                buildClassContent(classTree);
+                buildSerialUIDInfo(classHeader);
+                buildClassContent(classHeader);
 
-                classSerializedTree.add(writer.getMemberTree(classTree));
+                classSerializedHeader.add(writer.getMember(classHeader));
             }
         }
-        packageSerializedTree.add(classSerializedTree);
+        target.add(classSerializedHeader);
     }
 
     /**
      * Build the serial UID information for the given class.
      *
-     * @param classTree content tree to which the serial UID information will be added
+     * @param target the content to which the serial UID information will be added
      */
-    protected void buildSerialUIDInfo(Content classTree) {
-        Content serialUidTree = writer.getSerialUIDInfoHeader();
+    protected void buildSerialUIDInfo(Content target) {
+        Content serialUIDHeader = writer.getSerialUIDInfoHeader();
         for (VariableElement field : utils.getFieldsUnfiltered(currentTypeElement)) {
             if (field.getSimpleName().toString().compareTo(SERIAL_VERSION_UID) == 0 &&
                 field.getConstantValue() != null) {
                 writer.addSerialUIDInfo(SERIAL_VERSION_UID_HEADER,
-                                        utils.constantValueExpression(field), serialUidTree);
+                                        utils.constantValueExpression(field), serialUIDHeader);
                 break;
             }
         }
-        classTree.add(serialUidTree);
+        target.add(serialUIDHeader);
     }
 
     /**
      * Build the summaries for the methods and fields.
      *
-     * @param classTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildClassContent(Content classTree) throws DocletException {
-        Content classContentTree = writer.getClassContentHeader();
+    protected void buildClassContent(Content target) throws DocletException {
+        Content classContent = writer.getClassContentHeader();
 
-        buildSerializableMethods(classContentTree);
-        buildFieldHeader(classContentTree);
-        buildSerializableFields(classContentTree);
+        buildSerializableMethods(classContent);
+        buildFieldHeader(classContent);
+        buildSerializableFields(classContent);
 
-        classTree.add(classContentTree);
+        target.add(classContent);
     }
 
     /**
      * Build the summaries for the methods that belong to the given class.
      *
-     * @param classContentTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildSerializableMethods(Content classContentTree) throws DocletException {
-        Content serializableMethodTree = methodWriter.getSerializableMethodsHeader();
+    protected void buildSerializableMethods(Content target) throws DocletException {
+        Content serializableMethodsHeader = methodWriter.getSerializableMethodsHeader();
         SortedSet<ExecutableElement> members = utils.serializationMethods(currentTypeElement);
         if (!members.isEmpty()) {
             for (ExecutableElement member : members) {
                 currentMember = member;
-                Content methodsContentTree = methodWriter.getMethodsContentHeader(
+                Content methodsContent = methodWriter.getMethodsContentHeader(
                         currentMember == members.last());
 
-                buildMethodSubHeader(methodsContentTree);
-                buildDeprecatedMethodInfo(methodsContentTree);
-                buildMethodInfo(methodsContentTree);
+                buildMethodSubHeader(methodsContent);
+                buildDeprecatedMethodInfo(methodsContent);
+                buildMethodInfo(methodsContent);
 
-                serializableMethodTree.add(methodsContentTree);
+                serializableMethodsHeader.add(methodsContent);
             }
         }
         if (!utils.serializationMethods(currentTypeElement).isEmpty()) {
-            classContentTree.add(methodWriter.getSerializableMethods(
+            target.add(methodWriter.getSerializableMethods(
                     resources.getText("doclet.Serialized_Form_methods"),
-                    serializableMethodTree));
+                    serializableMethodsHeader));
             if (utils.isSerializable(currentTypeElement) && !utils.isExternalizable(currentTypeElement)) {
                 if (utils.serializationMethods(currentTypeElement).isEmpty()) {
                     Content noCustomizationMsg = methodWriter.getNoCustomizationMsg(
                             resources.getText("doclet.Serializable_no_customization"));
-                    classContentTree.add(methodWriter.getSerializableMethods(
+                    target.add(methodWriter.getSerializableMethods(
                             resources.getText("doclet.Serialized_Form_methods"),
                             noCustomizationMsg));
                 }
@@ -301,52 +301,52 @@ public class SerializedFormBuilder extends AbstractBuilder {
     /**
      * Build the method sub header.
      *
-     * @param methodsContentTree content tree to which the documentation will be added
+     * @param methodsContent the content to which the documentation will be added
      */
-    protected void buildMethodSubHeader(Content methodsContentTree)  {
-        methodWriter.addMemberHeader((ExecutableElement)currentMember, methodsContentTree);
+    protected void buildMethodSubHeader(Content methodsContent)  {
+        methodWriter.addMemberHeader((ExecutableElement)currentMember, methodsContent);
     }
 
     /**
      * Build the deprecated method description.
      *
-     * @param methodsContentTree content tree to which the documentation will be added
+     * @param methodsContent the content to which the documentation will be added
      */
-    protected void buildDeprecatedMethodInfo(Content methodsContentTree) {
-        methodWriter.addDeprecatedMemberInfo((ExecutableElement)currentMember, methodsContentTree);
+    protected void buildDeprecatedMethodInfo(Content methodsContent) {
+        methodWriter.addDeprecatedMemberInfo((ExecutableElement)currentMember, methodsContent);
     }
 
     /**
      * Build the information for the method.
      *
-     * @param methodsContentTree content tree to which the documentation will be added
+     * @param methodsContent the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildMethodInfo(Content methodsContentTree) throws DocletException  {
+    protected void buildMethodInfo(Content methodsContent) throws DocletException  {
         if (options.noComment()) {
             return;
         }
 
-        buildMethodDescription(methodsContentTree);
-        buildMethodTags(methodsContentTree);
+        buildMethodDescription(methodsContent);
+        buildMethodTags(methodsContent);
     }
 
     /**
      * Build method description.
      *
-     * @param methodsContentTree content tree to which the documentation will be added
+     * @param methodsContent the content to which the documentation will be added
      */
-    protected void buildMethodDescription(Content methodsContentTree) {
-        methodWriter.addMemberDescription((ExecutableElement)currentMember, methodsContentTree);
+    protected void buildMethodDescription(Content methodsContent) {
+        methodWriter.addMemberDescription((ExecutableElement)currentMember, methodsContent);
     }
 
     /**
      * Build the method tags.
      *
-     * @param methodsContentTree content tree to which the documentation will be added
+     * @param methodsContent the content to which the documentation will be added
      */
-    protected void buildMethodTags(Content methodsContentTree) {
-        methodWriter.addMemberTags((ExecutableElement)currentMember, methodsContentTree);
+    protected void buildMethodTags(Content methodsContent) {
+        methodWriter.addMemberTags((ExecutableElement)currentMember, methodsContent);
         ExecutableElement method = (ExecutableElement)currentMember;
         if (method.getSimpleName().toString().compareTo("writeExternal") == 0
                 && utils.getSerialDataTrees(method).isEmpty()) {
@@ -362,11 +362,11 @@ public class SerializedFormBuilder extends AbstractBuilder {
     /**
      * Build the field header.
      *
-     * @param classContentTree content tree to which the documentation will be added
+     * @param classContent the content to which the documentation will be added
      */
-    protected void buildFieldHeader(Content classContentTree) {
+    protected void buildFieldHeader(Content classContent) {
         if (!utils.serializableFields(currentTypeElement).isEmpty()) {
-            buildFieldSerializationOverview(currentTypeElement, classContentTree);
+            buildFieldSerializationOverview(currentTypeElement, classContent);
         }
     }
 
@@ -374,25 +374,25 @@ public class SerializedFormBuilder extends AbstractBuilder {
      * Build the serialization overview for the given class.
      *
      * @param typeElement the class to print the overview for.
-     * @param classContentTree content tree to which the documentation will be added
+     * @param classContent the content to which the documentation will be added
      */
-    public void buildFieldSerializationOverview(TypeElement typeElement, Content classContentTree) {
+    public void buildFieldSerializationOverview(TypeElement typeElement, Content classContent) {
         if (utils.definesSerializableFields(typeElement)) {
             VariableElement ve = utils.serializableFields(typeElement).first();
             // Check to see if there are inline comments, tags or deprecation
             // information to be printed.
             if (fieldWriter.shouldPrintOverview(ve)) {
-                Content serializableFieldsTree = fieldWriter.getSerializableFieldsHeader();
-                Content fieldsOverviewContentTree = fieldWriter.getFieldsContentHeader(true);
-                fieldWriter.addMemberDeprecatedInfo(ve, fieldsOverviewContentTree);
+                Content serializableFieldsHeader = fieldWriter.getSerializableFieldsHeader();
+                Content fieldsOverviewContent = fieldWriter.getFieldsContentHeader(true);
+                fieldWriter.addMemberDeprecatedInfo(ve, fieldsOverviewContent);
                 if (!options.noComment()) {
-                    fieldWriter.addMemberDescription(ve, fieldsOverviewContentTree);
-                    fieldWriter.addMemberTags(ve, fieldsOverviewContentTree);
+                    fieldWriter.addMemberDescription(ve, fieldsOverviewContent);
+                    fieldWriter.addMemberTags(ve, fieldsOverviewContent);
                 }
-                serializableFieldsTree.add(fieldsOverviewContentTree);
-                classContentTree.add(fieldWriter.getSerializableFields(
+                serializableFieldsHeader.add(fieldsOverviewContent);
+                classContent.add(fieldWriter.getSerializableFields(
                         resources.getText("doclet.Serialized_Form_class"),
-                        serializableFieldsTree));
+                        serializableFieldsHeader));
             }
         }
     }
@@ -400,67 +400,67 @@ public class SerializedFormBuilder extends AbstractBuilder {
     /**
      * Build the summaries for the fields that belong to the given class.
      *
-     * @param classContentTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      * @throws DocletException if there is a problem while building the documentation
      */
-    protected void buildSerializableFields(Content classContentTree)
+    protected void buildSerializableFields(Content target)
             throws DocletException {
         SortedSet<VariableElement> members = utils.serializableFields(currentTypeElement);
         if (!members.isEmpty()) {
-            Content serializableFieldsTree = fieldWriter.getSerializableFieldsHeader();
+            Content serializableFieldsHeader = fieldWriter.getSerializableFieldsHeader();
             for (VariableElement ve : members) {
                 currentMember = ve;
                 if (!utils.definesSerializableFields(currentTypeElement)) {
-                    Content fieldsContentTree = fieldWriter.getFieldsContentHeader(
+                    Content fieldsContent = fieldWriter.getFieldsContentHeader(
                             currentMember == members.last());
 
-                    buildFieldSubHeader(fieldsContentTree);
-                    buildFieldDeprecationInfo(fieldsContentTree);
-                    buildFieldInfo(fieldsContentTree);
+                    buildFieldSubHeader(fieldsContent);
+                    buildFieldDeprecationInfo(fieldsContent);
+                    buildFieldInfo(fieldsContent);
 
-                    serializableFieldsTree.add(fieldsContentTree);
+                    serializableFieldsHeader.add(fieldsContent);
                 } else {
-                    buildSerialFieldTagsInfo(serializableFieldsTree);
+                    buildSerialFieldTagsInfo(serializableFieldsHeader);
                 }
             }
-            classContentTree.add(fieldWriter.getSerializableFields(
+            target.add(fieldWriter.getSerializableFields(
                     resources.getText("doclet.Serialized_Form_fields"),
-                    serializableFieldsTree));
+                    serializableFieldsHeader));
         }
     }
 
     /**
      * Build the field sub header.
      *
-     * @param fieldsContentTree content tree to which the documentation will be added
+     * @param fieldsContent the content to which the documentation will be added
      */
-    protected void buildFieldSubHeader(Content fieldsContentTree) {
+    protected void buildFieldSubHeader(Content fieldsContent) {
         if (!utils.definesSerializableFields(currentTypeElement)) {
             VariableElement field = (VariableElement) currentMember;
             fieldWriter.addMemberHeader(field.asType(),
                     utils.getSimpleName(field),
-                    fieldsContentTree);
+                    fieldsContent);
         }
     }
 
     /**
      * Build the field deprecation information.
      *
-     * @param fieldsContentTree content tree to which the documentation will be added
+     * @param fieldsContent the content to which the documentation will be added
      */
-    protected void buildFieldDeprecationInfo(Content fieldsContentTree) {
+    protected void buildFieldDeprecationInfo(Content fieldsContent) {
         if (!utils.definesSerializableFields(currentTypeElement)) {
             fieldWriter.addMemberDeprecatedInfo((VariableElement)currentMember,
-                    fieldsContentTree);
+                    fieldsContent);
         }
     }
 
     /**
      * Build the serial field tags information.
      *
-     * @param serializableFieldsTree content tree to which the documentation will be added
+     * @param target the content to which the documentation will be added
      */
-    protected void buildSerialFieldTagsInfo(Content serializableFieldsTree) {
+    protected void buildSerialFieldTagsInfo(Content target) {
         if (options.noComment()) {
             return;
         }
@@ -477,20 +477,20 @@ public class SerializedFormBuilder extends AbstractBuilder {
         for (SerialFieldTree tag : tags) {
             if (tag.getName() == null || tag.getType() == null)  // ignore malformed @serialField tags
                 continue;
-            Content fieldsContentTree = fieldWriter.getFieldsContentHeader(tag.equals(tags.last()));
+            Content fieldsContent = fieldWriter.getFieldsContentHeader(tag.equals(tags.last()));
             TypeMirror type = ch.getReferencedType(tag);
-            fieldWriter.addMemberHeader(type, tag.getName().getName().toString(), fieldsContentTree);
-            fieldWriter.addMemberDescription(field, tag, fieldsContentTree);
-            serializableFieldsTree.add(fieldsContentTree);
+            fieldWriter.addMemberHeader(type, tag.getName().getName().toString(), fieldsContent);
+            fieldWriter.addMemberDescription(field, tag, fieldsContent);
+            target.add(fieldsContent);
         }
     }
 
     /**
      * Build the field information.
      *
-     * @param fieldsContentTree content tree to which the documentation will be added
+     * @param fieldsContent the content to which the documentation will be added
      */
-    protected void buildFieldInfo(Content fieldsContentTree) {
+    protected void buildFieldInfo(Content fieldsContent) {
         if (options.noComment()) {
             return;
         }
@@ -503,8 +503,8 @@ public class SerializedFormBuilder extends AbstractBuilder {
                     "doclet.MissingSerialTag", utils.getFullyQualifiedName(te),
                     utils.getSimpleName(field));
         }
-        fieldWriter.addMemberDescription(field, fieldsContentTree);
-        fieldWriter.addMemberTags(field, fieldsContentTree);
+        fieldWriter.addMemberDescription(field, fieldsContent);
+        fieldWriter.addMemberTags(field, fieldsContent);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
index 04a238800cd..3d8f7b90e2d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java
@@ -56,9 +56,7 @@ public abstract class LinkFactory {
     }
 
     /**
-     * Returns an empty instance of a content object.
-     *
-     * @return an empty instance of a content object.
+     * {@return a new instance of a content object}
      */
     protected abstract Content newContent();
 
@@ -66,7 +64,7 @@ public abstract class LinkFactory {
      * Constructs a link from the given link information.
      *
      * @param linkInfo the information about the link.
-     * @return the output of the link.
+     * @return the link.
      */
     public Content getLink(LinkInfo linkInfo) {
         if (linkInfo.type != null) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java
index 9094e04a087..277295bdfed 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,9 +93,7 @@ public abstract class LinkInfo {
     public boolean skipPreview;
 
     /**
-     * Returns an empty instance of a content object.
-     *
-     * @return an empty instance of a content object.
+     * {@return a new instance of a content object}
      */
     protected abstract Content newContent();
 
-- 
GitLab


From 63fec5da27994b05a58ce1abcfe07a8ed8bc497b Mon Sep 17 00:00:00 2001
From: Luis Pinto <luis.pinto@oracle.com>
Date: Fri, 1 Apr 2022 13:26:20 +0000
Subject: [PATCH 316/345] 8283525: http://tools.ietf.org/html/* URLs return 404

Reviewed-by: coffeys
---
 .../share/classes/java/security/Key.java       |  2 +-
 .../classes/java/security/SecureRandom.java    |  2 +-
 .../classes/java/security/cert/CRLReason.java  |  2 +-
 .../java/security/cert/TrustAnchor.java        |  2 +-
 .../classes/java/security/cert/X509CRL.java    |  2 +-
 .../java/security/cert/X509CRLSelector.java    |  2 +-
 .../java/security/cert/X509CertSelector.java   |  2 +-
 .../java/security/cert/X509Certificate.java    |  2 +-
 .../share/classes/java/util/Locale.java        | 18 +++++++++---------
 .../javax/crypto/spec/RC5ParameterSpec.java    |  2 +-
 .../security/auth/x500/X500Principal.java      |  6 +++---
 .../javax/security/auth/x500/package-info.java |  8 ++++----
 .../share/classes/sun/security/pkcs/PKCS7.java |  2 +-
 .../x509/AuthorityInfoAccessExtension.java     |  2 +-
 .../x509/DeltaCRLIndicatorExtension.java       |  2 +-
 .../security/x509/FreshestCRLExtension.java    |  2 +-
 .../IssuingDistributionPointExtension.java     |  2 +-
 .../x509/SubjectInfoAccessExtension.java       |  2 +-
 .../classes/sun/security/x509/X509CRLImpl.java |  2 +-
 .../share/native/libzip/zlib/ChangeLog         |  2 +-
 src/java.base/share/native/libzip/zlib/README  |  2 +-
 .../share/native/libzip/zlib/deflate.c         |  2 +-
 src/java.base/share/native/libzip/zlib/zlib.h  |  2 +-
 .../imageio/plugins/tiff/FaxTIFFTagSet.java    |  2 +-
 .../classes/org/ietf/jgss/GSSContext.java      |  2 +-
 src/jdk.jartool/share/man/jarsigner.1          |  2 +-
 .../classes/com/sun/nio/sctp/Association.java  |  2 +-
 .../classes/com/sun/nio/sctp/package-info.java |  4 ++--
 .../internal/net/http/hpack/DecoderTest.java   | 16 ++++++++--------
 .../internal/net/http/hpack/EncoderTest.java   | 16 ++++++++--------
 .../example/authz/AuthzIdRequestControl.java   |  2 +-
 .../example/authz/AuthzIdResponseControl.java  |  2 +-
 32 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/java.base/share/classes/java/security/Key.java b/src/java.base/share/classes/java/security/Key.java
index 1c01095caf9..b805998a151 100644
--- a/src/java.base/share/classes/java/security/Key.java
+++ b/src/java.base/share/classes/java/security/Key.java
@@ -63,7 +63,7 @@ package java.security;
  * </pre>
  *
  * For more information, see
- * <a href="http://tools.ietf.org/html/rfc5280">RFC 5280:
+ * <a href="https://tools.ietf.org/html/rfc5280">RFC 5280:
  * Internet X.509 Public Key Infrastructure Certificate and CRL Profile</a>.
  *
  * <LI>A Format
diff --git a/src/java.base/share/classes/java/security/SecureRandom.java b/src/java.base/share/classes/java/security/SecureRandom.java
index 1cf18d74a0f..02422b77bc3 100644
--- a/src/java.base/share/classes/java/security/SecureRandom.java
+++ b/src/java.base/share/classes/java/security/SecureRandom.java
@@ -50,7 +50,7 @@ import sun.security.util.Debug;
  * Therefore any seed material passed to a {@code SecureRandom} object must be
  * unpredictable, and all {@code SecureRandom} output sequences must be
  * cryptographically strong, as described in
- * <a href="http://tools.ietf.org/html/rfc4086">
+ * <a href="https://tools.ietf.org/html/rfc4086">
  * <i>RFC 4086: Randomness Requirements for Security</i></a>.
  *
  * <p> Many {@code SecureRandom} implementations are in the form of a
diff --git a/src/java.base/share/classes/java/security/cert/CRLReason.java b/src/java.base/share/classes/java/security/cert/CRLReason.java
index 79d4729d0b8..2bc83f3356b 100644
--- a/src/java.base/share/classes/java/security/cert/CRLReason.java
+++ b/src/java.base/share/classes/java/security/cert/CRLReason.java
@@ -27,7 +27,7 @@ package java.security.cert;
 
 /**
  * The CRLReason enumeration specifies the reason that a certificate
- * is revoked, as defined in <a href="http://tools.ietf.org/html/rfc5280">
+ * is revoked, as defined in <a href="https://tools.ietf.org/html/rfc5280">
  * RFC 5280: Internet X.509 Public Key Infrastructure Certificate and CRL
  * Profile</a>.
  *
diff --git a/src/java.base/share/classes/java/security/cert/TrustAnchor.java b/src/java.base/share/classes/java/security/cert/TrustAnchor.java
index ab60b5cbd9a..2626bcf3c2d 100644
--- a/src/java.base/share/classes/java/security/cert/TrustAnchor.java
+++ b/src/java.base/share/classes/java/security/cert/TrustAnchor.java
@@ -84,7 +84,7 @@ public class TrustAnchor {
      * The name constraints are specified as a byte array. This byte array
      * should contain the DER encoded form of the name constraints, as they
      * would appear in the NameConstraints structure defined in
-     * <a href="http://tools.ietf.org/html/rfc5280">RFC 5280</a>
+     * <a href="https://tools.ietf.org/html/rfc5280">RFC 5280</a>
      * and X.509. The ASN.1 definition of this structure appears below.
      *
      * <pre>{@code
diff --git a/src/java.base/share/classes/java/security/cert/X509CRL.java b/src/java.base/share/classes/java/security/cert/X509CRL.java
index a9f3d2939aa..48982d70ada 100644
--- a/src/java.base/share/classes/java/security/cert/X509CRL.java
+++ b/src/java.base/share/classes/java/security/cert/X509CRL.java
@@ -66,7 +66,7 @@ import sun.security.util.SignatureUtil;
  * </pre>
  * <p>
  * More information can be found in
- * <a href="http://tools.ietf.org/html/rfc5280">RFC 5280: Internet X.509
+ * <a href="https://tools.ietf.org/html/rfc5280">RFC 5280: Internet X.509
  * Public Key Infrastructure Certificate and CRL Profile</a>.
  * <p>
  * The ASN.1 definition of {@code tbsCertList} is:
diff --git a/src/java.base/share/classes/java/security/cert/X509CRLSelector.java b/src/java.base/share/classes/java/security/cert/X509CRLSelector.java
index 444100cbdcc..45bc470c8c1 100644
--- a/src/java.base/share/classes/java/security/cert/X509CRLSelector.java
+++ b/src/java.base/share/classes/java/security/cert/X509CRLSelector.java
@@ -53,7 +53,7 @@ import sun.security.x509.X500Name;
  * {@link CertStore#getCRLs CertStore.getCRLs} or some similar
  * method.
  * <p>
- * Please refer to <a href="http://tools.ietf.org/html/rfc5280">RFC 5280:
+ * Please refer to <a href="https://tools.ietf.org/html/rfc5280">RFC 5280:
  * Internet X.509 Public Key Infrastructure Certificate and CRL Profile</a>
  * for definitions of the X.509 CRL fields and extensions mentioned below.
  * <p>
diff --git a/src/java.base/share/classes/java/security/cert/X509CertSelector.java b/src/java.base/share/classes/java/security/cert/X509CertSelector.java
index 5a25ba5927f..291ff5bee83 100644
--- a/src/java.base/share/classes/java/security/cert/X509CertSelector.java
+++ b/src/java.base/share/classes/java/security/cert/X509CertSelector.java
@@ -62,7 +62,7 @@ import sun.security.x509.*;
  * number. Other unique combinations include the issuer, subject,
  * subjectKeyIdentifier and/or the subjectPublicKey criteria.
  * <p>
- * Please refer to <a href="http://tools.ietf.org/html/rfc5280">RFC 5280:
+ * Please refer to <a href="https://tools.ietf.org/html/rfc5280">RFC 5280:
  * Internet X.509 Public Key Infrastructure Certificate and CRL Profile</a> for
  * definitions of the X.509 certificate extensions mentioned below.
  * <p>
diff --git a/src/java.base/share/classes/java/security/cert/X509Certificate.java b/src/java.base/share/classes/java/security/cert/X509Certificate.java
index 127f60b4180..a05f957ac97 100644
--- a/src/java.base/share/classes/java/security/cert/X509Certificate.java
+++ b/src/java.base/share/classes/java/security/cert/X509Certificate.java
@@ -65,7 +65,7 @@ import sun.security.util.SignatureUtil;
  * CA such as a "root" CA.
  * <p>
  * More information can be found in
- * <a href="http://tools.ietf.org/html/rfc5280">RFC 5280: Internet X.509
+ * <a href="https://tools.ietf.org/html/rfc5280">RFC 5280: Internet X.509
  * Public Key Infrastructure Certificate and CRL Profile</a>.
  * <p>
  * The ASN.1 definition of {@code tbsCertificate} is:
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 2da179a5dd7..a06e5c4f4b7 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -75,8 +75,8 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  * region, or culture.
  *
  * <p> The {@code Locale} class implements IETF BCP 47 which is composed of
- * <a href="http://tools.ietf.org/html/rfc4647">RFC 4647 "Matching of Language
- * Tags"</a> and <a href="http://tools.ietf.org/html/rfc5646">RFC 5646 "Tags
+ * <a href="https://tools.ietf.org/html/rfc4647">RFC 4647 "Matching of Language
+ * Tags"</a> and <a href="https://tools.ietf.org/html/rfc5646">RFC 5646 "Tags
  * for Identifying Languages"</a> with support for the LDML (UTS#35, "Unicode
  * Locale Data Markup Language") BCP 47-compatible extensions for locale data
  * exchange.
@@ -280,7 +280,7 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  * locale matching documentation.
  *
  * <p>In order to do matching a user's preferred locales to a set of language
- * tags, <a href="http://tools.ietf.org/html/rfc4647">RFC 4647 Matching of
+ * tags, <a href="https://tools.ietf.org/html/rfc4647">RFC 4647 Matching of
  * Language Tags</a> defines two mechanisms: filtering and lookup.
  * <em>Filtering</em> is used to get all matching locales, whereas
  * <em>lookup</em> is to choose the best matching locale.
@@ -2853,7 +2853,7 @@ public final class Locale implements Cloneable, Serializable {
 
     /**
      * This enum provides constants to select a filtering mode for locale
-     * matching. Refer to <a href="http://tools.ietf.org/html/rfc4647">RFC 4647
+     * matching. Refer to <a href="https://tools.ietf.org/html/rfc4647">RFC 4647
      * Matching of Language Tags</a> for details.
      *
      * <p>As an example, think of two Language Priority Lists each of which
@@ -2989,7 +2989,7 @@ public final class Locale implements Cloneable, Serializable {
 
     /**
      * This class expresses a <em>Language Range</em> defined in
-     * <a href="http://tools.ietf.org/html/rfc4647">RFC 4647 Matching of
+     * <a href="https://tools.ietf.org/html/rfc4647">RFC 4647 Matching of
      * Language Tags</a>. A language range is an identifier which is used to
      * select language tag(s) meeting specific requirements by using the
      * mechanisms described in <a href="Locale.html#LocaleMatching">Locale
@@ -2998,7 +2998,7 @@ public final class Locale implements Cloneable, Serializable {
      *
      * <p>There are two types of language ranges: basic and extended. In RFC
      * 4647, the syntax of language ranges is expressed in
-     * <a href="http://tools.ietf.org/html/rfc4234">ABNF</a> as follows:
+     * <a href="https://tools.ietf.org/html/rfc4234">ABNF</a> as follows:
      * <blockquote>
      * <pre>
      *     basic-language-range    = (1*8ALPHA *("-" 1*8alphanum)) / "*"
@@ -3164,7 +3164,7 @@ public final class Locale implements Cloneable, Serializable {
          *
          * In a weighted list, each language range is given a weight value.
          * The weight value is identical to the "quality value" in
-         * <a href="http://tools.ietf.org/html/rfc2616">RFC 2616</a>, and it
+         * <a href="https://tools.ietf.org/html/rfc2616">RFC 2616</a>, and it
          * expresses how much the user prefers  the language. A weight value is
          * specified after a corresponding language range followed by
          * {@code ";q="}, and the default weight value is {@code MAX_WEIGHT}
@@ -3202,7 +3202,7 @@ public final class Locale implements Cloneable, Serializable {
          *
          * @param ranges a list of comma-separated language ranges or a list of
          *     language ranges in the form of the "Accept-Language" header
-         *     defined in <a href="http://tools.ietf.org/html/rfc2616">RFC
+         *     defined in <a href="https://tools.ietf.org/html/rfc2616">RFC
          *     2616</a>
          * @return a Language Priority List consisting of language ranges
          *     included in the given {@code ranges} and their equivalent
@@ -3223,7 +3223,7 @@ public final class Locale implements Cloneable, Serializable {
          *
          * @param ranges a list of comma-separated language ranges or a list
          *     of language ranges in the form of the "Accept-Language" header
-         *     defined in <a href="http://tools.ietf.org/html/rfc2616">RFC
+         *     defined in <a href="https://tools.ietf.org/html/rfc2616">RFC
          *     2616</a>
          * @param map a map containing information to customize language ranges
          * @return a Language Priority List with customization. The list is
diff --git a/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java
index ced87331bce..0a86e17cd02 100644
--- a/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java
@@ -29,7 +29,7 @@ import java.security.spec.AlgorithmParameterSpec;
 
 /**
  * This class specifies the parameters used with the
- * <a href="http://tools.ietf.org/html/rfc2040"><i>RC5</i></a>
+ * <a href="https://tools.ietf.org/html/rfc2040"><i>RC5</i></a>
  * algorithm.
  *
  * <p> The parameters consist of a version number, a rounds count, a word
diff --git a/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java b/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java
index f0bf5e0ae2e..578249ef48d 100644
--- a/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java
+++ b/src/java.base/share/classes/javax/security/auth/x500/X500Principal.java
@@ -41,13 +41,13 @@ import sun.security.util.*;
  * of the distinguished name, or by using the ASN.1 DER encoded byte
  * representation of the distinguished name.  The current specification
  * for the string representation of a distinguished name is defined in
- * <a href="http://tools.ietf.org/html/rfc2253">RFC 2253: Lightweight
+ * <a href="https://tools.ietf.org/html/rfc2253">RFC 2253: Lightweight
  * Directory Access Protocol (v3): UTF-8 String Representation of
  * Distinguished Names</a>. This class, however, accepts string formats from
- * both RFC 2253 and <a href="http://tools.ietf.org/html/rfc1779">RFC 1779:
+ * both RFC 2253 and <a href="https://tools.ietf.org/html/rfc1779">RFC 1779:
  * A String Representation of Distinguished Names</a>, and also recognizes
  * attribute type keywords whose OIDs (Object Identifiers) are defined in
- * <a href="http://tools.ietf.org/html/rfc5280">RFC 5280: Internet X.509
+ * <a href="https://tools.ietf.org/html/rfc5280">RFC 5280: Internet X.509
  * Public Key Infrastructure Certificate and CRL Profile</a>.
  *
  * <p> The string representation for this {@code X500Principal}
diff --git a/src/java.base/share/classes/javax/security/auth/x500/package-info.java b/src/java.base/share/classes/javax/security/auth/x500/package-info.java
index 38c6439092e..45859a79bed 100644
--- a/src/java.base/share/classes/javax/security/auth/x500/package-info.java
+++ b/src/java.base/share/classes/javax/security/auth/x500/package-info.java
@@ -31,15 +31,15 @@
  * <h2>Package Specification</h2>
  *
  * <ul>
- *   <li><a href="http://tools.ietf.org/html/rfc1779">
+ *   <li><a href="https://tools.ietf.org/html/rfc1779">
  *     RFC 1779: A String Representation of Distinguished Names</a></li>
- *   <li><a href="http://tools.ietf.org/html/rfc2253">
+ *   <li><a href="https://tools.ietf.org/html/rfc2253">
  *     RFC 2253: Lightweight Directory Access Protocol (v3):
  *     UTF-8 String Representation of Distinguished Names</a></li>
- *   <li><a href="http://tools.ietf.org/html/rfc5280">
+ *   <li><a href="https://tools.ietf.org/html/rfc5280">
  *     RFC 5280: Internet X.509 Public Key Infrastructure
  *     Certificate and Certificate Revocation List (CRL) Profile</a></li>
- *   <li><a href="http://tools.ietf.org/html/rfc4512">
+ *   <li><a href="https://tools.ietf.org/html/rfc4512">
  *     RFC 4512: Lightweight Directory Access Protocol (LDAP):
  *     Directory Information Models</a></li>
  * </ul>
diff --git a/src/java.base/share/classes/sun/security/pkcs/PKCS7.java b/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
index 3484bd04c32..da6d1687a6d 100644
--- a/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
+++ b/src/java.base/share/classes/sun/security/pkcs/PKCS7.java
@@ -940,7 +940,7 @@ public class PKCS7 {
 
     /**
      * Examine the certificate for a Subject Information Access extension
-     * (<a href="http://tools.ietf.org/html/rfc5280">RFC 5280</a>).
+     * (<a href="https://tools.ietf.org/html/rfc5280">RFC 5280</a>).
      * The extension's {@code accessMethod} field should contain the object
      * identifier defined for timestamping: 1.3.6.1.5.5.7.48.3 and its
      * {@code accessLocation} field should contain an HTTP or HTTPS URL.
diff --git a/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java b/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
index 69459fb6ef0..f25110dfbbe 100644
--- a/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
+++ b/src/java.base/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
@@ -43,7 +43,7 @@ import sun.security.util.DerValue;
  * certificate that identifies the specific OCSP Responder to use when
  * performing on-line validation of that certificate.
  * <p>
- * This extension is defined in <a href="http://tools.ietf.org/html/rfc5280">
+ * This extension is defined in <a href="https://tools.ietf.org/html/rfc5280">
  * Internet X.509 PKI Certificate and Certificate Revocation List
  * (CRL) Profile</a>. The profile permits
  * the extension to be included in end-entity or CA certificates,
diff --git a/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java b/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
index 5933758874a..10e36f2b4ae 100644
--- a/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
+++ b/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
@@ -42,7 +42,7 @@ import java.math.BigInteger;
  *
  * <p>
  * The extension is defined in Section 5.2.4 of
- * <a href="http://tools.ietf.org/html/rfc5280">Internet X.509 PKI
+ * <a href="https://tools.ietf.org/html/rfc5280">Internet X.509 PKI
  * Certificate and Certificate Revocation List (CRL) Profile</a>.
  *
  * <p>
diff --git a/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java b/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java
index 84dcb284cab..4cc0b5180b5 100644
--- a/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java
+++ b/src/java.base/share/classes/sun/security/x509/FreshestCRLExtension.java
@@ -42,7 +42,7 @@ import sun.security.util.*;
  *
  * <p>
  * The extension is defined in Section 5.2.6 of
- * <a href="http://tools.ietf.org/html/rfc5280">Internet X.509 PKI
+ * <a href="https://tools.ietf.org/html/rfc5280">Internet X.509 PKI
  * Certificate and Certificate Revocation List (CRL) Profile</a>.
  *
  * <p>
diff --git a/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java b/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
index d810cf012ae..f214cddf650 100644
--- a/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
+++ b/src/java.base/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
@@ -46,7 +46,7 @@ import sun.security.util.DerValue;
  *
  * <p>
  * The extension is defined in Section 5.2.5 of
- * <a href="http://tools.ietf.org/html/rfc5280">Internet X.509 PKI
+ * <a href="https://tools.ietf.org/html/rfc5280">Internet X.509 PKI
  * Certificate and Certificate Revocation List (CRL) Profile</a>.
  *
  * <p>
diff --git a/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java b/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
index 0acdf96057f..09636a7ebb2 100644
--- a/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
+++ b/src/java.base/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
@@ -48,7 +48,7 @@ import sun.security.util.DerValue;
  * included in end entity or CA certificates.  Conforming CAs MUST mark
  * this extension as non-critical.
  * <p>
- * This extension is defined in <a href="http://tools.ietf.org/html/rfc5280">
+ * This extension is defined in <a href="https://tools.ietf.org/html/rfc5280">
  * Internet X.509 PKI Certificate and Certificate Revocation List
  * (CRL) Profile</a>. The profile permits
  * the extension to be included in end-entity or CA certificates,
diff --git a/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java b/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
index 551e38ad31c..f721b8156dc 100644
--- a/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
+++ b/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
@@ -54,7 +54,7 @@ import sun.security.util.*;
  *     signature            BIT STRING  }
  * </pre>
  * More information can be found in
- * <a href="http://tools.ietf.org/html/rfc5280">RFC 5280: Internet X.509
+ * <a href="https://tools.ietf.org/html/rfc5280">RFC 5280: Internet X.509
  * Public Key Infrastructure Certificate and CRL Profile</a>.
  * <p>
  * The ASN.1 definition of <code>tbsCertList</code> is:
diff --git a/src/java.base/share/native/libzip/zlib/ChangeLog b/src/java.base/share/native/libzip/zlib/ChangeLog
index 30199a65a03..9dbeb5e5642 100644
--- a/src/java.base/share/native/libzip/zlib/ChangeLog
+++ b/src/java.base/share/native/libzip/zlib/ChangeLog
@@ -304,7 +304,7 @@ Changes in 1.2.5.1 (10 Sep 2011)
 - Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
 - Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
 - Add debug records in assmebler code [Londer]
-- Update RFC references to use http://tools.ietf.org/html/... [Li]
+- Update RFC references to use https://tools.ietf.org/html/... [Li]
 - Add --archs option, use of libtool to configure for Mac OS X [Borstel]
 
 Changes in 1.2.5 (19 Apr 2010)
diff --git a/src/java.base/share/native/libzip/zlib/README b/src/java.base/share/native/libzip/zlib/README
index 51106de4753..a0d208b7705 100644
--- a/src/java.base/share/native/libzip/zlib/README
+++ b/src/java.base/share/native/libzip/zlib/README
@@ -3,7 +3,7 @@ ZLIB DATA COMPRESSION LIBRARY
 zlib 1.2.11 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
-http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
+https://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
 rfc1952 (gzip format).
 
 All functions of the compression library are documented in the file zlib.h
diff --git a/src/java.base/share/native/libzip/zlib/deflate.c b/src/java.base/share/native/libzip/zlib/deflate.c
index f30f71bdd79..f8d84da882a 100644
--- a/src/java.base/share/native/libzip/zlib/deflate.c
+++ b/src/java.base/share/native/libzip/zlib/deflate.c
@@ -61,7 +61,7 @@
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://tools.ietf.org/html/rfc1951
+ *      Available in https://tools.ietf.org/html/rfc1951
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
diff --git a/src/java.base/share/native/libzip/zlib/zlib.h b/src/java.base/share/native/libzip/zlib/zlib.h
index e383d0e4508..729c77ba165 100644
--- a/src/java.base/share/native/libzip/zlib/zlib.h
+++ b/src/java.base/share/native/libzip/zlib/zlib.h
@@ -48,7 +48,7 @@
 
 
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  Comments) 1950 to 1952 in the files https://tools.ietf.org/html/rfc1950
   (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
diff --git a/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java
index f31663bfa63..881df65993f 100644
--- a/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java
+++ b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java
@@ -29,7 +29,7 @@ import java.util.List;
 
 /**
  * A class representing the extra tags found in a
- * <a href="http://tools.ietf.org/html/rfc2306.html">TIFF-F</a> (RFC 2036) file.
+ * <a href="https://tools.ietf.org/html/rfc2306.html">TIFF-F</a> (RFC 2036) file.
  *
  * @since 9
  */
diff --git a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
index 1492033c49c..7bbb89544be 100644
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/GSSContext.java
@@ -101,7 +101,7 @@ import java.io.OutputStream;
  *
  * The stream-based methods of {@code GSSContext} have been deprecated in
  * Java SE 11. These methods have also been removed from
- * <a href="http://tools.ietf.org/html/rfc8353">
+ * <a href="https://tools.ietf.org/html/rfc8353">
  * RFC 8353: Generic Security Service API Version 2: Java Bindings Update</a>
  * for the following reasons (see section 11): "The overloaded methods of
  * GSSContext that use input and output streams as the means to convey
diff --git a/src/jdk.jartool/share/man/jarsigner.1 b/src/jdk.jartool/share/man/jarsigner.1
index bcf457fb6f6..9cf2df33b22 100644
--- a/src/jdk.jartool/share/man/jarsigner.1
+++ b/src/jdk.jartool/share/man/jarsigner.1
@@ -766,7 +766,7 @@ The file can be a sequence of concatenated X.509 certificates, or a
 single PKCS#7 formatted data block, either in binary encoding format or
 in printable encoding format (also known as Base64 encoding) as defined
 by \f[B]Internet RFC 1421 Certificate Encoding Standard\f[R]
-[http://tools.ietf.org/html/rfc1421].
+[https://tools.ietf.org/html/rfc1421].
 .RS
 .RE
 .TP
diff --git a/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java
index 79170ddf831..17d05a61a39 100644
--- a/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java
+++ b/src/jdk.sctp/share/classes/com/sun/nio/sctp/Association.java
@@ -39,7 +39,7 @@ package com.sun.nio.sctp;
  * shutdown. An association ID is not unique across multiple SCTP channels.
  * An Association's local and remote addresses may change if the SCTP
  * implementation supports <I>Dynamic Address Reconfiguration</I> as defined by
- * <A HREF="http://tools.ietf.org/html/rfc5061">RFC5061</A>, see the
+ * <A HREF="https://tools.ietf.org/html/rfc5061">RFC5061</A>, see the
  * {@code bindAddress} and {@code unbindAddress} methods of {@link SctpChannel},
  * {@link SctpServerChannel}, and {@link SctpMultiChannel}.
  *
diff --git a/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java
index 53fd53d4819..513b7392471 100644
--- a/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java
+++ b/src/jdk.sctp/share/classes/com/sun/nio/sctp/package-info.java
@@ -65,9 +65,9 @@
  * com.sun.nio.sctp.NotificationHandler notification handler}.
  *
  * <P> The SCTP protocol is defined by
- * <A HREF="http://tools.ietf.org/html/rfc4960">RFC4960</A>, and the optional
+ * <A HREF="https://tools.ietf.org/html/rfc4960">RFC4960</A>, and the optional
  * extension for <I>Dynamic Address Reconfiguration</I> is defined by
- * <A HREF="http://tools.ietf.org/html/rfc5061">RFC5061</A>.
+ * <A HREF="https://tools.ietf.org/html/rfc5061">RFC5061</A>.
  *
  * @since 1.7
  */
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
index 34eb5103bf8..2f82852ae8a 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
@@ -44,7 +44,7 @@ import static jdk.internal.net.http.hpack.TestHelper.*;
 public final class DecoderTest {
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.2.1
+    // https://tools.ietf.org/html/rfc7541#appendix-C.2.1
     //
     @Test
     public void example1() {
@@ -60,7 +60,7 @@ public final class DecoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.2.2
+    // https://tools.ietf.org/html/rfc7541#appendix-C.2.2
     //
     @Test
     public void example2() {
@@ -72,7 +72,7 @@ public final class DecoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.2.3
+    // https://tools.ietf.org/html/rfc7541#appendix-C.2.3
     //
     @Test
     public void example3() {
@@ -85,7 +85,7 @@ public final class DecoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.2.4
+    // https://tools.ietf.org/html/rfc7541#appendix-C.2.4
     //
     @Test
     public void example4() {
@@ -97,7 +97,7 @@ public final class DecoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.3
+    // https://tools.ietf.org/html/rfc7541#appendix-C.3
     //
     @Test
     public void example5() {
@@ -162,7 +162,7 @@ public final class DecoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.4
+    // https://tools.ietf.org/html/rfc7541#appendix-C.4
     //
     @Test
     public void example6() {
@@ -209,7 +209,7 @@ public final class DecoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.5
+    // https://tools.ietf.org/html/rfc7541#appendix-C.5
     //
     @Test
     public void example7() {
@@ -269,7 +269,7 @@ public final class DecoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.6
+    // https://tools.ietf.org/html/rfc7541#appendix-C.6
     //
     @Test
     public void example8() {
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
index e96ab298bea..bf7769c7eb0 100644
--- a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
@@ -48,7 +48,7 @@ import static org.testng.Assert.assertTrue;
 public final class EncoderTest {
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.2.1
+    // https://tools.ietf.org/html/rfc7541#appendix-C.2.1
     //
     @Test
     public void example1() {
@@ -69,7 +69,7 @@ public final class EncoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.2.2
+    // https://tools.ietf.org/html/rfc7541#appendix-C.2.2
     //
     @Test
     public void example2() {
@@ -88,7 +88,7 @@ public final class EncoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.2.3
+    // https://tools.ietf.org/html/rfc7541#appendix-C.2.3
     //
     @Test
     public void example3() {
@@ -108,7 +108,7 @@ public final class EncoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.2.4
+    // https://tools.ietf.org/html/rfc7541#appendix-C.2.4
     //
     @Test
     public void example4() {
@@ -127,7 +127,7 @@ public final class EncoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.3
+    // https://tools.ietf.org/html/rfc7541#appendix-C.3
     //
     @Test
     public void example5() {
@@ -261,7 +261,7 @@ public final class EncoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.4
+    // https://tools.ietf.org/html/rfc7541#appendix-C.4
     //
     @Test
     public void example6() {
@@ -340,7 +340,7 @@ public final class EncoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.5
+    // https://tools.ietf.org/html/rfc7541#appendix-C.5
     //
     @Test
     public void example7() {
@@ -432,7 +432,7 @@ public final class EncoderTest {
     }
 
     //
-    // http://tools.ietf.org/html/rfc7541#appendix-C.6
+    // https://tools.ietf.org/html/rfc7541#appendix-C.6
     //
     @Test
     public void example8() {
diff --git a/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdRequestControl.java b/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdRequestControl.java
index cd0c518d36b..97343cc2cbb 100644
--- a/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdRequestControl.java
+++ b/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdRequestControl.java
@@ -24,7 +24,7 @@
 /**
  * This class implements the LDAPv3 Authorization Identity request control
  * as defined in
- * <a href="http://tools.ietf.org/html/rfc3829">RFC 3829</a>.
+ * <a href="https://tools.ietf.org/html/rfc3829">RFC 3829</a>.
  */
 
 package org.example.authz;
diff --git a/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControl.java b/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControl.java
index f38f916d3fe..c1d2951b690 100644
--- a/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControl.java
+++ b/test/jdk/javax/naming/module/src/authz/org/example/authz/AuthzIdResponseControl.java
@@ -24,7 +24,7 @@
 /**
  * This class implements the LDAPv3 Authorization Identity response control
  * as defined in
- * <a href="http://tools.ietf.org/html/rfc3829">RFC 3829</a>.
+ * <a href="https://tools.ietf.org/html/rfc3829">RFC 3829</a>.
  */
 
 package org.example.authz;
-- 
GitLab


From 96179c897566029a4815afd309fb1f92912d849d Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Fri, 1 Apr 2022 14:36:52 +0000
Subject: [PATCH 317/345] 8284146: Disable jdk/jshell/HighlightUITest.java on
 macosx-aarch64

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

diff --git a/test/langtools/ProblemList.txt b/test/langtools/ProblemList.txt
index 60cc7e33b4a..964aea79ddd 100644
--- a/test/langtools/ProblemList.txt
+++ b/test/langtools/ProblemList.txt
@@ -34,6 +34,7 @@
 jdk/jshell/UserJdiUserRemoteTest.java                                           8173079    linux-all
 jdk/jshell/UserInputTest.java                                                   8169536    generic-all
 jdk/jshell/ToolBasicTest.java                                                   8265357    macosx-aarch64
+jdk/jshell/HighlightUITest.java                                                 8284144    macosx-aarch64
 
 ###########################################################################
 #
-- 
GitLab


From 943d4ee18ff02acd9f5c9ab0842e58160608d4b2 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 1 Apr 2022 16:14:53 +0000
Subject: [PATCH 318/345] 8284180: Some files missing newlines

Reviewed-by: alanb, pchilanomate, stefank
---
 src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp    | 2 +-
 src/hotspot/share/ci/ciSymbols.hpp                           | 2 +-
 src/hotspot/share/code/debugInfo.hpp                         | 1 -
 src/hotspot/share/gc/parallel/parallelInitLogger.hpp         | 2 +-
 src/hotspot/share/jfr/recorder/service/jfrEventThrottler.hpp | 2 +-
 src/hotspot/share/memory/memRegion.cpp                       | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
index 37221953a77..75ca68e43fb 100644
--- a/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
@@ -41,4 +41,4 @@ class ICache : public AbstractICache {
   }
 };
 
-#endif // OS_CPU_LINUX_AARCH64_ICACHE_AARCH64_HPP
\ No newline at end of file
+#endif // OS_CPU_LINUX_AARCH64_ICACHE_AARCH64_HPP
diff --git a/src/hotspot/share/ci/ciSymbols.hpp b/src/hotspot/share/ci/ciSymbols.hpp
index df77b90148f..244d7196cce 100644
--- a/src/hotspot/share/ci/ciSymbols.hpp
+++ b/src/hotspot/share/ci/ciSymbols.hpp
@@ -40,4 +40,4 @@ class ciSymbols {
 
 };
 
-#endif // SHARE_CI_CISYMBOLS_HPP
\ No newline at end of file
+#endif // SHARE_CI_CISYMBOLS_HPP
diff --git a/src/hotspot/share/code/debugInfo.hpp b/src/hotspot/share/code/debugInfo.hpp
index 3f213783a21..7c85ae60c33 100644
--- a/src/hotspot/share/code/debugInfo.hpp
+++ b/src/hotspot/share/code/debugInfo.hpp
@@ -29,7 +29,6 @@
 #include "code/location.hpp"
 #include "code/nmethod.hpp"
 #include "code/oopRecorder.hpp"
-#include "runtime/stackValue.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/growableArray.hpp"
 
diff --git a/src/hotspot/share/gc/parallel/parallelInitLogger.hpp b/src/hotspot/share/gc/parallel/parallelInitLogger.hpp
index ecd9b453f1f..2a3b6349964 100644
--- a/src/hotspot/share/gc/parallel/parallelInitLogger.hpp
+++ b/src/hotspot/share/gc/parallel/parallelInitLogger.hpp
@@ -34,4 +34,4 @@ class ParallelInitLogger : public GCInitLogger {
   static void print();
 };
 
-#endif //SHARE_GC_PARALLEL_PARALLELINITLOGGER_HPP
\ No newline at end of file
+#endif //SHARE_GC_PARALLEL_PARALLELINITLOGGER_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.hpp b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.hpp
index 226a2d4ecd2..b3c56183630 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.hpp
@@ -54,4 +54,4 @@ class JfrEventThrottler : public JfrAdaptiveSampler {
   static bool accept(JfrEventId event_id, int64_t timestamp = 0);
 };
 
-#endif // SHARE_JFR_RECORDER_SERVICE_JFREVENTTHROTTLER_HPP
\ No newline at end of file
+#endif // SHARE_JFR_RECORDER_SERVICE_JFREVENTTHROTTLER_HPP
diff --git a/src/hotspot/share/memory/memRegion.cpp b/src/hotspot/share/memory/memRegion.cpp
index 3c8dfc837ba..ed8adc7df94 100644
--- a/src/hotspot/share/memory/memRegion.cpp
+++ b/src/hotspot/share/memory/memRegion.cpp
@@ -118,4 +118,4 @@ void MemRegion::destroy_array(MemRegion* array, size_t length) {
     array[i].~MemRegion();
   }
   FREE_C_HEAP_ARRAY(MemRegion, array);
-}
\ No newline at end of file
+}
-- 
GitLab


From 1dfa1eaea0c8958f4b793c0766e36607cbde5c7f Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Fri, 1 Apr 2022 16:28:26 +0000
Subject: [PATCH 319/345] 8284094: Memory leak in
 invoker_completeInvokeRequest()

Reviewed-by: cjplummer, shade
---
 src/jdk.jdwp.agent/share/native/libjdwp/invoker.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
index 2f6eb5f40a1..e1b4d2f3ab6 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
@@ -810,6 +810,7 @@ invoker_completeInvokeRequest(jthread thread)
             tossGlobalRef(env, &exc);
         }
         outStream_sendReply(&out);
+        outStream_destroy(&out);
     }
 }
 
-- 
GitLab


From 028fbf474bf8bd914919e28a7aa50cca0daca314 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Fri, 1 Apr 2022 18:37:39 +0000
Subject: [PATCH 320/345] 8254935: Deprecate the PSSParameterSpec(int)
 constructor

Reviewed-by: mullan
---
 .../java/security/spec/PSSParameterSpec.java  | 41 ++++++++++++-------
 .../sun/security/rsa/PSSParameters.java       | 13 +++---
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java b/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java
index ddc32291dfe..b6603279e04 100644
--- a/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java
+++ b/src/java.base/share/classes/java/security/spec/PSSParameterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,11 @@ package java.security.spec;
 import java.util.Objects;
 
 /**
- * This class specifies a parameter spec for RSASSA-PSS signature scheme,
+ * This class specifies a parameter spec for the RSASSA-PSS signature scheme,
  * as defined in the
  * <a href="https://tools.ietf.org/rfc/rfc8017.txt">PKCS#1 v2.2</a> standard.
  *
- * <p>Its ASN.1 definition in PKCS#1 standard is described below:
+ * <p>Its ASN.1 definition in the PKCS #1 standard is described below:
  * <pre>
  * RSASSA-PSS-params ::= SEQUENCE {
  *   hashAlgorithm      [0] HashAlgorithm      DEFAULT sha1,
@@ -64,12 +64,6 @@ import java.util.Objects;
  *   ...  -- Allows for future expansion --
  * }
  * </pre>
- * <p>Note: the PSSParameterSpec.DEFAULT uses the following:
- *     message digest  -- "SHA-1"
- *     mask generation function (mgf) -- "MGF1"
- *     parameters for mgf -- MGF1ParameterSpec.SHA1
- *     SaltLength   -- 20
- *     TrailerField -- 1
  *
  * @see MGF1ParameterSpec
  * @see AlgorithmParameterSpec
@@ -94,17 +88,26 @@ public class PSSParameterSpec implements AlgorithmParameterSpec {
     private final int trailerField;
 
     /**
-     * The {@code TrailerFieldBC} constant as defined in PKCS#1
+     * The {@code TrailerFieldBC} constant as defined in the PKCS #1 standard.
      *
      * @since 11
      */
     public static final int TRAILER_FIELD_BC = 1;
 
     /**
-     * The PSS parameter set with all default values
+     * The PSS parameter set with all default values.
+     * @deprecated This field uses the default values defined in the PKCS #1
+     *         standard. Some of these defaults are no longer recommended due
+     *         to advances in cryptanalysis -- see the
+     *         <a href="https://tools.ietf.org/rfc/rfc8017.txt">PKCS#1 v2.2</a>
+     *         standard for more details. Thus, it is recommended to create
+     *         a new {@code PSSParameterSpec} with the desired parameter values
+     *         using the
+     *         {@link #PSSParameterSpec(String, String, AlgorithmParameterSpec, int, int)} constructor.
      *
      * @since 1.5
      */
+    @Deprecated(since="19")
     public static final PSSParameterSpec DEFAULT = new PSSParameterSpec
         ("SHA-1", "MGF1", MGF1ParameterSpec.SHA1, 20, TRAILER_FIELD_BC);
 
@@ -126,7 +129,7 @@ public class PSSParameterSpec implements AlgorithmParameterSpec {
      * @param mgfSpec      the parameters for the mask generation function.
      *         If null is specified, null will be returned by
      *         getMGFParameters().
-     * @param saltLen      the length of salt
+     * @param saltLen      the length of salt in bytes
      * @param trailerField the value of the trailer field
      * @throws    NullPointerException if {@code mdName}, or {@code mgfName}
      *         is null
@@ -157,13 +160,21 @@ public class PSSParameterSpec implements AlgorithmParameterSpec {
     /**
      * Creates a new {@code PSSParameterSpec}
      * using the specified salt length and other default values as
-     * defined in PKCS#1.
+     * defined in the PKCS #1 standard.
      *
-     * @param saltLen the length of salt in bytes to be used in PKCS#1
-     *         PSS encoding
+     * @param saltLen the length of salt in bytes
      * @throws    IllegalArgumentException if {@code saltLen} is
      *         less than 0
+     * @deprecated This constructor uses the default values defined in
+     *         the PKCS #1 standard except for the salt length. Some of these
+     *         defaults are no longer recommended due to advances in
+     *         cryptanalysis -- see the
+     *         <a href="https://tools.ietf.org/rfc/rfc8017.txt">PKCS#1 v2.2</a>
+     *         standard for more details. Thus, it is recommended to explicitly
+     *         specify all desired parameter values with the
+     *         {@link #PSSParameterSpec(String, String, AlgorithmParameterSpec, int, int)} constructor.
      */
+    @Deprecated(since="19")
     public PSSParameterSpec(int saltLen) {
         this("SHA-1", "MGF1", MGF1ParameterSpec.SHA1, saltLen, TRAILER_FIELD_BC);
     }
diff --git a/src/java.base/share/classes/sun/security/rsa/PSSParameters.java b/src/java.base/share/classes/sun/security/rsa/PSSParameters.java
index 5a1584b0a9e..1a317a3ed14 100644
--- a/src/java.base/share/classes/sun/security/rsa/PSSParameters.java
+++ b/src/java.base/share/classes/sun/security/rsa/PSSParameters.java
@@ -34,7 +34,6 @@ import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.MGF1ParameterSpec;
 import java.security.spec.PSSParameterSpec;
-import static java.security.spec.PSSParameterSpec.DEFAULT;
 
 /**
  * This class implements the PSS parameters used with the RSA
@@ -81,12 +80,12 @@ public final class PSSParameters extends AlgorithmParametersSpi {
 
     @Override
     protected void engineInit(byte[] encoded) throws IOException {
-        // first initialize with the DEFAULT values before
-        // retrieving from the encoding bytes
-        String mdName = DEFAULT.getDigestAlgorithm();
-        MGF1ParameterSpec mgfSpec = (MGF1ParameterSpec) DEFAULT.getMGFParameters();
-        int saltLength = DEFAULT.getSaltLength();
-        int trailerField = DEFAULT.getTrailerField();
+        // first initialize with the ASN.1 DEFAULT values defined in PKCS #1
+        // v2.2 since the encoding bytes may not define all fields
+        String mdName = "SHA-1";
+        MGF1ParameterSpec mgfSpec = MGF1ParameterSpec.SHA1;
+        int saltLength = 20;
+        int trailerField = PSSParameterSpec.TRAILER_FIELD_BC;
 
         DerInputStream der = new DerInputStream(encoded);
         DerValue[] datum = der.getSequence(4);
-- 
GitLab


From afd0f5a904bc531d1aae3f11ab0b50a6e0330bf1 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Fri, 1 Apr 2022 20:26:34 +0000
Subject: [PATCH 321/345] 8284190: disable
 G1RegionToSpaceMapper.largeStressAdjacent_vm on windows

Reviewed-by: tschatzl
---
 test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
index 668c63acf51..56f60e6a501 100644
--- a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
+++ b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
@@ -97,7 +97,12 @@ TEST_VM(G1RegionToSpaceMapper, smallStressAdjacent) {
   G1MapperWorkers::run_task(&task);
 }
 
+#if defined(_WINDOWS)
+// See JDK-8283899.
+TEST_VM(G1RegionToSpaceMapper, DISABLED_largeStressAdjacent) {
+#else
 TEST_VM(G1RegionToSpaceMapper, largeStressAdjacent) {
+#endif
   // Fake a heap with 2m regions and create a BOT like mapper. This
   // will give a G1RegionsLargerThanCommitSizeMapper to stress.
   uint num_regions = G1MapperWorkers::MaxWorkers;
-- 
GitLab


From 0b09f70a730404ceb827673f1d3c82fbf495bb41 Mon Sep 17 00:00:00 2001
From: Bradford Wetmore <wetmore@openjdk.org>
Date: Sat, 2 Apr 2022 00:30:48 +0000
Subject: [PATCH 322/345] 8273553: sun.security.ssl.SSLEngineImpl.closeInbound
 also has similar error of JDK-8253368

Reviewed-by: xuelei, rhalade, coffeys
---
 .../sun/security/ssl/SSLEngineImpl.java       |  20 +-
 .../sun/security/ssl/SSLSocketImpl.java       |   7 +-
 .../SSLSocketSSLEngineCloseInbound.java       | 491 ++++++++++++++++++
 3 files changed, 505 insertions(+), 13 deletions(-)
 create mode 100644 test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketSSLEngineCloseInbound.java

diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
index 1db9ba8d86b..990b9126832 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -48,7 +48,7 @@ import javax.net.ssl.SSLProtocolException;
 import javax.net.ssl.SSLSession;
 
 /**
- * Implementation of an non-blocking SSLEngine.
+ * Implementation of a non-blocking SSLEngine.
  *
  * @author Brad Wetmore
  */
@@ -270,7 +270,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
             if (ciphertext == null && !conContext.isNegotiated &&
                     conContext.isInboundClosed() &&
                     hsStatus == HandshakeStatus.NEED_WRAP) {
-                // Even the outboud is open, no futher data could be wrapped as:
+                // Even the outbound is open, no further data could be wrapped as:
                 //     1. the outbound is empty
                 //     2. no negotiated connection
                 //     3. the inbound has closed, cannot complete the handshake
@@ -789,17 +789,17 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
             // Is it ready to close inbound?
             //
             // No exception if the initial handshake is not started.
-            if (!conContext.isInputCloseNotified &&
-                (conContext.isNegotiated ||
-                    conContext.handshakeContext != null)) {
-
-                throw conContext.fatal(Alert.INTERNAL_ERROR,
+            if (!conContext.isInputCloseNotified && (conContext.isNegotiated
+                    || conContext.handshakeContext != null)) {
+                throw new SSLException(
                         "closing inbound before receiving peer's close_notify");
             }
-
-            conContext.closeInbound();
         } finally {
-            engineLock.unlock();
+            try {
+                conContext.closeInbound();
+            } finally {
+                engineLock.unlock();
+            }
         }
     }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index 68fb3860203..879d3901e31 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -838,9 +838,10 @@ public final class SSLSocketImpl
         // No need to throw exception if the initial handshake is not started.
         try {
             if (checkCloseNotify && !conContext.isInputCloseNotified &&
-                (conContext.isNegotiated || conContext.handshakeContext != null)) {
-            throw new SSLException(
-                    "closing inbound before receiving peer's close_notify");
+                    (conContext.isNegotiated ||
+                            conContext.handshakeContext != null)) {
+                throw new SSLException(
+                        "closing inbound before receiving peer's close_notify");
             }
         } finally {
             conContext.closeInbound();
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketSSLEngineCloseInbound.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketSSLEngineCloseInbound.java
new file mode 100644
index 00000000000..abf1571cadc
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketSSLEngineCloseInbound.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 8273553 8253368
+ * @summary sun.security.ssl.SSLEngineImpl.closeInbound also has similar error
+ *          of JDK-8253368
+ * @run main/othervm SSLSocketSSLEngineCloseInbound TLSv1.3
+ * @run main/othervm SSLSocketSSLEngineCloseInbound TLSv1.2
+ * @run main/othervm SSLSocketSSLEngineCloseInbound TLSv1.1
+ * @run main/othervm SSLSocketSSLEngineCloseInbound TLSv1
+ * @run main/othervm SSLSocketSSLEngineCloseInbound TLS
+ */
+
+/**
+ * A SSLSocket/SSLEngine interop test case.  This is not the way to
+ * code SSLEngine-based servers, but works for what we need to do here,
+ * which is to make sure that SSLEngine/SSLSockets can talk to each other.
+ * SSLEngines can use direct or indirect buffers, and different code
+ * is used to get at the buffer contents internally, so we test that here.
+ *
+ * The test creates one SSLSocket (client) and one SSLEngine (server).
+ * The SSLSocket talks to a raw ServerSocket, and the server code
+ * does the translation between byte [] and ByteBuffers that the SSLEngine
+ * can use.  The "transport" layer consists of a Socket Input/OutputStream
+ * and two byte buffers for the SSLEngines:  think of them
+ * as directly connected pipes.
+ *
+ * Again, this is a *very* simple example: real code will be much more
+ * involved.  For example, different threading and I/O models could be
+ * used, transport mechanisms could close unexpectedly, and so on.
+ *
+ * When this application runs, notice that several messages
+ * (wrap/unwrap) pass before any application data is consumed or
+ * produced.  (For more information, please see the SSL/TLS
+ * specifications.)  There may several steps for a successful handshake,
+ * so it's typical to see the following series of operations:
+ *
+ *      client          server          message
+ *      ======          ======          =======
+ *      write()         ...             ClientHello
+ *      ...             unwrap()        ClientHello
+ *      ...             wrap()          ServerHello/Certificate
+ *      read()          ...             ServerHello/Certificate
+ *      write()         ...             ClientKeyExchange
+ *      write()         ...             ChangeCipherSpec
+ *      write()         ...             Finished
+ *      ...             unwrap()        ClientKeyExchange
+ *      ...             unwrap()        ChangeCipherSpec
+ *      ...             unwrap()        Finished
+ *      ...             wrap()          ChangeCipherSpec
+ *      ...             wrap()          Finished
+ *      read()          ...             ChangeCipherSpec
+ *      read()          ...             Finished
+ */
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.*;
+import java.io.*;
+import java.net.*;
+import java.security.*;
+import java.nio.*;
+
+public class SSLSocketSSLEngineCloseInbound {
+
+    /*
+     * Enables logging of the SSL/TLS operations.
+     */
+    private static final boolean logging = true;
+
+    /*
+     * Enables the JSSE system debugging system property:
+     *
+     *     -Djavax.net.debug=all
+     *
+     * This gives a lot of low-level information about operations underway,
+     * including specific handshake messages, and might be best examined
+     * after gaining some familiarity with this application.
+     */
+    private static final boolean debug = false;
+    private final SSLContext sslc;
+    private SSLEngine serverEngine;     // server-side SSLEngine
+    private SSLSocket clientSocket;
+
+    private final byte[] serverMsg =
+        "Hi there Client, I'm a Server.".getBytes();
+    private final byte[] clientMsg =
+        "Hello Server, I'm a Client! Pleased to meet you!".getBytes();
+
+    private ByteBuffer serverOut;       // write side of serverEngine
+    private ByteBuffer serverIn;        // read side of serverEngine
+
+    private volatile Exception clientException;
+    private volatile Exception serverException;
+
+    /*
+     * For data transport, this example uses local ByteBuffers.
+     */
+    private ByteBuffer cTOs;            // "reliable" transport client->server
+    private ByteBuffer sTOc;            // "reliable" transport server->client
+
+    /*
+     * The following is to set up the keystores/trust material.
+     */
+    private static final String pathToStores = "../../../../javax/net/ssl/etc";
+    private static final String keyStoreFile = "keystore";
+    private static final String trustStoreFile = "truststore";
+    private static final String keyFilename =
+            System.getProperty("test.src", ".") + "/" + pathToStores
+            + "/" + keyStoreFile;
+    private static final String trustFilename =
+            System.getProperty("test.src", ".") + "/" + pathToStores
+            + "/" + trustStoreFile;
+
+    /*
+     * Main entry point for this test.
+     */
+    public static void main(String[] args) throws Exception {
+        String protocol = args[0];
+
+        // reset security properties to make sure that the algorithms
+        // and keys used in this test are not disabled.
+        Security.setProperty("jdk.tls.disabledAlgorithms", "");
+        Security.setProperty("jdk.certpath.disabledAlgorithms", "");
+
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
+        /*
+         * Run the tests with direct and indirect buffers.
+         */
+        SSLSocketSSLEngineCloseInbound test =
+            new SSLSocketSSLEngineCloseInbound(protocol);
+        log("-------------------------------------");
+        log("Testing " + protocol + " for direct buffers ...");
+        test.runTest(true);
+
+        log("---------------------------------------");
+        log("Testing " + protocol + " for indirect buffers ...");
+        test.runTest(false);
+
+        log("Test Passed.");
+    }
+
+    /*
+     * Create an initialized SSLContext to use for these tests.
+     */
+    public SSLSocketSSLEngineCloseInbound(String protocol) throws Exception {
+
+        KeyStore ks = KeyStore.getInstance("JKS");
+        KeyStore ts = KeyStore.getInstance("JKS");
+
+        char[] passphrase = "passphrase".toCharArray();
+
+        try (FileInputStream keyFile = new FileInputStream(keyFilename);
+                FileInputStream trustFile = new FileInputStream(trustFilename)) {
+            ks.load(keyFile, passphrase);
+            ts.load(trustFile, passphrase);
+        }
+
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+        kmf.init(ks, passphrase);
+
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+        tmf.init(ts);
+
+        SSLContext sslCtx = SSLContext.getInstance(protocol);
+
+        sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+        sslc = sslCtx;
+    }
+
+    /*
+     * Run the test.
+     *
+     * Sit in a tight loop, with the server engine calling wrap/unwrap
+     * regardless of whether data is available or not.  We do this until
+     * we get the application data.  Then we shutdown and go to the next one.
+     *
+     * The main loop handles all the I/O phases of the SSLEngine's
+     * lifetime:
+     *
+     *     initial handshaking
+     *     application data transfer
+     *     engine closing
+     *
+     * One could easily separate these phases into separate
+     * sections of code.
+     */
+    private void runTest(boolean direct) throws Exception {
+        clientSocket = null;
+
+        // generates the server-side Socket
+        try (ServerSocket serverSocket = new ServerSocket()) {
+            serverSocket.setReuseAddress(false);
+            serverSocket.bind(null);
+            int port = serverSocket.getLocalPort();
+            log("Port: " + port);
+            Thread thread = createClientThread(port);
+
+            createSSLEngine();
+            createBuffers(direct);
+
+            // server-side socket that will read
+            try (Socket socket = serverSocket.accept()) {
+                socket.setSoTimeout(500);
+
+                InputStream is = socket.getInputStream();
+                OutputStream os = socket.getOutputStream();
+
+                SSLEngineResult serverResult;   // results from last operation
+
+                /*
+                 * Examining the SSLEngineResults could be much more involved,
+                 * and may alter the overall flow of the application.
+                 *
+                 * For example, if we received a BUFFER_OVERFLOW when trying
+                 * to write to the output pipe, we could reallocate a larger
+                 * pipe, but instead we wait for the peer to drain it.
+                 */
+                byte[] inbound = new byte[8192];
+                byte[] outbound = new byte[8192];
+
+                while (!isEngineClosed(serverEngine)) {
+                    int len;
+
+                    // Inbound data
+                    log("================");
+
+                    // Try reading Client side, even if it's already closed.
+                    try {
+                        len = is.read(inbound);
+                        if (len > 0) {
+                            cTOs.put(inbound, 0, len);
+                        }
+                    } catch (IOException e) {
+                        /*
+                         * swallow IO/SocketTimeoutExceptions.  We'll do
+                         * the testing/exit after the unwraps.
+                         */
+                    }
+
+                    cTOs.flip();
+
+                    serverResult = serverEngine.unwrap(cTOs, serverIn);
+                    log("server unwrap: ", serverResult);
+                    runDelegatedTasks(serverResult, serverEngine);
+                    cTOs.compact();
+
+                    // Outbound data
+                    log("----");
+
+                    // After we've received  our app bytes, close input side
+                    // and see what happens.  Exit the test at the end.
+                    if (serverIn.position() != 0) {
+                        try {
+                            serverEngine.closeInbound();
+                            throw new Exception(
+                                    "No error shutting down client's input");
+                        } catch (SSLException e) {
+                            System.out.println(
+                                    "Server caught the right Exception");
+                        }
+
+                        if (serverEngine.getSession().isValid()) {
+                            System.out.println("Server session is still valid");
+                        } else {
+                            throw new Exception("Server session is not valid");
+                        }
+
+                        return;
+                    }
+
+                    serverResult = serverEngine.wrap(serverOut, sTOc);
+                    log("server wrap: ", serverResult);
+                    runDelegatedTasks(serverResult, serverEngine);
+
+                    sTOc.flip();
+
+                    if ((len = sTOc.remaining()) != 0) {
+                        sTOc.get(outbound, 0, len);
+                        os.write(outbound, 0, len);
+                        // Give the other side a chance to process
+                    }
+
+                    sTOc.compact();
+                }
+            } catch (Exception e) {
+                serverException = e;
+            } finally {
+                // Wait for the client to join up with us.
+                if (thread != null) {
+                    thread.join();
+                }
+            }
+        } finally {
+            if (serverException != null) {
+                if (clientException != null) {
+                    serverException.initCause(clientException);
+                }
+                throw serverException;
+            }
+            if (clientException != null) {
+                if (serverException != null) {
+                    clientException.initCause(serverException);
+                }
+                throw clientException;
+            }
+        }
+    }
+
+    /*
+     * Create a client thread which does simple SSLSocket operations.
+     * We'll write and read one data packet.
+     */
+    private Thread createClientThread(final int port) {
+
+        Thread t = new Thread("ClientThread") {
+
+            @Override
+            public void run() {
+                // client-side socket
+                try (SSLSocket sslSocket = (SSLSocket)sslc.getSocketFactory().
+                            createSocket("localhost", port)) {
+                    clientSocket = sslSocket;
+
+                    OutputStream os = sslSocket.getOutputStream();
+
+                    // write(byte[]) goes in one shot.
+                    os.write(clientMsg);
+                    os.flush();
+
+                    try {
+                        sslSocket.shutdownInput();
+                        throw new Exception(
+                                "No error shutting down client's input");
+                    } catch (SSLException e) {
+                        System.out.println("Client caught the right Exception");
+                    }
+
+                    if (sslSocket.getSession().isValid()) {
+                        System.out.println("Client session is still valid");
+                    } else {
+                        throw new Exception("Client's session is not valid");
+                    }
+
+                    // Give server a chance to read before we shutdown via
+                    // the try-with-resources block.
+                    Thread.sleep(2000);
+                } catch (Exception e) {
+                    clientException = e;
+                }
+            }
+        };
+        t.start();
+        return t;
+    }
+
+    /*
+     * Using the SSLContext created during object creation,
+     * create/configure the SSLEngines we'll use for this test.
+     */
+    private void createSSLEngine() {
+        /*
+         * Configure the serverEngine to act as a server in the SSL/TLS
+         * handshake.
+         */
+        serverEngine = sslc.createSSLEngine();
+        serverEngine.setUseClientMode(false);
+        serverEngine.getNeedClientAuth();
+    }
+
+    /*
+     * Create and size the buffers appropriately.
+     */
+    private void createBuffers(boolean direct) {
+
+        SSLSession session = serverEngine.getSession();
+        int appBufferMax = session.getApplicationBufferSize();
+        int netBufferMax = session.getPacketBufferSize();
+
+        /*
+         * We'll make the input buffers a bit bigger than the max needed
+         * size, so that unwrap()s following a successful data transfer
+         * won't generate BUFFER_OVERFLOWS.
+         *
+         * We'll use a mix of direct and indirect ByteBuffers for
+         * tutorial purposes only.  In reality, only use direct
+         * ByteBuffers when they give a clear performance enhancement.
+         */
+        if (direct) {
+            serverIn = ByteBuffer.allocateDirect(appBufferMax + 50);
+            cTOs = ByteBuffer.allocateDirect(netBufferMax);
+            sTOc = ByteBuffer.allocateDirect(netBufferMax);
+        } else {
+            serverIn = ByteBuffer.allocate(appBufferMax + 50);
+            cTOs = ByteBuffer.allocate(netBufferMax);
+            sTOc = ByteBuffer.allocate(netBufferMax);
+        }
+
+        serverOut = ByteBuffer.wrap(serverMsg);
+    }
+
+    /*
+     * If the result indicates that we have outstanding tasks to do,
+     * go ahead and run them in this thread.
+     */
+    private static void runDelegatedTasks(SSLEngineResult result,
+            SSLEngine engine) throws Exception {
+
+        if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+            Runnable runnable;
+            while ((runnable = engine.getDelegatedTask()) != null) {
+                log("\trunning delegated task...");
+                runnable.run();
+            }
+            HandshakeStatus hsStatus = engine.getHandshakeStatus();
+            if (hsStatus == HandshakeStatus.NEED_TASK) {
+                throw new Exception(
+                        "handshake shouldn't need additional tasks");
+            }
+            log("\tnew HandshakeStatus: " + hsStatus);
+        }
+    }
+
+    private static boolean isEngineClosed(SSLEngine engine) {
+        return (engine.isOutboundDone() && engine.isInboundDone());
+    }
+
+    /*
+     * Logging code
+     */
+    private static boolean resultOnce = true;
+
+    private static void log(String str, SSLEngineResult result) {
+        if (!logging) {
+            return;
+        }
+        if (resultOnce) {
+            resultOnce = false;
+            log("The format of the SSLEngineResult is: \n"
+                    + "\t\"getStatus() / getHandshakeStatus()\" +\n"
+                    + "\t\"bytesConsumed() / bytesProduced()\"\n");
+        }
+        HandshakeStatus hsStatus = result.getHandshakeStatus();
+        log(str
+                + result.getStatus() + "/" + hsStatus + ", "
+                + result.bytesConsumed() + "/" + result.bytesProduced()
+                + " bytes");
+        if (hsStatus == HandshakeStatus.FINISHED) {
+            log("\t...ready for application data");
+        }
+    }
+
+    private static void log(String str) {
+        if (logging) {
+            if (debug) {
+                System.err.println(str);
+            } else {
+                System.out.println(str);
+            }
+        }
+    }
+}
-- 
GitLab


From e5e1aab459cf620644e2c8a1056338bb82ce81c3 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Sat, 2 Apr 2022 02:46:26 +0000
Subject: [PATCH 323/345] 8284068: riscv: should call Atomic::release_store in
 JavaThread::set_thread_state

Reviewed-by: shade
---
 src/hotspot/share/runtime/thread.inline.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index 92dfdfa3dbe..ee7d48b8660 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -162,7 +162,7 @@ inline JavaThreadState JavaThread::thread_state() const    {
 inline void JavaThread::set_thread_state(JavaThreadState s) {
   assert(current_or_null() == NULL || current_or_null() == this,
          "state change should only be called by the current thread");
-#if defined(PPC64) || defined (AARCH64)
+#if defined(PPC64) || defined (AARCH64) || defined(RISCV64)
   // Use membars when accessing volatile _thread_state. See
   // Threads::create_vm() for size checks.
   Atomic::release_store((volatile jint*)&_thread_state, (jint)s);
-- 
GitLab


From 060a1887339a366075755ad2a359ee3336ef381d Mon Sep 17 00:00:00 2001
From: Feilong Jiang <fjiang@openjdk.org>
Date: Sat, 2 Apr 2022 02:55:50 +0000
Subject: [PATCH 324/345] 8283865: riscv: Break down -XX:+UseRVB into seperate
 options for each bitmanip extension

Reviewed-by: fyang, shade
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |   1 +
 src/hotspot/cpu/riscv/globals_riscv.hpp       |   3 +-
 .../cpu/riscv/macroAssembler_riscv.cpp        |  44 ++--
 src/hotspot/cpu/riscv/riscv.ad                |   2 +-
 src/hotspot/cpu/riscv/riscv_b.ad              | 194 +++++++++---------
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    |   7 +-
 src/hotspot/cpu/riscv/vm_version_riscv.hpp    |   3 +-
 .../linux_riscv/vm_version_linux_riscv.cpp    |  12 +-
 8 files changed, 130 insertions(+), 136 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index e8b43aee9db..c1e7b1c54c2 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1944,6 +1944,7 @@ enum Nf {
 
 // ====================================
 // RISC-V Bit-Manipulation Extension
+// Currently only support Zba and Zbb.
 // ====================================
 #define INSN(NAME, op, funct3, funct7)                  \
   void NAME(Register Rd, Register Rs1, Register Rs2) {  \
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index cbfc0583883..30e3a8779b8 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -91,8 +91,9 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, AvoidUnalignedAccesses, true,                                    \
           "Avoid generating unaligned memory accesses")                          \
   product(bool, UseRVV, false, EXPERIMENTAL, "Use RVV instructions")             \
-  product(bool, UseRVB, false, EXPERIMENTAL, "Use RVB instructions")             \
   product(bool, UseRVC, false, EXPERIMENTAL, "Use RVC instructions")             \
+  product(bool, UseZba, false, EXPERIMENTAL, "Use Zba instructions")             \
+  product(bool, UseZbb, false, EXPERIMENTAL, "Use Zbb instructions")             \
   product(bool, UseRVVForBigIntegerShiftIntrinsics, true,                        \
           "Use RVV instructions for left/right shift of BigInteger")
 
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 46ab4364655..d830405db21 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -1473,7 +1473,7 @@ void MacroAssembler::store_sized_value(Address dst, Register src, size_t size_in
 // reverse bytes in halfword in lower 16 bits and sign-extend
 // Rd[15:0] = Rs[7:0] Rs[15:8] (sign-extend to 64 bits)
 void MacroAssembler::revb_h_h(Register Rd, Register Rs, Register tmp) {
-  if (UseRVB) {
+  if (UseZbb) {
     rev8(Rd, Rs);
     srai(Rd, Rd, 48);
     return;
@@ -1490,7 +1490,7 @@ void MacroAssembler::revb_h_h(Register Rd, Register Rs, Register tmp) {
 // reverse bytes in lower word and sign-extend
 // Rd[31:0] = Rs[7:0] Rs[15:8] Rs[23:16] Rs[31:24] (sign-extend to 64 bits)
 void MacroAssembler::revb_w_w(Register Rd, Register Rs, Register tmp1, Register tmp2) {
-  if (UseRVB) {
+  if (UseZbb) {
     rev8(Rd, Rs);
     srai(Rd, Rd, 32);
     return;
@@ -1507,7 +1507,7 @@ void MacroAssembler::revb_w_w(Register Rd, Register Rs, Register tmp1, Register
 // reverse bytes in halfword in lower 16 bits and zero-extend
 // Rd[15:0] = Rs[7:0] Rs[15:8] (zero-extend to 64 bits)
 void MacroAssembler::revb_h_h_u(Register Rd, Register Rs, Register tmp) {
-  if (UseRVB) {
+  if (UseZbb) {
     rev8(Rd, Rs);
     srli(Rd, Rd, 48);
     return;
@@ -1524,11 +1524,11 @@ void MacroAssembler::revb_h_h_u(Register Rd, Register Rs, Register tmp) {
 // reverse bytes in halfwords in lower 32 bits and zero-extend
 // Rd[31:0] = Rs[23:16] Rs[31:24] Rs[7:0] Rs[15:8] (zero-extend to 64 bits)
 void MacroAssembler::revb_h_w_u(Register Rd, Register Rs, Register tmp1, Register tmp2) {
-  if (UseRVB) {
+  if (UseZbb) {
     rev8(Rd, Rs);
     rori(Rd, Rd, 32);
     roriw(Rd, Rd, 16);
-    zext_w(Rd, Rd);
+    zero_extend(Rd, Rd, 32);
     return;
   }
   assert_different_registers(Rs, tmp1, tmp2);
@@ -1557,16 +1557,16 @@ void MacroAssembler::revb_h_helper(Register Rd, Register Rs, Register tmp1, Regi
 // reverse bytes in each halfword
 // Rd[63:0] = Rs[55:48] Rs[63:56] Rs[39:32] Rs[47:40] Rs[23:16] Rs[31:24] Rs[7:0] Rs[15:8]
 void MacroAssembler::revb_h(Register Rd, Register Rs, Register tmp1, Register tmp2) {
-  if (UseRVB) {
+  if (UseZbb) {
     assert_different_registers(Rs, tmp1);
     assert_different_registers(Rd, tmp1);
     rev8(Rd, Rs);
-    zext_w(tmp1, Rd);
+    zero_extend(tmp1, Rd, 32);
     roriw(tmp1, tmp1, 16);
     slli(tmp1, tmp1, 32);
     srli(Rd, Rd, 32);
     roriw(Rd, Rd, 16);
-    zext_w(Rd, Rd);
+    zero_extend(Rd, Rd, 32);
     orr(Rd, Rd, tmp1);
     return;
   }
@@ -1581,7 +1581,7 @@ void MacroAssembler::revb_h(Register Rd, Register Rs, Register tmp1, Register tm
 // reverse bytes in each word
 // Rd[63:0] = Rs[39:32] Rs[47:40] Rs[55:48] Rs[63:56] Rs[7:0] Rs[15:8] Rs[23:16] Rs[31:24]
 void MacroAssembler::revb_w(Register Rd, Register Rs, Register tmp1, Register tmp2) {
-  if (UseRVB) {
+  if (UseZbb) {
     rev8(Rd, Rs);
     rori(Rd, Rd, 32);
     return;
@@ -1595,7 +1595,7 @@ void MacroAssembler::revb_w(Register Rd, Register Rs, Register tmp1, Register tm
 // reverse bytes in doubleword
 // Rd[63:0] = Rs[7:0] Rs[15:8] Rs[23:16] Rs[31:24] Rs[39:32] Rs[47,40] Rs[55,48] Rs[63:56]
 void MacroAssembler::revb(Register Rd, Register Rs, Register tmp1, Register tmp2) {
-  if (UseRVB) {
+  if (UseZbb) {
     rev8(Rd, Rs);
     return;
   }
@@ -1617,7 +1617,7 @@ void MacroAssembler::revb(Register Rd, Register Rs, Register tmp1, Register tmp2
 // rotate right with shift bits
 void MacroAssembler::ror_imm(Register dst, Register src, uint32_t shift, Register tmp)
 {
-  if (UseRVB) {
+  if (UseZbb) {
     rori(dst, src, shift);
     return;
   }
@@ -3563,7 +3563,7 @@ void MacroAssembler::multiply_to_len(Register x, Register xlen, Register y, Regi
 // shift 16 bits once.
 void MacroAssembler::ctzc_bit(Register Rd, Register Rs, bool isLL, Register tmp1, Register tmp2)
 {
-  if (UseRVB) {
+  if (UseZbb) {
     assert_different_registers(Rd, Rs, tmp1);
     int step = isLL ? 8 : 16;
     ctz(Rd, Rs);
@@ -3905,7 +3905,7 @@ void MacroAssembler::zero_memory(Register addr, Register len, Register tmp) {
 // shift left by shamt and add
 // Rd = (Rs1 << shamt) + Rs2
 void MacroAssembler::shadd(Register Rd, Register Rs1, Register Rs2, Register tmp, int shamt) {
-  if (UseRVB) {
+  if (UseZba) {
     if (shamt == 1) {
       sh1add(Rd, Rs1, Rs2);
       return;
@@ -3927,14 +3927,14 @@ void MacroAssembler::shadd(Register Rd, Register Rs1, Register Rs2, Register tmp
 }
 
 void MacroAssembler::zero_extend(Register dst, Register src, int bits) {
-  if (UseRVB) {
-    if (bits == 16) {
-      zext_h(dst, src);
-      return;
-    } else if (bits == 32) {
-      zext_w(dst, src);
-      return;
-    }
+  if (UseZba && bits == 32) {
+    zext_w(dst, src);
+    return;
+  }
+
+  if (UseZbb && bits == 16) {
+    zext_h(dst, src);
+    return;
   }
 
   if (bits == 8) {
@@ -3946,7 +3946,7 @@ void MacroAssembler::zero_extend(Register dst, Register src, int bits) {
 }
 
 void MacroAssembler::sign_extend(Register dst, Register src, int bits) {
-  if (UseRVB) {
+  if (UseZbb) {
     if (bits == 8) {
       sext_b(dst, src);
       return;
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 588887e1d96..d06991b0854 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1814,7 +1814,7 @@ const bool Matcher::match_rule_supported(int opcode) {
     case Op_CountLeadingZerosL:
     case Op_CountTrailingZerosI:
     case Op_CountTrailingZerosL:
-      return UseRVB;
+      return UseZbb;
   }
 
   return true; // Per default match rules are supported.
diff --git a/src/hotspot/cpu/riscv/riscv_b.ad b/src/hotspot/cpu/riscv/riscv_b.ad
index 4488c1c4031..bbebe13f0a8 100644
--- a/src/hotspot/cpu/riscv/riscv_b.ad
+++ b/src/hotspot/cpu/riscv/riscv_b.ad
@@ -25,11 +25,11 @@
 
 // RISCV Bit-Manipulation Extension Architecture Description File
 
-instruct rorI_imm_rvb(iRegINoSp dst, iRegI src, immI shift) %{
-  predicate(UseRVB);
+instruct rorI_imm_b(iRegINoSp dst, iRegI src, immI shift) %{
+  predicate(UseZbb);
   match(Set dst (RotateRight src shift));
 
-  format %{ "roriw  $dst, $src, ($shift & 0x1f)\t#@rorI_imm_rvb" %}
+  format %{ "roriw  $dst, $src, ($shift & 0x1f)\t#@rorI_imm_b" %}
 
   ins_cost(ALU_COST);
   ins_encode %{
@@ -39,11 +39,11 @@ instruct rorI_imm_rvb(iRegINoSp dst, iRegI src, immI shift) %{
   ins_pipe(ialu_reg_shift);
 %}
 
-instruct rorL_imm_rvb(iRegLNoSp dst, iRegL src, immI shift) %{
-  predicate(UseRVB);
+instruct rorL_imm_b(iRegLNoSp dst, iRegL src, immI shift) %{
+  predicate(UseZbb);
   match(Set dst (RotateRight src shift));
 
-  format %{ "rori  $dst, $src, ($shift & 0x3f)\t#@rorL_imm_rvb" %}
+  format %{ "rori  $dst, $src, ($shift & 0x3f)\t#@rorL_imm_b" %}
 
   ins_cost(ALU_COST);
   ins_encode %{
@@ -53,11 +53,11 @@ instruct rorL_imm_rvb(iRegLNoSp dst, iRegL src, immI shift) %{
   ins_pipe(ialu_reg_shift);
 %}
 
-instruct rorI_reg_rvb(iRegINoSp dst, iRegI src, iRegI shift) %{
-  predicate(UseRVB);
+instruct rorI_reg_b(iRegINoSp dst, iRegI src, iRegI shift) %{
+  predicate(UseZbb);
   match(Set dst (RotateRight src shift));
 
-  format %{ "rorw  $dst, $src, $shift\t#@rorI_reg_rvb" %}
+  format %{ "rorw  $dst, $src, $shift\t#@rorI_reg_b" %}
   ins_cost(ALU_COST);
   ins_encode %{
     __ rorw(as_Register($dst$$reg), as_Register($src$$reg), as_Register($shift$$reg));
@@ -65,11 +65,11 @@ instruct rorI_reg_rvb(iRegINoSp dst, iRegI src, iRegI shift) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct rorL_reg_rvb(iRegLNoSp dst, iRegL src, iRegI shift) %{
-  predicate(UseRVB);
+instruct rorL_reg_b(iRegLNoSp dst, iRegL src, iRegI shift) %{
+  predicate(UseZbb);
   match(Set dst (RotateRight src shift));
 
-  format %{ "ror  $dst, $src, $shift\t#@rorL_reg_rvb" %}
+  format %{ "ror  $dst, $src, $shift\t#@rorL_reg_b" %}
   ins_cost(ALU_COST);
   ins_encode %{
     __ ror(as_Register($dst$$reg), as_Register($src$$reg), as_Register($shift$$reg));
@@ -77,11 +77,11 @@ instruct rorL_reg_rvb(iRegLNoSp dst, iRegL src, iRegI shift) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct rolI_reg_rvb(iRegINoSp dst, iRegI src, iRegI shift) %{
-  predicate(UseRVB);
+instruct rolI_reg_b(iRegINoSp dst, iRegI src, iRegI shift) %{
+  predicate(UseZbb);
   match(Set dst (RotateLeft src shift));
 
-  format %{ "rolw  $dst, $src, $shift\t#@rolI_reg_rvb" %}
+  format %{ "rolw  $dst, $src, $shift\t#@rolI_reg_b" %}
   ins_cost(ALU_COST);
   ins_encode %{
     __ rolw(as_Register($dst$$reg), as_Register($src$$reg), as_Register($shift$$reg));
@@ -89,11 +89,11 @@ instruct rolI_reg_rvb(iRegINoSp dst, iRegI src, iRegI shift) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct rolL_reg_rvb(iRegLNoSp dst, iRegL src, iRegI shift) %{
-  predicate(UseRVB);
+instruct rolL_reg_b(iRegLNoSp dst, iRegL src, iRegI shift) %{
+  predicate(UseZbb);
   match(Set dst (RotateLeft src shift));
 
-  format %{ "rol  $dst, $src, $shift\t#@rolL_reg_rvb" %}
+  format %{ "rol  $dst, $src, $shift\t#@rolL_reg_b" %}
   ins_cost(ALU_COST);
   ins_encode %{
     __ rol(as_Register($dst$$reg), as_Register($src$$reg), as_Register($shift$$reg));
@@ -102,11 +102,11 @@ instruct rolL_reg_rvb(iRegLNoSp dst, iRegL src, iRegI shift) %{
 %}
 
 // Convert oop into int for vectors alignment masking
-instruct convP2I_rvb(iRegINoSp dst, iRegP src) %{
-  predicate(UseRVB);
+instruct convP2I_b(iRegINoSp dst, iRegP src) %{
+  predicate(UseZba);
   match(Set dst (ConvL2I (CastP2X src)));
 
-  format %{ "zext.w  $dst, $src\t# ptr -> int @convP2I_rvb" %}
+  format %{ "zext.w  $dst, $src\t# ptr -> int @convP2I_b" %}
 
   ins_cost(ALU_COST);
   ins_encode %{
@@ -117,11 +117,11 @@ instruct convP2I_rvb(iRegINoSp dst, iRegP src) %{
 %}
 
 // byte to int
-instruct convB2I_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_24 lshift, immI_24 rshift) %{
-  predicate(UseRVB);
+instruct convB2I_reg_reg_b(iRegINoSp dst, iRegIorL2I src, immI_24 lshift, immI_24 rshift) %{
+  predicate(UseZbb);
   match(Set dst (RShiftI (LShiftI src lshift) rshift));
 
-  format %{ "sext.b  $dst, $src\t# b2i, #@convB2I_reg_reg_rvb" %}
+  format %{ "sext.b  $dst, $src\t# b2i, #@convB2I_reg_reg_b" %}
 
   ins_cost(ALU_COST);
   ins_encode %{
@@ -132,11 +132,11 @@ instruct convB2I_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_24 lshift, immI
 %}
 
 // int to short
-instruct convI2S_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_16 lshift, immI_16 rshift) %{
-  predicate(UseRVB);
+instruct convI2S_reg_reg_b(iRegINoSp dst, iRegIorL2I src, immI_16 lshift, immI_16 rshift) %{
+  predicate(UseZbb);
   match(Set dst (RShiftI (LShiftI src lshift) rshift));
 
-  format %{ "sext.h  $dst, $src\t# i2s, #@convI2S_reg_reg_rvb" %}
+  format %{ "sext.h  $dst, $src\t# i2s, #@convI2S_reg_reg_b" %}
 
   ins_cost(ALU_COST);
   ins_encode %{
@@ -147,11 +147,11 @@ instruct convI2S_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_16 lshift, immI
 %}
 
 // short to unsigned int
-instruct convS2UI_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_16bits mask) %{
-  predicate(UseRVB);
+instruct convS2UI_reg_reg_b(iRegINoSp dst, iRegIorL2I src, immI_16bits mask) %{
+  predicate(UseZbb);
   match(Set dst (AndI src mask));
 
-  format %{ "zext.h  $dst, $src\t# s2ui, #@convS2UI_reg_reg_rvb" %}
+  format %{ "zext.h  $dst, $src\t# s2ui, #@convS2UI_reg_reg_b" %}
 
   ins_cost(ALU_COST);
   ins_encode %{
@@ -162,11 +162,11 @@ instruct convS2UI_reg_reg_rvb(iRegINoSp dst, iRegIorL2I src, immI_16bits mask) %
 %}
 
 // int to unsigned long (zero extend)
-instruct convI2UL_reg_reg_rvb(iRegLNoSp dst, iRegIorL2I src, immL_32bits mask) %{
-  predicate(UseRVB);
+instruct convI2UL_reg_reg_b(iRegLNoSp dst, iRegIorL2I src, immL_32bits mask) %{
+  predicate(UseZba);
   match(Set dst (AndL (ConvI2L src) mask));
 
-  format %{ "zext.w  $dst, $src\t# i2ul, #@convI2UL_reg_reg_rvb" %}
+  format %{ "zext.w  $dst, $src\t# i2ul, #@convI2UL_reg_reg_b" %}
 
   ins_cost(ALU_COST);
   ins_encode %{
@@ -177,12 +177,12 @@ instruct convI2UL_reg_reg_rvb(iRegLNoSp dst, iRegIorL2I src, immL_32bits mask) %
 %}
 
 // BSWAP instructions
-instruct bytes_reverse_int_rvb(iRegINoSp dst, iRegIorL2I src) %{
-  predicate(UseRVB);
+instruct bytes_reverse_int_b(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseZbb);
   match(Set dst (ReverseBytesI src));
 
   ins_cost(ALU_COST * 2);
-  format %{ "revb_w_w  $dst, $src\t#@bytes_reverse_int_rvb" %}
+  format %{ "revb_w_w  $dst, $src\t#@bytes_reverse_int_b" %}
 
   ins_encode %{
     __ revb_w_w(as_Register($dst$$reg), as_Register($src$$reg));
@@ -191,12 +191,12 @@ instruct bytes_reverse_int_rvb(iRegINoSp dst, iRegIorL2I src) %{
   ins_pipe(ialu_reg);
 %}
 
-instruct bytes_reverse_long_rvb(iRegLNoSp dst, iRegL src) %{
-  predicate(UseRVB);
+instruct bytes_reverse_long_b(iRegLNoSp dst, iRegL src) %{
+  predicate(UseZbb);
   match(Set dst (ReverseBytesL src));
 
   ins_cost(ALU_COST);
-  format %{ "rev8  $dst, $src\t#@bytes_reverse_long_rvb" %}
+  format %{ "rev8  $dst, $src\t#@bytes_reverse_long_b" %}
 
   ins_encode %{
     __ rev8(as_Register($dst$$reg), as_Register($src$$reg));
@@ -205,12 +205,12 @@ instruct bytes_reverse_long_rvb(iRegLNoSp dst, iRegL src) %{
   ins_pipe(ialu_reg);
 %}
 
-instruct bytes_reverse_unsigned_short_rvb(iRegINoSp dst, iRegIorL2I src) %{
-  predicate(UseRVB);
+instruct bytes_reverse_unsigned_short_b(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseZbb);
   match(Set dst (ReverseBytesUS src));
 
   ins_cost(ALU_COST * 2);
-  format %{ "revb_h_h_u  $dst, $src\t#@bytes_reverse_unsigned_short_rvb" %}
+  format %{ "revb_h_h_u  $dst, $src\t#@bytes_reverse_unsigned_short_b" %}
 
   ins_encode %{
     __ revb_h_h_u(as_Register($dst$$reg), as_Register($src$$reg));
@@ -219,12 +219,12 @@ instruct bytes_reverse_unsigned_short_rvb(iRegINoSp dst, iRegIorL2I src) %{
   ins_pipe(ialu_reg);
 %}
 
-instruct bytes_reverse_short_rvb(iRegINoSp dst, iRegIorL2I src) %{
-  predicate(UseRVB);
+instruct bytes_reverse_short_b(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseZbb);
   match(Set dst (ReverseBytesS src));
 
   ins_cost(ALU_COST * 2);
-  format %{ "revb_h_h  $dst, $src\t#@bytes_reverse_short_rvb" %}
+  format %{ "revb_h_h  $dst, $src\t#@bytes_reverse_short_b" %}
 
   ins_encode %{
     __ revb_h_h(as_Register($dst$$reg), as_Register($src$$reg));
@@ -234,12 +234,12 @@ instruct bytes_reverse_short_rvb(iRegINoSp dst, iRegIorL2I src) %{
 %}
 
 // Shift Add Pointer
-instruct shaddP_reg_reg_rvb(iRegPNoSp dst, iRegP src1, iRegL src2, immIScale imm) %{
-  predicate(UseRVB);
+instruct shaddP_reg_reg_b(iRegPNoSp dst, iRegP src1, iRegL src2, immIScale imm) %{
+  predicate(UseZba);
   match(Set dst (AddP src1 (LShiftL src2 imm)));
 
   ins_cost(ALU_COST);
-  format %{ "shadd  $dst, $src2, $src1, $imm\t# ptr, #@shaddP_reg_reg_rvb" %}
+  format %{ "shadd  $dst, $src2, $src1, $imm\t# ptr, #@shaddP_reg_reg_b" %}
 
   ins_encode %{
     __ shadd(as_Register($dst$$reg),
@@ -252,12 +252,12 @@ instruct shaddP_reg_reg_rvb(iRegPNoSp dst, iRegP src1, iRegL src2, immIScale imm
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct shaddP_reg_reg_ext_rvb(iRegPNoSp dst, iRegP src1, iRegI src2, immIScale imm) %{
-  predicate(UseRVB);
+instruct shaddP_reg_reg_ext_b(iRegPNoSp dst, iRegP src1, iRegI src2, immIScale imm) %{
+  predicate(UseZba);
   match(Set dst (AddP src1 (LShiftL (ConvI2L src2) imm)));
 
   ins_cost(ALU_COST);
-  format %{ "shadd  $dst, $src2, $src1, $imm\t# ptr, #@shaddP_reg_reg_ext_rvb" %}
+  format %{ "shadd  $dst, $src2, $src1, $imm\t# ptr, #@shaddP_reg_reg_ext_b" %}
 
   ins_encode %{
     __ shadd(as_Register($dst$$reg),
@@ -271,12 +271,12 @@ instruct shaddP_reg_reg_ext_rvb(iRegPNoSp dst, iRegP src1, iRegI src2, immIScale
 %}
 
 // Shift Add Long
-instruct shaddL_reg_reg_rvb(iRegLNoSp dst, iRegL src1, iRegL src2, immIScale imm) %{
-  predicate(UseRVB);
+instruct shaddL_reg_reg_b(iRegLNoSp dst, iRegL src1, iRegL src2, immIScale imm) %{
+  predicate(UseZba);
   match(Set dst (AddL src1 (LShiftL src2 imm)));
 
   ins_cost(ALU_COST);
-  format %{ "shadd  $dst, $src2, $src1, $imm\t#@shaddL_reg_reg_rvb" %}
+  format %{ "shadd  $dst, $src2, $src1, $imm\t#@shaddL_reg_reg_b" %}
 
   ins_encode %{
     __ shadd(as_Register($dst$$reg),
@@ -289,12 +289,12 @@ instruct shaddL_reg_reg_rvb(iRegLNoSp dst, iRegL src1, iRegL src2, immIScale imm
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct shaddL_reg_reg_ext_rvb(iRegLNoSp dst, iRegL src1, iRegI src2, immIScale imm) %{
-  predicate(UseRVB);
+instruct shaddL_reg_reg_ext_b(iRegLNoSp dst, iRegL src1, iRegI src2, immIScale imm) %{
+  predicate(UseZba);
   match(Set dst (AddL src1 (LShiftL (ConvI2L src2) imm)));
 
   ins_cost(ALU_COST);
-  format %{ "shadd  $dst, $src2, $src1, $imm\t#@shaddL_reg_reg_ext_rvb" %}
+  format %{ "shadd  $dst, $src2, $src1, $imm\t#@shaddL_reg_reg_ext_b" %}
 
   ins_encode %{
     __ shadd(as_Register($dst$$reg),
@@ -308,12 +308,12 @@ instruct shaddL_reg_reg_ext_rvb(iRegLNoSp dst, iRegL src1, iRegI src2, immIScale
 %}
 
 // Zeros Count instructions
-instruct countLeadingZerosI_rvb(iRegINoSp dst, iRegIorL2I src) %{
-  predicate(UseRVB);
+instruct countLeadingZerosI_b(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseZbb);
   match(Set dst (CountLeadingZerosI src));
 
   ins_cost(ALU_COST);
-  format %{ "clzw  $dst, $src\t#@countLeadingZerosI_rvb" %}
+  format %{ "clzw  $dst, $src\t#@countLeadingZerosI_b" %}
 
   ins_encode %{
     __ clzw(as_Register($dst$$reg), as_Register($src$$reg));
@@ -322,12 +322,12 @@ instruct countLeadingZerosI_rvb(iRegINoSp dst, iRegIorL2I src) %{
   ins_pipe(ialu_reg);
 %}
 
-instruct countLeadingZerosL_rvb(iRegINoSp dst, iRegL src) %{
-  predicate(UseRVB);
+instruct countLeadingZerosL_b(iRegINoSp dst, iRegL src) %{
+  predicate(UseZbb);
   match(Set dst (CountLeadingZerosL src));
 
   ins_cost(ALU_COST);
-  format %{ "clz  $dst, $src\t#@countLeadingZerosL_rvb" %}
+  format %{ "clz  $dst, $src\t#@countLeadingZerosL_b" %}
 
   ins_encode %{
     __ clz(as_Register($dst$$reg), as_Register($src$$reg));
@@ -336,12 +336,12 @@ instruct countLeadingZerosL_rvb(iRegINoSp dst, iRegL src) %{
   ins_pipe(ialu_reg);
 %}
 
-instruct countTrailingZerosI_rvb(iRegINoSp dst, iRegIorL2I src) %{
-  predicate(UseRVB);
+instruct countTrailingZerosI_b(iRegINoSp dst, iRegIorL2I src) %{
+  predicate(UseZbb);
   match(Set dst (CountTrailingZerosI src));
 
   ins_cost(ALU_COST);
-  format %{ "ctzw  $dst, $src\t#@countTrailingZerosI_rvb" %}
+  format %{ "ctzw  $dst, $src\t#@countTrailingZerosI_b" %}
 
   ins_encode %{
     __ ctzw(as_Register($dst$$reg), as_Register($src$$reg));
@@ -350,12 +350,12 @@ instruct countTrailingZerosI_rvb(iRegINoSp dst, iRegIorL2I src) %{
   ins_pipe(ialu_reg);
 %}
 
-instruct countTrailingZerosL_rvb(iRegINoSp dst, iRegL src) %{
-  predicate(UseRVB);
+instruct countTrailingZerosL_b(iRegINoSp dst, iRegL src) %{
+  predicate(UseZbb);
   match(Set dst (CountTrailingZerosL src));
 
   ins_cost(ALU_COST);
-  format %{ "ctz  $dst, $src\t#@countTrailingZerosL_rvb" %}
+  format %{ "ctz  $dst, $src\t#@countTrailingZerosL_b" %}
 
   ins_encode %{
     __ ctz(as_Register($dst$$reg), as_Register($src$$reg));
@@ -365,12 +365,12 @@ instruct countTrailingZerosL_rvb(iRegINoSp dst, iRegL src) %{
 %}
 
 // Population Count instructions
-instruct popCountI_rvb(iRegINoSp dst, iRegIorL2I src) %{
+instruct popCountI_b(iRegINoSp dst, iRegIorL2I src) %{
   predicate(UsePopCountInstruction);
   match(Set dst (PopCountI src));
 
   ins_cost(ALU_COST);
-  format %{ "cpopw  $dst, $src\t#@popCountI_rvb" %}
+  format %{ "cpopw  $dst, $src\t#@popCountI_b" %}
 
   ins_encode %{
     __ cpopw(as_Register($dst$$reg), as_Register($src$$reg));
@@ -380,12 +380,12 @@ instruct popCountI_rvb(iRegINoSp dst, iRegIorL2I src) %{
 %}
 
 // Note: Long/bitCount(long) returns an int.
-instruct popCountL_rvb(iRegINoSp dst, iRegL src) %{
+instruct popCountL_b(iRegINoSp dst, iRegL src) %{
   predicate(UsePopCountInstruction);
   match(Set dst (PopCountL src));
 
   ins_cost(ALU_COST);
-  format %{ "cpop  $dst, $src\t#@popCountL_rvb" %}
+  format %{ "cpop  $dst, $src\t#@popCountL_b" %}
 
   ins_encode %{
     __ cpop(as_Register($dst$$reg), as_Register($src$$reg));
@@ -395,12 +395,12 @@ instruct popCountL_rvb(iRegINoSp dst, iRegL src) %{
 %}
 
 // Max and Min
-instruct minI_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2) %{
-  predicate(UseRVB);
+instruct minI_reg_b(iRegINoSp dst, iRegI src1, iRegI src2) %{
+  predicate(UseZbb);
   match(Set dst (MinI src1 src2));
 
   ins_cost(ALU_COST);
-  format %{ "min  $dst, $src1, $src2\t#@minI_reg_rvb" %}
+  format %{ "min  $dst, $src1, $src2\t#@minI_reg_b" %}
 
   ins_encode %{
     __ min(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
@@ -409,12 +409,12 @@ instruct minI_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct maxI_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2) %{
-  predicate(UseRVB);
+instruct maxI_reg_b(iRegINoSp dst, iRegI src1, iRegI src2) %{
+  predicate(UseZbb);
   match(Set dst (MaxI src1 src2));
 
   ins_cost(ALU_COST);
-  format %{ "max  $dst, $src1, $src2\t#@maxI_reg_rvb" %}
+  format %{ "max  $dst, $src1, $src2\t#@maxI_reg_b" %}
 
   ins_encode %{
     __ max(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
@@ -424,14 +424,14 @@ instruct maxI_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2) %{
 %}
 
 // Abs
-instruct absI_reg_rvb(iRegINoSp dst, iRegI src) %{
-  predicate(UseRVB);
+instruct absI_reg_b(iRegINoSp dst, iRegI src) %{
+  predicate(UseZbb);
   match(Set dst (AbsI src));
 
   ins_cost(ALU_COST * 2);
   format %{
     "negw  t0, $src\n\t"
-    "max  $dst, $src, t0\t#@absI_reg_rvb"
+    "max  $dst, $src, t0\t#@absI_reg_b"
   %}
 
   ins_encode %{
@@ -442,14 +442,14 @@ instruct absI_reg_rvb(iRegINoSp dst, iRegI src) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct absL_reg_rvb(iRegLNoSp dst, iRegL src) %{
-  predicate(UseRVB);
+instruct absL_reg_b(iRegLNoSp dst, iRegL src) %{
+  predicate(UseZbb);
   match(Set dst (AbsL src));
 
   ins_cost(ALU_COST * 2);
   format %{
     "neg  t0, $src\n\t"
-    "max $dst, $src, t0\t#@absL_reg_rvb"
+    "max  $dst, $src, t0\t#@absL_reg_b"
   %}
 
   ins_encode %{
@@ -461,12 +461,12 @@ instruct absL_reg_rvb(iRegLNoSp dst, iRegL src) %{
 %}
 
 // And Not
-instruct andnI_reg_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2, immI_M1 m1) %{
-  predicate(UseRVB);
+instruct andnI_reg_reg_b(iRegINoSp dst, iRegI src1, iRegI src2, immI_M1 m1) %{
+  predicate(UseZbb);
   match(Set dst (AndI src1 (XorI src2 m1)));
 
   ins_cost(ALU_COST);
-  format %{ "andn  $dst, $src1, $src2\t#@andnI_reg_reg_rvb" %}
+  format %{ "andn  $dst, $src1, $src2\t#@andnI_reg_reg_b" %}
 
   ins_encode %{
     __ andn(as_Register($dst$$reg),
@@ -477,12 +477,12 @@ instruct andnI_reg_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2, immI_M1 m1) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct andnL_reg_reg_rvb(iRegLNoSp dst, iRegL src1, iRegL src2, immL_M1 m1) %{
-  predicate(UseRVB);
+instruct andnL_reg_reg_b(iRegLNoSp dst, iRegL src1, iRegL src2, immL_M1 m1) %{
+  predicate(UseZbb);
   match(Set dst (AndL src1 (XorL src2 m1)));
 
   ins_cost(ALU_COST);
-  format %{ "andn  $dst, $src1, $src2\t#@andnL_reg_reg_rvb" %}
+  format %{ "andn  $dst, $src1, $src2\t#@andnL_reg_reg_b" %}
 
   ins_encode %{
     __ andn(as_Register($dst$$reg),
@@ -494,12 +494,12 @@ instruct andnL_reg_reg_rvb(iRegLNoSp dst, iRegL src1, iRegL src2, immL_M1 m1) %{
 %}
 
 // Or Not
-instruct ornI_reg_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2, immI_M1 m1) %{
-  predicate(UseRVB);
+instruct ornI_reg_reg_b(iRegINoSp dst, iRegI src1, iRegI src2, immI_M1 m1) %{
+  predicate(UseZbb);
   match(Set dst (OrI src1 (XorI src2 m1)));
 
   ins_cost(ALU_COST);
-  format %{ "orn  $dst, $src1, $src2\t#@ornI_reg_reg_rvb" %}
+  format %{ "orn  $dst, $src1, $src2\t#@ornI_reg_reg_b" %}
 
   ins_encode %{
     __ orn(as_Register($dst$$reg),
@@ -510,12 +510,12 @@ instruct ornI_reg_reg_rvb(iRegINoSp dst, iRegI src1, iRegI src2, immI_M1 m1) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct ornL_reg_reg_rvb(iRegLNoSp dst, iRegL src1, iRegL src2, immL_M1 m1) %{
-  predicate(UseRVB);
+instruct ornL_reg_reg_b(iRegLNoSp dst, iRegL src1, iRegL src2, immL_M1 m1) %{
+  predicate(UseZbb);
   match(Set dst (OrL src1 (XorL src2 m1)));
 
   ins_cost(ALU_COST);
-  format %{ "orn  $dst, $src1, $src2\t#@ornL_reg_reg_rvb" %}
+  format %{ "orn  $dst, $src1, $src2\t#@ornL_reg_reg_b" %}
 
   ins_encode %{
     __ orn(as_Register($dst$$reg),
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 768c7633ca6..559f8b5e4ea 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -112,11 +112,6 @@ void VM_Version::initialize() {
     }
   }
 
-  if (UseRVB && !(_features & CPU_B)) {
-    warning("RVB is not supported on this CPU");
-    FLAG_SET_DEFAULT(UseRVB, false);
-  }
-
   if (UseRVC && !(_features & CPU_C)) {
     warning("RVC is not supported on this CPU");
     FLAG_SET_DEFAULT(UseRVC, false);
@@ -126,7 +121,7 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(AvoidUnalignedAccesses, true);
   }
 
-  if (UseRVB) {
+  if (UseZbb) {
     if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
       FLAG_SET_DEFAULT(UsePopCountInstruction, true);
     }
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index 8e35530359a..1d6eeb97504 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -58,8 +58,7 @@ public:
     decl(F,            "f",            5)     \
     decl(D,            "d",            3)     \
     decl(C,            "c",            2)     \
-    decl(V,            "v",           21)     \
-    decl(B,            "b",            1)
+    decl(V,            "v",           21)
 
 #define DECLARE_CPU_FEATURE_FLAG(id, name, bit) CPU_##id = (1 << bit),
     CPU_FEATURE_FLAGS(DECLARE_CPU_FEATURE_FLAG)
diff --git a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
index 4623dbfad42..a954dcf5768 100644
--- a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
@@ -60,10 +60,6 @@
 #define HWCAP_ISA_V  (1 << ('V' - 'A'))
 #endif
 
-#ifndef HWCAP_ISA_B
-#define HWCAP_ISA_B  (1 << ('B' - 'A'))
-#endif
-
 #define read_csr(csr)                                           \
 ({                                                              \
         register unsigned long __v;                             \
@@ -90,7 +86,10 @@ void VM_Version::get_os_cpu_info() {
   static_assert(CPU_D == HWCAP_ISA_D, "Flag CPU_D must follow Linux HWCAP");
   static_assert(CPU_C == HWCAP_ISA_C, "Flag CPU_C must follow Linux HWCAP");
   static_assert(CPU_V == HWCAP_ISA_V, "Flag CPU_V must follow Linux HWCAP");
-  static_assert(CPU_B == HWCAP_ISA_B, "Flag CPU_B must follow Linux HWCAP");
+
+  // RISC-V has four bit-manipulation ISA-extensions: Zba/Zbb/Zbc/Zbs.
+  // Availability for those extensions could not be queried from HWCAP.
+  // TODO: Add proper detection for those extensions.
   _features = auxv & (
       HWCAP_ISA_I |
       HWCAP_ISA_M |
@@ -98,8 +97,7 @@ void VM_Version::get_os_cpu_info() {
       HWCAP_ISA_F |
       HWCAP_ISA_D |
       HWCAP_ISA_C |
-      HWCAP_ISA_V |
-      HWCAP_ISA_B);
+      HWCAP_ISA_V);
 
   if (FILE *f = fopen("/proc/cpuinfo", "r")) {
     char buf[512], *p;
-- 
GitLab


From c1e67b6603b2bd6ac6b0ce43994ab13c207a6431 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Sat, 2 Apr 2022 03:23:49 +0000
Subject: [PATCH 325/345] 8283474: Include detailed heap object info in CDS map
 file

Reviewed-by: ccheung, stuefe
---
 src/hotspot/share/cds/archiveBuilder.cpp | 120 +++++++++++++++--------
 src/hotspot/share/cds/heapShared.cpp     |  16 ++-
 src/hotspot/share/cds/heapShared.hpp     |  30 +++++-
 3 files changed, 120 insertions(+), 46 deletions(-)

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 89529b2cf59..cff024a8afb 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -27,6 +27,7 @@
 #include "cds/archiveUtils.hpp"
 #include "cds/cppVtables.hpp"
 #include "cds/dumpAllocStats.hpp"
+#include "cds/heapShared.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/symbolTable.hpp"
@@ -40,6 +41,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayKlass.hpp"
+#include "oops/objArrayOop.inline.hpp"
 #include "oops/oopHandle.inline.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals_extension.hpp"
@@ -929,27 +931,29 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
   }
 
   // rw/ro regions only
-  static void write_dump_region(const char* name, DumpRegion* region) {
+  static void log_metaspace_region(const char* name, DumpRegion* region,
+                                   const ArchiveBuilder::SourceObjList* src_objs) {
     address region_base = address(region->base());
     address region_top  = address(region->top());
-    write_region(name, region_base, region_top, region_base + buffer_to_runtime_delta());
+    log_region(name, region_base, region_top, region_base + buffer_to_runtime_delta());
+    log_metaspace_objects(region, src_objs);
   }
 
 #define _LOG_PREFIX PTR_FORMAT ": @@ %-17s %d"
 
-  static void write_klass(Klass* k, address runtime_dest, const char* type_name, int bytes, Thread* current) {
+  static void log_klass(Klass* k, address runtime_dest, const char* type_name, int bytes, Thread* current) {
     ResourceMark rm(current);
     log_debug(cds, map)(_LOG_PREFIX " %s",
                         p2i(runtime_dest), type_name, bytes, k->external_name());
   }
-  static void write_method(Method* m, address runtime_dest, const char* type_name, int bytes, Thread* current) {
+  static void log_method(Method* m, address runtime_dest, const char* type_name, int bytes, Thread* current) {
     ResourceMark rm(current);
     log_debug(cds, map)(_LOG_PREFIX " %s",
                         p2i(runtime_dest), type_name, bytes,  m->external_name());
   }
 
   // rw/ro regions only
-  static void write_objects(DumpRegion* region, const ArchiveBuilder::SourceObjList* src_objs) {
+  static void log_metaspace_objects(DumpRegion* region, const ArchiveBuilder::SourceObjList* src_objs) {
     address last_obj_base = address(region->base());
     address last_obj_end  = address(region->base());
     address region_end    = address(region->end());
@@ -958,7 +962,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
       SourceObjInfo* src_info = src_objs->at(i);
       address src = src_info->orig_obj();
       address dest = src_info->dumped_addr();
-      write_data(last_obj_base, dest, last_obj_base + buffer_to_runtime_delta());
+      log_data(last_obj_base, dest, last_obj_base + buffer_to_runtime_delta());
       address runtime_dest = dest + buffer_to_runtime_delta();
       int bytes = src_info->size_in_bytes();
 
@@ -967,21 +971,21 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
 
       switch (type) {
       case MetaspaceObj::ClassType:
-        write_klass((Klass*)src, runtime_dest, type_name, bytes, current);
+        log_klass((Klass*)src, runtime_dest, type_name, bytes, current);
         break;
       case MetaspaceObj::ConstantPoolType:
-        write_klass(((ConstantPool*)src)->pool_holder(),
+        log_klass(((ConstantPool*)src)->pool_holder(),
                     runtime_dest, type_name, bytes, current);
         break;
       case MetaspaceObj::ConstantPoolCacheType:
-        write_klass(((ConstantPoolCache*)src)->constant_pool()->pool_holder(),
+        log_klass(((ConstantPoolCache*)src)->constant_pool()->pool_holder(),
                     runtime_dest, type_name, bytes, current);
         break;
       case MetaspaceObj::MethodType:
-        write_method((Method*)src, runtime_dest, type_name, bytes, current);
+        log_method((Method*)src, runtime_dest, type_name, bytes, current);
         break;
       case MetaspaceObj::ConstMethodType:
-        write_method(((ConstMethod*)src)->method(), runtime_dest, type_name, bytes, current);
+        log_method(((ConstMethod*)src)->method(), runtime_dest, type_name, bytes, current);
         break;
       case MetaspaceObj::SymbolType:
         {
@@ -1000,22 +1004,22 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
       last_obj_end  = dest + bytes;
     }
 
-    write_data(last_obj_base, last_obj_end, last_obj_base + buffer_to_runtime_delta());
+    log_data(last_obj_base, last_obj_end, last_obj_base + buffer_to_runtime_delta());
     if (last_obj_end < region_end) {
       log_debug(cds, map)(PTR_FORMAT ": @@ Misc data " SIZE_FORMAT " bytes",
                           p2i(last_obj_end + buffer_to_runtime_delta()),
                           size_t(region_end - last_obj_end));
-      write_data(last_obj_end, region_end, last_obj_end + buffer_to_runtime_delta());
+      log_data(last_obj_end, region_end, last_obj_end + buffer_to_runtime_delta());
     }
   }
 
 #undef _LOG_PREFIX
 
-  // Write information about a region, whose address at dump time is [base .. top). At
+  // Log information about a region, whose address at dump time is [base .. top). At
   // runtime, this region will be mapped to runtime_base.  runtime_base is 0 if this
   // region will be mapped at os-selected addresses (such as the bitmap region), or will
   // be accessed with os::read (the header).
-  static void write_region(const char* name, address base, address top, address runtime_base) {
+  static void log_region(const char* name, address base, address top, address runtime_base) {
     size_t size = top - base;
     base = runtime_base;
     top = runtime_base + size;
@@ -1024,27 +1028,63 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
   }
 
   // open and closed archive regions
-  static void write_heap_region(const char* which, GrowableArray<MemRegion> *regions) {
+  static void log_heap_regions(const char* which, GrowableArray<MemRegion> *regions) {
+#if INCLUDE_CDS_JAVA_HEAP
     for (int i = 0; i < regions->length(); i++) {
       address start = address(regions->at(i).start());
       address end = address(regions->at(i).end());
-      write_region(which, start, end, start);
-      write_data(start, end, start);
+      log_region(which, start, end, start);
+
+      while (start < end) {
+        size_t byte_size;
+        oop archived_oop = cast_to_oop(start);
+        oop original_oop = HeapShared::get_original_object(archived_oop);
+        if (original_oop != NULL) {
+          ResourceMark rm;
+          log_info(cds, map)(PTR_FORMAT ": @@ Object %s",
+                             p2i(start), original_oop->klass()->external_name());
+          byte_size = original_oop->size() * BytesPerWord;
+        } else if (archived_oop == HeapShared::roots()) {
+          // HeapShared::roots() is copied specially so it doesn't exist in
+          // HeapShared::OriginalObjectTable. See HeapShared::copy_roots().
+          log_info(cds, map)(PTR_FORMAT ": @@ Object HeapShared:roots (ObjArray)",
+                             p2i(start));
+          byte_size = objArrayOopDesc::object_size(HeapShared::roots()->length()) * BytesPerWord;
+        } else {
+          // We have reached the end of the region
+          break;
+        }
+        address oop_end = start + byte_size;
+        log_data(start, oop_end, start, /*is_heap=*/true);
+        start = oop_end;
+      }
+      if (start < end) {
+        log_info(cds, map)(PTR_FORMAT ": @@ Unused heap space " SIZE_FORMAT " bytes",
+                           p2i(start), size_t(end - start));
+        log_data(start, end, start, /*is_heap=*/true);
+      }
     }
+#endif
   }
 
-  // Dump all the data [base...top). Pretend that the base address
+  // Log all the data [base...top). Pretend that the base address
   // will be mapped to runtime_base at run-time.
-  static void write_data(address base, address top, address runtime_base) {
+  static void log_data(address base, address top, address runtime_base, bool is_heap = false) {
     assert(top >= base, "must be");
 
     LogStreamHandle(Trace, cds, map) lsh;
     if (lsh.is_enabled()) {
-      os::print_hex_dump(&lsh, base, top, sizeof(address), 32, runtime_base);
+      int unitsize = sizeof(address);
+      if (is_heap && UseCompressedOops) {
+        // This makes the compressed oop pointers easier to read, but
+        // longs and doubles will be split into two words.
+        unitsize = sizeof(narrowOop);
+      }
+      os::print_hex_dump(&lsh, base, top, unitsize, 32, runtime_base);
     }
   }
 
-  static void write_header(FileMapInfo* mapinfo) {
+  static void log_header(FileMapInfo* mapinfo) {
     LogStreamHandle(Info, cds, map) lsh;
     if (lsh.is_enabled()) {
       mapinfo->print(&lsh);
@@ -1052,41 +1092,38 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
   }
 
 public:
-  static void write(ArchiveBuilder* builder, FileMapInfo* mapinfo,
-             GrowableArray<MemRegion> *closed_heap_regions,
-             GrowableArray<MemRegion> *open_heap_regions,
-             char* bitmap, size_t bitmap_size_in_bytes) {
+  static void log(ArchiveBuilder* builder, FileMapInfo* mapinfo,
+                  GrowableArray<MemRegion> *closed_heap_regions,
+                  GrowableArray<MemRegion> *open_heap_regions,
+                  char* bitmap, size_t bitmap_size_in_bytes) {
     log_info(cds, map)("%s CDS archive map for %s", DumpSharedSpaces ? "Static" : "Dynamic", mapinfo->full_path());
 
     address header = address(mapinfo->header());
     address header_end = header + mapinfo->header()->header_size();
-    write_region("header", header, header_end, 0);
-    write_header(mapinfo);
-    write_data(header, header_end, 0);
+    log_region("header", header, header_end, 0);
+    log_header(mapinfo);
+    log_data(header, header_end, 0);
 
     DumpRegion* rw_region = &builder->_rw_region;
     DumpRegion* ro_region = &builder->_ro_region;
 
-    write_dump_region("rw region", rw_region);
-    write_objects(rw_region, &builder->_rw_src_objs);
-
-    write_dump_region("ro region", ro_region);
-    write_objects(ro_region, &builder->_ro_src_objs);
+    log_metaspace_region("rw region", rw_region, &builder->_rw_src_objs);
+    log_metaspace_region("ro region", ro_region, &builder->_ro_src_objs);
 
     address bitmap_end = address(bitmap + bitmap_size_in_bytes);
-    write_region("bitmap", address(bitmap), bitmap_end, 0);
-    write_data(header, header_end, 0);
+    log_region("bitmap", address(bitmap), bitmap_end, 0);
+    log_data((address)bitmap, bitmap_end, 0);
 
     if (closed_heap_regions != NULL) {
-      write_heap_region("closed heap region", closed_heap_regions);
+      log_heap_regions("closed heap region", closed_heap_regions);
     }
     if (open_heap_regions != NULL) {
-      write_heap_region("open heap region", open_heap_regions);
+      log_heap_regions("open heap region", open_heap_regions);
     }
 
     log_info(cds, map)("[End of CDS archive map]");
   }
-};
+}; // end ArchiveBuilder::CDSMapLogger
 
 void ArchiveBuilder::print_stats() {
   _alloc_stats.print_stats(int(_ro_region.used()), int(_rw_region.used()));
@@ -1140,9 +1177,10 @@ void ArchiveBuilder::write_archive(FileMapInfo* mapinfo,
   }
 
   if (log_is_enabled(Info, cds, map)) {
-    CDSMapLogger::write(this, mapinfo, closed_heap_regions, open_heap_regions,
-                        bitmap, bitmap_size_in_bytes);
+    CDSMapLogger::log(this, mapinfo, closed_heap_regions, open_heap_regions,
+                      bitmap, bitmap_size_in_bytes);
   }
+  CDS_JAVA_HEAP_ONLY(HeapShared::destroy_archived_object_cache());
   FREE_C_HEAP_ARRAY(char, bitmap);
 }
 
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 14bca5d74b6..fa387a73d1d 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -51,8 +51,9 @@
 #include "memory/universe.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/fieldStreams.inline.hpp"
-#include "oops/objArrayOop.hpp"
+#include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "oops/typeArrayOop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/globals_extension.hpp"
@@ -213,6 +214,7 @@ void HeapShared::reset_archived_object_states(TRAPS) {
 }
 
 HeapShared::ArchivedObjectCache* HeapShared::_archived_object_cache = NULL;
+HeapShared::OriginalObjectTable* HeapShared::_original_object_table = NULL;
 oop HeapShared::find_archived_heap_object(oop obj) {
   assert(DumpSharedSpaces, "dump-time only");
   ArchivedObjectCache* cache = archived_object_cache();
@@ -317,6 +319,9 @@ oop HeapShared::archive_object(oop obj) {
     ArchivedObjectCache* cache = archived_object_cache();
     CachedOopInfo info = make_cached_oop_info(archived_oop);
     cache->put(obj, info);
+    if (_original_object_table != NULL) {
+      _original_object_table->put(archived_oop, obj);
+    }
     if (log_is_enabled(Debug, cds, heap)) {
       ResourceMark rm;
       log_debug(cds, heap)("Archived heap object " PTR_FORMAT " ==> " PTR_FORMAT " : %s",
@@ -466,7 +471,7 @@ void HeapShared::archive_objects(GrowableArray<MemRegion>* closed_regions,
     NoSafepointVerifier nsv;
 
     // Cache for recording where the archived objects are copied to
-    create_archived_object_cache();
+    create_archived_object_cache(log_is_enabled(Info, cds, map));
 
     log_info(cds)("Heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
                    UseCompressedOops ? p2i(CompressedOops::begin()) :
@@ -480,7 +485,6 @@ void HeapShared::archive_objects(GrowableArray<MemRegion>* closed_regions,
     copy_open_objects(open_regions);
 
     CDSHeapVerifier::verify();
-    destroy_archived_object_cache();
   }
 
   G1HeapVerifier::verify_archive_regions();
@@ -532,6 +536,12 @@ void HeapShared::copy_open_objects(GrowableArray<MemRegion>* open_regions) {
 
 // Copy _pending_archive_roots into an objArray
 void HeapShared::copy_roots() {
+  // HeapShared::roots() points into an ObjArray in the open archive region. A portion of the
+  // objects in this array are discovered during HeapShared::archive_objects(). For example,
+  // in HeapShared::archive_reachable_objects_from() ->  HeapShared::check_enum_obj().
+  // However, HeapShared::archive_objects() happens inside a safepoint, so we can't
+  // allocate a "regular" ObjArray and pass the result to HeapShared::archive_object().
+  // Instead, we have to roll our own alloc/copy routine here.
   int length = _pending_roots != NULL ? _pending_roots->length() : 0;
   size_t size = objArrayOopDesc::object_size(length);
   Klass* k = Universe::objectArrayKlassObj(); // already relocated to point to archived klass
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index d8fc71fc76e..402f451de4c 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -247,12 +247,19 @@ private:
   }
 
   typedef ResourceHashtable<oop, CachedOopInfo,
-      15889, // prime number
+      36137, // prime number
       ResourceObj::C_HEAP,
       mtClassShared,
       HeapShared::oop_hash> ArchivedObjectCache;
   static ArchivedObjectCache* _archived_object_cache;
 
+  typedef ResourceHashtable<oop, oop,
+      36137, // prime number
+      ResourceObj::C_HEAP,
+      mtClassShared,
+      HeapShared::oop_hash> OriginalObjectTable;
+  static OriginalObjectTable* _original_object_table;
+
   class DumpTimeKlassSubGraphInfoTable
     : public ResourceHashtable<Klass*, KlassSubGraphInfo,
                                137, // prime number
@@ -375,17 +382,36 @@ private:
   static void fill_failed_loaded_region();
  public:
   static void reset_archived_object_states(TRAPS);
-  static void create_archived_object_cache() {
+  static void create_archived_object_cache(bool create_orig_table) {
     _archived_object_cache =
       new (ResourceObj::C_HEAP, mtClass)ArchivedObjectCache();
+    if (create_orig_table) {
+      _original_object_table =
+        new (ResourceObj::C_HEAP, mtClass)OriginalObjectTable();
+    } else {
+      _original_object_table = NULL;
+    }
   }
   static void destroy_archived_object_cache() {
     delete _archived_object_cache;
     _archived_object_cache = NULL;
+    if (_original_object_table != NULL) {
+      delete _original_object_table;
+      _original_object_table = NULL;
+    }
   }
   static ArchivedObjectCache* archived_object_cache() {
     return _archived_object_cache;
   }
+  static oop get_original_object(oop archived_object) {
+    assert(_original_object_table != NULL, "sanity");
+    oop* r = _original_object_table->get(archived_object);
+    if (r == NULL) {
+      return NULL;
+    } else {
+      return *r;
+    }
+  }
 
   static oop find_archived_heap_object(oop obj);
   static oop archive_object(oop obj);
-- 
GitLab


From 003ec21f3c9e9b8dabb1fbaa6b86da6028a2a4ef Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Sat, 2 Apr 2022 18:00:33 +0000
Subject: [PATCH 326/345] 8279508: Auto-vectorize Math.round API

Reviewed-by: sviswanathan, aph
---
 src/hotspot/cpu/x86/assembler_x86.cpp         |  30 +++-
 src/hotspot/cpu/x86/assembler_x86.hpp         |   4 +
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 160 ++++++++++++++----
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp |  28 +++
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |  80 ++++++++-
 src/hotspot/cpu/x86/macroAssembler_x86.hpp    |   4 +-
 src/hotspot/cpu/x86/x86.ad                    |  84 ++++++++-
 src/hotspot/cpu/x86/x86_64.ad                 |  22 +++
 src/hotspot/share/adlc/formssel.cpp           |   1 +
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   5 +-
 src/hotspot/share/opto/c2compiler.cpp         |   4 +-
 src/hotspot/share/opto/classes.hpp            |   4 +
 src/hotspot/share/opto/convertnode.hpp        |  19 ++-
 src/hotspot/share/opto/library_call.cpp       |  10 +-
 src/hotspot/share/opto/loopTransform.cpp      |   4 +
 src/hotspot/share/opto/superword.cpp          |   1 +
 src/hotspot/share/opto/vectornode.cpp         |   7 +
 src/hotspot/share/opto/vectornode.hpp         |  16 ++
 .../share/classes/java/lang/Math.java         |   2 +
 .../compiler/c2/cr6340864/TestDoubleVect.java |  59 ++++++-
 .../compiler/c2/cr6340864/TestFloatVect.java  |  54 +++++-
 .../vectorization/TestRoundVectDouble.java    |  72 ++++++++
 .../vectorization/TestRoundVectFloat.java     |  71 ++++++++
 test/jdk/java/lang/Math/RoundTests.java       |  22 +--
 .../bench/java/math/FpRoundingBenchmark.java  |  98 ++++++++---
 25 files changed, 768 insertions(+), 93 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorization/TestRoundVectDouble.java
 create mode 100644 test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 3505e081d38..fbf95ae02b5 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -1995,6 +1995,13 @@ void Assembler::cvttsd2sil(Register dst, XMMRegister src) {
   emit_int16(0x2C, (0xC0 | encode));
 }
 
+void Assembler::cvtss2sil(Register dst, XMMRegister src) {
+  NOT_LP64(assert(VM_Version::supports_sse(), ""));
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+  int encode = simd_prefix_and_encode(as_XMMRegister(dst->encoding()), xnoreg, src, VEX_SIMD_F3, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x2D, (0xC0 | encode));
+}
+
 void Assembler::cvttss2sil(Register dst, XMMRegister src) {
   NOT_LP64(assert(VM_Version::supports_sse(), ""));
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
@@ -2088,6 +2095,21 @@ void Assembler::vcvttps2dq(XMMRegister dst, XMMRegister src, int vector_len) {
   emit_int16(0x5B, (0xC0 | encode));
 }
 
+void Assembler::vcvtps2dq(XMMRegister dst, XMMRegister src, int vector_len) {
+  assert(vector_len <= AVX_256bit ? VM_Version::supports_avx() : VM_Version::supports_evex(), "");
+  InstructionAttr attributes(vector_len, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x5B, (0xC0 | encode));
+}
+
+void Assembler::evcvtpd2qq(XMMRegister dst, XMMRegister src, int vector_len) {
+  assert(UseAVX > 2 && VM_Version::supports_avx512dq(), "");
+  InstructionAttr attributes(vector_len, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  attributes.set_is_evex_instruction();
+  int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x7B, (0xC0 | encode));
+}
+
 void Assembler::evcvtqq2ps(XMMRegister dst, XMMRegister src, int vector_len) {
   assert(UseAVX > 2 && VM_Version::supports_avx512dq(), "");
   InstructionAttr attributes(vector_len, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
@@ -6493,7 +6515,6 @@ void Assembler::vrndscalepd(XMMRegister dst, Address src, int32_t rmode, int vec
   emit_int8((rmode));
 }
 
-
 void Assembler::vsqrtpd(XMMRegister dst, XMMRegister src, int vector_len) {
   assert(VM_Version::supports_avx(), "");
   InstructionAttr attributes(vector_len, /* vex_w */ VM_Version::supports_evex(), /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
@@ -12285,6 +12306,13 @@ void Assembler::cvttsd2siq(Register dst, XMMRegister src) {
   emit_int16(0x2C, (0xC0 | encode));
 }
 
+void Assembler::cvtsd2siq(Register dst, XMMRegister src) {
+  NOT_LP64(assert(VM_Version::supports_sse2(), ""));
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+  int encode = simd_prefix_and_encode(as_XMMRegister(dst->encoding()), xnoreg, src, VEX_SIMD_F2, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x2D, (0xC0 | encode));
+}
+
 void Assembler::cvttss2siq(Register dst, XMMRegister src) {
   NOT_LP64(assert(VM_Version::supports_sse(), ""));
   InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 7141e4b96c4..6af93b52fc6 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1149,6 +1149,7 @@ private:
   void cvtss2sd(XMMRegister dst, Address src);
 
   // Convert with Truncation Scalar Double-Precision Floating-Point Value to Doubleword Integer
+  void cvtsd2siq(Register dst, XMMRegister src);
   void cvttsd2sil(Register dst, Address src);
   void cvttsd2sil(Register dst, XMMRegister src);
   void cvttsd2siq(Register dst, Address src);
@@ -1157,6 +1158,7 @@ private:
   // Convert with Truncation Scalar Single-Precision Floating-Point Value to Doubleword Integer
   void cvttss2sil(Register dst, XMMRegister src);
   void cvttss2siq(Register dst, XMMRegister src);
+  void cvtss2sil(Register dst, XMMRegister src);
 
   // Convert vector double to int
   void cvttpd2dq(XMMRegister dst, XMMRegister src);
@@ -1166,6 +1168,7 @@ private:
   void vcvtpd2ps(XMMRegister dst, XMMRegister src, int vector_len);
 
   // Convert vector float and int
+  void vcvtps2dq(XMMRegister dst, XMMRegister src, int vector_len);
   void vcvttps2dq(XMMRegister dst, XMMRegister src, int vector_len);
 
   // Convert vector long to vector FP
@@ -1173,6 +1176,7 @@ private:
   void evcvtqq2pd(XMMRegister dst, XMMRegister src, int vector_len);
 
   // Convert vector double to long
+  void evcvtpd2qq(XMMRegister dst, XMMRegister src, int vector_len);
   void evcvttpd2qq(XMMRegister dst, XMMRegister src, int vector_len);
 
   // Evex casts with truncation
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 6d8b9101303..c4411be23cf 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -4061,41 +4061,18 @@ void C2_MacroAssembler::masked_op(int ideal_opc, int mask_len, KRegister dst,
 }
 
 /*
- * Algorithm for vector D2L and F2I conversions:-
- * a) Perform vector D2L/F2I cast.
- * b) Choose fast path if none of the result vector lane contains 0x80000000 value.
- *    It signifies that source value could be any of the special floating point
- *    values(NaN,-Inf,Inf,Max,-Min).
- * c) Set destination to zero if source is NaN value.
- * d) Replace 0x80000000 with MaxInt if source lane contains a +ve value.
+ * Following routine handles special floating point values(NaN/Inf/-Inf/Max/Min) for casting operation.
+ * If src is NaN, the result is 0.
+ * If the src is negative infinity or any value less than or equal to the value of Integer.MIN_VALUE,
+ * the result is equal to the value of Integer.MIN_VALUE.
+ * If the src is positive infinity or any value greater than or equal to the value of Integer.MAX_VALUE,
+ * the result is equal to the value of Integer.MAX_VALUE.
  */
-
-void C2_MacroAssembler::vector_castD2L_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
-                                            KRegister ktmp1, KRegister ktmp2, AddressLiteral double_sign_flip,
-                                            Register scratch, int vec_enc) {
-  Label done;
-  evcvttpd2qq(dst, src, vec_enc);
-  evmovdqul(xtmp1, k0, double_sign_flip, false, vec_enc, scratch);
-  evpcmpeqq(ktmp1, xtmp1, dst, vec_enc);
-  kortestwl(ktmp1, ktmp1);
-  jccb(Assembler::equal, done);
-
-  vpxor(xtmp2, xtmp2, xtmp2, vec_enc);
-  evcmppd(ktmp2, k0, src, src, Assembler::UNORD_Q, vec_enc);
-  evmovdquq(dst, ktmp2, xtmp2, true, vec_enc);
-
-  kxorwl(ktmp1, ktmp1, ktmp2);
-  evcmppd(ktmp1, ktmp1, src, xtmp2, Assembler::NLT_UQ, vec_enc);
-  vpternlogq(xtmp2, 0x11, xtmp1, xtmp1, vec_enc);
-  evmovdquq(dst, ktmp1, xtmp2, true, vec_enc);
-  bind(done);
-}
-
-void C2_MacroAssembler::vector_castF2I_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
-                                           XMMRegister xtmp2, XMMRegister xtmp3, XMMRegister xtmp4,
-                                           AddressLiteral float_sign_flip, Register scratch, int vec_enc) {
+void C2_MacroAssembler::vector_cast_float_special_cases_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                                                            XMMRegister xtmp2, XMMRegister xtmp3, XMMRegister xtmp4,
+                                                            Register scratch, AddressLiteral float_sign_flip,
+                                                            int vec_enc) {
   Label done;
-  vcvttps2dq(dst, src, vec_enc);
   vmovdqu(xtmp1, float_sign_flip, scratch, vec_enc);
   vpcmpeqd(xtmp2, dst, xtmp1, vec_enc);
   vptest(xtmp2, xtmp2, vec_enc);
@@ -4120,11 +4097,11 @@ void C2_MacroAssembler::vector_castF2I_avx(XMMRegister dst, XMMRegister src, XMM
   bind(done);
 }
 
-void C2_MacroAssembler::vector_castF2I_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
-                                            KRegister ktmp1, KRegister ktmp2, AddressLiteral float_sign_flip,
-                                            Register scratch, int vec_enc) {
+void C2_MacroAssembler::vector_cast_float_special_cases_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                                                             XMMRegister xtmp2, KRegister ktmp1, KRegister ktmp2,
+                                                             Register scratch, AddressLiteral float_sign_flip,
+                                                             int vec_enc) {
   Label done;
-  vcvttps2dq(dst, src, vec_enc);
   evmovdqul(xtmp1, k0, float_sign_flip, false, vec_enc, scratch);
   Assembler::evpcmpeqd(ktmp1, k0, xtmp1, dst, vec_enc);
   kortestwl(ktmp1, ktmp1);
@@ -4141,6 +4118,115 @@ void C2_MacroAssembler::vector_castF2I_evex(XMMRegister dst, XMMRegister src, XM
   bind(done);
 }
 
+/*
+ * Following routine handles special floating point values(NaN/Inf/-Inf/Max/Min) for casting operation.
+ * If src is NaN, the result is 0.
+ * If the src is negative infinity or any value less than or equal to the value of Long.MIN_VALUE,
+ * the result is equal to the value of Long.MIN_VALUE.
+ * If the src is positive infinity or any value greater than or equal to the value of Long.MAX_VALUE,
+ * the result is equal to the value of Long.MAX_VALUE.
+ */
+void C2_MacroAssembler::vector_cast_double_special_cases_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                                                              XMMRegister xtmp2, KRegister ktmp1, KRegister ktmp2,
+                                                              Register scratch, AddressLiteral double_sign_flip,
+                                                              int vec_enc) {
+  Label done;
+  evmovdqul(xtmp1, k0, double_sign_flip, false, vec_enc, scratch);
+  evpcmpeqq(ktmp1, xtmp1, dst, vec_enc);
+  kortestwl(ktmp1, ktmp1);
+  jccb(Assembler::equal, done);
+
+  vpxor(xtmp2, xtmp2, xtmp2, vec_enc);
+  evcmppd(ktmp2, k0, src, src, Assembler::UNORD_Q, vec_enc);
+  evmovdquq(dst, ktmp2, xtmp2, true, vec_enc);
+
+  kxorwl(ktmp1, ktmp1, ktmp2);
+  evcmppd(ktmp1, ktmp1, src, xtmp2, Assembler::NLT_UQ, vec_enc);
+  vpternlogq(xtmp2, 0x11, xtmp1, xtmp1, vec_enc);
+  evmovdquq(dst, ktmp1, xtmp2, true, vec_enc);
+  bind(done);
+}
+
+/*
+ * Algorithm for vector D2L and F2I conversions:-
+ * a) Perform vector D2L/F2I cast.
+ * b) Choose fast path if none of the result vector lane contains 0x80000000 value.
+ *    It signifies that source value could be any of the special floating point
+ *    values(NaN,-Inf,Inf,Max,-Min).
+ * c) Set destination to zero if source is NaN value.
+ * d) Replace 0x80000000 with MaxInt if source lane contains a +ve value.
+ */
+
+void C2_MacroAssembler::vector_castD2L_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                                            KRegister ktmp1, KRegister ktmp2, AddressLiteral double_sign_flip,
+                                            Register scratch, int vec_enc) {
+  evcvttpd2qq(dst, src, vec_enc);
+  vector_cast_double_special_cases_evex(dst, src, xtmp1, xtmp2, ktmp1, ktmp2, scratch, double_sign_flip, vec_enc);
+}
+
+void C2_MacroAssembler::vector_castF2I_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                                           XMMRegister xtmp2, XMMRegister xtmp3, XMMRegister xtmp4,
+                                           AddressLiteral float_sign_flip, Register scratch, int vec_enc) {
+  vcvttps2dq(dst, src, vec_enc);
+  vector_cast_float_special_cases_avx(dst, src, xtmp1, xtmp2, xtmp3, xtmp4, scratch, float_sign_flip, vec_enc);
+}
+
+void C2_MacroAssembler::vector_castF2I_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                                            KRegister ktmp1, KRegister ktmp2, AddressLiteral float_sign_flip,
+                                            Register scratch, int vec_enc) {
+  vcvttps2dq(dst, src, vec_enc);
+  vector_cast_float_special_cases_evex(dst, src, xtmp1, xtmp2, ktmp1, ktmp2, scratch, float_sign_flip, vec_enc);
+}
+
+#ifdef _LP64
+void C2_MacroAssembler::vector_round_double_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                                                 KRegister ktmp1, KRegister ktmp2, AddressLiteral double_sign_flip,
+                                                 AddressLiteral new_mxcsr, Register scratch, int vec_enc) {
+  // Perform floor(val+0.5) operation under the influence of MXCSR.RC mode roundTowards -inf.
+  // and re-instantiate original MXCSR.RC mode after that.
+  ExternalAddress mxcsr_std(StubRoutines::x86::addr_mxcsr_std());
+  ldmxcsr(new_mxcsr, scratch);
+  mov64(scratch, julong_cast(0.5L));
+  evpbroadcastq(xtmp1, scratch, vec_enc);
+  vaddpd(xtmp1, src , xtmp1, vec_enc);
+  evcvtpd2qq(dst, xtmp1, vec_enc);
+  vector_cast_double_special_cases_evex(dst, src, xtmp1, xtmp2, ktmp1, ktmp2, scratch, double_sign_flip, vec_enc);
+  ldmxcsr(mxcsr_std, scratch);
+}
+
+void C2_MacroAssembler::vector_round_float_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                                                KRegister ktmp1, KRegister ktmp2, AddressLiteral float_sign_flip,
+                                                AddressLiteral new_mxcsr, Register scratch, int vec_enc) {
+  // Perform floor(val+0.5) operation under the influence of MXCSR.RC mode roundTowards -inf.
+  // and re-instantiate original MXCSR.RC mode after that.
+  ExternalAddress mxcsr_std(StubRoutines::x86::addr_mxcsr_std());
+  ldmxcsr(new_mxcsr, scratch);
+  movl(scratch, jint_cast(0.5));
+  movq(xtmp1, scratch);
+  vbroadcastss(xtmp1, xtmp1, vec_enc);
+  vaddps(xtmp1, src , xtmp1, vec_enc);
+  vcvtps2dq(dst, xtmp1, vec_enc);
+  vector_cast_float_special_cases_evex(dst, src, xtmp1, xtmp2, ktmp1, ktmp2, scratch, float_sign_flip, vec_enc);
+  ldmxcsr(mxcsr_std, scratch);
+}
+
+void C2_MacroAssembler::vector_round_float_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                                               XMMRegister xtmp3, XMMRegister xtmp4, AddressLiteral float_sign_flip,
+                                               AddressLiteral new_mxcsr, Register scratch, int vec_enc) {
+  // Perform floor(val+0.5) operation under the influence of MXCSR.RC mode roundTowards -inf.
+  // and re-instantiate original MXCSR.RC mode after that.
+  ExternalAddress mxcsr_std(StubRoutines::x86::addr_mxcsr_std());
+  ldmxcsr(new_mxcsr, scratch);
+  movl(scratch, jint_cast(0.5));
+  movq(xtmp1, scratch);
+  vbroadcastss(xtmp1, xtmp1, vec_enc);
+  vaddps(xtmp1, src , xtmp1, vec_enc);
+  vcvtps2dq(dst, xtmp1, vec_enc);
+  vector_cast_float_special_cases_avx(dst, src, xtmp1, xtmp2, xtmp3, xtmp4, scratch, float_sign_flip, vec_enc);
+  ldmxcsr(mxcsr_std, scratch);
+}
+#endif
+
 void C2_MacroAssembler::vector_unsigned_cast(XMMRegister dst, XMMRegister src, int vlen_enc,
                                              BasicType from_elem_bt, BasicType to_elem_bt) {
   switch (from_elem_bt) {
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index 5ecdf20700d..5f8e38a93b2 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -303,6 +303,7 @@ public:
                            KRegister ktmp1, KRegister ktmp2, AddressLiteral float_sign_flip,
                            Register scratch, int vec_enc);
 
+
   void vector_castD2L_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
                            KRegister ktmp1, KRegister ktmp2, AddressLiteral double_sign_flip,
                            Register scratch, int vec_enc);
@@ -310,6 +311,33 @@ public:
   void vector_unsigned_cast(XMMRegister dst, XMMRegister src, int vlen_enc,
                             BasicType from_elem_bt, BasicType to_elem_bt);
 
+  void vector_cast_double_special_cases_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                                             KRegister ktmp1, KRegister ktmp2, Register scratch, AddressLiteral double_sign_flip,
+                                             int vec_enc);
+
+  void vector_cast_float_special_cases_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                                            KRegister ktmp1, KRegister ktmp2, Register scratch, AddressLiteral float_sign_flip,
+                                            int vec_enc);
+
+  void vector_cast_float_special_cases_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1,
+                                           XMMRegister xtmp2, XMMRegister xtmp3, XMMRegister xtmp4,
+                                           Register scratch, AddressLiteral float_sign_flip,
+                                           int vec_enc);
+
+#ifdef _LP64
+  void vector_round_double_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                                KRegister ktmp1, KRegister ktmp2, AddressLiteral double_sign_flip,
+                                AddressLiteral new_mxcsr, Register scratch, int vec_enc);
+
+  void vector_round_float_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                               KRegister ktmp1, KRegister ktmp2, AddressLiteral double_sign_flip,
+                               AddressLiteral new_mxcsr, Register scratch, int vec_enc);
+
+  void vector_round_float_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
+                              XMMRegister xtmp3, XMMRegister xtmp4, AddressLiteral float_sign_flip,
+                              AddressLiteral new_mxcsr, Register scratch, int vec_enc);
+#endif
+
   void evpternlog(XMMRegister dst, int func, KRegister mask, XMMRegister src2, XMMRegister src3,
                   bool merge, BasicType bt, int vlen_enc);
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 67faa195457..855c855089d 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -2252,12 +2252,12 @@ void MacroAssembler::fld_x(AddressLiteral src) {
   Assembler::fld_x(as_Address(src));
 }
 
-void MacroAssembler::ldmxcsr(AddressLiteral src) {
+void MacroAssembler::ldmxcsr(AddressLiteral src, Register scratchReg) {
   if (reachable(src)) {
     Assembler::ldmxcsr(as_Address(src));
   } else {
-    lea(rscratch1, src);
-    Assembler::ldmxcsr(Address(rscratch1, 0));
+    lea(scratchReg, src);
+    Assembler::ldmxcsr(Address(scratchReg, 0));
   }
 }
 
@@ -9120,6 +9120,80 @@ void MacroAssembler::convert_f2l(Register dst, XMMRegister src) {
   bind(done);
 }
 
+void MacroAssembler::round_float(Register dst, XMMRegister src, Register rtmp, Register rcx) {
+  // Following code is line by line assembly translation rounding algorithm.
+  // Please refer to java.lang.Math.round(float) algorithm for details.
+  const int32_t FloatConsts_EXP_BIT_MASK = 0x7F800000;
+  const int32_t FloatConsts_SIGNIFICAND_WIDTH = 24;
+  const int32_t FloatConsts_EXP_BIAS = 127;
+  const int32_t FloatConsts_SIGNIF_BIT_MASK = 0x007FFFFF;
+  const int32_t MINUS_32 = 0xFFFFFFE0;
+  Label L_special_case, L_block1, L_exit;
+  movl(rtmp, FloatConsts_EXP_BIT_MASK);
+  movdl(dst, src);
+  andl(dst, rtmp);
+  sarl(dst, FloatConsts_SIGNIFICAND_WIDTH - 1);
+  movl(rtmp, FloatConsts_SIGNIFICAND_WIDTH - 2 + FloatConsts_EXP_BIAS);
+  subl(rtmp, dst);
+  movl(rcx, rtmp);
+  movl(dst, MINUS_32);
+  testl(rtmp, dst);
+  jccb(Assembler::notEqual, L_special_case);
+  movdl(dst, src);
+  andl(dst, FloatConsts_SIGNIF_BIT_MASK);
+  orl(dst, FloatConsts_SIGNIF_BIT_MASK + 1);
+  movdl(rtmp, src);
+  testl(rtmp, rtmp);
+  jccb(Assembler::greaterEqual, L_block1);
+  negl(dst);
+  bind(L_block1);
+  sarl(dst);
+  addl(dst, 0x1);
+  sarl(dst, 0x1);
+  jmp(L_exit);
+  bind(L_special_case);
+  convert_f2i(dst, src);
+  bind(L_exit);
+}
+
+void MacroAssembler::round_double(Register dst, XMMRegister src, Register rtmp, Register rcx) {
+  // Following code is line by line assembly translation rounding algorithm.
+  // Please refer to java.lang.Math.round(double) algorithm for details.
+  const int64_t DoubleConsts_EXP_BIT_MASK = 0x7FF0000000000000L;
+  const int64_t DoubleConsts_SIGNIFICAND_WIDTH = 53;
+  const int64_t DoubleConsts_EXP_BIAS = 1023;
+  const int64_t DoubleConsts_SIGNIF_BIT_MASK = 0x000FFFFFFFFFFFFFL;
+  const int64_t MINUS_64 = 0xFFFFFFFFFFFFFFC0L;
+  Label L_special_case, L_block1, L_exit;
+  mov64(rtmp, DoubleConsts_EXP_BIT_MASK);
+  movq(dst, src);
+  andq(dst, rtmp);
+  sarq(dst, DoubleConsts_SIGNIFICAND_WIDTH - 1);
+  mov64(rtmp, DoubleConsts_SIGNIFICAND_WIDTH - 2 + DoubleConsts_EXP_BIAS);
+  subq(rtmp, dst);
+  movq(rcx, rtmp);
+  mov64(dst, MINUS_64);
+  testq(rtmp, dst);
+  jccb(Assembler::notEqual, L_special_case);
+  movq(dst, src);
+  mov64(rtmp, DoubleConsts_SIGNIF_BIT_MASK);
+  andq(dst, rtmp);
+  mov64(rtmp, DoubleConsts_SIGNIF_BIT_MASK + 1);
+  orq(dst, rtmp);
+  movq(rtmp, src);
+  testq(rtmp, rtmp);
+  jccb(Assembler::greaterEqual, L_block1);
+  negq(dst);
+  bind(L_block1);
+  sarq(dst);
+  addq(dst, 0x1);
+  sarq(dst, 0x1);
+  jmp(L_exit);
+  bind(L_special_case);
+  convert_d2l(dst, src);
+  bind(L_exit);
+}
+
 void MacroAssembler::convert_d2l(Register dst, XMMRegister src) {
   Label done;
   cvttsd2siq(dst, src);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 9b3da9d5de1..303b6b0c83c 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -906,7 +906,7 @@ public:
   void fld_x(AddressLiteral src);
 
   void ldmxcsr(Address src) { Assembler::ldmxcsr(src); }
-  void ldmxcsr(AddressLiteral src);
+  void ldmxcsr(AddressLiteral src, Register scratchReg = rscratch1);
 
 #ifdef _LP64
  private:
@@ -1994,6 +1994,8 @@ public:
   void convert_d2i(Register dst, XMMRegister src);
   void convert_f2l(Register dst, XMMRegister src);
   void convert_d2l(Register dst, XMMRegister src);
+  void round_double(Register dst, XMMRegister src, Register rtmp, Register rcx);
+  void round_float(Register dst, XMMRegister src, Register rtmp, Register rcx);
 
   void cache_wb(Address line);
   void cache_wbsync(bool is_pre);
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index ab28ebd5ca5..cf182d9880d 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -1468,6 +1468,16 @@ const bool Matcher::match_rule_supported(int opcode) {
         return false;
       }
       break;
+    case Op_RoundVF:
+      if (UseAVX < 2) { // enabled for AVX2 only
+        return false;
+      }
+      break;
+    case Op_RoundVD:
+      if (UseAVX < 3) {
+        return false;  // enabled for AVX3 only
+      }
+      break;
     case Op_CompareAndSwapL:
 #ifdef _LP64
     case Op_CompareAndSwapP:
@@ -1572,6 +1582,12 @@ const bool Matcher::match_rule_supported(int opcode) {
          return false;
       }
       break;
+    case Op_RoundF:
+    case Op_RoundD:
+      if (!is_LP64) {
+        return false;
+      }
+      break;
     case Op_CopySignD:
     case Op_CopySignF:
       if (UseAVX < 3 || !is_LP64)  {
@@ -1817,6 +1833,11 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType
         return false;
       }
       break;
+    case Op_RoundVD:
+      if (!VM_Version::supports_avx512dq()) {
+        return false;
+      }
+      break;
     case Op_VectorCastF2X:
       if (is_subword_type(bt) || bt == T_LONG) {
         return false;
@@ -7173,13 +7194,14 @@ instruct vcastFtoD_reg(vec dst, vec src) %{
   ins_pipe( pipe_slow );
 %}
 
-instruct vcastFtoI_reg_avx(vec dst, vec src, vec xtmp1, vec xtmp2, vec xtmp3, vec xtmp4, rRegP scratch, rFlagsReg cr) %{
+
+instruct castFtoI_reg_avx(vec dst, vec src, vec xtmp1, vec xtmp2, vec xtmp3, vec xtmp4, rRegP scratch, rFlagsReg cr) %{
   predicate(!VM_Version::supports_avx512vl() &&
             Matcher::vector_length_in_bytes(n) < 64 &&
             Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst (VectorCastF2X src));
   effect(TEMP dst, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP xtmp4, TEMP scratch, KILL cr);
-  format %{ "vector_cast_f2i $dst,$src\t! using $xtmp1, $xtmp2, $xtmp3 and $xtmp4 as TEMP" %}
+  format %{ "vector_cast_f2i $dst,$src\t! using $xtmp1, $xtmp2, $xtmp3, $xtmp4 and $scratch as TEMP" %}
   ins_encode %{
     int vlen_enc = vector_length_encoding(this);
     __ vector_castF2I_avx($dst$$XMMRegister, $src$$XMMRegister, $xtmp1$$XMMRegister,
@@ -7189,13 +7211,13 @@ instruct vcastFtoI_reg_avx(vec dst, vec src, vec xtmp1, vec xtmp2, vec xtmp3, ve
   ins_pipe( pipe_slow );
 %}
 
-instruct vcastFtoI_reg_evex(vec dst, vec src, vec xtmp1, vec xtmp2, kReg ktmp1, kReg ktmp2, rRegP scratch, rFlagsReg cr) %{
+instruct castFtoI_reg_evex(vec dst, vec src, vec xtmp1, vec xtmp2, kReg ktmp1, kReg ktmp2, rRegP scratch, rFlagsReg cr) %{
   predicate((VM_Version::supports_avx512vl() ||
              Matcher::vector_length_in_bytes(n) == 64) &&
              Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst (VectorCastF2X src));
   effect(TEMP dst, TEMP xtmp1, TEMP xtmp2, TEMP ktmp1, TEMP ktmp2, TEMP scratch, KILL cr);
-  format %{ "vector_cast_f2i $dst,$src\t! using $xtmp1, $xtmp2, $ktmp1 and $ktmp2 as TEMP" %}
+  format %{ "vector_cast_f2i $dst,$src\t! using $xtmp1, $xtmp2, $ktmp1, $ktmp2 and $scratch as TEMP" %}
   ins_encode %{
     int vlen_enc = vector_length_encoding(this);
     __ vector_castF2I_evex($dst$$XMMRegister, $src$$XMMRegister, $xtmp1$$XMMRegister,
@@ -7216,11 +7238,11 @@ instruct vcastDtoF_reg(vec dst, vec src) %{
   ins_pipe( pipe_slow );
 %}
 
-instruct vcastDtoL_reg_evex(vec dst, vec src, vec xtmp1, vec xtmp2, kReg ktmp1, kReg ktmp2, rRegP scratch, rFlagsReg cr) %{
+instruct castDtoL_reg_evex(vec dst, vec src, vec xtmp1, vec xtmp2, kReg ktmp1, kReg ktmp2, rRegP scratch, rFlagsReg cr) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst (VectorCastD2X src));
   effect(TEMP dst, TEMP xtmp1, TEMP xtmp2, TEMP ktmp1, TEMP ktmp2, TEMP scratch, KILL cr);
-  format %{ "vector_cast_d2l $dst,$src\t! using $xtmp1, $xtmp2, $ktmp1 and $ktmp2 as TEMP" %}
+  format %{ "vector_cast_d2l $dst,$src\t! using $xtmp1, $xtmp2, $ktmp1, $ktmp2 and $scratch as TEMP" %}
   ins_encode %{
     int vlen_enc = vector_length_encoding(this);
     __ vector_castD2L_evex($dst$$XMMRegister, $src$$XMMRegister, $xtmp1$$XMMRegister,
@@ -7246,6 +7268,56 @@ instruct vucast(vec dst, vec src) %{
   ins_pipe( pipe_slow );
 %}
 
+#ifdef _LP64
+instruct vround_float_avx(vec dst, vec src, vec xtmp1, vec xtmp2, vec xtmp3, vec xtmp4, rRegP scratch, rFlagsReg cr) %{
+  predicate(!VM_Version::supports_avx512vl() &&
+            Matcher::vector_length_in_bytes(n) < 64 &&
+            Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (RoundVF src));
+  effect(TEMP dst, TEMP xtmp1, TEMP xtmp2, TEMP xtmp3, TEMP xtmp4, TEMP scratch, KILL cr);
+  format %{ "vector_round_float $dst,$src\t! using $xtmp1, $xtmp2, $xtmp3, $xtmp4 and $scratch as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    InternalAddress new_mxcsr = $constantaddress((jint)0x3F80);
+    __ vector_round_float_avx($dst$$XMMRegister, $src$$XMMRegister, $xtmp1$$XMMRegister,
+                              $xtmp2$$XMMRegister, $xtmp3$$XMMRegister, $xtmp4$$XMMRegister,
+                              ExternalAddress(vector_float_signflip()), new_mxcsr, $scratch$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vround_float_evex(vec dst, vec src, vec xtmp1, vec xtmp2, kReg ktmp1, kReg ktmp2, rRegP scratch, rFlagsReg cr) %{
+  predicate((VM_Version::supports_avx512vl() ||
+             Matcher::vector_length_in_bytes(n) == 64) &&
+             Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (RoundVF src));
+  effect(TEMP dst, TEMP xtmp1, TEMP xtmp2, TEMP ktmp1, TEMP ktmp2, TEMP scratch, KILL cr);
+  format %{ "vector_round_float $dst,$src\t! using $xtmp1, $xtmp2, $ktmp1, $ktmp2 and $scratch as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    InternalAddress new_mxcsr = $constantaddress((jint)0x3F80);
+    __ vector_round_float_evex($dst$$XMMRegister, $src$$XMMRegister, $xtmp1$$XMMRegister,
+                               $xtmp2$$XMMRegister, $ktmp1$$KRegister, $ktmp2$$KRegister,
+                               ExternalAddress(vector_float_signflip()), new_mxcsr, $scratch$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct vround_reg_evex(vec dst, vec src, vec xtmp1, vec xtmp2, kReg ktmp1, kReg ktmp2, rRegP scratch, rFlagsReg cr) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst (RoundVD src));
+  effect(TEMP dst, TEMP xtmp1, TEMP xtmp2, TEMP ktmp1, TEMP ktmp2, TEMP scratch, KILL cr);
+  format %{ "vector_round_long $dst,$src\t! using $xtmp1, $xtmp2, $ktmp1, $ktmp2 and $scratch as TEMP" %}
+  ins_encode %{
+    int vlen_enc = vector_length_encoding(this);
+    InternalAddress new_mxcsr = $constantaddress((jint)0x3F80);
+    __ vector_round_double_evex($dst$$XMMRegister, $src$$XMMRegister, $xtmp1$$XMMRegister,
+                                $xtmp2$$XMMRegister, $ktmp1$$KRegister, $ktmp2$$KRegister,
+                                ExternalAddress(vector_double_signflip()), new_mxcsr, $scratch$$Register, vlen_enc);
+  %}
+  ins_pipe( pipe_slow );
+%}
+#endif
 // --------------------------------- VectorMaskCmp --------------------------------------
 
 instruct vcmpFD(legVec dst, legVec src1, legVec src2, immI8 cond) %{
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 09ff7075994..62132ea930f 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -10821,6 +10821,28 @@ instruct convD2L_reg_reg(rRegL dst, regD src, rFlagsReg cr)
   ins_pipe(pipe_slow);
 %}
 
+instruct round_double_reg(rRegL dst, regD src, rRegL rtmp, rcx_RegL rcx, rFlagsReg cr)
+%{
+  match(Set dst (RoundD src));
+  effect(TEMP dst, TEMP rtmp, TEMP rcx, KILL cr);
+  format %{ "round_double $dst,$src \t! using $rtmp and $rcx as TEMP"%}
+  ins_encode %{
+    __ round_double($dst$$Register, $src$$XMMRegister, $rtmp$$Register, $rcx$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct round_float_reg(rRegI dst, regF src, rRegL rtmp, rcx_RegL rcx, rFlagsReg cr)
+%{
+  match(Set dst (RoundF src));
+  effect(TEMP dst, TEMP rtmp, TEMP rcx, KILL cr);
+  format %{ "round_float $dst,$src" %}
+  ins_encode %{
+    __ round_float($dst$$Register, $src$$XMMRegister, $rtmp$$Register, $rcx$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct convI2F_reg_reg(regF dst, rRegI src)
 %{
   predicate(!UseXmmI2F);
diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp
index 7ae8d123642..ba65dd706fb 100644
--- a/src/hotspot/share/adlc/formssel.cpp
+++ b/src/hotspot/share/adlc/formssel.cpp
@@ -4239,6 +4239,7 @@ bool MatchRule::is_vector() const {
     "FmaVD","FmaVF","PopCountVI", "PopCountVL", "VectorLongToMask",
     // Next are vector mask ops.
     "MaskAll", "AndVMask", "OrVMask", "XorVMask", "VectorMaskCast",
+    "RoundVF", "RoundVD",
     // Next are not supported currently.
     "PackB","PackS","PackI","PackL","PackF","PackD","Pack2L","Pack2D",
     "ExtractB","ExtractUB","ExtractC","ExtractS","ExtractI","ExtractL","ExtractF","ExtractD"
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 5b2c6a9ce56..b2757ca86bc 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -134,6 +134,7 @@ class methodHandle;
   do_name(log_name,"log")       do_name(log10_name,"log10")     do_name(pow_name,"pow")                                 \
   do_name(exp_name,"exp")       do_name(min_name,"min")         do_name(max_name,"max")                                 \
   do_name(floor_name, "floor")  do_name(ceil_name, "ceil")      do_name(rint_name, "rint")                              \
+  do_name(round_name, "round")                                                                                          \
                                                                                                                         \
   do_name(addExact_name,"addExact")                                                                                     \
   do_name(decrementExact_name,"decrementExact")                                                                         \
@@ -185,6 +186,8 @@ class methodHandle;
   do_intrinsic(_minF,                     java_lang_Math,         min_name,           float2_float_signature,    F_S)   \
   do_intrinsic(_maxD,                     java_lang_Math,         max_name,           double2_double_signature,  F_S)   \
   do_intrinsic(_minD,                     java_lang_Math,         min_name,           double2_double_signature,  F_S)   \
+  do_intrinsic(_roundD,                   java_lang_Math,         round_name,         double_long_signature,     F_S)   \
+  do_intrinsic(_roundF,                   java_lang_Math,         round_name,         float_int_signature,       F_S)   \
   do_intrinsic(_dcopySign,                java_lang_Math,         copySign_name,      double2_double_signature,  F_S)   \
   do_intrinsic(_fcopySign,                java_lang_Math,         copySign_name,      float2_float_signature,    F_S)   \
   do_intrinsic(_dsignum,                  java_lang_Math,         signum_name,        double_double_signature,   F_S)   \
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index 94e7fb4f4a0..dfa2a86e602 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -523,6 +523,8 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt
   case vmIntrinsics::_dlog:
   case vmIntrinsics::_dlog10:
   case vmIntrinsics::_dpow:
+  case vmIntrinsics::_roundD:
+  case vmIntrinsics::_roundF:
   case vmIntrinsics::_min:
   case vmIntrinsics::_max:
   case vmIntrinsics::_min_strict:
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 5cedd71ec56..a268399f1b9 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -311,6 +311,8 @@ macro(SignumD)
 macro(SignumF)
 macro(SqrtD)
 macro(SqrtF)
+macro(RoundF)
+macro(RoundD)
 macro(Start)
 macro(StartOSR)
 macro(StoreB)
@@ -446,6 +448,8 @@ macro(ReplicateI)
 macro(ReplicateL)
 macro(ReplicateF)
 macro(ReplicateD)
+macro(RoundVF)
+macro(RoundVD)
 macro(Extract)
 macro(ExtractB)
 macro(ExtractUB)
diff --git a/src/hotspot/share/opto/convertnode.hpp b/src/hotspot/share/opto/convertnode.hpp
index fb670191fc3..87fca38d43f 100644
--- a/src/hotspot/share/opto/convertnode.hpp
+++ b/src/hotspot/share/opto/convertnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,6 +81,14 @@ class ConvD2LNode : public Node {
   virtual uint ideal_reg() const { return Op_RegL; }
 };
 
+class RoundDNode : public Node {
+  public:
+  RoundDNode( Node *dbl ) : Node(0,dbl) {}
+  virtual int Opcode() const;
+  virtual const Type *bottom_type() const { return TypeLong::LONG; }
+  virtual uint ideal_reg() const { return Op_RegL; }
+};
+
 //------------------------------ConvF2DNode------------------------------------
 // Convert Float to a Double.
 class ConvF2DNode : public Node {
@@ -105,6 +113,7 @@ class ConvF2INode : public Node {
   virtual uint  ideal_reg() const { return Op_RegI; }
 };
 
+
 //------------------------------ConvF2LNode------------------------------------
 // Convert float to long
 class ConvF2LNode : public Node {
@@ -141,6 +150,14 @@ class ConvI2FNode : public Node {
   virtual uint  ideal_reg() const { return Op_RegF; }
 };
 
+class RoundFNode : public Node {
+  public:
+  RoundFNode( Node *in1 ) : Node(0,in1) {}
+  virtual int Opcode() const;
+  virtual const Type *bottom_type() const { return TypeInt::INT; }
+  virtual uint  ideal_reg() const { return Op_RegI; }
+};
+
 //------------------------------ConvI2LNode------------------------------------
 // Convert integer to long
 class ConvI2LNode : public TypeNode {
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 2f7c7fdc84c..fd23e272c71 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -269,6 +269,8 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_dcopySign:
   case vmIntrinsics::_fcopySign:
   case vmIntrinsics::_dsignum:
+  case vmIntrinsics::_roundF:
+  case vmIntrinsics::_roundD:
   case vmIntrinsics::_fsignum:                  return inline_math_native(intrinsic_id());
 
   case vmIntrinsics::_notify:
@@ -1605,6 +1607,7 @@ Node* LibraryCallKit::round_double_node(Node* n) {
 // public static double Math.sqrt(double)
 // public static double Math.log(double)
 // public static double Math.log10(double)
+// public static double Math.round(double)
 bool LibraryCallKit::inline_double_math(vmIntrinsics::ID id) {
   Node* arg = round_double_node(argument(0));
   Node* n = NULL;
@@ -1616,6 +1619,7 @@ bool LibraryCallKit::inline_double_math(vmIntrinsics::ID id) {
   case vmIntrinsics::_ceil:   n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_ceil); break;
   case vmIntrinsics::_floor:  n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_floor); break;
   case vmIntrinsics::_rint:   n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_rint); break;
+  case vmIntrinsics::_roundD: n = new RoundDNode(arg); break;
   case vmIntrinsics::_dcopySign: n = CopySignDNode::make(_gvn, arg, round_double_node(argument(2))); break;
   case vmIntrinsics::_dsignum: n = SignumDNode::make(_gvn, arg); break;
   default:  fatal_unexpected_iid(id);  break;
@@ -1637,6 +1641,7 @@ bool LibraryCallKit::inline_math(vmIntrinsics::ID id) {
   case vmIntrinsics::_labs:   n = new AbsLNode(                arg);  break;
   case vmIntrinsics::_fcopySign: n = new CopySignFNode(arg, argument(1)); break;
   case vmIntrinsics::_fsignum: n = SignumFNode::make(_gvn, arg); break;
+  case vmIntrinsics::_roundF: n = new RoundFNode(arg); break;
   default:  fatal_unexpected_iid(id);  break;
   }
   set_result(_gvn.transform(n));
@@ -1752,9 +1757,11 @@ bool LibraryCallKit::inline_math_native(vmIntrinsics::ID id) {
       runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dlog10), "LOG10");
 
     // These intrinsics are supported on all hardware
+  case vmIntrinsics::_roundD: return Matcher::match_rule_supported(Op_RoundD) ? inline_double_math(id) : false;
   case vmIntrinsics::_ceil:
   case vmIntrinsics::_floor:
   case vmIntrinsics::_rint:   return Matcher::match_rule_supported(Op_RoundDoubleMode) ? inline_double_math(id) : false;
+
   case vmIntrinsics::_dsqrt:
   case vmIntrinsics::_dsqrt_strict:
                               return Matcher::match_rule_supported(Op_SqrtD) ? inline_double_math(id) : false;
@@ -1774,6 +1781,7 @@ bool LibraryCallKit::inline_math_native(vmIntrinsics::ID id) {
   case vmIntrinsics::_fcopySign: return inline_math(id);
   case vmIntrinsics::_dsignum: return Matcher::match_rule_supported(Op_SignumD) ? inline_double_math(id) : false;
   case vmIntrinsics::_fsignum: return Matcher::match_rule_supported(Op_SignumF) ? inline_math(id) : false;
+  case vmIntrinsics::_roundF: return Matcher::match_rule_supported(Op_RoundF) ? inline_math(id) : false;
 
    // These intrinsics are not yet correctly implemented
   case vmIntrinsics::_datan2:
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 253340a6be5..a9839941669 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -970,6 +970,10 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) {
       case Op_ModL: body_size += 30; break;
       case Op_DivL: body_size += 30; break;
       case Op_MulL: body_size += 10; break;
+      case Op_RoundF: body_size += 30; break;
+      case Op_RoundD: body_size += 30; break;
+      case Op_RoundVF: body_size += 30; break;
+      case Op_RoundVD: body_size += 30; break;
       case Op_PopCountVI:
       case Op_PopCountVL: {
         const TypeVect* vt = n->bottom_type()->is_vect();
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 8a116212783..1459e3b7541 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -2563,6 +2563,7 @@ bool SuperWord::output() {
                  opc == Op_AbsF || opc == Op_AbsD ||
                  opc == Op_AbsI || opc == Op_AbsL ||
                  opc == Op_NegF || opc == Op_NegD ||
+                 opc == Op_RoundF || opc == Op_RoundD ||
                  opc == Op_PopCountI || opc == Op_PopCountL) {
         assert(n->req() == 2, "only one input expected");
         Node* in = vector_opd(p, 1);
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index ae9bb537959..8b385f28f40 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -157,6 +157,10 @@ int VectorNode::opcode(int sopc, BasicType bt) {
     return (bt == T_FLOAT ? Op_SqrtVF : 0);
   case Op_SqrtD:
     return (bt == T_DOUBLE ? Op_SqrtVD : 0);
+  case Op_RoundF:
+    return (bt == T_INT ? Op_RoundVF : 0);
+  case Op_RoundD:
+    return (bt == T_LONG ? Op_RoundVD : 0);
   case Op_PopCountI:
     // Unimplemented for subword types since bit count changes
     // depending on size of lane (and sign bit).
@@ -585,6 +589,9 @@ VectorNode* VectorNode::make(int vopc, Node* n1, Node* n2, const TypeVect* vt, b
   case Op_SqrtVF: return new SqrtVFNode(n1, vt);
   case Op_SqrtVD: return new SqrtVDNode(n1, vt);
 
+  case Op_RoundVF: return new RoundVFNode(n1, vt);
+  case Op_RoundVD: return new RoundVDNode(n1, vt);
+
   case Op_PopCountVI: return new PopCountVINode(n1, vt);
   case Op_PopCountVL: return new PopCountVLNode(n1, vt);
   case Op_RotateLeftV: return new RotateLeftVNode(n1, n2, vt);
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index d853a71f8cc..74fd1f63991 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -1544,6 +1544,14 @@ class VectorCastD2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+class RoundVFNode : public VectorNode {
+ public:
+  RoundVFNode(Node* in, const TypeVect* vt) :VectorNode(in, vt) {
+    assert(in->bottom_type()->is_vect()->element_basic_type() == T_FLOAT, "must be float");
+  }
+  virtual int Opcode() const;
+};
+
 class VectorUCastB2XNode : public VectorCastNode {
  public:
   VectorUCastB2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1552,6 +1560,14 @@ class VectorUCastB2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+class RoundVDNode : public VectorNode {
+ public:
+  RoundVDNode(Node* in, const TypeVect* vt) : VectorNode(in, vt) {
+    assert(in->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE, "must be double");
+  }
+  virtual int Opcode() const;
+};
+
 class VectorUCastS2XNode : public VectorCastNode {
  public:
   VectorUCastS2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index 6d8fa48c976..4155e8616f5 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -753,6 +753,7 @@ public final class Math {
      * @see     java.lang.Integer#MAX_VALUE
      * @see     java.lang.Integer#MIN_VALUE
      */
+    @IntrinsicCandidate
     public static int round(float a) {
         int intBits = Float.floatToRawIntBits(a);
         int biasedExp = (intBits & FloatConsts.EXP_BIT_MASK)
@@ -802,6 +803,7 @@ public final class Math {
      * @see     java.lang.Long#MAX_VALUE
      * @see     java.lang.Long#MIN_VALUE
      */
+    @IntrinsicCandidate
     public static long round(double a) {
         long longBits = Double.doubleToRawLongBits(a);
         long biasedExp = (longBits & DoubleConsts.EXP_BIT_MASK)
diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java
index 8822b38a99a..cc6f860a6a9 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestDoubleVect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,14 +44,16 @@ public class TestDoubleVect {
     System.out.println("Testing Double vectors");
     int errn = test();
     if (errn > 0) {
-      System.err.println("FAILED: " + errn + " errors");
-      System.exit(97);
+        System.err.println("FAILED: " + errn + " errors");
+        System.exit(97);
     }
     System.out.println("PASSED");
   }
 
   static int test() {
     double[] a0 = new double[ARRLEN];
+    long  [] l0 = new long[ARRLEN];
+
     double[] a1 = new double[ARRLEN];
     double[] a2 = new double[ARRLEN];
     double[] a3 = new double[ARRLEN];
@@ -91,6 +93,7 @@ public class TestDoubleVect {
       test_ceil(a0, a1);
       test_floor(a0, a1);
       test_sqrt(a0, a1);
+      test_round(l0, a1);
     }
     // Test and verify results
     System.out.println("Verification");
@@ -355,6 +358,7 @@ public class TestDoubleVect {
         errn += verify("test_negc: ", i, a0[i], (double)(-((double)(ADD_INIT+i))));
       }
 
+
       // To test -ve and +ve Zero scenarios.
       double [] other_corner_cases     = { -0.0, 0.0, 9.007199254740992E15 };
       double [] other_corner_cases_res = new double[3];
@@ -421,6 +425,35 @@ public class TestDoubleVect {
       for (int i=8; i<ARRLEN; i++) {
         errn += verify("test_sqrt: ", i, a0[i], Math.sqrt((double)(ADD_INIT+i)));
       }
+
+      a1[6] = +0x1.fffffffffffffp-2;
+      a1[7] = +0x1.0p-1;
+      a1[8] = +0x1.0000000000001p-1;
+      a1[9] = -0x1.fffffffffffffp-2;
+      a1[10] = -0x1.0p-1;
+      a1[11] = -0x1.0000000000001p-1;
+      a1[12] = 1.7976931348623157E19;
+      a1[13] = -1.7976931348623157E19;
+
+      test_round(l0, a1);
+      errn += verify("test_round: ", 0, l0[0], 0L);
+      errn += verify("test_round: ", 1, l0[1], Long.MAX_VALUE);
+      errn += verify("test_round: ", 2, l0[2], Long.MIN_VALUE);
+      errn += verify("test_round: ", 3, l0[3], Long.MAX_VALUE);
+      errn += verify("test_round: ", 4, l0[4], 0L);
+      errn += verify("test_round: ", 5, l0[5], 0L);
+
+      errn += verify("test_round: ", 6, l0[6], 0L);
+      errn += verify("test_round: ", 7, l0[7], 1L);
+      errn += verify("test_round: ", 8, l0[8], 1L);
+      errn += verify("test_round: ", 9, l0[9], 0L);
+      errn += verify("test_round: ", 10, l0[10], 0L);
+      errn += verify("test_round: ", 11, l0[11], -1L);
+      errn += verify("test_round: ", 12, l0[12], Long.MAX_VALUE);
+      errn += verify("test_round: ", 13, l0[13], Long.MIN_VALUE);
+      for (int i=14; i<ARRLEN; i++) {
+        errn += verify("test_round: ", i, l0[i], Math.round((double)(ADD_INIT+i)));
+      }
     }
 
     if (errn > 0)
@@ -564,6 +597,12 @@ public class TestDoubleVect {
     end = System.currentTimeMillis();
     System.out.println("test_sqrt_n: " + (end - start));
 
+    start = System.currentTimeMillis();
+    for (int i=0; i<ITERS; i++) {
+      test_round(l0, a1);
+    }
+    end = System.currentTimeMillis();
+    System.out.println("test_round_n: " + (end - start));
     return errn;
   }
 
@@ -691,6 +730,20 @@ public class TestDoubleVect {
     }
   }
 
+  static void test_round(long[] a0, double[] a1) {
+    for (int i = 0; i < a0.length; i+=1) {
+      a0[i] = Math.round(a1[i]);
+    }
+  }
+
+  static int verify(String text, int i, long elem, long val) {
+    if (elem != val) {
+      System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+      return 1;
+    }
+    return 0;
+  }
+
   static int verify(String text, int i, double elem, double val) {
     if (elem != val && !(Double.isNaN(elem) && Double.isNaN(val))) {
       System.err.println(text + "[" + i + "] = " + elem + " != " + val);
diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java
index a10da62e788..48bb8bdbc12 100644
--- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java
+++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestFloatVect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@ public class TestFloatVect {
 
   static int test() {
     float[] a0 = new float[ARRLEN];
+    int[] i0 = new int[ARRLEN];
     float[] a1 = new float[ARRLEN];
     float[] a2 = new float[ARRLEN];
     float[] a3 = new float[ARRLEN];
@@ -88,7 +89,9 @@ public class TestFloatVect {
       test_diva(a0, a1, a3);
       test_negc(a0, a1);
       test_sqrt(a0, a1);
+      test_round(i0, a1);
     }
+
     // Test and verify results
     System.out.println("Verification");
     int errn = 0;
@@ -369,6 +372,35 @@ public class TestFloatVect {
         errn += verify("test_sqrt: ", i, a0[i], (float)(Math.sqrt((double)(ADD_INIT+i))));
       }
 
+      a1[6] = +0x1.fffffep-2f;
+      a1[7] = +0x1.0p-1f;
+      a1[8] = +0x1.000002p-1f;
+      a1[9] = -0x1.fffffep-2f;
+      a1[10] = -0x1.0p-1f;
+      a1[11] = -0x1.000002p-1f;
+      a1[12] = 3.4028235E10f;
+      a1[13] = -3.4028235E10f;
+
+      test_round(i0, a1);
+      errn += verify("test_round: ", 0, i0[0], 0);
+      errn += verify("test_round: ", 1, i0[1], Integer.MAX_VALUE);
+      errn += verify("test_round: ", 2, i0[2], Integer.MIN_VALUE);
+      errn += verify("test_round: ", 3, i0[3], Integer.MAX_VALUE);
+      errn += verify("test_round: ", 4, i0[4], 0);
+      errn += verify("test_round: ", 5, i0[5], 0);
+      errn += verify("test_round: ", 6, i0[6], 0);
+      errn += verify("test_round: ", 7, i0[7], 1);
+      errn += verify("test_round: ", 8, i0[8], 1);
+      errn += verify("test_round: ", 9, i0[9], 0);
+      errn += verify("test_round: ", 10, i0[10], 0);
+      errn += verify("test_round: ", 11, i0[11], -1);
+      errn += verify("test_round: ", 12, i0[12], Integer.MAX_VALUE);
+      errn += verify("test_round: ", 13, i0[13], Integer.MIN_VALUE);
+
+      for (int i=14; i<ARRLEN; i++) {
+        errn += verify("test_round: ", i, i0[i], Math.round(((float)(ADD_INIT+i))));
+      }
+
     }
 
     if (errn > 0)
@@ -512,6 +544,12 @@ public class TestFloatVect {
     end = System.currentTimeMillis();
     System.out.println("test_sqrt_n: " + (end - start));
 
+    start = System.currentTimeMillis();
+    for (int i=0; i<ITERS; i++) {
+      test_round(i0, a1);
+    }
+    end = System.currentTimeMillis();
+    System.out.println("test_round_n: " + (end - start));
     return errn;
   }
 
@@ -609,6 +647,20 @@ public class TestFloatVect {
     }
   }
 
+  static void test_round(int[] a0, float[] a1) {
+    for (int i = 0; i < a0.length; i+=1) {
+      a0[i] = Math.round(a1[i]);
+    }
+  }
+
+  static int verify(String text, int i, int elem, int val) {
+    if (elem != val) {
+      System.err.println(text + "[" + i + "] = " + elem + " != " + val);
+      return 1;
+    }
+    return 0;
+  }
+
   static int verify(String text, int i, float elem, float val) {
     if (elem != val && !(Float.isNaN(elem) && Float.isNaN(val))) {
       System.err.println(text + "[" + i + "] = " + elem + " != " + val);
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectDouble.java b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectDouble.java
new file mode 100644
index 00000000000..83fb2790aa6
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectDouble.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8279508
+ * @summary Auto-vectorize Math.round API
+ * @requires vm.compiler2.enabled
+ * @requires vm.cpu.features ~= ".*avx512dq.*"
+ * @requires os.simpleArch == "x64"
+ * @library /test/lib /
+ * @run driver compiler.vectorization.TestRoundVectDouble
+ */
+
+package compiler.vectorization;
+
+import compiler.lib.ir_framework.*;
+
+public class TestRoundVectDouble {
+  private static final int ARRLEN = 1024;
+  private static final int ITERS  = 11000;
+
+  private static double [] dinp;
+  private static long   [] lout;
+
+  public static void main(String args[]) {
+      TestFramework.runWithFlags("-XX:-TieredCompilation",
+                                  "-XX:UseAVX=3",
+                                  "-XX:CompileThresholdScaling=0.3");
+      System.out.println("PASSED");
+  }
+
+  @Test
+  @IR(applyIf = {"UseAVX", "3"}, counts = {"RoundVD" , " > 0 "})
+  public void test_round_double(long[] lout, double[] dinp) {
+      for (int i = 0; i < lout.length; i+=1) {
+          lout[i] = Math.round(dinp[i]);
+      }
+  }
+
+  @Run(test = {"test_round_double"}, mode = RunMode.STANDALONE)
+  public void kernel_test_round_double() {
+      dinp = new double[ARRLEN];
+      lout = new long[ARRLEN];
+      for(int i = 0 ; i < ARRLEN; i++) {
+          dinp[i] = (double)i*1.4;
+      }
+      for (int i = 0; i < ITERS; i++) {
+          test_round_double(lout , dinp);
+      }
+  }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
new file mode 100644
index 00000000000..78e8d7b55cc
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8279508
+ * @summary Auto-vectorize Math.round API
+ * @requires vm.compiler2.enabled
+ * @requires vm.cpu.features ~= ".*avx.*"
+ * @requires os.simpleArch == "x64"
+ * @library /test/lib /
+ * @run driver compiler.vectorization.TestRoundVectFloat
+ */
+
+package compiler.vectorization;
+
+import compiler.lib.ir_framework.*;
+
+public class TestRoundVectFloat {
+  private static final int ARRLEN = 1024;
+  private static final int ITERS  = 11000;
+  private static float  [] finp;
+  private static int    [] iout;
+
+  public static void main(String args[]) {
+      TestFramework.runWithFlags("-XX:-TieredCompilation",
+                                 "-XX:UseAVX=1",
+                                 "-XX:CompileThresholdScaling=0.3");
+      System.out.println("PASSED");
+  }
+
+  @Test
+  @IR(applyIf = {"UseAVX", " > 1"}, counts = {"RoundVF" , " > 0 "})
+  public void test_round_float(int[] iout, float[] finp) {
+      for (int i = 0; i < finp.length; i+=1) {
+          iout[i] = Math.round(finp[i]);
+      }
+  }
+
+  @Run(test = {"test_round_float"}, mode = RunMode.STANDALONE)
+  public void kernel_test_round() {
+      finp = new float[ARRLEN];
+      iout = new int[ARRLEN];
+      for(int i = 0 ; i < ARRLEN; i++) {
+          finp[i] = (float)i*1.4f;
+      }
+      for (int i = 0; i < ITERS; i++) {
+          test_round_float(iout , finp);
+      }
+  }
+}
diff --git a/test/jdk/java/lang/Math/RoundTests.java b/test/jdk/java/lang/Math/RoundTests.java
index 0a51b426386..e8f4e817a66 100644
--- a/test/jdk/java/lang/Math/RoundTests.java
+++ b/test/jdk/java/lang/Math/RoundTests.java
@@ -25,20 +25,22 @@
  * @test
  * @bug 6430675 8010430
  * @summary Check for correct implementation of {Math, StrictMath}.round
+ * @run main/othervm -XX:Tier3CompileThreshold=50 -XX:CompileThresholdScaling=0.01 -XX:+TieredCompilation RoundTests
  */
 public class RoundTests {
     public static void main(String... args) {
         int failures = 0;
-
-        failures += testNearFloatHalfCases();
-        failures += testNearDoubleHalfCases();
-        failures += testUnityULPCases();
-        failures += testSpecialCases();
-
-        if (failures > 0) {
-            System.err.println("Testing {Math, StrictMath}.round incurred "
-                               + failures + " failures.");
-            throw new RuntimeException();
+        for (int i = 0; i < 500; i++) {
+            failures += testNearFloatHalfCases();
+            failures += testNearDoubleHalfCases();
+            failures += testUnityULPCases();
+            failures += testSpecialCases();
+
+            if (failures > 0) {
+                System.err.println("Testing {Math, StrictMath}.round incurred "
+                                   + failures + " failures.");
+                throw new RuntimeException();
+            }
         }
     }
 
diff --git a/test/micro/org/openjdk/bench/java/math/FpRoundingBenchmark.java b/test/micro/org/openjdk/bench/java/math/FpRoundingBenchmark.java
index cf0eed32e07..8381673028e 100644
--- a/test/micro/org/openjdk/bench/java/math/FpRoundingBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/math/FpRoundingBenchmark.java
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -26,53 +26,97 @@ package org.openjdk.bench.java.math;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import org.openjdk.jmh.annotations.*;
-import org.openjdk.jmh.infra.Blackhole;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
 public class FpRoundingBenchmark {
 
-  @Param({"1024"})
+  @Param({"1024", "2048"})
   public int TESTSIZE;
 
   public double[] DargV1;
-
-  public double[] Res;
+  public double[] ResD;
+  public long[] ResL;
+  public float[] FargV1;
+  public float[] ResF;
+  public int[] ResI;
 
   public final double[] DspecialVals = {
-      0.0, -0.0, Double.NaN, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY};
+      0.0, -0.0, Double.NaN, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY,
+      Double.MAX_VALUE, -Double.MAX_VALUE, Double.MIN_VALUE, -Double.MIN_VALUE,
+      Double.MIN_NORMAL
+  };
+
+  public final float[] FspecialVals = {
+      0.0f, -0.0f, Float.NaN, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY,
+      Float.MAX_VALUE, -Float.MAX_VALUE, Float.MIN_VALUE, -Float.MIN_VALUE,
+      Float.MIN_NORMAL
+  };
 
   @Setup(Level.Trial)
   public void BmSetup() {
-    int i = 0;
-    Random r = new Random(1024);
-    DargV1 = new double[TESTSIZE];
-    Res = new double[TESTSIZE];
-
-    for (; i < DspecialVals.length; i++) {
-      DargV1[i] = DspecialVals[i];
-    }
-
-    for (; i < TESTSIZE; i++) {
-      DargV1[i] = r.nextDouble()*TESTSIZE;
-    }
+      int i = 0;
+      Random r = new Random(1024);
+
+      DargV1 = new double[TESTSIZE];
+      ResD = new double[TESTSIZE];
+
+      for (; i < DspecialVals.length; i++) {
+          DargV1[i] = DspecialVals[i];
+      }
+
+      for (; i < TESTSIZE; i++) {
+          DargV1[i] = Double.longBitsToDouble(r.nextLong());;
+      }
+
+      FargV1 = new float[TESTSIZE];
+      ResF = new float[TESTSIZE];
+
+      i = 0;
+      for (; i < FspecialVals.length; i++) {
+          FargV1[i] = FspecialVals[i];
+      }
+
+      for (; i < TESTSIZE; i++) {
+          FargV1[i] = Float.intBitsToFloat(r.nextInt());
+      }
+
+      ResI = new int[TESTSIZE];
+      ResL = new long[TESTSIZE];
+  }
+
+  @Benchmark
+  public void test_ceil() {
+      for (int i = 0; i < TESTSIZE; i++) {
+          ResD[i] = Math.ceil(DargV1[i]);
+      }
+  }
+
+  @Benchmark
+  public void test_floor() {
+      for (int i = 0; i < TESTSIZE; i++) {
+          ResD[i] = Math.floor(DargV1[i]);
+      }
   }
 
   @Benchmark
-  public void testceil(Blackhole bh) {
-    for (int i = 0; i < TESTSIZE; i++)
-      Res[i] = Math.ceil(DargV1[i]);
+  public void test_rint() {
+      for (int i = 0; i < TESTSIZE; i++) {
+          ResD[i] = Math.rint(DargV1[i]);
+      }
   }
 
   @Benchmark
-  public void testfloor(Blackhole bh) {
-    for (int i = 0; i < TESTSIZE; i++)
-      Res[i] = Math.floor(DargV1[i]);
+  public void test_round_double() {
+      for (int i = 0; i < TESTSIZE; i++) {
+          ResL[i] = Math.round(DargV1[i]);
+      }
   }
 
   @Benchmark
-  public void testrint(Blackhole bh) {
-    for (int i = 0; i < TESTSIZE; i++)
-      Res[i] = Math.rint(DargV1[i]);
+  public void test_round_float() {
+      for (int i = 0; i < TESTSIZE; i++) {
+          ResI[i] = Math.round(FargV1[i]);
+      }
   }
 }
-- 
GitLab


From 1012d59e64327817b9a2e01b94c1ad1b962c070f Mon Sep 17 00:00:00 2001
From: Lutz Schmidt <lucy@openjdk.org>
Date: Mon, 4 Apr 2022 07:51:50 +0000
Subject: [PATCH 327/345] 8281079: [s390] Unify Address Operand Encoding in
 Instruction Emitters

Reviewed-by: mdoerr, mbaesken
---
 src/hotspot/cpu/s390/assembler_s390.hpp       |  40 +-
 .../cpu/s390/assembler_s390.inline.hpp        | 695 ++++++++++--------
 src/hotspot/cpu/s390/s390.ad                  |  37 +-
 src/hotspot/cpu/s390/stubGenerator_s390.cpp   |   8 +-
 4 files changed, 418 insertions(+), 362 deletions(-)

diff --git a/src/hotspot/cpu/s390/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp
index 1d64ceebeb0..7a1c31157b0 100644
--- a/src/hotspot/cpu/s390/assembler_s390.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2021 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022 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
@@ -729,6 +729,7 @@ class Assembler : public AbstractAssembler {
 #define SLRK_ZOPC   (unsigned  int)(0xb9 << 24 | 0x00fb << 16)
 #define SLGRK_ZOPC  (unsigned  int)(0xb9 << 24 | 0x00eb << 16)
 // RM, Logical
+#define SL_ZOPC     (unsigned  int)(0x5f << 24)
 #define SLY_ZOPC    (unsigned long)(227L << 40 | 95L)
 #define SLGF_ZOPC   (unsigned long)(227L << 40 | 27L)
 #define SLG_ZOPC    (unsigned long)(227L << 40 | 11L)
@@ -1519,7 +1520,9 @@ class Assembler : public AbstractAssembler {
   //-----------------------------------------------
 
   // Calculate length of instruction.
+  static unsigned int instr_len(unsigned char  len_bits);
   static unsigned int instr_len(unsigned char *instr);
+  static unsigned int instr_len(unsigned long  instr);
 
   // Longest instructions are 6 bytes on z/Architecture.
   static unsigned int instr_maxlen() { return 6; }
@@ -1597,6 +1600,8 @@ class Assembler : public AbstractAssembler {
   static int inv_simm32(long x)    { return (inv_s_field(x, 31,  0)); }                         // 6-byte instructions only
   static int inv_uimm12(long x)    { return (inv_u_field(x, 11,  0)); }                         // 4-byte instructions only
 
+ private:
+
   // Encode u_field from long value.
   static long u_field(long x, int hi_bit, int lo_bit) {
     long r = x << lo_bit;
@@ -1616,10 +1621,21 @@ class Assembler : public AbstractAssembler {
                                          else                     { guarantee(false, "bad address format");  return 0;   }
                                        }
 
-  static int64_t rsmask_48( int64_t d2, Register b2)              { return uimm12(d2, 20, 48)                   | regz(b2, 16, 48); }
-  static int64_t rxmask_48( int64_t d2, Register x2, Register b2) { return uimm12(d2, 20, 48) | reg(x2, 12, 48) | regz(b2, 16, 48); }
-  static int64_t rsymask_48(int64_t d2, Register b2)              { return simm20(d2)                           | regz(b2, 16, 48); }
-  static int64_t rxymask_48(int64_t d2, Register x2, Register b2) { return simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48); }
+  static int64_t rsmask_32( int64_t d2, Register b2)              { return uimm12(d2, 20, 32)                    | regz(b2, 16, 32); }
+  static int64_t rsmask_48( int64_t d2, Register b2)              { return uimm12(d2, 20, 48)                    | regz(b2, 16, 48); }
+  static int64_t rsmask_SS( int64_t d2, Register b2)              { return uimm12(d2, 36, 48)                    | regz(b2, 32, 48); } // storage-storage instructions
+  static int64_t rsymask_48(int64_t d2, Register b2)              { return simm20(d2)                            | regz(b2, 16, 48); }
+  static int64_t rxmask_32( int64_t d2, Register x2, Register b2) { return uimm12(d2, 20, 32) | regt(x2, 12, 32) | regz(b2, 16, 32); }
+  static int64_t rxmask_48( int64_t d2, Register x2, Register b2) { return uimm12(d2, 20, 48) | regt(x2, 12, 48) | regz(b2, 16, 48); }
+  static int64_t rxymask_48(int64_t d2, Register x2, Register b2) { return simm20(d2)         | regt(x2, 12, 48) | regz(b2, 16, 48); }
+
+  // For instructions which use address calculation to derive an input value to the instruction.
+  // Shift instructions are an example of such use.
+  static int64_t rsmaskt_32( int64_t d2, Register b2)             { return uimm12(d2, 20, 32)                    | regt(b2, 16, 32); }
+  static int64_t rsmaskt_48( int64_t d2, Register b2)             { return uimm12(d2, 20, 48)                    | regt(b2, 16, 48); }
+  static int64_t rsymaskt_48(int64_t d2, Register b2)             { return simm20(d2)                            | regt(b2, 16, 48); }
+  static int64_t rxmaskt_32( int64_t d2, Register x2, Register b2){ return uimm12(d2, 20, 32) | regt(x2, 12, 32) | regt(b2, 16, 32); }
+  static int64_t rxymaskt_48(int64_t d2, Register x2, Register b2){ return simm20(d2)         | regt(x2, 12, 48) | regt(b2, 16, 48); }
 
   // Address calculated from d12(vx,b) - vx is vector index register.
   static int64_t rvmask_48( int64_t d2, VectorRegister x2, Register b2) { return uimm12(d2, 20, 48) | vreg(x2, 12) | regz(b2, 16, 48); }
@@ -1717,8 +1733,8 @@ class Assembler : public AbstractAssembler {
             (((ui20 >> 12) &  0xffL) << (48-40)));  // DH
   }
 
-  static long reg(Register r, int s, int len)  { return u_field(r->encoding(), (len-s)-1, (len-s)-4); }
-  static long reg(int r, int s, int len)       { return u_field(r,             (len-s)-1, (len-s)-4); }
+  static long reg(int r, int s, int len)       { return u_field(r, (len-s)-1, (len-s)-4); }
+  static long reg( Register r, int s, int len) { return reg(r->encoding(), s, len); }
   static long regt(Register r, int s, int len) { return reg(r, s, len); }
   static long regz(Register r, int s, int len) { assert(r != Z_R0, "cannot use register R0 in memory access"); return reg(r, s, len); }
 
@@ -1792,9 +1808,11 @@ class Assembler : public AbstractAssembler {
   static unsigned int align(unsigned int x, unsigned int a) { return ((x + (a - 1)) & ~(a - 1)); }
   static bool    is_aligned(unsigned int x, unsigned int a) { return (0 == x % a); }
 
+  inline unsigned int emit_instruction(unsigned long x, unsigned int len);
   inline void emit_16(int x);
   inline void emit_32(int x);
   inline void emit_48(long x);
+  inline void emit_data(int x);
 
   // Compare and control flow instructions
   // =====================================
@@ -2159,13 +2177,17 @@ class Assembler : public AbstractAssembler {
 
   // sub memory
   inline void z_s(   Register r1, int64_t d2, Register x2, Register b2);  // sub         r1 = r1 - *(d2_imm12+x2+b2) ; int32
-  inline void z_sy(  Register r1, int64_t d2, Register x2, Register b2);  // sub         r1 = r1 + *(d2_imm20+s2+b2) ; int32
+  inline void z_sy(  Register r1, int64_t d2, Register x2, Register b2);  // sub         r1 = r1 - *(d2_imm20+s2+b2) ; int32
+  inline void z_sl(  Register r1, int64_t d2, Register x2, Register b2);  // sub         r1 = r1 - *(d2_uimm12+x2+b2); int32
+  inline void z_sly( Register r1, int64_t d2, Register x2, Register b2);  // sub         r1 = r1 - *(d2_imm20+x2+b2) ; int32
   inline void z_sg(  Register r1, int64_t d2, Register x2, Register b2);  // sub         r1 = r1 - *(d2_imm12+x2+b2) ; int64
   inline void z_sgf( Register r1, int64_t d2, Register x2, Register b2);  // sub         r1 = r1 - *(d2_imm12+x2+b2) ; int64 - int32
   inline void z_slg( Register r1, int64_t d2, Register x2, Register b2);  // sub logical r1 = r1 - *(d2_imm20+x2+b2) ; uint64
   inline void z_slgf(Register r1, int64_t d2, Register x2, Register b2);  // sub logical r1 = r1 - *(d2_imm20+x2+b2) ; uint64 - uint32
   inline void z_s(   Register r1, const Address& a);                      // sub         r1 = r1 - *(a)              ; int32
   inline void z_sy(  Register r1, const Address& a);                      // sub         r1 = r1 - *(a)              ; int32
+  inline void z_sl(  Register r1, const Address& a);                      // sub         r1 = r1 - *(a)              ; int32
+  inline void z_sly( Register r1, const Address& a);                      // sub         r1 = r1 - *(a)              ; int32
   inline void z_sg(  Register r1, const Address& a);                      // sub         r1 = r1 - *(a)              ; int64
   inline void z_sgf( Register r1, const Address& a);                      // sub         r1 = r1 - *(a)              ; int64 - int32
   inline void z_slg( Register r1, const Address& a);                      // sub         r1 = r1 - *(a)              ; uint64
diff --git a/src/hotspot/cpu/s390/assembler_s390.inline.hpp b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
index 31b674a5533..d45869e4707 100644
--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2021 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022 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
@@ -30,30 +30,59 @@
 #include "asm/codeBuffer.hpp"
 #include "code/codeCache.hpp"
 
-// Convention: Use Z_R0 and Z_R1 instead of Z_scratch_* in all
-// assembler_s390.* files.
 
-// Local implementation of byte emitters to help inlining.
+inline unsigned int Assembler::emit_instruction(unsigned long x, unsigned int len) {
+  CodeSection*  cs = code_section();
+  address      pos = pc();
+  assert(((intptr_t)pos & 0x01L) == 0, "instruction address alignment error");
+  if (len == 0) {
+    len = instr_len(x);
+  }
+
+  switch (len) {
+    case 2:
+      *(unsigned short*)(pos)     = (unsigned short)x;
+      break;
+    case 4:
+      // May be unaligned store. Only slightly less efficient.
+      *(unsigned int*)(pos)       = (unsigned int)x;
+      break;
+    case 6:
+      // Have to split anyway, so we can arrange for aligned stores.
+      if (((intptr_t)pos & 0x03) == 0) {
+        *(unsigned int*)pos       = (unsigned int)(x>>16);
+        *(unsigned short*)(pos+4) = (unsigned short)x;
+      } else {
+        *(unsigned short*)(pos)   = (unsigned short)(x>>32);
+        *(unsigned int*)(pos+2)   = (unsigned int)x;
+      }
+      break;
+    default:
+      ShouldNotReachHere();
+      break;
+  }
+
+  assert(instr_len(pos) == len, "%d-byte emitter can't handle %d-byte instructions.", len, instr_len(pos));
+  cs->set_end(pos + len);
+  return len;
+}
 inline void Assembler::emit_16(int x) {
-  CodeSection*       cs = code_section();
-  address      code_pos = pc();
-  *(unsigned short*)code_pos = (unsigned short)x;
-  cs->set_end( code_pos + sizeof(unsigned short));
+  emit_instruction((unsigned int)x, 2);
 }
 
 inline void Assembler::emit_32(int x) {
-  CodeSection*       cs = code_section();
-  address      code_pos = pc();
-  *(jint*)code_pos = (jint)x;
-  cs->set_end( code_pos + sizeof( jint));
+  emit_instruction((unsigned int)x, 4);
 }
 
 inline void Assembler::emit_48(long x) {
+  emit_instruction((unsigned long)x, 6);
+}
+
+inline void Assembler::emit_data(int x) {
   CodeSection*       cs = code_section();
   address      code_pos = pc();
-  *(unsigned short*)code_pos = (unsigned short)(x>>32);
-  *(jint*)(code_pos+sizeof(unsigned short)) = (jint)x;
-  cs->set_end( code_pos + sizeof( jint) + sizeof( unsigned short));
+  *(int*)code_pos = x;
+  cs->set_end(code_pos + sizeof(int));
 }
 
 // Support lightweight sync (from z196). Experimental as of now. For explanation see *.hpp file.
@@ -104,26 +133,27 @@ inline void Assembler::z_kimd( Register r1, Register r2) { emit_32( KIMD_ZOPC
 inline void Assembler::z_klmd( Register r1, Register r2) { emit_32( KLMD_ZOPC   | regt(r1, 24, 32) | regt(r2, 28, 32)); }
 inline void Assembler::z_kmac( Register r1, Register r2) { emit_32( KMAC_ZOPC   | regt(r1, 24, 32) | regt(r2, 28, 32)); }
 
-inline void Assembler::z_exrl(Register r1, int64_t i2)  { emit_48( EXRL_ZOPC   | regt(r1, 8, 48) | simm32(i2, 16, 48)); }                             // z10
-inline void Assembler::z_exrl(Register r1, address a2)  { emit_48( EXRL_ZOPC   | regt(r1, 8, 48) | simm32(RelAddr::pcrel_off32(a2, pc()), 16, 48)); } // z10
+inline void Assembler::z_ex(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( EX_ZOPC | regz(r1, 8, 32) | rxmask_32(d2, x2, b2)); }
+inline void Assembler::z_exrl(Register r1, int64_t i2)   { emit_48( EXRL_ZOPC   | regz(r1,  8, 48) | simm32(i2, 16, 48)); }                             // z10
+inline void Assembler::z_exrl(Register r1, address a2)   { emit_48( EXRL_ZOPC   | regz(r1,  8, 48) | simm32(RelAddr::pcrel_off32(a2, pc()), 16, 48)); } // z10
 
-inline void Assembler::z_ectg(int64_t d1, Register b1, int64_t d2, Register b2, Register r3) { emit_48( ECTG_ZOPC | reg(r3, 8, 48) | uimm12(d1, 20, 48) | reg(b1, 16, 48) | uimm12(d2, 36, 48) | reg(b2, 32, 48)); }
-inline void Assembler::z_ecag(Register r1, Register r3, int64_t d2, Register b2)             { emit_48( ECAG_ZOPC | reg(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | reg(b2, 16, 48)); }
+inline void Assembler::z_ectg( int64_t d1, Register b1, int64_t d2, Register b2, Register r3) { emit_48( ECTG_ZOPC | reg(r3, 8, 48) | rsmask_48(d1, b1) | rsmask_SS(  d2, b2)); }
+inline void Assembler::z_ecag(Register r1, Register r3, int64_t d2, Register b2)              { emit_48( ECAG_ZOPC | reg(r1, 8, 48) | reg(r3, 12, 48)   | rsymaskt_48(d2, b2)); }
 
 
 //------------------------------
 // Interlocked-Update
 //------------------------------
-inline void Assembler::z_laa(  Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAA_ZOPC   | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_laag( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAAG_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_laal( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAAL_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_laalg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAALG_ZOPC | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_lan(  Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAN_ZOPC   | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_lang( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LANG_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_lax(  Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAX_ZOPC   | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_laxg( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAXG_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_lao(  Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAO_ZOPC   | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
-inline void Assembler::z_laog( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAOG_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | regz(b2, 16, 48)); }
+inline void Assembler::z_laa(  Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAA_ZOPC   | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_laag( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAAG_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_laal( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAAL_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_laalg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAALG_ZOPC | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_lan(  Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAN_ZOPC   | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_lang( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LANG_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_lax(  Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAX_ZOPC   | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_laxg( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAXG_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_lao(  Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAO_ZOPC   | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_laog( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LAOG_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
 
 inline void Assembler::z_laa(  Register r1, Register r3, const Address& a) { assert(!a.has_index(), " no index reg allowed"); z_laa(  r1, r3, a.disp12(), a.base()); }
 inline void Assembler::z_laag( Register r1, Register r3, const Address& a) { assert(!a.has_index(), " no index reg allowed"); z_laag( r1, r3, a.disp12(), a.base()); }
@@ -139,33 +169,33 @@ inline void Assembler::z_laog( Register r1, Register r3, const Address& a) { ass
 //--------------------------------
 // Execution Prediction
 //--------------------------------
-inline void Assembler::z_pfd(  int64_t m1, int64_t d2, Register x2, Register b2) { emit_48( PFD_ZOPC   | uimm4(m1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_pfd(  int64_t m1, int64_t d2, Register x2, Register b2) { emit_48( PFD_ZOPC   | uimm4(m1, 8, 48) | rxymask_48(d2, x2, b2)); }
 inline void Assembler::z_pfd(  int64_t m1, Address a)                            { z_pfd(m1, a.disp(), a.indexOrR0(), a.base()); }
 inline void Assembler::z_pfdrl(int64_t m1, int64_t i2)                           { emit_48( PFDRL_ZOPC | uimm4(m1, 8, 48) | simm32(i2, 16, 48)); }
-inline void Assembler::z_bpp(  int64_t m1, int64_t i2, int64_t d3, Register b3)  { emit_48( BPP_ZOPC   | uimm4(m1, 8, 48) | uimm12(d3, 20, 48) | reg(b3, 16, 48) | simm16(i2, 32, 48)); }
+inline void Assembler::z_bpp(  int64_t m1, int64_t i2, int64_t d3, Register b3)  { emit_48( BPP_ZOPC   | uimm4(m1, 8, 48) | rsmask_48(d3, b3)  | simm16(i2, 32, 48)); }
 inline void Assembler::z_bprp( int64_t m1, int64_t i2, int64_t i3)               { emit_48( BPRP_ZOPC  | uimm4(m1, 8, 48) | simm12(i2, 12, 48) | simm24(i3, 24, 48)); }
 
 //-------------------------------
 // Transaction Control
 //-------------------------------
-inline void Assembler::z_tbegin( int64_t d1, Register b1, int64_t i2) { emit_48( TBEGIN_ZOPC  | uimm12(d1, 20, 48) | reg(b1, 16, 48) | uimm16(i2, 32, 48)); }
-inline void Assembler::z_tbeginc(int64_t d1, Register b1, int64_t i2) { emit_48( TBEGINC_ZOPC | uimm12(d1, 20, 48) | reg(b1, 16, 48) | uimm16(i2, 32, 48)); }
+inline void Assembler::z_tbegin( int64_t d1, Register b1, int64_t i2) { emit_48( TBEGIN_ZOPC  | rsmask_48(d1, b1) | uimm16(i2, 32, 48)); }
+inline void Assembler::z_tbeginc(int64_t d1, Register b1, int64_t i2) { emit_48( TBEGINC_ZOPC | rsmask_48(d1, b1) | uimm16(i2, 32, 48)); }
 inline void Assembler::z_tend()                                       { emit_32( TEND_ZOPC); }
-inline void Assembler::z_tabort( int64_t d2, Register b2)             { emit_32( TABORT_ZOPC  | uimm12(d2, 20, 32) | reg(b2, 16, 32)); }
+inline void Assembler::z_tabort( int64_t d2, Register b2)             { emit_32( TABORT_ZOPC  | rsmask_32(d2, b2)); }
 inline void Assembler::z_etnd(Register r1)                            { emit_32( ETND_ZOPC    | regt(r1, 24, 32)); }
 inline void Assembler::z_ppa(Register r1, Register r2, int64_t m3)    { emit_32( PPA_ZOPC     | reg(r1, 24, 32) | reg(r2, 28, 32) | uimm4(m3, 16, 32)); }
 
 //---------------------------------
 // Conditional Execution
 //---------------------------------
-inline void Assembler::z_locr(  Register r1, Register r2, branch_condition cc)             { emit_32( LOCR_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32) | uimm4(cc, 16, 32)); }               // z196
-inline void Assembler::z_locgr( Register r1, Register r2, branch_condition cc)             { emit_32( LOCGR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32) | uimm4(cc, 16, 32)); }               // z196
-inline void Assembler::z_loc(   Register r1, int64_t d2, Register b2, branch_condition cc) { emit_48( LOC_ZOPC   | regt(r1,  8, 48) | simm20(d2) | regz(b2, 16, 48) | uimm4(cc, 12, 48)); } // z196
-inline void Assembler::z_locg(  Register r1, int64_t d2, Register b2, branch_condition cc) { emit_48( LOCG_ZOPC  | regt(r1,  8, 48) | simm20(d2) | regz(b2, 16, 48) | uimm4(cc, 12, 48)); } // z196
-inline void Assembler::z_loc(   Register r1, const Address &a, branch_condition cc)        { z_loc(r1, a.disp(), a.base(), cc); }
+inline void Assembler::z_locr(  Register r1, Register r2, branch_condition cc)             { emit_32( LOCR_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32)    | uimm4(cc, 16, 32)); } // z196
+inline void Assembler::z_locgr( Register r1, Register r2, branch_condition cc)             { emit_32( LOCGR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)    | uimm4(cc, 16, 32)); } // z196
+inline void Assembler::z_loc(   Register r1, int64_t d2, Register b2, branch_condition cc) { emit_48( LOC_ZOPC   | regt(r1,  8, 48) | rsymask_48(d2, b2) | uimm4(cc, 12, 48)); } // z196
+inline void Assembler::z_locg(  Register r1, int64_t d2, Register b2, branch_condition cc) { emit_48( LOCG_ZOPC  | regt(r1,  8, 48) | rsymask_48(d2, b2) | uimm4(cc, 12, 48)); } // z196
+inline void Assembler::z_loc(   Register r1, const Address &a, branch_condition cc)        { z_loc(r1,  a.disp(), a.base(), cc); }
 inline void Assembler::z_locg(  Register r1, const Address &a, branch_condition cc)        { z_locg(r1, a.disp(), a.base(), cc); }
-inline void Assembler::z_stoc(  Register r1, int64_t d2, Register b2, branch_condition cc) { emit_48( STOC_ZOPC  | regt(r1,  8, 48) | simm20(d2) | regz(b2, 16, 48) | uimm4(cc, 12, 48)); } // z196
-inline void Assembler::z_stocg( Register r1, int64_t d2, Register b2, branch_condition cc) { emit_48( STOCG_ZOPC | regt(r1,  8, 48) | simm20(d2) | regz(b2, 16, 48) | uimm4(cc, 12, 48)); } // z196
+inline void Assembler::z_stoc(  Register r1, int64_t d2, Register b2, branch_condition cc) { emit_48( STOC_ZOPC  | regt(r1,  8, 48) | rsymask_48(d2, b2) | uimm4(cc, 12, 48)); } // z196
+inline void Assembler::z_stocg( Register r1, int64_t d2, Register b2, branch_condition cc) { emit_48( STOCG_ZOPC | regt(r1,  8, 48) | rsymask_48(d2, b2) | uimm4(cc, 12, 48)); } // z196
 
 inline void Assembler::z_srst( Register r1, Register r2) { emit_32( SRST_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_srstu(Register r1, Register r2) { emit_32( SRSTU_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
@@ -173,26 +203,29 @@ inline void Assembler::z_srstu(Register r1, Register r2) { emit_32( SRSTU_ZOPC |
 //---------------------------------
 // Address calculation
 //---------------------------------
-inline void Assembler::z_layz(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LAY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | reg(b2, 16, 48)); }
+inline void Assembler::z_layz(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LAY_ZOPC | regt(r1, 8, 48) | rxymaskt_48(d2, x2, b2)); }
+inline void Assembler::z_lay( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LAY_ZOPC | regt(r1, 8, 48) | rxymask_48( d2, x2, b2)); }
+inline void Assembler::z_laz( Register r1, int64_t d2, Register x2, Register b2) { emit_32( LA_ZOPC  | regt(r1, 8, 32) | rxmaskt_32( d2, x2, b2)); }
+inline void Assembler::z_la(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( LA_ZOPC  | regt(r1, 8, 32) | rxmask_32(  d2, x2, b2)); }
 inline void Assembler::z_lay( Register r1, const Address &a)                     { z_layz(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_lay( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LAY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_laz( Register r1, int64_t d2, Register x2, Register b2) { emit_32( LA_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | reg(b2, 16, 32)); }
-inline void Assembler::z_la(  Register r1, const Address &a)                     { z_laz(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_la(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( LA_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32));}
+inline void Assembler::z_la(  Register r1, const Address &a)                     { z_laz( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_larl(Register r1, int64_t i2)    { emit_48( LARL_ZOPC | regt(r1, 8, 48) | simm32(i2, 16, 48)); }
 inline void Assembler::z_larl(Register r1, address a)     { emit_48( LARL_ZOPC | regt(r1, 8, 48) | simm32(RelAddr::pcrel_off32(a, pc()), 16, 48)); }
 
-inline void Assembler::z_lr(Register r1, Register r2)                          { emit_16( LR_ZOPC | regt(r1,8,16) | reg(r2,12,16)); }
-inline void Assembler::z_lgr(Register r1, Register r2)                         { emit_32( LGR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
-inline void Assembler::z_lh(Register r1, int64_t d2, Register x2, Register b2) { emit_32( LH_ZOPC | 0 << 16 | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_lh(Register r1, const Address &a)                     { z_lh(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_l(Register r1, int64_t d2, Register x2, Register b2)  { emit_32( L_ZOPC | 0 << 16 | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_l(Register r1, const Address &a)                      { z_l(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_lg(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LG_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_lg(Register r1, const Address &a)                     { z_lg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-
-inline void Assembler::z_lbr(  Register r1, Register r2) { emit_32( LBR_ZOPC   | regt(r1, 24, 32) | reg( r2, 28, 32)); }
-inline void Assembler::z_lhr(  Register r1, Register r2) { emit_32( LHR_ZOPC   | regt(r1, 24, 32) | reg( r2, 28, 32)); }
+//---------------------------------
+// Load/Store
+//---------------------------------
+inline void Assembler::z_lr( Register r1, Register r2)                          { emit_16( LR_ZOPC  | regt(r1, 8,  16) | reg(r2, 12, 16)); }
+inline void Assembler::z_lgr(Register r1, Register r2)                          { emit_32( LGR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
+inline void Assembler::z_lh( Register r1, int64_t d2, Register x2, Register b2) { emit_32( LH_ZOPC  | regt(r1, 8,  32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_l(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( L_ZOPC   | regt(r1, 8,  32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_lg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LG_ZOPC  | regt(r1, 8,  48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_lh( Register r1, const Address &a)                     { z_lh(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_l(  Register r1, const Address &a)                     { z_l( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_lg( Register r1, const Address &a)                     { z_lg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+
+inline void Assembler::z_lbr(  Register r1, Register r2) { emit_32( LBR_ZOPC   | regt(r1, 24, 32) | reg(r2, 28, 32)); }
+inline void Assembler::z_lhr(  Register r1, Register r2) { emit_32( LHR_ZOPC   | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_lgbr( Register r1, Register r2) { emit_32( LGBR_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_lghr( Register r1, Register r2) { emit_32( LGHR_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_lgfr( Register r1, Register r2) { emit_32( LGFR_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32)); }
@@ -201,30 +234,30 @@ inline void Assembler::z_llgcr(Register r1, Register r2) { emit_32( LLGCR_ZOPC |
 inline void Assembler::z_llghr(Register r1, Register r2) { emit_32( LLGHR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_llgfr(Register r1, Register r2) { emit_32( LLGFR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 
+inline void Assembler::z_sth(Register r1, int64_t d2, Register x2, Register b2) { emit_32( STH_ZOPC | reg(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_st( Register r1, int64_t d2, Register x2, Register b2) { emit_32( ST_ZOPC  | reg(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_stg(Register r1, int64_t d2, Register x2, Register b2) { emit_48( STG_ZOPC | reg(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 inline void Assembler::z_sth(Register r1, const Address &a)                     { z_sth(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_sth(Register r1, int64_t d2, Register x2, Register b2) { emit_32( STH_ZOPC | reg(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_st( Register r1, const Address& d)                     { z_st(r1, d.disp(), d.indexOrR0(), d.base()); }
-inline void Assembler::z_st( Register r1, int64_t d2, Register x2, Register b2) { emit_32( ST_ZOPC  | reg(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_stg(Register r1, const Address& d)                     { z_stg(r1, d.disp(), d.indexOrR0(), d.base()); }
-inline void Assembler::z_stg(Register r1, int64_t d2, Register x2, Register b2) { emit_48( STG_ZOPC | reg(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_st( Register r1, const Address &a)                     { z_st( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_stg(Register r1, const Address &a)                     { z_stg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
-inline void Assembler::z_stcm (Register r1, int64_t m3, int64_t d2, Register b2) { emit_32( STCM_ZOPC  | regt(r1, 8, 32) | uimm4(m3, 12, 32) | uimm12(d2, 20, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_stcmy(Register r1, int64_t m3, int64_t d2, Register b2) { emit_48( STCMY_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | simm20(d2)         | regz(b2, 16, 48)); }
-inline void Assembler::z_stcmh(Register r1, int64_t m3, int64_t d2, Register b2) { emit_48( STCMH_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | simm20(d2)         | regz(b2, 16, 48)); }
+inline void Assembler::z_stcm (Register r1, int64_t m3, int64_t d2, Register b2) { emit_32( STCM_ZOPC  | regt(r1, 8, 32) | uimm4(m3, 12, 32) | rsmask_32( d2, b2)); }
+inline void Assembler::z_stcmy(Register r1, int64_t m3, int64_t d2, Register b2) { emit_48( STCMY_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_stcmh(Register r1, int64_t m3, int64_t d2, Register b2) { emit_48( STCMH_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | rsymask_48(d2, b2)); }
 
 // memory-immediate instructions (8-bit immediate)
-inline void Assembler::z_cli( int64_t d1, Register b1, int64_t i2) { emit_32( CLI_ZOPC  | uimm12(d1, 20, 32) | regz(b1, 16, 32) | uimm8(i2, 8, 32)); }
-inline void Assembler::z_mvi( int64_t d1, Register b1, int64_t i2) { emit_32( MVI_ZOPC  | uimm12(d1, 20, 32) | regz(b1, 16, 32) | imm8(i2, 8, 32)); }
-inline void Assembler::z_tm(  int64_t d1, Register b1, int64_t i2) { emit_32( TM_ZOPC   | uimm12(d1, 20, 32) | regz(b1, 16, 32) | imm8(i2, 8, 32)); }
-inline void Assembler::z_ni(  int64_t d1, Register b1, int64_t i2) { emit_32( NI_ZOPC   | uimm12(d1, 20, 32) | regz(b1, 16, 32) | imm8(i2, 8, 32)); }
-inline void Assembler::z_oi(  int64_t d1, Register b1, int64_t i2) { emit_32( OI_ZOPC   | uimm12(d1, 20, 32) | regz(b1, 16, 32) | imm8(i2, 8, 32)); }
-inline void Assembler::z_xi(  int64_t d1, Register b1, int64_t i2) { emit_32( XI_ZOPC   | uimm12(d1, 20, 32) | regz(b1, 16, 32) | imm8(i2, 8, 32)); }
-inline void Assembler::z_cliy(int64_t d1, Register b1, int64_t i2) { emit_48( CLIY_ZOPC | simm20(d1)         | regz(b1, 16, 48) | uimm8(i2, 8, 48)); }
-inline void Assembler::z_mviy(int64_t d1, Register b1, int64_t i2) { emit_48( MVIY_ZOPC | simm20(d1)         | regz(b1, 16, 48) | imm8(i2, 8, 48)); }
-inline void Assembler::z_tmy( int64_t d1, Register b1, int64_t i2) { emit_48( TMY_ZOPC  | simm20(d1)         | regz(b1, 16, 48) | imm8(i2, 8, 48)); }
-inline void Assembler::z_niy( int64_t d1, Register b1, int64_t i2) { emit_48( NIY_ZOPC  | simm20(d1)         | regz(b1, 16, 48) | imm8(i2, 8, 48)); }
-inline void Assembler::z_oiy( int64_t d1, Register b1, int64_t i2) { emit_48( OIY_ZOPC  | simm20(d1)         | regz(b1, 16, 48) | imm8(i2, 8, 48)); }
-inline void Assembler::z_xiy( int64_t d1, Register b1, int64_t i2) { emit_48( XIY_ZOPC  | simm20(d1)         | regz(b1, 16, 48) | imm8(i2, 8, 48)); }
+inline void Assembler::z_cli( int64_t d1, Register b1, int64_t i2) { emit_32( CLI_ZOPC  | rsmask_32( d1, b1) | uimm8(i2, 8, 32)); }
+inline void Assembler::z_mvi( int64_t d1, Register b1, int64_t i2) { emit_32( MVI_ZOPC  | rsmask_32( d1, b1) | imm8(i2, 8, 32)); }
+inline void Assembler::z_tm(  int64_t d1, Register b1, int64_t i2) { emit_32( TM_ZOPC   | rsmask_32( d1, b1) | imm8(i2, 8, 32)); }
+inline void Assembler::z_ni(  int64_t d1, Register b1, int64_t i2) { emit_32( NI_ZOPC   | rsmask_32( d1, b1) | imm8(i2, 8, 32)); }
+inline void Assembler::z_oi(  int64_t d1, Register b1, int64_t i2) { emit_32( OI_ZOPC   | rsmask_32( d1, b1) | imm8(i2, 8, 32)); }
+inline void Assembler::z_xi(  int64_t d1, Register b1, int64_t i2) { emit_32( XI_ZOPC   | rsmask_32( d1, b1) | imm8(i2, 8, 32)); }
+inline void Assembler::z_cliy(int64_t d1, Register b1, int64_t i2) { emit_48( CLIY_ZOPC | rsymask_48(d1, b1) | uimm8(i2, 8, 48)); }
+inline void Assembler::z_mviy(int64_t d1, Register b1, int64_t i2) { emit_48( MVIY_ZOPC | rsymask_48(d1, b1) | imm8(i2, 8, 48)); }
+inline void Assembler::z_tmy( int64_t d1, Register b1, int64_t i2) { emit_48( TMY_ZOPC  | rsymask_48(d1, b1) | imm8(i2, 8, 48)); }
+inline void Assembler::z_niy( int64_t d1, Register b1, int64_t i2) { emit_48( NIY_ZOPC  | rsymask_48(d1, b1) | imm8(i2, 8, 48)); }
+inline void Assembler::z_oiy( int64_t d1, Register b1, int64_t i2) { emit_48( OIY_ZOPC  | rsymask_48(d1, b1) | imm8(i2, 8, 48)); }
+inline void Assembler::z_xiy( int64_t d1, Register b1, int64_t i2) { emit_48( XIY_ZOPC  | rsymask_48(d1, b1) | imm8(i2, 8, 48)); }
 
 inline void Assembler::z_cli( const Address& a, int64_t imm) { assert(!a.has_index(), " no index reg allowed in CLI");  z_cli( a.disp12(), a.base(), imm); }
 inline void Assembler::z_mvi( const Address& a, int64_t imm) { assert(!a.has_index(), " no index reg allowed in CLI");  z_mvi( a.disp12(), a.base(), imm); }
@@ -244,61 +277,58 @@ inline void Assembler::z_mvc(const Address& d, const Address& s, int64_t l) {
   assert(!d.has_index() && !s.has_index(), "Address operand can not be encoded.");
   z_mvc(d.disp(), l-1, d.base(), s.disp(), s.base());
 }
-inline void Assembler::z_mvc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( MVC_ZOPC | uimm12(d1, 20, 48) | uimm8(l, 8, 48) | regz(b1, 16, 48) | uimm12(d2, 36, 48) | regz(b2, 32, 48)); }
-inline void Assembler::z_mvcle(Register r1, Register r3, int64_t d2, Register b2) { emit_32( MVCLE_ZOPC | reg(r1, 8, 32) | reg(r3, 12, 32) | uimm12(d2, 20, 32) | reg(b2, 16, 32)); }
+inline void Assembler::z_mvc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( MVC_ZOPC | uimm8(l, 8, 48) | rsmask_48(d1, b1) | rsmask_SS(d2, b2)); }
+inline void Assembler::z_mvcle(Register r1, Register r3, int64_t d2, Register b2) { emit_32( MVCLE_ZOPC | reg(r1, 8, 32) | reg(r3, 12, 32) | rsmaskt_32(d2, b2)); }
 
-inline void Assembler::z_mvhhi( int64_t d1, Register b1, int64_t i2) { emit_48( MVHHI_ZOPC | uimm12( d1, 20, 48) | regz(b1, 16, 48) | simm16(i2, 32, 48)); }
-inline void Assembler::z_mvhi ( int64_t d1, Register b1, int64_t i2) { emit_48( MVHI_ZOPC  | uimm12( d1, 20, 48) | regz(b1, 16, 48) | simm16(i2, 32, 48)); }
-inline void Assembler::z_mvghi( int64_t d1, Register b1, int64_t i2) { emit_48( MVGHI_ZOPC | uimm12( d1, 20, 48) | regz(b1, 16, 48) | simm16(i2, 32, 48)); }
+inline void Assembler::z_mvhhi( int64_t d1, Register b1, int64_t i2) { emit_48( MVHHI_ZOPC | rsmask_48( d1, b1) | simm16(i2, 32, 48)); }
+inline void Assembler::z_mvhi ( int64_t d1, Register b1, int64_t i2) { emit_48( MVHI_ZOPC  | rsmask_48( d1, b1) | simm16(i2, 32, 48)); }
+inline void Assembler::z_mvghi( int64_t d1, Register b1, int64_t i2) { emit_48( MVGHI_ZOPC | rsmask_48( d1, b1) | simm16(i2, 32, 48)); }
 inline void Assembler::z_mvhhi( const Address &d, int64_t i2) { assert(!d.has_index(), " no index reg allowed in MVHHI"); z_mvhhi( d.disp(), d.baseOrR0(), i2); }
 inline void Assembler::z_mvhi ( const Address &d, int64_t i2) { assert(!d.has_index(), " no index reg allowed in MVHI");  z_mvhi(  d.disp(), d.baseOrR0(), i2); }
 inline void Assembler::z_mvghi( const Address &d, int64_t i2) { assert(!d.has_index(), " no index reg allowed in MVGHI"); z_mvghi( d.disp(), d.baseOrR0(), i2); }
 
-inline void Assembler::z_ex(Register r1, int64_t d2, Register x2, Register b2) { emit_32( EX_ZOPC | regz(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-
-inline void Assembler::z_ic  (Register r1, int64_t d2, Register x2, Register b2) { emit_32( IC_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_icy (Register r1, int64_t d2, Register x2, Register b2) { emit_48( ICY_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_icm (Register r1, int64_t m3, int64_t d2, Register b2) { emit_32( ICM_ZOPC  | regt(r1, 8, 32) | uimm4(m3, 12, 32) | uimm12(d2, 20, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_icmy(Register r1, int64_t m3, int64_t d2, Register b2) { emit_48( ICMY_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | simm20(d2)         | regz(b2, 16, 48)); }
-inline void Assembler::z_icmh(Register r1, int64_t m3, int64_t d2, Register b2) { emit_48( ICMH_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | simm20(d2)         | regz(b2, 16, 48)); }
+inline void Assembler::z_ic  (Register r1, int64_t d2, Register x2, Register b2) { emit_32( IC_ZOPC   | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_icy (Register r1, int64_t d2, Register x2, Register b2) { emit_48( ICY_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_icm (Register r1, int64_t m3, int64_t d2,  Register b2) { emit_32( ICM_ZOPC  | regt(r1, 8, 32) | uimm4(m3, 12, 32) | rsmask_32( d2, b2)); }
+inline void Assembler::z_icmy(Register r1, int64_t m3, int64_t d2,  Register b2) { emit_48( ICMY_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_icmh(Register r1, int64_t m3, int64_t d2,  Register b2) { emit_48( ICMH_ZOPC | regt(r1, 8, 48) | uimm4(m3, 12, 48) | rsymask_48(d2, b2)); }
 inline void Assembler::z_iihh(Register r1, int64_t i2) { emit_32( IIHH_ZOPC | regt(r1, 8, 32) | imm16(i2, 16, 32)); }
 inline void Assembler::z_iihl(Register r1, int64_t i2) { emit_32( IIHL_ZOPC | regt(r1, 8, 32) | imm16(i2, 16, 32)); }
 inline void Assembler::z_iilh(Register r1, int64_t i2) { emit_32( IILH_ZOPC | regt(r1, 8, 32) | imm16(i2, 16, 32)); }
 inline void Assembler::z_iill(Register r1, int64_t i2) { emit_32( IILL_ZOPC | regt(r1, 8, 32) | imm16(i2, 16, 32)); }
 inline void Assembler::z_iihf(Register r1, int64_t i2) { emit_48( IIHF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 inline void Assembler::z_iilf(Register r1, int64_t i2) { emit_48( IILF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
-inline void Assembler::z_lgf(Register r1, const Address& a) { z_lgf(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_lgf(Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LGF_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_lhy(Register r1, const Address &a) { z_lhy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_lhy(Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LHY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_lgh(Register r1, const Address &a) { z_lgh(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_lgh(Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LGH_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_lt(Register r1, const Address &a) { z_lt(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_lt (Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LT_ZOPC  | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_ltg(Register r1, const Address &a) { z_ltg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_ltg(Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LTG_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_lgf( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LGF_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_lhy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LHY_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_lgh( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LGH_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_lt ( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LT_ZOPC   | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ltg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LTG_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ltgf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LTGF_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_lb ( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LB_ZOPC   | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_lgb( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LGB_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ly(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( LY_ZOPC   | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_llc( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LLC_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_llh( Register r1, int64_t d2, Register x2, Register b2) { emit_48( LLH_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_llgf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LLGF_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_llgh(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LLGH_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_llgc(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LLGC_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_lgf( Register r1, const Address &a) { z_lgf( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_lhy( Register r1, const Address &a) { z_lhy( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_lgh( Register r1, const Address &a) { z_lgh( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_lt(  Register r1, const Address &a) { z_lt(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_ltg( Register r1, const Address &a) { z_ltg( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_ltgf(Register r1, const Address &a) { z_ltgf(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_ltgf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LTGF_ZOPC| regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_lb(Register r1, const Address &a) { z_lb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_lb (Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LB_ZOPC  | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_lgb(Register r1, const Address &a) { z_lgb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_lgb(Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LGB_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_ly(Register r1, const Address &a) { z_ly(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_ly(Register r1, int64_t d2, Register x2, Register b2)   { emit_48( LY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_llc(Register r1, const Address& a) { z_llc(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_llc(Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LLC_ZOPC  | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_llh(Register r1, const Address &a) { z_llh(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_llh(Register r1, int64_t d2, Register x2, Register b2)  { emit_48( LLH_ZOPC  | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_lb(  Register r1, const Address &a) { z_lb(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_lgb( Register r1, const Address &a) { z_lgb( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_ly(  Register r1, const Address &a) { z_ly(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_llc( Register r1, const Address &a) { z_llc( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_llh( Register r1, const Address &a) { z_llh( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_llgf(Register r1, const Address &a) { z_llgf(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_llgf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LLGF_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
 inline void Assembler::z_llgh(Register r1, const Address &a) { z_llgh(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_llgh(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LLGH_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
 inline void Assembler::z_llgc(Register r1, const Address &a) { z_llgc(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_llgc(Register r1, int64_t d2, Register x2, Register b2) { emit_48( LLGC_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_llgc(Register r1, int64_t d2, Register b2)              { z_llgc( r1, d2, Z_R0, b2); }
-inline void Assembler::z_lhi(Register r1, int64_t i2) { emit_32( LHI_ZOPC | regt(r1, 8, 32) | simm16(i2, 16, 32)); }
-inline void Assembler::z_lghi(Register r1, int64_t i2) { emit_32( LGHI_ZOPC | regt(r1, 8, 32) | simm16(i2, 16, 32)); }
-inline void Assembler::z_lgfi(Register r1, int64_t i2) { emit_48( LGFI_ZOPC | regt(r1, 8, 48) | simm32(i2, 16, 48)); }
+inline void Assembler::z_lhi(  Register r1, int64_t i2) { emit_32( LHI_ZOPC   | regt(r1, 8, 32) | simm16(i2, 16, 32)); }
+inline void Assembler::z_lghi( Register r1, int64_t i2) { emit_32( LGHI_ZOPC  | regt(r1, 8, 32) | simm16(i2, 16, 32)); }
+inline void Assembler::z_lgfi( Register r1, int64_t i2) { emit_48( LGFI_ZOPC  | regt(r1, 8, 48) | simm32(i2, 16, 48)); }
 inline void Assembler::z_llihf(Register r1, int64_t i2) { emit_48( LLIHF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 inline void Assembler::z_llilf(Register r1, int64_t i2) { emit_48( LLILF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 inline void Assembler::z_llihh(Register r1, int64_t i2) { emit_32( LLIHH_ZOPC | regt(r1, 8, 32) | imm16(i2, 16, 32)); }
@@ -323,36 +353,37 @@ inline void Assembler::z_lrvgr(Register r1, Register r2) { emit_32( LRVGR_ZOPC |
 inline void Assembler::z_ltr(  Register r1, Register r2) { emit_16( LTR_ZOPC   | regt(r1,  8, 16) | reg(r2, 12, 16)); }
 inline void Assembler::z_ltgr( Register r1, Register r2) { emit_32( LTGR_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_ltgfr(Register r1, Register r2) { emit_32( LTGFR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
-inline void Assembler::z_stc(  Register r1, const Address &a) { z_stc(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_stc(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( STC_ZOPC | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
+inline void Assembler::z_stc(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( STC_ZOPC  | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_stcy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( STCY_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_sthy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( STHY_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_sty(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( STY_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_stc(  Register r1, const Address &a) { z_stc( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_stcy( Register r1, const Address &a) { z_stcy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_stcy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( STCY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
 inline void Assembler::z_sthy( Register r1, const Address &a) { z_sthy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_sthy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( STHY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_sty(  Register r1, const Address &a) { z_sty(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_sty(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( STY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_stfle(int64_t d2, Register b2) { emit_32(STFLE_ZOPC | uimm12(d2,20,32) | regz(b2,16,32)); }
+inline void Assembler::z_sty(  Register r1, const Address &a) { z_sty( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+
+inline void Assembler::z_stfle(int64_t d2, Register b2) { emit_32(STFLE_ZOPC | rsmask_32(d2, b2)); }
 
 
 //-----------------------------------
 // SHIFT/RORATE OPERATIONS
 //-----------------------------------
-inline void Assembler::z_sla( Register r1,              int64_t d2, Register b2) { emit_32( SLA_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(b2, 16, 32)); }
-inline void Assembler::z_slak(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SLAK_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(b2, 16, 48) | reg(r3, 12, 48)); }
-inline void Assembler::z_slag(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SLAG_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(b2, 16, 48) | reg(r3, 12, 48)); }
-inline void Assembler::z_sra( Register r1,              int64_t d2, Register b2) { emit_32( SRA_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(b2, 16, 32)); }
-inline void Assembler::z_srak(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SRAK_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(b2, 16, 48) | reg(r3, 12, 48)); }
-inline void Assembler::z_srag(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SRAG_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(b2, 16, 48) | reg(r3, 12, 48)); }
-inline void Assembler::z_sll( Register r1,              int64_t d2, Register b2) { emit_32( SLL_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(b2, 16, 32)); }
-inline void Assembler::z_sllk(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SLLK_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(b2, 16, 48) | reg(r3, 12, 48)); }
-inline void Assembler::z_sllg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SLLG_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(b2, 16, 48) | reg(r3, 12, 48)); }
-inline void Assembler::z_srl( Register r1,              int64_t d2, Register b2) { emit_32( SRL_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(b2, 16, 32)); }
-inline void Assembler::z_srlk(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SRLK_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(b2, 16, 48) | reg(r3, 12, 48)); }
-inline void Assembler::z_srlg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SRLG_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(b2, 16, 48) | reg(r3, 12, 48)); }
+inline void Assembler::z_sla( Register r1,              int64_t d2, Register b2) { emit_32( SLA_ZOPC  | regt(r1, 8, 32) | rsmaskt_32( d2, b2)); }
+inline void Assembler::z_slak(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SLAK_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
+inline void Assembler::z_slag(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SLAG_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
+inline void Assembler::z_sra( Register r1,              int64_t d2, Register b2) { emit_32( SRA_ZOPC  | regt(r1, 8, 32) | rsmaskt_32( d2, b2)); }
+inline void Assembler::z_srak(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SRAK_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
+inline void Assembler::z_srag(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SRAG_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
+inline void Assembler::z_sll( Register r1,              int64_t d2, Register b2) { emit_32( SLL_ZOPC  | regt(r1, 8, 32) | rsmaskt_32( d2, b2)); }
+inline void Assembler::z_sllk(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SLLK_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
+inline void Assembler::z_sllg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SLLG_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
+inline void Assembler::z_srl( Register r1,              int64_t d2, Register b2) { emit_32( SRL_ZOPC  | regt(r1, 8, 32) | rsmaskt_32( d2, b2)); }
+inline void Assembler::z_srlk(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SRLK_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
+inline void Assembler::z_srlg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( SRLG_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
 
 // rotate left
-inline void Assembler::z_rll( Register r1, Register r3, int64_t d2, Register b2) { emit_48( RLL_ZOPC  | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | reg(b2, 16, 48)); }
-inline void Assembler::z_rllg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( RLLG_ZOPC | regt(r1, 8, 48) | reg(r3, 12, 48) | simm20(d2) | reg(b2, 16, 48)); }
+inline void Assembler::z_rll( Register r1, Register r3, int64_t d2, Register b2) { emit_48( RLL_ZOPC  | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
+inline void Assembler::z_rllg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( RLLG_ZOPC | regt(r1, 8, 48) | rsymaskt_48(d2, b2) | reg(r3, 12, 48)); }
 
 // Rotate the AND/XOR/OR/insert
 inline void Assembler::z_rnsbg( Register r1, Register r2, int64_t spos3, int64_t epos4, int64_t nrot5, bool test_only) { // Rotate then AND selected bits.  -- z196
@@ -388,9 +419,9 @@ inline void Assembler::z_risbg( Register r1, Register r2, int64_t spos3, int64_t
 //------------------------------
 // LOGICAL OPERATIONS
 //------------------------------
-inline void Assembler::z_n(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( N_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_ny(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( NY_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_ng(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( NG_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_n(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( N_ZOPC  | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_ny(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( NY_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ng(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( NG_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 inline void Assembler::z_n(   Register r1, const Address& a) { z_n( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_ny(  Register r1, const Address& a) { z_ny(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_ng(  Register r1, const Address& a) { z_ng(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
@@ -407,9 +438,9 @@ inline void Assembler::z_nill(Register r1, int64_t i2) { emit_32( NILL_ZOPC | re
 inline void Assembler::z_nihf(Register r1, int64_t i2) { emit_48( NIHF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 inline void Assembler::z_nilf(Register r1, int64_t i2) { emit_48( NILF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 
-inline void Assembler::z_o(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( O_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_oy(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( OY_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_og(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( OG_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_o(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( O_ZOPC  | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_oy(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( OY_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_og(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( OG_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 inline void Assembler::z_o(   Register r1, const Address& a) { z_o( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_oy(  Register r1, const Address& a) { z_oy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_og(  Register r1, const Address& a) { z_og(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
@@ -426,9 +457,9 @@ inline void Assembler::z_oill(Register r1, int64_t i2) { emit_32( OILL_ZOPC | re
 inline void Assembler::z_oihf(Register r1, int64_t i2) { emit_48( OIHF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 inline void Assembler::z_oilf(Register r1, int64_t i2) { emit_48( OILF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 
-inline void Assembler::z_x(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( X_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_xy(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( XY_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_xg(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( XG_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_x(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( X_ZOPC  | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_xy(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( XY_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_xg(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( XG_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 inline void Assembler::z_x(   Register r1, const Address& a) { z_x( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_xy(  Register r1, const Address& a) { z_xy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_xg(  Register r1, const Address& a) { z_xg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
@@ -441,9 +472,9 @@ inline void Assembler::z_xgrk(Register r1, Register r2, Register r3) { emit_32(
 inline void Assembler::z_xihf(Register r1, int64_t i2) { emit_48( XIHF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 inline void Assembler::z_xilf(Register r1, int64_t i2) { emit_48( XILF_ZOPC | regt(r1, 8, 48) | imm32(i2, 16, 48)); }
 
-inline void Assembler::z_nc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( NC_ZOPC | uimm12(d1, 20, 48) | uimm8(l, 8, 48) | regz(b1, 16, 48) | uimm12(d2, 36, 48) | regz(b2, 32, 48)); }
-inline void Assembler::z_oc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( OC_ZOPC | uimm12(d1, 20, 48) | uimm8(l, 8, 48) | regz(b1, 16, 48) | uimm12(d2, 36, 48) | regz(b2, 32, 48)); }
-inline void Assembler::z_xc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( XC_ZOPC | uimm12(d1, 20, 48) | uimm8(l, 8, 48) | regz(b1, 16, 48) | uimm12(d2, 36, 48) | regz(b2, 32, 48)); }
+inline void Assembler::z_nc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( NC_ZOPC | uimm8(l, 8, 48) | rsmask_48(d1, b1) | rsmask_SS(d2, b2)); }
+inline void Assembler::z_oc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( OC_ZOPC | uimm8(l, 8, 48) | rsmask_48(d1, b1) | rsmask_SS(d2, b2)); }
+inline void Assembler::z_xc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( XC_ZOPC | uimm8(l, 8, 48) | rsmask_48(d1, b1) | rsmask_SS(d2, b2)); }
 inline void Assembler::z_nc(Address dst, int64_t len, Address src2) { assert(!dst.has_index() && !src2.has_index(), "Cannot encode index"); z_nc(dst.disp12(), len-1, dst.base(), src2.disp12(), src2.base()); }
 inline void Assembler::z_oc(Address dst, int64_t len, Address src2) { assert(!dst.has_index() && !src2.has_index(), "Cannot encode index"); z_oc(dst.disp12(), len-1, dst.base(), src2.disp12(), src2.base()); }
 inline void Assembler::z_xc(Address dst, int64_t len, Address src2) { assert(!dst.has_index() && !src2.has_index(), "Cannot encode index"); z_xc(dst.disp12(), len-1, dst.base(), src2.disp12(), src2.base()); }
@@ -452,14 +483,14 @@ inline void Assembler::z_xc(Address dst, int64_t len, Address src2) { assert(!ds
 //---------------
 // ADD
 //---------------
-inline void Assembler::z_a(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( A_ZOPC    | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_ay(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( AY_ZOPC   | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_al(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( AL_ZOPC   | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_aly( Register r1, int64_t d2, Register x2, Register b2) { emit_48( ALY_ZOPC  | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_ag(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( AG_ZOPC   | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_agf( Register r1, int64_t d2, Register x2, Register b2) { emit_48( AGF_ZOPC  | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_alg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( ALG_ZOPC  | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_algf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( ALGF_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_a(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( A_ZOPC    | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_ay(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( AY_ZOPC   | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_al(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( AL_ZOPC   | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_aly( Register r1, int64_t d2, Register x2, Register b2) { emit_48( ALY_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ag(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( AG_ZOPC   | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_agf( Register r1, int64_t d2, Register x2, Register b2) { emit_48( AGF_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_alg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( ALG_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_algf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( ALGF_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 inline void Assembler::z_a(   Register r1, const Address& a) { z_a(   r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_ay(  Register r1, const Address& a) { z_ay(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_al(  Register r1, const Address& a) { z_al(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
@@ -501,10 +532,10 @@ inline void Assembler::z_alhsik( Register r1, Register r3, int64_t i2) { emit_48
 inline void Assembler::z_alghsik(Register r1, Register r3, int64_t i2) { emit_48( ALGHSIK_ZOPC | regt(r1, 8, 48) | reg(r3, 12, 48) | simm16(i2, 16, 48)); }
 
 // In-memory arithmetic (add signed, add logical with signed immediate)
-inline void Assembler::z_asi(  int64_t d1, Register b1, int64_t i2) { emit_48( ASI_ZOPC   | simm8(i2, 8, 48) | simm20(d1) | regz(b1, 16, 48)); }
-inline void Assembler::z_agsi( int64_t d1, Register b1, int64_t i2) { emit_48( AGSI_ZOPC  | simm8(i2, 8, 48) | simm20(d1) | regz(b1, 16, 48)); }
-inline void Assembler::z_alsi( int64_t d1, Register b1, int64_t i2) { emit_48( ALSI_ZOPC  | simm8(i2, 8, 48) | simm20(d1) | regz(b1, 16, 48)); }
-inline void Assembler::z_algsi(int64_t d1, Register b1, int64_t i2) { emit_48( ALGSI_ZOPC | simm8(i2, 8, 48) | simm20(d1) | regz(b1, 16, 48)); }
+inline void Assembler::z_asi(  int64_t d1, Register b1, int64_t i2) { emit_48( ASI_ZOPC   | simm8(i2, 8, 48) | rsymask_48(d1, b1)); }
+inline void Assembler::z_agsi( int64_t d1, Register b1, int64_t i2) { emit_48( AGSI_ZOPC  | simm8(i2, 8, 48) | rsymask_48(d1, b1)); }
+inline void Assembler::z_alsi( int64_t d1, Register b1, int64_t i2) { emit_48( ALSI_ZOPC  | simm8(i2, 8, 48) | rsymask_48(d1, b1)); }
+inline void Assembler::z_algsi(int64_t d1, Register b1, int64_t i2) { emit_48( ALGSI_ZOPC | simm8(i2, 8, 48) | rsymask_48(d1, b1)); }
 inline void Assembler::z_asi(  const Address& d, int64_t i2) { assert(!d.has_index(), "No index in ASI");   z_asi(  d.disp(), d.base(), i2); }
 inline void Assembler::z_agsi( const Address& d, int64_t i2) { assert(!d.has_index(), "No index in AGSI");  z_agsi( d.disp(), d.base(), i2); }
 inline void Assembler::z_alsi( const Address& d, int64_t i2) { assert(!d.has_index(), "No index in ALSI");  z_alsi( d.disp(), d.base(), i2); }
@@ -514,14 +545,18 @@ inline void Assembler::z_algsi(const Address& d, int64_t i2) { assert(!d.has_ind
 //--------------------
 // SUBTRACT
 //--------------------
-inline void Assembler::z_s(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( S_ZOPC    | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_sy(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( SY_ZOPC   | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_sg(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( SG_ZOPC   | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_sgf( Register r1, int64_t d2, Register x2, Register b2) { emit_48( SGF_ZOPC  | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_slg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( SLG_ZOPC  | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_slgf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( SLGF_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_s(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( S_ZOPC    | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_sy(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( SY_ZOPC   | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_sl(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( SL_ZOPC   | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_sly( Register r1, int64_t d2, Register x2, Register b2) { emit_48( SLY_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_sg(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( SG_ZOPC   | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_sgf( Register r1, int64_t d2, Register x2, Register b2) { emit_48( SGF_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_slg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( SLG_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_slgf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( SLGF_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 inline void Assembler::z_s(   Register r1, const Address& a) { z_s(   r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_sy(  Register r1, const Address& a) { z_sy(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_sl(  Register r1, const Address& a) { z_sl(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_sly( Register r1, const Address& a) { z_sly( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_sg(  Register r1, const Address& a) { z_sg(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_sgf( Register r1, const Address& a) { z_sgf( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_slg( Register r1, const Address& a) { z_slg( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
@@ -533,8 +568,8 @@ inline void Assembler::z_sgfr(Register r1, Register r2) { emit_32( SGFR_ZOPC | r
 inline void Assembler::z_srk( Register r1, Register r2, Register r3) { emit_32( SRK_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32) | reg(r3, 16, 32)); }
 inline void Assembler::z_sgrk(Register r1, Register r2, Register r3) { emit_32( SGRK_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32) | reg(r3, 16, 32)); }
 
-inline void Assembler::z_sh(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( SH_ZOPC  | regt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_shy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( SHY_ZOPC | regt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_sh(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( SH_ZOPC  | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_shy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( SHY_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 inline void Assembler::z_sh(  Register r1, const Address &a) { z_sh( r1, a.disp(), a.indexOrR0(), a.base()); }
 inline void Assembler::z_shy( Register r1, const Address &a) { z_shy(r1, a.disp(), a.indexOrR0(), a.base()); }
 
@@ -560,12 +595,12 @@ inline void Assembler::z_msgfr(Register r1, Register r2) { emit_32( MSGFR_ZOPC |
 inline void Assembler::z_mlr(  Register r1, Register r2) { emit_32( MLR_ZOPC   | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_mlgr( Register r1, Register r2) { emit_32( MLGR_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 
-inline void Assembler::z_mhy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( MHY_ZOPC  | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_msy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( MSY_ZOPC  | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_msg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( MSG_ZOPC  | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_msgf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( MSGF_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_ml(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( ML_ZOPC   | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_mlg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( MLG_ZOPC  | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_mhy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( MHY_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_msy( Register r1, int64_t d2, Register x2, Register b2) { emit_48( MSY_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_msg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( MSG_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_msgf(Register r1, int64_t d2, Register x2, Register b2) { emit_48( MSGF_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ml(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( ML_ZOPC   | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_mlg( Register r1, int64_t d2, Register x2, Register b2) { emit_48( MLG_ZOPC  | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 
 inline void Assembler::z_mhy( Register r1, const Address& a) { z_mhy( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_msy( Register r1, const Address& a) { z_msy( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
@@ -583,45 +618,44 @@ inline void Assembler::z_mghi( Register r1, int64_t i2) { emit_32( MGHI_ZOPC  |
 //------------------
 // DIVIDE
 //------------------
-inline void Assembler::z_dsgr( Register r1, Register r2) { emit_32( DSGR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
+inline void Assembler::z_dsgr( Register r1, Register r2) { emit_32( DSGR_ZOPC  | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_dsgfr(Register r1, Register r2) { emit_32( DSGFR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
 
 
 //-------------------
 // COMPARE
 //-------------------
-inline void Assembler::z_cr(  Register r1, Register r2) { emit_16( CR_ZOPC   | reg(r1,  8, 16) | reg(r2,12,16)); }
+inline void Assembler::z_cr(  Register r1, Register r2) { emit_16( CR_ZOPC   | reg(r1,  8, 16) | reg(r2, 12, 16)); }
+inline void Assembler::z_clr( Register r1, Register r2) { emit_16( CLR_ZOPC  | reg(r1,  8, 16) | reg(r2, 12, 16)); }
 inline void Assembler::z_cgr( Register r1, Register r2) { emit_32( CGR_ZOPC  | reg(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_cgfr(Register r1, Register r2) { emit_32( CGFR_ZOPC | reg(r1, 24, 32) | reg(r2, 28, 32)); }
+inline void Assembler::z_clgr(Register r1, Register r2) { emit_32( CLGR_ZOPC | reg(r1, 24, 32) | reg(r2, 28, 32)); }
 inline void Assembler::z_chi( Register r1, int64_t i2)  { emit_32( CHI_ZOPC  | reg(r1,  8, 32) | simm16(i2, 16, 32)); }
 inline void Assembler::z_cghi(Register r1, int64_t i2)  { emit_32( CGHI_ZOPC | reg(r1,  8, 32) | simm16(i2, 16, 32)); }
 inline void Assembler::z_cfi( Register r1, int64_t i2)  { emit_48( CFI_ZOPC  | regt(r1, 8, 48) | uimm32(i2, 16, 48)); }
 inline void Assembler::z_cgfi(Register r1, int64_t i2)  { emit_48( CGFI_ZOPC | regt(r1, 8, 48) | uimm32(i2, 16, 48)); }
-inline void Assembler::z_ch(Register r1, const Address &a) { z_ch(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_ch(Register r1, int64_t d2, Register x2, Register b2) { emit_32( CH_ZOPC | reg(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_c(Register r1, const Address &a) { z_c(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_c(Register r1,  int64_t d2, Register x2, Register b2) { emit_32( C_ZOPC  | reg(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_cy(Register r1, const Address &a) { z_cy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_cy(Register r1, int64_t d2, Register x2, Register b2) { emit_48( CY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_cy(Register r1, int64_t d2, Register b2) { z_cy(r1, d2, Z_R0, b2); }
-inline void Assembler::z_cg(Register r1, const Address &a) { z_cg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_cg(Register r1, int64_t d2, Register x2, Register b2) { emit_48( CG_ZOPC | reg(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_clr(Register r1, Register r2) { emit_16( CLR_ZOPC | reg(r1,8,16) | reg(r2,12,16)); }
-inline void Assembler::z_clgr(Register r1, Register r2) { emit_32( CLGR_ZOPC | regt(r1, 24, 32) | reg(r2, 28, 32)); }
-
-
-inline void Assembler::z_clfi(Register r1, int64_t i2)  { emit_48( CLFI_ZOPC  | regt(r1, 8, 48) | uimm32(i2, 16, 48)); }
+inline void Assembler::z_ch(  Register r1, int64_t d2, Register x2, Register b2) { emit_32( CH_ZOPC | reg(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_c(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( C_ZOPC  | reg(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_cy(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( CY_ZOPC | reg(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_cg(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( CG_ZOPC | reg(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ch(  Register r1, const Address &a) { z_ch(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_c(   Register r1, const Address &a) { z_c( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_cy(  Register r1, const Address &a) { z_cy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_cg(  Register r1, const Address &a) { z_cg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+
+
+inline void Assembler::z_clfi( Register r1, int64_t i2) { emit_48( CLFI_ZOPC  | regt(r1, 8, 48) | uimm32(i2, 16, 48)); }
 inline void Assembler::z_clgfi(Register r1, int64_t i2) { emit_48( CLGFI_ZOPC | regt(r1, 8, 48) | uimm32(i2, 16, 48)); }
-inline void Assembler::z_cl(Register r1, const Address &a) { z_cl(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_cl(Register r1, int64_t d2, Register x2, Register b2) { emit_32( CL_ZOPC | regt(r1, 8, 32) | uimm12(d2,20,32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_cly(Register r1, const Address &a) { z_cly(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_cly(Register r1, int64_t d2, Register x2, Register b2) { emit_48( CLY_ZOPC | regt(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_cly(Register r1, int64_t d2, Register b2) { z_cly(r1, d2, Z_R0, b2); }
-inline void Assembler::z_clg(Register r1, const Address &a) { z_clg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_clg(Register r1, int64_t d2, Register x2, Register b2) { emit_48( CLG_ZOPC | reg(r1, 8, 48) | simm20(d2) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_clc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( CLC_ZOPC | uimm12(d1, 20, 48) | uimm8(l, 8, 48) | regz(b1, 16, 48) | uimm12(d2, 36, 48) | regz(b2, 32, 48)); }
-inline void Assembler::z_clcle(Register r1, Register r3, int64_t d2, Register b2) { emit_32( CLCLE_ZOPC | reg(r1, 8, 32) | reg(r3, 12, 32) | uimm12(d2, 20, 32) | reg(b2, 16, 32)); }
-inline void Assembler::z_clclu(Register r1, Register r3, int64_t d2, Register b2) { emit_48( CLCLU_ZOPC | reg(r1, 8, 48) | reg(r3, 12, 48) | uimm12(d2, 20, 48) | reg(b2, 16, 48)); }
+inline void Assembler::z_cl(   Register r1, int64_t d2, Register x2, Register b2) { emit_32( CL_ZOPC  | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_cly(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( CLY_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_clg(  Register r1, int64_t d2, Register x2, Register b2) { emit_48( CLG_ZOPC | reg( r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_cl(   Register r1, const Address &a) { z_cl( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_cly(  Register r1, const Address &a) { z_cly(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_clg(  Register r1, const Address &a) { z_clg(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+
+inline void Assembler::z_clc(int64_t d1, int64_t l, Register b1, int64_t d2, Register b2) { emit_48( CLC_ZOPC | uimm8(l, 8, 48) | rsmask_48(d1, b1) | rsmask_SS(d2, b2)); }
+inline void Assembler::z_clcle(Register r1, Register r3, int64_t d2, Register b2) { emit_32( CLCLE_ZOPC | reg(r1, 8, 32) | reg(r3, 12, 32) | rsmaskt_32( d2, b2)); }
+inline void Assembler::z_clclu(Register r1, Register r3, int64_t d2, Register b2) { emit_48( CLCLU_ZOPC | reg(r1, 8, 48) | reg(r3, 12, 48) | rsymaskt_48(d2, b2)); }
 
 inline void Assembler::z_tmll(Register r1, int64_t i2) { emit_32( TMLL_ZOPC | regt(r1, 8, 32) | imm16(i2, 16, 32)); }
 inline void Assembler::z_tmlh(Register r1, int64_t i2) { emit_32( TMLH_ZOPC | regt(r1, 8, 32) | imm16(i2, 16, 32)); }
@@ -634,86 +668,89 @@ inline void Assembler::z_trot(Register r1, Register r2, int64_t m3) { emit_32( T
 inline void Assembler::z_trto(Register r1, Register r2, int64_t m3) { emit_32( TRTO_ZOPC | reg(r1, 24, 32) | reg(r2, 28, 32) | uimm4(m3, 16, 32)); }
 inline void Assembler::z_trtt(Register r1, Register r2, int64_t m3) { emit_32( TRTT_ZOPC | reg(r1, 24, 32) | reg(r2, 28, 32) | uimm4(m3, 16, 32)); }
 
+
+//------------------------
+// COMPARE AND BRANCH/TRAP
+//------------------------
 // signed comparison
-inline void Assembler::z_crb(Register r1,  Register r2, branch_condition m3, int64_t d4, Register b4) { emit_48( CRB_ZOPC  | reg(r1, 8, 48) | reg(r2, 12, 48) | uimm12(d4, 20, 48) | reg(b4, 16, 48) | uimm4(m3, 32, 48)); }
-inline void Assembler::z_cgrb(Register r1, Register r2, branch_condition m3, int64_t d4, Register b4) { emit_48( CGRB_ZOPC | reg(r1, 8, 48) | reg(r2, 12, 48) | uimm12(d4, 20, 48) | reg(b4, 16, 48) | uimm4(m3, 32, 48)); }
-inline void Assembler::z_crj(Register r1,  Register r2, branch_condition m3, address a4)              { emit_48( CRJ_ZOPC  | reg(r1, 8, 48) | reg(r2, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm4(m3, 32, 48)); }
-inline void Assembler::z_cgrj(Register r1, Register r2, branch_condition m3, address a4)              { emit_48( CGRJ_ZOPC | reg(r1, 8, 48) | reg(r2, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm4(m3, 32, 48)); }
-inline void Assembler::z_cib(Register r1,  int64_t i2, branch_condition m3, int64_t d4, Register b4)  { emit_48( CIB_ZOPC  | reg(r1, 8, 48) | uimm4(m3, 12, 48) | uimm12(d4, 20, 48) | reg(b4, 16, 48) | simm8(i2, 32, 48)); }
-inline void Assembler::z_cgib(Register r1, int64_t i2, branch_condition m3, int64_t d4, Register b4)  { emit_48( CGIB_ZOPC | reg(r1, 8, 48) | uimm4(m3, 12, 48) | uimm12(d4, 20, 48) | reg(b4, 16, 48) | simm8(i2, 32, 48)); }
-inline void Assembler::z_cij(Register r1,  int64_t i2, branch_condition m3, address a4)               { emit_48( CIJ_ZOPC  | reg(r1, 8, 48) | uimm4(m3, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | simm8(i2, 32, 48)); }
-inline void Assembler::z_cgij(Register r1, int64_t i2, branch_condition m3, address a4)               { emit_48( CGIJ_ZOPC | reg(r1, 8, 48) | uimm4(m3, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | simm8(i2, 32, 48)); }
+inline void Assembler::z_crb(Register  r1, Register r2, branch_condition m3, int64_t d4, Register b4) { emit_48( CRB_ZOPC  | reg(r1, 8, 48) | reg(r2, 12, 48)     | rsmask_48(d4, b4) | uimm4(m3, 32, 48)); }
+inline void Assembler::z_cgrb(Register r1, Register r2, branch_condition m3, int64_t d4, Register b4) { emit_48( CGRB_ZOPC | reg(r1, 8, 48) | reg(r2, 12, 48)     | rsmask_48(d4, b4) | uimm4(m3, 32, 48)); }
+inline void Assembler::z_crj(Register  r1, Register r2, branch_condition m3, address a4)              { emit_48( CRJ_ZOPC  | reg(r1, 8, 48) | reg(r2, 12, 48)     | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm4(m3, 32, 48)); }
+inline void Assembler::z_cgrj(Register r1, Register r2, branch_condition m3, address a4)              { emit_48( CGRJ_ZOPC | reg(r1, 8, 48) | reg(r2, 12, 48)     | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm4(m3, 32, 48)); }
+inline void Assembler::z_cib(Register  r1, int64_t i2,  branch_condition m3, int64_t d4, Register b4) { emit_48( CIB_ZOPC  | reg(r1, 8, 48) | uimm4(m3, 12, 48)   | rsmask_48(d4, b4) | simm8(i2, 32, 48)); }
+inline void Assembler::z_cgib(Register r1, int64_t i2,  branch_condition m3, int64_t d4, Register b4) { emit_48( CGIB_ZOPC | reg(r1, 8, 48) | uimm4(m3, 12, 48)   | rsmask_48(d4, b4) | simm8(i2, 32, 48)); }
+inline void Assembler::z_cij(Register  r1, int64_t i2,  branch_condition m3, address a4)              { emit_48( CIJ_ZOPC  | reg(r1, 8, 48) | uimm4(m3, 12, 48)   | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | simm8(i2, 32, 48)); }
+inline void Assembler::z_cgij(Register r1, int64_t i2,  branch_condition m3, address a4)              { emit_48( CGIJ_ZOPC | reg(r1, 8, 48) | uimm4(m3, 12, 48)   | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | simm8(i2, 32, 48)); }
 // unsigned comparison
-inline void Assembler::z_clrb(Register r1,  Register r2, branch_condition m3, int64_t d4, Register b4) { emit_48( CLRB_ZOPC  | reg(r1, 8, 48) | reg(r2, 12, 48) | uimm12(d4, 20, 48) | reg(b4, 16, 48) | uimm4(m3, 32, 48)); }
-inline void Assembler::z_clgrb(Register r1, Register r2, branch_condition m3, int64_t d4, Register b4) { emit_48( CLGRB_ZOPC | reg(r1, 8, 48) | reg(r2, 12, 48) | uimm12(d4, 20, 48) | reg(b4, 16, 48) | uimm4(m3, 32, 48)); }
-inline void Assembler::z_clrj(Register r1,  Register r2, branch_condition m3, address a4)              { emit_48( CLRJ_ZOPC  | reg(r1, 8, 48) | reg(r2, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm4(m3, 32, 48)); }
-inline void Assembler::z_clgrj(Register r1, Register r2, branch_condition m3, address a4)              { emit_48( CLGRJ_ZOPC | reg(r1, 8, 48) | reg(r2, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm4(m3, 32, 48)); }
-inline void Assembler::z_clib(Register r1,  int64_t i2, branch_condition m3, int64_t d4, Register b4)  { emit_48( CLIB_ZOPC  | reg(r1, 8, 48) | uimm4(m3, 12, 48) | uimm12(d4, 20, 48) | reg(b4, 16, 48) | uimm8(i2, 32, 48)); }
-inline void Assembler::z_clgib(Register r1, int64_t i2, branch_condition m3, int64_t d4, Register b4)  { emit_48( CLGIB_ZOPC | reg(r1, 8, 48) | uimm4(m3, 12, 48) | uimm12(d4, 20, 48) | reg(b4, 16, 48) | uimm8(i2, 32, 48)); }
-inline void Assembler::z_clij(Register r1,  int64_t i2, branch_condition m3, address a4)               { emit_48( CLIJ_ZOPC  | reg(r1, 8, 48) | uimm4(m3, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm8(i2, 32, 48)); }
+inline void Assembler::z_clrb(Register  r1, Register r2, branch_condition m3, int64_t d4, Register b4) { emit_48( CLRB_ZOPC  | reg(r1, 8, 48) | reg(r2, 12, 48)   | rsmask_48(d4, b4) | uimm4(m3, 32, 48)); }
+inline void Assembler::z_clgrb(Register r1, Register r2, branch_condition m3, int64_t d4, Register b4) { emit_48( CLGRB_ZOPC | reg(r1, 8, 48) | reg(r2, 12, 48)   | rsmask_48(d4, b4) | uimm4(m3, 32, 48)); }
+inline void Assembler::z_clrj(Register  r1, Register r2, branch_condition m3, address a4)              { emit_48( CLRJ_ZOPC  | reg(r1, 8, 48) | reg(r2, 12, 48)   | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm4(m3, 32, 48)); }
+inline void Assembler::z_clgrj(Register r1, Register r2, branch_condition m3, address a4)              { emit_48( CLGRJ_ZOPC | reg(r1, 8, 48) | reg(r2, 12, 48)   | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm4(m3, 32, 48)); }
+inline void Assembler::z_clib(Register  r1, int64_t i2, branch_condition m3, int64_t d4, Register b4)  { emit_48( CLIB_ZOPC  | reg(r1, 8, 48) | uimm4(m3, 12, 48) | rsmask_48(d4, b4) | uimm8(i2, 32, 48)); }
+inline void Assembler::z_clgib(Register r1, int64_t i2, branch_condition m3, int64_t d4, Register b4)  { emit_48( CLGIB_ZOPC | reg(r1, 8, 48) | uimm4(m3, 12, 48) | rsmask_48(d4, b4) | uimm8(i2, 32, 48)); }
+inline void Assembler::z_clij(Register  r1, int64_t i2, branch_condition m3, address a4)               { emit_48( CLIJ_ZOPC  | reg(r1, 8, 48) | uimm4(m3, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm8(i2, 32, 48)); }
 inline void Assembler::z_clgij(Register r1, int64_t i2, branch_condition m3, address a4)               { emit_48( CLGIJ_ZOPC | reg(r1, 8, 48) | uimm4(m3, 12, 48) | simm16(RelAddr::pcrel_off16(a4, pc()), 16, 48) | uimm8(i2, 32, 48)); }
 
 // Compare and trap instructions (signed).
-inline void Assembler::z_crt(Register  r1, Register r2, int64_t m3)  { emit_32( CRT_ZOPC   | reg(r1, 24, 32) | reg(r2, 28, 32) | uimm4(m3, 16, 32)); }
-inline void Assembler::z_cgrt(Register r1, Register r2, int64_t m3)  { emit_32( CGRT_ZOPC  | reg(r1, 24, 32) | reg(r2, 28, 32) | uimm4(m3, 16, 32)); }
+inline void Assembler::z_crt(Register  r1, Register r2, int64_t m3)  { emit_32( CRT_ZOPC   | reg(r1, 24, 32) | reg(r2, 28, 32)    | uimm4(m3, 16, 32)); }
+inline void Assembler::z_cgrt(Register r1, Register r2, int64_t m3)  { emit_32( CGRT_ZOPC  | reg(r1, 24, 32) | reg(r2, 28, 32)    | uimm4(m3, 16, 32)); }
 inline void Assembler::z_cit(Register  r1, int64_t i2, int64_t m3)   { emit_48( CIT_ZOPC   | reg(r1,  8, 48) | simm16(i2, 16, 48) | uimm4(m3, 32, 48)); }
 inline void Assembler::z_cgit(Register r1, int64_t i2, int64_t m3)   { emit_48( CGIT_ZOPC  | reg(r1,  8, 48) | simm16(i2, 16, 48) | uimm4(m3, 32, 48)); }
 
 // Compare and trap instructions (unsigned).
-inline void Assembler::z_clrt(Register  r1, Register r2, int64_t m3) { emit_32( CLRT_ZOPC  | reg(r1, 24, 32) | reg(r2, 28, 32) | uimm4(m3, 16, 32)); }
-inline void Assembler::z_clgrt(Register r1, Register r2, int64_t m3) { emit_32( CLGRT_ZOPC | reg(r1, 24, 32) | reg(r2, 28, 32) | uimm4(m3, 16, 32)); }
+inline void Assembler::z_clrt(Register  r1, Register r2, int64_t m3) { emit_32( CLRT_ZOPC  | reg(r1, 24, 32) | reg(r2, 28, 32)    | uimm4(m3, 16, 32)); }
+inline void Assembler::z_clgrt(Register r1, Register r2, int64_t m3) { emit_32( CLGRT_ZOPC | reg(r1, 24, 32) | reg(r2, 28, 32)    | uimm4(m3, 16, 32)); }
 inline void Assembler::z_clfit(Register r1, int64_t i2, int64_t m3)  { emit_48( CLFIT_ZOPC | reg(r1,  8, 48) | uimm16(i2, 16, 48) | uimm4(m3, 32, 48)); }
 inline void Assembler::z_clgit(Register r1, int64_t i2, int64_t m3)  { emit_48( CLGIT_ZOPC | reg(r1,  8, 48) | uimm16(i2, 16, 48) | uimm4(m3, 32, 48)); }
 
-inline void Assembler::z_bc(  branch_condition m1, int64_t d2, Register x2, Register b2) { emit_32( BC_ZOPC | 0 << 16 | uimm4(m1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_bcr( branch_condition m1, Register r2) { emit_16( BCR_ZOPC | uimm4(m1,8,16) | reg(r2,12,16)); }
-inline void Assembler::z_brc( branch_condition i1, int64_t i2)  { emit_32( BRC_ZOPC | uimm4(i1, 8, 32) | simm16(i2, 16, 32)); }
-inline void Assembler::z_brc( branch_condition i1, address a)   { emit_32( BRC_ZOPC | uimm4(i1, 8, 32) | simm16(RelAddr::pcrel_off16(a, pc()), 16, 32)); }
-inline void Assembler::z_brcl(branch_condition i1, address a)   { emit_48( BRCL_ZOPC | uimm4(i1, 8, 48)| simm32(RelAddr::pcrel_off32(a, pc()), 16, 48)); }
-inline void Assembler::z_bctgr(Register r1, Register r2)        { emit_32( BCTGR_ZOPC | reg( r1, 24, 32) | reg( r2, 28, 32)); };
 
-inline void Assembler::z_basr(Register r1, Register r2) { emit_16( BASR_ZOPC | regt(r1,8,16) | reg(r2,12,16)); }
-
-inline void Assembler::z_brasl(Register r1, address a) { emit_48( BRASL_ZOPC | regt(r1, 8, 48) | simm32(RelAddr::pcrel_off32(a, pc()), 16, 48)); }
-
-inline void Assembler::z_brct(Register r1, address a) { emit_32( BRCT_ZOPC | regt(r1, 8, 32) | simm16(RelAddr::pcrel_off16(a, pc()), 16, 32)); }
-inline void Assembler::z_brct(Register r1, Label& L) {z_brct(r1, target(L)); }
+//------------------------
+// BRANCH/CALL
+//------------------------
+inline void Assembler::z_bc(  branch_condition m1, int64_t d2, Register x2, Register b2) { emit_32( BC_ZOPC | uimm4(m1, 8, 32) | rxmask_32(d2, x2, b2)); }
+inline void Assembler::z_bcr( branch_condition m1, Register r2) { emit_16( BCR_ZOPC   | uimm4(m1, 8, 16) | reg(r2, 12, 16)); }
+inline void Assembler::z_brc( branch_condition i1, int64_t i2)  { emit_32( BRC_ZOPC   | uimm4(i1, 8, 32) | simm16(i2, 16, 32)); }
+inline void Assembler::z_brc( branch_condition i1, address a)   { emit_32( BRC_ZOPC   | uimm4(i1, 8, 32) | simm16(RelAddr::pcrel_off16(a, pc()), 16, 32)); }
+inline void Assembler::z_brcl(branch_condition i1, address a)   { emit_48( BRCL_ZOPC  | uimm4(i1, 8, 48) | simm32(RelAddr::pcrel_off32(a, pc()), 16, 48)); }
+inline void Assembler::z_bctgr(Register r1, Register r2)        { emit_32( BCTGR_ZOPC | reg( r1, 24, 32) | reg( r2, 28, 32)); };
 
-inline void Assembler::z_brxh(Register r1, Register r3, address a) {emit_32( BRXH_ZOPC | reg(r1, 8, 32) | reg(r3, 12, 32)  | simm16(RelAddr::pcrel_off16(a, pc()), 16, 32));}
-inline void Assembler::z_brxh(Register r1, Register r3, Label& L) {z_brxh(r1, r3, target(L)); }
+inline void Assembler::z_basr( Register r1, Register r2) { emit_16( BASR_ZOPC  | regt(r1, 8, 16) | reg(r2, 12, 16)); }
+inline void Assembler::z_brasl(Register r1, address a)   { emit_48( BRASL_ZOPC | regt(r1, 8, 48) | simm32(RelAddr::pcrel_off32(a, pc()), 16, 48)); }
 
+inline void Assembler::z_brct(Register  r1, address a)              {emit_32( BRCT_ZOPC  | reg(r1, 8, 32) | simm16(RelAddr::pcrel_off16(a, pc()), 16, 32)); }
+inline void Assembler::z_brxh(Register  r1, Register r3, address a) {emit_32( BRXH_ZOPC  | reg(r1, 8, 32) | reg(r3, 12, 32) | simm16(RelAddr::pcrel_off16(a, pc()), 16, 32));}
 inline void Assembler::z_brxle(Register r1, Register r3, address a) {emit_32( BRXLE_ZOPC | reg(r1, 8, 32) | reg(r3, 12, 32) | simm16(RelAddr::pcrel_off16(a, pc()), 16, 32));}
-inline void Assembler::z_brxle(Register r1, Register r3, Label& L) {z_brxle(r1, r3, target(L)); }
-
 inline void Assembler::z_brxhg(Register r1, Register r3, address a) {emit_48( BRXHG_ZOPC | reg(r1, 8, 48) | reg(r3, 12, 48) | simm16(RelAddr::pcrel_off16(a, pc()), 16, 48));}
-inline void Assembler::z_brxhg(Register r1, Register r3, Label& L) {z_brxhg(r1, r3, target(L)); }
-
 inline void Assembler::z_brxlg(Register r1, Register r3, address a) {emit_48( BRXLG_ZOPC | reg(r1, 8, 48) | reg(r3, 12, 48) | simm16(RelAddr::pcrel_off16(a, pc()), 16, 48));}
+inline void Assembler::z_brct(Register  r1,              Label& L) {z_brct( r1,     target(L)); }
+inline void Assembler::z_brxh(Register  r1, Register r3, Label& L) {z_brxh( r1, r3, target(L)); }
+inline void Assembler::z_brxle(Register r1, Register r3, Label& L) {z_brxle(r1, r3, target(L)); }
+inline void Assembler::z_brxhg(Register r1, Register r3, Label& L) {z_brxhg(r1, r3, target(L)); }
 inline void Assembler::z_brxlg(Register r1, Register r3, Label& L) {z_brxlg(r1, r3, target(L)); }
 
-inline void Assembler::z_flogr(Register r1, Register r2) { emit_32( FLOGR_ZOPC  | reg(r1, 24, 32) | reg(r2, 28, 32)); }
-inline void Assembler::z_popcnt(Register r1, Register r2) { emit_32( POPCNT_ZOPC  | reg(r1, 24, 32) | reg(r2, 28, 32)); }
-inline void Assembler::z_ahhhr(Register r1, Register r2, Register r3) { emit_32( AHHHR_ZOPC  | reg(r3, 16, 32) | reg(r1, 24, 32) | reg(r2, 28, 32)); }
-inline void Assembler::z_ahhlr(Register r1, Register r2, Register r3) { emit_32( AHHLR_ZOPC  | reg(r3, 16, 32) | reg(r1, 24, 32) | reg(r2, 28, 32)); }
+inline void Assembler::z_flogr( Register r1, Register r2)              { emit_32( FLOGR_ZOPC  | reg(r1, 24, 32) | reg(r2, 28, 32)); }
+inline void Assembler::z_popcnt(Register r1, Register r2)              { emit_32( POPCNT_ZOPC | reg(r1, 24, 32) | reg(r2, 28, 32)); }
+inline void Assembler::z_ahhhr( Register r1, Register r2, Register r3) { emit_32( AHHHR_ZOPC  | reg(r3, 16, 32) | reg(r1, 24, 32) | reg(r2, 28, 32)); }
+inline void Assembler::z_ahhlr( Register r1, Register r2, Register r3) { emit_32( AHHLR_ZOPC  | reg(r3, 16, 32) | reg(r1, 24, 32) | reg(r2, 28, 32)); }
 
 inline void Assembler::z_tam() { emit_16( TAM_ZOPC); }
-inline void Assembler::z_stckf(int64_t d2, Register b2) { emit_32( STCKF_ZOPC | uimm12(d2, 20, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_stm( Register r1, Register r3, int64_t d2, Register b2) { emit_32( STM_ZOPC  | reg(r1, 8, 32) | reg(r3,12,32)| reg(b2,16,32) | uimm12(d2, 20,32)); }
-inline void Assembler::z_stmy(Register r1, Register r3, int64_t d2, Register b2) { emit_48( STMY_ZOPC | reg(r1, 8, 48) | reg(r3,12,48)| reg(b2,16,48) | simm20(d2) ); }
-inline void Assembler::z_stmg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( STMG_ZOPC | reg(r1, 8, 48) | reg(r3,12,48)| reg(b2,16,48) | simm20(d2) ); }
-inline void Assembler::z_lm(  Register r1, Register r3, int64_t d2, Register b2) { emit_32( LM_ZOPC   | reg(r1, 8, 32) | reg(r3,12,32)| reg(b2,16,32) | uimm12(d2, 20,32)); }
-inline void Assembler::z_lmy( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LMY_ZOPC  | reg(r1, 8, 48) | reg(r3,12,48)| reg(b2,16,48) | simm20(d2) ); }
-inline void Assembler::z_lmg( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LMG_ZOPC  | reg(r1, 8, 48) | reg(r3,12,48)| reg(b2,16,48) | simm20(d2) ); }
-
-inline void Assembler::z_cs( Register r1, Register r3, int64_t d2, Register b2) { emit_32( CS_ZOPC  | regt(r1, 8, 32) | reg(r3, 12, 32) | reg(b2, 16, 32) | uimm12(d2, 20, 32)); }
-inline void Assembler::z_csy(Register r1, Register r3, int64_t d2, Register b2) { emit_48( CSY_ZOPC | regt(r1, 8, 48) | reg(r3, 12, 48) | reg(b2, 16, 48) | simm20(d2)); }
-inline void Assembler::z_csg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( CSG_ZOPC | regt(r1, 8, 48) | reg(r3, 12, 48) | reg(b2, 16, 48) | simm20(d2)); }
+inline void Assembler::z_stckf(int64_t d2, Register b2) { emit_32( STCKF_ZOPC | rsmask_32(d2, b2)); }
+inline void Assembler::z_stm( Register r1, Register r3, int64_t d2, Register b2) { emit_32( STM_ZOPC  | reg(r1, 8, 32) | reg(r3,12,32)| rsmask_32( d2, b2)); }
+inline void Assembler::z_stmy(Register r1, Register r3, int64_t d2, Register b2) { emit_48( STMY_ZOPC | reg(r1, 8, 48) | reg(r3,12,48)| rsymask_48(d2, b2)); }
+inline void Assembler::z_stmg(Register r1, Register r3, int64_t d2, Register b2) { emit_48( STMG_ZOPC | reg(r1, 8, 48) | reg(r3,12,48)| rsymask_48(d2, b2)); }
+inline void Assembler::z_lm(  Register r1, Register r3, int64_t d2, Register b2) { emit_32( LM_ZOPC   | reg(r1, 8, 32) | reg(r3,12,32)| rsmask_32( d2, b2)); }
+inline void Assembler::z_lmy( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LMY_ZOPC  | reg(r1, 8, 48) | reg(r3,12,48)| rsymask_48(d2, b2)); }
+inline void Assembler::z_lmg( Register r1, Register r3, int64_t d2, Register b2) { emit_48( LMG_ZOPC  | reg(r1, 8, 48) | reg(r3,12,48)| rsymask_48(d2, b2)); }
+
+inline void Assembler::z_cs( Register r1, Register r3, int64_t d2, Register b2)  { emit_32( CS_ZOPC  | regt(r1, 8, 32) | reg(r3, 12, 32) | rsmask_32( d2, b2)); }
+inline void Assembler::z_csy(Register r1, Register r3, int64_t d2, Register b2)  { emit_48( CSY_ZOPC | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
+inline void Assembler::z_csg(Register r1, Register r3, int64_t d2, Register b2)  { emit_48( CSG_ZOPC | regt(r1, 8, 48) | reg(r3, 12, 48) | rsymask_48(d2, b2)); }
 inline void Assembler::z_cs( Register r1, Register r3, const Address& a) { assert(!a.has_index(), "Cannot encode index"); z_cs( r1, r3, a.disp(), a.baseOrR0()); }
 inline void Assembler::z_csy(Register r1, Register r3, const Address& a) { assert(!a.has_index(), "Cannot encode index"); z_csy(r1, r3, a.disp(), a.baseOrR0()); }
 inline void Assembler::z_csg(Register r1, Register r3, const Address& a) { assert(!a.has_index(), "Cannot encode index"); z_csg(r1, r3, a.disp(), a.baseOrR0()); }
 
-inline void Assembler::z_cvd(Register r1, int64_t d2, Register x2, Register b2)  { emit_32( CVD_ZOPC  | regt(r1, 8, 32) | reg(x2, 12, 32) | reg(b2, 16, 32) | uimm12(d2, 20, 32)); }
-inline void Assembler::z_cvdg(Register r1, int64_t d2, Register x2, Register b2) { emit_48( CVDG_ZOPC | regt(r1, 8, 48) | reg(x2, 12, 48) | reg(b2, 16, 48) | simm20(d2)); }
+inline void Assembler::z_cvd( Register r1, int64_t d2, Register x2, Register b2) { emit_32( CVD_ZOPC  | regt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_cvdg(Register r1, int64_t d2, Register x2, Register b2) { emit_48( CVDG_ZOPC | regt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
 
 
 //---------------------------
@@ -1142,30 +1179,30 @@ inline void Assembler::z_ler(  FloatRegister r1, FloatRegister r2) { emit_16( LE
 inline void Assembler::z_ldr(  FloatRegister r1, FloatRegister r2) { emit_16( LDR_ZOPC   | fregt(r1,8,16)    | freg(r2,12,16));   }
 inline void Assembler::z_ldebr(FloatRegister r1, FloatRegister r2) { emit_32( LDEBR_ZOPC | fregt(r1, 24, 32) | freg(r2, 28, 32)); }
 inline void Assembler::z_ledbr(FloatRegister r1, FloatRegister r2) { emit_32( LEDBR_ZOPC | fregt(r1, 24, 32) | freg(r2, 28, 32)); }
-inline void Assembler::z_le( FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_32( LE_ZOPC  | fregt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_ley(FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( LEY_ZOPC | fregt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_ld( FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_32( LD_ZOPC  | fregt(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_ldy(FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( LDY_ZOPC | fregt(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_le( FloatRegister r1, const Address &a) { z_le( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_ley(FloatRegister r1, const Address &a) { z_ley(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_ld( FloatRegister r1, const Address &a) { z_ld( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_ldy(FloatRegister r1, const Address &a) { z_ldy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_le(   FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_32( LE_ZOPC  | fregt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_ley(  FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( LEY_ZOPC | fregt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ld(   FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_32( LD_ZOPC  | fregt(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_ldy(  FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( LDY_ZOPC | fregt(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_le(   FloatRegister r1, const Address &a) { z_le( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_ley(  FloatRegister r1, const Address &a) { z_ley(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_ld(   FloatRegister r1, const Address &a) { z_ld( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_ldy(  FloatRegister r1, const Address &a) { z_ldy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
-inline void Assembler::z_lzdr(FloatRegister r1) { emit_32( LZDR_ZOPC | fregt(r1, 24, 32)); }
-inline void Assembler::z_lzer(FloatRegister f1) { emit_32( LZER_ZOPC | fregt(f1, 24, 32)); }
+inline void Assembler::z_lzdr( FloatRegister r1) { emit_32( LZDR_ZOPC | fregt(r1, 24, 32)); }
+inline void Assembler::z_lzer( FloatRegister f1) { emit_32( LZER_ZOPC | fregt(f1, 24, 32)); }
 
 
 //-----------------
 // STORE
 //-----------------
-inline void Assembler::z_ste( FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_32( STE_ZOPC  | freg(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_stey(FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( STEY_ZOPC | freg(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_std( FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_32( STD_ZOPC  | freg(r1, 8, 32) | uimm12(d2, 20, 32) | reg(x2, 12, 32) | regz(b2, 16, 32)); }
-inline void Assembler::z_stdy(FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( STDY_ZOPC | freg(r1, 8, 48) | simm20(d2)         | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_ste( FloatRegister r1, const Address &a) { z_ste( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_stey(FloatRegister r1, const Address &a) { z_stey(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_std( FloatRegister r1, const Address &a) { z_std( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_stdy(FloatRegister r1, const Address &a) { z_stdy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_ste(  FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_32( STE_ZOPC  | freg(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_stey( FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( STEY_ZOPC | freg(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_std(  FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_32( STD_ZOPC  | freg(r1, 8, 32) | rxmask_32( d2, x2, b2)); }
+inline void Assembler::z_stdy( FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( STDY_ZOPC | freg(r1, 8, 48) | rxymask_48(d2, x2, b2)); }
+inline void Assembler::z_ste(  FloatRegister r1, const Address &a) { z_ste( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_stey( FloatRegister r1, const Address &a) { z_stey(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_std(  FloatRegister r1, const Address &a) { z_std( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_stdy( FloatRegister r1, const Address &a) { z_stdy(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
 
 //---------------
@@ -1173,35 +1210,34 @@ inline void Assembler::z_stdy(FloatRegister r1, const Address &a) { z_stdy(r1, a
 //---------------
 inline void Assembler::z_aebr( FloatRegister f1, FloatRegister f2)                  { emit_32( AEBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
 inline void Assembler::z_adbr( FloatRegister f1, FloatRegister f2)                  { emit_32( ADBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
-inline void Assembler::z_aeb(  FloatRegister f1, int64_t d2, Register x2, Register b2 ) { emit_48( AEB_ZOPC | fregt( f1, 8, 48) | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
-inline void Assembler::z_adb(  FloatRegister f1, int64_t d2, Register x2, Register b2 ) { emit_48( ADB_ZOPC | fregt( f1, 8, 48) | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
-inline void Assembler::z_aeb(  FloatRegister r1, const Address& a)                   { z_aeb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_adb(  FloatRegister r1, const Address& a)                   { z_adb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_aeb(  FloatRegister f1, int64_t d2, Register x2, Register b2) { emit_48( AEB_ZOPC | fregt( f1, 8, 48) | rxmask_48(d2, x2, b2));}
+inline void Assembler::z_adb(  FloatRegister f1, int64_t d2, Register x2, Register b2) { emit_48( ADB_ZOPC | fregt( f1, 8, 48) | rxmask_48(d2, x2, b2));}
+inline void Assembler::z_aeb(  FloatRegister r1, const Address& a)                  { z_aeb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_adb(  FloatRegister r1, const Address& a)                  { z_adb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
 
 //---------------
 // SUB
 //---------------
-inline void Assembler::z_sebr( FloatRegister f1, FloatRegister f2)                  { emit_32( SEBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
-inline void Assembler::z_sdbr( FloatRegister f1, FloatRegister f2)                  { emit_32( SDBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
-inline void Assembler::z_seb(  FloatRegister f1, int64_t d2, Register x2, Register b2 ) { emit_48( SEB_ZOPC | fregt( f1, 8, 48) | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
-inline void Assembler::z_sdb(  FloatRegister f1, int64_t d2, Register x2, Register b2 ) { emit_48( SDB_ZOPC | fregt( f1, 8, 48) | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
+inline void Assembler::z_sebr( FloatRegister f1, FloatRegister f2)                   { emit_32( SEBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
+inline void Assembler::z_sdbr( FloatRegister f1, FloatRegister f2)                   { emit_32( SDBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
+inline void Assembler::z_seb(  FloatRegister f1, int64_t d2, Register x2, Register b2) { emit_48( SEB_ZOPC | fregt( f1, 8, 48) | rxmask_48(d2, x2, b2));}
+inline void Assembler::z_sdb(  FloatRegister f1, int64_t d2, Register x2, Register b2) { emit_48( SDB_ZOPC | fregt( f1, 8, 48) | rxmask_48(d2, x2, b2));}
 inline void Assembler::z_seb(  FloatRegister r1, const Address& a)                   { z_seb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_sdb(  FloatRegister r1, const Address& a)                   { z_sdb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
 inline void Assembler::z_lcebr(FloatRegister r1, FloatRegister r2)                   { emit_32( LCEBR_ZOPC | fregt(r1, 24, 32) | freg(r2, 28, 32)); }
 inline void Assembler::z_lcdbr(FloatRegister r1, FloatRegister r2)                   { emit_32( LCDBR_ZOPC | fregt(r1, 24, 32) | freg(r2, 28, 32)); }
-
-inline void Assembler::z_lpdbr( FloatRegister fr1, FloatRegister fr2) { emit_32( LPDBR_ZOPC | fregt( fr1, 24,32) | freg((fr2 == fnoreg) ? fr1:fr2, 28, 32)); }
+inline void Assembler::z_lpdbr(FloatRegister r1, FloatRegister r2)                   { emit_32( LPDBR_ZOPC | fregt(r1, 24, 32) | freg((r2 == fnoreg) ? r1:r2, 28, 32)); }
 
 
 //---------------
 // MUL
 //---------------
-inline void Assembler::z_meebr(FloatRegister f1, FloatRegister f2)                  { emit_32( MEEBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
-inline void Assembler::z_mdbr( FloatRegister f1, FloatRegister f2)                  { emit_32( MDBR_ZOPC  | fregt( f1, 24, 32) | freg( f2, 28, 32));}
-inline void Assembler::z_meeb( FloatRegister f1, int64_t d2, Register x2, Register b2 ) { emit_48( MEEB_ZOPC | fregt( f1, 8, 48) | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
-inline void Assembler::z_mdb(  FloatRegister f1, int64_t d2, Register x2, Register b2 ) { emit_48( MDB_ZOPC  | fregt( f1, 8, 48) | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
+inline void Assembler::z_meebr(FloatRegister f1, FloatRegister f2)                   { emit_32( MEEBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
+inline void Assembler::z_mdbr( FloatRegister f1, FloatRegister f2)                   { emit_32( MDBR_ZOPC  | fregt( f1, 24, 32) | freg( f2, 28, 32));}
+inline void Assembler::z_meeb( FloatRegister f1, int64_t d2, Register x2, Register b2) { emit_48( MEEB_ZOPC | fregt( f1, 8, 48) | rxmask_48(d2, x2, b2));}
+inline void Assembler::z_mdb(  FloatRegister f1, int64_t d2, Register x2, Register b2) { emit_48( MDB_ZOPC  | fregt( f1, 8, 48) | rxmask_48(d2, x2, b2));}
 inline void Assembler::z_meeb( FloatRegister r1, const Address& a)                   { z_meeb( r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_mdb(  FloatRegister r1, const Address& a)                   { z_mdb(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
@@ -1213,43 +1249,43 @@ inline void Assembler::z_maebr(FloatRegister f1, FloatRegister f3, FloatRegister
 inline void Assembler::z_madbr(FloatRegister f1, FloatRegister f3, FloatRegister f2) { emit_32( MADBR_ZOPC | fregt(f1, 16, 32) | freg(f3, 24, 32) | freg(f2, 28, 32) );}
 inline void Assembler::z_msebr(FloatRegister f1, FloatRegister f3, FloatRegister f2) { emit_32( MSEBR_ZOPC | fregt(f1, 16, 32) | freg(f3, 24, 32) | freg(f2, 28, 32) );}
 inline void Assembler::z_msdbr(FloatRegister f1, FloatRegister f3, FloatRegister f2) { emit_32( MSDBR_ZOPC | fregt(f1, 16, 32) | freg(f3, 24, 32) | freg(f2, 28, 32) );}
-inline void Assembler::z_maeb(FloatRegister f1, FloatRegister f3, int64_t d2, Register x2, Register b2) { emit_48( MAEB_ZOPC | fregt(f1, 32, 48) | freg(f3, 8, 48) | uimm12(d2, 20, 48) | reg(x2, 12, 48) | regz(b2, 16, 48) );}
-inline void Assembler::z_madb(FloatRegister f1, FloatRegister f3, int64_t d2, Register x2, Register b2) { emit_48( MADB_ZOPC | fregt(f1, 32, 48) | freg(f3, 8, 48) | uimm12(d2, 20, 48) | reg(x2, 12, 48) | regz(b2, 16, 48) );}
-inline void Assembler::z_mseb(FloatRegister f1, FloatRegister f3, int64_t d2, Register x2, Register b2) { emit_48( MSEB_ZOPC | fregt(f1, 32, 48) | freg(f3, 8, 48) | uimm12(d2, 20, 48) | reg(x2, 12, 48) | regz(b2, 16, 48) );}
-inline void Assembler::z_msdb(FloatRegister f1, FloatRegister f3, int64_t d2, Register x2, Register b2) { emit_48( MSDB_ZOPC | fregt(f1, 32, 48) | freg(f3, 8, 48) | uimm12(d2, 20, 48) | reg(x2, 12, 48) | regz(b2, 16, 48) );}
-inline void Assembler::z_maeb(FloatRegister f1, FloatRegister f3, const Address& a) { z_maeb(f1, f3, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_madb(FloatRegister f1, FloatRegister f3, const Address& a) { z_madb(f1, f3, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_mseb(FloatRegister f1, FloatRegister f3, const Address& a) { z_mseb(f1, f3, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_msdb(FloatRegister f1, FloatRegister f3, const Address& a) { z_msdb(f1, f3, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_maeb(FloatRegister f1, FloatRegister f3, int64_t d2, Register x2, Register b2) { emit_48( MAEB_ZOPC | fregt(f1, 32, 48) | freg(f3, 8, 48) | rxmask_48(d2, x2, b2) );}
+inline void Assembler::z_madb(FloatRegister f1, FloatRegister f3, int64_t d2, Register x2, Register b2) { emit_48( MADB_ZOPC | fregt(f1, 32, 48) | freg(f3, 8, 48) | rxmask_48(d2, x2, b2) );}
+inline void Assembler::z_mseb(FloatRegister f1, FloatRegister f3, int64_t d2, Register x2, Register b2) { emit_48( MSEB_ZOPC | fregt(f1, 32, 48) | freg(f3, 8, 48) | rxmask_48(d2, x2, b2) );}
+inline void Assembler::z_msdb(FloatRegister f1, FloatRegister f3, int64_t d2, Register x2, Register b2) { emit_48( MSDB_ZOPC | fregt(f1, 32, 48) | freg(f3, 8, 48) | rxmask_48(d2, x2, b2) );}
+inline void Assembler::z_maeb(FloatRegister f1, FloatRegister f3, const Address& a)  { z_maeb(f1, f3, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_madb(FloatRegister f1, FloatRegister f3, const Address& a)  { z_madb(f1, f3, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_mseb(FloatRegister f1, FloatRegister f3, const Address& a)  { z_mseb(f1, f3, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_msdb(FloatRegister f1, FloatRegister f3, const Address& a)  { z_msdb(f1, f3, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
 
 //---------------
 // DIV
 //---------------
-inline void Assembler::z_debr( FloatRegister f1, FloatRegister f2)                      { emit_32( DEBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
-inline void Assembler::z_ddbr( FloatRegister f1, FloatRegister f2)                      { emit_32( DDBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
-inline void Assembler::z_deb(  FloatRegister f1, int64_t d2, Register x2, Register b2 ) { emit_48( DEB_ZOPC  | fregt( f1, 8, 48)  | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
-inline void Assembler::z_ddb(  FloatRegister f1, int64_t d2, Register x2, Register b2 ) { emit_48( DDB_ZOPC  | fregt( f1, 8, 48)  | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
-inline void Assembler::z_deb(  FloatRegister r1, const Address& a)                      { z_deb(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
-inline void Assembler::z_ddb(  FloatRegister r1, const Address& a)                      { z_ddb(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_debr( FloatRegister f1, FloatRegister f2)                   { emit_32( DEBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
+inline void Assembler::z_ddbr( FloatRegister f1, FloatRegister f2)                   { emit_32( DDBR_ZOPC | fregt( f1, 24, 32) | freg( f2, 28, 32));}
+inline void Assembler::z_deb(  FloatRegister f1, int64_t d2, Register x2, Register b2) { emit_48( DEB_ZOPC  | fregt( f1, 8, 48)  | rxmask_48(d2, x2, b2));}
+inline void Assembler::z_ddb(  FloatRegister f1, int64_t d2, Register x2, Register b2) { emit_48( DDB_ZOPC  | fregt( f1, 8, 48)  | rxmask_48(d2, x2, b2));}
+inline void Assembler::z_deb(  FloatRegister r1, const Address& a)                   { z_deb(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
+inline void Assembler::z_ddb(  FloatRegister r1, const Address& a)                   { z_ddb(  r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
 
 //---------------
 // square root
 //---------------
-inline void Assembler::z_sqdbr(FloatRegister f1, FloatRegister f2)                       { emit_32(SQDBR_ZOPC | fregt(f1, 24, 32)  | freg(f2, 28, 32)); }
-inline void Assembler::z_sqdb( FloatRegister fr1, int64_t d2, Register x2, Register b2 ) { emit_48( SQDB_ZOPC | fregt( fr1, 8, 48) | uimm12( d2, 20, 48) | reg( x2, 12, 48) | regz( b2, 16, 48));}
-inline void Assembler::z_sqdb( FloatRegister fr1, int64_t d2, Register b2)               { z_sqdb( fr1, d2, Z_R0, b2);}
+inline void Assembler::z_sqdbr(FloatRegister r1, FloatRegister r2)                   { emit_32(SQDBR_ZOPC | fregt(r1, 24, 32)  | freg(r2, 28, 32)); }
+inline void Assembler::z_sqdb( FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( SQDB_ZOPC | fregt( r1, 8, 48) | rxmask_48(d2, x2, b2));}
+inline void Assembler::z_sqdb( FloatRegister r1, int64_t d2, Register b2)            { z_sqdb( r1, d2, Z_R0, b2);}
 
 
 //---------------
 // CMP
 //---------------
 inline void Assembler::z_cebr(FloatRegister r1, FloatRegister r2)                    { emit_32( CEBR_ZOPC | fregt(r1, 24, 32) | freg(r2, 28, 32)); }
-inline void Assembler::z_ceb(FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( CEB_ZOPC  | fregt(r1, 8, 48) | uimm12(d2, 20, 48) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
-inline void Assembler::z_ceb(FloatRegister r1, const Address &a)                     { z_ceb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_cdbr(FloatRegister r1, FloatRegister r2)                    { emit_32( CDBR_ZOPC | fregt(r1, 24, 32) | freg(r2, 28, 32)); }
-inline void Assembler::z_cdb(FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( CDB_ZOPC  | fregt(r1, 8, 48) | uimm12(d2, 20, 48) | reg(x2, 12, 48) | regz(b2, 16, 48)); }
+inline void Assembler::z_ceb(FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( CEB_ZOPC  | fregt(r1,  8, 48) | rxmask_48(d2, x2, b2)); }
+inline void Assembler::z_cdb(FloatRegister r1, int64_t d2, Register x2, Register b2) { emit_48( CDB_ZOPC  | fregt(r1,  8, 48) | rxmask_48(d2, x2, b2)); }
+inline void Assembler::z_ceb(FloatRegister r1, const Address &a)                     { z_ceb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 inline void Assembler::z_cdb(FloatRegister r1, const Address &a)                     { z_cdb(r1, a.disp(), a.indexOrR0(), a.baseOrR0()); }
 
 
@@ -1280,13 +1316,16 @@ inline void Assembler::z_cgdbr(Register r1, FloatRegister r2, RoundingMode m) {
   inline void Assembler::z_st(Register r1, int64_t d2, Register b2)        { z_st(  r1, d2, Z_R0, b2); }
   inline void Assembler::z_sty(Register r1, int64_t d2, Register b2)       { z_sty( r1, d2, Z_R0, b2); }
   inline void Assembler::z_stg(Register r1, int64_t d2, Register b2)       { z_stg( r1, d2, Z_R0, b2); }
-  inline void Assembler::z_lgf(Register r1, int64_t d2, Register b2)       { z_lgf( r1, d2, Z_R0, b2); }
+  inline void Assembler::z_lgb(Register r1, int64_t d2, Register b2)       { z_lgb( r1, d2, Z_R0, b2); }
   inline void Assembler::z_lgh(Register r1, int64_t d2, Register b2)       { z_lgh( r1, d2, Z_R0, b2); }
+  inline void Assembler::z_lgf(Register r1, int64_t d2, Register b2)       { z_lgf( r1, d2, Z_R0, b2); }
+  inline void Assembler::z_llgc(Register r1, int64_t d2, Register b2)      { z_llgc(r1, d2, Z_R0, b2); }
   inline void Assembler::z_llgh(Register r1, int64_t d2, Register b2)      { z_llgh(r1, d2, Z_R0, b2); }
   inline void Assembler::z_llgf(Register r1, int64_t d2, Register b2)      { z_llgf(r1, d2, Z_R0, b2); }
-  inline void Assembler::z_lgb(Register r1, int64_t d2, Register b2)       { z_lgb( r1, d2, Z_R0, b2); }
   inline void Assembler::z_cl( Register r1, int64_t d2, Register b2)       { z_cl(  r1, d2, Z_R0, b2); }
-  inline void Assembler::z_c(Register r1, int64_t d2, Register b2)         { z_c(   r1, d2, Z_R0, b2); }
+  inline void Assembler::z_cly(Register r1, int64_t d2, Register b2)       { z_cly( r1, d2, Z_R0, b2); }
+  inline void Assembler::z_c( Register r1, int64_t d2, Register b2)        { z_c(   r1, d2, Z_R0, b2); }
+  inline void Assembler::z_cy(Register r1, int64_t d2, Register b2)        { z_cy(  r1, d2, Z_R0, b2); }
   inline void Assembler::z_cg(Register r1, int64_t d2, Register b2)        { z_cg(  r1, d2, Z_R0, b2); }
   inline void Assembler::z_sh(Register r1, int64_t d2, Register b2)        { z_sh(  r1, d2, Z_R0, b2); }
   inline void Assembler::z_shy(Register r1, int64_t d2, Register b2)       { z_shy( r1, d2, Z_R0, b2); }
@@ -1346,24 +1385,40 @@ inline void Assembler::z_brc( branch_condition m, Label& L) { z_brc(m, target(L)
 inline void Assembler::z_brcl(branch_condition m, Label& L) { z_brcl(m, target(L)); }
 
 
-// Instruction must start at passed address.
-// Extra check for illtraps with ID.
-inline unsigned int Assembler::instr_len(unsigned char *instr) {
-  switch ((*instr) >> 6) {
+// Instruction len bits must be stored right-justified in argument.
+inline unsigned int Assembler::instr_len(unsigned char len_bits) {
+  assert(len_bits < 4, "bad instruction len %d", len_bits);
+  switch (len_bits) {
     case 0: return 2;
     case 1: // fallthru
     case 2: return 4;
     case 3: return 6;
     default:
-      // Control can't reach here.
-      // The switch expression examines just the leftmost two bytes
+      // len_bits contains, right-justified, only the leftmost two bits
       // of the main opcode. So the range of values is just [0..3].
-      // Having a default clause makes the compiler happy.
       ShouldNotReachHere();
       return 0;
   }
 }
 
+// Instruction must start at passed address.
+inline unsigned int Assembler::instr_len(unsigned char *instr) {
+  return instr_len((unsigned char)((*instr) >> 6));
+}
+
+// Instruction must be stored right-justified in argument.
+inline unsigned int Assembler::instr_len(unsigned long instr) {
+  // An instruction is 2, 4, or 6 bytes in length.
+  // The instruction length in encoded in the leftmost two bits of the instruction.
+  //  len = 6: len_bits = [46..47]
+  //  len = 4: len_bits = [30..31]
+  //  len = 2: len_bits = [14..15]
+  unsigned char len_bits = instr >> (48-2);
+  if (len_bits == 0) len_bits = instr >> (32-2);
+  if (len_bits == 0) len_bits = instr >> (16-2);
+  return instr_len(len_bits);
+}
+
 // Move instr at pc right-justified into passed long int.
 // Return instr len in bytes as function result.
 // Note: 2-byte instr don't really need to be accessed unsigned
@@ -1383,9 +1438,7 @@ inline unsigned int Assembler::get_instruction(unsigned char *pc, unsigned long
       *instr = ((unsigned long)(*(unsigned int*)   pc)) << 16 |
                ((unsigned long)*(unsigned short*) (pc + 4)); break;
     default:
-      // Control can't reach here.
       // The length as returned from instr_len() can only be 2, 4, or 6 bytes.
-      // Having a default clause makes the compiler happy.
       ShouldNotReachHere();
       *instr = 0L; // This assignment is there to make gcc8 happy.
       break;
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index d13afd1c8b4..f603c5fa00a 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -697,27 +697,18 @@ uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
 }
 
 static inline void z_emit16(CodeBuffer &cbuf, long value) {
-  // 32bit instructions may become sign extended.
-  assert(value >= 0, "unintended sign extension (int->long)");
-  assert(value < (1L << 16), "instruction too large");
-  *((unsigned short*)(cbuf.insts_end())) = (unsigned short)value;
-  cbuf.set_insts_end(cbuf.insts_end() + sizeof(unsigned short));
+  C2_MacroAssembler _masm(&cbuf);
+  __ emit_instruction((unsigned long)value, 2);
 }
 
 static inline void z_emit32(CodeBuffer &cbuf, long value) {
-  // 32bit instructions may become sign extended.
-  assert(value < (1L << 32), "instruction too large");
-  *((unsigned int*)(cbuf.insts_end())) = (unsigned int)value;
-  cbuf.set_insts_end(cbuf.insts_end() + sizeof(unsigned int));
+  C2_MacroAssembler _masm(&cbuf);
+  __ emit_instruction((unsigned long)value, 4);
 }
 
 static inline void z_emit48(CodeBuffer &cbuf, long value) {
-  // 32bit instructions may become sign extended.
-  assert(value >= 0, "unintended sign extension (int->long)");
-  assert(value < (1L << 48), "instruction too large");
-  value = value<<16;
-  memcpy(cbuf.insts_end(), (unsigned char*)&value, 6);
-  cbuf.set_insts_end(cbuf.insts_end() + 6);
+  C2_MacroAssembler _masm(&cbuf);
+  __ emit_instruction((unsigned long)value, 6);
 }
 
 static inline unsigned int z_emit_inst(CodeBuffer &cbuf, long value) {
@@ -726,19 +717,9 @@ static inline unsigned int z_emit_inst(CodeBuffer &cbuf, long value) {
     value = (long)((unsigned long)((unsigned int)value));
   }
 
-  if (value < (1L << 16)) { // 2-byte instruction
-    z_emit16(cbuf, value);
-    return 2;
-  }
-
-  if (value < (1L << 32)) { // 4-byte instruction, might be unaligned store
-    z_emit32(cbuf, value);
-    return 4;
-  }
-
-  // 6-byte instruction, probably unaligned store.
-  z_emit48(cbuf, value);
-  return 6;
+  C2_MacroAssembler _masm(&cbuf);
+  int len = __ emit_instruction((unsigned long)value, 0);
+  return len;
 }
 
 // Check effective address (at runtime) for required alignment.
diff --git a/src/hotspot/cpu/s390/stubGenerator_s390.cpp b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
index 102200fc08f..21cf227067b 100644
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
@@ -2419,9 +2419,9 @@ class StubGenerator: public StubCodeGenerator {
     // Put extra information in the stub code, to make it more readable.
     // Write the high part of the address.
     // [RGV] Check if there is a dependency on the size of this prolog.
-    __ emit_32((intptr_t)cdesc >> 32);
-    __ emit_32((intptr_t)cdesc);
-    __ emit_32(++_stub_count);
+    __ emit_data((intptr_t)cdesc >> 32);
+    __ emit_data((intptr_t)cdesc);
+    __ emit_data(++_stub_count);
 #endif
     align(true);
   }
@@ -2435,7 +2435,7 @@ class StubGenerator: public StubCodeGenerator {
 
     if (at_header) {
       while ((intptr_t)(__ pc()) % icache_line_size != 0) {
-        __ emit_16(0);
+        __ z_illtrap();
       }
     } else {
       while ((intptr_t)(__ pc()) % icache_half_line_size != 0) {
-- 
GitLab


From 9d200d6e7a3399d2b5448c27e40eb3b4d14a02df Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Mon, 4 Apr 2022 09:28:04 +0000
Subject: [PATCH 328/345] 8282756: Make ElementKind checks more specific

Reviewed-by: jjg
---
 .../formats/html/AbstractMemberWriter.java    | 11 +--
 .../formats/html/AbstractTreeWriter.java      |  6 +-
 .../formats/html/AllClassesIndexWriter.java   |  6 +-
 .../html/AnnotationTypeMemberWriterImpl.java  |  2 +-
 .../doclets/formats/html/ClassUseWriter.java  |  2 +-
 .../doclets/formats/html/ClassWriterImpl.java | 10 +--
 .../formats/html/HtmlDocletWriter.java        |  2 +-
 .../doclets/formats/html/HtmlLinkFactory.java |  4 +-
 .../doclets/formats/html/IndexWriter.java     |  2 +-
 .../formats/html/MethodWriterImpl.java        |  2 +-
 .../formats/html/NestedClassWriterImpl.java   |  6 +-
 .../formats/html/PackageWriterImpl.java       |  6 +-
 .../doclets/formats/html/Signatures.java      |  8 +-
 .../builders/MemberSummaryBuilder.java        |  2 +-
 .../toolkit/builders/MethodBuilder.java       |  1 +
 .../doclets/toolkit/taglets/ParamTaglet.java  |  2 +-
 .../doclets/toolkit/taglets/SeeTaglet.java    |  4 +-
 .../doclets/toolkit/taglets/ThrowsTaglet.java |  2 +-
 .../doclets/toolkit/util/ClassTree.java       | 10 +--
 .../doclets/toolkit/util/MetaKeywords.java    |  2 +-
 .../toolkit/util/SummaryAPIListBuilder.java   |  4 +-
 .../internal/doclets/toolkit/util/Utils.java  | 73 +++++--------------
 .../toolkit/util/VisibleMemberTable.java      |  8 +-
 23 files changed, 70 insertions(+), 105 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
index c972ca31aff..3ed4aff1a1a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@@ -237,9 +237,8 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
             target.add(resources.getText("doclet.Package_private"));
             target.add(" ");
         }
-        boolean isAnnotatedTypeElement = utils.isAnnotationType(member.getEnclosingElement());
-        if (!isAnnotatedTypeElement && utils.isMethod(member)) {
-            if (!utils.isInterface(member.getEnclosingElement()) && utils.isAbstract(member)) {
+        if (!utils.isAnnotationInterface(member.getEnclosingElement()) && utils.isMethod(member)) {
+            if (!utils.isPlainInterface(member.getEnclosingElement()) && utils.isAbstract(member)) {
                 target.add("abstract ");
             }
             if (utils.isDefault(member)) {
@@ -322,15 +321,13 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
             Content typeContent = new ContentBuilder();
             if (te != null
                     && !utils.isConstructor(element)
-                    && !utils.isClass(element)
-                    && !utils.isInterface(element)
-                    && !utils.isAnnotationType(element)) {
+                    && !utils.isTypeElement(element)) {
                 var name = new HtmlTree(TagName.SPAN);
                 name.setStyle(HtmlStyle.typeNameLabel);
                 name.add(name(te) + ".");
                 typeContent.add(name);
             }
-            addSummaryLink(utils.isClass(element) || utils.isInterface(element)
+            addSummaryLink(utils.isClass(element) || utils.isPlainInterface(element)
                     ? HtmlLinkInfo.Kind.CLASS_USE
                     : HtmlLinkInfo.Kind.MEMBER,
                     te, element, typeContent);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
index 76bc29162f6..5d40167bcba 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
@@ -117,7 +117,7 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
             var sectionHeading = HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
                     headingContent);
             var section = HtmlTree.SECTION(HtmlStyle.hierarchy, sectionHeading);
-            addLevelInfo(!utils.isInterface(firstTypeElement) ? firstTypeElement : null,
+            addLevelInfo(!utils.isPlainInterface(firstTypeElement) ? firstTypeElement : null,
                     sset, isEnums, section);
             content.add(section);
         }
@@ -137,14 +137,14 @@ public abstract class AbstractTreeWriter extends HtmlDocletWriter {
     {
         SortedSet<TypeElement> interfaces = new TreeSet<>(comparators.makeGeneralPurposeComparator());
         typeElement.getInterfaces().forEach(t -> interfaces.add(utils.asTypeElement(t)));
-        if (interfaces.size() > (utils.isInterface(typeElement) ? 1 : 0)) {
+        if (interfaces.size() > (utils.isPlainInterface(typeElement) ? 1 : 0)) {
             boolean isFirst = true;
             for (TypeElement intf : interfaces) {
                 if (parent != intf) {
                     if (utils.isPublic(intf) || utils.isLinkable(intf)) {
                         if (isFirst) {
                             isFirst = false;
-                            if (utils.isInterface(typeElement)) {
+                            if (utils.isPlainInterface(typeElement)) {
                                 content.add(" (");
                                 content.add(contents.also);
                                 content.add(" extends ");
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
index 688643b4796..79c01e1a871 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
@@ -116,12 +116,12 @@ public class AllClassesIndexWriter extends HtmlDocletWriter {
                 .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
                 .setId(HtmlIds.ALL_CLASSES_TABLE)
                 .setDefaultTab(contents.allClassesAndInterfacesLabel)
-                .addTab(contents.interfaces, utils::isInterface)
-                .addTab(contents.classes, e -> utils.isOrdinaryClass((TypeElement)e))
+                .addTab(contents.interfaces, utils::isPlainInterface)
+                .addTab(contents.classes, e -> utils.isNonThrowableClass((TypeElement)e))
                 .addTab(contents.enums, utils::isEnum)
                 .addTab(contents.records, e -> utils.isRecord((TypeElement)e))
                 .addTab(contents.exceptionClasses, e -> utils.isThrowable((TypeElement)e))
-                .addTab(contents.annotationTypes, utils::isAnnotationType);
+                .addTab(contents.annotationTypes, utils::isAnnotationInterface);
         for (Character unicode : indexBuilder.getFirstCharacters()) {
             for (IndexItem indexItem : indexBuilder.getItems(unicode)) {
                 TypeElement typeElement = (TypeElement) indexItem.getElement();
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriterImpl.java
index 1c13eff682b..5f7e4acec9f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriterImpl.java
@@ -269,7 +269,7 @@ public class AnnotationTypeMemberWriterImpl extends AbstractMemberWriter
     }
 
     public void addDefaultValueInfo(Element member, Content annotationContent) {
-        if (utils.isAnnotationType(member)) {
+        if (utils.isAnnotationInterface(member.getEnclosingElement())) {
             ExecutableElement ee = (ExecutableElement) member;
             AnnotationValue value = ee.getDefaultValue();
             if (value != null) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
index e1bffe39923..cbc12cc09a8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
@@ -268,7 +268,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
      * @param content the content to which the package annotation elements will be added
      */
     protected void addPackageAnnotationList(Content content) {
-        if (!utils.isAnnotationType(typeElement) ||
+        if (!utils.isAnnotationInterface(typeElement) ||
                 pkgToPackageAnnotations == null ||
                 pkgToPackageAnnotations.isEmpty()) {
             return;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
index aa037e7766f..02f3530ecb6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
@@ -302,7 +302,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
 
     @Override
     public void addSubInterfacesInfo(Content target) {
-        if (utils.isInterface(typeElement)) {
+        if (utils.isPlainInterface(typeElement)) {
             Set<TypeElement> subInterfaces = classtree.allSubClasses(typeElement, false);
             if (!subInterfaces.isEmpty()) {
                 var dl = HtmlTree.DL(HtmlStyle.notes);
@@ -315,7 +315,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
 
     @Override
     public void addInterfaceUsageInfo(Content target) {
-        if (!utils.isInterface(typeElement)) {
+        if (!utils.isPlainInterface(typeElement)) {
             return;
         }
         for (String s : suppressImplementingSet) {
@@ -350,7 +350,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
                 new TreeSet<>(comparators.makeTypeMirrorIndexUseComparator());
         interfaces.addAll(utils.getAllInterfaces(typeElement));
 
-        if (utils.isInterface(typeElement) && !interfaces.isEmpty()) {
+        if (utils.isPlainInterface(typeElement) && !interfaces.isEmpty()) {
             var dl = HtmlTree.DL(HtmlStyle.notes);
             dl.add(HtmlTree.DT(contents.allSuperinterfacesLabel));
             dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.SUPER_INTERFACES, interfaces)));
@@ -367,7 +367,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
             @Override
             public Void visitType(TypeElement e, Void p) {
                 var dl = HtmlTree.DL(HtmlStyle.notes);
-                dl.add(HtmlTree.DT(utils.isInterface(e)
+                dl.add(HtmlTree.DT(utils.isPlainInterface(e)
                         ? contents.enclosingInterfaceLabel
                         : contents.enclosingClassLabel));
                 dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.CLASS, List.of(e))));
@@ -462,7 +462,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
     public Content getMemberDetails(Content content) {
         var section = HtmlTree.SECTION(HtmlStyle.details, content);
         // The following id is required by the Navigation bar
-        if (utils.isAnnotationType(typeElement)) {
+        if (utils.isAnnotationInterface(typeElement)) {
             section.setId(HtmlIds.ANNOTATION_TYPE_ELEMENT_DETAIL);
         }
         return section;
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 d8408440c85..30a629288ef 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
@@ -325,7 +325,7 @@ public class HtmlDocletWriter {
             return;
         }
         var dl = HtmlTree.DL(HtmlStyle.notes);
-        if (utils.isExecutableElement(e) && !utils.isConstructor(e)) {
+        if (utils.isMethod(e)) {
             addMethodInfo((ExecutableElement)e, dl);
         }
         Content output = getBlockTagOutput(e);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
index 3956987baa9..9c3b7ff0ef2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
@@ -258,10 +258,10 @@ public class HtmlLinkFactory extends LinkFactory {
         if (isTypeLink) {
             return resources.getText("doclet.Href_Type_Param_Title",
                     utils.getSimpleName(typeElement));
-        } else if (utils.isInterface(typeElement)){
+        } else if (utils.isPlainInterface(typeElement)){
             return resources.getText("doclet.Href_Interface_Title",
                 m_writer.getLocalizedPackageName(utils.containingPackage(typeElement)));
-        } else if (utils.isAnnotationType(typeElement)) {
+        } else if (utils.isAnnotationInterface(typeElement)) {
             return resources.getText("doclet.Href_Annotation_Title",
                 m_writer.getLocalizedPackageName(utils.containingPackage(typeElement)));
         } else if (utils.isEnum(typeElement)) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
index d2e3829e92e..a75509be6c4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
@@ -330,7 +330,7 @@ public class IndexWriter extends HtmlDocletWriter {
             case CONSTRUCTOR ->
                     "doclet.Constructor_for";
             case METHOD ->
-                    utils.isAnnotationType(enclosing) ? "doclet.Element_in"
+                    utils.isAnnotationInterface(enclosing) ? "doclet.Element_in"
                             : utils.isStatic(member) ? "doclet.Static_method_in" : "doclet.Method_in";
             case RECORD_COMPONENT ->
                     "doclet.Record_component_in";
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
index 8e34b3826ce..859908078b8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
@@ -200,7 +200,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
                 .addTab(contents.getContent("doclet.Instance_Methods"), e -> !utils.isStatic(e))
                 .addTab(contents.getContent("doclet.Abstract_Methods"), utils::isAbstract)
                 .addTab(contents.getContent("doclet.Concrete_Methods"),
-                        e -> !utils.isAbstract(e) && !utils.isInterface(e.getEnclosingElement()))
+                        e -> !utils.isAbstract(e) && !utils.isPlainInterface(e.getEnclosingElement()))
                 .addTab(contents.getContent("doclet.Default_Methods"), utils::isDefault)
                 .addTab(contents.getContent("doclet.Deprecated_Methods"),
                         e -> utils.isDeprecated(e) || utils.isDeprecated(typeElement));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
index 929523a6c42..e24e9000ff9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
@@ -82,7 +82,7 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
 
     @Override
     public TableHeader getSummaryTableHeader(Element member) {
-        Content label = utils.isInterface(member) ?
+        Content label = utils.isPlainInterface(member) ?
                 contents.interfaceLabel : contents.classLabel;
 
         return new TableHeader(contents.modifierAndTypeLabel, label, contents.descriptionLabel);
@@ -104,11 +104,11 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
         Content classLink = writer.getPreQualifiedClassLink(HtmlLinkInfo.Kind.MEMBER, typeElement);
         Content label;
         if (options.summarizeOverriddenMethods()) {
-            label = Text.of(utils.isInterface(typeElement)
+            label = Text.of(utils.isPlainInterface(typeElement)
                     ? resources.getText("doclet.Nested_Classes_Interfaces_Declared_In_Interface")
                     : resources.getText("doclet.Nested_Classes_Interfaces_Declared_In_Class"));
         } else {
-            label = Text.of(utils.isInterface(typeElement)
+            label = Text.of(utils.isPlainInterface(typeElement)
                     ? resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Interface")
                     : resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class"));
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
index fff6c32bfb1..e8ac645e5ec 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
@@ -251,12 +251,12 @@ public class PackageWriterImpl extends HtmlDocletWriter
                 .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
                 .setId(HtmlIds.CLASS_SUMMARY)
                 .setDefaultTab(contents.allClassesAndInterfacesLabel)
-                .addTab(contents.interfaces, utils::isInterface)
-                .addTab(contents.classes, e -> utils.isOrdinaryClass((TypeElement)e))
+                .addTab(contents.interfaces, utils::isPlainInterface)
+                .addTab(contents.classes, e -> utils.isNonThrowableClass((TypeElement)e))
                 .addTab(contents.enums, utils::isEnum)
                 .addTab(contents.records, e -> utils.isRecord((TypeElement)e))
                 .addTab(contents.exceptionClasses, e -> utils.isThrowable((TypeElement)e))
-                .addTab(contents.annotationTypes, utils::isAnnotationType);
+                .addTab(contents.annotationTypes, utils::isAnnotationInterface);
         for (TypeElement typeElement : allClasses) {
             if (typeElement != null && utils.isCoreClass(typeElement)) {
                 Content classLink = getLink(new HtmlLinkInfo(
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
index 4437fca5b7b..94a45588a80 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
@@ -145,10 +145,10 @@ public class Signatures {
             if (utils.isRecord(typeElement)) {
                 content.add(getRecordComponents());
             }
-            if (!utils.isAnnotationType(typeElement)) {
+            if (!utils.isAnnotationInterface(typeElement)) {
                 var extendsImplements = new HtmlTree(TagName.SPAN)
                         .setStyle(HtmlStyle.extendsImplements);
-                if (!utils.isInterface(typeElement)) {
+                if (!utils.isPlainInterface(typeElement)) {
                     TypeMirror superclass = utils.getFirstVisibleSuperClass(typeElement);
                     if (superclass != null) {
                         content.add(DocletConstants.NL);
@@ -169,7 +169,7 @@ public class Signatures {
                         }
                         if (isFirst) {
                             extendsImplements.add(DocletConstants.NL);
-                            extendsImplements.add(utils.isInterface(typeElement) ? "extends " : "implements ");
+                            extendsImplements.add(utils.isPlainInterface(typeElement) ? "extends " : "implements ");
                             isFirst = false;
                         } else {
                             extendsImplements.add(", ");
@@ -507,7 +507,7 @@ public class Signatures {
             // interface methods and fields.
             if ((utils.isField(element) || utils.isMethod(element))) {
                 Element te = element.getEnclosingElement();
-                if (utils.isInterface(te) || utils.isAnnotationType(te)) {
+                if (utils.isInterface(te)) {
                     // Remove the implicit abstract and public modifiers
                     if (utils.isMethod(element)) {
                         set.remove(ABSTRACT);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
index 4dee69dfe91..1d3f737d96e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
@@ -266,7 +266,7 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
                     configuration.cmtUtils.updatePropertyMethodComment(ee, property);
                 }
                 List<? extends DocTree> firstSentenceTags = utils.getFirstSentenceTrees(member);
-                if (utils.isExecutableElement(member) && firstSentenceTags.isEmpty()) {
+                if (utils.isMethod(member) && firstSentenceTags.isEmpty()) {
                     //Inherit comments from overridden or implemented method if
                     //necessary.
                     DocFinder.Output inheritedDoc =
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
index ec0bd8b0885..9f895851be8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java
@@ -169,6 +169,7 @@ public class MethodBuilder extends AbstractMemberBuilder {
      */
     protected void buildMethodComments(Content methodContent) {
         if (!options.noComment()) {
+            assert utils.isMethod(currentMethod); // not all executables are methods
             ExecutableElement method = currentMethod;
             if (utils.getFullBody(currentMethod).isEmpty()) {
                 DocFinder.Output docs = DocFinder.search(configuration,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java
index 2af114d322b..8dbf3bbd647 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java
@@ -243,7 +243,7 @@ public class ParamTaglet extends BaseTaglet implements InheritableTaglet {
             if (dt != null) {
                 result.add(processParamTag(e, kind, writer, dt,
                         ch.getParameterName(dt), result.isEmpty()));
-            } else if (writer.configuration().utils.isExecutableElement(e)) {
+            } else if (writer.configuration().utils.isMethod(e)) {
                 result.add(getInheritedTagletOutput(kind, e, writer,
                         formalParameters.get(i), i, result.isEmpty()));
             }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java
index 60863371ae8..bf6144f605c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SeeTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ public class SeeTaglet extends BaseTaglet implements InheritableTaglet {
         Utils utils = writer.configuration().utils;
         List<? extends SeeTree> tags = utils.getSeeTrees(holder);
         Element e = holder;
-        if (tags.isEmpty() && utils.isExecutableElement(holder)) {
+        if (tags.isEmpty() && utils.isMethod(holder)) {
             Input input = new DocFinder.Input(utils, holder, this);
             DocFinder.Output inheritedDoc = DocFinder.search(writer.configuration(), input);
             if (inheritedDoc.holder != null) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java
index 5851980a4b9..c029d5dc633 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java
@@ -130,7 +130,7 @@ public class ThrowsTaglet extends BaseTaglet
             Map<String, TypeMirror> typeSubstitutions, TagletWriter writer) {
         Utils utils = writer.configuration().utils;
         Content result = writer.getOutputInstance();
-        if (utils.isExecutableElement(holder)) {
+        if (utils.isMethod(holder)) {
             Map<List<? extends ThrowsTree>, ExecutableElement> declaredExceptionTags = new LinkedHashMap<>();
             for (TypeMirror declaredExceptionType : declaredExceptionTypes) {
                 Input input = new DocFinder.Input(utils, holder, this,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java
index 801a8908354..6a8b6c3fd14 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ClassTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -180,9 +180,9 @@ public class ClassTree {
                 processType(aClass, configuration, baseEnums, subEnums);
             } else if (utils.isClass(aClass)) {
                 processType(aClass, configuration, baseClasses, subClasses);
-            } else if (utils.isInterface(aClass)) {
+            } else if (utils.isPlainInterface(aClass)) {
                 processInterface(aClass);
-            } else if (utils.isAnnotationType(aClass)) {
+            } else if (utils.isAnnotationInterface(aClass)) {
                 processType(aClass, configuration, baseAnnotationTypes,
                     subAnnotationTypes);
             }
@@ -336,9 +336,9 @@ public class ClassTree {
     private SortedSet<TypeElement> directSubClasses0(TypeElement typeElement, boolean isEnum) {
         if (isEnum) {
             return get(subEnums, typeElement);
-        } else if (utils.isAnnotationType(typeElement)) {
+        } else if (utils.isAnnotationInterface(typeElement)) {
             return get(subAnnotationTypes, typeElement);
-        } else if (utils.isInterface(typeElement)) {
+        } else if (utils.isPlainInterface(typeElement)) {
             return get(subInterfaces, typeElement);
         } else if (utils.isClass(typeElement)) {
             return get(subClasses, typeElement);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
index 69eedccf5e0..e0db61051c5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
@@ -93,7 +93,7 @@ public class MetaKeywords {
      */
     protected List<String> getClassKeyword(TypeElement typeElement) {
         ArrayList<String> metakeywords = new ArrayList<>(1);
-        String cltypelower = utils.isInterface(typeElement) ? "interface" : "class";
+        String cltypelower = utils.isPlainInterface(typeElement) ? "interface" : "class";
         metakeywords.add(utils.getFullyQualifiedName(typeElement) + " " + cltypelower);
         return metakeywords;
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SummaryAPIListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SummaryAPIListBuilder.java
index 7350c33ebf9..abff28cd3de 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SummaryAPIListBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SummaryAPIListBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,7 +161,7 @@ public class SummaryAPIListBuilder {
                     }
                 }
             }
-            if (utils.isAnnotationType(te)) {
+            if (utils.isAnnotationInterface(te)) {
                 composeSummaryList(summaryMap.get(SummaryElementKind.ANNOTATION_TYPE_MEMBER),
                         utils.getAnnotationMembers(te));
 
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 cbf35e571c7..a71965326a7 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
@@ -52,7 +52,6 @@ import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import javax.lang.model.AnnotatedConstruct;
 import javax.lang.model.SourceVersion;
@@ -73,7 +72,6 @@ import javax.lang.model.type.ArrayType;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.ErrorType;
 import javax.lang.model.type.ExecutableType;
-import javax.lang.model.type.NoType;
 import javax.lang.model.type.PrimitiveType;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
@@ -284,35 +282,21 @@ public class Utils {
         return !e.getAnnotationMirrors().isEmpty();
     }
 
-    public boolean isAnnotationType(Element e) {
-        return new SimpleElementVisitor14<Boolean, Void>() {
-            @Override
-            public Boolean visitExecutable(ExecutableElement e, Void p) {
-                return visit(e.getEnclosingElement());
-            }
-
-            @Override
-            public Boolean visitUnknown(Element e, Void p) {
-                return false;
-            }
-
-            @Override
-            protected Boolean defaultAction(Element e, Void p) {
-                return e.getKind() == ANNOTATION_TYPE;
-            }
-        }.visit(e);
+    public boolean isAnnotationInterface(Element e) {
+        return e.getKind() == ANNOTATION_TYPE;
     }
 
-    /**
-     * An Enum implementation is almost identical, thus this method returns if
-     * this element represents a CLASS or an ENUM
-     * @param e element
-     * @return true if class or enum
-     */
+    // Note that e.getKind().isClass() is not the same as e.getKind() == CLASS
     public boolean isClass(Element e) {
         return e.getKind().isClass();
     }
 
+    // Note that e.getKind().isInterface() is not the same as e.getKind() == INTERFACE
+    // See Also: isPlainInterface(Element)
+    public boolean isInterface(Element e) {
+        return e.getKind().isInterface();
+    }
+
     public boolean isConstructor(Element e) {
          return e.getKind() == CONSTRUCTOR;
     }
@@ -325,7 +309,7 @@ public class Utils {
         return e.getKind() == FIELD;
     }
 
-    public boolean isInterface(Element e) {
+    public boolean isPlainInterface(Element e) {
         return e.getKind() == INTERFACE;
     }
 
@@ -447,46 +431,30 @@ public class Utils {
         return t.getKind() == NONE;
     }
 
-    public boolean isOrdinaryClass(TypeElement te) {
-        if (isEnum(te) || isInterface(te) || isAnnotationType(te) || isRecord(te)) {
-            return false;
-        }
-        return !isThrowable(te);
-    }
-
     public boolean isUndocumentedEnclosure(TypeElement enclosingTypeElement) {
         return (isPackagePrivate(enclosingTypeElement) || isPrivate(enclosingTypeElement)
                     || hasHiddenTag(enclosingTypeElement))
                 && !isLinkable(enclosingTypeElement);
     }
 
+    public boolean isNonThrowableClass(TypeElement te) {
+        return te.getKind() == CLASS && !isThrowable(te);
+    }
+
     public boolean isThrowable(TypeElement te) {
-        if (isEnum(te) || isInterface(te) || isAnnotationType(te)) {
-            return false;
-        }
-        return typeUtils.isSubtype(te.asType(), getThrowableType());
+        return te.getKind() == CLASS && typeUtils.isSubtype(te.asType(), getThrowableType());
     }
 
     public boolean isExecutableElement(Element e) {
-        return switch (e.getKind()) {
-            case CONSTRUCTOR, METHOD, INSTANCE_INIT -> true;
-            default -> false;
-        };
+        return e.getKind().isExecutable();
     }
 
     public boolean isVariableElement(Element e) {
-        return switch (e.getKind()) {
-            case ENUM_CONSTANT, EXCEPTION_PARAMETER, FIELD, LOCAL_VARIABLE,
-                    PARAMETER, RESOURCE_VARIABLE -> true;
-            default -> false;
-        };
+        return e.getKind().isVariable();
     }
 
     public boolean isTypeElement(Element e) {
-        return switch (e.getKind()) {
-            case CLASS, ENUM, INTERFACE, ANNOTATION_TYPE, RECORD -> true;
-            default -> false;
-        };
+        return e.getKind().isDeclaredType();
     }
 
     /**
@@ -869,7 +837,7 @@ public class Utils {
             if (typeUtils.isSameType(t, getObjectType()))
                 continue;
             TypeElement e = asTypeElement(t);
-            if (isInterface(e)) {
+            if (isPlainInterface(e)) {
                 if (!visited.add(e)) {
                     continue; // seen it before
                 }
@@ -1127,8 +1095,7 @@ public class Utils {
     }
 
     private boolean checkType(TypeElement te) {
-        return isInterface(te) || typeUtils.isSameType(te.asType(), getObjectType())
-                || isAnnotationType(te);
+        return isInterface(te) || typeUtils.isSameType(te.asType(), getObjectType());
     }
 
     public TypeElement getFirstVisibleSuperClassAsTypeElement(TypeElement te) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
index f673ead07ce..e06cc5fff99 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
@@ -407,8 +407,8 @@ public class VisibleMemberTable {
     }
 
     private void computeParents() {
-        // suppress parents of annotation types
-        if (utils.isAnnotationType(te)) {
+        // suppress parents of annotation interfaces
+        if (utils.isAnnotationInterface(te)) {
             return;
         }
 
@@ -577,7 +577,7 @@ public class VisibleMemberTable {
 
     boolean isEnclosureInterface(Element e) {
         TypeElement enclosing = utils.getEnclosingTypeElement(e);
-        return utils.isInterface(enclosing);
+        return utils.isPlainInterface(enclosing);
     }
 
     boolean allowInheritedMethod(ExecutableElement inheritedMethod,
@@ -777,7 +777,7 @@ public class VisibleMemberTable {
                         addMember(e, Kind.FIELDS);
                         break;
                     case METHOD:
-                        if (utils.isAnnotationType(te)) {
+                        if (utils.isAnnotationInterface(te)) {
                             ExecutableElement ee = (ExecutableElement) e;
                             addMember(e, Kind.ANNOTATION_TYPE_MEMBER);
                             addMember(e, ee.getDefaultValue() == null
-- 
GitLab


From 4e20a03786094f1eb0c662fe8f281295bf1bac83 Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Mon, 4 Apr 2022 14:00:26 +0000
Subject: [PATCH 329/345] 8283044: Use asynchronous handshakes to deliver
 asynchronous exceptions

Reviewed-by: dcubed, dholmes, rehn
---
 src/hotspot/share/prims/jni.cpp               |   4 +-
 src/hotspot/share/runtime/handshake.cpp       |  95 ++++++--
 src/hotspot/share/runtime/handshake.hpp       |  24 +-
 .../share/runtime/interfaceSupport.inline.hpp |   2 +-
 src/hotspot/share/runtime/objectMonitor.cpp   |   5 +-
 src/hotspot/share/runtime/safepoint.cpp       |  33 +--
 .../share/runtime/safepointMechanism.cpp      |   4 +-
 .../share/runtime/safepointMechanism.hpp      |   6 +-
 .../runtime/safepointMechanism.inline.hpp     |  18 +-
 src/hotspot/share/runtime/sweeper.cpp         |   2 +-
 src/hotspot/share/runtime/thread.cpp          | 198 ++++++----------
 src/hotspot/share/runtime/thread.hpp          |  37 ++-
 src/hotspot/share/runtime/thread.inline.hpp   |  65 ++++--
 src/hotspot/share/runtime/vmStructs.cpp       |   7 -
 src/hotspot/share/utilities/exceptions.cpp    |   6 -
 src/hotspot/share/utilities/exceptions.hpp    |   2 -
 .../sun/jvm/hotspot/runtime/Thread.java       |   7 -
 .../Thread/AsyncExceptionOnMonitorEnter.java  | 200 ++++++++++++++++
 .../runtime/Thread/AsyncExceptionTest.java    | 216 ++++++++++++++++++
 .../libAsyncExceptionOnMonitorEnter.cpp       |  85 +++++++
 20 files changed, 763 insertions(+), 253 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/Thread/AsyncExceptionOnMonitorEnter.java
 create mode 100644 test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java
 create mode 100644 test/hotspot/jtreg/runtime/Thread/libAsyncExceptionOnMonitorEnter.cpp

diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 13a2ff9dc87..d60edaf03f7 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -549,7 +549,9 @@ JNI_END
 
 static void jni_check_async_exceptions(JavaThread *thread) {
   assert(thread == Thread::current(), "must be itself");
-  thread->check_and_handle_async_exceptions();
+  if (thread->has_async_exception_condition()) {
+    SafepointMechanism::process_if_requested_with_exit_check(thread, true /* check asyncs */);
+  }
 }
 
 JNI_ENTRY_NO_PRESERVE(jthrowable, jni_ExceptionOccurred(JNIEnv *env))
diff --git a/src/hotspot/share/runtime/handshake.cpp b/src/hotspot/share/runtime/handshake.cpp
index 05306bd6f3a..c2f91016b4b 100644
--- a/src/hotspot/share/runtime/handshake.cpp
+++ b/src/hotspot/share/runtime/handshake.cpp
@@ -24,6 +24,8 @@
 
 #include "precompiled.hpp"
 #include "jvm_io.h"
+#include "classfile/javaClasses.hpp"
+#include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
@@ -78,6 +80,8 @@ class HandshakeOperation : public CHeapObj<mtThread> {
   const char* name()               { return _handshake_cl->name(); }
   bool is_async()                  { return _handshake_cl->is_async(); }
   bool is_suspend()                { return _handshake_cl->is_suspend(); }
+  bool is_async_exception()        { return _handshake_cl->is_async_exception(); }
+  bool is_ThreadDeath()            { return _handshake_cl->is_ThreadDeath(); }
 };
 
 class AsyncHandshakeOperation : public HandshakeOperation {
@@ -313,7 +317,6 @@ void HandshakeOperation::do_handshake(JavaThread* thread) {
 
   // Only actually execute the operation for non terminated threads.
   if (!thread->is_terminated()) {
-    NoSafepointVerifier nsv;
     _handshake_cl->do_thread(thread);
   }
 
@@ -426,6 +429,7 @@ HandshakeState::HandshakeState(JavaThread* target) :
   _queue(),
   _lock(Monitor::nosafepoint, "HandshakeState_lock"),
   _active_handshaker(),
+  _async_exceptions_blocked(false),
   _suspended(false),
   _async_suspend_handshake(false)
 {
@@ -443,39 +447,61 @@ bool HandshakeState::operation_pending(HandshakeOperation* op) {
   return _queue.contains(mo);
 }
 
-static bool no_suspend_filter(HandshakeOperation* op) {
-  return !op->is_suspend();
+// Filters
+static bool non_self_executable_filter(HandshakeOperation* op) {
+  return !op->is_async();
+}
+static bool no_async_exception_filter(HandshakeOperation* op) {
+  return !op->is_async_exception();
+}
+static bool async_exception_filter(HandshakeOperation* op) {
+  return op->is_async_exception();
+}
+static bool is_ThreadDeath_filter(HandshakeOperation* op) {
+  return op->is_ThreadDeath();
+}
+static bool no_suspend_no_async_exception_filter(HandshakeOperation* op) {
+  return !op->is_suspend() && !op->is_async_exception();
 }
 
-HandshakeOperation* HandshakeState::get_op_for_self(bool allow_suspend) {
+HandshakeOperation* HandshakeState::get_op_for_self(bool allow_suspend, bool check_async_exception) {
   assert(_handshakee == Thread::current(), "Must be called by self");
   assert(_lock.owned_by_self(), "Lock must be held");
-  if (allow_suspend) {
+  assert(allow_suspend || !check_async_exception, "invalid case");
+  if (!allow_suspend) {
+    return _queue.peek(no_suspend_no_async_exception_filter);
+  } else if (check_async_exception && !_async_exceptions_blocked) {
     return _queue.peek();
   } else {
-    return _queue.peek(no_suspend_filter);
+    return _queue.peek(no_async_exception_filter);
   }
 }
 
-static bool non_self_queue_filter(HandshakeOperation* op) {
-  return !op->is_async();
+bool HandshakeState::has_operation(bool allow_suspend, bool check_async_exception) {
+  MutexLocker ml(&_lock, Mutex::_no_safepoint_check_flag);
+  return get_op_for_self(allow_suspend, check_async_exception) != NULL;
+}
+
+bool HandshakeState::has_async_exception_operation(bool ThreadDeath_only) {
+  if (!has_operation()) return false;
+  MutexLocker ml(_lock.owned_by_self() ? NULL :  &_lock, Mutex::_no_safepoint_check_flag);
+  if (!ThreadDeath_only) {
+    return _queue.peek(async_exception_filter) != NULL;
+  } else {
+    return _queue.peek(is_ThreadDeath_filter) != NULL;
+  }
 }
 
 bool HandshakeState::have_non_self_executable_operation() {
   assert(_handshakee != Thread::current(), "Must not be called by self");
   assert(_lock.owned_by_self(), "Lock must be held");
-  return _queue.contains(non_self_queue_filter);
-}
-
-bool HandshakeState::has_a_non_suspend_operation() {
-  MutexLocker ml(&_lock, Mutex::_no_safepoint_check_flag);
-  return _queue.contains(no_suspend_filter);
+  return _queue.contains(non_self_executable_filter);
 }
 
 HandshakeOperation* HandshakeState::get_op() {
   assert(_handshakee != Thread::current(), "Must not be called by self");
   assert(_lock.owned_by_self(), "Lock must be held");
-  return _queue.peek(non_self_queue_filter);
+  return _queue.peek(non_self_executable_filter);
 };
 
 void HandshakeState::remove_op(HandshakeOperation* op) {
@@ -485,7 +511,7 @@ void HandshakeState::remove_op(HandshakeOperation* op) {
   assert(ret == op, "Popped op must match requested op");
 };
 
-bool HandshakeState::process_by_self(bool allow_suspend) {
+bool HandshakeState::process_by_self(bool allow_suspend, bool check_async_exception) {
   assert(Thread::current() == _handshakee, "should call from _handshakee");
   assert(!_handshakee->is_terminated(), "should not be a terminated thread");
 
@@ -493,15 +519,12 @@ bool HandshakeState::process_by_self(bool allow_suspend) {
   // Threads shouldn't block if they are in the middle of printing, but...
   ttyLocker::break_tty_lock_for_safepoint(os::current_thread_id());
 
-  // Handshakes cannot safely safepoint.
-  // The exception to this rule is the asynchronous suspension handshake.
-  // It by-passes the NSV by manually doing the transition.
-  NoSafepointVerifier nsv;
-
   while (has_operation()) {
+    // Handshakes cannot safely safepoint. The exceptions to this rule are
+    // the asynchronous suspension and unsafe access error handshakes.
     MutexLocker ml(&_lock, Mutex::_no_safepoint_check_flag);
 
-    HandshakeOperation* op = get_op_for_self(allow_suspend);
+    HandshakeOperation* op = get_op_for_self(allow_suspend, check_async_exception);
     if (op != NULL) {
       assert(op->_target == NULL || op->_target == Thread::current(), "Wrong thread");
       bool async = op->is_async();
@@ -517,8 +540,8 @@ bool HandshakeState::process_by_self(bool allow_suspend) {
         // An asynchronous handshake may put the JavaThread in blocked state (safepoint safe).
         // The destructor ~PreserveExceptionMark touches the exception oop so it must not be executed,
         // since a safepoint may be in-progress when returning from the async handshake.
-        op->do_handshake(_handshakee); // acquire, op removed after
         remove_op(op);
+        op->do_handshake(_handshakee);
         log_handshake_info(((AsyncHandshakeOperation*)op)->start_time(), op->name(), 1, 0, "asynchronous");
         delete op;
         return true; // Must check for safepoints
@@ -730,3 +753,29 @@ bool HandshakeState::resume() {
   _lock.notify();
   return true;
 }
+
+void HandshakeState::handle_unsafe_access_error() {
+  if (is_suspended()) {
+    // A suspend handshake was added to the queue after the
+    // unsafe access error. Since the suspender has already
+    // considered this JT as suspended and assumes it won't go
+    // back to Java until resumed we cannot create the exception
+    // object yet. Add a new unsafe access error operation to
+    // the end of the queue and try again in the next attempt.
+    Handshake::execute(new UnsafeAccessErrorHandshake(), _handshakee);
+    log_info(handshake)("JavaThread " INTPTR_FORMAT " skipping unsafe access processing due to suspend.", p2i(_handshakee));
+    return;
+  }
+  // Release the handshake lock before constructing the oop to
+  // avoid deadlocks since that can block. This will allow the
+  // JavaThread to execute normally as if it was outside a handshake.
+  // We will reacquire the handshake lock at return from ~MutexUnlocker.
+  MutexUnlocker ml(&_lock, Mutex::_no_safepoint_check_flag);
+  // We may be at method entry which requires we save the do-not-unlock flag.
+  UnlockFlagSaver fs(_handshakee);
+  Handle h_exception = Exceptions::new_exception(_handshakee, vmSymbols::java_lang_InternalError(), "a fault occurred in an unsafe memory access operation");
+  if (h_exception()->is_a(vmClasses::InternalError_klass())) {
+    java_lang_InternalError::set_during_unsafe_access(h_exception());
+  }
+  _handshakee->handle_async_exception(h_exception());
+}
diff --git a/src/hotspot/share/runtime/handshake.hpp b/src/hotspot/share/runtime/handshake.hpp
index f6a8e28a037..8012f225c65 100644
--- a/src/hotspot/share/runtime/handshake.hpp
+++ b/src/hotspot/share/runtime/handshake.hpp
@@ -33,9 +33,11 @@
 #include "utilities/filterQueue.hpp"
 
 class HandshakeOperation;
+class AsyncHandshakeOperation;
 class JavaThread;
 class SuspendThreadHandshake;
 class ThreadSelfSuspensionHandshake;
+class UnsafeAccessErrorHandshake;
 class ThreadsListHandle;
 
 // A handshake closure is a callback that is executed for a JavaThread
@@ -51,6 +53,8 @@ class HandshakeClosure : public ThreadClosure, public CHeapObj<mtThread> {
   const char* name() const                         { return _name; }
   virtual bool is_async()                          { return false; }
   virtual bool is_suspend()                        { return false; }
+  virtual bool is_async_exception()                { return false; }
+  virtual bool is_ThreadDeath()                    { return false; }
   virtual void do_thread(Thread* thread) = 0;
 };
 
@@ -87,6 +91,7 @@ class JvmtiRawMonitor;
 class HandshakeState {
   friend ThreadSelfSuspensionHandshake;
   friend SuspendThreadHandshake;
+  friend UnsafeAccessErrorHandshake;
   friend JavaThread;
   // This a back reference to the JavaThread,
   // the target for all operation in the queue.
@@ -104,7 +109,7 @@ class HandshakeState {
   bool can_process_handshake();
 
   bool have_non_self_executable_operation();
-  HandshakeOperation* get_op_for_self(bool allow_suspend);
+  HandshakeOperation* get_op_for_self(bool allow_suspend, bool check_async_exception);
   HandshakeOperation* get_op();
   void remove_op(HandshakeOperation* op);
 
@@ -124,17 +129,16 @@ class HandshakeState {
 
   void add_operation(HandshakeOperation* op);
 
-  bool has_operation() {
-    return !_queue.is_empty();
-  }
-  bool has_a_non_suspend_operation();
+  bool has_operation() { return !_queue.is_empty(); }
+  bool has_operation(bool allow_suspend, bool check_async_exception);
+  bool has_async_exception_operation(bool ThreadDeath_only);
 
   bool operation_pending(HandshakeOperation* op);
 
   // If the method returns true we need to check for a possible safepoint.
   // This is due to a suspension handshake which put the JavaThread in blocked
   // state so a safepoint may be in-progress.
-  bool process_by_self(bool allow_suspend);
+  bool process_by_self(bool allow_suspend, bool check_async_exception);
 
   enum ProcessResult {
     _no_operation = 0,
@@ -148,6 +152,14 @@ class HandshakeState {
 
   Thread* active_handshaker() const { return Atomic::load(&_active_handshaker); }
 
+  // Support for asynchronous exceptions
+ private:
+  bool _async_exceptions_blocked;
+
+  bool async_exceptions_blocked() { return _async_exceptions_blocked; }
+  void set_async_exceptions_blocked(bool b) { _async_exceptions_blocked = b; }
+  void handle_unsafe_access_error();
+
   // Suspend/resume support
  private:
   // This flag is true when the thread owning this
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
index 7cbdb00995c..f3d9b78998d 100644
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
@@ -210,7 +210,7 @@ class ThreadBlockInVMPreprocess : public ThreadStateTransition {
 
     if (SafepointMechanism::should_process(_thread, _allow_suspend)) {
       _pr(_thread);
-      SafepointMechanism::process_if_requested(_thread, _allow_suspend);
+      SafepointMechanism::process_if_requested(_thread, _allow_suspend, false /* check_async_exception */);
     }
   }
 };
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index a6e279cfcb2..02f1c730c28 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -1897,7 +1897,10 @@ int ObjectMonitor::TrySpin(JavaThread* current) {
     // This is in keeping with the "no loitering in runtime" rule.
     // We periodically check to see if there's a safepoint pending.
     if ((ctr & 0xFF) == 0) {
-      if (SafepointMechanism::should_process(current)) {
+      // Can't call SafepointMechanism::should_process() since that
+      // might update the poll values and we could be in a thread_blocked
+      // state here which is not allowed so just check the poll.
+      if (SafepointMechanism::local_poll_armed(current)) {
         goto Abort;           // abrupt spin egress
       }
       SpinPause();
diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp
index 44240f85b71..e4b813c6a3e 100644
--- a/src/hotspot/share/runtime/safepoint.cpp
+++ b/src/hotspot/share/runtime/safepoint.cpp
@@ -963,33 +963,34 @@ void ThreadSafepointState::handle_polling_page_exception() {
     set_at_poll_safepoint(true);
     // Process pending operation
     // We never deliver an async exception at a polling point as the
-    // compiler may not have an exception handler for it. The polling
-    // code will notice the pending async exception, deoptimize and
-    // the exception will be delivered. (Polling at a return point
-    // is ok though). Sure is a lot of bother for a deprecated feature...
+    // compiler may not have an exception handler for it (polling at
+    // a return point is ok though). We will check for a pending async
+    // exception below and deoptimize if needed. We also cannot deoptimize
+    // and still install the exception here because live registers needed
+    // during deoptimization are clobbered by the exception path. The
+    // exception will just be delivered once we get into the interpreter.
     SafepointMechanism::process_if_requested_with_exit_check(self, false /* check asyncs */);
     set_at_poll_safepoint(false);
 
-    // If we have a pending async exception deoptimize the frame
-    // as otherwise we may never deliver it.
     if (self->has_async_exception_condition()) {
       Deoptimization::deoptimize_frame(self, caller_fr.id());
+      log_info(exceptions)("deferred async exception at compiled safepoint");
     }
 
-    // If an exception has been installed we must check for a pending deoptimization
-    // Deoptimize frame if exception has been thrown.
-
+    // If an exception has been installed we must verify that the top frame wasn't deoptimized.
     if (self->has_pending_exception() ) {
       RegisterMap map(self, true, false);
       frame caller_fr = stub_fr.sender(&map);
       if (caller_fr.is_deoptimized_frame()) {
-        // The exception patch will destroy registers that are still
-        // live and will be needed during deoptimization. Defer the
-        // Async exception should have deferred the exception until the
-        // next safepoint which will be detected when we get into
-        // the interpreter so if we have an exception now things
-        // are messed up.
-
+        // The exception path will destroy registers that are still
+        // live and will be needed during deoptimization, so if we
+        // have an exception now things are messed up. We only check
+        // at this scope because for a poll return it is ok to deoptimize
+        // while having a pending exception since the call we are returning
+        // from already collides with exception handling registers and
+        // so there is no issue (the exception handling path kills call
+        // result registers but this is ok since the exception kills
+        // the result anyway).
         fatal("Exception installed and deoptimization is pending");
       }
     }
diff --git a/src/hotspot/share/runtime/safepointMechanism.cpp b/src/hotspot/share/runtime/safepointMechanism.cpp
index 0a4d9a436c0..97c232979ee 100644
--- a/src/hotspot/share/runtime/safepointMechanism.cpp
+++ b/src/hotspot/share/runtime/safepointMechanism.cpp
@@ -111,7 +111,7 @@ void SafepointMechanism::update_poll_values(JavaThread* thread) {
   }
 }
 
-void SafepointMechanism::process(JavaThread *thread, bool allow_suspend) {
+void SafepointMechanism::process(JavaThread *thread, bool allow_suspend, bool check_async_exception) {
   // Read global poll and has_handshake after local poll
   OrderAccess::loadload();
 
@@ -135,7 +135,7 @@ void SafepointMechanism::process(JavaThread *thread, bool allow_suspend) {
     // 3) Before the handshake code is run
     StackWatermarkSet::on_safepoint(thread);
 
-    need_rechecking = thread->handshake_state()->has_operation() && thread->handshake_state()->process_by_self(allow_suspend);
+    need_rechecking = thread->handshake_state()->has_operation() && thread->handshake_state()->process_by_self(allow_suspend, check_async_exception);
   } while (need_rechecking);
 
   update_poll_values(thread);
diff --git a/src/hotspot/share/runtime/safepointMechanism.hpp b/src/hotspot/share/runtime/safepointMechanism.hpp
index 46cac5e4a61..4479759c084 100644
--- a/src/hotspot/share/runtime/safepointMechanism.hpp
+++ b/src/hotspot/share/runtime/safepointMechanism.hpp
@@ -49,7 +49,7 @@ class SafepointMechanism : public AllStatic {
 
   static inline bool global_poll();
 
-  static void process(JavaThread *thread, bool allow_suspend);
+  static void process(JavaThread *thread, bool allow_suspend, bool check_async_exception);
 
   static void default_initialize();
 
@@ -80,8 +80,8 @@ class SafepointMechanism : public AllStatic {
   static inline bool should_process(JavaThread* thread, bool allow_suspend = true);
 
   // Processes a pending requested operation.
-  static inline void process_if_requested(JavaThread* thread, bool allow_suspend = true);
-  static inline void process_if_requested_with_exit_check(JavaThread* thread, bool check_asyncs);
+  static inline void process_if_requested(JavaThread* thread, bool allow_suspend, bool check_async_exception);
+  static inline void process_if_requested_with_exit_check(JavaThread* thread, bool check_async_exception);
   // Compute what the poll values should be and install them.
   static void update_poll_values(JavaThread* thread);
 
diff --git a/src/hotspot/share/runtime/safepointMechanism.inline.hpp b/src/hotspot/share/runtime/safepointMechanism.inline.hpp
index 9439672157f..3cac28dca16 100644
--- a/src/hotspot/share/runtime/safepointMechanism.inline.hpp
+++ b/src/hotspot/share/runtime/safepointMechanism.inline.hpp
@@ -66,19 +66,17 @@ bool SafepointMechanism::global_poll() {
 bool SafepointMechanism::should_process(JavaThread* thread, bool allow_suspend) {
   if (!local_poll_armed(thread)) {
     return false;
-  } else if (allow_suspend) {
-    return true;
   }
-  //  We are armed but we should ignore suspend operations.
+
   if (global_poll() || // Safepoint
-      thread->handshake_state()->has_a_non_suspend_operation() || // Non-suspend handshake
+      thread->handshake_state()->has_operation(allow_suspend, false /* check_async_exception */) || // Handshake
       !StackWatermarkSet::processing_started(thread)) { // StackWatermark processing is not started
     return true;
   }
 
   // It has boiled down to two possibilities:
   // 1: We have nothing to process, this just a disarm poll.
-  // 2: We have a suspend handshake, which cannot be processed.
+  // 2: We have a suspend or async exception handshake, which cannot be processed.
   // We update the poll value in case of a disarm, to reduce false positives.
   update_poll_values(thread);
 
@@ -88,19 +86,19 @@ bool SafepointMechanism::should_process(JavaThread* thread, bool allow_suspend)
   return false;
 }
 
-void SafepointMechanism::process_if_requested(JavaThread* thread, bool allow_suspend) {
+void SafepointMechanism::process_if_requested(JavaThread* thread, bool allow_suspend, bool check_async_exception) {
   // Check NoSafepointVerifier. This also clears unhandled oops if CheckUnhandledOops is used.
   thread->check_possible_safepoint();
 
   if (local_poll_armed(thread)) {
-    process(thread, allow_suspend);
+    process(thread, allow_suspend, check_async_exception);
   }
 }
 
-void SafepointMechanism::process_if_requested_with_exit_check(JavaThread* thread, bool check_asyncs) {
-  process_if_requested(thread);
+void SafepointMechanism::process_if_requested_with_exit_check(JavaThread* thread, bool check_async_exception) {
+  process_if_requested(thread, true /* allow_suspend */, check_async_exception);
   if (thread->has_special_runtime_exit_condition()) {
-    thread->handle_special_runtime_exit_condition(check_asyncs);
+    thread->handle_special_runtime_exit_condition();
   }
 }
 
diff --git a/src/hotspot/share/runtime/sweeper.cpp b/src/hotspot/share/runtime/sweeper.cpp
index 988d6ccfac9..d6ac3dc921b 100644
--- a/src/hotspot/share/runtime/sweeper.cpp
+++ b/src/hotspot/share/runtime/sweeper.cpp
@@ -266,7 +266,7 @@ void NMethodSweeper::force_sweep() {
  */
 void NMethodSweeper::handle_safepoint_request() {
   JavaThread* thread = JavaThread::current();
-  if (SafepointMechanism::should_process(thread)) {
+  if (SafepointMechanism::local_poll_armed(thread)) {
     if (PrintMethodFlushing && Verbose) {
       tty->print_cr("### Sweep at %d out of %d, yielding to safepoint", _seen, CodeCache::nmethod_count());
     }
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index c1e327d40a5..76e7e9d1e55 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -1014,10 +1014,6 @@ JavaThread::JavaThread() :
   _monitor_chunks(nullptr),
 
   _suspend_flags(0),
-  _pending_async_exception(nullptr),
-#ifdef ASSERT
-  _is_unsafe_access_error(false),
-#endif
 
   _thread_state(_thread_new),
   _saved_exception_pc(nullptr),
@@ -1585,157 +1581,104 @@ void JavaThread::remove_monitor_chunk(MonitorChunk* chunk) {
   }
 }
 
+void JavaThread::handle_special_runtime_exit_condition() {
+  if (is_obj_deopt_suspend()) {
+    frame_anchor()->make_walkable(this);
+    wait_for_object_deoptimization();
+  }
+  JFR_ONLY(SUSPEND_THREAD_CONDITIONAL(this);)
+}
+
 
 // Asynchronous exceptions support
 //
-void JavaThread::check_and_handle_async_exceptions() {
-  if (has_last_Java_frame() && has_async_exception_condition()) {
-    // If we are at a polling page safepoint (not a poll return)
-    // then we must defer async exception because live registers
-    // will be clobbered by the exception path. Poll return is
-    // ok because the call we are returning from already collides
-    // with exception handling registers and so there is no issue.
-    // (The exception handling path kills call result registers but
-    //  this is ok since the exception kills the result anyway).
-
-    if (is_at_poll_safepoint()) {
-      // if the code we are returning to has deoptimized we must defer
-      // the exception otherwise live registers get clobbered on the
-      // exception path before deoptimization is able to retrieve them.
-      //
-      RegisterMap map(this, false);
-      frame caller_fr = last_frame().sender(&map);
-      assert(caller_fr.is_compiled_frame(), "what?");
-      if (caller_fr.is_deoptimized_frame()) {
-        log_info(exceptions)("deferred async exception at compiled safepoint");
-        return;
-      }
-    }
-  }
+void JavaThread::handle_async_exception(oop java_throwable) {
+  assert(java_throwable != NULL, "should have an _async_exception to throw");
+  assert(!is_at_poll_safepoint(), "should have never called this method");
 
-  if (!clear_async_exception_condition()) {
-    if ((_suspend_flags & _async_delivery_disabled) != 0) {
-      log_info(exceptions)("Async exception delivery is disabled");
+  if (has_last_Java_frame()) {
+    frame f = last_frame();
+    if (f.is_runtime_frame()) {
+      // If the topmost frame is a runtime stub, then we are calling into
+      // OptoRuntime from compiled code. Some runtime stubs (new, monitor_exit..)
+      // must deoptimize the caller before continuing, as the compiled exception
+      // handler table may not be valid.
+      RegisterMap reg_map(this, false);
+      frame compiled_frame = f.sender(&reg_map);
+      if (!StressCompiledExceptionHandlers && compiled_frame.can_be_deoptimized()) {
+        Deoptimization::deoptimize(this, compiled_frame);
+      }
     }
-    return;
   }
 
-  if (_pending_async_exception != NULL) {
-    // Only overwrite an already pending exception if it is not a threadDeath.
-    if (!has_pending_exception() || !pending_exception()->is_a(vmClasses::ThreadDeath_klass())) {
+  // Only overwrite an already pending exception if it is not a ThreadDeath.
+  if (!has_pending_exception() || !pending_exception()->is_a(vmClasses::ThreadDeath_klass())) {
 
-      // We cannot call Exceptions::_throw(...) here because we cannot block
-      set_pending_exception(_pending_async_exception, __FILE__, __LINE__);
+    // We cannot call Exceptions::_throw(...) here because we cannot block
+    set_pending_exception(java_throwable, __FILE__, __LINE__);
 
-      LogTarget(Info, exceptions) lt;
-      if (lt.is_enabled()) {
-        ResourceMark rm;
-        LogStream ls(lt);
-        ls.print("Async. exception installed at runtime exit (" INTPTR_FORMAT ")", p2i(this));
-          if (has_last_Java_frame()) {
-            frame f = last_frame();
-           ls.print(" (pc: " INTPTR_FORMAT " sp: " INTPTR_FORMAT " )", p2i(f.pc()), p2i(f.sp()));
-          }
-        ls.print_cr(" of type: %s", _pending_async_exception->klass()->external_name());
+    LogTarget(Info, exceptions) lt;
+    if (lt.is_enabled()) {
+      ResourceMark rm;
+      LogStream ls(lt);
+      ls.print("Async. exception installed at runtime exit (" INTPTR_FORMAT ")", p2i(this));
+      if (has_last_Java_frame()) {
+        frame f = last_frame();
+        ls.print(" (pc: " INTPTR_FORMAT " sp: " INTPTR_FORMAT " )", p2i(f.pc()), p2i(f.sp()));
       }
+      ls.print_cr(" of type: %s", java_throwable->klass()->external_name());
     }
-    // Always null out the _pending_async_exception oop here since the async condition was
-    // already cleared above and thus considered handled.
-    _pending_async_exception = NULL;
-  } else {
-    assert(_is_unsafe_access_error, "must be");
-    DEBUG_ONLY(_is_unsafe_access_error = false);
-
-    // We may be at method entry which requires we save the do-not-unlock flag.
-    UnlockFlagSaver fs(this);
-    Exceptions::throw_unsafe_access_internal_error(this, __FILE__, __LINE__, "a fault occurred in an unsafe memory access operation");
-    // We might have blocked in a ThreadBlockInVM wrapper in the call above so make sure we process pending
-    // suspend requests and object reallocation operations if any since we might be going to Java after this.
-    SafepointMechanism::process_if_requested_with_exit_check(this, true /* check asyncs */);
   }
 }
 
-void JavaThread::handle_special_runtime_exit_condition(bool check_asyncs) {
+void JavaThread::install_async_exception(AsyncExceptionHandshake* aeh) {
+  // Do not throw asynchronous exceptions against the compiler thread.
+  if (!can_call_java()) {
+    delete aeh;
+    return;
+  }
 
-  if (is_obj_deopt_suspend()) {
-    frame_anchor()->make_walkable(this);
-    wait_for_object_deoptimization();
+  // Don't install a new pending async exception if there is already
+  // a pending ThreadDeath one. Just interrupt thread from potential
+  // wait()/sleep()/park() and return.
+  if (has_async_exception_condition(true /* ThreadDeath_only */)) {
+    java_lang_Thread::set_interrupted(threadObj(), true);
+    this->interrupt();
+    delete aeh;
+    return;
   }
 
-  // We might be here for reasons in addition to the self-suspend request
-  // so check for other async requests.
-  if (check_asyncs) {
-    check_and_handle_async_exceptions();
+  oop exception = aeh->exception();
+  Handshake::execute(aeh, this);  // Install asynchronous handshake
+
+  ResourceMark rm;
+  if (log_is_enabled(Info, exceptions)) {
+    log_info(exceptions)("Pending Async. exception installed of type: %s",
+                         InstanceKlass::cast(exception->klass())->external_name());
   }
+  // for AbortVMOnException flag
+  Exceptions::debug_check_abort(exception->klass()->external_name());
 
-  JFR_ONLY(SUSPEND_THREAD_CONDITIONAL(this);)
+  // Interrupt thread so it will wake up from a potential wait()/sleep()/park()
+  java_lang_Thread::set_interrupted(threadObj(), true);
+  this->interrupt();
 }
 
-class InstallAsyncExceptionClosure : public HandshakeClosure {
-  Handle _throwable; // The Throwable thrown at the target Thread
+class InstallAsyncExceptionHandshake : public HandshakeClosure {
+  AsyncExceptionHandshake* _aeh;
 public:
-  InstallAsyncExceptionClosure(Handle throwable) : HandshakeClosure("InstallAsyncException"), _throwable(throwable) {}
-
+  InstallAsyncExceptionHandshake(AsyncExceptionHandshake* aeh) :
+    HandshakeClosure("InstallAsyncException"), _aeh(aeh) {}
   void do_thread(Thread* thr) {
     JavaThread* target = JavaThread::cast(thr);
-    // Note that this now allows multiple ThreadDeath exceptions to be
-    // thrown at a thread.
-    // The target thread has run and has not exited yet.
-    target->send_thread_stop(_throwable());
+    target->install_async_exception(_aeh);
   }
 };
 
 void JavaThread::send_async_exception(JavaThread* target, oop java_throwable) {
-  Handle throwable(Thread::current(), java_throwable);
-  InstallAsyncExceptionClosure vm_stop(throwable);
-  Handshake::execute(&vm_stop, target);
-}
-
-void JavaThread::send_thread_stop(oop java_throwable)  {
-  ResourceMark rm;
-  assert(is_handshake_safe_for(Thread::current()),
-         "should be self or handshakee");
-
-  // Do not throw asynchronous exceptions against the compiler thread
-  // (the compiler thread should not be a Java thread -- fix in 1.4.2)
-  if (!can_call_java()) return;
-
-  {
-    // Actually throw the Throwable against the target Thread - however
-    // only if there is no thread death exception installed already.
-    if (_pending_async_exception == NULL || !_pending_async_exception->is_a(vmClasses::ThreadDeath_klass())) {
-      // If the topmost frame is a runtime stub, then we are calling into
-      // OptoRuntime from compiled code. Some runtime stubs (new, monitor_exit..)
-      // must deoptimize the caller before continuing, as the compiled  exception handler table
-      // may not be valid
-      if (has_last_Java_frame()) {
-        frame f = last_frame();
-        if (f.is_runtime_frame() || f.is_safepoint_blob_frame()) {
-          RegisterMap reg_map(this, false);
-          frame compiled_frame = f.sender(&reg_map);
-          if (!StressCompiledExceptionHandlers && compiled_frame.can_be_deoptimized()) {
-            Deoptimization::deoptimize(this, compiled_frame);
-          }
-        }
-      }
-
-      // Set async. pending exception in thread.
-      set_pending_async_exception(java_throwable);
-
-      if (log_is_enabled(Info, exceptions)) {
-         ResourceMark rm;
-        log_info(exceptions)("Pending Async. exception installed of type: %s",
-                             InstanceKlass::cast(_pending_async_exception->klass())->external_name());
-      }
-      // for AbortVMOnException flag
-      Exceptions::debug_check_abort(_pending_async_exception->klass()->external_name());
-    }
-  }
-
-
-  // Interrupt thread so it will wake up from a potential wait()/sleep()/park()
-  java_lang_Thread::set_interrupted(threadObj(), true);
-  this->interrupt();
+  OopHandle e(Universe::vm_global(), java_throwable);
+  InstallAsyncExceptionHandshake iaeh(new AsyncExceptionHandshake(e));
+  Handshake::execute(&iaeh, target);
 }
 
 
@@ -1966,7 +1909,6 @@ void JavaThread::oops_do_no_frames(OopClosure* f, CodeBlobClosure* cf) {
   // around using this function
   f->do_oop((oop*) &_vm_result);
   f->do_oop((oop*) &_exception_oop);
-  f->do_oop((oop*) &_pending_async_exception);
 #if INCLUDE_JVMCI
   f->do_oop((oop*) &_jvmci_reserved_oop0);
 #endif
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 4256a44c39c..86bc9df6ffa 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -68,6 +68,7 @@ class OSThread;
 class ThreadStatistics;
 class ConcurrentLocksDump;
 class MonitorInfo;
+class AsyncExceptionHandshake;
 
 class vframeArray;
 class vframe;
@@ -785,14 +786,11 @@ class JavaThread: public Thread {
   enum SuspendFlags {
     // NOTE: avoid using the sign-bit as cc generates different test code
     //       when the sign-bit is used, and sometimes incorrectly - see CR 6398077
-    _has_async_exception     = 0x00000001U, // there is a pending async exception
-    _async_delivery_disabled = 0x00000002U, // async exception delivery is disabled
-    _trace_flag              = 0x00000004U, // call tracing backend
-    _obj_deopt               = 0x00000008U  // suspend for object reallocation and relocking for JVMTI agent
+    _trace_flag             = 0x00000004U, // call tracing backend
+    _obj_deopt              = 0x00000008U  // suspend for object reallocation and relocking for JVMTI agent
   };
 
   // various suspension related flags - atomically updated
-  // overloaded with async exceptions so that we do a single check when transitioning from native->Java
   volatile uint32_t _suspend_flags;
 
   inline void set_suspend_flag(SuspendFlags f);
@@ -806,24 +804,18 @@ class JavaThread: public Thread {
   bool is_trace_suspend()      { return (_suspend_flags & _trace_flag) != 0; }
   bool is_obj_deopt_suspend()  { return (_suspend_flags & _obj_deopt) != 0; }
 
-  // Asynchronous exceptions support
+  // Asynchronous exception support
  private:
-  oop     _pending_async_exception;
-#ifdef ASSERT
-  bool    _is_unsafe_access_error;
-#endif
+  friend class InstallAsyncExceptionHandshake;
+  friend class AsyncExceptionHandshake;
+  friend class HandshakeState;
 
-  inline bool clear_async_exception_condition();
+  void install_async_exception(AsyncExceptionHandshake* aec = NULL);
+  void handle_async_exception(oop java_throwable);
  public:
-  bool has_async_exception_condition() {
-    return (_suspend_flags & _has_async_exception) != 0 &&
-           (_suspend_flags & _async_delivery_disabled) == 0;
-  }
-  inline void set_pending_async_exception(oop e);
+  bool has_async_exception_condition(bool ThreadDeath_only = false);
   inline void set_pending_unsafe_access_error();
   static void send_async_exception(JavaThread* jt, oop java_throwable);
-  void send_thread_stop(oop throwable);
-  void check_and_handle_async_exceptions();
 
   class NoAsyncExceptionDeliveryMark : public StackObj {
     friend JavaThread;
@@ -1169,13 +1161,10 @@ class JavaThread: public Thread {
   // current thread, i.e. reverts optimizations based on escape analysis.
   void wait_for_object_deoptimization();
 
-  // these next two are also used for self-suspension and async exception support
-  void handle_special_runtime_exit_condition(bool check_asyncs = true);
-
-  // Return true if JavaThread has an asynchronous condition or
-  // if external suspension is requested.
+  // Support for object deoptimization and JFR suspension
+  void handle_special_runtime_exit_condition();
   bool has_special_runtime_exit_condition() {
-    return (_suspend_flags & (_has_async_exception | _obj_deopt JFR_ONLY(| _trace_flag))) != 0;
+    return (_suspend_flags & (_obj_deopt JFR_ONLY(| _trace_flag))) != 0;
   }
 
   // Fast-locking support
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index ee7d48b8660..61aa7cca87b 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -28,7 +28,11 @@
 
 #include "runtime/thread.hpp"
 
+#include "classfile/vmClasses.hpp"
 #include "gc/shared/tlab_globals.hpp"
+#include "memory/universe.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/oopHandle.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/nonJavaThread.hpp"
 #include "runtime/orderAccess.hpp"
@@ -122,31 +126,62 @@ inline void JavaThread::clear_obj_deopt_flag() {
   clear_suspend_flag(_obj_deopt);
 }
 
-inline bool JavaThread::clear_async_exception_condition() {
-  bool ret = has_async_exception_condition();
-  if (ret) {
-    clear_suspend_flag(_has_async_exception);
+class AsyncExceptionHandshake : public AsyncHandshakeClosure {
+  OopHandle _exception;
+  bool _is_ThreadDeath;
+ public:
+  AsyncExceptionHandshake(OopHandle& o, const char* name = "AsyncExceptionHandshake")
+  : AsyncHandshakeClosure(name), _exception(o) {
+    _is_ThreadDeath = exception()->is_a(vmClasses::ThreadDeath_klass());
   }
-  return ret;
-}
 
-inline void JavaThread::set_pending_async_exception(oop e) {
-  _pending_async_exception = e;
-  set_suspend_flag(_has_async_exception);
-}
+  ~AsyncExceptionHandshake() {
+    assert(!_exception.is_empty(), "invariant");
+    _exception.release(Universe::vm_global());
+  }
+
+  void do_thread(Thread* thr) {
+    JavaThread* self = JavaThread::cast(thr);
+    assert(self == JavaThread::current(), "must be");
+
+    self->handle_async_exception(exception());
+  }
+  oop exception() {
+    assert(!_exception.is_empty(), "invariant");
+    return _exception.resolve();
+  }
+  bool is_async_exception()   { return true; }
+  bool is_ThreadDeath()       { return _is_ThreadDeath; }
+};
+
+class UnsafeAccessErrorHandshake : public AsyncHandshakeClosure {
+ public:
+  UnsafeAccessErrorHandshake() : AsyncHandshakeClosure("UnsafeAccessErrorHandshake") {}
+  void do_thread(Thread* thr) {
+    JavaThread* self = JavaThread::cast(thr);
+    assert(self == JavaThread::current(), "must be");
+
+    self->handshake_state()->handle_unsafe_access_error();
+  }
+  bool is_async_exception()   { return true; }
+};
 
 inline void JavaThread::set_pending_unsafe_access_error() {
-  set_suspend_flag(_has_async_exception);
-  DEBUG_ONLY(_is_unsafe_access_error = true);
+  if (!has_async_exception_condition()) {
+    Handshake::execute(new UnsafeAccessErrorHandshake(), this);
+  }
 }
 
+inline bool JavaThread::has_async_exception_condition(bool ThreadDeath_only) {
+  return handshake_state()->has_async_exception_operation(ThreadDeath_only);
+}
 
 inline JavaThread::NoAsyncExceptionDeliveryMark::NoAsyncExceptionDeliveryMark(JavaThread *t) : _target(t) {
-  assert((_target->_suspend_flags & _async_delivery_disabled) == 0, "Nesting is not supported");
-  _target->set_suspend_flag(_async_delivery_disabled);
+  assert(!_target->handshake_state()->async_exceptions_blocked(), "Nesting is not supported");
+  _target->handshake_state()->set_async_exceptions_blocked(true);
 }
 inline JavaThread::NoAsyncExceptionDeliveryMark::~NoAsyncExceptionDeliveryMark() {
-  _target->clear_suspend_flag(_async_delivery_disabled);
+  _target->handshake_state()->set_async_exceptions_blocked(false);
 }
 
 inline JavaThreadState JavaThread::thread_state() const    {
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 0f80248eb54..940fc3e3eaf 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -716,7 +716,6 @@
   nonstatic_field(JavaThread,                  _current_pending_monitor_is_from_java,         bool)                                  \
   volatile_nonstatic_field(JavaThread,         _current_waiting_monitor,                      ObjectMonitor*)                        \
   volatile_nonstatic_field(JavaThread,         _suspend_flags,                                uint32_t)                              \
-  nonstatic_field(JavaThread,                  _pending_async_exception,                      oop)                                   \
   volatile_nonstatic_field(JavaThread,         _exception_oop,                                oop)                                   \
   volatile_nonstatic_field(JavaThread,         _exception_pc,                                 address)                               \
   volatile_nonstatic_field(JavaThread,         _is_method_handle_return,                      int)                                   \
@@ -2121,12 +2120,6 @@
   declare_constant(JVM_CONSTANT_DynamicInError)                           \
   declare_constant(JVM_CONSTANT_InternalMax)                              \
                                                                           \
-  /*****************************/                                         \
-  /* Thread::SuspendFlags enum */                                         \
-  /*****************************/                                         \
-                                                                          \
-  declare_constant(JavaThread::_has_async_exception)                      \
-                                                                          \
   /*******************/                                                   \
   /* JavaThreadState */                                                   \
   /*******************/                                                   \
diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index 1b56009a27d..15149d1be7e 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -250,12 +250,6 @@ void Exceptions::throw_stack_overflow_exception(JavaThread* THREAD, const char*
   _throw(THREAD, file, line, exception);
 }
 
-void Exceptions::throw_unsafe_access_internal_error(JavaThread* thread, const char* file, int line, const char* message) {
-  Handle h_exception = new_exception(thread, vmSymbols::java_lang_InternalError(), message);
-  java_lang_InternalError::set_during_unsafe_access(h_exception());
-  _throw(thread, file, line, h_exception, message);
-}
-
 void Exceptions::fthrow(JavaThread* thread, const char* file, int line, Symbol* h_name, const char* format, ...) {
   const int max_msg_size = 1024;
   va_list ap;
diff --git a/src/hotspot/share/utilities/exceptions.hpp b/src/hotspot/share/utilities/exceptions.hpp
index a599682e25b..9103dc0ffed 100644
--- a/src/hotspot/share/utilities/exceptions.hpp
+++ b/src/hotspot/share/utilities/exceptions.hpp
@@ -173,8 +173,6 @@ class Exceptions {
 
   static void throw_stack_overflow_exception(JavaThread* thread, const char* file, int line, const methodHandle& method);
 
-  static void throw_unsafe_access_internal_error(JavaThread* thread, const char* file, int line, const char* message);
-
   static void wrap_dynamic_exception(bool is_indy, JavaThread* thread);
 
   // Exception counting for error files of interesting exceptions that may have
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
index b091afece87..355f78e4406 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
@@ -34,8 +34,6 @@ public class Thread extends VMObject {
   private static long tlabFieldOffset;
 
   private static CIntegerField suspendFlagsField;
-  // Thread::SuspendFlags enum constants
-  private static int HAS_ASYNC_EXCEPTION;
 
   private static AddressField currentPendingMonitorField;
   private static AddressField currentWaitingMonitorField;
@@ -55,7 +53,6 @@ public class Thread extends VMObject {
     Type typeJavaThread = db.lookupType("JavaThread");
 
     suspendFlagsField = typeJavaThread.getCIntegerField("_suspend_flags");
-    HAS_ASYNC_EXCEPTION = db.lookupIntConstant("JavaThread::_has_async_exception").intValue();
 
     tlabFieldOffset    = typeThread.getField("_tlab").getOffset();
     currentPendingMonitorField = typeJavaThread.getAddressField("_current_pending_monitor");
@@ -71,10 +68,6 @@ public class Thread extends VMObject {
     return (int) suspendFlagsField.getValue(addr);
   }
 
-  public boolean hasAsyncException() {
-    return (suspendFlags() & HAS_ASYNC_EXCEPTION) != 0;
-  }
-
   public ThreadLocalAllocBuffer tlab() {
     return new ThreadLocalAllocBuffer(addr.addOffsetTo(tlabFieldOffset));
   }
diff --git a/test/hotspot/jtreg/runtime/Thread/AsyncExceptionOnMonitorEnter.java b/test/hotspot/jtreg/runtime/Thread/AsyncExceptionOnMonitorEnter.java
new file mode 100644
index 00000000000..791c3624f15
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/Thread/AsyncExceptionOnMonitorEnter.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8283044
+ * @summary Stress delivery of asynchronous exceptions while target is at monitorenter
+ * @build AsyncExceptionOnMonitorEnter
+ * @run main/othervm AsyncExceptionOnMonitorEnter 0
+ * @run main/othervm/native -agentlib:AsyncExceptionOnMonitorEnter AsyncExceptionOnMonitorEnter 1
+ */
+
+import java.util.concurrent.Semaphore;
+
+public class AsyncExceptionOnMonitorEnter extends Thread {
+    private final static int DEF_TIME_MAX = 30;  // default max # secs to test
+    private final static String PROG_NAME = "AsyncExceptionOnMonitorEnter";
+    private static int TEST_MODE = 0;
+
+    public static native int createRawMonitor();
+    public static native int enterRawMonitor();
+    public static native int exitRawMonitor();
+    public static native void destroyRawMonitor();
+
+    private static Object o1 = new Object();
+    private static boolean firstWorker = true;
+    private static Semaphore sem = new Semaphore(0);
+
+    @Override
+    public void run() {
+        if (TEST_MODE == 0) {
+            testWithJavaMonitor();
+        } else {
+            testWithJVMTIRawMonitor();
+        }
+    }
+
+    public void testWithJavaMonitor() {
+        try {
+            synchronized (o1) {
+                if (firstWorker) {
+                    firstWorker = false;
+                    sem.release();
+                }
+                Thread.sleep(1000);
+            }
+        } catch (ThreadDeath td) {
+        } catch (InterruptedException e) {
+            throw new Error("Unexpected: " + e);
+        }
+    }
+
+
+    public void testWithJVMTIRawMonitor() {
+        boolean savedFirst = false;
+        try {
+            int retCode = enterRawMonitor();
+            if (retCode != 0 && firstWorker) {
+                throw new RuntimeException("error in JVMTI RawMonitorEnter: retCode=" + retCode);
+            }
+            if (firstWorker) {
+                firstWorker = false;
+                savedFirst = true;
+                sem.release();
+            }
+            Thread.sleep(1000);
+            retCode = exitRawMonitor();
+            if (retCode != 0 && savedFirst) {
+                throw new RuntimeException("error in JVMTI RawMonitorExit: retCode=" + retCode);
+            }
+        } catch (ThreadDeath td) {
+        } catch (InterruptedException e) {
+            throw new Error("Unexpected: " + e);
+        }
+    }
+
+    public static void main(String[] args) {
+        int timeMax = DEF_TIME_MAX;
+        try {
+            if (args.length == 1) {
+                TEST_MODE = Integer.parseUnsignedInt(args[0]);
+            } else if (args.length == 2) {
+                TEST_MODE = Integer.parseUnsignedInt(args[0]);
+                timeMax = Integer.parseUnsignedInt(args[1]);
+            }
+            if (TEST_MODE != 0 && TEST_MODE != 1) {
+                System.err.println("'" + TEST_MODE + "': invalid mode");
+                usage();
+            }
+        } catch (NumberFormatException nfe) {
+            System.err.println("'" + args[0] + "': invalid value.");
+            usage();
+        }
+
+        System.out.println("About to execute for " + timeMax + " seconds.");
+
+        long count = 0;
+        long start_time = System.currentTimeMillis();
+        while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
+            count++;
+
+            if (TEST_MODE == 1) {
+                // Create JVMTI raw monitor that will be used
+                int retCode = createRawMonitor();
+                if (retCode != 0) {
+                    throw new RuntimeException("error in JVMTI CreateRawMonitor: retCode=" + retCode);
+                }
+            }
+
+            AsyncExceptionOnMonitorEnter worker1 = new AsyncExceptionOnMonitorEnter();
+            AsyncExceptionOnMonitorEnter worker2 = new AsyncExceptionOnMonitorEnter();
+
+            try {
+                // Start firstWorker worker and wait until monitor is acquired
+                firstWorker = true;
+                worker1.start();
+                sem.acquire();
+
+                // Start second worker and allow some time for target to block on monitorenter
+                // before executing Thread.stop()
+                worker2.start();
+                Thread.sleep(300);
+
+                while (true) {
+                    worker2.stop();
+                    if (TEST_MODE != 1) {
+                        // Don't stop() worker1 with JVMTI raw monitors since if the monitor is
+                        // not released worker2 will deadlock on enter
+                        worker1.stop();
+                    }
+
+                    if (!worker1.isAlive() && !worker2.isAlive()) {
+                        // Done with Thread.stop() calls since
+                        // threads are not alive.
+                        break;
+                    }
+                }
+            } catch (InterruptedException e) {
+                throw new Error("Unexpected: " + e);
+            } catch (NoClassDefFoundError ncdfe) {
+                // Ignore because we're testing Thread.stop() which can
+                // cause it. Yes, a NoClassDefFoundError that happens
+                // in a worker thread can subsequently be seen in the
+                // main thread.
+            }
+
+            try {
+                worker1.join();
+                worker2.join();
+            } catch (InterruptedException e) {
+                throw new Error("Unexpected: " + e);
+            }
+
+            if (TEST_MODE == 1) {
+                // Destroy JVMTI raw monitor used
+                destroyRawMonitor();
+            }
+        }
+
+        System.out.println("Executed " + count + " loops in " + timeMax +
+                           " seconds.");
+
+        String cmd = System.getProperty("sun.java.command");
+        if (cmd != null && !cmd.startsWith("com.sun.javatest.regtest.agent.MainWrapper")) {
+            // Exit with success in a non-JavaTest environment:
+            System.exit(0);
+        }
+    }
+
+    public static void usage() {
+        System.err.println("Usage: " + PROG_NAME + " [mode [time_max]]");
+        System.err.println("where:");
+        System.err.println("    mode      0: Test with Java monitors (default); 1: Test with JVMTI raw monitors");
+        System.err.println("    time_max  max looping time in seconds");
+        System.err.println("              (default is " + DEF_TIME_MAX +
+                           " seconds)");
+        System.exit(1);
+    }
+}
+
diff --git a/test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java b/test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java
new file mode 100644
index 00000000000..9e35af9557a
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8283044
+ * @summary Stress delivery of asynchronous exceptions.
+ * @library /test/lib /test/hotspot/jtreg
+ * @build AsyncExceptionTest
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AsyncExceptionTest
+ */
+
+import compiler.testlibrary.CompilerUtils;
+import compiler.whitebox.CompilerWhiteBoxTest;
+import java.util.concurrent.CountDownLatch;
+import sun.hotspot.WhiteBox;
+
+public class AsyncExceptionTest extends Thread {
+    private final static int DEF_TIME_MAX = 30;  // default max # secs to test
+    private final static String PROG_NAME = "AsyncExceptionTest";
+
+    public static final WhiteBox WB = WhiteBox.getWhiteBox();
+
+    public CountDownLatch exitSyncObj = new CountDownLatch(1);
+    public CountDownLatch startSyncObj = new CountDownLatch(1);
+
+    private boolean realRun;
+    private boolean firstEntry = true;
+    private boolean receivedThreadDeathinInternal1 = false;
+    private boolean receivedThreadDeathinInternal2 = false;
+
+    public void setDontInline(String method) {
+        java.lang.reflect.Method m;
+        try {
+            m = AsyncExceptionTest.class.getMethod(method);
+        } catch(NoSuchMethodException e) {
+            throw new RuntimeException("Unexpected: " + e);
+        }
+        WB.testSetDontInlineMethod(m, true);
+    }
+
+    public void checkCompLevel(String method) {
+        int highestLevel = CompilerUtils.getMaxCompilationLevel();
+        java.lang.reflect.Method m;
+        try {
+            m = AsyncExceptionTest.class.getMethod(method);
+        } catch(NoSuchMethodException e) {
+            throw new RuntimeException("Unexpected: " + e);
+        }
+        int compLevel = WB.getMethodCompilationLevel(m);
+        while (compLevel < (highestLevel - 1)) {
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException e) { /* ignored */ }
+            compLevel = WB.getMethodCompilationLevel(m);
+        }
+    }
+
+    @Override
+    public void run() {
+        try {
+            setDontInline("internalRun1");
+            setDontInline("internalRun2");
+
+            int callCount = CompilerWhiteBoxTest.THRESHOLD;
+            while (callCount-- > 0) {
+                receivedThreadDeathinInternal2 = false;
+                realRun = false;
+                internalRun1();
+            }
+            checkCompLevel("internalRun1");
+            checkCompLevel("internalRun2");
+
+            receivedThreadDeathinInternal2 = false;
+            realRun = true;
+            internalRun1();
+        } catch (ThreadDeath td) {
+            throw new RuntimeException("Catched ThreadDeath in run() instead of internalRun2() or internalRun1(). receivedThreadDeathinInternal1=" + receivedThreadDeathinInternal1 + "; receivedThreadDeathinInternal2=" + receivedThreadDeathinInternal2);
+        } catch (NoClassDefFoundError ncdfe) {
+            // ignore because we're testing Thread.stop() which can cause it
+        }
+
+        if (receivedThreadDeathinInternal2 == false && receivedThreadDeathinInternal1 == false) {
+            throw new RuntimeException("Didn't catched ThreadDeath in internalRun2() nor in internalRun1(). receivedThreadDeathinInternal1=" + receivedThreadDeathinInternal1 + "; receivedThreadDeathinInternal2=" + receivedThreadDeathinInternal2);
+        }
+        exitSyncObj.countDown();
+    }
+
+    public void internalRun1() {
+        long start_time = System.currentTimeMillis();
+        try {
+            while (!receivedThreadDeathinInternal2) {
+              internalRun2();
+            }
+        } catch (ThreadDeath e) {
+            receivedThreadDeathinInternal1 = true;
+        }
+    }
+
+    public void internalRun2() {
+        try {
+            Integer myLocalCount = 1;
+            Integer myLocalCount2 = 1;
+
+            if (realRun && firstEntry) {
+                // Tell main thread we have started.
+                startSyncObj.countDown();
+                firstEntry = false;
+            }
+
+            while(myLocalCount > 0) {
+                if (!realRun) {
+                    receivedThreadDeathinInternal2 = true;
+                    break;
+                }
+                myLocalCount2 = (myLocalCount % 3) / 2;
+                myLocalCount -= 1;
+            }
+        } catch (ThreadDeath e) {
+            receivedThreadDeathinInternal2 = true;
+        }
+    }
+
+    public static void main(String[] args) {
+        int timeMax = 0;
+        if (args.length == 0) {
+            timeMax = DEF_TIME_MAX;
+        } else {
+            try {
+                timeMax = Integer.parseUnsignedInt(args[0]);
+            } catch (NumberFormatException nfe) {
+                System.err.println("'" + args[0] + "': invalid timeMax value.");
+                usage();
+            }
+        }
+
+        System.out.println("About to execute for " + timeMax + " seconds.");
+
+        long count = 0;
+        long start_time = System.currentTimeMillis();
+        while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
+            count++;
+            AsyncExceptionTest thread = new AsyncExceptionTest();
+            thread.start();
+            try {
+                // Wait for the worker thread to get going.
+                thread.startSyncObj.await();
+                while (true) {
+                    // Send async exception and wait until it is thrown
+                    thread.stop();
+                    thread.exitSyncObj.await();
+                    Thread.sleep(100);
+
+                    if (!thread.isAlive()) {
+                        // Done with Thread.stop() calls since
+                        // thread is not alive.
+                        break;
+                    }
+                }
+            } catch (InterruptedException e) {
+                throw new Error("Unexpected: " + e);
+            } catch (NoClassDefFoundError ncdfe) {
+                // Ignore because we're testing Thread.stop() which can
+                // cause it. Yes, a NoClassDefFoundError that happens
+                // in a worker thread can subsequently be seen in the
+                // main thread.
+            }
+
+            try {
+                thread.join();
+            } catch (InterruptedException e) {
+                throw new Error("Unexpected: " + e);
+            }
+        }
+
+        System.out.println("Executed " + count + " loops in " + timeMax +
+                           " seconds.");
+
+        String cmd = System.getProperty("sun.java.command");
+        if (cmd != null && !cmd.startsWith("com.sun.javatest.regtest.agent.MainWrapper")) {
+            // Exit with success in a non-JavaTest environment:
+            System.exit(0);
+        }
+    }
+
+    public static void usage() {
+        System.err.println("Usage: " + PROG_NAME + " [time_max]");
+        System.err.println("where:");
+        System.err.println("    time_max  max looping time in seconds");
+        System.err.println("              (default is " + DEF_TIME_MAX +
+                           " seconds)");
+        System.exit(1);
+    }
+}
+
diff --git a/test/hotspot/jtreg/runtime/Thread/libAsyncExceptionOnMonitorEnter.cpp b/test/hotspot/jtreg/runtime/Thread/libAsyncExceptionOnMonitorEnter.cpp
new file mode 100644
index 00000000000..fad039a189f
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/Thread/libAsyncExceptionOnMonitorEnter.cpp
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <string.h>
+#include "jvmti.h"
+
+extern "C" {
+
+static jvmtiEnv* jvmti = NULL;
+static jrawMonitorID monitor;
+
+JNIEXPORT jint JNICALL
+Java_AsyncExceptionOnMonitorEnter_createRawMonitor(JNIEnv *jni, jclass cls) {
+  jvmtiError err;
+  char name[32];
+
+  sprintf(name, "MyRawMonitor");
+  err = jvmti->CreateRawMonitor(name, &monitor);
+  if (err != JVMTI_ERROR_NONE) {
+    printf("CreateRawMonitor unexpected error: (%d)\n", err);
+  }
+  return err;
+}
+
+JNIEXPORT jint JNICALL
+Java_AsyncExceptionOnMonitorEnter_enterRawMonitor(JNIEnv *jni, jclass cls) {
+  jvmtiError err;
+  err = jvmti->RawMonitorEnter(monitor);
+  if (err != JVMTI_ERROR_NONE) {
+      printf("RawMonitorEnter unexpected error: (%d)\n", err);
+  }
+  return err;
+}
+
+JNIEXPORT jint JNICALL
+Java_AsyncExceptionOnMonitorEnter_exitRawMonitor(JNIEnv *jni, jclass cls) {
+  jvmtiError err;
+  err = jvmti->RawMonitorExit(monitor);
+  if (err != JVMTI_ERROR_NONE) {
+      printf("RawMonitorExit unexpected error: (%d)\n", err);
+  }
+  return err;
+}
+
+JNIEXPORT void JNICALL
+Java_AsyncExceptionOnMonitorEnter_destroyRawMonitor(JNIEnv *jni, jclass cls) {
+  jvmtiError err;
+  err = jvmti->DestroyRawMonitor(monitor);
+  // Almost always worker2 will be stopped before being able to release the
+  // JVMTI monitor so just ignore those errors.
+  if (err != JVMTI_ERROR_NONE && err != JVMTI_ERROR_NOT_MONITOR_OWNER) {
+    printf("DestroyRawMonitor unexpected error: (%d)\n", err);
+  }
+}
+
+JNIEXPORT jint JNICALL
+Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+  // create JVMTI environment
+  if (jvm->GetEnv((void **) (&jvmti), JVMTI_VERSION) != JNI_OK) {
+    return JNI_ERR;
+  }
+  return JNI_OK;
+}
+
+}
\ No newline at end of file
-- 
GitLab


From 36b9baa70da4af9b531319ea547884f1141e7cdd Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Mon, 4 Apr 2022 15:05:00 +0000
Subject: [PATCH 330/345] 8282508: Updating ASM to 9.2 for JDK 19

Reviewed-by: lancea, egahlin, mchung
---
 .../org/objectweb/asm/AnnotationVisitor.java  |  15 +-
 .../org/objectweb/asm/AnnotationWriter.java   |   3 +-
 .../internal/org/objectweb/asm/Attribute.java |   1 +
 .../org/objectweb/asm/ByteVector.java         |   2 +
 .../org/objectweb/asm/ClassReader.java        |  55 +++--
 .../objectweb/asm/ClassTooLargeException.java |   2 +
 .../org/objectweb/asm/ClassVisitor.java       |  48 ++---
 .../org/objectweb/asm/ClassWriter.java        |  43 ++--
 .../org/objectweb/asm/ConstantDynamic.java    |   2 +
 .../internal/org/objectweb/asm/Constants.java |   2 +
 .../internal/org/objectweb/asm/Context.java   |   2 +
 .../org/objectweb/asm/CurrentFrame.java       |   2 +
 .../jdk/internal/org/objectweb/asm/Edge.java  |   2 +
 .../org/objectweb/asm/FieldVisitor.java       |  20 +-
 .../org/objectweb/asm/FieldWriter.java        |   4 +-
 .../jdk/internal/org/objectweb/asm/Frame.java |   2 +
 .../internal/org/objectweb/asm/Handle.java    |   2 +
 .../internal/org/objectweb/asm/Handler.java   |   2 +
 .../jdk/internal/org/objectweb/asm/Label.java |   2 +
 .../asm/MethodTooLargeException.java          |   2 +
 .../org/objectweb/asm/MethodVisitor.java      |  12 +-
 .../org/objectweb/asm/MethodWriter.java       |   4 +-
 .../org/objectweb/asm/ModuleVisitor.java      |  12 +-
 .../org/objectweb/asm/ModuleWriter.java       |   4 +-
 .../internal/org/objectweb/asm/Opcodes.java   |  15 +-
 .../objectweb/asm/RecordComponentVisitor.java |  19 +-
 .../objectweb/asm/RecordComponentWriter.java  |   4 +-
 .../internal/org/objectweb/asm/Symbol.java    |   2 +
 .../org/objectweb/asm/SymbolTable.java        |   2 +
 .../jdk/internal/org/objectweb/asm/Type.java  |   2 +
 .../internal/org/objectweb/asm/TypePath.java  |   2 +
 .../org/objectweb/asm/TypeReference.java      |   2 +
 .../objectweb/asm/commons/AdviceAdapter.java  |  33 ++-
 .../asm/commons/AnalyzerAdapter.java          |   8 +-
 .../asm/commons/AnnotationRemapper.java       | 129 ++++++++++--
 .../objectweb/asm/commons/ClassRemapper.java  |  49 +++--
 .../asm/commons/CodeSizeEvaluator.java        |   4 +-
 .../objectweb/asm/commons/FieldRemapper.java  |  40 +++-
 .../asm/commons/GeneratorAdapter.java         |   8 +-
 .../asm/commons/InstructionAdapter.java       |  14 +-
 .../asm/commons/JSRInlinerAdapter.java        |   8 +-
 .../asm/commons/LocalVariablesSorter.java     |   8 +-
 .../org/objectweb/asm/commons/Method.java     |   2 +
 .../objectweb/asm/commons/MethodRemapper.java |  46 ++--
 .../asm/commons/ModuleHashesAttribute.java    |   4 +-
 .../objectweb/asm/commons/ModuleRemapper.java |  12 +-
 .../commons/ModuleResolutionAttribute.java    |   2 +
 .../asm/commons/ModuleTargetAttribute.java    |   2 +
 .../asm/commons/RecordComponentRemapper.java  |  34 ++-
 .../org/objectweb/asm/commons/Remapper.java   |  14 ++
 .../commons/RemappingAnnotationAdapter.java   |   3 +-
 .../asm/commons/RemappingClassAdapter.java    | 197 ------------------
 .../asm/commons/RemappingFieldAdapter.java    | 104 ---------
 .../asm/commons/RemappingMethodAdapter.java   |   3 +-
 .../commons/RemappingSignatureAdapter.java    | 187 -----------------
 .../asm/commons/SerialVersionUIDAdder.java    |  10 +-
 .../asm/commons/SignatureRemapper.java        |  12 +-
 .../objectweb/asm/commons/SimpleRemapper.java |  13 +-
 .../asm/commons/StaticInitMerger.java         |   8 +-
 .../asm/commons/TableSwitchGenerator.java     |   2 +
 .../asm/commons/TryCatchBlockSorter.java      |   4 +-
 .../asm/signature/SignatureReader.java        |   2 +
 .../asm/signature/SignatureVisitor.java       |   9 +-
 .../asm/signature/SignatureWriter.java        |   4 +-
 .../objectweb/asm/tree/AbstractInsnNode.java  |   2 +
 .../objectweb/asm/tree/AnnotationNode.java    |  12 +-
 .../org/objectweb/asm/tree/ClassNode.java     |  43 ++--
 .../org/objectweb/asm/tree/FieldInsnNode.java |   2 +
 .../org/objectweb/asm/tree/FieldNode.java     |   8 +-
 .../org/objectweb/asm/tree/FrameNode.java     |   2 +
 .../org/objectweb/asm/tree/IincInsnNode.java  |   2 +
 .../objectweb/asm/tree/InnerClassNode.java    |   2 +
 .../org/objectweb/asm/tree/InsnList.java      |  15 +-
 .../org/objectweb/asm/tree/InsnNode.java      |   2 +
 .../org/objectweb/asm/tree/IntInsnNode.java   |   2 +
 .../asm/tree/InvokeDynamicInsnNode.java       |   2 +
 .../org/objectweb/asm/tree/JumpInsnNode.java  |   2 +
 .../org/objectweb/asm/tree/LabelNode.java     |   2 +
 .../org/objectweb/asm/tree/LdcInsnNode.java   |  21 +-
 .../objectweb/asm/tree/LineNumberNode.java    |   2 +
 .../asm/tree/LocalVariableAnnotationNode.java |   8 +-
 .../objectweb/asm/tree/LocalVariableNode.java |   2 +
 .../asm/tree/LookupSwitchInsnNode.java        |   2 +
 .../objectweb/asm/tree/MethodInsnNode.java    |   2 +
 .../org/objectweb/asm/tree/MethodNode.java    |  16 +-
 .../objectweb/asm/tree/ModuleExportNode.java  |   2 +
 .../org/objectweb/asm/tree/ModuleNode.java    |   6 +-
 .../objectweb/asm/tree/ModuleOpenNode.java    |   2 +
 .../objectweb/asm/tree/ModuleProvideNode.java |   2 +
 .../objectweb/asm/tree/ModuleRequireNode.java |   2 +
 .../asm/tree/MultiANewArrayInsnNode.java      |   2 +
 .../org/objectweb/asm/tree/ParameterNode.java |   2 +
 .../asm/tree/RecordComponentNode.java         |   9 +-
 .../asm/tree/TableSwitchInsnNode.java         |   2 +
 .../objectweb/asm/tree/TryCatchBlockNode.java |   2 +
 .../asm/tree/TypeAnnotationNode.java          |   8 +-
 .../org/objectweb/asm/tree/TypeInsnNode.java  |   2 +
 .../UnsupportedClassVersionException.java     |   4 +-
 .../internal/org/objectweb/asm/tree/Util.java |   2 +
 .../org/objectweb/asm/tree/VarInsnNode.java   |   2 +
 .../objectweb/asm/tree/analysis/Analyzer.java |  73 ++++++-
 .../asm/tree/analysis/AnalyzerException.java  |   2 +
 .../asm/tree/analysis/BasicInterpreter.java   |   8 +-
 .../asm/tree/analysis/BasicValue.java         |   2 +
 .../asm/tree/analysis/BasicVerifier.java      |   8 +-
 .../objectweb/asm/tree/analysis/Frame.java    |  74 +++++--
 .../asm/tree/analysis/Interpreter.java        |   2 +
 .../asm/tree/analysis/SimpleVerifier.java     |   8 +-
 .../objectweb/asm/tree/analysis/SmallSet.java |   2 +
 .../asm/tree/analysis/SourceInterpreter.java  |   8 +-
 .../asm/tree/analysis/SourceValue.java        |   2 +
 .../asm/tree/analysis/Subroutine.java         |   2 +
 .../objectweb/asm/tree/analysis/Value.java    |   2 +
 .../org/objectweb/asm/util/ASMifiable.java    |  81 -------
 .../org/objectweb/asm/util/ASMifier.java      |  46 ++--
 .../objectweb/asm/util/ASMifierSupport.java   |   2 +
 .../asm/util/CheckAnnotationAdapter.java      |   4 +-
 .../objectweb/asm/util/CheckClassAdapter.java |  59 ++++--
 .../objectweb/asm/util/CheckFieldAdapter.java |   8 +-
 .../asm/util/CheckMethodAdapter.java          |  18 +-
 .../asm/util/CheckModuleAdapter.java          |   8 +-
 .../asm/util/CheckRecordComponentAdapter.java |   7 +-
 .../asm/util/CheckSignatureAdapter.java       |   8 +-
 .../org/objectweb/asm/util/Printer.java       |  32 +--
 .../org/objectweb/asm/util/Textifiable.java   |  78 -------
 .../org/objectweb/asm/util/Textifier.java     |  23 +-
 .../objectweb/asm/util/TextifierSupport.java  |   2 +
 .../asm/util/TraceAnnotationVisitor.java      |   4 +-
 .../objectweb/asm/util/TraceClassVisitor.java |  18 +-
 .../objectweb/asm/util/TraceFieldVisitor.java |   4 +-
 .../asm/util/TraceMethodVisitor.java          |   4 +-
 .../asm/util/TraceModuleVisitor.java          |   3 +-
 .../asm/util/TraceRecordComponentVisitor.java |   4 +-
 .../asm/util/TraceSignatureVisitor.java       |   8 +-
 .../internal/org/objectweb/asm/version.txt    |   2 +-
 src/java.base/share/legal/asm.md              |   2 +-
 .../classes/sun/tools/jar/FingerPrint.java    |   2 +-
 .../ValidateJarWithSealedAndRecord.java       |  72 +++++++
 138 files changed, 1068 insertions(+), 1092 deletions(-)
 delete mode 100644 src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
 delete mode 100644 src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
 create mode 100644 test/langtools/tools/javac/sealed/ValidateJarWithSealedAndRecord.java

diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
index b5127eb142e..2288378fddd 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -98,19 +99,15 @@ public abstract class AnnotationVisitor {
       * @param annotationVisitor the annotation visitor to which this visitor must delegate method
       *     calls. May be {@literal null}.
       */
-    @SuppressWarnings("deprecation")
     public AnnotationVisitor(final int api, final AnnotationVisitor annotationVisitor) {
-        if (api != Opcodes.ASM8
+        if (api != Opcodes.ASM9
+                && api != Opcodes.ASM8
                 && api != Opcodes.ASM7
                 && api != Opcodes.ASM6
                 && api != Opcodes.ASM5
-                && api != Opcodes.ASM4
-                && api != Opcodes.ASM9_EXPERIMENTAL) {
+                && api != Opcodes.ASM4) {
             throw new IllegalArgumentException("Unsupported api " + api);
         }
-        if (api == Opcodes.ASM9_EXPERIMENTAL) {
-            Constants.checkAsmExperimental(this);
-        }
         this.api = api;
         this.av = annotationVisitor;
     }
@@ -162,9 +159,9 @@ public abstract class AnnotationVisitor {
     }
 
     /**
-      * Visits an array value of the annotation. Note that arrays of primitive types (such as byte,
+      * Visits an array value of the annotation. Note that arrays of primitive values (such as byte,
       * boolean, short, char, int, long, float or double) can be passed as value to {@link #visit
-      * visit}. This is what {@link ClassReader} does.
+      * visit}. This is what {@link ClassReader} does for non empty arrays of primitive values.
       *
       * @param name the value name.
       * @return a visitor to visit the actual array value elements, or {@literal null} if this visitor
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
index 9517d6b0255..fb4ae268d82 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -143,7 +144,7 @@ final class AnnotationWriter extends AnnotationVisitor {
             final boolean useNamedValues,
             final ByteVector annotation,
             final AnnotationWriter previousAnnotation) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         this.symbolTable = symbolTable;
         this.useNamedValues = useNamedValues;
         this.annotation = annotation;
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
index daadeb263e2..9c5ce91e3ff 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
index e576513f91b..9e5b8cf8850 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -390,3 +391,4 @@ public class ByteVector {
         data = newData;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
index e306e60d45b..7f76419d86c 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 import java.io.ByteArrayOutputStream;
@@ -119,6 +120,9 @@ public class ClassReader {
       */
     static final int EXPAND_ASM_INSNS = 256;
 
+    /** The maximum size of array to allocate. */
+    private static final int MAX_BUFFER_SIZE = 1024 * 1024;
+
     /** The size of the temporary byte array used to read class input streams chunk by chunk. */
     private static final int INPUT_STREAM_DATA_CHUNK_SIZE = 4096;
 
@@ -132,6 +136,9 @@ public class ClassReader {
     // DontCheck(MemberName): can't be renamed (for backward binary compatibility).
     public final byte[] b;
 
+    /** The offset in bytes of the ClassFile's access_flags field. */
+    public final int header;
+
     /**
       * A byte array containing the JVMS ClassFile structure to be parsed. <i>The content of this array
       * must not be modified. This field is intended for {@link Attribute} sub classes, and is normally
@@ -178,9 +185,6 @@ public class ClassReader {
       */
     private final int maxStringLength;
 
-    /** The offset in bytes of the ClassFile's access_flags field. */
-    public final int header;
-
     // -----------------------------------------------------------------------------------------------
     // Constructors
     // -----------------------------------------------------------------------------------------------
@@ -341,13 +345,19 @@ public class ClassReader {
         if (inputStream == null) {
             throw new IOException("Class not found");
         }
+        int bufferSize = calculateBufferSize(inputStream);
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-            byte[] data = new byte[INPUT_STREAM_DATA_CHUNK_SIZE];
+            byte[] data = new byte[bufferSize];
             int bytesRead;
-            while ((bytesRead = inputStream.read(data, 0, data.length)) != -1) {
+            int readCount = 0;
+            while ((bytesRead = inputStream.read(data, 0, bufferSize)) != -1) {
                 outputStream.write(data, 0, bytesRead);
+                readCount++;
             }
             outputStream.flush();
+            if (readCount == 1) {
+                return data;
+            }
             return outputStream.toByteArray();
         } finally {
             if (close) {
@@ -356,6 +366,20 @@ public class ClassReader {
         }
     }
 
+    private static int calculateBufferSize(final InputStream inputStream) throws IOException {
+        int expectedLength = inputStream.available();
+        /*
+          * Some implementations can return 0 while holding available data
+          * (e.g. new FileInputStream("/proc/a_file"))
+          * Also in some pathological cases a very small number might be returned,
+          * and in this case we use default size
+          */
+        if (expectedLength < 256) {
+            return INPUT_STREAM_DATA_CHUNK_SIZE;
+        }
+        return Math.min(expectedLength, MAX_BUFFER_SIZE);
+    }
+
     // -----------------------------------------------------------------------------------------------
     // Accessors
     // -----------------------------------------------------------------------------------------------
@@ -446,7 +470,6 @@ public class ClassReader {
       * @param parsingOptions the options to use to parse this class. One or more of {@link
       *     #SKIP_CODE}, {@link #SKIP_DEBUG}, {@link #SKIP_FRAMES} or {@link #EXPAND_FRAMES}.
       */
-    @SuppressWarnings("deprecation")
     public void accept(
             final ClassVisitor classVisitor,
             final Attribute[] attributePrototypes,
@@ -710,11 +733,11 @@ public class ClassReader {
         // Visit the PermittedSubclasses attribute.
         if (permittedSubclassesOffset != 0) {
             int numberOfPermittedSubclasses = readUnsignedShort(permittedSubclassesOffset);
-            int currentPermittedSubclassOffset = permittedSubclassesOffset + 2;
+            int currentPermittedSubclassesOffset = permittedSubclassesOffset + 2;
             while (numberOfPermittedSubclasses-- > 0) {
-                classVisitor.visitPermittedSubclassExperimental(
-                        readClass(currentPermittedSubclassOffset, charBuffer));
-                currentPermittedSubclassOffset += 2;
+                classVisitor.visitPermittedSubclass(
+                        readClass(currentPermittedSubclassesOffset, charBuffer));
+                currentPermittedSubclassesOffset += 2;
             }
         }
 
@@ -3005,7 +3028,7 @@ public class ClassReader {
             // Parse the array_value array.
             while (numElementValuePairs-- > 0) {
                 currentOffset =
-                        readElementValue(annotationVisitor, currentOffset, /* named = */ null, charBuffer);
+                        readElementValue(annotationVisitor, currentOffset, /* elementName= */ null, charBuffer);
             }
         }
         if (annotationVisitor != null) {
@@ -3483,7 +3506,6 @@ public class ClassReader {
     private int[] readBootstrapMethodsAttribute(final int maxStringLength) {
         char[] charBuffer = new char[maxStringLength];
         int currentAttributeOffset = getFirstAttributeOffset();
-        int[] currentBootstrapMethodOffsets = null;
         for (int i = readUnsignedShort(currentAttributeOffset - 2); i > 0; --i) {
             // Read the attribute_info's attribute_name and attribute_length fields.
             String attributeName = readUTF8(currentAttributeOffset, charBuffer);
@@ -3491,17 +3513,17 @@ public class ClassReader {
             currentAttributeOffset += 6;
             if (Constants.BOOTSTRAP_METHODS.equals(attributeName)) {
                 // Read the num_bootstrap_methods field and create an array of this size.
-                currentBootstrapMethodOffsets = new int[readUnsignedShort(currentAttributeOffset)];
+                int[] result = new int[readUnsignedShort(currentAttributeOffset)];
                 // Compute and store the offset of each 'bootstrap_methods' array field entry.
                 int currentBootstrapMethodOffset = currentAttributeOffset + 2;
-                for (int j = 0; j < currentBootstrapMethodOffsets.length; ++j) {
-                    currentBootstrapMethodOffsets[j] = currentBootstrapMethodOffset;
+                for (int j = 0; j < result.length; ++j) {
+                    result[j] = currentBootstrapMethodOffset;
                     // Skip the bootstrap_method_ref and num_bootstrap_arguments fields (2 bytes each),
                     // as well as the bootstrap_arguments array field (of size num_bootstrap_arguments * 2).
                     currentBootstrapMethodOffset +=
                             4 + readUnsignedShort(currentBootstrapMethodOffset + 2) * 2;
                 }
-                return currentBootstrapMethodOffsets;
+                return result;
             }
             currentAttributeOffset += attributeLength;
         }
@@ -3860,3 +3882,4 @@ public class ClassReader {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassTooLargeException.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassTooLargeException.java
index 730cfc953a4..fe94f7446d4 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassTooLargeException.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassTooLargeException.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -100,3 +101,4 @@ public final class ClassTooLargeException extends IndexOutOfBoundsException {
         return constantPoolCount;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
index 7bfb17051ae..a19ef8619ad 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
@@ -56,14 +56,16 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
  * A visitor to visit a Java class. The methods of this class must be called in the following order:
  * {@code visit} [ {@code visitSource} ] [ {@code visitModule} ][ {@code visitNestHost} ][ {@code
- * visitPermittedSubclass} ][ {@code visitOuterClass} ] ( {@code visitAnnotation} | {@code
- * visitTypeAnnotation} | {@code visitAttribute} )* ( {@code visitNestMember} | {@code
- * visitInnerClass} | {@code visitField} | {@code visitMethod} )* {@code visitEnd}.
+ * visitOuterClass} ] ( {@code visitAnnotation} | {@code visitTypeAnnotation} | {@code
+ * visitAttribute} )* ( {@code visitNestMember} | [ {@code * visitPermittedSubclass} ] | {@code
+ * visitInnerClass} | {@code visitRecordComponent} | {@code visitField} | {@code visitMethod} )*
+ * {@code visitEnd}.
  *
  * @author Eric Bruneton
  */
@@ -92,24 +94,20 @@ public abstract class ClassVisitor {
       * Constructs a new {@link ClassVisitor}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param classVisitor the class visitor to which this visitor must delegate method calls. May be
       *     null.
       */
-    @SuppressWarnings("deprecation")
     public ClassVisitor(final int api, final ClassVisitor classVisitor) {
-        if (api != Opcodes.ASM8
+        if (api != Opcodes.ASM9
+                && api != Opcodes.ASM8
                 && api != Opcodes.ASM7
                 && api != Opcodes.ASM6
                 && api != Opcodes.ASM5
-                && api != Opcodes.ASM4
-                && api != Opcodes.ASM9_EXPERIMENTAL) {
+                && api != Opcodes.ASM4) {
             throw new IllegalArgumentException("Unsupported api " + api);
         }
-        if (api == Opcodes.ASM9_EXPERIMENTAL) {
-            Constants.checkAsmExperimental(this);
-        }
         this.api = api;
         this.cv = classVisitor;
     }
@@ -172,7 +170,7 @@ public abstract class ClassVisitor {
       */
     public ModuleVisitor visitModule(final String name, final int access, final String version) {
         if (api < Opcodes.ASM6) {
-            throw new UnsupportedOperationException("This feature requires ASM6");
+            throw new UnsupportedOperationException("Module requires ASM6");
         }
         if (cv != null) {
             return cv.visitModule(name, access, version);
@@ -192,7 +190,7 @@ public abstract class ClassVisitor {
       */
     public void visitNestHost(final String nestHost) {
         if (api < Opcodes.ASM7) {
-            throw new UnsupportedOperationException("This feature requires ASM7");
+            throw new UnsupportedOperationException("NestHost requires ASM7");
         }
         if (cv != null) {
             cv.visitNestHost(nestHost);
@@ -248,7 +246,7 @@ public abstract class ClassVisitor {
     public AnnotationVisitor visitTypeAnnotation(
             final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) {
         if (api < Opcodes.ASM5) {
-            throw new UnsupportedOperationException("This feature requires ASM5");
+            throw new UnsupportedOperationException("TypeAnnotation requires ASM5");
         }
         if (cv != null) {
             return cv.visitTypeAnnotation(typeRef, typePath, descriptor, visible);
@@ -278,7 +276,7 @@ public abstract class ClassVisitor {
       */
     public void visitNestMember(final String nestMember) {
         if (api < Opcodes.ASM7) {
-            throw new UnsupportedOperationException("This feature requires ASM7");
+            throw new UnsupportedOperationException("NestMember requires ASM7");
         }
         if (cv != null) {
             cv.visitNestMember(nestMember);
@@ -286,20 +284,17 @@ public abstract class ClassVisitor {
     }
 
     /**
-      * <b>Experimental, use at your own risk. This method will be renamed when it becomes stable, this
-      * will break existing code using it</b>. Visits a permitted subclass. A permitted subclass is one
-      * of the allowed subclasses of the current class.
+      * Visits a permitted subclasses. A permitted subclass is one of the allowed subclasses of the
+      * current class.
       *
       * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
       */
-    @Deprecated
-    public void visitPermittedSubclassExperimental(final String permittedSubclass) {
-        if (api != Opcodes.ASM9_EXPERIMENTAL) {
-            throw new UnsupportedOperationException("This feature requires ASM9_EXPERIMENTAL");
+    public void visitPermittedSubclass(final String permittedSubclass) {
+        if (api < Opcodes.ASM9) {
+            throw new UnsupportedOperationException("PermittedSubclasses requires ASM9");
         }
         if (cv != null) {
-            cv.visitPermittedSubclassExperimental(permittedSubclass);
+            cv.visitPermittedSubclass(permittedSubclass);
         }
     }
 
@@ -335,7 +330,7 @@ public abstract class ClassVisitor {
     public RecordComponentVisitor visitRecordComponent(
             final String name, final String descriptor, final String signature) {
         if (api < Opcodes.ASM8) {
-            throw new UnsupportedOperationException("This feature requires ASM8");
+            throw new UnsupportedOperationException("Record requires ASM8");
         }
         if (cv != null) {
             return cv.visitRecordComponent(name, descriptor, signature);
@@ -411,3 +406,4 @@ public abstract class ClassVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
index 31cfe85afe2..7c387666262 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -110,7 +111,7 @@ public class ClassWriter extends ClassVisitor {
 
     /**
       * The access_flags field of the JVMS ClassFile structure. This field can contain ASM specific
-      * access flags, such as {@link Opcodes#ACC_DEPRECATED} or {}@link Opcodes#ACC_RECORD}, which are
+      * access flags, such as {@link Opcodes#ACC_DEPRECATED} or {@link Opcodes#ACC_RECORD}, which are
       * removed when generating the ClassFile structure.
       */
     private int accessFlags;
@@ -209,10 +210,10 @@ public class ClassWriter extends ClassVisitor {
     private ByteVector nestMemberClasses;
 
     /** The number_of_classes field of the PermittedSubclasses attribute, or 0. */
-    private int numberOfPermittedSubclassClasses;
+    private int numberOfPermittedSubclasses;
 
     /** The 'classes' array of the PermittedSubclasses attribute, or {@literal null}. */
-    private ByteVector permittedSubclassClasses;
+    private ByteVector permittedSubclasses;
 
     /**
       * The record components of this class, stored in a linked list of {@link RecordComponentWriter}
@@ -285,7 +286,7 @@ public class ClassWriter extends ClassVisitor {
       *     maximum stack size nor the stack frames will be computed for these methods</i>.
       */
     public ClassWriter(final ClassReader classReader, final int flags) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         symbolTable = classReader == null ? new SymbolTable(this) : new SymbolTable(this, classReader);
         if ((flags & COMPUTE_FRAMES) != 0) {
             this.compute = MethodWriter.COMPUTE_ALL_FRAMES;
@@ -403,20 +404,13 @@ public class ClassWriter extends ClassVisitor {
         nestMemberClasses.putShort(symbolTable.addConstantClass(nestMember).index);
     }
 
-    /**
-      * <b>Experimental, use at your own risk.</b>
-      *
-      * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
-      */
     @Override
-    @Deprecated
-    public final void visitPermittedSubclassExperimental(final String permittedSubclass) {
-        if (permittedSubclassClasses == null) {
-            permittedSubclassClasses = new ByteVector();
+    public final void visitPermittedSubclass(final String permittedSubclass) {
+        if (permittedSubclasses == null) {
+            permittedSubclasses = new ByteVector();
         }
-        ++numberOfPermittedSubclassClasses;
-        permittedSubclassClasses.putShort(symbolTable.addConstantClass(permittedSubclass).index);
+        ++numberOfPermittedSubclasses;
+        permittedSubclasses.putShort(symbolTable.addConstantClass(permittedSubclass).index);
     }
 
     @Override
@@ -607,9 +601,9 @@ public class ClassWriter extends ClassVisitor {
             size += 8 + nestMemberClasses.length;
             symbolTable.addConstantUtf8(Constants.NEST_MEMBERS);
         }
-        if (permittedSubclassClasses != null) {
+        if (permittedSubclasses != null) {
             ++attributesCount;
-            size += 8 + permittedSubclassClasses.length;
+            size += 8 + permittedSubclasses.length;
             symbolTable.addConstantUtf8(Constants.PERMITTED_SUBCLASSES);
         }
         int recordComponentCount = 0;
@@ -729,12 +723,12 @@ public class ClassWriter extends ClassVisitor {
                     .putShort(numberOfNestMemberClasses)
                     .putByteArray(nestMemberClasses.data, 0, nestMemberClasses.length);
         }
-        if (permittedSubclassClasses != null) {
+        if (permittedSubclasses != null) {
             result
                     .putShort(symbolTable.addConstantUtf8(Constants.PERMITTED_SUBCLASSES))
-                    .putInt(permittedSubclassClasses.length + 2)
-                    .putShort(numberOfPermittedSubclassClasses)
-                    .putByteArray(permittedSubclassClasses.data, 0, permittedSubclassClasses.length);
+                    .putInt(permittedSubclasses.length + 2)
+                    .putShort(numberOfPermittedSubclasses)
+                    .putByteArray(permittedSubclasses.data, 0, permittedSubclasses.length);
         }
         if ((accessFlags & Opcodes.ACC_RECORD) != 0 || firstRecordComponent != null) {
             result
@@ -783,8 +777,8 @@ public class ClassWriter extends ClassVisitor {
         nestHostClassIndex = 0;
         numberOfNestMemberClasses = 0;
         nestMemberClasses = null;
-        numberOfPermittedSubclassClasses = 0;
-        permittedSubclassClasses = null;
+        numberOfPermittedSubclasses = 0;
+        permittedSubclasses = null;
         firstRecordComponent = null;
         lastRecordComponent = null;
         firstAttribute = null;
@@ -1089,3 +1083,4 @@ public class ClassWriter extends ClassVisitor {
         return getClass().getClassLoader();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ConstantDynamic.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ConstantDynamic.java
index 089c69b261d..457bec9c94a 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ConstantDynamic.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ConstantDynamic.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 import java.util.Arrays;
@@ -207,3 +208,4 @@ public final class ConstantDynamic {
                 + Arrays.toString(bootstrapMethodArguments);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java
index 8599089459a..cc10a3cee72 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 import java.io.DataInputStream;
@@ -250,3 +251,4 @@ final class Constants {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java
index d88d22777d4..9b64452a096 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Context.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -165,3 +166,4 @@ final class Context {
       */
     Object[] currentFrameStackTypes;
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/CurrentFrame.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/CurrentFrame.java
index 7f4351706b1..32a4544dfd7 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/CurrentFrame.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/CurrentFrame.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -84,3 +85,4 @@ final class CurrentFrame extends Frame {
         copyFrom(successor);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java
index 3dc0ae3caf8..3da370335ff 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Edge.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -120,3 +121,4 @@ final class Edge {
         this.nextEdge = nextEdge;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
index 454c57d3191..235229da644 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -69,8 +70,8 @@ public abstract class FieldVisitor {
 
     /**
       * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-      * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      * Opcodes#ASM8}.
+      * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      * Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     protected final int api;
 
@@ -81,8 +82,8 @@ public abstract class FieldVisitor {
       * Constructs a new {@link FieldVisitor}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     public FieldVisitor(final int api) {
         this(api, null);
@@ -97,19 +98,15 @@ public abstract class FieldVisitor {
       * @param fieldVisitor the field visitor to which this visitor must delegate method calls. May be
       *     null.
       */
-    @SuppressWarnings("deprecation")
     public FieldVisitor(final int api, final FieldVisitor fieldVisitor) {
-        if (api != Opcodes.ASM8
+        if (api != Opcodes.ASM9
+                && api != Opcodes.ASM8
                 && api != Opcodes.ASM7
                 && api != Opcodes.ASM6
                 && api != Opcodes.ASM5
-                && api != Opcodes.ASM4
-                && api != Opcodes.ASM9_EXPERIMENTAL) {
+                && api != Opcodes.ASM4) {
             throw new IllegalArgumentException("Unsupported api " + api);
         }
-        if (api == Opcodes.ASM9_EXPERIMENTAL) {
-            Constants.checkAsmExperimental(this);
-        }
         this.api = api;
         this.fv = fieldVisitor;
     }
@@ -174,3 +171,4 @@ public abstract class FieldVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
index ef8c52e02f1..dd3b445056d 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -155,7 +156,7 @@ final class FieldWriter extends FieldVisitor {
             final String descriptor,
             final String signature,
             final Object constantValue) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         this.symbolTable = symbolTable;
         this.accessFlags = access;
         this.nameIndex = symbolTable.addConstantUtf8(name);
@@ -313,3 +314,4 @@ final class FieldWriter extends FieldVisitor {
         attributePrototypes.addAttributes(firstAttribute);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
index 47aa6d5753d..e4c9b420747 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Frame.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -1502,3 +1503,4 @@ class Frame {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java
index c18d6142a0d..991fc6aabf5 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handle.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -217,3 +218,4 @@ public final class Handle {
         return owner + '.' + name + descriptor + " (" + tag + (isInterface ? " itf" : "") + ')';
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java
index 3802f675643..848a6d1e14c 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Handler.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -227,3 +228,4 @@ final class Handler {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java
index 4f1cedaad23..a24413f7663 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Label.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -651,3 +652,4 @@ public class Label {
         return "L" + System.identityHashCode(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodTooLargeException.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodTooLargeException.java
index 82a551a3e3d..6c7252e35fb 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodTooLargeException.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodTooLargeException.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -128,3 +129,4 @@ public final class MethodTooLargeException extends IndexOutOfBoundsException {
         return codeSize;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
index 6bc37b1ec7a..69939c66001 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -110,19 +111,15 @@ public abstract class MethodVisitor {
       * @param methodVisitor the method visitor to which this visitor must delegate method calls. May
       *     be null.
       */
-    @SuppressWarnings("deprecation")
     public MethodVisitor(final int api, final MethodVisitor methodVisitor) {
-        if (api != Opcodes.ASM8
+        if (api != Opcodes.ASM9
+                && api != Opcodes.ASM8
                 && api != Opcodes.ASM7
                 && api != Opcodes.ASM6
                 && api != Opcodes.ASM5
-                && api != Opcodes.ASM4
-                && api != Opcodes.ASM9_EXPERIMENTAL) {
+                && api != Opcodes.ASM4) {
             throw new IllegalArgumentException("Unsupported api " + api);
         }
-        if (api == Opcodes.ASM9_EXPERIMENTAL) {
-            Constants.checkAsmExperimental(this);
-        }
         this.api = api;
         this.mv = methodVisitor;
     }
@@ -815,3 +812,4 @@ public abstract class MethodVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
index 648d523ba95..155d8fc06b1 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -623,7 +624,7 @@ final class MethodWriter extends MethodVisitor {
             final String signature,
             final String[] exceptions,
             final int compute) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         this.symbolTable = symbolTable;
         this.accessFlags = "<init>".equals(name) ? access | Constants.ACC_CONSTRUCTOR : access;
         this.nameIndex = symbolTable.addConstantUtf8(name);
@@ -2422,3 +2423,4 @@ final class MethodWriter extends MethodVisitor {
         attributePrototypes.addAttributes(firstCodeAttribute);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleVisitor.java
index 7ae90f18533..c2308529225 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -96,19 +97,15 @@ public abstract class ModuleVisitor {
       * @param moduleVisitor the module visitor to which this visitor must delegate method calls. May
       *     be null.
       */
-    @SuppressWarnings("deprecation")
     public ModuleVisitor(final int api, final ModuleVisitor moduleVisitor) {
-        if (api != Opcodes.ASM8
+        if (api != Opcodes.ASM9
+                && api != Opcodes.ASM8
                 && api != Opcodes.ASM7
                 && api != Opcodes.ASM6
                 && api != Opcodes.ASM5
-                && api != Opcodes.ASM4
-                && api != Opcodes.ASM9_EXPERIMENTAL) {
+                && api != Opcodes.ASM4) {
             throw new IllegalArgumentException("Unsupported api " + api);
         }
-        if (api == Opcodes.ASM9_EXPERIMENTAL) {
-            Constants.checkAsmExperimental(this);
-        }
         this.api = api;
         this.mv = moduleVisitor;
     }
@@ -214,3 +211,4 @@ public abstract class ModuleVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleWriter.java
index 950b53ee20f..8680488d7a0 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleWriter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ModuleWriter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -125,7 +126,7 @@ final class ModuleWriter extends ModuleVisitor {
     private int mainClassIndex;
 
     ModuleWriter(final SymbolTable symbolTable, final int name, final int access, final int version) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         this.symbolTable = symbolTable;
         this.moduleNameIndex = name;
         this.moduleFlags = access;
@@ -282,3 +283,4 @@ final class ModuleWriter extends ModuleVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
index d1b6d52865c..4123d87cd35 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -79,14 +80,7 @@ public interface Opcodes {
     int ASM6 = 6 << 16 | 0 << 8;
     int ASM7 = 7 << 16 | 0 << 8;
     int ASM8 = 8 << 16 | 0 << 8;
-
-    /**
-      * <i>Experimental, use at your own risk. This field will be renamed when it becomes stable, this
-      * will break existing code using it. Only code compiled with --enable-preview can use this.</i>
-      *
-      * @deprecated This API is experimental.
-      */
-    @Deprecated int ASM9_EXPERIMENTAL = 1 << 24 | 9 << 16 | 0 << 8;
+    int ASM9 = 9 << 16 | 0 << 8;
 
     /*
       * Internal flags used to redirect calls to deprecated methods. For instance, if a visitOldStuff
@@ -163,7 +157,7 @@ public interface Opcodes {
       * <pre>
       * public class StuffVisitor {
       *   &#64;Deprecated public void visitOldStuff(int arg, ...) {
-      *     visitNewStuf(arg | SOURCE_DEPRECATED, ...);
+      *     visitNewStuff(arg | SOURCE_DEPRECATED, ...);
       *   }
       *   public void visitNewStuff(int argAndSource...) {
       *     if ((argAndSource & SOURCE_DEPRECATED) == 0) {
@@ -185,7 +179,7 @@ public interface Opcodes {
       * <p>and there are two cases:
       *
       * <ul>
-      *   <li>call visitOldSuff: in the call to super.visitOldStuff, the source is set to
+      *   <li>call visitOldStuff: in the call to super.visitOldStuff, the source is set to
       *       SOURCE_DEPRECATED and visitNewStuff is called. Here 'do stuff' is run because the source
       *       was previously set to SOURCE_DEPRECATED, and execution eventually returns to
       *       UserStuffVisitor.visitOldStuff, where 'do user stuff' is run.
@@ -590,3 +584,4 @@ public interface Opcodes {
     int IFNULL = 198; // visitJumpInsn
     int IFNONNULL = 199; // -
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentVisitor.java
index 70396a6cfb9..dbca79f4a13 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -68,8 +69,8 @@ package jdk.internal.org.objectweb.asm;
  */
 public abstract class RecordComponentVisitor {
     /**
-      * The ASM API version implemented by this visitor. The value of this field must be {@link
-      * Opcodes#ASM8}.
+      * The ASM API version implemented by this visitor. The value of this field must be one of {@link
+      * Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     protected final int api;
 
@@ -81,7 +82,8 @@ public abstract class RecordComponentVisitor {
     /**
       * Constructs a new {@link RecordComponentVisitor}.
       *
-      * @param api the ASM API version implemented by this visitor. Must be {@link Opcodes#ASM8}.
+      * @param api the ASM API version implemented by this visitor. Must be one of {@link Opcodes#ASM8}
+      *     or {@link Opcodes#ASM9}.
       */
     public RecordComponentVisitor(final int api) {
         this(api, null);
@@ -94,20 +96,16 @@ public abstract class RecordComponentVisitor {
       * @param recordComponentVisitor the record component visitor to which this visitor must delegate
       *     method calls. May be null.
       */
-    @SuppressWarnings("deprecation")
     public RecordComponentVisitor(
             final int api, final RecordComponentVisitor recordComponentVisitor) {
-        if (api != Opcodes.ASM8
+        if (api != Opcodes.ASM9
+                && api != Opcodes.ASM8
                 && api != Opcodes.ASM7
                 && api != Opcodes.ASM6
                 && api != Opcodes.ASM5
-                && api != Opcodes.ASM4
-                && api != Opcodes.ASM9_EXPERIMENTAL) {
+                && api != Opcodes.ASM4) {
             throw new IllegalArgumentException("Unsupported api " + api);
         }
-        if (api == Opcodes.ASM9_EXPERIMENTAL) {
-            Constants.checkAsmExperimental(this);
-        }
         this.api = api;
         this.delegate = recordComponentVisitor;
     }
@@ -180,3 +178,4 @@ public abstract class RecordComponentVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentWriter.java
index 5ec88b4000a..c75130736af 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentWriter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/RecordComponentWriter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 final class RecordComponentWriter extends RecordComponentVisitor {
@@ -125,7 +126,7 @@ final class RecordComponentWriter extends RecordComponentVisitor {
             final String name,
             final String descriptor,
             final String signature) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         this.symbolTable = symbolTable;
         this.nameIndex = symbolTable.addConstantUtf8(name);
         this.descriptorIndex = symbolTable.addConstantUtf8(descriptor);
@@ -254,3 +255,4 @@ final class RecordComponentWriter extends RecordComponentVisitor {
         attributePrototypes.addAttributes(firstAttribute);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Symbol.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Symbol.java
index 630afc5d084..a6b17c650af 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Symbol.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Symbol.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -272,3 +273,4 @@ abstract class Symbol {
         return info;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/SymbolTable.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/SymbolTable.java
index d4af66c2101..2ca923859f4 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/SymbolTable.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/SymbolTable.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -1351,3 +1352,4 @@ final class SymbolTable {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java
index 0302df589e6..3eaa0c54380 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 import java.lang.reflect.Constructor;
@@ -924,3 +925,4 @@ public final class Type {
         return getDescriptor();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
index ae588db91a5..9725e5b0448 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -229,3 +230,4 @@ public final class TypePath {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
index bc8da0604a3..92a1c94eb0f 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm;
 
 /**
@@ -464,3 +465,4 @@ public class TypeReference {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
index b34d5cc4bbb..f319c79456b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.ArrayList;
@@ -185,10 +186,12 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
                     throw new IllegalArgumentException("Invalid return in constructor");
                 case RETURN: // empty stack
                     onMethodExit(opcode);
+                    endConstructorBasicBlockWithoutSuccessor();
                     break;
                 case ATHROW: // 1 before n/a after
                     popValue();
                     onMethodExit(opcode);
+                    endConstructorBasicBlockWithoutSuccessor();
                     break;
                 case NOP:
                 case LALOAD: // remove 2 add 2
@@ -383,6 +386,7 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
                     popValue();
                     break;
                 case RET:
+                    endConstructorBasicBlockWithoutSuccessor();
                     break;
                 default:
                     throw new IllegalArgumentException(INVALID_OPCODE + opcode);
@@ -484,10 +488,10 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
         super.visitMethodInsn(opcodeAndSource, owner, name, descriptor, isInterface);
         int opcode = opcodeAndSource & ~Opcodes.SOURCE_MASK;
 
-        doVisitMethodInsn(opcode, descriptor);
+        doVisitMethodInsn(opcode, name, descriptor);
     }
 
-    private void doVisitMethodInsn(final int opcode, final String descriptor) {
+    private void doVisitMethodInsn(final int opcode, final String name, final String descriptor) {
         if (isConstructor && !superClassConstructorCalled) {
             for (Type argumentType : Type.getArgumentTypes(descriptor)) {
                 popValue();
@@ -502,7 +506,9 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
                     break;
                 case INVOKESPECIAL:
                     Object value = popValue();
-                    if (value == UNINITIALIZED_THIS && !superClassConstructorCalled) {
+                    if (value == UNINITIALIZED_THIS
+                            && !superClassConstructorCalled
+                            && name.equals("<init>")) {
                         superClassConstructorCalled = true;
                         onMethodEnter();
                     }
@@ -528,7 +534,7 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
             final Handle bootstrapMethodHandle,
             final Object... bootstrapMethodArguments) {
         super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
-        doVisitMethodInsn(Opcodes.INVOKEDYNAMIC, descriptor);
+        doVisitMethodInsn(Opcodes.INVOKEDYNAMIC, name, descriptor);
     }
 
     @Override
@@ -560,6 +566,9 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
                 case JSR:
                     pushValue(OTHER);
                     break;
+                case GOTO:
+                    endConstructorBasicBlockWithoutSuccessor();
+                    break;
                 default:
                     break;
             }
@@ -573,6 +582,7 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
         if (isConstructor && !superClassConstructorCalled) {
             popValue();
             addForwardJumps(dflt, labels);
+            endConstructorBasicBlockWithoutSuccessor();
         }
     }
 
@@ -583,6 +593,7 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
         if (isConstructor && !superClassConstructorCalled) {
             popValue();
             addForwardJumps(dflt, labels);
+            endConstructorBasicBlockWithoutSuccessor();
         }
     }
 
@@ -619,6 +630,19 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
         forwardJumpStackFrames.put(label, new ArrayList<>(stackFrame));
     }
 
+    private void endConstructorBasicBlockWithoutSuccessor() {
+        // The next instruction is not reachable from this instruction. If it is dead code, we
+        // should not try to simulate stack operations, and there is no need to insert advices
+        // here. If it is reachable with a backward jump, the only possible case is that the super
+        // class constructor has already been called (backward jumps are forbidden before it is
+        // called). If it is reachable with a forward jump, there are two sub-cases. Either the
+        // super class constructor has already been called when reaching the next instruction, or
+        // it has not been called. But in this case there must be a forwardJumpStackFrames entry
+        // for a Label designating the next instruction, and superClassConstructorCalled will be
+        // reset to false there. We can therefore always reset this field to true here.
+        superClassConstructorCalled = true;
+    }
+
     private Object popValue() {
         return stackFrame.remove(stackFrame.size() - 1);
     }
@@ -676,3 +700,4 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
       */
     protected void onMethodExit(final int opcode) {}
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
index 488764a65ed..9d0c104fa64 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.ArrayList;
@@ -147,7 +148,7 @@ public class AnalyzerAdapter extends MethodVisitor {
             final String name,
             final String descriptor,
             final MethodVisitor methodVisitor) {
-        this(/* latest api = */ Opcodes.ASM8, owner, access, name, descriptor, methodVisitor);
+        this(/* latest api = */ Opcodes.ASM9, owner, access, name, descriptor, methodVisitor);
         if (getClass() != AnalyzerAdapter.class) {
             throw new IllegalStateException();
         }
@@ -157,8 +158,8 @@ public class AnalyzerAdapter extends MethodVisitor {
       * Constructs a new {@link AnalyzerAdapter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param owner the owner's class name.
       * @param access the method's access flags (see {@link Opcodes}).
       * @param name the method's name.
@@ -938,3 +939,4 @@ public class AnalyzerAdapter extends MethodVisitor {
         labels = null;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java
index 937b42f560e..4cadba8cdf1 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/AnnotationRemapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -68,6 +69,12 @@ import jdk.internal.org.objectweb.asm.Opcodes;
  */
 public class AnnotationRemapper extends AnnotationVisitor {
 
+    /**
+      * The descriptor of the visited annotation. May be {@literal null}, for instance for
+      * AnnotationDefault.
+      */
+    protected final String descriptor;
+
     /** The remapper used to remap the types in the visited annotation. */
     protected final Remapper remapper;
 
@@ -75,11 +82,27 @@ public class AnnotationRemapper extends AnnotationVisitor {
       * Constructs a new {@link AnnotationRemapper}. <i>Subclasses must not use this constructor</i>.
       * Instead, they must use the {@link #AnnotationRemapper(int,AnnotationVisitor,Remapper)} version.
       *
-      * @param annotationVisitor the annotation visitor this remapper must deleted to.
+      * @param annotationVisitor the annotation visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited annotation.
+      * @deprecated use {@link #AnnotationRemapper(String, AnnotationVisitor, Remapper)} instead.
       */
+    @Deprecated
     public AnnotationRemapper(final AnnotationVisitor annotationVisitor, final Remapper remapper) {
-        this(/* latest api = */ Opcodes.ASM8, annotationVisitor, remapper);
+        this(/* descriptor = */ null, annotationVisitor, remapper);
+    }
+
+    /**
+      * Constructs a new {@link AnnotationRemapper}. <i>Subclasses must not use this constructor</i>.
+      * Instead, they must use the {@link #AnnotationRemapper(int,String,AnnotationVisitor,Remapper)}
+      * version.
+      *
+      * @param descriptor the descriptor of the visited annotation. May be {@literal null}.
+      * @param annotationVisitor the annotation visitor this remapper must delegate to.
+      * @param remapper the remapper to use to remap the types in the visited annotation.
+      */
+    public AnnotationRemapper(
+            final String descriptor, final AnnotationVisitor annotationVisitor, final Remapper remapper) {
+        this(/* latest api = */ Opcodes.ASM9, descriptor, annotationVisitor, remapper);
     }
 
     /**
@@ -87,44 +110,71 @@ public class AnnotationRemapper extends AnnotationVisitor {
       *
       * @param api the ASM API version supported by this remapper. Must be one of {@link
       *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}
-      * @param annotationVisitor the annotation visitor this remapper must deleted to.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
+      * @param annotationVisitor the annotation visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited annotation.
+      * @deprecated use {@link #AnnotationRemapper(int, String, AnnotationVisitor, Remapper)} instead.
       */
+    @Deprecated
     protected AnnotationRemapper(
             final int api, final AnnotationVisitor annotationVisitor, final Remapper remapper) {
+        this(api, /* descriptor = */ null, annotationVisitor, remapper);
+    }
+
+    /**
+      * Constructs a new {@link AnnotationRemapper}.
+      *
+      * @param api the ASM API version supported by this remapper. Must be one of {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
+      * @param descriptor the descriptor of the visited annotation. May be {@literal null}.
+      * @param annotationVisitor the annotation visitor this remapper must delegate to.
+      * @param remapper the remapper to use to remap the types in the visited annotation.
+      */
+    protected AnnotationRemapper(
+            final int api,
+            final String descriptor,
+            final AnnotationVisitor annotationVisitor,
+            final Remapper remapper) {
         super(api, annotationVisitor);
+        this.descriptor = descriptor;
         this.remapper = remapper;
     }
 
     @Override
     public void visit(final String name, final Object value) {
-        super.visit(name, remapper.mapValue(value));
+        super.visit(mapAnnotationAttributeName(name), remapper.mapValue(value));
     }
 
     @Override
     public void visitEnum(final String name, final String descriptor, final String value) {
-        super.visitEnum(name, remapper.mapDesc(descriptor), value);
+        super.visitEnum(mapAnnotationAttributeName(name), remapper.mapDesc(descriptor), value);
     }
 
     @Override
     public AnnotationVisitor visitAnnotation(final String name, final String descriptor) {
-        AnnotationVisitor annotationVisitor = super.visitAnnotation(name, remapper.mapDesc(descriptor));
+        AnnotationVisitor annotationVisitor =
+                super.visitAnnotation(mapAnnotationAttributeName(name), remapper.mapDesc(descriptor));
         if (annotationVisitor == null) {
             return null;
         } else {
-            return annotationVisitor == av ? this : createAnnotationRemapper(annotationVisitor);
+            return annotationVisitor == av
+                    ? this
+                    : createAnnotationRemapper(descriptor, annotationVisitor);
         }
     }
 
     @Override
     public AnnotationVisitor visitArray(final String name) {
-        AnnotationVisitor annotationVisitor = super.visitArray(name);
+        AnnotationVisitor annotationVisitor = super.visitArray(mapAnnotationAttributeName(name));
         if (annotationVisitor == null) {
             return null;
         } else {
-            return annotationVisitor == av ? this : createAnnotationRemapper(annotationVisitor);
+            return annotationVisitor == av
+                    ? this
+                    : createAnnotationRemapper(/* descriptor = */ null, annotationVisitor);
         }
     }
 
@@ -134,8 +184,63 @@ public class AnnotationRemapper extends AnnotationVisitor {
       *
       * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
       * @return the newly created remapper.
+      * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
       */
+    @Deprecated
     protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
-        return new AnnotationRemapper(api, annotationVisitor, remapper);
+        return new AnnotationRemapper(api, /* descriptor = */ null, annotationVisitor, remapper);
+    }
+
+    /**
+      * Constructs a new remapper for annotations. The default implementation of this method returns a
+      * new {@link AnnotationRemapper}.
+      *
+      * @param descriptor the descriptor of the visited annotation.
+      * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
+      * @return the newly created remapper.
+      */
+    protected AnnotationVisitor createAnnotationRemapper(
+            final String descriptor, final AnnotationVisitor annotationVisitor) {
+        return new AnnotationRemapper(api, descriptor, annotationVisitor, remapper)
+                .orDeprecatedValue(createAnnotationRemapper(annotationVisitor));
+    }
+
+    /**
+      * Returns either this object, or the given one. If the given object is equal to the object
+      * returned by the default implementation of the deprecated createAnnotationRemapper method,
+      * meaning that this method has not been overridden (or only in minor ways, for instance to add
+      * logging), then we can return this object instead, supposed to have been created by the new
+      * createAnnotationRemapper method. Otherwise we must return the given object.
+      *
+      * @param deprecatedAnnotationVisitor the result of a call to the deprecated
+      *     createAnnotationRemapper method.
+      * @return either this object, or the given one.
+      */
+    final AnnotationVisitor orDeprecatedValue(final AnnotationVisitor deprecatedAnnotationVisitor) {
+        if (deprecatedAnnotationVisitor.getClass() == getClass()) {
+            AnnotationRemapper deprecatedAnnotationRemapper =
+                    (AnnotationRemapper) deprecatedAnnotationVisitor;
+            if (deprecatedAnnotationRemapper.api == api
+                    && deprecatedAnnotationRemapper.av == av
+                    && deprecatedAnnotationRemapper.remapper == remapper) {
+                return this;
+            }
+        }
+        return deprecatedAnnotationVisitor;
+    }
+
+    /**
+      * Maps an annotation attribute name with the remapper. Returns the original name unchanged if the
+      * internal name of the annotation is {@literal null}.
+      *
+      * @param name the name of the annotation attribute.
+      * @return the new name of the annotation attribute.
+      */
+    private String mapAnnotationAttributeName(final String name) {
+        if (descriptor == null) {
+            return name;
+        }
+        return remapper.mapAnnotationAttributeName(descriptor, name);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java
index acbf406b8a4..29f6c8de1c3 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ClassRemapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.List;
@@ -100,11 +101,11 @@ public class ClassRemapper extends ClassVisitor {
       * Constructs a new {@link ClassRemapper}. <i>Subclasses must not use this constructor</i>.
       * Instead, they must use the {@link #ClassRemapper(int,ClassVisitor,Remapper)} version.
       *
-      * @param classVisitor the class visitor this remapper must deleted to.
+      * @param classVisitor the class visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited class.
       */
     public ClassRemapper(final ClassVisitor classVisitor, final Remapper remapper) {
-        this(/* latest api = */ Opcodes.ASM8, classVisitor, remapper);
+        this(/* latest api = */ Opcodes.ASM9, classVisitor, remapper);
     }
 
     /**
@@ -112,9 +113,9 @@ public class ClassRemapper extends ClassVisitor {
       *
       * @param api the ASM API version supported by this remapper. Must be one of {@link
       *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
-      * @param classVisitor the class visitor this remapper must deleted to.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
+      * @param classVisitor the class visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited class.
       */
     protected ClassRemapper(final int api, final ClassVisitor classVisitor, final Remapper remapper) {
@@ -150,7 +151,9 @@ public class ClassRemapper extends ClassVisitor {
     public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
         AnnotationVisitor annotationVisitor =
                 super.visitAnnotation(remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null ? null : createAnnotationRemapper(annotationVisitor);
+        return annotationVisitor == null
+                ? null
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -158,7 +161,9 @@ public class ClassRemapper extends ClassVisitor {
             final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) {
         AnnotationVisitor annotationVisitor =
                 super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null ? null : createAnnotationRemapper(annotationVisitor);
+        return annotationVisitor == null
+                ? null
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -249,16 +254,9 @@ public class ClassRemapper extends ClassVisitor {
         super.visitNestMember(remapper.mapType(nestMember));
     }
 
-    /**
-      * <b>Experimental, use at your own risk.</b>.
-      *
-      * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
-      */
     @Override
-    @Deprecated
-    public void visitPermittedSubclassExperimental(final String permittedSubclass) {
-        super.visitPermittedSubclassExperimental(remapper.mapType(permittedSubclass));
+    public void visitPermittedSubclass(final String permittedSubclass) {
+        super.visitPermittedSubclass(remapper.mapType(permittedSubclass));
     }
 
     /**
@@ -289,9 +287,25 @@ public class ClassRemapper extends ClassVisitor {
       *
       * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
       * @return the newly created remapper.
+      * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
       */
+    @Deprecated
     protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
-        return new AnnotationRemapper(api, annotationVisitor, remapper);
+        return new AnnotationRemapper(api, /* descriptor = */ null, annotationVisitor, remapper);
+    }
+
+    /**
+      * Constructs a new remapper for annotations. The default implementation of this method returns a
+      * new {@link AnnotationRemapper}.
+      *
+      * @param descriptor the descriptor of the visited annotation.
+      * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
+      * @return the newly created remapper.
+      */
+    protected AnnotationVisitor createAnnotationRemapper(
+            final String descriptor, final AnnotationVisitor annotationVisitor) {
+        return new AnnotationRemapper(api, descriptor, annotationVisitor, remapper)
+                .orDeprecatedValue(createAnnotationRemapper(annotationVisitor));
     }
 
     /**
@@ -317,3 +331,4 @@ public class ClassRemapper extends ClassVisitor {
         return new RecordComponentRemapper(api, recordComponentVisitor, remapper);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
index 64595f3dace..dd9abb7e0bd 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.ConstantDynamic;
@@ -78,7 +79,7 @@ public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
     private int maxSize;
 
     public CodeSizeEvaluator(final MethodVisitor methodVisitor) {
-        this(/* latest api = */ Opcodes.ASM8, methodVisitor);
+        this(/* latest api = */ Opcodes.ASM9, methodVisitor);
     }
 
     protected CodeSizeEvaluator(final int api, final MethodVisitor methodVisitor) {
@@ -236,3 +237,4 @@ public class CodeSizeEvaluator extends MethodVisitor implements Opcodes {
         super.visitMultiANewArrayInsn(descriptor, numDimensions);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java
index 54fea2e7720..5f4f10a86d1 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/FieldRemapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -77,20 +78,20 @@ public class FieldRemapper extends FieldVisitor {
       * Constructs a new {@link FieldRemapper}. <i>Subclasses must not use this constructor</i>.
       * Instead, they must use the {@link #FieldRemapper(int,FieldVisitor,Remapper)} version.
       *
-      * @param fieldVisitor the field visitor this remapper must deleted to.
+      * @param fieldVisitor the field visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited field.
       */
     public FieldRemapper(final FieldVisitor fieldVisitor, final Remapper remapper) {
-        this(/* latest api = */ Opcodes.ASM8, fieldVisitor, remapper);
+        this(/* latest api = */ Opcodes.ASM9, fieldVisitor, remapper);
     }
 
     /**
       * Constructs a new {@link FieldRemapper}.
       *
-      * @param api the ASM API version supported by this remapper. Must be one of {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link Opcodes#ASM8}.
-      * @param fieldVisitor the field visitor this remapper must deleted to.
+      * @param api the ASM API version supported by this remapper. Must be one of {@link Opcodes#ASM4},
+      *     {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link Opcodes#ASM8}, or
+      *     {@link Opcodes#ASM9}.
+      * @param fieldVisitor the field visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited field.
       */
     protected FieldRemapper(final int api, final FieldVisitor fieldVisitor, final Remapper remapper) {
@@ -102,7 +103,9 @@ public class FieldRemapper extends FieldVisitor {
     public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
         AnnotationVisitor annotationVisitor =
                 super.visitAnnotation(remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null ? null : createAnnotationRemapper(annotationVisitor);
+        return annotationVisitor == null
+                ? null
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -110,7 +113,9 @@ public class FieldRemapper extends FieldVisitor {
             final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) {
         AnnotationVisitor annotationVisitor =
                 super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null ? null : createAnnotationRemapper(annotationVisitor);
+        return annotationVisitor == null
+                ? null
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     /**
@@ -119,8 +124,25 @@ public class FieldRemapper extends FieldVisitor {
       *
       * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
       * @return the newly created remapper.
+      * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
       */
+    @Deprecated
     protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
-        return new AnnotationRemapper(api, annotationVisitor, remapper);
+        return new AnnotationRemapper(api, /* descriptor = */ null, annotationVisitor, remapper);
+    }
+
+    /**
+      * Constructs a new remapper for annotations. The default implementation of this method returns a
+      * new {@link AnnotationRemapper}.
+      *
+      * @param descriptor the descriptor of the visited annotation.
+      * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
+      * @return the newly created remapper.
+      */
+    protected AnnotationVisitor createAnnotationRemapper(
+            final String descriptor, final AnnotationVisitor annotationVisitor) {
+        return new AnnotationRemapper(api, descriptor, annotationVisitor, remapper)
+                .orDeprecatedValue(createAnnotationRemapper(annotationVisitor));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
index 1a18fc5550e..fa9d8ad593b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.ArrayList;
@@ -232,7 +233,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
             final int access,
             final String name,
             final String descriptor) {
-        this(/* latest api = */ Opcodes.ASM8, methodVisitor, access, name, descriptor);
+        this(/* latest api = */ Opcodes.ASM9, methodVisitor, access, name, descriptor);
         if (getClass() != GeneratorAdapter.class) {
             throw new IllegalStateException();
         }
@@ -242,8 +243,8 @@ public class GeneratorAdapter extends LocalVariablesSorter {
       * Constructs a new {@link GeneratorAdapter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param methodVisitor the method visitor to which this adapter delegates calls.
       * @param access the method's access flags (see {@link Opcodes}).
       * @param name the method's name.
@@ -1398,3 +1399,4 @@ public class GeneratorAdapter extends LocalVariablesSorter {
         mark(catchLabel);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
index ba150bf8583..1e1f30d5db7 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.ConstantDynamic;
@@ -83,7 +84,7 @@ public class InstructionAdapter extends MethodVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public InstructionAdapter(final MethodVisitor methodVisitor) {
-        this(/* latest api = */ Opcodes.ASM8, methodVisitor);
+        this(/* latest api = */ Opcodes.ASM9, methodVisitor);
         if (getClass() != InstructionAdapter.class) {
             throw new IllegalStateException();
         }
@@ -93,8 +94,8 @@ public class InstructionAdapter extends MethodVisitor {
       * Constructs a new {@link InstructionAdapter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param methodVisitor the method visitor to which this adapter delegates calls.
       */
     protected InstructionAdapter(final int api, final MethodVisitor methodVisitor) {
@@ -1121,7 +1122,7 @@ public class InstructionAdapter extends MethodVisitor {
             final String owner, final String name, final String descriptor, final boolean isInterface) {
         if (api < Opcodes.ASM5) {
             if (isInterface) {
-                throw new IllegalArgumentException("INVOKEVIRTUAL on interfaces require ASM 5");
+                throw new UnsupportedOperationException("INVOKEVIRTUAL on interfaces require ASM 5");
             }
             invokevirtual(owner, name, descriptor);
             return;
@@ -1159,7 +1160,7 @@ public class InstructionAdapter extends MethodVisitor {
             final String owner, final String name, final String descriptor, final boolean isInterface) {
         if (api < Opcodes.ASM5) {
             if (isInterface) {
-                throw new IllegalArgumentException("INVOKESPECIAL on interfaces require ASM 5");
+                throw new UnsupportedOperationException("INVOKESPECIAL on interfaces require ASM 5");
             }
             invokespecial(owner, name, descriptor);
             return;
@@ -1197,7 +1198,7 @@ public class InstructionAdapter extends MethodVisitor {
             final String owner, final String name, final String descriptor, final boolean isInterface) {
         if (api < Opcodes.ASM5) {
             if (isInterface) {
-                throw new IllegalArgumentException("INVOKESTATIC on interfaces require ASM 5");
+                throw new UnsupportedOperationException("INVOKESTATIC on interfaces require ASM 5");
             }
             invokestatic(owner, name, descriptor);
             return;
@@ -1329,3 +1330,4 @@ public class InstructionAdapter extends MethodVisitor {
         mv.visitLabel(label);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
index deb08e45ebb..7ef4a5108bc 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.AbstractMap;
@@ -130,7 +131,7 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
             final String signature,
             final String[] exceptions) {
         this(
-                /* latest api = */ Opcodes.ASM8,
+                /* latest api = */ Opcodes.ASM9,
                 methodVisitor,
                 access,
                 name,
@@ -146,8 +147,8 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
       * Constructs a new {@link JSRInlinerAdapter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param methodVisitor the method visitor to send the resulting inlined method code to, or <code>
       *     null</code>.
       * @param access the method's access flags (see {@link Opcodes}). This parameter also indicates if
@@ -600,3 +601,4 @@ public class JSRInlinerAdapter extends MethodNode implements Opcodes {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
index c2df9e3c395..aab097156c0 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -112,7 +113,7 @@ public class LocalVariablesSorter extends MethodVisitor {
       */
     public LocalVariablesSorter(
             final int access, final String descriptor, final MethodVisitor methodVisitor) {
-        this(/* latest api = */ Opcodes.ASM8, access, descriptor, methodVisitor);
+        this(/* latest api = */ Opcodes.ASM9, access, descriptor, methodVisitor);
         if (getClass() != LocalVariablesSorter.class) {
             throw new IllegalStateException();
         }
@@ -122,8 +123,8 @@ public class LocalVariablesSorter extends MethodVisitor {
       * Constructs a new {@link LocalVariablesSorter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param access access flags of the adapted method.
       * @param descriptor the method's descriptor (see {@link Type}).
       * @param methodVisitor the method visitor to which this adapter delegates calls.
@@ -381,3 +382,4 @@ public class LocalVariablesSorter extends MethodVisitor {
         return local;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
index 16dc0d8375e..1fcab96f181 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.HashMap;
@@ -291,3 +292,4 @@ public class Method {
         return name.hashCode() ^ descriptor.hashCode();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java
index 29c4df3c6fc..aaa7d3ffe01 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/MethodRemapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -79,21 +80,21 @@ public class MethodRemapper extends MethodVisitor {
       * Constructs a new {@link MethodRemapper}. <i>Subclasses must not use this constructor</i>.
       * Instead, they must use the {@link #MethodRemapper(int,MethodVisitor,Remapper)} version.
       *
-      * @param methodVisitor the method visitor this remapper must deleted to.
+      * @param methodVisitor the method visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited method.
       */
     public MethodRemapper(final MethodVisitor methodVisitor, final Remapper remapper) {
-        this(/* latest api = */ Opcodes.ASM8, methodVisitor, remapper);
+        this(/* latest api = */ Opcodes.ASM9, methodVisitor, remapper);
     }
 
     /**
       * Constructs a new {@link MethodRemapper}.
       *
       * @param api the ASM API version supported by this remapper. Must be one of {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
-      * @param methodVisitor the method visitor this remapper must deleted to.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
+      * @param methodVisitor the method visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited method.
       */
     protected MethodRemapper(
@@ -107,7 +108,7 @@ public class MethodRemapper extends MethodVisitor {
         AnnotationVisitor annotationVisitor = super.visitAnnotationDefault();
         return annotationVisitor == null
                 ? annotationVisitor
-                : createAnnotationRemapper(annotationVisitor);
+                : createAnnotationRemapper(/* descriptor = */ null, annotationVisitor);
     }
 
     @Override
@@ -116,7 +117,7 @@ public class MethodRemapper extends MethodVisitor {
                 super.visitAnnotation(remapper.mapDesc(descriptor), visible);
         return annotationVisitor == null
                 ? annotationVisitor
-                : createAnnotationRemapper(annotationVisitor);
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -126,7 +127,7 @@ public class MethodRemapper extends MethodVisitor {
                 super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible);
         return annotationVisitor == null
                 ? annotationVisitor
-                : createAnnotationRemapper(annotationVisitor);
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -136,7 +137,7 @@ public class MethodRemapper extends MethodVisitor {
                 super.visitParameterAnnotation(parameter, remapper.mapDesc(descriptor), visible);
         return annotationVisitor == null
                 ? annotationVisitor
-                : createAnnotationRemapper(annotationVisitor);
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -240,7 +241,7 @@ public class MethodRemapper extends MethodVisitor {
                 super.visitInsnAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible);
         return annotationVisitor == null
                 ? annotationVisitor
-                : createAnnotationRemapper(annotationVisitor);
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -256,7 +257,7 @@ public class MethodRemapper extends MethodVisitor {
                 super.visitTryCatchAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible);
         return annotationVisitor == null
                 ? annotationVisitor
-                : createAnnotationRemapper(annotationVisitor);
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -290,7 +291,7 @@ public class MethodRemapper extends MethodVisitor {
                         typeRef, typePath, start, end, index, remapper.mapDesc(descriptor), visible);
         return annotationVisitor == null
                 ? annotationVisitor
-                : createAnnotationRemapper(annotationVisitor);
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     /**
@@ -299,8 +300,25 @@ public class MethodRemapper extends MethodVisitor {
       *
       * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
       * @return the newly created remapper.
+      * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
       */
+    @Deprecated
     protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
-        return new AnnotationRemapper(api, annotationVisitor, remapper);
+        return new AnnotationRemapper(api, /* descriptor = */ null, annotationVisitor, remapper);
+    }
+
+    /**
+      * Constructs a new remapper for annotations. The default implementation of this method returns a
+      * new {@link AnnotationRemapper}.
+      *
+      * @param descriptor the descriptor of the visited annotation.
+      * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
+      * @return the newly created remapper.
+      */
+    protected AnnotationVisitor createAnnotationRemapper(
+            final String descriptor, final AnnotationVisitor annotationVisitor) {
+        return new AnnotationRemapper(api, descriptor, annotationVisitor, remapper)
+                .orDeprecatedValue(createAnnotationRemapper(annotationVisitor));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleHashesAttribute.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleHashesAttribute.java
index 8786f195685..5b4cc253c39 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleHashesAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleHashesAttribute.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.ArrayList;
@@ -133,7 +134,7 @@ public final class ModuleHashesAttribute extends Attribute {
             currentOffset += 2;
             byte[] hash = new byte[hashLength];
             for (int j = 0; j < hashLength; ++j) {
-                hash[j] = (byte) (classReader.readByte(currentOffset) & 0xFF);
+                hash[j] = (byte) classReader.readByte(currentOffset);
                 currentOffset += 1;
             }
             hashList.add(hash);
@@ -167,3 +168,4 @@ public final class ModuleHashesAttribute extends Attribute {
         return byteVector;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleRemapper.java
index fdfc7c48207..f04e2f0322e 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleRemapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.ModuleVisitor;
@@ -75,11 +76,11 @@ public class ModuleRemapper extends ModuleVisitor {
       * Constructs a new {@link ModuleRemapper}. <i>Subclasses must not use this constructor</i>.
       * Instead, they must use the {@link #ModuleRemapper(int,ModuleVisitor,Remapper)} version.
       *
-      * @param moduleVisitor the module visitor this remapper must deleted to.
+      * @param moduleVisitor the module visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited module.
       */
     public ModuleRemapper(final ModuleVisitor moduleVisitor, final Remapper remapper) {
-        this(/* latest api = */ Opcodes.ASM8, moduleVisitor, remapper);
+        this(/* latest api = */ Opcodes.ASM9, moduleVisitor, remapper);
     }
 
     /**
@@ -87,9 +88,9 @@ public class ModuleRemapper extends ModuleVisitor {
       *
       * @param api the ASM API version supported by this remapper. Must be one of {@link
       *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
-      * @param moduleVisitor the module visitor this remapper must deleted to.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
+      * @param moduleVisitor the module visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited module.
       */
     protected ModuleRemapper(
@@ -151,3 +152,4 @@ public class ModuleRemapper extends ModuleVisitor {
         super.visitProvide(remapper.mapType(service), remappedProviders);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleResolutionAttribute.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleResolutionAttribute.java
index f862ddcce8d..8187ad30e0c 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleResolutionAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleResolutionAttribute.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.Attribute;
@@ -141,3 +142,4 @@ public final class ModuleResolutionAttribute extends Attribute {
         return byteVector;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleTargetAttribute.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleTargetAttribute.java
index 998adcf8b42..4d92734a972 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleTargetAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/ModuleTargetAttribute.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.Attribute;
@@ -115,3 +116,4 @@ public final class ModuleTargetAttribute extends Attribute {
         return byteVector;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RecordComponentRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RecordComponentRemapper.java
index 531a371c545..6974b05d71e 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RecordComponentRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RecordComponentRemapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -83,14 +84,14 @@ public class RecordComponentRemapper extends RecordComponentVisitor {
       */
     public RecordComponentRemapper(
             final RecordComponentVisitor recordComponentVisitor, final Remapper remapper) {
-        this(/* latest api = */ Opcodes.ASM8, recordComponentVisitor, remapper);
+        this(/* latest api = */ Opcodes.ASM9, recordComponentVisitor, remapper);
     }
 
     /**
       * Constructs a new {@link RecordComponentRemapper}.
       *
-      * @param api the ASM API version supported by this remapper. Must be {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
+      * @param api the ASM API version supported by this remapper. Must be one of {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
       * @param recordComponentVisitor the record component visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited record component.
       */
@@ -104,7 +105,9 @@ public class RecordComponentRemapper extends RecordComponentVisitor {
     public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
         AnnotationVisitor annotationVisitor =
                 super.visitAnnotation(remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null ? null : createAnnotationRemapper(annotationVisitor);
+        return annotationVisitor == null
+                ? null
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     @Override
@@ -112,7 +115,9 @@ public class RecordComponentRemapper extends RecordComponentVisitor {
             final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) {
         AnnotationVisitor annotationVisitor =
                 super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null ? null : createAnnotationRemapper(annotationVisitor);
+        return annotationVisitor == null
+                ? null
+                : createAnnotationRemapper(descriptor, annotationVisitor);
     }
 
     /**
@@ -121,8 +126,25 @@ public class RecordComponentRemapper extends RecordComponentVisitor {
       *
       * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
       * @return the newly created remapper.
+      * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
       */
+    @Deprecated
     protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
-        return new AnnotationRemapper(api, annotationVisitor, remapper);
+        return new AnnotationRemapper(api, /* descriptor = */ null, annotationVisitor, remapper);
+    }
+
+    /**
+      * Constructs a new remapper for annotations. The default implementation of this method returns a
+      * new {@link AnnotationRemapper}.
+      *
+      * @param descriptor the descriptor sof the visited annotation.
+      * @param annotationVisitor the AnnotationVisitor the remapper must delegate to.
+      * @return the newly created remapper.
+      */
+    protected AnnotationVisitor createAnnotationRemapper(
+            final String descriptor, final AnnotationVisitor annotationVisitor) {
+        return new AnnotationRemapper(api, descriptor, annotationVisitor, remapper)
+                .orDeprecatedValue(createAnnotationRemapper(annotationVisitor));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
index de0e11889cc..0439b4054e2 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.ConstantDynamic;
@@ -266,6 +267,18 @@ public abstract class Remapper {
         return new SignatureRemapper(signatureVisitor, this);
     }
 
+    /**
+      * Maps an annotation attribute name. The default implementation of this method returns the given
+      * name, unchanged. Subclasses can override.
+      *
+      * @param descriptor the descriptor of the annotation class.
+      * @param name the name of the annotation attribute.
+      * @return the new name of the annotation attribute.
+      */
+    public String mapAnnotationAttributeName(final String descriptor, final String name) {
+        return name;
+    }
+
     /**
       * Maps an inner class name to its new name. The default implementation of this method provides a
       * strategy that will work for inner classes produced by Java, but not necessarily other
@@ -376,3 +389,4 @@ public abstract class Remapper {
         return internalName;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
index 6347464f455..0f41cff5354 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
@@ -74,7 +74,7 @@ public class RemappingAnnotationAdapter extends AnnotationVisitor {
 
     public RemappingAnnotationAdapter(
             final AnnotationVisitor annotationVisitor, final Remapper remapper) {
-        this(Opcodes.ASM6, annotationVisitor, remapper);
+        this(Opcodes.ASM9, annotationVisitor, remapper);
     }
 
     protected RemappingAnnotationAdapter(
@@ -113,3 +113,4 @@ public class RemappingAnnotationAdapter extends AnnotationVisitor {
                         : new RemappingAnnotationAdapter(annotationVisitor, remapper));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
deleted file mode 100644
index 11af9d0d9da..00000000000
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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:
- *
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
- */
-package jdk.internal.org.objectweb.asm.commons;
-
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.FieldVisitor;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.ModuleVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.TypePath;
-
-/**
- * A {@link ClassVisitor} for type remapping.
- *
- * @deprecated use {@link ClassRemapper} instead.
- * @author Eugene Kuleshov
- */
-@Deprecated
-public class RemappingClassAdapter extends ClassVisitor {
-
-    protected final Remapper remapper;
-
-    protected String className;
-
-    public RemappingClassAdapter(final ClassVisitor classVisitor, final Remapper remapper) {
-        this(Opcodes.ASM6, classVisitor, remapper);
-    }
-
-    protected RemappingClassAdapter(
-            final int api, final ClassVisitor classVisitor, final Remapper remapper) {
-        super(api, classVisitor);
-        this.remapper = remapper;
-    }
-
-    @Override
-    public void visit(
-            final int version,
-            final int access,
-            final String name,
-            final String signature,
-            final String superName,
-            final String[] interfaces) {
-        this.className = name;
-        super.visit(
-                version,
-                access,
-                remapper.mapType(name),
-                remapper.mapSignature(signature, false),
-                remapper.mapType(superName),
-                interfaces == null ? null : remapper.mapTypes(interfaces));
-    }
-
-    @Override
-    public ModuleVisitor visitModule(final String name, final int flags, final String version) {
-        throw new RuntimeException("RemappingClassAdapter is deprecated, use ClassRemapper instead");
-    }
-
-    @Override
-    public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
-        AnnotationVisitor annotationVisitor =
-                super.visitAnnotation(remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null ? null : createRemappingAnnotationAdapter(annotationVisitor);
-    }
-
-    @Override
-    public AnnotationVisitor visitTypeAnnotation(
-            final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) {
-        AnnotationVisitor annotationVisitor =
-                super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null ? null : createRemappingAnnotationAdapter(annotationVisitor);
-    }
-
-    @Override
-    public FieldVisitor visitField(
-            final int access,
-            final String name,
-            final String descriptor,
-            final String signature,
-            final Object value) {
-        FieldVisitor fieldVisitor =
-                super.visitField(
-                        access,
-                        remapper.mapFieldName(className, name, descriptor),
-                        remapper.mapDesc(descriptor),
-                        remapper.mapSignature(signature, true),
-                        remapper.mapValue(value));
-        return fieldVisitor == null ? null : createRemappingFieldAdapter(fieldVisitor);
-    }
-
-    @Override
-    public MethodVisitor visitMethod(
-            final int access,
-            final String name,
-            final String descriptor,
-            final String signature,
-            final String[] exceptions) {
-        String newDescriptor = remapper.mapMethodDesc(descriptor);
-        MethodVisitor methodVisitor =
-                super.visitMethod(
-                        access,
-                        remapper.mapMethodName(className, name, descriptor),
-                        newDescriptor,
-                        remapper.mapSignature(signature, false),
-                        exceptions == null ? null : remapper.mapTypes(exceptions));
-        return methodVisitor == null
-                ? null
-                : createRemappingMethodAdapter(access, newDescriptor, methodVisitor);
-    }
-
-    @Override
-    public void visitInnerClass(
-            final String name, final String outerName, final String innerName, final int access) {
-        super.visitInnerClass(
-                remapper.mapType(name),
-                outerName == null ? null : remapper.mapType(outerName),
-                innerName,
-                access);
-    }
-
-    @Override
-    public void visitOuterClass(final String owner, final String name, final String descriptor) {
-        super.visitOuterClass(
-                remapper.mapType(owner),
-                name == null ? null : remapper.mapMethodName(owner, name, descriptor),
-                descriptor == null ? null : remapper.mapMethodDesc(descriptor));
-    }
-
-    protected FieldVisitor createRemappingFieldAdapter(final FieldVisitor fieldVisitor) {
-        return new RemappingFieldAdapter(fieldVisitor, remapper);
-    }
-
-    protected MethodVisitor createRemappingMethodAdapter(
-            final int access, final String newDescriptor, final MethodVisitor methodVisitior) {
-        return new RemappingMethodAdapter(access, newDescriptor, methodVisitior, remapper);
-    }
-
-    protected AnnotationVisitor createRemappingAnnotationAdapter(final AnnotationVisitor av) {
-        return new RemappingAnnotationAdapter(av, remapper);
-    }
-}
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
deleted file mode 100644
index 3fa8ccfb899..00000000000
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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:
- *
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
- */
-package jdk.internal.org.objectweb.asm.commons;
-
-import jdk.internal.org.objectweb.asm.AnnotationVisitor;
-import jdk.internal.org.objectweb.asm.FieldVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.TypePath;
-
-/**
- * A {@link FieldVisitor} adapter for type remapping.
- *
- * @deprecated use {@link FieldRemapper} instead.
- * @author Eugene Kuleshov
- */
-@Deprecated
-public class RemappingFieldAdapter extends FieldVisitor {
-
-    private final Remapper remapper;
-
-    public RemappingFieldAdapter(final FieldVisitor fieldVisitor, final Remapper remapper) {
-        this(Opcodes.ASM6, fieldVisitor, remapper);
-    }
-
-    protected RemappingFieldAdapter(
-            final int api, final FieldVisitor fieldVisitor, final Remapper remapper) {
-        super(api, fieldVisitor);
-        this.remapper = remapper;
-    }
-
-    @Override
-    public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
-        AnnotationVisitor annotationVisitor = fv.visitAnnotation(remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null
-                ? null
-                : new RemappingAnnotationAdapter(annotationVisitor, remapper);
-    }
-
-    @Override
-    public AnnotationVisitor visitTypeAnnotation(
-            final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) {
-        AnnotationVisitor annotationVisitor =
-                super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible);
-        return annotationVisitor == null
-                ? null
-                : new RemappingAnnotationAdapter(annotationVisitor, remapper);
-    }
-}
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
index e9a43253004..68ad22a4793 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
@@ -81,7 +81,7 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
             final String descriptor,
             final MethodVisitor methodVisitor,
             final Remapper remapper) {
-        this(Opcodes.ASM6, access, descriptor, methodVisitor, remapper);
+        this(Opcodes.ASM9, access, descriptor, methodVisitor, remapper);
     }
 
     protected RemappingMethodAdapter(
@@ -307,3 +307,4 @@ public class RemappingMethodAdapter extends LocalVariablesSorter {
                 : new RemappingAnnotationAdapter(annotationVisitor, remapper);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
deleted file mode 100644
index decfabd49e1..00000000000
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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:
- *
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
- */
-package jdk.internal.org.objectweb.asm.commons;
-
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.signature.SignatureVisitor;
-
-/**
- * A {@link SignatureVisitor} adapter for type mapping.
- *
- * @deprecated use {@link SignatureRemapper} instead.
- * @author Eugene Kuleshov
- */
-@Deprecated
-public class RemappingSignatureAdapter extends SignatureVisitor {
-
-    private final SignatureVisitor signatureVisitor;
-
-    private final Remapper remapper;
-
-    private String className;
-
-    public RemappingSignatureAdapter(
-            final SignatureVisitor signatureVisitor, final Remapper remapper) {
-        this(Opcodes.ASM6, signatureVisitor, remapper);
-    }
-
-    protected RemappingSignatureAdapter(
-            final int api, final SignatureVisitor signatureVisitor, final Remapper remapper) {
-        super(api);
-        this.signatureVisitor = signatureVisitor;
-        this.remapper = remapper;
-    }
-
-    @Override
-    public void visitClassType(final String name) {
-        className = name;
-        signatureVisitor.visitClassType(remapper.mapType(name));
-    }
-
-    @Override
-    public void visitInnerClassType(final String name) {
-        String remappedOuter = remapper.mapType(className) + '$';
-        className = className + '$' + name;
-        String remappedName = remapper.mapType(className);
-        int index =
-                remappedName.startsWith(remappedOuter)
-                        ? remappedOuter.length()
-                        : remappedName.lastIndexOf('$') + 1;
-        signatureVisitor.visitInnerClassType(remappedName.substring(index));
-    }
-
-    @Override
-    public void visitFormalTypeParameter(final String name) {
-        signatureVisitor.visitFormalTypeParameter(name);
-    }
-
-    @Override
-    public void visitTypeVariable(final String name) {
-        signatureVisitor.visitTypeVariable(name);
-    }
-
-    @Override
-    public SignatureVisitor visitArrayType() {
-        signatureVisitor.visitArrayType();
-        return this;
-    }
-
-    @Override
-    public void visitBaseType(final char descriptor) {
-        signatureVisitor.visitBaseType(descriptor);
-    }
-
-    @Override
-    public SignatureVisitor visitClassBound() {
-        signatureVisitor.visitClassBound();
-        return this;
-    }
-
-    @Override
-    public SignatureVisitor visitExceptionType() {
-        signatureVisitor.visitExceptionType();
-        return this;
-    }
-
-    @Override
-    public SignatureVisitor visitInterface() {
-        signatureVisitor.visitInterface();
-        return this;
-    }
-
-    @Override
-    public SignatureVisitor visitInterfaceBound() {
-        signatureVisitor.visitInterfaceBound();
-        return this;
-    }
-
-    @Override
-    public SignatureVisitor visitParameterType() {
-        signatureVisitor.visitParameterType();
-        return this;
-    }
-
-    @Override
-    public SignatureVisitor visitReturnType() {
-        signatureVisitor.visitReturnType();
-        return this;
-    }
-
-    @Override
-    public SignatureVisitor visitSuperclass() {
-        signatureVisitor.visitSuperclass();
-        return this;
-    }
-
-    @Override
-    public void visitTypeArgument() {
-        signatureVisitor.visitTypeArgument();
-    }
-
-    @Override
-    public SignatureVisitor visitTypeArgument(final char wildcard) {
-        signatureVisitor.visitTypeArgument(wildcard);
-        return this;
-    }
-
-    @Override
-    public void visitEnd() {
-        signatureVisitor.visitEnd();
-    }
-}
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
index 727a5ff3c14..74c7542a270 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.io.ByteArrayOutputStream;
@@ -181,7 +182,7 @@ public class SerialVersionUIDAdder extends ClassVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public SerialVersionUIDAdder(final ClassVisitor classVisitor) {
-        this(/* latest api = */ Opcodes.ASM8, classVisitor);
+        this(/* latest api = */ Opcodes.ASM9, classVisitor);
         if (getClass() != SerialVersionUIDAdder.class) {
             throw new IllegalStateException();
         }
@@ -191,8 +192,8 @@ public class SerialVersionUIDAdder extends ClassVisitor {
       * Constructs a new {@link SerialVersionUIDAdder}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param classVisitor a {@link ClassVisitor} to which this visitor will delegate calls.
       */
     protected SerialVersionUIDAdder(final int api, final ClassVisitor classVisitor) {
@@ -349,7 +350,7 @@ public class SerialVersionUIDAdder extends ClassVisitor {
     }
 
     /**
-      * Adds a static final serialVersionUID field to the class, with the given value.
+      * Adds a final static serialVersionUID field to the class, with the given value.
       *
       * @param svuid the serialVersionUID field value.
       */
@@ -522,3 +523,4 @@ public class SerialVersionUIDAdder extends ClassVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java
index 0de4b5630f0..81209e1bd64 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SignatureRemapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.ArrayList;
@@ -79,11 +80,11 @@ public class SignatureRemapper extends SignatureVisitor {
       * Constructs a new {@link SignatureRemapper}. <i>Subclasses must not use this constructor</i>.
       * Instead, they must use the {@link #SignatureRemapper(int,SignatureVisitor,Remapper)} version.
       *
-      * @param signatureVisitor the signature visitor this remapper must deleted to.
+      * @param signatureVisitor the signature visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited signature.
       */
     public SignatureRemapper(final SignatureVisitor signatureVisitor, final Remapper remapper) {
-        this(/* latest api = */ Opcodes.ASM8, signatureVisitor, remapper);
+        this(/* latest api = */ Opcodes.ASM9, signatureVisitor, remapper);
     }
 
     /**
@@ -91,9 +92,9 @@ public class SignatureRemapper extends SignatureVisitor {
       *
       * @param api the ASM API version supported by this remapper. Must be one of {@link
       *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5},{@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
-      * @param signatureVisitor the signature visitor this remapper must deleted to.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
+      * @param signatureVisitor the signature visitor this remapper must delegate to.
       * @param remapper the remapper to use to remap the types in the visited signature.
       */
     protected SignatureRemapper(
@@ -203,3 +204,4 @@ public class SignatureRemapper extends SignatureVisitor {
         classNames.remove(classNames.size() - 1);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
index 3e166379f6b..314738e3b2e 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.Collections;
@@ -80,8 +81,9 @@ public class SimpleRemapper extends Remapper {
       *           name.
       *       <li>for invokedynamic method names, the key is the name and descriptor of the method (in
       *           the form .&lt;name&gt;&lt;descriptor&gt;), and the value is the new method name.
-      *       <li>for field names, the key is the owner and name of the field (in the form
-      *           &lt;owner&gt;.&lt;name&gt;), and the value is the new field name.
+      *       <li>for field and attribute names, the key is the owner and name of the field or
+      *           attribute (in the form &lt;owner&gt;.&lt;name&gt;), and the value is the new field
+      *           name.
       *       <li>for internal names, the key is the old internal name, and the value is the new
       *           internal name.
       *     </ul>
@@ -113,6 +115,12 @@ public class SimpleRemapper extends Remapper {
         return remappedName == null ? name : remappedName;
     }
 
+    @Override
+    public String mapAnnotationAttributeName(final String descriptor, final String name) {
+        String remappedName = map(descriptor + '.' + name);
+        return remappedName == null ? name : remappedName;
+    }
+
     @Override
     public String mapFieldName(final String owner, final String name, final String descriptor) {
         String remappedName = map(owner + '.' + name);
@@ -124,3 +132,4 @@ public class SimpleRemapper extends Remapper {
         return mapping.get(key);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
index 3d803deb17d..b92e721a55e 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.ClassVisitor;
@@ -92,15 +93,15 @@ public class StaticInitMerger extends ClassVisitor {
       *     null.
       */
     public StaticInitMerger(final String prefix, final ClassVisitor classVisitor) {
-        this(/* latest api = */ Opcodes.ASM8, prefix, classVisitor);
+        this(/* latest api = */ Opcodes.ASM9, prefix, classVisitor);
     }
 
     /**
       * Constructs a new {@link StaticInitMerger}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param prefix the prefix to use to rename the existing &lt;clinit&gt; methods.
       * @param classVisitor the class visitor to which this visitor must delegate method calls. May be
       *     null.
@@ -154,3 +155,4 @@ public class StaticInitMerger extends ClassVisitor {
         super.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
index 2eecf0c3c76..69db3287c40 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import jdk.internal.org.objectweb.asm.Label;
@@ -80,3 +81,4 @@ public interface TableSwitchGenerator {
     /** Generates the code for the default switch case. */
     void generateDefault();
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
index 61431f190df..f64766572d2 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.commons;
 
 import java.util.Collections;
@@ -101,7 +102,7 @@ public class TryCatchBlockSorter extends MethodNode {
             final String signature,
             final String[] exceptions) {
         this(
-                /* latest api = */ Opcodes.ASM8,
+                /* latest api = */ Opcodes.ASM9,
                 methodVisitor,
                 access,
                 name,
@@ -154,3 +155,4 @@ public class TryCatchBlockSorter extends MethodNode {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
index 29d451d7045..9870ea5f72b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.signature;
 
 /**
@@ -281,3 +282,4 @@ public class SignatureReader {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
index 32600c7d5b4..cbfee22ecd8 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.signature;
 
 import jdk.internal.org.objectweb.asm.Opcodes;
@@ -102,14 +103,13 @@ public abstract class SignatureVisitor {
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
       *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
       */
-    @SuppressWarnings("deprecation")
     public SignatureVisitor(final int api) {
-        if (api != Opcodes.ASM8
+        if (api != Opcodes.ASM9
+                && api != Opcodes.ASM8
                 && api != Opcodes.ASM7
                 && api != Opcodes.ASM6
                 && api != Opcodes.ASM5
-                && api != Opcodes.ASM4
-                && api != Opcodes.ASM9_EXPERIMENTAL) {
+                && api != Opcodes.ASM4) {
             throw new IllegalArgumentException("Unsupported api " + api);
         }
         this.api = api;
@@ -238,3 +238,4 @@ public abstract class SignatureVisitor {
     /** Ends the visit of a signature corresponding to a class or interface type. */
     public void visitEnd() {}
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
index 68f8b46cb86..eceaaee424c 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.signature;
 
 import jdk.internal.org.objectweb.asm.Opcodes;
@@ -101,7 +102,7 @@ public class SignatureWriter extends SignatureVisitor {
 
     /** Constructs a new {@link SignatureWriter}. */
     public SignatureWriter() {
-        super(/* latest api =*/ Opcodes.ASM8);
+        super(/* latest api =*/ Opcodes.ASM9);
     }
 
     // -----------------------------------------------------------------------------------------------
@@ -269,3 +270,4 @@ public class SignatureWriter extends SignatureVisitor {
         argumentStack /= 2;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
index 35bfd9bd423..28b17cecc2b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.ArrayList;
@@ -294,3 +295,4 @@ public abstract class AbstractInsnNode {
         return this;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
index b18690a6672..d6e874221f6 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.ArrayList;
@@ -91,7 +92,7 @@ public class AnnotationNode extends AnnotationVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public AnnotationNode(final String descriptor) {
-        this(/* latest api = */ Opcodes.ASM8, descriptor);
+        this(/* latest api = */ Opcodes.ASM9, descriptor);
         if (getClass() != AnnotationNode.class) {
             throw new IllegalStateException();
         }
@@ -101,8 +102,8 @@ public class AnnotationNode extends AnnotationVisitor {
       * Constructs a new {@link AnnotationNode}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param descriptor the class descriptor of the annotation class.
       */
     public AnnotationNode(final int api, final String descriptor) {
@@ -116,7 +117,7 @@ public class AnnotationNode extends AnnotationVisitor {
       * @param values where the visited values must be stored.
       */
     AnnotationNode(final List<Object> values) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         this.values = values;
     }
 
@@ -205,7 +206,7 @@ public class AnnotationNode extends AnnotationVisitor {
       * introduced in more recent versions of the ASM API than the given version.
       *
       * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}, {@link Opcodes#ASM5},
-      *     {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link Opcodes#ASM8}.
+      *     {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     public void check(final int api) {
         // nothing to do
@@ -260,3 +261,4 @@ public class AnnotationNode extends AnnotationVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
index 1f12a83b639..56bfc584b1a 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.ArrayList;
@@ -158,14 +159,8 @@ public class ClassNode extends ClassVisitor {
     /** The internal names of the nest members of this class. May be {@literal null}. */
     public List<String> nestMembers;
 
-    /**
-      * <b>Experimental, use at your own risk. This method will be renamed when it becomes stable, this
-      * will break existing code using it</b>. The internal names of the permitted subclasses of this
-      * class. May be {@literal null}.
-      *
-      * @deprecated this API is experimental.
-      */
-    @Deprecated public List<String> permittedSubclassesExperimental;
+    /** The internal names of the permitted subclasses of this class. May be {@literal null}. */
+    public List<String> permittedSubclasses;
 
     /** The record components of this class. May be {@literal null}. */
     public List<RecordComponentNode> recordComponents;
@@ -183,7 +178,7 @@ public class ClassNode extends ClassVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public ClassNode() {
-        this(Opcodes.ASM8);
+        this(Opcodes.ASM9);
         if (getClass() != ClassNode.class) {
             throw new IllegalStateException();
         }
@@ -193,8 +188,8 @@ public class ClassNode extends ClassVisitor {
       * Constructs a new {@link ClassNode}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8}, or {@link Opcodes#ASM9}.
       */
     public ClassNode(final int api) {
         super(api);
@@ -281,16 +276,9 @@ public class ClassNode extends ClassVisitor {
         nestMembers = Util.add(nestMembers, nestMember);
     }
 
-    /**
-      * <b>Experimental, use at your own risk.</b>.
-      *
-      * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
-      */
     @Override
-    @Deprecated
-    public void visitPermittedSubclassExperimental(final String permittedSubclass) {
-        permittedSubclassesExperimental = Util.add(permittedSubclassesExperimental, permittedSubclass);
+    public void visitPermittedSubclass(final String permittedSubclass) {
+        permittedSubclasses = Util.add(permittedSubclasses, permittedSubclass);
     }
 
     @Override
@@ -347,11 +335,10 @@ public class ClassNode extends ClassVisitor {
       * in more recent versions of the ASM API than the given version.
       *
       * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}, {@link Opcodes#ASM5},
-      *     {@link Opcodes#ASM6}, {@link Opcodes#ASM7}. or {@link Opcodes#ASM8}.
+      *     {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
-    @SuppressWarnings("deprecation")
     public void check(final int api) {
-        if (api != Opcodes.ASM9_EXPERIMENTAL && permittedSubclassesExperimental != null) {
+        if (api < Opcodes.ASM9 && permittedSubclasses != null) {
             throw new UnsupportedClassVersionException();
         }
         if (api < Opcodes.ASM8 && ((access & Opcodes.ACC_RECORD) != 0 || recordComponents != null)) {
@@ -410,7 +397,6 @@ public class ClassNode extends ClassVisitor {
       *
       * @param classVisitor a class visitor.
       */
-    @SuppressWarnings("deprecation")
     public void accept(final ClassVisitor classVisitor) {
         // Visit the header.
         String[] interfacesArray = new String[this.interfaces.size()];
@@ -473,10 +459,10 @@ public class ClassNode extends ClassVisitor {
                 classVisitor.visitNestMember(nestMembers.get(i));
             }
         }
-        // Visit the permitted subclass.
-        if (permittedSubclassesExperimental != null) {
-            for (int i = 0, n = permittedSubclassesExperimental.size(); i < n; ++i) {
-                classVisitor.visitPermittedSubclassExperimental(permittedSubclassesExperimental.get(i));
+        // Visit the permitted subclasses.
+        if (permittedSubclasses != null) {
+            for (int i = 0, n = permittedSubclasses.size(); i < n; ++i) {
+                classVisitor.visitPermittedSubclass(permittedSubclasses.get(i));
             }
         }
         // Visit the inner classes.
@@ -500,3 +486,4 @@ public class ClassNode extends ClassVisitor {
         classVisitor.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
index a340f675c12..8dd491246e8 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -125,3 +126,4 @@ public class FieldInsnNode extends AbstractInsnNode {
         return new FieldInsnNode(opcode, owner, name, desc).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
index 93f03da4667..a5034342003 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -130,7 +131,7 @@ public class FieldNode extends FieldVisitor {
             final String descriptor,
             final String signature,
             final Object value) {
-        this(/* latest api = */ Opcodes.ASM8, access, name, descriptor, signature, value);
+        this(/* latest api = */ Opcodes.ASM9, access, name, descriptor, signature, value);
         if (getClass() != FieldNode.class) {
             throw new IllegalStateException();
         }
@@ -140,8 +141,8 @@ public class FieldNode extends FieldVisitor {
       * Constructs a new {@link FieldNode}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param access the field's access flags (see {@link jdk.internal.org.objectweb.asm.Opcodes}). This parameter
       *     also indicates if the field is synthetic and/or deprecated.
       * @param name the field's name.
@@ -274,3 +275,4 @@ public class FieldNode extends FieldVisitor {
         fieldVisitor.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
index aa929d00a40..cd4cc5c57ad 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.ArrayList;
@@ -217,3 +218,4 @@ public class FrameNode extends AbstractInsnNode {
         return array;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
index a445a27e076..c3cdf60337c 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -103,3 +104,4 @@ public class IincInsnNode extends AbstractInsnNode {
         return new IincInsnNode(var, incr).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
index 129bbfa36ff..7ab29379ca8 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import jdk.internal.org.objectweb.asm.ClassVisitor;
@@ -114,3 +115,4 @@ public class InnerClassNode {
         classVisitor.visitInnerClass(name, outerName, innerName, access);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
index 4290c469e2f..a375eb0ce88 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.ListIterator;
@@ -518,12 +519,19 @@ public class InsnList implements Iterable<AbstractInsnNode> {
         AbstractInsnNode remove;
 
         InsnListIterator(final int index) {
-            if (index == size()) {
+            if (index < 0 || index > size()) {
+                throw new IndexOutOfBoundsException();
+            } else if (index == size()) {
                 nextInsn = null;
                 previousInsn = getLast();
             } else {
-                nextInsn = get(index);
-                previousInsn = nextInsn.previousInsn;
+                AbstractInsnNode currentInsn = getFirst();
+                for (int i = 0; i < index; i++) {
+                    currentInsn = currentInsn.nextInsn;
+                }
+
+                nextInsn = currentInsn;
+                previousInsn = currentInsn.previousInsn;
             }
         }
 
@@ -626,3 +634,4 @@ public class InsnList implements Iterable<AbstractInsnNode> {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
index 6c231722a58..8fed9db1949 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -102,3 +103,4 @@ public class InsnNode extends AbstractInsnNode {
         return new InsnNode(opcode).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
index 82f885c35a0..5da8824ea99 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -108,3 +109,4 @@ public class IntInsnNode extends AbstractInsnNode {
         return new IntInsnNode(opcode, operand).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
index 46878f23b5d..0d934f2ab73 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -121,3 +122,4 @@ public class InvokeDynamicInsnNode extends AbstractInsnNode {
         return new InvokeDynamicInsnNode(name, desc, bsm, bsmArgs).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
index e1f1eb28dd0..8790ff32246 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -116,3 +117,4 @@ public class JumpInsnNode extends AbstractInsnNode {
         return new JumpInsnNode(opcode, clone(label, clonedLabels)).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
index 182c54ce10e..6edcc0d99d1 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -108,3 +109,4 @@ public class LabelNode extends AbstractInsnNode {
         value = null;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
index 23309524dce..20eafcaa656 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
@@ -56,11 +56,15 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
+import jdk.internal.org.objectweb.asm.ConstantDynamic;
+import jdk.internal.org.objectweb.asm.Handle;
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
 
 /**
  * A node that represents an LDC instruction.
@@ -70,17 +74,23 @@ import jdk.internal.org.objectweb.asm.Opcodes;
 public class LdcInsnNode extends AbstractInsnNode {
 
     /**
-      * The constant to be loaded on the stack. This parameter must be a non null {@link Integer}, a
-      * {@link Float}, a {@link Long}, a {@link Double}, a {@link String} or a {@link
-      * jdk.internal.org.objectweb.asm.Type}.
+      * The constant to be loaded on the stack. This field must be a non null {@link Integer}, a {@link
+      * Float}, a {@link Long}, a {@link Double}, a {@link String}, a {@link Type} of OBJECT or ARRAY
+      * sort for {@code .class} constants, for classes whose version is 49, a {@link Type} of METHOD
+      * sort for MethodType, a {@link Handle} for MethodHandle constants, for classes whose version is
+      * 51 or a {@link ConstantDynamic} for a constant dynamic for classes whose version is 55.
       */
     public Object cst;
 
     /**
       * Constructs a new {@link LdcInsnNode}.
       *
-      * @param value the constant to be loaded on the stack. This parameter must be a non null {@link
-      *     Integer}, a {@link Float}, a {@link Long}, a {@link Double} or a {@link String}.
+      * @param value the constant to be loaded on the stack. This parameter mist be a non null {@link
+      *     Integer}, a {@link Float}, a {@link Long}, a {@link Double}, a {@link String}, a {@link
+      *     Type} of OBJECT or ARRAY sort for {@code .class} constants, for classes whose version is
+      *     49, a {@link Type} of METHOD sort for MethodType, a {@link Handle} for MethodHandle
+      *     constants, for classes whose version is 51 or a {@link ConstantDynamic} for a constant
+      *     dynamic for classes whose version is 55.
       */
     public LdcInsnNode(final Object value) {
         super(Opcodes.LDC);
@@ -103,3 +113,4 @@ public class LdcInsnNode extends AbstractInsnNode {
         return new LdcInsnNode(cst).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
index 92cbac23838..ac882ed7783 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -103,3 +104,4 @@ public class LineNumberNode extends AbstractInsnNode {
         return new LineNumberNode(line, clone(start, clonedLabels));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
index c17e80847c2..54701d78214 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -114,15 +115,15 @@ public class LocalVariableAnnotationNode extends TypeAnnotationNode {
             final LabelNode[] end,
             final int[] index,
             final String descriptor) {
-        this(/* latest api = */ Opcodes.ASM8, typeRef, typePath, start, end, index, descriptor);
+        this(/* latest api = */ Opcodes.ASM9, typeRef, typePath, start, end, index, descriptor);
     }
 
     /**
       * Constructs a new {@link LocalVariableAnnotationNode}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param typeRef a reference to the annotated type. See {@link jdk.internal.org.objectweb.asm.TypeReference}.
       * @param start the fist instructions corresponding to the continuous ranges that make the scope
       *     of this local variable (inclusive).
@@ -169,3 +170,4 @@ public class LocalVariableAnnotationNode extends TypeAnnotationNode {
                         typeRef, typePath, startLabels, endLabels, indices, desc, visible));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
index 3a62f0e35c4..142c5915a06 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import jdk.internal.org.objectweb.asm.MethodVisitor;
@@ -121,3 +122,4 @@ public class LocalVariableNode {
                 name, desc, signature, start.getLabel(), end.getLabel(), index);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
index 73e0c633a64..513f2c06cfa 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -122,3 +123,4 @@ public class LookupSwitchInsnNode extends AbstractInsnNode {
         return clone.cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
index 0b6ff98c89b..9c5f40d6517 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -152,3 +153,4 @@ public class MethodInsnNode extends AbstractInsnNode {
         return new MethodInsnNode(opcode, owner, name, desc, itf).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
index 7161391b87e..6af5c517fa9 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.ArrayList;
@@ -186,7 +187,7 @@ public class MethodNode extends MethodVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public MethodNode() {
-        this(/* latest api = */ Opcodes.ASM8);
+        this(/* latest api = */ Opcodes.ASM9);
         if (getClass() != MethodNode.class) {
             throw new IllegalStateException();
         }
@@ -196,8 +197,8 @@ public class MethodNode extends MethodVisitor {
       * Constructs an uninitialized {@link MethodNode}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     public MethodNode(final int api) {
         super(api);
@@ -223,7 +224,7 @@ public class MethodNode extends MethodVisitor {
             final String descriptor,
             final String signature,
             final String[] exceptions) {
-        this(/* latest api = */ Opcodes.ASM8, access, name, descriptor, signature, exceptions);
+        this(/* latest api = */ Opcodes.ASM9, access, name, descriptor, signature, exceptions);
         if (getClass() != MethodNode.class) {
             throw new IllegalStateException();
         }
@@ -233,8 +234,8 @@ public class MethodNode extends MethodVisitor {
       * Constructs a new {@link MethodNode}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param access the method's access flags (see {@link Opcodes}). This parameter also indicates if
       *     the method is synthetic and/or deprecated.
       * @param name the method's name.
@@ -599,7 +600,7 @@ public class MethodNode extends MethodVisitor {
       * in more recent versions of the ASM API than the given version.
       *
       * @param api an ASM API version. Must be one of {@link Opcodes#ASM4}, {@link Opcodes#ASM5},
-      *     {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link Opcodes#ASM8}.
+      *     {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     public void check(final int api) {
         if (api == Opcodes.ASM4) {
@@ -803,3 +804,4 @@ public class MethodNode extends MethodVisitor {
         methodVisitor.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleExportNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleExportNode.java
index 9d872820da0..094c2e19300 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleExportNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleExportNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -108,3 +109,4 @@ public class ModuleExportNode {
                 packaze, access, modules == null ? null : modules.toArray(new String[0]));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleNode.java
index 8c48d4e8c9c..fcb9db550f0 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.ArrayList;
@@ -115,7 +116,7 @@ public class ModuleNode extends ModuleVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public ModuleNode(final String name, final int access, final String version) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         if (getClass() != ModuleNode.class) {
             throw new IllegalStateException();
         }
@@ -129,7 +130,7 @@ public class ModuleNode extends ModuleVisitor {
       * Constructs a {@link ModuleNode}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link Opcodes#ASM8}.
+      *     Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param name the fully qualified name (using dots) of the module.
       * @param access the module access flags, among {@code ACC_OPEN}, {@code ACC_SYNTHETIC} and {@code
       *     ACC_MANDATED}.
@@ -264,3 +265,4 @@ public class ModuleNode extends ModuleVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleOpenNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleOpenNode.java
index baecf6bf4e0..afc453ef3b1 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleOpenNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleOpenNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -108,3 +109,4 @@ public class ModuleOpenNode {
                 packaze, access, modules == null ? null : modules.toArray(new String[0]));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleProvideNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleProvideNode.java
index a191a43aa5a..3370aafe5f2 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleProvideNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleProvideNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -95,3 +96,4 @@ public class ModuleProvideNode {
         moduleVisitor.visitProvide(service, providers.toArray(new String[0]));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleRequireNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleRequireNode.java
index 15ccc4a7bdc..cec5ebcdbd2 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleRequireNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ModuleRequireNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import jdk.internal.org.objectweb.asm.ModuleVisitor;
@@ -102,3 +103,4 @@ public class ModuleRequireNode {
         moduleVisitor.visitRequire(module, access, version);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
index fde74ab7f31..201fb7652d6 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -103,3 +104,4 @@ public class MultiANewArrayInsnNode extends AbstractInsnNode {
         return new MultiANewArrayInsnNode(desc, dims).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java
index 30b85c2f49b..cb90eb6db5e 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import jdk.internal.org.objectweb.asm.MethodVisitor;
@@ -97,3 +98,4 @@ public class ParameterNode {
         methodVisitor.visitParameter(name, access);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/RecordComponentNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/RecordComponentNode.java
index 0c7f10eeeb9..7eb919b7bbb 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/RecordComponentNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/RecordComponentNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -107,7 +108,7 @@ public class RecordComponentNode extends RecordComponentVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public RecordComponentNode(final String name, final String descriptor, final String signature) {
-        this(/* latest api = */ Opcodes.ASM8, name, descriptor, signature);
+        this(/* latest api = */ Opcodes.ASM9, name, descriptor, signature);
         if (getClass() != RecordComponentNode.class) {
             throw new IllegalStateException();
         }
@@ -116,7 +117,8 @@ public class RecordComponentNode extends RecordComponentVisitor {
     /**
       * Constructs a new {@link RecordComponentNode}.
       *
-      * @param api the ASM API version implemented by this visitor. Must be {@link Opcodes#ASM8}.
+      * @param api the ASM API version implemented by this visitor. Must be one of {@link Opcodes#ASM8}
+      *     or {@link Opcodes#ASM9}.
       * @param name the record component name.
       * @param descriptor the record component descriptor (see {@link jdk.internal.org.objectweb.asm.Type}).
       * @param signature the record component signature.
@@ -175,7 +177,7 @@ public class RecordComponentNode extends RecordComponentVisitor {
       * method checks that this node, and all its children recursively, do not contain elements that
       * were introduced in more recent versions of the ASM API than the given version.
       *
-      * @param api an ASM API version. Must be {@link Opcodes#ASM8}.
+      * @param api an ASM API version. Must be one of {@link Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     public void check(final int api) {
         if (api < Opcodes.ASM8) {
@@ -232,3 +234,4 @@ public class RecordComponentNode extends RecordComponentVisitor {
         recordComponentVisitor.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
index 1dbf92548a4..cabc1553c69 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -122,3 +123,4 @@ public class TableSwitchInsnNode extends AbstractInsnNode {
                 .cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
index e172cde4cc6..fe033a5bc7c 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.List;
@@ -155,3 +156,4 @@ public class TryCatchBlockNode {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java
index 83b34af1318..023882bca2d 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import jdk.internal.org.objectweb.asm.Opcodes;
@@ -90,7 +91,7 @@ public class TypeAnnotationNode extends AnnotationNode {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public TypeAnnotationNode(final int typeRef, final TypePath typePath, final String descriptor) {
-        this(/* latest api = */ Opcodes.ASM8, typeRef, typePath, descriptor);
+        this(/* latest api = */ Opcodes.ASM9, typeRef, typePath, descriptor);
         if (getClass() != TypeAnnotationNode.class) {
             throw new IllegalStateException();
         }
@@ -100,8 +101,8 @@ public class TypeAnnotationNode extends AnnotationNode {
       * Constructs a new {@link AnnotationNode}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param typeRef a reference to the annotated type. See {@link jdk.internal.org.objectweb.asm.TypeReference}.
       * @param typePath the path to the annotated type argument, wildcard bound, array element type, or
       *     static inner type within 'typeRef'. May be {@literal null} if the annotation targets
@@ -115,3 +116,4 @@ public class TypeAnnotationNode extends AnnotationNode {
         this.typePath = typePath;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
index 1bc6f3275a3..3ebdfab6cee 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -114,3 +115,4 @@ public class TypeInsnNode extends AbstractInsnNode {
         return new TypeInsnNode(opcode, desc).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/UnsupportedClassVersionException.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/UnsupportedClassVersionException.java
index 8eb50e4c055..17f9ebb2e35 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/UnsupportedClassVersionException.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/UnsupportedClassVersionException.java
@@ -55,7 +55,8 @@
  * 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.
- */package jdk.internal.org.objectweb.asm.tree;
+ */
+package jdk.internal.org.objectweb.asm.tree;
 
 /**
  * Exception thrown in {@link AnnotationNode#check}, {@link ClassNode#check}, {@link
@@ -69,3 +70,4 @@ public class UnsupportedClassVersionException extends RuntimeException {
 
     private static final long serialVersionUID = -3502347765891805831L;
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java
index 38e30fa1340..eeb7261bb9a 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.ArrayList;
@@ -192,3 +193,4 @@ final class Util {
         return list;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
index 7c41463b09b..df6d834a6c0 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree;
 
 import java.util.Map;
@@ -111,3 +112,4 @@ public class VarInsnNode extends AbstractInsnNode {
         return new VarInsnNode(opcode, var).cloneAnnotations(this);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
index 31b879291f3..8c5e315ff09 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.ArrayList;
@@ -124,7 +125,8 @@ public class Analyzer<V extends Value> implements Opcodes {
       * Analyzes the given method.
       *
       * @param owner the internal name of the class to which 'method' belongs.
-      * @param method the method to be analyzed.
+      * @param method the method to be analyzed. The maxStack and maxLocals fields must have correct
+      *     values.
       * @return the symbolic state of the execution stack frame at each bytecode instruction of the
       *     method. The size of the returned array is equal to the number of instructions (and labels)
       *     of the method. A given frame is {@literal null} if and only if the corresponding
@@ -330,6 +332,74 @@ public class Analyzer<V extends Value> implements Opcodes {
         return frames;
     }
 
+    /**
+      * Analyzes the given method and computes and sets its maximum stack size and maximum number of
+      * local variables.
+      *
+      * @param owner the internal name of the class to which 'method' belongs.
+      * @param method the method to be analyzed.
+      * @return the symbolic state of the execution stack frame at each bytecode instruction of the
+      *     method. The size of the returned array is equal to the number of instructions (and labels)
+      *     of the method. A given frame is {@literal null} if and only if the corresponding
+      *     instruction cannot be reached (dead code).
+      * @throws AnalyzerException if a problem occurs during the analysis.
+      */
+    public Frame<V>[] analyzeAndComputeMaxs(final String owner, final MethodNode method)
+            throws AnalyzerException {
+        method.maxLocals = computeMaxLocals(method);
+        method.maxStack = -1;
+        analyze(owner, method);
+        method.maxStack = computeMaxStack(frames);
+        return frames;
+    }
+
+    /**
+      * Computes and returns the maximum number of local variables used in the given method.
+      *
+      * @param method a method.
+      * @return the maximum number of local variables used in the given method.
+      */
+    private static int computeMaxLocals(final MethodNode method) {
+        int maxLocals = Type.getArgumentsAndReturnSizes(method.desc) >> 2;
+        for (AbstractInsnNode insnNode : method.instructions) {
+            if (insnNode instanceof VarInsnNode) {
+                int local = ((VarInsnNode) insnNode).var;
+                int size =
+                        (insnNode.getOpcode() == Opcodes.LLOAD
+                                        || insnNode.getOpcode() == Opcodes.DLOAD
+                                        || insnNode.getOpcode() == Opcodes.LSTORE
+                                        || insnNode.getOpcode() == Opcodes.DSTORE)
+                                ? 2
+                                : 1;
+                maxLocals = Math.max(maxLocals, local + size);
+            } else if (insnNode instanceof IincInsnNode) {
+                int local = ((IincInsnNode) insnNode).var;
+                maxLocals = Math.max(maxLocals, local + 1);
+            }
+        }
+        return maxLocals;
+    }
+
+    /**
+      * Computes and returns the maximum stack size of a method, given its stack map frames.
+      *
+      * @param frames the stack map frames of a method.
+      * @return the maximum stack size of the given method.
+      */
+    private static int computeMaxStack(final Frame<?>[] frames) {
+        int maxStack = 0;
+        for (Frame<?> frame : frames) {
+            if (frame != null) {
+                int stackSize = 0;
+                for (int i = 0; i < frame.getStackSize(); ++i) {
+                    stackSize += frame.getStack(i).getSize();
+                }
+                maxStack = Math.max(maxStack, stackSize);
+            }
+        }
+        return maxStack;
+    }
+
     /**
       * Follows the control flow graph of the currently analyzed method, starting at the given
       * instruction index, and stores a copy of the given subroutine in {@link #subroutines} for each
@@ -632,3 +702,4 @@ public class Analyzer<V extends Value> implements Opcodes {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
index c74f873a80c..e3ea04720be 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import jdk.internal.org.objectweb.asm.tree.AbstractInsnNode;
@@ -118,3 +119,4 @@ public class AnalyzerException extends Exception {
         this.node = insn;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
index 0b7997e5092..d640e0a06f8 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.List;
@@ -92,7 +93,7 @@ public class BasicInterpreter extends Interpreter<BasicValue> implements Opcodes
       * version.
       */
     public BasicInterpreter() {
-        super(/* latest api = */ ASM8);
+        super(/* latest api = */ ASM9);
         if (getClass() != BasicInterpreter.class) {
             throw new IllegalStateException();
         }
@@ -103,8 +104,8 @@ public class BasicInterpreter extends Interpreter<BasicValue> implements Opcodes
       *
       * @param api the ASM API version supported by this interpreter. Must be one of {@link
       *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
       */
     protected BasicInterpreter(final int api) {
         super(api);
@@ -406,3 +407,4 @@ public class BasicInterpreter extends Interpreter<BasicValue> implements Opcodes
         return value1;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
index fea4e140d0f..58b57120ebd 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import jdk.internal.org.objectweb.asm.Type;
@@ -158,3 +159,4 @@ public class BasicValue implements Value {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
index dd89834c3c5..7a3b6b8ab63 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.List;
@@ -78,7 +79,7 @@ public class BasicVerifier extends BasicInterpreter {
       * use this constructor</i>. Instead, they must use the {@link #BasicVerifier(int)} version.
       */
     public BasicVerifier() {
-        super(/* latest api = */ ASM8);
+        super(/* latest api = */ ASM9);
         if (getClass() != BasicVerifier.class) {
             throw new IllegalStateException();
         }
@@ -89,8 +90,8 @@ public class BasicVerifier extends BasicInterpreter {
       *
       * @param api the ASM API version supported by this interpreter. Must be one of {@link
       *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
       */
     protected BasicVerifier(final int api) {
         super(api);
@@ -480,3 +481,4 @@ public class BasicVerifier extends BasicInterpreter {
         return value.equals(expected);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
index 1e57017c704..ddb477d6f7b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.ArrayList;
@@ -80,6 +81,9 @@ import jdk.internal.org.objectweb.asm.tree.VarInsnNode;
  */
 public class Frame<V extends Value> {
 
+    /** The maximum size of the operand stack of any method. */
+    private static final int MAX_STACK_SIZE = 65536;
+
     /**
       * The expected return type of the analyzed method, or {@literal null} if the method returns void.
       */
@@ -88,26 +92,43 @@ public class Frame<V extends Value> {
     /**
       * The local variables and the operand stack of this frame. The first {@link #numLocals} elements
       * correspond to the local variables. The following {@link #numStack} elements correspond to the
-      * operand stack.
+      * operand stack. Long and double values are represented with two elements in the local variables
+      * section, and with one element in the operand stack section.
       */
     private V[] values;
 
-    /** The number of local variables of this frame. */
+    /**
+      * The number of local variables of this frame. Long and double values are represented with two
+      * elements.
+      */
     private int numLocals;
 
-    /** The number of elements in the operand stack. */
+    /**
+      * The number of elements in the operand stack. Long and double values are represented with a
+      * single element.
+      */
     private int numStack;
 
+    /**
+      * The maximum number of elements in the operand stack. Long and double values are represented
+      * with a single element.
+      */
+    private int maxStack;
+
     /**
       * Constructs a new frame with the given size.
       *
-      * @param numLocals the maximum number of local variables of the frame.
-      * @param numStack the maximum stack size of the frame.
+      * @param numLocals the number of local variables of the frame. Long and double values are
+      *     represented with two elements.
+      * @param maxStack the maximum number of elements in the operand stack, or -1 if there is no
+      *     maximum value. Long and double values are represented with a single element.
       */
     @SuppressWarnings("unchecked")
-    public Frame(final int numLocals, final int numStack) {
-        this.values = (V[]) new Value[numLocals + numStack];
+    public Frame(final int numLocals, final int maxStack) {
+        this.values = (V[]) new Value[numLocals + (maxStack >= 0 ? maxStack : 4)];
         this.numLocals = numLocals;
+        this.numStack = 0;
+        this.maxStack = maxStack >= 0 ? maxStack : MAX_STACK_SIZE;
     }
 
     /**
@@ -128,8 +149,14 @@ public class Frame<V extends Value> {
       */
     public Frame<V> init(final Frame<? extends V> frame) {
         returnValue = frame.returnValue;
-        System.arraycopy(frame.values, 0, values, 0, values.length);
+        if (values.length < frame.values.length) {
+            values = frame.values.clone();
+        } else {
+            System.arraycopy(frame.values, 0, values, 0, frame.values.length);
+        }
+        numLocals = frame.numLocals;
         numStack = frame.numStack;
+        maxStack = frame.maxStack;
         return this;
     }
 
@@ -166,7 +193,8 @@ public class Frame<V extends Value> {
     }
 
     /**
-      * Returns the maximum number of local variables of this frame.
+      * Returns the maximum number of local variables of this frame. Long and double values are
+      * represented with two variables.
       *
       * @return the maximum number of local variables of this frame.
       */
@@ -175,16 +203,18 @@ public class Frame<V extends Value> {
     }
 
     /**
-      * Returns the maximum stack size of this frame.
+      * Returns the maximum number of elements in the operand stack of this frame. Long and double
+      * values are represented with a single element.
       *
-      * @return the maximum stack size of this frame.
+      * @return the maximum number of elements in the operand stack of this frame.
       */
     public int getMaxStackSize() {
-        return values.length - numLocals;
+        return maxStack;
     }
 
     /**
-      * Returns the value of the given local variable.
+      * Returns the value of the given local variable. Long and double values are represented with two
+      * variables.
       *
       * @param index a local variable index.
       * @return the value of the given local variable.
@@ -198,7 +228,8 @@ public class Frame<V extends Value> {
     }
 
     /**
-      * Sets the value of the given local variable.
+      * Sets the value of the given local variable. Long and double values are represented with two
+      * variables.
       *
       * @param index a local variable index.
       * @param value the new value of this local variable.
@@ -212,10 +243,10 @@ public class Frame<V extends Value> {
     }
 
     /**
-      * Returns the number of values in the operand stack of this frame. Long and double values are
-      * treated as single values.
+      * Returns the number of elements in the operand stack of this frame. Long and double values are
+      * represented with a single element.
       *
-      * @return the number of values in the operand stack of this frame.
+      * @return the number of elements in the operand stack of this frame.
       */
     public int getStackSize() {
         return numStack;
@@ -267,9 +298,15 @@ public class Frame<V extends Value> {
       * @param value the value that must be pushed into the stack.
       * @throws IndexOutOfBoundsException if the operand stack is full.
       */
+    @SuppressWarnings("unchecked")
     public void push(final V value) {
         if (numLocals + numStack >= values.length) {
-            throw new IndexOutOfBoundsException("Insufficient maximum stack size.");
+            if (numLocals + numStack >= maxStack) {
+                throw new IndexOutOfBoundsException("Insufficient maximum stack size.");
+            }
+            V[] oldValues = values;
+            values = (V[]) new Value[2 * values.length];
+            System.arraycopy(oldValues, 0, values, 0, oldValues.length);
         }
         values[numLocals + (numStack++)] = value;
     }
@@ -745,3 +782,4 @@ public class Frame<V extends Value> {
         return stringBuilder.toString();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
index d9b722e098e..ed8deff4022 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.List;
@@ -297,3 +298,4 @@ public abstract class Interpreter<V extends Value> {
       */
     public abstract V merge(V value1, V value2);
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
index 0e14dcc9864..cb426dea398 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.List;
@@ -125,7 +126,7 @@ public class SimpleVerifier extends BasicVerifier {
             final List<Type> currentClassInterfaces,
             final boolean isInterface) {
         this(
-                /* latest api = */ ASM8,
+                /* latest api = */ ASM9,
                 currentClass,
                 currentSuperClass,
                 currentClassInterfaces,
@@ -141,8 +142,8 @@ public class SimpleVerifier extends BasicVerifier {
       *
       * @param api the ASM API version supported by this verifier. Must be one of {@link
       *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
       * @param currentClass the type of the class to be verified.
       * @param currentSuperClass the type of the super class of the class to be verified.
       * @param currentClassInterfaces the types of the interfaces directly implemented by the class to
@@ -411,3 +412,4 @@ public class SimpleVerifier extends BasicVerifier {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
index 6f8ad5621bc..099a7377944 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.AbstractSet;
@@ -227,3 +228,4 @@ final class SmallSet<T> extends AbstractSet<T> {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
index 786aed688ca..bb242af2ff5 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.HashSet;
@@ -82,7 +83,7 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements Opcod
       * version.
       */
     public SourceInterpreter() {
-        super(/* latest api = */ ASM8);
+        super(/* latest api = */ ASM9);
         if (getClass() != SourceInterpreter.class) {
             throw new IllegalStateException();
         }
@@ -93,8 +94,8 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements Opcod
       *
       * @param api the ASM API version supported by this interpreter. Must be one of {@link
       *     jdk.internal.org.objectweb.asm.Opcodes#ASM4}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM5}, {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7} or {@link
-      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8}.
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM6}, {@link jdk.internal.org.objectweb.asm.Opcodes#ASM7}, {@link
+      *     jdk.internal.org.objectweb.asm.Opcodes#ASM8} or or {@link jdk.internal.org.objectweb.asm.Opcodes#ASM9}.
       */
     protected SourceInterpreter(final int api) {
         super(api);
@@ -251,3 +252,4 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements Opcod
         return self.containsAll(other);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
index eb0f619b913..926c2c28314 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.Set;
@@ -148,3 +149,4 @@ public class SourceValue implements Value {
         return insns.hashCode();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
index 1b38879edb1..f59644795d7 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 import java.util.ArrayList;
@@ -135,3 +136,4 @@ final class Subroutine {
         return changed;
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
index 5c8f0c97c17..450120c741a 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.tree.analysis;
 
 /**
@@ -73,3 +74,4 @@ public interface Value {
       */
     int getSize();
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
deleted file mode 100644
index 541f145a0f5..00000000000
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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:
- *
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
- */
-package jdk.internal.org.objectweb.asm.util;
-
-import java.util.Map;
-import jdk.internal.org.objectweb.asm.Label;
-
-/**
- * An {@link jdk.internal.org.objectweb.asm.Attribute} that can generate the ASM code to create an equivalent
- * attribute.
- *
- * @author Eugene Kuleshov
- */
-// DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
-public interface ASMifiable {
-
-    /**
-      * Generates the ASM code to create an attribute equal to this attribute.
-      *
-      * @param outputBuffer where the generated code must be appended.
-      * @param visitorVariableName the name of the visitor variable in the produced code.
-      * @param labelNames the names of the labels in the generated code.
-      */
-    void asmify(StringBuffer outputBuffer, String visitorVariableName, Map<Label, String> labelNames);
-}
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
index b6d0267e748..3db7eba438b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.io.IOException;
@@ -84,7 +85,7 @@ public class ASMifier extends Printer {
     /** The help message shown when command line arguments are incorrect. */
     private static final String USAGE =
             "Prints the ASM code to generate the given class.\n"
-                    + "Usage: ASMifier [-debug] <fully qualified class name or class file name>";
+                    + "Usage: ASMifier [-nodebug] <fully qualified class name or class file name>";
 
     /** A pseudo access flag used to distinguish class access flags. */
     private static final int ACCESS_CLASS = 0x40000;
@@ -136,6 +137,9 @@ public class ASMifier extends Printer {
         classVersions.put(Opcodes.V13, "V13");
         classVersions.put(Opcodes.V14, "V14");
         classVersions.put(Opcodes.V15, "V15");
+        classVersions.put(Opcodes.V16, "V16");
+        classVersions.put(Opcodes.V17, "V17");
+        classVersions.put(Opcodes.V18, "V18");
         CLASS_VERSIONS = Collections.unmodifiableMap(classVersions);
     }
 
@@ -155,7 +159,7 @@ public class ASMifier extends Printer {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public ASMifier() {
-        this(/* latest api = */ Opcodes.ASM8, "classWriter", 0);
+        this(/* latest api = */ Opcodes.ASM9, "classWriter", 0);
         if (getClass() != ASMifier.class) {
             throw new IllegalStateException();
         }
@@ -165,7 +169,8 @@ public class ASMifier extends Printer {
       * Constructs a new {@link ASMifier}.
       *
       * @param api the ASM API version implemented by this class. Must be one of {@link Opcodes#ASM4},
-      *     {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link Opcodes#ASM8}.
+      *     {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link Opcodes#ASM8} or
+      *     {@link Opcodes#ASM9}.
       * @param visitorVariableName the name of the visitor variable in the produced code.
       * @param annotationVisitorId identifier of the annotation visitor variable in the produced code.
       */
@@ -179,7 +184,7 @@ public class ASMifier extends Printer {
     /**
       * Prints the ASM source code to generate the given class to the standard output.
       *
-      * <p>Usage: ASMifier [-debug] &lt;binary class name or class file name&gt;
+      * <p>Usage: ASMifier [-nodebug] &lt;binary class name or class file name&gt;
       *
       * @param args the command line arguments.
       * @throws IOException if the class cannot be found, or if an IOException occurs.
@@ -191,7 +196,7 @@ public class ASMifier extends Printer {
     /**
       * Prints the ASM source code to generate the given class to the given output.
       *
-      * <p>Usage: ASMifier [-debug] &lt;binary class name or class file name&gt;
+      * <p>Usage: ASMifier [-nodebug] &lt;binary class name or class file name&gt;
       *
       * @param args the command line arguments.
       * @param output where to print the result.
@@ -354,17 +359,10 @@ public class ASMifier extends Printer {
         text.add(stringBuilder.toString());
     }
 
-    /**
-      * <b>Experimental, use at your own risk.</b>.
-      *
-      * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
-      */
     @Override
-    @Deprecated
-    public void visitPermittedSubclassExperimental(final String permittedSubclass) {
+    public void visitPermittedSubclass(final String permittedSubclass) {
         stringBuilder.setLength(0);
-        stringBuilder.append("classWriter.visitPermittedSubclassExperimental(");
+        stringBuilder.append("classWriter.visitPermittedSubclass(");
         appendConstant(permittedSubclass);
         stringBuilder.append(END_PARAMETERS);
         text.add(stringBuilder.toString());
@@ -664,9 +662,7 @@ public class ASMifier extends Printer {
 
     @Override
     public void visitRecordComponentEnd() {
-        stringBuilder.setLength(0);
-        stringBuilder.append(name).append(VISIT_END);
-        text.add(stringBuilder.toString());
+        visitMemberEnd();
     }
 
     // -----------------------------------------------------------------------------------------------
@@ -691,9 +687,7 @@ public class ASMifier extends Printer {
 
     @Override
     public void visitFieldEnd() {
-        stringBuilder.setLength(0);
-        stringBuilder.append(name).append(VISIT_END);
-        text.add(stringBuilder.toString());
+        visitMemberEnd();
     }
 
     // -----------------------------------------------------------------------------------------------
@@ -1166,9 +1160,7 @@ public class ASMifier extends Printer {
 
     @Override
     public void visitMethodEnd() {
-        stringBuilder.setLength(0);
-        stringBuilder.append(name).append(VISIT_END);
-        text.add(stringBuilder.toString());
+        visitMemberEnd();
     }
 
     // -----------------------------------------------------------------------------------------------
@@ -1278,6 +1270,13 @@ public class ASMifier extends Printer {
         text.add(stringBuilder.toString());
     }
 
+    /** Visits the end of a field, record component or method. */
+    private void visitMemberEnd() {
+        stringBuilder.setLength(0);
+        stringBuilder.append(name).append(VISIT_END);
+        text.add(stringBuilder.toString());
+    }
+
     // -----------------------------------------------------------------------------------------------
     // Utility methods
     // -----------------------------------------------------------------------------------------------
@@ -1645,3 +1644,4 @@ public class ASMifier extends Printer {
         stringBuilder.append(labelNames.get(label));
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifierSupport.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifierSupport.java
index b399fb27d58..956938394a4 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifierSupport.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifierSupport.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.util.Map;
@@ -80,3 +81,4 @@ public interface ASMifierSupport {
     void asmify(
             StringBuilder outputBuilder, String visitorVariableName, Map<Label, String> labelNames);
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
index 07634756103..b3d21f5ae99 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -83,7 +84,7 @@ public class CheckAnnotationAdapter extends AnnotationVisitor {
     }
 
     CheckAnnotationAdapter(final AnnotationVisitor annotationVisitor, final boolean useNamedValues) {
-        super(/* latest api = */ Opcodes.ASM8, annotationVisitor);
+        super(/* latest api = */ Opcodes.ASM9, annotationVisitor);
         this.useNamedValue = useNamedValues;
     }
 
@@ -164,3 +165,4 @@ public class CheckAnnotationAdapter extends AnnotationVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
index 4de5d38ae4e..a2528057007 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.io.FileInputStream;
@@ -205,7 +206,7 @@ public class CheckClassAdapter extends ClassVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public CheckClassAdapter(final ClassVisitor classVisitor, final boolean checkDataFlow) {
-        this(/* latest api = */ Opcodes.ASM8, classVisitor, checkDataFlow);
+        this(/* latest api = */ Opcodes.ASM9, classVisitor, checkDataFlow);
         if (getClass() != CheckClassAdapter.class) {
             throw new IllegalStateException();
         }
@@ -215,8 +216,8 @@ public class CheckClassAdapter extends ClassVisitor {
       * Constructs a new {@link CheckClassAdapter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param classVisitor the class visitor to which this adapter must delegate calls.
       * @param checkDataFlow {@literal true} to perform basic data flow checks, or {@literal false} to
       *     not perform any data flow check (see {@link CheckMethodAdapter}). This option requires
@@ -353,18 +354,11 @@ public class CheckClassAdapter extends ClassVisitor {
         super.visitNestMember(nestMember);
     }
 
-    /**
-      * <b>Experimental, use at your own risk.</b>.
-      *
-      * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
-      */
     @Override
-    @Deprecated
-    public void visitPermittedSubclassExperimental(final String permittedSubclass) {
+    public void visitPermittedSubclass(final String permittedSubclass) {
         checkState();
         CheckMethodAdapter.checkInternalName(version, permittedSubclass, "permittedSubclass");
-        super.visitPermittedSubclassExperimental(permittedSubclass);
+        super.visitPermittedSubclass(permittedSubclass);
     }
 
     @Override
@@ -468,7 +462,8 @@ public class CheckClassAdapter extends ClassVisitor {
             final String signature,
             final String[] exceptions) {
         checkState();
-        checkAccess(
+        checkMethodAccess(
+                version,
                 access,
                 Opcodes.ACC_PUBLIC
                         | Opcodes.ACC_PRIVATE
@@ -593,6 +588,23 @@ public class CheckClassAdapter extends ClassVisitor {
         }
     }
 
+    /**
+      * Checks that the given access flags do not contain invalid flags for a method. This method also
+      * checks that mutually incompatible flags are not set simultaneously.
+      *
+      * @param version the class version.
+      * @param access the method access flags to be checked.
+      * @param possibleAccess the valid access flags.
+      */
+    private static void checkMethodAccess(
+            final int version, final int access, final int possibleAccess) {
+        checkAccess(access, possibleAccess);
+        if ((version & 0xFFFF) < Opcodes.V17
+                && Integer.bitCount(access & (Opcodes.ACC_STRICT | Opcodes.ACC_ABSTRACT)) > 1) {
+            throw new IllegalArgumentException("strictfp and abstract are mutually exclusive: " + access);
+        }
+    }
+
     /**
       * Checks that the given name is a fully qualified name, using dots.
       *
@@ -981,9 +993,9 @@ public class CheckClassAdapter extends ClassVisitor {
                 mask = 0xFF0000FF;
                 break;
             default:
-                throw new AssertionError();
+                break;
         }
-        if ((typeRef & ~mask) != 0) {
+        if (mask == 0 || (typeRef & ~mask) != 0) {
             throw new IllegalArgumentException(
                     "Invalid type reference 0x" + Integer.toHexString(typeRef));
         }
@@ -1034,9 +1046,10 @@ public class CheckClassAdapter extends ClassVisitor {
 
         ClassReader classReader;
         if (args[0].endsWith(".class")) {
-            InputStream inputStream =
-                    new FileInputStream(args[0]); // NOPMD(AvoidFileStream): can't fix for 1.5 compatibility
-            classReader = new ClassReader(inputStream);
+            // Can't fix PMD warning for 1.5 compatibility.
+            try (InputStream inputStream = new FileInputStream(args[0])) { // NOPMD(AvoidFileStream)
+                classReader = new ClassReader(inputStream);
+            }
         } else {
             classReader = new ClassReader(args[0]);
         }
@@ -1065,7 +1078,6 @@ public class CheckClassAdapter extends ClassVisitor {
       * @param printResults whether to print the results of the bytecode verification.
       * @param printWriter where the results (or the stack trace in case of error) must be printed.
       */
-    @SuppressWarnings("deprecation")
     public static void verify(
             final ClassReader classReader,
             final ClassLoader loader,
@@ -1073,7 +1085,7 @@ public class CheckClassAdapter extends ClassVisitor {
             final PrintWriter printWriter) {
         ClassNode classNode = new ClassNode();
         classReader.accept(
-                new CheckClassAdapter(Opcodes.ASM9_EXPERIMENTAL, classNode, false) {},
+                new CheckClassAdapter(/*latest*/ Opcodes.ASM9, classNode, false) {},
                 ClassReader.SKIP_DEBUG);
 
         Type syperType = classNode.superName == null ? null : Type.getObjectType(classNode.superName);
@@ -1152,7 +1164,12 @@ public class CheckClassAdapter extends ClassVisitor {
             if (name.charAt(endIndex - 1) == ';') {
                 endIndex--;
             }
-            return name.substring(lastSlashIndex + 1, endIndex);
+            int lastBracketIndex = name.lastIndexOf('[');
+            if (lastBracketIndex == -1) {
+                return name.substring(lastSlashIndex + 1, endIndex);
+            }
+            return name.substring(0, lastBracketIndex + 1) + name.substring(lastSlashIndex + 1, endIndex);
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
index 8ac6fea420e..edb38aca7b1 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -83,7 +84,7 @@ public class CheckFieldAdapter extends FieldVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public CheckFieldAdapter(final FieldVisitor fieldVisitor) {
-        this(/* latest api = */ Opcodes.ASM8, fieldVisitor);
+        this(/* latest api = */ Opcodes.ASM9, fieldVisitor);
         if (getClass() != CheckFieldAdapter.class) {
             throw new IllegalStateException();
         }
@@ -93,8 +94,8 @@ public class CheckFieldAdapter extends FieldVisitor {
       * Constructs a new {@link CheckFieldAdapter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param fieldVisitor the field visitor to which this adapter must delegate calls.
       */
     protected CheckFieldAdapter(final int api, final FieldVisitor fieldVisitor) {
@@ -146,3 +147,4 @@ public class CheckFieldAdapter extends FieldVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
index 6ecf4604368..7f3816788da 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.io.PrintWriter;
@@ -398,7 +399,7 @@ public class CheckMethodAdapter extends MethodVisitor {
       */
     public CheckMethodAdapter(
             final MethodVisitor methodVisitor, final Map<Label, Integer> labelInsnIndices) {
-        this(/* latest api = */ Opcodes.ASM8, methodVisitor, labelInsnIndices);
+        this(/* latest api = */ Opcodes.ASM9, methodVisitor, labelInsnIndices);
         if (getClass() != CheckMethodAdapter.class) {
             throw new IllegalStateException();
         }
@@ -409,8 +410,8 @@ public class CheckMethodAdapter extends MethodVisitor {
       * data flow check (see {@link #CheckMethodAdapter(int,String,String,MethodVisitor,Map)}).
       *
       * @param api the ASM API version implemented by this CheckMethodAdapter. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param methodVisitor the method visitor to which this adapter must delegate calls.
       * @param labelInsnIndices the index of the instruction designated by each visited label so far
       *     (in other methods). This map is updated with the labels from the visited method.
@@ -446,7 +447,7 @@ public class CheckMethodAdapter extends MethodVisitor {
             final MethodVisitor methodVisitor,
             final Map<Label, Integer> labelInsnIndices) {
         this(
-                /* latest api = */ Opcodes.ASM8, access, name, descriptor, methodVisitor, labelInsnIndices);
+                /* latest api = */ Opcodes.ASM9, access, name, descriptor, methodVisitor, labelInsnIndices);
         if (getClass() != CheckMethodAdapter.class) {
             throw new IllegalStateException();
         }
@@ -458,8 +459,8 @@ public class CheckMethodAdapter extends MethodVisitor {
       * instruction IRETURN, or the invalid sequence IADD L2I will be detected.
       *
       * @param api the ASM API version implemented by this CheckMethodAdapter. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param access the method's access flags.
       * @param name the method's name.
       * @param descriptor the method's descriptor (see {@link Type}).
@@ -515,7 +516,7 @@ public class CheckMethodAdapter extends MethodVisitor {
             checkUnqualifiedName(version, name, "name");
         }
         CheckClassAdapter.checkAccess(
-                access, Opcodes.ACC_FINAL + Opcodes.ACC_MANDATED + Opcodes.ACC_SYNTHETIC);
+                access, Opcodes.ACC_FINAL | Opcodes.ACC_MANDATED | Opcodes.ACC_SYNTHETIC);
         super.visitParameter(name, access);
     }
 
@@ -815,7 +816,7 @@ public class CheckMethodAdapter extends MethodVisitor {
         checkVisitMaxsNotCalled();
         checkLabel(label, false, "label");
         if (labelInsnIndices.get(label) != null) {
-            throw new IllegalArgumentException("Already visited label");
+            throw new IllegalStateException("Already visited label");
         }
         labelInsnIndices.put(label, insnCount);
         super.visitLabel(label);
@@ -1473,3 +1474,4 @@ public class CheckMethodAdapter extends MethodVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckModuleAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckModuleAdapter.java
index 1eae61ba66f..91e85ce2a5b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckModuleAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckModuleAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.util.HashSet;
@@ -102,7 +103,7 @@ public class CheckModuleAdapter extends ModuleVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public CheckModuleAdapter(final ModuleVisitor moduleVisitor, final boolean isOpen) {
-        this(/* latest api = */ Opcodes.ASM8, moduleVisitor, isOpen);
+        this(/* latest api = */ Opcodes.ASM9, moduleVisitor, isOpen);
         if (getClass() != CheckModuleAdapter.class) {
             throw new IllegalStateException();
         }
@@ -112,8 +113,8 @@ public class CheckModuleAdapter extends ModuleVisitor {
       * Constructs a new {@link CheckModuleAdapter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param moduleVisitor the module visitor to which this adapter must delegate calls.
       * @param isOpen whether the visited module is open. Open modules have their {@link
       *     Opcodes#ACC_OPEN} access flag set in {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitModule}.
@@ -242,3 +243,4 @@ public class CheckModuleAdapter extends ModuleVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckRecordComponentAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckRecordComponentAdapter.java
index 2c2f9765101..98cbb9c4e42 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckRecordComponentAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckRecordComponentAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -86,7 +87,7 @@ public class CheckRecordComponentAdapter extends RecordComponentVisitor {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public CheckRecordComponentAdapter(final RecordComponentVisitor recordComponentVisitor) {
-        this(/* latest api =*/ Opcodes.ASM8, recordComponentVisitor);
+        this(/* latest api =*/ Opcodes.ASM9, recordComponentVisitor);
         if (getClass() != CheckRecordComponentAdapter.class) {
             throw new IllegalStateException();
         }
@@ -95,7 +96,8 @@ public class CheckRecordComponentAdapter extends RecordComponentVisitor {
     /**
       * Constructs a new {@link CheckRecordComponentAdapter}.
       *
-      * @param api the ASM API version implemented by this visitor. Must be {@link Opcodes#ASM8}.
+      * @param api the ASM API version implemented by this visitor. Must be one of {@link Opcodes#ASM8}
+      *     or {@link Opcodes#ASM9}.
       * @param recordComponentVisitor the record component visitor to which this adapter must delegate
       *     calls.
       */
@@ -149,3 +151,4 @@ public class CheckRecordComponentAdapter extends RecordComponentVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
index f05054afcb7..d16f45a8eca 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.util.EnumSet;
@@ -154,15 +155,15 @@ public class CheckSignatureAdapter extends SignatureVisitor {
       *     null}.
       */
     public CheckSignatureAdapter(final int type, final SignatureVisitor signatureVisitor) {
-        this(/* latest api = */ Opcodes.ASM8, type, signatureVisitor);
+        this(/* latest api = */ Opcodes.ASM9, type, signatureVisitor);
     }
 
     /**
       * Constructs a new {@link CheckSignatureAdapter}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       * @param type the type of signature to be checked. See {@link #CLASS_SIGNATURE}, {@link
       *     #METHOD_SIGNATURE} and {@link #TYPE_SIGNATURE}.
       * @param signatureVisitor the visitor to which this adapter must delegate calls. May be {@literal
@@ -389,3 +390,4 @@ public class CheckSignatureAdapter extends SignatureVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
index 0c8a0e8f56e..19e7bc4cd66 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.io.FileInputStream;
@@ -323,7 +324,8 @@ public abstract class Printer {
 
     /**
       * The ASM API version implemented by this class. The value of this field must be one of {@link
-      * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+      * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      * Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     protected final int api;
 
@@ -485,18 +487,12 @@ public abstract class Printer {
     }
 
     /**
-      * <b>Experimental, use at your own risk. This method will be renamed when it becomes stable, this
-      * will break existing code using it</b>.
-      *
-      * <p>Visits a permitted subclass. A permitted subtclass is one of the allowed subclasses of the
-      * current class. See {@link
-      * jdk.internal.org.objectweb.asm.ClassVisitor#visitPermittedSubclassExperimental(String)}.
+      * Visits a permitted subclasses. A permitted subclass is one of the allowed subclasses of the
+      * current class. See {@link jdk.internal.org.objectweb.asm.ClassVisitor#visitPermittedSubclass(String)}.
       *
       * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
       */
-    @Deprecated
-    public void visitPermittedSubclassExperimental(final String permittedSubclass) {
+    public void visitPermittedSubclass(final String permittedSubclass) {
         throw new UnsupportedOperationException(UNSUPPORTED_OPERATION);
     }
 
@@ -1305,7 +1301,7 @@ public abstract class Printer {
     /**
       * Prints a the given class to the given output.
       *
-      * <p>Command line arguments: [-debug] &lt;binary class name or class file name &gt;
+      * <p>Command line arguments: [-nodebug] &lt;binary class name or class file name &gt;
       *
       * @param args the command line arguments.
       * @param usage the help message to show when command line arguments are incorrect.
@@ -1321,7 +1317,9 @@ public abstract class Printer {
             final PrintWriter output,
             final PrintWriter logger)
             throws IOException {
-        if (args.length < 1 || args.length > 2 || (args[0].equals("-debug") && args.length != 2)) {
+        if (args.length < 1
+                || args.length > 2
+                || ((args[0].equals("-debug") || args[0].equals("-nodebug")) && args.length != 2)) {
             logger.println(usage);
             return;
         }
@@ -1330,7 +1328,7 @@ public abstract class Printer {
 
         String className;
         int parsingOptions;
-        if (args[0].equals("-debug")) {
+        if (args[0].equals("-nodebug")) {
             className = args[1];
             parsingOptions = ClassReader.SKIP_DEBUG;
         } else {
@@ -1341,11 +1339,13 @@ public abstract class Printer {
         if (className.endsWith(".class")
                 || className.indexOf('\\') != -1
                 || className.indexOf('/') != -1) {
-            InputStream inputStream =
-                    new FileInputStream(className); // NOPMD(AvoidFileStream): can't fix for 1.5 compatibility
-            new ClassReader(inputStream).accept(traceClassVisitor, parsingOptions);
+            // Can't fix PMD warning for 1.5 compatibility.
+            try (InputStream inputStream = new FileInputStream(className)) { // NOPMD(AvoidFileStream)
+                new ClassReader(inputStream).accept(traceClassVisitor, parsingOptions);
+            }
         } else {
             new ClassReader(className).accept(traceClassVisitor, parsingOptions);
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
deleted file mode 100644
index 78ed7e10033..00000000000
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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:
- *
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
- */
-package jdk.internal.org.objectweb.asm.util;
-
-import java.util.Map;
-import jdk.internal.org.objectweb.asm.Label;
-
-/**
- * An {@link jdk.internal.org.objectweb.asm.Attribute} that can print a readable representation of itself.
- *
- * @author Eugene Kuleshov
- */
-public interface Textifiable {
-
-    /**
-      * Generates a human readable representation of this attribute.
-      *
-      * @param outputBuffer where the human representation of this attribute must be appended.
-      * @param labelNames the human readable names of the labels.
-      */
-    void textify(StringBuffer outputBuffer, Map<Label, String> labelNames);
-}
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
index ace4f792545..63074314bc8 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.io.IOException;
@@ -84,7 +85,7 @@ public class Textifier extends Printer {
     /** The help message shown when command line arguments are incorrect. */
     private static final String USAGE =
             "Prints a disassembled view of the given class.\n"
-                    + "Usage: Textifier [-debug] <fully qualified class name or class file name>";
+                    + "Usage: Textifier [-nodebug] <fully qualified class name or class file name>";
 
     /** The type of internal names. See {@link #appendDescriptor}. */
     public static final int INTERNAL_NAME = 0;
@@ -143,7 +144,7 @@ public class Textifier extends Printer {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public Textifier() {
-        this(/* latest api = */ Opcodes.ASM8);
+        this(/* latest api = */ Opcodes.ASM9);
         if (getClass() != Textifier.class) {
             throw new IllegalStateException();
         }
@@ -153,8 +154,8 @@ public class Textifier extends Printer {
       * Constructs a new {@link Textifier}.
       *
       * @param api the ASM API version implemented by this visitor. Must be one of {@link
-      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-      *     Opcodes#ASM8}.
+      *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
+      *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
       */
     protected Textifier(final int api) {
         super(api);
@@ -163,7 +164,7 @@ public class Textifier extends Printer {
     /**
       * Prints a disassembled view of the given class to the standard output.
       *
-      * <p>Usage: Textifier [-debug] &lt;binary class name or class file name &gt;
+      * <p>Usage: Textifier [-nodebug] &lt;binary class name or class file name &gt;
       *
       * @param args the command line arguments.
       * @throws IOException if the class cannot be found, or if an IOException occurs.
@@ -175,7 +176,7 @@ public class Textifier extends Printer {
     /**
       * Prints a disassembled view of the given class to the given output.
       *
-      * <p>Usage: Textifier [-debug] &lt;binary class name or class file name &gt;
+      * <p>Usage: Textifier [-nodebug] &lt;binary class name or class file name &gt;
       *
       * @param args the command line arguments.
       * @param output where to print the result.
@@ -337,15 +338,8 @@ public class Textifier extends Printer {
         text.add(stringBuilder.toString());
     }
 
-    /**
-      * <b>Experimental, use at your own risk.</b>.
-      *
-      * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
-      */
     @Override
-    @Deprecated
-    public void visitPermittedSubclassExperimental(final String permittedSubclass) {
+    public void visitPermittedSubclass(final String permittedSubclass) {
         stringBuilder.setLength(0);
         stringBuilder.append(tab).append("PERMITTEDSUBCLASS ");
         appendDescriptor(INTERNAL_NAME, permittedSubclass);
@@ -1638,3 +1632,4 @@ public class Textifier extends Printer {
         return new Textifier(api);
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TextifierSupport.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TextifierSupport.java
index f4a0c2cabd9..edc3bf0351b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TextifierSupport.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TextifierSupport.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.util.Map;
@@ -76,3 +77,4 @@ public interface TextifierSupport {
       */
     void textify(StringBuilder outputBuilder, Map<Label, String> labelNames);
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
index e13cb331134..9133b45c563 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -88,7 +89,7 @@ public final class TraceAnnotationVisitor extends AnnotationVisitor {
       * @param printer the printer to convert the visited annotation into text.
       */
     public TraceAnnotationVisitor(final AnnotationVisitor annotationVisitor, final Printer printer) {
-        super(/* latest api = */ Opcodes.ASM8, annotationVisitor);
+        super(/* latest api = */ Opcodes.ASM9, annotationVisitor);
         this.printer = printer;
     }
 
@@ -122,3 +123,4 @@ public final class TraceAnnotationVisitor extends AnnotationVisitor {
         super.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
index f8b20180d68..eade2bc9c47 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.io.PrintWriter;
@@ -148,10 +149,9 @@ public final class TraceClassVisitor extends ClassVisitor {
       * @param printer the printer to convert the visited class into text.
       * @param printWriter the print writer to be used to print the class. May be {@literal null}.
       */
-    @SuppressWarnings("deprecation")
     public TraceClassVisitor(
             final ClassVisitor classVisitor, final Printer printer, final PrintWriter printWriter) {
-        super(/* latest api = */ Opcodes.ASM9_EXPERIMENTAL, classVisitor);
+        super(/* latest api = */ Opcodes.ASM9, classVisitor);
         this.printWriter = printWriter;
         this.p = printer;
     }
@@ -219,17 +219,10 @@ public final class TraceClassVisitor extends ClassVisitor {
         super.visitNestMember(nestMember);
     }
 
-    /**
-      * <b>Experimental, use at your own risk.</b>.
-      *
-      * @param permittedSubclass the internal name of a permitted subclass.
-      * @deprecated this API is experimental.
-      */
     @Override
-    @Deprecated
-    public void visitPermittedSubclassExperimental(final String permittedSubclass) {
-        p.visitPermittedSubclassExperimental(permittedSubclass);
-        super.visitPermittedSubclassExperimental(permittedSubclass);
+    public void visitPermittedSubclass(final String permittedSubclass) {
+        p.visitPermittedSubclass(permittedSubclass);
+        super.visitPermittedSubclass(permittedSubclass);
     }
 
     @Override
@@ -281,3 +274,4 @@ public final class TraceClassVisitor extends ClassVisitor {
         super.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
index 04f079d2044..62cc5939f11 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -91,7 +92,7 @@ public final class TraceFieldVisitor extends FieldVisitor {
       * @param printer the printer to convert the visited field into text.
       */
     public TraceFieldVisitor(final FieldVisitor fieldVisitor, final Printer printer) {
-        super(/* latest api = */ Opcodes.ASM8, fieldVisitor);
+        super(/* latest api = */ Opcodes.ASM9, fieldVisitor);
         this.p = printer;
     }
 
@@ -122,3 +123,4 @@ public final class TraceFieldVisitor extends FieldVisitor {
         super.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
index 610bd94d7bb..6f58868694b 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -93,7 +94,7 @@ public final class TraceMethodVisitor extends MethodVisitor {
       * @param printer the printer to convert the visited method into text.
       */
     public TraceMethodVisitor(final MethodVisitor methodVisitor, final Printer printer) {
-        super(/* latest api = */ Opcodes.ASM8, methodVisitor);
+        super(/* latest api = */ Opcodes.ASM9, methodVisitor);
         this.p = printer;
     }
 
@@ -341,3 +342,4 @@ public final class TraceMethodVisitor extends MethodVisitor {
         super.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceModuleVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceModuleVisitor.java
index b9e29c919ce..cbd0bf7aca7 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceModuleVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceModuleVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import jdk.internal.org.objectweb.asm.ModuleVisitor;
@@ -88,7 +89,7 @@ public final class TraceModuleVisitor extends ModuleVisitor {
       * @param printer the printer to convert the visited module into text.
       */
     public TraceModuleVisitor(final ModuleVisitor moduleVisitor, final Printer printer) {
-        super(/* latest api = */ Opcodes.ASM8, moduleVisitor);
+        super(/* latest api = */ Opcodes.ASM9, moduleVisitor);
         this.p = printer;
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceRecordComponentVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceRecordComponentVisitor.java
index 70e2a0258c8..2069f299d1a 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceRecordComponentVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceRecordComponentVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import jdk.internal.org.objectweb.asm.AnnotationVisitor;
@@ -93,7 +94,7 @@ public final class TraceRecordComponentVisitor extends RecordComponentVisitor {
       */
     public TraceRecordComponentVisitor(
             final RecordComponentVisitor recordComponentVisitor, final Printer printer) {
-        super(/* latest api ='*/ Opcodes.ASM8, recordComponentVisitor);
+        super(/* latest api ='*/ Opcodes.ASM9, recordComponentVisitor);
         this.printer = printer;
     }
 
@@ -125,3 +126,4 @@ public final class TraceRecordComponentVisitor extends RecordComponentVisitor {
         super.visitEnd();
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
index c9d41729852..a7ba0fb6a0f 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
@@ -56,6 +56,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package jdk.internal.org.objectweb.asm.util;
 
 import java.util.Collections;
@@ -140,13 +141,13 @@ public final class TraceSignatureVisitor extends SignatureVisitor {
       * @param accessFlags for class type signatures, the access flags of the class.
       */
     public TraceSignatureVisitor(final int accessFlags) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         this.isInterface = (accessFlags & Opcodes.ACC_INTERFACE) != 0;
         this.declaration = new StringBuilder();
     }
 
     private TraceSignatureVisitor(final StringBuilder stringBuilder) {
-        super(/* latest api = */ Opcodes.ASM8);
+        super(/* latest api = */ Opcodes.ASM9);
         this.isInterface = false;
         this.declaration = stringBuilder;
     }
@@ -256,7 +257,7 @@ public final class TraceSignatureVisitor extends SignatureVisitor {
     @Override
     public void visitClassType(final String name) {
         if ("java/lang/Object".equals(name)) {
-            // 'Map<java.lang.Object,java.util.List>' or 'public abstract V get(Object key);' should have
+            // 'Map<java.lang.Object,java.util.List>' or 'abstract public V get(Object key);' should have
             // Object 'but java.lang.String extends java.lang.Object' is unnecessary.
             boolean needObjectClass = argumentStack % 2 != 0 || parameterTypeVisited;
             if (needObjectClass) {
@@ -373,3 +374,4 @@ public final class TraceSignatureVisitor extends SignatureVisitor {
         }
     }
 }
+
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt
index 023148eacfe..b35c1bbf9ed 100644
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/version.txt
@@ -1,2 +1,2 @@
-ASM_8_0_1
+ASM_9_2
 origin	http://gitlab.ow2.org/asm/asm.git (fetch)
diff --git a/src/java.base/share/legal/asm.md b/src/java.base/share/legal/asm.md
index 707ecda7c0e..4b796017cec 100644
--- a/src/java.base/share/legal/asm.md
+++ b/src/java.base/share/legal/asm.md
@@ -1,4 +1,4 @@
-## ASM Bytecode Manipulation Framework v8.0.1
+## ASM Bytecode Manipulation Framework v9.2
 
 ### ASM License
 <pre>
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java b/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java
index c1ce47a1945..e9245430f66 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java
@@ -244,7 +244,7 @@ final class FingerPrint {
         private final Set<Method> methods = new HashSet<>();
 
         public ClassAttributes() {
-            super(Opcodes.ASM7);
+            super(Opcodes.ASM9);
         }
 
         private boolean isPublic(int access) {
diff --git a/test/langtools/tools/javac/sealed/ValidateJarWithSealedAndRecord.java b/test/langtools/tools/javac/sealed/ValidateJarWithSealedAndRecord.java
new file mode 100644
index 00000000000..c133b87a1cd
--- /dev/null
+++ b/test/langtools/tools/javac/sealed/ValidateJarWithSealedAndRecord.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282446 8282508
+ * @summary Jar validation fails when sealed classes and records are involved
+ * @run main ValidateJarWithSealedAndRecord
+ */
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.spi.ToolProvider;
+
+public class ValidateJarWithSealedAndRecord {
+
+    public static void main(String args[]) throws Exception {
+        ValidateJarWithSealedAndRecord theTest = new ValidateJarWithSealedAndRecord();
+        theTest.run();
+    }
+
+    void run() throws Exception {
+        generateFilesNeeded();
+    }
+
+    void writeFile(String f, String contents) throws IOException {
+        PrintStream s = new PrintStream(new FileOutputStream(f));
+        s.println(contents);
+        s.close();
+    }
+
+    void generateFilesNeeded() throws Exception {
+        ToolProvider jarTool = ToolProvider.findFirst("jar").orElseThrow(() -> new RuntimeException("jar tool not found"));
+        writeFile("Foo.java",
+                """
+                        public sealed interface Foo {
+                            record Bar() implements Foo {}
+                        }
+                        """
+                        );
+        com.sun.tools.javac.Main.compile(new String[]{"-d", "out", "Foo.java"});
+        jarTool.run(System.out, System.err, new String[] {"--create", "--file", "foo.jar", "-C", "out", "."});
+        /* we need to create a fresh instance with clean options in other case the tool will
+         * keep a copy of the options we just passed above
+         */
+        jarTool = ToolProvider.findFirst("jar").orElseThrow(() -> new RuntimeException("jar tool not found"));
+        if (jarTool.run(System.out, System.err, new String[]{"--validate", "--file", "foo.jar"}) != 0) {
+            throw new AssertionError("jar file couldn't be validated");
+        }
+    }
+}
-- 
GitLab


From f76f5da0169499ca91d55a8c0afd4b77a8a4de3d Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Mon, 4 Apr 2022 18:54:36 +0000
Subject: [PATCH 331/345] 5087440: java.io bulk read(...) end-of-stream return
 value descriptions ambiguous

Reviewed-by: rriggs, lancea
---
 src/java.base/share/classes/java/io/ObjectInput.java | 12 +++++++-----
 .../share/classes/java/io/ObjectInputStream.java     |  5 +++--
 .../share/classes/java/io/SequenceInputStream.java   |  6 ++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/java.base/share/classes/java/io/ObjectInput.java b/src/java.base/share/classes/java/io/ObjectInput.java
index fe80b377a0d..941b5f03498 100644
--- a/src/java.base/share/classes/java/io/ObjectInput.java
+++ b/src/java.base/share/classes/java/io/ObjectInput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,8 +62,9 @@ public interface ObjectInput extends DataInput, AutoCloseable {
      * Reads into an array of bytes.  This method will
      * block until some input is available.
      * @param   b the buffer into which the data is read
-     * @return  the actual number of bytes read, -1 is
-     *          returned when the end of the stream is reached.
+     * @return  the total number of bytes read into the buffer, or
+     *          {@code -1} if there is no more data because the end of
+     *          the stream has been reached.
      * @throws  IOException If an I/O error has occurred.
      */
     public int read(byte[] b) throws IOException;
@@ -74,8 +75,9 @@ public interface ObjectInput extends DataInput, AutoCloseable {
      * @param   b the buffer into which the data is read
      * @param   off the start offset of the data
      * @param   len the maximum number of bytes read
-     * @return  the actual number of bytes read, -1 is
-     *          returned when the end of the stream is reached.
+     * @return  the total number of bytes read into the buffer, or
+     *          {@code -1} if there is no more data because the end of
+     *          the stream has been reached.
      * @throws  IOException If an I/O error has occurred.
      */
     public int read(byte[] b, int off, int len) throws IOException;
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
index 14812fea9ad..319981e864b 100644
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -1031,8 +1031,9 @@ public class ObjectInputStream
      * @param   buf the buffer into which the data is read
      * @param   off the start offset in the destination array {@code buf}
      * @param   len the maximum number of bytes read
-     * @return  the actual number of bytes read, -1 is returned when the end of
-     *          the stream is reached.
+     * @return  the total number of bytes read into the buffer, or
+     *          {@code -1} if there is no more data because the end of
+     *          the stream has been reached.
      * @throws  NullPointerException if {@code buf} is {@code null}.
      * @throws  IndexOutOfBoundsException if {@code off} is negative,
      *          {@code len} is negative, or {@code len} is greater than
diff --git a/src/java.base/share/classes/java/io/SequenceInputStream.java b/src/java.base/share/classes/java/io/SequenceInputStream.java
index 5f692ce6c44..b4f948902a2 100644
--- a/src/java.base/share/classes/java/io/SequenceInputStream.java
+++ b/src/java.base/share/classes/java/io/SequenceInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,7 +177,9 @@ public class SequenceInputStream extends InputStream {
      * @param      off   the start offset in array {@code b}
      *                   at which the data is written.
      * @param      len   the maximum number of bytes read.
-     * @return     int   the number of bytes read.
+     * @return     the total number of bytes read into the buffer, or
+     *             {@code -1} if there is no more data because the end of
+     *             the last contained stream has been reached.
      * @throws     NullPointerException If {@code b} is {@code null}.
      * @throws     IndexOutOfBoundsException If {@code off} is negative,
      *             {@code len} is negative, or {@code len} is
-- 
GitLab


From 7381868afe316a9c62baa4618c49b68a5c43be01 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Mon, 4 Apr 2022 18:58:05 +0000
Subject: [PATCH 332/345] 8283623: Create an automated regression test for
 JDK-4525475

Reviewed-by: aivanov, serb
---
 .../4525475/JFileChooserReadOnlyTest.java     | 141 ++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 test/jdk/javax/swing/JFileChooser/4525475/JFileChooserReadOnlyTest.java

diff --git a/test/jdk/javax/swing/JFileChooser/4525475/JFileChooserReadOnlyTest.java b/test/jdk/javax/swing/JFileChooser/4525475/JFileChooserReadOnlyTest.java
new file mode 100644
index 00000000000..ae3ff1d2e0a
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/4525475/JFileChooserReadOnlyTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Component;
+import java.awt.Container;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.swing.Action;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+/*
+ * @test
+ * @key headful
+ * @bug 4525475
+ * @summary This testcase tests JDK-4525475 bug fix, checks whether JFileChooser
+ *          allows modification to the file-system by way of the "New Folder"
+ *          button or not, ideally a read-only JFileChooser shouldn't allow it.
+ * @run main JFileChooserReadOnlyTest
+ */
+public class JFileChooserReadOnlyTest {
+
+    private static volatile boolean result = true;
+    private static volatile boolean newFolderFound = false;
+
+    public static void main(String[] args) throws Exception {
+
+        List<String> lafs = Arrays.stream(getInstalledLookAndFeels())
+                                  .map(LookAndFeelInfo::getClassName)
+                                  .collect(Collectors.toList());
+        for (final String laf : lafs) {
+            if (!setLookAndFeel(laf)) {
+                continue;
+            }
+
+            // Test1, Read Only JFileChooser
+            SwingUtilities.invokeAndWait(
+                        () -> createAndTestCustomFileChooser(true));
+            System.out.println("It's a read-only JFileChooser " +
+                               (newFolderFound ? "but it has" :
+                                "and it doesn't have") +
+                               " a New Folder Button found" +
+                               ", So the Test1 " +
+                               (result ? "Passed" : "Failed") + " for " + laf);
+
+            // Test2, Read/Write JFileChooser
+            /* Skipping Motif and Aqua L&Fs
+               For Motif L&F, the 'New Folder' button is never shown.
+               The Aqua L&F behaves similar to the native FileChooser:
+                 the 'Open' dialog doesn't show the 'New Folder' button,
+                 but it shows the button for the 'Save' dialog.
+             */
+            if (!(laf.contains("Motif") || laf.contains("Aqua"))) {
+                SwingUtilities.invokeAndWait(
+                        () -> createAndTestCustomFileChooser(false));
+                System.out.println("It's not a read-only JFileChooser " +
+                                   (newFolderFound ? "and it has" :
+                                    "but it doesn't have") +
+                                   " a New Folder Button" + ", So the Test2 " +
+                                   (result ? "Passed" : "Failed") + " for " +
+                                   laf);
+            }
+
+            if (result) {
+                System.out.println("Test Passed for " + laf);
+            } else {
+                throw new RuntimeException(
+                        "Test Failed, JFileChooser readOnly flag is not " +
+                        "working properly for " + laf);
+            }
+        }
+    }
+
+    private static void createAndTestCustomFileChooser(boolean readOnly) {
+        newFolderFound = false;
+        UIManager.put("FileChooser.readOnly", Boolean.valueOf(readOnly));
+        JFileChooser jfc = new JFileChooser();
+        checkNewFolderButton(jfc, readOnly);
+        result = result && (readOnly ^ newFolderFound);
+    }
+
+    private static void checkNewFolderButton(Container c, boolean readOnly) {
+        int n = c.getComponentCount();
+        for (int i = 0; i < n && !newFolderFound; i++) {
+            Component comp = c.getComponent(i);
+            if (comp instanceof JButton) {
+                JButton b = (JButton) comp;
+                Action action = b.getAction();
+                if (action != null
+                    && "New Folder".equals(action.getValue(Action.NAME))) {
+                    newFolderFound = true;
+                    System.out.println(
+                            "New Folder Button Found when readOnly = " +
+                            readOnly);
+                }
+            } else if (comp instanceof Container) {
+                checkNewFolderButton((Container) comp, readOnly);
+            }
+        }
+    }
+
+    private static boolean setLookAndFeel(String lafName) {
+        try {
+            UIManager.setLookAndFeel(lafName);
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Ignoring Unsupported L&F: " + lafName);
+            return false;
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+}
-- 
GitLab


From 61d06c2d281edb8725e84bad4d75c7c4770ade78 Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Mon, 4 Apr 2022 20:00:36 +0000
Subject: [PATCH 333/345] 8276050: XMLInputFactoryImpl.getProperty() returns
 null

Reviewed-by: rriggs
---
 .../xerces/internal/impl/PropertyManager.java | 177 +++++++++++-------
 .../XMLInputFactoryTest/InputFactoryTest.java |  58 ++++++
 2 files changed, 164 insertions(+), 71 deletions(-)
 create mode 100644 test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/InputFactoryTest.java

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
index 4fc9a71b157..98c2c01310c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.sun.org.apache.xerces.internal.impl;
 
 import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
@@ -39,29 +38,31 @@ import jdk.xml.internal.JdkProperty;
 import jdk.xml.internal.JdkXmlUtils;
 
 /**
- * This class manages different properties related to Stax specification and its implementation.
- * This class constructor also takes itself (PropertyManager object) as parameter and initializes the
- * object with the property taken from the object passed.
+ * This class manages the properties for the Stax specification and its
+ * implementation. A PropertyManager object can be constructed based on the
+ * context or initialized with another PropertyManager object.
  *
  * @author Neeraj Bajaj
  * @author K Venugopal
  * @author Sunitha Reddy
  */
-
 public class PropertyManager {
 
-
     public static final String STAX_NOTATIONS = "javax.xml.stream.notations";
     public static final String STAX_ENTITIES = "javax.xml.stream.entities";
 
     private static final String STRING_INTERNING = "http://xml.org/sax/features/string-interning";
 
-    /** Property identifier: Security manager. */
+    /**
+     * Property identifier: Security manager.
+     */
     private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
 
-    /** Property identifier: Security property manager. */
-    private static final String XML_SECURITY_PROPERTY_MANAGER =
-            JdkConstants.XML_SECURITY_PROPERTY_MANAGER;
+    /**
+     * Property identifier: Security property manager.
+     */
+    private static final String XML_SECURITY_PROPERTY_MANAGER
+            = JdkConstants.XML_SECURITY_PROPERTY_MANAGER;
 
     HashMap<String, Object> supportedProps = new HashMap<>();
 
@@ -71,14 +72,18 @@ public class PropertyManager {
     public static final int CONTEXT_READER = 1;
     public static final int CONTEXT_WRITER = 2;
 
-    /** Creates a new instance of PropertyManager */
+    /**
+     * Creates a new instance of the PropertyManager based on the context.
+     *
+     * @param context a flag indicating the context: for a reader or writer.
+     */
     public PropertyManager(int context) {
-        switch(context){
-            case CONTEXT_READER:{
+        switch (context) {
+            case CONTEXT_READER: {
                 initConfigurableReaderProperties();
                 break;
             }
-            case CONTEXT_WRITER:{
+            case CONTEXT_WRITER: {
                 initWriterProps();
                 break;
             }
@@ -86,28 +91,29 @@ public class PropertyManager {
     }
 
     /**
-     * Initialize this object with the properties taken from passed PropertyManager object.
+     * Initializes the object with the properties of another
+     * PropertyManager object.
+     *
+     * @param propertyManager another PropertyManager object
      */
-    public PropertyManager(PropertyManager propertyManager){
+    public PropertyManager(PropertyManager propertyManager) {
 
         HashMap<String, Object> properties = propertyManager.getProperties();
         supportedProps.putAll(properties);
-        fSecurityManager = (XMLSecurityManager)getProperty(SECURITY_MANAGER);
-        fSecurityPropertyMgr = (XMLSecurityPropertyManager)getProperty(XML_SECURITY_PROPERTY_MANAGER);
+        fSecurityManager = (XMLSecurityManager) getProperty(SECURITY_MANAGER);
+        fSecurityPropertyMgr = (XMLSecurityPropertyManager) getProperty(XML_SECURITY_PROPERTY_MANAGER);
     }
 
-    private HashMap<String, Object> getProperties(){
-        return supportedProps ;
+    private HashMap<String, Object> getProperties() {
+        return supportedProps;
     }
 
-
     /**
-     * Important point:
-     * 1. We are not exposing Xerces namespace property. Application should configure namespace through
-     * Stax specific property.
+     * Initializes reader properties.
      *
+     * @implNote: StAX defined namespace rather than Xerces' should be used.
      */
-    private void initConfigurableReaderProperties(){
+    private void initConfigurableReaderProperties() {
         //spec default values
         supportedProps.put(XMLInputFactory.IS_NAMESPACE_AWARE, Boolean.TRUE);
         supportedProps.put(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
@@ -118,18 +124,18 @@ public class PropertyManager {
         supportedProps.put(XMLInputFactory.REPORTER, null);
         supportedProps.put(XMLInputFactory.RESOLVER, null);
         supportedProps.put(XMLInputFactory.ALLOCATOR, null);
-        supportedProps.put(STAX_NOTATIONS,null );
+        supportedProps.put(STAX_NOTATIONS, null);
 
         //zephyr (implementation) specific properties which can be set by the application.
         //interning is always done
-        supportedProps.put(Constants.SAX_FEATURE_PREFIX + Constants.STRING_INTERNING_FEATURE , true);
+        supportedProps.put(Constants.SAX_FEATURE_PREFIX + Constants.STRING_INTERNING_FEATURE, true);
         //recognizing java encoding names by default
-        supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.ALLOW_JAVA_ENCODINGS_FEATURE, true) ;
+        supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.ALLOW_JAVA_ENCODINGS_FEATURE, true);
         //in stax mode, namespace declarations are not added as attributes
-        supportedProps.put(Constants.ADD_NAMESPACE_DECL_AS_ATTRIBUTE ,  Boolean.FALSE) ;
+        supportedProps.put(Constants.ADD_NAMESPACE_DECL_AS_ATTRIBUTE, Boolean.FALSE);
         supportedProps.put(Constants.READER_IN_DEFINED_STATE, true);
         supportedProps.put(Constants.REUSE_INSTANCE, true);
-        supportedProps.put(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.STAX_REPORT_CDATA_EVENT , false);
+        supportedProps.put(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.STAX_REPORT_CDATA_EVENT, false);
         supportedProps.put(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.IGNORE_EXTERNAL_DTD, Boolean.FALSE);
         supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_DUPLICATE_ATTDEF_FEATURE, false);
         supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_DUPLICATE_ENTITYDEF_FEATURE, false);
@@ -142,61 +148,89 @@ public class PropertyManager {
 
         // Initialize Catalog features
         supportedProps.put(XMLConstants.USE_CATALOG, JdkXmlUtils.USE_CATALOG_DEFAULT);
-        for( CatalogFeatures.Feature f : CatalogFeatures.Feature.values()) {
+        for (CatalogFeatures.Feature f : CatalogFeatures.Feature.values()) {
             supportedProps.put(f.getPropertyName(), null);
         }
 
         supportedProps.put(JdkConstants.CDATA_CHUNK_SIZE, JdkConstants.CDATA_CHUNK_SIZE_DEFAULT);
     }
 
-    private void initWriterProps(){
-        supportedProps.put(XMLOutputFactory.IS_REPAIRING_NAMESPACES , Boolean.FALSE);
+    /**
+     * Initializes writer properties.
+     */
+    private void initWriterProps() {
+        supportedProps.put(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE);
         //default value of escaping characters is 'true'
-        supportedProps.put(Constants.ESCAPE_CHARACTERS , Boolean.TRUE);
+        supportedProps.put(Constants.ESCAPE_CHARACTERS, Boolean.TRUE);
         supportedProps.put(Constants.REUSE_INSTANCE, true);
     }
 
     /**
-     * public void reset(){
-     * supportedProps.clear() ;
-     * }
+     * Checks whether a property is managed by the PropertyManager.
+     *
+     * @param property the name of a property
+     * @return true if the property is managed by the PropertyManager, false
+     * otherwise
      */
-    public boolean containsProperty(String property){
-        return supportedProps.containsKey(property) ||
-                (fSecurityManager != null && fSecurityManager.getIndex(property) > -1) ||
-                (fSecurityPropertyMgr!=null && fSecurityPropertyMgr.getIndex(property) > -1) ;
+    public boolean containsProperty(String property) {
+        return supportedProps.containsKey(property)
+                || (fSecurityManager != null && fSecurityManager.getIndex(property) > -1)
+                || (fSecurityPropertyMgr != null && fSecurityPropertyMgr.getIndex(property) > -1);
     }
 
-    public Object getProperty(String property){
-        /** Check to see if the property is managed by the security manager **/
-        String propertyValue = (fSecurityManager != null) ?
-                fSecurityManager.getLimitAsString(property) : null;
+    /**
+     * Returns the value of a property.
+     *
+     * @param property the name of the property
+     * @return the value of a property
+     */
+    public Object getProperty(String property) {
+        /**
+         * Check to see if the property is managed by the security manager *
+         */
+        String propertyValue = (fSecurityManager != null)
+                ? fSecurityManager.getLimitAsString(property) : null;
+        /**
+         * Check to see if the property is managed by the security property
+         * manager
+         */
+        if (propertyValue == null) {
+            propertyValue = (fSecurityPropertyMgr != null)
+                    ? fSecurityPropertyMgr.getValue(property) : null;
+        }
         return propertyValue != null ? propertyValue : supportedProps.get(property);
     }
 
-    public void setProperty(String property, Object value){
-        String equivalentProperty = null ;
-        if(property.equals(XMLInputFactory.IS_NAMESPACE_AWARE)){
-            equivalentProperty = Constants.XERCES_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE ;
-        }
-        else if(property.equals(XMLInputFactory.IS_VALIDATING)){
-            if( (value instanceof Boolean) && ((Boolean)value).booleanValue()){
-                throw new java.lang.IllegalArgumentException("true value of isValidating not supported") ;
+    /**
+     * Sets a property value.
+     *
+     * @param property the name of the property
+     * @param value the value of the property
+     */
+    public void setProperty(String property, Object value) {
+        String equivalentProperty = null;
+        if (property.equals(XMLInputFactory.IS_NAMESPACE_AWARE)) {
+            equivalentProperty = Constants.XERCES_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE;
+        } else if (property.equals(XMLInputFactory.IS_VALIDATING)) {
+            if ((value instanceof Boolean) && ((Boolean) value)) {
+                throw new IllegalArgumentException("true value of isValidating not supported");
             }
-        }
-        else if(property.equals(STRING_INTERNING)){
-            if( (value instanceof Boolean) && !((Boolean)value).booleanValue()){
-                throw new java.lang.IllegalArgumentException("false value of " + STRING_INTERNING + "feature is not supported") ;
+        } else if (property.equals(STRING_INTERNING)) {
+            if ((value instanceof Boolean) && !((Boolean) value)) {
+                throw new IllegalArgumentException("false value of " +
+                        STRING_INTERNING + "feature is not supported");
             }
-        }
-        else if(property.equals(XMLInputFactory.RESOLVER)){
+        } else if (property.equals(XMLInputFactory.RESOLVER)) {
             //add internal stax property
-            supportedProps.put( Constants.XERCES_PROPERTY_PREFIX + Constants.STAX_ENTITY_RESOLVER_PROPERTY , new StaxEntityResolverWrapper((XMLResolver)value)) ;
+            supportedProps.put(Constants.XERCES_PROPERTY_PREFIX +
+                    Constants.STAX_ENTITY_RESOLVER_PROPERTY,
+                    new StaxEntityResolverWrapper((XMLResolver) value));
         }
 
         /**
-         * It's possible for users to set a security manager through the interface.
-         * If it's the old SecurityManager, convert it to the new XMLSecurityManager
+         * It's possible for users to set a security manager through the
+         * interface. If it's the old SecurityManager, convert it to the new
+         * XMLSecurityManager
          */
         if (property.equals(Constants.SECURITY_MANAGER)) {
             fSecurityManager = XMLSecurityManager.convert(value, fSecurityManager);
@@ -207,29 +241,30 @@ public class PropertyManager {
             if (value == null) {
                 fSecurityPropertyMgr = new XMLSecurityPropertyManager();
             } else {
-                fSecurityPropertyMgr = (XMLSecurityPropertyManager)value;
+                fSecurityPropertyMgr = (XMLSecurityPropertyManager) value;
             }
             supportedProps.put(JdkConstants.XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
             return;
         }
 
         //check if the property is managed by security manager
-        if (fSecurityManager == null ||
-                !fSecurityManager.setLimit(property, JdkProperty.State.APIPROPERTY, value)) {
+        if (fSecurityManager == null
+                || !fSecurityManager.setLimit(property, JdkProperty.State.APIPROPERTY, value)) {
             //check if the property is managed by security property manager
-            if (fSecurityPropertyMgr == null ||
-                    !fSecurityPropertyMgr.setValue(property, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
+            if (fSecurityPropertyMgr == null
+                    || !fSecurityPropertyMgr.setValue(property, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
                 //fall back to the existing property manager
                 supportedProps.put(property, value);
             }
         }
 
-        if(equivalentProperty != null){
-            supportedProps.put(equivalentProperty, value ) ;
+        if (equivalentProperty != null) {
+            supportedProps.put(equivalentProperty, value);
         }
     }
 
-    public String toString(){
+    @Override
+    public String toString() {
         return supportedProps.toString();
     }
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/InputFactoryTest.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/InputFactoryTest.java
new file mode 100644
index 00000000000..782cb74afad
--- /dev/null
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/InputFactoryTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package stream.XMLInputFactoryTest;
+
+import javax.xml.XMLConstants;
+import javax.xml.stream.XMLInputFactory;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/*
+ * @test
+ * @bug 8276050
+ * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
+ * @run testng/othervm stream.XMLInputFactoryTest.InputFactoryTest
+ * @summary Test XMLInputFactory functionalities.
+ */
+public class InputFactoryTest {
+    @DataProvider(name = "AEProperties")
+    public Object[][] getAEProperties() throws Exception {
+        return new Object[][]{
+            {XMLConstants.ACCESS_EXTERNAL_DTD, "all", "all"},
+            {XMLConstants.ACCESS_EXTERNAL_SCHEMA, "all", "all"},
+            {XMLConstants.ACCESS_EXTERNAL_DTD, "", ""},
+            {XMLConstants.ACCESS_EXTERNAL_SCHEMA, "", ""},
+        };
+    }
+
+    /*
+     * Verifies that the XMLInputFactory returns security properties correctly.
+    */
+    @Test(dataProvider = "AEProperties")
+    public void testProperty(String name, String value, String expected) {
+        XMLInputFactory xif = XMLInputFactory.newInstance();
+        xif.setProperty(name, value);
+        Assert.assertEquals(expected, (String)xif.getProperty(name));
+    }
+}
-- 
GitLab


From 732f7ae0aab3fc8246cb03a5eaaac92f6b316622 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Mon, 4 Apr 2022 20:05:22 +0000
Subject: [PATCH 334/345] 8284071: Collapse identical catch branches in
 jdk.console

Reviewed-by: cjplummer
---
 .../share/classes/sun/tools/jconsole/JConsole.java   | 12 +++---------
 .../sun/tools/jconsole/MaximizableInternalFrame.java | 12 ++----------
 .../classes/sun/tools/jconsole/ProxyClient.java      |  8 ++------
 .../share/classes/sun/tools/jconsole/SummaryTab.java | 10 ++--------
 .../share/classes/sun/tools/jconsole/ThreadTab.java  | 10 +++-------
 5 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java
index 980aea97b14..908f1e5056c 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/JConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -483,9 +483,7 @@ public class JConsole extends JFrame
             public void run() {
                 try {
                     addProxyClient(ProxyClient.getProxyClient(lvm), tile);
-                } catch (final SecurityException ex) {
-                    failed(ex, null, null, null);
-                } catch (final IOException ex) {
+                } catch (final SecurityException | IOException ex) {
                     failed(ex, null, null, null);
                 }
             }
@@ -502,11 +500,7 @@ public class JConsole extends JFrame
                 try {
                     addProxyClient(ProxyClient.getProxyClient(url, userName, password),
                                    tile);
-                } catch (final MalformedURLException ex) {
-                    failed(ex, url, userName, password);
-                } catch (final SecurityException ex) {
-                    failed(ex, url, userName, password);
-                } catch (final IOException ex) {
+                } catch (final IOException | SecurityException ex) {
                     failed(ex, url, userName, password);
                 }
             }
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
index cf411b1c7ab..69ad44fc270 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -239,15 +239,7 @@ public class MaximizableInternalFrame extends JInternalFrame {
                     UIManager.put(key,
                                   new MDIButtonIcon(UIManager.getIcon(key)));
                 }
-            } catch (ClassNotFoundException ex) {
-                if (JConsole.debug) {
-                    ex.printStackTrace();
-                }
-            } catch (NoSuchFieldException ex) {
-                if (JConsole.debug) {
-                    ex.printStackTrace();
-                }
-            } catch (IllegalAccessException ex) {
+            } catch (ClassNotFoundException | IllegalAccessException | NoSuchFieldException ex) {
                 if (JConsole.debug) {
                     ex.printStackTrace();
                 }
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java
index d9ad2db95e6..ec2290421a4 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ProxyClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -608,11 +608,7 @@ public class ProxyClient implements JConsoleContext {
                 try {
                     MBeanInfo info = server.getMBeanInfo(o);
                     result.put(o, info);
-                } catch (IntrospectionException e) {
-                    // TODO: should log the error
-                } catch (InstanceNotFoundException e) {
-                    // TODO: should log the error
-                } catch (ReflectionException e) {
+                } catch (IntrospectionException | ReflectionException | InstanceNotFoundException e) {
                     // TODO: should log the error
                 }
             }
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java
index 3168665cfc0..e716aae61a3 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/SummaryTab.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -302,13 +302,7 @@ class SummaryTab extends Tab {
                        4);
                 append(endTable);
             }
-        } catch (IOException e) {
-            if (JConsole.isDebug()) {
-                e.printStackTrace();
-            }
-            proxyClient.markAsDead();
-            return null;
-        } catch (UndeclaredThrowableException e) {
+        } catch (IOException | UndeclaredThrowableException e) {
             if (JConsole.isDebug()) {
                 e.printStackTrace();
             }
diff --git a/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java
index 09a2c62f128..cc7f6c78826 100644
--- a/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java
+++ b/src/jdk.jconsole/share/classes/sun/tools/jconsole/ThreadTab.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -216,9 +216,7 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
                     }
                     timeStamp = System.currentTimeMillis();
                     return true;
-                } catch (IOException e) {
-                    return false;
-                } catch (UndeclaredThrowableException e) {
+                } catch (IOException | UndeclaredThrowableException e) {
                     return false;
                 }
             }
@@ -426,9 +424,7 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
                                         }
                                     });
                                     sleep(30 * 1000);
-                                } catch (InterruptedException ex) {
-                                    // Ignore
-                                } catch (InvocationTargetException ex) {
+                                } catch (InterruptedException | InvocationTargetException ex) {
                                     // Ignore
                                 }
                                 SwingUtilities.invokeLater(new Runnable() {
-- 
GitLab


From e29707493e0e6752b82f6d6a6c67a47225490944 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 4 Apr 2022 20:08:07 +0000
Subject: [PATCH 335/345] 8284181: ArgumentsTest.set_numeric_flag_double_vm
 fails on some locales

Reviewed-by: stuefe
---
 test/hotspot/gtest/runtime/test_arguments.cpp | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/gtest/runtime/test_arguments.cpp b/test/hotspot/gtest/runtime/test_arguments.cpp
index 737263d73c2..b67d306baab 100644
--- a/test/hotspot/gtest/runtime/test_arguments.cpp
+++ b/test/hotspot/gtest/runtime/test_arguments.cpp
@@ -572,7 +572,7 @@ TEST_VM_F(ArgumentsTest, set_numeric_flag_double) {
   check_numeric_flag<double>(flag, getvalue, valid_strings,
                              ARRAY_SIZE(valid_strings), /*is_double=*/true);
 
-  const char* more_valid_strings[] = {
+  const char* more_test_strings[] = {
     // These examples are from https://en.cppreference.com/w/cpp/language/floating_literal
     // (but with the L and F suffix removed).
     "1e10", "1e-5",
@@ -582,6 +582,7 @@ TEST_VM_F(ArgumentsTest, set_numeric_flag_double) {
     "0x1.p0", "0xf.p-1",
     "0x0.123p-1", "0xa.bp10",
     "0x1.4p3",
+
     // More test cases
     "1.5", "6.02e23", "-6.02e+23",
     "1.7976931348623157E+308", // max double
@@ -589,18 +590,25 @@ TEST_VM_F(ArgumentsTest, set_numeric_flag_double) {
     "0x1.91eb85p+1",
     "999999999999999999999999999999",
   };
-  for (uint i = 0; i < ARRAY_SIZE(more_valid_strings); i++) {
-    const char* str = more_valid_strings[i];
+  for (uint i = 0; i < ARRAY_SIZE(more_test_strings); i++) {
+    const char* str = more_test_strings[i];
 
     char* dummy;
+    errno = 0;
     double expected = strtod(str, &dummy);
-    ASSERT_TRUE(errno == 0);
-
-    ASSERT_TRUE(ArgumentsTest::parse_argument(flag->name(), str))
-        << "Valid string '" <<
+    if (errno == 0) {
+      ASSERT_TRUE(ArgumentsTest::parse_argument(flag->name(), str))
+        << "Test string '" <<
         str << "' did not parse for type " << flag->type_string() << ".";
-    double d = flag->get_double();
-    ASSERT_TRUE(d == expected)
+      double d = flag->get_double();
+      ASSERT_TRUE(d == expected)
         << "Parsed number " << d << " is not the same as expected " << expected;
+    } else {
+      // Some of the strings like "1.e-2" are not valid in certain locales.
+      // The decimal-point character is also locale dependent.
+      ASSERT_FALSE(ArgumentsTest::parse_argument(flag->name(), str))
+        << "Invalid string '" << str << "' parsed without error.";
+
+    }
   }
 }
-- 
GitLab


From 0cd46f655a77662a3ffee057e03025f37530f3aa Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Mon, 4 Apr 2022 20:39:44 +0000
Subject: [PATCH 336/345] 8283597: [REDO] Invalid generic signature for
 redefined classes

Reviewed-by: sspitsyn, coleenp
---
 .../share/prims/jvmtiRedefineClasses.cpp      |  19 +-
 .../RedefineGenericSignatureTest.java         | 195 ++++++++++++++++++
 2 files changed, 204 insertions(+), 10 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java

diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
index 586c0679177..e8ba72cbc0e 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
@@ -1856,14 +1856,15 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
   if (old_cp->has_dynamic_constant()) {
     scratch_cp->set_has_dynamic_constant();
   }
-  // Copy attributes from scratch_cp to merge_cp
-  merge_cp->copy_fields(scratch_cp());
 
   log_info(redefine, class, constantpool)("merge_cp_len=%d, index_map_len=%d", merge_cp_length, _index_map_count);
 
   if (_index_map_count == 0) {
     // there is nothing to map between the new and merged constant pools
 
+    // Copy attributes from scratch_cp to merge_cp
+    merge_cp->copy_fields(scratch_cp());
+
     if (old_cp->length() == scratch_cp->length()) {
       // The old and new constant pools are the same length and the
       // index map is empty. This means that the three constant pools
@@ -1917,6 +1918,9 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
       return JVMTI_ERROR_INTERNAL;
     }
 
+    // Copy attributes from scratch_cp to merge_cp (should be done after rewrite_cp_refs())
+    merge_cp->copy_fields(scratch_cp());
+
     // Replace the new constant pool with a shrunken copy of the
     // merged constant pool so now the rewritten bytecodes have
     // valid references; the previous new constant pool will get
@@ -3492,10 +3496,9 @@ void VM_RedefineClasses::rewrite_cp_refs_in_verification_type_info(
 } // end rewrite_cp_refs_in_verification_type_info()
 
 
-// Change the constant pool associated with klass scratch_class to
-// scratch_cp. If shrink is true, then scratch_cp_length elements
-// are copied from scratch_cp to a smaller constant pool and the
-// smaller constant pool is associated with scratch_class.
+// Change the constant pool associated with klass scratch_class to scratch_cp.
+// scratch_cp_length elements are copied from scratch_cp to a smaller constant pool
+// and the smaller constant pool is associated with scratch_class.
 void VM_RedefineClasses::set_new_constant_pool(
        ClassLoaderData* loader_data,
        InstanceKlass* scratch_class, constantPoolHandle scratch_cp,
@@ -4357,10 +4360,6 @@ void VM_RedefineClasses::redefine_single_class(Thread* current, jclass the_jclas
 
   // Leave arrays of jmethodIDs and itable index cache unchanged
 
-  // Copy the "source file name" attribute from new class version
-  the_class->set_source_file_name_index(
-    scratch_class->source_file_name_index());
-
   // Copy the "source debug extension" attribute from new class version
   the_class->set_source_debug_extension(
     scratch_class->source_debug_extension(),
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java
new file mode 100644
index 00000000000..04ccd12cc36
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineGenericSignatureTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8282241
+ * @summary Verifies class redefinition correctly updates generic_signature and source_file_name attributes
+ * @requires vm.jvmti
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ *          java.instrument
+ * @library /test/lib
+ * @run main RedefineClassHelper
+ * @run main/othervm -javaagent:redefineagent.jar --add-opens=java.base/java.lang=ALL-UNNAMED RedefineGenericSignatureTest
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.util.List;
+
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+class GenericSignatureTester {
+    public GenericSignatureTarget<List<String>> method1() {
+        return null;
+    }
+}
+
+class GenericSignatureTarget<T extends List<?>>  {
+    public GenericSignatureTarget<T> foo() { return null; }
+    public static void throwException() { throw new RuntimeException(); }
+}
+
+public class RedefineGenericSignatureTest {
+    private static final String newTargetClassSource =
+            "class GenericSignatureTarget<T> {\n" +
+            "    public GenericSignatureTarget<T> foo() { return null; }\n" +
+            "    public static void throwException() { throw new RuntimeException(); }\n" +
+            "}\n";
+
+    public static void main (String[] args) throws Throwable {
+        RedefineGenericSignatureTest test = new RedefineGenericSignatureTest();
+        test.runTest();
+    }
+
+    private final static String sourceFileName = "RedefineGenericSignatureTest.java";
+    private final static String sourceFileNameNew = "RedefineGenericSignatureTestNew.java";
+    // expected signature of GenericSignatureTester.method1 return type
+    private final static String expectedRetType = "GenericSignatureTarget<java.util.List<java.lang.String>>";
+    // expected generic signature of the original GenericSignatureTarget
+    private final static String expectedSigOld = "<T::Ljava/util/List<*>;>Ljava/lang/Object;";
+    // expected generic signature of the redefined GenericSignatureTarget
+    private final static String expectedSigNew = "<T:Ljava/lang/Object;>Ljava/lang/Object;";
+
+    private static void log(Object o) {
+        System.out.println(o);
+    }
+
+    private String getTargetGenSig() throws Throwable {
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        MethodHandles.Lookup classLookup = MethodHandles.privateLookupIn(Class.class, lookup);
+        MethodHandle getGenericSignature0 = classLookup.findVirtual(
+                Class.class, "getGenericSignature0", MethodType.methodType(String.class));
+        Object genericSignature = getGenericSignature0.invoke(GenericSignatureTarget.class);
+        return String.valueOf(genericSignature);
+    }
+
+    private String getTesterRetType() throws Throwable {
+        Type type = GenericSignatureTester.class.getDeclaredMethod("method1").getGenericReturnType();
+        return String.valueOf(type);
+    }
+
+    private String getTargetSourceFilename() {
+        try {
+            GenericSignatureTarget.throwException();
+        } catch (RuntimeException ex) {
+            return ex.getStackTrace()[0].getFileName();
+        }
+        return "Cannot get source file name";
+    }
+
+    // Prints dissassembled class bytes.
+    private void printDisassembled(String description, Class cls, byte[] bytes) throws Exception {
+        log(description + " -------------------");
+
+        File f = new File(cls.getSimpleName()+".class");
+        try (FileOutputStream fos = new FileOutputStream(f)) {
+            fos.write(bytes);
+        }
+        JDKToolLauncher javap = JDKToolLauncher.create("javap")
+                .addToolArg("-verbose")
+                .addToolArg("-p")       // Shows all classes and members.
+                //.addToolArg("-c")       // Prints out disassembled code
+                .addToolArg("-s")       // Prints internal type signatures.
+                .addToolArg(f.toString());
+        ProcessBuilder pb = new ProcessBuilder(javap.getCommand());
+        OutputAnalyzer out = ProcessTools.executeProcess(pb);
+        out.shouldHaveExitValue(0);
+        try {
+            Files.delete(f.toPath());
+        } catch (Exception ex) {
+            // ignore
+        }
+        out.asLines().forEach(s -> log(s));
+        log("==========================================");
+        Files.deleteIfExists(f.toPath());
+    }
+
+    private byte[] getNewClassBytes() {
+        byte[] bytecode = InMemoryJavaCompiler.compile(GenericSignatureTarget.class.getName(), newTargetClassSource);
+
+        ClassWriter cw = new ClassWriter(0);
+        ClassReader cr = new ClassReader(bytecode);
+        cr.accept(new ClassVisitor(Opcodes.ASM7, cw) {
+            private boolean sourceSet = false;
+            @Override
+            public void visitSource(String source, String debug) {
+                sourceSet = true;
+                log("Changing source: \"" + source + "\" -> \"" + sourceFileNameNew + "\"");
+                super.visitSource(sourceFileNameNew, debug);
+            }
+
+            @Override
+            public void visitEnd() {
+                if (!sourceSet) {
+                    log("Set source: \"" + sourceFileNameNew + "\"");
+                    super.visitSource(sourceFileNameNew, null);
+                }
+                super.visitEnd();
+            }
+        }, 0);
+        return cw.toByteArray();
+    }
+
+    private void runTest() throws Throwable {
+        Class targetClass = GenericSignatureTarget.class;
+
+        String oldSig = getTargetGenSig();
+        log("old target class sig: \"" + oldSig + "\"");
+
+        byte[] oldClassBytes = targetClass.getResourceAsStream(targetClass.getName() + ".class").readAllBytes();
+        printDisassembled("Old " + targetClass.getName(), targetClass, oldClassBytes);
+
+        log("Redefining " + targetClass.getName() + " class");
+        byte[] newClassBytes = getNewClassBytes();
+        printDisassembled("New " + targetClass.getName(), targetClass, newClassBytes);
+        RedefineClassHelper.redefineClass(targetClass, newClassBytes);
+
+        String newSig = getTargetGenSig();
+        log("new target class sig: \"" + newSig + "\"");
+
+        String newRetType = getTesterRetType();
+        log("new tester ret type: \"" + newRetType + "\"");
+
+        String newSrcFileName = getTargetSourceFilename();
+        log("new source file name: \"" + newSrcFileName + "\"");
+
+        Asserts.assertStringsEqual(expectedSigOld, oldSig, "wrong old generic signature");
+        Asserts.assertStringsEqual(expectedSigNew, newSig, "wrong new generic signature");
+        Asserts.assertStringsEqual(expectedRetType, newRetType, "wrong ret type");
+        Asserts.assertStringsEqual(sourceFileNameNew, newSrcFileName, "wrong new source file name");
+    }
+}
-- 
GitLab


From 86caf606ff1f09fbe0ff402ebafbc4ae36d41811 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Mon, 4 Apr 2022 21:20:12 +0000
Subject: [PATCH 337/345] 8283703: Add sealed modifier to java.awt.geom.Path2D

Reviewed-by: bpb, kizune, aivanov
---
 src/java.desktop/share/classes/java/awt/geom/Path2D.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/geom/Path2D.java b/src/java.desktop/share/classes/java/awt/geom/Path2D.java
index e777f276602..e8d752c2bf3 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Path2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Path2D.java
@@ -70,7 +70,9 @@ import sun.awt.geom.Curve;
  * @author Jim Graham
  * @since 1.6
  */
-public abstract class Path2D implements Shape, Cloneable {
+public abstract sealed class Path2D implements Shape, Cloneable
+    permits Path2D.Double,
+            Path2D.Float   {
     /**
      * An even-odd winding rule for determining the interior of
      * a path.
@@ -191,7 +193,7 @@ public abstract class Path2D implements Shape, Cloneable {
      *
      * @since 1.6
      */
-    public static class Float extends Path2D implements Serializable {
+    public static non-sealed class Float extends Path2D implements Serializable {
         transient float[] floatCoords;
 
         /**
@@ -1093,7 +1095,7 @@ public abstract class Path2D implements Shape, Cloneable {
      *
      * @since 1.6
      */
-    public static class Double extends Path2D implements Serializable {
+    public static non-sealed class Double extends Path2D implements Serializable {
         transient double[] doubleCoords;
 
         /**
-- 
GitLab


From 9440b391933afa672cbb625df010805d4a5ea504 Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Mon, 4 Apr 2022 21:22:44 +0000
Subject: [PATCH 338/345] 8283215: [macos] Screen Magnifier: Getting
 java.awt.IllegalComponentStateException when menu item is selected

Reviewed-by: serb, prr
---
 .../classes/sun/lwawt/macosx/CAccessibility.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
index f338f25f05e..efc6968150b 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
@@ -28,6 +28,7 @@ package sun.lwawt.macosx;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.IllegalComponentStateException;
 import java.awt.KeyboardFocusManager;
 import java.awt.Point;
 import java.awt.Window;
@@ -469,7 +470,16 @@ class CAccessibility implements PropertyChangeListener {
     public static Accessible accessibilityHitTest(final Container parent, final float hitPointX, final float hitPointY) {
         return invokeAndWait(new Callable<Accessible>() {
             public Accessible call() throws Exception {
-                final Point p = parent.getLocationOnScreen();
+                if (parent == null) {
+                    return null;
+                }
+
+                final Point p;
+                try {
+                    p = parent.getLocationOnScreen();
+                } catch (IllegalComponentStateException ice) {
+                    return null;
+                }
 
                 // Make it into local coords
                 final Point localPoint = new Point((int)(hitPointX - p.getX()), (int)(hitPointY - p.getY()));
-- 
GitLab


From 59fe31a0900f6ae2cf3846d11b623e287b61bb43 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 4 Apr 2022 21:43:34 +0000
Subject: [PATCH 339/345] 8284170: Add "make doctor" to the make help

Reviewed-by: erikj
---
 make/Global.gmk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/make/Global.gmk b/make/Global.gmk
index f9200d16851..618e9ca2439 100644
--- a/make/Global.gmk
+++ b/make/Global.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -53,14 +53,17 @@ help:
 	$(info $(_) make docs-jdk-api      # Create just JDK javadocs)
 	$(info $(_) make bootcycle-images  # Build images twice, second time with newly built JDK)
 	$(info $(_) make install           # Install the generated images locally)
-	$(info $(_) make reconfigure       # Rerun configure with the same arguments as last time)
-	$(info $(_) make help              # Give some help on using make)
 	$(info $(_) make check             # Run basic testing (currently tier1))
 	$(info $(_) make test-<test>       # Run test, e.g. test-tier1)
 	$(info $(_) make test TEST=<t>     # Run test(s) given by TEST specification)
 	$(info $(_) make exploded-test TEST=<t> # Run test(s) on the exploded image instead of)
 	$(info $(_)                        # the full jdk image)
 	$(info )
+	$(info Targets for troubleshooting)
+	$(info $(_) make help              # Give some help on using make)
+	$(info $(_) make doctor            # Diagnose build environment problems)
+	$(info $(_) make reconfigure       # Rerun configure with the same arguments as last time)
+	$(info )
 	$(info Targets for cleaning)
 	$(info $(_) make clean             # Remove all files generated by make, but not those)
 	$(info $(_)                        # generated by configure)
-- 
GitLab


From 36b3bbc53de074647ce04de890dc99bd5a2373e8 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Tue, 5 Apr 2022 00:39:02 +0000
Subject: [PATCH 340/345] 8284033: Leak XVisualInfo in getAllConfigs in
 awt_GraphicsEnv.c

Reviewed-by: serb, prr
---
 .../unix/native/libawt_xawt/awt/awt_GraphicsEnv.c            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
index 815289b7c8f..6d7d3125b94 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -579,7 +579,8 @@ cleanup:
        XFree (pVI8sg);
     if (n1sg != 0)
        XFree (pVI1sg);
-
+    if (nTrue != 0)
+       XFree (pVITrue);
     AWT_UNLOCK ();
 }
 
-- 
GitLab


From 9561b5e041c4cc70319e60953819c521c1e68d6c Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Tue, 5 Apr 2022 03:39:39 +0000
Subject: [PATCH 341/345] 8284165: Add pid to process reaper thread name

Reviewed-by: rriggs
---
 .../classes/java/lang/ProcessHandleImpl.java  | 55 +++++++++++--------
 .../lang/ProcessBuilder/ProcessReaperCCL.java |  2 +-
 .../java/util/concurrent/Phaser/Basic.java    |  2 +-
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
index 8a3527c724b..ff9cf8b0fbd 100644
--- a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
@@ -140,33 +140,40 @@ final class ProcessHandleImpl implements ProcessHandle {
                 processReaperExecutor.execute(new Runnable() {
                     // Use inner class to avoid lambda stack overhead
                     public void run() {
-                        int exitValue = waitForProcessExit0(pid, shouldReap);
-                        if (exitValue == NOT_A_CHILD) {
-                            // pid not alive or not a child of this process
-                            // If it is alive wait for it to terminate
-                            long sleep = 300;     // initial milliseconds to sleep
-                            int incr = 30;        // increment to the sleep time
-
-                            long startTime = isAlive0(pid);
-                            long origStart = startTime;
-                            while (startTime >= 0) {
-                                try {
-                                    Thread.sleep(Math.min(sleep, 5000L)); // no more than 5 sec
-                                    sleep += incr;
-                                } catch (InterruptedException ie) {
-                                    // ignore and retry
-                                }
-                                startTime = isAlive0(pid);  // recheck if it is alive
-                                if (startTime > 0 && origStart > 0 && startTime != origStart) {
-                                    // start time changed (and is not zero), pid is not the same process
-                                    break;
+                        String threadName = Thread.currentThread().getName();
+                        Thread.currentThread().setName("process reaper (pid " + pid + ")");
+                        try {
+                            int exitValue = waitForProcessExit0(pid, shouldReap);
+                            if (exitValue == NOT_A_CHILD) {
+                                // pid not alive or not a child of this process
+                                // If it is alive wait for it to terminate
+                                long sleep = 300;     // initial milliseconds to sleep
+                                int incr = 30;        // increment to the sleep time
+
+                                long startTime = isAlive0(pid);
+                                long origStart = startTime;
+                                while (startTime >= 0) {
+                                    try {
+                                        Thread.sleep(Math.min(sleep, 5000L)); // no more than 5 sec
+                                        sleep += incr;
+                                    } catch (InterruptedException ie) {
+                                        // ignore and retry
+                                    }
+                                    startTime = isAlive0(pid);  // recheck if it is alive
+                                    if (startTime > 0 && origStart > 0 && startTime != origStart) {
+                                        // start time changed (and is not zero), pid is not the same process
+                                        break;
+                                    }
                                 }
+                                exitValue = 0;
                             }
-                            exitValue = 0;
+                            newCompletion.complete(exitValue);
+                            // remove from cache afterwards
+                            completions.remove(pid, newCompletion);
+                        } finally {
+                            // Restore thread name
+                            Thread.currentThread().setName(threadName);
                         }
-                        newCompletion.complete(exitValue);
-                        // remove from cache afterwards
-                        completions.remove(pid, newCompletion);
                     }
                 });
             }
diff --git a/test/jdk/java/lang/ProcessBuilder/ProcessReaperCCL.java b/test/jdk/java/lang/ProcessBuilder/ProcessReaperCCL.java
index 00fa38bdb0d..79593b014c3 100644
--- a/test/jdk/java/lang/ProcessBuilder/ProcessReaperCCL.java
+++ b/test/jdk/java/lang/ProcessBuilder/ProcessReaperCCL.java
@@ -57,7 +57,7 @@ public class ProcessReaperCCL {
 
         // Verify all "Process Reaper" threads have a null CCL
         for (Thread th : Thread.getAllStackTraces().keySet()) {
-            if ("process reaper".equals(th.getName())) {
+            if (th.getName().startsWith("process reaper")) {
                 Assert.assertEquals(th.getContextClassLoader(), null, "CCL not null");
             }
         }
diff --git a/test/jdk/java/util/concurrent/Phaser/Basic.java b/test/jdk/java/util/concurrent/Phaser/Basic.java
index 99356cd7c7a..2ea09dced99 100644
--- a/test/jdk/java/util/concurrent/Phaser/Basic.java
+++ b/test/jdk/java/util/concurrent/Phaser/Basic.java
@@ -440,7 +440,7 @@ public class Basic {
             if ("Finalizer".equals(name)
                 && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
                 continue;
-            if ("process reaper".equals(name))
+            if (name.startsWith("process reaper"))
                 continue;
             if (name != null && name.startsWith("ForkJoinPool.commonPool-worker"))
                 continue;
-- 
GitLab


From 632825c6d2933c8f1e63569199413ecaa74b6740 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Tue, 5 Apr 2022 04:42:32 +0000
Subject: [PATCH 342/345] 8283621: Write a regression test for CCC4400728

Reviewed-by: aivanov, serb
---
 .../JFileChooserDefaultDirectoryTest.java     | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 test/jdk/javax/swing/JFileChooser/4400728/JFileChooserDefaultDirectoryTest.java

diff --git a/test/jdk/javax/swing/JFileChooser/4400728/JFileChooserDefaultDirectoryTest.java b/test/jdk/javax/swing/JFileChooser/4400728/JFileChooserDefaultDirectoryTest.java
new file mode 100644
index 00000000000..9a13f3cdd9b
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/4400728/JFileChooserDefaultDirectoryTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.swing.JFileChooser;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4400728
+ * @summary This testcase tests CCC4400728 request, checks whether JFileChooser
+ *          constructor set correct default directory or not, it is typically
+ *          the "Documents" folder on Windows, and the user's home directory
+ *          on Unix.
+ * @run main JFileChooserDefaultDirectoryTest
+ */
+public class JFileChooserDefaultDirectoryTest {
+
+    public static void main(String[] args) throws Exception {
+        final AtomicReference<String> actual = new AtomicReference<>("");
+        SwingUtilities.invokeAndWait(() -> {
+            JFileChooser jFileChooser = new JFileChooser();
+            actual.set(jFileChooser.getFileSystemView()
+                                   .getDefaultDirectory()
+                                   .getName());
+        });
+        String actualDefaultDirectory = actual.get();
+        final boolean isWindows = System.getProperty("os.name")
+                                        .startsWith("Windows");
+        if (isWindows) {
+            if (actualDefaultDirectory.equals("Documents")) {
+                System.out.println("Test Passed");
+            } else {
+                throw new RuntimeException(
+                        "Test Failed, JFileChooser constructor sets incorrect" +
+                        " default directory, actual = " +
+                        actualDefaultDirectory +
+                        " expected should be 'Documents'");
+            }
+        } else {
+            final String userHome = System.getProperty("user.home");
+            System.out.println("UserHome dir = " + userHome);
+            String expectedDefaultDirectory = new File(userHome).getName();
+            if (expectedDefaultDirectory.equals(actualDefaultDirectory)) {
+                System.out.println("Test Passed");
+            } else {
+                throw new RuntimeException(
+                        "Test Failed, JFileChooser constructor sets incorrect" +
+                        " default directory, actual = " +
+                        actualDefaultDirectory + " expected = " +
+                        expectedDefaultDirectory);
+            }
+        }
+    }
+
+}
-- 
GitLab


From f20ed33618efaad308a71814a79a580b709b8152 Mon Sep 17 00:00:00 2001
From: Tejesh R <tejesh.r@oracle.com>
Date: Tue, 5 Apr 2022 11:09:11 +0000
Subject: [PATCH 343/345] 8284278: Diagnostic Fix Updated.

Reviewed-by: prr, psadhukhan
---
 test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java b/test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java
index 6ca33c96356..56e6aae43f9 100644
--- a/test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java
+++ b/test/jdk/javax/swing/JTable/8236907/LastVisibleRow.java
@@ -36,8 +36,10 @@ import java.awt.image.BufferedImage;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Robot;
+import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 
+import javax.imageio.ImageIO;
 import javax.print.attribute.HashPrintRequestAttributeSet;
 import javax.print.attribute.PrintRequestAttributeSet;
 
@@ -75,10 +77,13 @@ public class LastVisibleRow {
             clearSelect();
             testRobot.waitForIdle();
             BufferedImage bufferedImageAfter = testRobot.createScreenCapture(getCaptureRect());
+
             testRobot.delay(1000);
 
             if (!compare(bufferedImageBefore, bufferedImageAfter)) {
-                throw new RuntimeException("Test Case Failed!!");
+                ImageIO.write(bufferedImageBefore, "png", new File("bufferedImageBefore.png"));
+                ImageIO.write(bufferedImageAfter, "png", new File("bufferedImageAfter.png"));
+                throw new RuntimeException("Test Case Failed!!, Last Row not Visible!!!");
             }
         } finally {
             if (frame != null) SwingUtilities.invokeAndWait(() -> frame.dispose());
-- 
GitLab


From 648efd7abc93bf738723886ff941e3dd3aa622cb Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Tue, 5 Apr 2022 13:08:54 +0000
Subject: [PATCH 344/345] 8284275: Remove unused sun.nio.fs.Reflect

Reviewed-by: alanb, bpb
---
 .../share/classes/sun/nio/fs/Reflect.java     | 64 -------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 src/java.base/share/classes/sun/nio/fs/Reflect.java

diff --git a/src/java.base/share/classes/sun/nio/fs/Reflect.java b/src/java.base/share/classes/sun/nio/fs/Reflect.java
deleted file mode 100644
index 1f995543b64..00000000000
--- a/src/java.base/share/classes/sun/nio/fs/Reflect.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.nio.fs;
-
-import java.lang.reflect.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * Utility class for reflection.
- */
-
-class Reflect {
-    private Reflect() {}
-
-    @SuppressWarnings("removal")
-    private static void setAccessible(final AccessibleObject ao) {
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                @Override
-                public Object run() {
-                    ao.setAccessible(true);
-                    return null;
-                }});
-    }
-
-    /**
-     * Lookup the field of a given class.
-     */
-    static Field lookupField(String className, String fieldName) {
-        try {
-            Class<?> cl = Class.forName(className);
-            Field f = cl.getDeclaredField(fieldName);
-            setAccessible(f);
-            return f;
-        } catch (ClassNotFoundException x) {
-            throw new AssertionError(x);
-        } catch (NoSuchFieldException x) {
-            throw new AssertionError(x);
-        }
-    }
-}
-- 
GitLab


From 526e73498eef5c7608845501ab4ebef0997a5c0d Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 5 Apr 2022 15:38:36 +0000
Subject: [PATCH 345/345] 8282819: Deprecate Locale class constructors

Reviewed-by: lancea, rriggs
---
 .../CodePointInputMethodDescriptor.java       |   2 +-
 .../share/classes/java/util/Locale.java       | 152 +++++++++++++-----
 .../locale/provider/JRELocaleConstants.java   |  10 +-
 .../provider/LocaleServiceProviderPool.java   |   4 +-
 .../sun/util/resources/LocaleData.java        |   2 +-
 .../share/classes/sun/awt/SunToolkit.java     |   2 +-
 .../awt/im/ExecutableInputMethodManager.java  |  16 +-
 .../classes/sun/font/SunFontManager.java      |   4 +-
 .../xml/internal/security/utils/I18n.java     |   2 +-
 .../xsltc/dom/CollatorFactoryBase.java        |   2 +-
 .../datatype/XMLGregorianCalendarImpl.java    |   8 +-
 .../xml/internal/utils/LocaleUtility.java     |   2 +-
 .../jdk/xml/internal/SecuritySupport.java     |   4 +-
 .../plugins/IncludeLocalesPlugin.java         |   8 +-
 test/jdk/java/util/Locale/TestOf.java         | 111 +++++++++++++
 15 files changed, 256 insertions(+), 73 deletions(-)
 create mode 100644 test/jdk/java/util/Locale/TestOf.java

diff --git a/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java b/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java
index 0e91e1916da..320a1ce7e66 100644
--- a/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java
+++ b/src/demo/share/jfc/CodePointIM/com/sun/inputmethods/internal/codepointim/CodePointInputMethodDescriptor.java
@@ -75,7 +75,7 @@ public class CodePointInputMethodDescriptor implements InputMethodDescriptor {
      */
     public Locale[] getAvailableLocales() {
         Locale[] locales = {
-            new Locale("", "", ""), };
+            Locale.ROOT, };
         return locales;
     }
 
diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index a06e5c4f4b7..0ab6fbad86f 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -230,9 +230,9 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  * implementations in a Java Runtime Environment might not support any
  * particular Unicode locale attributes or key/type pairs.
  *
- * <h3>Creating a Locale</h3>
+ * <h3><a id="ObtainingLocale">Obtaining a Locale</a></h3>
  *
- * <p>There are several different ways to create a {@code Locale}
+ * <p>There are several ways to obtain a {@code Locale}
  * object.
  *
  * <h4>Builder</h4>
@@ -240,36 +240,20 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  * <p>Using {@link Builder} you can construct a {@code Locale} object
  * that conforms to BCP 47 syntax.
  *
- * <h4>Constructors</h4>
- *
- * <p>The {@code Locale} class provides three constructors:
- * <blockquote>
- * <pre>
- *     {@link #Locale(String language)}
- *     {@link #Locale(String language, String country)}
- *     {@link #Locale(String language, String country, String variant)}
- * </pre>
- * </blockquote>
- * These constructors allow you to create a {@code Locale} object
- * with language, country and variant, but you cannot specify
- * script or extensions.
- *
  * <h4>Factory Methods</h4>
  *
- * <p>The method {@link #forLanguageTag} creates a {@code Locale}
- * object for a well-formed BCP 47 language tag.
+ * <p>The method {@link #forLanguageTag} obtains a {@code Locale}
+ * object for a well-formed BCP 47 language tag. The method
+ * {@link #of(String, String, String)} and its overloads obtain a
+ * {@code Locale} object from given {@code language}, {@code country},
+ * and/or {@code variant} defined above.
  *
  * <h4>Locale Constants</h4>
  *
  * <p>The {@code Locale} class provides a number of convenient constants
- * that you can use to create {@code Locale} objects for commonly used
- * locales. For example, the following creates a {@code Locale} object
- * for the United States:
- * <blockquote>
- * <pre>
- *     Locale.US
- * </pre>
- * </blockquote>
+ * that you can use to obtain {@code Locale} objects for commonly used
+ * locales. For example, {@code Locale.US} is the {@code Locale} object
+ * for the United States.
  *
  * <h3><a id="LocaleMatching">Locale Matching</a></h3>
  *
@@ -344,7 +328,7 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  *
  * <h3>Use of Locale</h3>
  *
- * <p>Once you've created a {@code Locale} you can query it for information
+ * <p>Once you've obtained a {@code Locale} you can query it for information
  * about itself. Use {@code getCountry} to get the country (or region)
  * code and {@code getLanguage} to get the language code.
  * You can use {@code getDisplayCountry} to get the
@@ -387,7 +371,7 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  *
  * <h3>Compatibility</h3>
  *
- * <p>In order to maintain compatibility with existing usage, Locale's
+ * <p>In order to maintain compatibility, Locale's
  * constructors retain their behavior prior to the Java Runtime
  * Environment version 1.7.  The same is largely true for the
  * {@code toString} method. Thus Locale objects can continue to
@@ -741,6 +725,9 @@ public final class Locale implements Cloneable, Serializable {
      * see <a href="#special_cases_constructor">Special Cases</a> for more information.
      * </ul>
      *
+     * @deprecated Locale constructors have been deprecated. See <a href ="#ObtainingLocale">
+     * Obtaining a Locale</a> for other options.
+     *
      * @param language An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
      * up to 8 characters in length.  See the {@code Locale} class description about
      * valid language values.
@@ -750,6 +737,7 @@ public final class Locale implements Cloneable, Serializable {
      * See the {@code Locale} class description for the details.
      * @throws    NullPointerException thrown if any argument is null.
      */
+    @Deprecated(since="19")
     public Locale(String language, String country, String variant) {
         if (language == null || country == null || variant == null) {
             throw new NullPointerException();
@@ -771,6 +759,9 @@ public final class Locale implements Cloneable, Serializable {
      * any syntactic checks on the input.
      * </ul>
      *
+     * @deprecated Locale constructors have been deprecated. See <a href="#ObtainingLocale">
+     * Obtaining a Locale</a> for other options.
+     *
      * @param language An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
      * up to 8 characters in length.  See the {@code Locale} class description about
      * valid language values.
@@ -778,6 +769,7 @@ public final class Locale implements Cloneable, Serializable {
      * See the {@code Locale} class description about valid country values.
      * @throws    NullPointerException thrown if either argument is null.
      */
+    @Deprecated(since="19")
     public Locale(String language, String country) {
         this(language, country, "");
     }
@@ -794,16 +786,96 @@ public final class Locale implements Cloneable, Serializable {
      * any syntactic checks on the input.
      * </ul>
      *
+     * @deprecated Locale constructors have been deprecated. See <a href="#ObtainingLocale">
+     * Obtaining a Locale</a> for other options.
+     *
      * @param language An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
      * up to 8 characters in length.  See the {@code Locale} class description about
      * valid language values.
      * @throws    NullPointerException thrown if argument is null.
      * @since 1.4
      */
+    @Deprecated(since="19")
     public Locale(String language) {
         this(language, "", "");
     }
 
+    /**
+     * Obtains a locale from language, country and variant.
+     * This method normalizes the language value to lowercase and
+     * the country value to uppercase.
+     * @implNote
+     * <ul>
+     * <li>This method does not make any syntactic checks on the input.
+     * Use {@link Locale.Builder} for full syntactic checks with BCP47.
+     * <li>The two cases ("ja", "JP", "JP") and ("th", "TH", "TH") are handled specially,
+     * see <a href="#special_cases_constructor">Special Cases</a> for more information.
+     * <li>Obsolete ISO 639 codes ("iw", "ji", and "in") are mapped to
+     * their current forms. See <a href="#legacy_language_codes">Legacy language
+     * codes</a> for more information.
+     * </ul>
+     *
+     * @param language A language code. See the {@code Locale} class description of
+     * <a href="#def_language">language</a> values.
+     * @param country A country code. See the {@code Locale} class description of
+     * <a href="#def_region">country</a> values.
+     * @param variant Any arbitrary value used to indicate a variation of a {@code Locale}.
+     * See the {@code Locale} class description of <a href="#def_variant">variant</a> values.
+     * @throws    NullPointerException thrown if any argument is null.
+     * @return A {@code Locale} object
+     * @since 19
+     */
+    public static Locale of(String language, String country, String variant) {
+        return getInstance(language, "", country, variant, null);
+    }
+
+    /**
+     * Obtains a locale from language and country.
+     * This method normalizes the language value to lowercase and
+     * the country value to uppercase.
+     * @implNote
+     * <ul>
+     * <li>This method does not make any syntactic checks on the input.
+     * Use {@link Locale.Builder} for full syntactic checks with BCP47.
+     * <li>Obsolete ISO 639 codes ("iw", "ji", and "in") are mapped to
+     * their current forms. See <a href="#legacy_language_codes">Legacy language
+     * codes</a> for more information.
+     * </ul>
+     *
+     * @param language A language code. See the {@code Locale} class description of
+     * <a href="#def_language">language</a> values.
+     * @param country A country code. See the {@code Locale} class description of
+     * <a href="#def_region">country</a> values.
+     * @throws    NullPointerException thrown if either argument is null.
+     * @return A {@code Locale} object
+     * @since 19
+     */
+    public static Locale of(String language, String country) {
+        return getInstance(language, "", country, "", null);
+    }
+
+    /**
+     * Obtains a locale from a language code.
+     * This method normalizes the language value to lowercase.
+     * @implNote
+     * <ul>
+     * <li>This method does not make any syntactic checks on the input.
+     * Use {@link Locale.Builder} for full syntactic checks with BCP47.
+     * <li>Obsolete ISO 639 codes ("iw", "ji", and "in") are mapped to
+     * their current forms. See <a href="#legacy_language_codes">Legacy language
+     * codes</a> for more information.
+     * </ul>
+     *
+     * @param language A language code. See the {@code Locale} class description of
+     * <a href="#def_language">language</a> values.
+     * @throws    NullPointerException thrown if argument is null.
+     * @return A {@code Locale} object
+     * @since 19
+     */
+    public static Locale of(String language) {
+        return getInstance(language, "", "", "", null);
+    }
+
     /**
      * Returns a {@code Locale} constructed from the given
      * {@code language}, {@code country} and
@@ -1138,14 +1210,14 @@ public final class Locale implements Cloneable, Serializable {
 
     /**
      * Returns a list of all 2-letter country codes defined in ISO 3166.
-     * Can be used to create Locales.
+     * Can be used to obtain Locales.
      * This method is equivalent to {@link #getISOCountries(Locale.IsoCountryCode type)}
      * with {@code type}  {@link IsoCountryCode#PART1_ALPHA2}.
      * <p>
      * <b>Note:</b> The {@code Locale} class also supports other codes for
      * country (region), such as 3-letter numeric UN M.49 area codes.
      * Therefore, the list returned by this method does not contain ALL valid
-     * codes that can be used to create Locales.
+     * codes that can be used to obtain Locales.
      * <p>
      * Note that this method does not return obsolete 2-letter country codes.
      * ISO3166-3 codes which designate country codes for those obsolete codes,
@@ -1178,7 +1250,7 @@ public final class Locale implements Cloneable, Serializable {
 
     /**
      * Returns a list of all 2-letter language codes defined in ISO 639.
-     * Can be used to create Locales.
+     * Can be used to obtain Locales.
      * <p>
      * <b>Note:</b>
      * <ul>
@@ -1187,7 +1259,7 @@ public final class Locale implements Cloneable, Serializable {
      * languages whose codes have changed.
      * <li>The {@code Locale} class also supports language codes up to
      * 8 characters in length.  Therefore, the list returned by this method does
-     * not contain ALL valid codes that can be used to create Locales.
+     * not contain ALL valid codes that can be used to obtain Locales.
      * </ul>
      *
      * @return An array of ISO 639 two-letter language codes.
@@ -1520,12 +1592,12 @@ public final class Locale implements Cloneable, Serializable {
      * "NY", representing Norwegian Nynorsk (Norway), is converted
      * to a language tag "nn-NO".</li></ul>
      *
-     * <p><b>Note:</b> Although the language tag created by this
+     * <p><b>Note:</b> Although the language tag obtained by this
      * method is well-formed (satisfies the syntax requirements
      * defined by the IETF BCP 47 specification), it is not
      * necessarily a valid BCP 47 language tag.  For example,
      * <pre>
-     *   new Locale("xx", "YY").toLanguageTag();</pre>
+     *   Locale.forLanguageTag("xx-YY").toLanguageTag();</pre>
      *
      * will return "xx-YY", but the language subtag "xx" and the
      * region subtag "YY" are invalid because they are not registered
@@ -2510,7 +2582,7 @@ public final class Locale implements Cloneable, Serializable {
      * from values configured by the setters.  Unlike the {@code Locale}
      * constructors, the {@code Builder} checks if a value configured by a
      * setter satisfies the syntax requirements defined by the {@code Locale}
-     * class.  A {@code Locale} object created by a {@code Builder} is
+     * class.  A {@code Locale} object obtained from a {@code Builder} is
      * well-formed and can be transformed to a well-formed IETF BCP 47 language tag
      * without losing information.
      *
@@ -2521,11 +2593,11 @@ public final class Locale implements Cloneable, Serializable {
      * {@code IllformedLocaleException} for a variant that does not satisfy
      * this restriction. If it is necessary to support such a variant, use a
      * Locale constructor.  However, keep in mind that a {@code Locale}
-     * object created this way might lose the variant information when
+     * object obtained this way might lose the variant information when
      * transformed to a BCP 47 language tag.
      *
-     * <p>The following example shows how to create a {@code Locale} object
-     * with the {@code Builder}.
+     * <p>The following example shows how to obtain a {@code Locale} object
+     * using a {@code Builder}.
      * <blockquote>
      * <pre>
      *     Locale aLocale = new Builder().setLanguage("sr").setScript("Latn").setRegion("RS").build();
@@ -2658,7 +2730,7 @@ public final class Locale implements Cloneable, Serializable {
          * <p>The typical region value is a two-letter ISO 3166 code or a
          * three-digit UN M.49 area code.
          *
-         * <p>The country value in the {@code Locale} created by the
+         * <p>The country value in the {@code Locale} obtained from a
          * {@code Builder} is always normalized to upper case.
          *
          * @param region the region
@@ -2831,7 +2903,7 @@ public final class Locale implements Cloneable, Serializable {
         }
 
         /**
-         * Returns an instance of {@code Locale} created from the fields set
+         * Returns an instance of {@code Locale} obtained from the fields set
          * on this builder.
          *
          * <p>This applies the conversions listed in {@link Locale#forLanguageTag}
diff --git a/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java b/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java
index ea511c5bbc6..f54f8d5b68e 100644
--- a/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/JRELocaleConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,10 +35,10 @@ import java.util.Locale;
  * @author Masayoshi Okutsu
  */
 public class JRELocaleConstants {
-    public static final Locale JA_JP_JP = new Locale("ja", "JP", "JP");
-    public static final Locale NO_NO_NY = new Locale("no", "NO", "NY");
-    public static final Locale TH_TH    = new Locale("th", "TH");
-    public static final Locale TH_TH_TH = new Locale("th", "TH", "TH");
+    public static final Locale JA_JP_JP = Locale.of("ja", "JP", "JP");
+    public static final Locale NO_NO_NY = Locale.of("no", "NO", "NY");
+    public static final Locale TH_TH    = Locale.of("th", "TH");
+    public static final Locale TH_TH_TH = Locale.of("th", "TH", "TH");
 
     private JRELocaleConstants() {
     }
diff --git a/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
index 18bac98d941..0cfbf24ad83 100644
--- a/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -369,7 +369,7 @@ public final class LocaleServiceProviderPool {
                         "A locale(" + locale + ") has non-empty extensions, but has illformed fields.");
 
                 // Fallback - script field will be lost.
-                lookupLocale = new Locale(locale.getLanguage(), locale.getCountry(), locale.getVariant());
+                lookupLocale = Locale.of(locale.getLanguage(), locale.getCountry(), locale.getVariant());
             }
         }
         return lookupLocale;
diff --git a/src/java.base/share/classes/sun/util/resources/LocaleData.java b/src/java.base/share/classes/sun/util/resources/LocaleData.java
index 4240352e831..7d9af41811c 100644
--- a/src/java.base/share/classes/sun/util/resources/LocaleData.java
+++ b/src/java.base/share/classes/sun/util/resources/LocaleData.java
@@ -246,7 +246,7 @@ public class LocaleData {
         private static final LocaleDataStrategy INSTANCE = new LocaleDataStrategy();
         // TODO: avoid hard-coded Locales
         private static final Set<Locale> JAVA_BASE_LOCALES
-            = Set.of(Locale.ROOT, Locale.ENGLISH, Locale.US, new Locale("en", "US", "POSIX"));
+            = Set.of(Locale.ROOT, Locale.ENGLISH, Locale.US, Locale.of("en", "US", "POSIX"));
 
         private LocaleDataStrategy() {
         }
diff --git a/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index 380a5e4db01..1e144c373e4 100644
--- a/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -1181,7 +1181,7 @@ public abstract class SunToolkit extends Toolkit
                 variant = AccessController.doPrivileged(
                                 new GetPropertyAction("user.variant", ""));
             }
-            startupLocale = new Locale(language, country, variant);
+            startupLocale = Locale.of(language, country, variant);
         }
         return startupLocale;
     }
diff --git a/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java b/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
index eb8f6368c20..5b32879b598 100644
--- a/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
+++ b/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -375,7 +375,7 @@ class ExecutableInputMethodManager extends InputMethodManager
                     variant = localeString.substring(postIndex + 1);
                 }
             }
-            Locale locale = new Locale(language, country, variant);
+            Locale locale = Locale.of(language, country, variant);
             locator = locator.deriveLocator(locale);
         }
 
@@ -550,8 +550,8 @@ class ExecutableInputMethodManager extends InputMethodManager
         if (preferredLocale.equals(Locale.KOREA)) {
             preferredLocale = Locale.KOREAN;
         }
-        if (preferredLocale.equals(new Locale("th", "TH"))) {
-            preferredLocale = new Locale("th");
+        if (preferredLocale.equals(Locale.of("th", "TH"))) {
+            preferredLocale = Locale.of("th");
         }
 
         // obtain node
@@ -623,10 +623,10 @@ class ExecutableInputMethodManager extends InputMethodManager
                 advertised = Locale.KOREAN;
             }
         } else if (locale.getLanguage().equals("th")) {
-            if (locator.isLocaleAvailable(new Locale("th", "TH"))) {
-                advertised = new Locale("th", "TH");
-            } else if (locator.isLocaleAvailable(new Locale("th"))) {
-                advertised = new Locale("th");
+            if (locator.isLocaleAvailable(Locale.of("th", "TH"))) {
+                advertised = Locale.of("th", "TH");
+            } else if (locator.isLocaleAvailable(Locale.of("th"))) {
+                advertised = Locale.of("th");
             }
         }
 
diff --git a/src/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java
index 4f36498f6e2..3395e343e2e 100644
--- a/src/java.desktop/share/classes/sun/font/SunFontManager.java
+++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3466,7 +3466,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
                     String language = System.getProperty("user.language", "en");
                     String country  = System.getProperty("user.country","");
                     String variant  = System.getProperty("user.variant","");
-                    return new Locale(language, country, variant);
+                    return Locale.of(language, country, variant);
                 }
             });
         }
diff --git a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
index 9b928794c6e..d2d63fc85ff 100644
--- a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
+++ b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
@@ -160,7 +160,7 @@ public final class I18n {
         I18n.resourceBundle =
             ResourceBundle.getBundle(
                 Constants.exceptionMessagesResourceBundleBase,
-                new Locale(languageCode, countryCode)
+                Locale.of(languageCode, countryCode)
             );
         alreadyInitialized = true;
     }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
index ce509409620..1cfd9693901 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
@@ -38,7 +38,7 @@ public class CollatorFactoryBase implements CollatorFactory {
     }
 
     public Collator getCollator(String lang, String country) {
-        return Collator.getInstance(new Locale(lang, country));
+        return Collator.getInstance(Locale.of(lang, country));
     }
 
     public Collator getCollator(Locale locale) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
index 46582fefd1b..fbb758def47 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2425,12 +2425,12 @@ public class XMLGregorianCalendarImpl
         if (lang != null) {
             if (country != null) {
                 if (variant != null) {
-                    locale = new Locale(lang, country, variant);
+                    locale = Locale.of(lang, country, variant);
                 } else {
-                    locale = new Locale(lang, country);
+                    locale = Locale.of(lang, country);
                 }
             } else {
-                locale = new Locale(lang);
+                locale = Locale.of(lang);
             }
         }
         if (locale == null) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
index d63e26aafd4..e08a619dd61 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
@@ -78,7 +78,7 @@ public class LocaleUtility {
             variant = EMPTY_STRING;
         }
 
-        return new Locale(language, country, variant );
+        return Locale.of(language, country, variant);
     }
 
 
diff --git a/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java b/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java
index c5678b8b750..760db484b97 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java
+++ b/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -275,7 +275,7 @@ public class SecuritySupport {
                 return ResourceBundle.getBundle(bundle, locale);
             } catch (MissingResourceException e) {
                 try {
-                    return ResourceBundle.getBundle(bundle, new Locale("en", "US"));
+                    return ResourceBundle.getBundle(bundle, Locale.US);
                 } catch (MissingResourceException e2) {
                     throw new MissingResourceException(
                             "Could not load any resource bundle by " + bundle, bundle, "");
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
index 623b7f2917b..fae1cba139f 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -141,9 +141,9 @@ public final class IncludeLocalesPlugin extends AbstractPlugin implements Resour
     private static final String jaJPJPTag = "ja-JP-JP";
     private static final String noNONYTag = "no-NO-NY";
     private static final String thTHTHTag = "th-TH-TH";
-    private static final Locale jaJPJP = new Locale("ja", "JP", "JP");
-    private static final Locale noNONY = new Locale("no", "NO", "NY");
-    private static final Locale thTHTH = new Locale("th", "TH", "TH");
+    private static final Locale jaJPJP = Locale.of("ja", "JP", "JP");
+    private static final Locale noNONY = Locale.of("no", "NO", "NY");
+    private static final Locale thTHTH = Locale.of("th", "TH", "TH");
 
     public IncludeLocalesPlugin() {
         super("include-locales");
diff --git a/test/jdk/java/util/Locale/TestOf.java b/test/jdk/java/util/Locale/TestOf.java
new file mode 100644
index 00000000000..c923da832bf
--- /dev/null
+++ b/test/jdk/java/util/Locale/TestOf.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/**
+ * @test
+ * @bug 8282819
+ * @summary Unit tests for Locale.of() method. Those tests check the equality
+ *      of obtained objects with ones that are gotten from other means with both
+ *      well-formed and ill-formed arguments. Also checks the possible NPEs
+ *      for error cases.
+ * @run testng TestOf
+ */
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+
+import java.util.Locale;
+
+import org.testng.annotations.Test;
+import org.testng.annotations.DataProvider;
+
+@SuppressWarnings("deprecation")
+@Test
+public class TestOf {
+
+    @DataProvider
+    public Object[][] data_1Arg() {
+        return new Object[][]{
+                // well-formed
+                {Locale.ENGLISH, "en"},
+                {Locale.JAPANESE, "ja"},
+
+                // ill-formed
+                {Locale.ROOT, ""},
+                {new Locale("a"), "a"},
+                {new Locale("xxxxxxxxxx"), "xxxxxxxxxx"},
+        };
+    }
+
+    @DataProvider
+    public Object[][] data_2Args() {
+        return new Object[][]{
+                // well-formed
+                {Locale.US, "en", "US"},
+                {Locale.JAPAN, "ja", "JP"},
+
+                // ill-formed
+                {new Locale("", "US"), "", "US"},
+                {new Locale("a", "b"), "a", "b"},
+                {new Locale("xxxxxxxxxx", "yyyyyyyyyy"), "xxxxxxxxxx", "yyyyyyyyyy"},
+        };
+    }
+
+    @DataProvider
+    public Object[][] data_3Args() {
+        return new Object[][]{
+                // well-formed
+                {Locale.forLanguageTag("en-US-POSIX"), "en", "US", "POSIX"},
+                {Locale.forLanguageTag("ja-JP-POSIX"), "ja", "JP", "POSIX"},
+
+                // ill-formed
+                {new Locale("", "", "POSIX"), "", "", "POSIX"},
+                {new Locale("a", "b", "c"), "a", "b", "c"},
+                {new Locale("xxxxxxxxxx", "yyyyyyyyyy", "zzzzzzzzzz"),
+                        "xxxxxxxxxx", "yyyyyyyyyy", "zzzzzzzzzz"},
+                {new Locale("ja", "JP", "JP"), "ja", "JP", "JP"},
+                {new Locale("th", "TH", "TH"), "th", "TH", "TH"},
+                {new Locale("no", "NO", "NY"), "no", "NO", "NY"},
+        };
+    }
+
+    @Test (dataProvider = "data_1Arg")
+    public void test_1Arg(Locale expected, String lang) {
+        assertEquals(Locale.of(lang), expected);
+    }
+
+    @Test (dataProvider = "data_2Args")
+    public void test_2Args(Locale expected, String lang, String ctry) {
+        assertEquals(Locale.of(lang, ctry), expected);
+    }
+
+    @Test (dataProvider = "data_3Args")
+    public void test_3Args(Locale expected, String lang, String ctry, String vrnt) {
+        assertEquals(Locale.of(lang, ctry, vrnt), expected);
+    }
+
+    @Test
+    public void test_NPE() {
+        assertThrows(NullPointerException.class, () -> Locale.of(null));
+        assertThrows(NullPointerException.class, () -> Locale.of("", null));
+        assertThrows(NullPointerException.class, () -> Locale.of("", "", null));
+    }
+}
-- 
GitLab